Automated l10n update (.po files)

543 files changed, 95152 insertions, 87052 deletions

diff --git a/tde-i18n-cy/messages/tdeaccessibility/kbstateapplet.po b/tde-i18n-cy/messages/tdeaccessibility/kbstateapplet.po
index f02c5b5d97f..b8bc8e47e11 100644
--- a/tde-i18n-cy/messages/tdeaccessibility/kbstateapplet.po
+++ b/tde-i18n-cy/messages/tdeaccessibility/kbstateapplet.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdeaccessibility/kbstateapplet.po\n"
-"POT-Creation-Date: 2005-10-02 02:46+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeaccessibility/kmag.po b/tde-i18n-cy/messages/tdeaccessibility/kmag.po
index 8dddf7d6544..76f1809a586 100644
--- a/tde-i18n-cy/messages/tdeaccessibility/kmag.po
+++ b/tde-i18n-cy/messages/tdeaccessibility/kmag.po
@@ -5,24 +5,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmag\n"
-"POT-Creation-Date: 2006-05-28 04:04+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-01-01 21:25+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.2\n"
 
-#: kmagzoomview.cpp:159
-#, fuzzy
-msgid ""
-"This is the main window which shows the contents of the selected region. The "
-"contents will be magnified according to the zoom level that is set."
-msgstr ""
-"Dyma'r brif ffenestr sy'n dangos cynnwys yr ardal ddewisiedig.  Chwyddir y "
-"cynnwys os gosodir y lefel chwyddu."
-
 #: _translatorinfo.cpp:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
@@ -35,41 +27,15 @@ msgid ""
 "Your emails"
 msgstr "kyfieithu@dotmon.com"
 
-#: main.cpp:37
-msgid "File to open"
-msgstr "Ffeil i agor"
-
-#: kmagselrect.cpp:228 main.cpp:45
-msgid "KMagnifier"
-msgstr "KChwyddydd"
-
-#: main.cpp:46
-msgid "Screen magnifier for the Trinity Desktop Environment (TDE)"
-msgstr "Chwyddydd sgrîn ar gyfer yr Amgylchedd Penbwrdd K (TDE)"
-
-#: main.cpp:53
-msgid "Rewrite and current maintainer"
-msgstr "Ail-ysgrifennwr a chynhaliwr cyfredol"
-
-#: main.cpp:56
-msgid "Original idea and author (TDE1)"
-msgstr "Syniad gwreiddiol ac awdur (TDE1)"
-
-#: main.cpp:58
-msgid ""
-"Rework of the user interface, improved selection window, speed optimisation, "
-"rotation, bug fixes"
-msgstr ""
-
-#: main.cpp:59
-msgid "Some tips"
-msgstr "Rhai cynghorion"
-
 #: kmagselrect.cpp:228
 #, fuzzy
 msgid "Selection Window"
 msgstr "Ffe&nestr Dewisiad"
 
+#: kmagselrect.cpp:228 main.cpp:45
+msgid "KMagnifier"
+msgstr "KChwyddydd"
+
 #: kmag.cpp:92
 msgid "&Very Low"
 msgstr "&Isel Iawn"
@@ -421,6 +387,42 @@ msgstr ""
 msgid "Magnify to Bottom Screen Edge - Select Size"
 msgstr ""
 
+#: kmagzoomview.cpp:159
+#, fuzzy
+msgid ""
+"This is the main window which shows the contents of the selected region. The "
+"contents will be magnified according to the zoom level that is set."
+msgstr ""
+"Dyma'r brif ffenestr sy'n dangos cynnwys yr ardal ddewisiedig.  Chwyddir y "
+"cynnwys os gosodir y lefel chwyddu."
+
+#: main.cpp:37
+msgid "File to open"
+msgstr "Ffeil i agor"
+
+#: main.cpp:46
+msgid "Screen magnifier for the Trinity Desktop Environment (TDE)"
+msgstr "Chwyddydd sgrîn ar gyfer yr Amgylchedd Penbwrdd K (TDE)"
+
+#: main.cpp:53
+msgid "Rewrite and current maintainer"
+msgstr "Ail-ysgrifennwr a chynhaliwr cyfredol"
+
+#: main.cpp:56
+#, fuzzy
+msgid "Original idea and author (KDE1)"
+msgstr "Syniad gwreiddiol ac awdur (TDE1)"
+
+#: main.cpp:58
+msgid ""
+"Rework of the user interface, improved selection window, speed optimisation, "
+"rotation, bug fixes"
+msgstr ""
+
+#: main.cpp:59
+msgid "Some tips"
+msgstr "Rhai cynghorion"
+
 #, fuzzy
 #~ msgid "Magnify &whole screen into window"
 #~ msgstr "Chwyddu o amgylch y cyrchydd llygoden"
diff --git a/tde-i18n-cy/messages/tdeaccessibility/kmousetool.po b/tde-i18n-cy/messages/tdeaccessibility/kmousetool.po
index b2c4d8f8630..7048459ff1c 100644
--- a/tde-i18n-cy/messages/tdeaccessibility/kmousetool.po
+++ b/tde-i18n-cy/messages/tdeaccessibility/kmousetool.po
@@ -5,69 +5,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmousetool\n"
-"POT-Creation-Date: 2005-02-17 01:26+0100\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-01-08 17:55+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.2\n"
 
-#: kmousetool.cpp:418
-msgid "The drag time must be less than or equal to the dwell time."
-msgstr "Rhaid i'r amser llusgo fod yn llai na neu yn gyfartal i'r amser aros."
-
-#: kmousetool.cpp:418
-msgid "Invalid Value"
-msgstr "Gwerth Annilys"
-
-#: kmousetool.cpp:488 kmousetool.cpp:632
-msgid "&Stop"
-msgstr "&Aros"
-
-#: kmousetool.cpp:559
-#, fuzzy
-msgid ""
-"There are unsaved changes in the active module.\n"
-"Do you want to apply the changes before closing the configuration window or "
-"discard the changes?"
-msgstr ""
-"Mae newidiadau na gedwyd yn y modiwl gweithredol."
-"<br>Hoffech chi weithredu'r newidiadau cyn cau'r ffenestr ymgom, neu taflu'r "
-"newidiadau?"
-
-#: kmousetool.cpp:560
-msgid "Closing Configuration Window"
-msgstr "Cau'r Ffenestr Ffurfweddiad"
-
-#: kmousetool.cpp:578
-#, fuzzy
-msgid ""
-"There are unsaved changes in the active module.\n"
-"Do you want to apply the changes before quitting KMousetool or discard the "
-"changes?"
-msgstr ""
-"Mae newidiadau na gedwyd yn y modiwl gweithredol."
-"<br>Hoffech chi weithredu'r newidiadau cyn terfynu KErfynLlygoden, neu taflu'r "
-"newidiadau?"
-
-#: kmousetool.cpp:579
-msgid "Quitting KMousetool"
-msgstr "Terfynu KErfynLlygoden"
-
-#: kmousetool.cpp:616
-msgid "&Configure KMouseTool..."
-msgstr "&Ffurfweddu KErfynLlygoden..."
-
-#: kmousetool.cpp:619
-msgid "KMousetool &Handbook"
-msgstr "&Llawlyfr KErfynLlygoden"
-
-#: kmousetool.cpp:621
-msgid "&About KMouseTool"
-msgstr "&Ynglyn â KErfynLlygoden"
-
 #: _translatorinfo.cpp:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
@@ -86,18 +33,6 @@ msgstr "kyfieithu@dotmon.com"
 msgid "KMouseTool"
 msgstr "KErfynLlygoden"
 
-#: main.cpp:48
-msgid "Current maintainer"
-msgstr "Cynhaliwr cyfredol"
-
-#: main.cpp:49
-msgid "Usability improvements"
-msgstr "Gwelliannau defnyddioldeb"
-
-#: main.cpp:50
-msgid "Original author"
-msgstr "Awdur gwreiddiol"
-
 #. i18n: file kmousetoolui.ui line 44
 #: rc.cpp:6
 #, no-c-format
@@ -162,3 +97,69 @@ msgstr ""
 "Bydd KErfynLlygoden yn rhedeg fel cymhwysiad cefndir ar ôl i chi gau'r ymgom "
 "yma.  I newid y gosodiadau eto, ail-gychwyn KErfynLlygoden neu ddefnyddiwch y "
 "cafn cysawd TDE."
+
+#: kmousetool.cpp:418
+msgid "The drag time must be less than or equal to the dwell time."
+msgstr "Rhaid i'r amser llusgo fod yn llai na neu yn gyfartal i'r amser aros."
+
+#: kmousetool.cpp:418
+msgid "Invalid Value"
+msgstr "Gwerth Annilys"
+
+#: kmousetool.cpp:488 kmousetool.cpp:632
+msgid "&Stop"
+msgstr "&Aros"
+
+#: kmousetool.cpp:559
+#, fuzzy
+msgid ""
+"There are unsaved changes in the active module.\n"
+"Do you want to apply the changes before closing the configuration window or "
+"discard the changes?"
+msgstr ""
+"Mae newidiadau na gedwyd yn y modiwl gweithredol."
+"<br>Hoffech chi weithredu'r newidiadau cyn cau'r ffenestr ymgom, neu taflu'r "
+"newidiadau?"
+
+#: kmousetool.cpp:560
+msgid "Closing Configuration Window"
+msgstr "Cau'r Ffenestr Ffurfweddiad"
+
+#: kmousetool.cpp:578
+#, fuzzy
+msgid ""
+"There are unsaved changes in the active module.\n"
+"Do you want to apply the changes before quitting KMousetool or discard the "
+"changes?"
+msgstr ""
+"Mae newidiadau na gedwyd yn y modiwl gweithredol."
+"<br>Hoffech chi weithredu'r newidiadau cyn terfynu KErfynLlygoden, neu taflu'r "
+"newidiadau?"
+
+#: kmousetool.cpp:579
+msgid "Quitting KMousetool"
+msgstr "Terfynu KErfynLlygoden"
+
+#: kmousetool.cpp:616
+msgid "&Configure KMouseTool..."
+msgstr "&Ffurfweddu KErfynLlygoden..."
+
+#: kmousetool.cpp:619
+msgid "KMousetool &Handbook"
+msgstr "&Llawlyfr KErfynLlygoden"
+
+#: kmousetool.cpp:621
+msgid "&About KMouseTool"
+msgstr "&Ynglyn â KErfynLlygoden"
+
+#: main.cpp:48
+msgid "Current maintainer"
+msgstr "Cynhaliwr cyfredol"
+
+#: main.cpp:49
+msgid "Usability improvements"
+msgstr "Gwelliannau defnyddioldeb"
+
+#: main.cpp:50
+msgid "Original author"
+msgstr "Awdur gwreiddiol"
diff --git a/tde-i18n-cy/messages/tdeaccessibility/kmouth.po b/tde-i18n-cy/messages/tdeaccessibility/kmouth.po
index 44642d0b8a5..ed1b95fceaa 100644
--- a/tde-i18n-cy/messages/tdeaccessibility/kmouth.po
+++ b/tde-i18n-cy/messages/tdeaccessibility/kmouth.po
@@ -5,15 +5,127 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmouth\n"
-"POT-Creation-Date: 2005-07-24 01:41+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-01-08 18:01+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.2\n"
 
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "KD wrth KGyfieithu"
+
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "kyfieithu@dotmon.com"
+
+#: phraselist.cpp:56
+msgid ""
+"This list contains the history of spoken sentences. You can select sentences "
+"and press the speak button for re-speaking."
+msgstr ""
+"Cynhwysa'r rhestr yma hanes brawddegau a lefarwyd.  Gallwch dewis brawddegau a "
+"gwthio'r botwm llefaru ar gyfer ail-lefaru."
+
+#: phraselist.cpp:74
+msgid ""
+"Into this edit field you can type a phrase. Click on the speak button in order "
+"to speak the entered phrase."
+msgstr ""
+"Gallwch deipio ymadrodd i mewn i'r maes golygu yma.  Cliciwch ar y botwm "
+"llefaru er mwyn llefaru'r ymadrodd a fewnosodwyd."
+
+#: kmouth.cpp:127 kmouth.cpp:156 phraselist.cpp:79
+msgid "&Speak"
+msgstr "&Llafaru"
+
+#: kmouth.cpp:129 phraselist.cpp:82
+msgid ""
+"Speaks the currently active sentence(s). If there is some text in the edit "
+"field it is spoken. Otherwise the selected sentences in the history (if any) "
+"are spoken."
+msgstr ""
+"Llafaru'r frawddeg(au) sy'n weithredol yn gyfredol.  Os oes testun yn y maes "
+"golygu, llafarir.  Fel arall, llafarir y brawddegau penodol yn yr hanes (os oes "
+"rhai)."
+
+#: phrasebook/phrasebookdialog.cpp:744 phraselist.cpp:449
+#, c-format
+msgid ""
+"There was an error saving file\n"
+"%1"
+msgstr ""
+"Roedd gwall wrth gadw'r ffeil\n"
+"%1"
+
+#: phraselist.cpp:454
+msgid ""
+"*|All Files\n"
+"*.phrasebook|Phrase Books (*.phrasebook)\n"
+"*.txt|Plain Text Files (*.txt)"
+msgstr ""
+"*|Pob Ffeil\n"
+"*.phrasebook|Llyfrau Ymadroddion (*.phrasebook)\n"
+"*.txt|Ffeiliau Testun Plaen (*.txt)"
+
+#: phraselist.cpp:454
+msgid "Open File as History"
+msgstr "Agor Ffeil fel hanes"
+
+#: phrasebook/phrasebookdialog.cpp:734 phraselist.cpp:475
+#, c-format
+msgid ""
+"There was an error loading file\n"
+"%1"
+msgstr ""
+"Roedd gwall wrth lwytho'r ffeil\n"
+"%1"
+
+#: configwizard.cpp:37
+msgid "Initial Configuration - KMouth"
+msgstr "Ffurfweddiad Cychwynnol - KCeg"
+
+#: configwizard.cpp:57
+msgid "Text-to-Speech Configuration"
+msgstr "Ffurfweddiad Testun-i-Leferydd"
+
+#: configwizard.cpp:71
+msgid "Initial Phrase Book"
+msgstr "Llyfr Ymadroddion Cychwynnol"
+
+#: configwizard.cpp:103 optionsdialog.cpp:136
+msgid "Word Completion"
+msgstr "Cwblhad Geiriau"
+
+#: optionsdialog.cpp:123
+msgid "General Options"
+msgstr "Dewisiadau Cyffredinol"
+
+#: optionsdialog.cpp:129
+msgid "&Preferences"
+msgstr "&Hoffterau"
+
+#: optionsdialog.cpp:133
+msgid "&Text-to-Speech"
+msgstr "&Testun-i-Leferydd"
+
+#: optionsdialog.cpp:142
+msgid "KTTSD Speech Service"
+msgstr "Gwasanaeth Lleferydd KTTSD"
+
+#: optionsdialog.cpp:143
+#, fuzzy
+msgid "TDE Text-to-Speech Daemon Configuration"
+msgstr "Ffurfweddiad yr Ellyll Testun-i-Leferydd TDE"
+
 #: texttospeechconfigurationwidget.cpp:47
 #: wordcompletion/dictionarycreationwizard.cpp:101
 msgid "Local"
@@ -29,19 +141,196 @@ msgstr "Lladin1"
 msgid "Unicode"
 msgstr "Ungôd"
 
-#: wordcompletion/creationsourcedetailsui.ui.h:31
-#: wordcompletion/klanguagebuttonhelper.cpp:38
-#: wordcompletion/klanguagebuttonhelper.cpp:56
-#: wordcompletion/wordcompletionui.ui.h:31
-#: wordcompletion/wordcompletionwidget.cpp:78
-#: wordcompletion/wordcompletionwidget.cpp:139
-#: wordcompletion/wordcompletionwidget.cpp:203
-msgid "without name"
-msgstr "di-enw"
+#: phrasebook/phrasebookdialog.cpp:134
+msgid " (%1 of %2 books selected)"
+msgstr " (%1 o %2 o lyfrau wedi eu dewis)"
 
-#: wordcompletion/wordcompletionwidget.cpp:249
-msgid "Export Dictionary"
-msgstr "Allforio Geiriadur"
+#: phrasebook/phrasebookdialog.cpp:145
+msgid "Please decide which phrase books you need:"
+msgstr "Penderfynwch ar ba lyfrau ymadroddion sydd angen arnoch:"
+
+#: phrasebook/phrasebookdialog.cpp:153
+msgid "Book"
+msgstr "Llyfr"
+
+#: phrasebook/phrasebookdialog.cpp:242
+msgid ""
+"By clicking on this button you can select the keyboard shortcut associated with "
+"the selected phrase."
+msgstr ""
+
+#: phrasebook/phrasebookdialog.cpp:263
+msgid "Phrase Book"
+msgstr "Llyfr Ymadroddion"
+
+#: phrasebook/phrasebookdialog.cpp:300
+msgid "Phrase"
+msgstr "Ymadrodd"
+
+#: phrasebook/phrasebookdialog.cpp:301
+msgid "Shortcut"
+msgstr "Byrlwybr"
+
+#: phrasebook/phrasebookdialog.cpp:305
+msgid ""
+"This list contains the current phrase book in a tree structure. You can select "
+"and modify individual phrases and sub phrase books"
+msgstr ""
+
+#: phrasebook/phrasebookdialog.cpp:325
+msgid "&New Phrase"
+msgstr "Ymadrodd &Newydd"
+
+#: phrasebook/phrasebookdialog.cpp:326 phrasebook/phrasebookdialog.cpp:327
+msgid "Adds a new phrase"
+msgstr "Ychwnaegu ymadrodd newydd"
+
+#: phrasebook/phrasebookdialog.cpp:329
+msgid "New Phrase &Book"
+msgstr "Llyfr Y&madroddion Newydd"
+
+#: phrasebook/phrasebookdialog.cpp:330 phrasebook/phrasebookdialog.cpp:331
+msgid "Adds a new phrase book into which other books and phrases can be placed"
+msgstr ""
+"Ychwanegu llyfr ymadroddion newydd y ellir rhoi llyfrau eraill ac ymadroddion "
+"ynddo"
+
+#: phrasebook/phrasebookdialog.cpp:334 phrasebook/phrasebookdialog.cpp:335
+msgid "Saves the phrase book onto the hard disk"
+msgstr "Cadw'r llyfr ymadroddion i'r ddisg galed"
+
+#: phrasebook/phrasebookdialog.cpp:337 phrasebook/phrasebookdialog.cpp:341
+msgid "&Import..."
+msgstr "&Mewnforio..."
+
+#: phrasebook/phrasebookdialog.cpp:338 phrasebook/phrasebookdialog.cpp:339
+#: phrasebook/phrasebookdialog.cpp:342 phrasebook/phrasebookdialog.cpp:343
+msgid "Imports a file and adds its contents to the phrase book"
+msgstr "Mewnforio ffeil ac ychwanegu ei gynnwys i'r llyfr ymadroddion"
+
+#: phrasebook/phrasebookdialog.cpp:345
+msgid "I&mport Standard Phrase Book"
+msgstr "Me&wnforio Llyfr Ymadroddion Safonol"
+
+#: phrasebook/phrasebookdialog.cpp:346 phrasebook/phrasebookdialog.cpp:347
+msgid "Imports a standard phrase book and adds its contents to the phrase book"
+msgstr ""
+"Mewnforio llyfr ymadroddion safonol ac ychwanegu ei gynnwys i'r llyfr "
+"ymadroddion"
+
+#: phrasebook/phrasebookdialog.cpp:349
+msgid "&Export..."
+msgstr "&Allforio..."
+
+#: phrasebook/phrasebookdialog.cpp:350 phrasebook/phrasebookdialog.cpp:351
+msgid "Exports the currently selected phrase(s) or phrase book(s) into a file"
+msgstr ""
+"Allforio'r ymadrodd(ion) neu lyfr(au) ymadroddion dewisiedig cyfredol i ffeil"
+
+#: phrasebook/phrasebookdialog.cpp:354 phrasebook/phrasebookdialog.cpp:355
+msgid "Prints the currently selected phrase(s) or phrase book(s)"
+msgstr "Argraffu'r ymadrodd(ion) neu lyfr(au) ymadroddion dewisiedig cyfredol"
+
+#: phrasebook/phrasebookdialog.cpp:358 phrasebook/phrasebookdialog.cpp:359
+msgid "Closes the window"
+msgstr "Cau'r ffenestr"
+
+#: phrasebook/phrasebookdialog.cpp:363 phrasebook/phrasebookdialog.cpp:364
+msgid ""
+"Cuts the currently selected entries from the phrase book and puts it to the "
+"clipboard"
+msgstr ""
+"Torri'r cofnod dewisiedig cyfredol o'r llyfr ymadroddion, a'i roi ar y "
+"gludfwrdd"
+
+#: phrasebook/phrasebookdialog.cpp:367 phrasebook/phrasebookdialog.cpp:368
+msgid ""
+"Copies the currently selected entry from the phrase book to the clipboard"
+msgstr ""
+"Copïo'r cofnod dewisiedig cyfredol o'r llyfr ymadroddion, a'i roi ar y "
+"gludfwrdd"
+
+#: kmouth.cpp:124 phrasebook/phrasebookdialog.cpp:371
+#: phrasebook/phrasebookdialog.cpp:372
+msgid "Pastes the clipboard contents to actual position"
+msgstr "Gludo cynnwys y gludfwrdd i'r fan wirioneddol"
+
+#: phrasebook/phrasebookdialog.cpp:375 phrasebook/phrasebookdialog.cpp:376
+msgid "Deletes the selected entries from the phrase book"
+msgstr "Dileu'r cofnodion dewisiedig cyfredol o'r llyfr ymadroddion"
+
+#. i18n: file phrasebook/buttonboxui.ui line 93
+#: phrasebook/phrasebookdialog.cpp:491 phrasebook/phrasebookdialog.cpp:505
+#: rc.cpp:205
+#, no-c-format
+msgid "Text of the &phrase:"
+msgstr "&Testun yr ymadrodd:"
+
+#: phrasebook/phrasebookdialog.cpp:526
+msgid "Name of the &phrase book:"
+msgstr "Enw'r &llyfr ymadroddion:"
+
+#: phrasebook/phrasebookdialog.cpp:545
+msgid ""
+"<qt>There are unsaved changes."
+"<br>Do you want to apply the changes before closing the \"phrase book\" window "
+"or discard the changes?</qt>"
+msgstr ""
+"<qt>Mae newidiadau na'u newidwyd. "
+"<br>Hoffech chi weithredu'r newidiadau cyn cau'r ffenestr \"llyfr "
+"ymadroddion\", neu dafu'r newidiadau?</qt>"
+
+#: phrasebook/phrasebookdialog.cpp:546
+msgid "Closing \"Phrase Book\" Window"
+msgstr "Cau'r Ffenestr \"Llyfr Ymadroddion\""
+
+#: phrasebook/phrasebookdialog.cpp:598
+msgid ""
+"In order to use the '%1' key as a shortcut, it must be combined with the Win, "
+"Alt, Ctrl, and/or Shift keys."
+msgstr ""
+"Er mwyn defnyddio'r bysell '%1' fel byrlwybr, rhaid ei chyfuno â'r bysyll Win, "
+"Alt, Ctrl a/neu Shift."
+
+#: phrasebook/phrasebookdialog.cpp:601
+msgid "Invalid Shortcut Key"
+msgstr "Bysell Fyrlwybr Annilys"
+
+#: phrasebook/phrasebookdialog.cpp:695
+msgid "(New Phrase Book)"
+msgstr "(Llyfr ymadroddion newydd)"
+
+#: phrasebook/phrasebookdialog.cpp:706
+msgid "(New Phrase)"
+msgstr "(Ymadrodd newydd)"
+
+#: phrasebook/phrasebook.cpp:258 phrasebook/phrasebookdialog.cpp:723
+msgid ""
+"*.phrasebook|Phrase Books (*.phrasebook)\n"
+"*.txt|Plain Text Files (*.txt)\n"
+"*|All Files"
+msgstr ""
+"*.phrasebook|Llyfrau Ymadroddion (*.phrasebook)\n"
+"*.txt|Ffeiliau Testun Plaen (*.txt)\n"
+"*|Pob Ffeil"
+
+#: phrasebook/phrasebookdialog.cpp:723
+msgid "Import Phrasebook"
+msgstr "Mewnforio Llyfr Ymadrodd"
+
+#: phrasebook/phrasebookdialog.cpp:743
+msgid "Export Phrase Book"
+msgstr "Allforion Llyfr Ymadroddion"
+
+#: phrasebook/phrasebook.cpp:260
+msgid ""
+"*.txt|Plain Text Files (*.txt)\n"
+"*.phrasebook|Phrase Books (*.phrasebook)\n"
+"*|All Files"
+msgstr ""
+"*.txt|Ffeiliau Testun Plaen (*.txt)\n"
+"*.phrasebook|Llyfrau Ymadroddion (*.phrasebook)\n"
+"*|Pob Ffeil"
 
 #: phrasebook/phrasebook.cpp:277 wordcompletion/wordcompletionwidget.cpp:254
 msgid "The file %1 already exists. Do you want to overwrite it?"
@@ -55,44 +344,76 @@ msgstr "Ffeil yn Bodoli"
 msgid "&Overwrite"
 msgstr "&Trosysgrifo"
 
-#: wordcompletion/wordlist.cpp:109
-msgid "Creating Word List"
-msgstr "Creu Rhestr Geiriau"
+#: phrasebook/phrasebook.cpp:289
+msgid ""
+"Your chosen filename <i>%1</i> has a different extension than <i>.phrasebook</i>"
+". Do you wish to add <i>.phrasebook</i> to the filename?"
+msgstr ""
+"Mae gan eich enw dewisiedig<i>%1</i> estyniad gwahanol i <i>.phrasebook</i>"
+".  Hoffech chi ychwanegu <i>.phrasebook</i> i enw'r ffeil?"
 
-#: wordcompletion/wordlist.cpp:109 wordcompletion/wordlist.cpp:291
-msgid "Parsing the TDE documentation..."
-msgstr "Dosrannu dogfennaeth TDE..."
+#: phrasebook/phrasebook.cpp:290 phrasebook/phrasebook.cpp:306
+msgid "File Extension"
+msgstr "Estyniad Ffeil"
 
-#: wordcompletion/wordlist.cpp:238
-msgid "Merging dictionaries..."
-msgstr "Cyfuno geiriaduron..."
+#: phrasebook/phrasebook.cpp:290
+msgid "Do Not Add"
+msgstr "Na Ychwaneger"
 
-#: wordcompletion/wordlist.cpp:305
-msgid "Parsing file..."
-msgstr "Dosrannu ffeil..."
+#: phrasebook/phrasebook.cpp:305
+#, fuzzy
+msgid ""
+"Your chosen filename <i>%1</i> has the extension <i>.phrasebook</i>"
+". Do you wish to save in phrasebook format?"
+msgstr ""
+"Mae gan eich enw dewisiedig<i>%1</i> yr estyniad <i>.phrasebook</i>"
+".  Hoffech chi gadw yn fformat llyfr ymadroddion?"
 
-#: wordcompletion/wordlist.cpp:315
-msgid "Parsing directory..."
-msgstr "Dosrannu cyfeiriadur..."
+#: phrasebook/phrasebook.cpp:306
+msgid "As Phrasebook"
+msgstr "Fel Llyfr Ymadroddion"
 
-#: wordcompletion/wordlist.cpp:504
-msgid "Performing spell check..."
-msgstr "Cywiro sillafu..."
+#: phrasebook/phrasebook.cpp:306
+msgid "As Plain Text"
+msgstr "Fel Testun Plaen"
 
-#. i18n: file wordcompletion/kdedocsourceui.ui line 68
-#: rc.cpp:292 wordcompletion/kdedocsourceui.ui.h:14
-#, no-c-format
+#: phrasebook/phrasetree.cpp:470
 msgid ""
-"With this combo box you select which of the installed languages is used for "
-"creating the new dictionary. KMouth will only parse documentation files of this "
-"language."
+"The '%1' key combination has already been allocated to %2.\n"
+"Please choose a unique key combination."
 msgstr ""
+"Neilltuwyd y cyfuniad bysyll '%1' i %2.\n"
+"Dewiswch cyfuniad bysyll unigryw."
 
-#. i18n: file wordcompletion/creationsourcedetailsui.ui line 144
-#: rc.cpp:241 wordcompletion/creationsourcedetailsui.ui.h:15
+#: phrasebook/phrasetree.cpp:488
+msgid "the standard \"%1\" action"
+msgstr "y weithred \"%1\" safonol"
+
+#: phrasebook/phrasetree.cpp:489
+msgid "Conflict with Standard Application Shortcut"
+msgstr "Gwrthdrawiad efo Byrlwybr Cymhwysiad Safonol"
+
+#: phrasebook/phrasetree.cpp:504
+msgid "the global \"%1\" action"
+msgstr "y weithred \"%1\" eang"
+
+#: phrasebook/phrasetree.cpp:505
+msgid "Conflict with Global Shortcuts"
+msgstr "Gwrthdrawiad efo Byrlwybrau Eang"
+
+#: phrasebook/phrasetree.cpp:520
+msgid "an other phrase"
+msgstr "ymadrodd arall"
+
+#: phrasebook/phrasetree.cpp:521
+msgid "Key Conflict"
+msgstr "Gwrthdrawiad Bysell"
+
+#. i18n: file wordcompletion/wordcompletionui.ui line 224
+#: rc.cpp:340 wordcompletion/wordcompletionui.ui.h:15
 #, no-c-format
 msgid ""
-"With this combo box you decide which language should be associated with the new "
+"With this combo box you select the language associated with the selected "
 "dictionary."
 msgstr ""
 
@@ -111,6 +432,16 @@ msgstr ""
 msgid "Please enter the code for the custom language:"
 msgstr ""
 
+#: wordcompletion/creationsourcedetailsui.ui.h:31
+#: wordcompletion/klanguagebuttonhelper.cpp:38
+#: wordcompletion/klanguagebuttonhelper.cpp:56
+#: wordcompletion/wordcompletionui.ui.h:31
+#: wordcompletion/wordcompletionwidget.cpp:78
+#: wordcompletion/wordcompletionwidget.cpp:139
+#: wordcompletion/wordcompletionwidget.cpp:203
+msgid "without name"
+msgstr "di-enw"
+
 #: wordcompletion/dictionarycreationwizard.cpp:53
 msgid "Source of New Dictionary (1)"
 msgstr "Tarddiad y Geiriadur Newydd (1)"
@@ -151,38 +482,50 @@ msgstr ""
 msgid "TDE Documentation"
 msgstr "Dogfennaeth TDE"
 
-#. i18n: file wordcompletion/wordcompletionui.ui line 224
-#: rc.cpp:340 wordcompletion/wordcompletionui.ui.h:15
-#, no-c-format
-msgid ""
-"With this combo box you select the language associated with the selected "
-"dictionary."
-msgstr ""
+#: wordcompletion/wordlist.cpp:109
+msgid "Creating Word List"
+msgstr "Creu Rhestr Geiriau"
 
-#: optionsdialog.cpp:123
-msgid "General Options"
-msgstr "Dewisiadau Cyffredinol"
+#: wordcompletion/wordlist.cpp:109 wordcompletion/wordlist.cpp:291
+msgid "Parsing the TDE documentation..."
+msgstr "Dosrannu dogfennaeth TDE..."
 
-#: optionsdialog.cpp:129
-msgid "&Preferences"
-msgstr "&Hoffterau"
+#: wordcompletion/wordlist.cpp:238
+msgid "Merging dictionaries..."
+msgstr "Cyfuno geiriaduron..."
 
-#: optionsdialog.cpp:133
-msgid "&Text-to-Speech"
-msgstr "&Testun-i-Leferydd"
+#: wordcompletion/wordlist.cpp:305
+msgid "Parsing file..."
+msgstr "Dosrannu ffeil..."
 
-#: configwizard.cpp:103 optionsdialog.cpp:136
-msgid "Word Completion"
-msgstr "Cwblhad Geiriau"
+#: wordcompletion/wordlist.cpp:315
+msgid "Parsing directory..."
+msgstr "Dosrannu cyfeiriadur..."
 
-#: optionsdialog.cpp:142
-msgid "KTTSD Speech Service"
-msgstr "Gwasanaeth Lleferydd KTTSD"
+#: wordcompletion/wordlist.cpp:504
+msgid "Performing spell check..."
+msgstr "Cywiro sillafu..."
 
-#: optionsdialog.cpp:143
-#, fuzzy
-msgid "TDE Text-to-Speech Daemon Configuration"
-msgstr "Ffurfweddiad yr Ellyll Testun-i-Leferydd TDE"
+#. i18n: file wordcompletion/kdedocsourceui.ui line 68
+#: rc.cpp:292 wordcompletion/kdedocsourceui.ui.h:14
+#, no-c-format
+msgid ""
+"With this combo box you select which of the installed languages is used for "
+"creating the new dictionary. KMouth will only parse documentation files of this "
+"language."
+msgstr ""
+
+#. i18n: file wordcompletion/creationsourcedetailsui.ui line 144
+#: rc.cpp:241 wordcompletion/creationsourcedetailsui.ui.h:15
+#, no-c-format
+msgid ""
+"With this combo box you decide which language should be associated with the new "
+"dictionary."
+msgstr ""
+
+#: wordcompletion/wordcompletionwidget.cpp:249
+msgid "Export Dictionary"
+msgstr "Allforio Geiriadur"
 
 #: kmouth.cpp:98
 msgid "&Open as History..."
@@ -240,11 +583,6 @@ msgstr ""
 "golygu, copïir i'r gludfwrdd.  Fel arall, rhoddir y brawddegau dewisiedig (os "
 "oes rhai) copïir i'r gludfwrdd."
 
-#: kmouth.cpp:124 phrasebook/phrasebookdialog.cpp:371
-#: phrasebook/phrasebookdialog.cpp:372
-msgid "Pastes the clipboard contents to actual position"
-msgstr "Gludo cynnwys y gludfwrdd i'r fan wirioneddol"
-
 #: kmouth.cpp:125
 msgid ""
 "Pastes the clipboard contents at the current cursor position into the edit "
@@ -252,24 +590,10 @@ msgid ""
 msgstr ""
 "Gludo cynnwys y gludfwrdd wrth leoliad cyfredol y chyrchydd yn y maes golygu."
 
-#: kmouth.cpp:127 kmouth.cpp:156 phraselist.cpp:79
-msgid "&Speak"
-msgstr "&Llafaru"
-
 #: kmouth.cpp:128
 msgid "Speaks the currently active sentence(s)"
 msgstr "Llafaru'r frawddeg(au) sy'n weithredol yn gyfredol."
 
-#: kmouth.cpp:129 phraselist.cpp:82
-msgid ""
-"Speaks the currently active sentence(s). If there is some text in the edit "
-"field it is spoken. Otherwise the selected sentences in the history (if any) "
-"are spoken."
-msgstr ""
-"Llafaru'r frawddeg(au) sy'n weithredol yn gyfredol.  Os oes testun yn y maes "
-"golygu, llafarir.  Fel arall, llafarir y brawddegau penodol yn yr hanes (os oes "
-"rhai)."
-
 #: kmouth.cpp:132
 msgid "&Edit..."
 msgstr "&Golygu..."
@@ -381,34 +705,6 @@ msgstr "Dangos/cuddio'r bar offer..."
 msgid "Toggle the statusbar..."
 msgstr "Dangos/cuddio'r bar cyflwr..."
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "KD wrth KGyfieithu"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "kyfieithu@dotmon.com"
-
-#: main.cpp:28
-msgid "A type-and-say front end for speech synthesizers"
-msgstr "Blaen-wyneb teipio-a-dweud ar gyfer syntheseiddyddion lleferydd"
-
-#: main.cpp:34
-msgid "History file to open"
-msgstr "Ffeil hanes i'w agor"
-
-#: main.cpp:42
-msgid "KMouth"
-msgstr "KCeg"
-
-#: main.cpp:49
-msgid "Tips, extended phrase books"
-msgstr "Cynhgorion, llyfrau ymadroddion estynedig"
-
 #. i18n: file kmouthui.rc line 14
 #: rc.cpp:9 rc.cpp:98
 #, no-c-format
@@ -612,13 +908,6 @@ msgstr ""
 msgid "Shortcut for the phrase:"
 msgstr "Byrlwybr ar gyfer yr ymadrodd:"
 
-#. i18n: file phrasebook/buttonboxui.ui line 93
-#: phrasebook/phrasebookdialog.cpp:491 phrasebook/phrasebookdialog.cpp:505
-#: rc.cpp:205
-#, no-c-format
-msgid "Text of the &phrase:"
-msgstr "&Testun yr ymadrodd:"
-
 #. i18n: file wordcompletion/creationsourcedetailsui.ui line 24
 #: rc.cpp:211 rc.cpp:280
 #, no-c-format
@@ -868,309 +1157,21 @@ msgstr "&Enw:"
 msgid "With this input field you specify the name of the selected dictionary."
 msgstr ""
 
-#: phrasebook/phrasebookdialog.cpp:134
-msgid " (%1 of %2 books selected)"
-msgstr " (%1 o %2 o lyfrau wedi eu dewis)"
-
-#: phrasebook/phrasebookdialog.cpp:145
-msgid "Please decide which phrase books you need:"
-msgstr "Penderfynwch ar ba lyfrau ymadroddion sydd angen arnoch:"
-
-#: phrasebook/phrasebookdialog.cpp:153
-msgid "Book"
-msgstr "Llyfr"
-
-#: phrasebook/phrasebookdialog.cpp:242
-msgid ""
-"By clicking on this button you can select the keyboard shortcut associated with "
-"the selected phrase."
-msgstr ""
-
-#: phrasebook/phrasebookdialog.cpp:263
-msgid "Phrase Book"
-msgstr "Llyfr Ymadroddion"
-
-#: phrasebook/phrasebookdialog.cpp:300
-msgid "Phrase"
-msgstr "Ymadrodd"
-
-#: phrasebook/phrasebookdialog.cpp:301
-msgid "Shortcut"
-msgstr "Byrlwybr"
-
-#: phrasebook/phrasebookdialog.cpp:305
-msgid ""
-"This list contains the current phrase book in a tree structure. You can select "
-"and modify individual phrases and sub phrase books"
-msgstr ""
-
-#: phrasebook/phrasebookdialog.cpp:325
-msgid "&New Phrase"
-msgstr "Ymadrodd &Newydd"
-
-#: phrasebook/phrasebookdialog.cpp:326 phrasebook/phrasebookdialog.cpp:327
-msgid "Adds a new phrase"
-msgstr "Ychwnaegu ymadrodd newydd"
-
-#: phrasebook/phrasebookdialog.cpp:329
-msgid "New Phrase &Book"
-msgstr "Llyfr Y&madroddion Newydd"
-
-#: phrasebook/phrasebookdialog.cpp:330 phrasebook/phrasebookdialog.cpp:331
-msgid "Adds a new phrase book into which other books and phrases can be placed"
-msgstr ""
-"Ychwanegu llyfr ymadroddion newydd y ellir rhoi llyfrau eraill ac ymadroddion "
-"ynddo"
-
-#: phrasebook/phrasebookdialog.cpp:334 phrasebook/phrasebookdialog.cpp:335
-msgid "Saves the phrase book onto the hard disk"
-msgstr "Cadw'r llyfr ymadroddion i'r ddisg galed"
-
-#: phrasebook/phrasebookdialog.cpp:337 phrasebook/phrasebookdialog.cpp:341
-msgid "&Import..."
-msgstr "&Mewnforio..."
-
-#: phrasebook/phrasebookdialog.cpp:338 phrasebook/phrasebookdialog.cpp:339
-#: phrasebook/phrasebookdialog.cpp:342 phrasebook/phrasebookdialog.cpp:343
-msgid "Imports a file and adds its contents to the phrase book"
-msgstr "Mewnforio ffeil ac ychwanegu ei gynnwys i'r llyfr ymadroddion"
-
-#: phrasebook/phrasebookdialog.cpp:345
-msgid "I&mport Standard Phrase Book"
-msgstr "Me&wnforio Llyfr Ymadroddion Safonol"
-
-#: phrasebook/phrasebookdialog.cpp:346 phrasebook/phrasebookdialog.cpp:347
-msgid "Imports a standard phrase book and adds its contents to the phrase book"
-msgstr ""
-"Mewnforio llyfr ymadroddion safonol ac ychwanegu ei gynnwys i'r llyfr "
-"ymadroddion"
-
-#: phrasebook/phrasebookdialog.cpp:349
-msgid "&Export..."
-msgstr "&Allforio..."
-
-#: phrasebook/phrasebookdialog.cpp:350 phrasebook/phrasebookdialog.cpp:351
-msgid "Exports the currently selected phrase(s) or phrase book(s) into a file"
-msgstr ""
-"Allforio'r ymadrodd(ion) neu lyfr(au) ymadroddion dewisiedig cyfredol i ffeil"
-
-#: phrasebook/phrasebookdialog.cpp:354 phrasebook/phrasebookdialog.cpp:355
-msgid "Prints the currently selected phrase(s) or phrase book(s)"
-msgstr "Argraffu'r ymadrodd(ion) neu lyfr(au) ymadroddion dewisiedig cyfredol"
-
-#: phrasebook/phrasebookdialog.cpp:358 phrasebook/phrasebookdialog.cpp:359
-msgid "Closes the window"
-msgstr "Cau'r ffenestr"
-
-#: phrasebook/phrasebookdialog.cpp:363 phrasebook/phrasebookdialog.cpp:364
-msgid ""
-"Cuts the currently selected entries from the phrase book and puts it to the "
-"clipboard"
-msgstr ""
-"Torri'r cofnod dewisiedig cyfredol o'r llyfr ymadroddion, a'i roi ar y "
-"gludfwrdd"
-
-#: phrasebook/phrasebookdialog.cpp:367 phrasebook/phrasebookdialog.cpp:368
-msgid ""
-"Copies the currently selected entry from the phrase book to the clipboard"
-msgstr ""
-"Copïo'r cofnod dewisiedig cyfredol o'r llyfr ymadroddion, a'i roi ar y "
-"gludfwrdd"
-
-#: phrasebook/phrasebookdialog.cpp:375 phrasebook/phrasebookdialog.cpp:376
-msgid "Deletes the selected entries from the phrase book"
-msgstr "Dileu'r cofnodion dewisiedig cyfredol o'r llyfr ymadroddion"
-
-#: phrasebook/phrasebookdialog.cpp:526
-msgid "Name of the &phrase book:"
-msgstr "Enw'r &llyfr ymadroddion:"
-
-#: phrasebook/phrasebookdialog.cpp:545
-msgid ""
-"<qt>There are unsaved changes."
-"<br>Do you want to apply the changes before closing the \"phrase book\" window "
-"or discard the changes?</qt>"
-msgstr ""
-"<qt>Mae newidiadau na'u newidwyd. "
-"<br>Hoffech chi weithredu'r newidiadau cyn cau'r ffenestr \"llyfr "
-"ymadroddion\", neu dafu'r newidiadau?</qt>"
-
-#: phrasebook/phrasebookdialog.cpp:546
-msgid "Closing \"Phrase Book\" Window"
-msgstr "Cau'r Ffenestr \"Llyfr Ymadroddion\""
-
-#: phrasebook/phrasebookdialog.cpp:598
-msgid ""
-"In order to use the '%1' key as a shortcut, it must be combined with the Win, "
-"Alt, Ctrl, and/or Shift keys."
-msgstr ""
-"Er mwyn defnyddio'r bysell '%1' fel byrlwybr, rhaid ei chyfuno â'r bysyll Win, "
-"Alt, Ctrl a/neu Shift."
-
-#: phrasebook/phrasebookdialog.cpp:601
-msgid "Invalid Shortcut Key"
-msgstr "Bysell Fyrlwybr Annilys"
-
-#: phrasebook/phrasebookdialog.cpp:695
-msgid "(New Phrase Book)"
-msgstr "(Llyfr ymadroddion newydd)"
-
-#: phrasebook/phrasebookdialog.cpp:706
-msgid "(New Phrase)"
-msgstr "(Ymadrodd newydd)"
-
-#: phrasebook/phrasebook.cpp:258 phrasebook/phrasebookdialog.cpp:723
-msgid ""
-"*.phrasebook|Phrase Books (*.phrasebook)\n"
-"*.txt|Plain Text Files (*.txt)\n"
-"*|All Files"
-msgstr ""
-"*.phrasebook|Llyfrau Ymadroddion (*.phrasebook)\n"
-"*.txt|Ffeiliau Testun Plaen (*.txt)\n"
-"*|Pob Ffeil"
-
-#: phrasebook/phrasebookdialog.cpp:723
-msgid "Import Phrasebook"
-msgstr "Mewnforio Llyfr Ymadrodd"
-
-#: phrasebook/phrasebookdialog.cpp:734 phraselist.cpp:475
-#, c-format
-msgid ""
-"There was an error loading file\n"
-"%1"
-msgstr ""
-"Roedd gwall wrth lwytho'r ffeil\n"
-"%1"
-
-#: phrasebook/phrasebookdialog.cpp:743
-msgid "Export Phrase Book"
-msgstr "Allforion Llyfr Ymadroddion"
-
-#: phrasebook/phrasebookdialog.cpp:744 phraselist.cpp:449
-#, c-format
-msgid ""
-"There was an error saving file\n"
-"%1"
-msgstr ""
-"Roedd gwall wrth gadw'r ffeil\n"
-"%1"
-
-#: phrasebook/phrasebook.cpp:260
-msgid ""
-"*.txt|Plain Text Files (*.txt)\n"
-"*.phrasebook|Phrase Books (*.phrasebook)\n"
-"*|All Files"
-msgstr ""
-"*.txt|Ffeiliau Testun Plaen (*.txt)\n"
-"*.phrasebook|Llyfrau Ymadroddion (*.phrasebook)\n"
-"*|Pob Ffeil"
-
-#: phrasebook/phrasebook.cpp:289
-msgid ""
-"Your chosen filename <i>%1</i> has a different extension than <i>.phrasebook</i>"
-". Do you wish to add <i>.phrasebook</i> to the filename?"
-msgstr ""
-"Mae gan eich enw dewisiedig<i>%1</i> estyniad gwahanol i <i>.phrasebook</i>"
-".  Hoffech chi ychwanegu <i>.phrasebook</i> i enw'r ffeil?"
-
-#: phrasebook/phrasebook.cpp:290 phrasebook/phrasebook.cpp:306
-msgid "File Extension"
-msgstr "Estyniad Ffeil"
-
-#: phrasebook/phrasebook.cpp:290
-msgid "Do Not Add"
-msgstr "Na Ychwaneger"
-
-#: phrasebook/phrasebook.cpp:305
-#, fuzzy
-msgid ""
-"Your chosen filename <i>%1</i> has the extension <i>.phrasebook</i>"
-". Do you wish to save in phrasebook format?"
-msgstr ""
-"Mae gan eich enw dewisiedig<i>%1</i> yr estyniad <i>.phrasebook</i>"
-".  Hoffech chi gadw yn fformat llyfr ymadroddion?"
-
-#: phrasebook/phrasebook.cpp:306
-msgid "As Phrasebook"
-msgstr "Fel Llyfr Ymadroddion"
-
-#: phrasebook/phrasebook.cpp:306
-msgid "As Plain Text"
-msgstr "Fel Testun Plaen"
-
-#: phrasebook/phrasetree.cpp:470
-msgid ""
-"The '%1' key combination has already been allocated to %2.\n"
-"Please choose a unique key combination."
-msgstr ""
-"Neilltuwyd y cyfuniad bysyll '%1' i %2.\n"
-"Dewiswch cyfuniad bysyll unigryw."
-
-#: phrasebook/phrasetree.cpp:488
-msgid "the standard \"%1\" action"
-msgstr "y weithred \"%1\" safonol"
-
-#: phrasebook/phrasetree.cpp:489
-msgid "Conflict with Standard Application Shortcut"
-msgstr "Gwrthdrawiad efo Byrlwybr Cymhwysiad Safonol"
-
-#: phrasebook/phrasetree.cpp:504
-msgid "the global \"%1\" action"
-msgstr "y weithred \"%1\" eang"
-
-#: phrasebook/phrasetree.cpp:505
-msgid "Conflict with Global Shortcuts"
-msgstr "Gwrthdrawiad efo Byrlwybrau Eang"
-
-#: phrasebook/phrasetree.cpp:520
-msgid "an other phrase"
-msgstr "ymadrodd arall"
-
-#: phrasebook/phrasetree.cpp:521
-msgid "Key Conflict"
-msgstr "Gwrthdrawiad Bysell"
-
-#: configwizard.cpp:37
-msgid "Initial Configuration - KMouth"
-msgstr "Ffurfweddiad Cychwynnol - KCeg"
-
-#: configwizard.cpp:57
-msgid "Text-to-Speech Configuration"
-msgstr "Ffurfweddiad Testun-i-Leferydd"
-
-#: configwizard.cpp:71
-msgid "Initial Phrase Book"
-msgstr "Llyfr Ymadroddion Cychwynnol"
-
-#: phraselist.cpp:56
-msgid ""
-"This list contains the history of spoken sentences. You can select sentences "
-"and press the speak button for re-speaking."
-msgstr ""
-"Cynhwysa'r rhestr yma hanes brawddegau a lefarwyd.  Gallwch dewis brawddegau a "
-"gwthio'r botwm llefaru ar gyfer ail-lefaru."
+#: main.cpp:28
+msgid "A type-and-say front end for speech synthesizers"
+msgstr "Blaen-wyneb teipio-a-dweud ar gyfer syntheseiddyddion lleferydd"
 
-#: phraselist.cpp:74
-msgid ""
-"Into this edit field you can type a phrase. Click on the speak button in order "
-"to speak the entered phrase."
-msgstr ""
-"Gallwch deipio ymadrodd i mewn i'r maes golygu yma.  Cliciwch ar y botwm "
-"llefaru er mwyn llefaru'r ymadrodd a fewnosodwyd."
+#: main.cpp:34
+msgid "History file to open"
+msgstr "Ffeil hanes i'w agor"
 
-#: phraselist.cpp:454
-msgid ""
-"*|All Files\n"
-"*.phrasebook|Phrase Books (*.phrasebook)\n"
-"*.txt|Plain Text Files (*.txt)"
-msgstr ""
-"*|Pob Ffeil\n"
-"*.phrasebook|Llyfrau Ymadroddion (*.phrasebook)\n"
-"*.txt|Ffeiliau Testun Plaen (*.txt)"
+#: main.cpp:42
+msgid "KMouth"
+msgstr "KCeg"
 
-#: phraselist.cpp:454
-msgid "Open File as History"
-msgstr "Agor Ffeil fel hanes"
+#: main.cpp:49
+msgid "Tips, extended phrase books"
+msgstr "Cynhgorion, llyfrau ymadroddion estynedig"
 
 #~ msgid "(New phrase book)"
 #~ msgstr "(Llyfr ymadroddion newydd)"
diff --git a/tde-i18n-cy/messages/tdeaccessibility/ksayit.po b/tde-i18n-cy/messages/tdeaccessibility/ksayit.po
index 7b1a3898b80..67b334a0671 100644
--- a/tde-i18n-cy/messages/tdeaccessibility/ksayit.po
+++ b/tde-i18n-cy/messages/tdeaccessibility/ksayit.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: all2.po\n"
-"POT-Creation-Date: 2008-07-08 01:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeaccessibility/kttsd.po b/tde-i18n-cy/messages/tdeaccessibility/kttsd.po
index 197f96423ea..0f072a9e5b4 100644
--- a/tde-i18n-cy/messages/tdeaccessibility/kttsd.po
+++ b/tde-i18n-cy/messages/tdeaccessibility/kttsd.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: all2.po\n"
-"POT-Creation-Date: 2008-07-08 01:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -765,7 +766,7 @@ msgstr "Digwyddiadau"
 #. i18n: file libkttsd/selecttalkerwidget.ui line 25
 #: filters/talkerchooser/talkerchooserconf.cpp:225
 #: kcmkttsmgr/kcmkttsmgr.cpp:2501 kttsjobmgr/kttsjobmgr.cpp:496
-#: libkttsd/selecttalkerdlg.h:60 rc.cpp:405
+#: libkttsd/selecttalkerdlg.h:61 rc.cpp:405
 #, no-c-format
 msgid "Select Talker"
 msgstr ""
diff --git a/tde-i18n-cy/messages/tdeaccessibility/libKTTSD.po b/tde-i18n-cy/messages/tdeaccessibility/libKTTSD.po
index 0c8cc5017f2..e7bae86fb67 100644
--- a/tde-i18n-cy/messages/tdeaccessibility/libKTTSD.po
+++ b/tde-i18n-cy/messages/tdeaccessibility/libKTTSD.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: all2.po\n"
-"POT-Creation-Date: 2005-05-08 01:29+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeaddons/akregator_konqplugin.po b/tde-i18n-cy/messages/tdeaddons/akregator_konqplugin.po
index a4548036980..5f3b72389f9 100644
--- a/tde-i18n-cy/messages/tdeaddons/akregator_konqplugin.po
+++ b/tde-i18n-cy/messages/tdeaddons/akregator_konqplugin.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: all2.po\n"
-"POT-Creation-Date: 2006-11-11 02:39+0100\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeaddons/alsaplayerui.po b/tde-i18n-cy/messages/tdeaddons/alsaplayerui.po
index d6d33bd72c7..c458d7a517d 100644
--- a/tde-i18n-cy/messages/tdeaddons/alsaplayerui.po
+++ b/tde-i18n-cy/messages/tdeaddons/alsaplayerui.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: alsaplayerui\n"
-"POT-Creation-Date: 2008-07-08 01:23+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-02-19 20:20+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeaddons/ark_plugin.po b/tde-i18n-cy/messages/tdeaddons/ark_plugin.po
index 5822221fbc5..a1082ba48f4 100644
--- a/tde-i18n-cy/messages/tdeaddons/ark_plugin.po
+++ b/tde-i18n-cy/messages/tdeaddons/ark_plugin.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdeaddons/ark_plugin.po\n"
-"POT-Creation-Date: 2006-10-17 02:38+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -51,11 +52,11 @@ msgstr ""
 msgid "Extract To..."
 msgstr "Alldynnu I..."
 
-#: arkplugin.cpp:435 arkplugin.cpp:479
+#: arkplugin.cpp:472 arkplugin.cpp:516
 msgid "Archive"
 msgstr "Archif"
 
-#: arkplugin.cpp:439 arkplugin.cpp:483
+#: arkplugin.cpp:476 arkplugin.cpp:520
 #, c-format
 msgid "Archive %1"
 msgstr "Archif %1"
diff --git a/tde-i18n-cy/messages/tdeaddons/atlantikdesigner.po b/tde-i18n-cy/messages/tdeaddons/atlantikdesigner.po
index ec91349e0be..bfb31b24026 100644
--- a/tde-i18n-cy/messages/tdeaddons/atlantikdesigner.po
+++ b/tde-i18n-cy/messages/tdeaddons/atlantikdesigner.po
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdeaddons/atlantikdesigner.po\n"
-"POT-Creation-Date: 2004-12-29 14:56+0100\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-02-04 10:24+0200\n"
 "Last-Translator: www.kyfieithu.co.uk <kyfieithu@dotmon.com>"
 ", www.gyfieithu.co.uk<kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
@@ -29,95 +30,6 @@ msgid ""
 "Your emails"
 msgstr "kyfieithu@dotmon.com"
 
-#: designer/main.cpp:12
-msgid "Atlantik Designer"
-msgstr "Dylunydd Atlantik"
-
-#: designer/main.cpp:13
-msgid "Atlantik gameboard designer"
-msgstr "Dylunydd bwrdd chwarae Atlantik"
-
-#: designer/main.cpp:15
-msgid "(c) 2002 Jason Katz-Brown"
-msgstr "(h) 2002 Jason Katz-Brown"
-
-#: designer/main.cpp:20
-msgid "main author"
-msgstr "prif awdur"
-
-#: designer/main.cpp:21
-msgid "libatlantikui"
-msgstr "libatlantikui"
-
-#: designer/designer.cpp:56
-msgid "&Edit Gameboard Info..."
-msgstr "&Golygu Gwybodaeth y Bwrdd Chwarae..."
-
-#: designer/designer.cpp:57
-msgid "&Edit Groups..."
-msgstr "G&olygu Grwpiau..."
-
-#: designer/designer.cpp:59
-msgid "&Add 4 Squares"
-msgstr "&Ychwanegu 4 Sgw?r"
-
-#: designer/designer.cpp:60
-msgid "&Remove 4 Squares"
-msgstr "&Tynnu 4 sgw?r"
-
-#: designer/designer.cpp:63
-msgid "&Up"
-msgstr "I &Fyny"
-
-#: designer/designer.cpp:64
-msgid "&Down"
-msgstr "I &Lawr"
-
-#: designer/designer.cpp:65
-msgid "&Left"
-msgstr "&Chwith"
-
-#: designer/designer.cpp:66
-msgid "&Right"
-msgstr "&De"
-
-#: designer/designer.cpp:72
-msgid "Change Estate"
-msgstr "Newid St?d"
-
-#: designer/designer.cpp:194
-msgid "New Estate"
-msgstr "St?d Newydd"
-
-#: designer/designer.cpp:213
-msgid "There are unsaved changes to gameboard. Save them?"
-msgstr "Mae yna newidiadau i'r bwrdd chwarae sydd heb eu cadw.  Cadw?"
-
-#: designer/designer.cpp:213
-msgid "Unsaved Changes"
-msgstr "Newidiadau Heb eu Cadw"
-
-#: designer/designer.cpp:351
-msgid "No Name"
-msgstr "Dim Enw"
-
-#: designer/designer.cpp:529
-msgid "This board file is invalid; cannot open."
-msgstr "Mae'r ffeil bwrdd yma'n annilys; methu'i agor."
-
-#: designer/designer.cpp:529
-msgid "There are only %1 estates specified in this file."
-msgstr "Dim ond %1 o stadau sydd wedi'u penodi yn y ffeil yma."
-
-#: designer/designer.cpp:556
-#, c-format
-msgid "Jump to Estate %1"
-msgstr "Neidio i St?d %1"
-
-#: designer/designer.cpp:949
-msgid "Atlantik Gameboard Editor"
-msgstr "Golygydd Bwrdd Chwarae Atlantik"
-
 #: designer/group.cpp:23
 msgid "Group Editor"
 msgstr "Golygydd Gr?p"
@@ -187,6 +99,42 @@ msgstr "Rhowch enw'r gr?p newydd:"
 msgid "That group is already on the list."
 msgstr "Mae'r gr?p yna eisoes ar y rhestr."
 
+#: designer/boardinfo.cpp:19
+msgid "Gameboard Information"
+msgstr "Gwybodaeth y Bwrdd Chwarae"
+
+#: designer/boardinfo.cpp:42
+msgid "Version:"
+msgstr "Fersiwn :"
+
+#: designer/boardinfo.cpp:52
+msgid "URL:"
+msgstr "URL:"
+
+#: designer/boardinfo.cpp:60
+msgid "Description:"
+msgstr "Disgrifiad:"
+
+#: designer/boardinfo.cpp:72
+msgid "Background color:"
+msgstr "Lliw'r cefndir:"
+
+#: designer/boardinfo.cpp:79
+msgid "&Authors"
+msgstr "&Awduron"
+
+#: designer/boardinfo.cpp:83
+msgid "&Thanks To"
+msgstr "&Diolch i"
+
+#: designer/boardinfo.cpp:123
+msgid "&Add Name"
+msgstr "Ychw&anegu Enw"
+
+#: designer/boardinfo.cpp:127
+msgid "&Delete Name"
+msgstr "&Dileu Enw"
+
 #: designer/editor.cpp:189
 msgid "Type:"
 msgstr "Math:"
@@ -363,38 +311,91 @@ msgstr "Pris:"
 msgid "Group:"
 msgstr "Gr?p:"
 
-#: designer/boardinfo.cpp:19
-msgid "Gameboard Information"
-msgstr "Gwybodaeth y Bwrdd Chwarae"
+#: designer/designer.cpp:56
+msgid "&Edit Gameboard Info..."
+msgstr "&Golygu Gwybodaeth y Bwrdd Chwarae..."
 
-#: designer/boardinfo.cpp:42
-msgid "Version:"
-msgstr "Fersiwn :"
+#: designer/designer.cpp:57
+msgid "&Edit Groups..."
+msgstr "G&olygu Grwpiau..."
 
-#: designer/boardinfo.cpp:52
-msgid "URL:"
-msgstr "URL:"
+#: designer/designer.cpp:59
+msgid "&Add 4 Squares"
+msgstr "&Ychwanegu 4 Sgw?r"
 
-#: designer/boardinfo.cpp:60
-msgid "Description:"
-msgstr "Disgrifiad:"
+#: designer/designer.cpp:60
+msgid "&Remove 4 Squares"
+msgstr "&Tynnu 4 sgw?r"
 
-#: designer/boardinfo.cpp:72
-msgid "Background color:"
-msgstr "Lliw'r cefndir:"
+#: designer/designer.cpp:63
+msgid "&Up"
+msgstr "I &Fyny"
 
-#: designer/boardinfo.cpp:79
-msgid "&Authors"
-msgstr "&Awduron"
+#: designer/designer.cpp:64
+msgid "&Down"
+msgstr "I &Lawr"
 
-#: designer/boardinfo.cpp:83
-msgid "&Thanks To"
-msgstr "&Diolch i"
+#: designer/designer.cpp:65
+msgid "&Left"
+msgstr "&Chwith"
 
-#: designer/boardinfo.cpp:123
-msgid "&Add Name"
-msgstr "Ychw&anegu Enw"
+#: designer/designer.cpp:66
+msgid "&Right"
+msgstr "&De"
 
-#: designer/boardinfo.cpp:127
-msgid "&Delete Name"
-msgstr "&Dileu Enw"
+#: designer/designer.cpp:72
+msgid "Change Estate"
+msgstr "Newid St?d"
+
+#: designer/designer.cpp:194
+msgid "New Estate"
+msgstr "St?d Newydd"
+
+#: designer/designer.cpp:213
+msgid "There are unsaved changes to gameboard. Save them?"
+msgstr "Mae yna newidiadau i'r bwrdd chwarae sydd heb eu cadw.  Cadw?"
+
+#: designer/designer.cpp:213
+msgid "Unsaved Changes"
+msgstr "Newidiadau Heb eu Cadw"
+
+#: designer/designer.cpp:351
+msgid "No Name"
+msgstr "Dim Enw"
+
+#: designer/designer.cpp:529
+msgid "This board file is invalid; cannot open."
+msgstr "Mae'r ffeil bwrdd yma'n annilys; methu'i agor."
+
+#: designer/designer.cpp:529
+msgid "There are only %1 estates specified in this file."
+msgstr "Dim ond %1 o stadau sydd wedi'u penodi yn y ffeil yma."
+
+#: designer/designer.cpp:556
+#, c-format
+msgid "Jump to Estate %1"
+msgstr "Neidio i St?d %1"
+
+#: designer/designer.cpp:949
+msgid "Atlantik Gameboard Editor"
+msgstr "Golygydd Bwrdd Chwarae Atlantik"
+
+#: designer/main.cpp:12
+msgid "Atlantik Designer"
+msgstr "Dylunydd Atlantik"
+
+#: designer/main.cpp:13
+msgid "Atlantik gameboard designer"
+msgstr "Dylunydd bwrdd chwarae Atlantik"
+
+#: designer/main.cpp:15
+msgid "(c) 2002 Jason Katz-Brown"
+msgstr "(h) 2002 Jason Katz-Brown"
+
+#: designer/main.cpp:20
+msgid "main author"
+msgstr "prif awdur"
+
+#: designer/main.cpp:21
+msgid "libatlantikui"
+msgstr "libatlantikui"
diff --git a/tde-i18n-cy/messages/tdeaddons/audiorename_plugin.po b/tde-i18n-cy/messages/tdeaddons/audiorename_plugin.po
index eb033856cfa..e14f4bbe873 100644
--- a/tde-i18n-cy/messages/tdeaddons/audiorename_plugin.po
+++ b/tde-i18n-cy/messages/tdeaddons/audiorename_plugin.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: audiorename_plugin\n"
-"POT-Creation-Date: 2007-01-07 02:43+0100\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-02-24 11:12+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeaddons/autorefresh.po b/tde-i18n-cy/messages/tdeaddons/autorefresh.po
index 52cdbee6b64..bdfe833d7fa 100644
--- a/tde-i18n-cy/messages/tdeaddons/autorefresh.po
+++ b/tde-i18n-cy/messages/tdeaddons/autorefresh.po
@@ -3,10 +3,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: autorefresh\n"
-"POT-Creation-Date: 2004-10-12 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-02-19 20:33+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeaddons/babelfish.po b/tde-i18n-cy/messages/tdeaddons/babelfish.po
index 83ef146d3aa..3710e9d4f6d 100644
--- a/tde-i18n-cy/messages/tdeaddons/babelfish.po
+++ b/tde-i18n-cy/messages/tdeaddons/babelfish.po
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdeaddons/babelfish.po\n"
-"POT-Creation-Date: 2008-04-08 02:02+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-02-04 10:24+0200\n"
 "Last-Translator: www.kyfieithu.co.uk <kyfieithu@dotmon.com>"
 ", www.gyfieithu.co.uk<kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
diff --git a/tde-i18n-cy/messages/tdeaddons/charlatanui.po b/tde-i18n-cy/messages/tdeaddons/charlatanui.po
index 9c5871adae0..e9d02a76d9e 100644
--- a/tde-i18n-cy/messages/tdeaddons/charlatanui.po
+++ b/tde-i18n-cy/messages/tdeaddons/charlatanui.po
@@ -3,10 +3,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: charlatanui\n"
-"POT-Creation-Date: 2004-10-12 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-02-19 20:37+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeaddons/crashesplugin.po b/tde-i18n-cy/messages/tdeaddons/crashesplugin.po
index 89bc0510dee..5208e059b39 100644
--- a/tde-i18n-cy/messages/tdeaddons/crashesplugin.po
+++ b/tde-i18n-cy/messages/tdeaddons/crashesplugin.po
@@ -3,10 +3,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: crashesplugin\n"
-"POT-Creation-Date: 2005-08-10 10:20+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-02-19 20:39+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeaddons/dirfilterplugin.po b/tde-i18n-cy/messages/tdeaddons/dirfilterplugin.po
index 080a0456d89..94aff23a534 100644
--- a/tde-i18n-cy/messages/tdeaddons/dirfilterplugin.po
+++ b/tde-i18n-cy/messages/tdeaddons/dirfilterplugin.po
@@ -3,63 +3,64 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dirfilterplugin\n"
-"POT-Creation-Date: 2005-12-31 03:19+0100\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-02-19 20:42+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.2\n"
 
-#: dirfilterplugin.cpp:155
+#: dirfilterplugin.cpp:156
 msgid "View F&ilter"
 msgstr "Gweld &Hidlen"
 
-#: dirfilterplugin.cpp:158
+#: dirfilterplugin.cpp:159
 msgid "Allow to filter the currently displayed items by filetype."
 msgstr ""
 
-#: dirfilterplugin.cpp:175
+#: dirfilterplugin.cpp:176
 msgid "Clear Filter Field"
 msgstr ""
 
-#: dirfilterplugin.cpp:179
+#: dirfilterplugin.cpp:180
 msgid "Clear filter field<p>Clears the content of the filter field."
 msgstr ""
 
-#: dirfilterplugin.cpp:195
+#: dirfilterplugin.cpp:196
 msgid ""
 "Enter here a text which an item in the view must contain anywhere to be shown."
 msgstr ""
 
-#: dirfilterplugin.cpp:199
+#: dirfilterplugin.cpp:201
 msgid "Filter Field"
 msgstr ""
 
-#: dirfilterplugin.cpp:250
+#: dirfilterplugin.cpp:278
 msgid "Only Show Items of Type"
 msgstr "Dangos yn Unig Eitemau o Fath"
 
-#: dirfilterplugin.cpp:316
+#: dirfilterplugin.cpp:344
 msgid "Use Multiple Filters"
 msgstr "Defnyddio Hidlenni Lluosol"
 
-#: dirfilterplugin.cpp:321
+#: dirfilterplugin.cpp:349
 msgid "Show Count"
 msgstr "Dangos y Cyfrif"
 
-#: dirfilterplugin.cpp:325
+#: dirfilterplugin.cpp:353
 msgid "Reset"
 msgstr "Ailosod"
 
-#. i18n: file dirfilterplugin.rc line 8
+#. i18n: file dirfilterplugin.rc line 10
 #: rc.cpp:6
 #, no-c-format
 msgid "Extra Toolbar"
 msgstr "Bar Offer Ychwanegol"
 
-#. i18n: file dirfilterplugin.rc line 11
+#. i18n: file dirfilterplugin.rc line 14
 #: rc.cpp:9
 #, no-c-format
 msgid "Filter Toolbar"
diff --git a/tde-i18n-cy/messages/tdeaddons/domtreeviewer.po b/tde-i18n-cy/messages/tdeaddons/domtreeviewer.po
index 0e220dfc9f2..84f85351f19 100644
--- a/tde-i18n-cy/messages/tdeaddons/domtreeviewer.po
+++ b/tde-i18n-cy/messages/tdeaddons/domtreeviewer.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: domtreeviewer\n"
-"POT-Creation-Date: 2006-05-18 04:07+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-02-24 11:28+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeaddons/dub.po b/tde-i18n-cy/messages/tdeaddons/dub.po
index 05aafb3ee92..7c14b554d89 100644
--- a/tde-i18n-cy/messages/tdeaddons/dub.po
+++ b/tde-i18n-cy/messages/tdeaddons/dub.po
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdeaddons/dub.po\n"
-"POT-Creation-Date: 2004-10-12 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-02-04 10:24+0200\n"
 "Last-Translator: www.kyfieithu.co.uk <kyfieithu@dotmon.com>"
 ", www.gyfieithu.co.uk<kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
diff --git a/tde-i18n-cy/messages/tdeaddons/ffrs.po b/tde-i18n-cy/messages/tdeaddons/ffrs.po
index 2d4be26d66d..9ab025ba549 100644
--- a/tde-i18n-cy/messages/tdeaddons/ffrs.po
+++ b/tde-i18n-cy/messages/tdeaddons/ffrs.po
@@ -3,10 +3,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ffrs\n"
-"POT-Creation-Date: 2004-10-12 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-02-24 11:33+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeaddons/fsview.po b/tde-i18n-cy/messages/tdeaddons/fsview.po
index a14574cf001..821a0b09441 100644
--- a/tde-i18n-cy/messages/tdeaddons/fsview.po
+++ b/tde-i18n-cy/messages/tdeaddons/fsview.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: fsview\n"
-"POT-Creation-Date: 2007-05-17 02:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-02-24 11:29+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -30,21 +31,86 @@ msgid ""
 "Your emails"
 msgstr "kyfieithu@dotmon.com"
 
-#: main.cpp:19
-msgid "View filesystem starting from this folder"
-msgstr "Edrych ar y cysawd ffeiliau gan gychwyn o'r blygell hon"
+#: fsview.cpp:49 fsview.cpp:389
+msgid "Name"
+msgstr "Enw"
 
-#: fsview_part.cpp:89 main.cpp:26
-msgid "FSView"
-msgstr "FSView"
+#: fsview.cpp:50
+msgid "Size"
+msgstr "Maint"
 
-#: main.cpp:27
-msgid "Filesystem Viewer"
-msgstr "Gwelydd y Cysawd Ffeiliau"
+#: fsview.cpp:51
+msgid "File Count"
+msgstr "Cyfrif Ffeiliau"
 
-#: main.cpp:29
-msgid "(c) 2002, Josef Weidendorfer"
-msgstr "(h) 2002, Josef Weidendorfer"
+#: fsview.cpp:52
+#, fuzzy
+msgid "Directory Count"
+msgstr "Cyfrif Ffeiliau"
+
+#: fsview.cpp:53
+msgid "Last Modified"
+msgstr "Newid Diwethaf"
+
+#: fsview.cpp:54 fsview.cpp:390
+msgid "Owner"
+msgstr "Perchennog"
+
+#: fsview.cpp:55 fsview.cpp:391
+msgid "Group"
+msgstr "Gr?p"
+
+#: fsview.cpp:56 fsview.cpp:392
+msgid "Mime Type"
+msgstr "Math Mime"
+
+#: fsview.cpp:280
+msgid "Go To"
+msgstr "Ewch I"
+
+#: fsview.cpp:282
+msgid "Go Up"
+msgstr "Ewch i Fyny"
+
+#: fsview.cpp:284
+msgid "Stop Refresh"
+msgstr "Peidio ? chyfredoli"
+
+#: fsview.cpp:286
+msgid "Refresh"
+msgstr "Cyfredoli"
+
+#: fsview.cpp:289
+msgid "Refresh '%1'"
+msgstr "Cyfredoli '%1'"
+
+#: fsview.cpp:292 fsview_part.cpp:123
+msgid "Stop at Depth"
+msgstr "Aros wrth Ddyfnder"
+
+#: fsview.cpp:294 fsview_part.cpp:121
+msgid "Stop at Area"
+msgstr "Aros wrth Ardal"
+
+#: fsview.cpp:296
+msgid "Stop at Name"
+msgstr "Aros wrth Enw"
+
+#: fsview.cpp:302 fsview_part.cpp:127
+msgid "Color Mode"
+msgstr "Modd Lliw"
+
+#: fsview.cpp:305 fsview_part.cpp:125
+msgid "Visualization"
+msgstr "Delweddu"
+
+#: fsview.cpp:387
+msgid "None"
+msgstr "Dim"
+
+#: fsview.cpp:388
+msgid "Depth"
+msgstr "Dyfnder"
 
 #: fsview_part.cpp:76
 msgid ""
@@ -63,6 +129,10 @@ msgstr ""
 "1 blygell\n"
 " %n o blygyll"
 
+#: fsview_part.cpp:89 main.cpp:26
+msgid "FSView"
+msgstr "FSView"
+
 #: fsview_part.cpp:90
 msgid "Filesystem Utilization Viewer"
 msgstr "Gwelydd Defnydd y Cysawd Ffeiliau"
@@ -88,22 +158,6 @@ msgstr ""
 "<p>Am fanylion ar ddefnydd a'r dewisiadau sydd ar gael, gweler y gymorth arlein "
 "o dan y ddewislen 'Cymorth/Llawlyfr FSView'.</p>"
 
-#: fsview.cpp:294 fsview_part.cpp:121
-msgid "Stop at Area"
-msgstr "Aros wrth Ardal"
-
-#: fsview.cpp:292 fsview_part.cpp:123
-msgid "Stop at Depth"
-msgstr "Aros wrth Ddyfnder"
-
-#: fsview.cpp:305 fsview_part.cpp:125
-msgid "Visualization"
-msgstr "Delweddu"
-
-#: fsview.cpp:302 fsview_part.cpp:127
-msgid "Color Mode"
-msgstr "Modd Lliw"
-
 #: fsview_part.cpp:131
 msgid "&FSView Manual"
 msgstr "&Llawlyfr FSView"
@@ -262,70 +316,17 @@ msgstr "Iselhau fesul un (hyd at %1)"
 msgid "Increment (to %1)"
 msgstr "Cynyddu fesul un (hyd at %1)"
 
-#: fsview.cpp:49 fsview.cpp:389
-msgid "Name"
-msgstr "Enw"
-
-#: fsview.cpp:50
-msgid "Size"
-msgstr "Maint"
-
-#: fsview.cpp:51
-msgid "File Count"
-msgstr "Cyfrif Ffeiliau"
-
-#: fsview.cpp:52
-#, fuzzy
-msgid "Directory Count"
-msgstr "Cyfrif Ffeiliau"
-
-#: fsview.cpp:53
-msgid "Last Modified"
-msgstr "Newid Diwethaf"
-
-#: fsview.cpp:54 fsview.cpp:390
-msgid "Owner"
-msgstr "Perchennog"
-
-#: fsview.cpp:55 fsview.cpp:391
-msgid "Group"
-msgstr "Gr?p"
-
-#: fsview.cpp:56 fsview.cpp:392
-msgid "Mime Type"
-msgstr "Math Mime"
-
-#: fsview.cpp:280
-msgid "Go To"
-msgstr "Ewch I"
-
-#: fsview.cpp:282
-msgid "Go Up"
-msgstr "Ewch i Fyny"
-
-#: fsview.cpp:284
-msgid "Stop Refresh"
-msgstr "Peidio ? chyfredoli"
-
-#: fsview.cpp:286
-msgid "Refresh"
-msgstr "Cyfredoli"
-
-#: fsview.cpp:289
-msgid "Refresh '%1'"
-msgstr "Cyfredoli '%1'"
-
-#: fsview.cpp:296
-msgid "Stop at Name"
-msgstr "Aros wrth Enw"
+#: main.cpp:19
+msgid "View filesystem starting from this folder"
+msgstr "Edrych ar y cysawd ffeiliau gan gychwyn o'r blygell hon"
 
-#: fsview.cpp:387
-msgid "None"
-msgstr "Dim"
+#: main.cpp:27
+msgid "Filesystem Viewer"
+msgstr "Gwelydd y Cysawd Ffeiliau"
 
-#: fsview.cpp:388
-msgid "Depth"
-msgstr "Dyfnder"
+#: main.cpp:29
+msgid "(c) 2002, Josef Weidendorfer"
+msgstr "(h) 2002, Josef Weidendorfer"
 
 #~ msgid "(c) 2003, Josef Weidendorfer"
 #~ msgstr "(h) 2003, Josef Weidendorfer"
diff --git a/tde-i18n-cy/messages/tdeaddons/imagerename_plugin.po b/tde-i18n-cy/messages/tdeaddons/imagerename_plugin.po
index edd50236e7c..5a2e56024de 100644
--- a/tde-i18n-cy/messages/tdeaddons/imagerename_plugin.po
+++ b/tde-i18n-cy/messages/tdeaddons/imagerename_plugin.po
@@ -3,16 +3,17 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: imagerename_plugin\n"
-"POT-Creation-Date: 2004-10-12 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-02-25 10:18+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.2\n"
 
-#: image_plugin.cpp:71
+#: image_plugin.cpp:70
 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 --git a/tde-i18n-cy/messages/tdeaddons/imgalleryplugin.po b/tde-i18n-cy/messages/tdeaddons/imgalleryplugin.po
index 58aa0821a82..79646c56e9a 100644
--- a/tde-i18n-cy/messages/tdeaddons/imgalleryplugin.po
+++ b/tde-i18n-cy/messages/tdeaddons/imgalleryplugin.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: imgalleryplugin\n"
-"POT-Creation-Date: 2007-01-07 02:43+0100\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-02-24 11:37+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeaddons/katecppsymbolviewer.po b/tde-i18n-cy/messages/tdeaddons/katecppsymbolviewer.po
index 3cf9894dda6..2f70691d990 100644
--- a/tde-i18n-cy/messages/tdeaddons/katecppsymbolviewer.po
+++ b/tde-i18n-cy/messages/tdeaddons/katecppsymbolviewer.po
@@ -3,10 +3,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: katecppsymbolviewer\n"
-"POT-Creation-Date: 2007-03-26 02:16+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-02-25 10:47+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,11 +86,11 @@ msgstr ""
 msgid "Globals"
 msgstr "Eangderau"
 
-#: plugin_katesymbolviewer.h:136
+#: plugin_katesymbolviewer.h:139
 #, fuzzy
 msgid "Symbol Viewer"
 msgstr "Rhestr Symbolau"
 
-#: plugin_katesymbolviewer.h:137
+#: plugin_katesymbolviewer.h:140
 msgid "Symbol Viewer Configuration Page"
 msgstr ""
diff --git a/tde-i18n-cy/messages/tdeaddons/katefiletemplates.po b/tde-i18n-cy/messages/tdeaddons/katefiletemplates.po
index f004563d324..7a14a218fa3 100644
--- a/tde-i18n-cy/messages/tdeaddons/katefiletemplates.po
+++ b/tde-i18n-cy/messages/tdeaddons/katefiletemplates.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdeaddons/katefiletemplates.po\n"
-"POT-Creation-Date: 2007-10-02 01:15+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeaddons/katefll_initplugin.po b/tde-i18n-cy/messages/tdeaddons/katefll_initplugin.po
index 21c0e245bb9..b6fd5b7e237 100644
--- a/tde-i18n-cy/messages/tdeaddons/katefll_initplugin.po
+++ b/tde-i18n-cy/messages/tdeaddons/katefll_initplugin.po
@@ -3,10 +3,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: katefll_initplugin\n"
-"POT-Creation-Date: 2005-07-24 01:39+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-02-25 10:54+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeaddons/katefll_plugin.po b/tde-i18n-cy/messages/tdeaddons/katefll_plugin.po
index b8f5265bdeb..50080741e7a 100644
--- a/tde-i18n-cy/messages/tdeaddons/katefll_plugin.po
+++ b/tde-i18n-cy/messages/tdeaddons/katefll_plugin.po
@@ -3,10 +3,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: katefll_plugin\n"
-"POT-Creation-Date: 2005-07-24 01:39+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-02-25 10:56+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeaddons/katehelloworld.po b/tde-i18n-cy/messages/tdeaddons/katehelloworld.po
index 01b1266f0e7..fd6d3df9c05 100644
--- a/tde-i18n-cy/messages/tdeaddons/katehelloworld.po
+++ b/tde-i18n-cy/messages/tdeaddons/katehelloworld.po
@@ -3,10 +3,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: katehelloworld\n"
-"POT-Creation-Date: 2004-10-12 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-02-25 10:56+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeaddons/katehtmltools.po b/tde-i18n-cy/messages/tdeaddons/katehtmltools.po
index b0adbd80117..8761cc5bd5e 100644
--- a/tde-i18n-cy/messages/tdeaddons/katehtmltools.po
+++ b/tde-i18n-cy/messages/tdeaddons/katehtmltools.po
@@ -3,10 +3,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: katehtmltools\n"
-"POT-Creation-Date: 2004-10-12 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-02-25 10:59+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeaddons/kateinsertcommand.po b/tde-i18n-cy/messages/tdeaddons/kateinsertcommand.po
index e4946627b07..8bc40efbdb4 100644
--- a/tde-i18n-cy/messages/tdeaddons/kateinsertcommand.po
+++ b/tde-i18n-cy/messages/tdeaddons/kateinsertcommand.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kateinsertcommand\n"
-"POT-Creation-Date: 2006-03-06 03:57+0100\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-02-26 14:07+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -67,7 +68,7 @@ msgstr "Daeth y gorchymyn i ben gyda cyflwr %1"
 msgid "Oops!"
 msgstr "Wps!"
 
-#: plugin_kateinsertcommand.cpp:286 plugin_kateinsertcommand.h:73
+#: plugin_kateinsertcommand.cpp:286 plugin_kateinsertcommand.h:74
 msgid "Insert Command"
 msgstr "Mewnosod Gorchymyn"
 
@@ -176,12 +177,12 @@ msgstr ""
 "<p><strong> Plygell Weithio Ddiweddaraf: </strong> Y blygell a ddefnyddiwyd y "
 "tro diwethaf ichi ddefnyddio'r ategyn hwn.</p></qt>"
 
-#: plugin_kateinsertcommand.h:75
+#: plugin_kateinsertcommand.h:76
 #, fuzzy
 msgid "Configure Insert Command Plugin"
 msgstr "Mewnosod Gorchymyn"
 
-#: plugin_kateinsertcommand.h:135
+#: plugin_kateinsertcommand.h:137
 msgid "Please Wait"
 msgstr "Disgwyliwch"
 
diff --git a/tde-i18n-cy/messages/tdeaddons/katekjswrapper.po b/tde-i18n-cy/messages/tdeaddons/katekjswrapper.po
index 539bcbf72b3..47d9cd7ceb5 100644
--- a/tde-i18n-cy/messages/tdeaddons/katekjswrapper.po
+++ b/tde-i18n-cy/messages/tdeaddons/katekjswrapper.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdeaddons/katekjswrapper.po\n"
-"POT-Creation-Date: 2004-10-30 01:25+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeaddons/katemake.po b/tde-i18n-cy/messages/tdeaddons/katemake.po
index 9b7ecb54959..ade15fa34a9 100644
--- a/tde-i18n-cy/messages/tdeaddons/katemake.po
+++ b/tde-i18n-cy/messages/tdeaddons/katemake.po
@@ -3,10 +3,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: katemake\n"
-"POT-Creation-Date: 2006-08-18 04:13+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-02-25 11:03+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeaddons/katemodeline.po b/tde-i18n-cy/messages/tdeaddons/katemodeline.po
index c8bbd27d806..9fcd1ce193d 100644
--- a/tde-i18n-cy/messages/tdeaddons/katemodeline.po
+++ b/tde-i18n-cy/messages/tdeaddons/katemodeline.po
@@ -3,10 +3,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: katemodeline\n"
-"POT-Creation-Date: 2004-10-12 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-02-26 20:26+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeaddons/kateopenheader.po b/tde-i18n-cy/messages/tdeaddons/kateopenheader.po
index a8adf6a674b..b75aa854048 100644
--- a/tde-i18n-cy/messages/tdeaddons/kateopenheader.po
+++ b/tde-i18n-cy/messages/tdeaddons/kateopenheader.po
@@ -3,10 +3,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kateopenheader\n"
-"POT-Creation-Date: 2004-10-12 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-02-26 20:27+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeaddons/katepybrowse.po b/tde-i18n-cy/messages/tdeaddons/katepybrowse.po
index df5e4e93e36..ad60f6bdddf 100644
--- a/tde-i18n-cy/messages/tdeaddons/katepybrowse.po
+++ b/tde-i18n-cy/messages/tdeaddons/katepybrowse.po
@@ -3,10 +3,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: katepybrowse\n"
-"POT-Creation-Date: 2005-05-08 01:27+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-02-26 20:30+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeaddons/katesnippets.po b/tde-i18n-cy/messages/tdeaddons/katesnippets.po
index 73ce97d87eb..c8ce5c9816f 100644
--- a/tde-i18n-cy/messages/tdeaddons/katesnippets.po
+++ b/tde-i18n-cy/messages/tdeaddons/katesnippets.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: all2.po\n"
-"POT-Creation-Date: 2005-05-08 01:27+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeaddons/katetabbarextension.po b/tde-i18n-cy/messages/tdeaddons/katetabbarextension.po
index b2cae022435..f2db99e43cc 100644
--- a/tde-i18n-cy/messages/tdeaddons/katetabbarextension.po
+++ b/tde-i18n-cy/messages/tdeaddons/katetabbarextension.po
@@ -1,28 +1,33 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdeaddons/katetabbarextension.po\n"
-"POT-Creation-Date: 2008-02-22 01:36+0100\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: plugin_katetabbarextension.cpp:484
-msgid "Sorting Behavior"
+#: plugin_katetabbarextension.cpp:483
+msgid "Behavior options"
 msgstr ""
 
-#: plugin_katetabbarextension.cpp:488
+#: plugin_katetabbarextension.cpp:486
 msgid "Sort files alphabetically"
 msgstr ""
 
+#: plugin_katetabbarextension.cpp:487
+msgid "Close document on mouse middle click"
+msgstr ""
+
 #. i18n: file ui.rc line 4
-#: plugin_katetabbarextension.h:307 rc.cpp:3
+#: plugin_katetabbarextension.h:348 rc.cpp:3
 #, no-c-format
 msgid "Tab Bar Extension"
 msgstr ""
 
-#: plugin_katetabbarextension.h:308
+#: plugin_katetabbarextension.h:349
 msgid "Configure Tab Bar Extension"
 msgstr ""
diff --git a/tde-i18n-cy/messages/tdeaddons/katetextfilter.po b/tde-i18n-cy/messages/tdeaddons/katetextfilter.po
index 82759897796..0350a33a136 100644
--- a/tde-i18n-cy/messages/tdeaddons/katetextfilter.po
+++ b/tde-i18n-cy/messages/tdeaddons/katetextfilter.po
@@ -3,10 +3,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: katetextfilter\n"
-"POT-Creation-Date: 2006-01-02 03:18+0100\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-02-26 20:33+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeaddons/katexmlcheck.po b/tde-i18n-cy/messages/tdeaddons/katexmlcheck.po
index 95aaf5a34ce..43678f06630 100644
--- a/tde-i18n-cy/messages/tdeaddons/katexmlcheck.po
+++ b/tde-i18n-cy/messages/tdeaddons/katexmlcheck.po
@@ -3,10 +3,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: katexmlcheck\n"
-"POT-Creation-Date: 2005-05-08 01:27+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-02-26 20:35+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeaddons/katexmltools.po b/tde-i18n-cy/messages/tdeaddons/katexmltools.po
index 8626ad49f7a..506a069e15b 100644
--- a/tde-i18n-cy/messages/tdeaddons/katexmltools.po
+++ b/tde-i18n-cy/messages/tdeaddons/katexmltools.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: katexmltools\n"
-"POT-Creation-Date: 2005-05-08 01:27+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-02-24 11:39+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeaddons/kbinaryclock.po b/tde-i18n-cy/messages/tdeaddons/kbinaryclock.po
index 503d748223b..a656264910d 100644
--- a/tde-i18n-cy/messages/tdeaddons/kbinaryclock.po
+++ b/tde-i18n-cy/messages/tdeaddons/kbinaryclock.po
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdeaddons/kbinaryclock.po\n"
-"POT-Creation-Date: 2008-07-08 01:23+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-02-04 10:24+0200\n"
 "Last-Translator: www.kyfieithu.co.uk <kyfieithu@dotmon.com>"
 ", www.gyfieithu.co.uk<kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
diff --git a/tde-i18n-cy/messages/tdeaddons/kcmkuick.po b/tde-i18n-cy/messages/tdeaddons/kcmkuick.po
index 9739bb4f759..e081b5944af 100644
--- a/tde-i18n-cy/messages/tdeaddons/kcmkuick.po
+++ b/tde-i18n-cy/messages/tdeaddons/kcmkuick.po
@@ -3,10 +3,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmkuick\n"
-"POT-Creation-Date: 2004-10-12 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-02-27 11:58+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeaddons/kmathapplet.po b/tde-i18n-cy/messages/tdeaddons/kmathapplet.po
index 9bd4aac5ef6..b7946aa7fcd 100644
--- a/tde-i18n-cy/messages/tdeaddons/kmathapplet.po
+++ b/tde-i18n-cy/messages/tdeaddons/kmathapplet.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdeaddons/kmathapplet.po\n"
-"POT-Creation-Date: 2004-12-17 01:25+0100\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeaddons/kolourpicker.po b/tde-i18n-cy/messages/tdeaddons/kolourpicker.po
index d65a10af63e..25c4dc54759 100644
--- a/tde-i18n-cy/messages/tdeaddons/kolourpicker.po
+++ b/tde-i18n-cy/messages/tdeaddons/kolourpicker.po
@@ -3,10 +3,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kolourpicker\n"
-"POT-Creation-Date: 2008-08-12 01:19+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-02-27 12:06+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeaddons/konqsidebar_delicious.po b/tde-i18n-cy/messages/tdeaddons/konqsidebar_delicious.po
index 0989408de7f..5c9f2a7f831 100644
--- a/tde-i18n-cy/messages/tdeaddons/konqsidebar_delicious.po
+++ b/tde-i18n-cy/messages/tdeaddons/konqsidebar_delicious.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2005-08-18 04:32+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeaddons/konqsidebar_mediaplayer.po b/tde-i18n-cy/messages/tdeaddons/konqsidebar_mediaplayer.po
index 0b86c54914f..6c8849589c1 100644
--- a/tde-i18n-cy/messages/tdeaddons/konqsidebar_mediaplayer.po
+++ b/tde-i18n-cy/messages/tdeaddons/konqsidebar_mediaplayer.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: konqsidebar_mediaplayer\n"
-"POT-Creation-Date: 2004-12-11 01:24+0100\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-02-26 14:13+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeaddons/konqsidebar_news.po b/tde-i18n-cy/messages/tdeaddons/konqsidebar_news.po
index a63b4fa5c1c..ed6cb69cec8 100644
--- a/tde-i18n-cy/messages/tdeaddons/konqsidebar_news.po
+++ b/tde-i18n-cy/messages/tdeaddons/konqsidebar_news.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdeaddons/konqsidebar_news.po\n"
-"POT-Creation-Date: 2004-12-11 01:24+0100\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeaddons/ksig.po b/tde-i18n-cy/messages/tdeaddons/ksig.po
index 25daff37f80..e8d5e235a4b 100644
--- a/tde-i18n-cy/messages/tdeaddons/ksig.po
+++ b/tde-i18n-cy/messages/tdeaddons/ksig.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ksig\n"
-"POT-Creation-Date: 2005-03-07 01:46+0100\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-02-26 14:13+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeaddons/ktimemon.po b/tde-i18n-cy/messages/tdeaddons/ktimemon.po
index 5b17fdafe4a..7c2f1a56a3e 100644
--- a/tde-i18n-cy/messages/tdeaddons/ktimemon.po
+++ b/tde-i18n-cy/messages/tdeaddons/ktimemon.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ktimemon\n"
-"POT-Creation-Date: 2006-04-15 04:00+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-02-26 14:15+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -337,8 +338,9 @@ msgstr ""
 "cyfnewid: %4 MB %5% rhydd"
 
 #: timemon.cc:238
+#, fuzzy
 msgid ""
-"KTimeMon for TDE\n"
+"KTimeMon for KDE\n"
 "Maintained by Dirk A. Mueller <dmuell@gmx.net>\n"
 "Written by M. Maierhofer (m.maierhofer@tees.ac.uk)\n"
 "Based on timemon by H. Maierhofer"
diff --git a/tde-i18n-cy/messages/tdeaddons/kuick_plugin.po b/tde-i18n-cy/messages/tdeaddons/kuick_plugin.po
index bad3c26f124..f7f618f4a7c 100644
--- a/tde-i18n-cy/messages/tdeaddons/kuick_plugin.po
+++ b/tde-i18n-cy/messages/tdeaddons/kuick_plugin.po
@@ -3,10 +3,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kuick_plugin\n"
-"POT-Creation-Date: 2006-11-03 02:41+0100\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-02-27 12:08+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeaddons/libkaddrbk_geo_xxport.po b/tde-i18n-cy/messages/tdeaddons/libkaddrbk_geo_xxport.po
index 0e2f63e7795..db6d1e1a884 100644
--- a/tde-i18n-cy/messages/tdeaddons/libkaddrbk_geo_xxport.po
+++ b/tde-i18n-cy/messages/tdeaddons/libkaddrbk_geo_xxport.po
@@ -3,10 +3,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkaddrbk_geo_xxport\n"
-"POT-Creation-Date: 2004-11-25 01:30+0100\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-02-27 11:26+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeaddons/libkaddrbk_gmx_xxport.po b/tde-i18n-cy/messages/tdeaddons/libkaddrbk_gmx_xxport.po
index eb6ff5ef602..ab343aad59e 100644
--- a/tde-i18n-cy/messages/tdeaddons/libkaddrbk_gmx_xxport.po
+++ b/tde-i18n-cy/messages/tdeaddons/libkaddrbk_gmx_xxport.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: all2.po\n"
-"POT-Creation-Date: 2006-08-28 02:41+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeaddons/lyrics.po b/tde-i18n-cy/messages/tdeaddons/lyrics.po
index 2451fbf7e57..64ffeea428a 100644
--- a/tde-i18n-cy/messages/tdeaddons/lyrics.po
+++ b/tde-i18n-cy/messages/tdeaddons/lyrics.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: lyrics\n"
-"POT-Creation-Date: 2004-11-24 01:22+0100\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-02-26 14:17+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -31,7 +32,7 @@ msgstr "Ffurfweddu ategyn Lyrics"
 msgid "Search providers:"
 msgstr "Darparwyr ymchwiliadau:"
 
-#: cmodule.cpp:61 cmodule.h:24
+#: cmodule.cpp:61 cmodule.h:25
 msgid "New Search Provider"
 msgstr "Darparwr Ymchwiliadau Newydd"
 
diff --git a/tde-i18n-cy/messages/tdeaddons/mediacontrol.po b/tde-i18n-cy/messages/tdeaddons/mediacontrol.po
index 859a93c5534..9f08749290a 100644
--- a/tde-i18n-cy/messages/tdeaddons/mediacontrol.po
+++ b/tde-i18n-cy/messages/tdeaddons/mediacontrol.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mediacontrol\n"
-"POT-Creation-Date: 2008-08-12 01:19+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-02-26 14:18+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -79,7 +80,8 @@ msgid "Fix for Noatun-Support"
 msgstr "Trwsiad ar gyfer Cynhaliaeth Noatun"
 
 #: mediacontrol.cpp:127
-msgid "Fix for Vertical Slider"
+#, fuzzy
+msgid "Fix forQt::Vertical Slider"
 msgstr "Trwsiad ar gyfer Sglefryn Fertigol"
 
 #: mediacontrol.cpp:129
diff --git a/tde-i18n-cy/messages/tdeaddons/mf_konqplugin.po b/tde-i18n-cy/messages/tdeaddons/mf_konqplugin.po
index 76ffbd3f221..94bbbeff0e5 100644
--- a/tde-i18n-cy/messages/tdeaddons/mf_konqplugin.po
+++ b/tde-i18n-cy/messages/tdeaddons/mf_konqplugin.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2005-06-13 01:32+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeaddons/minitoolsplugin.po b/tde-i18n-cy/messages/tdeaddons/minitoolsplugin.po
index 9d1acde7944..f6c33cb7721 100644
--- a/tde-i18n-cy/messages/tdeaddons/minitoolsplugin.po
+++ b/tde-i18n-cy/messages/tdeaddons/minitoolsplugin.po
@@ -3,10 +3,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: minitoolsplugin\n"
-"POT-Creation-Date: 2004-10-12 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-02-27 11:26+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeaddons/nexscope.po b/tde-i18n-cy/messages/tdeaddons/nexscope.po
index f47eedb8741..83793535f11 100644
--- a/tde-i18n-cy/messages/tdeaddons/nexscope.po
+++ b/tde-i18n-cy/messages/tdeaddons/nexscope.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nexscope\n"
-"POT-Creation-Date: 2004-10-12 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-02-26 14:18+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeaddons/pitchablespeed.po b/tde-i18n-cy/messages/tdeaddons/pitchablespeed.po
index 65fc2c94a6c..d21016c41d1 100644
--- a/tde-i18n-cy/messages/tdeaddons/pitchablespeed.po
+++ b/tde-i18n-cy/messages/tdeaddons/pitchablespeed.po
@@ -3,10 +3,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: pitchablespeed\n"
-"POT-Creation-Date: 2004-10-12 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-02-27 11:29+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeaddons/rellinks.po b/tde-i18n-cy/messages/tdeaddons/rellinks.po
index af5035c5f10..3b754ac81fc 100644
--- a/tde-i18n-cy/messages/tdeaddons/rellinks.po
+++ b/tde-i18n-cy/messages/tdeaddons/rellinks.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdeaddons/rellinks.po\n"
-"POT-Creation-Date: 2005-09-05 02:42+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeaddons/searchbarplugin.po b/tde-i18n-cy/messages/tdeaddons/searchbarplugin.po
index 2b472c79fdd..965d40e3241 100644
--- a/tde-i18n-cy/messages/tdeaddons/searchbarplugin.po
+++ b/tde-i18n-cy/messages/tdeaddons/searchbarplugin.po
@@ -3,10 +3,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: searchbarplugin\n"
-"POT-Creation-Date: 2006-06-20 04:04+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-02-27 11:31+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,32 +19,48 @@ msgstr ""
 msgid "Search Toolbar"
 msgstr "Bar Offer Chwilio"
 
-#: searchbar.cpp:71
+#: searchbar.cpp:80
 msgid "Search Bar"
 msgstr "Bar Chwiliad"
 
-#: searchbar.cpp:79
+#: searchbar.cpp:88
 msgid ""
 "Search Bar"
 "<p>Enter a search term. Click on the icon to change search mode or provider."
 msgstr ""
 
-#: searchbar.cpp:82
+#: searchbar.cpp:91
 #, fuzzy
 msgid "Focus Searchbar"
 msgstr "Bar Chwiliad"
 
-#: searchbar.cpp:264 searchbar.cpp:327
+#: searchbar.cpp:322 searchbar.cpp:385
 #, fuzzy
 msgid "Find in This Page"
 msgstr "Canfod ar y dudalen hon"
 
-#: searchbar.cpp:298
+#: searchbar.cpp:356
 #, fuzzy
 msgid "%1 Search"
 msgstr "Bar Chwiliad"
 
-#: searchbar.cpp:358
+#: searchbar.cpp:416
+msgid "Use Google Suggest"
+msgstr ""
+
+#: searchbar.cpp:418
+msgid "For Google Only"
+msgstr ""
+
+#: searchbar.cpp:418
+msgid "For All Searches"
+msgstr ""
+
+#: searchbar.cpp:418
+msgid "Never"
+msgstr ""
+
+#: searchbar.cpp:421
 #, fuzzy
 msgid "Select Search Engines..."
 msgstr "Dewis peiriant chwilio..."
diff --git a/tde-i18n-cy/messages/tdeaddons/synaescope.po b/tde-i18n-cy/messages/tdeaddons/synaescope.po
index d780478858f..1d0703b9871 100644
--- a/tde-i18n-cy/messages/tdeaddons/synaescope.po
+++ b/tde-i18n-cy/messages/tdeaddons/synaescope.po
@@ -3,10 +3,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: synaescope\n"
-"POT-Creation-Date: 2004-10-12 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-02-27 11:33+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeaddons/tdefile_cert.po b/tde-i18n-cy/messages/tdeaddons/tdefile_cert.po
index 4051ca41c30..a2b47bbd2d6 100644
--- a/tde-i18n-cy/messages/tdeaddons/tdefile_cert.po
+++ b/tde-i18n-cy/messages/tdeaddons/tdefile_cert.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: all2.po\n"
-"POT-Creation-Date: 2004-11-11 01:23+0100\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeaddons/tdefile_desktop.po b/tde-i18n-cy/messages/tdeaddons/tdefile_desktop.po
index e2c3a8f7cec..bf166c595d3 100644
--- a/tde-i18n-cy/messages/tdeaddons/tdefile_desktop.po
+++ b/tde-i18n-cy/messages/tdeaddons/tdefile_desktop.po
@@ -3,10 +3,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_desktop\n"
-"POT-Creation-Date: 2004-10-12 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-02-27 12:01+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -60,6 +61,6 @@ msgstr "Hoff Eitemau"
 msgid "Link To"
 msgstr "Cysylltu I"
 
-#: tdefile_desktop.cpp:101
+#: tdefile_desktop.cpp:102
 msgid "Service"
 msgstr "Gwasanaeth"
diff --git a/tde-i18n-cy/messages/tdeaddons/tdefile_folder.po b/tde-i18n-cy/messages/tdeaddons/tdefile_folder.po
index 9ad5005dd6f..9e501b878c1 100644
--- a/tde-i18n-cy/messages/tdeaddons/tdefile_folder.po
+++ b/tde-i18n-cy/messages/tdeaddons/tdefile_folder.po
@@ -3,10 +3,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_folder\n"
-"POT-Creation-Date: 2004-10-12 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-02-27 11:21+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeaddons/tdefile_html.po b/tde-i18n-cy/messages/tdeaddons/tdefile_html.po
index 50675a60795..7cfebb614c1 100644
--- a/tde-i18n-cy/messages/tdeaddons/tdefile_html.po
+++ b/tde-i18n-cy/messages/tdeaddons/tdefile_html.po
@@ -3,10 +3,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_html\n"
-"POT-Creation-Date: 2006-11-26 03:48+0100\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-02-27 11:21+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeaddons/tdefile_lnk.po b/tde-i18n-cy/messages/tdeaddons/tdefile_lnk.po
index f72cd78edfb..28d0befb5e9 100644
--- a/tde-i18n-cy/messages/tdeaddons/tdefile_lnk.po
+++ b/tde-i18n-cy/messages/tdeaddons/tdefile_lnk.po
@@ -1,14 +1,33 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdeaddons/tdefile_lnk.po\n"
-"POT-Creation-Date: 2004-10-12 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: lnkforward.cpp:37
+msgid "lnkforward"
+msgstr ""
+
+#: lnkforward.cpp:39
+msgid "TDE tool for opening URLs given in a Windows .lnk file"
+msgstr ""
+
+#: lnkforward.cpp:45
+msgid ""
+"Map a Windows drive to a local mountpoint, e.g. \"C=/mnt/windows\"\n"
+"This option can be given multiple times"
+msgstr ""
+
+#: lnkforward.cpp:47
+msgid "Windows .lnk file to open"
+msgstr ""
+
 #: tdefile_lnk.cpp:46
 msgid "Windows Link File Information"
 msgstr ""
@@ -37,21 +56,3 @@ msgstr ""
 #: tdefile_lnk.cpp:83
 msgid "on network share"
 msgstr ""
-
-#: lnkforward.cpp:37
-msgid "lnkforward"
-msgstr ""
-
-#: lnkforward.cpp:39
-msgid "TDE tool for opening URLs given in a Windows .lnk file"
-msgstr ""
-
-#: lnkforward.cpp:45
-msgid ""
-"Map a Windows drive to a local mountpoint, e.g. \"C=/mnt/windows\"\n"
-"This option can be given multiple times"
-msgstr ""
-
-#: lnkforward.cpp:47
-msgid "Windows .lnk file to open"
-msgstr ""
diff --git a/tde-i18n-cy/messages/tdeaddons/tdefile_mhtml.po b/tde-i18n-cy/messages/tdeaddons/tdefile_mhtml.po
index 2a60d97c886..a67a0d89f54 100644
--- a/tde-i18n-cy/messages/tdeaddons/tdefile_mhtml.po
+++ b/tde-i18n-cy/messages/tdeaddons/tdefile_mhtml.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: all2.po\n"
-"POT-Creation-Date: 2005-01-19 01:25+0100\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeaddons/tdefile_txt.po b/tde-i18n-cy/messages/tdeaddons/tdefile_txt.po
index b309f450e4f..3e8460c2822 100644
--- a/tde-i18n-cy/messages/tdeaddons/tdefile_txt.po
+++ b/tde-i18n-cy/messages/tdeaddons/tdefile_txt.po
@@ -3,10 +3,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_txt\n"
-"POT-Creation-Date: 2005-01-08 01:24+0100\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-02-27 11:22+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeaddons/tdehtmlsettingsplugin.po b/tde-i18n-cy/messages/tdeaddons/tdehtmlsettingsplugin.po
index 31a00eda968..f7d41bb8254 100644
--- a/tde-i18n-cy/messages/tdeaddons/tdehtmlsettingsplugin.po
+++ b/tde-i18n-cy/messages/tdeaddons/tdehtmlsettingsplugin.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdehtmlsettingsplugin\n"
-"POT-Creation-Date: 2005-02-10 01:34+0100\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-02-25 10:01+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeaddons/tippecanoe.po b/tde-i18n-cy/messages/tdeaddons/tippecanoe.po
index b16d7db1f3a..c9b58c1876c 100644
--- a/tde-i18n-cy/messages/tdeaddons/tippecanoe.po
+++ b/tde-i18n-cy/messages/tdeaddons/tippecanoe.po
@@ -3,10 +3,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tippecanoe\n"
-"POT-Creation-Date: 2004-10-12 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-02-27 11:35+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeaddons/tyler.po b/tde-i18n-cy/messages/tdeaddons/tyler.po
index 8dd10c57b95..cfacca1a961 100644
--- a/tde-i18n-cy/messages/tdeaddons/tyler.po
+++ b/tde-i18n-cy/messages/tdeaddons/tyler.po
@@ -3,10 +3,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tyler\n"
-"POT-Creation-Date: 2004-10-12 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-02-27 11:36+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeaddons/uachangerplugin.po b/tde-i18n-cy/messages/tdeaddons/uachangerplugin.po
index 237bbf93456..48a9fea952e 100644
--- a/tde-i18n-cy/messages/tdeaddons/uachangerplugin.po
+++ b/tde-i18n-cy/messages/tdeaddons/uachangerplugin.po
@@ -3,10 +3,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: uachangerplugin\n"
-"POT-Creation-Date: 2005-06-28 01:37+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-02-27 11:38+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeaddons/validatorsplugin.po b/tde-i18n-cy/messages/tdeaddons/validatorsplugin.po
index ab3ca57537f..d33aff4509a 100644
--- a/tde-i18n-cy/messages/tdeaddons/validatorsplugin.po
+++ b/tde-i18n-cy/messages/tdeaddons/validatorsplugin.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: validatorsplugin\n"
-"POT-Creation-Date: 2004-10-12 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-02-26 14:19+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeaddons/wakeup.po b/tde-i18n-cy/messages/tdeaddons/wakeup.po
index 867d3e83459..91536041610 100644
--- a/tde-i18n-cy/messages/tdeaddons/wakeup.po
+++ b/tde-i18n-cy/messages/tdeaddons/wakeup.po
@@ -3,10 +3,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: wakeup\n"
-"POT-Creation-Date: 2004-10-12 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-02-27 11:42+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeaddons/wavecapture.po b/tde-i18n-cy/messages/tdeaddons/wavecapture.po
index c69c5943f75..6f83562d022 100644
--- a/tde-i18n-cy/messages/tdeaddons/wavecapture.po
+++ b/tde-i18n-cy/messages/tdeaddons/wavecapture.po
@@ -3,10 +3,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: wavecapture\n"
-"POT-Creation-Date: 2004-10-12 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-02-27 11:44+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeaddons/webarchiver.po b/tde-i18n-cy/messages/tdeaddons/webarchiver.po
index 251f7e5e9de..11f025efb23 100644
--- a/tde-i18n-cy/messages/tdeaddons/webarchiver.po
+++ b/tde-i18n-cy/messages/tdeaddons/webarchiver.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: webarchiver\n"
-"POT-Creation-Date: 2007-01-25 02:44+0100\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-02-26 13:55+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeadmin/kcmlilo.po b/tde-i18n-cy/messages/tdeadmin/kcmlilo.po
index 219f8bbc137..808efdac18d 100644
--- a/tde-i18n-cy/messages/tdeadmin/kcmlilo.po
+++ b/tde-i18n-cy/messages/tdeadmin/kcmlilo.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmlilo\n"
-"POT-Creation-Date: 2007-03-13 02:18+0100\n"
+"POT-Creation-Date: 2014-09-29 00:51-0500\n"
 "PO-Revision-Date: 2004-02-26 16:43+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeadmin/kcron.po b/tde-i18n-cy/messages/tdeadmin/kcron.po
index 9f71126360f..bfd4de8c43f 100644
--- a/tde-i18n-cy/messages/tdeadmin/kcron.po
+++ b/tde-i18n-cy/messages/tdeadmin/kcron.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcron\n"
-"POT-Creation-Date: 2007-05-25 02:16+0200\n"
+"POT-Creation-Date: 2014-09-29 00:51-0500\n"
 "PO-Revision-Date: 2004-01-16 22:17+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -42,7 +43,7 @@ msgstr "Dim cofnod cyfrinair ar gael ar gyfer uid '%1'"
 msgid "An error occurred while updating crontab."
 msgstr "Digwyddodd gwall wrth ddiweddaru crontab."
 
-#: ctdom.cpp:33 ctdow.cpp:58 cttask.cpp:316
+#: ctdom.cpp:33 ctdow.cpp:58 cttask.cpp:303
 msgid "every day "
 msgstr "bob diwrnod"
 
@@ -256,44 +257,44 @@ msgstr "Tachwedd"
 msgid "December"
 msgstr "Rhagfyr"
 
-#: cttask.cpp:251
+#: cttask.cpp:238
 #, fuzzy
 msgid "%H:%M"
 msgstr "%A:%M"
 
-#: cttask.cpp:252
+#: cttask.cpp:239
 msgid ""
 "_: Please translator, read the README.translators file in kcron's source code\n"
 "DAYS_OF_MONTH of MONTHS"
 msgstr "DAYS_OF_MONTH o MONTHS"
 
-#: cttask.cpp:253
+#: cttask.cpp:240
 msgid ""
 "_: Really, read that file\n"
 "every DAYS_OF_WEEK"
 msgstr "pob DAYS_OF_WEEK"
 
-#: cttask.cpp:254
+#: cttask.cpp:241
 msgid "DOM_FORMAT as well as DOW_FORMAT"
 msgstr "DOM_FORMAT yn ogystal â DOW_FORMAT"
 
-#: cttask.cpp:255
+#: cttask.cpp:242
 msgid "At TIME"
 msgstr "wrth TIME"
 
-#: cttask.cpp:256
+#: cttask.cpp:243
 msgid "TIME_FORMAT, DATE_FORMAT"
 msgstr "TIME_FORMAT, DATE_FORMAT"
 
-#: cttask.cpp:302
+#: cttask.cpp:289
 msgid ", and "
 msgstr ", a"
 
-#: cttask.cpp:304 ctunit.cpp:187
+#: cttask.cpp:291 ctunit.cpp:187
 msgid " and "
 msgstr "a"
 
-#: cttask.cpp:306 ctunit.cpp:189
+#: cttask.cpp:293 ctunit.cpp:189
 msgid ", "
 msgstr ","
 
@@ -528,87 +529,83 @@ msgstr "R&haglen:"
 msgid "&Browse..."
 msgstr "&Pori..."
 
-#: kttask.cpp:176
-msgid "&Silent"
-msgstr "&Distaw"
-
-#: kttask.cpp:185
+#: kttask.cpp:180
 msgid "Months"
 msgstr "Misoedd"
 
-#: kttask.cpp:201 kttask.cpp:234 kttask.cpp:254 kttask.cpp:314 kttask.cpp:343
-#: kttask.cpp:712 kttask.cpp:741 kttask.cpp:750 kttask.cpp:779 kttask.cpp:788
-#: kttask.cpp:817 kttask.cpp:826 kttask.cpp:855 kttask.cpp:864 kttask.cpp:893
+#: kttask.cpp:196 kttask.cpp:229 kttask.cpp:249 kttask.cpp:309 kttask.cpp:338
+#: kttask.cpp:706 kttask.cpp:735 kttask.cpp:744 kttask.cpp:773 kttask.cpp:782
+#: kttask.cpp:811 kttask.cpp:820 kttask.cpp:849 kttask.cpp:858 kttask.cpp:887
 msgid "Set All"
 msgstr ""
 
-#: kttask.cpp:207
+#: kttask.cpp:202
 msgid "Days of Month"
 msgstr "Diwrnodau'r Mis"
 
-#: kttask.cpp:238
+#: kttask.cpp:233
 msgid "Days of Week"
 msgstr "Diwrnodau'r Wythnos"
 
-#: kttask.cpp:260
+#: kttask.cpp:255
 msgid "Daily"
 msgstr "Pob Dydd"
 
-#: kttask.cpp:266
+#: kttask.cpp:261
 msgid "Run every day"
 msgstr "Rhedeg pob dydd"
 
-#: kttask.cpp:271
+#: kttask.cpp:266
 msgid "Hours"
 msgstr "Oriau"
 
-#: kttask.cpp:276
+#: kttask.cpp:271
 msgid "AM"
 msgstr "YB"
 
-#: kttask.cpp:299
+#: kttask.cpp:294
 msgid "PM"
 msgstr "YP"
 
-#: kttask.cpp:318
+#: kttask.cpp:313
 msgid "Minutes"
 msgstr "Munudau"
 
-#: kttask.cpp:528
+#: kttask.cpp:523
 msgid ""
 "Please enter the following to schedule the task:\n"
 msgstr ""
 "Mewnosodwch y dilynnol i drefnlennu'r dasg:\n"
 
-#: kttask.cpp:534
+#: kttask.cpp:529
 msgid "the program to run"
 msgstr "y rhaglen i redeg"
 
-#: kttask.cpp:546
+#: kttask.cpp:541
 msgid "the months"
 msgstr "y misoedd"
 
-#: kttask.cpp:567
+#: kttask.cpp:562
 msgid "either the days of the month or the days of the week"
 msgstr "unai diwrnodau y mis neu ddiwrnodau'r wythnos"
 
-#: kttask.cpp:583
+#: kttask.cpp:578
 msgid "the hours"
 msgstr "yr oriau"
 
-#: kttask.cpp:599
+#: kttask.cpp:594
 msgid "the minutes"
 msgstr "y munudau"
 
-#: kttask.cpp:627
+#: kttask.cpp:622
 msgid "Cannot locate program. Please re-enter."
 msgstr "Methu lleoli'r rhaglen.  Mewnosodwch eto."
 
-#: kttask.cpp:635
+#: kttask.cpp:630
 msgid "Program is not an executable file. Please re-enter."
 msgstr "Nid ffeil gweithredadwy yw'r rhaglen.  Mewnosodwch eto."
 
-#: kttask.cpp:703
+#: kttask.cpp:697
 msgid "Only local or mounted files can be executed by crontab."
 msgstr ""
 "Dim ond ffeiliau lleol neu arosodedig a gellir eu gweithredu gan crontab."
@@ -683,5 +680,8 @@ msgstr "Trefnlennydd Tasgau TDE"
 msgid "KCron"
 msgstr "KCron"
 
+#~ msgid "&Silent"
+#~ msgstr "&Distaw"
+
 #~ msgid "New"
 #~ msgstr "Newydd"
diff --git a/tde-i18n-cy/messages/tdeadmin/kdat.po b/tde-i18n-cy/messages/tdeadmin/kdat.po
index 1c5211fcd5a..23b1f5a2024 100644
--- a/tde-i18n-cy/messages/tdeadmin/kdat.po
+++ b/tde-i18n-cy/messages/tdeadmin/kdat.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kdat\n"
-"POT-Creation-Date: 2008-07-08 01:20+0200\n"
+"POT-Creation-Date: 2014-09-29 00:51-0500\n"
 "PO-Revision-Date: 2004-02-26 16:47+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -1012,7 +1013,7 @@ msgstr "Adfer i blygell:"
 msgid "Verify in folder:"
 msgstr "Gwirio mewn plygell:"
 
-#. i18n: file OptionsDlgWidget.ui line 136
+#. i18n: file OptionsDlgWidget.ui line 142
 #: VerifyOptDlg.cpp:60 rc.cpp:30 rc.cpp:42
 #, no-c-format
 msgid "..."
@@ -1056,7 +1057,7 @@ msgstr "Methu gosod cof yn kdat"
 msgid "Options Widget"
 msgstr ""
 
-#. i18n: file OptionsDlgWidget.ui line 53
+#. i18n: file OptionsDlgWidget.ui line 56
 #: rc.cpp:6
 #, no-c-format
 msgid ""
@@ -1064,7 +1065,7 @@ msgid ""
 " This is used when formatting the tapes."
 msgstr ""
 
-#. i18n: file OptionsDlgWidget.ui line 67
+#. i18n: file OptionsDlgWidget.ui line 73
 #: rc.cpp:9
 #, no-c-format
 msgid ""
@@ -1073,19 +1074,19 @@ msgid ""
 "floppy tape drives this should be set to <b>10240</b> bytes."
 msgstr ""
 
-#. i18n: file OptionsDlgWidget.ui line 73
+#. i18n: file OptionsDlgWidget.ui line 79
 #: rc.cpp:12
 #, no-c-format
 msgid "MB"
 msgstr "MB"
 
-#. i18n: file OptionsDlgWidget.ui line 78
+#. i18n: file OptionsDlgWidget.ui line 84
 #: rc.cpp:15
 #, no-c-format
 msgid "GB"
 msgstr "GB"
 
-#. i18n: file OptionsDlgWidget.ui line 88
+#. i18n: file OptionsDlgWidget.ui line 94
 #: rc.cpp:18
 #, no-c-format
 msgid ""
@@ -1093,31 +1094,31 @@ msgid ""
 "(MB) or gigabytes (GB)."
 msgstr ""
 
-#. i18n: file OptionsDlgWidget.ui line 96
+#. i18n: file OptionsDlgWidget.ui line 102
 #: rc.cpp:21
 #, no-c-format
 msgid "bytes"
 msgstr "beitiau"
 
-#. i18n: file OptionsDlgWidget.ui line 104
+#. i18n: file OptionsDlgWidget.ui line 110
 #: rc.cpp:24
 #, no-c-format
 msgid "Tape block size:"
 msgstr "Maint blociau'r tâp:"
 
-#. i18n: file OptionsDlgWidget.ui line 115
+#. i18n: file OptionsDlgWidget.ui line 121
 #: rc.cpp:27
 #, no-c-format
 msgid "Default tape size:"
 msgstr "Maint rhagosod y tâp:"
 
-#. i18n: file OptionsDlgWidget.ui line 139
+#. i18n: file OptionsDlgWidget.ui line 145
 #: rc.cpp:33
 #, no-c-format
 msgid "Browse for the tar command."
 msgstr ""
 
-#. i18n: file OptionsDlgWidget.ui line 147
+#. i18n: file OptionsDlgWidget.ui line 153
 #: rc.cpp:36
 #, no-c-format
 msgid ""
@@ -1125,19 +1126,19 @@ msgid ""
 "tape device.  The default is <b>/dev/tape</b>."
 msgstr ""
 
-#. i18n: file OptionsDlgWidget.ui line 155
+#. i18n: file OptionsDlgWidget.ui line 161
 #: rc.cpp:39
 #, no-c-format
 msgid "Tar command:"
 msgstr "Gorchymyn tar:"
 
-#. i18n: file OptionsDlgWidget.ui line 169
+#. i18n: file OptionsDlgWidget.ui line 175
 #: rc.cpp:45
 #, no-c-format
 msgid "Browse for the tape device."
 msgstr ""
 
-#. i18n: file OptionsDlgWidget.ui line 177
+#. i18n: file OptionsDlgWidget.ui line 183
 #: rc.cpp:48
 #, no-c-format
 msgid ""
@@ -1145,31 +1146,31 @@ msgid ""
 "The full path should be given.  The default is <b>tar</b>."
 msgstr ""
 
-#. i18n: file OptionsDlgWidget.ui line 185
+#. i18n: file OptionsDlgWidget.ui line 191
 #: rc.cpp:51
 #, no-c-format
 msgid "Tape device:"
 msgstr "Dyfais dâp:"
 
-#. i18n: file OptionsDlgWidget.ui line 198
+#. i18n: file OptionsDlgWidget.ui line 204
 #: rc.cpp:54
 #, no-c-format
 msgid "Tape Drive Options"
 msgstr "Dewisiadau'r Gyrriant Tâp"
 
-#. i18n: file OptionsDlgWidget.ui line 209
+#. i18n: file OptionsDlgWidget.ui line 215
 #: rc.cpp:57
 #, no-c-format
 msgid "Load tape on mount"
 msgstr "Llwytho tâp wrth arosod"
 
-#. i18n: file OptionsDlgWidget.ui line 212
+#. i18n: file OptionsDlgWidget.ui line 218
 #: rc.cpp:60
 #, no-c-format
 msgid "<qt>Issue an <tt>mtload</tt> command prior to mounting the tape.</qt>"
 msgstr ""
 
-#. i18n: file OptionsDlgWidget.ui line 217
+#. i18n: file OptionsDlgWidget.ui line 223
 #: rc.cpp:63
 #, no-c-format
 msgid ""
@@ -1179,19 +1180,19 @@ msgid ""
 "This is required by some tape drives."
 msgstr ""
 
-#. i18n: file OptionsDlgWidget.ui line 225
+#. i18n: file OptionsDlgWidget.ui line 231
 #: rc.cpp:68
 #, no-c-format
 msgid "Lock tape drive on mount"
 msgstr "Cloi'r gyrriant tâp wrth arosod"
 
-#. i18n: file OptionsDlgWidget.ui line 228
+#. i18n: file OptionsDlgWidget.ui line 234
 #: rc.cpp:71
 #, no-c-format
 msgid "Disable the eject button after mounting the tape."
 msgstr ""
 
-#. i18n: file OptionsDlgWidget.ui line 233
+#. i18n: file OptionsDlgWidget.ui line 239
 #: rc.cpp:74
 #, no-c-format
 msgid ""
@@ -1201,19 +1202,19 @@ msgid ""
 "This doesn't work for all tape drives."
 msgstr ""
 
-#. i18n: file OptionsDlgWidget.ui line 241
+#. i18n: file OptionsDlgWidget.ui line 247
 #: rc.cpp:79
 #, no-c-format
 msgid "Eject tape on unmount"
 msgstr "Allfwrw'r tâp wrth dadosod"
 
-#. i18n: file OptionsDlgWidget.ui line 244
+#. i18n: file OptionsDlgWidget.ui line 250
 #: rc.cpp:82
 #, no-c-format
 msgid "Try to eject the tape after it is unmounted.  Don't use this for ftape."
 msgstr ""
 
-#. i18n: file OptionsDlgWidget.ui line 249
+#. i18n: file OptionsDlgWidget.ui line 255
 #: rc.cpp:85
 #, no-c-format
 msgid ""
@@ -1222,19 +1223,19 @@ msgid ""
 "This option should not be used for floppy-tape drives."
 msgstr ""
 
-#. i18n: file OptionsDlgWidget.ui line 257
+#. i18n: file OptionsDlgWidget.ui line 263
 #: rc.cpp:90
 #, no-c-format
 msgid "Variable block size"
 msgstr "Maint y blociau newidiol "
 
-#. i18n: file OptionsDlgWidget.ui line 260
+#. i18n: file OptionsDlgWidget.ui line 266
 #: rc.cpp:93
 #, no-c-format
 msgid "Enable variable-block size support in the tape drive."
 msgstr ""
 
-#. i18n: file OptionsDlgWidget.ui line 265
+#. i18n: file OptionsDlgWidget.ui line 271
 #: rc.cpp:96
 #, no-c-format
 msgid ""
diff --git a/tde-i18n-cy/messages/tdeadmin/knetworkconf.po b/tde-i18n-cy/messages/tdeadmin/knetworkconf.po
index 2464305e359..e968ecc5a7e 100644
--- a/tde-i18n-cy/messages/tdeadmin/knetworkconf.po
+++ b/tde-i18n-cy/messages/tdeadmin/knetworkconf.po
@@ -1,33 +1,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: all2.po\n"
-"POT-Creation-Date: 2008-07-08 01:20+0200\n"
+"POT-Creation-Date: 2014-09-29 00:51-0500\n"
 "PO-Revision-Date: 2005-02-22 02:28+0100\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kadddevicecontainer.cpp:129 kadddnsserverdlg.ui.h:42
-#: kaddknownhostdlg.ui.h:25
-msgid "The format of the specified IP address is not valid."
-msgstr ""
-
-#: kadddevicecontainer.cpp:129 kadddevicecontainer.cpp:132
-#: kadddevicecontainer.cpp:135 kadddevicecontainer.cpp:138
-#: kadddnsserverdlg.ui.h:42 kaddknownhostdlg.ui.h:25 knetworkconf.cpp:589
-msgid "Invalid IP Address"
-msgstr ""
-
-#: kadddnsserverdlg.ui.h:54
-msgid "You have to type an alias first."
-msgstr ""
-
-#: kadddnsserverdlg.ui.h:54
-msgid "Invalid Text"
-msgstr ""
-
 #: _translatorinfo.cpp:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
@@ -40,6 +22,51 @@ msgid ""
 "Your emails"
 msgstr "kyfieithu@dotmon.com"
 
+#: knetworkconfmodule.cpp:94
+msgid "KNetworkConf"
+msgstr ""
+
+#: knetworkconfmodule.cpp:97
+msgid "Lead Developer"
+msgstr ""
+
+#: knetworkconfmodule.cpp:99
+msgid "Provided the Network backend which KNetworkConf relies on."
+msgstr ""
+
+#: knetworkconfmodule.cpp:101
+msgid "Conectiva Linux Support"
+msgstr ""
+
+#: knetworkconfmodule.cpp:103
+msgid "Documentation maintainer, and German translator"
+msgstr ""
+
+#: knetworkconfmodule.cpp:105
+msgid "Various bugfixes and features"
+msgstr ""
+
+#: knetworkconfmodule.cpp:107
+msgid "Various bugfixes and Brazilian Portuguese translator"
+msgstr ""
+
+#: knetworkconfmodule.cpp:113
+msgid ""
+"%1Network configuration%2This module allows you to configure your TCP/IP "
+"settings.%3"
+msgstr ""
+
+#: kadddevicecontainer.cpp:129 kadddnsserverdlg.ui.h:42
+#: kaddknownhostdlg.ui.h:25
+msgid "The format of the specified IP address is not valid."
+msgstr ""
+
+#: kadddevicecontainer.cpp:129 kadddevicecontainer.cpp:132
+#: kadddevicecontainer.cpp:135 kadddevicecontainer.cpp:138
+#: kadddnsserverdlg.ui.h:42 kaddknownhostdlg.ui.h:25 knetworkconf.cpp:589
+msgid "Invalid IP Address"
+msgstr ""
+
 #: kaddknownhostdlg.ui.h:29
 msgid "You must add at least one alias for the specified IP address."
 msgstr ""
@@ -173,42 +200,6 @@ msgstr ""
 msgid "There is already another profile with that name."
 msgstr ""
 
-#: kadddevicecontainer.cpp:53
-msgid "&Advanced Settings"
-msgstr "&Gosodiadau Uwch"
-
-#: kadddevicecontainer.cpp:54 kadddevicecontainer.cpp:55
-msgid "Toggle between advanced and basic settings"
-msgstr ""
-
-#: kadddevicecontainer.cpp:57
-msgid "Apply changes"
-msgstr "Cymhwyso'r newidiadau"
-
-#: kadddevicecontainer.cpp:59
-msgid "Forget changes"
-msgstr ""
-
-#: kadddevicecontainer.cpp:132
-msgid "The format of the specified netmask is not valid."
-msgstr ""
-
-#: kadddevicecontainer.cpp:135
-msgid "The format of the specified broadcast is not valid."
-msgstr ""
-
-#: kadddevicecontainer.cpp:138
-msgid "The format of the specified Gateway is not valid."
-msgstr ""
-
-#: kadddevicecontainer.cpp:174
-msgid "Basic Settings"
-msgstr ""
-
-#: kadddevicecontainer.cpp:179
-msgid "Advanced Settings"
-msgstr "Gosodiadau Uwch"
-
 #: kprofileslistviewtooltip.h:84
 msgid "<b>Network Configuration of this Profile:</b>"
 msgstr ""
@@ -263,6 +254,50 @@ msgstr ""
 msgid "<br><b>DNS Name Server:</b> %1"
 msgstr ""
 
+#: kadddevicecontainer.cpp:53
+msgid "&Advanced Settings"
+msgstr "&Gosodiadau Uwch"
+
+#: kadddevicecontainer.cpp:54 kadddevicecontainer.cpp:55
+msgid "Toggle between advanced and basic settings"
+msgstr ""
+
+#: kadddevicecontainer.cpp:57
+msgid "Apply changes"
+msgstr "Cymhwyso'r newidiadau"
+
+#: kadddevicecontainer.cpp:59
+msgid "Forget changes"
+msgstr ""
+
+#: kadddevicecontainer.cpp:132
+msgid "The format of the specified netmask is not valid."
+msgstr ""
+
+#: kadddevicecontainer.cpp:135
+msgid "The format of the specified broadcast is not valid."
+msgstr ""
+
+#: kadddevicecontainer.cpp:138
+msgid "The format of the specified Gateway is not valid."
+msgstr ""
+
+#: kadddevicecontainer.cpp:174
+msgid "Basic Settings"
+msgstr ""
+
+#: kadddevicecontainer.cpp:179
+msgid "Advanced Settings"
+msgstr "Gosodiadau Uwch"
+
+#: kadddnsserverdlg.ui.h:54
+msgid "You have to type an alias first."
+msgstr ""
+
+#: kadddnsserverdlg.ui.h:54
+msgid "Invalid Text"
+msgstr ""
+
 #. i18n: file kadddevicedlg.ui line 44
 #: rc.cpp:3
 #, no-c-format
@@ -896,45 +931,16 @@ msgid ""
 "current network configuration could be damaged."
 msgstr ""
 
-#: knetworkconfmodule.cpp:94
-msgid "KNetworkConf"
-msgstr ""
-
-#: knetworkconfmodule.cpp:97
-msgid "Lead Developer"
-msgstr ""
-
-#: knetworkconfmodule.cpp:99
-msgid "Provided the Network backend which KNetworkConf relies on."
-msgstr ""
-
-#: knetworkconfmodule.cpp:101
-msgid "Conectiva Linux Support"
-msgstr ""
-
-#: knetworkconfmodule.cpp:103
-msgid "Documentation maintainer, and German translator"
-msgstr ""
-
-#: knetworkconfmodule.cpp:105
-msgid "Various bugfixes and features"
-msgstr ""
-
-#: knetworkconfmodule.cpp:107
-msgid "Various bugfixes and Brazilian Portuguese translator"
-msgstr ""
-
-#: knetworkconfmodule.cpp:113
+#: version.h:5
 msgid ""
-"%1Network configuration%2This module allows you to configure your TCP/IP "
-"settings.%3"
+"KNetworkConf - A Trinity Control Center module to configure TCP/IP settings."
 msgstr ""
 
 #: knetworkconfigparser.cpp:41
 msgid ""
 "Could not find the backend script for the network configuration detection. "
 "Something is wrong with your installation.\n"
-" Please check that  \n"
+" Please check that \n"
 "{TDE_PATH}/%1 \n"
 "file is present."
 msgstr ""
@@ -998,11 +1004,6 @@ msgstr ""
 msgid "Error Obtaining Supported Platforms List"
 msgstr ""
 
-#: version.h:5
-msgid ""
-"KNetworkConf - A Trinity Control Center module to configure TCP/IP settings."
-msgstr ""
-
 #, fuzzy
 #~ msgid "Could not parse the XML file."
 #~ msgstr "Methwyd agor y ffeil"
diff --git a/tde-i18n-cy/messages/tdeadmin/kpackage.po b/tde-i18n-cy/messages/tdeadmin/kpackage.po
index 8b24a02b9cc..31500666f2a 100644
--- a/tde-i18n-cy/messages/tdeadmin/kpackage.po
+++ b/tde-i18n-cy/messages/tdeadmin/kpackage.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kpackage\n"
-"POT-Creation-Date: 2006-08-29 02:38+0200\n"
+"POT-Creation-Date: 2014-09-29 00:51-0500\n"
 "PO-Revision-Date: 2004-02-26 16:50+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeadmin/ksysv.po b/tde-i18n-cy/messages/tdeadmin/ksysv.po
index cf3b90d4c3a..acf7da0c0bf 100644
--- a/tde-i18n-cy/messages/tdeadmin/ksysv.po
+++ b/tde-i18n-cy/messages/tdeadmin/ksysv.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ksysv\n"
-"POT-Creation-Date: 2007-09-19 01:14+0200\n"
+"POT-Creation-Date: 2014-09-29 00:51-0500\n"
 "PO-Revision-Date: 2004-02-26 16:56+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeadmin/kuser.po b/tde-i18n-cy/messages/tdeadmin/kuser.po
index 6a8fec888b3..4549edc32dc 100644
--- a/tde-i18n-cy/messages/tdeadmin/kuser.po
+++ b/tde-i18n-cy/messages/tdeadmin/kuser.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kuser\n"
-"POT-Creation-Date: 2008-07-08 01:20+0200\n"
+"POT-Creation-Date: 2014-09-29 00:51-0500\n"
 "PO-Revision-Date: 2004-02-26 13:58+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeadmin/secpolicy.po b/tde-i18n-cy/messages/tdeadmin/secpolicy.po
index 3b6dd1786e1..a442327fe3c 100644
--- a/tde-i18n-cy/messages/tdeadmin/secpolicy.po
+++ b/tde-i18n-cy/messages/tdeadmin/secpolicy.po
@@ -3,10 +3,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: secpolicy\n"
-"POT-Creation-Date: 2005-02-06 01:20+0100\n"
+"POT-Creation-Date: 2014-09-29 00:51-0500\n"
 "PO-Revision-Date: 2004-02-27 12:15+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeadmin/tdefile_deb.po b/tde-i18n-cy/messages/tdeadmin/tdefile_deb.po
index 8f53862e814..fd62013d397 100644
--- a/tde-i18n-cy/messages/tdeadmin/tdefile_deb.po
+++ b/tde-i18n-cy/messages/tdeadmin/tdefile_deb.po
@@ -3,10 +3,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_deb\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:51-0500\n"
 "PO-Revision-Date: 2004-02-27 12:12+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeadmin/tdefile_rpm.po b/tde-i18n-cy/messages/tdeadmin/tdefile_rpm.po
index f7c6991b9d2..d4c6e221dd7 100644
--- a/tde-i18n-cy/messages/tdeadmin/tdefile_rpm.po
+++ b/tde-i18n-cy/messages/tdeadmin/tdefile_rpm.po
@@ -3,10 +3,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_rpm\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:51-0500\n"
 "PO-Revision-Date: 2004-02-27 12:13+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeartwork/klock.po b/tde-i18n-cy/messages/tdeartwork/klock.po
index a551ed20472..a4fbd7b931e 100644
--- a/tde-i18n-cy/messages/tdeartwork/klock.po
+++ b/tde-i18n-cy/messages/tdeartwork/klock.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdeartwork/klock.po\n"
-"POT-Creation-Date: 2008-07-08 01:23+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -71,7 +72,7 @@ msgid ""
 "<br>\n"
 "<a href=\"http://www.reallyslick.com/\">http://www.reallyslick.com/</a></p>\n"
 "\n"
-"<p>Ported to TDE by Karl Robillard</p>"
+"<p>Ported to KDE by Karl Robillard</p>"
 msgstr ""
 
 #: kdesavers/Flux.cpp:784
@@ -109,7 +110,7 @@ msgid ""
 "<br>\n"
 "<a href=\"http://www.reallyslick.com/\">http://www.reallyslick.com/</a></p>\n"
 "\n"
-"<p>Ported to TDE by Karl Robillard</p>"
+"<p>Ported to KDE by Karl Robillard</p>"
 msgstr ""
 
 #: kdesavers/SolarWinds.cpp:598
@@ -147,7 +148,7 @@ msgid ""
 "<br>\n"
 "<a href=\"http://www.reallyslick.com/\">http://www.reallyslick.com/</a></p>\n"
 "\n"
-"<p>Ported to TDE by Karl Robillard</p>"
+"<p>Ported to KDE by Karl Robillard</p>"
 msgstr ""
 
 #: kdesavers/banner.cpp:44
@@ -529,7 +530,7 @@ msgstr ""
 
 #: kdesavers/pendulum.cpp:788
 msgid ""
-"<h3>KPendulum Screen Saver for TDE</h3>"
+"<h3>KPendulum Screen Saver for KDE</h3>"
 "<p>Simulation of a two-part pendulum</p>"
 "<p>Copyright (c) Georg&nbsp;Drenkhahn 2004</p>"
 "<p><tt>georg-d@users.sourceforge.net</tt></p>"
@@ -573,7 +574,7 @@ msgstr ""
 
 #: kdesavers/rotation.cpp:782
 msgid ""
-"<h3>KRotation Screen Saver for TDE</h3>"
+"<h3>KRotation Screen Saver for KDE</h3>"
 "<p>Simulation of a force free rotating asymmetric body</p>"
 "<p>Copyright (c) Georg&nbsp;Drenkhahn 2004</p>"
 "<p><tt>georg-d@users.sourceforge.net</tt></p>"
diff --git a/tde-i18n-cy/messages/tdeartwork/kxsconfig.po b/tde-i18n-cy/messages/tdeartwork/kxsconfig.po
index 267de08b8aa..ed479106c5a 100644
--- a/tde-i18n-cy/messages/tdeartwork/kxsconfig.po
+++ b/tde-i18n-cy/messages/tdeartwork/kxsconfig.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdeartwork/kxsconfig.po\n"
-"POT-Creation-Date: 2007-05-22 02:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeartwork/tdepartsaver.po b/tde-i18n-cy/messages/tdeartwork/tdepartsaver.po
index 05d5a3ee3e0..9e1044ec05e 100644
--- a/tde-i18n-cy/messages/tdeartwork/tdepartsaver.po
+++ b/tde-i18n-cy/messages/tdeartwork/tdepartsaver.po
@@ -1,30 +1,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdeartwork/tdepartsaver.po\n"
-"POT-Creation-Date: 2007-02-26 02:46+0100\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: tdepartsaver.cpp:62
-msgid "KPart Screen Saver"
-msgstr ""
-
-#: tdepartsaver.cpp:124
-msgid "The screen saver is not configured yet."
-msgstr ""
-
-#: tdepartsaver.cpp:258
-msgid "All of your files are unsupported"
-msgstr ""
-
-#: tdepartsaver.cpp:341
-msgid "Select Media Files"
-msgstr ""
-
 #. i18n: file configwidget.ui line 17
 #: rc.cpp:3
 #, no-c-format
@@ -84,3 +69,19 @@ msgstr ""
 #, no-c-format
 msgid "seconds"
 msgstr "eiliad"
+
+#: tdepartsaver.cpp:62
+msgid "KPart Screen Saver"
+msgstr ""
+
+#: tdepartsaver.cpp:124
+msgid "The screen saver is not configured yet."
+msgstr ""
+
+#: tdepartsaver.cpp:258
+msgid "All of your files are unsupported"
+msgstr ""
+
+#: tdepartsaver.cpp:341
+msgid "Select Media Files"
+msgstr ""
diff --git a/tde-i18n-cy/messages/tdeartwork/tdestyle_phase_config.po b/tde-i18n-cy/messages/tdeartwork/tdestyle_phase_config.po
index 1d53b2465c0..c828fe58788 100644
--- a/tde-i18n-cy/messages/tdeartwork/tdestyle_phase_config.po
+++ b/tde-i18n-cy/messages/tdeartwork/tdestyle_phase_config.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: all2.po\n"
-"POT-Creation-Date: 2005-01-31 01:35+0100\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeartwork/twin_art_clients.po b/tde-i18n-cy/messages/tdeartwork/twin_art_clients.po
index 598af6f8c6a..db3e62ff373 100644
--- a/tde-i18n-cy/messages/tdeartwork/twin_art_clients.po
+++ b/tde-i18n-cy/messages/tdeartwork/twin_art_clients.po
@@ -6,22 +6,18 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: all.po\n"
-"POT-Creation-Date: 2005-12-17 03:14+0100\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cde/cdeclient.cpp:299
-msgid "<center><b>CDE preview</b></center>"
-msgstr ""
-
-#: cde/cdeclient.cpp:328 icewm/icewm.cpp:976 icewm/icewm.cpp:980
-#: kde1/kde1client.cpp:308 kstep/nextclient.cpp:511
-msgid "Menu"
-msgstr "Dewislen"
+#: kstep/nextclient.cpp:841 riscos/AboveButton.cpp:48
+msgid "Keep above others"
+msgstr "Cadw Uwchben y Lleill"
 
 #: cde/cdeclient.cpp:350 glow/glowclient.cpp:664 icewm/icewm.cpp:1017
 #: kde1/kde1client.cpp:346 kstep/nextclient.cpp:502
@@ -29,52 +25,6 @@ msgstr "Dewislen"
 msgid "Minimize"
 msgstr "Lleihau"
 
-#: cde/cdeclient.cpp:361 cde/cdeclient.cpp:400 glow/glowclient.cpp:606
-#: glow/glowclient.cpp:670 icewm/icewm.cpp:1005 icewm/icewm.cpp:1525
-#: kde1/kde1client.cpp:358 kde1/kde1client.cpp:444 kstep/nextclient.cpp:481
-#: kstep/nextclient.cpp:776 riscos/MaximiseButton.cpp:69
-#: riscos/MaximiseButton.cpp:83 system/systemclient.cpp:391
-#: system/systemclient.cpp:630
-msgid "Maximize"
-msgstr "Ehangu"
-
-#: cde/config/config.cpp:31
-msgid "Text &Alignment"
-msgstr ""
-
-#: cde/config/config.cpp:33
-msgid "Use these buttons to set the alignment of the titlebar caption text."
-msgstr ""
-
-#: cde/config/config.cpp:35
-msgid "Centered"
-msgstr "Wedi'i ganoli"
-
-#: cde/config/config.cpp:39
-msgid "Draw window frames using &titlebar colors"
-msgstr "Darlunio fframau ffenestri â lliwia'r bar &teitl"
-
-#: cde/config/config.cpp:40
-msgid ""
-"When selected, the window decoration borders are drawn using the titlebar "
-"colors. Otherwise, they are drawn using normal border colors instead."
-msgstr ""
-"Pan yn ddewisiedig, darlunir ffiniau addurno'r ffenestri â lliwiau'r bar teitl. "
-"Heblaw hynny, fe'u darlunir â'r lliwiau ffiniau arferol."
-
-#: cde/config/config.cpp:48
-msgid ""
-"Tip: If you want the look of the original Motif(tm) Window Manager,\n"
-"click the \"Buttons\" tab above and remove the help\n"
-"and close buttons from the titlebar."
-msgstr ""
-
-#: glow/glowclient.cpp:586 glow/glowclient.cpp:652 icewm/icewm.cpp:1048
-#: icewm/icewm.cpp:1501 kstep/nextclient.cpp:765 riscos/StickyButton.cpp:82
-#: system/systemclient.cpp:659
-msgid "Not on all desktops"
-msgstr ""
-
 #: glow/glowclient.cpp:591 glow/glowclient.cpp:652 icewm/icewm.cpp:1048
 #: icewm/icewm.cpp:1501 kstep/nextclient.cpp:530 kstep/nextclient.cpp:765
 #: riscos/StickyButton.cpp:70 riscos/StickyButton.cpp:83
@@ -82,50 +32,38 @@ msgstr ""
 msgid "On all desktops"
 msgstr "Ar Bob Penbwrdd"
 
-#: glow/glowclient.cpp:718
-msgid "<b><center>Glow preview</center></b>"
-msgstr ""
-
-#: glow/config/glowconfigdialog.cpp:69
-msgid "Theme"
-msgstr "Thema"
-
-#: glow/config/glowconfigdialog.cpp:70
-msgid "Button Size"
-msgstr ""
-
-#: glow/config/glowconfigdialog.cpp:80
-msgid "Button Glow Colors"
-msgstr ""
-
-#: glow/config/glowconfigdialog.cpp:161
-msgid "Titlebar gradient:"
-msgstr ""
-
-#: glow/config/glowconfigdialog.cpp:168
-msgid "Show resize handle"
+#: glow/glowclient.cpp:586 glow/glowclient.cpp:652 icewm/icewm.cpp:1048
+#: icewm/icewm.cpp:1501 kstep/nextclient.cpp:765 riscos/StickyButton.cpp:82
+#: system/systemclient.cpp:659
+msgid "Not on all desktops"
 msgstr ""
 
-#: kde1/kde1client.cpp:257
-msgid "<center><b>TDE 1 preview</b></center>"
-msgstr ""
+#: kstep/nextclient.cpp:852 riscos/LowerButton.cpp:48
+msgid "Keep below others"
+msgstr "Cadw Dan y Lleill"
 
-#: kde1/kde1client.cpp:323 kde1/kde1client.cpp:457
-msgid "Not On All Desktops"
+#: riscos/Manager.cpp:714
+msgid "<center><b>RiscOS preview</b></center>"
 msgstr ""
 
-#: kde1/kde1client.cpp:323 kde1/kde1client.cpp:457
-msgid "On All Desktops"
-msgstr "Ar Bob Penbwrdd"
-
-#: kde1/kde1client.cpp:606
-msgid "<center><b>TDE 1 decoration</b></center>"
-msgstr ""
+#: cde/cdeclient.cpp:361 cde/cdeclient.cpp:400 glow/glowclient.cpp:606
+#: glow/glowclient.cpp:670 icewm/icewm.cpp:1005 icewm/icewm.cpp:1525
+#: kde1/kde1client.cpp:358 kde1/kde1client.cpp:444 kstep/nextclient.cpp:481
+#: kstep/nextclient.cpp:776 riscos/MaximiseButton.cpp:69
+#: riscos/MaximiseButton.cpp:83 system/systemclient.cpp:391
+#: system/systemclient.cpp:630
+msgid "Maximize"
+msgstr "Ehangu"
 
 #: icewm/icewm.cpp:903 icewm/icewm.cpp:913
 msgid "<center><b>IceWM preview</b></center>"
 msgstr ""
 
+#: cde/cdeclient.cpp:328 icewm/icewm.cpp:976 icewm/icewm.cpp:980
+#: kde1/kde1client.cpp:308 kstep/nextclient.cpp:511
+msgid "Menu"
+msgstr "Dewislen"
+
 #: icewm/icewm.cpp:1036 icewm/icewm.cpp:1536
 msgid "Rollup"
 msgstr ""
@@ -185,6 +123,34 @@ msgstr ""
 msgid "Infadel #2 (default)"
 msgstr ""
 
+#: glow/glowclient.cpp:718
+msgid "<b><center>Glow preview</center></b>"
+msgstr ""
+
+#: glow/config/glowconfigdialog.cpp:69
+msgid "Theme"
+msgstr "Thema"
+
+#: glow/config/glowconfigdialog.cpp:70
+msgid "Button Size"
+msgstr ""
+
+#: glow/config/glowconfigdialog.cpp:80
+msgid "Button Glow Colors"
+msgstr ""
+
+#: glow/config/glowconfigdialog.cpp:161
+msgid "Titlebar gradient:"
+msgstr ""
+
+#: glow/config/glowconfigdialog.cpp:168
+msgid "Show resize handle"
+msgstr ""
+
+#: system/systemclient.cpp:307
+msgid "<center><b>System++ preview</b></center>"
+msgstr ""
+
 #: kstep/nextclient.cpp:415
 msgid "<center><b>KStep preview</b></center>"
 msgstr ""
@@ -205,28 +171,63 @@ msgstr "Dat-gysgodi"
 msgid "Do not keep above others"
 msgstr ""
 
-#: kstep/nextclient.cpp:841 riscos/AboveButton.cpp:48
-msgid "Keep above others"
-msgstr "Cadw Uwchben y Lleill"
-
 #: kstep/nextclient.cpp:852
 msgid "Do not keep below others"
 msgstr ""
 
-#: kstep/nextclient.cpp:852 riscos/LowerButton.cpp:48
-msgid "Keep below others"
-msgstr "Cadw Dan y Lleill"
+#: openlook/OpenLook.cpp:362
+msgid "<center><b>OpenLook preview</b></center>"
+msgstr ""
 
-#: riscos/Manager.cpp:714
-msgid "<center><b>RiscOS preview</b></center>"
+#: cde/config/config.cpp:31
+msgid "Text &Alignment"
 msgstr ""
 
-#: system/systemclient.cpp:307
-msgid "<center><b>System++ preview</b></center>"
+#: cde/config/config.cpp:33
+msgid "Use these buttons to set the alignment of the titlebar caption text."
 msgstr ""
 
-#: openlook/OpenLook.cpp:362
-msgid "<center><b>OpenLook preview</b></center>"
+#: cde/config/config.cpp:35
+msgid "Centered"
+msgstr "Wedi'i ganoli"
+
+#: cde/config/config.cpp:39
+msgid "Draw window frames using &titlebar colors"
+msgstr "Darlunio fframau ffenestri â lliwia'r bar &teitl"
+
+#: cde/config/config.cpp:40
+msgid ""
+"When selected, the window decoration borders are drawn using the titlebar "
+"colors. Otherwise, they are drawn using normal border colors instead."
+msgstr ""
+"Pan yn ddewisiedig, darlunir ffiniau addurno'r ffenestri â lliwiau'r bar teitl. "
+"Heblaw hynny, fe'u darlunir â'r lliwiau ffiniau arferol."
+
+#: cde/config/config.cpp:48
+msgid ""
+"Tip: If you want the look of the original Motif(tm) Window Manager,\n"
+"click the \"Buttons\" tab above and remove the help\n"
+"and close buttons from the titlebar."
+msgstr ""
+
+#: cde/cdeclient.cpp:299
+msgid "<center><b>CDE preview</b></center>"
+msgstr ""
+
+#: kde1/kde1client.cpp:257
+msgid "<center><b>KDE 1 preview</b></center>"
+msgstr ""
+
+#: kde1/kde1client.cpp:323 kde1/kde1client.cpp:457
+msgid "Not On All Desktops"
+msgstr ""
+
+#: kde1/kde1client.cpp:323 kde1/kde1client.cpp:457
+msgid "On All Desktops"
+msgstr "Ar Bob Penbwrdd"
+
+#: kde1/kde1client.cpp:606
+msgid "<center><b>KDE 1 decoration</b></center>"
 msgstr ""
 
 #~ msgid "Sticky"
diff --git a/tde-i18n-cy/messages/tdebase/appletproxy.po b/tde-i18n-cy/messages/tdebase/appletproxy.po
index d7ee67a5dcf..3e10d36a8fb 100644
--- a/tde-i18n-cy/messages/tdebase/appletproxy.po
+++ b/tde-i18n-cy/messages/tdebase/appletproxy.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: appletproxy\n"
-"POT-Creation-Date: 2006-04-09 03:51+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2005-09-03 19:08+0100\n"
 "Last-Translator: Kevin Donnelly <kevin@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdebase/clockapplet.po b/tde-i18n-cy/messages/tdebase/clockapplet.po
index 5a7366aecfd..ad38d5b1800 100644
--- a/tde-i18n-cy/messages/tdebase/clockapplet.po
+++ b/tde-i18n-cy/messages/tdebase/clockapplet.po
@@ -10,353 +10,354 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: clockapplet\n"
-"POT-Creation-Date: 2008-08-19 01:16+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-06-30 10:57+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.2\n"
 "\n"
 
-#: clock.cpp:93
+#: clock.cpp:83
 msgid "Configure - Clock"
 msgstr "Ffurfweddu - Cloc"
 
-#: clock.cpp:136
+#: clock.cpp:126
 msgid "General"
 msgstr "Cyffredinol"
 
-#: clock.cpp:680
+#: clock.cpp:697
 msgid ""
 "_: hour\n"
 "one"
 msgstr "un"
 
-#: clock.cpp:680
+#: clock.cpp:697
 msgid ""
 "_: hour\n"
 "two"
 msgstr "dau"
 
-#: clock.cpp:681
+#: clock.cpp:698
 msgid ""
 "_: hour\n"
 "three"
 msgstr "tri"
 
-#: clock.cpp:681
+#: clock.cpp:698
 msgid ""
 "_: hour\n"
 "four"
 msgstr "pedwar"
 
-#: clock.cpp:681
+#: clock.cpp:698
 msgid ""
 "_: hour\n"
 "five"
 msgstr "pump"
 
-#: clock.cpp:682
+#: clock.cpp:699
 msgid ""
 "_: hour\n"
 "six"
 msgstr "chwech"
 
-#: clock.cpp:682
+#: clock.cpp:699
 msgid ""
 "_: hour\n"
 "seven"
 msgstr "saith"
 
-#: clock.cpp:682
+#: clock.cpp:699
 msgid ""
 "_: hour\n"
 "eight"
 msgstr "wyth"
 
-#: clock.cpp:683
+#: clock.cpp:700
 msgid ""
 "_: hour\n"
 "nine"
 msgstr "naw"
 
-#: clock.cpp:683
+#: clock.cpp:700
 msgid ""
 "_: hour\n"
 "ten"
 msgstr "deg"
 
-#: clock.cpp:683
+#: clock.cpp:700
 msgid ""
 "_: hour\n"
 "eleven"
 msgstr "un ar ddeg"
 
-#: clock.cpp:684
+#: clock.cpp:701
 msgid ""
 "_: hour\n"
 "twelve"
 msgstr "deuddeg"
 
-#: clock.cpp:687
+#: clock.cpp:704
 #, no-c-format
 msgid "%0 o'clock"
 msgstr "%0 o'r gloch"
 
-#: clock.cpp:688
+#: clock.cpp:705
 #, no-c-format
 msgid "five past %0"
 msgstr "pum munud wedi %0"
 
-#: clock.cpp:689
+#: clock.cpp:706
 #, no-c-format
 msgid "ten past %0"
 msgstr "deng munud wedi %0"
 
-#: clock.cpp:690
+#: clock.cpp:707
 #, no-c-format
 msgid "quarter past %0"
 msgstr "chwarter wedi %0"
 
-#: clock.cpp:691
+#: clock.cpp:708
 #, no-c-format
 msgid "twenty past %0"
 msgstr "ugain munud wedi %0"
 
-#: clock.cpp:692
+#: clock.cpp:709
 #, no-c-format
 msgid "twenty five past %0"
 msgstr "pum munud ar hugain wedi %0"
 
-#: clock.cpp:693
+#: clock.cpp:710
 #, no-c-format
 msgid "half past %0"
 msgstr "hanner awr wedi %0"
 
-#: clock.cpp:694
+#: clock.cpp:711
 #, no-c-format
 msgid "twenty five to %1"
 msgstr "pum munud ar hugain i %1"
 
-#: clock.cpp:695
+#: clock.cpp:712
 #, no-c-format
 msgid "twenty to %1"
 msgstr "ugain munud i %1"
 
-#: clock.cpp:696
+#: clock.cpp:713
 #, no-c-format
 msgid "quarter to %1"
 msgstr "chwarter i %1"
 
-#: clock.cpp:697
+#: clock.cpp:714
 #, no-c-format
 msgid "ten to %1"
 msgstr "deng munud i %1"
 
-#: clock.cpp:698
+#: clock.cpp:715
 #, no-c-format
 msgid "five to %1"
 msgstr "pum munud i %1"
 
-#: clock.cpp:699
+#: clock.cpp:716
 #, no-c-format
 msgid "%1 o'clock"
 msgstr "%1 o'r gloch"
 
-#: clock.cpp:702
+#: clock.cpp:719
 #, no-c-format
 msgid ""
 "_: one\n"
 "%0 o'clock"
 msgstr "%0 o'r gloch"
 
-#: clock.cpp:703
+#: clock.cpp:720
 #, no-c-format
 msgid ""
 "_: one\n"
 "five past %0"
 msgstr "pum munud wedi %0"
 
-#: clock.cpp:704
+#: clock.cpp:721
 #, no-c-format
 msgid ""
 "_: one\n"
 "ten past %0"
 msgstr "deng munud wedi %0"
 
-#: clock.cpp:705
+#: clock.cpp:722
 #, no-c-format
 msgid ""
 "_: one\n"
 "quarter past %0"
 msgstr "chwarter wedi %0"
 
-#: clock.cpp:706
+#: clock.cpp:723
 #, no-c-format
 msgid ""
 "_: one\n"
 "twenty past %0"
 msgstr "ugain munud wedi %0"
 
-#: clock.cpp:707
+#: clock.cpp:724
 #, no-c-format
 msgid ""
 "_: one\n"
 "twenty five past %0"
 msgstr "pum munud ar hugain wedi %0"
 
-#: clock.cpp:708
+#: clock.cpp:725
 #, no-c-format
 msgid ""
 "_: one\n"
 "half past %0"
 msgstr "hanner awr wedi %0"
 
-#: clock.cpp:709
+#: clock.cpp:726
 #, no-c-format
 msgid ""
 "_: one\n"
 "twenty five to %1"
 msgstr "pum munud ar hugain i %1"
 
-#: clock.cpp:710
+#: clock.cpp:727
 #, no-c-format
 msgid ""
 "_: one\n"
 "twenty to %1"
 msgstr "ugain munud i %1"
 
-#: clock.cpp:711
+#: clock.cpp:728
 #, no-c-format
 msgid ""
 "_: one\n"
 "quarter to %1"
 msgstr "chwarter i %1"
 
-#: clock.cpp:712
+#: clock.cpp:729
 #, no-c-format
 msgid ""
 "_: one\n"
 "ten to %1"
 msgstr "deng munud i %1"
 
-#: clock.cpp:713
+#: clock.cpp:730
 #, no-c-format
 msgid ""
 "_: one\n"
 "five to %1"
 msgstr "pum munud i %1"
 
-#: clock.cpp:714
+#: clock.cpp:731
 #, no-c-format
 msgid ""
 "_: one\n"
 "%1 o'clock"
 msgstr "%1 o'r gloch"
 
-#: clock.cpp:716
+#: clock.cpp:733
 msgid "Night"
 msgstr "Nos"
 
-#: clock.cpp:717
+#: clock.cpp:734
 msgid "Early morning"
 msgstr "Ben bore"
 
-#: clock.cpp:717
+#: clock.cpp:734
 msgid "Morning"
 msgstr "Bore"
 
-#: clock.cpp:717
+#: clock.cpp:734
 msgid "Almost noon"
 msgstr "Bron hanner dydd"
 
-#: clock.cpp:718
+#: clock.cpp:735
 msgid "Noon"
 msgstr "Hanner dydd"
 
-#: clock.cpp:718
+#: clock.cpp:735
 msgid "Afternoon"
 msgstr "Prynhawn"
 
-#: clock.cpp:718
+#: clock.cpp:735
 msgid "Evening"
 msgstr "Noswaith"
 
-#: clock.cpp:719
+#: clock.cpp:736
 msgid "Late evening"
 msgstr "Min nos"
 
-#: clock.cpp:821
+#: clock.cpp:838
 msgid "Start of week"
 msgstr "Dechrau'r wythnos"
 
-#: clock.cpp:823
+#: clock.cpp:840
 msgid "Middle of week"
 msgstr "Canol yr wythnos"
 
-#: clock.cpp:825
+#: clock.cpp:842
 msgid "End of week"
 msgstr "Diwedd yr wythnos"
 
-#: clock.cpp:827
+#: clock.cpp:844
 msgid "Weekend!"
 msgstr "Penwythnos!"
 
-#: clock.cpp:1502
+#: clock.cpp:1541
 msgid "Clock"
 msgstr "Cloc"
 
-#: clock.cpp:1528 clock.cpp:1731
+#: clock.cpp:1567 clock.cpp:1770
 msgid "Local Timezone"
 msgstr "Amserfa leol"
 
-#: clock.cpp:1537
+#: clock.cpp:1576
 msgid "&Configure Timezones..."
 msgstr "&Ffurfweddu Amserfeydd..."
 
-#: clock.cpp:1541
+#: clock.cpp:1580
 msgid "&Plain"
 msgstr "&Plaen"
 
-#: clock.cpp:1542
+#: clock.cpp:1581
 msgid "&Digital"
 msgstr "&Digidol"
 
-#: clock.cpp:1543
+#: clock.cpp:1582
 msgid "&Analog"
 msgstr "A&nalog"
 
-#: clock.cpp:1544
+#: clock.cpp:1583
 msgid "&Fuzzy"
 msgstr "&Niwlaidd"
 
-#: clock.cpp:1547
+#: clock.cpp:1586
 msgid "&Type"
 msgstr "&Math"
 
-#: clock.cpp:1548
+#: clock.cpp:1587
 msgid "Show Time&zone"
 msgstr "Dangos Amser&fa"
 
-#: clock.cpp:1551
+#: clock.cpp:1590
 msgid "&Adjust Date && Time..."
 msgstr "&Addasu Dyddiad && Amser..."
 
-#: clock.cpp:1553
+#: clock.cpp:1592
 msgid "Date && Time &Format..."
 msgstr "&Fformat Dyddiad && Amser..."
 
-#: clock.cpp:1556
+#: clock.cpp:1595
 msgid "C&opy to Clipboard"
 msgstr "C&opïo i'r Gludfwrdd"
 
-#: clock.cpp:1560
+#: clock.cpp:1599
 msgid "&Configure Clock..."
 msgstr "&Ffurfweddu'r Cloc..."
 
-#: clock.cpp:1813
+#: clock.cpp:1852
 #, c-format
 msgid "Showing time for %1"
 msgstr ""
@@ -396,19 +397,19 @@ msgid "&Frame"
 msgstr "&Ffrâm"
 
 #. i18n: file analog.ui line 92
-#: rc.cpp:18 rc.cpp:63 rc.cpp:90 rc.cpp:147
+#: rc.cpp:18 rc.cpp:63 rc.cpp:90 rc.cpp:150
 #, no-c-format
 msgid "Time"
 msgstr "Amser"
 
 #. i18n: file analog.ui line 136
-#: rc.cpp:21 rc.cpp:69 rc.cpp:99 rc.cpp:156 rc.cpp:162
+#: rc.cpp:21 rc.cpp:69 rc.cpp:99 rc.cpp:159 rc.cpp:165
 #, no-c-format
 msgid "Foreground color:"
 msgstr "Lliw blaendir:"
 
 #. i18n: file analog.ui line 167
-#: rc.cpp:24 rc.cpp:72 rc.cpp:96 rc.cpp:153 rc.cpp:165
+#: rc.cpp:24 rc.cpp:72 rc.cpp:96 rc.cpp:156 rc.cpp:168
 #, no-c-format
 msgid "Background color:"
 msgstr "Lliw cefndir:"
@@ -462,7 +463,7 @@ msgid "LCD look"
 msgstr "Golwg LCD"
 
 #. i18n: file fuzzy.ui line 124
-#: rc.cpp:93 rc.cpp:150 rc.cpp:168
+#: rc.cpp:93 rc.cpp:153 rc.cpp:171
 #, no-c-format
 msgid "Font:"
 msgstr "Wynebfath:"
@@ -533,32 +534,38 @@ msgstr "Cloc Niwlaidd"
 msgid "&Seconds"
 msgstr "&Eiliadau"
 
-#. i18n: file settings.ui line 326
-#: rc.cpp:159
+#. i18n: file settings.ui line 186
+#: rc.cpp:147
+#, fuzzy, no-c-format
+msgid "&Shadow"
+msgstr "Lliw cysgod:"
+
+#. i18n: file settings.ui line 334
+#: rc.cpp:162
 #, no-c-format
 msgid "Date"
 msgstr "Dyddiad"
 
-#. i18n: file settings.ui line 438
-#: rc.cpp:171
+#. i18n: file settings.ui line 446
+#: rc.cpp:174
 #, no-c-format
 msgid "&Timezones"
 msgstr "&Amserfeydd"
 
-#. i18n: file settings.ui line 447
-#: rc.cpp:174
+#. i18n: file settings.ui line 455
+#: rc.cpp:177
 #, no-c-format
 msgid "City"
 msgstr "Dinas"
 
-#. i18n: file settings.ui line 458
-#: rc.cpp:177
+#. i18n: file settings.ui line 466
+#: rc.cpp:180
 #, no-c-format
 msgid "Comment"
 msgstr "Sylwad"
 
-#. i18n: file settings.ui line 474
-#: rc.cpp:180
+#. i18n: file settings.ui line 482
+#: rc.cpp:183
 #, no-c-format
 msgid ""
 "A list of timezones known to your system. Press the middle mouse button on the "
@@ -568,91 +575,97 @@ msgstr ""
 "cloc yn y bar tasgiau, ac fe ddengys i chi yr amser yn y dinasoedd dewisiedig."
 
 #. i18n: file clockapplet.kcfg line 10
-#: rc.cpp:183
+#: rc.cpp:186
 #, no-c-format
 msgid "Clock type"
 msgstr "Math cloc"
 
 #. i18n: file clockapplet.kcfg line 22
-#: rc.cpp:186 rc.cpp:189 rc.cpp:210 rc.cpp:228 rc.cpp:255 rc.cpp:282
+#: rc.cpp:189 rc.cpp:192 rc.cpp:216 rc.cpp:234 rc.cpp:261 rc.cpp:288
 #, no-c-format
 msgid "Foreground color."
 msgstr "Lliw blaendir."
 
 #. i18n: file clockapplet.kcfg line 30
-#: rc.cpp:192 rc.cpp:207 rc.cpp:279
+#: rc.cpp:195 rc.cpp:213 rc.cpp:285
 #, no-c-format
 msgid "Font for the clock."
 msgstr "Wynebfath ar gyfer y cloc."
 
 #. i18n: file clockapplet.kcfg line 40
-#: rc.cpp:195 rc.cpp:216 rc.cpp:243
+#: rc.cpp:198 rc.cpp:222 rc.cpp:249
 #, no-c-format
 msgid "Show seconds."
 msgstr "Dangos eiliadau."
 
 #. i18n: file clockapplet.kcfg line 44
-#: rc.cpp:198 rc.cpp:219 rc.cpp:246 rc.cpp:270
+#: rc.cpp:201 rc.cpp:225 rc.cpp:252 rc.cpp:276
 #, no-c-format
 msgid "Show date."
 msgstr "Dangos dyddiad."
 
 #. i18n: file clockapplet.kcfg line 48
-#: rc.cpp:201 rc.cpp:222 rc.cpp:249 rc.cpp:273
+#: rc.cpp:204 rc.cpp:228 rc.cpp:255 rc.cpp:279
 #, fuzzy, no-c-format
 msgid "Show day of week."
 msgstr "Dangos dyddiad."
 
 #. i18n: file clockapplet.kcfg line 52
-#: rc.cpp:204 rc.cpp:225 rc.cpp:252 rc.cpp:276
+#: rc.cpp:207 rc.cpp:231 rc.cpp:258 rc.cpp:282
 #, no-c-format
 msgid "Show frame."
 msgstr "Dangos ffrâm."
 
-#. i18n: file clockapplet.kcfg line 69
-#: rc.cpp:213 rc.cpp:231 rc.cpp:258 rc.cpp:285
+#. i18n: file clockapplet.kcfg line 56
+#: rc.cpp:210
+#, no-c-format
+msgid "Use shadow."
+msgstr ""
+
+#. i18n: file clockapplet.kcfg line 73
+#: rc.cpp:219 rc.cpp:237 rc.cpp:264 rc.cpp:291
 #, no-c-format
 msgid "Background color."
 msgstr "Lliw cefndir."
 
-#. i18n: file clockapplet.kcfg line 99
-#: rc.cpp:234 rc.cpp:261
+#. i18n: file clockapplet.kcfg line 103
+#: rc.cpp:240 rc.cpp:267
 #, no-c-format
 msgid "Shadow color."
 msgstr "Lliw cysgod."
 
-#. i18n: file clockapplet.kcfg line 103
-#: rc.cpp:237
+#. i18n: file clockapplet.kcfg line 107
+#: rc.cpp:243
 #, no-c-format
 msgid "Blink"
 msgstr "Amrantu"
 
-#. i18n: file clockapplet.kcfg line 107
-#: rc.cpp:240 rc.cpp:264
+#. i18n: file clockapplet.kcfg line 111
+#: rc.cpp:246 rc.cpp:270
 #, no-c-format
 msgid "LCD Style"
 msgstr "Ardull LCD"
 
-#. i18n: file clockapplet.kcfg line 145
-#: rc.cpp:267
+#. i18n: file clockapplet.kcfg line 149
+#: rc.cpp:273
 #, no-c-format
 msgid "Anti-Alias factor"
 msgstr "Ffactor Gwrth-Amgenu"
 
-#. i18n: file clockapplet.kcfg line 178
-#: rc.cpp:288
+#. i18n: file clockapplet.kcfg line 182
+#: rc.cpp:294
 #, no-c-format
 msgid "Fuzzyness"
 msgstr "Niwlaiddrwydd"
 
-#. i18n: file clockapplet.kcfg line 184
-#: rc.cpp:291
+#. i18n: file clockapplet.kcfg line 188
+#: rc.cpp:297
 #, no-c-format
 msgid "Show window frame"
 msgstr "Dangos ffrâm ffenestr"
 
-#. i18n: file clockapplet.kcfg line 188
-#: rc.cpp:294
+#. i18n: file clockapplet.kcfg line 192
+#: rc.cpp:300
 #, no-c-format
 msgid "Default size of the calendar"
 msgstr "Maint rhagosodol y calendr"
diff --git a/tde-i18n-cy/messages/tdebase/display.po b/tde-i18n-cy/messages/tdebase/display.po
index 4c158e66fec..bc03e94b14e 100644
--- a/tde-i18n-cy/messages/tdebase/display.po
+++ b/tde-i18n-cy/messages/tdebase/display.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: display\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-06-30 11:22+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdebase/dockbarextension.po b/tde-i18n-cy/messages/tdebase/dockbarextension.po
index 29af0a2be01..c0553a1ba04 100644
--- a/tde-i18n-cy/messages/tdebase/dockbarextension.po
+++ b/tde-i18n-cy/messages/tdebase/dockbarextension.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dockbarextension\n"
-"POT-Creation-Date: 2005-11-06 02:43+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-06-10 11:57+0100\n"
 "Last-Translator: Kgyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdebase/drkonqi.po b/tde-i18n-cy/messages/tdebase/drkonqi.po
index 10d667762d7..a626bade48c 100644
--- a/tde-i18n-cy/messages/tdebase/drkonqi.po
+++ b/tde-i18n-cy/messages/tdebase/drkonqi.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drkonqi\n"
-"POT-Creation-Date: 2008-01-23 01:15+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-06-30 11:27+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,10 +28,33 @@ msgid ""
 "Your emails"
 msgstr "kyfieithu@dotmon.com"
 
-#: backtrace.cpp:83
+#: backtrace.cpp:97
 msgid "Could not generate a backtrace as the debugger '%1' was not found."
 msgstr "Methu creu ôlrhain, gan na chanfuwyd y dadnamydd '%1'"
 
+#: backtrace.cpp:146
+#, fuzzy
+msgid "Administrative access is required to generate a backtrace"
+msgstr "Nid oedd yn bosib creu olrheiniad."
+
+#: bugdescription.cpp:59
+msgid "Crash Report"
+msgstr ""
+
+#: bugdescription.cpp:67 bugdescriptiondialog.cpp:60
+msgid "Bug Description"
+msgstr ""
+
+#: bugdescriptiondialog.cpp:83
+msgid "Contact Email: "
+msgstr ""
+
+#: bugdescriptiondialog.cpp:90
+msgid ""
+"Enter the text (in English if possible) that you wish to submit with this crash "
+"report.\n"
+msgstr ""
+
 #: debugger.cpp:65
 msgid "C&opy"
 msgstr "C&opïo"
@@ -48,26 +72,26 @@ msgstr "Cadwyd yr ôlrhain i %1"
 msgid "Cannot create a file in which to save the backtrace"
 msgstr "Methu creu ffeil i gadw'r ôlrhain iddo"
 
-#: debugger.cpp:115
+#: debugger.cpp:115 toplevel.cpp:485
 #, fuzzy
 msgid "Select Filename"
 msgstr "Dewiswch Enw Ffeil"
 
-#: debugger.cpp:123
+#: debugger.cpp:123 toplevel.cpp:496
 msgid ""
 "A file named \"%1\" already exists. Are you sure you want to overwrite it?"
 msgstr ""
 "Mae ffeil o'r enw \"%1\" mewn bod eisoes.  Ydych wir eisiau ysgrifennu drosti?"
 
-#: debugger.cpp:125
+#: debugger.cpp:125 toplevel.cpp:498
 msgid "Overwrite File?"
 msgstr "Trosysgrifo'r Ffeil?"
 
-#: debugger.cpp:126
+#: debugger.cpp:126 toplevel.cpp:499
 msgid "&Overwrite"
 msgstr "&Trosysgrifo"
 
-#: debugger.cpp:138
+#: debugger.cpp:138 toplevel.cpp:510
 msgid "Cannot open file %1 for writing"
 msgstr "Methu agor y ffeil %1 ar gyfer ysgrifennu"
 
@@ -179,39 +203,43 @@ msgstr "Analluogi cyrchiad disg mympwyol"
 msgid "The TDE Crash Handler"
 msgstr "Y Trinydd Chwalfeydd TDE"
 
-#: toplevel.cpp:59
+#: toplevel.cpp:63
 msgid "&Bug report"
 msgstr "Adroddiad &Nam"
 
-#: toplevel.cpp:60
+#: toplevel.cpp:64
 msgid "&Debugger"
 msgstr "&Dadnamydd"
 
-#: toplevel.cpp:64
+#: toplevel.cpp:65
+msgid "&Report Crash"
+msgstr ""
+
+#: toplevel.cpp:69
 msgid "&General"
 msgstr "&Cyffredinol"
 
-#: toplevel.cpp:79
+#: toplevel.cpp:84
 msgid "&Backtrace"
 msgstr "&Olrhain"
 
-#: toplevel.cpp:103
+#: toplevel.cpp:108
 msgid "<p><b>Short description</b></p><p>%1</p>"
 msgstr "<p><b>Disgrifiad byr</b></p><p>%1</p>"
 
-#: toplevel.cpp:107
+#: toplevel.cpp:112
 msgid "<p><b>What is this?</b></p><p>%1</p>"
 msgstr "<p><b>Beth yw hyn?</b></p><p>%1</p>"
 
-#: toplevel.cpp:111
+#: toplevel.cpp:116
 msgid "<p><b>What can I do?</b></p><p>%1</p>"
 msgstr "<p><b>Beth allaf i ei wneud?</b></p><p>%1</p>"
 
-#: toplevel.cpp:116
+#: toplevel.cpp:121
 msgid "<p><b>Application crashed</b></p><p>The program %appname crashed.</p>"
 msgstr "<p><b>Chwalodd y cymhwysiad</b></p><p>Chwalodd y rhaglen %appname.</p>"
 
-#: toplevel.cpp:135
+#: toplevel.cpp:140
 msgid ""
 "<p>Do you want to generate a backtrace? This will help the developers to figure "
 "out what went wrong.</p>\n"
@@ -227,26 +255,99 @@ msgstr ""
 "gwybodaeth ar sut i'w ail-achosi. Nid yw'n bosib i gywiro'r nam heb ddisgrifiad "
 "cywir.</b></p>"
 
-#: toplevel.cpp:147
+#: toplevel.cpp:152
 msgid "Include Backtrace"
 msgstr "Cynnwys Olrheiniad"
 
-#: toplevel.cpp:147
+#: toplevel.cpp:152
 msgid "Generate"
 msgstr "Creu"
 
-#: toplevel.cpp:147
+#: toplevel.cpp:152
 msgid "Do Not Generate"
 msgstr ""
 
-#: toplevel.cpp:215
+#: toplevel.cpp:229 toplevel.cpp:241
 msgid "It was not possible to generate a backtrace."
 msgstr "Nid oedd yn bosib creu olrheiniad."
 
-#: toplevel.cpp:216
+#: toplevel.cpp:230 toplevel.cpp:241
 msgid "Backtrace Not Possible"
 msgstr "Dim Olrheiniad Yn Bosibl"
 
+#: toplevel.cpp:255
+msgid ""
+"<p>Do you want to include a description of what you were doing when this "
+"application crashed? This would help the developers to figure out what went "
+"wrong.</p>\n"
+msgstr ""
+
+#: toplevel.cpp:261
+msgid "Include Description"
+msgstr ""
+
+#: toplevel.cpp:261
+msgid "Add Description"
+msgstr ""
+
+#: toplevel.cpp:261
+msgid "Just Report the Crash"
+msgstr ""
+
+#: toplevel.cpp:353
+msgid ""
+"<p>The crash report is ready.  Do you want to send it now?</p>\n"
+msgstr ""
+
+#: toplevel.cpp:354
+msgid "Ready to Send"
+msgstr ""
+
+#: toplevel.cpp:354
+msgid "View Report"
+msgstr ""
+
+#: toplevel.cpp:354
+msgid "Send Report"
+msgstr ""
+
+#: toplevel.cpp:435
+msgid ""
+"<p>Your crash report has been uploaded!</p></p>You may reference it if desired "
+"by its unique ID:"
+"<br>%1</p>"
+msgstr ""
+
+#: toplevel.cpp:436
+msgid "Report uploaded"
+msgstr ""
+
+#: toplevel.cpp:448
+msgid ""
+"<p>Your crash report failed to upload!</p>"
+"<p>Please check your network settings and try again.</p>"
+"<p>The server responded:"
+"<br>%1</p>"
+msgstr ""
+
+#: toplevel.cpp:449 toplevel.cpp:466
+msgid "Upload failure"
+msgstr ""
+
+#: toplevel.cpp:449 toplevel.cpp:466
+msgid "Save Report"
+msgstr ""
+
+#: toplevel.cpp:449 toplevel.cpp:466
+msgid "Retry Upload"
+msgstr ""
+
+#: toplevel.cpp:465
+msgid ""
+"<p>Your crash report failed to upload!</p>"
+"<p>Please check your network settings and try again.</p>"
+msgstr ""
+
 #~ msgid ""
 #~ "%1 not found. Check if it is installed -- you need it to generate the backtrace.\n"
 #~ "If you have another debugger, contact kde-devel@kde.org for help on how to set it up."
diff --git a/tde-i18n-cy/messages/tdebase/extensionproxy.po b/tde-i18n-cy/messages/tdebase/extensionproxy.po
index 54419393f1b..fd1250a2421 100644
--- a/tde-i18n-cy/messages/tdebase/extensionproxy.po
+++ b/tde-i18n-cy/messages/tdebase/extensionproxy.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: extensionproxy\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-06-30 11:28+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdebase/filetypes.po b/tde-i18n-cy/messages/tdebase/filetypes.po
index 18911b081c5..f3a13897318 100644
--- a/tde-i18n-cy/messages/tdebase/filetypes.po
+++ b/tde-i18n-cy/messages/tdebase/filetypes.po
@@ -10,10 +10,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: filetypes\n"
-"POT-Creation-Date: 2007-02-02 02:29+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-06-30 11:37+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -252,7 +253,8 @@ msgstr ""
 "Golygydd mathau ffeil TDE - fersiwn syml ar gyfer golygu math ffeil unigol"
 
 #: keditfiletype.cpp:117
-msgid "(c) 2000, TDE developers"
+#, fuzzy
+msgid "(c) 2000, KDE developers"
 msgstr "(h)(c)2000, Datblygwyr TDE"
 
 #: keditfiletype.cpp:151
diff --git a/tde-i18n-cy/messages/tdebase/htmlsearch.po b/tde-i18n-cy/messages/tdebase/htmlsearch.po
index 01a371ed276..3e6141f9169 100644
--- a/tde-i18n-cy/messages/tdebase/htmlsearch.po
+++ b/tde-i18n-cy/messages/tdebase/htmlsearch.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: htmlsearch\n"
-"POT-Creation-Date: 2005-05-18 21:23+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-06-30 11:37+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdebase/joystick.po b/tde-i18n-cy/messages/tdebase/joystick.po
index 69ed6d9289d..af7f00db2ee 100644
--- a/tde-i18n-cy/messages/tdebase/joystick.po
+++ b/tde-i18n-cy/messages/tdebase/joystick.po
@@ -3,10 +3,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: joystick\n"
-"POT-Creation-Date: 2006-03-02 03:42+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-07-03 11:25+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdebase/kaccess.po b/tde-i18n-cy/messages/tdebase/kaccess.po
index 81d1549b5c1..926b590e552 100644
--- a/tde-i18n-cy/messages/tdebase/kaccess.po
+++ b/tde-i18n-cy/messages/tdebase/kaccess.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kaccess\n"
-"POT-Creation-Date: 2006-09-16 02:33+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-06-10 16:14+0100\n"
 "Last-Translator: Kgyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -295,8 +296,8 @@ msgstr ""
 #: kaccess.cpp:751
 msgid ""
 "These AccessX settings are needed for some users with motion impairments and "
-"can be configured in the Trinity Control Center. You can also turn them on and off "
-"with standardized keyboard gestures.\n"
+"can be configured in the Trinity Control Center. You can also turn them on and "
+"off with standardized keyboard gestures.\n"
 "\n"
 "If you do not need them, you can select \"Deactivate all AccessX features and "
 "gestures\"."
diff --git a/tde-i18n-cy/messages/tdebase/kappfinder.po b/tde-i18n-cy/messages/tdebase/kappfinder.po
index a990eed273a..665a52505b9 100644
--- a/tde-i18n-cy/messages/tdebase/kappfinder.po
+++ b/tde-i18n-cy/messages/tdebase/kappfinder.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kappfinder\n"
-"POT-Creation-Date: 2005-05-18 21:23+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-06-30 11:39+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdebase/kasbarextension.po b/tde-i18n-cy/messages/tdebase/kasbarextension.po
index 27c29eb230f..ba43e87c8fc 100644
--- a/tde-i18n-cy/messages/tdebase/kasbarextension.po
+++ b/tde-i18n-cy/messages/tdebase/kasbarextension.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kasbarextension\n"
-"POT-Creation-Date: 2006-08-13 04:04+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-06-30 11:42+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,7 +25,8 @@ msgid "About Kasbar"
 msgstr "Ynglyn â Kasbar"
 
 #: kasaboutdlg.cpp:156
-msgid "<qt><body><h2>Kasbar Version: %1</h2><b>TDE Version:</b> %2</body></qt>"
+#, fuzzy
+msgid "<qt><body><h2>Kasbar Version: %1</h2><b>KDE Version:</b> %2</body></qt>"
 msgstr ""
 "<qt><body>"
 "<h2>Fersiwn Kasbar: %1</h2><b>Fersiwn TDE:</b> %2</body></qt>"
diff --git a/tde-i18n-cy/messages/tdebase/kate.po b/tde-i18n-cy/messages/tdebase/kate.po
index 0624a9d8aa8..6e4cc2a7ad1 100644
--- a/tde-i18n-cy/messages/tdebase/kate.po
+++ b/tde-i18n-cy/messages/tdebase/kate.po
@@ -10,208 +10,255 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kate\n"
-"POT-Creation-Date: 2008-08-14 01:15+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-06-30 15:15+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.2\n"
 "\n"
 
-#: app/kateexternaltools.cpp:276
-msgid "Failed to expand the command '%1'."
-msgstr ""
-
-#: app/kateexternaltools.cpp:277
-#, fuzzy
-msgid "Kate External Tools"
-msgstr "Offer Allanol"
-
-#: app/kateexternaltools.cpp:427
-msgid "Edit External Tool"
-msgstr "Golygu Erfyn Allanol"
-
-#: app/kateexternaltools.cpp:441
-msgid "&Label:"
-msgstr "&Label:"
+#: _translatorinfo.cpp:1 app/katemain.cpp:103 app/kwritemain.cpp:589
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Owain Green drwy KGyfieithu - Meddalwedd Gymraeg"
 
-#: app/kateexternaltools.cpp:446
-msgid "The name will be displayed in the 'Tools->External' menu"
-msgstr "Dangosir yr enw yn y ddewislen 'Offer->Allanol'"
+#: _translatorinfo.cpp:3 app/katemain.cpp:103 app/kwritemain.cpp:589
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "kyfieithu@dotmon.com"
 
-#: app/kateexternaltools.cpp:456
-msgid "S&cript:"
-msgstr "S&gript :"
+#: tips.txt:3
+msgid ""
+"<p>Kate comes with a nice set of plugins, providing simple\n"
+"and advanced features of all sorts.</p>\n"
+"<p>You can enable/disable plugins to suit your needs in the configuration "
+"dialog,\n"
+"choose <strong>Settings -&gt;configure</strong> to launch that.</p>\n"
+msgstr ""
+"<p>Daw set o ategion dymunol gyda Kate, gan ddarparu\n"
+" nodweddion syml ac uwch o bob math.</p>\n"
+"<p>Gallwch alluogi/analluogi ategion yn ôl eich anghenion yn yr ymgom "
+"ffurfweddu,\n"
+" dewiswch <strong>Gosodiadau ->ffurfweddu</strong> i gychwyn hwnna.</p>\n"
 
-#: app/kateexternaltools.cpp:461
-#, fuzzy
+#: tips.txt:11
 msgid ""
-"<p>The script to execute to invoke the tool. The script is passed to /bin/sh "
-"for execution. The following macros will be expanded:</p>"
-"<ul>"
-"<li><code>%URL</code> - the URL of the current document."
-"<li><code>%URLs</code> - a list of the URLs of all open documents."
-"<li><code>%directory</code> - the URL of the directory containing the current "
-"document."
-"<li><code>%filename</code> - the filename of the current document."
-"<li><code>%line</code> - the current line of the text cursor in the current "
-"view."
-"<li><code>%column</code> - the column of the text cursor in the current view."
-"<li><code>%selection</code> - the selected text in the current view."
-"<li><code>%text</code> - the text of the current document.</ul>"
+"<p>You can swap the characters on each side of the cursor just by pressing\n"
+"<strong>Ctrl+T</strong></p>\n"
 msgstr ""
-"<p>Y gorchymyn i weithredu i alw'r erfyn.  Ehangir y macros dilynnol:</p>"
-"<ul>"
-"<li><code>%URL</code> - URL y ddogfen gyfredol."
-"<li><code>%URLs</code> - rhestr o URLau pob dogfen agored."
-"<li><code>%directory</code> - URL y cyfeiriadur sy'n cynnwys y ddogfen "
-"gyfredol."
-"<li><code>filename</code> - enw ffeil y ddogfen gyfredol."
-"<li><code>%line</code> - llinell gyfredol y cyrchydd testun yn y golwg "
-"gyfredol."
-"<li><code>%column</code> - colofn y cyrchydd testun yn y golwg gyfredol."
-"<li><code>%selection</code> - y testun dewisiedig yn y golwg gyfredol. "
-"<li><code>%text</code> - testun y ddogfen gyfredol. </ul>"
+"<p>Gallwch gyfnewid y nôdau ar naill ochr y cyrchydd drwy wasgu\n"
+"<strong>Ctrl+T</strong></p>\n"
 
-#: app/kateexternaltools.cpp:479
-msgid "&Executable:"
-msgstr "&Gweithredadwyn:"
+#: tips.txt:17
+msgid ""
+"<p>You can export the current document as a HTML file, including\n"
+"syntax highlighting.</p>\n"
+"<p>Just choose <strong>File -&gt; Export -&gt; HTML...</strong></p>\n"
+msgstr ""
+"<p>Gallwch allforio'r ddogfen cyfredol yn ffeil HTML, gan gynnwys\n"
+" amlygu cystrawen.</p>\n"
+"<p>Dewiswch <strong>Ffeil -> Allforio -> HTML...</strong></p>\n"
 
-#: app/kateexternaltools.cpp:484
+#: tips.txt:24
 msgid ""
-"The executable used by the command. This is used to check if a tool should be "
-"displayed; if not set, the first word of <em>command</em> will be used."
+"<p>You can split the Kate editor as many times as you like and\n"
+"in either direction. Each frame has its own status bar and\n"
+"can display any open document.</p>\n"
+"<p>Just choose "
+"<br><strong>View -&gt; Split [ Horizontal | Vertical ]</strong></p>\n"
 msgstr ""
-"Y gweithredadwyn a ddefnyddir gan y gorchymyn.  Defnyddir hyn i wirio a ddylai "
-"erfyn gael ei ddangos; os ni osodir, defnyddir y gair cyntaf o <em>"
-"gorchymyn</em>."
+"<p>Gallwch rannu'r golygydd Kate faint bynnag o weithiau yr hoffech ac\n"
+" yn yn naill gyferiad neu'r llall. Mae gan bob ffrâm ei far cyflwr ei hun a "
+"gall ddangos unrhwy ddogfen sydd ar agor.</p>\n"
+"<p>Dewiswch "
+"<br><strong>Golwg -> Rhannu'n [ Llorweddol | Fertigol ]</strong></p>\n"
 
-#: app/kateexternaltools.cpp:490
-msgid "&Mime types:"
-msgstr "&Mathau mime:"
+#: tips.txt:32
+msgid ""
+"<p>You can drag the Tool views (<em>File List</em> and <em>File Selector</em>)\n"
+"to any side that you want them in Kate, or stack them, or even tear them off "
+"the\n"
+"main window.</p>\n"
+msgstr ""
+"<p>Gallwch lusgo'r golygon Offer (<em>Rhestr Ffeiliau</em> a <em>"
+"Dewisydd Ffeiliau</em>)\n"
+" i unrhyw ochr yr hoffech nhw yng Kate, neu eu pentyru, neu hyd yn oed eu "
+"rhwygo o'r\n"
+" prif-ffenestr.</p>\n"
 
-#: app/kateexternaltools.cpp:495
+#: tips.txt:39
 #, fuzzy
 msgid ""
-"A semicolon-separated list of mime types for which this tool should be "
-"available; if this is left empty, the tool is always available. To choose from "
-"known mimetypes, press the button on the right."
+"<p>Kate has a built-in terminal emulator, just click on <strong>"
+"\"Terminal\"</strong> at\n"
+"the bottom to show or hide it as you desire.</p>\n"
 msgstr ""
-"Rhestr o fathau mime wedi'u gwahanu gan wahannod y ddylai'r erfyn yma fod ar "
-"gael iddynt; os gadewir yn wag, mae'r erfyn ar gael yn wastad.  I ddewis o'r "
-"mathau mime a gwyddys, gwasgwch y botwm ar y dde."
+"<p>Mae gan Kate efelychydd terfynell mewnadeiladedig, gwasgwch <strong>"
+"F7</strong> i'w\n"
+" ddangos neu'i guddio fel y mynnoch.</p>\n"
 
-#: app/kateexternaltools.cpp:504
-msgid "Click for a dialog that can help you creating a list of mimetypes."
+#: tips.txt:45
+#, fuzzy
+msgid ""
+"<p>Kate can highlight the current line with a\n"
+"<table bgcolor=\"yellow\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\" "
+"width=\"100%\">"
+"<tr>"
+"<td>different\n"
+"background color.<strong>|</strong></td></tr></table></p>\n"
+"<p>You can set the color in the <em>Colors</em> page of the configuration\n"
+"dialog.</p>\n"
 msgstr ""
+"<p>Gall Kate amlygu'r llinell gyfredol â\n"
+" <table bgcolor=\"yellow\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\" "
+"width=\"100%\">"
+"<tr>"
+"<td>lliw \n"
+" cefndir gwahanol.<strong>|</strong></td></tr></table></p>\n"
+" "
+"<p>Gallwch osod y lliw ar y dudalen <em>Lliwiau</em> yn yr ymgom\n"
+" ffurfweddu.</p>\n"
 
-#: app/kateexternaltools.cpp:508
-msgid "&Save:"
-msgstr "&Cadw :"
-
-#: app/kateexternaltools.cpp:512
-msgid "None"
-msgstr "Dim"
-
-#: app/kateexternaltools.cpp:512
+#: tips.txt:54
 #, fuzzy
-msgid "Current Document"
-msgstr "Plygell Dogfen Gyfredol"
+msgid ""
+"<p>You can open the currently edited file in any other application from within\n"
+"Kate.</p>\n"
+"<p>Choose <strong>File -&gt; Open With</strong> for the list of programs\n"
+"configured\n"
+"for the document type. There is also an option <strong>Other...</strong> to\n"
+"choose any application on your system.</p>\n"
+msgstr ""
+"<p>Gallwch agor y ffeil golygedig cyfredol mewn unrhyw gymhwysiad arall oddi "
+"mewn \n"
+" Kate.</p>\n"
+" "
+"<p>Dewiswch <strong>Ffeil -> Agor Gyda</strong> am y restr o raglenni\n"
+"ffurfweddwyd\n"
+" ar gyfer math y ddogfen. Mae hefyd dewisiad <strong>Arall...</strong> i \n"
+" ddewis unrhyw gymhwysiad ar eich cysawd.</p>\n"
 
-#: app/kateexternaltools.cpp:512
+#: tips.txt:64
 #, fuzzy
-msgid "All Documents"
-msgstr "&Dogfen"
-
-#: app/kateexternaltools.cpp:516
 msgid ""
-"You can elect to save the current or all [modified] documents prior to running "
-"the command. This is helpful if you want to pass URLs to an application like, "
-"for example, an FTP client."
+"<p>You can configure the editor to always display the line numbers and/or\n"
+"bookmark panes when started from the <strong>View Defaults</strong> "
+"page of the\n"
+"configuration dialog.</p>\n"
 msgstr ""
+"<p>Gallwch ffurfweddu'r golygydd i ddangos rhifau llinellau bob amser a/neu \n"
+" cwareli nôdau tudalen pan yn cychwyn o dudalen <strong>"
+"Rhagosodion Golwg</strong> \n"
+" yr ymgom ffurfweddu.</p>\n"
+"\n"
 
-#: app/kateexternaltools.cpp:523
-msgid "&Command line name:"
+#: tips.txt:71
+#, fuzzy
+msgid ""
+"<p>You can download new or updated <em>Syntax highlight definitions</em> from\n"
+"the <strong>Highlighting</strong> page in the configuration dialog.</p>\n"
+"<p>Just click the <em>Download...</em> button on the <em>Highlight Modes</em>\n"
+"tab (You have to be online, of course...).</p>\n"
 msgstr ""
+"<p>Gallwch lawrlwytho <em>ddiffiniadau amlygu Cystrawen</em> "
+"newydd neu diweddaredig \n"
+" o'r dudalen <strong>Amlygu</strong> yn yr ymgom ffurfweddu.</p>\n"
+"<p>Cliciwch y botwm <em>Lawrlwytho...</em> ar y tab\n"
+" <em>Moddau Amlygu</em> (Rhaid i chi fod ar-lein, wrth gwrs...).</p>\n"
 
-#: app/kateexternaltools.cpp:528
+#: tips.txt:79
+#, fuzzy
 msgid ""
-"If you specify a name here, you can invoke the command from the view command "
-"lines with exttool-the_name_you_specified_here. Please do not use spaces or "
-"tabs in the name."
+"<p>You can cycle through all open documents by pressing <strong>"
+"Alt+Left</strong>\n"
+"or <strong>Alt+Right</strong>. The next/previous document will immediately be "
+"displayed\n"
+"in the active frame.</p>\n"
 msgstr ""
+"<p>Gallwch gylchu drwy bob dogfen agored drwy wasgu <strong>Alt+Chwith</strong> "
+"\n"
+" neu <strong>Alt+Dde</strong>. Dangosir y ddogfen nesaf/blaenorol ar unwaith\n"
+" yn y ffrâm weithredol.</p>\n"
 
-#: app/kateexternaltools.cpp:539
-msgid "You must specify at least a name and a command"
-msgstr "Rhaid i chi benodi o leiaf enw a gorchymyn."
-
-#: app/kateexternaltools.cpp:548
-msgid "Select the MimeTypes for which to enable this tool."
+#: tips.txt:86
+#, fuzzy
+msgid ""
+"<p>You can do cool sed-like regular expression replacements using <em>"
+"Command Line</em>.</p>\n"
+"<p>For example, press <strong>F7</strong> and enter <code>"
+"s /oldtext/newtext/g</code>\n"
+"to replace &quot;oldtext&quot; with &quot;newtext&quot; throughout the current\n"
+"line.</p>\n"
 msgstr ""
+"<p>Gallwch wneud amnewidiadau mynegiad rheolaidd fel sed gan ddefnyddio <em>"
+"Golygu \n"
+" Gorchymyn</em>.</p>\n"
+"<p>Er enghraifft, gwasgwch <strong>Ctrl+M</strong> a rhowch <code>"
+"s/hen-destun/ testun-newydd/g</code> \n"
+" i amnewid &quot;hen-destun&quot; gyda &quot;testun-newydd&quot; drwy gydol y "
+"llinell \n"
+" gyfredol.</p>\n"
 
-#: app/kateexternaltools.cpp:550
+#: tips.txt:94
 #, fuzzy
-msgid "Select Mime Types"
-msgstr "&Mathau mime:"
-
-#: app/kateexternaltools.cpp:568
-msgid "&New..."
-msgstr "&Newydd..."
-
-#: app/kateexternaltools.cpp:576
-msgid "&Edit..."
-msgstr "&Golygu..."
-
-#: app/kateexternaltools.cpp:580
-msgid "Insert &Separator"
-msgstr "Mewnosod &Gwahanydd"
-
-#: app/kateexternaltools.cpp:602
 msgid ""
-"This list shows all the configured tools, represented by their menu text."
+"<p>You can repeat your last search by just pressing <strong>F3</strong>, or\n"
+"<strong>Shift+F3</strong> if you want to search backwards.</p>\n"
 msgstr ""
-"Dangosa'r rhestr yma pob erfyn a ffurfweddir, wedi'u cynrychioli gan eu testun "
-"dewislen."
-
-#: app/kateviewspace.cpp:320 app/kateviewspace.cpp:359
-msgid " INS "
-msgstr "MEWN"
-
-#: app/kateviewspace.cpp:325 app/kateviewspace.cpp:363
-msgid " NORM "
-msgstr "ARF"
-
-#: app/kateviewspace.cpp:351
-msgid " Line: %1 Col: %2 "
-msgstr "Llinell: %1 Col: %2"
-
-#: app/kateviewspace.cpp:355
-msgid " R/O "
-msgstr "DyU"
-
-#: app/kateviewspace.cpp:357
-msgid " OVR "
-msgstr "DROS"
-
-#: app/kateviewspace.cpp:363
-msgid " BLK "
-msgstr "BLC"
+"<p>Gallwch ailadrodd eich chwiliad diwethaf drwy wasgu <strong>F3</strong>"
+", neu \n"
+" <strong>Syflydd+F3</strong> os ydych am chwilio am yn ôl.</p>\n"
 
-#: app/kateconsole.cpp:129
+#: tips.txt:100
+#, fuzzy
 msgid ""
-"Do you really want to pipe the text to the console? This will execute any "
-"contained commands with your user rights."
+"<p>You can filter the files displayed in the <em>File Selector</em> tool view.\n"
+"</p>\n"
+"<p>Simply enter your filter in the filter entry at the bottom, for example:\n"
+"<code>*.html *.php</code> if you only want to see HTML and PHP files in the\n"
+"current folder.</p>\n"
+"<p>The File Selector will even remember your filters for you.</strong></p>\n"
 msgstr ""
+"<p>Gallwch hidlo'r ffeiliau a ddengys yn y golwg offer <em>"
+"Dewisydd Ffeiliau</em>.\n"
+" </p>\n"
+"<p>Rhowch eich hidlen yn y gofnod hidlen ar y gwaelod, er enghraifft: \n"
+" <code>*.html *.php</code> os ydych am weld dim ond ffeiliau HTML a PHP yn y \n"
+" plygell cyfredol.</p>\n"
+"<p>Bydd y Dewisydd Ffeiliau hyd yn oed yn cofio eich hidlenni i chi.</strong>"
+"</p>\n"
 
-#: app/kateconsole.cpp:130
-msgid "Pipe to Console?"
-msgstr "Pibellu i Derfynnell?"
+#: tips.txt:110
+#, fuzzy
+msgid ""
+"<p>You can have two views - or even more - of the same document in Kate. "
+"Editing\n"
+"in either will be reflected in both.</p>\n"
+"<p>So if you find yourself scrolling up and down to look at text at the other\n"
+"end of a document, just press <strong>Ctrl+Shift+T</strong> to split\n"
+"horizontally.</p>\n"
+msgstr ""
+"<p>Gallwch gael dau olwg - neu hyd yn oed mwy - o'r un ddogfen yn Kate.\n"
+" Adlewyrchir golygu yn unrhyw un ohonynt yn y ddau.</p>\n"
+"<p>Felly cewch eich hunan yn sgrolio i fyny ac i lawr i edrych ar destun ar ben "
+"\n"
+" arall dogfen, gwasgwch <strong>Ctrl+Syflydd+T</strong> i rannu\n"
+" yn llorweddol.</p>\n"
 
-#: app/kateconsole.cpp:131
-msgid "Pipe to Console"
-msgstr "Pibellu i Derfynnell"
+#: tips.txt:119
+#, fuzzy
+msgid ""
+"<p>Press <strong>F8</strong> or <strong>Shift+F8</strong> to switch to the\n"
+"next/previous frame.</p>\n"
+msgstr ""
+"<p>Gwasgwch <strong>F8</strong> neu <strong>Syflydd+F8</strong> i newid i'r \n"
+" ffrâm nesaf/blaenorol.</p>\n"
 
 #: app/katemainwindow.cpp:212 app/katesavemodifieddialog.cpp:152
 msgid "Documents"
@@ -278,8 +325,8 @@ msgstr "Cau'r ffenestr hon"
 msgid "Create a new Kate view (a new window with the same document list)."
 msgstr "Creu golwg newydd Kate (ffenestr newydd â'r un rhestr ddogfennau)"
 
-#: app/kateconfigdialog.cpp:268 app/kateconfigdialog.cpp:269
-#: app/katemainwindow.cpp:265 app/katemainwindow.cpp:540
+#: app/kateconfigdialog.cpp:298 app/kateconfigdialog.cpp:299
+#: app/katemainwindow.cpp:265 app/katemainwindow.cpp:539
 msgid "External Tools"
 msgstr "Offer Allanol"
 
@@ -355,30 +402,30 @@ msgstr ""
 msgid "Closing Aborted"
 msgstr ""
 
-#: app/katemainwindow.cpp:489
+#: app/katemainwindow.cpp:488
 msgid ""
 "_: 'document name [*]', [*] means modified\n"
 "%1 [*]"
 msgstr ""
 
-#: app/katemainwindow.cpp:611
+#: app/katemainwindow.cpp:610
 msgid "&Other..."
 msgstr "A&rall..."
 
-#: app/katemainwindow.cpp:621
+#: app/katemainwindow.cpp:620
 msgid "Other..."
 msgstr "Eraill..."
 
-#: app/katemainwindow.cpp:638
+#: app/katemainwindow.cpp:637
 msgid "Application '%1' not found!"
 msgstr ""
 
-#: app/katemainwindow.cpp:638
+#: app/katemainwindow.cpp:637
 #, fuzzy
 msgid "Application Not Found!"
 msgstr "Cymhwysiad"
 
-#: app/katemainwindow.cpp:666
+#: app/katemainwindow.cpp:665
 msgid ""
 "<p>The current document has not been saved, and cannot be attached to an email "
 "message."
@@ -387,15 +434,15 @@ msgstr ""
 "<p>Ni gedwid y ddogfen gyfredol, a ni fedr ei atodi i neges ebost."
 "<p>A ydych am ei gadw a mynd ymlaen?"
 
-#: app/katemainwindow.cpp:669
+#: app/katemainwindow.cpp:668
 msgid "Cannot Send Unsaved File"
 msgstr "Methu Anfon Ffeil Heb ei Gadw"
 
-#: app/katemainwindow.cpp:677 app/katemainwindow.cpp:698
+#: app/katemainwindow.cpp:676 app/katemainwindow.cpp:697
 msgid "The file could not be saved. Please check if you have write permission."
 msgstr "Methwyd cadw'r ffeil. Gwiriwch os oes gennych caniatâd ysgrifennu."
 
-#: app/katemainwindow.cpp:688
+#: app/katemainwindow.cpp:687
 msgid ""
 "<p>The current file:"
 "<br><strong>%1</strong>"
@@ -407,322 +454,182 @@ msgstr ""
 "<br>. Ni fydd y newidiadau ar gael yn yr atodiad."
 "<p>A ydych am ei gadw cyn ei anfon?"
 
-#: app/katemainwindow.cpp:691
+#: app/katemainwindow.cpp:690
 msgid "Save Before Sending?"
 msgstr "Cadw Cyn Anfon?"
 
-#: app/katemainwindow.cpp:691
+#: app/katemainwindow.cpp:690
 msgid "Do Not Save"
 msgstr "Peidiwch â Chadw"
 
-#: app/katemailfilesdialog.cpp:47
-msgid "Email Files"
-msgstr "Ebostio Ffeiliau"
-
-#: app/katemailfilesdialog.cpp:49 app/katemailfilesdialog.cpp:99
-msgid "&Show All Documents >>"
-msgstr "&Dangos Pob Dogfen >>"
-
-#: app/katemailfilesdialog.cpp:52
-msgid "&Mail..."
-msgstr "&Postio..."
-
-#: app/katemailfilesdialog.cpp:57
-msgid ""
-"<p>Press <strong>Mail...</strong> to email the current document."
-"<p>To select more documents to send, press <strong>Show All "
-"Documents&nbsp;&gt;&gt;</strong>."
-msgstr ""
-"<p>Gwasgwch <strong>Postio...</strong> i ebostio'r ddogfen cyfredol."
-"<p>I ddewis rhagor o ddogfennau i'w hanfon, gwasgwch <strong>"
-"Dangos Pob Dogfen &nbsp;&gt;&gt;</ strong>."
-
 #: app/kateconfigplugindialogpage.cpp:81 app/katemailfilesdialog.cpp:61
 msgid "Name"
 msgstr "Enw"
 
-#: app/katefilelist.cpp:142 app/katefilelist.cpp:579
-#: app/katemailfilesdialog.cpp:62
-msgid "URL"
-msgstr "URL"
-
-#: app/katemailfilesdialog.cpp:104
-msgid "&Hide Document List <<"
-msgstr "&Cuddio Rhestr Ddogfennau <<"
-
-#: app/katemailfilesdialog.cpp:105
-msgid "Press <strong>Mail...</strong> to send selected documents"
-msgstr "Gwasgwch <strong>Postio...</strong> i anfon dogfennau dewisiedig"
-
-#: app/katemwmodonhddialog.cpp:61
-#, fuzzy
-msgid "Documents Modified on Disk"
-msgstr "Dogfen i'w hagor"
-
-#: app/katemwmodonhddialog.cpp:63
-msgid "&Ignore"
-msgstr "&Anwybyddu"
-
-#: app/katemwmodonhddialog.cpp:64
-msgid "&Overwrite"
-msgstr "&Trosysgrifo"
-
-#: app/katemwmodonhddialog.cpp:68
-msgid ""
-"Removes the modified flag from the selected documents and closes the dialog if "
-"there are no more unhandled documents."
-msgstr ""
-
-#: app/katemwmodonhddialog.cpp:71
-msgid ""
-"Overwrite selected documents, discarding the disk changes and closes the dialog "
-"if there are no more unhandled documents."
-msgstr ""
-
-#: app/katemwmodonhddialog.cpp:74
-msgid ""
-"Reloads the selected documents from disk and closes the dialog if there are no "
-"more unhandled documents."
-msgstr ""
+#: app/kateconfigplugindialogpage.cpp:82
+msgid "Comment"
+msgstr "Sylwad"
 
-#: app/katemwmodonhddialog.cpp:87
+#: app/kateconfigplugindialogpage.cpp:83
 msgid ""
-"<qt>The documents listed below has changed on disk."
-"<p>Select one or more at the time and press an action button until the list is "
-"empty.</qt>"
-msgstr ""
-
-#: app/katemwmodonhddialog.cpp:93
-msgid "Filename"
-msgstr "Enw Ffeil"
-
-#: app/katemwmodonhddialog.cpp:94
-msgid "Status on Disk"
+"Here you can see all available Kate plugins. Those with a check mark are "
+"loaded, and will be loaded again the next time Kate is started."
 msgstr ""
+"Yma gallwch weld pob ategyn Kate sydd ar gael. Mae'r sawl a nôd brith yn eu "
+"herbyn yn llwythiedig, ac fe'i llwythir tro nesaf y cychwynnir Kate."
 
-#: app/katemwmodonhddialog.cpp:98
-msgid "Modified"
-msgstr "Addaswyd"
-
-#: app/katemwmodonhddialog.cpp:98
-msgid "Created"
-msgstr "Crëwyd"
-
-#: app/katemwmodonhddialog.cpp:98
-msgid "Deleted"
-msgstr "Wedi'u dileu"
+#: app/katemain.cpp:41
+#, fuzzy
+msgid "Start Kate with a given session"
+msgstr "Sesiwn"
 
-#: app/katemwmodonhddialog.cpp:108
-msgid "&View Difference"
+#: app/katemain.cpp:43
+msgid "Use a already running kate instance (if possible)"
 msgstr ""
 
-#: app/katemwmodonhddialog.cpp:111
-msgid ""
-"Calculates the difference between the the editor contents and the disk file for "
-"the selected document, and shows the difference with the default application. "
-"Requires diff(1)."
+#: app/katemain.cpp:45
+msgid "Force single document mode if the MDI setting is enabled."
 msgstr ""
 
-#: app/katemwmodonhddialog.cpp:163
-#, fuzzy
-msgid ""
-"Could not save the document \n"
-"'%1'"
-msgstr "Cau`r ddogfen cyfredol"
-
-#: app/katemwmodonhddialog.cpp:268
-msgid ""
-"The diff command failed. Please make sure that diff(1) is installed and in your "
-"PATH."
+#: app/katemain.cpp:47
+msgid "Only try to reuse kate instance with this pid"
 msgstr ""
 
-#: app/katemwmodonhddialog.cpp:270
-msgid "Error Creating Diff"
+#: app/katemain.cpp:49 app/kwritemain.cpp:532
+msgid "Set encoding for the file to open"
 msgstr ""
 
-#: app/kateconfigdialog.cpp:91 app/kateconfigdialog.cpp:97
-#: app/kateconfigdialog.cpp:174 app/kateconfigdialog.cpp:243
-#: app/kateconfigdialog.cpp:252 app/kateconfigdialog.cpp:260
-#: app/kateconfigdialog.cpp:268 app/kateconfigdialog.cpp:317
-msgid "Application"
-msgstr "Cymhwysiad"
-
-#: app/kateconfigdialog.cpp:97
-msgid "General"
-msgstr "Cyffredinol"
-
-#: app/kateconfigdialog.cpp:98
-msgid "General Options"
-msgstr "Dewisiadau Cyffredinol"
-
-#: app/kateconfigdialog.cpp:105
-msgid "&Appearance"
-msgstr "&Ymddangosiad"
-
-#: app/kateconfigdialog.cpp:110
-msgid "&Show full path in title"
-msgstr "&Dangos llwybr llawn yn y teitl"
-
-#: app/kateconfigdialog.cpp:112
-msgid ""
-"If this option is checked, the full document path will be shown in the window "
-"caption."
-msgstr ""
-"Os dewisir y dewisiad hwn, dengys llwybr llawn y ddogfen ym mhennawd y "
-"ffenestr.  "
+#: app/katemain.cpp:51 app/kwritemain.cpp:533
+msgid "Navigate to this line"
+msgstr "Llywio i'r linell hon"
 
-#: app/kateconfigdialog.cpp:117
-msgid "&Behavior"
-msgstr "&Ymddygiad"
+#: app/katemain.cpp:53 app/kwritemain.cpp:534
+msgid "Navigate to this column"
+msgstr "Llywio i'r golofn hon"
 
-#: app/kateconfigdialog.cpp:122
-msgid "Sync &terminal emulator with active document"
-msgstr "Cydweddu efelychydd &terfynell â'r ddogfen weithredol"
+#: app/katemain.cpp:55 app/kwritemain.cpp:531
+msgid "Read the contents of stdin"
+msgstr "Darllen cynnwys stdin (y mewnbwn safonol)"
 
-#: app/kateconfigdialog.cpp:125
-msgid ""
-"If this is checked, the built in Konsole will <code>cd</code> "
-"to the directory of the active document when started and whenever the active "
-"document changes, if the document is a local file."
-msgstr ""
-"uOs yw hwn yn ddewisiedig, bydd y Konsole mewnadeiladedig yn <code>cd</code> "
-"(newid cyfeiriadur) i gyfeiriadur y ddogfen cyfredol pan ei gychwynnir a phryd "
-"bynnag y newida'r ddogfen weithredol, os yw'r ddogfen yn ffeil lleol."
+#: app/katemain.cpp:56 app/kwritemain.cpp:535
+msgid "Document to open"
+msgstr "Dogfen i'w hagor"
 
-#: app/kateconfigdialog.cpp:132
-msgid "Wa&rn about files modified by foreign processes"
-msgstr "Rhy&buddio am ffeiliau a addasir gan brosesau allanol"
+#: app/katemain.cpp:67
+msgid "Kate"
+msgstr "Kate"
 
-#: app/kateconfigdialog.cpp:135
-msgid ""
-"If enabled, when Kate receives focus you will be asked what to do with files "
-"that have been modified on the hard disk. If not enabled, you will be asked "
-"what to do with a file that has been modified on the hard disk only when that "
-"file gains focus inside Kate."
-msgstr ""
+#: app/katemain.cpp:68
+msgid "Kate - Advanced Text Editor"
+msgstr "Kate - Golygydd Testun Uwch"
 
-#: app/kateconfigdialog.cpp:143
+#: app/katemain.cpp:69 app/kwritemain.cpp:556
 #, fuzzy
-msgid "Meta-Information"
-msgstr "Meta-wybodaeth"
+msgid "(c) 2000-2005 The Kate Authors"
+msgstr "(h)(c) 2000-2003 Yr Awduron Kate"
 
-#: app/kateconfigdialog.cpp:148
-msgid "Keep &meta-information past sessions"
-msgstr "Cadw m&eta-wybodaeth tu hwnt i'r sesiwn"
+#: app/katemain.cpp:71 app/kwritemain.cpp:558
+msgid "Maintainer"
+msgstr "Cynhaliwr"
 
-#: app/kateconfigdialog.cpp:151
-msgid ""
-"Check this if you want document configuration like for example bookmarks to be "
-"saved past editor sessions. The configuration will be restored if the document "
-"has not changed when reopened."
-msgstr ""
-"Brithwch hyn os hoffech i ffurfweddiad dogfennau, fel tudnodau er enghraifft, "
-"gael ei gadw tu hwnt i'r sesiwn golygydd.  Adferir y ffurfweddiad os nid yw'r "
-"ddogfen wedi'i newid pan ail-agorir."
+#: app/katemain.cpp:72 app/katemain.cpp:73 app/katemain.cpp:74
+#: app/katemain.cpp:79 app/kwritemain.cpp:559 app/kwritemain.cpp:560
+#: app/kwritemain.cpp:561 app/kwritemain.cpp:566
+msgid "Core Developer"
+msgstr "Datblygwr Craidd"
 
-#: app/kateconfigdialog.cpp:159
-msgid "&Delete unused meta-information after:"
-msgstr "&Dileu meta-wybodaeth nas defnyddwyd ar ôl:"
+#: app/katemain.cpp:75 app/kwritemain.cpp:562
+msgid "The cool buffersystem"
+msgstr "Y gyfundrefn byfferi cŵl"
 
-#: app/kateconfigdialog.cpp:161
-msgid "(never)"
-msgstr "(byth)"
+#: app/katemain.cpp:76 app/kwritemain.cpp:563
+msgid "The Editing Commands"
+msgstr "Y Gorchmynion Golygu"
 
-#: app/kateconfigdialog.cpp:162
-msgid " day(s)"
-msgstr "diwrnod(au)"
+#: app/katemain.cpp:77 app/kwritemain.cpp:564
+msgid "Testing, ..."
+msgstr "Profi,..."
 
-#: app/kateconfigdialog.cpp:174
-msgid "Sessions"
-msgstr "Sesiynau"
+#: app/katemain.cpp:78 app/kwritemain.cpp:565
+msgid "Former Core Developer"
+msgstr "Cyn-ddatblygwr Craidd"
 
-#: app/kateconfigdialog.cpp:175
-#, fuzzy
-msgid "Session Management"
-msgstr "Sesiwn"
+#: app/katemain.cpp:80 app/kwritemain.cpp:567
+msgid "KWrite Author"
+msgstr "Awdur KWrite"
 
-#: app/kateconfigdialog.cpp:181
-#, fuzzy
-msgid "Elements of Sessions"
-msgstr "Sesiwn"
+#: app/katemain.cpp:81 app/kwritemain.cpp:568
+msgid "KWrite port to KParts"
+msgstr "Porthiad KWrite i KParts"
 
-#: app/kateconfigdialog.cpp:186
-#, fuzzy
-msgid "Include &window configuration"
-msgstr "Adfer ffurfwedd &golwg"
+#: app/katemain.cpp:84 app/kwritemain.cpp:571
+msgid "KWrite Undo History, Kspell integration"
+msgstr "Hanes Datwneud KWrite, cyfuno Kspell"
 
-#: app/kateconfigdialog.cpp:190
-msgid ""
-"Check this if you want all your views and frames restored each time you open "
-"Kate"
-msgstr ""
-"Dewiswch hwn os ydych am adfer eich holl olygon a'ch holl fframau bob tro yr "
-"agorwch Kate"
+#: app/katemain.cpp:85 app/kwritemain.cpp:572
+msgid "KWrite XML Syntax highlighting support"
+msgstr "Cynhaliaeth amlygu cystrawen XML KWrite"
 
-#: app/kateconfigdialog.cpp:195
-msgid "Behavior on Application Startup"
-msgstr ""
+#: app/katemain.cpp:86 app/kwritemain.cpp:573
+msgid "Patches and more"
+msgstr "Clytiau a mwy"
 
-#: app/kateconfigdialog.cpp:199
-msgid "&Start new session"
-msgstr "Dechrau &Sesiwn Newydd"
+#: app/katemain.cpp:87
+msgid "Developer & Highlight wizard"
+msgstr "Dewin Datblygu ac Amlygu"
 
-#: app/kateconfigdialog.cpp:200
-#, fuzzy
-msgid "&Load last-used session"
-msgstr "Sesiwn"
+#: app/katemain.cpp:89 app/kwritemain.cpp:575
+msgid "Highlighting for RPM Spec-Files, Perl, Diff and more"
+msgstr "Amlygu ffeiliau manyleb RPM, Perl, Diff a mwy"
 
-#: app/kateconfigdialog.cpp:201
-msgid "&Manually choose a session"
-msgstr ""
+#: app/katemain.cpp:90 app/kwritemain.cpp:576
+msgid "Highlighting for VHDL"
+msgstr "Amlygu ar gyfer VHDL"
 
-#: app/kateconfigdialog.cpp:216
-msgid "Behavior on Application Exit or Session Switch"
-msgstr ""
+#: app/katemain.cpp:91 app/kwritemain.cpp:577
+msgid "Highlighting for SQL"
+msgstr "Amlygu ar gyfer SQL"
 
-#: app/kateconfigdialog.cpp:220
-#, fuzzy
-msgid "&Do not save session"
-msgstr "Sesiwn"
+#: app/katemain.cpp:92 app/kwritemain.cpp:578
+msgid "Highlighting for Ferite"
+msgstr "Amlygu ar gyfer Ferite"
 
-#: app/kateconfigdialog.cpp:221
-#, fuzzy
-msgid "&Save session"
-msgstr "Sesiwn"
+#: app/katemain.cpp:93 app/kwritemain.cpp:579
+msgid "Highlighting for ILERPG"
+msgstr "Amlygu ar gyfer ILERPG"
 
-#: app/kateconfigdialog.cpp:222
-msgid "&Ask user"
-msgstr ""
+#: app/katemain.cpp:94 app/kwritemain.cpp:580
+msgid "Highlighting for LaTeX"
+msgstr "Amlygu ar gyfer LaTeX"
 
-#: app/kateconfigdialog.cpp:243
-msgid "File Selector"
-msgstr "Dewisydd Ffeiliau"
+#: app/katemain.cpp:95 app/kwritemain.cpp:581
+msgid "Highlighting for Makefiles, Python"
+msgstr "Amlygu ar gyfer ffeiliau gwneud, Python"
 
-#: app/kateconfigdialog.cpp:245
-msgid "File Selector Settings"
-msgstr "Gosodiadau Dewisydd Ffeiliau"
+#: app/katemain.cpp:96 app/kwritemain.cpp:582
+msgid "Highlighting for Python"
+msgstr "Amlygu ar gyfer Python"
 
-#: app/kateconfigdialog.cpp:252
-#, fuzzy
-msgid "Document List"
-msgstr "Dogfennau"
+#: app/katemain.cpp:98 app/kwritemain.cpp:584
+msgid "Highlighting for Scheme"
+msgstr "Amlygu ar gyfer Scheme"
 
-#: app/kateconfigdialog.cpp:253
-#, fuzzy
-msgid "Document List Settings"
-msgstr "Dogfen i'w hagor"
+#: app/katemain.cpp:99 app/kwritemain.cpp:585
+msgid "PHP Keyword/Datatype list"
+msgstr "Rhestr Allweddair/Math data PHP"
 
-#: app/kateconfigdialog.cpp:260 app/kateconfigdialog.cpp:317
-msgid "Plugins"
-msgstr "Ategion"
+#: app/katemain.cpp:100 app/kwritemain.cpp:586
+msgid "Very nice help"
+msgstr "Cymorth hyfryd iawn"
 
-#: app/kateconfigdialog.cpp:261
-msgid "Plugin Manager"
-msgstr "Trefnydd Ategion"
+#: app/katemain.cpp:101 app/kwritemain.cpp:587
+msgid "All people who have contributed and I have forgotten to mention"
+msgstr "Pawb sydd wedi cyfrannu a rwy wedi anghofio eu crybwyll"
 
-#: app/kateconfigdialog.cpp:276 app/kateconfigdialog.cpp:282
-msgid "Editor"
-msgstr "Golygydd"
+#: app/kateapp.cpp:214 app/kateapp.cpp:326 app/kwritemain.cpp:686
+msgid ""
+"The file '%1' could not be opened: it is not a normal file, it is a folder."
+msgstr "Methwyd agor y ffeil '%1'; plygell yw hi, dim ffeil arferol."
 
 #: app/kategrepdialog.cpp:102
 msgid "Pattern:"
@@ -879,365 +786,597 @@ msgstr "<strong>Gwall:</strong><p>"
 msgid "Grep Tool Error"
 msgstr "Gwall Erfyn grep"
 
-#: app/katemain.cpp:41
+#: app/katedocmanager.cpp:395
+msgid ""
+"<p>The document '%1' has been modified, but not saved."
+"<p>Do you want to save your changes or discard them?"
+msgstr ""
+"<p>Addaswyd y ddogfen '%1', ond ni'i gadwyd. "
+"<p>Ydych am gadw eich newidiadu, neu eu taflu?"
+
+#: app/katedocmanager.cpp:397
+msgid "Close Document"
+msgstr "Cau Dogfen"
+
+#: app/katedocmanager.cpp:484
+msgid "Reopening files from the last session..."
+msgstr "Ailagor ffeiliau o'r sesiwn blaenorol..."
+
+#: app/katedocmanager.cpp:491
 #, fuzzy
-msgid "Start Kate with a given session"
-msgstr "Sesiwn"
+msgid "Starting Up"
+msgstr "Ymgyc&hwyn"
 
-#: app/katemain.cpp:43
-msgid "Use a already running kate instance (if possible)"
+#: app/katemwmodonhddialog.cpp:61
+#, fuzzy
+msgid "Documents Modified on Disk"
+msgstr "Dogfen i'w hagor"
+
+#: app/katemwmodonhddialog.cpp:63
+msgid "&Ignore"
+msgstr "&Anwybyddu"
+
+#: app/katemwmodonhddialog.cpp:64
+msgid "&Overwrite"
+msgstr "&Trosysgrifo"
+
+#: app/katemwmodonhddialog.cpp:68
+msgid ""
+"Removes the modified flag from the selected documents and closes the dialog if "
+"there are no more unhandled documents."
 msgstr ""
 
-#: app/katemain.cpp:45
-msgid "Only try to reuse kate instance with this pid"
+#: app/katemwmodonhddialog.cpp:71
+msgid ""
+"Overwrite selected documents, discarding the disk changes and closes the dialog "
+"if there are no more unhandled documents."
 msgstr ""
 
-#: app/katemain.cpp:47 app/kwritemain.cpp:532
-msgid "Set encoding for the file to open"
+#: app/katemwmodonhddialog.cpp:74
+msgid ""
+"Reloads the selected documents from disk and closes the dialog if there are no "
+"more unhandled documents."
 msgstr ""
 
-#: app/katemain.cpp:49 app/kwritemain.cpp:533
-msgid "Navigate to this line"
-msgstr "Llywio i'r linell hon"
+#: app/katemwmodonhddialog.cpp:87
+msgid ""
+"<qt>The documents listed below has changed on disk."
+"<p>Select one or more at the time and press an action button until the list is "
+"empty.</qt>"
+msgstr ""
 
-#: app/katemain.cpp:51 app/kwritemain.cpp:534
-msgid "Navigate to this column"
-msgstr "Llywio i'r golofn hon"
+#: app/katemwmodonhddialog.cpp:93
+msgid "Filename"
+msgstr "Enw Ffeil"
 
-#: app/katemain.cpp:53 app/kwritemain.cpp:531
-msgid "Read the contents of stdin"
-msgstr "Darllen cynnwys stdin (y mewnbwn safonol)"
+#: app/katemwmodonhddialog.cpp:94
+msgid "Status on Disk"
+msgstr ""
 
-#: app/katemain.cpp:54 app/kwritemain.cpp:535
-msgid "Document to open"
-msgstr "Dogfen i'w hagor"
+#: app/katemwmodonhddialog.cpp:98
+msgid "Modified"
+msgstr "Addaswyd"
 
-#: app/katemain.cpp:63
-msgid "Kate"
-msgstr "Kate"
+#: app/katemwmodonhddialog.cpp:98
+msgid "Created"
+msgstr "Crëwyd"
 
-#: app/katemain.cpp:64
-msgid "Kate - Advanced Text Editor"
-msgstr "Kate - Golygydd Testun Uwch"
+#: app/katemwmodonhddialog.cpp:98
+msgid "Deleted"
+msgstr "Wedi'u dileu"
+
+#: app/katemwmodonhddialog.cpp:108
+msgid "&View Difference"
+msgstr ""
+
+#: app/katemwmodonhddialog.cpp:111
+msgid ""
+"Calculates the difference between the the editor contents and the disk file for "
+"the selected document, and shows the difference with the default application. "
+"Requires diff(1)."
+msgstr ""
 
-#: app/katemain.cpp:65 app/kwritemain.cpp:552
+#: app/katemwmodonhddialog.cpp:163
 #, fuzzy
-msgid "(c) 2000-2005 The Kate Authors"
-msgstr "(h)(c) 2000-2003 Yr Awduron Kate"
+msgid ""
+"Could not save the document \n"
+"'%1'"
+msgstr "Cau`r ddogfen cyfredol"
 
-#: app/katemain.cpp:67 app/kwritemain.cpp:554
-msgid "Maintainer"
-msgstr "Cynhaliwr"
+#: app/katemwmodonhddialog.cpp:268
+msgid ""
+"The diff command failed. Please make sure that diff(1) is installed and in your "
+"PATH."
+msgstr ""
 
-#: app/katemain.cpp:68 app/katemain.cpp:69 app/katemain.cpp:70
-#: app/katemain.cpp:75 app/kwritemain.cpp:555 app/kwritemain.cpp:556
-#: app/kwritemain.cpp:557 app/kwritemain.cpp:562
-msgid "Core Developer"
-msgstr "Datblygwr Craidd"
+#: app/katemwmodonhddialog.cpp:270
+msgid "Error Creating Diff"
+msgstr ""
 
-#: app/katemain.cpp:71 app/kwritemain.cpp:558
-msgid "The cool buffersystem"
-msgstr "Y gyfundrefn byfferi cŵl"
+#: app/katemailfilesdialog.cpp:47
+msgid "Email Files"
+msgstr "Ebostio Ffeiliau"
 
-#: app/katemain.cpp:72 app/kwritemain.cpp:559
-msgid "The Editing Commands"
-msgstr "Y Gorchmynion Golygu"
+#: app/katemailfilesdialog.cpp:49 app/katemailfilesdialog.cpp:99
+msgid "&Show All Documents >>"
+msgstr "&Dangos Pob Dogfen >>"
 
-#: app/katemain.cpp:73 app/kwritemain.cpp:560
-msgid "Testing, ..."
-msgstr "Profi,..."
+#: app/katemailfilesdialog.cpp:52
+msgid "&Mail..."
+msgstr "&Postio..."
 
-#: app/katemain.cpp:74 app/kwritemain.cpp:561
-msgid "Former Core Developer"
-msgstr "Cyn-ddatblygwr Craidd"
+#: app/katemailfilesdialog.cpp:57
+msgid ""
+"<p>Press <strong>Mail...</strong> to email the current document."
+"<p>To select more documents to send, press <strong>Show All "
+"Documents&nbsp;&gt;&gt;</strong>."
+msgstr ""
+"<p>Gwasgwch <strong>Postio...</strong> i ebostio'r ddogfen cyfredol."
+"<p>I ddewis rhagor o ddogfennau i'w hanfon, gwasgwch <strong>"
+"Dangos Pob Dogfen &nbsp;&gt;&gt;</ strong>."
 
-#: app/katemain.cpp:76 app/kwritemain.cpp:563
-msgid "KWrite Author"
-msgstr "Awdur KWrite"
+#: app/katefilelist.cpp:150 app/katefilelist.cpp:688
+#: app/katemailfilesdialog.cpp:62
+msgid "URL"
+msgstr "URL"
 
-#: app/katemain.cpp:77 app/kwritemain.cpp:564
-msgid "KWrite port to KParts"
-msgstr "Porthiad KWrite i KParts"
+#: app/katemailfilesdialog.cpp:104
+msgid "&Hide Document List <<"
+msgstr "&Cuddio Rhestr Ddogfennau <<"
 
-#: app/katemain.cpp:80 app/kwritemain.cpp:567
-msgid "KWrite Undo History, Kspell integration"
-msgstr "Hanes Datwneud KWrite, cyfuno Kspell"
+#: app/katemailfilesdialog.cpp:105
+msgid "Press <strong>Mail...</strong> to send selected documents"
+msgstr "Gwasgwch <strong>Postio...</strong> i anfon dogfennau dewisiedig"
 
-#: app/katemain.cpp:81 app/kwritemain.cpp:568
-msgid "KWrite XML Syntax highlighting support"
-msgstr "Cynhaliaeth amlygu cystrawen XML KWrite"
+#: app/katefileselector.cpp:170
+msgid "Current Document Folder"
+msgstr "Plygell Dogfen Gyfredol"
 
-#: app/katemain.cpp:82 app/kwritemain.cpp:569
-msgid "Patches and more"
-msgstr "Clytiau a mwy"
+#: app/katefileselector.cpp:198
+msgid ""
+"<p>Here you can enter a path for a folder to display."
+"<p>To go to a folder previously entered, press the arrow on the right and "
+"choose one. "
+"<p>The entry has folder completion. Right-click to choose how completion should "
+"behave."
+msgstr ""
+"<p>Yma gallwch roi llwybr ar gyfer plygell i'w ddangos."
+"<p> I fynd i blygell a roddwyd eisioes, gwasgwch y saeth ar y dde a dewis un "
+"ohonynt."
+"<p>Mae cyflawni plygyll ar y gofnod. Rhowch glic-dde i ddewis sut y dylai'r "
+"cyflawni ymddwyn."
 
-#: app/katemain.cpp:83
-msgid "Developer & Highlight wizard"
-msgstr "Dewin Datblygu ac Amlygu"
+#: app/katefileselector.cpp:203
+msgid ""
+"<p>Here you can enter a name filter to limit which files are displayed."
+"<p>To clear the filter, toggle off the filter button to the left."
+"<p>To reapply the last filter used, toggle on the filter button."
+msgstr ""
+"<p>Yma gallwch roi hidlen enwau i gyfyngu pa ffeiliau a ddengys."
+"<p>I wagio'r hidlen, diffoddwch y botwm hidlen ar y chwith."
+"<p>I ailweithredu'r hidlen ddefnyddiwyd ddiwethaf, cynnwch y botwm hidlen."
 
-#: app/katemain.cpp:85 app/kwritemain.cpp:571
-msgid "Highlighting for RPM Spec-Files, Perl, Diff and more"
-msgstr "Amlygu ffeiliau manyleb RPM, Perl, Diff a mwy"
+#: app/katefileselector.cpp:207
+msgid ""
+"<p>This button clears the name filter when toggled off, or reapplies the last "
+"filter used when toggled on."
+msgstr ""
+"<p>Gwagia'r botwm yma'r hidlen enwau pan yn ddiffodd, neu ailweithreda'r hidlen "
+"ddefnyddiwyd ddiwethaf pan ynghyn."
 
-#: app/katemain.cpp:86 app/kwritemain.cpp:572
-msgid "Highlighting for VHDL"
-msgstr "Amlygu ar gyfer VHDL"
+#: app/katefileselector.cpp:321
+msgid "Apply last filter (\"%1\")"
+msgstr "Gweithredu'r hidlen ddiwethaf (\"%1\")"
 
-#: app/katemain.cpp:87 app/kwritemain.cpp:573
-msgid "Highlighting for SQL"
-msgstr "Amlygu ar gyfer SQL"
+#: app/katefileselector.cpp:326
+msgid "Clear filter"
+msgstr "Gwagio hidlen"
 
-#: app/katemain.cpp:88 app/kwritemain.cpp:574
-msgid "Highlighting for Ferite"
-msgstr "Amlygu ar gyfer Ferite"
+#: app/katefileselector.cpp:536
+msgid "Toolbar"
+msgstr "Bar offer"
 
-#: app/katemain.cpp:89 app/kwritemain.cpp:575
-msgid "Highlighting for ILERPG"
-msgstr "Amlygu ar gyfer ILERPG"
+#: app/katefileselector.cpp:538
+msgid "A&vailable actions:"
+msgstr "&Gweithredoedd ar gael:"
 
-#: app/katemain.cpp:90 app/kwritemain.cpp:576
-msgid "Highlighting for LaTeX"
-msgstr "Amlygu ar gyfer LaTeX"
+#: app/katefileselector.cpp:539
+msgid "S&elected actions:"
+msgstr "Gweithredoedd d&ewisiedig:"
 
-#: app/katemain.cpp:91 app/kwritemain.cpp:577
-msgid "Highlighting for Makefiles, Python"
-msgstr "Amlygu ar gyfer ffeiliau gwneud, Python"
+#: app/katefileselector.cpp:547
+msgid "Auto Synchronization"
+msgstr "Cydweddu Ymysgogol"
 
-#: app/katemain.cpp:92 app/kwritemain.cpp:578
-msgid "Highlighting for Python"
-msgstr "Amlygu ar gyfer Python"
+#: app/katefileselector.cpp:548
+msgid "When a docu&ment becomes active"
+msgstr "Pan ddaw dog&fen yn weithredol"
 
-#: app/katemain.cpp:94 app/kwritemain.cpp:580
-msgid "Highlighting for Scheme"
-msgstr "Amlygu ar gyfer Scheme"
+#: app/katefileselector.cpp:549
+msgid "When the file selector becomes visible"
+msgstr "Pan ymddengys y dewisydd ffeiliau"
 
-#: app/katemain.cpp:95 app/kwritemain.cpp:581
-msgid "PHP Keyword/Datatype list"
-msgstr "Rhestr Allweddair/Math data PHP"
+#: app/katefileselector.cpp:556
+msgid "Remember &locations:"
+msgstr "Cofio &lleoliadau:"
 
-#: app/katemain.cpp:96 app/kwritemain.cpp:582
-msgid "Very nice help"
-msgstr "Cymorth hyfryd iawn"
+#: app/katefileselector.cpp:563
+msgid "Remember &filters:"
+msgstr "Cofio &hidlenni:"
 
-#: app/katemain.cpp:97 app/kwritemain.cpp:583
-msgid "All people who have contributed and I have forgotten to mention"
-msgstr "Pawb sydd wedi cyfrannu a rwy wedi anghofio eu crybwyll"
+#: app/katefileselector.cpp:570
+msgid "Session"
+msgstr "Sesiwn"
 
-#: _translatorinfo.cpp:1 app/katemain.cpp:99 app/kwritemain.cpp:585
+#: app/katefileselector.cpp:571
+msgid "Restore loca&tion"
+msgstr "Adfer lleolia&dau:"
+
+#: app/katefileselector.cpp:572
+msgid "Restore last f&ilter"
+msgstr "Adfer h&idlen ddiwethaf:"
+
+#: app/katefileselector.cpp:592
 msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Owain Green drwy KGyfieithu - Meddalwedd Gymraeg"
+"<p>Decides how many locations to keep in the history of the location combo box."
+msgstr ""
+"<p>Penderfynna sawl lleoliad i gadw yn hanes y blwch cyfuno lleoliadau."
 
-#: _translatorinfo.cpp:3 app/katemain.cpp:99 app/kwritemain.cpp:585
+#: app/katefileselector.cpp:597
 msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "kyfieithu@dotmon.com"
+"<p>Decides how many filters to keep in the history of the filter combo box."
+msgstr "<p>Penderfynna sawl hidlen i gadw yn hanes y blwch cyfuno hidlenni."
 
-#: app/katedocmanager.cpp:395
+#: app/katefileselector.cpp:602
 msgid ""
-"<p>The document '%1' has been modified, but not saved."
-"<p>Do you want to save your changes or discard them?"
+"<p>These options allow you to have the File Selector automatically change "
+"location to the folder of the active document on certain events."
+"<p>Auto synchronization is <em>lazy</em>, meaning it will not take effect until "
+"the file selector is visible."
+"<p>None of these are enabled by default, but you can always sync the location "
+"by pressing the sync button in the toolbar."
 msgstr ""
-"<p>Addaswyd y ddogfen '%1', ond ni'i gadwyd. "
-"<p>Ydych am gadw eich newidiadu, neu eu taflu?"
+"<p>Galluoga'r dewisiadau yma i chi beri i'r Dewisydd Ffeiliau newid lleoliad i "
+"blygell y ddogfen gyfredol yn ymysgogol ar ddigwyddiadau penodol."
+"<p>Mae cydweddu ymysgogol yn <em>ddiog</em>, sy'n golygu na ddaw i rym nes "
+"ymddengys y dewisydd ffeiliau."
+"<p>Ni ddewisir yr un o'r rhain yn ragosod, ond gallwch gydweddu'r lleoliad trwy "
+"wasgu'r botwm cydweddu yn y bar offer ar unrhyw adeg."
 
-#: app/katedocmanager.cpp:397
-msgid "Close Document"
-msgstr "Cau Dogfen"
+#: app/katefileselector.cpp:611
+msgid ""
+"<p>If this option is enabled (default), the location will be restored when you "
+"start Kate."
+"<p><strong>Note</strong> that if the session is handled by the TDE session "
+"manager, the location is always restored."
+msgstr ""
+"<p>Os yw'r dewisiad yma'n alluog (rhagosodyn), adferir y lleoliad pan "
+"gychwynnwch Kate."
+"<p><strong>Noder</strong> yr adferir y lleoliad bob tro os trinir y sesiwn gan "
+"y trefnydd sesiynau TDE."
 
-#: app/katedocmanager.cpp:483
-msgid "Reopening files from the last session..."
-msgstr "Ailagor ffeiliau o'r sesiwn blaenorol..."
+#: app/katefileselector.cpp:615
+msgid ""
+"<p>If this option is enabled (default), the current filter will be restored "
+"when you start Kate."
+"<p><strong>Note</strong> that if the session is handled by the TDE session "
+"manager, the filter is always restored."
+"<p><strong>Note</strong> that some of the autosync settings may override the "
+"restored location if on."
+msgstr ""
+"<p>Os yw'r dewisiad yma'n alluog (rhagosodyn), adferir yr hidlen pan "
+"gychwynnwch Kate."
+"<p><strong>Noder</strong> yr adferir yr hidlen bob tro os trinir y sesiwn gan y "
+"trefnydd sesiynau TDE. "
+"<p><strong>Noder</strong> y gall rhai o'r gosodiadau hunan-gydamseru gymryd "
+"blaenoriaeth dros y lleoliad a adferir, os mae'n nhw mewn bod."
 
-#: app/katedocmanager.cpp:490
-#, fuzzy
-msgid "Starting Up"
-msgstr "Ymgyc&hwyn"
+#: app/kateconfigdialog.cpp:91 app/kateconfigdialog.cpp:97
+#: app/kateconfigdialog.cpp:204 app/kateconfigdialog.cpp:273
+#: app/kateconfigdialog.cpp:282 app/kateconfigdialog.cpp:290
+#: app/kateconfigdialog.cpp:298 app/kateconfigdialog.cpp:347
+msgid "Application"
+msgstr "Cymhwysiad"
 
-#: app/katesession.cpp:78 app/katesession.cpp:102 app/katesession.cpp:252
-#, fuzzy
-msgid "Default Session"
-msgstr "Sesiwn"
+#: app/kateconfigdialog.cpp:97
+msgid "General"
+msgstr "Cyffredinol"
 
-#: app/katesession.cpp:82
-#, fuzzy
-msgid "Unnamed Session"
-msgstr "Sesiwn"
+#: app/kateconfigdialog.cpp:98
+msgid "General Options"
+msgstr "Dewisiadau Cyffredinol"
 
-#: app/katesession.cpp:104
-msgid "Session (%1)"
-msgstr "Sesiwn (%1)"
+#: app/kateconfigdialog.cpp:105
+msgid "&Appearance"
+msgstr "&Ymddangosiad"
 
-#: app/katesession.cpp:384
-msgid "Save Session?"
-msgstr "Cadw Sesiwn?"
+#: app/kateconfigdialog.cpp:110
+msgid "&Show full path in title"
+msgstr "&Dangos llwybr llawn yn y teitl"
 
-#: app/katesession.cpp:391
-#, fuzzy
-msgid "Save current session?"
-msgstr "Dogfennau"
+#: app/kateconfigdialog.cpp:112
+msgid ""
+"If this option is checked, the full document path will be shown in the window "
+"caption."
+msgstr ""
+"Os dewisir y dewisiad hwn, dengys llwybr llawn y ddogfen ym mhennawd y "
+"ffenestr.  "
 
-#: app/katesession.cpp:392
-msgid "Do not ask again"
-msgstr "Peidiwch a gofyn eto"
+#: app/kateconfigdialog.cpp:117
+msgid "Sort &files alphabetically in the file list"
+msgstr "Didoli &ffeiliau'n wyddorol yn y restr ffeiliau"
 
-#: app/katesession.cpp:482
-#, fuzzy
-msgid "No session selected to open."
-msgstr "&Dewisiedig:"
+#: app/kateconfigdialog.cpp:120
+msgid ""
+"If this is checked, the files in the file list will be sorted alphabetically."
+msgstr "uOs dewisir hwn, didolir ffeiliau yn y restr ffeiliau yn ôl yr wyddor."
 
-#: app/katesession.cpp:482
-#, fuzzy
-msgid "No Session Selected"
-msgstr "&Dewisiedig:"
+#: app/kateconfigdialog.cpp:124
+msgid "&Behavior"
+msgstr "&Ymddygiad"
 
-#: app/katesession.cpp:554
-#, fuzzy
-msgid "Specify Name for Current Session"
-msgstr "Dogfennau"
+#: app/kateconfigdialog.cpp:129
+msgid "&Number of recent files:"
+msgstr "&Nifer ffeiliau diweddar:"
 
-#: app/katesession.cpp:554 app/katesession.cpp:572 app/katesession.cpp:850
-msgid "Session name:"
-msgstr "Enw sesiwn:"
+#: app/kateconfigdialog.cpp:134
+msgid ""
+"<qt>Sets the number of recent files remembered by Kate."
+"<p><strong>NOTE: </strong>If you set this lower than the current value, the "
+"list will be truncated and some items forgotten.</qt>"
+msgstr ""
+"<qt>Gosoda'r nifer o ffeiliau diweddar bydd Kate yn cofio."
+"<p><strong>NODER:</strong>Os gosodwch hwn yn llai na'r gwerth cyfredol, "
+"talfyrrir y restr ac fe anghofir rhai eitemau.</qt>"
 
-#: app/katesession.cpp:561
-msgid "To save a new session, you must specify a name."
+#: app/kateconfigdialog.cpp:143
+msgid "Always use the current instance of kate to open new files"
 msgstr ""
 
-#: app/katesession.cpp:561 app/katesession.cpp:579 app/katesession.cpp:857
-msgid "Missing Session Name"
+#: app/kateconfigdialog.cpp:146
+msgid ""
+"When checked, all files opened from outside of Kate will only use the currently "
+"opened instance of Kate."
 msgstr ""
 
-#: app/katesession.cpp:572
-msgid "Specify New Name for Current Session"
+#: app/kateconfigdialog.cpp:152
+msgid "Sync &terminal emulator with active document"
+msgstr "Cydweddu efelychydd &terfynell â'r ddogfen weithredol"
+
+#: app/kateconfigdialog.cpp:155
+msgid ""
+"If this is checked, the built in Konsole will <code>cd</code> "
+"to the directory of the active document when started and whenever the active "
+"document changes, if the document is a local file."
 msgstr ""
+"uOs yw hwn yn ddewisiedig, bydd y Konsole mewnadeiladedig yn <code>cd</code> "
+"(newid cyfeiriadur) i gyfeiriadur y ddogfen cyfredol pan ei gychwynnir a phryd "
+"bynnag y newida'r ddogfen weithredol, os yw'r ddogfen yn ffeil lleol."
 
-#: app/katesession.cpp:579 app/katesession.cpp:857
-msgid "To save a session, you must specify a name."
+#: app/kateconfigdialog.cpp:162
+msgid "Wa&rn about files modified by foreign processes"
+msgstr "Rhy&buddio am ffeiliau a addasir gan brosesau allanol"
+
+#: app/kateconfigdialog.cpp:165
+msgid ""
+"If enabled, when Kate receives focus you will be asked what to do with files "
+"that have been modified on the hard disk. If not enabled, you will be asked "
+"what to do with a file that has been modified on the hard disk only when that "
+"file gains focus inside Kate."
 msgstr ""
 
-#: app/katesession.cpp:618
+#: app/kateconfigdialog.cpp:173
 #, fuzzy
-msgid "Session Chooser"
-msgstr "Sesiwn"
+msgid "Meta-Information"
+msgstr "Meta-wybodaeth"
 
-#: app/katesession.cpp:623 app/katesession.cpp:715
+#: app/kateconfigdialog.cpp:178
+msgid "Keep &meta-information past sessions"
+msgstr "Cadw m&eta-wybodaeth tu hwnt i'r sesiwn"
+
+#: app/kateconfigdialog.cpp:181
+msgid ""
+"Check this if you want document configuration like for example bookmarks to be "
+"saved past editor sessions. The configuration will be restored if the document "
+"has not changed when reopened."
+msgstr ""
+"Brithwch hyn os hoffech i ffurfweddiad dogfennau, fel tudnodau er enghraifft, "
+"gael ei gadw tu hwnt i'r sesiwn golygydd.  Adferir y ffurfweddiad os nid yw'r "
+"ddogfen wedi'i newid pan ail-agorir."
+
+#: app/kateconfigdialog.cpp:189
+msgid "&Delete unused meta-information after:"
+msgstr "&Dileu meta-wybodaeth nas defnyddwyd ar ôl:"
+
+#: app/kateconfigdialog.cpp:191
+msgid "(never)"
+msgstr "(byth)"
+
+#: app/kateconfigdialog.cpp:192
+msgid " day(s)"
+msgstr "diwrnod(au)"
+
+#: app/kateconfigdialog.cpp:204
+msgid "Sessions"
+msgstr "Sesiynau"
+
+#: app/kateconfigdialog.cpp:205
 #, fuzzy
-msgid "Open Session"
+msgid "Session Management"
 msgstr "Sesiwn"
 
-#: app/katesession.cpp:624
-msgid "New Session"
-msgstr "Sesiwn Newydd"
-
-#: app/katesession.cpp:642 app/katesession.cpp:732 app/katesession.cpp:796
+#: app/kateconfigdialog.cpp:211
 #, fuzzy
-msgid "Session Name"
+msgid "Elements of Sessions"
 msgstr "Sesiwn"
 
-#: app/katesession.cpp:643 app/katesession.cpp:733 app/katesession.cpp:797
+#: app/kateconfigdialog.cpp:216
 #, fuzzy
-msgid "Open Documents"
-msgstr "Dogfennau"
+msgid "Include &window configuration"
+msgstr "Adfer ffurfwedd &golwg"
 
-#: app/katesession.cpp:660
-msgid "&Always use this choice"
+#: app/kateconfigdialog.cpp:220
+msgid ""
+"Check this if you want all your views and frames restored each time you open "
+"Kate"
 msgstr ""
+"Dewiswch hwn os ydych am adfer eich holl olygon a'ch holl fframau bob tro yr "
+"agorwch Kate"
 
-#: app/katesession.cpp:720
-msgid "&Open"
-msgstr "A&gor"
+#: app/kateconfigdialog.cpp:225
+msgid "Behavior on Application Startup"
+msgstr ""
 
-#: app/katesession.cpp:781
+#: app/kateconfigdialog.cpp:229
+msgid "&Start new session"
+msgstr "Dechrau &Sesiwn Newydd"
+
+#: app/kateconfigdialog.cpp:230
 #, fuzzy
-msgid "Manage Sessions"
+msgid "&Load last-used session"
 msgstr "Sesiwn"
 
-#: app/katesession.cpp:810
-msgid "&Rename..."
-msgstr "Ail-&enwi..."
+#: app/kateconfigdialog.cpp:231
+msgid "&Manually choose a session"
+msgstr ""
 
-#: app/katesession.cpp:850
-msgid "Specify New Name for Session"
+#: app/kateconfigdialog.cpp:246
+msgid "Behavior on Application Exit or Session Switch"
 msgstr ""
 
-#: app/katefilelist.cpp:139
+#: app/kateconfigdialog.cpp:250
+#, fuzzy
+msgid "&Do not save session"
+msgstr "Sesiwn"
+
+#: app/kateconfigdialog.cpp:251
+#, fuzzy
+msgid "&Save session"
+msgstr "Sesiwn"
+
+#: app/kateconfigdialog.cpp:252
+msgid "&Ask user"
+msgstr ""
+
+#: app/kateconfigdialog.cpp:273
+msgid "File Selector"
+msgstr "Dewisydd Ffeiliau"
+
+#: app/kateconfigdialog.cpp:275
+msgid "File Selector Settings"
+msgstr "Gosodiadau Dewisydd Ffeiliau"
+
+#: app/kateconfigdialog.cpp:282
+#, fuzzy
+msgid "Document List"
+msgstr "Dogfennau"
+
+#: app/kateconfigdialog.cpp:283
+#, fuzzy
+msgid "Document List Settings"
+msgstr "Dogfen i'w hagor"
+
+#: app/kateconfigdialog.cpp:290 app/kateconfigdialog.cpp:347
+msgid "Plugins"
+msgstr "Ategion"
+
+#: app/kateconfigdialog.cpp:291
+msgid "Plugin Manager"
+msgstr "Trefnydd Ategion"
+
+#: app/kateconfigdialog.cpp:306 app/kateconfigdialog.cpp:312
+msgid "Editor"
+msgstr "Golygydd"
+
+#: app/katefilelist.cpp:141
 msgid "Sort &By"
 msgstr "Trefn&u Gan"
 
-#: app/katefilelist.cpp:142 app/katefilelist.cpp:579
+#: app/katefilelist.cpp:143
+#, fuzzy
+msgid "Move File Up"
+msgstr "Gwaredu Ffeil"
+
+#: app/katefilelist.cpp:145
+#, fuzzy
+msgid "Move File Down"
+msgstr "Gwaredu Ffeil"
+
+#: app/katefilelist.cpp:150 app/katefilelist.cpp:688
 msgid "Opening Order"
 msgstr ""
 
-#: app/katefilelist.cpp:142 app/katefilelist.cpp:579
+#: app/katefilelist.cpp:150 app/katefilelist.cpp:688
 #, fuzzy
 msgid "Document Name"
 msgstr "Dogfennau"
 
-#: app/katefilelist.cpp:373
+#: app/katefilelist.cpp:150
+msgid "Manual Placement"
+msgstr ""
+
+#: app/katefilelist.cpp:432
 #, fuzzy
 msgid ""
 "<b>This file was changed (modified) on disk by another program.</b><br />"
 msgstr ""
 "<b>Newidwyd (addaswyd) y ffeil yma ar y ddisg gan raglen arall!</b><br />"
 
-#: app/katefilelist.cpp:375
+#: app/katefilelist.cpp:434
 #, fuzzy
 msgid ""
 "<b>This file was changed (created) on disk by another program.</b><br />"
 msgstr ""
 "<b>Newidwyd (creuwyd) y ffeil yma ar y ddisg gan raglen arall!</b><br />"
 
-#: app/katefilelist.cpp:377
+#: app/katefilelist.cpp:436
 #, fuzzy
 msgid ""
 "<b>This file was changed (deleted) on disk by another program.</b><br />"
 msgstr ""
 "<b>Newidwyd (dileuwyd) y ffeil yma ar y ddisg gan raglen arall!</b><br />"
 
-#: app/katefilelist.cpp:553
+#: app/katefilelist.cpp:662
 msgid "Background Shading"
 msgstr ""
 
-#: app/katefilelist.cpp:559
+#: app/katefilelist.cpp:668
 msgid "&Enable background shading"
 msgstr ""
 
-#: app/katefilelist.cpp:563
+#: app/katefilelist.cpp:672
 #, fuzzy
 msgid "&Viewed documents' shade:"
 msgstr "Dogfennau"
 
-#: app/katefilelist.cpp:568
+#: app/katefilelist.cpp:677
 #, fuzzy
 msgid "&Modified documents' shade:"
 msgstr "Dogfennau"
 
-#: app/katefilelist.cpp:575
+#: app/katefilelist.cpp:684
 #, fuzzy
 msgid "&Sort by:"
 msgstr "Trefn&u Gan"
 
-#: app/katefilelist.cpp:585
+#: app/katefilelist.cpp:694
 msgid ""
 "When background shading is enabled, documents that have been viewed or edited "
 "within the current session will have a shaded background. The most recent "
 "documents have the strongest shade."
 msgstr ""
 
-#: app/katefilelist.cpp:589
+#: app/katefilelist.cpp:698
 msgid "Set the color for shading viewed documents."
 msgstr ""
 
-#: app/katefilelist.cpp:591
+#: app/katefilelist.cpp:700
 msgid ""
 "Set the color for modified documents. This color is blended into the color for "
 "viewed files. The most recently edited documents get most of this color."
 msgstr ""
 
-#: app/katefilelist.cpp:596
+#: app/katefilelist.cpp:705
 msgid "Set the sorting method for the documents."
 msgstr ""
 
@@ -1270,8 +1409,9 @@ msgid "Create another view containing the current document"
 msgstr "Creu golwg arall yn cynnwys y ddogfen gyfredol"
 
 #: app/kwritemain.cpp:157
-msgid "Choose Editor..."
-msgstr "Dewis Golygydd..."
+#, fuzzy
+msgid "Choose Editor Component..."
+msgstr "Dewiswch Gydran Olygu"
 
 #: app/kwritemain.cpp:159
 msgid "Override the system wide setting for the default editing component"
@@ -1311,23 +1451,163 @@ msgstr ""
 "Ni ellid darllen y ffeil a roddwyd, gwiriwch os yw'n bodoli neu os yw'n "
 "ddarllenadwy i'r defnyddiwr cyfredol."
 
-#: app/kwritemain.cpp:549
+#: app/kwritemain.cpp:553
 msgid "KWrite"
 msgstr "KWrite"
 
-#: app/kwritemain.cpp:551
+#: app/kwritemain.cpp:555
 msgid "KWrite - Text Editor"
 msgstr "KWrite - Golygydd Testun"
 
-#: app/kateapp.cpp:210 app/kateapp.cpp:322 app/kwritemain.cpp:682
-msgid ""
-"The file '%1' could not be opened: it is not a normal file, it is a folder."
-msgstr "Methwyd agor y ffeil '%1'; plygell yw hi, dim ffeil arferol."
-
-#: app/kwritemain.cpp:696
+#: app/kwritemain.cpp:700
 msgid "Choose Editor Component"
 msgstr "Dewiswch Gydran Olygu"
 
+#: app/kateconsole.cpp:129
+msgid ""
+"Do you really want to pipe the text to the console? This will execute any "
+"contained commands with your user rights."
+msgstr ""
+
+#: app/kateconsole.cpp:130
+msgid "Pipe to Console?"
+msgstr "Pibellu i Derfynnell?"
+
+#: app/kateconsole.cpp:131
+msgid "Pipe to Console"
+msgstr "Pibellu i Derfynnell"
+
+#: app/katesession.cpp:78 app/katesession.cpp:102 app/katesession.cpp:252
+#, fuzzy
+msgid "Default Session"
+msgstr "Sesiwn"
+
+#: app/katesession.cpp:82
+#, fuzzy
+msgid "Unnamed Session"
+msgstr "Sesiwn"
+
+#: app/katesession.cpp:104
+msgid "Session (%1)"
+msgstr "Sesiwn (%1)"
+
+#: app/katesession.cpp:384
+msgid "Save Session?"
+msgstr "Cadw Sesiwn?"
+
+#: app/katesession.cpp:391
+#, fuzzy
+msgid "Save current session?"
+msgstr "Dogfennau"
+
+#: app/katesession.cpp:392
+msgid "Do not ask again"
+msgstr "Peidiwch a gofyn eto"
+
+#: app/katesession.cpp:482
+#, fuzzy
+msgid "No session selected to open."
+msgstr "&Dewisiedig:"
+
+#: app/katesession.cpp:482
+#, fuzzy
+msgid "No Session Selected"
+msgstr "&Dewisiedig:"
+
+#: app/katesession.cpp:554
+#, fuzzy
+msgid "Specify Name for Current Session"
+msgstr "Dogfennau"
+
+#: app/katesession.cpp:554 app/katesession.cpp:572 app/katesession.cpp:850
+msgid "Session name:"
+msgstr "Enw sesiwn:"
+
+#: app/katesession.cpp:561
+msgid "To save a new session, you must specify a name."
+msgstr ""
+
+#: app/katesession.cpp:561 app/katesession.cpp:579 app/katesession.cpp:857
+msgid "Missing Session Name"
+msgstr ""
+
+#: app/katesession.cpp:572
+msgid "Specify New Name for Current Session"
+msgstr ""
+
+#: app/katesession.cpp:579 app/katesession.cpp:857
+msgid "To save a session, you must specify a name."
+msgstr ""
+
+#: app/katesession.cpp:618
+#, fuzzy
+msgid "Session Chooser"
+msgstr "Sesiwn"
+
+#: app/katesession.cpp:623 app/katesession.cpp:715
+#, fuzzy
+msgid "Open Session"
+msgstr "Sesiwn"
+
+#: app/katesession.cpp:624
+msgid "New Session"
+msgstr "Sesiwn Newydd"
+
+#: app/katesession.cpp:642 app/katesession.cpp:732 app/katesession.cpp:796
+#, fuzzy
+msgid "Session Name"
+msgstr "Sesiwn"
+
+#: app/katesession.cpp:643 app/katesession.cpp:733 app/katesession.cpp:797
+#, fuzzy
+msgid "Open Documents"
+msgstr "Dogfennau"
+
+#: app/katesession.cpp:660
+msgid "&Always use this choice"
+msgstr ""
+
+#: app/katesession.cpp:720
+msgid "&Open"
+msgstr "A&gor"
+
+#: app/katesession.cpp:781
+#, fuzzy
+msgid "Manage Sessions"
+msgstr "Sesiwn"
+
+#: app/katesession.cpp:810
+msgid "&Rename..."
+msgstr "Ail-&enwi..."
+
+#: app/katesession.cpp:850
+msgid "Specify New Name for Session"
+msgstr ""
+
+#: app/kateviewspace.cpp:321 app/kateviewspace.cpp:360
+msgid " INS "
+msgstr "MEWN"
+
+#: app/kateviewspace.cpp:326 app/kateviewspace.cpp:364
+msgid " NORM "
+msgstr "ARF"
+
+#: app/kateviewspace.cpp:352
+msgid " Line: %1 Col: %2 "
+msgstr "Llinell: %1 Col: %2"
+
+#: app/kateviewspace.cpp:356
+msgid " R/O "
+msgstr "DyU"
+
+#: app/kateviewspace.cpp:358
+msgid " OVR "
+msgstr "DROS"
+
+#: app/kateviewspace.cpp:364
+msgid " BLK "
+msgstr "BLC"
+
 #: app/kateviewmanager.cpp:97
 msgid "New Tab"
 msgstr "Tab Newydd"
@@ -1392,81 +1672,6 @@ msgstr "Agor tab newydd"
 msgid "Close the current tab"
 msgstr "Cau'r tab cyfredol"
 
-#: app/katemdi.cpp:140
-msgid "Tool &Views"
-msgstr "Golygfeydd &Offer"
-
-#: app/katemdi.cpp:141
-msgid "Show Side&bars"
-msgstr ""
-
-#: app/katemdi.cpp:143
-msgid "Hide Side&bars"
-msgstr ""
-
-#: app/katemdi.cpp:176
-#, c-format
-msgid "Show %1"
-msgstr "Dangos %1"
-
-#: app/katemdi.cpp:179
-#, c-format
-msgid "Hide %1"
-msgstr "Cuddio %1"
-
-#: app/katemdi.cpp:464
-msgid "Behavior"
-msgstr "Ymddygiad"
-
-#: app/katemdi.cpp:466
-msgid "Make Non-Persistent"
-msgstr ""
-
-#: app/katemdi.cpp:466
-msgid "Make Persistent"
-msgstr ""
-
-#: app/katemdi.cpp:468
-msgid "Move To"
-msgstr "Symud I"
-
-#: app/katemdi.cpp:471
-msgid "Left Sidebar"
-msgstr ""
-
-#: app/katemdi.cpp:474
-msgid "Right Sidebar"
-msgstr ""
-
-#: app/katemdi.cpp:477
-msgid "Top Sidebar"
-msgstr ""
-
-#: app/katemdi.cpp:480
-msgid "Bottom Sidebar"
-msgstr ""
-
-#: app/katemdi.cpp:778
-msgid ""
-"<qt>You are about to hide the sidebars. With hidden sidebars it is not possible "
-"to directly access the tool views with the mouse anymore, so if you need to "
-"access the sidebars again invoke <b>Window &gt; Tool Views &gt; Show "
-"Sidebars</b> in the menu. It is still possible to show/hide the tool views with "
-"the assigned shortcuts.</qt>"
-msgstr ""
-
-#: app/kateconfigplugindialogpage.cpp:82
-msgid "Comment"
-msgstr "Sylwad"
-
-#: app/kateconfigplugindialogpage.cpp:83
-msgid ""
-"Here you can see all available Kate plugins. Those with a check mark are "
-"loaded, and will be loaded again the next time Kate is started."
-msgstr ""
-"Yma gallwch weld pob ategyn Kate sydd ar gael. Mae'r sawl a nôd brith yn eu "
-"herbyn yn llwythiedig, ac fe'i llwythir tro nesaf y cychwynnir Kate."
-
 #: app/katesavemodifieddialog.cpp:78
 msgid "Save As (%1)"
 msgstr ""
@@ -1516,393 +1721,244 @@ msgid ""
 "to proceed."
 msgstr ""
 
-#: app/katefileselector.cpp:170
-msgid "Current Document Folder"
-msgstr "Plygell Dogfen Gyfredol"
-
-#: app/katefileselector.cpp:198
-msgid ""
-"<p>Here you can enter a path for a folder to display."
-"<p>To go to a folder previously entered, press the arrow on the right and "
-"choose one. "
-"<p>The entry has folder completion. Right-click to choose how completion should "
-"behave."
+#: app/kateexternaltools.cpp:276
+msgid "Failed to expand the command '%1'."
 msgstr ""
-"<p>Yma gallwch roi llwybr ar gyfer plygell i'w ddangos."
-"<p> I fynd i blygell a roddwyd eisioes, gwasgwch y saeth ar y dde a dewis un "
-"ohonynt."
-"<p>Mae cyflawni plygyll ar y gofnod. Rhowch glic-dde i ddewis sut y dylai'r "
-"cyflawni ymddwyn."
 
-#: app/katefileselector.cpp:203
-msgid ""
-"<p>Here you can enter a name filter to limit which files are displayed."
-"<p>To clear the filter, toggle off the filter button to the left."
-"<p>To reapply the last filter used, toggle on the filter button."
-msgstr ""
-"<p>Yma gallwch roi hidlen enwau i gyfyngu pa ffeiliau a ddengys."
-"<p>I wagio'r hidlen, diffoddwch y botwm hidlen ar y chwith."
-"<p>I ailweithredu'r hidlen ddefnyddiwyd ddiwethaf, cynnwch y botwm hidlen."
+#: app/kateexternaltools.cpp:277
+#, fuzzy
+msgid "Kate External Tools"
+msgstr "Offer Allanol"
 
-#: app/katefileselector.cpp:207
-msgid ""
-"<p>This button clears the name filter when toggled off, or reapplies the last "
-"filter used when toggled on."
-msgstr ""
-"<p>Gwagia'r botwm yma'r hidlen enwau pan yn ddiffodd, neu ailweithreda'r hidlen "
-"ddefnyddiwyd ddiwethaf pan ynghyn."
+#: app/kateexternaltools.cpp:427
+msgid "Edit External Tool"
+msgstr "Golygu Erfyn Allanol"
 
-#: app/katefileselector.cpp:321
-msgid "Apply last filter (\"%1\")"
-msgstr "Gweithredu'r hidlen ddiwethaf (\"%1\")"
+#: app/kateexternaltools.cpp:441
+msgid "&Label:"
+msgstr "&Label:"
 
-#: app/katefileselector.cpp:326
-msgid "Clear filter"
-msgstr "Gwagio hidlen"
+#: app/kateexternaltools.cpp:446
+msgid "The name will be displayed in the 'Tools->External' menu"
+msgstr "Dangosir yr enw yn y ddewislen 'Offer->Allanol'"
 
-#: app/katefileselector.cpp:536
-msgid "Toolbar"
-msgstr "Bar offer"
+#: app/kateexternaltools.cpp:456
+msgid "S&cript:"
+msgstr "S&gript :"
 
-#: app/katefileselector.cpp:538
-msgid "A&vailable actions:"
-msgstr "&Gweithredoedd ar gael:"
+#: app/kateexternaltools.cpp:461
+#, fuzzy
+msgid ""
+"<p>The script to execute to invoke the tool. The script is passed to /bin/sh "
+"for execution. The following macros will be expanded:</p>"
+"<ul>"
+"<li><code>%URL</code> - the URL of the current document."
+"<li><code>%URLs</code> - a list of the URLs of all open documents."
+"<li><code>%directory</code> - the URL of the directory containing the current "
+"document."
+"<li><code>%filename</code> - the filename of the current document."
+"<li><code>%line</code> - the current line of the text cursor in the current "
+"view."
+"<li><code>%column</code> - the column of the text cursor in the current view."
+"<li><code>%selection</code> - the selected text in the current view."
+"<li><code>%text</code> - the text of the current document.</ul>"
+msgstr ""
+"<p>Y gorchymyn i weithredu i alw'r erfyn.  Ehangir y macros dilynnol:</p>"
+"<ul>"
+"<li><code>%URL</code> - URL y ddogfen gyfredol."
+"<li><code>%URLs</code> - rhestr o URLau pob dogfen agored."
+"<li><code>%directory</code> - URL y cyfeiriadur sy'n cynnwys y ddogfen "
+"gyfredol."
+"<li><code>filename</code> - enw ffeil y ddogfen gyfredol."
+"<li><code>%line</code> - llinell gyfredol y cyrchydd testun yn y golwg "
+"gyfredol."
+"<li><code>%column</code> - colofn y cyrchydd testun yn y golwg gyfredol."
+"<li><code>%selection</code> - y testun dewisiedig yn y golwg gyfredol. "
+"<li><code>%text</code> - testun y ddogfen gyfredol. </ul>"
 
-#: app/katefileselector.cpp:539
-msgid "S&elected actions:"
-msgstr "Gweithredoedd d&ewisiedig:"
+#: app/kateexternaltools.cpp:479
+msgid "&Executable:"
+msgstr "&Gweithredadwyn:"
 
-#: app/katefileselector.cpp:547
-msgid "Auto Synchronization"
-msgstr "Cydweddu Ymysgogol"
+#: app/kateexternaltools.cpp:484
+msgid ""
+"The executable used by the command. This is used to check if a tool should be "
+"displayed; if not set, the first word of <em>command</em> will be used."
+msgstr ""
+"Y gweithredadwyn a ddefnyddir gan y gorchymyn.  Defnyddir hyn i wirio a ddylai "
+"erfyn gael ei ddangos; os ni osodir, defnyddir y gair cyntaf o <em>"
+"gorchymyn</em>."
 
-#: app/katefileselector.cpp:548
-msgid "When a docu&ment becomes active"
-msgstr "Pan ddaw dog&fen yn weithredol"
+#: app/kateexternaltools.cpp:490
+msgid "&Mime types:"
+msgstr "&Mathau mime:"
 
-#: app/katefileselector.cpp:549
-msgid "When the file selector becomes visible"
-msgstr "Pan ymddengys y dewisydd ffeiliau"
+#: app/kateexternaltools.cpp:495
+#, fuzzy
+msgid ""
+"A semicolon-separated list of mime types for which this tool should be "
+"available; if this is left empty, the tool is always available. To choose from "
+"known mimetypes, press the button on the right."
+msgstr ""
+"Rhestr o fathau mime wedi'u gwahanu gan wahannod y ddylai'r erfyn yma fod ar "
+"gael iddynt; os gadewir yn wag, mae'r erfyn ar gael yn wastad.  I ddewis o'r "
+"mathau mime a gwyddys, gwasgwch y botwm ar y dde."
 
-#: app/katefileselector.cpp:556
-msgid "Remember &locations:"
-msgstr "Cofio &lleoliadau:"
+#: app/kateexternaltools.cpp:504
+msgid "Click for a dialog that can help you creating a list of mimetypes."
+msgstr ""
 
-#: app/katefileselector.cpp:563
-msgid "Remember &filters:"
-msgstr "Cofio &hidlenni:"
+#: app/kateexternaltools.cpp:508
+msgid "&Save:"
+msgstr "&Cadw :"
 
-#: app/katefileselector.cpp:570
-msgid "Session"
-msgstr "Sesiwn"
+#: app/kateexternaltools.cpp:512
+msgid "None"
+msgstr "Dim"
 
-#: app/katefileselector.cpp:571
-msgid "Restore loca&tion"
-msgstr "Adfer lleolia&dau:"
+#: app/kateexternaltools.cpp:512
+#, fuzzy
+msgid "Current Document"
+msgstr "Plygell Dogfen Gyfredol"
 
-#: app/katefileselector.cpp:572
-msgid "Restore last f&ilter"
-msgstr "Adfer h&idlen ddiwethaf:"
+#: app/kateexternaltools.cpp:512
+#, fuzzy
+msgid "All Documents"
+msgstr "&Dogfen"
 
-#: app/katefileselector.cpp:592
+#: app/kateexternaltools.cpp:516
 msgid ""
-"<p>Decides how many locations to keep in the history of the location combo box."
+"You can elect to save the current or all [modified] documents prior to running "
+"the command. This is helpful if you want to pass URLs to an application like, "
+"for example, an FTP client."
 msgstr ""
-"<p>Penderfynna sawl lleoliad i gadw yn hanes y blwch cyfuno lleoliadau."
-
-#: app/katefileselector.cpp:597
-msgid ""
-"<p>Decides how many filters to keep in the history of the filter combo box."
-msgstr "<p>Penderfynna sawl hidlen i gadw yn hanes y blwch cyfuno hidlenni."
 
-#: app/katefileselector.cpp:602
-msgid ""
-"<p>These options allow you to have the File Selector automatically change "
-"location to the folder of the active document on certain events."
-"<p>Auto synchronization is <em>lazy</em>, meaning it will not take effect until "
-"the file selector is visible."
-"<p>None of these are enabled by default, but you can always sync the location "
-"by pressing the sync button in the toolbar."
+#: app/kateexternaltools.cpp:523
+msgid "&Command line name:"
 msgstr ""
-"<p>Galluoga'r dewisiadau yma i chi beri i'r Dewisydd Ffeiliau newid lleoliad i "
-"blygell y ddogfen gyfredol yn ymysgogol ar ddigwyddiadau penodol."
-"<p>Mae cydweddu ymysgogol yn <em>ddiog</em>, sy'n golygu na ddaw i rym nes "
-"ymddengys y dewisydd ffeiliau."
-"<p>Ni ddewisir yr un o'r rhain yn ragosod, ond gallwch gydweddu'r lleoliad trwy "
-"wasgu'r botwm cydweddu yn y bar offer ar unrhyw adeg."
 
-#: app/katefileselector.cpp:611
+#: app/kateexternaltools.cpp:528
 msgid ""
-"<p>If this option is enabled (default), the location will be restored when you "
-"start Kate."
-"<p><strong>Note</strong> that if the session is handled by the TDE session "
-"manager, the location is always restored."
+"If you specify a name here, you can invoke the command from the view command "
+"lines with exttool-the_name_you_specified_here. Please do not use spaces or "
+"tabs in the name."
 msgstr ""
-"<p>Os yw'r dewisiad yma'n alluog (rhagosodyn), adferir y lleoliad pan "
-"gychwynnwch Kate."
-"<p><strong>Noder</strong> yr adferir y lleoliad bob tro os trinir y sesiwn gan "
-"y trefnydd sesiynau TDE."
 
-#: app/katefileselector.cpp:615
-msgid ""
-"<p>If this option is enabled (default), the current filter will be restored "
-"when you start Kate."
-"<p><strong>Note</strong> that if the session is handled by the TDE session "
-"manager, the filter is always restored."
-"<p><strong>Note</strong> that some of the autosync settings may override the "
-"restored location if on."
+#: app/kateexternaltools.cpp:539
+msgid "You must specify at least a name and a command"
+msgstr "Rhaid i chi benodi o leiaf enw a gorchymyn."
+
+#: app/kateexternaltools.cpp:548
+msgid "Select the MimeTypes for which to enable this tool."
 msgstr ""
-"<p>Os yw'r dewisiad yma'n alluog (rhagosodyn), adferir yr hidlen pan "
-"gychwynnwch Kate."
-"<p><strong>Noder</strong> yr adferir yr hidlen bob tro os trinir y sesiwn gan y "
-"trefnydd sesiynau TDE. "
-"<p><strong>Noder</strong> y gall rhai o'r gosodiadau hunan-gydamseru gymryd "
-"blaenoriaeth dros y lleoliad a adferir, os mae'n nhw mewn bod."
 
-#. i18n: file ./data/kateui.rc line 43
-#: rc.cpp:9
-#, no-c-format
-msgid "&Document"
-msgstr "&Dogfen"
+#: app/kateexternaltools.cpp:550
+#, fuzzy
+msgid "Select Mime Types"
+msgstr "&Mathau mime:"
 
-#. i18n: file ./data/kateui.rc line 62
-#: rc.cpp:18
-#, no-c-format
-msgid "Sess&ions"
-msgstr "Ses&iynau"
+#: app/kateexternaltools.cpp:568
+msgid "&New..."
+msgstr "&Newydd..."
 
-#. i18n: file ./data/kateui.rc line 85
-#: rc.cpp:24
-#, no-c-format
-msgid "&Window"
-msgstr "&Ffenestr"
+#: app/kateexternaltools.cpp:576
+msgid "&Edit..."
+msgstr "&Golygu..."
 
-#: tips.cpp:3
-msgid ""
-"<p>Kate comes with a nice set of plugins, providing simple\n"
-"and advanced features of all sorts.</p>\n"
-"<p>You can enable/disable plugins to suit your needs in the configuration "
-"dialog,\n"
-"choose <strong>Settings -&gt;configure</strong> to launch that.</p>\n"
-msgstr ""
-"<p>Daw set o ategion dymunol gyda Kate, gan ddarparu\n"
-" nodweddion syml ac uwch o bob math.</p>\n"
-"<p>Gallwch alluogi/analluogi ategion yn ôl eich anghenion yn yr ymgom "
-"ffurfweddu,\n"
-" dewiswch <strong>Gosodiadau ->ffurfweddu</strong> i gychwyn hwnna.</p>\n"
+#: app/kateexternaltools.cpp:580
+msgid "Insert &Separator"
+msgstr "Mewnosod &Gwahanydd"
 
-#: tips.cpp:11
+#: app/kateexternaltools.cpp:602
 msgid ""
-"<p>You can swap the characters on each side of the cursor just by pressing\n"
-"<strong>Ctrl+T</strong></p>\n"
+"This list shows all the configured tools, represented by their menu text."
 msgstr ""
-"<p>Gallwch gyfnewid y nôdau ar naill ochr y cyrchydd drwy wasgu\n"
-"<strong>Ctrl+T</strong></p>\n"
+"Dangosa'r rhestr yma pob erfyn a ffurfweddir, wedi'u cynrychioli gan eu testun "
+"dewislen."
 
-#: tips.cpp:17
-msgid ""
-"<p>You can export the current document as a HTML file, including\n"
-"syntax highlighting.</p>\n"
-"<p>Just choose <strong>File -&gt; Export -&gt; HTML...</strong></p>\n"
-msgstr ""
-"<p>Gallwch allforio'r ddogfen cyfredol yn ffeil HTML, gan gynnwys\n"
-" amlygu cystrawen.</p>\n"
-"<p>Dewiswch <strong>Ffeil -> Allforio -> HTML...</strong></p>\n"
+#: app/katemdi.cpp:140
+msgid "Tool &Views"
+msgstr "Golygfeydd &Offer"
 
-#: tips.cpp:24
-msgid ""
-"<p>You can split the Kate editor as many times as you like and\n"
-"in either direction. Each frame has its own status bar and\n"
-"can display any open document.</p>\n"
-"<p>Just choose "
-"<br><strong>View -&gt; Split [ Horizontal | Vertical ]</strong></p>\n"
+#: app/katemdi.cpp:141
+msgid "Show Side&bars"
 msgstr ""
-"<p>Gallwch rannu'r golygydd Kate faint bynnag o weithiau yr hoffech ac\n"
-" yn yn naill gyferiad neu'r llall. Mae gan bob ffrâm ei far cyflwr ei hun a "
-"gall ddangos unrhwy ddogfen sydd ar agor.</p>\n"
-"<p>Dewiswch "
-"<br><strong>Golwg -> Rhannu'n [ Llorweddol | Fertigol ]</strong></p>\n"
 
-#: tips.cpp:32
-msgid ""
-"<p>You can drag the Tool views (<em>File List</em> and <em>File Selector</em>)\n"
-"to any side that you want them in Kate, or stack them, or even tear them off "
-"the\n"
-"main window.</p>\n"
+#: app/katemdi.cpp:143
+msgid "Hide Side&bars"
 msgstr ""
-"<p>Gallwch lusgo'r golygon Offer (<em>Rhestr Ffeiliau</em> a <em>"
-"Dewisydd Ffeiliau</em>)\n"
-" i unrhyw ochr yr hoffech nhw yng Kate, neu eu pentyru, neu hyd yn oed eu "
-"rhwygo o'r\n"
-" prif-ffenestr.</p>\n"
 
-#: tips.cpp:39
-#, fuzzy
-msgid ""
-"<p>Kate has a built-in terminal emulator, just click on <strong>"
-"\"Terminal\"</strong> at\n"
-"the bottom to show or hide it as you desire.</p>\n"
-msgstr ""
-"<p>Mae gan Kate efelychydd terfynell mewnadeiladedig, gwasgwch <strong>"
-"F7</strong> i'w\n"
-" ddangos neu'i guddio fel y mynnoch.</p>\n"
+#: app/katemdi.cpp:176
+#, c-format
+msgid "Show %1"
+msgstr "Dangos %1"
 
-#: tips.cpp:45
-#, fuzzy
-msgid ""
-"<p>Kate can highlight the current line with a\n"
-"<table bgcolor=\"yellow\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\" "
-"width=\"100%\">"
-"<tr>"
-"<td>different\n"
-"background color.<strong>|</strong></td></tr></table></p>\n"
-"<p>You can set the color in the <em>Colors</em> page of the configuration\n"
-"dialog.</p>\n"
-msgstr ""
-"<p>Gall Kate amlygu'r llinell gyfredol â\n"
-" <table bgcolor=\"yellow\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\" "
-"width=\"100%\">"
-"<tr>"
-"<td>lliw \n"
-" cefndir gwahanol.<strong>|</strong></td></tr></table></p>\n"
-" "
-"<p>Gallwch osod y lliw ar y dudalen <em>Lliwiau</em> yn yr ymgom\n"
-" ffurfweddu.</p>\n"
+#: app/katemdi.cpp:179
+#, c-format
+msgid "Hide %1"
+msgstr "Cuddio %1"
 
-#: tips.cpp:54
-#, fuzzy
-msgid ""
-"<p>You can open the currently edited file in any other application from within\n"
-"Kate.</p>\n"
-"<p>Choose <strong>File -&gt; Open With</strong> for the list of programs\n"
-"configured\n"
-"for the document type. There is also an option <strong>Other...</strong> to\n"
-"choose any application on your system.</p>\n"
-msgstr ""
-"<p>Gallwch agor y ffeil golygedig cyfredol mewn unrhyw gymhwysiad arall oddi "
-"mewn \n"
-" Kate.</p>\n"
-" "
-"<p>Dewiswch <strong>Ffeil -> Agor Gyda</strong> am y restr o raglenni\n"
-"ffurfweddwyd\n"
-" ar gyfer math y ddogfen. Mae hefyd dewisiad <strong>Arall...</strong> i \n"
-" ddewis unrhyw gymhwysiad ar eich cysawd.</p>\n"
+#: app/katemdi.cpp:465
+msgid "Behavior"
+msgstr "Ymddygiad"
 
-#: tips.cpp:64
-#, fuzzy
-msgid ""
-"<p>You can configure the editor to always display the line numbers and/or\n"
-"bookmark panes when started from the <strong>View Defaults</strong> "
-"page of the\n"
-"configuration dialog.</p>\n"
+#: app/katemdi.cpp:467
+msgid "Make Non-Persistent"
 msgstr ""
-"<p>Gallwch ffurfweddu'r golygydd i ddangos rhifau llinellau bob amser a/neu \n"
-" cwareli nôdau tudalen pan yn cychwyn o dudalen <strong>"
-"Rhagosodion Golwg</strong> \n"
-" yr ymgom ffurfweddu.</p>\n"
-"\n"
 
-#: tips.cpp:71
-#, fuzzy
-msgid ""
-"<p>You can download new or updated <em>Syntax highlight definitions</em> from\n"
-"the <strong>Highlighting</strong> page in the configuration dialog.</p>\n"
-"<p>Just click the <em>Download...</em> button on the <em>Highlight Modes</em>\n"
-"tab (You have to be online, of course...).</p>\n"
+#: app/katemdi.cpp:467
+msgid "Make Persistent"
 msgstr ""
-"<p>Gallwch lawrlwytho <em>ddiffiniadau amlygu Cystrawen</em> "
-"newydd neu diweddaredig \n"
-" o'r dudalen <strong>Amlygu</strong> yn yr ymgom ffurfweddu.</p>\n"
-"<p>Cliciwch y botwm <em>Lawrlwytho...</em> ar y tab\n"
-" <em>Moddau Amlygu</em> (Rhaid i chi fod ar-lein, wrth gwrs...).</p>\n"
 
-#: tips.cpp:79
-#, fuzzy
-msgid ""
-"<p>You can cycle through all open documents by pressing <strong>"
-"Alt+Left</strong>\n"
-"or <strong>Alt+Right</strong>. The next/previous document will immediately be "
-"displayed\n"
-"in the active frame.</p>\n"
-msgstr ""
-"<p>Gallwch gylchu drwy bob dogfen agored drwy wasgu <strong>Alt+Chwith</strong> "
-"\n"
-" neu <strong>Alt+Dde</strong>. Dangosir y ddogfen nesaf/blaenorol ar unwaith\n"
-" yn y ffrâm weithredol.</p>\n"
+#: app/katemdi.cpp:469
+msgid "Move To"
+msgstr "Symud I"
 
-#: tips.cpp:86
-#, fuzzy
-msgid ""
-"<p>You can do cool sed-like regular expression replacements using <em>"
-"Command Line</em>.</p>\n"
-"<p>For example, press <strong>F7</strong> and enter <code>"
-"s /oldtext/newtext/g</code>\n"
-"to replace &quot;oldtext&quot; with &quot;newtext&quot; throughout the current\n"
-"line.</p>\n"
+#: app/katemdi.cpp:472
+msgid "Left Sidebar"
 msgstr ""
-"<p>Gallwch wneud amnewidiadau mynegiad rheolaidd fel sed gan ddefnyddio <em>"
-"Golygu \n"
-" Gorchymyn</em>.</p>\n"
-"<p>Er enghraifft, gwasgwch <strong>Ctrl+M</strong> a rhowch <code>"
-"s/hen-destun/ testun-newydd/g</code> \n"
-" i amnewid &quot;hen-destun&quot; gyda &quot;testun-newydd&quot; drwy gydol y "
-"llinell \n"
-" gyfredol.</p>\n"
 
-#: tips.cpp:94
-#, fuzzy
-msgid ""
-"<p>You can repeat your last search by just pressing <strong>F3</strong>, or\n"
-"<strong>Shift+F3</strong> if you want to search backwards.</p>\n"
+#: app/katemdi.cpp:475
+msgid "Right Sidebar"
 msgstr ""
-"<p>Gallwch ailadrodd eich chwiliad diwethaf drwy wasgu <strong>F3</strong>"
-", neu \n"
-" <strong>Syflydd+F3</strong> os ydych am chwilio am yn ôl.</p>\n"
 
-#: tips.cpp:100
-#, fuzzy
-msgid ""
-"<p>You can filter the files displayed in the <em>File Selector</em> tool view.\n"
-"</p>\n"
-"<p>Simply enter your filter in the filter entry at the bottom, for example:\n"
-"<code>*.html *.php</code> if you only want to see HTML and PHP files in the\n"
-"current folder.</p>\n"
-"<p>The File Selector will even remember your filters for you.</strong></p>\n"
+#: app/katemdi.cpp:478
+msgid "Top Sidebar"
 msgstr ""
-"<p>Gallwch hidlo'r ffeiliau a ddengys yn y golwg offer <em>"
-"Dewisydd Ffeiliau</em>.\n"
-" </p>\n"
-"<p>Rhowch eich hidlen yn y gofnod hidlen ar y gwaelod, er enghraifft: \n"
-" <code>*.html *.php</code> os ydych am weld dim ond ffeiliau HTML a PHP yn y \n"
-" plygell cyfredol.</p>\n"
-"<p>Bydd y Dewisydd Ffeiliau hyd yn oed yn cofio eich hidlenni i chi.</strong>"
-"</p>\n"
 
-#: tips.cpp:110
-#, fuzzy
-msgid ""
-"<p>You can have two views - or even more - of the same document in Kate. "
-"Editing\n"
-"in either will be reflected in both.</p>\n"
-"<p>So if you find yourself scrolling up and down to look at text at the other\n"
-"end of a document, just press <strong>Ctrl+Shift+T</strong> to split\n"
-"horizontally.</p>\n"
+#: app/katemdi.cpp:481
+msgid "Bottom Sidebar"
 msgstr ""
-"<p>Gallwch gael dau olwg - neu hyd yn oed mwy - o'r un ddogfen yn Kate.\n"
-" Adlewyrchir golygu yn unrhyw un ohonynt yn y ddau.</p>\n"
-"<p>Felly cewch eich hunan yn sgrolio i fyny ac i lawr i edrych ar destun ar ben "
-"\n"
-" arall dogfen, gwasgwch <strong>Ctrl+Syflydd+T</strong> i rannu\n"
-" yn llorweddol.</p>\n"
 
-#: tips.cpp:119
-#, fuzzy
+#: app/katemdi.cpp:779
 msgid ""
-"<p>Press <strong>F8</strong> or <strong>Shift+F8</strong> to switch to the\n"
-"next/previous frame.</p>\n"
+"<qt>You are about to hide the sidebars. With hidden sidebars it is not possible "
+"to directly access the tool views with the mouse anymore, so if you need to "
+"access the sidebars again invoke <b>Window &gt; Tool Views &gt; Show "
+"Sidebars</b> in the menu. It is still possible to show/hide the tool views with "
+"the assigned shortcuts.</qt>"
 msgstr ""
-"<p>Gwasgwch <strong>F8</strong> neu <strong>Syflydd+F8</strong> i newid i'r \n"
-" ffrâm nesaf/blaenorol.</p>\n"
+
+#. i18n: file ./data/kateui.rc line 43
+#: rc.cpp:9
+#, no-c-format
+msgid "&Document"
+msgstr "&Dogfen"
+
+#. i18n: file ./data/kateui.rc line 62
+#: rc.cpp:18
+#, no-c-format
+msgid "Sess&ions"
+msgstr "Ses&iynau"
+
+#. i18n: file ./data/kateui.rc line 85
+#: rc.cpp:24
+#, no-c-format
+msgid "&Window"
+msgstr "&Ffenestr"
+
+#~ msgid "Choose Editor..."
+#~ msgstr "Dewis Golygydd..."
 
 #, fuzzy
 #~ msgid "Start Kate (no arguments)"
@@ -2009,9 +2065,6 @@ msgstr ""
 #~ msgid "Remove Folder"
 #~ msgstr "Gwaredu Plygell"
 
-#~ msgid "Remove File"
-#~ msgstr "Gwaredu Ffeil"
-
 #~ msgid "F&ind:"
 #~ msgstr "C&anfod:"
 
@@ -2033,12 +2086,6 @@ msgstr ""
 #~ msgid "The document<br><code>%1</code><br>was deleted from disk by another program."
 #~ msgstr "Gafodd y ddogfen <br><code>%1</code><br> ei dileu oddiar y ddisg gan broses arall"
 
-#~ msgid "&Number of recent files:"
-#~ msgstr "&Nifer ffeiliau diweddar:"
-
-#~ msgid "<qt>Sets the number of recent files remembered by Kate.<p><strong>NOTE: </strong>If you set this lower than the current value, the list will be truncated and some items forgotten.</qt>"
-#~ msgstr "<qt>Gosoda'r nifer o ffeiliau diweddar bydd Kate yn cofio.<p><strong>NODER:</strong>Os gosodwch hwn yn llai na'r gwerth cyfredol, talfyrrir y restr ac fe anghofir rhai eitemau.</qt>"
-
 #, fuzzy
 #~ msgid "If enabled, a passive popup message will be displayed whenever a local file is modified, created or deleted by another program."
 #~ msgstr "Os alluogir, dangosir neges naidlen oddefol pan addasir, creuir neu ddileuir ffeil lleol gan broses arall."
@@ -2046,12 +2093,6 @@ msgstr ""
 #~ msgid "Contents &Plugins"
 #~ msgstr "A&tegion Cynnwys"
 
-#~ msgid "Sort &files alphabetically in the file list"
-#~ msgstr "Didoli &ffeiliau'n wyddorol yn y restr ffeiliau"
-
-#~ msgid "If this is checked, the files in the file list will be sorted alphabetically."
-#~ msgstr "uOs dewisir hwn, didolir ffeiliau yn y restr ffeiliau yn ôl yr wyddor."
-
 #~ msgid "Files to load"
 #~ msgstr "Ffeiliau i'w llwytho"
 
diff --git a/tde-i18n-cy/messages/tdebase/kay.po b/tde-i18n-cy/messages/tdebase/kay.po
index 3566d64a6d1..ce144d2120d 100644
--- a/tde-i18n-cy/messages/tdebase/kay.po
+++ b/tde-i18n-cy/messages/tdebase/kay.po
@@ -1,45 +1,64 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2007-03-30 02:14+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: medianotifier.cpp:175
+#: medianotifier.cpp:209
 msgid ""
 "An autorun file has been found on your '%1'. Do you want to execute it?\n"
 "Note that executing a file on a medium may compromise your system's security"
 msgstr ""
 
-#: medianotifier.cpp:179
+#: medianotifier.cpp:213
 #, c-format
 msgid "Autorun - %1"
 msgstr ""
 
-#: medianotifier.cpp:249
+#: medianotifier.cpp:283
 msgid ""
 "An autoopen file has been found on your '%1'. Do you want to open '%2'?\n"
 "Note that opening a file on a medium may compromise your system's security"
 msgstr ""
 
-#: medianotifier.cpp:253
+#: medianotifier.cpp:287
 #, c-format
 msgid "Autoopen - %1"
 msgstr ""
 
-#: notificationdialog.cpp:37
+#: medianotifier.cpp:384
+msgid "Low Disk Space"
+msgstr ""
+
+#: medianotifier.cpp:388
+msgid "Start Konqueror"
+msgstr ""
+
+#: medianotifier.cpp:390
+msgid ""
+"You are running low on disk space on your home partition (currently %1% free), "
+"would you like to run Konqueror to free some disk space and fix the problem?"
+msgstr ""
+
+#: medianotifier.cpp:394
+msgid "Do not ask again"
+msgstr ""
+
+#: notificationdialog.cpp:38
 msgid "Medium Detected"
 msgstr ""
 
-#: notificationdialog.cpp:51
+#: notificationdialog.cpp:52
 msgid "<b>Medium type:</b>"
 msgstr ""
 
-#: notificationdialog.cpp:64
+#: notificationdialog.cpp:65
 msgid "Configure..."
 msgstr "Ffurfweddu..."
 
diff --git a/tde-i18n-cy/messages/tdebase/kcmaccess.po b/tde-i18n-cy/messages/tdebase/kcmaccess.po
index ee72facabaf..babe9ce2336 100644
--- a/tde-i18n-cy/messages/tdebase/kcmaccess.po
+++ b/tde-i18n-cy/messages/tdebase/kcmaccess.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmaccess\n"
-"POT-Creation-Date: 2006-03-27 03:52+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-11-23 13:01+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdebase/kcmaccessibility.po b/tde-i18n-cy/messages/tdebase/kcmaccessibility.po
index eeab9035dc8..f07017e1237 100644
--- a/tde-i18n-cy/messages/tdebase/kcmaccessibility.po
+++ b/tde-i18n-cy/messages/tdebase/kcmaccessibility.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmaccessibility\n"
-"POT-Creation-Date: 2008-07-08 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-07-18 17:31+0100\n"
 "Last-Translator: KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdebase/kcmarts.po b/tde-i18n-cy/messages/tdebase/kcmarts.po
index 77a0884db43..828997bc731 100644
--- a/tde-i18n-cy/messages/tdebase/kcmarts.po
+++ b/tde-i18n-cy/messages/tdebase/kcmarts.po
@@ -10,10 +10,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmarts\n"
-"POT-Creation-Date: 2007-07-28 01:12+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-06-30 15:17+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdebase/kcmbackground.po b/tde-i18n-cy/messages/tdebase/kcmbackground.po
index 967b5f42191..5a0f27c6108 100644
--- a/tde-i18n-cy/messages/tdebase/kcmbackground.po
+++ b/tde-i18n-cy/messages/tdebase/kcmbackground.po
@@ -10,10 +10,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmbackground\n"
-"POT-Creation-Date: 2008-07-08 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-07-03 06:51+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -144,11 +145,12 @@ msgstr ""
 "Ni lenwoch y maes 'Gorchymyn'.\n"
 " Mae hon yn faes angenrheidiol."
 
-#: bgdialog.cpp:131
+#: bgdialog.cpp:149
 msgid "Open file dialog"
 msgstr "Agor ymgom ffeil"
 
-#: bgdialog.cpp:368
+#: bgdialog.cpp:390
+#, fuzzy
 msgid ""
 "<h1>Background</h1> This module allows you to control the appearance of the "
 "virtual desktops. TDE offers a variety of options for customization, including "
@@ -163,8 +165,8 @@ msgid ""
 "opaquely, or blended in different ways with the background colors and patterns."
 "<p> TDE allows you to have the wallpaper change automatically at specified "
 "intervals of time. You can also replace the background with a program that "
-"updates the desktop dynamically. For example, the \"kdeworld\" program shows a "
-"day/night map of the world which is updated periodically."
+"updates the desktop dynamically. For example, the \"kworldclock\" program shows "
+"a day/night map of the world which is updated periodically."
 msgstr ""
 "<h1>Cefndir</h1> Galluoga'r modiwl yma i chi reoli golwg y rhith-benbyrddau. "
 "Cynniga TDE amrywiaeth o ddewisiadau addasu, gan gynnwys y gallu i benodi "
@@ -180,110 +182,114 @@ msgstr ""
 "yn ddynamig. Er engrhaifft, dengys y rhaglen \"kdeworld\" fap dydd/nos o'r byd "
 "a ddiweddarir yn gyfnodol."
 
-#: bgdialog.cpp:424
+#: bgdialog.cpp:449
+msgid "Desktop %1 Viewport %2"
+msgstr ""
+
+#: bgdialog.cpp:456
 #, c-format
 msgid "Screen %1"
 msgstr "Sgrîn %1"
 
-#: bgdialog.cpp:427
+#: bgdialog.cpp:459
 msgid "Single Color"
 msgstr "Un Lliw"
 
-#: bgdialog.cpp:428
+#: bgdialog.cpp:460
 msgid "Horizontal Gradient"
 msgstr "Graddfa Llorweddol"
 
-#: bgdialog.cpp:429
+#: bgdialog.cpp:461
 msgid "Vertical Gradient"
 msgstr "Graddfa Fertigol"
 
-#: bgdialog.cpp:430
+#: bgdialog.cpp:462
 msgid "Pyramid Gradient"
 msgstr "Graddfa Pyramid"
 
-#: bgdialog.cpp:431
+#: bgdialog.cpp:463
 msgid "Pipecross Gradient"
 msgstr "Graddfa Croesbibell"
 
-#: bgdialog.cpp:432
+#: bgdialog.cpp:464
 msgid "Elliptic Gradient"
 msgstr "Graddfa Eliptig"
 
-#: bgdialog.cpp:447
+#: bgdialog.cpp:479
 msgid "Centered"
 msgstr "Wedi'i ganoli"
 
-#: bgdialog.cpp:448
+#: bgdialog.cpp:480
 msgid "Tiled"
 msgstr "Wedi'i deilio"
 
-#: bgdialog.cpp:449
+#: bgdialog.cpp:481
 msgid "Center Tiled"
 msgstr "Teilio canoledig"
 
-#: bgdialog.cpp:450
+#: bgdialog.cpp:482
 msgid "Centered Maxpect"
 msgstr "Agwedd uchaf Canoledig"
 
-#: bgdialog.cpp:451
+#: bgdialog.cpp:483
 msgid "Tiled Maxpect"
 msgstr "Agwedd uchaf Teiliedig"
 
-#: bgdialog.cpp:452
+#: bgdialog.cpp:484
 msgid "Scaled"
 msgstr "Graddiedig"
 
-#: bgdialog.cpp:453
+#: bgdialog.cpp:485
 msgid "Centered Auto Fit"
 msgstr "Ffit Gorau Canoledig"
 
-#: bgdialog.cpp:454
+#: bgdialog.cpp:486
 #, fuzzy
 msgid "Scale & Crop"
 msgstr "Graddiedig"
 
-#: bgdialog.cpp:457
+#: bgdialog.cpp:489
 msgid "No Blending"
 msgstr "Dim Cyfuno"
 
-#: bgdialog.cpp:458
+#: bgdialog.cpp:490
 msgid "Flat"
 msgstr "Gwastad"
 
-#: bgdialog.cpp:461
+#: bgdialog.cpp:493
 msgid "Pyramid"
 msgstr "Pyramid"
 
-#: bgdialog.cpp:462
+#: bgdialog.cpp:494
 msgid "Pipecross"
 msgstr "Croesbibell"
 
-#: bgdialog.cpp:463
+#: bgdialog.cpp:495
 msgid "Elliptic"
 msgstr "Eliptaidd"
 
-#: bgdialog.cpp:464
+#: bgdialog.cpp:496
 msgid "Intensity"
 msgstr "Cryfder"
 
-#: bgdialog.cpp:465
+#: bgdialog.cpp:497
 msgid "Saturation"
 msgstr "Dirlawnder"
 
-#: bgdialog.cpp:466
+#: bgdialog.cpp:498
 msgid "Contrast"
 msgstr "Cyferbyniant"
 
-#: bgdialog.cpp:467
+#: bgdialog.cpp:499
 msgid "Hue Shift"
 msgstr "Crwydredd Arlliw"
 
-#: bgdialog.cpp:616
+#: bgdialog.cpp:656
 msgid "Select Wallpaper"
 msgstr "Dewis Papur Wal"
 
 #. i18n: file bgdialog_ui.ui line 300
-#: bgdialog.cpp:1218 rc.cpp:152
+#: bgdialog.cpp:1260 rc.cpp:152
 #, fuzzy, no-c-format
 msgid "Get New Wallpapers"
 msgstr "Dewis Papur Wal"
@@ -313,8 +319,8 @@ msgid "TDE Background Control Module"
 msgstr "Modiwl Rheoli Cefndir TDE"
 
 #: main.cpp:73
-msgid "(c) 1997-2002 Martin R. Jones"
-msgstr "(h)1997-2002 Martin R. Jones"
+msgid "(c) 2009,2010 Timothy Pearson"
+msgstr ""
 
 #. i18n: file bgadvanced_ui.ui line 27
 #: rc.cpp:3
@@ -323,7 +329,7 @@ msgid "Background Program"
 msgstr "Rhaglen Gefndir"
 
 #. i18n: file bgadvanced_ui.ui line 44
-#: rc.cpp:6 rc.cpp:245
+#: rc.cpp:6 rc.cpp:251
 #, no-c-format
 msgid "&Add..."
 msgstr "&Ychwanegu..."
@@ -700,7 +706,7 @@ msgid "Posi&tion:"
 msgstr "Lleo&liad:"
 
 #. i18n: file bgdialog_ui.ui line 376
-#: rc.cpp:164 rc.cpp:206
+#: rc.cpp:164 rc.cpp:212
 #, fuzzy, no-c-format
 msgid ""
 "<qt>You can choose here how a background picture is shown on the desktop:\n"
@@ -746,6 +752,18 @@ msgstr ""
 #. i18n: file bgdialog_ui.ui line 384
 #: rc.cpp:176
 #, no-c-format
+msgid "Cross-fading background"
+msgstr ""
+
+#. i18n: file bgdialog_ui.ui line 387
+#: rc.cpp:179
+#, no-c-format
+msgid "Enables a smooth fading effect when changing background image."
+msgstr ""
+
+#. i18n: file bgdialog_ui.ui line 395
+#: rc.cpp:182
+#, no-c-format
 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 option of \"No "
@@ -755,14 +773,14 @@ msgstr ""
 "gyfuno'r lliwiau cefndir â'r llun. Golyga'r dewis rhagosodedig \"Dim Cyfuno\" y "
 "bydd y llun yn cuddio'r lliwiau cefndir oddi tano."
 
-#. i18n: file bgdialog_ui.ui line 403
-#: rc.cpp:179
+#. i18n: file bgdialog_ui.ui line 414
+#: rc.cpp:185
 #, no-c-format
 msgid "Click to choose the primary background color."
 msgstr "Cliciwch i ddewis y lliw cefndir cynradd."
 
-#. i18n: file bgdialog_ui.ui line 414
-#: rc.cpp:182
+#. i18n: file bgdialog_ui.ui line 425
+#: rc.cpp:188
 #, no-c-format
 msgid ""
 "Click to choose the secondary background color. If no secondary color is "
@@ -771,26 +789,26 @@ msgstr ""
 "Cliciwch i ddewis y lliw cefndir eilradd. Os nad oes angen lliw eilradd ar y "
 "patrwm dewisiedig, analluogir y botwm yma."
 
-#. i18n: file bgdialog_ui.ui line 424
-#: rc.cpp:185
+#. i18n: file bgdialog_ui.ui line 435
+#: rc.cpp:191
 #, no-c-format
 msgid "Co&lors:"
 msgstr "Lli&wiau:"
 
-#. i18n: file bgdialog_ui.ui line 435
-#: rc.cpp:188
+#. i18n: file bgdialog_ui.ui line 446
+#: rc.cpp:194
 #, no-c-format
 msgid "&Blending:"
 msgstr "Cyfu&no:"
 
-#. i18n: file bgdialog_ui.ui line 454
-#: rc.cpp:191
+#. i18n: file bgdialog_ui.ui line 465
+#: rc.cpp:197
 #, no-c-format
 msgid "Balance:"
 msgstr "Cydbwysedd:"
 
-#. i18n: file bgdialog_ui.ui line 460
-#: rc.cpp:194 rc.cpp:197
+#. i18n: file bgdialog_ui.ui line 471
+#: rc.cpp:200 rc.cpp:203
 #, no-c-format
 msgid ""
 "You can use this slider to control the degree of blending. You can experiment "
@@ -799,14 +817,14 @@ msgstr ""
 "Gallwch ddefnyddio'r llithrydd yma i reoli gradd y cyfuno. Gallwch arbrofi drwy "
 "symud y llithrydd a gwylio'i eiffeithiau yn y ddelwedd ragolwg."
 
-#. i18n: file bgdialog_ui.ui line 496
-#: rc.cpp:200
+#. i18n: file bgdialog_ui.ui line 507
+#: rc.cpp:206
 #, no-c-format
 msgid "Reverse roles"
 msgstr "Gwrthdroi rôlau"
 
-#. i18n: file bgdialog_ui.ui line 499
-#: rc.cpp:203
+#. i18n: file bgdialog_ui.ui line 510
+#: rc.cpp:209
 #, no-c-format
 msgid ""
 "For some types of blending, you can reverse the role of the background and the "
@@ -815,38 +833,38 @@ msgstr ""
 "Gyda rhai mathau o gyfuno, gallwch wrthdroi rôl y cefndir a'r llun drwy ddewis "
 "y dewisiad yma."
 
-#. i18n: file bgdialog_ui.ui line 573
-#: rc.cpp:218
+#. i18n: file bgdialog_ui.ui line 584
+#: rc.cpp:224
 #, no-c-format
 msgid "Background"
 msgstr "Cefndir"
 
-#. i18n: file bgdialog_ui.ui line 584
-#: rc.cpp:221
+#. i18n: file bgdialog_ui.ui line 595
+#: rc.cpp:227
 #, no-c-format
 msgid "&No picture"
 msgstr "Dim ll&un:"
 
-#. i18n: file bgdialog_ui.ui line 592
-#: rc.cpp:224
+#. i18n: file bgdialog_ui.ui line 603
+#: rc.cpp:230
 #, no-c-format
 msgid "&Slide show:"
 msgstr "Sioe Try&loywderau"
 
-#. i18n: file bgdialog_ui.ui line 600
-#: rc.cpp:227
+#. i18n: file bgdialog_ui.ui line 611
+#: rc.cpp:233
 #, no-c-format
 msgid "&Picture:"
 msgstr "Llu&n:"
 
-#. i18n: file bgdialog_ui.ui line 628
-#: rc.cpp:230
+#. i18n: file bgdialog_ui.ui line 639
+#: rc.cpp:236
 #, no-c-format
 msgid "Set&up..."
 msgstr "Goso&d..."
 
-#. i18n: file bgdialog_ui.ui line 631
-#: rc.cpp:233
+#. i18n: file bgdialog_ui.ui line 642
+#: rc.cpp:239
 #, no-c-format
 msgid ""
 "Click this button to select a set of images to be used as background pictures. "
@@ -859,35 +877,38 @@ msgstr ""
 "Gellir dangos y  delweddau ar hap, neu yn y drefn y'u penodoch."
 
 #. i18n: file bgwallpaper_ui.ui line 27
-#: rc.cpp:236
+#: rc.cpp:242
 #, no-c-format
 msgid "Show the following pictures:"
 msgstr "Dangos y lluniau canlynol:"
 
 #. i18n: file bgwallpaper_ui.ui line 35
-#: rc.cpp:239
+#: rc.cpp:245
 #, no-c-format
 msgid "&Show pictures in random order"
 msgstr "&Dangos lluniau mewn trefn hap"
 
 #. i18n: file bgwallpaper_ui.ui line 51
-#: rc.cpp:242
+#: rc.cpp:248
 #, no-c-format
 msgid "Change &picture after:"
 msgstr "Newid &llun wedi:"
 
 #. i18n: file bgwallpaper_ui.ui line 146
-#: rc.cpp:251
+#: rc.cpp:257
 #, no-c-format
 msgid "Move &Down"
 msgstr "&Gostwng"
 
 #. i18n: file bgwallpaper_ui.ui line 154
-#: rc.cpp:254
+#: rc.cpp:260
 #, no-c-format
 msgid "Move &Up"
 msgstr "&Codi"
 
+#~ msgid "(c) 1997-2002 Martin R. Jones"
+#~ msgstr "(h)1997-2002 Martin R. Jones"
+
 #~ msgid "No picture, color only"
 #~ msgstr "Dim llun, lliw yn unig"
 
diff --git a/tde-i18n-cy/messages/tdebase/kcmbell.po b/tde-i18n-cy/messages/tdebase/kcmbell.po
index 7ade216eae7..7bf78ba0a77 100644
--- a/tde-i18n-cy/messages/tdebase/kcmbell.po
+++ b/tde-i18n-cy/messages/tdebase/kcmbell.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmbell\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-06-30 22:01+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdebase/kcmcgi.po b/tde-i18n-cy/messages/tdebase/kcmcgi.po
index 75349875a8b..4cbac591863 100644
--- a/tde-i18n-cy/messages/tdebase/kcmcgi.po
+++ b/tde-i18n-cy/messages/tdebase/kcmcgi.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcgi\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-06-10 16:32+0100\n"
 "Last-Translator: Kgyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdebase/kcmcolors.po b/tde-i18n-cy/messages/tdebase/kcmcolors.po
index 85f17ab2ed5..34f121e8cbc 100644
--- a/tde-i18n-cy/messages/tdebase/kcmcolors.po
+++ b/tde-i18n-cy/messages/tdebase/kcmcolors.po
@@ -10,10 +10,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcolors\n"
-"POT-Creation-Date: 2006-08-22 02:34+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-07-03 06:53+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -33,11 +34,12 @@ msgid ""
 msgstr "kyfieithu@dotmon.com"
 
 #: colorscm.cpp:100
+#, fuzzy
 msgid ""
 "<h1>Colors</h1> This module allows you to choose the color scheme used for the "
-"TDE desktop. The different elements of the desktop, such as title bars, menu "
-"text, etc., are called \"widgets\". You can choose the widget whose color you "
-"want to change by selecting it from a list, or by clicking on a graphical "
+"Trinity desktop. The different elements of the desktop, such as title bars, "
+"menu text, etc., are called \"widgets\". You can choose the widget whose color "
+"you want to change by selecting it from a list, or by clicking on a graphical "
 "representation of the desktop."
 "<p> You can save color settings as complete color schemes, which can also be "
 "modified or deleted. TDE comes with several predefined color schemes on which "
diff --git a/tde-i18n-cy/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-cy/messages/tdebase/kcmcomponentchooser.po
index 1918dc12131..a6da9939a62 100644
--- a/tde-i18n-cy/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-cy/messages/tdebase/kcmcomponentchooser.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\n"
-"POT-Creation-Date: 2008-07-08 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-07-03 06:59+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdebase/kcmcrypto.po b/tde-i18n-cy/messages/tdebase/kcmcrypto.po
index e9e828073f1..bd45bfc2608 100644
--- a/tde-i18n-cy/messages/tdebase/kcmcrypto.po
+++ b/tde-i18n-cy/messages/tdebase/kcmcrypto.po
@@ -10,10 +10,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcrypto\n"
-"POT-Creation-Date: 2007-07-30 01:13+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-07-03 07:02+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -231,7 +232,7 @@ msgstr "Defnyddio EGD"
 msgid "Use entropy file"
 msgstr "Defnydio ffeil entropi"
 
-#: crypto.cpp:418 crypto.cpp:2278
+#: crypto.cpp:418 crypto.cpp:2298
 msgid "Path to EGD:"
 msgstr "Llwybr i EGD:"
 
@@ -568,14 +569,14 @@ msgstr ""
 "OpenSSL."
 
 #: certexport.cpp:93 certexport.cpp:108 certexport.cpp:116 crypto.cpp:832
-#: crypto.cpp:1039 crypto.cpp:1341 crypto.cpp:1370 crypto.cpp:1387
-#: crypto.cpp:1389 crypto.cpp:1572 crypto.cpp:1590 crypto.cpp:1642
-#: crypto.cpp:1674 crypto.cpp:1676 crypto.cpp:1870 crypto.cpp:1890
-#: crypto.cpp:1956 crypto.cpp:1963 crypto.cpp:1978 crypto.cpp:2030
+#: crypto.cpp:1047 crypto.cpp:1361 crypto.cpp:1390 crypto.cpp:1407
+#: crypto.cpp:1409 crypto.cpp:1592 crypto.cpp:1610 crypto.cpp:1662
+#: crypto.cpp:1694 crypto.cpp:1696 crypto.cpp:1890 crypto.cpp:1910
+#: crypto.cpp:1976 crypto.cpp:1983 crypto.cpp:1998 crypto.cpp:2050
 msgid "SSL"
 msgstr "SSL"
 
-#: crypto.cpp:834 crypto.cpp:2258 crypto.cpp:2266 crypto.cpp:2270
+#: crypto.cpp:834 crypto.cpp:2278 crypto.cpp:2286 crypto.cpp:2290
 msgid "OpenSSL"
 msgstr "OpenSSL"
 
@@ -599,7 +600,7 @@ msgstr "Llofnodwyr SSL"
 msgid "Validation Options"
 msgstr "Dewisiadau Gwiriant"
 
-#: crypto.cpp:1035
+#: crypto.cpp:1043
 msgid ""
 "If you do not select at least one SSL algorithm, either SSL will not work or "
 "the application may be forced to choose a suitable default."
@@ -607,56 +608,56 @@ msgstr ""
 "Os na ddewiswch o leiaf un algorithm SSL, naill ai ni fydd SSL yn gweithio neu "
 "gorfodir i'r cymhwysiad ddewis rhagosodiad addas."
 
-#: crypto.cpp:1087
+#: crypto.cpp:1099
 msgid "If you do not select at least one cipher, SSLv2 will not work."
 msgstr "Os na ddewiswch o leiaf un cêl-ysgrifen, ni fydd SSL f2 yn gweithio."
 
-#: crypto.cpp:1089
+#: crypto.cpp:1101
 msgid "SSLv2 Ciphers"
 msgstr "Cêl-ysgrifennau SSLf2"
 
-#: crypto.cpp:1106
+#: crypto.cpp:1118
 msgid "If you do not select at least one cipher, SSLv3 will not work."
 msgstr "Os na ddewiswch o leiaf un cêl-ysgrifen, ni fydd SSL f3 yn gweithio."
 
-#: crypto.cpp:1108
+#: crypto.cpp:1120
 msgid "SSLv3 Ciphers"
 msgstr "Cêl-ysgrifennau SSLf3"
 
-#: crypto.cpp:1340
+#: crypto.cpp:1360
 msgid "Could not open the certificate."
 msgstr "Methwyd agor y dystysgrif."
 
-#: crypto.cpp:1370
+#: crypto.cpp:1390
 msgid "Error obtaining the certificate."
 msgstr "Gwall tra'n sicrhau'r dystysgrif."
 
-#: crypto.cpp:1387 crypto.cpp:1674
+#: crypto.cpp:1407 crypto.cpp:1694
 msgid "This certificate passed the verification tests successfully."
 msgstr "Fe basiodd y dystysgrif hon y profion gwirio'n llwyddiannus."
 
-#: crypto.cpp:1389 crypto.cpp:1676
+#: crypto.cpp:1409 crypto.cpp:1696
 msgid "This certificate has failed the tests and should be considered invalid."
 msgstr ""
 "Fe fethodd y dystysgryf hon y profion gwirio a dylid ei hystyried yn annilys."
 
-#: crypto.cpp:1566
+#: crypto.cpp:1586
 msgid "Certificate password"
 msgstr "Cyfrinair y dystysgrif"
 
-#: crypto.cpp:1572
+#: crypto.cpp:1592
 msgid "The certificate file could not be loaded. Try a different password?"
 msgstr "Nid oedd modd llwytho'r ffeil dystysgrif. Ceisiwch cyfrinair arall?"
 
-#: crypto.cpp:1572
+#: crypto.cpp:1592
 msgid "Try"
 msgstr "Ceisio"
 
-#: crypto.cpp:1572
+#: crypto.cpp:1592
 msgid "Do Not Try"
 msgstr ""
 
-#: crypto.cpp:1590
+#: crypto.cpp:1610
 msgid ""
 "A certificate with that name already exists. Are you sure that you wish to "
 "replace it?"
@@ -664,51 +665,51 @@ msgstr ""
 "Mae tystysgrif o'r enw yna'n bodoli eisioes. A ydych yn sicr eich bod am ei "
 "amnewid?"
 
-#: crypto.cpp:1623 crypto.cpp:1655 crypto.cpp:1703
+#: crypto.cpp:1643 crypto.cpp:1675 crypto.cpp:1723
 msgid "Enter the certificate password:"
 msgstr "Rhowch cyfrinair y dystysgrifau:"
 
-#: crypto.cpp:1629 crypto.cpp:1661 crypto.cpp:1709 crypto.cpp:1807
+#: crypto.cpp:1649 crypto.cpp:1681 crypto.cpp:1729 crypto.cpp:1827
 msgid "Decoding failed. Please try again:"
 msgstr "Methodd dadgodiad. Ceisiwch eto:"
 
-#: crypto.cpp:1642
+#: crypto.cpp:1662
 msgid "Export failed."
 msgstr "Methodd yr allforio."
 
-#: crypto.cpp:1802
+#: crypto.cpp:1822
 msgid "Enter the OLD password for the certificate:"
 msgstr "Rhowch HEN gyfrinair y dystysgrif:"
 
-#: crypto.cpp:1815
+#: crypto.cpp:1835
 msgid "Enter the new certificate password"
 msgstr "Rhowch cyfrinair newydd y dystysgrif"
 
-#: crypto.cpp:1867 crypto.cpp:1962
+#: crypto.cpp:1887 crypto.cpp:1982
 msgid "This is not a signer certificate."
 msgstr "Nid tystysgrif llofnodwr mo hon."
 
-#: crypto.cpp:1887 crypto.cpp:1977
+#: crypto.cpp:1907 crypto.cpp:1997
 msgid "You already have this signer certificate installed."
 msgstr "Mae gennych y dystysgrif llofnodwr yma'n osodedig yn barod."
 
-#: crypto.cpp:1955
+#: crypto.cpp:1975
 msgid "The certificate file could not be loaded."
 msgstr "Nid oedd modd llwytho'r ffeil dystysgrif."
 
-#: crypto.cpp:2006
+#: crypto.cpp:2026
 msgid "Do you want to make this certificate available to KMail as well?"
 msgstr "Hoffech wneud y dystysgrif yma ar gael i KMail hefyd?"
 
-#: crypto.cpp:2006
+#: crypto.cpp:2026
 msgid "Make Available"
 msgstr ""
 
-#: crypto.cpp:2006
+#: crypto.cpp:2026
 msgid "Do Not Make Available"
 msgstr ""
 
-#: crypto.cpp:2012
+#: crypto.cpp:2032
 msgid ""
 "Could not execute Kleopatra. You might have to install or update the tdepim "
 "package."
@@ -716,7 +717,7 @@ msgstr ""
 "Methu gweithredu Kleopatra.  Efallai bydd rhaid i chi arsefydlu neu diweddaru'r "
 "pecyn tdepim."
 
-#: crypto.cpp:2030
+#: crypto.cpp:2050
 msgid ""
 "This will revert your certificate signers database to the TDE default.\n"
 "This operation cannot be undone.\n"
@@ -726,81 +727,81 @@ msgstr ""
 " Ni ellir dad-wneud y gweithrediad yma.\n"
 " A ydych yn sicr eich bod am barhau?"
 
-#: crypto.cpp:2030
+#: crypto.cpp:2050
 msgid "Revert"
 msgstr "Dychwelyd"
 
-#: crypto.cpp:2256 crypto.cpp:2264
+#: crypto.cpp:2276 crypto.cpp:2284
 msgid "Failed to load OpenSSL."
 msgstr "Methwyd llwytho OpenSSL."
 
-#: crypto.cpp:2257
+#: crypto.cpp:2277
 msgid "libssl was not found or successfully loaded."
 msgstr "Ni ganfuwyd libssl neu ni'u llwythwyd yn llwyddiannus."
 
-#: crypto.cpp:2265
+#: crypto.cpp:2285
 msgid "libcrypto was not found or successfully loaded."
 msgstr "Ni ganfuwyd libcrypto neu ni'u llwythwyd yn llwyddiannus."
 
-#: crypto.cpp:2270
+#: crypto.cpp:2290
 msgid "OpenSSL was successfully loaded."
 msgstr "Llwythwyd OpenSSL yn llwyddiannus."
 
-#: crypto.cpp:2289
+#: crypto.cpp:2309
 msgid "Path to entropy file:"
 msgstr "Llwybr i'r ffeil entropi:"
 
-#: crypto.cpp:2302
+#: crypto.cpp:2322
 msgid "Personal SSL"
 msgstr "SSL Personol"
 
-#: crypto.cpp:2303
+#: crypto.cpp:2323
 msgid "Server SSL"
 msgstr "SSL Gweinyddion"
 
-#: crypto.cpp:2304
+#: crypto.cpp:2324
 msgid "S/MIME"
 msgstr "S/MIME"
 
-#: crypto.cpp:2305
+#: crypto.cpp:2325
 msgid "PGP"
 msgstr "PGP"
 
-#: crypto.cpp:2306
+#: crypto.cpp:2326
 msgid "GPG"
 msgstr "GPG"
 
-#: crypto.cpp:2307
+#: crypto.cpp:2327
 msgid "SSL Personal Request"
 msgstr "Cais Bersonol SSL"
 
-#: crypto.cpp:2308
+#: crypto.cpp:2328
 msgid "SSL Server Request"
 msgstr "Cais Gweinydd SSL"
 
-#: crypto.cpp:2309
+#: crypto.cpp:2329
 msgid "Netscape SSL"
 msgstr "SSL Netscape"
 
-#: crypto.cpp:2310
+#: crypto.cpp:2330
 msgid ""
 "_: Server certificate authority\n"
 "Server CA"
 msgstr "AT Gweinydd"
 
-#: crypto.cpp:2311
+#: crypto.cpp:2331
 msgid ""
 "_: Personal certificate authority\n"
 "Personal CA"
 msgstr "AT Personol"
 
-#: crypto.cpp:2312
+#: crypto.cpp:2332
 msgid ""
 "_: Secure MIME certificate authority\n"
 "S/MIME CA"
 msgstr "AT S/MIME"
 
-#: crypto.cpp:2404
+#: crypto.cpp:2435
 msgid "None"
 msgstr "Dim"
 
diff --git a/tde-i18n-cy/messages/tdebase/kcmcss.po b/tde-i18n-cy/messages/tdebase/kcmcss.po
index 83ededc1c78..a2367c28da9 100644
--- a/tde-i18n-cy/messages/tdebase/kcmcss.po
+++ b/tde-i18n-cy/messages/tdebase/kcmcss.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcss\n"
-"POT-Creation-Date: 2008-07-08 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-11-23 15:49+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdebase/kcmenergy.po b/tde-i18n-cy/messages/tdebase/kcmenergy.po
index 3156970ef4d..6f6b9646aa9 100644
--- a/tde-i18n-cy/messages/tdebase/kcmenergy.po
+++ b/tde-i18n-cy/messages/tdebase/kcmenergy.po
@@ -5,16 +5,17 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmenergy\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-06-10 17:18+0100\n"
 "Last-Translator: Kgyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: energy.cpp:145
+#: energy.cpp:149
 msgid ""
 "<h1>Display Power Control</h1> If your display supports power saving features, "
 "you can configure them using this module."
@@ -34,36 +35,41 @@ msgstr ""
 "llygoden, neu wasgu allwedd ni fydd yn debyg i achosi sgil-effeithiau "
 "anfwriadol, er enghraifft, yr allwedd \"Syflyd\" (Shift)."
 
-#: energy.cpp:165
+#: energy.cpp:185
 msgid "&Enable display power management"
 msgstr "&Galluogi dangos rheolaeth pwer"
 
-#: energy.cpp:168
+#: energy.cpp:189
 msgid "Check this option to enable the power saving features of your display."
 msgstr ""
 "Cywirwch y dewisiad yma i alluogi nodweddion arbed pwer ar eich ddangosydd."
 
-#: energy.cpp:171
+#: energy.cpp:193
+#, fuzzy
+msgid "&Enable specific display power management"
+msgstr "&Galluogi dangos rheolaeth pwer"
+
+#: energy.cpp:199
 msgid "Your display does not support power saving."
 msgstr "Nid yw eich dangosydd yn cynnal arbed pwer."
 
-#: energy.cpp:178
+#: energy.cpp:206
 msgid "Learn more about the Energy Star program"
 msgstr "Dysgu rhagor am y rhaglen Seren Ynni (Energy Star)"
 
-#: energy.cpp:187
+#: energy.cpp:216
 msgid "&Standby after:"
 msgstr "&Mynd wrth gefn ar ol:"
 
-#: energy.cpp:189 energy.cpp:200 energy.cpp:212
+#: energy.cpp:218 energy.cpp:229 energy.cpp:241
 msgid " min"
 msgstr "lleiaf"
 
-#: energy.cpp:190 energy.cpp:201 energy.cpp:213
+#: energy.cpp:219 energy.cpp:230 energy.cpp:242
 msgid "Disabled"
 msgstr "Analluogir"
 
-#: energy.cpp:193
+#: energy.cpp:222
 msgid ""
 "Choose the period of inactivity after which the display should enter "
 "\"standby\" mode. This is the first level of power saving."
@@ -71,11 +77,11 @@ msgstr ""
 "Dewis y cyfnod llonydd cyn i'r dangosydd fynd \"wrth gefn\". Dyma'r safon "
 "cyntaf o arbed pwer."
 
-#: energy.cpp:198
+#: energy.cpp:227
 msgid "S&uspend after:"
 msgstr "C&ysgu ar ol:"
 
-#: energy.cpp:204
+#: energy.cpp:233
 msgid ""
 "Choose the period of inactivity after which the display should enter "
 "\"suspend\" mode. This is the second level of power saving, but may not be "
@@ -84,11 +90,11 @@ msgstr ""
 "Dewis y cyfnod llonydd cyn i'r dangosydd \"gysgu\". Dyma'r ail safon o arbed "
 "pwer, ond efallai ni fydd yn wahanol i'r safon cyntaf am rai dangosyddion."
 
-#: energy.cpp:210
+#: energy.cpp:239
 msgid "&Power off after:"
 msgstr "&Diffodd y pwer ar ol:"
 
-#: energy.cpp:216
+#: energy.cpp:245
 msgid ""
 "Choose the period of inactivity after which the display should be powered off. "
 "This is the greatest level of power saving that can be achieved while the "
@@ -96,3 +102,11 @@ msgid ""
 msgstr ""
 "Dewis y cyfnod llonydd cyn i'r dangosydd ddiffodd ei bwer. Dyma'r safon gorau o "
 "arbed pwer y gall ei gyflawni tra mae'r dangosydd dal arnodd wrth y plwg.  "
+
+#: energy.cpp:256
+msgid "Configure KPowersave..."
+msgstr ""
+
+#: energy.cpp:262
+msgid "Configure TDEPowersave..."
+msgstr ""
diff --git a/tde-i18n-cy/messages/tdebase/kcmfonts.po b/tde-i18n-cy/messages/tdebase/kcmfonts.po
index 183bb832073..6640a00a0ae 100644
--- a/tde-i18n-cy/messages/tdebase/kcmfonts.po
+++ b/tde-i18n-cy/messages/tdebase/kcmfonts.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmfonts\n"
-"POT-Creation-Date: 2007-04-11 02:14+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-07-03 07:04+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdebase/kcmhtmlsearch.po b/tde-i18n-cy/messages/tdebase/kcmhtmlsearch.po
index 874dc9e6677..b71e300638c 100644
--- a/tde-i18n-cy/messages/tdebase/kcmhtmlsearch.po
+++ b/tde-i18n-cy/messages/tdebase/kcmhtmlsearch.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmhtmlsearch\n"
-"POT-Creation-Date: 2005-05-18 21:23+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-11-23 16:25+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdebase/kcmicons.po b/tde-i18n-cy/messages/tdebase/kcmicons.po
index 78a8fd426e5..0d13177abdd 100644
--- a/tde-i18n-cy/messages/tdebase/kcmicons.po
+++ b/tde-i18n-cy/messages/tdebase/kcmicons.po
@@ -10,10 +10,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmicons\n"
-"POT-Creation-Date: 2006-09-03 02:35+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-07-03 07:09+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -32,115 +33,134 @@ msgid ""
 "Your emails"
 msgstr "kyfieithu@dotmon.com"
 
-#: icons.cpp:45
+#: icons.cpp:48
 msgid "Use of Icon"
 msgstr "Defnydd Eicon"
 
-#: icons.cpp:66
+#: icons.cpp:69
 msgid "Active"
 msgstr "Gweithredol"
 
-#: icons.cpp:68
+#: icons.cpp:71
 msgid "Disabled"
 msgstr "Analluog"
 
-#: icons.cpp:80
+#: icons.cpp:82
 msgid "Size:"
 msgstr "Maint:"
 
-#: icons.cpp:88
+#: icons.cpp:90
 msgid "Double-sized pixels"
 msgstr "Picseli maint-dwbl"
 
-#: icons.cpp:92
+#: icons.cpp:94
 msgid "Animate icons"
 msgstr "Bywlunio eiconau"
 
-#: icons.cpp:117
+#: icons.cpp:98
+msgid "Rounded text selection"
+msgstr ""
+
+#: icons.cpp:102
+msgid "Show icon activation effect"
+msgstr ""
+
+#: icons.cpp:131
 msgid "Set Effect..."
 msgstr "Gosod Effaith..."
 
-#: icons.cpp:133
+#: icons.cpp:147
 msgid "Desktop/File Manager"
 msgstr "Trefnydd Penbwrdd/Ffeiliau"
 
-#: icons.cpp:134
+#: icons.cpp:148
 msgid "Toolbar"
 msgstr "Bar Offer"
 
-#: icons.cpp:136
+#: icons.cpp:150
 msgid "Small Icons"
 msgstr "Eiconau Bach"
 
-#: icons.cpp:137
+#: icons.cpp:151
 msgid "Panel"
 msgstr "Panel"
 
-#: icons.cpp:138
+#: icons.cpp:152
 msgid "All Icons"
 msgstr "Pob Eicon"
 
-#: icons.cpp:445
+#: icons.cpp:153 icons.cpp:303 icons.cpp:364 icons.cpp:375 icons.cpp:518
+#: icons.cpp:561 icons.cpp:612
+msgid "Panel Buttons"
+msgstr ""
+
+#: icons.cpp:154 icons.cpp:317 icons.cpp:367 icons.cpp:378 icons.cpp:526
+#: icons.cpp:564 icons.cpp:617
+#, fuzzy
+msgid "System Tray Icons"
+msgstr "Eiconau Bach"
+
+#: icons.cpp:579
 msgid "Setup Default Icon Effect"
 msgstr "Gosod Effaith Eicon Rhagosod"
 
-#: icons.cpp:446
+#: icons.cpp:580
 msgid "Setup Active Icon Effect"
 msgstr "Gosod Effaith Eicon Gweithredol"
 
-#: icons.cpp:447
+#: icons.cpp:581
 msgid "Setup Disabled Icon Effect"
 msgstr "Gosod Effaith Eicon Analluog"
 
-#: icons.cpp:534
+#: icons.cpp:690
 msgid "&Effect:"
 msgstr "&Effaith:"
 
-#: icons.cpp:538
+#: icons.cpp:694
 msgid "No Effect"
 msgstr "Dim Effaith"
 
-#: icons.cpp:539
+#: icons.cpp:695
 msgid "To Gray"
 msgstr "I Lwyd"
 
-#: icons.cpp:540
+#: icons.cpp:696
 msgid "Colorize"
 msgstr "Lliweiddio"
 
-#: icons.cpp:541
+#: icons.cpp:697
 msgid "Gamma"
 msgstr "Gama"
 
-#: icons.cpp:542
+#: icons.cpp:698
 msgid "Desaturate"
 msgstr "Dad-ddirlenwi"
 
-#: icons.cpp:543
+#: icons.cpp:699
 msgid "To Monochrome"
 msgstr ""
 
-#: icons.cpp:549
+#: icons.cpp:705
 msgid "&Semi-transparent"
 msgstr "&Lled-dryloyw"
 
-#: icons.cpp:553
+#: icons.cpp:709
 msgid "Preview"
 msgstr "Rhagolwg"
 
-#: icons.cpp:564
+#: icons.cpp:720
 msgid "Effect Parameters"
 msgstr "Paramedrau Effaith"
 
-#: icons.cpp:569
+#: icons.cpp:725
 msgid "&Amount:"
 msgstr "&Maint:"
 
-#: icons.cpp:576
+#: icons.cpp:732
 msgid "Co&lor:"
 msgstr "&Lliw:"
 
-#: icons.cpp:584
+#: icons.cpp:740
 msgid "&Second color:"
 msgstr ""
 
diff --git a/tde-i18n-cy/messages/tdebase/kcminfo.po b/tde-i18n-cy/messages/tdebase/kcminfo.po
index cae9c0d8947..eafa34c1da7 100644
--- a/tde-i18n-cy/messages/tdebase/kcminfo.po
+++ b/tde-i18n-cy/messages/tdebase/kcminfo.po
@@ -10,10 +10,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcminfo\n"
-"POT-Creation-Date: 2006-06-16 03:58+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-07-03 07:10+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -158,7 +159,7 @@ msgstr "%1 Beit"
 
 #: info.cpp:263 info_aix.cpp:299 info_hpux.cpp:372 info_hpux.cpp:662
 #: info_linux.cpp:136 info_linux.cpp:562 info_netbsd.cpp:73
-#: info_openbsd.cpp:69 info_solaris.cpp:686 opengl.cpp:636
+#: info_openbsd.cpp:69 info_solaris.cpp:686 opengl.cpp:635
 msgid "Value"
 msgstr "Gwerth"
 
@@ -166,7 +167,7 @@ msgstr "Gwerth"
 msgid "Server Information"
 msgstr "Gwybodaeth am y Gweinydd"
 
-#: info.cpp:272 opengl.cpp:638
+#: info.cpp:272 opengl.cpp:637
 msgid "Name of the Display"
 msgstr "Enw'r Dangosydd"
 
@@ -898,11 +899,13 @@ msgid "Disk cache:"
 msgstr "Storfa dros dro'r disg:"
 
 #: memory.cpp:156
-msgid "Total swap memory:"
+#, fuzzy
+msgid "Total swap space:"
 msgstr "Cyfanswm y cof cyfnewid:"
 
 #: memory.cpp:159
-msgid "Free swap memory:"
+#, fuzzy
+msgid "Free swap space:"
 msgstr "Cof cyfnewid na ddefnyddid:"
 
 #: memory.cpp:198
@@ -910,9 +913,10 @@ msgid "Total Memory"
 msgstr "Cyfanswm y cof"
 
 #: memory.cpp:199
+#, fuzzy
 msgid ""
-"This graph gives you an overview of the <b>total sum of physical and virtual "
-"memory</b> in your system."
+"This graph gives you an overview of the usage of <b>all available memory</b> "
+"(the sum of physical memory and swap space) in your system."
 msgstr ""
 "Mae'r graff yn rhoi trosolwg o'r <b> cof corfforol a rhith </b> yn eich cysawd."
 
@@ -921,13 +925,16 @@ msgid "Physical Memory"
 msgstr "Cof Corfforol"
 
 #: memory.cpp:205
+#, fuzzy
 msgid ""
-"This graph gives you an overview of the <b>usage of physical memory</b> "
+"This graph gives you an overview of the usage of <b>physical memory</b> "
 "in your system."
 "<p>Most operating systems (including Linux) will use as much of the available "
-"physical memory as possible as disk cache, to speed up the system performance. "
-"<p>This means that if you have a small amount of <b>Free Physical Memory</b> "
-"and a large amount of <b>Disk Cache Memory</b>, your system is well configured."
+"physical memory as possible for a disk cache, to speed up the reading and "
+"writing of files. "
+"<p>This means that if you are seeing a small amount of <b>"
+"Free Physical Memory</b> and a large amount of <b>Disk Cache</b>"
+", your system is well configured."
 msgstr ""
 "Mae'r graff yn rhoi trosolwg o'r <b>defnydd o gof corfforol </b> "
 "yn eich cysawd."
@@ -938,21 +945,22 @@ msgstr ""
 "a llawer o <b>Gof Disg Dros Dro</b>, yna mae'ch cysawd wedi ei ffurfweddu yn "
 "dda."
 
-#: memory.cpp:217
+#: memory.cpp:216
 msgid "Swap Space"
 msgstr "Lle Cyfnewid"
 
-#: memory.cpp:218
+#: memory.cpp:217
+#, fuzzy
 msgid ""
-"The swap space is the <b>virtual memory</b> available to the system. "
-"<p>It will be used on demand and is provided through one or more swap "
+"Swap space is the <b>virtual memory</b> available to the system. "
+"<p>It will be used when needed, and is provided through one or more swap "
 "partitions and/or swap files."
 msgstr ""
 "Y lle cyfnewid yw'r <b>cof rhith</d> sydd ar gael i'r system. "
 "<p>Defnyddir ef pan mae angen arno, a cyflenwir ef drwy un neu fwy o raniadau "
 "disg a/neu ffeil cyfnewid."
 
-#: memory.cpp:271
+#: memory.cpp:270
 msgid ""
 "<h1>Memory Information</h1> This display shows you the current memory usage of "
 "your system. The values are updated on a regular basis and give you an overview "
@@ -963,44 +971,49 @@ msgstr ""
 "diweddaru yn rheolaidd, ac maent yn rhoi trosolwg i chi o'r cof corfforol a "
 "rhith a ddefnyddir."
 
-#: memory.cpp:350
+#: memory.cpp:349
 msgid "%1 free"
 msgstr "%1 ar gael"
 
-#: memory.cpp:371
+#: memory.cpp:370
 msgid "%1 bytes ="
 msgstr "%1 beit ="
 
-#: memory.cpp:402
+#: memory.cpp:401
 msgid "Application Data"
 msgstr "Data'r Cymhwysiad"
 
-#: memory.cpp:404
+#: memory.cpp:403
 msgid "Disk Buffers"
 msgstr "Byfferau Disg"
 
-#: memory.cpp:406
+#: memory.cpp:405
 msgid "Disk Cache"
 msgstr "Storfa Dros Dro'r Disg"
 
-#: memory.cpp:408
+#: memory.cpp:407
 msgid "Free Physical Memory"
 msgstr "Cof Corfforol Rhydd"
 
-#: memory.cpp:419 memory.cpp:439
+#: memory.cpp:418
 msgid "Used Swap"
 msgstr "Lle Cyfnewid a Ddefnyddir"
 
-#: memory.cpp:421
+#: memory.cpp:420
 msgid "Free Swap"
 msgstr "Lle Cyfnewid Rhydd"
 
-#: memory.cpp:437
-msgid "Used Physical Memory"
-msgstr "Cof Corfforol a Ddefnyddir"
+#: memory.cpp:432
+msgid "Used Memory (swap part)"
+msgstr ""
+
+#: memory.cpp:434
+msgid "Used Memory (physical part)"
+msgstr ""
 
-#: memory.cpp:441
-msgid "Total Free Memory"
+#: memory.cpp:436
+#, fuzzy
+msgid "Free Memory (total)"
 msgstr "Cyfanswm y Cof Rhydd"
 
 #: opengl.cpp:266
@@ -1205,6 +1218,9 @@ msgstr "Fersiwn Alib"
 msgid "GLU extensions"
 msgstr ""
 
-#: opengl.cpp:662
+#: opengl.cpp:661
 msgid "Could not initialize OpenGL"
 msgstr ""
+
+#~ msgid "Used Physical Memory"
+#~ msgstr "Cof Corfforol a Ddefnyddir"
diff --git a/tde-i18n-cy/messages/tdebase/kcminput.po b/tde-i18n-cy/messages/tdebase/kcminput.po
index 2410f51ad8d..58a4538b1d9 100644
--- a/tde-i18n-cy/messages/tdebase/kcminput.po
+++ b/tde-i18n-cy/messages/tdebase/kcminput.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcminput\n"
-"POT-Creation-Date: 2006-08-22 02:34+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-07-03 07:13+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -36,87 +37,87 @@ msgstr "kyfieithu@dotmon.com"
 msgid "Mouse type: %1"
 msgstr ""
 
-#: logitechmouse.cpp:225
+#: logitechmouse.cpp:229
 msgid ""
 "RF channel 1 has been set. Please press Connect button on mouse to re-establish "
 "link"
 msgstr ""
 
-#: logitechmouse.cpp:225 logitechmouse.cpp:229
+#: logitechmouse.cpp:229 logitechmouse.cpp:233
 msgid "Press Connect Button"
 msgstr ""
 
-#: logitechmouse.cpp:229
+#: logitechmouse.cpp:233
 msgid ""
 "RF channel 2 has been set. Please press Connect button on mouse to re-establish "
 "link"
 msgstr ""
 
-#: logitechmouse.cpp:356
+#: logitechmouse.cpp:370
 msgid "none"
 msgstr "dim"
 
-#: logitechmouse.cpp:359 logitechmouse.cpp:389
+#: logitechmouse.cpp:373 logitechmouse.cpp:403
 msgid "Cordless Mouse"
 msgstr ""
 
-#: logitechmouse.cpp:362 logitechmouse.cpp:368 logitechmouse.cpp:371
+#: logitechmouse.cpp:376 logitechmouse.cpp:382 logitechmouse.cpp:385
 msgid "Cordless Wheel Mouse"
 msgstr ""
 
-#: logitechmouse.cpp:365
+#: logitechmouse.cpp:379
 msgid "Cordless MouseMan Wheel"
 msgstr ""
 
-#: logitechmouse.cpp:374
+#: logitechmouse.cpp:388
 msgid "Cordless TrackMan Wheel"
 msgstr ""
 
-#: logitechmouse.cpp:377
+#: logitechmouse.cpp:391
 msgid "TrackMan Live"
 msgstr ""
 
-#: logitechmouse.cpp:380
+#: logitechmouse.cpp:394
 msgid "Cordless TrackMan FX"
 msgstr ""
 
-#: logitechmouse.cpp:383
+#: logitechmouse.cpp:397
 msgid "Cordless MouseMan Optical"
 msgstr ""
 
-#: logitechmouse.cpp:386
+#: logitechmouse.cpp:400
 msgid "Cordless Optical Mouse"
 msgstr ""
 
-#: logitechmouse.cpp:392
+#: logitechmouse.cpp:406
 msgid "Cordless MouseMan Optical (2ch)"
 msgstr ""
 
-#: logitechmouse.cpp:395
+#: logitechmouse.cpp:409
 msgid "Cordless Optical Mouse (2ch)"
 msgstr ""
 
-#: logitechmouse.cpp:398
+#: logitechmouse.cpp:412
 msgid "Cordless Mouse (2ch)"
 msgstr ""
 
-#: logitechmouse.cpp:401
+#: logitechmouse.cpp:415
 msgid "Cordless Optical TrackMan"
 msgstr ""
 
-#: logitechmouse.cpp:404
+#: logitechmouse.cpp:418
 msgid "MX700 Cordless Optical Mouse"
 msgstr ""
 
-#: logitechmouse.cpp:407
+#: logitechmouse.cpp:421
 msgid "MX700 Cordless Optical Mouse (2ch)"
 msgstr ""
 
-#: logitechmouse.cpp:410
+#: logitechmouse.cpp:424
 msgid "Unknown mouse"
 msgstr ""
 
-#: mouse.cpp:82
+#: mouse.cpp:84
 msgid ""
 "<h1>Mouse</h1> This module allows you to choose various options for the way in "
 "which your pointing device works. Your pointing device may be a mouse, "
@@ -126,11 +127,11 @@ msgstr ""
 "ffordd y mae'ch dyfais bwyntio'n gweithio. Gall eich dyfais bwyntio fod yn "
 "lygoden, yn bêl-drac, neu ryw galedwedd arall sydd â swyddogaeth tebyg."
 
-#: mouse.cpp:101
+#: mouse.cpp:103
 msgid "&General"
 msgstr "&Cyffredinol"
 
-#: mouse.cpp:106
+#: mouse.cpp:108
 msgid ""
 "If you are left-handed, you may prefer to swap the functions of the left and "
 "right buttons on your pointing device by choosing the 'left-handed' option. If "
@@ -144,7 +145,7 @@ msgstr ""
 "bydd effaith. Er enghraifft, os oes gennych lygoden â tri botwm, nid oes "
 "effaith ar y botwm canol."
 
-#: mouse.cpp:116
+#: mouse.cpp:118
 msgid ""
 "The default behavior in TDE is to select and activate icons with a single click "
 "of the left button on your pointing device. This behavior is consistent with "
@@ -157,11 +158,11 @@ msgstr ""
 "gysylltiadau mewn porwyr gwê cyffredin. Os byddai well gennych ddewis â chlic "
 "unigol, a gweithredoli â chlic dwbl, dewiswch y dewisiad yma."
 
-#: mouse.cpp:124
+#: mouse.cpp:126
 msgid "Activates and opens a file or folder with a single click."
 msgstr "Gweithredola ac agora ffeil neu blygell â chlic sengl."
 
-#: mouse.cpp:130
+#: mouse.cpp:132
 msgid ""
 "If you check this option, pausing the mouse pointer over an icon on the screen "
 "will automatically select that icon. This may be useful when single clicks "
@@ -172,7 +173,7 @@ msgstr ""
 "cliciau sengl yn gweithredu eiconau, ac eich bod am ddewis yr eicon yn unig, "
 "heb ei weithredoli."
 
-#: mouse.cpp:142
+#: mouse.cpp:144
 msgid ""
 "If you have checked the option to automatically select icons, this slider "
 "allows you to select how long the mouse pointer must be paused over the icon "
@@ -182,23 +183,23 @@ msgstr ""
 "chi ddewis am gyhyd y mae rhaid seibio pwyntydd y lygoden dros yr eicon cyn ei "
 "ddewis."
 
-#: mouse.cpp:147
+#: mouse.cpp:149
 msgid "Show feedback when clicking an icon"
 msgstr "Dangos adborth pan yn clicio ar eicon"
 
-#: mouse.cpp:179
+#: mouse.cpp:181
 msgid "&Cursor Theme"
 msgstr "T&hema Cyrchydd"
 
-#: mouse.cpp:183
+#: mouse.cpp:185
 msgid "Advanced"
 msgstr "Uwch"
 
-#: mouse.cpp:189
+#: mouse.cpp:191
 msgid "Pointer acceleration:"
 msgstr "Cyflymiad Pwyntydd:"
 
-#: mouse.cpp:194
+#: mouse.cpp:196
 msgid ""
 "This option allows you to change the relationship between the distance that the "
 "mouse pointer moves on the screen and the relative movement of the physical "
@@ -216,11 +217,11 @@ msgstr ""
 "ddewis gwerthoedd uchel iawn achosi i bwyntydd y llygoden wibio ar draws y "
 "sgrîn gan ei wneud yn anodd iawn i'w reoli!"
 
-#: mouse.cpp:207
+#: mouse.cpp:209
 msgid "Pointer threshold:"
 msgstr "Trothwy pwyntydd:"
 
-#: mouse.cpp:215
+#: mouse.cpp:217
 msgid ""
 "The threshold is the smallest distance that the mouse pointer must move on the "
 "screen before acceleration has any effect. If the movement is smaller than the "
@@ -242,7 +243,7 @@ msgstr ""
 msgid "Double click interval:"
 msgstr "Cyfnod clic dwbl:"
 
-#: mouse.cpp:231 mouse.cpp:249 mouse.cpp:303 mouse.cpp:311 mouse.cpp:320
+#: mouse.cpp:231 mouse.cpp:279 mouse.cpp:333 mouse.cpp:341 mouse.cpp:350
 msgid " msec"
 msgstr "meil"
 
@@ -257,11 +258,26 @@ msgstr ""
 "dwbl yw'r cyfnod clic dwbl. Os yw'r ail glic yn digwydd wedi'r cyfnod yma ar ôl "
 "y clic cyntaf, fe'u adnabyddir yn ddau glic arwahanol."
 
-#: mouse.cpp:247
+#: mouse.cpp:246
+msgid "Double-click on the image below to test your double-click interval:"
+msgstr ""
+
+#: mouse.cpp:248
+msgid ""
+"The image will change when your double-click test time is less than or equal to "
+"the interval you configured. When changing the interval, be sure to select the "
+"Apply button before testing. For example, the image will not change when you "
+"configure a double-click interval of 700 milliseconds and the time between two "
+"successive clicks on the image is 800 milliseconds, but the image will change "
+"when the time between clicks is 600 milliseconds. The goal is to select a "
+"comfortable interval that you find is not too fast or slow."
+msgstr ""
+
+#: mouse.cpp:277
 msgid "Drag start time:"
 msgstr "Amser cychwyn llusgo:"
 
-#: mouse.cpp:254
+#: mouse.cpp:284
 msgid ""
 "If you click with the mouse (e.g. in a multi-line editor) and begin to move the "
 "mouse within the drag start time, a drag operation will be initiated."
@@ -269,11 +285,11 @@ msgstr ""
 "Os gliciwch â'r llygoden (e.e. mewn golygydd aml-linell) a dechreuwch symud y "
 "lygoden o fewn yr amser dechrau llusgo, fe gychwynnir gweithred lusgo."
 
-#: mouse.cpp:260
+#: mouse.cpp:290
 msgid "Drag start distance:"
 msgstr "Pellter dechrau llusgo:"
 
-#: mouse.cpp:268
+#: mouse.cpp:298
 msgid ""
 "If you click with the mouse and begin to move the mouse at least the drag start "
 "distance, a drag operation will be initiated."
@@ -281,11 +297,11 @@ msgstr ""
 "Os gliciwch â'r llygoden a dechreuwch symud y lygoden o leiaf y pellter dechrau "
 "llusgo, fe gychwynnir gweithred lusgo."
 
-#: mouse.cpp:274
+#: mouse.cpp:304
 msgid "Mouse wheel scrolls by:"
 msgstr "Olwyn llygoden yn sgrolio:"
 
-#: mouse.cpp:282
+#: mouse.cpp:312
 msgid ""
 "If you use the wheel of a mouse, this value determines the number of lines to "
 "scroll for each wheel movement. Note that if this number exceeds the number of "
@@ -297,54 +313,54 @@ msgstr ""
 "golwg, fe'i anwybyddir ac fe gaiff symudiad yr olwyn ei drin fel symudiad "
 "tudalen i fyny/i lawr."
 
-#: mouse.cpp:288
+#: mouse.cpp:318
 msgid "Mouse Navigation"
 msgstr "Llywio Llygoden"
 
-#: mouse.cpp:296
+#: mouse.cpp:326
 msgid "&Move pointer with keyboard (using the num pad)"
 msgstr "&Symud pwyntydd â bysyll (ar y pad rhifol)"
 
-#: mouse.cpp:302
+#: mouse.cpp:332
 msgid "&Acceleration delay:"
 msgstr "Oedi &cyflymiad:"
 
-#: mouse.cpp:310
+#: mouse.cpp:340
 msgid "R&epeat interval:"
 msgstr "Cyfnod &ailadrodd:"
 
-#: mouse.cpp:318
+#: mouse.cpp:348
 msgid "Acceleration &time:"
 msgstr "A&mser cyflymiad:"
 
-#: mouse.cpp:326
+#: mouse.cpp:356
 msgid "Ma&ximum speed:"
 msgstr "Cyflymder &uchaf:"
 
-#: mouse.cpp:328
+#: mouse.cpp:358
 #, fuzzy
 msgid " pixel/sec"
 msgstr "picseli"
 
-#: mouse.cpp:334
+#: mouse.cpp:364
 msgid "Acceleration &profile:"
 msgstr "&Proffil cyflymiad:"
 
-#: mouse.cpp:407
+#: mouse.cpp:437
 msgid "Mouse"
 msgstr "Llygoden"
 
-#: mouse.cpp:408
+#: mouse.cpp:438
 msgid "(c) 1997 - 2005 Mouse developers"
 msgstr ""
 
-#: mouse.cpp:710 mouse.cpp:715
+#: mouse.cpp:765 mouse.cpp:770
 msgid ""
 "_n:  pixel\n"
 " pixels"
 msgstr ""
 
-#: mouse.cpp:720
+#: mouse.cpp:775
 msgid ""
 "_n:  line\n"
 " lines"
@@ -500,19 +516,19 @@ msgstr ""
 msgid "Select the cursor theme you want to use:"
 msgstr "Dewis y thema cyrchydd yr hoffech ddefnyddio:"
 
-#: core/themepage.cpp:66 xcursor/themepage.cpp:93
+#: core/themepage.cpp:66 xcursor/themepage.cpp:100
 msgid "Name"
 msgstr "Enw"
 
-#: core/themepage.cpp:67 xcursor/themepage.cpp:94
+#: core/themepage.cpp:67 xcursor/themepage.cpp:101
 msgid "Description"
 msgstr "Disgrifiad"
 
-#: core/themepage.cpp:105 xcursor/themepage.cpp:139
+#: core/themepage.cpp:105 xcursor/themepage.cpp:146
 msgid "You have to restart TDE for these changes to take effect."
 msgstr "Rhaid ailgychwyn TDE i'r newidiadau yma ddod i rym."
 
-#: core/themepage.cpp:106 xcursor/themepage.cpp:140
+#: core/themepage.cpp:106 xcursor/themepage.cpp:147
 msgid "Cursor Settings Changed"
 msgstr "Newidwyd Gosodiadau'r Cyrchydd"
 
@@ -548,40 +564,48 @@ msgstr " Gwyn mawr"
 msgid "Large white cursors"
 msgstr "Cyrchyddion gwyn mawr"
 
-#: xcursor/themepage.cpp:84
+#: xcursor/themepage.cpp:79
+msgid "XFree theme %1 - incomplete for TDE"
+msgstr ""
+
+#: xcursor/themepage.cpp:80
+msgid "No description available"
+msgstr "Dim disgrifiad ar gael"
+
+#: xcursor/themepage.cpp:91
 #, fuzzy
 msgid "Select the cursor theme you want to use (hover preview to test cursor):"
 msgstr "Dewis y thema cyrchydd yr hoffech ddefnyddio:"
 
-#: xcursor/themepage.cpp:104
+#: xcursor/themepage.cpp:111
 msgid "Install New Theme..."
 msgstr "Gosod Thema Newydd..."
 
-#: xcursor/themepage.cpp:105
+#: xcursor/themepage.cpp:112
 msgid "Remove Theme"
 msgstr " Gwaredu Thema"
 
-#: xcursor/themepage.cpp:212
+#: xcursor/themepage.cpp:219
 msgid "Drag or Type Theme URL"
 msgstr "Llusgo neu Deipio URL y Thema"
 
-#: xcursor/themepage.cpp:221
+#: xcursor/themepage.cpp:228
 #, c-format
 msgid "Unable to find the cursor theme archive %1."
 msgstr "Methu canfod yr archif themau cyrchydd %1."
 
-#: xcursor/themepage.cpp:223
+#: xcursor/themepage.cpp:230
 msgid ""
 "Unable to download the cursor theme archive; please check that the address %1 "
 "is correct."
 msgstr ""
 "Methu lawrlwytho'r archif themau cyrchydd; gwiriwch bod y cyfeiriad %1 yn iawn."
 
-#: xcursor/themepage.cpp:231
+#: xcursor/themepage.cpp:238
 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:240
+#: xcursor/themepage.cpp:247
 msgid ""
 "<qt>Are you sure you want to remove the <strong>%1</strong> cursor theme?"
 "<br>This will delete all the files installed by this theme.</qt>"
@@ -589,11 +613,11 @@ msgstr ""
 "<qt>Ydych yn sicr yr hoffech waredu'r thema cyrchydd <strong>%1</strong>?"
 "<br>  Bydd hyn yn dileu pob ffeil a osodwyd gan y thema yma.</qt>"
 
-#: xcursor/themepage.cpp:246
+#: xcursor/themepage.cpp:253
 msgid "Confirmation"
 msgstr "Cadarnhad"
 
-#: xcursor/themepage.cpp:300
+#: xcursor/themepage.cpp:307
 msgid ""
 "A theme named %1 already exists in your icon theme folder. Do you want replace "
 "it with this one?"
@@ -601,28 +625,24 @@ msgstr ""
 "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:302
+#: xcursor/themepage.cpp:309
 msgid "Overwrite Theme?"
 msgstr " Drosysgrifo'r thema?"
 
-#: xcursor/themepage.cpp:336 xcursor/themepage.cpp:483
-msgid "No description available"
-msgstr "Dim disgrifiad ar gael"
-
-#: xcursor/themepage.cpp:537
+#: xcursor/themepage.cpp:544
 msgid "No theme"
 msgstr " Dim thema"
 
-#: xcursor/themepage.cpp:537
+#: xcursor/themepage.cpp:544
 msgid "The old classic X cursors"
 msgstr "Yr hen gyrchyddion X clasurol"
 
-#: xcursor/themepage.cpp:539
+#: xcursor/themepage.cpp:546
 #, fuzzy
 msgid "System theme"
 msgstr " Dim thema"
 
-#: xcursor/themepage.cpp:539
+#: xcursor/themepage.cpp:546
 msgid "Do not change cursor theme"
 msgstr ""
 
diff --git a/tde-i18n-cy/messages/tdebase/kcmkclock.po b/tde-i18n-cy/messages/tdebase/kcmkclock.po
index 619167ab7b6..0fa106cba79 100644
--- a/tde-i18n-cy/messages/tdebase/kcmkclock.po
+++ b/tde-i18n-cy/messages/tdebase/kcmkclock.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmkclock\n"
-"POT-Creation-Date: 2005-12-17 03:07+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-07-03 07:15+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdebase/kcmkded.po b/tde-i18n-cy/messages/tdebase/kcmkded.po
index f20afabc1b4..94c8572836a 100644
--- a/tde-i18n-cy/messages/tdebase/kcmkded.po
+++ b/tde-i18n-cy/messages/tdebase/kcmkded.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmkded\n"
-"POT-Creation-Date: 2006-08-22 02:34+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-07-03 07:17+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -40,10 +41,11 @@ msgid "(c) 2002 Daniel Molkentin"
 msgstr "(h)(c) 2002 Daniel Molkentin"
 
 #: kcmkded.cpp:59
+#, fuzzy
 msgid ""
 "<h1>Service Manager</h1>"
-"<p>This module allows you to have an overview of all plugins of the TDE Daemon, "
-"also referred to as TDE Services. Generally, there are two types of service:</p>"
+"<p>This module allows you to have an overview of all plugins running as TDE "
+"Services. Generally, there are two types of service:</p>"
 "<ul>"
 "<li>Services invoked at startup</li>"
 "<li>Services called on demand</li></ul>"
@@ -121,7 +123,8 @@ msgid "Start"
 msgstr "Dechrau"
 
 #: kcmkded.cpp:237 kcmkded.cpp:328
-msgid "Unable to contact TDED."
+#, fuzzy
+msgid "Unable to contact KDED."
 msgstr "Methu cysylltu â TDED."
 
 #: kcmkded.cpp:322
diff --git a/tde-i18n-cy/messages/tdebase/kcmkeys.po b/tde-i18n-cy/messages/tdebase/kcmkeys.po
index 5998d09a386..a83b4a752f2 100644
--- a/tde-i18n-cy/messages/tdebase/kcmkeys.po
+++ b/tde-i18n-cy/messages/tdebase/kcmkeys.po
@@ -10,17 +10,18 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmkeys\n"
-"POT-Creation-Date: 2006-08-22 02:34+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-07-03 07:20+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.2\n"
 "\n"
 
-#: shortcuts.cpp:93
+#: shortcuts.cpp:96
 msgid ""
 "<h1>Key Bindings</h1> Using key bindings you can configure certain actions to "
 "be triggered when you press a key or a combination of keys, e.g. Ctrl+C is "
@@ -42,7 +43,7 @@ msgstr ""
 "'Byrlwybrau Cymhwysiadau' mae rhwymiadau y'u defnyddir gan fwyaf o fewn "
 "cymhwysiadau, megis copïo a gludio."
 
-#: shortcuts.cpp:152
+#: shortcuts.cpp:157
 msgid ""
 "Click here to remove the selected key bindings scheme. You cannot remove the "
 "standard system-wide schemes 'Current scheme' and 'TDE default'."
@@ -51,49 +52,53 @@ msgstr ""
 "waredu'r cynlluniau safonol cysawd-eang 'Cynllun cyfredol' na 'Rhagosodion "
 "TDE'."
 
-#: shortcuts.cpp:158
+#: shortcuts.cpp:163
 msgid "New scheme"
 msgstr "Cynllun newydd"
 
-#: shortcuts.cpp:163
+#: shortcuts.cpp:168
 msgid "&Save..."
 msgstr "&Cadw..."
 
-#: shortcuts.cpp:165
+#: shortcuts.cpp:170
 msgid ""
 "Click here to add a new key bindings scheme. You will be prompted for a name."
 msgstr ""
 "uCliciwch yma i ychwanegu cynllun rhwymiadau bysyll newydd. Fe'ch anogir am "
 "enw."
 
-#: shortcuts.cpp:177
+#: shortcuts.cpp:195
+msgid "Use Win key as modifier (uncheck to bind Win key to Menu)"
+msgstr ""
+
+#: shortcuts.cpp:201
 msgid "&Global Shortcuts"
 msgstr "&Byrlwybrau Eang"
 
-#: shortcuts.cpp:182
+#: shortcuts.cpp:206
 msgid "Shortcut Se&quences"
 msgstr "Cyf&resi Byrlwybrau"
 
-#: shortcuts.cpp:187
+#: shortcuts.cpp:211
 msgid "App&lication Shortcuts"
 msgstr "Byrlwybrau Cy&mhwysiadau"
 
-#: shortcuts.cpp:248
+#: shortcuts.cpp:272
 msgid "User-Defined Scheme"
 msgstr "Cynllun Addasiedig"
 
-#: shortcuts.cpp:249
+#: shortcuts.cpp:273
 msgid "Current Scheme"
 msgstr "Cynllun Cyfredol"
 
-#: shortcuts.cpp:292
+#: shortcuts.cpp:316
 msgid ""
 "Your current changes will be lost if you load another scheme before saving this "
 "one."
 msgstr ""
 "Collir eich newidiadau cyfredol os lwythwch gynllun arall cyn cadw'r un yma."
 
-#: shortcuts.cpp:312
+#: shortcuts.cpp:336
 msgid ""
 "This scheme requires the \"%1\" modifier key, which is not available on your "
 "keyboard layout. Do you wish to view it anyway?"
@@ -101,19 +106,19 @@ msgstr ""
 "Mae angen y fysell addasu \"%1\" ar y cynllun yma, ac nid yw ar gael ar eich "
 "cynllun bysellfwrdd. A ydych am ei weld beth bynnag?"
 
-#: modifiers.cpp:194 modifiers.cpp:290 shortcuts.cpp:314
+#: modifiers.cpp:195 modifiers.cpp:291 shortcuts.cpp:338
 msgid "Win"
 msgstr "Win"
 
-#: shortcuts.cpp:341 shortcuts.cpp:374
+#: shortcuts.cpp:365 shortcuts.cpp:398
 msgid "Save Key Scheme"
 msgstr "Cadw Cynllun Bysyll"
 
-#: shortcuts.cpp:342
+#: shortcuts.cpp:366
 msgid "Enter a name for the key scheme:"
 msgstr "Rhowch enw i'r cynllun bysyll:"
 
-#: shortcuts.cpp:372
+#: shortcuts.cpp:396
 msgid ""
 "A key scheme with the name '%1' already exists;\n"
 "do you want to overwrite it?\n"
@@ -121,37 +126,31 @@ msgstr ""
 "Mae cynllun bysyll o'r enw '%1' yn bodoli eisioes.\n"
 " A ydych am ysgrifennu drosto?\n"
 
-#: shortcuts.cpp:375
+#: shortcuts.cpp:399
 msgid "Overwrite"
 msgstr "Ysgrifennu Drosto"
 
-#: modifiers.cpp:174
+#: modifiers.cpp:175
 msgid "TDE Modifiers"
 msgstr "Addasyddion TDE"
 
-#: modifiers.cpp:177
+#: modifiers.cpp:178
 msgid "Modifier"
 msgstr "Addasydd"
 
-#: modifiers.cpp:182 modifiers.cpp:235
+#: modifiers.cpp:183 modifiers.cpp:236
 msgid "X11-Mod"
 msgstr "X11-Mod"
 
-#: modifiers.cpp:188 modifiers.cpp:288
-msgid ""
-"_: QAccel\n"
-"Ctrl"
-msgstr "Ctrl"
-
-#: modifiers.cpp:207
+#: modifiers.cpp:208
 msgid "Macintosh keyboard"
 msgstr "Bysellfwrdd Macintosh"
 
-#: modifiers.cpp:212
+#: modifiers.cpp:213
 msgid "MacOS-style modifier usage"
 msgstr "Defnydd addasyddion dull-MacOS"
 
-#: modifiers.cpp:215
+#: modifiers.cpp:216
 msgid ""
 "Checking this box will change your X Modifier Mapping to better reflect the "
 "standard MacOS modifier key usage. It allows you to use <i>Command+C</i> for <i>"
@@ -166,32 +165,32 @@ msgstr ""
 "safonol PC. Defnyddir <b>Command</b> ar gyfer gorchmynion cymhwysiadau  a rhai "
 "terfynell, a <b>Control</b> ar gyfer gorchmynion trefnyddion ffenestri."
 
-#: modifiers.cpp:228
+#: modifiers.cpp:229
 msgid "X Modifier Mapping"
 msgstr "Mapiad Addasyddion X"
 
-#: modifiers.cpp:278 modifiers.cpp:284 treeview.cpp:108
+#: modifiers.cpp:279 modifiers.cpp:285 treeview.cpp:108
 msgid "Command"
 msgstr "Gorchymyn"
 
-#: modifiers.cpp:279 modifiers.cpp:283
+#: modifiers.cpp:280 modifiers.cpp:284
 msgid "Option"
 msgstr "Dewisiad"
 
-#: modifiers.cpp:280 modifiers.cpp:282
+#: modifiers.cpp:281 modifiers.cpp:283
 msgid "Control"
 msgstr "(Rheoli) Control"
 
-#: modifiers.cpp:297
+#: modifiers.cpp:298
 #, c-format
 msgid "Key %1"
 msgstr "Bysell %1"
 
-#: modifiers.cpp:330
+#: modifiers.cpp:331
 msgid "None"
 msgstr "Dim"
 
-#: modifiers.cpp:343
+#: modifiers.cpp:344
 msgid ""
 "You can only activate this option if your X keyboard layout has the 'Super' or "
 "'Meta' keys properly configured as modifier keys."
@@ -335,378 +334,478 @@ msgid "Walk Through Windows (Reverse)"
 msgstr "Cerdded Drwy Ffenestri (Am yn ôl)"
 
 #: ../../twin/twinbindings.cpp:23
+#, fuzzy
+msgid "Walk Through Windows of Same Application"
+msgstr "Cerdded Drwy Ffenestri"
+
+#: ../../twin/twinbindings.cpp:24
+#, fuzzy
+msgid "Walk Through Windows of Same Application (Reverse)"
+msgstr "Cerdded Drwy Ffenestri (Am yn ôl)"
+
+#: ../../twin/twinbindings.cpp:25
 msgid "Walk Through Desktops"
 msgstr "Cerdded Drwy Benbyrddau"
 
-#: ../../twin/twinbindings.cpp:24
+#: ../../twin/twinbindings.cpp:26
 msgid "Walk Through Desktops (Reverse)"
 msgstr "Cerdded Drwy Benbyrddau (Am yn ôl)"
 
-#: ../../twin/twinbindings.cpp:25
+#: ../../twin/twinbindings.cpp:27
 msgid "Walk Through Desktop List"
 msgstr "Cerdded Drwy'r Restr Benbyrddau"
 
-#: ../../twin/twinbindings.cpp:26
+#: ../../twin/twinbindings.cpp:28
 msgid "Walk Through Desktop List (Reverse)"
 msgstr "Cerdded Drwy'r Restr Benbyrddau (Am yn ôl)"
 
-#: ../../twin/twinbindings.cpp:28
+#: ../../twin/twinbindings.cpp:30
 msgid "Windows"
 msgstr "Ffenestri"
 
-#: ../../twin/twinbindings.cpp:29
+#: ../../twin/twinbindings.cpp:31
 msgid "Window Operations Menu"
 msgstr "Dewislen Gweithredoedd Ffenestr"
 
-#: ../../twin/twinbindings.cpp:30
+#: ../../twin/twinbindings.cpp:32
 msgid "Close Window"
 msgstr "Cau'r Ffenestr"
 
-#: ../../twin/twinbindings.cpp:32
+#: ../../twin/twinbindings.cpp:34
 msgid "Maximize Window"
 msgstr "Ehangu'r Ffenestr"
 
-#: ../../twin/twinbindings.cpp:34
+#: ../../twin/twinbindings.cpp:36
 msgid "Maximize Window Vertically"
 msgstr "Ehangu'r Ffenestr yn Fertigol"
 
-#: ../../twin/twinbindings.cpp:36
+#: ../../twin/twinbindings.cpp:38
 msgid "Maximize Window Horizontally"
 msgstr "Ehangu'r Ffenestr yn Llorweddol"
 
-#: ../../twin/twinbindings.cpp:38
+#: ../../twin/twinbindings.cpp:40
 msgid "Minimize Window"
 msgstr "Lleihau'r Ffenestr"
 
-#: ../../twin/twinbindings.cpp:40
+#: ../../twin/twinbindings.cpp:42
 msgid "Shade Window"
 msgstr "Rholio'r Ffenestr"
 
-#: ../../twin/twinbindings.cpp:42
+#: ../../twin/twinbindings.cpp:44
 msgid "Move Window"
 msgstr "Symud y Ffenestr"
 
-#: ../../twin/twinbindings.cpp:44
+#: ../../twin/twinbindings.cpp:46
 msgid "Resize Window"
 msgstr "Newid Maint y Ffenestr"
 
-#: ../../twin/twinbindings.cpp:46
+#: ../../twin/twinbindings.cpp:48
 msgid "Raise Window"
 msgstr "Codi'r Ffenestr"
 
-#: ../../twin/twinbindings.cpp:48
+#: ../../twin/twinbindings.cpp:50
 msgid "Lower Window"
 msgstr "Gostwng y Ffenestr"
 
-#: ../../twin/twinbindings.cpp:50
+#: ../../twin/twinbindings.cpp:52
 msgid "Toggle Window Raise/Lower"
 msgstr "Newid Codi/Gostwng Ffenestr"
 
-#: ../../twin/twinbindings.cpp:51
+#: ../../twin/twinbindings.cpp:53
 msgid "Make Window Fullscreen"
 msgstr "Gwneud i'r Ffenestr Lenwi'r Sgrîn"
 
-#: ../../twin/twinbindings.cpp:53
+#: ../../twin/twinbindings.cpp:55
 msgid "Hide Window Border"
 msgstr "Cuddio Ymyl y Ffenestr"
 
-#: ../../twin/twinbindings.cpp:55
+#: ../../twin/twinbindings.cpp:57
 msgid "Keep Window Above Others"
 msgstr "Cadw'r Ffenestr Dros y Lleill"
 
-#: ../../twin/twinbindings.cpp:57
+#: ../../twin/twinbindings.cpp:59
 msgid "Keep Window Below Others"
 msgstr "Cadw'r Ffenestr Dan y Lleill"
 
-#: ../../twin/twinbindings.cpp:59
+#: ../../twin/twinbindings.cpp:61
 msgid "Activate Window Demanding Attention"
 msgstr "Gweithredu'r Ffenest sy'n Gofyn am Sylw"
 
-#: ../../twin/twinbindings.cpp:60
+#: ../../twin/twinbindings.cpp:62
 msgid "Setup Window Shortcut"
 msgstr ""
 
-#: ../../twin/twinbindings.cpp:61
+#: ../../twin/twinbindings.cpp:63
 msgid "Pack Window to the Right"
 msgstr "Pacio'r Ffenestr i'r Dde"
 
-#: ../../twin/twinbindings.cpp:63
+#: ../../twin/twinbindings.cpp:65
 msgid "Pack Window to the Left"
 msgstr "Pacio'r Ffenestr i'r Chwith"
 
-#: ../../twin/twinbindings.cpp:65
+#: ../../twin/twinbindings.cpp:67
 msgid "Pack Window Up"
 msgstr "Pacio'r Ffenestr i Fyny"
 
-#: ../../twin/twinbindings.cpp:67
+#: ../../twin/twinbindings.cpp:69
 msgid "Pack Window Down"
 msgstr "Pacio'r Ffenestr i Lawr"
 
-#: ../../twin/twinbindings.cpp:69
+#: ../../twin/twinbindings.cpp:71
 msgid "Pack Grow Window Horizontally"
 msgstr "Pacio ac Ehangu'r Ffenestr yn Llorweddol"
 
-#: ../../twin/twinbindings.cpp:71
+#: ../../twin/twinbindings.cpp:73
 msgid "Pack Grow Window Vertically"
 msgstr "Pacio ac Ehangu'r Ffenestr yn Fertigol"
 
-#: ../../twin/twinbindings.cpp:73
+#: ../../twin/twinbindings.cpp:75
 msgid "Pack Shrink Window Horizontally"
 msgstr "Pacio a Lleihau'r Ffenestr yn Llorweddol"
 
-#: ../../twin/twinbindings.cpp:75
+#: ../../twin/twinbindings.cpp:77
 msgid "Pack Shrink Window Vertically"
 msgstr "Pacio a Lleihau'r Ffenestr yn Fertigol"
 
-#: ../../twin/twinbindings.cpp:78
+#: ../../twin/twinbindings.cpp:80
 msgid "Window & Desktop"
 msgstr "Ffenestr a Phenbwrdd"
 
-#: ../../twin/twinbindings.cpp:79
+#: ../../twin/twinbindings.cpp:81
 msgid "Keep Window on All Desktops"
 msgstr "Cadw'r Ffenestr ar Bob Penbwrdd"
 
-#: ../../twin/twinbindings.cpp:81
+#: ../../twin/twinbindings.cpp:83
 msgid "Window to Desktop 1"
 msgstr "Ffenestr i Benbwrdd 1"
 
-#: ../../twin/twinbindings.cpp:82
+#: ../../twin/twinbindings.cpp:84
 msgid "Window to Desktop 2"
 msgstr "Ffenestr i Benbwrdd 2"
 
-#: ../../twin/twinbindings.cpp:83
+#: ../../twin/twinbindings.cpp:85
 msgid "Window to Desktop 3"
 msgstr "Ffenestr i Benbwrdd 3"
 
-#: ../../twin/twinbindings.cpp:84
+#: ../../twin/twinbindings.cpp:86
 msgid "Window to Desktop 4"
 msgstr "Ffenestr i Benbwrdd 4"
 
-#: ../../twin/twinbindings.cpp:85
+#: ../../twin/twinbindings.cpp:87
 msgid "Window to Desktop 5"
 msgstr "Ffenestr i Benbwrdd 5"
 
-#: ../../twin/twinbindings.cpp:86
+#: ../../twin/twinbindings.cpp:88
 msgid "Window to Desktop 6"
 msgstr "Ffenestr i Benbwrdd 6"
 
-#: ../../twin/twinbindings.cpp:87
+#: ../../twin/twinbindings.cpp:89
 msgid "Window to Desktop 7"
 msgstr "Ffenestr i Benbwrdd 7"
 
-#: ../../twin/twinbindings.cpp:88
+#: ../../twin/twinbindings.cpp:90
 msgid "Window to Desktop 8"
 msgstr "Ffenestr i Benbwrdd 8"
 
-#: ../../twin/twinbindings.cpp:89
+#: ../../twin/twinbindings.cpp:91
 msgid "Window to Desktop 9"
 msgstr "Ffenestr i Benbwrdd 9"
 
-#: ../../twin/twinbindings.cpp:90
+#: ../../twin/twinbindings.cpp:92
 msgid "Window to Desktop 10"
 msgstr "Ffenestr i Benbwrdd 10"
 
-#: ../../twin/twinbindings.cpp:91
+#: ../../twin/twinbindings.cpp:93
 msgid "Window to Desktop 11"
 msgstr "Ffenestr i Benbwrdd 11"
 
-#: ../../twin/twinbindings.cpp:92
+#: ../../twin/twinbindings.cpp:94
 msgid "Window to Desktop 12"
 msgstr "Ffenestr i Benbwrdd 12"
 
-#: ../../twin/twinbindings.cpp:93
+#: ../../twin/twinbindings.cpp:95
 msgid "Window to Desktop 13"
 msgstr "Ffenestr i Benbwrdd 13"
 
-#: ../../twin/twinbindings.cpp:94
+#: ../../twin/twinbindings.cpp:96
 msgid "Window to Desktop 14"
 msgstr "Ffenestr i Benbwrdd 14"
 
-#: ../../twin/twinbindings.cpp:95
+#: ../../twin/twinbindings.cpp:97
 msgid "Window to Desktop 15"
 msgstr "Ffenestr i Benbwrdd 15"
 
-#: ../../twin/twinbindings.cpp:96
+#: ../../twin/twinbindings.cpp:98
 msgid "Window to Desktop 16"
 msgstr "Ffenestr i Benbwrdd 16"
 
-#: ../../twin/twinbindings.cpp:97
+#: ../../twin/twinbindings.cpp:99
 #, fuzzy
 msgid "Window to Desktop 17"
 msgstr "Ffenestr i Benbwrdd 7"
 
-#: ../../twin/twinbindings.cpp:98
+#: ../../twin/twinbindings.cpp:100
 #, fuzzy
 msgid "Window to Desktop 18"
 msgstr "Ffenestr i Benbwrdd 8"
 
-#: ../../twin/twinbindings.cpp:99
+#: ../../twin/twinbindings.cpp:101
 #, fuzzy
 msgid "Window to Desktop 19"
 msgstr "Ffenestr i Benbwrdd 9"
 
-#: ../../twin/twinbindings.cpp:100
+#: ../../twin/twinbindings.cpp:102
 #, fuzzy
 msgid "Window to Desktop 20"
 msgstr "Ffenestr i Benbwrdd 2"
 
-#: ../../twin/twinbindings.cpp:101
+#: ../../twin/twinbindings.cpp:103
 msgid "Window to Next Desktop"
 msgstr "Ffenestr i'r Penbwrdd Nesaf"
 
-#: ../../twin/twinbindings.cpp:102
+#: ../../twin/twinbindings.cpp:104
 msgid "Window to Previous Desktop"
 msgstr "Ffenestr i'r Penbwrdd Blaenorol"
 
-#: ../../twin/twinbindings.cpp:103
+#: ../../twin/twinbindings.cpp:105
 #, fuzzy
 msgid "Window One Desktop to the Right"
 msgstr "Newid Un Penbwrdd i'r Dde"
 
-#: ../../twin/twinbindings.cpp:104
+#: ../../twin/twinbindings.cpp:106
 #, fuzzy
 msgid "Window One Desktop to the Left"
 msgstr "Newid Un Penbwrdd i'r Chwith"
 
-#: ../../twin/twinbindings.cpp:105
+#: ../../twin/twinbindings.cpp:107
 #, fuzzy
 msgid "Window One Desktop Up"
 msgstr "Ffenestr a Phenbwrdd"
 
-#: ../../twin/twinbindings.cpp:106
+#: ../../twin/twinbindings.cpp:108
 #, fuzzy
 msgid "Window One Desktop Down"
 msgstr "Newid Un Penbwrdd i Lawr"
 
-#: ../../twin/twinbindings.cpp:108
+#: ../../twin/twinbindings.cpp:109
+#, fuzzy
+msgid "Window to Screen 0"
+msgstr "Llunsgrîn Ffenestr"
+
+#: ../../twin/twinbindings.cpp:110
+#, fuzzy
+msgid "Window to Screen 1"
+msgstr "Llunsgrîn Ffenestr"
+
+#: ../../twin/twinbindings.cpp:111
+#, fuzzy
+msgid "Window to Screen 2"
+msgstr "Llunsgrîn Ffenestr"
+
+#: ../../twin/twinbindings.cpp:112
+#, fuzzy
+msgid "Window to Screen 3"
+msgstr "Llunsgrîn Ffenestr"
+
+#: ../../twin/twinbindings.cpp:113
+#, fuzzy
+msgid "Window to Screen 4"
+msgstr "Llunsgrîn Ffenestr"
+
+#: ../../twin/twinbindings.cpp:114
+#, fuzzy
+msgid "Window to Screen 5"
+msgstr "Llunsgrîn Ffenestr"
+
+#: ../../twin/twinbindings.cpp:115
+#, fuzzy
+msgid "Window to Screen 6"
+msgstr "Llunsgrîn Ffenestr"
+
+#: ../../twin/twinbindings.cpp:116
+#, fuzzy
+msgid "Window to Screen 7"
+msgstr "Llunsgrîn Ffenestr"
+
+#: ../../twin/twinbindings.cpp:117
+#, fuzzy
+msgid "Window to Next Screen"
+msgstr "Ffenestr i'r Penbwrdd Nesaf"
+
+#: ../../twin/twinbindings.cpp:119
 msgid "Desktop Switching"
 msgstr "Newid Penbwrdd"
 
-#: ../../twin/twinbindings.cpp:109
+#: ../../twin/twinbindings.cpp:120
 msgid "Switch to Desktop 1"
 msgstr "Newid i Benbwrdd 1"
 
-#: ../../twin/twinbindings.cpp:110
+#: ../../twin/twinbindings.cpp:121
 msgid "Switch to Desktop 2"
 msgstr "Newid i Benbwrdd 2"
 
-#: ../../twin/twinbindings.cpp:111
+#: ../../twin/twinbindings.cpp:122
 msgid "Switch to Desktop 3"
 msgstr "Newid i Benbwrdd 3"
 
-#: ../../twin/twinbindings.cpp:112
+#: ../../twin/twinbindings.cpp:123
 msgid "Switch to Desktop 4"
 msgstr "Newid i Benbwrdd 4"
 
-#: ../../twin/twinbindings.cpp:113
+#: ../../twin/twinbindings.cpp:124
 msgid "Switch to Desktop 5"
 msgstr "Newid i Benbwrdd 5"
 
-#: ../../twin/twinbindings.cpp:114
+#: ../../twin/twinbindings.cpp:125
 msgid "Switch to Desktop 6"
 msgstr "Newid i Benbwrdd 6"
 
-#: ../../twin/twinbindings.cpp:115
+#: ../../twin/twinbindings.cpp:126
 msgid "Switch to Desktop 7"
 msgstr "Newid i Benbwrdd 7"
 
-#: ../../twin/twinbindings.cpp:116
+#: ../../twin/twinbindings.cpp:127
 msgid "Switch to Desktop 8"
 msgstr "Newid i Benbwrdd 8"
 
-#: ../../twin/twinbindings.cpp:117
+#: ../../twin/twinbindings.cpp:128
 msgid "Switch to Desktop 9"
 msgstr "Newid i Benbwrdd 9"
 
-#: ../../twin/twinbindings.cpp:118
+#: ../../twin/twinbindings.cpp:129
 msgid "Switch to Desktop 10"
 msgstr "Newid i Benbwrdd 10"
 
-#: ../../twin/twinbindings.cpp:119
+#: ../../twin/twinbindings.cpp:130
 msgid "Switch to Desktop 11"
 msgstr "Newid i Benbwrdd 11"
 
-#: ../../twin/twinbindings.cpp:120
+#: ../../twin/twinbindings.cpp:131
 msgid "Switch to Desktop 12"
 msgstr "Newid i Benbwrdd 12"
 
-#: ../../twin/twinbindings.cpp:121
+#: ../../twin/twinbindings.cpp:132
 msgid "Switch to Desktop 13"
 msgstr "Newid i Benbwrdd 13"
 
-#: ../../twin/twinbindings.cpp:122
+#: ../../twin/twinbindings.cpp:133
 msgid "Switch to Desktop 14"
 msgstr "Newid i Benbwrdd 14"
 
-#: ../../twin/twinbindings.cpp:123
+#: ../../twin/twinbindings.cpp:134
 msgid "Switch to Desktop 15"
 msgstr "Newid i Benbwrdd 15"
 
-#: ../../twin/twinbindings.cpp:124
+#: ../../twin/twinbindings.cpp:135
 msgid "Switch to Desktop 16"
 msgstr "Newid i Benbwrdd 16"
 
-#: ../../twin/twinbindings.cpp:125
+#: ../../twin/twinbindings.cpp:136
 #, fuzzy
 msgid "Switch to Desktop 17"
 msgstr "Newid i Benbwrdd 7"
 
-#: ../../twin/twinbindings.cpp:126
+#: ../../twin/twinbindings.cpp:137
 #, fuzzy
 msgid "Switch to Desktop 18"
 msgstr "Newid i Benbwrdd 8"
 
-#: ../../twin/twinbindings.cpp:127
+#: ../../twin/twinbindings.cpp:138
 #, fuzzy
 msgid "Switch to Desktop 19"
 msgstr "Newid i Benbwrdd 9"
 
-#: ../../twin/twinbindings.cpp:128
+#: ../../twin/twinbindings.cpp:139
 #, fuzzy
 msgid "Switch to Desktop 20"
 msgstr "Newid i Benbwrdd 2"
 
-#: ../../twin/twinbindings.cpp:129
+#: ../../twin/twinbindings.cpp:140
 msgid "Switch to Next Desktop"
 msgstr "Newid i'r Penbwrdd Nesaf"
 
-#: ../../twin/twinbindings.cpp:130
+#: ../../twin/twinbindings.cpp:141
 msgid "Switch to Previous Desktop"
 msgstr "Newid i'r Penbwrdd Blaenorol"
 
-#: ../../twin/twinbindings.cpp:131
+#: ../../twin/twinbindings.cpp:142
 msgid "Switch One Desktop to the Right"
 msgstr "Newid Un Penbwrdd i'r Dde"
 
-#: ../../twin/twinbindings.cpp:132
+#: ../../twin/twinbindings.cpp:143
 msgid "Switch One Desktop to the Left"
 msgstr "Newid Un Penbwrdd i'r Chwith"
 
-#: ../../twin/twinbindings.cpp:133
+#: ../../twin/twinbindings.cpp:144
 msgid "Switch One Desktop Up"
 msgstr "Newid Un Penbwrdd i Fyny "
 
-#: ../../twin/twinbindings.cpp:134
+#: ../../twin/twinbindings.cpp:145
 msgid "Switch One Desktop Down"
 msgstr "Newid Un Penbwrdd i Lawr"
 
-#: ../../twin/twinbindings.cpp:137
+#: ../../twin/twinbindings.cpp:146
+#, fuzzy
+msgid "Switch to Screen 0"
+msgstr "Newid i Benbwrdd 10"
+
+#: ../../twin/twinbindings.cpp:147
+#, fuzzy
+msgid "Switch to Screen 1"
+msgstr "Newid i Benbwrdd 1"
+
+#: ../../twin/twinbindings.cpp:148
+#, fuzzy
+msgid "Switch to Screen 2"
+msgstr "Newid i Benbwrdd 2"
+
+#: ../../twin/twinbindings.cpp:149
+#, fuzzy
+msgid "Switch to Screen 3"
+msgstr "Newid i Benbwrdd 3"
+
+#: ../../twin/twinbindings.cpp:150
+#, fuzzy
+msgid "Switch to Screen 4"
+msgstr "Newid i Benbwrdd 4"
+
+#: ../../twin/twinbindings.cpp:151
+#, fuzzy
+msgid "Switch to Screen 5"
+msgstr "Newid i Benbwrdd 5"
+
+#: ../../twin/twinbindings.cpp:152
+#, fuzzy
+msgid "Switch to Screen 6"
+msgstr "Newid i Benbwrdd 6"
+
+#: ../../twin/twinbindings.cpp:153
+#, fuzzy
+msgid "Switch to Screen 7"
+msgstr "Newid i Benbwrdd 7"
+
+#: ../../twin/twinbindings.cpp:154
+#, fuzzy
+msgid "Switch to Next Screen"
+msgstr "Newid i'r Penbwrdd Nesaf"
+
+#: ../../twin/twinbindings.cpp:157
 msgid "Mouse Emulation"
 msgstr "Efelychiad Llygoden"
 
-#: ../../twin/twinbindings.cpp:138
+#: ../../twin/twinbindings.cpp:158
 msgid "Kill Window"
 msgstr "Lladd Ffenestr"
 
-#: ../../twin/twinbindings.cpp:139
+#: ../../twin/twinbindings.cpp:159
 msgid "Window Screenshot"
 msgstr "Llunsgrîn Ffenestr"
 
-#: ../../twin/twinbindings.cpp:140
+#: ../../twin/twinbindings.cpp:160
 msgid "Desktop Screenshot"
 msgstr "Llunsgrîn Benbwrdd"
 
-#: ../../twin/twinbindings.cpp:145
+#: ../../twin/twinbindings.cpp:165
 #, fuzzy
 msgid "Block Global Shortcuts"
 msgstr "&Byrlwybrau Eang"
@@ -755,20 +854,29 @@ msgstr ""
 msgid "Lock Session"
 msgstr "Cloi Sesiwn"
 
-#: ../../kdesktop/kdesktopbindings.cpp:37
+#: ../../kdesktop/kdesktopbindings.cpp:32
+#, fuzzy
+msgid "Lock Session (Hotkey)"
+msgstr "Cloi Sesiwn"
+
+#: ../../kdesktop/kdesktopbindings.cpp:38
+msgid "Start Screen Saver"
+msgstr ""
+
+#: ../../kdesktop/kdesktopbindings.cpp:44
 msgid "Log Out"
 msgstr "Allgofnodi"
 
-#: ../../kdesktop/kdesktopbindings.cpp:38
+#: ../../kdesktop/kdesktopbindings.cpp:45
 #, fuzzy
 msgid "Log Out Without Confirmation"
 msgstr "Allgofnodi heb Gadarnhâd"
 
-#: ../../kdesktop/kdesktopbindings.cpp:39
+#: ../../kdesktop/kdesktopbindings.cpp:46
 msgid "Halt without Confirmation"
 msgstr "Stopio'r Cyfrifiadur heb Gadarnhâd"
 
-#: ../../kdesktop/kdesktopbindings.cpp:40
+#: ../../kdesktop/kdesktopbindings.cpp:47
 msgid "Reboot without Confirmation"
 msgstr "Ailgychwyn y Cyfrifiadur heb Gadarnhâd"
 
@@ -796,6 +904,11 @@ msgstr "Bysellfwrdd"
 msgid "Switch to Next Keyboard Layout"
 msgstr "Newid i'r Cynllun Bysellfwrdd Nesaf"
 
+#~ msgid ""
+#~ "_: QAccel\n"
+#~ "Ctrl"
+#~ msgstr "Ctrl"
+
 #~ msgid "Save key scheme"
 #~ msgstr "Cadw cynllun bysyll"
 
diff --git a/tde-i18n-cy/messages/tdebase/kcmkicker.po b/tde-i18n-cy/messages/tdebase/kcmkicker.po
index f9bc3f1f684..e2c8a7fb4b7 100644
--- a/tde-i18n-cy/messages/tdebase/kcmkicker.po
+++ b/tde-i18n-cy/messages/tdebase/kcmkicker.po
@@ -10,10 +10,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmkicker\n"
-"POT-Creation-Date: 2008-07-08 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-07-03 07:22+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -115,21 +116,21 @@ msgstr ""
 msgid "Main Panel"
 msgstr "Prif Banel"
 
-#. i18n: file hidingtab.ui line 371
-#: hidingtab_impl.cpp:216 rc.cpp:197
+#. i18n: file hidingtab.ui line 385
+#: hidingtab_impl.cpp:222 rc.cpp:224
 #, no-c-format
 msgid "Show left panel-hiding bu&tton"
 msgstr "Dangos bo&twm chwith cuddio'r panel"
 
-#: hidingtab_impl.cpp:217
+#: hidingtab_impl.cpp:223
 msgid "Show right panel-hiding bu&tton"
 msgstr "Dangos y bo&twm cuddio panel dde"
 
-#: hidingtab_impl.cpp:221
+#: hidingtab_impl.cpp:227
 msgid "Show top panel-hiding bu&tton"
 msgstr "Dangos y bo&twm cuddio panel ar y pen"
 
-#: hidingtab_impl.cpp:222
+#: hidingtab_impl.cpp:228
 msgid "Show bottom panel-hiding bu&tton"
 msgstr "Dangos y bo&twm cuddio panel gwaelod"
 
@@ -149,11 +150,11 @@ msgstr ""
 "%1\n"
 "%2"
 
-#: lookandfeeltab_kcm.cpp:36 main.cpp:346
+#: lookandfeeltab_kcm.cpp:36 main.cpp:358
 msgid "kcmkicker"
 msgstr "kcmkicker"
 
-#: lookandfeeltab_kcm.cpp:36 main.cpp:347
+#: lookandfeeltab_kcm.cpp:36 main.cpp:359
 msgid "TDE Panel Control Module"
 msgstr "Modiwl Rheoli Paneli TDE"
 
@@ -165,7 +166,7 @@ msgstr ""
 "(h) 1999 - 2001 Matthias Elter\n"
 "(h) 2002 Aaron J. Seigo"
 
-#: lookandfeeltab_kcm.cpp:86 main.cpp:333
+#: lookandfeeltab_kcm.cpp:86 main.cpp:345
 msgid ""
 "<h1>Panel</h1> Here you can configure the TDE panel (also referred to as "
 "'kicker'). This includes options like the position and size of the panel, as "
@@ -183,19 +184,21 @@ msgstr ""
 "ddewislen gyd-destun ar glic botwm dde'r lygoden. Cynniga'r ddewislen "
 "gyd-destun hefyd modd trin botymau a rhaglennigion y panel."
 
-#: main.cpp:349
+#: main.cpp:361
+#, fuzzy
 msgid ""
+"(c) 2009 - 2010 Timothy Pearson\n"
 "(c) 1999 - 2001 Matthias Elter\n"
 "(c) 2002 - 2003 Aaron J. Seigo"
 msgstr ""
 "(h) 1999 - 2001 Matthias Elter\n"
 "(h) 2002 - 2003 Aaron J. Seigo"
 
-#: menutab_impl.cpp:99
+#: menutab_impl.cpp:129
 msgid "Quick Browser"
 msgstr "Porwr Cyflym"
 
-#: menutab_impl.cpp:177
+#: menutab_impl.cpp:311
 msgid ""
 "The TDE menu editor (kmenuedit) could not be launched.\n"
 "Perhaps it is not installed or not in your path."
@@ -203,7 +206,7 @@ msgstr ""
 "Nid oedd modd cychwyn y golygydd dewislenni TDE (kmenuedit).\n"
 " Efallai nad yw'n osodedig neu nid yw yn eich llwybr."
 
-#: menutab_impl.cpp:179
+#: menutab_impl.cpp:313
 msgid "Application Missing"
 msgstr "Cymhwysiad ar Goll"
 
@@ -260,7 +263,7 @@ msgid "All Screens"
 msgstr "Pob Sgrîn"
 
 #. i18n: file positiontab.ui line 412
-#: positiontab_impl.cpp:535 rc.cpp:528
+#: positiontab_impl.cpp:535 rc.cpp:618
 #, no-c-format
 msgid "Custom"
 msgstr "Addasiedig"
@@ -287,7 +290,7 @@ msgstr ""
 "Diffinia'r gosodiad yma pa mor fawr yw'r botymau cuddio os ydynt i'w gweld."
 
 #. i18n: file advancedOptions.ui line 52
-#: rc.cpp:12 rc.cpp:534
+#: rc.cpp:12 rc.cpp:624
 #, no-c-format
 msgid " pixels"
 msgstr "picseli"
@@ -428,80 +431,126 @@ msgid ""
 "option to make it transparent anyways."
 msgstr ""
 
-#. i18n: file applettab.ui line 24
+#. i18n: file advancedOptions.ui line 304
 #: rc.cpp:86
 #, no-c-format
+msgid "Blur the background when transparency is enabled"
+msgstr ""
+
+#. i18n: file advancedOptions.ui line 307
+#: rc.cpp:89
+#, no-c-format
+msgid ""
+"When checked, the displayed semi-transparent background image will be blurred "
+"to reduce eyestrain"
+msgstr ""
+
+#. i18n: file advancedOptions.ui line 317
+#: rc.cpp:92
+#, no-c-format
+msgid "Texture"
+msgstr ""
+
+#. i18n: file advancedOptions.ui line 328
+#: rc.cpp:95
+#, no-c-format
+msgid "Show resize handle on panels"
+msgstr ""
+
+#. i18n: file advancedOptions.ui line 331
+#: rc.cpp:98
+#, no-c-format
+msgid ""
+"Enabling this option will show a resize handle on the resizable end of each "
+"panel."
+msgstr ""
+
+#. i18n: file advancedOptions.ui line 339
+#: rc.cpp:101
+#, no-c-format
+msgid "Use deep buttons"
+msgstr ""
+
+#. i18n: file advancedOptions.ui line 342
+#: rc.cpp:104
+#, no-c-format
+msgid "Enabling this option will yield more highly textured panels."
+msgstr ""
+
+#. i18n: file applettab.ui line 24
+#: rc.cpp:107
+#, no-c-format
 msgid "Security Level"
 msgstr "Lefel Ddiogelwch"
 
 #. i18n: file applettab.ui line 35
-#: rc.cpp:89
+#: rc.cpp:110
 #, no-c-format
 msgid "Load only trusted applets internal"
 msgstr "Llwytho dim ond rhaglennigion mewnol ymddiriedadwy"
 
 #. i18n: file applettab.ui line 43
-#: rc.cpp:92
+#: rc.cpp:113
 #, no-c-format
 msgid "Load startup config applets internal"
 msgstr "Llwytho rhaglennigion ffurfweddu cychwynnol mewnol"
 
 #. i18n: file applettab.ui line 51
-#: rc.cpp:95
+#: rc.cpp:116
 #, no-c-format
 msgid "Load all applets internal"
 msgstr "Llwytho pob rhaglennig mewnol"
 
 #. i18n: file applettab.ui line 67
-#: rc.cpp:98
+#: rc.cpp:119
 #, no-c-format
 msgid "List of Trusted Applets"
 msgstr "Rhestr o Raglennigion Ymddiriedadwy"
 
 #. i18n: file applettab.ui line 84
-#: rc.cpp:101
+#: rc.cpp:122
 #, no-c-format
 msgid "Available Applets"
 msgstr "Rhaglennigion Ar Gael"
 
 #. i18n: file applettab.ui line 133
-#: rc.cpp:104
+#: rc.cpp:125
 #, no-c-format
 msgid ">>"
 msgstr ">>"
 
 #. i18n: file applettab.ui line 172
-#: rc.cpp:107
+#: rc.cpp:128
 #, no-c-format
 msgid "<<"
 msgstr "<<"
 
 #. i18n: file applettab.ui line 197
-#: rc.cpp:110
+#: rc.cpp:131
 #, no-c-format
 msgid "Trusted Applets"
 msgstr "Rhaglennigion Ymddiriedir Ynddynt"
 
 #. i18n: file hidingtab.ui line 44
-#: rc.cpp:113 rc.cpp:467
+#: rc.cpp:134 rc.cpp:557
 #, no-c-format
 msgid "S&ettings for:"
 msgstr "G&osodiadau ar gyfer:"
 
 #. i18n: file hidingtab.ui line 79
-#: rc.cpp:116
+#: rc.cpp:137
 #, no-c-format
 msgid "Hide Mode"
 msgstr "Modd Guddio"
 
 #. i18n: file hidingtab.ui line 107
-#: rc.cpp:119
+#: rc.cpp:140
 #, no-c-format
 msgid "On&ly hide when a panel-hiding button is clicked"
 msgstr "Cuddio pan glicir botwm cuddio'r panel yn unig"
 
 #. i18n: file hidingtab.ui line 113
-#: rc.cpp:122
+#: rc.cpp:143
 #, no-c-format
 msgid ""
 "If this option is selected, the only way to hide the panel will be to click on "
@@ -511,19 +560,19 @@ msgstr ""
 "yr unig modd o guddio'r panel."
 
 #. i18n: file hidingtab.ui line 138
-#: rc.cpp:125
+#: rc.cpp:146
 #, no-c-format
 msgid " sec"
 msgstr "eil"
 
 #. i18n: file hidingtab.ui line 141
-#: rc.cpp:128
+#: rc.cpp:149
 #, no-c-format
 msgid "Immediately"
 msgstr "Ar Unwaith"
 
 #. i18n: file hidingtab.ui line 144
-#: rc.cpp:131 rc.cpp:137
+#: rc.cpp:152 rc.cpp:158
 #, no-c-format
 msgid ""
 "Here you can change the delay after which the panel will disappear if not used."
@@ -531,19 +580,19 @@ msgstr ""
 "Yma gallwch newid hyd yr oedi cyn i'r panel ddiflannu os na'i ddefnyddir."
 
 #. i18n: file hidingtab.ui line 163
-#: rc.cpp:134
+#: rc.cpp:155
 #, no-c-format
 msgid "after the &cursor leaves the panel"
 msgstr "wedi i'r &cyrchydd adael y panel"
 
 #. i18n: file hidingtab.ui line 199
-#: rc.cpp:140
+#: rc.cpp:161
 #, no-c-format
 msgid "Allow other &windows to cover the panel"
 msgstr "Caniatáu i &ffenestri eraill orchuddio'r panel"
 
 #. i18n: file hidingtab.ui line 202
-#: rc.cpp:143
+#: rc.cpp:164
 #, no-c-format
 msgid ""
 "If this option is selected, the panel will allow itself to be covered by other "
@@ -553,13 +602,13 @@ msgstr ""
 "orchuddio."
 
 #. i18n: file hidingtab.ui line 213
-#: rc.cpp:146
+#: rc.cpp:167
 #, no-c-format
 msgid "Hide a&utomatically"
 msgstr "Cuddio'n &ymysgogol"
 
 #. i18n: file hidingtab.ui line 216
-#: rc.cpp:149
+#: rc.cpp:170
 #, no-c-format
 msgid ""
 "If this option is selected, the panel will automatically hide after a period of "
@@ -572,13 +621,13 @@ msgstr ""
 "arbennig o ddefnyddiol ar gydraniadau sgrîn bach, megis cluniaduron."
 
 #. i18n: file hidingtab.ui line 235
-#: rc.cpp:152
+#: rc.cpp:173
 #, no-c-format
 msgid "&Raise when the pointer touches the screen's:"
 msgstr "&Codi pan gyffyrdda'r pwyntydd â rhan yma'r sgrîn:"
 
 #. i18n: file hidingtab.ui line 238
-#: rc.cpp:155
+#: rc.cpp:176
 #, no-c-format
 msgid ""
 "When this option is selected, moving the pointer to the specified edge of the "
@@ -589,55 +638,55 @@ msgstr ""
 "achosi i'r panel ymddangos uwchlaw unrhyw ffenestri sydd yn ei orchuddio."
 
 #. i18n: file hidingtab.ui line 244
-#: rc.cpp:158
+#: rc.cpp:179
 #, no-c-format
 msgid "Top Left Corner"
 msgstr "Cornel Pen-Chwith"
 
 #. i18n: file hidingtab.ui line 249
-#: rc.cpp:161
+#: rc.cpp:182
 #, no-c-format
 msgid "Top Edge"
 msgstr "Ymyl Uchaf"
 
 #. i18n: file hidingtab.ui line 254
-#: rc.cpp:164
+#: rc.cpp:185
 #, no-c-format
 msgid "Top Right Corner"
 msgstr "Cornel Pen-Dde"
 
 #. i18n: file hidingtab.ui line 259
-#: rc.cpp:167
+#: rc.cpp:188
 #, no-c-format
 msgid "Right Edge"
 msgstr "Ymyl Dde"
 
 #. i18n: file hidingtab.ui line 264
-#: rc.cpp:170
+#: rc.cpp:191
 #, no-c-format
 msgid "Bottom Right Corner"
 msgstr "Cornel Gwaelod-Dde"
 
 #. i18n: file hidingtab.ui line 269
-#: rc.cpp:173
+#: rc.cpp:194
 #, no-c-format
 msgid "Bottom Edge"
 msgstr "Ymyl Waelod"
 
 #. i18n: file hidingtab.ui line 274
-#: rc.cpp:176
+#: rc.cpp:197
 #, no-c-format
 msgid "Bottom Left Corner"
 msgstr "Cornel Gwaelod-Chwith"
 
 #. i18n: file hidingtab.ui line 279
-#: rc.cpp:179
+#: rc.cpp:200
 #, no-c-format
 msgid "Left Edge"
 msgstr "Ymyl Chwith"
 
 #. i18n: file hidingtab.ui line 289
-#: rc.cpp:182
+#: rc.cpp:203
 #, no-c-format
 msgid ""
 "Here you can set the location on the screen's edge that will bring the panel to "
@@ -646,13 +695,28 @@ msgstr ""
 "Yma gallwch osod y lleoliad ar ymyl y sgrîn fydd yn dod a'r panel i'r blaen."
 
 #. i18n: file hidingtab.ui line 319
-#: rc.cpp:185
+#: rc.cpp:206
+#, no-c-format
+msgid "&Hide panel when configured screen is not available"
+msgstr ""
+
+#. i18n: file hidingtab.ui line 322
+#: rc.cpp:209
+#, no-c-format
+msgid ""
+"When this option is selected, this panel will be hidden if its Xinerama screen "
+"is not available.  This panel will be automatically restored when the "
+"configured Xinerama screen is reenabked."
+msgstr ""
+
+#. i18n: file hidingtab.ui line 333
+#: rc.cpp:212
 #, no-c-format
 msgid "Show panel when switching &desktops"
 msgstr "Dangos panel pan yn newid penbwrdd"
 
-#. i18n: file hidingtab.ui line 322
-#: rc.cpp:188
+#. i18n: file hidingtab.ui line 336
+#: rc.cpp:215
 #, no-c-format
 msgid ""
 "If this option is enabled, the panel will automatically show itself for a brief "
@@ -662,14 +726,14 @@ msgstr ""
 "Os yw'r dewisiad yma'n alluog, fe ddengys y panel ei hun am amser byr pan "
 "newidir y penbwrdd fel y gallwch weld ar pa benbwrdd yr ydych."
 
-#. i18n: file hidingtab.ui line 357
-#: rc.cpp:191
+#. i18n: file hidingtab.ui line 371
+#: rc.cpp:218
 #, no-c-format
 msgid "Panel-Hiding Buttons"
 msgstr "Botymau Cuddio'r Panel"
 
-#. i18n: file hidingtab.ui line 360
-#: rc.cpp:194
+#. i18n: file hidingtab.ui line 374
+#: rc.cpp:221
 #, no-c-format
 msgid ""
 "This option controls the panel-hiding buttons, which are buttons with a small "
@@ -680,8 +744,8 @@ msgstr ""
 "bennau'r panel. Gallwch roi botwm ar un pen neu'r llall, neu ar y ddau ben. "
 "Bydd clicio ar un o'r botymau yma'n cuddio'r panel."
 
-#. i18n: file hidingtab.ui line 377
-#: rc.cpp:200
+#. i18n: file hidingtab.ui line 391
+#: rc.cpp:227
 #, no-c-format
 msgid ""
 "When this option is selected, a panel-hiding button appears on the left end of "
@@ -690,14 +754,14 @@ msgstr ""
 "Pan ddewisir y dewisiad yma, ymddengys botwm cuddio'r panel ar ben chwith y "
 "panel."
 
-#. i18n: file hidingtab.ui line 385
-#: rc.cpp:203
+#. i18n: file hidingtab.ui line 399
+#: rc.cpp:230
 #, no-c-format
 msgid "Show right panel-hiding &button"
 msgstr "Dangos &botwm dde cuddio'r panel"
 
-#. i18n: file hidingtab.ui line 391
-#: rc.cpp:206
+#. i18n: file hidingtab.ui line 405
+#: rc.cpp:233
 #, no-c-format
 msgid ""
 "When this option is selected, a panel-hiding button appears on the right end of "
@@ -705,20 +769,20 @@ msgid ""
 msgstr ""
 "Pan ddewisir y dewisiad yma, ymddengys botwm cuddio'r panel ar ben dde y panel."
 
-#. i18n: file hidingtab.ui line 426
-#: rc.cpp:209
+#. i18n: file hidingtab.ui line 440
+#: rc.cpp:236
 #, no-c-format
 msgid "Panel Animation"
 msgstr "Bywlunio'r Panel"
 
-#. i18n: file hidingtab.ui line 454
-#: rc.cpp:212
+#. i18n: file hidingtab.ui line 468
+#: rc.cpp:239
 #, no-c-format
 msgid "A&nimate panel hiding"
 msgstr "Bywlu&nio cuddio'r panel"
 
-#. i18n: file hidingtab.ui line 457
-#: rc.cpp:215
+#. i18n: file hidingtab.ui line 471
+#: rc.cpp:242
 #, no-c-format
 msgid ""
 "When this option is selected the panel will \"slide\" off the screen when "
@@ -727,32 +791,32 @@ msgstr ""
 "Pan ddewisir y dewisiad yma, fe \"lithra\"'r panel o'r sgrîn pan yn cuddio. "
 "Rheolir cyflymder y bywlunio gan y llithrydd yn union isod."
 
-#. i18n: file hidingtab.ui line 522
-#: rc.cpp:218
+#. i18n: file hidingtab.ui line 536
+#: rc.cpp:245
 #, no-c-format
 msgid "Determines how quickly the panel hides if hiding animation is enabled."
 msgstr "Penna pa mor gyflym y cuddia'r panel os yw bywlunio cuddio'n alluog."
 
-#. i18n: file hidingtab.ui line 558
-#: rc.cpp:221
+#. i18n: file hidingtab.ui line 572
+#: rc.cpp:248
 #, no-c-format
 msgid "Fast"
 msgstr "Cyflym"
 
-#. i18n: file hidingtab.ui line 599
-#: rc.cpp:224
+#. i18n: file hidingtab.ui line 613
+#: rc.cpp:251
 #, no-c-format
 msgid "Medium"
 msgstr "Canolig"
 
-#. i18n: file hidingtab.ui line 623
-#: rc.cpp:227
+#. i18n: file hidingtab.ui line 637
+#: rc.cpp:254
 #, no-c-format
 msgid "Slow"
 msgstr "Araf"
 
 #. i18n: file lookandfeeltab.ui line 16
-#: rc.cpp:230
+#: rc.cpp:257
 #, no-c-format
 msgid ""
 "If this option is selected, informational tooltips will appear when the mouse "
@@ -762,19 +826,19 @@ msgstr ""
 "llygoden yn symud dros yr eiconau, botymau, a'r rhaglennigion yn y panel."
 
 #. i18n: file lookandfeeltab.ui line 30
-#: rc.cpp:233
+#: rc.cpp:260
 #, no-c-format
 msgid "General"
 msgstr "Cyffredinol"
 
 #. i18n: file lookandfeeltab.ui line 41
-#: rc.cpp:236
+#: rc.cpp:263
 #, fuzzy, no-c-format
 msgid "Enable icon &mouseover effects"
 msgstr "Galluogi &chwyddo eiconau"
 
 #. i18n: file lookandfeeltab.ui line 44
-#: rc.cpp:239
+#: rc.cpp:266
 #, fuzzy, no-c-format
 msgid ""
 "When this option is selected a mouseover effect appears when the mouse cursor "
@@ -784,13 +848,29 @@ msgstr ""
 "llygoden drostynt."
 
 #. i18n: file lookandfeeltab.ui line 52
-#: rc.cpp:242
+#: rc.cpp:269
+#, fuzzy, no-c-format
+msgid "Enable icon activation effects"
+msgstr "Galluogi &chwyddo eiconau"
+
+#. i18n: file lookandfeeltab.ui line 55
+#: rc.cpp:272
+#, fuzzy, no-c-format
+msgid ""
+"When this option is selected an activation effect appears when panel buttons "
+"are left clicked."
+msgstr ""
+"Pan ddewisir y dewisiad yma, chwyddir eiconau'r botymau pan symuda'r cyrchydd "
+"llygoden drostynt."
+
+#. i18n: file lookandfeeltab.ui line 63
+#: rc.cpp:275
 #, no-c-format
 msgid "Show too&ltips"
 msgstr "Dangos c&ynghorion offer"
 
-#. i18n: file lookandfeeltab.ui line 55
-#: rc.cpp:245
+#. i18n: file lookandfeeltab.ui line 66
+#: rc.cpp:278
 #, no-c-format
 msgid ""
 "When this option is selected informational tooltips will appear when the mouse "
@@ -800,44 +880,44 @@ msgstr ""
 "cyrchydd llygoden yn symud dros yr eiconau, botymau, a'r rhaglennigion yn y "
 "panel."
 
-#. i18n: file lookandfeeltab.ui line 65
-#: rc.cpp:248
+#. i18n: file lookandfeeltab.ui line 76
+#: rc.cpp:281
 #, no-c-format
 msgid "Button Backgrounds"
 msgstr "Cefndir Botymau"
 
-#. i18n: file lookandfeeltab.ui line 76
-#: rc.cpp:251
+#. i18n: file lookandfeeltab.ui line 87
+#: rc.cpp:284
 #, no-c-format
 msgid "&TDE menu:"
 msgstr "Y ddewislen &K:"
 
-#. i18n: file lookandfeeltab.ui line 82
-#: rc.cpp:254 rc.cpp:278
+#. i18n: file lookandfeeltab.ui line 93
+#: rc.cpp:287 rc.cpp:311
 #, no-c-format
 msgid "Choose a tile image for the TDE menu."
 msgstr "Dewiswch ddelwedd deil i'r ddewislen K."
 
-#. i18n: file lookandfeeltab.ui line 90
-#: rc.cpp:257
+#. i18n: file lookandfeeltab.ui line 101
+#: rc.cpp:290
 #, no-c-format
 msgid "&QuickBrowser menus:"
 msgstr "Dewislenni Porwr&Cyflym:"
 
-#. i18n: file lookandfeeltab.ui line 96
-#: rc.cpp:260 rc.cpp:269
+#. i18n: file lookandfeeltab.ui line 107
+#: rc.cpp:293 rc.cpp:302
 #, no-c-format
 msgid "Choose a tile image for Quick Browser buttons."
 msgstr "Dewiswch ddelwedd deil i fotymau PorwrCyflym."
 
-#. i18n: file lookandfeeltab.ui line 107
-#: rc.cpp:266 rc.cpp:275 rc.cpp:290 rc.cpp:308 rc.cpp:335
+#. i18n: file lookandfeeltab.ui line 118
+#: rc.cpp:299 rc.cpp:308 rc.cpp:323 rc.cpp:341 rc.cpp:368
 #, no-c-format
 msgid "Custom Color"
 msgstr "Lliw Addasiedig"
 
-#. i18n: file lookandfeeltab.ui line 165
-#: rc.cpp:281
+#. i18n: file lookandfeeltab.ui line 176
+#: rc.cpp:314
 #, no-c-format
 msgid ""
 "When the Custom Color option is selected, use this button to pick a color for "
@@ -846,8 +926,8 @@ msgstr ""
 "Pan ddewisir y dewisiad Lliw Addasiedig, defnyddiwch y botwm yma i ddewis lliw "
 "ar gyfer cefndiroedd teil porydd cyflym."
 
-#. i18n: file lookandfeeltab.ui line 176
-#: rc.cpp:284
+#. i18n: file lookandfeeltab.ui line 187
+#: rc.cpp:317
 #, no-c-format
 msgid ""
 "When the Custom Color option is selected, use this button to pick a color for "
@@ -856,14 +936,14 @@ msgstr ""
 "Pan dewisir y dewisiad Lliw Addasiedig, defnyddiwch y botwm yma i ddewis lliw "
 "ar gyfer cefndir teil y ddewislen K."
 
-#. i18n: file lookandfeeltab.ui line 205
-#: rc.cpp:293 rc.cpp:302
+#. i18n: file lookandfeeltab.ui line 216
+#: rc.cpp:326 rc.cpp:335
 #, no-c-format
 msgid "Choose a tile image for window list buttons."
 msgstr "Dewiswch ddelwedd deil i fotymau'r restr ffenestri."
 
-#. i18n: file lookandfeeltab.ui line 216
-#: rc.cpp:296
+#. i18n: file lookandfeeltab.ui line 227
+#: rc.cpp:329
 #, no-c-format
 msgid ""
 "When the Custom Color option is selected, use this button to pick a color for "
@@ -872,20 +952,20 @@ msgstr ""
 "Pan ddewisir y dewisiad Lliw Addasiedig, defnyddiwch y botwm yma i ddewis lliw "
 "ar gyfer cefndiroedd teil rhestr ffenestri."
 
-#. i18n: file lookandfeeltab.ui line 224
-#: rc.cpp:299
+#. i18n: file lookandfeeltab.ui line 235
+#: rc.cpp:332
 #, no-c-format
 msgid "&Window list:"
 msgstr "Rhestr &Ffenestri:"
 
-#. i18n: file lookandfeeltab.ui line 259
-#: rc.cpp:311 rc.cpp:320
+#. i18n: file lookandfeeltab.ui line 270
+#: rc.cpp:344 rc.cpp:353
 #, no-c-format
 msgid "Choose a tile image for desktop access buttons."
 msgstr "Dewiswch ddelwedd deil ar gyfer botymau cyrchu penbwrdd."
 
-#. i18n: file lookandfeeltab.ui line 270
-#: rc.cpp:314
+#. i18n: file lookandfeeltab.ui line 281
+#: rc.cpp:347
 #, no-c-format
 msgid ""
 "When the Custom Color option is selected, use this button to pick a color for "
@@ -894,14 +974,14 @@ msgstr ""
 "Pan ddewisir y dewisiad Lliw Addasiedig, defnyddiwch y botwm yma i ddewis lliw "
 "ar gyfer cefndir y teil penbwrdd."
 
-#. i18n: file lookandfeeltab.ui line 278
-#: rc.cpp:317
+#. i18n: file lookandfeeltab.ui line 289
+#: rc.cpp:350
 #, no-c-format
 msgid "De&sktop access:"
 msgstr "Cyrchu Pe&nbwrdd:"
 
-#. i18n: file lookandfeeltab.ui line 295
-#: rc.cpp:323
+#. i18n: file lookandfeeltab.ui line 306
+#: rc.cpp:356
 #, no-c-format
 msgid ""
 "When the Custom Color option is selected, use this button to pick a color for "
@@ -910,32 +990,32 @@ msgstr ""
 "Pan ddewisir y dewisiad Lliw Addasiedig, defnyddiwch y botwm yma i ddewis lliw "
 "ar gyfer cefndiroedd teil cymhwysiadau."
 
-#. i18n: file lookandfeeltab.ui line 303
-#: rc.cpp:326
+#. i18n: file lookandfeeltab.ui line 314
+#: rc.cpp:359
 #, no-c-format
 msgid "Applicatio&ns:"
 msgstr "Cy&mhwysiadau:"
 
-#. i18n: file lookandfeeltab.ui line 309
-#: rc.cpp:329 rc.cpp:338
+#. i18n: file lookandfeeltab.ui line 320
+#: rc.cpp:362 rc.cpp:371
 #, no-c-format
 msgid "Choose a tile image for buttons that launch applications."
 msgstr "Dewiswch ddelwedd deil i fotymau sy'n cychwyn cymhwysiadau."
 
-#. i18n: file lookandfeeltab.ui line 365
-#: rc.cpp:341
+#. i18n: file lookandfeeltab.ui line 376
+#: rc.cpp:374
 #, no-c-format
 msgid "Panel Background"
 msgstr "Cefndir y Panel"
 
-#. i18n: file lookandfeeltab.ui line 396
-#: rc.cpp:344
+#. i18n: file lookandfeeltab.ui line 407
+#: rc.cpp:377
 #, no-c-format
 msgid "Colorize to &match the desktop color scheme"
 msgstr "Lliwio i gydweddu cynllun lliw y pe&nbwrdd."
 
-#. i18n: file lookandfeeltab.ui line 402
-#: rc.cpp:347
+#. i18n: file lookandfeeltab.ui line 413
+#: rc.cpp:380
 #, no-c-format
 msgid ""
 "If this option is selected, the panel background image will be colored to match "
@@ -945,14 +1025,14 @@ msgstr ""
 "Os dewisir y dewisiad yma, lliwir delwedd gefndir y panel i gydweddu'r lliwiau "
 "rhagosod.  I newid y lliwiau rhagosod, ewch i'r modiwl rheoli 'Lliwiau'."
 
-#. i18n: file lookandfeeltab.ui line 449
-#: rc.cpp:350
+#. i18n: file lookandfeeltab.ui line 460
+#: rc.cpp:383
 #, no-c-format
 msgid "This is a preview for the selected background image."
 msgstr "Dyma ragolwg o'r delwedd gefndir dewisiedig."
 
-#. i18n: file lookandfeeltab.ui line 469
-#: rc.cpp:353
+#. i18n: file lookandfeeltab.ui line 480
+#: rc.cpp:386
 #, no-c-format
 msgid ""
 "Here you can choose a theme to be displayed by the panel. Press the 'Browse' "
@@ -963,26 +1043,26 @@ msgstr ""
 "ddewis thema drwy'r ymgom ffeil.\n"
 "Dim ond os y dewisir 'Galluogi delwedd gefndir' y mae'r dewis yma'n weithredol."
 
-#. i18n: file lookandfeeltab.ui line 477
-#: rc.cpp:357
+#. i18n: file lookandfeeltab.ui line 488
+#: rc.cpp:390
 #, no-c-format
 msgid "Enable &background image"
 msgstr "Galluogi delwedd &gefndir"
 
-#. i18n: file lookandfeeltab.ui line 485
-#: rc.cpp:360
+#. i18n: file lookandfeeltab.ui line 496
+#: rc.cpp:393
 #, no-c-format
 msgid "Enable &transparency"
 msgstr "Galluogi &tryloywder"
 
-#. i18n: file lookandfeeltab.ui line 503
-#: rc.cpp:363
+#. i18n: file lookandfeeltab.ui line 514
+#: rc.cpp:396
 #, no-c-format
 msgid "Advanc&ed Options"
 msgstr "Dewisi&adau Uwch"
 
-#. i18n: file lookandfeeltab.ui line 506
-#: rc.cpp:366
+#. i18n: file lookandfeeltab.ui line 517
+#: rc.cpp:399
 #, no-c-format
 msgid ""
 "Click here to open the Advanced Options dialog. You can configure the applet "
@@ -991,32 +1071,50 @@ msgstr ""
 "Cliciwch yma i agor yr ymgom Dewisiadau Uwch.  Gallwch ffurfweddu golwg a "
 "theimlad y dolenni rhaglennig, lliw y trylowyder arlliwio, a rhagor."
 
-#. i18n: file menutab.ui line 27
-#: rc.cpp:369
+#. i18n: file menutab.ui line 35
+#: rc.cpp:402
+#, fuzzy, no-c-format
+msgid "TDE menu style:"
+msgstr "Y ddewislen &K:"
+
+#. i18n: file menutab.ui line 44
+#: rc.cpp:405
+#, no-c-format
+msgid "Kickoff"
+msgstr ""
+
+#. i18n: file menutab.ui line 49
+#: rc.cpp:408
+#, no-c-format
+msgid "Trinity Classic"
+msgstr ""
+
+#. i18n: file menutab.ui line 80
+#: rc.cpp:411
 #, no-c-format
 msgid "TDE Menu"
 msgstr "Y Ddewislen K"
 
-#. i18n: file menutab.ui line 49
-#: rc.cpp:372
+#. i18n: file menutab.ui line 102
+#: rc.cpp:414
 #, no-c-format
 msgid "Menu item format:"
 msgstr "Fformat eitemau dewislenni:"
 
-#. i18n: file menutab.ui line 55
-#: rc.cpp:375
+#. i18n: file menutab.ui line 108
+#: rc.cpp:417
 #, no-c-format
 msgid "Here you can choose how menu entries are shown."
 msgstr "Yma gallwch ddewis sut y ddangosir cofnodion y ddewislen."
 
-#. i18n: file menutab.ui line 66
-#: rc.cpp:378
+#. i18n: file menutab.ui line 119
+#: rc.cpp:420
 #, no-c-format
 msgid "&Name only"
 msgstr "&Enw'n unig"
 
-#. i18n: file menutab.ui line 69
-#: rc.cpp:381
+#. i18n: file menutab.ui line 122
+#: rc.cpp:423
 #, no-c-format
 msgid ""
 "When this option is selected, items in the TDE Menu will appear with the "
@@ -1025,14 +1123,14 @@ msgstr ""
 "Pan ddewisir y dewisiad yma, ymddengys enw'r cymhwysiad wrth ochr yr eicon yn y "
 "gofnod yn y ddewislen K."
 
-#. i18n: file menutab.ui line 77
-#: rc.cpp:384
+#. i18n: file menutab.ui line 130
+#: rc.cpp:426
 #, fuzzy, no-c-format
 msgid "Name - &Description"
 msgstr "Enw (&Disgrifiad)"
 
-#. i18n: file menutab.ui line 83
-#: rc.cpp:387
+#. i18n: file menutab.ui line 136
+#: rc.cpp:429
 #, fuzzy, no-c-format
 msgid ""
 "When this option is selected, items in the TDE Menu will appear with the "
@@ -1041,14 +1139,14 @@ msgstr ""
 "Pan ddewisir y dewisiad yma, ymddengys enw'r cymhwysiad a disgrifiad byr mewn "
 "cromfachau wrth ochr yr eicon yn y gofnod yn y ddewislen K."
 
-#. i18n: file menutab.ui line 91
-#: rc.cpp:390
+#. i18n: file menutab.ui line 144
+#: rc.cpp:432
 #, fuzzy, no-c-format
 msgid "D&escription only"
 msgstr "Dis&grifiad (Enw)"
 
-#. i18n: file menutab.ui line 94
-#: rc.cpp:393
+#. i18n: file menutab.ui line 147
+#: rc.cpp:435
 #, fuzzy, no-c-format
 msgid ""
 "When this option is selected, items in the TDE Menu will appear with the "
@@ -1057,14 +1155,14 @@ msgstr ""
 "Pan ddewisir y dewisiad yma, ymddengys enw'r cymhwysiad wrth ochr yr eicon yn y "
 "gofnod yn y ddewislen K."
 
-#. i18n: file menutab.ui line 105
-#: rc.cpp:396
+#. i18n: file menutab.ui line 158
+#: rc.cpp:438
 #, no-c-format
 msgid "Des&cription (Name)"
 msgstr "Dis&grifiad (Enw)"
 
-#. i18n: file menutab.ui line 108
-#: rc.cpp:399
+#. i18n: file menutab.ui line 161
+#: rc.cpp:441
 #, no-c-format
 msgid ""
 "When this option is selected, items in the TDE Menu will appear with a brief "
@@ -1073,20 +1171,87 @@ msgstr ""
 "Pan ddewisir y dewisiad yma, ymddengys disgrifiad byr ac enw'r cymhwysiad mewn "
 "cromfachau wrth ochr yr eicon yn y gofnod yn y ddewislen K."
 
-#. i18n: file menutab.ui line 118
-#: rc.cpp:402
+#. i18n: file menutab.ui line 171
+#: rc.cpp:444
+#, no-c-format
+msgid "Edit &TDE Menu"
+msgstr "Golygu'r Ddewislen &K"
+
+#. i18n: file menutab.ui line 174
+#: rc.cpp:447
+#, fuzzy, no-c-format
+msgid ""
+"Start the editor for the TDE Menu. Here you can add, edit, remove and hide "
+"applications."
+msgstr ""
+"Cychwyn y golygydd am y ddewislen K.  Yma gallwch ychwanegu, golygu, gwaredu a "
+"cuddio cymhwysiadau."
+
+#. i18n: file menutab.ui line 182
+#: rc.cpp:450
+#, no-c-format
+msgid "Change menu icon"
+msgstr ""
+
+#. i18n: file menutab.ui line 185
+#: rc.cpp:453
+#, fuzzy, no-c-format
+msgid "Allows you to choose a different icon for the TDE menu."
+msgstr "Dewiswch ddelwedd deil i'r ddewislen K."
+
+#. i18n: file menutab.ui line 213
+#: rc.cpp:456
+#, fuzzy, no-c-format
+msgid "Optional Menus"
+msgstr "Is-ddewislenni Dewisol"
+
+#. i18n: file menutab.ui line 243
+#: rc.cpp:459
+#, no-c-format
+msgid ""
+"This is a list of the dynamic menus that can be displayed in the TDE menu in "
+"addition to the normal applications. Use the checkboxes to add or remove menus."
+msgstr ""
+"Rhestr o'r dewislenni byw y gellir eu dangos yn y ddewislen TDE, ynghŷd â'r "
+"cymhwysiadau arferol. Defnyddiwch y blychau brith i ychwanegu neu waredu "
+"dewislenni."
+
+#. i18n: file menutab.ui line 256
+#: rc.cpp:462
+#, no-c-format
+msgid "Open menu on mouse hover"
+msgstr ""
+
+#. i18n: file menutab.ui line 264
+#: rc.cpp:465
+#, fuzzy, no-c-format
+msgid "Show T&ooltip"
+msgstr "Dangos c&ynghorion offer"
+
+#. i18n: file menutab.ui line 270
+#: rc.cpp:468
+#, no-c-format
+msgid ""
+"<qt>When this option is selected, a tooltip appears when hovering the mouse "
+"pointer over Application Launcher Menu items. Enabling this option also "
+"requires that tooltips are enabled in the Panels->Appearance configuration "
+"dialog."
+msgstr ""
+
+#. i18n: file menutab.ui line 278
+#: rc.cpp:471
 #, no-c-format
 msgid "Show side ima&ge"
 msgstr "Dangos delwe&dd ochr."
 
-#. i18n: file menutab.ui line 126
-#: rc.cpp:405
+#. i18n: file menutab.ui line 286
+#: rc.cpp:474
 #, fuzzy, no-c-format
 msgid ""
 "<qt>When this option is selected an image will appear down the left-hand side "
 "of the TDE Menu. The image will be tinted according to your color settings.\n"
-"                                    \n"
-"                                    "
+"\t\t\t\t\t\t\t\t\n"
+"\t\t\t\t\t\t\t\t"
 "<p><b>Tip</b>: You can customize the image that appears in the TDE Menu by "
 "putting an image file called kside.png and a tileable image file called "
 "kside_tile.png in $TDEHOME/share/apps/kicker/pics.</qt>"
@@ -1099,53 +1264,48 @@ msgstr ""
 "drwy roi ffeil delwedd o'r enw kside.png a ffeil delwedd deiladwy o'r enw "
 "kside_tile.png yn $TDEHOME/share/apps/kicker/pics.</qt>"
 
-#. i18n: file menutab.ui line 151
-#: rc.cpp:410
+#. i18n: file menutab.ui line 294
+#: rc.cpp:479
 #, no-c-format
-msgid "Edit &TDE Menu"
-msgstr "Golygu'r Ddewislen &K"
+msgid "Display text in menu button"
+msgstr ""
 
-#. i18n: file menutab.ui line 154
-#: rc.cpp:413
-#, no-c-format
+#. i18n: file menutab.ui line 300
+#: rc.cpp:482
+#, fuzzy, no-c-format
 msgid ""
-"Start the editor for the TDE menu. Here you can add, edit, remove and hide "
-"applications."
+"<qt>When this option is selected the text below will be shown in the TDE Menu "
+"button."
 msgstr ""
-"Cychwyn y golygydd am y ddewislen K.  Yma gallwch ychwanegu, golygu, gwaredu a "
-"cuddio cymhwysiadau."
+"Pan ddewisir y dewisiad yma, ymddengys enw'r cymhwysiad wrth ochr yr eicon yn y "
+"gofnod yn y ddewislen K."
 
-#. i18n: file menutab.ui line 162
-#: rc.cpp:416
-#, fuzzy, no-c-format
-msgid "Optional Menus"
-msgstr "Is-ddewislenni Dewisol"
+#. i18n: file menutab.ui line 323
+#: rc.cpp:485
+#, no-c-format
+msgid "Text:"
+msgstr ""
 
-#. i18n: file menutab.ui line 192
-#: rc.cpp:419
+#. i18n: file menutab.ui line 347
+#: rc.cpp:488
 #, no-c-format
-msgid ""
-"This is a list of the dynamic menus that can be displayed in the TDE menu in "
-"addition to the normal applications. Use the checkboxes to add or remove menus."
+msgid "Font:"
 msgstr ""
-"Rhestr o'r dewislenni byw y gellir eu dangos yn y ddewislen TDE, ynghŷd â'r "
-"cymhwysiadau arferol. Defnyddiwch y blychau brith i ychwanegu neu waredu "
-"dewislenni."
 
-#. i18n: file menutab.ui line 202
-#: rc.cpp:422
+#. i18n: file menutab.ui line 406
+#: rc.cpp:491
 #, no-c-format
 msgid "QuickBrowser Menus"
 msgstr "Dewislenni PorwrCyflym"
 
-#. i18n: file menutab.ui line 221
-#: rc.cpp:425
+#. i18n: file menutab.ui line 425
+#: rc.cpp:494 rc.cpp:512
 #, no-c-format
 msgid "Ma&ximum number of entries:"
 msgstr "&Uchafswm nifer cofnodion:"
 
-#. i18n: file menutab.ui line 227
-#: rc.cpp:428 rc.cpp:431
+#. i18n: file menutab.ui line 431
+#: rc.cpp:497 rc.cpp:500
 #, no-c-format
 msgid ""
 "When browsing directories that contain a lot of files, the QuickBrowser can "
@@ -1157,14 +1317,14 @@ msgstr ""
 "weithiau guddio'ch penbwrdd cyfan. Yma gallwch gyfyngu'r nifer o gofnodion a "
 "ddengys ar y tro. Mae hwn yn ddefnyddiol iawn ar gyfer cydraniadau sgrîn isel."
 
-#. i18n: file menutab.ui line 254
-#: rc.cpp:434
+#. i18n: file menutab.ui line 458
+#: rc.cpp:503
 #, no-c-format
 msgid "Show hidden fi&les"
 msgstr "Dangos ffeilia&u cudd"
 
-#. i18n: file menutab.ui line 260
-#: rc.cpp:437
+#. i18n: file menutab.ui line 464
+#: rc.cpp:506
 #, no-c-format
 msgid ""
 "If this option is enabled, hidden files (i.e. files beginning with a dot) will "
@@ -1173,20 +1333,34 @@ msgstr ""
 "Os yw'r dewisiad yma'n alluog, dengys ffeiliau cudd (h.y. ffeiliau'n dechrau â "
 "dot) yn y dewislenni PorwrCyflym."
 
-#. i18n: file menutab.ui line 287
-#: rc.cpp:440
+#. i18n: file menutab.ui line 491
+#: rc.cpp:509
+#, no-c-format
+msgid "Recent Documents Menu"
+msgstr ""
+
+#. i18n: file menutab.ui line 516
+#: rc.cpp:515 rc.cpp:518
+#, no-c-format
+msgid ""
+"This sets the maximum number of recently accessed documents stored for fast "
+"retrieval."
+msgstr ""
+
+#. i18n: file menutab.ui line 562
+#: rc.cpp:521
 #, no-c-format
 msgid "QuickStart Menu Items"
 msgstr "Eitemau'r Ddewislen DdechrauCyflym"
 
-#. i18n: file menutab.ui line 306
-#: rc.cpp:443
+#. i18n: file menutab.ui line 581
+#: rc.cpp:524
 #, no-c-format
 msgid "Maxim&um number of entries:"
 msgstr "Uchafs&wm nifer cofnodion:"
 
-#. i18n: file menutab.ui line 312
-#: rc.cpp:446
+#. i18n: file menutab.ui line 587
+#: rc.cpp:527
 #, no-c-format
 msgid ""
 "This option allows you to define the maximum number of applications that should "
@@ -1195,8 +1369,8 @@ msgstr ""
 "Galluoga'r dewisiad hwn i chi ddiffinio uchafswm nifer y cymhwysiadau y dylid "
 "eu dangos ar arwyneb y ddewislen DdechrauCyflym."
 
-#. i18n: file menutab.ui line 329
-#: rc.cpp:449
+#. i18n: file menutab.ui line 604
+#: rc.cpp:530
 #, no-c-format
 msgid ""
 "This option allows you to define how many applications should be displayed at "
@@ -1205,14 +1379,14 @@ msgstr ""
 "Galluoga'r dewisiad hwn i chi ddiffinio sawl cymhwysiad y dylid eu dangos ar y "
 "tro, ar arwyneb y ddewislen DdechrauCyflym."
 
-#. i18n: file menutab.ui line 339
-#: rc.cpp:452
+#. i18n: file menutab.ui line 614
+#: rc.cpp:533
 #, no-c-format
 msgid "Show the &applications most recently used"
 msgstr "Dangos y &cymhwysiadau ddefnyddwyd ddiweddaraf"
 
-#. i18n: file menutab.ui line 345
-#: rc.cpp:455
+#. i18n: file menutab.ui line 620
+#: rc.cpp:536
 #, no-c-format
 msgid ""
 "When this option is selected the QuickStart menu area will be filled with the "
@@ -1221,14 +1395,14 @@ msgstr ""
 "Pan ddewisir y dewisiad yma, llenwir arwyneb y ddewislen DdechrauCyflym â'r "
 "cymhwysiadau a ddefnyddioch ddiweddaraf."
 
-#. i18n: file menutab.ui line 353
-#: rc.cpp:458
+#. i18n: file menutab.ui line 628
+#: rc.cpp:539
 #, no-c-format
 msgid "Show the applications most fre&quently used"
 msgstr "Dangos y cymhwysiadau &ddefnyddir fwyaf"
 
-#. i18n: file menutab.ui line 356
-#: rc.cpp:461
+#. i18n: file menutab.ui line 631
+#: rc.cpp:542
 #, no-c-format
 msgid ""
 "When this option is selected the QuickStart menu area will be filled with the "
@@ -1237,8 +1411,30 @@ msgstr ""
 "Pan ddewisir y dewisiad yma, llenwir arwyneb y ddewislen DdechrauCyflym â'r "
 "cymhwysiadau rydych yn eu defnyddio fwyaf."
 
+#. i18n: file menutab.ui line 658
+#: rc.cpp:545
+#, fuzzy, no-c-format
+msgid "TDE Menu Search"
+msgstr "Y Ddewislen K"
+
+#. i18n: file menutab.ui line 669
+#: rc.cpp:548
+#, no-c-format
+msgid "Show search field in TDE Menu"
+msgstr ""
+
+#. i18n: file menutab.ui line 675
+#: rc.cpp:551
+#, fuzzy, no-c-format
+msgid ""
+"<qt>When this option is selected a text-based search field will appear in the "
+"TDE Menu.</qt>"
+msgstr ""
+"Pan ddewisir y dewisiad yma, ymddengys botwm cuddio'r panel ar ben chwith y "
+"panel."
+
 #. i18n: file positiontab.ui line 17
-#: rc.cpp:464
+#: rc.cpp:554
 #, no-c-format
 msgid ""
 "This is a list of all the panels currently active on your desktop. Select one "
@@ -1247,13 +1443,13 @@ msgstr ""
 "Dyma restr holl baneli gweithredol eich penbwrdd. Dewiswch un i'w ffurfweddu."
 
 #. i18n: file positiontab.ui line 83
-#: rc.cpp:470
+#: rc.cpp:560
 #, no-c-format
 msgid "Screen"
 msgstr "Sgrîn"
 
 #. i18n: file positiontab.ui line 139
-#: rc.cpp:473
+#: rc.cpp:563
 #, no-c-format
 msgid ""
 "This preview image shows how the panel will appear on your screen with the "
@@ -1267,25 +1463,25 @@ msgstr ""
 "dimensiynau'r panel."
 
 #. i18n: file positiontab.ui line 191
-#: rc.cpp:476
+#: rc.cpp:566
 #, no-c-format
 msgid "Identify"
 msgstr "Dynodi"
 
 #. i18n: file positiontab.ui line 194
-#: rc.cpp:479
+#: rc.cpp:569
 #, no-c-format
 msgid "This button displays each monitor's identifying number"
 msgstr "Dengys y botwm yma rif dynodi bob monitor"
 
 #. i18n: file positiontab.ui line 212
-#: rc.cpp:482
+#: rc.cpp:572
 #, no-c-format
 msgid "&Xinerama screen:"
 msgstr "&Sgrîn Xinerama:"
 
 #. i18n: file positiontab.ui line 223
-#: rc.cpp:485
+#: rc.cpp:575
 #, no-c-format
 msgid ""
 "This menu selects which screen the Panel will be displayed on in a "
@@ -1294,13 +1490,13 @@ msgstr ""
 "Dewisa'r ddewislen hon ar ba sgrîn y dengys y Panel ar gysawd aml-fonitor"
 
 #. i18n: file positiontab.ui line 260
-#: rc.cpp:488
+#: rc.cpp:578
 #, no-c-format
 msgid "Len&gth"
 msgstr "&Hyd"
 
 #. i18n: file positiontab.ui line 264
-#: rc.cpp:491
+#: rc.cpp:581
 #, no-c-format
 msgid ""
 "This group of settings determines how the panel is aligned, including\n"
@@ -1310,7 +1506,7 @@ msgstr ""
 " sut y'i lleolir ar y sgrîn a faint o'r sgrîn y dylai ddefnyddio."
 
 #. i18n: file positiontab.ui line 312
-#: rc.cpp:495
+#: rc.cpp:585
 #, no-c-format
 msgid ""
 "This slider defines how much of the screen's edge will be occupied by the "
@@ -1318,13 +1514,13 @@ msgid ""
 msgstr "Penna'r llithrydd yma faint o ochr y sgrîn y cymera'r panel."
 
 #. i18n: file positiontab.ui line 329
-#: rc.cpp:498
+#: rc.cpp:588
 #, no-c-format
 msgid "%"
 msgstr "%"
 
 #. i18n: file positiontab.ui line 332
-#: rc.cpp:501
+#: rc.cpp:591
 #, no-c-format
 msgid ""
 "This spinbox defines how much of the screen's edge will be occupied by the "
@@ -1332,13 +1528,13 @@ msgid ""
 msgstr "Diffinia'r blwch troelli yma faint o ochr y sgrîn y cymera'r panel."
 
 #. i18n: file positiontab.ui line 342
-#: rc.cpp:504
+#: rc.cpp:594
 #, no-c-format
 msgid "&Expand as required to fit contents"
 msgstr "&Chwyddo faint sydd angen i ffitio'r cynnwys"
 
 #. i18n: file positiontab.ui line 345
-#: rc.cpp:507
+#: rc.cpp:597
 #, no-c-format
 msgid ""
 "When this option is selected, the panel will grow as necessary to accommodate "
@@ -1348,63 +1544,63 @@ msgstr ""
 "rhaglennigion arno."
 
 #. i18n: file positiontab.ui line 380
-#: rc.cpp:510
+#: rc.cpp:600
 #, no-c-format
 msgid "Si&ze"
 msgstr "Main&t"
 
 #. i18n: file positiontab.ui line 383
-#: rc.cpp:513
+#: rc.cpp:603
 #, no-c-format
 msgid "This sets the size of the panel."
 msgstr ""
 
 #. i18n: file positiontab.ui line 392
-#: rc.cpp:516
+#: rc.cpp:606
 #, no-c-format
 msgid "Tiny"
 msgstr "Pitw"
 
 #. i18n: file positiontab.ui line 397
-#: rc.cpp:519
+#: rc.cpp:609
 #, no-c-format
 msgid "Small"
 msgstr "Bach"
 
 #. i18n: file positiontab.ui line 402
-#: rc.cpp:522
+#: rc.cpp:612
 #, no-c-format
 msgid "Normal"
 msgstr "Arferol"
 
 #. i18n: file positiontab.ui line 407
-#: rc.cpp:525
+#: rc.cpp:615
 #, no-c-format
 msgid "Large"
 msgstr "Mawr"
 
 #. i18n: file positiontab.ui line 484
-#: rc.cpp:531
+#: rc.cpp:621
 #, no-c-format
 msgid "This slider defines the panel size when the Custom option is selected."
 msgstr ""
 "Penna'r llithrydd yma faint y panel pan ddewisir y dewisiad Addasiedig."
 
 #. i18n: file positiontab.ui line 507
-#: rc.cpp:537
+#: rc.cpp:627
 #, no-c-format
 msgid "This spinbox defines the panel size when the Custom option is selected."
 msgstr ""
 "Penna'r blwch troelli yma faint y panel pan ddewisir y dewisiad Addasiedig."
 
 #. i18n: file positiontab.ui line 519
-#: rc.cpp:540
+#: rc.cpp:630
 #, no-c-format
 msgid "Position"
 msgstr "Lleoliad"
 
 #. i18n: file positiontab.ui line 525
-#: rc.cpp:543
+#: rc.cpp:633
 #, no-c-format
 msgid ""
 "Here you can set the position of the panel highlighted on the left side. You "
@@ -1417,142 +1613,143 @@ msgstr ""
 "sgrîn.  Gallwch hefyd ei roi i mewn i ganol neu i mewn i bob cornel y sgrîn."
 
 #. i18n: file positiontab.ui line 609
-#: rc.cpp:546
+#: rc.cpp:636
 #, no-c-format
 msgid "Alt+1"
 msgstr "Alt+1"
 
 #. i18n: file positiontab.ui line 643
-#: rc.cpp:549
+#: rc.cpp:639
 #, no-c-format
 msgid "Alt+2"
 msgstr "Alt+2"
 
 #. i18n: file positiontab.ui line 677
-#: rc.cpp:552
+#: rc.cpp:642
 #, no-c-format
 msgid "Alt+3"
 msgstr "Alt+3"
 
 #. i18n: file positiontab.ui line 721
-#: rc.cpp:555
+#: rc.cpp:645
 #, no-c-format
 msgid "Alt+="
 msgstr "Alt+="
 
 #. i18n: file positiontab.ui line 755
-#: rc.cpp:558
+#: rc.cpp:648
 #, no-c-format
 msgid "Alt+-"
 msgstr "Alt+-"
 
 #. i18n: file positiontab.ui line 789
-#: rc.cpp:561
+#: rc.cpp:651
 #, no-c-format
 msgid "Alt+0"
 msgstr "Alt+0"
 
 #. i18n: file positiontab.ui line 833
-#: rc.cpp:564
+#: rc.cpp:654
 #, no-c-format
 msgid "Alt+9"
 msgstr "Alt+9"
 
 #. i18n: file positiontab.ui line 867
-#: rc.cpp:567
+#: rc.cpp:657
 #, no-c-format
 msgid "Alt+8"
 msgstr "Alt+8"
 
 #. i18n: file positiontab.ui line 901
-#: rc.cpp:570
+#: rc.cpp:660
 #, no-c-format
 msgid "Alt+7"
 msgstr "Alt+7"
 
 #. i18n: file positiontab.ui line 945
-#: rc.cpp:573
+#: rc.cpp:663
 #, no-c-format
 msgid "Alt+4"
 msgstr "Alt+4"
 
 #. i18n: file positiontab.ui line 979
-#: rc.cpp:576
+#: rc.cpp:666
 #, no-c-format
 msgid "Alt+5"
 msgstr "Alt+5"
 
 #. i18n: file positiontab.ui line 1013
-#: rc.cpp:579
+#: rc.cpp:669
 #, no-c-format
 msgid "Alt+6"
 msgstr "Alt+6"
 
-#: rc.cpp:580
-msgid "TDE Button"
+#: rc.cpp:670
+#, fuzzy
+msgid "KDE Button"
 msgstr "Botwm TDE"
 
-#: rc.cpp:581
+#: rc.cpp:671
 msgid "Blue Wood"
 msgstr "Pren Glas"
 
-#: rc.cpp:582
+#: rc.cpp:672
 msgid "Green Wood"
 msgstr "Pren Gwyrdd"
 
-#: rc.cpp:583
+#: rc.cpp:673
 msgid "Light Gray"
 msgstr "Llwyd Golau"
 
-#: rc.cpp:584
+#: rc.cpp:674
 msgid "Light Green"
 msgstr "Gwyrdd Golau"
 
-#: rc.cpp:585
+#: rc.cpp:675
 msgid "Light Pastel"
 msgstr "Pastel Golau"
 
-#: rc.cpp:586
+#: rc.cpp:676
 msgid "Light Purple"
 msgstr "Porffor Golau"
 
-#: rc.cpp:587
+#: rc.cpp:677
 msgid "Nuts And Bolts"
 msgstr "Nytiau a Bolltiau"
 
-#: rc.cpp:588
+#: rc.cpp:678
 msgid "Red Wood"
 msgstr "Pren Coch"
 
-#: rc.cpp:589
+#: rc.cpp:679
 msgid "Solid Blue"
 msgstr "Glas Solet"
 
-#: rc.cpp:590
+#: rc.cpp:680
 msgid "Solid Gray"
 msgstr "Llwyd Solet"
 
-#: rc.cpp:591
+#: rc.cpp:681
 msgid "Solid Green"
 msgstr "Gwyrdd Solet"
 
-#: rc.cpp:592
+#: rc.cpp:682
 msgid "Solid Orange"
 msgstr "Oren Solet"
 
-#: rc.cpp:593
+#: rc.cpp:683
 msgid "Solid Pastel"
 msgstr "Pastel Solet"
 
-#: rc.cpp:594
+#: rc.cpp:684
 msgid "Solid Purple"
 msgstr "Porffor Solet"
 
-#: rc.cpp:595
+#: rc.cpp:685
 msgid "Solid Red"
 msgstr "Coch Solet"
 
-#: rc.cpp:596
+#: rc.cpp:686
 msgid "Solid Tigereye"
 msgstr "Llygad-teigr Solet"
 
diff --git a/tde-i18n-cy/messages/tdebase/kcmkonq.po b/tde-i18n-cy/messages/tdebase/kcmkonq.po
index d719bc85c54..ea10e4df5ed 100644
--- a/tde-i18n-cy/messages/tdebase/kcmkonq.po
+++ b/tde-i18n-cy/messages/tdebase/kcmkonq.po
@@ -10,10 +10,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmkonq\n"
-"POT-Creation-Date: 2008-06-08 01:37+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-07-03 17:50+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -62,22 +63,36 @@ msgstr ""
 "pob trosglwyddiad mewn ffenestr ar wahân."
 
 #: behaviour.cpp:85
+msgid "Show archived &files as folders"
+msgstr ""
+
+#: behaviour.cpp:88
+#, fuzzy
+msgid ""
+"Checking this option will list archived files as folders when using tree view."
+msgstr ""
+"Bydd britho'r dewisiad yma yn gadael i ffeiliau eu ailenwi gan glicio yn "
+"uniongyrchol ar enw'r eicon."
+
+#: behaviour.cpp:94
 msgid "Show file &tips"
 msgstr "Dangos &cynghorion ffeil"
 
-#: behaviour.cpp:88
+#: behaviour.cpp:97
+#, fuzzy
 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"
+"small popup window with additional information about that file.This feature "
+"requires 'Enable tooltips' in KControl, Appearance & Themes, Style."
 msgstr ""
 "Yma gallwch reoli os, pan yn symud y lygoden uwchlaw ffeil, rydych am weld "
 "naidlen fach â gwybodaeth ychwanegol am y ffeil yna."
 
-#: behaviour.cpp:108
+#: behaviour.cpp:118
 msgid "Show &previews in file tips"
 msgstr "Dangos &rhagolygon mewn cynghorion ffeil"
 
-#: behaviour.cpp:111
+#: behaviour.cpp:121
 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."
@@ -85,11 +100,11 @@ msgstr ""
 "Yma gallwch reoli os ydych am i'r naidlen gynnwys rhagolwg mwy i'r ffeil, pan "
 "yn symud y lygoden drosti."
 
-#: behaviour.cpp:114
+#: behaviour.cpp:124
 msgid "Rename icons in&line"
 msgstr "&Ailenwi eiconau mewnlinell  "
 
-#: behaviour.cpp:115
+#: behaviour.cpp:125
 msgid ""
 "Checking this option will allow files to be renamed by clicking directly on the "
 "icon name. "
@@ -97,15 +112,15 @@ msgstr ""
 "Bydd britho'r dewisiad yma yn gadael i ffeiliau eu ailenwi gan glicio yn "
 "uniongyrchol ar enw'r eicon."
 
-#: behaviour.cpp:121
+#: behaviour.cpp:131
 msgid "Home &URL:"
 msgstr "URL &Gartref:"
 
-#: behaviour.cpp:126
+#: behaviour.cpp:136
 msgid "Select Home Folder"
 msgstr "Dewis Plygwll Cartref"
 
-#: behaviour.cpp:131
+#: behaviour.cpp:141
 msgid ""
 "This is the URL (e.g. a folder or a web page) where Konqueror will jump to when "
 "the \"Home\" button is pressed. This is usually your home folder, symbolized by "
@@ -115,12 +130,12 @@ msgstr ""
 "botwm \"Cartref\". Eich plygell gartref, wedi'i symbylu gan 'dilde' (~), yw hon "
 "gan amlaf."
 
-#: behaviour.cpp:139
+#: behaviour.cpp:149
 #, fuzzy
 msgid "Show 'Delete' context me&nu entries which bypass the trashcan"
 msgstr "Dangos cofnodion &dewislen 'Dileu' sy'n osgoi'r bin sbwriel"
 
-#: behaviour.cpp:143
+#: behaviour.cpp:153
 #, fuzzy
 msgid ""
 "Check this if you want 'Delete' menu commands to be displayed on the desktop "
@@ -130,11 +145,11 @@ msgstr ""
 "Dadfritho hyn os na hoffech gorchmynion dewislen 'Dileu' i'w dangos ar y "
 "penbwrdd ac yn newislenni y trefnydd ffeiliau neu ddewislenni cyd-destun."
 
-#: behaviour.cpp:148
+#: behaviour.cpp:158
 msgid "Ask Confirmation For"
 msgstr "Gofyn Cadarnhad am"
 
-#: behaviour.cpp:150
+#: behaviour.cpp:160
 msgid ""
 "This option tells Konqueror whether to ask for a confirmation when you "
 "\"delete\" a file. "
@@ -150,11 +165,11 @@ msgstr ""
 "gellir ei adfer yn hawdd iawn.</li> "
 "<li><em>Dileu:</em> dilëir y ffeil.</li> </ul>"
 
-#: behaviour.cpp:159
+#: behaviour.cpp:169
 msgid "&Move to trash"
 msgstr "&Symud i'r sbwriel"
 
-#: behaviour.cpp:161
+#: behaviour.cpp:171
 msgid "D&elete"
 msgstr "Dil&eu"
 
@@ -220,11 +235,11 @@ msgstr "Penbwrdd %1"
 msgid "Sound Files"
 msgstr "Ffeiliau Sain"
 
-#: desktopbehavior_impl.cpp:136
+#: desktopbehavior_impl.cpp:137
 msgid "&Left button:"
 msgstr "Botwm &Chwith"
 
-#: desktopbehavior_impl.cpp:137
+#: desktopbehavior_impl.cpp:138
 msgid ""
 "You can choose what happens when you click the left button of your pointing "
 "device on the desktop:"
@@ -232,11 +247,11 @@ msgstr ""
 "Gallwch ddewis beth ddigwydda pan gliciwch botwm chwith eich dyfais bwyntio ar "
 "y penbwrdd:"
 
-#: desktopbehavior_impl.cpp:140
+#: desktopbehavior_impl.cpp:141
 msgid "Right b&utton:"
 msgstr "Botwm &Dde"
 
-#: desktopbehavior_impl.cpp:141
+#: desktopbehavior_impl.cpp:142
 msgid ""
 "You can choose what happens when you click the right button of your pointing "
 "device on the desktop:"
@@ -244,7 +259,8 @@ msgstr ""
 "Gallwch ddewis beth ddigwydda pan gliciwch botwm dde eich dyfais bwyntio ar y "
 "penbwrdd:"
 
-#: desktopbehavior_impl.cpp:157 desktopbehavior_impl.cpp:203
+#: desktopbehavior_impl.cpp:158 desktopbehavior_impl.cpp:204
+#, fuzzy
 msgid ""
 " "
 "<ul>"
@@ -257,8 +273,8 @@ msgid ""
 "<li><em>Desktop menu:</em> a context menu for the desktop pops up. Among other "
 "things, this menu has options for configuring the display, locking the screen, "
 "and logging out of TDE.</li> "
-"<li><em>Application menu:</em> the \"K\" menu pops up. This might be useful for "
-"quickly accessing applications if you like to keep the panel (also known as "
+"<li><em>Application menu:</em> the \"TDE\" menu pops up. This might be useful "
+"for quickly accessing applications if you like to keep the panel (also known as "
 "\"Kicker\") hidden from view.</li></ul>"
 msgstr ""
 "<ul>"
@@ -275,7 +291,8 @@ msgstr ""
 "yn ddefnyddiol i gyrchu cymhwysiadau'n gyflym os ydych yn hoffi cadw'r panel "
 "(neu'r \"Ciciwr\") yn gudd.</li></ul>"
 
-#: desktopbehavior_impl.cpp:178
+#: desktopbehavior_impl.cpp:179
+#, fuzzy
 msgid ""
 "You can choose what happens when you click the middle button of your pointing "
 "device on the desktop: "
@@ -289,8 +306,8 @@ msgid ""
 "<li><em>Desktop menu:</em> a context menu for the desktop pops up. Among other "
 "things, this menu has options for configuring the display, locking the screen, "
 "and logging out of TDE.</li> "
-"<li><em>Application menu:</em> the \"K\" menu pops up. This might be useful for "
-"quickly accessing applications if you like to keep the panel (also known as "
+"<li><em>Application menu:</em> the \"TDE\" menu pops up. This might be useful "
+"for quickly accessing applications if you like to keep the panel (also known as "
 "\"Kicker\") hidden from view.</li></ul>"
 msgstr ""
 "Gallwch ddewis beth ddigwydda pan gliciwch y botwm canol ar eich dyfais bwyntio "
@@ -309,35 +326,35 @@ msgstr ""
 "yn ddefnyddiol i gyrchu cymhwysiadau'n gyflym os ydych yn hoffi cadw'r panel "
 "(neu'r \"Ciciwr\") yn gudd.</li></ul>\t"
 
-#: desktopbehavior_impl.cpp:269
+#: desktopbehavior_impl.cpp:290
 msgid "No Action"
 msgstr "Dim Gweithred"
 
-#: desktopbehavior_impl.cpp:270
+#: desktopbehavior_impl.cpp:291
 msgid "Window List Menu"
 msgstr "Dewislen Rhestr Ffenestri"
 
-#: desktopbehavior_impl.cpp:271
+#: desktopbehavior_impl.cpp:292
 msgid "Desktop Menu"
 msgstr "Dewislen Penbwrdd"
 
-#: desktopbehavior_impl.cpp:272
+#: desktopbehavior_impl.cpp:293
 msgid "Application Menu"
 msgstr "Dewislen Cymhwysiadau"
 
-#: desktopbehavior_impl.cpp:273
+#: desktopbehavior_impl.cpp:294
 msgid "Bookmarks Menu"
 msgstr ""
 
-#: desktopbehavior_impl.cpp:274
+#: desktopbehavior_impl.cpp:295
 msgid "Custom Menu 1"
 msgstr "Dewislen Addasiedig 1"
 
-#: desktopbehavior_impl.cpp:275
+#: desktopbehavior_impl.cpp:296
 msgid "Custom Menu 2"
 msgstr "Dewislen Addasiedig 2"
 
-#: desktopbehavior_impl.cpp:458
+#: desktopbehavior_impl.cpp:480
 #, fuzzy
 msgid ""
 "<h1>Behavior</h1>\n"
@@ -473,14 +490,14 @@ msgstr ""
 msgid ""
 "<h1>Preview Options</h1> Here you can modify the behavior of Konqueror when it "
 "shows the files in a folder."
-"<h2>The list of protocols:</h2> check the protocols over which previews should "
+"<h2>The list of protocols:</h2> Check the protocols over which previews should "
 "be shown; uncheck those over which they should not. For instance, you might "
 "want to show previews over SMB if the local network is fast enough, but you "
 "might disable it for FTP if you often visit very slow FTP sites with large "
 "images."
-"<h2>Maximum File Size:</h2> select the maximum file size for which previews "
-"should be generated. For instance, if set to 1 MB (the default), no preview "
-"will be generated for files bigger than 1 MB, for speed reasons."
+"<h2>Maximum File Size:</h2> Select the maximum file size for which previews "
+"should be generated. For instance, if set to 10 MB (the default), no preview "
+"will be generated for files bigger than 10 MB, for speed reasons."
 msgstr ""
 "<h1>Dewisiadau Rhagolwg</h1> Yma gallwch addasu ymddygiad Konqueror pan ddengys "
 "ffeiliau mewn plygell."
@@ -749,18 +766,24 @@ msgstr "Eiconau Dyfeisiau"
 
 #. i18n: file desktopbehavior.ui line 373
 #: rc.cpp:88
-#, no-c-format
-msgid "&Show device icons:"
+#, fuzzy, no-c-format
+msgid "&Show device icons"
 msgstr "Dang&os eiconau dyfeisiau"
 
-#. i18n: file desktopbehavior.ui line 379
+#. i18n: file desktopbehavior.ui line 381
 #: rc.cpp:91
+#, fuzzy, no-c-format
+msgid "&Show free space overlay on device icons"
+msgstr "Dang&os eiconau dyfeisiau"
+
+#. i18n: file desktopbehavior.ui line 387
+#: rc.cpp:94
 #, no-c-format
 msgid "Device Types to Display"
 msgstr "Mathau Dyfeisiau i'w Dangos"
 
-#. i18n: file desktopbehavior.ui line 398
-#: rc.cpp:94
+#. i18n: file desktopbehavior.ui line 406
+#: rc.cpp:97
 #, no-c-format
 msgid "Deselect the device types which you do not want to see on the desktop."
 msgstr "Dat-ddewis y mathau dyfeisiau nad ydych eisiau eu gweld ar y penbwrdd"
@@ -819,15 +842,91 @@ msgstr ""
 "Defnyddir y blygell yma yn ragosod i lwytho dogfennau ohono, neu i gadw "
 "dogfennau ynddo."
 
-#: rootopts.cpp:202 rootopts.cpp:217
+#: rootopts.cpp:117
+#, fuzzy
+msgid "Download path:"
+msgstr "Llwybr do&gfennau:"
+
+#: rootopts.cpp:124
+#, fuzzy
+msgid ""
+"This folder will be used by default to load or save downloads from or to."
+msgstr ""
+"Defnyddir y blygell yma yn ragosod i lwytho dogfennau ohono, neu i gadw "
+"dogfennau ynddo."
+
+#: rootopts.cpp:129
+#, fuzzy
+msgid "Music path:"
+msgstr "Llwybr sbw&riel:"
+
+#: rootopts.cpp:136
+#, fuzzy
+msgid "This folder will be used by default to load or save music from or to."
+msgstr ""
+"Defnyddir y blygell yma yn ragosod i lwytho dogfennau ohono, neu i gadw "
+"dogfennau ynddo."
+
+#: rootopts.cpp:141
+#, fuzzy
+msgid "Pictures path:"
+msgstr "Llwybr do&gfennau:"
+
+#: rootopts.cpp:148
+#, fuzzy
+msgid ""
+"This folder will be used by default to load or save pictures from or to."
+msgstr ""
+"Defnyddir y blygell yma yn ragosod i lwytho dogfennau ohono, neu i gadw "
+"dogfennau ynddo."
+
+#: rootopts.cpp:153
+msgid "Public Share path:"
+msgstr ""
+
+#: rootopts.cpp:160
+#, fuzzy
+msgid ""
+"This folder will be used by default to load or save public shared files from or "
+"to."
+msgstr ""
+"Defnyddir y blygell yma yn ragosod i lwytho dogfennau ohono, neu i gadw "
+"dogfennau ynddo."
+
+#: rootopts.cpp:165
+#, fuzzy
+msgid "Templates path:"
+msgstr "Llwybr sbw&riel:"
+
+#: rootopts.cpp:172
+#, fuzzy
+msgid ""
+"This folder will be used by default to load or save templates from or to."
+msgstr ""
+"Defnyddir y blygell yma yn ragosod i lwytho dogfennau ohono, neu i gadw "
+"dogfennau ynddo."
+
+#: rootopts.cpp:177
+#, fuzzy
+msgid "Videos path:"
+msgstr "Llwybr pen&bwrdd"
+
+#: rootopts.cpp:184
+#, fuzzy
+msgid "This folder will be used by default to load or save videos from or to."
+msgstr ""
+"Defnyddir y blygell yma yn ragosod i lwytho dogfennau ohono, neu i gadw "
+"dogfennau ynddo."
+
+#: rootopts.cpp:312 rootopts.cpp:326
 msgid "Autostart"
 msgstr "Hunan-ddechrau"
 
-#: rootopts.cpp:206
+#: rootopts.cpp:316
 msgid "Desktop"
 msgstr "Penbwrdd"
 
-#: rootopts.cpp:275
+#: rootopts.cpp:512
 msgid ""
 "The path for '%1' has been changed;\n"
 "do you want the files to be moved from '%2' to '%3'?"
@@ -835,7 +934,7 @@ msgstr ""
 "Newidiwyd llwybr '%1';\n"
 " a ydych am i mi symud y ffeiliau o '%2' i '%3'?"
 
-#: rootopts.cpp:276
+#: rootopts.cpp:513
 msgid "Confirmation Required"
 msgstr "Mynnir Cadarnhad"
 
@@ -848,9 +947,6 @@ msgstr "Mynnir Cadarnhad"
 #~ msgid " pixels"
 #~ msgstr "picseli"
 
-#~ msgid "&Trash path:"
-#~ msgstr "Llwybr sbw&riel:"
-
 #~ msgid "This folder contains deleted files (until you empty the trashcan). You can change the location of this folder if you want to, and the contents will move automatically to the new location as well."
 #~ msgstr "Mae'r blygell yma'n cynnwys ffeiliau dilëedig (nes i chi wagu'r sbwriel). Gallwch newid lleoliad y blygell yma os hoffech, ac fe symuda'r cynnwys i'r lleoliad newydd hefyd yn ymysgogol."
 
diff --git a/tde-i18n-cy/messages/tdebase/kcmkonqhtml.po b/tde-i18n-cy/messages/tdebase/kcmkonqhtml.po
index 2afaef6d251..89ca1ba3320 100644
--- a/tde-i18n-cy/messages/tdebase/kcmkonqhtml.po
+++ b/tde-i18n-cy/messages/tdebase/kcmkonqhtml.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmkonqhtml\n"
-"POT-Creation-Date: 2007-10-22 01:14+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-07-03 22:35+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -28,10 +29,6 @@ msgid ""
 "Your emails"
 msgstr "owaing@oceanfree.netkyfieithu@dotmon.com"
 
-#: advancedTabDialog.cpp:39 htmlopts.cpp:98
-msgid "Advanced Options"
-msgstr "Dewisiadau Uwch"
-
 #: appearance.cpp:33
 msgid ""
 "<h1>Konqueror Fonts</h1>On this page, you can configure which fonts Konqueror "
@@ -279,7 +276,7 @@ msgid ""
 "either discarded or replaced with a placeholder image. "
 msgstr ""
 
-#: htmlopts.cpp:41
+#: htmlopts.cpp:45
 msgid ""
 "<h1>Konqueror Browser</h1> Here you can configure Konqueror's browser "
 "functionality. Please note that the file manager functionality has to be "
@@ -293,15 +290,15 @@ msgstr ""
 "Konqueror drin côd HTML yn y tudalennau gwê y llwytha. Nid yw'n angenrhaid "
 "newid unrhywbeth yma fel arfer."
 
-#: htmlopts.cpp:49
+#: htmlopts.cpp:53
 msgid "Boo&kmarks"
 msgstr "Tu&dnodau"
 
-#: htmlopts.cpp:50
+#: htmlopts.cpp:54
 msgid "Ask for name and folder when adding bookmarks"
 msgstr "Gofyn am enw a phlygell wrth ychwanegu tudnodau"
 
-#: htmlopts.cpp:51
+#: htmlopts.cpp:55
 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 bookmark."
@@ -309,11 +306,11 @@ msgstr ""
 "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:55
+#: htmlopts.cpp:59
 msgid "Show only marked bookmarks in bookmark toolbar"
 msgstr "Dangos tudnodau nodedig yn unig yn y bar offer tudnodau"
 
-#: htmlopts.cpp:56
+#: htmlopts.cpp:60
 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."
@@ -321,15 +318,16 @@ msgstr ""
 "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:65
+#: htmlopts.cpp:69
 msgid "Form Com&pletion"
 msgstr "Cyf&lawni ffurflenni"
 
-#: htmlopts.cpp:66
-msgid "Enable completion of &forms"
+#: htmlopts.cpp:70
+#, fuzzy
+msgid "Enable com&pletion of forms"
 msgstr "Galluogi cyflawni &ffurflenni"
 
-#: htmlopts.cpp:67
+#: htmlopts.cpp:71
 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."
@@ -337,53 +335,24 @@ msgstr ""
 "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:72
+#: htmlopts.cpp:76
 msgid "&Maximum completions:"
 msgstr "&Uchafswm cylfawniadau:"
 
-#: htmlopts.cpp:75
+#: htmlopts.cpp:79
 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:83
-msgid "Tabbed Browsing"
-msgstr "Pori â Thabiau"
-
-#: htmlopts.cpp:86
-msgid "Open &links in new tab instead of in new window"
-msgstr "Agor &cysylltiadau mewn tab newydd yn hytrach na ffenestr newydd"
-
 #: htmlopts.cpp:87
-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."
-msgstr ""
-"Fe agora hwn gysylltiadau mewn tab newydd yn hytrach na ffenestr newydd mewn "
-"amryw o sefyllfaoedd megis dewis cysylltiad neu blygell â'r botwm llygoden "
-"canol."
-
-#: htmlopts.cpp:92
-msgid "Hide the tab bar when only one tab is open"
-msgstr "Cuddio'r bar tabiau pan fo dim ond un tab yn agored"
-
-#: htmlopts.cpp:93
-msgid ""
-"This will display the tab bar only if there are two or more tabs. Otherwise it "
-"will always be displayed."
-msgstr ""
-"Dengys hwn y bar tabiau os oes dau neu fwy o dabiau'n unig. Fel arall fe'i "
-"dengys bob amser."
-
-#: htmlopts.cpp:108
 msgid "Mouse Beha&vior"
 msgstr "Ymddygiad &Llygoden"
 
-#: htmlopts.cpp:110
+#: htmlopts.cpp:89
 msgid "Chan&ge cursor over links"
 msgstr "Newi&d cyrchydd dros gysylltiadau"
 
-#: htmlopts.cpp:111
+#: htmlopts.cpp:90
 msgid ""
 "If this option is set, the shape of the cursor will change (usually to a hand) "
 "if it is moved over a hyperlink."
@@ -391,11 +360,11 @@ msgstr ""
 "Os gosodir y dewisiad yma, fe newida siâp y cyrchydd (i law fel arfer) os y'i "
 "symudir dros gyswllt-hyper."
 
-#: htmlopts.cpp:115
+#: htmlopts.cpp:94
 msgid "M&iddle click opens URL in selection"
 msgstr "Mae &clic canol yn agor URL yn y dewisiad"
 
-#: htmlopts.cpp:117
+#: htmlopts.cpp:96
 msgid ""
 "If this box is checked, you can open the URL in the selection by middle "
 "clicking on a Konqueror view."
@@ -403,11 +372,11 @@ msgstr ""
 "Os brithir y blwch yma, gallwch agor yr URL yn y dewisiad gan ganol-glicio ar "
 "olwg Konqueror."
 
-#: htmlopts.cpp:121
+#: htmlopts.cpp:100
 msgid "Right click goes &back in history"
 msgstr "Clic-dde'n mynd yn ôl &drwy'r hanes"
 
-#: htmlopts.cpp:123
+#: htmlopts.cpp:102
 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 "
@@ -417,11 +386,11 @@ msgstr ""
 "Konqueror. I gyrchu'r ddewislen gyd-destun, gwasgwch botwm dde'r lygoden a "
 "symudwch."
 
-#: htmlopts.cpp:132
+#: htmlopts.cpp:111
 msgid "A&utomatically load images"
 msgstr "Llwytho delweddau'n &ymysgogol"
 
-#: htmlopts.cpp:133
+#: htmlopts.cpp:112
 msgid ""
 "If this box is checked, Konqueror will automatically load any images that are "
 "embedded in a web page. Otherwise, it will display placeholders for the images, "
@@ -436,11 +405,23 @@ msgstr ""
 "<br>Os nad oes gennych gysylltiad rhwydwaith araf iawn, byddwch mwy na thebyg "
 "eisiau dewis y blwch yma i wella'ch profiad pori."
 
-#: htmlopts.cpp:138
+#: htmlopts.cpp:117
+#, fuzzy
+msgid "Enable &favicons"
+msgstr "Galluogi dadna&mydd"
+
+#: htmlopts.cpp:118
+msgid ""
+"If this box is checked, Konqueror will automatically load and display favicon "
+"images that are associated with a web page. These images appear in the Location "
+"bar. Otherwise a generic image will appear."
+msgstr ""
+
+#: htmlopts.cpp:123
 msgid "Dra&w frame around not completely loaded images"
 msgstr ""
 
-#: htmlopts.cpp:139
+#: htmlopts.cpp:124
 #, fuzzy
 msgid ""
 "If this box is checked, Konqueror will draw a frame as placeholder around not "
@@ -455,11 +436,11 @@ msgstr ""
 "<br>Os nad oes gennych gysylltiad rhwydwaith araf iawn, byddwch mwy na thebyg "
 "eisiau dewis y blwch yma i wella'ch profiad pori."
 
-#: htmlopts.cpp:144
+#: htmlopts.cpp:129
 msgid "Allow automatic delayed &reloading/redirecting"
 msgstr "Caniatáu &ail-lwytho/ailgyfeirio ymysgogol seibiedig"
 
-#: htmlopts.cpp:146
+#: htmlopts.cpp:131
 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."
@@ -467,27 +448,27 @@ msgstr ""
 "Ceisia rhai tudallenau gwê am ail-lwytho ymysgogol neu ailgyfeiriad ar ôl amser "
 "penodol. Drwy ddatddewis y blwch yma anwybydda Konqueror y ceisiadau hyn."
 
-#: htmlopts.cpp:158
+#: htmlopts.cpp:143
 msgid "Und&erline links:"
 msgstr "Tanlin&ellu cysylltiadau:"
 
-#: htmlopts.cpp:161
+#: htmlopts.cpp:146
 msgid ""
 "_: underline\n"
 "Enabled"
 msgstr "Galluog"
 
-#: htmlopts.cpp:162
+#: htmlopts.cpp:147
 msgid ""
 "_: underline\n"
 "Disabled"
 msgstr "Analluog"
 
-#: htmlopts.cpp:163
+#: htmlopts.cpp:148
 msgid "Only on Hover"
 msgstr "Ar Hofran yn Unig"
 
-#: htmlopts.cpp:167
+#: htmlopts.cpp:152
 msgid ""
 "Controls how Konqueror handles underlining hyperlinks:"
 "<br>"
@@ -508,27 +489,28 @@ msgstr ""
 "<br><i>Noder: Gall ddiffinadau CSS y safle gymeryd blaenoriaeth dros y gwerth "
 "hwn.</i>"
 
-#: htmlopts.cpp:178
+#: htmlopts.cpp:163
 msgid "A&nimations:"
 msgstr "&Bywluniau:"
 
-#: htmlopts.cpp:181
+#: htmlopts.cpp:166
 msgid ""
 "_: animations\n"
 "Enabled"
 msgstr "Galluog"
 
-#: htmlopts.cpp:182
+#: htmlopts.cpp:167
 msgid ""
 "_: animations\n"
 "Disabled"
 msgstr "Analluog"
 
-#: htmlopts.cpp:183
+#: htmlopts.cpp:168
 msgid "Show Only Once"
 msgstr "Dangos Ond Unwaith"
 
-#: htmlopts.cpp:187
+#: htmlopts.cpp:172
+#, fuzzy
 msgid ""
 "Controls how Konqueror shows animated images:"
 "<br>"
@@ -536,7 +518,7 @@ msgid ""
 "<li><b>Enabled</b>: Show all animations completely.</li>"
 "<li><b>Disabled</b>: Never show animations, show the start image only.</li>"
 "<li><b>Show only once</b>: Show all animations completely but do not repeat "
-"them.</li>"
+"them.</li></ul>"
 msgstr ""
 "Rheola sut y dengys bywluniau gan Konqueror:"
 "<br>"
@@ -547,6 +529,35 @@ msgstr ""
 "<li><b>Dangos ond unwaith</b>: Dengys pob bywlun yn gyfan ond ni'u "
 "hailadroddir.</li>"
 
+#: htmlopts.cpp:180
+msgid "Sm&ooth scrolling"
+msgstr ""
+
+#: htmlopts.cpp:183
+#, fuzzy
+msgid ""
+"_: SmoothScrolling\n"
+"Enabled"
+msgstr "Galluog"
+
+#: htmlopts.cpp:184
+#, fuzzy
+msgid ""
+"_: SmoothScrolling\n"
+"Disabled"
+msgstr "Analluog"
+
+#: htmlopts.cpp:189
+msgid ""
+"Determines whether Konqueror should use smooth steps to scroll HTML pages, or "
+"whole steps:"
+"<br>"
+"<ul>"
+"<li><b>Always</b>: Always use smooth steps when scrolling.</li>"
+"<li><b>Never</b>: Never use smooth scrolling, scroll with whole steps "
+"instead.</li></ul>"
+msgstr ""
+
 #: javaopts.cpp:62 jsopts.cpp:48 pluginopts.cpp:59
 msgid "Global Settings"
 msgstr "Gosodiadau Eang"
@@ -697,7 +708,7 @@ msgstr ""
 "mynnwch. I gadw'r broses java'n rhedeg drwy gydoel yr amser y rhed y broses "
 "konqueror, gadewch y blwch brith Cau Gwesteiwr Rhaglennigion heb ei ddewis."
 
-#: javaopts.cpp:283 pluginopts.cpp:626
+#: javaopts.cpp:283 pluginopts.cpp:628
 msgid "Doma&in-Specific"
 msgstr "Penodol &i'r Parth"
 
@@ -1016,19 +1027,19 @@ msgstr "Derbyn ieithoedd:"
 msgid "Accept character sets:"
 msgstr "Derbyn setiau nôdau:"
 
-#: main.cpp:82
+#: main.cpp:89
 msgid "kcmkonqhtml"
 msgstr "kcmkonqhtml"
 
-#: main.cpp:82
+#: main.cpp:89
 msgid "Konqueror Browsing Control Module"
 msgstr "Modiwl Reoli Pori Konqueror"
 
-#: main.cpp:84
+#: main.cpp:91
 msgid "(c) 1999 - 2001 The Konqueror Developers"
 msgstr "(h)(c) 1999 - 2001 Datblygwyr Konqueror"
 
-#: main.cpp:94
+#: main.cpp:101
 msgid ""
 "JavaScript access controls\n"
 "Per-domain policies extensions"
@@ -1036,15 +1047,15 @@ msgstr ""
 "Rheolau cyrchu JavaScript\n"
 "Estyniadau polisïau pob yn barth"
 
-#: main.cpp:106
+#: main.cpp:113
 msgid "&Java"
 msgstr "&Java"
 
-#: main.cpp:110
+#: main.cpp:117
 msgid "Java&Script"
 msgstr "Java&Script"
 
-#: main.cpp:159
+#: main.cpp:166
 msgid ""
 "<h2>JavaScript</h2>On this page, you can configure whether JavaScript programs "
 "embedded in web pages should be allowed to be executed by Konqueror."
@@ -1085,7 +1096,7 @@ msgstr ""
 msgid "Domain-Specific Settin&gs"
 msgstr "&Gosodiadau Penodol i'r Parth"
 
-#: pluginopts.cpp:86 pluginopts.cpp:593
+#: pluginopts.cpp:86 pluginopts.cpp:595
 msgid "Domain-Specific Policies"
 msgstr "Polisïau Penodol i'r Parth..."
 
@@ -1145,7 +1156,7 @@ msgstr ""
 "Dileu</i> yn gwaredu'r polisi dewisiedig gan achosi defnyddio'r rhagosodyn "
 "polisi i'r parth yna. "
 
-#: pluginopts.cpp:129 pluginopts.cpp:523
+#: pluginopts.cpp:129 pluginopts.cpp:525
 msgid "Netscape Plugins"
 msgstr "Ategion Netscape"
 
@@ -1214,35 +1225,35 @@ msgstr "Yn chwilio am ategion"
 msgid "Select Plugin Scan Folder"
 msgstr "Dewiswch Blygell Chwilio Ategion"
 
-#: pluginopts.cpp:546
+#: pluginopts.cpp:548
 msgid "Plugin"
 msgstr "Ategyn"
 
-#: pluginopts.cpp:563
+#: pluginopts.cpp:565
 msgid "MIME type"
 msgstr "Math MME"
 
-#: pluginopts.cpp:568
+#: pluginopts.cpp:570
 msgid "Description"
 msgstr "Disgrifiad"
 
-#: pluginopts.cpp:573
+#: pluginopts.cpp:575
 msgid "Suffixes"
 msgstr "Ôl-ddodiadau"
 
-#: pluginopts.cpp:638
+#: pluginopts.cpp:640
 msgid "New Plugin Policy"
 msgstr "Polisi Ategion Newydd"
 
-#: pluginopts.cpp:641
+#: pluginopts.cpp:643
 msgid "Change Plugin Policy"
 msgstr "Newid Polisi Ategion"
 
-#: pluginopts.cpp:645
+#: pluginopts.cpp:647
 msgid "&Plugin policy:"
 msgstr "&Polisi ategion:"
 
-#: pluginopts.cpp:646
+#: pluginopts.cpp:648
 msgid "Select a plugin policy for the above host or domain."
 msgstr "Dewiswch bolisi ategion ar gyfer y gwesteiwr neu'r parth uchod."
 
@@ -1251,9 +1262,10 @@ msgid "&Host or domain name:"
 msgstr "Enw &gwesteiwr neu barth:"
 
 #: policydlg.cpp:40
+#, fuzzy
 msgid ""
-"Enter the name of a host (like www.kde.org) or a domain, starting with a dot "
-"(like .kde.org or .org)"
+"Enter the name of a host (like www.trinitydesktop.org) or a domain, starting "
+"with a dot (like .trinitydesktop.org or .org)"
 msgstr ""
 "Rhowch enw gwesteiwr (fel www.kde.org) neu barth, yn dechrau â dot (fel "
 ".kde.org neu .org)"
@@ -1262,212 +1274,282 @@ msgstr ""
 msgid "You must first enter a domain name."
 msgstr "Rhaid rhoi enw parth yn gyntaf."
 
-#. i18n: file advancedTabOptions.ui line 27
+#. i18n: file nsconfigwidget.ui line 17
 #: rc.cpp:3
 #, no-c-format
-msgid "<b>Advanced Options</b>"
-msgstr "<b>Dewisiadau Uwch</b>"
+msgid "Netscape Plugin Config"
+msgstr "Ffurfweddu Ategion Netscape"
 
-#. i18n: file advancedTabOptions.ui line 57
+#. i18n: file nsconfigwidget.ui line 40
 #: rc.cpp:6
 #, no-c-format
-msgid "O&pen new tabs in the background"
-msgstr "&Agor tabiau newydd yn y cefndir"
+msgid "Scan"
+msgstr "Chwilio"
 
-#. i18n: file advancedTabOptions.ui line 60
+#. i18n: file nsconfigwidget.ui line 59
 #: rc.cpp:9
 #, no-c-format
-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."
+msgid "&Scan for New Plugins"
+msgstr "&Chwilio am Ategion Newydd"
 
-#. i18n: file advancedTabOptions.ui line 68
+#. i18n: file nsconfigwidget.ui line 62
 #: rc.cpp:12
 #, no-c-format
-msgid "Open &new tab after current tab"
-msgstr "Agor tab ne&wydd ar ôl y tab cyfredol"
+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 advancedTabOptions.ui line 71
+#. i18n: file nsconfigwidget.ui line 89
 #: rc.cpp:15
-#, fuzzy, no-c-format
-msgid ""
-"This will open a new tab opened from a page after the current tab, instead of "
-"after the last tab."
-msgstr "Agora hwn dab newydd ar ôl y tab cyfredol, yn lle ar ôl y tab olaf."
-
-#. i18n: file advancedTabOptions.ui line 79
-#: rc.cpp:18
 #, no-c-format
-msgid "Confirm &when closing windows with multiple tabs"
-msgstr "Gwirio &pan yn cau ffenestri â sawl tab"
+msgid "Scan for new plugins at &TDE startup"
+msgstr "Chwilio am ategion newydd wrth ymgychwyn &TDE"
 
-#. i18n: file advancedTabOptions.ui line 82
-#: rc.cpp:21
+#. i18n: file nsconfigwidget.ui line 92
+#: rc.cpp:18
 #, no-c-format
 msgid ""
-"This will ask you whether you are sure you want to close a window when it has "
-"multiple tabs opened in it."
+"If this option is enabled, TDE will look for new Netscape plugins every time it "
+"starts up. This makes it easier for you if you often install new plugins, but "
+"it may also slow down TDE startup. You might want to disable this option, "
+"especially if you seldom install plugins."
 msgstr ""
-"Gofynna hwn i chi os ydych yn sicr eich bod am gau ffenestr pan fo sawl tab ar "
-"agor ynddi."
+"Os galluogir y dewisiad yma, edrycha TDE am ategion Netscape newyd bob tro y "
+"cychwynna. Fe wna hyn hi'n haws i chi os ydych yn gosod ategion newydd yn aml, "
+"ond gall hefyd arafu ymgychwyn TDE. Efallai hoffech analluogi'r dewisiad yma, "
+"yn arbennig os nad ydych yn gosod ategion yn aml."
 
-#. i18n: file advancedTabOptions.ui line 90
-#: rc.cpp:24
+#. i18n: file nsconfigwidget.ui line 106
+#: rc.cpp:21
 #, no-c-format
-msgid "&Show close button instead of website icon"
-msgstr "&Dangos botwm cau yn lle eicon safwe"
+msgid "Scan Folders"
+msgstr "Arsylwi Plygyll"
 
-#. i18n: file advancedTabOptions.ui line 93
+#. i18n: file nsconfigwidget.ui line 128
 #: rc.cpp:27
 #, no-c-format
-msgid ""
-"This will display close buttons inside each tab instead of websites' icons."
-msgstr ""
-"Bydd hwn yn dangos botymau cau tu mewn i bob tab yn lle eiconau safweoedd."
+msgid "&New"
+msgstr "&Newydd"
 
-#. i18n: file advancedTabOptions.ui line 101
+#. i18n: file nsconfigwidget.ui line 150
 #: rc.cpp:30
 #, no-c-format
-msgid "Open pop&ups in new tab instead of in new window"
-msgstr "Agor &cysylltiadau mewn tab newydd yn hytrach na ffenestr newydd"
+msgid "Do&wn"
+msgstr "I la&wr"
 
-#. i18n: file advancedTabOptions.ui line 104
+#. i18n: file nsconfigwidget.ui line 161
 #: rc.cpp:33
 #, no-c-format
-msgid ""
-"Whether or not JavaScript popups if allowed shall open in a new tab or in a new "
-"window."
-msgstr ""
-"Dylai naidlenni JavaScript, os ganiateir, agor unai mewn tab newydd neu mewn "
-"ffenestr newydd."
+msgid "&Up"
+msgstr "I &fyny"
 
-#. i18n: file advancedTabOptions.ui line 112
+#. i18n: file nsconfigwidget.ui line 203
 #: rc.cpp:36
 #, no-c-format
-msgid "Activate previous used tab when closing the current tab"
-msgstr "Gweithredu'r tab a ddefyddwyd o'r blaen wrth gau'r tab cyfredol"
-
-#. i18n: file advancedTabOptions.ui line 115
-#: rc.cpp:39
-#, no-c-format
-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."
-msgstr ""
-"Os brithir hwn, gweithredir y tab a ddefnyddwyd neu agorwyd o'r blaen pan "
-"ceuwch y tab gweithredol cyfredol, yn lle yr un i'r dde o'r tab cyfredol."
+msgid "Plugins"
+msgstr "Ategion"
 
-#. i18n: file advancedTabOptions.ui line 123
+#. i18n: file nsconfigwidget.ui line 223
 #: rc.cpp:42
 #, no-c-format
-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"
+msgid "Value"
+msgstr "Gwerth"
 
-#. i18n: file advancedTabOptions.ui line 126
+#. i18n: file nsconfigwidget.ui line 239
 #: rc.cpp:45
 #, no-c-format
-msgid ""
-"When you click a URL in another TDE program or call kfmclient to open a URL, "
-"the current desktop will be searched for a non-minimized Konqueror and, if "
-"found, the URL opened as a new tab within it. Otherwise a new Konqueror window "
-"will be opened with the required URL."
-msgstr ""
-"Pan gliciwch URL mewn rhaglen arall TDE neu alwch kfmclient i agor URL, chwilir "
-"ar y penbwrdd cyfredol am Konqueror na's lleiheuir ac, os ar gael, agorir yr "
-"URL fel tab newydd tu mewn iddo.  Os fel arall, agorir ffenestr newydd "
-"Konqueror efo'r URL gofynnol."
+msgid "Here you can see a list of the Netscape plugins TDE has found."
+msgstr "Yma gallwch weld rhestr o'r ategion Nescape mae TDE wedi'u canfod."
 
-#. i18n: file nsconfigwidget.ui line 17
+#. i18n: file nsconfigwidget.ui line 250
 #: rc.cpp:48
 #, no-c-format
-msgid "Netscape Plugin Config"
-msgstr "Ffurfweddu Ategion Netscape"
+msgid "Use a&rtsdsp to pipe plugin sound through aRts"
+msgstr "Defnyddio a&rtsdsp i bibellu sain ategion drwy aRts"
 
-#. i18n: file nsconfigwidget.ui line 40
+#. i18n: file userInterOpts.ui line 35
 #: rc.cpp:51
 #, no-c-format
-msgid "Scan"
-msgstr "Chwilio"
+msgid "Tabbed Browsing"
+msgstr "Pori â Thabiau"
 
-#. i18n: file nsconfigwidget.ui line 59
+#. i18n: file userInterOpts.ui line 54
 #: rc.cpp:54
 #, no-c-format
-msgid "&Scan for New Plugins"
-msgstr "&Chwilio am Ategion Newydd"
+msgid "Open &links in new tab instead of in new window"
+msgstr "Agor &cysylltiadau mewn tab newydd yn hytrach na ffenestr newydd"
 
-#. i18n: file nsconfigwidget.ui line 62
+#. i18n: file userInterOpts.ui line 57
 #: rc.cpp:57
 #, no-c-format
-msgid "Click here to scan for newly installed Netscape plugins now."
-msgstr "Cliciwch yma i chwilio nawr am ategion Netscape newydd eu gosod."
+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."
+msgstr ""
+"Fe agora hwn gysylltiadau mewn tab newydd yn hytrach na ffenestr newydd mewn "
+"amryw o sefyllfaoedd megis dewis cysylltiad neu blygell â'r botwm llygoden "
+"canol."
 
-#. i18n: file nsconfigwidget.ui line 89
+#. i18n: file userInterOpts.ui line 65
 #: rc.cpp:60
-#, no-c-format
-msgid "Scan for new plugins at &TDE startup"
-msgstr "Chwilio am ategion newydd wrth ymgychwyn &TDE"
+#, fuzzy, no-c-format
+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 nsconfigwidget.ui line 92
+#. i18n: file userInterOpts.ui line 68
 #: rc.cpp:63
 #, no-c-format
 msgid ""
-"If this option is enabled, TDE will look for new Netscape plugins every time it "
-"starts up. This makes it easier for you if you often install new plugins, but "
-"it may also slow down TDE startup. You might want to disable this option, "
-"especially if you seldom install plugins."
+"This will display the tab bar only if there are two or more tabs. Otherwise it "
+"will always be displayed."
 msgstr ""
-"Os galluogir y dewisiad yma, edrycha TDE am ategion Netscape newyd bob tro y "
-"cychwynna. Fe wna hyn hi'n haws i chi os ydych yn gosod ategion newydd yn aml, "
-"ond gall hefyd arafu ymgychwyn TDE. Efallai hoffech analluogi'r dewisiad yma, "
-"yn arbennig os nad ydych yn gosod ategion yn aml."
+"Dengys hwn y bar tabiau os oes dau neu fwy o dabiau'n unig. Fel arall fe'i "
+"dengys bob amser."
 
-#. i18n: file nsconfigwidget.ui line 106
+#. i18n: file userInterOpts.ui line 76
 #: rc.cpp:66
 #, no-c-format
-msgid "Scan Folders"
-msgstr "Arsylwi Plygyll"
+msgid "C&ycle tabs with mouse wheel"
+msgstr ""
 
-#. i18n: file nsconfigwidget.ui line 128
+#. i18n: file userInterOpts.ui line 79
+#: rc.cpp:69
+#, fuzzy, no-c-format
+msgid ""
+"This will cycle through tabs when there are two or more tabs using the mouse "
+"wheel."
+msgstr ""
+"Dengys hwn y bar tabiau os oes dau neu fwy o dabiau'n unig. Fel arall fe'i "
+"dengys bob amser."
+
+#. i18n: file userInterOpts.ui line 87
 #: rc.cpp:72
 #, no-c-format
-msgid "&New"
-msgstr "&Newydd"
+msgid "O&pen new tabs in the background"
+msgstr "&Agor tabiau newydd yn y cefndir"
 
-#. i18n: file nsconfigwidget.ui line 150
+#. i18n: file userInterOpts.ui line 90
 #: rc.cpp:75
 #, no-c-format
-msgid "Do&wn"
-msgstr "I la&wr"
+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 nsconfigwidget.ui line 161
+#. i18n: file userInterOpts.ui line 98
 #: rc.cpp:78
 #, no-c-format
-msgid "&Up"
-msgstr "I &fyny"
+msgid "Open &new tab after current tab"
+msgstr "Agor tab ne&wydd ar ôl y tab cyfredol"
 
-#. i18n: file nsconfigwidget.ui line 203
+#. i18n: file userInterOpts.ui line 101
 #: rc.cpp:81
+#, fuzzy, no-c-format
+msgid ""
+"This will open a new tab opened from a page after the current tab, instead of "
+"after the last tab."
+msgstr "Agora hwn dab newydd ar ôl y tab cyfredol, yn lle ar ôl y tab olaf."
+
+#. i18n: file userInterOpts.ui line 109
+#: rc.cpp:84
 #, no-c-format
-msgid "Plugins"
-msgstr "Ategion"
+msgid "Confirm &when closing windows with multiple tabs"
+msgstr "Gwirio &pan yn cau ffenestri â sawl tab"
 
-#. i18n: file nsconfigwidget.ui line 223
+#. i18n: file userInterOpts.ui line 112
 #: rc.cpp:87
 #, no-c-format
-msgid "Value"
-msgstr "Gwerth"
+msgid ""
+"This will ask you whether you are sure you want to close a window when it has "
+"multiple tabs opened in it."
+msgstr ""
+"Gofynna hwn i chi os ydych yn sicr eich bod am gau ffenestr pan fo sawl tab ar "
+"agor ynddi."
 
-#. i18n: file nsconfigwidget.ui line 239
+#. i18n: file userInterOpts.ui line 120
 #: rc.cpp:90
 #, no-c-format
-msgid "Here you can see a list of the Netscape plugins TDE has found."
-msgstr "Yma gallwch weld rhestr o'r ategion Nescape mae TDE wedi'u canfod."
+msgid "&Show close button instead of website icon"
+msgstr "&Dangos botwm cau yn lle eicon safwe"
 
-#. i18n: file nsconfigwidget.ui line 250
+#. i18n: file userInterOpts.ui line 123
 #: rc.cpp:93
 #, no-c-format
-msgid "Use a&rtsdsp to pipe plugin sound through aRts"
-msgstr "Defnyddio a&rtsdsp i bibellu sain ategion drwy aRts"
+msgid ""
+"This will display close buttons inside each tab instead of websites' icons."
+msgstr ""
+"Bydd hwn yn dangos botymau cau tu mewn i bob tab yn lle eiconau safweoedd."
+
+#. i18n: file userInterOpts.ui line 131
+#: rc.cpp:96
+#, fuzzy, no-c-format
+msgid "&Show close button instead of website icon with mouse hover"
+msgstr "&Dangos botwm cau yn lle eicon safwe"
+
+#. i18n: file userInterOpts.ui line 134
+#: rc.cpp:99
+#, fuzzy, no-c-format
+msgid ""
+"This will display a close button inside each tab instead of websites' icons "
+"when the mouse pointer hovers the icon."
+msgstr ""
+"Bydd hwn yn dangos botymau cau tu mewn i bob tab yn lle eiconau safweoedd."
+
+#. i18n: file userInterOpts.ui line 142
+#: rc.cpp:102
+#, no-c-format
+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 userInterOpts.ui line 145
+#: rc.cpp:105
+#, no-c-format
+msgid ""
+"Whether or not JavaScript popups if allowed shall open in a new tab or in a new "
+"window."
+msgstr ""
+"Dylai naidlenni JavaScript, os ganiateir, agor unai mewn tab newydd neu mewn "
+"ffenestr newydd."
+
+#. i18n: file userInterOpts.ui line 153
+#: rc.cpp:108
+#, no-c-format
+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 userInterOpts.ui line 156
+#: rc.cpp:111
+#, no-c-format
+msgid ""
+"When you click a URL in another TDE program or call kfmclient to open a URL, "
+"the current desktop will be searched for a non-minimized Konqueror and, if "
+"found, the URL opened as a new tab within it. Otherwise a new Konqueror window "
+"will be opened with the required URL."
+msgstr ""
+"Pan gliciwch URL mewn rhaglen arall TDE neu alwch kfmclient i agor URL, chwilir "
+"ar y penbwrdd cyfredol am Konqueror na's lleiheuir ac, os ar gael, agorir yr "
+"URL fel tab newydd tu mewn iddo.  Os fel arall, agorir ffenestr newydd "
+"Konqueror efo'r URL gofynnol."
+
+#. i18n: file userInterOpts.ui line 164
+#: rc.cpp:114
+#, no-c-format
+msgid "Activate previous used tab when closing the current tab"
+msgstr "Gweithredu'r tab a ddefyddwyd o'r blaen wrth gau'r tab cyfredol"
+
+#. i18n: file userInterOpts.ui line 167
+#: rc.cpp:117
+#, no-c-format
+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."
+msgstr ""
+"Os brithir hwn, gweithredir y tab a ddefnyddwyd neu agorwyd o'r blaen pan "
+"ceuwch y tab gweithredol cyfredol, yn lle yr un i'r dde o'r tab cyfredol."
+
+#~ msgid "Advanced Options"
+#~ msgstr "Dewisiadau Uwch"
+
+#~ msgid "<b>Advanced Options</b>"
+#~ msgstr "<b>Dewisiadau Uwch</b>"
 
 #~ msgid "Import.."
 #~ msgstr "Mewnforio.."
diff --git a/tde-i18n-cy/messages/tdebase/kcmkonsole.po b/tde-i18n-cy/messages/tdebase/kcmkonsole.po
index 55636cf0e34..933080c072c 100644
--- a/tde-i18n-cy/messages/tdebase/kcmkonsole.po
+++ b/tde-i18n-cy/messages/tdebase/kcmkonsole.po
@@ -10,10 +10,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmkonsole\n"
-"POT-Creation-Date: 2008-07-08 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-07-03 22:36+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -35,8 +36,9 @@ msgstr ""
 "kyfieithu@dotmon.com"
 
 #: kcmkonsole.cpp:43
+#, fuzzy
 msgid ""
-"<h1>Konsole</h1> With this module you can configure Konsole, the TDE terminal "
+"<h1>Konsole</h1> With this module you can configure Konsole, the KDE terminal "
 "application. You can configure the generic Konsole options (which can also be "
 "configured using the RMB) and you can edit the schemas and sessions available "
 "to Konsole."
@@ -60,7 +62,7 @@ msgstr "Konsole KCM"
 msgid "KControl module for Konsole configuration"
 msgstr "Modiwl KControl ar gyfer ffurfweddu Konsole"
 
-#: kcmkonsole.cpp:162
+#: kcmkonsole.cpp:171
 msgid ""
 "The Ctrl+S/Ctrl+Q flow control setting will only affect newly started Konsole "
 "sessions.\n"
@@ -72,7 +74,7 @@ msgstr ""
 " Gellir defnyddio'r gorchymyn 'stty' i newid gosodiadau rheoli llif sesiynau "
 "Konsole cyfredol."
 
-#: kcmkonsole.cpp:170
+#: kcmkonsole.cpp:179
 msgid ""
 "You have chosen to enable bidirectional text rendering by default.\n"
 "Note that bidirectional text may not always be shown correctly, especially when "
@@ -92,506 +94,512 @@ msgstr ""
 msgid "&General"
 msgstr "&Cyffredinol"
 
-#. i18n: file kcmkonsoledialog.ui line 70
+#. i18n: file kcmkonsoledialog.ui line 78
 #: rc.cpp:6
 #, no-c-format
-msgid "Double Click"
-msgstr "Clic Dwbl"
-
-#. i18n: file kcmkonsoledialog.ui line 81
-#: rc.cpp:9
-#, no-c-format
-msgid "Consider the following characters &part of a word when double clicking:"
-msgstr "Ystyried y nôdau canynol yn &rhan o air wrth glicio'n ddwbl"
-
-#. i18n: file kcmkonsoledialog.ui line 107
-#: rc.cpp:12
-#, no-c-format
-msgid "Misc"
-msgstr "Amrywiol"
-
-#. i18n: file kcmkonsoledialog.ui line 118
-#: rc.cpp:15
-#, no-c-format
 msgid "Show terminal si&ze after resizing"
 msgstr "Dangos maint y derfynell ar ôl &newid maint"
 
-#. i18n: file kcmkonsoledialog.ui line 126
-#: rc.cpp:18
+#. i18n: file kcmkonsoledialog.ui line 86
+#: rc.cpp:9
 #, no-c-format
 msgid "Show &frame"
 msgstr "Dangos &ffrâm"
 
-#. i18n: file kcmkonsoledialog.ui line 134
-#: rc.cpp:21
+#. i18n: file kcmkonsoledialog.ui line 94
+#: rc.cpp:12
 #, no-c-format
 msgid "&Confirm quit when closing more than one session"
 msgstr "&Gwirio gadael wrth gau mwy nag un sesiwn"
 
-#. i18n: file kcmkonsoledialog.ui line 142
-#: rc.cpp:24
+#. i18n: file kcmkonsoledialog.ui line 102
+#: rc.cpp:15
 #, no-c-format
 msgid "&Blinking cursor"
 msgstr "Cyrchydd &amrantol"
 
-#. i18n: file kcmkonsoledialog.ui line 150
-#: rc.cpp:27
+#. i18n: file kcmkonsoledialog.ui line 110
+#: rc.cpp:18
 #, no-c-format
 msgid "&Require Ctrl key for drag and drop"
 msgstr "&Mynnu bysell Ctrl i lusgo a gollwng"
 
-#. i18n: file kcmkonsoledialog.ui line 158
-#: rc.cpp:30
+#. i18n: file kcmkonsoledialog.ui line 118
+#: rc.cpp:21
 #, no-c-format
 msgid "Triple click selects &only from the current word forward"
 msgstr "Clicio triphlyg yn dewis dim &ond o'r gair cyfredol ymlaen"
 
-#. i18n: file kcmkonsoledialog.ui line 166
-#: rc.cpp:33
+#. i18n: file kcmkonsoledialog.ui line 126
+#: rc.cpp:24
 #, no-c-format
 msgid "Allow progr&ams to resize terminal window"
 msgstr "Caniatáu rh&aglenni i newid maint y ffenestr terfynell"
 
-#. i18n: file kcmkonsoledialog.ui line 174
+#. i18n: file kcmkonsoledialog.ui line 134
+#: rc.cpp:27
+#, fuzzy, no-c-format
+msgid "&Use Ctrl+S/Ctrl+Q flow control"
+msgstr "Defnyddio rheoli llif Ctrl+S/Ctrl+Q"
+
+#. i18n: file kcmkonsoledialog.ui line 142
+#: rc.cpp:30
+#, fuzzy, no-c-format
+msgid "E&nable bidirectional text rendering"
+msgstr "Galluogi llunio testun deugyfeiriol"
+
+#. i18n: file kcmkonsoledialog.ui line 150
+#: rc.cpp:33
+#, no-c-format
+msgid "Set &tab title to match window title"
+msgstr ""
+
+#. i18n: file kcmkonsoledialog.ui line 158
 #: rc.cpp:36
 #, no-c-format
-msgid "Use Ctrl+S/Ctrl+Q flow control"
-msgstr "Defnyddio rheoli llif Ctrl+S/Ctrl+Q"
+msgid "Cycle tabs &with mouse wheel"
+msgstr ""
 
-#. i18n: file kcmkonsoledialog.ui line 199
+#. i18n: file kcmkonsoledialog.ui line 166
 #: rc.cpp:39
 #, no-c-format
-msgid "Enable bidirectional text rendering"
-msgstr "Galluogi llunio testun deugyfeiriol"
+msgid "Enable main &menu accelerator keys"
+msgstr ""
 
-#. i18n: file kcmkonsoledialog.ui line 215
+#. i18n: file kcmkonsoledialog.ui line 174
 #: rc.cpp:42
 #, no-c-format
-msgid "Seconds to detect s&ilence:"
-msgstr "Eiliadau i ddarganfod &distawrwydd:"
+msgid "Handle Meta &key as Alt Key"
+msgstr ""
 
-#. i18n: file kcmkonsoledialog.ui line 269
+#. i18n: file kcmkonsoledialog.ui line 190
 #: rc.cpp:45
 #, no-c-format
 msgid "&Line spacing:"
 msgstr "&Bylchu llinellau:"
 
-#. i18n: file kcmkonsoledialog.ui line 297
+#. i18n: file kcmkonsoledialog.ui line 262
 #: rc.cpp:48
 #, no-c-format
-msgid "Set tab title to match window title"
-msgstr ""
+msgid "Seconds to detect s&ilence:"
+msgstr "Eiliadau i ddarganfod &distawrwydd:"
 
-#. i18n: file kcmkonsoledialog.ui line 309
+#. i18n: file kcmkonsoledialog.ui line 292
 #: rc.cpp:51
 #, no-c-format
+msgid "Consider the following characters &part of a word when double clicking:"
+msgstr "Ystyried y nôdau canynol yn &rhan o air wrth glicio'n ddwbl"
+
+#. i18n: file kcmkonsoledialog.ui line 320
+#: rc.cpp:54
+#, no-c-format
 msgid "&Schema"
 msgstr "&Sgema"
 
-#. i18n: file kcmkonsoledialog.ui line 327
-#: rc.cpp:54
+#. i18n: file kcmkonsoledialog.ui line 338
+#: rc.cpp:57
 #, no-c-format
 msgid "S&ession"
 msgstr "S&esiwn"
 
 #. i18n: file schemadialog.ui line 16
-#: rc.cpp:57
+#: rc.cpp:60
 #, no-c-format
 msgid "Konsole Schema Editor"
 msgstr "Golygydd Sgemâu Konsole"
 
 #. i18n: file schemadialog.ui line 42
-#: rc.cpp:60
+#: rc.cpp:63
 #, no-c-format
 msgid "&Title:"
 msgstr "&Teitl:"
 
 #. i18n: file schemadialog.ui line 76
-#: rc.cpp:63
+#: rc.cpp:66
 #, no-c-format
 msgid "Colors"
 msgstr "Lliwiau"
 
 #. i18n: file schemadialog.ui line 87
-#: rc.cpp:66
+#: rc.cpp:69
 #, no-c-format
 msgid "Shell co&lor:"
 msgstr "&Lliw Plisgyn:"
 
 #. i18n: file schemadialog.ui line 98
-#: rc.cpp:69
+#: rc.cpp:72
 #, no-c-format
 msgid "&Bold"
 msgstr "&Bras"
 
 #. i18n: file schemadialog.ui line 129
-#: rc.cpp:72 rc.cpp:225
+#: rc.cpp:75 rc.cpp:228
 #, no-c-format
 msgid "Custom"
 msgstr "Addasiedig"
 
 #. i18n: file schemadialog.ui line 134
-#: rc.cpp:75
+#: rc.cpp:78
 #, no-c-format
 msgid "System Background"
 msgstr "Cefndir y Cysawd"
 
 #. i18n: file schemadialog.ui line 139
-#: rc.cpp:78
+#: rc.cpp:81
 #, no-c-format
 msgid "System Foreground"
 msgstr "Blaendir y Cysawd"
 
 #. i18n: file schemadialog.ui line 144
-#: rc.cpp:81
+#: rc.cpp:84
 #, no-c-format
 msgid "Random Hue"
 msgstr "Arlliw Hap"
 
 #. i18n: file schemadialog.ui line 173
-#: rc.cpp:84
+#: rc.cpp:87
 #, no-c-format
 msgid "Trans&parent"
 msgstr "Tr&yloyw"
 
 #. i18n: file schemadialog.ui line 181
-#: rc.cpp:87
+#: rc.cpp:90
 #, no-c-format
 msgid "&Konsole color:"
 msgstr "Lliw &Konsole:"
 
 #. i18n: file schemadialog.ui line 190
-#: rc.cpp:90
+#: rc.cpp:93
 #, no-c-format
 msgid "0 - Foreground Color"
 msgstr "0 - Lliw Blaendir"
 
 #. i18n: file schemadialog.ui line 195
-#: rc.cpp:93
+#: rc.cpp:96
 #, no-c-format
 msgid "1 - Background Color"
 msgstr "1 - Lliw Cefndir"
 
 #. i18n: file schemadialog.ui line 200
-#: rc.cpp:96
+#: rc.cpp:99
 #, no-c-format
 msgid "2 - Color 0 (black)"
 msgstr "2 - Lliw 0 (du)"
 
 #. i18n: file schemadialog.ui line 205
-#: rc.cpp:99
+#: rc.cpp:102
 #, no-c-format
 msgid "3 - Color 1 (red)"
 msgstr "3 - Lliw 1 (coch)"
 
 #. i18n: file schemadialog.ui line 210
-#: rc.cpp:102
+#: rc.cpp:105
 #, no-c-format
 msgid "4 - Color 2 (green)"
 msgstr "4 - Lliw 2 (gwyrdd)"
 
 #. i18n: file schemadialog.ui line 215
-#: rc.cpp:105
+#: rc.cpp:108
 #, no-c-format
 msgid "5 - Color 3 (yellow)"
 msgstr "5 - Lliw 3 (melyn)"
 
 #. i18n: file schemadialog.ui line 220
-#: rc.cpp:108
+#: rc.cpp:111
 #, no-c-format
 msgid "6 - Color 4 (blue)"
 msgstr "6 - Lliw 4 (glas)"
 
 #. i18n: file schemadialog.ui line 225
-#: rc.cpp:111
+#: rc.cpp:114
 #, no-c-format
 msgid "7 - Color 5 (magenta)"
 msgstr "7 - Lliw 5 (magenta)"
 
 #. i18n: file schemadialog.ui line 230
-#: rc.cpp:114
+#: rc.cpp:117
 #, no-c-format
 msgid "8 - Color 6 (cyan)"
 msgstr "8 - Lliw 6 (gwyrddlas)"
 
 #. i18n: file schemadialog.ui line 235
-#: rc.cpp:117
+#: rc.cpp:120
 #, no-c-format
 msgid "9 - Color 7 (white)"
 msgstr "9 - Lliw 7 (gwyn)"
 
 #. i18n: file schemadialog.ui line 240
-#: rc.cpp:120
+#: rc.cpp:123
 #, no-c-format
 msgid "10 - Foreground Intensive Color"
 msgstr "10 - Lliw Blaendir Cryf"
 
 #. i18n: file schemadialog.ui line 245
-#: rc.cpp:123
+#: rc.cpp:126
 #, no-c-format
 msgid "11 - Background Intensive Color"
 msgstr "11 - Lliw Cefndir Cryf"
 
 #. i18n: file schemadialog.ui line 250
-#: rc.cpp:126
+#: rc.cpp:129
 #, no-c-format
 msgid "12 - Color 0 Intensive (gray)"
 msgstr "12 - Lliw 0 Cryf (llwyd)"
 
 #. i18n: file schemadialog.ui line 255
-#: rc.cpp:129
+#: rc.cpp:132
 #, no-c-format
 msgid "13 - Color 1 Intensive (light red)"
 msgstr "13 - Lliw 1 Cryf (coch golau)"
 
 #. i18n: file schemadialog.ui line 260
-#: rc.cpp:132
+#: rc.cpp:135
 #, no-c-format
 msgid "14 - Color 2 Intensive (light green)"
 msgstr "14 - Lliw 2 Cryf (gwyrdd golau)"
 
 #. i18n: file schemadialog.ui line 265
-#: rc.cpp:135
+#: rc.cpp:138
 #, no-c-format
 msgid "15 - Color 3 Intensive (light yellow)"
 msgstr "15 - Lliw 3 Cryf (melyn golau)"
 
 #. i18n: file schemadialog.ui line 270
-#: rc.cpp:138
+#: rc.cpp:141
 #, no-c-format
 msgid "16 - Color 4 Intensive (light blue)"
 msgstr "16 - Lliw 4 Cryf (glas golau)"
 
 #. i18n: file schemadialog.ui line 275
-#: rc.cpp:141
+#: rc.cpp:144
 #, no-c-format
 msgid "17 - Color 5 Intensive (light magenta)"
 msgstr "17 - Lliw 5 Cryf (magenta golau)"
 
 #. i18n: file schemadialog.ui line 280
-#: rc.cpp:144
+#: rc.cpp:147
 #, no-c-format
 msgid "18 - Color 6 Intensive (light cyan)"
 msgstr "18 - Lliw 6 Cryf (gwyrddlas golau)"
 
 #. i18n: file schemadialog.ui line 285
-#: rc.cpp:147
+#: rc.cpp:150
 #, no-c-format
 msgid "19 - Color 7 Intensive (white)"
 msgstr "19 - Lliw 7 Cryf (gwyn)"
 
 #. i18n: file schemadialog.ui line 307
-#: rc.cpp:150
+#: rc.cpp:153
 #, no-c-format
 msgid "Schema"
 msgstr "Sgema"
 
 #. i18n: file schemadialog.ui line 323
-#: rc.cpp:153
+#: rc.cpp:156
 #, no-c-format
 msgid "S&et as default schema"
 msgstr "Gosod f&el sgema ragosod"
 
 #. i18n: file schemadialog.ui line 339
-#: rc.cpp:156
+#: rc.cpp:159
 #, no-c-format
 msgid "Sa&ve Schema..."
 msgstr "C&adw Sgema..."
 
 #. i18n: file schemadialog.ui line 347
-#: rc.cpp:159
+#: rc.cpp:162
 #, no-c-format
 msgid "&Remove Schema"
 msgstr "&Gwaredu Sgema"
 
 #. i18n: file schemadialog.ui line 376
-#: rc.cpp:162
+#: rc.cpp:165
 #, no-c-format
 msgid "Background"
 msgstr "Cefndir"
 
 #. i18n: file schemadialog.ui line 409
-#: rc.cpp:165
+#: rc.cpp:168
 #, no-c-format
 msgid "..."
 msgstr "..."
 
 #. i18n: file schemadialog.ui line 415
-#: rc.cpp:168
+#: rc.cpp:171
 #, no-c-format
 msgid "Tiled"
 msgstr "Teiliedig"
 
 #. i18n: file schemadialog.ui line 420
-#: rc.cpp:171
+#: rc.cpp:174
 #, no-c-format
 msgid "Centered"
 msgstr "Canoledig"
 
 #. i18n: file schemadialog.ui line 425
-#: rc.cpp:174
+#: rc.cpp:177
 #, no-c-format
 msgid "Full"
 msgstr "Llawn"
 
 #. i18n: file schemadialog.ui line 437
-#: rc.cpp:177
+#: rc.cpp:180
 #, no-c-format
 msgid "&Image:"
 msgstr "&Delwedd:"
 
 #. i18n: file schemadialog.ui line 448
-#: rc.cpp:180
+#: rc.cpp:183
 #, no-c-format
 msgid "Min"
 msgstr "Isaf"
 
 #. i18n: file schemadialog.ui line 467
-#: rc.cpp:183
+#: rc.cpp:186
 #, no-c-format
 msgid "Max"
 msgstr "Uchaf"
 
 #. i18n: file schemadialog.ui line 475
-#: rc.cpp:186
+#: rc.cpp:189
 #, no-c-format
 msgid "Shade t&o:"
 msgstr "Cysgodi &hyd:"
 
 #. i18n: file schemadialog.ui line 528
-#: rc.cpp:189
+#: rc.cpp:192
 #, no-c-format
 msgid "Tr&ansparent"
 msgstr "Tr&yloyw"
 
 #. i18n: file sessiondialog.ui line 16
-#: rc.cpp:192
+#: rc.cpp:195
 #, no-c-format
 msgid "Konsole Session Editor"
 msgstr "Golygydd Sesiwn Konsole"
 
 #. i18n: file sessiondialog.ui line 59
-#: rc.cpp:198
+#: rc.cpp:201
 #, no-c-format
 msgid "<Default>"
 msgstr "<Rhagosod>"
 
 #. i18n: file sessiondialog.ui line 64
-#: rc.cpp:201
+#: rc.cpp:204
 #, no-c-format
 msgid "Normal"
 msgstr "Arferol"
 
 #. i18n: file sessiondialog.ui line 69
-#: rc.cpp:204
+#: rc.cpp:207
 #, no-c-format
 msgid "Tiny"
 msgstr "Pitw"
 
 #. i18n: file sessiondialog.ui line 74
-#: rc.cpp:207
+#: rc.cpp:210
 #, no-c-format
 msgid "Small"
 msgstr "Bach"
 
 #. i18n: file sessiondialog.ui line 79
-#: rc.cpp:210
+#: rc.cpp:213
 #, no-c-format
 msgid "Medium"
 msgstr "Canolig"
 
 #. i18n: file sessiondialog.ui line 84
-#: rc.cpp:213
+#: rc.cpp:216
 #, no-c-format
 msgid "Large"
 msgstr "Mawr"
 
 #. i18n: file sessiondialog.ui line 89
-#: rc.cpp:216
+#: rc.cpp:219
 #, no-c-format
 msgid "Huge"
 msgstr "Anferth"
 
 #. i18n: file sessiondialog.ui line 94
-#: rc.cpp:219
+#: rc.cpp:222
 #, no-c-format
 msgid "Linux"
 msgstr "Linux"
 
 #. i18n: file sessiondialog.ui line 99
-#: rc.cpp:222
+#: rc.cpp:225
 #, no-c-format
 msgid "Unicode"
 msgstr "Unicôd"
 
 #. i18n: file sessiondialog.ui line 137
-#: rc.cpp:228
+#: rc.cpp:231
 #, no-c-format
 msgid "&Font:"
 msgstr "&Wynebfath:"
 
 #. i18n: file sessiondialog.ui line 153
-#: rc.cpp:231
+#: rc.cpp:234
 #, no-c-format
 msgid "S&chema:"
 msgstr "S&gema :"
 
 #. i18n: file sessiondialog.ui line 164
-#: rc.cpp:234
+#: rc.cpp:237
 #, no-c-format
 msgid "$&TERM:"
 msgstr "$&TERM:"
 
 #. i18n: file sessiondialog.ui line 175
-#: rc.cpp:237
+#: rc.cpp:240
 #, no-c-format
 msgid "&Keytab:"
 msgstr "&Byselldab:"
 
 #. i18n: file sessiondialog.ui line 222
-#: rc.cpp:240
+#: rc.cpp:243
 #, no-c-format
 msgid "&Icon:"
 msgstr "&Eicon:"
 
 #. i18n: file sessiondialog.ui line 238
-#: rc.cpp:243
+#: rc.cpp:246
 #, no-c-format
 msgid "Session"
 msgstr "Sesiwn"
 
 #. i18n: file sessiondialog.ui line 262
-#: rc.cpp:246
+#: rc.cpp:249
 #, no-c-format
 msgid "Sa&ve Session..."
 msgstr "Cad&w Sesiwn..."
 
 #. i18n: file sessiondialog.ui line 270
-#: rc.cpp:249
+#: rc.cpp:252
 #, no-c-format
 msgid "&Remove Session"
 msgstr "&Gwaredu Sesiwn"
 
 #. i18n: file sessiondialog.ui line 307
-#: rc.cpp:252
+#: rc.cpp:255
 #, no-c-format
 msgid "General"
 msgstr "Cyffredinol"
 
 #. i18n: file sessiondialog.ui line 342
-#: rc.cpp:255
+#: rc.cpp:258
 #, no-c-format
 msgid "&Name:"
 msgstr "&Enw:"
 
 #. i18n: file sessiondialog.ui line 353
-#: rc.cpp:258
+#: rc.cpp:261
 #, no-c-format
 msgid "E&xecute:"
 msgstr "G&weithredu:"
 
 #. i18n: file sessiondialog.ui line 364
-#: rc.cpp:261
+#: rc.cpp:264
 #, no-c-format
 msgid "&Directory:"
 msgstr "&Cyfeiriadur:"
@@ -727,6 +735,12 @@ msgstr ""
 msgid "Error Removing Session"
 msgstr "Gwall tra'n Gwaredu Sesiwn"
 
+#~ msgid "Double Click"
+#~ msgstr "Clic Dwbl"
+
+#~ msgid "Misc"
+#~ msgstr "Amrywiol"
+
 #~ msgid "KCMKonsoleDialog"
 #~ msgstr "YmgomKCMKonsole"
 
diff --git a/tde-i18n-cy/messages/tdebase/kcmkurifilt.po b/tde-i18n-cy/messages/tdebase/kcmkurifilt.po
index cbe63d4e95f..70adc1881ba 100644
--- a/tde-i18n-cy/messages/tdebase/kcmkurifilt.po
+++ b/tde-i18n-cy/messages/tdebase/kcmkurifilt.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmkurifilt\n"
-"POT-Creation-Date: 2006-09-29 02:33+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-07-03 22:36+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,8 +27,8 @@ msgid ""
 "browsing features of TDE. "
 "<h2>Internet Keywords</h2>Internet Keywords let you type in the name of a "
 "brand, a project, a celebrity, etc... and go to the relevant location. For "
-"example you can just type \"TDE\" or \"K Desktop Environment\" in Konqueror to "
-"go to TDE's homepage."
+"example you can just type \"TDE\" or \"Trinity Desktop Environment\" in "
+"Konqueror to go to TDE's homepage."
 "<h2>Web Shortcuts</h2>Web Shortcuts are a quick way of using Web search "
 "engines. For example, type \"altavista:frobozz\" or \"av:frobozz\" and "
 "Konqueror will do a search on AltaVista for \"frobozz\". Even easier: just "
@@ -326,11 +327,11 @@ msgstr "<qt>Nid oes gan <b>%1</b> blygell cartref.</qt>"
 msgid "<qt>There is no user called <b>%1</b>.</qt>"
 msgstr "<qt>Nid oes defnyddiwr o'r enw <b>%1</b>.</qt>"
 
-#: plugins/shorturi/tdeshorturifilter.cpp:504
+#: plugins/shorturi/tdeshorturifilter.cpp:526
 msgid "<qt>The file or folder <b>%1</b> does not exist."
 msgstr "<qt>Nid yw'r ffeil neu'r blygell<b>%1</b> yn bodoli."
 
-#: plugins/shorturi/tdeshorturifilter.cpp:521
+#: plugins/shorturi/tdeshorturifilter.cpp:543
 msgid "&ShortURLs"
 msgstr "URLau&Byr"
 
diff --git a/tde-i18n-cy/messages/tdebase/kcmkwm.po b/tde-i18n-cy/messages/tdebase/kcmkwm.po
index 0840795fd27..9fbff8a35ca 100644
--- a/tde-i18n-cy/messages/tdebase/kcmkwm.po
+++ b/tde-i18n-cy/messages/tdebase/kcmkwm.po
@@ -10,10 +10,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmkwm\n"
-"POT-Creation-Date: 2006-04-11 03:54+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-07-04 13:05+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -73,12 +74,13 @@ msgid "(c) 1997 - 2002 KWin and KControl Authors"
 msgstr "(h) 1997 - 2002 Awduron KWin a KControl"
 
 #: main.cpp:190
+#, fuzzy
 msgid ""
 "<h1>Window Behavior</h1> Here you can customize the way windows behave when "
 "being moved, resized or clicked on. You can also specify a focus policy as well "
 "as a placement policy for new windows. "
 "<p>Please note that this configuration will not take effect if you do not use "
-"KWin as your window manager. If you do use a different window manager, please "
+"TWin as your window manager. If you do use a different window manager, please "
 "refer to its documentation for how to customize window behavior."
 msgstr ""
 "<h1>Ymddygiad Ffenestri</h1> Yma gallwch ffurfweddu'r ffordd mae ffenestri'n "
@@ -461,31 +463,31 @@ msgstr "Gweithredoli, Codi a Symud"
 msgid "Resize"
 msgstr "Newid Maint"
 
-#: windows.cpp:122
+#: windows.cpp:125
 msgid "Focus"
 msgstr "Canolbwynt"
 
-#: windows.cpp:129
+#: windows.cpp:132
 msgid "&Policy:"
 msgstr "&Polisi:"
 
-#: windows.cpp:132
+#: windows.cpp:135
 msgid "Click to Focus"
 msgstr "Clicio i Ganolbwyntio"
 
-#: windows.cpp:133
+#: windows.cpp:136
 msgid "Focus Follows Mouse"
 msgstr "Canolbwynt yn Dilyn Llygoden"
 
-#: windows.cpp:134
+#: windows.cpp:137
 msgid "Focus Under Mouse"
 msgstr "Canolbwynt o Dan Lygoden"
 
-#: windows.cpp:135
+#: windows.cpp:138
 msgid "Focus Strictly Under Mouse"
 msgstr "Canolbwynt yn Union o Dan Lygoden"
 
-#: windows.cpp:140
+#: windows.cpp:143
 msgid ""
 "The focus policy is used to determine the active window, i.e. the window you "
 "can work in. "
@@ -523,27 +525,107 @@ msgstr ""
 "Dan Lygoden' yn atal rhai nodweddion fel y cerdded drwy'r ffenestri Alt+Tab yn "
 "y modd TDE rhag weithio'n iawn."
 
-#: windows.cpp:165
+#: windows.cpp:168
 msgid "Auto &raise"
 msgstr "&Codi ymysgogol"
 
-#: windows.cpp:170 windows.cpp:183 windows.cpp:546
+#: windows.cpp:173 windows.cpp:186 windows.cpp:645
 msgid "Dela&y:"
 msgstr "&Saib:"
 
-#: windows.cpp:173 windows.cpp:186 windows.cpp:549 windows.cpp:577
+#: windows.cpp:176 windows.cpp:189 windows.cpp:648 windows.cpp:676
 msgid " msec"
 msgstr "m-eil"
 
-#: windows.cpp:178
+#: windows.cpp:181
 msgid "Delay focus"
 msgstr "Oedi canolbwynt"
 
-#: windows.cpp:189
-msgid "C&lick raise active window"
+#: windows.cpp:192
+#, fuzzy
+msgid "Click &raises active window"
 msgstr "C&lic i godi'r ffenestr weithredol"
 
-#: windows.cpp:196
+#: windows.cpp:199
+#, fuzzy
+msgid "Focus stealing prevention &level:"
+msgstr "Lefel o ataliad dwyn canolbwynt:"
+
+#: windows.cpp:202
+msgid ""
+"_: Focus Stealing Prevention Level\n"
+"None"
+msgstr "Dim"
+
+#: windows.cpp:203
+msgid ""
+"_: Focus Stealing Prevention Level\n"
+"Low"
+msgstr "Isel"
+
+#: windows.cpp:204
+msgid ""
+"_: Focus Stealing Prevention Level\n"
+"Normal"
+msgstr "Arferol"
+
+#: windows.cpp:205
+msgid ""
+"_: Focus Stealing Prevention Level\n"
+"High"
+msgstr "Uchel"
+
+#: windows.cpp:206
+msgid ""
+"_: Focus Stealing Prevention Level\n"
+"Extreme"
+msgstr "Eithaf"
+
+#: windows.cpp:209
+#, fuzzy
+msgid ""
+"<p>This option specifies how much TWin will try to prevent unwanted focus "
+"stealing caused by unexpected activation of new windows. (Note: This feature "
+"does not work with the Focus Under Mouse or Focus Strictly Under Mouse focus "
+"policies.)"
+"<ul>"
+"<li><em>None:</em> Prevention is turned off and new windows always become "
+"activated.</li>"
+"<li><em>Low:</em> Prevention is enabled; when some window does not have support "
+"for the underlying mechanism and TWin cannot reliably decide whether to "
+"activate the window or not, it will be activated. This setting may have both "
+"worse and better results than normal level, depending on the applications.</li>"
+"<li><em>Normal:</em> Prevention is enabled.</li>"
+"<li><em>High:</em> New windows get activated only if no window is currently "
+"active or if they belong to the currently active application. This setting is "
+"probably not really usable when not using mouse focus policy.</li>"
+"<li><em>Extreme:</em> All windows must be explicitly activated by the user.</li>"
+"</ul></p>"
+"<p>Windows that are prevented from stealing focus are marked as demanding "
+"attention, which by default means their taskbar entry will be highlighted. This "
+"can be changed in the Notifications control module.</p>"
+msgstr ""
+"Penoda'r dewisiad yma cymaint y bydd KWin yn ceisio atal dwyn canolbwynt "
+"annymunol a achosir gan weithredoli annisgwyl ffenestri newydd.  (Noder: nid "
+"y'w nodwedd yma yn gweithio efo'r polisïau Canolbwynt o Dan Lygoden neu "
+"Canolbwynt yn Union o Dan Lygoden.)"
+"<ul> "
+"<li><em>Dim:</em>Mae ataliad wedi'i ddiffodd, a bydd ffenestri newydd o hyd yn "
+"dod yn weithredol.</li>"
+"<li><em>Isel:</em>Alluogir ataliad; pan ni chynhelir y mecanwaith gwaelodol gan "
+"ryw ffenestr, a mae KWin yn methu penderfynu yn ddibynadwy a ddylai alluogi'r "
+"ffenestr neu beidio, bydd hi'n cael ei alluogi.  Gall y gosodiad yma gael "
+"canlyniadau gwell neu waeth na'r lefel arferol, yn dibynnu ar y "
+"cymhwysiadau.</li>"
+"<li><em>Arferol:</em>Alluogir ataliad.</li>"
+"<li><em>Uchel:</em>Gweithredolir ffenestri newydd, ond yn unig pan nid oes "
+"ffenestr sy'n weithredol yn gyfredol, neu pan maen nhw'n biau i'r cymhwysiad "
+"sy'n weithredol yn gyfredol.  Nid yw'r gosodiad yma yn wir ddefnyddiadwy heb "
+"ddefnyddio polisi canolbwynt llygoden hefyd.</li>"
+"<li><em>Eithaf:</em>Rhaid i bob ffenestr gael ei weithredoli yn benodol gan y "
+"defnyddiwr.</li></ul>"
+
+#: windows.cpp:231
 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."
@@ -551,7 +633,7 @@ msgstr ""
 "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:198
+#: windows.cpp:233
 msgid ""
 "This is the delay after which the window that the mouse pointer is over will "
 "automatically come to the front."
@@ -559,7 +641,7 @@ msgstr ""
 "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:202
+#: windows.cpp:237
 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 "
@@ -569,7 +651,7 @@ msgstr ""
 "rywle yng nghynnwys y ffenestr.  I amnewid hyn efo ffenestri anweithredol, "
 "rhaid i chi newid y gosodiadau yn y tab Gweithredoedd."
 
-#: windows.cpp:207
+#: windows.cpp:242
 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)."
@@ -577,7 +659,7 @@ 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:209
+#: windows.cpp:244
 msgid ""
 "This is the delay after which the window the mouse pointer is over will "
 "automatically receive focus."
@@ -585,15 +667,38 @@ msgstr ""
 "Dyma'r saib y derbynnia'r ffenestr y mae'r pwyntydd llygoden drosto ganolbwynt "
 "ar ei ôl."
 
-#: windows.cpp:214
+#: windows.cpp:247
+msgid "S&eparate screen focus"
+msgstr ""
+
+#: windows.cpp:249
+msgid ""
+"When this option is enabled, focus operations are limited only to the active "
+"Xinerama screen"
+msgstr ""
+
+#: windows.cpp:252
+#, fuzzy
+msgid "Active &mouse screen"
+msgstr "Gweithredoli a Chodi"
+
+#: windows.cpp:254
+msgid ""
+"When this option is enabled, active Xinerama screen (where for example new "
+"windows appear) is the screen with the mouse pointer. When disabled, the active "
+"Xinerama screen is the screen with the focused window. This option is by "
+"default disabled for Click to focus and enabled for other focus policies."
+msgstr ""
+
+#: windows.cpp:270
 msgid "Navigation"
 msgstr "Llywio"
 
-#: windows.cpp:218
+#: windows.cpp:274
 msgid "Show window list while switching windows"
 msgstr "Dangos y rhestr ffenestri tra'n amnewid ffenestri"
 
-#: windows.cpp:221
+#: windows.cpp:277
 msgid ""
 "Hold down the Alt key and press the Tab key repeatedly to walk through the "
 "windows on the current desktop (the Alt+Tab combination can be reconfigured).\n"
@@ -615,11 +720,11 @@ msgstr ""
 "naid-gelfigyn.  Yn ychwanegol, anfonir y ffenestr a weithredolwyd o'r blaen i'r "
 "cefn yn y modd yma."
 
-#: windows.cpp:233
+#: windows.cpp:289
 msgid "&Traverse windows on all desktops"
 msgstr "&Trawsteithio ffenestri ar bob penbwrdd"
 
-#: windows.cpp:236
+#: windows.cpp:292
 msgid ""
 "Leave this option disabled if you want to limit walking through windows to the "
 "current desktop."
@@ -627,11 +732,11 @@ msgstr ""
 "Gadewch y dewisiad yma'n analluog os ydych am gyfyngu cerdded trwy ffenestri "
 "i'r penbwrdd cyfredol."
 
-#: windows.cpp:240
+#: windows.cpp:296
 msgid "Desktop navi&gation wraps around"
 msgstr "Lly&wio penbwrdd yn amlapio"
 
-#: windows.cpp:243
+#: windows.cpp:299
 msgid ""
 "Enable this option if you want keyboard or active desktop border navigation "
 "beyond the edge of a desktop to take you to the opposite edge of the new "
@@ -641,11 +746,12 @@ msgstr ""
 "gweithredoltu hwnt i ymyl benbwrdd i ddod â chi i'r penbwrdd ar yr ymyl "
 "wrthwyneb."
 
-#: windows.cpp:247
-msgid "Popup desktop name on desktop &switch"
+#: windows.cpp:303
+#, fuzzy
+msgid "Popup &desktop name on desktop switch"
 msgstr "Enw penbwrdd yn neidio i fyny pan yn &newid penbwrdd"
 
-#: windows.cpp:250
+#: windows.cpp:306
 msgid ""
 "Enable this option if you wish to see the current desktop name popup whenever "
 "the current desktop is changed."
@@ -653,15 +759,15 @@ msgstr ""
 "Galluogwch y dewisiad yma os hoffech weld enw'r penbwrdd cyfredol yn neidio i "
 "fyny pan newidir y penbwrdd cyfredol."
 
-#: windows.cpp:535
+#: windows.cpp:634
 msgid "Shading"
 msgstr "Cysgodi"
 
-#: windows.cpp:537
+#: windows.cpp:636
 msgid "Anima&te"
 msgstr "&Bywlunio"
 
-#: windows.cpp:538
+#: windows.cpp:637
 msgid ""
 "Animate the action of reducing the window to its titlebar (shading) as well as "
 "the expansion of a shaded window"
@@ -669,11 +775,11 @@ msgstr ""
 "Bywlunio'r weithred o leihau'r ffenestr i'w bar teitl (rholio), yn ogystal âg "
 "ehangu ffenestr wedi'i rholio"
 
-#: windows.cpp:541
+#: windows.cpp:640
 msgid "&Enable hover"
 msgstr "&Galluogi hofran"
 
-#: windows.cpp:551
+#: windows.cpp:650
 msgid ""
 "If Shade Hover is enabled, a shaded window will un-shade automatically when the "
 "mouse pointer has been over the title bar for some time."
@@ -681,7 +787,7 @@ msgstr ""
 "Os yw Hofran Rholio yn alluog, fe ddatgysgodir ffenestr wedi'i rholio yn "
 "ymysgogol pan fo'r pwyntydd llygoden dros y bar teitl am ryw amser."
 
-#: windows.cpp:554
+#: windows.cpp:653
 msgid ""
 "Sets the time in milliseconds before the window unshades when the mouse pointer "
 "goes over the shaded window."
@@ -689,11 +795,11 @@ msgstr ""
 "Gosoda'r amser mewn mili-eiliadau cyn i'r ffenestr ddatrolio pan fo'r pwyntydd "
 "llygoden yn mynd dros y ffenestr wedi'i rholio."
 
-#: windows.cpp:565
+#: windows.cpp:664
 msgid "Active Desktop Borders"
 msgstr "Ffiniau Penbwrdd Gweithredol"
 
-#: windows.cpp:568
+#: windows.cpp:667
 msgid ""
 "If this option is enabled, moving the mouse to a screen border will change your "
 "desktop. This is e.g. useful if you want to drag windows from one desktop to "
@@ -703,23 +809,23 @@ msgstr ""
 "eich penbwrdd. Mae hyn yn ddefnyddiol e.e. os ydych am lusgo ffenestri o un "
 "penbwrdd i'r llall."
 
-#: windows.cpp:571
+#: windows.cpp:670
 msgid "D&isabled"
 msgstr "&Analluog"
 
-#: windows.cpp:572
+#: windows.cpp:671
 msgid "Only &when moving windows"
 msgstr "Dim ond &pan yn symud ffenestri"
 
-#: windows.cpp:573
+#: windows.cpp:672
 msgid "A&lways enabled"
 msgstr "Galluog &bob amser"
 
-#: windows.cpp:578
+#: windows.cpp:677
 msgid "Desktop &switch delay:"
 msgstr "&Saib newid penbwrdd:"
 
-#: windows.cpp:579
+#: windows.cpp:678
 msgid ""
 "Here you can set a delay for switching desktops using the active borders "
 "feature. Desktops will be switched after the mouse has been pushed against a "
@@ -729,89 +835,11 @@ msgstr ""
 "gweithredol. Newidir penbyrddau wedi gwthio'r lygoden yn erbyn ffin y sgrîn am "
 "y nifer penodol o fili-eiliadau."
 
-#: windows.cpp:592
-msgid "Focus stealing prevention level:"
-msgstr "Lefel o ataliad dwyn canolbwynt:"
-
-#: windows.cpp:594
-msgid ""
-"_: Focus Stealing Prevention Level\n"
-"None"
-msgstr "Dim"
-
-#: windows.cpp:595
-msgid ""
-"_: Focus Stealing Prevention Level\n"
-"Low"
-msgstr "Isel"
-
-#: windows.cpp:596
-msgid ""
-"_: Focus Stealing Prevention Level\n"
-"Normal"
-msgstr "Arferol"
-
-#: windows.cpp:597
-msgid ""
-"_: Focus Stealing Prevention Level\n"
-"High"
-msgstr "Uchel"
-
-#: windows.cpp:598
-msgid ""
-"_: Focus Stealing Prevention Level\n"
-"Extreme"
-msgstr "Eithaf"
-
-#: windows.cpp:602
-#, fuzzy
-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 "
-"does not work with the Focus Under Mouse or Focus Strictly Under Mouse focus "
-"policies.)"
-"<ul>"
-"<li><em>None:</em> Prevention is turned off and new windows always become "
-"activated.</li>"
-"<li><em>Low:</em> Prevention is enabled; when some window does not have support "
-"for the underlying mechanism and KWin cannot reliably decide whether to "
-"activate the window or not, it will be activated. This setting may have both "
-"worse and better results than normal level, depending on the applications.</li>"
-"<li><em>Normal:</em> Prevention is enabled.</li>"
-"<li><em>High:</em> New windows get activated only if no window is currently "
-"active or if they belong to the currently active application. This setting is "
-"probably not really usable when not using mouse focus policy.</li>"
-"<li><em>Extreme:</em> All windows must be explicitly activated by the user.</li>"
-"</ul></p>"
-"<p>Windows that are prevented from stealing focus are marked as demanding "
-"attention, which by default means their taskbar entry will be highlighted. This "
-"can be changed in the Notifications control module.</p>"
-msgstr ""
-"Penoda'r dewisiad yma cymaint y bydd KWin yn ceisio atal dwyn canolbwynt "
-"annymunol a achosir gan weithredoli annisgwyl ffenestri newydd.  (Noder: nid "
-"y'w nodwedd yma yn gweithio efo'r polisïau Canolbwynt o Dan Lygoden neu "
-"Canolbwynt yn Union o Dan Lygoden.)"
-"<ul> "
-"<li><em>Dim:</em>Mae ataliad wedi'i ddiffodd, a bydd ffenestri newydd o hyd yn "
-"dod yn weithredol.</li>"
-"<li><em>Isel:</em>Alluogir ataliad; pan ni chynhelir y mecanwaith gwaelodol gan "
-"ryw ffenestr, a mae KWin yn methu penderfynu yn ddibynadwy a ddylai alluogi'r "
-"ffenestr neu beidio, bydd hi'n cael ei alluogi.  Gall y gosodiad yma gael "
-"canlyniadau gwell neu waeth na'r lefel arferol, yn dibynnu ar y "
-"cymhwysiadau.</li>"
-"<li><em>Arferol:</em>Alluogir ataliad.</li>"
-"<li><em>Uchel:</em>Gweithredolir ffenestri newydd, ond yn unig pan nid oes "
-"ffenestr sy'n weithredol yn gyfredol, neu pan maen nhw'n biau i'r cymhwysiad "
-"sy'n weithredol yn gyfredol.  Nid yw'r gosodiad yma yn wir ddefnyddiadwy heb "
-"ddefnyddio polisi canolbwynt llygoden hefyd.</li>"
-"<li><em>Eithaf:</em>Rhaid i bob ffenestr gael ei weithredoli yn benodol gan y "
-"defnyddiwr.</li></ul>"
-
-#: windows.cpp:625
+#: windows.cpp:690
 msgid "Hide utility windows for inactive applications"
 msgstr ""
 
-#: windows.cpp:627
+#: windows.cpp:692
 msgid ""
 "When turned on, utility windows (tool windows, torn-off menus,...) of inactive "
 "applications will be hidden and will be shown only when the application becomes "
@@ -819,15 +847,15 @@ msgid ""
 "type for this feature to work."
 msgstr ""
 
-#: windows.cpp:780
+#: windows.cpp:834
 msgid "Windows"
 msgstr "Ffenestri"
 
-#: windows.cpp:788
+#: windows.cpp:842
 msgid "Di&splay content in moving windows"
 msgstr "Dango&s cynnwys mewn ffenestri symudol"
 
-#: windows.cpp:790
+#: windows.cpp:844
 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 "
@@ -837,11 +865,11 @@ msgstr ""
 "yn hytrach na dangos 'sgerbwd' ffenestr. Efallai na fydd y canlyniad yn plesio "
 "ar beiriannau araf heb gyflymiad graffeg."
 
-#: windows.cpp:794
+#: windows.cpp:848
 msgid "Display content in &resizing windows"
 msgstr "Dangos cynnwys mewn ffenestri sy'n newid &maint"
 
-#: windows.cpp:796
+#: windows.cpp:850
 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 "
@@ -851,11 +879,11 @@ msgstr ""
 "maint, yn hytrach na dangos 'sgerbwd' ffenestr. Efallai na fydd y canlyniad yn "
 "plesio ar beiriannau araf."
 
-#: windows.cpp:800
+#: windows.cpp:854
 msgid "Display window &geometry when moving or resizing"
 msgstr "Dangos &geometreg ffenestr tra'n symud neu newid maint"
 
-#: windows.cpp:802
+#: windows.cpp:856
 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 corner of "
@@ -865,11 +893,11 @@ msgstr ""
 "symud neu newid ei maint. Dengys lleoliad y ffenestr o gornel pen-chwith y "
 "sgrîn, ynghŷd â'i maint."
 
-#: windows.cpp:812
+#: windows.cpp:866
 msgid "Animate minimi&ze and restore"
 msgstr "Bywlunio &lleihau ac adfer"
 
-#: windows.cpp:814
+#: windows.cpp:868
 msgid ""
 "Enable this option if you want an animation shown when windows are minimized or "
 "restored."
@@ -877,15 +905,15 @@ msgstr ""
 "Galluogwch y dewisiad yma os ydych am ddangos bywluniad pan leiheir neu adferir "
 "ffenestri."
 
-#: windows.cpp:828
+#: windows.cpp:882
 msgid "Slow"
 msgstr "Araf"
 
-#: windows.cpp:832
+#: windows.cpp:886
 msgid "Fast"
 msgstr "Cyflym"
 
-#: windows.cpp:836
+#: windows.cpp:890
 msgid ""
 "Here you can set the speed of the animation shown when windows are minimized "
 "and restored. "
@@ -893,11 +921,11 @@ msgstr ""
 "Yma gallwch osod cyflymder y bywluniad y'i dengys pan leiheir ac adferir "
 "ffenestri."
 
-#: windows.cpp:842
+#: windows.cpp:896
 msgid "Allow moving and resizing o&f maximized windows"
 msgstr "Caniatáu symud a newid main&t ffenestri ehangedig"
 
-#: windows.cpp:844
+#: windows.cpp:898
 msgid ""
 "When enabled, this feature activates the border of maximized windows and allows "
 "you to move or resize them, just like for normal windows"
@@ -905,36 +933,36 @@ msgstr ""
 "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:850
+#: windows.cpp:904
 msgid "&Placement:"
 msgstr "&Lleoliad:"
 
-#: windows.cpp:853
+#: windows.cpp:907
 msgid "Smart"
 msgstr "Deallus"
 
-#: windows.cpp:854
+#: windows.cpp:908
 #, fuzzy
 msgid "Maximizing"
 msgstr "Ehangu"
 
-#: windows.cpp:855
+#: windows.cpp:909
 msgid "Cascade"
 msgstr "Rhaeadr"
 
-#: windows.cpp:856
+#: windows.cpp:910
 msgid "Random"
 msgstr "Ar Hap"
 
-#: windows.cpp:857
+#: windows.cpp:911
 msgid "Centered"
 msgstr "Canoledig"
 
-#: windows.cpp:858
+#: windows.cpp:912
 msgid "Zero-Cornered"
 msgstr "Cornel-Sero"
 
-#: windows.cpp:865
+#: windows.cpp:919
 #, fuzzy
 msgid ""
 "The placement policy determines where a new window will appear on the desktop. "
@@ -956,19 +984,19 @@ msgstr ""
 "<li><em>Rhaeadr</em> rhaeadra'r ffenestri</li> "
 "<li><em>Ar Hap</em> defnyddia lleoliad hap</li></ul>"
 
-#: windows.cpp:904
+#: windows.cpp:958
 msgid "Snap Zones"
 msgstr "Cylchfeydd Snap"
 
-#: windows.cpp:908 windows.cpp:917
+#: windows.cpp:962 windows.cpp:971
 msgid "none"
 msgstr "dim"
 
-#: windows.cpp:910
+#: windows.cpp:964
 msgid "&Border snap zone:"
 msgstr "Cylchfa snap ff&in"
 
-#: windows.cpp:912
+#: windows.cpp:966
 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 near it."
@@ -976,11 +1004,11 @@ msgstr ""
 "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:919
+#: windows.cpp:973
 msgid "&Window snap zone:"
 msgstr "Cylchfa snap &ffenestr"
 
-#: windows.cpp:921
+#: windows.cpp:975
 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're moved near "
@@ -990,11 +1018,11 @@ msgstr ""
 "wna i'r ffenestri snapio i'w gilydd pan yn cael eu symud yn agos i ffenestr "
 "arall."
 
-#: windows.cpp:925
+#: windows.cpp:979
 msgid "Snap windows onl&y when overlapping"
 msgstr "Snapio ffenestri pan yn gorgyffwrdd yn &unig"
 
-#: windows.cpp:926
+#: windows.cpp:980
 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 window or "
@@ -1004,18 +1032,18 @@ msgstr ""
 "h.y. ni chânt eu snapio os y daw'r ffenestr yn agos i ffenestr arall neu i "
 "ffin."
 
-#: windows.cpp:1023 windows.cpp:1027
+#: windows.cpp:1077 windows.cpp:1081
 msgid ""
 "_n:  pixel\n"
 " pixels"
 msgstr ""
 
-#: windows.cpp:1226
+#: windows.cpp:1280
 msgid ""
 "<qt><b>It seems that alpha channel support is not available.</b>"
 "<br>"
 "<br>Please make sure you have <a href=\"http://www.freedesktop.org/\">"
-"Xorg &ge; 6.8</a>, and installed the kompmgr that came with twin."
+"Xorg &ge; 6.8</a>, and installed the composition manager that came with twin."
 "<br>Also, make sure you have the following entries in your XConfig (e.g. "
 "/etc/X11/xorg.conf):"
 "<br>"
@@ -1030,115 +1058,134 @@ msgid ""
 "<br>In <i>Section \"Device\"</i></qt>"
 msgstr ""
 
-#: windows.cpp:1246
+#: windows.cpp:1300
 msgid "Apply translucency only to decoration"
 msgstr ""
 
-#: windows.cpp:1254
+#: windows.cpp:1308
 #, fuzzy
 msgid "Active windows:"
 msgstr "Ffenestr Mewnol Anweithredol"
 
-#: windows.cpp:1261
+#: windows.cpp:1315
 #, fuzzy
 msgid "Inactive windows:"
 msgstr "Ffenestr Mewnol Anweithredol"
 
-#: windows.cpp:1268
+#: windows.cpp:1322
 #, fuzzy
 msgid "Moving windows:"
 msgstr "Ffenestri"
 
-#: windows.cpp:1275
+#: windows.cpp:1329
 #, fuzzy
 msgid "Dock windows:"
 msgstr "Ffenestri"
 
-#: windows.cpp:1284
+#: windows.cpp:1338
 msgid "Treat 'keep above' windows as active ones"
 msgstr ""
 
-#: windows.cpp:1287
+#: windows.cpp:1341
 msgid "Disable ARGB windows (ignores window alpha maps, fixes gtk1 apps)"
 msgstr ""
 
-#: windows.cpp:1291
+#: windows.cpp:1347
+msgid "Use OpenGL compositor (best performance)"
+msgstr ""
+
+#: windows.cpp:1354
 msgid "Opacity"
 msgstr "Didreiddiad"
 
-#: windows.cpp:1297
+#: windows.cpp:1360
+msgid ""
+"Use shadows (standard effects should be disabled in the Styles module if this "
+"is checked)"
+msgstr ""
+
+#: windows.cpp:1368
 #, fuzzy
-msgid "Use shadows"
+msgid "Base shadow radius:"
 msgstr "Rholio"
 
-#: windows.cpp:1305
+#: windows.cpp:1375
 #, fuzzy
-msgid "Active window size:"
+msgid "Inactive window distance from background:"
 msgstr "Ffenestr Mewnol Anweithredol"
 
-#: windows.cpp:1312
-#, fuzzy
-msgid "Inactive window size:"
-msgstr "Ffenestr Mewnol Anweithredol"
+#: windows.cpp:1382
+msgid "Active window distance from background:"
+msgstr ""
 
-#: windows.cpp:1319
-#, fuzzy
-msgid "Dock window size:"
-msgstr "Ffenestri"
+#: windows.cpp:1389
+msgid "Dock distance from background:"
+msgstr ""
+
+#: windows.cpp:1396
+msgid "Menu distance from background:"
+msgstr ""
 
-#: windows.cpp:1326
+#: windows.cpp:1409
 msgid "Vertical offset:"
 msgstr ""
 
-#: windows.cpp:1333
+#: windows.cpp:1416
 msgid "Horizontal offset:"
 msgstr ""
 
-#: windows.cpp:1340
+#: windows.cpp:1423
 msgid "Shadow color:"
 msgstr "Lliw cysgod:"
 
-#: windows.cpp:1346
+#: windows.cpp:1429
 msgid "Remove shadows on move"
 msgstr ""
 
-#: windows.cpp:1348
+#: windows.cpp:1431
 msgid "Remove shadows on resize"
 msgstr ""
 
-#: windows.cpp:1351
+#: windows.cpp:1434
 msgid "Shadows"
 msgstr "Cysgodion"
 
-#: windows.cpp:1356
+#: windows.cpp:1439
 msgid "Fade-in windows (including popups)"
 msgstr ""
 
-#: windows.cpp:1357
+#: windows.cpp:1440
+msgid ""
+"Fade-in menus (requires menu fade effect to be disabled in the Styles module)"
+msgstr ""
+
+#: windows.cpp:1441
 msgid "Fade between opacity changes"
 msgstr ""
 
-#: windows.cpp:1360
+#: windows.cpp:1444
 msgid "Fade-in speed:"
 msgstr ""
 
-#: windows.cpp:1363
+#: windows.cpp:1447
 msgid "Fade-out speed:"
 msgstr ""
 
-#: windows.cpp:1370
+#: windows.cpp:1455
 msgid "Effects"
 msgstr "Effeithiau"
 
-#: windows.cpp:1372
-msgid "Use translucency/shadows"
+#: windows.cpp:1457
+msgid "Enable the Trinity window composition manager"
 msgstr ""
 
-#: windows.cpp:1624
-msgid ""
-"<qt>Translucency support is new and may cause problems"
-"<br> including crashes (sometimes the translucency engine, seldom even X).</qt>"
-msgstr ""
+#, fuzzy
+#~ msgid "Active window size:"
+#~ msgstr "Ffenestr Mewnol Anweithredol"
+
+#, fuzzy
+#~ msgid "Dock window size:"
+#~ msgstr "Ffenestri"
 
 #~ msgid " pixels"
 #~ msgstr "picsel"
diff --git a/tde-i18n-cy/messages/tdebase/kcmlaunch.po b/tde-i18n-cy/messages/tdebase/kcmlaunch.po
index c008f3e0a62..3162ede310c 100644
--- a/tde-i18n-cy/messages/tdebase/kcmlaunch.po
+++ b/tde-i18n-cy/messages/tdebase/kcmlaunch.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmlaunch\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-12-29 08:05+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdebase/kcmlayout.po b/tde-i18n-cy/messages/tdebase/kcmlayout.po
index 48211f1acba..590d4a55d12 100644
--- a/tde-i18n-cy/messages/tdebase/kcmlayout.po
+++ b/tde-i18n-cy/messages/tdebase/kcmlayout.po
@@ -10,577 +10,578 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmlayout\n"
-"POT-Creation-Date: 2008-07-08 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-07-04 14:19+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.2\n"
 "\n"
 
-#: kcmlayout.cpp:563
+#: kcmlayout.cpp:566
 msgid "None"
 msgstr "Dim"
 
-#: kcmlayout.cpp:832
+#: kcmlayout.cpp:835
 msgid "Brazilian ABNT2"
 msgstr "Brasilaidd ABNT2"
 
-#: kcmlayout.cpp:833
+#: kcmlayout.cpp:836
 msgid "Dell 101-key PC"
 msgstr "PC 101-bysell Dell"
 
-#: kcmlayout.cpp:834
+#: kcmlayout.cpp:837
 msgid "Everex STEPnote"
 msgstr "Everex STEPnote"
 
-#: kcmlayout.cpp:835
+#: kcmlayout.cpp:838
 msgid "Generic 101-key PC"
 msgstr "PC 101-bysell cyffredinol"
 
-#: kcmlayout.cpp:836
+#: kcmlayout.cpp:839
 msgid "Generic 102-key (Intl) PC"
 msgstr "PC 102-bysell (rhyngwladol) cyffredinol"
 
-#: kcmlayout.cpp:837
+#: kcmlayout.cpp:840
 msgid "Generic 104-key PC"
 msgstr "PC 104-bysell cyffredinol"
 
-#: kcmlayout.cpp:838
+#: kcmlayout.cpp:841
 msgid "Generic 105-key (Intl) PC"
 msgstr "PC 105-bysell (rhyngwladol) cyffredinol"
 
-#: kcmlayout.cpp:839
+#: kcmlayout.cpp:842
 msgid "Japanese 106-key"
 msgstr "Siapanaidd 106-bysell"
 
-#: kcmlayout.cpp:840
+#: kcmlayout.cpp:843
 msgid "Microsoft Natural"
 msgstr "Naturiol Microsoft"
 
-#: kcmlayout.cpp:841
+#: kcmlayout.cpp:844
 msgid "Northgate OmniKey 101"
 msgstr "Northgate OmniKey 101"
 
-#: kcmlayout.cpp:842
+#: kcmlayout.cpp:845
 msgid "Keytronic FlexPro"
 msgstr "Keytronic FlexPro"
 
-#: kcmlayout.cpp:843
+#: kcmlayout.cpp:846
 msgid "Winbook Model XP5"
 msgstr "Model XP5 Winbook"
 
-#: kcmlayout.cpp:846
+#: kcmlayout.cpp:849
 msgid "Group Shift/Lock behavior"
 msgstr "Ymddygiad Syflyd/Cloi Grŵp"
 
-#: kcmlayout.cpp:847
+#: kcmlayout.cpp:850
 msgid "R-Alt switches group while pressed"
 msgstr "Alt-Dde'n cyfnewid grŵp tra'i wesgir"
 
-#: kcmlayout.cpp:848
+#: kcmlayout.cpp:851
 msgid "Right Alt key changes group"
 msgstr "Bysell Alt Dde'n newid grŵp"
 
-#: kcmlayout.cpp:849
+#: kcmlayout.cpp:852
 msgid "Caps Lock key changes group"
 msgstr "Bysell Gloi Priflythrennau'n newid grŵp"
 
-#: kcmlayout.cpp:850
+#: kcmlayout.cpp:853
 msgid "Menu key changes group"
 msgstr "Bysell Ddewislen yn newid grŵp"
 
-#: kcmlayout.cpp:851
+#: kcmlayout.cpp:854
 msgid "Both Shift keys together change group"
 msgstr "Y ddwy fysell Syflyd â'i gilydd yn newid grŵp"
 
-#: kcmlayout.cpp:852
+#: kcmlayout.cpp:855
 msgid "Control+Shift changes group"
 msgstr "Rheoli+Syflyd yn newid grŵp"
 
-#: kcmlayout.cpp:853
+#: kcmlayout.cpp:856
 msgid "Alt+Control changes group"
 msgstr "Alt+Rheoli yn newid grŵp"
 
-#: kcmlayout.cpp:854
+#: kcmlayout.cpp:857
 msgid "Alt+Shift changes group"
 msgstr "Alt+Syflyd yn newid grŵp"
 
-#: kcmlayout.cpp:855
+#: kcmlayout.cpp:858
 msgid "Control Key Position"
 msgstr "Lleoliad Bysell Reoli"
 
-#: kcmlayout.cpp:856
+#: kcmlayout.cpp:859
 msgid "Make CapsLock an additional Control"
 msgstr "Gwneud y Clo Priflythrennau'n Reolydd ychwanegol"
 
-#: kcmlayout.cpp:857
+#: kcmlayout.cpp:860
 msgid "Swap Control and Caps Lock"
 msgstr "Cyfnewid Rheoli â'r Clo Priflythrennau"
 
-#: kcmlayout.cpp:858
+#: kcmlayout.cpp:861
 msgid "Control key at left of 'A'"
 msgstr "Bysell Reoli ar ochr chwith 'A'"
 
-#: kcmlayout.cpp:859
+#: kcmlayout.cpp:862
 msgid "Control key at bottom left"
 msgstr "Bysell Reoli ar y gwaelod ar y chwith"
 
-#: kcmlayout.cpp:860
+#: kcmlayout.cpp:863
 msgid "Use keyboard LED to show alternative group"
 msgstr "Defnyddio LED bysellfwrdd i ddangos grŵp amgen"
 
-#: kcmlayout.cpp:861
+#: kcmlayout.cpp:864
 msgid "Num_Lock LED shows alternative group"
 msgstr "LED Clo Rhif yn dangos grŵp amgen"
 
-#: kcmlayout.cpp:862
+#: kcmlayout.cpp:865
 msgid "Caps_Lock LED shows alternative group"
 msgstr "LED Clo Priflythrennau'n dangos grŵp amgen"
 
-#: kcmlayout.cpp:863
+#: kcmlayout.cpp:866
 msgid "Scroll_Lock LED shows alternative group"
 msgstr "LED Clo Sgrolio'n dangos grŵp amgen"
 
-#: kcmlayout.cpp:866
+#: kcmlayout.cpp:869
 msgid "Left Win-key switches group while pressed"
 msgstr "Bysell Ffenestr Chwith yn cyfnewid grŵp tra'i gwesgir"
 
-#: kcmlayout.cpp:867
+#: kcmlayout.cpp:870
 msgid "Right Win-key switches group while pressed"
 msgstr "Bysell Ffenestr Dde yn cyfnewid grŵp tra'i gwesgir"
 
-#: kcmlayout.cpp:868
+#: kcmlayout.cpp:871
 msgid "Both Win-keys switch group while pressed"
 msgstr "Y Ddau Fysell Ffenestr yn cyfnewid grŵp tra'u gwesgir"
 
-#: kcmlayout.cpp:869
+#: kcmlayout.cpp:872
 msgid "Left Win-key changes group"
 msgstr "Bysell Ffenestr Chwith yn newid grŵp"
 
-#: kcmlayout.cpp:870
+#: kcmlayout.cpp:873
 msgid "Right Win-key changes group"
 msgstr "Bysell Ffenestr Dde yn newid grŵp"
 
-#: kcmlayout.cpp:871
+#: kcmlayout.cpp:874
 msgid "Third level choosers"
 msgstr "Dewisyddion trydydd lefel"
 
-#: kcmlayout.cpp:872
+#: kcmlayout.cpp:875
 msgid "Press Right Control to choose 3rd level"
 msgstr "Gwasgu Rheoli-Dde i ddewis 3ydd lefel"
 
-#: kcmlayout.cpp:873
+#: kcmlayout.cpp:876
 msgid "Press Menu key to choose 3rd level"
 msgstr "Gwasgu'r Fysell Ddewislen i ddewis 3ydd lefel"
 
-#: kcmlayout.cpp:874
+#: kcmlayout.cpp:877
 msgid "Press any of Win-keys to choose 3rd level"
 msgstr "Gwasgu unrhyw Fysell Ffenestr i ddewis 3ydd lefel"
 
-#: kcmlayout.cpp:875
+#: kcmlayout.cpp:878
 msgid "Press Left Win-key to choose 3rd level"
 msgstr "Gwasgu'r Fysell Ffenestr Chwith i ddewis 3ydd lefel"
 
-#: kcmlayout.cpp:876
+#: kcmlayout.cpp:879
 msgid "Press Right Win-key to choose 3rd level"
 msgstr "Gwasgu'r Fysell Ffenestr Dde i ddewis 3ydd lefel"
 
-#: kcmlayout.cpp:877
+#: kcmlayout.cpp:880
 msgid "CapsLock key behavior"
 msgstr "Ymddygiad bysell Glo Priflythrennau"
 
-#: kcmlayout.cpp:878
+#: kcmlayout.cpp:881
 msgid "uses internal capitalization. Shift cancels Caps."
 msgstr "defnyddia priflythrennu mewnol. Syflyd yn diddymu'r Prifl."
 
-#: kcmlayout.cpp:879
+#: kcmlayout.cpp:882
 msgid "uses internal capitalization. Shift doesn't cancel Caps."
 msgstr "defnyddia priflythrennu mewnol. Syflyd ddim yn diddymu'r Prifl."
 
-#: kcmlayout.cpp:880
+#: kcmlayout.cpp:883
 msgid "acts as Shift with locking. Shift cancels Caps."
 msgstr "ymddwyn fel Syflyd â chlo. Syflyd yn diddymu'r Prifl."
 
-#: kcmlayout.cpp:881
+#: kcmlayout.cpp:884
 msgid "acts as Shift with locking. Shift doesn't cancel Caps."
 msgstr "ymddwyn fel Syflyd â chlo. Syflyd ddim yn diddymu'r Prifl."
 
-#: kcmlayout.cpp:882
+#: kcmlayout.cpp:885
 msgid "Alt/Win key behavior"
 msgstr "Ymddygiad bysyll Alt/Ffenestr"
 
-#: kcmlayout.cpp:883
+#: kcmlayout.cpp:886
 msgid "Add the standard behavior to Menu key."
 msgstr "Ychwanegu ymddygiad safonol i'r fysell Ddewislen."
 
-#: kcmlayout.cpp:884
+#: kcmlayout.cpp:887
 msgid "Alt and Meta on the Alt keys (default)."
 msgstr "Alt a Meta ar y bysyll Alt (rhagosod)."
 
-#: kcmlayout.cpp:885
+#: kcmlayout.cpp:888
 msgid "Meta is mapped to the Win-keys."
 msgstr "Meta'n fapiedig i'r bysyll-Ffenestr."
 
-#: kcmlayout.cpp:886
+#: kcmlayout.cpp:889
 msgid "Meta is mapped to the left Win-key."
 msgstr "Meta'n fapiedig i'r bysell Ffenestr chwith."
 
-#: kcmlayout.cpp:887
+#: kcmlayout.cpp:890
 msgid "Super is mapped to the Win-keys (default)."
 msgstr "Sŵper yn fapiedig i'r bysyll-Ffenestr (rhagosod)."
 
-#: kcmlayout.cpp:888
+#: kcmlayout.cpp:891
 msgid "Hyper is mapped to the Win-keys."
 msgstr "Hyper yn fapiedig i'r bysyll-Ffenestr."
 
-#: kcmlayout.cpp:889
+#: kcmlayout.cpp:892
 msgid "Right Alt is Compose"
 msgstr "Alt Dde yw'r fysell Gyfansoddi"
 
-#: kcmlayout.cpp:890
+#: kcmlayout.cpp:893
 msgid "Right Win-key is Compose"
 msgstr "Y fysell Ffenestr Dde yw'r fysell Gyfansoddi"
 
-#: kcmlayout.cpp:891
+#: kcmlayout.cpp:894
 msgid "Menu is Compose"
 msgstr "Y fysell Ddewislen yw'r fysell Gyfansoddi"
 
-#: kcmlayout.cpp:894
+#: kcmlayout.cpp:897
 msgid "Both Ctrl keys together change group"
 msgstr "Y ddwy fysell Rheoli (Ctrl) â'i gilydd yn newid grŵp"
 
-#: kcmlayout.cpp:895
+#: kcmlayout.cpp:898
 msgid "Both Alt keys together change group"
 msgstr "Y ddwy fysell Alt â'i gilydd yn newid grŵp"
 
-#: kcmlayout.cpp:896
+#: kcmlayout.cpp:899
 msgid "Left Shift key changes group"
 msgstr "Bysell Syflyd (Shift) Chwith yn newid grŵp"
 
-#: kcmlayout.cpp:897
+#: kcmlayout.cpp:900
 msgid "Right Shift key changes group"
 msgstr "Bysell Syflyd (Shift)  Dde'n newid grŵp"
 
-#: kcmlayout.cpp:898
+#: kcmlayout.cpp:901
 msgid "Right Ctrl key changes group"
 msgstr "Bysell Rheoli (Ctrl) Dde'n newid grŵp"
 
-#: kcmlayout.cpp:899
+#: kcmlayout.cpp:902
 msgid "Left Alt key changes group"
 msgstr "Bysell Alt Chwith yn newid grŵp"
 
-#: kcmlayout.cpp:900
+#: kcmlayout.cpp:903
 msgid "Left Ctrl key changes group"
 msgstr "Bysell Rheoli (Ctrl) Chwith yn newid grŵp"
 
-#: kcmlayout.cpp:901
+#: kcmlayout.cpp:904
 msgid "Compose Key"
 msgstr "Bysell Gyfansoddi"
 
-#: kcmlayout.cpp:904
+#: kcmlayout.cpp:907
 msgid "Shift with numpad keys works as in MS Windows."
 msgstr "Mae Syflyd (Shift) efo bysyll y pad rhifau yn gweithio fel yn Windows."
 
-#: kcmlayout.cpp:905
+#: kcmlayout.cpp:908
 msgid "Special keys (Ctrl+Alt+<key>) handled in a server."
 msgstr "Bysyll arbennig (Ctrl+Alt+<key>) wedi'u trin mewn gweinydd."
 
-#: kcmlayout.cpp:906
+#: kcmlayout.cpp:909
 msgid "Miscellaneous compatibility options"
 msgstr "Amrywiol ddewisiadau cytunedd"
 
-#: kcmlayout.cpp:907
+#: kcmlayout.cpp:910
 msgid "Right Control key works as Right Alt"
 msgstr "Bysell Rheoli (Ctrl) Dde'n gweithio fel Alt Dde"
 
-#: kcmlayout.cpp:910
+#: kcmlayout.cpp:913
 #, fuzzy
 msgid "Right Alt key switches group while pressed"
 msgstr "Bysell Ffenestr Dde yn cyfnewid grŵp tra'i gwesgir"
 
-#: kcmlayout.cpp:911
+#: kcmlayout.cpp:914
 #, fuzzy
 msgid "Left Alt key switches group while pressed"
 msgstr "Bysell Ffenestr Chwith yn cyfnewid grŵp tra'i gwesgir"
 
-#: kcmlayout.cpp:912
+#: kcmlayout.cpp:915
 #, fuzzy
 msgid "Press Right Alt-key to choose 3rd level"
 msgstr "Gwasgu'r Fysell Ffenestr Dde i ddewis 3ydd lefel"
 
-#: kcmlayout.cpp:915
+#: kcmlayout.cpp:918
 msgid "R-Alt switches group while pressed."
 msgstr "Alt-Dde'n cyfnewid grŵp tra'i wesgir."
 
-#: kcmlayout.cpp:916
+#: kcmlayout.cpp:919
 #, fuzzy
 msgid "Left Alt key switches group while pressed."
 msgstr "Bysell Ffenestr Chwith yn cyfnewid grŵp tra'i gwesgir"
 
-#: kcmlayout.cpp:917
+#: kcmlayout.cpp:920
 msgid "Left Win-key switches group while pressed."
 msgstr "Bysell Ffenestr Chwith yn cyfnewid grŵp tra'i gwesgir."
 
-#: kcmlayout.cpp:918
+#: kcmlayout.cpp:921
 msgid "Right Win-key switches group while pressed."
 msgstr "Bysell Ffenestr Dde yn cyfnewid grŵp tra'i gwesgir."
 
-#: kcmlayout.cpp:919
+#: kcmlayout.cpp:922
 msgid "Both Win-keys switch group while pressed."
 msgstr "Y Ddau Fysell Ffenestr yn cyfnewid grŵp tra'u gwesgir."
 
-#: kcmlayout.cpp:920
+#: kcmlayout.cpp:923
 #, fuzzy
 msgid "Right Ctrl key switches group while pressed."
 msgstr "Bysell Ffenestr Dde yn cyfnewid grŵp tra'i gwesgir"
 
-#: kcmlayout.cpp:921
+#: kcmlayout.cpp:924
 msgid "Right Alt key changes group."
 msgstr "Bysell Alt Dde'n newid grŵp."
 
-#: kcmlayout.cpp:922
+#: kcmlayout.cpp:925
 msgid "Left Alt key changes group."
 msgstr "Bysell Alt Chwith yn newid grŵp."
 
-#: kcmlayout.cpp:923
+#: kcmlayout.cpp:926
 #, fuzzy
 msgid "CapsLock key changes group."
 msgstr "Bysell Gloi Priflythrennau'n newid grŵp"
 
-#: kcmlayout.cpp:924
+#: kcmlayout.cpp:927
 #, fuzzy
 msgid "Shift+CapsLock changes group."
 msgstr "Bysell Gloi Priflythrennau'n newid grŵp"
 
-#: kcmlayout.cpp:925
+#: kcmlayout.cpp:928
 msgid "Both Shift keys together change group."
 msgstr "Y ddwy fysell Syflyd â'i gilydd yn newid grŵp."
 
-#: kcmlayout.cpp:926
+#: kcmlayout.cpp:929
 msgid "Both Alt keys together change group."
 msgstr "Y ddwy fysell Alt â'i gilydd yn newid grŵp."
 
-#: kcmlayout.cpp:927
+#: kcmlayout.cpp:930
 msgid "Both Ctrl keys together change group."
 msgstr "Y ddwy fysell Rheoli (Ctrl) â'i gilydd yn newid grŵp."
 
-#: kcmlayout.cpp:928
+#: kcmlayout.cpp:931
 #, fuzzy
 msgid "Ctrl+Shift changes group."
 msgstr "Rheoli+Syflyd yn newid grŵp"
 
-#: kcmlayout.cpp:929
+#: kcmlayout.cpp:932
 #, fuzzy
 msgid "Alt+Ctrl changes group."
 msgstr "Alt+Rheoli yn newid grŵp"
 
-#: kcmlayout.cpp:930
+#: kcmlayout.cpp:933
 msgid "Alt+Shift changes group."
 msgstr "Alt+Syflyd yn newid grŵp."
 
-#: kcmlayout.cpp:931
+#: kcmlayout.cpp:934
 msgid "Menu key changes group."
 msgstr "Bysell Ddewislen yn newid grŵp."
 
-#: kcmlayout.cpp:932
+#: kcmlayout.cpp:935
 msgid "Left Win-key changes group."
 msgstr "Bysell Ffenestr Chwith yn newid grŵp."
 
-#: kcmlayout.cpp:933
+#: kcmlayout.cpp:936
 msgid "Right Win-key changes group."
 msgstr "Bysell Ffenestr Dde yn newid grŵp."
 
-#: kcmlayout.cpp:934
+#: kcmlayout.cpp:937
 msgid "Left Shift key changes group."
 msgstr "Bysell Syflyd (Shift) Chwith yn newid grŵp."
 
-#: kcmlayout.cpp:935
+#: kcmlayout.cpp:938
 msgid "Right Shift key changes group."
 msgstr "Bysell Syflyd (Shift)  Dde'n newid grŵp."
 
-#: kcmlayout.cpp:936
+#: kcmlayout.cpp:939
 msgid "Left Ctrl key changes group."
 msgstr "Bysell Rheoli (Ctrl) Chwith yn newid grŵp."
 
-#: kcmlayout.cpp:937
+#: kcmlayout.cpp:940
 msgid "Right Ctrl key changes group."
 msgstr "Bysell Rheoli (Ctrl) Dde'n newid grŵp."
 
-#: kcmlayout.cpp:938
+#: kcmlayout.cpp:941
 #, fuzzy
 msgid "Press Right Ctrl to choose 3rd level."
 msgstr "Gwasgu Rheoli-Dde i ddewis 3ydd lefel"
 
-#: kcmlayout.cpp:939
+#: kcmlayout.cpp:942
 msgid "Press Menu key to choose 3rd level."
 msgstr "Gwasgu'r Fysell Ddewislen i ddewis 3ydd lefel."
 
-#: kcmlayout.cpp:940
+#: kcmlayout.cpp:943
 msgid "Press any of Win-keys to choose 3rd level."
 msgstr "Gwasgu unrhyw Fysell Ffenestr i ddewis 3ydd lefel."
 
-#: kcmlayout.cpp:941
+#: kcmlayout.cpp:944
 msgid "Press Left Win-key to choose 3rd level."
 msgstr "Gwasgu'r Fysell Ffenestr Chwith i ddewis 3ydd lefel."
 
-#: kcmlayout.cpp:942
+#: kcmlayout.cpp:945
 msgid "Press Right Win-key to choose 3rd level."
 msgstr "Gwasgu'r Fysell Ffenestr Dde i ddewis 3ydd lefel."
 
-#: kcmlayout.cpp:943
+#: kcmlayout.cpp:946
 #, fuzzy
 msgid "Press any of Alt keys to choose 3rd level."
 msgstr "Gwasgu unrhyw Fysell Ffenestr i ddewis 3ydd lefel"
 
-#: kcmlayout.cpp:944
+#: kcmlayout.cpp:947
 #, fuzzy
 msgid "Press Left Alt key to choose 3rd level."
 msgstr "Gwasgu'r Fysell Ffenestr Chwith i ddewis 3ydd lefel"
 
-#: kcmlayout.cpp:945
+#: kcmlayout.cpp:948
 #, fuzzy
 msgid "Press Right Alt key to choose 3rd level."
 msgstr "Gwasgu'r Fysell Ffenestr Dde i ddewis 3ydd lefel"
 
-#: kcmlayout.cpp:946
+#: kcmlayout.cpp:949
 #, fuzzy
 msgid "Ctrl key position"
 msgstr "Lleoliad Bysell Reoli"
 
-#: kcmlayout.cpp:947
+#: kcmlayout.cpp:950
 #, fuzzy
 msgid "Make CapsLock an additional Ctrl."
 msgstr "Gwneud y Clo Priflythrennau'n Reolydd ychwanegol"
 
-#: kcmlayout.cpp:948
+#: kcmlayout.cpp:951
 #, fuzzy
 msgid "Swap Ctrl and CapsLock."
 msgstr "Cyfnewid Rheoli â'r Clo Priflythrennau"
 
-#: kcmlayout.cpp:949
+#: kcmlayout.cpp:952
 #, fuzzy
 msgid "Ctrl key at left of 'A'"
 msgstr "Bysell Reoli ar ochr chwith 'A'"
 
-#: kcmlayout.cpp:950
+#: kcmlayout.cpp:953
 #, fuzzy
 msgid "Ctrl key at bottom left"
 msgstr "Bysell Reoli ar y gwaelod ar y chwith"
 
-#: kcmlayout.cpp:951
+#: kcmlayout.cpp:954
 #, fuzzy
 msgid "Right Ctrl key works as Right Alt."
 msgstr "Bysell Rheoli (Ctrl) Dde'n gweithio fel Alt Dde"
 
-#: kcmlayout.cpp:952
+#: kcmlayout.cpp:955
 msgid "Use keyboard LED to show alternative group."
 msgstr "Defnyddio LED bysellfwrdd i ddangos grŵp amgen."
 
-#: kcmlayout.cpp:953
+#: kcmlayout.cpp:956
 #, fuzzy
 msgid "NumLock LED shows alternative group."
 msgstr "LED Clo Rhif yn dangos grŵp amgen"
 
-#: kcmlayout.cpp:954
+#: kcmlayout.cpp:957
 #, fuzzy
 msgid "CapsLock LED shows alternative group."
 msgstr "LED Clo Priflythrennau'n dangos grŵp amgen"
 
-#: kcmlayout.cpp:955
+#: kcmlayout.cpp:958
 #, fuzzy
 msgid "ScrollLock LED shows alternative group."
 msgstr "LED Clo Sgrolio'n dangos grŵp amgen"
 
-#: kcmlayout.cpp:956
+#: kcmlayout.cpp:959
 #, fuzzy
 msgid "CapsLock uses internal capitalization. Shift cancels CapsLock."
 msgstr "defnyddia priflythrennu mewnol. Syflyd yn diddymu'r Prifl."
 
-#: kcmlayout.cpp:957
+#: kcmlayout.cpp:960
 #, fuzzy
 msgid "CapsLock uses internal capitalization. Shift doesn't cancel CapsLock."
 msgstr "defnyddia priflythrennu mewnol. Syflyd ddim yn diddymu'r Prifl."
 
-#: kcmlayout.cpp:958
+#: kcmlayout.cpp:961
 #, fuzzy
 msgid "CapsLock acts as Shift with locking. Shift cancels CapsLock."
 msgstr "ymddwyn fel Syflyd â chlo. Syflyd yn diddymu'r Prifl."
 
-#: kcmlayout.cpp:959
+#: kcmlayout.cpp:962
 #, fuzzy
 msgid "CapsLock acts as Shift with locking. Shift doesn't cancel CapsLock."
 msgstr "ymddwyn fel Syflyd â chlo. Syflyd ddim yn diddymu'r Prifl."
 
-#: kcmlayout.cpp:960
+#: kcmlayout.cpp:963
 msgid "CapsLock just locks the Shift modifier."
 msgstr ""
 
-#: kcmlayout.cpp:961
+#: kcmlayout.cpp:964
 msgid "CapsLock toggles normal capitalization of alphabetic characters."
 msgstr ""
 
-#: kcmlayout.cpp:962
+#: kcmlayout.cpp:965
 msgid "CapsLock toggles Shift so all keys are affected."
 msgstr ""
 
-#: kcmlayout.cpp:963
+#: kcmlayout.cpp:966
 #, fuzzy
 msgid "Alt and Meta are on the Alt keys (default)."
 msgstr "Alt a Meta ar y bysyll Alt (rhagosod)."
 
-#: kcmlayout.cpp:964
+#: kcmlayout.cpp:967
 #, fuzzy
 msgid "Alt is mapped to the right Win-key and Super to Menu."
 msgstr "Meta'n fapiedig i'r bysell Ffenestr chwith."
 
-#: kcmlayout.cpp:965
+#: kcmlayout.cpp:968
 #, fuzzy
 msgid "Compose key position"
 msgstr "Lleoliad Bysell Reoli"
 
-#: kcmlayout.cpp:966
+#: kcmlayout.cpp:969
 msgid "Right Alt is Compose."
 msgstr "Alt Dde yw'r fysell Gyfansoddi."
 
-#: kcmlayout.cpp:967
+#: kcmlayout.cpp:970
 msgid "Right Win-key is Compose."
 msgstr "Y fysell Ffenestr Dde yw'r fysell Gyfansoddi."
 
-#: kcmlayout.cpp:968
+#: kcmlayout.cpp:971
 msgid "Menu is Compose."
 msgstr "Y fysell Ddewislen yw'r fysell Gyfansoddi."
 
-#: kcmlayout.cpp:969
+#: kcmlayout.cpp:972
 #, fuzzy
 msgid "Right Ctrl is Compose."
 msgstr "Alt Dde yw'r fysell Gyfansoddi"
 
-#: kcmlayout.cpp:970
+#: kcmlayout.cpp:973
 #, fuzzy
 msgid "Caps Lock is Compose."
 msgstr "Y fysell Ddewislen yw'r fysell Gyfansoddi"
 
-#: kcmlayout.cpp:971
+#: kcmlayout.cpp:974
 #, fuzzy
 msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
 msgstr "Bysyll arbennig (Ctrl+Alt+<key>) wedi'u trin mewn gweinydd."
 
-#: kcmlayout.cpp:972
+#: kcmlayout.cpp:975
 msgid "Adding the EuroSign to certain keys"
 msgstr ""
 
-#: kcmlayout.cpp:973
+#: kcmlayout.cpp:976
 msgid "Add the EuroSign to the E key."
 msgstr ""
 
-#: kcmlayout.cpp:974
+#: kcmlayout.cpp:977
 msgid "Add the EuroSign to the 5 key."
 msgstr ""
 
-#: kcmlayout.cpp:975
+#: kcmlayout.cpp:978
 msgid "Add the EuroSign to the 2 key."
 msgstr ""
 
@@ -1410,14 +1411,35 @@ msgstr ""
 "creu'r un effaith â gwasgu'r fysell honno sawl gwaith: anfonir nôdau Tab o hyd "
 "nes i chi ryddhau'r fysell."
 
-#. i18n: file kcmmiscwidget.ui line 263
+#. i18n: file kcmmiscwidget.ui line 252
 #: rc.cpp:191
 #, no-c-format
+msgid "Use &BIOS settings"
+msgstr ""
+
+#. i18n: file kcmmiscwidget.ui line 258
+#: rc.cpp:194
+#, fuzzy, no-c-format
+msgid ""
+"If you check this option, pressing and holding down a key emits the same "
+"character over and over again as set in the BIOS. For example, pressing and "
+"holding down the Tab key will have the same effect as that of pressing that key "
+"several times in succession: Tab characters continue to be emitted until you "
+"release the key."
+msgstr ""
+"Os dewiswch y dewisiad yma, bydd gwasgu a chadw bysell i lawr yn anfon yr un "
+"nôd eto ac eto. Er enghraifft, bydd gwasgu a chadw'r fysell Tab i lawr yn "
+"creu'r un effaith â gwasgu'r fysell honno sawl gwaith: anfonir nôdau Tab o hyd "
+"nes i chi ryddhau'r fysell."
+
+#. i18n: file kcmmiscwidget.ui line 277
+#: rc.cpp:197
+#, no-c-format
 msgid "%"
 msgstr "%"
 
-#. i18n: file kcmmiscwidget.ui line 266
-#: rc.cpp:194 rc.cpp:200
+#. i18n: file kcmmiscwidget.ui line 280
+#: rc.cpp:200 rc.cpp:206
 #, no-c-format
 msgid ""
 "If supported, this option allows you to hear audible clicks from your "
@@ -1436,8 +1458,8 @@ msgstr ""
 "neu glicio'r botymau i fyny/i lawr ar y blwch troelli. Bydd gosod lefel y sain "
 "yn 0% yn diffodd y cliciau bysyll."
 
-#. i18n: file kcmmiscwidget.ui line 282
-#: rc.cpp:197
+#. i18n: file kcmmiscwidget.ui line 296
+#: rc.cpp:203
 #, no-c-format
 msgid "Key click &volume:"
 msgstr "&Lefel sain clic bysyll:"
diff --git a/tde-i18n-cy/messages/tdebase/kcmlocale.po b/tde-i18n-cy/messages/tdebase/kcmlocale.po
index b5d056542d3..b40b468a339 100644
--- a/tde-i18n-cy/messages/tdebase/kcmlocale.po
+++ b/tde-i18n-cy/messages/tdebase/kcmlocale.po
@@ -10,10 +10,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmlocale\n"
-"POT-Creation-Date: 2006-08-23 02:32+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-07-04 14:21+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -84,46 +85,59 @@ msgstr "&Amser && Dyddiadau"
 msgid "&Other"
 msgstr "&Arall"
 
-#: kcmlocale.cpp:54
+#: kcmlocale.cpp:55
 #, fuzzy
 msgid "Country or region:"
 msgstr "Gwlad:"
 
-#: kcmlocale.cpp:60
+#: kcmlocale.cpp:61
 msgid "Languages:"
 msgstr "Ieithoedd:"
 
-#: kcmlocale.cpp:69
+#: kcmlocale.cpp:70
 msgid "Add Language"
 msgstr "Ychwanegu Iaith"
 
-#: kcmlocale.cpp:73
+#: kcmlocale.cpp:74
 msgid "Remove Language"
 msgstr "Gwaredu Iaith"
 
-#: kcmlocale.cpp:74
+#: kcmlocale.cpp:75
 msgid "Move Up"
 msgstr "Codi"
 
-#: kcmlocale.cpp:75
+#: kcmlocale.cpp:76
 msgid "Move Down"
 msgstr "Gostwng"
 
-#: kcmlocale.cpp:235
+#: kcmlocale.cpp:107
+msgid "Install New Language"
+msgstr ""
+
+#: kcmlocale.cpp:109
+#, fuzzy
+msgid "Uninstall Language"
+msgstr "Ychwanegu Iaith"
+
+#: kcmlocale.cpp:111
+msgid "Select System Language"
+msgstr ""
+
+#: kcmlocale.cpp:297
 msgid "Other"
 msgstr "Arall"
 
-#: kcmlocale.cpp:243 kcmlocale.cpp:290 kcmlocale.cpp:311
+#: kcmlocale.cpp:305 kcmlocale.cpp:352 kcmlocale.cpp:373
 msgid "without name"
 msgstr "heb enw"
 
-#: kcmlocale.cpp:403
+#: kcmlocale.cpp:465
 #, fuzzy
 msgid ""
 "This is where you live. TDE will use the defaults for this country or region."
 msgstr "Dyma lle y trigwch. Defnyddia TDE rhagosodion y wlad yma."
 
-#: kcmlocale.cpp:406
+#: kcmlocale.cpp:468
 msgid ""
 "This will add a language to the list. If the language is already in the list, "
 "the old one will be moved instead."
@@ -131,11 +145,11 @@ msgstr ""
 "Ychwanega hwn iaith i'r restr. Os yw'r iaith eisioes yn y restr, symudir yr hen "
 "iaith yn ei lle."
 
-#: kcmlocale.cpp:410
+#: kcmlocale.cpp:472
 msgid "This will remove the highlighted language from the list."
 msgstr "Gwareda hyn yr iaith amlygedig o'r restr."
 
-#: kcmlocale.cpp:413
+#: kcmlocale.cpp:475
 msgid ""
 "TDE programs will be displayed in the first available language in this list.\n"
 "If none of the languages are available, US English will be used."
@@ -143,7 +157,7 @@ msgstr ""
 "Dangosir rhaglenni TDE yn yr iaith gyntaf yn y rhestr sydd ar gael.\n"
 " Os nid oes un o'r ieithoedd ar gael, defnyddir Saesneg yr UDau."
 
-#: kcmlocale.cpp:420
+#: kcmlocale.cpp:482
 #, fuzzy
 msgid ""
 "Here you can choose your country or region. The settings for languages, numbers "
@@ -152,7 +166,7 @@ msgstr ""
 "Yma gallwch ddewis eich gwlad. Newida'r gosodiadau iaith, rhifau ayyb i'r "
 "gwerthoedd cyfatebol yn ymysgogol."
 
-#: kcmlocale.cpp:427
+#: kcmlocale.cpp:489
 #, fuzzy
 msgid ""
 "Here you can choose the languages that will be used by TDE. If the first "
diff --git a/tde-i18n-cy/messages/tdebase/kcmmedia.po b/tde-i18n-cy/messages/tdebase/kcmmedia.po
index 5a9ed1f21e0..36ef8f62120 100644
--- a/tde-i18n-cy/messages/tdebase/kcmmedia.po
+++ b/tde-i18n-cy/messages/tdebase/kcmmedia.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2008-07-08 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -45,19 +46,19 @@ msgstr ""
 msgid "Maintainer"
 msgstr "Cynhaliwr"
 
-#: main.cpp:70
+#: main.cpp:71
 msgid "Help for the application design"
 msgstr ""
 
-#: main.cpp:100
+#: main.cpp:101
 msgid "FIXME : Write me..."
 msgstr ""
 
-#: managermodule.cpp:40
+#: managermodule.cpp:49
 msgid "No support for HAL on this system"
 msgstr ""
 
-#: managermodule.cpp:47
+#: managermodule.cpp:56
 msgid "No support for CD polling on this system"
 msgstr ""
 
@@ -65,54 +66,283 @@ msgstr ""
 msgid "All Mime Types"
 msgstr ""
 
-#. i18n: file managermoduleview.ui line 24
+#. i18n: file managermoduleview.ui line 16
 #: rc.cpp:3
 #, no-c-format
-msgid "Enable HAL backend"
+msgid "ManagerModuleView"
 msgstr ""
 
 #. i18n: file managermoduleview.ui line 27
 #: rc.cpp:6
 #, no-c-format
-msgid ""
-"Select this if you want to enable the Hardware Abstraction Layer "
-"(http://hal.freedesktop.org/wiki/Software/hal) support."
+msgid "Enable HAL backend"
 msgstr ""
 
-#. i18n: file managermoduleview.ui line 35
+#. i18n: file managermoduleview.ui line 30
 #: rc.cpp:9
 #, no-c-format
-msgid "Enable CD polling"
+msgid ""
+"Select this if you want to enable the Hardware Abstraction Layer "
+"(http://hal.freedesktop.org/wiki/Software/hal) support."
 msgstr ""
 
 #. i18n: file managermoduleview.ui line 38
 #: rc.cpp:12
 #, no-c-format
-msgid "Select this to enable the CD polling."
+msgid "Enable CD polling"
 msgstr ""
 
-#. i18n: file managermoduleview.ui line 46
+#. i18n: file managermoduleview.ui line 41
 #: rc.cpp:15
 #, no-c-format
-msgid "Enable medium application autostart after mount"
+msgid "Select this to enable the CD polling."
 msgstr ""
 
 #. i18n: file managermoduleview.ui line 49
 #: rc.cpp:18
 #, no-c-format
+msgid "Enable medium application autostart after mount"
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 52
+#: rc.cpp:21
+#, no-c-format
 msgid ""
 "Select this if you want to enable application autostart after mounting a "
 "device."
 msgstr ""
 
+#. i18n: file managermoduleview.ui line 60
+#: rc.cpp:24
+#, no-c-format
+msgid "Mount options"
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 80
+#: rc.cpp:27
+#, no-c-format
+msgid ""
+"Here you can specify default mount options for your storage media. Please note "
+"that some options are not supported for certain filesystems and/or medium. You "
+"will be able to redefine all these options on per-volume basis later, using "
+"Properties dialog of the corresponding volume."
+"<br>\n"
+"Some of the options are tristate. Leave them \"undefined\" to let TDE choose "
+"the best value depending on your media."
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 99
+#: rc.cpp:31
+#, no-c-format
+msgid "Read only"
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 102
+#: rc.cpp:34
+#, no-c-format
+msgid "By default, mount all file systems read-only."
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 110
+#: rc.cpp:37
+#, no-c-format
+msgid "Mount as user"
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 113
+#: rc.cpp:40
+#, no-c-format
+msgid "Mount this file system as user."
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 121
+#: rc.cpp:43
+#, no-c-format
+msgid "Flushed IO"
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 127
+#: rc.cpp:46
+#, no-c-format
+msgid ""
+"Always flush all data to the hot plug devices immediately and don't cache it."
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 135
+#: rc.cpp:49
+#, no-c-format
+msgid "Synchronous"
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 141
+#: rc.cpp:52
+#, no-c-format
+msgid "All I/O to the file system should be done synchronously."
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 149
+#: rc.cpp:55
+#, no-c-format
+msgid "Quiet"
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 152
+#: rc.cpp:58
+#, no-c-format
+msgid ""
+"Attempts to chown or chmod files do not return errors, although they fail. Use "
+"with caution!"
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 160
+#: rc.cpp:61
+#, no-c-format
+msgid "UTF-8 charset"
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 163
+#: rc.cpp:64
+#, no-c-format
+msgid ""
+"UTF8 is the filesystem safe 8-bit encoding of Unicode that is used by the "
+"console. It can be be enabled for the filesystem with this option."
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 179
+#: rc.cpp:67
+#, no-c-format
+msgid "Short names:"
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 197
+#: rc.cpp:70
+#, no-c-format
+msgid ""
+"<h2>Defines  the  behaviour  for  creation and display of filenames which fit "
+"into 8.3 characters. If a long name for a file exists, it will always be "
+"preferred display.</h2>\n"
+"\n"
+"<h3><b>Lower</b></h3>\n"
+"Force the short name to lower case upon display; store a long name when the "
+"short name is not all upper case.\n"
+"\n"
+"<h3><b>Windows 95</b></h3>\n"
+"Force the short name to upper case upon display; store a long name when the "
+"short name is not all upper case.\n"
+"\n"
+"<h3><b>Windows NT</b></h3>\n"
+"Display the shortname as is; store a long name when the short name is not all "
+"lower case or all upper case.\n"
+"\n"
+"<h3><b>Mixed</b></h3>\n"
+"Display the short name as is; store a long name when the short name is not all "
+"upper case."
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 203
+#: rc.cpp:85
+#, no-c-format
+msgid "All Data"
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 208
+#: rc.cpp:88
+#, no-c-format
+msgid "Ordered"
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 213
+#: rc.cpp:91
+#, no-c-format
+msgid "Writeback"
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 228
+#: rc.cpp:94
+#, no-c-format
+msgid "Journaling:"
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 243
+#: rc.cpp:97
+#, no-c-format
+msgid ""
+"<h2>Specifies  the journalling mode for file data. Metadata is always "
+"journaled. </h2>\n"
+"           \n"
+"<h3><b>All Data</b></h3>\n"
+"           All  data  is  committed into the journal prior to being written "
+"into the main file system. This is the slowest variant with the highest data "
+"security.\n"
+"\n"
+"<h3><b>Ordered</b></h3>\n"
+"           All data is forced directly out to the main  file system prior to "
+"its metadata being committed to the journal.\n"
+"\n"
+"<h3><b>Write Back</b></h3>\n"
+"           Data ordering is not preserved - data may be written into the main "
+"file system after its metadata has been committed to the journal.  This is "
+"rumoured to  be the  highest-throughput option.  It guarantees internal file "
+"system integrity,  however it can allow old data to appear in files after  a  "
+"crash  and  journal recovery."
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 249
+#: rc.cpp:109
+#, no-c-format
+msgid "Lower"
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 254
+#: rc.cpp:112
+#, no-c-format
+msgid "Windows 95"
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 259
+#: rc.cpp:115
+#, no-c-format
+msgid "Windows NT"
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 264
+#: rc.cpp:118
+#, no-c-format
+msgid "Mixed"
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 278
+#: rc.cpp:121
+#, no-c-format
+msgid "Mount automatically"
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 281
+#: rc.cpp:124
+#, no-c-format
+msgid "By default, mount all file systems automatically."
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 289
+#: rc.cpp:127
+#, no-c-format
+msgid "Access time updates"
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 295
+#: rc.cpp:130
+#, no-c-format
+msgid "Update inode access time for each access."
+msgstr ""
+
 #. i18n: file notifiermoduleview.ui line 48
-#: rc.cpp:21
+#: rc.cpp:133
 #, no-c-format
 msgid "Medium types:"
 msgstr ""
 
 #. i18n: file notifiermoduleview.ui line 64
-#: rc.cpp:24
+#: rc.cpp:136
 #, no-c-format
 msgid ""
 "Here is the list of the available types of medium which can be monitored. You "
@@ -121,43 +351,43 @@ msgid ""
 msgstr ""
 
 #. i18n: file notifiermoduleview.ui line 90
-#: rc.cpp:27
+#: rc.cpp:139
 #, no-c-format
 msgid "&Add..."
 msgstr "Ychw&anegu..."
 
 #. i18n: file notifiermoduleview.ui line 93
-#: rc.cpp:30
+#: rc.cpp:142
 #, no-c-format
 msgid "Click here to add an action."
 msgstr ""
 
 #. i18n: file notifiermoduleview.ui line 104
-#: rc.cpp:36
+#: rc.cpp:148
 #, no-c-format
 msgid "Click here to delete the selected action if possible."
 msgstr ""
 
 #. i18n: file notifiermoduleview.ui line 112
-#: rc.cpp:39
+#: rc.cpp:151
 #, no-c-format
 msgid "&Edit..."
 msgstr "&Golygu..."
 
 #. i18n: file notifiermoduleview.ui line 115
-#: rc.cpp:42
+#: rc.cpp:154
 #, no-c-format
 msgid "Click here to edit the selected action if possible."
 msgstr ""
 
 #. i18n: file notifiermoduleview.ui line 123
-#: rc.cpp:45
+#: rc.cpp:157
 #, no-c-format
 msgid "&Toggle as Auto Action"
 msgstr ""
 
 #. i18n: file notifiermoduleview.ui line 126
-#: rc.cpp:48
+#: rc.cpp:160
 #, no-c-format
 msgid ""
 "Click here to perform this action automatically on detection of the selected "
@@ -165,7 +395,7 @@ msgid ""
 msgstr ""
 
 #. i18n: file notifiermoduleview.ui line 153
-#: rc.cpp:51
+#: rc.cpp:163
 #, no-c-format
 msgid ""
 "Here is the list of the available actions. You can modify them by using the "
@@ -173,25 +403,25 @@ msgid ""
 msgstr ""
 
 #. i18n: file serviceview.ui line 30
-#: rc.cpp:54 rc.cpp:57 serviceconfigdialog.cpp:40
+#: rc.cpp:166 rc.cpp:169 serviceconfigdialog.cpp:40
 #, no-c-format
 msgid "Edit Service"
 msgstr "Golygu Gwasanaeth"
 
 #. i18n: file serviceview.ui line 188
-#: rc.cpp:60
+#: rc.cpp:172
 #, no-c-format
 msgid "Available &medium types:"
 msgstr ""
 
 #. i18n: file serviceview.ui line 191
-#: rc.cpp:63
+#: rc.cpp:175
 #, no-c-format
 msgid "Displa&y service for:"
 msgstr ""
 
 #. i18n: file serviceview.ui line 218
-#: rc.cpp:66
+#: rc.cpp:178
 #, no-c-format
 msgid "Command:"
 msgstr "Gorchymyn:"
diff --git a/tde-i18n-cy/messages/tdebase/kcmnic.po b/tde-i18n-cy/messages/tdebase/kcmnic.po
index 92c28705619..03c38ed8e32 100644
--- a/tde-i18n-cy/messages/tdebase/kcmnic.po
+++ b/tde-i18n-cy/messages/tdebase/kcmnic.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmnic\n"
-"POT-Creation-Date: 2006-12-31 02:37+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-07-04 14:21+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdebase/kcmnotify.po b/tde-i18n-cy/messages/tdebase/kcmnotify.po
index 2d3f8e2b3f1..77e18088f72 100644
--- a/tde-i18n-cy/messages/tdebase/kcmnotify.po
+++ b/tde-i18n-cy/messages/tdebase/kcmnotify.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmnotify\n"
-"POT-Creation-Date: 2008-07-08 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-12-28 20:23+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -29,8 +30,9 @@ msgid ""
 msgstr "kyfieithu@dotmon.com"
 
 #: knotify.cpp:56
+#, fuzzy
 msgid ""
-"<h1>System Notifications</h1>TDE allows for a great deal of control over how "
+"<h1>System Notifications</h1>KDE allows for a great deal of control over how "
 "you will be notified when certain events occur. There are several choices as to "
 "how you are notified:"
 "<ul>"
diff --git a/tde-i18n-cy/messages/tdebase/kcmperformance.po b/tde-i18n-cy/messages/tdebase/kcmperformance.po
index b05c1e067aa..f1c8b2e1f3f 100644
--- a/tde-i18n-cy/messages/tdebase/kcmperformance.po
+++ b/tde-i18n-cy/messages/tdebase/kcmperformance.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmperformance\n"
-"POT-Creation-Date: 2006-08-23 02:32+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-07-04 17:09+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -193,14 +194,14 @@ msgstr ""
 msgid ""
 "<p>During startup TDE needs to perform a check of its system configuration "
 "(mimetypes, installed applications, etc.), and in case the configuration has "
-"changed since the last time, the system configuration cache (KSyCoCa) needs to "
-"be updated.</p>"
+"changed since the last time, the system configuration cache (TDESyCoCa) needs "
+"to be updated.</p>"
 "<p>This option delays the check, which avoid scanning all directories "
 "containing files describing the system during TDE startup, thus making TDE "
 "startup faster. However, in the rare case the system configuration has changed "
 "since the last time, and the change is needed before this delayed check takes "
-"place, this option may lead to various problems (missing applications in the K "
-"Menu, reports from applications about missing required mimetypes, etc.).</p>"
+"place, this option may lead to various problems (missing applications in the "
+"TDE Menu, reports from applications about missing required mimetypes, etc.).</p>"
 "<p>Changes of system configuration mostly happen by (un)installing "
 "applications. It is therefore recommended to turn this option temporarily off "
 "while (un)installing applications.</p>"
diff --git a/tde-i18n-cy/messages/tdebase/kcmprintmgr.po b/tde-i18n-cy/messages/tdebase/kcmprintmgr.po
index 66b0ccc9540..001e77b2f5d 100644
--- a/tde-i18n-cy/messages/tdebase/kcmprintmgr.po
+++ b/tde-i18n-cy/messages/tdebase/kcmprintmgr.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmprintmgr\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-07-16 12:23+0100\n"
 "Last-Translator: KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdebase/kcmsamba.po b/tde-i18n-cy/messages/tdebase/kcmsamba.po
index b04b2769057..f6e85e7e781 100644
--- a/tde-i18n-cy/messages/tdebase/kcmsamba.po
+++ b/tde-i18n-cy/messages/tdebase/kcmsamba.po
@@ -10,10 +10,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmsamba\n"
-"POT-Creation-Date: 2005-07-06 01:31+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-12-28 20:22+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -72,7 +73,8 @@ msgid "TDE Panel System Information Control Module"
 msgstr "Modwl Reoli Gwybodaeth Cysawd Panel TDE"
 
 #: main.cpp:88
-msgid "(c) 2002 TDE Information Control Module Samba Team"
+#, fuzzy
+msgid "(c) 2002 KDE Information Control Module Samba Team"
 msgstr "(h)(c) 2002 Tîm Samba Modwl Reoli Gwybodaeth TDE"
 
 #: kcmsambaimports.cpp:46 ksmbstatus.cpp:63
diff --git a/tde-i18n-cy/messages/tdebase/kcmscreensaver.po b/tde-i18n-cy/messages/tdebase/kcmscreensaver.po
index f69435b6689..68eb2d9c486 100644
--- a/tde-i18n-cy/messages/tdebase/kcmscreensaver.po
+++ b/tde-i18n-cy/messages/tdebase/kcmscreensaver.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmscreensaver\n"
-"POT-Creation-Date: 2008-07-08 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-07-04 17:16+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -194,7 +195,7 @@ msgstr "Chwith gwaelod :"
 msgid "Bottom right:"
 msgstr "De gwaelod :"
 
-#: scrnsave.cpp:89
+#: scrnsave.cpp:104
 msgid ""
 "<h1>Screen Saver</h1> This module allows you to enable and configure a screen "
 "saver. Note that you can enable a screen saver even if you have power saving "
@@ -216,104 +217,148 @@ msgstr ""
 "wnewch hynny gallwch ddal i gloi'r sgrîn yn uniongyrchol gan ddefnyddio "
 "gweithred \"Cloi'r Sgrîn\" y penbwrdd."
 
-#: scrnsave.cpp:132
+#: scrnsave.cpp:147
 msgid "Screen Saver"
 msgstr "arbedydd Sgrîn"
 
-#: scrnsave.cpp:147
+#: scrnsave.cpp:162
 msgid "Select the screen saver to use."
 msgstr ""
 
-#: scrnsave.cpp:150
+#: scrnsave.cpp:165
 msgid "&Setup..."
 msgstr "&Gosod..."
 
-#: scrnsave.cpp:154
+#: scrnsave.cpp:169
 msgid "Configure the screen saver's options, if any."
 msgstr ""
 
-#: scrnsave.cpp:156
+#: scrnsave.cpp:171
 msgid "&Test"
 msgstr "&Profi"
 
-#: scrnsave.cpp:160
+#: scrnsave.cpp:175
 #, fuzzy
 msgid "Show a full screen preview of the screen saver."
 msgstr "Yma gallwch weld rhagolwg o'r arbedydd sgrîn dewisiedig."
 
-#: scrnsave.cpp:162
+#: scrnsave.cpp:177
 msgid "Settings"
 msgstr "Gosodiadau"
 
-#: scrnsave.cpp:169
+#: scrnsave.cpp:182
 msgid "Start a&utomatically"
 msgstr "Dechrau yn y&mysgogol"
 
-#: scrnsave.cpp:172
+#: scrnsave.cpp:184
 msgid "Automatically start the screen saver after a period of inactivity."
 msgstr ""
 
-#: scrnsave.cpp:180 scrnsave.cpp:213
+#: scrnsave.cpp:191 scrnsave.cpp:219
 msgid "After:"
 msgstr "Wedi:"
 
-#: scrnsave.cpp:186
+#: scrnsave.cpp:197
 msgid " min"
 msgstr "munud"
 
-#: scrnsave.cpp:195
+#: scrnsave.cpp:205
 msgid "The period of inactivity after which the screen saver should start."
 msgstr ""
 
-#: scrnsave.cpp:201
+#: scrnsave.cpp:209
 msgid "&Require password to stop"
 msgstr "&Mynnu cyfrinair i atal"
 
-#: scrnsave.cpp:208
+#: scrnsave.cpp:214
 msgid ""
 "Prevent potential unauthorized use by requiring a password to stop the screen "
 "saver."
 msgstr ""
 
-#: scrnsave.cpp:216
+#: scrnsave.cpp:221
 msgid ""
 "The amount of time, after the screen saver has started, to ask for the unlock "
 "password."
 msgstr ""
 
-#: scrnsave.cpp:221
+#: scrnsave.cpp:226
 msgid " sec"
 msgstr "eil"
 
-#: scrnsave.cpp:239
+#: scrnsave.cpp:242
 msgid "Choose the period after which the display will be locked. "
 msgstr "Dewis y cyfnod y cloir y dangosydd ar ei ôl."
 
+#: scrnsave.cpp:246
+msgid "&Delay saver start after lock"
+msgstr ""
+
+#: scrnsave.cpp:251
+msgid ""
+"When manually locking the screen, wait to start the screen saver until the "
+"configured start delay has elapsed."
+msgstr ""
+
 #: scrnsave.cpp:253
+msgid "&Use Secure Attention Key"
+msgstr ""
+
+#: scrnsave.cpp:258
+msgid "Require Secure Attention Key prior to displaying the unlock dialog."
+msgstr ""
+
+#: scrnsave.cpp:260
+msgid "Use &legacy lock windows"
+msgstr ""
+
+#: scrnsave.cpp:265
+msgid "Use old-style unmanaged X11 lock windows."
+msgstr ""
+
+#: scrnsave.cpp:267
+msgid "Hide active &windows from saver"
+msgstr ""
+
+#: scrnsave.cpp:272
+msgid ""
+"Hide all active windows from the screen saver and use the desktop background as "
+"the screen saver input."
+msgstr ""
+
+#: scrnsave.cpp:274
+msgid "Hide &cancel button"
+msgstr ""
+
+#: scrnsave.cpp:279
+msgid "Hide Cancel button from the \"Desktop Session Locked\" dialog."
+msgstr ""
+
+#: scrnsave.cpp:288
 #, fuzzy
 msgid "A preview of the selected screen saver."
 msgstr "Yma gallwch weld rhagolwg o'r arbedydd sgrîn dewisiedig."
 
-#: scrnsave.cpp:258
+#: scrnsave.cpp:293
 msgid "Advanced &Options"
 msgstr "Dewisiada&u Uwch"
 
-#: scrnsave.cpp:285
+#: scrnsave.cpp:320
 #, fuzzy
 msgid "kcmscreensaver"
 msgstr "arbedydd Sgrîn"
 
-#: scrnsave.cpp:285
+#: scrnsave.cpp:320
 msgid "TDE Screen Saver Control Module"
 msgstr ""
 
-#: scrnsave.cpp:287
+#: scrnsave.cpp:322
 msgid ""
 "(c) 1997-2002 Martin R. Jones\n"
 "(c) 2003-2004 Chris Howells"
 msgstr ""
 
-#: scrnsave.cpp:470
+#: scrnsave.cpp:519
 msgid "Loading..."
 msgstr "Yn llwytho..."
 
diff --git a/tde-i18n-cy/messages/tdebase/kcmsmartcard.po b/tde-i18n-cy/messages/tdebase/kcmsmartcard.po
index da9f34eed3b..60a3f188d87 100644
--- a/tde-i18n-cy/messages/tdebase/kcmsmartcard.po
+++ b/tde-i18n-cy/messages/tdebase/kcmsmartcard.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmsmartcard\n"
-"POT-Creation-Date: 2006-08-23 02:32+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-07-04 17:17+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -45,8 +46,8 @@ msgstr "Rhesymau Posib"
 msgid ""
 "\n"
 "1) The TDE daemon, 'kded' is not running. You can restart it by running the "
-"command 'tdeinit' and then try reloading the Trinity Control Center to see if this "
-"message goes away.\n"
+"command 'tdeinit' and then try reloading the Trinity Control Center to see if "
+"this message goes away.\n"
 "\n"
 "2) You don't appear to have smartcard support in the TDE libraries. You will "
 "need to recompile the tdelibs package with libpcsclite installed."
diff --git a/tde-i18n-cy/messages/tdebase/kcmsmserver.po b/tde-i18n-cy/messages/tdebase/kcmsmserver.po
index 52384066d46..4355a89d42d 100644
--- a/tde-i18n-cy/messages/tdebase/kcmsmserver.po
+++ b/tde-i18n-cy/messages/tdebase/kcmsmserver.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmsmserver\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-07-04 17:20+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -57,20 +58,77 @@ msgstr ""
 "Llenwch y blwch cywiro yma os ydych eisiau i'r rheolydd sisiynau ddangos ymgom "
 "cadarnhau allgofnodi."
 
-#. i18n: file smserverconfigdlg.ui line 62
+#. i18n: file smserverconfigdlg.ui line 65
 #: rc.cpp:15
 #, no-c-format
+msgid "Show &logout fadeaway"
+msgstr ""
+
+#. i18n: file smserverconfigdlg.ui line 68
+#: rc.cpp:18
+#, fuzzy, no-c-format
+msgid ""
+"Check this option if you want to see a fadeaway when displaying a logout "
+"confirmation dialog box."
+msgstr ""
+"Llenwch y blwch cywiro yma os ydych eisiau i'r rheolydd sisiynau ddangos ymgom "
+"cadarnhau allgofnodi."
+
+#. i18n: file smserverconfigdlg.ui line 79
+#: rc.cpp:21
+#, no-c-format
+msgid "Sho&w fancy logout fadeaway"
+msgstr ""
+
+#. i18n: file smserverconfigdlg.ui line 82
+#: rc.cpp:24
+#, fuzzy, no-c-format
+msgid ""
+"Check this option if you want to see a fancy fadeaway when displaying a logout "
+"confirmation dialog box."
+msgstr ""
+"Llenwch y blwch cywiro yma os ydych eisiau i'r rheolydd sisiynau ddangos ymgom "
+"cadarnhau allgofnodi."
+
+#. i18n: file smserverconfigdlg.ui line 90
+#: rc.cpp:27
+#, no-c-format
 msgid "O&ffer shutdown options"
 msgstr "C&ynnig dewisiadau cau i lawr"
 
-#. i18n: file smserverconfigdlg.ui line 72
-#: rc.cpp:18
+#. i18n: file smserverconfigdlg.ui line 93
+#: rc.cpp:30
+#, fuzzy, no-c-format
+msgid ""
+"Check this option if you want to see various options when displaying a logout "
+"confirmation dialog box."
+msgstr ""
+"Llenwch y blwch cywiro yma os ydych eisiau i'r rheolydd sisiynau ddangos ymgom "
+"cadarnhau allgofnodi."
+
+#. i18n: file smserverconfigdlg.ui line 101
+#: rc.cpp:33
+#, no-c-format
+msgid "Show logout stat&us dialog"
+msgstr ""
+
+#. i18n: file smserverconfigdlg.ui line 104
+#: rc.cpp:36
+#, fuzzy, no-c-format
+msgid ""
+"Check this option if you want to see a dialog box showing the logout status."
+msgstr ""
+"Llenwch y blwch cywiro yma os ydych eisiau i'r rheolydd sisiynau ddangos ymgom "
+"cadarnhau allgofnodi."
+
+#. i18n: file smserverconfigdlg.ui line 114
+#: rc.cpp:39
 #, no-c-format
 msgid "On Login"
 msgstr "Ar Fewngofnodi"
 
-#. i18n: file smserverconfigdlg.ui line 79
-#: rc.cpp:21
+#. i18n: file smserverconfigdlg.ui line 121
+#: rc.cpp:42
 #, no-c-format
 msgid ""
 "<ul>\n"
@@ -94,32 +152,32 @@ msgstr ""
 "gwag wrth yr ymgychwyn nesaf.</li>\n"
 "</ul>"
 
-#. i18n: file smserverconfigdlg.ui line 90
-#: rc.cpp:28
+#. i18n: file smserverconfigdlg.ui line 132
+#: rc.cpp:49
 #, no-c-format
 msgid "Restore &previous session"
 msgstr "Adfer y sesiwn &cynt"
 
-#. i18n: file smserverconfigdlg.ui line 98
-#: rc.cpp:31
+#. i18n: file smserverconfigdlg.ui line 140
+#: rc.cpp:52
 #, no-c-format
 msgid "Restore &manually saved session"
 msgstr "Adfer sesiwn a &gadwyd â llaw."
 
-#. i18n: file smserverconfigdlg.ui line 106
-#: rc.cpp:34
+#. i18n: file smserverconfigdlg.ui line 148
+#: rc.cpp:55
 #, no-c-format
 msgid "Start with an empty &session"
 msgstr "Cychwyn efo sesiwn g&wag"
 
-#. i18n: file smserverconfigdlg.ui line 116
-#: rc.cpp:37
+#. i18n: file smserverconfigdlg.ui line 158
+#: rc.cpp:58
 #, no-c-format
 msgid "Default Shutdown Option"
 msgstr "Dewisiad Cau i Lawr Rhagosodol"
 
-#. i18n: file smserverconfigdlg.ui line 119
-#: rc.cpp:40
+#. i18n: file smserverconfigdlg.ui line 161
+#: rc.cpp:61
 #, no-c-format
 msgid ""
 "Here you can choose what should happen by default when you log out. This only "
@@ -128,38 +186,38 @@ msgstr ""
 "Dyma lle gallwch ddewis be ddylai ddigwydd wrth ragosod pan yn allgofnodi. Nid "
 "yw ystyr gan hyn, os nad ydych wedi mewngofnodi drwy TDM."
 
-#. i18n: file smserverconfigdlg.ui line 130
-#: rc.cpp:43
+#. i18n: file smserverconfigdlg.ui line 172
+#: rc.cpp:64
 #, no-c-format
 msgid "&End current session"
 msgstr "&Terfynu y sesiwn cyfredol"
 
-#. i18n: file smserverconfigdlg.ui line 138
-#: rc.cpp:46
+#. i18n: file smserverconfigdlg.ui line 180
+#: rc.cpp:67
 #, no-c-format
 msgid "&Turn off computer"
 msgstr "&Cau'r cyfrifiadur i lawr"
 
-#. i18n: file smserverconfigdlg.ui line 146
-#: rc.cpp:49
+#. i18n: file smserverconfigdlg.ui line 188
+#: rc.cpp:70
 #, no-c-format
 msgid "&Restart computer"
 msgstr "&Ail-gychwyn y cyfrifiadur"
 
-#. i18n: file smserverconfigdlg.ui line 156
-#: rc.cpp:52
+#. i18n: file smserverconfigdlg.ui line 198
+#: rc.cpp:73
 #, no-c-format
 msgid "Advanced"
 msgstr "Uwch"
 
-#. i18n: file smserverconfigdlg.ui line 167
-#: rc.cpp:55
+#. i18n: file smserverconfigdlg.ui line 209
+#: rc.cpp:76
 #, no-c-format
 msgid "Applications to be e&xcluded from sessions:"
 msgstr "Cymhwysiadau i'w gwa&hardd o sesiynau:"
 
-#. i18n: file smserverconfigdlg.ui line 178
-#: rc.cpp:58
+#. i18n: file smserverconfigdlg.ui line 220
+#: rc.cpp:79
 #, fuzzy, no-c-format
 msgid ""
 "Here you can enter a comma-separated list of applications that should not be "
diff --git a/tde-i18n-cy/messages/tdebase/kcmspellchecking.po b/tde-i18n-cy/messages/tdebase/kcmspellchecking.po
index a9ac7e99c35..3fdad89fd1e 100644
--- a/tde-i18n-cy/messages/tdebase/kcmspellchecking.po
+++ b/tde-i18n-cy/messages/tdebase/kcmspellchecking.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmspellchecking\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-07-17 10:13+0100\n"
 "Last-Translator: KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdebase/kcmstyle.po b/tde-i18n-cy/messages/tdebase/kcmstyle.po
index 0e3c8ee4e01..0268347eb44 100644
--- a/tde-i18n-cy/messages/tdebase/kcmstyle.po
+++ b/tde-i18n-cy/messages/tdebase/kcmstyle.po
@@ -10,10 +10,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmstyle\n"
-"POT-Creation-Date: 2006-08-23 02:32+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-07-04 17:23+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -64,145 +65,177 @@ msgid "Sho&w icons on buttons"
 msgstr "Dan&gos eiconau ar fotymau"
 
 #: kcmstyle.cpp:184
+msgid "Enable &scrolling in popup menus"
+msgstr ""
+
+#: kcmstyle.cpp:186
+msgid "Hide &underlined characters in the menu bar when not in use"
+msgstr ""
+
+#: kcmstyle.cpp:188
+msgid "&Pressing only the menu bar activator key selects the menu bar"
+msgstr ""
+
+#: kcmstyle.cpp:190
 msgid "E&nable tooltips"
 msgstr "Gall&uogi cynghorion offer"
 
-#: kcmstyle.cpp:186
+#: kcmstyle.cpp:192
 msgid "Show tear-off handles in &popup menus"
 msgstr "Dangos dolenni rhwygo mewn &naidlenni"
 
-#: kcmstyle.cpp:190
+#: kcmstyle.cpp:199
+#, fuzzy
+msgid "Menu popup delay:"
+msgstr "Didr&eiddiad y ddewislen:"
+
+#: kcmstyle.cpp:201
+msgid " msec"
+msgstr ""
+
+#: kcmstyle.cpp:207
 msgid "Preview"
 msgstr "Rhagolwg"
 
-#: kcmstyle.cpp:208
+#: kcmstyle.cpp:225
 msgid "&Enable GUI effects"
 msgstr "&Alluogi effeithiau RGD"
 
-#: kcmstyle.cpp:216 kcmstyle.cpp:224 kcmstyle.cpp:233 kcmstyle.cpp:243
+#: kcmstyle.cpp:233 kcmstyle.cpp:241 kcmstyle.cpp:250 kcmstyle.cpp:258
+#: kcmstyle.cpp:268
 msgid "Disable"
 msgstr "Analluogi"
 
-#: kcmstyle.cpp:217 kcmstyle.cpp:225 kcmstyle.cpp:234
+#: kcmstyle.cpp:234 kcmstyle.cpp:242 kcmstyle.cpp:259
 msgid "Animate"
 msgstr "Bywlunio"
 
-#: kcmstyle.cpp:218
+#: kcmstyle.cpp:235
 msgid "Combobo&x effect:"
 msgstr "Effaith &blwch cyfunol:"
 
-#: kcmstyle.cpp:226 kcmstyle.cpp:235
+#: kcmstyle.cpp:243 kcmstyle.cpp:260
 msgid "Fade"
 msgstr "Pylu"
 
-#: kcmstyle.cpp:227
+#: kcmstyle.cpp:244
 msgid "&Tool tip effect:"
 msgstr "Effaith &cynghoryn offer:"
 
-#: kcmstyle.cpp:236
+#: kcmstyle.cpp:251
+#, fuzzy
+msgid "Make translucent"
+msgstr "Gwneud yn lled-dryloyw"
+
+#: kcmstyle.cpp:252
+#, fuzzy
+msgid "&Rubberband effect:"
+msgstr "Effaith &Dewislen"
+
+#: kcmstyle.cpp:261
 msgid "Make Translucent"
 msgstr "Gwneud yn lled-dryloyw"
 
-#: kcmstyle.cpp:237
+#: kcmstyle.cpp:262
 msgid "&Menu effect:"
 msgstr "Effaith &Dewislen"
 
-#: kcmstyle.cpp:244
+#: kcmstyle.cpp:269
 msgid "Application Level"
 msgstr "Safon Cymhwysiant"
 
-#: kcmstyle.cpp:246
+#: kcmstyle.cpp:271
 msgid "Me&nu tear-off handles:"
 msgstr "Dolennu rhwygo i'r dde&wislen:"
 
-#: kcmstyle.cpp:251
+#: kcmstyle.cpp:276
 msgid "Menu &drop shadow"
 msgstr "Ta&n-gysgod i'r ddewislen"
 
-#: kcmstyle.cpp:272
+#: kcmstyle.cpp:297
 msgid "Software Tint"
 msgstr "Arlliw Meddalwedd"
 
-#: kcmstyle.cpp:273
+#: kcmstyle.cpp:298
 msgid "Software Blend"
 msgstr "Cyfuno Meddalwedd"
 
-#: kcmstyle.cpp:275
+#: kcmstyle.cpp:300
 msgid "XRender Blend"
 msgstr "Cyfuno XRender"
 
-#: kcmstyle.cpp:288
+#: kcmstyle.cpp:313
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: kcmstyle.cpp:290
+#: kcmstyle.cpp:315
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: kcmstyle.cpp:292
+#: kcmstyle.cpp:317
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: kcmstyle.cpp:295
+#: kcmstyle.cpp:320
 msgid "Menu trans&lucency type:"
 msgstr "Math lled-dry&loywder y ddewislen:"
 
-#: kcmstyle.cpp:297
+#: kcmstyle.cpp:322
 msgid "Menu &opacity:"
 msgstr "Didr&eiddiad y ddewislen:"
 
-#: kcmstyle.cpp:326
+#: kcmstyle.cpp:351
 msgid "High&light buttons under mouse"
 msgstr "A&mlygu'r botymau dan y lygoden"
 
-#: kcmstyle.cpp:327
+#: kcmstyle.cpp:352
 msgid "Transparent tool&bars when moving"
 msgstr "Bariau o&ffer tryloyw wrth symud"
 
-#: kcmstyle.cpp:332
+#: kcmstyle.cpp:357
 msgid "Text pos&ition:"
 msgstr "Lleoliad y tes&tun"
 
-#: kcmstyle.cpp:334
+#: kcmstyle.cpp:359
 msgid "Icons Only"
 msgstr "Eiconau yn Unig"
 
-#: kcmstyle.cpp:335
+#: kcmstyle.cpp:360
 msgid "Text Only"
 msgstr "Testun yn Unig"
 
-#: kcmstyle.cpp:336
+#: kcmstyle.cpp:361
 msgid "Text Alongside Icons"
 msgstr "Testun wrth Ymyl Eiconau"
 
-#: kcmstyle.cpp:337
+#: kcmstyle.cpp:362
 msgid "Text Under Icons"
 msgstr "Testun Dan Eiconau"
 
-#: kcmstyle.cpp:379
+#: kcmstyle.cpp:409
 msgid "&Style"
 msgstr "A&rddull"
 
-#: kcmstyle.cpp:380
+#: kcmstyle.cpp:410
 msgid "&Effects"
 msgstr "E&ffeithiau"
 
-#: kcmstyle.cpp:381
+#: kcmstyle.cpp:411
 msgid "&Toolbar"
 msgstr "&Bar offer"
 
-#: kcmstyle.cpp:418 kcmstyle.cpp:429
+#: kcmstyle.cpp:448 kcmstyle.cpp:459
 msgid "There was an error loading the configuration dialog for this style."
 msgstr "Roedd gwall wrth lwytho'r ymgom ffurfweddu ar gyfer yr arddull yma."
 
-#: kcmstyle.cpp:420 kcmstyle.cpp:431
+#: kcmstyle.cpp:450 kcmstyle.cpp:461
 msgid "Unable to Load Dialog"
 msgstr "Methu Llwytho'r Ymgom"
 
-#: kcmstyle.cpp:520
+#: kcmstyle.cpp:550
 msgid ""
 "<qt>Selected style: <b>%1</b>"
 "<br>"
@@ -218,24 +251,24 @@ msgstr ""
 "<br>"
 "<br>"
 
-#: kcmstyle.cpp:532
+#: kcmstyle.cpp:562
 msgid "Menu translucency is not available.<br>"
 msgstr "Nid yw lled-dryloywder dewislenni ar gael.<br>"
 
-#: kcmstyle.cpp:539
+#: kcmstyle.cpp:569
 msgid "Menu drop-shadows are not available."
 msgstr "Nid yw tan-gysgodi dewislenni ar gael."
 
-#: kcmstyle.cpp:722 kcmstyle.cpp:834
+#: kcmstyle.cpp:764 kcmstyle.cpp:876
 msgid "No description available."
 msgstr "Nid oes disgrifiad ar gael."
 
-#: kcmstyle.cpp:834
+#: kcmstyle.cpp:876
 #, c-format
 msgid "Description: %1"
 msgstr "Disgrifiad: %1"
 
-#: kcmstyle.cpp:1013
+#: kcmstyle.cpp:1065
 msgid ""
 "Here you can choose from a list of predefined widget styles (e.g. the way "
 "buttons are drawn) which may or may not be combined with a theme (additional "
@@ -245,7 +278,7 @@ msgstr ""
 "mae'r botymau yn cael eu darlunio) sydd yn gallu neu beidio cael ei gyfuno gyda "
 "chynllun (gyda gwybodaeth arall fel gwead marmor neu raddliw)"
 
-#: kcmstyle.cpp:1017
+#: kcmstyle.cpp:1069
 msgid ""
 "This area shows a preview of the currently selected style without having to "
 "apply it to the whole desktop."
@@ -253,7 +286,7 @@ msgstr ""
 "Mae'r ardal hon yn dangos rhagolwg o'r arddull dewisiedig heb fod rhaid "
 "gweithredu'r arddull ar y penbwrdd cyfan."
 
-#: kcmstyle.cpp:1021
+#: kcmstyle.cpp:1073
 msgid ""
 "This page allows you to enable various widget style effects. For best "
 "performance, it is advisable to disable all effects."
@@ -261,7 +294,7 @@ msgstr ""
 "Galluoga'r dudalen hon i chi alluogi amryw o effeithiau arddull celfigion. Ar "
 "gyfer y perfformiad gorau, argymellir analluogi pob effaith."
 
-#: kcmstyle.cpp:1023
+#: kcmstyle.cpp:1075
 msgid ""
 "If you check this box, you can select several effects for different widgets "
 "like combo boxes, menus or tooltips."
@@ -269,7 +302,7 @@ msgstr ""
 "Os frithwch y blwch yma, gallwch ddewis sawl effaith ar gyfer celfigion "
 "gwahanol megis blychau cyfuno, dewislenni, neu gynghorion offer."
 
-#: kcmstyle.cpp:1025
+#: kcmstyle.cpp:1077
 msgid ""
 "<p><b>Disable: </b>do not use any combo box effects.</p>\n"
 "<b>Animate: </b>Do some animation."
@@ -277,7 +310,7 @@ msgstr ""
 "<p><b>Analluogi:</b>Peidio â defnyddio unrhyw effeithiau blychau cyfuno.</p>\n"
 "<b>Bywlunio:</b>Defnyddio rhai bywluniadau."
 
-#: kcmstyle.cpp:1027
+#: kcmstyle.cpp:1079
 msgid ""
 "<p><b>Disable: </b>do not use any tooltip effects.</p>\n"
 "<p><b>Animate: </b>Do some animation.</p>\n"
@@ -287,7 +320,16 @@ msgstr ""
 "<p><b>Bywlunio:</b>Defnyddio rhai bywluniadau.</p>\n"
 "<b>Pylu:</b>Pylu cynghorion offer i mewn gan ddefnyddio cyfuno-alffa."
 
-#: kcmstyle.cpp:1030
+#: kcmstyle.cpp:1082
+#, fuzzy
+msgid ""
+"<p><b>Disable: </b>do not use any rubberband effects.</p>\n"
+"<b>Make Translucent: </b>Draw a translucent rubberband."
+msgstr ""
+"<p><b>Analluogi:</b>Peidio â defnyddio unrhyw effeithiau blychau cyfuno.</p>\n"
+"<b>Bywlunio:</b>Defnyddio rhai bywluniadau."
+
+#: kcmstyle.cpp:1084
 msgid ""
 "<p><b>Disable: </b>do not use any menu effects.</p>\n"
 "<p><b>Animate: </b>Do some animation.</p>\n"
@@ -301,7 +343,7 @@ msgstr ""
 "<b>Gwneud yn Lled-dryloyw:</b>Creu effaith dryloyw ar ddewislenni drwy "
 "gyfuno-alffa. (Arddulliau TDE yn unig)"
 
-#: kcmstyle.cpp:1034
+#: kcmstyle.cpp:1088
 msgid ""
 "When enabled, all popup menus will have a drop-shadow, otherwise drop-shadows "
 "will not be displayed. At present, only TDE styles can have this effect "
@@ -311,7 +353,7 @@ msgstr ""
 "tan-gysgodion. Ar hyn o bryd, dim ond ar arddulliau TDE gellir galluogi'r "
 "effaith yma. "
 
-#: kcmstyle.cpp:1037
+#: kcmstyle.cpp:1091
 msgid ""
 "<p><b>Software Tint: </b>Alpha-blend using a flat color.</p>\n"
 "<p><b>Software Blend: </b>Alpha-blend using an image.</p>\n"
@@ -327,12 +369,12 @@ msgstr ""
 "ddangosyddion heb gyflymiad, ond gall serch hynny wella perfformiad ar "
 "ddangosyddion pell.</p>\n"
 
-#: kcmstyle.cpp:1042
+#: kcmstyle.cpp:1096
 msgid "By adjusting this slider you can control the menu effect opacity."
 msgstr ""
 "Drwy addasu'r llithrydd yma gallwch reoli tryloywder effaith y ddewislen."
 
-#: kcmstyle.cpp:1045
+#: kcmstyle.cpp:1099
 msgid ""
 "<b>Note:</b> that all widgets in this combobox do not apply to Qt-only "
 "applications."
@@ -340,7 +382,7 @@ msgstr ""
 "<b>Noder:</b> bod pob celfigyn yn y blwch cyfuno yn peidio â gweithredu ar "
 "gymhwysiadau Qt-yn-unig!"
 
-#: kcmstyle.cpp:1047
+#: kcmstyle.cpp:1101
 msgid ""
 "If this option is selected, toolbar buttons will change their color when the "
 "mouse cursor is moved over them."
@@ -348,7 +390,7 @@ msgstr ""
 "Os dewisir y dewisiad yma, newida botymau barrau offer eu lliw pan symudir "
 "cyrchydd y lygoden drostynt."
 
-#: kcmstyle.cpp:1049
+#: kcmstyle.cpp:1103
 msgid ""
 "If you check this box, the toolbars will be transparent when moving them "
 "around."
@@ -356,7 +398,7 @@ msgstr ""
 "Os frithwch y blwch yma, bydd y barrau offer yn dryloyw pan eu symudir o "
 "gwmpas."
 
-#: kcmstyle.cpp:1051
+#: kcmstyle.cpp:1105
 msgid ""
 "If you check this option, the TDE application will offer tooltips when the "
 "cursor remains over items in the toolbar."
@@ -364,7 +406,7 @@ msgstr ""
 "Os frithwch y dewisiad yma, cynniga'r cymhwysiad TDE gynghorion offer pan "
 "arhosa'r cyrchydd dros eitemau yn y bar offer."
 
-#: kcmstyle.cpp:1053
+#: kcmstyle.cpp:1107
 msgid ""
 "<p><b>Icons only:</b> Shows only icons on toolbar buttons. Best option for low "
 "resolutions.</p>"
@@ -381,7 +423,7 @@ msgstr ""
 "<p><b>Testun o dan eiconau:</b>Dangosa eiconau a thestun ar fotymau barrau "
 "offer. Alinir testun o dan yr eicon.</p>"
 
-#: kcmstyle.cpp:1060
+#: kcmstyle.cpp:1114
 msgid ""
 "If you enable this option, TDE Applications will show small icons alongside "
 "some important buttons."
@@ -389,7 +431,42 @@ msgstr ""
 "Os alluogwch y dewisiad yma, dangosa Cymhwysiadau TDE eiconau bach wrth ochr "
 "rhai botymau pwysig."
 
-#: kcmstyle.cpp:1062
+#: kcmstyle.cpp:1116
+#, fuzzy
+msgid ""
+"If you enable this option, pop-up menus will scroll if vertical space is "
+"exhausted."
+msgstr ""
+"Os alluogwch y dewisiad yma, dangosa Cymhwysiadau TDE eiconau bach wrth ochr "
+"rhai botymau pwysig."
+
+#: kcmstyle.cpp:1117
+msgid ""
+"Program drop-down menus can be used with either the mouse or keyboard. Each "
+"menu item on the menu bar that can be activated from the keyboard contains one "
+"character that is underlined. When the underlined character key is pressed "
+"concurrently with the activator key (usually Alt), the keyboard combination "
+"opens the menu or selects that menu item. The underlines can remain hidden "
+"until the activator key is pressed or remain visible at all times. Enabling "
+"this option hides the underlines until pressing the activator key. Note: some "
+"widget styles do not support this feature."
+msgstr ""
+
+#: kcmstyle.cpp:1124
+msgid ""
+"When using the keyboard, program drop-down menus can be activated in one of two "
+"ways. Concurrently press the activator key (usually Alt) and the underlined "
+"character that is part of the menu name, or sequentially press and release the "
+"activator key and then press the underlined character. Enabling this option "
+"selects the latter method. The method of concurrently pressing both keys is "
+"supported in both Trinity and non Trinity programs. The choice of using either "
+"method applies to Trinity Programs only and not to non Trinity programs. "
+"Regardless of which option is preferred, after a desired menu opens, pressing "
+"only the respective underlined key of any menu item is required to select that "
+"menu item."
+msgstr ""
+
+#: kcmstyle.cpp:1132
 msgid ""
 "If you enable this option some pop-up menus will show so called tear-off "
 "handles. If you click them, you get the menu inside a widget. This can be very "
@@ -399,6 +476,12 @@ msgstr ""
 "y'u gelwir. Os gliciwch arnynt, cewch y ddewislen o fewn celfigyn. Gall hyn fod "
 "o gymorth mawr pan yn cyflawni'r un weithred sawl gwaith."
 
+#: kcmstyle.cpp:1136
+msgid ""
+"The menu popup delay is the time (in milliseconds) before a selected menu or "
+"submenu appears."
+msgstr ""
+
 #: menupreview.cpp:160
 #, c-format
 msgid "%"
diff --git a/tde-i18n-cy/messages/tdebase/kcmtaskbar.po b/tde-i18n-cy/messages/tdebase/kcmtaskbar.po
index 01164e0d8c4..c207f675827 100644
--- a/tde-i18n-cy/messages/tdebase/kcmtaskbar.po
+++ b/tde-i18n-cy/messages/tdebase/kcmtaskbar.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmtaskbar\n"
-"POT-Creation-Date: 2008-07-08 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-07-04 17:24+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,68 +28,93 @@ msgid ""
 "Your emails"
 msgstr "kyfieithu@dotmon.com"
 
-#: kcmtaskbar.cpp:83
+#: kcmtaskbar.cpp:103
 msgid "Show Task List"
 msgstr "Dangos y Restr Tasgau"
 
-#: kcmtaskbar.cpp:83
+#: kcmtaskbar.cpp:103
 msgid "Show Operations Menu"
 msgstr "Dangos y Ddewislen Weithredoedd"
 
-#: kcmtaskbar.cpp:84
+#: kcmtaskbar.cpp:104
 msgid "Activate, Raise or Minimize Task"
 msgstr "Gweithredoli, Codi neu Leihau Tasg"
 
-#: kcmtaskbar.cpp:85
+#: kcmtaskbar.cpp:105
 msgid "Activate Task"
 msgstr "Gweithredoli Tasg"
 
-#: kcmtaskbar.cpp:85
+#: kcmtaskbar.cpp:105
 msgid "Raise Task"
 msgstr "Codi Tasg"
 
-#: kcmtaskbar.cpp:86
+#: kcmtaskbar.cpp:106
 msgid "Lower Task"
 msgstr "Gostwng Tasg"
 
-#: kcmtaskbar.cpp:86
+#: kcmtaskbar.cpp:106
 msgid "Minimize Task"
 msgstr "Lleihau Tasg"
 
-#: kcmtaskbar.cpp:87
-msgid "To Current Desktop"
+#: kcmtaskbar.cpp:107
+#, fuzzy
+msgid "Move To Current Desktop"
 msgstr "I'r Penbwrdd Cyfredol"
 
-#: kcmtaskbar.cpp:88
+#: kcmtaskbar.cpp:108
 #, fuzzy
 msgid "Close Task"
 msgstr "Gostwng Tasg"
 
-#: kcmtaskbar.cpp:106
+#: kcmtaskbar.cpp:126
 msgid "Never"
 msgstr "Byth"
 
-#: kcmtaskbar.cpp:106
+#: kcmtaskbar.cpp:126
 msgid "When Taskbar Full"
 msgstr "Pan fo'r Bar Tasgau'n Llawn"
 
-#: kcmtaskbar.cpp:107
+#: kcmtaskbar.cpp:127
 msgid "Always"
 msgstr "Bob Amser"
 
-#: kcmtaskbar.cpp:129
+#: kcmtaskbar.cpp:145
+msgid "Any"
+msgstr ""
+
+#: kcmtaskbar.cpp:145
+msgid "Only Stopped"
+msgstr ""
+
+#: kcmtaskbar.cpp:146
+msgid "Only Running"
+msgstr ""
+
+#: kcmtaskbar.cpp:164
+msgid "Icons and Text"
+msgstr ""
+
+#: kcmtaskbar.cpp:165
+msgid "Text only"
+msgstr ""
+
+#: kcmtaskbar.cpp:166
+msgid "Icons only"
+msgstr ""
+
+#: kcmtaskbar.cpp:217
 msgid "Elegant"
 msgstr ""
 
-#: kcmtaskbar.cpp:130
+#: kcmtaskbar.cpp:218
 msgid "Classic"
 msgstr ""
 
-#: kcmtaskbar.cpp:131
+#: kcmtaskbar.cpp:219
 msgid "For Transparency"
 msgstr ""
 
-#: kcmtaskbar.cpp:144
+#: kcmtaskbar.cpp:232
 msgid ""
 "<h1>Taskbar</h1> You can configure the taskbar here. This includes options such "
 "as whether or not the taskbar should show all windows at once or only those on "
@@ -100,60 +126,96 @@ msgstr ""
 "dim ond y rhai ar y penbwrdd cyfredol. Gallwch hefyd ffurfweddu a ddylid dangos "
 "y botwm Rhestr Ffenestri ai peidio."
 
-#: kcmtaskbar.cpp:176
+#: kcmtaskbar.cpp:270
 msgid "kcmtaskbar"
 msgstr "kcmtaskbar"
 
-#: kcmtaskbar.cpp:177
+#: kcmtaskbar.cpp:271
 msgid "TDE Taskbar Control Module"
 msgstr "Modwl Rheoli Bar Tasgau TDE"
 
-#: kcmtaskbar.cpp:179
+#: kcmtaskbar.cpp:273
 msgid "(c) 2000 - 2001 Matthias Elter"
 msgstr "(h)(c) 2000 - 2001 Matthias Elter"
 
-#: kcmtaskbar.cpp:182
+#: kcmtaskbar.cpp:276
 msgid "TDEConfigXT conversion"
 msgstr ""
 
-#: kcmtaskbar.cpp:209 kcmtaskbar.cpp:210 kcmtaskbar.cpp:211
+#: kcmtaskbar.cpp:364 kcmtaskbar.cpp:365 kcmtaskbar.cpp:366
 msgid "Cycle Through Windows"
 msgstr "Cylchu Drwy'r Ffenestri"
 
-#: kcmtaskbar.cpp:243
+#: kcmtaskbar.cpp:398
 msgid "Custom"
 msgstr "Addasiedig"
 
 #. i18n: file kcmtaskbarui.ui line 16
-#: rc.cpp:3 rc.cpp:6
+#: rc.cpp:3 rc.cpp:27
 #, no-c-format
 msgid "Taskbar"
 msgstr "Bar Tasgau"
 
-#. i18n: file kcmtaskbarui.ui line 47
+#. i18n: file kcmtaskbarui.ui line 32
+#: rc.cpp:6
+#, no-c-format
+msgid "Settings"
+msgstr ""
+
+#. i18n: file kcmtaskbarui.ui line 43
 #: rc.cpp:9
-#, fuzzy, no-c-format
-msgid "Sort windows by desk&top"
-msgstr "&Dangos ffenestri o bob penbwrdd"
+#, no-c-format
+msgid ""
+"<b>NOTE: Currently you are editing the global taskbar configuration.</b>"
+"<br>To change the configuration of a specific taskbar (when using multiple "
+"taskbars), use the corresponding Configure Taskbar menu option, located in the "
+"taskbar handle popup menu."
+msgstr ""
 
-#. i18n: file kcmtaskbarui.ui line 55
+#. i18n: file kcmtaskbarui.ui line 51
 #: rc.cpp:12
 #, no-c-format
 msgid ""
-"Selecting this option causes the taskbar to show windows in order of the "
-"desktop they appear on.\n"
-"\n"
-"By default this option is selected."
+"<b>NOTE:</b> Currently you are editing the taskbar configuration for <b>only</b> "
+"this taskbar."
+msgstr ""
+
+#. i18n: file kcmtaskbarui.ui line 59
+#: rc.cpp:15
+#, no-c-format
+msgid "Use global floating taskbar configuration"
+msgstr ""
+
+#. i18n: file kcmtaskbarui.ui line 65
+#: rc.cpp:18
+#, no-c-format
+msgid ""
+"Selecting this option causes the taskbar to use the global taskbar "
+"configuration."
 msgstr ""
 
-#. i18n: file kcmtaskbarui.ui line 63
-#: rc.cpp:17
+#. i18n: file kcmtaskbarui.ui line 73
+#: rc.cpp:21
+#, no-c-format
+msgid ""
+"Overwrite current configuration with the current global floating taskbar "
+"configuration"
+msgstr ""
+
+#. i18n: file kcmtaskbarui.ui line 81
+#: rc.cpp:24
+#, no-c-format
+msgid "Edt global floating taskbar configuration"
+msgstr ""
+
+#. i18n: file kcmtaskbarui.ui line 106
+#: rc.cpp:30
 #, no-c-format
 msgid "&Show windows from all desktops"
 msgstr "&Dangos ffenestri o bob penbwrdd"
 
-#. i18n: file kcmtaskbarui.ui line 71
-#: rc.cpp:20
+#. i18n: file kcmtaskbarui.ui line 114
+#: rc.cpp:33
 #, fuzzy, no-c-format
 msgid ""
 "Turning this option off will cause the taskbar to display <b>only</b> "
@@ -165,50 +227,74 @@ msgstr ""
 "penbwrdd cyfredol yn unig. Yn ragosod, dengys y bar tasgau bob ffenestr "
 "gyfredol."
 
-#. i18n: file kcmtaskbarui.ui line 79
-#: rc.cpp:25
-#, no-c-format
-msgid "Show window list &button"
-msgstr "Dangos &botwm rhestr ffenestri"
+#. i18n: file kcmtaskbarui.ui line 122
+#: rc.cpp:38
+#, fuzzy, no-c-format
+msgid "Sort windows by desk&top"
+msgstr "&Dangos ffenestri o bob penbwrdd"
 
-#. i18n: file kcmtaskbarui.ui line 85
-#: rc.cpp:28
+#. i18n: file kcmtaskbarui.ui line 130
+#: rc.cpp:41
 #, no-c-format
 msgid ""
-"Selecting this option causes the taskbar to display a button that, when "
-"clicked, shows a list of all windows in a popup menu."
+"Selecting this option causes the taskbar to show windows in order of the "
+"desktop they appear on.\n"
+"\n"
+"By default this option is selected."
 msgstr ""
 
-#. i18n: file kcmtaskbarui.ui line 105
-#: rc.cpp:31
-#, no-c-format
+#. i18n: file kcmtaskbarui.ui line 138
+#: rc.cpp:46
+#, fuzzy, no-c-format
+msgid "Show windows from all sc&reens"
+msgstr "&Dangos ffenestri o bob penbwrdd"
+
+#. i18n: file kcmtaskbarui.ui line 146
+#: rc.cpp:49
+#, fuzzy, no-c-format
 msgid ""
-"The taskbar can group similar windows into single buttons. When one of these "
-"window group buttons are clicked on a menu appears showing all the windows in "
-"that group. This can be especially useful with the <em>Show all windows</em> "
-"option.\n"
-"\n"
-"You can set the taskbar to <strong>Never</strong> group windows, to <strong>"
-"Always</strong> group windows or to group windows only <strong>"
-"When the Taskbar is Full</strong>.\n"
+"Turning this option off will cause the taskbar to display <b>only</b> "
+"windows which are on the same Xinerama screen as the taskbar.\n"
 "\n"
-"By default the taskbar groups windows when it is full."
+"By default, this option is selected and all windows are shown."
 msgstr ""
+"Brithwch y dewisiad yma os ydych am i'r bar tasgau ddangos ffenestri sydd "
+"wedi'u lleihau'n unig. Yn ragosod, dengys y bar tasgau bob ffenestr."
 
-#. i18n: file kcmtaskbarui.ui line 113
-#: rc.cpp:38
+#. i18n: file kcmtaskbarui.ui line 154
+#: rc.cpp:54
 #, no-c-format
-msgid "&Group similar tasks:"
-msgstr "&Casglu tasgau tebyg:"
+msgid "Sort alphabeticall&y by application name"
+msgstr ""
 
-#. i18n: file kcmtaskbarui.ui line 124
-#: rc.cpp:41
+#. i18n: file kcmtaskbarui.ui line 165
+#: rc.cpp:57
+#, no-c-format
+msgid "&Allow taskbar items to be rearranged using drag and drop"
+msgstr ""
+
+#. i18n: file kcmtaskbarui.ui line 171
+#: rc.cpp:60
+#, no-c-format
+msgid ""
+"Turning this option on will allow tasks on the taskbar to be manually "
+"rearranged using drag and drop."
+msgstr ""
+
+#. i18n: file kcmtaskbarui.ui line 179
+#: rc.cpp:63
+#, fuzzy, no-c-format
+msgid "Cycle through windows with mouse wheel"
+msgstr "Cylchu Drwy'r Ffenestri"
+
+#. i18n: file kcmtaskbarui.ui line 190
+#: rc.cpp:66
 #, no-c-format
 msgid "Show o&nly minimized windows"
 msgstr "Dangos ffenestri wedi'u lleihau yn u&nig"
 
-#. i18n: file kcmtaskbarui.ui line 129
-#: rc.cpp:44
+#. i18n: file kcmtaskbarui.ui line 195
+#: rc.cpp:69
 #, fuzzy, no-c-format
 msgid ""
 "Select this option if you want the taskbar to display <b>only</b> "
@@ -219,100 +305,127 @@ msgstr ""
 "Brithwch y dewisiad yma os ydych am i'r bar tasgau ddangos ffenestri sydd "
 "wedi'u lleihau'n unig. Yn ragosod, dengys y bar tasgau bob ffenestr."
 
-#. i18n: file kcmtaskbarui.ui line 137
-#: rc.cpp:49
+#. i18n: file kcmtaskbarui.ui line 203
+#: rc.cpp:74
 #, no-c-format
-msgid "Sho&w application icons"
-msgstr "Dango&s eiconau cymhwysiadau"
+msgid "Show window list &button"
+msgstr "Dangos &botwm rhestr ffenestri"
 
-#. i18n: file kcmtaskbarui.ui line 145
-#: rc.cpp:52
+#. i18n: file kcmtaskbarui.ui line 209
+#: rc.cpp:77
 #, no-c-format
 msgid ""
-"Select this option if you want window icons to appear along with their titles "
-"in the taskbar.\n"
-"\n"
-"By default this option is selected."
+"Selecting this option causes the taskbar to display a button that, when "
+"clicked, shows a list of all windows in a popup menu."
 msgstr ""
 
-#. i18n: file kcmtaskbarui.ui line 153
-#: rc.cpp:57
-#, fuzzy, no-c-format
-msgid "Show windows from all sc&reens"
-msgstr "&Dangos ffenestri o bob penbwrdd"
+#. i18n: file kcmtaskbarui.ui line 217
+#: rc.cpp:80
+#, no-c-format
+msgid "Dis&play:"
+msgstr ""
 
-#. i18n: file kcmtaskbarui.ui line 161
-#: rc.cpp:60
-#, fuzzy, no-c-format
+#. i18n: file kcmtaskbarui.ui line 236
+#: rc.cpp:83
+#, no-c-format
 msgid ""
-"Turning this option off will cause the taskbar to display <b>only</b> "
-"windows which are on the same Xinerama screen as the taskbar.\n"
+"Choose taskbar display mode among <strong>Icons and text</strong>, <strong>"
+"Text only</strong> and <strong>Icons only</strong>."
+msgstr ""
+
+#. i18n: file kcmtaskbarui.ui line 256
+#: rc.cpp:86
+#, no-c-format
+msgid ""
+"The taskbar can group similar windows into single buttons. When one of these "
+"window group buttons are clicked on a menu appears showing all the windows in "
+"that group. This can be especially useful with the <em>Show all windows</em> "
+"option.\n"
 "\n"
-"By default, this option is selected and all windows are shown."
+"You can set the taskbar to <strong>Never</strong> group windows, to <strong>"
+"Always</strong> group windows or to group windows only <strong>"
+"When the Taskbar is Full</strong>.\n"
+"\n"
+"By default the taskbar groups windows when it is full."
 msgstr ""
-"Brithwch y dewisiad yma os ydych am i'r bar tasgau ddangos ffenestri sydd "
-"wedi'u lleihau'n unig. Yn ragosod, dengys y bar tasgau bob ffenestr."
 
-#. i18n: file kcmtaskbarui.ui line 174
-#: rc.cpp:65
+#. i18n: file kcmtaskbarui.ui line 264
+#: rc.cpp:93
 #, no-c-format
-msgid "A&ppearance:"
-msgstr "&Golwg :"
+msgid "&Group similar tasks:"
+msgstr "&Casglu tasgau tebyg:"
 
-#. i18n: file kcmtaskbarui.ui line 188
-#: rc.cpp:68
+#. i18n: file kcmtaskbarui.ui line 283
+#: rc.cpp:96
 #, no-c-format
-msgid "Use &custom colors"
+msgid ""
+"The taskbar can show and/or hide tasks based on their current process state.  "
+"Select <em>Any</em> to show all tasks regardless of current state."
 msgstr ""
 
-#. i18n: file kcmtaskbarui.ui line 257
-#: rc.cpp:71
+#. i18n: file kcmtaskbarui.ui line 291
+#: rc.cpp:99
+#, fuzzy, no-c-format
+msgid "&Show tasks with state:"
+msgstr "Dangos y Restr Tasgau"
+
+#. i18n: file kcmtaskbarui.ui line 307
+#: rc.cpp:102
 #, no-c-format
-msgid "&Background color:"
+msgid "A&ppearance:"
+msgstr "&Golwg :"
+
+#. i18n: file kcmtaskbarui.ui line 321
+#: rc.cpp:105
+#, no-c-format
+msgid "Use &custom colors"
 msgstr ""
 
-#. i18n: file kcmtaskbarui.ui line 276
-#: rc.cpp:74
+#. i18n: file kcmtaskbarui.ui line 340
+#: rc.cpp:108
 #, no-c-format
 msgid "Inacti&ve task text color:"
 msgstr ""
 
-#. i18n: file kcmtaskbarui.ui line 287
-#: rc.cpp:77
+#. i18n: file kcmtaskbarui.ui line 376
+#: rc.cpp:111
 #, no-c-format
 msgid "Active task te&xt color:"
 msgstr ""
 
-#. i18n: file kcmtaskbarui.ui line 334
-#: rc.cpp:80
+#. i18n: file kcmtaskbarui.ui line 412
+#: rc.cpp:114
 #, no-c-format
-msgid "Sort alphabeticall&y by application name"
+msgid "&Background color:"
 msgstr ""
 
-#. i18n: file kcmtaskbarui.ui line 347
-#: rc.cpp:83
+#. i18n: file kcmtaskbarui.ui line 469
+#: rc.cpp:117
 #, no-c-format
 msgid "Actions"
 msgstr "Gweithredoedd"
 
-#. i18n: file kcmtaskbarui.ui line 358
-#: rc.cpp:86
+#. i18n: file kcmtaskbarui.ui line 480
+#: rc.cpp:120
 #, no-c-format
 msgid "&Left button:"
 msgstr "Botwm chw&ith:"
 
-#. i18n: file kcmtaskbarui.ui line 369
-#: rc.cpp:89
+#. i18n: file kcmtaskbarui.ui line 491
+#: rc.cpp:123
 #, no-c-format
 msgid "&Middle button:"
 msgstr "Botwm &Canol:"
 
-#. i18n: file kcmtaskbarui.ui line 380
-#: rc.cpp:92
+#. i18n: file kcmtaskbarui.ui line 502
+#: rc.cpp:126
 #, no-c-format
 msgid "Right b&utton:"
 msgstr "B&otwm Dde"
 
+#~ msgid "Sho&w application icons"
+#~ msgstr "Dango&s eiconau cymhwysiadau"
+
 #, fuzzy
 #~ msgid "Alt+C"
 #~ msgstr "Alt+R"
diff --git a/tde-i18n-cy/messages/tdebase/kcmtdednssd.po b/tde-i18n-cy/messages/tdebase/kcmtdednssd.po
index 24435f76849..99efbdc0767 100644
--- a/tde-i18n-cy/messages/tdebase/kcmtdednssd.po
+++ b/tde-i18n-cy/messages/tdebase/kcmtdednssd.po
@@ -1,134 +1,184 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: all2.po\n"
-"POT-Creation-Date: 2005-10-13 02:37+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kcmdnssd.cpp:53
+#: kcmdnssd.cpp:59
 msgid "kcm_tdednssd"
 msgstr ""
 
-#: kcmdnssd.cpp:54
+#: kcmdnssd.cpp:60
 msgid "ZeroConf configuration"
 msgstr ""
 
-#: kcmdnssd.cpp:55
+#: kcmdnssd.cpp:61
 msgid "(C) 2004,2005 Jakub Stachowski"
 msgstr ""
 
-#: kcmdnssd.cpp:56
+#: kcmdnssd.cpp:62
 msgid "Setup services browsing with ZeroConf"
 msgstr ""
 
+#: kcmdnssd.cpp:96
+msgid ""
+"Enabling local network browsing will open a network port (5353) on your "
+"computer.  If security problems are discovered in the zeroconf server, remote "
+"attackers could access your computer as the \"avahi\" user."
+msgstr ""
+
+#: kcmdnssd.cpp:103
+msgid "Enable Zeroconf Network Browsing"
+msgstr ""
+
+#: kcmdnssd.cpp:103
+msgid "Enable Browsing"
+msgstr ""
+
+#: kcmdnssd.cpp:103
+msgid "Don't Enable Browsing"
+msgstr ""
+
 #. i18n: file configdialog.ui line 30
-#: rc.cpp:3 rc.cpp:55
+#: rc.cpp:3 rc.cpp:73
 #, no-c-format
 msgid "MyDialog1"
 msgstr ""
 
 #. i18n: file configdialog.ui line 45
-#: rc.cpp:6 rc.cpp:58
+#: rc.cpp:6 rc.cpp:76
 #, no-c-format
 msgid "&General"
 msgstr "&Cyffredinol"
 
-#. i18n: file configdialog.ui line 56
-#: rc.cpp:9 rc.cpp:61
+#. i18n: file configdialog.ui line 67
+#: rc.cpp:9 rc.cpp:79
 #, no-c-format
-msgid "Browse local networ&k"
+msgid "Publishing Mode"
 msgstr ""
 
-#. i18n: file configdialog.ui line 59
-#: rc.cpp:12 rc.cpp:64
+#. i18n: file configdialog.ui line 85
+#: rc.cpp:12 rc.cpp:82
 #, no-c-format
-msgid "Browse local network (domain .local) using multicast DNS."
+msgid "&Wide area network"
 msgstr ""
 
-#. i18n: file configdialog.ui line 75
-#: rc.cpp:15 rc.cpp:67
-#, no-c-format
-msgid "Additional Domains"
-msgstr ""
+#. i18n: file configdialog.ui line 88
+#: rc.cpp:15 rc.cpp:85
+#, fuzzy, no-c-format
+msgid "Alt+W"
+msgstr "Alt+A"
 
-#. i18n: file configdialog.ui line 79
-#: rc.cpp:18 rc.cpp:70
+#. i18n: file configdialog.ui line 91
+#: rc.cpp:18 rc.cpp:88
 #, no-c-format
 msgid ""
-"List of Internet domains  that will be browsed for services. Do not put .local "
-"here - it\n"
-"is configured with 'Browse local network' option above."
+"Advertise services on Internet domain using public IP. To have this option "
+"working you need to configure wide area operation in using administrator mode"
 msgstr ""
 
-#. i18n: file configdialog.ui line 95
-#: rc.cpp:22 rc.cpp:74
+#. i18n: file configdialog.ui line 107
+#: rc.cpp:21 rc.cpp:91
 #, no-c-format
-msgid "Publishing Mode"
+msgid "Loc&al network"
 msgstr ""
 
 #. i18n: file configdialog.ui line 110
-#: rc.cpp:25 rc.cpp:77
+#: rc.cpp:24 rc.cpp:94
 #, no-c-format
-msgid "Loc&al network"
-msgstr ""
+msgid "Alt+A"
+msgstr "Alt+A"
 
 #. i18n: file configdialog.ui line 116
-#: rc.cpp:28 rc.cpp:80
+#: rc.cpp:27 rc.cpp:97
 #, no-c-format
 msgid ""
 "Advertise services on local network (in domain .local) using multicast DNS."
 msgstr ""
 
-#. i18n: file configdialog.ui line 135
-#: rc.cpp:31 rc.cpp:83
+#. i18n: file configdialog.ui line 125
+#: rc.cpp:30 rc.cpp:100
 #, no-c-format
-msgid "&Wide area network"
+msgid "Browse local networ&k"
+msgstr ""
+
+#. i18n: file configdialog.ui line 128
+#: rc.cpp:33 rc.cpp:103
+#, fuzzy, no-c-format
+msgid "Alt+K"
+msgstr "Alt+A"
+
+#. i18n: file configdialog.ui line 131
+#: rc.cpp:36 rc.cpp:45 rc.cpp:106 rc.cpp:115
+#, no-c-format
+msgid "Browse local network (domain .local) using multicast DNS."
 msgstr ""
 
-#. i18n: file configdialog.ui line 138
-#: rc.cpp:34 rc.cpp:86
+#. i18n: file configdialog.ui line 139
+#: rc.cpp:39 rc.cpp:109
+#, no-c-format
+msgid "Enable &Zeroconf network browsing"
+msgstr ""
+
+#. i18n: file configdialog.ui line 142
+#: rc.cpp:42 rc.cpp:112
+#, fuzzy, no-c-format
+msgid "Alt+Z"
+msgstr "Alt+A"
+
+#. i18n: file configdialog.ui line 161
+#: rc.cpp:48 rc.cpp:118
+#, no-c-format
+msgid "Additional Domains"
+msgstr ""
+
+#. i18n: file configdialog.ui line 165
+#: rc.cpp:51 rc.cpp:121
 #, no-c-format
 msgid ""
-"Advertise services on Internet domain using public IP. To have this option "
-"working you need to configure wide area operation in using administrator mode"
+"List of Internet domains  that will be browsed for services. Do not put .local "
+"here - it\n"
+"is configured with 'Browse local network' option above."
 msgstr ""
 
-#. i18n: file configdialog.ui line 149
-#: rc.cpp:37 rc.cpp:89
+#. i18n: file configdialog.ui line 175
+#: rc.cpp:55 rc.cpp:125
 #, no-c-format
 msgid "W&ide area"
 msgstr ""
 
-#. i18n: file configdialog.ui line 168
-#: rc.cpp:40 rc.cpp:92
+#. i18n: file configdialog.ui line 194
+#: rc.cpp:58 rc.cpp:128
 #, no-c-format
 msgid "Shared secret:"
 msgstr ""
 
-#. i18n: file configdialog.ui line 193
-#: rc.cpp:43 rc.cpp:95
+#. i18n: file configdialog.ui line 219
+#: rc.cpp:61 rc.cpp:131
 #, no-c-format
 msgid "Name of this machine. Must be in fully qualified form (host.domain)"
 msgstr ""
 
-#. i18n: file configdialog.ui line 201
-#: rc.cpp:46 rc.cpp:98
+#. i18n: file configdialog.ui line 227
+#: rc.cpp:64 rc.cpp:134
 #, no-c-format
 msgid "Optional shared secret used for authorization of DNS dynamic updates."
 msgstr ""
 
-#. i18n: file configdialog.ui line 212
-#: rc.cpp:49 rc.cpp:101
+#. i18n: file configdialog.ui line 238
+#: rc.cpp:67 rc.cpp:137
 #, no-c-format
 msgid "Domain:"
 msgstr "Parth:"
 
-#. i18n: file configdialog.ui line 220
-#: rc.cpp:52 rc.cpp:104
+#. i18n: file configdialog.ui line 246
+#: rc.cpp:70 rc.cpp:140
 #, no-c-format
 msgid "Hostname:"
 msgstr "Enw Gwesteiwr:"
@@ -144,6 +194,3 @@ msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr "kyfieithu@dotmon.com"
-
-#~ msgid "Alt+A"
-#~ msgstr "Alt+A"
diff --git a/tde-i18n-cy/messages/tdebase/kcmtdeio.po b/tde-i18n-cy/messages/tdebase/kcmtdeio.po
index d97570e7338..fd2ff6e3ea4 100644
--- a/tde-i18n-cy/messages/tdebase/kcmtdeio.po
+++ b/tde-i18n-cy/messages/tdebase/kcmtdeio.po
@@ -10,10 +10,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmkio\n"
-"POT-Creation-Date: 2008-07-08 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-07-03 07:57+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -337,14 +338,12 @@ msgid ""
 "<qt>Enter a valid address or url."
 "<p><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, then simply enter <code>"
-".kde.org</code></qt>"
+"domain, then simply enter <code>.kde.org</code></qt>"
 msgstr ""
 "<qt>Rhowch cyfeiriad neu url dilys."
 "<p><b><u>NODER:</u></b> Ni chynhelir cydweddu nodau-chwilio fel <code>"
 "*.kde.org</code>. Os hoffech gydweddu unrhyw weinydd yn y parth <code>"
-".kde.org</code>, rhowch <code>"
-".kde.org</code></qt>"
+".kde.org</code>, rhowch <code>.kde.org</code></qt>"
 
 #: kproxydlg.cpp:54
 msgid "&Proxy"
@@ -1187,7 +1186,8 @@ msgid ""
 "<p>\n"
 "<b>NOTE:</b> This option might not work properly or not work at all in some "
 "UNIX/Linux distributions. If you encounter a problem when using this option, "
-"please check the FAQ section at http://konqueror.kde.org.\n"
+"please contact the Trinity developers or file a bug report at "
+"http://bugs.trinitydesktop.org/.\n"
 "</qt>"
 msgstr ""
 "<qt>\n"
@@ -1504,11 +1504,11 @@ msgstr "Enw &Parth:"
 
 #. i18n: file policydlg_ui.ui line 35
 #: rc.cpp:443 rc.cpp:448
-#, no-c-format
+#, fuzzy, no-c-format
 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"
+"Enter the host or domain to which this policy applies, e.g. <b>"
+"www.trinitydesktop.org</b> or <b>.trinitydesktop.org</b>.\n"
 "</qt>"
 msgstr ""
 "<qt>\n"
@@ -1781,12 +1781,12 @@ msgstr ""
 
 #. i18n: file useragentdlg_ui.ui line 19
 #: rc.cpp:598
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "<qt>\n"
 "Here you can modify the default browser-identification text or set a site <code>"
-"(eg. www.kde.org)</code> or a domain <code>(eg. kde.org)</code> "
-"specific identification text."
+"(eg. www.trinitydesktop.org)</code> or a domain <code>"
+"(eg. trinitydesktop.org)</code> specific identification text."
 "<p>\n"
 "To add a new site specific identification text, click the <code>New</code> "
 "button and supply the necessary information. To change an existing site "
diff --git a/tde-i18n-cy/messages/tdebase/kcmtwindecoration.po b/tde-i18n-cy/messages/tdebase/kcmtwindecoration.po
index d29ac06e78e..7486d7f6c54 100644
--- a/tde-i18n-cy/messages/tdebase/kcmtwindecoration.po
+++ b/tde-i18n-cy/messages/tdebase/kcmtwindecoration.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmtwindecoration\n"
-"POT-Creation-Date: 2005-10-28 02:43+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-07-03 22:37+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -32,7 +33,8 @@ msgid "Buttons"
 msgstr "Botymau"
 
 #: buttons.cpp:611
-msgid "TDE"
+#, fuzzy
+msgid "KDE"
 msgstr "TDE"
 
 #: buttons.cpp:663
@@ -85,7 +87,25 @@ msgstr "Dewislen"
 msgid "--- spacer ---"
 msgstr ""
 
-#: twindecoration.cpp:90
+#: preview.cpp:48
+msgid ""
+"No preview available.\n"
+"Most probably there\n"
+"was a problem loading the plugin."
+msgstr ""
+"Dim rhagolwg ar gael.\n"
+"Mwy na thebyg mi roedd\n"
+"problem wrth lwytho'r ategyn."
+
+#: preview.cpp:330
+msgid "Active Window"
+msgstr "Ffenestr Weithredol"
+
+#: preview.cpp:330
+msgid "Inactive Window"
+msgstr "Ffenestr anweithredol"
+
+#: twindecoration.cpp:95
 msgid ""
 "Select the window decoration. This is the look and feel of both the window "
 "borders and the window handle."
@@ -93,24 +113,24 @@ msgstr ""
 "Dewiswch yr addurniad ffenestr. Dyma golwg a theimlad ffiniau ffenestr a dolen "
 "y ffenestr."
 
-#: twindecoration.cpp:95
+#: twindecoration.cpp:100
 msgid "Decoration Options"
 msgstr "Dewisiadau Addurniadau"
 
-#: twindecoration.cpp:105
+#: twindecoration.cpp:110
 #, fuzzy
 msgid "B&order size:"
 msgstr "Maint ffin: Bach Iawn"
 
-#: twindecoration.cpp:108
+#: twindecoration.cpp:113
 msgid "Use this combobox to change the border size of the decoration."
 msgstr ""
 
-#: twindecoration.cpp:124
+#: twindecoration.cpp:129
 msgid "&Show window button tooltips"
 msgstr "&Dangos cynghorion offer botymau ffenestri"
 
-#: twindecoration.cpp:126
+#: twindecoration.cpp:131
 msgid ""
 "Enabling this checkbox will show window button tooltips. If this checkbox is "
 "off, no window button tooltips will be shown."
@@ -118,11 +138,11 @@ 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."
 
-#: twindecoration.cpp:130
+#: twindecoration.cpp:135
 msgid "Use custom titlebar button &positions"
 msgstr "Defnyddio &lleoliadau botymau bar teitl addasiedig"
 
-#: twindecoration.cpp:132
+#: twindecoration.cpp:137
 msgid ""
 "The appropriate settings can be found in the \"Buttons\" Tab; please note that "
 "this option is not available on all styles yet."
@@ -130,61 +150,190 @@ msgstr ""
 "Gellir canfod y gosodiadau perthnasol yn y Tab \"Botymau\"; noder nad yw'r  "
 "dewisiad yma ar gael ar bob arddull eto!"
 
-#: twindecoration.cpp:163
+#: twindecoration.cpp:155
+msgid "NOTICE:"
+msgstr ""
+
+#: twindecoration.cpp:155
+msgid "A third party Window Manager has been selected for use with TDE."
+msgstr ""
+
+#: twindecoration.cpp:155
+msgid ""
+"As a result, the built-in Window Manager configuration system will not function "
+"and has been disabled."
+msgstr ""
+
+#: twindecoration.cpp:182
+msgid "&Draw a drop shadow under windows"
+msgstr ""
+
+#: twindecoration.cpp:184
+msgid ""
+"Enabling this checkbox will allow you to choose a kind of drop shadow to draw "
+"under each window."
+msgstr ""
+
+#: twindecoration.cpp:188
+#, fuzzy
+msgid "Active Window Shadow"
+msgstr "Ffenestr Weithredol"
+
+#: twindecoration.cpp:190
+#, fuzzy
+msgid "Inactive Window Shadows"
+msgstr "Ffenestr anweithredol"
+
+#: twindecoration.cpp:192
+msgid "Draw Shadow Under Normal Windows And..."
+msgstr ""
+
+#: twindecoration.cpp:194
+msgid "Docks and &panels"
+msgstr ""
+
+#: twindecoration.cpp:198
+msgid "O&verride windows"
+msgstr ""
+
+#: twindecoration.cpp:202
+msgid "&Top menu"
+msgstr ""
+
+#: twindecoration.cpp:207
+msgid "Draw shadow under &inactive windows"
+msgstr ""
+
+#: twindecoration.cpp:213 twindecoration.cpp:219
+msgid "Colour:"
+msgstr ""
+
+#: twindecoration.cpp:225 twindecoration.cpp:241
+msgid "Maximum opacity:"
+msgstr ""
+
+#: twindecoration.cpp:262 twindecoration.cpp:272
+msgid "Offset rightward (may be negative):"
+msgstr ""
+
+#: twindecoration.cpp:265 twindecoration.cpp:276 twindecoration.cpp:286
+#: twindecoration.cpp:297 twindecoration.cpp:308 twindecoration.cpp:319
+msgid " pixels"
+msgstr ""
+
+#: twindecoration.cpp:283 twindecoration.cpp:293
+msgid "Offset downward (may be negative):"
+msgstr ""
+
+#: twindecoration.cpp:304 twindecoration.cpp:315
+msgid "Thickness to either side of window:"
+msgstr ""
+
+#: twindecoration.cpp:330
+msgid ""
+"Select the window manager. Selecting a window manager other than \"twin\" will "
+"require you to use a third party program for configuration and may increase the "
+"risk of system crashes or security problems."
+msgstr ""
+
+#: twindecoration.cpp:333
+msgid "Window Manager to use in your TDE session:"
+msgstr ""
+
+#: twindecoration.cpp:337
+msgid ""
+"Specify any command line arguments to be passed to the selected WM on startup, "
+"separated with whitespace.  A common example is --replace"
+msgstr ""
+
+#: twindecoration.cpp:339
+msgid ""
+"Command line arguments to pass to the Window Manager (should remain blank "
+"unless needed):"
+msgstr ""
+
+#: twindecoration.cpp:353
 msgid "&Window Decoration"
 msgstr "Addurniad &Ffenestr"
 
-#: twindecoration.cpp:164
+#: twindecoration.cpp:354
 msgid "&Buttons"
 msgstr "&Botymau"
 
-#: twindecoration.cpp:182
+#: twindecoration.cpp:355
+#, fuzzy
+msgid "&Shadows"
+msgstr "Rholio"
+
+#: twindecoration.cpp:356
+#, fuzzy
+msgid "&Window Manager"
+msgstr "Addurniad &Ffenestr"
+
+#: twindecoration.cpp:382
 msgid "kcmtwindecoration"
 msgstr "kcmtwindecoration"
 
-#: twindecoration.cpp:183
+#: twindecoration.cpp:383
 msgid "Window Decoration Control Module"
 msgstr "Modwl Reoli Addurniadau Ffenestri"
 
-#: twindecoration.cpp:185
+#: twindecoration.cpp:385
 msgid "(c) 2001 Karol Szwed"
 msgstr "(h)(c) 2001 Karol Szwed"
 
-#: twindecoration.cpp:237 twindecoration.cpp:439
-msgid "TDE 2"
+#: twindecoration.cpp:437 twindecoration.cpp:695
+#, fuzzy
+msgid "KDE 2"
 msgstr "TDE 2"
 
-#: twindecoration.cpp:266
+#: twindecoration.cpp:458
+msgid "(KDE4's window manager)"
+msgstr ""
+
+#: twindecoration.cpp:458
+msgid "(Compiz Effects Manager)"
+msgstr ""
+
+#: twindecoration.cpp:458
+msgid "(Simple, fast window manager)"
+msgstr ""
+
+#: twindecoration.cpp:460
+msgid "(Default TDE window manager)"
+msgstr ""
+
+#: twindecoration.cpp:522
 msgid "Tiny"
 msgstr "Pitw"
 
-#: twindecoration.cpp:267
+#: twindecoration.cpp:523
 msgid "Normal"
 msgstr "Arferol"
 
-#: twindecoration.cpp:268
+#: twindecoration.cpp:524
 msgid "Large"
 msgstr "Mawr"
 
-#: twindecoration.cpp:269
+#: twindecoration.cpp:525
 #, fuzzy
 msgid "Very Large"
 msgstr "Maint ffin: Mawr Iawn"
 
-#: twindecoration.cpp:270
+#: twindecoration.cpp:526
 msgid "Huge"
 msgstr "Anferth"
 
-#: twindecoration.cpp:271
+#: twindecoration.cpp:527
 msgid "Very Huge"
 msgstr ""
 
-#: twindecoration.cpp:272
+#: twindecoration.cpp:528
 #, fuzzy
 msgid "Oversized"
 msgstr "Newid maint"
 
-#: twindecoration.cpp:591
+#: twindecoration.cpp:949
 #, fuzzy
 msgid ""
 "<h1>Window Manager Decoration</h1>"
@@ -211,24 +360,6 @@ msgstr ""
 "drwy fritho'r blwch \"Defnyddio lleoliadau bar teitl addasiedig\". Yn y tab "
 "\"Botymau\" gallwch newid lleoliadau'r botymau yn ôl eich dewis.</p>"
 
-#: preview.cpp:48
-msgid ""
-"No preview available.\n"
-"Most probably there\n"
-"was a problem loading the plugin."
-msgstr ""
-"Dim rhagolwg ar gael.\n"
-"Mwy na thebyg mi roedd\n"
-"problem wrth lwytho'r ategyn."
-
-#: preview.cpp:330
-msgid "Active Window"
-msgstr "Ffenestr Weithredol"
-
-#: preview.cpp:330
-msgid "Inactive Window"
-msgstr "Ffenestr anweithredol"
-
 #~ msgid "Spacer"
 #~ msgstr "Bylchwr"
 
diff --git a/tde-i18n-cy/messages/tdebase/kcmtwinrules.po b/tde-i18n-cy/messages/tdebase/kcmtwinrules.po
index 4f2bcaf4b4d..31289dafc71 100644
--- a/tde-i18n-cy/messages/tdebase/kcmtwinrules.po
+++ b/tde-i18n-cy/messages/tdebase/kcmtwinrules.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmtwinrules\n"
-"POT-Creation-Date: 2008-07-08 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-07-03 17:42+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -103,11 +104,12 @@ msgid "(c) 2004 KWin and KControl Authors"
 msgstr "(c) 2004 Awduron KWin a KControl"
 
 #: kcm.cpp:81
+#, fuzzy
 msgid ""
 "<h1>Window-specific Settings</h1> Here you can customize window settings "
 "specifically only for some windows. "
 "<p>Please note that this configuration will not take effect if you do not use "
-"KWin as your window manager. If you do use a different window manager, please "
+"TWin as your window manager. If you do use a different window manager, please "
 "refer to its documentation for how to customize window behavior."
 msgstr ""
 "<h1>Gosodiadau sy'n Benodol i'r Ffenestr</h1> Yma, gallwch addasu gosodiadau "
@@ -139,11 +141,12 @@ msgid "Window settings for %1"
 msgstr ""
 
 #: main.cpp:279
-msgid "KWin"
-msgstr "KWin"
+msgid "TWin"
+msgstr ""
 
 #: main.cpp:280
-msgid "KWin helper utility"
+#, fuzzy
+msgid "TWin helper utility"
 msgstr "Defnyddioldeb gymorth KWin"
 
 #: main.cpp:290
@@ -853,6 +856,9 @@ msgstr ""
 msgid "Edit Shortcut"
 msgstr ""
 
+#~ msgid "KWin"
+#~ msgstr "KWin"
+
 #~ msgid "Form2"
 #~ msgstr "Ffurflen2"
 
diff --git a/tde-i18n-cy/messages/tdebase/kcmusb.po b/tde-i18n-cy/messages/tdebase/kcmusb.po
index 4f9ddfca582..876e9c0c572 100644
--- a/tde-i18n-cy/messages/tdebase/kcmusb.po
+++ b/tde-i18n-cy/messages/tdebase/kcmusb.po
@@ -9,10 +9,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmusb\n"
-"POT-Creation-Date: 2006-06-21 03:58+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2005-09-03 18:59+0100\n"
 "Last-Translator: Kevin Donnelly <kevin@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdebase/kcmview1394.po b/tde-i18n-cy/messages/tdebase/kcmview1394.po
index 1bc76331199..7a17ee8fa65 100644
--- a/tde-i18n-cy/messages/tdebase/kcmview1394.po
+++ b/tde-i18n-cy/messages/tdebase/kcmview1394.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmview1394\n"
-"POT-Creation-Date: 2005-09-27 02:32+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-12-28 19:51+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -86,7 +87,7 @@ msgstr "Gwerthwr"
 msgid "Generate 1394 Bus Reset"
 msgstr "Acosi ailosodiad y Bws 1394"
 
-#: view1394.cpp:65
+#: view1394.cpp:64
 msgid ""
 "On the right hand side you can see some information about your IEEE 1394 "
 "configuration."
@@ -119,20 +120,20 @@ msgstr ""
 "<br><b>Cyflymder</b>: cyflymder y nôd"
 "<br>"
 
-#: view1394.cpp:196
+#: view1394.cpp:195
 msgid "Port %1:\"%2\""
 msgstr "Porth %1:\"%2\""
 
-#: view1394.cpp:209
+#: view1394.cpp:208
 #, c-format
 msgid "Node %1"
 msgstr "Nôd %1"
 
-#: view1394.cpp:212
+#: view1394.cpp:211
 msgid "Not ready"
 msgstr "Dim yn barod"
 
-#: view1394.cpp:316
+#: view1394.cpp:315
 msgid "Unknown"
 msgstr "Anhysbys"
 
diff --git a/tde-i18n-cy/messages/tdebase/kcmxinerama.po b/tde-i18n-cy/messages/tdebase/kcmxinerama.po
index e3245581758..3b10c39878d 100644
--- a/tde-i18n-cy/messages/tdebase/kcmxinerama.po
+++ b/tde-i18n-cy/messages/tdebase/kcmxinerama.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmxinerama\n"
-"POT-Creation-Date: 2006-08-23 02:32+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-07-04 17:25+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdebase/kcontrol.po b/tde-i18n-cy/messages/tdebase/kcontrol.po
index 88be70f5720..737e8ff13c0 100644
--- a/tde-i18n-cy/messages/tdebase/kcontrol.po
+++ b/tde-i18n-cy/messages/tdebase/kcontrol.po
@@ -10,10 +10,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcontrol\n"
-"POT-Creation-Date: 2008-01-05 01:15+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-07-04 17:30+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -48,7 +49,7 @@ msgstr ""
 "Croeso i Ganolfan Reoli Trinity, lle canolog i ffurfweddu eith amgylchedd "
 "penbwrdd. Dewiswch eitem o'r mynegai i'r chwith i lwytho modiwl ffurfweddu."
 
-#: aboutwidget.cpp:53 main.cpp:108
+#: aboutwidget.cpp:53
 msgid "Trinity Info Center"
 msgstr "Canolfan Wybodaeth Trinity"
 
@@ -61,8 +62,8 @@ msgid ""
 "Welcome to the Trinity Info Center, a central place to find information about "
 "your computer system."
 msgstr ""
-"Croeso i Ganolfan Wybodaeth TDE, lle canolog i ddarganfod gwybodaeth am "
-"eich cysawd cyfrifiadurol."
+"Croeso i Ganolfan Wybodaeth TDE, lle canolog i ddarganfod gwybodaeth am eich "
+"cysawd cyfrifiadurol."
 
 #: aboutwidget.cpp:61
 #, fuzzy
@@ -102,7 +103,7 @@ msgstr "Peiriant:"
 msgid "<big><b>Loading...</b></big>"
 msgstr "<big><b>Llwytho...</b></big>"
 
-#: dockcontainer.cpp:201 toplevel.cpp:376
+#: dockcontainer.cpp:201 toplevel.cpp:371
 msgid ""
 "There are unsaved changes in the active module.\n"
 "Do you want to apply the changes before running the new module or discard the "
@@ -112,7 +113,7 @@ msgstr ""
 " A ydych chi eisiau cadw'r newidiadau cyn rhedeg y modiwl nesaf, neu daflu'r "
 "newidiadau?"
 
-#: dockcontainer.cpp:204 toplevel.cpp:379
+#: dockcontainer.cpp:204 toplevel.cpp:374
 msgid ""
 "There are unsaved changes in the active module.\n"
 "Do you want to apply the changes before exiting the Control Center or discard "
@@ -122,7 +123,7 @@ msgstr ""
 " A ydych chi eisiau cadw'r newidiadau cyn i chi adael y Ganolfan Reoli, neu "
 "daflu'r newidiadau?"
 
-#: dockcontainer.cpp:207 toplevel.cpp:382
+#: dockcontainer.cpp:207 toplevel.cpp:377
 msgid "Unsaved Changes"
 msgstr "Newidiadau Heb eu Cadw"
 
@@ -136,21 +137,7 @@ msgstr ""
 "penodol.</p>"
 "<p>I ddarllen y llawlyfr cyfan, cliciwch <a href=\"%1\">yma</a>.</p>"
 
-#: helpwidget.cpp:51
-msgid ""
-"<h1>TDE Info Center</h1>There is no quick help available for the active info "
-"module."
-"<br>"
-"<br>Click <a href = \"kinfocenter/index.html\">here</a> "
-"to read the general Info Center manual."
-msgstr ""
-"<h1>Canolfan Wybodaeth TDE</h1>Nid oes cymorth cyflym am y modiwl gwybodaeth "
-"gweithredol."
-"<br>"
-"<br>Cliciwch <a href = \"kinfocenter/index.html\">yma</a> "
-"i ddarllen llawlyfr cyffredinol y Ganolfan Wybodaeth."
-
-#: helpwidget.cpp:56
+#: helpwidget.cpp:50
 msgid ""
 "<h1>Trinity Control Center</h1>There is no quick help available for the active "
 "control module."
@@ -177,18 +164,19 @@ msgstr ""
 msgid "The Trinity Control Center"
 msgstr "Canolfan Reoli TDE"
 
-#: main.cpp:106 main.cpp:110
+#: main.cpp:106
 msgid "(c) 1998-2004, The Trinity Control Center Developers"
 msgstr "(h)(c) 1998-2002, Y Datblygwyr Canolfan Reoli TDE"
 
-#: main.cpp:109
-msgid "The TDE Info Center"
-msgstr "Canolfan Wybodaeth TDE"
-
-#: main.cpp:128 main.cpp:130
+#: main.cpp:115
 msgid "Current Maintainer"
 msgstr "Cynhaliwr Cyfredol"
 
+#: main.cpp:116
+#, fuzzy
+msgid "Previous Maintainer"
+msgstr "Cynhaliwr Cyfredol"
+
 #: modules.cpp:160
 msgid "<big>Loading...</big>"
 msgstr "<big>Yn Llwytho</big>"
@@ -239,13 +227,13 @@ msgid "&Administrator Mode"
 msgstr "Modd &Gweinyddol"
 
 #. i18n: file kcontrolui.rc line 5
-#: rc.cpp:6 rc.cpp:15
+#: rc.cpp:6
 #, no-c-format
 msgid "&Mode"
 msgstr "&Modd"
 
 #. i18n: file kcontrolui.rc line 9
-#: rc.cpp:9 rc.cpp:18
+#: rc.cpp:9
 #, no-c-format
 msgid "Icon &Size"
 msgstr "Maint &Eicon"
@@ -290,25 +278,31 @@ msgstr "&Mawr"
 msgid "&Huge"
 msgstr "&Enfawr"
 
-#: toplevel.cpp:270 toplevel.cpp:392 toplevel.cpp:447
+#: toplevel.cpp:270 toplevel.cpp:387 toplevel.cpp:442
 msgid "About Current Module"
 msgstr "Am y Modiwl Cyfredol"
 
-#: toplevel.cpp:281 toplevel.cpp:357
+#: toplevel.cpp:276 toplevel.cpp:352
 msgid "&Report Bug..."
 msgstr "&Anfon adroddiad nam..."
 
-#: toplevel.cpp:359
+#: toplevel.cpp:354
 msgid "Report Bug on Module %1..."
 msgstr "Anfon Adroddiad Nam am Modiwl %1..."
 
-#: toplevel.cpp:440
+#: toplevel.cpp:435
 #, c-format
 msgid ""
 "_: Help menu->about <modulename>\n"
 "About %1"
 msgstr "Am %1"
 
+#~ msgid "<h1>TDE Info Center</h1>There is no quick help available for the active info module.<br><br>Click <a href = \"kinfocenter/index.html\">here</a> to read the general Info Center manual."
+#~ msgstr "<h1>Canolfan Wybodaeth TDE</h1>Nid oes cymorth cyflym am y modiwl gwybodaeth gweithredol.<br><br>Cliciwch <a href = \"kinfocenter/index.html\">yma</a> i ddarllen llawlyfr cyffredinol y Ganolfan Wybodaeth."
+
+#~ msgid "The TDE Info Center"
+#~ msgstr "Canolfan Wybodaeth TDE"
+
 #~ msgid "Choose between Index, Search and Quick Help"
 #~ msgstr "Dewiswch rhwng Mynegai, Chwilio, a Chymorth Cyflym"
 
diff --git a/tde-i18n-cy/messages/tdebase/kdcop.po b/tde-i18n-cy/messages/tdebase/kdcop.po
index a4977262bd6..94879c18222 100644
--- a/tde-i18n-cy/messages/tdebase/kdcop.po
+++ b/tde-i18n-cy/messages/tdebase/kdcop.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kdcop\n"
-"POT-Creation-Date: 2007-05-15 02:14+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-07-05 19:59+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdebase/kdesktop.po b/tde-i18n-cy/messages/tdebase/kdesktop.po
index 577896d3f10..26f7afe07a4 100644
--- a/tde-i18n-cy/messages/tdebase/kdesktop.po
+++ b/tde-i18n-cy/messages/tdebase/kdesktop.po
@@ -10,59 +10,82 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kdesktop\n"
-"POT-Creation-Date: 2008-07-08 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-07-05 20:19+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.2\n"
 "\n"
 
-#: lock/autologout.cc:39
+#: lock/autologout.cc:42
+msgid "Automatic Logout Notification"
+msgstr ""
+
+#: lock/autologout.cc:54
 msgid "<nobr><qt><b>Automatic Log Out</b></qt><nobr>"
 msgstr ""
 
-#: lock/autologout.cc:40
+#: lock/autologout.cc:55
 msgid ""
 "<qt>To prevent being logged out, resume using this session by moving the mouse "
 "or pressing a key.</qt>"
 msgstr ""
 
-#: lock/autologout.cc:80
+#: lock/autologout.cc:97
 #, c-format
 msgid ""
 "_n: <nobr><qt>You will be automatically logged out in 1 second</qt></nobr>\n"
 "<nobr><qt>You will be automatically logged out in %n seconds</qt></nobr>"
 msgstr ""
 
-#: lock/lockdlg.cc:82
+#: lock/lockdlg.cc:110 lock/sakdlg.cc:76
+#, fuzzy
+msgid "Desktop Session Locked"
+msgstr "Cloydd KPenbwrdd"
+
+#: lock/lockdlg.cc:129 lock/lockdlg.cc:130
+msgid "This computer is in use and has been locked."
+msgstr ""
+
+#: lock/lockdlg.cc:130
+msgid "Only '%1' may unlock this session."
+msgstr ""
+
+#: lock/lockdlg.cc:134
 msgid "<nobr><b>The session is locked</b><br>"
 msgstr "<nobr><b>Mae'r sesiwn wedi'i gloi</b><br>"
 
-#: lock/lockdlg.cc:83
+#: lock/lockdlg.cc:135
 #, fuzzy
 msgid "<nobr><b>The session was locked by %1</b><br>"
 msgstr "<nobr><b>Mae'r sesiwn wedi'i gloi gan %1</b><br>"
 
-#: lock/lockdlg.cc:93
+#: lock/lockdlg.cc:140
+#, c-format
+msgid "This session has been locked since %1"
+msgstr ""
+
+#: lock/lockdlg.cc:151
 msgid "Sw&itch User..."
 msgstr ""
 
-#: lock/lockdlg.cc:94
+#: lock/lockdlg.cc:152 lock/querydlg.cc:94
 msgid "Unl&ock"
 msgstr "Dat&gloi"
 
-#: lock/lockdlg.cc:191
+#: lock/lockdlg.cc:309
 msgid "<b>Unlocking failed</b>"
 msgstr "<b>Methwyd datgloi</b>"
 
-#: lock/lockdlg.cc:197
+#: lock/lockdlg.cc:316
 msgid "<b>Warning: Caps Lock on</b>"
 msgstr "<b>Rhybudd: Clo Llythrennau arnodd</b>"
 
-#: lock/lockdlg.cc:423
+#: lock/lockdlg.cc:561
 #, fuzzy
 msgid ""
 "Cannot unlock the session because the authentication system failed to work;\n"
@@ -71,7 +94,16 @@ msgstr ""
 "Methu datgloi'r sesiwn, gan fod y cysawd dilysiant yn methu gweithio.\n"
 "Rhaid i chi ladd kdesktop_lock (pid %1) â llaw."
 
-#: lock/lockdlg.cc:526
+#: lock/lockdlg.cc:616 lock/lockprocess.cc:2395
+msgid "Authentication Subsystem Notice"
+msgstr ""
+
+#: lock/lockdlg.cc:673
+#, fuzzy
+msgid "New Session"
+msgstr "Dechrau Sesiwn Newydd"
+
+#: lock/lockdlg.cc:687
 #, fuzzy
 msgid ""
 "You have chosen to open another desktop session instead of resuming the current "
@@ -90,96 +122,155 @@ msgstr ""
 "fel rheol i'r sesiwn cyntaf, F%2 i'r ail sesiwn, ac yn y blaen. Cewch newid "
 "rhwng sesiynau gan wthio CTRL, ALT a'r bysell-F addas yr un pryd.</p>"
 
-#: krootwm.cc:842 lock/lockdlg.cc:539
+#: krootwm.cc:899 lock/lockdlg.cc:700
 msgid "&Start New Session"
 msgstr "Dechrau &Sesiwn Newydd"
 
-#: lock/lockdlg.cc:551
+#: lock/lockdlg.cc:712
 msgid "&Do not ask again"
 msgstr "&Peidio a gofyn eto"
 
-#: lock/lockdlg.cc:651
+#: kdesktopbindings.cpp:26 krootwm.cc:466 lock/lockdlg.cc:799
+#: lock/securedlg.cc:116
+msgid "Switch User"
+msgstr ""
+
+#: lock/lockdlg.cc:824
 msgid "Session"
 msgstr "Sesiwn"
 
-#: lock/lockdlg.cc:652
+#: lock/lockdlg.cc:825
 msgid "Location"
 msgstr "Lleoliad"
 
-#: lock/lockdlg.cc:678
+#: lock/lockdlg.cc:851
 msgid ""
 "_: session\n"
 "&Activate"
 msgstr "&Gweithredoli"
 
-#: lock/lockdlg.cc:687
+#: lock/lockdlg.cc:860
 msgid "Start &New Session"
 msgstr "&Dechrau Sesiwn Newydd"
 
-#: lock/lockprocess.cc:742
+#: lock/lockprocess.cc:538 lock/lockprocess.cc:693
+msgid "Securing desktop session"
+msgstr ""
+
+#: lock/lockprocess.cc:1435
 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:746
+#: lock/lockprocess.cc:1439
 msgid "Cannot start <i>kcheckpass</i>."
 msgstr "Methu cychwyn <i>kcheckpass</i>."
 
-#: lock/lockprocess.cc:747
+#: lock/lockprocess.cc:1440
 msgid "<i>kcheckpass</i> is unable to operate. Possibly it is not SetUID root."
 msgstr ""
 "Mae <i>kcheckpass</i> yn methu gweithredu.  Efallai ni osodir i SetUID gwraidd."
 
-#: lock/lockprocess.cc:790
+#: lock/lockprocess.cc:1483
 msgid "No appropriate greeter plugin configured."
 msgstr "Ni ffurfweddir ategyn cyfarchydd penodol."
 
-#: lock/main.cc:54
+#: lock/main.cc:212
 msgid "Force session locking"
 msgstr "Gorfodi cloi'r sesiwn"
 
-#: lock/main.cc:55
+#: lock/main.cc:213
 msgid "Only start screensaver"
 msgstr "Dechrau arbedwr sgrîn yn unig"
 
-#: lock/main.cc:56
+#: lock/main.cc:214
+msgid "Launch the secure dialog"
+msgstr ""
+
+#: lock/main.cc:215
 msgid "Only use the blank screensaver"
 msgstr "Defnyddio'r arbedwr sgrîn gwag yn unig"
 
-#: lock/main.cc:66
+#: lock/main.cc:216
+msgid "TDE internal command for background process loading"
+msgstr ""
+
+#: lock/main.cc:234
 msgid "KDesktop Locker"
 msgstr "Cloydd KPenbwrdd"
 
-#: lock/main.cc:66
+#: lock/main.cc:234
 msgid "Session Locker for KDesktop"
 msgstr "Cloydd Sesiwn i KPenbwrdd"
 
-#: desktop.cc:771
+#: lock/querydlg.cc:74
+msgid "Information Needed"
+msgstr ""
+
+#: lock/sakdlg.cc:102
+msgid "Press Ctrl+Alt+Del to begin."
+msgstr ""
+
+#: lock/sakdlg.cc:102
+msgid "This process helps keep your password secure."
+msgstr ""
+
+#: lock/sakdlg.cc:102
+msgid "It prevents unauthorized users from emulating the login screen."
+msgstr ""
+
+#: lock/securedlg.cc:76
+#, fuzzy
+msgid "Secure Desktop Area"
+msgstr "Adnewyddu Penbwrdd"
+
+#: lock/securedlg.cc:95
+msgid "'%1' is currently logged on"
+msgstr ""
+
+#: lock/securedlg.cc:98
+msgid "You are currently logged on"
+msgstr ""
+
+#: kdesktopbindings.cpp:31 krootwm.cc:191 lock/securedlg.cc:104
+msgid "Lock Session"
+msgstr "Cloi Sesiwn"
+
+#: lock/securedlg.cc:107
+#, fuzzy
+msgid "Task Manager"
+msgstr "Dangos Rheolydd Tasgiau"
+
+#: lock/securedlg.cc:110
+msgid "Logoff Menu"
+msgstr ""
+
+#: desktop.cc:935
 msgid "Set as Primary Background Color"
 msgstr "Gosod fel Lliw Cefndir Cynradd"
 
-#: desktop.cc:772
+#: desktop.cc:936
 msgid "Set as Secondary Background Color"
 msgstr "Gosod fel Lliw Cefndir Ailradd"
 
-#: desktop.cc:789
+#: desktop.cc:953
 msgid "&Save to Desktop..."
 msgstr "&Cadw i Benbwrdd..."
 
-#: desktop.cc:791
+#: desktop.cc:955
 msgid "Set as &Wallpaper"
 msgstr "Gosod fel &Papur Wal"
 
-#: desktop.cc:799
+#: desktop.cc:963
 msgid "Enter a name for the image below:"
 msgstr "Mewnosod enw ar gyfer y ddelwedd isod:"
 
-#: desktop.cc:808
+#: desktop.cc:972
 msgid "image.png"
 msgstr "image.png"
 
-#: desktop.cc:871
+#: desktop.cc:1035
 #, fuzzy
 msgid ""
 "Could not log out properly.\n"
@@ -212,139 +303,155 @@ msgid ""
 "to use another path."
 msgstr ""
 
-#: kdiconview.cc:437
+#: kdiconview.cc:444
 msgid "&Rename"
 msgstr "&Ail-enwi"
 
-#: kdiconview.cc:438
+#: kdiconview.cc:445
 msgid "&Properties"
 msgstr "&Priodweddau"
 
-#: kdiconview.cc:439
+#: kdiconview.cc:446
 msgid "&Move to Trash"
 msgstr "&Symud i Sbwriel"
 
-#: krootwm.cc:133
+#: kdiconview.cc:808
+msgid "You have chosen to remove a system icon"
+msgstr ""
+
+#: kdiconview.cc:808
+msgid "You can restore this icon in the future through the"
+msgstr ""
+
+#: kdiconview.cc:808
+msgid "tab in the"
+msgstr ""
+
+#: kdiconview.cc:808
+msgid "Behavior"
+msgstr ""
+
+#: kdiconview.cc:808
+msgid "pane of the Desktop Settings control module."
+msgstr ""
+
+#: krootwm.cc:134
 msgid "Run Command..."
 msgstr "Rhedeg Gorchymyn..."
 
-#: krootwm.cc:137
+#: krootwm.cc:135
+msgid "Open Terminal Here..."
+msgstr ""
+
+#: krootwm.cc:141
 msgid "Configure Desktop..."
 msgstr "Ffurfweddu Penbwrdd..."
 
-#: krootwm.cc:139 krootwm.cc:364
+#: krootwm.cc:143 krootwm.cc:374
 msgid "Disable Desktop Menu"
 msgstr "Analluogi Dewislen Penbwrdd"
 
-#: krootwm.cc:143
+#: krootwm.cc:147
 msgid "Unclutter Windows"
 msgstr "Dad-lanastrio Ffenestri"
 
-#: krootwm.cc:145
+#: krootwm.cc:149
 msgid "Cascade Windows"
 msgstr "Rhaeadru Ffenestri"
 
-#: krootwm.cc:151
+#: krootwm.cc:155
 msgid "By Name (Case Sensitive)"
 msgstr "Gan Enw (Llythrennau Mawr/Bach o Bwys)"
 
-#: krootwm.cc:153
+#: krootwm.cc:157
 msgid "By Name (Case Insensitive)"
 msgstr "Gan Enw (Llythrennau Mawr/Bach Dim o Bwys)"
 
-#: krootwm.cc:155
+#: krootwm.cc:159
 msgid "By Size"
 msgstr "Gan Faint"
 
-#: krootwm.cc:157
+#: krootwm.cc:161
 msgid "By Type"
 msgstr "Gan Fath"
 
-#: krootwm.cc:159
+#: krootwm.cc:163
 msgid "By Date"
 msgstr "Gan Ddyddiad"
 
-#: krootwm.cc:162
+#: krootwm.cc:166
 msgid "Directories First"
 msgstr "Cyfeiriaduron yn Gyntaf"
 
-#: krootwm.cc:165
+#: krootwm.cc:169
 msgid "Line Up Horizontally"
 msgstr "Unioni yn Llorweddol"
 
-#: krootwm.cc:168
+#: krootwm.cc:172
 msgid "Line Up Vertically"
 msgstr "Unioni yn Fertigol"
 
-#: krootwm.cc:171
+#: krootwm.cc:175
 msgid "Align to Grid"
 msgstr "Alinio i'r Grid"
 
-#. i18n: file kdesktop.kcfg line 180
-#: krootwm.cc:175 rc.cpp:215
+#. i18n: file kdesktop.kcfg line 185
+#: krootwm.cc:179 rc.cpp:242
 #, no-c-format
 msgid "Lock in Place"
 msgstr ""
 
-#: krootwm.cc:181
+#: krootwm.cc:185
 msgid "Refresh Desktop"
 msgstr "Adnewyddu Penbwrdd"
 
-#: kdesktopbindings.cpp:31 krootwm.cc:187
-msgid "Lock Session"
-msgstr "Cloi Sesiwn"
-
-#: krootwm.cc:192
+#: krootwm.cc:196
 #, fuzzy
 msgid "Log Out \"%1\"..."
 msgstr "Allgofnodi\"%1\"..."
 
-#: krootwm.cc:198
+#: krootwm.cc:202
 msgid "Start New Session"
 msgstr "Dechrau Sesiwn Newydd"
 
-#: krootwm.cc:202
+#: krootwm.cc:206
 #, fuzzy
 msgid "Lock Current && Start New Session"
 msgstr "Dechrau &Sesiwn Newydd"
 
-#: krootwm.cc:342 krootwm.cc:420
+#: krootwm.cc:352 krootwm.cc:434
 msgid "Sort Icons"
 msgstr "Trefnu eiconau"
 
-#: krootwm.cc:344
+#: krootwm.cc:354
 msgid "Line Up Icons"
 msgstr "Unioni Eiconau"
 
-#: krootwm.cc:371
+#: krootwm.cc:381
 msgid "Enable Desktop Menu"
 msgstr "Galluogi Dewislen Penbwrdd"
 
-#: krootwm.cc:430
+#: krootwm.cc:444
 msgid "Icons"
 msgstr "Eiconau"
 
-#: krootwm.cc:436 krootwm.cc:492
+#: krootwm.cc:450 krootwm.cc:506
 msgid "Windows"
 msgstr "Ffenestri"
 
-#: kdesktopbindings.cpp:26 krootwm.cc:452
-msgid "Switch User"
-msgstr ""
-
-#: krootwm.cc:481
+#: krootwm.cc:495
 msgid "Sessions"
 msgstr "Sesiynau"
 
-#: krootwm.cc:485
+#: krootwm.cc:499
 msgid "New"
 msgstr "Newydd"
 
-#: kdesktopbindings.cpp:14 krootwm.cc:491
+#: kdesktopbindings.cpp:14 krootwm.cc:505
 msgid "Desktop"
 msgstr "Penbwrdd"
 
-#: krootwm.cc:830
+#: krootwm.cc:887
 #, fuzzy
 msgid ""
 "<p>You have chosen to open another desktop session."
@@ -362,27 +469,31 @@ msgstr ""
 "fel rheol i'r sesiwn cyntaf, F%2 i'r ail sesiwn, ac yn y blaen. Cewch newid "
 "rhwng sesiynau gan wthio CTRL, ALT a'r bysell-F addas yr un pryd.</p>"
 
-#: krootwm.cc:841
+#: krootwm.cc:898
 msgid "Warning - New Session"
 msgstr "Rhybudd - Sesiwn Newydd"
 
-#: main.cc:46
+#: main.cc:58
 msgid "The TDE desktop"
 msgstr "Y Penbwrdd TDE"
 
-#: main.cc:52
+#: main.cc:64
 msgid "Use this if the desktop window appears as a real window"
 msgstr "Defnyddiwch hwn os yw'r ffenestr penbwrdd yn dangos fel ffenestr gwir"
 
-#: main.cc:53
+#: main.cc:65
 msgid "Obsolete"
 msgstr "Anarferedig"
 
-#: main.cc:54
+#: main.cc:66
 msgid "Wait for kded to finish building database"
 msgstr "Disgwyl am kded i orffen adeiladu'r cronfa ddata"
 
-#: main.cc:153
+#: main.cc:68
+msgid "Enable background transparency"
+msgstr ""
+
+#: main.cc:171
 msgid "KDesktop"
 msgstr "KPenbwrdd"
 
@@ -398,7 +509,7 @@ msgid ""
 "Your emails"
 msgstr "kyfieithu@dotmon.com"
 
-#: kdesktopbindings.cpp:20 minicli.cpp:79
+#: kdesktopbindings.cpp:20 minicli.cpp:82
 msgid "Run Command"
 msgstr "Rhedeg Gorchymyn"
 
@@ -410,46 +521,102 @@ msgstr "Dangos Rheolydd Tasgiau"
 msgid "Show Window List"
 msgstr "Dangos Rhestr Ffenestri"
 
-#: kdesktopbindings.cpp:37
+#: kdesktopbindings.cpp:32
+#, fuzzy
+msgid "Lock Session (Hotkey)"
+msgstr "Cloi Sesiwn"
+
+#: kdesktopbindings.cpp:38
+#, fuzzy
+msgid "Start Screen Saver"
+msgstr "Dechrau arbedwr sgrîn yn unig"
+
+#: kdesktopbindings.cpp:44
 msgid "Log Out"
 msgstr "Allgofnodi"
 
-#: kdesktopbindings.cpp:38
+#: kdesktopbindings.cpp:45
 #, fuzzy
 msgid "Log Out Without Confirmation"
 msgstr "Allgofnodi heb Gadarnhàd"
 
-#: kdesktopbindings.cpp:39
+#: kdesktopbindings.cpp:46
 msgid "Halt without Confirmation"
 msgstr "Stopio heb Gadarnhàd"
 
-#: kdesktopbindings.cpp:40
+#: kdesktopbindings.cpp:47
 msgid "Reboot without Confirmation"
 msgstr "Ail-gychwyn heb Gadarnhàd"
 
-#: minicli.cpp:93 minicli.cpp:639
+#: kxdglauncher.cpp:91
+msgid "XDG variable name to open"
+msgstr ""
+
+#: kxdglauncher.cpp:92
+msgid "Do not launch Konqueror; instead print path to directory if it exists)"
+msgstr ""
+
+#: kxdglauncher.cpp:98
+msgid "TDE XDG File Browser Launcher and Prompter"
+msgstr ""
+
+#: kxdglauncher.cpp:98
+msgid "Prompts if directory does not exist, otherwise launches"
+msgstr ""
+
+#: kxdglauncher.cpp:123
+msgid ""
+"Please confirm your Documents directory location"
+"<br>Upon confimation a new directory will be created"
+msgstr ""
+
+#: kxdglauncher.cpp:124
+msgid "Create Documents directory"
+msgstr ""
+
+#: kxdglauncher.cpp:167
+msgid "Unable to create directory "
+msgstr ""
+
+#: kxdglauncher.cpp:167
+msgid "Please check folder permissions and try again"
+msgstr ""
+
+#: kxdglauncher.cpp:167 kxdglauncher.cpp:172
+msgid "Unable to create directory"
+msgstr ""
+
+#: kxdglauncher.cpp:172
+msgid "Unable to create the directory "
+msgstr ""
+
+#: kxdglauncher.cpp:172
+msgid "Directory path cannot be longer than 4096 characters"
+msgstr ""
+
+#: minicli.cpp:96 minicli.cpp:795
 msgid "&Options >>"
 msgstr "&Dewisiadau >>"
 
-#: minicli.cpp:96
+#: minicli.cpp:99
 msgid "&Run"
 msgstr "&Rhedeg"
 
-#: minicli.cpp:392
+#: minicli.cpp:452
 msgid "<qt>The user <b>%1</b> does not exist on this system.</qt>"
 msgstr "<qt>Nid yw'r defnyddiwr <b>%1</b> yn bodoli ar y system yma.</qt>"
 
-#: minicli.cpp:402
+#: minicli.cpp:462
 msgid ""
 "You do not exist.\n"
 msgstr ""
 "Nid ydych yn bodoli!\n"
 
-#: minicli.cpp:427
+#: minicli.cpp:487
 msgid "Incorrect password; please try again."
 msgstr "Cyfrinair anghywir; ceisiwch eto, os gwelwch yn dda."
 
-#: minicli.cpp:538
+#: minicli.cpp:598
 msgid ""
 "<center><b>%1</b></center>\n"
 "You do not have permission to execute this command."
@@ -457,7 +624,7 @@ msgstr ""
 "<center><b>%1</b></center>\n"
 "Nid oes gennych ganiatàd i weithredu'r gorchymyn yma."
 
-#: minicli.cpp:566
+#: minicli.cpp:626
 msgid ""
 "<center><b>%1</b></center>\n"
 "Could not run the specified command."
@@ -465,7 +632,7 @@ msgstr ""
 "<center><b>%1</b></center>\n"
 "Methu rhedeg y gorchymyn penodol."
 
-#: minicli.cpp:578
+#: minicli.cpp:638
 msgid ""
 "<center><b>%1</b></center>\n"
 "The specified command does not exist."
@@ -473,11 +640,11 @@ msgstr ""
 "<center><b>%1</b></center>\n"
 "Nid yw'r gorchymyn penodol yn bodoli."
 
-#: minicli.cpp:627
+#: minicli.cpp:783
 msgid "&Options <<"
 msgstr "&Dewisiadau <<"
 
-#: minicli.cpp:832
+#: minicli.cpp:1000
 msgid ""
 "Running a realtime application can be very dangerous. If the application "
 "misbehaves, the system might hang unrecoverably.\n"
@@ -487,11 +654,11 @@ msgstr ""
 "camymddwyn, gall y cysawd ymatal heb siwan o'r adennill. \n"
 "Ydych yn sicr yr ydych eisiau mynd ymlaen?"
 
-#: minicli.cpp:835
+#: minicli.cpp:1003
 msgid "Warning - Run Command"
 msgstr "Rhybudd - Rhedeg Gorchymyn"
 
-#: minicli.cpp:835
+#: minicli.cpp:1003
 msgid "&Run Realtime"
 msgstr "&Rhedeg Gwir-amser"
 
@@ -532,38 +699,83 @@ msgstr ""
 "</ul>\n"
 "</qt>"
 
-#. i18n: file minicli_ui.ui line 199
+#. i18n: file minicli_ui.ui line 188
 #: rc.cpp:14
 #, no-c-format
+msgid "Autocomplete shows available &applications"
+msgstr ""
+
+#. i18n: file minicli_ui.ui line 192
+#: rc.cpp:17
+#, no-c-format
+msgid ""
+"<qt>When enabled, the system shows available applications in the autocompletion "
+"area.\n"
+"\t\t\t\t\t\t</qt>"
+msgstr ""
+
+#. i18n: file minicli_ui.ui line 200
+#: rc.cpp:21
+#, no-c-format
+msgid "Autocomplete uses &filesystem instead of history"
+msgstr ""
+
+#. i18n: file minicli_ui.ui line 204
+#: rc.cpp:24
+#, no-c-format
+msgid ""
+"<qt>This selects whether the filesystem or the past command history will be "
+"used for autocompletion.\n"
+"\t\t\t\t\t\t</qt>"
+msgstr ""
+
+#. i18n: file minicli_ui.ui line 212
+#: rc.cpp:28
+#, no-c-format
+msgid "Autocomplete uses &both history and filesystem"
+msgstr ""
+
+#. i18n: file minicli_ui.ui line 216
+#: rc.cpp:31
+#, no-c-format
+msgid ""
+"<qt>This selects whether the filesystem and the past command history will be "
+"used for autocompletion.\n"
+"\t\t\t\t\t\t</qt>"
+msgstr ""
+
+#. i18n: file minicli_ui.ui line 235
+#: rc.cpp:35
+#, no-c-format
 msgid "User&name:"
 msgstr "Enw &defnyddiwr:"
 
-#. i18n: file minicli_ui.ui line 205
-#: rc.cpp:17 rc.cpp:47
+#. i18n: file minicli_ui.ui line 241
+#: rc.cpp:38 rc.cpp:68
 #, no-c-format
 msgid "Enter the user you want to run the application as here."
 msgstr "Mewnosodwch y defnyddiwr yr ydych eisiau rhedeg y cymhwysiad fel fo."
 
-#. i18n: file minicli_ui.ui line 224
-#: rc.cpp:20 rc.cpp:26
+#. i18n: file minicli_ui.ui line 260
+#: rc.cpp:41 rc.cpp:47
 #, no-c-format
 msgid "Enter the password here for the user you specified above."
 msgstr "Mewnosodwch y cyfrinair am y defnyddiwr a benodwyd uchod."
 
-#. i18n: file minicli_ui.ui line 243
-#: rc.cpp:23
+#. i18n: file minicli_ui.ui line 279
+#: rc.cpp:44
 #, no-c-format
 msgid "Pass&word:"
 msgstr "Cyf&rinair"
 
-#. i18n: file minicli_ui.ui line 257
-#: rc.cpp:29
+#. i18n: file minicli_ui.ui line 293
+#: rc.cpp:50
 #, no-c-format
 msgid "Run in &terminal window"
 msgstr "Rhedeg mewn ffenestr &terfynell"
 
-#. i18n: file minicli_ui.ui line 260
-#: rc.cpp:32
+#. i18n: file minicli_ui.ui line 296
+#: rc.cpp:53
 #, no-c-format
 msgid ""
 "Check this option if the application you want to run is a text mode "
@@ -573,14 +785,14 @@ msgstr ""
 "gymhwysiad modd testun.   Bydd y cymhwysiad yn cael ei redeg wedyn mewn ffenest "
 "efelychu terfynell."
 
-#. i18n: file minicli_ui.ui line 279
-#: rc.cpp:35
+#. i18n: file minicli_ui.ui line 315
+#: rc.cpp:56
 #, no-c-format
 msgid "&Priority:"
 msgstr "&Blaenoriaeth:"
 
-#. i18n: file minicli_ui.ui line 285
-#: rc.cpp:38 rc.cpp:53 rc.cpp:59 rc.cpp:62
+#. i18n: file minicli_ui.ui line 321
+#: rc.cpp:59 rc.cpp:74 rc.cpp:80 rc.cpp:83
 #, no-c-format
 msgid ""
 "The priority that the command will be run with can be set here. From left to "
@@ -592,14 +804,14 @@ msgstr ""
 "Am flaenoriaethau sy'n uwch na'r gwerth yma, bydd angen cyfrinair gwraidd "
 "ganddoch."
 
-#. i18n: file minicli_ui.ui line 312
-#: rc.cpp:41
+#. i18n: file minicli_ui.ui line 348
+#: rc.cpp:62
 #, no-c-format
 msgid "Run with a &different priority"
 msgstr "Rhedeg gyda blaenoriaeth &gwahanol"
 
-#. i18n: file minicli_ui.ui line 315
-#: rc.cpp:44
+#. i18n: file minicli_ui.ui line 351
+#: rc.cpp:65
 #, no-c-format
 msgid ""
 "Check this option if you want to run the application with a different priority. "
@@ -610,26 +822,26 @@ msgstr ""
 "gwahanol.  Mae blaenoriaeth uwch yn dweud wrth y cysawd gweithredu i roi rhagor "
 "o amser prosesu i'ch cymhwysiad."
 
-#. i18n: file minicli_ui.ui line 356
-#: rc.cpp:50
+#. i18n: file minicli_ui.ui line 392
+#: rc.cpp:71
 #, no-c-format
 msgid "Low"
 msgstr "Isel"
 
-#. i18n: file minicli_ui.ui line 370
-#: rc.cpp:56
+#. i18n: file minicli_ui.ui line 406
+#: rc.cpp:77
 #, no-c-format
 msgid "High"
 msgstr "Uchel"
 
-#. i18n: file minicli_ui.ui line 411
-#: rc.cpp:65
+#. i18n: file minicli_ui.ui line 447
+#: rc.cpp:86
 #, no-c-format
 msgid "Run as a different &user"
 msgstr "Rhedeg fel defnyddiwr &gwahanol"
 
-#. i18n: file minicli_ui.ui line 414
-#: rc.cpp:68
+#. i18n: file minicli_ui.ui line 450
+#: rc.cpp:89
 #, no-c-format
 msgid ""
 "Check this option if you want to run the application with a different user id. "
@@ -641,26 +853,26 @@ msgstr ""
 "yn pennu caniatadau cyrchiad ffeil ac ati.  Mae angen cyfrinair y defnyddiwr er "
 "mwyn gwneud hyn."
 
-#. i18n: file minicli_ui.ui line 470
-#: rc.cpp:71
+#. i18n: file minicli_ui.ui line 506
+#: rc.cpp:92
 #, no-c-format
 msgid "Com&mand:"
 msgstr "Go&rchymyn:"
 
-#. i18n: file minicli_ui.ui line 476
-#: rc.cpp:74 rc.cpp:77
-#, no-c-format
+#. i18n: file minicli_ui.ui line 512
+#: rc.cpp:95 rc.cpp:98
+#, fuzzy, no-c-format
 msgid ""
 "Enter the command you wish to execute or the address of the resource you want "
-"to open. This can be a remote URL like \"www.kde.org\" or a local one like "
-"\"~/.tderc\"."
+"to open. This can be a remote URL like \"www.trinitydesktop.org\" or a local "
+"one like \"~/.tderc\"."
 msgstr ""
 "Mewnosodwch y gorchymyn yr ydych eisiau ei weithredu neu cyfeiriad yr adnodd yr "
 "ydych  eisiau ei agor. Mae hyn yn gallu bod yn URL pell fel \"www.kde.org\" neu "
 "un lleol fel \"~/.tderc\""
 
-#. i18n: file minicli_ui.ui line 533
-#: rc.cpp:80
+#. i18n: file minicli_ui.ui line 569
+#: rc.cpp:101
 #, no-c-format
 msgid ""
 "Enter the name of the application you want to run or the URL you want to view"
@@ -669,13 +881,13 @@ msgstr ""
 "ei weld."
 
 #. i18n: file kdesktop.kcfg line 11
-#: rc.cpp:83
+#: rc.cpp:104
 #, no-c-format
 msgid "Common settings for all desktops"
 msgstr ""
 
 #. i18n: file kdesktop.kcfg line 12
-#: rc.cpp:86
+#: rc.cpp:107
 #, no-c-format
 msgid ""
 "If you want the same background settings to be applied to all desktops enable "
@@ -683,13 +895,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file kdesktop.kcfg line 16
-#: rc.cpp:89
+#: rc.cpp:110
 #, no-c-format
 msgid "Common settings for all screens"
 msgstr ""
 
 #. i18n: file kdesktop.kcfg line 17
-#: rc.cpp:92
+#: rc.cpp:113
 #, no-c-format
 msgid ""
 "If you want the same background settings to be applied to all screens enable "
@@ -697,13 +909,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file kdesktop.kcfg line 21
-#: rc.cpp:95
+#: rc.cpp:116
 #, no-c-format
 msgid "Draw backgrounds per screen"
 msgstr ""
 
 #. i18n: file kdesktop.kcfg line 22
-#: rc.cpp:98
+#: rc.cpp:119
 #, no-c-format
 msgid ""
 "If you want to draw to each screen separately in xinerama mode enable this "
@@ -711,26 +923,26 @@ msgid ""
 msgstr ""
 
 #. i18n: file kdesktop.kcfg line 26
-#: rc.cpp:101
+#: rc.cpp:122
 #, no-c-format
 msgid "Limit background cache"
 msgstr ""
 
 #. i18n: file kdesktop.kcfg line 27
-#: rc.cpp:104
+#: rc.cpp:125
 #, no-c-format
 msgid ""
 "Enable this option if you want to limit the cache size for the background."
 msgstr ""
 
 #. i18n: file kdesktop.kcfg line 31
-#: rc.cpp:107
+#: rc.cpp:128
 #, no-c-format
 msgid "Background cache size"
 msgstr ""
 
 #. i18n: file kdesktop.kcfg line 32
-#: rc.cpp:110
+#: rc.cpp:131
 #, no-c-format
 msgid ""
 "Here you can enter how much memory TDE should use for caching the "
@@ -739,14 +951,28 @@ msgid ""
 "use."
 msgstr ""
 
-#. i18n: file kdesktop.kcfg line 38
-#: rc.cpp:113
+#. i18n: file kdesktop.kcfg line 36
+#: rc.cpp:134
+#, no-c-format
+msgid "Background Opacity"
+msgstr ""
+
+#. i18n: file kdesktop.kcfg line 37
+#: rc.cpp:137
+#, no-c-format
+msgid ""
+"Here you can the opacity of the background (0-100). A composite manager can "
+"then render something behind it."
+msgstr ""
+
+#. i18n: file kdesktop.kcfg line 43
+#: rc.cpp:140
 #, no-c-format
 msgid "Show icons on desktop"
 msgstr "Dangos eiconau ar y penbwrdd"
 
-#. i18n: file kdesktop.kcfg line 39
-#: rc.cpp:116
+#. i18n: file kdesktop.kcfg line 44
+#: rc.cpp:143
 #, no-c-format
 msgid ""
 "Uncheck this option if you do not want to have icons on the desktop. Without "
@@ -757,14 +983,14 @@ msgstr ""
 "eiconau bydd y penbwrdd ychydig yn gyflymach ond ni fedrwch lusgo ffeiliau i'r "
 "penbwrdd mwyach."
 
-#. i18n: file kdesktop.kcfg line 43
-#: rc.cpp:119
+#. i18n: file kdesktop.kcfg line 48
+#: rc.cpp:146
 #, no-c-format
 msgid "Allow programs in desktop window"
 msgstr "Caniatáu rhaglenni yn y ffenestr benbwrdd"
 
-#. i18n: file kdesktop.kcfg line 44
-#: rc.cpp:122
+#. i18n: file kdesktop.kcfg line 49
+#: rc.cpp:149
 #, no-c-format
 msgid ""
 "Check this option if you want to run X11 programs that draw into the desktop "
@@ -777,14 +1003,14 @@ msgstr ""
 "rhaglenni fel netscape, sy'n gwirio'r ffenestr wraidd am enghreifftiau "
 "rhedegog, datddewiswch y dewisiad yma."
 
-#. i18n: file kdesktop.kcfg line 55
-#: rc.cpp:125
+#. i18n: file kdesktop.kcfg line 60
+#: rc.cpp:152
 #, no-c-format
 msgid "Automatically line up icons"
 msgstr "Rhesi eiconau'n ymysgogol"
 
-#. i18n: file kdesktop.kcfg line 56
-#: rc.cpp:128
+#. i18n: file kdesktop.kcfg line 61
+#: rc.cpp:155
 #, no-c-format
 msgid ""
 "Check this option if you want to see your icons automatically aligned to the "
@@ -793,118 +1019,118 @@ msgstr ""
 "Dewiswch y dewisiad yma os ydych am weld eich eiconau wedi'u trefnu'n ymysgogol "
 "at grid pan eu symudwch."
 
-#. i18n: file kdesktop.kcfg line 60
-#: rc.cpp:131 rc.cpp:209
+#. i18n: file kdesktop.kcfg line 65
+#: rc.cpp:158 rc.cpp:236
 #, fuzzy, no-c-format
 msgid "Sort directories first"
 msgstr "Cyfeiriaduron yn Gyntaf"
 
-#. i18n: file kdesktop.kcfg line 71
-#: rc.cpp:134
+#. i18n: file kdesktop.kcfg line 76
+#: rc.cpp:161
 #, no-c-format
 msgid "Mouse wheel over desktop background switches desktop"
 msgstr "Newidia'r olwyn llygoden y penbwrdd pan fo dros y penbwrdd"
 
-#. i18n: file kdesktop.kcfg line 72
-#: rc.cpp:137
+#. i18n: file kdesktop.kcfg line 77
+#: rc.cpp:164
 #, no-c-format
 msgid ""
 "You can switch between the virtual desktops by using the mouse wheel over the "
 "desktop background."
 msgstr ""
 
-#. i18n: file kdesktop.kcfg line 83
-#: rc.cpp:140
+#. i18n: file kdesktop.kcfg line 88
+#: rc.cpp:167
 #, no-c-format
 msgid "Terminal application"
 msgstr ""
 
-#. i18n: file kdesktop.kcfg line 84
-#: rc.cpp:143
+#. i18n: file kdesktop.kcfg line 89
+#: rc.cpp:170
 #, no-c-format
 msgid "Defines which terminal application is used."
 msgstr ""
 
-#. i18n: file kdesktop.kcfg line 88
-#: rc.cpp:146
+#. i18n: file kdesktop.kcfg line 93
+#: rc.cpp:173
 #, no-c-format
 msgid "Left Mouse Button Action"
 msgstr ""
 
-#. i18n: file kdesktop.kcfg line 89
-#: rc.cpp:149
+#. i18n: file kdesktop.kcfg line 94
+#: rc.cpp:176
 #, no-c-format
 msgid ""
 "You can choose what happens when you click the left button of your pointing "
 "device on the desktop."
 msgstr ""
 
-#. i18n: file kdesktop.kcfg line 93
-#: rc.cpp:152
+#. i18n: file kdesktop.kcfg line 98
+#: rc.cpp:179
 #, no-c-format
 msgid "Middle Mouse Button Action"
 msgstr ""
 
-#. i18n: file kdesktop.kcfg line 94
-#: rc.cpp:155
+#. i18n: file kdesktop.kcfg line 99
+#: rc.cpp:182
 #, no-c-format
 msgid ""
 "You can choose what happens when you click the middle button of your pointing "
 "device on the desktop."
 msgstr ""
 
-#. i18n: file kdesktop.kcfg line 98
-#: rc.cpp:158
+#. i18n: file kdesktop.kcfg line 103
+#: rc.cpp:185
 #, no-c-format
 msgid "Right Mouse Button Action"
 msgstr ""
 
-#. i18n: file kdesktop.kcfg line 99
-#: rc.cpp:161
+#. i18n: file kdesktop.kcfg line 104
+#: rc.cpp:188
 #, no-c-format
 msgid ""
 "You can choose what happens when you click the right button of your pointing "
 "device on the desktop."
 msgstr ""
 
-#. i18n: file kdesktop.kcfg line 105
-#: rc.cpp:164
+#. i18n: file kdesktop.kcfg line 110
+#: rc.cpp:191
 #, no-c-format
-msgid "TDE major version number"
+msgid "KDE major version number"
 msgstr ""
 
-#. i18n: file kdesktop.kcfg line 110
-#: rc.cpp:167
+#. i18n: file kdesktop.kcfg line 115
+#: rc.cpp:194
 #, no-c-format
-msgid "TDE minor version number"
+msgid "KDE minor version number"
 msgstr ""
 
-#. i18n: file kdesktop.kcfg line 115
-#: rc.cpp:170
+#. i18n: file kdesktop.kcfg line 120
+#: rc.cpp:197
 #, no-c-format
-msgid "TDE release version number"
+msgid "KDE release version number"
 msgstr ""
 
-#. i18n: file kdesktop.kcfg line 122
-#: rc.cpp:173
+#. i18n: file kdesktop.kcfg line 127
+#: rc.cpp:200
 #, no-c-format
 msgid "Normal text color used for icon labels"
 msgstr ""
 
-#. i18n: file kdesktop.kcfg line 126
-#: rc.cpp:176
+#. i18n: file kdesktop.kcfg line 131
+#: rc.cpp:203
 #, no-c-format
 msgid "Background color used for icon labels"
 msgstr ""
 
-#. i18n: file kdesktop.kcfg line 131
-#: rc.cpp:179
+#. i18n: file kdesktop.kcfg line 136
+#: rc.cpp:206
 #, no-c-format
 msgid "Enable text shadow"
 msgstr ""
 
-#. i18n: file kdesktop.kcfg line 132
-#: rc.cpp:182
+#. i18n: file kdesktop.kcfg line 137
+#: rc.cpp:209
 #, no-c-format
 msgid ""
 "Check here to enable a shadow outline around the desktop font. This also "
@@ -915,14 +1141,14 @@ msgstr ""
 "hwn ei gwneud hi'n haws i ddarllen testun y penbwrdd yn erbyn cefndiroedd o liw "
 "tebyg."
 
-#. i18n: file kdesktop.kcfg line 145
-#: rc.cpp:185
+#. i18n: file kdesktop.kcfg line 150
+#: rc.cpp:212
 #, no-c-format
 msgid "Show hidden files"
 msgstr "Dangos ffeiliau cudd"
 
-#. i18n: file kdesktop.kcfg line 146
-#: rc.cpp:188
+#. i18n: file kdesktop.kcfg line 151
+#: rc.cpp:215
 #, no-c-format
 msgid ""
 "<p>If you check this option, any files in your desktop directory that begin "
@@ -934,82 +1160,82 @@ msgid ""
 "change or delete these files unless you know what you are doing.</p>"
 msgstr ""
 
-#. i18n: file kdesktop.kcfg line 150
-#: rc.cpp:191
+#. i18n: file kdesktop.kcfg line 155
+#: rc.cpp:218
 #, no-c-format
 msgid "Align direction"
 msgstr ""
 
-#. i18n: file kdesktop.kcfg line 151
-#: rc.cpp:194
+#. i18n: file kdesktop.kcfg line 156
+#: rc.cpp:221
 #, no-c-format
 msgid ""
 "If this is enabled, icons are aligned vertically, otherwise horizontally."
 msgstr ""
 
-#. i18n: file kdesktop.kcfg line 155
-#: rc.cpp:197
+#. i18n: file kdesktop.kcfg line 160
+#: rc.cpp:224
 #, no-c-format
 msgid "Show Icon Previews For"
 msgstr "Dangos Rhagolygon Eicon Ar Gyfer"
 
-#. i18n: file kdesktop.kcfg line 156
-#: rc.cpp:200
+#. i18n: file kdesktop.kcfg line 161
+#: rc.cpp:227
 #, no-c-format
 msgid "Select for which types of files you want to enable preview images."
 msgstr ""
 "Dewis ar gyfer pa fathau o ffeiliau yr hoffech alluogi delweddau rhagolwg."
 
-#. i18n: file kdesktop.kcfg line 170
-#: rc.cpp:203
+#. i18n: file kdesktop.kcfg line 175
+#: rc.cpp:230
 #, fuzzy, no-c-format
 msgid "Sort criterion"
 msgstr "Trefnu eiconau"
 
-#. i18n: file kdesktop.kcfg line 171
-#: rc.cpp:206
+#. i18n: file kdesktop.kcfg line 176
+#: rc.cpp:233
 #, no-c-format
 msgid ""
 "Sets the sort criterion. Possible choices are NameCaseSensitive = 0, "
 "NameCaseInsensitive = 1, Size = 2, Type = 3, Date = 4."
 msgstr ""
 
-#. i18n: file kdesktop.kcfg line 176
-#: rc.cpp:212
+#. i18n: file kdesktop.kcfg line 181
+#: rc.cpp:239
 #, no-c-format
 msgid ""
 "Enable this to place directories in front of the sorted list, otherwise they "
 "are amongst the files."
 msgstr ""
 
-#. i18n: file kdesktop.kcfg line 181
-#: rc.cpp:218
+#. i18n: file kdesktop.kcfg line 186
+#: rc.cpp:245
 #, fuzzy, no-c-format
 msgid "Check this option if you want to keep your icons from moving."
 msgstr ""
 "Dewiswch y dewisiad yma os ydych am weld eich eiconau wedi'u trefnu'n ymysgogol "
 "at grid pan eu symudwch."
 
-#. i18n: file kdesktop.kcfg line 202
-#: rc.cpp:221
+#. i18n: file kdesktop.kcfg line 207
+#: rc.cpp:248
 #, no-c-format
 msgid "Device Types to exclude"
 msgstr ""
 
-#. i18n: file kdesktop.kcfg line 203
-#: rc.cpp:224
+#. i18n: file kdesktop.kcfg line 208
+#: rc.cpp:251
 #, no-c-format
 msgid "The device types which you do not want to see on the desktop."
 msgstr ""
 
-#. i18n: file kdesktop.kcfg line 211
-#: rc.cpp:227
+#. i18n: file kdesktop.kcfg line 221
+#: rc.cpp:254
 #, no-c-format
 msgid "Current application's menu bar (Mac OS-style)"
 msgstr "Bar dewislen y cymhwysiad cyfredol (arddull MacOS)"
 
-#. i18n: file kdesktop.kcfg line 212
-#: rc.cpp:230
+#. i18n: file kdesktop.kcfg line 222
+#: rc.cpp:257
 #, no-c-format
 msgid ""
 "If this option is selected, applications will not have their menu bar attached "
@@ -1022,14 +1248,14 @@ msgstr ""
 "dangos dewislenni'r cymhwysiad sy'n weithredol yn gyfredol.  Efallai byddwch yn "
 "adnabod y nodwedd yma o Mac OS."
 
-#. i18n: file kdesktop.kcfg line 218
-#: rc.cpp:233
+#. i18n: file kdesktop.kcfg line 228
+#: rc.cpp:260
 #, no-c-format
 msgid "Desktop menu bar"
 msgstr "Bar Dewislen y Penbwrdd"
 
-#. i18n: file kdesktop.kcfg line 219
-#: rc.cpp:236
+#. i18n: file kdesktop.kcfg line 229
+#: rc.cpp:263
 #, no-c-format
 msgid ""
 "If this option is selected, there is one menu bar at the top of the screen "
@@ -1038,38 +1264,38 @@ msgstr ""
 "Os dewisir y dewisiad yma, mae un bar dewislen wrth ben y sgrîn sy'n dangos y "
 "dewislenni penbwrdd."
 
-#. i18n: file kdesktop.kcfg line 225
-#: rc.cpp:239
+#. i18n: file kdesktop.kcfg line 235
+#: rc.cpp:266
 #, fuzzy, no-c-format
 msgid "Enable screen saver"
 msgstr "Dechrau arbedwr sgrîn yn unig"
 
-#. i18n: file kdesktop.kcfg line 226
-#: rc.cpp:242
+#. i18n: file kdesktop.kcfg line 236
+#: rc.cpp:269
 #, fuzzy, no-c-format
 msgid "Enables the screen saver."
 msgstr "Defnyddio'r arbedwr sgrîn gwag yn unig"
 
-#. i18n: file kdesktop.kcfg line 230
-#: rc.cpp:245
+#. i18n: file kdesktop.kcfg line 240
+#: rc.cpp:272
 #, no-c-format
 msgid "Screen saver timeout"
 msgstr ""
 
-#. i18n: file kdesktop.kcfg line 231
-#: rc.cpp:248
+#. i18n: file kdesktop.kcfg line 241
+#: rc.cpp:275
 #, no-c-format
 msgid "Sets the seconds after which the screen saver is started."
 msgstr ""
 
-#. i18n: file kdesktop.kcfg line 235
-#: rc.cpp:251
+#. i18n: file kdesktop.kcfg line 245
+#: rc.cpp:278
 #, no-c-format
 msgid "Suspend screen saver when DPMS kicks in"
 msgstr ""
 
-#. i18n: file kdesktop.kcfg line 238
-#: rc.cpp:254
+#. i18n: file kdesktop.kcfg line 248
+#: rc.cpp:281
 #, no-c-format
 msgid ""
 "Usually the screen saver is suspended when display power saving kicks in,\n"
@@ -1079,6 +1305,52 @@ msgid ""
 "them."
 msgstr ""
 
+#. i18n: file kdesktop.kcfg line 303
+#: rc.cpp:286
+#, no-c-format
+msgid ""
+"When enabled this restores the old style unmanaged window behavior of desktop "
+"locking."
+msgstr ""
+
+#. i18n: file kdesktop.kcfg line 308
+#: rc.cpp:289
+#, no-c-format
+msgid ""
+"When enabled the date and time when the desktop was locked is displayed as an "
+"additional intrusion detection measure."
+msgstr ""
+
+#. i18n: file kdesktop.kcfg line 313
+#: rc.cpp:292
+#, no-c-format
+msgid ""
+"When disabled the screensaver starts immediately when locking the desktop."
+msgstr ""
+
+#. i18n: file kdesktop.kcfg line 318
+#: rc.cpp:295
+#, no-c-format
+msgid ""
+"When enabled all active windows are hidden from the screensaver, showing only "
+"the desktop background as a result."
+msgstr ""
+
+#. i18n: file kdesktop.kcfg line 323
+#: rc.cpp:298
+#, no-c-format
+msgid "Hide Cancel button from the \"Desktop Session Locked\" dialog."
+msgstr ""
+
+#. i18n: file kdesktop.kcfg line 328
+#: rc.cpp:301
+#, no-c-format
+msgid ""
+"When enabled, the Trinity Secure Attention Key (TSAK) system will be used to "
+"secure the screen locker.  This requires system wide TSAK support to be enabled "
+"prior to use."
+msgstr ""
+
 #~ msgid "Enable this option if you want to disable the screen saver while watching TV or movies."
 #~ msgstr "Galluogwch y dewisiad yma os ydych am analluogi'r arbedydd sgrîn tra'n gwylio teledu neu ffilmiau."
 
diff --git a/tde-i18n-cy/messages/tdebase/kdialog.po b/tde-i18n-cy/messages/tdebase/kdialog.po
index c0b1a95222a..92cace1f5e8 100644
--- a/tde-i18n-cy/messages/tdebase/kdialog.po
+++ b/tde-i18n-cy/messages/tdebase/kdialog.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kdialog\n"
-"POT-Creation-Date: 2006-04-27 03:54+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-12-28 18:06+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -166,16 +167,16 @@ msgstr ""
 msgid "Arguments - depending on main option"
 msgstr "Ymresymiadau - yn ddibynnol ar y prif ddewisiad"
 
-#: kdialog.cpp:665
+#: kdialog.cpp:679
 msgid "KDialog"
 msgstr "KDialog"
 
-#: kdialog.cpp:666
+#: kdialog.cpp:680
 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:669
+#: kdialog.cpp:683
 msgid "Current maintainer"
 msgstr "Cynhaliwr cyfredol"
 
diff --git a/tde-i18n-cy/messages/tdebase/kfindpart.po b/tde-i18n-cy/messages/tdebase/kfindpart.po
index 1448682f71d..557dc1c1f0a 100644
--- a/tde-i18n-cy/messages/tdebase/kfindpart.po
+++ b/tde-i18n-cy/messages/tdebase/kfindpart.po
@@ -10,10 +10,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kfindpart\n"
-"POT-Creation-Date: 2006-10-10 02:32+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-12-28 14:15+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -376,7 +377,8 @@ msgstr ""
 "</ul></qt>"
 
 #: kftabdlg.cpp:552
-msgid "Unable to search within a period which is less than a minute."
+#, fuzzy
+msgid "Unable to search within a period that is less than a minute."
 msgstr "Methu chwilio o fewn cyfnod sy'n fyrrach na munud."
 
 #: kftabdlg.cpp:563
@@ -492,7 +494,7 @@ msgstr "Agor Gyda..."
 msgid "Selected Files"
 msgstr "Ffeiliau Dewisiedig"
 
-#: kquery.cpp:478
+#: kquery.cpp:483
 msgid "Error while using locate"
 msgstr "Gwall tra'n defnyddio locate"
 
@@ -511,7 +513,8 @@ msgid "KFind"
 msgstr "KFind"
 
 #: main.cpp:27
-msgid "(c) 1998-2003, The TDE Developers"
+#, fuzzy
+msgid "(c) 1998-2003, The KDE Developers"
 msgstr "(h)(c) 1998-2003, Datblygwyr TDE"
 
 #: main.cpp:29
diff --git a/tde-i18n-cy/messages/tdebase/kfmclient.po b/tde-i18n-cy/messages/tdebase/kfmclient.po
index 661136c4858..5093d0dbb62 100644
--- a/tde-i18n-cy/messages/tdebase/kfmclient.po
+++ b/tde-i18n-cy/messages/tdebase/kfmclient.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kfmclient\n"
-"POT-Creation-Date: 2006-08-04 03:58+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-12-28 14:09+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -99,7 +100,8 @@ msgid ""
 msgstr ""
 "  kfmclient openProfile 'proffil' ['url']\n"
 "            # Agora ffenestr gan ddefnyddio'r proffil penodedig.\n"
-"            #   ffeil o dan ~/.trinity/share/apps/konqueror/profilesyw proffil.\n"
+"            #   ffeil o dan ~/.trinity/share/apps/konqueror/profilesyw "
+"proffil.\n"
 "            #   URL dewisol i'w agor yw 'url'.\n"
 "\n"
 
@@ -192,6 +194,17 @@ msgstr ""
 "\n"
 
 #: kfmclient.cc:127
+#, fuzzy
+msgid ""
+"  kfmclient openBrowser\n"
+"            # Opens the system default Web browser.\n"
+"\n"
+msgstr ""
+"  kfmclient openProperties 'url'\n"
+"            # Agora ddewislen briodweddau\n"
+"\n"
+
+#: kfmclient.cc:129
 msgid ""
 "  kfmclient configure\n"
 "            # Re-read Konqueror's configuration.\n"
@@ -201,7 +214,7 @@ msgstr ""
 "            # Ail-ddarllen ffurfwedd Konqueror.\n"
 "\n"
 
-#: kfmclient.cc:129
+#: kfmclient.cc:131
 msgid ""
 "  kfmclient configureDesktop\n"
 "            # Re-read kdesktop's configuration.\n"
@@ -211,7 +224,7 @@ msgstr ""
 "            # Ail-ddarllen ffurfwedd kdesktop.\n"
 "\n"
 
-#: kfmclient.cc:132
+#: kfmclient.cc:134
 msgid ""
 "*** Examples:\n"
 "  kfmclient exec file:/root/Desktop/cdrom.desktop \"Mount default\"\n"
@@ -223,7 +236,7 @@ msgstr ""
 "             // Arosoda'r CDd-ROM\n"
 "\n"
 
-#: kfmclient.cc:135
+#: kfmclient.cc:137
 msgid ""
 "  kfmclient exec file:/home/weis/data/test.html\n"
 "             // Opens the file with default binding\n"
@@ -233,7 +246,7 @@ msgstr ""
 "             // Agora'r ffeil â rhwymiadau rhagosod\n"
 "\n"
 
-#: kfmclient.cc:137
+#: kfmclient.cc:139
 msgid ""
 "  kfmclient exec file:/home/weis/data/test.html Netscape\n"
 "             // Opens the file with netscape\n"
@@ -243,7 +256,7 @@ msgstr ""
 "             // Agora'r ffeil â Netscape\n"
 "\n"
 
-#: kfmclient.cc:139
+#: kfmclient.cc:141
 msgid ""
 "  kfmclient exec ftp://localhost/\n"
 "             // Opens new window with URL\n"
@@ -253,7 +266,7 @@ msgstr ""
 "            // Agora ffenestr newydd â'r URL\n"
 "\n"
 
-#: kfmclient.cc:141
+#: kfmclient.cc:143
 msgid ""
 "  kfmclient exec file:/root/Desktop/emacs.desktop\n"
 "             // Starts emacs\n"
@@ -263,7 +276,7 @@ msgstr ""
 "             // Dechreua emacs\n"
 "\n"
 
-#: kfmclient.cc:143
+#: kfmclient.cc:145
 msgid ""
 "  kfmclient exec file:/root/Desktop/cdrom.desktop\n"
 "             // Opens the CD-ROM's mount directory\n"
@@ -273,7 +286,7 @@ msgstr ""
 "             // Agora gyfeiriadur arosod yr CDd-ROM\n"
 "\n"
 
-#: kfmclient.cc:145
+#: kfmclient.cc:147
 msgid ""
 "  kfmclient exec .\n"
 "             // Opens the current directory. Very convenient.\n"
@@ -283,29 +296,29 @@ msgstr ""
 "             // Agora'r cyfeiriadur cyfredol. Hwylus iawn.\n"
 "\n"
 
-#: kfmclient.cc:405
+#: kfmclient.cc:407
 msgid ""
 "Profile %1 not found\n"
 msgstr ""
 "Proffil %1 heb ei ganfod\n"
 
-#: kfmclient.cc:434
+#: kfmclient.cc:436
 msgid ""
 "Syntax Error: Not enough arguments\n"
 msgstr ""
 "Gwall Cystrawen: Dim digon o ymresymiadau\n"
 
-#: kfmclient.cc:439
+#: kfmclient.cc:441
 msgid ""
 "Syntax Error: Too many arguments\n"
 msgstr ""
 "Gwall Cystrawen: Gormod o ymresymiadau\n"
 
-#: kfmclient.cc:559
+#: kfmclient.cc:569
 msgid "Unable to download from an invalid URL."
 msgstr "Methu lawrlwytho o URL annilys."
 
-#: kfmclient.cc:623
+#: kfmclient.cc:633
 msgid ""
 "Syntax Error: Unknown command '%1'\n"
 msgstr ""
diff --git a/tde-i18n-cy/messages/tdebase/kgreet_classic.po b/tde-i18n-cy/messages/tdebase/kgreet_classic.po
index 7cdaae48676..17d6183d338 100644
--- a/tde-i18n-cy/messages/tdebase/kgreet_classic.po
+++ b/tde-i18n-cy/messages/tdebase/kgreet_classic.po
@@ -3,43 +3,44 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kgreet_classic\n"
-"POT-Creation-Date: 2007-12-16 01:17+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-07-04 11:21+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.2\n"
 
-#: kgreet_classic.cpp:97
+#: kgreet_classic.cpp:98
 msgid "&Username:"
 msgstr "&Enw Defnyddiwr:"
 
-#: kgreet_classic.cpp:102
+#: kgreet_classic.cpp:103
 msgid "Username:"
 msgstr "Enw defnyddiwr:"
 
-#: kgreet_classic.cpp:124
+#: kgreet_classic.cpp:125
 msgid "&Password:"
 msgstr "&Cyfrinair:"
 
-#: kgreet_classic.cpp:125
+#: kgreet_classic.cpp:126
 msgid "Current &password:"
 msgstr "Cy&frinair cyfredol:"
 
-#: kgreet_classic.cpp:143
+#: kgreet_classic.cpp:144
 msgid "&New password:"
 msgstr "Cyfrinair &newydd:"
 
-#: kgreet_classic.cpp:144
+#: kgreet_classic.cpp:145
 msgid "Con&firm password:"
 msgstr "Ca&darnhau cyfrinair:"
 
-#: kgreet_classic.cpp:291
+#: kgreet_classic.cpp:299
 msgid "Unrecognized prompt \"%1\""
 msgstr "Anogiad anadnabyddus \"%1\""
 
-#: kgreet_classic.cpp:500
+#: kgreet_classic.cpp:508
 msgid "Username + password (classic)"
 msgstr "Defnydd-enw + cyfrinair (clasurol)"
diff --git a/tde-i18n-cy/messages/tdebase/kgreet_winbind.po b/tde-i18n-cy/messages/tdebase/kgreet_winbind.po
index 2c93024bfbc..4d99daabb90 100644
--- a/tde-i18n-cy/messages/tdebase/kgreet_winbind.po
+++ b/tde-i18n-cy/messages/tdebase/kgreet_winbind.po
@@ -1,50 +1,51 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: all2.po\n"
-"POT-Creation-Date: 2007-12-16 01:17+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kgreet_winbind.cpp:127
+#: kgreet_winbind.cpp:128
 msgid "&Domain:"
 msgstr "&Parth:"
 
-#: kgreet_winbind.cpp:128
+#: kgreet_winbind.cpp:129
 msgid "&Username:"
 msgstr "&Enw Defnyddiwr:"
 
-#: kgreet_winbind.cpp:142
+#: kgreet_winbind.cpp:143
 msgid "Domain:"
 msgstr "Parth:"
 
-#: kgreet_winbind.cpp:145
+#: kgreet_winbind.cpp:146
 msgid "Username:"
 msgstr "Enw defnyddiwr:"
 
-#: kgreet_winbind.cpp:164
+#: kgreet_winbind.cpp:165
 msgid "&Password:"
 msgstr "&Cyfrinair:"
 
-#: kgreet_winbind.cpp:165
+#: kgreet_winbind.cpp:166
 msgid "Current &password:"
 msgstr "Cy&frinair cyfredol:"
 
-#: kgreet_winbind.cpp:188
+#: kgreet_winbind.cpp:189
 msgid "&New password:"
 msgstr "Cyfrinair &newydd:"
 
-#: kgreet_winbind.cpp:189
+#: kgreet_winbind.cpp:190
 msgid "Con&firm password:"
 msgstr "Ca&darnhau cyfrinair:"
 
-#: kgreet_winbind.cpp:370
+#: kgreet_winbind.cpp:378
 msgid "Unrecognized prompt \"%1\""
 msgstr "Anogiad anadnabyddus \"%1\""
 
-#: kgreet_winbind.cpp:666
+#: kgreet_winbind.cpp:674
 msgid "Winbind / Samba"
 msgstr ""
diff --git a/tde-i18n-cy/messages/tdebase/khelpcenter.po b/tde-i18n-cy/messages/tdebase/khelpcenter.po
index e63d05c2b6a..f2c73b6537e 100644
--- a/tde-i18n-cy/messages/tdebase/khelpcenter.po
+++ b/tde-i18n-cy/messages/tdebase/khelpcenter.po
@@ -10,10 +10,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: khelpcenter\n"
-"POT-Creation-Date: 2007-05-19 02:14+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-12-28 11:07+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -39,23 +40,25 @@ msgstr ""
 msgid "URL to display"
 msgstr "URL i'w ddangos"
 
-#: application.cpp:63 navigator.cpp:466
-msgid "TDE Help Center"
+#: application.cpp:63
+#, fuzzy
+msgid "Trinity Help Center"
 msgstr "Canolfan Gymorth TDE"
 
-#: application.cpp:65 khc_indexbuilder.cpp:176
-msgid "The TDE Help Center"
-msgstr "Canolfan Gymorth TDE"
+#: application.cpp:65 navigator.cpp:473
+#, fuzzy
+msgid "The Trinity Help Center"
+msgstr "Canolfan Reolaeth TDE"
 
 #: application.cpp:67
 msgid "(c) 1999-2003, The KHelpCenter developers"
 msgstr "(h) 1999-2003, Datblygwyr KHelpCenter"
 
-#: application.cpp:71
+#: application.cpp:72
 msgid "Original Author"
 msgstr "Awdur Gwreiddiol"
 
-#: application.cpp:73
+#: application.cpp:74
 msgid "Info page support"
 msgstr "Cynhaliaeth tudalennau gwybodaeth"
 
@@ -159,7 +162,8 @@ msgid "See also: "
 msgstr "Gweler hefyd:"
 
 #: glossary.cpp:292
-msgid "TDE Glossary"
+#, fuzzy
+msgid "KDE Glossary"
 msgstr "Geirfa TDE"
 
 #: htmlsearchconfig.cpp:44
@@ -282,32 +286,32 @@ msgstr "Newid..."
 msgid "<qt>The folder <b>%1</b> does not exist; unable to create index.</qt>"
 msgstr "<qt>Nid yw'r blygell <b>%1</b> yn bodoli. Methu creu mynegai.</qt>"
 
-#: kcmhelpcenter.cpp:352
+#: kcmhelpcenter.cpp:353
 msgid "Missing"
 msgstr "Ar goll"
 
-#: kcmhelpcenter.cpp:397
+#: kcmhelpcenter.cpp:398
 msgid ""
 "Document '%1' (%2):\n"
 msgstr ""
 
-#: kcmhelpcenter.cpp:402
+#: kcmhelpcenter.cpp:403
 msgid "No document type."
 msgstr ""
 
-#: kcmhelpcenter.cpp:408
+#: kcmhelpcenter.cpp:409
 msgid "No search handler available for document type '%1'."
 msgstr ""
 
-#: kcmhelpcenter.cpp:415
+#: kcmhelpcenter.cpp:416
 msgid "No indexing command specified for document type '%1'."
 msgstr ""
 
-#: kcmhelpcenter.cpp:530
+#: kcmhelpcenter.cpp:531
 msgid "Failed to build index."
 msgstr "Methu adeiladu mynegai."
 
-#: kcmhelpcenter.cpp:588
+#: kcmhelpcenter.cpp:589
 #, c-format
 msgid ""
 "Error executing indexing build command:\n"
@@ -331,6 +335,10 @@ msgstr "Cyfeiriadur mynegai"
 msgid "KHelpCenter Index Builder"
 msgstr "Adeiladwr Mynegeion KHelpCenter"
 
+#: khc_indexbuilder.cpp:176
+msgid "The TDE Help Center"
+msgstr "Canolfan Gymorth TDE"
+
 #: khc_indexbuilder.cpp:178
 msgid "(c) 2003, The KHelpCenter developers"
 msgstr "(h)2003, Datblygwyr KHelpCenter"
@@ -407,31 +415,31 @@ msgstr "Gwagu'r chwiliad"
 msgid "&Search"
 msgstr " &Chwilio"
 
-#: navigator.cpp:187
+#: navigator.cpp:188
 msgid "Search Options"
 msgstr "Dewisiadau Chwilio"
 
-#: navigator.cpp:195
+#: navigator.cpp:196
 msgid "G&lossary"
 msgstr "&Geirfa"
 
-#: navigator.cpp:465
+#: navigator.cpp:472
 msgid "Start Page"
 msgstr "Tudalen Gychwyn"
 
-#: navigator.cpp:553
+#: navigator.cpp:560
 msgid "Unable to run search program."
 msgstr "Methu rhedeg rhaglen chwilio."
 
-#: navigator.cpp:594
+#: navigator.cpp:601
 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:598
+#: navigator.cpp:605
 msgid "Create"
 msgstr "Creu"
 
-#: navigator.cpp:599
+#: navigator.cpp:606
 msgid "Do Not Create"
 msgstr ""
 
@@ -550,80 +558,88 @@ msgid "Help Center"
 msgstr "Canolfan Gymorth"
 
 #: view.cpp:120
-msgid "Welcome to the K Desktop Environment"
+#, fuzzy
+msgid "Welcome to the Trinity Desktop Environment"
 msgstr "Croeso i'r Amgylchedd Penbwrdd K"
 
 #: view.cpp:121
-msgid "The TDE team welcomes you to user-friendly UNIX computing"
+#, fuzzy
+msgid "The TDE team welcomes you to user-friendly UNIX-like computing"
 msgstr ""
 "Mae'r tîm TDE yn eich croesawu i gyfrifiaduro UNIX cyfeillgar i ddefnyddwyr."
 
 #: view.cpp:122
+#, fuzzy
 msgid ""
-"TDE is a powerful graphical desktop environment for UNIX workstations. A\n"
-"TDE desktop combines ease of use, contemporary functionality and outstanding\n"
-"graphical design with the technological superiority of the UNIX operating\n"
-"system."
+"The Trinity Desktop Environment (TDE) is a graphical desktop\n"
+"environment for UNIX-like workstations. The\n"
+"Trinity Desktop Environment combines ease of use, contemporary functionality, "
+"and\n"
+"professional graphical design along with the technical advantages of\n"
+"UNIX-like operating systems."
 msgstr ""
 "TDE is a powerful graphical desktop environment for UNIX workstations. A\n"
 "TDE desktop combines ease of use, contemporary functionality and outstanding\n"
 "graphical design with the technological superiority of the UNIX operating\n"
 "system."
 
-#: view.cpp:126
-msgid "What is the K Desktop Environment?"
+#: view.cpp:127
+#, fuzzy
+msgid "What is the Trinity Desktop Environment?"
 msgstr "Beth yw'r Amgylchedd Penbwrdd K?"
 
-#: view.cpp:127
-msgid "Contacting the TDE Project"
+#: view.cpp:128
+#, fuzzy
+msgid "Contacting the TDE Project Members"
 msgstr "Cysylltu â'r Cywaith TDE"
 
-#: view.cpp:128
+#: view.cpp:129
 msgid "Supporting the TDE Project"
 msgstr "Cynnal y Cywaith TDE"
 
-#: view.cpp:129
+#: view.cpp:130
 msgid "Useful links"
 msgstr "Cysylltiadau defnyddiol"
 
-#: view.cpp:130
+#: view.cpp:131
 msgid "Getting the most out of TDE"
 msgstr "Cael y gorau allan o TDE"
 
-#: view.cpp:131
+#: view.cpp:132
 msgid "General Documentation"
 msgstr "Dogfennaeth gyffredinol"
 
-#: view.cpp:132
+#: view.cpp:133
 msgid "A Quick Start Guide to the Desktop"
 msgstr "Canllaw Dechrau Cyflym i'r Penbwrdd"
 
-#: view.cpp:133
+#: view.cpp:134
 #, fuzzy
 msgid "TDE Users' guide"
 msgstr "Llawlyfr Defnyddwyr TDE"
 
-#: view.cpp:134
-msgid "Frequently asked questions"
+#: view.cpp:135
+#, fuzzy
+msgid "Frequently Asked Questions"
 msgstr "Cwestiynau a ofynnir yn aml"
 
-#: view.cpp:135
+#: view.cpp:136
 msgid "Basic Applications"
 msgstr "Cymhwysiadau Sylfaenol"
 
-#: view.cpp:136
+#: view.cpp:137
 msgid "The Kicker Desktop Panel"
 msgstr "Panel Penbwrdd Ciciwr"
 
-#: view.cpp:137
+#: view.cpp:138
 msgid "The Trinity Control Center"
 msgstr "Canolfan Reolaeth TDE"
 
-#: view.cpp:138
+#: view.cpp:139
 msgid "The Konqueror File manager and Web Browser"
 msgstr "Y Trefnydd Ffeiliau a'r Porydd Gwê Konqueror"
 
-#: view.cpp:269
+#: view.cpp:270
 msgid "Copy Link Address"
 msgstr "Copïo Cyfeiriad Cyswllt"
 
diff --git a/tde-i18n-cy/messages/tdebase/khotkeys.po b/tde-i18n-cy/messages/tdebase/khotkeys.po
index bf0917e2991..f22001ff284 100644
--- a/tde-i18n-cy/messages/tdebase/khotkeys.po
+++ b/tde-i18n-cy/messages/tdebase/khotkeys.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: khotkeys\n"
-"POT-Creation-Date: 2008-07-08 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-12-28 11:04+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -465,23 +466,43 @@ msgstr "KHotKeys"
 msgid "KHotKeys daemon"
 msgstr "Ellyll KHotKeys"
 
-#: shared/actions.cpp:181
+#: shared/actions.cpp:159 shared/actions.cpp:173 shared/actions.cpp:178
+msgid "KHotKeys was unable to execute"
+msgstr ""
+
+#: shared/actions.cpp:159
+msgid "Please verify existence of the service"
+msgstr ""
+
+#: shared/actions.cpp:159
+msgid "Unable to launch service!"
+msgstr ""
+
+#: shared/actions.cpp:173 shared/actions.cpp:178
+msgid "Please verify existence and permissions of the executable file"
+msgstr ""
+
+#: shared/actions.cpp:173 shared/actions.cpp:178
+msgid "Unable to launch program"
+msgstr ""
+
+#: shared/actions.cpp:186
 msgid "Command/URL : "
 msgstr "Gorchymyn/URL:"
 
-#: shared/actions.cpp:218
+#: shared/actions.cpp:223
 msgid "Menuentry : "
 msgstr "Cofnod y ddewislen:"
 
-#: shared/actions.cpp:302
+#: shared/actions.cpp:307
 msgid "DCOP : "
 msgstr "DCOP:"
 
-#: shared/actions.cpp:396
+#: shared/actions.cpp:401
 msgid "Keyboard input : "
 msgstr "Mewnbwn allweddell:"
 
-#: shared/actions.cpp:442
+#: shared/actions.cpp:447
 msgid "Activate window : "
 msgstr "Gweithredu'r ffenestr:"
 
diff --git a/tde-i18n-cy/messages/tdebase/kicker.po b/tde-i18n-cy/messages/tdebase/kicker.po
index e237564590a..2848e0b8101 100644
--- a/tde-i18n-cy/messages/tdebase/kicker.po
+++ b/tde-i18n-cy/messages/tdebase/kicker.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kicker\n"
-"POT-Creation-Date: 2008-08-19 01:16+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-12-27 23:14+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -31,11 +32,11 @@ msgstr "Dangos y penbwrdd"
 msgid "Desktop Access"
 msgstr "Cyrchiad Penbwrdd"
 
-#: buttons/kbutton.cpp:43
+#: buttons/kbutton.cpp:45
 msgid "Applications, tasks and desktop sessions"
 msgstr ""
 
-#: buttons/kbutton.cpp:44 ui/k_mnu.cpp:76
+#: buttons/kbutton.cpp:46 buttons/knewbutton.cpp:59 ui/k_mnu.cpp:87
 msgid "TDE Menu"
 msgstr "Dewislen K"
 
@@ -48,7 +49,8 @@ msgstr "Methu gweithredu cymhwysiad di-TDE!"
 msgid "Kicker Error"
 msgstr "Gwall Kicker"
 
-#: buttons/servicemenubutton.cpp:62
+#: buttons/servicemenubutton.cpp:62 ui/k_new_mnu.cpp:1404
+#: ui/k_new_mnu.cpp:1902
 msgid "Applications"
 msgstr "Cymhwysiadau"
 
@@ -80,22 +82,22 @@ msgstr "Ni ellir llwytho'r rhaglennig %1.  Gwiriwch eich gosodiad."
 msgid "Applet Loading Error"
 msgstr "Gwall wrth Lwytho'r Rhaglennig"
 
-#: core/container_extension.cpp:1607 core/container_extension.cpp:1620
+#: core/container_extension.cpp:1688 core/container_extension.cpp:1701
 msgid "Show panel"
 msgstr "Dangos y panel"
 
-#: core/container_extension.cpp:1611 core/container_extension.cpp:1624
+#: core/container_extension.cpp:1692 core/container_extension.cpp:1705
 msgid "Hide panel"
 msgstr "Cuddio'r panel"
 
-#: core/extensionmanager.cpp:117
+#: core/extensionmanager.cpp:120
 #, fuzzy
 msgid ""
 "The TDE panel (kicker) could not load the main panel due to a problem with your "
 "installation. "
 msgstr "Ni ellir llwytho'r rhaglennig %1.  Gwiriwch eich gosodiad."
 
-#: core/extensionmanager.cpp:119
+#: core/extensionmanager.cpp:122
 msgid "Fatal Error!"
 msgstr "Gwall Angheuol !"
 
@@ -122,140 +124,152 @@ msgstr "Panel TDE"
 
 #: core/main.cpp:112
 #, fuzzy
-msgid "(c) 1999-2004, The TDE Team"
+msgid "(c) 1999-2010, The KDE Team"
 msgstr "(h)(c) 1999-2002, Y Tîm TDE"
 
 #: core/main.cpp:114
 msgid "Current maintainer"
 msgstr "Cynhaliwr cyfredol"
 
-#: core/main.cpp:122
+#: core/main.cpp:123
 msgid "Kiosk mode"
 msgstr "Modd Stondin"
 
-#: core/panelextension.cpp:341
+#: core/panelextension.cpp:340
 #, fuzzy
 msgid "Add &Applet to Menubar..."
 msgstr "Dewislen Rhaglennig"
 
-#: core/panelextension.cpp:342
+#: core/panelextension.cpp:341
 msgid "Add &Applet to Panel..."
 msgstr ""
 
-#: core/panelextension.cpp:345
+#: core/panelextension.cpp:344
 #, fuzzy
 msgid "Add Appli&cation to Menubar"
 msgstr "Botwm Cymhwysiad"
 
-#: core/panelextension.cpp:346
+#: core/panelextension.cpp:345
 #, fuzzy
 msgid "Add Appli&cation to Panel"
 msgstr "Botwm Cymhwysiad"
 
-#: core/panelextension.cpp:350
+#: core/panelextension.cpp:349
 #, fuzzy
 msgid "&Remove From Menubar"
 msgstr "&Gwaredu Dewislen %1"
 
-#: core/panelextension.cpp:351
+#: core/panelextension.cpp:350
 #, fuzzy
 msgid "&Remove From Panel"
 msgstr "&Gwaredu Dewislen %1"
 
-#: core/panelextension.cpp:356
+#: core/panelextension.cpp:355
 #, fuzzy
 msgid "Add New &Panel"
 msgstr "&Panel"
 
-#: core/panelextension.cpp:358
+#: core/panelextension.cpp:357
 #, fuzzy
 msgid "Remove Pa&nel"
 msgstr "&Gwaredu Dewislen %1"
 
-#: core/panelextension.cpp:365 core/panelextension.cpp:373
+#: core/panelextension.cpp:364 core/panelextension.cpp:372
 #, fuzzy
 msgid "&Lock Panels"
 msgstr "&Panel"
 
-#: core/panelextension.cpp:372
+#: core/panelextension.cpp:371
 #, fuzzy
 msgid "Un&lock Panels"
 msgstr "&Panel"
 
-#: core/panelextension.cpp:380
+#: core/panelextension.cpp:379
 msgid "&Configure Panel..."
 msgstr "&Ffurfweddu'r Panel..."
 
+#: core/panelextension.cpp:385
+msgid "&Launch Process Manager..."
+msgstr ""
+
 #: ui/addapplet.cpp:234
 #, fuzzy
 msgid "Add Applet"
 msgstr "Rhaglennig"
 
-#: ui/addappletvisualfeedback.cpp:60
+#: ui/addappletvisualfeedback.cpp:61
 msgid "%1 Added"
 msgstr ""
 
-#: ui/appletop_mnu.cpp:51
+#: ui/appletop_mnu.cpp:52
 msgid "&Move %1 Menu"
 msgstr "&Symud Dewislen %1"
 
-#: ui/appletop_mnu.cpp:52
+#: ui/appletop_mnu.cpp:53
 msgid "&Move %1 Button"
 msgstr "&Symud Botwm %1"
 
-#: ui/appletop_mnu.cpp:53
+#: ui/appletop_mnu.cpp:54
 #, c-format
 msgid "&Move %1"
 msgstr "&Symud %1"
 
-#: ui/appletop_mnu.cpp:75
+#: ui/appletop_mnu.cpp:76
 msgid "&Remove %1 Menu"
 msgstr "&Gwaredu Dewislen %1"
 
-#: ui/appletop_mnu.cpp:76
+#: ui/appletop_mnu.cpp:77
 msgid "&Remove %1 Button"
 msgstr "&Gwaredu Botwm %1"
 
-#: ui/appletop_mnu.cpp:77
+#: ui/appletop_mnu.cpp:78
 #, c-format
 msgid "&Remove %1"
 msgstr "&Gwaredu %1"
 
-#: ui/appletop_mnu.cpp:91 ui/extensionop_mnu.cpp:43
+#: ui/appletop_mnu.cpp:92 ui/extensionop_mnu.cpp:43
 msgid "Report &Bug..."
 msgstr "Anfon Adroddiad &Nam..."
 
-#: ui/appletop_mnu.cpp:105
+#: ui/appletop_mnu.cpp:106
 #, c-format
 msgid "&About %1"
 msgstr "&Am %1"
 
-#: ui/appletop_mnu.cpp:125
+#: ui/appletop_mnu.cpp:126
 #, fuzzy
 msgid "&Configure %1 Button..."
 msgstr "&Ffurfweddu %1..."
 
-#: ui/appletop_mnu.cpp:130 ui/extensionop_mnu.cpp:62
+#: ui/appletop_mnu.cpp:131 ui/extensionop_mnu.cpp:62
 msgid "&Configure %1..."
 msgstr "&Ffurfweddu %1..."
 
-#: ui/appletop_mnu.cpp:143
+#: ui/appletop_mnu.cpp:144
 msgid "Applet Menu"
 msgstr "Dewislen Rhaglennig"
 
-#: ui/appletop_mnu.cpp:144
+#: ui/appletop_mnu.cpp:145
 msgid "%1 Menu"
 msgstr "Dewislen %1"
 
-#: ui/appletop_mnu.cpp:170
+#: ui/appletop_mnu.cpp:173
+msgid "Switch to Kickoff Menu Style"
+msgstr ""
+
+#: ui/appletop_mnu.cpp:175
+msgid "Switch to Trinity Classic Menu Style"
+msgstr ""
+
+#: ui/appletop_mnu.cpp:186
 msgid "&Menu Editor"
 msgstr "Golygydd &Dewislenni"
 
-#: ui/appletop_mnu.cpp:185
+#: ui/appletop_mnu.cpp:201
 msgid "&Edit Bookmarks"
 msgstr "&Golygu Tudnodau"
 
-#: ui/appletop_mnu.cpp:194
+#: ui/appletop_mnu.cpp:210
 msgid "Panel Menu"
 msgstr "Dewislen y Panel"
 
@@ -283,23 +297,23 @@ msgstr "Dewis Plygell"
 msgid "'%1' is not a valid folder."
 msgstr "Nid yw '%1' yn blygell ddilys."
 
-#: ui/browser_mnu.cpp:126 ui/browser_mnu.cpp:135
+#: ui/browser_mnu.cpp:127 ui/browser_mnu.cpp:136
 msgid "Failed to Read Folder"
 msgstr "Methwyd Darllen y Blygell"
 
-#: ui/browser_mnu.cpp:143
+#: ui/browser_mnu.cpp:144
 msgid "Not Authorized to Read Folder"
 msgstr "Ni'ch Awdurdodir i Ddarllen y Blygell"
 
-#: ui/browser_mnu.cpp:151
+#: ui/browser_mnu.cpp:154
 msgid "Open in File Manager"
 msgstr "Agor yn y Trefnydd Ffeiliau"
 
-#: ui/browser_mnu.cpp:153
+#: ui/browser_mnu.cpp:156
 msgid "Open in Terminal"
 msgstr "Agor mewn Terfynnell"
 
-#: ui/browser_mnu.cpp:299
+#: ui/browser_mnu.cpp:302
 msgid "More"
 msgstr "Mwy"
 
@@ -333,48 +347,76 @@ msgstr "Dewiswch Weithredadwy-yn"
 msgid "Select Other"
 msgstr "Dewis Plygell"
 
-#: ui/k_mnu.cpp:197
+#: ui/itemview.cpp:475 ui/k_new_mnu.cpp:1029
+#, fuzzy
+msgid "New Applications"
+msgstr "Cymhwysiadau"
+
+#: ui/itemview.cpp:479
+msgid "Restart Computer"
+msgstr ""
+
+#: ui/itemview.cpp:482 ui/k_mnu.cpp:378 ui/k_new_mnu.cpp:1356
+msgid "Switch User"
+msgstr ""
+
+#: ui/itemview.cpp:860
+#, fuzzy, c-format
+msgid "Host: %1"
+msgstr "Pori: %1"
+
+#: ui/itemview.cpp:1170
+#, fuzzy
+msgid "Directory: /)"
+msgstr "Cyfeiriadur &Cartref"
+
+#: ui/itemview.cpp:1172
+#, fuzzy
+msgid "Directory: "
+msgstr "Cyfeiriadur &Cartref"
+
+#: ui/k_mnu.cpp:267
+msgid "Press '/' to search..."
+msgstr ""
+
+#: ui/k_mnu.cpp:286
 msgid "All Applications"
 msgstr "Pob Cymhwysiad"
 
-#: ui/k_mnu.cpp:199
+#: ui/k_mnu.cpp:288
 msgid "Actions"
 msgstr "Gweithredoedd"
 
-#: ui/k_mnu.cpp:231
+#: ui/k_mnu.cpp:320
 msgid "Quick Browser"
 msgstr "Porwr Cyflym"
 
-#: ui/k_mnu.cpp:280
+#: ui/k_mnu.cpp:369 ui/k_new_mnu.cpp:1421
 msgid "Run Command..."
 msgstr "Rhedeg Gorchymyn..."
 
-#: ui/k_mnu.cpp:289
-msgid "Switch User"
-msgstr ""
-
-#: ui/k_mnu.cpp:301
+#: ui/k_mnu.cpp:390 ui/k_new_mnu.cpp:1350
 msgid "Save Session"
 msgstr "Cadw Sesiwn"
 
-#: ui/k_mnu.cpp:306
+#: ui/k_mnu.cpp:395
 msgid "Lock Session"
 msgstr "Cloi Sesiwn"
 
-#: ui/k_mnu.cpp:311
+#: ui/k_mnu.cpp:400
 msgid "Log Out..."
 msgstr "Allgofnodi"
 
-#: ui/k_mnu.cpp:364
+#: ui/k_mnu.cpp:476 ui/k_new_mnu.cpp:939 ui/k_new_mnu.cpp:1535
 #, fuzzy
 msgid "Lock Current && Start New Session"
 msgstr "Dechrau Sesiwn Newydd"
 
-#: ui/k_mnu.cpp:365
+#: ui/k_mnu.cpp:478 ui/k_new_mnu.cpp:936 ui/k_new_mnu.cpp:1536
 msgid "Start New Session"
 msgstr "Dechrau Sesiwn Newydd"
 
-#: ui/k_mnu.cpp:397
+#: ui/k_mnu.cpp:510 ui/k_new_mnu.cpp:1568
 #, fuzzy
 msgid ""
 "<p>You have chosen to open another desktop session."
@@ -391,14 +433,400 @@ msgstr ""
 "F%2 i'r ail sesiwn ac yn y blaen. Gallwch newid rhwng y sesiynau drwy wasgu "
 "RHEOLI, EIL, a'r fysell-F briodol ar yr un pryd.</p>"
 
-#: ui/k_mnu.cpp:408
+#: ui/k_mnu.cpp:521 ui/k_new_mnu.cpp:1579
 msgid "Warning - New Session"
 msgstr "Rhybudd - Sesiwn Newydd"
 
-#: ui/k_mnu.cpp:409
+#: ui/k_mnu.cpp:522 ui/k_new_mnu.cpp:1580
 msgid "&Start New Session"
 msgstr "Dechrau &Sesiwn Newydd"
 
+#: ui/k_new_mnu.cpp:204
+msgid "User&nbsp;<b>%1</b>&nbsp;on&nbsp;<b>%2</b>"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:223
+msgid "Most commonly used applications and documents"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:226
+#, fuzzy
+msgid "List of installed applications"
+msgstr "Cymhwysiadau a Ddefnyddir fel Amlaf"
+
+#: ui/k_new_mnu.cpp:231
+msgid ""
+"Information and configuration of your system, access to personal files, network "
+"resources and connected disk drives"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:240
+#, fuzzy
+msgid "Recently used applications and documents"
+msgstr "Cymhwysiadau a Ddefnyddwyd yn Ddiweddar"
+
+#: ui/k_new_mnu.cpp:244
+msgid "<qt>Logout, switch user, switch off or reset, suspend of the system"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:248
+msgid "<p align=\"center\"> <u>F</u>avorites</p>"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:249
+msgid "<p align=\"center\"><u>H</u>istory</p>"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:251
+msgid "<p align=\"center\"> <u>C</u>omputer</p>"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:252
+msgid "<p align=\"center\"><u>A</u>pplications</p>"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:254
+msgid "<p align=\"center\"><u>L</u>eave</p>"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:314
+msgid "Search Internet"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:326
+#, fuzzy
+msgid "Search Index"
+msgstr "&Chwilio:"
+
+#: ui/k_new_mnu.cpp:415
+msgid "Applications, Contacts and Documents"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:925
+msgid "Start '%1'"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:927
+msgid "Start '%1' (current)"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:929
+msgid "Restart and boot directly into '%1'"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:937
+#, fuzzy
+msgid "Start a parallel session"
+msgstr "Dechrau Sesiwn Newydd"
+
+#: ui/k_new_mnu.cpp:940
+#, fuzzy
+msgid "Lock screen and start a parallel session"
+msgstr "Dechrau Sesiwn Newydd"
+
+#: ui/k_new_mnu.cpp:951
+msgid "Switch to Session of User '%1'"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:952
+#, fuzzy, c-format
+msgid "Session: %1"
+msgstr "Cloi'r Sgrîn"
+
+#: ui/k_new_mnu.cpp:1338
+#, fuzzy
+msgid "Session"
+msgstr "Cloi'r Sgrîn"
+
+#: ui/k_new_mnu.cpp:1340
+msgid "Logout"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:1341
+#, fuzzy
+msgid "End session"
+msgstr "Cloi'r Sgrîn"
+
+#: ui/k_new_mnu.cpp:1343
+msgid "Lock"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:1344
+#, fuzzy
+msgid "Lock screen"
+msgstr "Cloi'r Sgrîn"
+
+#: ui/k_new_mnu.cpp:1351
+msgid "Save current Session for next login"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:1357
+msgid "Manage parallel sessions"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:1374
+msgid "System"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:1375
+msgid "Shutdown Computer"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:1376
+msgid "Turn off computer"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:1378
+msgid "&Restart Computer"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:1379
+msgid "Restart and boot the default system"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:1389
+#, fuzzy
+msgid "Start Operating System"
+msgstr "Dechrau Cymhwysiadau"
+
+#: ui/k_new_mnu.cpp:1390
+msgid "Restart and boot another operating system"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:1425
+#, fuzzy
+msgid "System Folders"
+msgstr "Dewis Plygell"
+
+#: ui/k_new_mnu.cpp:1427
+#, fuzzy
+msgid "Home Folder"
+msgstr "&Plygell Gartref"
+
+#: ui/k_new_mnu.cpp:1436
+msgid "My Documents"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:1445
+msgid "My Images"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:1454
+msgid "My Music"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:1463
+msgid "My Videos"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:1472
+msgid "My Downloads"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:1475
+#, fuzzy
+msgid "Network Folders"
+msgstr "Dewis Plygell"
+
+#: ui/k_new_mnu.cpp:1700
+msgid ""
+"<center><b>%1</b></center>\n"
+"You do not have permission to execute this command."
+msgstr ""
+
+#: ui/k_new_mnu.cpp:1728
+msgid ""
+"<center><b>%1</b></center>\n"
+"Could not run the specified command."
+msgstr ""
+
+#: ui/k_new_mnu.cpp:1738
+msgid ""
+"<center><b>%1</b></center>\n"
+"The specified command does not exist."
+msgstr ""
+
+#: ui/k_new_mnu.cpp:1936
+msgid "Documents"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:2272 ui/k_new_mnu.cpp:2402
+#, c-format
+msgid "Send Email to %1"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:2283
+#, c-format
+msgid "Open Addressbook at %1"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:2324
+msgid "- Add ext:type to specify a file extension."
+msgstr ""
+
+#: ui/k_new_mnu.cpp:2327
+msgid "- When searching for a phrase, add quotes."
+msgstr ""
+
+#: ui/k_new_mnu.cpp:2330
+msgid "- To exclude search terms, use the minus symbol in front."
+msgstr ""
+
+#: ui/k_new_mnu.cpp:2333
+msgid "- To search for optional terms, use OR."
+msgstr ""
+
+#: ui/k_new_mnu.cpp:2336
+msgid "- You can use upper and lower case."
+msgstr ""
+
+#: ui/k_new_mnu.cpp:2339
+msgid "Search Quick Tips"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:2391
+msgid "%1 = %2"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:2423
+#, c-format
+msgid "Open Local File: %1"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:2426
+#, c-format
+msgid "Open Local Dir: %1"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:2429
+#, fuzzy, c-format
+msgid "Open Remote Location: %1"
+msgstr "Mewngofnod Pell"
+
+#: ui/k_new_mnu.cpp:2457
+msgid "Run '%1'"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:2502 ui/k_new_mnu.cpp:2575
+msgid "No matches found"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:2627
+msgid "top %1 of %2"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:2629
+msgid "%1 (top %2 of %3)"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:2760
+msgid "Do you really want to reset the computer and boot Microsoft Windows"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:2760
+#, fuzzy
+msgid "Start Windows Confirmation"
+msgstr "Ffurfwedd y Porwr Cyflym"
+
+#: ui/k_new_mnu.cpp:2760
+#, fuzzy
+msgid "Start Windows"
+msgstr "Rhestr ffenestri"
+
+#: ui/k_new_mnu.cpp:2785
+msgid "Could not start Tomboy."
+msgstr ""
+
+#: ui/k_new_mnu.cpp:2845
+#, fuzzy
+msgid "Remove From Favorites"
+msgstr "&Gwaredu Dewislen %1"
+
+#: ui/k_new_mnu.cpp:2852
+msgid "Add to Favorites"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:2883 ui/service_mnu.cpp:630
+msgid "Add Menu to Desktop"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:2886 ui/service_mnu.cpp:603
+msgid "Add Item to Desktop"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:2893 ui/service_mnu.cpp:636
+msgid "Add Menu to Main Panel"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:2896 ui/service_mnu.cpp:609
+msgid "Add Item to Main Panel"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:2902 ui/service_mnu.cpp:642
+#, fuzzy
+msgid "Edit Menu"
+msgstr "Dewislen K"
+
+#: ui/k_new_mnu.cpp:2904 ui/service_mnu.cpp:615
+msgid "Edit Item"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:2910 ui/service_mnu.cpp:621
+msgid "Put Into Run Dialog"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:2938
+msgid "Advanced"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:2954
+#, fuzzy
+msgid "Clear Recently Used Applications"
+msgstr "Cymhwysiadau a Ddefnyddwyd yn Ddiweddar"
+
+#: ui/k_new_mnu.cpp:2957
+#, fuzzy
+msgid "Clear Recently Used Documents"
+msgstr "Cymhwysiadau a Ddefnyddwyd yn Ddiweddar"
+
+#: ui/k_new_mnu.cpp:3542
+msgid "Media"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:3601
+msgid "(%1 available)"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:3732 ui/k_new_mnu.cpp:3736
+#, fuzzy, c-format
+msgid "Directory: %1"
+msgstr "Cyfeiriadur &Cartref"
+
+#: ui/k_new_mnu.cpp:3828
+msgid "Suspend to Disk"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:3829 ui/k_new_mnu.cpp:3837 ui/k_new_mnu.cpp:3845
+#: ui/k_new_mnu.cpp:3853
+msgid "Pause without logging out"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:3836
+msgid "Suspend to RAM"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:3844
+msgid "Freeze"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:3852
+msgid "Standby"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:3921
+msgid "Suspend failed"
+msgstr ""
+
 #: ui/quickbrowser_mnu.cpp:48
 msgid "&Home Folder"
 msgstr "&Plygell Gartref"
@@ -455,60 +883,31 @@ msgstr "%1 (Chwith)"
 msgid "%1 (Floating)"
 msgstr "%1 (Dde)"
 
-#: ui/service_mnu.cpp:262
+#: ui/service_mnu.cpp:368
 msgid "No Entries"
 msgstr "Dim Cofnodion"
 
-#: ui/service_mnu.cpp:269
+#: ui/service_mnu.cpp:375
 msgid "Add This Menu"
 msgstr "Ychwanegu'r Ddewislen Hon"
 
-#: ui/service_mnu.cpp:274
+#: ui/service_mnu.cpp:380
 #, fuzzy
 msgid "Add Non-TDE Application"
 msgstr "Cymhwysiad Di-TDE"
 
-#: ui/service_mnu.cpp:314
+#: ui/service_mnu.cpp:421
 msgid ""
 "_: Entries in K-menu: %1 app name, %2 description\n"
 "%1 - %2"
 msgstr ""
 
-#: ui/service_mnu.cpp:324
+#: ui/service_mnu.cpp:431
 msgid ""
 "_: Entries in K-menu: %1 description, %2 app name\n"
 "%1 (%2)"
 msgstr ""
 
-#: ui/service_mnu.cpp:488
-msgid "Add Item to Desktop"
-msgstr ""
-
-#: ui/service_mnu.cpp:494
-msgid "Add Item to Main Panel"
-msgstr ""
-
-#: ui/service_mnu.cpp:500
-msgid "Edit Item"
-msgstr ""
-
-#: ui/service_mnu.cpp:506
-msgid "Put Into Run Dialog"
-msgstr ""
-
-#: ui/service_mnu.cpp:515
-msgid "Add Menu to Desktop"
-msgstr ""
-
-#: ui/service_mnu.cpp:521
-msgid "Add Menu to Main Panel"
-msgstr ""
-
-#: ui/service_mnu.cpp:527
-#, fuzzy
-msgid "Edit Menu"
-msgstr "Dewislen K"
-
 #: _translatorinfo.cpp:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
@@ -571,22 +970,28 @@ msgstr ""
 msgid "&Add to Panel"
 msgstr ""
 
-#. i18n: file ui/nonTDEButtonSettings.ui line 30
-#: rc.cpp:33 rc.cpp:58
+#. i18n: file ui/kmenuitembase.ui line 36
+#: rc.cpp:33
+#, no-c-format
+msgid "KMenuItemBase"
+msgstr ""
+
+#. i18n: file ui/nonKDEButtonSettings.ui line 30
+#: rc.cpp:36 rc.cpp:61
 #, no-c-format
 msgid ""
 "Enter the name of the executable file to be run when this button is selected. "
 "If it is not in your $PATH then you will need to provide an absolute path."
 msgstr ""
 
-#. i18n: file ui/nonTDEButtonSettings.ui line 38
-#: rc.cpp:36
+#. i18n: file ui/nonKDEButtonSettings.ui line 38
+#: rc.cpp:39
 #, fuzzy, no-c-format
 msgid "Co&mmand line arguments (optional):"
 msgstr "Ymresymiadau llinell orchymyn dewisol:"
 
-#. i18n: file ui/nonTDEButtonSettings.ui line 46
-#: rc.cpp:39 rc.cpp:50
+#. i18n: file ui/nonKDEButtonSettings.ui line 46
+#: rc.cpp:42 rc.cpp:53
 #, no-c-format
 msgid ""
 "Enter any command line options that should be passed to the command here.\n"
@@ -594,46 +999,46 @@ msgid ""
 "<i>Example</i>: For the command `rm -rf` enter \"-rf\" in this text box."
 msgstr ""
 
-#. i18n: file ui/nonTDEButtonSettings.ui line 54
-#: rc.cpp:44
+#. i18n: file ui/nonKDEButtonSettings.ui line 54
+#: rc.cpp:47
 #, fuzzy, no-c-format
 msgid "Run in a &terminal window"
 msgstr "Rhedeg mewn terfynnell"
 
-#. i18n: file ui/nonTDEButtonSettings.ui line 57
-#: rc.cpp:47
+#. i18n: file ui/nonKDEButtonSettings.ui line 57
+#: rc.cpp:50
 #, no-c-format
 msgid ""
 "Select this option if the command is a command line application and you wish to "
 "be able to see its output when run."
 msgstr ""
 
-#. i18n: file ui/nonTDEButtonSettings.ui line 75
-#: rc.cpp:55
+#. i18n: file ui/nonKDEButtonSettings.ui line 75
+#: rc.cpp:58
 #, no-c-format
 msgid "&Executable:"
 msgstr "&Gweithredadwyn:"
 
-#. i18n: file ui/nonTDEButtonSettings.ui line 97
-#: rc.cpp:61 rc.cpp:67 rc.cpp:73 rc.cpp:76
+#. i18n: file ui/nonKDEButtonSettings.ui line 97
+#: rc.cpp:64 rc.cpp:70 rc.cpp:76 rc.cpp:79
 #, no-c-format
 msgid "Enter the name you would like to appear for this button here."
 msgstr ""
 
-#. i18n: file ui/nonTDEButtonSettings.ui line 105
-#: rc.cpp:64
+#. i18n: file ui/nonKDEButtonSettings.ui line 105
+#: rc.cpp:67
 #, fuzzy, no-c-format
 msgid "&Button title:"
 msgstr "Eicon botwm:"
 
-#. i18n: file ui/nonTDEButtonSettings.ui line 167
-#: rc.cpp:70
+#. i18n: file ui/nonKDEButtonSettings.ui line 167
+#: rc.cpp:73
 #, no-c-format
 msgid "&Description:"
 msgstr "&Disgrifiad:"
 
 #. i18n: file core/extensionSettings.kcfg line 14
-#: rc.cpp:79
+#: rc.cpp:82
 #, no-c-format
 msgid ""
 "Whether this panel actually exists or not. Primarily to work around the fact "
@@ -642,103 +1047,109 @@ msgid ""
 msgstr ""
 
 #. i18n: file core/extensionSettings.kcfg line 18
-#: rc.cpp:82
+#: rc.cpp:85
 #, no-c-format
 msgid "The position of the panel"
 msgstr ""
 
 #. i18n: file core/extensionSettings.kcfg line 25
-#: rc.cpp:85
+#: rc.cpp:88
 #, no-c-format
 msgid "The alignment of the panel"
 msgstr ""
 
 #. i18n: file core/extensionSettings.kcfg line 32
-#: rc.cpp:88
+#: rc.cpp:91
 #, no-c-format
 msgid "Primary xinerama screen"
 msgstr ""
 
 #. i18n: file core/extensionSettings.kcfg line 37
-#: rc.cpp:91
+#: rc.cpp:94
 #, no-c-format
 msgid "Hide button size"
 msgstr ""
 
 #. i18n: file core/extensionSettings.kcfg line 44
-#: rc.cpp:94
+#: rc.cpp:97
 #, no-c-format
 msgid "Show left panel hide button"
 msgstr ""
 
 #. i18n: file core/extensionSettings.kcfg line 49
-#: rc.cpp:97
+#: rc.cpp:100
 #, no-c-format
 msgid "Show right panel hide button"
 msgstr ""
 
 #. i18n: file core/extensionSettings.kcfg line 54
-#: rc.cpp:100
+#: rc.cpp:103
 #, fuzzy, no-c-format
 msgid "Auto hide panel"
 msgstr "Cuddio'r panel"
 
 #. i18n: file core/extensionSettings.kcfg line 59
-#: rc.cpp:103
+#: rc.cpp:106
 #, no-c-format
 msgid "Enable auto hide"
 msgstr ""
 
 #. i18n: file core/extensionSettings.kcfg line 64
-#: rc.cpp:106
+#: rc.cpp:109
 #, no-c-format
-msgid "Delay before auto hide"
+msgid "Auto hide when Xinerama screen is not available"
 msgstr ""
 
 #. i18n: file core/extensionSettings.kcfg line 69
-#: rc.cpp:109
+#: rc.cpp:112
+#, no-c-format
+msgid "Delay before auto hide"
+msgstr ""
+
+#. i18n: file core/extensionSettings.kcfg line 74
+#: rc.cpp:115
 #, no-c-format
 msgid "The trigger location for unhides"
 msgstr ""
 
-#. i18n: file core/extensionSettings.kcfg line 76
-#: rc.cpp:112
+#. i18n: file core/extensionSettings.kcfg line 81
+#: rc.cpp:118
 #, no-c-format
 msgid "Enable background hiding"
 msgstr ""
 
-#. i18n: file core/extensionSettings.kcfg line 81
-#: rc.cpp:115
+#. i18n: file core/extensionSettings.kcfg line 86
+#: rc.cpp:121
 #, no-c-format
 msgid "Animate panel hiding"
 msgstr "Bywlunio cuddio'r panel"
 
-#. i18n: file core/extensionSettings.kcfg line 86
-#: rc.cpp:118
+#. i18n: file core/extensionSettings.kcfg line 91
+#: rc.cpp:124
 #, no-c-format
 msgid "Panel hiding animation speed"
 msgstr ""
 
-#. i18n: file core/extensionSettings.kcfg line 91
-#: rc.cpp:121
+#. i18n: file core/extensionSettings.kcfg line 96
+#: rc.cpp:127
 #, no-c-format
 msgid "Length in percentage"
 msgstr ""
 
-#. i18n: file core/extensionSettings.kcfg line 98
-#: rc.cpp:124
+#. i18n: file core/extensionSettings.kcfg line 103
+#: rc.cpp:130
 #, no-c-format
 msgid "Expand as required to fit contents"
 msgstr "Chwyddo faint sydd angen i ffitio'r cynnwys"
 
-#. i18n: file core/extensionSettings.kcfg line 103
-#: rc.cpp:127
+#. i18n: file core/extensionSettings.kcfg line 108
+#: rc.cpp:133
 #, no-c-format
 msgid "Size"
 msgstr "Maint"
 
-#. i18n: file core/extensionSettings.kcfg line 108
-#: rc.cpp:130
+#. i18n: file core/extensionSettings.kcfg line 113
+#: rc.cpp:136
 #, fuzzy, no-c-format
 msgid "Custom size"
 msgstr "Maint Panel Addasiedig"
@@ -766,9 +1177,6 @@ msgstr "Maint Panel Addasiedig"
 #~ msgid "Click to browse and start applications"
 #~ msgstr "Cliciwch yma i bori a chychwyn cymwysiadau"
 
-#~ msgid "Remote Login"
-#~ msgstr "Mewngofnod Pell"
-
 #~ msgid "Scroll left"
 #~ msgstr "Sgolio i'r chwith"
 
@@ -787,9 +1195,6 @@ msgstr "Maint Panel Addasiedig"
 #~ msgid "Menu: %1"
 #~ msgstr "Dewislen: %1"
 
-#~ msgid "Windowlist"
-#~ msgstr "Rhestr ffenestri"
-
 #~ msgid ""
 #~ "<qt>Set the size (in pixels) that you would like the panel to be below.<br> \n"
 #~ "<p><b>Tip:</b> You can click and drag the edge of the panel to freely resize it later.</qt>"
@@ -806,10 +1211,6 @@ msgstr "Maint Panel Addasiedig"
 #~ msgid "Form1"
 #~ msgstr "Ffurf1"
 
-#, fuzzy
-#~ msgid "Sessions"
-#~ msgstr "Cloi'r Sgrîn"
-
 #~ msgid "Select &File..."
 #~ msgstr "Dewis &Ffeil..."
 
@@ -817,10 +1218,6 @@ msgstr "Maint Panel Addasiedig"
 #~ msgid "Start New Session..."
 #~ msgstr "Dechrau Sesiwn Newydd"
 
-#, fuzzy
-#~ msgid "&Lock current session"
-#~ msgstr "Cloi'r Sgrîn"
-
 #~ msgid "Tiny"
 #~ msgstr "Pitw"
 
@@ -842,15 +1239,9 @@ msgstr "Maint Panel Addasiedig"
 #~ msgid "Show Desktop"
 #~ msgstr "Dangos y Penbwrdd"
 
-#~ msgid "Start Applications"
-#~ msgstr "Dechrau Cymhwysiadau"
-
 #~ msgid "Extension"
 #~ msgstr "Estyniad"
 
-#~ msgid "&Home Directory"
-#~ msgstr "Cyfeiriadur &Cartref"
-
 #~ msgid "&Root Directory"
 #~ msgstr "Cyfeiriadur &Gwraidd"
 
diff --git a/tde-i18n-cy/messages/tdebase/kjobviewer.po b/tde-i18n-cy/messages/tdebase/kjobviewer.po
index 8f56ac8bf2b..2514931aae0 100644
--- a/tde-i18n-cy/messages/tdebase/kjobviewer.po
+++ b/tde-i18n-cy/messages/tdebase/kjobviewer.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kjobviewer\n"
-"POT-Creation-Date: 2006-03-12 03:46+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-12-27 14:57+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdebase/klipper.po b/tde-i18n-cy/messages/tdebase/klipper.po
index 578c0902c36..59aecf2f671 100644
--- a/tde-i18n-cy/messages/tdebase/klipper.po
+++ b/tde-i18n-cy/messages/tdebase/klipper.po
@@ -10,10 +10,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: klipper\n"
-"POT-Creation-Date: 2006-06-17 03:59+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-12-27 14:52+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,18 +130,17 @@ msgid "Sy&nchronize contents of the clipboard and the selection"
 msgstr "Cyd&weddu cynnwys y gludfwrdd â'r dewisiad "
 
 #: configdialog.cpp:141
-msgid ""
-"Selecting this option synchronizes these two buffers, so they work the same way "
-"as in TDE 1.x and 2.x."
+#, fuzzy
+msgid "Selecting this option synchronizes these two buffers."
 msgstr ""
 "Bydd dewis y dewisiad yma'n cydweddu'r dau fyffer yma, fel eu bod yn gweithio'r "
 "un fath ag yng TDE 1.x a 2.x"
 
-#: configdialog.cpp:145
+#: configdialog.cpp:144
 msgid "Separate clipboard and selection"
 msgstr "Clipfwrdd a dewisiad arwahanol"
 
-#: configdialog.cpp:148
+#: configdialog.cpp:147
 msgid ""
 "Using this option will only set the selection when highlighting something and "
 "the clipboard when choosing e.g. \"Copy\" in a menubar."
@@ -148,23 +148,23 @@ msgstr ""
 "Bydd defnyddio'r dewisiad yma'n gosod y dewisiad pan yn amlygu rhwybeth, a'r "
 "gludfwrdd pan yn dewis e.e. \"Copïo\" mewn bar dewislen."
 
-#: configdialog.cpp:155
+#: configdialog.cpp:154
 msgid "Tim&eout for action popups:"
 msgstr "&Goramser naidlenni gweithredoedd:"
 
-#: configdialog.cpp:157
+#: configdialog.cpp:156
 msgid " sec"
 msgstr "eil"
 
-#: configdialog.cpp:158
+#: configdialog.cpp:157
 msgid "A value of 0 disables the timeout"
 msgstr "Bydd 0 yn werth yn analluogi'r goramser"
 
-#: configdialog.cpp:161
+#: configdialog.cpp:160
 msgid "C&lipboard history size:"
 msgstr "Maint hanes y c&lipfwrdd"
 
-#: configdialog.cpp:183
+#: configdialog.cpp:182
 msgid ""
 "_n:  entry\n"
 " entries"
@@ -172,32 +172,33 @@ msgstr ""
 "cofnod\n"
 "cofnod"
 
-#: configdialog.cpp:229
+#: configdialog.cpp:228
 msgid "Action &list (right click to add/remove commands):"
 msgstr "&Rhestr weithredoedd (clic-dde i ychwanegu/waredu gorchmynion):"
 
-#: configdialog.cpp:233
-msgid "Regular Expression (see http://doc.trolltech.com/qregexp.html#details)"
+#: configdialog.cpp:232
+#, fuzzy
+msgid "Regular Expression (see http://doc.trolltech.com/tqregexp.html#details)"
 msgstr ""
 "Mynegiad Rheolaidd (gweler http://doc.trolltech.com/qregexp.html#details)"
 
-#: configdialog.cpp:234
+#: configdialog.cpp:233
 msgid "Description"
 msgstr "Disgrifiad"
 
-#: configdialog.cpp:286
+#: configdialog.cpp:285
 msgid "&Use graphical editor for editing regular expressions"
 msgstr "&Defnyddio golygydd graffegol i olygu mynegiadau rheolaidd"
 
-#: configdialog.cpp:295
+#: configdialog.cpp:294
 msgid "&Add Action"
 msgstr "&Ychwanegu Gweithred"
 
-#: configdialog.cpp:298
+#: configdialog.cpp:297
 msgid "&Delete Action"
 msgstr "&Dileu Gweithred"
 
-#: configdialog.cpp:301
+#: configdialog.cpp:300
 #, c-format
 msgid ""
 "Click on a highlighted item's column to change it. \"%s\" in a command will be "
@@ -206,43 +207,43 @@ msgstr ""
 "Cliciwch ar golofn eitem amlygedig i'w newid. Amnewidir \"%s\" mewn gorchymun â "
 "chynnwys y gludfwrdd."
 
-#: configdialog.cpp:307
+#: configdialog.cpp:306
 msgid "Advanced..."
 msgstr "Uwch..."
 
-#: configdialog.cpp:332
+#: configdialog.cpp:331
 msgid "Add Command"
 msgstr "Ychwanegu Gorchymyn"
 
-#: configdialog.cpp:333
+#: configdialog.cpp:332
 msgid "Remove Command"
 msgstr "Gwaredu Gorchymyn"
 
-#: configdialog.cpp:343
+#: configdialog.cpp:342
 msgid "Click here to set the command to be executed"
 msgstr "Cliciwch yma i gosod y gorchymyn i'w weithredu"
 
-#: configdialog.cpp:344
+#: configdialog.cpp:343
 msgid "<new command>"
 msgstr "<gorchymyn newydd>"
 
-#: configdialog.cpp:366
+#: configdialog.cpp:365
 msgid "Click here to set the regexp"
 msgstr "Cliciwch yma i osod y myn. rheol."
 
-#: configdialog.cpp:367
+#: configdialog.cpp:366
 msgid "<new action>"
 msgstr "<gweithred newydd>"
 
-#: configdialog.cpp:407
+#: configdialog.cpp:406
 msgid "Advanced Settings"
 msgstr "Gosodiadau Uwch"
 
-#: configdialog.cpp:424
+#: configdialog.cpp:423
 msgid "D&isable Actions for Windows of Type WM_CLASS"
 msgstr "A&nalluogi Gweithredoedd ar gyfer Ffenestri o Fath ***"
 
-#: configdialog.cpp:427
+#: configdialog.cpp:426
 #, fuzzy
 msgid ""
 "<qt>This lets you specify windows in which Klipper should not invoke "
@@ -302,11 +303,11 @@ msgstr "G&wagio Hanes y Clipfwrdd"
 msgid "&Configure Klipper..."
 msgstr "&Ffurfweddu Klipper..."
 
-#: toplevel.cpp:225
+#: toplevel.cpp:232
 msgid "Klipper - clipboard tool"
 msgstr "Klipper - erfyn gludfwrdd"
 
-#: toplevel.cpp:525
+#: toplevel.cpp:543
 msgid ""
 "You can enable URL actions later by right-clicking on the Klipper icon and "
 "selecting 'Enable Actions'"
@@ -314,7 +315,7 @@ msgstr ""
 "Gallwch alluogi gweithredoedd URL nes ymlaen drwy glic-dde ar eicon Klipper a "
 "dewis 'Galluogi Gweithredoedd'"
 
-#: toplevel.cpp:592
+#: toplevel.cpp:610
 msgid ""
 "Should Klipper start automatically\n"
 "when you login?"
@@ -322,52 +323,52 @@ msgstr ""
 "A ddylai Klipper gychwyn yn ymysgogol\n"
 " pan rydych yn mewngofnodi?"
 
-#: toplevel.cpp:592
+#: toplevel.cpp:610
 msgid "Automatically Start Klipper?"
 msgstr "Dechrau Klipper yn Ymysgogol?"
 
-#: toplevel.cpp:592
+#: toplevel.cpp:610
 msgid "Start"
 msgstr "Dechrau"
 
-#: toplevel.cpp:592
+#: toplevel.cpp:610
 msgid "Do Not Start"
 msgstr ""
 
-#: toplevel.cpp:647
+#: toplevel.cpp:665
 msgid "Enable &Actions"
 msgstr "Galluogi &Gweithredoedd"
 
-#: toplevel.cpp:651
+#: toplevel.cpp:669
 msgid "&Actions Enabled"
 msgstr "&Gweithredoedd Galluog"
 
-#: toplevel.cpp:1089
+#: toplevel.cpp:1104
 #, fuzzy
 msgid "TDE cut & paste history utility"
 msgstr "Cyfleuster hanes Torri a Gludo TDE"
 
-#: toplevel.cpp:1093
+#: toplevel.cpp:1108
 msgid "Klipper"
 msgstr "Klipper"
 
-#: toplevel.cpp:1100
+#: toplevel.cpp:1115
 msgid "Author"
 msgstr "Awdur"
 
-#: toplevel.cpp:1104
+#: toplevel.cpp:1119
 msgid "Original Author"
 msgstr "Awdur Gwreiddiol"
 
-#: toplevel.cpp:1108
+#: toplevel.cpp:1123
 msgid "Contributor"
 msgstr "Cyfrannwr"
 
-#: toplevel.cpp:1112
+#: toplevel.cpp:1127
 msgid "Bugfixes and optimizations"
 msgstr "Nam-drwsiadau a gwelliannau"
 
-#: toplevel.cpp:1116
+#: toplevel.cpp:1131
 msgid "Maintainer"
 msgstr "Cynhaliwr"
 
@@ -375,14 +376,14 @@ msgstr "Cynhaliwr"
 msgid " - Actions For: "
 msgstr "- Gweithredoedd ar Gyfer:"
 
-#: urlgrabber.cpp:195
+#: urlgrabber.cpp:196
 msgid "Disable This Popup"
 msgstr "Analluogi'r Naidlen Hon"
 
-#: urlgrabber.cpp:199
+#: urlgrabber.cpp:200
 msgid "&Edit Contents..."
 msgstr "&Golygu'r Cynnwys..."
 
-#: urlgrabber.cpp:262
+#: urlgrabber.cpp:271
 msgid "Edit Contents"
 msgstr "Golygu'r Cynnwys"
diff --git a/tde-i18n-cy/messages/tdebase/kmenuapplet.po b/tde-i18n-cy/messages/tdebase/kmenuapplet.po
index b781e5d5f31..a457941e517 100644
--- a/tde-i18n-cy/messages/tdebase/kmenuapplet.po
+++ b/tde-i18n-cy/messages/tdebase/kmenuapplet.po
@@ -6,16 +6,17 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmenuapplet\n"
-"POT-Creation-Date: 2008-08-11 01:16+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-11-23 11:56+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.2\n"
 
-#: menuapplet.cpp:352
+#: menuapplet.cpp:350
 msgid ""
 "You do not appear to have enabled the standalone menubar; enable it in the "
 "Behavior control module for desktop."
diff --git a/tde-i18n-cy/messages/tdebase/kmenuedit.po b/tde-i18n-cy/messages/tdebase/kmenuedit.po
index c1dd516da04..a92d0f2d08c 100644
--- a/tde-i18n-cy/messages/tdebase/kmenuedit.po
+++ b/tde-i18n-cy/messages/tdebase/kmenuedit.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmenuedit\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-12-27 14:46+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -103,7 +104,7 @@ msgstr "&Enw Defnyddiwr:"
 msgid "Current shortcut &key:"
 msgstr "&Bysell byrlwybr cyfredol:"
 
-#: basictab.cpp:485
+#: basictab.cpp:490
 msgid ""
 "<qt>The key <b>%1</b> can not be used here because it is already used to "
 "activate <b>%2</b>."
@@ -111,7 +112,7 @@ msgstr ""
 "<qt>Ni ellir defnyddio'r allwedd <b>%1</b> yma, oherwydd mae'n cael ei "
 "defnyydio yn barod i weithredu <b>%2</b>."
 
-#: basictab.cpp:490
+#: basictab.cpp:495
 msgid ""
 "<qt>The key <b>%1</b> can not be used here because it is already in use."
 msgstr ""
@@ -152,7 +153,11 @@ msgstr "&Eitem Newydd..."
 msgid "New S&eparator"
 msgstr ""
 
-#: kmenuedit.cpp:153
+#: kmenuedit.cpp:70
+msgid "Save && Quit"
+msgstr ""
+
+#: kmenuedit.cpp:161
 #, fuzzy
 msgid ""
 "You have made changes to the Control Center.\n"
@@ -161,12 +166,12 @@ msgstr ""
 "Rydych wedi gwneud newidiadau i'r ddewislen.\n"
 "Ydych am gadw'r newidiadau neu eu gwaredu?"
 
-#: kmenuedit.cpp:155
+#: kmenuedit.cpp:163
 #, fuzzy
 msgid "Save Control Center Changes?"
 msgstr "Cadw'r Newidiadau i'r Ddewislen?"
 
-#: kmenuedit.cpp:161
+#: kmenuedit.cpp:169
 msgid ""
 "You have made changes to the menu.\n"
 "Do you want to save the changes or discard them?"
@@ -174,7 +179,7 @@ msgstr ""
 "Rydych wedi gwneud newidiadau i'r ddewislen.\n"
 "Ydych am gadw'r newidiadau neu eu gwaredu?"
 
-#: kmenuedit.cpp:163
+#: kmenuedit.cpp:171
 msgid "Save Menu Changes?"
 msgstr "Cadw'r Newidiadau i'r Ddewislen?"
 
diff --git a/tde-i18n-cy/messages/tdebase/kminipagerapplet.po b/tde-i18n-cy/messages/tdebase/kminipagerapplet.po
index f01e794d3a4..95bee289f62 100644
--- a/tde-i18n-cy/messages/tdebase/kminipagerapplet.po
+++ b/tde-i18n-cy/messages/tdebase/kminipagerapplet.po
@@ -6,115 +6,120 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kminipagerapplet\n"
-"POT-Creation-Date: 2008-08-18 01:16+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-12-27 14:41+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.2\n"
 
-#: pagerapplet.cpp:680
+#: pagerapplet.cpp:713
 msgid "&Launch Pager"
 msgstr "&Cychwyn Swnyn"
 
-#: pagerapplet.cpp:683
+#: pagerapplet.cpp:716
 #, fuzzy
 msgid "&Rename Desktop \"%1\""
 msgstr "&Ail-enwi Rhith-benbwrdd"
 
-#: pagerapplet.cpp:689
+#: pagerapplet.cpp:722
 msgid "Pager Layout"
 msgstr ""
 
-#: pagerapplet.cpp:693
+#: pagerapplet.cpp:726
 msgid "&Automatic"
 msgstr "&Ymysgogol"
 
-#: pagerapplet.cpp:694
+#: pagerapplet.cpp:727
 msgid ""
 "_: one row or column\n"
 "&1"
 msgstr "&1"
 
-#: pagerapplet.cpp:695
+#: pagerapplet.cpp:728
 msgid ""
 "_: two rows or columns\n"
 "&2"
 msgstr "&2"
 
-#: pagerapplet.cpp:696
+#: pagerapplet.cpp:729
 msgid ""
 "_: three rows or columns\n"
 "&3"
 msgstr "&3"
 
-#: pagerapplet.cpp:698
+#: pagerapplet.cpp:731
 msgid "&Rows"
 msgstr "&Rhesi"
 
-#: pagerapplet.cpp:699
+#: pagerapplet.cpp:732
 msgid "&Columns"
 msgstr "&Colofnau"
 
-#: pagerapplet.cpp:702
+#: pagerapplet.cpp:735
 msgid "&Window Thumbnails"
 msgstr ""
 
-#: pagerapplet.cpp:703
+#: pagerapplet.cpp:736
 msgid "&Window Icons"
 msgstr ""
 
-#: pagerapplet.cpp:705
+#: pagerapplet.cpp:737
+msgid "&Cycle on Wheel"
+msgstr ""
+
+#: pagerapplet.cpp:739
 msgid "Text Label"
 msgstr ""
 
-#: pagerapplet.cpp:706
+#: pagerapplet.cpp:740
 #, fuzzy
 msgid "Desktop N&umber"
 msgstr "&Rhif"
 
-#: pagerapplet.cpp:708
+#: pagerapplet.cpp:742
 msgid "Desktop N&ame"
 msgstr ""
 
-#: pagerapplet.cpp:710
+#: pagerapplet.cpp:744
 msgid "N&o Label"
 msgstr ""
 
-#: pagerapplet.cpp:713
+#: pagerapplet.cpp:747
 msgid "Background"
 msgstr "Cefndir"
 
-#: pagerapplet.cpp:714
+#: pagerapplet.cpp:748
 msgid "&Elegant"
 msgstr ""
 
-#: pagerapplet.cpp:716
+#: pagerapplet.cpp:750
 msgid "&Transparent"
 msgstr "&Tryloyw"
 
-#: pagerapplet.cpp:718
+#: pagerapplet.cpp:753
 msgid "&Desktop Wallpaper"
 msgstr "&Papur Wal y Penbwrdd"
 
-#: pagerapplet.cpp:721
+#: pagerapplet.cpp:757
 msgid "&Pager Options"
 msgstr ""
 
-#: pagerapplet.cpp:724
+#: pagerapplet.cpp:760
 msgid "&Configure Desktops..."
 msgstr "&Ffurfweddu Rhith-benbyrddau..."
 
-#: pagerbutton.cpp:807
+#: pagerbutton.cpp:819
 #, c-format
 msgid ""
 "_n: and 1 other\n"
 "and %n others"
 msgstr ""
 
-#: pagerbutton.cpp:815
+#: pagerbutton.cpp:827
 #, c-format
 msgid ""
 "_n: One window:\n"
@@ -187,6 +192,12 @@ msgstr ""
 msgid "Show window icons in previews?"
 msgstr ""
 
+#. i18n: file pagersettings.kcfg line 59
+#: rc.cpp:36
+#, no-c-format
+msgid "Cycle through desktops with wheel?"
+msgstr ""
+
 #~ msgid "&Show"
 #~ msgstr "&Dangos"
 
diff --git a/tde-i18n-cy/messages/tdebase/knetattach.po b/tde-i18n-cy/messages/tdebase/knetattach.po
index 1aa9d8e7efc..6b98cc8d8f2 100644
--- a/tde-i18n-cy/messages/tdebase/knetattach.po
+++ b/tde-i18n-cy/messages/tdebase/knetattach.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdebase/knetattach.po\n"
-"POT-Creation-Date: 2008-07-08 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdebase/konqueror.po b/tde-i18n-cy/messages/tdebase/konqueror.po
index 16b042166c6..275685feed6 100644
--- a/tde-i18n-cy/messages/tdebase/konqueror.po
+++ b/tde-i18n-cy/messages/tdebase/konqueror.po
@@ -10,10 +10,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: konqueror\n"
-"POT-Creation-Date: 2008-07-08 01:19+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-12-27 14:40+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -71,7 +72,7 @@ msgid ""
 msgstr ""
 
 #. i18n: file konqueror.kcfg line 20
-#: about/konq_aboutpage.cc:124 rc.cpp:75
+#: about/konq_aboutpage.cc:151 rc.cpp:75
 #, no-c-format
 msgid "Home Folder"
 msgstr "Plygell Cartref"
@@ -161,19 +162,19 @@ 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 konqueror.kcfg line 598
+#. i18n: file konqueror.kcfg line 604
 #: rc.cpp:111
 #, no-c-format
 msgid "Ask confirmation for deleting a file."
 msgstr ""
 
-#. i18n: file konqueror.kcfg line 604
+#. i18n: file konqueror.kcfg line 610
 #: rc.cpp:114
 #, no-c-format
 msgid "Ask confirmation for move to trash"
 msgstr ""
 
-#. i18n: file konqueror.kcfg line 605
+#. i18n: file konqueror.kcfg line 611
 #: rc.cpp:117
 #, no-c-format
 msgid ""
@@ -181,7 +182,7 @@ msgid ""
 "file to your trash folder, from where it can be recovered very easily."
 msgstr ""
 
-#. i18n: file konqueror.kcfg line 615
+#. i18n: file konqueror.kcfg line 621
 #: rc.cpp:120
 #, no-c-format
 msgid ""
@@ -207,13 +208,13 @@ msgstr "Maint &Eicon"
 msgid "S&ort"
 msgstr "T&refnu"
 
-#. i18n: file iconview/konq_iconview.rc line 43
+#. i18n: file iconview/konq_iconview.rc line 44
 #: rc.cpp:204
 #, no-c-format
 msgid "Iconview Toolbar"
 msgstr "Bar Offer Golwg Eicon"
 
-#. i18n: file iconview/konq_iconview.rc line 48
+#. i18n: file iconview/konq_iconview.rc line 49
 #: rc.cpp:207
 #, no-c-format
 msgid "Iconview Extra Toolbar"
@@ -328,7 +329,7 @@ msgid "URLs older than"
 msgstr "URLau hyn na"
 
 #. i18n: file sidebar/trees/history_module/history_dlg.ui line 151
-#: about/konq_aboutpage.cc:277 rc.cpp:375
+#: about/konq_aboutpage.cc:304 rc.cpp:375
 #, no-c-format
 msgid "Details"
 msgstr "Manylion"
@@ -382,8 +383,8 @@ msgstr ""
 "Dyma'r ddiagnosteg:\n"
 " %2"
 
-#: about/konq_aboutpage.cc:113 about/konq_aboutpage.cc:178
-#: about/konq_aboutpage.cc:233 about/konq_aboutpage.cc:330 konq_factory.cc:218
+#: about/konq_aboutpage.cc:140 about/konq_aboutpage.cc:205
+#: about/konq_aboutpage.cc:260 about/konq_aboutpage.cc:357 konq_factory.cc:218
 msgid "Konqueror"
 msgstr "Konqueror "
 
@@ -393,7 +394,7 @@ msgstr "Porydd gwe, rheolwr ffeil, ..."
 
 #: konq_factory.cc:222
 #, fuzzy
-msgid "(c) 1999-2005, The Konqueror developers"
+msgid "(c) 1999-2010, The Konqueror developers"
 msgstr "(c) 1999-2003, y datblygwyr Konqueror "
 
 #: konq_factory.cc:224
@@ -401,69 +402,73 @@ msgid "http://konqueror.kde.org"
 msgstr "http://konqueror.kde.org"
 
 #: konq_factory.cc:225
+msgid "Maintainer, Trinity bugfixes"
+msgstr ""
+
+#: konq_factory.cc:226
 #, fuzzy
 msgid "developer (framework, parts, JavaScript, I/O lib) and maintainer"
 msgstr "datblygwr (rhannau, rhaglengell M/A) a chynhaliwr"
 
-#: konq_factory.cc:226
+#: konq_factory.cc:227
 msgid "developer (framework, parts)"
 msgstr "datblygwr (fframwaith, rhannau)"
 
-#: konq_factory.cc:227 konq_factory.cc:254
+#: konq_factory.cc:228 konq_factory.cc:255
 msgid "developer (framework)"
 msgstr "datblygwr (fframwaith)"
 
-#: konq_factory.cc:228
+#: konq_factory.cc:229
 msgid "developer"
 msgstr "datblygwr"
 
-#: konq_factory.cc:229
+#: konq_factory.cc:230
 msgid "developer (List views)"
 msgstr "datblygwr (Golygon rhestr)"
 
-#: konq_factory.cc:230
+#: konq_factory.cc:231
 msgid "developer (List views, I/O lib)"
 msgstr "datblygwr (Golygon rhestr, rhaglengell M/A)"
 
-#: konq_factory.cc:231 konq_factory.cc:232 konq_factory.cc:233
-#: konq_factory.cc:235 konq_factory.cc:236 konq_factory.cc:238
-#: konq_factory.cc:239 konq_factory.cc:240 konq_factory.cc:241
-#: konq_factory.cc:242
+#: konq_factory.cc:232 konq_factory.cc:233 konq_factory.cc:234
+#: konq_factory.cc:236 konq_factory.cc:237 konq_factory.cc:239
+#: konq_factory.cc:240 konq_factory.cc:241 konq_factory.cc:242
+#: konq_factory.cc:243
 msgid "developer (HTML rendering engine)"
 msgstr "datblygwr (peiriant llunio HTML)"
 
-#: konq_factory.cc:234
+#: konq_factory.cc:235
 msgid "developer (HTML rendering engine, I/O lib)"
 msgstr "datblygwr (peiriant llunio HTML, rhaglengell M/A)"
 
-#: konq_factory.cc:237
+#: konq_factory.cc:238
 #, fuzzy
 msgid "developer (HTML rendering engine, I/O lib, regression test framework)"
 msgstr "datblygwr (peiriant llunio HTML, rhaglengell M/A)"
 
-#: konq_factory.cc:243
+#: konq_factory.cc:244
 #, fuzzy
 msgid "developer (HTML rendering engine, JavaScript)"
 msgstr "datblygwr (peiriant llunio HTML)"
 
-#: konq_factory.cc:244
+#: konq_factory.cc:245
 msgid "developer (JavaScript)"
 msgstr "datblygwr (JavaScript)"
 
-#: konq_factory.cc:245
+#: konq_factory.cc:246
 #, fuzzy
 msgid "developer (Java applets and other embedded objects)"
 msgstr "datblygwr (cynhaliaeth rhaglennigion Java)"
 
-#: konq_factory.cc:246 konq_factory.cc:247
+#: konq_factory.cc:247 konq_factory.cc:248
 msgid "developer (I/O lib)"
 msgstr "datblygwr (rhaglengell M/A)"
 
-#: konq_factory.cc:248 konq_factory.cc:249
+#: konq_factory.cc:249 konq_factory.cc:250
 msgid "developer (Java applet support)"
 msgstr "datblygwr (cynhaliaeth rhaglennigion Java)"
 
-#: konq_factory.cc:250
+#: konq_factory.cc:251
 msgid ""
 "developer (Java 2 security manager support,\n"
 " and other major improvements to applet support)"
@@ -471,41 +476,41 @@ msgstr ""
 "datblygwr (cynhaliaeth trefnydd diogelwch Java 2,\n"
 " a gwelliannau mawr i gynhaliaeth rhaglennigion)"
 
-#: konq_factory.cc:251
+#: konq_factory.cc:252
 msgid "developer (Netscape plugin support)"
 msgstr "datblygwr (cynhaliaeth ategion Netscape)"
 
-#: konq_factory.cc:252
+#: konq_factory.cc:253
 msgid "developer (SSL, Netscape plugins)"
 msgstr "datblygwr (SSL, cynhaliaeth ategion Netscape)"
 
-#: konq_factory.cc:253
+#: konq_factory.cc:254
 msgid "developer (I/O lib, Authentication support)"
 msgstr "datblygwr (rhaglengell M/A, cynhaliaeth dilysiant)"
 
-#: konq_factory.cc:255
+#: konq_factory.cc:256
 msgid "graphics/icons"
 msgstr "graffeg/eiconau"
 
-#: konq_factory.cc:256
+#: konq_factory.cc:257
 msgid "kfm author"
 msgstr "awdur kfm"
 
-#: konq_factory.cc:257
+#: konq_factory.cc:258
 msgid "developer (navigation panel framework)"
 msgstr "datblygwr (fframwaith panel llywio)"
 
-#: konq_factory.cc:258
+#: konq_factory.cc:259
 #, fuzzy
 msgid "developer (misc stuff)"
 msgstr "datblygwr (Golygon rhestr)"
 
-#: konq_factory.cc:259
+#: konq_factory.cc:260
 #, fuzzy
 msgid "developer (AdBlock filter)"
 msgstr "datblygwr (fframwaith)"
 
-#: konq_frame.cc:85
+#: konq_frame.cc:86
 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 "
@@ -519,16 +524,16 @@ msgstr ""
 "hyn yn arbennig o ddefnyddiol gyda golygon o sawl math gwahanol, megis coeden "
 "cyfeiriaduron â golwg eiconig neu manwl, a ffenestr efelychu terfynell o bosib."
 
-#: konq_frame.cc:148
+#: konq_frame.cc:154
 #, fuzzy
 msgid "Close View"
 msgstr "Datgloi Golwg"
 
-#: konq_frame.cc:229
+#: konq_frame.cc:235
 msgid "%1/s"
 msgstr "%1/s"
 
-#: konq_frame.cc:231
+#: konq_frame.cc:237
 msgid "Stalled"
 msgstr "Wedi Seibio"
 
@@ -541,12 +546,12 @@ msgstr "Rhagolygon mewn %1"
 msgid "Preview In"
 msgstr "Rhagolygon mewn"
 
-#: konq_guiclients.cc:190
+#: konq_guiclients.cc:195
 #, c-format
 msgid "Show %1"
 msgstr "Dangos %1"
 
-#: konq_guiclients.cc:194
+#: konq_guiclients.cc:199
 #, c-format
 msgid "Hide %1"
 msgstr "Cuddio %1"
@@ -588,7 +593,7 @@ msgstr ""
 msgid "Location to open"
 msgstr "Lleoliad i agor."
 
-#: konq_mainwindow.cc:495
+#: konq_mainwindow.cc:562
 #, c-format
 msgid ""
 "Malformed URL\n"
@@ -597,7 +602,7 @@ msgstr ""
 "URL annilys\n"
 " %1"
 
-#: konq_mainwindow.cc:500
+#: konq_mainwindow.cc:567
 #, c-format
 msgid ""
 "Protocol not supported\n"
@@ -606,7 +611,7 @@ msgstr ""
 "Ni chynhelir protocol\n"
 " %1"
 
-#: konq_mainwindow.cc:583 konq_run.cc:119
+#: konq_mainwindow.cc:650 konq_run.cc:119
 msgid ""
 "There appears to be a configuration error. You have associated Konqueror with "
 "%1, but it cannot handle this file type."
@@ -614,352 +619,397 @@ msgstr ""
 "Ymddengys bod gwall ffurfweddu.  Rydych wedi cysylltu Konqueror efo %1, ond ni "
 "all drin y math yma o ffeil."
 
-#: konq_mainwindow.cc:1414
+#: konq_mainwindow.cc:1480
 msgid "Open Location"
 msgstr "Agor Lleoliad"
 
-#: konq_mainwindow.cc:1445
+#: konq_mainwindow.cc:1511
 #, fuzzy
 msgid "Cannot create the find part, check your installation."
 msgstr "Methu creu'r rhan ganfod, gwiriwch eich gosodiad."
 
-#: konq_mainwindow.cc:1721
+#: konq_mainwindow.cc:1787
 msgid "Canceled."
 msgstr "Wedi'i ddiddymu"
 
-#: konq_mainwindow.cc:1759
+#: konq_mainwindow.cc:1825
 msgid ""
 "This page contains changes that have not been submitted.\n"
 "Reloading the page will discard these changes."
 msgstr ""
 
-#: konq_mainwindow.cc:1760 konq_mainwindow.cc:2582 konq_mainwindow.cc:2600
-#: konq_mainwindow.cc:2704 konq_mainwindow.cc:2720 konq_mainwindow.cc:2737
-#: konq_mainwindow.cc:2774 konq_mainwindow.cc:2807 konq_mainwindow.cc:5233
-#: konq_mainwindow.cc:5251 konq_viewmgr.cc:1165 konq_viewmgr.cc:1183
+#: konq_mainwindow.cc:1826 konq_mainwindow.cc:2673 konq_mainwindow.cc:2691
+#: konq_mainwindow.cc:2803 konq_mainwindow.cc:2819 konq_mainwindow.cc:2836
+#: konq_mainwindow.cc:2873 konq_mainwindow.cc:2906 konq_mainwindow.cc:5328
+#: konq_mainwindow.cc:5346 konq_viewmgr.cc:1171 konq_viewmgr.cc:1189
 msgid "Discard Changes?"
 msgstr "Taflu Newidiadau?"
 
-#: konq_mainwindow.cc:1760 konq_mainwindow.cc:2582 konq_mainwindow.cc:2600
-#: konq_mainwindow.cc:2704 konq_mainwindow.cc:2720 konq_mainwindow.cc:2737
-#: konq_mainwindow.cc:2774 konq_mainwindow.cc:2807 konq_mainwindow.cc:5233
-#: konq_mainwindow.cc:5251 konq_viewmgr.cc:1165 konq_viewmgr.cc:1183
+#: konq_mainwindow.cc:1826 konq_mainwindow.cc:2673 konq_mainwindow.cc:2691
+#: konq_mainwindow.cc:2803 konq_mainwindow.cc:2819 konq_mainwindow.cc:2836
+#: konq_mainwindow.cc:2873 konq_mainwindow.cc:2906 konq_mainwindow.cc:5328
+#: konq_mainwindow.cc:5346 konq_viewmgr.cc:1171 konq_viewmgr.cc:1189
 msgid "&Discard Changes"
 msgstr "&Taflu Newidiadau"
 
-#: konq_mainwindow.cc:1865
+#: konq_mainwindow.cc:1855 konq_mainwindow.cc:4048
+msgid ""
+"Stop loading the document"
+"<p>All network transfers will be stopped and Konqueror will display the content "
+"that has been received so far."
+msgstr ""
+"Atal llwytho'r ddogfen"
+"<p>Terfynir pob drosglwyddiad rhwydwaith, a dengys Konqueror y cynnwys a "
+"dderbyniwyd hyd hynny."
+
+#: konq_mainwindow.cc:1858 konq_mainwindow.cc:4051
+msgid "Stop loading the document"
+msgstr "Atal llwytho'r ddogfen"
+
+#: konq_mainwindow.cc:1862 konq_mainwindow.cc:4038
+msgid ""
+"Reload the currently displayed document"
+"<p>This may, for example, be needed to refresh webpages that have been modified "
+"since they were loaded, in order to make the changes visible."
+msgstr ""
+"Ail-lwytho'r ddogfen arddangosedig cyfredol"
+"<p>Gall bod angen hwn i adfywio tudalennau gwê, er enghraifft rhai sydd wedi eu "
+"addasu ers eu llwytho, er mwyn dangos y newidiadau."
+
+#: konq_mainwindow.cc:1865 konq_mainwindow.cc:4041
+msgid "Reload the currently displayed document"
+msgstr "Ail-lwytho'r ddogfen arddangosedig cyfredol"
+
+#: konq_mainwindow.cc:1959
 #, fuzzy
 msgid "Your sidebar is not functional or unavailable."
 msgstr ""
 "Nid yw'ch bar ochr yn gweithio, neu nid yw ar gael. Nid oes modd ychwanegu "
 "cofnod newydd."
 
-#: konq_mainwindow.cc:1865 konq_mainwindow.cc:1884
+#: konq_mainwindow.cc:1959 konq_mainwindow.cc:1978
 msgid "Show History Sidebar"
 msgstr ""
 
-#: konq_mainwindow.cc:1884
+#: konq_mainwindow.cc:1978
 msgid "Cannot find running history plugin in your sidebar."
 msgstr ""
 
-#: konq_mainwindow.cc:2581 konq_mainwindow.cc:2599
+#: konq_mainwindow.cc:2672 konq_mainwindow.cc:2690
 msgid ""
 "This tab contains changes that have not been submitted.\n"
 "Detaching the tab will discard these changes."
 msgstr ""
 
-#: konq_mainwindow.cc:2703
+#: konq_mainwindow.cc:2802
 msgid ""
 "This view contains changes that have not been submitted.\n"
 "Closing the view will discard these changes."
 msgstr ""
 
-#: konq_mainwindow.cc:2719 konq_mainwindow.cc:2736
+#: konq_mainwindow.cc:2818 konq_mainwindow.cc:2835
 msgid ""
 "This tab contains changes that have not been submitted.\n"
 "Closing the tab will discard these changes."
 msgstr ""
 
-#: konq_mainwindow.cc:2758
+#: konq_mainwindow.cc:2857
 #, fuzzy
 msgid "Do you really want to close all other tabs?"
 msgstr "Ydych wir am glirio'r hanes gyfan?"
 
-#: konq_mainwindow.cc:2759
+#: konq_mainwindow.cc:2858
 #, fuzzy
 msgid "Close Other Tabs Confirmation"
 msgstr "Cau Tabiau &Eraill"
 
-#: konq_mainwindow.cc:2759 konq_mainwindow.cc:3803 konq_tabs.cc:421
+#: konq_mainwindow.cc:2858 konq_mainwindow.cc:3904 konq_tabs.cc:496
 msgid "Close &Other Tabs"
 msgstr "Cau Tabiau &Eraill"
 
-#: konq_mainwindow.cc:2773
+#: konq_mainwindow.cc:2872
 msgid ""
 "This tab contains changes that have not been submitted.\n"
 "Closing other tabs will discard these changes."
 msgstr ""
 
-#: konq_mainwindow.cc:2806
+#: konq_mainwindow.cc:2905
 msgid ""
 "This tab contains changes that have not been submitted.\n"
 "Reloading all tabs will discard these changes."
 msgstr ""
 
-#: konq_mainwindow.cc:2878
+#: konq_mainwindow.cc:2977
 #, c-format
 msgid "No permissions to write to %1"
 msgstr "Dim caniatadau i ysgrifennu i %1"
 
-#: konq_mainwindow.cc:2888
+#: konq_mainwindow.cc:2987
 msgid "Enter Target"
 msgstr "Mewnosodwch Targed"
 
-#: konq_mainwindow.cc:2897
+#: konq_mainwindow.cc:2996
 #, fuzzy
 msgid "<qt><b>%1</b> is not valid</qt>"
 msgstr "<qt>Nid yw <b>%1</b> yn ddilys<qt>"
 
-#: konq_mainwindow.cc:2913
+#: konq_mainwindow.cc:3012
 #, fuzzy
 msgid "Copy selected files from %1 to:"
 msgstr "Copio ffeiliau dewisiedig o"
 
-#: konq_mainwindow.cc:2923
+#: konq_mainwindow.cc:3022
 #, fuzzy
 msgid "Move selected files from %1 to:"
 msgstr "Symud ffeiliau dewisiedig o"
 
-#: konq_mainwindow.cc:3705
+#: konq_mainwindow.cc:3806
 msgid "&Edit File Type..."
 msgstr "&Golygu Math Ffeil..."
 
-#: konq_mainwindow.cc:3707 sidebar/trees/history_module/history_module.cpp:78
+#: konq_mainwindow.cc:3808 sidebar/trees/history_module/history_module.cpp:78
 msgid "New &Window"
 msgstr "&Ffenestr Newydd"
 
-#: konq_mainwindow.cc:3708
+#: konq_mainwindow.cc:3809
 msgid "&Duplicate Window"
 msgstr "&Dyblygu Ffenestr"
 
-#: konq_mainwindow.cc:3709
+#: konq_mainwindow.cc:3810
 #, fuzzy
 msgid "Send &Link Address..."
 msgstr "Anfon &Cyswllt"
 
-#: konq_mainwindow.cc:3710
+#: konq_mainwindow.cc:3811
 msgid "S&end File..."
 msgstr "A&nfon Ffeil"
 
-#: konq_mainwindow.cc:3713
+#: konq_mainwindow.cc:3814
 msgid "Open &Terminal"
 msgstr "Agor &Terfynell"
 
-#: konq_mainwindow.cc:3715
+#: konq_mainwindow.cc:3816
 msgid "&Open Location..."
 msgstr "&Agor Lleoliad..."
 
-#: konq_mainwindow.cc:3717
+#: konq_mainwindow.cc:3818
 msgid "&Find File..."
 msgstr "&Canfod Ffeil..."
 
-#: konq_mainwindow.cc:3722
+#: konq_mainwindow.cc:3823
 msgid "&Use index.html"
 msgstr "&Defnyddio index.html"
 
-#: konq_mainwindow.cc:3723
+#: konq_mainwindow.cc:3824
 msgid "Lock to Current Location"
 msgstr "Cloi i'r Lleoliad Cyfredol"
 
-#: konq_mainwindow.cc:3724
+#: konq_mainwindow.cc:3825
 msgid "Lin&k View"
 msgstr "Cysyll&tu Golwg"
 
-#: konq_mainwindow.cc:3727
+#: konq_mainwindow.cc:3828
 msgid "&Up"
 msgstr "I &Fyny"
 
-#: konq_mainwindow.cc:3746 konq_mainwindow.cc:3765
+#: konq_mainwindow.cc:3847 konq_mainwindow.cc:3866
 msgid "History"
 msgstr "Hanes"
 
-#: konq_mainwindow.cc:3750
+#: konq_mainwindow.cc:3851
 msgid "Home"
 msgstr "Cartref"
 
-#: konq_mainwindow.cc:3754
+#: konq_mainwindow.cc:3855
 msgid "S&ystem"
 msgstr "C&ysawd:"
 
-#: konq_mainwindow.cc:3755
+#: konq_mainwindow.cc:3856
 msgid "App&lications"
 msgstr "Cym&hwysiadau"
 
-#: konq_mainwindow.cc:3756
+#: konq_mainwindow.cc:3857
 msgid "&Storage Media"
 msgstr ""
 
-#: konq_mainwindow.cc:3757
+#: konq_mainwindow.cc:3858
 #, fuzzy
 msgid "&Network Folders"
 msgstr "Plygell Newydd:"
 
-#: konq_mainwindow.cc:3758
+#: konq_mainwindow.cc:3859
 msgid "Sett&ings"
 msgstr "Goso&diadau"
 
-#: about/konq_aboutpage.cc:136 konq_mainwindow.cc:3760
+#: about/konq_aboutpage.cc:163 konq_mainwindow.cc:3861
 msgid "Trash"
 msgstr "Sbwriel"
 
-#: konq_mainwindow.cc:3761
+#: konq_mainwindow.cc:3862
 msgid "Autostart"
 msgstr "Hunan-gychwyn"
 
-#: konq_mainwindow.cc:3762
+#: konq_mainwindow.cc:3863
 msgid "Most Often Visited"
 msgstr "Wedi'i Ymweld yr Amlaf"
 
-#: konq_mainwindow.cc:3769 konq_mainwindow.cc:4335
+#: konq_mainwindow.cc:3870 konq_mainwindow.cc:4422
 msgid "&Save View Profile..."
 msgstr "&Cadw Proffil Golwg..."
 
-#: konq_mainwindow.cc:3770
+#: konq_mainwindow.cc:3871
 msgid "Save View Changes per &Folder"
 msgstr ""
 
-#: konq_mainwindow.cc:3772
+#: konq_mainwindow.cc:3873
 msgid "Remove Folder Properties"
 msgstr "Gwaredu Priodweddau Plygell"
 
-#: konq_mainwindow.cc:3792
+#: konq_mainwindow.cc:3893
 #, fuzzy
 msgid "Configure Extensions..."
 msgstr "Ffurfweddu Gwirio Sillafu..."
 
-#: konq_mainwindow.cc:3793
+#: konq_mainwindow.cc:3894
 msgid "Configure Spell Checking..."
 msgstr "Ffurfweddu Gwirio Sillafu..."
 
-#: konq_mainwindow.cc:3796
+#: konq_mainwindow.cc:3897
 msgid "Split View &Left/Right"
 msgstr "Hollti Golwg &Chwith/Dde"
 
-#: konq_mainwindow.cc:3797
+#: konq_mainwindow.cc:3898
 msgid "Split View &Top/Bottom"
 msgstr "Hollti Golwg &Pen/Gwaelod"
 
-#: konq_mainwindow.cc:3798 konq_tabs.cc:84
+#: konq_mainwindow.cc:3899 konq_tabs.cc:93
 msgid "&New Tab"
 msgstr "Tab &Newydd"
 
-#: konq_mainwindow.cc:3799
+#: konq_mainwindow.cc:3900
 msgid "&Duplicate Current Tab"
 msgstr "&Dyblygu'r Tab Cyfredol"
 
-#: konq_mainwindow.cc:3800
+#: konq_mainwindow.cc:3901
 msgid "Detach Current Tab"
 msgstr "Datglymu'r Tab Cyfredol"
 
-#: konq_mainwindow.cc:3801
+#: konq_mainwindow.cc:3902
 #, fuzzy
 msgid "&Close Active View"
 msgstr "&Gwaredu'r Olwg Weithredol"
 
-#: konq_mainwindow.cc:3802
+#: konq_mainwindow.cc:3903
 msgid "Close Current Tab"
 msgstr "Cau'r Tab Cyfredol"
 
-#: konq_mainwindow.cc:3805
+#: konq_mainwindow.cc:3906
 msgid "Activate Next Tab"
 msgstr "Gweithredu'r Tab Nesaf"
 
-#: konq_mainwindow.cc:3806
+#: konq_mainwindow.cc:3907
 msgid "Activate Previous Tab"
 msgstr "Gweithredu'r Tab Cynt"
 
-#: konq_mainwindow.cc:3811
+#: konq_mainwindow.cc:3912
 #, fuzzy, c-format
 msgid "Activate Tab %1"
 msgstr "Gweithredu'r Tab Nesaf"
 
-#: konq_mainwindow.cc:3814
+#: konq_mainwindow.cc:3915
 msgid "Move Tab Left"
 msgstr "Symud Tab i'r Chwith"
 
-#: konq_mainwindow.cc:3815
+#: konq_mainwindow.cc:3916
 msgid "Move Tab Right"
 msgstr "Symud Tab i'r Dde"
 
-#: konq_mainwindow.cc:3818
+#: konq_mainwindow.cc:3919
 msgid "Dump Debug Info"
 msgstr "Tomenu Gwybodaeth Dadnamu"
 
-#: konq_mainwindow.cc:3821
+#: konq_mainwindow.cc:3922
 msgid "C&onfigure View Profiles..."
 msgstr "Ff&urfweddu Proffilau Golwg..."
 
-#: konq_mainwindow.cc:3822
+#: konq_mainwindow.cc:3923
 msgid "Load &View Profile"
 msgstr "Llwytho Proffil &Golwg"
 
-#: konq_mainwindow.cc:3835 konq_tabs.cc:399
+#: konq_mainwindow.cc:3936 konq_tabs.cc:474
 msgid "&Reload All Tabs"
 msgstr "&Ail-lwytho bob tab"
 
-#: konq_mainwindow.cc:3850
+#: konq_mainwindow.cc:3938
+#, fuzzy
+msgid "&Reload/Stop"
+msgstr "&Ail-lwytho bob tab"
+
+#: konq_mainwindow.cc:3953
 msgid "&Stop"
 msgstr "&Atal"
 
-#: konq_mainwindow.cc:3852
+#: konq_mainwindow.cc:3955
 msgid "&Rename"
 msgstr "&Ail-enwi"
 
-#: konq_mainwindow.cc:3853
+#: konq_mainwindow.cc:3956
 msgid "&Move to Trash"
 msgstr "&Symud i'r Sbwriel"
 
-#: konq_mainwindow.cc:3859
+#: konq_mainwindow.cc:3962
+msgid "Copy &Files..."
+msgstr "Copïo &Ffeiliau..."
+
+#: konq_mainwindow.cc:3963
+msgid "M&ove Files..."
+msgstr "S&ymud Ffeiliau..."
+
+#: konq_mainwindow.cc:3965
+msgid "Create Folder..."
+msgstr "Creu Plygell..."
+
+#: konq_mainwindow.cc:3966
 msgid "Animated Logo"
 msgstr "Logo Bywluniedig"
 
-#: konq_mainwindow.cc:3862 konq_mainwindow.cc:3863
+#: konq_mainwindow.cc:3969 konq_mainwindow.cc:3970
 msgid "L&ocation: "
 msgstr "Ll&eoliad:"
 
-#: konq_mainwindow.cc:3866
+#: konq_mainwindow.cc:3973
 msgid "Location Bar"
 msgstr "Bar Lleoliad"
 
-#: konq_mainwindow.cc:3871
+#: konq_mainwindow.cc:3978
 msgid "Location Bar<p>Enter a web address or search term."
 msgstr "Bar Lleoliad<p>Rhowch cyfeiriad gwê neu derm chwilio."
 
-#: konq_mainwindow.cc:3874
+#: konq_mainwindow.cc:3981
 msgid "Clear Location Bar"
 msgstr "Clirio'r Bar Lleoliad"
 
-#: konq_mainwindow.cc:3879
+#: konq_mainwindow.cc:3986
 msgid "Clear Location bar<p>Clears the content of the location bar."
 msgstr "Clirio'r Bar Lleoliad<p>Cliria gynnwys y bar lleoliad."
 
-#: konq_mainwindow.cc:3902
+#: konq_mainwindow.cc:4009
 msgid "Bookmark This Location"
 msgstr "Tudnodi'r Lleoliad Yma"
 
-#: konq_mainwindow.cc:3906
+#: konq_mainwindow.cc:4013
 msgid "Kon&queror Introduction"
 msgstr "Cyflwyniad Kon&queror"
 
-#: konq_mainwindow.cc:3908
+#: konq_mainwindow.cc:4015
 msgid "Go"
 msgstr "Ewch"
 
-#: konq_mainwindow.cc:3909
+#: konq_mainwindow.cc:4016
 msgid "Go<p>Goes to the page that has been entered into the location bar."
 msgstr "Ewch<p>Â i'r dudalen a roddir yn y bar lleoliad."
 
-#: konq_mainwindow.cc:3915
+#: konq_mainwindow.cc:4022
 msgid ""
 "Enter the parent folder"
 "<p>For instance, if the current location is file:/home/%1 clicking this button "
@@ -969,27 +1019,27 @@ msgstr ""
 "<p>Er enghraifft, os file:/home/%1 yw'r lleoliad cyfredol, â'r botwm yma â chi "
 "i file:/home"
 
-#: konq_mainwindow.cc:3918
+#: konq_mainwindow.cc:4025
 msgid "Enter the parent folder"
 msgstr "Mynd i mewn i'r blygell riant"
 
-#: konq_mainwindow.cc:3920
+#: konq_mainwindow.cc:4027
 msgid "Move backwards one step in the browsing history<p>"
 msgstr "Symud yn ôl un cam drwy'r hanes pori<p>"
 
-#: konq_mainwindow.cc:3921
+#: konq_mainwindow.cc:4028
 msgid "Move backwards one step in the browsing history"
 msgstr "Symud yn ôl un cam drwy'r hanes pori"
 
-#: konq_mainwindow.cc:3923
+#: konq_mainwindow.cc:4030
 msgid "Move forward one step in the browsing history<p>"
 msgstr "Symud ymlaen un cam drwy'r hanes pori<p>"
 
-#: konq_mainwindow.cc:3924
+#: konq_mainwindow.cc:4031
 msgid "Move forward one step in the browsing history"
 msgstr "Symud ymlaen un cam drwy'r hanes pori"
 
-#: konq_mainwindow.cc:3926
+#: konq_mainwindow.cc:4033
 #, fuzzy
 msgid ""
 "Navigate to your 'Home Location'"
@@ -1000,26 +1050,12 @@ msgstr ""
 "<p>Gallwch ffurfweddu'r lleoliad i ble'r â'r botwm yma a chi yn y <b>"
 "Ganolfan Reolaeth TDE</b>, o dan <b>Trefnydd Ffeiliau</b>/<b>Ymddygiad</b>."
 
-#: konq_mainwindow.cc:3929
+#: konq_mainwindow.cc:4036
 #, fuzzy
 msgid "Navigate to your 'Home Location'"
 msgstr "Llywio i'ch 'URL gartref' neu hafan"
 
-#: konq_mainwindow.cc:3931
-msgid ""
-"Reload the currently displayed document"
-"<p>This may, for example, be needed to refresh webpages that have been modified "
-"since they were loaded, in order to make the changes visible."
-msgstr ""
-"Ail-lwytho'r ddogfen arddangosedig cyfredol"
-"<p>Gall bod angen hwn i adfywio tudalennau gwê, er enghraifft rhai sydd wedi eu "
-"addasu ers eu llwytho, er mwyn dangos y newidiadau."
-
-#: konq_mainwindow.cc:3934
-msgid "Reload the currently displayed document"
-msgstr "Ail-lwytho'r ddogfen arddangosedig cyfredol"
-
-#: konq_mainwindow.cc:3936
+#: konq_mainwindow.cc:4043
 #, fuzzy
 msgid ""
 "Reload all currently displayed documents in tabs"
@@ -1030,26 +1066,12 @@ msgstr ""
 "<p>Gall bod angen hwn i adfywio tudalennau gwê, er enghraifft rhai sydd wedi eu "
 "addasu ers eu llwytho, er mwyn dangos y newidiadau."
 
-#: konq_mainwindow.cc:3939
+#: konq_mainwindow.cc:4046
 #, fuzzy
 msgid "Reload all currently displayed document in tabs"
 msgstr "Ail-lwytho'r ddogfen arddangosedig cyfredol"
 
-#: konq_mainwindow.cc:3941
-msgid ""
-"Stop loading the document"
-"<p>All network transfers will be stopped and Konqueror will display the content "
-"that has been received so far."
-msgstr ""
-"Atal llwytho'r ddogfen"
-"<p>Terfynir pob drosglwyddiad rhwydwaith, a dengys Konqueror y cynnwys a "
-"dderbyniwyd hyd hynny."
-
-#: konq_mainwindow.cc:3944
-msgid "Stop loading the document"
-msgstr "Atal llwytho'r ddogfen"
-
-#: konq_mainwindow.cc:3946
+#: konq_mainwindow.cc:4053
 msgid ""
 "Cut the currently selected text or item(s) and move it to the system clipboard"
 "<p> This makes it available to the <b>Paste</b> command in Konqueror and other "
@@ -1059,11 +1081,11 @@ msgstr ""
 "<p> Mae hyn yn ei wneud ar gael i'r gorchymyn <b>Gludo</b> "
 "yn Konqueror a chymhwysiadau eraill TDE."
 
-#: konq_mainwindow.cc:3950
+#: konq_mainwindow.cc:4057
 msgid "Move the selected text or item(s) to the clipboard"
 msgstr "Symud y testun neu eitem(au) dewisiedig i'r gludfwrdd"
 
-#: konq_mainwindow.cc:3952
+#: konq_mainwindow.cc:4059
 msgid ""
 "Copy the currently selected text or item(s) to the system clipboard"
 "<p>This makes it available to the <b>Paste</b> command in Konqueror and other "
@@ -1073,11 +1095,11 @@ msgstr ""
 "<p> Mae hyn yn ei wneud ar gael i'r gorchymyn <b>Gludo</b> "
 "yn Konqueror a chymhwysiadau eraill TDE."
 
-#: konq_mainwindow.cc:3956
+#: konq_mainwindow.cc:4063
 msgid "Copy the selected text or item(s) to the clipboard"
 msgstr "Copïo'r testun neu eitem(au) dewisiedig cyfredol i'r clipfwrdd"
 
-#: konq_mainwindow.cc:3958
+#: konq_mainwindow.cc:4065
 msgid ""
 "Paste the previously cut or copied clipboard contents"
 "<p>This also works for text copied or cut from other TDE applications."
@@ -1086,11 +1108,11 @@ msgstr ""
 "<p>Gweithia hyn hefyd gyda testun wedi ei gopïo neu'i dorri o gymhwysiadau "
 "eraill TDE."
 
-#: konq_mainwindow.cc:3961
+#: konq_mainwindow.cc:4068
 msgid "Paste the clipboard contents"
 msgstr "Gludo cynnwys y gludfwrdd"
 
-#: konq_mainwindow.cc:3963
+#: konq_mainwindow.cc:4070
 msgid ""
 "Print the currently displayed document"
 "<p>You will be presented with a dialog where you can set various options, such "
@@ -1104,15 +1126,15 @@ msgstr ""
 "<p>Darpara'r ymgom yma hefyd hygyrchedd i wasanaethau argraffu arbennig TDE, "
 "megis creu ffeil PDF o'r ddogfen cyfredol."
 
-#: konq_mainwindow.cc:3969
+#: konq_mainwindow.cc:4076
 msgid "Print the current document"
 msgstr "Argraffu'r ddogfen cyfredol"
 
-#: konq_mainwindow.cc:3975
+#: konq_mainwindow.cc:4082
 msgid "If present, open index.html when entering a folder."
 msgstr "Agor index.html wrth fynd i blygell, os mae'n bresennol."
 
-#: konq_mainwindow.cc:3976
+#: konq_mainwindow.cc:4083
 #, fuzzy
 msgid ""
 "A locked view cannot change folders. Use in combination with 'link view' to "
@@ -1121,7 +1143,7 @@ msgstr ""
 "Ni all golwg wedi'i gloi newid plygyll.  Defnyddiwch ynghyd â 'golwg gyswllt' i "
 "archwilio sawl ffeil o un blygell"
 
-#: konq_mainwindow.cc:3977
+#: konq_mainwindow.cc:4084
 msgid ""
 "Sets the view as 'linked'. A linked view follows folder changes made in other "
 "linked views."
@@ -1129,75 +1151,72 @@ msgstr ""
 "Gosoda'r golwg yn 'olwg gyswllt'. Dilyna golygion cyswllt newidion plygell a "
 "wnaed mewn golygon cyswllt eraill."
 
-#: konq_mainwindow.cc:4001
+#: konq_mainwindow.cc:4108
 #: sidebar/trees/bookmark_module/bookmark_module.cpp:71
 msgid "Open Folder in Tabs"
 msgstr "Agor Plygell mewn Tabiau"
 
-#: konq_mainwindow.cc:4006
+#: konq_mainwindow.cc:4113
 #: sidebar/trees/bookmark_module/bookmark_module.cpp:67
-#: sidebar/trees/konq_sidebartree.cpp:913
+#: sidebar/trees/konq_sidebartree.cpp:924
 msgid "Open in New Window"
 msgstr "Agor mewn Ffenestr Newydd"
 
-#: konq_mainwindow.cc:4007
+#: konq_mainwindow.cc:4114
 #: sidebar/trees/bookmark_module/bookmark_module.cpp:69
-#: sidebar/trees/konq_sidebartree.cpp:915
+#: sidebar/trees/konq_sidebartree.cpp:926
 msgid "Open in New Tab"
 msgstr "Agor mewn Tab Newydd"
 
-#: konq_mainwindow.cc:4175
-msgid "Copy &Files..."
-msgstr "Copïo &Ffeiliau..."
-
-#: konq_mainwindow.cc:4176
-msgid "M&ove Files..."
-msgstr "S&ymud Ffeiliau..."
-
-#: konq_mainwindow.cc:4180
-msgid "Create Folder..."
-msgstr "Creu Plygell..."
-
-#: konq_mainwindow.cc:4334
+#: konq_mainwindow.cc:4421
 msgid "&Save View Profile \"%1\"..."
 msgstr "&Cadw Proffil Golwg \"%1\"..."
 
-#: konq_mainwindow.cc:4674
+#: konq_mainwindow.cc:4762
 msgid "Open in T&his Window"
 msgstr "Agor yn y Ffenest &Hon"
 
-#: konq_mainwindow.cc:4675
+#: konq_mainwindow.cc:4763
 #, fuzzy
 msgid "Open the document in current window"
 msgstr "Agor y ddogfen mewn ffenestr newydd"
 
-#: konq_mainwindow.cc:4677 sidebar/web_module/web_module.h:55
+#: konq_mainwindow.cc:4765 sidebar/web_module/web_module.h:55
 #: sidebar/web_module/web_module.h:58
 msgid "Open in New &Window"
 msgstr "Agor mewn Ffenestr &Newydd"
 
-#: konq_mainwindow.cc:4678
+#: konq_mainwindow.cc:4766
 msgid "Open the document in a new window"
 msgstr "Agor y ddogfen mewn ffenestr newydd"
 
-#: konq_mainwindow.cc:4688
+#: konq_mainwindow.cc:4776 konq_mainwindow.cc:4780
+msgid "Open in &Background Tab"
+msgstr "Agor mewn Tab Cefn&dir"
+
+#: konq_mainwindow.cc:4777 konq_mainwindow.cc:4782
+msgid "Open the document in a new background tab"
+msgstr "Agor y ddogfen mewn tab cefndir newydd"
+
+#: konq_mainwindow.cc:4778 konq_mainwindow.cc:4781
 msgid "Open in &New Tab"
 msgstr "Agor mewn Tab &Newydd"
 
-#: konq_mainwindow.cc:4689
-msgid "Open the document in a new tab"
-msgstr "Agor y ddogfen mewn tab newydd"
+#: konq_mainwindow.cc:4779 konq_mainwindow.cc:4783
+#, fuzzy
+msgid "Open the document in a new foreground tab"
+msgstr "Agor y ddogfen mewn tab cefndir newydd"
 
-#: konq_mainwindow.cc:4929
+#: konq_mainwindow.cc:5025
 #, c-format
 msgid "Open with %1"
 msgstr "Agor gyda %1"
 
-#: konq_mainwindow.cc:4986
+#: konq_mainwindow.cc:5082
 msgid "&View Mode"
 msgstr "Modd &Golwg"
 
-#: konq_mainwindow.cc:5196
+#: konq_mainwindow.cc:5291
 #, fuzzy
 msgid ""
 "You have multiple tabs open in this window, are you sure you want to quit?"
@@ -1205,42 +1224,42 @@ msgstr ""
 "Mae gennych amryw dabiau ar agor yn y ffenestr hon; a ydych yn sicr eich bod am "
 "ei chau?"
 
-#: konq_mainwindow.cc:5198 konq_viewmgr.cc:1147
+#: konq_mainwindow.cc:5293 konq_viewmgr.cc:1153
 msgid "Confirmation"
 msgstr "Cadarnhâd"
 
-#: konq_mainwindow.cc:5200
+#: konq_mainwindow.cc:5295
 msgid "C&lose Current Tab"
 msgstr "C&au'r Tab Cyfredol"
 
-#: konq_mainwindow.cc:5232
+#: konq_mainwindow.cc:5327
 msgid ""
 "This tab contains changes that have not been submitted.\n"
 "Closing the window will discard these changes."
 msgstr ""
 
-#: konq_mainwindow.cc:5250
+#: konq_mainwindow.cc:5345
 msgid ""
 "This page contains changes that have not been submitted.\n"
 "Closing the window will discard these changes."
 msgstr ""
 
-#: konq_mainwindow.cc:5342
+#: konq_mainwindow.cc:5437
 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."
 
-#: konq_mainwindow.cc:5342 konq_mainwindow.cc:5349
+#: konq_mainwindow.cc:5437 konq_mainwindow.cc:5444
 msgid "Web Sidebar"
 msgstr "Bar Ochr Gwê"
 
-#: konq_mainwindow.cc:5347
+#: konq_mainwindow.cc:5442
 msgid "Add new web extension \"%1\" to your sidebar?"
 msgstr "Ychwanegu estyniad gwê newydd \"%1\" i'ch bar ochr?"
 
-#: konq_mainwindow.cc:5349
+#: konq_mainwindow.cc:5444
 msgid "Do Not Add"
 msgstr "Na Ychwaneger"
 
@@ -1268,7 +1287,7 @@ msgstr "Cadw &URLau yn y proffil"
 msgid "Save &window size in profile"
 msgstr "Cadw &maint ffenestri yn y proffil"
 
-#: konq_tabs.cc:65
+#: konq_tabs.cc:74
 msgid ""
 "This bar contains the list of currently open tabs. Click on a tab to make it "
 "active. The option to show a close button instead of the website icon in the "
@@ -1278,33 +1297,43 @@ msgid ""
 "case it was truncated to fit the tab size."
 msgstr ""
 
-#: konq_tabs.cc:89
+#: konq_tabs.cc:98
 #, fuzzy
 msgid "&Reload Tab"
 msgstr "&Ail-lwytho bob tab"
 
-#: konq_tabs.cc:94
+#: konq_tabs.cc:103
 msgid "&Duplicate Tab"
 msgstr "&Dyblygu Tab"
 
-#: konq_tabs.cc:100
+#: konq_tabs.cc:109
 msgid "D&etach Tab"
 msgstr "D&atglymu Tab"
 
-#: konq_tabs.cc:107
+#: konq_tabs.cc:116
+#, fuzzy
+msgid "Move Tab &Left"
+msgstr "Symud Tab i'r Chwith"
+
+#: konq_tabs.cc:122
+#, fuzzy
+msgid "Move Tab &Right"
+msgstr "Symud Tab i'r Dde"
+
+#: konq_tabs.cc:129
 #, fuzzy
 msgid "Other Tabs"
 msgstr "Cau Tabiau &Eraill"
 
-#: konq_tabs.cc:112
+#: konq_tabs.cc:134
 msgid "&Close Tab"
 msgstr "&Cau Tab"
 
-#: konq_tabs.cc:144
+#: konq_tabs.cc:166
 msgid "Open a new tab"
 msgstr "Agor tab newydd"
 
-#: konq_tabs.cc:153
+#: konq_tabs.cc:175
 msgid "Close the current tab"
 msgstr "Cau'r tab cyfredol"
 
@@ -1322,7 +1351,7 @@ msgstr ""
 msgid "Resend"
 msgstr "Ail-anfon"
 
-#: konq_viewmgr.cc:1145
+#: konq_viewmgr.cc:1151
 #, fuzzy
 msgid ""
 "You have multiple tabs open in this window.\n"
@@ -1331,125 +1360,129 @@ msgstr ""
 "Mae gennych amryw dabiau ar agor yn y ffenestr hon; a ydych yn sicr eich bod am "
 "ei chau?"
 
-#: konq_viewmgr.cc:1148
+#: konq_viewmgr.cc:1154
 msgid "Load View Profile"
 msgstr "Llwytho Proffil Golwg"
 
-#: konq_viewmgr.cc:1164
+#: konq_viewmgr.cc:1170
 msgid ""
 "This tab contains changes that have not been submitted.\n"
 "Loading a profile will discard these changes."
 msgstr ""
 
-#: konq_viewmgr.cc:1182
+#: konq_viewmgr.cc:1188
 msgid ""
 "This page contains changes that have not been submitted.\n"
 "Loading a profile will discard these changes."
 msgstr ""
 
-#: iconview/konq_iconview.cc:212 listview/konq_listview.cc:674
+#: iconview/konq_iconview.cc:214 listview/konq_listview.cc:702
 msgid "Show &Hidden Files"
 msgstr "Dangos Ffeiliau &Cudd"
 
-#: iconview/konq_iconview.cc:215
+#: iconview/konq_iconview.cc:217
 msgid "Toggle displaying of hidden dot files"
 msgstr "Dangos/cuddio ffeiliau dot cudd"
 
-#: iconview/konq_iconview.cc:217
+#: iconview/konq_iconview.cc:219
 msgid "&Folder Icons Reflect Contents"
 msgstr "Adlewyrcha Eiconau &Plygell eu Cynnwys"
 
-#: iconview/konq_iconview.cc:220
+#: iconview/konq_iconview.cc:222
+msgid "&Media Icons Reflect Free Space"
+msgstr ""
+
+#: iconview/konq_iconview.cc:225
 msgid "&Preview"
 msgstr "&Rhagolwg"
 
-#: iconview/konq_iconview.cc:222
+#: iconview/konq_iconview.cc:227
 #, fuzzy
 msgid "Enable Previews"
 msgstr "Dangos Rhagolygon"
 
-#: iconview/konq_iconview.cc:223
+#: iconview/konq_iconview.cc:228
 #, fuzzy
 msgid "Disable Previews"
 msgstr "Dangos Rhagolygon"
 
-#: iconview/konq_iconview.cc:243
+#: iconview/konq_iconview.cc:248
 msgid "Sound Files"
 msgstr "Ffeiliau Sain"
 
-#: iconview/konq_iconview.cc:250
+#: iconview/konq_iconview.cc:255
 msgid "By Name (Case Sensitive)"
 msgstr "Gan Enw (llythrennau mawr/bach o bwys)"
 
-#: iconview/konq_iconview.cc:251
+#: iconview/konq_iconview.cc:256
 msgid "By Name (Case Insensitive)"
 msgstr "Gan Enw (llythrennau mawr/bach ddim o bwys)"
 
-#: iconview/konq_iconview.cc:252
+#: iconview/konq_iconview.cc:257
 msgid "By Size"
 msgstr "Gan Faint"
 
-#: iconview/konq_iconview.cc:253
+#: iconview/konq_iconview.cc:258
 msgid "By Type"
 msgstr "Gan Fath"
 
-#: iconview/konq_iconview.cc:254
+#: iconview/konq_iconview.cc:259
 msgid "By Date"
 msgstr "Gan Ddyddiad"
 
-#: iconview/konq_iconview.cc:279
+#: iconview/konq_iconview.cc:284
 msgid "Folders First"
 msgstr "Plygyll yn Gyntaf"
 
-#: iconview/konq_iconview.cc:280
+#: iconview/konq_iconview.cc:285
 msgid "Descending"
 msgstr "Disgynnol"
 
-#: iconview/konq_iconview.cc:305 listview/konq_listview.cc:668
+#: iconview/konq_iconview.cc:310 listview/konq_listview.cc:680
 msgid "Se&lect..."
 msgstr "De&wis..."
 
-#: iconview/konq_iconview.cc:307 listview/konq_listview.cc:669
+#: iconview/konq_iconview.cc:312 listview/konq_listview.cc:681
 msgid "Unselect..."
 msgstr "Datddewis..."
 
-#: iconview/konq_iconview.cc:310 listview/konq_listview.cc:671
+#: iconview/konq_iconview.cc:315 listview/konq_listview.cc:683
 msgid "Unselect All"
 msgstr "Datddewis Popeth"
 
-#: iconview/konq_iconview.cc:312 listview/konq_listview.cc:672
+#: iconview/konq_iconview.cc:317 listview/konq_listview.cc:684
 msgid "&Invert Selection"
 msgstr "&Gwrthdroi Dewisiad"
 
-#: iconview/konq_iconview.cc:316
+#: iconview/konq_iconview.cc:321
 msgid "Allows selecting of file or folder items based on a given mask"
 msgstr "Galluoga ddewis eitemau ffeil neu blygell ar sail masg a roddwyd"
 
-#: iconview/konq_iconview.cc:317
+#: iconview/konq_iconview.cc:322
 msgid "Allows unselecting of file or folder items based on a given mask"
 msgstr "Galluoga ddatddewis eitemau ffeil neu blygell ar sail masg a roddwyd"
 
-#: iconview/konq_iconview.cc:318
+#: iconview/konq_iconview.cc:323
 msgid "Selects all items"
 msgstr "Dewisa pob eitem"
 
-#: iconview/konq_iconview.cc:319
+#: iconview/konq_iconview.cc:324
 msgid "Unselects all selected items"
 msgstr "Datddewisa pob eitem dewisiedig"
 
-#: iconview/konq_iconview.cc:320
+#: iconview/konq_iconview.cc:325
 msgid "Inverts the current selection of items"
 msgstr "Gwrthdroa'r dewisiad cyfredol o eitemau"
 
-#: iconview/konq_iconview.cc:524 listview/konq_listview.cc:370
+#: iconview/konq_iconview.cc:550 listview/konq_listview.cc:382
 msgid "Select files:"
 msgstr "Dewis ffeiliau:"
 
-#: iconview/konq_iconview.cc:551 listview/konq_listview.cc:401
+#: iconview/konq_iconview.cc:577 listview/konq_listview.cc:413
 msgid "Unselect files:"
 msgstr "Datddewis ffeiliau:"
 
-#: iconview/konq_iconview.cc:755
+#: iconview/konq_iconview.cc:781
 msgid ""
 "You cannot drop any items in a directory in which you do not have write "
 "permission"
@@ -1463,154 +1496,182 @@ msgstr "Gweld &fel"
 msgid "Filename"
 msgstr "Enw Ffeil"
 
-#: listview/konq_listview.cc:267
+#: listview/konq_listview.cc:275
 msgid "MimeType"
 msgstr "Math MIME"
 
-#: listview/konq_listview.cc:268
+#: listview/konq_listview.cc:276
 msgid "Size"
 msgstr "Maint"
 
-#: listview/konq_listview.cc:269
+#: listview/konq_listview.cc:277
 msgid "Modified"
 msgstr "Addaswyd"
 
-#: listview/konq_listview.cc:270
+#: listview/konq_listview.cc:278
 msgid "Accessed"
 msgstr "Hygyrchwyd"
 
-#: listview/konq_listview.cc:271
+#: listview/konq_listview.cc:279
 msgid "Created"
 msgstr "Crëwyd"
 
-#: listview/konq_listview.cc:272
+#: listview/konq_listview.cc:280
 msgid "Permissions"
 msgstr "Caniatadau"
 
-#: listview/konq_listview.cc:273
+#: listview/konq_listview.cc:281
 msgid "Owner"
 msgstr "Perchennog"
 
-#: listview/konq_listview.cc:274
+#: listview/konq_listview.cc:282
 msgid "Group"
 msgstr "Grŵp"
 
-#: listview/konq_listview.cc:275
+#: listview/konq_listview.cc:283
 msgid "Link"
 msgstr "Cyswllt"
 
 #: keditbookmarks/bookmarkinfo.cpp:196 keditbookmarks/listview.cpp:581
-#: keditbookmarks/listview.cpp:703 listview/konq_listview.cc:276
+#: keditbookmarks/listview.cpp:703 listview/konq_listview.cc:284
 msgid "URL"
 msgstr "URL"
 
-#: listview/konq_listview.cc:278
+#: listview/konq_listview.cc:286
 msgid "File Type"
 msgstr "Math Ffeil"
 
-#: listview/konq_listview.cc:646
+#: listview/konq_listview.cc:658
 msgid "Show &Modification Time"
 msgstr "Dangos Amser &Addasu"
 
-#: listview/konq_listview.cc:647
+#: listview/konq_listview.cc:659
 #, fuzzy
 msgid "Hide &Modification Time"
 msgstr "Dangos Amser &Addasu"
 
-#: listview/konq_listview.cc:648
+#: listview/konq_listview.cc:660
 msgid "Show &File Type"
 msgstr "Dangos Math &Ffeil"
 
-#: listview/konq_listview.cc:649
+#: listview/konq_listview.cc:661
 #, fuzzy
 msgid "Hide &File Type"
 msgstr "Math Ffeil"
 
-#: listview/konq_listview.cc:650
+#: listview/konq_listview.cc:662
 msgid "Show MimeType"
 msgstr "Dangos Math MIME"
 
-#: listview/konq_listview.cc:651
+#: listview/konq_listview.cc:663
 #, fuzzy
 msgid "Hide MimeType"
 msgstr "Math MIME"
 
-#: listview/konq_listview.cc:652
+#: listview/konq_listview.cc:664
 msgid "Show &Access Time"
 msgstr "Dangos Amser &Hygyrchu"
 
-#: listview/konq_listview.cc:653
+#: listview/konq_listview.cc:665
 #, fuzzy
 msgid "Hide &Access Time"
 msgstr "Dangos Amser &Hygyrchu"
 
-#: listview/konq_listview.cc:654
+#: listview/konq_listview.cc:666
 msgid "Show &Creation Time"
 msgstr "Dangos Amser &Creu"
 
-#: listview/konq_listview.cc:655
+#: listview/konq_listview.cc:667
 #, fuzzy
 msgid "Hide &Creation Time"
 msgstr "Dangos Amser &Creu"
 
-#: listview/konq_listview.cc:656
+#: listview/konq_listview.cc:668
 msgid "Show &Link Destination"
 msgstr "Dangos Cyrchfan C&yswllt"
 
-#: listview/konq_listview.cc:657
+#: listview/konq_listview.cc:669
 #, fuzzy
 msgid "Hide &Link Destination"
 msgstr "Dangos Cyrchfan C&yswllt"
 
-#: listview/konq_listview.cc:658
+#: listview/konq_listview.cc:670
 msgid "Show Filesize"
 msgstr "Dangos Maint Ffeil"
 
-#: listview/konq_listview.cc:659
+#: listview/konq_listview.cc:671
 #, fuzzy
 msgid "Hide Filesize"
 msgstr "Dangos Maint Ffeil"
 
-#: listview/konq_listview.cc:660
+#: listview/konq_listview.cc:672
 msgid "Show Owner"
 msgstr "Dangos Perchennog"
 
-#: listview/konq_listview.cc:661
+#: listview/konq_listview.cc:673
 #, fuzzy
 msgid "Hide Owner"
 msgstr "Perchennog"
 
-#: listview/konq_listview.cc:662
+#: listview/konq_listview.cc:674
 msgid "Show Group"
 msgstr "Dangos Grŵp"
 
-#: listview/konq_listview.cc:663
+#: listview/konq_listview.cc:675
 #, fuzzy
 msgid "Hide Group"
 msgstr "Grŵp"
 
-#: listview/konq_listview.cc:664
+#: listview/konq_listview.cc:676
 msgid "Show Permissions"
 msgstr "Dangos Caniatadau"
 
-#: listview/konq_listview.cc:665
+#: listview/konq_listview.cc:677
 #, fuzzy
 msgid "Hide Permissions"
 msgstr "Caniatadau"
 
-#: listview/konq_listview.cc:666
+#: listview/konq_listview.cc:678
 msgid "Show URL"
 msgstr "Dangos URL"
 
-#: listview/konq_listview.cc:676
+#: listview/konq_listview.cc:689
+msgid "&Rename and move to next item"
+msgstr ""
+
+#: listview/konq_listview.cc:691
+msgid ""
+"Pressing this button completes the current rename operation,moves to the next "
+"item and starts a new rename operation."
+msgstr ""
+
+#: listview/konq_listview.cc:693
+msgid "Complete rename operation and move the next item"
+msgstr ""
+
+#: listview/konq_listview.cc:695
+msgid "&Rename and move to previous item"
+msgstr ""
+
+#: listview/konq_listview.cc:697
+msgid ""
+"Pressing this button completes the current rename operation,moves to the "
+"previous item and starts a new rename operation."
+msgstr ""
+
+#: listview/konq_listview.cc:699
+msgid "Complete rename operation and move the previous item"
+msgstr ""
+
+#: listview/konq_listview.cc:704
 msgid "Case Insensitive Sort"
 msgstr "Trefnu (llythrennau mawr/bach ddim o bwys)"
 
-#: listview/konq_listviewwidget.cc:350 listview/konq_textviewwidget.cc:68
+#: listview/konq_listviewwidget.cc:355 listview/konq_textviewwidget.cc:68
 msgid "Name"
 msgstr "Enw"
 
-#: listview/konq_listviewwidget.cc:909
+#: listview/konq_listviewwidget.cc:1060
 msgid "You must take the file out of the trash before being able to use it."
 msgstr "Rhaid i chi gymryd y ffeil allan o'r sbwriel cyn allu ei ddefnyddio."
 
@@ -1619,7 +1680,7 @@ msgid "Galeon"
 msgstr ""
 
 #: keditbookmarks/importers.h:118
-msgid "TDE"
+msgid "KDE"
 msgstr ""
 
 #: keditbookmarks/importers.h:139
@@ -1649,7 +1710,7 @@ msgstr "Sbwriel"
 msgid "&Show Netscape Bookmarks in Konqueror"
 msgstr "&Dangos Tudnodau Netscape mewn Ffenestri Konqueror"
 
-#: keditbookmarks/actionsimpl.cpp:111 sidebar/trees/konq_sidebartree.cpp:907
+#: keditbookmarks/actionsimpl.cpp:111 sidebar/trees/konq_sidebartree.cpp:918
 msgid "Rename"
 msgstr "Ail-enwi"
 
@@ -1753,7 +1814,7 @@ msgstr "Mewnforio Tudnodau &Galeon"
 
 #: keditbookmarks/actionsimpl.cpp:190
 #, fuzzy
-msgid "Import &TDE2/TDE3 Bookmarks..."
+msgid "Import &KDE2/KDE3 Bookmarks..."
 msgstr "Mewnforio Tudnodau &TDE2"
 
 #: keditbookmarks/actionsimpl.cpp:193
@@ -1934,7 +1995,8 @@ msgid "*.xbel|Galeon Bookmark Files (*.xbel)"
 msgstr "*.xbel|Ffeiliau Tudnod Galeon (*.xbel)"
 
 #: keditbookmarks/importers.cpp:188
-msgid "*.xml|TDE Bookmark Files (*.xml)"
+#, fuzzy
+msgid "*.xml|KDE Bookmark Files (*.xml)"
 msgstr "*.xml|Ffeiliau Tudnod TDE (*.xml)"
 
 #: keditbookmarks/kbookmarkmerger.cpp:42
@@ -2077,7 +2139,8 @@ msgid "Konqueror Bookmarks Editor"
 msgstr "Golygydd Tudnodau Konqueror"
 
 #: keditbookmarks/main.cpp:120
-msgid "(c) 2000 - 2003, TDE developers"
+#, fuzzy
+msgid "(c) 2000 - 2003, KDE developers"
 msgstr "(h) 2000 - 2003, datblygwyr TDE"
 
 #: keditbookmarks/main.cpp:121
@@ -2118,118 +2181,118 @@ msgid ""
 "<br>Resets the quick search so that all bookmarks are shown again."
 msgstr ""
 
-#: keditbookmarks/toplevel.cpp:219 sidebar/trees/konqsidebar_tree.cpp:33
+#: keditbookmarks/toplevel.cpp:219 sidebar/trees/konqsidebar_tree.cpp:34
 msgid "Se&arch:"
 msgstr "&Chwiliad:"
 
-#: about/konq_aboutpage.cc:112 about/konq_aboutpage.cc:114
-#: about/konq_aboutpage.cc:177 about/konq_aboutpage.cc:179
-#: about/konq_aboutpage.cc:232 about/konq_aboutpage.cc:234
-#: about/konq_aboutpage.cc:329 about/konq_aboutpage.cc:331
+#: about/konq_aboutpage.cc:139 about/konq_aboutpage.cc:141
+#: about/konq_aboutpage.cc:204 about/konq_aboutpage.cc:206
+#: about/konq_aboutpage.cc:259 about/konq_aboutpage.cc:261
+#: about/konq_aboutpage.cc:356 about/konq_aboutpage.cc:358
 msgid "Conquer your Desktop!"
 msgstr "Gorchfygwch eich Penbwrdd!"
 
-#: about/konq_aboutpage.cc:115 about/konq_aboutpage.cc:180
-#: about/konq_aboutpage.cc:235 about/konq_aboutpage.cc:332
+#: about/konq_aboutpage.cc:142 about/konq_aboutpage.cc:207
+#: about/konq_aboutpage.cc:262 about/konq_aboutpage.cc:359
 msgid ""
 "Konqueror is your file manager, web browser and universal document viewer."
 msgstr ""
 
-#: about/konq_aboutpage.cc:116 about/konq_aboutpage.cc:181
-#: about/konq_aboutpage.cc:236 about/konq_aboutpage.cc:333
+#: about/konq_aboutpage.cc:143 about/konq_aboutpage.cc:208
+#: about/konq_aboutpage.cc:263 about/konq_aboutpage.cc:360
 #, fuzzy
 msgid "Starting Points"
 msgstr "Goso&diadau"
 
-#: about/konq_aboutpage.cc:117 about/konq_aboutpage.cc:182
-#: about/konq_aboutpage.cc:237 about/konq_aboutpage.cc:334
+#: about/konq_aboutpage.cc:144 about/konq_aboutpage.cc:209
+#: about/konq_aboutpage.cc:264 about/konq_aboutpage.cc:361
 msgid "Introduction"
 msgstr "Cyflwyniad"
 
-#: about/konq_aboutpage.cc:118 about/konq_aboutpage.cc:183
-#: about/konq_aboutpage.cc:238 about/konq_aboutpage.cc:335
+#: about/konq_aboutpage.cc:145 about/konq_aboutpage.cc:210
+#: about/konq_aboutpage.cc:265 about/konq_aboutpage.cc:362
 msgid "Tips"
 msgstr "Cynghorion"
 
-#: about/konq_aboutpage.cc:119 about/konq_aboutpage.cc:184
-#: about/konq_aboutpage.cc:239 about/konq_aboutpage.cc:240
-#: about/konq_aboutpage.cc:336
+#: about/konq_aboutpage.cc:146 about/konq_aboutpage.cc:211
+#: about/konq_aboutpage.cc:266 about/konq_aboutpage.cc:267
+#: about/konq_aboutpage.cc:363
 msgid "Specifications"
 msgstr "Penodiadau"
 
-#: about/konq_aboutpage.cc:125
+#: about/konq_aboutpage.cc:152
 msgid "Your personal files"
 msgstr ""
 
-#: about/konq_aboutpage.cc:128
+#: about/konq_aboutpage.cc:155
 msgid "Storage Media"
 msgstr ""
 
-#: about/konq_aboutpage.cc:129
+#: about/konq_aboutpage.cc:156
 msgid "Disks and removable media"
 msgstr ""
 
-#: about/konq_aboutpage.cc:132
+#: about/konq_aboutpage.cc:159
 #, fuzzy
 msgid "Network Folders"
 msgstr "Plygell Newydd:"
 
-#: about/konq_aboutpage.cc:133
+#: about/konq_aboutpage.cc:160
 msgid "Shared files and folders"
 msgstr ""
 
-#: about/konq_aboutpage.cc:137
+#: about/konq_aboutpage.cc:164
 msgid "Browse and restore the trash"
 msgstr ""
 
-#: about/konq_aboutpage.cc:140
+#: about/konq_aboutpage.cc:167
 msgid "Applications"
 msgstr "Cymhwysiadau"
 
-#: about/konq_aboutpage.cc:141
+#: about/konq_aboutpage.cc:168
 #, fuzzy
 msgid "Installed programs"
 msgstr "Ategion a Osodir"
 
-#: about/konq_aboutpage.cc:144
+#: about/konq_aboutpage.cc:171
 msgid "Settings"
 msgstr "Gosodiadau"
 
-#: about/konq_aboutpage.cc:145
+#: about/konq_aboutpage.cc:172
 #, fuzzy
 msgid "Desktop configuration"
 msgstr "Dangos Botwm Ffurfweddu"
 
-#: about/konq_aboutpage.cc:148
+#: about/konq_aboutpage.cc:175
 #, fuzzy
 msgid "Next: An Introduction to Konqueror"
 msgstr "Cyflwyniad"
 
-#: about/konq_aboutpage.cc:150
+#: about/konq_aboutpage.cc:177
 msgid "Search the Web"
 msgstr ""
 
-#: about/konq_aboutpage.cc:185
+#: about/konq_aboutpage.cc:212
 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:189
+#: about/konq_aboutpage.cc:216
 #, fuzzy
 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 "
-"href=\"http://www.kde.org\">http://www.kde.org</A>) of a web page you would "
-"like to visit in the location bar and press Enter, or choose an entry from the "
-"Bookmarks menu."
+"href=\"http://www.trinitydesktop.org\">http://www.trinitydesktop.org</A>"
+") of a web page you would like to visit in the location bar and press Enter, or "
+"choose an entry from the Bookmarks menu."
 msgstr ""
 "Dim ond rhoi cyfeiriad Rhyngrwyd (e.e. <a href=\"http://www.kde.org \">"
 "http://www.kde.org</a>) y dudalen wê a gwasgu Dychwelyd sydd angen, neu "
 "dewiswch cofnod yn eich dewislen Tudnodau."
 
-#: about/konq_aboutpage.cc:194
+#: about/konq_aboutpage.cc:221
 #, fuzzy
 msgid ""
 "To return to the previous location, press the back button  <img width='16' "
@@ -2238,7 +2301,7 @@ msgstr ""
 "Os hoffech fynd yn ôl i'r dudalen wê flaenorol, gwasgwch y botwm <IMG WIDTH=16 "
 "HEIGHT=16 SRC=\"%1\"> &nbsp;(\"Yn ôl\") yn y bar offer."
 
-#: about/konq_aboutpage.cc:197
+#: about/konq_aboutpage.cc:224
 #, fuzzy
 msgid ""
 "To quickly go to your Home folder press the  home button <img width='16' "
@@ -2247,13 +2310,13 @@ msgstr ""
 "Os hoffech fynd yn ôl i'r dudalen wê flaenorol, gwasgwch y botwm <IMG WIDTH=16 "
 "HEIGHT=16 SRC=\"%1\"> &nbsp;(\"Yn ôl\") yn y bar offer."
 
-#: about/konq_aboutpage.cc:199
+#: about/konq_aboutpage.cc:226
 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:201
+#: about/konq_aboutpage.cc:228
 #, fuzzy
 msgid ""
 "<em>Tuning Tip:</em> If you want the Konqueror web browser to start faster, you "
@@ -2267,11 +2330,11 @@ msgstr ""
 "Cyflwyniad Konqueror, ac yna gwasgu Gosodiadau -> Cadw Proffil Golwg \"Pori "
 "Gwê\"."
 
-#: about/konq_aboutpage.cc:206
+#: about/konq_aboutpage.cc:233
 msgid "Next: Tips &amp; Tricks"
 msgstr ""
 
-#: about/konq_aboutpage.cc:241
+#: about/konq_aboutpage.cc:268
 msgid ""
 "Konqueror is designed to embrace and support Internet standards. The aim is to "
 "fully implement the officially sanctioned standards from organizations such as "
@@ -2287,19 +2350,19 @@ msgstr ""
 "chynhaliaeth i nodweddion megis hoffeiconau, geiriau allweddol Rhyngrwyd, a "
 "tudnodau <a href=\"%1\">XBEL bookmarks</a>, gweithreda Konqueror hefyd:"
 
-#: about/konq_aboutpage.cc:248
+#: about/konq_aboutpage.cc:275
 msgid "Web Browsing"
 msgstr "Pori'r Wê"
 
-#: about/konq_aboutpage.cc:249
+#: about/konq_aboutpage.cc:276
 msgid "Supported standards"
 msgstr "Safonau cynnaledig"
 
-#: about/konq_aboutpage.cc:250
+#: about/konq_aboutpage.cc:277
 msgid "Additional requirements*"
 msgstr "Gofynion Ychwanegol*"
 
-#: about/konq_aboutpage.cc:251
+#: about/konq_aboutpage.cc:278
 msgid ""
 "<A HREF=\"%1\">DOM</A> (Level 1, partially Level 2) based <A HREF=\"%2\">"
 "HTML 4.01</A>"
@@ -2307,28 +2370,28 @@ msgstr ""
 "<a href=\"%1\">DOM</a>Sail  (Lefel 1, Level 2 rhannol)<a href=\"%2 \">"
 "HTML 4.01</a>"
 
-#: about/konq_aboutpage.cc:253 about/konq_aboutpage.cc:255
-#: about/konq_aboutpage.cc:267 about/konq_aboutpage.cc:272
-#: about/konq_aboutpage.cc:274
+#: about/konq_aboutpage.cc:280 about/konq_aboutpage.cc:282
+#: about/konq_aboutpage.cc:294 about/konq_aboutpage.cc:299
+#: about/konq_aboutpage.cc:301
 msgid "built-in"
 msgstr "mewnadeiladedig"
 
-#: about/konq_aboutpage.cc:254
+#: about/konq_aboutpage.cc:281
 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:256
+#: about/konq_aboutpage.cc:283
 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:257
+#: about/konq_aboutpage.cc:284
 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:258
+#: about/konq_aboutpage.cc:285
 msgid ""
 "JavaScript enabled (globally). Configure JavaScript <A HREF=\\\"%1\\\">here</A>"
 "."
@@ -2336,11 +2399,11 @@ msgstr ""
 "JavaScript galluog (yn eang). Analluogwch JavaScript <A HREF=\\\"%1\\\">yma</ A>"
 "."
 
-#: about/konq_aboutpage.cc:259
+#: about/konq_aboutpage.cc:286
 msgid "Secure <A HREF=\"%1\">Java</A><SUP>&reg;</SUP> support"
 msgstr "Cynhaliaeth <a href=\"%1\">Java</a><sup>&reg;</sup> diogel"
 
-#: about/konq_aboutpage.cc:260
+#: about/konq_aboutpage.cc:287
 msgid ""
 "JDK 1.2.0 (Java 2) compatible VM (<A HREF=\"%1\">Blackdown</A>, <A HREF=\"%2\">"
 "IBM</A> or <A HREF=\"%3\">Sun</A>)"
@@ -2348,11 +2411,11 @@ msgstr ""
 "VM cyfaddas â JDK 1.2.0 (Java 2) (<a href=\"%1\">Blackdown</a>, <a href=\"%2 \">"
 "IBM</a> neu <a href=\"%3\">Sun</a>)"
 
-#: about/konq_aboutpage.cc:262
+#: about/konq_aboutpage.cc:289
 msgid "Enable Java (globally) <A HREF=\"%1\">here</A>."
 msgstr "Galluogwch Java (yn eang) <a href=\"%1\">yma</a>."
 
-#: about/konq_aboutpage.cc:263
+#: about/konq_aboutpage.cc:290
 msgid ""
 "Netscape Communicator<SUP>&reg;</SUP> <A HREF=\"%4\">plugins</A> "
 "(for viewing <A HREF=\"%1\">Flash<SUP>&reg;</SUP></A>, <A HREF=\"%2\">Real<SUP>"
@@ -2362,86 +2425,86 @@ msgstr ""
 "(i ddangos <a href=\"%1\">Flash<sup>&reg;</sup></a>, <a href=\"%2 \">Real<sup>"
 "&reg;</sup></a>Audio, <a href=\"%3\">Real<sup>&reg;</sup></a>Video, ayyb)"
 
-#: about/konq_aboutpage.cc:268
+#: about/konq_aboutpage.cc:295
 msgid "Secure Sockets Layer"
 msgstr "Haen Socedi Diogel (SSL)"
 
-#: about/konq_aboutpage.cc:269
+#: about/konq_aboutpage.cc:296
 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:270
+#: about/konq_aboutpage.cc:297
 msgid "OpenSSL"
 msgstr "OpenSSL"
 
-#: about/konq_aboutpage.cc:271
+#: about/konq_aboutpage.cc:298
 msgid "Bidirectional 16bit unicode support"
 msgstr "Cynhaliaeth unicode deuffordd 16did"
 
-#: about/konq_aboutpage.cc:273
+#: about/konq_aboutpage.cc:300
 msgid "AutoCompletion for forms"
 msgstr "Hunan-Gwblhau i ffurflenni"
 
-#: about/konq_aboutpage.cc:275
+#: about/konq_aboutpage.cc:302
 msgid "G E N E R A L"
 msgstr "C Y FF R E D I N O L"
 
-#: about/konq_aboutpage.cc:276
+#: about/konq_aboutpage.cc:303
 msgid "Feature"
 msgstr "Nodwedd"
 
-#: about/konq_aboutpage.cc:278
+#: about/konq_aboutpage.cc:305
 msgid "Image formats"
 msgstr "Fformatau Delwedd"
 
-#: about/konq_aboutpage.cc:279
+#: about/konq_aboutpage.cc:306
 msgid "Transfer protocols"
 msgstr "Protocolau trosglwyddo"
 
-#: about/konq_aboutpage.cc:280
+#: about/konq_aboutpage.cc:307
 msgid "HTTP 1.1 (including gzip/bzip2 compression)"
 msgstr "HTTP 1.1 (gan gynnwys cywasgu gzip/bzip2)"
 
-#: about/konq_aboutpage.cc:281
+#: about/konq_aboutpage.cc:308
 msgid "FTP"
 msgstr "FTP"
 
-#: about/konq_aboutpage.cc:282
+#: about/konq_aboutpage.cc:309
 msgid "and <A HREF=\"%1\">many more...</A>"
 msgstr "a <a href=\"%1\">llawer  mwy...</a>"
 
-#: about/konq_aboutpage.cc:283
+#: about/konq_aboutpage.cc:310
 msgid "URL-Completion"
 msgstr "Cwblhâd-URL"
 
-#: about/konq_aboutpage.cc:284
+#: about/konq_aboutpage.cc:311
 msgid "Manual"
 msgstr "Â llaw"
 
-#: about/konq_aboutpage.cc:285
+#: about/konq_aboutpage.cc:312
 msgid "Popup"
 msgstr "Neidiol"
 
-#: about/konq_aboutpage.cc:286
+#: about/konq_aboutpage.cc:313
 msgid "(Short-) Automatic"
 msgstr "(Byr-) Awtomatig"
 
-#: about/konq_aboutpage.cc:288
+#: about/konq_aboutpage.cc:315
 msgid "<a href=\"%1\">Return to Starting Points</a>"
 msgstr ""
 
-#: about/konq_aboutpage.cc:337
+#: about/konq_aboutpage.cc:364
 msgid "Tips &amp; Tricks"
 msgstr ""
 
-#: about/konq_aboutpage.cc:338
+#: about/konq_aboutpage.cc:365
 #, fuzzy
 msgid ""
-"Use Internet-Keywords and Web-Shortcuts: by typing \"gg: TDE\" one can search "
-"the Internet, using Google, for the search phrase \"TDE\". There are a lot of "
-"Web-Shortcuts predefined to make searching for software or looking up certain "
-"words in an encyclopedia a breeze. You can even <a href=\"%1\">"
-"create your own</a> Web-Shortcuts."
+"Use Internet-Keywords and Web-Shortcuts: by typing \"gg: Trinity Desktop\" one "
+"can search the Internet, using Google, for the search phrase \"Trinity "
+"Desktop\". There are a lot of Web-Shortcuts predefined to make searching for "
+"software or looking up certain words in an encyclopedia a breeze. You can even "
+"<a href=\"%1\">create your own</a> Web-Shortcuts."
 msgstr ""
 "Defnyddiwch Allweddeiriau-Rhyngrwyd a Byrlwybrau-Gwê! Trwy deipio \"gg:TDE\" "
 "gellir chwilio'r Rhyngrwyd, gan ddefnyddio Google, am y cymal chwilio \"TDE\". "
@@ -2449,7 +2512,7 @@ msgstr ""
 "canfod geiriau penodol mewn gwyddoniadur yn hawdd. Gallwch hyd yn oed <a "
 "href=\"%1 \">greu Byrlwybrau-Gwê eich hun</a>!"
 
-#: about/konq_aboutpage.cc:343
+#: about/konq_aboutpage.cc:370
 #, fuzzy
 msgid ""
 "Use the magnifier button <img width='16' height='16' src=\"%1\"> "
@@ -2458,7 +2521,7 @@ msgstr ""
 "Defnyddiwch y botwm chwyddo <IMG WIDTH=16 HEIGHT=16 SRC=\"%1\">  "
 "&nbsp; yn y bar offer i godi maint y wynebfath ar eich tudalen wê."
 
-#: about/konq_aboutpage.cc:345
+#: about/konq_aboutpage.cc:372
 #, fuzzy
 msgid ""
 "When you want to paste a new address into the Location toolbar you might want "
@@ -2469,7 +2532,7 @@ msgstr ""
 "glirio'r gofnod cyfredol drwy wasgu'r saeth ddu â'r groes wen &nbsp;<IMG "
 "WIDTH=16 HEIGHT=16 SRC=\"%1\"> &nbsp; yn y bar offer."
 
-#: about/konq_aboutpage.cc:349
+#: about/konq_aboutpage.cc:376
 msgid ""
 "To create a link on your desktop pointing to the current page, simply drag the "
 "\"Location\" label that is to the left of the Location toolbar, drop it on to "
@@ -2479,7 +2542,7 @@ msgstr ""
 "label \"Lleoliad\" sydd i'r chwith o'r bar offer Lleoliad, gollyngwch ef ar y "
 "penbwrdd, a dewiswch \"Cysylltu\"."
 
-#: about/konq_aboutpage.cc:352
+#: about/konq_aboutpage.cc:379
 #, fuzzy
 msgid ""
 "You can also find <img width='16' height='16' src=\"%1\"> "
@@ -2490,7 +2553,7 @@ msgstr ""
 "&nbsp; yn y ddewislen Ffenestr. Mae'r nodwedd yma'n ddefnyddiol iawn mewn "
 "sesiynau \"Siarad\"."
 
-#: about/konq_aboutpage.cc:355
+#: about/konq_aboutpage.cc:382
 #, fuzzy
 msgid ""
 "Divide et impera (lat. \"Divide and conquer\") - by splitting a window into two "
@@ -2505,7 +2568,7 @@ msgstr ""
 "dymunwch. Gallwch hyd yn oed lwytho proffilau-golwg (e.e. Midnight Commander), "
 "neu greu rhai eich hun."
 
-#: about/konq_aboutpage.cc:360
+#: about/konq_aboutpage.cc:387
 #, fuzzy
 msgid ""
 "Use the <a href=\"%1\">user-agent</a> feature if the website you are visiting "
@@ -2516,7 +2579,7 @@ msgstr ""
 "os gofynna'r wefan yr ymwelwch â hi i ddefnyddio porwr gwahanol (a peidiwch "
 "anghofio anfon cwyn at y gwefeistr!)"
 
-#: about/konq_aboutpage.cc:363
+#: about/konq_aboutpage.cc:390
 #, fuzzy
 msgid ""
 "The <img width='16' height='16' src=\"%1\"> History in your SideBar ensures "
@@ -2526,14 +2589,14 @@ msgstr ""
 "sicrhau bod cofnod gennych o'r tudalennau yr ydych wedi ymweld â nhw yn "
 "ddiweddar."
 
-#: about/konq_aboutpage.cc:365
+#: about/konq_aboutpage.cc:392
 msgid ""
 "Use a caching <a href=\"%1\">proxy</a> to speed up your Internet connection."
 msgstr ""
 "Defnyddiwch <a href=\"%1\">ddirprwy</a> strorfa dros dro i gyflymu'ch "
 "cysylltiad i'r Rhyngrwyd."
 
-#: about/konq_aboutpage.cc:367
+#: about/konq_aboutpage.cc:394
 #, fuzzy
 msgid ""
 "Advanced users will appreciate the Konsole which you can embed into Konqueror "
@@ -2543,7 +2606,7 @@ msgstr ""
 "Konqueror (Ffenestr -> <IMG WIDTH=16 HEIGHT=16 SRC=\"%1\">  "
 "&nbsp;  Dangos Efelychydd Terfynell)."
 
-#: about/konq_aboutpage.cc:370
+#: about/konq_aboutpage.cc:397
 msgid ""
 "Thanks to <a href=\"%1\">DCOP</a> you can have full control over Konqueror "
 "using a script."
@@ -2551,28 +2614,28 @@ msgstr ""
 "Diolch i <a href=\"%1\">DCOP</a> mae gennych reolaeth gyflawn dros Konqueror "
 "drwy ddefnyddio sgriptiau."
 
-#: about/konq_aboutpage.cc:372
+#: about/konq_aboutpage.cc:399
 msgid "<img width='16' height='16' src=\"%1\">"
 msgstr ""
 
-#: about/konq_aboutpage.cc:373
+#: about/konq_aboutpage.cc:400
 #, fuzzy
 msgid "Next: Specifications"
 msgstr "Penodiadau"
 
-#: about/konq_aboutpage.cc:389
+#: about/konq_aboutpage.cc:416
 msgid "Installed Plugins"
 msgstr "Ategion a Osodir"
 
-#: about/konq_aboutpage.cc:390
+#: about/konq_aboutpage.cc:417
 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:391
+#: about/konq_aboutpage.cc:418
 msgid "Installed"
 msgstr "Wedi'u Gosod"
 
-#: about/konq_aboutpage.cc:392
+#: about/konq_aboutpage.cc:419
 msgid "<td>Mime Type</td><td>Description</td><td>Suffixes</td><td>Plugin</td>"
 msgstr ""
 "<td>Math Mime</td>"
@@ -2580,20 +2643,20 @@ msgstr ""
 "<td>Ôlddodiadau</td>"
 "<td>Ategyn</td>"
 
-#: about/konq_aboutpage.cc:498
+#: about/konq_aboutpage.cc:538
 msgid ""
 "Do you want to disable showing the introduction in the webbrowsing profile?"
 msgstr "Hoffech analluogi dangos y cyflwyniad yn y proffil pori gwê?"
 
-#: about/konq_aboutpage.cc:500
+#: about/konq_aboutpage.cc:540
 msgid "Faster Startup?"
 msgstr "Dechrau Cyflymach?"
 
-#: about/konq_aboutpage.cc:500
+#: about/konq_aboutpage.cc:540
 msgid "Disable"
 msgstr "Analluogi"
 
-#: about/konq_aboutpage.cc:500
+#: about/konq_aboutpage.cc:540
 msgid "Keep"
 msgstr "Cadw"
 
@@ -2626,57 +2689,64 @@ msgstr "Gweithredu gorchymyn plisgyn yn y cyfeiriadur cyfredol:"
 msgid "Output from command: \"%1\""
 msgstr "Allbwn o'r gorchymyn: \"%1\""
 
-#: sidebar/trees/konqsidebar_tree.cpp:31
+#: sidebar/trees/konqsidebar_tree.cpp:32
 msgid "Clear Search"
 msgstr "Gwagu'r Chwiliad"
 
-#: sidebar/trees/konqsidebar_tree.cpp:146
+#: sidebar/trees/konqsidebar_tree.cpp:147
 msgid "Select Type"
 msgstr "Dewiswch Fath"
 
-#: sidebar/trees/konqsidebar_tree.cpp:147
+#: sidebar/trees/konqsidebar_tree.cpp:148
 msgid "Select type:"
 msgstr "Dewiswch fath:"
 
-#: sidebar/trees/history_module/history_module.cpp:80
-msgid "&Remove Entry"
-msgstr "&Gwaredu Cofnod"
-
-#: sidebar/trees/history_module/history_module.cpp:82
-msgid "C&lear History"
-msgstr "C&lirio'r Hanes"
+#: sidebar/trees/bookmark_module/bookmark_module.cpp:59
+msgid "&Create New Folder"
+msgstr "&Creu Plygell Newydd"
 
-#: sidebar/trees/history_module/history_module.cpp:88
-msgid "By &Name"
-msgstr "Gan &Enw"
+#: sidebar/trees/bookmark_module/bookmark_module.cpp:61
+#: sidebar/trees/konq_sidebartree.cpp:916
+msgid "Delete Folder"
+msgstr "Dileu Plygell"
 
-#: sidebar/trees/history_module/history_module.cpp:93
-msgid "By &Date"
-msgstr "Gan &Ddyddiad"
+#: sidebar/trees/bookmark_module/bookmark_module.cpp:63
+msgid "Delete Bookmark"
+msgstr "Dileu y Tudnod"
 
-#: sidebar/trees/history_module/history_module.cpp:351
-#: sidebar/trees/history_module/kcmhistory.cpp:263
-msgid "Do you really want to clear the entire history?"
-msgstr "Ydych wir am glirio'r hanes gyfan?"
+#: sidebar/trees/bookmark_module/bookmark_module.cpp:73
+#: sidebar/trees/konq_sidebartree.cpp:928
+msgid "Copy Link Address"
+msgstr "Copïo Cyfeiriad Cyswllt"
 
-#: sidebar/trees/history_module/history_module.cpp:353
-#: sidebar/trees/history_module/kcmhistory.cpp:265
-msgid "Clear History?"
-msgstr "Clirio'r Hanes?"
+#: sidebar/trees/bookmark_module/bookmark_module.cpp:308
+#, fuzzy
+msgid ""
+"Are you sure you wish to remove the bookmark folder\n"
+"\"%1\"?"
+msgstr "Ydych wir eisiau gwaredu'r plygell tudnodau yma?"
 
-#: sidebar/trees/history_module/history_item.cpp:121
+#: sidebar/trees/bookmark_module/bookmark_module.cpp:309
+#, fuzzy
 msgid ""
-"<qt>"
-"<center><b>%4</b></center>"
-"<hr>Last visited: %1"
-"<br>First visited: %2"
-"<br>Number of times visited: %3</qt>"
-msgstr ""
-"<qt>"
-"<center><b>%4</b></center>"
-"<hr>Ymweliad diwethaf: %1"
-"<br>Ymweliad cyntaf: %2"
-"<br>Nifer ymweliadau: %3</qt>"
+"Are you sure you wish to remove the bookmark\n"
+"\"%1\"?"
+msgstr "Ydych wir eisiau gwaredu'r tudnod yma?"
+
+#: sidebar/trees/bookmark_module/bookmark_module.cpp:310
+#, fuzzy
+msgid "Bookmark Folder Deletion"
+msgstr "Golygydd Tudnodau"
+
+#: sidebar/trees/bookmark_module/bookmark_module.cpp:311
+#, fuzzy
+msgid "Bookmark Deletion"
+msgstr "Golygydd Tudnodau"
+
+#: sidebar/trees/bookmark_module/bookmark_module.cpp:353
+#, fuzzy
+msgid "Bookmark Properties"
+msgstr "Gwaredu Priodweddau Plygell"
 
 #: sidebar/trees/history_module/kcmhistory.cpp:68
 #: sidebar/trees/history_module/kcmhistory.cpp:73
@@ -2712,84 +2782,72 @@ msgid ""
 "Minutes"
 msgstr ""
 
-#: sidebar/trees/dirtree_module/dirtree_module.cpp:422
-#, fuzzy
-msgid "Cannot find parent item %1 in the tree. Internal error."
-msgstr "Methu canfod eitem riant %1 yn y goeden. Gwall mewnol."
-
-#: sidebar/trees/bookmark_module/bookmark_module.cpp:59
-msgid "&Create New Folder"
-msgstr "&Creu Plygell Newydd"
-
-#: sidebar/trees/bookmark_module/bookmark_module.cpp:61
-#: sidebar/trees/konq_sidebartree.cpp:905
-msgid "Delete Folder"
-msgstr "Dileu Plygell"
-
-#: sidebar/trees/bookmark_module/bookmark_module.cpp:63
-msgid "Delete Bookmark"
-msgstr "Dileu y Tudnod"
+#: sidebar/trees/history_module/history_module.cpp:351
+#: sidebar/trees/history_module/kcmhistory.cpp:263
+msgid "Do you really want to clear the entire history?"
+msgstr "Ydych wir am glirio'r hanes gyfan?"
 
-#: sidebar/trees/bookmark_module/bookmark_module.cpp:73
-#: sidebar/trees/konq_sidebartree.cpp:917
-msgid "Copy Link Address"
-msgstr "Copïo Cyfeiriad Cyswllt"
+#: sidebar/trees/history_module/history_module.cpp:353
+#: sidebar/trees/history_module/kcmhistory.cpp:265
+msgid "Clear History?"
+msgstr "Clirio'r Hanes?"
 
-#: sidebar/trees/bookmark_module/bookmark_module.cpp:308
-#, fuzzy
+#: sidebar/trees/history_module/history_item.cpp:121
 msgid ""
-"Are you sure you wish to remove the bookmark folder\n"
-"\"%1\"?"
-msgstr "Ydych wir eisiau gwaredu'r plygell tudnodau yma?"
+"<qt>"
+"<center><b>%4</b></center>"
+"<hr>Last visited: %1"
+"<br>First visited: %2"
+"<br>Number of times visited: %3</qt>"
+msgstr ""
+"<qt>"
+"<center><b>%4</b></center>"
+"<hr>Ymweliad diwethaf: %1"
+"<br>Ymweliad cyntaf: %2"
+"<br>Nifer ymweliadau: %3</qt>"
 
-#: sidebar/trees/bookmark_module/bookmark_module.cpp:309
-#, fuzzy
-msgid ""
-"Are you sure you wish to remove the bookmark\n"
-"\"%1\"?"
-msgstr "Ydych wir eisiau gwaredu'r tudnod yma?"
+#: sidebar/trees/history_module/history_module.cpp:80
+msgid "&Remove Entry"
+msgstr "&Gwaredu Cofnod"
 
-#: sidebar/trees/bookmark_module/bookmark_module.cpp:310
-#, fuzzy
-msgid "Bookmark Folder Deletion"
-msgstr "Golygydd Tudnodau"
+#: sidebar/trees/history_module/history_module.cpp:82
+msgid "C&lear History"
+msgstr "C&lirio'r Hanes"
 
-#: sidebar/trees/bookmark_module/bookmark_module.cpp:311
-#, fuzzy
-msgid "Bookmark Deletion"
-msgstr "Golygydd Tudnodau"
+#: sidebar/trees/history_module/history_module.cpp:88
+msgid "By &Name"
+msgstr "Gan &Enw"
 
-#: sidebar/trees/bookmark_module/bookmark_module.cpp:353
-#, fuzzy
-msgid "Bookmark Properties"
-msgstr "Gwaredu Priodweddau Plygell"
+#: sidebar/trees/history_module/history_module.cpp:93
+msgid "By &Date"
+msgstr "Gan &Ddyddiad"
 
-#: sidebar/trees/konq_sidebartree.cpp:903
+#: sidebar/trees/konq_sidebartree.cpp:914
 msgid "&Create New Folder..."
 msgstr "&Creu Plygell Newydd..."
 
-#: sidebar/trees/konq_sidebartree.cpp:909
+#: sidebar/trees/konq_sidebartree.cpp:920
 #, fuzzy
 msgid "Delete Link"
 msgstr "&Dileu Proffil"
 
-#: sidebar/trees/konq_sidebartree.cpp:955
+#: sidebar/trees/konq_sidebartree.cpp:966
 msgid "New Folder"
 msgstr "Plygell Newydd:"
 
-#: sidebar/trees/konq_sidebartree.cpp:959
+#: sidebar/trees/konq_sidebartree.cpp:970
 msgid "Create New Folder"
 msgstr "Creu Plygell Newydd"
 
-#: sidebar/trees/konq_sidebartree.cpp:960
+#: sidebar/trees/konq_sidebartree.cpp:971
 msgid "Enter folder name:"
 msgstr "Rhowch enw'r blygell:"
 
-#: sidebar/sidebar_widget.cpp:116
+#: sidebar/sidebar_widget.cpp:117
 msgid "Rollback to System Default"
 msgstr "Rholio'n ôl i Ragosodyn y Cysawd"
 
-#: sidebar/sidebar_widget.cpp:122
+#: sidebar/sidebar_widget.cpp:123
 msgid ""
 "<qt>This removes all your entries from the sidebar and adds the system default "
 "ones.<BR><B>This procedure is irreversible</B><BR>Do you want to proceed?</qt>"
@@ -2798,58 +2856,58 @@ msgstr ""
 "cysawd.<BR><B>Nid oes modd datwneud y weithred hon</B>.<BR>"
 "A ydych am fynd ymlaen?</qt>"
 
-#: sidebar/sidebar_widget.cpp:277
+#: sidebar/sidebar_widget.cpp:278
 msgid "Add New"
 msgstr "Ychwanegu Un Newydd"
 
-#: sidebar/sidebar_widget.cpp:278
+#: sidebar/sidebar_widget.cpp:279
 msgid "Multiple Views"
 msgstr "Golygon Lluosol"
 
-#: sidebar/sidebar_widget.cpp:279
+#: sidebar/sidebar_widget.cpp:280
 msgid "Show Tabs Left"
 msgstr "Dangos Tabiau ar y Chwith"
 
-#: sidebar/sidebar_widget.cpp:280
+#: sidebar/sidebar_widget.cpp:281
 msgid "Show Configuration Button"
 msgstr "Dangos Botwm Ffurfweddu"
 
-#: sidebar/sidebar_widget.cpp:283
+#: sidebar/sidebar_widget.cpp:284
 msgid "Close Navigation Panel"
 msgstr "Cau'r Panel Llywio"
 
-#: sidebar/sidebar_widget.cpp:346
+#: sidebar/sidebar_widget.cpp:347
 msgid "This entry already exists."
 msgstr "Mae'r gofnod hon yn bodoli eisioes."
 
-#: sidebar/sidebar_widget.cpp:360 sidebar/web_module/web_module.cpp:210
+#: sidebar/sidebar_widget.cpp:361 sidebar/web_module/web_module.cpp:210
 msgid "Web SideBar Plugin"
 msgstr "Ategyn Bar Ochr Gwê"
 
-#: sidebar/sidebar_widget.cpp:506
+#: sidebar/sidebar_widget.cpp:507
 msgid "Enter a URL:"
 msgstr "Rhowch URL:"
 
-#: sidebar/sidebar_widget.cpp:514
+#: sidebar/sidebar_widget.cpp:515
 #, fuzzy
 msgid "<qt><b>%1</b> does not exist</qt>"
 msgstr "<qt>Nid yw <b>%1</b> yn bodoli<qt>"
 
-#: sidebar/sidebar_widget.cpp:531
+#: sidebar/sidebar_widget.cpp:532
 msgid "<qt>Do you really want to remove the <b>%1</b> tab?</qt>"
 msgstr "<qt>Ydych wir am waredu'r tab<b>%1</b>?</qt>"
 
-#: sidebar/sidebar_widget.cpp:546
+#: sidebar/sidebar_widget.cpp:547
 #, fuzzy
 msgid "Set Name"
 msgstr "Enw"
 
-#: sidebar/sidebar_widget.cpp:546
+#: sidebar/sidebar_widget.cpp:547
 #, fuzzy
 msgid "Enter the name:"
 msgstr "Mewnosodwch enw cyfeiriadur:"
 
-#: sidebar/sidebar_widget.cpp:634
+#: sidebar/sidebar_widget.cpp:635
 msgid ""
 "You have hidden the navigation panel configuration button. To make it visible "
 "again, click the right mouse button on any of the navigation panel buttons and "
@@ -2859,28 +2917,28 @@ msgstr ""
 "dde y llygoden ar unrhyw fotwm ar y panel llywio a dewiswch \"Dangos Botwm "
 "Ffurfweddu\"."
 
-#: sidebar/sidebar_widget.cpp:733
+#: sidebar/sidebar_widget.cpp:734
 msgid "Configure Sidebar"
 msgstr "Ffurfweddu Bar Ochr"
 
-#: sidebar/sidebar_widget.cpp:858
+#: sidebar/sidebar_widget.cpp:859
 #, fuzzy
 msgid "Set Name..."
 msgstr "Gosod URL..."
 
-#: sidebar/sidebar_widget.cpp:859
+#: sidebar/sidebar_widget.cpp:860
 msgid "Set URL..."
 msgstr "Gosod URL..."
 
-#: sidebar/sidebar_widget.cpp:860
+#: sidebar/sidebar_widget.cpp:861
 msgid "Set Icon..."
 msgstr "Gosod Eicon..."
 
-#: sidebar/sidebar_widget.cpp:864
+#: sidebar/sidebar_widget.cpp:865
 msgid "Configure Navigation Panel"
 msgstr "Ffurfweddu'r Panel Llywio"
 
-#: sidebar/sidebar_widget.cpp:928
+#: sidebar/sidebar_widget.cpp:929
 msgid "Unknown"
 msgstr "Anhysbys"
 
@@ -2896,10 +2954,6 @@ msgstr "munud"
 msgid " sec"
 msgstr "eil"
 
-#: sidebar/konqsidebar.cpp:118
-msgid "Extended Sidebar"
-msgstr "Bar Ochr Estynedig"
-
 #: sidebar/trees/bookmark_module/bookmark_module.h:85
 msgid "Add Bookmark"
 msgstr "Ychwanegu Tudnod"
@@ -2927,6 +2981,16 @@ msgstr ""
 " owaing@oceanfree.net\n"
 "kyfieithu@dotmon.com"
 
+#~ msgid "Open the document in a new tab"
+#~ msgstr "Agor y ddogfen mewn tab newydd"
+
+#, fuzzy
+#~ msgid "Cannot find parent item %1 in the tree. Internal error."
+#~ msgstr "Methu canfod eitem riant %1 yn y goeden. Gwall mewnol."
+
+#~ msgid "Extended Sidebar"
+#~ msgstr "Bar Ochr Estynedig"
+
 #~ msgid " day"
 #~ msgstr "diwrnod"
 
@@ -3064,12 +3128,6 @@ msgstr ""
 #~ msgid "Directory"
 #~ msgstr "Cyfeiriadur"
 
-#~ msgid "Open in &Background Tab"
-#~ msgstr "Agor mewn Tab Cefn&dir"
-
-#~ msgid "Open the document in a new background tab"
-#~ msgstr "Agor y ddogfen mewn tab cefndir newydd"
-
 #~ msgid "Exit Full-Screen Mode"
 #~ msgstr "Gadael Modd Sgrîn-Lawn"
 
diff --git a/tde-i18n-cy/messages/tdebase/konsole.po b/tde-i18n-cy/messages/tdebase/konsole.po
index 47d9a9016e4..058e8978bdf 100644
--- a/tde-i18n-cy/messages/tdebase/konsole.po
+++ b/tde-i18n-cy/messages/tdebase/konsole.po
@@ -10,21 +10,22 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: konsole\n"
-"POT-Creation-Date: 2007-08-03 01:12+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-12-27 14:17+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.2\n"
 "\n"
 
-#: TEWidget.cpp:947 TEWidget.cpp:949
+#: TEWidget.cpp:964 TEWidget.cpp:966
 msgid "Size: XXX x XXX"
 msgstr "Maint: XXX x XXX"
 
-#: TEWidget.cpp:954
+#: TEWidget.cpp:971
 msgid "Size: %1 x %2"
 msgstr "Maint: %1 x %2"
 
@@ -40,234 +41,256 @@ msgid ""
 "Your emails"
 msgstr "kyfieithu@dotmon.com"
 
-#: konsole.cpp:489 konsole_part.cpp:327
+#: konsole.cpp:215
+#, fuzzy
+msgid "&Session"
+msgstr "Sesiwn"
+
+#: konsole.cpp:219
+#, fuzzy
+msgid "Se&ttings"
+msgstr "Gosodiadau"
+
+#: konsole.cpp:524 konsole_part.cpp:328
 msgid "&Suspend Task"
 msgstr "&Seibio Tasg"
 
-#: konsole.cpp:490 konsole_part.cpp:328
+#: konsole.cpp:525 konsole_part.cpp:329
 msgid "&Continue Task"
 msgstr "Ail&ddechrau Tasg"
 
-#: konsole.cpp:491 konsole_part.cpp:329
+#: konsole.cpp:526 konsole_part.cpp:330
 msgid "&Hangup"
 msgstr "&Rhoi Pen ar Dasg"
 
-#: konsole.cpp:492 konsole_part.cpp:330
+#: konsole.cpp:527 konsole_part.cpp:331
 msgid "&Interrupt Task"
 msgstr "&Ymyrru Tasg"
 
-#: konsole.cpp:493 konsole_part.cpp:331
+#: konsole.cpp:528 konsole_part.cpp:332
 msgid "&Terminate Task"
 msgstr "&Terfynu Tasg"
 
-#: konsole.cpp:494 konsole_part.cpp:332
+#: konsole.cpp:529 konsole_part.cpp:333
 msgid "&Kill Task"
 msgstr "&Lladd Tasg"
 
-#: konsole.cpp:495 konsole_part.cpp:333
+#: konsole.cpp:530 konsole_part.cpp:334
 msgid "User Signal &1"
 msgstr "Arwydd Defnyddiwr &1"
 
-#: konsole.cpp:496 konsole_part.cpp:334
+#: konsole.cpp:531 konsole_part.cpp:335
 msgid "User Signal &2"
 msgstr "Arwydd Defnyddiwr &2"
 
-#: konsole.cpp:507 konsole.cpp:722 konsole_part.cpp:470
+#: konsole.cpp:542 konsole.cpp:762 konsole_part.cpp:476
 msgid "&Send Signal"
 msgstr "Anfon &Arwydd"
 
-#: konsole.cpp:581
+#: konsole.cpp:616
 msgid "&Tab Bar"
 msgstr "B&ar Tab"
 
-#: konsole.cpp:584 konsole.cpp:592 konsole_part.cpp:348
+#: konsole.cpp:619 konsole.cpp:627 konsole_part.cpp:349
 msgid "&Hide"
 msgstr "C&uddio"
 
-#: konsole.cpp:584
+#: konsole.cpp:619
 msgid "&Top"
 msgstr "&Pen"
 
-#: konsole.cpp:589 konsole_part.cpp:344
+#: konsole.cpp:624 konsole_part.cpp:345
 msgid "Sc&rollbar"
 msgstr "&Bar Sgrolio"
 
-#: konsole.cpp:592 konsole_part.cpp:348
+#: konsole.cpp:627 konsole_part.cpp:349
 msgid "&Left"
 msgstr "&Chwith"
 
-#: konsole.cpp:592 konsole_part.cpp:348
+#: konsole.cpp:627 konsole_part.cpp:349
 msgid "&Right"
 msgstr "&Dde"
 
-#: konsole.cpp:605 konsole_part.cpp:354
+#: konsole.cpp:640 konsole_part.cpp:355
 msgid "&Bell"
 msgstr "C&loch"
 
-#: konsole.cpp:608 konsole_part.cpp:358
+#: konsole.cpp:643 konsole_part.cpp:359
 msgid "System &Bell"
 msgstr "C&loch Cysawd"
 
-#: konsole.cpp:609 konsole_part.cpp:359
+#: konsole.cpp:644 konsole_part.cpp:360
 msgid "System &Notification"
 msgstr "&Hysbysiad Cysawd"
 
-#: konsole.cpp:610 konsole_part.cpp:360
+#: konsole.cpp:645 konsole_part.cpp:361
 msgid "&Visible Bell"
 msgstr "Cloch &Gweladwy"
 
-#: konsole.cpp:611 konsole_part.cpp:361
+#: konsole.cpp:646 konsole_part.cpp:362
 msgid "N&one"
 msgstr "&Dim"
 
-#: konsole.cpp:619 konsole_part.cpp:366
+#: konsole.cpp:654 konsole_part.cpp:367
 msgid "&Enlarge Font"
 msgstr "&Cynyddu Maint yr Wynebfath"
 
-#: konsole.cpp:623 konsole_part.cpp:367
+#: konsole.cpp:658 konsole_part.cpp:368
 msgid "&Shrink Font"
 msgstr "&Lleihau Wynebfath"
 
-#: konsole.cpp:627 konsole_part.cpp:368
+#: konsole.cpp:662 konsole_part.cpp:369
 msgid "Se&lect..."
 msgstr "De&wis..."
 
-#: konsole.cpp:633
+#: konsole.cpp:668
 msgid "&Install Bitmap..."
 msgstr ""
 
-#: konsole.cpp:641 konsole_part.cpp:372
+#: konsole.cpp:676 konsole_part.cpp:373
 msgid "&Encoding"
 msgstr "A&mgodiad"
 
-#: konsole.cpp:649 konsole_part.cpp:385
+#: konsole.cpp:684 konsole_part.cpp:386
 msgid "&Keyboard"
 msgstr "All&weddell"
 
-#: konsole.cpp:653 konsole_part.cpp:395
+#: konsole.cpp:688 konsole_part.cpp:396
 msgid "Sch&ema"
 msgstr "S&cema"
 
-#: konsole.cpp:658
+#: konsole.cpp:693
 msgid "S&ize"
 msgstr "&Maint"
 
-#: konsole.cpp:661
+#: konsole.cpp:696
 msgid "40x15 (&Small)"
 msgstr "40x15 (&Bach)"
 
-#: konsole.cpp:662
+#: konsole.cpp:697
 msgid "80x24 (&VT100)"
 msgstr "80x24 (&VT100)"
 
-#: konsole.cpp:663
+#: konsole.cpp:698
 msgid "80x25 (&IBM PC)"
 msgstr "80x25 (&IBM PC)"
 
-#: konsole.cpp:664
+#: konsole.cpp:699
 msgid "80x40 (&XTerm)"
 msgstr "80x40 (&XTerm)"
 
-#: konsole.cpp:665
+#: konsole.cpp:700
 msgid "80x52 (IBM V&GA)"
 msgstr "80x52 (IBM V&GA)"
 
-#: konsole.cpp:667
+#: konsole.cpp:702
 msgid "&Custom..."
 msgstr "&Addasu..."
 
-#: konsole.cpp:672
+#: konsole.cpp:707
 msgid "Hist&ory..."
 msgstr "&Hanes..."
 
-#: konsole.cpp:678 konsole_part.cpp:447
+#: konsole.cpp:713 konsole_part.cpp:453
 msgid "&Save as Default"
 msgstr "&Cadw fel Rhagosodyn"
 
-#: konsole.cpp:701
+#: konsole.cpp:736
 msgid "&Tip of the Day"
 msgstr "&Cymhorthyn y Dydd"
 
-#: konsole.cpp:715 konsole_part.cpp:456
+#: konsole.cpp:750 konsole_part.cpp:462
 msgid "Set Selection End"
 msgstr "Gosod Diwedd y Dewisiad"
 
-#: konsole.cpp:726
+#: konsole.cpp:758
+msgid "&Open.."
+msgstr ""
+
+#: konsole.cpp:766
 msgid "New Sess&ion"
 msgstr "Ses&iwn Newydd "
 
-#: konsole.cpp:739 konsole_part.cpp:476
+#: konsole.cpp:779 konsole_part.cpp:482
 msgid "S&ettings"
 msgstr "G&osodiadau"
 
-#: konsole.cpp:794 konsole.cpp:1076
+#: konsole.cpp:836 konsole.cpp:1139
 msgid "&Detach Session"
 msgstr "&Datglymu'r Sesiwn"
 
-#: konsole.cpp:797 konsole.cpp:1080
+#: konsole.cpp:841 konsole.cpp:1144
 msgid "&Rename Session..."
 msgstr "&Ailenwi'r Sesiwn..."
 
-#: konsole.cpp:801 konsole.cpp:1089
+#: konsole.cpp:845 konsole.cpp:1153
 msgid "Monitor for &Activity"
 msgstr "Archwilio am &Weithgarwch"
 
-#: konsole.cpp:803 konsole.cpp:1092
+#: konsole.cpp:847 konsole.cpp:1156
 #, fuzzy
 msgid "Stop Monitoring for &Activity"
 msgstr "Archwilio am &Weithgarwch"
 
-#: konsole.cpp:806 konsole.cpp:1094
+#: konsole.cpp:850 konsole.cpp:1158
 msgid "Monitor for &Silence"
 msgstr "Archwilio am &Dawelwch"
 
-#: konsole.cpp:808 konsole.cpp:1097
+#: konsole.cpp:852 konsole.cpp:1161
 #, fuzzy
 msgid "Stop Monitoring for &Silence"
 msgstr "Archwilio am &Dawelwch"
 
-#: konsole.cpp:811 konsole.cpp:1099
+#: konsole.cpp:855 konsole.cpp:1163
 msgid "Send &Input to All Sessions"
 msgstr "Anfon &Mewnbwn i Bob Sesiwn"
 
-#: konsole.cpp:816
+#: konsole.cpp:862 konsole.cpp:1196
+msgid "&Move Session Left"
+msgstr "&Symud Sesiwn i'r Chwith"
+
+#: konsole.cpp:869 konsole.cpp:1202
+msgid "M&ove Session Right"
+msgstr "S&ymud Sesiwn i'r Dde"
+
+#: konsole.cpp:876
 msgid "Select &Tab Color..."
 msgstr ""
 
-#: konsole.cpp:820
+#: konsole.cpp:880
 msgid "Switch to Tab"
 msgstr "Newid i Dab"
 
-#: konsole.cpp:825 konsole.cpp:1119 konsole.cpp:1201 konsole.cpp:2992
+#: konsole.cpp:885 konsole.cpp:1183 konsole.cpp:1271 konsole.cpp:3088
 msgid "C&lose Session"
 msgstr "Ca&u Sesiwn"
 
-#: konsole.cpp:835
+#: konsole.cpp:895
 msgid "Tab &Options"
 msgstr "Dewi&siadau Tab"
 
-#: konsole.cpp:837
+#: konsole.cpp:897
 #, fuzzy
 msgid "&Text && Icons"
 msgstr "T&estun && Eiconau"
 
-#: konsole.cpp:837
+#: konsole.cpp:897
 msgid "Text &Only"
 msgstr "Testu&n yn Unig"
 
-#: konsole.cpp:837
+#: konsole.cpp:897
 msgid "&Icons Only"
 msgstr "Ei&conau yn Unig"
 
-#: konsole.cpp:844
+#: konsole.cpp:904
 msgid "&Dynamic Hide"
 msgstr "&Cuddio yn Ddeinameg"
 
-#: konsole.cpp:849
+#: konsole.cpp:909
 msgid "&Auto Resize Tabs"
 msgstr ""
 
-#: konsole.cpp:917
+#: konsole.cpp:978
 msgid ""
 "Click for new standard session\n"
 "Click and hold for session menu"
@@ -275,113 +298,97 @@ msgstr ""
 "Cliciwch ar gyfer sesiwn safonol newydd\n"
 "Clicwch a gafael ar gyfer dewislen sesiwn"
 
-#: konsole.cpp:926
+#: konsole.cpp:987
 #, fuzzy
 msgid "Close the current session"
 msgstr "Ca&u Sesiwn"
 
-#: konsole.cpp:1030
-msgid "Session"
-msgstr "Sesiwn"
-
-#: konsole.cpp:1036
-msgid "Settings"
-msgstr "Gosodiadau"
-
-#: konsole.cpp:1046
+#: konsole.cpp:1107
 msgid "Paste Selection"
 msgstr "Gludo'r Dewisiad"
 
-#: konsole.cpp:1049
+#: konsole.cpp:1110
 msgid "C&lear Terminal"
 msgstr "C&lirio'r Derfynell"
 
-#: konsole.cpp:1051
+#: konsole.cpp:1112
 msgid "&Reset && Clear Terminal"
 msgstr "&Ailosod a Chlirio'r Derfynell"
 
-#: konsole.cpp:1053
+#: konsole.cpp:1114
 msgid "&Find in History..."
 msgstr "&Canfod yn yr Hanes..."
 
-#: konsole.cpp:1061
+#: konsole.cpp:1122
 msgid "Find Pre&vious"
 msgstr "Canfod Blae&norol"
 
-#: konsole.cpp:1065
+#: konsole.cpp:1126
 msgid "S&ave History As..."
 msgstr "C&adw'r Hanes Fel..."
 
-#: konsole.cpp:1069
+#: konsole.cpp:1130
 msgid "Clear &History"
 msgstr "Clirio'r &Hanes"
 
-#: konsole.cpp:1073
+#: konsole.cpp:1134
 msgid "Clear All H&istories"
 msgstr "Clirio &Pob Hanes"
 
-#: konsole.cpp:1084
+#: konsole.cpp:1148
 msgid "&ZModem Upload..."
 msgstr "Fyny-lwytho â &ZModem..."
 
-#: konsole.cpp:1104
+#: konsole.cpp:1168
 msgid "Hide &Menubar"
 msgstr "Cuddio Bar &Dewislen"
 
-#: konsole.cpp:1110
+#: konsole.cpp:1174
 msgid "Save Sessions &Profile..."
 msgstr "Cadw &Proffil Sesiwn..."
 
-#: konsole.cpp:1121
+#: konsole.cpp:1185
 msgid "&Print Screen..."
 msgstr "&Argraffu'r Sgrîn..."
 
-#: konsole.cpp:1126
+#: konsole.cpp:1190
 msgid "New Session"
 msgstr "Sesiwn Newydd"
 
-#: konsole.cpp:1127
+#: konsole.cpp:1191
 msgid "Activate Menu"
 msgstr "Gweithredu'r Ddewislen"
 
-#: konsole.cpp:1128
+#: konsole.cpp:1192
 msgid "List Sessions"
 msgstr "Rhestru Sesiynau"
 
-#: konsole.cpp:1130
-msgid "&Move Session Left"
-msgstr "&Symud Sesiwn i'r Chwith"
-
-#: konsole.cpp:1133
-msgid "M&ove Session Right"
-msgstr "S&ymud Sesiwn i'r Dde"
-
-#: konsole.cpp:1137
+#: konsole.cpp:1207
 msgid "Go to Previous Session"
 msgstr "Ewch i'r Sesiwn Blaenorol"
 
-#: konsole.cpp:1139
+#: konsole.cpp:1209
 msgid "Go to Next Session"
 msgstr "Ewch i'r Sesiwn Canlynol"
 
-#: konsole.cpp:1143
+#: konsole.cpp:1213
 #, fuzzy, c-format
 msgid "Switch to Session %1"
 msgstr "Newid i Sesiwn 1"
 
-#: konsole.cpp:1146
+#: konsole.cpp:1216
 msgid "Enlarge Font"
 msgstr "Cynyddu Maint yr Wynebfath"
 
-#: konsole.cpp:1147
+#: konsole.cpp:1217
 msgid "Shrink Font"
 msgstr "Lleihau Wynebfath"
 
-#: konsole.cpp:1149
+#: konsole.cpp:1219
 msgid "Toggle Bidi"
 msgstr "Bidi (dwy-gyfeiriol) ai peidio"
 
-#: konsole.cpp:1196
+#: konsole.cpp:1266
 msgid ""
 "You have open sessions (besides the current one). These will be killed if you "
 "continue.\n"
@@ -391,11 +398,11 @@ msgstr ""
 "barhewch.\n"
 "A ydych yn sicr eich bod am adael?"
 
-#: konsole.cpp:1199
+#: konsole.cpp:1269
 msgid "Really Quit?"
 msgstr "Gadael, o ddifrif?"
 
-#: konsole.cpp:1232
+#: konsole.cpp:1302
 msgid ""
 "The application running in Konsole does not respond to the close request. Do "
 "you want Konsole to close anyway?"
@@ -403,47 +410,47 @@ msgstr ""
 "Nid yw'r cymhwysiad sy'n rhedeg o fewn Konsole yn ymateb i'r gais cau. A ydych "
 "am i Konsole gau serch hyn?"
 
-#: konsole.cpp:1234
+#: konsole.cpp:1304
 msgid "Application Does Not Respond"
 msgstr "Ni Ymateba'r Cymhwysiad"
 
-#: konsole.cpp:1417
+#: konsole.cpp:1484
 msgid "Save Sessions Profile"
 msgstr "Cadw Proffil Sesiwn"
 
-#: konsole.cpp:1418
+#: konsole.cpp:1485
 msgid "Enter name under which the profile should be saved:"
 msgstr "Rhowch enw i gadw'r proffil:"
 
-#: konsole.cpp:1809
+#: konsole.cpp:1887
 msgid ""
 "If you want to use the bitmap fonts distributed with Konsole, they must be "
 "installed.  After installation, you must restart Konsole to use them.  Do you "
 "want to install the fonts listed below into fonts:/Personal?"
 msgstr ""
 
-#: konsole.cpp:1811
+#: konsole.cpp:1889
 msgid "Install Bitmap Fonts?"
 msgstr ""
 
-#: konsole.cpp:1812
+#: konsole.cpp:1890
 msgid "&Install"
 msgstr "&Gosod"
 
-#: konsole.cpp:1813
+#: konsole.cpp:1891
 #, fuzzy
 msgid "Do Not Install"
 msgstr "&Gosod"
 
-#: konsole.cpp:1825
+#: konsole.cpp:1903
 msgid "Could not install %1 into fonts:/Personal/"
 msgstr ""
 
-#: konsole.cpp:1909
+#: konsole.cpp:1987
 msgid "Use the right mouse button to bring back the menu"
 msgstr "Defnyddiwch botwm dde'r lygoden i adfer y ddewislen"
 
-#: konsole.cpp:2034
+#: konsole.cpp:2112
 msgid ""
 "You have chosen one or more Ctrl+<key> combinations to be used as shortcuts. As "
 "a result these key combinations will no longer be passed to the command shell "
@@ -457,83 +464,88 @@ msgid ""
 "You are currently using the following Ctrl+<key> combinations:"
 msgstr ""
 
-#: konsole.cpp:2044
+#: konsole.cpp:2122
 msgid "Choice of Shortcut Keys"
 msgstr ""
 
-#: konsole.cpp:2431
+#: konsole.cpp:2525
 msgid ""
 "_: abbreviation of number\n"
 "%1 No. %2"
 msgstr "%1 Rh. %2"
 
-#: konsole.cpp:2486
+#: konsole.cpp:2580
 msgid "Session List"
 msgstr "Rhestr Sesiynau"
 
-#: konsole.cpp:2991
+#: konsole.cpp:3087
 msgid "Are you sure that you want to close the current session?"
 msgstr ""
 
-#: konsole.cpp:2992
+#: konsole.cpp:3088
 #, fuzzy
 msgid "Close Confirmation"
 msgstr "Ffurfwedd Maint"
 
-#: konsole.cpp:3373 konsole.cpp:3431 konsole.cpp:3452
+#: konsole.cpp:3467 konsole.cpp:3525 konsole.cpp:3546
 msgid "New "
 msgstr "Newydd"
 
-#: konsole.cpp:3417 konsole.cpp:3419 konsole.cpp:3435 konsole.cpp:3437
+#: konsole.cpp:3511 konsole.cpp:3513 konsole.cpp:3529 konsole.cpp:3531
 msgid "New &Window"
 msgstr "&Ffenestr Newydd"
 
-#: konsole.cpp:3461
+#: konsole.cpp:3555
 msgid "New Shell at Bookmark"
 msgstr "Plisgyn Newydd wrth Nôd Tudalen"
 
-#: konsole.cpp:3464
+#: konsole.cpp:3558
 msgid "Shell at Bookmark"
 msgstr "Plisgyn wrth Nôd Tudalen"
 
-#: konsole.cpp:3475
+#: konsole.cpp:3569
 #, c-format
 msgid ""
 "_: Screen is a program controlling screens!\n"
 "Screen at %1"
 msgstr "Sgrîn (rhaglen) wrth %1"
 
-#: konsole.cpp:3788
+#: konsole.cpp:3888
 msgid "Rename Session"
 msgstr "Ailenwi Sesiwn"
 
-#: konsole.cpp:3789
+#: konsole.cpp:3889
 msgid "Session name:"
 msgstr "Enw sesiwn:"
 
-#: konsole.cpp:3824 konsole_part.cpp:969
+#: konsole.cpp:3924 konsole_part.cpp:996
 msgid "History Configuration"
 msgstr "Ffurfweddu Hanes"
 
-#: konsole.cpp:3832 konsole_part.cpp:977
+#: konsole.cpp:3932 konsole_part.cpp:1004
 msgid "&Enable"
 msgstr "&Galluogi"
 
-#: konsole.cpp:3835
+#: konsole.cpp:3935
 msgid "&Number of lines: "
 msgstr "&Nifer llinellau:"
 
-#: konsole.cpp:3839 konsole_part.cpp:984
+#: konsole.cpp:3939 konsole_part.cpp:1011
 msgid ""
 "_: Unlimited (number of lines)\n"
 "Unlimited"
 msgstr "Heb derfyn"
 
-#: konsole.cpp:3843 konsole_part.cpp:986
+#: konsole.cpp:3943 konsole_part.cpp:1013
 msgid "&Set Unlimited"
 msgstr "&Gosod Heb Derfyn"
 
-#: konsole.cpp:4000
+#: konsole.cpp:4071
+#, c-format
+msgid "%1"
+msgstr ""
+
+#: konsole.cpp:4128
 msgid ""
 "End of history reached.\n"
 "Continue from the beginning?"
@@ -541,11 +553,11 @@ msgstr ""
 "Cyrhaeddwyd diwedd yr hanes.\n"
 "Mynd ymlaen o'r dechrau?"
 
-#: konsole.cpp:4001 konsole.cpp:4009 konsole.cpp:4018
+#: konsole.cpp:4129 konsole.cpp:4137 konsole.cpp:4146
 msgid "Find"
 msgstr "Canfod"
 
-#: konsole.cpp:4008
+#: konsole.cpp:4136
 msgid ""
 "Beginning of history reached.\n"
 "Continue from the end?"
@@ -553,21 +565,21 @@ msgstr ""
 "Cyrhaeddwyd dechrau yr hanes.\n"
 "Mynd ymlaen o'r diwedd?"
 
-#: konsole.cpp:4017
+#: konsole.cpp:4145
 msgid "Search string '%1' not found."
 msgstr "Ni ganfuwyd y llinyn chwilio '%1'."
 
-#: konsole.cpp:4034
+#: konsole.cpp:4162
 msgid "Save History"
 msgstr "Cadw Hanes"
 
-#: konsole.cpp:4040
+#: konsole.cpp:4168
 msgid ""
 "This is not a local file.\n"
 msgstr ""
 "Nid yw hon yn ffeil lleol.\n"
 
-#: konsole.cpp:4050
+#: konsole.cpp:4178
 msgid ""
 "A file with this name already exists.\n"
 "Do you want to overwrite it?"
@@ -575,28 +587,28 @@ msgstr ""
 "Bodola ffeil o'r enw yma eisioes.\n"
 "A ydych am ei throsysgrifennu?"
 
-#: konsole.cpp:4050
+#: konsole.cpp:4178
 msgid "File Exists"
 msgstr "Ffeil yn Bodoli"
 
-#: konsole.cpp:4050
+#: konsole.cpp:4178
 msgid "Overwrite"
 msgstr "Trosysgrifo"
 
-#: konsole.cpp:4055
+#: konsole.cpp:4183
 msgid "Unable to write to file."
 msgstr "Methu ysgrifennu i'r ffeil"
 
-#: konsole.cpp:4065
+#: konsole.cpp:4193
 msgid "Could not save history."
 msgstr "Methwyd cadw'r hanes."
 
-#: konsole.cpp:4076
+#: konsole.cpp:4204
 msgid "<p>The current session already has a ZModem file transfer in progress."
 msgstr ""
 "<p>Mae trosglwyddiad ffeil ZModem ar waith yn barod yn y sesiwn cyfredol."
 
-#: konsole.cpp:4085
+#: konsole.cpp:4213
 msgid ""
 "<p>No suitable ZModem software was found on the system.\n"
 "<p>You may wish to install the 'rzsz' or 'lrzsz' package.\n"
@@ -604,11 +616,11 @@ msgstr ""
 "<p>Ni ganfuwyd meddalwedd ZModem addas ar y cysawd.\n"
 "<p>Efallai hoffech osod y pecyn 'rzsz' neu'r un 'lrzsz'.\n"
 
-#: konsole.cpp:4092
+#: konsole.cpp:4220
 msgid "Select Files to Upload"
 msgstr "Dewiswch Ffeiliau i Fyny-lwytho"
 
-#: konsole.cpp:4112
+#: konsole.cpp:4240
 msgid ""
 "<p>A ZModem file transfer attempt has been detected, but no suitable ZModem "
 "software was found on the system.\n"
@@ -618,7 +630,7 @@ msgstr ""
 "ZModem addas ar y cysawd.\n"
 "<p>Efallai hoffech osod y pecyn 'rzsz' neu'r un 'lrzsz'.\n"
 
-#: konsole.cpp:4119
+#: konsole.cpp:4247
 msgid ""
 "A ZModem file transfer attempt has been detected.\n"
 "Please specify the folder you want to store the file(s):"
@@ -626,117 +638,121 @@ msgstr ""
 "Darganfyddwyd cais trosglwyddiad ffeil ZModem.\n"
 "Dewiswch y blygell yr hoffech cadw'r ffeil(iau) ynddi:"
 
-#: konsole.cpp:4122
+#: konsole.cpp:4250
 msgid "&Download"
 msgstr "&Lawrlwytho"
 
-#: konsole.cpp:4123 konsole.cpp:4124
+#: konsole.cpp:4251 konsole.cpp:4252
 msgid "Start downloading file to specified folder."
 msgstr "Dechrau lawrlwytho i'r blygell benodol."
 
-#: konsole.cpp:4140
+#: konsole.cpp:4268
 #, c-format
 msgid "Print %1"
 msgstr "Argraffu %1"
 
-#: konsole.cpp:4167
+#: konsole.cpp:4295
 msgid "Size Configuration"
 msgstr "Ffurfwedd Maint"
 
-#: konsole.cpp:4181
+#: konsole.cpp:4309
 msgid "Number of columns:"
 msgstr "Nifer colofnau:"
 
-#: konsole.cpp:4184 konsole_part.cpp:991
+#: konsole.cpp:4312 konsole_part.cpp:1018
 msgid "Number of lines:"
 msgstr "Nifel llinellau:"
 
-#: konsole.cpp:4212
+#: konsole.cpp:4340
 msgid "As &regular expression"
 msgstr "Fel &mynegiad rheolaidd"
 
-#: konsole.cpp:4215
+#: konsole.cpp:4343
 msgid "&Edit..."
 msgstr "&Golygu..."
 
-#: konsole_part.cpp:92 main.cpp:168
+#: konsole_part.cpp:92 main.cpp:165
 msgid "Konsole"
 msgstr "Konsole"
 
-#: konsole_part.cpp:399
+#: konsole_part.cpp:400
 msgid "&History..."
 msgstr "&Hanes..."
 
-#: konsole_part.cpp:405
+#: konsole_part.cpp:406
 msgid "Li&ne Spacing"
 msgstr "Bylchu Lli&nell"
 
-#: konsole_part.cpp:411
+#: konsole_part.cpp:412
 msgid "&0"
 msgstr "&0"
 
-#: konsole_part.cpp:412
+#: konsole_part.cpp:413
 msgid "&1"
 msgstr "&1"
 
-#: konsole_part.cpp:413
+#: konsole_part.cpp:414
 msgid "&2"
 msgstr "&2"
 
-#: konsole_part.cpp:414
+#: konsole_part.cpp:415
 msgid "&3"
 msgstr "&3"
 
-#: konsole_part.cpp:415
+#: konsole_part.cpp:416
 msgid "&4"
 msgstr "&4"
 
-#: konsole_part.cpp:416
+#: konsole_part.cpp:417
 msgid "&5"
 msgstr "&5"
 
-#: konsole_part.cpp:417
+#: konsole_part.cpp:418
 msgid "&6"
 msgstr "&6"
 
-#: konsole_part.cpp:418
+#: konsole_part.cpp:419
 msgid "&7"
 msgstr "&7"
 
-#: konsole_part.cpp:419
+#: konsole_part.cpp:420
 msgid "&8"
 msgstr "&8"
 
-#: konsole_part.cpp:424
+#: konsole_part.cpp:425
 msgid "Blinking &Cursor"
 msgstr "&Cyrchydd Amrantol"
 
-#: konsole_part.cpp:429
+#: konsole_part.cpp:430
 msgid "Show Fr&ame"
 msgstr "Dangos Ffr&âm"
 
-#: konsole_part.cpp:431
+#: konsole_part.cpp:432
 #, fuzzy
 msgid "Hide Fr&ame"
 msgstr "Dangos Ffr&âm"
 
-#: konsole_part.cpp:435
+#: konsole_part.cpp:436
+msgid "Me&ta key as Alt key"
+msgstr ""
+
+#: konsole_part.cpp:441
 msgid "Wor&d Connectors..."
 msgstr "Cysylltyddion &Geiriau..."
 
-#: konsole_part.cpp:441
+#: konsole_part.cpp:447
 msgid "&Use Konsole's Settings"
 msgstr ""
 
-#: konsole_part.cpp:480
+#: konsole_part.cpp:486
 msgid "&Close Terminal Emulator"
 msgstr "&Cau'r Efelychydd Terfynellau"
 
-#: konsole_part.cpp:919
+#: konsole_part.cpp:946
 msgid "Word Connectors"
 msgstr "Cysylltyddion Geiriau"
 
-#: konsole_part.cpp:920
+#: konsole_part.cpp:947
 msgid ""
 "Characters other than alphanumerics considered part of a word when double "
 "clicking:"
@@ -744,12 +760,12 @@ msgstr ""
 "Nôdau (heblaw am lythrennau a rhifau) i'w ystyrru fel rhan o air wrth glicio'n "
 "ddwbl:"
 
-#: kwrited.cpp:84
+#: kwrited.cpp:85
 #, c-format
 msgid "KWrited - Listening on Device %1"
 msgstr "KWrited - Yn gwrando ar ddyfais %1"
 
-#: kwrited.cpp:117
+#: kwrited.cpp:118
 msgid "Clear Messages"
 msgstr ""
 
@@ -806,103 +822,99 @@ msgstr "Peidio â dangos bar sgrolio"
 msgid "Do not use Xft (anti-aliasing)"
 msgstr "Peidio â defnyddio XFT (Gwrthamgenu)"
 
-#: main.cpp:79
-msgid "Enable experimental support for real transparency"
-msgstr ""
-
-#: main.cpp:81
+#: main.cpp:78
 msgid "Terminal size in columns x lines"
 msgstr "Maint terfynell mewn colofnau x llinellau"
 
-#: main.cpp:82
+#: main.cpp:79
 msgid "Terminal size is fixed"
 msgstr "Mae maint y derfynell yn osodedig"
 
-#: main.cpp:83
+#: main.cpp:80
 #, fuzzy
 msgid "Start with given session type"
 msgstr "Dechrau â phroffil sesiwn a roddwyd"
 
-#: main.cpp:84
+#: main.cpp:81
 #, fuzzy
 msgid "List available session types"
 msgstr "Rhestru'r mathau o sesiynau sydd ar gael."
 
-#: main.cpp:85
+#: main.cpp:82
 msgid "Set keytab to 'name'"
 msgstr ""
 
-#: main.cpp:86
+#: main.cpp:83
 #, fuzzy
 msgid "List available keytabs"
 msgstr "Rhestru'r mathau o broffilau sydd ar gael."
 
-#: main.cpp:87
+#: main.cpp:84
 #, fuzzy
 msgid "Start with given session profile"
 msgstr "Dechrau â phroffil sesiwn a roddwyd"
 
-#: main.cpp:88
+#: main.cpp:85
 #, fuzzy
 msgid "List available session profiles"
 msgstr "Rhestru'r mathau o sesiynau sydd ar gael."
 
-#: main.cpp:89
+#: main.cpp:86
 msgid "Set schema to 'name' or use 'file'"
 msgstr ""
 
-#: main.cpp:91
+#: main.cpp:88
 #, fuzzy
 msgid "List available schemata"
 msgstr "Rhestru'r mathau o broffilau sydd ar gael."
 
-#: main.cpp:92
+#: main.cpp:89
 #, fuzzy
 msgid "Enable extended DCOP Qt functions"
 msgstr "Galluogi swyddogaethau estynedig DCOP"
 
-#: main.cpp:93
+#: main.cpp:90
 #, fuzzy
 msgid "Change working directory to 'dir'"
 msgstr "Newid cyfeiriadur gwaith y konsole yn 'gyf'"
 
-#: main.cpp:94
+#: main.cpp:91
 msgid "Execute 'command' instead of shell"
 msgstr "Gweithredu 'gorchymyn' yn lle plisgyn"
 
-#: main.cpp:96
+#: main.cpp:93
 msgid "Arguments for 'command'"
 msgstr "Ymresymiadau i'r 'gorchymyn'"
 
-#: main.cpp:171
+#: main.cpp:168
 msgid "Maintainer"
 msgstr "Cynhaliwr"
 
-#: main.cpp:172
+#: main.cpp:169
 msgid "Author"
 msgstr "Awdur"
 
-#: main.cpp:174 main.cpp:177 main.cpp:180
+#: main.cpp:171 main.cpp:174 main.cpp:177
 msgid "bug fixing and improvements"
 msgstr "trwsio namau a gwelliannau"
 
-#: main.cpp:183 main.cpp:219 main.cpp:222 main.cpp:225 main.cpp:228
+#: main.cpp:180 main.cpp:216 main.cpp:219 main.cpp:222 main.cpp:225
 msgid "bug fixing"
 msgstr "trwsio namau"
 
-#: main.cpp:186
+#: main.cpp:183
 msgid "Solaris support and work on history"
 msgstr "cynhaliaeth Solaris a gwaith ar yr hanes"
 
-#: main.cpp:189
+#: main.cpp:186
 msgid "faster startup, bug fixing"
 msgstr "ymgychwyn cyflymach, trwsio namau"
 
-#: main.cpp:192
+#: main.cpp:189
 msgid "decent marking"
 msgstr "marcio da"
 
-#: main.cpp:195
+#: main.cpp:192
 msgid ""
 "partification\n"
 "Toolbar and session names"
@@ -910,7 +922,7 @@ msgstr ""
 "dyrannu\n"
 "Bar offer ac enwau sesiwn"
 
-#: main.cpp:199
+#: main.cpp:196
 msgid ""
 "partification\n"
 "overall improvements"
@@ -918,11 +930,11 @@ msgstr ""
 "dyrannu\n"
 "gwelliannau cyffredinol"
 
-#: main.cpp:203
+#: main.cpp:200
 msgid "transparency"
 msgstr "tryloywder"
 
-#: main.cpp:206
+#: main.cpp:203
 msgid ""
 "most of main.C donated via kvt\n"
 "overall improvements"
@@ -930,19 +942,19 @@ msgstr ""
 "rhoddwyd rhan fwyaf main.C drwy kvt\n"
 "gwelliannau cyffredinol"
 
-#: main.cpp:210
+#: main.cpp:207
 msgid "schema and selection improvements"
 msgstr "gwelliannau sgema a dewis"
 
-#: main.cpp:213
+#: main.cpp:210
 msgid "SGI Port"
 msgstr "Porthiad SGI"
 
-#: main.cpp:216
+#: main.cpp:213
 msgid "FreeBSD port"
 msgstr "Porthiad FreeBSD"
 
-#: main.cpp:230
+#: main.cpp:227
 msgid ""
 "Thanks to many others.\n"
 "The above list only reflects the contributors\n"
@@ -952,13 +964,13 @@ msgstr ""
 "Dengys y rhestr uchod y cyfranwyr y\n"
 "medrais cadw cofnod ohonynt."
 
-#: main.cpp:337
+#: main.cpp:284
 msgid ""
 "You can't use BOTH -ls and -e.\n"
 msgstr ""
 "Ni allwch ddefnyddio -ls A -e hefyd.\n"
 
-#: main.cpp:464
+#: main.cpp:411
 #, fuzzy
 msgid ""
 "expected --vt_sz <#columns>x<#lines> e.g. 80x40\n"
@@ -1124,7 +1136,7 @@ msgstr "Terfynodd sesiwn '%1' â chyflwr %2."
 msgid "Session '%1' exited unexpectedly."
 msgstr "Terfynodd sesiwn '%1' yn annisgwyl."
 
-#: session.cpp:649
+#: session.cpp:655
 msgid "ZModem Progress"
 msgstr "Cynnydd ZModem"
 
@@ -1359,9 +1371,10 @@ msgstr ""
 "y lygoden, tra'n gwasgu'r fysell Shift?\n"
 
 #: tips.cpp:153
+#, fuzzy
 msgid ""
 "<p>...that you can let Konsole set the current directory as the window title?\n"
-"For Bash, put 'export PS1=$PS1\"\\[\\e]0;\\H:\\w\\a\\]\"' in your ~/.bashrc .\n"
+"For Bash, put 'export PS1=$PS1\"\\[\\e[0m\\H:\\w\\a\\]\"' in your ~/.bashrc .\n"
 msgstr ""
 "<p>...gallwch ganiatáu i Konsole osod y cyfeiriadur cyfredol yn deitl y "
 "ffestr?\n"
@@ -1369,19 +1382,21 @@ msgstr ""
 "plisgyn Bash.\n"
 
 #: tips.cpp:159
+#, fuzzy
 msgid ""
 "<p>...that you can let Konsole set the current directory as the session name?\n"
-"For Bash, put 'export PS1=$PS1\"\\[\\e]30;\\H:\\w\\a\\]\"' in your ~/.bashrc .\n"
+"For Bash, put 'export PS1=$PS1\"\\[\\e[30m\\H:\\w\\a\\]\"' in your ~/.bashrc .\n"
 msgstr ""
 "<p>...gallwch ganiatáu i Konsole osod y cyfeiriadur cyfredol yn enw'r sesiwn?\n"
 "Rhowch 'export PS1=$PS1\"\\[\\e]30;\\H:\\w\\a\\]\"' yn eich ~/.bashrc ar gyfer "
 "y plisgyn Bash.\n"
 
 #: tips.cpp:165
+#, fuzzy
 msgid ""
 "<p>...that if you let your shell pass the current directory to Konsole within "
 "the prompt\n"
-"variable, e.g. for Bash with 'export PS1=$PS1\"\\[\\e]31;\\w\\a\\]\"' in your "
+"variable, e.g. for Bash with 'export PS1=$PS1\"\\[\\e[31m\\w\\a\\]\"' in your "
 "~/.bashrc, then\n"
 "Konsole can bookmark it, and session management will remember your current "
 "working directory\n"
@@ -1397,6 +1412,28 @@ msgstr ""
 
 #: tips.cpp:173
 msgid ""
+"<p>...that working with remote hosts in Konsole can be made much easier by "
+"setting the\n"
+"prompt to correctly show your hostname and present path? Try setting your "
+"prompt in our\n"
+"~/.bashrc with: \"export PS1='\\[\\e[0m\\h:\\w> '\" You can then just select "
+"your prompt and\n"
+"press middle-mouse to paste it as the source or destination on the command "
+"line.\n"
+msgstr ""
+
+#: tips.cpp:181
+msgid ""
+"<p>...that you can temporarily set the prompt for Konsole by setting the 'PS1=' "
+"variable\n"
+"without having to edit your ~/.bashrc. Try entering the following on the "
+"command line to\n"
+"set your prompt. It will also include the current time before the path:\n"
+"PS1='\\[\\e[0;37m\\]\\A\\[\\e[1;34m\\] \\[\\e[1;34m\\]\\h:\\w> \\[\\e[0m\\]'\n"
+msgstr ""
+
+#: tips.cpp:189
+msgid ""
 "<p>...that double-clicking will select a whole word?\n"
 "<p>When you don't release the mouse button after the second click you\n"
 "can extend your selection by additional words when moving the mouse.\n"
@@ -1405,7 +1442,7 @@ msgstr ""
 "<p>Pan na ryddhewch y botwm llygoden wedi'r ail glic gallwch\n"
 "estyn eich dewisiad drwy eiriau ychwanegol pan yn symud y lygoden.\n"
 
-#: tips.cpp:180
+#: tips.cpp:196
 msgid ""
 "<p>...that triple-clicking will select a whole line?\n"
 "<p>When you don't release the mouse button after the third click you\n"
@@ -1415,14 +1452,15 @@ msgstr ""
 "<p>Pan na ryddhewch y botwm llygoden wedi'r trydydd clic gallwch\n"
 "estyn y dewisiad drwy linellau ychwanegol pan yn symud y lygoden.\n"
 
-#: tips.cpp:187
+#: tips.cpp:203
+#, fuzzy
 msgid ""
 "<p>...that if you drag &amp; drop a URL into a Konsole window you are presented "
 "with a\n"
 "menu giving the option to copy or move the specified file into the current "
 "working directory,\n"
 "as well as just pasting the URL as text.\n"
-"<p>This works with any type of URL which TDE supports.\n"
+"<p>This works with any type of URL which KDE supports.\n"
 msgstr ""
 "<p>...os lusgwch a gollyngwch URL i ffenestr Konsole cyflwynir \n"
 "dewislen i chi sy'n rhoi'r dewis o gopïo neu symud y ffeil benodol i'r "
@@ -1430,7 +1468,7 @@ msgstr ""
 "yn ogystal â dim ond gludo'r URL ar ffurf testun.\n"
 "<p>Gweithia hyn ag unrhyw fath o URL y cynhelir gan TDE.\n"
 
-#: tips.cpp:195
+#: tips.cpp:211
 #, fuzzy
 msgid ""
 "<p>...that the \"Settings->Configure Shortcuts...\" dialog allows you to define "
@@ -1443,7 +1481,7 @@ msgstr ""
 "ni ddangosir yn y ddewislen, fel gweithredoli dewislenni, newid ffontiau, a "
 "rhestru a newid sesiynau?\n"
 
-#: tips.cpp:201
+#: tips.cpp:217
 msgid ""
 "<p>...that right-clicking over the \"New\" button in the left corner of the "
 "tabbar or in an empty tabbar space displays a menu where you can set several "
diff --git a/tde-i18n-cy/messages/tdebase/kpager.po b/tde-i18n-cy/messages/tdebase/kpager.po
index 8928260700d..b1708de7d62 100644
--- a/tde-i18n-cy/messages/tdebase/kpager.po
+++ b/tde-i18n-cy/messages/tdebase/kpager.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kpager\n"
-"POT-Creation-Date: 2006-08-16 04:04+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-07-22 15:49+0100\n"
 "Last-Translator: KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdebase/kpersonalizer.po b/tde-i18n-cy/messages/tdebase/kpersonalizer.po
index 5ecd7399b48..535e1e21318 100644
--- a/tde-i18n-cy/messages/tdebase/kpersonalizer.po
+++ b/tde-i18n-cy/messages/tdebase/kpersonalizer.po
@@ -8,89 +8,17 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kpersonalizer\n"
-"POT-Creation-Date: 2005-09-03 02:36+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-12-27 14:10+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "www.gyfieithu.co.uk<kyfieithu@dotmon.com>\n"
 "X-Generator: KBabel 1.2\n"
 
-#: kstylepage.cpp:50
-msgid "Style"
-msgstr "Arddull"
-
-#: kstylepage.cpp:51
-msgid "Description"
-msgstr "Disgrifiad"
-
-#: kstylepage.cpp:55
-msgid "Plastik"
-msgstr "Plastik"
-
-#: kstylepage.cpp:55
-msgid "Light"
-msgstr "Golau"
-
-#: kstylepage.cpp:56
-msgid "TDE default style"
-msgstr "Ardull rhagosodedig TDE"
-
-#: kstylepage.cpp:59
-msgid "TDE Classic"
-msgstr "TDE Clasurol"
-
-#: kstylepage.cpp:60
-msgid "Classic TDE style"
-msgstr "Ardull clasurol TDE"
-
-#: kstylepage.cpp:63
-msgid "Keramik"
-msgstr "Keramik"
-
-#: kstylepage.cpp:64
-#, fuzzy
-msgid "The previous default style"
-msgstr "Ardull rhagosodedig TDE"
-
-#: kstylepage.cpp:67
-msgid "Sunshine"
-msgstr "Heulwen"
-
-#: kstylepage.cpp:68
-msgid "A very common desktop"
-msgstr "Penbwrdd cyffredin iawn"
-
-#: kstylepage.cpp:71
-msgid "Redmond"
-msgstr "Redmond"
-
-#: kstylepage.cpp:72
-msgid "A style from the northwest of the USA"
-msgstr "Ardull o ogledd orllewin UDA"
-
-#: kstylepage.cpp:75
-msgid "Platinum"
-msgstr "Platinwm"
-
-#: kstylepage.cpp:76
-msgid "The platinum style"
-msgstr "Yr arddull platinwm"
-
-#: kcountrypage.cpp:48
-msgid "<h3>Welcome to TDE %1</h3>"
-msgstr "<h3>Croeso i TDE %1</h3>"
-
-#: kcountrypage.cpp:90 kcountrypage.cpp:117 kfindlanguage.cpp:82
-msgid "without name"
-msgstr "heb enw"
-
-#: kcountrypage.cpp:142
-msgid "All"
-msgstr "Popeth"
-
 #: _translatorinfo.cpp:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
@@ -103,85 +31,21 @@ msgid ""
 "Your emails"
 msgstr "kyfieithu@dotmon.com"
 
-#: main.cpp:27 main.cpp:38
-msgid "KPersonalizer"
-msgstr "KPersonalizer"
-
-#: main.cpp:31
-#, fuzzy
-msgid "Personalizer is restarted by itself"
-msgstr "ailddechreuodd y personoleiddydd ei hunan"
-
-#: main.cpp:32
-#, fuzzy
-msgid "Personalizer is running before TDE session"
-msgstr "mae'r personoleiddydd yn rhedeg cyn sesiwn TDE"
-
-#: kpersonalizer.cpp:67
-msgid "Step 1: Introduction"
-msgstr "Cam 1: Cyflwyniad"
-
-#: kpersonalizer.cpp:71
-msgid "Step 2: I want it my Way..."
-msgstr "Cam 2: Rwy ei eisiau fe fy ffordd fy hunan.."
-
-#: kpersonalizer.cpp:75
-msgid "Step 3: Eyecandy-O-Meter"
-msgstr "Cam 3: Losin-Llygadol-O-Medr"
-
-#: kpersonalizer.cpp:79
-msgid "Step 4: Everybody loves Themes"
-msgstr "Cam 4: Mae Pawb yn hoffi Themau"
-
-#: kpersonalizer.cpp:83
-msgid "Step 5: Time to Refine"
-msgstr "Cam 5: Amser i Goethi"
-
-#: kpersonalizer.cpp:86
-msgid "S&kip Wizard"
-msgstr "&Hepgor y Dewin"
-
-#: kpersonalizer.cpp:152
-msgid ""
-"<p>Are you sure you want to quit the Desktop Settings Wizard?</p>"
-"<p>The Desktop Settings Wizard helps you to configure the TDE desktop to your "
-"personal liking.</p>"
-"<p>Click <b>Cancel</b> to return and finish your setup.</p>"
-msgstr ""
-"<p>A ydych chi'n siŵr eich bod am orffen y Dewin Gosodiadau Penbwrdd?</p>"
-"<p>Mae'r Dewin Gosodiadau Penbwrdd yn eich cynorthwyo i ffurfweddu eich "
-"penbwrdd TDE at eich dant.</p>"
-"<p>Cliciwch <b>Diddymu</b> i fynd yn ôl a gorffen eich gosodiad.</p>"
-
-#: kpersonalizer.cpp:156
-msgid ""
-"<p>Are you sure you want to quit the Desktop Settings Wizard?</p>"
-"<p>If yes, click <b>Quit</b> and all changes will be lost."
-"<br>If not, click <b>Cancel</b> to return and finish your setup.</p>"
-msgstr ""
-"<p>A ydych chi'n siŵr eich bod am hepgor y Dewin Gosodiadau Penbwrdd?</p>"
-"<p>Os ydych, cliciwch <b>Gadael</b> ac fe gollir pob newidiad. "
-"<br> Os nac ydych, cliciwch <b>Diddymu</b> i fynd yn ôl a gorffen eich "
-"gosodiad.</p>"
-
-#: kpersonalizer.cpp:160
-msgid "All Changes Will Be Lost"
-msgstr "Collir Pob Newidiad"
-
 #: kospage.cpp:352
+#, fuzzy
 msgid ""
 "<b>Window activation:</b> <i>Focus on click</i>"
 "<br><b>Titlebar double-click:</b> <i>Shade window</i>"
-"<br><b>Mouse selection:</b> <i>Single click</i>"
-"<br><b>Application startup notification:</b> <i>busy cursor</i>"
-"<br><b>Keyboard scheme:</b> <i>TDE default</i>"
+"<br><b>Mouse selection:</b> <i>Double click</i>"
+"<br><b>Application startup notification:</b> <i>none</i>"
+"<br><b>Keyboard scheme:</b> <i>Trinity default</i>"
 "<br>"
 msgstr ""
 "<b>Gweithredoli Ffenestri:</b> <i>Canolbwyntio ar glic</i>"
 "<br><b>Clic dwbl ar y bar teitl: </b> <i>Rholio'r Ffenestr</i>"
 "<br><b>Dewis â llygoden:</b> <i>Clic unigol</i>"
-"<br><b>Hysbysiad cychwyn cymhwysiad:</b> <i>cyrchydd prysur</i>"
-"<br><b>Cynllun bysellfwrdd:</b> <i>Rhagosodyn TDE</i>"
+"<br><b>Hysbysiad cychwyn cymhwysiad:</b> <i>dim</i>"
+"<br><b>Cynllun bysellfwrdd:</b> <i>Mac</i>"
 "<br>"
 
 #: kospage.cpp:364
@@ -201,11 +65,12 @@ msgstr ""
 "<br>"
 
 #: kospage.cpp:376
+#, fuzzy
 msgid ""
 "<b>Window activation:</b> <i>Focus on click</i>"
 "<br><b>Titlebar double-click:</b> <i>Maximize window</i>"
 "<br><b>Mouse selection:</b> <i>Double click</i>"
-"<br><b>Application startup notification:</b> <i>busy cursor</i>"
+"<br><b>Application startup notification:</b> <i>none</i>"
 "<br><b>Keyboard scheme:</b> <i>Windows</i>"
 "<br>"
 msgstr ""
@@ -232,86 +97,72 @@ msgstr ""
 "<br><b>Cynllun bysellfwrdd:</b> <i>Mac</i>"
 "<br>"
 
-#: keyecandypage.cpp:67
-msgid "Features"
-msgstr "Nodweddion"
-
-#: keyecandypage.cpp:71
-msgid "Desktop Wallpaper"
-msgstr "Papur Wal y Penbwrdd"
+#: tdestylepage.cpp:50
+msgid "Style"
+msgstr "Arddull"
 
-#: keyecandypage.cpp:73
-msgid "Window Moving/Resizing Effects"
-msgstr "Effeithiau Symud/Newid Maint Ffenestri "
+#: tdestylepage.cpp:51
+msgid "Description"
+msgstr "Disgrifiad"
 
-#: keyecandypage.cpp:75
-msgid "Display Contents in Moving/Resizing Windows"
-msgstr "Dangos Cynnwys y Ffenestr Pan yn Symud/Newid Maint"
+#: tdestylepage.cpp:55
+msgid "Plastik"
+msgstr "Plastik"
 
-#: keyecandypage.cpp:78
-msgid "File Manager Background Picture"
-msgstr "Llun Cefndir y Trefnydd Ffeiliau"
+#: tdestylepage.cpp:55
+msgid "Light"
+msgstr "Golau"
 
-#: keyecandypage.cpp:80
-msgid "Panel Background Picture"
-msgstr "Llun Cefndir y Panel"
+#: tdestylepage.cpp:56
+msgid "TDE default style"
+msgstr "Ardull rhagosodedig TDE"
 
-#: keyecandypage.cpp:83
+#: tdestylepage.cpp:59
 #, fuzzy
-msgid "Panel Icon Popups"
-msgstr "Chwyddo Eicon y Panel"
-
-#: keyecandypage.cpp:85
-msgid "Icon Highlighting"
-msgstr "Amlygu Eicon"
-
-#: keyecandypage.cpp:87
-msgid "File Manager Icon Animation"
-msgstr "Bywlunio Eicon y Trefnydd Ffeiliau"
-
-#: keyecandypage.cpp:90
-msgid "Sound Theme"
-msgstr "Thema Sain"
+msgid "KDE Classic"
+msgstr "TDE Clasurol"
 
-#: keyecandypage.cpp:96
-msgid "Large Desktop Icons"
-msgstr "Eiconau Penbwrdd Mawr"
+#: tdestylepage.cpp:60
+#, fuzzy
+msgid "Classic KDE style"
+msgstr "Ardull clasurol TDE"
 
-#: keyecandypage.cpp:98
-msgid "Large Panel Icons"
-msgstr "Eiconau Panel Mawr"
+#: tdestylepage.cpp:63
+msgid "Keramik"
+msgstr "Keramik"
 
-#: keyecandypage.cpp:102
-msgid "Smoothed Fonts (Antialiasing)"
-msgstr "Wynebfathau Llyfn (Gwrthamgenu)"
+#: tdestylepage.cpp:64
+#, fuzzy
+msgid "The previous default style"
+msgstr "Ardull rhagosodedig TDE"
 
-#: keyecandypage.cpp:106
-msgid "Preview Images"
-msgstr "Rhagolygu Delweddau"
+#: tdestylepage.cpp:67
+msgid "Sunshine"
+msgstr "Heulwen"
 
-#: keyecandypage.cpp:108
-msgid "Icons on Buttons"
-msgstr "Eiconau ar Fotymau"
+#: tdestylepage.cpp:68
+msgid "A very common desktop"
+msgstr "Penbwrdd cyffredin iawn"
 
-#: keyecandypage.cpp:112
-msgid "Animated Combo Boxes"
-msgstr "Blychau Cyfun Bywluniedig"
+#: tdestylepage.cpp:71
+msgid "Redmond"
+msgstr "Redmond"
 
-#: keyecandypage.cpp:116
-msgid "Fading Tooltips"
-msgstr "Cymorth offer pyledig"
+#: tdestylepage.cpp:72
+msgid "A style from the northwest of the USA"
+msgstr "Ardull o ogledd orllewin UDA"
 
-#: keyecandypage.cpp:119
-msgid "Preview Text Files"
-msgstr "Rhagolygu Ffeiliau Testun"
+#: tdestylepage.cpp:75
+msgid "Platinum"
+msgstr "Platinwm"
 
-#: keyecandypage.cpp:122
-msgid "Fading Menus"
-msgstr "Dewislenni pyledig"
+#: tdestylepage.cpp:76
+msgid "The platinum style"
+msgstr "Yr arddull platinwm"
 
-#: keyecandypage.cpp:124
-msgid "Preview Other Files"
-msgstr "Rhagolygu Ffeiliau Eraill"
+#: kcountrypage.cpp:90 kcountrypage.cpp:117 kfindlanguage.cpp:82
+msgid "without name"
+msgstr "heb enw"
 
 #. i18n: file kcountrypagedlg.ui line 64
 #: rc.cpp:3
@@ -323,15 +174,15 @@ msgstr "Dewiswch eich iaith os gwelwch yn dda:"
 #: rc.cpp:6
 #, fuzzy, no-c-format
 msgid ""
-"<p>This Personalizer will help you configure the basic setup of your TDE "
+"<p>This Personalizer will help you configure the basic setup of your Trinity "
 "desktop in five quick, easy steps. You can set things like your country (for "
 "date and time formats, etc.), language, desktop behavior and more.</p>\n"
-"<p>You will be able to change all the settings later using the TDE Control "
+"<p>You will be able to change all the settings later using the Trinity Control "
 "Center. You may choose to postpone your personalization until later by clicking "
 "on <b>Skip Wizard</b>. Any changes made so far, will then be reversed, except "
 "for the country and language settings. However, new users are encouraged to use "
 "this simple method.</p>\n"
-"<p>If you already like your TDE configuration and wish to quit the Wizard, "
+"<p>If you already like your Trinity configuration and wish to quit the Wizard, "
 "click <b>Skip Wizard</b>, then <b>Quit</b>.</p>"
 msgstr ""
 "<p>Bydd y Personoleiddydd yma'n eich cynorthwyo i ffurweddu gosodiad sylfaenol "
@@ -347,8 +198,8 @@ msgstr ""
 
 #. i18n: file kcountrypagedlg.ui line 100
 #: rc.cpp:11
-#, no-c-format
-msgid "<h3>Welcome to TDE %VERSION%!</h3>"
+#, fuzzy, no-c-format
+msgid "<h3>Welcome to Trinity %VERSION%!</h3>"
 msgstr "<h3>Croeso i TDE %VERSION%!</h3>"
 
 #. i18n: file kcountrypagedlg.ui line 148
@@ -359,11 +210,11 @@ msgstr "Dewiswch eich gwlad:"
 
 #. i18n: file keyecandypagedlg.ui line 64
 #: rc.cpp:17
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<P>TDE offers many visually appealing special effects, such as smoothed fonts, "
-"previews in the file manager and animated menus. All this beauty, however, "
-"comes at a small performance cost. </P>\n"
+"<P>Trinity offers many visually appealing special effects, such as smoothed "
+"fonts, previews in the file manager and animated menus. All this beauty, "
+"however, comes at a small performance cost. </P>\n"
 "If you have a fast, new processor, you might want to turn them all on, but for "
 "those of us with slower processors, starting off with less eye candy helps to "
 "keep your desktop more responsive."
@@ -451,12 +302,12 @@ msgstr "Apple MacOS (C)"
 
 #. i18n: file kospagedlg.ui line 126
 #: rc.cpp:56
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "<b>System Behavior</b>"
 "<br>\n"
 "Graphical User Interfaces behave differently on various Operating Systems.\n"
-"TDE allows you to customize its behavior according to your needs."
+"Trinity allows you to customize its behavior according to your needs."
 msgstr ""
 "<b>Ymddygiad Y Cysawd</b>"
 "<br>\n"
@@ -468,8 +319,8 @@ msgstr ""
 #: rc.cpp:61
 #, no-c-format
 msgid ""
-"For motion impaired users, TDE provides keyboard gestures to activate special "
-"keyboard settings."
+"For motion impaired users, Trinity provides keyboard gestures to activate "
+"special keyboard settings."
 msgstr ""
 
 #. i18n: file kospagedlg.ui line 179
@@ -513,64 +364,223 @@ msgstr ""
 msgid "&Launch Trinity Control Center"
 msgstr "&Cychwyn Canolfan Reoli TDE"
 
-#. i18n: file kstylepagedlg.ui line 32
-#: rc.cpp:80
-#, no-c-format
-msgid ""
-"Please choose the way your computer should look by selecting one of the items "
-"below."
-msgstr ""
-"Dewiswch y ffordd y dylai'ch cyfrifiadur edrych drwy ddewis un o'r eitemau "
-"isod."
-
-#. i18n: file kstylepagedlg.ui line 89
-#: rc.cpp:83
-#, no-c-format
-msgid "Preview"
-msgstr "Rhagolwg"
-
 #. i18n: file stylepreview.ui line 42
-#: rc.cpp:86
+#: rc.cpp:80
 #, no-c-format
 msgid "Tab 1"
 msgstr "Tab 1"
 
 #. i18n: file stylepreview.ui line 61
-#: rc.cpp:89
+#: rc.cpp:83
 #, no-c-format
 msgid "Button"
 msgstr "Botwm"
 
 #. i18n: file stylepreview.ui line 72
-#: rc.cpp:92
+#: rc.cpp:86
 #, no-c-format
 msgid "ComboBox"
 msgstr "Blwch Cyfuno"
 
 #. i18n: file stylepreview.ui line 92
-#: rc.cpp:95
+#: rc.cpp:89
 #, no-c-format
 msgid "Button Group"
 msgstr "Casgliad o Fotymau"
 
 #. i18n: file stylepreview.ui line 103
-#: rc.cpp:98 rc.cpp:101
+#: rc.cpp:92 rc.cpp:95
 #, no-c-format
 msgid "RadioButton"
 msgstr "BotwmRadio"
 
 #. i18n: file stylepreview.ui line 136
-#: rc.cpp:104
+#: rc.cpp:98
 #, no-c-format
 msgid "CheckBox"
 msgstr "BlwchBritho"
 
 #. i18n: file stylepreview.ui line 165
-#: rc.cpp:107
+#: rc.cpp:101
 #, no-c-format
 msgid "Tab 2"
 msgstr "Tab 2"
 
+#. i18n: file tdestylepagedlg.ui line 32
+#: rc.cpp:104
+#, no-c-format
+msgid ""
+"Please choose the way your computer should look by selecting one of the items "
+"below."
+msgstr ""
+"Dewiswch y ffordd y dylai'ch cyfrifiadur edrych drwy ddewis un o'r eitemau "
+"isod."
+
+#. i18n: file tdestylepagedlg.ui line 89
+#: rc.cpp:107
+#, no-c-format
+msgid "Preview"
+msgstr "Rhagolwg"
+
+#: keyecandypage.cpp:69
+msgid "Features"
+msgstr "Nodweddion"
+
+#: keyecandypage.cpp:73
+msgid "Desktop Wallpaper"
+msgstr "Papur Wal y Penbwrdd"
+
+#: keyecandypage.cpp:75
+msgid "Window Moving/Resizing Effects"
+msgstr "Effeithiau Symud/Newid Maint Ffenestri "
+
+#: keyecandypage.cpp:77
+msgid "Display Contents in Moving/Resizing Windows"
+msgstr "Dangos Cynnwys y Ffenestr Pan yn Symud/Newid Maint"
+
+#: keyecandypage.cpp:80
+msgid "File Manager Background Picture"
+msgstr "Llun Cefndir y Trefnydd Ffeiliau"
+
+#: keyecandypage.cpp:82
+msgid "Panel Background Picture"
+msgstr "Llun Cefndir y Panel"
+
+#: keyecandypage.cpp:85
+#, fuzzy
+msgid "Panel Icon Popups"
+msgstr "Chwyddo Eicon y Panel"
+
+#: keyecandypage.cpp:87
+msgid "Icon Highlighting"
+msgstr "Amlygu Eicon"
+
+#: keyecandypage.cpp:89
+msgid "File Manager Icon Animation"
+msgstr "Bywlunio Eicon y Trefnydd Ffeiliau"
+
+#: keyecandypage.cpp:92
+msgid "Sound Theme"
+msgstr "Thema Sain"
+
+#: keyecandypage.cpp:98
+msgid "Large Desktop Icons"
+msgstr "Eiconau Penbwrdd Mawr"
+
+#: keyecandypage.cpp:100
+msgid "Large Panel Icons"
+msgstr "Eiconau Panel Mawr"
+
+#: keyecandypage.cpp:104
+msgid "Smoothed Fonts (Antialiasing)"
+msgstr "Wynebfathau Llyfn (Gwrthamgenu)"
+
+#: keyecandypage.cpp:108
+msgid "Preview Images"
+msgstr "Rhagolygu Delweddau"
+
+#: keyecandypage.cpp:110
+msgid "Icons on Buttons"
+msgstr "Eiconau ar Fotymau"
+
+#: keyecandypage.cpp:114
+msgid "Animated Combo Boxes"
+msgstr "Blychau Cyfun Bywluniedig"
+
+#: keyecandypage.cpp:118
+msgid "Fading Tooltips"
+msgstr "Cymorth offer pyledig"
+
+#: keyecandypage.cpp:121
+msgid "Preview Text Files"
+msgstr "Rhagolygu Ffeiliau Testun"
+
+#: keyecandypage.cpp:124
+msgid "Fading Menus"
+msgstr "Dewislenni pyledig"
+
+#: keyecandypage.cpp:126
+msgid "Preview Other Files"
+msgstr "Rhagolygu Ffeiliau Eraill"
+
+#: kpersonalizer.cpp:67
+msgid "Step 1: Introduction"
+msgstr "Cam 1: Cyflwyniad"
+
+#: kpersonalizer.cpp:71
+msgid "Step 2: I want it my Way..."
+msgstr "Cam 2: Rwy ei eisiau fe fy ffordd fy hunan.."
+
+#: kpersonalizer.cpp:75
+msgid "Step 3: Eyecandy-O-Meter"
+msgstr "Cam 3: Losin-Llygadol-O-Medr"
+
+#: kpersonalizer.cpp:79
+msgid "Step 4: Everybody loves Themes"
+msgstr "Cam 4: Mae Pawb yn hoffi Themau"
+
+#: kpersonalizer.cpp:83
+msgid "Step 5: Time to Refine"
+msgstr "Cam 5: Amser i Goethi"
+
+#: kpersonalizer.cpp:86
+msgid "S&kip Wizard"
+msgstr "&Hepgor y Dewin"
+
+#: kpersonalizer.cpp:152
+#, fuzzy
+msgid ""
+"<p>Are you sure you want to quit the Desktop Settings Wizard?</p>"
+"<p>The Desktop Settings Wizard helps you to configure the Trinity desktop to "
+"your personal liking.</p>"
+"<p>Click <b>Cancel</b> to return and finish your setup.</p>"
+msgstr ""
+"<p>A ydych chi'n siŵr eich bod am orffen y Dewin Gosodiadau Penbwrdd?</p>"
+"<p>Mae'r Dewin Gosodiadau Penbwrdd yn eich cynorthwyo i ffurfweddu eich "
+"penbwrdd TDE at eich dant.</p>"
+"<p>Cliciwch <b>Diddymu</b> i fynd yn ôl a gorffen eich gosodiad.</p>"
+
+#: kpersonalizer.cpp:156
+msgid ""
+"<p>Are you sure you want to quit the Desktop Settings Wizard?</p>"
+"<p>If yes, click <b>Quit</b> and all changes will be lost."
+"<br>If not, click <b>Cancel</b> to return and finish your setup.</p>"
+msgstr ""
+"<p>A ydych chi'n siŵr eich bod am hepgor y Dewin Gosodiadau Penbwrdd?</p>"
+"<p>Os ydych, cliciwch <b>Gadael</b> ac fe gollir pob newidiad. "
+"<br> Os nac ydych, cliciwch <b>Diddymu</b> i fynd yn ôl a gorffen eich "
+"gosodiad.</p>"
+
+#: kpersonalizer.cpp:160
+msgid "All Changes Will Be Lost"
+msgstr "Collir Pob Newidiad"
+
+#: kcountrypage.cpp:48
+#, fuzzy
+msgid "<h3>Welcome to Trinity %1</h3>"
+msgstr "<h3>Croeso i TDE %1</h3>"
+
+#: kcountrypage.cpp:142
+msgid "All"
+msgstr "Popeth"
+
+#: main.cpp:27 main.cpp:38
+msgid "KPersonalizer"
+msgstr "KPersonalizer"
+
+#: main.cpp:31
+#, fuzzy
+msgid "Personalizer is restarted by itself"
+msgstr "ailddechreuodd y personoleiddydd ei hunan"
+
+#: main.cpp:32
+#, fuzzy
+msgid "Personalizer is running before Trinity session"
+msgstr "mae'r personoleiddydd yn rhedeg cyn sesiwn TDE"
+
+#~ msgid "<b>Window activation:</b> <i>Focus on click</i><br><b>Titlebar double-click:</b> <i>Shade window</i><br><b>Mouse selection:</b> <i>Single click</i><br><b>Application startup notification:</b> <i>busy cursor</i><br><b>Keyboard scheme:</b> <i>TDE default</i><br>"
+#~ msgstr "<b>Gweithredoli Ffenestri:</b> <i>Canolbwyntio ar glic</i><br><b>Clic dwbl ar y bar teitl: </b> <i>Rholio'r Ffenestr</i><br><b>Dewis â llygoden:</b> <i>Clic unigol</i><br><b>Hysbysiad cychwyn cymhwysiad:</b> <i>cyrchydd prysur</i><br><b>Cynllun bysellfwrdd:</b> <i>Rhagosodyn TDE</i><br>"
+
 #~ msgid "Other"
 #~ msgstr "Arall"
 
diff --git a/tde-i18n-cy/messages/tdebase/kprinter.po b/tde-i18n-cy/messages/tdebase/kprinter.po
index fabc3f2881b..81022f16096 100644
--- a/tde-i18n-cy/messages/tdebase/kprinter.po
+++ b/tde-i18n-cy/messages/tdebase/kprinter.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kprinter\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-07-22 15:57+0100\n"
 "Last-Translator: KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdebase/krdb.po b/tde-i18n-cy/messages/tdebase/krdb.po
index 08145a69d69..b68a714cd39 100644
--- a/tde-i18n-cy/messages/tdebase/krdb.po
+++ b/tde-i18n-cy/messages/tdebase/krdb.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: krdb\n"
-"POT-Creation-Date: 2006-05-17 03:54+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-07-22 16:00+0100\n"
 "Last-Translator: KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdebase/kreadconfig.po b/tde-i18n-cy/messages/tdebase/kreadconfig.po
index 42b9cc7ef55..77ea1ff0509 100644
--- a/tde-i18n-cy/messages/tdebase/kreadconfig.po
+++ b/tde-i18n-cy/messages/tdebase/kreadconfig.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kreadconfig\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-07-22 16:01+0100\n"
 "Last-Translator: KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdebase/krunapplet.po b/tde-i18n-cy/messages/tdebase/krunapplet.po
index 68693171748..f1071784da9 100644
--- a/tde-i18n-cy/messages/tdebase/krunapplet.po
+++ b/tde-i18n-cy/messages/tdebase/krunapplet.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: krunapplet\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-07-22 16:06+0100\n"
 "Last-Translator: KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdebase/ksmserver.po b/tde-i18n-cy/messages/tdebase/ksmserver.po
index 0206f34a047..e43b0148ad0 100644
--- a/tde-i18n-cy/messages/tdebase/ksmserver.po
+++ b/tde-i18n-cy/messages/tdebase/ksmserver.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ksmserver\n"
-"POT-Creation-Date: 2007-03-07 02:42+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-12-27 12:17+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -48,42 +49,225 @@ msgstr ""
 "yn cymeryd rhan yn y sesiwn. 'twin' yw'r rhagosodyn."
 
 #: main.cpp:38
+msgid "Pass additional arguments to the window manager. Default is ''"
+msgstr ""
+
+#: main.cpp:39
 #, fuzzy
 msgid "Also allow remote connections"
 msgstr "Caniatáu cysylltiadau pell hefyd."
 
-#: main.cpp:182
+#: main.cpp:183
 msgid "The TDE Session Manager"
 msgstr "Trefnydd Sesiynau TDE"
 
-#: main.cpp:186
+#: main.cpp:187
 msgid "Maintainer"
 msgstr "Cynhaliwr"
 
-#: shutdown.cpp:349
+#: shutdown.cpp:268
+msgid "Notifying applications of logout request..."
+msgstr ""
+
+#: shutdown.cpp:504 shutdown.cpp:535
+msgid "Skip Notification (%1)"
+msgstr ""
+
+#: shutdown.cpp:506
+msgid "Notifying remaining applications of logout request (%1/%2)..."
+msgstr ""
+
+#: shutdown.cpp:509
+msgid "Notifying remaining applications of logout request (%1/%2, %3)..."
+msgstr ""
+
+#: shutdown.cpp:516
+msgid "Ignore and Resume Logout"
+msgstr ""
+
+#: shutdown.cpp:524
+msgid "An application is requesting attention, logout paused..."
+msgstr ""
+
+#: shutdown.cpp:527
+msgid "%3 is requesting attention, logout paused..."
+msgstr ""
+
+#: shutdown.cpp:537
+msgid "Notifying applications of logout request (%1/%2)..."
+msgstr ""
+
+#: shutdown.cpp:540
+msgid "Notifying applications of logout request (%1/%2, %3)..."
+msgstr ""
+
+#: shutdown.cpp:630
 msgid "Logout canceled by '%1'"
 msgstr ""
 
-#: shutdowndlg.cpp:102
+#: shutdown.cpp:636
+msgid "Logout canceled by user"
+msgstr ""
+
+#: shutdown.cpp:695
+msgid "Forcing interacting application termination"
+msgstr ""
+
+#: shutdown.cpp:745
+msgid "Notifying remaining applications of logout request..."
+msgstr ""
+
+#: shutdown.cpp:775
+msgid "Synchronizing remote folders"
+msgstr ""
+
+#: shutdown.cpp:781 shutdowndlg.cpp:1279
+msgid "Saving your settings..."
+msgstr ""
+
+#: shutdown.cpp:831 shutdown.cpp:904
+msgid "Closing applications (%1/%2)..."
+msgstr ""
+
+#: shutdown.cpp:834 shutdown.cpp:907
+msgid "Closing applications (%1/%2, %3)..."
+msgstr ""
+
+#: shutdown.cpp:915
+msgid "Terminating services..."
+msgstr ""
+
+#: shutdowndlg.cpp:728
 msgid "End Session for \"%1\""
 msgstr "Diwedd Sesiwn ar gyfer \"%1\""
 
-#: shutdowndlg.cpp:128
+#: shutdowndlg.cpp:753
+msgid "Log out"
+msgstr ""
+
+#: shutdowndlg.cpp:784
 msgid "&End Current Session"
 msgstr "&Terfynu y sesiwn cyfredol"
 
-#: shutdowndlg.cpp:136
+#: shutdowndlg.cpp:785
+msgid ""
+"<qt>"
+"<h3>End Current Session</h3>"
+"<p>Log out of the current session to login with a different user</p></qt>"
+msgstr ""
+
+#: shutdowndlg.cpp:883
+msgid "&Freeze"
+msgstr ""
+
+#: shutdowndlg.cpp:895
+msgid "&Suspend"
+msgstr ""
+
+#: shutdowndlg.cpp:907
+msgid "&Hibernate"
+msgstr ""
+
+#: shutdowndlg.cpp:925
+#, fuzzy
+msgid "&Restart"
+msgstr "&Ail-gychwyn y cyfrifiadur"
+
+#: shutdowndlg.cpp:949 shutdowndlg.cpp:1025
+msgid ""
+"_: current option in boot loader\n"
+" (current)"
+msgstr ""
+
+#: shutdowndlg.cpp:965
+#, fuzzy
+msgid "&Turn Off"
+msgstr "&Cau'r cyfrifiadur i lawr"
+
+#: shutdowndlg.cpp:990
 msgid "&Turn Off Computer"
 msgstr "&Cau'r cyfrifiadur i lawr"
 
-#: shutdowndlg.cpp:144
+#: shutdowndlg.cpp:991
+msgid ""
+"<qt>"
+"<h3>Turn Off Computer</h3>"
+"<p>Log out of the current session and turn off the computer</p></qt>"
+msgstr ""
+
+#: shutdowndlg.cpp:1002
 msgid "&Restart Computer"
 msgstr "&Ail-gychwyn y cyfrifiadur"
 
-#: shutdowndlg.cpp:164
+#: shutdowndlg.cpp:1003
 msgid ""
-"_: current option in boot loader\n"
-" (current)"
+"<qt>"
+"<h3>Restart Computer</h3>"
+"<p>Log out of the current session and restart the computer</p>"
+"<p>Hold the mouse button or the space bar for a short while to get a list of "
+"options what to boot</p></qt>"
+msgstr ""
+
+#: shutdowndlg.cpp:1039
+#, fuzzy
+msgid "&Freeze Computer"
+msgstr "&Ail-gychwyn y cyfrifiadur"
+
+#: shutdowndlg.cpp:1047
+#, fuzzy
+msgid "&Suspend Computer"
+msgstr "&Cau'r cyfrifiadur i lawr"
+
+#: shutdowndlg.cpp:1055
+#, fuzzy
+msgid "&Hibernate Computer"
+msgstr "&Ail-gychwyn y cyfrifiadur"
+
+#: shutdowndlg.cpp:1281
+msgid "Skip Notification"
+msgstr ""
+
+#: shutdowndlg.cpp:1282
+#, fuzzy
+msgid "Abort Logout"
+msgstr "&Allgofnodi"
+
+#: shutdowndlg.cpp:1337
+msgid "Would you like to turn off your computer?"
+msgstr ""
+
+#: shutdowndlg.cpp:1338
+msgid ""
+"This computer will turn off automatically\n"
+"after %1 seconds."
+msgstr ""
+
+#: shutdowndlg.cpp:1344
+msgid "Would you like to reboot your computer?"
+msgstr ""
+
+#: shutdowndlg.cpp:1346
+msgid "Would you like to reboot to \"%1\"?"
+msgstr ""
+
+#: shutdowndlg.cpp:1347
+msgid ""
+"This computer will reboot automatically\n"
+"after %1 seconds."
+msgstr ""
+
+#: shutdowndlg.cpp:1351
+msgid "Would you like to end your current session?"
+msgstr ""
+
+#: shutdowndlg.cpp:1352
+msgid ""
+"This session will end\n"
+"after %1 seconds automatically."
+msgstr ""
+
+#: startupdlg.cpp:78
+msgid "Loading your settings"
 msgstr ""
 
 #~ msgid "Shutdown Mode"
@@ -98,9 +282,6 @@ msgstr ""
 #~ msgid "&Try now"
 #~ msgstr "&Ceisio nawr"
 
-#~ msgid "&Logout"
-#~ msgstr "&Allgofnodi"
-
 #~ msgid "What do you want to do?"
 #~ msgstr "Beth ydych am ei wneud?"
 
diff --git a/tde-i18n-cy/messages/tdebase/ksplash.po b/tde-i18n-cy/messages/tdebase/ksplash.po
index 957f4670270..811be70526c 100644
--- a/tde-i18n-cy/messages/tdebase/ksplash.po
+++ b/tde-i18n-cy/messages/tdebase/ksplash.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ksplash\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-12-27 12:16+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -62,13 +63,15 @@ msgid "KSplash"
 msgstr "KSplash"
 
 #: main.cpp:46
-msgid "TDE splash screen"
+#, fuzzy
+msgid "Trinity splash screen"
 msgstr "Sgrîn croeso TDE"
 
 #: main.cpp:48
+#, fuzzy
 msgid ""
 "(c) 2001 - 2003, Flaming Sword Productions\n"
-" (c) 2003 TDE developers"
+" (c) 2003 KDE developers"
 msgstr ""
 "(h) 2001 - 2003, Cynyrchiadau Flaming Sword\n"
 "(h) 2003 Datblygwyr TDE"
@@ -110,7 +113,8 @@ msgid "Restoring session"
 msgstr "Yn adfer y sesiwn"
 
 #: themeengine/objkstheme.cpp:135
-msgid "TDE is up and running"
+#, fuzzy
+msgid "Trinity is up and running"
 msgstr "Mae TDE yn barod ac yn rhedeg"
 
 #~ msgid "The TDE Splash Screen."
diff --git a/tde-i18n-cy/messages/tdebase/ksplashthemes.po b/tde-i18n-cy/messages/tdebase/ksplashthemes.po
index 4d047fff0e0..aa684f0c2d8 100644
--- a/tde-i18n-cy/messages/tdebase/ksplashthemes.po
+++ b/tde-i18n-cy/messages/tdebase/ksplashthemes.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ksplashthemes\n"
-"POT-Creation-Date: 2006-08-24 02:34+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-12-27 12:10+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -111,7 +112,8 @@ msgid "TDE splash screen theme manager"
 msgstr "Rheolydd Themau Sgrîn Croeso TDE"
 
 #: main.cpp:68
-msgid "(c) 2003 TDE developers"
+#, fuzzy
+msgid "(c) 2003 KDE developers"
 msgstr "(h) 2003 Datblygwyr TDE"
 
 #: main.cpp:70
diff --git a/tde-i18n-cy/messages/tdebase/kstart.po b/tde-i18n-cy/messages/tdebase/kstart.po
index 11679eec3cd..a96b062c1f7 100644
--- a/tde-i18n-cy/messages/tdebase/kstart.po
+++ b/tde-i18n-cy/messages/tdebase/kstart.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kstart\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-07-22 16:28+0100\n"
 "Last-Translator: KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdebase/ksystemtrayapplet.po b/tde-i18n-cy/messages/tdebase/ksystemtrayapplet.po
index 172a6d5b5c0..25337695842 100644
--- a/tde-i18n-cy/messages/tdebase/ksystemtrayapplet.po
+++ b/tde-i18n-cy/messages/tdebase/ksystemtrayapplet.po
@@ -5,28 +5,33 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ksystemtrayapplet\n"
-"POT-Creation-Date: 2008-08-14 01:16+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-07-22 16:29+0100\n"
 "Last-Translator: KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: systemtrayapplet.cpp:205
+#: systemtrayapplet.cpp:237
 msgid "Configure System Tray"
 msgstr ""
 
-#: systemtrayapplet.cpp:214
-msgid "Visible icons:"
+#: systemtrayapplet.cpp:247
+msgid "Show Clock in Tray"
 msgstr ""
 
-#: systemtrayapplet.cpp:215
+#: systemtrayapplet.cpp:252
 msgid "Hidden icons:"
 msgstr ""
 
-#: systemtrayapplet.cpp:726
+#: systemtrayapplet.cpp:253
+msgid "Visible icons:"
+msgstr ""
+
+#: systemtrayapplet.cpp:844
 msgid "Configure System Tray..."
 msgstr ""
 
diff --git a/tde-i18n-cy/messages/tdebase/ksystraycmd.po b/tde-i18n-cy/messages/tdebase/ksystraycmd.po
index a8496908f3c..00604942225 100644
--- a/tde-i18n-cy/messages/tdebase/ksystraycmd.po
+++ b/tde-i18n-cy/messages/tdebase/ksystraycmd.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ksystraycmd\n"
-"POT-Creation-Date: 2006-08-12 04:01+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-07-22 16:37+0100\n"
 "Last-Translator: KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdebase/kthememanager.po b/tde-i18n-cy/messages/tdebase/kthememanager.po
index e12580ed506..76b0e592ac0 100644
--- a/tde-i18n-cy/messages/tdebase/kthememanager.po
+++ b/tde-i18n-cy/messages/tdebase/kthememanager.po
@@ -3,10 +3,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kthememanager\n"
-"POT-Creation-Date: 2008-07-08 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-07-04 12:10+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdebase/ktip.po b/tde-i18n-cy/messages/tdebase/ktip.po
index 1ed9f7400e5..a530e46ff14 100644
--- a/tde-i18n-cy/messages/tdebase/ktip.po
+++ b/tde-i18n-cy/messages/tdebase/ktip.po
@@ -8,73 +8,29 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ktip\n"
-"POT-Creation-Date: 2006-11-23 02:35+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-06-29 22:15+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.2\n"
 "\n"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Peter Bradley drwy KGyfiethu"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "kyfieithu@dotmon.com"
-
-#: ktipwindow.cpp:32
-msgid "Useful tips"
-msgstr "Cynghorion defnyddiol"
-
-#: ktipwindow.cpp:36
-msgid "KTip"
-msgstr "KCynghoryn"
-
-#: ktipwindow.cpp:52
-msgid "Useful Tips"
-msgstr "Cynghorion Defnyddiol"
-
-#: tips.cpp:3
-#, fuzzy
+#: tips.txt:3
 msgid ""
 "<P>\n"
 "There is a lot of information about TDE on the\n"
-"<A HREF=\"http://www.kde.org/\">TDE web site</A>. There are\n"
-"also useful sites for major applications like\n"
-"<A HREF=\"http://www.konqueror.org/\">Konqueror</A>,\n"
-"<A HREF=\"http://www.koffice.org/\">KOffice</A> and\n"
-"<A HREF=\"http://www.kdevelop.org/\">KDevelop</A>,\n"
-"which can be put to its full usage even outside TDE...\n"
-"</P>\n"
+"<A HREF=\"http://www.trinitydesktop.org/\">TDE web site</A>.</P>\n"
 "<br>\n"
 "<center>\n"
 "<img src=\"crystalsvg/48x48/places/desktop.png\">\n"
 "</center>\n"
 msgstr ""
-"<P>\n"
-" Mae llawer o wybodaeth ynglŷn â TDE ar y\n"
-" <A HREF=\"http://www.kde.org/\">gwefan TDE</A>. Mae\n"
-" gwefannau gwerth eu gweld hefyd am gynhwysiadau bennaf tebyg i\n"
-" <A HREF=\"http://www.konqueror.org/\">Konqueror</A>, \n"
-" <A HREF=\"http://www.koffice.org/\">KSwyddfa</A> ac\n"
-" <A HREF=\"http://www.kdevelop.org/\">KDatblgyu</A>,\n"
-" a ellir ei ddefnyddio hyd yn oed tu allan o TDE...\n"
-" </P>\n"
-" \n"
-" "
-"<center>\n"
-" <img src=\"crystalsvg/48x48/places/desktop.png\">\n"
-" </center>\n"
 
-#: tips.cpp:22
+#: tips.txt:14
 #, fuzzy
 msgid ""
 "<p>\n"
@@ -82,10 +38,6 @@ msgid ""
 "language with the Control Center in \"Regional &amp; Accessibility\"\n"
 "->.\"Country/Region &amp; Language\".\n"
 "</p>\n"
-"<p>For more information about TDE translations and translators, see <a\n"
-"href=\"http://i18n.kde.org/\">http://i18n.kde.org</a>.\n"
-"</p>\n"
-"<br>\n"
 "<center>\n"
 "<img src=\"crystalsvg/48x48/apps/locale.png\">\n"
 "<p align=\"right\"><em>Contributed by Andrea Rizzi</em></p>\n"
@@ -101,7 +53,7 @@ msgstr ""
 " <img src=\"crystalsvg/48x48/apps/locale.png\">\n"
 " <p align=\"right\"><em>Cyfranwyd gan Andrea Rizzi</em></p>\n"
 
-#: tips.cpp:38
+#: tips.txt:26
 #, fuzzy
 msgid ""
 "<p>\n"
@@ -125,7 +77,7 @@ msgstr ""
 " <img src=\"crystalsvg/48x48/places/desktop.png\">\n"
 " </center>\n"
 
-#: tips.cpp:51
+#: tips.txt:39
 #, fuzzy
 msgid ""
 "<p>\n"
@@ -146,7 +98,7 @@ msgstr ""
 "Ganolfan Reoli (Penbwrdd->Paneli, tab Cuddio).\n"
 "</p>\n"
 
-#: tips.cpp:64
+#: tips.txt:52
 #, fuzzy
 msgid ""
 "<p>\n"
@@ -171,7 +123,7 @@ msgstr ""
 " <img src=\"crystalsvg/48x48/apps/klipper.png\">\n"
 " </center>\n"
 
-#: tips.cpp:79
+#: tips.txt:67
 #, fuzzy
 msgid ""
 "<p>\n"
@@ -191,7 +143,7 @@ msgstr ""
 " <img src=\"crystalsvg/48x48/apps/window_list.png\">\n"
 " </center>\n"
 
-#: tips.cpp:90
+#: tips.txt:78
 msgid ""
 "<p>The <b>\"Location\" label</b> in Konqueror is draggable.</p>\n"
 "<p>This means you can create shortcuts (e.g. on the desktop or the panel)\n"
@@ -205,7 +157,7 @@ msgstr ""
 " golygu meysydd i gael yr URL wedi'i deipio i mewn yna (fel y gallwch efo "
 "cysylltau neu ffeiliau sydd wedi'u harddangos yn Konqueror).</p>\n"
 
-#: tips.cpp:99
+#: tips.txt:87
 msgid ""
 "<p>For quick access to TDEPrint Manager type\n"
 "<strong>\"print:/manager\"</strong>... --  <em>\"Type where?\"</em>,\n"
@@ -239,7 +191,7 @@ msgstr ""
 " <img src=\"crystalsvg/48x48/devices/printer1.png\">\n"
 " <p align=\"right\"><em>Cyfrannwyd gan Kurt Pfeifle</em></p>\n"
 
-#: tips.cpp:115
+#: tips.txt:103
 #, fuzzy
 msgid ""
 "<p>\n"
@@ -261,7 +213,7 @@ msgstr ""
 " Wrth gwrs, cewch newid yr ymddygiad hwn yn y Ganolfan Reoli.\n"
 " </p>\n"
 
-#: tips.cpp:127
+#: tips.txt:115
 #, fuzzy
 msgid ""
 "<p>\n"
@@ -280,12 +232,12 @@ msgstr ""
 " "
 "<center><img src=\"crystalsvg/48x48/apps/kcmkwm.png\"></center></p>\n"
 
-#: tips.cpp:138
+#: tips.txt:126
 #, fuzzy
 msgid ""
 "<p>\n"
 "You can assign <b>keyboard shortcuts</b> to your favorite applications in the\n"
-"TDE menu editor (K-menu->Settings->Menu Editor). Select the application\n"
+"TDE menu editor (TDE Menu->Settings->Menu Editor). Select the application\n"
 "(e.g. Konsole), then click on the image next to \"Current shortcut\n"
 "key:\". Press the key combination you want (say, Ctrl+Alt+K).\n"
 "<p>That is it: now you can fire up Konsoles with Ctrl+Alt+K.</p>\n"
@@ -299,7 +251,7 @@ msgstr ""
 " "
 "<p> Dyna fo! Rwan cynnau Konsole efo Ctrl+Alt+K!</p>\n"
 
-#: tips.cpp:148
+#: tips.txt:136
 #, fuzzy
 msgid ""
 "<p>\n"
@@ -316,29 +268,32 @@ msgstr ""
 " \"Nifer y penbyrddau\" yn y Ganolfan Reoli (Penbwrdd->Penbyrddau Lluosol).\n"
 " </p>\n"
 
-#: tips.cpp:159
-#, fuzzy
-msgid ""
-"<p>The TDE project was founded in October 1996 and had its first release,\n"
-"1.0, on July 12, 1998.</p>\n"
+#: tips.txt:147
+msgid ""
+"<p>The <b>Trinity Desktop Environment</b> was born as a fork of the\n"
+"K Desktop Environment version 3.5, which was originally written by the KDE "
+"Team,\n"
+"a world-wide network of software engineers committed to Free Software "
+"development.\n"
+"The name <i>Trinity</i> was chosen because the word means <i>Three</i> as in\n"
+"<i>continuation of KDE 3</i>.</p>\n"
+"<p>Since then, TDE has evolved to be an independent and standalone computer "
+"desktop\n"
+"environment project. The developers have molded the code to its own identity "
+"without\n"
+"giving up on the efficiency, productivity and traditional user interface "
+"experience\n"
+"characteristic of the original KDE 3 series.</p>\n"
+"<p>The KDE project was founded in October 1996 and was first released\n"
+"on July 12, 1998.</p>\n"
+"<p>TDE first release dates back to April 2010.</p>\n"
 "<p>You can <em>support the TDE project</em> with work (programming, designing,\n"
 "documenting, proof-reading, translating, etc.) and financial or\n"
-"hardware donations. Please contact <a\n"
-" href=\"mailto:kde-ev@kde.org\">kde-ev@kde.org</a>\n"
-"if you are interested in donating, or <a\n"
-"href=\"mailto:kde-quality@kde.org\">kde-quality@kde.org</a> if you would\n"
-"like to contribute in other ways.</p>\n"
-msgstr ""
-"<p>Sefydlwyd y cywaith TDE Hydref 1996, a chafodd ei rhyddhau'n gyntaf\n"
-"ar Orffennaf 12, 1998, efo fersiwn 1.0</p>\n"
-"<p>Cewch <em>cefnogi'r cywaith TDE</em> efo rhoddion gwaith (rhaglenni, "
-"dylunio, \n"
-" dogfenni, darllen proflenni, cyfieithu, ayyb) ac arian neu galedwedd. "
-"Cysylltwch â <a\n"
-" href=\"mailto:kde-ev@kde.org\">kde-ev@kde.org</a>\n"
-"os oes gennych ddiddordeb.</p>\n"
-
-#: tips.cpp:172
+"hardware donations. Please contact the TDE team if you are interested in\n"
+"donating, or if you would like to contribute in other ways.</p>\n"
+msgstr ""
+
+#: tips.txt:167
 #, fuzzy
 msgid ""
 "<p>TDE provides some shortcuts to change the size of a window:</p>\n"
@@ -382,12 +337,12 @@ msgstr ""
 "<td>efo botwm de y llygoden</td>\n"
 " </tr></table>\n"
 
-#: tips.cpp:186
+#: tips.txt:181
 #, fuzzy
 msgid ""
 "<p>You can stay up to date with new developments in TDE and releases\n"
-"by regularly checking the web site <A\n"
-" HREF=\"http://www.kde.org\">http://www.kde.org</A>.</p>\n"
+"by regularly checking the <a href=\"http://www.trinitydesktop.org/\">"
+"TDE web site</A>.</p>\n"
 "<BR>\n"
 "<center><img src=\"hicolor/48x48/apps/konqueror.png\"></center></p>\n"
 msgstr ""
@@ -400,11 +355,11 @@ msgstr ""
 " "
 "<center><img src=\"crystalsvg/48x48/apps/konqueror.png\"></center></p>\n"
 
-#: tips.cpp:195
+#: tips.txt:189
 #, fuzzy
 msgid ""
 "<p align=\"center\"><strong>TDEPrinting (I)</strong></p>\n"
-"<p><strong>kprinter</strong>, TDE's new printing utility supports\n"
+"<p><strong>tdeprinter</strong>, TDE's printing utility supports\n"
 "different print subsystems. These subsystems differ very much\n"
 "in their abilities.</p>\n"
 "<p>Among the supported systems are:\n"
@@ -437,14 +392,13 @@ msgstr ""
 " </ul>\n"
 " <p align=\"right\"><strong>-->&nbsp;</strong></p>\n"
 
-#: tips.cpp:211
+#: tips.txt:205
 #, fuzzy
 msgid ""
 "<p align=\"center\"><strong>TDEPrinting (II)</strong></p>\n"
 "<p>Not all print subsystems provide equal abilities\n"
 "for TDEPrint to build on.</p>\n"
-"<p>The TDEPrinting Team\n"
-"recommends installing a <A\n"
+"<p>The TDE developers recommend installing a <A\n"
 "HREF=\"http://www.cups.org/\"><strong>CUPS-based</strong></A>\n"
 "software as the underlying print subsystem.</p>\n"
 "<p> CUPS provides easy usage, powerful features, broad printer\n"
@@ -472,16 +426,13 @@ msgstr ""
 " </p>\n"
 " <p align=\"right\"><em>Wedi'i gyfrannu gan Kurt Pfeifle</em></p>\n"
 
-#: tips.cpp:228
+#: tips.txt:221
 #, fuzzy
 msgid ""
 "<p>\n"
 "TDE is based on a well-designed C++ foundation. C++ is a programming\n"
 "language well suited to desktop development. The TDE object model\n"
-"extends the power of C++ even further. See\n"
-" <a href=\"http://developer.kde.org/\">http://developer.kde.org/</a>\n"
-"for details.</p>"
-"<br>\n"
+"extends the power of C++ even further.\n"
 "<center><img src=\"hicolor/48x48/apps/konqueror.png\"></center>\n"
 msgstr ""
 "<p>\n"
@@ -495,7 +446,7 @@ msgstr ""
 " "
 "<center><img src=\"crystalsvg/48x48/apps/konqueror.png\"></center>\n"
 
-#: tips.cpp:239
+#: tips.txt:230
 msgid ""
 "<p>\n"
 "You can use Konqueror to <strong>browse through tar archives</strong>,\n"
@@ -507,7 +458,7 @@ msgstr ""
 " hyd yn oed rhai crynoedig. Cewch dynnu ffeiliau gan eu llusgo\n"
 " i fan arall, e.e. ffenestr Konqueror arall neu'r penbwrdd.</p>\n"
 
-#: tips.cpp:247
+#: tips.txt:238
 msgid ""
 "<p>\n"
 "You can cycle through the virtual desktops by holding the Ctrl key and\n"
@@ -518,10 +469,10 @@ msgid ""
 "TDE User Guide</a>.</p>\n"
 msgstr ""
 
-#: tips.cpp:257
+#: tips.txt:248
 #, fuzzy
 msgid ""
-"<p>You can start <strong>kprinter</strong> as a standalone program\n"
+"<p>You can start <strong>tdeprinter</strong> as a standalone program\n"
 "from any xterm, Konsole window or from the \"Run Command\" dialog (started\n"
 "by pressing <i>Alt+F2</i>). Then select the file to print. You can print\n"
 "as many items of different types as you want, all at once.\n"
@@ -541,10 +492,10 @@ msgstr ""
 " <img src=\"crystalsvg/48x48/devices/printer2.png\"></center>\n"
 " <p align=\"right\"><em>Cyfrannwyd gan Kurt Pfeifle</em></p>\n"
 
-#: tips.cpp:269
+#: tips.txt:260
 #, fuzzy
 msgid ""
-"<p>You may at any time switch <strong>kprinter</strong> to another\n"
+"<p>You may at any time switch <strong>tdeprinter</strong> to another\n"
 "print subsystem \"on the fly\" (and you do not need to be root to do it.)\n"
 "</p>\n"
 "<p>Laptop users who frequently change to different environments may find\n"
@@ -565,11 +516,11 @@ msgstr ""
 " </p>\n"
 " <p align=\"right\"><em>Cyfrannwyd gan Kurt Pfeifle</em></p>\n"
 
-#: tips.cpp:281
+#: tips.txt:272
 #, fuzzy
 msgid ""
 "<P>\n"
-"TDE's help system can display not only TDE's own HTML-based help, but\n"
+"TDE's help system can display TDE's HTML-based help, but\n"
 "also info and man pages.</P>\n"
 "<p>For more ways of getting help, see <a\n"
 "href=\"help:/khelpcenter/userguide/getting-help.html\">the TDE User\n"
@@ -584,7 +535,7 @@ msgstr ""
 " "
 "<center><img src=\"crystalsvg/48x48/apps/khelpcenter.png\"></center>\n"
 
-#: tips.cpp:293
+#: tips.txt:284
 #, fuzzy
 msgid ""
 "<P>Clicking with the right mouse button on panel icons or applets opens a\n"
@@ -598,7 +549,7 @@ msgstr ""
 " naidlen sy'n eich galluogi i symud neu ddileu'r eitem, neu ychwanegu un "
 "newydd.</P>\n"
 
-#: tips.cpp:302
+#: tips.txt:293
 msgid ""
 "<P>If a toolbar is not large enough to display all buttons on it, you can\n"
 "click on the small arrow at the far right end of the toolbar to see\n"
@@ -608,16 +559,15 @@ msgstr ""
 "cewch glicio ar y saeth bach ar y pen pellaf i'r dde o'r bar offer i weld\n"
 "y botymau sy'n weddill.</P>\n"
 
-#: tips.cpp:309
+#: tips.txt:300
 #, fuzzy
 msgid ""
 "<p>\n"
 "Need comprehensive info about TDEPrinting?"
 "<br> </p>\n"
 "<p> Type <strong>help:/tdeprint/</strong> into a Konqueror address field\n"
-"and get the\n"
-" TDEPrint Handbook\n"
-"displayed.</p> "
+"and get the TDEPrint Handbook</a>\n"
+"displayed.</p>\n"
 "<center>\n"
 "<img src=\"crystalsvg/48x48/devices/printer1.png\">\n"
 msgstr ""
@@ -632,7 +582,7 @@ msgstr ""
 "<center>\n"
 " <img src=\"crystalsvg/48x48/devices/printer2.png\">\n"
 
-#: tips.cpp:328
+#: tips.txt:311
 msgid ""
 "<P>You can run non-TDE applications without problems on a TDE\n"
 "desktop. It is even possible to integrate them into the menu system.\n"
@@ -644,7 +594,7 @@ msgstr ""
 " Bydd y rhaglen \"KAppfinder\" yn chwilio am raglenni adnabyddedig\n"
 " i'w hymgorffori yn y ddewislen.</P>\n"
 
-#: tips.cpp:336
+#: tips.txt:319
 #, fuzzy
 msgid ""
 "<p>You can quickly move the panel to another screen edge by \"grabbing\" it "
@@ -656,10 +606,11 @@ msgstr ""
 "<p>Cewch symud y panel yn sydyn i sgrïn arall trwy \"gydio\" ynddo efo\n"
 " botwm chwith y llygoden a'i symud i le bynnag rydych chi ei eisiau.</p>\n"
 
-#: tips.cpp:344
+#: tips.txt:327
+#, fuzzy
 msgid ""
 "<p>\n"
-"If you need to kill some time, TDE comes with an extensive collection\n"
+"If you want to kill some time, TDE comes with an extensive collection\n"
 "of games.</p>"
 "<br>\n"
 "<center>\n"
@@ -673,7 +624,7 @@ msgstr ""
 "<center>\n"
 "<img src=\"crystalsvg/48x48/apps/package_games.png\">\n"
 
-#: tips.cpp:353
+#: tips.txt:336
 msgid ""
 "<p>You can <strong>quickly change the background</strong> image of the\n"
 "desktop by dragging a graphics image from a Konqueror window to the\n"
@@ -682,7 +633,7 @@ msgstr ""
 "<p>Cewch <strong>newid llun cefndir y penbwrdd</strong> yn sydyn trwy\n"
 " lusgo delwedd graffeg o ffenestr Konqueror i gefndir y penbwrdd.</p>\n"
 
-#: tips.cpp:360
+#: tips.txt:343
 msgid ""
 "<p>You can change the background color of the desktop by dragging a color\n"
 "from a color selector in any application to the desktop background.\n"
@@ -692,7 +643,7 @@ msgstr ""
 " mewn unrhyw raglen i genfdir y penbwrdd.\n"
 " </p>\n"
 
-#: tips.cpp:367
+#: tips.txt:350
 #, fuzzy
 msgid ""
 "<p>\n"
@@ -706,7 +657,7 @@ msgstr ""
 " panel (Dewislen y Panel) a dewis Ychwanegu/Botwm/beth bynnag.\n"
 " </p>\n"
 
-#: tips.cpp:375
+#: tips.txt:358
 #, fuzzy
 msgid ""
 "<p>\n"
@@ -719,7 +670,7 @@ msgstr ""
 "Dewislen y Panel/Ychwanegu/Rhaglennig o'r ddewislen K.\n"
 " </p>\n"
 
-#: tips.cpp:383
+#: tips.txt:366
 #, fuzzy
 msgid ""
 "<p>\n"
@@ -734,7 +685,7 @@ msgstr ""
 " y Panel/Ychwanegu/Rhaglennig/Cychwynydd Cymhwysiad o'r ddewislen K.\n"
 " </p>\n"
 
-#: tips.cpp:393
+#: tips.txt:376
 msgid ""
 "<p>Want to see the local time of your friends or\n"
 "business partners <b>around the world</b>?</p>\n"
@@ -745,7 +696,7 @@ msgstr ""
 " "
 "<p>'Mond i chi wasgu botwm canol y llygoden ar <b>gloc y panel</b>.</p>\n"
 
-#: tips.cpp:400
+#: tips.txt:383
 #, fuzzy
 msgid ""
 "<p>Your <b>panel clock</b> can be configured to display the time\n"
@@ -758,7 +709,7 @@ msgstr ""
 " mewn modd <b>plaen</b>, <b>digidol</b>, <b>analog</b> neu <b>arddull bras.</b>"
 "</p>\n"
 
-#: tips.cpp:409
+#: tips.txt:392
 #, fuzzy
 msgid ""
 "<p>\n"
@@ -781,7 +732,7 @@ msgstr ""
 "<center>\n"
 " <img src=\"crystalsvg/48x48/apps/go.png\">\n"
 
-#: tips.cpp:420
+#: tips.txt:403
 msgid ""
 "<p>\n"
 "You can <strong>browse any URL</strong> by pressing\n"
@@ -802,7 +753,7 @@ msgstr ""
 "<center>\n"
 " <img src=\"crystalsvg/48x48/places/ftp.png\">\n"
 
-#: tips.cpp:431
+#: tips.txt:414
 #, fuzzy
 msgid ""
 "<p>If you are using Konqueror and want to type another location into\n"
@@ -818,7 +769,7 @@ msgstr ""
 " i'r chwith o'r label \"Lleoliad\" a chychwyn teipio.</p>\n"
 "<p>Cewch hefyd wasgu Ctrl+O i agor ymgom i roi lleoliad arall i fewn.</p>\n"
 
-#: tips.cpp:441
+#: tips.txt:424
 #, fuzzy
 msgid ""
 "<p>\n"
@@ -839,7 +790,7 @@ msgstr ""
 "<center>\n"
 " <img src=\"crystalsvg/48x48/apps/khelpcenter.png\">\n"
 
-#: tips.cpp:452
+#: tips.txt:435
 #, fuzzy
 msgid ""
 "<p>\n"
@@ -863,7 +814,7 @@ msgstr ""
 "<center>\n"
 " <img src=\"crystalsvg/48x48/apps/khelpcenter.png\">\n"
 
-#: tips.cpp:465
+#: tips.txt:448
 #, fuzzy
 msgid ""
 "<p>\n"
@@ -881,12 +832,13 @@ msgstr ""
 "<br>\n"
 " Wrth gwrs, gallwch newid yr ymddygiad hwn tryw ddefnyddio'r Ganolfan Reoli.\n"
 
-#: tips.cpp:474
+#: tips.txt:457
+#, fuzzy
 msgid ""
 "<p> Want TDE's printing power in non-TDE apps?  </p>\n"
-"<p> Then use <strong>'kprinter'</strong> as \"print command\".\n"
-"Works with Netscape, Mozilla, Galeon, gv, Acrobat Reader,\n"
-" StarOffice, OpenOffice.org, any GNOME application and many more...</p>\n"
+"<p> Then use <strong>'tdeprinter'</strong> as \"print command\".\n"
+"Works with Firefox, Seamonkey, Epiphany, gv, Acrobat Reader,\n"
+"LibreOffice, OpenOffice, any GNOME application and many more...</p>\n"
 "<center>\n"
 "<img src=\"crystalsvg/48x48/devices/printer1.png\">\n"
 "<p align=\"right\"><em>Contributed by Kurt Pfeifle</em></p>\n"
@@ -901,7 +853,7 @@ msgstr ""
 " <img src=\"crystalsvg/48x48/devices/printer1.png\">\n"
 " <p align=\"right\"><em>Cyfrannwyd gan Kurt Pfeifle</em></p>\n"
 
-#: tips.cpp:488
+#: tips.txt:468
 msgid ""
 "<p>\n"
 "You can <strong>resize a window</strong> on the screen by holding the Alt key,\n"
@@ -912,7 +864,7 @@ msgstr ""
 "Alt,\n"
 " de-glicio unrhyw le i fewn i'r ffenestr a symud y llygoden.</p>\n"
 
-#: tips.cpp:495
+#: tips.txt:475
 #, fuzzy
 msgid ""
 "<p>\n"
@@ -926,23 +878,7 @@ msgstr ""
 " Darpara'r dibynnydd ebost TDE (KMail) <strong>cyfuniad PGP/GnuPG </strong>\n"
 " esmwyth at cêl-ysgrifo a llofnodi eich negeseuon ebost.</p>\n"
 
-#: tips.cpp:505
-#, fuzzy
-msgid ""
-"<p>\n"
-"You can find TDE developers all over the world, e.g., in Germany,\n"
-"Sweden, France, Canada, USA, Australia, Namibia, Argentina, and even in\n"
-"Norway!</p>\n"
-"<p>\n"
-"To see where TDE developers can be found, take a look at <a "
-"href=\"http://worldwide.kde.org\">worldwide.kde.org</a>.</p>\n"
-msgstr ""
-"<p>\n"
-" Cewch hyd i ddatblygwyr TDE dros y byd i gyd, e.e. yn yr Almaen,\n"
-" Sweden, Ffrainc, Canada, UDA, Awstralia, Namibia, yr Ariannin,\n"
-" yn Norwy hyd yn oed!</p>\n"
-
-#: tips.cpp:515
+#: tips.txt:485
 #, fuzzy
 msgid ""
 "<p>\n"
@@ -958,7 +894,7 @@ msgstr ""
 " wybodaeth teitlau a thraciau.\n"
 " </p>\n"
 
-#: tips.cpp:525
+#: tips.txt:495
 msgid ""
 "<p>\n"
 "Some people open many terminal windows just to enter <em>one single</em>\n"
@@ -982,7 +918,7 @@ msgstr ""
 "os ydych angen allbwn testun.\n"
 "</li> </ul>\n"
 
-#: tips.cpp:536
+#: tips.txt:506
 #, fuzzy
 msgid ""
 "<p>\n"
@@ -999,12 +935,12 @@ msgstr ""
 " lliw yn y modiwl <em>Golwg & Themau</em> tu mewn i'r Ganolfan Reoli.\n"
 " </p>\n"
 
-#: tips.cpp:545
+#: tips.txt:515
 #, fuzzy
 msgid ""
 "<p align=\"center\"><strong>TDE Command Line Printing (I)</strong></p>\n"
 "<p> Want to print from command line, without missing TDE's printing power?</p>\n"
-"<p> Type <strong>'kprinter'</strong>. Up pops the\n"
+"<p> Type <strong>'tdeprinter'</strong>. Up pops the\n"
 "TDEPrint dialog. Select printer, print options and\n"
 "print files (note that you may select <em>different</em>\n"
 "files of <em>different</em> types for <em>one</em> print job...). </p>\n"
@@ -1025,14 +961,15 @@ msgstr ""
 " (wedi'i alw trwy wasgu <em>Alt+F2</em>)</p>\n"
 " <p align=\"right\"><strong>-->&nbsp;</strong></p>\n"
 
-#: tips.cpp:557
+#: tips.txt:527
+#, fuzzy
 msgid ""
 "<p align=\"center\"><strong>TDE Command Line Printing (II)</strong></p>\n"
 "<p>\n"
 "You may specify print files and/or name a printer from the command line:\n"
 "<pre>\n"
-"kprinter -d infotec \\\n   /home/kurt/paragliding.jpg \\\n   "
-"../tdeprint-handbook.pdf \\\n   /opt/kde3/flyer.ps\n"
+"tdeprinter -d infotec \\\n   /home/kurt/paragliding.jpg \\\n   "
+"../tdeprint-handbook.pdf \\\n   /opt/trinity/flyer.ps\n"
 "</pre>\n"
 " This prints 3 different files (from different folders) to printer "
 "\"infotec\".\n"
@@ -1060,7 +997,7 @@ msgstr ""
 " <img src=\"crystalsvg/48x48/devices/printer1.png\">\n"
 " <p align=\"right\"><em>Cyfrannwyd gan Kurt Pfeifle</em></p>\n"
 
-#: tips.cpp:575
+#: tips.txt:545
 msgid ""
 "<p>\n"
 "The difference between window manager styles and old-fashioned themes is\n"
@@ -1072,40 +1009,19 @@ msgstr ""
 " bod yr un cyntaf yn adlewyrchu hyd yn oed gosodiadau lliwiau bar teitl y\n"
 " ffenestr o'r Ganolfan Reoli, a gall weithredoli nodweddion gwahanol.</p>\n"
 
-#: tips.cpp:583
+#: tips.txt:553
 msgid ""
 "<p>\n"
-"The K in TDE does not stand for anything. It is the character that comes\n"
-"before L in the Latin alphabet, which stands for Linux. It was chosen\n"
-"because TDE runs on many types of UNIX (and perfectly well on FreeBSD).\n"
-"</p>\n"
+"The K in KDE did not stand for anything special. The K was the\n"
+"character that came before L in the Latin alphabet, which stands for Linux.\n"
+"The K was chosen because KDE ran on many types of UNIX and FreeBSD.\n"
+"The T in TDE does stand for something special. The T stands for Trinity\n"
+"which means three because Trinity is a continuation of the KDE 3.5 code base.\n"
+"The T also represents the name of the Trinity project that brought you this\n"
+"desktop environment. TDE also runs on many types of UNIX and FreeBSD.</p>\n"
 msgstr ""
-"<p>\n"
-" Ni saif y K yn TDE am unrhyw beth. Y llythyren a ddaw o flaen L yn y wyddor\n"
-" Lladin ydy o, sy'n sefyll am Linux. Dewiswyd am fod TDE yn rhedeg\n"
-" ar lawer o mathau gwahanol o UNIX (ac yn berffaith iawn ar FreeBSD).\n"
-" </p>\n"
 
-#: tips.cpp:592
-#, fuzzy
-msgid ""
-"<p>If you want to know when <b>the next release</b> of TDE is planned,\n"
-"look for the release schedule on <a\n"
-" href=\"http://developer.kde.org/\">http://developer.kde.org</a>. If you only\n"
-"find old release schedules, there will probably be some weeks/months of\n"
-"intensive development left before the next release.</p>"
-"<br>\n"
-"<center><img src=\"hicolor/48x48/apps/konqueror.png\"></center>\n"
-msgstr ""
-"<p>Os ydych am wybod pryd bydd <b>rhyddhad nesaf</b> TDE wedi'i gynllunio, \n"
-"edrychwch am y cynllun rhyddhau ar\n"
-"<a href=\"http://developer.kde.org/\">http://developer.kde.org</a>. Os na\n"
-"chewch ond cynlluniau hen, mwy na thebyg bydd rhai wythnosau/misoedd o\n"
-" ddatblygu dwys ar ôl, cyn y rhyddhad nesaf.</p>\n"
-" "
-"<center><img src=\"crystalsvg/48x48/apps/konqueror.png\"></center>\n"
-
-#: tips.cpp:602
+#: tips.txt:565
 #, fuzzy
 msgid ""
 "<p>\n"
@@ -1120,7 +1036,7 @@ msgstr ""
 " olygu'ch addurniad bar teitl trwy dde-glicio eich bar teitl a\n"
 " dewis \"Ffurfweddu...\".</p>\n"
 
-#: tips.cpp:611
+#: tips.txt:574
 #, fuzzy
 msgid ""
 "<p>If you do not like the default completion mode (e.g. in Konqueror), you\n"
@@ -1136,7 +1052,7 @@ msgstr ""
 " gwblhau mewn plisgyn UNIX. Defnyddiwch Ctrl+E i'w alw.\n"
 " </p>\n"
 
-#: tips.cpp:621
+#: tips.txt:584
 #, fuzzy
 msgid ""
 "<p>If you want another panel, to make more space for your applets and\n"
@@ -1152,20 +1068,20 @@ msgstr ""
 "<p>\n"
 " (Cewch roi wedyn unrhyw beth ar y panel newydd, addasu ei faint ac ati.)</p> \n"
 
-#: tips.cpp:630
+#: tips.txt:593
 #, fuzzy
 msgid ""
-"<p>If you want to contribute your own \"tip of the day\", please send it to\n"
-"<a href=\"mailto:kde-doc-english@kde.org\">kde-doc-english@kde.org</a>"
-", and we will be happy to\n"
-" include\n"
-"it in the next release.</p>\n"
+"<p>If you want to contribute your own \"tip of the day\", please send the tip "
+"to\n"
+"<a href=\"trinity-devel@lists.pearsoncomputing.net\">"
+"trinity-devel@lists.pearsoncomputing.net</a>,\n"
+"and we will consider the tip for the next release.</p>\n"
 msgstr ""
 "<p>Os ydych eisiau cyfrannu eich \"cynghoryn y dydd\", a wnewch ei anfon at\n"
 " <a href=\"mailto:kalle@kde.org\">kalle@kde.org</a>, ac mi fyddwn yn falch o'i\n"
 " gyfuno yn y rhyddhau nesaf.</p>\n"
 
-#: tips.cpp:638
+#: tips.txt:600
 msgid ""
 "<p>\n"
 "If you drag a file from Konqueror or from the desktop to Konsole, you\n"
@@ -1184,7 +1100,7 @@ msgstr ""
 " llwybr i gyd yn ffenestr y derfynell.</p>\n"
 " <p align=\"right\"><em>Cyfrannwyd gan Gerard Delafond</em></p>\n"
 
-#: tips.cpp:649
+#: tips.txt:611
 #, fuzzy
 msgid ""
 "<p>\n"
@@ -1204,7 +1120,7 @@ msgstr ""
 " </p>\n"
 " <p align=\"right\"><em>Cyfrannwyd gan Stefan Schimanski</em></p>\n"
 
-#: tips.cpp:661
+#: tips.txt:623
 #, fuzzy
 msgid ""
 "<p>\n"
@@ -1228,7 +1144,7 @@ msgstr ""
 " <p align=\"right\"><em>Cyfrannwyd gan Michael Lachmann and Thomas Diehl</em>"
 "</p>\n"
 
-#: tips.cpp:674
+#: tips.txt:636
 msgid ""
 "<p>\n"
 "Each UNIX user has a so-called Home folder in which his or her\n"
@@ -1246,7 +1162,7 @@ msgstr ""
 " </p>\n"
 " <p align=\"right\"><em>Cyfrannwyd gan Carsten Niehaus</em></p>\n"
 
-#: tips.cpp:685
+#: tips.txt:647
 msgid ""
 "<p>\n"
 "You might wonder why there are very few (if any) files whose\n"
@@ -1269,7 +1185,7 @@ msgstr ""
 " </p>\n"
 " <p align=\"right\"><em>Cyfrannwyd gan Carsten Niehaus</em></p>\n"
 
-#: tips.cpp:698
+#: tips.txt:660
 #, fuzzy
 msgid ""
 "<p>\n"
@@ -1285,7 +1201,7 @@ msgstr ""
 " </p>\n"
 " <p align=\"right\"><em>Cyfrannwyd gan Carsten Niehaus</em></p>\n"
 
-#: tips.cpp:707
+#: tips.txt:669
 msgid ""
 "<p>\n"
 "Did you know that you can use the middle mouse button to paste\n"
@@ -1304,7 +1220,7 @@ msgstr ""
 " </p>\n"
 " <p align=\"right\"><em>Cyfrannwyd gan Carsten Niehaus</em></p>\n"
 
-#: tips.cpp:718
+#: tips.txt:680
 #, fuzzy
 msgid ""
 "<p>\n"
@@ -1312,7 +1228,7 @@ msgid ""
 "</p>\n"
 "<p>\n"
 "Drag a file and drop it on the \"Files\" tab of an opened\n"
-"<strong>kprinter</strong> dialog. </p>\n"
+"<strong>tdeprinter</strong> dialog. </p>\n"
 "<p>Then continue as you would normally: select a printer, job options, etc.\n"
 "and click the \"Print\" button.\n"
 "</p>\n"
@@ -1337,15 +1253,16 @@ msgstr ""
 " <img src=\"crystalsvg/48x48/devices/printer2.png\">\n"
 " <p align=\"right\"><em>Cyfrannwyd gan Kurt Pfeifle</em></p>\n"
 
-#: tips.cpp:734
+#: tips.txt:696
+#, fuzzy
 msgid ""
 "<p>\n"
 "If you need to calculate a distance on the screen, the program\n"
 "<em>kruler</em> can be of great help.</p>\n"
 "<p>\n"
 "Furthermore, if you need to look closely at the ruler to count single\n"
-"pixels, <em>kmag</em> may be very useful. (It is not part of the TDE base\n"
-"installation but needs to be installed separately. It might already be\n"
+"pixels, <em>kmag</em> may be very useful. (<em>kmag</em> is part of the TDE\n"
+"Accessibility package. It might already be\n"
 "available on your distribution.) <em>kmag</em> works\n"
 "just like <em>xmag</em>, with the difference that it magnifies on the fly.\n"
 "</p>\n"
@@ -1366,7 +1283,7 @@ msgstr ""
 " </p>\n"
 " <p align=\"right\"><em>Cyfrannwyd gan Jesper Pedersen</em></p>\n"
 
-#: tips.cpp:749
+#: tips.txt:711
 #, fuzzy
 msgid ""
 "<p>\n"
@@ -1384,7 +1301,7 @@ msgstr ""
 " </p>\n"
 " <p align=\"right\"><em>Cyfrannwyd gan</em></p>\n"
 
-#: tips.cpp:759
+#: tips.txt:721
 #, fuzzy
 msgid ""
 "<p>\n"
@@ -1402,7 +1319,7 @@ msgstr ""
 " </p> \n"
 " <p align=\"right\"><em>Cyfrannwyd gan Jeff Tranter</em></p>\n"
 
-#: tips.cpp:768
+#: tips.txt:730
 #, fuzzy
 msgid ""
 "<p>\n"
@@ -1432,7 +1349,7 @@ msgstr ""
 " </p>\n"
 " <p align=\"right\"><em>Cyfrannwyd gan Jeff Tranter</em></p>\n"
 
-#: tips.cpp:782
+#: tips.txt:744
 msgid ""
 "<p>\n"
 "By holding down the <b>Shift</b> button while moving a container (button\n"
@@ -1446,10 +1363,10 @@ msgstr ""
 " cynwysyddion eraill.\n"
 " </p>\n"
 
-#: tips.cpp:791
+#: tips.txt:753
 msgid ""
 "<p>\n"
-"TDE's 'tdeioslaves' do not just work in Konqueror: you can use network\n"
+"TDE's 'tdeio slaves' do not just work in Konqueror: you can use network\n"
 "URLs in any TDE application. For example, you can enter a URL like\n"
 "ftp://www.server.com/myfile in the Kate Open dialog, and Kate will\n"
 "open the file and save changes back to the FTP server when you click\n"
@@ -1457,7 +1374,7 @@ msgid ""
 "</p>\n"
 msgstr ""
 
-#: tips.cpp:802
+#: tips.txt:764
 msgid ""
 "<p>\n"
 "You can use Konqueror to access your files on any server that you have\n"
@@ -1470,7 +1387,7 @@ msgid ""
 "</p>\n"
 msgstr ""
 
-#: tips.cpp:815
+#: tips.txt:777
 msgid ""
 "<p>\n"
 "KMail, the TDE email client, has built-in support for several popular\n"
@@ -1485,7 +1402,7 @@ msgid ""
 "</p>\n"
 msgstr ""
 
-#: tips.cpp:830
+#: tips.txt:792
 msgid ""
 "<p>\n"
 "You can make a window go below other windows by middle-clicking on its "
@@ -1493,7 +1410,7 @@ msgid ""
 "</p>\n"
 msgstr ""
 
-#: tips.cpp:837
+#: tips.txt:799
 msgid ""
 "<p>\n"
 "TDE applications offer short \"What's This?\" help texts for many\n"
@@ -1503,7 +1420,7 @@ msgid ""
 "</p>\n"
 msgstr ""
 
-#: tips.cpp:847
+#: tips.txt:809
 msgid ""
 "<p>\n"
 "TDE supports several different window focus modes: take a look in the\n"
@@ -1512,7 +1429,7 @@ msgid ""
 "</p>\n"
 msgstr ""
 
-#: tips.cpp:856
+#: tips.txt:818
 msgid ""
 "<p>\n"
 "Konqueror can continuously scroll webpages up or down: just press\n"
@@ -1521,27 +1438,26 @@ msgid ""
 "</p>\n"
 msgstr ""
 
-#: tips.cpp:865
+#: tips.txt:827
 msgid ""
 "<p>You can use Konqueror's help:/ tdeioslave to have quick and easy\n"
 "access to an application's handbook by typing <b>help:/</b>, directly\n"
 "followed by the application name, in the Location bar. So, for example\n"
-"to view the handbook for kwrite simply type help:/kwrite.</p> \n"
+"to view the handbook for kwrite simply type help:/kwrite.</p>\n"
 msgstr ""
 
-#: tips.cpp:873
+#: tips.txt:835
 msgid ""
-"<p>Thanks to the <a href=\"http://svg.kde.org\" title=\"ksvg\">KSVG\n"
-"project</a>, TDE now has full support for the Scalable Vector Graphics\n"
-"(SVG) image filetypes. You can view these images in Konqueror and even\n"
-"set an SVG image as a background for your desktop.</p>\n"
-"<p>There is also a great bunch of <a\n"
-"href=\"http://kdelook.org/index.php?xcontentmode=7\" title=\"kdelook\n"
+"<p>Thanks to the original KSVG project, TDE has full support for Scalable\n"
+"Vector Graphics (SVG) image filetypes. You can view these images in\n"
+"Konqueror and even set an SVG image as a background for your desktop.</p>\n"
+"<p>There is a great bunch of <a\n"
+"href=\"http://kde-look.org/index.php?xcontentmode=7\" title=\"kdelook\n"
 "SVG\">SVG wallpapers</a> for your desktop background available at <a\n"
-"href=\"http://kdelook.org\" title=\"kdelook\">kde-look.org</a>.</p>\n"
+"href=\"http://kde-look.org\" title=\"kdelook\">kde-look.org</a>.</p>\n"
 msgstr ""
 
-#: tips.cpp:885
+#: tips.txt:846
 msgid ""
 "<p>Konqueror's Web Shortcuts feature lets you submit a query directly\n"
 "to a search engine without having to visit the website\n"
@@ -1553,22 +1469,22 @@ msgid ""
 "Shortcuts icon.</p>\n"
 msgstr ""
 
-#: tips.cpp:897
+#: tips.txt:858
 msgid ""
-"<p>TDE is always looking to improve its accessibility, and with the\n"
-"launch of KTTS (TDE Text-to-Speech) you now have the power to convert\n"
+"<p>TDE developers are always looking to improve accessibility, and with\n"
+"KTTS (TDE Text-to-Speech) you have the power to convert\n"
 "strings of text into audible speech. </p>\n"
-"<p>KTTS is constantly improving, and currently provides support to\n"
+"<p>KTTS currently provides support to\n"
 "speak all or any portion of plain text files (as viewed in Kate), HTML\n"
 "pages in Konqueror, text in the TDE clipboard, as well as speech of\n"
 "TDE notifications (KNotify).</p>\n"
 "<p>To start the KTTS system, you can either select KTTS in the TDE\n"
-"menu, or hit Alt+F2 to run a command and then type <b>kttsmgr</b>. For\n"
+"menu, or press Alt+F2 to run a command and then type <b>kttsmgr</b>. For\n"
 "more information on KTTS, check the <a href=\"help:/kttsd\" title=\"KTTSD\n"
 "Handbook\">KTTSD Handbook</a>.</p>\n"
 msgstr ""
 
-#: tips.cpp:912
+#: tips.txt:873
 msgid ""
 "<p>Though TDE is a very stable desktop environment, programs may\n"
 "occasionally freeze or crash, particularly if you are running the\n"
@@ -1583,7 +1499,7 @@ msgid ""
 "used as a last resort.</p>\n"
 msgstr ""
 
-#: tips.cpp:927
+#: tips.txt:888
 msgid ""
 "<p>KMail is TDE's email client, but did you know that you can\n"
 "integrate it -- along with other programs -- to bring them all under\n"
@@ -1592,13 +1508,13 @@ msgid ""
 "<p>Other possible programs to integrate with Kontact include\n"
 "KAddressBook (for handling Contacts), KNotes (for keeping notes),\n"
 "KNode (to keep up-to-date with the latest news), and KOrganizer (for a\n"
-"comprehensive calender).</p>\n"
+"comprehensive calendar).</p>\n"
 msgstr ""
 
-#: tips.cpp:939
+#: tips.txt:900
 msgid ""
 "<p>You can use the mouse wheel to quickly perform a number of tasks;\n"
-"here are a few you might not have known of: \n"
+"here are a few you might not have known of:\n"
 "<ul>"
 "<li>Ctrl+Mouse-Wheel in the Konqueror web browser to change the font-size,\n"
 "or in Konqueror file manager to change icon size.</li>\n"
@@ -1609,22 +1525,22 @@ msgid ""
 "desktop.</li></ul></p>\n"
 msgstr ""
 
-#: tips.cpp:952
+#: tips.txt:913
 msgid ""
 "<p>By pressing F4 in Konqueror you can open a terminal at your current\n"
 "location.</p>\n"
 msgstr ""
 
-#: tips.cpp:958
+#: tips.txt:919
 msgid ""
 "<p>Although TDE will automatically restore your TDE programs that were\n"
 "left open after you logged out, you can specifically tell TDE to start\n"
 "particular applications on start up; see the <a\n"
-"href=\"help:/khelpcenter/faq/configure.html#id2574142\" title=\"Autostart\n"
+"href=\"help:/khelpcenter/faq/configure.html\" title=\"Autostart\n"
 "FAQ\">FAQ entry</a> for more information.</p>\n"
 msgstr ""
 
-#: tips.cpp:967
+#: tips.txt:928
 msgid ""
 "<p>You can integrate Kontact, TDE's Personal Information Management\n"
 "suit, with Kopete, TDE's Instant Messenger client, so that you can\n"
@@ -1634,7 +1550,7 @@ msgid ""
 "title=\"Integrated Messaging\">the TDE User Guide</a>.</p>\n"
 msgstr ""
 
-#: tips.cpp:977
+#: tips.txt:938
 msgid ""
 "<p>By entering <b>kmail --composer</b> in Konsole you can\n"
 "have KMail only open up the composer window, so that you do not have to\n"
@@ -1642,7 +1558,7 @@ msgid ""
 "someone.</p>\n"
 msgstr ""
 
-#: tips.cpp:985
+#: tips.txt:946
 msgid ""
 "<p>While remembering passwords may be tedious, and writing them down\n"
 "on paper or in a text file may be insecure and untidy, TDEWallet is an\n"
@@ -1652,17 +1568,17 @@ msgid ""
 "<p>TDEWallet can be accessed from kcontrol, TDE's Control Center; from\n"
 "there, simply go to Security &amp; Privacy->TDE Wallet. For more\n"
 "information on TDEWallet and on how to use it, check <a\n"
-"href=\"help:/tdewallet\" title=\"tdewallet\">the handbook</a>.</p>\n"
+"href=\"help:/tdewallet\" title=\"tdewallet\">the TDEWallet handbook</a>.</p>\n"
 msgstr ""
 
-#: tips.cpp:998
+#: tips.txt:959
 msgid ""
 "<p>By pressing the Middle Mouse-Button on the desktop you can get a\n"
 "brief list of all the windows on each desktop. From here you can also\n"
 " unclutter or cascade the windows.</p>\n"
 msgstr ""
 
-#: tips.cpp:1005
+#: tips.txt:966
 msgid ""
 "<p>Different virtual desktops can be customized individually, to a\n"
 "certain extent. For example, you can specify a particular background\n"
@@ -1671,7 +1587,7 @@ msgid ""
 "select Configure Desktop.</p>\n"
 msgstr ""
 
-#: tips.cpp:1014
+#: tips.txt:975
 msgid ""
 "<p>While tabbed browsing in Konqueror is very useful, you can take\n"
 "this one step further if you choose to have a split view in order to\n"
@@ -1683,7 +1599,7 @@ msgid ""
 "some of the tabs where you might think it is useful.</p>\n"
 msgstr ""
 
-#: tips.cpp:1026
+#: tips.txt:987
 msgid ""
 "<p>\n"
 "You can let TDE turn the <b>NumLock</b> ON or OFF at startup.\n"
@@ -1716,6 +1632,122 @@ msgstr ""
 "clicio \"Nesaf\" yn mynd â chi yn ôl i'r cyghoryn cyntaf.</i>\n"
 "</p>\n"
 
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Peter Bradley drwy KGyfiethu"
+
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "kyfieithu@dotmon.com"
+
+#: ktipwindow.cpp:32
+msgid "Useful tips"
+msgstr "Cynghorion defnyddiol"
+
+#: ktipwindow.cpp:36
+msgid "KTip"
+msgstr "KCynghoryn"
+
+#: ktipwindow.cpp:52
+msgid "Useful Tips"
+msgstr "Cynghorion Defnyddiol"
+
+#, fuzzy
+#~ msgid ""
+#~ "<P>\n"
+#~ "There is a lot of information about TDE on the\n"
+#~ "<A HREF=\"http://www.kde.org/\">TDE web site</A>. There are\n"
+#~ "also useful sites for major applications like\n"
+#~ "<A HREF=\"http://www.konqueror.org/\">Konqueror</A>,\n"
+#~ "<A HREF=\"http://www.koffice.org/\">KOffice</A> and\n"
+#~ "<A HREF=\"http://www.kdevelop.org/\">KDevelop</A>,\n"
+#~ "which can be put to its full usage even outside TDE...\n"
+#~ "</P>\n"
+#~ "<br>\n"
+#~ "<center>\n"
+#~ "<img src=\"crystalsvg/48x48/places/desktop.png\">\n"
+#~ "</center>\n"
+#~ msgstr ""
+#~ "<P>\n"
+#~ " Mae llawer o wybodaeth ynglŷn â TDE ar y\n"
+#~ " <A HREF=\"http://www.kde.org/\">gwefan TDE</A>. Mae\n"
+#~ " gwefannau gwerth eu gweld hefyd am gynhwysiadau bennaf tebyg i\n"
+#~ " <A HREF=\"http://www.konqueror.org/\">Konqueror</A>, \n"
+#~ " <A HREF=\"http://www.koffice.org/\">KSwyddfa</A> ac\n"
+#~ " <A HREF=\"http://www.kdevelop.org/\">KDatblgyu</A>,\n"
+#~ " a ellir ei ddefnyddio hyd yn oed tu allan o TDE...\n"
+#~ " </P>\n"
+#~ " \n"
+#~ " <center>\n"
+#~ " <img src=\"crystalsvg/48x48/places/desktop.png\">\n"
+#~ " </center>\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "<p>The TDE project was founded in October 1996 and had its first release,\n"
+#~ "1.0, on July 12, 1998.</p>\n"
+#~ "<p>You can <em>support the TDE project</em> with work (programming, designing,\n"
+#~ "documenting, proof-reading, translating, etc.) and financial or\n"
+#~ "hardware donations. Please contact <a\n"
+#~ " href=\"mailto:kde-ev@kde.org\">kde-ev@kde.org</a>\n"
+#~ "if you are interested in donating, or <a\n"
+#~ "href=\"mailto:kde-quality@kde.org\">kde-quality@kde.org</a> if you would\n"
+#~ "like to contribute in other ways.</p>\n"
+#~ msgstr ""
+#~ "<p>Sefydlwyd y cywaith TDE Hydref 1996, a chafodd ei rhyddhau'n gyntaf\n"
+#~ "ar Orffennaf 12, 1998, efo fersiwn 1.0</p>\n"
+#~ "<p>Cewch <em>cefnogi'r cywaith TDE</em> efo rhoddion gwaith (rhaglenni, dylunio, \n"
+#~ " dogfenni, darllen proflenni, cyfieithu, ayyb) ac arian neu galedwedd. Cysylltwch â <a\n"
+#~ " href=\"mailto:kde-ev@kde.org\">kde-ev@kde.org</a>\n"
+#~ "os oes gennych ddiddordeb.</p>\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "<p>\n"
+#~ "You can find TDE developers all over the world, e.g., in Germany,\n"
+#~ "Sweden, France, Canada, USA, Australia, Namibia, Argentina, and even in\n"
+#~ "Norway!</p>\n"
+#~ "<p>\n"
+#~ "To see where TDE developers can be found, take a look at <a href=\"http://worldwide.kde.org\">worldwide.kde.org</a>.</p>\n"
+#~ msgstr ""
+#~ "<p>\n"
+#~ " Cewch hyd i ddatblygwyr TDE dros y byd i gyd, e.e. yn yr Almaen,\n"
+#~ " Sweden, Ffrainc, Canada, UDA, Awstralia, Namibia, yr Ariannin,\n"
+#~ " yn Norwy hyd yn oed!</p>\n"
+
+#~ msgid ""
+#~ "<p>\n"
+#~ "The K in TDE does not stand for anything. It is the character that comes\n"
+#~ "before L in the Latin alphabet, which stands for Linux. It was chosen\n"
+#~ "because TDE runs on many types of UNIX (and perfectly well on FreeBSD).\n"
+#~ "</p>\n"
+#~ msgstr ""
+#~ "<p>\n"
+#~ " Ni saif y K yn TDE am unrhyw beth. Y llythyren a ddaw o flaen L yn y wyddor\n"
+#~ " Lladin ydy o, sy'n sefyll am Linux. Dewiswyd am fod TDE yn rhedeg\n"
+#~ " ar lawer o mathau gwahanol o UNIX (ac yn berffaith iawn ar FreeBSD).\n"
+#~ " </p>\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "<p>If you want to know when <b>the next release</b> of TDE is planned,\n"
+#~ "look for the release schedule on <a\n"
+#~ " href=\"http://developer.kde.org/\">http://developer.kde.org</a>. If you only\n"
+#~ "find old release schedules, there will probably be some weeks/months of\n"
+#~ "intensive development left before the next release.</p><br>\n"
+#~ "<center><img src=\"hicolor/48x48/apps/konqueror.png\"></center>\n"
+#~ msgstr ""
+#~ "<p>Os ydych am wybod pryd bydd <b>rhyddhad nesaf</b> TDE wedi'i gynllunio, \n"
+#~ "edrychwch am y cynllun rhyddhau ar\n"
+#~ "<a href=\"http://developer.kde.org/\">http://developer.kde.org</a>. Os na\n"
+#~ "chewch ond cynlluniau hen, mwy na thebyg bydd rhai wythnosau/misoedd o\n"
+#~ " ddatblygu dwys ar ôl, cyn y rhyddhad nesaf.</p>\n"
+#~ " <center><img src=\"crystalsvg/48x48/apps/konqueror.png\"></center>\n"
+
 #~ msgid ""
 #~ "<p>\n"
 #~ "You can cycle through the virtual desktops by holding the Ctrl key and\n"
diff --git a/tde-i18n-cy/messages/tdebase/kwriteconfig.po b/tde-i18n-cy/messages/tdebase/kwriteconfig.po
index c5c9f7d8cec..c8fac7e8e52 100644
--- a/tde-i18n-cy/messages/tdebase/kwriteconfig.po
+++ b/tde-i18n-cy/messages/tdebase/kwriteconfig.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kwriteconfig\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-07-22 17:02+0100\n"
 "Last-Translator: KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdebase/kxkb.po b/tde-i18n-cy/messages/tdebase/kxkb.po
index 891a00545bf..c8702c7ca7a 100644
--- a/tde-i18n-cy/messages/tdebase/kxkb.po
+++ b/tde-i18n-cy/messages/tdebase/kxkb.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kxkb\n"
-"POT-Creation-Date: 2006-04-06 03:54+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-12-26 23:53+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdebase/libdmctl.po b/tde-i18n-cy/messages/tdebase/libdmctl.po
index c19ebc0a631..a371a0fd585 100644
--- a/tde-i18n-cy/messages/tdebase/libdmctl.po
+++ b/tde-i18n-cy/messages/tdebase/libdmctl.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: all2.po\n"
-"POT-Creation-Date: 2007-11-02 01:14+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdebase/libkicker.po b/tde-i18n-cy/messages/tdebase/libkicker.po
index 65fdb7b73bf..e3f66273fde 100644
--- a/tde-i18n-cy/messages/tdebase/libkicker.po
+++ b/tde-i18n-cy/messages/tdebase/libkicker.po
@@ -5,28 +5,29 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkicker\n"
-"POT-Creation-Date: 2008-07-31 01:15+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-07-22 17:05+0100\n"
 "Last-Translator: KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: panner.cpp:77
+#: panner.cpp:108
 msgid "Scroll left"
 msgstr "Sgrolio i'r chwith"
 
-#: panner.cpp:78
+#: panner.cpp:109
 msgid "Scroll right"
 msgstr "Sgrolio i'r dde"
 
-#: panner.cpp:91
+#: panner.cpp:122
 msgid "Scroll up"
 msgstr "Sgrolio i fyny"
 
-#: panner.cpp:92
+#: panner.cpp:123
 msgid "Scroll down"
 msgstr "Sgrolio i lawr"
 
@@ -58,46 +59,80 @@ msgstr ""
 
 #. i18n: file kickerSettings.kcfg line 30
 #: rc.cpp:15
+#, no-c-format
+msgid "Enable resize handles"
+msgstr ""
+
+#. i18n: file kickerSettings.kcfg line 31
+#: rc.cpp:18
+#, no-c-format
+msgid ""
+"When this option is enabled, the panel will provide a resize handle on order to "
+"change its width via click-and-drag"
+msgstr ""
+
+#. i18n: file kickerSettings.kcfg line 36
+#: rc.cpp:21
+#, no-c-format
+msgid "Make the task buttons push further into the screen when activated"
+msgstr ""
+
+#. i18n: file kickerSettings.kcfg line 41
+#: rc.cpp:24
 #, fuzzy, no-c-format
 msgid "Enable transparency for menubar panel"
 msgstr "Galluogi tryloywder"
 
-#. i18n: file kickerSettings.kcfg line 31
-#: rc.cpp:18
+#. i18n: file kickerSettings.kcfg line 42
+#: rc.cpp:27
 #, no-c-format
 msgid ""
 "When this option is enabled, the panel containing the menubar will become "
 "pseudo-transparent as well"
 msgstr ""
 
-#. i18n: file kickerSettings.kcfg line 36
-#: rc.cpp:21
+#. i18n: file kickerSettings.kcfg line 47
+#: rc.cpp:30
+#, fuzzy, no-c-format
+msgid "Enable blurring for menubar panel"
+msgstr "Galluogi tryloywder"
+
+#. i18n: file kickerSettings.kcfg line 48
+#: rc.cpp:33
+#, no-c-format
+msgid ""
+"When this option is enabled, the panel containing the menubar will blur "
+"pseudo-transparent image"
+msgstr ""
+
+#. i18n: file kickerSettings.kcfg line 53
+#: rc.cpp:36
 #, no-c-format
 msgid "Enable background image"
 msgstr "Galluogi delwedd gefndir:"
 
-#. i18n: file kickerSettings.kcfg line 37
-#: rc.cpp:24
+#. i18n: file kickerSettings.kcfg line 54
+#: rc.cpp:39
 #, no-c-format
 msgid ""
 "When this option is enabled, the panel will display a tiled image as its "
 "background"
 msgstr ""
 
-#. i18n: file kickerSettings.kcfg line 42
-#: rc.cpp:27
+#. i18n: file kickerSettings.kcfg line 59
+#: rc.cpp:42
 #, no-c-format
 msgid "Enable colourized background."
 msgstr ""
 
-#. i18n: file kickerSettings.kcfg line 47
-#: rc.cpp:30
+#. i18n: file kickerSettings.kcfg line 64
+#: rc.cpp:45
 #, no-c-format
 msgid "Rotate background"
 msgstr ""
 
-#. i18n: file kickerSettings.kcfg line 48
-#: rc.cpp:33
+#. i18n: file kickerSettings.kcfg line 65
+#: rc.cpp:48
 #, no-c-format
 msgid ""
 "When this option is enabled, when the panel is placed on the side or top edges "
@@ -105,14 +140,14 @@ msgid ""
 "orientation"
 msgstr ""
 
-#. i18n: file kickerSettings.kcfg line 53
-#: rc.cpp:36
+#. i18n: file kickerSettings.kcfg line 70
+#: rc.cpp:51
 #, no-c-format
 msgid "Background image"
 msgstr "Delwedd gefndir"
 
-#. i18n: file kickerSettings.kcfg line 54
-#: rc.cpp:39
+#. i18n: file kickerSettings.kcfg line 71
+#: rc.cpp:54
 #, no-c-format
 msgid ""
 "Here you can choose an image to be displayed on the panel. Press the 'browse' "
@@ -120,67 +155,73 @@ msgid ""
 "if 'Enable background image' is selected"
 msgstr ""
 
-#. i18n: file kickerSettings.kcfg line 59
-#: rc.cpp:42
+#. i18n: file kickerSettings.kcfg line 76
+#: rc.cpp:57
 #, no-c-format
 msgid ""
 "Controls the saturation level of the tint color used with transparent panels"
 msgstr ""
 
-#. i18n: file kickerSettings.kcfg line 66
-#: rc.cpp:45
+#. i18n: file kickerSettings.kcfg line 83
+#: rc.cpp:60
 #, no-c-format
 msgid "The tint color used to colorize transparent panels"
 msgstr ""
 
-#. i18n: file kickerSettings.kcfg line 68
-#: rc.cpp:48
+#. i18n: file kickerSettings.kcfg line 85
+#: rc.cpp:63
 #, no-c-format
 msgid "This option sets the color to use when tinting transparent panels"
 msgstr ""
 
-#. i18n: file kickerSettings.kcfg line 72
-#: rc.cpp:51
+#. i18n: file kickerSettings.kcfg line 89
+#: rc.cpp:66
 #, no-c-format
 msgid "Raise when the pointer touches the screen here"
 msgstr ""
 
-#. i18n: file kickerSettings.kcfg line 77
-#: rc.cpp:54
+#. i18n: file kickerSettings.kcfg line 94
+#: rc.cpp:69
 #, no-c-format
 msgid "Fade out applet handles"
 msgstr ""
 
-#. i18n: file kickerSettings.kcfg line 79
-#: rc.cpp:57
+#. i18n: file kickerSettings.kcfg line 96
+#: rc.cpp:72
 #, no-c-format
 msgid ""
 "Select this option to make applet handles only visible on mouse hover. Applet "
 "handles let you move, remove and configure applets."
 msgstr ""
 
-#. i18n: file kickerSettings.kcfg line 83
-#: rc.cpp:60
+#. i18n: file kickerSettings.kcfg line 100
+#: rc.cpp:75
 #, no-c-format
 msgid "Hide applet handles"
 msgstr ""
 
-#. i18n: file kickerSettings.kcfg line 85
-#: rc.cpp:63
+#. i18n: file kickerSettings.kcfg line 102
+#: rc.cpp:78
 #, no-c-format
 msgid ""
 "Select this option to always hide the applet handles. Beware this could disable "
 "moving, removing or configuring some applets."
 msgstr ""
 
-#. i18n: file kickerSettings.kcfg line 89
-#: rc.cpp:66
+#. i18n: file kickerSettings.kcfg line 106
+#: rc.cpp:81
 #, no-c-format
 msgid "Show informational tooltips"
 msgstr ""
 
-#. i18n: file kickerSettings.kcfg line 94
-#: rc.cpp:69
+#. i18n: file kickerSettings.kcfg line 111
+#: rc.cpp:84
+#, no-c-format
+msgid "Show visual effect when panel icon is activated."
+msgstr ""
+
+#. i18n: file kickerSettings.kcfg line 116
+#: rc.cpp:87
 #, no-c-format
 msgid ""
 "A list of applets that have been loaded at runtime. In the case of a crash "
@@ -188,8 +229,8 @@ msgid ""
 "the crash"
 msgstr ""
 
-#. i18n: file kickerSettings.kcfg line 98
-#: rc.cpp:72
+#. i18n: file kickerSettings.kcfg line 120
+#: rc.cpp:90
 #, no-c-format
 msgid ""
 "A list of extensions that have been loaded at runtime. In the case of a crash "
@@ -197,263 +238,391 @@ msgid ""
 "caused the crash"
 msgstr ""
 
-#. i18n: file kickerSettings.kcfg line 108
-#: rc.cpp:75
+#. i18n: file kickerSettings.kcfg line 124
+#: rc.cpp:93
+#, no-c-format
+msgid "When this option is enabled, the classic TDE Menu is used."
+msgstr ""
+
+#. i18n: file kickerSettings.kcfg line 129
+#: rc.cpp:96
+#, no-c-format
+msgid "When this option is enabled, the Kickoff Menu opens on mouse hover."
+msgstr ""
+
+#. i18n: file kickerSettings.kcfg line 134
+#: rc.cpp:99
+#, no-c-format
+msgid ""
+"When this option is enabled, the Kickoff Menu application view switching will "
+"scroll."
+msgstr ""
+
+#. i18n: file kickerSettings.kcfg line 139
+#: rc.cpp:102 rc.cpp:105
+#, no-c-format
+msgid "Preferred width of the KMenu"
+msgstr ""
+
+#. i18n: file kickerSettings.kcfg line 149
+#: rc.cpp:108
+#, no-c-format
+msgid "With this option the scale of the fonts Kickoff uses can be influenced"
+msgstr ""
+
+#. i18n: file kickerSettings.kcfg line 156
+#: rc.cpp:111
+#, no-c-format
+msgid ""
+"When this option is enabled, tdeabc is utilized to search for addresses. This "
+"may start KMail."
+msgstr ""
+
+#. i18n: file kickerSettings.kcfg line 161
+#: rc.cpp:114
+#, no-c-format
+msgid ""
+"When this option is enabled, the Geeko eye moves when the mouse hovers the "
+"start menu button"
+msgstr ""
+
+#. i18n: file kickerSettings.kcfg line 168
+#: rc.cpp:117
+#, no-c-format
+msgid "Show names and icons on tabs"
+msgstr ""
+
+#. i18n: file kickerSettings.kcfg line 171
+#: rc.cpp:120
+#, no-c-format
+msgid "Show only the names"
+msgstr ""
+
+#. i18n: file kickerSettings.kcfg line 174
+#: rc.cpp:123
+#, no-c-format
+msgid "Show only the icons"
+msgstr ""
+
+#. i18n: file kickerSettings.kcfg line 178
+#: rc.cpp:126
+#, no-c-format
+msgid "Appearace of the Kickoff tabbar"
+msgstr ""
+
+#. i18n: file kickerSettings.kcfg line 182
+#: rc.cpp:129
+#, no-c-format
+msgid ""
+"When this option is enabled, the tabs in the Kickoff menu will switch without "
+"the need to click"
+msgstr ""
+
+#. i18n: file kickerSettings.kcfg line 194
+#: rc.cpp:132
 #, no-c-format
 msgid "Show simple menu entries"
 msgstr ""
 
-#. i18n: file kickerSettings.kcfg line 111
-#: rc.cpp:78
+#. i18n: file kickerSettings.kcfg line 197
+#: rc.cpp:135
 #, no-c-format
 msgid "Show names first on detailed entries"
 msgstr ""
 
-#. i18n: file kickerSettings.kcfg line 114
-#: rc.cpp:81
+#. i18n: file kickerSettings.kcfg line 200
+#: rc.cpp:138
 #, no-c-format
 msgid "Show only description for menu entries"
 msgstr ""
 
-#. i18n: file kickerSettings.kcfg line 117
-#: rc.cpp:84
+#. i18n: file kickerSettings.kcfg line 203
+#: rc.cpp:141
 #, no-c-format
 msgid "Show detailed menu entries"
 msgstr ""
 
-#. i18n: file kickerSettings.kcfg line 121
-#: rc.cpp:87
+#. i18n: file kickerSettings.kcfg line 207
+#: rc.cpp:144
 #, no-c-format
 msgid "Formation of the menu entry text"
 msgstr ""
 
-#. i18n: file kickerSettings.kcfg line 125
-#: rc.cpp:90
+#. i18n: file kickerSettings.kcfg line 211
+#: rc.cpp:147
 #, no-c-format
 msgid "Show section titles in Kmenu"
 msgstr ""
 
-#. i18n: file kickerSettings.kcfg line 130
-#: rc.cpp:93
+#. i18n: file kickerSettings.kcfg line 216
+#: rc.cpp:150
+#, no-c-format
+msgid "Simplify menus with only a single item inside"
+msgstr ""
+
+#. i18n: file kickerSettings.kcfg line 221
+#: rc.cpp:153
 #, no-c-format
 msgid "Height of menu entries in pixels"
 msgstr ""
 
-#. i18n: file kickerSettings.kcfg line 135
-#: rc.cpp:96
+#. i18n: file kickerSettings.kcfg line 226
+#: rc.cpp:156
 #, no-c-format
 msgid "Show hidden files in Quick Browser"
 msgstr ""
 
-#. i18n: file kickerSettings.kcfg line 140
-#: rc.cpp:99
+#. i18n: file kickerSettings.kcfg line 231
+#: rc.cpp:159
 #, no-c-format
 msgid "Maximum number of entries"
 msgstr ""
 
-#. i18n: file kickerSettings.kcfg line 146
-#: rc.cpp:102
+#. i18n: file kickerSettings.kcfg line 237
+#: rc.cpp:162
 #, no-c-format
 msgid "Show bookmarks in KMenu"
 msgstr ""
 
-#. i18n: file kickerSettings.kcfg line 151
-#: rc.cpp:105
+#. i18n: file kickerSettings.kcfg line 242
+#: rc.cpp:165
 #, no-c-format
 msgid "Use the Quick Browser"
 msgstr ""
 
-#. i18n: file kickerSettings.kcfg line 156
-#: rc.cpp:108
+#. i18n: file kickerSettings.kcfg line 247
+#: rc.cpp:168
 #, no-c-format
 msgid "Optional Menus"
 msgstr ""
 
-#. i18n: file kickerSettings.kcfg line 161
-#: rc.cpp:111
+#. i18n: file kickerSettings.kcfg line 252
+#: rc.cpp:171
 #, no-c-format
 msgid "Recently used applications"
 msgstr "Cymhwysiadau a Ddefnyddwyd yn Ddiweddar"
 
-#. i18n: file kickerSettings.kcfg line 165
-#: rc.cpp:114
+#. i18n: file kickerSettings.kcfg line 256
+#: rc.cpp:174
 #, no-c-format
 msgid "Number of visible entries"
 msgstr ""
 
-#. i18n: file kickerSettings.kcfg line 171
-#: rc.cpp:117
+#. i18n: file kickerSettings.kcfg line 262
+#: rc.cpp:177
 #, no-c-format
 msgid "Show most recently used applications rather than most frequently used"
 msgstr ""
 
-#. i18n: file kickerSettings.kcfg line 180
-#: rc.cpp:120
+#. i18n: file kickerSettings.kcfg line 267
+#: rc.cpp:180
+#, no-c-format
+msgid "The menu entries shown in the Favorites tab"
+msgstr ""
+
+#. i18n: file kickerSettings.kcfg line 271
+#: rc.cpp:183
+#, no-c-format
+msgid "Whether the panel has been started before or not"
+msgstr ""
+
+#. i18n: file kickerSettings.kcfg line 276
+#: rc.cpp:186
+#, no-c-format
+msgid "When the applications were first seen by Kickoff"
+msgstr ""
+
+#. i18n: file kickerSettings.kcfg line 284
+#: rc.cpp:189
 #, no-c-format
 msgid "Enable a tile background image for the KMenu button"
 msgstr ""
 
-#. i18n: file kickerSettings.kcfg line 185
-#: rc.cpp:123
+#. i18n: file kickerSettings.kcfg line 289
+#: rc.cpp:192
 #, no-c-format
 msgid "Enable a tile background image for the Desktop button"
 msgstr ""
 
-#. i18n: file kickerSettings.kcfg line 190
-#: rc.cpp:126
+#. i18n: file kickerSettings.kcfg line 294
+#: rc.cpp:195
 #, no-c-format
 msgid "Enable a tile background image for Application, URL and special buttons"
 msgstr ""
 
-#. i18n: file kickerSettings.kcfg line 195
-#: rc.cpp:129
+#. i18n: file kickerSettings.kcfg line 299
+#: rc.cpp:198
 #, no-c-format
 msgid "Enable a tile background image for the Quick Browser button"
 msgstr ""
 
-#. i18n: file kickerSettings.kcfg line 200
-#: rc.cpp:132
+#. i18n: file kickerSettings.kcfg line 304
+#: rc.cpp:201
 #, no-c-format
 msgid "Enable a tile background image for the Window List button"
 msgstr ""
 
-#. i18n: file kickerSettings.kcfg line 205
-#: rc.cpp:135
+#. i18n: file kickerSettings.kcfg line 309
+#: rc.cpp:204
 #, no-c-format
 msgid "Image tile for Kmenu button background"
 msgstr ""
 
-#. i18n: file kickerSettings.kcfg line 209
-#: rc.cpp:138 rc.cpp:144
+#. i18n: file kickerSettings.kcfg line 313
+#: rc.cpp:207 rc.cpp:213
 #, no-c-format
 msgid "Color to use for Kmenu button background"
 msgstr ""
 
-#. i18n: file kickerSettings.kcfg line 214
-#: rc.cpp:141
+#. i18n: file kickerSettings.kcfg line 318
+#: rc.cpp:210
 #, no-c-format
 msgid "Image tile for Desktop button background"
 msgstr ""
 
-#. i18n: file kickerSettings.kcfg line 223
-#: rc.cpp:147
+#. i18n: file kickerSettings.kcfg line 327
+#: rc.cpp:216
 #, no-c-format
 msgid "Image tile for Application, URL and special button backgrounds"
 msgstr ""
 
-#. i18n: file kickerSettings.kcfg line 227
-#: rc.cpp:150
+#. i18n: file kickerSettings.kcfg line 331
+#: rc.cpp:219
 #, no-c-format
 msgid "Color to use for Application, URL and special button backgrounds"
 msgstr ""
 
-#. i18n: file kickerSettings.kcfg line 232
-#: rc.cpp:153
+#. i18n: file kickerSettings.kcfg line 336
+#: rc.cpp:222
 #, no-c-format
 msgid "Image tile for Browser button background"
 msgstr ""
 
-#. i18n: file kickerSettings.kcfg line 236
-#: rc.cpp:156
+#. i18n: file kickerSettings.kcfg line 340
+#: rc.cpp:225
 #, no-c-format
 msgid "Color to use for Browser button background"
 msgstr ""
 
-#. i18n: file kickerSettings.kcfg line 241
-#: rc.cpp:159
+#. i18n: file kickerSettings.kcfg line 345
+#: rc.cpp:228
 #, no-c-format
 msgid "Image tile for Window List button background"
 msgstr ""
 
-#. i18n: file kickerSettings.kcfg line 245
-#: rc.cpp:162
+#. i18n: file kickerSettings.kcfg line 349
+#: rc.cpp:231
 #, no-c-format
 msgid "Color to use for Window List button background"
 msgstr ""
 
-#. i18n: file kickerSettings.kcfg line 254
-#: rc.cpp:165
+#. i18n: file kickerSettings.kcfg line 358
+#: rc.cpp:234
 #, no-c-format
 msgid "Use side image in Kmenu"
 msgstr ""
 
-#. i18n: file kickerSettings.kcfg line 259
-#: rc.cpp:168
+#. i18n: file kickerSettings.kcfg line 363
+#: rc.cpp:237
+#, no-c-format
+msgid "Use Tooltip in Kmenu"
+msgstr ""
+
+#. i18n: file kickerSettings.kcfg line 368
+#: rc.cpp:240
+#, no-c-format
+msgid "Show searh field in Kmenu"
+msgstr ""
+
+#. i18n: file kickerSettings.kcfg line 373
+#: rc.cpp:243
 #, no-c-format
 msgid "The name of the file to use as the side image in the TDE Menu"
 msgstr ""
 
-#. i18n: file kickerSettings.kcfg line 264
-#: rc.cpp:171
+#. i18n: file kickerSettings.kcfg line 378
+#: rc.cpp:246
 #, no-c-format
 msgid ""
 "The name of the file used as a tile to fill the height of TDE Menu that "
 "SidePixmapName does not cover"
 msgstr ""
 
-#. i18n: file kickerSettings.kcfg line 269
-#: rc.cpp:174
+#. i18n: file kickerSettings.kcfg line 383
+#: rc.cpp:249
 #, no-c-format
 msgid "Show text on the TDE Menu button"
 msgstr ""
 
-#. i18n: file kickerSettings.kcfg line 274
-#: rc.cpp:177
+#. i18n: file kickerSettings.kcfg line 388
+#: rc.cpp:252
 #, no-c-format
 msgid "Text to be shown on TDE Menu Button"
 msgstr ""
 
-#. i18n: file kickerSettings.kcfg line 283
-#: rc.cpp:180
+#. i18n: file kickerSettings.kcfg line 393
+#: rc.cpp:255
+#, no-c-format
+msgid "Custom TDE Menu Button Icon"
+msgstr ""
+
+#. i18n: file kickerSettings.kcfg line 402
+#: rc.cpp:258
 #, no-c-format
 msgid "Enable icon mouse over effects"
 msgstr ""
 
-#. i18n: file kickerSettings.kcfg line 288
-#: rc.cpp:183
+#. i18n: file kickerSettings.kcfg line 407
+#: rc.cpp:261
 #, no-c-format
 msgid "Show icons in mouse over effects"
 msgstr ""
 
-#. i18n: file kickerSettings.kcfg line 293
-#: rc.cpp:186
+#. i18n: file kickerSettings.kcfg line 412
+#: rc.cpp:264
 #, no-c-format
 msgid "Show text in mouse over effects"
 msgstr ""
 
-#. i18n: file kickerSettings.kcfg line 298
-#: rc.cpp:189
+#. i18n: file kickerSettings.kcfg line 417
+#: rc.cpp:267
 #, no-c-format
 msgid ""
 "Controls how fast the tooltips fade in, measured in thousandths of a second"
 msgstr ""
 
-#. i18n: file kickerSettings.kcfg line 304
-#: rc.cpp:192
+#. i18n: file kickerSettings.kcfg line 423
+#: rc.cpp:270
 #, no-c-format
 msgid "Mouse over effects are shown after the defined time (in milliseconds)"
 msgstr ""
 
-#. i18n: file kickerSettings.kcfg line 309
-#: rc.cpp:195
+#. i18n: file kickerSettings.kcfg line 428
+#: rc.cpp:273
 #, no-c-format
 msgid "Mouse over effects are hidden after the defined time (in milliseconds)"
 msgstr ""
 
-#. i18n: file kickerSettings.kcfg line 314
-#: rc.cpp:198
+#. i18n: file kickerSettings.kcfg line 433
+#: rc.cpp:276
 #, no-c-format
 msgid "Enable background tiles"
 msgstr ""
 
-#. i18n: file kickerSettings.kcfg line 319
-#: rc.cpp:201
+#. i18n: file kickerSettings.kcfg line 438
+#: rc.cpp:279
 #, no-c-format
 msgid "The margin between panel icons and the panel border"
 msgstr ""
 
-#. i18n: file kickerSettings.kcfg line 324
-#: rc.cpp:204
+#. i18n: file kickerSettings.kcfg line 443
+#: rc.cpp:282
+#, no-c-format
+msgid "The maximum height of the TDE Menu button in pixels"
+msgstr ""
+
+#. i18n: file kickerSettings.kcfg line 448
+#: rc.cpp:285
 #, no-c-format
 msgid ""
 "Buttons that represent KServices (applications, primarily) watch for the "
@@ -461,14 +630,14 @@ msgid ""
 "turns this off."
 msgstr ""
 
-#. i18n: file kickerSettings.kcfg line 329
-#: rc.cpp:207
+#. i18n: file kickerSettings.kcfg line 453
+#: rc.cpp:288
 #, no-c-format
 msgid "Font for the buttons with text."
 msgstr ""
 
-#. i18n: file kickerSettings.kcfg line 334
-#: rc.cpp:210
+#. i18n: file kickerSettings.kcfg line 458
+#: rc.cpp:291
 #, no-c-format
 msgid "Text color for the buttons."
 msgstr ""
diff --git a/tde-i18n-cy/messages/tdebase/libkickermenu_konsole.po b/tde-i18n-cy/messages/tdebase/libkickermenu_konsole.po
index 1b7278e2643..e04b061cc6b 100644
--- a/tde-i18n-cy/messages/tdebase/libkickermenu_konsole.po
+++ b/tde-i18n-cy/messages/tdebase/libkickermenu_konsole.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkickermenu_konsole\n"
-"POT-Creation-Date: 2006-02-23 03:46+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-07-22 17:04+0100\n"
 "Last-Translator: KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdebase/libkickermenu_prefmenu.po b/tde-i18n-cy/messages/tdebase/libkickermenu_prefmenu.po
index 28d565ea86d..4f828f9757c 100644
--- a/tde-i18n-cy/messages/tdebase/libkickermenu_prefmenu.po
+++ b/tde-i18n-cy/messages/tdebase/libkickermenu_prefmenu.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkickermenu_prefmenu\n"
-"POT-Creation-Date: 2006-03-18 04:02+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-07-22 17:04+0100\n"
 "Last-Translator: KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,7 +20,8 @@ msgid "Settings"
 msgstr "Gosodiadau"
 
 #: prefmenu.cpp:248
-msgid "Control Center"
+#, fuzzy
+msgid "Trinity Control Center"
 msgstr "Canolfan Reoli"
 
 #: prefmenu.cpp:266
diff --git a/tde-i18n-cy/messages/tdebase/libkickermenu_recentdocs.po b/tde-i18n-cy/messages/tdebase/libkickermenu_recentdocs.po
index 0d415310fd9..6e4f157f432 100644
--- a/tde-i18n-cy/messages/tdebase/libkickermenu_recentdocs.po
+++ b/tde-i18n-cy/messages/tdebase/libkickermenu_recentdocs.po
@@ -5,19 +5,20 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkickermenu_recentdocs\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-07-22 17:05+0100\n"
 "Last-Translator: KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: recentdocsmenu.cpp:53
+#: recentdocsmenu.cpp:55
 msgid "Clear History"
 msgstr "Gwagio'r Hanes"
 
-#: recentdocsmenu.cpp:60
+#: recentdocsmenu.cpp:61
 msgid "No Entries"
 msgstr "Dim Cofnodion"
diff --git a/tde-i18n-cy/messages/tdebase/libkickermenu_remotemenu.po b/tde-i18n-cy/messages/tdebase/libkickermenu_remotemenu.po
index 37aae2fb84f..213095621ad 100644
--- a/tde-i18n-cy/messages/tdebase/libkickermenu_remotemenu.po
+++ b/tde-i18n-cy/messages/tdebase/libkickermenu_remotemenu.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: all2.po\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdebase/libkickermenu_systemmenu.po b/tde-i18n-cy/messages/tdebase/libkickermenu_systemmenu.po
index 6a765e76f4f..b41a0049526 100644
--- a/tde-i18n-cy/messages/tdebase/libkickermenu_systemmenu.po
+++ b/tde-i18n-cy/messages/tdebase/libkickermenu_systemmenu.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: all2.po\n"
-"POT-Creation-Date: 2006-03-18 04:02+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdebase/libkickermenu_tdeprint.po b/tde-i18n-cy/messages/tdebase/libkickermenu_tdeprint.po
index a00a0797d8f..bd07d00f351 100644
--- a/tde-i18n-cy/messages/tdebase/libkickermenu_tdeprint.po
+++ b/tde-i18n-cy/messages/tdebase/libkickermenu_tdeprint.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkickermenu_tdeprint\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-07-22 17:03+0100\n"
 "Last-Translator: KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdebase/libkickermenu_tom.po b/tde-i18n-cy/messages/tdebase/libkickermenu_tom.po
index 8fd663e5141..086622fe8f0 100644
--- a/tde-i18n-cy/messages/tdebase/libkickermenu_tom.po
+++ b/tde-i18n-cy/messages/tdebase/libkickermenu_tom.po
@@ -3,10 +3,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkickermenu_tom\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-07-04 12:18+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdebase/libkonq.po b/tde-i18n-cy/messages/tdebase/libkonq.po
index b6b2f6b8c04..8e3d0175786 100644
--- a/tde-i18n-cy/messages/tdebase/libkonq.po
+++ b/tde-i18n-cy/messages/tdebase/libkonq.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkonq\n"
-"POT-Creation-Date: 2007-09-26 01:13+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-01-05 15:00+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -116,12 +117,12 @@ msgstr "<p>Nid oes gennych ganiatadau digonol i ddarllen <b>%1</b></p>"
 msgid "<p><b>%1</b> does not seem to exist anymore</p>"
 msgstr "<p>Nid yw <b>%1</b> yn bodoli mwyach</p>"
 
-#: konq_dirpart.cc:491
+#: konq_dirpart.cc:495
 #, c-format
 msgid "Search result: %1"
 msgstr "Canlyniad y chwiliad: %1"
 
-#: konq_operations.cc:269
+#: konq_operations.cc:271
 #, c-format
 msgid ""
 "_n: Do you really want to delete this item?\n"
@@ -130,11 +131,11 @@ msgstr ""
 "Ydych wir eisiau dileu yr eitem yma?\n"
 "Ydych wir eisiau dileu y %n o eitemau yma?"
 
-#: konq_operations.cc:271
+#: konq_operations.cc:273
 msgid "Delete Files"
 msgstr "Dileu Ffeiliau"
 
-#: konq_operations.cc:278
+#: konq_operations.cc:280
 #, c-format
 msgid ""
 "_n: Do you really want to shred this item?\n"
@@ -143,15 +144,15 @@ msgstr ""
 "Ydych wir eisiau malu yr eitem yma?\n"
 "Ydych wir eisiau malu y %n o eitemau yma?"
 
-#: konq_operations.cc:280
+#: konq_operations.cc:282
 msgid "Shred Files"
 msgstr "Malu Ffeiliau"
 
-#: konq_operations.cc:281
+#: konq_operations.cc:283
 msgid "Shred"
 msgstr "Malu"
 
-#: konq_operations.cc:288
+#: konq_operations.cc:290
 #, c-format
 msgid ""
 "_n: Do you really want to move this item to the trash?\n"
@@ -160,131 +161,131 @@ msgstr ""
 "Ydych wir eisiau symud yr eitem yma i'r sbwriel?\n"
 "Ydych wir eisiau symud y %n o eitemau yma i'r sbwriel?"
 
-#: konq_operations.cc:290
+#: konq_operations.cc:292
 msgid "Move to Trash"
 msgstr "Symud i'r Sbwriel"
 
-#: konq_operations.cc:291
+#: konq_operations.cc:293
 msgid ""
 "_: Verb\n"
 "&Trash"
 msgstr "Symud i'&r sbwriel"
 
-#: konq_operations.cc:342
+#: konq_operations.cc:344
 msgid "You cannot drop a folder on to itself"
 msgstr "Nid yw'n bosib gollwng plygell ar ei hunan"
 
-#: konq_operations.cc:388
+#: konq_operations.cc:390
 msgid "File name for dropped contents:"
 msgstr ""
 
-#: konq_operations.cc:567
+#: konq_operations.cc:575
 msgid "&Move Here"
 msgstr "Sy&mud Yma"
 
-#: konq_operations.cc:569
+#: konq_operations.cc:577
 msgid "&Copy Here"
 msgstr "&Copïo Yma"
 
-#: konq_operations.cc:570
+#: konq_operations.cc:578
 msgid "&Link Here"
 msgstr "Creu Cysw&llt Yma "
 
-#: konq_operations.cc:572
+#: konq_operations.cc:580
 msgid "Set as &Wallpaper"
 msgstr "Gosod fel Papur &Wal"
 
-#: konq_operations.cc:574
+#: konq_operations.cc:582
 msgid "C&ancel"
 msgstr "&Diddymu"
 
-#: konq_operations.cc:728 konq_operations.cc:730 konq_operations.cc:732
+#: konq_operations.cc:736 konq_operations.cc:738 konq_operations.cc:740
 msgid "New Folder"
 msgstr "Plygell Newydd"
 
-#: konq_operations.cc:733
+#: konq_operations.cc:741
 msgid "Enter folder name:"
 msgstr "Rhowch enw'r blygell:"
 
-#: konq_popupmenu.cc:471
+#: konq_popupmenu.cc:501
 msgid "&Open"
 msgstr "&Agor"
 
-#: konq_popupmenu.cc:471
+#: konq_popupmenu.cc:501
 msgid "Open in New &Window"
 msgstr "Agor mewn Ffenestr Ne&wydd"
 
-#: konq_popupmenu.cc:478
+#: konq_popupmenu.cc:508
 msgid "Open the trash in a new window"
 msgstr "Agor y sbwriel mewn ffenestr newydd"
 
-#: konq_popupmenu.cc:480
+#: konq_popupmenu.cc:510
 #, fuzzy
 msgid "Open the medium in a new window"
 msgstr "Agor y ddogfen mewn ffenestr newydd"
 
-#: konq_popupmenu.cc:482
+#: konq_popupmenu.cc:512
 msgid "Open the document in a new window"
 msgstr "Agor y ddogfen mewn ffenestr newydd"
 
-#: konq_popupmenu.cc:501
+#: konq_popupmenu.cc:531
 msgid "Create &Folder..."
 msgstr "Creu pl&ygell..."
 
-#: konq_popupmenu.cc:508
+#: konq_popupmenu.cc:538
 msgid "&Restore"
 msgstr "&Adfer"
 
-#: konq_popupmenu.cc:579
+#: konq_popupmenu.cc:609
 msgid "&Empty Trash Bin"
 msgstr "Gwagio'r Swbri&el"
 
-#: konq_popupmenu.cc:601
+#: konq_popupmenu.cc:631
 msgid "&Bookmark This Page"
 msgstr "&Tudnodi'r Dudalen Yma"
 
-#: konq_popupmenu.cc:603
+#: konq_popupmenu.cc:633
 msgid "&Bookmark This Location"
 msgstr "T&udnodi'r Lleoliad Yma"
 
-#: konq_popupmenu.cc:606
+#: konq_popupmenu.cc:636
 msgid "&Bookmark This Folder"
 msgstr "Tu&dnodi'r Blygell Yma"
 
-#: konq_popupmenu.cc:608
+#: konq_popupmenu.cc:638
 msgid "&Bookmark This Link"
 msgstr "Tudnod&i'r Cyswllt Yma"
 
-#: konq_popupmenu.cc:610
+#: konq_popupmenu.cc:640
 msgid "&Bookmark This File"
 msgstr "Tudnod&i'r Ffeil Yma"
 
-#: konq_popupmenu.cc:858
+#: konq_popupmenu.cc:894
 msgid "&Open With"
 msgstr "&Agor Gyda"
 
-#: konq_popupmenu.cc:888
+#: konq_popupmenu.cc:924
 #, c-format
 msgid "Open with %1"
 msgstr "Agor gyda %1"
 
-#: konq_popupmenu.cc:902
+#: konq_popupmenu.cc:938
 msgid "&Other..."
 msgstr "&Eraill..."
 
-#: konq_popupmenu.cc:906 konq_popupmenu.cc:913
+#: konq_popupmenu.cc:942 konq_popupmenu.cc:949
 msgid "&Open With..."
 msgstr "&Agor Gyda..."
 
-#: konq_popupmenu.cc:933
+#: konq_popupmenu.cc:969
 msgid "Ac&tions"
 msgstr "Gwei&thredoedd"
 
-#: konq_popupmenu.cc:967
+#: konq_popupmenu.cc:1003
 msgid "&Properties"
 msgstr "&Priodweddau"
 
-#: konq_popupmenu.cc:981
+#: konq_popupmenu.cc:1017
 msgid "Share"
 msgstr "Rhannu"
 
diff --git a/tde-i18n-cy/messages/tdebase/libtaskbar.po b/tde-i18n-cy/messages/tdebase/libtaskbar.po
index 2671bab5d52..c1089d156f1 100644
--- a/tde-i18n-cy/messages/tdebase/libtaskbar.po
+++ b/tde-i18n-cy/messages/tdebase/libtaskbar.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libtaskbar\n"
-"POT-Creation-Date: 2008-08-18 01:16+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-07-22 17:06+0100\n"
 "Last-Translator: KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -17,231 +18,306 @@ msgstr ""
 #. i18n: file taskbar.kcfg line 11
 #: rc.cpp:3
 #, no-c-format
-msgid "Show windows from all desktops"
-msgstr "Dangos ffenestri o bob penbwrdd"
+msgid "Use the global taskbar configuration"
+msgstr ""
 
 #. i18n: file taskbar.kcfg line 12
 #: rc.cpp:6
 #, no-c-format
 msgid ""
-"Turning this option off will cause the taskbar to display <b>only</b> "
-"the windows on the current desktop. \\n\\nBy default, this option is selected "
-"and all windows are shown."
+"Turning this option off will cause the taskbar to ignore the global taskbar "
+"configuration, instead using a specific configuration for that particular "
+"taskbar."
 msgstr ""
 
 #. i18n: file taskbar.kcfg line 16
 #: rc.cpp:9
 #, no-c-format
-msgid "Show only minimized windows"
-msgstr "Dangos ffenestri wedi'u lleihau yn unig"
+msgid "Allow taskbar items to be rearranged using drag and drop"
+msgstr ""
 
 #. i18n: file taskbar.kcfg line 17
 #: rc.cpp:12
 #, no-c-format
 msgid ""
-"Select this option if you want the taskbar to display <b>only</b> "
-"minimized windows. \\n\\nBy default, this option is not selected and the "
-"taskbar will show all windows."
+"Turning this option on will allow tasks on the taskbar to be manually "
+"rearranged using drag and drop."
 msgstr ""
 
-#. i18n: file taskbar.kcfg line 22
+#. i18n: file taskbar.kcfg line 21
 #: rc.cpp:15
 #, no-c-format
+msgid "Show windows from all desktops"
+msgstr "Dangos ffenestri o bob penbwrdd"
+
+#. i18n: file taskbar.kcfg line 22
+#: rc.cpp:18
+#, no-c-format
+msgid ""
+"Turning this option off will cause the taskbar to display <b>only</b> "
+"the windows on the current desktop. By default, this option is selected and all "
+"windows are shown."
+msgstr ""
+
+#. i18n: file taskbar.kcfg line 26
+#: rc.cpp:21
+#, no-c-format
+msgid "Cycle through windows with mouse wheel"
+msgstr ""
+
+#. i18n: file taskbar.kcfg line 27
+#: rc.cpp:24
+#, no-c-format
+msgid ""
+"Enabling this option causes the taskbar to cycle through the current list of "
+"windows when using the mouse wheel"
+msgstr ""
+
+#. i18n: file taskbar.kcfg line 31
+#: rc.cpp:27
+#, no-c-format
+msgid "Show only minimized windows"
+msgstr "Dangos ffenestri wedi'u lleihau yn unig"
+
+#. i18n: file taskbar.kcfg line 32
+#: rc.cpp:30
+#, no-c-format
+msgid ""
+"Select this option if you want the taskbar to display <b>only</b> "
+"minimized windows. By default, this option is not selected and the taskbar will "
+"show all windows."
+msgstr ""
+
+#. i18n: file taskbar.kcfg line 37
+#: rc.cpp:33 rc.cpp:48
+#, no-c-format
 msgid "Never"
 msgstr "Byth"
 
-#. i18n: file taskbar.kcfg line 25
-#: rc.cpp:18
+#. i18n: file taskbar.kcfg line 40
+#: rc.cpp:36 rc.cpp:51
 #, no-c-format
 msgid "When Taskbar Full"
 msgstr "Pan fo'r Bar Tasgau'n llawn"
 
-#. i18n: file taskbar.kcfg line 28
-#: rc.cpp:21
+#. i18n: file taskbar.kcfg line 43
+#: rc.cpp:39 rc.cpp:54
 #, no-c-format
 msgid "Always"
 msgstr "Bob Amser"
 
-#. i18n: file taskbar.kcfg line 32
-#: rc.cpp:24
+#. i18n: file taskbar.kcfg line 47
+#: rc.cpp:42
+#, no-c-format
+msgid "Display:"
+msgstr ""
+
+#. i18n: file taskbar.kcfg line 48
+#: rc.cpp:45
+#, no-c-format
+msgid ""
+"Choose taskbar display mode among <strong>Icons and text</strong>, <strong>"
+"Text only</strong> and <strong>Icons only</strong>"
+msgstr ""
+
+#. i18n: file taskbar.kcfg line 63
+#: rc.cpp:57
 #, no-c-format
 msgid "Group similar tasks:"
 msgstr "Casglu tasgau tebyg:"
 
-#. i18n: file taskbar.kcfg line 33
-#: rc.cpp:27
+#. i18n: file taskbar.kcfg line 64
+#: rc.cpp:60
 #, no-c-format
 msgid ""
 "The taskbar can group similar windows into single buttons. When one of these "
 "window group buttons are clicked on a menu appears showing all the windows in "
 "that group. This can be especially useful with the <em>Show all windows</em> "
-"option.\\n\\nYou can set the taskbar to <strong>Never</strong> "
+"option. You can set the taskbar to <strong>Never</strong> "
 "group windows, to <strong>Always</strong> group windows or to group windows "
-"only <strong>When the Taskbar is Full</strong>.\\n\\nBy default the taskbar "
-"groups windows when it is full."
+"only <strong>When the Taskbar is Full</strong>. By default the taskbar groups "
+"windows when it is full."
 msgstr ""
 
-#. i18n: file taskbar.kcfg line 37
-#: rc.cpp:30
+#. i18n: file taskbar.kcfg line 69
+#: rc.cpp:63
 #, no-c-format
-msgid "Sort windows by desktop"
+msgid "Any"
+msgstr ""
+
+#. i18n: file taskbar.kcfg line 72
+#: rc.cpp:66
+#, no-c-format
+msgid "Only Stopped"
+msgstr ""
+
+#. i18n: file taskbar.kcfg line 75
+#: rc.cpp:69
+#, no-c-format
+msgid "Only Running"
 msgstr ""
 
-#. i18n: file taskbar.kcfg line 38
-#: rc.cpp:33
+#. i18n: file taskbar.kcfg line 79
+#: rc.cpp:72
+#, fuzzy, no-c-format
+msgid "Show tasks with state:"
+msgstr "Dangos y Restr Tasgau"
+
+#. i18n: file taskbar.kcfg line 80
+#: rc.cpp:75
 #, no-c-format
 msgid ""
-"Selecting this option causes the taskbar to show windows in order of the "
-"desktop they appear on.\\n\\nBy default this option is selected."
+"The taskbar can show and/or hide tasks based on their current process state. "
+"Select <em>Any</em> to show all tasks regardless of current state."
 msgstr ""
 
-#. i18n: file taskbar.kcfg line 42
-#: rc.cpp:36
+#. i18n: file taskbar.kcfg line 84
+#: rc.cpp:78
 #, no-c-format
-msgid "Sort windows by application"
+msgid "Sort windows by desktop"
 msgstr ""
 
-#. i18n: file taskbar.kcfg line 43
-#: rc.cpp:39
+#. i18n: file taskbar.kcfg line 85
+#: rc.cpp:81
 #, no-c-format
 msgid ""
-"Selecting this option causes the taskbar to show windows ordered by "
-"application.\\n\\nBy default this option is selected."
+"Selecting this option causes the taskbar to show windows in order of the "
+"desktop they appear on. By default this option is selected."
 msgstr ""
 
-#. i18n: file taskbar.kcfg line 47
-#: rc.cpp:42
+#. i18n: file taskbar.kcfg line 89
+#: rc.cpp:84
 #, no-c-format
-msgid "Show application icons"
-msgstr "Dangos eiconau cymhwysiadau"
+msgid "Sort windows by application"
+msgstr ""
 
-#. i18n: file taskbar.kcfg line 48
-#: rc.cpp:45
+#. i18n: file taskbar.kcfg line 90
+#: rc.cpp:87
 #, no-c-format
 msgid ""
-"Select this option if you want window icons to appear along with their titles "
-"in the taskbar.\\n\\nBy default this option is selected."
+"Selecting this option causes the taskbar to show windows ordered by "
+"application. By default this option is selected."
 msgstr ""
 
-#. i18n: file taskbar.kcfg line 64
-#: rc.cpp:48
+#. i18n: file taskbar.kcfg line 106
+#: rc.cpp:90
 #, no-c-format
 msgid "Show windows from all screens"
 msgstr ""
 
-#. i18n: file taskbar.kcfg line 65
-#: rc.cpp:51
+#. i18n: file taskbar.kcfg line 107
+#: rc.cpp:93
 #, no-c-format
 msgid ""
 "Turning this option off will cause the taskbar to display <b>only</b> "
-"windows which are on the same Xinerama screen as the taskbar.\\n\\nBy default, "
-"this option is selected and all windows are shown."
+"windows which are on the same Xinerama screen as the taskbar. By default, this "
+"option is selected and all windows are shown."
 msgstr ""
 
-#. i18n: file taskbar.kcfg line 74
-#: rc.cpp:54
+#. i18n: file taskbar.kcfg line 116
+#: rc.cpp:96
 #, no-c-format
 msgid "Show window list button"
 msgstr ""
 
-#. i18n: file taskbar.kcfg line 75
-#: rc.cpp:57
+#. i18n: file taskbar.kcfg line 117
+#: rc.cpp:99
 #, no-c-format
 msgid ""
 "Selecting this option causes the taskbar to display a button that, when "
 "clicked, shows a list of all windows in a popup menu."
 msgstr ""
 
-#. i18n: file taskbar.kcfg line 87
-#: rc.cpp:60
+#. i18n: file taskbar.kcfg line 129
+#: rc.cpp:102
 #, no-c-format
 msgid "Show Task List"
 msgstr "Dangos y Restr Tasgau"
 
-#. i18n: file taskbar.kcfg line 90
-#: rc.cpp:63
+#. i18n: file taskbar.kcfg line 132
+#: rc.cpp:105
 #, no-c-format
 msgid "Show Operations Menu"
 msgstr "Dangos y Ddewislen Weithredoedd"
 
-#. i18n: file taskbar.kcfg line 93
-#: rc.cpp:66
+#. i18n: file taskbar.kcfg line 135
+#: rc.cpp:108
 #, no-c-format
 msgid "Activate, Raise or Minimize Task"
 msgstr "Gweithredoli, Codi neu Leihau Tasg"
 
-#. i18n: file taskbar.kcfg line 96
-#: rc.cpp:69
+#. i18n: file taskbar.kcfg line 138
+#: rc.cpp:111
 #, no-c-format
 msgid "Activate Task"
 msgstr "Gweithredoli Tasg"
 
-#. i18n: file taskbar.kcfg line 99
-#: rc.cpp:72
+#. i18n: file taskbar.kcfg line 141
+#: rc.cpp:114
 #, no-c-format
 msgid "Raise Task"
 msgstr "Codi Tasg"
 
-#. i18n: file taskbar.kcfg line 102
-#: rc.cpp:75
+#. i18n: file taskbar.kcfg line 144
+#: rc.cpp:117
 #, no-c-format
 msgid "Lower Task"
 msgstr "Gostwng Tasg"
 
-#. i18n: file taskbar.kcfg line 105
-#: rc.cpp:78
+#. i18n: file taskbar.kcfg line 147
+#: rc.cpp:120
 #, no-c-format
 msgid "Minimize Task"
 msgstr "Lleihau Tasg"
 
-#. i18n: file taskbar.kcfg line 108
-#: rc.cpp:81
+#. i18n: file taskbar.kcfg line 150
+#: rc.cpp:123
 #, no-c-format
 msgid "Move To Current Desktop"
 msgstr ""
 
-#. i18n: file taskbar.kcfg line 111
-#: rc.cpp:84
+#. i18n: file taskbar.kcfg line 153
+#: rc.cpp:126
 #, fuzzy, no-c-format
 msgid "Close Task"
 msgstr "Gostwng Tasg"
 
-#. i18n: file taskbar.kcfg line 117
-#: rc.cpp:87
+#. i18n: file taskbar.kcfg line 159
+#: rc.cpp:129
 #, no-c-format
 msgid "Mouse button actions"
 msgstr "Gweithredoedd Botwm Llygoden"
 
-#. i18n: file taskbar.kcfg line 125
-#: rc.cpp:90
+#. i18n: file taskbar.kcfg line 167
+#: rc.cpp:132
 #, no-c-format
 msgid ""
 "The number of times to blink a taskbar button when a window asks for attention. "
 "Setting this to 1000 or greater causes the button to blink forever."
 msgstr ""
 
-#. i18n: file taskbar.kcfg line 130
-#: rc.cpp:93
+#. i18n: file taskbar.kcfg line 172
+#: rc.cpp:135
 #, no-c-format
 msgid "Draw taskbar entries \"flat\" and not as a button"
 msgstr ""
 
-#. i18n: file taskbar.kcfg line 131
-#: rc.cpp:96
+#. i18n: file taskbar.kcfg line 173
+#: rc.cpp:138
 #, no-c-format
 msgid ""
 "Turning this option on will cause the taskbar to draw visible button frames for "
-"each entry in the taskbar. \\n\\nBy default, this option is off."
+"each entry in the taskbar. By default, this option is off."
 msgstr ""
 
-#. i18n: file taskbar.kcfg line 135
-#: rc.cpp:99
+#. i18n: file taskbar.kcfg line 177
+#: rc.cpp:141
 #, no-c-format
 msgid "Draw taskbar text with a halo around it"
 msgstr ""
 
-#. i18n: file taskbar.kcfg line 136
-#: rc.cpp:102
+#. i18n: file taskbar.kcfg line 178
+#: rc.cpp:144
 #, no-c-format
 msgid ""
 "Turning this option on will cause the taskbar to draw fancier text that has an "
@@ -249,20 +325,20 @@ msgid ""
 "dark panel backgrounds, it is slower."
 msgstr ""
 
-#. i18n: file taskbar.kcfg line 140
-#: rc.cpp:105
+#. i18n: file taskbar.kcfg line 182
+#: rc.cpp:147
 #, no-c-format
 msgid "Show a visible button frame on the task the cursor is positioned over"
 msgstr ""
 
-#. i18n: file taskbar.kcfg line 144
-#: rc.cpp:108
+#. i18n: file taskbar.kcfg line 186
+#: rc.cpp:150
 #, no-c-format
 msgid "Show thumbnails instead of icons in the mouse-over effects"
 msgstr ""
 
-#. i18n: file taskbar.kcfg line 145
-#: rc.cpp:111
+#. i18n: file taskbar.kcfg line 187
+#: rc.cpp:153
 #, no-c-format
 msgid ""
 "Enabling this option will draw a thumbnail of the window in its mouse-over "
@@ -272,14 +348,14 @@ msgid ""
 "desktop is activated, respectively.</p>"
 msgstr ""
 
-#. i18n: file taskbar.kcfg line 149
-#: rc.cpp:114
+#. i18n: file taskbar.kcfg line 191
+#: rc.cpp:156
 #, no-c-format
 msgid "Maximum width/height of the thumbnail in pixels"
 msgstr ""
 
-#. i18n: file taskbar.kcfg line 150
-#: rc.cpp:117
+#. i18n: file taskbar.kcfg line 192
+#: rc.cpp:159
 #, no-c-format
 msgid ""
 "A thumbnail is created by resizing the window. The scaling factor is determined "
@@ -287,56 +363,56 @@ msgid ""
 "not exceed this value in any dimension."
 msgstr ""
 
-#. i18n: file taskbar.kcfg line 154
-#: rc.cpp:120
+#. i18n: file taskbar.kcfg line 196
+#: rc.cpp:162
 #, no-c-format
 msgid "Use custom colors for taskbar buttons text and background"
 msgstr ""
 
-#. i18n: file taskbar.kcfg line 155
-#: rc.cpp:123
+#. i18n: file taskbar.kcfg line 197
+#: rc.cpp:165
 #, no-c-format
 msgid ""
 "Turning this option on will allow choosing your own colors for taskbar buttons "
 "text and background."
 msgstr ""
 
-#. i18n: file taskbar.kcfg line 158
-#: rc.cpp:126
+#. i18n: file taskbar.kcfg line 200
+#: rc.cpp:168
 #, no-c-format
 msgid "Color to use for active task button text"
 msgstr ""
 
-#. i18n: file taskbar.kcfg line 160
-#: rc.cpp:129
+#. i18n: file taskbar.kcfg line 202
+#: rc.cpp:171
 #, no-c-format
 msgid ""
 "This color is used for displaying text on taskbar button for task which is "
 "active at the moment."
 msgstr ""
 
-#. i18n: file taskbar.kcfg line 163
-#: rc.cpp:132
+#. i18n: file taskbar.kcfg line 205
+#: rc.cpp:174
 #, no-c-format
 msgid "Color to use for inactive tasks button text"
 msgstr ""
 
-#. i18n: file taskbar.kcfg line 165
-#: rc.cpp:135
+#. i18n: file taskbar.kcfg line 207
+#: rc.cpp:177
 #, no-c-format
 msgid ""
 "This color is used for displaying text on taskbar button for tasks other than "
 "active."
 msgstr ""
 
-#. i18n: file taskbar.kcfg line 168
-#: rc.cpp:138
+#. i18n: file taskbar.kcfg line 210
+#: rc.cpp:180
 #, no-c-format
 msgid "Color to use for taskbar buttons background"
 msgstr ""
 
-#. i18n: file taskbar.kcfg line 170
-#: rc.cpp:141
+#. i18n: file taskbar.kcfg line 212
+#: rc.cpp:183
 #, no-c-format
 msgid "This color is used for displaying background of taskbar buttons."
 msgstr ""
@@ -349,28 +425,47 @@ msgstr "Cofnod Bar Tasgau Nesaf"
 msgid "Previous Taskbar Entry"
 msgstr "Cofnod Bar Tasgau Blaenorol"
 
-#: taskcontainer.cpp:623 taskcontainer.cpp:1600
+#: taskcontainer.cpp:728 taskcontainer.cpp:1840
 msgid "modified"
 msgstr "addaswyd"
 
-#: taskcontainer.cpp:1517
+#: taskcontainer.cpp:1281
+msgid "Move to Beginning"
+msgstr ""
+
+#: taskcontainer.cpp:1286
+msgid "Move Left"
+msgstr ""
+
+#: taskcontainer.cpp:1291
+msgid "Move Right"
+msgstr ""
+
+#: taskcontainer.cpp:1296
+msgid "Move to End"
+msgstr ""
+
+#: taskcontainer.cpp:1754
 #, fuzzy
 msgid "Loading application ..."
 msgstr "Dangos eiconau cymhwysiadau"
 
-#: taskcontainer.cpp:1581
+#: taskcontainer.cpp:1821
 msgid "On all desktops"
 msgstr "Ar Bob Penbwrdd"
 
-#: taskcontainer.cpp:1586
+#: taskcontainer.cpp:1826
 #, c-format
 msgid "On %1"
 msgstr "Ymlaen %1"
 
-#: taskcontainer.cpp:1592
+#: taskcontainer.cpp:1832
 msgid "Requesting attention"
 msgstr ""
 
-#: taskcontainer.cpp:1598
+#: taskcontainer.cpp:1838
 msgid "Has unsaved changes"
 msgstr ""
+
+#~ msgid "Show application icons"
+#~ msgstr "Dangos eiconau cymhwysiadau"
diff --git a/tde-i18n-cy/messages/tdebase/libtaskmanager.po b/tde-i18n-cy/messages/tdebase/libtaskmanager.po
index aa0077c2a25..73bfa02dea5 100644
--- a/tde-i18n-cy/messages/tdebase/libtaskmanager.po
+++ b/tde-i18n-cy/messages/tdebase/libtaskmanager.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libtaskmanager\n"
-"POT-Creation-Date: 2007-08-31 01:13+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-07-22 17:08+0100\n"
 "Last-Translator: KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,75 +19,79 @@ msgstr ""
 msgid "modified"
 msgstr "addaswyd"
 
-#: taskrmbmenu.cpp:69
+#: taskrmbmenu.cpp:71
 msgid "Ad&vanced"
 msgstr "&Uwch"
 
-#: taskrmbmenu.cpp:74
+#: taskrmbmenu.cpp:76
 msgid "To &Desktop"
 msgstr "I'r &Penbwrdd"
 
-#: taskrmbmenu.cpp:78
+#: taskrmbmenu.cpp:80
 msgid "&To Current Desktop"
 msgstr "&I'r Penbwrdd Cyfredol"
 
-#: taskrmbmenu.cpp:89
+#: taskrmbmenu.cpp:91
 msgid "&Move"
 msgstr "Sy&mud"
 
-#: taskrmbmenu.cpp:92
+#: taskrmbmenu.cpp:94
 msgid "Re&size"
 msgstr "&Newid Maint"
 
-#: taskrmbmenu.cpp:95
+#: taskrmbmenu.cpp:97
 msgid "Mi&nimize"
 msgstr "&Lleihau"
 
-#: taskrmbmenu.cpp:99
+#: taskrmbmenu.cpp:101
 msgid "Ma&ximize"
 msgstr "&Ehangu"
 
-#: taskrmbmenu.cpp:103
+#: taskrmbmenu.cpp:105
 msgid "&Shade"
 msgstr "&Cysgodi"
 
-#: taskrmbmenu.cpp:136
+#: taskrmbmenu.cpp:113
+msgid "Move Task Button"
+msgstr ""
+
+#: taskrmbmenu.cpp:145
 msgid "All to &Desktop"
 msgstr "Popeth i'r &Penbwrdd"
 
-#: taskrmbmenu.cpp:138
+#: taskrmbmenu.cpp:147
 msgid "All &to Current Desktop"
 msgstr "Popeth &i'r Penbwrdd Cyfredol"
 
-#: taskrmbmenu.cpp:153
+#: taskrmbmenu.cpp:162
 msgid "Mi&nimize All"
 msgstr "&Lleihau Popeth"
 
-#: taskrmbmenu.cpp:166
+#: taskrmbmenu.cpp:175
 msgid "Ma&ximize All"
 msgstr "&Ehangu Popeth"
 
-#: taskrmbmenu.cpp:179
+#: taskrmbmenu.cpp:188
 msgid "&Restore All"
 msgstr "&Adfer Popeth"
 
-#: taskrmbmenu.cpp:194
+#: taskrmbmenu.cpp:203
 msgid "&Close All"
 msgstr "&Cau Popeth"
 
-#: taskrmbmenu.cpp:205
+#: taskrmbmenu.cpp:214
 msgid "Keep &Above Others"
 msgstr "Cadw &Uwchben y Lleill"
 
-#: taskrmbmenu.cpp:210
+#: taskrmbmenu.cpp:219
 msgid "Keep &Below Others"
 msgstr "Cadw &Dan y Lleill"
 
-#: taskrmbmenu.cpp:215
+#: taskrmbmenu.cpp:224
 msgid "&Fullscreen"
 msgstr "S&grîn Llawn"
 
-#: taskrmbmenu.cpp:232 taskrmbmenu.cpp:253
+#: taskrmbmenu.cpp:241 taskrmbmenu.cpp:262
 msgid "&All Desktops"
 msgstr "&Pob Penbwrdd"
 
diff --git a/tde-i18n-cy/messages/tdebase/lockout.po b/tde-i18n-cy/messages/tdebase/lockout.po
index 082f9c4e27e..d635de35f8b 100644
--- a/tde-i18n-cy/messages/tdebase/lockout.po
+++ b/tde-i18n-cy/messages/tdebase/lockout.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: lockout\n"
-"POT-Creation-Date: 2008-08-18 01:16+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-12-26 23:47+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdebase/mediaapplet.po b/tde-i18n-cy/messages/tdebase/mediaapplet.po
index 6b672007c6b..59cfb18ab97 100644
--- a/tde-i18n-cy/messages/tdebase/mediaapplet.po
+++ b/tde-i18n-cy/messages/tdebase/mediaapplet.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: all2.po\n"
-"POT-Creation-Date: 2008-07-31 01:15+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdebase/naughtyapplet.po b/tde-i18n-cy/messages/tdebase/naughtyapplet.po
index f591ba0853c..2245e689e73 100644
--- a/tde-i18n-cy/messages/tdebase/naughtyapplet.po
+++ b/tde-i18n-cy/messages/tdebase/naughtyapplet.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: naughtyapplet\n"
-"POT-Creation-Date: 2008-08-19 01:16+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-07-22 17:13+0100\n"
 "Last-Translator: KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdebase/nsplugin.po b/tde-i18n-cy/messages/tdebase/nsplugin.po
index 65c64a81468..ccd77c0c94d 100644
--- a/tde-i18n-cy/messages/tdebase/nsplugin.po
+++ b/tde-i18n-cy/messages/tdebase/nsplugin.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nsplugin\n"
-"POT-Creation-Date: 2007-12-22 01:14+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-12-27 09:47+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -49,38 +50,38 @@ msgstr "Yn llwytho ategyn Netscape ar gyfer %1"
 msgid "Unable to load Netscape plugin for %1"
 msgstr "Methu llwytho ategyn Netscape ar gyfer %1"
 
-#: pluginscan.cpp:200
+#: pluginscan.cpp:201
 msgid "Netscape plugin mimeinfo"
 msgstr "Gwybodaeth MIME ategyn Netscape"
 
-#: pluginscan.cpp:235
+#: pluginscan.cpp:241
 msgid "Unnamed plugin"
 msgstr "Ategyn di-enw"
 
-#: pluginscan.cpp:461 pluginscan.cpp:464
+#: pluginscan.cpp:468 pluginscan.cpp:471
 msgid "Netscape plugin viewer"
 msgstr "Gwelydd ategion Netscape"
 
-#: pluginscan.cpp:514
+#: pluginscan.cpp:521
 #, fuzzy
 msgid "Show progress output for GUI"
 msgstr "Dangos allbwn cynnydd ar gyfer GUI."
 
-#: pluginscan.cpp:521
+#: pluginscan.cpp:528
 msgid "nspluginscan"
 msgstr "nspluginscan"
 
-#: viewer/nsplugin.cpp:819
+#: viewer/nsplugin.cpp:818
 #, c-format
 msgid "Submitting data to %1"
 msgstr "Yn cyflwyno data i %1"
 
-#: viewer/nsplugin.cpp:838
+#: viewer/nsplugin.cpp:837
 #, c-format
 msgid "Requesting %1"
 msgstr "Yn ceisio %1"
 
-#: viewer/viewer.cpp:280
+#: viewer/viewer.cpp:257
 msgid ""
 "There was an error connecting to the Desktop communications server. Please make "
 "sure that the 'dcopserver' process has been started, and then try again."
@@ -88,6 +89,6 @@ msgstr ""
 "Roedd gwall tra'n cysylltu â gweinydd cyfathrebu'r Penbwrdd. Gwiriwch fod y "
 "broses 'dcopserver' wedi'i chychwyn wedyn ceisiwch eto, os gwelwch yn dda."
 
-#: viewer/viewer.cpp:284
+#: viewer/viewer.cpp:261
 msgid "Error Connecting to DCOP Server"
 msgstr "Gwall wrth Gysylltu â'r Gweinydd DCOP"
diff --git a/tde-i18n-cy/messages/tdebase/privacy.po b/tde-i18n-cy/messages/tdebase/privacy.po
index 72f9ac4d5c5..75ee909fdad 100644
--- a/tde-i18n-cy/messages/tdebase/privacy.po
+++ b/tde-i18n-cy/messages/tdebase/privacy.po
@@ -10,10 +10,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: privacy\n"
-"POT-Creation-Date: 2008-07-08 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-12-26 23:43+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -88,9 +89,8 @@ msgid "Saved Clipboard Contents"
 msgstr "Cynnwys clipfwrdd wedi'i gadw"
 
 #: privacy.cpp:100
-#, fuzzy
-msgid "Web History"
-msgstr "Hanes gwe"
+msgid "Web and File Manager History"
+msgstr ""
 
 #: privacy.cpp:102
 #, fuzzy
@@ -117,6 +117,10 @@ msgid "Favorite Icons"
 msgstr "Hoff eiconau"
 
 #: privacy.cpp:112
+msgid "KPDF Document Data"
+msgstr ""
+
+#: privacy.cpp:114
 msgid ""
 "Check all cleanup actions you would like to perform. These will be executed by "
 "pressing the button below"
@@ -124,74 +128,79 @@ msgstr ""
 "Brithwch bob weithred lanhau yr hoffech ei chyflawni. Gweithredir y rhain drwy "
 "wasgu'r botwm isod."
 
-#: privacy.cpp:113
+#: privacy.cpp:115
 msgid "Immediately performs the cleanup actions selected above"
 msgstr "Gweithreda'r gweithredoedd glanhau dewiswyd uchod ar unwaith."
 
-#: privacy.cpp:115
+#: privacy.cpp:117
 msgid "Clears all cached thumbnails"
 msgstr ""
 
-#: privacy.cpp:116
+#: privacy.cpp:118
 msgid ""
 "Clears the history of commands run through the Run Command tool on the desktop"
 msgstr ""
 "Gwagia'r hanes o orchmynion a redwyd drwy'r erfyn Rhedeg Gorchymyn ar y "
 "penbwrdd"
 
-#: privacy.cpp:117
+#: privacy.cpp:119
 msgid "Clears all stored cookies set by websites"
 msgstr "Gwagia bob bisgïen gadwedig a osodwyd gan safweoedd."
 
-#: privacy.cpp:118
-msgid "Clears the history of visited websites"
+#: privacy.cpp:120
+#, fuzzy
+msgid "Clears the history of visited websites and file manager URLs"
 msgstr "Gwagia'r hanes o wefannau sydd wedi cael eu gweld"
 
-#: privacy.cpp:119
+#: privacy.cpp:121
 msgid "Clears the clipboard contents stored by Klipper"
 msgstr "Gwagia gynnwys y gludfwrdd sydd wedi'i gadw gan Klipper"
 
-#: privacy.cpp:120
+#: privacy.cpp:122
 msgid "Clears the temporary cache of websites visited"
 msgstr "Gwagia'r gelc dros-dro o wefannau wedi'u ymweld"
 
-#: privacy.cpp:121
+#: privacy.cpp:123
 msgid "Clears values which were entered into forms on websites"
 msgstr "Gwagia werthoedd a roddwyd ar ffurflenni ar safweoedd"
 
-#: privacy.cpp:122
+#: privacy.cpp:124
 msgid ""
 "Clears the list of recently used documents from the TDE applications menu"
 msgstr ""
 "Gwagia'r restr dogfennau ddefnyddiwyd yn ddiweddar o'r ddewislen gymhwysiadau "
 "TDE"
 
-#: privacy.cpp:123
+#: privacy.cpp:125
 msgid "Clears the entries from the list of recently started applications"
 msgstr "Gwagia'r cofnodion o'r restr o gymhwysiadau ddechrewyd yn ddiweddar"
 
-#: privacy.cpp:124
+#: privacy.cpp:126
 msgid "Clears the FavIcons cached from visited websites"
 msgstr "Gwagia'r HoffEiconau a gelciwyd o safweoedd ymweledig."
 
-#: privacy.cpp:251
+#: privacy.cpp:127
+msgid "Clears all KPDF document data files"
+msgstr ""
+
+#: privacy.cpp:257
 msgid ""
 "You are deleting data that is potentially valuable to you. Are you sure?"
 msgstr "Rydych yn dileu data sydd efallai o werth i chi.  Ydych yn siwr?"
 
-#: privacy.cpp:254
+#: privacy.cpp:260
 msgid "Starting cleanup..."
 msgstr "Dechrau glanhau..."
 
-#: privacy.cpp:263
+#: privacy.cpp:269
 msgid "Clearing %1..."
 msgstr "Gwaredu %1..."
 
-#: privacy.cpp:298
+#: privacy.cpp:307
 msgid "Clearing of %1 failed"
 msgstr "Methodd y gwaredu o %1"
 
-#: privacy.cpp:305
+#: privacy.cpp:314
 msgid "Clean up finished."
 msgstr "Glanhau wedi gorffen."
 
@@ -382,5 +391,9 @@ msgid "And do not allow me to remove my contact information"
 msgstr "A sydd ddim yn caniatáu i mi waredu fy ngwybodaeth cyswllt"
 
 #, fuzzy
+#~ msgid "Web History"
+#~ msgstr "Hanes gwe"
+
+#, fuzzy
 #~ msgid " failed."
 #~ msgstr "wedi methu."
diff --git a/tde-i18n-cy/messages/tdebase/quicklauncher.po b/tde-i18n-cy/messages/tdebase/quicklauncher.po
index 73a479e072e..cad31e0c683 100644
--- a/tde-i18n-cy/messages/tdebase/quicklauncher.po
+++ b/tde-i18n-cy/messages/tdebase/quicklauncher.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: quicklauncher\n"
-"POT-Creation-Date: 2008-07-31 01:15+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-12-26 14:42+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -31,11 +32,19 @@ msgstr "kyfieithu@dotmon.com"
 msgid "Automatic"
 msgstr "Awtomatig"
 
-#: quickbutton.cpp:148 quicklauncher.cpp:165 quicklauncher.cpp:169
+#: quickbutton.cpp:63 quickbutton.cpp:64
+msgid "Show Desktop"
+msgstr ""
+
+#: quickbutton.cpp:171 quicklauncher.cpp:165 quicklauncher.cpp:169
 msgid "Add Application"
 msgstr "Ychwanegu Cymhwysiad"
 
-#: quickbutton.cpp:154
+#: quickbutton.cpp:174 quicklauncher.cpp:175
+msgid "Remove Application"
+msgstr "Gwaredu Cymhwysiad"
+
+#: quickbutton.cpp:177
 msgid "Never Remove Automatically"
 msgstr ""
 
@@ -44,19 +53,15 @@ msgstr ""
 msgid "Configure Quicklauncher..."
 msgstr "Cychwynnydd Cyflym"
 
-#: quicklauncher.cpp:175
-msgid "Remove Application"
-msgstr "Gwaredu Cymhwysiad"
-
 #: quicklauncher.cpp:198
 msgid "Unknown"
 msgstr "Anhysbys"
 
-#: quicklauncher.cpp:495
+#: quicklauncher.cpp:499
 msgid "Quick Launcher"
 msgstr "Cychwynnydd Cyflym"
 
-#: quicklauncher.cpp:496
+#: quicklauncher.cpp:500
 msgid "A simple application launcher"
 msgstr "Cychwynnydd cymhwysiadau syml"
 
@@ -69,179 +74,191 @@ msgstr ""
 #. i18n: file configdlgbase.ui line 35
 #: rc.cpp:6
 #, no-c-format
+msgid "Enable 'Show Desktop' button"
+msgstr ""
+
+#. i18n: file configdlgbase.ui line 43
+#: rc.cpp:9
+#, no-c-format
 msgid "Layout"
 msgstr "Cynllun"
 
-#. i18n: file configdlgbase.ui line 46
-#: rc.cpp:9
+#. i18n: file configdlgbase.ui line 54
+#: rc.cpp:12
 #, no-c-format
 msgid "Conserve space"
 msgstr ""
 
-#. i18n: file configdlgbase.ui line 49
-#: rc.cpp:12
+#. i18n: file configdlgbase.ui line 57
+#: rc.cpp:15
 #, no-c-format
 msgid "Do not expand icons to the size of the panel"
 msgstr ""
 
-#. i18n: file configdlgbase.ui line 57
-#: rc.cpp:15
+#. i18n: file configdlgbase.ui line 65
+#: rc.cpp:18
 #, no-c-format
 msgid "Icon size:"
 msgstr "Maint eicon :"
 
-#. i18n: file configdlgbase.ui line 92
-#: rc.cpp:18
+#. i18n: file configdlgbase.ui line 100
+#: rc.cpp:21
 #, fuzzy, no-c-format
 msgid "Most Popular Applications"
 msgstr "Gwaredu Cymhwysiad"
 
-#. i18n: file configdlgbase.ui line 145
-#: rc.cpp:21
+#. i18n: file configdlgbase.ui line 153
+#: rc.cpp:24
 #, no-c-format
 msgid "Short Term"
 msgstr ""
 
-#. i18n: file configdlgbase.ui line 156
-#: rc.cpp:24
+#. i18n: file configdlgbase.ui line 164
+#: rc.cpp:27
 #, no-c-format
 msgid "Long Term"
 msgstr ""
 
-#. i18n: file configdlgbase.ui line 169
-#: rc.cpp:27
+#. i18n: file configdlgbase.ui line 177
+#: rc.cpp:30
 #, no-c-format
 msgid "Maximum number of applications:"
 msgstr ""
 
-#. i18n: file configdlgbase.ui line 204
-#: rc.cpp:30
+#. i18n: file configdlgbase.ui line 212
+#: rc.cpp:33
 #, no-c-format
 msgid "Minimum number of applications:"
 msgstr ""
 
-#. i18n: file configdlgbase.ui line 212
-#: rc.cpp:33
+#. i18n: file configdlgbase.ui line 220
+#: rc.cpp:36
 #, no-c-format
 msgid "Add/remove applications based on their popularity"
 msgstr ""
 
 #. i18n: file launcherapplet.kcfg line 9
-#: rc.cpp:36
+#: rc.cpp:39
 #, no-c-format
 msgid "Conserve Space"
 msgstr ""
 
 #. i18n: file launcherapplet.kcfg line 13
-#: rc.cpp:39
+#: rc.cpp:42
 #, no-c-format
 msgid "Drag Enabled"
 msgstr ""
 
 #. i18n: file launcherapplet.kcfg line 17
-#: rc.cpp:42
+#: rc.cpp:45
+#, no-c-format
+msgid "Show Desktop Button Enabled"
+msgstr ""
+
+#. i18n: file launcherapplet.kcfg line 21
+#: rc.cpp:48
 #, no-c-format
 msgid "Icon Size"
 msgstr "Maint Eicon"
 
-#. i18n: file launcherapplet.kcfg line 21
-#: rc.cpp:45
+#. i18n: file launcherapplet.kcfg line 25
+#: rc.cpp:51
 #, no-c-format
 msgid "Offered Icon Sizes"
 msgstr ""
 
-#. i18n: file launcherapplet.kcfg line 25
-#: rc.cpp:48
+#. i18n: file launcherapplet.kcfg line 29
+#: rc.cpp:54
 #, no-c-format
 msgid "Buttons"
 msgstr "Botymau"
 
-#. i18n: file launcherapplet.kcfg line 29
-#: rc.cpp:51
+#. i18n: file launcherapplet.kcfg line 33
+#: rc.cpp:57
 #, no-c-format
 msgid "Volatile Buttons"
 msgstr ""
 
-#. i18n: file launcherapplet.kcfg line 30
-#: rc.cpp:54
+#. i18n: file launcherapplet.kcfg line 34
+#: rc.cpp:60
 #, no-c-format
 msgid "Buttons that can be removed dynamically if they become unpopular"
 msgstr ""
 
-#. i18n: file launcherapplet.kcfg line 34
-#: rc.cpp:57
+#. i18n: file launcherapplet.kcfg line 38
+#: rc.cpp:63
 #, no-c-format
 msgid "Show frame for volatile buttons"
 msgstr ""
 
-#. i18n: file launcherapplet.kcfg line 38
-#: rc.cpp:60
+#. i18n: file launcherapplet.kcfg line 42
+#: rc.cpp:66
 #, no-c-format
 msgid "Auto Adjust Enabled"
 msgstr ""
 
-#. i18n: file launcherapplet.kcfg line 42
-#: rc.cpp:63
+#. i18n: file launcherapplet.kcfg line 46
+#: rc.cpp:69
 #, no-c-format
 msgid "Minimum Number of Items"
 msgstr ""
 
-#. i18n: file launcherapplet.kcfg line 47
-#: rc.cpp:66
+#. i18n: file launcherapplet.kcfg line 51
+#: rc.cpp:72
 #, no-c-format
 msgid "Maximum Number of Items"
 msgstr ""
 
-#. i18n: file launcherapplet.kcfg line 52
-#: rc.cpp:69
+#. i18n: file launcherapplet.kcfg line 56
+#: rc.cpp:75
 #, no-c-format
 msgid "History Weight"
 msgstr ""
 
-#. i18n: file launcherapplet.kcfg line 60
-#: rc.cpp:72
+#. i18n: file launcherapplet.kcfg line 64
+#: rc.cpp:78
 #, no-c-format
 msgid "Service Cache Size"
 msgstr ""
 
-#. i18n: file launcherapplet.kcfg line 61
-#: rc.cpp:75
+#. i18n: file launcherapplet.kcfg line 65
+#: rc.cpp:81
 #, no-c-format
 msgid "Number of services to remember"
 msgstr ""
 
-#. i18n: file launcherapplet.kcfg line 65
-#: rc.cpp:78
+#. i18n: file launcherapplet.kcfg line 69
+#: rc.cpp:84
 #, no-c-format
 msgid "Service Names"
 msgstr ""
 
-#. i18n: file launcherapplet.kcfg line 66
-#: rc.cpp:81
+#. i18n: file launcherapplet.kcfg line 70
+#: rc.cpp:87
 #, no-c-format
 msgid "Name of known services"
 msgstr ""
 
-#. i18n: file launcherapplet.kcfg line 69
-#: rc.cpp:84
+#. i18n: file launcherapplet.kcfg line 73
+#: rc.cpp:90
 #, no-c-format
 msgid "Service Insertion Positions"
 msgstr ""
 
-#. i18n: file launcherapplet.kcfg line 70
-#: rc.cpp:87
+#. i18n: file launcherapplet.kcfg line 74
+#: rc.cpp:93
 #, no-c-format
 msgid "Position where services are inserted when they regain popularity"
 msgstr ""
 
-#. i18n: file launcherapplet.kcfg line 73
-#: rc.cpp:90
+#. i18n: file launcherapplet.kcfg line 77
+#: rc.cpp:96
 #, no-c-format
 msgid "Service History Data"
 msgstr ""
 
-#. i18n: file launcherapplet.kcfg line 74
-#: rc.cpp:93
+#. i18n: file launcherapplet.kcfg line 78
+#: rc.cpp:99
 #, no-c-format
 msgid "History Data used to determine the popularity of a service"
 msgstr ""
diff --git a/tde-i18n-cy/messages/tdebase/tdedebugdialog.po b/tde-i18n-cy/messages/tdebase/tdedebugdialog.po
index 021336b2910..c6e14da402f 100644
--- a/tde-i18n-cy/messages/tdebase/tdedebugdialog.po
+++ b/tde-i18n-cy/messages/tdebase/tdedebugdialog.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdedebugdialog\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-07-05 20:00+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -28,6 +29,26 @@ msgid ""
 "Your emails"
 msgstr "kyfieithu@dotmon.com"
 
+#: main.cpp:72
+msgid "Show the fully-fledged dialog instead of the default list dialog"
+msgstr "Dangos yr ymgom llawn yn lle ymgom y rhestr ragosodol."
+
+#: main.cpp:80
+msgid "TDEDebugDialog"
+msgstr "KYmgomDad-namu (TDEDebugDialog)"
+
+#: main.cpp:81
+msgid "A dialog box for setting preferences for debug output"
+msgstr "Blwch ymgom am osod hoffiannau am allbwn dad-namu"
+
+#: main.cpp:83
+msgid "Maintainer"
+msgstr "Cynhaliwr"
+
+#: main.cpp:84
+msgid "Original maintainer/developer"
+msgstr ""
+
 #: tdedebugdialog.cpp:46 tdelistdebugdialog.cpp:37
 msgid "Debug Settings"
 msgstr "Gosodiadau Dad-namu"
@@ -77,19 +98,3 @@ msgstr "&Dewis Popeth"
 #: tdelistdebugdialog.cpp:57
 msgid "&Deselect All"
 msgstr "Da&tddewis Popeth"
-
-#: main.cpp:72
-msgid "Show the fully-fledged dialog instead of the default list dialog"
-msgstr "Dangos yr ymgom llawn yn lle ymgom y rhestr ragosodol."
-
-#: main.cpp:80
-msgid "TDEDebugDialog"
-msgstr "KYmgomDad-namu (TDEDebugDialog)"
-
-#: main.cpp:81
-msgid "A dialog box for setting preferences for debug output"
-msgstr "Blwch ymgom am osod hoffiannau am allbwn dad-namu"
-
-#: main.cpp:83
-msgid "Maintainer"
-msgstr "Cynhaliwr"
diff --git a/tde-i18n-cy/messages/tdebase/tdefontinst.po b/tde-i18n-cy/messages/tdebase/tdefontinst.po
index 934f783f17d..cd2a8944074 100644
--- a/tde-i18n-cy/messages/tdebase/tdefontinst.po
+++ b/tde-i18n-cy/messages/tdebase/tdefontinst.po
@@ -7,20 +7,21 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefontinst\n"
-"POT-Creation-Date: 2008-06-16 02:37+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2005-01-27 20:19+0000\n"
 "Last-Translator: Kevin Donnelly <kevin@dotmon.com>\n"
 "Language-Team: Cymraeg\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9\n"
 
-#: kcmfontinst/KCmFontInst.cpp:87
+#: kcmfontinst/KCmFontInst.cpp:88
 msgid "TDE Font Installer"
 msgstr "Arsefydlydd Wynebfathau TDE"
 
-#: kcmfontinst/KCmFontInst.cpp:90
+#: kcmfontinst/KCmFontInst.cpp:91
 msgid ""
 "GUI front end to the fonts:/ ioslave.\n"
 "(c) Craig Drummond, 2000 - 2004"
@@ -28,15 +29,15 @@ msgstr ""
 "Blaen-wyneb GUI i'r io-was fonts:/.\n"
 "(h) Craig Drummond, 2000 - 2003"
 
-#: kcmfontinst/KCmFontInst.cpp:92
+#: kcmfontinst/KCmFontInst.cpp:93
 msgid "Developer and maintainer"
 msgstr "Datblygiwr a chynhaliwr"
 
-#: kcmfontinst/KCmFontInst.cpp:157 kcmfontinst/KCmFontInst.cpp:220
+#: kcmfontinst/KCmFontInst.cpp:158 kcmfontinst/KCmFontInst.cpp:221
 msgid "Add Fonts..."
 msgstr "Ychwanegu Wynebfathau..."
 
-#: kcmfontinst/KCmFontInst.cpp:172
+#: kcmfontinst/KCmFontInst.cpp:173
 msgid ""
 "<b>The fonts shown are your personal fonts.</b>"
 "<br>To see (and install) system-wide fonts, click on the \"Administrator Mode\" "
@@ -46,19 +47,19 @@ msgstr ""
 "<br>Er mwyn gweld (ac arsefydlu) wynebfathau cysawd, cliciwch ar y botwm \"Modd "
 "Gweinyddwr\" isod."
 
-#: kcmfontinst/KCmFontInst.cpp:213
+#: kcmfontinst/KCmFontInst.cpp:214
 msgid "Show Bitmap Fonts"
 msgstr ""
 
-#: kcmfontinst/KCmFontInst.cpp:234
+#: kcmfontinst/KCmFontInst.cpp:235
 msgid "Configure..."
 msgstr "Ffurfweddu..."
 
-#: kcmfontinst/KCmFontInst.cpp:238
+#: kcmfontinst/KCmFontInst.cpp:239
 msgid "Print..."
 msgstr "Argraffu"
 
-#: kcmfontinst/KCmFontInst.cpp:317
+#: kcmfontinst/KCmFontInst.cpp:318
 msgid ""
 "<h1>Font Installer</h1>"
 "<p> This module allows you to install TrueType, Type1, and Bitmap fonts.</p>"
@@ -74,7 +75,7 @@ msgstr ""
 "arsefydliedig.  Er mwyn arsefydlu wynebfath, copiwch un i mewn i'r blygell "
 "addas.</p>"
 
-#: kcmfontinst/KCmFontInst.cpp:324
+#: kcmfontinst/KCmFontInst.cpp:325
 msgid ""
 "<h1>Font Installer</h1>"
 "<p> This module allows you to install TrueType, Type1, and Bitmap fonts.</p>"
@@ -99,19 +100,19 @@ msgstr ""
 "wynebfathau cysawd, defnyddiwch y botwm \"Modd Gweinyddwr\" i redeg y modiwl "
 "yma fel \"gwraidd\".</p>"
 
-#: kcmfontinst/KCmFontInst.cpp:421
+#: kcmfontinst/KCmFontInst.cpp:422
 msgid "Add Fonts"
 msgstr "Ychwanegu Wynebfathau"
 
-#: kcmfontinst/KCmFontInst.cpp:430
+#: kcmfontinst/KCmFontInst.cpp:431
 msgid "You did not select anything to delete."
 msgstr "Ni ddewisoch rywbeth i'w ddileu."
 
-#: kcmfontinst/KCmFontInst.cpp:430
+#: kcmfontinst/KCmFontInst.cpp:431
 msgid "Nothing to Delete"
 msgstr "Dim byd i'w Dileu"
 
-#: kcmfontinst/KCmFontInst.cpp:454
+#: kcmfontinst/KCmFontInst.cpp:455
 msgid ""
 "<qt>Do you really want to delete\n"
 " <b>'%1'</b>?</qt>"
@@ -119,11 +120,11 @@ msgstr ""
 "<qt>Ydych wir eisiau dileu\n"
 " <b>'%1'</b>?</qt>"
 
-#: kcmfontinst/KCmFontInst.cpp:455
+#: kcmfontinst/KCmFontInst.cpp:456
 msgid "Delete Font"
 msgstr "Dileu Wynebfath"
 
-#: kcmfontinst/KCmFontInst.cpp:459
+#: kcmfontinst/KCmFontInst.cpp:460
 #, fuzzy, c-format
 msgid ""
 "_n: Do you really want to delete this font?\n"
@@ -132,21 +133,21 @@ msgstr ""
 "Ydych wir eisiau dileu'r wynebfath yma?\n"
 "Ydych wir eisiau dileu'r %n o wynebfathau yma?"
 
-#: kcmfontinst/KCmFontInst.cpp:461
+#: kcmfontinst/KCmFontInst.cpp:462
 msgid "Delete Fonts"
 msgstr "Dileu Wynebfathau"
 
-#: kcmfontinst/KCmFontInst.cpp:535
+#: kcmfontinst/KCmFontInst.cpp:536
 msgid ""
 "There are no printable fonts.\n"
 "You can only print non-bitmap fonts."
 msgstr ""
 
-#: kcmfontinst/KCmFontInst.cpp:536
+#: kcmfontinst/KCmFontInst.cpp:537
 msgid "Cannot Print"
 msgstr ""
 
-#: kcmfontinst/KCmFontInst.cpp:561
+#: kcmfontinst/KCmFontInst.cpp:562
 #, c-format
 msgid ""
 "_n: One Font\n"
@@ -155,11 +156,11 @@ msgstr ""
 "Un Wynebfath\n"
 "%n o Wynebfathau"
 
-#: kcmfontinst/KCmFontInst.cpp:581
+#: kcmfontinst/KCmFontInst.cpp:582
 msgid "(%1 Total)"
 msgstr "(%1 Cyfanswm)"
 
-#: kcmfontinst/KCmFontInst.cpp:584
+#: kcmfontinst/KCmFontInst.cpp:585
 #, c-format
 msgid ""
 "_n: One Family\n"
@@ -168,7 +169,7 @@ msgstr ""
 "Un Deulu \n"
 "%n o Deuluoedd"
 
-#: kcmfontinst/KCmFontInst.cpp:611
+#: kcmfontinst/KCmFontInst.cpp:612
 #, fuzzy
 msgid ""
 "<p>Please note that any open applications will need to be restarted in order "
@@ -180,7 +181,7 @@ msgstr ""
 "Noder: bydd angen ail-gychwyn cymhwysiadau agored er mwyn i newidiadau gael eu "
 "sylwi."
 
-#: kcmfontinst/KCmFontInst.cpp:615
+#: kcmfontinst/KCmFontInst.cpp:616
 msgid ""
 "Please note that any open applications will need to be restarted in order for "
 "any changes to be noticed."
@@ -188,7 +189,7 @@ msgstr ""
 "Noder: bydd angen ail-gychwyn cymhwysiadau agored er mwyn i newidiadau gael eu "
 "sylwi."
 
-#: kcmfontinst/KCmFontInst.cpp:618 viewpart/FontViewPart.cpp:244
+#: kcmfontinst/KCmFontInst.cpp:619 viewpart/FontViewPart.cpp:244
 msgid "Success"
 msgstr "Llwyddiant"
 
@@ -307,6 +308,46 @@ msgstr "Diweddaru"
 msgid "Do Not Update"
 msgstr ""
 
+#: lib/FcEngine.cpp:522
+msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz0123456789"
+msgstr "AaBbCcDdEeFfGgHhIiJjLlMmNnOoPpRrSsTtUuWwYy0123456789"
+
+#: lib/FcEngine.cpp:576
+msgid "ERROR: Could not determine font's name."
+msgstr "GWALL: Methu pennu enw'r wynebfath."
+
+#: lib/FcEngine.cpp:580
+msgid ""
+"_n: %1 [1 pixel]\n"
+"%1 [%n pixels]"
+msgstr ""
+"%1 [1 picsel]\n"
+"%1 [%n o bicseli]"
+
+#: lib/FcEngine.cpp:697
+msgid ""
+"_: A sentence that uses all of the letters of the alphabet\n"
+"The quick brown fox jumps over the lazy dog"
+msgstr "Cwsg ni ddaw i'm hamrant heno"
+
+#: lib/FcEngine.cpp:711
+msgid ""
+"_: All of the letters of the alphabet, uppercase\n"
+"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+msgstr "ABCDEFGHIJLMNOPRSTUWY"
+
+#: lib/FcEngine.cpp:716
+msgid ""
+"_: All of the letters of the alphabet, lowercase\n"
+"abcdefghijklmnopqrstuvwxyz"
+msgstr "abcdefghIiJjlmnoprstuwy"
+
+#: lib/FcEngine.cpp:721
+msgid ""
+"_: Numbers and characters\n"
+"0123456789.:,;(*!?'/\\\")£$€%^&-+@~#<>{}[]"
+msgstr "0123456789.:,;(*!?'/\\\")£$€%^&-+@~#<>{}[]"
+
 #: tdefile-plugin/KFileFont.cpp:287
 msgid "General"
 msgstr "Cyffredinol"
@@ -432,46 +473,6 @@ msgid ""
 "Sorry, you cannot rename, move, copy, or delete either \"%1\" or \"%2\"."
 msgstr "Ni allwch ail-enwi, symud, copïo, neu ddileu unai \"%1\" neu \"%2\"."
 
-#: lib/FcEngine.cpp:522
-msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz0123456789"
-msgstr "AaBbCcDdEeFfGgHhIiJjLlMmNnOoPpRrSsTtUuWwYy0123456789"
-
-#: lib/FcEngine.cpp:576
-msgid "ERROR: Could not determine font's name."
-msgstr "GWALL: Methu pennu enw'r wynebfath."
-
-#: lib/FcEngine.cpp:580
-msgid ""
-"_n: %1 [1 pixel]\n"
-"%1 [%n pixels]"
-msgstr ""
-"%1 [1 picsel]\n"
-"%1 [%n o bicseli]"
-
-#: lib/FcEngine.cpp:697
-msgid ""
-"_: A sentence that uses all of the letters of the alphabet\n"
-"The quick brown fox jumps over the lazy dog"
-msgstr "Cwsg ni ddaw i'm hamrant heno"
-
-#: lib/FcEngine.cpp:711
-msgid ""
-"_: All of the letters of the alphabet, uppercase\n"
-"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-msgstr "ABCDEFGHIJLMNOPRSTUWY"
-
-#: lib/FcEngine.cpp:716
-msgid ""
-"_: All of the letters of the alphabet, lowercase\n"
-"abcdefghijklmnopqrstuvwxyz"
-msgstr "abcdefghIiJjlmnoprstuwy"
-
-#: lib/FcEngine.cpp:721
-msgid ""
-"_: Numbers and characters\n"
-"0123456789.:,;(*!?'/\\\")£$€%^&-+@~#<>{}[]"
-msgstr "0123456789.:,;(*!?'/\\\")£$€%^&-+@~#<>{}[]"
-
 #: viewpart/FontPreview.cpp:92
 msgid " No preview available"
 msgstr "Dim rhagolwg ar gael"
diff --git a/tde-i18n-cy/messages/tdebase/tdehtmlkttsd.po b/tde-i18n-cy/messages/tdebase/tdehtmlkttsd.po
index 3d70661cb82..06b2a5a57e5 100644
--- a/tde-i18n-cy/messages/tdebase/tdehtmlkttsd.po
+++ b/tde-i18n-cy/messages/tdebase/tdehtmlkttsd.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: all2.po\n"
-"POT-Creation-Date: 2006-01-04 03:13+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdebase/tdeio_finger.po b/tde-i18n-cy/messages/tdebase/tdeio_finger.po
index 401f04cea26..6be33fc1b31 100644
--- a/tde-i18n-cy/messages/tdebase/tdeio_finger.po
+++ b/tde-i18n-cy/messages/tdebase/tdeio_finger.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_finger\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-07-21 16:55+0100\n"
 "Last-Translator: KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdebase/tdeio_fish.po b/tde-i18n-cy/messages/tdebase/tdeio_fish.po
index 566ab7c41e7..b251e340fe4 100644
--- a/tde-i18n-cy/messages/tdebase/tdeio_fish.po
+++ b/tde-i18n-cy/messages/tdebase/tdeio_fish.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_fish\n"
-"POT-Creation-Date: 2006-11-05 02:34+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-07-21 16:56+0100\n"
 "Last-Translator: KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdebase/tdeio_floppy.po b/tde-i18n-cy/messages/tdebase/tdeio_floppy.po
index 8e08f1a7149..42780f7d628 100644
--- a/tde-i18n-cy/messages/tdebase/tdeio_floppy.po
+++ b/tde-i18n-cy/messages/tdebase/tdeio_floppy.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_floppy\n"
-"POT-Creation-Date: 2005-09-21 02:57+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2005-09-03 17:09+0100\n"
 "Last-Translator: Kevin Donnelly <kevin@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdebase/tdeio_home.po b/tde-i18n-cy/messages/tdebase/tdeio_home.po
index 4d8de4b4070..46a46b3c0b2 100644
--- a/tde-i18n-cy/messages/tdebase/tdeio_home.po
+++ b/tde-i18n-cy/messages/tdebase/tdeio_home.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2006-04-28 03:54+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdebase/tdeio_ldap.po b/tde-i18n-cy/messages/tdebase/tdeio_ldap.po
index 85c5b321ff7..726781f8735 100644
--- a/tde-i18n-cy/messages/tdebase/tdeio_ldap.po
+++ b/tde-i18n-cy/messages/tdebase/tdeio_ldap.po
@@ -3,10 +3,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_ldap\n"
-"POT-Creation-Date: 2007-11-01 01:14+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-07-04 12:02+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdebase/tdeio_mac.po b/tde-i18n-cy/messages/tdebase/tdeio_mac.po
index 3442f29e967..61592db205c 100644
--- a/tde-i18n-cy/messages/tdebase/tdeio_mac.po
+++ b/tde-i18n-cy/messages/tdebase/tdeio_mac.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_mac\n"
-"POT-Creation-Date: 2005-09-21 02:57+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-07-21 17:13+0100\n"
 "Last-Translator: KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdebase/tdeio_man.po b/tde-i18n-cy/messages/tdebase/tdeio_man.po
index 851ce409720..38e3a69083a 100644
--- a/tde-i18n-cy/messages/tdebase/tdeio_man.po
+++ b/tde-i18n-cy/messages/tdebase/tdeio_man.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_man\n"
-"POT-Creation-Date: 2007-05-29 02:15+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-07-22 14:28+0100\n"
 "Last-Translator: KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,7 +27,11 @@ msgid ""
 "Your emails"
 msgstr "kyfieithu@dotmon.com"
 
-#: tdeio_man.cpp:465
+#: kmanpart.cpp:65
+msgid "KMan"
+msgstr "KMan"
+
+#: tdeio_man.cpp:471
 msgid ""
 "No man page matching to %1 found."
 "<br>"
@@ -37,96 +42,96 @@ msgid ""
 "file in the directory /etc ."
 msgstr ""
 
-#: tdeio_man.cpp:496
+#: tdeio_man.cpp:508
 msgid "Open of %1 failed."
 msgstr "Methodd agor %1."
 
-#: tdeio_man.cpp:600 tdeio_man.cpp:618
+#: tdeio_man.cpp:649 tdeio_man.cpp:667
 msgid "Man output"
 msgstr "Allbwn llawlyfr"
 
-#: tdeio_man.cpp:604
+#: tdeio_man.cpp:653
 #, fuzzy
 msgid "<body><h1>TDE Man Viewer Error</h1>"
 msgstr "<body bgcolor=#ffffff><h1>Gwall Gwelydd Llawlyfr TDE</h1>"
 
-#: tdeio_man.cpp:622
+#: tdeio_man.cpp:671
 msgid "There is more than one matching man page."
 msgstr "Mae mwy nag un dudalen llawlyfr yn cydweddu."
 
-#: tdeio_man.cpp:633
+#: tdeio_man.cpp:682
 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 ""
 
-#: tdeio_man.cpp:723
+#: tdeio_man.cpp:772
 msgid "User Commands"
 msgstr "Gorchmynion Defnyddiwr"
 
-#: tdeio_man.cpp:725
+#: tdeio_man.cpp:774
 msgid "System Calls"
 msgstr "Galwadau Cysawd"
 
-#: tdeio_man.cpp:727
+#: tdeio_man.cpp:776
 msgid "Subroutines"
 msgstr "Is-reolweithiau"
 
-#: tdeio_man.cpp:729
+#: tdeio_man.cpp:778
 msgid "Perl Modules"
 msgstr "Modylau Perl"
 
-#: tdeio_man.cpp:731
+#: tdeio_man.cpp:780
 msgid "Network Functions"
 msgstr "Ffwythiannau Rhwydwaith"
 
-#: tdeio_man.cpp:733
+#: tdeio_man.cpp:782
 msgid "Devices"
 msgstr "Dyfeisiau"
 
-#: tdeio_man.cpp:735
+#: tdeio_man.cpp:784
 msgid "File Formats"
 msgstr "Fformadau Ffeil"
 
-#: tdeio_man.cpp:737
+#: tdeio_man.cpp:786
 msgid "Games"
 msgstr "Gêmau"
 
-#: tdeio_man.cpp:741
+#: tdeio_man.cpp:790
 msgid "System Administration"
 msgstr "Gweinyddiaeth Cysawd"
 
-#: tdeio_man.cpp:743
+#: tdeio_man.cpp:792
 msgid "Kernel"
 msgstr "Cnewyllyn"
 
-#: tdeio_man.cpp:745
+#: tdeio_man.cpp:794
 msgid "Local Documentation"
 msgstr "Dogfennaeth Lleol"
 
-#: tdeio_man.cpp:747
+#: tdeio_man.cpp:796
 msgid "New"
 msgstr "Newydd"
 
-#: tdeio_man.cpp:782 tdeio_man.cpp:786 tdeio_man.cpp:1209
+#: tdeio_man.cpp:831 tdeio_man.cpp:835 tdeio_man.cpp:1258
 msgid "UNIX Manual Index"
 msgstr "Mynegai Llawlyfr UNIX"
 
-#: tdeio_man.cpp:801
+#: tdeio_man.cpp:850
 msgid "Section "
 msgstr "Adran "
 
-#: tdeio_man.cpp:1214
+#: tdeio_man.cpp:1263
 #, fuzzy
 msgid "Index for Section %1: %2"
 msgstr "<body bgcolor=#ffffff><h1>Mynegai Adran %1: %2</h1>"
 
-#: tdeio_man.cpp:1219
+#: tdeio_man.cpp:1268
 msgid "Generating Index"
 msgstr "Yn Creu Mynegai"
 
-#: tdeio_man.cpp:1529
+#: tdeio_man.cpp:1584
 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 "
@@ -136,10 +141,6 @@ msgstr ""
 "ac estyn y llwybr chwilio drwy addasu'r newidyn amgylchedd PATH cyn cychwyn "
 "TDE."
 
-#: kmanpart.cpp:65
-msgid "KMan"
-msgstr "KMan"
-
 #~ msgid "No man page matching to %1 found. You can extend the search path by setting the environment variable MANPATH before starting TDE."
 #~ msgstr "Ni ganfuwyd tudalen llawlyfr (man) yn cydweddu â %1. Gallwch estyn y chwiliad drwy osod y newidyn amgylchedd MANPATH cyn cychwyn TDE."
 
diff --git a/tde-i18n-cy/messages/tdebase/tdeio_media.po b/tde-i18n-cy/messages/tdebase/tdeio_media.po
index e85bdd81b5c..2b3586b029f 100644
--- a/tde-i18n-cy/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-cy/messages/tdebase/tdeio_media.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_devices\n"
-"POT-Creation-Date: 2008-07-08 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-12-28 11:06+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,60 +28,73 @@ msgid ""
 "Your emails"
 msgstr "kyfieithu@dotmon.com"
 
-#: tdeio_media.cpp:35
-msgid "Protocol name"
-msgstr "Enw protocol"
-
-#: tdeio_media.cpp:36 tdeio_media.cpp:37
-msgid "Socket name"
-msgstr "Enw soced"
-
-#: mediaimpl.cpp:86 mediaimpl.cpp:113 mediaimpl.cpp:139 mediaimpl.cpp:173
-#: mediaimpl.cpp:193 mediaimpl.cpp:214
-#: mounthelper/tdeio_media_mounthelper.cpp:45
+#: mediaimpl.cpp:88 mediaimpl.cpp:115 mediaimpl.cpp:141 mediaimpl.cpp:177
+#: mediaimpl.cpp:197 mediaimpl.cpp:218
+#: mounthelper/tdeio_media_mounthelper.cpp:48
+#: mounthelper/tdeio_media_mounthelper.cpp:252
 msgid "The TDE mediamanager is not running."
 msgstr ""
 
-#: mediaimpl.cpp:183
+#: mediaimpl.cpp:187
 msgid "This media name already exists."
 msgstr ""
 
-#: mediaimpl.cpp:226
+#: mediaimpl.cpp:230 mediaimpl.cpp:293
 msgid "No such medium."
 msgstr ""
 
-#: mediaimpl.cpp:259 mediamanager/halbackend.cpp:972
-#: mediamanager/halbackend.cpp:981 mediamanager/halbackend.cpp:1285
-#: mediamanager/halbackend.cpp:1296 mounthelper/tdeio_media_mounthelper.cpp:53
+#: mediaimpl.cpp:238
+msgid "The drive is encrypted."
+msgstr ""
+
+#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1260
+#: mediamanager/halbackend.cpp:1269 mediamanager/halbackend.cpp:1659
+#: mediamanager/halbackend.cpp:1676 mediamanager/halbackend.cpp:1687
+#: mediamanager/halbackend.cpp:1789 mediamanager/halbackend.cpp:1797
+#: mediamanager/halbackend.cpp:1804 mediamanager/halbackend.cpp:1844
+#: mediamanager/halbackend.cpp:1850 mediamanager/halbackend.cpp:1857
+#: mounthelper/tdeio_media_mounthelper.cpp:56
 msgid "Internal Error"
 msgstr "Gwall Mewnol"
 
-#. i18n: file propsdlgplugin/propertiespagegui.ui line 35
+#. i18n: file propsdlgplugin/propertiespagegui.ui line 16
 #: rc.cpp:3
 #, no-c-format
+msgid "PropertiesPageGUI"
+msgstr ""
+
+#. i18n: file propsdlgplugin/propertiespagegui.ui line 27
+#: rc.cpp:6
+#, no-c-format
+msgid "Use default mount options"
+msgstr ""
+
+#. i18n: file propsdlgplugin/propertiespagegui.ui line 35
+#: rc.cpp:9
+#, no-c-format
 msgid "Generic Mount Options"
 msgstr ""
 
 #. i18n: file propsdlgplugin/propertiespagegui.ui line 54
-#: rc.cpp:6
+#: rc.cpp:12
 #, no-c-format
 msgid "Read only"
 msgstr "Darllen yn unig"
 
 #. i18n: file propsdlgplugin/propertiespagegui.ui line 57
-#: rc.cpp:9
+#: rc.cpp:15
 #, no-c-format
 msgid "Mount the file system read-only."
 msgstr ""
 
 #. i18n: file propsdlgplugin/propertiespagegui.ui line 65
-#: rc.cpp:12
+#: rc.cpp:18
 #, no-c-format
 msgid "Quiet"
 msgstr ""
 
 #. i18n: file propsdlgplugin/propertiespagegui.ui line 68
-#: rc.cpp:15
+#: rc.cpp:21
 #, no-c-format
 msgid ""
 "Attempts to chown or chmod files do not return errors, although they fail. Use "
@@ -88,37 +102,37 @@ msgid ""
 msgstr ""
 
 #. i18n: file propsdlgplugin/propertiespagegui.ui line 76
-#: rc.cpp:18
+#: rc.cpp:24
 #, no-c-format
 msgid "Synchronous"
 msgstr ""
 
 #. i18n: file propsdlgplugin/propertiespagegui.ui line 79
-#: rc.cpp:21
+#: rc.cpp:27
 #, no-c-format
 msgid "All I/O to the file system should be done synchronously."
 msgstr ""
 
 #. i18n: file propsdlgplugin/propertiespagegui.ui line 87
-#: rc.cpp:24
+#: rc.cpp:30
 #, no-c-format
 msgid "Access time updates"
 msgstr ""
 
 #. i18n: file propsdlgplugin/propertiespagegui.ui line 90
-#: rc.cpp:27
+#: rc.cpp:33
 #, no-c-format
 msgid "Update inode access time for each access."
 msgstr ""
 
 #. i18n: file propsdlgplugin/propertiespagegui.ui line 106
-#: rc.cpp:30
+#: rc.cpp:36
 #, fuzzy, no-c-format
 msgid "Mountpoint:"
 msgstr "Man Clymu"
 
 #. i18n: file propsdlgplugin/propertiespagegui.ui line 112
-#: rc.cpp:33
+#: rc.cpp:39
 #, no-c-format
 msgid ""
 "Under what directory this file system shall be mounted. Please note that there "
@@ -127,44 +141,44 @@ msgid ""
 msgstr ""
 
 #. i18n: file propsdlgplugin/propertiespagegui.ui line 130
-#: rc.cpp:36
+#: rc.cpp:42
 #, no-c-format
 msgid "Mount automatically"
 msgstr ""
 
 #. i18n: file propsdlgplugin/propertiespagegui.ui line 133
-#: rc.cpp:39
+#: rc.cpp:45
 #, no-c-format
 msgid "Mount this file system automatically."
 msgstr ""
 
 #. i18n: file propsdlgplugin/propertiespagegui.ui line 145
-#: rc.cpp:42
+#: rc.cpp:48
 #, no-c-format
 msgid "Filesystem Specific Mount Options"
 msgstr ""
 
 #. i18n: file propsdlgplugin/propertiespagegui.ui line 164
-#: rc.cpp:45
+#: rc.cpp:51
 #, no-c-format
 msgid "Flushed IO"
 msgstr ""
 
 #. i18n: file propsdlgplugin/propertiespagegui.ui line 167
-#: rc.cpp:48
+#: rc.cpp:54
 #, no-c-format
 msgid ""
 "Always flush all data to the hot plug devices immediately and don't cache it."
 msgstr ""
 
 #. i18n: file propsdlgplugin/propertiespagegui.ui line 175
-#: rc.cpp:51
+#: rc.cpp:57
 #, no-c-format
 msgid "UTF-8 charset"
 msgstr ""
 
 #. i18n: file propsdlgplugin/propertiespagegui.ui line 178
-#: rc.cpp:54
+#: rc.cpp:60
 #, no-c-format
 msgid ""
 "UTF8 is the filesystem safe 8-bit encoding of Unicode that is used by the "
@@ -172,25 +186,25 @@ msgid ""
 msgstr ""
 
 #. i18n: file propsdlgplugin/propertiespagegui.ui line 186
-#: rc.cpp:57
+#: rc.cpp:63
 #, no-c-format
 msgid "Mount as user"
 msgstr ""
 
 #. i18n: file propsdlgplugin/propertiespagegui.ui line 189
-#: rc.cpp:60
+#: rc.cpp:66
 #, no-c-format
 msgid "Mount this file system as user."
 msgstr ""
 
 #. i18n: file propsdlgplugin/propertiespagegui.ui line 205
-#: rc.cpp:63
+#: rc.cpp:69
 #, no-c-format
 msgid "Journaling:"
 msgstr ""
 
 #. i18n: file propsdlgplugin/propertiespagegui.ui line 220
-#: rc.cpp:66 rc.cpp:87
+#: rc.cpp:72 rc.cpp:93
 #, no-c-format
 msgid ""
 "<h2>Specifies  the journalling mode for file data. Metadata is always "
@@ -214,31 +228,31 @@ msgid ""
 msgstr ""
 
 #. i18n: file propsdlgplugin/propertiespagegui.ui line 226
-#: rc.cpp:78
+#: rc.cpp:84
 #, no-c-format
 msgid "All Data"
 msgstr ""
 
 #. i18n: file propsdlgplugin/propertiespagegui.ui line 231
-#: rc.cpp:81
+#: rc.cpp:87
 #, no-c-format
 msgid "Ordered"
 msgstr ""
 
 #. i18n: file propsdlgplugin/propertiespagegui.ui line 236
-#: rc.cpp:84
+#: rc.cpp:90
 #, no-c-format
 msgid "Write Back"
 msgstr ""
 
 #. i18n: file propsdlgplugin/propertiespagegui.ui line 270
-#: rc.cpp:99
+#: rc.cpp:105
 #, fuzzy, no-c-format
 msgid "Short names:"
 msgstr "Enw soced"
 
 #. i18n: file propsdlgplugin/propertiespagegui.ui line 288
-#: rc.cpp:102 rc.cpp:129
+#: rc.cpp:108 rc.cpp:135
 #, no-c-format
 msgid ""
 "<h2>Defines  the  behaviour  for  creation and display of filenames which fit "
@@ -263,74 +277,82 @@ msgid ""
 msgstr ""
 
 #. i18n: file propsdlgplugin/propertiespagegui.ui line 294
-#: rc.cpp:117
+#: rc.cpp:123
 #, no-c-format
 msgid "Lower"
 msgstr "Gostwng"
 
 #. i18n: file propsdlgplugin/propertiespagegui.ui line 299
-#: rc.cpp:120
+#: rc.cpp:126
 #, no-c-format
 msgid "Windows 95"
 msgstr ""
 
 #. i18n: file propsdlgplugin/propertiespagegui.ui line 304
-#: rc.cpp:123
+#: rc.cpp:129
 #, no-c-format
 msgid "Windows NT"
 msgstr ""
 
 #. i18n: file propsdlgplugin/propertiespagegui.ui line 309
-#: rc.cpp:126
+#: rc.cpp:132
 #, no-c-format
 msgid "Mixed"
 msgstr "Cymysg"
 
 #. i18n: file propsdlgplugin/propertiespagegui.ui line 342
-#: rc.cpp:144
+#: rc.cpp:150
 #, no-c-format
 msgid "Filesystem: iso9660"
 msgstr ""
 
-#: tdefile-plugin/tdefilemediaplugin.cpp:173
+#: tdeio_media.cpp:36
+msgid "Protocol name"
+msgstr "Enw protocol"
+
+#: tdeio_media.cpp:37 tdeio_media.cpp:38
+msgid "Socket name"
+msgstr "Enw soced"
+
+#: tdefile-plugin/tdefilemediaplugin.cpp:183
 #, fuzzy
 msgid "Medium Information"
 msgstr "Gwybodaeth am y Ddyfais"
 
-#: tdefile-plugin/tdefilemediaplugin.cpp:176
+#: tdefile-plugin/tdefilemediaplugin.cpp:186
 msgid "Free"
 msgstr "Rhydd"
 
-#: tdefile-plugin/tdefilemediaplugin.cpp:179
+#: tdefile-plugin/tdefilemediaplugin.cpp:189
 msgid "Used"
 msgstr "Defnyddiwyd"
 
-#: tdefile-plugin/tdefilemediaplugin.cpp:182
+#: tdefile-plugin/tdefilemediaplugin.cpp:192
 msgid "Total"
 msgstr "Cyfanswm"
 
-#: tdefile-plugin/tdefilemediaplugin.cpp:185
+#: tdefile-plugin/tdefilemediaplugin.cpp:195
 msgid "Base URL"
 msgstr "URL Sylfaenol"
 
-#: tdefile-plugin/tdefilemediaplugin.cpp:186
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
 msgid "Mount Point"
 msgstr "Man Clymu"
 
-#: tdefile-plugin/tdefilemediaplugin.cpp:187
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
 #, fuzzy
 msgid "Device Node"
 msgstr "Dyfeisiau"
 
-#: tdefile-plugin/tdefilemediaplugin.cpp:189
+#: tdefile-plugin/tdefilemediaplugin.cpp:199
 msgid "Medium Summary"
 msgstr ""
 
-#: tdefile-plugin/tdefilemediaplugin.cpp:191
+#: tdefile-plugin/tdefilemediaplugin.cpp:201
 msgid "Usage"
 msgstr ""
 
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:203
 msgid "Bar Graph"
 msgstr ""
 
@@ -350,8 +372,15 @@ msgstr "Agor mewn Ffenestr Newydd"
 msgid "Unknown"
 msgstr "Anhysbys"
 
+#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
+msgid "Decrypt"
+msgstr ""
+
 #: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1218 mediamanager/halbackend.cpp:1240
+#: mediamanager/halbackend.cpp:1591 mediamanager/halbackend.cpp:1613
+#: mediamanager/halbackend.cpp:1772 mediamanager/halbackend.cpp:1827
+#: mediamanager/tdehardwarebackend.cpp:1323
+#: mediamanager/tdehardwarebackend.cpp:1334
 #, c-format
 msgid "No such medium: %1"
 msgstr ""
@@ -388,103 +417,339 @@ msgstr "Rhaniad Pell"
 msgid "Hard Disk"
 msgstr "Disg"
 
-#: mediamanager/halbackend.cpp:640
+#: mediamanager/halbackend.cpp:745 mediamanager/tdehardwarebackend.cpp:780
 #, fuzzy
 msgid "Unknown Drive"
 msgstr "Anhysbys"
 
-#: mediamanager/halbackend.cpp:652
+#: mediamanager/halbackend.cpp:757 mediamanager/tdehardwarebackend.cpp:810
 #, fuzzy
 msgid "Floppy Drive"
 msgstr "Llipa"
 
-#: mediamanager/halbackend.cpp:660
+#: mediamanager/halbackend.cpp:765
 #, fuzzy
 msgid "Zip Drive"
 msgstr "Disg Zip"
 
-#: mediamanager/halbackend.cpp:730
+#: mediamanager/halbackend.cpp:835 mediamanager/tdehardwarebackend.cpp:867
 msgid "Camera"
 msgstr ""
 
-#: mediamanager/halbackend.cpp:992
+#: mediamanager/halbackend.cpp:1217 mediamanager/halbackend.cpp:1243
+msgid "Authenticate"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1218
+msgid ""
+"<big><b>System policy prevents mounting internal media</b></big>"
+"<br/>Authentication is required to perform this action. Please enter your "
+"password to verify."
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1244
+msgid ""
+"<big><b>System policy prevents unmounting media mounted by other users</b></big>"
+"<br/>Authentication is required to perform this action. Please enter your "
+"password to verify."
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1280
 msgid "Invalid filesystem type"
 msgstr ""
 
-#: mediamanager/halbackend.cpp:994 mediamanager/halbackend.cpp:1141
-#: mediamanager/halbackend.cpp:1317
-msgid "Permissions denied"
+#: mediamanager/halbackend.cpp:1282
+msgid ""
+"Permission denied"
+"<p>Please ensure that:"
+"<br>1. You have permission to access this device."
+"<br>2. This device node is not listed in /etc/fstab.</p>"
 msgstr ""
 
-#: mediamanager/halbackend.cpp:996
+#: mediamanager/halbackend.cpp:1286
 #, fuzzy
 msgid "Device is already mounted."
 msgstr "Dyfais heb ei osod"
 
-#: mediamanager/halbackend.cpp:1042
+#: mediamanager/halbackend.cpp:1336
 msgid ""
 "Moreover, programs still using the device have been detected. They are listed "
 "below. You have to close them or change their working directory before "
 "attempting to unmount the device again."
 msgstr ""
 
-#: mediamanager/halbackend.cpp:1065 mediamanager/halbackend.cpp:1306
+#: mediamanager/halbackend.cpp:1377 mediamanager/tdehardwarebackend.cpp:1562
+msgid ""
+"Programs that were still using the device have been forcibly terminated. They "
+"are listed below."
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1398 mediamanager/halbackend.cpp:1711
+#: mediamanager/tdehardwarebackend.cpp:1380
+#: mediamanager/tdehardwarebackend.cpp:1398
+#: mediamanager/tdehardwarebackend.cpp:1438
 msgid ""
 "Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> "
 "and currently mounted at <b>%4</b> could not be unmounted. "
 msgstr ""
 
-#: mediamanager/halbackend.cpp:1071
+#: mediamanager/halbackend.cpp:1404 mediamanager/tdehardwarebackend.cpp:1444
 msgid "The following error was returned by umount command:"
 msgstr ""
 
-#: mediamanager/halbackend.cpp:1312
+#: mediamanager/halbackend.cpp:1474
+msgid "Permission denied"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1558 mediamanager/tdehardwarebackend.cpp:1206
+msgid "Cannot mount encrypted drives!"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1717
 msgid "Unmounting failed due to the following error:"
 msgstr ""
 
-#: mediamanager/halbackend.cpp:1314
+#: mediamanager/halbackend.cpp:1719
 msgid "Device is Busy:"
 msgstr ""
 
-#: mediamanager/mediamanager.cpp:213 mediamanager/mediamanager.cpp:217
-#: mediamanager/mediamanager.cpp:226 mediamanager/mediamanager.cpp:230
+#: mediamanager/halbackend.cpp:1723
+msgid ""
+"Permission denied"
+"<p>Please ensure that:"
+"<br>1. You have permission to access this device."
+"<br>2. This device was originally mounted using TDE.</p>"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1735
+msgid ""
+"%1"
+"<p><b>Would you like to forcibly terminate these processes?</b>"
+"<br><i>All unsaved data would be lost</i>"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1807
+msgid "Wrong password"
+msgstr ""
+
+#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
+#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
+#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
 msgid "Feature only available with HAL"
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:74
+#: mediamanager/mediamanager.cpp:252
+msgid "Feature only available with the TDE hardware backend"
+msgstr ""
+
+#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
+#: mediamanager/mediamanager.cpp:275
+msgid "Feature only available with HAL or TDE hardware backend"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:452
+#: mediamanager/tdehardwarebackend.cpp:489
+#: mediamanager/tdehardwarebackend.cpp:720
+msgid "%1 Removable Device"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:497
+#, fuzzy
+msgid "Blank CD-ROM"
+msgstr "CDd-ROM"
+
+#: mediamanager/tdehardwarebackend.cpp:506
+msgid "Blank CD-R"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:515
+msgid "Blank CD-RW"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:524
+msgid "Blank Magneto-Optical CD"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:533
+msgid "Blank Mount Ranier CD-RW"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:542
+msgid "Blank Mount Ranier CD-RW-W"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:551
+msgid "Blank DVD-ROM"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:560
+msgid "Blank DVD-RAM"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:569
+msgid "Blank DVD-R"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:578
+msgid "Blank DVD-RW"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:587
+msgid "Blank Dual Layer DVD-R"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:596
+msgid "Blank Dual Layer DVD-RW"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:605
+msgid "Blank DVD+R"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:614
+msgid "Blank DVD+RW"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:623
+msgid "Blank Dual Layer DVD+R"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:632
+msgid "Blank Dual Layer DVD+RW"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:641
+msgid "Blank BD-ROM"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:650
+msgid "Blank BD-R"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:659
+msgid "Blank BD-RW"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:668
+msgid "Blank HDDVD-ROM"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:677
+msgid "Blank HDDVD-R"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:686
+msgid "Blank HDDVD-RW"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:693
+msgid "Audio CD"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:714
+msgid "%1 Fixed Disk (%2)"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:824
+#, fuzzy
+msgid "%1 Zip Disk"
+msgstr "Disg Zip"
+
+#: mediamanager/tdehardwarebackend.cpp:1186
+#: mediamanager/tdehardwarebackend.cpp:1366
+#, fuzzy
+msgid "Internal error"
+msgstr "Gwall Mewnol"
+
+#: mediamanager/tdehardwarebackend.cpp:1213
+msgid ""
+"<qt>Unable to mount this device."
+"<p>Potential reasons include:"
+"<br>Improper device and/or user privilege level"
+"<br>Corrupt data on storage device"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:1215
+#: mediamanager/tdehardwarebackend.cpp:1290
+#: mediamanager/tdehardwarebackend.cpp:1382
+#: mediamanager/tdehardwarebackend.cpp:1400
+msgid "<p>Technical details:<br>"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:1288
+msgid ""
+"<qt>Unable to mount this device."
+"<p>Potential reasons include:"
+"<br>Improper device and/or user privilege level"
+"<br>Corrupt data on storage device"
+"<br>Incorrect encryption password"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:1394
+msgid ""
+"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
+"%4</b> can not be unmounted at this time."
+"<p>%5"
+"<p><b>Would you like to forcibly terminate these processes?</b>"
+"<br><i>All unsaved data would be lost</i>"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:1521
+msgid ""
+"Programs still using the device have been detected. They are listed below. You "
+"have to close them or change their working directory before attempting to "
+"unmount the device again."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:77
 msgid "%1 cannot be found."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:81
+#: mounthelper/tdeio_media_mounthelper.cpp:84
 #, fuzzy
 msgid "%1 is not a mountable media."
 msgstr "%1%2 (heb ei osod)"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:166
+#: mounthelper/tdeio_media_mounthelper.cpp:99
+#, fuzzy
+msgid "%1 is not an encrypted media."
+msgstr "%1%2 (heb ei osod)"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:105
+#, fuzzy
+msgid "%1 is already decrypted."
+msgstr "Dyfais heb ei osod"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:224
 msgid "The device was successfully unmounted, but the tray could not be opened"
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:168
+#: mounthelper/tdeio_media_mounthelper.cpp:226
 msgid "The device was successfully unmounted, but could not be ejected"
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:182
+#: mounthelper/tdeio_media_mounthelper.cpp:271
+#, fuzzy
+msgid "Decrypt given URL"
+msgstr "Datosod yr URL a roddwyd"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:272
 msgid "Unmount given URL"
 msgstr "Datosod yr URL a roddwyd"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:183
+#: mounthelper/tdeio_media_mounthelper.cpp:273
 msgid "Mount given URL (default)"
 msgstr "Gosod yr URL a roddwyd (rhagosod)"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:184
+#: mounthelper/tdeio_media_mounthelper.cpp:274
 msgid "Eject given URL via tdeeject"
 msgstr "Allfwrw'r URL a roddwyd drwy tdeeject"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:185
+#: mounthelper/tdeio_media_mounthelper.cpp:275
 msgid "Unmount and Eject given URL (necessary for some USB devices)"
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:186
+#: mounthelper/tdeio_media_mounthelper.cpp:276
 #, fuzzy
 msgid "media:/ URL to mount/unmount/eject/remove"
 msgstr "dyfeisiau:/ URL i'w osod/ddatosod/allfwrw."
@@ -494,15 +759,15 @@ msgstr "dyfeisiau:/ URL i'w osod/ddatosod/allfwrw."
 msgid "Filesystem: %1"
 msgstr ""
 
-#: propsdlgplugin/propertiespage.cpp:196
+#: propsdlgplugin/propertiespage.cpp:207
 msgid "Mountpoint has to be below /media"
 msgstr ""
 
-#: propsdlgplugin/propertiespage.cpp:211
+#: propsdlgplugin/propertiespage.cpp:223
 msgid "Saving the changes failed"
 msgstr ""
 
-#: propsdlgplugin/propsdlgshareplugin.cpp:67
+#: propsdlgplugin/propsdlgshareplugin.cpp:68
 msgid "&Mounting"
 msgstr "&Gosod"
 
diff --git a/tde-i18n-cy/messages/tdebase/tdeio_nfs.po b/tde-i18n-cy/messages/tdebase/tdeio_nfs.po
index 241ffa5a479..1a2f4adf61f 100644
--- a/tde-i18n-cy/messages/tdebase/tdeio_nfs.po
+++ b/tde-i18n-cy/messages/tdebase/tdeio_nfs.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_nfs\n"
-"POT-Creation-Date: 2005-06-10 01:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-07-22 14:30+0100\n"
 "Last-Translator: KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdebase/tdeio_nntp.po b/tde-i18n-cy/messages/tdebase/tdeio_nntp.po
index e0284847dc8..b3505b12914 100644
--- a/tde-i18n-cy/messages/tdebase/tdeio_nntp.po
+++ b/tde-i18n-cy/messages/tdebase/tdeio_nntp.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_nntp\n"
-"POT-Creation-Date: 2005-06-20 01:29+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-07-22 14:33+0100\n"
 "Last-Translator: KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdebase/tdeio_pop3.po b/tde-i18n-cy/messages/tdebase/tdeio_pop3.po
index 85bb10f85ec..4b6937c1a11 100644
--- a/tde-i18n-cy/messages/tdebase/tdeio_pop3.po
+++ b/tde-i18n-cy/messages/tdebase/tdeio_pop3.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_pop3\n"
-"POT-Creation-Date: 2007-07-17 01:45+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-07-22 14:42+0100\n"
 "Last-Translator: KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -120,9 +121,10 @@ msgstr ""
 "Dewiswch dull awdurdodi gwahanol."
 
 #: pop3.cc:735
+#, fuzzy
 msgid ""
 "Your POP3 server claims to support TLS but negotiation was unsuccessful. You "
-"can disable TLS in TDE using the crypto settings module."
+"can disable TLS in KDE using the crypto settings module."
 msgstr ""
 "Honna'ch gweinydd POP3 ei fod yn cynnal TLS ond bu trafodaeth yn aflwyddiannus. "
 "Gallwch analluogi TLS yng TDE gan ddefnyddio'r modwl gosodiadau cêl-ysgrifaeth."
diff --git a/tde-i18n-cy/messages/tdebase/tdeio_print.po b/tde-i18n-cy/messages/tdebase/tdeio_print.po
index d3b4ca12aec..c4c1c5e26e9 100644
--- a/tde-i18n-cy/messages/tdebase/tdeio_print.po
+++ b/tde-i18n-cy/messages/tdebase/tdeio_print.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_print\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-12-27 15:06+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -86,14 +87,14 @@ msgstr "Methu pennu math y tarddiad am %1."
 msgid "Unable to retrieve printer information for %1."
 msgstr "Methu nôl gwybodaeth argraffyddion am %1."
 
-#: tdeio_print.cpp:640 tdeio_print.cpp:681 tdeio_print.cpp:724 tdeio_print.cpp:825
-#: tdeio_print.cpp:896
+#: tdeio_print.cpp:640 tdeio_print.cpp:681 tdeio_print.cpp:724
+#: tdeio_print.cpp:825 tdeio_print.cpp:896
 #, c-format
 msgid "Unable to load template %1"
 msgstr "Methu llwytho patrymlun %1 "
 
-#: tdeio_print.cpp:645 tdeio_print.cpp:646 tdeio_print.cpp:696 tdeio_print.cpp:697
-#: tdeio_print.cpp:735 tdeio_print.cpp:736
+#: tdeio_print.cpp:645 tdeio_print.cpp:646 tdeio_print.cpp:696
+#: tdeio_print.cpp:697 tdeio_print.cpp:735 tdeio_print.cpp:736
 #, c-format
 msgid "Properties of %1"
 msgstr "Priodweddau %1"
diff --git a/tde-i18n-cy/messages/tdebase/tdeio_remote.po b/tde-i18n-cy/messages/tdebase/tdeio_remote.po
index 1325ad6bf92..e9e8a16b037 100644
--- a/tde-i18n-cy/messages/tdebase/tdeio_remote.po
+++ b/tde-i18n-cy/messages/tdebase/tdeio_remote.po
@@ -1,14 +1,19 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: all2.po\n"
-"POT-Creation-Date: 2006-04-28 03:54+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: remoteimpl.cpp:198
+msgid "Add a Network Folder"
+msgstr ""
+
 #: tdeio_remote.cpp:34
 msgid "Protocol name"
 msgstr "Enw protocol"
@@ -16,7 +21,3 @@ msgstr "Enw protocol"
 #: tdeio_remote.cpp:35 tdeio_remote.cpp:36
 msgid "Socket name"
 msgstr "Enw soced"
-
-#: remoteimpl.cpp:198
-msgid "Add a Network Folder"
-msgstr ""
diff --git a/tde-i18n-cy/messages/tdebase/tdeio_settings.po b/tde-i18n-cy/messages/tdebase/tdeio_settings.po
index 1b17679db5f..ece19b14a9d 100644
--- a/tde-i18n-cy/messages/tdebase/tdeio_settings.po
+++ b/tde-i18n-cy/messages/tdebase/tdeio_settings.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_settings\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-12-27 15:03+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdebase/tdeio_sftp.po b/tde-i18n-cy/messages/tdebase/tdeio_sftp.po
index b59e2e46f73..bb5372debdd 100644
--- a/tde-i18n-cy/messages/tdebase/tdeio_sftp.po
+++ b/tde-i18n-cy/messages/tdebase/tdeio_sftp.po
@@ -5,169 +5,50 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_sftp\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-07-22 15:01+0100\n"
 "Last-Translator: KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: tdeio_sftp.cpp:427
-msgid "An internal error occurred. Please retry the request again."
-msgstr ""
-
-#: tdeio_sftp.cpp:510
-msgid "Opening SFTP connection to host <b>%1:%2</b>"
-msgstr "Yn agor cysylltiad SFTP i'r gwesteiwr <b>%1:%2</b>"
-
-#: tdeio_sftp.cpp:514
-msgid "No hostname specified"
-msgstr "Nid yw enw'r gwesteiwr wedi'i benodi"
-
-#: tdeio_sftp.cpp:526
-msgid "SFTP Login"
-msgstr "Mewngofnod SFTP"
-
-#: tdeio_sftp.cpp:528
-msgid "site:"
-msgstr "safle:"
-
-#: tdeio_sftp.cpp:629
-#, fuzzy
-msgid "Please enter your username and key passphrase."
-msgstr ""
-"Rhowch eich enw defnyddiwr a'ch cyfrinosodiad allweddol os gwelwch yn dda."
-
-#: tdeio_sftp.cpp:631
-#, fuzzy
-msgid "Please enter your username and password."
-msgstr "Rhowch eich enw defnyddiwr a'ch cyfrinair os gwelwch yn dda."
-
-#: tdeio_sftp.cpp:639
-#, fuzzy
-msgid "Incorrect username or password"
-msgstr "Enw defnyddiwr neu gyfrinair anghywir"
-
-#: tdeio_sftp.cpp:644
-#, fuzzy
-msgid "Please enter a username and password"
-msgstr "Rhowch enw defnyddiwr a chyfrinair"
-
-#: tdeio_sftp.cpp:703
-#, fuzzy
-msgid "Warning: Cannot verify host's identity."
-msgstr "Rhybydd: Methu gwirio dynodiad y gwesteiwr!"
-
-#: tdeio_sftp.cpp:714
-#, fuzzy
-msgid "Warning: Host's identity changed."
-msgstr "Rhybydd: Newidodd dynodiad y gwesteiwr!"
-
-#: tdeio_sftp.cpp:725 tdeio_sftp.cpp:726
-msgid "Authentication failed."
-msgstr "Methodd dilysiant."
-
-#: tdeio_sftp.cpp:740 tdeio_sftp.cpp:755
-msgid "Connection failed."
-msgstr "Methodd y cysylltiad."
-
-#: tdeio_sftp.cpp:741 ksshprocess.cpp:810 ksshprocess.cpp:957
-msgid "Connection closed by remote host."
-msgstr "Ceuwyd y cysylltiad gan y gwesteiwr pell."
-
-#: tdeio_sftp.cpp:756
-#, c-format
-msgid "Unexpected SFTP error: %1"
-msgstr "Gwall SFTP annisgwyl: %1"
-
-#: tdeio_sftp.cpp:800
-#, c-format
-msgid "SFTP version %1"
-msgstr "SFTP fersiwn %1"
-
-#: tdeio_sftp.cpp:806
-msgid "Protocol error."
-msgstr "Gwall protocol."
-
-#: tdeio_sftp.cpp:812
-#, c-format
-msgid "Successfully connected to %1"
-msgstr "Cysylltwyd â %1 yn llwyddiannus"
-
-#: tdeio_sftp.cpp:1047
-msgid "An internal error occurred. Please try again."
-msgstr ""
-
-#: tdeio_sftp.cpp:1068
-msgid ""
-"Unknown error was encountered while copying the file to '%1'. Please try again."
-msgstr ""
-
-#: tdeio_sftp.cpp:1318
-msgid "The remote host does not support renaming files."
-msgstr "Nid yw'r gwesteiwr pell yn cynnal ail-enwi ffeiliau."
-
-#: tdeio_sftp.cpp:1367
-msgid "The remote host does not support creating symbolic links."
-msgstr "Nid yw'r gwesteiwr pell yn cynnal creu cysylltau symbolaidd."
-
-#: tdeio_sftp.cpp:1492
-msgid "Connection closed"
-msgstr "Ceuwyd y cysylltiad"
-
-#: tdeio_sftp.cpp:1494
-msgid "Could not read SFTP packet"
-msgstr "Methwyd darllen y pecyn SFTP"
-
-#: tdeio_sftp.cpp:1611
-msgid "SFTP command failed for an unknown reason."
-msgstr "Methodd y gorchymyn SFTP am reswm anhysbys."
-
-#: tdeio_sftp.cpp:1615
-msgid "The SFTP server received a bad message."
-msgstr "Derbynnodd y gweinydd SFTP neges wael."
-
-#: tdeio_sftp.cpp:1619
-msgid "You attempted an operation unsupported by the SFTP server."
-msgstr "Fe geisioch weithred nas cynhelir gan y gweinydd SFTP."
-
-#: tdeio_sftp.cpp:1623
-#, c-format
-msgid "Error code: %1"
-msgstr "Cod gwall: %1"
-
 #: ksshprocess.cpp:408
 msgid "Cannot specify a subsystem and command at the same time."
 msgstr "Nid oes modd penodi is-gysawd a gorchymun ar yr un pryd."
 
-#: ksshprocess.cpp:743
+#: ksshprocess.cpp:753
 msgid "No options provided for ssh execution."
 msgstr "Ni ddarparwyd ddewisiadau ar gyfer gweithredu ssh."
 
-#: ksshprocess.cpp:751
+#: ksshprocess.cpp:761
 msgid "Failed to execute ssh process."
 msgstr "Methwyd gweithredu'r broses ssh."
 
-#: ksshprocess.cpp:776 ksshprocess.cpp:805 ksshprocess.cpp:924
-#: ksshprocess.cpp:996
+#: ksshprocess.cpp:786 ksshprocess.cpp:815 ksshprocess.cpp:934
+#: ksshprocess.cpp:1006
 msgid "Error encountered while talking to ssh."
 msgstr "Daethpwyd ar draws gwall tra'n siarad â ssh."
 
-#: ksshprocess.cpp:856
+#: ksshprocess.cpp:820 ksshprocess.cpp:967 tdeio_sftp.cpp:737
+msgid "Connection closed by remote host."
+msgstr "Ceuwyd y cysylltiad gan y gwesteiwr pell."
+
+#: ksshprocess.cpp:866
 msgid "Please supply a password."
 msgstr "Rhowch gyfrinair os gwelwch yn dda."
 
-#: ksshprocess.cpp:895
+#: ksshprocess.cpp:905
 msgid "Please supply the passphrase for your SSH private key."
 msgstr "Rhowch y cyfrinosodiad ar gyfer eich allwedd breifat SSH."
 
-#: ksshprocess.cpp:909
+#: ksshprocess.cpp:919
 msgid "Authentication to %1 failed"
 msgstr "Methodd dilysiant i %1"
 
-#: ksshprocess.cpp:932
+#: ksshprocess.cpp:942
 msgid ""
 "The identity of the remote host '%1' could not be verified because the host's "
 "key is not in the \"known hosts\" file."
@@ -175,7 +56,7 @@ msgstr ""
 "Nid oedd modd gwirio dynodiad y gwesteiwr pell '%1' gan na fo allwedd y "
 "gwesteiwr yn y ffeil \"gwesteiwyr hysbys\"."
 
-#: ksshprocess.cpp:938
+#: ksshprocess.cpp:948
 msgid ""
 " Manually, add the host's key to the \"known hosts\" file or contact your "
 "administrator."
@@ -183,12 +64,12 @@ msgstr ""
 " Ychwanegwch allwedd y gwesteiwr â llaw i'r ffeil \"gwesteiwyr hysbys\" neu "
 "gysylltwch â'ch rheolwr."
 
-#: ksshprocess.cpp:944
+#: ksshprocess.cpp:954
 msgid " Manually, add the host's key to %1 or contact your administrator."
 msgstr ""
 " Ychwanegwch allwedd y gwesteiwr â llaw i %1 neu gysylltwch â'ch rheolwr."
 
-#: ksshprocess.cpp:976
+#: ksshprocess.cpp:986
 msgid ""
 "The identity of the remote host '%1' could not be verified. The host's key "
 "fingerprint is:\n"
@@ -205,7 +86,7 @@ msgstr ""
 "\n"
 "A hoffech dderbyn allwedd y gwesteiwr a chysylltu beth bynnag? "
 
-#: ksshprocess.cpp:1004
+#: ksshprocess.cpp:1014
 msgid ""
 "WARNING: The identity of the remote host '%1' has changed!\n"
 "\n"
@@ -223,7 +104,7 @@ msgstr ""
 "%2\n"
 "Ychwanegwch yr allwedd gwesteiwr cywir i \"%3\" i gael gwared o'r neges hon."
 
-#: ksshprocess.cpp:1039
+#: ksshprocess.cpp:1049
 msgid ""
 "WARNING: The identity of the remote host '%1' has changed!\n"
 "\n"
@@ -244,10 +125,130 @@ msgstr ""
 "\n"
 "A hoffech dderbyn allwedd y gwesteiwr a chysylltu beth bynnag? "
 
-#: ksshprocess.cpp:1063
+#: ksshprocess.cpp:1073
 msgid "Host key was rejected."
 msgstr "Gwrthodwyd allwedd y gwesteiwr."
 
+#: tdeio_sftp.cpp:427
+msgid "An internal error occurred. Please retry the request again."
+msgstr ""
+
+#: tdeio_sftp.cpp:506
+msgid "Opening SFTP connection to host <b>%1:%2</b>"
+msgstr "Yn agor cysylltiad SFTP i'r gwesteiwr <b>%1:%2</b>"
+
+#: tdeio_sftp.cpp:510
+msgid "No hostname specified"
+msgstr "Nid yw enw'r gwesteiwr wedi'i benodi"
+
+#: tdeio_sftp.cpp:522
+msgid "SFTP Login"
+msgstr "Mewngofnod SFTP"
+
+#: tdeio_sftp.cpp:524
+msgid "site:"
+msgstr "safle:"
+
+#: tdeio_sftp.cpp:625
+#, fuzzy
+msgid "Please enter your username and key passphrase."
+msgstr ""
+"Rhowch eich enw defnyddiwr a'ch cyfrinosodiad allweddol os gwelwch yn dda."
+
+#: tdeio_sftp.cpp:627
+#, fuzzy
+msgid "Please enter your username and password."
+msgstr "Rhowch eich enw defnyddiwr a'ch cyfrinair os gwelwch yn dda."
+
+#: tdeio_sftp.cpp:635
+#, fuzzy
+msgid "Incorrect username or password"
+msgstr "Enw defnyddiwr neu gyfrinair anghywir"
+
+#: tdeio_sftp.cpp:640
+#, fuzzy
+msgid "Please enter a username and password"
+msgstr "Rhowch enw defnyddiwr a chyfrinair"
+
+#: tdeio_sftp.cpp:699
+#, fuzzy
+msgid "Warning: Cannot verify host's identity."
+msgstr "Rhybydd: Methu gwirio dynodiad y gwesteiwr!"
+
+#: tdeio_sftp.cpp:710
+#, fuzzy
+msgid "Warning: Host's identity changed."
+msgstr "Rhybydd: Newidodd dynodiad y gwesteiwr!"
+
+#: tdeio_sftp.cpp:721 tdeio_sftp.cpp:722
+msgid "Authentication failed."
+msgstr "Methodd dilysiant."
+
+#: tdeio_sftp.cpp:736 tdeio_sftp.cpp:751
+msgid "Connection failed."
+msgstr "Methodd y cysylltiad."
+
+#: tdeio_sftp.cpp:752
+#, c-format
+msgid "Unexpected SFTP error: %1"
+msgstr "Gwall SFTP annisgwyl: %1"
+
+#: tdeio_sftp.cpp:796
+#, c-format
+msgid "SFTP version %1"
+msgstr "SFTP fersiwn %1"
+
+#: tdeio_sftp.cpp:802
+msgid "Protocol error."
+msgstr "Gwall protocol."
+
+#: tdeio_sftp.cpp:808
+#, c-format
+msgid "Successfully connected to %1"
+msgstr "Cysylltwyd â %1 yn llwyddiannus"
+
+#: tdeio_sftp.cpp:1043
+msgid "An internal error occurred. Please try again."
+msgstr ""
+
+#: tdeio_sftp.cpp:1064
+msgid ""
+"Unknown error was encountered while copying the file to '%1'. Please try again."
+msgstr ""
+
+#: tdeio_sftp.cpp:1314
+msgid "The remote host does not support renaming files."
+msgstr "Nid yw'r gwesteiwr pell yn cynnal ail-enwi ffeiliau."
+
+#: tdeio_sftp.cpp:1363
+msgid "The remote host does not support creating symbolic links."
+msgstr "Nid yw'r gwesteiwr pell yn cynnal creu cysylltau symbolaidd."
+
+#: tdeio_sftp.cpp:1488
+msgid "Connection closed"
+msgstr "Ceuwyd y cysylltiad"
+
+#: tdeio_sftp.cpp:1490
+msgid "Could not read SFTP packet"
+msgstr "Methwyd darllen y pecyn SFTP"
+
+#: tdeio_sftp.cpp:1607
+msgid "SFTP command failed for an unknown reason."
+msgstr "Methodd y gorchymyn SFTP am reswm anhysbys."
+
+#: tdeio_sftp.cpp:1611
+msgid "The SFTP server received a bad message."
+msgstr "Derbynnodd y gweinydd SFTP neges wael."
+
+#: tdeio_sftp.cpp:1615
+msgid "You attempted an operation unsupported by the SFTP server."
+msgstr "Fe geisioch weithred nas cynhelir gan y gweinydd SFTP."
+
+#: tdeio_sftp.cpp:1619
+#, c-format
+msgid "Error code: %1"
+msgstr "Cod gwall: %1"
+
 #~ msgid "Could not allocate memory for SFTP packet."
 #~ msgstr "Methwyd dyrannu cof ar gyfer y pecyn SFTP."
 
diff --git a/tde-i18n-cy/messages/tdebase/tdeio_smb.po b/tde-i18n-cy/messages/tdebase/tdeio_smb.po
index 857e035cd92..5647ce52e8d 100644
--- a/tde-i18n-cy/messages/tdebase/tdeio_smb.po
+++ b/tde-i18n-cy/messages/tdebase/tdeio_smb.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_smb\n"
-"POT-Creation-Date: 2005-11-08 02:45+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-12-27 15:02+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -33,16 +34,16 @@ msgstr ""
 "Gweinydd = %1\n"
 "Rhaniad = %2"
 
-#: tdeio_smb_auth.cpp:175
+#: tdeio_smb_auth.cpp:176
 msgid "libsmbclient failed to initialize"
 msgstr "methodd libsmbclient ymgychwyn"
 
-#: tdeio_smb_auth.cpp:181
+#: tdeio_smb_auth.cpp:182
 #, fuzzy
 msgid "libsmbclient failed to create context"
 msgstr "methodd libsmbclient ymgychwyn"
 
-#: tdeio_smb_auth.cpp:191
+#: tdeio_smb_auth.cpp:192
 #, fuzzy
 msgid "libsmbclient failed to initialize context"
 msgstr "methodd libsmbclient ymgychwyn"
diff --git a/tde-i18n-cy/messages/tdebase/tdeio_smtp.po b/tde-i18n-cy/messages/tdebase/tdeio_smtp.po
index 26ec2789a6a..10abbfb67de 100644
--- a/tde-i18n-cy/messages/tdebase/tdeio_smtp.po
+++ b/tde-i18n-cy/messages/tdebase/tdeio_smtp.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_smtp\n"
-"POT-Creation-Date: 2007-07-17 01:45+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-07-22 15:21+0100\n"
 "Last-Translator: KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -40,9 +41,10 @@ msgstr ""
 "heb gêl-ysgrifaeth."
 
 #: command.cc:186
+#, fuzzy
 msgid ""
 "Your SMTP server claims to support TLS, but negotiation was unsuccessful.\n"
-"You can disable TLS in TDE using the crypto settings module."
+"You can disable TLS in KDE using the crypto settings module."
 msgstr ""
 "Honna'ch gweinydd SMTP ei fod yn cynnal TLS, ond bu trafodaeth yn "
 "aflwyddiannus.\n"
diff --git a/tde-i18n-cy/messages/tdebase/tdeio_system.po b/tde-i18n-cy/messages/tdebase/tdeio_system.po
index e4e7b0844bb..e42c53a13b1 100644
--- a/tde-i18n-cy/messages/tdebase/tdeio_system.po
+++ b/tde-i18n-cy/messages/tdebase/tdeio_system.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: all2.po\n"
-"POT-Creation-Date: 2006-04-28 03:54+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdebase/tdeio_tar.po b/tde-i18n-cy/messages/tdebase/tdeio_tar.po
index 7fb0f7e6c88..dc7e9165d98 100644
--- a/tde-i18n-cy/messages/tdebase/tdeio_tar.po
+++ b/tde-i18n-cy/messages/tdebase/tdeio_tar.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2007-09-22 01:12+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdebase/tdeio_thumbnail.po b/tde-i18n-cy/messages/tdebase/tdeio_thumbnail.po
index f195a8ce145..58301e49e2b 100644
--- a/tde-i18n-cy/messages/tdebase/tdeio_thumbnail.po
+++ b/tde-i18n-cy/messages/tdebase/tdeio_thumbnail.po
@@ -1,49 +1,50 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2005-06-03 01:23+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: thumbnail.cpp:174
+#: thumbnail.cpp:175
 msgid "No MIME Type specified."
 msgstr ""
 
-#: thumbnail.cpp:184
+#: thumbnail.cpp:185
 msgid "No or invalid size specified."
 msgstr ""
 
-#: thumbnail.cpp:265
+#: thumbnail.cpp:266
 msgid "No plugin specified."
 msgstr ""
 
-#: thumbnail.cpp:283
+#: thumbnail.cpp:284
 #, c-format
 msgid "Cannot load ThumbCreator %1"
 msgstr ""
 
-#: thumbnail.cpp:291
+#: thumbnail.cpp:292
 #, c-format
 msgid "Cannot create thumbnail for %1"
 msgstr ""
 
-#: thumbnail.cpp:358
+#: thumbnail.cpp:359
 msgid "Failed to create a thumbnail."
 msgstr ""
 
-#: thumbnail.cpp:373
+#: thumbnail.cpp:374
 msgid "Could not write image."
 msgstr ""
 
-#: thumbnail.cpp:398
+#: thumbnail.cpp:399
 #, c-format
 msgid "Failed to attach to shared memory segment %1"
 msgstr ""
 
-#: thumbnail.cpp:403
+#: thumbnail.cpp:404
 msgid "Image is too big for the shared memory segment"
 msgstr ""
diff --git a/tde-i18n-cy/messages/tdebase/tdeio_trash.po b/tde-i18n-cy/messages/tdebase/tdeio_trash.po
index ac234ead4e4..35a5fe6d802 100644
--- a/tde-i18n-cy/messages/tdebase/tdeio_trash.po
+++ b/tde-i18n-cy/messages/tdebase/tdeio_trash.po
@@ -1,37 +1,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdebase/tdeio_trash.po\n"
-"POT-Creation-Date: 2006-11-07 02:35+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ktrash.cpp:30
-msgid "Empty the contents of the trash"
-msgstr ""
-
-#: ktrash.cpp:32
-msgid "Restore a trashed file to its original location"
-msgstr ""
-
-#: ktrash.cpp:34
-msgid "Ignored"
-msgstr "Anwybyddwyd"
-
-#: ktrash.cpp:42
-msgid "ktrash"
-msgstr ""
-
-#: ktrash.cpp:43
-msgid ""
-"Helper program to handle the TDE trash can\n"
-"Note: to move files to the trash, do not use ktrash, but \"kfmclient move 'url' "
-"trash:/\""
-msgstr ""
-
 #: tdeio_trash.cpp:46
 msgid "Protocol name"
 msgstr "Enw protocol"
@@ -40,20 +18,20 @@ msgstr "Enw protocol"
 msgid "Socket name"
 msgstr "Enw soced"
 
-#: tdeio_trash.cpp:97 tdeio_trash.cpp:160 tdeio_trash.cpp:317 tdeio_trash.cpp:349
-#: tdeio_trash.cpp:511 tdeio_trash.cpp:523
+#: tdeio_trash.cpp:96 tdeio_trash.cpp:159 tdeio_trash.cpp:316
+#: tdeio_trash.cpp:348 tdeio_trash.cpp:510 tdeio_trash.cpp:522
 #, c-format
 msgid "Malformed URL %1"
 msgstr "URL annilys %1"
 
-#: tdeio_trash.cpp:116
+#: tdeio_trash.cpp:115
 msgid ""
 "The directory %1 does not exist anymore, so it is not possible to restore this "
 "item to its original location. You can either recreate that directory and use "
 "the restore operation again, or drag the item anywhere else to restore it."
 msgstr ""
 
-#: tdeio_trash.cpp:145
+#: tdeio_trash.cpp:144
 msgid "This file is already in the trash bin."
 msgstr ""
 
@@ -68,3 +46,26 @@ msgstr ""
 #: tdefile-plugin/tdefile_trash.cpp:56
 msgid "Date of Deletion"
 msgstr ""
+
+#: ktrash.cpp:30
+msgid "Empty the contents of the trash"
+msgstr ""
+
+#: ktrash.cpp:32
+msgid "Restore a trashed file to its original location"
+msgstr ""
+
+#: ktrash.cpp:34
+msgid "Ignored"
+msgstr "Anwybyddwyd"
+
+#: ktrash.cpp:42
+msgid "ktrash"
+msgstr ""
+
+#: ktrash.cpp:43
+msgid ""
+"Helper program to handle the TDE trash can\n"
+"Note: to move files to the trash, do not use ktrash, but \"kfmclient move 'url' "
+"trash:/\""
+msgstr ""
diff --git a/tde-i18n-cy/messages/tdebase/tdepasswd.po b/tde-i18n-cy/messages/tdebase/tdepasswd.po
index 4e6a5af9212..045b1c60eff 100644
--- a/tde-i18n-cy/messages/tdebase/tdepasswd.po
+++ b/tde-i18n-cy/messages/tdebase/tdepasswd.po
@@ -3,10 +3,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdepasswd\n"
-"POT-Creation-Date: 2005-07-09 01:31+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-07-03 22:45+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdebase/tdeprint_part.po b/tde-i18n-cy/messages/tdebase/tdeprint_part.po
index 0b8d0c795c8..fcf18e986c8 100644
--- a/tde-i18n-cy/messages/tdebase/tdeprint_part.po
+++ b/tde-i18n-cy/messages/tdebase/tdeprint_part.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeprint_part\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-07-17 10:25+0100\n"
 "Last-Translator: KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdebase/tdeprintfax.po b/tde-i18n-cy/messages/tdebase/tdeprintfax.po
index 24d67c619e3..8734fd89f86 100644
--- a/tde-i18n-cy/messages/tdebase/tdeprintfax.po
+++ b/tde-i18n-cy/messages/tdebase/tdeprintfax.po
@@ -8,113 +8,28 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeprintfax\n"
-"POT-Creation-Date: 2006-04-28 03:54+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-07-05 20:14+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "www.gyfieithu.co.uk<kyfieithu@dotmon.com>\n"
 "X-Generator: KBabel 1.2\n"
 
-#: confsystem.cpp:50
-msgid "F&ax system:"
-msgstr "Cysawd Ff&acs:"
-
-#: confsystem.cpp:51
-msgid "Co&mmand:"
-msgstr "Gorchy&myn:"
-
-#: confsystem.cpp:61
-msgid "Fax &server (if any):"
-msgstr "&Gweinydd ffacs (os oes un):"
-
-#: confsystem.cpp:62
-msgid "&Fax/Modem device:"
-msgstr "Dyfais &Ffacs/Modem:"
-
-#: confsystem.cpp:65
-msgid "Standard Modem Port"
-msgstr "Porth Modem Safonol"
-
-#: confsystem.cpp:67
-#, c-format
-msgid "Serial Port #%1"
-msgstr "Porth Gyfresol #%1"
-
-#: confsystem.cpp:68
-msgid "Other"
-msgstr "Arall"
-
-#: faxctrl.cpp:387
-msgid "Converting input files to PostScript"
-msgstr "Trosi ffeiliau mewnbwn i ffurf PostScript"
-
-#: faxctrl.cpp:462
-msgid "Sending fax to %1 (%2)"
-msgstr "Yn anfon ffacs i %1 (%2)"
-
-#: faxctrl.cpp:467
-#, c-format
-msgid "Sending to fax using: %1"
-msgstr "Yn anfon ffacs i'r derbynnydd drwy: %1"
-
-#: faxctrl.cpp:471
-msgid "Sending fax to %1..."
-msgstr "Yn anfon ffacs i %1..."
-
-#: faxctrl.cpp:482
-msgid "Skipping %1..."
-msgstr "Yn hepgor %1..."
-
-#: faxctrl.cpp:500
-msgid "Filtering %1..."
-msgstr "Yn hidlo %1..."
-
-#: faxctrl.cpp:618
-msgid "Fax log"
-msgstr "Cofnodion ffacs"
-
-#: faxctrl.cpp:620
-msgid "Fax Log"
-msgstr "Cofnodion Ffacs"
-
-#: faxctrl.cpp:629 faxctrl.cpp:659
-msgid "TDEPrint Fax Tool Log"
-msgstr "Confnodion Erfyn Argraffu Ffacs TDE"
-
-#: faxctrl.cpp:664
-msgid "Cannot open file for writing."
-msgstr "Methu agor ffeil ar gyfer ysgrifennu."
-
-#: conffax.cpp:43
-msgid "High (204x196 dpi)"
-msgstr "Uchel (204x196 dyf)"
-
-#: conffax.cpp:44
-msgid "Low (204x98 dpi)"
-msgstr "Isel (204x98 dyf)"
-
-#: conffax.cpp:45
-msgid "A4"
-msgstr "A4"
-
-#: conffax.cpp:46
-msgid "Letter"
-msgstr "Llythyr"
-
-#: conffax.cpp:47
-msgid "Legal"
-msgstr "Cyfreithiol"
-
-#: conffax.cpp:48
-msgid "&Resolution:"
-msgstr "&Cydraniad:"
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Owain Green drwy KGyfieithu"
 
-#: conffax.cpp:50
-msgid "&Paper size:"
-msgstr "Maint &papur:"
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "kyfieithu@dotmon.com"
 
 #: confgeneral.cpp:41
 msgid "&Name:"
@@ -132,60 +47,6 @@ msgstr "Rh&if:"
 msgid "Replace international prefix '+' with:"
 msgstr "Disodli'r rhagddodiad rhyngwladol '+' efo:"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Owain Green drwy KGyfieithu"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "kyfieithu@dotmon.com"
-
-#: main.cpp:33
-msgid "A small fax utility to be used with tdeprint."
-msgstr "Cyfleuster ffacs bach i'w ddefnyddio â tdeprint."
-
-#: main.cpp:39
-msgid "Phone number to fax to"
-msgstr "Rhif ffôn i anfon ffacs iddo"
-
-#: main.cpp:40
-msgid "Send fax immediately"
-msgstr "Anfon ffacs ar unwaith"
-
-#: main.cpp:41
-msgid "Exit after sending"
-msgstr "Terfynnu ar ôl ei anfon"
-
-#: main.cpp:42
-msgid "File to fax (added to the file list)"
-msgstr "Ffeil i'w hanfon fel ffacs (wedi'i hychwanegu i'r restr ffeiliau)"
-
-#: main.cpp:50
-msgid "KdeprintFax"
-msgstr "KdeprintFax"
-
-#: filterdlg.cpp:31
-msgid "Filter Parameters"
-msgstr "Paramedrau Hidlo"
-
-#: filterdlg.cpp:37
-msgid "MIME type:"
-msgstr "Math MIME:"
-
-#: filterdlg.cpp:38
-msgid "Command:"
-msgstr "Gorchymyn:"
-
-#. i18n: file tdeprintfaxui.rc line 10
-#: rc.cpp:6
-#, no-c-format
-msgid "Fa&x"
-msgstr "Ffa&cs"
-
 #: conffilters.cpp:42
 msgid "Mime Type"
 msgstr "Math Mime"
@@ -250,25 +111,33 @@ msgstr "Hidlenni"
 msgid "Filters Configuration"
 msgstr "Ffurfwedd Hidlenni"
 
-#: faxab.cpp:41 tdeprintfax.cpp:88
-msgid "Name"
-msgstr "Enw"
+#: conffax.cpp:43
+msgid "High (204x196 dpi)"
+msgstr "Uchel (204x196 dyf)"
 
-#: faxab.cpp:42 tdeprintfax.cpp:87 tdeprintfax.cpp:562
-msgid "Fax Number"
-msgstr "Rhif Ffacs"
+#: conffax.cpp:44
+msgid "Low (204x98 dpi)"
+msgstr "Isel (204x98 dyf)"
 
-#: faxab.cpp:44
-msgid "Entries:"
-msgstr "Cofnodion:"
+#: conffax.cpp:45
+msgid "A4"
+msgstr "A4"
 
-#: faxab.cpp:47
-msgid "&Edit Addressbook"
-msgstr "&Golygu Llyfr Cyfeiriadau"
+#: conffax.cpp:46
+msgid "Letter"
+msgstr "Llythyr"
 
-#: faxab.cpp:150
-msgid "No fax number found in your address book."
-msgstr "Ni ganfuwyd rhif ffacs yn eich llyfr cyfeiriadau."
+#: conffax.cpp:47
+msgid "Legal"
+msgstr "Cyfreithiol"
+
+#: conffax.cpp:48
+msgid "&Resolution:"
+msgstr "&Cydraniad:"
+
+#: conffax.cpp:50
+msgid "&Paper size:"
+msgstr "Maint &papur:"
 
 #: tdeprintfax.cpp:74
 msgid "Move up"
@@ -282,6 +151,14 @@ msgstr "Symud i lawr"
 msgid "F&iles:"
 msgstr "Ffe&iliau:"
 
+#: faxab.cpp:42 tdeprintfax.cpp:87 tdeprintfax.cpp:562
+msgid "Fax Number"
+msgstr "Rhif Ffacs"
+
+#: faxab.cpp:41 tdeprintfax.cpp:88
+msgid "Name"
+msgstr "Enw"
+
 #: tdeprintfax.cpp:89
 msgid "Enterprise"
 msgstr "Menter"
@@ -411,5 +288,133 @@ msgstr "&Menter:"
 msgid "Invalid fax number."
 msgstr "Rhif ffacs annilys."
 
+#: faxctrl.cpp:387
+msgid "Converting input files to PostScript"
+msgstr "Trosi ffeiliau mewnbwn i ffurf PostScript"
+
+#: faxctrl.cpp:462
+msgid "Sending fax to %1 (%2)"
+msgstr "Yn anfon ffacs i %1 (%2)"
+
+#: faxctrl.cpp:467
+#, c-format
+msgid "Sending to fax using: %1"
+msgstr "Yn anfon ffacs i'r derbynnydd drwy: %1"
+
+#: faxctrl.cpp:471
+msgid "Sending fax to %1..."
+msgstr "Yn anfon ffacs i %1..."
+
+#: faxctrl.cpp:482
+msgid "Skipping %1..."
+msgstr "Yn hepgor %1..."
+
+#: faxctrl.cpp:500
+msgid "Filtering %1..."
+msgstr "Yn hidlo %1..."
+
+#: faxctrl.cpp:618
+msgid "Fax log"
+msgstr "Cofnodion ffacs"
+
+#: faxctrl.cpp:620
+msgid "Fax Log"
+msgstr "Cofnodion Ffacs"
+
+#: faxctrl.cpp:629 faxctrl.cpp:659
+msgid "TDEPrint Fax Tool Log"
+msgstr "Confnodion Erfyn Argraffu Ffacs TDE"
+
+#: faxctrl.cpp:664
+msgid "Cannot open file for writing."
+msgstr "Methu agor ffeil ar gyfer ysgrifennu."
+
+#: faxab.cpp:44
+msgid "Entries:"
+msgstr "Cofnodion:"
+
+#: faxab.cpp:47
+msgid "&Edit Addressbook"
+msgstr "&Golygu Llyfr Cyfeiriadau"
+
+#: faxab.cpp:150
+msgid "No fax number found in your address book."
+msgstr "Ni ganfuwyd rhif ffacs yn eich llyfr cyfeiriadau."
+
+#: filterdlg.cpp:31
+msgid "Filter Parameters"
+msgstr "Paramedrau Hidlo"
+
+#: filterdlg.cpp:37
+msgid "MIME type:"
+msgstr "Math MIME:"
+
+#: filterdlg.cpp:38
+msgid "Command:"
+msgstr "Gorchymyn:"
+
+#. i18n: file tdeprintfaxui.rc line 10
+#: rc.cpp:6
+#, no-c-format
+msgid "Fa&x"
+msgstr "Ffa&cs"
+
+#: confsystem.cpp:50
+msgid "F&ax system:"
+msgstr "Cysawd Ff&acs:"
+
+#: confsystem.cpp:51
+msgid "Co&mmand:"
+msgstr "Gorchy&myn:"
+
+#: confsystem.cpp:61
+msgid "Fax &server (if any):"
+msgstr "&Gweinydd ffacs (os oes un):"
+
+#: confsystem.cpp:62
+msgid "&Fax/Modem device:"
+msgstr "Dyfais &Ffacs/Modem:"
+
+#: confsystem.cpp:65
+msgid "Standard Modem Port"
+msgstr "Porth Modem Safonol"
+
+#: confsystem.cpp:67
+#, c-format
+msgid "Serial Port #%1"
+msgstr "Porth Gyfresol #%1"
+
+#: confsystem.cpp:68
+msgid "Other"
+msgstr "Arall"
+
+#: main.cpp:33
+msgid "A small fax utility to be used with tdeprint."
+msgstr "Cyfleuster ffacs bach i'w ddefnyddio â tdeprint."
+
+#: main.cpp:39
+msgid "Phone number to fax to"
+msgstr "Rhif ffôn i anfon ffacs iddo"
+
+#: main.cpp:40
+msgid "Send fax immediately"
+msgstr "Anfon ffacs ar unwaith"
+
+#: main.cpp:41
+msgid "Exit after sending"
+msgstr "Terfynnu ar ôl ei anfon"
+
+#: main.cpp:42
+msgid "File to fax (added to the file list)"
+msgstr "Ffeil i'w hanfon fel ffacs (wedi'i hychwanegu i'r restr ffeiliau)"
+
+#: main.cpp:50
+#, fuzzy
+msgid "TDEPrintFax"
+msgstr "Confnodion Erfyn Argraffu Ffacs TDE"
+
+#~ msgid "KdeprintFax"
+#~ msgstr "KdeprintFax"
+
 #~ msgid "Fax &number:"
 #~ msgstr "&Rhif ffacs:"
diff --git a/tde-i18n-cy/messages/tdebase/tderandr.po b/tde-i18n-cy/messages/tdebase/tderandr.po
index 822837e3dd5..35a859a2a9e 100644
--- a/tde-i18n-cy/messages/tdebase/tderandr.po
+++ b/tde-i18n-cy/messages/tdebase/tderandr.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tderandr\n"
-"POT-Creation-Date: 2006-11-08 02:34+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-01-05 14:58+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,7 +27,52 @@ msgid ""
 "Your emails"
 msgstr "kyfieithu@dotmon.com"
 
-#: tderandrmodule.cpp:82
+#: configdialog.cpp:49
+msgid "Global &Shortcuts"
+msgstr ""
+
+#: ktimerdialog.cpp:154
+#, c-format
+msgid ""
+"_n: 1 second remaining:\n"
+"%n seconds remaining:"
+msgstr ""
+"1 eiliad ar ôl:\n"
+"%n eiliad ar ôl:"
+
+#: main.cpp:32
+msgid "Application is being auto-started at TDE session start"
+msgstr "Hunan-gyhwynnir y cymhwysiad wrth gychwyn y sesiwn TDE"
+
+#: main.cpp:38
+msgid "Resize and Rotate"
+msgstr "Newid Maint a Cylchdroi"
+
+#: main.cpp:38
+msgid "Resize and Rotate System Tray App"
+msgstr "Cymhwysiad Cafn Cysawd Newid Maint a Cylchdroi"
+
+#: main.cpp:39
+msgid "Developer and maintainer"
+msgstr ""
+
+#: main.cpp:40
+msgid "Original developer and maintainer"
+msgstr ""
+
+#: main.cpp:41
+msgid "Many fixes"
+msgstr "Llawer o drwsiadau"
+
+#: tderandrbindings.cpp:29
+msgid "Display Control"
+msgstr ""
+
+#: tderandrbindings.cpp:31
+msgid "Switch Displays"
+msgstr ""
+
+#: tderandrmodule.cpp:83
 #, fuzzy
 msgid ""
 "<qt>Your X server does not support resizing and rotating the display. Please "
@@ -37,16 +83,16 @@ msgstr ""
 "Diweddarwch i fersiwn 4.3 neu uwch.  Mae angen yr estyniad X Resize And Rotate "
 "(RANDR) fersiwn 1.1 neu uwch i ddefnyddio'r nodwedd yma.  Côd gwall: %1</qt>"
 
-#: tderandrmodule.cpp:91
+#: tderandrmodule.cpp:92
 msgid "Settings for screen:"
 msgstr "Gosodiadau ar gyfer y sgrîn:"
 
-#: tderandrmodule.cpp:95 tderandrtray.cpp:83
+#: tderandrmodule.cpp:96 tderandrtray.cpp:267
 #, c-format
 msgid "Screen %1"
 msgstr "Sgrîn %1"
 
-#: tderandrmodule.cpp:100
+#: tderandrmodule.cpp:101
 msgid ""
 "The screen whose settings you would like to change can be selected using this "
 "drop-down list."
@@ -54,40 +100,40 @@ msgstr ""
 "Gellir ddewis y sgrîn y dymunwch newid y gosodiadau ohono gan ddefnyddio'r "
 "llam-restr."
 
-#: tderandrmodule.cpp:109
+#: tderandrmodule.cpp:110
 msgid "Screen size:"
 msgstr "Maint y sgrîn:"
 
-#: tderandrmodule.cpp:111
+#: tderandrmodule.cpp:112
 msgid ""
 "The size, otherwise known as the resolution, of your screen can be selected "
 "from this drop-down list."
 msgstr ""
 "Gellir dewis maint, neu fel arall cydraniad, eich sgrîn o'r llam-restr yma."
 
-#: tderandrmodule.cpp:117
+#: tderandrmodule.cpp:118
 msgid "Refresh rate:"
 msgstr "Graddfa adfywio:"
 
-#: tderandrmodule.cpp:119
+#: tderandrmodule.cpp:120
 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."
 
-#: tderandrmodule.cpp:123
+#: tderandrmodule.cpp:124
 msgid "Orientation (degrees counterclockwise)"
 msgstr "Cyfeiriadaeth (graddau wrthglocwedd)"
 
-#: tderandrmodule.cpp:126
+#: tderandrmodule.cpp:127
 msgid ""
 "The options in this section allow you to change the rotation of your screen."
 msgstr "Caniata'r dewisiadau yn yr adran yma i chi newid cylchdro eich sgrîn."
 
-#: tderandrmodule.cpp:128
+#: tderandrmodule.cpp:129
 msgid "Apply settings on TDE startup"
 msgstr "Gweithredu'r gosodiadau wrth ymgychwyn TDE"
 
-#: tderandrmodule.cpp:130
+#: tderandrmodule.cpp:131
 msgid ""
 "If this option is enabled the size and orientation settings will be used when "
 "TDE starts."
@@ -95,11 +141,11 @@ msgstr ""
 "Os alluogir y dewisiad yma, defnyddir y gosodiadau maint a chyfeiriadaeth wrth "
 "ymgychwyn TDE."
 
-#: tderandrmodule.cpp:135
+#: tderandrmodule.cpp:136
 msgid "Allow tray application to change startup settings"
 msgstr "Caniatáu i gymhwysiad cafn newid gosodiadau ymgychwyn"
 
-#: tderandrmodule.cpp:137
+#: tderandrmodule.cpp:138
 msgid ""
 "If this option is enabled, options set by the system tray applet will be saved "
 "and loaded when TDE starts instead of being temporary."
@@ -107,182 +153,212 @@ msgstr ""
 "Os alluogir y dewisiad yma, cedwir dewisiadau a osodir gan y cymhwysiad cafn "
 "cysawd a'u llwythir wrth ymgychwyn TDE yn lle bod yn dros-dro."
 
-#: tderandrmodule.cpp:174 tderandrtray.cpp:149
+#: tderandrmodule.cpp:175 tderandrtray.cpp:433
 msgid "%1 x %2"
 msgstr "%1 x %2"
 
-#: tderandrtray.cpp:45
+#: tderandrtray.cpp:62
 #, fuzzy
 msgid "Screen resize & rotate"
 msgstr "Newid Maint a Cylchdroi"
 
-#: tderandrtray.cpp:69
+#: tderandrtray.cpp:107
+msgid "Start KRandRTray automatically when you log in?"
+msgstr ""
+
+#: tderandrtray.cpp:108
+msgid "Question"
+msgstr ""
+
+#: tderandrtray.cpp:108
+msgid "Start Automatically"
+msgstr ""
+
+#: tderandrtray.cpp:108
+msgid "Do Not Start"
+msgstr ""
+
+#: tderandrtray.cpp:252
 msgid "Required X Extension Not Available"
 msgstr "Nid yw'r Estyniad X Gofynnol ar Gael"
 
-#: tderandrtray.cpp:94
-msgid "Configure Display..."
+#: tderandrtray.cpp:282
+msgid "Color Profile"
+msgstr ""
+
+#: tderandrtray.cpp:298
+msgid "Display Profiles"
+msgstr ""
+
+#: tderandrtray.cpp:308
+#, fuzzy
+msgid "Global Configuration"
+msgstr "&Derbyn Ffurfweddiad"
+
+#: tderandrtray.cpp:310
+#, fuzzy
+msgid "Configure Displays..."
+msgstr "Ffurfweddu Dangosydd..."
+
+#: tderandrtray.cpp:320
+#, fuzzy
+msgid "Configure Shortcut Keys..."
 msgstr "Ffurfweddu Dangosydd..."
 
-#: tderandrtray.cpp:117
+#: tderandrtray.cpp:355
 msgid "Screen configuration has changed"
 msgstr "Newidwyd ffurfweddiad y sgrîn"
 
-#: tderandrtray.cpp:128
+#: tderandrtray.cpp:412
 msgid "Screen Size"
 msgstr "Maint y Sgrîn"
 
-#: tderandrtray.cpp:181
+#: tderandrtray.cpp:465
 msgid "Refresh Rate"
 msgstr "Graddfa Ailfywio"
 
-#: tderandrtray.cpp:251
+#: tderandrtray.cpp:539
 msgid "Configure Display"
 msgstr "Ffurfweddu Dangosydd"
 
-#: ktimerdialog.cpp:154
-#, c-format
+#: tderandrtray.cpp:548
+#, fuzzy
+msgid "Configure Displays"
+msgstr "Ffurfweddu Dangosydd"
+
+#: tderandrtray.cpp:710 tderandrtray.cpp:863
 msgid ""
-"_n: 1 second remaining:\n"
-"%n seconds remaining:"
+"<b>Unable to activate output %1</b>"
+"<p>Either the output is not connected to a display,"
+"<br>or the display configuration is not detectable"
 msgstr ""
-"1 eiliad ar ôl:\n"
-"%n eiliad ar ôl:"
-
-#: main.cpp:32
-msgid "Application is being auto-started at TDE session start"
-msgstr "Hunan-gyhwynnir y cymhwysiad wrth gychwyn y sesiwn TDE"
-
-#: main.cpp:38
-msgid "Resize and Rotate"
-msgstr "Newid Maint a Cylchdroi"
 
-#: main.cpp:38
-msgid "Resize and Rotate System Tray App"
-msgstr "Cymhwysiad Cafn Cysawd Newid Maint a Cylchdroi"
+#: tderandrtray.cpp:710 tderandrtray.cpp:863
+msgid "Output Unavailable"
+msgstr ""
 
-#: main.cpp:39
-msgid "Maintainer"
-msgstr "Cynhaliwr"
+#: tderandrtray.cpp:744
+msgid "Output Port"
+msgstr ""
 
-#: main.cpp:40
-msgid "Many fixes"
-msgstr "Llawer o drwsiadau"
+#: tderandrtray.cpp:759
+msgid "%1 (Active)"
+msgstr ""
 
-#: randr.cpp:159
-msgid "Confirm Display Setting Change"
-msgstr "Cadarnhau Newid Gosodiadau'r Dangosydd"
+#: tderandrtray.cpp:781
+msgid "%1 (Connected, Inactive)"
+msgstr ""
 
-#: randr.cpp:163
-msgid "&Accept Configuration"
-msgstr "&Derbyn Ffurfweddiad"
+#: tderandrtray.cpp:803
+msgid "%1 (Disconnected, Inactive)"
+msgstr ""
 
-#: randr.cpp:164
-msgid "&Return to Previous Configuration"
-msgstr "D&cyhwelyd i'r Ffurfweddiad Cynt"
+#: tderandrtray.cpp:810
+msgid "Next available output"
+msgstr ""
 
-#: randr.cpp:166
+#: tderandrtray.cpp:883
 msgid ""
-"Your screen orientation, size and refresh rate have 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."
+"<b>You are attempting to deactivate the only active output</b>"
+"<p>You must keep at least one display output active at all times!"
 msgstr ""
-"Newidwyd cyfeiriadaeth eich sgrîn, ei faint, a'i raddfa adfywio i'r gosodiadau "
-"dymunol.  dywedwch os ydych eisiau cadw'r ffurfweddiad yma.  Mewn 15 eiliad "
-"bydd y dangosiad yn dychwelyd i'r gosodiadau cynt."
 
-#: randr.cpp:197
-msgid ""
-"New configuration:\n"
-"Resolution: %1 x %2\n"
-"Orientation: %3"
+#: tderandrtray.cpp:883
+msgid "Invalid Operation Requested"
 msgstr ""
-"Ffurfweddiad newydd:\n"
-"Cydraniad: %1 x %2\n"
-"Cylchdroi: %3"
 
-#: randr.cpp:202
-msgid ""
-"New configuration:\n"
-"Resolution: %1 x %2\n"
-"Orientation: %3\n"
-"Refresh rate: %4"
+#: tderandrtray.cpp:891
+msgid "New display output options are available!"
 msgstr ""
-"Ffurfweddiad newydd:\n"
-"Cydraniad: %1 x %2\n"
-"Cylchdroi: %3\n"
-"Graddfa adfywio: %4"
 
-#: randr.cpp:231 randr.cpp:248
-msgid "Normal"
-msgstr "Arferol"
+#: tderandrtray.cpp:892
+msgid "A screen has been added, removed, or changed"
+msgstr ""
 
-#: randr.cpp:233
-msgid "Left (90 degrees)"
-msgstr "I'r Chwith (90 gradd)"
+#~ msgid "Maintainer"
+#~ msgstr "Cynhaliwr"
 
-#: randr.cpp:235
-msgid "Upside-down (180 degrees)"
-msgstr "Pen i Lawr (180 gradd)"
+#~ msgid "Confirm Display Setting Change"
+#~ msgstr "Cadarnhau Newid Gosodiadau'r Dangosydd"
 
-#: randr.cpp:237
-msgid "Right (270 degrees)"
-msgstr "I'r Dde (270 gradd)"
+#~ msgid "&Return to Previous Configuration"
+#~ msgstr "D&cyhwelyd i'r Ffurfweddiad Cynt"
 
-#: randr.cpp:239
-msgid "Mirror horizontally"
-msgstr "Adlewyrchu yn llorweddol"
+#~ msgid "Your screen orientation, size and refresh rate have 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 "Newidwyd cyfeiriadaeth eich sgrîn, ei faint, a'i raddfa adfywio i'r gosodiadau dymunol.  dywedwch os ydych eisiau cadw'r ffurfweddiad yma.  Mewn 15 eiliad bydd y dangosiad yn dychwelyd i'r gosodiadau cynt."
 
-#: randr.cpp:241
-msgid "Mirror vertically"
-msgstr "Adlewyrchu yn fertigol"
+#~ msgid ""
+#~ "New configuration:\n"
+#~ "Resolution: %1 x %2\n"
+#~ "Orientation: %3"
+#~ msgstr ""
+#~ "Ffurfweddiad newydd:\n"
+#~ "Cydraniad: %1 x %2\n"
+#~ "Cylchdroi: %3"
 
-#: randr.cpp:243 randr.cpp:274
-msgid "Unknown orientation"
-msgstr "Cylchdroi anhysbys"
+#~ msgid ""
+#~ "New configuration:\n"
+#~ "Resolution: %1 x %2\n"
+#~ "Orientation: %3\n"
+#~ "Refresh rate: %4"
+#~ msgstr ""
+#~ "Ffurfweddiad newydd:\n"
+#~ "Cydraniad: %1 x %2\n"
+#~ "Cylchdroi: %3\n"
+#~ "Graddfa adfywio: %4"
 
-#: randr.cpp:250
-msgid "Rotated 90 degrees counterclockwise"
-msgstr "Wedi'i gylchdroi 90 gradd yn wrthglocwedd"
+#~ msgid "Normal"
+#~ msgstr "Arferol"
 
-#: randr.cpp:252
-msgid "Rotated 180 degrees counterclockwise"
-msgstr "Wedi'i gylchdroi 180 gradd yn wrthglocwedd"
+#~ msgid "Left (90 degrees)"
+#~ msgstr "I'r Chwith (90 gradd)"
 
-#: randr.cpp:254
-msgid "Rotated 270 degrees counterclockwise"
-msgstr "Wedi'i gylchdroi 270 gradd yn wrthglocwedd"
+#~ msgid "Upside-down (180 degrees)"
+#~ msgstr "Pen i Lawr (180 gradd)"
 
-#: randr.cpp:259
-msgid "Mirrored horizontally and vertically"
-msgstr "Wedi'i adlewyrchu yn llorweddol ac yn fertigol"
+#~ msgid "Right (270 degrees)"
+#~ msgstr "I'r Dde (270 gradd)"
 
-#: randr.cpp:261
-msgid "mirrored horizontally and vertically"
-msgstr "wedi'i adlewyrchu yn llorweddol ac yn fertigol"
+#~ msgid "Mirror horizontally"
+#~ msgstr "Adlewyrchu yn llorweddol"
 
-#: randr.cpp:264
-msgid "Mirrored horizontally"
-msgstr "Wedi'i adlewyrchu yn llorweddol"
+#~ msgid "Mirror vertically"
+#~ msgstr "Adlewyrchu yn fertigol"
 
-#: randr.cpp:266
-msgid "mirrored horizontally"
-msgstr "wedi'i adlewyrchu yn llorweddol"
+#~ msgid "Unknown orientation"
+#~ msgstr "Cylchdroi anhysbys"
 
-#: randr.cpp:269
-msgid "Mirrored vertically"
-msgstr "Wedi'i adlewyrchu yn fertigol"
+#~ msgid "Rotated 90 degrees counterclockwise"
+#~ msgstr "Wedi'i gylchdroi 90 gradd yn wrthglocwedd"
 
-#: randr.cpp:271
-msgid "mirrored vertically"
-msgstr "wedi'i adlewyrchu yn fertigol"
+#~ msgid "Rotated 180 degrees counterclockwise"
+#~ msgstr "Wedi'i gylchdroi 180 gradd yn wrthglocwedd"
 
-#: randr.cpp:276
-msgid "unknown orientation"
-msgstr "cylchdroi anhysbys"
+#~ msgid "Rotated 270 degrees counterclockwise"
+#~ msgstr "Wedi'i gylchdroi 270 gradd yn wrthglocwedd"
 
-#: randr.cpp:400 randr.cpp:405
-msgid ""
-"_: Refresh rate in Hertz (Hz)\n"
-"%1 Hz"
-msgstr "%1 Hz"
+#~ msgid "Mirrored horizontally and vertically"
+#~ msgstr "Wedi'i adlewyrchu yn llorweddol ac yn fertigol"
+
+#~ msgid "mirrored horizontally and vertically"
+#~ msgstr "wedi'i adlewyrchu yn llorweddol ac yn fertigol"
+
+#~ msgid "Mirrored horizontally"
+#~ msgstr "Wedi'i adlewyrchu yn llorweddol"
+
+#~ msgid "mirrored horizontally"
+#~ msgstr "wedi'i adlewyrchu yn llorweddol"
+
+#~ msgid "Mirrored vertically"
+#~ msgstr "Wedi'i adlewyrchu yn fertigol"
+
+#~ msgid "mirrored vertically"
+#~ msgstr "wedi'i adlewyrchu yn fertigol"
+
+#~ msgid "unknown orientation"
+#~ msgstr "cylchdroi anhysbys"
+
+#~ msgid ""
+#~ "_: Refresh rate in Hertz (Hz)\n"
+#~ "%1 Hz"
+#~ msgstr "%1 Hz"
diff --git a/tde-i18n-cy/messages/tdebase/tdescreensaver.po b/tde-i18n-cy/messages/tdebase/tdescreensaver.po
index 26f3c4bb7b4..1d463c9a309 100644
--- a/tde-i18n-cy/messages/tdebase/tdescreensaver.po
+++ b/tde-i18n-cy/messages/tdebase/tdescreensaver.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdescreensaver\n"
-"POT-Creation-Date: 2007-01-26 02:37+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-12-27 12:19+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,7 +28,7 @@ msgstr "Gosod Arbedwr Sgrîn Wag"
 msgid "Color:"
 msgstr "Lliw:"
 
-#: random.cpp:41
+#: random.cpp:42
 msgid ""
 "Usage: %1 [-setup] [args]\n"
 "Starts a random screen saver.\n"
@@ -37,38 +38,38 @@ msgstr ""
 "Dechreua arbedwr sgrîn ar hap.\n"
 "Fe basir unrhyw ymresymiadau (heblaw am -setup) ymlaen at yr arbedwr sgrîn."
 
-#: random.cpp:48
+#: random.cpp:49
 msgid "Start a random TDE screen saver"
 msgstr "Dechrau arbedwr sgrîn TDE hap"
 
-#: random.cpp:54
+#: random.cpp:55
 #, fuzzy
 msgid "Setup screen saver"
 msgstr "Gosod Arbedydd Sgrîn."
 
-#: random.cpp:55
+#: random.cpp:56
 #, fuzzy
 msgid "Run in the specified XWindow"
 msgstr "Rhedeg yn y FfenestrX a benodir"
 
-#: random.cpp:56
+#: random.cpp:57
 #, fuzzy
 msgid "Run in the root XWindow"
 msgstr "Rhedeg yn y FfenestrX wraidd."
 
-#: random.cpp:66
+#: random.cpp:104
 #, fuzzy
 msgid "Random screen saver"
 msgstr "Gosod Arbedydd Sgrîn Hap"
 
-#: random.cpp:215
+#: random.cpp:261
 msgid "Setup Random Screen Saver"
 msgstr "Gosod Arbedydd Sgrîn Hap"
 
-#: random.cpp:222
+#: random.cpp:268
 msgid "Use OpenGL screen savers"
 msgstr "Defnyddio arbedyddion sgrîn OpenGL"
 
-#: random.cpp:225
+#: random.cpp:271
 msgid "Use screen savers that manipulate the screen"
 msgstr "Defnyddio arbedyddion sgrîn sy'n trin y sgrîn"
diff --git a/tde-i18n-cy/messages/tdebase/tdestyle_keramik_config.po b/tde-i18n-cy/messages/tdebase/tdestyle_keramik_config.po
index d94483e8a46..e976928c35d 100644
--- a/tde-i18n-cy/messages/tdebase/tdestyle_keramik_config.po
+++ b/tde-i18n-cy/messages/tdebase/tdestyle_keramik_config.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdestyle_keramik_config\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-12-27 10:19+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdebase/tdesu.po b/tde-i18n-cy/messages/tdebase/tdesu.po
index f18180f92e8..e5abcf76c71 100644
--- a/tde-i18n-cy/messages/tdebase/tdesu.po
+++ b/tde-i18n-cy/messages/tdebase/tdesu.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdesu\n"
-"POT-Creation-Date: 2007-11-14 01:15+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-07-22 13:13+0100\n"
 "Last-Translator: KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -62,62 +63,67 @@ msgid "Let command use existing dcopserver"
 msgstr "Caniatáu i'r gorchymyn ddefnyddio dcopserver cyfredol."
 
 #: tdesu.cpp:66
-msgid "Do not display ignore button"
-msgstr ""
+#, fuzzy
+msgid "Ignored"
+msgstr "&Anwybyddu"
 
 #: tdesu.cpp:67
-msgid "Specify icon to use in the password dialog"
+msgid "Display the ignore button"
 msgstr ""
 
 #: tdesu.cpp:68
+msgid "Specify icon to use in the password dialog"
+msgstr ""
+
+#: tdesu.cpp:69
 msgid "Do not show the command to be run in the dialog"
 msgstr ""
 
-#: tdesu.cpp:99
+#: tdesu.cpp:100
 msgid "TDE su"
 msgstr "su TDE"
 
-#: tdesu.cpp:100
+#: tdesu.cpp:101
 msgid "Runs a program with elevated privileges."
 msgstr "Rheda raglen â breintiau dyrchafedig."
 
-#: tdesu.cpp:103
+#: tdesu.cpp:104
 msgid "Maintainer"
 msgstr "Cynhaliwr"
 
-#: tdesu.cpp:105
+#: tdesu.cpp:106
 msgid "Original author"
 msgstr "Awdur gwreiddiol"
 
-#: tdesu.cpp:131
+#: tdesu.cpp:132
 msgid "Command '%1' not found."
 msgstr "Gorchymyn '%1' heb ei ganfod."
 
-#: tdesu.cpp:207
+#: tdesu.cpp:208
 #, c-format
 msgid "Illegal priority: %1"
 msgstr "Blaenoriaeth anghyfreithlon: %1"
 
-#: tdesu.cpp:235
+#: tdesu.cpp:230
 msgid "No command specified."
 msgstr "Dim gorchymyn wedi'i benodi."
 
-#: tdesu.cpp:344
+#: tdesu.cpp:336
 #, fuzzy
 msgid ""
 "Su returned with an error.\n"
 msgstr ""
 "Dychwelodd su â gwall!\n"
 
-#: tdesu.cpp:365
+#: tdesu.cpp:357
 msgid "Command:"
 msgstr "Gorchymyn:"
 
-#: tdesu.cpp:370
+#: tdesu.cpp:362
 msgid "realtime: "
 msgstr "gwir-amser: "
 
-#: tdesu.cpp:373
+#: tdesu.cpp:365
 msgid "Priority:"
 msgstr "Blaenoriaeth:"
 
@@ -130,7 +136,7 @@ msgstr "Rhedeg fel %1"
 msgid "Please enter your password."
 msgstr ""
 
-#: sudlg.cpp:36
+#: sudlg.cpp:37
 msgid ""
 "The action you requested needs root privileges. Please enter root's password "
 "below or click Ignore to continue with your current privileges."
@@ -139,7 +145,7 @@ msgstr ""
 "y gwraidd (root) isod neu gliciwch ar Anwybyddu i fynd yn eich blaen â'ch "
 "breintiau cyfredol."
 
-#: sudlg.cpp:40
+#: sudlg.cpp:42
 msgid ""
 "The action you requested needs additional privileges. Please enter the password "
 "for \"%1\" below or click Ignore to continue with your current privileges."
@@ -148,15 +154,42 @@ msgstr ""
 "gyfrinair \"%1\" isod neu gliciwch ar Anwybyddu i fynd yn eich blaen â'ch "
 "breintiau cyfredol."
 
-#: sudlg.cpp:48
+#: sudlg.cpp:49
+#, fuzzy
+msgid ""
+"The action you requested needs root privileges. Please enter root's password "
+"below."
+msgstr ""
+"Mae angen breintiau gwraidd ar y weithred y gofynnoch amdani. Rhowch gyfrinair "
+"y gwraidd (root) isod neu gliciwch ar Anwybyddu i fynd yn eich blaen â'ch "
+"breintiau cyfredol."
+
+#: sudlg.cpp:53
+#, fuzzy
+msgid ""
+"The action you requested needs additional privileges. Please enter the password "
+"for \"%1\" below."
+msgstr ""
+"Mae angen breintiau gwraidd ar y weithred y gofynnoch amdani. Rhowch gyfrinair "
+"y gwraidd (root) isod neu gliciwch ar Anwybyddu i fynd yn eich blaen â'ch "
+"breintiau cyfredol."
+
+#: sudlg.cpp:59
+msgid ""
+"<qt>The stored password will be:"
+"<br> * Kept for up to %1 minutes"
+"<br> * Destroyed on logout"
+msgstr ""
+
+#: sudlg.cpp:62
 msgid "&Ignore"
 msgstr "&Anwybyddu"
 
-#: sudlg.cpp:64
+#: sudlg.cpp:78
 msgid "Conversation with su failed."
 msgstr "Methodd yr ymgom âg su."
 
-#: sudlg.cpp:73
+#: sudlg.cpp:87
 #, fuzzy
 msgid ""
 "The program 'su' is not found;\n"
@@ -165,7 +198,7 @@ msgstr ""
 "Ni ganfuir y raglen 'su'!\n"
 "Gwiriwch bod eich llwybr (PATH) wedi'i osod yn gywir."
 
-#: sudlg.cpp:80
+#: sudlg.cpp:94
 #, fuzzy
 msgid ""
 "You are not allowed to use 'su';\n"
@@ -176,11 +209,11 @@ msgstr ""
 "Ar rai gysawdau, mae angen i chi fod mewn grŵp arbennig (yn aml: olwyn (wheel)) "
 "i ddefnyddio'r raglen yma."
 
-#: sudlg.cpp:87
+#: sudlg.cpp:101
 msgid "Incorrect password; please try again."
 msgstr "Cyfrinair anghywir; ceisiwch eto, os gwelwch yn dda."
 
-#: sudlg.cpp:91
+#: sudlg.cpp:105
 msgid "Internal error: illegal return from SuProcess::checkInstall()"
 msgstr ""
 "Gwall mewnol: Dychweliad anghyfreithlon oddiwrth SuProcess::checkInstall()"
@@ -196,7 +229,3 @@ msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr "kyfieithu@dotmon.com"
-
-#, fuzzy
-#~ msgid "The action you requested needs root privileges. Please enter root's password below "
-#~ msgstr "Mae angen breintiau gwraidd ar y weithred y gofynnoch amdani. Rhowch gyfrinair y gwraidd (root) isod neu gliciwch ar Anwybyddu i fynd yn eich blaen â'ch breintiau cyfredol."
diff --git a/tde-i18n-cy/messages/tdebase/tdesud.po b/tde-i18n-cy/messages/tdebase/tdesud.po
index 526bd077d5f..66fcf9be58b 100644
--- a/tde-i18n-cy/messages/tdebase/tdesud.po
+++ b/tde-i18n-cy/messages/tdebase/tdesud.po
@@ -5,24 +5,25 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdesud\n"
-"POT-Creation-Date: 2005-07-23 01:32+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-07-17 16:22+0100\n"
 "Last-Translator: KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: tdesud.cpp:251
+#: tdesud.cpp:254
 msgid "TDE su daemon"
 msgstr "Ellyll su TDE"
 
-#: tdesud.cpp:252
+#: tdesud.cpp:255
 msgid "Daemon used by tdesu"
 msgstr "Ellyll (daemon) a ddefnyddir gan tdesu"
 
-#: tdesud.cpp:255
+#: tdesud.cpp:258
 msgid "Author"
 msgstr "Awdur"
 
diff --git a/tde-i18n-cy/messages/tdebase/tdmconfig.po b/tde-i18n-cy/messages/tdebase/tdmconfig.po
index e860f85f8fc..409617aeda2 100644
--- a/tde-i18n-cy/messages/tdebase/tdmconfig.po
+++ b/tde-i18n-cy/messages/tdebase/tdmconfig.po
@@ -10,10 +10,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdmconfig\n"
-"POT-Creation-Date: 2007-11-17 01:14+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-12-28 18:00+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -36,11 +37,11 @@ msgstr ""
 "rhyw raglen (xsetroot o bosib) mewn sgript y penodir yn y dewisiad Setup= yn "
 "tdmrc (Xsetup fel arfer)."
 
-#: tdm-appear.cpp:71
+#: tdm-appear.cpp:77
 msgid "&Greeting:"
 msgstr "&Cyfarchiad"
 
-#: tdm-appear.cpp:76
+#: tdm-appear.cpp:82
 msgid ""
 "This is the \"headline\" for TDM's login window. You may want to put some nice "
 "greeting or information about the operating system here."
@@ -69,35 +70,35 @@ msgstr ""
 "<li>%m -> math y peiriant (caledwedd)</li> "
 "<li>%% -> % sengl</li> </ul>"
 
-#: tdm-appear.cpp:95
+#: tdm-appear.cpp:101
 msgid "Logo area:"
 msgstr "Ardal logo:"
 
-#: tdm-appear.cpp:99
+#: tdm-appear.cpp:105
 msgid ""
 "_: logo area\n"
 "&None"
 msgstr "&Dim"
 
-#: tdm-appear.cpp:100
+#: tdm-appear.cpp:106
 msgid "Show cloc&k"
 msgstr "Dangos clo&c"
 
-#: tdm-appear.cpp:101
+#: tdm-appear.cpp:107
 msgid "Sho&w logo"
 msgstr "Dang&os logo"
 
-#: tdm-appear.cpp:113
+#: tdm-appear.cpp:119
 msgid ""
 "You can choose to display a custom logo (see below), a clock or no logo at all."
 msgstr ""
 "Gallwch ddewis dangos logo addasiedig (gweler isod), cloc, neu dim logo o gwbl."
 
-#: tdm-appear.cpp:119
+#: tdm-appear.cpp:125
 msgid "&Logo:"
 msgstr "&Logo:"
 
-#: tdm-appear.cpp:129
+#: tdm-appear.cpp:135
 msgid ""
 "Click here to choose an image that TDM will display. You can also drag and drop "
 "an image onto this button (e.g. from Konqueror)."
@@ -105,79 +106,99 @@ msgstr ""
 "Cliciwch yma i ddewis delwedd bydd TDM yn ei ddangos. Gallwch hefyd lusgo a "
 "gollwng delwedd i'r botwm yma (e.e. o Konqueror)."
 
-#: tdm-appear.cpp:141
+#: tdm-appear.cpp:147
 msgid "Position:"
 msgstr "Lleoliad:"
 
-#: tdm-appear.cpp:144
+#: tdm-appear.cpp:150
 msgid "&X:"
 msgstr "&X:"
 
-#: tdm-appear.cpp:151
+#: tdm-appear.cpp:157
 msgid "&Y:"
 msgstr "&Y:"
 
-#: tdm-appear.cpp:158
+#: tdm-appear.cpp:164
 #, fuzzy
 msgid ""
 "Here you specify the relative coordinates (in percent) of the login dialog's "
 "<em>center</em>."
 msgstr "Yma penodwch gyfesurynnau <em>canol</em> yr ymgom mewngofnodi."
 
-#: tdm-appear.cpp:173 tdm-appear.cpp:186 tdm-users.cpp:84
+#: tdm-appear.cpp:179
+#, fuzzy
+msgid "None"
+msgstr "&Dim"
+
+#: tdm-appear.cpp:180
+msgid "Trinity compositor"
+msgstr ""
+
+#: tdm-appear.cpp:181
+#, fuzzy
+msgid "Compositor:"
+msgstr "Lleoliad:"
+
+#: tdm-appear.cpp:185
+msgid ""
+"Choose a compositor to be used in TDM.  Note that the chosen compositor will "
+"continue to run after login."
+msgstr ""
+
+#: tdm-appear.cpp:190 tdm-appear.cpp:203 tdm-users.cpp:84
 msgid "<default>"
 msgstr "<rhagosodedig>"
 
-#: tdm-appear.cpp:176
+#: tdm-appear.cpp:193
 msgid "GUI s&tyle:"
 msgstr "Ar&ddull GUI:"
 
-#: tdm-appear.cpp:180
+#: tdm-appear.cpp:197
 msgid "You can choose a basic GUI style here that will be used by TDM only."
 msgstr ""
 "Gallwch ddewis arddull GUI sylfaenol yma i'w ddefnyddio gan TDM yn unig."
 
-#: tdm-appear.cpp:189
+#: tdm-appear.cpp:206
 msgid "&Color scheme:"
 msgstr "Cynllun &lliwiau:"
 
-#: tdm-appear.cpp:193
+#: tdm-appear.cpp:210
 msgid "You can choose a basic Color Scheme here that will be used by TDM only."
 msgstr ""
 "Gallwch ddewis Cynllun Lliwiau sylfaenol yma i'w ddefnyddio gan TDM yn unig."
 
-#: tdm-appear.cpp:199
+#: tdm-appear.cpp:216
 msgid "No Echo"
 msgstr "Dim Adlais"
 
-#: tdm-appear.cpp:200
+#: tdm-appear.cpp:217
 msgid "One Star"
 msgstr "Un Seren"
 
-#: tdm-appear.cpp:201
+#: tdm-appear.cpp:218
 msgid "Three Stars"
 msgstr "Tri Seren"
 
-#: tdm-appear.cpp:202
+#: tdm-appear.cpp:219
 msgid "Echo &mode:"
 msgstr "&Modd adlais"
 
-#: tdm-appear.cpp:206
+#: tdm-appear.cpp:223
 msgid ""
 "You can choose whether and how TDM shows your password when you type it."
 msgstr ""
 "Gallwch ddewis os a sut y mae TDM yn dangos eich cyfrinair pan rydych yn ei "
 "deipio."
 
-#: tdm-appear.cpp:212
+#: tdm-appear.cpp:229
 msgid "Locale"
 msgstr "Lleoleiddiad"
 
-#: tdm-appear.cpp:218
+#: tdm-appear.cpp:235
 msgid "Languag&e:"
 msgstr "Iai&th:"
 
-#: tdm-appear.cpp:223
+#: tdm-appear.cpp:240
 #, fuzzy
 msgid ""
 "Here you can choose the language used by TDM. This setting does not affect a "
@@ -186,11 +207,31 @@ msgstr ""
 "Yma gallwch ddewis yr iaith i'w defnyddio gan TDM. Nid yw'r gosodiad yma'n "
 "effeithio ar osodiadau personol defnyddiwr a ddônt i rym wedi'r mewngofnodi."
 
-#: tdm-appear.cpp:264
+#: tdm-appear.cpp:247
+msgid "Secure Attention Key"
+msgstr ""
+
+#: tdm-appear.cpp:250
+msgid "Enable Secure Attention Key"
+msgstr ""
+
+#: tdm-appear.cpp:258
+msgid ""
+"Secure Attention Key support is not available on your system.  Please check for "
+"the presence of evdev and uinput."
+msgstr ""
+
+#: tdm-appear.cpp:262
+msgid ""
+"Here you can enable or disable the Secure Attention Key [SAK] anti-spoofing "
+"measure."
+msgstr ""
+
+#: tdm-appear.cpp:303
 msgid "without name"
 msgstr "heb enw"
 
-#: tdm-appear.cpp:405
+#: tdm-appear.cpp:444
 msgid ""
 "There was an error loading the image:\n"
 "%1\n"
@@ -200,12 +241,12 @@ msgstr ""
 "%1\n"
 " Ni gaiff ei gadw."
 
-#: tdm-appear.cpp:445 tdm-appear.cpp:488
-#, c-format
-msgid "Welcome to %s at %n"
+#: tdm-appear.cpp:506 tdm-appear.cpp:561
+#, fuzzy, c-format
+msgid "Welcome to %n"
 msgstr "Croeso i %s wrth %n"
 
-#: tdm-appear.cpp:504
+#: tdm-appear.cpp:578
 msgid ""
 "<h1>TDM - Appearance</h1> Here you can configure the basic appearance of the "
 "TDM login manager, i.e. a greeting string, an icon etc."
@@ -260,31 +301,31 @@ msgstr ""
 "Os dewiswch y blwch yma a bo'r estyniad Xft gyda'ch Gweinydd-X, gwrthamgenir "
 "(llyfnheir) y wynebfathau yn yr ymgom fewngofnodi."
 
-#: tdm-shut.cpp:49
+#: tdm-shut.cpp:48
 msgid "Allow Shutdown"
 msgstr "Caniatáu Cau i Lawr"
 
-#: tdm-shut.cpp:52
+#: tdm-shut.cpp:51
 msgid "&Local:"
 msgstr "&Lleol:"
 
-#: tdm-shut.cpp:53 tdm-shut.cpp:59
+#: tdm-shut.cpp:52 tdm-shut.cpp:58
 msgid "Everybody"
 msgstr "Pawb"
 
-#: tdm-shut.cpp:54 tdm-shut.cpp:60
+#: tdm-shut.cpp:53 tdm-shut.cpp:59
 msgid "Only Root"
 msgstr "Gwraidd (root) yn Unig"
 
-#: tdm-shut.cpp:55 tdm-shut.cpp:61
+#: tdm-shut.cpp:54 tdm-shut.cpp:60
 msgid "Nobody"
 msgstr "Neb"
 
-#: tdm-shut.cpp:58
+#: tdm-shut.cpp:57
 msgid "&Remote:"
 msgstr "&Pell:"
 
-#: tdm-shut.cpp:63
+#: tdm-shut.cpp:62
 msgid ""
 "Here you can select who is allowed to shutdown the computer using TDM. You can "
 "specify different values for local (console) and remote displays. Possible "
@@ -304,52 +345,64 @@ msgstr ""
 "i'r defnyddiwr roi cyfrinair y gwraidd yn unig</li>"
 "<li><em>Neb:</em> ni all neb gau'r cyfrifiadur i lawr drwy TDM</li></ul>"
 
-#: tdm-shut.cpp:71
+#: tdm-shut.cpp:70
 msgid "Commands"
 msgstr "Gorchmynion:"
 
-#: tdm-shut.cpp:74
+#: tdm-shut.cpp:73
 #, fuzzy
 msgid "H&alt:"
 msgstr "Ata&l:"
 
-#: tdm-shut.cpp:77
+#: tdm-shut.cpp:76
 msgid "Command to initiate the system halt. Typical value: /sbin/halt"
 msgstr "Gorchymyn i ymgychwyn atal y cysawd. Gwerth gyffredin: /sbin/halt"
 
-#: tdm-shut.cpp:82
+#: tdm-shut.cpp:81
 #, fuzzy
 msgid "Reb&oot:"
 msgstr "&Ailgychwyn:"
 
-#: tdm-shut.cpp:85
+#: tdm-shut.cpp:84
 msgid "Command to initiate the system reboot. Typical value: /sbin/reboot"
 msgstr ""
 "Gorchymyn i ymgychwyn ailgychwyn y cysawd. Gwerth gyffredin: /sbin/reboot"
 
-#: tdm-shut.cpp:93
+#: tdm-shut.cpp:92
 msgid ""
 "_: boot manager\n"
 "None"
 msgstr "Dim"
 
-#: tdm-shut.cpp:94
+#: tdm-shut.cpp:93
 msgid "Grub"
 msgstr "Grub"
 
-#: tdm-shut.cpp:96
+#: tdm-shut.cpp:95
 msgid "Lilo"
 msgstr "Lilo"
 
-#: tdm-shut.cpp:98
+#: tdm-shut.cpp:97
 msgid "Boot manager:"
 msgstr ""
 
-#: tdm-shut.cpp:100
+#: tdm-shut.cpp:99
 #, fuzzy
 msgid "Enable boot options in the \"Shutdown...\" dialog."
 msgstr "Galluogi dewisiadau cychwyn LILO yn yr ymgom \"Cau i Lawr...\"."
 
+#: tdm-shut.cpp:103
+msgid "Restart X-Server with session exit"
+msgstr ""
+
+#: tdm-shut.cpp:105
+msgid ""
+"Whether the login manager should restart the local X-Server after a session "
+"exit instead of resetting. Use this option when the X-Server leaks memory, "
+"crashes the system on reset attempts, or otherwise exhibits display issues or "
+"artifacts."
+msgstr ""
+
 #: tdm-users.cpp:81
 #, c-format
 msgid "Unable to create folder %1"
@@ -737,6 +790,16 @@ msgstr ""
 "diogelwch: os y defnyddir clöwr sgrîn arall na'r un cyfun TDE, bydd hyn yn ei "
 "gwneud hi'n bosib i osgoi clo sgrîn y diogelwyd gan gyfrinair."
 
+#: tdm-conv.cpp:157
+msgid "Allow &Root Login"
+msgstr ""
+
+#: tdm-conv.cpp:158
+msgid ""
+"When set this allows root logins directly in TDM. This is discouraged by some "
+"people. Use with caution."
+msgstr ""
+
 #: main.cpp:67
 msgid ""
 "%1 does not appear to be an image file.\n"
@@ -823,27 +886,27 @@ msgstr ""
 "<br>Noder bod y gosodiadau yma yn dyllau diogelwch gan eu natur, felly "
 "defnyddiwch nhw yn ofalus iawn."
 
-#: main.cpp:186
+#: main.cpp:192
 msgid "A&ppearance"
 msgstr "&Golwg"
 
-#: main.cpp:190
+#: main.cpp:196
 msgid "&Font"
 msgstr "&Wynebfath"
 
-#: main.cpp:194
+#: main.cpp:200
 msgid "&Background"
 msgstr "&Cefndir"
 
-#: main.cpp:198
+#: main.cpp:204
 msgid "&Shutdown"
 msgstr "&Cau i Lawr"
 
-#: main.cpp:202
+#: main.cpp:208
 msgid "&Users"
 msgstr "&Defnyddwyr"
 
-#: main.cpp:210
+#: main.cpp:216
 msgid "Con&venience"
 msgstr "&Hwylusedd"
 
@@ -868,9 +931,6 @@ msgstr ""
 #~ msgid "Sho&w boot options"
 #~ msgstr "Dangos dewis&iadau cychwyn"
 
-#~ msgid "&None"
-#~ msgstr "&Dim"
-
 #~ msgid "Cente&red"
 #~ msgstr "Wedi'i ga&noli"
 
diff --git a/tde-i18n-cy/messages/tdebase/tdmgreet.po b/tde-i18n-cy/messages/tdebase/tdmgreet.po
index b336ef2ea9b..ac9ce72305b 100644
--- a/tde-i18n-cy/messages/tdebase/tdmgreet.po
+++ b/tde-i18n-cy/messages/tdebase/tdmgreet.po
@@ -10,113 +10,30 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdmgreet\n"
-"POT-Creation-Date: 2007-12-08 01:14+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-12-28 17:31+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.2\n"
 "\n"
 
-#: tdmconfig.cpp:139
-msgid "[fix tdmrc!]"
-msgstr "[trwsio tdmrc!]"
-
-#: tdmconfig.cpp:154
-msgid ""
-"_n: %1: TTY login\n"
-"%1: %n TTY logins"
-msgstr ""
-
-#: tdmconfig.cpp:165
-msgid "Unused"
-msgstr ""
-
-#: tdmconfig.cpp:167
-msgid ""
-"_: user: session type\n"
-"%1: %2"
-msgstr ""
-
-#: tdmconfig.cpp:169
-#, c-format
-msgid ""
-"_: ... host\n"
-"X login on %1"
-msgstr ""
-
-#: krootimage.cpp:37
-msgid "Fancy desktop background for tdm"
-msgstr ""
-
-#: krootimage.cpp:42
-msgid "Name of the configuration file"
-msgstr ""
-
-#: krootimage.cpp:103
-msgid "KRootImage"
-msgstr ""
-
-#: kchooser.cpp:57
-msgid "&Local Login"
-msgstr "&Mewngofnod Lleol"
-
-#: kchooser.cpp:61
-msgid "XDMCP Host Menu"
-msgstr "Dewislen Gwesteiwyr XDMCP"
-
-#: kchooser.cpp:66
-msgid "Hostname"
-msgstr "Enw gwesteiwr"
-
-#: kchooser.cpp:68
-msgid "Status"
-msgstr "Cyflwr"
-
-#: kchooser.cpp:76
-msgid "Hos&t:"
-msgstr "Gwe&steiwr"
-
-#: kchooser.cpp:77
-msgid "A&dd"
-msgstr "&Ychwcanegu"
-
-#: kchooser.cpp:85
-msgid "&Accept"
-msgstr "D&erbyn"
-
-#: kchooser.cpp:87
-msgid "&Refresh"
-msgstr "&Ailfywio"
-
-#: kchooser.cpp:95 kgreeter.cpp:694
-msgid "&Menu"
-msgstr "&Dewislen"
-
-#: kchooser.cpp:177
-msgid "<unknown>"
-msgstr "<anhysbys>"
-
-#: kchooser.cpp:215
-#, c-format
-msgid "Unknown host %1"
-msgstr "Gwesteiwr anhysbys %1"
-
-#: kgreeter.cpp:395
+#: kgreeter.cpp:595
 msgid "Custom"
 msgstr "Addasiedig"
 
-#: kgreeter.cpp:396
+#: kgreeter.cpp:596
 msgid "Failsafe"
 msgstr "Methu-diogel"
 
-#: kgreeter.cpp:470
+#: kgreeter.cpp:671
 msgid " (previous)"
 msgstr "(cynt)"
 
-#: kgreeter.cpp:529
+#: kgreeter.cpp:742
 msgid ""
 "Your saved session type '%1' is not valid any more.\n"
 "Please select a new one, otherwise 'default' will be used."
@@ -124,308 +41,301 @@ msgstr ""
 "Nid yw eich math sesiwn '%1' a gedwir yn ddilys rwan.\n"
 "Dewiswch un newydd, neu fydd 'rhagosod' yn cael ei ddefnyddio."
 
-#: kgreeter.cpp:636
+#: kgreeter.cpp:851
 msgid "Warning: this is an unsecured session"
 msgstr ""
 
-#: kgreeter.cpp:638
+#: kgreeter.cpp:853
 msgid ""
 "This display requires no X authorization.\n"
 "This means that anybody can connect to it,\n"
 "open windows on it or intercept your input."
 msgstr ""
 
-#: kgreeter.cpp:691
+#: kgreeter.cpp:916
 msgid "L&ogin"
 msgstr "Mewn&gofnodi"
 
-#: kgreeter.cpp:724 kgreeter.cpp:865
+#: kchooser.cpp:95 kgreeter.cpp:919
+msgid "&Menu"
+msgstr "&Dewislen"
+
+#: kgreeter.cpp:949 kgreeter.cpp:1092
 msgid "Session &Type"
 msgstr "Ma&th y Sesiwn"
 
-#: kgreeter.cpp:729 kgreeter.cpp:871
+#: kgreeter.cpp:954 kgreeter.cpp:1104
 msgid "&Authentication Method"
 msgstr "Dull Dil&ysiant"
 
-#: kgreeter.cpp:734 kgreeter.cpp:876
+#: kgreeter.cpp:959 kgreeter.cpp:1109
 msgid "&Remote Login"
 msgstr "Mewngofnod &Pell"
 
-#: kgreeter.cpp:812
+#: kgreeter.cpp:1040
 msgid "Login Failed."
 msgstr "Methwyd mewngofnodi."
 
-#: kconsole.cpp:75
-msgid "Cannot open console"
+#: themer/tdmthemer.cpp:71
+#, fuzzy, c-format
+msgid "Cannot open theme file %1"
 msgstr "Methu agor terfynell"
 
-#: kconsole.cpp:159
-msgid ""
-"\n"
-"*** Cannot open console log source ***"
+#: themer/tdmthemer.cpp:75
+#, c-format
+msgid "Cannot parse theme file %1"
 msgstr ""
-"\n"
-"*** Methu agor tarddiad cofnodion y terfynell ***"
 
-#: kgdialog.cpp:61
-msgid "Sw&itch User"
-msgstr ""
+#: themer/tdmlabel.cpp:214
+msgid "Language"
+msgstr "Iaith"
 
-#: kgdialog.cpp:73
-msgid "R&estart X Server"
-msgstr "A&il-gychwyn y Gweinydd X"
+#: themer/tdmlabel.cpp:215
+msgid "Session Type"
+msgstr "Math y Sesiwn"
 
-#: kgdialog.cpp:73
-msgid "Clos&e Connection"
-msgstr "Ca&u'r Cysylltiad"
+#: themer/tdmlabel.cpp:216
+msgid "Menu"
+msgstr "Dewislen"
 
-#: kgdialog.cpp:84
-msgid "Co&nsole Login"
-msgstr "Mewngofnod &Terfynell"
+#: themer/tdmlabel.cpp:217
+msgid "&Administration"
+msgstr ""
 
-#: kgdialog.cpp:87
-msgid "&Shutdown..."
-msgstr "&Cau i lawr..."
+#: themer/tdmlabel.cpp:218
+msgid "Disconnect"
+msgstr "Datgysylltu"
 
-#: kgdialog.cpp:227
-msgid ""
-"_: session (location)\n"
-"%1 (%2)"
-msgstr "%1(%2)"
+#: themer/tdmlabel.cpp:220
+msgid "Power Off"
+msgstr ""
 
-#: kgverify.cpp:177
-msgid "No greeter widget plugin loaded. Check the configuration."
-msgstr "Ni lwythir ategyn celfigyn cyfarchydd.  Gwiriwch y gosodiad."
+#: themer/tdmlabel.cpp:221
+msgid "Suspend"
+msgstr "Seibio"
+
+#: themer/tdmlabel.cpp:222
+msgid "Reboot"
+msgstr "Ailgychwyn"
 
-#: kgverify.cpp:435
+#: themer/tdmlabel.cpp:223
 #, fuzzy
-msgid ""
-"Authenticating %1...\n"
-"\n"
+msgid "XDMCP Chooser"
+msgstr "Dewislen Gwesteiwyr XDMCP"
+
+#: themer/tdmlabel.cpp:225
+msgid "Caps Lock is enabled."
 msgstr ""
-"Dilysu %1 ...\n"
-"\n"
 
-#: kgverify.cpp:439
-msgid "You are required to change your password immediately (password aged)."
+#: themer/tdmlabel.cpp:226
+#, c-format
+msgid "User %s will login in %d seconds"
 msgstr ""
-"Rhaid i chi newid eich cyfrinair yn syth bin (mae'r cyfrinair wedi dyddio)."
 
-#: kgverify.cpp:440
-msgid "You are required to change your password immediately (root enforced)."
-msgstr "Rhaid i chi newid eich cyfrinair yn syth bin (gorfodir gan wraidd)."
+#: themer/tdmlabel.cpp:227
+#, c-format
+msgid "Welcome to %h"
+msgstr ""
 
-#: kgverify.cpp:441
-msgid "You are not allowed to login at the moment."
-msgstr "Ni chaniateir i chi fewngofnodi ar hyn o bryd."
+#: themer/tdmlabel.cpp:228
+msgid "Username:"
+msgstr "Enw defnyddiwr:"
 
-#: kgverify.cpp:442
-msgid "Home folder not available."
-msgstr "Nid yw'r blygell gartref ar gael."
+#: themer/tdmlabel.cpp:229
+msgid "Password:"
+msgstr "Cyfrinair:"
 
-#: kgverify.cpp:443
-msgid ""
-"Logins are not allowed at the moment.\n"
-"Try again later."
+#: themer/tdmlabel.cpp:230
+msgid "Domain:"
 msgstr ""
-"Ni chaniateir mewngofnodi ar hyn o bryd.\n"
-"Ceisiwch eto yn nes ymlaen."
-
-#: kgverify.cpp:444
-msgid "Your login shell is not listed in /etc/shells."
-msgstr "Ni restrir eich plisgyn mewngofnodi yn /etc/shells."
 
-#: kgverify.cpp:445
-msgid "Root logins are not allowed."
-msgstr "Ni chaniateir mewngofnodi fel gwraidd."
-
-#: kgverify.cpp:446
-#, fuzzy
-msgid "Your account has expired; please contact your system administrator."
-msgstr "Mae eich cyfrif wedi darfod (ni newidwyd y cyfrinair)."
+#: themer/tdmlabel.cpp:231
+msgid "Login"
+msgstr "Mewngofnod"
 
-#: kgverify.cpp:456
+#: themer/tdmlabel.cpp:270
+#, no-c-format
 msgid ""
-"A critical error occurred.\n"
-"Please look at TDM's logfile(s) for more information\n"
-"or contact your system administrator."
+"_: date format\n"
+"%a %d %B"
 msgstr ""
-"Digwyddodd gwall argyfyngus.\n"
-" Edrychwch ar ffeil cofnod TDE am fwy o wybodaeth\n"
-"neu cysylltwch â'ch gweinyddwr cysawd."
 
-#: kgverify.cpp:482
-#, c-format
-msgid ""
-"_n: Your account expires tomorrow.\n"
-"Your account expires in %n days."
+#: krootimage.cpp:38
+msgid "Fancy desktop background for tdm"
 msgstr ""
-"Mae eich cyfrif yn darfod yfory.\n"
-"Mae eich cyfrif yn darfod mewn %n o ddiwrnodau."
 
-#: kgverify.cpp:483
-msgid "Your account expires today."
-msgstr "Mae eich cyfrif yn darfod heddiw."
+#: krootimage.cpp:43
+msgid "Name of the configuration file"
+msgstr ""
 
-#: kgverify.cpp:490
-#, c-format
-msgid ""
-"_n: Your password expires tomorrow.\n"
-"Your password expires in %n days."
+#: krootimage.cpp:121
+msgid "KRootImage"
 msgstr ""
-"Mae eich cyfrinair yn darfod yfory.\n"
-"Mae eich cyfrinair yn darfod mewn %n o ddiwrnodau."
 
-#: kgverify.cpp:491
-msgid "Your password expires today."
-msgstr "Mae eich cyfrinair yn darfod heddiw."
+#: kchooser.cpp:57
+msgid "&Local Login"
+msgstr "&Mewngofnod Lleol"
 
-#: kgverify.cpp:558 kgverify.cpp:1005
-msgid "Authentication failed"
-msgstr "Methodd dilysiant"
+#: kchooser.cpp:61
+msgid "XDMCP Host Menu"
+msgstr "Dewislen Gwesteiwyr XDMCP"
 
-#: kgverify.cpp:695
-msgid ""
-"Authenticated user (%1) does not match requested user (%2).\n"
-msgstr ""
-"Nid yw'r defnyddiwr wedi'i ddilysu (%1) yn cydweddu â'r defnyddiwr a ofynnwyd "
-"amdano (%2).\n"
+#: kchooser.cpp:66
+msgid "Hostname"
+msgstr "Enw gwesteiwr"
 
-#: kgverify.cpp:988
-#, c-format
-msgid ""
-"_n: Automatic login in 1 second...\n"
-"Automatic login in %n seconds..."
-msgstr ""
+#: kchooser.cpp:68
+msgid "Status"
+msgstr "Cyflwr"
 
-#: kgverify.cpp:997
-msgid "Warning: Caps Lock on"
-msgstr "Rhybudd: Clo Llythrennau arnodd"
+#: kchooser.cpp:76
+msgid "Hos&t:"
+msgstr "Gwe&steiwr"
 
-#: kgverify.cpp:1002
-msgid "Change failed"
-msgstr "Methodd y newidiad"
+#: kchooser.cpp:77
+msgid "A&dd"
+msgstr "&Ychwcanegu"
 
-#: kgverify.cpp:1004
-msgid "Login failed"
-msgstr "Methwyd mewngofnodi"
+#: kchooser.cpp:85
+msgid "&Accept"
+msgstr "D&erbyn"
 
-#: kgverify.cpp:1038
-msgid "Theme not usable with authentication method '%1'."
-msgstr ""
+#: kchooser.cpp:87
+msgid "&Refresh"
+msgstr "&Ailfywio"
 
-#: kgverify.cpp:1093
-msgid "Changing authentication token"
-msgstr "Newid tocyn dilysiant"
+#: kchooser.cpp:177
+msgid "<unknown>"
+msgstr "<anhysbys>"
+
+#: kchooser.cpp:215
+#, c-format
+msgid "Unknown host %1"
+msgstr "Gwesteiwr anhysbys %1"
 
-#: tdmshutdown.cpp:92
+#: tdmshutdown.cpp:97
 msgid "Root authorization required."
 msgstr ""
 
-#: tdmshutdown.cpp:123 tdmshutdown.cpp:516
+#: tdmshutdown.cpp:128 tdmshutdown.cpp:602
 #, fuzzy
 msgid "&Schedule..."
 msgstr "&Trefnlennu"
 
-#: tdmshutdown.cpp:246
+#: tdmshutdown.cpp:247 tdmshutdown.cpp:473
+#, fuzzy
+msgid "Shutdown TDE"
+msgstr "Math o gau i lawr"
+
+#: tdmshutdown.cpp:253
 msgid "Shutdown Type"
 msgstr "Math o gau i lawr"
 
-#: tdmshutdown.cpp:250
+#: tdmshutdown.cpp:257
 msgid "&Turn off computer"
 msgstr "&Diffodd y cyfrifiadur"
 
-#: tdmshutdown.cpp:254
+#: tdmshutdown.cpp:261
 msgid "&Restart computer"
 msgstr "&Ail-gychwyn y cyfrifiadur"
 
-#: tdmshutdown.cpp:282
+#: tdmshutdown.cpp:289
 msgid "Scheduling"
 msgstr "Yn Trefnlennu"
 
-#: tdmshutdown.cpp:286
+#: tdmshutdown.cpp:293
 msgid "&Start:"
 msgstr "&Dechrau:"
 
-#: tdmshutdown.cpp:289
+#: tdmshutdown.cpp:296
 msgid "T&imeout:"
 msgstr "G&oramser:"
 
-#: tdmshutdown.cpp:291
+#: tdmshutdown.cpp:298
 msgid "&Force after timeout"
 msgstr ""
 
-#: tdmshutdown.cpp:340
+#: tdmshutdown.cpp:347
 msgid "Entered start date is invalid."
 msgstr ""
 
-#: tdmshutdown.cpp:349
+#: tdmshutdown.cpp:356
 msgid "Entered timeout date is invalid."
 msgstr ""
 
-#: tdmshutdown.cpp:482
-msgid "&Turn Off Computer"
-msgstr "&Cau'r cyfrifiadur i lawr"
-
-#: tdmshutdown.cpp:489
-msgid "&Restart Computer"
-msgstr "&Ail-gychwyn y cyfrifiadur"
+#: tdmshutdown.cpp:501
+#, fuzzy
+msgid "&Restart"
+msgstr "&Dechrau:"
 
-#: tdmshutdown.cpp:504
+#: tdmshutdown.cpp:521 tdmshutdown.cpp:590
 msgid ""
 "_: current option in boot loader\n"
 "%1 (current)"
 msgstr ""
 
-#: tdmshutdown.cpp:608
+#: tdmshutdown.cpp:532
+#, fuzzy
+msgid "&Turn Off"
+msgstr "&Cau'r cyfrifiadur i lawr"
+
+#: tdmshutdown.cpp:568
+msgid "&Turn Off Computer"
+msgstr "&Cau'r cyfrifiadur i lawr"
+
+#: tdmshutdown.cpp:575
+msgid "&Restart Computer"
+msgstr "&Ail-gychwyn y cyfrifiadur"
+
+#: tdmshutdown.cpp:819
 msgid "Turn Off Computer"
 msgstr "Cau'r cyfrifiadur i lawr"
 
-#: tdmshutdown.cpp:611
+#: tdmshutdown.cpp:822
 msgid "Switch to Console"
 msgstr ""
 
-#: tdmshutdown.cpp:613
+#: tdmshutdown.cpp:824
 msgid "Restart Computer"
 msgstr "Ail-gychwyn y cyfrifiadur"
 
-#: tdmshutdown.cpp:615
+#: tdmshutdown.cpp:826
 msgid "<br>(Next boot: %1)"
 msgstr ""
 
-#: tdmshutdown.cpp:627
+#: tdmshutdown.cpp:838
 msgid "Abort active sessions:"
 msgstr ""
 
-#: tdmshutdown.cpp:628
+#: tdmshutdown.cpp:839
 msgid "No permission to abort active sessions:"
 msgstr ""
 
-#: tdmshutdown.cpp:635
+#: tdmshutdown.cpp:846
 msgid "Session"
 msgstr "Sesiwn"
 
-#: tdmshutdown.cpp:636
+#: tdmshutdown.cpp:847
 msgid "Location"
 msgstr "Lleoliad"
 
-#: tdmshutdown.cpp:667
+#: tdmshutdown.cpp:878
 msgid "Abort pending shutdown:"
 msgstr ""
 
-#: tdmshutdown.cpp:668
+#: tdmshutdown.cpp:879
 msgid "No permission to abort pending shutdown:"
 msgstr ""
 
-#: tdmshutdown.cpp:674
+#: tdmshutdown.cpp:885
 msgid "now"
 msgstr "rwan"
 
-#: tdmshutdown.cpp:680
+#: tdmshutdown.cpp:891
 msgid "infinite"
 msgstr ""
 
-#: tdmshutdown.cpp:686
+#: tdmshutdown.cpp:897
 msgid ""
 "Owner: %1\n"
 "Type: %2%5\n"
@@ -433,124 +343,242 @@ msgid ""
 "Timeout: %4"
 msgstr ""
 
-#: tdmshutdown.cpp:691
+#: tdmshutdown.cpp:902
 msgid "console user"
 msgstr ""
 
-#: tdmshutdown.cpp:693
+#: tdmshutdown.cpp:904
 msgid "control socket"
 msgstr ""
 
-#: tdmshutdown.cpp:696
+#: tdmshutdown.cpp:907
 msgid "turn off computer"
 msgstr "cau'r cyfrifiadur i lawr"
 
-#: tdmshutdown.cpp:697
+#: tdmshutdown.cpp:908
 msgid "restart computer"
 msgstr "ail-gychwyn y cyfrifiadur"
 
-#: tdmshutdown.cpp:700
+#: tdmshutdown.cpp:911
 #, c-format
 msgid ""
 "\n"
 "Next boot: %1"
 msgstr ""
 
-#: tdmshutdown.cpp:703
+#: tdmshutdown.cpp:914
 #, c-format
 msgid ""
 "\n"
 "After timeout: %1"
 msgstr ""
 
-#: tdmshutdown.cpp:705
+#: tdmshutdown.cpp:916
 msgid "abort all sessions"
 msgstr ""
 
-#: tdmshutdown.cpp:707
+#: tdmshutdown.cpp:918
 msgid "abort own sessions"
 msgstr ""
 
-#: tdmshutdown.cpp:708
+#: tdmshutdown.cpp:919
 msgid "cancel shutdown"
 msgstr ""
 
-#: themer/tdmlabel.cpp:170
-msgid "Language"
-msgstr "Iaith"
+#: kgverify.cpp:177
+msgid "No greeter widget plugin loaded. Check the configuration."
+msgstr "Ni lwythir ategyn celfigyn cyfarchydd.  Gwiriwch y gosodiad."
 
-#: themer/tdmlabel.cpp:171
-msgid "Session Type"
-msgstr "Math y Sesiwn"
+#: kgverify.cpp:442
+#, fuzzy
+msgid ""
+"Authenticating %1...\n"
+"\n"
+msgstr ""
+"Dilysu %1 ...\n"
+"\n"
 
-#: themer/tdmlabel.cpp:172
-msgid "Menu"
-msgstr "Dewislen"
+#: kgverify.cpp:446
+msgid "You are required to change your password immediately (password aged)."
+msgstr ""
+"Rhaid i chi newid eich cyfrinair yn syth bin (mae'r cyfrinair wedi dyddio)."
 
-#: themer/tdmlabel.cpp:173
-msgid "Disconnect"
-msgstr "Datgysylltu"
+#: kgverify.cpp:447
+msgid "You are required to change your password immediately (root enforced)."
+msgstr "Rhaid i chi newid eich cyfrinair yn syth bin (gorfodir gan wraidd)."
+
+#: kgverify.cpp:448
+msgid "You are not allowed to login at the moment."
+msgstr "Ni chaniateir i chi fewngofnodi ar hyn o bryd."
+
+#: kgverify.cpp:449
+msgid "Home folder not available."
+msgstr "Nid yw'r blygell gartref ar gael."
 
-#: themer/tdmlabel.cpp:175
-msgid "Power off"
+#: kgverify.cpp:450
+msgid ""
+"Logins are not allowed at the moment.\n"
+"Try again later."
 msgstr ""
+"Ni chaniateir mewngofnodi ar hyn o bryd.\n"
+"Ceisiwch eto yn nes ymlaen."
 
-#: themer/tdmlabel.cpp:176
-msgid "Suspend"
-msgstr "Seibio"
+#: kgverify.cpp:451
+msgid "Your login shell is not listed in /etc/shells."
+msgstr "Ni restrir eich plisgyn mewngofnodi yn /etc/shells."
 
-#: themer/tdmlabel.cpp:177
-msgid "Reboot"
-msgstr "Ailgychwyn"
+#: kgverify.cpp:452
+msgid "Root logins are not allowed."
+msgstr "Ni chaniateir mewngofnodi fel gwraidd."
 
-#: themer/tdmlabel.cpp:178
+#: kgverify.cpp:453
 #, fuzzy
-msgid "XDMCP Chooser"
-msgstr "Dewislen Gwesteiwyr XDMCP"
+msgid "Your account has expired; please contact your system administrator."
+msgstr "Mae eich cyfrif wedi darfod (ni newidwyd y cyfrinair)."
 
-#: themer/tdmlabel.cpp:180
-msgid "You have got caps lock on."
+#: kgverify.cpp:463
+msgid ""
+"A critical error occurred.\n"
+"Please look at TDM's logfile(s) for more information\n"
+"or contact your system administrator."
 msgstr ""
+"Digwyddodd gwall argyfyngus.\n"
+" Edrychwch ar ffeil cofnod TDE am fwy o wybodaeth\n"
+"neu cysylltwch â'ch gweinyddwr cysawd."
 
-#: themer/tdmlabel.cpp:181
+#: kgverify.cpp:489
 #, c-format
-msgid "User %s will login in %d seconds"
+msgid ""
+"_n: Your account expires tomorrow.\n"
+"Your account expires in %n days."
 msgstr ""
+"Mae eich cyfrif yn darfod yfory.\n"
+"Mae eich cyfrif yn darfod mewn %n o ddiwrnodau."
+
+#: kgverify.cpp:490
+msgid "Your account expires today."
+msgstr "Mae eich cyfrif yn darfod heddiw."
 
-#: themer/tdmlabel.cpp:182
+#: kgverify.cpp:497
 #, c-format
-msgid "Welcome to %h"
+msgid ""
+"_n: Your password expires tomorrow.\n"
+"Your password expires in %n days."
 msgstr ""
+"Mae eich cyfrinair yn darfod yfory.\n"
+"Mae eich cyfrinair yn darfod mewn %n o ddiwrnodau."
 
-#: themer/tdmlabel.cpp:183
-msgid "Username:"
-msgstr "Enw defnyddiwr:"
+#: kgverify.cpp:498
+msgid "Your password expires today."
+msgstr "Mae eich cyfrinair yn darfod heddiw."
 
-#: themer/tdmlabel.cpp:184
-msgid "Password:"
-msgstr "Cyfrinair:"
+#: kgverify.cpp:565 kgverify.cpp:1012
+msgid "Authentication failed"
+msgstr "Methodd dilysiant"
 
-#: themer/tdmlabel.cpp:185
-msgid "Login"
-msgstr "Mewngofnod"
+#: kgverify.cpp:702
+msgid ""
+"Authenticated user (%1) does not match requested user (%2).\n"
+msgstr ""
+"Nid yw'r defnyddiwr wedi'i ddilysu (%1) yn cydweddu â'r defnyddiwr a ofynnwyd "
+"amdano (%2).\n"
 
-#: themer/tdmlabel.cpp:225
-#, no-c-format
+#: kgverify.cpp:995
+#, c-format
 msgid ""
-"_: date format\n"
-"%a %d %B"
+"_n: Automatic login in 1 second...\n"
+"Automatic login in %n seconds..."
 msgstr ""
 
-#: themer/tdmthemer.cpp:67
-#, fuzzy, c-format
-msgid "Cannot open theme file %1"
-msgstr "Methu agor terfynell"
+#: kgverify.cpp:1004
+msgid "Warning: Caps Lock on"
+msgstr "Rhybudd: Clo Llythrennau arnodd"
 
-#: themer/tdmthemer.cpp:71
+#: kgverify.cpp:1009
+msgid "Change failed"
+msgstr "Methodd y newidiad"
+
+#: kgverify.cpp:1011
+msgid "Login failed"
+msgstr "Methwyd mewngofnodi"
+
+#: kgverify.cpp:1045
+msgid "Theme not usable with authentication method '%1'."
+msgstr ""
+
+#: kgverify.cpp:1100
+msgid "Changing authentication token"
+msgstr "Newid tocyn dilysiant"
+
+#: kfdialog.cpp:167
+msgid "Question"
+msgstr ""
+
+#: tdmconfig.cpp:141
+msgid "[fix tdmrc!]"
+msgstr "[trwsio tdmrc!]"
+
+#: tdmconfig.cpp:156
+msgid ""
+"_n: %1: TTY login\n"
+"%1: %n TTY logins"
+msgstr ""
+
+#: tdmconfig.cpp:167
+msgid "Unused"
+msgstr ""
+
+#: tdmconfig.cpp:169
+msgid ""
+"_: user: session type\n"
+"%1: %2"
+msgstr ""
+
+#: tdmconfig.cpp:171
 #, c-format
-msgid "Cannot parse theme file %1"
+msgid ""
+"_: ... host\n"
+"X login on %1"
 msgstr ""
 
+#: kgdialog.cpp:62
+msgid "Sw&itch User"
+msgstr ""
+
+#: kgdialog.cpp:74
+msgid "R&estart X Server"
+msgstr "A&il-gychwyn y Gweinydd X"
+
+#: kgdialog.cpp:74
+msgid "Clos&e Connection"
+msgstr "Ca&u'r Cysylltiad"
+
+#: kgdialog.cpp:85
+msgid "Co&nsole Login"
+msgstr "Mewngofnod &Terfynell"
+
+#: kgdialog.cpp:89
+msgid "&Shutdown..."
+msgstr "&Cau i lawr..."
+
+#: kgdialog.cpp:229
+msgid ""
+"_: session (location)\n"
+"%1 (%2)"
+msgstr "%1(%2)"
+
+#: kconsole.cpp:75
+msgid "Cannot open console"
+msgstr "Methu agor terfynell"
+
+#: kconsole.cpp:159
+msgid ""
+"\n"
+"*** Cannot open console log source ***"
+msgstr ""
+"\n"
+"*** Methu agor tarddiad cofnodion y terfynell ***"
+
 #~ msgid "Login chooser for Xdmcp"
 #~ msgstr "Dewisydd mewngofnodi am Xdmcp"
 
diff --git a/tde-i18n-cy/messages/tdebase/trashapplet.po b/tde-i18n-cy/messages/tdebase/trashapplet.po
index d558d351125..54a282ac068 100644
--- a/tde-i18n-cy/messages/tdebase/trashapplet.po
+++ b/tde-i18n-cy/messages/tdebase/trashapplet.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: all2.po\n"
-"POT-Creation-Date: 2005-09-27 02:32+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdebase/twin.po b/tde-i18n-cy/messages/tdebase/twin.po
index 68e69f3663c..aeb27a20475 100644
--- a/tde-i18n-cy/messages/tdebase/twin.po
+++ b/tde-i18n-cy/messages/tdebase/twin.po
@@ -10,10 +10,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: twin\n"
-"POT-Creation-Date: 2008-03-10 01:27+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-12-27 10:16+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -31,11 +32,89 @@ msgid ""
 "Your emails"
 msgstr "kyfieithu@dotmon.com"
 
-#: activation.cpp:695
+#: activation.cpp:738
 #, fuzzy
 msgid "Window '%1' demands attention."
 msgstr "Gweithredu'r Ffenestr sy'n Gofyn am Sylw"
 
+#: client.cpp:2004
+msgid "Suspended"
+msgstr ""
+
+#: main.cpp:64
+#, fuzzy
+msgid ""
+"[twin] it looks like there's already a window manager running. twin not "
+"started.\n"
+msgstr ""
+"twin: Eitha debyg mae trefnydd ffenestri yn rhedeg yn barod. Ni ddechreuwyd "
+"twin.\n"
+
+#: main.cpp:79
+#, fuzzy
+msgid "[twin] failure during initialization; aborting"
+msgstr "twin: methiant yn ystod ymgychwyn, erthylir"
+
+#: main.cpp:138 main.cpp:144 main.cpp:150
+#, fuzzy
+msgid ""
+"[twin] unable to claim manager selection, another wm running? (try using "
+"--replace)\n"
+msgstr ""
+"twin: Methu hawlio dewisiad trefnydd, trefnydd ffenestri arall yn rhedeg? "
+"(Ceisiwch ddefnyddio --replace)\n"
+
+#: main.cpp:237
+#, fuzzy
+msgid "TDE window manager"
+msgstr "Trefnydd Ffenestri TDE"
+
+#: main.cpp:241
+msgid "Disable configuration options"
+msgstr "Analluogi dewisiadau ffurfweddu"
+
+#: main.cpp:242
+#, fuzzy
+msgid "Replace already-running ICCCM2.0-compliant window manager"
+msgstr ""
+"Amnewid trefnydd ffenestri sy'n cydymffurfio â ICCCM2.0 sy'n rhedeg yn barod"
+
+#: main.cpp:243
+msgid "Do not start composition manager"
+msgstr ""
+
+#: killer/killer.cpp:49 main.cpp:319
+msgid "TWin"
+msgstr ""
+
+#: main.cpp:321
+#, fuzzy
+msgid "(c) 1999-2005, The KDE Developers"
+msgstr "(h) 1999-2002, Y Datblygwyr TDE"
+
+#: main.cpp:325
+msgid "Maintainer"
+msgstr "Cynhaliwr"
+
+#: plugins.cpp:32
+#, fuzzy
+msgid "TWin: "
+msgstr "KWin:"
+
+#: plugins.cpp:33
+#, fuzzy
+msgid ""
+"\n"
+"TWin will now exit..."
+msgstr ""
+"\n"
+"Bydd KWin yn terfynu rwan..."
+
+#: tabbox.cpp:53
+#, fuzzy
+msgid "*** No Windows ***"
+msgstr "*** Dim Tasgau ***"
+
 #: twinbindings.cpp:18
 msgid "System"
 msgstr "Cysawd"
@@ -53,446 +132,481 @@ msgid "Walk Through Windows (Reverse)"
 msgstr "Cerdded Trwy'r Ffenestri (Am yn Ôl)"
 
 #: twinbindings.cpp:23
+#, fuzzy
+msgid "Walk Through Windows of Same Application"
+msgstr "Cerdded Trwy'r Ffenestri"
+
+#: twinbindings.cpp:24
+#, fuzzy
+msgid "Walk Through Windows of Same Application (Reverse)"
+msgstr "Cerdded Trwy'r Ffenestri (Am yn Ôl)"
+
+#: twinbindings.cpp:25
 msgid "Walk Through Desktops"
 msgstr "Cerdded Trwy'r Penbyrddau"
 
-#: twinbindings.cpp:24
+#: twinbindings.cpp:26
 msgid "Walk Through Desktops (Reverse)"
 msgstr "Cerdded Trwy'r Penbyrddau (Am yn Ôl)"
 
-#: twinbindings.cpp:25
+#: twinbindings.cpp:27
 msgid "Walk Through Desktop List"
 msgstr "Cerdded Trwy'r Restr Penbyrddau"
 
-#: twinbindings.cpp:26
+#: twinbindings.cpp:28
 msgid "Walk Through Desktop List (Reverse)"
 msgstr "Cerdded Trwy'r Restr Penbyrddau (Am yn Ôl)"
 
-#: twinbindings.cpp:28
+#: twinbindings.cpp:30
 msgid "Windows"
 msgstr "Ffenestri"
 
-#: twinbindings.cpp:29
+#: twinbindings.cpp:31
 msgid "Window Operations Menu"
 msgstr "Dewislen Weithredoedd Ffenestr"
 
-#: twinbindings.cpp:30
+#: twinbindings.cpp:32
 msgid "Close Window"
 msgstr "Cau'r Ffenestr"
 
-#: twinbindings.cpp:32
+#: twinbindings.cpp:34
 msgid "Maximize Window"
 msgstr "&Ehangu'r Ffenestr"
 
-#: twinbindings.cpp:34
+#: twinbindings.cpp:36
 msgid "Maximize Window Vertically"
 msgstr "Ehangu'r Ffenestr yn Fertigol"
 
-#: twinbindings.cpp:36
+#: twinbindings.cpp:38
 msgid "Maximize Window Horizontally"
 msgstr "Ehangu'r Ffenestr yn Llorweddol"
 
-#: twinbindings.cpp:38
+#: twinbindings.cpp:40
 msgid "Minimize Window"
 msgstr "Lleihau'r Ffenestr"
 
-#: twinbindings.cpp:40
+#: twinbindings.cpp:42
 msgid "Shade Window"
 msgstr "Rholio'r Ffenestr"
 
-#: twinbindings.cpp:42
+#: twinbindings.cpp:44
 msgid "Move Window"
 msgstr "Symud y Ffenestr"
 
-#: twinbindings.cpp:44
+#: twinbindings.cpp:46
 msgid "Resize Window"
 msgstr "Newid Maint y Ffenestr"
 
-#: twinbindings.cpp:46
+#: twinbindings.cpp:48
 msgid "Raise Window"
 msgstr "Codi'r Ffenestr"
 
-#: twinbindings.cpp:48
+#: twinbindings.cpp:50
 msgid "Lower Window"
 msgstr "Gostwng y Ffenestr"
 
-#: twinbindings.cpp:50
+#: twinbindings.cpp:52
 msgid "Toggle Window Raise/Lower"
 msgstr "Codi/Gostwng Ffenestr"
 
-#: twinbindings.cpp:51
+#: twinbindings.cpp:53
 msgid "Make Window Fullscreen"
 msgstr "Gwneud i'r Ffenestr Lenwi'r Sgrîn"
 
-#: twinbindings.cpp:53
+#: twinbindings.cpp:55
 msgid "Hide Window Border"
 msgstr "Cuddio Ymyl y Ffenestr"
 
-#: twinbindings.cpp:55
+#: twinbindings.cpp:57
 msgid "Keep Window Above Others"
 msgstr "Cadw'r Ffenestr Uwchben y Lleill"
 
-#: twinbindings.cpp:57
+#: twinbindings.cpp:59
 msgid "Keep Window Below Others"
 msgstr "Cadw'r Ffenestr Dan y Lleill"
 
-#: twinbindings.cpp:59
+#: twinbindings.cpp:61
 msgid "Activate Window Demanding Attention"
 msgstr "Gweithredu'r Ffenestr sy'n Gofyn am Sylw"
 
-#: twinbindings.cpp:60
+#: twinbindings.cpp:62
 #, fuzzy
 msgid "Setup Window Shortcut"
 msgstr "Cadw Gosodiadau Ffenest&r"
 
-#: twinbindings.cpp:61
+#: twinbindings.cpp:63
 msgid "Pack Window to the Right"
 msgstr "Pacio'r Ffenestr i'r Dde"
 
-#: twinbindings.cpp:63
+#: twinbindings.cpp:65
 msgid "Pack Window to the Left"
 msgstr "Pacio'r Ffenestr i'r Chwith"
 
-#: twinbindings.cpp:65
+#: twinbindings.cpp:67
 msgid "Pack Window Up"
 msgstr "Pacio'r Ffenestr i Fyny"
 
-#: twinbindings.cpp:67
+#: twinbindings.cpp:69
 msgid "Pack Window Down"
 msgstr "Pacio'r Ffenestr i Lawr"
 
-#: twinbindings.cpp:69
+#: twinbindings.cpp:71
 msgid "Pack Grow Window Horizontally"
 msgstr "Pacio'r Ffenestr a'i Hehangu yn Llorweddol"
 
-#: twinbindings.cpp:71
+#: twinbindings.cpp:73
 msgid "Pack Grow Window Vertically"
 msgstr "Pacio'r Ffenestr a'i Hehangu yn Fertigol"
 
-#: twinbindings.cpp:73
+#: twinbindings.cpp:75
 msgid "Pack Shrink Window Horizontally"
 msgstr "Pacio'r Ffenestr a'i Lleihau yn Llorweddol"
 
-#: twinbindings.cpp:75
+#: twinbindings.cpp:77
 msgid "Pack Shrink Window Vertically"
 msgstr "Pacio'r Ffenestr a'i Lleihau yn Fertigol"
 
-#: twinbindings.cpp:78
+#: twinbindings.cpp:80
 msgid "Window & Desktop"
 msgstr "Ffenestr & Penbwrdd"
 
-#: twinbindings.cpp:79
+#: twinbindings.cpp:81
 msgid "Keep Window on All Desktops"
 msgstr "Cadw'r Ffenestr ar Bob un Penbwrdd"
 
-#: twinbindings.cpp:81
+#: twinbindings.cpp:83
 msgid "Window to Desktop 1"
 msgstr "Ffenestr i Benbwrdd 1"
 
-#: twinbindings.cpp:82
+#: twinbindings.cpp:84
 msgid "Window to Desktop 2"
 msgstr "Ffenestr i Benbwrdd 2"
 
-#: twinbindings.cpp:83
+#: twinbindings.cpp:85
 msgid "Window to Desktop 3"
 msgstr "Ffenestr i Benbwrdd 3"
 
-#: twinbindings.cpp:84
+#: twinbindings.cpp:86
 msgid "Window to Desktop 4"
 msgstr "Ffenestr i Benbwrdd 4"
 
-#: twinbindings.cpp:85
+#: twinbindings.cpp:87
 msgid "Window to Desktop 5"
 msgstr "Ffenestr i Benbwrdd 5"
 
-#: twinbindings.cpp:86
+#: twinbindings.cpp:88
 msgid "Window to Desktop 6"
 msgstr "Ffenestr i Benbwrdd 6"
 
-#: twinbindings.cpp:87
+#: twinbindings.cpp:89
 msgid "Window to Desktop 7"
 msgstr "Ffenestr i Benbwrdd 7"
 
-#: twinbindings.cpp:88
+#: twinbindings.cpp:90
 msgid "Window to Desktop 8"
 msgstr "Ffenestr i Benbwrdd 8"
 
-#: twinbindings.cpp:89
+#: twinbindings.cpp:91
 msgid "Window to Desktop 9"
 msgstr "Ffenestr i Benbwrdd 9"
 
-#: twinbindings.cpp:90
+#: twinbindings.cpp:92
 msgid "Window to Desktop 10"
 msgstr "Ffenestr i Benbwrdd 10"
 
-#: twinbindings.cpp:91
+#: twinbindings.cpp:93
 msgid "Window to Desktop 11"
 msgstr "Ffenestr i Benbwrdd 11"
 
-#: twinbindings.cpp:92
+#: twinbindings.cpp:94
 msgid "Window to Desktop 12"
 msgstr "Ffenestr i Benbwrdd 12"
 
-#: twinbindings.cpp:93
+#: twinbindings.cpp:95
 msgid "Window to Desktop 13"
 msgstr "Ffenestr i Benbwrdd 13"
 
-#: twinbindings.cpp:94
+#: twinbindings.cpp:96
 msgid "Window to Desktop 14"
 msgstr "Ffenestr i Benbwrdd 14"
 
-#: twinbindings.cpp:95
+#: twinbindings.cpp:97
 msgid "Window to Desktop 15"
 msgstr "Ffenestr i Benbwrdd 15"
 
-#: twinbindings.cpp:96
+#: twinbindings.cpp:98
 msgid "Window to Desktop 16"
 msgstr "Ffenestr i Benbwrdd 16"
 
-#: twinbindings.cpp:97
+#: twinbindings.cpp:99
 #, fuzzy
 msgid "Window to Desktop 17"
 msgstr "Ffenestr i Benbwrdd 7"
 
-#: twinbindings.cpp:98
+#: twinbindings.cpp:100
 #, fuzzy
 msgid "Window to Desktop 18"
 msgstr "Ffenestr i Benbwrdd 8"
 
-#: twinbindings.cpp:99
+#: twinbindings.cpp:101
 #, fuzzy
 msgid "Window to Desktop 19"
 msgstr "Ffenestr i Benbwrdd 9"
 
-#: twinbindings.cpp:100
+#: twinbindings.cpp:102
 #, fuzzy
 msgid "Window to Desktop 20"
 msgstr "Ffenestr i Benbwrdd 2"
 
-#: twinbindings.cpp:101
+#: twinbindings.cpp:103
 msgid "Window to Next Desktop"
 msgstr "Ffenestr i'r Penbwrdd Nesaf"
 
-#: twinbindings.cpp:102
+#: twinbindings.cpp:104
 msgid "Window to Previous Desktop"
 msgstr "Ffenestr i'r Penbwrdd Blaenorol"
 
-#: twinbindings.cpp:103
+#: twinbindings.cpp:105
 #, fuzzy
 msgid "Window One Desktop to the Right"
 msgstr "Newid Un Penbwrdd i'r Dde"
 
-#: twinbindings.cpp:104
+#: twinbindings.cpp:106
 #, fuzzy
 msgid "Window One Desktop to the Left"
 msgstr "Newid Un Penbwrdd i'r Chwith"
 
-#: twinbindings.cpp:105
+#: twinbindings.cpp:107
 #, fuzzy
 msgid "Window One Desktop Up"
 msgstr "Ffenestr & Penbwrdd"
 
-#: twinbindings.cpp:106
+#: twinbindings.cpp:108
 #, fuzzy
 msgid "Window One Desktop Down"
 msgstr "Newid Un Penbwrdd i Lawr"
 
-#: twinbindings.cpp:108
+#: twinbindings.cpp:109
+#, fuzzy
+msgid "Window to Screen 0"
+msgstr "Sgrînlun Ffenestr"
+
+#: twinbindings.cpp:110
+#, fuzzy
+msgid "Window to Screen 1"
+msgstr "Sgrînlun Ffenestr"
+
+#: twinbindings.cpp:111
+#, fuzzy
+msgid "Window to Screen 2"
+msgstr "Sgrînlun Ffenestr"
+
+#: twinbindings.cpp:112
+#, fuzzy
+msgid "Window to Screen 3"
+msgstr "Sgrînlun Ffenestr"
+
+#: twinbindings.cpp:113
+#, fuzzy
+msgid "Window to Screen 4"
+msgstr "Sgrînlun Ffenestr"
+
+#: twinbindings.cpp:114
+#, fuzzy
+msgid "Window to Screen 5"
+msgstr "Sgrînlun Ffenestr"
+
+#: twinbindings.cpp:115
+#, fuzzy
+msgid "Window to Screen 6"
+msgstr "Sgrînlun Ffenestr"
+
+#: twinbindings.cpp:116
+#, fuzzy
+msgid "Window to Screen 7"
+msgstr "Sgrînlun Ffenestr"
+
+#: twinbindings.cpp:117
+#, fuzzy
+msgid "Window to Next Screen"
+msgstr "Ffenestr i'r Penbwrdd Nesaf"
+
+#: twinbindings.cpp:119
 msgid "Desktop Switching"
 msgstr "Newid Penbwrdd"
 
-#: twinbindings.cpp:109
+#: twinbindings.cpp:120
 msgid "Switch to Desktop 1"
 msgstr "Newid i Benbwrdd 1"
 
-#: twinbindings.cpp:110
+#: twinbindings.cpp:121
 msgid "Switch to Desktop 2"
 msgstr "Newid i Benbwrdd 2"
 
-#: twinbindings.cpp:111
+#: twinbindings.cpp:122
 msgid "Switch to Desktop 3"
 msgstr "Newid i Benbwrdd 3"
 
-#: twinbindings.cpp:112
+#: twinbindings.cpp:123
 msgid "Switch to Desktop 4"
 msgstr "Newid i Benbwrdd 4"
 
-#: twinbindings.cpp:113
+#: twinbindings.cpp:124
 msgid "Switch to Desktop 5"
 msgstr "Newid i Benbwrdd 5"
 
-#: twinbindings.cpp:114
+#: twinbindings.cpp:125
 msgid "Switch to Desktop 6"
 msgstr "Newid i Benbwrdd 6"
 
-#: twinbindings.cpp:115
+#: twinbindings.cpp:126
 msgid "Switch to Desktop 7"
 msgstr "Newid i Benbwrdd 7"
 
-#: twinbindings.cpp:116
+#: twinbindings.cpp:127
 msgid "Switch to Desktop 8"
 msgstr "Newid i Benbwrdd 8"
 
-#: twinbindings.cpp:117
+#: twinbindings.cpp:128
 msgid "Switch to Desktop 9"
 msgstr "Newid i Benbwrdd 9"
 
-#: twinbindings.cpp:118
+#: twinbindings.cpp:129
 msgid "Switch to Desktop 10"
 msgstr "Newid i Benbwrdd 10"
 
-#: twinbindings.cpp:119
+#: twinbindings.cpp:130
 msgid "Switch to Desktop 11"
 msgstr "Newid i Benbwrdd 11"
 
-#: twinbindings.cpp:120
+#: twinbindings.cpp:131
 msgid "Switch to Desktop 12"
 msgstr "Newid i Benbwrdd 12"
 
-#: twinbindings.cpp:121
+#: twinbindings.cpp:132
 msgid "Switch to Desktop 13"
 msgstr "Newid i Benbwrdd 13"
 
-#: twinbindings.cpp:122
+#: twinbindings.cpp:133
 msgid "Switch to Desktop 14"
 msgstr "Newid i Benbwrdd 14"
 
-#: twinbindings.cpp:123
+#: twinbindings.cpp:134
 msgid "Switch to Desktop 15"
 msgstr "Newid i Benbwrdd 15"
 
-#: twinbindings.cpp:124
+#: twinbindings.cpp:135
 msgid "Switch to Desktop 16"
 msgstr "Newid i Benbwrdd 16"
 
-#: twinbindings.cpp:125
+#: twinbindings.cpp:136
 #, fuzzy
 msgid "Switch to Desktop 17"
 msgstr "Newid i Benbwrdd 7"
 
-#: twinbindings.cpp:126
+#: twinbindings.cpp:137
 #, fuzzy
 msgid "Switch to Desktop 18"
 msgstr "Newid i Benbwrdd 8"
 
-#: twinbindings.cpp:127
+#: twinbindings.cpp:138
 #, fuzzy
 msgid "Switch to Desktop 19"
 msgstr "Newid i Benbwrdd 9"
 
-#: twinbindings.cpp:128
+#: twinbindings.cpp:139
 #, fuzzy
 msgid "Switch to Desktop 20"
 msgstr "Newid i Benbwrdd 2"
 
-#: twinbindings.cpp:129
+#: twinbindings.cpp:140
 msgid "Switch to Next Desktop"
 msgstr "Newid i'r Penbwrdd Nesaf"
 
-#: twinbindings.cpp:130
+#: twinbindings.cpp:141
 msgid "Switch to Previous Desktop"
 msgstr "Newid i'r Penbwrdd Blaenorol"
 
-#: twinbindings.cpp:131
+#: twinbindings.cpp:142
 msgid "Switch One Desktop to the Right"
 msgstr "Newid Un Penbwrdd i'r Dde"
 
-#: twinbindings.cpp:132
+#: twinbindings.cpp:143
 msgid "Switch One Desktop to the Left"
 msgstr "Newid Un Penbwrdd i'r Chwith"
 
-#: twinbindings.cpp:133
+#: twinbindings.cpp:144
 msgid "Switch One Desktop Up"
 msgstr "Newid Un Penbwrdd i Fynnu"
 
-#: twinbindings.cpp:134
+#: twinbindings.cpp:145
 msgid "Switch One Desktop Down"
 msgstr "Newid Un Penbwrdd i Lawr"
 
-#: twinbindings.cpp:137
-msgid "Mouse Emulation"
-msgstr "Efelychiad Llygoden"
-
-#: twinbindings.cpp:138
-msgid "Kill Window"
-msgstr "Lladd Ffenestr"
-
-#: twinbindings.cpp:139
-msgid "Window Screenshot"
-msgstr "Sgrînlun Ffenestr"
+#: twinbindings.cpp:146
+#, fuzzy
+msgid "Switch to Screen 0"
+msgstr "Newid i Benbwrdd 10"
 
-#: twinbindings.cpp:140
-msgid "Desktop Screenshot"
-msgstr "Sgrînlun Penbwrdd"
+#: twinbindings.cpp:147
+#, fuzzy
+msgid "Switch to Screen 1"
+msgstr "Newid i Benbwrdd 1"
 
-#: twinbindings.cpp:145
-msgid "Block Global Shortcuts"
-msgstr ""
+#: twinbindings.cpp:148
+#, fuzzy
+msgid "Switch to Screen 2"
+msgstr "Newid i Benbwrdd 2"
 
-#: main.cpp:65
-msgid ""
-"twin: it looks like there's already a window manager running. twin not "
-"started.\n"
-msgstr ""
-"twin: Eitha debyg mae trefnydd ffenestri yn rhedeg yn barod. Ni ddechreuwyd "
-"twin.\n"
+#: twinbindings.cpp:149
+#, fuzzy
+msgid "Switch to Screen 3"
+msgstr "Newid i Benbwrdd 3"
 
-#: main.cpp:80
-msgid "twin: failure during initialization; aborting"
-msgstr "twin: methiant yn ystod ymgychwyn, erthylir"
+#: twinbindings.cpp:150
+#, fuzzy
+msgid "Switch to Screen 4"
+msgstr "Newid i Benbwrdd 4"
 
-#: main.cpp:101
-msgid ""
-"twin: unable to claim manager selection, another wm running? (try using "
-"--replace)\n"
-msgstr ""
-"twin: Methu hawlio dewisiad trefnydd, trefnydd ffenestri arall yn rhedeg? "
-"(Ceisiwch ddefnyddio --replace)\n"
+#: twinbindings.cpp:151
+#, fuzzy
+msgid "Switch to Screen 5"
+msgstr "Newid i Benbwrdd 5"
 
-#: main.cpp:182
+#: twinbindings.cpp:152
 #, fuzzy
-msgid "TDE window manager"
-msgstr "Trefnydd Ffenestri TDE"
+msgid "Switch to Screen 6"
+msgstr "Newid i Benbwrdd 6"
 
-#: main.cpp:186
-msgid "Disable configuration options"
-msgstr "Analluogi dewisiadau ffurfweddu"
+#: twinbindings.cpp:153
+#, fuzzy
+msgid "Switch to Screen 7"
+msgstr "Newid i Benbwrdd 7"
 
-#: main.cpp:187
+#: twinbindings.cpp:154
 #, fuzzy
-msgid "Replace already-running ICCCM2.0-compliant window manager"
-msgstr ""
-"Amnewid trefnydd ffenestri sy'n cydymffurfio â ICCCM2.0 sy'n rhedeg yn barod"
+msgid "Switch to Next Screen"
+msgstr "Newid i'r Penbwrdd Nesaf"
 
-#: killer/killer.cpp:49 main.cpp:263
-msgid "KWin"
-msgstr "KWin"
+#: twinbindings.cpp:157
+msgid "Mouse Emulation"
+msgstr "Efelychiad Llygoden"
 
-#: main.cpp:265
-#, fuzzy
-msgid "(c) 1999-2005, The TDE Developers"
-msgstr "(h) 1999-2002, Y Datblygwyr TDE"
+#: twinbindings.cpp:158
+msgid "Kill Window"
+msgstr "Lladd Ffenestr"
 
-#: main.cpp:269
-msgid "Maintainer"
-msgstr "Cynhaliwr"
+#: twinbindings.cpp:159
+msgid "Window Screenshot"
+msgstr "Sgrînlun Ffenestr"
 
-#: plugins.cpp:32
-msgid "KWin: "
-msgstr "KWin:"
+#: twinbindings.cpp:160
+msgid "Desktop Screenshot"
+msgstr "Sgrînlun Penbwrdd"
 
-#: plugins.cpp:33
-msgid ""
-"\n"
-"KWin will now exit..."
+#: twinbindings.cpp:165
+msgid "Block Global Shortcuts"
 msgstr ""
-"\n"
-"Bydd KWin yn terfynu rwan..."
-
-#: tabbox.cpp:55
-#, fuzzy
-msgid "*** No Windows ***"
-msgstr "*** Dim Tasgau ***"
 
 #: useractions.cpp:62
 msgid "Keep &Above Others"
@@ -510,75 +624,89 @@ msgstr "S&grîn Llawn"
 msgid "&No Border"
 msgstr "D&im Ymyl"
 
-#: useractions.cpp:69
+#: useractions.cpp:68
+#, fuzzy
+msgid "Shad&ow"
+msgstr "Rholio"
+
+#: useractions.cpp:70
 #, fuzzy
 msgid "Window &Shortcut..."
 msgstr "Sgrînlun Ffenestr"
 
-#: useractions.cpp:70
+#: useractions.cpp:72
+#, fuzzy
+msgid "&Suspend Application"
+msgstr "Cadw Gosodiadau Ffenest&r"
+
+#: useractions.cpp:73
+msgid "&Resume Application"
+msgstr ""
+
+#: useractions.cpp:75
 #, fuzzy
 msgid "&Special Window Settings..."
 msgstr "Cadw Gosodiadau Ffenest&r"
 
-#: useractions.cpp:71
+#: useractions.cpp:76
 #, fuzzy
 msgid "&Special Application Settings..."
 msgstr "Cadw Gosodiadau Ffenest&r"
 
-#: useractions.cpp:73
+#: useractions.cpp:78
 msgid "Ad&vanced"
 msgstr "Uw&ch"
 
-#: useractions.cpp:80
+#: useractions.cpp:85
 msgid "Reset opacity to default value"
 msgstr ""
 
-#: useractions.cpp:82
+#: useractions.cpp:87
 msgid "Slide this to set the window's opacity"
 msgstr ""
 
-#: useractions.cpp:89
+#: useractions.cpp:94
 msgid "&Opacity"
 msgstr "&Didreiddiad"
 
-#: useractions.cpp:92
+#: useractions.cpp:97
 msgid "&Move"
 msgstr "Sy&mud"
 
-#: useractions.cpp:93
+#: useractions.cpp:98
 msgid "Re&size"
 msgstr "&Newid Maint"
 
-#: useractions.cpp:94
+#: useractions.cpp:99
 msgid "Mi&nimize"
 msgstr "&Lleihau"
 
-#: useractions.cpp:95
+#: useractions.cpp:100
 msgid "Ma&ximize"
 msgstr "&Ehangu"
 
-#: useractions.cpp:96
+#: useractions.cpp:101
 msgid "Sh&ade"
 msgstr "&Cysgodi"
 
-#: useractions.cpp:103
+#: useractions.cpp:108
 msgid "Configur&e Window Behavior..."
 msgstr "Ffurfw&eddu Ymddygiad Ffenestr..."
 
-#: useractions.cpp:198
+#: useractions.cpp:209
 msgid "To &Desktop"
 msgstr "I'r Penbwr&dd"
 
-#: useractions.cpp:211
+#: useractions.cpp:222
 msgid "&All Desktops"
 msgstr "&Pob Penbwrdd"
 
-#: workspace.cpp:1017 workspace.cpp:1037
+#: workspace.cpp:1182 workspace.cpp:1202
 #, c-format
 msgid "Desktop %1"
 msgstr "Penbwrdd %1"
 
-#: workspace.cpp:2397
+#: workspace.cpp:2754
 #, fuzzy
 msgid ""
 "You have selected to show a window without its border.\n"
@@ -591,7 +719,7 @@ msgstr ""
 "Defnyddiwch y ddewislen gweithrediadau ffenestri yn lle, a weithredir gan "
 "ddefnyddio'r byrlwybr allweddell %1."
 
-#: workspace.cpp:2409
+#: workspace.cpp:2766
 #, fuzzy
 msgid ""
 "You have selected to show a window in fullscreen mode.\n"
@@ -605,37 +733,32 @@ msgstr ""
 "ddewislen gweithrediadau ffenestri yn lle, a weithredir gan ddefnyddio'r "
 "byrlwybr allweddell %1."
 
-#: workspace.cpp:2446 workspace.cpp:2528
-msgid ""
-"The Composite Manager could not be started.\\nMake sure you have \"kompmgr\" in "
-"a $PATH directory."
-msgstr ""
-
-#: workspace.cpp:2506
+#: workspace.cpp:2899
 msgid ""
 "The Composite Manager crashed twice within a minute and is therefore disabled "
 "for this session."
 msgstr ""
 
-#: workspace.cpp:2507 workspace.cpp:2529 workspace.cpp:2567
+#: workspace.cpp:2900 workspace.cpp:2923 workspace.cpp:2962
 msgid "Composite Manager Failure"
 msgstr ""
 
-#: workspace.cpp:2546
+#: workspace.cpp:2941
 msgid ""
-"<qt><b>kompmgr failed to open the display</b>"
-"<br>There is probably an invalid display entry in your ~/.xcompmgrrc.</qt>"
+"<qt><b>The TDE composition manager failed to open the display</b>"
+"<br>There is probably an invalid display entry in your ~/.compton-tde.conf "
+"file.</qt>"
 msgstr ""
 
-#: workspace.cpp:2548
+#: workspace.cpp:2943
 msgid ""
-"<qt><b>kompmgr cannot find the Xrender extension</b>"
+"<qt><b>The TDE composition manager cannot find the Xrender extension</b>"
 "<br>You are using either an outdated or a crippled version of XOrg."
 "<br>Get XOrg &ge; 6.8 from www.freedesktop.org."
 "<br></qt>"
 msgstr ""
 
-#: workspace.cpp:2550
+#: workspace.cpp:2945
 msgid ""
 "<qt><b>Composite extension not found</b>"
 "<br>You <i>must</i> use XOrg &ge; 6.8 for translucency and shadows to work."
@@ -645,20 +768,21 @@ msgid ""
 "<br>EndSection</i></qt>"
 msgstr ""
 
-#: workspace.cpp:2555
+#: workspace.cpp:2950
 msgid ""
 "<qt><b>Damage extension not found</b>"
 "<br>You <i>must</i> use XOrg &ge; 6.8 for translucency and shadows to work.</qt>"
 msgstr ""
 
-#: workspace.cpp:2557
+#: workspace.cpp:2952
 msgid ""
 "<qt><b>XFixes extension not found</b>"
 "<br>You <i>must</i> use XOrg &ge; 6.8 for translucency and shadows to work.</qt>"
 msgstr ""
 
 #: killer/killer.cpp:50
-msgid "KWin helper utility"
+#, fuzzy
+msgid "TWin helper utility"
 msgstr "Defnyddioldeb gymorth KWin"
 
 #: killer/killer.cpp:67
@@ -686,58 +810,58 @@ msgstr ""
 msgid "Keep Running"
 msgstr ""
 
-#: lib/kcommondecoration.cpp:265
+#: lib/kcommondecoration.cpp:270
 msgid ""
 "_: %1 is the name of window decoration style\n"
 "<center><b>%1 preview</b></center>"
 msgstr ""
 
-#: lib/kcommondecoration.cpp:329
+#: lib/kcommondecoration.cpp:351
 msgid "Menu"
 msgstr "Dewislen"
 
-#: lib/kcommondecoration.cpp:342 lib/kcommondecoration.cpp:529
+#: lib/kcommondecoration.cpp:366 lib/kcommondecoration.cpp:554
 #, fuzzy
 msgid "Not on all desktops"
 msgstr "Cadw'r Ffenestr ar Bob un Penbwrdd"
 
-#: lib/kcommondecoration.cpp:342 lib/kcommondecoration.cpp:530
+#: lib/kcommondecoration.cpp:366 lib/kcommondecoration.cpp:555
 msgid "On all desktops"
 msgstr "Ar Bob Penbwrdd"
 
-#: lib/kcommondecoration.cpp:364
+#: lib/kcommondecoration.cpp:389
 msgid "Minimize"
 msgstr "Lleihau"
 
-#: lib/kcommondecoration.cpp:376 lib/kcommondecoration.cpp:516
+#: lib/kcommondecoration.cpp:401 lib/kcommondecoration.cpp:541
 msgid "Maximize"
 msgstr "Ehangu"
 
-#: lib/kcommondecoration.cpp:399 lib/kcommondecoration.cpp:572
+#: lib/kcommondecoration.cpp:424 lib/kcommondecoration.cpp:597
 #, fuzzy
 msgid "Do not keep above others"
 msgstr "Cadw &Uwchben y Lleill"
 
-#: lib/kcommondecoration.cpp:399 lib/kcommondecoration.cpp:572
-#: lib/kcommondecoration.cpp:596
+#: lib/kcommondecoration.cpp:424 lib/kcommondecoration.cpp:597
+#: lib/kcommondecoration.cpp:621
 msgid "Keep above others"
 msgstr "Cadw Uwchben y Lleill"
 
-#: lib/kcommondecoration.cpp:412 lib/kcommondecoration.cpp:589
+#: lib/kcommondecoration.cpp:437 lib/kcommondecoration.cpp:614
 #, fuzzy
 msgid "Do not keep below others"
 msgstr "Cadw &Dan y Lleill"
 
-#: lib/kcommondecoration.cpp:412 lib/kcommondecoration.cpp:579
-#: lib/kcommondecoration.cpp:589
+#: lib/kcommondecoration.cpp:437 lib/kcommondecoration.cpp:604
+#: lib/kcommondecoration.cpp:614
 msgid "Keep below others"
 msgstr "Cadw Dan y Lleill"
 
-#: lib/kcommondecoration.cpp:425 lib/kcommondecoration.cpp:541
+#: lib/kcommondecoration.cpp:450 lib/kcommondecoration.cpp:566
 msgid "Unshade"
 msgstr "Dat-gysgodi"
 
-#: lib/kcommondecoration.cpp:425 lib/kcommondecoration.cpp:542
+#: lib/kcommondecoration.cpp:450 lib/kcommondecoration.cpp:567
 msgid "Shade"
 msgstr "Rholio"
 
@@ -752,9 +876,13 @@ msgid "The default decoration plugin is corrupt and could not be loaded."
 msgstr "Mae'r ategyn addurno rhagosodedig yn llygredig ac ni ellid ei lwytho!"
 
 #: lib/kdecoration_plugins_p.cpp:159
-msgid "The library %1 is not a KWin plugin."
+#, fuzzy
+msgid "The library %1 is not a TWin plugin."
 msgstr "Nid yw'r rhaglengell %1 yn ategyn KWin."
 
+#~ msgid "KWin"
+#~ msgstr "KWin"
+
 #~ msgid "Window Close"
 #~ msgstr "Ffenestr Cau "
 
diff --git a/tde-i18n-cy/messages/tdebase/twin_clients.po b/tde-i18n-cy/messages/tdebase/twin_clients.po
index 2fe434379db..bf314359f11 100644
--- a/tde-i18n-cy/messages/tdebase/twin_clients.po
+++ b/tde-i18n-cy/messages/tdebase/twin_clients.po
@@ -1,112 +1,37 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdebase/twin_clients.po\n"
-"POT-Creation-Date: 2008-07-08 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: quartz/quartz.cpp:513
+msgid "Quartz"
+msgstr "Cwarts"
+
 #: b2/config/config.cpp:41 quartz/config/config.cpp:40
 msgid "Draw window frames using &titlebar colors"
 msgstr "Darlunio fframau ffenestri â lliwia'r bar &teitl"
 
-#: b2/config/config.cpp:43
-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:49
-msgid "Draw &resize handle"
-msgstr ""
-
-#: b2/config/config.cpp:51
-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:56
-msgid "Actions Settings"
-msgstr ""
-
-#: b2/config/config.cpp:58
-msgid "Double click on menu button:"
-msgstr ""
-
-#: b2/config/config.cpp:60
-msgid "Do Nothing"
-msgstr ""
-
-#: b2/config/config.cpp:61
-msgid "Minimize Window"
-msgstr "Lleihau'r Ffenestr"
-
-#: b2/config/config.cpp:62
-msgid "Shade Window"
-msgstr "Rholio'r Ffenestr"
-
-#: b2/config/config.cpp:63
-msgid "Close Window"
-msgstr "Cau'r Ffenestr"
-
-#: b2/config/config.cpp:66
+#: quartz/config/config.cpp:42
 msgid ""
-"An action can be associated to a double click of the menu button. Leave it to "
-"none if in doubt."
+"When selected, the window decoration borders are drawn using the titlebar "
+"colors; otherwise, they are drawn using normal border colors instead."
 msgstr ""
 
-#: b2/b2client.cpp:346 keramik/keramik.cpp:1036
-#: kwmtheme/kwmthemeclient.cpp:292
-msgid "Menu"
-msgstr "Dewislen"
-
-#: b2/b2client.cpp:348 b2/b2client.cpp:814 keramik/keramik.cpp:1046
-#: keramik/keramik.cpp:1431
-msgid "Not on all desktops"
+#: quartz/config/config.cpp:45
+msgid "Quartz &extra slim"
 msgstr ""
 
-#: b2/b2client.cpp:348 b2/b2client.cpp:814 keramik/keramik.cpp:1046
-#: keramik/keramik.cpp:1431
-msgid "On all desktops"
-msgstr "Ar Bob Penbwrdd"
-
-#: b2/b2client.cpp:349 keramik/keramik.cpp:1066
-#: kwmtheme/kwmthemeclient.cpp:312
-msgid "Minimize"
-msgstr "Lleihau"
-
-#: b2/b2client.cpp:349 b2/b2client.cpp:826 keramik/keramik.cpp:1075
-#: keramik/keramik.cpp:1419 kwmtheme/kwmthemeclient.cpp:320
-#: kwmtheme/kwmthemeclient.cpp:775
-msgid "Maximize"
-msgstr "Ehangu"
-
-#: b2/b2client.cpp:351 b2/b2client.cpp:859 keramik/keramik.cpp:1112
-#: keramik/keramik.cpp:1442
-msgid "Unshade"
-msgstr "Dat-gysgodi"
-
-#: b2/b2client.cpp:351 b2/b2client.cpp:859 keramik/keramik.cpp:1112
-#: keramik/keramik.cpp:1442
-msgid "Shade"
-msgstr "Rholio"
-
-#: b2/b2client.cpp:352
-msgid "Resize"
-msgstr "Newid maint"
-
-#: b2/b2client.cpp:390
-msgid "<b><center>B II preview</center></b>"
+#: quartz/config/config.cpp:47
+msgid "Quartz window decorations with extra-small title bar."
 msgstr ""
 
-#: web/Web.cpp:53
-msgid "Web"
-msgstr "Gwe"
-
 #: default/config/config.cpp:40
 msgid "Draw titlebar &stipple effect"
 msgstr "Darlunio effaith &dotwaith y bar teitl"
@@ -138,143 +63,185 @@ msgid ""
 msgstr ""
 
 #: default/kdedefault.cpp:746
-msgid "TDE2"
+msgid "KDE2"
 msgstr ""
 
-#: keramik/keramik.cpp:964
-msgid "<center><b>Keramik preview</b></center>"
+#: modernsystem/modernsys.cpp:383
+msgid "Modern System"
+msgstr "Cysawd Cyfoes"
+
+#: modernsystem/config/config.cpp:40
+msgid "&Show window resize handle"
+msgstr "&Dangos dolen newid maint ffenestr"
+
+#: modernsystem/config/config.cpp:42
+msgid ""
+"When selected, all windows are drawn with a resize handle at the lower right "
+"corner. This makes window resizing easier, especially for trackballs and other "
+"mouse replacements on laptops."
 msgstr ""
+"Pan yn ddewisiedig, darlunir pob ffenestr â dolen newid maint ar y gornel isaf "
+"ar y dde. Fe wna hyn newid maint ffenestri'n haws, yn arbennig i beli trac ac "
+"amnewidion llygoden eraill ar gliniaduron."
 
-#: keramik/keramik.cpp:1093
-msgid "Keep Above Others"
-msgstr "Cadw Uwchben y Lleill"
+#: modernsystem/config/config.cpp:52
+msgid "Here you can change the size of the resize handle."
+msgstr "Yma gallwch newid maint y ddolen newid maint."
 
-#: keramik/keramik.cpp:1102
-msgid "Keep Below Others"
-msgstr "Cadw Dan y Lleill"
+#: modernsystem/config/config.cpp:61
+msgid "Small"
+msgstr "Bach"
 
-#: redmond/redmond.cpp:353
-msgid "Redmond"
-msgstr "Redmond"
+#: modernsystem/config/config.cpp:63
+msgid "Medium"
+msgstr "Canolig"
+
+#: modernsystem/config/config.cpp:65
+msgid "Large"
+msgstr "Mawr"
+
+#: kwmtheme/cli_installer/main.cpp:12
+msgid "Installs a KWM theme"
+msgstr ""
+
+#: kwmtheme/cli_installer/main.cpp:16
+msgid "Path to a theme config file"
+msgstr ""
 
 #: kwmtheme/kwmthemeclient.cpp:260
 msgid "<center><b>KWMTheme</b></center>"
 msgstr ""
 
+#: b2/b2client.cpp:347 keramik/keramik.cpp:1053
+#: kwmtheme/kwmthemeclient.cpp:292
+msgid "Menu"
+msgstr "Dewislen"
+
 #: kwmtheme/kwmthemeclient.cpp:301 kwmtheme/kwmthemeclient.cpp:765
 msgid "Sticky"
 msgstr "Gludiog"
 
+#: b2/b2client.cpp:350 keramik/keramik.cpp:1086
+#: kwmtheme/kwmthemeclient.cpp:312
+msgid "Minimize"
+msgstr "Lleihau"
+
+#: b2/b2client.cpp:350 b2/b2client.cpp:847 keramik/keramik.cpp:1095
+#: keramik/keramik.cpp:1439 kwmtheme/kwmthemeclient.cpp:320
+#: kwmtheme/kwmthemeclient.cpp:775
+msgid "Maximize"
+msgstr "Ehangu"
+
 #: kwmtheme/kwmthemeclient.cpp:765
 msgid "Unsticky"
 msgstr ""
 
-#: kwmtheme/cli_installer/main.cpp:12
-msgid "Installs a KWM theme"
-msgstr ""
+#: redmond/redmond.cpp:353
+msgid "Redmond"
+msgstr "Redmond"
 
-#: kwmtheme/cli_installer/main.cpp:16
-msgid "Path to a theme config file"
+#: plastik/plastikclient.cpp:56
+msgid "Plastik"
+msgstr "Plastik"
+
+#: b2/b2client.cpp:349 b2/b2client.cpp:835 keramik/keramik.cpp:1065
+#: keramik/keramik.cpp:1451
+msgid "Not on all desktops"
 msgstr ""
 
-#: laptop/laptopclient.cpp:353
-msgid "Laptop"
-msgstr "Gluniadur"
+#: b2/b2client.cpp:349 b2/b2client.cpp:835 keramik/keramik.cpp:1065
+#: keramik/keramik.cpp:1451
+msgid "On all desktops"
+msgstr "Ar Bob Penbwrdd"
 
-#. i18n: file ./keramik/config/keramikconfig.ui line 16
-#: rc.cpp:3
-#, no-c-format
-msgid "Keramik"
-msgstr "Keramik"
+#: b2/b2client.cpp:352 b2/b2client.cpp:880 keramik/keramik.cpp:1132
+#: keramik/keramik.cpp:1462
+msgid "Unshade"
+msgstr "Dat-gysgodi"
 
-#. i18n: file ./keramik/config/keramikconfig.ui line 30
-#: rc.cpp:6
-#, no-c-format
-msgid "Display the window &icon in the caption bubble"
-msgstr "Dangos &eicon y ffenestr yn y swigen bennawd"
+#: b2/b2client.cpp:352 b2/b2client.cpp:880 keramik/keramik.cpp:1132
+#: keramik/keramik.cpp:1462
+msgid "Shade"
+msgstr "Rholio"
 
-#. i18n: file ./keramik/config/keramikconfig.ui line 33
-#: rc.cpp:9
-#, no-c-format
+#: b2/b2client.cpp:353
+msgid "Resize"
+msgstr "Newid maint"
+
+#: b2/b2client.cpp:391
+msgid "<b><center>B II preview</center></b>"
+msgstr ""
+
+#: b2/config/config.cpp:43
 msgid ""
-"Check this option if you want the window icon to be displayed in the caption "
-"bubble next to the titlebar text."
+"When selected, the window borders are drawn using the titlebar colors; "
+"otherwise, they are drawn using normal border colors."
 msgstr ""
-"Brithwch y dewisiad yma os ydych am ddangos eicon y ffenestr yn y swigen "
-"bennawd nesaf at destun y bar teitl."
 
-#. i18n: file ./keramik/config/keramikconfig.ui line 41
-#: rc.cpp:12
-#, no-c-format
-msgid "Draw &small caption bubbles on active windows"
-msgstr "Darlunio &swigod pennawd bach ar ffenestri gweithredol"
+#: b2/config/config.cpp:49
+msgid "Draw &resize handle"
+msgstr ""
 
-#. i18n: file ./keramik/config/keramikconfig.ui line 44
-#: rc.cpp:15
-#, no-c-format
+#: b2/config/config.cpp:51
 msgid ""
-"Check this option if you want the caption bubble to have the same size on "
-"active windows that it has on inactive ones. This option is useful for laptops "
-"or low resolution displays where you want maximize the amount of space "
-"available to the window contents."
+"When selected, decorations are drawn with a \"grab handle\" in the bottom right "
+"corner of the windows; otherwise, no grab handle is drawn."
 msgstr ""
-"Brithwch y dewisiad yma os ydych am i'r swigen bennawd gael yr un maint ar "
-"ffenestri gweithredol sydd ganddi ar rai anweithredol. Mae'r dewisiad yma'n "
-"ddefnyddiol ar gliniaduron neu ddangosyddion raddfa isel lle yr hoffech wneud y "
-"defnydd gorau o'r gofod are gael ar gyfer cynnwys ffenestri."
 
-#. i18n: file ./keramik/config/keramikconfig.ui line 52
-#: rc.cpp:18
-#, no-c-format
-msgid "Draw g&rab bars below windows"
-msgstr "Darlunio bariau &cydio o dan ffenestri"
+#: b2/config/config.cpp:56
+msgid "Actions Settings"
+msgstr ""
 
-#. i18n: file ./keramik/config/keramikconfig.ui line 55
-#: rc.cpp:21
-#, no-c-format
-msgid ""
-"Check this option if you want a grab bar to be drawn below windows. When this "
-"option is not selected only a thin border will be drawn in its place."
+#: b2/config/config.cpp:58
+msgid "Double click on menu button:"
 msgstr ""
-"Brithwch y dewisiad yma os ydych am ddarlunio bar cydio ar waelod ffenestri. "
-"Pan nad yw'r dewisiad yma wedi'i ddewis dim ond ffin tenau y darlunir yn ei le."
 
-#. i18n: file ./keramik/config/keramikconfig.ui line 63
-#: rc.cpp:24 rc.cpp:51
-#, no-c-format
-msgid "Use shadowed &text"
-msgstr "Defnyddio &testun â chysgod"
+#: b2/config/config.cpp:60
+msgid "Do Nothing"
+msgstr ""
 
-#. i18n: file ./keramik/config/keramikconfig.ui line 66
-#: rc.cpp:27 rc.cpp:54
-#, no-c-format
+#: b2/config/config.cpp:61
+msgid "Minimize Window"
+msgstr "Lleihau'r Ffenestr"
+
+#: b2/config/config.cpp:62
+msgid "Shade Window"
+msgstr "Rholio'r Ffenestr"
+
+#: b2/config/config.cpp:63
+msgid "Close Window"
+msgstr "Cau'r Ffenestr"
+
+#: b2/config/config.cpp:66
 msgid ""
-"Check this option if you want the titlebar text to have a 3D look with a shadow "
-"behind it."
+"An action can be associated to a double click of the menu button. Leave it to "
+"none if in doubt."
 msgstr ""
-"Brithwch y dewisiad yma os ydych am i destun y bar teitl gael golwg 3D â "
-"chysgod tu ôl iddo."
+
+#: web/Web.cpp:53
+msgid "Web"
+msgstr "Gwe"
 
 #. i18n: file ./plastik/config/configdialog.ui line 16
-#: rc.cpp:30
+#: rc.cpp:3
 #, no-c-format
 msgid "Config Dialog"
 msgstr ""
 
 #. i18n: file ./plastik/config/configdialog.ui line 30
-#: rc.cpp:33
+#: rc.cpp:6
 #, no-c-format
 msgid "Title &Alignment"
 msgstr ""
 
 #. i18n: file ./plastik/config/configdialog.ui line 67
-#: rc.cpp:45
+#: rc.cpp:18
 #, fuzzy, no-c-format
 msgid "Colored window border"
 msgstr "Cau'r Ffenestr"
 
 #. i18n: file ./plastik/config/configdialog.ui line 73
-#: rc.cpp:48
+#: rc.cpp:21
 #, fuzzy, no-c-format
 msgid ""
 "Check this option if the window border should be painted in the titlebar color. "
@@ -283,14 +250,30 @@ msgstr ""
 "Brithwch y dewisiad yma os ydych am ddangos eicon y ffenestr yn y swigen "
 "bennawd nesaf at destun y bar teitl."
 
+#. i18n: file ./plastik/config/configdialog.ui line 81
+#: rc.cpp:24 rc.cpp:63
+#, no-c-format
+msgid "Use shadowed &text"
+msgstr "Defnyddio &testun â chysgod"
+
+#. i18n: file ./plastik/config/configdialog.ui line 84
+#: rc.cpp:27 rc.cpp:66
+#, no-c-format
+msgid ""
+"Check this option if you want the titlebar text to have a 3D look with a shadow "
+"behind it."
+msgstr ""
+"Brithwch y dewisiad yma os ydych am i destun y bar teitl gael golwg 3D â "
+"chysgod tu ôl iddo."
+
 #. i18n: file ./plastik/config/configdialog.ui line 92
-#: rc.cpp:57
+#: rc.cpp:30
 #, no-c-format
 msgid "Animate buttons"
 msgstr ""
 
 #. i18n: file ./plastik/config/configdialog.ui line 95
-#: rc.cpp:60
+#: rc.cpp:33
 #, no-c-format
 msgid ""
 "Check this option if you want the buttons to fade in when the mouse pointer "
@@ -298,74 +281,92 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./plastik/config/configdialog.ui line 103
-#: rc.cpp:63
+#: rc.cpp:36
 #, no-c-format
 msgid "Close windows by double clicking the menu button"
 msgstr ""
 
 #. i18n: file ./plastik/config/configdialog.ui line 106
-#: rc.cpp:66
+#: rc.cpp:39
 #, no-c-format
 msgid ""
 "Check this option if you want windows to be closed when you double click the "
 "menu button, similar to Microsoft Windows."
 msgstr ""
 
-#: quartz/config/config.cpp:42
-msgid ""
-"When selected, the window decoration borders are drawn using the titlebar "
-"colors; otherwise, they are drawn using normal border colors instead."
-msgstr ""
+#. i18n: file ./keramik/config/keramikconfig.ui line 16
+#: rc.cpp:42
+#, no-c-format
+msgid "Keramik"
+msgstr "Keramik"
 
-#: quartz/config/config.cpp:45
-msgid "Quartz &extra slim"
-msgstr ""
+#. i18n: file ./keramik/config/keramikconfig.ui line 30
+#: rc.cpp:45
+#, no-c-format
+msgid "Display the window &icon in the caption bubble"
+msgstr "Dangos &eicon y ffenestr yn y swigen bennawd"
 
-#: quartz/config/config.cpp:47
-msgid "Quartz window decorations with extra-small title bar."
+#. i18n: file ./keramik/config/keramikconfig.ui line 33
+#: rc.cpp:48
+#, no-c-format
+msgid ""
+"Check this option if you want the window icon to be displayed in the caption "
+"bubble next to the titlebar text."
 msgstr ""
+"Brithwch y dewisiad yma os ydych am ddangos eicon y ffenestr yn y swigen "
+"bennawd nesaf at destun y bar teitl."
 
-#: quartz/quartz.cpp:513
-msgid "Quartz"
-msgstr "Cwarts"
-
-#: modernsystem/config/config.cpp:40
-msgid "&Show window resize handle"
-msgstr "&Dangos dolen newid maint ffenestr"
+#. i18n: file ./keramik/config/keramikconfig.ui line 41
+#: rc.cpp:51
+#, no-c-format
+msgid "Draw &small caption bubbles on active windows"
+msgstr "Darlunio &swigod pennawd bach ar ffenestri gweithredol"
 
-#: modernsystem/config/config.cpp:42
+#. i18n: file ./keramik/config/keramikconfig.ui line 44
+#: rc.cpp:54
+#, no-c-format
 msgid ""
-"When selected, all windows are drawn with a resize handle at the lower right "
-"corner. This makes window resizing easier, especially for trackballs and other "
-"mouse replacements on laptops."
+"Check this option if you want the caption bubble to have the same size on "
+"active windows that it has on inactive ones. This option is useful for laptops "
+"or low resolution displays where you want maximize the amount of space "
+"available to the window contents."
 msgstr ""
-"Pan yn ddewisiedig, darlunir pob ffenestr â dolen newid maint ar y gornel isaf "
-"ar y dde. Fe wna hyn newid maint ffenestri'n haws, yn arbennig i beli trac ac "
-"amnewidion llygoden eraill ar gliniaduron."
+"Brithwch y dewisiad yma os ydych am i'r swigen bennawd gael yr un maint ar "
+"ffenestri gweithredol sydd ganddi ar rai anweithredol. Mae'r dewisiad yma'n "
+"ddefnyddiol ar gliniaduron neu ddangosyddion raddfa isel lle yr hoffech wneud y "
+"defnydd gorau o'r gofod are gael ar gyfer cynnwys ffenestri."
 
-#: modernsystem/config/config.cpp:52
-msgid "Here you can change the size of the resize handle."
-msgstr "Yma gallwch newid maint y ddolen newid maint."
+#. i18n: file ./keramik/config/keramikconfig.ui line 52
+#: rc.cpp:57
+#, no-c-format
+msgid "Draw g&rab bars below windows"
+msgstr "Darlunio bariau &cydio o dan ffenestri"
 
-#: modernsystem/config/config.cpp:61
-msgid "Small"
-msgstr "Bach"
+#. i18n: file ./keramik/config/keramikconfig.ui line 55
+#: rc.cpp:60
+#, no-c-format
+msgid ""
+"Check this option if you want a grab bar to be drawn below windows. When this "
+"option is not selected only a thin border will be drawn in its place."
+msgstr ""
+"Brithwch y dewisiad yma os ydych am ddarlunio bar cydio ar waelod ffenestri. "
+"Pan nad yw'r dewisiad yma wedi'i ddewis dim ond ffin tenau y darlunir yn ei le."
 
-#: modernsystem/config/config.cpp:63
-msgid "Medium"
-msgstr "Canolig"
+#: keramik/keramik.cpp:965
+msgid "<center><b>Keramik preview</b></center>"
+msgstr ""
 
-#: modernsystem/config/config.cpp:65
-msgid "Large"
-msgstr "Mawr"
+#: keramik/keramik.cpp:1113
+msgid "Keep Above Others"
+msgstr "Cadw Uwchben y Lleill"
 
-#: modernsystem/modernsys.cpp:383
-msgid "Modern System"
-msgstr "Cysawd Cyfoes"
+#: keramik/keramik.cpp:1122
+msgid "Keep Below Others"
+msgstr "Cadw Dan y Lleill"
 
-#: plastik/plastikclient.cpp:56
-msgid "Plastik"
-msgstr "Plastik"
+#: laptop/laptopclient.cpp:353
+msgid "Laptop"
+msgstr "Gluniadur"
 
 #~ msgid "Keep above others"
 #~ msgstr "Cadw Uwchben y Lleill"
diff --git a/tde-i18n-cy/messages/tdebase/twin_lib.po b/tde-i18n-cy/messages/tdebase/twin_lib.po
index e3a6a3d3fd4..1f9f0fbcec1 100644
--- a/tde-i18n-cy/messages/tdebase/twin_lib.po
+++ b/tde-i18n-cy/messages/tdebase/twin_lib.po
@@ -1,74 +1,76 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2005-10-08 02:42+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kcommondecoration.cpp:265
+#: kdecoration_plugins_p.cpp:120
+msgid "No window decoration plugin library was found."
+msgstr ""
+
+#: kdecoration_plugins_p.cpp:145
+msgid "The default decoration plugin is corrupt and could not be loaded."
+msgstr ""
+
+#: kdecoration_plugins_p.cpp:159
+#, fuzzy
+msgid "The library %1 is not a TWin plugin."
+msgstr "Nid yw'r rhaglengell %1 yn ategyn KWin."
+
+#: kcommondecoration.cpp:270
 msgid ""
 "_: %1 is the name of window decoration style\n"
 "<center><b>%1 preview</b></center>"
 msgstr ""
 
-#: kcommondecoration.cpp:329
+#: kcommondecoration.cpp:351
 msgid "Menu"
 msgstr "Dewislen"
 
-#: kcommondecoration.cpp:342 kcommondecoration.cpp:529
+#: kcommondecoration.cpp:366 kcommondecoration.cpp:554
 msgid "Not on all desktops"
 msgstr ""
 
-#: kcommondecoration.cpp:342 kcommondecoration.cpp:530
+#: kcommondecoration.cpp:366 kcommondecoration.cpp:555
 msgid "On all desktops"
 msgstr "Ar Bob Penbwrdd"
 
-#: kcommondecoration.cpp:364
+#: kcommondecoration.cpp:389
 msgid "Minimize"
 msgstr "Lleihau"
 
-#: kcommondecoration.cpp:376 kcommondecoration.cpp:516
+#: kcommondecoration.cpp:401 kcommondecoration.cpp:541
 msgid "Maximize"
 msgstr "Ehangu"
 
-#: kcommondecoration.cpp:399 kcommondecoration.cpp:572
+#: kcommondecoration.cpp:424 kcommondecoration.cpp:597
 msgid "Do not keep above others"
 msgstr ""
 
-#: kcommondecoration.cpp:399 kcommondecoration.cpp:572
-#: kcommondecoration.cpp:596
+#: kcommondecoration.cpp:424 kcommondecoration.cpp:597
+#: kcommondecoration.cpp:621
 msgid "Keep above others"
 msgstr "Cadw Uwchben y Lleill"
 
-#: kcommondecoration.cpp:412 kcommondecoration.cpp:589
+#: kcommondecoration.cpp:437 kcommondecoration.cpp:614
 msgid "Do not keep below others"
 msgstr ""
 
-#: kcommondecoration.cpp:412 kcommondecoration.cpp:579
-#: kcommondecoration.cpp:589
+#: kcommondecoration.cpp:437 kcommondecoration.cpp:604
+#: kcommondecoration.cpp:614
 msgid "Keep below others"
 msgstr "Cadw Dan y Lleill"
 
-#: kcommondecoration.cpp:425 kcommondecoration.cpp:541
+#: kcommondecoration.cpp:450 kcommondecoration.cpp:566
 msgid "Unshade"
 msgstr "Dat-gysgodi"
 
-#: kcommondecoration.cpp:425 kcommondecoration.cpp:542
+#: kcommondecoration.cpp:450 kcommondecoration.cpp:567
 msgid "Shade"
 msgstr "Rholio"
-
-#: kdecoration_plugins_p.cpp:120
-msgid "No window decoration plugin library was found."
-msgstr ""
-
-#: kdecoration_plugins_p.cpp:145
-msgid "The default decoration plugin is corrupt and could not be loaded."
-msgstr ""
-
-#: kdecoration_plugins_p.cpp:159
-msgid "The library %1 is not a KWin plugin."
-msgstr "Nid yw'r rhaglengell %1 yn ategyn KWin."
diff --git a/tde-i18n-cy/messages/tdebase/useraccount.po b/tde-i18n-cy/messages/tdebase/useraccount.po
index f7ce9c55f71..f211d33b0f8 100644
--- a/tde-i18n-cy/messages/tdebase/useraccount.po
+++ b/tde-i18n-cy/messages/tdebase/useraccount.po
@@ -3,10 +3,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: useraccount\n"
-"POT-Creation-Date: 2008-07-08 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-07-04 12:39+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -144,7 +145,7 @@ msgstr "Bu gwall wrth gadw'r ddelwedd: %1"
 msgid "Your administrator has disallowed changing your image."
 msgstr "Mae eich gweinyddwr wedi atal newid eich delwedd."
 
-#: main.cpp:334
+#: main.cpp:333
 msgid ""
 "%1 does not appear to be an image file.\n"
 "Please use files with these extensions:\n"
diff --git a/tde-i18n-cy/messages/tdeedu/blinken.po b/tde-i18n-cy/messages/tdeedu/blinken.po
index e7a4b6b803f..76d37d2b50a 100644
--- a/tde-i18n-cy/messages/tdeedu/blinken.po
+++ b/tde-i18n-cy/messages/tdeedu/blinken.po
@@ -3,10 +3,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: blinken\n"
-"POT-Creation-Date: 2006-02-24 03:55+0100\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2005-11-01 13:36+0000\n"
 "Last-Translator: Kevin Donnelly <kevin@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -36,7 +37,7 @@ msgstr "Sŵn wedi'i Analluogi"
 msgid ""
 "_: If the Steve font that is used by bliken by default to show status messages "
 "does not support any of the characters of your language, please translate that "
-"message to 1 and TDE standard font will be used to show the texts, if not "
+"message to 1 and KDE standard font will be used to show the texts, if not "
 "translate it to 0\n"
 "0"
 msgstr ""
diff --git a/tde-i18n-cy/messages/tdeedu/kalzium.po b/tde-i18n-cy/messages/tdeedu/kalzium.po
index 8f47fb9909d..26c845f641c 100644
--- a/tde-i18n-cy/messages/tdeedu/kalzium.po
+++ b/tde-i18n-cy/messages/tdeedu/kalzium.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdeedu/kalzium.po\n"
-"POT-Creation-Date: 2008-07-08 01:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -4438,11 +4439,11 @@ msgstr ""
 msgid "Save Spectrum"
 msgstr ""
 
-#: spectrumviewimpl.cpp:43
+#: spectrumviewimpl.cpp:44
 msgid "The spectrum could not be saved"
 msgstr ""
 
-#: spectrumviewimpl.cpp:43
+#: spectrumviewimpl.cpp:44
 msgid "Image Could Not Be Saved"
 msgstr ""
 
diff --git a/tde-i18n-cy/messages/tdeedu/kanagram.po b/tde-i18n-cy/messages/tdeedu/kanagram.po
index c8e7d88d0ad..bdd69c62888 100644
--- a/tde-i18n-cy/messages/tdeedu/kanagram.po
+++ b/tde-i18n-cy/messages/tdeedu/kanagram.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2008-07-08 01:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -62,7 +63,8 @@ msgid "About Kanagram"
 msgstr ""
 
 #: kanagram.cpp:270
-msgid "About TDE"
+#, fuzzy
+msgid "About KDE"
 msgstr "Ynglyn a Kde"
 
 #: kanagram.cpp:277
@@ -83,19 +85,19 @@ msgid "Quit Kanagram"
 msgstr ""
 
 #. i18n: file ./mainsettingswidget.ui line 16
-#: kanagram.cpp:743 rc.cpp:51
+#: kanagram.cpp:743 rc.cpp:94
 #, no-c-format
 msgid "General"
 msgstr "Cyffredinol"
 
 #. i18n: file ./vocabsettingswidget.ui line 16
-#: kanagram.cpp:745 rc.cpp:99
+#: kanagram.cpp:745 rc.cpp:64
 #, no-c-format
 msgid "Vocabularies"
 msgstr ""
 
 #. i18n: file ./newstuffwidget.ui line 16
-#: kanagram.cpp:746 rc.cpp:129
+#: kanagram.cpp:746 rc.cpp:51
 #, no-c-format
 msgid "New Stuff"
 msgstr ""
@@ -307,155 +309,155 @@ msgstr "Awgrym :"
 msgid "The selected hint. Add a hint to aid in guessing the word."
 msgstr ""
 
-#. i18n: file ./mainsettingswidget.ui line 19
+#. i18n: file ./newstuffwidget.ui line 31
 #: rc.cpp:54
 #, no-c-format
 msgid ""
+"Kanagram allows you to download\n"
+"new data from the Internet.\n"
+"\n"
+"If you are connected to the Internet, press \n"
+"the button to get new vocabulary files."
+msgstr ""
+
+#. i18n: file ./newstuffwidget.ui line 56
+#: rc.cpp:61
+#, no-c-format
+msgid "Download New Vocabularies"
+msgstr ""
+
+#. i18n: file ./vocabsettingswidget.ui line 43
+#: rc.cpp:67
+#, no-c-format
+msgid "Create New"
+msgstr "Creu Newydd"
+
+#. i18n: file ./vocabsettingswidget.ui line 46
+#: rc.cpp:70
+#, no-c-format
+msgid "Creates a new vocabulary."
+msgstr ""
+
+#. i18n: file ./vocabsettingswidget.ui line 57
+#: rc.cpp:76
+#, no-c-format
+msgid "Edits the selected vocabulary."
+msgstr ""
+
+#. i18n: file ./vocabsettingswidget.ui line 68
+#: rc.cpp:82
+#, no-c-format
+msgid "Deletes the selected vocabulary."
+msgstr ""
+
+#. i18n: file ./vocabsettingswidget.ui line 76
+#: rc.cpp:85
+#, no-c-format
+msgid "Title"
+msgstr "Teitl"
+
+#. i18n: file ./vocabsettingswidget.ui line 87
+#: rc.cpp:88
+#, no-c-format
+msgid "Description"
+msgstr "Disgrifiad"
+
+#. i18n: file ./vocabsettingswidget.ui line 106
+#: rc.cpp:91
+#, no-c-format
+msgid "The list of installed vocabularies."
+msgstr ""
+
+#. i18n: file ./mainsettingswidget.ui line 19
+#: rc.cpp:97
+#, no-c-format
+msgid ""
 "This setting allows you to set the length of time that Kanagram's hint bubble "
 "is shown."
 msgstr ""
 
 #. i18n: file ./mainsettingswidget.ui line 30
-#: rc.cpp:57
+#: rc.cpp:100
 #, fuzzy, no-c-format
 msgid "Hints"
 msgstr "Awgrym"
 
 #. i18n: file ./mainsettingswidget.ui line 41
-#: rc.cpp:60
+#: rc.cpp:103
 #, no-c-format
 msgid "Auto-hide hints after:"
 msgstr ""
 
 #. i18n: file ./mainsettingswidget.ui line 47
-#: rc.cpp:63
+#: rc.cpp:106
 #, no-c-format
 msgid "Do Not Auto-Hide Hints"
 msgstr ""
 
 #. i18n: file ./mainsettingswidget.ui line 52
-#: rc.cpp:66
+#: rc.cpp:109
 #, no-c-format
 msgid "3 Seconds"
 msgstr ""
 
 #. i18n: file ./mainsettingswidget.ui line 57
-#: rc.cpp:69
+#: rc.cpp:112
 #, no-c-format
 msgid "5 Seconds"
 msgstr ""
 
 #. i18n: file ./mainsettingswidget.ui line 62
-#: rc.cpp:72
+#: rc.cpp:115
 #, no-c-format
 msgid "7 Seconds"
 msgstr ""
 
 #. i18n: file ./mainsettingswidget.ui line 67
-#: rc.cpp:75
+#: rc.cpp:118
 #, no-c-format
 msgid "9 Seconds"
 msgstr ""
 
 #. i18n: file ./mainsettingswidget.ui line 81
-#: rc.cpp:78
+#: rc.cpp:121
 #, no-c-format
 msgid "Vocabulary Options"
 msgstr ""
 
 #. i18n: file ./mainsettingswidget.ui line 100
-#: rc.cpp:81
+#: rc.cpp:124
 #, no-c-format
 msgid "Play using:"
 msgstr ""
 
 #. i18n: file ./mainsettingswidget.ui line 128
-#: rc.cpp:84
+#: rc.cpp:127
 #, no-c-format
 msgid "Use standard fonts"
 msgstr ""
 
 #. i18n: file ./mainsettingswidget.ui line 134
-#: rc.cpp:87
+#: rc.cpp:130
 #, no-c-format
 msgid "Uses a standard font for the chalkboard/interface."
 msgstr ""
 
 #. i18n: file ./mainsettingswidget.ui line 142
-#: rc.cpp:90
+#: rc.cpp:133
 #, no-c-format
 msgid "Get Chalk Font"
 msgstr ""
 
 #. i18n: file ./mainsettingswidget.ui line 152
-#: rc.cpp:93
+#: rc.cpp:136
 #, no-c-format
 msgid "Use sou&nds"
 msgstr "Defnydd&io sain"
 
 #. i18n: file ./mainsettingswidget.ui line 155
-#: rc.cpp:96
-#, no-c-format
-msgid "Turns sounds on/off."
-msgstr ""
-
-#. i18n: file ./vocabsettingswidget.ui line 43
-#: rc.cpp:102
-#, no-c-format
-msgid "Create New"
-msgstr "Creu Newydd"
-
-#. i18n: file ./vocabsettingswidget.ui line 46
-#: rc.cpp:105
-#, no-c-format
-msgid "Creates a new vocabulary."
-msgstr ""
-
-#. i18n: file ./vocabsettingswidget.ui line 57
-#: rc.cpp:111
-#, no-c-format
-msgid "Edits the selected vocabulary."
-msgstr ""
-
-#. i18n: file ./vocabsettingswidget.ui line 68
-#: rc.cpp:117
-#, no-c-format
-msgid "Deletes the selected vocabulary."
-msgstr ""
-
-#. i18n: file ./vocabsettingswidget.ui line 76
-#: rc.cpp:120
-#, no-c-format
-msgid "Title"
-msgstr "Teitl"
-
-#. i18n: file ./vocabsettingswidget.ui line 87
-#: rc.cpp:123
-#, no-c-format
-msgid "Description"
-msgstr "Disgrifiad"
-
-#. i18n: file ./vocabsettingswidget.ui line 106
-#: rc.cpp:126
-#, no-c-format
-msgid "The list of installed vocabularies."
-msgstr ""
-
-#. i18n: file ./newstuffwidget.ui line 31
-#: rc.cpp:132
-#, no-c-format
-msgid ""
-"Kanagram allows you to download\n"
-"new data from the Internet.\n"
-"\n"
-"If you are connected to the Internet, press \n"
-"the button to get new vocabulary files."
-msgstr ""
-
-#. i18n: file ./newstuffwidget.ui line 56
 #: rc.cpp:139
 #, no-c-format
-msgid "Download New Vocabularies"
+msgid "Turns sounds on/off."
 msgstr ""
 
 #: vocabedit.cpp:117
diff --git a/tde-i18n-cy/messages/tdeedu/kbruch.po b/tde-i18n-cy/messages/tdeedu/kbruch.po
index dddb4af8ad2..7f2719328fe 100644
--- a/tde-i18n-cy/messages/tdeedu/kbruch.po
+++ b/tde-i18n-cy/messages/tdeedu/kbruch.po
@@ -3,15 +3,28 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kbruch\n"
-"POT-Creation-Date: 2008-07-08 01:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2005-11-02 21:59+0000\n"
 "Last-Translator: Kevin Donnelly <kevin@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10\n"
 
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Kyfieithu: KD"
+
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "kyfieithu@dotmon.com"
+
 #: exercisecompare.cpp:90
 msgid "Click on this button to change the comparison sign."
 msgstr "Cliciwch ar y botwm yma i newid yr arwydd cymharu."
@@ -63,21 +76,9 @@ msgstr "CYWIR"
 msgid "N&ext Task"
 msgstr "Tasg &Nesaf"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Kyfieithu: KD"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "kyfieithu@dotmon.com"
-
-#: kbruch.h:32
-msgid "KBruch"
-msgstr "KBruch"
+#: kbruch.cpp:42
+msgid "Learn calculating with fractions"
+msgstr "Dysgu cyfrifiannu efo ffracsiynau"
 
 #: exerciseconvert.cpp:89 taskview.cpp:88
 msgid "Enter the numerator of your result"
@@ -96,19 +97,17 @@ msgstr ""
 "Cliciwch ar y botwm yma i wirio eich canlyniad.  Ni fydd y botwm yn gweithio os "
 "nad ydych wedi rhoi canlyniad eto."
 
-#: taskview.cpp:169
-msgid "In this exercise you have to solve a given task with fractions."
-msgstr "Yn yr ymarfer yma, rhaid i chi ddatrys tasg benodol efo ffracsiynau."
+#: exerciseconvert.cpp:170
+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."
 
-#: taskview.cpp:170
+#: exerciseconvert.cpp:171
 msgid ""
-"In this exercise you have to solve the generated task. You have to enter "
-"numerator and denominator. You can adjust the difficulty of the task with the "
-"boxes in the toolbar. Do not forget to reduce the result!"
+"In this exercise you have to convert a given number into a fraction by entering "
+"numerator and denominator. Do not forget to reduce the result!"
 msgstr ""
-"Yn yr ymarfer yma, rhaid i chi ddatrys y dasg wedi'i chreu.  Rhaid i chi roi'r "
-"rhifiadur a'r enwadur.  Cewch addasu anhawster y dasg efo'r blychau yn y bar "
-"offer.  Peidiwch ag anghofio lleihau'r canlyniad!"
+"Yn yr ymarfer yma, rhaid i chi drosi rhif i ffracsiwn gan roi rhifiadur ac "
+"enwadur.  Peidiwch ag anghofio lleihau'r canlyniad!"
 
 #: exerciseconvert.cpp:406 taskview.cpp:332
 msgid ""
@@ -128,16 +127,6 @@ msgstr ""
 "Rhowch eich canlyniadau wedi'u lleihau o hyd.  Bydd y dasg hon yn cael ei "
 "chyfrif fel heb ei datrys yn gywir."
 
-#: taskwidget.cpp:107
-msgid ""
-"_: division symbol\n"
-"/"
-msgstr "/"
-
-#: kbruch.cpp:42
-msgid "Learn calculating with fractions"
-msgstr "Dysgu cyfrifiannu efo ffracsiynau"
-
 #. i18n: file kbruchui.rc line 4
 #: rc.cpp:3
 #, no-c-format
@@ -434,6 +423,30 @@ msgstr ""
 msgid "Task Viewer Settings"
 msgstr "Gosodiadau Gwelydd Tasg"
 
+#: taskview.cpp:169
+msgid "In this exercise you have to solve a given task with fractions."
+msgstr "Yn yr ymarfer yma, rhaid i chi ddatrys tasg benodol efo ffracsiynau."
+
+#: taskview.cpp:170
+msgid ""
+"In this exercise you have to solve the generated task. You have to enter "
+"numerator and denominator. You can adjust the difficulty of the task with the "
+"boxes in the toolbar. Do not forget to reduce the result!"
+msgstr ""
+"Yn yr ymarfer yma, rhaid i chi ddatrys y dasg wedi'i chreu.  Rhaid i chi roi'r "
+"rhifiadur a'r enwadur.  Cewch addasu anhawster y dasg efo'r blychau yn y bar "
+"offer.  Peidiwch ag anghofio lleihau'r canlyniad!"
+
+#: kbruch.h:32
+msgid "KBruch"
+msgstr "KBruch"
+
+#: taskwidget.cpp:107
+msgid ""
+"_: division symbol\n"
+"/"
+msgstr "/"
+
 #: exercisefactorize.cpp:121
 msgid "2"
 msgstr "2"
@@ -571,15 +584,3 @@ msgstr ""
 "ydych yn ei wneud.  Cewch ailosod yr ystadegau gan glicio ar y botwm isod.  "
 "Hefyd, os nad ydych eisiau gweld yr ystadegau, defnyddiwch y bar fertigol ar y "
 "chwith i leihau maint rhan yma'r ffenestr."
-
-#: exerciseconvert.cpp:170
-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."
-
-#: exerciseconvert.cpp:171
-msgid ""
-"In this exercise you have to convert a given number into a fraction by entering "
-"numerator and denominator. Do not forget to reduce the result!"
-msgstr ""
-"Yn yr ymarfer yma, rhaid i chi drosi rhif i ffracsiwn gan roi rhifiadur ac "
-"enwadur.  Peidiwch ag anghofio lleihau'r canlyniad!"
diff --git a/tde-i18n-cy/messages/tdeedu/keduca.po b/tde-i18n-cy/messages/tdeedu/keduca.po
index fe52c38524d..b454acc0722 100644
--- a/tde-i18n-cy/messages/tdeedu/keduca.po
+++ b/tde-i18n-cy/messages/tdeedu/keduca.po
@@ -1,260 +1,244 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdeedu/keduca.po\n"
-"POT-Creation-Date: 2008-07-08 01:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: keducabuilder/main.cpp:26
-msgid "Form-based tests and exams builder"
-msgstr ""
-
-#: keduca/main.cpp:30 keducabuilder/main.cpp:31
-msgid "File to load"
-msgstr "Ffeil i lwytho"
-
-#: keducabuilder/main.cpp:37
-msgid "KEducaBuilder"
-msgstr ""
-
-#: keduca/main.cpp:39 keducabuilder/main.cpp:40
-msgid "Original Author"
-msgstr "Awdur Gwreiddiol"
-
-#: keduca/main.cpp:40 keducabuilder/main.cpp:41
-msgid "Maintainer 2002-2004"
-msgstr ""
-
-#: keduca/main.cpp:42 keducabuilder/main.cpp:42
-msgid "Various fixes and cleanups"
-msgstr ""
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "KD wrth KGyfieithu"
 
-#: keduca/main.cpp:44 keducabuilder/main.cpp:43
-msgid "Icons"
-msgstr "Eiconau"
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "kyfieithu@dotmon.com"
 
-#: keducabuilder/kcontrolheader.cpp:30
+#: kcontrolheader.cpp:30
 msgid "Document Information"
 msgstr "Gwybodaeth am y Ddogfen"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 119
-#: keducabuilder/kcontrolheader.cpp:77 rc.cpp:104
+#. i18n: file kcontrolheaderbase.ui line 119
+#: kcontrolheader.cpp:77 rc.cpp:98
 #, no-c-format
 msgid "Description and rules of the project."
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 129
-#: keducabuilder/kcontrolheader.cpp:83 rc.cpp:107 rc.cpp:191
+#. i18n: file kcontrolheaderbase.ui line 129
+#: kcontrolheader.cpp:83 rc.cpp:101
 #, no-c-format
 msgid "Description"
 msgstr "Disgrifiad"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 173
-#: keducabuilder/kcontrolheader.cpp:97 rc.cpp:119
+#. i18n: file kcontrolheaderbase.ui line 173
+#: kcontrolheader.cpp:97 rc.cpp:113
 #, no-c-format
 msgid "Type:"
 msgstr "Math:"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 224
-#: keducabuilder/kcontrolheader.cpp:110 rc.cpp:122
+#. i18n: file kcontrolheaderbase.ui line 224
+#: kcontrolheader.cpp:110 rc.cpp:116
 #, no-c-format
 msgid "Level:"
 msgstr "Lefel :"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 151
-#: keducabuilder/kcontrolheader.cpp:119 rc.cpp:113
+#. i18n: file kcontrolheaderbase.ui line 151
+#: kcontrolheader.cpp:119 rc.cpp:107
 #, no-c-format
 msgid "Language:"
 msgstr "Iaith:"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 162
-#: keducabuilder/kcontrolheader.cpp:128 rc.cpp:116
+#. i18n: file kcontrolheaderbase.ui line 162
+#: kcontrolheader.cpp:128 rc.cpp:110
 #, no-c-format
 msgid "Category:"
 msgstr "Categori :"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 140
-#: keducabuilder/kcontrolheader.cpp:140 rc.cpp:110
+#. i18n: file kcontrolheaderbase.ui line 140
+#: kcontrolheader.cpp:140 rc.cpp:104
 #, no-c-format
 msgid "Title:"
 msgstr "Teitl:"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 252
-#: keducabuilder/kcontrolheader.cpp:148 rc.cpp:125
+#. i18n: file kcontrolheaderbase.ui line 252
+#: kcontrolheader.cpp:148 rc.cpp:119
 #, no-c-format
 msgid "Picture"
 msgstr "Llun"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 263
-#: keducabuilder/kcontrolheader.cpp:158 rc.cpp:128
+#. i18n: file kcontrolheaderbase.ui line 263
+#: kcontrolheader.cpp:158 rc.cpp:122
 #, no-c-format
 msgid "Default picture:"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 281
-#: keducabuilder/kcontrolheader.cpp:166 rc.cpp:131 rc.cpp:203
+#. i18n: file kcontrolheaderbase.ui line 281
+#: kcontrolheader.cpp:166 rc.cpp:125
 #, no-c-format
 msgid "Author"
 msgstr "Awdur"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 318
-#: keducabuilder/kcontrolheader.cpp:184 rc.cpp:137
+#. i18n: file kcontrolheaderbase.ui line 318
+#: kcontrolheader.cpp:184 rc.cpp:131
 #, no-c-format
 msgid "Web page:"
 msgstr "Tudalen wê:"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 329
-#: keducabuilder/kcontrolheader.cpp:190 rc.cpp:140
+#. i18n: file kcontrolheaderbase.ui line 329
+#: kcontrolheader.cpp:190 rc.cpp:134
 #, no-c-format
 msgid "Email:"
 msgstr "Ebost:"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 292
-#: keducabuilder/kcontrolheader.cpp:196 rc.cpp:134 rc.cpp:176
+#. i18n: file kcontrolheaderbase.ui line 292
+#: kcontrolheader.cpp:196 rc.cpp:128
 #, no-c-format
 msgid "Name:"
 msgstr "Enw:"
 
-#: keducabuilder/kcontrolheader.cpp:340
+#: kcontrolheader.cpp:340
 msgid "Computers"
 msgstr "Cyfrifiaduron"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 206
-#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
-#: rc.cpp:34
+#. i18n: file kcontroladdeditbase.ui line 206
+#: kcontrolheader.cpp:346 keducabuilder.cpp:487 rc.cpp:28
 #, no-c-format
 msgid "Test"
 msgstr "Profi"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 211
-#: keducabuilder/kcontrolheader.cpp:347 rc.cpp:37
+#. i18n: file kcontroladdeditbase.ui line 211
+#: kcontrolheader.cpp:347 rc.cpp:31
 #, no-c-format
 msgid "Test with Question Points"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 216
-#: keducabuilder/kcontrolheader.cpp:348 rc.cpp:40
+#. i18n: file kcontroladdeditbase.ui line 216
+#: kcontrolheader.cpp:348 rc.cpp:34
 #, no-c-format
 msgid "Test with Answers Points"
 msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:349
+#: kcontrolheader.cpp:349
 msgid "Slidershow"
 msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:350
+#: kcontrolheader.cpp:350
 msgid "Exam"
 msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:351
+#: kcontrolheader.cpp:351
 msgid "Psychotechnic Test"
 msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:354
+#: kcontrolheader.cpp:354
 msgid "Easy"
 msgstr "Hawdd"
 
-#: keducabuilder/kcontrolheader.cpp:355
+#: kcontrolheader.cpp:355
 msgid "Normal"
 msgstr "Arferol"
 
-#: keducabuilder/kcontrolheader.cpp:356
+#: kcontrolheader.cpp:356
 msgid "Expert"
 msgstr "Hen law"
 
-#: keducabuilder/kcontrolheader.cpp:357
+#: kcontrolheader.cpp:357
 msgid "Supreme"
 msgstr ""
 
-#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
+#: keducabuilder.cpp:116
 msgid "Open &Gallery..."
 msgstr ""
 
-#: keducabuilder/keducabuilder.cpp:121
+#: keducabuilder.cpp:121
 msgid "Document Info"
 msgstr ""
 
-#: keducabuilder/keducabuilder.cpp:124
+#: keducabuilder.cpp:124
 msgid "&Add..."
 msgstr "Ychw&anegu..."
 
-#: keducabuilder/keducabuilder.cpp:125
+#: keducabuilder.cpp:125
 msgid "&Edit..."
 msgstr "&Golygu..."
 
-#: keducabuilder/keducabuilder.cpp:127
+#: keducabuilder.cpp:127
 msgid "&Up"
 msgstr "I &Fyny"
 
-#: keducabuilder/keducabuilder.cpp:128
+#: keducabuilder.cpp:128
 msgid "&Down"
 msgstr "I &Lawr"
 
-#: keducabuilder/keducabuilder.cpp:139
+#: keducabuilder.cpp:139
 msgid "Welcome To KEduca!"
 msgstr ""
 
-#: keducabuilder/keducabuilder.cpp:140
+#: keducabuilder.cpp:140
 msgid ""
 "Add a new Question by using the Edit Menu or by choosing one of the icons "
 "above."
 msgstr ""
 
-#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
+#: keducabuilder.cpp:151
 msgid "Open Educa File"
 msgstr ""
 
-#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
+#: keducabuilder.cpp:192
 msgid "Answers"
 msgstr ""
 
-#: keducabuilder/keducabuilder.cpp:222
+#: keducabuilder.cpp:222
 msgid "Question Image"
 msgstr ""
 
-#: keducabuilder/keducabuilder.cpp:228
+#: keducabuilder.cpp:228
 msgid "Question point"
 msgstr ""
 
-#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
+#: keducabuilder.cpp:234
 msgid "Time"
 msgstr "Amser"
 
-#: keducabuilder/keducabuilder.cpp:236
+#: keducabuilder.cpp:236
 msgid " seconds</p>"
 msgstr ""
 
-#: keducabuilder/keducabuilder.cpp:241
+#: keducabuilder.cpp:241
 msgid "Tip"
 msgstr ""
 
-#: keducabuilder/keducabuilder.cpp:249
+#: keducabuilder.cpp:249
 msgid "Explain"
 msgstr ""
 
-#: keducabuilder/keducabuilder.cpp:286
+#: keducabuilder.cpp:286
 msgid ""
 "The document \"%1\" has been modified.\n"
 "Do you want to save it?"
 msgstr ""
 
-#: keducabuilder/keducabuilder.cpp:288
+#: keducabuilder.cpp:288
 msgid "Save Document?"
 msgstr ""
 
-#: keducabuilder/keducabuilder.cpp:409
+#: keducabuilder.cpp:409
 msgid "Compress the file"
 msgstr ""
 
-#: keducabuilder/keducabuilder.cpp:413
+#: keducabuilder.cpp:413
 msgid "Save Document As"
 msgstr "Cadw'r Ddogfen Fel"
 
-#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
+#: keducabuilder.cpp:450
 msgid ""
 "A document with this name already exists.\n"
 "Do you want to overwrite it?"
@@ -262,31 +246,31 @@ msgstr ""
 "Mae dogfen efo'r enw hwn yn bodoli eisoes.\n"
 "Ydych eisiau ei throsysgrifo?"
 
-#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+#: keducabuilder.cpp:452
 msgid "Overwrite"
 msgstr "Trosysgrifo"
 
-#: keducabuilder/keducabuilder.cpp:462
+#: keducabuilder.cpp:462
 msgid ""
 "If you want to share this document, it is better to copy the images to the same "
 "folder as the document.\n"
 "Do you want to copy images?"
 msgstr ""
 
-#: keducabuilder/keducabuilder.cpp:464
+#: keducabuilder.cpp:464
 msgid "Copy Images"
 msgstr ""
 
-#: keducabuilder/keducabuilder.cpp:464
+#: keducabuilder.cpp:464
 msgid "Do Not Copy"
 msgstr ""
 
-#: keducabuilder/keducabuilder.cpp:488
+#: keducabuilder.cpp:488
 #, c-format
 msgid "Print %1"
 msgstr "Argraffu %1"
 
-#: keducabuilder/keducabuilder.cpp:536
+#: keducabuilder.cpp:536
 msgid ""
 "Unable to save file.\n"
 "\n"
@@ -294,243 +278,33 @@ msgid ""
 "(Only the description is necessary)"
 msgstr ""
 
-#: keducabuilder/keducabuilder.cpp:536
+#: keducabuilder.cpp:536
 msgid "Complete Document Info..."
 msgstr ""
 
-#: keducabuilder/keducabuilder.cpp:546
+#: keducabuilder.cpp:546
 msgid ""
 "Unable to save file.\n"
 "\n"
 "You must insert a question."
 msgstr ""
 
-#: keducabuilder/keducabuilder.cpp:547
+#: keducabuilder.cpp:547
 msgid "Insert Question"
 msgstr ""
 
-#: keducabuilder/keducaeditorstartdialog.cpp:109
-#: libkeduca/kgallerydialog.cpp:182
+#: keducaeditorstartdialog.cpp:109
 msgid "You need to specify the file to open!"
 msgstr ""
 
-#: keducabuilder/kcontroladdedit.cpp:56
-msgid "Modify Question"
-msgstr ""
-
-#: keducabuilder/kcontroladdedit.cpp:59
-msgid "Add Questions"
-msgstr ""
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 592
-#: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
-#: keducabuilder/kcontroladdedit.cpp:183 keducabuilder/kcontroladdedit.cpp:220
-#: rc.cpp:74
-#, no-c-format
-msgid "True"
-msgstr "Gwir"
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 587
-#: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
-#: rc.cpp:71
-#, no-c-format
-msgid "False"
-msgstr "Ffug"
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 696
-#: keducabuilder/kcontroladdedit.cpp:108 rc.cpp:89
-#, no-c-format
-msgid "&Add"
-msgstr "&Ychwanegu"
-
-#: libkeduca/kgallerydialog.cpp:168
-msgid "You need to specify a server!"
-msgstr ""
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "KD wrth KGyfieithu"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "kyfieithu@dotmon.com"
-
-#: keduca/keducaprefs.cpp:41
-msgid "Various Settings"
-msgstr "Gosodiadau Amrywiol"
-
-#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
-msgid "General"
-msgstr "Cyffredinol"
-
-#: keduca/keducaprefs.cpp:56
-msgid "Show results of the answer after press next"
-msgstr ""
-
-#: keduca/keducaprefs.cpp:60
-msgid "Show results when finish the test"
-msgstr ""
-
-#: keduca/keducaprefs.cpp:64
-msgid "Order"
-msgstr "Trefn"
-
-#. i18n: file ./keduca/configdialogbase.ui line 67
-#: keduca/keducaprefs.cpp:74 rc.cpp:233
-#, no-c-format
-msgid "Show questions in random order"
-msgstr ""
-
-#. i18n: file ./keduca/configdialogbase.ui line 75
-#: keduca/keducaprefs.cpp:78 rc.cpp:236
-#, no-c-format
-msgid "Show answers in random order"
-msgstr ""
-
-#: keduca/main.cpp:25
-msgid "Form-based tests and exams"
-msgstr ""
-
-#: keduca/main.cpp:36
-msgid "KEduca"
-msgstr "KEduca"
-
-#: keduca/main.cpp:41
-msgid "Current Maintainer"
-msgstr "Cynhaliwr Cyfredol"
-
-#: keduca/keduca_part.cpp:59
-msgid "KEducaPart"
-msgstr ""
-
-#: keduca/keduca_part.cpp:60
-msgid "KEduca KParts Component"
-msgstr ""
-
-#: keduca/keducaview.cpp:71
-msgid "&Start Test"
-msgstr ""
-
-#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
-msgid "&Next >>"
-msgstr "&Nesaf >>"
-
-#: keduca/keducaview.cpp:89
-msgid "&Save Results..."
-msgstr ""
-
-#: keduca/keducaview.cpp:151
-msgid "Save Results As"
-msgstr "Cadw'r Canlyniadau Fel"
-
-#: keduca/keducaview.cpp:192
-msgid "Save failed."
-msgstr "Methodd y cadw."
-
-#: keduca/keducaview.cpp:212
-#, c-format
-msgid "Question %1"
-msgstr "Cwestiwn %1"
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 664
-#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482 rc.cpp:86
-#, no-c-format
-msgid "Points"
-msgstr "Pwyntiau:"
-
-#: keduca/keducaview.cpp:267
-msgid ""
-"You have %1 seconds to complete this question.\n"
-"\n"
-"Press OK when you are ready."
-msgstr ""
-
-#: keduca/keducaview.cpp:376
-msgid "Result"
-msgstr "Canlyniad"
-
-#: keduca/keducaview.cpp:445
-msgid "Statistics"
-msgstr "Ystadegau"
-
-#: keduca/keducaview.cpp:446
-msgid "Correct questions"
-msgstr ""
-
-#: keduca/keducaview.cpp:448
-msgid "Incorrect questions"
-msgstr ""
-
-#: keduca/keducaview.cpp:452
-msgid "Total points"
-msgstr ""
-
-#: keduca/keducaview.cpp:453
-msgid "Correct points"
-msgstr ""
-
-#: keduca/keducaview.cpp:455
-msgid "Incorrect points"
-msgstr ""
-
-#: keduca/keducaview.cpp:460
-msgid "Total time"
-msgstr "Cyfanswm amser"
-
-#: keduca/keducaview.cpp:462
-msgid "Time in tests"
-msgstr ""
-
-#: keduca/keducaview.cpp:487
-msgid "The answer is: "
-msgstr ""
-
-#: keduca/keducaview.cpp:489
-msgid "The correct answer is: "
-msgstr ""
-
-#: keduca/keducaview.cpp:495
-msgid "Your answer was: "
-msgstr ""
-
-#: keduca/keducaview.cpp:550
-msgid "Title"
-msgstr "Teitl"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 212
-#: keduca/keducaview.cpp:551 rc.cpp:197
-#, no-c-format
-msgid "Category"
-msgstr "Categori"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 223
-#: keduca/keducaview.cpp:552 rc.cpp:200
-#, no-c-format
-msgid "Type"
-msgstr "Math"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 201
-#: keduca/keducaview.cpp:553 rc.cpp:194
-#, no-c-format
-msgid "Language"
-msgstr "Iaith"
-
-#: keduca/kquestion.cpp:56
-msgid "%v seconds left"
-msgstr ""
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 20
-#: rc.cpp:15
+#. i18n: file kcontroladdeditbase.ui line 20
+#: rc.cpp:9
 #, no-c-format
 msgid "Question"
 msgstr "Cwestiwn"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 120
-#: rc.cpp:18
+#. i18n: file kcontroladdeditbase.ui line 120
+#: rc.cpp:12
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
@@ -542,56 +316,56 @@ msgid ""
 "</span>"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 161
-#: rc.cpp:25
+#. i18n: file kcontroladdeditbase.ui line 161
+#: rc.cpp:19
 #, no-c-format
 msgid "&Question:"
 msgstr "&Cwestiwn :"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 175
-#: rc.cpp:28
+#. i18n: file kcontroladdeditbase.ui line 175
+#: rc.cpp:22
 #, no-c-format
 msgid "&Type:"
 msgstr "&Math:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 189
-#: rc.cpp:31
+#. i18n: file kcontroladdeditbase.ui line 189
+#: rc.cpp:25
 #, no-c-format
 msgid "&Picture:"
 msgstr "Llu&n:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 228
-#: rc.cpp:43
+#. i18n: file kcontroladdeditbase.ui line 228
+#: rc.cpp:37
 #, no-c-format
 msgid "P&oint:"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 242
-#: rc.cpp:46
+#. i18n: file kcontroladdeditbase.ui line 242
+#: rc.cpp:40
 #, no-c-format
 msgid "Ti&me:"
 msgstr "Am&ser:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 256
-#: rc.cpp:49
+#. i18n: file kcontroladdeditbase.ui line 256
+#: rc.cpp:43
 #, no-c-format
 msgid "T&ip:"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 275
-#: rc.cpp:52
+#. i18n: file kcontroladdeditbase.ui line 275
+#: rc.cpp:46
 #, no-c-format
 msgid "&Explain:"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 367
-#: rc.cpp:55 rc.cpp:80
+#. i18n: file kcontroladdeditbase.ui line 367
+#: rc.cpp:49 rc.cpp:74
 #, no-c-format
 msgid "Answer"
 msgstr "Ateb"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 467
-#: rc.cpp:58
+#. i18n: file kcontroladdeditbase.ui line 467
+#: rc.cpp:52
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
@@ -603,143 +377,209 @@ msgid ""
 "</span>"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 553
-#: rc.cpp:65
+#. i18n: file kcontroladdeditbase.ui line 553
+#: rc.cpp:59
 #, no-c-format
 msgid "&Answer:"
 msgstr "&Ateb :"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 567
-#: rc.cpp:68
+#. i18n: file kcontroladdeditbase.ui line 567
+#: rc.cpp:62
 #, no-c-format
 msgid "&Value:"
 msgstr "&Gwerth:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 606
-#: rc.cpp:77
+#. i18n: file kcontroladdeditbase.ui line 587
+#: kcontroladdedit.cpp:95 kcontroladdedit.cpp:121 rc.cpp:65
+#, no-c-format
+msgid "False"
+msgstr "Ffug"
+
+#. i18n: file kcontroladdeditbase.ui line 592
+#: kcontroladdedit.cpp:95 kcontroladdedit.cpp:121 kcontroladdedit.cpp:183
+#: kcontroladdedit.cpp:220 rc.cpp:68
+#, no-c-format
+msgid "True"
+msgstr "Gwir"
+
+#. i18n: file kcontroladdeditbase.ui line 606
+#: rc.cpp:71
 #, no-c-format
 msgid "&Points:"
 msgstr "&Pwyntiau:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 653
-#: rc.cpp:83
+#. i18n: file kcontroladdeditbase.ui line 653
+#: rc.cpp:77
 #, no-c-format
 msgid "Value"
 msgstr "Gwerth"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 735
-#: rc.cpp:95
+#. i18n: file kcontroladdeditbase.ui line 664
+#: rc.cpp:80
+#, no-c-format
+msgid "Points"
+msgstr "Pwyntiau:"
+
+#. i18n: file kcontroladdeditbase.ui line 696
+#: kcontroladdedit.cpp:108 rc.cpp:83
+#, no-c-format
+msgid "&Add"
+msgstr "&Ychwanegu"
+
+#. i18n: file kcontroladdeditbase.ui line 735
+#: rc.cpp:89
 #, no-c-format
 msgid "Move &Up"
 msgstr "Symud i &Fyny"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 746
-#: rc.cpp:98
+#. i18n: file kcontroladdeditbase.ui line 746
+#: rc.cpp:92
 #, no-c-format
 msgid "Move &Down"
 msgstr "Symud i &Lawr"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 92
-#: rc.cpp:101
+#. i18n: file kcontrolheaderbase.ui line 92
+#: rc.cpp:95
 #, no-c-format
 msgid "<b  style=\"text-decoration:underline;\">Information</b>"
 msgstr ""
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 16
-#: rc.cpp:149
+#. i18n: file keducaeditorstartdialogbase.ui line 16
+#: rc.cpp:143
 #, no-c-format
 msgid "Editor - Getting Started"
 msgstr ""
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 76
-#: rc.cpp:152
+#. i18n: file keducaeditorstartdialogbase.ui line 76
+#: rc.cpp:146
 #, no-c-format
 msgid "Open an &existing document:"
 msgstr ""
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 127
-#: rc.cpp:155
+#. i18n: file keducaeditorstartdialogbase.ui line 127
+#: rc.cpp:149
 #, no-c-format
 msgid "Open a &recent document:"
 msgstr ""
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 176
-#: rc.cpp:158
+#. i18n: file keducaeditorstartdialogbase.ui line 176
+#: rc.cpp:152
 #, no-c-format
 msgid "Open with Internet gallery browser"
 msgstr ""
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 184
-#: rc.cpp:161
+#. i18n: file keducaeditorstartdialogbase.ui line 184
+#: rc.cpp:155
 #, no-c-format
 msgid "Start a &new document"
 msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 16
-#: rc.cpp:173
-#, no-c-format
-msgid "Gallery"
+#: main.cpp:26
+msgid "Form-based tests and exams builder"
 msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 72
-#: rc.cpp:179
-#, no-c-format
-msgid "Address:"
-msgstr "Cyfeiriad:"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 118
-#: rc.cpp:182
-#, no-c-format
-msgid "&Add Server"
-msgstr "&Ychwanegu gweinydd"
+#: main.cpp:31
+msgid "File to load"
+msgstr "Ffeil i lwytho"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 157
-#: rc.cpp:185
-#, no-c-format
-msgid "Servers"
-msgstr "Gweinyddion"
+#: main.cpp:37
+msgid "KEducaBuilder"
+msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 168
-#: rc.cpp:188 rc.cpp:206
-#, no-c-format
-msgid "Address"
-msgstr "Cyfeiriad"
+#: main.cpp:40
+msgid "Original Author"
+msgstr "Awdur Gwreiddiol"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 315
-#: rc.cpp:212
-#, no-c-format
-msgid "&Open"
-msgstr "A&gor"
+#: main.cpp:41
+msgid "Maintainer 2002-2004"
+msgstr ""
 
-#. i18n: file ./keduca/configdialogbase.ui line 16
-#: rc.cpp:218
-#, no-c-format
-msgid "KEduca Config Dialog"
+#: main.cpp:42
+msgid "Various fixes and cleanups"
 msgstr ""
 
-#. i18n: file ./keduca/configdialogbase.ui line 27
-#: rc.cpp:221
-#, fuzzy, no-c-format
-msgid "Show Results"
-msgstr "Canlyniad"
+#: main.cpp:43
+msgid "Icons"
+msgstr "Eiconau"
 
-#. i18n: file ./keduca/configdialogbase.ui line 38
-#: rc.cpp:224
-#, no-c-format
-msgid "At the end of the test"
+#: kcontroladdedit.cpp:56
+msgid "Modify Question"
 msgstr ""
 
-#. i18n: file ./keduca/configdialogbase.ui line 46
-#: rc.cpp:227
-#, no-c-format
-msgid "After answering each question"
+#: kcontroladdedit.cpp:59
+msgid "Add Questions"
 msgstr ""
 
-#. i18n: file ./keduca/configdialogbase.ui line 56
-#: rc.cpp:230
-#, fuzzy, no-c-format
-msgid "Ordering"
-msgstr "Trefn"
+#~ msgid "Various Settings"
+#~ msgstr "Gosodiadau Amrywiol"
+
+#~ msgid "General"
+#~ msgstr "Cyffredinol"
+
+#~ msgid "Order"
+#~ msgstr "Trefn"
+
+#~ msgid "KEduca"
+#~ msgstr "KEduca"
+
+#~ msgid "Current Maintainer"
+#~ msgstr "Cynhaliwr Cyfredol"
+
+#~ msgid "&Next >>"
+#~ msgstr "&Nesaf >>"
+
+#~ msgid "Save Results As"
+#~ msgstr "Cadw'r Canlyniadau Fel"
+
+#~ msgid "Save failed."
+#~ msgstr "Methodd y cadw."
+
+#~ msgid "Question %1"
+#~ msgstr "Cwestiwn %1"
+
+#~ msgid "Result"
+#~ msgstr "Canlyniad"
+
+#~ msgid "Statistics"
+#~ msgstr "Ystadegau"
+
+#~ msgid "Total time"
+#~ msgstr "Cyfanswm amser"
+
+#~ msgid "Title"
+#~ msgstr "Teitl"
+
+#~ msgid "Category"
+#~ msgstr "Categori"
+
+#~ msgid "Type"
+#~ msgstr "Math"
+
+#~ msgid "Language"
+#~ msgstr "Iaith"
+
+#~ msgid "Address:"
+#~ msgstr "Cyfeiriad:"
+
+#~ msgid "&Add Server"
+#~ msgstr "&Ychwanegu gweinydd"
+
+#~ msgid "Servers"
+#~ msgstr "Gweinyddion"
+
+#~ msgid "Address"
+#~ msgstr "Cyfeiriad"
+
+#~ msgid "&Open"
+#~ msgstr "A&gor"
+
+#, fuzzy
+#~ msgid "Show Results"
+#~ msgstr "Canlyniad"
+
+#, fuzzy
+#~ msgid "Ordering"
+#~ msgstr "Trefn"
 
 #~ msgid "Main Window"
 #~ msgstr "Prif Ffenestr"
diff --git a/tde-i18n-cy/messages/tdeedu/kgeography.po b/tde-i18n-cy/messages/tdeedu/kgeography.po
index 02f1acd49f8..68627e4218c 100644
--- a/tde-i18n-cy/messages/tdeedu/kgeography.po
+++ b/tde-i18n-cy/messages/tdeedu/kgeography.po
@@ -3,10 +3,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kgeography\n"
-"POT-Creation-Date: 2007-03-02 02:46+0100\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2005-11-02 13:59+0000\n"
 "Last-Translator: Kevin Donnelly <kevin@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeedu/khangman.po b/tde-i18n-cy/messages/tdeedu/khangman.po
index c13b2ab7faf..81bcb3c52cd 100644
--- a/tde-i18n-cy/messages/tdeedu/khangman.po
+++ b/tde-i18n-cy/messages/tdeedu/khangman.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdeedu/khangman.po\n"
-"POT-Creation-Date: 2008-07-08 01:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,6 +21,18 @@ msgid ""
 "the words; otherwise leave it untranslated as a reminder)"
 msgstr ""
 
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "KD wrth KGyfieithu"
+
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "kyfieithu@dotmon.com"
+
 #: khangmanview.cpp:66
 msgid "G&uess"
 msgstr ""
@@ -71,152 +84,97 @@ msgid ""
 "Check your installation, please!"
 msgstr ""
 
-#: timer.cpp:33 timer.cpp:34 timer.cpp:42 timer.cpp:43
-msgid "seconds"
-msgstr "eiliad"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "KD wrth KGyfieithu"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "kyfieithu@dotmon.com"
-
-#: main.cpp:32
-msgid "Classical hangman game for TDE"
-msgstr ""
-
-#: main.cpp:44
-msgid "KHangMan"
-msgstr "Krogwr"
-
-#: main.cpp:48
-msgid "Previous maintainer"
-msgstr "Cynhaliwr Cynt"
-
-#: main.cpp:50
-msgid "Actual maintainer, author"
-msgstr ""
-
-#: main.cpp:52
-msgid "Graphics"
-msgstr "Graffeg"
-
-#: main.cpp:54
-msgid "Swedish data files, coding help, transparent pictures and i18n fixes"
-msgstr ""
-
-#: main.cpp:56
-msgid "Nature theme background"
-msgstr ""
-
-#: main.cpp:58
-msgid "Blue theme background, icons"
-msgstr ""
-
-#: main.cpp:60
-msgid "Spanish data files"
-msgstr ""
-
-#: main.cpp:62
-msgid "Danish data files"
-msgstr ""
-
-#: main.cpp:64
-msgid "Finnish data files"
-msgstr ""
+#: khangman.cpp:77
+msgid "&New"
+msgstr "&Newydd"
 
-#: main.cpp:66
-msgid "Brazilian Portuguese data files"
+#: khangman.cpp:78
+msgid "Play with a new word"
 msgstr ""
 
-#: main.cpp:68
-msgid "Catalan data files"
+#: khangman.cpp:81
+msgid "&Get Words in New Language..."
 msgstr ""
 
-#: main.cpp:70
-msgid "Italian data files"
-msgstr ""
+#: khangman.cpp:85
+msgid "Le&vel"
+msgstr "Le&fel"
 
-#: main.cpp:72
-msgid "Dutch data files"
+#: khangman.cpp:86
+msgid "Choose the level"
 msgstr ""
 
-#: main.cpp:74
-msgid "Czech data files"
-msgstr ""
+#: khangman.cpp:87
+msgid "Choose the level of difficulty"
+msgstr "Dewis lefel anhawster"
 
-#: main.cpp:76
-msgid "Hungarian data files"
-msgstr ""
+#: khangman.cpp:91
+msgid "&Language"
+msgstr "&Iaith"
 
-#: main.cpp:78
-msgid "Norwegian (Bokmål) data files"
-msgstr ""
+#: khangman.cpp:100
+msgid "L&ook"
+msgstr "G&wedd"
 
-#: main.cpp:80
-msgid "Tajik data files"
+#: khangman.cpp:101
+msgid "&Sea Theme"
 msgstr ""
 
-#: main.cpp:82
-msgid "Serbian (Cyrillic and Latin) data files"
+#: khangman.cpp:102
+msgid "&Desert Theme"
 msgstr ""
 
-#: main.cpp:84
-msgid "Slovenian data files"
+#: khangman.cpp:105 khangman.cpp:106
+msgid "Choose the look and feel"
 msgstr ""
 
-#: main.cpp:86
-msgid "Portuguese data files"
+#: khangman.cpp:148
+msgid "First letter upper case"
 msgstr ""
 
-#: main.cpp:88
-msgid "Norwegian (Nynorsk) data files"
-msgstr ""
+#: khangman.cpp:243
+msgid "Cyrillic"
+msgstr "Cyrilig"
 
-#: main.cpp:90
-msgid "Turkish data files"
-msgstr ""
+#: khangman.cpp:247
+msgid "Latin"
+msgstr "Lladin"
 
-#: main.cpp:92
-msgid "Russian data files"
-msgstr ""
+#: khangman.cpp:371
+msgid "General"
+msgstr "Cyffredinol"
 
-#: main.cpp:94
-msgid "Bulgarian data files"
-msgstr ""
+#: khangman.cpp:378
+msgid "Languages"
+msgstr "Ieithoedd"
 
-#: main.cpp:96
-msgid "Irish (Gaelic) data files"
+#. i18n: file timerdlg.ui line 24
+#: khangman.cpp:381 rc.cpp:67
+#, no-c-format
+msgid "Timers"
 msgstr ""
 
-#: main.cpp:98
-msgid "Softer Hangman Pictures"
+#: khangman.cpp:437
+msgid ""
+"File $TDEDIR/share/apps/khangman/%1.txt not found;\n"
+"check your installation."
 msgstr ""
 
-#: main.cpp:100 main.cpp:102 main.cpp:104
-msgid "Coding help"
+#: khangman.cpp:460
+#, c-format
+msgid "Inserts the character %1"
 msgstr ""
 
-#: main.cpp:106
-msgid "Coding help, fixed a lot of things"
+#: khangman.cpp:534
+msgid "Hint on right-click"
 msgstr ""
 
-#: main.cpp:108
-msgid "SVG icon"
-msgstr "Eicon SVG"
-
-#: main.cpp:110
-msgid "Code for generating icons for the characters toolbar"
+#: khangman.cpp:536
+msgid "Hint available"
 msgstr ""
 
-#: main.cpp:112
-msgid "Code cleaning"
+#: khangman.cpp:542
+msgid "Type accented letters"
 msgstr ""
 
 #. i18n: file advanced.ui line 32
@@ -374,12 +332,6 @@ msgid ""
 "Default is no sound."
 msgstr ""
 
-#. i18n: file timerdlg.ui line 24
-#: khangman.cpp:381 rc.cpp:67
-#, no-c-format
-msgid "Timers"
-msgstr ""
-
 #. i18n: file timerdlg.ui line 64
 #: rc.cpp:70
 #, no-c-format
@@ -434,91 +386,140 @@ msgstr "Prif"
 msgid "Special Characters"
 msgstr "Nodau Arbennig"
 
-#: khangman.cpp:77
-msgid "&New"
-msgstr "&Newydd"
+#: timer.cpp:33 timer.cpp:34 timer.cpp:42 timer.cpp:43
+msgid "seconds"
+msgstr "eiliad"
 
-#: khangman.cpp:78
-msgid "Play with a new word"
+#: main.cpp:32
+msgid "Classical hangman game for TDE"
 msgstr ""
 
-#: khangman.cpp:81
-msgid "&Get Words in New Language..."
+#: main.cpp:44
+msgid "KHangMan"
+msgstr "Krogwr"
+
+#: main.cpp:48
+msgid "Previous maintainer"
+msgstr "Cynhaliwr Cynt"
+
+#: main.cpp:50
+msgid "Actual maintainer, author"
 msgstr ""
 
-#: khangman.cpp:85
-msgid "Le&vel"
-msgstr "Le&fel"
+#: main.cpp:52
+msgid "Graphics"
+msgstr "Graffeg"
 
-#: khangman.cpp:86
-msgid "Choose the level"
+#: main.cpp:54
+msgid "Swedish data files, coding help, transparent pictures and i18n fixes"
 msgstr ""
 
-#: khangman.cpp:87
-msgid "Choose the level of difficulty"
-msgstr "Dewis lefel anhawster"
+#: main.cpp:56
+msgid "Nature theme background"
+msgstr ""
 
-#: khangman.cpp:91
-msgid "&Language"
-msgstr "&Iaith"
+#: main.cpp:58
+msgid "Blue theme background, icons"
+msgstr ""
 
-#: khangman.cpp:100
-msgid "L&ook"
-msgstr "G&wedd"
+#: main.cpp:60
+msgid "Spanish data files"
+msgstr ""
 
-#: khangman.cpp:101
-msgid "&Sea Theme"
+#: main.cpp:62
+msgid "Danish data files"
 msgstr ""
 
-#: khangman.cpp:102
-msgid "&Desert Theme"
+#: main.cpp:64
+msgid "Finnish data files"
 msgstr ""
 
-#: khangman.cpp:105 khangman.cpp:106
-msgid "Choose the look and feel"
+#: main.cpp:66
+msgid "Brazilian Portuguese data files"
 msgstr ""
 
-#: khangman.cpp:148
-msgid "First letter upper case"
+#: main.cpp:68
+msgid "Catalan data files"
 msgstr ""
 
-#: khangman.cpp:243
-msgid "Cyrillic"
-msgstr "Cyrilig"
+#: main.cpp:70
+msgid "Italian data files"
+msgstr ""
 
-#: khangman.cpp:247
-msgid "Latin"
-msgstr "Lladin"
+#: main.cpp:72
+msgid "Dutch data files"
+msgstr ""
 
-#: khangman.cpp:371
-msgid "General"
-msgstr "Cyffredinol"
+#: main.cpp:74
+msgid "Czech data files"
+msgstr ""
 
-#: khangman.cpp:378
-msgid "Languages"
-msgstr "Ieithoedd"
+#: main.cpp:76
+msgid "Hungarian data files"
+msgstr ""
 
-#: khangman.cpp:437
-msgid ""
-"File $TDEDIR/share/apps/khangman/%1.txt not found;\n"
-"check your installation."
+#: main.cpp:78
+msgid "Norwegian (Bokmål) data files"
 msgstr ""
 
-#: khangman.cpp:460
-#, c-format
-msgid "Inserts the character %1"
+#: main.cpp:80
+msgid "Tajik data files"
 msgstr ""
 
-#: khangman.cpp:534
-msgid "Hint on right-click"
+#: main.cpp:82
+msgid "Serbian (Cyrillic and Latin) data files"
 msgstr ""
 
-#: khangman.cpp:536
-msgid "Hint available"
+#: main.cpp:84
+msgid "Slovenian data files"
 msgstr ""
 
-#: khangman.cpp:542
-msgid "Type accented letters"
+#: main.cpp:86
+msgid "Portuguese data files"
+msgstr ""
+
+#: main.cpp:88
+msgid "Norwegian (Nynorsk) data files"
+msgstr ""
+
+#: main.cpp:90
+msgid "Turkish data files"
+msgstr ""
+
+#: main.cpp:92
+msgid "Russian data files"
+msgstr ""
+
+#: main.cpp:94
+msgid "Bulgarian data files"
+msgstr ""
+
+#: main.cpp:96
+msgid "Irish (Gaelic) data files"
+msgstr ""
+
+#: main.cpp:98
+msgid "Softer Hangman Pictures"
+msgstr ""
+
+#: main.cpp:100 main.cpp:102 main.cpp:104
+msgid "Coding help"
+msgstr ""
+
+#: main.cpp:106
+msgid "Coding help, fixed a lot of things"
+msgstr ""
+
+#: main.cpp:108
+msgid "SVG icon"
+msgstr "Eicon SVG"
+
+#: main.cpp:110
+msgid "Code for generating icons for the characters toolbar"
+msgstr ""
+
+#: main.cpp:112
+msgid "Code cleaning"
 msgstr ""
 
 #~ msgid "Easy"
diff --git a/tde-i18n-cy/messages/tdeedu/kig.po b/tde-i18n-cy/messages/tdeedu/kig.po
index 349590e0772..5af9b49ba94 100644
--- a/tde-i18n-cy/messages/tdeedu/kig.po
+++ b/tde-i18n-cy/messages/tdeedu/kig.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdeedu/kig.po\n"
-"POT-Creation-Date: 2008-07-08 01:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -252,13 +253,13 @@ msgid "&Keep aspect ratio"
 msgstr ""
 
 #. i18n: file filters/imageexporteroptionsbase.ui line 132
-#: kig/kig_part.cpp:136 rc.cpp:136 rc.cpp:145 rc.cpp:157
+#: kig/kig_part.cpp:134 rc.cpp:136 rc.cpp:145 rc.cpp:157
 #, no-c-format
 msgid "Show grid"
 msgstr "Dangos Grid"
 
 #. i18n: file filters/imageexporteroptionsbase.ui line 140
-#: kig/kig_part.cpp:139 rc.cpp:139 rc.cpp:148 rc.cpp:160
+#: kig/kig_part.cpp:137 rc.cpp:139 rc.cpp:148 rc.cpp:160
 #, no-c-format
 msgid "Show axes"
 msgstr ""
@@ -1445,15 +1446,15 @@ msgstr ""
 msgid "Enter the coordinates for the new point."
 msgstr ""
 
-#: kig/kig_part.cpp:623 misc/kigfiledialog.cc:55 modes/typesdialog.cpp:173
+#: kig/kig_part.cpp:621 misc/kigfiledialog.cc:55 modes/typesdialog.cpp:175
 msgid "The file \"%1\" already exists. Do you wish to overwrite it?"
 msgstr ""
 
-#: kig/kig_part.cpp:624 misc/kigfiledialog.cc:56 modes/typesdialog.cpp:175
+#: kig/kig_part.cpp:622 misc/kigfiledialog.cc:56 modes/typesdialog.cpp:177
 msgid "Overwrite File?"
 msgstr "Trosysgrifo'r Ffeil?"
 
-#: kig/kig_part.cpp:624 misc/kigfiledialog.cc:56 modes/typesdialog.cpp:175
+#: kig/kig_part.cpp:622 misc/kigfiledialog.cc:56 modes/typesdialog.cpp:177
 msgid "Overwrite"
 msgstr "Trosysgrifo"
 
@@ -1986,7 +1987,7 @@ msgstr ""
 msgid "Change Object Style"
 msgstr ""
 
-#: kig/kig_part.cpp:245 modes/popup.cc:980
+#: kig/kig_part.cpp:243 modes/popup.cc:980
 msgid "U&nhide All"
 msgstr ""
 
@@ -4094,125 +4095,125 @@ msgstr ""
 msgid "Add %1 Objects"
 msgstr ""
 
-#: kig/kig_part.cpp:84
+#: kig/kig_part.cpp:82
 msgid "KigPart"
 msgstr "KigPart"
 
-#: kig/kig_part.cpp:98
+#: kig/kig_part.cpp:96
 msgid "&Set Coordinate System"
 msgstr ""
 
-#: kig/kig_part.cpp:132
+#: kig/kig_part.cpp:130
 msgid "Kig Options"
 msgstr ""
 
-#: kig/kig_part.cpp:224
+#: kig/kig_part.cpp:222
 msgid "Invert Selection"
 msgstr "Gwrthdroi Dewisiad"
 
-#: kig/kig_part.cpp:233
+#: kig/kig_part.cpp:231
 msgid "&Delete Objects"
 msgstr "&Dileu Gwrthrychau"
 
-#: kig/kig_part.cpp:235
+#: kig/kig_part.cpp:233
 msgid "Delete the selected objects"
 msgstr ""
 
-#: kig/kig_part.cpp:238
+#: kig/kig_part.cpp:236
 msgid "Cancel Construction"
 msgstr ""
 
-#: kig/kig_part.cpp:241
+#: kig/kig_part.cpp:239
 msgid "Cancel the construction of the object being constructed"
 msgstr ""
 
-#: kig/kig_part.cpp:247
+#: kig/kig_part.cpp:245
 msgid "Show all hidden objects"
 msgstr ""
 
-#: kig/kig_part.cpp:251
+#: kig/kig_part.cpp:249
 msgid "&New Macro..."
 msgstr ""
 
-#: kig/kig_part.cpp:253
+#: kig/kig_part.cpp:251
 msgid "Define a new macro"
 msgstr ""
 
-#: kig/kig_part.cpp:256
+#: kig/kig_part.cpp:254
 msgid "Manage &Types..."
 msgstr ""
 
-#: kig/kig_part.cpp:258
+#: kig/kig_part.cpp:256
 msgid "Manage macro types."
 msgstr ""
 
-#: kig/kig_part.cpp:265 kig/kig_part.cpp:266
+#: kig/kig_part.cpp:263 kig/kig_part.cpp:264
 msgid "Zoom in on the document"
 msgstr ""
 
-#: kig/kig_part.cpp:270 kig/kig_part.cpp:271
+#: kig/kig_part.cpp:268 kig/kig_part.cpp:269
 msgid "Zoom out of the document"
 msgstr ""
 
-#: kig/kig_part.cpp:277 kig/kig_part.cpp:278
+#: kig/kig_part.cpp:275 kig/kig_part.cpp:276
 msgid "Recenter the screen on the document"
 msgstr ""
 
-#: kig/kig_part.cpp:290
+#: kig/kig_part.cpp:288
 msgid "Full Screen"
 msgstr "Sgrîn Lawn"
 
-#: kig/kig_part.cpp:294 kig/kig_part.cpp:295
+#: kig/kig_part.cpp:292 kig/kig_part.cpp:293
 msgid "View this document full-screen."
 msgstr ""
 
-#: kig/kig_part.cpp:299
+#: kig/kig_part.cpp:297
 msgid "&Select Shown Area"
 msgstr ""
 
-#: kig/kig_part.cpp:301 kig/kig_part.cpp:302
+#: kig/kig_part.cpp:299 kig/kig_part.cpp:300
 msgid "Select the area that you want to be shown in the window."
 msgstr ""
 
-#: kig/kig_part.cpp:305
+#: kig/kig_part.cpp:303
 msgid "S&elect Zoom Area"
 msgstr ""
 
-#: kig/kig_part.cpp:311
+#: kig/kig_part.cpp:309
 msgid "Show &Grid"
 msgstr "Dango&s Grid"
 
-#: kig/kig_part.cpp:313
+#: kig/kig_part.cpp:311
 msgid "Show or hide the grid."
 msgstr ""
 
-#: kig/kig_part.cpp:317
+#: kig/kig_part.cpp:315
 msgid "Show &Axes"
 msgstr ""
 
-#: kig/kig_part.cpp:319
+#: kig/kig_part.cpp:317
 msgid "Show or hide the axes."
 msgstr ""
 
-#: kig/kig_part.cpp:323
+#: kig/kig_part.cpp:321
 msgid "Wear Infrared Glasses"
 msgstr ""
 
-#: kig/kig_part.cpp:325
+#: kig/kig_part.cpp:323
 msgid "Enable/Disable hidden objects visibility."
 msgstr ""
 
-#: kig/kig_part.cpp:373
+#: kig/kig_part.cpp:371
 msgid ""
 "The file \"%1\" you tried to open does not exist. Please verify that you "
 "entered the correct path."
 msgstr ""
 
-#: kig/kig_part.cpp:375
+#: kig/kig_part.cpp:373
 msgid "File Not Found"
 msgstr "Ni chanfuwyd y ffeil"
 
-#: kig/kig_part.cpp:390
+#: kig/kig_part.cpp:388
 msgid ""
 "You tried to open a document of type \"%1\"; unfortunately, Kig does not "
 "support this format. If you think the format in question would be worth "
@@ -4220,38 +4221,38 @@ msgid ""
 "mailto:toscano.pino@tiscali.it or do the work yourself and send me a patch."
 msgstr ""
 
-#: kig/kig_part.cpp:396 kig/kig_part.cpp:439
+#: kig/kig_part.cpp:394 kig/kig_part.cpp:437
 msgid "Format Not Supported"
 msgstr ""
 
-#: kig/kig_part.cpp:437
+#: kig/kig_part.cpp:435
 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:439
+#: kig/kig_part.cpp:437
 msgid "Save Kig Format"
 msgstr ""
 
-#: kig/kig_part.cpp:612
+#: kig/kig_part.cpp:610
 msgid ""
 "*.kig|Kig Documents (*.kig)\n"
 "*.kigz|Compressed Kig Documents (*.kigz)"
 msgstr ""
 
-#: kig/kig_part.cpp:790
+#: kig/kig_part.cpp:780
 msgid "Print Geometry"
 msgstr ""
 
-#: kig/kig_part.cpp:863
+#: kig/kig_part.cpp:853
 #, c-format
 msgid ""
 "_n: Hide %n Object\n"
 "Hide %n Objects"
 msgstr ""
 
-#: kig/kig_part.cpp:882
+#: kig/kig_part.cpp:872
 #, c-format
 msgid ""
 "_n: Show %n Object\n"
@@ -4348,46 +4349,46 @@ msgstr ""
 msgid "Set Polar Coordinate System"
 msgstr ""
 
-#: modes/typesdialog.cpp:82
+#: modes/typesdialog.cpp:84
 msgid "&Edit..."
 msgstr "&Golygu..."
 
-#: modes/typesdialog.cpp:85
+#: modes/typesdialog.cpp:87
 msgid "E&xport..."
 msgstr "&Allforio..."
 
-#: modes/typesdialog.cpp:141
+#: modes/typesdialog.cpp:143
 #, c-format
 msgid ""
 "_n: Are you sure you want to delete this type?\n"
 "Are you sure you want to delete these %n types?"
 msgstr ""
 
-#: modes/typesdialog.cpp:142
+#: modes/typesdialog.cpp:144
 msgid "Are You Sure?"
 msgstr "Ydych Yn Sicr?"
 
-#: modes/typesdialog.cpp:168 modes/typesdialog.cpp:183
+#: modes/typesdialog.cpp:170 modes/typesdialog.cpp:185
 msgid ""
 "*.kigt|Kig Types Files\n"
 "*|All Files"
 msgstr ""
 
-#: modes/typesdialog.cpp:168
+#: modes/typesdialog.cpp:170
 msgid "Export Types"
 msgstr ""
 
-#: modes/typesdialog.cpp:183
+#: modes/typesdialog.cpp:185
 msgid "Import Types"
 msgstr ""
 
-#: modes/typesdialog.cpp:234
+#: modes/typesdialog.cpp:236
 msgid ""
 "There is more than one type selected. You can only edit one type at a time. "
 "Please select only the type you want to edit and try again."
 msgstr ""
 
-#: modes/typesdialog.cpp:237
+#: modes/typesdialog.cpp:239
 msgid "More Than One Type Selected"
 msgstr ""
 
diff --git a/tde-i18n-cy/messages/tdeedu/kiten.po b/tde-i18n-cy/messages/tdeedu/kiten.po
index b5e5a455e29..57466c46a03 100644
--- a/tde-i18n-cy/messages/tdeedu/kiten.po
+++ b/tde-i18n-cy/messages/tdeedu/kiten.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdeedu/kiten.po\n"
-"POT-Creation-Date: 2005-04-20 15:09+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeedu/klatin.po b/tde-i18n-cy/messages/tdeedu/klatin.po
index c8e3070299e..1055594bd2c 100644
--- a/tde-i18n-cy/messages/tdeedu/klatin.po
+++ b/tde-i18n-cy/messages/tdeedu/klatin.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdeedu/klatin.po\n"
-"POT-Creation-Date: 2008-07-08 01:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeedu/klettres.po b/tde-i18n-cy/messages/tdeedu/klettres.po
index 074df61b1fe..64f06d2a1b9 100644
--- a/tde-i18n-cy/messages/tdeedu/klettres.po
+++ b/tde-i18n-cy/messages/tdeedu/klettres.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdeedu/klettres.po\n"
-"POT-Creation-Date: 2008-07-08 01:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeedu/kmplot.po b/tde-i18n-cy/messages/tdeedu/kmplot.po
index e2ad6e6e854..9bd667dcb6d 100644
--- a/tde-i18n-cy/messages/tdeedu/kmplot.po
+++ b/tde-i18n-cy/messages/tdeedu/kmplot.po
@@ -1,191 +1,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdeedu/kmplot.po\n"
-"POT-Creation-Date: 2008-07-08 01:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kmplotio.cpp:229 kparametereditor.cpp:143
-msgid "The file does not exist."
-msgstr ""
-
-#: kmplotio.cpp:235 kmplotio.cpp:245 kparametereditor.cpp:154
-#: kparametereditor.cpp:195
-msgid "An error appeared when opening this file"
-msgstr ""
-
-#: kmplotio.cpp:250
-msgid "The file could not be loaded"
-msgstr ""
-
-#: kmplotio.cpp:289
-msgid "The file had an unknown version number"
-msgstr ""
-
-#. i18n: file settingspagescaling.ui line 192
-#: View.cpp:1147 kmplotio.cpp:326 rc.cpp:1360 rc.cpp:1441 rc.cpp:3014
-#: rc.cpp:3095
-#, no-c-format
-msgid "automatic"
-msgstr "awtomatig"
-
-#: kmplotio.cpp:541
-msgid "The function %1 could not be loaded"
-msgstr ""
-
-#: coordsconfigdialog.cpp:57 coordsconfigdialog.cpp:72 editfunction.cpp:220
-#: keditparametric.cpp:154 keditpolar.cpp:138 kminmax.cpp:243
-msgid "The minimum range value must be lower than the maximum range value"
-msgstr ""
-
-#: editfunction.cpp:311 keditparametric.cpp:177 keditpolar.cpp:160
-#: kminmax.cpp:293
-msgid "Function could not be found"
-msgstr ""
-
-#: ksliderwindow.cpp:48
-#, c-format
-msgid "Slider %1"
-msgstr ""
-
-#: ksliderwindow.cpp:49
-#, c-format
-msgid "Slider no. %1"
-msgstr ""
-
-#: ksliderwindow.cpp:50
-msgid ""
-"Move slider to change the parameter of the function plot connected to this "
-"slider."
-msgstr ""
-
-#: ksliderwindow.cpp:64
-msgid "&Change Minimum Value"
-msgstr ""
-
-#: ksliderwindow.cpp:66
-msgid "&Change Maximum Value"
-msgstr ""
-
-#: ksliderwindow.cpp:102
-msgid "Change Minimum Value"
-msgstr ""
-
-#: ksliderwindow.cpp:102
-msgid "Type a new minimum value for the slider:"
-msgstr ""
-
-#: ksliderwindow.cpp:113
-msgid "Change Maximum Value"
-msgstr ""
-
-#: ksliderwindow.cpp:113
-msgid "Type a new maximum value for the slider:"
-msgstr ""
-
-#: kprinterdlg.cpp:39
-msgid "KmPlot Options"
-msgstr ""
-
-#: kprinterdlg.cpp:45
-msgid "Print header table"
-msgstr ""
-
-#: kprinterdlg.cpp:46
-msgid "Transparent background"
-msgstr "Cefndir tryloyw"
-
-#: parser.cpp:534
-msgid "This function is depending on an other function"
-msgstr ""
-
-#: parser.cpp:961
-msgid ""
-"Parser error at position %1:\n"
-"Syntax error"
-msgstr ""
-
-#: parser.cpp:964
-msgid ""
-"Parser error at position %1:\n"
-"Missing parenthesis"
-msgstr ""
-
-#: parser.cpp:967
-msgid ""
-"Parser error at position %1:\n"
-"Function name unknown"
-msgstr ""
-
-#: parser.cpp:970
-msgid ""
-"Parser error at position %1:\n"
-"Void function variable"
-msgstr ""
-
-#: parser.cpp:973
-msgid ""
-"Parser error at position %1:\n"
-"Too many functions"
-msgstr ""
-
-#: parser.cpp:976
-msgid ""
-"Parser error at position %1:\n"
-"Token-memory overflow"
-msgstr ""
-
-#: parser.cpp:979
-msgid ""
-"Parser error at position %1:\n"
-"Stack overflow"
-msgstr ""
-
-#: parser.cpp:982
-msgid ""
-"Parser error at position %1:\n"
-"Name of function not free."
-msgstr ""
-
-#: parser.cpp:985
-msgid ""
-"Parser error at position %1:\n"
-"recursive function not allowed."
-msgstr ""
-
-#: parser.cpp:988
-#, c-format
-msgid "Could not find a defined constant at position %1."
-msgstr ""
-
-#: parser.cpp:991
-msgid "Empty function"
-msgstr ""
-
-#: parser.cpp:993
-msgid "The function name is not allowed to contain capital letters."
-msgstr ""
-
-#: parser.cpp:995
-msgid "Function could not be found."
-msgstr ""
-
-#: parser.cpp:997
-msgid "The expression must not contain user-defined constants."
-msgstr ""
-
-#: keditconstant.cpp:61
-msgid "Please insert a valid constant name between A and Z."
-msgstr ""
-
-#: keditconstant.cpp:78
-msgid "The constant already exists."
-msgstr ""
-
 #: _translatorinfo.cpp:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
@@ -198,40 +22,36 @@ msgid ""
 "Your emails"
 msgstr "kyfieithu@dotmon.com"
 
-#: main.cpp:43
-msgid "Mathematical function plotter for TDE"
+#: kmplot.cpp:77
+msgid "Could not find KmPlot's part."
 msgstr ""
 
-#: main.cpp:47
-msgid "File to open"
-msgstr "Ffeil i agor"
-
-#: main.cpp:57
-msgid "KmPlot"
-msgstr "KmPlot"
-
-#: main.cpp:63
-msgid "Original Author"
-msgstr "Awdur Gwreiddiol"
+#: kmplot.cpp:228
+msgid ""
+"*.fkt|KmPlot Files (*.fkt)\n"
+"*.*|All Files"
+msgstr ""
 
-#: main.cpp:66
-msgid "GUI"
+#: xparser.cpp:120
+msgid "Error in extension."
 msgstr ""
 
-#: main.cpp:68
-msgid "Various improvements"
-msgstr "Amrywiaeth o welliannau"
+#: xparser.cpp:769
+msgid "There are no other Kmplot instances running"
+msgstr ""
 
-#: main.cpp:69
-msgid "svg icon"
-msgstr "eicon SVG"
+#: xparser.cpp:781
+msgid "kmplot"
+msgstr "kmplot"
 
-#: main.cpp:70
-msgid "command line options, MIME type"
+#: xparser.cpp:781
+msgid ""
+"Choose which KmPlot instance\n"
+"you want to copy the function to:"
 msgstr ""
 
-#: keditparametric.cpp:108
-msgid "Recursive function not allowed"
+#: xparser.cpp:807 xparser.cpp:816
+msgid "An error appeared during the transfer"
 msgstr ""
 
 #: kparametereditor.cpp:81 kparametereditor.cpp:107
@@ -254,6 +74,15 @@ msgstr ""
 msgid "*.txt|Plain Text File "
 msgstr ""
 
+#: kmplotio.cpp:229 kparametereditor.cpp:143
+msgid "The file does not exist."
+msgstr ""
+
+#: kmplotio.cpp:235 kmplotio.cpp:245 kparametereditor.cpp:154
+#: kparametereditor.cpp:195
+msgid "An error appeared when opening this file"
+msgstr ""
+
 #: kparametereditor.cpp:182
 msgid ""
 "Line %1 is not a valid parameter value and will therefore not be included. Do "
@@ -422,10 +251,20 @@ msgstr ""
 msgid "Please choose a function"
 msgstr ""
 
+#: coordsconfigdialog.cpp:57 coordsconfigdialog.cpp:72 editfunction.cpp:220
+#: keditparametric.cpp:154 keditpolar.cpp:138 kminmax.cpp:243
+msgid "The minimum range value must be lower than the maximum range value"
+msgstr ""
+
 #: editfunction.cpp:229 kminmax.cpp:251
 msgid "Please insert a minimum and maximum range between %1 and %2"
 msgstr ""
 
+#: editfunction.cpp:311 keditparametric.cpp:177 keditpolar.cpp:160
+#: kminmax.cpp:293
+msgid "Function could not be found"
+msgstr ""
+
 #: kminmax.cpp:301
 msgid "You must choose a parameter for that function"
 msgstr ""
@@ -472,16 +311,6 @@ msgstr ""
 msgid "Choose a parameter to use:"
 msgstr ""
 
-#: kmplot.cpp:77
-msgid "Could not find KmPlot's part."
-msgstr ""
-
-#: kmplot.cpp:228
-msgid ""
-"*.fkt|KmPlot Files (*.fkt)\n"
-"*.*|All Files"
-msgstr ""
-
 #: FktDlg.cpp:188 MainDlg.cpp:466
 msgid "New Function Plot"
 msgstr ""
@@ -500,6 +329,259 @@ msgstr ""
 msgid "New Polar Plot"
 msgstr ""
 
+#: coordsconfigdialog.cpp:39
+msgid "Coords"
+msgstr ""
+
+#: coordsconfigdialog.cpp:39
+msgid "Edit Coordinate System"
+msgstr ""
+
+#: keditparametric.cpp:108
+msgid "Recursive function not allowed"
+msgstr ""
+
+#: MainDlg.cpp:94
+msgid "Enter a function equation, for example: f(x)=x^2"
+msgstr ""
+
+#: MainDlg.cpp:108
+msgid "General"
+msgstr "Cyffredinol"
+
+#: MainDlg.cpp:108
+msgid "General Settings"
+msgstr "Gosodiadau Cyffredinol"
+
+#: MainDlg.cpp:109
+msgid "Constants"
+msgstr ""
+
+#: MainDlg.cpp:133
+msgid "Configure KmPlot..."
+msgstr ""
+
+#: MainDlg.cpp:140
+msgid "E&xport..."
+msgstr "&Allforio..."
+
+#: MainDlg.cpp:143
+msgid "&No Zoom"
+msgstr ""
+
+#: MainDlg.cpp:144
+msgid "Zoom &Rectangular"
+msgstr ""
+
+#: MainDlg.cpp:145
+msgid "Zoom &In"
+msgstr "Ne&sàu"
+
+#: MainDlg.cpp:146
+msgid "Zoom &Out"
+msgstr "Pell&hàu"
+
+#: MainDlg.cpp:147
+msgid "&Center Point"
+msgstr ""
+
+#: MainDlg.cpp:148
+msgid "&Fit Widget to Trigonometric Functions"
+msgstr ""
+
+#: MainDlg.cpp:157
+msgid "Predefined &Math Functions"
+msgstr ""
+
+#: MainDlg.cpp:160
+msgid "&Colors..."
+msgstr "&Lliwiau ..."
+
+#: MainDlg.cpp:161
+msgid "&Coordinate System..."
+msgstr ""
+
+#: MainDlg.cpp:163
+msgid "&Scaling..."
+msgstr "&Graddio..."
+
+#: MainDlg.cpp:164
+msgid "&Fonts..."
+msgstr "&Ffontiau ..."
+
+#: MainDlg.cpp:166
+msgid "Coordinate System I"
+msgstr ""
+
+#: MainDlg.cpp:167
+msgid "Coordinate System II"
+msgstr ""
+
+#: MainDlg.cpp:168
+msgid "Coordinate System III"
+msgstr ""
+
+#: MainDlg.cpp:171
+msgid "&New Function Plot..."
+msgstr ""
+
+#: MainDlg.cpp:172
+msgid "New Parametric Plot..."
+msgstr ""
+
+#: MainDlg.cpp:173
+msgid "New Polar Plot..."
+msgstr ""
+
+#: MainDlg.cpp:174
+msgid "Edit Plots..."
+msgstr ""
+
+#: MainDlg.cpp:177
+msgid "&Get y-Value..."
+msgstr ""
+
+#: MainDlg.cpp:178
+msgid "&Search for Minimum Value..."
+msgstr ""
+
+#: MainDlg.cpp:179
+msgid "&Search for Maximum Value..."
+msgstr ""
+
+#: MainDlg.cpp:180
+#, fuzzy
+msgid "&Calculate Integral"
+msgstr "&Cyfrifo"
+
+#: MainDlg.cpp:183
+msgid "Quick Edit"
+msgstr ""
+
+#: MainDlg.cpp:184
+msgid ""
+"Enter a simple function equation here.\n"
+"For instance: f(x)=x^2\n"
+"For more options use Functions->Edit Plots... menu."
+msgstr ""
+
+#: MainDlg.cpp:187
+msgid "Show Slider 1"
+msgstr ""
+
+#: MainDlg.cpp:188
+msgid "Show Slider 2"
+msgstr ""
+
+#: MainDlg.cpp:189
+msgid "Show Slider 3"
+msgstr ""
+
+#: MainDlg.cpp:190
+msgid "Show Slider 4"
+msgstr ""
+
+#. i18n: file editfunctionpage.ui line 91
+#: MainDlg.cpp:193 rc.cpp:229 rc.cpp:1883
+#, no-c-format
+msgid "&Hide"
+msgstr "Cudd&io"
+
+#: MainDlg.cpp:202
+msgid "&Move"
+msgstr "Sy&mud"
+
+#: MainDlg.cpp:214
+msgid ""
+"The plot has been modified.\n"
+"Do you want to save it?"
+msgstr ""
+
+#: MainDlg.cpp:252
+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:252
+msgid "Save New Format"
+msgstr ""
+
+#: MainDlg.cpp:266
+msgid ""
+"*.fkt|KmPlot Files (*.fkt)\n"
+"*|All Files"
+msgstr ""
+
+#: MainDlg.cpp:274
+msgid "The file could not be saved"
+msgstr ""
+
+#: MainDlg.cpp:290
+msgid ""
+"*.svg|Scalable Vector Graphics (*.svg)\n"
+"*.bmp|Bitmap 180dpi (*.bmp)\n"
+"*.png|Bitmap 180dpi (*.png)"
+msgstr ""
+
+#: MainDlg.cpp:309 MainDlg.cpp:325 MainDlg.cpp:341
+msgid "The URL could not be saved."
+msgstr ""
+
+#: MainDlg.cpp:395
+msgid "Print Plot"
+msgstr ""
+
+#: MainDlg.cpp:407
+msgid "Colors"
+msgstr "Lliwiau"
+
+#: MainDlg.cpp:407
+msgid "Edit Colors"
+msgstr ""
+
+#: MainDlg.cpp:433
+msgid "Scale"
+msgstr "Chwyddo"
+
+#: MainDlg.cpp:433
+msgid "Edit Scaling"
+msgstr ""
+
+#: MainDlg.cpp:445
+msgid "Edit Fonts"
+msgstr ""
+
+#: MainDlg.cpp:538
+msgid ""
+"Parametric functions must be definied in the \"New Parametric Plot\"-dialog "
+"which you can find in the menubar"
+msgstr ""
+
+#: MainDlg.cpp:543
+msgid "Recursive function is not allowed"
+msgstr ""
+
+#: MainDlg.cpp:802
+msgid "KmPlotPart"
+msgstr "KmPlotPart"
+
+#: kconstanteditor.cpp:95
+msgid "A function uses this constant; therefore, it cannot be removed."
+msgstr ""
+
+#: kconstanteditor.cpp:111 kconstanteditor.cpp:190
+msgid "The item could not be found."
+msgstr ""
+
+#: kconstanteditor.cpp:158
+msgid "Choose Name"
+msgstr ""
+
+#: kconstanteditor.cpp:158
+msgid "Choose a name for the constant:"
+msgstr ""
+
 #. i18n: file kmplot_part.rc line 23
 #: rc.cpp:6
 #, no-c-format
@@ -762,12 +844,6 @@ msgstr ""
 msgid "Extensions"
 msgstr ""
 
-#. i18n: file editfunctionpage.ui line 91
-#: MainDlg.cpp:193 rc.cpp:229 rc.cpp:1883
-#, no-c-format
-msgid "&Hide"
-msgstr "Cudd&io"
-
 #. i18n: file editfunctionpage.ui line 94
 #: rc.cpp:232 rc.cpp:346 rc.cpp:540 rc.cpp:652 rc.cpp:1886 rc.cpp:2000
 #: rc.cpp:2194 rc.cpp:2306
@@ -2342,6 +2418,13 @@ msgstr ""
 msgid "cm"
 msgstr "cm"
 
+#. i18n: file settingspagescaling.ui line 192
+#: View.cpp:1147 kmplotio.cpp:326 rc.cpp:1360 rc.cpp:1441 rc.cpp:3014
+#: rc.cpp:3095
+#, no-c-format
+msgid "automatic"
+msgstr "awtomatig"
+
 #. i18n: file settingspagescaling.ui line 199
 #: rc.cpp:1363 rc.cpp:3017
 #, no-c-format
@@ -2889,338 +2972,256 @@ msgstr ""
 msgid "The value the zoom-out tool should use"
 msgstr ""
 
-#: View.cpp:440 View.cpp:1783
-msgid "The drawing was cancelled by the user."
-msgstr ""
-
-#: View.cpp:478
-msgid "Parameters:"
-msgstr "Paramedrau:"
-
-#: View.cpp:479
-msgid "Plotting Area"
-msgstr ""
-
-#: View.cpp:480
-msgid "Axes Division"
-msgstr ""
-
-#: View.cpp:481
-msgid "Printing Format"
-msgstr ""
-
-#: View.cpp:482
-msgid "x-Axis:"
-msgstr ""
-
-#: View.cpp:483
-msgid "y-Axis:"
-msgstr "Echelin-Y :"
-
-#: View.cpp:491
-msgid "Functions:"
-msgstr "Ffwythiannau :"
-
-#: View.cpp:681
-msgid "root"
-msgstr "gwraidd"
-
-#: View.cpp:1897
-msgid "Are you sure you want to remove this function?"
-msgstr ""
-
-#: xparser.cpp:120
-msgid "Error in extension."
+#: ksliderwindow.cpp:48
+#, c-format
+msgid "Slider %1"
 msgstr ""
 
-#: xparser.cpp:769
-msgid "There are no other Kmplot instances running"
+#: ksliderwindow.cpp:49
+#, c-format
+msgid "Slider no. %1"
 msgstr ""
 
-#: xparser.cpp:781
-msgid "kmplot"
-msgstr "kmplot"
-
-#: xparser.cpp:781
+#: ksliderwindow.cpp:50
 msgid ""
-"Choose which KmPlot instance\n"
-"you want to copy the function to:"
+"Move slider to change the parameter of the function plot connected to this "
+"slider."
 msgstr ""
 
-#: xparser.cpp:807 xparser.cpp:816
-msgid "An error appeared during the transfer"
+#: ksliderwindow.cpp:64
+msgid "&Change Minimum Value"
 msgstr ""
 
-#: kconstanteditor.cpp:95
-msgid "A function uses this constant; therefore, it cannot be removed."
+#: ksliderwindow.cpp:66
+msgid "&Change Maximum Value"
 msgstr ""
 
-#: kconstanteditor.cpp:111 kconstanteditor.cpp:190
-msgid "The item could not be found."
+#: ksliderwindow.cpp:102
+msgid "Change Minimum Value"
 msgstr ""
 
-#: kconstanteditor.cpp:158
-msgid "Choose Name"
+#: ksliderwindow.cpp:102
+msgid "Type a new minimum value for the slider:"
 msgstr ""
 
-#: kconstanteditor.cpp:158
-msgid "Choose a name for the constant:"
+#: ksliderwindow.cpp:113
+msgid "Change Maximum Value"
 msgstr ""
 
-#: MainDlg.cpp:94
-msgid "Enter a function equation, for example: f(x)=x^2"
+#: ksliderwindow.cpp:113
+msgid "Type a new maximum value for the slider:"
 msgstr ""
 
-#: MainDlg.cpp:108
-msgid "General"
-msgstr "Cyffredinol"
-
-#: MainDlg.cpp:108
-msgid "General Settings"
-msgstr "Gosodiadau Cyffredinol"
-
-#: MainDlg.cpp:109
-msgid "Constants"
+#: kmplotio.cpp:250
+msgid "The file could not be loaded"
 msgstr ""
 
-#: MainDlg.cpp:133
-msgid "Configure KmPlot..."
+#: kmplotio.cpp:289
+msgid "The file had an unknown version number"
 msgstr ""
 
-#: MainDlg.cpp:140
-msgid "E&xport..."
-msgstr "&Allforio..."
-
-#: MainDlg.cpp:143
-msgid "&No Zoom"
+#: kmplotio.cpp:541
+msgid "The function %1 could not be loaded"
 msgstr ""
 
-#: MainDlg.cpp:144
-msgid "Zoom &Rectangular"
+#: View.cpp:440 View.cpp:1783
+msgid "The drawing was cancelled by the user."
 msgstr ""
 
-#: MainDlg.cpp:145
-msgid "Zoom &In"
-msgstr "Ne&sàu"
-
-#: MainDlg.cpp:146
-msgid "Zoom &Out"
-msgstr "Pell&hàu"
+#: View.cpp:478
+msgid "Parameters:"
+msgstr "Paramedrau:"
 
-#: MainDlg.cpp:147
-msgid "&Center Point"
+#: View.cpp:479
+msgid "Plotting Area"
 msgstr ""
 
-#: MainDlg.cpp:148
-msgid "&Fit Widget to Trigonometric Functions"
+#: View.cpp:480
+msgid "Axes Division"
 msgstr ""
 
-#: MainDlg.cpp:157
-msgid "Predefined &Math Functions"
+#: View.cpp:481
+msgid "Printing Format"
 msgstr ""
 
-#: MainDlg.cpp:160
-msgid "&Colors..."
-msgstr "&Lliwiau ..."
-
-#: MainDlg.cpp:161
-msgid "&Coordinate System..."
+#: View.cpp:482
+msgid "x-Axis:"
 msgstr ""
 
-#: MainDlg.cpp:163
-msgid "&Scaling..."
-msgstr "&Graddio..."
-
-#: MainDlg.cpp:164
-msgid "&Fonts..."
-msgstr "&Ffontiau ..."
+#: View.cpp:483
+msgid "y-Axis:"
+msgstr "Echelin-Y :"
 
-#: MainDlg.cpp:166
-msgid "Coordinate System I"
-msgstr ""
+#: View.cpp:491
+msgid "Functions:"
+msgstr "Ffwythiannau :"
 
-#: MainDlg.cpp:167
-msgid "Coordinate System II"
-msgstr ""
+#: View.cpp:681
+msgid "root"
+msgstr "gwraidd"
 
-#: MainDlg.cpp:168
-msgid "Coordinate System III"
+#: View.cpp:1897
+msgid "Are you sure you want to remove this function?"
 msgstr ""
 
-#: MainDlg.cpp:171
-msgid "&New Function Plot..."
+#: keditconstant.cpp:61
+msgid "Please insert a valid constant name between A and Z."
 msgstr ""
 
-#: MainDlg.cpp:172
-msgid "New Parametric Plot..."
+#: keditconstant.cpp:78
+msgid "The constant already exists."
 msgstr ""
 
-#: MainDlg.cpp:173
-msgid "New Polar Plot..."
-msgstr ""
+#: editfunction.cpp:62
+msgid "Function"
+msgstr "Ffwythiant"
 
-#: MainDlg.cpp:174
-msgid "Edit Plots..."
+#: editfunction.cpp:64
+msgid "Derivatives"
 msgstr ""
 
-#: MainDlg.cpp:177
-msgid "&Get y-Value..."
+#: editfunction.cpp:70
+#, c-format
+msgid "Slider No. %1"
 msgstr ""
 
-#: MainDlg.cpp:178
-msgid "&Search for Minimum Value..."
+#: editfunction.cpp:180
+msgid "You can only define plot functions in this dialog"
 msgstr ""
 
-#: MainDlg.cpp:179
-msgid "&Search for Maximum Value..."
+#: editfunction.cpp:247
+msgid "Please insert a valid x-value"
 msgstr ""
 
-#: MainDlg.cpp:180
-#, fuzzy
-msgid "&Calculate Integral"
-msgstr "&Cyfrifo"
-
-#: MainDlg.cpp:183
-msgid "Quick Edit"
+#: editfunction.cpp:259
+msgid "Please insert a valid y-value"
 msgstr ""
 
-#: MainDlg.cpp:184
-msgid ""
-"Enter a simple function equation here.\n"
-"For instance: f(x)=x^2\n"
-"For more options use Functions->Edit Plots... menu."
+#: editfunction.cpp:301
+msgid "Recursive function is only allowed when drawing integral graphs"
 msgstr ""
 
-#: MainDlg.cpp:187
-msgid "Show Slider 1"
+#: kprinterdlg.cpp:39
+msgid "KmPlot Options"
 msgstr ""
 
-#: MainDlg.cpp:188
-msgid "Show Slider 2"
+#: kprinterdlg.cpp:45
+msgid "Print header table"
 msgstr ""
 
-#: MainDlg.cpp:189
-msgid "Show Slider 3"
-msgstr ""
+#: kprinterdlg.cpp:46
+msgid "Transparent background"
+msgstr "Cefndir tryloyw"
 
-#: MainDlg.cpp:190
-msgid "Show Slider 4"
+#: parser.cpp:534
+msgid "This function is depending on an other function"
 msgstr ""
 
-#: MainDlg.cpp:202
-msgid "&Move"
-msgstr "Sy&mud"
-
-#: MainDlg.cpp:214
+#: parser.cpp:961
 msgid ""
-"The plot has been modified.\n"
-"Do you want to save it?"
+"Parser error at position %1:\n"
+"Syntax error"
 msgstr ""
 
-#: MainDlg.cpp:252
+#: parser.cpp:964
 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?"
+"Parser error at position %1:\n"
+"Missing parenthesis"
 msgstr ""
 
-#: MainDlg.cpp:252
-msgid "Save New Format"
+#: parser.cpp:967
+msgid ""
+"Parser error at position %1:\n"
+"Function name unknown"
 msgstr ""
 
-#: MainDlg.cpp:266
+#: parser.cpp:970
 msgid ""
-"*.fkt|KmPlot Files (*.fkt)\n"
-"*|All Files"
+"Parser error at position %1:\n"
+"Void function variable"
 msgstr ""
 
-#: MainDlg.cpp:274
-msgid "The file could not be saved"
+#: parser.cpp:973
+msgid ""
+"Parser error at position %1:\n"
+"Too many functions"
 msgstr ""
 
-#: MainDlg.cpp:290
+#: parser.cpp:976
 msgid ""
-"*.svg|Scalable Vector Graphics (*.svg)\n"
-"*.bmp|Bitmap 180dpi (*.bmp)\n"
-"*.png|Bitmap 180dpi (*.png)"
+"Parser error at position %1:\n"
+"Token-memory overflow"
 msgstr ""
 
-#: MainDlg.cpp:309 MainDlg.cpp:325 MainDlg.cpp:341
-msgid "The URL could not be saved."
+#: parser.cpp:979
+msgid ""
+"Parser error at position %1:\n"
+"Stack overflow"
 msgstr ""
 
-#: MainDlg.cpp:395
-msgid "Print Plot"
+#: parser.cpp:982
+msgid ""
+"Parser error at position %1:\n"
+"Name of function not free."
 msgstr ""
 
-#: MainDlg.cpp:407
-msgid "Colors"
-msgstr "Lliwiau"
-
-#: MainDlg.cpp:407
-msgid "Edit Colors"
+#: parser.cpp:985
+msgid ""
+"Parser error at position %1:\n"
+"recursive function not allowed."
 msgstr ""
 
-#: MainDlg.cpp:433
-msgid "Scale"
-msgstr "Chwyddo"
-
-#: MainDlg.cpp:433
-msgid "Edit Scaling"
+#: parser.cpp:988
+#, c-format
+msgid "Could not find a defined constant at position %1."
 msgstr ""
 
-#: MainDlg.cpp:445
-msgid "Edit Fonts"
+#: parser.cpp:991
+msgid "Empty function"
 msgstr ""
 
-#: MainDlg.cpp:538
-msgid ""
-"Parametric functions must be definied in the \"New Parametric Plot\"-dialog "
-"which you can find in the menubar"
+#: parser.cpp:993
+msgid "The function name is not allowed to contain capital letters."
 msgstr ""
 
-#: MainDlg.cpp:543
-msgid "Recursive function is not allowed"
+#: parser.cpp:995
+msgid "Function could not be found."
 msgstr ""
 
-#: MainDlg.cpp:802
-msgid "KmPlotPart"
-msgstr "KmPlotPart"
-
-#: coordsconfigdialog.cpp:39
-msgid "Coords"
+#: parser.cpp:997
+msgid "The expression must not contain user-defined constants."
 msgstr ""
 
-#: coordsconfigdialog.cpp:39
-msgid "Edit Coordinate System"
+#: main.cpp:43
+msgid "Mathematical function plotter for TDE"
 msgstr ""
 
-#: editfunction.cpp:62
-msgid "Function"
-msgstr "Ffwythiant"
+#: main.cpp:47
+msgid "File to open"
+msgstr "Ffeil i agor"
 
-#: editfunction.cpp:64
-msgid "Derivatives"
-msgstr ""
+#: main.cpp:57
+msgid "KmPlot"
+msgstr "KmPlot"
 
-#: editfunction.cpp:70
-#, c-format
-msgid "Slider No. %1"
-msgstr ""
+#: main.cpp:63
+msgid "Original Author"
+msgstr "Awdur Gwreiddiol"
 
-#: editfunction.cpp:180
-msgid "You can only define plot functions in this dialog"
+#: main.cpp:66
+msgid "GUI"
 msgstr ""
 
-#: editfunction.cpp:247
-msgid "Please insert a valid x-value"
-msgstr ""
+#: main.cpp:68
+msgid "Various improvements"
+msgstr "Amrywiaeth o welliannau"
 
-#: editfunction.cpp:259
-msgid "Please insert a valid y-value"
-msgstr ""
+#: main.cpp:69
+msgid "svg icon"
+msgstr "eicon SVG"
 
-#: editfunction.cpp:301
-msgid "Recursive function is only allowed when drawing integral graphs"
+#: main.cpp:70
+msgid "command line options, MIME type"
 msgstr ""
 
 #~ msgid "max:"
diff --git a/tde-i18n-cy/messages/tdeedu/kpercentage.po b/tde-i18n-cy/messages/tdeedu/kpercentage.po
index e73987d6bc4..a69c05009cb 100644
--- a/tde-i18n-cy/messages/tdeedu/kpercentage.po
+++ b/tde-i18n-cy/messages/tdeedu/kpercentage.po
@@ -3,15 +3,117 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kpercentage\n"
-"POT-Creation-Date: 2005-03-18 01:27+0100\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2005-11-02 22:17+0000\n"
 "Last-Translator: Kevin Donnelly <kevin@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10\n"
 
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Kyfieithu: KD"
+
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "kyfieithu@dotmon.com"
+
+#: kanswer.cpp:153 kanswer.cpp:168
+msgid "Congratulations!"
+msgstr "Llongyfarchiadau!"
+
+#: kanswer.cpp:158
+msgid "Error!"
+msgstr "Gwall!"
+
+#: kanswer.cpp:163
+msgid "Oops!"
+msgstr "Wps!"
+
+#: kanswer.cpp:164
+msgid "Mistyped!"
+msgstr "Camdeipiad!"
+
+#: kanswer.cpp:169
+msgid ""
+"Great!\n"
+"You managed all\n"
+"the exercises!"
+msgstr ""
+"Gwych!\n"
+" Rydych wedi llwyddo gwneud bob un ymarfer!"
+
+#: feedback_i18n.cpp:2
+msgid "Good choice!"
+msgstr "Dewis da!"
+
+#: feedback_i18n.cpp:3
+msgid "Well done!"
+msgstr "Da iawn chi!"
+
+#: feedback_i18n.cpp:4
+msgid "Pretty good!"
+msgstr "Go dda!"
+
+#: feedback_i18n.cpp:5
+msgid "Fine!"
+msgstr "Da!"
+
+#: feedback_i18n.cpp:6
+msgid "Right!"
+msgstr "Iawn!"
+
+#: feedback_i18n.cpp:7
+msgid "Yes!"
+msgstr "Ie!"
+
+#: feedback_i18n.cpp:8
+msgid "Great!"
+msgstr "Gwych!"
+
+#: feedback_i18n.cpp:9
+msgid "Good work!"
+msgstr "Ardderchog!"
+
+#: feedback_i18n.cpp:11
+msgid "Wrong!"
+msgstr "Anghywir!"
+
+#: feedback_i18n.cpp:12
+msgid "Not right!"
+msgstr "Dim yn iawn!"
+
+#: feedback_i18n.cpp:13
+msgid "Think twice!"
+msgstr "Meddyliwch eto!"
+
+#: feedback_i18n.cpp:14
+msgid "Sorry, no!"
+msgstr "Sori, nage!"
+
+#: feedback_i18n.cpp:15
+msgid "False!"
+msgstr "Ffug!"
+
+#: feedback_i18n.cpp:16
+msgid "Try again!"
+msgstr "Ceisiwch eto!"
+
+#: feedback_i18n.cpp:17
+msgid "Oh no!"
+msgstr "O na!"
+
+#: feedback_i18n.cpp:18
+msgid "That's not right!"
+msgstr "Nid yw hyn yn gywir!"
+
 #: kpercentage.cpp:71
 msgid "Number of tasks:"
 msgstr "Nifer tasgau:"
@@ -119,54 +221,6 @@ msgid "Choose one of the levels <i>easy</i>, <i>medium</i>, and <i>crazy</i>."
 msgstr ""
 "Dewiswch un o'r lefelau <i>hawdd</i>, <i>go anodd</i>, a <i>gwallgof</i>."
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Kyfieithu: KD"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "kyfieithu@dotmon.com"
-
-#: main.cpp:30
-msgid "A program to improve your skills in calculating with percentages"
-msgstr "Rhaglen i wella eich sgiliau wrth gyfrifiannu efo camrannau"
-
-#: main.cpp:42
-msgid "KPercentage"
-msgstr "KPercentage"
-
-#: main.cpp:48
-msgid "coding, coding and coding"
-msgstr "codio, codio a chodio"
-
-#: main.cpp:49
-msgid "CVS, coding and sed-script"
-msgstr "CVS, codio a sgript sed"
-
-#: main.cpp:50
-msgid "CVS, coding and Makefile stuff"
-msgstr "CVS, codio a phethau Makefile"
-
-#: main.cpp:51 main.cpp:52
-msgid "Pixmaps"
-msgstr "Picsfapiau"
-
-#: main.cpp:53
-msgid "Spelling and Language"
-msgstr "Sillafu ac Iaith"
-
-#: main.cpp:54
-msgid "Cleaning and bugfixing code"
-msgstr "Glanhau'r côd a trwsio namau"
-
-#: main.cpp:55
-msgid "SVG icon"
-msgstr "Eicon SVG"
-
 #: kpercentmain.cpp:102
 #, c-format
 msgid " % of "
@@ -224,91 +278,38 @@ msgstr ""
 "%1%\n"
 "yn anghywir"
 
-#: feedback_i18n.cpp:2
-msgid "Good choice!"
-msgstr "Dewis da!"
-
-#: feedback_i18n.cpp:3
-msgid "Well done!"
-msgstr "Da iawn chi!"
-
-#: feedback_i18n.cpp:4
-msgid "Pretty good!"
-msgstr "Go dda!"
-
-#: feedback_i18n.cpp:5
-msgid "Fine!"
-msgstr "Da!"
-
-#: feedback_i18n.cpp:6
-msgid "Right!"
-msgstr "Iawn!"
-
-#: feedback_i18n.cpp:7
-msgid "Yes!"
-msgstr "Ie!"
-
-#: feedback_i18n.cpp:8
-msgid "Great!"
-msgstr "Gwych!"
-
-#: feedback_i18n.cpp:9
-msgid "Good work!"
-msgstr "Ardderchog!"
-
-#: feedback_i18n.cpp:11
-msgid "Wrong!"
-msgstr "Anghywir!"
-
-#: feedback_i18n.cpp:12
-msgid "Not right!"
-msgstr "Dim yn iawn!"
-
-#: feedback_i18n.cpp:13
-msgid "Think twice!"
-msgstr "Meddyliwch eto!"
-
-#: feedback_i18n.cpp:14
-msgid "Sorry, no!"
-msgstr "Sori, nage!"
-
-#: feedback_i18n.cpp:15
-msgid "False!"
-msgstr "Ffug!"
+#: main.cpp:30
+msgid "A program to improve your skills in calculating with percentages"
+msgstr "Rhaglen i wella eich sgiliau wrth gyfrifiannu efo camrannau"
 
-#: feedback_i18n.cpp:16
-msgid "Try again!"
-msgstr "Ceisiwch eto!"
+#: main.cpp:42
+msgid "KPercentage"
+msgstr "KPercentage"
 
-#: feedback_i18n.cpp:17
-msgid "Oh no!"
-msgstr "O na!"
+#: main.cpp:48
+msgid "coding, coding and coding"
+msgstr "codio, codio a chodio"
 
-#: feedback_i18n.cpp:18
-msgid "That's not right!"
-msgstr "Nid yw hyn yn gywir!"
+#: main.cpp:49
+msgid "CVS, coding and sed-script"
+msgstr "CVS, codio a sgript sed"
 
-#: kanswer.cpp:153 kanswer.cpp:168
-msgid "Congratulations!"
-msgstr "Llongyfarchiadau!"
+#: main.cpp:50
+msgid "CVS, coding and Makefile stuff"
+msgstr "CVS, codio a phethau Makefile"
 
-#: kanswer.cpp:158
-msgid "Error!"
-msgstr "Gwall!"
+#: main.cpp:51 main.cpp:52
+msgid "Pixmaps"
+msgstr "Picsfapiau"
 
-#: kanswer.cpp:163
-msgid "Oops!"
-msgstr "Wps!"
+#: main.cpp:53
+msgid "Spelling and Language"
+msgstr "Sillafu ac Iaith"
 
-#: kanswer.cpp:164
-msgid "Mistyped!"
-msgstr "Camdeipiad!"
+#: main.cpp:54
+msgid "Cleaning and bugfixing code"
+msgstr "Glanhau'r côd a trwsio namau"
 
-#: kanswer.cpp:169
-msgid ""
-"Great!\n"
-"You managed all\n"
-"the exercises!"
-msgstr ""
-"Gwych!\n"
-" Rydych wedi llwyddo gwneud bob un ymarfer!"
+#: main.cpp:55
+msgid "SVG icon"
+msgstr "Eicon SVG"
diff --git a/tde-i18n-cy/messages/tdeedu/kstars.po b/tde-i18n-cy/messages/tdeedu/kstars.po
index 5f7e3c24714..f8c23007f1d 100644
--- a/tde-i18n-cy/messages/tdeedu/kstars.po
+++ b/tde-i18n-cy/messages/tdeedu/kstars.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kstars\n"
-"POT-Creation-Date: 2008-07-08 01:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-02-26 16:58+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -496,7 +497,7 @@ msgstr "Uwch"
 msgid "Log"
 msgstr "Cofnodion"
 
-#: detaildialog.cpp:487 skyobject.cpp:386 tools/observinglist.cpp:285
+#: detaildialog.cpp:487 skyobject.cpp:387 tools/observinglist.cpp:285
 #: tools/observinglist.cpp:493 tools/observinglist.cpp:503
 #, c-format
 msgid "Record here observation logs and/or data on %1."
@@ -25514,8 +25515,8 @@ msgstr ""
 msgid ""
 "The atmosphere bends light passing through it, like a lens.  If this item is "
 "checked, this \"atmospheric refraction\" will be simulated in the sky map.  "
-"Note that this correction is only applied when using the Horizontal coordinate "
-"system."
+"Note that this correction is only applied when using theQt::Horizontal "
+"coordinate system."
 msgstr ""
 
 #. i18n: file opsadvancedui.ui line 41
@@ -27459,9 +27460,10 @@ msgid ""
 "arcminutes and arcseconds (\"45:20\", \"45:20:00\", \"45:20\", \"45 20.0\", "
 "etc.).\n"
 "\n"
-"The Altitude is one of the coordinates in the Horizontal coordinate system.  It "
-"is defined as the angle of an object above or below the horizon.  For example, "
-"the Zenith has an Altitude of 90 degrees.  Altitude is also known as Elevation."
+"The Altitude is one of the coordinates in theQt::Horizontal coordinate system.  "
+"It is defined as the angle of an object above or below the horizon.  For "
+"example, the Zenith has an Altitude of 90 degrees.  Altitude is also known as "
+"Elevation."
 msgstr ""
 
 #. i18n: file tools/argsetaltaz.ui line 56
@@ -29781,109 +29783,109 @@ msgstr "di-enw"
 msgid "unnamed object"
 msgstr ""
 
-#: skyobject.cpp:311
+#: skyobject.cpp:312
 msgid "Star"
 msgstr "Seren"
 
-#: skyobject.cpp:312
+#: skyobject.cpp:313
 msgid "Catalog Star"
 msgstr ""
 
-#: skyobject.cpp:313
+#: skyobject.cpp:314
 msgid "Planet"
 msgstr ""
 
-#: skyobject.cpp:314
+#: skyobject.cpp:315
 msgid "Open Cluster"
 msgstr ""
 
-#: skyobject.cpp:315
+#: skyobject.cpp:316
 msgid "Globular Cluster"
 msgstr ""
 
-#: skyobject.cpp:316
+#: skyobject.cpp:317
 msgid "Gaseous Nebula"
 msgstr ""
 
-#: skyobject.cpp:317
+#: skyobject.cpp:318
 msgid "Planetary Nebula"
 msgstr ""
 
-#: skyobject.cpp:318
+#: skyobject.cpp:319
 msgid "Supernova Remnant"
 msgstr ""
 
-#: skyobject.cpp:319
+#: skyobject.cpp:320
 msgid "Galaxy"
 msgstr "Galaeth"
 
-#: skyobject.cpp:320
+#: skyobject.cpp:321
 msgid "Comet"
 msgstr ""
 
-#: skyobject.cpp:321
+#: skyobject.cpp:322
 msgid "Asteroid"
 msgstr ""
 
-#: skyobject.cpp:322
+#: skyobject.cpp:323
 msgid "Unknown Type"
 msgstr "Math anhysbys"
 
-#: skyobject.cpp:345
+#: skyobject.cpp:346
 msgid "Show HST Image"
 msgstr ""
 
-#: skyobject.cpp:346
+#: skyobject.cpp:347
 msgid "%1: Hubble Space Telescope, operated by STScI for NASA [public domain]"
 msgstr ""
 
-#: skyobject.cpp:349
+#: skyobject.cpp:350
 msgid "Show Spitzer Image"
 msgstr ""
 
-#: skyobject.cpp:350
+#: skyobject.cpp:351
 msgid "%1: Spitzer Space Telescope, courtesy NASA/JPL-Caltech [public domain]"
 msgstr ""
 
-#: skyobject.cpp:353
+#: skyobject.cpp:354
 msgid "Show SEDS Image"
 msgstr ""
 
-#: skyobject.cpp:354
+#: skyobject.cpp:355
 msgid "%1: SEDS, http://www.seds.org [free for non-commercial use]"
 msgstr ""
 
-#: skyobject.cpp:357
+#: skyobject.cpp:358
 msgid "Show KPNO AOP Image"
 msgstr ""
 
-#: skyobject.cpp:358
+#: skyobject.cpp:359
 msgid ""
 "%1: Advanced Observing Program at Kitt Peak National Observatory [free for "
 "non-commercial use; no physical reproductions]"
 msgstr ""
 
-#: skyobject.cpp:361
+#: skyobject.cpp:362
 msgid "Show NOAO Image"
 msgstr ""
 
-#: skyobject.cpp:362
+#: skyobject.cpp:363
 msgid ""
 "%1: National Optical Astronomy Observatories and AURA [free for non-commercial "
 "use]"
 msgstr ""
 
-#: skyobject.cpp:366
+#: skyobject.cpp:367
 msgid ""
 "%1: Very Large Telescope, operated by the European Southern Observatory [free "
 "for non-commercial use; no reproductions]"
 msgstr ""
 
-#: skyobject.cpp:369
+#: skyobject.cpp:370
 msgid "Show"
 msgstr "Dangos"
 
-#: skyobject.cpp:426
+#: skyobject.cpp:427
 msgid "user log file could not be opened."
 msgstr ""
 
@@ -30334,7 +30336,7 @@ msgstr ""
 msgid ""
 "\t\t"
 "<p>The status bar displays the current sky coordinates of the mouse cursor,\n"
-"\t\t\tin both Equatorial and Horizontal coordinate systems.\n"
+"\t\t\tin both Equatorial andQt::Horizontal coordinate systems.\n"
 "\t\t</p>\n"
 "\t\n"
 msgstr ""
@@ -30372,7 +30374,7 @@ msgstr ""
 #: tips.cpp:125
 msgid ""
 "\t\t"
-"<p>To switch between Equatorial and Horizontal coordinate\n"
+"<p>To switch between Equatorial andQt::Horizontal coordinate\n"
 "\t\t\tsystems, use the \"View->Coordinates\" menu item, or press the spacebar.\n"
 "\t\t</p>\n"
 "\t\n"
@@ -30595,7 +30597,7 @@ msgid ""
 "\t\t\titem in the File menu, or by pressing Ctrl+I.  In addition, you can\n"
 "\t\t\trun KStars from a command prompt with the \"--dump\" argument to save a\n"
 "\t\t\tsky image to disk without even opening the program window.  This can\n"
-"\t\t\tbe used to generate dynamic wallpaper for your TDE desktop.\n"
+"\t\t\tbe used to generate dynamic wallpaper for your KDE desktop.\n"
 "\t\t</p>\n"
 "\t\n"
 msgstr ""
@@ -30780,11 +30782,11 @@ msgid ""
 "\t\n"
 msgstr ""
 
-#: addlinkdialog.h:41
+#: addlinkdialog.h:42
 msgid "object"
 msgstr "gwrthrych"
 
-#: ksnewstuff.h:69
+#: ksnewstuff.h:68
 msgid "Uploading data is not possible yet!"
 msgstr ""
 
@@ -31766,7 +31768,7 @@ msgid "Skymap Options"
 msgstr ""
 
 #: tools/scriptbuilder.cpp:649
-msgid "Use Horizontal coordinates? (otherwise, use Equatorial)"
+msgid "UseQt::Horizontal coordinates? (otherwise, use Equatorial)"
 msgstr ""
 
 #: tools/scriptbuilder.cpp:650
diff --git a/tde-i18n-cy/messages/tdeedu/ktouch.po b/tde-i18n-cy/messages/tdeedu/ktouch.po
index 1ffeb9e0468..518ade474e7 100644
--- a/tde-i18n-cy/messages/tdeedu/ktouch.po
+++ b/tde-i18n-cy/messages/tdeedu/ktouch.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdeedu/ktouch.po\n"
-"POT-Creation-Date: 2008-07-08 01:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeedu/kturtle.po b/tde-i18n-cy/messages/tdeedu/kturtle.po
index 4ef92699f79..aa04789f927 100644
--- a/tde-i18n-cy/messages/tdeedu/kturtle.po
+++ b/tde-i18n-cy/messages/tdeedu/kturtle.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdeedu/kturtle.po\n"
-"POT-Creation-Date: 2007-06-18 01:16+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeedu/kverbos.po b/tde-i18n-cy/messages/tdeedu/kverbos.po
index c5e82afc83f..978de293ba4 100644
--- a/tde-i18n-cy/messages/tdeedu/kverbos.po
+++ b/tde-i18n-cy/messages/tdeedu/kverbos.po
@@ -1,22 +1,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdeedu/kverbos.po\n"
-"POT-Creation-Date: 2008-07-08 01:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kverbosdoc.cpp:106
-msgid ""
-"The current file has been modified.\n"
-"Do you want to save it?"
-msgstr ""
-"Addaswyd y ffeil gyfredol.\n"
-"Hoffech ei chadw?"
-
 #: _translatorinfo.cpp:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
@@ -29,39 +22,6 @@ msgid ""
 "Your emails"
 msgstr "kyfieithu@dotmon.com"
 
-#: main.cpp:24 main.cpp:38
-msgid "KVerbos"
-msgstr "KVerbos"
-
-#: main.cpp:28
-msgid "File to open"
-msgstr "Ffeil i agor"
-
-#: main.cpp:42
-msgid "svg icon"
-msgstr "eicon SVG"
-
-#: kerfassen.cpp:276
-msgid ""
-"The current verb is not in the list yet.\n"
-"Do you want to add it?"
-msgstr ""
-
-#: kerfassen.cpp:277
-msgid "Do Not Add"
-msgstr "Na Ychwaneger"
-
-#: kerfassen.cpp:423
-msgid ""
-"The current verb is already in the list.\n"
-"Do you want to replace it?\n"
-"If you do not want to change the list press 'Cancel'."
-msgstr ""
-
-#: kerfassen.cpp:424
-msgid "Do Not Replace"
-msgstr ""
-
 #: kverbos.cpp:119
 msgid "New &Window"
 msgstr "&Ffenestr Newydd"
@@ -261,6 +221,52 @@ msgstr ""
 msgid "user: "
 msgstr "defnyddiwr: "
 
+#: kerfassen.cpp:276
+msgid ""
+"The current verb is not in the list yet.\n"
+"Do you want to add it?"
+msgstr ""
+
+#: kerfassen.cpp:277
+msgid "Do Not Add"
+msgstr "Na Ychwaneger"
+
+#: kerfassen.cpp:423
+msgid ""
+"The current verb is already in the list.\n"
+"Do you want to replace it?\n"
+"If you do not want to change the list press 'Cancel'."
+msgstr ""
+
+#: kerfassen.cpp:424
+msgid "Do Not Replace"
+msgstr ""
+
+#: kverbosdoc.cpp:106
+msgid ""
+"The current file has been modified.\n"
+"Do you want to save it?"
+msgstr ""
+"Addaswyd y ffeil gyfredol.\n"
+"Hoffech ei chadw?"
+
+#: kresult.cpp:37
+msgid "trained"
+msgstr ""
+
+#: kresult.cpp:38
+#, c-format
+msgid "correct in %"
+msgstr ""
+
+#: kresult.cpp:39
+msgid "date"
+msgstr "dyddiad"
+
+#: kresult.cpp:43
+msgid " verbs"
+msgstr ""
+
 #. i18n: file kverbosui.rc line 15
 #: rc.cpp:12
 #, no-c-format
@@ -712,19 +718,14 @@ msgstr ""
 msgid "The language selected by the user"
 msgstr ""
 
-#: kresult.cpp:37
-msgid "trained"
-msgstr ""
-
-#: kresult.cpp:38
-#, c-format
-msgid "correct in %"
-msgstr ""
+#: main.cpp:24 main.cpp:38
+msgid "KVerbos"
+msgstr "KVerbos"
 
-#: kresult.cpp:39
-msgid "date"
-msgstr "dyddiad"
+#: main.cpp:28
+msgid "File to open"
+msgstr "Ffeil i agor"
 
-#: kresult.cpp:43
-msgid " verbs"
-msgstr ""
+#: main.cpp:42
+msgid "svg icon"
+msgstr "eicon SVG"
diff --git a/tde-i18n-cy/messages/tdeedu/kvoctrain.po b/tde-i18n-cy/messages/tdeedu/kvoctrain.po
index e9fc2a9c110..4453efe80d0 100644
--- a/tde-i18n-cy/messages/tdeedu/kvoctrain.po
+++ b/tde-i18n-cy/messages/tdeedu/kvoctrain.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdeedu/kvoctrain.po\n"
-"POT-Creation-Date: 2008-07-08 01:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -1143,7 +1144,7 @@ msgid "&From Original"
 msgstr ""
 
 #. i18n: file ./entry-dialogs/FromToEntryPageForm.ui line 33
-#: entry-dialogs/EntryDlg.cpp:167 entry-dialogs/EntryDlg.cpp:259 rc.cpp:825
+#: entry-dialogs/EntryDlg.cpp:167 entry-dialogs/EntryDlg.cpp:259 rc.cpp:480
 #, no-c-format
 msgid "Properties From Original"
 msgstr ""
@@ -1223,11 +1224,11 @@ msgstr ""
 msgid "Ready."
 msgstr "Parod"
 
-#: kva_clip.cpp:115
+#: kva_clip.cpp:73
 msgid "Copying selection to clipboard..."
 msgstr "Yn copïo'r dewisiad i'r clipfwrdd..."
 
-#: kva_clip.cpp:166
+#: kva_clip.cpp:124
 msgid "Inserting clipboard contents..."
 msgstr "Yn mewnosod cynnwys y clipfwrdd..."
 
@@ -1546,7 +1547,7 @@ msgid "Create random lessons with unassigned entries"
 msgstr ""
 
 #. i18n: file ./docprop-dialogs/TenseOptPageForm.ui line 123
-#: kva_init.cpp:183 rc.cpp:27 rc.cpp:123 rc.cpp:150 rc.cpp:168
+#: kva_init.cpp:183 rc.cpp:1104 rc.cpp:1200 rc.cpp:1218 rc.cpp:1236
 #, no-c-format
 msgid "&Clean Up"
 msgstr "&Glanhau"
@@ -1628,7 +1629,7 @@ msgstr ""
 
 #: kva_io.cpp:49
 msgid ""
-"*.qvo|QVocab (*.qvo)\n"
+"*.qvo|TQVocab (*.qvo)\n"
 msgstr ""
 
 #: kva_io.cpp:50
@@ -1939,7 +1940,7 @@ msgid "Original"
 msgstr "Gwreiddiol"
 
 #. i18n: file ./statistik-dialogs/StatistikPageForm.ui line 61
-#: kvoctrainview.cpp:179 rc.cpp:783
+#: kvoctrainview.cpp:179 rc.cpp:303
 #, no-c-format
 msgid "Lesson"
 msgstr ""
@@ -2515,15 +2516,15 @@ msgstr ""
 msgid "Future"
 msgstr ""
 
-#: kvt-core/kvd_csv.cpp:70
+#: kvt-core/kvd_csv.cpp:120
 msgid "! Title:"
 msgstr ""
 
-#: kvt-core/kvd_csv.cpp:71
+#: kvt-core/kvd_csv.cpp:121
 msgid "! Author:"
 msgstr ""
 
-#: kvt-core/kvd_csv.cpp:239
+#: kvt-core/kvd_csv.cpp:289
 msgid "Error in csv file"
 msgstr ""
 
@@ -2743,7 +2744,7 @@ msgstr "KVocTrain"
 #: main.cpp:48
 msgid ""
 "© 1999-2002\tEwald Arnold\n"
-"© 2001-2002\tThe TDE team\n"
+"© 2001-2002\tThe KDE team\n"
 "© 2004-2007\tPeter Hedlund\n"
 "© 2007     \tFrederik Gladhorn\n"
 msgstr ""
@@ -2765,7 +2766,7 @@ msgid "Original Author"
 msgstr "Awdur Gwreiddiol"
 
 #: main.cpp:66
-msgid "Help with port to Qt3/TDE3"
+msgid "Help with port to Qt3/KDE3"
 msgstr ""
 
 #: main.cpp:69
@@ -2803,7 +2804,7 @@ msgid "Port to TDEConfig XT"
 msgstr ""
 
 #: main.cpp:92
-msgid "TDE Team"
+msgid "KDE Team"
 msgstr ""
 
 #: main.cpp:93
@@ -2984,888 +2985,852 @@ msgstr ""
 msgid "&Learning"
 msgstr ""
 
-#. i18n: file ./docprop-dialogs/TenseOptPageForm.ui line 16
-#: rc.cpp:12 rc.cpp:30 rc.cpp:90 rc.cpp:108 rc.cpp:126 rc.cpp:135 rc.cpp:153
-#: rc.cpp:480 rc.cpp:669 rc.cpp:753 rc.cpp:771 rc.cpp:786 rc.cpp:807
-#: rc.cpp:822 rc.cpp:852 rc.cpp:870 rc.cpp:876 rc.cpp:888 rc.cpp:894
-#: rc.cpp:897 rc.cpp:906 rc.cpp:948 rc.cpp:975 rc.cpp:978 rc.cpp:981
-#: rc.cpp:1026 rc.cpp:1029 rc.cpp:1032 rc.cpp:1035 rc.cpp:1038 rc.cpp:1041
-#: rc.cpp:1044 rc.cpp:1047 rc.cpp:1050 rc.cpp:1053 rc.cpp:1059 rc.cpp:1176
-#: rc.cpp:1179 rc.cpp:1182 rc.cpp:1185 rc.cpp:1188 rc.cpp:1215 rc.cpp:1218
+#. i18n: file ./query-dialogs/RandomQueryDlgForm.ui line 40
+#: rc.cpp:12
 #, no-c-format
-msgid "-"
-msgstr "-"
+msgid "Enter the correct translation:"
+msgstr ""
 
-#. i18n: file ./docprop-dialogs/TenseOptPageForm.ui line 33
+#. i18n: file ./query-dialogs/RandomQueryDlgForm.ui line 56
 #: rc.cpp:15
 #, no-c-format
-msgid "Tense Descriptions"
+msgid "Original Expression"
 msgstr ""
 
-#. i18n: file ./docprop-dialogs/TenseOptPageForm.ui line 75
-#: rc.cpp:18 rc.cpp:114 rc.cpp:141 rc.cpp:159
+#. i18n: file ./query-dialogs/RandomQueryDlgForm.ui line 81
+#: rc.cpp:18 rc.cpp:21 rc.cpp:24 rc.cpp:69 rc.cpp:72 rc.cpp:75 rc.cpp:78
+#: rc.cpp:81 rc.cpp:84 rc.cpp:87 rc.cpp:90 rc.cpp:93 rc.cpp:96 rc.cpp:102
+#: rc.cpp:147 rc.cpp:150 rc.cpp:153 rc.cpp:156 rc.cpp:159 rc.cpp:222
+#: rc.cpp:225 rc.cpp:291 rc.cpp:306 rc.cpp:324 rc.cpp:342 rc.cpp:348
+#: rc.cpp:360 rc.cpp:366 rc.cpp:369 rc.cpp:378 rc.cpp:399 rc.cpp:414
+#: rc.cpp:435 rc.cpp:477 rc.cpp:558 rc.cpp:609 rc.cpp:1089 rc.cpp:1107
+#: rc.cpp:1167 rc.cpp:1185 rc.cpp:1203 rc.cpp:1221 rc.cpp:1239
 #, no-c-format
-msgid "&New..."
-msgstr "&Newydd..."
-
-#. i18n: file ./docprop-dialogs/TenseOptPageForm.ui line 91
-#: rc.cpp:21 rc.cpp:117 rc.cpp:144 rc.cpp:162
-#, no-c-format
-msgid "&Modify..."
-msgstr "&Addasu..."
-
-#. i18n: file ./docprop-dialogs/LangPropPageForm.ui line 33
-#: rc.cpp:33
-#, no-c-format
-msgid "Language Elements"
-msgstr ""
+msgid "-"
+msgstr "-"
 
-#. i18n: file ./docprop-dialogs/LangPropPageForm.ui line 58
-#: rc.cpp:36
+#. i18n: file ./query-dialogs/RandomQueryDlgForm.ui line 121
+#: rc.cpp:27 rc.cpp:393 rc.cpp:1179
 #, no-c-format
-msgid "Language code (ISO 639):"
+msgid "&Remark:"
 msgstr ""
 
-#. i18n: file ./docprop-dialogs/LangPropPageForm.ui line 116
-#: rc.cpp:39
-#, no-c-format
-msgid "Articles"
-msgstr "Erhyglau"
-
-#. i18n: file ./docprop-dialogs/LangPropPageForm.ui line 133
-#: rc.cpp:42 rc.cpp:921
+#. i18n: file ./query-dialogs/RandomQueryDlgForm.ui line 129
+#: rc.cpp:30
 #, no-c-format
-msgid "&Female:"
-msgstr ""
+msgid "T&ype:"
+msgstr "M&ath:"
 
-#. i18n: file ./docprop-dialogs/LangPropPageForm.ui line 144
-#: rc.cpp:45 rc.cpp:933
+#. i18n: file ./query-dialogs/RandomQueryDlgForm.ui line 137
+#: rc.cpp:33
 #, no-c-format
-msgid "&Male:"
+msgid "&False friend:"
 msgstr ""
 
-#. i18n: file ./docprop-dialogs/LangPropPageForm.ui line 176
-#: rc.cpp:48
+#. i18n: file ./query-dialogs/RandomQueryDlgForm.ui line 251
+#: rc.cpp:36 rc.cpp:108 rc.cpp:171 rc.cpp:198 rc.cpp:252 rc.cpp:279
 #, no-c-format
-msgid "Definite"
-msgstr ""
+msgid "&Verify"
+msgstr "&Gwirio"
 
-#. i18n: file ./docprop-dialogs/LangPropPageForm.ui line 266
-#: rc.cpp:51 rc.cpp:930
+#. i18n: file ./query-dialogs/RandomQueryDlgForm.ui line 267
+#: rc.cpp:39 rc.cpp:249
 #, no-c-format
-msgid "&Neutral:"
+msgid "Show &More"
 msgstr ""
 
-#. i18n: file ./docprop-dialogs/LangPropPageForm.ui line 277
-#: rc.cpp:54
+#. i18n: file ./query-dialogs/RandomQueryDlgForm.ui line 283
+#: rc.cpp:42 rc.cpp:111 rc.cpp:165 rc.cpp:204 rc.cpp:246 rc.cpp:285
 #, no-c-format
-msgid "Indefinite"
-msgstr ""
+msgid "Show &All"
+msgstr "Dango&s Pob Un"
 
-#. i18n: file ./docprop-dialogs/LangPropPageForm.ui line 295
-#: rc.cpp:57
+#. i18n: file ./query-dialogs/RandomQueryDlgForm.ui line 299
+#: rc.cpp:45 rc.cpp:114 rc.cpp:162 rc.cpp:207 rc.cpp:288
 #, no-c-format
-msgid "Conjugation"
+msgid "&Do Not Know"
 msgstr ""
 
-#. i18n: file ./docprop-dialogs/LangPropPageForm.ui line 312
-#: rc.cpp:60 rc.cpp:918
+#. i18n: file ./query-dialogs/RandomQueryDlgForm.ui line 315
+#: rc.cpp:48 rc.cpp:105 rc.cpp:168 rc.cpp:201 rc.cpp:240 rc.cpp:282
 #, no-c-format
-msgid "&1. Person:"
+msgid "I &Know It"
 msgstr ""
 
-#. i18n: file ./docprop-dialogs/LangPropPageForm.ui line 323
-#: rc.cpp:63 rc.cpp:936
+#. i18n: file ./query-dialogs/RandomQueryDlgForm.ui line 333
+#: rc.cpp:51 rc.cpp:117 rc.cpp:174 rc.cpp:210 rc.cpp:228 rc.cpp:267
 #, no-c-format
-msgid "&2. Person:"
-msgstr ""
+msgid "Progress"
+msgstr "Cynnydd"
 
-#. i18n: file ./docprop-dialogs/LangPropPageForm.ui line 334
-#: rc.cpp:66
+#. i18n: file ./query-dialogs/RandomQueryDlgForm.ui line 350
+#: rc.cpp:54 rc.cpp:123 rc.cpp:180 rc.cpp:216 rc.cpp:234 rc.cpp:273
 #, no-c-format
-msgid "3. Person:"
-msgstr ""
+msgid "Time:"
+msgstr "Amser:"
 
-#. i18n: file ./docprop-dialogs/LangPropPageForm.ui line 389
-#: rc.cpp:69 rc.cpp:912
+#. i18n: file ./query-dialogs/RandomQueryDlgForm.ui line 358
+#: rc.cpp:57 rc.cpp:120 rc.cpp:177 rc.cpp:213 rc.cpp:231 rc.cpp:270
 #, no-c-format
-msgid "C&ommon"
-msgstr "C&yffredin"
+msgid "Count:"
+msgstr "Cyfrif:"
 
-#. i18n: file ./docprop-dialogs/LangPropPageForm.ui line 397
-#: rc.cpp:72
+#. i18n: file ./query-dialogs/RandomQueryDlgForm.ui line 392
+#: rc.cpp:60 rc.cpp:126 rc.cpp:183 rc.cpp:219 rc.cpp:237 rc.cpp:276
 #, no-c-format
-msgid "F&emale:"
+msgid "Cycle:"
 msgstr ""
 
-#. i18n: file ./docprop-dialogs/LangPropPageForm.ui line 408
-#: rc.cpp:75
+#. i18n: file ./query-dialogs/VerbQueryDlgForm.ui line 40
+#: rc.cpp:63
 #, no-c-format
-msgid "M&ale:"
+msgid "Enter the correct conjugation forms."
 msgstr ""
 
-#. i18n: file ./docprop-dialogs/LangPropPageForm.ui line 419
-#: rc.cpp:78
+#. i18n: file ./query-dialogs/VerbQueryDlgForm.ui line 61
+#: rc.cpp:66
 #, no-c-format
-msgid "Neu&tral:"
+msgid "Current tense is %1."
 msgstr ""
 
-#. i18n: file ./docprop-dialogs/LangPropPageForm.ui line 430
-#: rc.cpp:81 rc.cpp:939
+#. i18n: file ./query-dialogs/VerbQueryDlgForm.ui line 283
+#: rc.cpp:99
 #, no-c-format
-msgid "Plural"
+msgid "Base form:"
 msgstr ""
 
-#. i18n: file ./docprop-dialogs/LangPropPageForm.ui line 446
-#: rc.cpp:84 rc.cpp:915
-#, no-c-format
-msgid "&Common"
-msgstr "&Cyffredin"
-
-#. i18n: file ./docprop-dialogs/LangPropPageForm.ui line 454
-#: rc.cpp:87 rc.cpp:924
+#. i18n: file ./query-dialogs/MCQueryDlgForm.ui line 32
+#: rc.cpp:129
 #, no-c-format
-msgid "Singular"
+msgid "Select the correct translation:"
 msgstr ""
 
-#. i18n: file ./docprop-dialogs/TitlePageForm.ui line 33
-#: rc.cpp:93
+#. i18n: file ./query-dialogs/MCQueryDlgForm.ui line 90
+#: rc.cpp:132 rc.cpp:423
 #, no-c-format
-msgid "General Document Properties"
-msgstr ""
+msgid "&2:"
+msgstr "&2 :"
 
-#. i18n: file ./docprop-dialogs/TitlePageForm.ui line 50
-#: rc.cpp:96
+#. i18n: file ./query-dialogs/MCQueryDlgForm.ui line 98
+#: rc.cpp:135 rc.cpp:426
 #, no-c-format
-msgid "&Title:"
-msgstr "&Teitl:"
+msgid "&3:"
+msgstr "&3 :"
 
-#. i18n: file ./docprop-dialogs/TitlePageForm.ui line 74
-#: rc.cpp:99
+#. i18n: file ./query-dialogs/MCQueryDlgForm.ui line 106
+#: rc.cpp:138 rc.cpp:420
 #, no-c-format
-msgid "&Authors:"
-msgstr "&Awduron :"
+msgid "&1:"
+msgstr "&1 :"
 
-#. i18n: file ./docprop-dialogs/TitlePageForm.ui line 85
-#: rc.cpp:102 rc.cpp:801 rc.cpp:984
+#. i18n: file ./query-dialogs/MCQueryDlgForm.ui line 114
+#: rc.cpp:141 rc.cpp:429
 #, no-c-format
-msgid "&Remark:"
-msgstr ""
+msgid "&4:"
+msgstr "&4 :"
 
-#. i18n: file ./docprop-dialogs/TitlePageForm.ui line 96
-#: rc.cpp:105
+#. i18n: file ./query-dialogs/MCQueryDlgForm.ui line 122
+#: rc.cpp:144 rc.cpp:432
 #, no-c-format
-msgid "&License:"
-msgstr "&Trwydded:"
+msgid "&5:"
+msgstr "&5 :"
 
-#. i18n: file ./docprop-dialogs/UsageOptPageForm.ui line 33
-#: rc.cpp:111
+#. i18n: file ./query-dialogs/AdjQueryDlgForm.ui line 40
+#: rc.cpp:186
 #, no-c-format
-msgid "Usage Labels"
+msgid "Fill in the missing comparison expressions:"
 msgstr ""
 
-#. i18n: file ./docprop-dialogs/DocOptionsPageForm.ui line 33
-#: rc.cpp:129
+#. i18n: file ./query-dialogs/AdjQueryDlgForm.ui line 48
+#: rc.cpp:189 rc.cpp:405 rc.cpp:528 rc.cpp:999
 #, no-c-format
-msgid "Document Options"
+msgid "Level &1:"
 msgstr ""
 
-#. i18n: file ./docprop-dialogs/DocOptionsPageForm.ui line 50
-#: rc.cpp:132
+#. i18n: file ./query-dialogs/AdjQueryDlgForm.ui line 59
+#: rc.cpp:192 rc.cpp:411 rc.cpp:531 rc.cpp:1017
 #, no-c-format
-msgid "Allo&w sorting"
+msgid "Level &3:"
 msgstr ""
 
-#. i18n: file ./docprop-dialogs/TypeOptPageForm.ui line 33
-#: rc.cpp:138
+#. i18n: file ./query-dialogs/AdjQueryDlgForm.ui line 70
+#: rc.cpp:195 rc.cpp:408 rc.cpp:507 rc.cpp:1002
 #, no-c-format
-msgid "Type Descriptions"
+msgid "Level &2:"
 msgstr ""
 
-#. i18n: file ./docprop-dialogs/LessOptPageForm.ui line 33
-#: rc.cpp:156
+#. i18n: file ./query-dialogs/SimpleQueryDlgForm.ui line 278
+#: rc.cpp:243
 #, no-c-format
-msgid "Lesson Descriptions"
+msgid "Do &Not Know"
 msgstr ""
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 35
-#: rc.cpp:171
+#. i18n: file ./query-dialogs/ArtQueryDlgForm.ui line 40
+#: rc.cpp:255
 #, no-c-format
-msgid "&Table font:"
+msgid "Select the correct article for this noun:"
 msgstr ""
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 51
-#: rc.cpp:174
+#. i18n: file ./query-dialogs/ArtQueryDlgForm.ui line 100
+#: rc.cpp:258
 #, no-c-format
-msgid "&IPA font:"
+msgid "&female"
 msgstr ""
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 70
-#: rc.cpp:177
-#, fuzzy, no-c-format
-msgid "Grade Colors"
-msgstr "&Defnyddio lliwiau"
-
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 95
-#: rc.cpp:180 rc.cpp:501
+#. i18n: file ./query-dialogs/ArtQueryDlgForm.ui line 108
+#: rc.cpp:261
 #, no-c-format
-msgid "Level &4:"
+msgid "&male"
 msgstr ""
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 114
-#: rc.cpp:183 rc.cpp:489
+#. i18n: file ./query-dialogs/ArtQueryDlgForm.ui line 116
+#: rc.cpp:264
 #, no-c-format
-msgid "Level &5:"
+msgid "&neutral"
 msgstr ""
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 133
-#: rc.cpp:186 rc.cpp:504
+#. i18n: file ./statistik-dialogs/StatistikPageForm.ui line 28
+#: rc.cpp:294
 #, no-c-format
-msgid "Level &7:"
+msgid "Grade FROM"
 msgstr ""
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 152
-#: rc.cpp:189 rc.cpp:492
+#. i18n: file ./statistik-dialogs/StatistikPageForm.ui line 39
+#: rc.cpp:297
 #, no-c-format
-msgid "Level &6:"
+msgid "Grade TO"
 msgstr ""
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 171
-#: rc.cpp:192
+#. i18n: file ./statistik-dialogs/StatistikPageForm.ui line 50
+#: rc.cpp:300
 #, no-c-format
-msgid "&N"
-msgstr "&N"
+msgid "Entries"
+msgstr "Cofnodion"
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 187
-#: rc.cpp:195
+#. i18n: file ./statistik-dialogs/GenStatPageForm.ui line 37
+#: rc.cpp:309 rc.cpp:612
 #, no-c-format
-msgid "Not &queried:"
-msgstr ""
+msgid "Filename:"
+msgstr "Enw Ffeil :"
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 206
-#: rc.cpp:198
+#. i18n: file ./statistik-dialogs/GenStatPageForm.ui line 49
+#: rc.cpp:312 rc.cpp:615
 #, no-c-format
-msgid "&1"
-msgstr "&1"
+msgid "Title:"
+msgstr "Teitl:"
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 209
-#: rc.cpp:201 rc.cpp:615
+#. i18n: file ./statistik-dialogs/GenStatPageForm.ui line 61
+#: rc.cpp:315
 #, no-c-format
-msgid "Alt+1"
-msgstr "Alt+1"
+msgid "Entries:"
+msgstr "Cofnodion:"
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 212
-#: rc.cpp:204
+#. i18n: file ./statistik-dialogs/GenStatPageForm.ui line 73
+#: rc.cpp:318
 #, no-c-format
-msgid "Color for the grade 1"
-msgstr ""
+msgid "Author:"
+msgstr "Awdur:"
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 215
-#: rc.cpp:207
+#. i18n: file ./statistik-dialogs/GenStatPageForm.ui line 85
+#: rc.cpp:321
 #, no-c-format
-msgid "Click here to change the color for grade 1."
+msgid "Lessons:"
 msgstr ""
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 231
-#: rc.cpp:210 rc.cpp:507 rc.cpp:813 rc.cpp:1089
+#. i18n: file ./entry-dialogs/CommonEntryPageForm.ui line 27
+#: rc.cpp:327
 #, no-c-format
-msgid "Level &1:"
+msgid "Invokes lesson input dialog"
 msgstr ""
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 250
-#: rc.cpp:213 rc.cpp:486 rc.cpp:816 rc.cpp:1095
+#. i18n: file ./entry-dialogs/CommonEntryPageForm.ui line 52
+#: rc.cpp:330
 #, no-c-format
-msgid "Level &2:"
+msgid "Common Properties"
 msgstr ""
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 269
-#: rc.cpp:216
+#. i18n: file ./entry-dialogs/CommonEntryPageForm.ui line 128
+#: rc.cpp:333
 #, no-c-format
-msgid "&2"
-msgstr "&2"
+msgid "&Expression:"
+msgstr "&Mynegiad:"
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 272
-#: rc.cpp:219
+#. i18n: file ./entry-dialogs/CommonEntryPageForm.ui line 139
+#: rc.cpp:336
 #, no-c-format
-msgid "Alt+2"
-msgstr "Alt+2"
+msgid "&Pronunciation:"
+msgstr ""
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 275
-#: rc.cpp:222
+#. i18n: file ./entry-dialogs/CommonEntryPageForm.ui line 150
+#: rc.cpp:339 rc.cpp:561
 #, no-c-format
-msgid "Color for the grade 2"
+msgid "&Lesson:"
 msgstr ""
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 278
-#: rc.cpp:225
+#. i18n: file ./entry-dialogs/CommonEntryPageForm.ui line 184
+#: rc.cpp:345
 #, no-c-format
-msgid "Click here to change the color for grade 2."
+msgid "Invokes input dialog for lessons"
 msgstr ""
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 294
-#: rc.cpp:228 rc.cpp:510 rc.cpp:819 rc.cpp:1092
+#. i18n: file ./entry-dialogs/CommonEntryPageForm.ui line 215
+#: rc.cpp:351
 #, no-c-format
-msgid "Level &3:"
+msgid "Invokes dialog page with characters from phonetic alphabet"
 msgstr ""
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 313
-#: rc.cpp:231
+#. i18n: file ./entry-dialogs/CommonEntryPageForm.ui line 225
+#: rc.cpp:354
 #, no-c-format
-msgid "&3"
-msgstr "&3"
+msgid "T&ype"
+msgstr "M&ath"
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 316
-#: rc.cpp:234
+#. i18n: file ./entry-dialogs/CommonEntryPageForm.ui line 272
+#: rc.cpp:357
 #, no-c-format
-msgid "Alt+3"
-msgstr "Alt+3"
+msgid "&Subtype:"
+msgstr ""
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 319
-#: rc.cpp:237
+#. i18n: file ./entry-dialogs/CommonEntryPageForm.ui line 319
+#: rc.cpp:363
 #, no-c-format
-msgid "Color for the grade 3"
+msgid "Invokes input dialog for word types"
 msgstr ""
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 322
-#: rc.cpp:240
+#. i18n: file ./entry-dialogs/CommonEntryPageForm.ui line 377
+#: rc.cpp:372
 #, no-c-format
-msgid "Click here to change the color for grade 3."
+msgid "Invokes input dialog for usage labels"
 msgstr ""
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 338
-#: rc.cpp:243
+#. i18n: file ./entry-dialogs/CommonEntryPageForm.ui line 458
+#: rc.cpp:375
 #, no-c-format
-msgid "&4"
-msgstr "&4"
+msgid "Acti&ve"
+msgstr "Gwei&thredol"
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 341
-#: rc.cpp:246
+#. i18n: file ./entry-dialogs/AuxInfoEntryPageForm.ui line 49
+#: rc.cpp:381
 #, no-c-format
-msgid "Alt+4"
-msgstr "Alt+4"
+msgid "Additional Properties"
+msgstr ""
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 344
-#: rc.cpp:249
+#. i18n: file ./entry-dialogs/AuxInfoEntryPageForm.ui line 123
+#: rc.cpp:384
 #, no-c-format
-msgid "Color for the grade 4"
-msgstr ""
+msgid "S&ynonyms:"
+msgstr "C&yfystyron :"
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 347
-#: rc.cpp:252
+#. i18n: file ./entry-dialogs/AuxInfoEntryPageForm.ui line 134
+#: rc.cpp:387
 #, no-c-format
-msgid "Click here to change the color for grade 4."
+msgid "Ant&onyms:"
 msgstr ""
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 363
-#: rc.cpp:255
+#. i18n: file ./entry-dialogs/AuxInfoEntryPageForm.ui line 145
+#: rc.cpp:390
 #, no-c-format
-msgid "&5"
-msgstr "&5"
+msgid "E&xample:"
+msgstr "E&nghraifft :"
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 366
-#: rc.cpp:258
+#. i18n: file ./entry-dialogs/AuxInfoEntryPageForm.ui line 167
+#: rc.cpp:396
 #, no-c-format
-msgid "Alt+5"
-msgstr "Alt+5"
+msgid "&Paraphrase:"
+msgstr ""
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 369
-#: rc.cpp:261
+#. i18n: file ./entry-dialogs/AdjEntryPageForm.ui line 33
+#: rc.cpp:402
 #, no-c-format
-msgid "Color for the grade 5"
+msgid "Comparison of Adjectives"
 msgstr ""
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 372
-#: rc.cpp:264
+#. i18n: file ./entry-dialogs/MCEntryPageForm.ui line 33
+#: rc.cpp:417
 #, no-c-format
-msgid "Click here to change the color for grade 5."
+msgid "Suggestions for Multiple Choice"
 msgstr ""
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 388
-#: rc.cpp:267
+#. i18n: file ./entry-dialogs/TenseEntryPageForm.ui line 33
+#: rc.cpp:438
 #, no-c-format
-msgid "&6"
-msgstr "&6"
+msgid "Conjugation of Verbs"
+msgstr ""
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 391
-#: rc.cpp:270
+#. i18n: file ./entry-dialogs/TenseEntryPageForm.ui line 71
+#: rc.cpp:441 rc.cpp:1146
 #, no-c-format
-msgid "Alt+6"
-msgstr "Alt+6"
+msgid "C&ommon"
+msgstr "C&yffredin"
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 394
-#: rc.cpp:273
+#. i18n: file ./entry-dialogs/TenseEntryPageForm.ui line 105
+#: rc.cpp:444 rc.cpp:1161
 #, no-c-format
-msgid "Color for the grade 6"
-msgstr ""
+msgid "&Common"
+msgstr "&Cyffredin"
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 397
-#: rc.cpp:276
+#. i18n: file ./entry-dialogs/TenseEntryPageForm.ui line 121
+#: rc.cpp:447 rc.cpp:1137
 #, no-c-format
-msgid "Click here to change the color for grade 6."
+msgid "&1. Person:"
 msgstr ""
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 413
-#: rc.cpp:279
+#. i18n: file ./entry-dialogs/TenseEntryPageForm.ui line 132
+#: rc.cpp:450 rc.cpp:1119
 #, no-c-format
-msgid "&7"
-msgstr "&7"
+msgid "&Female:"
+msgstr ""
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 416
-#: rc.cpp:282
+#. i18n: file ./entry-dialogs/TenseEntryPageForm.ui line 143
+#: rc.cpp:453 rc.cpp:1164
 #, no-c-format
-msgid "Alt+7"
-msgstr "Alt+7"
+msgid "Singular"
+msgstr ""
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 419
-#: rc.cpp:285
+#. i18n: file ./entry-dialogs/TenseEntryPageForm.ui line 177
+#: rc.cpp:456
 #, no-c-format
-msgid "Color for the grade 7"
+msgid "&3. Person:"
 msgstr ""
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 422
-#: rc.cpp:288
+#. i18n: file ./entry-dialogs/TenseEntryPageForm.ui line 257
+#: rc.cpp:459 rc.cpp:1128
 #, no-c-format
-msgid "Click here to change the color for grade 7."
+msgid "&Neutral:"
 msgstr ""
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 430
-#: rc.cpp:291
+#. i18n: file ./entry-dialogs/TenseEntryPageForm.ui line 268
+#: rc.cpp:462 rc.cpp:1122
 #, no-c-format
-msgid "&Use colors"
-msgstr "&Defnyddio lliwiau"
+msgid "&Male:"
+msgstr ""
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 433
-#: rc.cpp:294 rc.cpp:297
+#. i18n: file ./entry-dialogs/TenseEntryPageForm.ui line 292
+#: rc.cpp:465 rc.cpp:1140
 #, no-c-format
-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."
+msgid "&2. Person:"
 msgstr ""
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 30
-#: rc.cpp:300
+#. i18n: file ./entry-dialogs/TenseEntryPageForm.ui line 303
+#: rc.cpp:468 rc.cpp:1158
 #, no-c-format
-msgid "&Use alternative learning method"
+msgid "Plural"
 msgstr ""
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 33
-#: rc.cpp:303
+#. i18n: file ./entry-dialogs/TenseEntryPageForm.ui line 329
+#: rc.cpp:471
 #, no-c-format
-msgid "Use the Leitner learning method"
+msgid "&Tense:"
 msgstr ""
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 36
-#: rc.cpp:306
+#. i18n: file ./entry-dialogs/TenseEntryPageForm.ui line 348
+#: rc.cpp:474
 #, no-c-format
-msgid ""
-"By checking this, you will use the Leitner method of learning which requires "
-"you to answer correctly to each question 4 times in a row. "
-msgstr ""
+msgid "Ne&xt"
+msgstr "Ne&saf"
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 44
-#: rc.cpp:309
+#. i18n: file ./entry-dialogs/FromToEntryPageForm.ui line 113
+#: rc.cpp:483
 #, no-c-format
-msgid "S&wap direction randomly"
+msgid "False fr&iend:"
 msgstr ""
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 52
-#: rc.cpp:312
+#. i18n: file ./entry-dialogs/FromToEntryPageForm.ui line 124
+#: rc.cpp:486
 #, no-c-format
-msgid "Random Query Options"
-msgstr ""
+msgid "&Grade:"
+msgstr "&Gradd:"
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 66
-#: rc.cpp:315
+#. i18n: file ./entry-dialogs/FromToEntryPageForm.ui line 137
+#: rc.cpp:489
 #, no-c-format
-msgid "&Enable suggestion lists"
+msgid "Last Query &Date"
 msgstr ""
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 69
-#: rc.cpp:318
+#. i18n: file ./entry-dialogs/FromToEntryPageForm.ui line 204
+#: rc.cpp:492
 #, no-c-format
-msgid "If checked, pressing F5 or F6 will display a list of suggestions"
-msgstr ""
+msgid "T&oday"
+msgstr "H&eddiw"
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 72
-#: rc.cpp:321
+#. i18n: file ./entry-dialogs/FromToEntryPageForm.ui line 212
+#: rc.cpp:495
 #, no-c-format
-msgid ""
-"When this options is enabled, you can enter part of an answer, then press F5 or "
-"F6 to get a list of translations starting with or containing the text you "
-"typed."
-msgstr ""
+msgid "&Never"
+msgstr "&Byth"
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 83
-#: rc.cpp:324
+#. i18n: file ./entry-dialogs/FromToEntryPageForm.ui line 222
+#: rc.cpp:498
 #, no-c-format
-msgid "Split &translations"
+msgid "Query Counters"
 msgstr ""
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 86
-#: rc.cpp:327
+#. i18n: file ./entry-dialogs/FromToEntryPageForm.ui line 239
+#: rc.cpp:501
 #, no-c-format
-msgid "Split translations and show multiple answer fields"
-msgstr ""
+msgid "&Wrong:"
+msgstr "&Anghywir:"
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 89
-#: rc.cpp:330
+#. i18n: file ./entry-dialogs/FromToEntryPageForm.ui line 250
+#: rc.cpp:504
 #, no-c-format
-msgid ""
-"When this options is enabled, the program will split translations into several "
-"parts, show multiple answer fields, and you will need to answer each one of "
-"them. This is useful for example when a word has several meanings that have "
-"different translations in the other language."
+msgid "&Altogether:"
 msgstr ""
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 97
-#: rc.cpp:333
+#. i18n: file ./common-dialogs/blockoptionsbase.ui line 53
+#: rc.cpp:510 rc.cpp:972
 #, no-c-format
-msgid "Maximum number of &fields:"
+msgid "Level &5:"
 msgstr ""
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 103
-#: rc.cpp:336 rc.cpp:399
+#. i18n: file ./common-dialogs/blockoptionsbase.ui line 64
+#: rc.cpp:513 rc.cpp:978
 #, no-c-format
-msgid "Maximum number of fields to split translations into"
+msgid "Level &6:"
 msgstr ""
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 106
-#: rc.cpp:339 rc.cpp:402
+#. i18n: file ./common-dialogs/blockoptionsbase.ui line 83
+#: rc.cpp:516
 #, no-c-format
-msgid ""
-"Enter the maximum number of answer fields you want to have. When splitting "
-"translations, the program will only split into this many parts, and the last "
-"part will contain the rest of the translation."
+msgid "E&xpiring"
 msgstr ""
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 117
-#: rc.cpp:342
+#. i18n: file ./common-dialogs/blockoptionsbase.ui line 104
+#: rc.cpp:519
 #, no-c-format
-msgid "Enable I Know &button"
+msgid "Bl&ocking"
 msgstr ""
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 120
-#: rc.cpp:345
+#. i18n: file ./common-dialogs/blockoptionsbase.ui line 135
+#: rc.cpp:522 rc.cpp:969
 #, no-c-format
-msgid "Enable the I Know It button on the Random Query screen"
+msgid "Level &4:"
 msgstr ""
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 123
-#: rc.cpp:348
+#. i18n: file ./common-dialogs/blockoptionsbase.ui line 146
+#: rc.cpp:525 rc.cpp:975
 #, no-c-format
-msgid ""
-"If this is checked, the I Know button will be available. It allows you to tell "
-"the query that you know the result without writing it or having it checked. "
-"This is available by default. If you uncheck this, the I Know button will not "
-"be available."
+msgid "Level &7:"
 msgstr ""
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 139
-#: rc.cpp:351
+#. i18n: file ./common-dialogs/thresholdoptionsbase.ui line 53
+#: rc.cpp:534
 #, no-c-format
-msgid "at"
-msgstr ""
+msgid "G&rade:"
+msgstr "G&radd:"
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 150
-#: rc.cpp:354
+#. i18n: file ./common-dialogs/thresholdoptionsbase.ui line 64
+#: rc.cpp:537
 #, no-c-format
-msgid "pe&riods"
+msgid "&Bad count:"
 msgstr ""
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 153
-#: rc.cpp:357
+#. i18n: file ./common-dialogs/thresholdoptionsbase.ui line 75
+#: rc.cpp:540
 #, no-c-format
-msgid "Split translations at periods"
+msgid "Last q&uery:"
 msgstr ""
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 156
-#: rc.cpp:360
+#. i18n: file ./common-dialogs/thresholdoptionsbase.ui line 119
+#: rc.cpp:543
 #, no-c-format
-msgid ""
-"When this options is enabled, translations will be split at periods if they "
-"have any (except any trailing periods that will be removed)."
+msgid "Word t&ype:"
 msgstr ""
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 167
-#: rc.cpp:363
+#. i18n: file ./common-dialogs/thresholdoptionsbase.ui line 140
+#: rc.cpp:546
 #, no-c-format
-msgid "sem&icolons"
+msgid "Query c&ount:"
 msgstr ""
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 170
-#: rc.cpp:366
+#. i18n: file ./common-dialogs/thresholdoptionsbase.ui line 167
+#: rc.cpp:549
 #, no-c-format
-msgid "Split translations at semicolons"
-msgstr ""
+msgid "&All"
+msgstr "&Popeth"
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 173
-#: rc.cpp:369
+#. i18n: file ./common-dialogs/thresholdoptionsbase.ui line 191
+#: rc.cpp:552
 #, no-c-format
-msgid ""
-"When this options is enabled, translations that have not been split at periods "
-"or colons will be split at semicolons if they have any."
-msgstr ""
+msgid "&None"
+msgstr "&Dim"
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 192
-#: rc.cpp:372
+#. i18n: file ./common-dialogs/thresholdoptionsbase.ui line 199
+#: rc.cpp:555
 #, no-c-format
-msgid "co&mmas"
+msgid "Selected lessons:"
 msgstr ""
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 195
-#: rc.cpp:375
+#. i18n: file ./common-dialogs/pasteoptionsbase.ui line 30
+#: rc.cpp:564
 #, no-c-format
-msgid "Split translations at commas"
+msgid "Sep&arator:"
+msgstr "Gwa&hanydd:"
+
+#. i18n: file ./common-dialogs/pasteoptionsbase.ui line 47
+#: rc.cpp:567
+#, no-c-format
+msgid "Choose which separator you want to use to separate your data."
 msgstr ""
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 198
-#: rc.cpp:378
+#. i18n: file ./common-dialogs/pasteoptionsbase.ui line 50
+#: rc.cpp:570
 #, no-c-format
 msgid ""
-"When this options is enabled, translations that have not been split at periods, "
-"colons or semicolons will be split at commas if they have any."
+"Choose one separator which will divide the parts of an expression when "
+"transferring data from or to another application over the clipboard."
 msgstr ""
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 209
-#: rc.cpp:381
+#. i18n: file ./common-dialogs/pasteoptionsbase.ui line 75
+#: rc.cpp:573
 #, no-c-format
-msgid "co&lons"
-msgstr ""
+msgid "Order"
+msgstr "Trefn"
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 212
-#: rc.cpp:384
+#. i18n: file ./common-dialogs/pasteoptionsbase.ui line 105
+#: rc.cpp:576
 #, no-c-format
-msgid "Split translations at colons"
-msgstr ""
+msgid "&Down"
+msgstr "I &Lawr"
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 215
-#: rc.cpp:387
+#. i18n: file ./common-dialogs/pasteoptionsbase.ui line 113
+#: rc.cpp:579
 #, no-c-format
-msgid ""
-"When this options is enabled, translations that have not been split at periods "
-"will be split at colons if they have any."
-msgstr ""
+msgid "S&kip"
+msgstr "H&epgor"
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 226
-#: rc.cpp:390
+#. i18n: file ./common-dialogs/pasteoptionsbase.ui line 121
+#: rc.cpp:582
 #, no-c-format
-msgid "Enable S&how More button"
-msgstr ""
+msgid "&Up"
+msgstr "I &Fyny"
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 229
-#: rc.cpp:393
+#. i18n: file ./common-dialogs/pasteoptionsbase.ui line 129
+#: rc.cpp:585
 #, no-c-format
-msgid "Enable the Show More button on the Random Query screen"
+msgid "Use &current document"
 msgstr ""
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 232
-#: rc.cpp:396
+#. i18n: file ./common-dialogs/pasteoptionsbase.ui line 132
+#: rc.cpp:588
 #, no-c-format
 msgid ""
-"When this is checked, you will be able to use a Show More button which allow "
-"you to get the next letter in your answer in the query. If this is unchecked, "
-"the Show More button will not be enabled, you will not be able to use it."
+"Check this if you want the items in the clipboard to be in the same language "
+"order as the current document."
 msgstr ""
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 324
-#: rc.cpp:405
+#. i18n: file ./common-dialogs/pasteoptionsbase.ui line 135
+#: rc.cpp:591
 #, no-c-format
-msgid "Time Per Query"
+msgid ""
+"When checked, the items in the clipboard are assumed to be in the same language "
+"order as the current document."
 msgstr ""
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 358
-#: rc.cpp:408
+#. i18n: file ./common-dialogs/groupoptionsbase.ui line 27
+#: rc.cpp:594
 #, no-c-format
-msgid "&Show solution"
-msgstr ""
+msgid "N&ame:"
+msgstr "E&nw:"
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 369
-#: rc.cpp:411
+#. i18n: file ./common-dialogs/groupoptionsbase.ui line 70
+#: rc.cpp:600
 #, no-c-format
-msgid "&No time limitation"
-msgstr ""
+msgid "&Load"
+msgstr "&Llwytho"
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 375
-#: rc.cpp:414
+#. i18n: file ./common-dialogs/groupoptionsbase.ui line 86
+#: rc.cpp:603
 #, no-c-format
-msgid "Check this if you do not want any time limitation per query."
-msgstr ""
+msgid "&New"
+msgstr "&Newydd"
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 378
-#: rc.cpp:417
+#. i18n: file ./common-dialogs/ProgressDlgForm.ui line 82
+#: rc.cpp:618
 #, no-c-format
-msgid "When this is checked, there is no time limitation for each query"
+msgid "file.kvtml"
 msgstr ""
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 386
-#: rc.cpp:420
+#. i18n: file ./common-dialogs/ProgressDlgForm.ui line 98
+#: rc.cpp:621
 #, no-c-format
-msgid "&Continue after timeout"
-msgstr ""
+msgid "title"
+msgstr "teitl"
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 404
-#: rc.cpp:423
+#. i18n: file ./common-dialogs/generaloptionsbase.ui line 27
+#: rc.cpp:624
 #, no-c-format
-msgid "Ma&x. time (s):"
+msgid "&Save vocabularies automatically on close and quit"
 msgstr ""
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 423
-#: rc.cpp:426
+#. i18n: file ./common-dialogs/generaloptionsbase.ui line 30
+#: rc.cpp:627 rc.cpp:636
 #, no-c-format
-msgid "S&how remaining time"
+msgid "Allow automatic saving of your work"
 msgstr ""
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 426
-#: rc.cpp:429
+#. i18n: file ./common-dialogs/generaloptionsbase.ui line 33
+#: rc.cpp:630 rc.cpp:639
 #, no-c-format
-msgid "If checked, activate a progress bar to show the remaining time."
+msgid "Your work will be automatically saved if you check this option"
 msgstr ""
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 429
-#: rc.cpp:432
+#. i18n: file ./common-dialogs/generaloptionsbase.ui line 41
+#: rc.cpp:633
 #, no-c-format
-msgid ""
-"Check this button if you want to activate a progress bar to show the remaining "
-"time for each query."
+msgid "&Create a backup every"
 msgstr ""
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 460
-#: rc.cpp:435
+#. i18n: file ./common-dialogs/generaloptionsbase.ui line 66
+#: rc.cpp:642
 #, no-c-format
-msgid "Set the maximum time allowed per query."
-msgstr ""
+msgid "minutes"
+msgstr "munudau"
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 463
-#: rc.cpp:438
+#. i18n: file ./common-dialogs/generaloptionsbase.ui line 77
+#: rc.cpp:645
 #, no-c-format
-msgid ""
-"You may set a time limit KVocTrain grants you to remember the correct answer. "
-"Set here the maximum time you want to allow per query."
+msgid "Smart a&ppending"
 msgstr ""
 
-#. i18n: file ./common-dialogs/groupoptionsbase.ui line 27
-#: rc.cpp:441
+#. i18n: file ./common-dialogs/generaloptionsbase.ui line 80
+#: rc.cpp:648
 #, no-c-format
-msgid "N&ame:"
-msgstr "E&nw:"
+msgid "If checked, the entry dialog will popup repeatedly"
+msgstr ""
 
-#. i18n: file ./common-dialogs/groupoptionsbase.ui line 70
-#: rc.cpp:447
+#. i18n: file ./common-dialogs/generaloptionsbase.ui line 83
+#: rc.cpp:651
 #, no-c-format
-msgid "&Load"
-msgstr "&Llwytho"
+msgid ""
+"If this feature is activated, you will repeatedly be prompted with the entry "
+"dialog. After entering the first original you have to enter the corresponding "
+"translations. Afterwards you proceed with the next original and its "
+"translations until you stop by pressing the ESC key."
+msgstr ""
 
-#. i18n: file ./common-dialogs/groupoptionsbase.ui line 86
-#: rc.cpp:450
+#. i18n: file ./common-dialogs/generaloptionsbase.ui line 91
+#: rc.cpp:654
 #, no-c-format
-msgid "&New"
-msgstr "&Newydd"
+msgid "Appl&y changes without asking"
+msgstr ""
 
-#. i18n: file ./common-dialogs/thresholdoptionsbase.ui line 53
-#: rc.cpp:456
+#. i18n: file ./common-dialogs/generaloptionsbase.ui line 94
+#: rc.cpp:657
 #, no-c-format
-msgid "G&rade:"
-msgstr "G&radd:"
+msgid "Your changes will be applied automatically."
+msgstr ""
 
-#. i18n: file ./common-dialogs/thresholdoptionsbase.ui line 64
-#: rc.cpp:459
+#. i18n: file ./common-dialogs/generaloptionsbase.ui line 97
+#: rc.cpp:660
 #, no-c-format
-msgid "&Bad count:"
+msgid ""
+"If checked, you will not be asked if you really want this change; it will be "
+"applied automatically."
 msgstr ""
 
-#. i18n: file ./common-dialogs/thresholdoptionsbase.ui line 75
-#: rc.cpp:462
+#. i18n: file ./common-dialogs/generaloptionsbase.ui line 105
+#: rc.cpp:663
 #, no-c-format
-msgid "Last q&uery:"
+msgid "Column Resizing"
 msgstr ""
 
-#. i18n: file ./common-dialogs/thresholdoptionsbase.ui line 119
-#: rc.cpp:465
+#. i18n: file ./common-dialogs/generaloptionsbase.ui line 119
+#: rc.cpp:666
 #, no-c-format
-msgid "Word t&ype:"
-msgstr ""
+msgid "A&utomatic"
+msgstr "A&wtomatig"
 
-#. i18n: file ./common-dialogs/thresholdoptionsbase.ui line 140
-#: rc.cpp:468
+#. i18n: file ./common-dialogs/generaloptionsbase.ui line 122
+#: rc.cpp:669
 #, no-c-format
-msgid "Query c&ount:"
+msgid "KVocTrain determines the resizing of the columns"
 msgstr ""
 
-#. i18n: file ./common-dialogs/thresholdoptionsbase.ui line 167
-#: rc.cpp:471
+#. i18n: file ./common-dialogs/generaloptionsbase.ui line 125
+#: rc.cpp:672
 #, no-c-format
-msgid "&All"
-msgstr "&Popeth"
+msgid ""
+"KVocTrain makes each column the same width except the leftmost with the lesson "
+"names, which is half the size of the others. The second column, which contains "
+"the picture that describes the state of the row, has a fixed width."
+msgstr ""
 
-#. i18n: file ./common-dialogs/thresholdoptionsbase.ui line 191
-#: rc.cpp:474
+#. i18n: file ./common-dialogs/generaloptionsbase.ui line 133
+#: rc.cpp:675
 #, no-c-format
-msgid "&None"
-msgstr "&Dim"
+msgid "P&ercentage"
+msgstr ""
 
-#. i18n: file ./common-dialogs/thresholdoptionsbase.ui line 199
-#: rc.cpp:477
+#. i18n: file ./common-dialogs/generaloptionsbase.ui line 136
+#: rc.cpp:678
 #, no-c-format
-msgid "Selected lessons:"
+msgid "The columns resize using the same factor that the window is resized to."
 msgstr ""
 
-#. i18n: file ./common-dialogs/thresholdoptionsbase.ui line 257
-#: rc.cpp:483 rc.cpp:867
+#. i18n: file ./common-dialogs/generaloptionsbase.ui line 139
+#: rc.cpp:681
 #, no-c-format
-msgid "&Lesson:"
+msgid "If this is checked, the columns resize by the same amount as the window"
 msgstr ""
 
-#. i18n: file ./common-dialogs/blockoptionsbase.ui line 83
-#: rc.cpp:495
+#. i18n: file ./common-dialogs/generaloptionsbase.ui line 147
+#: rc.cpp:684
 #, no-c-format
-msgid "E&xpiring"
+msgid "&Fixed"
+msgstr "&Sefydlog"
+
+#. i18n: file ./common-dialogs/generaloptionsbase.ui line 150
+#: rc.cpp:687
+#, no-c-format
+msgid "There is no resizing of the columns"
 msgstr ""
 
-#. i18n: file ./common-dialogs/blockoptionsbase.ui line 104
-#: rc.cpp:498
+#. i18n: file ./common-dialogs/generaloptionsbase.ui line 153
+#: rc.cpp:690
 #, no-c-format
-msgid "Bl&ocking"
+msgid "When checked, the columns are not resized"
 msgstr ""
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 30
-#: rc.cpp:513
+#: rc.cpp:693
 #, no-c-format
 msgid "Available Languages"
 msgstr ""
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 50
-#: rc.cpp:519
+#: rc.cpp:699
 #, no-c-format
 msgid "Delete the selected language"
 msgstr ""
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 53
-#: rc.cpp:522
+#: rc.cpp:702
 #, no-c-format
 msgid "By clicking on this button you can delete the selected language."
 msgstr ""
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 69
-#: rc.cpp:525
+#: rc.cpp:705
 #, no-c-format
 msgid "Alternative language code"
 msgstr ""
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 72
-#: rc.cpp:528
+#: rc.cpp:708
 #, no-c-format
 msgid ""
 "An alternative language code is set here but you can change it if you want"
 msgstr ""
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 88
-#: rc.cpp:531
+#: rc.cpp:711
 #, no-c-format
 msgid "Your own description of the language code."
 msgstr ""
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 91
-#: rc.cpp:534
+#: rc.cpp:714
 #, no-c-format
 msgid ""
 "A description of the language is written here and you can modify it if you "
@@ -3873,13 +3838,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 99
-#: rc.cpp:537 rc.cpp:549
+#: rc.cpp:717 rc.cpp:729
 #, no-c-format
 msgid "Select a language or use the Add New Language Code to add one."
 msgstr ""
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 102
-#: rc.cpp:540 rc.cpp:552
+#: rc.cpp:720 rc.cpp:732
 #, no-c-format
 msgid ""
 "You can select a language with the drop down box or use the Add New Language "
@@ -3887,13 +3852,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 113
-#: rc.cpp:543
+#: rc.cpp:723
 #, no-c-format
 msgid "The flag representing the language"
 msgstr ""
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 116
-#: rc.cpp:546
+#: rc.cpp:726
 #, no-c-format
 msgid ""
 "The default flag representing the language is set here but you can choose "
@@ -3901,19 +3866,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 143
-#: rc.cpp:555
+#: rc.cpp:735
 #, no-c-format
 msgid "Language c&ode:"
 msgstr ""
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 149
-#: rc.cpp:558 rc.cpp:594
+#: rc.cpp:738 rc.cpp:774
 #, no-c-format
 msgid "You can assign a language to each column"
 msgstr ""
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 152
-#: rc.cpp:561 rc.cpp:597
+#: rc.cpp:741 rc.cpp:777
 #, no-c-format
 msgid ""
 "Each column can be assigned a language. This is internally done with the usual "
@@ -3921,19 +3886,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 160
-#: rc.cpp:564
+#: rc.cpp:744
 #, no-c-format
 msgid "Alte&rnative code:"
 msgstr ""
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 166
-#: rc.cpp:567
+#: rc.cpp:747
 #, no-c-format
 msgid "Select a second language code if necessary"
 msgstr ""
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 169
-#: rc.cpp:570
+#: rc.cpp:750
 #, no-c-format
 msgid ""
 "Sometimes it may be useful to have a second language code because some "
@@ -3941,19 +3906,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 177
-#: rc.cpp:573
+#: rc.cpp:753
 #, no-c-format
 msgid "Lang&uage name:"
 msgstr ""
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 183
-#: rc.cpp:576
+#: rc.cpp:756
 #, no-c-format
 msgid "Describe the language in your own terms."
 msgstr ""
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 186
-#: rc.cpp:579
+#: rc.cpp:759
 #, no-c-format
 msgid ""
 "Here you can give the language code a descriptive name in your own language "
@@ -3961,49 +3926,49 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 194
-#: rc.cpp:582
+#: rc.cpp:762
 #, no-c-format
 msgid "&Picture:"
 msgstr "Llu&n:"
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 200
-#: rc.cpp:585
+#: rc.cpp:765
 #, no-c-format
 msgid "Set a picture for the language"
 msgstr ""
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 203
-#: rc.cpp:588
+#: rc.cpp:768
 #, no-c-format
 msgid "Choose a picture to represent the language above."
 msgstr ""
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 219
-#: rc.cpp:591
+#: rc.cpp:771
 #, no-c-format
 msgid "Keyboard layout:"
 msgstr "Cynllun bysellfwrdd:"
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 238
-#: rc.cpp:600
+#: rc.cpp:780
 #, no-c-format
 msgid "Add New Language Code"
 msgstr ""
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 255
-#: rc.cpp:603
+#: rc.cpp:783
 #, no-c-format
 msgid "Add Language Data From &TDE Database"
 msgstr ""
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 258
-#: rc.cpp:606
+#: rc.cpp:786
 #, no-c-format
 msgid "Obtains the language choices from the TDE database"
 msgstr ""
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 261
-#: rc.cpp:609
+#: rc.cpp:789
 #, no-c-format
 msgid ""
 "Pressing this button opens a menu that contains all the countries that are "
@@ -4012,19 +3977,25 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 269
-#: rc.cpp:612
+#: rc.cpp:792
 #, no-c-format
 msgid "Add Language Data From ISO639-&1"
 msgstr ""
 
+#. i18n: file ./common-dialogs/languageoptionsbase.ui line 272
+#: rc.cpp:795 rc.cpp:990
+#, no-c-format
+msgid "Alt+1"
+msgstr "Alt+1"
+
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 275
-#: rc.cpp:618
+#: rc.cpp:798
 #, no-c-format
 msgid "List of languages covered by ISO639-1"
 msgstr ""
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 278
-#: rc.cpp:621
+#: rc.cpp:801
 #, no-c-format
 msgid ""
 "Pressing this button opens a menu that contains all the language codes that are "
@@ -4032,645 +4003,675 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 286
-#: rc.cpp:624
+#: rc.cpp:804
 #, no-c-format
 msgid "&Add"
 msgstr "&Ychwanegu"
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 289
-#: rc.cpp:627
+#: rc.cpp:807
 #, no-c-format
 msgid "Allow addition of the language you typed."
 msgstr ""
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 292
-#: rc.cpp:630
+#: rc.cpp:810
 #, no-c-format
 msgid ""
 "This button becomes available when you type a language code in the field."
 msgstr ""
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 308
-#: rc.cpp:633
+#: rc.cpp:813
 #, no-c-format
 msgid "Type your language code if you know it."
 msgstr ""
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 311
-#: rc.cpp:636
+#: rc.cpp:816
 #, no-c-format
 msgid ""
 "Type the language code if you know it or use one of the 2 buttons below to "
 "choose a language code."
 msgstr ""
 
-#. i18n: file ./common-dialogs/pasteoptionsbase.ui line 30
-#: rc.cpp:639
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 30
+#: rc.cpp:819
 #, no-c-format
-msgid "Sep&arator:"
-msgstr "Gwa&hanydd:"
+msgid "&Use alternative learning method"
+msgstr ""
 
-#. i18n: file ./common-dialogs/pasteoptionsbase.ui line 47
-#: rc.cpp:642
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 33
+#: rc.cpp:822
 #, no-c-format
-msgid "Choose which separator you want to use to separate your data."
+msgid "Use the Leitner learning method"
 msgstr ""
 
-#. i18n: file ./common-dialogs/pasteoptionsbase.ui line 50
-#: rc.cpp:645
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 36
+#: rc.cpp:825
 #, no-c-format
 msgid ""
-"Choose one separator which will divide the parts of an expression when "
-"transferring data from or to another application over the clipboard."
+"By checking this, you will use the Leitner method of learning which requires "
+"you to answer correctly to each question 4 times in a row. "
 msgstr ""
 
-#. i18n: file ./common-dialogs/pasteoptionsbase.ui line 75
-#: rc.cpp:648
-#, no-c-format
-msgid "Order"
-msgstr "Trefn"
-
-#. i18n: file ./common-dialogs/pasteoptionsbase.ui line 105
-#: rc.cpp:651
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 44
+#: rc.cpp:828
 #, no-c-format
-msgid "&Down"
-msgstr "I &Lawr"
+msgid "S&wap direction randomly"
+msgstr ""
 
-#. i18n: file ./common-dialogs/pasteoptionsbase.ui line 113
-#: rc.cpp:654
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 52
+#: rc.cpp:831
 #, no-c-format
-msgid "S&kip"
-msgstr "H&epgor"
+msgid "Random Query Options"
+msgstr ""
 
-#. i18n: file ./common-dialogs/pasteoptionsbase.ui line 121
-#: rc.cpp:657
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 66
+#: rc.cpp:834
 #, no-c-format
-msgid "&Up"
-msgstr "I &Fyny"
+msgid "&Enable suggestion lists"
+msgstr ""
 
-#. i18n: file ./common-dialogs/pasteoptionsbase.ui line 129
-#: rc.cpp:660
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 69
+#: rc.cpp:837
 #, no-c-format
-msgid "Use &current document"
+msgid "If checked, pressing F5 or F6 will display a list of suggestions"
 msgstr ""
 
-#. i18n: file ./common-dialogs/pasteoptionsbase.ui line 132
-#: rc.cpp:663
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 72
+#: rc.cpp:840
 #, no-c-format
 msgid ""
-"Check this if you want the items in the clipboard to be in the same language "
-"order as the current document."
+"When this options is enabled, you can enter part of an answer, then press F5 or "
+"F6 to get a list of translations starting with or containing the text you "
+"typed."
 msgstr ""
 
-#. i18n: file ./common-dialogs/pasteoptionsbase.ui line 135
-#: rc.cpp:666
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 83
+#: rc.cpp:843
 #, no-c-format
-msgid ""
-"When checked, the items in the clipboard are assumed to be in the same language "
-"order as the current document."
+msgid "Split &translations"
 msgstr ""
 
-#. i18n: file ./common-dialogs/ProgressDlgForm.ui line 54
-#: rc.cpp:672 rc.cpp:756
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 86
+#: rc.cpp:846
 #, no-c-format
-msgid "Filename:"
-msgstr "Enw Ffeil :"
+msgid "Split translations and show multiple answer fields"
+msgstr ""
 
-#. i18n: file ./common-dialogs/ProgressDlgForm.ui line 66
-#: rc.cpp:675 rc.cpp:759
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 89
+#: rc.cpp:849
 #, no-c-format
-msgid "Title:"
-msgstr "Teitl:"
+msgid ""
+"When this options is enabled, the program will split translations into several "
+"parts, show multiple answer fields, and you will need to answer each one of "
+"them. This is useful for example when a word has several meanings that have "
+"different translations in the other language."
+msgstr ""
 
-#. i18n: file ./common-dialogs/ProgressDlgForm.ui line 82
-#: rc.cpp:678
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 97
+#: rc.cpp:852
 #, no-c-format
-msgid "file.kvtml"
+msgid "Maximum number of &fields:"
 msgstr ""
 
-#. i18n: file ./common-dialogs/ProgressDlgForm.ui line 98
-#: rc.cpp:681
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 103
+#: rc.cpp:855 rc.cpp:918
 #, no-c-format
-msgid "title"
-msgstr "teitl"
+msgid "Maximum number of fields to split translations into"
+msgstr ""
 
-#. i18n: file ./common-dialogs/generaloptionsbase.ui line 27
-#: rc.cpp:684
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 106
+#: rc.cpp:858 rc.cpp:921
 #, no-c-format
-msgid "&Save vocabularies automatically on close and quit"
+msgid ""
+"Enter the maximum number of answer fields you want to have. When splitting "
+"translations, the program will only split into this many parts, and the last "
+"part will contain the rest of the translation."
 msgstr ""
 
-#. i18n: file ./common-dialogs/generaloptionsbase.ui line 30
-#: rc.cpp:687 rc.cpp:696
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 117
+#: rc.cpp:861
 #, no-c-format
-msgid "Allow automatic saving of your work"
+msgid "Enable I Know &button"
 msgstr ""
 
-#. i18n: file ./common-dialogs/generaloptionsbase.ui line 33
-#: rc.cpp:690 rc.cpp:699
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 120
+#: rc.cpp:864
 #, no-c-format
-msgid "Your work will be automatically saved if you check this option"
+msgid "Enable the I Know It button on the Random Query screen"
 msgstr ""
 
-#. i18n: file ./common-dialogs/generaloptionsbase.ui line 41
-#: rc.cpp:693
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 123
+#: rc.cpp:867
 #, no-c-format
-msgid "&Create a backup every"
+msgid ""
+"If this is checked, the I Know button will be available. It allows you to tell "
+"the query that you know the result without writing it or having it checked. "
+"This is available by default. If you uncheck this, the I Know button will not "
+"be available."
 msgstr ""
 
-#. i18n: file ./common-dialogs/generaloptionsbase.ui line 66
-#: rc.cpp:702
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 139
+#: rc.cpp:870
 #, no-c-format
-msgid "minutes"
-msgstr "munudau"
+msgid "at"
+msgstr ""
 
-#. i18n: file ./common-dialogs/generaloptionsbase.ui line 77
-#: rc.cpp:705
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 150
+#: rc.cpp:873
 #, no-c-format
-msgid "Smart a&ppending"
+msgid "pe&riods"
 msgstr ""
 
-#. i18n: file ./common-dialogs/generaloptionsbase.ui line 80
-#: rc.cpp:708
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 153
+#: rc.cpp:876
 #, no-c-format
-msgid "If checked, the entry dialog will popup repeatedly"
+msgid "Split translations at periods"
 msgstr ""
 
-#. i18n: file ./common-dialogs/generaloptionsbase.ui line 83
-#: rc.cpp:711
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 156
+#: rc.cpp:879
 #, no-c-format
 msgid ""
-"If this feature is activated, you will repeatedly be prompted with the entry "
-"dialog. After entering the first original you have to enter the corresponding "
-"translations. Afterwards you proceed with the next original and its "
-"translations until you stop by pressing the ESC key."
+"When this options is enabled, translations will be split at periods if they "
+"have any (except any trailing periods that will be removed)."
 msgstr ""
 
-#. i18n: file ./common-dialogs/generaloptionsbase.ui line 91
-#: rc.cpp:714
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 167
+#: rc.cpp:882
 #, no-c-format
-msgid "Appl&y changes without asking"
+msgid "sem&icolons"
 msgstr ""
 
-#. i18n: file ./common-dialogs/generaloptionsbase.ui line 94
-#: rc.cpp:717
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 170
+#: rc.cpp:885
 #, no-c-format
-msgid "Your changes will be applied automatically."
+msgid "Split translations at semicolons"
 msgstr ""
 
-#. i18n: file ./common-dialogs/generaloptionsbase.ui line 97
-#: rc.cpp:720
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 173
+#: rc.cpp:888
 #, no-c-format
 msgid ""
-"If checked, you will not be asked if you really want this change; it will be "
-"applied automatically."
+"When this options is enabled, translations that have not been split at periods "
+"or colons will be split at semicolons if they have any."
 msgstr ""
 
-#. i18n: file ./common-dialogs/generaloptionsbase.ui line 105
-#: rc.cpp:723
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 192
+#: rc.cpp:891
 #, no-c-format
-msgid "Column Resizing"
+msgid "co&mmas"
 msgstr ""
 
-#. i18n: file ./common-dialogs/generaloptionsbase.ui line 119
-#: rc.cpp:726
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 195
+#: rc.cpp:894
 #, no-c-format
-msgid "A&utomatic"
-msgstr "A&wtomatig"
+msgid "Split translations at commas"
+msgstr ""
 
-#. i18n: file ./common-dialogs/generaloptionsbase.ui line 122
-#: rc.cpp:729
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 198
+#: rc.cpp:897
 #, no-c-format
-msgid "KVocTrain determines the resizing of the columns"
+msgid ""
+"When this options is enabled, translations that have not been split at periods, "
+"colons or semicolons will be split at commas if they have any."
 msgstr ""
 
-#. i18n: file ./common-dialogs/generaloptionsbase.ui line 125
-#: rc.cpp:732
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 209
+#: rc.cpp:900
 #, no-c-format
-msgid ""
-"KVocTrain makes each column the same width except the leftmost with the lesson "
-"names, which is half the size of the others. The second column, which contains "
-"the picture that describes the state of the row, has a fixed width."
+msgid "co&lons"
 msgstr ""
 
-#. i18n: file ./common-dialogs/generaloptionsbase.ui line 133
-#: rc.cpp:735
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 212
+#: rc.cpp:903
 #, no-c-format
-msgid "P&ercentage"
+msgid "Split translations at colons"
 msgstr ""
 
-#. i18n: file ./common-dialogs/generaloptionsbase.ui line 136
-#: rc.cpp:738
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 215
+#: rc.cpp:906
 #, no-c-format
-msgid "The columns resize using the same factor that the window is resized to."
+msgid ""
+"When this options is enabled, translations that have not been split at periods "
+"will be split at colons if they have any."
 msgstr ""
 
-#. i18n: file ./common-dialogs/generaloptionsbase.ui line 139
-#: rc.cpp:741
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 226
+#: rc.cpp:909
 #, no-c-format
-msgid "If this is checked, the columns resize by the same amount as the window"
+msgid "Enable S&how More button"
 msgstr ""
 
-#. i18n: file ./common-dialogs/generaloptionsbase.ui line 147
-#: rc.cpp:744
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 229
+#: rc.cpp:912
 #, no-c-format
-msgid "&Fixed"
-msgstr "&Sefydlog"
+msgid "Enable the Show More button on the Random Query screen"
+msgstr ""
 
-#. i18n: file ./common-dialogs/generaloptionsbase.ui line 150
-#: rc.cpp:747
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 232
+#: rc.cpp:915
 #, no-c-format
-msgid "There is no resizing of the columns"
+msgid ""
+"When this is checked, you will be able to use a Show More button which allow "
+"you to get the next letter in your answer in the query. If this is unchecked, "
+"the Show More button will not be enabled, you will not be able to use it."
 msgstr ""
 
-#. i18n: file ./common-dialogs/generaloptionsbase.ui line 153
-#: rc.cpp:750
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 324
+#: rc.cpp:924
 #, no-c-format
-msgid "When checked, the columns are not resized"
+msgid "Time Per Query"
 msgstr ""
 
-#. i18n: file ./statistik-dialogs/GenStatPageForm.ui line 61
-#: rc.cpp:762
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 358
+#: rc.cpp:927
 #, no-c-format
-msgid "Entries:"
-msgstr "Cofnodion:"
+msgid "&Show solution"
+msgstr ""
 
-#. i18n: file ./statistik-dialogs/GenStatPageForm.ui line 73
-#: rc.cpp:765
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 369
+#: rc.cpp:930
 #, no-c-format
-msgid "Author:"
-msgstr "Awdur:"
+msgid "&No time limitation"
+msgstr ""
 
-#. i18n: file ./statistik-dialogs/GenStatPageForm.ui line 85
-#: rc.cpp:768
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 375
+#: rc.cpp:933
 #, no-c-format
-msgid "Lessons:"
+msgid "Check this if you do not want any time limitation per query."
 msgstr ""
 
-#. i18n: file ./statistik-dialogs/StatistikPageForm.ui line 28
-#: rc.cpp:774
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 378
+#: rc.cpp:936
 #, no-c-format
-msgid "Grade FROM"
+msgid "When this is checked, there is no time limitation for each query"
 msgstr ""
 
-#. i18n: file ./statistik-dialogs/StatistikPageForm.ui line 39
-#: rc.cpp:777
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 386
+#: rc.cpp:939
 #, no-c-format
-msgid "Grade TO"
+msgid "&Continue after timeout"
 msgstr ""
 
-#. i18n: file ./statistik-dialogs/StatistikPageForm.ui line 50
-#: rc.cpp:780
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 404
+#: rc.cpp:942
 #, no-c-format
-msgid "Entries"
-msgstr "Cofnodion"
+msgid "Ma&x. time (s):"
+msgstr ""
 
-#. i18n: file ./entry-dialogs/AuxInfoEntryPageForm.ui line 49
-#: rc.cpp:789
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 423
+#: rc.cpp:945
 #, no-c-format
-msgid "Additional Properties"
+msgid "S&how remaining time"
 msgstr ""
 
-#. i18n: file ./entry-dialogs/AuxInfoEntryPageForm.ui line 123
-#: rc.cpp:792
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 426
+#: rc.cpp:948
 #, no-c-format
-msgid "S&ynonyms:"
-msgstr "C&yfystyron :"
+msgid "If checked, activate a progress bar to show the remaining time."
+msgstr ""
 
-#. i18n: file ./entry-dialogs/AuxInfoEntryPageForm.ui line 134
-#: rc.cpp:795
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 429
+#: rc.cpp:951
 #, no-c-format
-msgid "Ant&onyms:"
+msgid ""
+"Check this button if you want to activate a progress bar to show the remaining "
+"time for each query."
 msgstr ""
 
-#. i18n: file ./entry-dialogs/AuxInfoEntryPageForm.ui line 145
-#: rc.cpp:798
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 460
+#: rc.cpp:954
 #, no-c-format
-msgid "E&xample:"
-msgstr "E&nghraifft :"
+msgid "Set the maximum time allowed per query."
+msgstr ""
 
-#. i18n: file ./entry-dialogs/AuxInfoEntryPageForm.ui line 167
-#: rc.cpp:804
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 463
+#: rc.cpp:957
 #, no-c-format
-msgid "&Paraphrase:"
+msgid ""
+"You may set a time limit KVocTrain grants you to remember the correct answer. "
+"Set here the maximum time you want to allow per query."
 msgstr ""
 
-#. i18n: file ./entry-dialogs/AdjEntryPageForm.ui line 33
-#: rc.cpp:810
+#. i18n: file ./common-dialogs/viewoptionsbase.ui line 35
+#: rc.cpp:960
 #, no-c-format
-msgid "Comparison of Adjectives"
+msgid "&Table font:"
 msgstr ""
 
-#. i18n: file ./entry-dialogs/FromToEntryPageForm.ui line 113
-#: rc.cpp:828
+#. i18n: file ./common-dialogs/viewoptionsbase.ui line 51
+#: rc.cpp:963
 #, no-c-format
-msgid "False fr&iend:"
+msgid "&IPA font:"
 msgstr ""
 
-#. i18n: file ./entry-dialogs/FromToEntryPageForm.ui line 124
-#: rc.cpp:831
+#. i18n: file ./common-dialogs/viewoptionsbase.ui line 70
+#: rc.cpp:966
+#, fuzzy, no-c-format
+msgid "Grade Colors"
+msgstr "&Defnyddio lliwiau"
+
+#. i18n: file ./common-dialogs/viewoptionsbase.ui line 171
+#: rc.cpp:981
 #, no-c-format
-msgid "&Grade:"
-msgstr "&Gradd:"
+msgid "&N"
+msgstr "&N"
 
-#. i18n: file ./entry-dialogs/FromToEntryPageForm.ui line 137
-#: rc.cpp:834
+#. i18n: file ./common-dialogs/viewoptionsbase.ui line 187
+#: rc.cpp:984
 #, no-c-format
-msgid "Last Query &Date"
+msgid "Not &queried:"
 msgstr ""
 
-#. i18n: file ./entry-dialogs/FromToEntryPageForm.ui line 204
-#: rc.cpp:837
+#. i18n: file ./common-dialogs/viewoptionsbase.ui line 206
+#: rc.cpp:987
 #, no-c-format
-msgid "T&oday"
-msgstr "H&eddiw"
+msgid "&1"
+msgstr "&1"
 
-#. i18n: file ./entry-dialogs/FromToEntryPageForm.ui line 212
-#: rc.cpp:840
+#. i18n: file ./common-dialogs/viewoptionsbase.ui line 212
+#: rc.cpp:993
 #, no-c-format
-msgid "&Never"
-msgstr "&Byth"
+msgid "Color for the grade 1"
+msgstr ""
 
-#. i18n: file ./entry-dialogs/FromToEntryPageForm.ui line 222
-#: rc.cpp:843
+#. i18n: file ./common-dialogs/viewoptionsbase.ui line 215
+#: rc.cpp:996
 #, no-c-format
-msgid "Query Counters"
+msgid "Click here to change the color for grade 1."
 msgstr ""
 
-#. i18n: file ./entry-dialogs/FromToEntryPageForm.ui line 239
-#: rc.cpp:846
+#. i18n: file ./common-dialogs/viewoptionsbase.ui line 269
+#: rc.cpp:1005
 #, no-c-format
-msgid "&Wrong:"
-msgstr "&Anghywir:"
+msgid "&2"
+msgstr "&2"
 
-#. i18n: file ./entry-dialogs/FromToEntryPageForm.ui line 250
-#: rc.cpp:849
+#. i18n: file ./common-dialogs/viewoptionsbase.ui line 272
+#: rc.cpp:1008
 #, no-c-format
-msgid "&Altogether:"
-msgstr ""
+msgid "Alt+2"
+msgstr "Alt+2"
 
-#. i18n: file ./entry-dialogs/CommonEntryPageForm.ui line 27
-#: rc.cpp:855
+#. i18n: file ./common-dialogs/viewoptionsbase.ui line 275
+#: rc.cpp:1011
 #, no-c-format
-msgid "Invokes lesson input dialog"
+msgid "Color for the grade 2"
 msgstr ""
 
-#. i18n: file ./entry-dialogs/CommonEntryPageForm.ui line 52
-#: rc.cpp:858
+#. i18n: file ./common-dialogs/viewoptionsbase.ui line 278
+#: rc.cpp:1014
 #, no-c-format
-msgid "Common Properties"
+msgid "Click here to change the color for grade 2."
 msgstr ""
 
-#. i18n: file ./entry-dialogs/CommonEntryPageForm.ui line 128
-#: rc.cpp:861
+#. i18n: file ./common-dialogs/viewoptionsbase.ui line 313
+#: rc.cpp:1020
 #, no-c-format
-msgid "&Expression:"
-msgstr "&Mynegiad:"
+msgid "&3"
+msgstr "&3"
 
-#. i18n: file ./entry-dialogs/CommonEntryPageForm.ui line 139
-#: rc.cpp:864
+#. i18n: file ./common-dialogs/viewoptionsbase.ui line 316
+#: rc.cpp:1023
 #, no-c-format
-msgid "&Pronunciation:"
-msgstr ""
+msgid "Alt+3"
+msgstr "Alt+3"
 
-#. i18n: file ./entry-dialogs/CommonEntryPageForm.ui line 184
-#: rc.cpp:873
+#. i18n: file ./common-dialogs/viewoptionsbase.ui line 319
+#: rc.cpp:1026
 #, no-c-format
-msgid "Invokes input dialog for lessons"
+msgid "Color for the grade 3"
 msgstr ""
 
-#. i18n: file ./entry-dialogs/CommonEntryPageForm.ui line 215
-#: rc.cpp:879
+#. i18n: file ./common-dialogs/viewoptionsbase.ui line 322
+#: rc.cpp:1029
 #, no-c-format
-msgid "Invokes dialog page with characters from phonetic alphabet"
+msgid "Click here to change the color for grade 3."
 msgstr ""
 
-#. i18n: file ./entry-dialogs/CommonEntryPageForm.ui line 225
-#: rc.cpp:882
+#. i18n: file ./common-dialogs/viewoptionsbase.ui line 338
+#: rc.cpp:1032
 #, no-c-format
-msgid "T&ype"
-msgstr "M&ath"
+msgid "&4"
+msgstr "&4"
 
-#. i18n: file ./entry-dialogs/CommonEntryPageForm.ui line 272
-#: rc.cpp:885
+#. i18n: file ./common-dialogs/viewoptionsbase.ui line 341
+#: rc.cpp:1035
 #, no-c-format
-msgid "&Subtype:"
-msgstr ""
+msgid "Alt+4"
+msgstr "Alt+4"
 
-#. i18n: file ./entry-dialogs/CommonEntryPageForm.ui line 319
-#: rc.cpp:891
+#. i18n: file ./common-dialogs/viewoptionsbase.ui line 344
+#: rc.cpp:1038
 #, no-c-format
-msgid "Invokes input dialog for word types"
+msgid "Color for the grade 4"
 msgstr ""
 
-#. i18n: file ./entry-dialogs/CommonEntryPageForm.ui line 377
-#: rc.cpp:900
+#. i18n: file ./common-dialogs/viewoptionsbase.ui line 347
+#: rc.cpp:1041
 #, no-c-format
-msgid "Invokes input dialog for usage labels"
+msgid "Click here to change the color for grade 4."
 msgstr ""
 
-#. i18n: file ./entry-dialogs/CommonEntryPageForm.ui line 458
-#: rc.cpp:903
+#. i18n: file ./common-dialogs/viewoptionsbase.ui line 363
+#: rc.cpp:1044
 #, no-c-format
-msgid "Acti&ve"
-msgstr "Gwei&thredol"
+msgid "&5"
+msgstr "&5"
 
-#. i18n: file ./entry-dialogs/TenseEntryPageForm.ui line 33
-#: rc.cpp:909
+#. i18n: file ./common-dialogs/viewoptionsbase.ui line 366
+#: rc.cpp:1047
 #, no-c-format
-msgid "Conjugation of Verbs"
-msgstr ""
+msgid "Alt+5"
+msgstr "Alt+5"
 
-#. i18n: file ./entry-dialogs/TenseEntryPageForm.ui line 177
-#: rc.cpp:927
+#. i18n: file ./common-dialogs/viewoptionsbase.ui line 369
+#: rc.cpp:1050
 #, no-c-format
-msgid "&3. Person:"
+msgid "Color for the grade 5"
 msgstr ""
 
-#. i18n: file ./entry-dialogs/TenseEntryPageForm.ui line 329
-#: rc.cpp:942
+#. i18n: file ./common-dialogs/viewoptionsbase.ui line 372
+#: rc.cpp:1053
 #, no-c-format
-msgid "&Tense:"
+msgid "Click here to change the color for grade 5."
 msgstr ""
 
-#. i18n: file ./entry-dialogs/TenseEntryPageForm.ui line 348
-#: rc.cpp:945
-#, no-c-format
-msgid "Ne&xt"
-msgstr "Ne&saf"
-
-#. i18n: file ./entry-dialogs/MCEntryPageForm.ui line 33
-#: rc.cpp:951
+#. i18n: file ./common-dialogs/viewoptionsbase.ui line 388
+#: rc.cpp:1056
 #, no-c-format
-msgid "Suggestions for Multiple Choice"
-msgstr ""
+msgid "&6"
+msgstr "&6"
 
-#. i18n: file ./entry-dialogs/MCEntryPageForm.ui line 58
-#: rc.cpp:954 rc.cpp:1167
+#. i18n: file ./common-dialogs/viewoptionsbase.ui line 391
+#: rc.cpp:1059
 #, no-c-format
-msgid "&1:"
-msgstr "&1 :"
+msgid "Alt+6"
+msgstr "Alt+6"
 
-#. i18n: file ./entry-dialogs/MCEntryPageForm.ui line 77
-#: rc.cpp:957 rc.cpp:1161
+#. i18n: file ./common-dialogs/viewoptionsbase.ui line 394
+#: rc.cpp:1062
 #, no-c-format
-msgid "&2:"
-msgstr "&2 :"
+msgid "Color for the grade 6"
+msgstr ""
 
-#. i18n: file ./entry-dialogs/MCEntryPageForm.ui line 96
-#: rc.cpp:960 rc.cpp:1164
+#. i18n: file ./common-dialogs/viewoptionsbase.ui line 397
+#: rc.cpp:1065
 #, no-c-format
-msgid "&3:"
-msgstr "&3 :"
+msgid "Click here to change the color for grade 6."
+msgstr ""
 
-#. i18n: file ./entry-dialogs/MCEntryPageForm.ui line 180
-#: rc.cpp:963 rc.cpp:1170
+#. i18n: file ./common-dialogs/viewoptionsbase.ui line 413
+#: rc.cpp:1068
 #, no-c-format
-msgid "&4:"
-msgstr "&4 :"
+msgid "&7"
+msgstr "&7"
 
-#. i18n: file ./entry-dialogs/MCEntryPageForm.ui line 199
-#: rc.cpp:966 rc.cpp:1173
+#. i18n: file ./common-dialogs/viewoptionsbase.ui line 416
+#: rc.cpp:1071
 #, no-c-format
-msgid "&5:"
-msgstr "&5 :"
+msgid "Alt+7"
+msgstr "Alt+7"
 
-#. i18n: file ./query-dialogs/RandomQueryDlgForm.ui line 40
-#: rc.cpp:969
+#. i18n: file ./common-dialogs/viewoptionsbase.ui line 419
+#: rc.cpp:1074
 #, no-c-format
-msgid "Enter the correct translation:"
+msgid "Color for the grade 7"
 msgstr ""
 
-#. i18n: file ./query-dialogs/RandomQueryDlgForm.ui line 56
-#: rc.cpp:972
+#. i18n: file ./common-dialogs/viewoptionsbase.ui line 422
+#: rc.cpp:1077
 #, no-c-format
-msgid "Original Expression"
+msgid "Click here to change the color for grade 7."
 msgstr ""
 
-#. i18n: file ./query-dialogs/RandomQueryDlgForm.ui line 129
-#: rc.cpp:987
+#. i18n: file ./common-dialogs/viewoptionsbase.ui line 430
+#: rc.cpp:1080
 #, no-c-format
-msgid "T&ype:"
-msgstr "M&ath:"
+msgid "&Use colors"
+msgstr "&Defnyddio lliwiau"
 
-#. i18n: file ./query-dialogs/RandomQueryDlgForm.ui line 137
-#: rc.cpp:990
+#. i18n: file ./common-dialogs/viewoptionsbase.ui line 433
+#: rc.cpp:1083 rc.cpp:1086
 #, no-c-format
-msgid "&False friend:"
+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 ./query-dialogs/RandomQueryDlgForm.ui line 251
-#: rc.cpp:993 rc.cpp:1065 rc.cpp:1098 rc.cpp:1146 rc.cpp:1200 rc.cpp:1245
+#. i18n: file ./docprop-dialogs/TenseOptPageForm.ui line 33
+#: rc.cpp:1092
 #, no-c-format
-msgid "&Verify"
-msgstr "&Gwirio"
+msgid "Tense Descriptions"
+msgstr ""
 
-#. i18n: file ./query-dialogs/RandomQueryDlgForm.ui line 267
-#: rc.cpp:996 rc.cpp:1242
+#. i18n: file ./docprop-dialogs/TenseOptPageForm.ui line 75
+#: rc.cpp:1095 rc.cpp:1191 rc.cpp:1209 rc.cpp:1227
 #, no-c-format
-msgid "Show &More"
-msgstr ""
+msgid "&New..."
+msgstr "&Newydd..."
 
-#. i18n: file ./query-dialogs/RandomQueryDlgForm.ui line 283
-#: rc.cpp:999 rc.cpp:1068 rc.cpp:1104 rc.cpp:1152 rc.cpp:1194 rc.cpp:1239
+#. i18n: file ./docprop-dialogs/TenseOptPageForm.ui line 91
+#: rc.cpp:1098 rc.cpp:1194 rc.cpp:1212 rc.cpp:1230
 #, no-c-format
-msgid "Show &All"
-msgstr "Dango&s Pob Un"
+msgid "&Modify..."
+msgstr "&Addasu..."
 
-#. i18n: file ./query-dialogs/RandomQueryDlgForm.ui line 299
-#: rc.cpp:1002 rc.cpp:1071 rc.cpp:1107 rc.cpp:1155 rc.cpp:1191
+#. i18n: file ./docprop-dialogs/LangPropPageForm.ui line 33
+#: rc.cpp:1110
 #, no-c-format
-msgid "&Do Not Know"
+msgid "Language Elements"
 msgstr ""
 
-#. i18n: file ./query-dialogs/RandomQueryDlgForm.ui line 315
-#: rc.cpp:1005 rc.cpp:1062 rc.cpp:1101 rc.cpp:1149 rc.cpp:1197 rc.cpp:1233
+#. i18n: file ./docprop-dialogs/LangPropPageForm.ui line 58
+#: rc.cpp:1113
 #, no-c-format
-msgid "I &Know It"
+msgid "Language code (ISO 639):"
 msgstr ""
 
-#. i18n: file ./query-dialogs/RandomQueryDlgForm.ui line 333
-#: rc.cpp:1008 rc.cpp:1074 rc.cpp:1110 rc.cpp:1134 rc.cpp:1203 rc.cpp:1221
+#. i18n: file ./docprop-dialogs/LangPropPageForm.ui line 116
+#: rc.cpp:1116
 #, no-c-format
-msgid "Progress"
-msgstr "Cynnydd"
+msgid "Articles"
+msgstr "Erhyglau"
 
-#. i18n: file ./query-dialogs/RandomQueryDlgForm.ui line 350
-#: rc.cpp:1011 rc.cpp:1080 rc.cpp:1116 rc.cpp:1140 rc.cpp:1209 rc.cpp:1227
+#. i18n: file ./docprop-dialogs/LangPropPageForm.ui line 176
+#: rc.cpp:1125
 #, no-c-format
-msgid "Time:"
-msgstr "Amser:"
+msgid "Definite"
+msgstr ""
 
-#. i18n: file ./query-dialogs/RandomQueryDlgForm.ui line 358
-#: rc.cpp:1014 rc.cpp:1077 rc.cpp:1113 rc.cpp:1137 rc.cpp:1206 rc.cpp:1224
+#. i18n: file ./docprop-dialogs/LangPropPageForm.ui line 277
+#: rc.cpp:1131
 #, no-c-format
-msgid "Count:"
-msgstr "Cyfrif:"
+msgid "Indefinite"
+msgstr ""
 
-#. i18n: file ./query-dialogs/RandomQueryDlgForm.ui line 392
-#: rc.cpp:1017 rc.cpp:1083 rc.cpp:1119 rc.cpp:1143 rc.cpp:1212 rc.cpp:1230
+#. i18n: file ./docprop-dialogs/LangPropPageForm.ui line 295
+#: rc.cpp:1134
 #, no-c-format
-msgid "Cycle:"
+msgid "Conjugation"
 msgstr ""
 
-#. i18n: file ./query-dialogs/VerbQueryDlgForm.ui line 40
-#: rc.cpp:1020
+#. i18n: file ./docprop-dialogs/LangPropPageForm.ui line 334
+#: rc.cpp:1143
 #, no-c-format
-msgid "Enter the correct conjugation forms."
+msgid "3. Person:"
 msgstr ""
 
-#. i18n: file ./query-dialogs/VerbQueryDlgForm.ui line 61
-#: rc.cpp:1023
+#. i18n: file ./docprop-dialogs/LangPropPageForm.ui line 397
+#: rc.cpp:1149
 #, no-c-format
-msgid "Current tense is %1."
+msgid "F&emale:"
 msgstr ""
 
-#. i18n: file ./query-dialogs/VerbQueryDlgForm.ui line 283
-#: rc.cpp:1056
+#. i18n: file ./docprop-dialogs/LangPropPageForm.ui line 408
+#: rc.cpp:1152
 #, no-c-format
-msgid "Base form:"
+msgid "M&ale:"
 msgstr ""
 
-#. i18n: file ./query-dialogs/AdjQueryDlgForm.ui line 40
-#: rc.cpp:1086
+#. i18n: file ./docprop-dialogs/LangPropPageForm.ui line 419
+#: rc.cpp:1155
 #, no-c-format
-msgid "Fill in the missing comparison expressions:"
+msgid "Neu&tral:"
 msgstr ""
 
-#. i18n: file ./query-dialogs/ArtQueryDlgForm.ui line 40
-#: rc.cpp:1122
+#. i18n: file ./docprop-dialogs/TitlePageForm.ui line 33
+#: rc.cpp:1170
 #, no-c-format
-msgid "Select the correct article for this noun:"
+msgid "General Document Properties"
 msgstr ""
 
-#. i18n: file ./query-dialogs/ArtQueryDlgForm.ui line 100
-#: rc.cpp:1125
+#. i18n: file ./docprop-dialogs/TitlePageForm.ui line 50
+#: rc.cpp:1173
 #, no-c-format
-msgid "&female"
+msgid "&Title:"
+msgstr "&Teitl:"
+
+#. i18n: file ./docprop-dialogs/TitlePageForm.ui line 74
+#: rc.cpp:1176
+#, no-c-format
+msgid "&Authors:"
+msgstr "&Awduron :"
+
+#. i18n: file ./docprop-dialogs/TitlePageForm.ui line 96
+#: rc.cpp:1182
+#, no-c-format
+msgid "&License:"
+msgstr "&Trwydded:"
+
+#. i18n: file ./docprop-dialogs/UsageOptPageForm.ui line 33
+#: rc.cpp:1188
+#, no-c-format
+msgid "Usage Labels"
 msgstr ""
 
-#. i18n: file ./query-dialogs/ArtQueryDlgForm.ui line 108
-#: rc.cpp:1128
+#. i18n: file ./docprop-dialogs/LessOptPageForm.ui line 33
+#: rc.cpp:1206
 #, no-c-format
-msgid "&male"
+msgid "Lesson Descriptions"
 msgstr ""
 
-#. i18n: file ./query-dialogs/ArtQueryDlgForm.ui line 116
-#: rc.cpp:1131
+#. i18n: file ./docprop-dialogs/TypeOptPageForm.ui line 33
+#: rc.cpp:1224
 #, no-c-format
-msgid "&neutral"
+msgid "Type Descriptions"
 msgstr ""
 
-#. i18n: file ./query-dialogs/MCQueryDlgForm.ui line 32
-#: rc.cpp:1158
+#. i18n: file ./docprop-dialogs/DocOptionsPageForm.ui line 33
+#: rc.cpp:1242
 #, no-c-format
-msgid "Select the correct translation:"
+msgid "Document Options"
 msgstr ""
 
-#. i18n: file ./query-dialogs/SimpleQueryDlgForm.ui line 278
-#: rc.cpp:1236
+#. i18n: file ./docprop-dialogs/DocOptionsPageForm.ui line 50
+#: rc.cpp:1245
 #, no-c-format
-msgid "Do &Not Know"
+msgid "Allo&w sorting"
 msgstr ""
 
 #: _translatorinfo.cpp:1
diff --git a/tde-i18n-cy/messages/tdeedu/kwordquiz.po b/tde-i18n-cy/messages/tdeedu/kwordquiz.po
index e9131f3f7cb..4cc944da5c7 100644
--- a/tde-i18n-cy/messages/tdeedu/kwordquiz.po
+++ b/tde-i18n-cy/messages/tdeedu/kwordquiz.po
@@ -3,30 +3,132 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kwordquiz\n"
-"POT-Creation-Date: 2008-07-08 01:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2005-11-03 00:28+0000\n"
 "Last-Translator: Kevin Donnelly <kevin@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10\n"
 
-#: kwordquizdoc.cpp:110
+#: dlgrc.cpp:22
+msgid "Rows & Columns"
+msgstr "Rhesi a Cholofnau"
+
+#: _translatorinfo.cpp:1
 msgid ""
-"The current file has been modified.\n"
-"Do you want to save it?"
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Kyfieithu: KD"
+
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "kyfieithu@dotmon.com"
+
+#: flashview.cpp:89 multipleview.cpp:129 qaview.cpp:160
+msgid "Your answer was correct!"
+msgstr "Roedd eich ateb yn gywir!"
+
+#. i18n: file multipleviewbase.ui line 584
+#: multipleview.cpp:140 qaview.cpp:170 rc.cpp:360 rc.cpp:906
+#, no-c-format
+msgid "Correct Answer"
+msgstr "Ateb Cywir"
+
+#: flashview.cpp:97 multipleview.cpp:143 qaview.cpp:173
+msgid "Your answer was incorrect."
+msgstr "Roedd eich ateb yn anghywir."
+
+#. i18n: file multipleviewbase.ui line 847
+#: multipleview.cpp:146 qaview.cpp:176 rc.cpp:420 rc.cpp:861
+#, no-c-format
+msgid "Previous Question"
+msgstr "Cwestiwn Cynt"
+
+#. i18n: file multipleviewbase.ui line 198
+#: multipleview.cpp:151 qaview.cpp:179 rc.cpp:282 rc.cpp:882
+#, no-c-format
+msgid "Your Answer"
+msgstr "Eich Ateb"
+
+#: multipleview.cpp:165 qaview.cpp:192
+msgid "Summary"
+msgstr "Crynodeb"
+
+#: kwordquizview.cpp:68
+msgid "Column 1"
 msgstr ""
-"Addaswyd y ffeil gyfredol.\n"
-"Hoffech ei chadw?"
 
-#: kwordquizdoc.cpp:165
-msgid "<qt>Cannot open file<br><b>%1</b></qt>"
-msgstr "<qt>Methu agor ffeil<br><b>%1</b></qt>"
+#: kwordquizview.cpp:69
+msgid "Column 2"
+msgstr ""
 
-#: kwordquizdoc.cpp:335
-msgid "<qt>Cannot write to file<br><b>%1</b></qt>"
-msgstr "<qt>Methu ysgrifennu i ffeil<br><b>%1</b></qt>"
+#: kwordquizview.cpp:214 kwordquizview.cpp:219
+#, c-format
+msgid "KWordQuiz - %1"
+msgstr ""
+
+#: kwordquizview.cpp:223
+msgid "Name:_____________________________ Date:__________"
+msgstr ""
+
+#. i18n: file prefquizbase.ui line 96
+#: kwordquizview.cpp:234 rc.cpp:741
+#, no-c-format
+msgid "Score"
+msgstr "Sgôr"
+
+#: kwordquizview.cpp:304
+msgid "&Undo Entry"
+msgstr ""
+
+#: kwordquizview.cpp:315
+msgid "There is an error with the Fill-in-the-blank brackets"
+msgstr ""
+
+#: kwordquiz.cpp:79 kwordquiz.cpp:652 kwordquizview.cpp:399
+msgid "Cannot &Undo"
+msgstr ""
+
+#: kwordquizview.cpp:411
+msgid "&Undo Cut"
+msgstr ""
+
+#: kwordquizview.cpp:451
+msgid "&Undo Paste"
+msgstr ""
+
+#: kwordquizview.cpp:539
+msgid "&Undo Clear"
+msgstr ""
+
+#: kwordquizview.cpp:550
+msgid "&Undo Insert"
+msgstr ""
+
+#: kwordquizview.cpp:564
+msgid "&Undo Delete"
+msgstr ""
+
+#: kwordquizview.cpp:633
+msgid "&Undo Mark Blank"
+msgstr ""
+
+#: kwordquizview.cpp:679
+msgid "&Undo Unmark Blank"
+msgstr ""
+
+#: kwordquizview.cpp:778
+msgid "&Undo Sort"
+msgstr ""
+
+#: kwordquizview.cpp:793
+msgid "&Undo Shuffle"
+msgstr ""
 
 #: wqlreader.cpp:62
 msgid "This does not appear to be a (K)WordQuiz file"
@@ -36,18 +138,6 @@ msgstr "Ymddengys nad ffeil (K)WordQuiz yw hon"
 msgid "KWordQuiz can only open files created by WordQuiz 5.x"
 msgstr "Gall KWordQuiz agor ffeiliau a greuwyd gan WordQuiz5.x yn unig"
 
-#: dlgrc.cpp:22
-msgid "Rows & Columns"
-msgstr "Rhesi a Cholofnau"
-
-#: flashview.cpp:89 multipleview.cpp:129 qaview.cpp:160
-msgid "Your answer was correct!"
-msgstr "Roedd eich ateb yn gywir!"
-
-#: flashview.cpp:97 multipleview.cpp:143 qaview.cpp:173
-msgid "Your answer was incorrect."
-msgstr "Roedd eich ateb yn anghywir."
-
 #: dlglanguage.cpp:26
 msgid "Column Titles"
 msgstr "Teitlau Colofn"
@@ -98,91 +188,61 @@ msgstr ""
 msgid "Special Characters"
 msgstr "Nodau Arbennig"
 
-#. i18n: file multipleviewbase.ui line 584
-#: multipleview.cpp:140 qaview.cpp:170 rc.cpp:360 rc.cpp:906
-#, no-c-format
-msgid "Correct Answer"
-msgstr "Ateb Cywir"
-
-#. i18n: file multipleviewbase.ui line 847
-#: multipleview.cpp:146 qaview.cpp:176 rc.cpp:420 rc.cpp:861
-#, no-c-format
-msgid "Previous Question"
-msgstr "Cwestiwn Cynt"
-
-#. i18n: file multipleviewbase.ui line 198
-#: multipleview.cpp:151 qaview.cpp:179 rc.cpp:282 rc.cpp:882
-#, no-c-format
-msgid "Your Answer"
-msgstr "Eich Ateb"
+#: kwordquizdoc.cpp:110
+msgid ""
+"The current file has been modified.\n"
+"Do you want to save it?"
+msgstr ""
+"Addaswyd y ffeil gyfredol.\n"
+"Hoffech ei chadw?"
 
-#: multipleview.cpp:165 qaview.cpp:192
-msgid "Summary"
-msgstr "Crynodeb"
+#: kwordquizdoc.cpp:165
+msgid "<qt>Cannot open file<br><b>%1</b></qt>"
+msgstr "<qt>Methu agor ffeil<br><b>%1</b></qt>"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Kyfieithu: KD"
+#: kwordquizdoc.cpp:335
+msgid "<qt>Cannot write to file<br><b>%1</b></qt>"
+msgstr "<qt>Methu ysgrifennu i ffeil<br><b>%1</b></qt>"
 
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "kyfieithu@dotmon.com"
+#: dlgsort.cpp:24
+msgid "Sort"
+msgstr "Trefnu"
 
-#: main.cpp:24
-msgid "A powerful flashcard and vocabulary learning program"
+#: wqprintdialogpage.cpp:31
+msgid "Vocabulary Options"
 msgstr ""
 
-#: main.cpp:29
-msgid ""
-"A number 1-5 corresponding to the \n"
-"entries in the Mode menu"
+#: wqprintdialogpage.cpp:35
+msgid "Select Type of Printout"
 msgstr ""
 
-#: main.cpp:31
-msgid ""
-"Type of session to start with: \n"
-"'flash' for flashcard, \n"
-"'mc' for multiple choice, \n"
-"'qa' for question and answer"
+#: wqprintdialogpage.cpp:42
+msgid "Vocabulary &list"
 msgstr ""
 
-#: main.cpp:32
-msgid "File to open"
-msgstr "Ffeil i'w hagor"
-
-#: main.cpp:39
-msgid "KWordQuiz"
-msgstr "KWordQuiz"
-
-#: main.cpp:49
-msgid "TDE Edutainment Maintainer"
-msgstr "Cynhaliwr Addloniant TDE"
+#: wqprintdialogpage.cpp:44
+msgid "Vocabulary e&xam"
+msgstr ""
 
-#: kwqnewstuff.cpp:81
-msgid "The file '%1' already exists. Do you want to overwrite it?"
+#: wqprintdialogpage.cpp:46
+msgid "&Flashcards"
 msgstr ""
 
-#: kwordquiz.cpp:613 kwqnewstuff.cpp:84
-msgid "Overwrite"
-msgstr "Trosysgrifo"
+#: wqprintdialogpage.cpp:50
+msgid "Specify type of printout to make"
+msgstr ""
 
-#: kwqnewstuff.cpp:84
-msgid "Do Not Overwrite"
-msgstr "Peidio â Throsysgrifo"
+#: wqprintdialogpage.cpp:51
+msgid "Select to print the vocabulary as displayed in the editor"
+msgstr ""
 
-#: kwqnewstuff.cpp:89
-msgid ""
-"<qt>The selected file will now be downloaded and saved as\n"
-"<b>'%1'</b>.</qt>"
+#: wqprintdialogpage.cpp:52
+msgid "Select to print the vocabulary as a vocabulary exam"
 msgstr ""
 
-#: dlgsort.cpp:24
-msgid "Sort"
-msgstr "Trefnu"
+#: wqprintdialogpage.cpp:53
+msgid "Select to print flashcards"
+msgstr ""
 
 #. i18n: file kwordquizui.rc line 16
 #: rc.cpp:3
@@ -1104,12 +1164,6 @@ msgid ""
 "errors"
 msgstr ""
 
-#. i18n: file prefquizbase.ui line 96
-#: kwordquizview.cpp:234 rc.cpp:741
-#, no-c-format
-msgid "Score"
-msgstr "Sgôr"
-
 #. i18n: file prefquizbase.ui line 99
 #: rc.cpp:744
 #, no-c-format
@@ -1400,10 +1454,50 @@ msgid ""
 "$HOME)"
 msgstr ""
 
-#: kwordquiz.cpp:79 kwordquiz.cpp:652 kwordquizview.cpp:399
-msgid "Cannot &Undo"
+#: kwqnewstuff.cpp:81
+msgid "The file '%1' already exists. Do you want to overwrite it?"
+msgstr ""
+
+#: kwordquiz.cpp:613 kwqnewstuff.cpp:84
+msgid "Overwrite"
+msgstr "Trosysgrifo"
+
+#: kwqnewstuff.cpp:84
+msgid "Do Not Overwrite"
+msgstr "Peidio â Throsysgrifo"
+
+#: kwqnewstuff.cpp:89
+msgid ""
+"<qt>The selected file will now be downloaded and saved as\n"
+"<b>'%1'</b>.</qt>"
 msgstr ""
 
+#: dlgspecchar.cpp:26
+msgid "Select Character"
+msgstr "Dethol Nod"
+
+#: dlgspecchar.cpp:30
+msgid "&Select"
+msgstr "&Dethol"
+
+#: dlgspecchar.cpp:31
+msgid "Select this character"
+msgstr "Dethol y nod yma"
+
+#: prefcardappearance.cpp:68
+msgid ""
+"_: Back of the flashcard\n"
+"Back"
+msgstr "Cefn"
+
+#: prefcardappearance.cpp:70
+msgid "Answer"
+msgstr "Ateb"
+
+#: prefcardappearance.cpp:83
+msgid "Question"
+msgstr "Cwestiwn"
+
 #: kwordquiz.cpp:109
 msgid "Creates a new blank vocabulary document"
 msgstr ""
@@ -1669,7 +1763,7 @@ msgstr ""
 #: kwordquiz.cpp:499
 msgid ""
 "*.kvtml *.wql *.xml.gz *.csv|All Supported Documents\n"
-"*.kvtml|TDE Vocabulary Document\n"
+"*.kvtml|KDE Vocabulary Document\n"
 "*.wql|KWordQuiz Document\n"
 "*.xml.gz|Pauker Lesson\n"
 "*.csv|Comma-Separated Values"
@@ -1689,7 +1783,7 @@ msgstr ""
 
 #: kwordquiz.cpp:587
 msgid ""
-"*.kvtml|TDE Vocabulary Document\n"
+"*.kvtml|KDE Vocabulary Document\n"
 "*.wql|KWordQuiz Document\n"
 "*.csv|Comma-Separated Values\n"
 "*.html|Hypertext Markup Language"
@@ -1852,125 +1946,33 @@ msgstr ""
 msgid "%1 <-> %2 Randomly"
 msgstr ""
 
-#: kwordquizview.cpp:68
-msgid "Column 1"
-msgstr ""
-
-#: kwordquizview.cpp:69
-msgid "Column 2"
-msgstr ""
-
-#: kwordquizview.cpp:214 kwordquizview.cpp:219
-#, c-format
-msgid "KWordQuiz - %1"
-msgstr ""
-
-#: kwordquizview.cpp:223
-msgid "Name:_____________________________ Date:__________"
-msgstr ""
-
-#: kwordquizview.cpp:304
-msgid "&Undo Entry"
-msgstr ""
-
-#: kwordquizview.cpp:315
-msgid "There is an error with the Fill-in-the-blank brackets"
-msgstr ""
-
-#: kwordquizview.cpp:411
-msgid "&Undo Cut"
-msgstr ""
-
-#: kwordquizview.cpp:451
-msgid "&Undo Paste"
-msgstr ""
-
-#: kwordquizview.cpp:539
-msgid "&Undo Clear"
-msgstr ""
-
-#: kwordquizview.cpp:550
-msgid "&Undo Insert"
-msgstr ""
-
-#: kwordquizview.cpp:564
-msgid "&Undo Delete"
-msgstr ""
-
-#: kwordquizview.cpp:633
-msgid "&Undo Mark Blank"
-msgstr ""
-
-#: kwordquizview.cpp:679
-msgid "&Undo Unmark Blank"
-msgstr ""
-
-#: kwordquizview.cpp:778
-msgid "&Undo Sort"
-msgstr ""
-
-#: kwordquizview.cpp:793
-msgid "&Undo Shuffle"
-msgstr ""
-
-#: wqprintdialogpage.cpp:31
-msgid "Vocabulary Options"
-msgstr ""
-
-#: wqprintdialogpage.cpp:35
-msgid "Select Type of Printout"
-msgstr ""
-
-#: wqprintdialogpage.cpp:42
-msgid "Vocabulary &list"
-msgstr ""
-
-#: wqprintdialogpage.cpp:44
-msgid "Vocabulary e&xam"
-msgstr ""
-
-#: wqprintdialogpage.cpp:46
-msgid "&Flashcards"
-msgstr ""
-
-#: wqprintdialogpage.cpp:50
-msgid "Specify type of printout to make"
-msgstr ""
-
-#: wqprintdialogpage.cpp:51
-msgid "Select to print the vocabulary as displayed in the editor"
-msgstr ""
-
-#: wqprintdialogpage.cpp:52
-msgid "Select to print the vocabulary as a vocabulary exam"
+#: main.cpp:24
+msgid "A powerful flashcard and vocabulary learning program"
 msgstr ""
 
-#: wqprintdialogpage.cpp:53
-msgid "Select to print flashcards"
+#: main.cpp:29
+msgid ""
+"A number 1-5 corresponding to the \n"
+"entries in the Mode menu"
 msgstr ""
 
-#: prefcardappearance.cpp:68
+#: main.cpp:31
 msgid ""
-"_: Back of the flashcard\n"
-"Back"
-msgstr "Cefn"
-
-#: prefcardappearance.cpp:70
-msgid "Answer"
-msgstr "Ateb"
-
-#: prefcardappearance.cpp:83
-msgid "Question"
-msgstr "Cwestiwn"
+"Type of session to start with: \n"
+"'flash' for flashcard, \n"
+"'mc' for multiple choice, \n"
+"'qa' for question and answer"
+msgstr ""
 
-#: dlgspecchar.cpp:26
-msgid "Select Character"
-msgstr "Dethol Nod"
+#: main.cpp:32
+msgid "File to open"
+msgstr "Ffeil i'w hagor"
 
-#: dlgspecchar.cpp:30
-msgid "&Select"
-msgstr "&Dethol"
+#: main.cpp:39
+msgid "KWordQuiz"
+msgstr "KWordQuiz"
 
-#: dlgspecchar.cpp:31
-msgid "Select this character"
-msgstr "Dethol y nod yma"
+#: main.cpp:49
+#, fuzzy
+msgid "KDE Edutainment Maintainer"
+msgstr "Cynhaliwr Addloniant TDE"
diff --git a/tde-i18n-cy/messages/tdeedu/libtdeedu.po b/tde-i18n-cy/messages/tdeedu/libtdeedu.po
index d2c6843cc69..de82544d698 100644
--- a/tde-i18n-cy/messages/tdeedu/libtdeedu.po
+++ b/tde-i18n-cy/messages/tdeedu/libtdeedu.po
@@ -3,10 +3,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libtdeedu\n"
-"POT-Creation-Date: 2007-02-14 02:46+0100\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2005-11-02 21:57+0000\n"
 "Last-Translator: Kevin Donnelly <kevin@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,6 +25,55 @@ msgid ""
 "Your emails"
 msgstr "kyfieithu@dotmon.com"
 
+#: tdeeduui/tdeeduglossary.cpp:35 tdeeduui/tdeeduglossary.cpp:166
+msgid "Glossary"
+msgstr "Geirfa"
+
+#: tdeeduui/tdeeduglossary.cpp:185
+msgid "Search:"
+msgstr "Chwilio:"
+
+#: tdeeduui/tdeeduglossary.cpp:390
+msgid "References"
+msgstr "Cyfeiriadau"
+
+#: extdate/extdatepicker.cpp:80
+#, c-format
+msgid "Week %1"
+msgstr "Wythnos %1"
+
+#: extdate/extdatepicker.cpp:152
+msgid "Next year"
+msgstr "Blwyddyn nesaf"
+
+#: extdate/extdatepicker.cpp:153
+msgid "Previous year"
+msgstr "Blwyddyn cynt"
+
+#: extdate/extdatepicker.cpp:154
+msgid "Next month"
+msgstr "Mis nesaf"
+
+#: extdate/extdatepicker.cpp:155
+msgid "Previous month"
+msgstr "Mis cynt"
+
+#: extdate/extdatepicker.cpp:156
+msgid "Select a week"
+msgstr "Dewiswch wythnos"
+
+#: extdate/extdatepicker.cpp:157
+msgid "Select a month"
+msgstr "Dewiswch fis"
+
+#: extdate/extdatepicker.cpp:158
+msgid "Select a year"
+msgstr "Dewiswch flwyddyn"
+
+#: extdate/extdatepicker.cpp:159
+msgid "Select the current day"
+msgstr "Dewis y diwrnod cyfredol"
+
 #: extdate/extdatetime.cpp:49
 msgid ""
 "_: Short month name\n"
@@ -268,55 +318,6 @@ msgstr "Profi ExtDatePicker"
 msgid "(c) 2004, Jason Harris"
 msgstr "Hawlfraint (h)(c) 2004, Jason Harris"
 
-#: extdate/extdatepicker.cpp:80
-#, c-format
-msgid "Week %1"
-msgstr "Wythnos %1"
-
-#: extdate/extdatepicker.cpp:152
-msgid "Next year"
-msgstr "Blwyddyn nesaf"
-
-#: extdate/extdatepicker.cpp:153
-msgid "Previous year"
-msgstr "Blwyddyn cynt"
-
-#: extdate/extdatepicker.cpp:154
-msgid "Next month"
-msgstr "Mis nesaf"
-
-#: extdate/extdatepicker.cpp:155
-msgid "Previous month"
-msgstr "Mis cynt"
-
-#: extdate/extdatepicker.cpp:156
-msgid "Select a week"
-msgstr "Dewiswch wythnos"
-
-#: extdate/extdatepicker.cpp:157
-msgid "Select a month"
-msgstr "Dewiswch fis"
-
-#: extdate/extdatepicker.cpp:158
-msgid "Select a year"
-msgstr "Dewiswch flwyddyn"
-
-#: extdate/extdatepicker.cpp:159
-msgid "Select the current day"
-msgstr "Dewis y diwrnod cyfredol"
-
-#: tdeeduui/tdeeduglossary.cpp:35 tdeeduui/tdeeduglossary.cpp:166
-msgid "Glossary"
-msgstr "Geirfa"
-
-#: tdeeduui/tdeeduglossary.cpp:185
-msgid "Search:"
-msgstr "Chwilio:"
-
-#: tdeeduui/tdeeduglossary.cpp:390
-msgid "References"
-msgstr "Cyfeiriadau"
-
 #~ msgid "Jan"
 #~ msgstr "Ion"
 
diff --git a/tde-i18n-cy/messages/tdeedu/tdefile_drgeo.po b/tde-i18n-cy/messages/tdeedu/tdefile_drgeo.po
index 8acadb84a82..9693a83dce8 100644
--- a/tde-i18n-cy/messages/tdeedu/tdefile_drgeo.po
+++ b/tde-i18n-cy/messages/tdeedu/tdefile_drgeo.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdeedu/tdefile_drgeo.po\n"
-"POT-Creation-Date: 2005-05-08 12:46+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeedu/tdefile_kig.po b/tde-i18n-cy/messages/tdeedu/tdefile_kig.po
index 1e4503f11ab..baa224d85d2 100644
--- a/tde-i18n-cy/messages/tdeedu/tdefile_kig.po
+++ b/tde-i18n-cy/messages/tdeedu/tdefile_kig.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdeedu/tdefile_kig.po\n"
-"POT-Creation-Date: 2005-05-25 08:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdegames/atlantik.po b/tde-i18n-cy/messages/tdegames/atlantik.po
index bfa06e3e230..40803047283 100644
--- a/tde-i18n-cy/messages/tdegames/atlantik.po
+++ b/tde-i18n-cy/messages/tdegames/atlantik.po
@@ -9,217 +9,17 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: atlantik\n"
-"POT-Creation-Date: 2005-07-24 01:33+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2005-09-08 17:20+0100\n"
 "Last-Translator: Kevin Donnelly <kevin@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10\n"
 "\n"
 
-#: libatlantikclient/atlantik_network.cpp:909
-msgid "Connecting to %1:%2..."
-msgstr "Yn cysylltu â %1:%2..."
-
-#: libatlantikclient/atlantik_network.cpp:915
-msgid "Server host name lookup finished..."
-msgstr "Wedi gorffen chwilio am enw gwesteiwr y gweinydd..."
-
-#: libatlantikclient/atlantik_network.cpp:920
-msgid "Connected to %1:%2."
-msgstr "Wedi cysylltu â %1:%2."
-
-#: libatlantikclient/atlantik_network.cpp:925
-#, c-format
-msgid "Connection failed! Error code: %1"
-msgstr "Wedi methu cysylltu!  Cod gwall: %1"
-
-#: libatlantikui/trade_widget.cpp:55
-#, c-format
-msgid "Trade %1"
-msgstr "Masnach %1"
-
-#: libatlantikui/trade_widget.cpp:59
-msgid "Add Component"
-msgstr "Ychwanegu Cydran"
-
-#: libatlantikui/trade_widget.cpp:63
-msgid "Estate"
-msgstr "Stâd"
-
-#: libatlantikui/trade_widget.cpp:64
-msgid "Money"
-msgstr "Arian"
-
-#: libatlantikui/trade_widget.cpp:89
-msgid "From"
-msgstr "O"
-
-#: libatlantikui/trade_widget.cpp:93
-msgid "To"
-msgstr "I"
-
-#: libatlantikui/trade_widget.cpp:112
-msgid "Update"
-msgstr "Diweddaru"
-
-#: libatlantikui/auction_widget.cpp:54 libatlantikui/trade_widget.cpp:120
-#: libatlantikui/trade_widget.cpp:122
-msgid "Player"
-msgstr "Chwaraewr"
-
-#: libatlantikui/trade_widget.cpp:121
-msgid "Gives"
-msgstr "Rhoi"
-
-#: libatlantikui/trade_widget.cpp:123
-msgid "Item"
-msgstr "Eitem"
-
-#: libatlantikui/trade_widget.cpp:133
-msgid "Reject"
-msgstr "Gwrthod"
-
-#: libatlantikui/trade_widget.cpp:138
-msgid "Accept"
-msgstr "Derbyn"
-
-#: libatlantikui/trade_widget.cpp:146 libatlantikui/trade_widget.cpp:219
-msgid "%1 out of %2 players accept current trade proposal."
-msgstr "Mae %1 allan o %2 chwaraewr yn derbyn y cynnig masnach cyfredol."
-
-#: libatlantikui/trade_widget.cpp:180
-msgid ""
-"_: gives is transitive ;)\n"
-"gives"
-msgstr "yn rhoi"
-
-#: libatlantikui/trade_widget.cpp:235
-#, c-format
-msgid "Trade proposal was rejected by %1."
-msgstr "Cafodd y cynnig masnach ei wrthod gan %1."
-
-#: libatlantikui/trade_widget.cpp:237
-msgid "Trade proposal was rejected."
-msgstr "Cafodd y cynnig masnach ei wrthod."
-
-#: libatlantikui/trade_widget.cpp:357
-msgid "Remove From Trade"
-msgstr "Gwaredu o fasnach"
-
-#: libatlantikui/estateview.cpp:480 libatlantikui/portfolioview.cpp:263
-#, c-format
-msgid "Request Trade with %1"
-msgstr "Gofyn am fasnach gyda %1"
-
-#: libatlantikui/portfolioview.cpp:268
-msgid "Boot Player %1 to Lounge"
-msgstr "Lluchio Chwaraewr %1 i'r Lolfa"
-
-#: libatlantikui/auction_widget.cpp:50
-#, c-format
-msgid "Auction: %1"
-msgstr "Arwerthiant: %1"
-
-#: libatlantikui/auction_widget.cpp:50
-msgid "Auction"
-msgstr "Arwerthiant"
-
-#: libatlantikui/auction_widget.cpp:55
-msgid "Bid"
-msgstr "Cais"
-
-#: libatlantikui/auction_widget.cpp:80
-msgid "Make Bid"
-msgstr "Gwneud Cais"
-
-#: libatlantikui/auction_widget.cpp:94
-msgid "Going once..."
-msgstr "Mynd unwaith..."
-
-#: libatlantikui/auction_widget.cpp:98
-msgid "Going twice..."
-msgstr "Mynd dwywaith..."
-
-#: libatlantikui/auction_widget.cpp:102
-msgid "Sold!"
-msgstr "Gwerthwyd!"
-
-#: libatlantikui/estatedetails.cpp:220 libatlantikui/estateview.cpp:86
-#, c-format
-msgid "Price: %1"
-msgstr "Pris: %1"
-
-#: libatlantikui/estatedetails.cpp:227 libatlantikui/estateview.cpp:75
-#, c-format
-msgid "Owner: %1"
-msgstr "Perchennog: %1"
-
-#: libatlantikui/estatedetails.cpp:227
-msgid "unowned"
-msgstr "heb berchennog"
-
-#: libatlantikui/estatedetails.cpp:232
-#, c-format
-msgid "Houses: %1"
-msgstr "Tai: %1"
-
-#: libatlantikui/estatedetails.cpp:235
-#, c-format
-msgid "Mortgaged: %1"
-msgstr "Wedi'u morgeisio: %1"
-
-#: libatlantikui/estateview.cpp:77
-#, c-format
-msgid "Unmortgage Price: %1"
-msgstr "Pris Dadforgeisio: %1"
-
-#: libatlantikui/estateview.cpp:79
-#, c-format
-msgid "Mortgage Value: %1"
-msgstr "Gwerth Morgeisio: %1"
-
-#: libatlantikui/estateview.cpp:81
-#, c-format
-msgid "House Value: %1"
-msgstr "Gwerth Tŷ: %1"
-
-#: libatlantikui/estateview.cpp:83
-#, c-format
-msgid "House Price: %1"
-msgstr "Pris Tŷ: %1"
-
-#: libatlantikui/estateview.cpp:88
-#, c-format
-msgid "Money: %1"
-msgstr "Arian: %1"
-
-#: libatlantikui/estateview.cpp:447
-msgid "Unmortgage"
-msgstr "Dadforgeisio"
-
-#: libatlantikui/estateview.cpp:453
-msgid "Mortgage"
-msgstr "Morgeisio"
-
-#: libatlantikui/estateview.cpp:460
-msgid "Build Hotel"
-msgstr "Adeiladu Gwesty"
-
-#: libatlantikui/estateview.cpp:462
-msgid "Build House"
-msgstr "Adeiladu Tŷ"
-
-#: libatlantikui/estateview.cpp:469
-msgid "Sell Hotel"
-msgstr "Gwerthu Gwesty"
-
-#: libatlantikui/estateview.cpp:471
-msgid "Sell House"
-msgstr "Gwerthu Tŷ"
-
 #: _translatorinfo.cpp:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
@@ -232,179 +32,22 @@ msgid ""
 "Your emails"
 msgstr "kyfieithu@dotmon.com"
 
-#: client/atlantik.cpp:106
-msgid "Show Event &Log"
-msgstr "Dangos &Cofnod Digwyddiadau"
-
-#: client/atlantik.cpp:135
-msgid "&Buy"
-msgstr "&Prynu"
-
-#: client/atlantik.cpp:137
-msgid "&Auction"
-msgstr "&Arwerthiant"
-
-#: client/atlantik.cpp:141
-msgid "Use Card to Leave Jail"
-msgstr "Defnyddio Cerdyn i Adael Carchar"
-
-#: client/atlantik.cpp:143
-msgid "&Pay to Leave Jail"
-msgstr "&Talu i Adael Carchar"
-
-#: client/atlantik.cpp:145
-msgid "Roll to Leave &Jail"
-msgstr "&Rholio i Adael Carchar"
-
-#: client/atlantik.cpp:448
-msgid "Error connecting: "
-msgstr "Gwall wrth gysylltu: "
-
-#: client/atlantik.cpp:454
-msgid "connection refused by host."
-msgstr "gwrthodwyd y cysylltiad gan y gweinydd."
-
-#: client/atlantik.cpp:456
-msgid "could not connect to host."
-msgstr "methwyd cysylltu â'r gweinydd."
-
-#: client/atlantik.cpp:460
-msgid "host not found."
-msgstr "ni chafwyd gweinydd."
-
-#: client/atlantik.cpp:464
-msgid "unknown error."
-msgstr "gwall anhysbys."
-
-#: client/atlantik.cpp:478
-msgid "Connection with server %1:%2 lost."
-msgstr "Colliwyd y cysylltiad â'r gweinydd %1:%2."
-
-#: client/atlantik.cpp:483
-msgid "Disconnected from %1:%2."
-msgstr "Dadgysylltwyd o %1:%2."
-
-#: client/atlantik.cpp:714
-msgid "It is your turn now."
-msgstr "Eich tro chi yw hi nawr."
-
-#: client/atlantik.cpp:843
-msgid ""
-"You are currently part of an active game. Are you sure you want to close "
-"Atlantik? If you do, you forfeit the game."
-msgstr ""
-"Rydych yn cymryd rhan mewn gêm weithredol ar hyn o bryd.  Ydych wir eisiau cau "
-"Atlantik?  Os felly, byddwch yn fforfedu'r gêm."
-
-#: client/atlantik.cpp:843
-msgid "Close & Forfeit?"
-msgstr "Cau a Fforfedu?"
-
-#: client/atlantik.cpp:843
-msgid "Close && Forfeit"
-msgstr "Cau && Fforfedu"
-
-#: client/selectconfiguration_widget.cpp:45
-msgid "Game Configuration"
-msgstr "Ffurfweddu'r Gêm"
-
-#: client/selectconfiguration_widget.cpp:61
-msgid "Leave Game"
-msgstr "Gadael Gêm"
-
-#: client/selectconfiguration_widget.cpp:68
-msgid "Start Game"
-msgstr "Dechrau Gêm"
-
-#: client/selectconfiguration_widget.cpp:78
-msgid "Retrieving configuration list..."
-msgstr "Nôl rhestr ffurfweddu..."
-
-#: client/selectconfiguration_widget.cpp:83
-msgid "Game started. Retrieving full game data..."
-msgstr "Dechreuwyd y gêm.  Nôl gwybodaeth gyfan y gêm..."
-
-#: client/selectconfiguration_widget.cpp:162
-msgid "Retrieved configuration list."
-msgstr "Cafwyd y rhestr ffurfweddu."
-
-#: client/main.cpp:29
-msgid "Connect to this host"
-msgstr "Cysylltu â'r gwesteiwr yma"
-
-#: client/main.cpp:31
-msgid "Connect at this port"
-msgstr "Cysylltu â'r porth yma"
-
-#: client/main.cpp:33
-msgid "Join this game"
-msgstr "Ymuno â'r gêm"
-
-#: client/main.cpp:41
-msgid "Atlantik"
-msgstr "AAtlantiktlantik"
-
-#: client/main.cpp:42
-msgid "The Atlantic board game"
-msgstr "Gêm bwrdd Atlantik"
-
-#: client/main.cpp:44
-msgid "(c) 1998-2004 Rob Kaper"
-msgstr "(c)(h) 1998-2004 Rob Kaper"
-
-#: client/main.cpp:45
-msgid "TDE client for playing Monopoly-like games on the monopd network."
-msgstr ""
-"Dibynnydd TDE ar gyfer chwarae gemau tebyg i Monopoly ar y rhwydwaith monopd."
-
-#: client/main.cpp:49
-msgid "main author"
-msgstr "prif awdur"
-
-#: client/main.cpp:52
-msgid "KExtendedSocket support"
-msgstr "Cefnogaeth KExtendedSocket"
-
-#: client/main.cpp:53
-msgid "various patches"
-msgstr "cywiriadau amrywiol"
-
-#: client/main.cpp:55
-msgid "application icon"
-msgstr "eicon y cymhwysiad"
-
-#: client/main.cpp:56
-msgid "token icons"
-msgstr "eiconau tocyn"
-
-#: client/main.cpp:57 client/main.cpp:58
-msgid "icons"
-msgstr "eiconau"
-
-#: client/main.cpp:73
-msgid "The Atlantic Board Game"
-msgstr "Gêm Bwrdd Atlantik"
-
-#: client/eventlogwidget.cpp:59
-msgid "Event Log"
-msgstr "Cofnod Digwyddiadau"
-
-#: client/eventlogwidget.cpp:66
-msgid "Date/Time"
-msgstr "Dyddiad/Amser"
+#: libatlantikclient/atlantik_network.cpp:909
+msgid "Connecting to %1:%2..."
+msgstr "Yn cysylltu â %1:%2..."
 
-#: client/eventlogwidget.cpp:67 client/selectgame_widget.cpp:49
-msgid "Description"
-msgstr "Disgrifiad"
+#: libatlantikclient/atlantik_network.cpp:915
+msgid "Server host name lookup finished..."
+msgstr "Wedi gorffen chwilio am enw gwesteiwr y gweinydd..."
 
-#: client/eventlogwidget.cpp:75
-msgid "&Save As..."
-msgstr "&Cadw Fel..."
+#: libatlantikclient/atlantik_network.cpp:920
+msgid "Connected to %1:%2."
+msgstr "Wedi cysylltu â %1:%2."
 
-#: client/eventlogwidget.cpp:116
+#: libatlantikclient/atlantik_network.cpp:925
 #, c-format
-msgid "Atlantik log file, saved at %1."
-msgstr "Ffeil cofnod Atlantik, wedi'i gadw ar %1."
+msgid "Connection failed! Error code: %1"
+msgstr "Wedi methu cysylltu!  Cod gwall: %1"
 
 #: client/configdlg.cpp:43
 msgid "Configure Atlantik"
@@ -596,6 +239,123 @@ msgstr "Cafwyd y rhestr weinyddion."
 msgid "Error while retrieving the server list."
 msgstr "Gwall wrth nôl y rhestr weinyddion."
 
+#: client/eventlogwidget.cpp:59
+msgid "Event Log"
+msgstr "Cofnod Digwyddiadau"
+
+#: client/eventlogwidget.cpp:66
+msgid "Date/Time"
+msgstr "Dyddiad/Amser"
+
+#: client/eventlogwidget.cpp:67 client/selectgame_widget.cpp:49
+msgid "Description"
+msgstr "Disgrifiad"
+
+#: client/eventlogwidget.cpp:75
+msgid "&Save As..."
+msgstr "&Cadw Fel..."
+
+#: client/eventlogwidget.cpp:116
+#, c-format
+msgid "Atlantik log file, saved at %1."
+msgstr "Ffeil cofnod Atlantik, wedi'i gadw ar %1."
+
+#: client/selectconfiguration_widget.cpp:45
+msgid "Game Configuration"
+msgstr "Ffurfweddu'r Gêm"
+
+#: client/selectconfiguration_widget.cpp:61
+msgid "Leave Game"
+msgstr "Gadael Gêm"
+
+#: client/selectconfiguration_widget.cpp:68
+msgid "Start Game"
+msgstr "Dechrau Gêm"
+
+#: client/selectconfiguration_widget.cpp:78
+msgid "Retrieving configuration list..."
+msgstr "Nôl rhestr ffurfweddu..."
+
+#: client/selectconfiguration_widget.cpp:83
+msgid "Game started. Retrieving full game data..."
+msgstr "Dechreuwyd y gêm.  Nôl gwybodaeth gyfan y gêm..."
+
+#: client/selectconfiguration_widget.cpp:162
+msgid "Retrieved configuration list."
+msgstr "Cafwyd y rhestr ffurfweddu."
+
+#: client/atlantik.cpp:106
+msgid "Show Event &Log"
+msgstr "Dangos &Cofnod Digwyddiadau"
+
+#: client/atlantik.cpp:135
+msgid "&Buy"
+msgstr "&Prynu"
+
+#: client/atlantik.cpp:137
+msgid "&Auction"
+msgstr "&Arwerthiant"
+
+#: client/atlantik.cpp:141
+msgid "Use Card to Leave Jail"
+msgstr "Defnyddio Cerdyn i Adael Carchar"
+
+#: client/atlantik.cpp:143
+msgid "&Pay to Leave Jail"
+msgstr "&Talu i Adael Carchar"
+
+#: client/atlantik.cpp:145
+msgid "Roll to Leave &Jail"
+msgstr "&Rholio i Adael Carchar"
+
+#: client/atlantik.cpp:448
+msgid "Error connecting: "
+msgstr "Gwall wrth gysylltu: "
+
+#: client/atlantik.cpp:454
+msgid "connection refused by host."
+msgstr "gwrthodwyd y cysylltiad gan y gweinydd."
+
+#: client/atlantik.cpp:456
+msgid "could not connect to host."
+msgstr "methwyd cysylltu â'r gweinydd."
+
+#: client/atlantik.cpp:460
+msgid "host not found."
+msgstr "ni chafwyd gweinydd."
+
+#: client/atlantik.cpp:464
+msgid "unknown error."
+msgstr "gwall anhysbys."
+
+#: client/atlantik.cpp:478
+msgid "Connection with server %1:%2 lost."
+msgstr "Colliwyd y cysylltiad â'r gweinydd %1:%2."
+
+#: client/atlantik.cpp:483
+msgid "Disconnected from %1:%2."
+msgstr "Dadgysylltwyd o %1:%2."
+
+#: client/atlantik.cpp:714
+msgid "It is your turn now."
+msgstr "Eich tro chi yw hi nawr."
+
+#: client/atlantik.cpp:843
+msgid ""
+"You are currently part of an active game. Are you sure you want to close "
+"Atlantik? If you do, you forfeit the game."
+msgstr ""
+"Rydych yn cymryd rhan mewn gêm weithredol ar hyn o bryd.  Ydych wir eisiau cau "
+"Atlantik?  Os felly, byddwch yn fforfedu'r gêm."
+
+#: client/atlantik.cpp:843
+msgid "Close & Forfeit?"
+msgstr "Cau a Fforfedu?"
+
+#: client/atlantik.cpp:843
+msgid "Close && Forfeit"
+msgstr "Cau && Fforfedu"
+
 #: client/selectgame_widget.cpp:43
 msgid "Create or Select monopd Game"
 msgstr "Creu neu Ddewis Gêm monopd"
@@ -633,6 +393,247 @@ msgstr "Ymuno â Gêm %2 %1"
 msgid "Join Game"
 msgstr "Ymuno â Gêm"
 
+#: client/main.cpp:29
+msgid "Connect to this host"
+msgstr "Cysylltu â'r gwesteiwr yma"
+
+#: client/main.cpp:31
+msgid "Connect at this port"
+msgstr "Cysylltu â'r porth yma"
+
+#: client/main.cpp:33
+msgid "Join this game"
+msgstr "Ymuno â'r gêm"
+
+#: client/main.cpp:41
+msgid "Atlantik"
+msgstr "AAtlantiktlantik"
+
+#: client/main.cpp:42
+msgid "The Atlantic board game"
+msgstr "Gêm bwrdd Atlantik"
+
+#: client/main.cpp:44
+msgid "(c) 1998-2004 Rob Kaper"
+msgstr "(c)(h) 1998-2004 Rob Kaper"
+
+#: client/main.cpp:45
+msgid "TDE client for playing Monopoly-like games on the monopd network."
+msgstr ""
+"Dibynnydd TDE ar gyfer chwarae gemau tebyg i Monopoly ar y rhwydwaith monopd."
+
+#: client/main.cpp:49
+msgid "main author"
+msgstr "prif awdur"
+
+#: client/main.cpp:52
+msgid "KExtendedSocket support"
+msgstr "Cefnogaeth KExtendedSocket"
+
+#: client/main.cpp:53
+msgid "various patches"
+msgstr "cywiriadau amrywiol"
+
+#: client/main.cpp:55
+msgid "application icon"
+msgstr "eicon y cymhwysiad"
+
+#: client/main.cpp:56
+msgid "token icons"
+msgstr "eiconau tocyn"
+
+#: client/main.cpp:57 client/main.cpp:58
+msgid "icons"
+msgstr "eiconau"
+
+#: client/main.cpp:73
+msgid "The Atlantic Board Game"
+msgstr "Gêm Bwrdd Atlantik"
+
+#: libatlantikui/trade_widget.cpp:55
+#, c-format
+msgid "Trade %1"
+msgstr "Masnach %1"
+
+#: libatlantikui/trade_widget.cpp:59
+msgid "Add Component"
+msgstr "Ychwanegu Cydran"
+
+#: libatlantikui/trade_widget.cpp:63
+msgid "Estate"
+msgstr "Stâd"
+
+#: libatlantikui/trade_widget.cpp:64
+msgid "Money"
+msgstr "Arian"
+
+#: libatlantikui/trade_widget.cpp:89
+msgid "From"
+msgstr "O"
+
+#: libatlantikui/trade_widget.cpp:93
+msgid "To"
+msgstr "I"
+
+#: libatlantikui/trade_widget.cpp:112
+msgid "Update"
+msgstr "Diweddaru"
+
+#: libatlantikui/auction_widget.cpp:54 libatlantikui/trade_widget.cpp:120
+#: libatlantikui/trade_widget.cpp:122
+msgid "Player"
+msgstr "Chwaraewr"
+
+#: libatlantikui/trade_widget.cpp:121
+msgid "Gives"
+msgstr "Rhoi"
+
+#: libatlantikui/trade_widget.cpp:123
+msgid "Item"
+msgstr "Eitem"
+
+#: libatlantikui/trade_widget.cpp:133
+msgid "Reject"
+msgstr "Gwrthod"
+
+#: libatlantikui/trade_widget.cpp:138
+msgid "Accept"
+msgstr "Derbyn"
+
+#: libatlantikui/trade_widget.cpp:146 libatlantikui/trade_widget.cpp:219
+msgid "%1 out of %2 players accept current trade proposal."
+msgstr "Mae %1 allan o %2 chwaraewr yn derbyn y cynnig masnach cyfredol."
+
+#: libatlantikui/trade_widget.cpp:180
+msgid ""
+"_: gives is transitive ;)\n"
+"gives"
+msgstr "yn rhoi"
+
+#: libatlantikui/trade_widget.cpp:235
+#, c-format
+msgid "Trade proposal was rejected by %1."
+msgstr "Cafodd y cynnig masnach ei wrthod gan %1."
+
+#: libatlantikui/trade_widget.cpp:237
+msgid "Trade proposal was rejected."
+msgstr "Cafodd y cynnig masnach ei wrthod."
+
+#: libatlantikui/trade_widget.cpp:357
+msgid "Remove From Trade"
+msgstr "Gwaredu o fasnach"
+
+#: libatlantikui/estatedetails.cpp:227 libatlantikui/estateview.cpp:75
+#, c-format
+msgid "Owner: %1"
+msgstr "Perchennog: %1"
+
+#: libatlantikui/estateview.cpp:77
+#, c-format
+msgid "Unmortgage Price: %1"
+msgstr "Pris Dadforgeisio: %1"
+
+#: libatlantikui/estateview.cpp:79
+#, c-format
+msgid "Mortgage Value: %1"
+msgstr "Gwerth Morgeisio: %1"
+
+#: libatlantikui/estateview.cpp:81
+#, c-format
+msgid "House Value: %1"
+msgstr "Gwerth Tŷ: %1"
+
+#: libatlantikui/estateview.cpp:83
+#, c-format
+msgid "House Price: %1"
+msgstr "Pris Tŷ: %1"
+
+#: libatlantikui/estatedetails.cpp:220 libatlantikui/estateview.cpp:86
+#, c-format
+msgid "Price: %1"
+msgstr "Pris: %1"
+
+#: libatlantikui/estateview.cpp:88
+#, c-format
+msgid "Money: %1"
+msgstr "Arian: %1"
+
+#: libatlantikui/estateview.cpp:447
+msgid "Unmortgage"
+msgstr "Dadforgeisio"
+
+#: libatlantikui/estateview.cpp:453
+msgid "Mortgage"
+msgstr "Morgeisio"
+
+#: libatlantikui/estateview.cpp:460
+msgid "Build Hotel"
+msgstr "Adeiladu Gwesty"
+
+#: libatlantikui/estateview.cpp:462
+msgid "Build House"
+msgstr "Adeiladu Tŷ"
+
+#: libatlantikui/estateview.cpp:469
+msgid "Sell Hotel"
+msgstr "Gwerthu Gwesty"
+
+#: libatlantikui/estateview.cpp:471
+msgid "Sell House"
+msgstr "Gwerthu Tŷ"
+
+#: libatlantikui/estateview.cpp:480 libatlantikui/portfolioview.cpp:263
+#, c-format
+msgid "Request Trade with %1"
+msgstr "Gofyn am fasnach gyda %1"
+
+#: libatlantikui/portfolioview.cpp:268
+msgid "Boot Player %1 to Lounge"
+msgstr "Lluchio Chwaraewr %1 i'r Lolfa"
+
+#: libatlantikui/auction_widget.cpp:50
+#, c-format
+msgid "Auction: %1"
+msgstr "Arwerthiant: %1"
+
+#: libatlantikui/auction_widget.cpp:50
+msgid "Auction"
+msgstr "Arwerthiant"
+
+#: libatlantikui/auction_widget.cpp:55
+msgid "Bid"
+msgstr "Cais"
+
+#: libatlantikui/auction_widget.cpp:80
+msgid "Make Bid"
+msgstr "Gwneud Cais"
+
+#: libatlantikui/auction_widget.cpp:94
+msgid "Going once..."
+msgstr "Mynd unwaith..."
+
+#: libatlantikui/auction_widget.cpp:98
+msgid "Going twice..."
+msgstr "Mynd dwywaith..."
+
+#: libatlantikui/auction_widget.cpp:102
+msgid "Sold!"
+msgstr "Gwerthwyd!"
+
+#: libatlantikui/estatedetails.cpp:227
+msgid "unowned"
+msgstr "heb berchennog"
+
+#: libatlantikui/estatedetails.cpp:232
+#, c-format
+msgid "Houses: %1"
+msgstr "Tai: %1"
+
+#: libatlantikui/estatedetails.cpp:235
+#, c-format
+msgid "Mortgaged: %1"
+msgstr "Wedi'u morgeisio: %1"
+
 #. i18n: file atlantikui.rc line 7
 #: rc.cpp:6
 #, no-c-format
diff --git a/tde-i18n-cy/messages/tdegames/kasteroids.po b/tde-i18n-cy/messages/tdegames/kasteroids.po
index e9e452c86a0..28d1ec3fbe4 100644
--- a/tde-i18n-cy/messages/tdegames/kasteroids.po
+++ b/tde-i18n-cy/messages/tdegames/kasteroids.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kasteroids\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2005-09-08 17:20+0100\n"
 "Last-Translator: Kevin Donnelly <kevin@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdegames/katomic.po b/tde-i18n-cy/messages/tdegames/katomic.po
index 856aef0e954..78ab2c3e5ef 100644
--- a/tde-i18n-cy/messages/tdegames/katomic.po
+++ b/tde-i18n-cy/messages/tdegames/katomic.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: katomic\n"
-"POT-Creation-Date: 2008-06-25 01:36+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2005-09-09 09:04+0100\n"
 "Last-Translator: Kevin Donnelly <kevin@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -42,19 +43,19 @@ msgstr "Rydych wedi datrys lefel %1 o fewn %2 o droeon!"
 msgid "Congratulations"
 msgstr "Llongyfarchiadau"
 
-#: gamewidget.cpp:101 gamewidget.cpp:225
+#: gamewidget.cpp:101 gamewidget.cpp:248
 msgid "Level %1 Highscores"
 msgstr "Sgoriau Gorau Lefel %1 "
 
-#: gamewidget.cpp:183
+#: gamewidget.cpp:206
 msgid "Score"
 msgstr "Sgôr"
 
-#: gamewidget.cpp:188
+#: gamewidget.cpp:211
 msgid "Highscore:"
 msgstr "Sgor Gorau:"
 
-#: gamewidget.cpp:200
+#: gamewidget.cpp:223
 msgid "Your score so far:"
 msgstr "Eich sgôr hyd yn hyn:"
 
diff --git a/tde-i18n-cy/messages/tdegames/kbackgammon.po b/tde-i18n-cy/messages/tdegames/kbackgammon.po
index f3760e22964..413fa42d585 100644
--- a/tde-i18n-cy/messages/tdegames/kbackgammon.po
+++ b/tde-i18n-cy/messages/tdegames/kbackgammon.po
@@ -8,183 +8,28 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kbackgammon\n"
-"POT-Creation-Date: 2007-03-09 02:17+0100\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2005-10-20 08:23+0100\n"
 "Last-Translator: Kevin Donnelly <kevin@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10\n"
 "\n"
 
-#: kbg.cpp:78
-msgid "Open Board"
-msgstr "Bwrdd Agored"
-
-#: kbg.cpp:79
-msgid "FIBS"
-msgstr "FIBS"
-
-#: kbg.cpp:80
-msgid "GNU Backgammon (Experimental)"
-msgstr "Backgammon GNU (Arbrofiadol)"
-
-#: kbg.cpp:81
-msgid "Next Generation (Experimental)"
-msgstr "Y Genhedlaeth Nesaf (Arbrofiadol)"
-
-#: kbg.cpp:83
-msgid "FIBS Home"
-msgstr "Cartref FIBS"
-
-#: kbg.cpp:86
-msgid "Backgammon Rules"
-msgstr "Rheolau Backgammon"
-
-#: kbg.cpp:108
-msgid "&Engine"
-msgstr "&Peiriant"
-
-#: kbg.cpp:124
-msgid "Double Cube"
-msgstr "Ciwb Dwbwl"
-
-#: kbg.cpp:133
-msgid "&Backgammon on the Web"
-msgstr "&Backgammon ar y We"
-
-#: kbg.cpp:145
-msgid "Command: "
-msgstr "Gorchymyn: "
-
-#: kbg.cpp:182
-msgid ""
-"This area contains the status messages for the game. Most of these messages are "
-"sent to you from the current engine."
-msgstr ""
-"Cynnwys yr ardal hon  negeseuon ar gyfer y gêm.  Anfonir y rhan fwyaf o'r rhain "
-"atoch o'r peiriant cyfredol."
-
-#: kbg.cpp:186
-msgid ""
-"This is the command line. You can type special commands related to the current "
-"engine in here. Most relevant commands are also available through the menus."
-msgstr ""
-"Dyma'r llinell orchymyn.  Cewch deipio yma orchmynion arbennig, sy'n ymwneud "
-"â'r peiriant cyfredol.  Mae'r rhan fwyaf o'r gorchmynion perthnasol ar gael o'r "
-"dewislenni hefyd."
-
-#: kbg.cpp:191
-msgid ""
-"This is the button bar tool bar. It gives you easy access to game related "
-"commands. You can drag the bar to a different location within the window."
-msgstr ""
-"Dyma far offer y bar botymau.  Mae'n rhoi cyrchiad hawdd i orchmynion "
-"perthnasol i'r gêm.  Cewch lusgo'r bar i leoliad arall tu mewn y ffenest."
-
-#: kbg.cpp:196
-msgid ""
-"This is the status bar. It shows you the currently selected engine in the left "
-"corner."
-msgstr ""
-"Dyma'r bar cyflwr.  Dengys i chi'r peiriant wedi'i ddewis ar hyn o bryd yn y "
-"gornel chwith."
-
-#: kbg.cpp:509
-msgid "General"
-msgstr "Cyffredinol"
-
-#: kbg.cpp:509
-#, c-format
-msgid "Here you can configure general settings of %1"
-msgstr "Yma cewch ffurfweddu gosodiadau %1"
-
-#: kbg.cpp:516
-msgid "Messages"
-msgstr "Negeseuon"
-
-#: kbg.cpp:517
-msgid "Timer"
-msgstr "Amserydd"
-
-#: kbg.cpp:518
-msgid "Autosave"
-msgstr "Hunangadw"
-
-#: kbg.cpp:519
-msgid "Events"
-msgstr "Digwyddiadau"
-
-#: kbg.cpp:524
-msgid ""
-"After you finished your moves, they have to be sent to the engine. You can "
-"either do that manually (in which case you should not enable this feature), or "
-"you can specify an amount of time that has to pass before the move is "
-"committed. If you undo a move during the timeout, the timeout will be reset and "
-"restarted once you finish the move. This is very useful if you would like to "
-"review the result of your move."
-msgstr ""
-"Wedi gorffen eich troeon, rhaid eu danfon i'r peiriant.  Cewch wneud hyn neill "
-"ai â llaw (os felly, ddylech chi ddim galluogi'r nodwedd hwn), neu mi gewch "
-"ddynodi cyfnod amser mae rhaid iddo fynd heibio cyn i'r tro gael eu gadarnhau.  "
-"Os ydych chi'n dadwneud tro yn ystod yr oediad hwn, ailosodir y cyfnod a'i "
-"ailgychwyn unwaith i chi orffen eich tro.  Mae hyn yn ddefnyddiol iawn pe "
-"carech fwrw golwg dros ganlyniad eich tro."
-
-#: kbg.cpp:531
-msgid "Enable timeout"
-msgstr "Galluogi oediad"
-
-#: kbg.cpp:536
-msgid "Move timeout in seconds:"
-msgstr "Symud oediad mewn eiliadau:"
-
-#: kbg.cpp:549
-msgid ""
-"Check the box to enable all the messages that you have previously disabled by "
-"choosing the \"Don't show this message again\" option."
-msgstr ""
-"Brithwch y blwch i alluogi pob neges analluog trwy ddewis \"Peidiwch â dangos y "
-"neges hon eto\"."
-
-#: kbg.cpp:553
-msgid "Reenable all messages"
-msgstr "Ailalluogi pob neges"
-
-#: kbg.cpp:559
-msgid ""
-"Check the box to automatically save all window positions on program exit. They "
-"will be restored at next start."
-msgstr ""
-"Brithwch y blwch i gadw'n ymysgogol safleoedd pob ffenest wrth derfynu'r "
-"rhaglen.  Cânt eu hadfer y tro nesaf i chi gychwyn."
-
-#: kbg.cpp:563
-msgid "Save settings on exit"
-msgstr "Cadw gosodiadau wrth derfynu"
-
-#: kbg.cpp:570
+#: _translatorinfo.cpp:1
 msgid ""
-"Event notification of %1 is configured as part of the system-wide notification "
-"process. Click here, and you will be able to configure system sounds, etc."
-msgstr ""
-"Mae hysbysu digwyddiad %1 wedi'i ffurfweddu fel rhan o'r broses hysbysu "
-"cysawd-eang.  Cliciwch yma, a chewch ffurfweddu seiniau'r system, a.y.y.b."
-
-#: kbg.cpp:577
-msgid "Klick here to configure the event notification"
-msgstr "Cliciwch yma i ffurfweddu hysbysu digwyddiadau"
-
-#: kbg.cpp:649
-#, c-format
-msgid "Print %1"
-msgstr "Argraffu %1"
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Kyfieithu: KD, Peter Bradley, dylunio, Thierry Vignaud"
 
-#: kbg.cpp:671
+#: _translatorinfo.cpp:3
 msgid ""
-"You can enable the menubar again with the right mouse button menu of the board."
-msgstr "Cewch alluogi bar y ddewislen eto gyda dewislen botwm de'r llygoden."
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "kyfieithu@dotmon.com"
 
 #: kbgboard.cpp:131
 msgid "Board"
@@ -338,46 +183,467 @@ msgstr ""
 "Ymhellach, gellir rhoi'r ciwb ar y bar cartref ac os caiff ei ddyblu, bydd "
 "dwblglicio arno yn gwneud felly."
 
-#: engines/fibs/kbgfibschat.cpp:203
-msgid "%1 user"
-msgstr "Defnyddiwr %1"
+#: engines/offline/kbgoffline.cpp:123
+msgid "&New Game..."
+msgstr "Gêm &Newydd..."
 
-#: engines/fibs/kbgfibschat.cpp:205
-msgid "Kibitz to watchers and players"
-msgstr "Kibitz i wylwyr a chwareuwyr"
+#: engines/offline/kbgoffline.cpp:124
+msgid "&Swap Colors"
+msgstr "&Amnewid Lliwiau"
 
-#: engines/fibs/kbgfibschat.cpp:207
-msgid "Whisper to watchers only"
-msgstr "Sibrwd i wylwyr yn unig"
+#: engines/offline/kbgoffline.cpp:126
+msgid "&Edit Mode"
+msgstr "&Modd Golygu"
 
-#: engines/fibs/kbgfibschat.cpp:222
-msgid "Chat Window"
-msgstr "Ffenest Sgwrsio"
+#: engines/offline/kbgoffline.cpp:182
+msgid "Offline Engine"
+msgstr "Peiriant All-lein"
 
-#: engines/fibs/kbgfibschat.cpp:224
+#: engines/offline/kbgoffline.cpp:182
+msgid "Use this to configure the Offline engine"
+msgstr "Defnyddiwch hyn i ffurfweddu'r peiriant All-lein"
+
+#: engines/offline/kbgoffline.cpp:199
+msgid "Names"
+msgstr "Enwau"
+
+#: engines/offline/kbgoffline.cpp:209
+msgid "First player:"
+msgstr "Chwaraewr cyntaf:"
+
+#: engines/offline/kbgoffline.cpp:210
+msgid "Second player:"
+msgstr "Ail chwaraewr:"
+
+#: engines/offline/kbgoffline.cpp:217
+msgid "Enter the name of the first player."
+msgstr "Rhowch enw'r chwaraewr cyntaf."
+
+#: engines/offline/kbgoffline.cpp:218
+msgid "Enter the name of the second player."
+msgstr "Rhowch enw'r ail chwaraewr."
+
+#: engines/offline/kbgoffline.cpp:224
+msgid "&Player Names"
+msgstr "Enwau'r Chwa&raewyr"
+
+#: engines/offline/kbgoffline.cpp:237 engines/offline/kbgoffline.cpp:253
+msgid "South"
+msgstr "De"
+
+#: engines/offline/kbgoffline.cpp:238 engines/offline/kbgoffline.cpp:254
+msgid "North"
+msgstr "Gogledd"
+
+#: engines/gnubg/kbggnubg.cpp:279 engines/offline/kbgoffline.cpp:286
+msgid "A game is currently in progress. Starting a new one will terminate it."
+msgstr ""
+"Mae gêm ar y gweill ar hyn o bryd.  Bydd cychwyn un newydd yn ei therfynu."
+
+#: engines/gnubg/kbggnubg.cpp:281 engines/offline/kbgoffline.cpp:288
+msgid "Start New Game"
+msgstr "Cychwyn Gêm Newydd"
+
+#: engines/gnubg/kbggnubg.cpp:281 engines/offline/kbgoffline.cpp:289
+msgid "Continue Old Game"
+msgstr "Parhau â Hen Gêm"
+
+#: engines/offline/kbgoffline.cpp:320
+msgid "%1 rolls %2, %3 rolls %4."
+msgstr "Mae %1 wedi rholio  %2, mae %3 wedi rholio %4."
+
+#: engines/offline/kbgoffline.cpp:325 engines/offline/kbgoffline.cpp:328
+msgid "%1 makes the first move."
+msgstr "Mae %1 yn gwneud y symudiad cyntaf."
+
+#: engines/gnubg/kbggnubg.cpp:239 engines/offline/kbgoffline.cpp:341
+#: engines/offline/kbgoffline.cpp:798
+msgid "%1 vs. %2"
+msgstr "%1 vs. %2"
+
+#: engines/offline/kbgoffline.cpp:391
 msgid ""
-"This is the chat window.\n"
-"\n"
-"The text in this window is colored depending on whether it is directed at you "
-"personally, shouted to the general FIBS population, has been said by you, or is "
-"of general interest. If you select the name of a player, the context contains "
-"entries specifically geared towards that player."
+"Please enter the nickname of the player whose home\n"
+"is in the lower half of the board:"
 msgstr ""
-"Hon yw'r ffenestr sgwrsio.\n"
-"\n"
-" Mae'r testun yn y ffenestr yma mewn lliw, gan ddibynnu ar a yw yn cael ei "
-"gyfeirio atoch yn bersonol, wedi cael ei weiddi i'r boblogaeth gyffredinol "
-"FIBS, wedi cael ei ddweud ganddoch, neu yn bod o ddiddordeb cyffredinol.  Os "
-"dewiswch enw chwaraewr, mae'r cyd-destun yn cynnwys cofnodion sy'n ymwneud â'r "
-"chwaraewr yna yn benodol."
+"Rhowch ffugenw'r chwaraewr sydd efo cartref\n"
+"yng nghanol isaf y bwrdd:"
 
-#: engines/fibs/kbgfibschat.cpp:233
-msgid "Info On"
-msgstr "Gwybodaeth Ar"
+#: engines/offline/kbgoffline.cpp:395
+msgid ""
+"Please enter the nickname of the player whose home\n"
+"is in the upper half of the board:"
+msgstr ""
+"Rhowch ffugenw'r chwaraewr sydd efo cartref\n"
+"yng nghanol uchaf y bwrdd:"
 
-#: engines/fibs/kbgfibschat.cpp:237
-msgid "Talk To"
-msgstr "Siarad Efo"
+#: engines/offline/kbgoffline.cpp:424 engines/offline/kbgoffline.cpp:656
+msgid "%1 wins the game. Congratulations!"
+msgstr "Mae %1 wedi ennill y gêm.  Llongyfarchiadau!"
+
+#: engines/offline/kbgoffline.cpp:443
+msgid "%1, please roll or double."
+msgstr "%1, rhowliwch neu ddyblwch."
+
+#: engines/offline/kbgoffline.cpp:562
+msgid "It's not your turn to roll!"
+msgstr "Dim eich tro chi i rolio yw fo!"
+
+#: engines/offline/kbgoffline.cpp:614
+msgid "Game over!"
+msgstr "Gêm drosodd!"
+
+#: engines/offline/kbgoffline.cpp:621
+msgid "%1, you cannot move."
+msgstr "%1, ni allwch symud."
+
+#: engines/offline/kbgoffline.cpp:630
+#, fuzzy, c-format
+msgid ""
+"_n: , please move 1 piece.\n"
+", please move %n pieces."
+msgstr ""
+", symudwch 1 darn.\n"
+", symudwch %2 o ddarnau."
+
+#: engines/offline/kbgoffline.cpp:649
+msgid "%1 has doubled. %2, do you accept the double?"
+msgstr "Mae %1 wedi dyblu.  %2, ydych yn derbyn y dyblu?"
+
+#: engines/offline/kbgoffline.cpp:652
+msgid "Doubling"
+msgstr "Yn dyblu"
+
+#: engines/fibs/kbgfibs.cpp:2219 engines/offline/kbgoffline.cpp:652
+msgid "Accept"
+msgstr "Derbyn"
+
+#: engines/fibs/kbgfibs.cpp:2220 engines/offline/kbgoffline.cpp:652
+msgid "Reject"
+msgstr "Gwrthod"
+
+#: engines/offline/kbgoffline.cpp:661
+msgid "%1 has accepted the double. The game continues."
+msgstr "Mae %1 wedi derbyn y dyblu.  Mae'r gêm yn parhau."
+
+#: engines/offline/kbgoffline.cpp:699
+msgid "In the middle of a game. Really quit?"
+msgstr "Yng nghanol gêm?  Terfynu go iawn?"
+
+#: engines/offline/kbgoffline.cpp:724
+msgid "Text commands are not yet working. The command '%1' has been ignored."
+msgstr ""
+"Nid yw gorchmynion testun yn gweithio eto.  Anwybyddwyd y gorchymyn '%1'."
+
+#: engines/offline/kbgoffline.cpp:794
+msgid "%1 vs. %2 - Edit Mode"
+msgstr "%1 vs. %2 - Modd Golygu"
+
+#: engines/gnubg/kbggnubg.cpp:134
+#, c-format
+msgid "gnubg doubles the cube to %1."
+msgstr "Mae gnubg yn dyblu'r ciwb i %1."
+
+#: engines/gnubg/kbggnubg.cpp:135
+msgid "gnubg doubles"
+msgstr "Mae gnubg yn dyblu"
+
+#: engines/gnubg/kbggnubg.cpp:136
+msgid "&Accept"
+msgstr "&Derbyn"
+
+#: engines/gnubg/kbggnubg.cpp:136
+msgid "Re&double"
+msgstr "Ailddy&blu"
+
+#: engines/gnubg/kbggnubg.cpp:136
+msgid "&Reject"
+msgstr "&Gwrthod"
+
+#: engines/gnubg/kbggnubg.cpp:188
+msgid "Please roll or double."
+msgstr "Rholiwch neu ddyblwch."
+
+#: engines/gnubg/kbggnubg.cpp:191
+msgid "Please roll."
+msgstr "Rholiwch."
+
+#: engines/gnubg/kbggnubg.cpp:202
+msgid "You roll %1 and %2."
+msgstr "Rydych yn rholio %1 a %2."
+
+#: engines/gnubg/kbggnubg.cpp:208
+msgid "Please move 1 piece."
+msgstr "Symudwch 1 darn."
+
+#: engines/gnubg/kbggnubg.cpp:211
+msgid "Please move %1 pieces."
+msgstr "Symudwch %1 o ddarnau."
+
+#: engines/gnubg/kbggnubg.cpp:223
+msgid "gnubg rolls %1 and %2."
+msgstr "Mae gnubg yn rholio %1 a %2."
+
+#: engines/gnubg/kbggnubg.cpp:225
+msgid "gnubg cannot move."
+msgstr "Mae gnubg yn methu symud."
+
+#: engines/gnubg/kbggnubg.cpp:294
+msgid "Starting a new game."
+msgstr "Yn cychwyn gêm newydd."
+
+#: engines/gnubg/kbggnubg.cpp:382
+msgid "GNU Engine"
+msgstr "Peiriant GNU"
+
+#: engines/gnubg/kbggnubg.cpp:382
+msgid "Here you can configure the GNU backgammon engine"
+msgstr "Cewch ffurfweddu'r peiriant tawlbwrdd GNU yma"
+
+#: engines/gnubg/kbggnubg.cpp:442
+msgid "&Restart GNU Backgammon"
+msgstr "Ail&gychwyn Tawlbwrdd GNU"
+
+#: engines/gnubg/kbggnubg.cpp:474
+msgid ""
+"This is experimental code which currently requires a specially patched version "
+"of GNU Backgammon."
+"<br/>"
+"<br/>"
+msgstr ""
+"Côd arbofol yw hwn, ac ar hyn o bryd mae angen fersiwn Tawlbwrdd GNU wedi'i "
+"glytio yn arbennig."
+"<br/>"
+"<br/>"
+
+#: engines/gnubg/kbggnubg.cpp:507
+msgid ""
+"Could not start the GNU Backgammon process.\n"
+"Make sure the program is in your PATH and is called \"gnubg\".\n"
+"Make sure that your copy is at least version 0.10"
+msgstr ""
+"Methu cychwyn y broses Dawlbwrdd GNU.\n"
+"Sicrhewch fod y rhaglen yn eich llwybr (PATH), ac efo'r enw \"gnubg\".\n"
+"Sicrhewch fod eich copi yn fersiwn 10.0 o leiaf"
+
+#: engines/gnubg/kbggnubg.cpp:535
+msgid "The GNU Backgammon process (%1) has exited. "
+msgstr "Mae'r broses Dawlbwrdd GNU (%1) wedi terfynu. "
+
+#: engines/nextgen/kbgng.cpp:63
+msgid "Local Games"
+msgstr "Gemau Lleol"
+
+#: engines/nextgen/kbgng.cpp:64
+msgid "Offer Network Games"
+msgstr "Cynnig Gemau Rhwydwaith"
+
+#: engines/nextgen/kbgng.cpp:65
+msgid "Join Network Games"
+msgstr "Ymuno â Gemau Rhwydwaith"
+
+#: engines/nextgen/kbgng.cpp:71
+msgid "&Types"
+msgstr "&Mathau"
+
+#: engines/nextgen/kbgng.cpp:77
+msgid "&Names..."
+msgstr "&Enwau..."
+
+#: engines/nextgen/kbgng.cpp:138
+msgid ""
+"Type the port number on which you want to listen to connections.\n"
+"The number should be between 1024 and 65535."
+msgstr ""
+"Rhowch y rhif porth yr hoffech wrando i gysylltiadau arno.\n"
+"Dylai'r rhif fod rhwng 1024 a 65535."
+
+#: engines/nextgen/kbgng.cpp:150
+#, c-format
+msgid "Now waiting for incoming connections on port %1."
+msgstr "Yn aros rwan am gysylltiadau sy'n cyrraedd ar borth %1."
+
+#: engines/nextgen/kbgng.cpp:153
+#, c-format
+msgid "Failed to offer connections on port %1."
+msgstr "Methodd gynnig cysylltiadau ar borth %1."
+
+#: engines/nextgen/kbgng.cpp:159
+msgid "Type the name of the server you want to connect to:"
+msgstr "Rhowch enw'r gweinydd yr hoffech gysylltu iddo:"
+
+#: engines/nextgen/kbgng.cpp:167
+msgid ""
+"Type the port number on %1 you want to connect to.\n"
+"The number should be between 1024 and 65535."
+msgstr ""
+"Rhowch y rhif porth ar %1 yr hoffech wrando i gysylltiadau arno.\n"
+"Dylai'r rhif fod rhwng 1024 a 65535."
+
+#: engines/nextgen/kbgng.cpp:186
+msgid "Now connected to %1:%2."
+msgstr "Ar gyswllt rwan i %1:%2."
+
+#: engines/nextgen/kbgng.cpp:189
+msgid "Failed to connect to %1:%2."
+msgstr "Methodd gysylltu i %1:%2."
+
+#: engines/nextgen/kbgng.cpp:210 engines/nextgen/kbgng.cpp:211
+msgid "Player %1 (%2) has joined the game."
+msgstr "Mae chwaraewr %1 (%2) wedi ymuno â'r gêm."
+
+#: engines/nextgen/kbgng.cpp:219
+#, c-format
+msgid "creating player. virtual=%1"
+msgstr "yn creu chwaraewr.rhith=%1"
+
+#: engines/nextgen/kbgng.cpp:456
+msgid "one"
+msgstr "un"
+
+#: engines/nextgen/kbgng.cpp:457
+msgid "two"
+msgstr "dau"
+
+#: engines/nextgen/kbgng.cpp:509
+msgid "Player %1 has changed the name to %2."
+msgstr "Mae chwaraewr %1 wedi newid yr enw i %2."
+
+#: engines/nextgen/kbgng.cpp:548
+msgid "Type the name of the first player:"
+msgstr "Rhowch enw'r chwaraewr cyntaf:"
+
+#: engines/nextgen/kbgng.cpp:551
+msgid "Type the name of the second player:"
+msgstr "Rhowch enw'r ail chwaraewr:"
+
+#: engines/nextgen/kbgng.cpp:570
+msgid "Players are %1 and %2"
+msgstr "%1 a %2 yw'r chwaraewyr"
+
+#: engines/fibs/kbginvite.cpp:55
+msgid "Invite Players"
+msgstr "Gwahodd i Chwaraewyr"
+
+#: engines/fibs/kbginvite.cpp:64
+msgid "&Invite"
+msgstr "G&wahodd"
+
+#: engines/fibs/kbginvite.cpp:65
+msgid "&Resume"
+msgstr "Ai&l-ddechrau"
+
+#: engines/fibs/kbginvite.cpp:66
+msgid "&Unlimited"
+msgstr "&Diderfyn"
+
+#: engines/fibs/kbginvite.cpp:71
+msgid ""
+"Type the name of the player you want to invite in the first entry\n"
+"field and select the desired match length in the spin box."
+msgstr ""
+"Rhowch enw'r chwaraewr yr hoffech roi gwahoddiad iddo yn y maes cofnod cyntaf,\n"
+"a dewiswch hyd boddhaol yr ornest yn y blwch troelli."
+
+#: engines/fibs/kplayerlist.cpp:218
+msgid "Player"
+msgstr "Chwaraewr"
+
+#: engines/fibs/kplayerlist.cpp:219
+msgid "Opponent"
+msgstr "Gwrthwynebwr"
+
+#: engines/fibs/kplayerlist.cpp:220
+msgid "Watches"
+msgstr "Gwylfeydd"
+
+#: engines/fibs/kplayerlist.cpp:221
+msgid "Status"
+msgstr "Cyflwr"
+
+#: engines/fibs/kplayerlist.cpp:222
+msgid "Rating"
+msgstr "Poblogrwydd"
+
+#: engines/fibs/kplayerlist.cpp:223
+msgid "Exp."
+msgstr "Prof."
+
+#: engines/fibs/kplayerlist.cpp:224
+msgid "Idle"
+msgstr "Segur"
+
+#: engines/fibs/kplayerlist.cpp:225
+msgid "Time"
+msgstr "Amser"
+
+#: engines/fibs/kplayerlist.cpp:226
+msgid "Host name"
+msgstr "Enw gwesteiwr"
+
+#: engines/fibs/kplayerlist.cpp:227
+msgid "Client"
+msgstr "Dibynnydd"
+
+#: engines/fibs/kplayerlist.cpp:228
+msgid "Email"
+msgstr "Ebost"
+
+#: engines/fibs/kplayerlist.cpp:245
+msgid ""
+"_: abreviate blind\n"
+"B"
+msgstr "D"
+
+#: engines/fibs/kplayerlist.cpp:246
+msgid ""
+"_: abreviate away\n"
+"A"
+msgstr "Y"
+
+#: engines/fibs/kplayerlist.cpp:247
+msgid ""
+"_: abreviate ready\n"
+"R"
+msgstr "P"
+
+#: engines/fibs/kplayerlist.cpp:259
+msgid ""
+"This window contains the player list. It shows all players that are currently "
+"logged into FIBS.Use the right mouse button to get a context menu with helpful "
+"information and commands."
+msgstr ""
+"Mae'r ffenestr yma yn cynnwys y rhestr chwaraewyr.  Dengys pob chwaraewr sydd "
+"wedi ei fewngofnodi i FIBS ar hyn o bryd.  Defnyddiwch fotwm de'r llygoden i "
+"gael dewislen cyd-destun efo gwybodaeth defnyddiol a gorchmynion."
+
+#: engines/fibs/kplayerlist.cpp:289
+msgid "Info"
+msgstr "Gwybodaeth"
+
+#: engines/fibs/kplayerlist.cpp:293
+msgid "Talk"
+msgstr "Siarad"
+
+#: engines/fibs/kplayerlist.cpp:298
+msgid "Look"
+msgstr "Edrych"
+
+#: engines/fibs/kplayerlist.cpp:299
+msgid "Watch"
+msgstr "Gwylio"
+
+#: engines/fibs/kplayerlist.cpp:300
+msgid "Unwatch"
+msgstr "Dadwylio"
+
+#: engines/fibs/kplayerlist.cpp:301 engines/fibs/kplayerlist.cpp:600
+msgid "Blind"
+msgstr "Dallu"
+
+#: engines/fibs/kplayerlist.cpp:302
+msgid "Update"
+msgstr "Diweddaru"
 
 #: engines/fibs/kbgfibschat.cpp:242 engines/fibs/kplayerlist.cpp:308
 msgid "Use Dialog"
@@ -419,37 +685,30 @@ msgstr "Heb derfyn"
 msgid "Resume"
 msgstr "Ail-ddechrau"
 
-#: engines/fibs/kbgfibschat.cpp:280
-msgid "Gag"
-msgstr "Distewi"
-
-#: engines/fibs/kbgfibschat.cpp:281
-msgid "Ungag"
-msgstr "Dad-ddistewi"
-
-#: engines/fibs/kbgfibschat.cpp:282
-msgid "Clear Gag List"
-msgstr "Clirio'r rhestr ddistewi"
-
-#: engines/fibs/kbgfibschat.cpp:286
-msgid "Silent"
-msgstr "Distaw"
+#: engines/fibs/kplayerlist.cpp:336
+msgid "Invite"
+msgstr "Gwahodd"
 
-#: engines/fibs/kbgfibschat.cpp:364
-msgid "Select users to be removed from the gag list."
-msgstr "Dewis defnyddwyr i'w tynnu o'r rhestr ddistewi."
+#: engines/fibs/kplayerlist.cpp:454
+msgid "Column Selection"
+msgstr "Dewisiad Colofnau"
 
-#: engines/fibs/kbgfibschat.cpp:366
+#: engines/fibs/kplayerlist.cpp:461
 msgid ""
-"Select all the users you want to remove from the gag list and then click OK. "
-"Afterwards you will again hear what they shout."
+"Select all the columns that you would\n"
+"like to be shown in the player list."
 msgstr ""
-"Dewiswch y defnyddwyr i gyd rydych am eu gwaredu o'r rhestr ddistewi, ac yna "
-"cliciwch Iawn. Wedyn byddwch yn gallu clywed beth maent yn ei weiddi eto."
+"Dewiswch pob colofn yr hoffech ei dangos\n"
+"yn y rhestr chwaraewyr."
 
-#: engines/fibs/kbgfibschat.cpp:381
-msgid "&Gag List"
-msgstr "&Rhestr Ddistewi"
+#: engines/fibs/kplayerlist.cpp:484
+msgid "&Playerlist"
+msgstr "R&hestr chwaraewyr"
+
+#: engines/fibs/kbgfibschat.cpp:689 engines/fibs/kplayerlist.cpp:572
+#, c-format
+msgid "Info on %1"
+msgstr "Gwybodaeth: %1"
 
 #: engines/fibs/kbgfibschat.cpp:453 engines/fibs/kbgfibschat.cpp:479
 #: engines/fibs/kbgfibschat.cpp:686 engines/fibs/kplayerlist.cpp:573
@@ -457,96 +716,44 @@ msgstr "&Rhestr Ddistewi"
 msgid "Talk to %1"
 msgstr "Siarad efo %1"
 
-#: engines/fibs/kbgfibschat.cpp:552
-msgid "<u>%1 tells you:</u> %2"
-msgstr "<u>%1 yn dweud wrthych:</u> %2"
-
-#: engines/fibs/kbgfibschat.cpp:561
-msgid "<u>%1 shouts:</u> %2"
-msgstr "<u>%1 yn gweiddi:</u> %2"
-
-#: engines/fibs/kbgfibschat.cpp:569
-msgid "<u>%1 whispers:</u> %2"
-msgstr "<u>%1 yn sibrwd:</u> %2"
-
-#: engines/fibs/kbgfibschat.cpp:578
-msgid "<u>%1 kibitzes:</u> %2"
-msgstr "<u>%1 yn mwydro:</u> %2"
-
-#: engines/fibs/kbgfibschat.cpp:586
-msgid "<u>You tell %1:</u> %2"
-msgstr "<u>Rydych yn dweud wrth %1:</u> %2"
-
-#: engines/fibs/kbgfibschat.cpp:593
+#: engines/fibs/kplayerlist.cpp:574
 #, c-format
-msgid "<u>You shout:</u> %1"
-msgstr "<u>Rydych yn gweiddi:</u> %1"
+msgid "Email to %1"
+msgstr "Ebostio i %1"
 
-#: engines/fibs/kbgfibschat.cpp:600
+#: engines/fibs/kplayerlist.cpp:575
 #, c-format
-msgid "<u>You whisper:</u> %1"
-msgstr "<u>Rydych yn sibrwd:</u> %1"
+msgid "Look at %1"
+msgstr "Edrych ar %1"
 
-#: engines/fibs/kbgfibschat.cpp:607
+#: engines/fibs/kplayerlist.cpp:576
 #, c-format
-msgid "<u>You kibitz:</u> %1"
-msgstr "<u>Rydych yn mwydro:</u> %1"
-
-#: engines/fibs/kbgfibschat.cpp:618
-msgid "<u>User %1 left a message at %2</u>: %3"
-msgstr "<u>Gadawodd Defnyddiwr %1 neges wrth %2</u>: %3"
-
-#: engines/fibs/kbgfibschat.cpp:625
-msgid "Your message for %1 has been delivered."
-msgstr "Danfonwyd eich neges ar gyfer %1."
-
-#: engines/fibs/kbgfibschat.cpp:632
-msgid "Your message for %1 has been saved."
-msgstr "Cadwyd eich neges ar gyfer %1."
-
-#: engines/fibs/kbgfibschat.cpp:649
-msgid "<u>You say to yourself:</u> "
-msgstr "<u>Rydych yn dweud wrthych hunan:</u>"
+msgid "Watch %1"
+msgstr "Gwylio %1"
 
-#: engines/fibs/kbgfibschat.cpp:689 engines/fibs/kplayerlist.cpp:572
+#: engines/fibs/kplayerlist.cpp:577
 #, c-format
-msgid "Info on %1"
-msgstr "Gwybodaeth: %1"
+msgid "Update %1"
+msgstr "Diweddaru %1"
 
 #: engines/fibs/kbgfibschat.cpp:693 engines/fibs/kplayerlist.cpp:590
 #, c-format
 msgid "Invite %1"
 msgstr "Gwahodd %1"
 
-#: engines/fibs/kbgfibschat.cpp:698
+#: engines/fibs/kplayerlist.cpp:598
 #, c-format
-msgid "Gag %1"
-msgstr "Distewi %1"
+msgid "Unblind %1"
+msgstr "Dad-ddallu %1"
 
-#: engines/fibs/kbgfibschat.cpp:701
+#: engines/fibs/kplayerlist.cpp:598
 #, c-format
-msgid "Ungag %1"
-msgstr "Dad-ddistewi %1"
-
-#: engines/fibs/kbgfibschat.cpp:730
-msgid "The gag list is now empty."
-msgstr "Mae'r rhestr ddistewi yn wag rwan."
-
-#: engines/fibs/kbgfibschat.cpp:744
-msgid "You won't hear what %1 says and shouts."
-msgstr "Ni fyddwch yn clywed beth mae %1 yn ei ddweud a gweiddi."
-
-#: engines/fibs/kbgfibschat.cpp:766
-msgid "You will again hear what %1 says and shouts."
-msgstr "Byddwch yn clywed beth mae %1 yn ei ddweud a gweiddi eto."
-
-#: engines/fibs/kbgfibschat.cpp:788
-msgid "You will not hear what people shout."
-msgstr "Ni fyddwch yn clywed beth mae pobl yn ei weiddi."
+msgid "Blind %1"
+msgstr "Dallu %1"
 
-#: engines/fibs/kbgfibschat.cpp:790
-msgid "You will hear what people shout."
-msgstr "Byddwch yn clywed beth mae pobl yn ei weiddi."
+#: engines/fibs/kplayerlist.cpp:889
+msgid "Player List - %1 - %2/%3"
+msgstr "Rhestr Chwaraewyr - %1 - %2/%3"
 
 #: engines/fibs/kbgfibs.cpp:210
 msgid "FIBS Engine"
@@ -1046,14 +1253,6 @@ msgstr "Gofyn am Ddyblau"
 msgid "&Response"
 msgstr "&Ymateb"
 
-#: engines/fibs/kbgfibs.cpp:2219 engines/offline/kbgoffline.cpp:652
-msgid "Accept"
-msgstr "Derbyn"
-
-#: engines/fibs/kbgfibs.cpp:2220 engines/offline/kbgoffline.cpp:652
-msgid "Reject"
-msgstr "Gwrthod"
-
 #: engines/fibs/kbgfibs.cpp:2227
 msgid "Join"
 msgstr "Uniad"
@@ -1074,525 +1273,345 @@ msgstr "Rhestr &Chwaraeon"
 msgid "&Chat"
 msgstr "&Sgwrsio"
 
-#: engines/fibs/kplayerlist.cpp:218
-msgid "Player"
-msgstr "Chwaraewr"
-
-#: engines/fibs/kplayerlist.cpp:219
-msgid "Opponent"
-msgstr "Gwrthwynebwr"
-
-#: engines/fibs/kplayerlist.cpp:220
-msgid "Watches"
-msgstr "Gwylfeydd"
-
-#: engines/fibs/kplayerlist.cpp:221
-msgid "Status"
-msgstr "Cyflwr"
-
-#: engines/fibs/kplayerlist.cpp:222
-msgid "Rating"
-msgstr "Poblogrwydd"
-
-#: engines/fibs/kplayerlist.cpp:223
-msgid "Exp."
-msgstr "Prof."
-
-#: engines/fibs/kplayerlist.cpp:224
-msgid "Idle"
-msgstr "Segur"
-
-#: engines/fibs/kplayerlist.cpp:225
-msgid "Time"
-msgstr "Amser"
-
-#: engines/fibs/kplayerlist.cpp:226
-msgid "Host name"
-msgstr "Enw gwesteiwr"
-
-#: engines/fibs/kplayerlist.cpp:227
-msgid "Client"
-msgstr "Dibynnydd"
-
-#: engines/fibs/kplayerlist.cpp:228
-msgid "Email"
-msgstr "Ebost"
+#: engines/fibs/kbgfibschat.cpp:203
+msgid "%1 user"
+msgstr "Defnyddiwr %1"
 
-#: engines/fibs/kplayerlist.cpp:245
-msgid ""
-"_: abreviate blind\n"
-"B"
-msgstr "D"
+#: engines/fibs/kbgfibschat.cpp:205
+msgid "Kibitz to watchers and players"
+msgstr "Kibitz i wylwyr a chwareuwyr"
 
-#: engines/fibs/kplayerlist.cpp:246
-msgid ""
-"_: abreviate away\n"
-"A"
-msgstr "Y"
+#: engines/fibs/kbgfibschat.cpp:207
+msgid "Whisper to watchers only"
+msgstr "Sibrwd i wylwyr yn unig"
 
-#: engines/fibs/kplayerlist.cpp:247
-msgid ""
-"_: abreviate ready\n"
-"R"
-msgstr "P"
+#: engines/fibs/kbgfibschat.cpp:222
+msgid "Chat Window"
+msgstr "Ffenest Sgwrsio"
 
-#: engines/fibs/kplayerlist.cpp:259
+#: engines/fibs/kbgfibschat.cpp:224
 msgid ""
-"This window contains the player list. It shows all players that are currently "
-"logged into FIBS.Use the right mouse button to get a context menu with helpful "
-"information and commands."
+"This is the chat window.\n"
+"\n"
+"The text in this window is colored depending on whether it is directed at you "
+"personally, shouted to the general FIBS population, has been said by you, or is "
+"of general interest. If you select the name of a player, the context contains "
+"entries specifically geared towards that player."
 msgstr ""
-"Mae'r ffenestr yma yn cynnwys y rhestr chwaraewyr.  Dengys pob chwaraewr sydd "
-"wedi ei fewngofnodi i FIBS ar hyn o bryd.  Defnyddiwch fotwm de'r llygoden i "
-"gael dewislen cyd-destun efo gwybodaeth defnyddiol a gorchmynion."
-
-#: engines/fibs/kplayerlist.cpp:289
-msgid "Info"
-msgstr "Gwybodaeth"
-
-#: engines/fibs/kplayerlist.cpp:293
-msgid "Talk"
-msgstr "Siarad"
+"Hon yw'r ffenestr sgwrsio.\n"
+"\n"
+" Mae'r testun yn y ffenestr yma mewn lliw, gan ddibynnu ar a yw yn cael ei "
+"gyfeirio atoch yn bersonol, wedi cael ei weiddi i'r boblogaeth gyffredinol "
+"FIBS, wedi cael ei ddweud ganddoch, neu yn bod o ddiddordeb cyffredinol.  Os "
+"dewiswch enw chwaraewr, mae'r cyd-destun yn cynnwys cofnodion sy'n ymwneud â'r "
+"chwaraewr yna yn benodol."
 
-#: engines/fibs/kplayerlist.cpp:298
-msgid "Look"
-msgstr "Edrych"
+#: engines/fibs/kbgfibschat.cpp:233
+msgid "Info On"
+msgstr "Gwybodaeth Ar"
 
-#: engines/fibs/kplayerlist.cpp:299
-msgid "Watch"
-msgstr "Gwylio"
+#: engines/fibs/kbgfibschat.cpp:237
+msgid "Talk To"
+msgstr "Siarad Efo"
 
-#: engines/fibs/kplayerlist.cpp:300
-msgid "Unwatch"
-msgstr "Dadwylio"
+#: engines/fibs/kbgfibschat.cpp:280
+msgid "Gag"
+msgstr "Distewi"
 
-#: engines/fibs/kplayerlist.cpp:301 engines/fibs/kplayerlist.cpp:600
-msgid "Blind"
-msgstr "Dallu"
+#: engines/fibs/kbgfibschat.cpp:281
+msgid "Ungag"
+msgstr "Dad-ddistewi"
 
-#: engines/fibs/kplayerlist.cpp:302
-msgid "Update"
-msgstr "Diweddaru"
+#: engines/fibs/kbgfibschat.cpp:282
+msgid "Clear Gag List"
+msgstr "Clirio'r rhestr ddistewi"
 
-#: engines/fibs/kplayerlist.cpp:336
-msgid "Invite"
-msgstr "Gwahodd"
+#: engines/fibs/kbgfibschat.cpp:286
+msgid "Silent"
+msgstr "Distaw"
 
-#: engines/fibs/kplayerlist.cpp:454
-msgid "Column Selection"
-msgstr "Dewisiad Colofnau"
+#: engines/fibs/kbgfibschat.cpp:364
+msgid "Select users to be removed from the gag list."
+msgstr "Dewis defnyddwyr i'w tynnu o'r rhestr ddistewi."
 
-#: engines/fibs/kplayerlist.cpp:461
+#: engines/fibs/kbgfibschat.cpp:366
 msgid ""
-"Select all the columns that you would\n"
-"like to be shown in the player list."
+"Select all the users you want to remove from the gag list and then click OK. "
+"Afterwards you will again hear what they shout."
 msgstr ""
-"Dewiswch pob colofn yr hoffech ei dangos\n"
-"yn y rhestr chwaraewyr."
+"Dewiswch y defnyddwyr i gyd rydych am eu gwaredu o'r rhestr ddistewi, ac yna "
+"cliciwch Iawn. Wedyn byddwch yn gallu clywed beth maent yn ei weiddi eto."
 
-#: engines/fibs/kplayerlist.cpp:484
-msgid "&Playerlist"
-msgstr "R&hestr chwaraewyr"
+#: engines/fibs/kbgfibschat.cpp:381
+msgid "&Gag List"
+msgstr "&Rhestr Ddistewi"
 
-#: engines/fibs/kplayerlist.cpp:574
-#, c-format
-msgid "Email to %1"
-msgstr "Ebostio i %1"
+#: engines/fibs/kbgfibschat.cpp:552
+msgid "<u>%1 tells you:</u> %2"
+msgstr "<u>%1 yn dweud wrthych:</u> %2"
 
-#: engines/fibs/kplayerlist.cpp:575
-#, c-format
-msgid "Look at %1"
-msgstr "Edrych ar %1"
+#: engines/fibs/kbgfibschat.cpp:561
+msgid "<u>%1 shouts:</u> %2"
+msgstr "<u>%1 yn gweiddi:</u> %2"
 
-#: engines/fibs/kplayerlist.cpp:576
-#, c-format
-msgid "Watch %1"
-msgstr "Gwylio %1"
+#: engines/fibs/kbgfibschat.cpp:569
+msgid "<u>%1 whispers:</u> %2"
+msgstr "<u>%1 yn sibrwd:</u> %2"
 
-#: engines/fibs/kplayerlist.cpp:577
-#, c-format
-msgid "Update %1"
-msgstr "Diweddaru %1"
+#: engines/fibs/kbgfibschat.cpp:578
+msgid "<u>%1 kibitzes:</u> %2"
+msgstr "<u>%1 yn mwydro:</u> %2"
 
-#: engines/fibs/kplayerlist.cpp:598
-#, c-format
-msgid "Unblind %1"
-msgstr "Dad-ddallu %1"
+#: engines/fibs/kbgfibschat.cpp:586
+msgid "<u>You tell %1:</u> %2"
+msgstr "<u>Rydych yn dweud wrth %1:</u> %2"
 
-#: engines/fibs/kplayerlist.cpp:598
+#: engines/fibs/kbgfibschat.cpp:593
 #, c-format
-msgid "Blind %1"
-msgstr "Dallu %1"
+msgid "<u>You shout:</u> %1"
+msgstr "<u>Rydych yn gweiddi:</u> %1"
 
-#: engines/fibs/kplayerlist.cpp:889
-msgid "Player List - %1 - %2/%3"
-msgstr "Rhestr Chwaraewyr - %1 - %2/%3"
+#: engines/fibs/kbgfibschat.cpp:600
+#, c-format
+msgid "<u>You whisper:</u> %1"
+msgstr "<u>Rydych yn sibrwd:</u> %1"
 
-#: engines/fibs/kbginvite.cpp:55
-msgid "Invite Players"
-msgstr "Gwahodd i Chwaraewyr"
+#: engines/fibs/kbgfibschat.cpp:607
+#, c-format
+msgid "<u>You kibitz:</u> %1"
+msgstr "<u>Rydych yn mwydro:</u> %1"
 
-#: engines/fibs/kbginvite.cpp:64
-msgid "&Invite"
-msgstr "G&wahodd"
+#: engines/fibs/kbgfibschat.cpp:618
+msgid "<u>User %1 left a message at %2</u>: %3"
+msgstr "<u>Gadawodd Defnyddiwr %1 neges wrth %2</u>: %3"
 
-#: engines/fibs/kbginvite.cpp:65
-msgid "&Resume"
-msgstr "Ai&l-ddechrau"
+#: engines/fibs/kbgfibschat.cpp:625
+msgid "Your message for %1 has been delivered."
+msgstr "Danfonwyd eich neges ar gyfer %1."
 
-#: engines/fibs/kbginvite.cpp:66
-msgid "&Unlimited"
-msgstr "&Diderfyn"
+#: engines/fibs/kbgfibschat.cpp:632
+msgid "Your message for %1 has been saved."
+msgstr "Cadwyd eich neges ar gyfer %1."
 
-#: engines/fibs/kbginvite.cpp:71
-msgid ""
-"Type the name of the player you want to invite in the first entry\n"
-"field and select the desired match length in the spin box."
-msgstr ""
-"Rhowch enw'r chwaraewr yr hoffech roi gwahoddiad iddo yn y maes cofnod cyntaf,\n"
-"a dewiswch hyd boddhaol yr ornest yn y blwch troelli."
+#: engines/fibs/kbgfibschat.cpp:649
+msgid "<u>You say to yourself:</u> "
+msgstr "<u>Rydych yn dweud wrthych hunan:</u>"
 
-#: engines/gnubg/kbggnubg.cpp:134
+#: engines/fibs/kbgfibschat.cpp:698
 #, c-format
-msgid "gnubg doubles the cube to %1."
-msgstr "Mae gnubg yn dyblu'r ciwb i %1."
+msgid "Gag %1"
+msgstr "Distewi %1"
 
-#: engines/gnubg/kbggnubg.cpp:135
-msgid "gnubg doubles"
-msgstr "Mae gnubg yn dyblu"
+#: engines/fibs/kbgfibschat.cpp:701
+#, c-format
+msgid "Ungag %1"
+msgstr "Dad-ddistewi %1"
 
-#: engines/gnubg/kbggnubg.cpp:136
-msgid "&Accept"
-msgstr "&Derbyn"
+#: engines/fibs/kbgfibschat.cpp:730
+msgid "The gag list is now empty."
+msgstr "Mae'r rhestr ddistewi yn wag rwan."
 
-#: engines/gnubg/kbggnubg.cpp:136
-msgid "Re&double"
-msgstr "Ailddy&blu"
+#: engines/fibs/kbgfibschat.cpp:744
+msgid "You won't hear what %1 says and shouts."
+msgstr "Ni fyddwch yn clywed beth mae %1 yn ei ddweud a gweiddi."
 
-#: engines/gnubg/kbggnubg.cpp:136
-msgid "&Reject"
-msgstr "&Gwrthod"
+#: engines/fibs/kbgfibschat.cpp:766
+msgid "You will again hear what %1 says and shouts."
+msgstr "Byddwch yn clywed beth mae %1 yn ei ddweud a gweiddi eto."
 
-#: engines/gnubg/kbggnubg.cpp:188
-msgid "Please roll or double."
-msgstr "Rholiwch neu ddyblwch."
+#: engines/fibs/kbgfibschat.cpp:788
+msgid "You will not hear what people shout."
+msgstr "Ni fyddwch yn clywed beth mae pobl yn ei weiddi."
 
-#: engines/gnubg/kbggnubg.cpp:191
-msgid "Please roll."
-msgstr "Rholiwch."
+#: engines/fibs/kbgfibschat.cpp:790
+msgid "You will hear what people shout."
+msgstr "Byddwch yn clywed beth mae pobl yn ei weiddi."
 
-#: engines/gnubg/kbggnubg.cpp:202
-msgid "You roll %1 and %2."
-msgstr "Rydych yn rholio %1 a %2."
+#. i18n: file kbackgammonui.rc line 5
+#: rc.cpp:3
+#, no-c-format
+msgid "&Move"
+msgstr "Sy&mud"
 
-#: engines/gnubg/kbggnubg.cpp:208
-msgid "Please move 1 piece."
-msgstr "Symudwch 1 darn."
+#. i18n: file kbackgammonui.rc line 10
+#: rc.cpp:6
+#, no-c-format
+msgid "&Command"
+msgstr "G&orchymyn"
 
-#: engines/gnubg/kbggnubg.cpp:211
-msgid "Please move %1 pieces."
-msgstr "Symudwch %1 o ddarnau."
+#. i18n: file kbackgammonui.rc line 32
+#: rc.cpp:18
+#, no-c-format
+msgid "Command Toolbar"
+msgstr "Bar Offer Gorchmynion"
 
-#: engines/gnubg/kbggnubg.cpp:223
-msgid "gnubg rolls %1 and %2."
-msgstr "Mae gnubg yn rholio %1 a %2."
+#: kbg.cpp:78
+msgid "Open Board"
+msgstr "Bwrdd Agored"
 
-#: engines/gnubg/kbggnubg.cpp:225
-msgid "gnubg cannot move."
-msgstr "Mae gnubg yn methu symud."
+#: kbg.cpp:79
+msgid "FIBS"
+msgstr "FIBS"
 
-#: engines/gnubg/kbggnubg.cpp:239 engines/offline/kbgoffline.cpp:341
-#: engines/offline/kbgoffline.cpp:798
-msgid "%1 vs. %2"
-msgstr "%1 vs. %2"
+#: kbg.cpp:80
+msgid "GNU Backgammon (Experimental)"
+msgstr "Backgammon GNU (Arbrofiadol)"
 
-#: engines/gnubg/kbggnubg.cpp:279 engines/offline/kbgoffline.cpp:286
-msgid "A game is currently in progress. Starting a new one will terminate it."
-msgstr ""
-"Mae gêm ar y gweill ar hyn o bryd.  Bydd cychwyn un newydd yn ei therfynu."
+#: kbg.cpp:81
+msgid "Next Generation (Experimental)"
+msgstr "Y Genhedlaeth Nesaf (Arbrofiadol)"
 
-#: engines/gnubg/kbggnubg.cpp:281 engines/offline/kbgoffline.cpp:288
-msgid "Start New Game"
-msgstr "Cychwyn Gêm Newydd"
+#: kbg.cpp:83
+msgid "FIBS Home"
+msgstr "Cartref FIBS"
 
-#: engines/gnubg/kbggnubg.cpp:281 engines/offline/kbgoffline.cpp:289
-msgid "Continue Old Game"
-msgstr "Parhau â Hen Gêm"
+#: kbg.cpp:86
+msgid "Backgammon Rules"
+msgstr "Rheolau Backgammon"
 
-#: engines/gnubg/kbggnubg.cpp:294
-msgid "Starting a new game."
-msgstr "Yn cychwyn gêm newydd."
+#: kbg.cpp:108
+msgid "&Engine"
+msgstr "&Peiriant"
 
-#: engines/gnubg/kbggnubg.cpp:382
-msgid "GNU Engine"
-msgstr "Peiriant GNU"
+#: kbg.cpp:124
+msgid "Double Cube"
+msgstr "Ciwb Dwbwl"
 
-#: engines/gnubg/kbggnubg.cpp:382
-msgid "Here you can configure the GNU backgammon engine"
-msgstr "Cewch ffurfweddu'r peiriant tawlbwrdd GNU yma"
+#: kbg.cpp:133
+msgid "&Backgammon on the Web"
+msgstr "&Backgammon ar y We"
 
-#: engines/gnubg/kbggnubg.cpp:442
-msgid "&Restart GNU Backgammon"
-msgstr "Ail&gychwyn Tawlbwrdd GNU"
+#: kbg.cpp:145
+msgid "Command: "
+msgstr "Gorchymyn: "
 
-#: engines/gnubg/kbggnubg.cpp:474
+#: kbg.cpp:182
 msgid ""
-"This is experimental code which currently requires a specially patched version "
-"of GNU Backgammon."
-"<br/>"
-"<br/>"
+"This area contains the status messages for the game. Most of these messages are "
+"sent to you from the current engine."
 msgstr ""
-"Côd arbofol yw hwn, ac ar hyn o bryd mae angen fersiwn Tawlbwrdd GNU wedi'i "
-"glytio yn arbennig."
-"<br/>"
-"<br/>"
+"Cynnwys yr ardal hon  negeseuon ar gyfer y gêm.  Anfonir y rhan fwyaf o'r rhain "
+"atoch o'r peiriant cyfredol."
 
-#: engines/gnubg/kbggnubg.cpp:507
+#: kbg.cpp:186
 msgid ""
-"Could not start the GNU Backgammon process.\n"
-"Make sure the program is in your PATH and is called \"gnubg\".\n"
-"Make sure that your copy is at least version 0.10"
+"This is the command line. You can type special commands related to the current "
+"engine in here. Most relevant commands are also available through the menus."
 msgstr ""
-"Methu cychwyn y broses Dawlbwrdd GNU.\n"
-"Sicrhewch fod y rhaglen yn eich llwybr (PATH), ac efo'r enw \"gnubg\".\n"
-"Sicrhewch fod eich copi yn fersiwn 10.0 o leiaf"
-
-#: engines/gnubg/kbggnubg.cpp:535
-msgid "The GNU Backgammon process (%1) has exited. "
-msgstr "Mae'r broses Dawlbwrdd GNU (%1) wedi terfynu. "
-
-#: engines/nextgen/kbgng.cpp:63
-msgid "Local Games"
-msgstr "Gemau Lleol"
-
-#: engines/nextgen/kbgng.cpp:64
-msgid "Offer Network Games"
-msgstr "Cynnig Gemau Rhwydwaith"
-
-#: engines/nextgen/kbgng.cpp:65
-msgid "Join Network Games"
-msgstr "Ymuno â Gemau Rhwydwaith"
-
-#: engines/nextgen/kbgng.cpp:71
-msgid "&Types"
-msgstr "&Mathau"
-
-#: engines/nextgen/kbgng.cpp:77
-msgid "&Names..."
-msgstr "&Enwau..."
+"Dyma'r llinell orchymyn.  Cewch deipio yma orchmynion arbennig, sy'n ymwneud "
+"â'r peiriant cyfredol.  Mae'r rhan fwyaf o'r gorchmynion perthnasol ar gael o'r "
+"dewislenni hefyd."
 
-#: engines/nextgen/kbgng.cpp:138
+#: kbg.cpp:191
 msgid ""
-"Type the port number on which you want to listen to connections.\n"
-"The number should be between 1024 and 65535."
+"This is the button bar tool bar. It gives you easy access to game related "
+"commands. You can drag the bar to a different location within the window."
 msgstr ""
-"Rhowch y rhif porth yr hoffech wrando i gysylltiadau arno.\n"
-"Dylai'r rhif fod rhwng 1024 a 65535."
-
-#: engines/nextgen/kbgng.cpp:150
-#, c-format
-msgid "Now waiting for incoming connections on port %1."
-msgstr "Yn aros rwan am gysylltiadau sy'n cyrraedd ar borth %1."
-
-#: engines/nextgen/kbgng.cpp:153
-#, c-format
-msgid "Failed to offer connections on port %1."
-msgstr "Methodd gynnig cysylltiadau ar borth %1."
-
-#: engines/nextgen/kbgng.cpp:159
-msgid "Type the name of the server you want to connect to:"
-msgstr "Rhowch enw'r gweinydd yr hoffech gysylltu iddo:"
+"Dyma far offer y bar botymau.  Mae'n rhoi cyrchiad hawdd i orchmynion "
+"perthnasol i'r gêm.  Cewch lusgo'r bar i leoliad arall tu mewn y ffenest."
 
-#: engines/nextgen/kbgng.cpp:167
+#: kbg.cpp:196
 msgid ""
-"Type the port number on %1 you want to connect to.\n"
-"The number should be between 1024 and 65535."
+"This is the status bar. It shows you the currently selected engine in the left "
+"corner."
 msgstr ""
-"Rhowch y rhif porth ar %1 yr hoffech wrando i gysylltiadau arno.\n"
-"Dylai'r rhif fod rhwng 1024 a 65535."
-
-#: engines/nextgen/kbgng.cpp:186
-msgid "Now connected to %1:%2."
-msgstr "Ar gyswllt rwan i %1:%2."
-
-#: engines/nextgen/kbgng.cpp:189
-msgid "Failed to connect to %1:%2."
-msgstr "Methodd gysylltu i %1:%2."
+"Dyma'r bar cyflwr.  Dengys i chi'r peiriant wedi'i ddewis ar hyn o bryd yn y "
+"gornel chwith."
 
-#: engines/nextgen/kbgng.cpp:210 engines/nextgen/kbgng.cpp:211
-msgid "Player %1 (%2) has joined the game."
-msgstr "Mae chwaraewr %1 (%2) wedi ymuno â'r gêm."
+#: kbg.cpp:509
+msgid "General"
+msgstr "Cyffredinol"
 
-#: engines/nextgen/kbgng.cpp:219
+#: kbg.cpp:509
 #, c-format
-msgid "creating player. virtual=%1"
-msgstr "yn creu chwaraewr.rhith=%1"
-
-#: engines/nextgen/kbgng.cpp:456
-msgid "one"
-msgstr "un"
-
-#: engines/nextgen/kbgng.cpp:457
-msgid "two"
-msgstr "dau"
-
-#: engines/nextgen/kbgng.cpp:509
-msgid "Player %1 has changed the name to %2."
-msgstr "Mae chwaraewr %1 wedi newid yr enw i %2."
-
-#: engines/nextgen/kbgng.cpp:548
-msgid "Type the name of the first player:"
-msgstr "Rhowch enw'r chwaraewr cyntaf:"
-
-#: engines/nextgen/kbgng.cpp:551
-msgid "Type the name of the second player:"
-msgstr "Rhowch enw'r ail chwaraewr:"
-
-#: engines/nextgen/kbgng.cpp:570
-msgid "Players are %1 and %2"
-msgstr "%1 a %2 yw'r chwaraewyr"
-
-#: engines/offline/kbgoffline.cpp:123
-msgid "&New Game..."
-msgstr "Gêm &Newydd..."
-
-#: engines/offline/kbgoffline.cpp:124
-msgid "&Swap Colors"
-msgstr "&Amnewid Lliwiau"
-
-#: engines/offline/kbgoffline.cpp:126
-msgid "&Edit Mode"
-msgstr "&Modd Golygu"
-
-#: engines/offline/kbgoffline.cpp:182
-msgid "Offline Engine"
-msgstr "Peiriant All-lein"
-
-#: engines/offline/kbgoffline.cpp:182
-msgid "Use this to configure the Offline engine"
-msgstr "Defnyddiwch hyn i ffurfweddu'r peiriant All-lein"
-
-#: engines/offline/kbgoffline.cpp:199
-msgid "Names"
-msgstr "Enwau"
-
-#: engines/offline/kbgoffline.cpp:209
-msgid "First player:"
-msgstr "Chwaraewr cyntaf:"
-
-#: engines/offline/kbgoffline.cpp:210
-msgid "Second player:"
-msgstr "Ail chwaraewr:"
-
-#: engines/offline/kbgoffline.cpp:217
-msgid "Enter the name of the first player."
-msgstr "Rhowch enw'r chwaraewr cyntaf."
-
-#: engines/offline/kbgoffline.cpp:218
-msgid "Enter the name of the second player."
-msgstr "Rhowch enw'r ail chwaraewr."
-
-#: engines/offline/kbgoffline.cpp:224
-msgid "&Player Names"
-msgstr "Enwau'r Chwa&raewyr"
-
-#: engines/offline/kbgoffline.cpp:237 engines/offline/kbgoffline.cpp:253
-msgid "South"
-msgstr "De"
+msgid "Here you can configure general settings of %1"
+msgstr "Yma cewch ffurfweddu gosodiadau %1"
 
-#: engines/offline/kbgoffline.cpp:238 engines/offline/kbgoffline.cpp:254
-msgid "North"
-msgstr "Gogledd"
+#: kbg.cpp:516
+msgid "Messages"
+msgstr "Negeseuon"
 
-#: engines/offline/kbgoffline.cpp:320
-msgid "%1 rolls %2, %3 rolls %4."
-msgstr "Mae %1 wedi rholio  %2, mae %3 wedi rholio %4."
+#: kbg.cpp:517
+msgid "Timer"
+msgstr "Amserydd"
 
-#: engines/offline/kbgoffline.cpp:325 engines/offline/kbgoffline.cpp:328
-msgid "%1 makes the first move."
-msgstr "Mae %1 yn gwneud y symudiad cyntaf."
+#: kbg.cpp:518
+msgid "Autosave"
+msgstr "Hunangadw"
 
-#: engines/offline/kbgoffline.cpp:391
-msgid ""
-"Please enter the nickname of the player whose home\n"
-"is in the lower half of the board:"
-msgstr ""
-"Rhowch ffugenw'r chwaraewr sydd efo cartref\n"
-"yng nghanol isaf y bwrdd:"
+#: kbg.cpp:519
+msgid "Events"
+msgstr "Digwyddiadau"
 
-#: engines/offline/kbgoffline.cpp:395
+#: kbg.cpp:524
 msgid ""
-"Please enter the nickname of the player whose home\n"
-"is in the upper half of the board:"
+"After you finished your moves, they have to be sent to the engine. You can "
+"either do that manually (in which case you should not enable this feature), or "
+"you can specify an amount of time that has to pass before the move is "
+"committed. If you undo a move during the timeout, the timeout will be reset and "
+"restarted once you finish the move. This is very useful if you would like to "
+"review the result of your move."
 msgstr ""
-"Rhowch ffugenw'r chwaraewr sydd efo cartref\n"
-"yng nghanol uchaf y bwrdd:"
-
-#: engines/offline/kbgoffline.cpp:424 engines/offline/kbgoffline.cpp:656
-msgid "%1 wins the game. Congratulations!"
-msgstr "Mae %1 wedi ennill y gêm.  Llongyfarchiadau!"
-
-#: engines/offline/kbgoffline.cpp:443
-msgid "%1, please roll or double."
-msgstr "%1, rhowliwch neu ddyblwch."
-
-#: engines/offline/kbgoffline.cpp:562
-msgid "It's not your turn to roll!"
-msgstr "Dim eich tro chi i rolio yw fo!"
+"Wedi gorffen eich troeon, rhaid eu danfon i'r peiriant.  Cewch wneud hyn neill "
+"ai â llaw (os felly, ddylech chi ddim galluogi'r nodwedd hwn), neu mi gewch "
+"ddynodi cyfnod amser mae rhaid iddo fynd heibio cyn i'r tro gael eu gadarnhau.  "
+"Os ydych chi'n dadwneud tro yn ystod yr oediad hwn, ailosodir y cyfnod a'i "
+"ailgychwyn unwaith i chi orffen eich tro.  Mae hyn yn ddefnyddiol iawn pe "
+"carech fwrw golwg dros ganlyniad eich tro."
 
-#: engines/offline/kbgoffline.cpp:614
-msgid "Game over!"
-msgstr "Gêm drosodd!"
+#: kbg.cpp:531
+msgid "Enable timeout"
+msgstr "Galluogi oediad"
 
-#: engines/offline/kbgoffline.cpp:621
-msgid "%1, you cannot move."
-msgstr "%1, ni allwch symud."
+#: kbg.cpp:536
+msgid "Move timeout in seconds:"
+msgstr "Symud oediad mewn eiliadau:"
 
-#: engines/offline/kbgoffline.cpp:630
-#, fuzzy, c-format
+#: kbg.cpp:549
 msgid ""
-"_n: , please move 1 piece.\n"
-", please move %n pieces."
+"Check the box to enable all the messages that you have previously disabled by "
+"choosing the \"Don't show this message again\" option."
 msgstr ""
-", symudwch 1 darn.\n"
-", symudwch %2 o ddarnau."
-
-#: engines/offline/kbgoffline.cpp:649
-msgid "%1 has doubled. %2, do you accept the double?"
-msgstr "Mae %1 wedi dyblu.  %2, ydych yn derbyn y dyblu?"
+"Brithwch y blwch i alluogi pob neges analluog trwy ddewis \"Peidiwch â dangos y "
+"neges hon eto\"."
 
-#: engines/offline/kbgoffline.cpp:652
-msgid "Doubling"
-msgstr "Yn dyblu"
+#: kbg.cpp:553
+msgid "Reenable all messages"
+msgstr "Ailalluogi pob neges"
 
-#: engines/offline/kbgoffline.cpp:661
-msgid "%1 has accepted the double. The game continues."
-msgstr "Mae %1 wedi derbyn y dyblu.  Mae'r gêm yn parhau."
+#: kbg.cpp:559
+msgid ""
+"Check the box to automatically save all window positions on program exit. They "
+"will be restored at next start."
+msgstr ""
+"Brithwch y blwch i gadw'n ymysgogol safleoedd pob ffenest wrth derfynu'r "
+"rhaglen.  Cânt eu hadfer y tro nesaf i chi gychwyn."
 
-#: engines/offline/kbgoffline.cpp:699
-msgid "In the middle of a game. Really quit?"
-msgstr "Yng nghanol gêm?  Terfynu go iawn?"
+#: kbg.cpp:563
+msgid "Save settings on exit"
+msgstr "Cadw gosodiadau wrth derfynu"
 
-#: engines/offline/kbgoffline.cpp:724
-msgid "Text commands are not yet working. The command '%1' has been ignored."
+#: kbg.cpp:570
+msgid ""
+"Event notification of %1 is configured as part of the system-wide notification "
+"process. Click here, and you will be able to configure system sounds, etc."
 msgstr ""
-"Nid yw gorchmynion testun yn gweithio eto.  Anwybyddwyd y gorchymyn '%1'."
+"Mae hysbysu digwyddiad %1 wedi'i ffurfweddu fel rhan o'r broses hysbysu "
+"cysawd-eang.  Cliciwch yma, a chewch ffurfweddu seiniau'r system, a.y.y.b."
 
-#: engines/offline/kbgoffline.cpp:794
-msgid "%1 vs. %2 - Edit Mode"
-msgstr "%1 vs. %2 - Modd Golygu"
+#: kbg.cpp:577
+msgid "Klick here to configure the event notification"
+msgstr "Cliciwch yma i ffurfweddu hysbysu digwyddiadau"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Kyfieithu: KD, Peter Bradley, dylunio, Thierry Vignaud"
+#: kbg.cpp:649
+#, c-format
+msgid "Print %1"
+msgstr "Argraffu %1"
 
-#: _translatorinfo.cpp:3
+#: kbg.cpp:671
 msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "kyfieithu@dotmon.com"
+"You can enable the menubar again with the right mouse button menu of the board."
+msgstr "Cewch alluogi bar y ddewislen eto gyda dewislen botwm de'r llygoden."
 
 #: main.cpp:31
 msgid "A Backgammon program for TDE"
@@ -1620,21 +1639,3 @@ msgstr "Awdur & cynhaliwr"
 #: main.cpp:49
 msgid "Initial anti-aliasing of the board"
 msgstr "Gwrthamgenu"
-
-#. i18n: file kbackgammonui.rc line 5
-#: rc.cpp:3
-#, no-c-format
-msgid "&Move"
-msgstr "Sy&mud"
-
-#. i18n: file kbackgammonui.rc line 10
-#: rc.cpp:6
-#, no-c-format
-msgid "&Command"
-msgstr "G&orchymyn"
-
-#. i18n: file kbackgammonui.rc line 32
-#: rc.cpp:18
-#, no-c-format
-msgid "Command Toolbar"
-msgstr "Bar Offer Gorchmynion"
diff --git a/tde-i18n-cy/messages/tdegames/kbattleship.po b/tde-i18n-cy/messages/tdegames/kbattleship.po
index e3351c23235..98da4e59ebc 100644
--- a/tde-i18n-cy/messages/tdegames/kbattleship.po
+++ b/tde-i18n-cy/messages/tdegames/kbattleship.po
@@ -9,10 +9,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kbattleship\n"
-"POT-Creation-Date: 2008-07-08 01:19+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2005-09-08 22:52+0100\n"
 "Last-Translator: Kevin Donnelly <kevin@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdegames/kblackbox.po b/tde-i18n-cy/messages/tdegames/kblackbox.po
index f4813baca5d..6f90f1eb6f7 100644
--- a/tde-i18n-cy/messages/tdegames/kblackbox.po
+++ b/tde-i18n-cy/messages/tdegames/kblackbox.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kblackbox\n"
-"POT-Creation-Date: 2005-07-24 01:33+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2005-09-14 12:51+0100\n"
 "Last-Translator: Kevin Donnelly <kevin@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdegames/kbounce.po b/tde-i18n-cy/messages/tdegames/kbounce.po
index 769bf2a7b16..12fd50911b2 100644
--- a/tde-i18n-cy/messages/tdegames/kbounce.po
+++ b/tde-i18n-cy/messages/tdegames/kbounce.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kbounce\n"
-"POT-Creation-Date: 2005-07-01 01:32+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2005-09-14 12:53+0100\n"
 "Last-Translator: Kevin Donnelly <kevin@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -132,18 +133,18 @@ msgstr ""
 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!"
 
-#: main.cpp:38
+#: main.cpp:40
 msgid "TDE Bounce Ball Game"
 msgstr "Gêm Sboncio Pêl TDE"
 
-#: main.cpp:45
+#: main.cpp:47
 msgid "KBounce"
 msgstr "KBounce"
 
-#: main.cpp:49
+#: main.cpp:51
 msgid "Original author"
 msgstr "Awdur gwreiddiol"
 
-#: main.cpp:51
+#: main.cpp:53
 msgid "Contributions"
 msgstr "Cyfraniadau"
diff --git a/tde-i18n-cy/messages/tdegames/kenolaba.po b/tde-i18n-cy/messages/tdegames/kenolaba.po
index 7fa099eaa6b..3f96538aa6f 100644
--- a/tde-i18n-cy/messages/tdegames/kenolaba.po
+++ b/tde-i18n-cy/messages/tdegames/kenolaba.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kenolaba\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2005-09-21 09:07+0100\n"
 "Last-Translator: Kevin Donnelly <kevin@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdegames/kfouleggs.po b/tde-i18n-cy/messages/tdegames/kfouleggs.po
index 46ddb0cd07b..892c24d92e6 100644
--- a/tde-i18n-cy/messages/tdegames/kfouleggs.po
+++ b/tde-i18n-cy/messages/tdegames/kfouleggs.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kfouleggs\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2005-09-14 12:55+0100\n"
 "Last-Translator: Kevin Donnelly <kevin@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdegames/kgoldrunner.po b/tde-i18n-cy/messages/tdegames/kgoldrunner.po
index e4b7a0d6df8..3023e345ccb 100644
--- a/tde-i18n-cy/messages/tdegames/kgoldrunner.po
+++ b/tde-i18n-cy/messages/tdegames/kgoldrunner.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kgoldrunner\n"
-"POT-Creation-Date: 2006-10-10 02:33+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2005-10-14 16:49+0100\n"
 "Last-Translator: Kevin Donnelly <kevin@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -1275,9 +1276,10 @@ msgid "Sorry, you cannot make the play area any larger."
 msgstr "Sori, ni allwch leihau'r maes chwarae."
 
 #: kgrcanvas.cpp:147
+#, fuzzy
 msgid ""
 "Sorry, you cannot change the size of the playing area. That function requires "
-"Qt Library version 3 or later."
+"TQt Library version 3 or later."
 msgstr ""
 "Sori, ni allwch newid maint y maes chwarae.  Mae'r nodwedd yna angen Llyfrgell "
 "Qt fersiwn 3 neu hwyrach."
diff --git a/tde-i18n-cy/messages/tdegames/kjumpingcube.po b/tde-i18n-cy/messages/tdegames/kjumpingcube.po
index 16026b7377a..e3e850ac321 100644
--- a/tde-i18n-cy/messages/tdegames/kjumpingcube.po
+++ b/tde-i18n-cy/messages/tdegames/kjumpingcube.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kjumpingcube\n"
-"POT-Creation-Date: 2008-07-08 01:19+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2005-09-21 09:08+0100\n"
 "Last-Translator: Kevin Donnelly <kevin@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdegames/klickety.po b/tde-i18n-cy/messages/tdegames/klickety.po
index 925063937a9..f2fdaba42c0 100644
--- a/tde-i18n-cy/messages/tdegames/klickety.po
+++ b/tde-i18n-cy/messages/tdegames/klickety.po
@@ -3,10 +3,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: klickety\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2004-07-06 21:17+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdegames/klines.po b/tde-i18n-cy/messages/tdegames/klines.po
index 07b604e7d74..135eb337f82 100644
--- a/tde-i18n-cy/messages/tdegames/klines.po
+++ b/tde-i18n-cy/messages/tdegames/klines.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: klines\n"
-"POT-Creation-Date: 2005-07-03 01:31+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2005-09-21 09:11+0100\n"
 "Last-Translator: Kevin Donnelly <kevin@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdegames/kmahjongg.po b/tde-i18n-cy/messages/tdegames/kmahjongg.po
index 3bec1563f38..78beca19f11 100644
--- a/tde-i18n-cy/messages/tdegames/kmahjongg.po
+++ b/tde-i18n-cy/messages/tdegames/kmahjongg.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmahjongg\n"
-"POT-Creation-Date: 2006-06-18 03:58+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2005-09-21 09:16+0100\n"
 "Last-Translator: Kevin Donnelly <kevin@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdegames/kmines.po b/tde-i18n-cy/messages/tdegames/kmines.po
index 309d63591e5..a1fa7f8e1ca 100644
--- a/tde-i18n-cy/messages/tdegames/kmines.po
+++ b/tde-i18n-cy/messages/tdegames/kmines.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmines\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2005-09-21 09:18+0100\n"
 "Last-Translator: Kevin Donnelly <kevin@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdegames/knetwalk.po b/tde-i18n-cy/messages/tdegames/knetwalk.po
index aef384fb810..976fdbbb827 100644
--- a/tde-i18n-cy/messages/tdegames/knetwalk.po
+++ b/tde-i18n-cy/messages/tdegames/knetwalk.po
@@ -3,10 +3,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: knetwalk\n"
-"POT-Creation-Date: 2006-12-21 02:39+0100\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2005-09-08 22:39+0100\n"
 "Last-Translator: Kevin Donnelly <kevin@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -41,7 +42,8 @@ msgid "anonymous"
 msgstr "dienw"
 
 #: main.cpp:27
-msgid "KNetWalk, a game for system administrators."
+#, fuzzy
+msgid "KNetwalk, a game for system administrators."
 msgstr "KNetWalk, gêm ar gyfer gweinyddwyr cysawd."
 
 #: main.cpp:33
@@ -61,11 +63,13 @@ msgid "Start in master mode"
 msgstr "Cychwyn mewn modd meistr"
 
 #: main.cpp:42
-msgid "knetwalk"
+#, fuzzy
+msgid "KNetwalk"
 msgstr "knetwalk"
 
 #: main.cpp:43
-msgid "(C) 2004, 2005 Andi Peredri, ported to TDE by Thomas Nagy"
+#, fuzzy
+msgid "(C) 2004, 2005 Andi Peredri, ported to KDE by Thomas Nagy"
 msgstr "(H) 2004, 2005 Andi Peredri, wedi'i drosi i TDE gan Thomas Nagy"
 
 #: mainwindow.cpp:75
diff --git a/tde-i18n-cy/messages/tdegames/kolf.po b/tde-i18n-cy/messages/tdegames/kolf.po
index 8712f4194f1..ecb1bdf22ea 100644
--- a/tde-i18n-cy/messages/tdegames/kolf.po
+++ b/tde-i18n-cy/messages/tdegames/kolf.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kolf\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2005-09-21 09:20+0100\n"
 "Last-Translator: Kevin Donnelly <kevin@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -558,38 +559,38 @@ msgstr "Disymud"
 msgid "Whether or not this slope can be moved by other objects, like floaters."
 msgstr "A ellir symud y llethr yma gan gwrthrychau eraill, megis arnofyddion."
 
-#: game.h:231
+#: game.h:232
 msgid "Puddle"
 msgstr "Pwll"
 
-#: game.h:244
+#: game.h:245
 msgid "Sand"
 msgstr "Tywod"
 
-#: game.h:281
+#: game.h:282
 msgid "Bumper"
 msgstr "Bympar"
 
-#: game.h:312
+#: game.h:313
 msgid "Cup"
 msgstr "Cwpan"
 
-#: game.h:421
+#: game.h:425
 msgid "Black Hole"
 msgstr "Twll Du"
 
-#: game.h:500
+#: game.h:504
 msgid "Wall"
 msgstr "Wal"
 
-#: game.h:608
+#: game.h:613
 msgid "Bridge"
 msgstr "Pont"
 
-#: game.h:645
+#: game.h:651
 msgid "Sign"
 msgstr "Llofnodi"
 
-#: game.h:703
+#: game.h:710
 msgid "Windmill"
 msgstr "Melin wynt"
diff --git a/tde-i18n-cy/messages/tdegames/konquest.po b/tde-i18n-cy/messages/tdegames/konquest.po
index b82d7b614c7..c690af6f2c8 100644
--- a/tde-i18n-cy/messages/tdegames/konquest.po
+++ b/tde-i18n-cy/messages/tdegames/konquest.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: konquest\n"
-"POT-Creation-Date: 2008-07-08 01:19+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2005-10-10 09:37+0100\n"
 "Last-Translator: Kevin Donnelly <kevin@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdegames/kpat.po b/tde-i18n-cy/messages/tdegames/kpat.po
index a368f28fb6e..304ac9f03b1 100644
--- a/tde-i18n-cy/messages/tdegames/kpat.po
+++ b/tde-i18n-cy/messages/tdegames/kpat.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kpat\n"
-"POT-Creation-Date: 2006-10-12 02:36+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2005-09-21 13:12+0100\n"
 "Last-Translator: Kevin Donnelly <kevin@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdegames/kpoker.po b/tde-i18n-cy/messages/tdegames/kpoker.po
index 21e8e3f1846..4862e75eaf0 100644
--- a/tde-i18n-cy/messages/tdegames/kpoker.po
+++ b/tde-i18n-cy/messages/tdegames/kpoker.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kpoker\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2005-09-21 13:39+0100\n"
 "Last-Translator: Kevin Donnelly <kevin@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdegames/kreversi.po b/tde-i18n-cy/messages/tdegames/kreversi.po
index 1c10ce4c3e0..843c08e0603 100644
--- a/tde-i18n-cy/messages/tdegames/kreversi.po
+++ b/tde-i18n-cy/messages/tdegames/kreversi.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kreversi\n"
-"POT-Creation-Date: 2008-07-08 01:19+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2005-09-21 13:37+0100\n"
 "Last-Translator: Kevin Donnelly <kevin@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -30,7 +31,7 @@ msgid ""
 "Your emails"
 msgstr "kyfieithu@dotmon.com"
 
-#: board.cpp:268
+#: board.cpp:267
 msgid "Click"
 msgstr "Clicio"
 
diff --git a/tde-i18n-cy/messages/tdegames/ksame.po b/tde-i18n-cy/messages/tdegames/ksame.po
index 7dcf145a9c9..df24955ff9f 100644
--- a/tde-i18n-cy/messages/tdegames/ksame.po
+++ b/tde-i18n-cy/messages/tdegames/ksame.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ksame\n"
-"POT-Creation-Date: 2005-07-24 01:33+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2005-10-01 16:13+0100\n"
 "Last-Translator: Kevin Donnelly <kevin@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdegames/kshisen.po b/tde-i18n-cy/messages/tdegames/kshisen.po
index 895136cbc66..effa42c2957 100644
--- a/tde-i18n-cy/messages/tdegames/kshisen.po
+++ b/tde-i18n-cy/messages/tdegames/kshisen.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kshisen\n"
-"POT-Creation-Date: 2006-06-12 04:03+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2005-09-21 13:41+0100\n"
 "Last-Translator: Kevin Donnelly <kevin@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -147,7 +148,8 @@ msgid "Game Paused"
 msgstr "Gêm wedi'i Seibio"
 
 #: app.cpp:80 app.cpp:340
-msgid " Cheat mode "
+#, fuzzy
+msgid " Hint mode "
 msgstr "Modd twyllo"
 
 #: app.cpp:123
diff --git a/tde-i18n-cy/messages/tdegames/ksirtet.po b/tde-i18n-cy/messages/tdegames/ksirtet.po
index bdb259e2f0d..931ed4dd531 100644
--- a/tde-i18n-cy/messages/tdegames/ksirtet.po
+++ b/tde-i18n-cy/messages/tdegames/ksirtet.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ksirtet\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2005-10-06 22:19+0100\n"
 "Last-Translator: Kevin Donnelly <kevin@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdegames/ksmiletris.po b/tde-i18n-cy/messages/tdegames/ksmiletris.po
index a686cd97d10..011d0ae4acd 100644
--- a/tde-i18n-cy/messages/tdegames/ksmiletris.po
+++ b/tde-i18n-cy/messages/tdegames/ksmiletris.po
@@ -3,10 +3,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ksmiletris\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2005-09-18 15:11+0100\n"
 "Last-Translator: Kevin Donnelly <kevin@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdegames/ksnake.po b/tde-i18n-cy/messages/tdegames/ksnake.po
index 98e9ee766b7..70eb2d7a58e 100644
--- a/tde-i18n-cy/messages/tdegames/ksnake.po
+++ b/tde-i18n-cy/messages/tdegames/ksnake.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ksnake\n"
-"POT-Creation-Date: 2008-07-08 01:19+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2005-10-10 09:27+0100\n"
 "Last-Translator: Kevin Donnelly <kevin@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdegames/ksokoban.po b/tde-i18n-cy/messages/tdegames/ksokoban.po
index 25acff4ff90..ae3981168b1 100644
--- a/tde-i18n-cy/messages/tdegames/ksokoban.po
+++ b/tde-i18n-cy/messages/tdegames/ksokoban.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ksokoban\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2005-09-21 13:43+0100\n"
 "Last-Translator: Kevin Donnelly <kevin@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdegames/kspaceduel.po b/tde-i18n-cy/messages/tdegames/kspaceduel.po
index 4f18e0fa975..74f7ac7c960 100644
--- a/tde-i18n-cy/messages/tdegames/kspaceduel.po
+++ b/tde-i18n-cy/messages/tdegames/kspaceduel.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kspaceduel\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2005-01-28 09:27+0000\n"
 "Last-Translator: Kevin Donnelly <kevin@dotmon.com>\n"
 "Language-Team: Cymraeg\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdegames/ktron.po b/tde-i18n-cy/messages/tdegames/ktron.po
index 674fe26347b..bf91f32d840 100644
--- a/tde-i18n-cy/messages/tdegames/ktron.po
+++ b/tde-i18n-cy/messages/tdegames/ktron.po
@@ -9,10 +9,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ktron\n"
-"POT-Creation-Date: 2008-07-08 01:19+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2005-09-08 21:42+0100\n"
 "Last-Translator: Kevin Donnelly <kevin@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdegames/ktuberling.po b/tde-i18n-cy/messages/tdegames/ktuberling.po
index c9aa9bc069d..58f3df3aa47 100644
--- a/tde-i18n-cy/messages/tdegames/ktuberling.po
+++ b/tde-i18n-cy/messages/tdegames/ktuberling.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ktuberling\n"
-"POT-Creation-Date: 2006-08-13 04:05+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2005-10-15 17:36+0100\n"
 "Last-Translator: Kevin Donnelly <kevin@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdegames/libksirtet.po b/tde-i18n-cy/messages/tdegames/libksirtet.po
index 269d9e14d21..e7a3b9aca6a 100644
--- a/tde-i18n-cy/messages/tdegames/libksirtet.po
+++ b/tde-i18n-cy/messages/tdegames/libksirtet.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libksirtet\n"
-"POT-Creation-Date: 2005-11-30 03:21+0100\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2005-10-10 09:35+0100\n"
 "Last-Translator: Kevin Donnelly <kevin@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdegames/libtdegames.po b/tde-i18n-cy/messages/tdegames/libtdegames.po
index e51cb7fbbc7..91319bfb05c 100644
--- a/tde-i18n-cy/messages/tdegames/libtdegames.po
+++ b/tde-i18n-cy/messages/tdegames/libtdegames.po
@@ -8,16 +8,249 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libtdegames\n"
-"POT-Creation-Date: 2006-12-21 02:39+0100\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2005-10-15 22:24+0100\n"
 "Last-Translator: Kevin Donnelly <kevin@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10\n"
 "\n"
 
+#: kgamemisc.cpp:55
+msgid ""
+"_: A list of language typical names ( for games ), separated by spaces\n"
+"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"
+
+#: kcarddialog.cpp:277
+msgid "Choose Backside"
+msgstr "Dewis Ochr Gefn"
+
+#: kcarddialog.cpp:297
+msgid "Backside"
+msgstr "Ochr Gefn"
+
+#: kcarddialog.cpp:301 kcarddialog.cpp:351
+msgid "empty"
+msgstr "gwag"
+
+#: kcarddialog.cpp:309
+msgid "Random backside"
+msgstr "Ochr Gefn Hap"
+
+#: kcarddialog.cpp:314
+msgid "Use global backside"
+msgstr "Defnyddio ochr gefn fyd-eang"
+
+#: kcarddialog.cpp:317
+msgid "Make Backside Global"
+msgstr "Gwneud yr Ochr Gefn yn Fyd-eang"
+
+#: kcarddialog.cpp:329
+msgid "Choose Frontside"
+msgstr "Dewis Ochr Flaen"
+
+#: kcarddialog.cpp:347
+msgid "Frontside"
+msgstr "Ochr Flaen"
+
+#: kcarddialog.cpp:359
+msgid "Random frontside"
+msgstr "Ochr Flaen Hap"
+
+#: kcarddialog.cpp:364
+msgid "Use global frontside"
+msgstr "Defnyddio ochr flaen fyd-eang"
+
+#: kcarddialog.cpp:367
+msgid "Make Frontside Global"
+msgstr "Gwneud yr Ochr Flaen yn Fyd-eang"
+
+#: kcarddialog.cpp:426
+msgid "Resize Cards"
+msgstr "Ailnewid Maint Cerdiau"
+
+#: kcarddialog.cpp:439
+msgid "Default Size"
+msgstr "Maint Rhagosodol"
+
+#: kcarddialog.cpp:443
+msgid "Preview:"
+msgstr "Rhagolwg:"
+
+#: kcarddialog.cpp:476 kcarddialog.cpp:511
+msgid "unnamed"
+msgstr "di-enw"
+
+#: kcarddialog.cpp:532
+msgid "Carddeck Selection"
+msgstr "Dewis Pecyn Cerdiau"
+
+#: kchatdialog.cpp:60 kchatdialog.cpp:68
+msgid "Configure Chat"
+msgstr "Ffurfweddu Sgwrs"
+
+#: kchatdialog.cpp:86 kchatdialog.cpp:108
+msgid "Name Font..."
+msgstr "Gwynebfath Enw..."
+
+#: kchatdialog.cpp:89 kchatdialog.cpp:111
+msgid "Text Font..."
+msgstr "Gwynebfath Testun..."
+
+#: kchatdialog.cpp:98
+msgid "Player: "
+msgstr "Chwaraewr:"
+
+#: kchatdialog.cpp:100
+msgid "This is a player message"
+msgstr "Neges chwaraewr yw hon"
+
+#: kchatdialog.cpp:106
+msgid "System Messages - Messages directly sent from the game"
+msgstr "Negeseuon Cysawd - negeseuon a anfonir yn uniongyrchol o'r gêm"
+
+#: kchatdialog.cpp:120
+msgid "--- Game: "
+msgstr "--- Gêm: "
+
+#: kchatdialog.cpp:122
+msgid "This is a system message"
+msgstr "Neges gysawd yw hon"
+
+#: kchatdialog.cpp:126
+msgid "Maximal number of messages (-1 = unlimited):"
+msgstr "Nifer uchafsymol o negeseuon (-1 = anfeidrol):"
+
+#: kstdgameaction.cpp:60
+msgid ""
+"_: new game\n"
+"&New"
+msgstr "&Newydd"
+
+#: kstdgameaction.cpp:61
+msgid "&Load..."
+msgstr "&Llwytho..."
+
+#: kstdgameaction.cpp:62
+msgid "Load &Recent"
+msgstr "Llwytho &Diweddar"
+
+#: kstdgameaction.cpp:63
+msgid "Restart &Game"
+msgstr "&Ailddechrau Gêm"
+
+#: kstdgameaction.cpp:65
+msgid "Save &As..."
+msgstr "Cadw &Fel..."
+
+#: kstdgameaction.cpp:66
+msgid "&End Game"
+msgstr "&Gorffen Gêm"
+
+#: kstdgameaction.cpp:67
+msgid "Pa&use"
+msgstr "Se&ibio"
+
+#: kstdgameaction.cpp:68
+msgid "Show &Highscores"
+msgstr "Dangos Sgorau &Gorau"
+
+#: kstdgameaction.cpp:72
+msgid "Repeat"
+msgstr "Ailadrodd"
+
+#: kstdgameaction.cpp:73
+msgid "Und&o"
+msgstr "&Dadwneud"
+
+#: kstdgameaction.cpp:74
+msgid "Re&do"
+msgstr "Ail&wneud"
+
+#: kstdgameaction.cpp:75
+msgid "&Roll Dice"
+msgstr "&Taflu Dis"
+
+#: kstdgameaction.cpp:76
+msgid "End Turn"
+msgstr "Gorffen Tro"
+
+#: kstdgameaction.cpp:77
+msgid "&Hint"
+msgstr "Cyng&horyn"
+
+#: kstdgameaction.cpp:78
+msgid "&Demo"
+msgstr "&Arddangos"
+
+#: kstdgameaction.cpp:79
+msgid "&Solve"
+msgstr "&Datrys"
+
+#: kstdgameaction.cpp:81
+msgid "Choose Game &Type"
+msgstr "Dewis &Math o Gêm"
+
+#: kstdgameaction.cpp:82
+msgid "Configure &Carddecks..."
+msgstr "Ffurfweddu &Pecynnau Cerdiau..."
+
+#: kstdgameaction.cpp:83
+msgid "Configure &Highscores..."
+msgstr "Ffurfweddu &Sgorau Gorau..."
+
+#: kchat.cpp:85 kgame/dialogs/kgamedebugdialog.cpp:497 kgame/kgamechat.cpp:103
+#: kgame/kgamepropertyhandler.cpp:382
+msgid "Unknown"
+msgstr "Anhysbys"
+
+#: kgame/kgameerror.cpp:63
+msgid ""
+"Cookie mismatch!\n"
+"Expected Cookie: %1\n"
+"Received Cookie: %2"
+msgstr ""
+"Cwci anghydnaws!\n"
+"Wedi disgwyl cwci: %1\n"
+"Wedi derbyn cwci: %2"
+
+#: kgame/kgameerror.cpp:72
+msgid ""
+"KGame Version mismatch!\n"
+"Expected Version: %1\n"
+"Received Version: %2\n"
+msgstr ""
+"Fersiwn KGame anghydnaws!\n"
+"Wedi disgwyl fersiwn: %1\n"
+"Wedi derbyn fersiwn: %2\n"
+
+#: kgame/kgameerror.cpp:76
+#, c-format
+msgid "Unknown error code %1"
+msgstr "Côd gwall anhysbys %1"
+
+#: kgame/kgamechat.cpp:95
+#, c-format
+msgid "Player %1"
+msgstr "Chwaraewr %1"
+
+#: kchatbase.cpp:409 kgame/kgamechat.cpp:168
+#, c-format
+msgid "Send to %1"
+msgstr "Anfon i %1"
+
+#: kgame/kgamechat.cpp:214
+msgid "Send to My Group (\"%1\")"
+msgstr "Anfon i Fy Ngrwp (\"%1\")"
+
 #: kgame/kplayer.cpp:91
 msgid "UserId"
 msgstr "Dynodiad Defnyddiwr"
@@ -43,6 +276,235 @@ msgstr "Mewnbwn Anghydamserol"
 msgid "myTurn"
 msgstr "fyNhro"
 
+#: kgame/kgamemessage.cpp:115
+msgid "Setup Game"
+msgstr "Ffurfweddu Gêm"
+
+#: kgame/kgamemessage.cpp:117
+msgid "Setup Game Continue"
+msgstr "Ffurfweddu Gêm (Parhau)"
+
+#: kgame/kgamemessage.cpp:119
+msgid "Load Game"
+msgstr "Llwytho Gêm"
+
+#: kgame/kgamemessage.cpp:121
+msgid "Client game connected"
+msgstr "Gêm dibynnydd wedi cysylltu"
+
+#: kgame/kgamemessage.cpp:123
+msgid "Game setup done"
+msgstr "Cwblhawyd ffurfweddu'r gêm"
+
+#: kgame/kgamemessage.cpp:125
+msgid "Synchronize Random"
+msgstr "Cydamseru Hap"
+
+#: kgame/dialogs/kgamedialogconfig.cpp:132 kgame/kgamemessage.cpp:127
+msgid "Disconnect"
+msgstr "Datgysylltu"
+
+#: kgame/kgamemessage.cpp:129
+msgid "Player Property"
+msgstr "Priodwedd Chwaraewr"
+
+#: kgame/kgamemessage.cpp:131
+msgid "Game Property"
+msgstr "Priodwedd Gêm"
+
+#: kgame/kgamemessage.cpp:133
+msgid "Add Player"
+msgstr "Ychwanegu Chwaraewr"
+
+#: kgame/kgamemessage.cpp:135
+msgid "Remove Player"
+msgstr "Gwaredu Chwaraewr"
+
+#: kgame/kgamemessage.cpp:137
+msgid "Activate Player"
+msgstr "Gweithredoli Chwaraewr"
+
+#: kgame/kgamemessage.cpp:139
+msgid "Inactivate Player"
+msgstr "Anweithredoli Chwaraewr"
+
+#: kgame/kgamemessage.cpp:141
+msgid "Id Turn"
+msgstr "Tro Dynodiad"
+
+#: kgame/kgamemessage.cpp:143
+msgid "Error Message"
+msgstr "Neges Wall"
+
+#: kgame/kgamemessage.cpp:145
+msgid "Player Input"
+msgstr "Mewnbwn Chwaraewr"
+
+#: kgame/kgamemessage.cpp:147
+msgid "An IO was added"
+msgstr "Ychwanegwyd IO"
+
+#: kgame/kgamemessage.cpp:149
+msgid "Process Query"
+msgstr "Ymholiad Proses"
+
+#: kgame/dialogs/kgamedebugdialog.cpp:207 kgame/kgamemessage.cpp:151
+msgid "Player ID"
+msgstr "Dynodiad Chwaraewr"
+
+#: kgame/dialogs/kgamedialogconfig.cpp:136
+msgid "Network Configuration"
+msgstr "Ffurfweddu Rhwydwaith"
+
+#: kgame/dialogs/kgamedialogconfig.cpp:194
+msgid "Cannot connect to the network"
+msgstr "Methu cysylltu â'r rhwydwaith"
+
+#: kgame/dialogs/kgamedialogconfig.cpp:200
+msgid "Network status: No Network"
+msgstr "Cyflwr rhydwaith: Dim Rhwydwaith"
+
+#: kgame/dialogs/kgamedialogconfig.cpp:206
+msgid "Network status: You are MASTER"
+msgstr "Cyflwr rhwydwaith: Chi yw'r MEISTR"
+
+#: kgame/dialogs/kgamedialogconfig.cpp:208
+msgid "Network status: You are connected"
+msgstr "Cyflwr rhwydwaith: Rydych wedi cysylltu"
+
+#: kgame/dialogs/kgamedialogconfig.cpp:276
+msgid "Your name:"
+msgstr "Eich Enw:"
+
+#: kgame/dialogs/kgamedialogconfig.cpp:436
+msgid "Maximal Number of Clients"
+msgstr "Nifer Uchafsymol o Ddibynyddion"
+
+#: kgame/dialogs/kgamedialogconfig.cpp:440
+msgid "Maximal number of clients (-1 = infinite):"
+msgstr "Nifer Uchafsymol o Ddibynyddion (-1 = anfeidrol):"
+
+#: kgame/dialogs/kgamedialogconfig.cpp:490
+msgid "Change Maximal Number of Clients"
+msgstr "Newid Nifer Uchafsymol o Ddibynyddion"
+
+#: kgame/dialogs/kgamedialogconfig.cpp:492
+msgid "Change Admin"
+msgstr "Newid Gweinyddwr"
+
+#: kgame/dialogs/kgamedialogconfig.cpp:494
+msgid "Remove Client with All Players"
+msgstr "Gwaredu Dibynnydd efo Pob Chwaraewr"
+
+#: kgame/dialogs/kgamedialogconfig.cpp:512
+msgid "Only the admin can configure the message server!"
+msgstr "Y gweinyddwr yn unig a all ffurfweddu'r gweinydd negeseuon!"
+
+#: kgame/dialogs/kgamedialogconfig.cpp:523
+msgid "You don't own the message server"
+msgstr "Nid ydych chi yn meddu'r gweinydd negeseuon"
+
+#: kgame/dialogs/kgamedialogconfig.cpp:556
+msgid "Chat"
+msgstr "Sgwrsio"
+
+#: kgame/dialogs/kgamedialogconfig.cpp:609
+msgid "Connected Players"
+msgstr "Chwaraewyr wedi Cysylltu"
+
+#: kgame/dialogs/kgamedialogconfig.cpp:746
+msgid "Do you want to ban player \"%1\" from the game?"
+msgstr "A ydych eisiau atal \"%1\" o'r gêm?"
+
+#: kgame/dialogs/kgamedialogconfig.cpp:747
+msgid "Ban Player"
+msgstr "Atal Chwaraewr"
+
+#: kgame/dialogs/kgamedialogconfig.cpp:747
+msgid "Do Not Ban"
+msgstr "Peidio ag Atal"
+
+#: kgame/dialogs/kgamedialog.cpp:118
+msgid "&Chat"
+msgstr "&Sgwrsio"
+
+#: kgame/dialogs/kgamedialog.cpp:129
+msgid "C&onnections"
+msgstr "&Cysylltiadau"
+
+#: kgame/dialogs/kgamedialog.cpp:157
+msgid "&Network"
+msgstr "&Rhwydwaith"
+
+#: kgame/dialogs/kgamedialog.cpp:165
+msgid "&Message Server"
+msgstr "Gweinydd &Negeseuon"
+
+#: kgame/dialogs/kgameerrordialog.cpp:80
+msgid "Connection to the server has been lost!"
+msgstr "Collwyd y cysylltiad i'r gweinydd!"
+
+#: kgame/dialogs/kgameerrordialog.cpp:93
+msgid "Connection to client has been lost!"
+msgstr "Collwyd y cysylltiad i'r derbynnydd!"
+
+#: kgame/dialogs/kgameerrordialog.cpp:99
+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"
+
+#: kgame/dialogs/kgameerrordialog.cpp:107
+msgid "No connection could be created."
+msgstr "Ni fu modd creu cysylltiad."
+
+#: kgame/dialogs/kgameerrordialog.cpp:109
+#, c-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"
+
+#: kgame/dialogs/kgameconnectdialog.cpp:67
+msgid "Create a network game"
+msgstr "Creu gêm rhwydwaith"
+
+#: kgame/dialogs/kgameconnectdialog.cpp:68
+msgid "Join a network game"
+msgstr "Ymuno â gêm rhwydwaith"
+
+#: kgame/dialogs/kgameconnectdialog.cpp:73
+msgid "Game name:"
+msgstr "Enw gêm:"
+
+#: kgame/dialogs/kgameconnectdialog.cpp:75
+msgid "Network games:"
+msgstr "Gemau rhwydwaith:"
+
+#: kgame/dialogs/kgameconnectdialog.cpp:78
+msgid "Port to connect to:"
+msgstr "Porth i gysylltu iddi:"
+
+#: kgame/dialogs/kgameconnectdialog.cpp:80
+msgid "Host to connect to:"
+msgstr "Gweinyddwr i gysylltu iddo:"
+
+#: kgame/dialogs/kgameconnectdialog.cpp:83
+msgid "&Start Network"
+msgstr "&Cychwyn Rhwydwaith"
+
+#: kgame/dialogs/kgameconnectdialog.cpp:217
+msgid "Network Game"
+msgstr "Gêm Rhwydwaith"
+
 #: kgame/dialogs/kgamedebugdialog.cpp:124
 msgid "KGame Debug Dialog"
 msgstr "Ymgom Dadnamu KGame"
@@ -134,10 +596,6 @@ msgstr "Chwaraewyr Ar Gael"
 msgid "Player Pointer"
 msgstr "Pwyntydd Chwaraewr"
 
-#: kgame/dialogs/kgamedebugdialog.cpp:207 kgame/kgamemessage.cpp:151
-msgid "Player ID"
-msgstr "Dynodiad Chwaraewr"
-
 #: kgame/dialogs/kgamedebugdialog.cpp:208
 msgid "Player Name"
 msgstr "Enw Chwaraewr"
@@ -260,168 +718,6 @@ msgstr "Lleol"
 msgid "Undefined"
 msgstr "Anniffiniedig"
 
-#: kchat.cpp:85 kgame/dialogs/kgamedebugdialog.cpp:497 kgame/kgamechat.cpp:103
-#: kgame/kgamepropertyhandler.cpp:382
-msgid "Unknown"
-msgstr "Anhysbys"
-
-#: kgame/dialogs/kgameerrordialog.cpp:80
-msgid "Connection to the server has been lost!"
-msgstr "Collwyd y cysylltiad i'r gweinydd!"
-
-#: kgame/dialogs/kgameerrordialog.cpp:93
-msgid "Connection to client has been lost!"
-msgstr "Collwyd y cysylltiad i'r derbynnydd!"
-
-#: kgame/dialogs/kgameerrordialog.cpp:99
-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"
-
-#: kgame/dialogs/kgameerrordialog.cpp:107
-msgid "No connection could be created."
-msgstr "Ni fu modd creu cysylltiad."
-
-#: kgame/dialogs/kgameerrordialog.cpp:109
-#, c-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"
-
-#: kgame/dialogs/kgamedialog.cpp:118
-msgid "&Chat"
-msgstr "&Sgwrsio"
-
-#: kgame/dialogs/kgamedialog.cpp:129
-msgid "C&onnections"
-msgstr "&Cysylltiadau"
-
-#: kgame/dialogs/kgamedialog.cpp:157
-msgid "&Network"
-msgstr "&Rhwydwaith"
-
-#: kgame/dialogs/kgamedialog.cpp:165
-msgid "&Message Server"
-msgstr "Gweinydd &Negeseuon"
-
-#: kgame/dialogs/kgamedialogconfig.cpp:132 kgame/kgamemessage.cpp:127
-msgid "Disconnect"
-msgstr "Datgysylltu"
-
-#: kgame/dialogs/kgamedialogconfig.cpp:136
-msgid "Network Configuration"
-msgstr "Ffurfweddu Rhwydwaith"
-
-#: kgame/dialogs/kgamedialogconfig.cpp:194
-msgid "Cannot connect to the network"
-msgstr "Methu cysylltu â'r rhwydwaith"
-
-#: kgame/dialogs/kgamedialogconfig.cpp:200
-msgid "Network status: No Network"
-msgstr "Cyflwr rhydwaith: Dim Rhwydwaith"
-
-#: kgame/dialogs/kgamedialogconfig.cpp:206
-msgid "Network status: You are MASTER"
-msgstr "Cyflwr rhwydwaith: Chi yw'r MEISTR"
-
-#: kgame/dialogs/kgamedialogconfig.cpp:208
-msgid "Network status: You are connected"
-msgstr "Cyflwr rhwydwaith: Rydych wedi cysylltu"
-
-#: kgame/dialogs/kgamedialogconfig.cpp:276
-msgid "Your name:"
-msgstr "Eich Enw:"
-
-#: kgame/dialogs/kgamedialogconfig.cpp:436
-msgid "Maximal Number of Clients"
-msgstr "Nifer Uchafsymol o Ddibynyddion"
-
-#: kgame/dialogs/kgamedialogconfig.cpp:440
-msgid "Maximal number of clients (-1 = infinite):"
-msgstr "Nifer Uchafsymol o Ddibynyddion (-1 = anfeidrol):"
-
-#: kgame/dialogs/kgamedialogconfig.cpp:490
-msgid "Change Maximal Number of Clients"
-msgstr "Newid Nifer Uchafsymol o Ddibynyddion"
-
-#: kgame/dialogs/kgamedialogconfig.cpp:492
-msgid "Change Admin"
-msgstr "Newid Gweinyddwr"
-
-#: kgame/dialogs/kgamedialogconfig.cpp:494
-msgid "Remove Client with All Players"
-msgstr "Gwaredu Dibynnydd efo Pob Chwaraewr"
-
-#: kgame/dialogs/kgamedialogconfig.cpp:512
-msgid "Only the admin can configure the message server!"
-msgstr "Y gweinyddwr yn unig a all ffurfweddu'r gweinydd negeseuon!"
-
-#: kgame/dialogs/kgamedialogconfig.cpp:523
-msgid "You don't own the message server"
-msgstr "Nid ydych chi yn meddu'r gweinydd negeseuon"
-
-#: kgame/dialogs/kgamedialogconfig.cpp:556
-msgid "Chat"
-msgstr "Sgwrsio"
-
-#: kgame/dialogs/kgamedialogconfig.cpp:609
-msgid "Connected Players"
-msgstr "Chwaraewyr wedi Cysylltu"
-
-#: kgame/dialogs/kgamedialogconfig.cpp:746
-msgid "Do you want to ban player \"%1\" from the game?"
-msgstr "A ydych eisiau atal \"%1\" o'r gêm?"
-
-#: kgame/dialogs/kgamedialogconfig.cpp:747
-msgid "Ban Player"
-msgstr "Atal Chwaraewr"
-
-#: kgame/dialogs/kgamedialogconfig.cpp:747
-msgid "Do Not Ban"
-msgstr "Peidio ag Atal"
-
-#: kgame/dialogs/kgameconnectdialog.cpp:67
-msgid "Create a network game"
-msgstr "Creu gêm rhwydwaith"
-
-#: kgame/dialogs/kgameconnectdialog.cpp:68
-msgid "Join a network game"
-msgstr "Ymuno â gêm rhwydwaith"
-
-#: kgame/dialogs/kgameconnectdialog.cpp:73
-msgid "Game name:"
-msgstr "Enw gêm:"
-
-#: kgame/dialogs/kgameconnectdialog.cpp:75
-msgid "Network games:"
-msgstr "Gemau rhwydwaith:"
-
-#: kgame/dialogs/kgameconnectdialog.cpp:78
-msgid "Port to connect to:"
-msgstr "Porth i gysylltu iddi:"
-
-#: kgame/dialogs/kgameconnectdialog.cpp:80
-msgid "Host to connect to:"
-msgstr "Gweinyddwr i gysylltu iddo:"
-
-#: kgame/dialogs/kgameconnectdialog.cpp:83
-msgid "&Start Network"
-msgstr "&Cychwyn Rhwydwaith"
-
-#: kgame/dialogs/kgameconnectdialog.cpp:217
-msgid "Network Game"
-msgstr "Gêm Rhwydwaith"
-
 #: kgame/kgame.cpp:94
 msgid "MaxPlayers"
 msgstr "Uchafswm Chwaraewyr"
@@ -447,381 +743,18 @@ msgstr "Dienw - Dynodiad: %1"
 msgid "%1 unregistered"
 msgstr "%1 heb gofrestru"
 
-#: kgame/kgamemessage.cpp:115
-msgid "Setup Game"
-msgstr "Ffurfweddu Gêm"
-
-#: kgame/kgamemessage.cpp:117
-msgid "Setup Game Continue"
-msgstr "Ffurfweddu Gêm (Parhau)"
-
-#: kgame/kgamemessage.cpp:119
-msgid "Load Game"
-msgstr "Llwytho Gêm"
-
-#: kgame/kgamemessage.cpp:121
-msgid "Client game connected"
-msgstr "Gêm dibynnydd wedi cysylltu"
-
-#: kgame/kgamemessage.cpp:123
-msgid "Game setup done"
-msgstr "Cwblhawyd ffurfweddu'r gêm"
-
-#: kgame/kgamemessage.cpp:125
-msgid "Synchronize Random"
-msgstr "Cydamseru Hap"
-
-#: kgame/kgamemessage.cpp:129
-msgid "Player Property"
-msgstr "Priodwedd Chwaraewr"
-
-#: kgame/kgamemessage.cpp:131
-msgid "Game Property"
-msgstr "Priodwedd Gêm"
-
-#: kgame/kgamemessage.cpp:133
-msgid "Add Player"
-msgstr "Ychwanegu Chwaraewr"
-
-#: kgame/kgamemessage.cpp:135
-msgid "Remove Player"
-msgstr "Gwaredu Chwaraewr"
-
-#: kgame/kgamemessage.cpp:137
-msgid "Activate Player"
-msgstr "Gweithredoli Chwaraewr"
-
-#: kgame/kgamemessage.cpp:139
-msgid "Inactivate Player"
-msgstr "Anweithredoli Chwaraewr"
-
-#: kgame/kgamemessage.cpp:141
-msgid "Id Turn"
-msgstr "Tro Dynodiad"
-
-#: kgame/kgamemessage.cpp:143
-msgid "Error Message"
-msgstr "Neges Wall"
-
-#: kgame/kgamemessage.cpp:145
-msgid "Player Input"
-msgstr "Mewnbwn Chwaraewr"
-
-#: kgame/kgamemessage.cpp:147
-msgid "An IO was added"
-msgstr "Ychwanegwyd IO"
-
-#: kgame/kgamemessage.cpp:149
-msgid "Process Query"
-msgstr "Ymholiad Proses"
-
-#: kgame/kgamechat.cpp:95
-#, c-format
-msgid "Player %1"
-msgstr "Chwaraewr %1"
-
-#: kchatbase.cpp:409 kgame/kgamechat.cpp:168
-#, c-format
-msgid "Send to %1"
-msgstr "Anfon i %1"
-
-#: kgame/kgamechat.cpp:214
-msgid "Send to My Group (\"%1\")"
-msgstr "Anfon i Fy Ngrwp (\"%1\")"
-
-#: kgame/kgameerror.cpp:63
-msgid ""
-"Cookie mismatch!\n"
-"Expected Cookie: %1\n"
-"Received Cookie: %2"
-msgstr ""
-"Cwci anghydnaws!\n"
-"Wedi disgwyl cwci: %1\n"
-"Wedi derbyn cwci: %2"
-
-#: kgame/kgameerror.cpp:72
-msgid ""
-"KGame Version mismatch!\n"
-"Expected Version: %1\n"
-"Received Version: %2\n"
-msgstr ""
-"Fersiwn KGame anghydnaws!\n"
-"Wedi disgwyl fersiwn: %1\n"
-"Wedi derbyn fersiwn: %2\n"
-
-#: kgame/kgameerror.cpp:76
-#, c-format
-msgid "Unknown error code %1"
-msgstr "Côd gwall anhysbys %1"
-
-#: kgamemisc.cpp:55
-msgid ""
-"_: A list of language typical names ( for games ), separated by spaces\n"
-"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"
-
-#: kstdgameaction.cpp:60
-msgid ""
-"_: new game\n"
-"&New"
-msgstr "&Newydd"
-
-#: kstdgameaction.cpp:61
-msgid "&Load..."
-msgstr "&Llwytho..."
-
-#: kstdgameaction.cpp:62
-msgid "Load &Recent"
-msgstr "Llwytho &Diweddar"
-
-#: kstdgameaction.cpp:63
-msgid "Restart &Game"
-msgstr "&Ailddechrau Gêm"
-
-#: kstdgameaction.cpp:65
-msgid "Save &As..."
-msgstr "Cadw &Fel..."
-
-#: kstdgameaction.cpp:66
-msgid "&End Game"
-msgstr "&Gorffen Gêm"
-
-#: kstdgameaction.cpp:67
-msgid "Pa&use"
-msgstr "Se&ibio"
-
-#: kstdgameaction.cpp:68
-msgid "Show &Highscores"
-msgstr "Dangos Sgorau &Gorau"
-
-#: kstdgameaction.cpp:72
-msgid "Repeat"
-msgstr "Ailadrodd"
-
-#: kstdgameaction.cpp:73
-msgid "Und&o"
-msgstr "&Dadwneud"
-
-#: kstdgameaction.cpp:74
-msgid "Re&do"
-msgstr "Ail&wneud"
-
-#: kstdgameaction.cpp:75
-msgid "&Roll Dice"
-msgstr "&Taflu Dis"
-
-#: kstdgameaction.cpp:76
-msgid "End Turn"
-msgstr "Gorffen Tro"
-
-#: kstdgameaction.cpp:77
-msgid "&Hint"
-msgstr "Cyng&horyn"
-
-#: kstdgameaction.cpp:78
-msgid "&Demo"
-msgstr "&Arddangos"
-
-#: kstdgameaction.cpp:79
-msgid "&Solve"
-msgstr "&Datrys"
-
-#: kstdgameaction.cpp:81
-msgid "Choose Game &Type"
-msgstr "Dewis &Math o Gêm"
-
-#: kstdgameaction.cpp:82
-msgid "Configure &Carddecks..."
-msgstr "Ffurfweddu &Pecynnau Cerdiau..."
-
-#: kstdgameaction.cpp:83
-msgid "Configure &Highscores..."
-msgstr "Ffurfweddu &Sgorau Gorau..."
-
-#: highscore/khighscore.cpp:134
-msgid "Retry"
-msgstr "Ailgeisio"
-
-#: highscore/khighscore.cpp:135
-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."
-
-#: highscore/kscoredialog.cpp:68
-msgid "High Scores"
-msgstr "Sgorau Gorau"
-
-#: highscore/kexthighscore_internal.h:69 highscore/kscoredialog.cpp:83
-msgid "Date"
-msgstr "Dyddiad"
-
-#: highscore/kscoredialog.cpp:86
-msgid "Level"
-msgstr "Lefel"
-
-#: highscore/kexthighscore.cpp:211 highscore/kscoredialog.cpp:89
-msgid "Score"
-msgstr "Sgôr"
+#: kchatbase.cpp:232
+msgid "Send to All Players"
+msgstr "Anfon i bob chwaraewr"
 
-#: highscore/kexthighscore_internal.h:49 highscore/kscoredialog.cpp:141
-msgid "Rank"
-msgstr "Gradd"
+#: kchatbase.cpp:371
+msgid "%1 %2"
+msgstr "%1 %2"
 
-#: highscore/kscoredialog.cpp:167
+#: kchatbase.cpp:387
 #, c-format
-msgid "#%1"
-msgstr "#%1"
-
-#: highscore/kscoredialog.cpp:351
-msgid ""
-"Excellent!\n"
-"You have a new high score!"
-msgstr ""
-"Ardderchog!\n"
-" Mae gennych sgôr gorau newydd!"
-
-#: highscore/kscoredialog.cpp:353
-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:139
-msgid "Best &Scores"
-msgstr "Sgorau G&orau"
-
-#: highscore/kexthighscore_gui.cpp:144
-msgid "&Players"
-msgstr "Ch&waraewyr"
-
-#: highscore/kexthighscore_gui.cpp:149
-msgid "Statistics"
-msgstr "Ystadegau"
-
-#: highscore/kexthighscore_gui.cpp:155
-msgid "Histogram"
-msgstr "Histogram"
-
-#: highscore/kexthighscore_gui.cpp:162
-msgid "View world-wide highscores"
-msgstr "Gweld sgorau gorau byd-eang"
-
-#: highscore/kexthighscore_gui.cpp:169
-msgid "View world-wide players"
-msgstr "Gweld chwaraewyr byd-eang"
-
-#: highscore/kexthighscore_gui.cpp:202
-msgid "Highscores"
-msgstr "Sgorau Gorau"
-
-#: highscore/kexthighscore_gui.cpp:204
-msgid "Configure..."
-msgstr "Ffurfweddu..."
-
-#: highscore/kexthighscore_gui.cpp:205
-msgid "Export..."
-msgstr "Allforio..."
-
-#: highscore/kexthighscore_gui.cpp:258
-msgid "Overwrite"
-msgstr "Trosysgrifo"
-
-#: highscore/kexthighscore_gui.cpp:260
-msgid "The file already exists. Overwrite?"
-msgstr "Mae'r ffeil mewn bod eisoes.  Trosysgrifo?"
-
-#: highscore/kexthighscore_gui.cpp:302
-msgid "Winner"
-msgstr "Enillydd"
-
-#: highscore/kexthighscore_gui.cpp:334
-msgid "Won Games"
-msgstr "Enillodd Gemau"
-
-#: highscore/kexthighscore_gui.cpp:356
-msgid "Configure Highscores"
-msgstr "Ffurfweddu Sgorau Gorau"
-
-#: highscore/kexthighscore_gui.cpp:367
-msgid "Main"
-msgstr "Prif"
-
-#: highscore/kexthighscore_gui.cpp:376 highscore/kexthighscore_gui.cpp:413
-msgid "Nickname:"
-msgstr "Ffugenw:"
-
-#: highscore/kexthighscore_gui.cpp:387
-msgid "Comment:"
-msgstr "Sylwad:"
-
-#: highscore/kexthighscore_gui.cpp:397
-msgid "World-wide highscores enabled"
-msgstr "Alluogir sgorau gorau byd-eang"
-
-#: highscore/kexthighscore_gui.cpp:404
-msgid "Advanced"
-msgstr "Uwch"
-
-#: highscore/kexthighscore_gui.cpp:408
-msgid "Registration Data"
-msgstr "Data Cofrestru"
-
-#: highscore/kexthighscore_gui.cpp:417
-msgid "Key:"
-msgstr "Allwedd:"
-
-#: highscore/kexthighscore_gui.cpp:456
-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."
-
-#: highscore/kexthighscore_gui.cpp:499
-msgid "Please choose a non empty nickname."
-msgstr "Dewiswch ffugenw nad yw'n wag."
-
-#: highscore/kexthighscore_gui.cpp:503
-msgid "Nickname already in use. Please choose another one"
-msgstr "Mae'r ffugenw mewn defnydd eisoes. Dewiswch un arall"
-
-#: highscore/kexthighscore_gui.cpp:520
-msgid "Enter Your Nickname"
-msgstr "Rhowch eich Ffugenw"
-
-#: highscore/kexthighscore_gui.cpp:528
-msgid "Congratulations, you have won!"
-msgstr "Llongyfarchiadau, rydych wedi ennill!"
-
-#: highscore/kexthighscore_gui.cpp:532
-msgid "Enter your nickname:"
-msgstr "Rhowch eich ffugenw:"
-
-#: highscore/kexthighscore_gui.cpp:540
-msgid "Do not ask again."
-msgstr "Paid â gofyn eto."
-
-#: highscore/kexthighscore.cpp:214
-msgid "Mean Score"
-msgstr "Sgôr Cymedrig"
-
-#: highscore/kexthighscore.cpp:219
-msgid "Best Score"
-msgstr "Sgôr Gorau"
-
-#: highscore/kexthighscore.cpp:223
-msgid "Elapsed Time"
-msgstr "Amser Aeth Heibio"
+msgid "--- %1"
+msgstr "--- %1"
 
 #: highscore/kexthighscore_internal.cpp:48
 msgid "anonymous"
@@ -917,10 +850,75 @@ msgstr "Ateb crai: %1"
 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)."
 
+#: highscore/kexthighscore_internal.h:49 highscore/kscoredialog.cpp:141
+msgid "Rank"
+msgstr "Gradd"
+
+#: highscore/kexthighscore_internal.h:69 highscore/kscoredialog.cpp:83
+msgid "Date"
+msgstr "Dyddiad"
+
 #: highscore/kexthighscore_internal.h:78
 msgid "Success"
 msgstr "Llwyddiant"
 
+#: highscore/khighscore.cpp:134
+msgid "Retry"
+msgstr "Ailgeisio"
+
+#: highscore/khighscore.cpp:135
+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."
+
+#: highscore/kexthighscore.cpp:211 highscore/kscoredialog.cpp:89
+msgid "Score"
+msgstr "Sgôr"
+
+#: highscore/kexthighscore.cpp:214
+msgid "Mean Score"
+msgstr "Sgôr Cymedrig"
+
+#: highscore/kexthighscore.cpp:219
+msgid "Best Score"
+msgstr "Sgôr Gorau"
+
+#: highscore/kexthighscore.cpp:223
+msgid "Elapsed Time"
+msgstr "Amser Aeth Heibio"
+
+#: highscore/kscoredialog.cpp:68
+msgid "High Scores"
+msgstr "Sgorau Gorau"
+
+#: highscore/kscoredialog.cpp:86
+msgid "Level"
+msgstr "Lefel"
+
+#: highscore/kscoredialog.cpp:167
+#, c-format
+msgid "#%1"
+msgstr "#%1"
+
+#: highscore/kscoredialog.cpp:351
+msgid ""
+"Excellent!\n"
+"You have a new high score!"
+msgstr ""
+"Ardderchog!\n"
+" Mae gennych sgôr gorau newydd!"
+
+#: highscore/kscoredialog.cpp:353
+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_item.cpp:272
 msgid "Multiplayers Scores"
 msgstr "Sgorau Aml-Chwaraewr"
@@ -997,115 +995,118 @@ msgstr "Cyfrif"
 msgid "Percent"
 msgstr "Canran"
 
-#: kcarddialog.cpp:277
-msgid "Choose Backside"
-msgstr "Dewis Ochr Gefn"
+#: highscore/kexthighscore_gui.cpp:139
+msgid "Best &Scores"
+msgstr "Sgorau G&orau"
 
-#: kcarddialog.cpp:297
-msgid "Backside"
-msgstr "Ochr Gefn"
+#: highscore/kexthighscore_gui.cpp:144
+msgid "&Players"
+msgstr "Ch&waraewyr"
 
-#: kcarddialog.cpp:301 kcarddialog.cpp:351
-msgid "empty"
-msgstr "gwag"
+#: highscore/kexthighscore_gui.cpp:149
+msgid "Statistics"
+msgstr "Ystadegau"
 
-#: kcarddialog.cpp:309
-msgid "Random backside"
-msgstr "Ochr Gefn Hap"
+#: highscore/kexthighscore_gui.cpp:155
+msgid "Histogram"
+msgstr "Histogram"
 
-#: kcarddialog.cpp:314
-msgid "Use global backside"
-msgstr "Defnyddio ochr gefn fyd-eang"
+#: highscore/kexthighscore_gui.cpp:162
+msgid "View world-wide highscores"
+msgstr "Gweld sgorau gorau byd-eang"
 
-#: kcarddialog.cpp:317
-msgid "Make Backside Global"
-msgstr "Gwneud yr Ochr Gefn yn Fyd-eang"
+#: highscore/kexthighscore_gui.cpp:169
+msgid "View world-wide players"
+msgstr "Gweld chwaraewyr byd-eang"
 
-#: kcarddialog.cpp:329
-msgid "Choose Frontside"
-msgstr "Dewis Ochr Flaen"
+#: highscore/kexthighscore_gui.cpp:202
+msgid "Highscores"
+msgstr "Sgorau Gorau"
 
-#: kcarddialog.cpp:347
-msgid "Frontside"
-msgstr "Ochr Flaen"
+#: highscore/kexthighscore_gui.cpp:204
+msgid "Configure..."
+msgstr "Ffurfweddu..."
 
-#: kcarddialog.cpp:359
-msgid "Random frontside"
-msgstr "Ochr Flaen Hap"
+#: highscore/kexthighscore_gui.cpp:205
+msgid "Export..."
+msgstr "Allforio..."
 
-#: kcarddialog.cpp:364
-msgid "Use global frontside"
-msgstr "Defnyddio ochr flaen fyd-eang"
+#: highscore/kexthighscore_gui.cpp:258
+msgid "Overwrite"
+msgstr "Trosysgrifo"
 
-#: kcarddialog.cpp:367
-msgid "Make Frontside Global"
-msgstr "Gwneud yr Ochr Flaen yn Fyd-eang"
+#: highscore/kexthighscore_gui.cpp:260
+msgid "The file already exists. Overwrite?"
+msgstr "Mae'r ffeil mewn bod eisoes.  Trosysgrifo?"
 
-#: kcarddialog.cpp:426
-msgid "Resize Cards"
-msgstr "Ailnewid Maint Cerdiau"
+#: highscore/kexthighscore_gui.cpp:302
+msgid "Winner"
+msgstr "Enillydd"
 
-#: kcarddialog.cpp:439
-msgid "Default Size"
-msgstr "Maint Rhagosodol"
+#: highscore/kexthighscore_gui.cpp:334
+msgid "Won Games"
+msgstr "Enillodd Gemau"
 
-#: kcarddialog.cpp:443
-msgid "Preview:"
-msgstr "Rhagolwg:"
+#: highscore/kexthighscore_gui.cpp:356
+msgid "Configure Highscores"
+msgstr "Ffurfweddu Sgorau Gorau"
 
-#: kcarddialog.cpp:476 kcarddialog.cpp:511
-msgid "unnamed"
-msgstr "di-enw"
+#: highscore/kexthighscore_gui.cpp:367
+msgid "Main"
+msgstr "Prif"
 
-#: kcarddialog.cpp:532
-msgid "Carddeck Selection"
-msgstr "Dewis Pecyn Cerdiau"
+#: highscore/kexthighscore_gui.cpp:376 highscore/kexthighscore_gui.cpp:413
+msgid "Nickname:"
+msgstr "Ffugenw:"
 
-#: kchatdialog.cpp:60 kchatdialog.cpp:68
-msgid "Configure Chat"
-msgstr "Ffurfweddu Sgwrs"
+#: highscore/kexthighscore_gui.cpp:387
+msgid "Comment:"
+msgstr "Sylwad:"
 
-#: kchatdialog.cpp:86 kchatdialog.cpp:108
-msgid "Name Font..."
-msgstr "Gwynebfath Enw..."
+#: highscore/kexthighscore_gui.cpp:397
+msgid "World-wide highscores enabled"
+msgstr "Alluogir sgorau gorau byd-eang"
 
-#: kchatdialog.cpp:89 kchatdialog.cpp:111
-msgid "Text Font..."
-msgstr "Gwynebfath Testun..."
+#: highscore/kexthighscore_gui.cpp:404
+msgid "Advanced"
+msgstr "Uwch"
 
-#: kchatdialog.cpp:98
-msgid "Player: "
-msgstr "Chwaraewr:"
+#: highscore/kexthighscore_gui.cpp:408
+msgid "Registration Data"
+msgstr "Data Cofrestru"
 
-#: kchatdialog.cpp:100
-msgid "This is a player message"
-msgstr "Neges chwaraewr yw hon"
+#: highscore/kexthighscore_gui.cpp:417
+msgid "Key:"
+msgstr "Allwedd:"
 
-#: kchatdialog.cpp:106
-msgid "System Messages - Messages directly sent from the game"
-msgstr "Negeseuon Cysawd - negeseuon a anfonir yn uniongyrchol o'r gêm"
+#: highscore/kexthighscore_gui.cpp:456
+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."
 
-#: kchatdialog.cpp:120
-msgid "--- Game: "
-msgstr "--- Gêm: "
+#: highscore/kexthighscore_gui.cpp:499
+msgid "Please choose a non empty nickname."
+msgstr "Dewiswch ffugenw nad yw'n wag."
 
-#: kchatdialog.cpp:122
-msgid "This is a system message"
-msgstr "Neges gysawd yw hon"
+#: highscore/kexthighscore_gui.cpp:503
+msgid "Nickname already in use. Please choose another one"
+msgstr "Mae'r ffugenw mewn defnydd eisoes. Dewiswch un arall"
 
-#: kchatdialog.cpp:126
-msgid "Maximal number of messages (-1 = unlimited):"
-msgstr "Nifer uchafsymol o negeseuon (-1 = anfeidrol):"
+#: highscore/kexthighscore_gui.cpp:520
+msgid "Enter Your Nickname"
+msgstr "Rhowch eich Ffugenw"
 
-#: kchatbase.cpp:232
-msgid "Send to All Players"
-msgstr "Anfon i bob chwaraewr"
+#: highscore/kexthighscore_gui.cpp:528
+msgid "Congratulations, you have won!"
+msgstr "Llongyfarchiadau, rydych wedi ennill!"
 
-#: kchatbase.cpp:371
-msgid "%1 %2"
-msgstr "%1 %2"
+#: highscore/kexthighscore_gui.cpp:532
+msgid "Enter your nickname:"
+msgstr "Rhowch eich ffugenw:"
 
-#: kchatbase.cpp:387
-#, c-format
-msgid "--- %1"
-msgstr "--- %1"
+#: highscore/kexthighscore_gui.cpp:540
+msgid "Do not ask again."
+msgstr "Paid â gofyn eto."
diff --git a/tde-i18n-cy/messages/tdegames/lskat.po b/tde-i18n-cy/messages/tdegames/lskat.po
index 370c54fba18..91ebfa2674a 100644
--- a/tde-i18n-cy/messages/tdegames/lskat.po
+++ b/tde-i18n-cy/messages/tdegames/lskat.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: lskat\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2005-10-16 11:37+0100\n"
 "Last-Translator: Kevin Donnelly <kevin@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -314,7 +315,8 @@ msgid "for"
 msgstr "ar gyfer"
 
 #: lskatview.cpp:306
-msgid "K D E"
+#, fuzzy
+msgid "T D E"
 msgstr "K D E "
 
 #: lskatview.cpp:407
diff --git a/tde-i18n-cy/messages/tdegames/twin4.po b/tde-i18n-cy/messages/tdegames/twin4.po
index cae1cc9f017..6055259313e 100644
--- a/tde-i18n-cy/messages/tdegames/twin4.po
+++ b/tde-i18n-cy/messages/tdegames/twin4.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: twin4\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2005-10-15 17:37+0100\n"
 "Last-Translator: Kevin Donnelly <kevin@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -30,190 +31,18 @@ msgid ""
 "Your emails"
 msgstr "kyfieithu@dotmon.com"
 
-#: twin4.cpp:67
-msgid "Chat Dlg"
-msgstr "Ymgom Sgwrsio"
-
-#: twin4.cpp:73
-msgid "Chat"
-msgstr "Sgwrsio"
-
-#: twin4.cpp:79
-msgid "Configure..."
-msgstr "Ffurfweddu..."
-
-#: twin4.cpp:192
-msgid "Start a new game"
-msgstr "Dechrau gêm newydd"
-
-#: twin4.cpp:195
-msgid "Open a saved game..."
-msgstr "Agor gêm wedi'i chadw..."
-
-#: twin4.cpp:198
-msgid "Save a game..."
-msgstr "Cadw gêm..."
-
-#: twin4.cpp:201
-msgid "Ending the current game..."
-msgstr "Terfynu'r gêm gyfredol..."
-
-#: twin4.cpp:202
-msgid "Aborts a currently played game. No winner will be declared."
-msgstr ""
-"Erthylu'r gêm sy'n cael ei chwarae ar hyn o bryd.  Ni fydd ennillwr yn cael ei "
-"gyhoeddi."
-
-#: twin4.cpp:204
-msgid "&Network Configuration..."
-msgstr "Ffurfweddu &Rhwydwaith..."
-
-#: twin4.cpp:207
-msgid "Network Chat..."
-msgstr "Sgwrsio Rhwydwaith..."
-
-#: twin4.cpp:211
-msgid "Debug KGame"
-msgstr "Dadnamu KGame"
-
-#: twin4.cpp:214
-msgid "&Show Statistics"
-msgstr "&Dangos Ystadegau"
-
-#: twin4.cpp:216
-msgid "Show statistics."
-msgstr "Dangos ystadegau."
-
-#: twin4.cpp:219
-msgid "Shows a hint on how to move."
-msgstr "Dangos cynghoryn am sut i symud."
-
-#: twin4.cpp:222
-msgid "Quits the program."
-msgstr "Terfynu'r rhaglen."
-
-#: twin4.cpp:225
-msgid "Undo last move."
-msgstr "Dadwneud symudiad diwethaf."
-
-#: twin4.cpp:228
-msgid "Redo last move."
-msgstr "Ailwneud symudiad diwethaf."
-
-#: twin4.cpp:242 twin4.cpp:252
-msgid "Ready"
-msgstr "Parod"
-
-#: twin4.cpp:251
-msgid "This leaves space for the mover"
-msgstr "Mae hyn yn gadael lle i'r symudwr"
-
-#: twin4.cpp:254
-msgid "(c) Martin Heni   "
-msgstr "Hawlfraint (Copyright) Martin Heni"
-
-#: twin4.cpp:255
-msgid "Welcome to KWin4"
-msgstr "Croeso i KWin4"
-
-#: twin4.cpp:457
-msgid "No game  "
-msgstr "Dim gêm"
-
-#: twin4.cpp:459
-msgid " - Yellow "
-msgstr "- Melyn"
-
-#: twin4.cpp:461
-msgid " - Red "
-msgstr "- Coch"
-
-#: twin4.cpp:463
-msgid "Nobody  "
-msgstr "Neb"
-
-#: twin4.cpp:482
-msgid ""
-"The network game ended!\n"
-msgstr ""
-"Daeth y gêm rhwydwaith i ben!\n"
-
-#: twin4.cpp:493
-msgid "Game running..."
-msgstr "Gêm yn rhedeg..."
-
-#: twin4.cpp:504
-msgid "The game is drawn. Please restart next round."
-msgstr "Mae'r gêm yn gyfartal.  Ailgychwynnwch y rownd nesaf."
-
-#: twin4.cpp:512
-msgid "%1 won the game. Please restart next round."
-msgstr "Ennillodd %1 y gêm. Ailgychwynnwch y rownd nesaf. "
-
-#: twin4.cpp:518
-msgid " Game aborted. Please restart next round."
-msgstr "Erthylwyd y gêm.  Ailgychwynnwch y rownd nesaf."
-
-#: twin4.cpp:536
-msgid "Network Configuration"
-msgstr "Ffurfweddu Rhwydwaith"
-
-#: twin4.cpp:548
-msgid "Yellow should be played by remote"
-msgstr "Dylai Melyn gael ei chwarae gan yr un pell"
-
-#: twin4.cpp:549
-msgid "Red should be played by remote"
-msgstr "Dylai Coch gael ei chwarae gan yr un pell"
-
-#: twin4.cpp:621
-msgid "General"
-msgstr "Cyffredinol"
-
-#: twin4view.cpp:350
-msgid ""
-"_: 1. intro line, welcome to win4\n"
-"Welcome"
-msgstr "Croeso"
-
-#: twin4view.cpp:356
-msgid ""
-"_: 2. intro line, welcome to win4\n"
-"to"
-msgstr "i"
-
-#: twin4view.cpp:362
-msgid ""
-"_: 3. intro line, welcome to win4\n"
-"KWin4"
-msgstr "KWin4"
-
-#: twin4view.cpp:606
-msgid "Hold on... the other player has not been yet..."
-msgstr "Arhoswch am eiliad... Nid yw'r chwaraewr arall yn barod eto..."
-
-#: twin4view.cpp:607
-msgid "Hold your horses..."
-msgstr "Arhoswch am eiliad..."
-
-#: twin4view.cpp:608
-msgid "Ah ah ah... only one go at a time..."
-msgstr "Twt twt twt... 'mond un ar y tro..."
-
-#: twin4view.cpp:609
-msgid "Please wait... it is not your turn."
-msgstr "Arhoswch, newch chi... dim eich tro chi ydy o."
-
 #: main.cpp:30
 msgid "Enter debug level"
 msgstr "Mynd i'r lefel dadnamu"
 
 #: main.cpp:39
-msgid "KWin4"
+#, fuzzy
+msgid "TWin4"
 msgstr "KWin4"
 
 #: main.cpp:41
-msgid "KWin4: Two player network game"
+#, fuzzy
+msgid "TWin4: Two player network game"
 msgstr "KWin4: Gêm rwydwaith ar gyfer dau chwaraewr"
 
 #: main.cpp:45
@@ -457,3 +286,179 @@ msgstr "Enillwr"
 #: scorewidget.cpp:166
 msgid "Loser"
 msgstr "Collwr"
+
+#: twin4.cpp:67
+msgid "Chat Dlg"
+msgstr "Ymgom Sgwrsio"
+
+#: twin4.cpp:73
+msgid "Chat"
+msgstr "Sgwrsio"
+
+#: twin4.cpp:79
+msgid "Configure..."
+msgstr "Ffurfweddu..."
+
+#: twin4.cpp:192
+msgid "Start a new game"
+msgstr "Dechrau gêm newydd"
+
+#: twin4.cpp:195
+msgid "Open a saved game..."
+msgstr "Agor gêm wedi'i chadw..."
+
+#: twin4.cpp:198
+msgid "Save a game..."
+msgstr "Cadw gêm..."
+
+#: twin4.cpp:201
+msgid "Ending the current game..."
+msgstr "Terfynu'r gêm gyfredol..."
+
+#: twin4.cpp:202
+msgid "Aborts a currently played game. No winner will be declared."
+msgstr ""
+"Erthylu'r gêm sy'n cael ei chwarae ar hyn o bryd.  Ni fydd ennillwr yn cael ei "
+"gyhoeddi."
+
+#: twin4.cpp:204
+msgid "&Network Configuration..."
+msgstr "Ffurfweddu &Rhwydwaith..."
+
+#: twin4.cpp:207
+msgid "Network Chat..."
+msgstr "Sgwrsio Rhwydwaith..."
+
+#: twin4.cpp:211
+msgid "Debug KGame"
+msgstr "Dadnamu KGame"
+
+#: twin4.cpp:214
+msgid "&Show Statistics"
+msgstr "&Dangos Ystadegau"
+
+#: twin4.cpp:216
+msgid "Show statistics."
+msgstr "Dangos ystadegau."
+
+#: twin4.cpp:219
+msgid "Shows a hint on how to move."
+msgstr "Dangos cynghoryn am sut i symud."
+
+#: twin4.cpp:222
+msgid "Quits the program."
+msgstr "Terfynu'r rhaglen."
+
+#: twin4.cpp:225
+msgid "Undo last move."
+msgstr "Dadwneud symudiad diwethaf."
+
+#: twin4.cpp:228
+msgid "Redo last move."
+msgstr "Ailwneud symudiad diwethaf."
+
+#: twin4.cpp:242 twin4.cpp:252
+msgid "Ready"
+msgstr "Parod"
+
+#: twin4.cpp:251
+msgid "This leaves space for the mover"
+msgstr "Mae hyn yn gadael lle i'r symudwr"
+
+#: twin4.cpp:254
+msgid "(c) Martin Heni   "
+msgstr "Hawlfraint (Copyright) Martin Heni"
+
+#: twin4.cpp:255
+#, fuzzy
+msgid "Welcome to TWin4"
+msgstr "Croeso i KWin4"
+
+#: twin4.cpp:457
+msgid "No game  "
+msgstr "Dim gêm"
+
+#: twin4.cpp:459
+msgid " - Yellow "
+msgstr "- Melyn"
+
+#: twin4.cpp:461
+msgid " - Red "
+msgstr "- Coch"
+
+#: twin4.cpp:463
+msgid "Nobody  "
+msgstr "Neb"
+
+#: twin4.cpp:482
+msgid ""
+"The network game ended!\n"
+msgstr ""
+"Daeth y gêm rhwydwaith i ben!\n"
+
+#: twin4.cpp:493
+msgid "Game running..."
+msgstr "Gêm yn rhedeg..."
+
+#: twin4.cpp:504
+msgid "The game is drawn. Please restart next round."
+msgstr "Mae'r gêm yn gyfartal.  Ailgychwynnwch y rownd nesaf."
+
+#: twin4.cpp:512
+msgid "%1 won the game. Please restart next round."
+msgstr "Ennillodd %1 y gêm. Ailgychwynnwch y rownd nesaf. "
+
+#: twin4.cpp:518
+msgid " Game aborted. Please restart next round."
+msgstr "Erthylwyd y gêm.  Ailgychwynnwch y rownd nesaf."
+
+#: twin4.cpp:536
+msgid "Network Configuration"
+msgstr "Ffurfweddu Rhwydwaith"
+
+#: twin4.cpp:548
+msgid "Yellow should be played by remote"
+msgstr "Dylai Melyn gael ei chwarae gan yr un pell"
+
+#: twin4.cpp:549
+msgid "Red should be played by remote"
+msgstr "Dylai Coch gael ei chwarae gan yr un pell"
+
+#: twin4.cpp:621
+msgid "General"
+msgstr "Cyffredinol"
+
+#: twin4view.cpp:350
+msgid ""
+"_: 1. intro line, welcome to win4\n"
+"Welcome"
+msgstr "Croeso"
+
+#: twin4view.cpp:356
+msgid ""
+"_: 2. intro line, welcome to win4\n"
+"to"
+msgstr "i"
+
+#: twin4view.cpp:362
+#, fuzzy
+msgid ""
+"_: 3. intro line, welcome to win4\n"
+"TWin4"
+msgstr "KWin4"
+
+#: twin4view.cpp:606
+msgid "Hold on... the other player has not been yet..."
+msgstr "Arhoswch am eiliad... Nid yw'r chwaraewr arall yn barod eto..."
+
+#: twin4view.cpp:607
+msgid "Hold your horses..."
+msgstr "Arhoswch am eiliad..."
+
+#: twin4view.cpp:608
+msgid "Ah ah ah... only one go at a time..."
+msgstr "Twt twt twt... 'mond un ar y tro..."
+
+#: twin4view.cpp:609
+msgid "Please wait... it is not your turn."
+msgstr "Arhoswch, newch chi... dim eich tro chi ydy o."
diff --git a/tde-i18n-cy/messages/tdegraphics/kcm_kviewcanvasconfig.po b/tde-i18n-cy/messages/tdegraphics/kcm_kviewcanvasconfig.po
index d5437be3f65..f3b8572215a 100644
--- a/tde-i18n-cy/messages/tdegraphics/kcm_kviewcanvasconfig.po
+++ b/tde-i18n-cy/messages/tdegraphics/kcm_kviewcanvasconfig.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdegraphics/kcm_kviewcanvasconfig.po\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdegraphics/kcm_kviewgeneralconfig.po b/tde-i18n-cy/messages/tdegraphics/kcm_kviewgeneralconfig.po
index 1b09b03da78..ae414a0d378 100644
--- a/tde-i18n-cy/messages/tdegraphics/kcm_kviewgeneralconfig.po
+++ b/tde-i18n-cy/messages/tdegraphics/kcm_kviewgeneralconfig.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdegraphics/kcm_kviewgeneralconfig.po\n"
-"POT-Creation-Date: 2005-05-18 21:25+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdegraphics/kcm_kviewpluginsconfig.po b/tde-i18n-cy/messages/tdegraphics/kcm_kviewpluginsconfig.po
index a52640da5ab..e046378038e 100644
--- a/tde-i18n-cy/messages/tdegraphics/kcm_kviewpluginsconfig.po
+++ b/tde-i18n-cy/messages/tdegraphics/kcm_kviewpluginsconfig.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdegraphics/kcm_kviewpluginsconfig.po\n"
-"POT-Creation-Date: 2005-05-18 21:25+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdegraphics/kcm_kviewviewerpluginsconfig.po b/tde-i18n-cy/messages/tdegraphics/kcm_kviewviewerpluginsconfig.po
index 4217cf815b7..074af166288 100644
--- a/tde-i18n-cy/messages/tdegraphics/kcm_kviewviewerpluginsconfig.po
+++ b/tde-i18n-cy/messages/tdegraphics/kcm_kviewviewerpluginsconfig.po
@@ -2,10 +2,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: "
 "../cy/messages//tdegraphics/kcm_kviewviewerpluginsconfig.po\n"
-"POT-Creation-Date: 2005-05-18 21:25+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdegraphics/kcmkamera.po b/tde-i18n-cy/messages/tdegraphics/kcmkamera.po
index bbb7d08ed92..f4f6f7e3a3d 100644
--- a/tde-i18n-cy/messages/tdegraphics/kcmkamera.po
+++ b/tde-i18n-cy/messages/tdegraphics/kcmkamera.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdegraphics/kcmkamera.po\n"
-"POT-Creation-Date: 2007-05-28 02:15+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -68,92 +69,92 @@ msgid ""
 "<a href=\"camera:/\">camera:/</a> in Konqueror and other TDE applications."
 msgstr ""
 
-#: kameradevice.cpp:79
+#: kameradevice.cpp:81
 msgid "Could not allocate memory for abilities list."
 msgstr ""
 
-#: kameradevice.cpp:83
+#: kameradevice.cpp:85
 msgid "Could not load ability list."
 msgstr ""
 
-#: kameradevice.cpp:88 kameradevice.cpp:434 kameradevice.cpp:454
+#: kameradevice.cpp:90 kameradevice.cpp:443 kameradevice.cpp:463
 msgid ""
 "Description of abilities for camera %1 is not available. Configuration options "
 "may be incorrect."
 msgstr ""
 
-#: kameradevice.cpp:111
+#: kameradevice.cpp:113
 msgid "Could not access driver. Check your gPhoto2 installation."
 msgstr ""
 
-#: kameradevice.cpp:131
+#: kameradevice.cpp:133
 msgid ""
 "Unable to initialize camera. Check your port settings and camera connectivity "
 "and try again."
 msgstr ""
 
-#: kameradevice.cpp:155
+#: kameradevice.cpp:157
 msgid ""
 "No camera summary information is available.\n"
 msgstr ""
 
-#: kameradevice.cpp:168 kameradevice.cpp:178
+#: kameradevice.cpp:170 kameradevice.cpp:180
 msgid "Camera configuration failed."
 msgstr ""
 
-#: kameradevice.cpp:213 kameradevice.cpp:308 kameradevice.cpp:393
+#: kameradevice.cpp:215 kameradevice.cpp:310 kameradevice.cpp:402
 msgid "Serial"
 msgstr "Cyfresol"
 
-#: kameradevice.cpp:214 kameradevice.cpp:311 kameradevice.cpp:395
+#: kameradevice.cpp:216 kameradevice.cpp:313 kameradevice.cpp:404
 msgid "USB"
 msgstr "USB"
 
-#: kameradevice.cpp:215
+#: kameradevice.cpp:217
 msgid "Unknown port"
 msgstr ""
 
-#: kameradevice.cpp:274
+#: kameradevice.cpp:276
 msgid "Select Camera Device"
 msgstr ""
 
-#: kameradevice.cpp:291
+#: kameradevice.cpp:293
 msgid "Supported Cameras"
 msgstr ""
 
-#: kameradevice.cpp:302 kameradevice.cpp:333
+#: kameradevice.cpp:304 kameradevice.cpp:335
 msgid "Port"
 msgstr "Porth"
 
-#: kameradevice.cpp:304
+#: kameradevice.cpp:306
 msgid "Port Settings"
 msgstr ""
 
-#: kameradevice.cpp:310
+#: kameradevice.cpp:312
 msgid ""
 "If this option is checked, the camera would have to be connected one of the "
 "serial ports (known as COM in Microsoft Windows) in your computer."
 msgstr ""
 
-#: kameradevice.cpp:313
+#: kameradevice.cpp:315
 msgid ""
 "If this option is checked, the camera would have to be connected to one of the "
 "USB slots in your computer or USB hub."
 msgstr ""
 
-#: kameradevice.cpp:320
+#: kameradevice.cpp:322
 msgid "No port type selected."
 msgstr ""
 
-#: kameradevice.cpp:326
+#: kameradevice.cpp:328
 msgid "Port:"
 msgstr "Porth:"
 
-#: kameradevice.cpp:328
+#: kameradevice.cpp:330
 msgid "Here you should choose the serial port you connect the camera to."
 msgstr ""
 
-#: kameradevice.cpp:336
+#: kameradevice.cpp:338
 msgid "No further configuration is required for USB."
 msgstr ""
 
diff --git a/tde-i18n-cy/messages/tdegraphics/kcoloredit.po b/tde-i18n-cy/messages/tdegraphics/kcoloredit.po
index 1232e951d76..62c5c05a90f 100644
--- a/tde-i18n-cy/messages/tdegraphics/kcoloredit.po
+++ b/tde-i18n-cy/messages/tdegraphics/kcoloredit.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdegraphics/kcoloredit.po\n"
-"POT-Creation-Date: 2006-06-05 03:59+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -142,7 +143,7 @@ msgid "File to open"
 msgstr "Ffeil i agor"
 
 #: main.cpp:44
-msgid "Rewrote UI code to be TDE standards compliant"
+msgid "Rewrote UI code to be KDE standards compliant"
 msgstr ""
 
 #. i18n: file kcoloreditui.rc line 12
diff --git a/tde-i18n-cy/messages/tdegraphics/kdjview.po b/tde-i18n-cy/messages/tdegraphics/kdjview.po
index 3e910e57b3e..f7aa3ad2b09 100644
--- a/tde-i18n-cy/messages/tdegraphics/kdjview.po
+++ b/tde-i18n-cy/messages/tdegraphics/kdjview.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2006-02-10 04:00+0100\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdegraphics/kdvi.po b/tde-i18n-cy/messages/tdegraphics/kdvi.po
index 86b61ed991d..0a6b1c0ea06 100644
--- a/tde-i18n-cy/messages/tdegraphics/kdvi.po
+++ b/tde-i18n-cy/messages/tdegraphics/kdvi.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdegraphics/kdvi.po\n"
-"POT-Creation-Date: 2008-07-08 01:19+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -269,35 +270,35 @@ msgstr ""
 msgid "Starting the editor..."
 msgstr ""
 
-#: dviRenderer_draw.cpp:269
+#: dviRenderer_draw.cpp:270
 msgid "The DVI code set a character of an unknown font."
 msgstr ""
 
-#: dviRenderer_draw.cpp:294 dviRenderer_prescan.cpp:636
+#: dviRenderer_draw.cpp:295 dviRenderer_prescan.cpp:636
 msgid "The DVI code referred to font #%1, which was not previously defined."
 msgstr ""
 
-#: dviRenderer_draw.cpp:379
+#: dviRenderer_draw.cpp:380
 msgid "The stack was not empty when the EOP command was encountered."
 msgstr ""
 
-#: dviRenderer_draw.cpp:391
+#: dviRenderer_draw.cpp:392
 msgid "The stack was empty when a POP command was encountered."
 msgstr ""
 
-#: dviRenderer_draw.cpp:515 dviRenderer_draw.cpp:524
+#: dviRenderer_draw.cpp:516 dviRenderer_draw.cpp:525
 msgid "The DVI code referred to a font which was not previously defined."
 msgstr ""
 
-#: dviRenderer_draw.cpp:564
+#: dviRenderer_draw.cpp:565
 msgid "An illegal command was encountered."
 msgstr ""
 
-#: dviRenderer_draw.cpp:569
+#: dviRenderer_draw.cpp:570
 msgid "The unknown op-code %1 was encountered."
 msgstr ""
 
-#: dviRenderer_export.cpp:83
+#: dviRenderer_export.cpp:84
 msgid ""
 "KDVI could not locate the program 'dvipdfm' on your computer. That program is "
 "essential for the export function to work. You can, however, convert the "
@@ -309,65 +310,65 @@ msgid ""
 "when looking for programs."
 msgstr ""
 
-#: dviRenderer_export.cpp:98
+#: dviRenderer_export.cpp:99
 msgid "*.pdf|Portable Document Format (*.pdf)"
 msgstr ""
 
-#: dviRenderer_export.cpp:98 dviRenderer_export.cpp:197
+#: dviRenderer_export.cpp:99 dviRenderer_export.cpp:198
 msgid "Export File As"
 msgstr "Allforio Ffeil Fel"
 
-#: dviRenderer_export.cpp:103 dviRenderer_export.cpp:202
+#: dviRenderer_export.cpp:104 dviRenderer_export.cpp:203
 #: kdvi_multipage.cpp:164
 msgid ""
 "The file %1\n"
 "exists. Do you want to overwrite that file?"
 msgstr ""
 
-#: dviRenderer_export.cpp:104 dviRenderer_export.cpp:203
+#: dviRenderer_export.cpp:105 dviRenderer_export.cpp:204
 #: kdvi_multipage.cpp:165
 msgid "Overwrite File"
 msgstr "Trosysgrifo Ffeil"
 
-#: dviRenderer_export.cpp:104 kdvi_multipage.cpp:165
+#: dviRenderer_export.cpp:105 kdvi_multipage.cpp:165
 msgid "Overwrite"
 msgstr "Trosysgrifo"
 
-#: dviRenderer_export.cpp:111
+#: dviRenderer_export.cpp:112
 msgid "Using dvipdfm to export the file to PDF"
 msgstr ""
 
-#: dviRenderer_export.cpp:113
+#: dviRenderer_export.cpp:114
 msgid ""
 "KDVI is currently using the external program 'dvipdfm' to convert your DVI-file "
 "to PDF. Sometimes that can take a while because dvipdfm needs to generate its "
 "own bitmap fonts Please be patient."
 msgstr ""
 
-#: dviRenderer_export.cpp:117
+#: dviRenderer_export.cpp:118
 msgid "Waiting for dvipdfm to finish..."
 msgstr ""
 
-#: dviRenderer_export.cpp:118
+#: dviRenderer_export.cpp:119
 msgid "dvipdfm progress dialog"
 msgstr ""
 
-#: dviRenderer_export.cpp:120 dviRenderer_export.cpp:223
+#: dviRenderer_export.cpp:121 dviRenderer_export.cpp:224
 msgid "Please be patient"
 msgstr ""
 
-#: dviRenderer_export.cpp:136
+#: dviRenderer_export.cpp:137
 msgid ""
 "<qt>The external program 'dvipdf', which was used to export the file, reported "
 "an error. You might wish to look at the <strong>document info dialog</strong> "
 "which you will find in the File-Menu for a precise error report.</qt>"
 msgstr ""
 
-#: dviRenderer_export.cpp:139
+#: dviRenderer_export.cpp:140
 msgid "Export: %1 to PDF"
 msgstr ""
 
-#: dviRenderer_export.cpp:180
+#: dviRenderer_export.cpp:181
 msgid ""
 "<qt><P>This DVI file refers to external graphic files which are not in "
 "PostScript format, and cannot be handled by the <strong>dvips</strong> "
@@ -380,41 +381,41 @@ msgid ""
 "complain, the missing functionality might later be added.</p></qt>"
 msgstr ""
 
-#: dviRenderer_export.cpp:187
+#: dviRenderer_export.cpp:188
 msgid "Functionality Unavailable"
 msgstr ""
 
-#: dviRenderer_export.cpp:197
+#: dviRenderer_export.cpp:198
 msgid "*.ps|PostScript (*.ps)"
 msgstr ""
 
-#: dviRenderer_export.cpp:214
+#: dviRenderer_export.cpp:215
 msgid "Using dvips to export the file to PostScript"
 msgstr ""
 
-#: dviRenderer_export.cpp:216
+#: dviRenderer_export.cpp:217
 msgid ""
 "KDVI is currently using the external program 'dvips' to convert your DVI-file "
 "to PostScript. Sometimes that can take a while because dvips needs to generate "
 "its own bitmap fonts Please be patient."
 msgstr ""
 
-#: dviRenderer_export.cpp:220
+#: dviRenderer_export.cpp:221
 msgid "Waiting for dvips to finish..."
 msgstr ""
 
-#: dviRenderer_export.cpp:221
+#: dviRenderer_export.cpp:222
 msgid "dvips progress dialog"
 msgstr ""
 
-#: dviRenderer_export.cpp:299
+#: dviRenderer_export.cpp:300
 msgid ""
 "<qt>The external program 'dvips', which was used to export the file, reported "
 "an error. You might wish to look at the <strong>document info dialog</strong> "
 "which you will find in the File-Menu for a precise error report.</qt>"
 msgstr ""
 
-#: dviRenderer_export.cpp:302
+#: dviRenderer_export.cpp:303
 msgid "Export: %1 to PostScript"
 msgstr ""
 
@@ -952,7 +953,7 @@ msgid ""
 "line argument that would allow KDVI to specify the exact line which you wish to "
 "edit.</p>\n"
 "<p>If you feel that KDVI's support for a certain editor is inadequate, please "
-"write to kebekus@kde.org.</p>"
+"contact the Trinity developers at www.trinitydesktop.org.</p>"
 msgstr ""
 
 #. i18n: file optionDialogSpecialWidget_base.ui line 135
@@ -1060,55 +1061,17 @@ msgstr ""
 msgid "The special command '%1' is not implemented."
 msgstr ""
 
-#: tips.cpp:3
-msgid ""
-"<p>...that KDVI can also load compressed DVI-files? \n"
-msgstr ""
-
-#: tips.cpp:8
-msgid ""
-"<p>...that you can mark text with the right mouse button and paste it\n"
-"into any application?\n"
-msgstr ""
-
-#: tips.cpp:14
-msgid ""
-"<p>...that KDVI now supports inverse search? You can click into your DVI file \n"
-"with the middle mouse button and your editor opens, loads the TeX file, and\n"
-"jumps to the proper line! <a href=\"help:/kdvi/inverse-search.html\">The \n"
-"manual explains how to set up your editor for this.</a> \n"
-msgstr ""
-
-#: tips.cpp:22
-msgid ""
-"<p>...that KDVI supports forward search? If you use Emacs or XEmacs, you can \n"
-"jump directly from the TeX file to the associated place in the DVI file. \n"
-"<a href=\"help:/kdvi/forward-search.html\">The manual explains how to set up \n"
-"your editor for this.</a> \n"
-msgstr ""
-
-#: tips.cpp:30
-msgid ""
-"<p>...that KDVI now offers full text search? \n"
-msgstr ""
-
-#: tips.cpp:35
-msgid ""
-"<p>...that KDVI can save your DVI file as PostScript, PDF, and even plain text? "
-"\n"
-msgstr ""
-
-#: util.cpp:73
+#: util.cpp:75
 msgid "Fatal Error! "
 msgstr "Gwall Angheuol ! "
 
-#: util.cpp:76
+#: util.cpp:78
 msgid ""
 "Fatal error.\n"
 "\n"
 msgstr ""
 
-#: util.cpp:78
+#: util.cpp:80
 msgid ""
 "\n"
 "\n"
@@ -1149,6 +1112,44 @@ msgstr ""
 msgid "Wrong command byte found in VF macro list: %1"
 msgstr ""
 
+#: tips.txt:3
+msgid ""
+"<p>...that KDVI can also load compressed DVI-files? \n"
+msgstr ""
+
+#: tips.txt:8
+msgid ""
+"<p>...that you can mark text with the right mouse button and paste it\n"
+"into any application?\n"
+msgstr ""
+
+#: tips.txt:14
+msgid ""
+"<p>...that KDVI now supports inverse search? You can click into your DVI file \n"
+"with the middle mouse button and your editor opens, loads the TeX file, and\n"
+"jumps to the proper line! <a href=\"help:/kdvi/inverse-search.html\">The \n"
+"manual explains how to set up your editor for this.</a> \n"
+msgstr ""
+
+#: tips.txt:22
+msgid ""
+"<p>...that KDVI supports forward search? If you use Emacs or XEmacs, you can \n"
+"jump directly from the TeX file to the associated place in the DVI file. \n"
+"<a href=\"help:/kdvi/forward-search.html\">The manual explains how to set up \n"
+"your editor for this.</a> \n"
+msgstr ""
+
+#: tips.txt:30
+msgid ""
+"<p>...that KDVI now offers full text search? \n"
+msgstr ""
+
+#: tips.txt:35
+msgid ""
+"<p>...that KDVI can save your DVI file as PostScript, PDF, and even plain text? "
+"\n"
+msgstr ""
+
 #~ msgid "Text..."
 #~ msgstr "Testun..."
 
diff --git a/tde-i18n-cy/messages/tdegraphics/kfax.po b/tde-i18n-cy/messages/tdegraphics/kfax.po
index 4aea5c91ac3..83acd708243 100644
--- a/tde-i18n-cy/messages/tdegraphics/kfax.po
+++ b/tde-i18n-cy/messages/tdegraphics/kfax.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdegraphics/kfax.po\n"
-"POT-Creation-Date: 2006-11-13 02:37+0100\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -29,11 +30,11 @@ msgstr ""
 msgid "Auto"
 msgstr "Ymysgogol"
 
-#: kfax.cpp:1453 options.cpp:107
+#: kfax.cpp:1454 options.cpp:107
 msgid "Fine"
 msgstr "Main"
 
-#: kfax.cpp:1453 options.cpp:111
+#: kfax.cpp:1454 options.cpp:111
 msgid "Normal"
 msgstr "Arferol"
 
@@ -57,142 +58,142 @@ msgstr ""
 msgid "Height:"
 msgstr "Taldra:"
 
-#: kfax.cpp:246
+#: kfax.cpp:247
 msgid "A&dd..."
 msgstr "Yc&hwanegu..."
 
-#: kfax.cpp:258
+#: kfax.cpp:259
 msgid "&Rotate Page"
 msgstr ""
 
-#: kfax.cpp:260
+#: kfax.cpp:261
 msgid "Mirror Page"
 msgstr ""
 
-#: kfax.cpp:262
+#: kfax.cpp:263
 msgid "&Flip Page"
 msgstr ""
 
-#: kfax.cpp:281
+#: kfax.cpp:282
 msgid "w: 00000 h: 00000"
 msgstr ""
 
-#: kfax.cpp:282
+#: kfax.cpp:283
 msgid "Res: XXXXX"
 msgstr ""
 
-#: kfax.cpp:283
+#: kfax.cpp:284
 msgid "Type: XXXXXXX"
 msgstr ""
 
-#: kfax.cpp:284
+#: kfax.cpp:285
 msgid "Page: XX of XX"
 msgstr ""
 
-#: kfax.cpp:694
+#: kfax.cpp:695
 msgid "There is no document active."
 msgstr ""
 
-#: kfax.cpp:703 kfax.cpp:704 kfax.cpp:1376 kfax.cpp:1651
+#: kfax.cpp:704 kfax.cpp:705 kfax.cpp:1377 kfax.cpp:1652
 msgid "KFax"
 msgstr "KFfacs"
 
-#: kfax.cpp:827
+#: kfax.cpp:828
 msgid "Saving..."
 msgstr "Cadw..."
 
-#: kfax.cpp:835
+#: kfax.cpp:836
 msgid ""
 "Failure in 'copy file()'\n"
 "Could not save file!"
 msgstr ""
 
-#: kfax.cpp:849
+#: kfax.cpp:850
 msgid "Loading '%1'"
 msgstr "Llwytho... '%1'"
 
-#: kfax.cpp:856
+#: kfax.cpp:857
 msgid "Downloading..."
 msgstr "Lawrlwytho ..."
 
-#: kfax.cpp:1444
+#: kfax.cpp:1445
 msgid "Page: %1 of %2"
 msgstr ""
 
-#: kfax.cpp:1449
+#: kfax.cpp:1450
 msgid "W: %1 H: %2"
 msgstr ""
 
-#: kfax.cpp:1453
+#: kfax.cpp:1454
 #, c-format
 msgid "Res: %1"
 msgstr ""
 
-#: kfax.cpp:1462
+#: kfax.cpp:1463
 msgid "Type: Tiff "
 msgstr ""
 
-#: kfax.cpp:1465
+#: kfax.cpp:1466
 msgid "Type: Raw "
 msgstr ""
 
-#: kfax.cpp:1622
+#: kfax.cpp:1623
 msgid "TDE G3/G4 Fax Viewer"
 msgstr ""
 
-#: kfax.cpp:1627
+#: kfax.cpp:1628
 msgid "Fine resolution"
 msgstr ""
 
-#: kfax.cpp:1629
+#: kfax.cpp:1630
 msgid "Normal resolution"
 msgstr ""
 
-#: kfax.cpp:1630
+#: kfax.cpp:1631
 msgid "Height (number of fax lines)"
 msgstr ""
 
-#: kfax.cpp:1632
+#: kfax.cpp:1633
 msgid "Width (dots per fax line)"
 msgstr ""
 
-#: kfax.cpp:1634
+#: kfax.cpp:1635
 msgid "Turn image 90 degrees (landscape mode)"
 msgstr ""
 
-#: kfax.cpp:1636
+#: kfax.cpp:1637
 msgid "Turn image upside down"
 msgstr ""
 
-#: kfax.cpp:1638
+#: kfax.cpp:1639
 msgid "Invert black and white"
 msgstr ""
 
-#: kfax.cpp:1640
+#: kfax.cpp:1641
 msgid "Limit memory use to 'bytes'"
 msgstr ""
 
-#: kfax.cpp:1642
+#: kfax.cpp:1643
 msgid "Fax data is packed lsb first"
 msgstr ""
 
-#: kfax.cpp:1643
+#: kfax.cpp:1644
 msgid "Raw files are g3-2d"
 msgstr ""
 
-#: kfax.cpp:1644
+#: kfax.cpp:1645
 msgid "Raw files are g4"
 msgstr ""
 
-#: kfax.cpp:1645
+#: kfax.cpp:1646
 msgid "Fax file(s) to show"
 msgstr ""
 
-#: kfax.cpp:1655
+#: kfax.cpp:1656
 msgid "UI Rewrite, lots of code cleanups and fixes"
 msgstr ""
 
-#: kfax.cpp:1657
+#: kfax.cpp:1658
 msgid "Printing Rewrite, lots of code cleanups and fixes"
 msgstr ""
 
diff --git a/tde-i18n-cy/messages/tdegraphics/kfaxview.po b/tde-i18n-cy/messages/tdegraphics/kfaxview.po
index 6dc01f21e1f..7544aad27af 100644
--- a/tde-i18n-cy/messages/tdegraphics/kfaxview.po
+++ b/tde-i18n-cy/messages/tdegraphics/kfaxview.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2005-10-15 02:46+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdegraphics/kgamma.po b/tde-i18n-cy/messages/tdegraphics/kgamma.po
index af4e5798bcd..9ed681344ed 100644
--- a/tde-i18n-cy/messages/tdegraphics/kgamma.po
+++ b/tde-i18n-cy/messages/tdegraphics/kgamma.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdegraphics/kgamma.po\n"
-"POT-Creation-Date: 2006-09-24 02:37+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -54,7 +55,7 @@ msgid "Blue:"
 msgstr "Glas:"
 
 #: kgamma.cpp:258
-msgid "Save settings to XF86Config"
+msgid "Save settings to X-Server Config"
 msgstr ""
 
 #: kgamma.cpp:261
diff --git a/tde-i18n-cy/messages/tdegraphics/kghostview.po b/tde-i18n-cy/messages/tdegraphics/kghostview.po
index 3743e7138f2..b94fa47d66c 100644
--- a/tde-i18n-cy/messages/tdegraphics/kghostview.po
+++ b/tde-i18n-cy/messages/tdegraphics/kghostview.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdegraphics/kghostview.po\n"
-"POT-Creation-Date: 2008-07-08 01:19+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -607,43 +608,55 @@ msgid ""
 "If this is on, then the file will be reloaded whenever it changes on disk"
 msgstr ""
 
-#. i18n: file kghostview.kcfg line 52
+#. i18n: file kghostview.kcfg line 50
 #: rc.cpp:109
 #, no-c-format
-msgid "The ghostscript interpreter to use"
+msgid "Retain document viewing data"
 msgstr ""
 
-#. i18n: file kghostview.kcfg line 53
+#. i18n: file kghostview.kcfg line 51
 #: rc.cpp:112
 #, no-c-format
+msgid "If this is on, then document viewing options are retained"
+msgstr ""
+
+#. i18n: file kghostview.kcfg line 57
+#: rc.cpp:115
+#, no-c-format
+msgid "The ghostscript interpreter to use"
+msgstr ""
+
+#. i18n: file kghostview.kcfg line 58
+#: rc.cpp:118
+#, no-c-format
 msgid ""
 "Kghostview does not, itself, display the document: it relies on ghostscript, "
 "and therefore needs it to be available. Here you can define the ghostscript "
 "interpreter to use."
 msgstr ""
 
-#. i18n: file kghostview.kcfg line 57
-#: rc.cpp:115
+#. i18n: file kghostview.kcfg line 62
+#: rc.cpp:121
 #, no-c-format
 msgid "Arguments for ghostscript if running with antialiasing"
 msgstr ""
 
-#. i18n: file kghostview.kcfg line 67
-#: rc.cpp:118
+#. i18n: file kghostview.kcfg line 72
+#: rc.cpp:124
 #, no-c-format
 msgid "This is the ghostscript version you are running"
 msgstr ""
 
-#. i18n: file kghostview.kcfg line 68
-#: rc.cpp:121
+#. i18n: file kghostview.kcfg line 73
+#: rc.cpp:127
 #, no-c-format
 msgid ""
 "This is the version of ghostscript you are running. Normally you will not need "
 "to change this since it gets detected automatically."
 msgstr ""
 
-#. i18n: file kghostview.kcfg line 71
-#: rc.cpp:124
+#. i18n: file kghostview.kcfg line 76
+#: rc.cpp:130
 #, no-c-format
 msgid "This is an internal setting"
 msgstr ""
diff --git a/tde-i18n-cy/messages/tdegraphics/kmrml.po b/tde-i18n-cy/messages/tdegraphics/kmrml.po
index 98816bc805a..958d3b9f50d 100644
--- a/tde-i18n-cy/messages/tdegraphics/kmrml.po
+++ b/tde-i18n-cy/messages/tdegraphics/kmrml.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdegraphics/kmrml.po\n"
-"POT-Creation-Date: 2006-11-25 02:35+0100\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdegraphics/kolourpaint.po b/tde-i18n-cy/messages/tdegraphics/kolourpaint.po
index 52e39c7e654..d7b494ca556 100644
--- a/tde-i18n-cy/messages/tdegraphics/kolourpaint.po
+++ b/tde-i18n-cy/messages/tdegraphics/kolourpaint.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdegraphics/kolourpaint.po\n"
-"POT-Creation-Date: 2007-10-23 01:13+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -435,16 +436,17 @@ msgstr ""
 msgid ""
 "<p>To acquire a screenshot, press <b>%1</b>.  The screenshot will be placed "
 "into the clipboard and you will be able to paste it in KolourPaint.</p>"
-"<p>You may configure the <b>Desktop Screenshot</b> shortcut in the TDE Control "
-"Center module <a href=\"configure kde shortcuts\">Keyboard Shortcuts</a>.</p>"
+"<p>You may configure the <b>Desktop Screenshot</b> shortcut in the Trinity "
+"Control Center module <a href=\"configure kde shortcuts\">Keyboard Shortcuts</a>"
+".</p>"
 "<p>Alternatively, you may try the application <a href=\"run ksnapshot\">"
 "KSnapshot</a>.</p>"
 msgstr ""
 
 #: kpmainwindow_help.cpp:154
 msgid ""
-"<p>You do not appear to be running TDE.</p>"
-"<p>Once you have loaded TDE:"
+"<p>You do not appear to be running KDE.</p>"
+"<p>Once you have loaded KDE:"
 "<br>"
 "<blockquote>To acquire a screenshot, press <b>%1</b>"
 ".  The screenshot will be placed into the clipboard and you will be able to "
@@ -642,7 +644,7 @@ msgstr "Testun"
 msgid "Selection"
 msgstr "Dewisiad"
 
-#: kpthumbnail.cpp:157
+#: kpthumbnail.cpp:139
 msgid "Thumbnail"
 msgstr ""
 
diff --git a/tde-i18n-cy/messages/tdegraphics/kooka.po b/tde-i18n-cy/messages/tdegraphics/kooka.po
index 7e06d549003..f20c5816cd7 100644
--- a/tde-i18n-cy/messages/tdegraphics/kooka.po
+++ b/tde-i18n-cy/messages/tdegraphics/kooka.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdegraphics/kooka.po\n"
-"POT-Creation-Date: 2006-04-23 03:56+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -494,7 +495,7 @@ msgid "Version: "
 msgstr "Fersiwn : "
 
 #: kooka.cpp:97
-msgid "TDE Scanning"
+msgid "KDE Scanning"
 msgstr ""
 
 #: kooka.cpp:140
@@ -534,7 +535,7 @@ msgid "Mirror Image &Vertically"
 msgstr ""
 
 #: kooka.cpp:195
-msgid "&Mirror Image Horizontally"
+msgid "&Mirror ImageQt::Horizontally"
 msgstr ""
 
 #: kooka.cpp:199
diff --git a/tde-i18n-cy/messages/tdegraphics/kpdf.po b/tde-i18n-cy/messages/tdegraphics/kpdf.po
index bac2cdc12c3..3878a9e0390 100644
--- a/tde-i18n-cy/messages/tdegraphics/kpdf.po
+++ b/tde-i18n-cy/messages/tdegraphics/kpdf.po
@@ -1,223 +1,26 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdegraphics/kpdf.po\n"
-"POT-Creation-Date: 2008-07-23 01:41+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ui/presentationwidget.cpp:148
-#, c-format
-msgid "Title: %1"
-msgstr "Teitl: %1"
-
-#: ui/presentationwidget.cpp:150
-#, c-format
-msgid "Author: %1"
-msgstr "Awdur: %1"
-
-#: ui/presentationwidget.cpp:152
-#, c-format
-msgid "Pages: %1"
-msgstr "Tudalennau : %1"
-
-#: ui/presentationwidget.cpp:153
-msgid "Click to begin"
-msgstr ""
-
-#: ui/presentationwidget.cpp:329
-msgid ""
-"There are two ways of exiting presentation mode, you can press either ESC key "
-"or click with the quit button that appears when placing the mouse in the "
-"top-right corner. Of course you can cycle windows (Alt+TAB by default)"
-msgstr ""
-
-#: ui/thumbnaillist.cpp:568
-msgid "Show bookmarked pages only"
-msgstr ""
-
-#: ui/searchwidget.cpp:49
-msgid "Enter at least 3 letters to filter pages"
-msgstr ""
-
-#: ui/searchwidget.cpp:55
-msgid "Clear filter"
-msgstr "Gwagio hidlen"
-
-#: ui/searchwidget.cpp:59
-msgid "Case Sensitive"
-msgstr "Mae llythrennau mawr/bach o bwys"
-
-#: ui/searchwidget.cpp:61
-msgid "Match Phrase"
-msgstr ""
-
-#: ui/searchwidget.cpp:62
-msgid "Match All Words"
-msgstr ""
-
-#: ui/searchwidget.cpp:63
-msgid "Match Any Word"
-msgstr ""
-
-#: ui/searchwidget.cpp:68
-#, fuzzy
-msgid "Filter Options"
-msgstr "Dewisiadau Cyffredinol"
-
-#: ui/toc.cpp:59
-msgid "Topic"
-msgstr ""
-
-#: ui/pageview.cpp:257
-msgid "Fit to Page &Width"
-msgstr "Ffitio i &Led Tudalen"
-
-#: ui/pageview.cpp:260
-msgid "Fit to &Page"
-msgstr "Ffitio &i Dudalen"
-
-#: ui/pageview.cpp:263
-msgid "Fit to &Text"
-msgstr ""
-
-#: ui/pageview.cpp:267
-#, fuzzy
-msgid "&Two Pages"
-msgstr "Tudalennau"
-
-#: ui/pageview.cpp:271
-msgid "&Continuous"
-msgstr ""
-
-#: ui/pageview.cpp:276
-#, fuzzy
-msgid "&Browse Tool"
-msgstr "Erfyn &Chwyddo"
-
-#: ui/pageview.cpp:280
-msgid "&Zoom Tool"
-msgstr "Erfyn &Chwyddo"
-
-#: ui/pageview.cpp:283
-msgid "&Select Tool"
-msgstr "&Erfyn Dethol"
-
-#: ui/pageview.cpp:291
-msgid "Scroll Up"
-msgstr "Sgrolio i fyny"
-
-#: ui/pageview.cpp:294
-msgid "Scroll Down"
-msgstr "Sgrolio i lawr"
-
-#: ui/pageview.cpp:354
-#, c-format
+#: _translatorinfo.cpp:1
 msgid ""
-"_n:  Loaded a one-page document.\n"
-" Loaded a %n-page document."
-msgstr ""
-
-#: ui/pageview.cpp:654 ui/pageview.cpp:675 ui/pageview.cpp:1635
-msgid "Text found: \"%1\"."
-msgstr "Canfuwyd y testun: \"%1\"."
-
-#: ui/pageview.cpp:654 ui/pageview.cpp:1635
-msgid "Text not found: \"%1\"."
-msgstr "Ni chanfuwyd y testun: \"%1\"."
-
-#: ui/pageview.cpp:706
-msgid "Starting -- find text as you type"
-msgstr "Dechrau -- canfod testun wrth deipio"
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "KD wrth KGyfieithu"
 
-#: ui/pageview.cpp:1117
-#, c-format
+#: _translatorinfo.cpp:3
 msgid ""
-"_n: Text (1 character)\n"
-"Text (%n characters)"
-msgstr ""
-
-#: ui/pageview.cpp:1118 ui/pageview.cpp:1125
-msgid "Copy to Clipboard"
-msgstr "Copïo i'r Gludfwrdd"
-
-#: ui/pageview.cpp:1122
-msgid "Speak Text"
-msgstr ""
-
-#: ui/pageview.cpp:1124
-msgid "Image (%1 by %2 pixels)"
-msgstr ""
-
-#: ui/pageview.cpp:1126
-msgid "Save to File..."
-msgstr "Cadw i Ffeil..."
-
-#: ui/pageview.cpp:1144
-msgid "Image [%1x%2] copied to clipboard."
-msgstr ""
-
-#: ui/pageview.cpp:1151
-msgid "File not saved."
-msgstr ""
-
-#: ui/pageview.cpp:1158
-msgid "Image [%1x%2] saved to %3 file."
-msgstr ""
-
-#: ui/pageview.cpp:1187
-#, c-format
-msgid "Starting KTTSD Failed: %1"
-msgstr ""
-
-#: part.cpp:948 ui/pageview.cpp:1571
-#, fuzzy
-msgid "Fit Width"
-msgstr "Ffitio i &Led Tudalen"
-
-#: ui/pageview.cpp:1571
-msgid "Fit Page"
-msgstr ""
-
-#: ui/pageview.cpp:2003
-msgid "Find stopped."
-msgstr "Arhosodd y canfod."
-
-#: ui/pageview.cpp:2013
-msgid "Welcome"
-msgstr "Croeso"
-
-#: ui/pageview.cpp:2079
-msgid "Select zooming area. Right-click to zoom out."
-msgstr ""
-
-#: ui/pageview.cpp:2085
-msgid "Draw a rectangle around the text/graphics to copy."
-msgstr ""
-
-#: ui/propertiesdialog.cpp:23
-msgid "Unknown File"
-msgstr ""
-
-#: ui/propertiesdialog.cpp:32
-#, fuzzy
-msgid "No document opened."
-msgstr "Dogfen i'w hagor"
-
-#: ui/propertiesdialog.cpp:38
-msgid "%1 Properties"
-msgstr ""
-
-#: ui/propertiesdialog.cpp:53
-msgid "%1:"
-msgstr "%1 :"
-
-#: ui/propertiesdialog.cpp:66
-msgid "Pages:"
-msgstr "Tudalennau :"
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "kyfieithu@dotmon.com"
 
 #: conf/dlgperformance.ui.h:25
 msgid ""
@@ -269,277 +72,21 @@ msgstr "Cyflwyniad"
 msgid "Options for Presentation Mode"
 msgstr ""
 
-#: core/document.cpp:750
-msgid ""
-"End of document reached.\n"
-"Continue from the beginning?"
-msgstr ""
-" Wedi cyrraedd diwedd y ddogfen.\n"
-" Ail-ddechrau o'r dechrau?"
-
-#: core/document.cpp:796
-msgid "No matches found for '%1'."
-msgstr ""
-
-#: core/document.cpp:998 core/document.cpp:1006
-msgid ""
-"The pdf file is trying to execute an external application and for your safety "
-"kpdf does not allow that."
-msgstr ""
-
-#: core/document.cpp:1019
-#, c-format
-msgid "No application found for opening file of mimetype %1."
-msgstr ""
-
-#: core/generator_pdf/generator_pdf.cpp:144
-msgid "Please insert the password to read the document:"
-msgstr ""
-
-#: core/generator_pdf/generator_pdf.cpp:146
-#, fuzzy
-msgid "Incorrect password. Try again:"
-msgstr "Cyfrinair anghywir"
-
-#: core/generator_pdf/generator_pdf.cpp:200
-msgid "Title"
-msgstr "Teitl"
-
-#: core/generator_pdf/generator_pdf.cpp:201
-msgid "Subject"
-msgstr "Pwnc"
-
-#: core/generator_pdf/generator_pdf.cpp:202
-msgid "Author"
-msgstr "Awdur"
-
-#: core/generator_pdf/generator_pdf.cpp:203
-msgid "Keywords"
-msgstr "Allweddeiriau"
-
-#: core/generator_pdf/generator_pdf.cpp:204
-msgid "Creator"
-msgstr "Creuwr"
-
-#: core/generator_pdf/generator_pdf.cpp:205
-msgid "Producer"
-msgstr ""
-
-#: core/generator_pdf/generator_pdf.cpp:206
-msgid "Created"
-msgstr "Crëwyd"
-
-#: core/generator_pdf/generator_pdf.cpp:207
-msgid "Modified"
-msgstr "Addaswyd"
-
-#: core/generator_pdf/generator_pdf.cpp:211
-#, c-format
-msgid ""
-"_: PDF v. <version>\n"
-"PDF v. %1"
-msgstr ""
-
-#: core/generator_pdf/generator_pdf.cpp:212
-#: core/generator_pdf/generator_pdf.cpp:221
-msgid "Format"
-msgstr "Fformat"
-
-#: core/generator_pdf/generator_pdf.cpp:213
-msgid "Encrypted"
-msgstr ""
-
-#: core/generator_pdf/generator_pdf.cpp:213
-msgid "Unencrypted"
-msgstr ""
-
-#: core/generator_pdf/generator_pdf.cpp:214
-#: core/generator_pdf/generator_pdf.cpp:222
-msgid "Security"
-msgstr "Diogelwch"
-
-#: core/generator_pdf/generator_pdf.cpp:216
-#: core/generator_pdf/generator_pdf.cpp:223
-msgid "Optimized"
-msgstr ""
-
-#: core/generator_pdf/generator_pdf.cpp:217
-msgid "Pages"
-msgstr "Tudalennau"
-
-#: core/generator_pdf/generator_pdf.cpp:222
-msgid "Unknown Encryption"
-msgstr ""
-
-#: core/generator_pdf/generator_pdf.cpp:223
-msgid "Unknown Optimization"
-msgstr ""
-
-#: core/generator_pdf/generator_pdf.cpp:374
-msgid "Name"
-msgstr "Enw"
-
-#: core/generator_pdf/generator_pdf.cpp:375
-msgid "Type"
-msgstr "Math"
-
-#: core/generator_pdf/generator_pdf.cpp:376
-msgid "Embedded"
-msgstr ""
-
-#: core/generator_pdf/generator_pdf.cpp:486
-msgid ""
-"The margins you specified change the page aspect ratio. Do you want to print "
-"with the aspect ratio changed or do you want the margins to be adapted so that "
-"the aspect ratio is preserved?"
-msgstr ""
-
-#: core/generator_pdf/generator_pdf.cpp:487
-msgid "Aspect ratio change"
-msgstr ""
-
-#: core/generator_pdf/generator_pdf.cpp:488
-msgid "Print with specified margins"
-msgstr ""
-
-#: core/generator_pdf/generator_pdf.cpp:489
-msgid "Print adapting margins to keep aspect ratio"
-msgstr ""
-
-#: core/generator_pdf/generator_pdf.cpp:720
-msgid "unknown"
-msgstr "anhysbys"
-
-#: core/generator_pdf/generator_pdf.cpp:721
-msgid "Type 1"
-msgstr ""
-
-#: core/generator_pdf/generator_pdf.cpp:722
-msgid "Type 1C"
-msgstr ""
-
-#: core/generator_pdf/generator_pdf.cpp:723
-msgid ""
-"_: OT means OpenType\n"
-"Type 1C (OT)"
-msgstr ""
-
-#: core/generator_pdf/generator_pdf.cpp:724
-msgid "Type 3"
-msgstr ""
-
-#: core/generator_pdf/generator_pdf.cpp:725
-msgid "TrueType"
-msgstr "TrueType:"
-
-#: core/generator_pdf/generator_pdf.cpp:726
-msgid ""
-"_: OT means OpenType\n"
-"TrueType (OT)"
-msgstr ""
-
-#: core/generator_pdf/generator_pdf.cpp:727
-msgid "CID Type 0"
-msgstr ""
-
-#: core/generator_pdf/generator_pdf.cpp:728
-msgid "CID Type 0C"
+#: shell/shell.cpp:86
+msgid "Unable to find kpdf part."
 msgstr ""
 
-#: core/generator_pdf/generator_pdf.cpp:729
+#: shell/shell.cpp:132
 msgid ""
-"_: OT means OpenType\n"
-"CID Type 0C (OT)"
-msgstr ""
-
-#: core/generator_pdf/generator_pdf.cpp:730
-msgid "CID TrueType"
+"Click to open a file\n"
+"Click and hold to open a recent file"
 msgstr ""
 
-#: core/generator_pdf/generator_pdf.cpp:731
+#: shell/shell.cpp:152
 msgid ""
-"_: OT means OpenType\n"
-"CID TrueType (OT)"
-msgstr ""
-
-#: core/generator_pdf/generator_pdf.cpp:764
-#: core/generator_pdf/generator_pdf.cpp:766
-#: core/generator_pdf/generator_pdf.cpp:771
-msgid "-"
-msgstr "-"
-
-#: core/generator_pdf/generator_pdf.cpp:770
-msgid "[none]"
-msgstr ""
-
-#: core/generator_pdf/generator_pdf.cpp:791
-#: core/generator_pdf/generator_pdf.cpp:795
-#: core/generator_pdf/generator_pdf.cpp:809
-msgid "Unknown"
-msgstr "Anhysbys"
-
-#: core/generator_pdf/generator_pdf.cpp:817
-#: core/generator_pdf/generator_pdf.cpp:822
-#: core/generator_pdf/generator_pdf.cpp:831
-#: core/generator_pdf/generator_pdf.cpp:852
-msgid "Unknown Date"
-msgstr ""
-
-#: core/link.cpp:21
-#, fuzzy, c-format
-msgid "Go to page %1"
-msgstr "Tudalen %1"
-
-#: core/link.cpp:21
-msgid "Open external file"
-msgstr ""
-
-#: core/link.cpp:26
-msgid "Execute '%1'..."
-msgstr ""
-
-#: core/link.cpp:39
-#, fuzzy
-msgid "First Page"
-msgstr "Ffitio &i Dudalen"
-
-#: core/link.cpp:41
-msgid "Previous Page"
-msgstr ""
-
-#: core/link.cpp:43
-msgid "Next Page"
-msgstr ""
-
-#: core/link.cpp:45
-msgid "Last Page"
+"<b>Click</b> to open a file or <b>Click and hold</b> to select a recent file"
 msgstr ""
 
-#: core/link.cpp:49
-#, fuzzy
-msgid "Forward"
-msgstr "Fformat"
-
-#: core/link.cpp:53
-#, fuzzy
-msgid "Start Presentation"
-msgstr "Cyflwyniad"
-
-#: core/link.cpp:55
-#, fuzzy
-msgid "End Presentation"
-msgstr "Cyflwyniad"
-
-#: core/link.cpp:57
-#, fuzzy
-msgid "Find..."
-msgstr "..."
-
-#: core/link.cpp:59
-#, fuzzy
-msgid "Go To Page..."
-msgstr "Tudalennau"
-
 #: shell/main.cpp:22
 msgid "kpdf, a kde pdf viewer based on xpdf"
 msgstr ""
@@ -564,33 +111,6 @@ msgstr ""
 msgid "Icon"
 msgstr "Eicon"
 
-#: shell/shell.cpp:86
-msgid "Unable to find kpdf part."
-msgstr ""
-
-#: shell/shell.cpp:132
-msgid ""
-"Click to open a file\n"
-"Click and hold to open a recent file"
-msgstr ""
-
-#: shell/shell.cpp:152
-msgid ""
-"<b>Click</b> to open a file or <b>Click and hold</b> to select a recent file"
-msgstr ""
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "KD wrth KGyfieithu"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "kyfieithu@dotmon.com"
-
 #: part.cpp:82
 #, fuzzy
 msgid "PDF Options"
@@ -741,6 +261,11 @@ msgstr ""
 msgid "Add Bookmark"
 msgstr "Ychwanegu Tudnod"
 
+#: part.cpp:948 ui/pageview.cpp:1581
+#, fuzzy
+msgid "Fit Width"
+msgstr "Ffitio i &Led Tudalen"
+
 #: part.cpp:963
 msgid "Tools"
 msgstr "Offer"
@@ -753,348 +278,838 @@ msgstr ""
 msgid "Could not print the document. Please report to bugs.kde.org"
 msgstr ""
 
-#. i18n: file part.rc line 26
-#: rc.cpp:12 rc.cpp:210
-#, no-c-format
-msgid "&Go"
-msgstr "&Ewch"
+#: core/document.cpp:750
+msgid ""
+"End of document reached.\n"
+"Continue from the beginning?"
+msgstr ""
+" Wedi cyrraedd diwedd y ddogfen.\n"
+" Ail-ddechrau o'r dechrau?"
 
-#. i18n: file ./conf/dlgperformance.ui line 35
-#: rc.cpp:24
-#, no-c-format
-msgid "CPU Usage"
+#: core/document.cpp:796
+msgid "No matches found for '%1'."
 msgstr ""
 
-#. i18n: file ./conf/dlgperformance.ui line 54
-#: rc.cpp:27
-#, no-c-format
-msgid "Enable &transparency effects"
+#: core/document.cpp:998 core/document.cpp:1006
+msgid ""
+"The pdf file is trying to execute an external application and for your safety "
+"kpdf does not allow that."
 msgstr ""
 
-#. i18n: file ./conf/dlgperformance.ui line 62
-#: rc.cpp:30
-#, no-c-format
-msgid "Enable &background generation"
+#: core/document.cpp:1019
+#, c-format
+msgid "No application found for opening file of mimetype %1."
 msgstr ""
 
-#. i18n: file ./conf/dlgperformance.ui line 125
-#: rc.cpp:33
-#, no-c-format
-msgid "Memory Usage"
-msgstr "Defnydd Cof"
+#: core/link.cpp:21
+#, fuzzy, c-format
+msgid "Go to page %1"
+msgstr "Tudalen %1"
 
-#. i18n: file ./conf/dlgperformance.ui line 158
-#: rc.cpp:36
-#, no-c-format
-msgid "&Low"
-msgstr "I&sel"
+#: core/link.cpp:21
+msgid "Open external file"
+msgstr ""
 
-#. i18n: file ./conf/dlgperformance.ui line 166
-#: rc.cpp:39
-#, no-c-format
-msgid "&Normal (default)"
+#: core/link.cpp:26
+msgid "Execute '%1'..."
 msgstr ""
 
-#. i18n: file ./conf/dlgperformance.ui line 174
-#: rc.cpp:42
-#, no-c-format
-msgid "&Aggressive"
+#: core/link.cpp:39
+#, fuzzy
+msgid "First Page"
+msgstr "Ffitio &i Dudalen"
+
+#: core/link.cpp:41
+msgid "Previous Page"
 msgstr ""
 
-#. i18n: file ./conf/dlggeneral.ui line 27
-#: rc.cpp:45
-#, no-c-format
-msgid "Program Look"
+#: core/link.cpp:43
+msgid "Next Page"
 msgstr ""
 
-#. i18n: file ./conf/dlggeneral.ui line 49
-#: rc.cpp:48
-#, no-c-format
-msgid "Show &search bar in thumbnails list"
+#: core/link.cpp:45
+msgid "Last Page"
 msgstr ""
 
-#. i18n: file ./conf/dlggeneral.ui line 60
-#: rc.cpp:51
-#, no-c-format
-msgid "Link the &thumbnails with the page"
+#: core/link.cpp:49
+#, fuzzy
+msgid "Forward"
+msgstr "Fformat"
+
+#: core/link.cpp:53
+#, fuzzy
+msgid "Start Presentation"
+msgstr "Cyflwyniad"
+
+#: core/link.cpp:55
+#, fuzzy
+msgid "End Presentation"
+msgstr "Cyflwyniad"
+
+#: core/link.cpp:57
+#, fuzzy
+msgid "Find..."
+msgstr "..."
+
+#: core/link.cpp:59
+#, fuzzy
+msgid "Go To Page..."
+msgstr "Tudalennau"
+
+#: core/generator_pdf/generator_pdf.cpp:144
+msgid "Please insert the password to read the document:"
 msgstr ""
 
-#. i18n: file ./conf/dlggeneral.ui line 68
-#: rc.cpp:54
-#, no-c-format
-msgid "Show scroll&bars"
+#: core/generator_pdf/generator_pdf.cpp:146
+#, fuzzy
+msgid "Incorrect password. Try again:"
+msgstr "Cyfrinair anghywir"
+
+#: core/generator_pdf/generator_pdf.cpp:200
+msgid "Title"
+msgstr "Teitl"
+
+#: core/generator_pdf/generator_pdf.cpp:201
+msgid "Subject"
+msgstr "Pwnc"
+
+#: core/generator_pdf/generator_pdf.cpp:202
+msgid "Author"
+msgstr "Awdur"
+
+#: core/generator_pdf/generator_pdf.cpp:203
+msgid "Keywords"
+msgstr "Allweddeiriau"
+
+#: core/generator_pdf/generator_pdf.cpp:204
+msgid "Creator"
+msgstr "Creuwr"
+
+#: core/generator_pdf/generator_pdf.cpp:205
+msgid "Producer"
 msgstr ""
 
-#. i18n: file ./conf/dlggeneral.ui line 76
-#: rc.cpp:57
-#, no-c-format
-msgid "Show &hints and info messages"
+#: core/generator_pdf/generator_pdf.cpp:206
+msgid "Created"
+msgstr "Crëwyd"
+
+#: core/generator_pdf/generator_pdf.cpp:207
+msgid "Modified"
+msgstr "Addaswyd"
+
+#: core/generator_pdf/generator_pdf.cpp:211
+#, c-format
+msgid ""
+"_: PDF v. <version>\n"
+"PDF v. %1"
 msgstr ""
 
-#. i18n: file ./conf/dlggeneral.ui line 84
-#: rc.cpp:60
-#, no-c-format
-msgid "&Obey DRM limitations"
+#: core/generator_pdf/generator_pdf.cpp:212
+#: core/generator_pdf/generator_pdf.cpp:221
+msgid "Format"
+msgstr "Fformat"
+
+#: core/generator_pdf/generator_pdf.cpp:213
+msgid "Encrypted"
 msgstr ""
 
-#. i18n: file ./conf/dlggeneral.ui line 92
-#: rc.cpp:63
-#, no-c-format
-msgid "&Watch file"
+#: core/generator_pdf/generator_pdf.cpp:213
+msgid "Unencrypted"
+msgstr ""
+
+#: core/generator_pdf/generator_pdf.cpp:214
+#: core/generator_pdf/generator_pdf.cpp:222
+msgid "Security"
+msgstr "Diogelwch"
+
+#: core/generator_pdf/generator_pdf.cpp:216
+#: core/generator_pdf/generator_pdf.cpp:223
+msgid "Optimized"
+msgstr ""
+
+#: core/generator_pdf/generator_pdf.cpp:217
+msgid "Pages"
+msgstr "Tudalennau"
+
+#: core/generator_pdf/generator_pdf.cpp:222
+msgid "Unknown Encryption"
+msgstr ""
+
+#: core/generator_pdf/generator_pdf.cpp:223
+msgid "Unknown Optimization"
+msgstr ""
+
+#: core/generator_pdf/generator_pdf.cpp:375
+msgid "Name"
+msgstr "Enw"
+
+#: core/generator_pdf/generator_pdf.cpp:376
+msgid "Type"
+msgstr "Math"
+
+#: core/generator_pdf/generator_pdf.cpp:377
+msgid "Embedded"
+msgstr ""
+
+#: core/generator_pdf/generator_pdf.cpp:487
+msgid ""
+"The margins you specified change the page aspect ratio. Do you want to print "
+"with the aspect ratio changed or do you want the margins to be adapted so that "
+"the aspect ratio is preserved?"
+msgstr ""
+
+#: core/generator_pdf/generator_pdf.cpp:488
+msgid "Aspect ratio change"
+msgstr ""
+
+#: core/generator_pdf/generator_pdf.cpp:489
+msgid "Print with specified margins"
+msgstr ""
+
+#: core/generator_pdf/generator_pdf.cpp:490
+msgid "Print adapting margins to keep aspect ratio"
+msgstr ""
+
+#: core/generator_pdf/generator_pdf.cpp:721
+msgid "unknown"
+msgstr "anhysbys"
+
+#: core/generator_pdf/generator_pdf.cpp:722
+msgid "Type 1"
 msgstr ""
 
+#: core/generator_pdf/generator_pdf.cpp:723
+msgid "Type 1C"
+msgstr ""
+
+#: core/generator_pdf/generator_pdf.cpp:724
+msgid ""
+"_: OT means OpenType\n"
+"Type 1C (OT)"
+msgstr ""
+
+#: core/generator_pdf/generator_pdf.cpp:725
+msgid "Type 3"
+msgstr ""
+
+#: core/generator_pdf/generator_pdf.cpp:726
+msgid "TrueType"
+msgstr "TrueType:"
+
+#: core/generator_pdf/generator_pdf.cpp:727
+msgid ""
+"_: OT means OpenType\n"
+"TrueType (OT)"
+msgstr ""
+
+#: core/generator_pdf/generator_pdf.cpp:728
+msgid "CID Type 0"
+msgstr ""
+
+#: core/generator_pdf/generator_pdf.cpp:729
+msgid "CID Type 0C"
+msgstr ""
+
+#: core/generator_pdf/generator_pdf.cpp:730
+msgid ""
+"_: OT means OpenType\n"
+"CID Type 0C (OT)"
+msgstr ""
+
+#: core/generator_pdf/generator_pdf.cpp:731
+msgid "CID TrueType"
+msgstr ""
+
+#: core/generator_pdf/generator_pdf.cpp:732
+msgid ""
+"_: OT means OpenType\n"
+"CID TrueType (OT)"
+msgstr ""
+
+#: core/generator_pdf/generator_pdf.cpp:765
+#: core/generator_pdf/generator_pdf.cpp:767
+#: core/generator_pdf/generator_pdf.cpp:772
+msgid "-"
+msgstr "-"
+
+#: core/generator_pdf/generator_pdf.cpp:771
+msgid "[none]"
+msgstr ""
+
+#: core/generator_pdf/generator_pdf.cpp:792
+#: core/generator_pdf/generator_pdf.cpp:796
+#: core/generator_pdf/generator_pdf.cpp:810
+msgid "Unknown"
+msgstr "Anhysbys"
+
+#: core/generator_pdf/generator_pdf.cpp:818
+#: core/generator_pdf/generator_pdf.cpp:823
+#: core/generator_pdf/generator_pdf.cpp:832
+#: core/generator_pdf/generator_pdf.cpp:853
+msgid "Unknown Date"
+msgstr ""
+
+#. i18n: file part.rc line 28
+#: rc.cpp:12 rc.cpp:213
+#, no-c-format
+msgid "&Go"
+msgstr "&Ewch"
+
 #. i18n: file ./conf/dlgpresentation.ui line 27
-#: rc.cpp:66
+#: rc.cpp:24
 #, no-c-format
 msgid "Navigation"
 msgstr "Llywio"
 
 #. i18n: file ./conf/dlgpresentation.ui line 49
-#: rc.cpp:69
+#: rc.cpp:27
 #, no-c-format
 msgid " sec."
 msgstr "eil."
 
 #. i18n: file ./conf/dlgpresentation.ui line 60
-#: rc.cpp:72
+#: rc.cpp:30
 #, no-c-format
 msgid "Advance every:"
 msgstr ""
 
 #. i18n: file ./conf/dlgpresentation.ui line 68
-#: rc.cpp:75
+#: rc.cpp:33
 #, no-c-format
 msgid "Loop after last page"
 msgstr ""
 
 #. i18n: file ./conf/dlgpresentation.ui line 89
-#: rc.cpp:81
-#, no-c-format
-msgid "Blinds Vertical"
+#: rc.cpp:39
+#, fuzzy, no-c-format
+msgid "BlindsQt::Vertical"
 msgstr "Cysgodlenni Fertigol"
 
 #. i18n: file ./conf/dlgpresentation.ui line 94
-#: rc.cpp:84
-#, no-c-format
-msgid "Blinds Horizontal"
+#: rc.cpp:42
+#, fuzzy, no-c-format
+msgid "BlindsQt::Horizontal"
 msgstr "Cysgodlenni Llorweddol"
 
 #. i18n: file ./conf/dlgpresentation.ui line 99
-#: rc.cpp:87
+#: rc.cpp:45
 #, no-c-format
 msgid "Box In"
 msgstr "Blwch i Mewn"
 
 #. i18n: file ./conf/dlgpresentation.ui line 104
-#: rc.cpp:90
+#: rc.cpp:48
 #, no-c-format
 msgid "Box Out"
 msgstr "Blwch Allan"
 
 #. i18n: file ./conf/dlgpresentation.ui line 109
-#: rc.cpp:93
+#: rc.cpp:51
 #, no-c-format
 msgid "Dissolve"
 msgstr "Hydoddi"
 
 #. i18n: file ./conf/dlgpresentation.ui line 114
-#: rc.cpp:96
+#: rc.cpp:54
 #, no-c-format
 msgid "Glitter Down"
 msgstr ""
 
 #. i18n: file ./conf/dlgpresentation.ui line 119
-#: rc.cpp:99
+#: rc.cpp:57
 #, no-c-format
 msgid "Glitter Right"
 msgstr ""
 
 #. i18n: file ./conf/dlgpresentation.ui line 124
-#: rc.cpp:102
+#: rc.cpp:60
 #, no-c-format
 msgid "Glitter Right-Down"
 msgstr ""
 
 #. i18n: file ./conf/dlgpresentation.ui line 129
-#: rc.cpp:105
+#: rc.cpp:63
 #, no-c-format
 msgid "Random Transition"
 msgstr "Trawsnewid ar Hap"
 
 #. i18n: file ./conf/dlgpresentation.ui line 139
-#: rc.cpp:111
-#, no-c-format
-msgid "Split Horizontal In"
-msgstr ""
+#: rc.cpp:69
+#, fuzzy, no-c-format
+msgid "SplitQt::Horizontal In"
+msgstr "Cysgodlenni Llorweddol"
 
 #. i18n: file ./conf/dlgpresentation.ui line 144
-#: rc.cpp:114
-#, no-c-format
-msgid "Split Horizontal Out"
-msgstr ""
+#: rc.cpp:72
+#, fuzzy, no-c-format
+msgid "SplitQt::Horizontal Out"
+msgstr "Cysgodlenni Llorweddol"
 
 #. i18n: file ./conf/dlgpresentation.ui line 149
-#: rc.cpp:117
+#: rc.cpp:75
 #, no-c-format
-msgid "Split Vertical In"
+msgid "SplitQt::Vertical In"
 msgstr ""
 
 #. i18n: file ./conf/dlgpresentation.ui line 154
-#: rc.cpp:120
+#: rc.cpp:78
 #, no-c-format
-msgid "Split Vertical Out"
+msgid "SplitQt::Vertical Out"
 msgstr ""
 
 #. i18n: file ./conf/dlgpresentation.ui line 159
-#: rc.cpp:123
+#: rc.cpp:81
 #, no-c-format
 msgid "Wipe Down"
 msgstr ""
 
 #. i18n: file ./conf/dlgpresentation.ui line 164
-#: rc.cpp:126
+#: rc.cpp:84
 #, no-c-format
 msgid "Wipe Right"
 msgstr ""
 
 #. i18n: file ./conf/dlgpresentation.ui line 169
-#: rc.cpp:129
+#: rc.cpp:87
 #, no-c-format
 msgid "Wipe Left"
 msgstr ""
 
 #. i18n: file ./conf/dlgpresentation.ui line 174
-#: rc.cpp:132
+#: rc.cpp:90
 #, no-c-format
 msgid "Wipe Up"
 msgstr ""
 
 #. i18n: file ./conf/dlgpresentation.ui line 186
-#: rc.cpp:135
+#: rc.cpp:93
 #, no-c-format
 msgid "Default transition:"
 msgstr ""
 
 #. i18n: file ./conf/dlgpresentation.ui line 194
-#: rc.cpp:138
+#: rc.cpp:96
 #, no-c-format
 msgid "Mouse cursor:"
 msgstr ""
 
 #. i18n: file ./conf/dlgpresentation.ui line 200
-#: rc.cpp:141
+#: rc.cpp:99
 #, no-c-format
 msgid "Hidden After Delay"
 msgstr ""
 
 #. i18n: file ./conf/dlgpresentation.ui line 205
-#: rc.cpp:144
+#: rc.cpp:102
 #, no-c-format
 msgid "Always Visible"
 msgstr ""
 
 #. i18n: file ./conf/dlgpresentation.ui line 210
-#: rc.cpp:147
+#: rc.cpp:105
 #, no-c-format
 msgid "Always Hidden"
 msgstr ""
 
 #. i18n: file ./conf/dlgpresentation.ui line 222
-#: rc.cpp:150
+#: rc.cpp:108
 #, no-c-format
 msgid "Background color:"
 msgstr "Lliw'r cefndir:"
 
 #. i18n: file ./conf/dlgpresentation.ui line 238
-#: rc.cpp:153
+#: rc.cpp:111
 #, no-c-format
 msgid "Show s&ummary page"
 msgstr ""
 
 #. i18n: file ./conf/dlgpresentation.ui line 246
-#: rc.cpp:156
+#: rc.cpp:114
 #, no-c-format
 msgid "Show &progress indicator"
 msgstr ""
 
+#. i18n: file ./conf/dlgperformance.ui line 35
+#: rc.cpp:117
+#, no-c-format
+msgid "CPU Usage"
+msgstr ""
+
+#. i18n: file ./conf/dlgperformance.ui line 54
+#: rc.cpp:120
+#, no-c-format
+msgid "Enable &transparency effects"
+msgstr ""
+
+#. i18n: file ./conf/dlgperformance.ui line 62
+#: rc.cpp:123
+#, no-c-format
+msgid "Enable &background generation"
+msgstr ""
+
+#. i18n: file ./conf/dlgperformance.ui line 125
+#: rc.cpp:126
+#, no-c-format
+msgid "Memory Usage"
+msgstr "Defnydd Cof"
+
+#. i18n: file ./conf/dlgperformance.ui line 158
+#: rc.cpp:129
+#, no-c-format
+msgid "&Low"
+msgstr "I&sel"
+
+#. i18n: file ./conf/dlgperformance.ui line 166
+#: rc.cpp:132
+#, no-c-format
+msgid "&Normal (default)"
+msgstr ""
+
+#. i18n: file ./conf/dlgperformance.ui line 174
+#: rc.cpp:135
+#, no-c-format
+msgid "&Aggressive"
+msgstr ""
+
 #. i18n: file ./conf/dlgaccessibility.ui line 27
-#: rc.cpp:159
+#: rc.cpp:138
 #, no-c-format
 msgid "Draw border around &Images"
 msgstr ""
 
 #. i18n: file ./conf/dlgaccessibility.ui line 35
-#: rc.cpp:162
+#: rc.cpp:141
 #, no-c-format
 msgid "Draw border around &Links"
 msgstr ""
 
 #. i18n: file ./conf/dlgaccessibility.ui line 51
-#: rc.cpp:165
+#: rc.cpp:144
 #, no-c-format
 msgid "Change &Colors"
 msgstr ""
 
 #. i18n: file ./conf/dlgaccessibility.ui line 83
-#: rc.cpp:168
+#: rc.cpp:147
 #, no-c-format
 msgid "Warning: these options can badly affect drawing speed."
 msgstr ""
 
 #. i18n: file ./conf/dlgaccessibility.ui line 125
-#: rc.cpp:171
+#: rc.cpp:150
 #, no-c-format
 msgid "&Invert colors"
 msgstr ""
 
 #. i18n: file ./conf/dlgaccessibility.ui line 136
-#: rc.cpp:174
+#: rc.cpp:153
 #, no-c-format
 msgid "Change &paper color"
 msgstr ""
 
 #. i18n: file ./conf/dlgaccessibility.ui line 172
-#: rc.cpp:177
+#: rc.cpp:156
 #, no-c-format
 msgid "Paper color:"
 msgstr ""
 
 #. i18n: file ./conf/dlgaccessibility.ui line 213
-#: rc.cpp:180
+#: rc.cpp:159
 #, no-c-format
 msgid "&Change dark and light colors"
 msgstr ""
 
 #. i18n: file ./conf/dlgaccessibility.ui line 308
-#: rc.cpp:183
+#: rc.cpp:162
 #, no-c-format
 msgid "Light color:"
 msgstr ""
 
 #. i18n: file ./conf/dlgaccessibility.ui line 336
-#: rc.cpp:186
+#: rc.cpp:165
 #, no-c-format
 msgid "Dark color:"
 msgstr ""
 
 #. i18n: file ./conf/dlgaccessibility.ui line 346
-#: rc.cpp:189
+#: rc.cpp:168
 #, no-c-format
 msgid "Convert to &black and white"
 msgstr ""
 
 #. i18n: file ./conf/dlgaccessibility.ui line 365
-#: rc.cpp:192
+#: rc.cpp:171
 #, no-c-format
 msgid "Contrast:"
 msgstr "Cyferbyniant :"
 
 #. i18n: file ./conf/dlgaccessibility.ui line 488
-#: rc.cpp:195
+#: rc.cpp:174
 #, no-c-format
 msgid "Threshold:"
 msgstr "Trothwy :"
 
+#. i18n: file ./conf/dlggeneral.ui line 27
+#: rc.cpp:177
+#, no-c-format
+msgid "Program Look"
+msgstr ""
+
+#. i18n: file ./conf/dlggeneral.ui line 49
+#: rc.cpp:180
+#, no-c-format
+msgid "Show &search bar in thumbnails list"
+msgstr ""
+
+#. i18n: file ./conf/dlggeneral.ui line 60
+#: rc.cpp:183
+#, no-c-format
+msgid "Link the &thumbnails with the page"
+msgstr ""
+
+#. i18n: file ./conf/dlggeneral.ui line 68
+#: rc.cpp:186
+#, no-c-format
+msgid "Show scroll&bars"
+msgstr ""
+
+#. i18n: file ./conf/dlggeneral.ui line 76
+#: rc.cpp:189
+#, no-c-format
+msgid "Show &hints and info messages"
+msgstr ""
+
+#. i18n: file ./conf/dlggeneral.ui line 84
+#: rc.cpp:192
+#, no-c-format
+msgid "&Obey DRM limitations"
+msgstr ""
+
+#. i18n: file ./conf/dlggeneral.ui line 92
+#: rc.cpp:195
+#, no-c-format
+msgid "&Watch file"
+msgstr ""
+
+#. i18n: file ./conf/dlggeneral.ui line 100
+#: rc.cpp:198
+#, no-c-format
+msgid "&Retain document viewing data"
+msgstr ""
+
+#: ui/thumbnaillist.cpp:568
+msgid "Show bookmarked pages only"
+msgstr ""
+
+#: ui/toc.cpp:59
+msgid "Topic"
+msgstr ""
+
+#: ui/propertiesdialog.cpp:23
+msgid "Unknown File"
+msgstr ""
+
+#: ui/propertiesdialog.cpp:32
+#, fuzzy
+msgid "No document opened."
+msgstr "Dogfen i'w hagor"
+
+#: ui/propertiesdialog.cpp:38
+msgid "%1 Properties"
+msgstr ""
+
+#: ui/propertiesdialog.cpp:53
+msgid "%1:"
+msgstr "%1 :"
+
+#: ui/propertiesdialog.cpp:66
+msgid "Pages:"
+msgstr "Tudalennau :"
+
+#: ui/searchwidget.cpp:49
+msgid "Enter at least 3 letters to filter pages"
+msgstr ""
+
+#: ui/searchwidget.cpp:55
+msgid "Clear filter"
+msgstr "Gwagio hidlen"
+
+#: ui/searchwidget.cpp:59
+msgid "Case Sensitive"
+msgstr "Mae llythrennau mawr/bach o bwys"
+
+#: ui/searchwidget.cpp:61
+msgid "Match Phrase"
+msgstr ""
+
+#: ui/searchwidget.cpp:62
+msgid "Match All Words"
+msgstr ""
+
+#: ui/searchwidget.cpp:63
+msgid "Match Any Word"
+msgstr ""
+
+#: ui/searchwidget.cpp:68
+#, fuzzy
+msgid "Filter Options"
+msgstr "Dewisiadau Cyffredinol"
+
+#: ui/pageview.cpp:259
+msgid "Fit to Page &Width"
+msgstr "Ffitio i &Led Tudalen"
+
+#: ui/pageview.cpp:262
+msgid "Fit to &Page"
+msgstr "Ffitio &i Dudalen"
+
+#: ui/pageview.cpp:265
+msgid "Fit to &Text"
+msgstr ""
+
+#: ui/pageview.cpp:270
+msgid "Rotate Right"
+msgstr ""
+
+#: ui/pageview.cpp:273
+msgid "Rotate Left"
+msgstr ""
+
+#: ui/pageview.cpp:277
+#, fuzzy
+msgid "&Two Pages"
+msgstr "Tudalennau"
+
+#: ui/pageview.cpp:281
+msgid "&Continuous"
+msgstr ""
+
+#: ui/pageview.cpp:286
+#, fuzzy
+msgid "&Browse Tool"
+msgstr "Erfyn &Chwyddo"
+
+#: ui/pageview.cpp:290
+msgid "&Zoom Tool"
+msgstr "Erfyn &Chwyddo"
+
+#: ui/pageview.cpp:293
+msgid "&Select Tool"
+msgstr "&Erfyn Dethol"
+
+#: ui/pageview.cpp:301
+msgid "Scroll Up"
+msgstr "Sgrolio i fyny"
+
+#: ui/pageview.cpp:304
+msgid "Scroll Down"
+msgstr "Sgrolio i lawr"
+
+#: ui/pageview.cpp:364
+#, c-format
+msgid ""
+"_n:  Loaded a one-page document.\n"
+" Loaded a %n-page document."
+msgstr ""
+
+#: ui/pageview.cpp:664 ui/pageview.cpp:685 ui/pageview.cpp:1645
+msgid "Text found: \"%1\"."
+msgstr "Canfuwyd y testun: \"%1\"."
+
+#: ui/pageview.cpp:664 ui/pageview.cpp:1645
+msgid "Text not found: \"%1\"."
+msgstr "Ni chanfuwyd y testun: \"%1\"."
+
+#: ui/pageview.cpp:716
+msgid "Starting -- find text as you type"
+msgstr "Dechrau -- canfod testun wrth deipio"
+
+#: ui/pageview.cpp:1127
+#, c-format
+msgid ""
+"_n: Text (1 character)\n"
+"Text (%n characters)"
+msgstr ""
+
+#: ui/pageview.cpp:1128 ui/pageview.cpp:1135
+msgid "Copy to Clipboard"
+msgstr "Copïo i'r Gludfwrdd"
+
+#: ui/pageview.cpp:1132
+msgid "Speak Text"
+msgstr ""
+
+#: ui/pageview.cpp:1134
+msgid "Image (%1 by %2 pixels)"
+msgstr ""
+
+#: ui/pageview.cpp:1136
+msgid "Save to File..."
+msgstr "Cadw i Ffeil..."
+
+#: ui/pageview.cpp:1154
+msgid "Image [%1x%2] copied to clipboard."
+msgstr ""
+
+#: ui/pageview.cpp:1161
+msgid "File not saved."
+msgstr ""
+
+#: ui/pageview.cpp:1168
+msgid "Image [%1x%2] saved to %3 file."
+msgstr ""
+
+#: ui/pageview.cpp:1197
+#, c-format
+msgid "Starting KTTSD Failed: %1"
+msgstr ""
+
+#: ui/pageview.cpp:1581
+msgid "Fit Page"
+msgstr ""
+
+#: ui/pageview.cpp:2013
+msgid "Find stopped."
+msgstr "Arhosodd y canfod."
+
+#: ui/pageview.cpp:2023
+msgid "Welcome"
+msgstr "Croeso"
+
+#: ui/pageview.cpp:2135
+msgid "Select zooming area. Right-click to zoom out."
+msgstr ""
+
+#: ui/pageview.cpp:2141
+msgid "Draw a rectangle around the text/graphics to copy."
+msgstr ""
+
+#: ui/presentationwidget.cpp:148
+#, c-format
+msgid "Title: %1"
+msgstr "Teitl: %1"
+
+#: ui/presentationwidget.cpp:150
+#, c-format
+msgid "Author: %1"
+msgstr "Awdur: %1"
+
+#: ui/presentationwidget.cpp:152
+#, c-format
+msgid "Pages: %1"
+msgstr "Tudalennau : %1"
+
+#: ui/presentationwidget.cpp:153
+msgid "Click to begin"
+msgstr ""
+
+#: ui/presentationwidget.cpp:329
+msgid ""
+"There are two ways of exiting presentation mode, you can press either ESC key "
+"or click with the quit button that appears when placing the mouse in the "
+"top-right corner. Of course you can cycle windows (Alt+TAB by default)"
+msgstr ""
+
 #~ msgid "&Normal"
 #~ msgstr "&Arferol"
 
diff --git a/tde-i18n-cy/messages/tdegraphics/kpovmodeler.po b/tde-i18n-cy/messages/tdegraphics/kpovmodeler.po
index b8fd5032029..cb903dad0f0 100644
--- a/tde-i18n-cy/messages/tdegraphics/kpovmodeler.po
+++ b/tde-i18n-cy/messages/tdegraphics/kpovmodeler.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdegraphics/kpovmodeler.po\n"
-"POT-Creation-Date: 2006-05-28 03:57+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -342,19 +343,19 @@ msgid "Cylinder"
 msgstr ""
 
 #: pmcameraedit.cpp:56
-msgid "1: Vertical, Fixed Viewpoint"
+msgid "1:Qt::Vertical, Fixed Viewpoint"
 msgstr ""
 
 #: pmcameraedit.cpp:57
-msgid "2: Horizontal, Fixed Viewpoint"
+msgid "2:Qt::Horizontal, Fixed Viewpoint"
 msgstr ""
 
 #: pmcameraedit.cpp:58
-msgid "3: Vertical, Variable Viewpoint"
+msgid "3:Qt::Vertical, Variable Viewpoint"
 msgstr ""
 
 #: pmcameraedit.cpp:59
-msgid "4: Horizontal, Variable Viewpoint"
+msgid "4:Qt::Horizontal, Variable Viewpoint"
 msgstr ""
 
 #: pmcameraedit.cpp:71
@@ -3223,7 +3224,7 @@ msgstr "I Lawr"
 msgid "Povray only supports up to 20 library paths."
 msgstr ""
 
-#: pmpovraysettings.cpp:207 pmpovraysettings.cpp:265
+#: pmpovraysettings.cpp:203 pmpovraysettings.cpp:257
 msgid "The list of library paths already contains this path."
 msgstr ""
 
@@ -4188,7 +4189,8 @@ msgid "Repeat:"
 msgstr "Ail-adrodd:"
 
 #: pmwarpedit.cpp:142
-msgid "Orientation:"
+#, fuzzy
+msgid "Qt::Orientation:"
 msgstr "Cyfeiriadaeth:"
 
 #: pmwarpedit.cpp:149
diff --git a/tde-i18n-cy/messages/tdegraphics/kruler.po b/tde-i18n-cy/messages/tdegraphics/kruler.po
index a81ba8946d8..591ea7d3c3f 100644
--- a/tde-i18n-cy/messages/tdegraphics/kruler.po
+++ b/tde-i18n-cy/messages/tdegraphics/kruler.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdegraphics/kruler.po\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -22,7 +23,7 @@ msgstr ""
 #: klineal.cpp:134
 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 "
+"in HTML or as a TQColor name. The rectangles background shows the color of the "
 "pixel inside the little square at the end of the line cursor."
 msgstr ""
 
@@ -70,7 +71,7 @@ msgstr "&Canolig"
 msgid "&Tall"
 msgstr ""
 
-#: klineal.cpp:160 klineal.cpp:293
+#: klineal.cpp:160 klineal.cpp:268
 msgid "&Full Screen Width"
 msgstr ""
 
@@ -86,24 +87,24 @@ msgstr ""
 msgid "Choose &Font..."
 msgstr "Dewis F&font..."
 
-#: klineal.cpp:293
+#: klineal.cpp:268
 msgid "&Full Screen Height"
 msgstr ""
 
-#: main.cpp:29
+#: main.cpp:40
 msgid "TDE Screen Ruler"
 msgstr "Mesurydd Sgrîn TDE"
 
-#: main.cpp:31
-msgid "A screen ruler for the K Desktop Environment"
+#: main.cpp:42
+msgid "A screen ruler for the Trinity Desktop Environment"
 msgstr ""
 
-#: main.cpp:36
+#: main.cpp:47
 msgid "Programming"
 msgstr ""
 
-#: main.cpp:37
-msgid "Initial port to TDE 2"
+#: main.cpp:48
+msgid "Initial port to KDE 2"
 msgstr ""
 
 #: _translatorinfo.cpp:1
diff --git a/tde-i18n-cy/messages/tdegraphics/ksnapshot.po b/tde-i18n-cy/messages/tdegraphics/ksnapshot.po
index 256b3085aed..f1f670e2054 100644
--- a/tde-i18n-cy/messages/tdegraphics/ksnapshot.po
+++ b/tde-i18n-cy/messages/tdegraphics/ksnapshot.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdegraphics/ksnapshot.po\n"
-"POT-Creation-Date: 2006-07-01 03:59+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdegraphics/ksvgplugin.po b/tde-i18n-cy/messages/tdegraphics/ksvgplugin.po
index 031e79b8c39..5e5fd806faa 100644
--- a/tde-i18n-cy/messages/tdegraphics/ksvgplugin.po
+++ b/tde-i18n-cy/messages/tdegraphics/ksvgplugin.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdegraphics/ksvgplugin.po\n"
-"POT-Creation-Date: 2005-05-18 21:25+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdegraphics/kuickshow.po b/tde-i18n-cy/messages/tdegraphics/kuickshow.po
index b6fb074a92b..7e8ef3c3027 100644
--- a/tde-i18n-cy/messages/tdegraphics/kuickshow.po
+++ b/tde-i18n-cy/messages/tdegraphics/kuickshow.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdegraphics/kuickshow.po\n"
-"POT-Creation-Date: 2007-03-26 02:14+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdegraphics/kview.po b/tde-i18n-cy/messages/tdegraphics/kview.po
index b22d2d7dc37..b247bdb7b4e 100644
--- a/tde-i18n-cy/messages/tdegraphics/kview.po
+++ b/tde-i18n-cy/messages/tdegraphics/kview.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdegraphics/kview.po\n"
-"POT-Creation-Date: 2005-03-07 01:42+0100\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdegraphics/kview_scale.po b/tde-i18n-cy/messages/tdegraphics/kview_scale.po
index d8e76b40009..15459ac5c78 100644
--- a/tde-i18n-cy/messages/tdegraphics/kview_scale.po
+++ b/tde-i18n-cy/messages/tdegraphics/kview_scale.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdegraphics/kview_scale.po\n"
-"POT-Creation-Date: 2005-05-18 21:25+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdegraphics/kviewbrowserplugin.po b/tde-i18n-cy/messages/tdegraphics/kviewbrowserplugin.po
index 043f53e8aa9..724cfae9f56 100644
--- a/tde-i18n-cy/messages/tdegraphics/kviewbrowserplugin.po
+++ b/tde-i18n-cy/messages/tdegraphics/kviewbrowserplugin.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdegraphics/kviewbrowserplugin.po\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdegraphics/kviewcanvas.po b/tde-i18n-cy/messages/tdegraphics/kviewcanvas.po
index b5eb093e2a8..840c876f07f 100644
--- a/tde-i18n-cy/messages/tdegraphics/kviewcanvas.po
+++ b/tde-i18n-cy/messages/tdegraphics/kviewcanvas.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdegraphics/kviewcanvas.po\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdegraphics/kvieweffectsplugin.po b/tde-i18n-cy/messages/tdegraphics/kvieweffectsplugin.po
index ee71fc59b25..8c2b06fd400 100644
--- a/tde-i18n-cy/messages/tdegraphics/kvieweffectsplugin.po
+++ b/tde-i18n-cy/messages/tdegraphics/kvieweffectsplugin.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdegraphics/kvieweffectsplugin.po\n"
-"POT-Creation-Date: 2005-05-18 21:25+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdegraphics/kviewpresenterplugin.po b/tde-i18n-cy/messages/tdegraphics/kviewpresenterplugin.po
index 684ad9af6c5..b3237ee6350 100644
--- a/tde-i18n-cy/messages/tdegraphics/kviewpresenterplugin.po
+++ b/tde-i18n-cy/messages/tdegraphics/kviewpresenterplugin.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdegraphics/kviewpresenterplugin.po\n"
-"POT-Creation-Date: 2005-01-31 01:31+0100\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdegraphics/kviewscannerplugin.po b/tde-i18n-cy/messages/tdegraphics/kviewscannerplugin.po
index 018cb62d3c6..e689c7ef2f7 100644
--- a/tde-i18n-cy/messages/tdegraphics/kviewscannerplugin.po
+++ b/tde-i18n-cy/messages/tdegraphics/kviewscannerplugin.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdegraphics/kviewscannerplugin.po\n"
-"POT-Creation-Date: 2005-05-18 21:25+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdegraphics/kviewshell.po b/tde-i18n-cy/messages/tdegraphics/kviewshell.po
index 71b64e8f6ca..588d96fef3b 100644
--- a/tde-i18n-cy/messages/tdegraphics/kviewshell.po
+++ b/tde-i18n-cy/messages/tdegraphics/kviewshell.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdegraphics/kviewshell.po\n"
-"POT-Creation-Date: 2008-07-08 01:19+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,7 +22,7 @@ msgid ""
 "Your emails"
 msgstr "kyfieithu@dotmon.com"
 
-#: documentWidget.cpp:547
+#: documentWidget.cpp:548
 #, c-format
 msgid "Link to %1"
 msgstr ""
@@ -34,95 +35,6 @@ msgstr ""
 msgid "Copyright (c) 2005 Wilfried Huss"
 msgstr ""
 
-#: tdemultipage.cpp:70
-msgid "Thumbnails"
-msgstr "Rhagolygon cryno"
-
-#: tdemultipage.cpp:158
-msgid "Save File As"
-msgstr ""
-
-#: tdemultipage.cpp:169
-msgid ""
-"The file %1\n"
-"exists. Shall I overwrite that file?"
-msgstr ""
-
-#: tdemultipage.cpp:170 tdemultipage.cpp:1916
-msgid "Overwrite File"
-msgstr "Trosysgrifo Ffeil"
-
-#: tdemultipage.cpp:170 tdemultipage.cpp:1916
-msgid "Overwrite"
-msgstr "Trosysgrifo"
-
-#: tdemultipage.cpp:770
-#, c-format
-msgid "Print %1"
-msgstr "Argraffu %1"
-
-#: tdemultipage.cpp:1422 tdemultipage.cpp:1564
-msgid "Search interrupted"
-msgstr ""
-
-#: tdemultipage.cpp:1430 tdemultipage.cpp:1572
-msgid "Search page %1 of %2"
-msgstr ""
-
-#: tdemultipage.cpp:1475
-msgid ""
-"<qt>The search string <strong>%1</strong> could not be found by the end of the "
-"document. Should the search be restarted from the beginning of the "
-"document?</qt>"
-msgstr ""
-
-#: tdemultipage.cpp:1478 tdemultipage.cpp:1620
-msgid "Text Not Found"
-msgstr ""
-
-#: tdemultipage.cpp:1502 tdemultipage.cpp:1644
-msgid "<qt>The search string <strong>%1</strong> could not be found.</qt>"
-msgstr ""
-
-#: tdemultipage.cpp:1617
-msgid ""
-"<qt>The search string <strong>%1</strong> could not be found by the beginning "
-"of the document. Should the search be restarted from the end of the "
-"document?</qt>"
-msgstr ""
-
-#: tdemultipage.cpp:1713
-#, c-format
-msgid "Reloading file %1"
-msgstr ""
-
-#: tdemultipage.cpp:1749
-#, c-format
-msgid "Loading file %1"
-msgstr "Llwytho ffeil %1"
-
-#: tdemultipage.cpp:1906
-msgid "*.txt|Plain Text (Latin 1) (*.txt)"
-msgstr ""
-
-#: tdemultipage.cpp:1906
-msgid "Export File As"
-msgstr "Allforio Ffeil Fel"
-
-#: tdemultipage.cpp:1915
-msgid ""
-"The file %1\n"
-"exists. Do you want to overwrite that file?"
-msgstr ""
-
-#: tdemultipage.cpp:1926
-msgid "Exporting to text..."
-msgstr ""
-
-#: tdemultipage.cpp:1926
-msgid "Abort"
-msgstr "Erthylu"
-
 #: kprintDialogPage_pageoptions.cpp:26
 #, fuzzy
 msgid "Page Size & Placement"
@@ -870,8 +782,8 @@ msgstr "in"
 
 #. i18n: file pageSizeWidget_base.ui line 144
 #: rc.cpp:140
-#, no-c-format
-msgid "Orientation:"
+#, fuzzy, no-c-format
+msgid "Qt::Orientation:"
 msgstr "Cyfeiriadaeth:"
 
 #. i18n: file pageSizeWidget_base.ui line 188
@@ -880,7 +792,7 @@ msgstr "Cyfeiriadaeth:"
 msgid "Page Preview"
 msgstr "Rhagolwg Tudalen"
 
-#. i18n: file kviewshell.kcfg line 72
+#. i18n: file kviewshell.kcfg line 75
 #: rc.cpp:152
 #, no-c-format
 msgid ""
@@ -921,6 +833,95 @@ msgstr "Llythrennau mawr/bach o bwys"
 msgid "Topic"
 msgstr ""
 
+#: tdemultipage.cpp:70
+msgid "Thumbnails"
+msgstr "Rhagolygon cryno"
+
+#: tdemultipage.cpp:158
+msgid "Save File As"
+msgstr ""
+
+#: tdemultipage.cpp:169
+msgid ""
+"The file %1\n"
+"exists. Shall I overwrite that file?"
+msgstr ""
+
+#: tdemultipage.cpp:170 tdemultipage.cpp:1916
+msgid "Overwrite File"
+msgstr "Trosysgrifo Ffeil"
+
+#: tdemultipage.cpp:170 tdemultipage.cpp:1916
+msgid "Overwrite"
+msgstr "Trosysgrifo"
+
+#: tdemultipage.cpp:770
+#, c-format
+msgid "Print %1"
+msgstr "Argraffu %1"
+
+#: tdemultipage.cpp:1422 tdemultipage.cpp:1564
+msgid "Search interrupted"
+msgstr ""
+
+#: tdemultipage.cpp:1430 tdemultipage.cpp:1572
+msgid "Search page %1 of %2"
+msgstr ""
+
+#: tdemultipage.cpp:1475
+msgid ""
+"<qt>The search string <strong>%1</strong> could not be found by the end of the "
+"document. Should the search be restarted from the beginning of the "
+"document?</qt>"
+msgstr ""
+
+#: tdemultipage.cpp:1478 tdemultipage.cpp:1620
+msgid "Text Not Found"
+msgstr ""
+
+#: tdemultipage.cpp:1502 tdemultipage.cpp:1644
+msgid "<qt>The search string <strong>%1</strong> could not be found.</qt>"
+msgstr ""
+
+#: tdemultipage.cpp:1617
+msgid ""
+"<qt>The search string <strong>%1</strong> could not be found by the beginning "
+"of the document. Should the search be restarted from the end of the "
+"document?</qt>"
+msgstr ""
+
+#: tdemultipage.cpp:1713
+#, c-format
+msgid "Reloading file %1"
+msgstr ""
+
+#: tdemultipage.cpp:1749
+#, c-format
+msgid "Loading file %1"
+msgstr "Llwytho ffeil %1"
+
+#: tdemultipage.cpp:1906
+msgid "*.txt|Plain Text (Latin 1) (*.txt)"
+msgstr ""
+
+#: tdemultipage.cpp:1906
+msgid "Export File As"
+msgstr "Allforio Ffeil Fel"
+
+#: tdemultipage.cpp:1915
+msgid ""
+"The file %1\n"
+"exists. Do you want to overwrite that file?"
+msgstr ""
+
+#: tdemultipage.cpp:1926
+msgid "Exporting to text..."
+msgstr ""
+
+#: tdemultipage.cpp:1926
+msgid "Abort"
+msgstr "Erthylu"
+
 #~ msgid "OverWrite"
 #~ msgstr "Trosysgrifo"
 
diff --git a/tde-i18n-cy/messages/tdegraphics/kviewviewer.po b/tde-i18n-cy/messages/tdegraphics/kviewviewer.po
index 6e4dd3c5d0b..b22ca2b7ad8 100644
--- a/tde-i18n-cy/messages/tdegraphics/kviewviewer.po
+++ b/tde-i18n-cy/messages/tdegraphics/kviewviewer.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdegraphics/kviewviewer.po\n"
-"POT-Creation-Date: 2005-07-24 01:35+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdegraphics/libkfaximgage.po b/tde-i18n-cy/messages/tdegraphics/libkfaximgage.po
index 81c7603e0a7..3bd9ac78347 100644
--- a/tde-i18n-cy/messages/tdegraphics/libkfaximgage.po
+++ b/tde-i18n-cy/messages/tdegraphics/libkfaximgage.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2005-10-15 02:46+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdegraphics/libkscan.po b/tde-i18n-cy/messages/tdegraphics/libkscan.po
index 8eeb0c70af7..2fbe0547762 100644
--- a/tde-i18n-cy/messages/tdegraphics/libkscan.po
+++ b/tde-i18n-cy/messages/tdegraphics/libkscan.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdegraphics/libkscan.po\n"
-"POT-Creation-Date: 2008-02-01 01:56+0100\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -391,7 +392,7 @@ msgstr ""
 #: scanparams.cpp:518
 msgid ""
 "<B>Problem: No Scanner was found</B><P>Your system does not provide a SANE <I>"
-"(Scanner Access Now Easy)</I> installation, which is required by the TDE scan "
+"(Scanner Access Now Easy)</I> installation, which is required by the KDE scan "
 "support.<P>Please install and configure SANE correctly on your system.<P>"
 "Visit the SANE homepage under http://www.sane-project.org to find out more "
 "about SANE installation and configuration. "
@@ -414,7 +415,7 @@ msgid "SANE debug (pnm only)"
 msgstr ""
 
 #: scanparams.cpp:675
-msgid "virt. Scan (all Qt modes)"
+msgid "virt. Scan (all TQt modes)"
 msgstr ""
 
 #: scanparams.cpp:736
diff --git a/tde-i18n-cy/messages/tdegraphics/tdefile_bmp.po b/tde-i18n-cy/messages/tdegraphics/tdefile_bmp.po
index eec0562f834..b52ba1cfc50 100644
--- a/tde-i18n-cy/messages/tdegraphics/tdefile_bmp.po
+++ b/tde-i18n-cy/messages/tdegraphics/tdefile_bmp.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdegraphics/tdefile_bmp.po\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdegraphics/tdefile_dds.po b/tde-i18n-cy/messages/tdegraphics/tdefile_dds.po
index 0d433d9e81f..fd7fdc8a6cf 100644
--- a/tde-i18n-cy/messages/tdegraphics/tdefile_dds.po
+++ b/tde-i18n-cy/messages/tdegraphics/tdefile_dds.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: all2.po\n"
-"POT-Creation-Date: 2004-11-01 01:46+0100\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdegraphics/tdefile_dvi.po b/tde-i18n-cy/messages/tdegraphics/tdefile_dvi.po
index 5b6e3da4ee4..4377715e8a5 100644
--- a/tde-i18n-cy/messages/tdegraphics/tdefile_dvi.po
+++ b/tde-i18n-cy/messages/tdegraphics/tdefile_dvi.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdegraphics/tdefile_dvi.po\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdegraphics/tdefile_exr.po b/tde-i18n-cy/messages/tdegraphics/tdefile_exr.po
index 28b3e4af549..d1948f186da 100644
--- a/tde-i18n-cy/messages/tdegraphics/tdefile_exr.po
+++ b/tde-i18n-cy/messages/tdegraphics/tdefile_exr.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdegraphics/tdefile_exr.po\n"
-"POT-Creation-Date: 2007-08-23 01:13+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdegraphics/tdefile_gif.po b/tde-i18n-cy/messages/tdegraphics/tdefile_gif.po
index d0aeefceffc..77542072860 100644
--- a/tde-i18n-cy/messages/tdegraphics/tdefile_gif.po
+++ b/tde-i18n-cy/messages/tdegraphics/tdefile_gif.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdegraphics/tdefile_gif.po\n"
-"POT-Creation-Date: 2005-03-14 01:33+0100\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdegraphics/tdefile_ico.po b/tde-i18n-cy/messages/tdegraphics/tdefile_ico.po
index 45388607d03..1e838d80018 100644
--- a/tde-i18n-cy/messages/tdegraphics/tdefile_ico.po
+++ b/tde-i18n-cy/messages/tdegraphics/tdefile_ico.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdegraphics/tdefile_ico.po\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdegraphics/tdefile_jpeg.po b/tde-i18n-cy/messages/tdegraphics/tdefile_jpeg.po
index 1c6ce57207c..10e14c6edaa 100644
--- a/tde-i18n-cy/messages/tdegraphics/tdefile_jpeg.po
+++ b/tde-i18n-cy/messages/tdegraphics/tdefile_jpeg.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdegraphics/tdefile_jpeg.po\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -169,8 +170,8 @@ msgstr "Dim ar gael"
 msgid "Infinite"
 msgstr ""
 
-#: tdefile_jpeg.cpp:335 tdefile_jpeg.cpp:370 tdefile_jpeg.cpp:378 tdefile_jpeg.cpp:403
-#: tdefile_jpeg.cpp:439 tdefile_jpeg.cpp:462
+#: tdefile_jpeg.cpp:335 tdefile_jpeg.cpp:370 tdefile_jpeg.cpp:378
+#: tdefile_jpeg.cpp:403 tdefile_jpeg.cpp:439 tdefile_jpeg.cpp:462
 msgid "Unknown"
 msgstr "Anhysbys"
 
diff --git a/tde-i18n-cy/messages/tdegraphics/tdefile_pcx.po b/tde-i18n-cy/messages/tdegraphics/tdefile_pcx.po
index 6e9dbdee24b..46aaf1c343b 100644
--- a/tde-i18n-cy/messages/tdegraphics/tdefile_pcx.po
+++ b/tde-i18n-cy/messages/tdegraphics/tdefile_pcx.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdegraphics/tdefile_pcx.po\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdegraphics/tdefile_pdf.po b/tde-i18n-cy/messages/tdegraphics/tdefile_pdf.po
index 75c442368ac..3bdc0e2dd0d 100644
--- a/tde-i18n-cy/messages/tdegraphics/tdefile_pdf.po
+++ b/tde-i18n-cy/messages/tdegraphics/tdefile_pdf.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdegraphics/tdefile_pdf.po\n"
-"POT-Creation-Date: 2005-04-20 15:05+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdegraphics/tdefile_png.po b/tde-i18n-cy/messages/tdegraphics/tdefile_png.po
index 7a848c3c32e..3fc363fedeb 100644
--- a/tde-i18n-cy/messages/tdegraphics/tdefile_png.po
+++ b/tde-i18n-cy/messages/tdegraphics/tdefile_png.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdegraphics/tdefile_png.po\n"
-"POT-Creation-Date: 2004-12-16 01:20+0100\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -49,8 +50,8 @@ msgstr "Sylwad"
 msgid "Grayscale"
 msgstr "Graddlwyd"
 
-#: tdefile_png.cpp:66 tdefile_png.cpp:70 tdefile_png.cpp:183 tdefile_png.cpp:187
-#: tdefile_png.cpp:191
+#: tdefile_png.cpp:66 tdefile_png.cpp:70 tdefile_png.cpp:183
+#: tdefile_png.cpp:187 tdefile_png.cpp:191
 msgid "Unknown"
 msgstr "Anhysbys"
 
diff --git a/tde-i18n-cy/messages/tdegraphics/tdefile_pnm.po b/tde-i18n-cy/messages/tdegraphics/tdefile_pnm.po
index a6a317c9780..a67c4dabb15 100644
--- a/tde-i18n-cy/messages/tdegraphics/tdefile_pnm.po
+++ b/tde-i18n-cy/messages/tdegraphics/tdefile_pnm.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdegraphics/tdefile_pnm.po\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdegraphics/tdefile_ps.po b/tde-i18n-cy/messages/tdegraphics/tdefile_ps.po
index 7af46bce952..bd00ecd1787 100644
--- a/tde-i18n-cy/messages/tdegraphics/tdefile_ps.po
+++ b/tde-i18n-cy/messages/tdegraphics/tdefile_ps.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdegraphics/tdefile_ps.po\n"
-"POT-Creation-Date: 2005-03-29 01:16+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdegraphics/tdefile_rgb.po b/tde-i18n-cy/messages/tdegraphics/tdefile_rgb.po
index b967aebdb1c..068acfdb6a7 100644
--- a/tde-i18n-cy/messages/tdegraphics/tdefile_rgb.po
+++ b/tde-i18n-cy/messages/tdegraphics/tdefile_rgb.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdegraphics/tdefile_rgb.po\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdegraphics/tdefile_tga.po b/tde-i18n-cy/messages/tdegraphics/tdefile_tga.po
index e5eb36afca1..5244443df57 100644
--- a/tde-i18n-cy/messages/tdegraphics/tdefile_tga.po
+++ b/tde-i18n-cy/messages/tdegraphics/tdefile_tga.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdegraphics/tdefile_tga.po\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdegraphics/tdefile_tiff.po b/tde-i18n-cy/messages/tdegraphics/tdefile_tiff.po
index 6a0d86b37d8..44f4f0dd903 100644
--- a/tde-i18n-cy/messages/tdegraphics/tdefile_tiff.po
+++ b/tde-i18n-cy/messages/tdegraphics/tdefile_tiff.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdegraphics/tdefile_tiff.po\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdegraphics/tdefile_xbm.po b/tde-i18n-cy/messages/tdegraphics/tdefile_xbm.po
index 4199a047cfa..11679df02ad 100644
--- a/tde-i18n-cy/messages/tdegraphics/tdefile_xbm.po
+++ b/tde-i18n-cy/messages/tdegraphics/tdefile_xbm.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdegraphics/tdefile_xbm.po\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdegraphics/tdefile_xpm.po b/tde-i18n-cy/messages/tdegraphics/tdefile_xpm.po
index 70ecf5e5fc0..b2b663c7132 100644
--- a/tde-i18n-cy/messages/tdegraphics/tdefile_xpm.po
+++ b/tde-i18n-cy/messages/tdegraphics/tdefile_xpm.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: all2.po\n"
-"POT-Creation-Date: 2004-11-15 01:37+0100\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdegraphics/tdeiconedit.po b/tde-i18n-cy/messages/tdegraphics/tdeiconedit.po
index 324b2040ec7..8b5bb0e7f36 100644
--- a/tde-i18n-cy/messages/tdegraphics/tdeiconedit.po
+++ b/tde-i18n-cy/messages/tdegraphics/tdeiconedit.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdegraphics/tdeiconedit.po\n"
-"POT-Creation-Date: 2006-03-05 03:45+0100\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -372,7 +373,7 @@ msgstr ""
 msgid "Colors: %1"
 msgstr "Lliwiau: %1"
 
-#: kicongrid.cpp:90
+#: tdeicongrid.cpp:90
 msgid ""
 "Icon draw grid\n"
 "\n"
@@ -382,66 +383,66 @@ msgid ""
 "scale)"
 msgstr ""
 
-#: kicongrid.cpp:116
+#: tdeicongrid.cpp:116
 msgid "width"
 msgstr "lled"
 
-#: kicongrid.cpp:121
+#: tdeicongrid.cpp:121
 msgid "height"
 msgstr "taldra"
 
-#: kicongrid.cpp:125
+#: tdeicongrid.cpp:125
 msgid ""
 "Rulers\n"
 "\n"
 "This is a visual representation of the current cursor position"
 msgstr ""
 
-#: kicongrid.cpp:816
+#: tdeicongrid.cpp:816
 msgid "Free Hand"
 msgstr ""
 
-#: kicongrid.cpp:1020
+#: tdeicongrid.cpp:1020
 msgid ""
 "There was an error loading a blank image.\n"
 msgstr ""
 
-#: kicongrid.cpp:1152
+#: tdeicongrid.cpp:1152
 msgid "All selected"
 msgstr ""
 
-#: kicongrid.cpp:1163
+#: tdeicongrid.cpp:1163
 msgid "Cleared"
 msgstr ""
 
-#: kicongrid.cpp:1205
+#: tdeicongrid.cpp:1205
 msgid "Selected area cut"
 msgstr ""
 
-#: kicongrid.cpp:1209
+#: tdeicongrid.cpp:1209
 msgid "Selected area copied"
 msgstr ""
 
-#: kicongrid.cpp:1234
+#: tdeicongrid.cpp:1234
 msgid ""
 "The clipboard image is larger than the current image!\n"
 "Paste as new image?"
 msgstr ""
 
-#: kicongrid.cpp:1235
+#: tdeicongrid.cpp:1235
 msgid "Do Not Paste"
 msgstr ""
 
-#: kicongrid.cpp:1354 kicongrid.cpp:1388
+#: tdeicongrid.cpp:1354 tdeicongrid.cpp:1388
 msgid "Done pasting"
 msgstr ""
 
-#: kicongrid.cpp:1359 kicongrid.cpp:1394
+#: tdeicongrid.cpp:1359 tdeicongrid.cpp:1394
 msgid ""
 "Invalid pixmap data in clipboard!\n"
 msgstr ""
 
-#: kicongrid.cpp:1901
+#: tdeicongrid.cpp:1901
 msgid "Drawn Array"
 msgstr ""
 
@@ -482,35 +483,35 @@ msgid ""
 "Double-click on a box to edit the color"
 msgstr ""
 
-#: kicon.cpp:73
+#: tdeicon.cpp:73
 msgid ""
 "The URL: %1 \n"
 "seems to be malformed.\n"
 msgstr ""
 
-#: kicon.cpp:89 kicon.cpp:104
+#: tdeicon.cpp:89 tdeicon.cpp:104
 msgid ""
 "There was an error loading:\n"
 "%1\n"
 msgstr ""
 
-#: kicon.cpp:178
+#: tdeicon.cpp:178
 msgid "Save Icon As"
 msgstr ""
 
-#: kicon.cpp:210
+#: tdeicon.cpp:210
 msgid "A file named \"%1\" already exists. Overwrite it?"
 msgstr ""
 
-#: kicon.cpp:212
+#: tdeicon.cpp:212
 msgid "Overwrite File?"
 msgstr "Trosysgrifo'r Ffeil?"
 
-#: kicon.cpp:213
+#: tdeicon.cpp:213
 msgid "&Overwrite"
 msgstr "&Trosysgrifo"
 
-#: kicon.cpp:268
+#: tdeicon.cpp:268
 msgid ""
 "There was an error saving:\n"
 "%1\n"
@@ -560,7 +561,7 @@ msgstr ""
 msgid "Create from template"
 msgstr ""
 
-#: kiconconfig.cpp:121 knew.cpp:199
+#: knew.cpp:199 tdeiconconfig.cpp:121
 msgid "Templates"
 msgstr "Patrymluniau"
 
@@ -601,107 +602,107 @@ msgstr "%1 x %2"
 msgid "modified"
 msgstr "addaswyd"
 
-#: kiconconfig.cpp:56
+#: tdeiconconfig.cpp:56
 msgid "Icon Template"
 msgstr ""
 
-#: kiconconfig.cpp:61
+#: tdeiconconfig.cpp:61
 msgid "Template"
 msgstr "Patrymlun"
 
-#: kiconconfig.cpp:70
+#: tdeiconconfig.cpp:70
 msgid "Description:"
 msgstr "Disgrifiad:"
 
-#: kiconconfig.cpp:75
+#: tdeiconconfig.cpp:75
 msgid "Path:"
 msgstr "Llwybr:"
 
-#: kiconconfig.cpp:141
+#: tdeiconconfig.cpp:141
 msgid "&Add..."
 msgstr "Ychw&anegu..."
 
-#: kiconconfig.cpp:144
+#: tdeiconconfig.cpp:144
 msgid "&Edit..."
 msgstr "&Golygu..."
 
-#: kiconconfig.cpp:247
+#: tdeiconconfig.cpp:247
 msgid "Select Background"
 msgstr "Dewis Cefndir"
 
-#: kiconconfig.cpp:263
+#: tdeiconconfig.cpp:263
 msgid "Use co&lor"
 msgstr "Defnyd&dio lliw"
 
-#: kiconconfig.cpp:267
+#: tdeiconconfig.cpp:267
 msgid "Use pix&map"
 msgstr ""
 
-#: kiconconfig.cpp:280
+#: tdeiconconfig.cpp:280
 msgid "Choose..."
 msgstr "Dewis..."
 
-#: kiconconfig.cpp:283
+#: tdeiconconfig.cpp:283
 msgid "Preview"
 msgstr "Rhagolwg"
 
-#: kiconconfig.cpp:363
+#: tdeiconconfig.cpp:363
 msgid "Only local files are supported yet."
 msgstr ""
 
-#: kiconconfig.cpp:384
+#: tdeiconconfig.cpp:384
 msgid "Paste &transparent pixels"
 msgstr ""
 
-#: kiconconfig.cpp:388
+#: tdeiconconfig.cpp:388
 msgid "Show &rulers"
 msgstr "Dango&s mesuryddion"
 
-#: kiconconfig.cpp:392
+#: tdeiconconfig.cpp:392
 msgid "Transparency Display"
 msgstr ""
 
-#: kiconconfig.cpp:402
+#: tdeiconconfig.cpp:402
 msgid "&Solid color:"
 msgstr ""
 
-#: kiconconfig.cpp:412
+#: tdeiconconfig.cpp:412
 msgid "Checker&board"
 msgstr ""
 
-#: kiconconfig.cpp:422
+#: tdeiconconfig.cpp:422
 msgid "Small"
 msgstr "Bach"
 
-#: kiconconfig.cpp:423
+#: tdeiconconfig.cpp:423
 msgid "Medium"
 msgstr "Canolig"
 
-#: kiconconfig.cpp:424
+#: tdeiconconfig.cpp:424
 msgid "Large"
 msgstr "Mawr"
 
-#: kiconconfig.cpp:427
+#: tdeiconconfig.cpp:427
 msgid "Si&ze:"
 msgstr "Main&t:"
 
-#: kiconconfig.cpp:433
+#: tdeiconconfig.cpp:433
 msgid "Color &1:"
 msgstr "Lliw 1&:"
 
-#: kiconconfig.cpp:439
+#: tdeiconconfig.cpp:439
 msgid "Color &2:"
 msgstr "Lliw 2&:"
 
-#: kiconconfig.cpp:540
+#: tdeiconconfig.cpp:540
 msgid "Icon Templates"
 msgstr ""
 
-#: kiconconfig.cpp:543
+#: tdeiconconfig.cpp:543
 msgid "Background"
 msgstr "Cefndir"
 
-#: kiconconfig.cpp:546
+#: tdeiconconfig.cpp:546
 msgid "Icon Grid"
 msgstr ""
 
diff --git a/tde-i18n-cy/messages/tdelibs/cupsdconf.po b/tde-i18n-cy/messages/tdelibs/cupsdconf.po
index beab725dbf7..281b95d59da 100644
--- a/tde-i18n-cy/messages/tdelibs/cupsdconf.po
+++ b/tde-i18n-cy/messages/tdelibs/cupsdconf.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdelibs/cupsdconf.po\n"
-"POT-Creation-Date: 2005-05-18 21:23+0200\n"
+"POT-Creation-Date: 2014-09-29 00:46-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -53,1013 +54,6 @@ msgstr "I:"
 msgid "Browse Address"
 msgstr ""
 
-#: cupsd.conf.template.cpp:1
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Server name (ServerName)</b>\n"
-"<p>\n"
-"The hostname of your server, as advertised to the world.\n"
-"By default CUPS will use the hostname of the system.</p>\n"
-"<p>\n"
-"To set the default server used by clients, see the client.conf file.</p>\n"
-"<p>\n"
-"<i>ex</i>: myhost.domain.com</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:11
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Server administrator (ServerAdmin)</b>\n"
-"<p>\n"
-"The email address to send all complaints or problems to.\n"
-"By default CUPS will use \"root@hostname\".</p>\n"
-"<p>\n"
-"<i>ex</i>: root@myhost.com</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:19
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Access log (AccessLog)</b>\n"
-"<p>\n"
-"The access log file; if this does not start with a leading /\n"
-"then it is assumed to be relative to ServerRoot.  By default set to\n"
-"\"/var/log/cups/access_log\".</p>\n"
-"<p>\n"
-"You can also use the special name <b>syslog</b> to send the output to the\n"
-"syslog file or daemon.</p>\n"
-"<p>\n"
-"<i>ex</i>: /var/log/cups/access_log</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:31
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Data directory (DataDir)</b>\n"
-"<p>\n"
-"The root directory for the CUPS data files.\n"
-"By default /usr/share/cups.</p>\n"
-"<p>\n"
-"<i>ex</i>: /usr/share/cups</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:39
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Default character set (DefaultCharset)</b>\n"
-"<p>\n"
-"The default character set to use. If not specified,\n"
-"defaults to utf-8.  Note that this can also be overridden in\n"
-"HTML documents...</p>\n"
-"<p>\n"
-"<i>ex</i>: utf-8</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:48
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Default language (DefaultLanguage)</b>\n"
-"<p>\n"
-"The default language if not specified by the browser.\n"
-"If not specified, the current locale is used.</p>\n"
-"<p>\n"
-"<i>ex</i>: en</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:56
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Document directory (DocumentRoot)</b>\n"
-"<p>\n"
-"The root directory for HTTP documents that are served.\n"
-"By default the compiled-in directory.</p>\n"
-"<p>\n"
-"<i>ex</i>: /usr/share/cups/doc</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:64
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Error log (ErrorLog)</b>\n"
-"<p>\n"
-"The error log file; if this does not start with a leading /\n"
-"then it is assumed to be relative to ServerRoot.  By default set to\n"
-"\"/var/log/cups/error_log\".</p>\n"
-"<p>\n"
-"You can also use the special name <b>syslog</b> to send the output to the\n"
-"syslog file or daemon.</p>\n"
-"<p>\n"
-"<i>ex</i>: /var/log/cups/error_log</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:76
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Font path (FontPath)</b>\n"
-"<p>\n"
-"The path to locate all font files (currently only for pstoraster).\n"
-"By default /usr/share/cups/fonts.</p>\n"
-"<p>\n"
-"<i>ex</i>: /usr/share/cups/fonts</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:84
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Log level (LogLevel)</b>\n"
-"<p>\n"
-"Controls the number of messages logged to the ErrorLog\n"
-"file and can be one of the following:</p>\n"
-"<ul type=circle>\n"
-"<li><i>debug2</i>:     Log everything.</li>\n"
-"<li><i>debug</i>:     Log almost everything.</li>\n"
-"<li><i>info</i>:      Log all requests and state changes.</li>\n"
-"<li><i>warn</i>:      Log errors and warnings.</li>\n"
-"<li><i>error</i>:     Log only errors.</li>\n"
-"<li><i>none</i>:      Log nothing.</li>\n"
-"</ul>"
-"<p>\n"
-"<i>ex</i>: info</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:99
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Max log size (MaxLogSize)</b>\n"
-"<p>\n"
-"Controls the maximum size of each log file before they are\n"
-"rotated.  Defaults to 1048576 (1MB).  Set to 0 to disable log rotating.</p>\n"
-"<p>\n"
-"<i>ex</i>: 1048576</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:107
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Page log (PageLog)</b>\n"
-"<p>\n"
-"The page log file; if this does not start with a leading /\n"
-"then it is assumed to be relative to ServerRoot.  By default set to\n"
-"\"/var/log/cups/page_log\".</p>\n"
-"<p>\n"
-"You can also use the special name <b>syslog</b> to send the output to the\n"
-"syslog file or daemon.</p>\n"
-"<p>\n"
-"<i>ex</i>: /var/log/cups/page_log</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:119
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Preserve job history (PreserveJobHistory)</b>\n"
-"<p>\n"
-"Whether or not to preserve the job history after a\n"
-"job is completed, canceled, or stopped.  Default is Yes.</p>\n"
-"<p>\n"
-"<i>ex</i>: Yes</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:127
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Preserve job files (PreserveJobFiles)</b>\n"
-"<p>\n"
-"Whether or not to preserve the job files after a\n"
-"job is completed, canceled, or stopped.  Default is No.</p>\n"
-"<p>\n"
-"<i>ex</i>: No</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:135
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Printcap file (Printcap)</b>\n"
-"<p>\n"
-"The name of the printcap file.  Default is no filename.\n"
-"Leave blank to disable printcap file generation.</p>\n"
-"<p>\n"
-"<i>ex</i>: /etc/printcap</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:143
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Request directory (RequestRoot)</b>\n"
-"<p>\n"
-"The directory where request files are stored.\n"
-"By default /var/spool/cups.</p>\n"
-"<p>\n"
-"<i>ex</i>: /var/spool/cups</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:151
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Remote root user (RemoteRoot)</b>\n"
-"<p>\n"
-"The name of the user assigned to unauthenticated accesses\n"
-"from remote systems.  By default \"remroot\".</p>\n"
-"<p>\n"
-"<i>ex</i>: remroot</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:159
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Server binaries (ServerBin)</b>\n"
-"<p>\n"
-"The root directory for the scheduler executables.\n"
-"By default /usr/lib/cups or /usr/lib32/cups (IRIX 6.5).</p>\n"
-"<p>\n"
-"<i>ex</i>: /usr/lib/cups</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:167
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Server files (ServerRoot)</b>\n"
-"<p>\n"
-"The root directory for the scheduler.\n"
-"By default /etc/cups.</p>\n"
-"<p>\n"
-"<i>ex</i>: /etc/cups</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:175
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>User (User)</b>\n"
-"<p>\n"
-"The user the server runs under.  Normally this\n"
-"must be <b>lp</b>, however you can configure things for another user\n"
-"as needed.</p>\n"
-"<p>\n"
-"Note: the server must be run initially as root to support the\n"
-"default IPP port of 631.  It changes users whenever an external\n"
-"program is run...</p>\n"
-"<p>\n"
-"<i>ex</i>: lp</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:188
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Group (Group)</b>\n"
-"<p>\n"
-"The group the server runs under.  Normally this\n"
-"must be <b>sys</b>, however you can configure things for another\n"
-"group as needed.</p>\n"
-"<p>\n"
-"<i>ex</i>: sys</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:197
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>RIP cache (RIPCache)</b>\n"
-"<p>\n"
-"The amount of memory that each RIP should use to cache\n"
-"bitmaps.  The value can be any real number followed by \"k\" for\n"
-"kilobytes, \"m\" for megabytes, \"g\" for gigabytes, or \"t\" for tiles\n"
-"(1 tile = 256x256 pixels).  Defaults to \"8m\" (8 megabytes).</p>\n"
-"<p>\n"
-"<i>ex</i>: 8m</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:207
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Temporary files (TempDir)</b>\n"
-"<p>\n"
-"The directory to put temporary files in. This directory must be\n"
-"writable by the user defined above!  Defaults to \"/var/spool/cups/tmp\" or\n"
-"the value of the TMPDIR environment variable.</p>\n"
-"<p>\n"
-"<i>ex</i>: /var/spool/cups/tmp</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:216
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Filter limit (FilterLimit)</b>\n"
-"<p>\n"
-"Sets the maximum cost of all job filters that can be run\n"
-"at the same time.  A limit of 0 means no limit.  A typical job may need\n"
-"a filter limit of at least 200; limits less than the minimum required\n"
-"by a job force a single job to be printed at any time.</p>\n"
-"<p>\n"
-"The default limit is 0 (unlimited).</p>\n"
-"<p>\n"
-"<i>ex</i>: 200</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:228
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Listen to (Port/Listen)</b>\n"
-"<p>\n"
-"Ports/addresses that are listened to.  The default port 631 is reserved\n"
-"for the Internet Printing Protocol (IPP) and is what is used here.</p>\n"
-"<p>\n"
-"You can have multiple Port/Listen lines to listen to more than one\n"
-"port or address, or to restrict access.</p>\n"
-"<p>\n"
-"Note: Unfortunately, most web browsers don't support TLS or HTTP Upgrades\n"
-"for encryption.  If you want to support web-based encryption you will\n"
-"probably need to listen on port 443 (the \"HTTPS\" port...).</p>\n"
-"<p>\n"
-"<i>ex</i>: 631, myhost:80, 1.2.3.4:631</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:243
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Hostname lookups (HostNameLookups)</b>\n"
-"<p>\n"
-"Whether or not to do lookups on IP addresses to get a\n"
-"fully-qualified hostname.  This defaults to Off for performance reasons...</p>\n"
-"<p>\n"
-"<i>ex</i>: On</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:251
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Keep alive (KeepAlive)</b>\n"
-"<p>\n"
-"Whether or not to support the Keep-Alive connection\n"
-"option.  Default is on.</p>\n"
-"<p>\n"
-"<i>ex</i>: On</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:259
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Keep-alive timeout (KeepAliveTimeout)</b>\n"
-"<p>\n"
-"The timeout (in seconds) before Keep-Alive connections are\n"
-"automatically closed.  Default is 60 seconds.</p>\n"
-"<p>\n"
-"<i>ex</i>: 60</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:267
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Max clients (MaxClients)</b>\n"
-"<p>\n"
-"Controls the maximum number of simultaneous clients that\n"
-"will be handled.  Defaults to 100.</p>\n"
-"<p>\n"
-"<i>ex</i>: 100</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:275
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Max request size (MaxRequestSize)</b>\n"
-"<p>\n"
-"Controls the maximum size of HTTP requests and print files.\n"
-"Set to 0 to disable this feature (defaults to 0).</p>\n"
-"<p>\n"
-"<i>ex</i>: 0</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:283
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Client timeout (Timeout)</b>\n"
-"<p>\n"
-"The timeout (in seconds) before requests time out.  Default is 300 seconds.</p>"
-"\n"
-"<p>\n"
-"<i>ex</i>: 300</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:290
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Use browsing (Browsing)</b>\n"
-"<p>\n"
-"Whether or not to <b>listen</b> to printer \n"
-"information from other CUPS servers.  \n"
-"</p>\n"
-"<p>\n"
-"Enabled by default.\n"
-"</p>\n"
-"<p>\n"
-"Note: to enable the <b>sending</b> of browsing\n"
-"information from this CUPS server to the LAN,\n"
-"specify a valid <i>BrowseAddress</i>.\n"
-"</p>\n"
-"<p>\n"
-"<i>ex</i>: On</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:307
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Use short names (BrowseShortNames)</b>\n"
-"<p>\n"
-"Whether or not to use \"short\" names for remote printers\n"
-"when possible (e.g. \"printer\" instead of \"printer@host\").  Enabled by\n"
-"default.</p>\n"
-"<p>\n"
-"<i>ex</i>: Yes</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:316
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Browse addresses (BrowseAddress)</b>\n"
-"<p>\n"
-"Specifies a broadcast address to be used.  By\n"
-"default browsing information is broadcast to all active interfaces.</p>\n"
-"<p>\n"
-"Note: HP-UX 10.20 and earlier do not properly handle broadcast unless\n"
-"you have a Class A, B, C, or D netmask (i.e. no CIDR support).</p>\n"
-"<p>\n"
-"<i>ex</i>: x.y.z.255, x.y.255.255</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:327
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Browse allow/deny (BrowseAllow/BrowseDeny)</b>\n"
-"<p>\n"
-"<u>BrowseAllow</u>: specifies an address mask to allow for incoming browser\n"
-"packets. The default is to allow packets from all addresses.</p>\n"
-"<p>\n"
-"<u>BrowseDeny</u>: specifies an address mask to deny for incoming browser\n"
-"packets. The default is to deny packets from no addresses.</p>\n"
-"<p>\n"
-"Both \"BrowseAllow\" and \"BrowseDeny\" accept the following notations for\n"
-"addresses:</p>\n"
-"<pre>\n"
-"All\n"
-"None\n"
-"*.domain.com\n"
-".domain.com\n"
-"host.domain.com\n"
-"nnn.*\n"
-"nnn.nnn.*\n"
-"nnn.nnn.nnn.*\n"
-"nnn.nnn.nnn.nnn\n"
-"nnn.nnn.nnn.nnn/mm\n"
-"nnn.nnn.nnn.nnn/mmm.mmm.mmm.mmm\n"
-"</pre>"
-"<p>\n"
-"The hostname/domainname restrictions only work if you have turned hostname\n"
-"lookups on!</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:354
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Browse interval (BrowseInterval)</b>\n"
-"<p>\n"
-"The time between browsing updates in seconds.  Default\n"
-"is 30 seconds.</p>\n"
-"<p>\n"
-"Note that browsing information is sent whenever a printer's state changes\n"
-"as well, so this represents the maximum time between updates.</p>\n"
-"<p>\n"
-"Set this to 0 to disable outgoing broadcasts so your local printers are\n"
-"not advertised but you can still see printers on other hosts.</p>\n"
-"<p>\n"
-"<i>ex</i>: 30</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:368
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Browse order (BrowseOrder)</b>\n"
-"<p>\n"
-"Specifies the order of BrowseAllow/BrowseDeny comparisons.</p>\n"
-"<p>\n"
-"<i>ex</i>: allow,deny</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:375
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Browse poll (BrowsePoll)</b>\n"
-"<p>\n"
-"Poll the named server(s) for printers.</p>\n"
-"<p>\n"
-"<i>ex</i>: myhost:631</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:382
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Browse port (BrowsePort)</b>\n"
-"<p>\n"
-"The port used for UDP broadcasts.  By default this is\n"
-"the IPP port; if you change this you need to do it on all servers.\n"
-"Only one BrowsePort is recognized.</p>\n"
-"<p>\n"
-"<i>ex</i>: 631</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:391
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Browse relay (BrowseRelay)</b>\n"
-"<p>\n"
-"Relay browser packets from one address/network to another.</p>\n"
-"<p>\n"
-"<i>ex</i>: src-address dest-address</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:398
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Browse timeout (BrowseTimeout)</b>\n"
-"<p>\n"
-"The timeout (in seconds) for network printers - if we don't\n"
-"get an update within this time the printer will be removed\n"
-"from the printer list.  This number definitely should not be\n"
-"less the BrowseInterval value for obvious reasons.  Defaults\n"
-"to 300 seconds.</p>\n"
-"<p>\n"
-"<i>ex</i>: 300</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:409
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Implicit classes (ImplicitClasses)</b>\n"
-"<p>\n"
-"Whether or not to use implicit classes.</p>\n"
-"<p>\n"
-"Printer classes can be specified explicitly in the classes.conf\n"
-"file, implicitly based upon the printers available on the LAN, or\n"
-"both.</p>\n"
-"<p>\n"
-"When ImplicitClasses is On, printers on the LAN with the same name\n"
-"(e.g. Acme-LaserPrint-1000) will be put into a class with the same\n"
-"name. This allows you to setup multiple redundant queues on a LAN\n"
-"without a lot of administrative difficulties.  If a user sends a\n"
-"job to Acme-LaserPrint-1000, the job will go to the first available\n"
-"queue.</p>\n"
-"<p>\n"
-"Enabled by default.</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:427
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>System group (SystemGroup)</b>\n"
-"<p>\n"
-"The group name for \"System\" (printer administration)\n"
-"access.  The default varies depending on the operating system, but\n"
-"will be <b>sys</b>, <b>system</b>, or <b>root</b> (checked for in that "
-"order).</p>\n"
-"<p>\n"
-"<i>ex</i>: sys</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:436
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Encryption certificate (ServerCertificate)</b>\n"
-"<p>\n"
-"The file to read containing the server's certificate.\n"
-"Defaults to \"/etc/cups/ssl/server.crt\".</p>\n"
-"<p>\n"
-"<i>ex</i>: /etc/cups/ssl/server.crt</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:444
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Encryption key (ServerKey)</b>\n"
-"<p>\n"
-"The file to read containing the server's key.\n"
-"Defaults to \"/etc/cups/ssl/server.key\".</p>\n"
-"<p>\n"
-"<i>ex</i>: /etc/cups/ssl/server.key</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:452
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"Access permissions\n"
-"# Access permissions for each directory served by the scheduler.\n"
-"Locations are relative to DocumentRoot...\n"
-"# AuthType: the authorization to use:\n"
-"#    None   - Perform no authentication\n"
-"Basic  - Perform authentication using the HTTP Basic method.\n"
-"Digest - Perform authentication using the HTTP Digest method.\n"
-"#    (Note: local certificate authentication can be substituted by\n"
-"the client for Basic or Digest when connecting to the\n"
-"localhost interface)\n"
-"# AuthClass: the authorization class; currently only Anonymous, User,\n"
-"System (valid user belonging to group SystemGroup), and Group\n"
-"(valid user belonging to the specified group) are supported.\n"
-"# AuthGroupName: the group name for \"Group\" authorization.\n"
-"# Order: the order of Allow/Deny processing.\n"
-"# Allow: allows access from the specified hostname, domain, IP address, or\n"
-"network.\n"
-"# Deny: denies access from the specified hostname, domain, IP address, or\n"
-"network.\n"
-"# Both \"Allow\" and \"Deny\" accept the following notations for addresses:\n"
-"#     All\n"
-"None\n"
-"*.domain.com\n"
-".domain.com\n"
-"host.domain.com\n"
-"nnn.*\n"
-"nnn.nnn.*\n"
-"nnn.nnn.nnn.*\n"
-"nnn.nnn.nnn.nnn\n"
-"nnn.nnn.nnn.nnn/mm\n"
-"nnn.nnn.nnn.nnn/mmm.mmm.mmm.mmm\n"
-"# The host and domain address require that you enable hostname lookups\n"
-"with \"HostNameLookups On\" above.\n"
-"# Encryption: whether or not to use encryption; this depends on having\n"
-"the OpenSSL library linked into the CUPS library and scheduler.\n"
-"# Possible values:\n"
-"#     Always       - Always use encryption (SSL)\n"
-"Never        - Never use encryption\n"
-"Required     - Use TLS encryption upgrade\n"
-"IfRequested  - Use encryption if the server requests it\n"
-"# The default value is \"IfRequested\".\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:495
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Authentication (AuthType)</b>\n"
-"<p>\n"
-"The authorization to use:"
-"<p>\n"
-"<ul type=circle>\n"
-"<li><i>None</i>   - Perform no authentication.</li>\n"
-"<li><i>Basic</i>  - Perform authentication using the HTTP Basic method.</li>\n"
-"<li><i>Digest</i> - Perform authentication using the HTTP Digest method.</li>\n"
-"</ul>"
-"<p>\n"
-"Note: local certificate authentication can be substituted by\n"
-"the client for <i>Basic</i> or <i>Digest</i> when connecting to the\n"
-"localhost interface.</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:508
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Class (AuthClass)</b>\n"
-"<p>\n"
-"The authorization class; currently only <i>Anonymous</i>, <i>User</i>,\n"
-"<i>System</i> (valid user belonging to group SystemGroup), and <i>Group</i>\n"
-"(valid user belonging to the specified group) are supported.</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:515
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<p>The user/group names allowed to access the resource. The format is a\n"
-"comma separated list.</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:519
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Satisfy (Satisfy)</b>\n"
-"<p>\n"
-"This directive controls whether all specified conditions must\n"
-"be satisfied to allow access to the resource. If set to \"all\",\n"
-"then all authentication and access control conditions must be\n"
-"satisfied to allow access.\n"
-"</p>\n"
-"<p>\n"
-"Setting Satisfy to \"any\" allows a user to gain access if the\n"
-"authentication <i>or</i> access control requirements are satisfied.\n"
-"For example, you might require authentication for remote access,\n"
-"but allow local access without authentication.\n"
-"</p>\n"
-"<p>\n"
-"The default is \"all\".\n"
-"</p> \n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:537
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Authentication group name (AuthGroupName)</b>\n"
-"<p>\n"
-"The group name for <i>Group</i> authorization.</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:542
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>ACL order (Order)</b>\n"
-"<p>\n"
-"The order of Allow/Deny processing.</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:547
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Allow</b>\n"
-"<p>\n"
-"Allows access from the specified hostname, domain, IP address, or\n"
-"network. Possible values are:</p>\n"
-"<pre>\n"
-"All\n"
-"None\n"
-"*.domain.com\n"
-".domain.com\n"
-"host.domain.com\n"
-"nnn.*\n"
-"nnn.nnn.*\n"
-"nnn.nnn.nnn.*\n"
-"nnn.nnn.nnn.nnn\n"
-"nnn.nnn.nnn.nnn/mm\n"
-"nnn.nnn.nnn.nnn/mmm.mmm.mmm.mmm\n"
-"</pre>"
-"<p>\n"
-"The host and domain address require that you enable hostname lookups\n"
-"with \"HostNameLookups On\" above.</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:568
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>ACL addresses (Allow/Deny)</b>\n"
-"<p>\n"
-"Allows/Denies access from the specified hostname, domain, IP address, or\n"
-"network. Possible values are:</p>\n"
-"<pre>\n"
-"All\n"
-"None\n"
-"*.domain.com\n"
-".domain.com\n"
-"host.domain.com\n"
-"nnn.*\n"
-"nnn.nnn.*\n"
-"nnn.nnn.nnn.*\n"
-"nnn.nnn.nnn.nnn\n"
-"nnn.nnn.nnn.nnn/mm\n"
-"nnn.nnn.nnn.nnn/mmm.mmm.mmm.mmm\n"
-"</pre>"
-"<p>\n"
-"The host and domain address require that you enable hostname lookups\n"
-"with \"HostNameLookups On\" above.</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:589
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Encryption (Encryption)</b>\n"
-"<p>\n"
-"Whether or not to use encryption; this depends on having\n"
-"the OpenSSL library linked into the CUPS library and scheduler.</p>\n"
-"<p>\n"
-"Possible values:</p>\n"
-"<ul type=circle>\n"
-"<li><i>Always</i>       - Always use encryption (SSL)</li>\n"
-"<li><i>Never</i>        - Never use encryption</li>\n"
-"<li><i>Required</i>     - Use TLS encryption upgrade</li>\n"
-"<li><i>IfRequested</i>  - Use encryption if the server requests it</li>\n"
-"</ul>"
-"<p>\n"
-"The default value is \"IfRequested\".</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:604
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Access permissions</b>\n"
-"<p>\n"
-"Access permissions for each directory served by the scheduler.\n"
-"Locations are relative to DocumentRoot...</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:610
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Auto purge jobs (AutoPurgeJobs)</b>\n"
-"<p>\n"
-"Automatically purge jobs when not needed for quotas.\n"
-"Default is No.</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:616
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Browse protocols (BrowseProtocols)</b>\n"
-"<p>\n"
-"Which protocols to use for browsing.  Can be\n"
-"any of the following separated by whitespace and/or commas:</p>\n"
-"<ul type=circle>\n"
-"<li><i>all</i>  - Use all supported protocols.</li>\n"
-"<li><i>cups</i> - Use the CUPS browse protocol.</li>\n"
-"<li><i>slp</i>  - Use the SLPv2 protocol.</li>\n"
-"</ul>"
-"<p>\n"
-"The default is <b>cups</b>.</p>\n"
-"<p>\n"
-"Note: If you choose to use SLPv2, it is <b>strongly</b> recommended that\n"
-"you have at least one SLP Directory Agent (DA) on your\n"
-"network.  Otherwise, browse updates can take several seconds,\n"
-"during which the scheduler will not response to client\n"
-"requests.</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:634
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Classification (Classification)</b>\n"
-"<p>\n"
-"The classification level of the server.  If set, this\n"
-"classification is displayed on all pages, and raw printing is disabled.\n"
-"The default is the empty string.</p>\n"
-"<p>\n"
-"<i>ex</i>: confidential\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:643
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Allow overrides (ClassifyOverride)</b>\n"
-"<p>\n"
-"Whether to allow users to override the classification\n"
-"on printouts. If enabled, users can limit banner pages to before or\n"
-"after the job, and can change the classification of a job, but cannot\n"
-"completely eliminate the classification or banners.</p>\n"
-"<p>\n"
-"The default is off.</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:653
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Hide implicit members (HideImplicitMembers)</b>\n"
-"<p>\n"
-"Whether or not to show the members of an\n"
-"implicit class.</p>\n"
-"<p>\n"
-"When HideImplicitMembers is On, any remote printers that are\n"
-"part of an implicit class are hidden from the user, who will\n"
-"then only see a single queue even though many queues will be\n"
-"supporting the implicit class.</p>\n"
-"<p>\n"
-"Enabled by default.</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:666
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Use &quot;any&quot; classes (ImplicitAnyClasses)</b>\n"
-"<p>\n"
-"Whether or not to create <b>AnyPrinter</b> implicit\n"
-"classes.</p>\n"
-"<p>\n"
-"When ImplicitAnyClasses is On and a local queue of the same name\n"
-"exists, e.g. \"printer\", \"printer@server1\", \"printer@server1\", then\n"
-"an implicit class called \"Anyprinter\" is created instead.</p>\n"
-"<p>\n"
-"When ImplicitAnyClasses is Off, implicit classes are not created\n"
-"when there is a local queue of the same name.</p>\n"
-"<p>\n"
-"Disabled by default.</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:681
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Max jobs (MaxJobs)</b>\n"
-"<p>\n"
-"Maximum number of jobs to keep in memory (active and completed).\n"
-"Default is 0 (no limit).</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:687
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Max jobs per user (MaxJobsPerUser)</b>\n"
-"<p>\n"
-"The MaxJobsPerUser directive controls the maximum number of <i>active</i>\n"
-"jobs that are allowed for each user. Once a user reaches the limit, new\n"
-"jobs will be rejected until one of the active jobs is completed, stopped,\n"
-"aborted, or canceled.</p>\n"
-"<p>\n"
-"Setting the maximum to 0 disables this functionality.\n"
-"Default is 0 (no limit).\n"
-"</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:699
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Max jobs per printer (MaxJobsPerPrinter)</b>\n"
-"<p>\n"
-"The MaxJobsPerPrinter directive controls the maximum number of <i>active</i>\n"
-"jobs that are allowed for each printer or class. Once a printer or class\n"
-"reaches the limit, new jobs will be rejected until one of the active jobs\n"
-"is completed, stopped, aborted, or canceled.</p>\n"
-"<p>\n"
-"Setting the maximum to 0 disables this functionality.\n"
-"Default is 0 (no limit).\n"
-"</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:711
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Port</b>\n"
-"<p>\n"
-"The port value that the CUPS daemon is listening to. Default is 631.</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:716
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Address</b>\n"
-"<p>\n"
-"The address that the CUPS daemon is listening at. Leave it empty or use\n"
-"an asterisk (*) to specify a port value on the entire subnetwork.</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:722
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<p>Check this box if you want to use SSL encryption with this address/port.\n"
-"</p>\n"
-msgstr ""
-
 #: cupsdbrowsingpage.cpp:37
 msgid "Browsing"
 msgstr ""
@@ -1125,106 +119,106 @@ msgstr ""
 msgid "Browse options:"
 msgstr ""
 
-#: cupsdconf.cpp:811 cupsdconf.cpp:834 cupsdconf.cpp:850
+#: cupsdconf.cpp:847 cupsdconf.cpp:870 cupsdconf.cpp:886
 msgid ""
 "_: Base\n"
 "Root"
 msgstr "Gwraidd"
 
-#: cupsdconf.cpp:811 cupsdconf.cpp:831 cupsdconf.cpp:852
+#: cupsdconf.cpp:847 cupsdconf.cpp:867 cupsdconf.cpp:888
 msgid "All printers"
 msgstr "Pob Argraffydd"
 
-#: cupsdconf.cpp:811 cupsdconf.cpp:832 cupsdconf.cpp:853
+#: cupsdconf.cpp:847 cupsdconf.cpp:868 cupsdconf.cpp:889
 msgid "All classes"
 msgstr ""
 
-#: cupsdconf.cpp:811 cupsdconf.cpp:833 cupsdconf.cpp:855
+#: cupsdconf.cpp:847 cupsdconf.cpp:869 cupsdconf.cpp:891
 msgid "Print jobs"
 msgstr ""
 
-#: cupsdconf.cpp:812 cupsdconf.cpp:830 cupsdconf.cpp:851
+#: cupsdconf.cpp:848 cupsdconf.cpp:866 cupsdconf.cpp:887
 msgid "Administration"
 msgstr ""
 
-#: cupsdconf.cpp:813 cupsdconf.cpp:840 cupsdconf.cpp:843 cupsdconf.cpp:864
+#: cupsdconf.cpp:849 cupsdconf.cpp:876 cupsdconf.cpp:879 cupsdconf.cpp:900
 msgid "Class"
 msgstr "Dosbarth"
 
-#: cupsdconf.cpp:814 cupsdconf.cpp:835 cupsdconf.cpp:838 cupsdconf.cpp:858
+#: cupsdconf.cpp:850 cupsdconf.cpp:871 cupsdconf.cpp:874 cupsdconf.cpp:894
 msgid "Printer"
 msgstr "Argraffydd"
 
-#: cupsdconf.cpp:854
+#: cupsdconf.cpp:890
 msgid "Root"
 msgstr "Gwraidd"
 
-#: cupsddialog.cpp:113
+#: cupsddialog.cpp:114
 msgid "Short Help"
 msgstr ""
 
-#: cupsddialog.cpp:126
+#: cupsddialog.cpp:127
 msgid "CUPS Server Configuration"
 msgstr ""
 
-#: cupsddialog.cpp:173
+#: cupsddialog.cpp:174
 msgid "Error while loading configuration file!"
 msgstr ""
 
-#: cupsddialog.cpp:173 cupsddialog.cpp:192 cupsddialog.cpp:258
-#: cupsddialog.cpp:313
+#: cupsddialog.cpp:174 cupsddialog.cpp:193 cupsddialog.cpp:254
+#: cupsddialog.cpp:309
 msgid "CUPS Configuration Error"
 msgstr ""
 
-#: cupsddialog.cpp:182
+#: cupsddialog.cpp:183
 msgid ""
 "Some options were not recognized by this configuration tool. They will be left "
 "untouched and you won't be able to change them."
 msgstr ""
 
-#: cupsddialog.cpp:184
+#: cupsddialog.cpp:185
 msgid "Unrecognized Options"
 msgstr ""
 
-#: cupsddialog.cpp:204
+#: cupsddialog.cpp:205
 msgid "Unable to find a running CUPS server"
 msgstr ""
 
-#: cupsddialog.cpp:218
+#: cupsddialog.cpp:214
 msgid "Unable to restart CUPS server (pid = %1)"
 msgstr ""
 
-#: cupsddialog.cpp:239
+#: cupsddialog.cpp:235
 msgid ""
 "Unable to retrieve configuration file from the CUPS server. You probably don't "
 "have the access permissions to perform this operation."
 msgstr ""
 
-#: cupsddialog.cpp:249
+#: cupsddialog.cpp:245
 msgid "Internal error: file '%1' not readable/writable!"
 msgstr ""
 
-#: cupsddialog.cpp:252
+#: cupsddialog.cpp:248
 msgid "Internal error: empty file '%1'!"
 msgstr ""
 
-#: cupsddialog.cpp:270
+#: cupsddialog.cpp:266
 msgid ""
 "The config file has not been uploaded to the CUPS server. The daemon will not "
 "be restarted."
 msgstr ""
 
-#: cupsddialog.cpp:274
+#: cupsddialog.cpp:270
 msgid ""
 "Unable to upload the configuration file to CUPS server. You probably don't have "
 "the access permissions to perform this operation."
 msgstr ""
 
-#: cupsddialog.cpp:277
+#: cupsddialog.cpp:273
 msgid "CUPS configuration error"
 msgstr ""
 
-#: cupsddialog.cpp:308
+#: cupsddialog.cpp:304
 #, c-format
 msgid "Unable to write configuration file %1"
 msgstr ""
diff --git a/tde-i18n-cy/messages/tdelibs/katepart.po b/tde-i18n-cy/messages/tdelibs/katepart.po
index 83eb6f74a6e..9f329bbd54b 100644
--- a/tde-i18n-cy/messages/tdelibs/katepart.po
+++ b/tde-i18n-cy/messages/tdelibs/katepart.po
@@ -8,247 +8,456 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: katepart\n"
-"POT-Creation-Date: 2008-05-21 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:46-0500\n"
 "PO-Revision-Date: 2003-11-12 14:22+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.2\n"
 "\n"
 
-#: part/kateprinter.cpp:72
-#, c-format
-msgid "Print %1"
-msgstr "Argraffu %1"
+#: _translatorinfo.cpp:1 part/katefactory.cpp:115
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "KD wrth KGyfieithu"
 
-#: part/kateprinter.cpp:202
-msgid "(Selection of) "
-msgstr "(Dewisiad o)"
+#: _translatorinfo.cpp:3 part/katefactory.cpp:115
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "kyfieithu@dotmon.com"
 
-#: part/kateprinter.cpp:309 part/kateprinter.cpp:528
-#, c-format
-msgid "Typographical Conventions for %1"
-msgstr "Arferiadau Teipograffeg am %1"
+#: plugins/autobookmarker/autobookmarker.cpp:90
+#, fuzzy
+msgid "AutoBookmarks"
+msgstr "Nod Tudalen"
 
-#: part/kateprinter.cpp:639
-msgid "Te&xt Settings"
-msgstr "Gosodiadau Test&un"
+#: plugins/autobookmarker/autobookmarker.cpp:101
+msgid "Configure AutoBookmarks"
+msgstr ""
 
-#: part/kateprinter.cpp:644
-msgid "Print &selected text only"
-msgstr "Argraffu testun de&wisedig yn unig"
+#: plugins/autobookmarker/autobookmarker.cpp:279
+msgid "Edit Entry"
+msgstr "Golygu cofnod ..."
 
-#: part/kateprinter.cpp:647
-msgid "Print &line numbers"
-msgstr "Argraffu rhifau &llinell"
+#: plugins/autobookmarker/autobookmarker.cpp:287
+msgid "&Pattern:"
+msgstr "&Patrwm:"
 
-#: part/kateprinter.cpp:650
-msgid "Print syntax &guide"
-msgstr "Argraffu canllawiau c&ystrawen"
+#: plugins/autobookmarker/autobookmarker.cpp:293
+msgid "<p>A regular expression. Matching lines will be bookmarked.</p>"
+msgstr ""
 
-#: part/kateprinter.cpp:659
+#: plugins/autobookmarker/autobookmarker.cpp:297
+msgid "Case &sensitive"
+msgstr "Mae llythrennau bras o &bwys"
+
+#: plugins/autobookmarker/autobookmarker.cpp:301
 msgid ""
-"<p>This option is only available if some text is selected in the document.</p>"
-"<p>If available and enabled, only the selected text is printed.</p>"
+"<p>If enabled, the pattern matching will be case sensitive, otherwise not.</p>"
 msgstr ""
-"<p>Mae'r dewisiad yma ar gael yn unig os mae testun wedi'i ddewis yn y "
-"ddogfen.</p>"
-"<p>Os ar gael ac wedi alluogi, argraffir y testun dewisedig yn unig.</p>"
 
-#: part/kateprinter.cpp:662
+#: plugins/autobookmarker/autobookmarker.cpp:304
+msgid "&Minimal matching"
+msgstr ""
+
+#: plugins/autobookmarker/autobookmarker.cpp:308
 msgid ""
-"<p>If enabled, line numbers will be printed on the left side of the page(s).</p>"
+"<p>If enabled, the pattern matching will use minimal matching; if you do not "
+"know what that is, please read the appendix on regular expressions in the kate "
+"manual.</p>"
 msgstr ""
-"<p>Os alluogir, argraffir rhifau llinell ar ochr chwith y tudalen(nau).</p>"
 
-#: part/kateprinter.cpp:664
+#: plugins/autobookmarker/autobookmarker.cpp:312
+#, fuzzy
+msgid "&File mask:"
+msgstr "Fformat Ffeil"
+
+#: plugins/autobookmarker/autobookmarker.cpp:318
 msgid ""
-"<p>Print a box displaying typographical conventions for the document type, as "
-"defined by the syntax highlighting being used."
+"<p>A list of filename masks, separated by semicolons. This can be used to limit "
+"the usage of this entity to files with matching names.</p>"
+"<p>Use the wizard button to the right of the mimetype entry below to easily "
+"fill out both lists.</p>"
 msgstr ""
-"<p>Argraffu blwch syn dangos arferiadau teipograffeg am fath y ddogfen, fel a "
-"ddiffinir gan yr amlygiad cystrawen a ddefnyddir."
 
-#: part/kateprinter.cpp:700
-msgid "Hea&der && Footer"
-msgstr "Pen&nawd && Troedyn"
+#: part/katedialogs.cpp:1303 part/katefiletype.cpp:308
+#: plugins/autobookmarker/autobookmarker.cpp:323
+msgid "MIME &types:"
+msgstr ""
 
-#: part/kateprinter.cpp:708
-msgid "Pr&int header"
-msgstr "A&rgraffu pennawd"
+#: plugins/autobookmarker/autobookmarker.cpp:329
+msgid ""
+"<p>A list of mime types, separated by semicolon. This can be used to limit the "
+"usage of this entity to files with matching mime types.</p>"
+"<p>Use the wizard button on the right to get a list of existing file types to "
+"choose from, using it will fill in the file masks as well.</p>"
+msgstr ""
 
-#: part/kateprinter.cpp:710
-msgid "Pri&nt footer"
-msgstr "Argr&affu troedyn"
+#: plugins/autobookmarker/autobookmarker.cpp:339
+msgid ""
+"<p>Click this button to display a checkable list of mimetypes available on your "
+"system. When used, the file masks entry above will be filled in with the "
+"corresponding masks.</p>"
+msgstr ""
 
-#: part/kateprinter.cpp:715
-msgid "Header/footer font:"
+#: plugins/autobookmarker/autobookmarker.cpp:364
+msgid ""
+"Select the MimeTypes for this pattern.\n"
+"Please note that this will automatically edit the associated file extensions as "
+"well."
 msgstr ""
 
-#: part/kateprinter.cpp:720
-msgid "Choo&se Font..."
-msgstr "Dewi&s Ffont..."
+#: part/katedialogs.cpp:1425 part/katefiletype.cpp:506
+#: plugins/autobookmarker/autobookmarker.cpp:366
+msgid "Select Mime Types"
+msgstr ""
 
-#: part/kateprinter.cpp:724
-msgid "Header Properties"
-msgstr "Nodweddion Penawdau"
+#: plugins/autobookmarker/autobookmarker.cpp:384
+msgid "&Patterns"
+msgstr "&Patrymau"
 
-#: part/kateprinter.cpp:727
-msgid "&Format:"
-msgstr "&Fformat:"
+#: plugins/autobookmarker/autobookmarker.cpp:387
+msgid "Pattern"
+msgstr "Patrwm"
 
-#: part/kateprinter.cpp:734 part/kateprinter.cpp:755
-msgid "Colors:"
-msgstr "Lliwiau:"
+#: plugins/autobookmarker/autobookmarker.cpp:388
+msgid "Mime Types"
+msgstr ""
 
-#: part/kateprinter.cpp:737 part/kateprinter.cpp:758
-msgid "Foreground:"
-msgstr "Blaendir:"
+#: plugins/autobookmarker/autobookmarker.cpp:389
+msgid "File Masks"
+msgstr ""
 
-#: part/kateprinter.cpp:740
-msgid "Bac&kground"
-msgstr "Ce&fndir"
+#: plugins/autobookmarker/autobookmarker.cpp:393
+msgid ""
+"<p>This list shows your configured autobookmark entities. When a document is "
+"opened, each entity is used in the following way: "
+"<ol>"
+"<li>The entity is dismissed, if a mime and/or filename mask is defined, and "
+"neither matches the document.</li>"
+"<li>Otherwise each line of the document is tried against the pattern, and a "
+"bookmark is set on matching lines.</li></ul>"
+"<p>Use the buttons below to manage your collection of entities.</p>"
+msgstr ""
 
-#: part/kateprinter.cpp:743
-msgid "Footer Properties"
-msgstr "Priodweddau'r Troedynnau"
+#: part/kateschema.cpp:840 plugins/autobookmarker/autobookmarker.cpp:405
+msgid "&New..."
+msgstr "&Newydd..."
 
-#: part/kateprinter.cpp:747
-msgid "For&mat:"
-msgstr "Ffor&mat:"
+#: plugins/autobookmarker/autobookmarker.cpp:408
+msgid "Press this button to create a new autobookmark entity."
+msgstr ""
 
-#: part/kateprinter.cpp:761
-msgid "&Background"
-msgstr "&Cefndir"
+#: plugins/autobookmarker/autobookmarker.cpp:413
+msgid "Press this button to delete the currently selected entity."
+msgstr ""
 
-#: part/kateprinter.cpp:788
-msgid "<p>Format of the page header. The following tags are supported:</p>"
-msgstr "<p>Fformat pennawd y dudalen.  Cynhelir y tagiau canlynol:</p>"
+#: plugins/autobookmarker/autobookmarker.cpp:415
+msgid "&Edit..."
+msgstr "&Golygu..."
 
-#: part/kateprinter.cpp:790
+#: plugins/autobookmarker/autobookmarker.cpp:418
+msgid "Press this button to edit the currently selected entity."
+msgstr ""
+
+#: plugins/insertfile/insertfileplugin.cpp:79
+msgid "Insert File..."
+msgstr "Mewnosod Ffeil ..."
+
+#: plugins/insertfile/insertfileplugin.cpp:88
+msgid "Choose File to Insert"
+msgstr "Dewis Ffeil i'w Fewnosod"
+
+#: plugins/insertfile/insertfileplugin.cpp:116
 msgid ""
-"<ul>"
-"<li><tt>%u</tt>: current user name</li>"
-"<li><tt>%d</tt>: complete date/time in short format</li>"
-"<li><tt>%D</tt>: complete date/time in long format</li>"
-"<li><tt>%h</tt>: current time</li>"
-"<li><tt>%y</tt>: current date in short format</li>"
-"<li><tt>%Y</tt>: current date in long format</li>"
-"<li><tt>%f</tt>: file name</li>"
-"<li><tt>%U</tt>: full URL of the document</li>"
-"<li><tt>%p</tt>: page number</li></ul>"
-"<br><u>Note:</u> Do <b>not</b> use the '|' (vertical bar) character."
+"Failed to load file:\n"
+"\n"
 msgstr ""
+"Methwyd llwytho ffeil:\n"
+" \n"
 
-#: part/kateprinter.cpp:804
-msgid "<p>Format of the page footer. The following tags are supported:</p>"
+#: plugins/insertfile/insertfileplugin.cpp:116
+#: plugins/insertfile/insertfileplugin.cpp:137
+#: plugins/insertfile/insertfileplugin.cpp:159
+msgid "Insert File Error"
+msgstr "Gwall Mewnosod Ffeil"
+
+#: plugins/insertfile/insertfileplugin.cpp:130
+msgid ""
+"<p>The file <strong>%1</strong> does not exist or is not readable, aborting."
 msgstr ""
+"<p>The file <strong>%1</strong> does not exist or is not readable, aborting."
 
-#: part/kateprinter.cpp:908
-msgid "L&ayout"
-msgstr "C&ynllun"
+#: plugins/insertfile/insertfileplugin.cpp:134
+msgid "<p>Unable to open file <strong>%1</strong>, aborting."
+msgstr "<p>Methu agor ffeil <strong>%1</strong> - yn erthylu."
 
-#: part/kateprinter.cpp:915 part/kateschema.cpp:834
-msgid "&Schema:"
-msgstr "&Sgema :"
+#: plugins/insertfile/insertfileplugin.cpp:157
+msgid "<p>File <strong>%1</strong> had no contents."
+msgstr "<p>Doedd gan y ffeil <strong>%1</strong> ddim cynnwys."
 
-#: part/kateprinter.cpp:919
-msgid "Draw bac&kground color"
-msgstr "Llunio lliw y ce&fndir"
+#: plugins/kdatatool/kate_kdatatool.cpp:78
+msgid "Data Tools"
+msgstr "Offer data"
 
-#: part/kateprinter.cpp:922
-msgid "Draw &boxes"
-msgstr "Llunio &blychau"
+#: plugins/kdatatool/kate_kdatatool.cpp:153
+#: plugins/kdatatool/kate_kdatatool.cpp:175
+msgid "(not available)"
+msgstr "(dim ar gael)"
 
-#: part/kateprinter.cpp:925
-msgid "Box Properties"
-msgstr "Priodweddau'r blwch"
+#: plugins/kdatatool/kate_kdatatool.cpp:183
+msgid ""
+"Data tools are only available when text is selected, or when the right mouse "
+"button is clicked over a word. If no data tools are offered even when text is "
+"selected, you need to install them. Some data tools are part of the KOffice "
+"package."
+msgstr ""
+"Mae offer data ar gael 'mond pan mae testun wedi'i ddewis, neu pan y glicir "
+"botwm de y llygoden dros air.  Os na cynnigir offer data hyd yn oed pan y "
+"ddewisir testun, mae angen eu gosod. Mae rhai o'r offer data yn rhan o'r pecyn "
+"KOffice. "
 
-#: part/kateprinter.cpp:928
-msgid "W&idth:"
-msgstr "&Lled:"
+#: plugins/isearch/ISearchPlugin.cpp:68 plugins/isearch/ISearchPlugin.cpp:371
+msgid "Search Incrementally"
+msgstr "Chwilio yn Gynyddol"
 
-#: part/kateprinter.cpp:932
-msgid "&Margin:"
-msgstr "&Ymyl:"
+#: plugins/isearch/ISearchPlugin.cpp:72 plugins/isearch/ISearchPlugin.cpp:372
+msgid "Search Incrementally Backwards"
+msgstr "Chwilio yn Ôl yn Gynyddol"
 
-#: part/kateprinter.cpp:936
-msgid "Co&lor:"
-msgstr "Ll&iw:"
+#: plugins/isearch/ISearchPlugin.cpp:76 plugins/isearch/ISearchPlugin.cpp:79
+msgid "I-Search:"
+msgstr "Chwilio Cynyddol:"
 
-#: part/kateprinter.cpp:954
+#: plugins/isearch/ISearchPlugin.cpp:95
+msgid "Search"
+msgstr "Chwilio"
+
+#: plugins/isearch/ISearchPlugin.cpp:101
+msgid "Search Options"
+msgstr "Dewisiadau Chwilio"
+
+#: plugins/isearch/ISearchPlugin.cpp:106 plugins/isearch/ISearchPlugin.cpp:412
+msgid "Case Sensitive"
+msgstr "Mae llythrennau mawr/bach o bwys"
+
+#: plugins/isearch/ISearchPlugin.cpp:115 plugins/isearch/ISearchPlugin.cpp:414
+msgid "From Beginning"
+msgstr "O'r Dechrau"
+
+#: plugins/isearch/ISearchPlugin.cpp:124 plugins/isearch/ISearchPlugin.cpp:416
+msgid "Regular Expression"
+msgstr "Mynegiad Rheolaidd"
+
+#: plugins/isearch/ISearchPlugin.cpp:244
 msgid ""
-"<p>If enabled, the background color of the editor will be used.</p>"
-"<p>This may be useful if your color scheme is designed for a dark "
-"background.</p>"
+"_: Incremental Search\n"
+"I-Search:"
+msgstr "Chwiliad Cynyddol:"
+
+#: plugins/isearch/ISearchPlugin.cpp:247
+msgid ""
+"_: Incremental Search found no match\n"
+"Failing I-Search:"
+msgstr "Methodd y chwiliad cynyddol ganfod cydweddiad: "
+
+#: plugins/isearch/ISearchPlugin.cpp:250
+msgid ""
+"_: Incremental Search in the reverse direction\n"
+"I-Search Backward:"
+msgstr "Chwiliad cynyddol i'r cyfeiriad arall:"
+
+#: plugins/isearch/ISearchPlugin.cpp:253
+msgid "Failing I-Search Backward:"
+msgstr "Methodd y chwiliad cynyddol ganfod cydweddiad yn y cyfeiriad arall:"
+
+#: plugins/isearch/ISearchPlugin.cpp:256
+msgid ""
+"_: Incremental Search has passed the end of the document\n"
+"Wrapped I-Search:"
+msgstr "Mae'r chwiliad cynyddol wedi pasio diwedd y ddogfen:"
+
+#: plugins/isearch/ISearchPlugin.cpp:259
+msgid "Failing Wrapped I-Search:"
 msgstr ""
+"Methodd y chwiliad cynyddol ganfod cydweddiad ar ôl pasio diwedd y ddogfen"
 
-#: part/kateprinter.cpp:957
+#: plugins/isearch/ISearchPlugin.cpp:262
+msgid "Wrapped I-Search Backward:"
+msgstr "Chwiliad cynyddol i'r cyfeiriad arall, sy'n pasio'r safle dechrau:"
+
+#: plugins/isearch/ISearchPlugin.cpp:265
+msgid "Failing Wrapped I-Search Backward:"
+msgstr ""
+"Methodd y chwiliad cynyddol ganfod cydweddiad ar ôl pasio'r safle dechrau, wrth "
+"fynd yn y cyfeiriad arall:"
+
+#: plugins/isearch/ISearchPlugin.cpp:269
 msgid ""
-"<p>If enabled, a box as defined in the properties below will be drawn around "
-"the contents of each page. The Header and Footer will be separated from the "
-"contents with a line as well.</p>"
+"_: Incremental Search has passed both the end of the document and the original "
+"starting position\n"
+"Overwrapped I-Search:"
+msgstr "Overwrapped I-Search:"
+
+#: plugins/isearch/ISearchPlugin.cpp:272
+msgid "Failing Overwrapped I-Search:"
 msgstr ""
+"Methodd y chwiliad cynyddol ganfod cydweddiad ar ôl pasio diwedd y ddogfen ac "
+"hefyd y safle dechrau:"
 
-#: part/kateprinter.cpp:961
-msgid "The width of the box outline"
-msgstr "Lled amlinell y blwch"
+#: plugins/isearch/ISearchPlugin.cpp:275
+msgid "Overwrapped I-Search Backwards:"
+msgstr ""
+"Mae'r chwiliad cynyddol wedi pasio diwedd y ddogfen ac hefyd y safle dechrau, "
+"wrth fynd yn y cyfeiriad arall:"
 
-#: part/kateprinter.cpp:963
-msgid "The margin inside boxes, in pixels"
-msgstr "Yr ymyl tu mewn y blychau, mewn picseli"
+#: plugins/isearch/ISearchPlugin.cpp:278
+msgid "Failing Overwrapped I-Search Backward:"
+msgstr ""
+"Methodd y chwiliad cynyddol ganfod cydweddiad ar ôl pasio diwedd y ddogfen ac "
+"hefyd y safle dechrau, wrth fynd yn y cyfeiriad arall:"
 
-#: part/kateprinter.cpp:965
-msgid "The line color to use for boxes"
-msgstr "Lliw y lliniau i'w ddefnyddio am y blychau"
+#: plugins/isearch/ISearchPlugin.cpp:280
+msgid "Error: unknown i-search state!"
+msgstr "Gwall: cyflwr anhysbys i'r chwiliad cynyddol!"
 
-#: part/katebookmarks.cpp:77
-msgid "Set &Bookmark"
-msgstr "Gosod &Tudnod"
+#: plugins/isearch/ISearchPlugin.cpp:341
+msgid "Next Incremental Search Match"
+msgstr "Cydweddiad Nesaf o'r Chwiliad Cynyddol"
 
-#: part/katebookmarks.cpp:80
-msgid "If a line has no bookmark then add one, otherwise remove it."
+#: plugins/isearch/ISearchPlugin.cpp:342
+msgid "Previous Incremental Search Match"
+msgstr "Cydweddiad Cynt o'r Chwiliad Cynyddol"
+
+#: plugins/wordcompletion/docwordcompletion.cpp:109
+msgid "Word Completion Plugin"
 msgstr ""
 
-#: part/katebookmarks.cpp:81
-#, fuzzy
-msgid "Clear &Bookmark"
-msgstr "Nod Tudalen"
+#: plugins/wordcompletion/docwordcompletion.cpp:114
+msgid "Configure the Word Completion Plugin"
+msgstr ""
 
-#: part/katebookmarks.cpp:84
-msgid "Clear &All Bookmarks"
+#: plugins/wordcompletion/docwordcompletion.cpp:148
+msgid "Reuse Word Above"
 msgstr ""
 
-#: part/katebookmarks.cpp:87
-msgid "Remove all bookmarks of the current document."
+#: plugins/wordcompletion/docwordcompletion.cpp:150
+msgid "Reuse Word Below"
 msgstr ""
 
-#: part/katebookmarks.cpp:90 part/katebookmarks.cpp:242
-msgid "Next Bookmark"
+#: plugins/wordcompletion/docwordcompletion.cpp:152
+msgid "Pop Up Completion List"
 msgstr ""
 
-#: part/katebookmarks.cpp:93
-msgid "Go to the next bookmark."
+#: plugins/wordcompletion/docwordcompletion.cpp:154
+msgid "Shell Completion"
 msgstr ""
 
-#: part/katebookmarks.cpp:96 part/katebookmarks.cpp:244
-msgid "Previous Bookmark"
+#: plugins/wordcompletion/docwordcompletion.cpp:156
+msgid "Automatic Completion Popup"
 msgstr ""
 
-#: part/katebookmarks.cpp:99
-msgid "Go to the previous bookmark."
+#: plugins/wordcompletion/docwordcompletion.cpp:498
+msgid "Automatically &show completion list"
 msgstr ""
 
-#: part/katebookmarks.cpp:203
-msgid "&Next: %1 - \"%2\""
-msgstr "&Nesaf: %1 - \"%2\""
+#: plugins/wordcompletion/docwordcompletion.cpp:511
+msgid ""
+"_: Translators: This is the first part of two strings wich will comprise the "
+"sentence 'Show completions when a word is at least N characters'. The first "
+"part is on the right side of the N, which is represented by a spinbox widget, "
+"followed by the second part: 'characters long'. Characters is a ingeger number "
+"between and including 1 and 30. Feel free to leave the second part of the "
+"sentence blank if it suits your language better. \n"
+"Show completions &when a word is at least"
+msgstr ""
 
-#: part/katebookmarks.cpp:210
-msgid "&Previous: %1 - \"%2\""
+#: plugins/wordcompletion/docwordcompletion.cpp:517
+msgid ""
+"_: This is the second part of two strings that will comprise teh sentence 'Show "
+"completions when a word is at least N characters'\n"
+"characters long."
 msgstr ""
 
+#: plugins/wordcompletion/docwordcompletion.cpp:520
+msgid ""
+"Enable the automatic completion list popup as default. The popup can be "
+"disabled on a view basis from the 'Tools' menu."
+msgstr ""
+
+#: plugins/wordcompletion/docwordcompletion.cpp:523
+msgid ""
+"Define the length a word should have before the completion list is displayed."
+msgstr ""
+
+#: part/kateluaindentscript.cpp:86
+msgid "indenter.register requires 2 parameters (event id, function to call)"
+msgstr ""
+
+#: part/kateluaindentscript.cpp:94
+msgid ""
+"indenter.register requires 2 parameters (event id (number), function to call "
+"(function))"
+msgstr ""
+
+#: part/kateluaindentscript.cpp:108
+msgid "indenter.register:invalid event id"
+msgstr ""
+
+#: part/kateluaindentscript.cpp:113
+msgid "indenter.register:there is already a function set for given"
+msgstr ""
+
+#: part/kateluaindentscript.cpp:126
+msgid "document.textLine:One parameter (line number) required"
+msgstr ""
+
+#: part/kateluaindentscript.cpp:130
+msgid "document.textLine:One parameter (line number) required (number)"
+msgstr ""
+
+#: part/kateluaindentscript.cpp:139
+msgid ""
+"document.removeText:Four parameters needed (start line, start col,end line, end "
+"col)"
+msgstr ""
+
+#: part/kateluaindentscript.cpp:143
+msgid ""
+"document.removeText:Four parameters needed (start line, start col,end line, end "
+"col) (4x number)"
+msgstr ""
+
+#: part/kateluaindentscript.cpp:152
+msgid "document.insertText:Three parameters needed (line,col,text)"
+msgstr ""
+
+#: part/kateluaindentscript.cpp:156
+msgid ""
+"document.removeText:Three parameters needed (line,col,text) "
+"(number,number,string)"
+msgstr ""
+
+#: part/kateluaindentscript.cpp:253
+msgid "LUA interpreter could not be initialized"
+msgstr ""
+
+#: part/kateluaindentscript.cpp:293 part/kateluaindentscript.cpp:316
+#: part/kateluaindentscript.cpp:344
+#, c-format
+msgid "Lua indenting script had errors: %1"
+msgstr ""
+
+#: part/katejscript.cpp:1058 part/katejscript.cpp:1076
+#: part/kateluaindentscript.cpp:413 part/kateluaindentscript.cpp:431
+msgid "(Unknown)"
+msgstr "(Anhysbys)"
+
 #: part/katefactory.cpp:70
 msgid "Kate Part"
 msgstr ""
@@ -358,216 +567,678 @@ msgstr "Cymorth hyfryd iawn"
 msgid "All people who have contributed and I have forgotten to mention"
 msgstr "Pawb sydd wedi cyfrannu a rwy wedi anghofio eu crybwyll"
 
-#: _translatorinfo.cpp:1 part/katefactory.cpp:115
+#: part/katesyntaxdocument.cpp:76
 msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "KD wrth KGyfieithu"
+"<qt>The error <b>%4</b>"
+"<br> has been detected in the file %1 at %2/%3</qt>"
+msgstr "<qt>Canfuwyd y gwall <b>%4</b><br> yn y ffeil %1 wrth %2/%3</qt>"
 
-#: _translatorinfo.cpp:3 part/katefactory.cpp:115
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "kyfieithu@dotmon.com"
+#: part/katesyntaxdocument.cpp:84
+#, c-format
+msgid "Unable to open %1"
+msgstr "Methu agor %1"
 
-#: part/katesearch.cpp:72
-msgid "Look up the first occurrence of a piece of text or regular expression."
+#: part/katesyntaxdocument.cpp:457
+msgid "Errors!"
+msgstr "Gwallau!"
+
+#: part/katesyntaxdocument.cpp:462
+#, c-format
+msgid "Error: %1"
+msgstr "Gwall: %1"
+
+#: part/katespell.cpp:57
+msgid "Spelling (from cursor)..."
 msgstr ""
 
-#: part/katesearch.cpp:74
-msgid "Look up the next occurrence of the search phrase."
+#: part/katespell.cpp:58
+msgid "Check the document's spelling from the cursor and forward"
 msgstr ""
 
-#: part/katesearch.cpp:76
-msgid "Look up the previous occurrence of the search phrase."
+#: part/katespell.cpp:60
+#, fuzzy
+msgid "Spellcheck Selection..."
+msgstr "Gwirio Sillafu"
+
+#: part/katespell.cpp:61
+msgid "Check spelling of the selected text"
 msgstr ""
 
-#: part/katesearch.cpp:78
+#: part/katespell.cpp:125
+msgid "Spellcheck"
+msgstr "Gwirio Sillafu"
+
+#: part/katespell.cpp:205
 msgid ""
-"Look up a piece of text or regular expression and replace the result with some "
-"given text."
+"The spelling program could not be started. Please make sure you have set the "
+"correct spelling program and that it is properly configured and in your PATH."
 msgstr ""
 
-#: part/katesearch.cpp:331
-msgid "Search string '%1' not found!"
+#: part/katespell.cpp:210
+msgid "The spelling program seems to have crashed."
 msgstr ""
 
-#: part/katesearch.cpp:333 part/katesearch.cpp:498
-msgid "Find"
-msgstr "Canfod:"
+#: part/kateview.cpp:216
+msgid "Cut the selected text and move it to the clipboard"
+msgstr "Torri'r testun dewisiedig a'i symud i'r gludfwrdd"
 
-#: part/katesearch.cpp:353 part/katesearch.cpp:371 part/katesearch.cpp:475
-#, c-format
+#: part/kateview.cpp:219
+msgid "Paste previously copied or cut clipboard contents"
+msgstr "Gludo cynhwysion y gludfwrdd sydd wedi eu gopïo neu dorri ynghynt"
+
+#: part/kateview.cpp:222
 msgid ""
-"_n: %n replacement made.\n"
-"%n replacements made."
+"Use this command to copy the currently selected text to the system clipboard."
+msgstr "Defnyddiwch y gorchymyn yma i gopïo'r testun dewisiedig i'r gludfwrdd."
+
+#: part/kateview.cpp:224
+msgid "Copy as &HTML"
 msgstr ""
 
-#: part/katesearch.cpp:479
-msgid "End of document reached."
-msgstr " Wedi cyrraedd diwedd y ddogfen."
+#: part/kateview.cpp:225
+#, fuzzy
+msgid ""
+"Use this command to copy the currently selected text as HTML to the system "
+"clipboard."
+msgstr "Defnyddiwch y gorchymyn yma i gopïo'r testun dewisiedig i'r gludfwrdd."
 
-#: part/katesearch.cpp:480
-msgid "Beginning of document reached."
-msgstr " Wedi cyrraedd diwedd y ddogfen."
+#: part/kateview.cpp:230
+msgid "Save the current document"
+msgstr "Cadw'r ddogfen cyfredol"
 
-#: part/katesearch.cpp:485
-msgid "End of selection reached."
+#: part/kateview.cpp:233
+msgid "Revert the most recent editing actions"
+msgstr "Dychwelyd y gweithredoedd golygu diweddaraf"
+
+#: part/kateview.cpp:236
+msgid "Revert the most recent undo operation"
+msgstr "Dychwelyd y weithred ddadwneud diweddaraf"
+
+#: part/kateview.cpp:238
+msgid "&Word Wrap Document"
 msgstr ""
 
-#: part/katesearch.cpp:486
-msgid "Beginning of selection reached."
+#: part/kateview.cpp:239
+msgid ""
+"Use this command to wrap all lines of the current document which are longer "
+"than the width of the current view, to fit into this view."
+"<br>"
+"<br> This is a static word wrap, meaning it is not updated when the view is "
+"resized."
 msgstr ""
 
-#: part/katesearch.cpp:490
-msgid "Continue from the beginning?"
+#: part/kateview.cpp:244
+msgid "&Indent"
+msgstr "&Mewnoliad"
+
+#: part/kateview.cpp:245
+msgid ""
+"Use this to indent a selected block of text."
+"<br>"
+"<br>You can configure whether tabs should be honored and used or replaced with "
+"spaces, in the configuration dialog."
 msgstr ""
 
-#: part/katesearch.cpp:491
-msgid "Continue from the end?"
+#: part/kateview.cpp:247
+msgid "&Unindent"
 msgstr ""
 
-#: part/katesearch.cpp:499
-msgid "&Stop"
-msgstr "&Aros"
+#: part/kateview.cpp:248
+msgid "Use this to unindent a selected block of text."
+msgstr ""
 
-#: part/katesearch.cpp:753
-msgid "Replace Confirmation"
+#: part/kateview.cpp:250
+msgid "&Clean Indentation"
 msgstr ""
 
-#: part/katesearch.cpp:755
-msgid "Replace &All"
-msgstr "Amnewid y &Cwbl"
+#: part/kateview.cpp:251
+msgid ""
+"Use this to clean the indentation of a selected block of text (only tabs/only "
+"spaces)"
+"<br>"
+"<br>You can configure whether tabs should be honored and used or replaced with "
+"spaces, in the configuration dialog."
+msgstr ""
 
-#: part/katesearch.cpp:755
-#, fuzzy
-msgid "Re&place && Close"
-msgstr "Amnewid Testun"
+#: part/kateview.cpp:254
+msgid "&Align"
+msgstr "&Alinio"
 
-#: part/katesearch.cpp:755
-msgid "&Replace"
-msgstr "A&mnewid"
+#: part/kateview.cpp:255
+msgid ""
+"Use this to align the current line or block of text to its proper indent level."
+msgstr ""
 
-#: part/katesearch.cpp:757
-msgid "&Find Next"
-msgstr "&Canfod Nesaf"
+#: part/kateview.cpp:257
+msgid "C&omment"
+msgstr "S&ylwad"
 
-#: part/katesearch.cpp:762
-msgid "Found an occurrence of your search term. What do you want to do?"
+#: part/kateview.cpp:259
+msgid ""
+"This command comments out the current line or a selected block of text.<BR><BR>"
+"The characters for single/multiple line comments are defined within the "
+"language's highlighting."
 msgstr ""
 
-#: part/katesearch.cpp:814
-msgid "Usage: find[:[bcersw]] PATTERN"
+#: part/kateview.cpp:262
+msgid "Unco&mment"
 msgstr ""
 
-#: part/katesearch.cpp:826
-msgid "Usage: ifind[:[bcrs]] PATTERN"
+#: part/kateview.cpp:264
+msgid ""
+"This command removes comments from the current line or a selected block of "
+"text.<BR><BR>The characters for single/multiple line comments are defined "
+"within the language's highlighting."
 msgstr ""
 
-#: part/katesearch.cpp:880
-msgid "Usage: replace[:[bceprsw]] PATTERN [REPLACEMENT]"
+#: part/kateview.cpp:267
+msgid "&Read Only Mode"
 msgstr ""
 
-#: part/katesearch.cpp:914
-msgid "<p>Usage: <code>find[:bcersw] PATTERN</code></p>"
+#: part/kateview.cpp:270
+msgid "Lock/unlock the document for writing"
 msgstr ""
 
-#: part/katesearch.cpp:917
+#: part/kateview.cpp:272
+msgid "Uppercase"
+msgstr "Priflythrennau"
+
+#: part/kateview.cpp:274
 msgid ""
-"<p>Usage: <code>ifind:[:bcrs] PATTERN</code>"
-"<br>ifind does incremental or 'as-you-type' search</p>"
+"Convert the selection to uppercase, or the character to the right of the cursor "
+"if no text is selected."
 msgstr ""
 
-#: part/katesearch.cpp:921
-msgid "<p>Usage: <code>replace[:bceprsw] PATTERN REPLACEMENT</code></p>"
+#: part/kateview.cpp:277
+msgid "Lowercase"
+msgstr "Llythrennau Bach"
+
+#: part/kateview.cpp:279
+msgid ""
+"Convert the selection to lowercase, or the character to the right of the cursor "
+"if no text is selected."
 msgstr ""
 
-#: part/katesearch.cpp:924
+#: part/kateview.cpp:282
+msgid "Capitalize"
+msgstr ""
+
+#: part/kateview.cpp:284
 msgid ""
-"<h4><caption>Options</h4>"
-"<p><b>b</b> - Search backward"
-"<br><b>c</b> - Search from cursor"
-"<br><b>r</b> - Pattern is a regular expression"
-"<br><b>s</b> - Case sensitive search"
+"Capitalize the selection, or the word under the cursor if no text is selected."
 msgstr ""
 
-#: part/katesearch.cpp:933
+#: part/kateview.cpp:287
+msgid "Join Lines"
+msgstr ""
+
+#: part/kateview.cpp:299
+msgid "Print the current document."
+msgstr "Argraffu'r ddogfen cyfredol."
+
+#: part/kateview.cpp:301
+msgid "Reloa&d"
+msgstr "Ail-l&wytho"
+
+#: part/kateview.cpp:302
+msgid "Reload the current document from disk."
+msgstr ""
+
+#: part/kateview.cpp:305
+msgid "Save the current document to disk, with a name of your choice."
+msgstr "Cadw i ddisg y ddogfen gyfredol gyda enw o'ch dewis chi."
+
+#: part/kateview.cpp:308
 msgid ""
-"<br><b>e</b> - Search in selected text only"
-"<br><b>w</b> - Search whole words only"
+"This command opens a dialog and lets you choose a line that you want the cursor "
+"to move to."
+msgstr ""
+"Mae'r gorchymyn yma'n agor blwch ymgom i ddewis pa linell i symud y cyrchydd "
+"iddi."
+
+#: part/kateview.cpp:310
+msgid "&Configure Editor..."
+msgstr ""
+
+#: part/kateview.cpp:311
+msgid "Configure various aspects of this editor."
+msgstr ""
+
+#: part/kateview.cpp:313
+msgid "&Highlighting"
+msgstr "&Amlygu"
+
+#: part/kateview.cpp:314
+msgid "Here you can choose how the current document should be highlighted."
+msgstr "Dyma lle gallwch ddewis sut dylai'r ddogfen gael ei amlygu."
+
+#: part/kateview.cpp:317
+msgid "&Filetype"
+msgstr ""
+
+#: part/kateview.cpp:320
+msgid "&Schema"
+msgstr "&Sgema"
+
+#: part/kateview.cpp:324
+#, fuzzy
+msgid "&Indentation"
+msgstr "Modd Dewis"
+
+#: part/kateview.cpp:327
+#, fuzzy
+msgid "E&xport as HTML..."
+msgstr "A&llforio"
+
+#: part/kateview.cpp:328
+#, fuzzy
+msgid ""
+"This command allows you to export the current document with all highlighting "
+"information into a HTML document."
 msgstr ""
+"Mae'r gorchymyn yma yn gadael i chi allforio'r ddogfen gyfredol efo pob "
+"gwybodaeth amlygu i mewn i ddogfen nodau ychwanegiad, e.e. HTML."
+
+#: part/kateview.cpp:332
+msgid "Select the entire text of the current document."
+msgstr "Dewis holl destun y ddogfen gyfredol."
 
-#: part/katesearch.cpp:939
+#: part/kateview.cpp:335
 msgid ""
-"<br><b>p</b> - Prompt for replace</p>"
-"<p>If REPLACEMENT is not present, an empty string is used.</p>"
-"<p>If you want to have whitespace in your PATTERN, you need to quote both "
-"PATTERN and REPLACEMENT with either single or double quotes. To have the quote "
-"characters in the strings, prepend them with a backslash."
+"If you have selected something within the current document, this will no longer "
+"be selected."
 msgstr ""
 
-#: part/kateluaindentscript.cpp:86
-msgid "indenter.register requires 2 parameters (event id, function to call)"
+#: part/kateview.cpp:337
+msgid "Enlarge Font"
+msgstr "Cynyddu Maint yr Wynebfath"
+
+#: part/kateview.cpp:338
+msgid "This increases the display font size."
 msgstr ""
 
-#: part/kateluaindentscript.cpp:94
+#: part/kateview.cpp:340
+msgid "Shrink Font"
+msgstr "Lleihau Wynebfath"
+
+#: part/kateview.cpp:341
+msgid "This decreases the display font size."
+msgstr ""
+
+#: part/kateview.cpp:344
+msgid "Bl&ock Selection Mode"
+msgstr "Modd Dewis &Blociau"
+
+#: part/kateview.cpp:347
 msgid ""
-"indenter.register requires 2 parameters (event id (number), function to call "
-"(function))"
+"This command allows switching between the normal (line based) selection mode "
+"and the block selection mode."
 msgstr ""
 
-#: part/kateluaindentscript.cpp:108
-msgid "indenter.register:invalid event id"
+#: part/kateview.cpp:350
+msgid "Overwr&ite Mode"
+msgstr "Modd T&rosysgrifo"
+
+#: part/kateview.cpp:353
+msgid ""
+"Choose whether you want the text you type to be inserted or to overwrite "
+"existing text."
 msgstr ""
 
-#: part/kateluaindentscript.cpp:113
-msgid "indenter.register:there is already a function set for given"
+#: part/kateview.cpp:357
+msgid "&Dynamic Word Wrap"
 msgstr ""
 
-#: part/kateluaindentscript.cpp:126
-msgid "document.textLine:One parameter (line number) required"
+#: part/katedialogs.cpp:701 part/kateview.cpp:360
+msgid ""
+"If this option is checked, the text lines will be wrapped at the view border on "
+"the screen."
 msgstr ""
 
-#: part/kateluaindentscript.cpp:130
-msgid "document.textLine:One parameter (line number) required (number)"
+#: part/kateview.cpp:362
+msgid "Dynamic Word Wrap Indicators"
 msgstr ""
 
-#: part/kateluaindentscript.cpp:139
+#: part/katedialogs.cpp:703 part/kateview.cpp:363
+msgid "Choose when the Dynamic Word Wrap Indicators should be displayed"
+msgstr ""
+
+#: part/kateview.cpp:367
+msgid "&Off"
+msgstr "&I ffwrdd"
+
+#: part/kateview.cpp:368
+#, fuzzy
+msgid "Follow &Line Numbers"
+msgstr "Argraffu rhifau &llinell"
+
+#: part/kateview.cpp:369
+msgid "&Always On"
+msgstr ""
+
+#: part/kateview.cpp:373
+msgid "Show Folding &Markers"
+msgstr ""
+
+#: part/kateview.cpp:376
 msgid ""
-"document.removeText:Four parameters needed (start line, start col,end line, end "
-"col)"
+"You can choose if the codefolding marks should be shown, if codefolding is "
+"possible."
 msgstr ""
 
-#: part/kateluaindentscript.cpp:143
+#: part/kateview.cpp:377
+msgid "Hide Folding &Markers"
+msgstr ""
+
+#: part/kateview.cpp:380
+msgid "Show &Icon Border"
+msgstr ""
+
+#: part/kateview.cpp:384
 msgid ""
-"document.removeText:Four parameters needed (start line, start col,end line, end "
-"col) (4x number)"
+"Show/hide the icon border.<BR><BR> The icon border shows bookmark symbols, for "
+"instance."
 msgstr ""
 
-#: part/kateluaindentscript.cpp:152
-msgid "document.insertText:Three parameters needed (line,col,text)"
+#: part/kateview.cpp:385
+msgid "Hide &Icon Border"
 msgstr ""
 
-#: part/kateluaindentscript.cpp:156
+#: part/kateview.cpp:388
+msgid "Show &Line Numbers"
+msgstr ""
+
+#: part/kateview.cpp:391
+msgid "Show/hide the line numbers on the left hand side of the view."
+msgstr ""
+
+#: part/kateview.cpp:392
+#, fuzzy
+msgid "Hide &Line Numbers"
+msgstr "Argraffu rhifau &llinell"
+
+#: part/kateview.cpp:395
+msgid "Show Scroll&bar Marks"
+msgstr ""
+
+#: part/kateview.cpp:398
 msgid ""
-"document.removeText:Three parameters needed (line,col,text) "
-"(number,number,string)"
+"Show/hide the marks on the vertical scrollbar.<BR><BR>"
+"The marks, for instance, show bookmarks."
 msgstr ""
 
-#: part/kateluaindentscript.cpp:253
-msgid "LUA interpreter could not be initialized"
+#: part/kateview.cpp:399
+msgid "Hide Scroll&bar Marks"
 msgstr ""
 
-#: part/kateluaindentscript.cpp:293 part/kateluaindentscript.cpp:316
-#: part/kateluaindentscript.cpp:344
+#: part/kateview.cpp:402
+msgid "Show Static &Word Wrap Marker"
+msgstr ""
+
+#: part/kateview.cpp:406
+msgid ""
+"Show/hide the Word Wrap Marker, a vertical line drawn at the word wrap column "
+"as defined in the editing properties"
+msgstr ""
+
+#: part/kateview.cpp:408
+msgid "Hide Static &Word Wrap Marker"
+msgstr ""
+
+#: part/kateview.cpp:411
+msgid "Switch to Command Line"
+msgstr ""
+
+#: part/kateview.cpp:414
+msgid "Show/hide the command line on the bottom of the view."
+msgstr ""
+
+#: part/kateview.cpp:416
+msgid "&End of Line"
+msgstr "&Diwedd y Llinell"
+
+#: part/kateview.cpp:417
+msgid "Choose which line endings should be used, when you save the document"
+msgstr ""
+
+#: part/kateview.cpp:427
+msgid "E&ncoding"
+msgstr "A&mgodiad"
+
+#: part/kateview.cpp:444
+msgid "Move Word Left"
+msgstr ""
+
+#: part/kateview.cpp:448
+msgid "Select Character Left"
+msgstr ""
+
+#: part/kateview.cpp:452
+msgid "Select Word Left"
+msgstr ""
+
+#: part/kateview.cpp:457
+msgid "Move Word Right"
+msgstr ""
+
+#: part/kateview.cpp:461
+msgid "Select Character Right"
+msgstr ""
+
+#: part/kateview.cpp:465
+msgid "Select Word Right"
+msgstr ""
+
+#: part/kateview.cpp:470
+msgid "Move to Beginning of Line"
+msgstr ""
+
+#: part/kateview.cpp:474
+msgid "Move to Beginning of Document"
+msgstr ""
+
+#: part/kateview.cpp:478
+msgid "Select to Beginning of Line"
+msgstr ""
+
+#: part/kateview.cpp:482
+msgid "Select to Beginning of Document"
+msgstr ""
+
+#: part/kateview.cpp:487
+msgid "Move to End of Line"
+msgstr ""
+
+#: part/kateview.cpp:491
+msgid "Move to End of Document"
+msgstr ""
+
+#: part/kateview.cpp:495
+msgid "Select to End of Line"
+msgstr ""
+
+#: part/kateview.cpp:499
+msgid "Select to End of Document"
+msgstr ""
+
+#: part/kateview.cpp:504
+msgid "Select to Previous Line"
+msgstr ""
+
+#: part/kateview.cpp:508
+msgid "Scroll Line Up"
+msgstr ""
+
+#: part/kateview.cpp:512
+#, fuzzy
+msgid "Move to Next Line"
+msgstr "Mynd i Linell"
+
+#: part/kateview.cpp:515
+#, fuzzy
+msgid "Move to Previous Line"
+msgstr "Mynd i Linell"
+
+#: part/kateview.cpp:518
+msgid "Move Character Right"
+msgstr ""
+
+#: part/kateview.cpp:521
+msgid "Move Character Left"
+msgstr ""
+
+#: part/kateview.cpp:525
+msgid "Select to Next Line"
+msgstr ""
+
+#: part/kateview.cpp:529
+msgid "Scroll Line Down"
+msgstr ""
+
+#: part/kateview.cpp:534
+msgid "Scroll Page Up"
+msgstr ""
+
+#: part/kateview.cpp:538
+msgid "Select Page Up"
+msgstr ""
+
+#: part/kateview.cpp:542
+msgid "Move to Top of View"
+msgstr ""
+
+#: part/kateview.cpp:546
+msgid "Select to Top of View"
+msgstr ""
+
+#: part/kateview.cpp:551
+msgid "Scroll Page Down"
+msgstr ""
+
+#: part/kateview.cpp:555
+msgid "Select Page Down"
+msgstr ""
+
+#: part/kateview.cpp:559
+msgid "Move to Bottom of View"
+msgstr ""
+
+#: part/kateview.cpp:563
+msgid "Select to Bottom of View"
+msgstr ""
+
+#: part/kateview.cpp:567
+msgid "Move to Matching Bracket"
+msgstr ""
+
+#: part/kateview.cpp:571
+msgid "Select to Matching Bracket"
+msgstr ""
+
+#: part/kateview.cpp:579
+msgid "Transpose Characters"
+msgstr ""
+
+#: part/kateview.cpp:584
+msgid "Delete Line"
+msgstr ""
+
+#: part/kateview.cpp:589
+msgid "Delete Word Left"
+msgstr ""
+
+#: part/kateview.cpp:594
+msgid "Delete Word Right"
+msgstr ""
+
+#: part/kateview.cpp:598
+msgid "Delete Next Character"
+msgstr ""
+
+#: part/kateview.cpp:602
+msgid "Backspace"
+msgstr "Yn ôl"
+
+#: part/kateview.cpp:628
+msgid "Collapse Toplevel"
+msgstr ""
+
+#: part/kateview.cpp:630
+msgid "Expand Toplevel"
+msgstr ""
+
+#: part/kateview.cpp:632
+msgid "Collapse One Local Level"
+msgstr ""
+
+#: part/kateview.cpp:634
+msgid "Expand One Local Level"
+msgstr ""
+
+#: part/kateview.cpp:639
+msgid "Show the code folding region tree"
+msgstr ""
+
+#: part/kateview.cpp:640
+msgid "Basic template code test"
+msgstr ""
+
+#: part/kateview.cpp:702
+msgid " OVR "
+msgstr "DROS"
+
+#: part/kateview.cpp:704
+msgid " INS "
+msgstr "MEWN"
+
+#: part/kateview.cpp:707
+msgid " R/O "
+msgstr "DyU"
+
+#: part/kateview.cpp:712
 #, c-format
-msgid "Lua indenting script had errors: %1"
+msgid " Line: %1"
+msgstr "Llinell: %1 "
+
+#: part/kateview.cpp:713
+#, c-format
+msgid " Col: %1"
+msgstr " Col: %1"
+
+#: part/kateview.cpp:716
+msgid " BLK "
+msgstr "BLC"
+
+#: part/kateview.cpp:716
+msgid " NORM "
+msgstr "ARF"
+
+#: part/katedocument.cpp:4331 part/katedocument.cpp:5073 part/kateview.cpp:863
+msgid "Save File"
 msgstr ""
 
-#: part/katejscript.cpp:1058 part/katejscript.cpp:1076
-#: part/kateluaindentscript.cpp:413 part/kateluaindentscript.cpp:431
-msgid "(Unknown)"
-msgstr "(Anhysbys)"
+#: part/katedocument.cpp:5101 part/kateview.cpp:890
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr ""
+"Mae ffeil o'r enw \"%1\" mewn bod eisoes.  Ydych wir eisiau ysgrifennu drosti?"
+
+#: part/katedocument.cpp:5103 part/kateview.cpp:891
+msgid "Overwrite File?"
+msgstr "Trosysgrifo'r Ffeil?"
+
+#: part/katedocument.cpp:5104 part/kateview.cpp:892
+msgid "&Overwrite"
+msgstr "&Trosysgrifo"
+
+#: part/kateview.cpp:892
+msgid "Overwrite the file"
+msgstr ""
+
+#: part/kateview.cpp:1794
+#, fuzzy
+msgid "Export File as HTML"
+msgstr "Allforio Ffeil Fel"
 
 #: part/katedocument.cpp:434
 msgid "Fonts & Colors"
@@ -642,28 +1313,28 @@ msgstr ""
 msgid "Plugin Manager"
 msgstr "Rheolydd Ategynion"
 
-#: part/katedocument.cpp:2482
+#: part/katedocument.cpp:2483
 msgid ""
 "The file %1 could not be loaded completely, as there is not enough temporary "
 "disk storage for it."
 msgstr ""
 
-#: part/katedocument.cpp:2484
+#: part/katedocument.cpp:2485
 msgid ""
 "The file %1 could not be loaded, as it was not possible to read from it.\n"
 "\n"
 "Check if you have read access to this file."
 msgstr ""
 
-#: part/katedocument.cpp:2494 part/katedocument.cpp:2560
+#: part/katedocument.cpp:2495 part/katedocument.cpp:2561
 msgid "The file %1 is a binary, saving it will result in a corrupt file."
 msgstr ""
 
-#: part/katedocument.cpp:2495
+#: part/katedocument.cpp:2496
 msgid "Binary File Opened"
 msgstr ""
 
-#: part/katedocument.cpp:2553
+#: part/katedocument.cpp:2554
 msgid ""
 "This file could not be loaded correctly due to lack of temporary disk space. "
 "Saving it could cause data loss.\n"
@@ -671,44 +1342,44 @@ msgid ""
 "Do you really want to save it?"
 msgstr ""
 
-#: part/katedocument.cpp:2553 part/katedocument.cpp:2580
-#: part/katedocument.cpp:2591 part/katedocument.cpp:2756
+#: part/katedocument.cpp:2554 part/katedocument.cpp:2581
+#: part/katedocument.cpp:2592 part/katedocument.cpp:2757
 msgid "Possible Data Loss"
 msgstr ""
 
-#: part/katedocument.cpp:2553 part/katedocument.cpp:2562
-#: part/katedocument.cpp:2574 part/katedocument.cpp:2580
-#: part/katedocument.cpp:2591
+#: part/katedocument.cpp:2554 part/katedocument.cpp:2563
+#: part/katedocument.cpp:2575 part/katedocument.cpp:2581
+#: part/katedocument.cpp:2592
 msgid "Save Nevertheless"
 msgstr ""
 
-#: part/katedocument.cpp:2561
+#: part/katedocument.cpp:2562
 msgid "Trying to Save Binary File"
 msgstr ""
 
-#: part/katedocument.cpp:2574
+#: part/katedocument.cpp:2575
 msgid ""
 "Do you really want to save this unmodified file? You could overwrite changed "
 "data in the file on disk."
 msgstr ""
 
-#: part/katedocument.cpp:2574
+#: part/katedocument.cpp:2575
 msgid "Trying to Save Unmodified File"
 msgstr ""
 
-#: part/katedocument.cpp:2580
+#: part/katedocument.cpp:2581
 msgid ""
 "Do you really want to save this file? Both your open file and the file on disk "
 "were changed. There could be some data lost."
 msgstr ""
 
-#: part/katedocument.cpp:2591
+#: part/katedocument.cpp:2592
 msgid ""
 "The selected encoding cannot encode every unicode character in this document. "
 "Do you really want to save it? There could be some data lost."
 msgstr ""
 
-#: part/katedocument.cpp:2642
+#: part/katedocument.cpp:2643
 msgid ""
 "The document could not be saved, as it was not possible to write to %1.\n"
 "\n"
@@ -716,235 +1387,351 @@ msgid ""
 "available."
 msgstr ""
 
-#: part/katedocument.cpp:2755
+#: part/katedocument.cpp:2756
 msgid "Do you really want to continue to close this file? Data loss may occur."
 msgstr ""
 
-#: part/katedocument.cpp:2756
+#: part/katedocument.cpp:2757
 msgid "Close Nevertheless"
 msgstr ""
 
-#: part/katedocument.cpp:4330 part/katedocument.cpp:5063 part/kateview.cpp:863
-msgid "Save File"
-msgstr ""
-
-#: part/katedocument.cpp:4339
+#: part/katedocument.cpp:4340
 msgid "Save failed"
 msgstr "Methodd y cadw"
 
-#: part/katedialogs.cpp:1615 part/katedocument.cpp:4401
+#: part/katedialogs.cpp:1610 part/katedocument.cpp:4402
 msgid "What do you want to do?"
 msgstr "Beth hoffech chi ei wneud?"
 
-#: part/katedocument.cpp:4402
+#: part/katedocument.cpp:4403
 #, fuzzy
 msgid "File Was Changed on Disk"
 msgstr "Mae'r Ffeil wedi Newid ar Dddisg"
 
-#: part/katedialogs.cpp:1593 part/katedocument.cpp:4402
+#: part/katedialogs.cpp:1588 part/katedocument.cpp:4403
 #, fuzzy
 msgid "&Reload File"
 msgstr "A&mnewid"
 
-#: part/katedocument.cpp:4402
+#: part/katedocument.cpp:4403
 msgid "&Ignore Changes"
 msgstr ""
 
-#: part/katedocument.cpp:4980
+#: part/katedocument.cpp:4981
 msgid "The file '%1' was modified by another program."
 msgstr ""
 
-#: part/katedocument.cpp:4983
+#: part/katedocument.cpp:4984
 msgid "The file '%1' was created by another program."
 msgstr ""
 
-#: part/katedocument.cpp:4986
+#: part/katedocument.cpp:4987
 msgid "The file '%1' was deleted by another program."
 msgstr ""
 
-#: part/katedocument.cpp:5091 part/kateview.cpp:890
-msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
-msgstr ""
-"Mae ffeil o'r enw \"%1\" mewn bod eisoes.  Ydych wir eisiau ysgrifennu drosti?"
-
-#: part/katedocument.cpp:5093 part/kateview.cpp:891
-msgid "Overwrite File?"
-msgstr "Trosysgrifo'r Ffeil?"
-
-#: part/katedocument.cpp:5094 part/kateview.cpp:892
-msgid "&Overwrite"
-msgstr "&Trosysgrifo"
+#: part/kateautoindent.cpp:97 part/katehighlight.cpp:3165
+#: part/kateschema.cpp:1058
+msgid "Normal"
+msgstr "Arferol"
 
-#: part/katefiletype.cpp:273
-msgid "&Filetype:"
+#: part/kateautoindent.cpp:99
+msgid "C Style"
 msgstr ""
 
-#: part/katefiletype.cpp:279
-msgid "&New"
-msgstr "&Newydd"
-
-#: part/katefiletype.cpp:289
-msgid "N&ame:"
-msgstr "E&nw:"
-
-#: part/katefiletype.cpp:294
-msgid "&Section:"
-msgstr "R&han:"
-
-#: part/katefiletype.cpp:299
-msgid "&Variables:"
-msgstr "&Newidynnau :"
+#: part/kateautoindent.cpp:101
+msgid "Python Style"
+msgstr ""
 
-#: part/katedialogs.cpp:1299 part/katefiletype.cpp:304
-msgid "File e&xtensions:"
+#: part/kateautoindent.cpp:103
+msgid "XML Style"
 msgstr ""
 
-#: part/katedialogs.cpp:1304 part/katefiletype.cpp:308
-#: plugins/autobookmarker/autobookmarker.cpp:324
-msgid "MIME &types:"
+#: part/kateautoindent.cpp:105
+msgid "S&S C Style"
 msgstr ""
 
-#: part/katedialogs.cpp:1309 part/katefiletype.cpp:317
-msgid "Prio&rity:"
-msgstr "Blae&noriaeth:"
+#: part/kateautoindent.cpp:107
+msgid "Variable Based Indenter"
+msgstr ""
 
-#: part/katefiletype.cpp:332
-#, fuzzy
-msgid "Create a new file type."
-msgstr "Cadw'r ddogfen cyfredol"
+#: part/kateautoindent.cpp:111 part/katefiletype.cpp:522
+#: part/katehighlight.cpp:1192
+msgid "None"
+msgstr "Dim"
 
-#: part/katefiletype.cpp:333
-#, fuzzy
-msgid "Delete the current file type."
-msgstr "Cadw'r ddogfen cyfredol"
+#: part/katehighlight.cpp:1823
+msgid "Normal Text"
+msgstr "Testun Arferol"
 
-#: part/katefiletype.cpp:335
+#: part/katehighlight.cpp:1971
 msgid ""
-"The name of the filetype will be the text of the corresponding menu item."
+"<B>%1</B>: Deprecated syntax. Attribute (%2) not addressed by symbolic name<BR>"
 msgstr ""
 
-#: part/katefiletype.cpp:337
-msgid "The section name is used to organize the file types in menus."
+#: part/katehighlight.cpp:2338
+msgid "<B>%1</B>: Deprecated syntax. Context %2 has no symbolic name<BR>"
 msgstr ""
 
-#: part/katefiletype.cpp:339
+#: part/katehighlight.cpp:2385
 msgid ""
-"<p>This string allows you to configure Kate's settings for the files selected "
-"by this mimetype using Kate variables. You can set almost any configuration "
-"option, such as highlight, indent-mode, encoding, etc.</p>"
-"<p>For a full list of known variables, see the manual.</p>"
+"<B>%1</B>:Deprecated syntax. Context %2 not addressed by a symbolic name"
 msgstr ""
 
-#: part/katefiletype.cpp:344
+#: part/katehighlight.cpp:2500
 msgid ""
-"The wildcards mask allows you to select files by filename. A typical mask uses "
-"an asterisk and the file extension, for example <code>*.txt; *.text</code>"
-". The string is a semicolon-separated list of masks."
+"There were warning(s) and/or error(s) while parsing the syntax highlighting "
+"configuration."
 msgstr ""
 
-#: part/katefiletype.cpp:349
-msgid ""
-"The mime type mask allows you to select files by mimetype. The string is a "
-"semicolon-separated list of mimetypes, for example <code>"
-"text/plain; text/english</code>."
+#: part/katehighlight.cpp:2502
+msgid "Kate Syntax Highlighting Parser"
 msgstr ""
 
-#: part/katefiletype.cpp:353
-msgid "Displays a wizard that helps you easily select mimetypes."
+#: part/katehighlight.cpp:2653
+msgid ""
+"Since there has been an error parsing the highlighting description, this "
+"highlighting will be disabled"
 msgstr ""
 
-#: part/katefiletype.cpp:355
+#: part/katehighlight.cpp:2855
 msgid ""
-"Sets a priority for this file type. If more than one file type selects the same "
-"file, the one with the highest priority will be used."
+"<B>%1</B>: Specified multiline comment region (%2) could not be resolved<BR>"
 msgstr ""
 
-#: part/katefiletype.cpp:427
-msgid "New Filetype"
+#: part/katehighlight.cpp:3166
+msgid "Keyword"
+msgstr "Allweddair"
+
+#: part/katehighlight.cpp:3167
+msgid "Data Type"
+msgstr "Math data"
+
+#: part/katehighlight.cpp:3168
+msgid "Decimal/Value"
 msgstr ""
 
-#: part/katefiletype.cpp:471
-#, c-format
-msgid "Properties of %1"
-msgstr "Priodweddau %1"
+#: part/katehighlight.cpp:3169
+msgid "Base-N Integer"
+msgstr ""
 
-#: part/katefiletype.cpp:504
-msgid ""
-"Select the MimeTypes you want for this file type.\n"
-"Please note that this will automatically edit the associated file extensions as "
-"well."
+#: part/katehighlight.cpp:3170
+msgid "Floating Point"
 msgstr ""
 
-#: part/katedialogs.cpp:1426 part/katefiletype.cpp:506
-#: plugins/autobookmarker/autobookmarker.cpp:367
-msgid "Select Mime Types"
+#: part/katehighlight.cpp:3171
+msgid "Character"
+msgstr "Nod"
+
+#: part/katehighlight.cpp:3172
+msgid "String"
+msgstr "Llinell"
+
+#: part/katedialogs.cpp:1116 part/katehighlight.cpp:3173
+msgid "Comment"
+msgstr "Sylwad"
+
+#: part/katehighlight.cpp:3174
+msgid "Others"
+msgstr "Eraill"
+
+#: part/katehighlight.cpp:3175
+msgid "Alert"
 msgstr ""
 
-#: part/kateautoindent.cpp:111 part/katefiletype.cpp:522
-#: part/katehighlight.cpp:1193
-msgid "None"
-msgstr "Dim"
+#: part/katehighlight.cpp:3176
+msgid "Function"
+msgstr "Ffwythiant"
 
-#: part/kateviewhelpers.cpp:237
-msgid "Available Commands"
+#: part/katehighlight.cpp:3178
+msgid "Region Marker"
 msgstr ""
 
-#: part/kateviewhelpers.cpp:239
+#: part/kateprinter.cpp:72
+#, c-format
+msgid "Print %1"
+msgstr "Argraffu %1"
+
+#: part/kateprinter.cpp:202
+msgid "(Selection of) "
+msgstr "(Dewisiad o)"
+
+#: part/kateprinter.cpp:309 part/kateprinter.cpp:528
+#, c-format
+msgid "Typographical Conventions for %1"
+msgstr "Arferiadau Teipograffeg am %1"
+
+#: part/kateprinter.cpp:639
+msgid "Te&xt Settings"
+msgstr "Gosodiadau Test&un"
+
+#: part/kateprinter.cpp:644
+msgid "Print &selected text only"
+msgstr "Argraffu testun de&wisedig yn unig"
+
+#: part/kateprinter.cpp:647
+msgid "Print &line numbers"
+msgstr "Argraffu rhifau &llinell"
+
+#: part/kateprinter.cpp:650
+msgid "Print syntax &guide"
+msgstr "Argraffu canllawiau c&ystrawen"
+
+#: part/kateprinter.cpp:659
 msgid ""
-"<p>For help on individual commands, do <code>'help &lt;command&gt;'</code></p>"
+"<p>This option is only available if some text is selected in the document.</p>"
+"<p>If available and enabled, only the selected text is printed.</p>"
 msgstr ""
+"<p>Mae'r dewisiad yma ar gael yn unig os mae testun wedi'i ddewis yn y "
+"ddogfen.</p>"
+"<p>Os ar gael ac wedi alluogi, argraffir y testun dewisedig yn unig.</p>"
 
-#: part/kateviewhelpers.cpp:250
-msgid "No help for '%1'"
+#: part/kateprinter.cpp:662
+msgid ""
+"<p>If enabled, line numbers will be printed on the left side of the page(s).</p>"
 msgstr ""
+"<p>Os alluogir, argraffir rhifau llinell ar ochr chwith y tudalen(nau).</p>"
 
-#: part/kateviewhelpers.cpp:253
-msgid "No such command <b>%1</b>"
+#: part/kateprinter.cpp:664
+msgid ""
+"<p>Print a box displaying typographical conventions for the document type, as "
+"defined by the syntax highlighting being used."
 msgstr ""
+"<p>Argraffu blwch syn dangos arferiadau teipograffeg am fath y ddogfen, fel a "
+"ddiffinir gan yr amlygiad cystrawen a ddefnyddir."
 
-#: part/kateviewhelpers.cpp:258
-msgid ""
-"<p>This is the Katepart <b>command line</b>."
-"<br>Syntax: <code><b>command [ arguments ]</b></code>"
-"<br>For a list of available commands, enter <code><b>help list</b></code>"
-"<br>For help for individual commands, enter <code><b>help &lt;command&gt;</b>"
-"</code></p>"
+#: part/kateprinter.cpp:700
+msgid "Hea&der && Footer"
+msgstr "Pen&nawd && Troedyn"
+
+#: part/kateprinter.cpp:708
+msgid "Pr&int header"
+msgstr "A&rgraffu pennawd"
+
+#: part/kateprinter.cpp:710
+msgid "Pri&nt footer"
+msgstr "Argr&affu troedyn"
+
+#: part/kateprinter.cpp:715
+msgid "Header/footer font:"
 msgstr ""
 
-#: part/kateviewhelpers.cpp:345
-msgid "Success: "
-msgstr "Llwyddiant : "
+#: part/kateprinter.cpp:720
+msgid "Choo&se Font..."
+msgstr "Dewi&s Ffont..."
 
-#: part/kateviewhelpers.cpp:347
-msgid "Success"
-msgstr "Llwyddiant"
+#: part/kateprinter.cpp:724
+msgid "Header Properties"
+msgstr "Nodweddion Penawdau"
 
-#: part/kateviewhelpers.cpp:352
-msgid "Error: "
-msgstr "Gwall:"
+#: part/kateprinter.cpp:727
+msgid "&Format:"
+msgstr "&Fformat:"
 
-#: part/kateviewhelpers.cpp:354
-msgid "Command \"%1\" failed."
+#: part/kateprinter.cpp:734 part/kateprinter.cpp:755
+msgid "Colors:"
+msgstr "Lliwiau:"
+
+#: part/kateprinter.cpp:737 part/kateprinter.cpp:758
+msgid "Foreground:"
+msgstr "Blaendir:"
+
+#: part/kateprinter.cpp:740
+msgid "Bac&kground"
+msgstr "Ce&fndir"
+
+#: part/kateprinter.cpp:743
+msgid "Footer Properties"
+msgstr "Priodweddau'r Troedynnau"
+
+#: part/kateprinter.cpp:747
+msgid "For&mat:"
+msgstr "Ffor&mat:"
+
+#: part/kateprinter.cpp:761
+msgid "&Background"
+msgstr "&Cefndir"
+
+#: part/kateprinter.cpp:788
+msgid "<p>Format of the page header. The following tags are supported:</p>"
+msgstr "<p>Fformat pennawd y dudalen.  Cynhelir y tagiau canlynol:</p>"
+
+#: part/kateprinter.cpp:790
+msgid ""
+"<ul>"
+"<li><tt>%u</tt>: current user name</li>"
+"<li><tt>%d</tt>: complete date/time in short format</li>"
+"<li><tt>%D</tt>: complete date/time in long format</li>"
+"<li><tt>%h</tt>: current time</li>"
+"<li><tt>%y</tt>: current date in short format</li>"
+"<li><tt>%Y</tt>: current date in long format</li>"
+"<li><tt>%f</tt>: file name</li>"
+"<li><tt>%U</tt>: full URL of the document</li>"
+"<li><tt>%p</tt>: page number</li></ul>"
+"<br><u>Note:</u> Do <b>not</b> use the '|' (vertical bar) character."
 msgstr ""
 
-#: part/kateviewhelpers.cpp:360
-msgid "No such command: \"%1\""
+#: part/kateprinter.cpp:804
+msgid "<p>Format of the page footer. The following tags are supported:</p>"
 msgstr ""
 
-#: part/kateschema.cpp:304 part/kateviewhelpers.cpp:704
-msgid "Bookmark"
-msgstr "Nod Tudalen"
+#: part/kateprinter.cpp:908
+msgid "L&ayout"
+msgstr "C&ynllun"
 
-#: part/kateviewhelpers.cpp:1127 part/kateviewhelpers.cpp:1128
-#, c-format
-msgid "Mark Type %1"
+#: part/kateprinter.cpp:915 part/kateschema.cpp:834
+msgid "&Schema:"
+msgstr "&Sgema :"
+
+#: part/kateprinter.cpp:919
+msgid "Draw bac&kground color"
+msgstr "Llunio lliw y ce&fndir"
+
+#: part/kateprinter.cpp:922
+msgid "Draw &boxes"
+msgstr "Llunio &blychau"
+
+#: part/kateprinter.cpp:925
+msgid "Box Properties"
+msgstr "Priodweddau'r blwch"
+
+#: part/kateprinter.cpp:928
+msgid "W&idth:"
+msgstr "&Lled:"
+
+#: part/kateprinter.cpp:932
+msgid "&Margin:"
+msgstr "&Ymyl:"
+
+#: part/kateprinter.cpp:936
+msgid "Co&lor:"
+msgstr "Ll&iw:"
+
+#: part/kateprinter.cpp:954
+msgid ""
+"<p>If enabled, the background color of the editor will be used.</p>"
+"<p>This may be useful if your color scheme is designed for a dark "
+"background.</p>"
 msgstr ""
 
-#: part/kateviewhelpers.cpp:1144
-msgid "Set Default Mark Type"
+#: part/kateprinter.cpp:957
+msgid ""
+"<p>If enabled, a box as defined in the properties below will be drawn around "
+"the contents of each page. The Header and Footer will be separated from the "
+"contents with a line as well.</p>"
 msgstr ""
 
+#: part/kateprinter.cpp:961
+msgid "The width of the box outline"
+msgstr "Lled amlinell y blwch"
+
+#: part/kateprinter.cpp:963
+msgid "The margin inside boxes, in pixels"
+msgstr "Yr ymyl tu mewn y blychau, mewn picseli"
+
+#: part/kateprinter.cpp:965
+msgid "The line color to use for boxes"
+msgstr "Lliw y lliniau i'w ddefnyddio am y blychau"
+
 #: part/kateschema.cpp:279
 msgid "Text Area Background"
 msgstr "Cefndir Ardal Testun"
@@ -961,6 +1748,10 @@ msgstr "Testun dewisedig:"
 msgid "Current line:"
 msgstr ""
 
+#: part/kateschema.cpp:304 part/kateviewhelpers.cpp:704
+msgid "Bookmark"
+msgstr "Nod Tudalen"
+
 #: part/kateschema.cpp:305
 msgid "Active Breakpoint"
 msgstr ""
@@ -1065,7 +1856,7 @@ msgid ""
 "menu when appropriate."
 msgstr ""
 
-#: part/katedialogs.cpp:1267 part/kateschema.cpp:689
+#: part/katedialogs.cpp:1266 part/kateschema.cpp:689
 msgid "H&ighlight:"
 msgstr "A&mlygu:"
 
@@ -1081,10 +1872,6 @@ msgid ""
 "menu when appropriate."
 msgstr ""
 
-#: part/kateschema.cpp:840 plugins/autobookmarker/autobookmarker.cpp:406
-msgid "&New..."
-msgstr "&Newydd..."
-
 #: part/kateschema.cpp:853
 msgid "Colors"
 msgstr "Lliwiau"
@@ -1117,11 +1904,6 @@ msgstr ""
 msgid "Context"
 msgstr ""
 
-#: part/kateautoindent.cpp:97 part/katehighlight.cpp:3166
-#: part/kateschema.cpp:1058
-msgid "Normal"
-msgstr "Arferol"
-
 #: part/kateschema.cpp:1059
 msgid "Selected"
 msgstr "Dewisiedig"
@@ -1193,204 +1975,334 @@ msgstr ""
 msgid "Kate Styles"
 msgstr ""
 
-#: part/katesyntaxdocument.cpp:76
+#: part/katefiletype.cpp:273
+msgid "&Filetype:"
+msgstr ""
+
+#: part/katefiletype.cpp:279
+msgid "&New"
+msgstr "&Newydd"
+
+#: part/katefiletype.cpp:289
+msgid "N&ame:"
+msgstr "E&nw:"
+
+#: part/katefiletype.cpp:294
+msgid "&Section:"
+msgstr "R&han:"
+
+#: part/katefiletype.cpp:299
+msgid "&Variables:"
+msgstr "&Newidynnau :"
+
+#: part/katedialogs.cpp:1298 part/katefiletype.cpp:304
+msgid "File e&xtensions:"
+msgstr ""
+
+#: part/katedialogs.cpp:1308 part/katefiletype.cpp:317
+msgid "Prio&rity:"
+msgstr "Blae&noriaeth:"
+
+#: part/katefiletype.cpp:332
+#, fuzzy
+msgid "Create a new file type."
+msgstr "Cadw'r ddogfen cyfredol"
+
+#: part/katefiletype.cpp:333
+#, fuzzy
+msgid "Delete the current file type."
+msgstr "Cadw'r ddogfen cyfredol"
+
+#: part/katefiletype.cpp:335
 msgid ""
-"<qt>The error <b>%4</b>"
-"<br> has been detected in the file %1 at %2/%3</qt>"
-msgstr "<qt>Canfuwyd y gwall <b>%4</b><br> yn y ffeil %1 wrth %2/%3</qt>"
+"The name of the filetype will be the text of the corresponding menu item."
+msgstr ""
 
-#: part/katesyntaxdocument.cpp:84
+#: part/katefiletype.cpp:337
+msgid "The section name is used to organize the file types in menus."
+msgstr ""
+
+#: part/katefiletype.cpp:339
+msgid ""
+"<p>This string allows you to configure Kate's settings for the files selected "
+"by this mimetype using Kate variables. You can set almost any configuration "
+"option, such as highlight, indent-mode, encoding, etc.</p>"
+"<p>For a full list of known variables, see the manual.</p>"
+msgstr ""
+
+#: part/katefiletype.cpp:344
+msgid ""
+"The wildcards mask allows you to select files by filename. A typical mask uses "
+"an asterisk and the file extension, for example <code>*.txt; *.text</code>"
+". The string is a semicolon-separated list of masks."
+msgstr ""
+
+#: part/katefiletype.cpp:349
+msgid ""
+"The mime type mask allows you to select files by mimetype. The string is a "
+"semicolon-separated list of mimetypes, for example <code>"
+"text/plain; text/english</code>."
+msgstr ""
+
+#: part/katefiletype.cpp:353
+msgid "Displays a wizard that helps you easily select mimetypes."
+msgstr ""
+
+#: part/katefiletype.cpp:355
+msgid ""
+"Sets a priority for this file type. If more than one file type selects the same "
+"file, the one with the highest priority will be used."
+msgstr ""
+
+#: part/katefiletype.cpp:427
+msgid "New Filetype"
+msgstr ""
+
+#: part/katefiletype.cpp:471
 #, c-format
-msgid "Unable to open %1"
-msgstr "Methu agor %1"
+msgid "Properties of %1"
+msgstr "Priodweddau %1"
 
-#: part/katesyntaxdocument.cpp:457
-msgid "Errors!"
-msgstr "Gwallau!"
+#: part/katefiletype.cpp:504
+msgid ""
+"Select the MimeTypes you want for this file type.\n"
+"Please note that this will automatically edit the associated file extensions as "
+"well."
+msgstr ""
 
-#: part/katesyntaxdocument.cpp:462
+#: part/kateviewhelpers.cpp:237
+msgid "Available Commands"
+msgstr ""
+
+#: part/kateviewhelpers.cpp:239
+msgid ""
+"<p>For help on individual commands, do <code>'help &lt;command&gt;'</code></p>"
+msgstr ""
+
+#: part/kateviewhelpers.cpp:250
+msgid "No help for '%1'"
+msgstr ""
+
+#: part/kateviewhelpers.cpp:253
+msgid "No such command <b>%1</b>"
+msgstr ""
+
+#: part/kateviewhelpers.cpp:258
+msgid ""
+"<p>This is the Katepart <b>command line</b>."
+"<br>Syntax: <code><b>command [ arguments ]</b></code>"
+"<br>For a list of available commands, enter <code><b>help list</b></code>"
+"<br>For help for individual commands, enter <code><b>help &lt;command&gt;</b>"
+"</code></p>"
+msgstr ""
+
+#: part/kateviewhelpers.cpp:345
+msgid "Success: "
+msgstr "Llwyddiant : "
+
+#: part/kateviewhelpers.cpp:347
+msgid "Success"
+msgstr "Llwyddiant"
+
+#: part/kateviewhelpers.cpp:352
+msgid "Error: "
+msgstr "Gwall:"
+
+#: part/kateviewhelpers.cpp:354
+msgid "Command \"%1\" failed."
+msgstr ""
+
+#: part/kateviewhelpers.cpp:360
+msgid "No such command: \"%1\""
+msgstr ""
+
+#: part/kateviewhelpers.cpp:1127 part/kateviewhelpers.cpp:1128
 #, c-format
-msgid "Error: %1"
-msgstr "Gwall: %1"
+msgid "Mark Type %1"
+msgstr ""
 
-#: part/katedialogs.cpp:153
+#: part/kateviewhelpers.cpp:1144
+msgid "Set Default Mark Type"
+msgstr ""
+
+#: part/katedialogs.cpp:152
 msgid "Automatic Indentation"
 msgstr ""
 
-#: part/katedialogs.cpp:157
+#: part/katedialogs.cpp:156
 msgid "&Indentation mode:"
 msgstr ""
 
-#: part/katedialogs.cpp:161 part/katedialogs.cpp:1132
+#: part/katedialogs.cpp:160 part/katedialogs.cpp:1131
 msgid "Configure..."
 msgstr "Ffurfweddu..."
 
-#: part/katedialogs.cpp:163
+#: part/katedialogs.cpp:162
 msgid "Insert leading Doxygen \"*\" when typing"
 msgstr ""
 
-#: part/katedialogs.cpp:164
+#: part/katedialogs.cpp:163
 msgid "Adjust indentation of code pasted from the clipboard"
 msgstr ""
 
-#: part/katedialogs.cpp:166
+#: part/katedialogs.cpp:165
 msgid "Indentation with Spaces"
 msgstr ""
 
-#: part/katedialogs.cpp:168
+#: part/katedialogs.cpp:167
 msgid "Use &spaces instead of tabs to indent"
 msgstr ""
 
-#: part/katedialogs.cpp:169
+#: part/katedialogs.cpp:168
 msgid "Emacs style mixed mode"
 msgstr ""
 
-#: part/katedialogs.cpp:173
+#: part/katedialogs.cpp:172
 msgid "Number of spaces:"
 msgstr "Nifer o fylchau:"
 
-#: part/katedialogs.cpp:175
+#: part/katedialogs.cpp:174
 msgid "Keep indent &profile"
 msgstr ""
 
-#: part/katedialogs.cpp:176
+#: part/katedialogs.cpp:175
 msgid "&Keep extra spaces"
 msgstr "&Cadw gofodnodau ychwanegol"
 
-#: part/katedialogs.cpp:178
+#: part/katedialogs.cpp:177
 msgid "Keys to Use"
 msgstr ""
 
-#: part/katedialogs.cpp:179
+#: part/katedialogs.cpp:178
 msgid "&Tab key indents"
 msgstr ""
 
-#: part/katedialogs.cpp:180
+#: part/katedialogs.cpp:179
 msgid "&Backspace key indents"
 msgstr ""
 
-#: part/katedialogs.cpp:183
+#: part/katedialogs.cpp:182
 msgid "Tab Key Mode if Nothing Selected"
 msgstr ""
 
-#: part/katedialogs.cpp:185
+#: part/katedialogs.cpp:184
 msgid "Insert indent &characters"
 msgstr ""
 
-#: part/katedialogs.cpp:186
+#: part/katedialogs.cpp:185
 msgid "I&nsert tab character"
 msgstr ""
 
-#: part/katedialogs.cpp:187
+#: part/katedialogs.cpp:186
 msgid "Indent current &line"
 msgstr ""
 
-#: part/katedialogs.cpp:209
+#: part/katedialogs.cpp:208
 msgid "Check this if you want to indent with spaces rather than tabs."
 msgstr ""
 
-#: part/katedialogs.cpp:211
+#: part/katedialogs.cpp:210
 msgid ""
 "Indentations of more than the selected number of spaces will not be shortened."
 msgstr ""
 
-#: part/katedialogs.cpp:214
+#: part/katedialogs.cpp:213
 msgid ""
 "This allows the <b>Tab</b> key to be used to increase the indentation level."
 msgstr ""
 
-#: part/katedialogs.cpp:217
+#: part/katedialogs.cpp:216
 msgid ""
 "This allows the <b>Backspace</b> key to be used to decrease the indentation "
 "level."
 msgstr ""
 
-#: part/katedialogs.cpp:220
+#: part/katedialogs.cpp:219
 msgid ""
 "Automatically inserts a leading \"*\" while typing within a Doxygen style "
 "comment."
 msgstr ""
 
-#: part/katedialogs.cpp:223
+#: part/katedialogs.cpp:222
 msgid "Use a mix of tab and space characters for indentation."
 msgstr ""
 
-#: part/katedialogs.cpp:225
+#: part/katedialogs.cpp:224
 msgid ""
 "If this option is selected, pasted code from the clipboard is indented. "
 "Triggering the <b>undo</b>-action removes the indentation."
 msgstr ""
 
-#: part/katedialogs.cpp:227
+#: part/katedialogs.cpp:226
 msgid "The number of spaces to indent with."
 msgstr ""
 
-#: part/katedialogs.cpp:230
+#: part/katedialogs.cpp:229
 msgid ""
 "If this button is enabled, additional indenter specific options are available "
 "and can be configured in an extra dialog."
 msgstr ""
 
-#: part/katedialogs.cpp:282
+#: part/katedialogs.cpp:281
 #, fuzzy
 msgid "Configure Indenter"
 msgstr "Ffurfweddu %1"
 
-#: part/katedialogs.cpp:357
+#: part/katedialogs.cpp:356
 msgid "Text Cursor Movement"
 msgstr ""
 
-#: part/katedialogs.cpp:359
+#: part/katedialogs.cpp:358
 msgid "Smart ho&me and smart end"
 msgstr ""
 
-#: part/katedialogs.cpp:363
+#: part/katedialogs.cpp:362
 msgid "Wrap c&ursor"
 msgstr ""
 
-#: part/katedialogs.cpp:367
+#: part/katedialogs.cpp:366
 msgid "&PageUp/PageDown moves cursor"
 msgstr ""
 
-#: part/katedialogs.cpp:373
+#: part/katedialogs.cpp:372
 msgid "Autocenter cursor (lines):"
 msgstr ""
 
-#: part/katedialogs.cpp:380
+#: part/katedialogs.cpp:379
 msgid "Selection Mode"
 msgstr "Modd Dewis"
 
-#: part/katedialogs.cpp:384
+#: part/katedialogs.cpp:383
 msgid "&Normal"
 msgstr "&Arferol"
 
-#: part/katedialogs.cpp:385
+#: part/katedialogs.cpp:384
 msgid "&Persistent"
 msgstr "Par&haol"
 
-#: part/katedialogs.cpp:390
+#: part/katedialogs.cpp:389
 msgid ""
 "Selections will be overwritten by typed text and will be lost on cursor "
 "movement."
 msgstr ""
 
-#: part/katedialogs.cpp:393
+#: part/katedialogs.cpp:392
 msgid "Selections will stay even after cursor movement and typing."
 msgstr ""
 
-#: part/katedialogs.cpp:396
+#: part/katedialogs.cpp:395
 msgid ""
 "Sets the number of lines to maintain visible above and below the cursor when "
 "possible."
 msgstr ""
 
-#: part/katedialogs.cpp:400
+#: part/katedialogs.cpp:399
 msgid ""
 "When selected, pressing the home key will cause the cursor to skip whitespace "
 "and go to the start of a line's text. The same applies for the end key."
 msgstr ""
 
-#: part/katedialogs.cpp:405
+#: part/katedialogs.cpp:404
 msgid ""
 "When on, moving the insertion cursor using the <b>Left</b> and <b>Right</b> "
 "keys will go on to previous/next line at beginning/end of the line, similar to "
@@ -1399,86 +2311,86 @@ msgid ""
 "it can be moved off the line end, which can be very handy for programmers."
 msgstr ""
 
-#: part/katedialogs.cpp:411
+#: part/katedialogs.cpp:410
 msgid ""
 "Selects whether the PageUp and PageDown keys should alter the vertical position "
 "of the cursor relative to the top of the view."
 msgstr ""
 
-#: part/katedialogs.cpp:473
+#: part/katedialogs.cpp:472
 msgid "Tabulators"
 msgstr "Tablyddion"
 
-#: part/katedialogs.cpp:475
+#: part/katedialogs.cpp:474
 msgid "&Insert spaces instead of tabulators"
 msgstr ""
 
-#: part/katedialogs.cpp:479
+#: part/katedialogs.cpp:478
 #, fuzzy
 msgid "&Show tabulators"
 msgstr "&Dangos tablyddion"
 
-#: part/katedialogs.cpp:485
+#: part/katedialogs.cpp:484
 msgid "Tab width:"
 msgstr ""
 
-#: part/katedialogs.cpp:490
+#: part/katedialogs.cpp:489
 msgid "Static Word Wrap"
 msgstr ""
 
-#: part/katedialogs.cpp:492
+#: part/katedialogs.cpp:491
 msgid "Enable static &word wrap"
 msgstr ""
 
-#: part/katedialogs.cpp:496
+#: part/katedialogs.cpp:495
 msgid "&Show static word wrap marker (if applicable)"
 msgstr ""
 
-#: part/katedialogs.cpp:502
+#: part/katedialogs.cpp:501
 msgid "Wrap words at:"
 msgstr ""
 
-#: part/katedialogs.cpp:507
+#: part/katedialogs.cpp:506
 msgid "Remove &trailing spaces"
 msgstr "Gwaredu &gofodnodau ychwanegol"
 
-#: part/katedialogs.cpp:512
+#: part/katedialogs.cpp:511
 msgid "Auto &brackets"
 msgstr ""
 
-#: part/katedialogs.cpp:519
+#: part/katedialogs.cpp:518
 msgid "Unlimited"
 msgstr "Heb derfyn"
 
-#: part/katedialogs.cpp:520
+#: part/katedialogs.cpp:519
 msgid "Maximum undo steps:"
 msgstr ""
 
-#: part/katedialogs.cpp:525
+#: part/katedialogs.cpp:524
 msgid "Smart search t&ext from:"
 msgstr ""
 
-#: part/katedialogs.cpp:528
+#: part/katedialogs.cpp:527
 msgid "Nowhere"
 msgstr ""
 
-#: part/katedialogs.cpp:529
+#: part/katedialogs.cpp:528
 msgid "Selection Only"
 msgstr "Dewisiad yn Unig"
 
-#: part/katedialogs.cpp:530
+#: part/katedialogs.cpp:529
 msgid "Selection, then Current Word"
 msgstr ""
 
-#: part/katedialogs.cpp:531
+#: part/katedialogs.cpp:530
 msgid "Current Word Only"
 msgstr ""
 
-#: part/katedialogs.cpp:532
+#: part/katedialogs.cpp:531
 msgid "Current Word, then Selection"
 msgstr ""
 
-#: part/katedialogs.cpp:542
+#: part/katedialogs.cpp:541
 msgid ""
 "Automatically start a new line of text when the current line exceeds the length "
 "specified by the <b>Wrap words at:</b> option."
@@ -1489,29 +2401,29 @@ msgid ""
 "config page."
 msgstr ""
 
-#: part/katedialogs.cpp:550
+#: part/katedialogs.cpp:549
 msgid ""
 "If the Word Wrap option is selected this entry determines the length (in "
 "characters) at which the editor will automatically start a new line."
 msgstr ""
 
-#: part/katedialogs.cpp:553
+#: part/katedialogs.cpp:552
 msgid ""
 "When the user types a left bracket ([,(, or {) KateView automatically enters "
 "the right bracket (}, ), or ]) to the right of the cursor."
 msgstr ""
 
-#: part/katedialogs.cpp:556
+#: part/katedialogs.cpp:555
 msgid ""
 "The editor will display a symbol to indicate the presence of a tab in the text."
 msgstr ""
 
-#: part/katedialogs.cpp:560
+#: part/katedialogs.cpp:559
 msgid ""
 "Sets the number of undo/redo steps to record. More steps uses more memory."
 msgstr ""
 
-#: part/katedialogs.cpp:563
+#: part/katedialogs.cpp:562
 msgid ""
 "This determines where KateView will get the search text from (this will be "
 "automatically entered into the Find Text dialog): "
@@ -1529,114 +2441,104 @@ msgid ""
 "Text Dialog will fall back to the last search text."
 msgstr ""
 
-#: part/katedialogs.cpp:588
+#: part/katedialogs.cpp:587
 msgid ""
 "If this is enabled, the editor will calculate the number of spaces up to the "
 "next tab position as defined by the tab width, and insert that number of spaces "
 "instead of a TAB character."
 msgstr ""
 
-#: part/katedialogs.cpp:592
+#: part/katedialogs.cpp:591
 msgid ""
 "If this is enabled, the editor will remove any trailing whitespace on lines "
 "when they are left by the insertion cursor."
 msgstr ""
 
-#: part/katedialogs.cpp:595
+#: part/katedialogs.cpp:594
 msgid ""
 "<p>If this option is checked, a vertical line will be drawn at the word wrap "
 "column as defined in the <strong>Editing</strong> properties."
 "<p>Note that the word wrap marker is only drawn if you use a fixed pitch font."
 msgstr ""
 
-#: part/katedialogs.cpp:651
+#: part/katedialogs.cpp:650
 msgid "Word Wrap"
 msgstr "Lapio Llinellau"
 
-#: part/katedialogs.cpp:653
+#: part/katedialogs.cpp:652
 msgid "&Dynamic word wrap"
 msgstr ""
 
-#: part/katedialogs.cpp:656
+#: part/katedialogs.cpp:655
 msgid "Dynamic word wrap indicators (if applicable):"
 msgstr ""
 
-#: part/katedialogs.cpp:659
+#: part/katedialogs.cpp:658
 msgid "Follow Line Numbers"
 msgstr ""
 
-#: part/katedialogs.cpp:660
+#: part/katedialogs.cpp:659
 msgid "Always On"
 msgstr ""
 
-#: part/katedialogs.cpp:664
+#: part/katedialogs.cpp:663
 msgid "Vertically align dynamically wrapped lines to indentation depth:"
 msgstr ""
 
-#: part/katedialogs.cpp:667
+#: part/katedialogs.cpp:666
 #, no-c-format
 msgid "% of View Width"
 msgstr ""
 
-#: part/katedialogs.cpp:668
+#: part/katedialogs.cpp:667
 msgid "Disabled"
 msgstr "Analluogir"
 
-#: part/katedialogs.cpp:672
+#: part/katedialogs.cpp:671
 msgid "Code Folding"
 msgstr ""
 
-#: part/katedialogs.cpp:674
+#: part/katedialogs.cpp:673
 msgid "Show &folding markers (if available)"
 msgstr ""
 
-#: part/katedialogs.cpp:675
+#: part/katedialogs.cpp:674
 msgid "Collapse toplevel folding nodes"
 msgstr ""
 
-#: part/katedialogs.cpp:680
+#: part/katedialogs.cpp:679
 msgid "Borders"
 msgstr "Borderi"
 
-#: part/katedialogs.cpp:682
+#: part/katedialogs.cpp:681
 msgid "Show &icon border"
 msgstr ""
 
-#: part/katedialogs.cpp:683
+#: part/katedialogs.cpp:682
 msgid "Show &line numbers"
 msgstr ""
 
-#: part/katedialogs.cpp:684
+#: part/katedialogs.cpp:683
 msgid "Show &scrollbar marks"
 msgstr ""
 
-#: part/katedialogs.cpp:688
+#: part/katedialogs.cpp:687
 msgid "Sort Bookmarks Menu"
 msgstr ""
 
-#: part/katedialogs.cpp:690
+#: part/katedialogs.cpp:689
 msgid "By &position"
 msgstr ""
 
-#: part/katedialogs.cpp:691
+#: part/katedialogs.cpp:690
 msgid "By c&reation"
 msgstr ""
 
-#: part/katedialogs.cpp:695
+#: part/katedialogs.cpp:694
 msgid "Show indentation lines"
 msgstr ""
 
-#: part/katedialogs.cpp:702 part/kateview.cpp:360
-msgid ""
-"If this option is checked, the text lines will be wrapped at the view border on "
-"the screen."
-msgstr ""
-
-#: part/katedialogs.cpp:704 part/kateview.cpp:363
-msgid "Choose when the Dynamic Word Wrap Indicators should be displayed"
-msgstr ""
-
-#: part/katedialogs.cpp:709
+#: part/katedialogs.cpp:708
 msgid ""
 "<p>Enables the start of dynamically wrapped lines to be aligned vertically to "
 "the indentation level of the first line.  This can help to make code and markup "
@@ -1648,13 +2550,13 @@ msgid ""
 "subsequent wrapped lines.</p>"
 msgstr ""
 
-#: part/katedialogs.cpp:718
+#: part/katedialogs.cpp:717
 msgid ""
 "If this option is checked, every new view will display line numbers on the left "
 "hand side."
 msgstr ""
 
-#: part/katedialogs.cpp:721
+#: part/katedialogs.cpp:720
 msgid ""
 "If this option is checked, every new view will display an icon border on the "
 "left hand side."
@@ -1662,7 +2564,7 @@ msgid ""
 "<br>The icon border shows bookmark signs, for instance."
 msgstr ""
 
-#: part/katedialogs.cpp:725
+#: part/katedialogs.cpp:724
 msgid ""
 "If this option is checked, every new view will show marks on the vertical "
 "scrollbar."
@@ -1670,151 +2572,151 @@ msgid ""
 "<br>These marks will, for instance, show bookmarks."
 msgstr ""
 
-#: part/katedialogs.cpp:729
+#: part/katedialogs.cpp:728
 msgid ""
 "If this option is checked, every new view will display marks for code folding, "
 "if code folding is available."
 msgstr ""
 
-#: part/katedialogs.cpp:732
+#: part/katedialogs.cpp:731
 msgid ""
 "Choose how the bookmarks should be ordered in the <b>Bookmarks</b> menu."
 msgstr ""
 
-#: part/katedialogs.cpp:734
+#: part/katedialogs.cpp:733
 msgid "The bookmarks will be ordered by the line numbers they are placed at."
 msgstr ""
 
-#: part/katedialogs.cpp:736
+#: part/katedialogs.cpp:735
 msgid ""
 "Each new bookmark will be added to the bottom, independently from where it is "
 "placed in the document."
 msgstr ""
 
-#: part/katedialogs.cpp:739
+#: part/katedialogs.cpp:738
 msgid ""
 "If this is enabled, the editor will display vertical lines to help identify "
 "indent lines."
 msgstr ""
 
-#: part/katedialogs.cpp:855
+#: part/katedialogs.cpp:854
 msgid "File Format"
 msgstr "Fformat Ffeil"
 
-#: part/katedialogs.cpp:859
+#: part/katedialogs.cpp:858
 msgid "&Encoding:"
 msgstr "&Amgodiad:"
 
-#: part/katedialogs.cpp:864
+#: part/katedialogs.cpp:863
 msgid "End &of line:"
 msgstr ""
 
-#: part/katedialogs.cpp:868
+#: part/katedialogs.cpp:867
 msgid "&Automatic end of line detection"
 msgstr ""
 
-#: part/katedialogs.cpp:870
+#: part/katedialogs.cpp:869
 msgid "UNIX"
 msgstr "UNIX"
 
-#: part/katedialogs.cpp:871
+#: part/katedialogs.cpp:870
 msgid "DOS/Windows"
 msgstr ""
 
-#: part/katedialogs.cpp:872
+#: part/katedialogs.cpp:871
 msgid "Macintosh"
 msgstr "Macintosh"
 
-#: part/katedialogs.cpp:874
+#: part/katedialogs.cpp:873
 msgid "Memory Usage"
 msgstr "Defnydd Cof"
 
-#: part/katedialogs.cpp:879
+#: part/katedialogs.cpp:878
 msgid "Maximum loaded &blocks per file:"
 msgstr ""
 
-#: part/katedialogs.cpp:885
+#: part/katedialogs.cpp:884
 msgid "Automatic Cleanups on Load/Save"
 msgstr ""
 
-#: part/katedialogs.cpp:888
+#: part/katedialogs.cpp:887
 msgid "Re&move trailing spaces"
 msgstr "&Gwaredu gofodnodau ychwanegol"
 
-#: part/katedialogs.cpp:891
+#: part/katedialogs.cpp:890
 msgid "Folder Config File"
 msgstr ""
 
-#: part/katedialogs.cpp:896
+#: part/katedialogs.cpp:895
 msgid "Do not use config file"
 msgstr ""
 
-#: part/katedialogs.cpp:897
+#: part/katedialogs.cpp:896
 msgid "Se&arch depth for config file:"
 msgstr ""
 
-#: part/katedialogs.cpp:899
+#: part/katedialogs.cpp:898
 msgid "Backup on Save"
 msgstr ""
 
-#: part/katedialogs.cpp:901
+#: part/katedialogs.cpp:900
 msgid "&Local files"
 msgstr ""
 
-#: part/katedialogs.cpp:902
+#: part/katedialogs.cpp:901
 msgid "&Remote files"
 msgstr ""
 
-#: part/katedialogs.cpp:905
+#: part/katedialogs.cpp:904
 msgid "&Prefix:"
 msgstr "&Rhagddodiad:"
 
-#: part/katedialogs.cpp:910
+#: part/katedialogs.cpp:909
 msgid "&Suffix:"
 msgstr "&Ôl-ddodiad:"
 
-#: part/katedialogs.cpp:917
+#: part/katedialogs.cpp:916
 msgid ""
 "The editor will automatically eliminate extra spaces at the ends of lines of "
 "text while loading/saving the file."
 msgstr ""
 
-#: part/katedialogs.cpp:920
+#: part/katedialogs.cpp:919
 msgid ""
 "<p>Backing up on save will cause Kate to copy the disk file to "
 "'&lt;prefix&gt;&lt;filename&gt;&lt;suffix&gt;' before saving changes."
 "<p>The suffix defaults to <strong>~</strong> and prefix is empty by default"
 msgstr ""
 
-#: part/katedialogs.cpp:924
+#: part/katedialogs.cpp:923
 msgid ""
 "Check this if you want the editor to autodetect the end of line type.The first "
 "found end of line type will be used for the whole file."
 msgstr ""
 
-#: part/katedialogs.cpp:927
+#: part/katedialogs.cpp:926
 msgid "Check this if you want backups of local files when saving"
 msgstr ""
 
-#: part/katedialogs.cpp:929
+#: part/katedialogs.cpp:928
 msgid "Check this if you want backups of remote files when saving"
 msgstr ""
 
-#: part/katedialogs.cpp:931
+#: part/katedialogs.cpp:930
 msgid "Enter the prefix to prepend to the backup file names"
 msgstr ""
 
-#: part/katedialogs.cpp:933
+#: part/katedialogs.cpp:932
 msgid "Enter the suffix to add to the backup file names"
 msgstr ""
 
-#: part/katedialogs.cpp:935
+#: part/katedialogs.cpp:934
 msgid ""
 "The editor will search the given number of folder levels upwards for "
 ".kateconfig file and load the settings line from it."
 msgstr ""
 
-#: part/katedialogs.cpp:938
+#: part/katedialogs.cpp:937
 msgid ""
 "The editor will load given number of blocks (of around 2048 lines) of text into "
 "memory; if the filesize is bigger than this the other blocks are swapped  to "
@@ -1825,57 +2727,53 @@ msgid ""
 "only if you have problems with the memory usage."
 msgstr ""
 
-#: part/katedialogs.cpp:977
+#: part/katedialogs.cpp:976
 msgid ""
 "You did not provide a backup suffix or prefix. Using default suffix: '~'"
 msgstr ""
 
-#: part/katedialogs.cpp:978
+#: part/katedialogs.cpp:977
 msgid "No Backup Suffix or Prefix"
 msgstr ""
 
-#: part/katedialogs.cpp:1014
+#: part/katedialogs.cpp:1013
 msgid "TDE Default"
 msgstr "Rhagosodion TDE"
 
-#: part/katedialogs.cpp:1116 part/katedialogs.cpp:1447
+#: part/katedialogs.cpp:1115 part/katedialogs.cpp:1446
 msgid "Name"
 msgstr "Enw"
 
-#: part/katedialogs.cpp:1117 part/katehighlight.cpp:3174
-msgid "Comment"
-msgstr "Sylwad"
-
-#: part/katedialogs.cpp:1213
+#: part/katedialogs.cpp:1212
 #, c-format
 msgid "Configure %1"
 msgstr "Ffurfweddu %1"
 
-#: part/katedialogs.cpp:1285
+#: part/katedialogs.cpp:1284
 msgid "Author:"
 msgstr "Awdur:"
 
-#: part/katedialogs.cpp:1291
+#: part/katedialogs.cpp:1290
 msgid "License:"
 msgstr "Trwydded:"
 
-#: part/katedialogs.cpp:1324
+#: part/katedialogs.cpp:1323
 msgid "Do&wnload..."
 msgstr "La&wrlwytho..."
 
-#: part/katedialogs.cpp:1332
+#: part/katedialogs.cpp:1331
 msgid ""
 "Choose a <em>Syntax Highlight mode</em> from this list to view its properties "
 "below."
 msgstr ""
 
-#: part/katedialogs.cpp:1335
+#: part/katedialogs.cpp:1334
 msgid ""
 "The list of file extensions used to determine which files to highlight using "
 "the current syntax highlight mode."
 msgstr ""
 
-#: part/katedialogs.cpp:1338
+#: part/katedialogs.cpp:1337
 msgid ""
 "The list of Mime Types used to determine which files to highlight using the "
 "current highlight mode."
@@ -1883,20 +2781,20 @@ msgid ""
 "MimeType selection dialog."
 msgstr ""
 
-#: part/katedialogs.cpp:1342
+#: part/katedialogs.cpp:1341
 msgid ""
 "Display a dialog with a list of all available mime types to choose from."
 "<p>The <strong>File Extensions</strong> entry will automatically be edited as "
 "well."
 msgstr ""
 
-#: part/katedialogs.cpp:1346
+#: part/katedialogs.cpp:1345
 msgid ""
 "Click this button to download new or updated syntax highlight descriptions from "
 "the Kate website."
 msgstr ""
 
-#: part/katedialogs.cpp:1424
+#: part/katedialogs.cpp:1423
 msgid ""
 "Select the MimeTypes you want highlighted using the '%1' syntax highlight "
 "rules.\n"
@@ -1904,112 +2802,112 @@ msgid ""
 "well."
 msgstr ""
 
-#: part/katedialogs.cpp:1439
+#: part/katedialogs.cpp:1438
 msgid "Highlight Download"
 msgstr ""
 
-#: part/katedialogs.cpp:1439
+#: part/katedialogs.cpp:1438
 msgid "&Install"
 msgstr "&Gosod"
 
-#: part/katedialogs.cpp:1444
+#: part/katedialogs.cpp:1443
 msgid "Select the syntax highlighting files you want to update:"
 msgstr ""
 
-#: part/katedialogs.cpp:1448
+#: part/katedialogs.cpp:1447
 msgid "Installed"
 msgstr "Wedi'i osod"
 
-#: part/katedialogs.cpp:1449
+#: part/katedialogs.cpp:1448
 msgid "Latest"
 msgstr "Diweddaraf"
 
-#: part/katedialogs.cpp:1453
+#: part/katedialogs.cpp:1452
 msgid "<b>Note:</b> New versions are selected automatically."
 msgstr ""
 
-#: part/katedialogs.cpp:1552
+#: part/katedialogs.cpp:1547
 msgid "Go to Line"
 msgstr "Mynd i Linell"
 
-#: part/katedialogs.cpp:1562
+#: part/katedialogs.cpp:1557
 msgid "&Go to line:"
 msgstr "&Mynd i linell:"
 
-#: part/katedialogs.cpp:1588
+#: part/katedialogs.cpp:1583
 #, fuzzy
 msgid "File Was Deleted on Disk"
 msgstr "Mae'r Ffeil wedi Newid ar Dddisg"
 
-#: part/katedialogs.cpp:1589
+#: part/katedialogs.cpp:1584
 #, fuzzy
 msgid "&Save File As..."
 msgstr "Mewnosod Ffeil ..."
 
-#: part/katedialogs.cpp:1590
+#: part/katedialogs.cpp:1585
 msgid "Lets you select a location and save the file again."
 msgstr ""
 
-#: part/katedialogs.cpp:1592
+#: part/katedialogs.cpp:1587
 #, fuzzy
 msgid "File Changed on Disk"
 msgstr "Mae'r Ffeil wedi Newid ar Dddisg"
 
-#: part/katedialogs.cpp:1594
+#: part/katedialogs.cpp:1589
 msgid ""
 "Reload the file from disk. If you have unsaved changes, they will be lost."
 msgstr ""
 
-#: part/katedialogs.cpp:1599
+#: part/katedialogs.cpp:1594
 msgid "&Ignore"
 msgstr "&Anwybyddu"
 
-#: part/katedialogs.cpp:1602
+#: part/katedialogs.cpp:1597
 msgid "Ignore the changes. You will not be prompted again."
 msgstr ""
 
-#: part/katedialogs.cpp:1603
+#: part/katedialogs.cpp:1598
 msgid ""
 "Do nothing. Next time you focus the file, or try to save it or close it, you "
 "will be prompted again."
 msgstr ""
 
-#: part/katedialogs.cpp:1621
+#: part/katedialogs.cpp:1616
 msgid "&View Difference"
 msgstr ""
 
-#: part/katedialogs.cpp:1626
+#: part/katedialogs.cpp:1621
 msgid ""
 "Calculates the difference between the editor contents and the disk file using "
 "diff(1) and opens the diff file with the default application for that."
 msgstr ""
 
-#: part/katedialogs.cpp:1630
+#: part/katedialogs.cpp:1625
 msgid "Overwrite"
 msgstr "Trosysgrifo"
 
-#: part/katedialogs.cpp:1631
+#: part/katedialogs.cpp:1626
 msgid "Overwrite the disk file with the editor content."
 msgstr ""
 
-#: part/katedialogs.cpp:1699
+#: part/katedialogs.cpp:1694
 msgid ""
 "The diff command failed. Please make sure that diff(1) is installed and in your "
 "PATH."
 msgstr ""
 
-#: part/katedialogs.cpp:1701
+#: part/katedialogs.cpp:1696
 msgid "Error Creating Diff"
 msgstr ""
 
-#: part/katedialogs.cpp:1716
+#: part/katedialogs.cpp:1711
 msgid ""
 "Ignoring means that you will not be warned again (unless the disk file changes "
 "once more): if you save the document, you will overwrite the file on disk; if "
 "you do not save then the disk file (if present) is what you have."
 msgstr ""
 
-#: part/katedialogs.cpp:1720
+#: part/katedialogs.cpp:1715
 msgid "You Are on Your Own"
 msgstr ""
 
@@ -2018,2097 +2916,2058 @@ msgstr ""
 msgid "Could not access view"
 msgstr ""
 
-#: part/katejscript.cpp:304 part/katejscript.cpp:928
-msgid "Exception, line %1: %2"
-msgstr ""
-
-#: part/katejscript.cpp:754
-msgid "Command not found"
-msgstr ""
-
-#: part/katejscript.cpp:762 part/katejscript.cpp:897
-msgid "JavaScript file not found"
-msgstr ""
-
-#: part/katespell.cpp:57
-msgid "Spelling (from cursor)..."
+#: part/katecmds.cpp:151
+msgid "Mode must be at least 0."
 msgstr ""
 
-#: part/katespell.cpp:58
-msgid "Check the document's spelling from the cursor and forward"
+#: part/katecmds.cpp:169
+msgid "No such highlight '%1'"
 msgstr ""
 
-#: part/katespell.cpp:60
-#, fuzzy
-msgid "Spellcheck Selection..."
-msgstr "Gwirio Sillafu"
-
-#: part/katespell.cpp:61
-msgid "Check spelling of the selected text"
+#: part/katecmds.cpp:180
+msgid "Missing argument. Usage: %1 <value>"
 msgstr ""
 
-#: part/katespell.cpp:125
-msgid "Spellcheck"
-msgstr "Gwirio Sillafu"
-
-#: part/katespell.cpp:205
-msgid ""
-"The spelling program could not be started. Please make sure you have set the "
-"correct spelling program and that it is properly configured and in your PATH."
+#: part/katecmds.cpp:184
+msgid "Failed to convert argument '%1' to integer."
 msgstr ""
 
-#: part/katespell.cpp:210
-msgid "The spelling program seems to have crashed."
+#: part/katecmds.cpp:190 part/katecmds.cpp:196
+msgid "Width must be at least 1."
 msgstr ""
 
-#: part/kateview.cpp:216
-msgid "Cut the selected text and move it to the clipboard"
-msgstr "Torri'r testun dewisiedig a'i symud i'r gludfwrdd"
-
-#: part/kateview.cpp:219
-msgid "Paste previously copied or cut clipboard contents"
-msgstr "Gludo cynhwysion y gludfwrdd sydd wedi eu gopïo neu dorri ynghynt"
-
-#: part/kateview.cpp:222
-msgid ""
-"Use this command to copy the currently selected text to the system clipboard."
-msgstr "Defnyddiwch y gorchymyn yma i gopïo'r testun dewisiedig i'r gludfwrdd."
-
-#: part/kateview.cpp:224
-msgid "Copy as &HTML"
+#: part/katecmds.cpp:202
+msgid "Column must be at least 1."
 msgstr ""
 
-#: part/kateview.cpp:225
-#, fuzzy
-msgid ""
-"Use this command to copy the currently selected text as HTML to the system "
-"clipboard."
-msgstr "Defnyddiwch y gorchymyn yma i gopïo'r testun dewisiedig i'r gludfwrdd."
-
-#: part/kateview.cpp:230
-msgid "Save the current document"
-msgstr "Cadw'r ddogfen cyfredol"
-
-#: part/kateview.cpp:233
-msgid "Revert the most recent editing actions"
-msgstr "Dychwelyd y gweithredoedd golygu diweddaraf"
-
-#: part/kateview.cpp:236
-msgid "Revert the most recent undo operation"
-msgstr "Dychwelyd y weithred ddadwneud diweddaraf"
-
-#: part/kateview.cpp:238
-msgid "&Word Wrap Document"
+#: part/katecmds.cpp:208
+msgid "Line must be at least 1"
 msgstr ""
 
-#: part/kateview.cpp:239
-msgid ""
-"Use this command to wrap all lines of the current document which are longer "
-"than the width of the current view, to fit into this view."
-"<br>"
-"<br> This is a static word wrap, meaning it is not updated when the view is "
-"resized."
+#: part/katecmds.cpp:210
+msgid "There is not that many lines in this document"
 msgstr ""
 
-#: part/kateview.cpp:244
-msgid "&Indent"
-msgstr "&Mewnoliad"
-
-#: part/kateview.cpp:245
-msgid ""
-"Use this to indent a selected block of text."
-"<br>"
-"<br>You can configure whether tabs should be honored and used or replaced with "
-"spaces, in the configuration dialog."
+#: part/katecmds.cpp:232
+msgid "Usage: %1 on|off|1|0|true|false"
 msgstr ""
 
-#: part/kateview.cpp:247
-msgid "&Unindent"
+#: part/katecmds.cpp:274
+msgid "Bad argument '%1'. Usage: %2 on|off|1|0|true|false"
 msgstr ""
 
-#: part/kateview.cpp:248
-msgid "Use this to unindent a selected block of text."
+#: part/katecmds.cpp:279
+msgid "Unknown command '%1'"
 msgstr ""
 
-#: part/kateview.cpp:250
-msgid "&Clean Indentation"
+#: part/katecmds.cpp:498
+msgid "Sorry, but Kate is not able to replace newlines, yet"
 msgstr ""
 
-#: part/kateview.cpp:251
+#: part/katecmds.cpp:540
+#, c-format
 msgid ""
-"Use this to clean the indentation of a selected block of text (only tabs/only "
-"spaces)"
-"<br>"
-"<br>You can configure whether tabs should be honored and used or replaced with "
-"spaces, in the configuration dialog."
+"_n: 1 replacement done\n"
+"%n replacements done"
 msgstr ""
 
-#: part/kateview.cpp:254
-msgid "&Align"
-msgstr "&Alinio"
+#: part/katebookmarks.cpp:77
+msgid "Set &Bookmark"
+msgstr "Gosod &Tudnod"
 
-#: part/kateview.cpp:255
-msgid ""
-"Use this to align the current line or block of text to its proper indent level."
+#: part/katebookmarks.cpp:80
+msgid "If a line has no bookmark then add one, otherwise remove it."
 msgstr ""
 
-#: part/kateview.cpp:257
-msgid "C&omment"
-msgstr "S&ylwad"
+#: part/katebookmarks.cpp:81
+#, fuzzy
+msgid "Clear &Bookmark"
+msgstr "Nod Tudalen"
 
-#: part/kateview.cpp:259
-msgid ""
-"This command comments out the current line or a selected block of text.<BR><BR>"
-"The characters for single/multiple line comments are defined within the "
-"language's highlighting."
+#: part/katebookmarks.cpp:84
+msgid "Clear &All Bookmarks"
 msgstr ""
 
-#: part/kateview.cpp:262
-msgid "Unco&mment"
+#: part/katebookmarks.cpp:87
+msgid "Remove all bookmarks of the current document."
 msgstr ""
 
-#: part/kateview.cpp:264
-msgid ""
-"This command removes comments from the current line or a selected block of "
-"text.<BR><BR>The characters for single/multiple line comments are defined "
-"within the language's highlighting."
+#: part/katebookmarks.cpp:90 part/katebookmarks.cpp:242
+msgid "Next Bookmark"
 msgstr ""
 
-#: part/kateview.cpp:267
-msgid "&Read Only Mode"
+#: part/katebookmarks.cpp:93
+msgid "Go to the next bookmark."
 msgstr ""
 
-#: part/kateview.cpp:270
-msgid "Lock/unlock the document for writing"
+#: part/katebookmarks.cpp:96 part/katebookmarks.cpp:244
+msgid "Previous Bookmark"
 msgstr ""
 
-#: part/kateview.cpp:272
-msgid "Uppercase"
-msgstr "Priflythrennau"
-
-#: part/kateview.cpp:274
-msgid ""
-"Convert the selection to uppercase, or the character to the right of the cursor "
-"if no text is selected."
+#: part/katebookmarks.cpp:99
+msgid "Go to the previous bookmark."
 msgstr ""
 
-#: part/kateview.cpp:277
-msgid "Lowercase"
-msgstr "Llythrennau Bach"
-
-#: part/kateview.cpp:279
-msgid ""
-"Convert the selection to lowercase, or the character to the right of the cursor "
-"if no text is selected."
-msgstr ""
+#: part/katebookmarks.cpp:203
+msgid "&Next: %1 - \"%2\""
+msgstr "&Nesaf: %1 - \"%2\""
 
-#: part/kateview.cpp:282
-msgid "Capitalize"
+#: part/katebookmarks.cpp:210
+msgid "&Previous: %1 - \"%2\""
 msgstr ""
 
-#: part/kateview.cpp:284
-msgid ""
-"Capitalize the selection, or the word under the cursor if no text is selected."
+#: part/katesearch.cpp:72
+msgid "Look up the first occurrence of a piece of text or regular expression."
 msgstr ""
 
-#: part/kateview.cpp:287
-msgid "Join Lines"
+#: part/katesearch.cpp:74
+msgid "Look up the next occurrence of the search phrase."
 msgstr ""
 
-#: part/kateview.cpp:299
-msgid "Print the current document."
-msgstr "Argraffu'r ddogfen cyfredol."
-
-#: part/kateview.cpp:301
-msgid "Reloa&d"
-msgstr "Ail-l&wytho"
-
-#: part/kateview.cpp:302
-msgid "Reload the current document from disk."
+#: part/katesearch.cpp:76
+msgid "Look up the previous occurrence of the search phrase."
 msgstr ""
 
-#: part/kateview.cpp:305
-msgid "Save the current document to disk, with a name of your choice."
-msgstr "Cadw i ddisg y ddogfen gyfredol gyda enw o'ch dewis chi."
-
-#: part/kateview.cpp:308
+#: part/katesearch.cpp:78
 msgid ""
-"This command opens a dialog and lets you choose a line that you want the cursor "
-"to move to."
-msgstr ""
-"Mae'r gorchymyn yma'n agor blwch ymgom i ddewis pa linell i symud y cyrchydd "
-"iddi."
-
-#: part/kateview.cpp:310
-msgid "&Configure Editor..."
-msgstr ""
-
-#: part/kateview.cpp:311
-msgid "Configure various aspects of this editor."
+"Look up a piece of text or regular expression and replace the result with some "
+"given text."
 msgstr ""
 
-#: part/kateview.cpp:313
-msgid "&Highlighting"
-msgstr "&Amlygu"
-
-#: part/kateview.cpp:314
-msgid "Here you can choose how the current document should be highlighted."
-msgstr "Dyma lle gallwch ddewis sut dylai'r ddogfen gael ei amlygu."
-
-#: part/kateview.cpp:317
-msgid "&Filetype"
+#: part/katesearch.cpp:331
+msgid "Search string '%1' not found!"
 msgstr ""
 
-#: part/kateview.cpp:320
-msgid "&Schema"
-msgstr "&Sgema"
-
-#: part/kateview.cpp:324
-#, fuzzy
-msgid "&Indentation"
-msgstr "Modd Dewis"
-
-#: part/kateview.cpp:327
-#, fuzzy
-msgid "E&xport as HTML..."
-msgstr "A&llforio"
+#: part/katesearch.cpp:333 part/katesearch.cpp:510
+msgid "Find"
+msgstr "Canfod:"
 
-#: part/kateview.cpp:328
-#, fuzzy
+#: part/katesearch.cpp:353 part/katesearch.cpp:371 part/katesearch.cpp:487
+#, c-format
 msgid ""
-"This command allows you to export the current document with all highlighting "
-"information into a HTML document."
+"_n: %n replacement made.\n"
+"%n replacements made."
 msgstr ""
-"Mae'r gorchymyn yma yn gadael i chi allforio'r ddogfen gyfredol efo pob "
-"gwybodaeth amlygu i mewn i ddogfen nodau ychwanegiad, e.e. HTML."
-
-#: part/kateview.cpp:332
-msgid "Select the entire text of the current document."
-msgstr "Dewis holl destun y ddogfen gyfredol."
 
-#: part/kateview.cpp:335
-msgid ""
-"If you have selected something within the current document, this will no longer "
-"be selected."
-msgstr ""
+#: part/katesearch.cpp:491
+msgid "End of document reached."
+msgstr " Wedi cyrraedd diwedd y ddogfen."
 
-#: part/kateview.cpp:337
-msgid "Enlarge Font"
-msgstr "Cynyddu Maint yr Wynebfath"
+#: part/katesearch.cpp:492
+msgid "Beginning of document reached."
+msgstr " Wedi cyrraedd diwedd y ddogfen."
 
-#: part/kateview.cpp:338
-msgid "This increases the display font size."
+#: part/katesearch.cpp:497
+msgid "End of selection reached."
 msgstr ""
 
-#: part/kateview.cpp:340
-msgid "Shrink Font"
-msgstr "Lleihau Wynebfath"
-
-#: part/kateview.cpp:341
-msgid "This decreases the display font size."
+#: part/katesearch.cpp:498
+msgid "Beginning of selection reached."
 msgstr ""
 
-#: part/kateview.cpp:344
-msgid "Bl&ock Selection Mode"
-msgstr "Modd Dewis &Blociau"
-
-#: part/kateview.cpp:347
-msgid ""
-"This command allows switching between the normal (line based) selection mode "
-"and the block selection mode."
+#: part/katesearch.cpp:502
+msgid "Continue from the beginning?"
 msgstr ""
 
-#: part/kateview.cpp:350
-msgid "Overwr&ite Mode"
-msgstr "Modd T&rosysgrifo"
-
-#: part/kateview.cpp:353
-msgid ""
-"Choose whether you want the text you type to be inserted or to overwrite "
-"existing text."
+#: part/katesearch.cpp:503
+msgid "Continue from the end?"
 msgstr ""
 
-#: part/kateview.cpp:357
-msgid "&Dynamic Word Wrap"
-msgstr ""
+#: part/katesearch.cpp:511
+msgid "&Stop"
+msgstr "&Aros"
 
-#: part/kateview.cpp:362
-msgid "Dynamic Word Wrap Indicators"
+#: part/katesearch.cpp:765
+msgid "Replace Confirmation"
 msgstr ""
 
-#: part/kateview.cpp:367
-msgid "&Off"
-msgstr "&I ffwrdd"
+#: part/katesearch.cpp:767
+msgid "Replace &All"
+msgstr "Amnewid y &Cwbl"
 
-#: part/kateview.cpp:368
+#: part/katesearch.cpp:767
 #, fuzzy
-msgid "Follow &Line Numbers"
-msgstr "Argraffu rhifau &llinell"
-
-#: part/kateview.cpp:369
-msgid "&Always On"
-msgstr ""
-
-#: part/kateview.cpp:373
-msgid "Show Folding &Markers"
-msgstr ""
-
-#: part/kateview.cpp:376
-msgid ""
-"You can choose if the codefolding marks should be shown, if codefolding is "
-"possible."
-msgstr ""
+msgid "Re&place && Close"
+msgstr "Amnewid Testun"
 
-#: part/kateview.cpp:377
-msgid "Hide Folding &Markers"
-msgstr ""
+#: part/katesearch.cpp:767
+msgid "&Replace"
+msgstr "A&mnewid"
 
-#: part/kateview.cpp:380
-msgid "Show &Icon Border"
-msgstr ""
+#: part/katesearch.cpp:769
+msgid "&Find Next"
+msgstr "&Canfod Nesaf"
 
-#: part/kateview.cpp:384
-msgid ""
-"Show/hide the icon border.<BR><BR> The icon border shows bookmark symbols, for "
-"instance."
+#: part/katesearch.cpp:774
+msgid "Found an occurrence of your search term. What do you want to do?"
 msgstr ""
 
-#: part/kateview.cpp:385
-msgid "Hide &Icon Border"
+#: part/katesearch.cpp:826
+msgid "Usage: find[:[bcersw]] PATTERN"
 msgstr ""
 
-#: part/kateview.cpp:388
-msgid "Show &Line Numbers"
+#: part/katesearch.cpp:838
+msgid "Usage: ifind[:[bcrs]] PATTERN"
 msgstr ""
 
-#: part/kateview.cpp:391
-msgid "Show/hide the line numbers on the left hand side of the view."
+#: part/katesearch.cpp:892
+msgid "Usage: replace[:[bceprsw]] PATTERN [REPLACEMENT]"
 msgstr ""
 
-#: part/kateview.cpp:392
-#, fuzzy
-msgid "Hide &Line Numbers"
-msgstr "Argraffu rhifau &llinell"
-
-#: part/kateview.cpp:395
-msgid "Show Scroll&bar Marks"
+#: part/katesearch.cpp:926
+msgid "<p>Usage: <code>find[:bcersw] PATTERN</code></p>"
 msgstr ""
 
-#: part/kateview.cpp:398
+#: part/katesearch.cpp:929
 msgid ""
-"Show/hide the marks on the vertical scrollbar.<BR><BR>"
-"The marks, for instance, show bookmarks."
-msgstr ""
-
-#: part/kateview.cpp:399
-msgid "Hide Scroll&bar Marks"
+"<p>Usage: <code>ifind:[:bcrs] PATTERN</code>"
+"<br>ifind does incremental or 'as-you-type' search</p>"
 msgstr ""
 
-#: part/kateview.cpp:402
-msgid "Show Static &Word Wrap Marker"
+#: part/katesearch.cpp:933
+msgid "<p>Usage: <code>replace[:bceprsw] PATTERN REPLACEMENT</code></p>"
 msgstr ""
 
-#: part/kateview.cpp:406
+#: part/katesearch.cpp:936
 msgid ""
-"Show/hide the Word Wrap Marker, a vertical line drawn at the word wrap column "
-"as defined in the editing properties"
-msgstr ""
-
-#: part/kateview.cpp:408
-msgid "Hide Static &Word Wrap Marker"
-msgstr ""
-
-#: part/kateview.cpp:411
-msgid "Switch to Command Line"
-msgstr ""
-
-#: part/kateview.cpp:414
-msgid "Show/hide the command line on the bottom of the view."
-msgstr ""
-
-#: part/kateview.cpp:416
-msgid "&End of Line"
-msgstr "&Diwedd y Llinell"
-
-#: part/kateview.cpp:417
-msgid "Choose which line endings should be used, when you save the document"
-msgstr ""
-
-#: part/kateview.cpp:427
-msgid "E&ncoding"
-msgstr "A&mgodiad"
-
-#: part/kateview.cpp:444
-msgid "Move Word Left"
-msgstr ""
-
-#: part/kateview.cpp:448
-msgid "Select Character Left"
-msgstr ""
-
-#: part/kateview.cpp:452
-msgid "Select Word Left"
-msgstr ""
-
-#: part/kateview.cpp:457
-msgid "Move Word Right"
-msgstr ""
-
-#: part/kateview.cpp:461
-msgid "Select Character Right"
-msgstr ""
-
-#: part/kateview.cpp:465
-msgid "Select Word Right"
-msgstr ""
-
-#: part/kateview.cpp:470
-msgid "Move to Beginning of Line"
-msgstr ""
-
-#: part/kateview.cpp:474
-msgid "Move to Beginning of Document"
-msgstr ""
-
-#: part/kateview.cpp:478
-msgid "Select to Beginning of Line"
-msgstr ""
-
-#: part/kateview.cpp:482
-msgid "Select to Beginning of Document"
-msgstr ""
-
-#: part/kateview.cpp:487
-msgid "Move to End of Line"
-msgstr ""
-
-#: part/kateview.cpp:491
-msgid "Move to End of Document"
-msgstr ""
-
-#: part/kateview.cpp:495
-msgid "Select to End of Line"
-msgstr ""
-
-#: part/kateview.cpp:499
-msgid "Select to End of Document"
-msgstr ""
-
-#: part/kateview.cpp:504
-msgid "Select to Previous Line"
-msgstr ""
-
-#: part/kateview.cpp:508
-msgid "Scroll Line Up"
-msgstr ""
-
-#: part/kateview.cpp:512
-#, fuzzy
-msgid "Move to Next Line"
-msgstr "Mynd i Linell"
-
-#: part/kateview.cpp:515
-#, fuzzy
-msgid "Move to Previous Line"
-msgstr "Mynd i Linell"
-
-#: part/kateview.cpp:518
-msgid "Move Character Right"
-msgstr ""
-
-#: part/kateview.cpp:521
-msgid "Move Character Left"
-msgstr ""
-
-#: part/kateview.cpp:525
-msgid "Select to Next Line"
-msgstr ""
-
-#: part/kateview.cpp:529
-msgid "Scroll Line Down"
-msgstr ""
-
-#: part/kateview.cpp:534
-msgid "Scroll Page Up"
-msgstr ""
-
-#: part/kateview.cpp:538
-msgid "Select Page Up"
-msgstr ""
-
-#: part/kateview.cpp:542
-msgid "Move to Top of View"
-msgstr ""
-
-#: part/kateview.cpp:546
-msgid "Select to Top of View"
-msgstr ""
-
-#: part/kateview.cpp:551
-msgid "Scroll Page Down"
-msgstr ""
-
-#: part/kateview.cpp:555
-msgid "Select Page Down"
-msgstr ""
-
-#: part/kateview.cpp:559
-msgid "Move to Bottom of View"
-msgstr ""
-
-#: part/kateview.cpp:563
-msgid "Select to Bottom of View"
-msgstr ""
-
-#: part/kateview.cpp:567
-msgid "Move to Matching Bracket"
-msgstr ""
-
-#: part/kateview.cpp:571
-msgid "Select to Matching Bracket"
-msgstr ""
-
-#: part/kateview.cpp:579
-msgid "Transpose Characters"
-msgstr ""
-
-#: part/kateview.cpp:584
-msgid "Delete Line"
-msgstr ""
-
-#: part/kateview.cpp:589
-msgid "Delete Word Left"
-msgstr ""
-
-#: part/kateview.cpp:594
-msgid "Delete Word Right"
-msgstr ""
-
-#: part/kateview.cpp:598
-msgid "Delete Next Character"
-msgstr ""
-
-#: part/kateview.cpp:602
-msgid "Backspace"
-msgstr "Yn ôl"
-
-#: part/kateview.cpp:628
-msgid "Collapse Toplevel"
+"<h4><caption>Options</h4>"
+"<p><b>b</b> - Search backward"
+"<br><b>c</b> - Search from cursor"
+"<br><b>r</b> - Pattern is a regular expression"
+"<br><b>s</b> - Case sensitive search"
 msgstr ""
 
-#: part/kateview.cpp:630
-msgid "Expand Toplevel"
+#: part/katesearch.cpp:945
+msgid ""
+"<br><b>e</b> - Search in selected text only"
+"<br><b>w</b> - Search whole words only"
 msgstr ""
 
-#: part/kateview.cpp:632
-msgid "Collapse One Local Level"
+#: part/katesearch.cpp:951
+msgid ""
+"<br><b>p</b> - Prompt for replace</p>"
+"<p>If REPLACEMENT is not present, an empty string is used.</p>"
+"<p>If you want to have whitespace in your PATTERN, you need to quote both "
+"PATTERN and REPLACEMENT with either single or double quotes. To have the quote "
+"characters in the strings, prepend them with a backslash."
 msgstr ""
 
-#: part/kateview.cpp:634
-msgid "Expand One Local Level"
+#: part/katejscript.cpp:304 part/katejscript.cpp:928
+msgid "Exception, line %1: %2"
 msgstr ""
 
-#: part/kateview.cpp:639
-msgid "Show the code folding region tree"
+#: part/katejscript.cpp:754
+msgid "Command not found"
 msgstr ""
 
-#: part/kateview.cpp:640
-msgid "Basic template code test"
+#: part/katejscript.cpp:762 part/katejscript.cpp:897
+msgid "JavaScript file not found"
 msgstr ""
 
-#: part/kateview.cpp:702
-msgid " OVR "
-msgstr "DROS"
-
-#: part/kateview.cpp:704
-msgid " INS "
-msgstr "MEWN"
-
-#: part/kateview.cpp:707
-msgid " R/O "
-msgstr "DyU"
-
-#: part/kateview.cpp:712
-#, c-format
-msgid " Line: %1"
-msgstr "Llinell: %1 "
-
-#: part/kateview.cpp:713
-#, c-format
-msgid " Col: %1"
-msgstr " Col: %1"
-
-#: part/kateview.cpp:716
-msgid " BLK "
-msgstr "BLC"
-
-#: part/kateview.cpp:716
-msgid " NORM "
-msgstr "ARF"
-
-#: part/kateview.cpp:892
-msgid "Overwrite the file"
+#. i18n: file ./data/katepartreadonlyui.rc line 39
+#: rc.cpp:12 rc.cpp:33
+#, no-c-format
+msgid "&Code Folding"
 msgstr ""
 
-#: part/kateview.cpp:1794
+#. i18n: file data/4dos.xml line 9
+#: rc.cpp:44
 #, fuzzy
-msgid "Export File as HTML"
-msgstr "Allforio Ffeil Fel"
-
-#: part/katehighlight.cpp:1824
-msgid "Normal Text"
-msgstr "Testun Arferol"
-
-#: part/katehighlight.cpp:1972
-msgid ""
-"<B>%1</B>: Deprecated syntax. Attribute (%2) not addressed by symbolic name<BR>"
-msgstr ""
-
-#: part/katehighlight.cpp:2339
-msgid "<B>%1</B>: Deprecated syntax. Context %2 has no symbolic name<BR>"
-msgstr ""
-
-#: part/katehighlight.cpp:2386
 msgid ""
-"<B>%1</B>:Deprecated syntax. Context %2 not addressed by a symbolic name"
-msgstr ""
-
-#: part/katehighlight.cpp:2501
-msgid ""
-"There were warning(s) and/or error(s) while parsing the syntax highlighting "
-"configuration."
-msgstr ""
-
-#: part/katehighlight.cpp:2503
-msgid "Kate Syntax Highlighting Parser"
-msgstr ""
+"_: Language\n"
+"4DOS BatchToMemory"
+msgstr "Cynllun"
 
-#: part/katehighlight.cpp:2654
+#. i18n: file data/4dos.xml line 9
+#: rc.cpp:46 rc.cpp:68 rc.cpp:80 rc.cpp:124 rc.cpp:128 rc.cpp:242 rc.cpp:272
+#: rc.cpp:276 rc.cpp:284 rc.cpp:356 rc.cpp:380 rc.cpp:400 rc.cpp:420
+#: rc.cpp:440 rc.cpp:464 rc.cpp:498 rc.cpp:502 rc.cpp:530 rc.cpp:550
+#: rc.cpp:638 rc.cpp:642 rc.cpp:650 rc.cpp:654 rc.cpp:686 rc.cpp:690
+#: rc.cpp:698 rc.cpp:702 rc.cpp:726 rc.cpp:754 rc.cpp:766 rc.cpp:778
+#: rc.cpp:786 rc.cpp:830 rc.cpp:834 rc.cpp:854 rc.cpp:874 rc.cpp:942
 msgid ""
-"Since there has been an error parsing the highlighting description, this "
-"highlighting will be disabled"
-msgstr ""
+"_: Language Section\n"
+"Scripts"
+msgstr "Sgriptiau"
 
-#: part/katehighlight.cpp:2856
+#. i18n: file data/abap.xml line 3
+#: rc.cpp:48
+#, fuzzy
 msgid ""
-"<B>%1</B>: Specified multiline comment region (%2) could not be resolved<BR>"
-msgstr ""
-
-#: part/katehighlight.cpp:3167
-msgid "Keyword"
-msgstr "Allweddair"
-
-#: part/katehighlight.cpp:3168
-msgid "Data Type"
-msgstr "Math data"
-
-#: part/katehighlight.cpp:3169
-msgid "Decimal/Value"
-msgstr ""
-
-#: part/katehighlight.cpp:3170
-msgid "Base-N Integer"
-msgstr ""
-
-#: part/katehighlight.cpp:3171
-msgid "Floating Point"
-msgstr ""
-
-#: part/katehighlight.cpp:3172
-msgid "Character"
-msgstr "Nod"
-
-#: part/katehighlight.cpp:3173
-msgid "String"
-msgstr "Llinell"
-
-#: part/katehighlight.cpp:3175
-msgid "Others"
-msgstr "Eraill"
-
-#: part/katehighlight.cpp:3176
-msgid "Alert"
-msgstr ""
-
-#: part/katehighlight.cpp:3177
-msgid "Function"
-msgstr "Ffwythiant"
-
-#: part/katehighlight.cpp:3179
-msgid "Region Marker"
-msgstr ""
-
-#: part/kateautoindent.cpp:99
-msgid "C Style"
-msgstr ""
-
-#: part/kateautoindent.cpp:101
-msgid "Python Style"
-msgstr ""
-
-#: part/kateautoindent.cpp:103
-msgid "XML Style"
-msgstr ""
-
-#: part/kateautoindent.cpp:105
-msgid "S&S C Style"
-msgstr ""
-
-#: part/kateautoindent.cpp:107
-msgid "Variable Based Indenter"
-msgstr ""
-
-#: part/katecmds.cpp:151
-msgid "Mode must be at least 0."
-msgstr ""
-
-#: part/katecmds.cpp:169
-msgid "No such highlight '%1'"
-msgstr ""
-
-#: part/katecmds.cpp:180
-msgid "Missing argument. Usage: %1 <value>"
-msgstr ""
-
-#: part/katecmds.cpp:184
-msgid "Failed to convert argument '%1' to integer."
-msgstr ""
-
-#: part/katecmds.cpp:190 part/katecmds.cpp:196
-msgid "Width must be at least 1."
-msgstr ""
-
-#: part/katecmds.cpp:202
-msgid "Column must be at least 1."
-msgstr ""
-
-#: part/katecmds.cpp:208
-msgid "Line must be at least 1"
-msgstr ""
-
-#: part/katecmds.cpp:210
-msgid "There is not that many lines in this document"
-msgstr ""
-
-#: part/katecmds.cpp:232
-msgid "Usage: %1 on|off|1|0|true|false"
-msgstr ""
-
-#: part/katecmds.cpp:274
-msgid "Bad argument '%1'. Usage: %2 on|off|1|0|true|false"
-msgstr ""
-
-#: part/katecmds.cpp:279
-msgid "Unknown command '%1'"
-msgstr ""
-
-#: part/katecmds.cpp:498
-msgid "Sorry, but Kate is not able to replace newlines, yet"
-msgstr ""
+"_: Language\n"
+"ABAP"
+msgstr "C"
 
-#: part/katecmds.cpp:540
-#, c-format
+#. i18n: file data/abap.xml line 3
+#: rc.cpp:50 rc.cpp:58 rc.cpp:84 rc.cpp:140 rc.cpp:148 rc.cpp:152 rc.cpp:164
+#: rc.cpp:168 rc.cpp:178 rc.cpp:182 rc.cpp:190 rc.cpp:194 rc.cpp:212
+#: rc.cpp:260 rc.cpp:264 rc.cpp:296 rc.cpp:300 rc.cpp:304 rc.cpp:348
+#: rc.cpp:360 rc.cpp:364 rc.cpp:372 rc.cpp:376 rc.cpp:404 rc.cpp:408
+#: rc.cpp:412 rc.cpp:428 rc.cpp:452 rc.cpp:456 rc.cpp:476 rc.cpp:486
+#: rc.cpp:490 rc.cpp:494 rc.cpp:510 rc.cpp:566 rc.cpp:572 rc.cpp:576
+#: rc.cpp:592 rc.cpp:596 rc.cpp:600 rc.cpp:604 rc.cpp:608 rc.cpp:612
+#: rc.cpp:620 rc.cpp:624 rc.cpp:628 rc.cpp:674 rc.cpp:678 rc.cpp:682
+#: rc.cpp:706 rc.cpp:746 rc.cpp:758 rc.cpp:762 rc.cpp:794 rc.cpp:814
+#: rc.cpp:826 rc.cpp:902 rc.cpp:930 rc.cpp:938
 msgid ""
-"_n: 1 replacement done\n"
-"%n replacements done"
-msgstr ""
-
-#. i18n: file ./data/katepartreadonlyui.rc line 39
-#: rc.cpp:12 rc.cpp:33
-#, no-c-format
-msgid "&Code Folding"
+"_: Language Section\n"
+"Sources"
 msgstr ""
 
 #. i18n: file data/abc.xml line 5
-#: rc.cpp:44
+#: rc.cpp:52
 msgid ""
 "_: Language\n"
 "ABC"
 msgstr ""
 
 #. i18n: file data/abc.xml line 5
-#: rc.cpp:46 rc.cpp:62 rc.cpp:110 rc.cpp:122 rc.cpp:150 rc.cpp:158 rc.cpp:162
-#: rc.cpp:170 rc.cpp:186 rc.cpp:290 rc.cpp:310 rc.cpp:318 rc.cpp:342
-#: rc.cpp:386 rc.cpp:418 rc.cpp:422
+#: rc.cpp:54 rc.cpp:72 rc.cpp:76 rc.cpp:156 rc.cpp:198 rc.cpp:206 rc.cpp:220
+#: rc.cpp:224 rc.cpp:230 rc.cpp:238 rc.cpp:268 rc.cpp:320 rc.cpp:336
+#: rc.cpp:388 rc.cpp:392 rc.cpp:396 rc.cpp:424 rc.cpp:436 rc.cpp:480
+#: rc.cpp:506 rc.cpp:518 rc.cpp:580 rc.cpp:662 rc.cpp:694 rc.cpp:734
+#: rc.cpp:742 rc.cpp:858
 msgid ""
 "_: Language Section\n"
 "Other"
 msgstr "Arall"
 
 #. i18n: file data/actionscript.xml line 3
-#: rc.cpp:48
+#: rc.cpp:56
 #, fuzzy
 msgid ""
 "_: Language\n"
 "ActionScript 2.0"
 msgstr "Sgriptiau"
 
-#. i18n: file data/actionscript.xml line 3
-#: rc.cpp:50 rc.cpp:54 rc.cpp:66 rc.cpp:98 rc.cpp:102 rc.cpp:106 rc.cpp:118
-#: rc.cpp:134 rc.cpp:138 rc.cpp:142 rc.cpp:154 rc.cpp:178 rc.cpp:182
-#: rc.cpp:206 rc.cpp:222 rc.cpp:230 rc.cpp:242 rc.cpp:246 rc.cpp:250
-#: rc.cpp:258 rc.cpp:274 rc.cpp:286 rc.cpp:294 rc.cpp:298 rc.cpp:302
-#: rc.cpp:338 rc.cpp:350 rc.cpp:354 rc.cpp:362 rc.cpp:394 rc.cpp:398
-#: rc.cpp:426 rc.cpp:434 rc.cpp:454 rc.cpp:474 rc.cpp:514 rc.cpp:530
-#: rc.cpp:534
-msgid ""
-"_: Language Section\n"
-"Sources"
-msgstr ""
-
 #. i18n: file data/ada.xml line 3
-#: rc.cpp:52
+#: rc.cpp:60
 msgid ""
 "_: Language\n"
 "Ada"
 msgstr ""
 
 #. i18n: file data/ahdl.xml line 3
-#: rc.cpp:56
+#: rc.cpp:62
 msgid ""
 "_: Language\n"
 "AHDL"
 msgstr ""
 
 #. i18n: file data/ahdl.xml line 3
-#: rc.cpp:58 rc.cpp:458 rc.cpp:498 rc.cpp:502
+#: rc.cpp:64 rc.cpp:798 rc.cpp:818 rc.cpp:822 rc.cpp:878 rc.cpp:882 rc.cpp:886
 msgid ""
 "_: Language Section\n"
 "Hardware"
 msgstr "Caledwedd"
 
+#. i18n: file data/ahk.xml line 3
+#: rc.cpp:66
+#, fuzzy
+msgid ""
+"_: Language\n"
+"AutoHotKey"
+msgstr "Python"
+
 #. i18n: file data/alert.xml line 29
-#: rc.cpp:60
+#: rc.cpp:70
 msgid ""
 "_: Language\n"
 "Alerts"
 msgstr ""
 
+#. i18n: file data/alert_indent.xml line 29
+#: rc.cpp:74
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Alerts_indent"
+msgstr "Gwyddonol"
+
+#. i18n: file data/ample.xml line 3
+#: rc.cpp:78
+#, fuzzy
+msgid ""
+"_: Language\n"
+"AMPLE"
+msgstr "XML"
+
 #. i18n: file data/ansic89.xml line 27
-#: rc.cpp:64
+#: rc.cpp:82
 msgid ""
 "_: Language\n"
 "ANSI C89"
 msgstr ""
 
+#. i18n: file data/ansys.xml line 3
+#: rc.cpp:86
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Ansys"
+msgstr "C"
+
+#. i18n: file data/ansys.xml line 3
+#: rc.cpp:88 rc.cpp:136 rc.cpp:246 rc.cpp:316 rc.cpp:324 rc.cpp:534 rc.cpp:538
+#: rc.cpp:542 rc.cpp:616 rc.cpp:714 rc.cpp:770 rc.cpp:846 rc.cpp:926
+msgid ""
+"_: Language Section\n"
+"Scientific"
+msgstr "Gwyddonol"
+
 #. i18n: file data/apache.xml line 15
-#: rc.cpp:68
+#: rc.cpp:90
 msgid ""
 "_: Language\n"
 "Apache Configuration"
 msgstr ""
 
 #. i18n: file data/apache.xml line 15
-#: rc.cpp:70 rc.cpp:114 rc.cpp:166 rc.cpp:210 rc.cpp:254 rc.cpp:510
+#: rc.cpp:92 rc.cpp:120 rc.cpp:160 rc.cpp:308 rc.cpp:332 rc.cpp:340 rc.cpp:416
+#: rc.cpp:554 rc.cpp:584 rc.cpp:862 rc.cpp:866 rc.cpp:894 rc.cpp:914
 msgid ""
 "_: Language Section\n"
 "Configuration"
 msgstr "Ffurfwedd"
 
 #. i18n: file data/asm-avr.xml line 36
-#: rc.cpp:72
+#: rc.cpp:94
 msgid ""
 "_: Language\n"
 "AVR Assembler"
 msgstr ""
 
 #. i18n: file data/asm-avr.xml line 36
-#: rc.cpp:74 rc.cpp:78 rc.cpp:226 rc.cpp:334 rc.cpp:346 rc.cpp:374
+#: rc.cpp:96 rc.cpp:100 rc.cpp:104 rc.cpp:108 rc.cpp:280 rc.cpp:352 rc.cpp:562
+#: rc.cpp:588 rc.cpp:646
 msgid ""
 "_: Language Section\n"
 "Assembler"
 msgstr ""
 
+#. i18n: file data/asm-dsp56k.xml line 4
+#: rc.cpp:98
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Motorola DSP56k"
+msgstr "D"
+
+#. i18n: file data/asm-m68k.xml line 4
+#: rc.cpp:102
+msgid ""
+"_: Language\n"
+"Motorola 68k (VASM/Devpac)"
+msgstr ""
+
 #. i18n: file data/asm6502.xml line 3
-#: rc.cpp:76
+#: rc.cpp:106
 msgid ""
 "_: Language\n"
 "Asm6502"
 msgstr ""
 
-#. i18n: file data/asp.xml line 3
-#: rc.cpp:80
+#. i18n: file data/asn1.xml line 12
+#: rc.cpp:110
+#, fuzzy
 msgid ""
 "_: Language\n"
-"ASP"
-msgstr ""
+"ASN.1"
+msgstr "SQL"
 
-#. i18n: file data/asp.xml line 3
-#: rc.cpp:82 rc.cpp:94 rc.cpp:126 rc.cpp:146 rc.cpp:174 rc.cpp:218 rc.cpp:234
-#: rc.cpp:262 rc.cpp:270 rc.cpp:278 rc.cpp:314 rc.cpp:330 rc.cpp:382
-#: rc.cpp:414 rc.cpp:446 rc.cpp:486 rc.cpp:506 rc.cpp:518 rc.cpp:522
-#: rc.cpp:526
+#. i18n: file data/asn1.xml line 12
+#: rc.cpp:112 rc.cpp:116 rc.cpp:132 rc.cpp:144 rc.cpp:174 rc.cpp:186
+#: rc.cpp:202 rc.cpp:216 rc.cpp:234 rc.cpp:252 rc.cpp:256 rc.cpp:312
+#: rc.cpp:328 rc.cpp:344 rc.cpp:368 rc.cpp:384 rc.cpp:432 rc.cpp:444
+#: rc.cpp:448 rc.cpp:460 rc.cpp:472 rc.cpp:514 rc.cpp:522 rc.cpp:526
+#: rc.cpp:546 rc.cpp:558 rc.cpp:632 rc.cpp:658 rc.cpp:666 rc.cpp:710
+#: rc.cpp:718 rc.cpp:722 rc.cpp:730 rc.cpp:738 rc.cpp:750 rc.cpp:774
+#: rc.cpp:782 rc.cpp:790 rc.cpp:838 rc.cpp:842 rc.cpp:850 rc.cpp:870
+#: rc.cpp:890 rc.cpp:898 rc.cpp:906 rc.cpp:910 rc.cpp:918 rc.cpp:922
+#: rc.cpp:934
 msgid ""
 "_: Language Section\n"
 "Markup"
 msgstr ""
 
-#. i18n: file data/awk.xml line 3
-#: rc.cpp:84
+#. i18n: file data/asp.xml line 3
+#: rc.cpp:114
 msgid ""
 "_: Language\n"
-"AWK"
+"ASP"
 msgstr ""
 
+#. i18n: file data/asterisk.xml line 19
+#: rc.cpp:118
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Asterisk"
+msgstr "Ebost"
+
 #. i18n: file data/awk.xml line 3
-#: rc.cpp:86 rc.cpp:90 rc.cpp:130 rc.cpp:190 rc.cpp:194 rc.cpp:238 rc.cpp:266
-#: rc.cpp:306 rc.cpp:322 rc.cpp:366 rc.cpp:370 rc.cpp:378 rc.cpp:402
-#: rc.cpp:406 rc.cpp:410 rc.cpp:430 rc.cpp:438 rc.cpp:450 rc.cpp:478
-#: rc.cpp:490 rc.cpp:494
+#: rc.cpp:122
 msgid ""
-"_: Language Section\n"
-"Scripts"
-msgstr "Sgriptiau"
+"_: Language\n"
+"AWK"
+msgstr ""
 
-#. i18n: file data/bash.xml line 10
-#: rc.cpp:88
+#. i18n: file data/bash.xml line 11
+#: rc.cpp:126
 msgid ""
 "_: Language\n"
 "Bash"
 msgstr ""
 
-#. i18n: file data/bibtex.xml line 3
-#: rc.cpp:92
+#. i18n: file data/bibtex.xml line 9
+#: rc.cpp:130
 msgid ""
 "_: Language\n"
 "BibTeX"
 msgstr ""
 
+#. i18n: file data/bmethod.xml line 3
+#: rc.cpp:134
+#, fuzzy
+msgid ""
+"_: Language\n"
+"B-Method"
+msgstr "Python"
+
 #. i18n: file data/c.xml line 3
-#: rc.cpp:96
+#: rc.cpp:138
 msgid ""
 "_: Language\n"
 "C"
 msgstr "C"
 
+#. i18n: file data/ccss.xml line 9
+#: rc.cpp:142
+#, fuzzy
+msgid ""
+"_: Language\n"
+"CleanCSS"
+msgstr "C"
+
 #. i18n: file data/cg.xml line 23
-#: rc.cpp:100
+#: rc.cpp:146
 msgid ""
 "_: Language\n"
 "Cg"
 msgstr ""
 
 #. i18n: file data/cgis.xml line 3
-#: rc.cpp:104
+#: rc.cpp:150
 msgid ""
 "_: Language\n"
 "CGiS"
 msgstr ""
 
 #. i18n: file data/changelog.xml line 3
-#: rc.cpp:108
+#: rc.cpp:154
 msgid ""
 "_: Language\n"
 "ChangeLog"
 msgstr ""
 
 #. i18n: file data/cisco.xml line 3
-#: rc.cpp:112
+#: rc.cpp:158
 msgid ""
 "_: Language\n"
 "Cisco"
 msgstr ""
 
 #. i18n: file data/clipper.xml line 3
-#: rc.cpp:116
+#: rc.cpp:162
 msgid ""
 "_: Language\n"
 "Clipper"
 msgstr ""
 
-#. i18n: file data/cmake.xml line 6
-#: rc.cpp:120
+#. i18n: file data/clojure.xml line 25
+#: rc.cpp:166
+#, fuzzy
 msgid ""
 "_: Language\n"
-"CMake"
-msgstr ""
+"Clojure"
+msgstr "C"
+
+#. i18n: file data/coffee.xml line 4
+#: rc.cpp:170
+#, fuzzy
+msgid ""
+"_: Language\n"
+"CoffeeScript"
+msgstr "JavaScript"
 
 #. i18n: file data/coldfusion.xml line 3
-#: rc.cpp:124
+#: rc.cpp:172
 msgid ""
 "_: Language\n"
 "ColdFusion"
 msgstr ""
 
-#. i18n: file data/commonlisp.xml line 28
-#: rc.cpp:128
+#. i18n: file data/commonlisp.xml line 26
+#: rc.cpp:176
 msgid ""
 "_: Language\n"
 "Common Lisp"
 msgstr ""
 
 #. i18n: file data/component-pascal.xml line 13
-#: rc.cpp:132
+#: rc.cpp:180
 msgid ""
 "_: Language\n"
 "Component-Pascal"
 msgstr ""
 
-#. i18n: file data/cpp.xml line 3
-#: rc.cpp:136
+#. i18n: file data/context.xml line 3
+#: rc.cpp:184
+#, fuzzy
 msgid ""
 "_: Language\n"
-"C++"
-msgstr ""
+"ConTeXt"
+msgstr "C"
+
+#. i18n: file data/crk.xml line 2
+#: rc.cpp:188
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Crack"
+msgstr "C"
 
 #. i18n: file data/cs.xml line 2
-#: rc.cpp:140
+#: rc.cpp:192
 msgid ""
 "_: Language\n"
 "C#"
 msgstr ""
 
-#. i18n: file data/css.xml line 3
-#: rc.cpp:144
+#. i18n: file data/css-php.xml line 32
+#: rc.cpp:196
+#, fuzzy
+msgid ""
+"_: Language\n"
+"CSS/PHP"
+msgstr "C"
+
+#. i18n: file data/css.xml line 26
+#: rc.cpp:200
 msgid ""
 "_: Language\n"
 "CSS"
 msgstr ""
 
 #. i18n: file data/cue.xml line 3
-#: rc.cpp:148
+#: rc.cpp:204
 msgid ""
 "_: Language\n"
 "CUE Sheet"
 msgstr ""
 
-#. i18n: file data/d.xml line 41
-#: rc.cpp:152
+#. i18n: file data/curry.xml line 33
+#: rc.cpp:208
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Curry"
+msgstr "C"
+
+#. i18n: file data/d.xml line 104
+#: rc.cpp:210
 msgid ""
 "_: Language\n"
 "D"
 msgstr "D"
 
+#. i18n: file data/ddoc.xml line 52
+#: rc.cpp:214
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Ddoc"
+msgstr "D"
+
 #. i18n: file data/debianchangelog.xml line 3
-#: rc.cpp:156
+#: rc.cpp:218
 msgid ""
 "_: Language\n"
 "Debian Changelog"
 msgstr ""
 
 #. i18n: file data/debiancontrol.xml line 3
-#: rc.cpp:160
+#: rc.cpp:222
 msgid ""
 "_: Language\n"
 "Debian Control"
 msgstr ""
 
 #. i18n: file data/desktop.xml line 3
-#: rc.cpp:164
+#: rc.cpp:226
 msgid ""
 "_: Language\n"
 ".desktop"
 msgstr ""
 
-#. i18n: file data/diff.xml line 15
-#: rc.cpp:168
+#. i18n: file data/diff.xml line 18
+#: rc.cpp:228
 msgid ""
 "_: Language\n"
 "Diff"
 msgstr "Diff"
 
-#. i18n: file data/doxygen.xml line 26
-#: rc.cpp:172
+#. i18n: file data/djangotemplate.xml line 7
+#: rc.cpp:232
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Django HTML Template"
+msgstr "HTML"
+
+#. i18n: file data/dockerfile.xml line 4
+#: rc.cpp:236
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Dockerfile"
+msgstr "Cynllun"
+
+#. i18n: file data/dosbat.xml line 11
+#: rc.cpp:240
+#, fuzzy
+msgid ""
+"_: Language\n"
+"MS-DOS Batch"
+msgstr "Cynllun"
+
+#. i18n: file data/dot.xml line 4
+#: rc.cpp:244
+#, fuzzy
+msgid ""
+"_: Language\n"
+"dot"
+msgstr "C"
+
+#. i18n: file data/doxygen.xml line 31
+#: rc.cpp:248
 msgid ""
 "_: Language\n"
 "Doxygen"
 msgstr ""
 
+#. i18n: file data/doxygenlua.xml line 30
+#: rc.cpp:250
+#, fuzzy
+msgid ""
+"_: Language\n"
+"DoxygenLua"
+msgstr "D"
+
+#. i18n: file data/dtd.xml line 6
+#: rc.cpp:254
+#, fuzzy
+msgid ""
+"_: Language\n"
+"DTD"
+msgstr "D"
+
 #. i18n: file data/e.xml line 3
-#: rc.cpp:176
+#: rc.cpp:258
 msgid ""
 "_: Language\n"
 "E Language"
 msgstr ""
 
 #. i18n: file data/eiffel.xml line 13
-#: rc.cpp:180
+#: rc.cpp:262
 msgid ""
 "_: Language\n"
 "Eiffel"
 msgstr ""
 
 #. i18n: file data/email.xml line 6
-#: rc.cpp:184
+#: rc.cpp:266
 msgid ""
 "_: Language\n"
 "Email"
 msgstr "Ebost"
 
+#. i18n: file data/erlang.xml line 39
+#: rc.cpp:270
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Erlang"
+msgstr "Ebost"
+
 #. i18n: file data/euphoria.xml line 32
-#: rc.cpp:188
+#: rc.cpp:274
 msgid ""
 "_: Language\n"
 "Euphoria"
 msgstr ""
 
+#. i18n: file data/fasm.xml line 16
+#: rc.cpp:278
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Intel x86 (FASM)"
+msgstr "SQL"
+
 #. i18n: file data/ferite.xml line 3
-#: rc.cpp:192
+#: rc.cpp:282
 msgid ""
 "_: Language\n"
 "ferite"
 msgstr ""
 
 #. i18n: file data/fgl-4gl.xml line 3
-#: rc.cpp:196
+#: rc.cpp:286
 msgid ""
 "_: Language\n"
 "4GL"
 msgstr ""
 
 #. i18n: file data/fgl-4gl.xml line 3
-#: rc.cpp:198 rc.cpp:202 rc.cpp:282 rc.cpp:390 rc.cpp:462 rc.cpp:466
-#: rc.cpp:470
+#: rc.cpp:288 rc.cpp:292 rc.cpp:468 rc.cpp:670 rc.cpp:802 rc.cpp:806
+#: rc.cpp:810
 msgid ""
 "_: Language Section\n"
 "Database"
 msgstr "Cronfa ddata"
 
 #. i18n: file data/fgl-per.xml line 3
-#: rc.cpp:200
+#: rc.cpp:290
 msgid ""
 "_: Language\n"
 "4GL-PER"
 msgstr ""
 
 #. i18n: file data/fortran.xml line 3
-#: rc.cpp:204
+#: rc.cpp:294
 msgid ""
 "_: Language\n"
 "Fortran"
 msgstr ""
 
+#. i18n: file data/freebasic.xml line 3
+#: rc.cpp:298
+#, fuzzy
+msgid ""
+"_: Language\n"
+"FreeBASIC"
+msgstr "C"
+
+#. i18n: file data/fsharp.xml line 12
+#: rc.cpp:302
+#, fuzzy
+msgid ""
+"_: Language\n"
+"FSharp"
+msgstr "SQL"
+
 #. i18n: file data/fstab.xml line 4
-#: rc.cpp:208
+#: rc.cpp:306
 msgid ""
 "_: Language\n"
 "fstab"
 msgstr ""
 
-#. i18n: file data/gdl.xml line 3
-#: rc.cpp:212
+#. i18n: file data/ftl.xml line 3
+#: rc.cpp:310
+#, fuzzy
 msgid ""
 "_: Language\n"
-"GDL"
-msgstr ""
+"FTL"
+msgstr "HTML"
+
+#. i18n: file data/gap.xml line 17
+#: rc.cpp:314
+#, fuzzy
+msgid ""
+"_: Language\n"
+"GAP"
+msgstr "C"
+
+#. i18n: file data/gdb.xml line 10
+#: rc.cpp:318
+#, fuzzy
+msgid ""
+"_: Language\n"
+"GDB Backtrace"
+msgstr "D"
 
 #. i18n: file data/gdl.xml line 3
-#: rc.cpp:214 rc.cpp:326 rc.cpp:358 rc.cpp:442 rc.cpp:482
+#: rc.cpp:322
 msgid ""
-"_: Language Section\n"
-"Scientific"
-msgstr "Gwyddonol"
+"_: Language\n"
+"GDL"
+msgstr ""
 
-#. i18n: file data/gettext.xml line 24
-#: rc.cpp:216
+#. i18n: file data/gettext.xml line 26
+#: rc.cpp:326
 msgid ""
 "_: Language\n"
 "GNU Gettext"
 msgstr ""
 
+#. i18n: file data/git-ignore.xml line 3
+#: rc.cpp:330
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Git Ignore"
+msgstr "cynnydd"
+
+#. i18n: file data/git-rebase.xml line 3
+#: rc.cpp:334
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Git Rebase"
+msgstr "Cynllun"
+
+#. i18n: file data/gitolite.xml line 3
+#: rc.cpp:338
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Gitolite"
+msgstr "Ebost"
+
+#. i18n: file data/glosstex.xml line 3
+#: rc.cpp:342
+#, fuzzy
+msgid ""
+"_: Language\n"
+"GlossTex"
+msgstr "cynnydd"
+
 #. i18n: file data/glsl.xml line 3
-#: rc.cpp:220
+#: rc.cpp:346
 msgid ""
 "_: Language\n"
 "GLSL"
 msgstr ""
 
-#. i18n: file data/gnuassembler.xml line 42
-#: rc.cpp:224
+#. i18n: file data/gnuassembler.xml line 46
+#: rc.cpp:350
 msgid ""
 "_: Language\n"
 "GNU Assembler"
 msgstr ""
 
-#. i18n: file data/haskell.xml line 4
-#: rc.cpp:228
+#. i18n: file data/gnuplot.xml line 3
+#: rc.cpp:354
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Gnuplot"
+msgstr "C"
+
+#. i18n: file data/go.xml line 29
+#: rc.cpp:358
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Go"
+msgstr "C"
+
+#. i18n: file data/grammar.xml line 6
+#: rc.cpp:362
+msgid ""
+"_: Language\n"
+"KDev-PG[-Qt] Grammar"
+msgstr ""
+
+#. i18n: file data/haml.xml line 3
+#: rc.cpp:366
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Haml"
+msgstr "Ebost"
+
+#. i18n: file data/haskell.xml line 3
+#: rc.cpp:370
 msgid ""
 "_: Language\n"
 "Haskell"
 msgstr ""
 
+#. i18n: file data/haxe.xml line 15
+#: rc.cpp:374
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Haxe"
+msgstr "C"
+
+#. i18n: file data/html-php.xml line 13
+#: rc.cpp:378
+#, fuzzy
+msgid ""
+"_: Language\n"
+"PHP (HTML)"
+msgstr "HTML"
+
 #. i18n: file data/html.xml line 7
-#: rc.cpp:232
+#: rc.cpp:382
 msgid ""
 "_: Language\n"
 "HTML"
 msgstr "HTML"
 
+#. i18n: file data/hunspell-aff.xml line 3
+#: rc.cpp:386
+msgid ""
+"_: Language\n"
+"Hunspell Affix File"
+msgstr ""
+
+#. i18n: file data/hunspell-dat.xml line 3
+#: rc.cpp:390
+msgid ""
+"_: Language\n"
+"Hunspell Thesaurus File"
+msgstr ""
+
+#. i18n: file data/hunspell-dic.xml line 3
+#: rc.cpp:394
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Hunspell Dictionary File"
+msgstr "Caledwedd"
+
 #. i18n: file data/idconsole.xml line 3
-#: rc.cpp:236
+#: rc.cpp:398
 msgid ""
 "_: Language\n"
 "Quake Script"
 msgstr ""
 
 #. i18n: file data/idl.xml line 3
-#: rc.cpp:240
+#: rc.cpp:402
 msgid ""
 "_: Language\n"
 "IDL"
 msgstr ""
 
 #. i18n: file data/ilerpg.xml line 48
-#: rc.cpp:244
+#: rc.cpp:406
 msgid ""
 "_: Language\n"
 "ILERPG"
 msgstr ""
 
-#. i18n: file data/inform.xml line 6
-#: rc.cpp:248
+#. i18n: file data/inform.xml line 5
+#: rc.cpp:410
 msgid ""
 "_: Language\n"
 "Inform"
 msgstr ""
 
 #. i18n: file data/ini.xml line 3
-#: rc.cpp:252
+#: rc.cpp:414
 msgid ""
 "_: Language\n"
 "INI Files"
 msgstr ""
 
+#. i18n: file data/j.xml line 27
+#: rc.cpp:418
+#, fuzzy
+msgid ""
+"_: Language\n"
+"J"
+msgstr "C"
+
+#. i18n: file data/jam.xml line 24
+#: rc.cpp:422
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Jam"
+msgstr "Java"
+
 #. i18n: file data/java.xml line 3
-#: rc.cpp:256
+#: rc.cpp:426
 msgid ""
 "_: Language\n"
 "Java"
 msgstr "Java"
 
 #. i18n: file data/javadoc.xml line 3
-#: rc.cpp:260
+#: rc.cpp:430
 msgid ""
 "_: Language\n"
 "Javadoc"
 msgstr ""
 
+#. i18n: file data/javascript-php.xml line 12
+#: rc.cpp:434
+#, fuzzy
+msgid ""
+"_: Language\n"
+"JavaScript/PHP"
+msgstr "JavaScript"
+
 #. i18n: file data/javascript.xml line 6
-#: rc.cpp:264
+#: rc.cpp:438
 msgid ""
 "_: Language\n"
 "JavaScript"
 msgstr "JavaScript"
 
+#. i18n: file data/json.xml line 15
+#: rc.cpp:442
+#, fuzzy
+msgid ""
+"_: Language\n"
+"JSON"
+msgstr "SQL"
+
 #. i18n: file data/jsp.xml line 3
-#: rc.cpp:268
+#: rc.cpp:446
 msgid ""
 "_: Language\n"
 "JSP"
 msgstr ""
 
+#. i18n: file data/julia.xml line 32
+#: rc.cpp:450
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Julia"
+msgstr "Java"
+
 #. i18n: file data/kbasic.xml line 3
-#: rc.cpp:272
+#: rc.cpp:454
 msgid ""
 "_: Language\n"
 "KBasic"
 msgstr ""
 
 #. i18n: file data/latex.xml line 3
-#: rc.cpp:276
+#: rc.cpp:458
 msgid ""
 "_: Language\n"
 "LaTeX"
 msgstr ""
 
+#. i18n: file data/ld.xml line 4
+#: rc.cpp:462
+#, fuzzy
+msgid ""
+"_: Language\n"
+"GNU Linker Script"
+msgstr "Sgriptiau"
+
 #. i18n: file data/ldif.xml line 3
-#: rc.cpp:280
+#: rc.cpp:466
 msgid ""
 "_: Language\n"
 "LDIF"
 msgstr ""
 
-#. i18n: file data/lex.xml line 23
-#: rc.cpp:284
+#. i18n: file data/less.xml line 3
+#: rc.cpp:470
+#, fuzzy
+msgid ""
+"_: Language\n"
+"LESSCSS"
+msgstr "C"
+
+#. i18n: file data/lex.xml line 21
+#: rc.cpp:474
 msgid ""
 "_: Language\n"
 "Lex/Flex"
 msgstr ""
 
-#. i18n: file data/lilypond.xml line 27
-#: rc.cpp:288
+#. i18n: file data/lilypond.xml line 23
+#: rc.cpp:478
 msgid ""
 "_: Language\n"
 "LilyPond"
 msgstr ""
 
+#. i18n: file data/literate-curry.xml line 3
+#: rc.cpp:482
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Literate Curry"
+msgstr "C"
+
 #. i18n: file data/literate-haskell.xml line 3
-#: rc.cpp:292
+#: rc.cpp:484
 msgid ""
 "_: Language\n"
 "Literate Haskell"
 msgstr ""
 
 #. i18n: file data/logtalk.xml line 4
-#: rc.cpp:296
+#: rc.cpp:488
 msgid ""
 "_: Language\n"
 "Logtalk"
 msgstr ""
 
 #. i18n: file data/lpc.xml line 19
-#: rc.cpp:300
+#: rc.cpp:492
 msgid ""
 "_: Language\n"
 "LPC"
 msgstr ""
 
-#. i18n: file data/lua.xml line 3
-#: rc.cpp:304
+#. i18n: file data/lsl.xml line 14
+#: rc.cpp:496
+#, fuzzy
+msgid ""
+"_: Language\n"
+"LSL"
+msgstr "SQL"
+
+#. i18n: file data/lua.xml line 38
+#: rc.cpp:500
 msgid ""
 "_: Language\n"
 "Lua"
 msgstr ""
 
-#. i18n: file data/m3u.xml line 14
-#: rc.cpp:308
+#. i18n: file data/m3u.xml line 17
+#: rc.cpp:504
 msgid ""
 "_: Language\n"
 "M3U"
 msgstr ""
 
+#. i18n: file data/m4.xml line 41
+#: rc.cpp:508
+#, fuzzy
+msgid ""
+"_: Language\n"
+"GNU M4"
+msgstr "XML"
+
 #. i18n: file data/mab.xml line 3
-#: rc.cpp:312
+#: rc.cpp:512
 msgid ""
 "_: Language\n"
 "MAB-DB"
 msgstr ""
 
-#. i18n: file data/makefile.xml line 5
-#: rc.cpp:316
+#. i18n: file data/makefile.xml line 10
+#: rc.cpp:516
 msgid ""
 "_: Language\n"
 "Makefile"
 msgstr ""
 
+#. i18n: file data/mako.xml line 7
+#: rc.cpp:520
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Mako"
+msgstr "XML"
+
+#. i18n: file data/mandoc.xml line 3
+#: rc.cpp:524
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Troff Mandoc"
+msgstr "Diff"
+
 #. i18n: file data/mason.xml line 3
-#: rc.cpp:320
+#: rc.cpp:528
 msgid ""
 "_: Language\n"
 "Mason"
 msgstr ""
 
-#. i18n: file data/matlab.xml line 58
-#: rc.cpp:324
+#. i18n: file data/mathematica.xml line 3
+#: rc.cpp:532
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Mathematica"
+msgstr "Ebost"
+
+#. i18n: file data/matlab.xml line 60
+#: rc.cpp:536
 msgid ""
 "_: Language\n"
 "Matlab"
 msgstr ""
 
-#. i18n: file data/mediawiki.xml line 3
-#: rc.cpp:328
+#. i18n: file data/maxima.xml line 24
+#: rc.cpp:540
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Maxima"
+msgstr "Java"
+
+#. i18n: file data/mediawiki.xml line 7
+#: rc.cpp:544
 #, fuzzy
 msgid ""
 "_: Language\n"
 "MediaWiki"
 msgstr "Ebost"
 
+#. i18n: file data/mel.xml line 23
+#: rc.cpp:548
+#, fuzzy
+msgid ""
+"_: Language\n"
+"MEL"
+msgstr "XML"
+
+#. i18n: file data/mergetagtext.xml line 28
+#: rc.cpp:552
+#, fuzzy
+msgid ""
+"_: Language\n"
+"mergetag text"
+msgstr "Ebost"
+
+#. i18n: file data/metafont.xml line 9
+#: rc.cpp:556
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Metapost/Metafont"
+msgstr "Python"
+
 #. i18n: file data/mips.xml line 3
-#: rc.cpp:332
+#: rc.cpp:560
 msgid ""
 "_: Language\n"
 "MIPS Assembler"
 msgstr ""
 
+#. i18n: file data/modelica.xml line 19
+#: rc.cpp:564
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Modelica"
+msgstr "Ebost"
+
+#. i18n: file data/modelines.xml line 10
+#: rc.cpp:568
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Modelines"
+msgstr "cynnydd"
+
 #. i18n: file data/modula-2.xml line 3
-#: rc.cpp:336
+#: rc.cpp:570
 msgid ""
 "_: Language\n"
 "Modula-2"
 msgstr ""
 
+#. i18n: file data/monobasic.xml line 13
+#: rc.cpp:574
+#, fuzzy
+msgid ""
+"_: Language\n"
+"MonoBasic"
+msgstr "Ebost"
+
 #. i18n: file data/mup.xml line 3
-#: rc.cpp:340
+#: rc.cpp:578
 msgid ""
 "_: Language\n"
 "Music Publisher"
 msgstr ""
 
-#. i18n: file data/nasm.xml line 31
-#: rc.cpp:344
+#. i18n: file data/nagios.xml line 3
+#: rc.cpp:582
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Nagios"
+msgstr "Ebost"
+
+#. i18n: file data/nasm.xml line 43
+#: rc.cpp:586
 msgid ""
 "_: Language\n"
 "Intel x86 (NASM)"
 msgstr ""
 
+#. i18n: file data/nemerle.xml line 4
+#: rc.cpp:590
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Nemerle"
+msgstr "Cynllun"
+
+#. i18n: file data/nesc.xml line 3
+#: rc.cpp:594
+#, fuzzy
+msgid ""
+"_: Language\n"
+"nesC"
+msgstr "C"
+
+#. i18n: file data/noweb.xml line 3
+#: rc.cpp:598
+#, fuzzy
+msgid ""
+"_: Language\n"
+"noweb"
+msgstr "C"
+
 #. i18n: file data/objectivec.xml line 3
-#: rc.cpp:348
+#: rc.cpp:602
 msgid ""
 "_: Language\n"
 "Objective-C"
 msgstr ""
 
-#. i18n: file data/ocaml.xml line 11
-#: rc.cpp:352
+#. i18n: file data/objectivecpp.xml line 3
+#: rc.cpp:606
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Objective-C++"
+msgstr "C"
+
+#. i18n: file data/ocaml.xml line 12
+#: rc.cpp:610
 msgid ""
 "_: Language\n"
 "Objective Caml"
 msgstr ""
 
 #. i18n: file data/octave.xml line 18
-#: rc.cpp:356
+#: rc.cpp:614
 msgid ""
 "_: Language\n"
 "Octave"
 msgstr ""
 
+#. i18n: file data/oors.xml line 3
+#: rc.cpp:618
+#, fuzzy
+msgid ""
+"_: Language\n"
+"OORS"
+msgstr "SQL"
+
+#. i18n: file data/opal.xml line 3
+#: rc.cpp:622
+#, fuzzy
+msgid ""
+"_: Language\n"
+"OPAL"
+msgstr "SQL"
+
+#. i18n: file data/opencl.xml line 3
+#: rc.cpp:626
+#, fuzzy
+msgid ""
+"_: Language\n"
+"OpenCL"
+msgstr "C"
+
+#. i18n: file data/pango.xml line 3
+#: rc.cpp:630
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Pango"
+msgstr "Python"
+
 #. i18n: file data/pascal.xml line 3
-#: rc.cpp:360
+#: rc.cpp:634
 msgid ""
 "_: Language\n"
 "Pascal"
 msgstr ""
 
 #. i18n: file data/perl.xml line 42
-#: rc.cpp:364
+#: rc.cpp:636
 msgid ""
 "_: Language\n"
 "Perl"
 msgstr ""
 
-#. i18n: file data/php.xml line 21
-#: rc.cpp:368
+#. i18n: file data/php.xml line 67
+#: rc.cpp:640
 msgid ""
 "_: Language\n"
 "PHP/PHP"
 msgstr ""
 
 #. i18n: file data/picsrc.xml line 11
-#: rc.cpp:372
+#: rc.cpp:644
 msgid ""
 "_: Language\n"
 "PicAsm"
 msgstr ""
 
+#. i18n: file data/pig.xml line 4
+#: rc.cpp:648
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Pig"
+msgstr "C"
+
 #. i18n: file data/pike.xml line 4
-#: rc.cpp:376
+#: rc.cpp:652
 msgid ""
 "_: Language\n"
 "Pike"
 msgstr ""
 
 #. i18n: file data/postscript.xml line 3
-#: rc.cpp:380
+#: rc.cpp:656
 msgid ""
 "_: Language\n"
 "PostScript"
 msgstr ""
 
-#. i18n: file data/povray.xml line 7
-#: rc.cpp:384
+#. i18n: file data/povray.xml line 9
+#: rc.cpp:660
 msgid ""
 "_: Language\n"
 "POV-Ray"
 msgstr ""
 
+#. i18n: file data/ppd.xml line 12
+#: rc.cpp:664
+#, fuzzy
+msgid ""
+"_: Language\n"
+"PostScript Printer Description"
+msgstr "Sgriptiau"
+
 #. i18n: file data/progress.xml line 3
-#: rc.cpp:388
+#: rc.cpp:668
 msgid ""
 "_: Language\n"
 "progress"
 msgstr "cynnydd"
 
-#. i18n: file data/prolog.xml line 3
-#: rc.cpp:392
+#. i18n: file data/prolog.xml line 107
+#: rc.cpp:672
 msgid ""
 "_: Language\n"
 "Prolog"
 msgstr ""
 
+#. i18n: file data/protobuf.xml line 3
+#: rc.cpp:676
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Protobuf"
+msgstr "Python"
+
 #. i18n: file data/purebasic.xml line 3
-#: rc.cpp:396
+#: rc.cpp:680
 msgid ""
 "_: Language\n"
 "PureBasic"
 msgstr ""
 
-#. i18n: file data/python.xml line 4
-#: rc.cpp:400
+#. i18n: file data/python.xml line 16
+#: rc.cpp:684
 msgid ""
 "_: Language\n"
 "Python"
 msgstr "Python"
 
-#. i18n: file data/r.xml line 11
-#: rc.cpp:404
+#. i18n: file data/q.xml line 3
+#: rc.cpp:688
+#, fuzzy
+msgid ""
+"_: Language\n"
+"q"
+msgstr "C"
+
+#. i18n: file data/qmake.xml line 3
+#: rc.cpp:692
+#, fuzzy
+msgid ""
+"_: Language\n"
+"QMake"
+msgstr "SQL"
+
+#. i18n: file data/qml.xml line 4
+#: rc.cpp:696
+#, fuzzy
+msgid ""
+"_: Language\n"
+"QML"
+msgstr "SQL"
+
+#. i18n: file data/r.xml line 10
+#: rc.cpp:700
 msgid ""
 "_: Language\n"
 "R Script"
 msgstr ""
 
+#. i18n: file data/rapidq.xml line 3
+#: rc.cpp:704
+#, fuzzy
+msgid ""
+"_: Language\n"
+"RapidQ"
+msgstr "Ebost"
+
+#. i18n: file data/relaxngcompact.xml line 3
+#: rc.cpp:708
+#, fuzzy
+msgid ""
+"_: Language\n"
+"RelaxNG-Compact"
+msgstr "JavaScript"
+
+#. i18n: file data/replicode.xml line 14
+#: rc.cpp:712
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Replicode"
+msgstr "cynnydd"
+
+#. i18n: file data/rest.xml line 14
+#: rc.cpp:716
+#, fuzzy
+msgid ""
+"_: Language\n"
+"reStructuredText"
+msgstr "Cynllun"
+
+#. i18n: file data/restructuredtext.xml line 3
+#: rc.cpp:720
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Restructured Text"
+msgstr "Cynllun"
+
 #. i18n: file data/rexx.xml line 3
-#: rc.cpp:408
+#: rc.cpp:724
 msgid ""
 "_: Language\n"
 "REXX"
 msgstr ""
 
 #. i18n: file data/rhtml.xml line 47
-#: rc.cpp:412
+#: rc.cpp:728
 msgid ""
 "_: Language\n"
 "Ruby/Rails/RHTML"
 msgstr ""
 
 #. i18n: file data/rib.xml line 8
-#: rc.cpp:416
+#: rc.cpp:732
 msgid ""
 "_: Language\n"
 "RenderMan RIB"
 msgstr ""
 
-#. i18n: file data/rpmspec.xml line 3
-#: rc.cpp:420
+#. i18n: file data/roff.xml line 10
+#: rc.cpp:736
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Roff"
+msgstr "Diff"
+
+#. i18n: file data/rpmspec.xml line 11
+#: rc.cpp:740
 msgid ""
 "_: Language\n"
 "RPM Spec"
 msgstr ""
 
 #. i18n: file data/rsiidl.xml line 3
-#: rc.cpp:424
+#: rc.cpp:744
 msgid ""
 "_: Language\n"
 "RSI IDL"
 msgstr ""
 
+#. i18n: file data/rtf.xml line 3
+#: rc.cpp:748
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Rich Text Format"
+msgstr "Cynllun"
+
 #. i18n: file data/ruby.xml line 33
-#: rc.cpp:428
+#: rc.cpp:752
 msgid ""
 "_: Language\n"
 "Ruby"
 msgstr ""
 
 #. i18n: file data/sather.xml line 3
-#: rc.cpp:432
+#: rc.cpp:756
 msgid ""
 "_: Language\n"
 "Sather"
 msgstr ""
 
+#. i18n: file data/scala.xml line 3
+#: rc.cpp:760
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Scala"
+msgstr "Java"
+
 #. i18n: file data/scheme.xml line 43
-#: rc.cpp:436
+#: rc.cpp:764
 msgid ""
 "_: Language\n"
 "Scheme"
 msgstr "Cynllun"
 
 #. i18n: file data/sci.xml line 3
-#: rc.cpp:440
+#: rc.cpp:768
 msgid ""
 "_: Language\n"
 "scilab"
 msgstr ""
 
+#. i18n: file data/scss.xml line 28
+#: rc.cpp:772
+#, fuzzy
+msgid ""
+"_: Language\n"
+"SCSS"
+msgstr "C"
+
+#. i18n: file data/sed.xml line 3
+#: rc.cpp:776
+#, fuzzy
+msgid ""
+"_: Language\n"
+"sed"
+msgstr "C"
+
 #. i18n: file data/sgml.xml line 3
-#: rc.cpp:444
+#: rc.cpp:780
 msgid ""
 "_: Language\n"
 "SGML"
 msgstr ""
 
 #. i18n: file data/sieve.xml line 4
-#: rc.cpp:448
+#: rc.cpp:784
 msgid ""
 "_: Language\n"
 "Sieve"
 msgstr ""
 
+#. i18n: file data/sisu.xml line 3
+#: rc.cpp:788
+#, fuzzy
+msgid ""
+"_: Language\n"
+"SiSU"
+msgstr "SQL"
+
 #. i18n: file data/sml.xml line 3
-#: rc.cpp:452
+#: rc.cpp:792
 msgid ""
 "_: Language\n"
 "SML"
 msgstr ""
 
 #. i18n: file data/spice.xml line 4
-#: rc.cpp:456
+#: rc.cpp:796
 msgid ""
 "_: Language\n"
 "Spice"
 msgstr ""
 
 #. i18n: file data/sql-mysql.xml line 8
-#: rc.cpp:460
+#: rc.cpp:800
 msgid ""
 "_: Language\n"
 "SQL (MySQL)"
 msgstr ""
 
 #. i18n: file data/sql-postgresql.xml line 4
-#: rc.cpp:464
+#: rc.cpp:804
 msgid ""
 "_: Language\n"
 "SQL (PostgreSQL)"
 msgstr ""
 
 #. i18n: file data/sql.xml line 6
-#: rc.cpp:468
+#: rc.cpp:808
 msgid ""
 "_: Language\n"
 "SQL"
 msgstr "SQL"
 
 #. i18n: file data/stata.xml line 3
-#: rc.cpp:472
+#: rc.cpp:812
 msgid ""
 "_: Language\n"
 "Stata"
 msgstr ""
 
-#. i18n: file data/tcl.xml line 8
-#: rc.cpp:476
+#. i18n: file data/systemc.xml line 10
+#: rc.cpp:816
+#, fuzzy
 msgid ""
 "_: Language\n"
-"Tcl/Tk"
-msgstr ""
+"SystemC"
+msgstr "C"
 
-#. i18n: file data/tibasic.xml line 3
-#: rc.cpp:480
+#. i18n: file data/systemverilog.xml line 42
+#: rc.cpp:820
+#, fuzzy
 msgid ""
 "_: Language\n"
-"TI Basic"
-msgstr ""
+"SystemVerilog"
+msgstr "Cynllun"
 
-#. i18n: file data/txt2tags.xml line 5
-#: rc.cpp:484
+#. i18n: file data/tads3.xml line 5
+#: rc.cpp:824
+#, fuzzy
 msgid ""
 "_: Language\n"
-"txt2tags"
-msgstr ""
+"TADS 3"
+msgstr "D"
 
-#. i18n: file data/uscript.xml line 3
-#: rc.cpp:488
+#. i18n: file data/tcl.xml line 31
+#: rc.cpp:828
 msgid ""
 "_: Language\n"
-"UnrealScript"
+"Tcl/Tk"
 msgstr ""
 
-#. i18n: file data/velocity.xml line 3
-#: rc.cpp:492
+#. i18n: file data/tcsh.xml line 11
+#: rc.cpp:832
+#, fuzzy
 msgid ""
 "_: Language\n"
-"Velocity"
-msgstr ""
+"Tcsh"
+msgstr "C"
 
-#. i18n: file data/verilog.xml line 3
-#: rc.cpp:496
+#. i18n: file data/texinfo.xml line 3
+#: rc.cpp:836
+#, fuzzy
 msgid ""
 "_: Language\n"
-"Verilog"
-msgstr ""
+"Texinfo"
+msgstr "Diff"
 
-#. i18n: file data/vhdl.xml line 3
-#: rc.cpp:500
+#. i18n: file data/textile.xml line 18
+#: rc.cpp:840
+#, fuzzy
 msgid ""
 "_: Language\n"
-"VHDL"
-msgstr ""
+"Textile"
+msgstr "Ebost"
 
-#. i18n: file data/vrml.xml line 3
-#: rc.cpp:504
+#. i18n: file data/tibasic.xml line 3
+#: rc.cpp:844
 msgid ""
 "_: Language\n"
-"VRML"
+"TI Basic"
 msgstr ""
 
-#. i18n: file data/winehq.xml line 3
-#: rc.cpp:508
+#. i18n: file data/txt2tags.xml line 6
+#: rc.cpp:848
 msgid ""
 "_: Language\n"
-"WINE Config"
+"txt2tags"
 msgstr ""
 
-#. i18n: file data/xharbour.xml line 3
-#: rc.cpp:512
+#. i18n: file data/uscript.xml line 3
+#: rc.cpp:852
 msgid ""
 "_: Language\n"
-"xHarbour"
+"UnrealScript"
 msgstr ""
 
-#. i18n: file data/xml.xml line 7
-#: rc.cpp:516
+#. i18n: file data/valgrind-suppression.xml line 3
+#: rc.cpp:856
+#, fuzzy
 msgid ""
 "_: Language\n"
-"XML"
-msgstr "XML"
+"Valgrind Suppression"
+msgstr "cynnydd"
 
-#. i18n: file data/xmldebug.xml line 3
-#: rc.cpp:520
+#. i18n: file data/varnish.xml line 3
+#: rc.cpp:860
+#, fuzzy
 msgid ""
 "_: Language\n"
-"XML (Debug)"
-msgstr ""
+"Varnish Configuration Language"
+msgstr "Ffurfwedd"
 
-#. i18n: file data/xslt.xml line 53
-#: rc.cpp:524
+#. i18n: file data/varnishtest.xml line 3
+#: rc.cpp:864
 msgid ""
 "_: Language\n"
-"xslt"
+"Varnish Test Case language"
 msgstr ""
 
-#. i18n: file data/yacas.xml line 3
-#: rc.cpp:528
+#. i18n: file data/vcard.xml line 5
+#: rc.cpp:868
 msgid ""
 "_: Language\n"
-"yacas"
+"vCard, vCalendar, iCalendar"
 msgstr ""
 
-#. i18n: file data/yacc.xml line 23
-#: rc.cpp:532
+#. i18n: file data/velocity.xml line 3
+#: rc.cpp:872
 msgid ""
 "_: Language\n"
-"Yacc/Bison"
-msgstr ""
-
-#: plugins/wordcompletion/docwordcompletion.cpp:109
-msgid "Word Completion Plugin"
-msgstr ""
-
-#: plugins/wordcompletion/docwordcompletion.cpp:114
-msgid "Configure the Word Completion Plugin"
-msgstr ""
-
-#: plugins/wordcompletion/docwordcompletion.cpp:148
-msgid "Reuse Word Above"
-msgstr ""
-
-#: plugins/wordcompletion/docwordcompletion.cpp:150
-msgid "Reuse Word Below"
-msgstr ""
-
-#: plugins/wordcompletion/docwordcompletion.cpp:152
-msgid "Pop Up Completion List"
-msgstr ""
-
-#: plugins/wordcompletion/docwordcompletion.cpp:154
-msgid "Shell Completion"
-msgstr ""
-
-#: plugins/wordcompletion/docwordcompletion.cpp:156
-msgid "Automatic Completion Popup"
-msgstr ""
-
-#: plugins/wordcompletion/docwordcompletion.cpp:498
-msgid "Automatically &show completion list"
+"Velocity"
 msgstr ""
 
-#: plugins/wordcompletion/docwordcompletion.cpp:511
+#. i18n: file data/vera.xml line 42
+#: rc.cpp:876
+#, fuzzy
 msgid ""
-"_: Translators: This is the first part of two strings wich will comprise the "
-"sentence 'Show completions when a word is at least N characters'. The first "
-"part is on the right side of the N, which is represented by a spinbox widget, "
-"followed by the second part: 'characters long'. Characters is a ingeger number "
-"between and including 1 and 30. Feel free to leave the second part of the "
-"sentence blank if it suits your language better. \n"
-"Show completions &when a word is at least"
-msgstr ""
+"_: Language\n"
+"Vera"
+msgstr "C"
 
-#: plugins/wordcompletion/docwordcompletion.cpp:517
+#. i18n: file data/verilog.xml line 3
+#: rc.cpp:880
 msgid ""
-"_: This is the second part of two strings that will comprise teh sentence 'Show "
-"completions when a word is at least N characters'\n"
-"characters long."
+"_: Language\n"
+"Verilog"
 msgstr ""
 
-#: plugins/wordcompletion/docwordcompletion.cpp:520
+#. i18n: file data/vhdl.xml line 14
+#: rc.cpp:884
 msgid ""
-"Enable the automatic completion list popup as default. The popup can be "
-"disabled on a view basis from the 'Tools' menu."
+"_: Language\n"
+"VHDL"
 msgstr ""
 
-#: plugins/wordcompletion/docwordcompletion.cpp:523
+#. i18n: file data/vrml.xml line 3
+#: rc.cpp:888
 msgid ""
-"Define the length a word should have before the completion list is displayed."
+"_: Language\n"
+"VRML"
 msgstr ""
 
-#: plugins/insertfile/insertfileplugin.cpp:79
-msgid "Insert File..."
-msgstr "Mewnosod Ffeil ..."
-
-#: plugins/insertfile/insertfileplugin.cpp:88
-msgid "Choose File to Insert"
-msgstr "Dewis Ffeil i'w Fewnosod"
-
-#: plugins/insertfile/insertfileplugin.cpp:116
+#. i18n: file data/winehq.xml line 3
+#: rc.cpp:892
 msgid ""
-"Failed to load file:\n"
-"\n"
+"_: Language\n"
+"WINE Config"
 msgstr ""
-"Methwyd llwytho ffeil:\n"
-" \n"
 
-#: plugins/insertfile/insertfileplugin.cpp:116
-#: plugins/insertfile/insertfileplugin.cpp:137
-#: plugins/insertfile/insertfileplugin.cpp:159
-msgid "Insert File Error"
-msgstr "Gwall Mewnosod Ffeil"
-
-#: plugins/insertfile/insertfileplugin.cpp:130
+#. i18n: file data/wml.xml line 57
+#: rc.cpp:896
 msgid ""
-"<p>The file <strong>%1</strong> does not exist or is not readable, aborting."
+"_: Language\n"
+"Wesnoth Markup Language"
 msgstr ""
-"<p>The file <strong>%1</strong> does not exist or is not readable, aborting."
-
-#: plugins/insertfile/insertfileplugin.cpp:134
-msgid "<p>Unable to open file <strong>%1</strong>, aborting."
-msgstr "<p>Methu agor ffeil <strong>%1</strong> - yn erthylu."
-
-#: plugins/insertfile/insertfileplugin.cpp:157
-msgid "<p>File <strong>%1</strong> had no contents."
-msgstr "<p>Doedd gan y ffeil <strong>%1</strong> ddim cynnwys."
 
-#: plugins/kdatatool/kate_kdatatool.cpp:78
-msgid "Data Tools"
-msgstr "Offer data"
-
-#: plugins/kdatatool/kate_kdatatool.cpp:153
-#: plugins/kdatatool/kate_kdatatool.cpp:175
-msgid "(not available)"
-msgstr "(dim ar gael)"
-
-#: plugins/kdatatool/kate_kdatatool.cpp:183
+#. i18n: file data/xharbour.xml line 3
+#: rc.cpp:900
 msgid ""
-"Data tools are only available when text is selected, or when the right mouse "
-"button is clicked over a word. If no data tools are offered even when text is "
-"selected, you need to install them. Some data tools are part of the KOffice "
-"package."
+"_: Language\n"
+"xHarbour"
 msgstr ""
-"Mae offer data ar gael 'mond pan mae testun wedi'i ddewis, neu pan y glicir "
-"botwm de y llygoden dros air.  Os na cynnigir offer data hyd yn oed pan y "
-"ddewisir testun, mae angen eu gosod. Mae rhai o'r offer data yn rhan o'r pecyn "
-"KOffice. "
-
-#: plugins/isearch/ISearchPlugin.cpp:68 plugins/isearch/ISearchPlugin.cpp:371
-msgid "Search Incrementally"
-msgstr "Chwilio yn Gynyddol"
-
-#: plugins/isearch/ISearchPlugin.cpp:72 plugins/isearch/ISearchPlugin.cpp:372
-msgid "Search Incrementally Backwards"
-msgstr "Chwilio yn Ôl yn Gynyddol"
-
-#: plugins/isearch/ISearchPlugin.cpp:76 plugins/isearch/ISearchPlugin.cpp:79
-msgid "I-Search:"
-msgstr "Chwilio Cynyddol:"
-
-#: plugins/isearch/ISearchPlugin.cpp:95
-msgid "Search"
-msgstr "Chwilio"
-
-#: plugins/isearch/ISearchPlugin.cpp:101
-msgid "Search Options"
-msgstr "Dewisiadau Chwilio"
 
-#: plugins/isearch/ISearchPlugin.cpp:106 plugins/isearch/ISearchPlugin.cpp:412
-msgid "Case Sensitive"
-msgstr "Mae llythrennau mawr/bach o bwys"
-
-#: plugins/isearch/ISearchPlugin.cpp:115 plugins/isearch/ISearchPlugin.cpp:414
-msgid "From Beginning"
-msgstr "O'r Dechrau"
-
-#: plugins/isearch/ISearchPlugin.cpp:124 plugins/isearch/ISearchPlugin.cpp:416
-msgid "Regular Expression"
-msgstr "Mynegiad Rheolaidd"
-
-#: plugins/isearch/ISearchPlugin.cpp:244
-msgid ""
-"_: Incremental Search\n"
-"I-Search:"
-msgstr "Chwiliad Cynyddol:"
-
-#: plugins/isearch/ISearchPlugin.cpp:247
+#. i18n: file data/xml.xml line 9
+#: rc.cpp:904
 msgid ""
-"_: Incremental Search found no match\n"
-"Failing I-Search:"
-msgstr "Methodd y chwiliad cynyddol ganfod cydweddiad: "
-
-#: plugins/isearch/ISearchPlugin.cpp:250
-msgid ""
-"_: Incremental Search in the reverse direction\n"
-"I-Search Backward:"
-msgstr "Chwiliad cynyddol i'r cyfeiriad arall:"
-
-#: plugins/isearch/ISearchPlugin.cpp:253
-msgid "Failing I-Search Backward:"
-msgstr "Methodd y chwiliad cynyddol ganfod cydweddiad yn y cyfeiriad arall:"
-
-#: plugins/isearch/ISearchPlugin.cpp:256
-msgid ""
-"_: Incremental Search has passed the end of the document\n"
-"Wrapped I-Search:"
-msgstr "Mae'r chwiliad cynyddol wedi pasio diwedd y ddogfen:"
-
-#: plugins/isearch/ISearchPlugin.cpp:259
-msgid "Failing Wrapped I-Search:"
-msgstr ""
-"Methodd y chwiliad cynyddol ganfod cydweddiad ar ôl pasio diwedd y ddogfen"
-
-#: plugins/isearch/ISearchPlugin.cpp:262
-msgid "Wrapped I-Search Backward:"
-msgstr "Chwiliad cynyddol i'r cyfeiriad arall, sy'n pasio'r safle dechrau:"
-
-#: plugins/isearch/ISearchPlugin.cpp:265
-msgid "Failing Wrapped I-Search Backward:"
-msgstr ""
-"Methodd y chwiliad cynyddol ganfod cydweddiad ar ôl pasio'r safle dechrau, wrth "
-"fynd yn y cyfeiriad arall:"
+"_: Language\n"
+"XML"
+msgstr "XML"
 
-#: plugins/isearch/ISearchPlugin.cpp:269
+#. i18n: file data/xmldebug.xml line 3
+#: rc.cpp:908
 msgid ""
-"_: Incremental Search has passed both the end of the document and the original "
-"starting position\n"
-"Overwrapped I-Search:"
-msgstr "Overwrapped I-Search:"
-
-#: plugins/isearch/ISearchPlugin.cpp:272
-msgid "Failing Overwrapped I-Search:"
-msgstr ""
-"Methodd y chwiliad cynyddol ganfod cydweddiad ar ôl pasio diwedd y ddogfen ac "
-"hefyd y safle dechrau:"
-
-#: plugins/isearch/ISearchPlugin.cpp:275
-msgid "Overwrapped I-Search Backwards:"
-msgstr ""
-"Mae'r chwiliad cynyddol wedi pasio diwedd y ddogfen ac hefyd y safle dechrau, "
-"wrth fynd yn y cyfeiriad arall:"
-
-#: plugins/isearch/ISearchPlugin.cpp:278
-msgid "Failing Overwrapped I-Search Backward:"
+"_: Language\n"
+"XML (Debug)"
 msgstr ""
-"Methodd y chwiliad cynyddol ganfod cydweddiad ar ôl pasio diwedd y ddogfen ac "
-"hefyd y safle dechrau, wrth fynd yn y cyfeiriad arall:"
-
-#: plugins/isearch/ISearchPlugin.cpp:280
-msgid "Error: unknown i-search state!"
-msgstr "Gwall: cyflwr anhysbys i'r chwiliad cynyddol!"
-
-#: plugins/isearch/ISearchPlugin.cpp:341
-msgid "Next Incremental Search Match"
-msgstr "Cydweddiad Nesaf o'r Chwiliad Cynyddol"
-
-#: plugins/isearch/ISearchPlugin.cpp:342
-msgid "Previous Incremental Search Match"
-msgstr "Cydweddiad Cynt o'r Chwiliad Cynyddol"
 
-#: plugins/autobookmarker/autobookmarker.cpp:90
+#. i18n: file data/xorg.xml line 3
+#: rc.cpp:912
 #, fuzzy
-msgid "AutoBookmarks"
-msgstr "Nod Tudalen"
-
-#: plugins/autobookmarker/autobookmarker.cpp:101
-msgid "Configure AutoBookmarks"
-msgstr ""
-
-#: plugins/autobookmarker/autobookmarker.cpp:280
-msgid "Edit Entry"
-msgstr "Golygu cofnod ..."
-
-#: plugins/autobookmarker/autobookmarker.cpp:288
-msgid "&Pattern:"
-msgstr "&Patrwm:"
-
-#: plugins/autobookmarker/autobookmarker.cpp:294
-msgid "<p>A regular expression. Matching lines will be bookmarked.</p>"
-msgstr ""
-
-#: plugins/autobookmarker/autobookmarker.cpp:298
-msgid "Case &sensitive"
-msgstr "Mae llythrennau bras o &bwys"
-
-#: plugins/autobookmarker/autobookmarker.cpp:302
 msgid ""
-"<p>If enabled, the pattern matching will be case sensitive, otherwise not.</p>"
-msgstr ""
-
-#: plugins/autobookmarker/autobookmarker.cpp:305
-msgid "&Minimal matching"
-msgstr ""
+"_: Language\n"
+"x.org Configuration"
+msgstr "Ffurfwedd"
 
-#: plugins/autobookmarker/autobookmarker.cpp:309
+#. i18n: file data/xslt.xml line 55
+#: rc.cpp:916
 msgid ""
-"<p>If enabled, the pattern matching will use minimal matching; if you do not "
-"know what that is, please read the appendix on regular expressions in the kate "
-"manual.</p>"
+"_: Language\n"
+"xslt"
 msgstr ""
 
-#: plugins/autobookmarker/autobookmarker.cpp:313
+#. i18n: file data/xul.xml line 7
+#: rc.cpp:920
 #, fuzzy
-msgid "&File mask:"
-msgstr "Fformat Ffeil"
-
-#: plugins/autobookmarker/autobookmarker.cpp:319
 msgid ""
-"<p>A list of filename masks, separated by semicolons. This can be used to limit "
-"the usage of this entity to files with matching names.</p>"
-"<p>Use the wizard button to the right of the mimetype entry below to easily "
-"fill out both lists.</p>"
-msgstr ""
+"_: Language\n"
+"XUL"
+msgstr "XML"
 
-#: plugins/autobookmarker/autobookmarker.cpp:330
+#. i18n: file data/yacas.xml line 3
+#: rc.cpp:924
 msgid ""
-"<p>A list of mime types, separated by semicolon. This can be used to limit the "
-"usage of this entity to files with matching mime types.</p>"
-"<p>Use the wizard button on the right to get a list of existing file types to "
-"choose from, using it will fill in the file masks as well.</p>"
+"_: Language\n"
+"yacas"
 msgstr ""
 
-#: plugins/autobookmarker/autobookmarker.cpp:340
+#. i18n: file data/yacc.xml line 28
+#: rc.cpp:928
 msgid ""
-"<p>Click this button to display a checkable list of mimetypes available on your "
-"system. When used, the file masks entry above will be filled in with the "
-"corresponding masks.</p>"
+"_: Language\n"
+"Yacc/Bison"
 msgstr ""
 
-#: plugins/autobookmarker/autobookmarker.cpp:365
+#. i18n: file data/yaml.xml line 4
+#: rc.cpp:932
+#, fuzzy
 msgid ""
-"Select the MimeTypes for this pattern.\n"
-"Please note that this will automatically edit the associated file extensions as "
-"well."
-msgstr ""
-
-#: plugins/autobookmarker/autobookmarker.cpp:385
-msgid "&Patterns"
-msgstr "&Patrymau"
-
-#: plugins/autobookmarker/autobookmarker.cpp:388
-msgid "Pattern"
-msgstr "Patrwm"
-
-#: plugins/autobookmarker/autobookmarker.cpp:389
-msgid "Mime Types"
-msgstr ""
-
-#: plugins/autobookmarker/autobookmarker.cpp:390
-msgid "File Masks"
-msgstr ""
+"_: Language\n"
+"YAML"
+msgstr "XML"
 
-#: plugins/autobookmarker/autobookmarker.cpp:394
+#. i18n: file data/zonnon.xml line 3
+#: rc.cpp:936
+#, fuzzy
 msgid ""
-"<p>This list shows your configured autobookmark entities. When a document is "
-"opened, each entity is used in the following way: "
-"<ol>"
-"<li>The entity is dismissed, if a mime and/or filename mask is defined, and "
-"neither matches the document.</li>"
-"<li>Otherwise each line of the document is tried against the pattern, and a "
-"bookmark is set on matching lines.</li></ul>"
-"<p>Use the buttons below to manage your collection of entities.</p>"
-msgstr ""
-
-#: plugins/autobookmarker/autobookmarker.cpp:409
-msgid "Press this button to create a new autobookmark entity."
-msgstr ""
-
-#: plugins/autobookmarker/autobookmarker.cpp:414
-msgid "Press this button to delete the currently selected entity."
-msgstr ""
-
-#: plugins/autobookmarker/autobookmarker.cpp:416
-msgid "&Edit..."
-msgstr "&Golygu..."
+"_: Language\n"
+"Zonnon"
+msgstr "Python"
 
-#: plugins/autobookmarker/autobookmarker.cpp:419
-msgid "Press this button to edit the currently selected entity."
-msgstr ""
+#. i18n: file data/zsh.xml line 11
+#: rc.cpp:940
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Zsh"
+msgstr "C"
 
 #, fuzzy
 #~ msgid "&Bookmarks"
diff --git a/tde-i18n-cy/messages/tdelibs/kmcop.po b/tde-i18n-cy/messages/tdelibs/kmcop.po
index 28774c11110..70aef9f9b38 100644
--- a/tde-i18n-cy/messages/tdelibs/kmcop.po
+++ b/tde-i18n-cy/messages/tdelibs/kmcop.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmcop\n"
-"POT-Creation-Date: 2005-05-18 21:23+0200\n"
+"POT-Creation-Date: 2014-09-29 00:46-0500\n"
 "PO-Revision-Date: 2003-07-16 20:32+0100\n"
 "Last-Translator: KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdelibs/knotify.po b/tde-i18n-cy/messages/tdelibs/knotify.po
index 0d6602108c7..7950cdc3e1e 100644
--- a/tde-i18n-cy/messages/tdelibs/knotify.po
+++ b/tde-i18n-cy/messages/tdelibs/knotify.po
@@ -10,36 +10,37 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: knotify\n"
-"POT-Creation-Date: 2007-01-27 02:36+0100\n"
+"POT-Creation-Date: 2014-09-29 00:46-0500\n"
 "PO-Revision-Date: 2003-11-13 11:17+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.2\n"
 
-#: knotify.cpp:108
+#: knotify.cpp:106
 msgid "KNotify"
 msgstr "KHysbysu"
 
-#: knotify.cpp:109
+#: knotify.cpp:107
 msgid "TDE Notification Server"
 msgstr "Gweinydd Hysbysiad TDE"
 
-#: knotify.cpp:111
+#: knotify.cpp:109
 msgid "Current Maintainer"
 msgstr "Cynhaliwr Cyfredol"
 
-#: knotify.cpp:113
+#: knotify.cpp:111
 msgid "Sound support"
 msgstr "Cymorth sŵn"
 
-#: knotify.cpp:114
+#: knotify.cpp:112
 msgid "Previous Maintainer"
 msgstr "Cynhaliwr Cynt"
 
-#: knotify.cpp:151
+#: knotify.cpp:148
 #, fuzzy
 msgid ""
 "During the previous startup, KNotify crashed while creating Arts::Dispatcher. "
@@ -51,19 +52,19 @@ msgstr ""
 "Wrth gychwyn yn gynt, chwalodd KHysbysu wrth greu Arts::Anfonwr.  Ydych eisiau "
 "ail-geisio neu anablu allbwn sŵn aRts?"
 
-#: knotify.cpp:157 knotify.cpp:196
+#: knotify.cpp:154 knotify.cpp:190
 msgid "KNotify Problem"
 msgstr "Problem efo KNotify"
 
-#: knotify.cpp:158 knotify.cpp:197
+#: knotify.cpp:155 knotify.cpp:191
 msgid "&Try Again"
 msgstr "&Ceisiwch Eto"
 
-#: knotify.cpp:159 knotify.cpp:198
+#: knotify.cpp:156 knotify.cpp:192
 msgid "D&isable aRts Output"
 msgstr "A&nablu  Allbwn aRts"
 
-#: knotify.cpp:190
+#: knotify.cpp:184
 #, fuzzy
 msgid ""
 "During the previous startup, KNotify crashed while instantiating KNotify. Do "
@@ -75,16 +76,17 @@ msgstr ""
 "Wrth gychwyn yn gynt, chwalodd KHysbysu wrth enghreifftio KHysbysu.  Ydych "
 "eisiau ail-geisio neu anablu allbwn sŵn aRts?"
 
-#: knotify.cpp:573
+#: knotify.cpp:574
 msgid "Notification"
 msgstr "Hysbysiad"
 
-#: knotify.cpp:582
+#: knotify.cpp:583
 msgid "Catastrophe!"
 msgstr "Trychineb!"
 
-#: knotify.cpp:788
-msgid "TDE System Notifications"
+#: knotify.cpp:791
+#, fuzzy
+msgid "Trinity System Notifications"
 msgstr "Hysbysiadiau Cysawd TDE"
 
 #: _translatorinfo.cpp:1
diff --git a/tde-i18n-cy/messages/tdelibs/libtdescreensaver.po b/tde-i18n-cy/messages/tdelibs/libtdescreensaver.po
index ab3ef84a5b9..bdd4082ec28 100644
--- a/tde-i18n-cy/messages/tdelibs/libtdescreensaver.po
+++ b/tde-i18n-cy/messages/tdelibs/libtdescreensaver.po
@@ -6,30 +6,31 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdelibs/libkscreensaver.po\n"
-"POT-Creation-Date: 2005-05-18 21:23+0200\n"
+"POT-Creation-Date: 2014-09-29 00:46-0500\n"
 "PO-Revision-Date: 2003-05-08 21:25+0000\n"
 "Last-Translator: KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: main.cpp:48
+#: main.cpp:50
 #, fuzzy
 msgid "Setup screen saver"
 msgstr "Ffurfweddu diogelydd-sgrîn."
 
-#: main.cpp:49
+#: main.cpp:51
 #, fuzzy
 msgid "Run in the specified XWindow"
 msgstr "Rhedeg yn y ffenest X penodol."
 
-#: main.cpp:50
+#: main.cpp:52
 #, fuzzy
 msgid "Run in the root XWindow"
 msgstr "Rhedeg y ffenest X gwreiddyn."
 
-#: main.cpp:51
+#: main.cpp:53
 msgid "Start screen saver in demo mode"
 msgstr "Dechrau diogelydd-sgrîn mewn modd arddangos."
diff --git a/tde-i18n-cy/messages/tdelibs/tdeabc_dir.po b/tde-i18n-cy/messages/tdelibs/tdeabc_dir.po
index a81957a8b43..1e34b893c94 100644
--- a/tde-i18n-cy/messages/tdelibs/tdeabc_dir.po
+++ b/tde-i18n-cy/messages/tdelibs/tdeabc_dir.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeabc_dir\n"
-"POT-Creation-Date: 2005-05-18 21:23+0200\n"
+"POT-Creation-Date: 2014-09-29 00:46-0500\n"
 "PO-Revision-Date: 2003-11-12 14:05+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdelibs/tdeabc_file.po b/tde-i18n-cy/messages/tdelibs/tdeabc_file.po
index dfad4770b22..12bc6b8d024 100644
--- a/tde-i18n-cy/messages/tdelibs/tdeabc_file.po
+++ b/tde-i18n-cy/messages/tdelibs/tdeabc_file.po
@@ -10,10 +10,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeabc_file\n"
-"POT-Creation-Date: 2006-06-20 03:54+0200\n"
+"POT-Creation-Date: 2014-09-29 00:46-0500\n"
 "PO-Revision-Date: 2003-11-12 14:09+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdelibs/tdeabc_ldaptdeio.po b/tde-i18n-cy/messages/tdelibs/tdeabc_ldaptdeio.po
index 32ae988507b..72ab938947d 100644
--- a/tde-i18n-cy/messages/tdelibs/tdeabc_ldaptdeio.po
+++ b/tde-i18n-cy/messages/tdelibs/tdeabc_ldaptdeio.po
@@ -5,184 +5,185 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeabc_ldapkio\n"
-"POT-Creation-Date: 2005-05-18 21:23+0200\n"
+"POT-Creation-Date: 2014-09-29 00:46-0500\n"
 "PO-Revision-Date: 2003-11-20 20:07+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.2\n"
 
-#: resourceldapkioconfig.cpp:55
+#: resourceldaptdeioconfig.cpp:55
 msgid "Sub-tree query"
 msgstr ""
 
-#: resourceldapkioconfig.cpp:58
+#: resourceldaptdeioconfig.cpp:58
 msgid "Edit Attributes..."
 msgstr "Golygu Priodweddau..."
 
-#: resourceldapkioconfig.cpp:59
+#: resourceldaptdeioconfig.cpp:59
 msgid "Offline Use..."
 msgstr ""
 
-#: resourceldapkioconfig.cpp:171
+#: resourceldaptdeioconfig.cpp:171
 msgid "Attributes Configuration"
 msgstr "Ffurfweddu Priodweddau"
 
-#: resourceldapkioconfig.cpp:175
+#: resourceldaptdeioconfig.cpp:175
 msgid "Object classes"
 msgstr ""
 
-#: resourceldapkioconfig.cpp:176
+#: resourceldaptdeioconfig.cpp:176
 msgid "Common name"
 msgstr "Enw cyffredinol"
 
-#: resourceldapkioconfig.cpp:177
+#: resourceldaptdeioconfig.cpp:177
 msgid "Formatted name"
 msgstr "Enw wedi'i fformatio"
 
-#: resourceldapkioconfig.cpp:178
+#: resourceldaptdeioconfig.cpp:178
 msgid "Family name"
 msgstr "Enw teuluol"
 
-#: resourceldapkioconfig.cpp:179
+#: resourceldaptdeioconfig.cpp:179
 msgid "Given name"
 msgstr "Enw cyntaf"
 
-#: resourceldapkioconfig.cpp:180
+#: resourceldaptdeioconfig.cpp:180
 msgid "Organization"
 msgstr "Sefydliad"
 
-#: resourceldapkioconfig.cpp:181
+#: resourceldaptdeioconfig.cpp:181
 msgid "Title"
 msgstr "Teitl"
 
-#: resourceldapkioconfig.cpp:182
+#: resourceldaptdeioconfig.cpp:182
 msgid "Street"
 msgstr "Stryd"
 
-#: resourceldapkioconfig.cpp:183
+#: resourceldaptdeioconfig.cpp:183
 msgid "State"
 msgstr "Cyflwr"
 
-#: resourceldapkioconfig.cpp:184
+#: resourceldaptdeioconfig.cpp:184
 msgid "City"
 msgstr "Dinas"
 
-#: resourceldapkioconfig.cpp:185
+#: resourceldaptdeioconfig.cpp:185
 msgid "Postal code"
 msgstr "Côd post"
 
-#: resourceldapkioconfig.cpp:186
+#: resourceldaptdeioconfig.cpp:186
 msgid "Email"
 msgstr "Ebost"
 
-#: resourceldapkioconfig.cpp:187
+#: resourceldaptdeioconfig.cpp:187
 msgid "Email alias"
 msgstr "Ffugenw ebost"
 
-#: resourceldapkioconfig.cpp:188
+#: resourceldaptdeioconfig.cpp:188
 msgid "Telephone number"
 msgstr "Rhif teleffôn"
 
-#: resourceldapkioconfig.cpp:189
+#: resourceldaptdeioconfig.cpp:189
 #, fuzzy
 msgid "Work telephone number"
 msgstr "Rhif teleffôn"
 
-#: resourceldapkioconfig.cpp:190
+#: resourceldaptdeioconfig.cpp:190
 msgid "Fax number"
 msgstr "Rhif Ffacs"
 
-#: resourceldapkioconfig.cpp:191
+#: resourceldaptdeioconfig.cpp:191
 #, fuzzy
 msgid "Cell phone number"
 msgstr "Rhif teleffôn"
 
-#: resourceldapkioconfig.cpp:192
+#: resourceldaptdeioconfig.cpp:192
 msgid "Pager"
 msgstr "Blîp"
 
-#: resourceldapkioconfig.cpp:193
+#: resourceldaptdeioconfig.cpp:193
 msgid "Note"
 msgstr "Noder"
 
-#: resourceldapkioconfig.cpp:194 resourceldapkioconfig.cpp:257
+#: resourceldaptdeioconfig.cpp:194 resourceldaptdeioconfig.cpp:257
 msgid "UID"
 msgstr "UID"
 
-#: resourceldapkioconfig.cpp:195
+#: resourceldaptdeioconfig.cpp:195
 msgid "Photo"
 msgstr "Ffoto"
 
-#: resourceldapkioconfig.cpp:240
+#: resourceldaptdeioconfig.cpp:240
 msgid "Template:"
 msgstr "Patrymlun:"
 
-#: resourceldapkioconfig.cpp:245
+#: resourceldaptdeioconfig.cpp:245
 msgid "User Defined"
 msgstr "Diffiniwyd gan y Defnyddiwr"
 
-#: resourceldapkioconfig.cpp:246
+#: resourceldaptdeioconfig.cpp:246
 msgid "Kolab"
 msgstr "Kolab"
 
-#: resourceldapkioconfig.cpp:247
+#: resourceldaptdeioconfig.cpp:247
 msgid "Netscape"
 msgstr "Netscape"
 
-#: resourceldapkioconfig.cpp:248
+#: resourceldaptdeioconfig.cpp:248
 msgid "Evolution"
 msgstr "Evolution"
 
-#: resourceldapkioconfig.cpp:249
+#: resourceldaptdeioconfig.cpp:249
 msgid "Outlook"
 msgstr "Outlook"
 
-#: resourceldapkioconfig.cpp:252
+#: resourceldaptdeioconfig.cpp:252
 msgid "RDN prefix attribute:"
 msgstr ""
 
-#: resourceldapkioconfig.cpp:256
+#: resourceldaptdeioconfig.cpp:256
 #, fuzzy
 msgid "commonName"
 msgstr "Enw cyffredinol"
 
-#: resourceldapkioconfig.cpp:337
+#: resourceldaptdeioconfig.cpp:337
 #, fuzzy
 msgid "Offline Configuration"
 msgstr "Ffurfweddu Priodweddau"
 
-#: resourceldapkioconfig.cpp:346
+#: resourceldaptdeioconfig.cpp:346
 msgid "Offline Cache Policy"
 msgstr ""
 
-#: resourceldapkioconfig.cpp:349
+#: resourceldaptdeioconfig.cpp:349
 msgid "Do not use offline cache"
 msgstr ""
 
-#: resourceldapkioconfig.cpp:350
+#: resourceldaptdeioconfig.cpp:350
 msgid "Use local copy if no connection"
 msgstr ""
 
-#: resourceldapkioconfig.cpp:351
+#: resourceldaptdeioconfig.cpp:351
 msgid "Always use local copy"
 msgstr ""
 
-#: resourceldapkioconfig.cpp:354
+#: resourceldaptdeioconfig.cpp:354
 msgid "Refresh offline cache automatically"
 msgstr ""
 
-#: resourceldapkioconfig.cpp:361
+#: resourceldaptdeioconfig.cpp:361
 msgid "Load into Cache"
 msgstr ""
 
-#: resourceldapkioconfig.cpp:383
+#: resourceldaptdeioconfig.cpp:383
 msgid "Successfully downloaded directory server contents!"
 msgstr ""
 
-#: resourceldapkioconfig.cpp:386
+#: resourceldaptdeioconfig.cpp:386
 #, c-format
 msgid "An error occurred downloading directory server contents into file %1."
 msgstr ""
diff --git a/tde-i18n-cy/messages/tdelibs/tdeabc_net.po b/tde-i18n-cy/messages/tdelibs/tdeabc_net.po
index 4858a5a4c1c..0facf2b9236 100644
--- a/tde-i18n-cy/messages/tdelibs/tdeabc_net.po
+++ b/tde-i18n-cy/messages/tdelibs/tdeabc_net.po
@@ -10,10 +10,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeabc_net\n"
-"POT-Creation-Date: 2007-03-05 02:37+0100\n"
+"POT-Creation-Date: 2014-09-29 00:46-0500\n"
 "PO-Revision-Date: 2003-11-12 14:10+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,25 +25,26 @@ msgstr ""
 msgid "Unable to download file '%1'."
 msgstr "Methu lawrlwytho ffeil '%1'."
 
-#: resourcenet.cpp:147 resourcenet.cpp:183 resourcenet.cpp:364
+#: resourcenet.cpp:147 resourcenet.cpp:184 resourcenet.cpp:367
 msgid "Unable to open file '%1'."
 msgstr "Methu agor ffeil '%1'."
 
-#: resourcenet.cpp:154 resourcenet.cpp:361
+#: resourcenet.cpp:154 resourcenet.cpp:364
 msgid "Problems during parsing file '%1'."
 msgstr "Problemau wrth ddosrannu ffeil '%1'."
 
-#: resourcenet.cpp:244 resourcenet.cpp:275
+#: resourcenet.cpp:246 resourcenet.cpp:278
 msgid "Unable to save file '%1'."
 msgstr "Methu cadw ffeil '%1'."
 
-#: resourcenet.cpp:250
+#: resourcenet.cpp:252
 #, fuzzy
 msgid "Unable to upload to '%1'."
 msgstr "Methu lawrlwytho ffeil '%1'."
 
-#: resourcenet.cpp:351
-msgid "Download failed in some way!"
+#: resourcenet.cpp:354
+#, fuzzy
+msgid "Download failed: Unable to create temporary file"
 msgstr "Methodd y lawrlwythiad mewn rhyw ffordd!"
 
 #: resourcenetconfig.cpp:42
diff --git a/tde-i18n-cy/messages/tdelibs/tdeabc_sql.po b/tde-i18n-cy/messages/tdelibs/tdeabc_sql.po
index 3f03d51dbf6..67764ed1b9d 100644
--- a/tde-i18n-cy/messages/tdelibs/tdeabc_sql.po
+++ b/tde-i18n-cy/messages/tdelibs/tdeabc_sql.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdelibs/tdeabc_sql.po\n"
-"POT-Creation-Date: 2005-05-18 21:23+0200\n"
+"POT-Creation-Date: 2014-09-29 00:46-0500\n"
 "PO-Revision-Date: 2003-05-08 21:18+0000\n"
 "Last-Translator: KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdelibs/tdeabcformat_binary.po b/tde-i18n-cy/messages/tdelibs/tdeabcformat_binary.po
index f65f4b31596..7989826c557 100644
--- a/tde-i18n-cy/messages/tdelibs/tdeabcformat_binary.po
+++ b/tde-i18n-cy/messages/tdelibs/tdeabcformat_binary.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeabcformat_binary\n"
-"POT-Creation-Date: 2005-05-18 21:23+0200\n"
+"POT-Creation-Date: 2014-09-29 00:46-0500\n"
 "PO-Revision-Date: 2003-07-16 18:24+0100\n"
 "Last-Translator: KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdelibs/tdecmshell.po b/tde-i18n-cy/messages/tdelibs/tdecmshell.po
index 422aadaa740..47807aa7a8d 100644
--- a/tde-i18n-cy/messages/tdelibs/tdecmshell.po
+++ b/tde-i18n-cy/messages/tdelibs/tdecmshell.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: all2.po\n"
-"POT-Creation-Date: 2006-08-13 04:02+0200\n"
+"POT-Creation-Date: 2014-09-29 00:46-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -54,7 +55,7 @@ msgid "A tool to start single TDE control modules"
 msgstr "Erfyn i gychwyn modiylau rheoli unigol TDE."
 
 #: main.cpp:205
-msgid "(c) 1999-2004, The TDE Developers"
+msgid "(c) 1999-2004, The KDE Developers"
 msgstr ""
 
 #: main.cpp:207
@@ -65,11 +66,11 @@ msgstr "Cynhaliwr"
 msgid "The following modules are available:"
 msgstr "Mae'r modiylau dilynnol ar gael:"
 
-#: main.cpp:247
+#: main.cpp:246
 msgid "No description available"
 msgstr "Dim disgrifiad ar gael"
 
-#: main.cpp:314
+#: main.cpp:321
 #, c-format
 msgid "Configure - %1"
 msgstr "Ffurfweddu - %1"
diff --git a/tde-i18n-cy/messages/tdelibs/tdefileaudiopreview.po b/tde-i18n-cy/messages/tdelibs/tdefileaudiopreview.po
index 3f5ad55e044..21c21bbcbe4 100644
--- a/tde-i18n-cy/messages/tdelibs/tdefileaudiopreview.po
+++ b/tde-i18n-cy/messages/tdelibs/tdefileaudiopreview.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefileaudiopreview\n"
-"POT-Creation-Date: 2006-10-03 02:33+0200\n"
+"POT-Creation-Date: 2014-09-29 00:46-0500\n"
 "PO-Revision-Date: 2003-07-18 17:00+0100\n"
 "Last-Translator: KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdelibs/tdeio.po b/tde-i18n-cy/messages/tdelibs/tdeio.po
index dddbad0d95a..c58327767a0 100644
--- a/tde-i18n-cy/messages/tdelibs/tdeio.po
+++ b/tde-i18n-cy/messages/tdelibs/tdeio.po
@@ -14,46 +14,1658 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio\n"
-"POT-Creation-Date: 2008-07-08 01:16+0200\n"
+"POT-Creation-Date: 2014-09-29 00:46-0500\n"
 "PO-Revision-Date: 2004-01-16 09:20+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.2\n"
 "\n"
 
-#: tdeio/netaccess.cpp:67
-msgid "File '%1' is not readable"
-msgstr "Nid yw'r ffeil '%1' yn ddarllenadwy"
+#: tests/kurifiltertest.cpp:144
+#, fuzzy
+msgid "kurifiltertest"
+msgstr "Arbrawf Argraffu"
+
+#: tests/kurifiltertest.cpp:145
+msgid "Unit test for the URI filter plugin framework."
+msgstr ""
+
+#: tests/kurifiltertest.cpp:150
+msgid "Use space as keyword delimeter for web shortcuts"
+msgstr ""
 
-#: tdeio/netaccess.cpp:438
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "KD wrth KGyfieithu"
+
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "kyfieithu@dotmon.com"
+
+#: bookmarks/kbookmarkmenu.cc:506 bookmarks/kbookmarkmenu_p.h:146
+msgid "Add Bookmark"
+msgstr "Ychwanegu Tudnod"
+
+#: bookmarks/kbookmarkimporter_opera.cc:110
+#: bookmarks/kbookmarkimporter_opera.cc:113
+msgid "*.adr|Opera Bookmark Files (*.adr)"
+msgstr "*.adr|Ffeiliau Tudnodau Opera (*.adr)"
+
+#: bookmarks/kbookmarkmenu.cc:259
+msgid "Add Bookmark Here"
+msgstr "Ychwanegu Tudnod Yma"
+
+#: bookmarks/kbookmarkmenu.cc:276
+msgid "Open Folder in Bookmark Editor"
+msgstr "Agor y Blygell yn y Golygydd Tudnodau"
+
+#: bookmarks/kbookmarkmenu.cc:279
+msgid "Delete Folder"
+msgstr "Dileu Plygell"
+
+#: bookmarks/kbookmarkmenu.cc:287
+msgid "Copy Link Address"
+msgstr "Copïo Cyfeiriad Cyswllt"
+
+#: bookmarks/kbookmarkmenu.cc:290
+msgid "Delete Bookmark"
+msgstr "Dileu y Tudnod"
+
+#: bookmarks/kbookmarkmenu.cc:318
 #, fuzzy
-msgid "ERROR: Unknown protocol '%1'"
+msgid "Bookmark Properties"
+msgstr "Priodweddau"
+
+#: bookmarks/kbookmarkmanager.cc:506 bookmarks/kbookmarkmenu.cc:343
+#, fuzzy
+msgid "Cannot add bookmark with empty URL."
+msgstr "Methu ychwanegu tudnod efo URL gwag"
+
+#: bookmarks/kbookmarkmenu.cc:381
+#, fuzzy
+msgid ""
+"Are you sure you wish to remove the bookmark folder\n"
+"\"%1\"?"
+msgstr "Ydych wir eisiau gwaredu'r plygell tudnodau yma?"
+
+#: bookmarks/kbookmarkmenu.cc:382
+#, fuzzy
+msgid ""
+"Are you sure you wish to remove the bookmark\n"
+"\"%1\"?"
+msgstr "Ydych wir eisiau gwaredu'r tudnod yma?"
+
+#: bookmarks/kbookmarkmenu.cc:383
+#, fuzzy
+msgid "Bookmark Folder Deletion"
+msgstr "Gwaredu Plygell Tudnodau"
+
+#: bookmarks/kbookmarkmenu.cc:384
+#, fuzzy
+msgid "Bookmark Deletion"
+msgstr "Dewis y Baner"
+
+#: bookmarks/kbookmarkmenu.cc:486
+msgid "Bookmark Tabs as Folder..."
+msgstr "Creu Plygell allan o'r Tabiau Tudnodau..."
+
+#: bookmarks/kbookmarkmenu.cc:495
+msgid "Add a folder of bookmarks for all open tabs."
+msgstr "Ychwanegu plygell o dudnodau am bob tab sy'n agored."
+
+#: bookmarks/kbookmarkmenu.cc:515
+msgid "Add a bookmark for the current document"
+msgstr "Ychwanegu tudnod am y ddogfen gyfredol"
+
+#: bookmarks/kbookmarkmenu.cc:529
+msgid "Edit your bookmark collection in a separate window"
+msgstr "Golygu eich casgliad tudnodau mewn ffenest gwahanol"
+
+#: bookmarks/kbookmarkmenu.cc:538
+msgid "&New Bookmark Folder..."
+msgstr "&Plygell Newydd i Tudnodau..."
+
+#: bookmarks/kbookmarkmenu.cc:550
+msgid "Create a new bookmark folder in this menu"
+msgstr "Creu plygell newydd i dudnodau yn y ddewislen yma"
+
+#: bookmarks/kbookmarkmenu.cc:684
+msgid "Quick Actions"
+msgstr "Gweithrediadau Brys"
+
+#: ../tdeioslave/http/kcookiejar/kcookiewin.cpp:270
+#: bookmarks/kbookmarkmenu.cc:791 tdefile/kpropertiesdialog.cpp:4020
+#: tdeio/tdefileitem.cpp:943
+msgid "Name:"
+msgstr "Enw:"
+
+#: bookmarks/kbookmarkmenu.cc:797 tdefile/kpropertiesdialog.cpp:992
+#: tdefile/kurlrequesterdlg.cpp:47
+msgid "Location:"
+msgstr "Lleoliad:"
+
+#: bookmarks/kbookmarkmenu.cc:829 tdefile/kpropertiesdialog.cpp:3306
+msgid "&Add"
+msgstr "&Ychwanegu"
+
+#: bookmarks/kbookmarkmenu.cc:831
+msgid "&New Folder..."
+msgstr "&Plygell Newydd"
+
+#: bookmarks/kbookmarkmenu.cc:948
+msgid "Bookmark"
+msgstr "Tudnod"
+
+#: bookmarks/kbookmarkmenu.cc:1115
+msgid "Netscape Bookmarks"
+msgstr "Tudnodau Netscape"
+
+#: bookmarks/kbookmark.cc:117
+msgid "Create New Bookmark Folder"
+msgstr "Creu Plygell Newydd i Dudnodau"
+
+#: bookmarks/kbookmark.cc:118
+#, c-format
+msgid "Create New Bookmark Folder in %1"
+msgstr "Creu Plygell Newydd i Dudnodau yn %1"
+
+#: bookmarks/kbookmark.cc:120
+msgid "New folder:"
+msgstr "Plygell newydd:"
+
+#: bookmarks/kbookmark.cc:286
+msgid "--- separator ---"
+msgstr "--- gwahanydd ---"
+
+#: bookmarks/kbookmarkimporter_ns.cc:110 bookmarks/kbookmarkimporter_ns.cc:113
+msgid "*.html|HTML Files (*.html)"
+msgstr "Ffeiliau *.html|HTML (*.html)"
+
+#: bookmarks/kbookmarkimporter_ns.cc:197
+msgid "<!-- This file was generated by Konqueror -->"
+msgstr "<!-- Creuwyd y ffeil yma gan Konqueror -->"
+
+#: bookmarks/kbookmarkmanager.cc:365
+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."
 msgstr ""
-"Protocol anhysbys '%1'. \n"
+"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."
+
+#: kssl/ksslcertdlg.cc:61
+msgid "Certificate"
+msgstr "Tystysgrif"
+
+#: kssl/ksslcertdlg.cc:67
+msgid "Save selection for this host."
+msgstr "Cadw dewisiad am y gwesteiwr yma."
+
+#: kssl/ksslcertdlg.cc:75
+msgid "Send certificate"
+msgstr "Anfon tystysgrif..."
+
+#: kssl/ksslcertdlg.cc:79
+msgid "Do not send a certificate"
+msgstr "Peidio ag anfon tystysgrif"
+
+#: kssl/ksslcertdlg.cc:84
+#, fuzzy
+msgid "KDE SSL Certificate Dialog"
+msgstr "Ymgom Tystysgrif SSL TDE"
+
+#: kssl/ksslcertdlg.cc:139
+msgid ""
+"The server <b>%1</b> requests a certificate."
+"<p>Select a certificate to use from the list below:"
+msgstr ""
+
+#: kssl/ksslinfodlg.cc:92 kssl/ksslinfodlg.cc:149
+msgid "Current connection is secured with SSL."
+msgstr "Diogelir y cysylltiad cyfredol gan SSL."
+
+#: kssl/ksslinfodlg.cc:95 kssl/ksslinfodlg.cc:152
+msgid "Current connection is not secured with SSL."
+msgstr "Ni ddiogelir y cysylltiad cyfredol gan SSL."
+
+#: kssl/ksslinfodlg.cc:99
+msgid "SSL support is not available in this build of TDE."
+msgstr "Nid yw cynnal SSL ar gael yn yr adeiladaeth yma o TDE.  "
+
+#: kssl/ksslinfodlg.cc:109
+msgid "C&ryptography Configuration..."
+msgstr "Ffurfweddiad &Cêl-ysgrifiaeth"
+
+#: kssl/ksslinfodlg.cc:120 kssl/ksslkeygen.cc:93
+msgid "TDE SSL Information"
+msgstr "Gwybodaeth SSL TDE"
+
+#: kssl/ksslinfodlg.cc:142
+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."
+
+#: kssl/ksslinfodlg.cc:144
+msgid "Some of this document is secured with SSL, but the main part is not."
+msgstr ""
+"Mae rhai darnau o'r ddogfen yma yn cael eu diogelu gan SSL, ond mae'r prif "
+"ddarn heb."
+
+#: kssl/ksslinfodlg.cc:184
+msgid "Chain:"
+msgstr "Cadwyn:"
+
+#: kssl/ksslinfodlg.cc:193
+msgid "0 - Site Certificate"
+msgstr "0 - Tystysgrif Wefan"
+
+#: kssl/ksslinfodlg.cc:210
+msgid "Peer certificate:"
+msgstr "Tystysgrif cydradd:"
+
+#: kssl/ksslinfodlg.cc:212
+msgid "Issuer:"
+msgstr "Cyhoeddwr:"
+
+#: kssl/ksslinfodlg.cc:218
+msgid "IP address:"
+msgstr "Cyfeiriad IP:"
+
+#: kssl/ksslinfodlg.cc:227 tdefile/kpropertiesdialog.cpp:2601
+msgid "URL:"
+msgstr "URL:"
+
+#: kssl/ksslinfodlg.cc:230
+msgid "Certificate state:"
+msgstr "Cyflwr y dystysgrif:"
+
+#: kssl/ksslinfodlg.cc:236
+msgid "Valid from:"
+msgstr "Yn ddilys o:"
+
+#: kssl/ksslinfodlg.cc:238
+msgid "Valid until:"
+msgstr "Yn ddilys tan:"
+
+#: kssl/ksslinfodlg.cc:241
+msgid "Serial number:"
+msgstr "Rhif cyfres:"
+
+#: kssl/ksslinfodlg.cc:243
+msgid "MD5 digest:"
+msgstr "Crynodeb MD5:"
+
+#: kssl/ksslinfodlg.cc:246
+msgid "Cipher in use:"
+msgstr "Cêl-ysgrifen mewn defnydd:"
+
+#: kssl/ksslinfodlg.cc:248
+msgid "Details:"
+msgstr "Manylion:"
+
+#: kssl/ksslinfodlg.cc:250
+msgid "SSL version:"
+msgstr "Fersiwn SSL:"
+
+#: kssl/ksslinfodlg.cc:252
+msgid "Cipher strength:"
+msgstr "Cryfder y cêl-ysgrifen:"
+
+#: kssl/ksslinfodlg.cc:253
+msgid "%1 bits used of a %2 bit cipher"
+msgstr "%1 did o cêl-ysgrifen %2 did wedi eu defnyddio"
+
+#: kssl/ksslinfodlg.cc:409
+msgid "Organization:"
+msgstr "Sefydliad:"
+
+#: kssl/ksslinfodlg.cc:414
+msgid "Organizational unit:"
+msgstr "Uned trefniadaeth: "
+
+#: kssl/ksslinfodlg.cc:419
+msgid "Locality:"
+msgstr "Bro:"
+
+#: kssl/ksslinfodlg.cc:424
+msgid ""
+"_: Federal State\n"
+"State:"
+msgstr "Talaith:"
+
+#: kssl/ksslinfodlg.cc:429
+msgid "Country:"
+msgstr "Gwlad:"
+
+#: kssl/ksslinfodlg.cc:434
+msgid "Common name:"
+msgstr "Enw Cyffredin:"
+
+#: kssl/ksslinfodlg.cc:439
+msgid "Email:"
+msgstr "Ebost:"
+
+#: kssl/ksslcertificate.cc:202
+msgid "Signature Algorithm: "
+msgstr "Algorithm Llofnod:"
+
+#: kssl/ksslcertificate.cc:203
+msgid "Unknown"
+msgstr "Anhysbys"
+
+#: kssl/ksslcertificate.cc:206
+msgid "Signature Contents:"
+msgstr "Cynnwys y Llofnod:"
+
+#: kssl/ksslcertificate.cc:338
+msgid ""
+"_: Unknown\n"
+"Unknown key algorithm"
+msgstr "Algorithm allwedd anhysbys"
+
+#: kssl/ksslcertificate.cc:341
+msgid "Key type: RSA (%1 bit)"
+msgstr "Math allwedd: RSA (%1 did)"
+
+#: kssl/ksslcertificate.cc:344
+msgid "Modulus: "
+msgstr "Modwlws:"
+
+#: kssl/ksslcertificate.cc:357
+msgid "Exponent: 0x"
+msgstr "Esbonnydd: 0x"
+
+#: kssl/ksslcertificate.cc:363
+msgid "Key type: DSA (%1 bit)"
+msgstr "Math allwedd: DSA (%1 did)"
+
+#: kssl/ksslcertificate.cc:366
+msgid "Prime: "
+msgstr "Rhif Cysefin:"
+
+#: kssl/ksslcertificate.cc:380
+#, fuzzy
+msgid "160 bit prime factor: "
+msgstr "Ffactor Gysefin 160-did:"
+
+#: kssl/ksslcertificate.cc:404
+msgid "Public key: "
+msgstr "Allwedd cyhoeddus: "
+
+#: kssl/ksslcertificate.cc:920
+msgid "The certificate is valid."
+msgstr "Mae'r dystysgrif yn ddilys."
+
+#: kssl/ksslcertificate.cc:924
+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. "
+
+#: kssl/ksslcertificate.cc:927
+msgid "Certificate signing authority is unknown or invalid."
+msgstr "Mae'r awdurdod llofnodi tystysgrifau yn anhysbys neu yn annilys."
+
+#: kssl/ksslcertificate.cc:929
+msgid "Certificate is self-signed and thus may not be trustworthy."
+msgstr ""
+"Mae'r dystysgrif wedi ei hunan-lofnodi, ac felly efallai ni ellir dibynnu arno."
+
+#: kssl/ksslcertificate.cc:931
+msgid "Certificate has expired."
+msgstr "Mae'r dystysgrif wedi darfod."
+
+#: kssl/ksslcertificate.cc:933
+msgid "Certificate has been revoked."
+msgstr "Mae'r dystysgrif wedi ei ddirymu."
+
+#: kssl/ksslcertificate.cc:935
+msgid "SSL support was not found."
+msgstr "Ni chanfuwyd cynnal SSL."
+
+#: kssl/ksslcertificate.cc:937
+msgid "Signature is untrusted."
+msgstr "Ni ellir rhoi ymddiried yn y llofnod."
+
+#: kssl/ksslcertificate.cc:939
+msgid "Signature test failed."
+msgstr "Methodd yr arbrawf llofnod."
+
+#: kssl/ksslcertificate.cc:942
+msgid "Rejected, possibly due to an invalid purpose."
+msgstr "Gwrthodwyd, efallai o achos bwriad annilys."
+
+#: kssl/ksslcertificate.cc:944
+msgid "Private key test failed."
+msgstr "Methodd arbrawf yr allwedd breifat."
+
+#: kssl/ksslcertificate.cc:946
+msgid "The certificate has not been issued for this host."
+msgstr "Ni chyhoeddwyd y tystysgrif am y gwesteiwr yma."
+
+#: kssl/ksslcertificate.cc:948
+#, fuzzy
+msgid "This certificate is not relevant."
+msgstr "Mae'r dystysgrif yn annilys."
+
+#: kssl/ksslcertificate.cc:953
+msgid "The certificate is invalid."
+msgstr "Mae'r dystysgrif yn annilys."
+
+#: kssl/ksslkeygen.cc:48
+msgid "TDE Certificate Request"
+msgstr "Cais Tystysgrif TDE"
+
+#: kssl/ksslkeygen.cc:50
+msgid "TDE Certificate Request - Password"
+msgstr "Cais Tystysgrif TDE - Cyfrinair"
+
+#: kssl/ksslkeygen.cc:93
+#, fuzzy
+msgid "Unsupported key size."
+msgstr "Ôl-wyneb ni chynhelir: %1."
+
+#: kssl/ksslkeygen.cc:97 misc/uiserver.cpp:1383
+msgid "TDE"
+msgstr "TDE"
+
+#: kssl/ksslkeygen.cc:97
+#, fuzzy
+msgid "Please wait while the encryption keys are generated..."
+msgstr "Arhoswch wrth i TDE ail-adeiladu cronfa gyrryddion."
+
+#: kssl/ksslkeygen.cc:107
+msgid "Do you wish to store the passphrase in your wallet file?"
+msgstr ""
+
+#: kssl/ksslkeygen.cc:107
+#, fuzzy
+msgid "Store"
+msgstr "Stryd"
+
+#: kssl/ksslkeygen.cc:107
+#, fuzzy
+msgid "Do Not Store"
+msgstr "Methu Canfod Statws yr Adnodd"
+
+#: kssl/ksslkeygen.cc:210
+msgid "2048 (High Grade)"
+msgstr ""
+
+#: kssl/ksslkeygen.cc:211
+msgid "1024 (Medium Grade)"
+msgstr ""
+
+#: kssl/ksslkeygen.cc:212
+msgid "768  (Low Grade)"
+msgstr ""
+
+#: kssl/ksslkeygen.cc:213
+msgid "512  (Low Grade)"
+msgstr ""
+
+#: kssl/ksslkeygen.cc:215
+msgid "No SSL support."
+msgstr "Ni chynhelir SSL."
+
+#: kssl/ksslpemcallback.cc:36
+msgid "Certificate password"
+msgstr "Cyfrinair tystysgrif"
+
+#: kssl/ksslutils.cc:79
+msgid "GMT"
+msgstr "GMT"
+
+#: misc/tdetelnetservice.cpp:41
+msgid "telnet service"
+msgstr "gwasanaeth telnet"
+
+#: misc/tdetelnetservice.cpp:42
+msgid "telnet protocol handler"
+msgstr "trinydd protocol telnet"
+
+#: misc/tdetelnetservice.cpp:76
+msgid "You do not have permission to access the %1 protocol."
+msgstr "Nid oes ganddoch caniatad i gyrchu'r protocol %1."
+
+#: misc/tdesendbugmail/main.cpp:22
+msgid "Subject line"
+msgstr "Llinell pwnc"
+
+#: misc/tdesendbugmail/main.cpp:23
+msgid "Recipient"
+msgstr "Derbynnwr"
+
+#: misc/tdesendbugmail/main.cpp:33
+msgid "Error connecting to server."
+msgstr "Gwall wrth gysylltu i'r gweinydd"
+
+#: misc/tdesendbugmail/main.cpp:36
+msgid "Not connected."
+msgstr "Dim cyswllt."
+
+#: misc/tdesendbugmail/main.cpp:39
+msgid "Connection timed out."
+msgstr "Cysylltiad wedi goramseru."
+
+#: misc/tdesendbugmail/main.cpp:42
+msgid "Time out waiting for server interaction."
+msgstr "Goramser wrth aros am ryngweithiad gweinydd."
+
+#: misc/tdesendbugmail/main.cpp:46
+msgid "Server said: \"%1\""
+msgstr "Dywedodd y gweinydd: \"%1\""
+
+#: misc/tdesendbugmail/main.cpp:62
+msgid "KSendBugMail"
+msgstr "KSendBugMail"
+
+#: misc/tdesendbugmail/main.cpp:63
+msgid "Sends a short bug report to submit@bugs.kde.org"
+msgstr "Gyrru adroddiad nam byr i submit@bugs.kde.org"
+
+#: misc/tdesendbugmail/main.cpp:65
+msgid "Author"
+msgstr "Awdur"
+
+#: misc/tdemailservice.cpp:32
+#, fuzzy
+msgid "KMailService"
+msgstr "Gwasanaeth ebost"
+
+#: misc/tdemailservice.cpp:32
+msgid "Mail service"
+msgstr "Gwasanaeth ebost"
+
+#: misc/uiserver.cpp:98 misc/uiserver.cpp:603 misc/uiserver.cpp:682
+msgid "Settings..."
+msgstr "Gosodiadau..."
+
+#: misc/uiserver.cpp:126
+msgid "Configure Network Operation Window"
+msgstr "Ffurfweddu Ffenestr Gweithrediadau'r Rhwydwaith"
+
+#: misc/uiserver.cpp:130
+msgid "Show system tray icon"
+msgstr "Dangos eicon y teclyn cysawd"
+
+#: misc/uiserver.cpp:131
+msgid "Keep network operation window always open"
+msgstr "Cadw'r ffenestr gweithrediadau'r rhwydwaith ar agor yn barhaol"
+
+#: misc/uiserver.cpp:132
+msgid "Show column headers"
+msgstr "Dangos penodau'r colofnau"
+
+#: misc/uiserver.cpp:133
+msgid "Show toolbar"
+msgstr "Dangos bar offer"
+
+#: misc/uiserver.cpp:134
+msgid "Show statusbar"
+msgstr "Dangos bar cyflwr"
+
+#: misc/uiserver.cpp:135
+msgid "Column widths are user adjustable"
+msgstr " Gall lledau'r colofnau gael eu addasu gan y defnyddiwr"
+
+#: misc/uiserver.cpp:136
+msgid "Show information:"
+msgstr "Dangos gwybodaeth:"
+
+#: misc/uiserver.cpp:143 misc/uiserver.cpp:474
+msgid "URL"
+msgstr "URL"
+
+#: misc/uiserver.cpp:144 misc/uiserver.cpp:473
+msgid ""
+"_: Remaining Time\n"
+"Rem. Time"
+msgstr "Ams. yn Weddill"
+
+#: misc/uiserver.cpp:145 misc/uiserver.cpp:472
+msgid "Speed"
+msgstr "Cyflymdra"
+
+#: misc/uiserver.cpp:146 misc/uiserver.cpp:471
+#: tdefile/tdefiledetailview.cpp:67
+msgid "Size"
+msgstr "Maint"
+
+#: misc/uiserver.cpp:147 misc/uiserver.cpp:470
+#, c-format
+msgid "%"
+msgstr "%"
+
+#: misc/uiserver.cpp:148 misc/uiserver.cpp:469
+msgid "Count"
+msgstr "Cyfrif"
+
+#: misc/uiserver.cpp:149 misc/uiserver.cpp:468
+msgid ""
+"_: Resume\n"
+"Res."
+msgstr "Ail-ddechrau"
+
+#: misc/uiserver.cpp:150 misc/uiserver.cpp:467
+#, fuzzy
+msgid "Local Filename"
+msgstr "Enw Ffeil Lleol"
+
+#: misc/uiserver.cpp:151 misc/uiserver.cpp:466
+msgid "Operation"
+msgstr "Gweithrediad"
+
+#: misc/uiserver.cpp:254
+msgid "%1 / %2"
+msgstr "%1 / %2"
+
+#: misc/uiserver.cpp:288 tdeio/defaultprogress.cpp:325
+msgid "Stalled"
+msgstr "Wedi seibio"
+
+#: misc/uiserver.cpp:291
+msgid "%1/s"
+msgstr "%1/s"
+
+#: misc/uiserver.cpp:302
+msgid "Copying"
+msgstr "Copïo"
+
+#: misc/uiserver.cpp:311
+msgid "Moving"
+msgstr "Symud"
+
+#: misc/uiserver.cpp:320
+msgid "Creating"
+msgstr "Creu"
+
+#: misc/uiserver.cpp:329
+msgid "Deleting"
+msgstr "Dileu"
+
+#: misc/uiserver.cpp:337
+msgid "Loading"
+msgstr "llwytho"
+
+#: misc/uiserver.cpp:362
+msgid "Examining"
+msgstr "Arholi"
+
+#: misc/uiserver.cpp:370
+msgid "Mounting"
+msgstr "Gosod"
+
+#: misc/uiserver.cpp:378 tdeio/defaultprogress.cpp:410
+msgid "Unmounting"
+msgstr "Ddi-osod"
+
+#: misc/uiserver.cpp:608 misc/uiserver.cpp:1097
+msgid " Files: %1 "
+msgstr "Ffeiliau : %1"
+
+#: misc/uiserver.cpp:609
+msgid ""
+"_: Remaining Size\n"
+" Rem. Size: %1 kB "
+msgstr ""
+
+#: misc/uiserver.cpp:610
+msgid ""
+"_: Remaining Time\n"
+" Rem. Time: 00:00:00 "
+msgstr ""
+
+#: misc/uiserver.cpp:611
+msgid " %1 kB/s "
+msgstr "%1 kB/s"
+
+#: misc/uiserver.cpp:632 tdeio/defaultprogress.cpp:179
+msgid "Progress Dialog"
+msgstr "Deialog Cynnydd"
+
+#: misc/uiserver.cpp:679
+msgid "Cancel Job"
+msgstr "Diddymu'r Swydd"
+
+#: misc/uiserver.cpp:1098
+msgid ""
+"_: Remaining Size\n"
+" Rem. Size: %1 "
+msgstr ""
+
+#: misc/uiserver.cpp:1100
+msgid ""
+"_: Remaining Time\n"
+" Rem. Time: %1 "
+msgstr ""
+
+#: misc/uiserver.cpp:1102 tdeio/statusbarprogress.cpp:134
+msgid " %1/s "
+msgstr "%1/s"
+
+#: misc/uiserver.cpp:1218 tdeio/observer.cpp:332
+msgid "The peer SSL certificate appears to be corrupt."
+msgstr "Ymddengys bod tystysgrif SSL y cymar yn llygredig."
+
+#: misc/uiserver.cpp:1218 tdeio/observer.cpp:332 tdeio/tcpslavebase.cpp:706
+msgid "SSL"
+msgstr "SSL"
+
+#: misc/uiserver.cpp:1384
+msgid "TDE Progress Information UI Server"
+msgstr "Gweinydd UI Gwybodaeth Cynnydd TDE"
+
+#: misc/uiserver.cpp:1387 misc/uiserver.cpp:1388
+msgid "Developer"
+msgstr "Datblygwr"
+
+#: misc/tdewalletd/tdewalletwizard.ui.h:23
+msgid "<qt>Password is empty.  <b>(WARNING: Insecure)"
+msgstr ""
+
+#: misc/tdewalletd/tdewalletwizard.ui.h:25
+msgid "Passwords match."
+msgstr "Mae'r cyfrineiriau yn cydweddu."
+
+#: misc/tdewalletd/tdewalletwizard.ui.h:28
+msgid "Passwords do not match."
+msgstr "Nid yw'r cyfrineiriau yn cydweddu."
+
+#: misc/tdewalletd/tdewalletd.cpp:438
+#, fuzzy
+msgid ""
+"<qt>TDE has requested to open the wallet '<b>%1</b>'. Please enter the password "
+"for this wallet below."
+msgstr ""
+"Mae TDE wedi gofyn i agor y waled '%1'.  Mewnosodwch y cyfrinair am y waled "
+"isod."
+
+#: misc/tdewalletd/tdewalletd.cpp:440
+#, fuzzy
+msgid ""
+"<qt>The application '<b>%1</b>' has requested to open the wallet '<b>%2</b>"
+"'. Please enter the password for this wallet below."
+msgstr ""
+"Mae'r cymhwysiad '%1' wedi gofyn i agor y waled '%2'.  Mewnosodwch y cyfrinair "
+"am y waled yma isod."
+
+#: misc/tdewalletd/tdewalletd.cpp:443 misc/tdewalletd/tdewalletd.cpp:457
+#: tdefile/tdefiledialog.cpp:1841
+msgid "&Open"
+msgstr "&Agor"
+
+#: misc/tdewalletd/tdewalletd.cpp:452
+msgid ""
+"TDE 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 ""
+"Mae TDE wedi gofyn i agor y waled.  Defnyddir hwn i gadw data gofalus mewn "
+"ffordd diogel.  Mewnosodwch gyfrinair i ddefnyddio efo'r waled yma, neu "
+"cliciwch Diddymu i wrthod cais y cymhwysiad."
+
+#: misc/tdewalletd/tdewalletd.cpp:454
+#, fuzzy
+msgid ""
+"<qt>The application '<b>%1</b>' has requested to open the TDE 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 ""
+"Mae'r cymhwysiad '%1' wedi gofyn i agor y waled TDE.  Defnyddir hwn i gadw data "
+"gofalus mewn ffordd diogel.  Mewnosodwch gyfrinair i ddefnyddio efo'r waled "
+"yma, neu cliciwch Diddymu i wrthod cais y cymhwysiad."
+
+#: misc/tdewalletd/tdewalletd.cpp:461
+#, fuzzy
+msgid ""
+"<qt>TDE has requested to create a new wallet named '<b>%1</b>"
+"'. Please choose a password for this wallet, or cancel to deny the "
+"application's request."
+msgstr ""
+"Mae TDE wedi gofyn i agor waled newydd o'r enw '%1'.  Dewiswch gyfrinair am y "
+"waled yma, neu cliciwch Diddymu i wrthod cais y cymhwysiad."
+
+#: misc/tdewalletd/tdewalletd.cpp:463
+#, fuzzy
+msgid ""
+"<qt>The application '<b>%1</b>' has requested to create a new wallet named '<b>"
+"%2</b>'. Please choose a password for this wallet, or cancel to deny the "
+"application's request."
+msgstr ""
+"Mae'r cymhwysiad '%1' wedi gofyn i agor y waled '%2'.  Dewiswch gyfrinair am y "
+"waled yma, neu cliciwch Diddymu i wrthod cais y cymhwysiad."
+
+#: misc/tdewalletd/tdewalletd.cpp:466
+msgid "C&reate"
+msgstr "C&reu"
+
+#: misc/tdewalletd/tdewalletd.cpp:470 misc/tdewalletd/tdewalletd.cpp:645
+#: misc/tdewalletd/tdewalletd.cpp:661 misc/tdewalletd/tdewalletd.cpp:672
+#: misc/tdewalletd/tdewalletd.cpp:677 misc/tdewalletd/tdewalletd.cpp:1237
+msgid "TDE Wallet Service"
+msgstr "Gwasanaeth Waled TDE"
+
+#: misc/tdewalletd/tdewalletd.cpp:482
+msgid ""
+"<qt>Error opening the wallet '<b>%1</b>'. Please try again."
+"<br>(Error code %2: %3)"
+msgstr ""
+
+#: misc/tdewalletd/tdewalletd.cpp:556
+#, fuzzy
+msgid "<qt>TDE has requested access to the open wallet '<b>%1</b>'."
+msgstr "Mae'r cymhwysiad '%1' wedi gofyn am gyrchiad i'r waled agored '%2'."
+
+#: misc/tdewalletd/tdewalletd.cpp:558
+#, fuzzy
+msgid ""
+"<qt>The application '<b>%1</b>' has requested access to the open wallet '<b>"
+"%2</b>'."
+msgstr "Mae'r cymhwysiad '%1' wedi gofyn am gyrchiad i'r waled agored '%2'."
+
+#: misc/tdewalletd/tdewalletd.cpp:645
+msgid ""
+"Unable to open wallet. The wallet must be opened in order to change the "
+"password."
+msgstr ""
+"Methu agor y waled.  Rhaid i'r waled gael ei agor er mwyn newid y cyfrinair."
+
+#: misc/tdewalletd/tdewalletd.cpp:660
+#, fuzzy
+msgid "<qt>Please choose a new password for the wallet '<b>%1</b>'."
+msgstr "Dewiswch cyfrinair newydd am y waled '%1'."
+
+#: misc/tdewalletd/tdewalletd.cpp:672
+msgid "Error re-encrypting the wallet. Password was not changed."
+msgstr "Gwall wrth ail-gêlysgrifennu'r waled.  Ni newidwyd y cyfrinair."
+
+#: misc/tdewalletd/tdewalletd.cpp:677
+msgid "Error reopening the wallet. Data may be lost."
+msgstr "Gwall wrth ail-agor y waled.  Efallai collwyd data."
+
+#: misc/tdewalletd/tdewalletd.cpp:1237
+msgid ""
+"There have been repeated failed attempts to gain access to a wallet. An "
+"application may be misbehaving."
+msgstr ""
+"Mae ceisiadau aflwyddianus niferus i gael cyrchiad i waled wedi bod.  Efallai "
+"mae cymhwysiad yn camymddwyn. "
+
+#: misc/kpac/discovery.cpp:116
+msgid "Could not find a usable proxy configuration script"
+msgstr "Methu canfod ysgrifen ffurfweddu'r dirpwry a gall ei defnyddio"
+
+#: misc/kpac/downloader.cpp:81
+#, c-format
+msgid ""
+"Could not download the proxy configuration script:\n"
+"%1"
+msgstr ""
+"Methu lawrlwytho'r ysgrifen ffurfweddu'r dirprwy:\n"
+"%1"
+
+#: misc/kpac/downloader.cpp:83
+msgid "Could not download the proxy configuration script"
+msgstr "Methu lawrlwytho'r ysgrifen ffurfweddu'r dirprwy."
+
+#: misc/kpac/proxyscout.cpp:124
+#, c-format
+msgid ""
+"The proxy configuration script is invalid:\n"
+"%1"
+msgstr ""
+" Mae'r ysgrifen ffurfweddu'r dirprwy yn annilys:\n"
+"%1"
+
+#: misc/kpac/proxyscout.cpp:184
+#, c-format
+msgid ""
+"The proxy configuration script returned an error:\n"
+"%1"
+msgstr ""
+"Mae gwall wedi'i ddychwelyd gan yr ysgrifen ffurfweddu'r dirprwy:\n"
+"%1"
+
+#: misc/tdefile/fileprops.cpp:200
+#, fuzzy
+msgid "Do not print the mimetype of the given file(s)"
+msgstr "Peidio ag argraffu math mime y ffeil(iau) penodol"
+
+#: misc/tdefile/fileprops.cpp:204
+msgid ""
+"List all supported metadata keys of the given file(s). If mimetype is not "
+"specified, the mimetype of the given files is used."
+msgstr ""
+"Rhestru pob allwedd metadata a gynhelir o'r ffeil(iau) a roddwyd.  Os nid yw'r "
+"math mime wedi'i bennu, defnyddir math mime y ffeiliau a roddwyd."
+
+#: misc/tdefile/fileprops.cpp:210
+msgid ""
+"List all preferred metadata keys of the given file(s). If mimetype is not "
+"specified, the mimetype of the given files is used."
+msgstr ""
+"Rhestru pob allwedd metadata amgen o'r ffeil(iau) a roddwyd. Os nid yw'r math "
+"mime wedi'i bennu, defnyddir math mime y ffeiliau a roddwyd."
+
+#: misc/tdefile/fileprops.cpp:216
+msgid "List all metadata keys which have a value in the given file(s)."
+msgstr ""
+"Rhestru pob allwedd metadata sydd efo gwerth yn y ffeil(iau) a roddwyd."
+
+#: misc/tdefile/fileprops.cpp:221
+msgid "Prints all mimetypes for which metadata support is available."
+msgstr "Argraffu pob math mime lle mae cynnal metadata ar gael."
+
+#: misc/tdefile/fileprops.cpp:226
+#, fuzzy
+msgid ""
+"Do not print a warning when more than one file was given and they do not all "
+"have the same mimetype."
+msgstr ""
+"Peidio ag argraffu rhybudd pan rhoddwyd mwy nac un math mime, a nid yw ganddynt "
+"i gyd yr un math mime."
+
+#: misc/tdefile/fileprops.cpp:231
+msgid "Prints all metadata values, available in the given file(s)."
+msgstr "Argraffu pob werth metadata sydd ar gael yn y ffeil(iau) a roddwyd."
+
+#: misc/tdefile/fileprops.cpp:236
+msgid "Prints the preferred metadata values, available in the given file(s)."
+msgstr ""
+"Argraffu y gwerthau metadata amgen sydd ar gael yn y ffeil(iau) a roddwyd."
+
+#: misc/tdefile/fileprops.cpp:240
+msgid ""
+"Opens a TDE properties dialog to allow viewing and modifying of metadata of the "
+"given file(s)"
+msgstr ""
+"Agor ymgom priodweddau TDE i ganiatàu gweld a newid y metadata yn y ffeil(iau) "
+"a roddwyd."
+
+#: misc/tdefile/fileprops.cpp:244
+msgid ""
+"Prints the value for 'key' of the given file(s). 'key' may also be a "
+"comma-separated list of keys"
+msgstr ""
+"Argraffu gwerth 'allwedd' y ffeil(iau) a roddwyd.  Gall 'key' fod hefyd yn "
+"rhestr gwahanwyd gan gollnod o allweddi."
+
+#: misc/tdefile/fileprops.cpp:248
+msgid ""
+"Attempts to set the value 'value' for the metadata key 'key' for the given "
+"file(s)"
+msgstr ""
+"Ceisio gosod y gwerth 'gwerth' i'r allwedd metadata 'allwedd' am y ffeil(iau) a "
+"roddwyd."
+
+#: misc/tdefile/fileprops.cpp:251
+#, fuzzy
+msgid "The group to get values from or set values to"
+msgstr "Y cylch i nôl gwerthoedd ohono neu i osod gwerthoedd iddo."
+
+#: misc/tdefile/fileprops.cpp:255
+msgid "The file (or a number of files) to operate on."
+msgstr "Y ffeil (neu nifer o ffeiliau) i weithredu arnynt."
+
+#: misc/tdefile/fileprops.cpp:270
+msgid "No support for metadata extraction found."
+msgstr "Dim cynnal wedi'i ganfod am dynnu metadata."
+
+#: misc/tdefile/fileprops.cpp:275
+msgid "Supported MimeTypes:"
+msgstr "Mathau Mime a Gynhelir"
+
+#: misc/tdefile/fileprops.cpp:410
+msgid "tdefile"
+msgstr "tdefile"
+
+#: misc/tdefile/fileprops.cpp:411
+msgid "A commandline tool to read and modify metadata of files."
+msgstr "Erfyn llinell gorchymyn i ddarllen a newid metadata ffeiliau."
+
+#: misc/tdefile/fileprops.cpp:438
+msgid "No files specified"
+msgstr "Dim ffeiliau wedi'u pennu"
+
+#: misc/tdefile/fileprops.cpp:467
+msgid "Cannot determine metadata"
+msgstr "Methu pennu metadata"
+
+#: tdeioexec/main.cpp:50
+msgid "TDEIO Exec - Opens remote files, watches modifications, asks for upload"
+msgstr ""
+"TDEIO Exec - Agor ffeiliau pell, arsylwi newidiadau, gofyn am lanlwytho."
+
+#: tdeioexec/main.cpp:54
+msgid "Treat URLs as local files and delete them afterwards"
+msgstr "Trin URLau fel ffeiliau lleol a'u dileu wedyn"
+
+#: tdeioexec/main.cpp:55
+#, fuzzy
+msgid "Suggested file name for the downloaded file"
+msgstr "Dewiswch enw ffeil amgen i'r ffeil newydd."
+
+#: tdeioexec/main.cpp:56
+msgid "Command to execute"
+msgstr "Gorchymyn i Weithredu"
+
+#: tdeioexec/main.cpp:57
+msgid "URL(s) or local file(s) used for 'command'"
+msgstr "URL(au) neu ffeil(iau) lleol i'w defnyddio fel 'gorchymyn'"
+
+#: tdeioexec/main.cpp:73
+msgid ""
+"'command' expected.\n"
+msgstr ""
+"'gorchymyn' a ddisgwylir.\n"
+
+#: tdeioexec/main.cpp:102
+msgid ""
+"The URL %1\n"
+"is malformed"
+msgstr ""
+"Mae'r URL %1\n"
+"wedi'i gam-fformatio"
+
+#: tdeioexec/main.cpp:104
+msgid ""
+"Remote URL %1\n"
+"not allowed with --tempfiles switch"
+msgstr ""
+"Ni chaniateir URL pell %1\n"
+"efo'r cymal --tempfiles"
+
+#: tdeioexec/main.cpp:237
+msgid ""
+"The supposedly temporary file\n"
+"%1\n"
+"has been modified.\n"
+"Do you still want to delete it?"
+msgstr ""
+"Mae'r ffeil\n"
+"%1\n"
+"(oedd i fod dros dro) wedi ei newid. \n"
+"Ydych eisiau ei dileu?"
+
+#: tdeioexec/main.cpp:238 tdeioexec/main.cpp:245
+msgid "File Changed"
+msgstr "Newidwyd y ffeil."
+
+#: tdeioexec/main.cpp:238
+#, fuzzy
+msgid "Do Not Delete"
+msgstr "Dim byd i'w dileu."
+
+#: tdeioexec/main.cpp:244
+msgid ""
+"The file\n"
+"%1\n"
+"has been modified.\n"
+"Do you want to upload the changes?"
+msgstr ""
+"Mae'r ffeil\n"
+"%1\n"
+"wedi ei newid. \n"
+"Ydych eisiau lanlwytho'r newidiadau?"
+
+#: tdeioexec/main.cpp:245
+msgid "Upload"
+msgstr "Lanlwytho"
+
+#: tdeioexec/main.cpp:245
+msgid "Do Not Upload"
+msgstr ""
+
+#: tdeioexec/main.cpp:274
+msgid "KIOExec"
+msgstr "KIOExec"
+
+#. i18n: file ./kssl/keygenwizard2.ui line 25
+#: rc.cpp:3
+#, no-c-format
+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 line 38
+#: rc.cpp:6
+#, no-c-format
+msgid "&Repeat password:"
+msgstr "&Ailadrodd cyfrinair:"
+
+#. i18n: file ./kssl/keygenwizard2.ui line 49
+#: rc.cpp:9
+#, no-c-format
+msgid "&Choose password:"
+msgstr "&Dewis cyfrinair:"
+
+#. i18n: file ./kssl/keygenwizard.ui line 25
+#: rc.cpp:12
+#, no-c-format
+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."
+
+#. i18n: file ./misc/tdewalletd/tdewalletwizard.ui line 16
+#: rc.cpp:15
+#, no-c-format
+msgid "TDE Wallet Wizard"
+msgstr "Dewin Waled TDE"
+
+#. i18n: file ./misc/tdewalletd/tdewalletwizard.ui line 23
+#: rc.cpp:18
+#, no-c-format
+msgid "Introduction"
+msgstr "Rhagymadrodd"
+
+#. i18n: file ./misc/tdewalletd/tdewalletwizard.ui line 56
+#: rc.cpp:21
+#, no-c-format
+msgid "<u>TDEWallet</u> - The TDE Wallet System"
+msgstr "<u>KWaled</u> - Y Cyfundrefn Waled TDE"
+
+#. i18n: file ./misc/tdewalletd/tdewalletwizard.ui line 81
+#: rc.cpp:24
+#, no-c-format
+msgid ""
+"Welcome to TDEWallet, the TDE Wallet System.  TDEWallet 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 TDEWallet and help you configure it for the first time."
+msgstr ""
+"Croeso i KWaled, y Gyfundrefn Waled TDE.  Mae KWaled yn gadael i chi gronni "
+"eich cyfrineiriau a data personol arall ar y ddisg mewn ffeil wedi'i "
+"gêl-ysgrifennu, yn atal i eraill weld y wybodaeth.  bydd y dewin yma yn rhoi "
+"manylion i chi a'ch cymorthwyo ei ffurfweddu am y tro cyntaf."
+
+#. i18n: file ./misc/tdewalletd/tdewalletwizard.ui line 112
+#: rc.cpp:27
+#, no-c-format
+msgid "&Basic setup (recommended)"
+msgstr "Gosod s&ylfaenol (argymelledig)"
+
+#. i18n: file ./misc/tdewalletd/tdewalletwizard.ui line 123
+#: rc.cpp:30
+#, no-c-format
+msgid "&Advanced setup"
+msgstr "Gosod &uwch"
+
+#. i18n: file ./misc/tdewalletd/tdewalletwizard.ui line 180
+#: rc.cpp:36
+#, no-c-format
+msgid ""
+"The TDE 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 blowfish algorithm with your password as the key.  When a "
+"wallet is opened, the wallet manager application will launch and display an "
+"icon in the system tray.  You can use this application to manage your wallets.  "
+"It even permits you to drag wallets and wallet contents, allowing you to easily "
+"copy a wallet to a remote system."
+msgstr " "
+
+#. i18n: file ./misc/tdewalletd/tdewalletwizard.ui line 193
+#: rc.cpp:39
+#, no-c-format
+msgid "Password Selection"
+msgstr "Dewis Cyfrinair"
+
+#. i18n: file ./misc/tdewalletd/tdewalletwizard.ui line 204
+#: rc.cpp:42
+#, no-c-format
+msgid ""
+"Various applications may attempt to use the TDE wallet to store passwords or "
+"other information such as web form data and cookies.  If you would like these "
+"applications to use the wallet, you must enable it now and choose a password.  "
+"The password you choose <i>cannot</i> be recovered if it is lost, and will "
+"allow anyone who knows it to obtain all the information contained in the "
+"wallet."
+msgstr " "
+
+#. i18n: file ./misc/tdewalletd/tdewalletwizard.ui line 234
+#: rc.cpp:45
+#, no-c-format
+msgid "Enter a new password:"
+msgstr "Mewnosodwch cyfrinair newydd:"
+
+#. i18n: file ./misc/tdewalletd/tdewalletwizard.ui line 251
+#: rc.cpp:48
+#, no-c-format
+msgid "Verify password:"
+msgstr "Gwirio cyfrinair"
+
+#. i18n: file ./misc/tdewalletd/tdewalletwizard.ui line 301
+#: rc.cpp:51
+#, no-c-format
+msgid "Yes, I wish to use the TDE wallet to store my personal information."
+msgstr "Rydw i eisiau defnyddio'r waled TDE i gronni fy ngwybodaeth personol."
+
+#. i18n: file ./misc/tdewalletd/tdewalletwizard.ui line 390
+#: rc.cpp:54
+#, no-c-format
+msgid "Security Level"
+msgstr "Lefel Diogelwch"
+
+#. i18n: file ./misc/tdewalletd/tdewalletwizard.ui line 401
+#: rc.cpp:57
+#, no-c-format
+msgid ""
+"The TDE 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 TDEWallet control "
+"module."
+msgstr ""
+
+#. i18n: file ./misc/tdewalletd/tdewalletwizard.ui line 432
+#: rc.cpp:60
+#, no-c-format
+msgid "Store network passwords and local passwords in separate wallet files"
+msgstr ""
+"Cronni cyfrineiriau rhwydwaith a cyfrineiriau lleol mewn ffeiliau waled "
+"gwahanol"
+
+#. i18n: file ./misc/tdewalletd/tdewalletwizard.ui line 440
+#: rc.cpp:63
+#, no-c-format
+msgid "Automatically close idle wallets"
+msgstr "Cau waledau segur yn ymysgogol"
+
+#. i18n: file ./misc/tdewalletd/kbetterthankdialogbase.ui line 60
+#: rc.cpp:66
+#, no-c-format
+msgid "Allow &Once"
+msgstr "Caniatau U&nwaith"
+
+#. i18n: file ./misc/tdewalletd/kbetterthankdialogbase.ui line 71
+#: rc.cpp:69
+#, no-c-format
+msgid "Allow &Always"
+msgstr "Gadael o &Hyd"
+
+#. i18n: file ./misc/tdewalletd/kbetterthankdialogbase.ui line 79
+#: rc.cpp:72
+#, no-c-format
+msgid "&Deny"
+msgstr "Gwa&hardd"
+
+#. i18n: file ./misc/tdewalletd/kbetterthankdialogbase.ui line 87
+#: rc.cpp:75
+#, fuzzy, no-c-format
+msgid "Deny &Forever"
+msgstr "&Am Byth"
+
+#. i18n: file ./tdefile/kpropertiesmimetypebase.ui line 27
+#: rc.cpp:78
+#, no-c-format
+msgid "Select one or more file types to add:"
+msgstr "Dewis un neu fwy o fathau ffeil i'w ychwanegu:"
+
+#. i18n: file ./tdefile/kpropertiesmimetypebase.ui line 36
+#: rc.cpp:81 rc.cpp:99
+#, no-c-format
+msgid "Mimetype"
+msgstr "Math MIME"
+
+#. i18n: file ./tdefile/kpropertiesmimetypebase.ui line 47
+#: rc.cpp:84 rc.cpp:102
+#, no-c-format
+msgid "Description"
+msgstr "Disgrifiad"
+
+#. i18n: file ./tdefile/kpropertiesmimetypebase.ui line 61
+#: rc.cpp:87
+#, no-c-format
+msgid ""
+"<qt>"
+"<p>Select one or more types of file that your application can handle here. 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>"
+msgstr ""
+
+#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 44
+#: rc.cpp:91
+#, no-c-format
+msgid "&Supported file types:"
+msgstr "Mat&hau ffeil a gynhelir:"
+
+#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 52
+#: rc.cpp:94 rc.cpp:105
+#, no-c-format
+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 ""
+
+#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 103
+#: rc.cpp:110
+#, no-c-format
+msgid "&Name:"
+msgstr "&Enw:"
+
+#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 109
+#: rc.cpp:113 rc.cpp:116
+#, no-c-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."
+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."
+
+#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 125
+#: rc.cpp:119 tdefile/kurlbar.cpp:950
+#, no-c-format
+msgid "&Description:"
+msgstr "&Disgrifiad:"
+
+#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 131
+#: rc.cpp:122 rc.cpp:125
+#, no-c-format
+msgid ""
+"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\"."
+
+#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 147
+#: rc.cpp:128
+#, no-c-format
+msgid "Comm&ent:"
+msgstr "Syl&wad:"
+
+#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 153
+#: rc.cpp:131 rc.cpp:134
+#, no-c-format
+msgid "Type any comment you think is useful here."
+msgstr "Teipiwch yma unrhyw sylwad o ddefnydd."
+
+#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 169
+#: rc.cpp:137
+#, no-c-format
+msgid "Co&mmand:"
+msgstr "G&orchymyn:"
+
+#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 186
+#: rc.cpp:140 rc.cpp:154
+#, 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"
+
+#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 213
+#: rc.cpp:168 tdefile/kicondialog.cpp:283 tdefile/kpropertiesdialog.cpp:3705
+#, no-c-format
+msgid "&Browse..."
+msgstr "&Pori..."
+
+#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 216
+#: rc.cpp:171
+#, no-c-format
+msgid ""
+"Click here to browse your file system in order to find the desired executable."
+msgstr ""
+"Cliciwch yma i bori'ch cysawd ffeil er mwyn canfod y gweithredadwyn penodol."
+
+#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 224
+#: rc.cpp:174
+#, no-c-format
+msgid "&Work path:"
+msgstr "Llwybr g&waith:"
+
+#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 230
+#: rc.cpp:177 rc.cpp:180
+#, fuzzy, no-c-format
+msgid "Sets the working directory for your application."
+msgstr "Dileuwch y cyfeiriadur cyfredol a ceisiwch eto."
+
+#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 246
+#: rc.cpp:183
+#, no-c-format
+msgid "Add..."
+msgstr "Ychwanegu..."
+
+#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 249
+#: rc.cpp:186
+#, no-c-format
+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."
+
+#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 277
+#: rc.cpp:192
+#, no-c-format
+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."
+
+#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 302
+#: rc.cpp:195
+#, no-c-format
+msgid "Ad&vanced Options"
+msgstr "De&wisiadau Uwch"
+
+#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 305
+#: rc.cpp:198
+#, no-c-format
+msgid ""
+"Click here to modify the way this application will run, launch feedback, DCOP "
+"options or to run it as a different user."
+msgstr ""
+"Cliciwch ym i addasu'r ffordd y rheda'r cymhwysiad yma, ymgychwyn adborth, "
+"desisiadau DCOP, neu ei redeg fel defnyddiwr arall."
+
+#. i18n: file ./tdefile/knotifywidgetbase.ui line 91
+#: rc.cpp:201
+#, no-c-format
+msgid "Events"
+msgstr "Digwyddiadau"
+
+#. i18n: file ./tdefile/knotifywidgetbase.ui line 117
+#: rc.cpp:204
+#, no-c-format
+msgid "Quick Controls"
+msgstr "Rheoliadau ar Frys"
+
+#. i18n: file ./tdefile/knotifywidgetbase.ui line 128
+#: rc.cpp:207
+#, no-c-format
+msgid "Apply to &all applications"
+msgstr "Gweithredu i bob cym&hwysiad"
+
+#. i18n: file ./tdefile/knotifywidgetbase.ui line 170
+#: rc.cpp:210
+#, no-c-format
+msgid "Turn O&ff All"
+msgstr "Cuddio &Popeth"
+
+#. i18n: file ./tdefile/knotifywidgetbase.ui line 173
+#: rc.cpp:213 rc.cpp:219
+#, no-c-format
+msgid "Allows you to change the behavior for all events at once"
+msgstr "Gadael i chi newid ymddwyn pob ddigwyddiad ar unwaith"
+
+#. i18n: file ./tdefile/knotifywidgetbase.ui line 181
+#: rc.cpp:216
+#, no-c-format
+msgid "Turn O&n All"
+msgstr "Da&tguddio Popeth"
+
+#. i18n: file ./tdefile/knotifywidgetbase.ui line 204
+#: rc.cpp:222 tdefile/kicondialog.cpp:330
+#, no-c-format
+msgid "Actions"
+msgstr "Gweithrediadau"
+
+#. i18n: file ./tdefile/knotifywidgetbase.ui line 215
+#: rc.cpp:225
+#, no-c-format
+msgid "Print a message to standard &error output"
+msgstr "Ar&graffu neges i allbwn gwall safonol"
+
+#. i18n: file ./tdefile/knotifywidgetbase.ui line 223
+#: rc.cpp:228
+#, no-c-format
+msgid "Show a &message in a pop-up window"
+msgstr "Dangos &neges mewn ffenest naidlen"
+
+#. i18n: file ./tdefile/knotifywidgetbase.ui line 231
+#: rc.cpp:231
+#, no-c-format
+msgid "E&xecute a program:"
+msgstr "Gwei&thredu rhaglen:"
+
+#. i18n: file ./tdefile/knotifywidgetbase.ui line 247
+#: rc.cpp:234
+#, no-c-format
+msgid "Play a &sound:"
+msgstr "Chwarae &sw^n:"
+
+#. i18n: file ./tdefile/knotifywidgetbase.ui line 258
+#: rc.cpp:237
+#, no-c-format
+msgid "Test the Sound"
+msgstr "Arbrofi'r Sw^n"
+
+#. i18n: file ./tdefile/knotifywidgetbase.ui line 268
+#: rc.cpp:240
+#, no-c-format
+msgid "Mark &taskbar entry"
+msgstr "Nodi cofnod y bar &tasgiau"
+
+#. i18n: file ./tdefile/knotifywidgetbase.ui line 276
+#: rc.cpp:243
+#, no-c-format
+msgid "&Log to a file:"
+msgstr "&Ysgrifennu i ffeil cofnod:"
+
+#. i18n: file ./tdefile/knotifywidgetbase.ui line 352
+#: rc.cpp:246
+#, no-c-format
+msgid "&Use a passive window that does not interrupt other work"
+msgstr "&Defnyddio ffenest goddefol sy ddim yn torri ar draws gwaith arall"
+
+#. i18n: file ./tdefile/knotifywidgetbase.ui line 378
+#: rc.cpp:249
+#, no-c-format
+msgid "Less Options"
+msgstr "Llai o Ddewisiadau"
+
+#. i18n: file ./tdefile/knotifywidgetbase.ui line 406
+#: rc.cpp:252
+#, no-c-format
+msgid "Player Settings"
+msgstr "Gosodiadau'r Chwaraewr"
 
-#: tdeio/global.cpp:729 tdeio/job.cpp:1761 tdeio/job.cpp:3228 tdeio/job.cpp:3745
-#: tdeio/paste.cpp:65
+#: ../tdeioslave/http/http.cc:5189 kpasswdserver/kpasswdserver.cpp:346
+msgid "  Do you want to retry?"
+msgstr "Ydych eisiau ail-geisio?"
+
+#: ../tdeioslave/http/http.cc:5190 kpasswdserver/kpasswdserver.cpp:348
+msgid "Authentication"
+msgstr "Dilysiant"
+
+#: kpasswdserver/kpasswdserver.cpp:348
+msgid "Retry"
+msgstr "Ail-geisio..."
+
+#: kpasswdserver/kpasswdserver.cpp:371 tdeio/passdlg.cpp:345
+msgid "Authorization Dialog"
+msgstr "Ymgom Awdurdodi"
+
+#: tdeio/global.cpp:749 tdeio/job.cpp:1796 tdeio/job.cpp:3263
+#: tdeio/job.cpp:3780 tdeio/paste.cpp:65
 msgid "File Already Exists"
 msgstr "Ffeil yn Bodoli'n Barod"
 
-#: tdeio/global.cpp:739 tdeio/job.cpp:2938
+#: tdeio/global.cpp:759 tdeio/job.cpp:2973
 msgid "Folder Already Exists"
 msgstr "Plygell yn Bodoli'n Barod"
 
-#: tdeio/job.cpp:3228 tdeio/job.cpp:3745
+#: tdeio/job.cpp:3263 tdeio/job.cpp:3780
 msgid "Already Exists as Folder"
 msgstr "Yn Bodoli'n Barod fel Plygell"
 
-#: tdeio/kimageio.cpp:231
-msgid "All Pictures"
-msgstr "Pob Delwedd"
-
-#: tdeio/pastedialog.cpp:49
-msgid "Data format:"
-msgstr "Fformat data :"
+#: tdeio/kdcopservicestarter.cpp:64
+#, c-format
+msgid "No service implementing %1"
+msgstr "Nid oes gwasanaeth sy'n gweithredu %1"
 
 #: tdeio/renamedlg.cpp:119
 msgid "&Rename"
@@ -130,8 +1742,8 @@ msgstr "newidwyd ar %1"
 msgid "The source file is '%1'"
 msgstr "Mae'r ffeil tarddiad yn '%1'"
 
-#: tdeio/kdirlister.cpp:282 tdeio/kdirlister.cpp:293 tdeio/krun.cpp:864
-#: tdeio/paste.cpp:213 tdeio/renamedlg.cpp:431
+#: tdeio/kdirlister.cpp:296 tdeio/kdirlister.cpp:307 tdeio/krun.cpp:996
+#: tdeio/paste.cpp:213 tdeio/renamedlg.cpp:433
 #, c-format
 msgid ""
 "Malformed URL\n"
@@ -140,6 +1752,107 @@ msgstr ""
 "URL Annilys \n"
 " %1"
 
+#: tdeio/krun.cpp:128
+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>"
+
+#: tdeio/krun.cpp:173
+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>"
+
+#: tdeio/krun.cpp:180
+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>"
+
+#: tdeio/krun.cpp:217
+#, fuzzy
+msgid "You are not authorized to open this file."
+msgstr "Nid ydych wedi cael eich awdurdodi i weithredu'r ffeil yma."
+
+#: tdefile/kopenwith.cpp:835 tdeio/krun.cpp:221
+msgid "Open with:"
+msgstr "Agor Efo:"
+
+#: tdeio/krun.cpp:559
+msgid "You are not authorized to execute this file."
+msgstr "Nid ydych wedi cael eich awdurdodi i weithredu'r ffeil yma."
+
+#: tdeio/krun.cpp:579
+#, c-format
+msgid "Launching %1"
+msgstr "Ymgychwyn %1"
+
+#: tdeio/krun.cpp:774
+msgid "You are not authorized to execute this service."
+msgstr "Nid ydych wedi cael eich awdurdodi i weithredu'r gwasanaeth yma."
+
+#: tdeio/krun.cpp:1033
+msgid ""
+"<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>"
+
+#: tdeio/krun.cpp:1555
+#, fuzzy
+msgid "Could not find the program '%1'"
+msgstr "Methu darganfod y rhaglen '%1'"
+
+#: tdefile/kpropertiesdialog.cpp:2754 tdeio/kmimetypechooser.cpp:75
+msgid "Mime Type"
+msgstr "Math MIME"
+
+#: tdefile/kpropertiesdialog.cpp:2765 tdeio/kmimetypechooser.cpp:80
+msgid "Comment"
+msgstr "Esboniad"
+
+#: tdeio/kmimetypechooser.cpp:84
+msgid "Patterns"
+msgstr "Patrymau"
+
+#: tdeio/kmimetypechooser.cpp:94
+msgid "&Edit..."
+msgstr "&Golygu..."
+
+#: tdeio/kmimetypechooser.cpp:104
+#, fuzzy
+msgid "Click this button to display the familiar TDE mime type editor."
+msgstr "Cliciwch y botwm yma i greu plygell newydd."
+
+#: tdeio/statusbarprogress.cpp:132
+msgid " Stalled "
+msgstr "Wedi seibio"
+
+#: tdeio/passdlg.cpp:57
+msgid "Password"
+msgstr "Cyfrinair"
+
+#: tdeio/passdlg.cpp:98
+#, fuzzy
+msgid "You need to supply a username and a password"
+msgstr "Rhaid i chi ddarparu enw cyfrif a cyfrinair"
+
+#: tdefile/kpropertiesdialog.cpp:3789 tdeio/passdlg.cpp:108
+msgid "&Username:"
+msgstr "&Enw Defnyddiwr:"
+
+#: tdeio/passdlg.cpp:125
+msgid "&Password:"
+msgstr "&Cyfrinair"
+
+#: tdeio/passdlg.cpp:147
+msgid "&Keep password"
+msgstr "&Cadw Cyfrinair"
+
 #: tdeio/paste.cpp:49 tdeio/paste.cpp:115
 #, fuzzy
 msgid "Filename for clipboard content:"
@@ -180,28 +1893,6 @@ msgstr ""
 msgid "&Paste Clipboard Contents"
 msgstr "Enw ffeil i gynnwys gludfwrdd:"
 
-#: tdeio/observer.cpp:332 misc/uiserver.cpp:1218
-msgid "The peer SSL certificate appears to be corrupt."
-msgstr "Ymddengys bod tystysgrif SSL y cymar yn llygredig."
-
-#: tdeio/observer.cpp:332 tdeio/tcpslavebase.cpp:706 misc/uiserver.cpp:1218
-msgid "SSL"
-msgstr "SSL"
-
-#: tdeio/chmodjob.cpp:173
-#, fuzzy
-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 ""
-"<qt>Methu newid perchnogaeth y ffeil <b>%1</b> Does ganddych dim digon o "
-"hawliau i gyflawni'r newid.</qt>"
-
-#: tdeio/chmodjob.cpp:173
-#, fuzzy
-msgid "&Skip File"
-msgstr "&Ffeil"
-
 #: tdeio/tdefilemetainfo.cpp:844
 msgid "s"
 msgstr "s"
@@ -254,6 +1945,63 @@ msgstr "Hz"
 msgid "mm"
 msgstr "mM"
 
+#: tdeio/chmodjob.cpp:173
+#, fuzzy
+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 ""
+"<qt>Methu newid perchnogaeth y ffeil <b>%1</b> Does ganddych dim digon o "
+"hawliau i gyflawni'r newid.</qt>"
+
+#: tdeio/chmodjob.cpp:173
+#, fuzzy
+msgid "&Skip File"
+msgstr "&Ffeil"
+
+#: tdeio/tdefileitem.cpp:899
+msgid "Symbolic Link"
+msgstr "Cyswllt Symbolaidd"
+
+#: tdeio/tdefileitem.cpp:901
+msgid "%1 (Link)"
+msgstr "%1 (Cyswllt)"
+
+#: tdefile/kpropertiesdialog.cpp:951 tdeio/tdefileitem.cpp:944
+msgid "Type:"
+msgstr "Math:"
+
+#: tdeio/tdefileitem.cpp:948
+#, fuzzy
+msgid "Link to %1 (%2)"
+msgstr "Cyswllt i %1"
+
+#: tdefile/kpropertiesdialog.cpp:1001 tdeio/tdefileitem.cpp:956
+msgid "Size:"
+msgstr "Maint:"
+
+#: tdefile/kpropertiesdialog.cpp:1069 tdeio/tdefileitem.cpp:961
+msgid "Modified:"
+msgstr "Newidwyd:"
+
+#: tdeio/tdefileitem.cpp:967
+msgid "Owner:"
+msgstr "Perchennog:"
+
+#: tdeio/tdefileitem.cpp:968
+msgid "Permissions:"
+msgstr "Caniatadau "
+
+#: tdeio/netaccess.cpp:67
+msgid "File '%1' is not readable"
+msgstr "Nid yw'r ffeil '%1' yn ddarllenadwy"
+
+#: tdeio/netaccess.cpp:461
+#, fuzzy
+msgid "ERROR: Unknown protocol '%1'"
+msgstr ""
+"Protocol anhysbys '%1'. \n"
+
 #: tdeio/kmimetype.cpp:110
 #, fuzzy
 msgid "No mime types installed."
@@ -268,11 +2016,11 @@ msgstr ""
 "Methu canfod math MIME\n"
 " %1"
 
-#: tdeio/kmimetype.cpp:796
+#: tdeio/kmimetype.cpp:794
 msgid "The desktop entry file %1 has no Type=... entry."
 msgstr "Mae'r ffeil cofnod penbwrdd  %1 heb gofnod Type= ..."
 
-#: tdeio/kmimetype.cpp:817
+#: tdeio/kmimetype.cpp:815
 msgid ""
 "The desktop entry of type\n"
 "%1\n"
@@ -282,7 +2030,7 @@ msgstr ""
 " %1\n"
 " yn anhysbys."
 
-#: tdeio/kmimetype.cpp:831 tdeio/kmimetype.cpp:933 tdeio/kmimetype.cpp:1115
+#: tdeio/kmimetype.cpp:829 tdeio/kmimetype.cpp:931 tdeio/kmimetype.cpp:1113
 msgid ""
 "The desktop entry file\n"
 "%1\n"
@@ -292,7 +2040,7 @@ msgstr ""
 " %1\n"
 " o fath FSDevice ond nid oes cofnod Dev= ... ganddo."
 
-#: tdeio/kmimetype.cpp:877
+#: tdeio/kmimetype.cpp:875
 msgid ""
 "The desktop entry file\n"
 "%1\n"
@@ -302,19 +2050,19 @@ msgstr ""
 " %1\n"
 " o fath Link ond nid oes  cofnod URL= ... ganddo."
 
-#: tdeio/kmimetype.cpp:943
+#: tdeio/kmimetype.cpp:941
 msgid "Mount"
 msgstr "Gosod"
 
-#: tdeio/kmimetype.cpp:954
+#: tdeio/kmimetype.cpp:952
 msgid "Eject"
 msgstr "Allfwrw"
 
-#: tdeio/kmimetype.cpp:956
+#: tdeio/kmimetype.cpp:954
 msgid "Unmount"
 msgstr "Datosod"
 
-#: tdeio/kmimetype.cpp:1073
+#: tdeio/kmimetype.cpp:1071
 msgid ""
 "The desktop entry file\n"
 "%1\n"
@@ -326,130 +2074,9 @@ msgstr ""
 " gyda cofnod dewislen annilys\n"
 " %2."
 
-#: tdeio/tcpslavebase.cpp:319
-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. "
-
-#: tdeio/tcpslavebase.cpp:325 tdeio/tcpslavebase.cpp:1087
-msgid "Security Information"
-msgstr "Gwybodaeth Ddiogelwch"
-
-#: tdeio/tcpslavebase.cpp:326
-#, fuzzy
-msgid "C&ontinue Loading"
-msgstr "Dal i Lwytho"
-
-#: tdeio/tcpslavebase.cpp:677
-msgid "Enter the certificate password:"
-msgstr "Mewnosodwch cyfrinair y tystysgrif:"
-
-#: tdeio/tcpslavebase.cpp:678
-msgid "SSL Certificate Password"
-msgstr "Cyfrinair Tystysgrif SSL"
-
-#: tdeio/tcpslavebase.cpp:691
-msgid "Unable to open the certificate. Try a new password?"
-msgstr "Methu agor y tystysgrif.  Ceisio cyfrinair newydd?"
-
-#: tdeio/tcpslavebase.cpp:704
-msgid "The procedure to set the client certificate for the session failed."
-msgstr "Methodd y weithdrefn i osod y tystysgrif cleient i'r sesiwn."
-
-#: tdeio/tcpslavebase.cpp:875
-msgid ""
-"The IP address of the host %1 does not match the one the certificate was issued "
-"to."
-msgstr ""
-"Nid yw cyfeiriad IP gwesteiwr %1 yn cydweddu â'r un a rowyd y tystysgrif iddo."
-
-#: tdeio/tcpslavebase.cpp:880 tdeio/tcpslavebase.cpp:888 tdeio/tcpslavebase.cpp:923
-#: tdeio/tcpslavebase.cpp:997 tdeio/tcpslavebase.cpp:1009
-#: tdeio/tcpslavebase.cpp:1018 tdeio/tcpslavebase.cpp:1049
-msgid "Server Authentication"
-msgstr "Dilysiant Gweinydd"
-
-#: tdeio/tcpslavebase.cpp:881 tdeio/tcpslavebase.cpp:889 tdeio/tcpslavebase.cpp:1019
-msgid "&Details"
-msgstr "&Manylion"
-
-#: tdeio/tcpslavebase.cpp:882 tdeio/tcpslavebase.cpp:890
-msgid "Co&ntinue"
-msgstr "Par&hau"
-
-#: tdeio/tcpslavebase.cpp:884 tdeio/tcpslavebase.cpp:1014
-msgid "The server certificate failed the authenticity test (%1)."
-msgstr "Methodd y tystysgrif gweinydd y prawf dilysiant (%1)."
-
-#: tdeio/tcpslavebase.cpp:920 tdeio/tcpslavebase.cpp:1046
-msgid ""
-"Would you like to accept this certificate forever without being prompted?"
-msgstr "Liciwch chi dderbyn y tystysgrif yma am byth heb gofweini arnoch?"
-
-#: tdeio/tcpslavebase.cpp:924 tdeio/tcpslavebase.cpp:1050
-msgid "&Forever"
-msgstr "&Am Byth"
-
-#: tdeio/tcpslavebase.cpp:925 tdeio/tcpslavebase.cpp:1051
-msgid "&Current Sessions Only"
-msgstr "&Sesiynau Cyfredol yn Unig"
-
-#: tdeio/tcpslavebase.cpp:996
-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?"
-
-#: tdeio/tcpslavebase.cpp:1008
-msgid ""
-"SSL certificate is being rejected as requested. You can disable this in the TDE "
-"Control Center."
-msgstr ""
-"Gwrthodir y tystysgrif fel a ofynwyd.  Gallwch analluogi hyn yn y ganolfan "
-"rheoli TDE."
-
-#: tdeio/tcpslavebase.cpp:1020
-msgid "Co&nnect"
-msgstr "Cy&sylltu"
-
-#: tdeio/tcpslavebase.cpp:1076
-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."
-
-#: tdeio/tcpslavebase.cpp:1088
-#, fuzzy
-msgid "Display SSL &Information"
-msgstr "Dangos Gwybodaeth SSL"
-
-#: tdeio/tcpslavebase.cpp:1090
-msgid "C&onnect"
-msgstr "C&ysylltu"
-
-#: tdeio/kdcopservicestarter.cpp:64
-#, c-format
-msgid "No service implementing %1"
-msgstr "Nid oes gwasanaeth sy'n gweithredu %1"
-
-#: tdeio/kscan.cpp:52
-msgid "Acquire Image"
-msgstr "Cipio Delwedd"
-
-#: tdeio/kscan.cpp:95
-msgid "OCR Image"
-msgstr "Delwedd OCR"
+#: tdeio/kimageio.cpp:231
+msgid "All Pictures"
+msgstr "Pob Delwedd"
 
 #: tdeio/defaultprogress.cpp:104
 msgid "Source:"
@@ -471,10 +2098,6 @@ msgstr "Agor &Ffeil"
 msgid "Open &Destination"
 msgstr "Agor &Cyrchfan"
 
-#: tdeio/defaultprogress.cpp:179 misc/uiserver.cpp:632
-msgid "Progress Dialog"
-msgstr "Deialog Cynnydd"
-
 #: tdeio/defaultprogress.cpp:226
 #, no-c-format
 msgid ""
@@ -551,10 +2174,6 @@ msgstr ""
 "%1 / %n ffeil\n"
 "%1 / %n ffeil"
 
-#: tdeio/defaultprogress.cpp:325 misc/uiserver.cpp:288
-msgid "Stalled"
-msgstr "Wedi seibio"
-
 #: tdeio/defaultprogress.cpp:327
 msgid "%1/s ( %2 remaining )"
 msgstr "%1/s ( %2 ar ôl )"
@@ -588,10 +2207,6 @@ msgstr "Archwilio Cynnydd Ffeil"
 msgid "Mounting %1"
 msgstr "Gosod %1"
 
-#: tdeio/defaultprogress.cpp:410 misc/uiserver.cpp:378
-msgid "Unmounting"
-msgstr "Ddi-osod"
-
 #: tdeio/defaultprogress.cpp:418
 #, c-format
 msgid "Resuming from %1"
@@ -605,13 +2220,9 @@ msgstr "Amhosib ail-ddechrau"
 msgid "%1/s (done)"
 msgstr "%1/s (wedi'i wneud)"
 
-#: tdeio/kservice.cpp:837
-msgid "Updating System Configuration"
-msgstr "Diweddaru Ffurfweddiad Cysawd"
-
-#: tdeio/kservice.cpp:838
-msgid "Updating system configuration."
-msgstr "Diweddaru ffurfweddiad y cysawd."
+#: tdeio/kshred.cpp:212
+msgid "Shredding:  pass %1 of 35"
+msgstr "Rhwygo: tro %1 o 35"
 
 #: tdeio/global.cpp:48 tdeio/global.cpp:81
 msgid "%1 B"
@@ -689,22 +2300,22 @@ msgstr ""
 "%n Plygell \n"
 "%n Plygell"
 
-#: tdeio/global.cpp:220
+#: tdeio/global.cpp:237
 #, c-format
 msgid "Could not read %1."
 msgstr "Methu darllen %1."
 
-#: tdeio/global.cpp:223
+#: tdeio/global.cpp:240
 #, fuzzy, c-format
 msgid "Could not write to %1."
 msgstr "Methu ysgrifennu at %1"
 
-#: tdeio/global.cpp:226
+#: tdeio/global.cpp:243
 #, fuzzy, c-format
 msgid "Could not start process %1."
 msgstr "Methu dechrau proses %1"
 
-#: tdeio/global.cpp:229
+#: tdeio/global.cpp:246
 #, c-format
 msgid ""
 "Internal Error\n"
@@ -715,54 +2326,54 @@ msgstr ""
 " Gyrrwch adroddiad nam llawn i http://bugs.kde.org\n"
 " %1"
 
-#: tdeio/global.cpp:232
+#: tdeio/global.cpp:249
 #, c-format
 msgid "Malformed URL %1."
 msgstr "URL annilys %1."
 
-#: tdeio/global.cpp:235
+#: tdeio/global.cpp:252
 msgid "The protocol %1 is not supported."
 msgstr "Ni chefnogir y protocol %1."
 
-#: tdeio/global.cpp:238
+#: tdeio/global.cpp:255
 msgid "The protocol %1 is only a filter protocol."
 msgstr "Dim ond protocol hidlo yw protocol %1."
 
-#: tdeio/global.cpp:245
+#: tdeio/global.cpp:262
 msgid "%1 is a folder, but a file was expected."
 msgstr "Plygell yw %1, ond disgwylwyd ffeil."
 
-#: tdeio/global.cpp:248
+#: tdeio/global.cpp:265
 msgid "%1 is a file, but a folder was expected."
 msgstr "Ffeil yw %1, ond disgwylwyd plygell."
 
-#: tdeio/global.cpp:251
+#: tdeio/global.cpp:268
 msgid "The file or folder %1 does not exist."
 msgstr "Nid ydy'r ffeil neu plygell %1 mewn bod."
 
-#: tdeio/global.cpp:254
+#: tdeio/global.cpp:271
 msgid "A file named %1 already exists."
 msgstr "Mae ffeil o'r enw %1 mewn bod yn barod."
 
-#: tdeio/global.cpp:257
+#: tdeio/global.cpp:274
 msgid "A folder named %1 already exists."
 msgstr "Mae plygell o'r enw %1 mewn bod yn barod."
 
-#: tdeio/global.cpp:260
+#: tdeio/global.cpp:277
 msgid "No hostname specified."
 msgstr "Nid yw enw'r gwesteiwr wedi'i benodi."
 
-#: tdeio/global.cpp:260
+#: tdeio/global.cpp:277
 #, c-format
 msgid "Unknown host %1"
 msgstr "Gwesteiwr anhysbys %1"
 
-#: tdeio/global.cpp:263
+#: tdeio/global.cpp:280
 #, fuzzy, c-format
 msgid "Access denied to %1."
 msgstr "Gwaharddwyd cyrchiad i %1"
 
-#: tdeio/global.cpp:266
+#: tdeio/global.cpp:283
 #, fuzzy, c-format
 msgid ""
 "Access denied.\n"
@@ -771,46 +2382,46 @@ msgstr ""
 "Gwaharddwyd cyrchiad. \n"
 "Methu ysgrifennu i %1"
 
-#: tdeio/global.cpp:269
+#: tdeio/global.cpp:286
 #, fuzzy, c-format
 msgid "Could not enter folder %1."
 msgstr "Methu mynd i mewn i blygell %1"
 
-#: tdeio/global.cpp:272
+#: tdeio/global.cpp:289
 msgid "The protocol %1 does not implement a folder service."
 msgstr "Nid yw'r protocol %1 yn gweithredoli gwasanaeth plygell."
 
-#: tdeio/global.cpp:275
+#: tdeio/global.cpp:292
 #, fuzzy, c-format
 msgid "Found a cyclic link in %1."
 msgstr "Wedi canfod cyswllt cylchredol yn %1"
 
-#: tdeio/global.cpp:281
+#: tdeio/global.cpp:298
 #, fuzzy, c-format
 msgid "Found a cyclic link while copying %1."
 msgstr "Wedi canfod cyswllt cylchredol wrth gopïo %1"
 
-#: tdeio/global.cpp:284
+#: tdeio/global.cpp:301
 #, fuzzy, c-format
 msgid "Could not create socket for accessing %1."
 msgstr "Methu creu soced i gyrchu %1"
 
-#: tdeio/global.cpp:287
+#: tdeio/global.cpp:304
 #, fuzzy, c-format
 msgid "Could not connect to host %1."
 msgstr "Methu cysylltu i westeiwr %1"
 
-#: tdeio/global.cpp:290
+#: tdeio/global.cpp:307
 #, fuzzy
 msgid "Connection to host %1 is broken."
 msgstr "Cysylltiad i westeiwr %1 wedi torri"
 
-#: tdeio/global.cpp:293
+#: tdeio/global.cpp:310
 #, fuzzy
 msgid "The protocol %1 is not a filter protocol."
 msgstr "Nid yw'r protocol %1 yn protocol hidl"
 
-#: tdeio/global.cpp:296
+#: tdeio/global.cpp:313
 #, c-format
 msgid ""
 "Could not mount device.\n"
@@ -821,7 +2432,7 @@ msgstr ""
 " Y gwall a adroddwyd oedd:\n"
 " %1"
 
-#: tdeio/global.cpp:299
+#: tdeio/global.cpp:316
 #, c-format
 msgid ""
 "Could not unmount device.\n"
@@ -832,76 +2443,76 @@ msgstr ""
 " Y gwall a adroddwyd oedd:\n"
 " %1"
 
-#: tdeio/global.cpp:302
+#: tdeio/global.cpp:319
 #, fuzzy, c-format
 msgid "Could not read file %1."
 msgstr "Methu darllen ffeil %1"
 
-#: tdeio/global.cpp:305
+#: tdeio/global.cpp:322
 #, fuzzy, c-format
 msgid "Could not write to file %1."
 msgstr "Methu ysgrifennu i ffeil %1"
 
-#: tdeio/global.cpp:308
+#: tdeio/global.cpp:325
 #, fuzzy, c-format
 msgid "Could not bind %1."
 msgstr "Methu rhwymo %1"
 
-#: tdeio/global.cpp:311
+#: tdeio/global.cpp:328
 #, fuzzy, c-format
 msgid "Could not listen %1."
 msgstr "Methu gwrando %1"
 
-#: tdeio/global.cpp:314
+#: tdeio/global.cpp:331
 #, fuzzy, c-format
 msgid "Could not accept %1."
 msgstr "Methu derbyn %1"
 
-#: tdeio/global.cpp:320
+#: tdeio/global.cpp:337
 #, fuzzy, c-format
 msgid "Could not access %1."
 msgstr "Methu cyrchu %1"
 
-#: tdeio/global.cpp:323
+#: tdeio/global.cpp:340
 #, fuzzy, c-format
 msgid "Could not terminate listing %1."
 msgstr "Methu terfynnu rhestriad %1"
 
-#: tdeio/global.cpp:326
+#: tdeio/global.cpp:343
 #, fuzzy, c-format
 msgid "Could not make folder %1."
 msgstr "Methu creu plygell %1"
 
-#: tdeio/global.cpp:329
+#: tdeio/global.cpp:346
 #, fuzzy, c-format
 msgid "Could not remove folder %1."
 msgstr "Methu gwaredu plygell %1"
 
-#: tdeio/global.cpp:332
+#: tdeio/global.cpp:349
 #, fuzzy, c-format
 msgid "Could not resume file %1."
 msgstr "Methu ail-ddechrau ffeil %1"
 
-#: tdeio/global.cpp:335
+#: tdeio/global.cpp:352
 #, fuzzy, c-format
 msgid "Could not rename file %1."
 msgstr "Methu ail-enwi ffeil %1"
 
-#: tdeio/global.cpp:338
+#: tdeio/global.cpp:355
 #, fuzzy, c-format
 msgid "Could not change permissions for %1."
 msgstr "Methu newid caniatàd i %1"
 
-#: tdeio/global.cpp:341
+#: tdeio/global.cpp:358
 #, fuzzy, c-format
 msgid "Could not delete file %1."
 msgstr "Methu dileu ffeil %1"
 
-#: tdeio/global.cpp:344
+#: tdeio/global.cpp:361
 msgid "The process for the %1 protocol died unexpectedly."
 msgstr "Marwodd y broses i brotocol %1 yn annisgwyl."
 
-#: tdeio/global.cpp:347
+#: tdeio/global.cpp:364
 #, fuzzy, c-format
 msgid ""
 "Error. Out of memory.\n"
@@ -910,7 +2521,7 @@ msgstr ""
 "Gwall.  Allan o Gof. \n"
 " %1"
 
-#: tdeio/global.cpp:350
+#: tdeio/global.cpp:367
 #, c-format
 msgid ""
 "Unknown proxy host\n"
@@ -919,11 +2530,11 @@ msgstr ""
 "Gwesteiwr dirprwy anhysbys\n"
 " %1"
 
-#: tdeio/global.cpp:353
+#: tdeio/global.cpp:370
 msgid "Authorization failed, %1 authentication not supported"
 msgstr "Methu awdurdodi, ni chynhelir dilysiant %1"
 
-#: tdeio/global.cpp:356
+#: tdeio/global.cpp:373
 #, c-format
 msgid ""
 "User canceled action\n"
@@ -932,7 +2543,7 @@ msgstr ""
 "Diddymodd y defnyddiwr y weithred\n"
 " %1"
 
-#: tdeio/global.cpp:359
+#: tdeio/global.cpp:376
 #, c-format
 msgid ""
 "Internal error in server\n"
@@ -941,7 +2552,7 @@ msgstr ""
 "Gwall mewnol yng gweinydd\n"
 " %1"
 
-#: tdeio/global.cpp:362
+#: tdeio/global.cpp:379
 #, c-format
 msgid ""
 "Timeout on server\n"
@@ -950,7 +2561,7 @@ msgstr ""
 "Goramser ar y gweinydd \n"
 " %1"
 
-#: tdeio/global.cpp:365
+#: tdeio/global.cpp:382
 #, c-format
 msgid ""
 "Unknown error\n"
@@ -959,7 +2570,7 @@ msgstr ""
 "Gwall anhysbys \n"
 " %1"
 
-#: tdeio/global.cpp:368
+#: tdeio/global.cpp:385
 #, c-format
 msgid ""
 "Unknown interrupt\n"
@@ -968,7 +2579,7 @@ msgstr ""
 "Ymyriad anhysbys\n"
 " %1"
 
-#: tdeio/global.cpp:379
+#: tdeio/global.cpp:396
 msgid ""
 "Could not delete original file %1.\n"
 "Please check permissions."
@@ -976,7 +2587,7 @@ msgstr ""
 "Methu dileu'r ffeil gwreiddiol %1.\n"
 " Cywirwch y caniatadau."
 
-#: tdeio/global.cpp:382
+#: tdeio/global.cpp:399
 msgid ""
 "Could not delete partial file %1.\n"
 "Please check permissions."
@@ -984,7 +2595,7 @@ msgstr ""
 "Methu dileu ffeil rhannol %1.\n"
 " Cywirwch y caniatadau."
 
-#: tdeio/global.cpp:385
+#: tdeio/global.cpp:402
 msgid ""
 "Could not rename original file %1.\n"
 "Please check permissions."
@@ -992,7 +2603,7 @@ msgstr ""
 "Methu ail-enwi ffeil gwreiddiol %1.\n"
 " Cywirwch y caniatadau."
 
-#: tdeio/global.cpp:388
+#: tdeio/global.cpp:405
 msgid ""
 "Could not rename partial file %1.\n"
 "Please check permissions."
@@ -1000,7 +2611,7 @@ msgstr ""
 "Methu ail-enwi ffeil rhannol %1.\n"
 " Cywirwch y caniatadau."
 
-#: tdeio/global.cpp:391
+#: tdeio/global.cpp:408
 msgid ""
 "Could not create symlink %1.\n"
 "Please check permissions."
@@ -1008,7 +2619,7 @@ msgstr ""
 "Methu creu cyswllt symbolaidd %1.\n"
 " Cywirwch y caniatadau."
 
-#: tdeio/global.cpp:397
+#: tdeio/global.cpp:414
 msgid ""
 "Could not write file %1.\n"
 "Disk full."
@@ -1016,7 +2627,7 @@ msgstr ""
 "Methu ysgrifennu ffeil %1. \n"
 " Mae'r ddisg yn llawn."
 
-#: tdeio/global.cpp:400
+#: tdeio/global.cpp:417
 #, c-format
 msgid ""
 "The source and destination are the same file.\n"
@@ -1025,16 +2636,23 @@ msgstr ""
 "Yr un un ffeil yw'r tarddiad a'r cyrchfan. \n"
 " %1"
 
-#: tdeio/global.cpp:406
+#: tdeio/global.cpp:423
 msgid "%1 is required by the server, but is not available."
 msgstr "Mae angen %1 gan y gweinydd, ond nid yw ar gael."
 
-#: tdeio/global.cpp:409
+#: tdeio/global.cpp:426
 #, fuzzy
 msgid "Access to restricted port in POST denied."
 msgstr "Gwaharddwyd cyrchiad i borth cyfyngedig yn POST"
 
-#: tdeio/global.cpp:412
+#: tdeio/global.cpp:429
+#, fuzzy
+msgid ""
+"Could not access %1.\n"
+"Offline mode active."
+msgstr "Methu cyrchu %1"
+
+#: tdeio/global.cpp:432
 msgid ""
 "Unknown error code %1\n"
 "%2\n"
@@ -1044,128 +2662,128 @@ msgstr ""
 " %2\n"
 " Anfonwch adroddiad nam llawn i http://bugs.kde.org."
 
-#: tdeio/global.cpp:422
+#: tdeio/global.cpp:442
 #, fuzzy, c-format
 msgid "Opening connections is not supported with the protocol %1."
 msgstr "Ni chynhelir agor cysylltiadau efo'r protocol %1"
 
-#: tdeio/global.cpp:424
+#: tdeio/global.cpp:444
 #, fuzzy, c-format
 msgid "Closing connections is not supported with the protocol %1."
 msgstr "Ni chynhelir cau cysylltiadau efo'r protocol %1"
 
-#: tdeio/global.cpp:426
+#: tdeio/global.cpp:446
 #, fuzzy, c-format
 msgid "Accessing files is not supported with the protocol %1."
 msgstr "Ni chynhelir cyrchu cysylltiadau efo'r protocol %1"
 
-#: tdeio/global.cpp:428
+#: tdeio/global.cpp:448
 #, fuzzy
 msgid "Writing to %1 is not supported."
 msgstr "Ni chynhelir ysgrifennu at %1"
 
-#: tdeio/global.cpp:430
+#: tdeio/global.cpp:450
 #, fuzzy, c-format
 msgid "There are no special actions available for protocol %1."
 msgstr "Dim gweithrediadau arbennig ar gael i brotocol %1"
 
-#: tdeio/global.cpp:432
+#: tdeio/global.cpp:452
 #, fuzzy, c-format
 msgid "Listing folders is not supported for protocol %1."
 msgstr "Ni chynhelir rhestru plygyll efo'r protocol %1"
 
-#: tdeio/global.cpp:434
+#: tdeio/global.cpp:454
 #, fuzzy
 msgid "Retrieving data from %1 is not supported."
 msgstr "Ni chynhelir nôl data oddiwrth %1"
 
-#: tdeio/global.cpp:436
+#: tdeio/global.cpp:456
 #, fuzzy
 msgid "Retrieving mime type information from %1 is not supported."
 msgstr "Ni chynhelir nôl data math mime oddiwrth %1"
 
-#: tdeio/global.cpp:438
+#: tdeio/global.cpp:458
 #, fuzzy
 msgid "Renaming or moving files within %1 is not supported."
 msgstr "Ni chynhelir ail-enwi neu symud ffeiliau tu mewn i %1"
 
-#: tdeio/global.cpp:440
+#: tdeio/global.cpp:460
 #, fuzzy, c-format
 msgid "Creating symlinks is not supported with protocol %1."
 msgstr "Ni chynhelir creu cysylltau symbolaidd efo'r protocol %1"
 
-#: tdeio/global.cpp:442
+#: tdeio/global.cpp:462
 #, fuzzy
 msgid "Copying files within %1 is not supported."
 msgstr "Ni chynhelir copïo ffeiliau tu mewn i %1"
 
-#: tdeio/global.cpp:444
+#: tdeio/global.cpp:464
 #, fuzzy
 msgid "Deleting files from %1 is not supported."
 msgstr "Ni chynhelir dileu ffeiliau o %1"
 
-#: tdeio/global.cpp:446
+#: tdeio/global.cpp:466
 #, fuzzy, c-format
 msgid "Creating folders is not supported with protocol %1."
 msgstr "Ni chynhelir creu plygyll efo'r protocol %1"
 
-#: tdeio/global.cpp:448
+#: tdeio/global.cpp:468
 #, fuzzy, c-format
 msgid "Changing the attributes of files is not supported with protocol %1."
 msgstr "Ni chynhelir newid priodoleddau ffeiliau efo'r protocol %1"
 
-#: tdeio/global.cpp:450
+#: tdeio/global.cpp:470
 #, fuzzy
 msgid "Using sub-URLs with %1 is not supported."
 msgstr "Ni chynhelir defnyddio is-URLs efo %1"
 
-#: tdeio/global.cpp:452
+#: tdeio/global.cpp:472
 #, fuzzy, c-format
 msgid "Multiple get is not supported with protocol %1."
 msgstr "Ni chynhelir nôl lluosol efo'r protocol %1"
 
-#: tdeio/global.cpp:454
+#: tdeio/global.cpp:474
 #, fuzzy
 msgid "Protocol %1 does not support action %2."
 msgstr "Nid yw protocol %1 yn cynnal gweithred %2"
 
-#: tdeio/global.cpp:474 tdeio/global.cpp:556
+#: tdeio/global.cpp:494 tdeio/global.cpp:576
 msgid "(unknown)"
 msgstr "(anhysbys)"
 
-#: tdeio/global.cpp:486
+#: tdeio/global.cpp:506
 msgid "<b>Technical reason</b>: "
 msgstr "<b>Rheswm technegol</b>:"
 
-#: tdeio/global.cpp:487
+#: tdeio/global.cpp:507
 msgid "</p><p><b>Details of the request</b>:"
 msgstr "</p><p><b>Manylion y cais</b>:"
 
-#: tdeio/global.cpp:488
+#: tdeio/global.cpp:508
 msgid "</p><ul><li>URL: %1</li>"
 msgstr "</p><ul><li>URL: %1</li>"
 
-#: tdeio/global.cpp:490
+#: tdeio/global.cpp:510
 msgid "<li>Protocol: %1</li>"
 msgstr "<li>Protocol: %1</li>"
 
-#: tdeio/global.cpp:492
+#: tdeio/global.cpp:512
 msgid "<li>Date and time: %1</li>"
 msgstr "<li>Dyddiad ac Amser: %1</li>"
 
-#: tdeio/global.cpp:493
+#: tdeio/global.cpp:513
 msgid "<li>Additional information: %1</li></ul>"
 msgstr "<li>Gwybodaeth ychwanegol: %1</li></ul>"
 
-#: tdeio/global.cpp:495
+#: tdeio/global.cpp:515
 msgid "<p><b>Possible causes</b>:</p><ul><li>"
 msgstr "<p><b>Achosion Posibl</b>:</p><ul><li> "
 
-#: tdeio/global.cpp:500
+#: tdeio/global.cpp:520
 msgid "<p><b>Possible solutions</b>:</p><ul><li>"
 msgstr "<p><b>Datrysiadau Posibl</b>:</p><ul><li> "
 
-#: tdeio/global.cpp:566
+#: tdeio/global.cpp:586
 msgid ""
 "Contact your appropriate computer support system, whether the system "
 "administrator, or technical support group for further assistance."
@@ -1173,15 +2791,15 @@ msgstr ""
 "Cysylltwch â'ch cysawd cynnal cyfrifiadur addas (ai'r gwasanaethwr cysawd, "
 "neu'r grw^p cynnal technegol) am fwy o gymorth."
 
-#: tdeio/global.cpp:569
+#: tdeio/global.cpp:589
 msgid "Contact the administrator of the server for further assistance."
 msgstr "Cysylltwch â gwasanaethwr y gweinydd am fwy o gymorth."
 
-#: tdeio/global.cpp:572
+#: tdeio/global.cpp:592
 msgid "Check your access permissions on this resource."
 msgstr "Cywirwch eich caniatadau cyrch ar yr adnodd yma."
 
-#: tdeio/global.cpp:573
+#: tdeio/global.cpp:593
 msgid ""
 "Your access permissions may be inadequate to perform the requested operation on "
 "this resource."
@@ -1189,14 +2807,14 @@ msgstr ""
 "Efallai bod eich caniatadau cyrch yn annigonol i gyflawni'r gweithrediad a "
 "gofynwyd ar yr adnodd yma."
 
-#: tdeio/global.cpp:575
+#: tdeio/global.cpp:595
 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."
 
-#: tdeio/global.cpp:577
+#: tdeio/global.cpp:597
 msgid ""
 "Check to make sure that no other application or user is using the file or has "
 "locked the file."
@@ -1204,15 +2822,15 @@ msgstr ""
 "Cywirwch i sicrhau nad yw cymhwysiad neu ddefnyddiwr arall yn defnyddio'r "
 "ffeil, neu wedi cloi'r ffeil."
 
-#: tdeio/global.cpp:579
+#: tdeio/global.cpp:599
 msgid "Although unlikely, a hardware error may have occurred."
 msgstr "Er annhebygol, efallai bod gwall caletwedd wedi digwydd."
 
-#: tdeio/global.cpp:581
+#: tdeio/global.cpp:601
 msgid "You may have encountered a bug in the program."
 msgstr "Efallai eich bod wedi cyfarfod nam yn y rhaglen."
 
-#: tdeio/global.cpp:582
+#: tdeio/global.cpp:602
 msgid ""
 "This is most likely to be caused by a bug in the program. Please consider "
 "submitting a full bug report as detailed below."
@@ -1220,7 +2838,7 @@ msgstr ""
 "Mae'n eitha debyg yr achosir hynny gan nam yn y rhaglen.  Ystyriedwch gyflwyno "
 "adroddiad nam llawn fel yn y manylion isod."
 
-#: tdeio/global.cpp:584
+#: tdeio/global.cpp:604
 msgid ""
 "Update your software to the latest version. Your distribution should provide "
 "tools to update your software."
@@ -1228,15 +2846,17 @@ msgstr ""
 "Diweddarwch eich meddalwedd i'r fersiwn diweddaraf.  Mae'n debyg y mae eich "
 "dosbarthiad yn darparu offer i ddiweddaru eich meddalwedd."
 
-#: tdeio/global.cpp:586
+#: tdeio/global.cpp:606
+#, fuzzy
 msgid ""
 "When all else fails, please consider helping the TDE team or the third party "
 "maintainer of this software by submitting a high quality bug report. If the "
 "software is provided by a third party, please contact them directly. Otherwise, "
 "first look to see if the same bug has been submitted by someone else by "
-"searching at the <a href=\"http://bugs.kde.org/\">TDE bug reporting website</a>"
-". If not, take note of the details given above, and include them in your bug "
-"report, along with as many other details as you think might help."
+"searching at the <a href=\"http://bugs.pearsoncomputing.net//\">"
+"TDE bug reporting website</a>. If not, take note of the details given above, "
+"and include them in your bug report, along with as many other details as you "
+"think might help."
 msgstr ""
 "Pan mae popeth arall yn methu. ystyriedwch helpu'r tîm TDE neu cynhaliwr "
 "trydydd blaid y feddalwedd yma drwy gyflwyno adroddiad nam o safon uchel.  Os "
@@ -1246,11 +2866,11 @@ msgstr ""
 ". Os dim, nodwch y manylion uchod, a'u cynnwys yn eich adroddiad nam, efo "
 "cymaint o fanylion eraill ac y meddyliwch bydd o gymorth."
 
-#: tdeio/global.cpp:594
+#: tdeio/global.cpp:614
 msgid "There may have been a problem with your network connection."
 msgstr "Efallai yr oedd problem efo'ch cysylltiad rhwydwaith."
 
-#: tdeio/global.cpp:597
+#: tdeio/global.cpp:617
 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."
@@ -1258,7 +2878,7 @@ msgstr ""
 "Efallai yr oedd problem efo'ch ffurfweddiad rhwydwaith.  Os ydych wedi bod yn "
 "cyrchu'r Rhyngrwyd yn ddiweddar heb broblemau, mae hynny'n annhebyg."
 
-#: tdeio/global.cpp:600
+#: tdeio/global.cpp:620
 msgid ""
 "There may have been a problem at some point along the network path between the "
 "server and this computer."
@@ -1266,40 +2886,40 @@ msgstr ""
 "Efallai yr oedd problem rhywle ar y llwybr rhwydwaith rhwng y gweinydd a'r "
 "cyfrifiadur yma."
 
-#: tdeio/global.cpp:602
+#: tdeio/global.cpp:622
 msgid "Try again, either now or at a later time."
 msgstr "Ceisiwch eto, un ai rwan neu yn hwyrach."
 
-#: tdeio/global.cpp:603
+#: tdeio/global.cpp:623
 msgid "A protocol error or incompatibility may have occurred."
 msgstr "Effallai y ddigwyddodd gwall protocol neu anghydnawsedd."
 
-#: tdeio/global.cpp:604
+#: tdeio/global.cpp:624
 msgid "Ensure that the resource exists, and try again."
 msgstr "Sicrhewch fod yr adnodd mewn bod, a ceisiwch eto."
 
-#: tdeio/global.cpp:605
+#: tdeio/global.cpp:625
 msgid "The specified resource may not exist."
 msgstr "Efallai nad yw'r adnodd penodol mewn bod."
 
-#: tdeio/global.cpp:606
+#: tdeio/global.cpp:626
 msgid "You may have incorrectly typed the location."
 msgstr "Efallai yr ydych wedi cam-deipio'r lleoliad."
 
-#: tdeio/global.cpp:607
+#: tdeio/global.cpp:627
 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."
 
-#: tdeio/global.cpp:609
+#: tdeio/global.cpp:629
 msgid "Check your network connection status."
 msgstr "Cywirwch statws eich cysylltiad rhwydwaith."
 
-#: tdeio/global.cpp:613
+#: tdeio/global.cpp:633
 msgid "Cannot Open Resource For Reading"
 msgstr "Methu Agor Adnodd i'w Ddarllen"
 
-#: tdeio/global.cpp:614
+#: tdeio/global.cpp:634
 msgid ""
 "This means that the contents of the requested file or folder <strong>%1</strong> "
 "could not be retrieved, as read access could not be obtained."
@@ -1307,16 +2927,16 @@ msgstr ""
 "Golygir hwn nad oedd yn bosib nôl cynnwys y ffeil neu blygell<strong>%1</strong> "
 "a ofynwyd amdano, gan ni ellid cael cyrchiad darllen."
 
-#: tdeio/global.cpp:617
+#: tdeio/global.cpp:637
 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."
 
-#: tdeio/global.cpp:623
+#: tdeio/global.cpp:643
 msgid "Cannot Open Resource For Writing"
 msgstr "Methu Agor Adnodd i Ysgrifennu."
 
-#: tdeio/global.cpp:624
+#: tdeio/global.cpp:644
 msgid ""
 "This means that the file, <strong>%1</strong>, could not be written to as "
 "requested, because access with permission to write could not be obtained."
@@ -1324,15 +2944,15 @@ msgstr ""
 "Golygir hwn nad oedd yn bosib ysgrifennu at y ffeil, <strong>%1</strong>"
 ", a ofynwyd amdano, gan ni ellid cael cyrchiad ysgrifennu."
 
-#: tdeio/global.cpp:632
+#: tdeio/global.cpp:652
 msgid "Cannot Initiate the %1 Protocol"
 msgstr "Methu Cychwyn y protocol %1"
 
-#: tdeio/global.cpp:633
+#: tdeio/global.cpp:653
 msgid "Unable to Launch Process"
 msgstr "Methu Lansio Proses"
 
-#: tdeio/global.cpp:634
+#: tdeio/global.cpp:654
 msgid ""
 "The program on your computer which provides access to the <strong>%1</strong> "
 "protocol could not be started. This is usually due to technical reasons."
@@ -1340,7 +2960,7 @@ msgstr ""
 "Ni ellir dechrau'r rhaglen ar eich cyfrifiadur sy'n darparu cyrchiad i'r "
 "protocol <strong>%1</strong>.  Fel arfer, mae hynny o achos rhesymau technegol."
 
-#: tdeio/global.cpp:637
+#: tdeio/global.cpp:657
 msgid ""
 "The program which provides compatibility with this protocol may not have been "
 "updated with your last update of TDE. This can cause the program to be "
@@ -1350,11 +2970,11 @@ msgstr ""
 "diweddaru efo'ch diweddariad diwetha o TDE.  Gall hynny achosi'r rhaglen i fod "
 "yn anghytu^n efo'r fersiwn cyfredol, ac felly ni fydd hi'n cychwyn."
 
-#: tdeio/global.cpp:645
+#: tdeio/global.cpp:665
 msgid "Internal Error"
 msgstr "Gwall Mewnol"
 
-#: tdeio/global.cpp:646
+#: tdeio/global.cpp:666
 msgid ""
 "The program on your computer which provides access to the <strong>%1</strong> "
 "protocol has reported an internal error."
@@ -1362,11 +2982,11 @@ msgstr ""
 "Mae'r rhaglen ar eich cyfrifiadur sy'n darparu cyrchiad i'r protocol <strong>"
 "%1</strong> wedi adrodd gwall mewnol."
 
-#: tdeio/global.cpp:654
+#: tdeio/global.cpp:674
 msgid "Improperly Formatted URL"
 msgstr "URL heb ei Fformatio yn Ddilys "
 
-#: tdeio/global.cpp:655
+#: tdeio/global.cpp:675
 msgid ""
 "The <strong>U</strong>niform <strong>R</strong>esource <strong>L</strong>"
 "ocator (URL) that you entered was not properly formatted. The format of a URL "
@@ -1380,12 +3000,12 @@ msgstr ""
 "<blockquote><strong>protocol://user@password:www.example.org:port/directory/file"
 "name.extension?query =value</strong></blockquote> "
 
-#: tdeio/global.cpp:664
+#: tdeio/global.cpp:684
 #, c-format
 msgid "Unsupported Protocol %1"
 msgstr "Ni chyhelir y Protocol %1"
 
-#: tdeio/global.cpp:665
+#: tdeio/global.cpp:685
 msgid ""
 "The protocol <strong>%1</strong> is not supported by the TDE programs currently "
 "installed on this computer."
@@ -1393,11 +3013,11 @@ msgstr ""
 "Ni chynhelir y protocol <strong>%1</strong> gan y rhaglenni TDE sydd wedi eu "
 "gosod ar hyn o bryd ar y cyfrifiadur yma. "
 
-#: tdeio/global.cpp:668
+#: tdeio/global.cpp:688
 msgid "The requested protocol may not be supported."
 msgstr "Efallai na chynhelir y protocol a ofynwyd amdano."
 
-#: tdeio/global.cpp:669
+#: tdeio/global.cpp:689
 msgid ""
 "The versions of the %1 protocol supported by this computer and the server may "
 "be incompatible."
@@ -1405,7 +3025,7 @@ msgstr ""
 "Efallai mae fersiynau'r protocol %1 a gynhelir gan y cyfrifiadur yma a'r "
 "gweinydd yn anghytûn."
 
-#: tdeio/global.cpp:671
+#: tdeio/global.cpp:691
 #, fuzzy
 msgid ""
 "You may perform a search on the Internet for a TDE program (called a tdeioslave "
@@ -1413,20 +3033,20 @@ msgid ""
 "href=\"http://kde-apps.org/\">http://kde-apps.org/</a> "
 "and <a href=\"http://freshmeat.net/\">http://freshmeat.net/</a>."
 msgstr ""
-"Cewch chwilio ar y Rhyngrwyd am raglen TDE (o'r enw tdeioslave neu  ioslave) sy'n "
-"cynnal y protocol yma.  Mae llefydd i chwilio yn cynnwys <a "
+"Cewch chwilio ar y Rhyngrwyd am raglen TDE (o'r enw tdeioslave neu  ioslave) "
+"sy'n cynnal y protocol yma.  Mae llefydd i chwilio yn cynnwys <a "
 "href=\"http://apps.kde.com/\">http://apps.kde.com/</a> "
 "a <a href=\"http://freshmeat.net/\">http://freshmeat.net/</a>."
 
-#: tdeio/global.cpp:680
+#: tdeio/global.cpp:700
 msgid "URL Does Not Refer to a Resource."
 msgstr "Nid yw'r URL yn cyfeirio at adnodd."
 
-#: tdeio/global.cpp:681
+#: tdeio/global.cpp:701
 msgid "Protocol is a Filter Protocol"
 msgstr "Protocol Hidl yw'r Protocol"
 
-#: tdeio/global.cpp:682
+#: tdeio/global.cpp:702
 msgid ""
 "The <strong>U</strong>niform <strong>R</strong>esource <strong>L</strong>"
 "ocator (URL) that you entered did not refer to a specific resource."
@@ -1434,7 +3054,7 @@ msgstr ""
 "Nid oedd y <strong>L</strong>leolydd <strong>A</strong>dnoddau <strong>"
 "U</strong>nffurf (URL) yr ydych wedi cyflwyno yn cyfeirio at adnodd penodol."
 
-#: tdeio/global.cpp:685
+#: tdeio/global.cpp:705
 msgid ""
 "TDE is able to communicate through a protocol within a protocol; the protocol "
 "specified is only for use in such situations, however this is not one of these "
@@ -1446,12 +3066,12 @@ msgstr ""
 "sefyllfaoedd yma. Mae hwn yn ddigwyddiad eithriadol, a mae'n debyg o ddynodi "
 "gwall rhaglennu."
 
-#: tdeio/global.cpp:693
+#: tdeio/global.cpp:713
 #, c-format
 msgid "Unsupported Action: %1"
 msgstr "Ni Chynhelir y Gweithrediad: %1"
 
-#: tdeio/global.cpp:694
+#: tdeio/global.cpp:714
 msgid ""
 "The requested action is not supported by the TDE program which is implementing "
 "the <strong>%1</strong> protocol."
@@ -1459,7 +3079,7 @@ msgstr ""
 "Ni chynhelir y gwethrediad a gofynwyd amdano gan y rhaglen TDE sydd yn "
 "gweithredu y protocol <strong>%1</strong>."
 
-#: tdeio/global.cpp:697
+#: tdeio/global.cpp:717
 msgid ""
 "This error is very much dependent on the TDE program. The additional "
 "information should give you more information than is available to the TDE "
@@ -1469,15 +3089,15 @@ msgstr ""
 "ychwanegol rhoi fwy o wybodaeth i chi nag sydd ar gael i'r pensaernïaeth "
 "mewnbwn/allbwn TDE."
 
-#: tdeio/global.cpp:700
+#: tdeio/global.cpp:720
 msgid "Attempt to find another way to accomplish the same outcome."
 msgstr "Ceisio canfod ffordd arall i gyflawni'r un canlyniad."
 
-#: tdeio/global.cpp:705
+#: tdeio/global.cpp:725
 msgid "File Expected"
 msgstr "Ffeil a Ddisgwylir."
 
-#: tdeio/global.cpp:706
+#: tdeio/global.cpp:726
 msgid ""
 "The request expected a file, however the folder <strong>%1</strong> "
 "was found instead."
@@ -1485,15 +3105,15 @@ msgstr ""
 "Disgwylodd y cais ffeil, ond wnaeth ganfod y plygell <strong>%1</strong> "
 "yn lle."
 
-#: tdeio/global.cpp:708
+#: tdeio/global.cpp:728
 msgid "This may be an error on the server side."
 msgstr "Efallai mae gwall ar ochr y gweinydd."
 
-#: tdeio/global.cpp:713
+#: tdeio/global.cpp:733
 msgid "Folder Expected"
 msgstr "Plygell a Ddisgwylir."
 
-#: tdeio/global.cpp:714
+#: tdeio/global.cpp:734
 msgid ""
 "The request expected a folder, however the file <strong>%1</strong> "
 "was found instead."
@@ -1501,15 +3121,15 @@ msgstr ""
 "Disgwylodd y cais blygell, ond wnaeth ganfod y ffeil <strong>%1</strong> "
 "yn lle."
 
-#: tdeio/global.cpp:721
+#: tdeio/global.cpp:741
 msgid "File or Folder Does Not Exist"
 msgstr "Nid yw'r Ffeil neu'r Plygell mewn Bod."
 
-#: tdeio/global.cpp:722
+#: tdeio/global.cpp:742
 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."
 
-#: tdeio/global.cpp:730
+#: tdeio/global.cpp:750
 msgid ""
 "The requested file could not be created because a file with the same name "
 "already exists."
@@ -1517,21 +3137,21 @@ msgstr ""
 "Ni ellir creu'r ffeil a ofynwyd amdano gan fod ffeil efo'r un enw mewn bod yn "
 "barod."
 
-#: tdeio/global.cpp:732
+#: tdeio/global.cpp:752
 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."
 
-#: tdeio/global.cpp:734
+#: tdeio/global.cpp:754
 msgid "Delete the current file and try again."
 msgstr "Dileuwch y ffeil cyfredol a ceisiwch eto."
 
-#: tdeio/global.cpp:735
+#: tdeio/global.cpp:755
 msgid "Choose an alternate filename for the new file."
 msgstr "Dewiswch enw ffeil amgen i'r ffeil newydd."
 
-#: tdeio/global.cpp:740
+#: tdeio/global.cpp:760
 msgid ""
 "The requested folder could not be created because a folder with the same name "
 "already exists."
@@ -1539,25 +3159,25 @@ msgstr ""
 "Ni ellir creu'r plygell a ofynwyd amdano gan fod plygell efo'r un enw mewn bod "
 "yn barod."
 
-#: tdeio/global.cpp:742
+#: tdeio/global.cpp:762
 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."
 
-#: tdeio/global.cpp:744
+#: tdeio/global.cpp:764
 msgid "Delete the current folder and try again."
 msgstr "Dileuwch y plygell cyfredol a ceisiwch eto."
 
-#: tdeio/global.cpp:745
+#: tdeio/global.cpp:765
 msgid "Choose an alternate name for the new folder."
 msgstr "Dewiswch enw amgen i'r plygell newydd."
 
-#: tdeio/global.cpp:749
+#: tdeio/global.cpp:769
 msgid "Unknown Host"
 msgstr "Gwesteiwr anhysbys"
 
-#: tdeio/global.cpp:750
+#: tdeio/global.cpp:770
 msgid ""
 "An unknown host error indicates that the server with the requested name, "
 "<strong>%1</strong>, could not be located on the Internet."
@@ -1565,52 +3185,52 @@ msgstr ""
 "Mae gwall gweinydd anhysbys yn dynodi na allir darganfod y gwesteiwr efo'r enw "
 "a ofynwyd amdano, <strong>%1</strong>, ar y Rhyngrwyd. "
 
-#: tdeio/global.cpp:753
+#: tdeio/global.cpp:773
 msgid ""
 "The name that you typed, %1, may not exist: it may be incorrectly typed."
 msgstr ""
 "Efallai nad yw'r enw yr ydych wedi ei deipio, %1, mewn bod: efallai mae o wedi "
 "ei deipio yn anghywir.  "
 
-#: tdeio/global.cpp:760
+#: tdeio/global.cpp:780
 msgid "Access Denied"
 msgstr "Gwaharddwyd Cyrchiad."
 
-#: tdeio/global.cpp:761
+#: tdeio/global.cpp:781
 msgid "Access was denied to the specified resource, <strong>%1</strong>."
 msgstr "Gwaharddwyd cyrchiad i'r adnodd penodol, <strong>%1</strong>."
 
-#: tdeio/global.cpp:763 tdeio/global.cpp:979
+#: tdeio/global.cpp:783 tdeio/global.cpp:999
 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."
 
-#: tdeio/global.cpp:765 tdeio/global.cpp:981
+#: tdeio/global.cpp:785 tdeio/global.cpp:1001
 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."
 
-#: tdeio/global.cpp:767 tdeio/global.cpp:983 tdeio/global.cpp:995
+#: tdeio/global.cpp:787 tdeio/global.cpp:1003 tdeio/global.cpp:1015
 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."
 
-#: tdeio/global.cpp:773
+#: tdeio/global.cpp:793
 msgid "Write Access Denied"
 msgstr "Gwaharddwyd Cyrchiad Ysgrifennu"
 
-#: tdeio/global.cpp:774
+#: tdeio/global.cpp:794
 msgid ""
 "This means that an attempt to write to the file <strong>%1</strong> "
 "was rejected."
 msgstr ""
 "Golygir hwn y gafodd cais i ysgrifennu i'r ffeil <strong>%1</strong> ei wrthod."
 
-#: tdeio/global.cpp:781
+#: tdeio/global.cpp:801
 msgid "Unable to Enter Folder"
 msgstr "Methu Mynd i mewn i'r Plygell."
 
-#: tdeio/global.cpp:782
+#: tdeio/global.cpp:802
 msgid ""
 "This means that an attempt to enter (in other words, to open) the requested "
 "folder <strong>%1</strong> was rejected."
@@ -1618,15 +3238,15 @@ msgstr ""
 "Golygir hwn y gafodd cais i fynd i mewn i'r plygell <strong>%1</strong> "
 "(hynny yw, i'w agor) ei wrthod."
 
-#: tdeio/global.cpp:790
+#: tdeio/global.cpp:810
 msgid "Folder Listing Unavailable"
 msgstr "Nid oes Rhestriad Plygell ar Gael."
 
-#: tdeio/global.cpp:791
+#: tdeio/global.cpp:811
 msgid "Protocol %1 is not a Filesystem"
 msgstr "Dim cysawd ffeil yw Protocol %1"
 
-#: tdeio/global.cpp:792
+#: tdeio/global.cpp:812
 msgid ""
 "This means that a request was made which requires determining the contents of "
 "the folder, and the TDE program supporting this protocol is unable to do so."
@@ -1634,11 +3254,11 @@ msgstr ""
 "Golygir hwn y gwnaed cais lle mae angen pederfynu cynnwys y plygell, ac mae'r "
 "rhaglen TDE sy'n cynnal y protocol yma yn methu gwneud."
 
-#: tdeio/global.cpp:800
+#: tdeio/global.cpp:820
 msgid "Cyclic Link Detected"
 msgstr "Datgelwyd Cyswllt Cylchol"
 
-#: tdeio/global.cpp:801
+#: tdeio/global.cpp:821
 msgid ""
 "UNIX environments are commonly able to link a file or folder to a separate name "
 "and/or location. TDE detected a link or series of links that results in an "
@@ -1650,7 +3270,7 @@ msgstr ""
 "sy'n creu dolen ddiddiwedd - h.y., roedd y ffeil wedi ei gysylltu (efallai mewn "
 "ffordd cylchfannol) i'w hun."
 
-#: tdeio/global.cpp:805 tdeio/global.cpp:827
+#: tdeio/global.cpp:825 tdeio/global.cpp:847
 msgid ""
 "Delete one part of the loop in order that it does not cause an infinite loop, "
 "and try again."
@@ -1658,23 +3278,23 @@ msgstr ""
 "Dileuwch un rhan o'r ddolen fel nad yw'n achosi dolen ddiddiwedd, a ceisiwch "
 "eto."
 
-#: tdeio/global.cpp:814
+#: tdeio/global.cpp:834
 msgid "Request Aborted By User"
 msgstr "Terfynwyd y Cais gan y Defnyddiwr"
 
-#: tdeio/global.cpp:815 tdeio/global.cpp:1108
+#: tdeio/global.cpp:835 tdeio/global.cpp:1128
 msgid "The request was not completed because it was aborted."
 msgstr "Ni chyflawnwyd y cais achos terfynwyd."
 
-#: tdeio/global.cpp:817 tdeio/global.cpp:1011 tdeio/global.cpp:1110
+#: tdeio/global.cpp:837 tdeio/global.cpp:1031 tdeio/global.cpp:1130
 msgid "Retry the request."
 msgstr "Ail-geisio'r cais."
 
-#: tdeio/global.cpp:821
+#: tdeio/global.cpp:841
 msgid "Cyclic Link Detected During Copy"
 msgstr "Datgelwyd Cyswllt Cylchol wrth Gopïo "
 
-#: tdeio/global.cpp:822
+#: tdeio/global.cpp:842
 msgid ""
 "UNIX environments are commonly able to link a file or folder to a separate name "
 "and/or location. During the requested copy operation, TDE detected a link or "
@@ -1686,15 +3306,15 @@ msgstr ""
 "datgelu cysylltiad neu gyfres o gysylltiadau sy'n creu dolen ddiddiwedd - h.y., "
 "roedd y ffeil wedi ei gysylltu (efallai mewn ffordd cylchfannol) i'w hun."
 
-#: tdeio/global.cpp:832
+#: tdeio/global.cpp:852
 msgid "Could Not Create Network Connection"
 msgstr "Methu Creu Cysylltiad Rhwydwaith"
 
-#: tdeio/global.cpp:833
+#: tdeio/global.cpp:853
 msgid "Could Not Create Socket"
 msgstr "Methu Creu Soced"
 
-#: tdeio/global.cpp:834
+#: tdeio/global.cpp:854
 msgid ""
 "This is a fairly technical error in which a required device for network "
 "communications (a socket) could not be created."
@@ -1702,7 +3322,8 @@ msgstr ""
 "Mae hwn yn wall go dechnegol, lle ni ellir creu dyfais gofynnol (soced) i "
 "gyfathrebion rhwydwaith."
 
-#: tdeio/global.cpp:836 tdeio/global.cpp:949 tdeio/global.cpp:960 tdeio/global.cpp:969
+#: tdeio/global.cpp:856 tdeio/global.cpp:969 tdeio/global.cpp:980
+#: tdeio/global.cpp:989
 msgid ""
 "The network connection may be incorrectly configured, or the network interface "
 "may not be enabled."
@@ -1710,11 +3331,11 @@ msgstr ""
 "Efallai mae'r cysylltiad rhwydwaith wedi ei ffurfweddu yn anghywir, neu "
 "analluogir y rhyngwyneb rhwydwaith."
 
-#: tdeio/global.cpp:842
+#: tdeio/global.cpp:862
 msgid "Connection to Server Refused"
 msgstr "Gwrthodwyd y Cysylltiad i'r Gweinydd"
 
-#: tdeio/global.cpp:843
+#: tdeio/global.cpp:863
 msgid ""
 "The server <strong>%1</strong> refused to allow this computer to make a "
 "connection."
@@ -1722,7 +3343,7 @@ msgstr ""
 "Gwrthododd y gweinydd <strong>%1</strong> adael i'r cyfrifiadur yma wneud "
 "cyswlltiad."
 
-#: tdeio/global.cpp:845
+#: tdeio/global.cpp:865
 msgid ""
 "The server, while currently connected to the Internet, may not be configured to "
 "allow requests."
@@ -1730,7 +3351,7 @@ msgstr ""
 "Efallai nad yw'r gweinydd, er ei fod yn gysylltiedig i'r Rhyngrwyd ar hyn o "
 "bryd, wedi ei ffurfweddu i ganiatàu ceisiadau.  "
 
-#: tdeio/global.cpp:847
+#: tdeio/global.cpp:867
 msgid ""
 "The server, while currently connected to the Internet, may not be running the "
 "requested service (%1)."
@@ -1738,7 +3359,7 @@ msgstr ""
 "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).  "
 
-#: tdeio/global.cpp:849
+#: tdeio/global.cpp:869
 msgid ""
 "A network firewall (a device which restricts Internet requests), either "
 "protecting your network or the network of the server, may have intervened, "
@@ -1748,11 +3369,11 @@ msgstr ""
 "sy'n amddiffyn un ai eich rhwydwaith neu rhwydwaith y gweinydd, wedi ymyrryd, a "
 "gwrthod y cais yma. "
 
-#: tdeio/global.cpp:856
+#: tdeio/global.cpp:876
 msgid "Connection to Server Closed Unexpectedly"
 msgstr "Cauwyd y Cysylltiad i'r Gweinydd yn Annisgwyl"
 
-#: tdeio/global.cpp:857
+#: tdeio/global.cpp:877
 msgid ""
 "Although a connection was established to <strong>%1</strong>"
 ", the connection was closed at an unexpected point in the communication."
@@ -1760,7 +3381,7 @@ msgstr ""
 "Er bod cysylltiad wedi eu greu i <strong>%1</strong>"
 ", cauwyd y cysylltiad wrth fan annisgwyl yn y cyfathrebu."
 
-#: tdeio/global.cpp:860
+#: tdeio/global.cpp:880
 msgid ""
 "A protocol error may have occurred, causing the server to close the connection "
 "as a response to the error."
@@ -1768,15 +3389,15 @@ msgstr ""
 "Efallai mae gwall protocol wedi digwydd, yn achosi i'r gweinydd gau'r "
 "cysylltiad fel ymateb i'r gwall."
 
-#: tdeio/global.cpp:866
+#: tdeio/global.cpp:886
 msgid "URL Resource Invalid"
 msgstr "Adnodd URL Annilys"
 
-#: tdeio/global.cpp:867
+#: tdeio/global.cpp:887
 msgid "Protocol %1 is not a Filter Protocol"
 msgstr "Nid yw protocol %1 yn Brotocol Hidl"
 
-#: tdeio/global.cpp:868
+#: tdeio/global.cpp:888
 msgid ""
 "The <strong>U</strong>niform <strong>R</strong>esource <strong>L</strong>"
 "ocator (URL) that you entered did not refer to a valid mechanism of accessing "
@@ -1786,7 +3407,7 @@ msgstr ""
 "U</strong>nffurf (URL) yr ydych wedi cyflwyno yn cyfeirio at ffordd dilys o "
 "gyrchu'r adnodd penodol, <strong>%1%2</strong>."
 
-#: tdeio/global.cpp:873
+#: tdeio/global.cpp:893
 msgid ""
 "TDE is able to communicate through a protocol within a protocol. This request "
 "specified a protocol be used as such, however this protocol is not capable of "
@@ -1798,15 +3419,15 @@ msgstr ""
 "gweithrediad o'r fath.  Mae hwn yn ddigwyddiad eithriadol, a mae'n debyg o "
 "ddynodi gwall rhaglennu."
 
-#: tdeio/global.cpp:881
+#: tdeio/global.cpp:901
 msgid "Unable to Initialize Input/Output Device"
 msgstr "Methu Cychwyn Dyfais Mewnbwn/Allbwn"
 
-#: tdeio/global.cpp:882
+#: tdeio/global.cpp:902
 msgid "Could Not Mount Device"
 msgstr "Methu Gosod Dyfais"
 
-#: tdeio/global.cpp:883
+#: tdeio/global.cpp:903
 msgid ""
 "The requested device could not be initialized (\"mounted\"). The reported error "
 "was: <strong>%1</strong>"
@@ -1814,7 +3435,7 @@ msgstr ""
 "Ni ellid ymgychwyn (\"mount\") y dyfais a ofynwyd amdano.  Y gwall a adroddwyd "
 "oedd: <strong>%1</strong>"
 
-#: tdeio/global.cpp:886
+#: tdeio/global.cpp:906
 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 "
@@ -1824,7 +3445,7 @@ msgstr ""
 "dyfais cyfryngau symudadwy (h.y. dim CD-ROM mewn gyriant CD), neu mewn achos "
 "dyfais perifferol/cludadwy efallai nad yw'r dyfais wedi ei gysylltu yn gywir."
 
-#: tdeio/global.cpp:890
+#: tdeio/global.cpp:910
 msgid ""
 "You may not have permissions to initialize (\"mount\") the device. On UNIX "
 "systems, often system administrator privileges are required to initialize a "
@@ -1834,7 +3455,7 @@ msgstr ""
 "gysodau Unix, y rhan fwyaf o'r amser mae angen hawliau gwasanaethydd cysawd i "
 "ymgychwyn dyfais."
 
-#: tdeio/global.cpp:894
+#: tdeio/global.cpp:914
 msgid ""
 "Check that the device is ready; removable drives must contain media, and "
 "portable devices must be connected and powered on.; and try again."
@@ -1842,15 +3463,15 @@ msgstr ""
 "Cywirwch bod y dyfais yn barod; rhaid i gyriannau symudadwy gynnwys cyfryngau, "
 "a rhaid i dyfeisiau cludadwy fod wedi eu cysylltu a bod arnodd; ceisiwch eto."
 
-#: tdeio/global.cpp:900
+#: tdeio/global.cpp:920
 msgid "Unable to Uninitialize Input/Output Device"
 msgstr "Methu Ddi-ymgychwyn Dyfais Mewnbwn/Allbwn"
 
-#: tdeio/global.cpp:901
+#: tdeio/global.cpp:921
 msgid "Could Not Unmount Device"
 msgstr "Methu Datosod Dyfais"
 
-#: tdeio/global.cpp:902
+#: tdeio/global.cpp:922
 msgid ""
 "The requested device could not be uninitialized (\"unmounted\"). The reported "
 "error was: <strong>%1</strong>"
@@ -1858,7 +3479,7 @@ msgstr ""
 "Ni ellid ddi-ymgychwyn (\"unmount\") y dyfais a ofynwyd amdano.  Y gwall a "
 "adroddwyd oedd: <strong>%1</strong>"
 
-#: tdeio/global.cpp:905
+#: tdeio/global.cpp:925
 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 this device "
@@ -1868,7 +3489,7 @@ msgstr ""
 "yn dal i'w ddefnyddio.  Mae hyd yn oed pethau fel cadw ffenest porwr ar agor ar "
 "leoliad ar y dyfais yma yn gallu achosi i'r dyfais barhau  mewn defnydd."
 
-#: tdeio/global.cpp:909
+#: tdeio/global.cpp:929
 msgid ""
 "You may not have permissions to uninitialize (\"unmount\") the device. On UNIX "
 "systems, system administrator privileges are often required to uninitialize a "
@@ -1878,15 +3499,15 @@ msgstr ""
 "gysodau Unix, y rhan fwyaf o'r amser mae angen hawliau gwasanaethydd cysawd i "
 "ddi-ymgychwyn dyfais."
 
-#: tdeio/global.cpp:913
+#: tdeio/global.cpp:933
 msgid "Check that no applications are accessing the device, and try again."
 msgstr "Cywirwch nad oes cymhwysiadau yn cyrchu'r dyfais, a ceisiwch eto."
 
-#: tdeio/global.cpp:918
+#: tdeio/global.cpp:938
 msgid "Cannot Read From Resource"
 msgstr "Methu Darllen oddiwrth yr Adnodd"
 
-#: tdeio/global.cpp:919
+#: tdeio/global.cpp:939
 msgid ""
 "This means that although the resource, <strong>%1</strong>"
 ", was able to be opened, an error occurred while reading the contents of the "
@@ -1895,15 +3516,15 @@ msgstr ""
 "Golygir hwn bod, er roedd yn bosib agor yr adnodd <strong>%1</strong>"
 ", digwyddodd gwall wrth ddarllen cynnwys yr adnodd."
 
-#: tdeio/global.cpp:922
+#: tdeio/global.cpp:942
 msgid "You may not have permissions to read from the resource."
 msgstr "Efallai nad oes ganddoch caniatadau i ddarllen oddiwrth yr adnodd."
 
-#: tdeio/global.cpp:931
+#: tdeio/global.cpp:951
 msgid "Cannot Write to Resource"
 msgstr "Methu ysgrifennu at yr adnodd."
 
-#: tdeio/global.cpp:932
+#: tdeio/global.cpp:952
 msgid ""
 "This means that although the resource, <strong>%1</strong>"
 ", was able to be opened, an error occurred while writing to the resource."
@@ -1911,19 +3532,19 @@ msgstr ""
 "Golygir hwn bod, er roedd yn bosib agor yr adnodd <strong>%1</strong>"
 ", digwyddodd gwall wrth ysgrifennu at yr adnodd."
 
-#: tdeio/global.cpp:935
+#: tdeio/global.cpp:955
 msgid "You may not have permissions to write to the resource."
 msgstr "Efallai nad oes ganddoch caniatadau i ysgrifennu at yr adnodd."
 
-#: tdeio/global.cpp:944 tdeio/global.cpp:955
+#: tdeio/global.cpp:964 tdeio/global.cpp:975
 msgid "Could Not Listen for Network Connections"
 msgstr "Methu Gwrando am Gysylltiadau Rhwydwaith"
 
-#: tdeio/global.cpp:945
+#: tdeio/global.cpp:965
 msgid "Could Not Bind"
 msgstr "Methu Ymrwymo"
 
-#: tdeio/global.cpp:946 tdeio/global.cpp:957
+#: tdeio/global.cpp:966 tdeio/global.cpp:977
 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 "
@@ -1932,15 +3553,15 @@ msgstr ""
 "Mae hwn yn wall go dechnegol, lle ni ellir creu dyfais gofynnol (soced) i "
 "gyfathrebion rhwydwaith i wrando am gysylltiadau rhwydwaith cyrhaeddol."
 
-#: tdeio/global.cpp:956
+#: tdeio/global.cpp:976
 msgid "Could Not Listen"
 msgstr "Methu Gwrando"
 
-#: tdeio/global.cpp:966
+#: tdeio/global.cpp:986
 msgid "Could Not Accept Network Connection"
 msgstr "Methu Derbyn Cysylltiad Rhwydwaith"
 
-#: tdeio/global.cpp:967
+#: tdeio/global.cpp:987
 msgid ""
 "This is a fairly technical error in which an error occurred while attempting to "
 "accept an incoming network connection."
@@ -1948,30 +3569,30 @@ msgstr ""
 "Mae hwn yn wall go dechnegol, lle ddigwyddodd gwall wrth ceisio derbyn "
 "cysylltiad rhwydwaith cyrhaeddol."
 
-#: tdeio/global.cpp:971
+#: tdeio/global.cpp:991
 msgid "You may not have permissions to accept the connection."
 msgstr "Efallai nad oes ganddoch caniatadau i dderbyn y cysylltiad."
 
-#: tdeio/global.cpp:976
+#: tdeio/global.cpp:996
 #, c-format
 msgid "Could Not Login: %1"
 msgstr "Methu Mewngofnodi: %1"
 
-#: tdeio/global.cpp:977
+#: tdeio/global.cpp:997
 msgid ""
 "An attempt to login to perform the requested operation was unsuccessful."
 msgstr ""
 "Roedd cais i fewngofnodi i gyflawni'r gweithrediad ceisiedig yn aflwyddiannus."
 
-#: tdeio/global.cpp:988
+#: tdeio/global.cpp:1008
 msgid "Could Not Determine Resource Status"
 msgstr "Methu Pennu Statws yr Adnodd"
 
-#: tdeio/global.cpp:989
+#: tdeio/global.cpp:1009
 msgid "Could Not Stat Resource"
 msgstr "Methu Canfod Statws yr Adnodd"
 
-#: tdeio/global.cpp:990
+#: tdeio/global.cpp:1010
 msgid ""
 "An attempt to determine information about the status of the resource <strong>"
 "%1</strong>, such as the resource name, type, size, etc., was unsuccessful."
@@ -1980,55 +3601,55 @@ msgstr ""
 ", er enghraifft enw yr adnodd, ei fath, ei faint ac yn y blaen, yn "
 "aflwyddiannus."
 
-#: tdeio/global.cpp:993
+#: tdeio/global.cpp:1013
 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."
 
-#: tdeio/global.cpp:1001
+#: tdeio/global.cpp:1021
 msgid "Could Not Cancel Listing"
 msgstr "Methu Diddymu'r Rhestriad"
 
-#: tdeio/global.cpp:1002
+#: tdeio/global.cpp:1022
 msgid "FIXME: Document this"
 msgstr "FIXME: Mae angen dogfennu hyn"
 
-#: tdeio/global.cpp:1006
+#: tdeio/global.cpp:1026
 msgid "Could Not Create Folder"
 msgstr "Methu Creu Plygell"
 
-#: tdeio/global.cpp:1007
+#: tdeio/global.cpp:1027
 msgid "An attempt to create the requested folder failed."
 msgstr "Methwyd cais i greu'r plygell a ofynwyd amdano."
 
-#: tdeio/global.cpp:1008
+#: tdeio/global.cpp:1028
 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."
 
-#: tdeio/global.cpp:1015
+#: tdeio/global.cpp:1035
 msgid "Could Not Remove Folder"
 msgstr "Methu Gwaredu Plygell"
 
-#: tdeio/global.cpp:1016
+#: tdeio/global.cpp:1036
 msgid "An attempt to remove the specified folder, <strong>%1</strong>, failed."
 msgstr "Methwyd cais i ddileu'r plygell penodol, <strong>%1</strong>."
 
-#: tdeio/global.cpp:1018
+#: tdeio/global.cpp:1038
 msgid "The specified folder may not exist."
 msgstr "Efallai nad yw'r plygell penodol mewn bod."
 
-#: tdeio/global.cpp:1019
+#: tdeio/global.cpp:1039
 msgid "The specified folder may not be empty."
 msgstr "Efallai nad yw'r plygell penodol yn wag."
 
-#: tdeio/global.cpp:1022
+#: tdeio/global.cpp:1042
 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."
 
-#: tdeio/global.cpp:1027
+#: tdeio/global.cpp:1047
 msgid "Could Not Resume File Transfer"
 msgstr "Methu Ail-gychwyn Trosglwyddo'r Ffeil"
 
-#: tdeio/global.cpp:1028
+#: tdeio/global.cpp:1048
 msgid ""
 "The specified request asked that the transfer of file <strong>%1</strong> "
 "be resumed at a certain point of the transfer. This was not possible."
@@ -2037,47 +3658,47 @@ msgstr ""
 "gael ei ail-gychwyn mewn man arbennig o'r trosglwyddiad.  Nid oedd hyn yn "
 "bosib."
 
-#: tdeio/global.cpp:1031
+#: tdeio/global.cpp:1051
 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."
 
-#: tdeio/global.cpp:1033
+#: tdeio/global.cpp:1053
 msgid "Retry the request without attempting to resume transfer."
 msgstr "Ail-geisiwch, heb geisio ail-gychwyn y trosgwyddiad."
 
-#: tdeio/global.cpp:1038
+#: tdeio/global.cpp:1058
 msgid "Could Not Rename Resource"
 msgstr "Methu Ail-enwi yr Adnodd"
 
-#: tdeio/global.cpp:1039
+#: tdeio/global.cpp:1059
 msgid "An attempt to rename the specified resource <strong>%1</strong> failed."
 msgstr "Methwyd cais i ail-enwi'r adnodd penodol <strong>%1</strong>."
 
-#: tdeio/global.cpp:1047
+#: tdeio/global.cpp:1067
 msgid "Could Not Alter Permissions of Resource"
 msgstr "Methu Newid Caniatadau'r Adnodd"
 
-#: tdeio/global.cpp:1048
+#: tdeio/global.cpp:1068
 msgid ""
 "An attempt to alter the permissions on the specified resource <strong>"
 "%1</strong> failed."
 msgstr ""
 "Methwyd cais i newid caniatadau ar yr adnodd penodol <strong>%1</strong>."
 
-#: tdeio/global.cpp:1055
+#: tdeio/global.cpp:1075
 msgid "Could Not Delete Resource"
 msgstr "Methu Dileu'r Adnodd"
 
-#: tdeio/global.cpp:1056
+#: tdeio/global.cpp:1076
 msgid "An attempt to delete the specified resource <strong>%1</strong> failed."
 msgstr "Methwyd cais i ddileu'r adnodd penodol <strong>%1</strong>."
 
-#: tdeio/global.cpp:1063
+#: tdeio/global.cpp:1083
 msgid "Unexpected Program Termination"
 msgstr "Terfynwyd y Rhaglen yn Annisgwyl"
 
-#: tdeio/global.cpp:1064
+#: tdeio/global.cpp:1084
 msgid ""
 "The program on your computer which provides access to the <strong>%1</strong> "
 "protocol has unexpectedly terminated."
@@ -2085,11 +3706,11 @@ msgstr ""
 "Mae'r rhaglen ar eich cyfrifiadur sy'n darparu cyrchiad i'r protocol <strong>"
 "%1</strong> wedi terfynu yn annisgwyl."
 
-#: tdeio/global.cpp:1072
+#: tdeio/global.cpp:1092
 msgid "Out of Memory"
 msgstr "Allan o Gof."
 
-#: tdeio/global.cpp:1073
+#: tdeio/global.cpp:1093
 msgid ""
 "The program on your computer which provides access to the <strong>%1</strong> "
 "protocol could not obtain the memory required to continue."
@@ -2097,11 +3718,11 @@ msgstr ""
 "Ni allai'r rhaglen ar eich cyfrifiadur sy'n darparu cyrchiad i'r protocol "
 "<strong>%1</strong> gael digon o gof i barhau."
 
-#: tdeio/global.cpp:1081
+#: tdeio/global.cpp:1101
 msgid "Unknown Proxy Host"
 msgstr "Gwesteiwr Dirpwry Anhysbys"
 
-#: tdeio/global.cpp:1082
+#: tdeio/global.cpp:1102
 msgid ""
 "While retrieving information about the specified proxy host, <strong>%1</strong>"
 ", an Unknown Host error was encountered. An unknown host error indicates that "
@@ -2111,7 +3732,7 @@ msgstr ""
 ", canfodwyd gwall Gwesteiwr Anhysbys.  Mae gwall gwesteiwr anhysbys yn dynodi "
 "na ellid lleoli'r enw ceisiedig ar y Rhyngrwyd."
 
-#: tdeio/global.cpp:1086
+#: tdeio/global.cpp:1106
 #, fuzzy
 msgid ""
 "There may have been a problem with your network configuration, specifically "
@@ -2122,15 +3743,15 @@ msgstr ""
 "gwesteiwr dirpwry.  Os ydych wedi bod yn cyrchu'r Rhyngrwyd heb broblemau yn "
 "ddiweddar, mae hyn yn anhebyg."
 
-#: tdeio/global.cpp:1090
+#: tdeio/global.cpp:1110
 msgid "Double-check your proxy settings and try again."
 msgstr "Cywirwch eich gosodiadau dirprwy a ceisiwch eto."
 
-#: tdeio/global.cpp:1095
+#: tdeio/global.cpp:1115
 msgid "Authentication Failed: Method %1 Not Supported"
 msgstr "Methodd Dilysiant: Ni Chynhelir Dull %1"
 
-#: tdeio/global.cpp:1097
+#: tdeio/global.cpp:1117
 #, c-format
 msgid ""
 "Although you may have supplied the correct authentication details, the "
@@ -2141,23 +3762,25 @@ msgstr ""
 "ni chynhelir y dull a ddefnyddir gan y gweinydd gan y rhaglen TDE sy'n "
 "cyflawni'r protocol %1."
 
-#: tdeio/global.cpp:1101
+#: tdeio/global.cpp:1121
+#, fuzzy
 msgid ""
-"Please file a bug at <a href=\"http://bugs.kde.org/\">http://bugs.kde.org/</a> "
-"to inform the TDE team of the unsupported authentication method."
+"Please file a bug at <a href=\"http://bugs.kde.org/\">"
+"http://bugs.pearsoncomputing.net/</a> to inform the TDE team of the unsupported "
+"authentication method."
 msgstr ""
 "Cyflwynwch nam wrth <a href=\"http://bugs.kde.org/\">http://bugs.kde.org/</a> "
 "i hysbysu'r tîm TDE am y dull dilysiant na chynhelir."
 
-#: tdeio/global.cpp:1107
+#: tdeio/global.cpp:1127
 msgid "Request Aborted"
 msgstr "Ataliwyd y Cais"
 
-#: tdeio/global.cpp:1114
+#: tdeio/global.cpp:1134
 msgid "Internal Error in Server"
 msgstr "Camgymeriad Mewnol yn y Gweinydd"
 
-#: tdeio/global.cpp:1115
+#: tdeio/global.cpp:1135
 msgid ""
 "The program on the server which provides access to the <strong>%1</strong> "
 "protocol has reported an internal error: %0."
@@ -2165,7 +3788,7 @@ msgstr ""
 "Mae'r rhaglen ar y gweinydd sy'n darparu cyrchiad i'r protocol <strong>"
 "%1</strong> wedi adrodd gwall mewnol: %0."
 
-#: tdeio/global.cpp:1118
+#: tdeio/global.cpp:1138
 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."
@@ -2173,11 +3796,11 @@ msgstr ""
 "Achosir hyn gan nam, mwy na thebyg.  Ystyriedwch cyflwyno adrodd nam llawn, yn "
 "ôl y manylion isod."
 
-#: tdeio/global.cpp:1121
+#: tdeio/global.cpp:1141
 msgid "Contact the administrator of the server to advise them of the problem."
 msgstr "Cysylltwch â gwasanaethwr y gweinuydd i'w gynghori am y problem."
 
-#: tdeio/global.cpp:1123
+#: tdeio/global.cpp:1143
 msgid ""
 "If you know who the authors of the server software are, submit the bug report "
 "directly to them."
@@ -2185,11 +3808,11 @@ msgstr ""
 "Os wyddoch pwy yw awduron y feddalwedd weinydd, cyflwynwch yr adrodd nam yn "
 "uniongyrchol iddynt."
 
-#: tdeio/global.cpp:1128
+#: tdeio/global.cpp:1148
 msgid "Timeout Error"
 msgstr "Gwall goramser"
 
-#: tdeio/global.cpp:1129
+#: tdeio/global.cpp:1149
 msgid ""
 "Although contact was made with the server, a response was not received within "
 "the amount of time allocated for the request as follows:"
@@ -2209,15 +3832,15 @@ msgstr ""
 "Noder y gallwch newid y gosodiadau goramser yn y Ganolfan Rheoli TDE, drwy "
 "ddewis Rhwydwaith -> Hoffiannau."
 
-#: tdeio/global.cpp:1140
+#: tdeio/global.cpp:1160
 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."
 
-#: tdeio/global.cpp:1146
+#: tdeio/global.cpp:1166
 msgid "Unknown Error"
 msgstr "Gwall Anhysbys"
 
-#: tdeio/global.cpp:1147
+#: tdeio/global.cpp:1167
 msgid ""
 "The program on your computer which provides access to the <strong>%1</strong> "
 "protocol has reported an unknown error: %2."
@@ -2225,11 +3848,11 @@ msgstr ""
 "Mae'r rhaglen ar y gweinydd sy'n darparu cyrchiad i'r protocol <strong>"
 "%1</strong> wedi adrodd gwall mewnol: %2."
 
-#: tdeio/global.cpp:1155
+#: tdeio/global.cpp:1175
 msgid "Unknown Interruption"
 msgstr "Ymyriad Anhysbys"
 
-#: tdeio/global.cpp:1156
+#: tdeio/global.cpp:1176
 msgid ""
 "The program on your computer which provides access to the <strong>%1</strong> "
 "protocol has reported an interruption of an unknown type: %2."
@@ -2237,11 +3860,11 @@ msgstr ""
 "Mae'r rhaglen ar y gweinydd sy'n darparu cyrchiad i'r protocol <strong>"
 "%1</strong> wedi adrodd ymyriad o fath anhysbys: %2."
 
-#: tdeio/global.cpp:1164
+#: tdeio/global.cpp:1184
 msgid "Could Not Delete Original File"
 msgstr "Methu Dileu Ffeil Gwreiddiol"
 
-#: tdeio/global.cpp:1165
+#: tdeio/global.cpp:1185
 msgid ""
 "The requested operation required the deleting of the original file, most likely "
 "at the end of a file move operation. The original file <strong>%1</strong> "
@@ -2251,11 +3874,11 @@ msgstr ""
 "gweithrediad symud ffeil, mwy na thebyg.  Ni ellid dileu'r ffeil gwreiddiol "
 "<strong>%1</strong>."
 
-#: tdeio/global.cpp:1174
+#: tdeio/global.cpp:1194
 msgid "Could Not Delete Temporary File"
 msgstr "Methu Dileu Ffeil Dros Dro"
 
-#: tdeio/global.cpp:1175
+#: tdeio/global.cpp:1195
 msgid ""
 "The requested operation required the creation of a temporary file in which to "
 "save the new file while being downloaded. This temporary file <strong>"
@@ -2265,11 +3888,11 @@ msgstr ""
 "newydd  wrth iddo gael ei lawrlwytho.  Ni ellid dileu'r ffeil dros dro <strong>"
 "%1</strong>."
 
-#: tdeio/global.cpp:1184
+#: tdeio/global.cpp:1204
 msgid "Could Not Rename Original File"
 msgstr "Methu Ail-enwi Ffeil Gwreiddiol"
 
-#: tdeio/global.cpp:1185
+#: tdeio/global.cpp:1205
 msgid ""
 "The requested operation required the renaming of the original file <strong>"
 "%1</strong>, however it could not be renamed."
@@ -2277,11 +3900,11 @@ msgstr ""
 "Roedd gan y weithrediad ceisiedig angen ail-enwi'r ffeil gwreiddiol <strong>"
 "%1</strong>.  Ond ni ellid ail-enwi'r ffeil."
 
-#: tdeio/global.cpp:1193
+#: tdeio/global.cpp:1213
 msgid "Could Not Rename Temporary File"
 msgstr "Methu Ail-enwi Ffeil Dro Dro"
 
-#: tdeio/global.cpp:1194
+#: tdeio/global.cpp:1214
 msgid ""
 "The requested operation required the creation of a temporary file <strong>"
 "%1</strong>, however it could not be created."
@@ -2289,27 +3912,27 @@ msgstr ""
 "Roedd gan y weithrediad ceisiedig angen greu ffeil dros dro <strong>%1</strong>"
 ".  Ond ni ellid creu'r ffeil."
 
-#: tdeio/global.cpp:1202
+#: tdeio/global.cpp:1222
 msgid "Could Not Create Link"
 msgstr "Methu Creu Cyswllt"
 
-#: tdeio/global.cpp:1203
+#: tdeio/global.cpp:1223
 msgid "Could Not Create Symbolic Link"
 msgstr "Methu Creu Cyswllt Symbolaidd"
 
-#: tdeio/global.cpp:1204
+#: tdeio/global.cpp:1224
 msgid "The requested symbolic link %1 could not be created."
 msgstr "Methu creu y cyswllt symbolaidd %1 a ofynwyd amdano."
 
-#: tdeio/global.cpp:1211
+#: tdeio/global.cpp:1231
 msgid "No Content"
 msgstr "Dim Cynnwys"
 
-#: tdeio/global.cpp:1216
+#: tdeio/global.cpp:1236
 msgid "Disk Full"
 msgstr "Disg Llawn"
 
-#: tdeio/global.cpp:1217
+#: tdeio/global.cpp:1237
 msgid ""
 "The requested file <strong>%1</strong> could not be written to as there is "
 "inadequate disk space."
@@ -2317,7 +3940,7 @@ msgstr ""
 "Ni ellid ysgrifennu at y ffeil ceisiedig <strong>%1</strong> "
 "gan fod diffyg lle ar y ddisg."
 
-#: tdeio/global.cpp:1219
+#: tdeio/global.cpp:1239
 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 3) "
@@ -2327,11 +3950,11 @@ msgstr ""
 "archifo ffeiliau i gronfa cyfryngau symudadwy fel disgiau CD-Cofnodi; neu 3) "
 "darganfod mwy o le cronfa."
 
-#: tdeio/global.cpp:1226
+#: tdeio/global.cpp:1246
 msgid "Source and Destination Files Identical"
 msgstr "Ffeiliau Tarddiad a Cyrchfan yn Unwy"
 
-#: tdeio/global.cpp:1227
+#: tdeio/global.cpp:1247
 msgid ""
 "The operation could not be completed because the source and destination files "
 "are the same file."
@@ -2339,144 +3962,15 @@ msgstr ""
 "Methu cwblhau'r gweithrediad gan fod ffeil tarddiad a ffeil cyrchfan yr un un "
 "ffeil."
 
-#: tdeio/global.cpp:1229
+#: tdeio/global.cpp:1249
 #, fuzzy
 msgid "Choose a different filename for the destination file."
 msgstr "Dewiswch enw ffeil gwahanol i'r ffeil cyrchfan."
 
-#: tdeio/global.cpp:1240
+#: tdeio/global.cpp:1260
 msgid "Undocumented Error"
 msgstr "Gwall Heb ei Ddogfennu"
 
-#: tdeio/statusbarprogress.cpp:132
-msgid " Stalled "
-msgstr "Wedi seibio"
-
-#: tdeio/statusbarprogress.cpp:134 misc/uiserver.cpp:1102
-msgid " %1/s "
-msgstr "%1/s"
-
-#: tdeio/passdlg.cpp:57
-msgid "Password"
-msgstr "Cyfrinair"
-
-#: tdeio/passdlg.cpp:98
-#, fuzzy
-msgid "You need to supply a username and a password"
-msgstr "Rhaid i chi ddarparu enw cyfrif a cyfrinair"
-
-#. i18n: file ./tdefile/kpropertiesdesktopadvbase.ui line 134
-#: tdefile/kpropertiesdialog.cpp:3699 tdeio/passdlg.cpp:108 rc.cpp:105
-#, no-c-format
-msgid "&Username:"
-msgstr "&Enw Defnyddiwr:"
-
-#: tdeio/passdlg.cpp:125
-msgid "&Password:"
-msgstr "&Cyfrinair"
-
-#: tdeio/passdlg.cpp:147
-msgid "&Keep password"
-msgstr "&Cadw Cyfrinair"
-
-#: tdeio/passdlg.cpp:345 kpasswdserver/kpasswdserver.cpp:371
-msgid "Authorization Dialog"
-msgstr "Ymgom Awdurdodi"
-
-#: tdeio/krun.cpp:120
-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>"
-
-#: tdeio/krun.cpp:159
-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>"
-
-#: tdeio/krun.cpp:166
-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>"
-
-#: tdeio/krun.cpp:203
-#, fuzzy
-msgid "You are not authorized to open this file."
-msgstr "Nid ydych wedi cael eich awdurdodi i weithredu'r ffeil yma."
-
-#: tdefile/kopenwith.cpp:835 tdeio/krun.cpp:207
-msgid "Open with:"
-msgstr "Agor Efo:"
-
-#: tdeio/krun.cpp:545
-msgid "You are not authorized to execute this file."
-msgstr "Nid ydych wedi cael eich awdurdodi i weithredu'r ffeil yma."
-
-#: tdeio/krun.cpp:565
-#, c-format
-msgid "Launching %1"
-msgstr "Ymgychwyn %1"
-
-#: tdeio/krun.cpp:746
-msgid "You are not authorized to execute this service."
-msgstr "Nid ydych wedi cael eich awdurdodi i weithredu'r gwasanaeth yma."
-
-#: tdeio/krun.cpp:900
-msgid ""
-"<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>"
-
-#: tdeio/krun.cpp:1400
-#, fuzzy
-msgid "Could not find the program '%1'"
-msgstr "Methu darganfod y rhaglen '%1'"
-
-#: tdeio/tdefileitem.cpp:730
-msgid "Symbolic Link"
-msgstr "Cyswllt Symbolaidd"
-
-#: tdeio/tdefileitem.cpp:732
-msgid "%1 (Link)"
-msgstr "%1 (Cyswllt)"
-
-#: ../tdeioslave/http/kcookiejar/kcookiewin.cpp:270
-#: bookmarks/kbookmarkmenu.cc:791 tdefile/kpropertiesdialog.cpp:3930
-#: tdeio/tdefileitem.cpp:774
-msgid "Name:"
-msgstr "Enw:"
-
-#: tdefile/kpropertiesdialog.cpp:927 tdeio/tdefileitem.cpp:775
-msgid "Type:"
-msgstr "Math:"
-
-#: tdeio/tdefileitem.cpp:779
-#, fuzzy
-msgid "Link to %1 (%2)"
-msgstr "Cyswllt i %1"
-
-#: tdefile/kpropertiesdialog.cpp:977 tdeio/tdefileitem.cpp:787
-msgid "Size:"
-msgstr "Maint:"
-
-#: tdefile/kpropertiesdialog.cpp:1045 tdeio/tdefileitem.cpp:792
-msgid "Modified:"
-msgstr "Newidwyd:"
-
-#: tdeio/tdefileitem.cpp:798
-msgid "Owner:"
-msgstr "Perchennog:"
-
-#: tdeio/tdefileitem.cpp:799
-msgid "Permissions:"
-msgstr "Caniatadau "
-
 #: tdeio/skipdlg.cpp:63
 msgid "Skip"
 msgstr "Hepgor"
@@ -2485,9 +3979,25 @@ msgstr "Hepgor"
 msgid "Auto Skip"
 msgstr "Awto Hepgor"
 
-#: tdeio/kshred.cpp:212
-msgid "Shredding:  pass %1 of 35"
-msgstr "Rhwygo: tro %1 o 35"
+#: tdeio/kscan.cpp:52
+msgid "Acquire Image"
+msgstr "Cipio Delwedd"
+
+#: tdeio/kscan.cpp:95
+msgid "OCR Image"
+msgstr "Delwedd OCR"
+
+#: tdeio/kservice.cpp:923
+msgid "Updating System Configuration"
+msgstr "Diweddaru Ffurfweddiad Cysawd"
+
+#: tdeio/kservice.cpp:924
+msgid "Updating system configuration."
+msgstr "Diweddaru ffurfweddiad y cysawd."
+
+#: tdeio/pastedialog.cpp:49
+msgid "Data format:"
+msgstr "Fformat data :"
 
 #: tdeio/slave.cpp:370
 #, c-format
@@ -2518,1204 +4028,616 @@ msgstr ""
 "Methu creu gwas-io:\n"
 " dywedodd tdelauncher: %1"
 
-#: tdefile/kpropertiesdialog.cpp:2686 tdeio/kmimetypechooser.cpp:75
-msgid "Mime Type"
-msgstr "Math MIME"
-
-#: tdefile/kpropertiesdialog.cpp:2697 tdeio/kmimetypechooser.cpp:80
-msgid "Comment"
-msgstr "Esboniad"
-
-#: tdeio/kmimetypechooser.cpp:84
-msgid "Patterns"
-msgstr "Patrymau"
+#: tdeio/tcpslavebase.cpp:319
+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. "
 
-#: tdeio/kmimetypechooser.cpp:94
-msgid "&Edit..."
-msgstr "&Golygu..."
+#: tdeio/tcpslavebase.cpp:325 tdeio/tcpslavebase.cpp:1089
+msgid "Security Information"
+msgstr "Gwybodaeth Ddiogelwch"
 
-#: tdeio/kmimetypechooser.cpp:104
+#: tdeio/tcpslavebase.cpp:326
 #, fuzzy
-msgid "Click this button to display the familiar TDE mime type editor."
-msgstr "Cliciwch y botwm yma i greu plygell newydd."
-
-#: kssl/ksslcertdlg.cc:61
-msgid "Certificate"
-msgstr "Tystysgrif"
+msgid "C&ontinue Loading"
+msgstr "Dal i Lwytho"
 
-#: kssl/ksslcertdlg.cc:67
-msgid "Save selection for this host."
-msgstr "Cadw dewisiad am y gwesteiwr yma."
+#: tdeio/tcpslavebase.cpp:677
+msgid "Enter the certificate password:"
+msgstr "Mewnosodwch cyfrinair y tystysgrif:"
 
-#: kssl/ksslcertdlg.cc:75
-msgid "Send certificate"
-msgstr "Anfon tystysgrif..."
+#: tdeio/tcpslavebase.cpp:678
+msgid "SSL Certificate Password"
+msgstr "Cyfrinair Tystysgrif SSL"
 
-#: kssl/ksslcertdlg.cc:79
-msgid "Do not send a certificate"
-msgstr "Peidio ag anfon tystysgrif"
+#: tdeio/tcpslavebase.cpp:691
+msgid "Unable to open the certificate. Try a new password?"
+msgstr "Methu agor y tystysgrif.  Ceisio cyfrinair newydd?"
 
-#: kssl/ksslcertdlg.cc:84
-msgid "TDE SSL Certificate Dialog"
-msgstr "Ymgom Tystysgrif SSL TDE"
+#: tdeio/tcpslavebase.cpp:704
+msgid "The procedure to set the client certificate for the session failed."
+msgstr "Methodd y weithdrefn i osod y tystysgrif cleient i'r sesiwn."
 
-#: kssl/ksslcertdlg.cc:139
+#: tdeio/tcpslavebase.cpp:877
 msgid ""
-"The server <b>%1</b> requests a certificate."
-"<p>Select a certificate to use from the list below:"
+"The IP address of the host %1 does not match the one the certificate was issued "
+"to."
 msgstr ""
+"Nid yw cyfeiriad IP gwesteiwr %1 yn cydweddu â'r un a rowyd y tystysgrif iddo."
 
-#: kssl/ksslcertificate.cc:202
-msgid "Signature Algorithm: "
-msgstr "Algorithm Llofnod:"
-
-#: kssl/ksslcertificate.cc:203
-msgid "Unknown"
-msgstr "Anhysbys"
+#: tdeio/tcpslavebase.cpp:882 tdeio/tcpslavebase.cpp:890
+#: tdeio/tcpslavebase.cpp:925 tdeio/tcpslavebase.cpp:999
+#: tdeio/tcpslavebase.cpp:1011 tdeio/tcpslavebase.cpp:1020
+#: tdeio/tcpslavebase.cpp:1051
+msgid "Server Authentication"
+msgstr "Dilysiant Gweinydd"
 
-#: kssl/ksslcertificate.cc:206
-msgid "Signature Contents:"
-msgstr "Cynnwys y Llofnod:"
+#: tdeio/tcpslavebase.cpp:883 tdeio/tcpslavebase.cpp:891
+#: tdeio/tcpslavebase.cpp:1021
+msgid "&Details"
+msgstr "&Manylion"
 
-#: kssl/ksslcertificate.cc:338
-msgid ""
-"_: Unknown\n"
-"Unknown key algorithm"
-msgstr "Algorithm allwedd anhysbys"
+#: tdeio/tcpslavebase.cpp:884 tdeio/tcpslavebase.cpp:892
+msgid "Co&ntinue"
+msgstr "Par&hau"
 
-#: kssl/ksslcertificate.cc:341
-msgid "Key type: RSA (%1 bit)"
-msgstr "Math allwedd: RSA (%1 did)"
+#: tdeio/tcpslavebase.cpp:886 tdeio/tcpslavebase.cpp:1016
+msgid "The server certificate failed the authenticity test (%1)."
+msgstr "Methodd y tystysgrif gweinydd y prawf dilysiant (%1)."
 
-#: kssl/ksslcertificate.cc:344
-msgid "Modulus: "
-msgstr "Modwlws:"
+#: tdeio/tcpslavebase.cpp:922 tdeio/tcpslavebase.cpp:1048
+msgid ""
+"Would you like to accept this certificate forever without being prompted?"
+msgstr "Liciwch chi dderbyn y tystysgrif yma am byth heb gofweini arnoch?"
 
-#: kssl/ksslcertificate.cc:357
-msgid "Exponent: 0x"
-msgstr "Esbonnydd: 0x"
+#: tdeio/tcpslavebase.cpp:926 tdeio/tcpslavebase.cpp:1052
+msgid "&Forever"
+msgstr "&Am Byth"
 
-#: kssl/ksslcertificate.cc:363
-msgid "Key type: DSA (%1 bit)"
-msgstr "Math allwedd: DSA (%1 did)"
+#: tdeio/tcpslavebase.cpp:927 tdeio/tcpslavebase.cpp:1053
+msgid "&Current Sessions Only"
+msgstr "&Sesiynau Cyfredol yn Unig"
 
-#: kssl/ksslcertificate.cc:366
-msgid "Prime: "
-msgstr "Rhif Cysefin:"
+#: tdeio/tcpslavebase.cpp:998
+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?"
 
-#: kssl/ksslcertificate.cc:380
+#: tdeio/tcpslavebase.cpp:1010
 #, fuzzy
-msgid "160 bit prime factor: "
-msgstr "Ffactor Gysefin 160-did:"
-
-#: kssl/ksslcertificate.cc:404
-msgid "Public key: "
-msgstr "Allwedd cyhoeddus: "
-
-#: kssl/ksslcertificate.cc:920
-msgid "The certificate is valid."
-msgstr "Mae'r dystysgrif yn ddilys."
-
-#: kssl/ksslcertificate.cc:924
 msgid ""
-"Certificate signing authority root files could not be found so the certificate "
-"is not verified."
+"SSL certificate is being rejected as requested. You can disable this in the "
+"Trinity Control Center."
 msgstr ""
-"Ni ellid canfod ffeiliau gwraidd i'r awdurdod llofnodi tystysgrifau, felly ni "
-"wirir y tystysgrif. "
+"Gwrthodir y tystysgrif fel a ofynwyd.  Gallwch analluogi hyn yn y ganolfan "
+"rheoli TDE."
 
-#: kssl/ksslcertificate.cc:927
-msgid "Certificate signing authority is unknown or invalid."
-msgstr "Mae'r awdurdod llofnodi tystysgrifau yn anhysbys neu yn annilys."
+#: tdeio/tcpslavebase.cpp:1022
+msgid "Co&nnect"
+msgstr "Cy&sylltu"
 
-#: kssl/ksslcertificate.cc:929
-msgid "Certificate is self-signed and thus may not be trustworthy."
+#: tdeio/tcpslavebase.cpp:1078
+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 ""
-"Mae'r dystysgrif wedi ei hunan-lofnodi, ac felly efallai ni ellir dibynnu arno."
-
-#: kssl/ksslcertificate.cc:931
-msgid "Certificate has expired."
-msgstr "Mae'r dystysgrif wedi darfod."
-
-#: kssl/ksslcertificate.cc:933
-msgid "Certificate has been revoked."
-msgstr "Mae'r dystysgrif wedi ei ddirymu."
+"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."
 
-#: kssl/ksslcertificate.cc:935
-msgid "SSL support was not found."
-msgstr "Ni chanfuwyd cynnal SSL."
+#: tdeio/tcpslavebase.cpp:1090
+#, fuzzy
+msgid "Display SSL &Information"
+msgstr "Dangos Gwybodaeth SSL"
 
-#: kssl/ksslcertificate.cc:937
-msgid "Signature is untrusted."
-msgstr "Ni ellir rhoi ymddiried yn y llofnod."
+#: tdeio/tcpslavebase.cpp:1092
+msgid "C&onnect"
+msgstr "C&ysylltu"
 
-#: kssl/ksslcertificate.cc:939
-msgid "Signature test failed."
-msgstr "Methodd yr arbrawf llofnod."
+#: tdefile/kimagefilepreview.cpp:53
+msgid "&Automatic preview"
+msgstr "&Awtomatig"
 
-#: kssl/ksslcertificate.cc:942
-msgid "Rejected, possibly due to an invalid purpose."
-msgstr "Gwrthodwyd, efallai o achos bwriad annilys."
+#: tdefile/kimagefilepreview.cpp:58
+msgid "&Preview"
+msgstr "&Rhagolwg"
 
-#: kssl/ksslcertificate.cc:944
-msgid "Private key test failed."
-msgstr "Methodd arbrawf yr allwedd breifat."
+#: tdefile/kicondialog.cpp:241 tdefile/kicondialog.cpp:250
+msgid "Select Icon"
+msgstr "Dewis Eicon"
 
-#: kssl/ksslcertificate.cc:946
-msgid "The certificate has not been issued for this host."
-msgstr "Ni chyhoeddwyd y tystysgrif am y gwesteiwr yma."
+#: tdefile/kicondialog.cpp:270
+msgid "Icon Source"
+msgstr "Ffynhonell Eicon"
 
-#: kssl/ksslcertificate.cc:948
-#, fuzzy
-msgid "This certificate is not relevant."
-msgstr "Mae'r dystysgrif yn annilys."
+#: tdefile/kicondialog.cpp:276
+msgid "S&ystem icons:"
+msgstr "E&iconau cysawd:"
 
-#: kssl/ksslcertificate.cc:953
-msgid "The certificate is invalid."
-msgstr "Mae'r dystysgrif yn annilys."
+#: tdefile/kicondialog.cpp:281
+msgid "O&ther icons:"
+msgstr "Ei&conau eraill:"
 
-#: kssl/ksslutils.cc:79
-msgid "GMT"
-msgstr "GMT"
+#: tdefile/kicondialog.cpp:293
+msgid "Clear Search"
+msgstr "Gwagu'r Chwiliad"
 
-#: kssl/ksslkeygen.cc:48
-msgid "TDE Certificate Request"
-msgstr "Cais Tystysgrif TDE"
+#: tdefile/kicondialog.cpp:297
+msgid "&Search:"
+msgstr "&Chwilio:"
 
-#: kssl/ksslkeygen.cc:50
-msgid "TDE Certificate Request - Password"
-msgstr "Cais Tystysgrif TDE - Cyfrinair"
+#: tdefile/kicondialog.cpp:308
+msgid "Search interactively for icon names (e.g. folder)."
+msgstr ""
 
-#: kssl/ksslkeygen.cc:93
+#: tdefile/kicondialog.cpp:331
 #, fuzzy
-msgid "Unsupported key size."
-msgstr "Ôl-wyneb ni chynhelir: %1."
-
-#: kssl/ksslinfodlg.cc:120 kssl/ksslkeygen.cc:93
-msgid "TDE SSL Information"
-msgstr "Gwybodaeth SSL TDE"
+msgid "Animations"
+msgstr "Stopio Animeiddiadau"
 
-#: kssl/ksslkeygen.cc:97 misc/uiserver.cpp:1383
-msgid "TDE"
-msgstr "TDE"
+#: tdefile/kicondialog.cpp:332 tdefile/kopenwith.cpp:296
+msgid "Applications"
+msgstr "Cymhwysiannau"
 
-#: kssl/ksslkeygen.cc:97
-#, fuzzy
-msgid "Please wait while the encryption keys are generated..."
-msgstr "Arhoswch wrth i TDE ail-adeiladu cronfa gyrryddion."
+#: tdefile/kicondialog.cpp:333
+msgid "Categories"
+msgstr "Categoriau"
 
-#: kssl/ksslkeygen.cc:107
-msgid "Do you wish to store the passphrase in your wallet file?"
-msgstr ""
+#: tdefile/kicondialog.cpp:334
+msgid "Devices"
+msgstr "Dyfeisiau"
 
-#: kssl/ksslkeygen.cc:107
+#: tdefile/kicondialog.cpp:335
 #, fuzzy
-msgid "Store"
-msgstr "Stryd"
+msgid "Emblems"
+msgstr "symudol"
 
-#: kssl/ksslkeygen.cc:107
+#: tdefile/kicondialog.cpp:336
 #, fuzzy
-msgid "Do Not Store"
-msgstr "Methu Canfod Statws yr Adnodd"
+msgid "Emotes"
+msgstr "Cynnwys Gwag"
 
-#: kssl/ksslkeygen.cc:210
-msgid "2048 (High Grade)"
-msgstr ""
+#: tdefile/kicondialog.cpp:337
+msgid "Filesystems"
+msgstr "Cysodau ffeil"
 
-#: kssl/ksslkeygen.cc:211
-msgid "1024 (Medium Grade)"
-msgstr ""
+#: tdefile/kicondialog.cpp:338
+msgid "International"
+msgstr "Rhyngwladol"
 
-#: kssl/ksslkeygen.cc:212
-msgid "768  (Low Grade)"
-msgstr ""
+#: tdefile/kicondialog.cpp:339
+msgid "Mimetypes"
+msgstr "Mathau MIME"
 
-#: kssl/ksslkeygen.cc:213
-msgid "512  (Low Grade)"
-msgstr ""
+#: tdefile/kicondialog.cpp:340
+#, fuzzy
+msgid "Places"
+msgstr "Tudalennau"
 
-#: kssl/ksslkeygen.cc:215
-msgid "No SSL support."
-msgstr "Ni chynhelir SSL."
+#: tdefile/kicondialog.cpp:341
+#, fuzzy
+msgid "Status"
+msgstr "Ymgychwyn"
 
-#: kssl/ksslpemcallback.cc:36
-msgid "Certificate password"
-msgstr "Cyfrinair tystysgrif"
+#: tdefile/kicondialog.cpp:589
+msgid "*.png *.xpm *.svg *.svgz|Icon Files (*.png *.xpm *.svg *.svgz)"
+msgstr "*.png *.xpm *.svg *.svgz|Ffeiliau eicon  (*.png *.xpm *.svg *.svgz)"
 
-#: kssl/ksslinfodlg.cc:92 kssl/ksslinfodlg.cc:149
-msgid "Current connection is secured with SSL."
-msgstr "Diogelir y cysylltiad cyfredol gan SSL."
+#: tdefile/tdefileiconview.cpp:63
+msgid "Small Icons"
+msgstr "Eiconau Bach "
 
-#: kssl/ksslinfodlg.cc:95 kssl/ksslinfodlg.cc:152
-msgid "Current connection is not secured with SSL."
-msgstr "Ni ddiogelir y cysylltiad cyfredol gan SSL."
+#: tdefile/tdefileiconview.cpp:68
+msgid "Large Icons"
+msgstr "Eiconau Mawr"
 
-#: kssl/ksslinfodlg.cc:99
-msgid "SSL support is not available in this build of TDE."
-msgstr "Nid yw cynnal SSL ar gael yn yr adeiladaeth yma o TDE.  "
+#: tdefile/tdefileiconview.cpp:76
+msgid "Thumbnail Previews"
+msgstr "Rhagolygon Cryno"
 
-#: kssl/ksslinfodlg.cc:109
-msgid "C&ryptography Configuration..."
-msgstr "Ffurfweddiad &Cêl-ysgrifiaeth"
+#: tdefile/tdefileiconview.cpp:120
+msgid "Icon View"
+msgstr "Golwg Eicon"
 
-#: kssl/ksslinfodlg.cc:142
+#: tdefile/kurlbar.cpp:352
 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."
-
-#: kssl/ksslinfodlg.cc:144
-msgid "Some of this document is secured with SSL, but the main part is not."
+"<qt>The <b>Quick Access</b> panel provides easy access to commonly used file "
+"locations."
+"<p>Clicking on one of the shortcut entries will take you to that location."
+"<p>By right clicking on an entry you can add, edit and remove shortcuts.</qt>"
 msgstr ""
-"Mae rhai darnau o'r ddogfen yma yn cael eu diogelu gan SSL, ond mae'r prif "
-"ddarn heb."
-
-#: kssl/ksslinfodlg.cc:184
-msgid "Chain:"
-msgstr "Cadwyn:"
-
-#: kssl/ksslinfodlg.cc:193
-msgid "0 - Site Certificate"
-msgstr "0 - Tystysgrif Wefan"
-
-#: kssl/ksslinfodlg.cc:210
-msgid "Peer certificate:"
-msgstr "Tystysgrif cydradd:"
-
-#: kssl/ksslinfodlg.cc:212
-msgid "Issuer:"
-msgstr "Cyhoeddwr:"
-
-#: kssl/ksslinfodlg.cc:218
-msgid "IP address:"
-msgstr "Cyfeiriad IP:"
-
-#: tdefile/kpropertiesdialog.cpp:2565 kssl/ksslinfodlg.cc:227
-msgid "URL:"
-msgstr "URL:"
-
-#: kssl/ksslinfodlg.cc:230
-msgid "Certificate state:"
-msgstr "Cyflwr y dystysgrif:"
-
-#: kssl/ksslinfodlg.cc:236
-msgid "Valid from:"
-msgstr "Yn ddilys o:"
-
-#: kssl/ksslinfodlg.cc:238
-msgid "Valid until:"
-msgstr "Yn ddilys tan:"
-
-#: kssl/ksslinfodlg.cc:241
-msgid "Serial number:"
-msgstr "Rhif cyfres:"
-
-#: kssl/ksslinfodlg.cc:243
-msgid "MD5 digest:"
-msgstr "Crynodeb MD5:"
-
-#: kssl/ksslinfodlg.cc:246
-msgid "Cipher in use:"
-msgstr "Cêl-ysgrifen mewn defnydd:"
-
-#: kssl/ksslinfodlg.cc:248
-msgid "Details:"
-msgstr "Manylion:"
-
-#: kssl/ksslinfodlg.cc:250
-msgid "SSL version:"
-msgstr "Fersiwn SSL:"
-
-#: kssl/ksslinfodlg.cc:252
-msgid "Cipher strength:"
-msgstr "Cryfder y cêl-ysgrifen:"
-
-#: kssl/ksslinfodlg.cc:253
-msgid "%1 bits used of a %2 bit cipher"
-msgstr "%1 did o cêl-ysgrifen %2 did wedi eu defnyddio"
+"<qt>Mae'r panel <b>Cyrchu ar Frys</b> yn darparu cyrchiad hawdd i leoliadau "
+"ffeil a ddefnyddir yn aml."
+"<p>Bydd clicio ar un o'r cofnodion byrlwybr yn mynd â chi i'r lleoliad yna."
+"<p>Drwy dde-glicio ar gofnod, gallwch ychwanegu, golygu a diddymu "
+"byrlwybrau.</qt>"
 
-#: kssl/ksslinfodlg.cc:401
-msgid "Organization:"
-msgstr "Sefydliad:"
+#: tdefile/kurlbar.cpp:620
+#, fuzzy
+msgid "Desktop Search"
+msgstr "Penbwrdd %1"
 
-#: kssl/ksslinfodlg.cc:406
-msgid "Organizational unit:"
-msgstr "Uned trefniadaeth: "
+#: tdefile/kurlbar.cpp:745
+msgid "&Large Icons"
+msgstr "Eiconau &Mawr"
 
-#: kssl/ksslinfodlg.cc:411
-msgid "Locality:"
-msgstr "Bro:"
+#: tdefile/kurlbar.cpp:745
+msgid "&Small Icons"
+msgstr "Eiconau &Bach"
 
-#: kssl/ksslinfodlg.cc:416
-msgid ""
-"_: Federal State\n"
-"State:"
-msgstr "Talaith:"
+#: tdefile/kurlbar.cpp:751
+msgid "&Edit Entry..."
+msgstr "&Golygu cofnod ..."
 
-#: kssl/ksslinfodlg.cc:421
-msgid "Country:"
-msgstr "Gwlad:"
+#: tdefile/kurlbar.cpp:755
+msgid "&Add Entry..."
+msgstr "&Ychwanegu cofnod ..."
 
-#: kssl/ksslinfodlg.cc:426
-msgid "Common name:"
-msgstr "Enw Cyffredin:"
+#: tdefile/kurlbar.cpp:759
+msgid "&Remove Entry"
+msgstr "&Diddymu Cofnod"
 
-#: kssl/ksslinfodlg.cc:431
-msgid "Email:"
-msgstr "Ebost:"
+#: tdefile/kurlbar.cpp:791
+msgid "Enter a description"
+msgstr "Rhoi disgrifiad"
 
-#: misc/kpac/proxyscout.cpp:124
-#, c-format
-msgid ""
-"The proxy configuration script is invalid:\n"
-"%1"
-msgstr ""
-" Mae'r ysgrifen ffurfweddu'r dirprwy yn annilys:\n"
-"%1"
+#: tdefile/kurlbar.cpp:937
+msgid "Edit Quick Access Entry"
+msgstr "Golygu Cofnod Cyrchu ar Frys"
 
-#: misc/kpac/proxyscout.cpp:184
-#, c-format
+#: tdefile/kurlbar.cpp:940
 msgid ""
-"The proxy configuration script returned an error:\n"
-"%1"
+"<qt><b>Please provide a description, URL and icon for this Quick Access "
+"entry.</b></br></qt>"
 msgstr ""
-"Mae gwall wedi'i ddychwelyd gan yr ysgrifen ffurfweddu'r dirprwy:\n"
-"%1"
+"<qt><b>Mae angen darparu disgrifiad, URL ac eicon i'r cofnod Cyrchu ar Frys "
+"yma.</b></br></qt>"
 
-#: misc/kpac/downloader.cpp:81
-#, c-format
+#: tdefile/kurlbar.cpp:947
 msgid ""
-"Could not download the proxy configuration script:\n"
-"%1"
+"<qt>This is the text that will appear in the Quick Access panel."
+"<p>The description should consist of one or two words that will help you "
+"remember what this entry refers to.</qt>"
 msgstr ""
-"Methu lawrlwytho'r ysgrifen ffurfweddu'r dirprwy:\n"
-"%1"
-
-#: misc/kpac/downloader.cpp:83
-msgid "Could not download the proxy configuration script"
-msgstr "Methu lawrlwytho'r ysgrifen ffurfweddu'r dirprwy."
-
-#: misc/kpac/discovery.cpp:116
-msgid "Could not find a usable proxy configuration script"
-msgstr "Methu canfod ysgrifen ffurfweddu'r dirpwry a gall ei defnyddio"
+"<qt>Dyma'r testun a fydd yn ymddangos yn y panel Cyrchu ar Frys."
+"<p>Dylai'r disgrifiad gynnwys un neu ddau o eiriau a fydd yn helpu chi gofio be "
+"mae'r cofnod hwn yn cyfeirio ato.</qt>"
 
-#: misc/tdefile/fileprops.cpp:200
+#: tdefile/kurlbar.cpp:957
 #, fuzzy
-msgid "Do not print the mimetype of the given file(s)"
-msgstr "Peidio ag argraffu math mime y ffeil(iau) penodol"
-
-#: misc/tdefile/fileprops.cpp:204
-msgid ""
-"List all supported metadata keys of the given file(s). If mimetype is not "
-"specified, the mimetype of the given files is used."
-msgstr ""
-"Rhestru pob allwedd metadata a gynhelir o'r ffeil(iau) a roddwyd.  Os nid yw'r "
-"math mime wedi'i bennu, defnyddir math mime y ffeiliau a roddwyd."
-
-#: misc/tdefile/fileprops.cpp:210
 msgid ""
-"List all preferred metadata keys of the given file(s). If mimetype is not "
-"specified, the mimetype of the given files is used."
-msgstr ""
-"Rhestru pob allwedd metadata amgen o'r ffeil(iau) a roddwyd. Os nid yw'r math "
-"mime wedi'i bennu, defnyddir math mime y ffeiliau a roddwyd."
-
-#: misc/tdefile/fileprops.cpp:216
-msgid "List all metadata keys which have a value in the given file(s)."
+"<qt>This is the location associated with the entry. Any valid URL may be used. "
+"For example:"
+"<p>%1"
+"<br>http://www.trinitydesktop.org"
+"<p>By clicking on the button next to the text edit box you can browse to an "
+"appropriate URL.</qt>"
 msgstr ""
-"Rhestru pob allwedd metadata sydd efo gwerth yn y ffeil(iau) a roddwyd."
+"<qt>Y lleoliad sydd ar y cyd efo'r cofnod.  Gellir defnyddio unrhyw URL dilys.  "
+"Er enghraifft: "
+"<p>%1"
+"<br>http://www.kde.org"
+"<br>ftp://ftp.kde.org/pub/kde/stable "
+"<p>Gan glicio ar y botwm wrth ymyl y blwch golygu testun, gallwch pori at URL "
+"addas. </qt>"
 
-#: misc/tdefile/fileprops.cpp:221
-msgid "Prints all mimetypes for which metadata support is available."
-msgstr "Argraffu pob math mime lle mae cynnal metadata ar gael."
+#: tdefile/kurlbar.cpp:961
+msgid "&URL:"
+msgstr "&URL:"
 
-#: misc/tdefile/fileprops.cpp:226
-#, fuzzy
+#: tdefile/kurlbar.cpp:968
 msgid ""
-"Do not print a warning when more than one file was given and they do not all "
-"have the same mimetype."
+"<qt>This is the icon that will appear in the Quick Access panel."
+"<p>Click on the button to select a different icon.</qt>"
 msgstr ""
-"Peidio ag argraffu rhybudd pan rhoddwyd mwy nac un math mime, a nid yw ganddynt "
-"i gyd yr un math mime."
+"<qt>Yr eicon a ymddenygs yn y panel Cyrchu ar Frys."
+"<p>Cliciwch ar y botwm i ddewis eicon gwahanol.</qt>"
 
-#: misc/tdefile/fileprops.cpp:231
-msgid "Prints all metadata values, available in the given file(s)."
-msgstr "Argraffu pob werth metadata sydd ar gael yn y ffeil(iau) a roddwyd."
+#: tdefile/kurlbar.cpp:970
+msgid "Choose an &icon:"
+msgstr "Dewis &eicon:"
 
-#: misc/tdefile/fileprops.cpp:236
-msgid "Prints the preferred metadata values, available in the given file(s)."
-msgstr ""
-"Argraffu y gwerthau metadata amgen sydd ar gael yn y ffeil(iau) a roddwyd."
+#: tdefile/kurlbar.cpp:986
+msgid "&Only show when using this application (%1)"
+msgstr "Dangos 'mond &pan ddefnyddir y cymhwysiad yma (%1)"
 
-#: misc/tdefile/fileprops.cpp:240
+#: tdefile/kurlbar.cpp:989
 msgid ""
-"Opens a TDE properties dialog to allow viewing and modifying of metadata of the "
-"given file(s)"
+"<qt>Select this setting if you want this entry to show only when using the "
+"current application (%1)."
+"<p>If this setting is not selected, the entry will be available in all "
+"applications.</qt>"
 msgstr ""
-"Agor ymgom priodweddau TDE i ganiatàu gweld a newid y metadata yn y ffeil(iau) "
-"a roddwyd."
+"<qt>Dewis y gosodiad yma os ydych eisiau i'r cofnod yma ddangos 'mond pan "
+"ddefnyddir y cymhwysiad yma (%1)."
+"<p>Os ni ddewisir y gosodiad yma, bydd y cofnod ar gael ym mhob "
+"chymhwysiad.</qt>"
 
-#: misc/tdefile/fileprops.cpp:244
-msgid ""
-"Prints the value for 'key' of the given file(s). 'key' may also be a "
-"comma-separated list of keys"
-msgstr ""
-"Argraffu gwerth 'allwedd' y ffeil(iau) a roddwyd.  Gall 'key' fod hefyd yn "
-"rhestr gwahanwyd gan gollnod o allweddi."
+#: tdefile/kurlrequester.cpp:213
+msgid "Open file dialog"
+msgstr "Agor Ymgom Ffeil"
 
-#: misc/tdefile/fileprops.cpp:248
+#: tdefile/kdirselectdialog.cpp:407 tdefile/kdirselectdialog.cpp:411
+#: tdefile/tdediroperator.cpp:389 tdefile/tdediroperator.cpp:393
+msgid "New Folder"
+msgstr "Plygell Newydd"
+
+#: tdefile/kdirselectdialog.cpp:412 tdefile/tdediroperator.cpp:394
+#, c-format
 msgid ""
-"Attempts to set the value 'value' for the metadata key 'key' for the given "
-"file(s)"
+"Create new folder in:\n"
+"%1"
 msgstr ""
-"Ceisio gosod y gwerth 'gwerth' i'r allwedd metadata 'allwedd' am y ffeil(iau) a "
-"roddwyd."
-
-#: misc/tdefile/fileprops.cpp:251
-#, fuzzy
-msgid "The group to get values from or set values to"
-msgstr "Y cylch i nôl gwerthoedd ohono neu i osod gwerthoedd iddo."
-
-#: misc/tdefile/fileprops.cpp:255
-msgid "The file (or a number of files) to operate on."
-msgstr "Y ffeil (neu nifer o ffeiliau) i weithredu arnynt."
-
-#: misc/tdefile/fileprops.cpp:270
-msgid "No support for metadata extraction found."
-msgstr "Dim cynnal wedi'i ganfod am dynnu metadata."
-
-#: misc/tdefile/fileprops.cpp:275
-msgid "Supported MimeTypes:"
-msgstr "Mathau Mime a Gynhelir"
-
-#: misc/tdefile/fileprops.cpp:410
-msgid "tdefile"
-msgstr "tdefile"
-
-#: misc/tdefile/fileprops.cpp:411
-msgid "A commandline tool to read and modify metadata of files."
-msgstr "Erfyn llinell gorchymyn i ddarllen a newid metadata ffeiliau."
-
-#: misc/tdefile/fileprops.cpp:438
-msgid "No files specified"
-msgstr "Dim ffeiliau wedi'u pennu"
+"Creu plygell newydd yn: \n"
+"%1"
 
-#: misc/tdefile/fileprops.cpp:467
-msgid "Cannot determine metadata"
-msgstr "Methu pennu metadata"
+#: tdefile/kdirselectdialog.cpp:435 tdefile/tdediroperator.cpp:422
+msgid "A file or folder named %1 already exists."
+msgstr "Mae ffeil neu blygell o'r enw %1 mewn bod yn barod."
 
-#: misc/tdewalletd/tdewalletd.cpp:400
+#: tdefile/kdirselectdialog.cpp:439 tdefile/tdediroperator.cpp:426
 #, fuzzy
-msgid ""
-"<qt>TDE has requested to open the wallet '<b>%1</b>'. Please enter the password "
-"for this wallet below."
-msgstr ""
-"Mae TDE wedi gofyn i agor y waled '%1'.  Mewnosodwch y cyfrinair am y waled "
-"isod."
+msgid "You do not have permission to create that folder."
+msgstr "Does dim hawliau ganddoch i greu'r plygell yna."
 
-#: misc/tdewalletd/tdewalletd.cpp:402
+#: tdefile/tdediroperator.cpp:448
 #, fuzzy
-msgid ""
-"<qt>The application '<b>%1</b>' has requested to open the wallet '<b>%2</b>"
-"'. Please enter the password for this wallet below."
-msgstr ""
-"Mae'r cymhwysiad '%1' wedi gofyn i agor y waled '%2'.  Mewnosodwch y cyfrinair "
-"am y waled yma isod."
-
-#: tdefile/tdefiledialog.cpp:1833 misc/tdewalletd/tdewalletd.cpp:405
-#: misc/tdewalletd/tdewalletd.cpp:419
-msgid "&Open"
-msgstr "&Agor"
+msgid "You did not select a file to delete."
+msgstr "Wnaethoch chi ddim dewis ffeil i ddileu."
 
-#: misc/tdewalletd/tdewalletd.cpp:414
-msgid ""
-"TDE 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 ""
-"Mae TDE wedi gofyn i agor y waled.  Defnyddir hwn i gadw data gofalus mewn "
-"ffordd diogel.  Mewnosodwch gyfrinair i ddefnyddio efo'r waled yma, neu "
-"cliciwch Diddymu i wrthod cais y cymhwysiad."
+#: tdefile/tdediroperator.cpp:449
+msgid "Nothing to Delete"
+msgstr "Dim byd i'w dileu."
 
-#: misc/tdewalletd/tdewalletd.cpp:416
-#, fuzzy
+#: tdefile/tdediroperator.cpp:471
 msgid ""
-"<qt>The application '<b>%1</b>' has requested to open the TDE 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."
+"<qt>Do you really want to delete\n"
+" <b>'%1'</b>?</qt>"
 msgstr ""
-"Mae'r cymhwysiad '%1' wedi gofyn i agor y waled TDE.  Defnyddir hwn i gadw data "
-"gofalus mewn ffordd diogel.  Mewnosodwch gyfrinair i ddefnyddio efo'r waled "
-"yma, neu cliciwch Diddymu i wrthod cais y cymhwysiad."
+"<qt>Ydych wir eisiau dileu\n"
+" <b>'%1'</b>?</qt>"
 
-#: misc/tdewalletd/tdewalletd.cpp:423
-#, fuzzy
-msgid ""
-"<qt>TDE has requested to create a new wallet named '<b>%1</b>"
-"'. Please choose a password for this wallet, or cancel to deny the "
-"application's request."
-msgstr ""
-"Mae TDE wedi gofyn i agor waled newydd o'r enw '%1'.  Dewiswch gyfrinair am y "
-"waled yma, neu cliciwch Diddymu i wrthod cais y cymhwysiad."
+#: tdefile/tdediroperator.cpp:473
+msgid "Delete File"
+msgstr "Dileu Ffeil"
 
-#: misc/tdewalletd/tdewalletd.cpp:425
-#, fuzzy
+#: tdefile/tdediroperator.cpp:478
+#, c-format
 msgid ""
-"<qt>The application '<b>%1</b>' has requested to create a new wallet named '<b>"
-"%2</b>'. Please choose a password for this wallet, or cancel to deny the "
-"application's request."
+"_n: Do you really want to delete this item?\n"
+"Do you really want to delete these %n items?"
 msgstr ""
-"Mae'r cymhwysiad '%1' wedi gofyn i agor y waled '%2'.  Dewiswch gyfrinair am y "
-"waled yma, neu cliciwch Diddymu i wrthod cais y cymhwysiad."
-
-#: misc/tdewalletd/tdewalletd.cpp:428
-msgid "C&reate"
-msgstr "C&reu"
-
-#: misc/tdewalletd/tdewalletd.cpp:432 misc/tdewalletd/tdewalletd.cpp:607
-#: misc/tdewalletd/tdewalletd.cpp:623 misc/tdewalletd/tdewalletd.cpp:634
-#: misc/tdewalletd/tdewalletd.cpp:639 misc/tdewalletd/tdewalletd.cpp:1157
-msgid "TDE Wallet Service"
-msgstr "Gwasanaeth Waled TDE"
+"Ydych wir eisiau dileu yr eitem yma?\n"
+"Ydych wir eisiau dileu y %n o eitemau yma?"
 
-#: misc/tdewalletd/tdewalletd.cpp:444
-msgid ""
-"<qt>Error opening the wallet '<b>%1</b>'. Please try again."
-"<br>(Error code %2: %3)"
-msgstr ""
+#: tdefile/tdediroperator.cpp:480
+msgid "Delete Files"
+msgstr "Dileu Ffeiliau"
 
-#: misc/tdewalletd/tdewalletd.cpp:518
+#: tdefile/tdediroperator.cpp:511
 #, fuzzy
-msgid "<qt>TDE has requested access to the open wallet '<b>%1</b>'."
-msgstr "Mae'r cymhwysiad '%1' wedi gofyn am gyrchiad i'r waled agored '%2'."
+msgid "You did not select a file to trash."
+msgstr "Wnaethoch chi ddim dewis ffeil i ddileu."
 
-#: misc/tdewalletd/tdewalletd.cpp:520
+#: tdefile/tdediroperator.cpp:512
 #, fuzzy
-msgid ""
-"<qt>The application '<b>%1</b>' has requested access to the open wallet '<b>"
-"%2</b>'."
-msgstr "Mae'r cymhwysiad '%1' wedi gofyn am gyrchiad i'r waled agored '%2'."
-
-#: misc/tdewalletd/tdewalletd.cpp:607
-msgid ""
-"Unable to open wallet. The wallet must be opened in order to change the "
-"password."
-msgstr ""
-"Methu agor y waled.  Rhaid i'r waled gael ei agor er mwyn newid y cyfrinair."
+msgid "Nothing to Trash"
+msgstr "Dim byd i'w Ddadwneud"
 
-#: misc/tdewalletd/tdewalletd.cpp:622
+#: tdefile/tdediroperator.cpp:534
 #, fuzzy
-msgid "<qt>Please choose a new password for the wallet '<b>%1</b>'."
-msgstr "Dewiswch cyfrinair newydd am y waled '%1'."
-
-#: misc/tdewalletd/tdewalletd.cpp:634
-msgid "Error re-encrypting the wallet. Password was not changed."
-msgstr "Gwall wrth ail-gêlysgrifennu'r waled.  Ni newidwyd y cyfrinair."
-
-#: misc/tdewalletd/tdewalletd.cpp:639
-msgid "Error reopening the wallet. Data may be lost."
-msgstr "Gwall wrth ail-agor y waled.  Efallai collwyd data."
-
-#: misc/tdewalletd/tdewalletd.cpp:1157
 msgid ""
-"There have been repeated failed attempts to gain access to a wallet. An "
-"application may be misbehaving."
-msgstr ""
-"Mae ceisiadau aflwyddianus niferus i gael cyrchiad i waled wedi bod.  Efallai "
-"mae cymhwysiad yn camymddwyn. "
-
-#: misc/tdewalletd/tdewalletwizard.ui.h:23
-msgid "<qt>Password is empty.  <b>(WARNING: Insecure)"
+"<qt>Do you really want to trash\n"
+" <b>'%1'</b>?</qt>"
 msgstr ""
+"<qt>Ydych wir eisiau dileu\n"
+" <b>'%1'</b>?</qt>"
 
-#: misc/tdewalletd/tdewalletwizard.ui.h:25
-msgid "Passwords match."
-msgstr "Mae'r cyfrineiriau yn cydweddu."
-
-#: misc/tdewalletd/tdewalletwizard.ui.h:28
-msgid "Passwords do not match."
-msgstr "Nid yw'r cyfrineiriau yn cydweddu."
-
-#: misc/tdetelnetservice.cpp:41
-msgid "telnet service"
-msgstr "gwasanaeth telnet"
-
-#: misc/tdetelnetservice.cpp:42
-msgid "telnet protocol handler"
-msgstr "trinydd protocol telnet"
-
-#: misc/tdetelnetservice.cpp:76
-msgid "You do not have permission to access the %1 protocol."
-msgstr "Nid oes ganddoch caniatad i gyrchu'r protocol %1."
-
-#: misc/uiserver.cpp:98 misc/uiserver.cpp:603 misc/uiserver.cpp:682
-msgid "Settings..."
-msgstr "Gosodiadau..."
-
-#: misc/uiserver.cpp:126
-msgid "Configure Network Operation Window"
-msgstr "Ffurfweddu Ffenestr Gweithrediadau'r Rhwydwaith"
-
-#: misc/uiserver.cpp:130
-msgid "Show system tray icon"
-msgstr "Dangos eicon y teclyn cysawd"
-
-#: misc/uiserver.cpp:131
-msgid "Keep network operation window always open"
-msgstr "Cadw'r ffenestr gweithrediadau'r rhwydwaith ar agor yn barhaol"
-
-#: misc/uiserver.cpp:132
-msgid "Show column headers"
-msgstr "Dangos penodau'r colofnau"
-
-#: misc/uiserver.cpp:133
-msgid "Show toolbar"
-msgstr "Dangos bar offer"
-
-#: misc/uiserver.cpp:134
-msgid "Show statusbar"
-msgstr "Dangos bar cyflwr"
-
-#: misc/uiserver.cpp:135
-msgid "Column widths are user adjustable"
-msgstr " Gall lledau'r colofnau gael eu addasu gan y defnyddiwr"
-
-#: misc/uiserver.cpp:136
-msgid "Show information:"
-msgstr "Dangos gwybodaeth:"
-
-#: misc/uiserver.cpp:143 misc/uiserver.cpp:474
-msgid "URL"
-msgstr "URL"
-
-#: misc/uiserver.cpp:144 misc/uiserver.cpp:473
-msgid ""
-"_: Remaining Time\n"
-"Rem. Time"
-msgstr "Ams. yn Weddill"
-
-#: misc/uiserver.cpp:145 misc/uiserver.cpp:472
-msgid "Speed"
-msgstr "Cyflymdra"
-
-#: tdefile/tdefiledetailview.cpp:67 misc/uiserver.cpp:146 misc/uiserver.cpp:471
-msgid "Size"
-msgstr "Maint"
-
-#: misc/uiserver.cpp:147 misc/uiserver.cpp:470
-#, c-format
-msgid "%"
-msgstr "%"
-
-#: misc/uiserver.cpp:148 misc/uiserver.cpp:469
-msgid "Count"
-msgstr "Cyfrif"
-
-#: misc/uiserver.cpp:149 misc/uiserver.cpp:468
-msgid ""
-"_: Resume\n"
-"Res."
-msgstr "Ail-ddechrau"
-
-#: misc/uiserver.cpp:150 misc/uiserver.cpp:467
+#: tdefile/tdediroperator.cpp:536
 #, fuzzy
-msgid "Local Filename"
-msgstr "Enw Ffeil Lleol"
-
-#: misc/uiserver.cpp:151 misc/uiserver.cpp:466
-msgid "Operation"
-msgstr "Gweithrediad"
-
-#: misc/uiserver.cpp:254
-msgid "%1 / %2"
-msgstr "%1 / %2"
-
-#: misc/uiserver.cpp:291
-msgid "%1/s"
-msgstr "%1/s"
-
-#: misc/uiserver.cpp:302
-msgid "Copying"
-msgstr "Copïo"
-
-#: misc/uiserver.cpp:311
-msgid "Moving"
-msgstr "Symud"
-
-#: misc/uiserver.cpp:320
-msgid "Creating"
-msgstr "Creu"
-
-#: misc/uiserver.cpp:329
-msgid "Deleting"
-msgstr "Dileu"
-
-#: misc/uiserver.cpp:337
-msgid "Loading"
-msgstr "llwytho"
-
-#: misc/uiserver.cpp:362
-msgid "Examining"
-msgstr "Arholi"
-
-#: misc/uiserver.cpp:370
-msgid "Mounting"
-msgstr "Gosod"
-
-#: misc/uiserver.cpp:608 misc/uiserver.cpp:1097
-msgid " Files: %1 "
-msgstr "Ffeiliau : %1"
-
-#: misc/uiserver.cpp:609
-msgid ""
-"_: Remaining Size\n"
-" Rem. Size: %1 kB "
-msgstr ""
-
-#: misc/uiserver.cpp:610
-msgid ""
-"_: Remaining Time\n"
-" Rem. Time: 00:00:00 "
-msgstr ""
-
-#: misc/uiserver.cpp:611
-msgid " %1 kB/s "
-msgstr "%1 kB/s"
-
-#: misc/uiserver.cpp:679
-msgid "Cancel Job"
-msgstr "Diddymu'r Swydd"
+msgid "Trash File"
+msgstr "Sbwriel"
 
-#: misc/uiserver.cpp:1098
+#: tdefile/tdediroperator.cpp:537 tdefile/tdediroperator.cpp:544
 msgid ""
-"_: Remaining Size\n"
-" Rem. Size: %1 "
+"_: to trash\n"
+"&Trash"
 msgstr ""
 
-#: misc/uiserver.cpp:1100
+#: tdefile/tdediroperator.cpp:541
+#, fuzzy, c-format
 msgid ""
-"_: Remaining Time\n"
-" Rem. Time: %1 "
+"_n: translators: not called for n == 1\n"
+"Do you really want to trash these %n items?"
 msgstr ""
+"Ydych wir eisiau dileu'r %n eitem yma? \n"
+"Ydych wir eisiau dileu'r %n eitem yma?"
 
-#: misc/uiserver.cpp:1384
-msgid "TDE Progress Information UI Server"
-msgstr "Gweinydd UI Gwybodaeth Cynnydd TDE"
-
-#: misc/uiserver.cpp:1387 misc/uiserver.cpp:1388
-msgid "Developer"
-msgstr "Datblygwr"
-
-#: misc/tdesendbugmail/main.cpp:22
-msgid "Subject line"
-msgstr "Llinell pwnc"
-
-#: misc/tdesendbugmail/main.cpp:23
-msgid "Recipient"
-msgstr "Derbynnwr"
-
-#: misc/tdesendbugmail/main.cpp:33
-msgid "Error connecting to server."
-msgstr "Gwall wrth gysylltu i'r gweinydd"
-
-#: misc/tdesendbugmail/main.cpp:36
-msgid "Not connected."
-msgstr "Dim cyswllt."
-
-#: misc/tdesendbugmail/main.cpp:39
-msgid "Connection timed out."
-msgstr "Cysylltiad wedi goramseru."
-
-#: misc/tdesendbugmail/main.cpp:42
-msgid "Time out waiting for server interaction."
-msgstr "Goramser wrth aros am ryngweithiad gweinydd."
-
-#: misc/tdesendbugmail/main.cpp:46
-msgid "Server said: \"%1\""
-msgstr "Dywedodd y gweinydd: \"%1\""
-
-#: misc/tdesendbugmail/main.cpp:62
-msgid "KSendBugMail"
-msgstr "KSendBugMail"
-
-#: misc/tdesendbugmail/main.cpp:63
-msgid "Sends a short bug report to submit@bugs.kde.org"
-msgstr "Gyrru adroddiad nam byr i submit@bugs.kde.org"
-
-#: misc/tdesendbugmail/main.cpp:65
-msgid "Author"
-msgstr "Awdur"
-
-#: misc/tdemailservice.cpp:32
+#: tdefile/tdediroperator.cpp:543
 #, fuzzy
-msgid "KMailService"
-msgstr "Gwasanaeth ebost"
-
-#: misc/tdemailservice.cpp:32
-msgid "Mail service"
-msgstr "Gwasanaeth ebost"
+msgid "Trash Files"
+msgstr "Ffeiliau dros dro"
 
-#: tdeioexec/main.cpp:50
-msgid "TDEIO Exec - Opens remote files, watches modifications, asks for upload"
-msgstr "TDEIO Exec - Agor ffeiliau pell, arsylwi newidiadau, gofyn am lanlwytho."
+#: tdefile/tdediroperator.cpp:658 tdefile/tdediroperator.cpp:726
+msgid "The specified folder does not exist or was not readable."
+msgstr "Nid ydy'r plygell penodol yn bodoli, neu doedd o ddim yn ddarllenadwy."
 
-#: tdeioexec/main.cpp:54
-msgid "Treat URLs as local files and delete them afterwards"
-msgstr "Trin URLau fel ffeiliau lleol a'u dileu wedyn"
+#: tdefile/tdediroperator.cpp:920 tdefile/tdediroperator.cpp:1321
+#: tdefile/tdefiledetailview.cpp:64
+msgid "Detailed View"
+msgstr "Golwg Manwl"
 
-#: tdeioexec/main.cpp:55
-#, fuzzy
-msgid "Suggested file name for the downloaded file"
-msgstr "Dewiswch enw ffeil amgen i'r ffeil newydd."
+#: tdefile/tdediroperator.cpp:925 tdefile/tdediroperator.cpp:1319
+msgid "Short View"
+msgstr "Golwg Byr"
 
-#: tdeioexec/main.cpp:56
-msgid "Command to execute"
-msgstr "Gorchymyn i Weithredu"
+#: tdefile/kcustommenueditor.cpp:94 tdefile/tdediroperator.cpp:1258
+msgid "Menu"
+msgstr "Dewislen"
 
-#: tdeioexec/main.cpp:57
-msgid "URL(s) or local file(s) used for 'command'"
-msgstr "URL(au) neu ffeil(iau) lleol i'w defnyddio fel 'gorchymyn'"
+#: tdefile/tdediroperator.cpp:1260
+msgid "Parent Folder"
+msgstr "Plygell Rhiant"
 
-#: tdeioexec/main.cpp:73
-msgid ""
-"'command' expected.\n"
-msgstr ""
-"'gorchymyn' a ddisgwylir.\n"
+#: tdefile/tdediroperator.cpp:1264 tdefile/tdefilespeedbar.cpp:60
+msgid "Home Folder"
+msgstr "Plygell Cartref"
 
-#: tdeioexec/main.cpp:102
-msgid ""
-"The URL %1\n"
-"is malformed"
-msgstr ""
-"Mae'r URL %1\n"
-"wedi'i gam-fformatio"
+#: tdefile/kdirselectdialog.cpp:92 tdefile/kdirselectdialog.cpp:125
+#: tdefile/tdediroperator.cpp:1269
+msgid "New Folder..."
+msgstr "Plygell Newydd..."
 
-#: tdeioexec/main.cpp:104
-msgid ""
-"Remote URL %1\n"
-"not allowed with --tempfiles switch"
-msgstr ""
-"Ni chaniateir URL pell %1\n"
-"efo'r cymal --tempfiles"
+#: tdefile/tdediroperator.cpp:1271
+msgid "Move to Trash"
+msgstr "Symud i'r Sbwriel"
 
-#: tdeioexec/main.cpp:237
-msgid ""
-"The supposedly temporary file\n"
-"%1\n"
-"has been modified.\n"
-"Do you still want to delete it?"
-msgstr ""
-"Mae'r ffeil\n"
-"%1\n"
-"(oedd i fod dros dro) wedi ei newid. \n"
-"Ydych eisiau ei dileu?"
+#: tdefile/tdediroperator.cpp:1282
+msgid "Sorting"
+msgstr "Didoli"
 
-#: tdeioexec/main.cpp:238 tdeioexec/main.cpp:245
-msgid "File Changed"
-msgstr "Newidwyd y ffeil."
+#: tdefile/tdediroperator.cpp:1283
+msgid "By Name"
+msgstr "Gan Enw"
 
-#: tdeioexec/main.cpp:238
-#, fuzzy
-msgid "Do Not Delete"
-msgstr "Dim byd i'w dileu."
+#: tdefile/tdediroperator.cpp:1286
+msgid "By Date"
+msgstr "Gan Ddyddiad"
 
-#: tdeioexec/main.cpp:244
-msgid ""
-"The file\n"
-"%1\n"
-"has been modified.\n"
-"Do you want to upload the changes?"
-msgstr ""
-"Mae'r ffeil\n"
-"%1\n"
-"wedi ei newid. \n"
-"Ydych eisiau lanlwytho'r newidiadau?"
+#: tdefile/tdediroperator.cpp:1289
+msgid "By Size"
+msgstr "Gan Faint"
 
-#: tdeioexec/main.cpp:245
-msgid "Upload"
-msgstr "Lanlwytho"
+#: tdefile/tdediroperator.cpp:1292
+msgid "Reverse"
+msgstr "Gwrthwyneb"
 
-#: tdeioexec/main.cpp:245
-msgid "Do Not Upload"
-msgstr ""
+#: tdefile/tdediroperator.cpp:1302
+msgid "Folders First"
+msgstr "Plygyll yn Gyntaf"
 
-#: tdeioexec/main.cpp:274
-msgid "KIOExec"
-msgstr "KIOExec"
+#: tdefile/tdediroperator.cpp:1304
+msgid "Case Insensitive"
+msgstr "Dim bwys am lythrennau bras"
 
-#: tdefile/kimagefilepreview.cpp:53
-msgid "&Automatic preview"
-msgstr "&Awtomatig"
+#: tdefile/tdediroperator.cpp:1324
+msgid "Show Hidden Files"
+msgstr "Dangos Ffeiliau Cudd"
 
-#: tdefile/kimagefilepreview.cpp:58
-msgid "&Preview"
-msgstr "&Rhagolwg"
+#: tdefile/tdediroperator.cpp:1327
+msgid "Separate Folders"
+msgstr "Plygyll ar Wahân"
 
-#: tdefile/tdefileview.cpp:77
-msgid "Unknown View"
-msgstr "Golwg Anhysbys"
+#: tdefile/tdediroperator.cpp:1331
+msgid "Show Preview"
+msgstr "Dangos Rhagolwg"
 
-#: tdefile/kpreviewprops.cpp:49
-msgid "P&review"
-msgstr "R&hagolwg"
+#: tdefile/tdediroperator.cpp:1335
+#, fuzzy
+msgid "Hide Preview"
+msgstr "Rhagweld"
 
-#: tdefile/tdefilespeedbar.cpp:46
+#: tdefile/tdefilespeedbar.cpp:49
 msgid "Desktop"
 msgstr "Penbwrdd"
 
-#: tdefile/tdefilespeedbar.cpp:53
+#: tdefile/tdefilespeedbar.cpp:56
 msgid "Documents"
 msgstr "Dogfennau"
 
-#: tdefile/tdediroperator.cpp:1264 tdefile/tdefilespeedbar.cpp:57
-msgid "Home Folder"
-msgstr "Plygell Cartref"
-
-#: tdefile/tdefilespeedbar.cpp:62
+#: tdefile/tdefilespeedbar.cpp:65
 msgid "Storage Media"
 msgstr ""
 
-#: tdefile/tdefilespeedbar.cpp:67
-#, fuzzy
-msgid "Network Folders"
-msgstr "Plygell Newydd"
-
-#: tdefile/kcustommenueditor.cpp:88
-msgid "Menu Editor"
-msgstr "Golygydd Dewislen"
-
-#: tdefile/kcustommenueditor.cpp:94 tdefile/tdediroperator.cpp:1258
-msgid "Menu"
-msgstr "Dewislen"
-
-#: tdefile/kcustommenueditor.cpp:98
-msgid "New..."
-msgstr "Newydd ..."
-
-#: tdefile/kcustommenueditor.cpp:100
-msgid "Move Up"
-msgstr "Symud i Fyny"
-
-#: tdefile/kcustommenueditor.cpp:101
-msgid "Move Down"
-msgstr "Symud i Lawr"
-
-#: tdefile/tdefiledialog.cpp:1676 tdefile/tdefilefiltercombo.cpp:32
-msgid "*|All Files"
-msgstr "*|Pob Ffeil"
-
-#: tdefile/tdefilefiltercombo.cpp:164
-msgid "All Supported Files"
-msgstr "Pob Ffeil a Cynhelir"
-
-#: tdefile/kopenwith.cpp:150
-msgid "Known Applications"
-msgstr "Cymhwysiannau Hysbys"
-
-#: tdefile/kicondialog.cpp:332 tdefile/kopenwith.cpp:296
-msgid "Applications"
-msgstr "Cymhwysiannau"
-
-#: tdefile/kopenwith.cpp:322
-msgid "Open With"
-msgstr "Agor Efo"
-
-#: tdefile/kopenwith.cpp:326
-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>"
-
-#: tdefile/kopenwith.cpp:332
-msgid "Choose the name of the program with which to open the selected files."
-msgstr "Dewis enw'r rhaglen i agor y ffeiliau penodol."
-
-#: tdefile/kopenwith.cpp:353
-#, c-format
-msgid "Choose Application for %1"
-msgstr "Dewis Cymhwysiad i %1"
-
-#: tdefile/kopenwith.cpp:354
-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>"
+#: tdefile/tdefilespeedbar.cpp:100
+msgid "Download"
 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>"
-
-#: tdefile/kopenwith.cpp:366
-msgid "Choose Application"
-msgstr "Dewis Cymhwysiad"
 
-#: tdefile/kopenwith.cpp:367
-msgid ""
-"<qt>Select a program. If the program is not listed, enter the name or click the "
-"browse button.</qt>"
+#: tdefile/tdefilespeedbar.cpp:102
+msgid "Music"
 msgstr ""
-"<qt>Dewisi rhaglen. Os nad yw'r rhaglen wedi ei rhestru, mewnbynnwch yr enw neu "
-"clicio ar y botwm pori</qt>"
-
-#: tdefile/kopenwith.cpp:406
-msgid "Clear input field"
-msgstr "Diddymu'r faes mewnbwn."
-
-#: tdefile/kopenwith.cpp:436
-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"
-
-#: tdefile/kopenwith.cpp:469
-msgid "Run in &terminal"
-msgstr "Rhedeg mewn &terfynell"
-
-#: tdefile/kopenwith.cpp:480
-msgid "&Do not close when command exits"
-msgstr "&Peidiwch a chau pan terfynir y gorchymyn"
-
-#: tdefile/kopenwith.cpp:497
-msgid "&Remember application association for this type of file"
-msgstr "&Cofio cyd-gymhwysiad i'r math yma o ffeil"
-
-#: tdefile/kicondialog.cpp:241 tdefile/kicondialog.cpp:250
-msgid "Select Icon"
-msgstr "Dewis Eicon"
-
-#: tdefile/kicondialog.cpp:270
-msgid "Icon Source"
-msgstr "Ffynhonell Eicon"
-
-#: tdefile/kicondialog.cpp:276
-msgid "S&ystem icons:"
-msgstr "E&iconau cysawd:"
-
-#: tdefile/kicondialog.cpp:281
-msgid "O&ther icons:"
-msgstr "Ei&conau eraill:"
-
-#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 213
-#: tdefile/kicondialog.cpp:283 tdefile/kpropertiesdialog.cpp:3615 rc.cpp:288
-#, no-c-format
-msgid "&Browse..."
-msgstr "&Pori..."
-
-#: tdefile/kicondialog.cpp:293
-msgid "Clear Search"
-msgstr "Gwagu'r Chwiliad"
-
-#: tdefile/kicondialog.cpp:297
-msgid "&Search:"
-msgstr "&Chwilio:"
-
-#: tdefile/kicondialog.cpp:308
-msgid "Search interactively for icon names (e.g. folder)."
-msgstr ""
-
-#. i18n: file ./tdefile/knotifywidgetbase.ui line 204
-#: tdefile/kicondialog.cpp:330 rc.cpp:165
-#, no-c-format
-msgid "Actions"
-msgstr "Gweithrediadau"
-
-#: tdefile/kicondialog.cpp:331
-#, fuzzy
-msgid "Animations"
-msgstr "Stopio Animeiddiadau"
-
-#: tdefile/kicondialog.cpp:333
-msgid "Categories"
-msgstr "Categoriau"
-
-#: tdefile/kicondialog.cpp:334
-msgid "Devices"
-msgstr "Dyfeisiau"
 
-#: tdefile/kicondialog.cpp:335
+#: tdefile/tdefilespeedbar.cpp:104
 #, fuzzy
-msgid "Emblems"
-msgstr "symudol"
+msgid "Pictures"
+msgstr "Pob Delwedd"
 
-#: tdefile/kicondialog.cpp:336
+#: tdefile/tdefilespeedbar.cpp:106
 #, fuzzy
-msgid "Emotes"
-msgstr "Cynnwys Gwag"
-
-#: tdefile/kicondialog.cpp:337
-msgid "Filesystems"
-msgstr "Cysodau ffeil"
-
-#: tdefile/kicondialog.cpp:338
-msgid "International"
-msgstr "Rhyngwladol"
+msgid "Videos"
+msgstr "Fideo"
 
-#: tdefile/kicondialog.cpp:339
-msgid "Mimetypes"
-msgstr "Mathau MIME"
+#: tdefile/tdefilespeedbar.cpp:108
+msgid "Templates"
+msgstr ""
 
-#: tdefile/kicondialog.cpp:340
-#, fuzzy
-msgid "Places"
-msgstr "Tudalennau"
+#: tdefile/tdefilespeedbar.cpp:110
+msgid "Public"
+msgstr "Cyhoeddus"
 
-#: tdefile/kicondialog.cpp:341
+#: tdefile/tdefilespeedbar.cpp:115
 #, fuzzy
-msgid "Status"
-msgstr "Ymgychwyn"
+msgid "Network Folders"
+msgstr "Plygell Newydd"
 
-#: tdefile/kicondialog.cpp:589
-msgid "*.png *.xpm *.svg *.svgz|Icon Files (*.png *.xpm *.svg *.svgz)"
-msgstr "*.png *.xpm *.svg *.svgz|Ffeiliau eicon  (*.png *.xpm *.svg *.svgz)"
+#: tdefile/kpreviewprops.cpp:49
+msgid "P&review"
+msgstr "R&hagolwg"
 
-#: tdefile/tdefilemetainfowidget.cpp:111
-msgid "<Error>"
-msgstr "<Gwall>"
+#: tdefile/kacleditwidget.cpp:564 tdefile/tdefiledetailview.cpp:66
+msgid "Name"
+msgstr "Enw"
 
-#: tdefile/tdefilepreview.cpp:63
-msgid "Preview"
-msgstr "Rhagweld"
+#: tdefile/tdefiledetailview.cpp:68
+msgid "Date"
+msgstr "Dyddiad"
 
-#: tdefile/tdefilepreview.cpp:69
-msgid "No preview available."
-msgstr "Dim rhagolwg ar gael."
+#: tdefile/tdefiledetailview.cpp:69
+msgid "Permissions"
+msgstr "Caniatad"
 
 #: tdefile/kacleditwidget.cpp:63 tdefile/kacleditwidget.cpp:421
 #: tdefile/tdefiledetailview.cpp:70
 msgid "Owner"
 msgstr "Perchennog"
 
+#: tdefile/kpropertiesdialog.cpp:2012 tdefile/tdefiledetailview.cpp:71
+msgid "Group"
+msgstr "Grw^p"
+
+#: tdefile/kmetaprops.cpp:130
+msgid "&Meta Info"
+msgstr "&Gwybodaeth Meta"
+
+#: tdefile/kdirselectdialog.cpp:90
+msgid "Select Folder"
+msgstr "Dewis Plygell"
+
+#: tdefile/kdirselectdialog.cpp:109
+msgid "Folders"
+msgstr "Plygyll"
+
+#: tdefile/kdirselectdialog.cpp:128
+#, fuzzy
+msgid "Show Hidden Folders"
+msgstr "Dangos Ffeiliau Cudd"
+
 #: tdefile/kacleditwidget.cpp:64 tdefile/kacleditwidget.cpp:423
 #, fuzzy
 msgid "Owning Group"
 msgstr "Grwp Newydd"
 
 #: tdefile/kacleditwidget.cpp:65 tdefile/kacleditwidget.cpp:425
-#: tdefile/kpropertiesdialog.cpp:1980
+#: tdefile/kpropertiesdialog.cpp:2016
 msgid "Others"
 msgstr "Eraill"
 
@@ -3776,10 +4698,6 @@ msgstr "Gr?p: "
 msgid "Type"
 msgstr "Math"
 
-#: tdefile/kacleditwidget.cpp:564 tdefile/tdefiledetailview.cpp:66
-msgid "Name"
-msgstr "Enw"
-
 #: tdefile/kacleditwidget.cpp:565
 msgid ""
 "_: read permission\n"
@@ -3803,178 +4721,6 @@ msgstr "x"
 msgid "Effective"
 msgstr "Gweithredwr"
 
-#: tdefile/kdirselectdialog.cpp:90
-msgid "Select Folder"
-msgstr "Dewis Plygell"
-
-#: tdefile/tdediroperator.cpp:1269 tdefile/kdirselectdialog.cpp:92
-#: tdefile/kdirselectdialog.cpp:125
-msgid "New Folder..."
-msgstr "Plygell Newydd..."
-
-#: tdefile/kdirselectdialog.cpp:109
-msgid "Folders"
-msgstr "Plygyll"
-
-#: tdefile/kdirselectdialog.cpp:128
-#, fuzzy
-msgid "Show Hidden Folders"
-msgstr "Dangos Ffeiliau Cudd"
-
-#: tdefile/tdediroperator.cpp:389 tdefile/tdediroperator.cpp:393
-#: tdefile/kdirselectdialog.cpp:407 tdefile/kdirselectdialog.cpp:411
-msgid "New Folder"
-msgstr "Plygell Newydd"
-
-#: tdefile/tdediroperator.cpp:394 tdefile/kdirselectdialog.cpp:412
-#, c-format
-msgid ""
-"Create new folder in:\n"
-"%1"
-msgstr ""
-"Creu plygell newydd yn: \n"
-"%1"
-
-#: tdefile/tdediroperator.cpp:422 tdefile/kdirselectdialog.cpp:435
-msgid "A file or folder named %1 already exists."
-msgstr "Mae ffeil neu blygell o'r enw %1 mewn bod yn barod."
-
-#: tdefile/tdediroperator.cpp:426 tdefile/kdirselectdialog.cpp:439
-#, fuzzy
-msgid "You do not have permission to create that folder."
-msgstr "Does dim hawliau ganddoch i greu'r plygell yna."
-
-#: bookmarks/kbookmarkmenu.cc:797 tdefile/kpropertiesdialog.cpp:968
-#: tdefile/kurlrequesterdlg.cpp:47
-msgid "Location:"
-msgstr "Lleoliad:"
-
-#: tdefile/knotifydialog.cpp:81
-msgid "Sounds"
-msgstr "Syniau"
-
-#: tdefile/knotifydialog.cpp:82
-msgid "Logging"
-msgstr "Cofnodi"
-
-#: tdefile/knotifydialog.cpp:83
-msgid "Program Execution"
-msgstr "Gweithrediad Rhaglen"
-
-#: tdefile/knotifydialog.cpp:84
-msgid "Message Windows"
-msgstr "Ffenestri Negesau"
-
-#: tdefile/knotifydialog.cpp:85
-msgid "Passive Windows"
-msgstr "Ffenestri Goddefol"
-
-#: tdefile/knotifydialog.cpp:86
-msgid "Standard Error Output"
-msgstr "Allbwn Gwall Safonol"
-
-#: tdefile/knotifydialog.cpp:87
-msgid "Taskbar"
-msgstr "Bar Tasgiau"
-
-#: tdefile/knotifydialog.cpp:121
-msgid "Execute a program"
-msgstr "Gweithredu rhaglen"
-
-#: tdefile/knotifydialog.cpp:122
-msgid "Print to Standard error output"
-msgstr "Argraffu i allbwn gwall safonol"
-
-#: tdefile/knotifydialog.cpp:123
-msgid "Display a messagebox"
-msgstr "Dangos blwch neges"
-
-#: tdefile/knotifydialog.cpp:124
-msgid "Log to a file"
-msgstr "Ysgrifennu i ffeil cofnod"
-
-#: tdefile/knotifydialog.cpp:125
-msgid "Play a sound"
-msgstr "Chwarae sŵn"
-
-#: tdefile/knotifydialog.cpp:126
-msgid "Flash the taskbar entry"
-msgstr "Fflachio cofnod y bar tasgiau"
-
-#: tdefile/knotifydialog.cpp:163
-msgid "Notification Settings"
-msgstr "Gosodiadau Hysbysau"
-
-#: tdefile/knotifydialog.cpp:309
-msgid ""
-"<qt>You may use the following macros"
-"<br>in the commandline:"
-"<br><b>%e</b>: for the event name,"
-"<br><b>%a</b>: for the name of the application that sent the event,"
-"<br><b>%s</b>: for the notification message,"
-"<br><b>%w</b>: for the numeric window ID where the event originated,"
-"<br><b>%i</b>: for the numeric event ID."
-msgstr ""
-"<qt>Gallwch ddefnyddio'r macros isod "
-"<br>yn y llinell gorchymyn:"
-"<br><b>%e</b>: am enw'r digwyddiad,"
-"<br><b>%a</b>: am enw'r cymhwysiad a anfonodd y digwyddiad,"
-"<br><b>%s</b>: am y neges hysbysu,"
-"<br><b>%w</b>: am yr ID ffenestr rhifol lle cychwynnodd y digwyddiad, "
-"<br><b>%i</b>: am yr ID digwyddiad rhifol."
-
-#: tdefile/knotifydialog.cpp:339
-#, fuzzy
-msgid "Advanced <<"
-msgstr "Gosod &uwch"
-
-#: tdefile/knotifydialog.cpp:340
-msgid "Hide advanced options"
-msgstr "Cuddio dewisiadau uwch"
-
-#: tdefile/knotifydialog.cpp:356
-#, fuzzy
-msgid "Advanced >>"
-msgstr "Gosod &uwch"
-
-#: tdefile/knotifydialog.cpp:357
-msgid "Show advanced options"
-msgstr "Dangos dewisiadau uwch"
-
-#: tdefile/knotifydialog.cpp:782
-#, fuzzy
-msgid "This will cause the notifications to be reset to their defaults."
-msgstr "Achosir i'r hysbysau gael ei ail-osod i'w rhagosodiadau!"
-
-#: tdefile/knotifydialog.cpp:784
-msgid "Are You Sure?"
-msgstr "Ydych Yn Sicr?"
-
-#: tdefile/knotifydialog.cpp:785
-msgid "&Reset"
-msgstr "&Ailosod"
-
-#: tdefile/knotifydialog.cpp:858
-msgid "Select Sound File"
-msgstr "Dewis Ffeil Sw^n"
-
-#: tdefile/knotifydialog.cpp:894
-msgid "Select Log File"
-msgstr "Dewis Ffeil Cofnodi"
-
-#: tdefile/knotifydialog.cpp:908
-msgid "Select File to Execute"
-msgstr "Dewis Ffeil i Weithredu"
-
-#: tdefile/knotifydialog.cpp:942
-#, fuzzy
-msgid "The specified file does not exist."
-msgstr "Efallai nad yw'r plygell penodol mewn bod."
-
-#: tdefile/knotifydialog.cpp:1012
-msgid "No description available"
-msgstr "Disgrifiad"
-
 #: tdefile/tdefiledialog.cpp:347
 #, fuzzy
 msgid "Please specify the filename to save to."
@@ -3985,12 +4731,12 @@ msgid "Please select the file to open."
 msgstr "Penodwch enw'r ffeil i agor."
 
 #: tdefile/tdefiledialog.cpp:410 tdefile/tdefiledialog.cpp:453
-#: tdefile/tdefiledialog.cpp:1550
+#: tdefile/tdefiledialog.cpp:1558
 msgid "You can only select local files."
 msgstr "Gallwch ddewis 'mond ffeiliau lleol."
 
 #: tdefile/tdefiledialog.cpp:411 tdefile/tdefiledialog.cpp:454
-#: tdefile/tdefiledialog.cpp:1551
+#: tdefile/tdefiledialog.cpp:1559
 #, fuzzy
 msgid "Remote Files Not Accepted"
 msgstr "Ni derbynnir Ffeiliau Pell"
@@ -4141,7 +4887,7 @@ msgstr ""
 msgid "&Location:"
 msgstr "&Lleoliad:"
 
-#: tdefile/tdefiledialog.cpp:1017
+#: tdefile/tdefiledialog.cpp:1018
 msgid ""
 "<qt>This is the filter to apply to the file list. File names that do not match "
 "the filter will not be shown."
@@ -4155,11 +4901,16 @@ msgstr ""
 "mewnosod hidl addasu yn syth i mewn i'r ardal testun."
 "<p> Caniateir nod-chwilwyr fel * a ?. </qt>"
 
-#: tdefile/tdefiledialog.cpp:1023
+#: tdefile/tdefiledialog.cpp:1024
 msgid "&Filter:"
 msgstr "&Hidl:"
 
-#: tdefile/tdefiledialog.cpp:1480
+#: tdefile/tdefiledialog.cpp:1171
+#, fuzzy
+msgid "search term"
+msgstr "(chwilio)"
+
+#: tdefile/tdefiledialog.cpp:1488
 #, fuzzy
 msgid ""
 "The chosen filenames do not\n"
@@ -4168,11 +4919,11 @@ msgstr ""
 "Ymddengys nad ydy \n"
 " enwau'r ffeiliau a ddewiswyd yn ddilys."
 
-#: tdefile/tdefiledialog.cpp:1482
+#: tdefile/tdefiledialog.cpp:1490
 msgid "Invalid Filenames"
 msgstr "Enwau Ffeil Annilys"
 
-#: tdefile/tdefiledialog.cpp:1512
+#: tdefile/tdefiledialog.cpp:1520
 #, fuzzy
 msgid ""
 "The requested filenames\n"
@@ -4185,33 +4936,37 @@ msgstr ""
 "yn edrych yn ddilys i mi. \n"
 "Sicrhewch bod pob enw ffeil ar amgau mewn dyfynodau dwbl."
 
-#: tdefile/tdefiledialog.cpp:1516
+#: tdefile/tdefiledialog.cpp:1524
 msgid "Filename Error"
 msgstr "Gwall yn enw'r ffeil"
 
-#: tdefile/tdefiledialog.cpp:1673
+#: tdefile/tdefiledialog.cpp:1681
 msgid "*|All Folders"
 msgstr "*|Pob Plygell"
 
-#: tdefile/tdefiledialog.cpp:1973
+#: tdefile/tdefiledialog.cpp:1684 tdefile/tdefilefiltercombo.cpp:32
+msgid "*|All Files"
+msgstr "*|Pob Ffeil"
+
+#: tdefile/tdefiledialog.cpp:1981
 #, fuzzy
 msgid "Automatically select filename e&xtension (%1)"
 msgstr "Dewis e&styniad yr enw ffeil yn awtomatig (%1)"
 
-#: tdefile/tdefiledialog.cpp:1974
+#: tdefile/tdefiledialog.cpp:1982
 msgid "the extension <b>%1</b>"
 msgstr "yr estyniad<b>%1</b>"
 
-#: tdefile/tdefiledialog.cpp:1982
+#: tdefile/tdefiledialog.cpp:1990
 #, fuzzy
 msgid "Automatically select filename e&xtension"
 msgstr "Dewis e&styniad yr enw ffeil yn awtomatig"
 
-#: tdefile/tdefiledialog.cpp:1983
+#: tdefile/tdefiledialog.cpp:1991
 msgid "a suitable extension"
 msgstr "estyniad addas"
 
-#: tdefile/tdefiledialog.cpp:1994
+#: tdefile/tdefiledialog.cpp:2002
 #, fuzzy
 msgid ""
 "This option enables some convenient features for saving files with extensions:"
@@ -4250,7 +5005,7 @@ msgstr ""
 "awtomatig).</li></ol>Os nad ydych yn sicr, alluogwch y dewisiad yma, oherwydd "
 "mae'n gwneud eich ffeiliau yn haws eu trefnu."
 
-#: tdefile/tdefiledialog.cpp:2268
+#: tdefile/tdefiledialog.cpp:2276
 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 bookmark."
@@ -4263,185 +5018,182 @@ msgstr ""
 "<p>Mae'r tudnodau yma yn benodol i'r deialog ffeil, ond ym mhob modd arall "
 "maent yn ymddwyn fel tudnodau mewn llefydd eraill yn TDE.</qt> "
 
-#: tdefile/tdefileiconview.cpp:62
-msgid "Small Icons"
-msgstr "Eiconau Bach "
-
-#: tdefile/tdefileiconview.cpp:67
-msgid "Large Icons"
-msgstr "Eiconau Mawr"
-
-#: tdefile/tdefileiconview.cpp:75
-msgid "Thumbnail Previews"
-msgstr "Rhagolygon Cryno"
+#: tdefile/tdefileview.cpp:77
+msgid "Unknown View"
+msgstr "Golwg Anhysbys"
 
-#: tdefile/tdefileiconview.cpp:119
-msgid "Icon View"
-msgstr "Golwg Eicon"
+#: tdefile/tdefilepreview.cpp:63
+msgid "Preview"
+msgstr "Rhagweld"
 
-#: tdefile/kurlrequester.cpp:213
-msgid "Open file dialog"
-msgstr "Agor Ymgom Ffeil"
+#: tdefile/tdefilepreview.cpp:69
+msgid "No preview available."
+msgstr "Dim rhagolwg ar gael."
 
-#: tdefile/tdediroperator.cpp:448
-#, fuzzy
-msgid "You did not select a file to delete."
-msgstr "Wnaethoch chi ddim dewis ffeil i ddileu."
+#: tdefile/kopenwith.cpp:150
+msgid "Known Applications"
+msgstr "Cymhwysiannau Hysbys"
 
-#: tdefile/tdediroperator.cpp:449
-msgid "Nothing to Delete"
-msgstr "Dim byd i'w dileu."
+#: tdefile/kopenwith.cpp:322
+msgid "Open With"
+msgstr "Agor Efo"
 
-#: tdefile/tdediroperator.cpp:471
+#: tdefile/kopenwith.cpp:326
 msgid ""
-"<qt>Do you really want to delete\n"
-" <b>'%1'</b>?</qt>"
+"<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>Ydych wir eisiau dileu\n"
-" <b>'%1'</b>?</qt>"
+"<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>"
 
-#: tdefile/tdediroperator.cpp:473
-msgid "Delete File"
-msgstr "Dileu Ffeil"
+#: tdefile/kopenwith.cpp:332
+msgid "Choose the name of the program with which to open the selected files."
+msgstr "Dewis enw'r rhaglen i agor y ffeiliau penodol."
 
-#: tdefile/tdediroperator.cpp:478
+#: tdefile/kopenwith.cpp:353
 #, c-format
-msgid ""
-"_n: Do you really want to delete this item?\n"
-"Do you really want to delete these %n items?"
-msgstr ""
-"Ydych wir eisiau dileu yr eitem yma?\n"
-"Ydych wir eisiau dileu y %n o eitemau yma?"
-
-#: tdefile/tdediroperator.cpp:480
-msgid "Delete Files"
-msgstr "Dileu Ffeiliau"
-
-#: tdefile/tdediroperator.cpp:511
-#, fuzzy
-msgid "You did not select a file to trash."
-msgstr "Wnaethoch chi ddim dewis ffeil i ddileu."
-
-#: tdefile/tdediroperator.cpp:512
-#, fuzzy
-msgid "Nothing to Trash"
-msgstr "Dim byd i'w Ddadwneud"
+msgid "Choose Application for %1"
+msgstr "Dewis Cymhwysiad i %1"
 
-#: tdefile/tdediroperator.cpp:534
-#, fuzzy
+#: tdefile/kopenwith.cpp:354
 msgid ""
-"<qt>Do you really want to trash\n"
-" <b>'%1'</b>?</qt>"
+"<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>Ydych wir eisiau dileu\n"
-" <b>'%1'</b>?</qt>"
+"<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>"
 
-#: tdefile/tdediroperator.cpp:536
-#, fuzzy
-msgid "Trash File"
-msgstr "Sbwriel"
+#: tdefile/kopenwith.cpp:366
+msgid "Choose Application"
+msgstr "Dewis Cymhwysiad"
 
-#: tdefile/tdediroperator.cpp:537 tdefile/tdediroperator.cpp:544
+#: tdefile/kopenwith.cpp:367
 msgid ""
-"_: to trash\n"
-"&Trash"
+"<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>"
 
-#: tdefile/tdediroperator.cpp:541
-#, fuzzy, c-format
+#: tdefile/kopenwith.cpp:406
+msgid "Clear input field"
+msgstr "Diddymu'r faes mewnbwn."
+
+#: tdefile/kopenwith.cpp:436
 msgid ""
-"_n: translators: not called for n == 1\n"
-"Do you really want to trash these %n items?"
+"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 ""
-"Ydych wir eisiau dileu'r %n eitem yma? \n"
-"Ydych wir eisiau dileu'r %n eitem yma?"
-
-#: tdefile/tdediroperator.cpp:543
-#, fuzzy
-msgid "Trash Files"
-msgstr "Ffeiliau dros dro"
-
-#: tdefile/tdediroperator.cpp:658 tdefile/tdediroperator.cpp:726
-msgid "The specified folder does not exist or was not readable."
-msgstr "Nid ydy'r plygell penodol yn bodoli, neu doedd o ddim yn ddarllenadwy."
-
-#: tdefile/tdediroperator.cpp:920 tdefile/tdediroperator.cpp:1321
-#: tdefile/tdefiledetailview.cpp:64
-msgid "Detailed View"
-msgstr "Golwg Manwl"
+" 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"
 
-#: tdefile/tdediroperator.cpp:925 tdefile/tdediroperator.cpp:1319
-msgid "Short View"
-msgstr "Golwg Byr"
+#: tdefile/kopenwith.cpp:469
+msgid "Run in &terminal"
+msgstr "Rhedeg mewn &terfynell"
 
-#: tdefile/tdediroperator.cpp:1260
-msgid "Parent Folder"
-msgstr "Plygell Rhiant"
+#: tdefile/kopenwith.cpp:480
+msgid "&Do not close when command exits"
+msgstr "&Peidiwch a chau pan terfynir y gorchymyn"
 
-#: tdefile/tdediroperator.cpp:1271
-msgid "Move to Trash"
-msgstr "Symud i'r Sbwriel"
+#: tdefile/kopenwith.cpp:497
+msgid "&Remember application association for this type of file"
+msgstr "&Cofio cyd-gymhwysiad i'r math yma o ffeil"
 
-#: tdefile/tdediroperator.cpp:1282
-msgid "Sorting"
-msgstr "Didoli"
+#: tdefile/tdefilesharedlg.cpp:58
+msgid "&Share"
+msgstr "&Rhaniad"
 
-#: tdefile/tdediroperator.cpp:1283
-msgid "By Name"
-msgstr "Gan Enw"
+#: tdefile/tdefilesharedlg.cpp:143
+#, fuzzy
+msgid "Only folders in your home folder can be shared."
+msgstr "Gellir rhannu dim ond cyfeiriaduron yn eich cyfeiriadur cartref."
 
-#: tdefile/tdediroperator.cpp:1286
-msgid "By Date"
-msgstr "Gan Ddyddiad"
+#: tdefile/tdefilesharedlg.cpp:154
+msgid "Not shared"
+msgstr "Dim wedi'i rhannu.  "
 
-#: tdefile/tdediroperator.cpp:1289
-msgid "By Size"
-msgstr "Gan Faint"
+#: tdefile/tdefilesharedlg.cpp:159
+msgid "Shared - read only for others"
+msgstr ""
 
-#: tdefile/tdediroperator.cpp:1292
-msgid "Reverse"
-msgstr "Gwrthwyneb"
+#: tdefile/tdefilesharedlg.cpp:164
+msgid "Shared - writeable for others"
+msgstr ""
 
-#: tdefile/tdediroperator.cpp:1302
-msgid "Folders First"
-msgstr "Plygyll yn Gyntaf"
+#: tdefile/tdefilesharedlg.cpp:186
+#, fuzzy
+msgid ""
+"Sharing this folder makes it available under Linux/UNIX (NFS) and Windows "
+"(Samba)."
+msgstr ""
+"Mae rhannu'r cyfeiriadur yma yn trefnu ei fod ar gael dan Linux/Unix (NFS) a "
+"Windows (Samba)."
 
-#: tdefile/tdediroperator.cpp:1304
-msgid "Case Insensitive"
-msgstr "Dim bwys am lythrennau bras"
+#: tdefile/tdefilesharedlg.cpp:192
+msgid "You can also reconfigure file sharing authorization."
+msgstr "Gallwch hefyd ailffurfweddu awdurdodi rhannu ffeiliau."
 
-#: tdefile/tdediroperator.cpp:1324
-msgid "Show Hidden Files"
-msgstr "Dangos Ffeiliau Cudd"
+#: tdefile/tdefilesharedlg.cpp:195 tdefile/tdefilesharedlg.cpp:222
+msgid "Configure File Sharing..."
+msgstr "Ffurfweddu Cyfrannu Ffeiliau..."
 
-#: tdefile/tdediroperator.cpp:1327
-msgid "Separate Folders"
-msgstr "Plygyll ar Wahân"
+#: tdefile/tdefilesharedlg.cpp:207
+msgid ""
+"Error running 'filesharelist'. Check if installed and in $PATH or /usr/sbin."
+msgstr ""
+"Gwall wrth redeg 'filesharelist'. Cywiro os wedi'i osod ac yn $PATH neu "
+"/usr/sbin."
 
-#: tdefile/tdediroperator.cpp:1331
-msgid "Show Preview"
-msgstr "Dangos Rhagolwg"
+#: tdefile/tdefilesharedlg.cpp:214
+#, fuzzy
+msgid "You need to be authorized to share folders."
+msgstr "Rhaid i chi gael eich awdurdodi er mwyn rhannu cyfeiriaduron."
 
-#: tdefile/tdediroperator.cpp:1335
+#: tdefile/tdefilesharedlg.cpp:217
 #, fuzzy
-msgid "Hide Preview"
-msgstr "Rhagweld"
+msgid "File sharing is disabled."
+msgstr "Analluogir golygu"
 
-#: tdefile/tdefiledetailview.cpp:68
-msgid "Date"
-msgstr "Dyddiad"
+#: tdefile/tdefilesharedlg.cpp:282
+msgid "Sharing folder '%1' failed."
+msgstr ""
 
-#: tdefile/tdefiledetailview.cpp:69
-msgid "Permissions"
-msgstr "Caniatad"
+#: tdefile/tdefilesharedlg.cpp:283
+msgid ""
+"An error occurred while trying to share folder '%1'. Make sure that the Perl "
+"script 'fileshareset' is set suid root."
+msgstr ""
 
-#: tdefile/tdefiledetailview.cpp:71 tdefile/kpropertiesdialog.cpp:1976
-msgid "Group"
-msgstr "Grw^p"
+#: tdefile/tdefilesharedlg.cpp:288
+msgid "Unsharing folder '%1' failed."
+msgstr ""
 
-#: tdefile/kmetaprops.cpp:130
-msgid "&Meta Info"
-msgstr "&Gwybodaeth Meta"
+#: tdefile/tdefilesharedlg.cpp:289
+msgid ""
+"An error occurred while trying to unshare folder '%1'. Make sure that the Perl "
+"script 'fileshareset' is set suid root."
+msgstr ""
 
 #: tdefile/kpropertiesdialog.cpp:177 tdefile/kpropertiesdialog.cpp:193
 #: tdefile/kpropertiesdialog.cpp:209 tdefile/kpropertiesdialog.cpp:232
@@ -4457,66 +5209,66 @@ msgid ""
 "Properties for %n Selected Items"
 msgstr "Priodweddau i %1"
 
-#: tdefile/kpropertiesdialog.cpp:740
+#: tdefile/kpropertiesdialog.cpp:748
 msgid "&General"
 msgstr "&Cyffredin"
 
-#: tdefile/kpropertiesdialog.cpp:944
+#: tdefile/kpropertiesdialog.cpp:968
 msgid "Create new file type"
 msgstr "Creu math ffeil newydd"
 
-#: tdefile/kpropertiesdialog.cpp:946
+#: tdefile/kpropertiesdialog.cpp:970
 msgid "Edit file type"
 msgstr "Golygu math y ffeil"
 
-#: tdefile/kpropertiesdialog.cpp:959
+#: tdefile/kpropertiesdialog.cpp:983
 msgid "Contents:"
 msgstr "Cynnwys:"
 
-#: tdefile/kpropertiesdialog.cpp:1001
+#: tdefile/kpropertiesdialog.cpp:1025
 msgid "Calculate"
 msgstr "Cyfrifo"
 
-#: tdefile/kpropertiesdialog.cpp:1012 tdefile/kpropertiesdialog.cpp:1239
+#: tdefile/kpropertiesdialog.cpp:1036 tdefile/kpropertiesdialog.cpp:1263
 msgid "Refresh"
 msgstr "Adnewyddu"
 
-#: tdefile/kpropertiesdialog.cpp:1020
+#: tdefile/kpropertiesdialog.cpp:1044
 msgid "Points to:"
 msgstr "Cyfeirio at:"
 
-#: tdefile/kpropertiesdialog.cpp:1034
+#: tdefile/kpropertiesdialog.cpp:1058
 msgid "Created:"
 msgstr "Creuwyd:"
 
-#: tdefile/kpropertiesdialog.cpp:1056
+#: tdefile/kpropertiesdialog.cpp:1080
 msgid "Accessed:"
 msgstr "Agorwyd:"
 
-#: tdefile/kpropertiesdialog.cpp:1075
+#: tdefile/kpropertiesdialog.cpp:1099
 msgid "Mounted on:"
 msgstr "Wedi'i arosod ar:"
 
-#: tdefile/kpropertiesdialog.cpp:1082 tdefile/kpropertiesdialog.cpp:2888
+#: tdefile/kpropertiesdialog.cpp:1106 tdefile/kpropertiesdialog.cpp:2958
 msgid "Free disk space:"
 msgstr "Lle ddisg wag:"
 
-#: tdefile/kpropertiesdialog.cpp:1189 tdefile/kpropertiesdialog.cpp:1204
-#: tdefile/kpropertiesdialog.cpp:3031
+#: tdefile/kpropertiesdialog.cpp:1213 tdefile/kpropertiesdialog.cpp:1228
+#: tdefile/kpropertiesdialog.cpp:3118
 #, no-c-format
 msgid ""
 "_: Available space out of total partition size (percent used)\n"
 "%1 out of %2 (%3% used)"
 msgstr "%1allan o %2 (defnyddir %3%)"
 
-#: tdefile/kpropertiesdialog.cpp:1215
+#: tdefile/kpropertiesdialog.cpp:1239
 #, fuzzy
 msgid ""
 "Calculating... %1 (%2)\n"
 "%3, %4"
 msgstr "Cyfrifo ... %1 (%2)"
 
-#: tdefile/kpropertiesdialog.cpp:1218 tdefile/kpropertiesdialog.cpp:1234
+#: tdefile/kpropertiesdialog.cpp:1242 tdefile/kpropertiesdialog.cpp:1258
 #, fuzzy, c-format
 msgid ""
 "_n: 1 file\n"
@@ -4525,7 +5277,7 @@ msgstr ""
 "%n ffeil\n"
 "%n o ffeiliau"
 
-#: tdefile/kpropertiesdialog.cpp:1219 tdefile/kpropertiesdialog.cpp:1235
+#: tdefile/kpropertiesdialog.cpp:1243 tdefile/kpropertiesdialog.cpp:1259
 #, fuzzy, c-format
 msgid ""
 "_n: 1 sub-folder\n"
@@ -4534,23 +5286,23 @@ msgstr ""
 "%n plygell\n"
 "%n o blygyll"
 
-#: tdefile/kpropertiesdialog.cpp:1248
+#: tdefile/kpropertiesdialog.cpp:1272
 msgid "Calculating..."
 msgstr "Cyfrifo ..."
 
-#: tdefile/kpropertiesdialog.cpp:1282
+#: tdefile/kpropertiesdialog.cpp:1306
 msgid "Stopped"
 msgstr "Wedi aros"
 
-#: tdefile/kpropertiesdialog.cpp:1322
+#: tdefile/kpropertiesdialog.cpp:1347
 #, fuzzy
 msgid "The new file name is empty."
 msgstr "Mae enw'r ffeil newydd yn wag!"
 
-#: tdefile/kpropertiesdialog.cpp:1460 tdefile/kpropertiesdialog.cpp:2621
-#: tdefile/kpropertiesdialog.cpp:2778 tdefile/kpropertiesdialog.cpp:3059
-#: tdefile/kpropertiesdialog.cpp:3340 tdefile/kpropertiesdialog.cpp:3836
-#: tdefile/kpropertiesdialog.cpp:4079
+#: tdefile/kpropertiesdialog.cpp:1489 tdefile/kpropertiesdialog.cpp:2673
+#: tdefile/kpropertiesdialog.cpp:2689 tdefile/kpropertiesdialog.cpp:2846
+#: tdefile/kpropertiesdialog.cpp:3146 tdefile/kpropertiesdialog.cpp:3430
+#: tdefile/kpropertiesdialog.cpp:3926 tdefile/kpropertiesdialog.cpp:4169
 msgid ""
 "<qt>Could not save properties. You do not have sufficient access to write to <b>"
 "%1</b>.</qt>"
@@ -4558,44 +5310,44 @@ msgstr ""
 "<qt>Methu cadw priodweddau. Does ganddych ganiatadau digonol i  ysgrifennu i <b>"
 "%1</b>.</qt>"
 
-#: tdefile/kpropertiesdialog.cpp:1534 tdefile/kpropertiesdialog.cpp:1538
-#: tdefile/kpropertiesdialog.cpp:1543
+#: tdefile/kpropertiesdialog.cpp:1563 tdefile/kpropertiesdialog.cpp:1567
+#: tdefile/kpropertiesdialog.cpp:1572
 msgid "Forbidden"
 msgstr "Gwaharddir"
 
-#: tdefile/kpropertiesdialog.cpp:1535
+#: tdefile/kpropertiesdialog.cpp:1564
 msgid "Can Read"
 msgstr " Gallu Darllen"
 
-#: tdefile/kpropertiesdialog.cpp:1536
+#: tdefile/kpropertiesdialog.cpp:1565
 msgid "Can Read & Write"
 msgstr "Gallu Darllen ac Ysgrifennu"
 
-#: tdefile/kpropertiesdialog.cpp:1539
+#: tdefile/kpropertiesdialog.cpp:1568
 msgid "Can View Content"
 msgstr " Gallu Edrych ar Gynnwys"
 
-#: tdefile/kpropertiesdialog.cpp:1540
+#: tdefile/kpropertiesdialog.cpp:1569
 msgid "Can View & Modify Content"
 msgstr "Gallu Edrych ar a Newid Cynnwys"
 
-#: tdefile/kpropertiesdialog.cpp:1544
+#: tdefile/kpropertiesdialog.cpp:1573
 msgid "Can View Content & Read"
 msgstr "Gallu Edrych ar Gynnwys a Darllen"
 
-#: tdefile/kpropertiesdialog.cpp:1545
+#: tdefile/kpropertiesdialog.cpp:1574
 msgid "Can View/Read & Modify/Write"
 msgstr " Gallu Edrych/Darllen a Newid/Ysgrifennu"
 
-#: tdefile/kpropertiesdialog.cpp:1639
+#: tdefile/kpropertiesdialog.cpp:1668
 msgid "&Permissions"
 msgstr "&Caniatadau"
 
-#: tdefile/kpropertiesdialog.cpp:1650 tdefile/kpropertiesdialog.cpp:1904
+#: tdefile/kpropertiesdialog.cpp:1679 tdefile/kpropertiesdialog.cpp:1940
 msgid "Access Permissions"
 msgstr "Caniatadau Cyrchu"
 
-#: tdefile/kpropertiesdialog.cpp:1661
+#: tdefile/kpropertiesdialog.cpp:1690
 msgid ""
 "_n: This file is a link and does not have permissions.\n"
 "All files are links and do not have permissions."
@@ -4603,31 +5355,31 @@ msgstr ""
 "Mae'r %n ffeil yma yn gyswllt ac nid oes ganddo ganiatadau. \n"
 "Mae'r %n ffeiliau i gyd yn gysylltau ac nid oes ganddynt ganiatadau."
 
-#: tdefile/kpropertiesdialog.cpp:1664
+#: tdefile/kpropertiesdialog.cpp:1693
 msgid "Only the owner can change permissions."
 msgstr "Neb ond y perchennog sy'n gallu newid caniatadau."
 
-#: tdefile/kpropertiesdialog.cpp:1667
+#: tdefile/kpropertiesdialog.cpp:1696
 msgid "O&wner:"
 msgstr "Perc&hennog:"
 
-#: tdefile/kpropertiesdialog.cpp:1673
+#: tdefile/kpropertiesdialog.cpp:1702
 msgid "Specifies the actions that the owner is allowed to do."
 msgstr "Penodi'r gweithrediadau y mae'r perchennog yn cael gwneud."
 
-#: tdefile/kpropertiesdialog.cpp:1675
+#: tdefile/kpropertiesdialog.cpp:1704
 msgid "Gro&up:"
 msgstr "Gr&w^p:"
 
-#: tdefile/kpropertiesdialog.cpp:1681
+#: tdefile/kpropertiesdialog.cpp:1710
 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."
 
-#: tdefile/kpropertiesdialog.cpp:1683
+#: tdefile/kpropertiesdialog.cpp:1712
 msgid "O&thers:"
 msgstr "E&raill:"
 
-#: tdefile/kpropertiesdialog.cpp:1689
+#: tdefile/kpropertiesdialog.cpp:1718
 msgid ""
 "Specifies the actions that all users, who are neither owner nor in the group, "
 "are allowed to do."
@@ -4635,15 +5387,15 @@ msgstr ""
 "Penodi'r gweithrediadau y mae pob defnyddiwr, sy ddim yn berchennog neu aelod y "
 "grw^p, yn cael gwneud."
 
-#: tdefile/kpropertiesdialog.cpp:1694
+#: tdefile/kpropertiesdialog.cpp:1723
 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"
 
-#: tdefile/kpropertiesdialog.cpp:1695
+#: tdefile/kpropertiesdialog.cpp:1724
 msgid "Is &executable"
 msgstr "Gallu ei &Weithredu"
 
-#: tdefile/kpropertiesdialog.cpp:1699
+#: tdefile/kpropertiesdialog.cpp:1728
 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 requires "
@@ -4653,7 +5405,7 @@ msgstr ""
 "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'."
 
-#: tdefile/kpropertiesdialog.cpp:1703
+#: tdefile/kpropertiesdialog.cpp:1732
 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."
@@ -4662,35 +5414,35 @@ msgstr ""
 "synnwyr i ddim ond rhaglenni a sgriptiau.  Mae'n angenrheidiol os byddwch "
 "eisiau eu gweithredu."
 
-#: tdefile/kpropertiesdialog.cpp:1710
+#: tdefile/kpropertiesdialog.cpp:1739
 msgid "A&dvanced Permissions"
 msgstr "C&aniatadau Uwch"
 
-#: tdefile/kpropertiesdialog.cpp:1719
+#: tdefile/kpropertiesdialog.cpp:1748
 msgid "Ownership"
 msgstr "Perchenogaeth"
 
-#: tdefile/kpropertiesdialog.cpp:1728
+#: tdefile/kpropertiesdialog.cpp:1757
 msgid "User:"
 msgstr "Defnyddiwr:"
 
-#: tdefile/kpropertiesdialog.cpp:1814
+#: tdefile/kpropertiesdialog.cpp:1843
 msgid "Group:"
 msgstr "Grw^p:"
 
-#: tdefile/kpropertiesdialog.cpp:1856
+#: tdefile/kpropertiesdialog.cpp:1885
 msgid "Apply changes to all subfolders and their contents"
 msgstr "Gosod newidiadau i bob is-blygell a'i gynnwys."
 
-#: tdefile/kpropertiesdialog.cpp:1894
+#: tdefile/kpropertiesdialog.cpp:1930
 msgid "Advanced Permissions"
 msgstr "Caniatadau Uwch"
 
-#: tdefile/kpropertiesdialog.cpp:1913
+#: tdefile/kpropertiesdialog.cpp:1949
 msgid "Class"
 msgstr "Dosbarth"
 
-#: tdefile/kpropertiesdialog.cpp:1918
+#: tdefile/kpropertiesdialog.cpp:1954
 msgid ""
 "Show\n"
 "Entries"
@@ -4698,19 +5450,19 @@ msgstr ""
 " Dangos\n"
 " Cofnodion"
 
-#: tdefile/kpropertiesdialog.cpp:1920
+#: tdefile/kpropertiesdialog.cpp:1956
 msgid "Read"
 msgstr "Darllen"
 
-#: tdefile/kpropertiesdialog.cpp:1925
+#: tdefile/kpropertiesdialog.cpp:1961
 msgid "This flag allows viewing the content of the folder."
 msgstr "Mae'r faner yma yn gadael gweld cynnwys y plygell."
 
-#: tdefile/kpropertiesdialog.cpp:1927
+#: tdefile/kpropertiesdialog.cpp:1963
 msgid "The Read flag allows viewing the content of the file."
 msgstr "Mae'r faner Ddarllen yn gadael gweld cynnwys y ffeil."
 
-#: tdefile/kpropertiesdialog.cpp:1931
+#: tdefile/kpropertiesdialog.cpp:1967
 msgid ""
 "Write\n"
 "Entries"
@@ -4718,11 +5470,11 @@ msgstr ""
 " Ysgrifennu\n"
 " Cofnodion"
 
-#: tdefile/kpropertiesdialog.cpp:1933
+#: tdefile/kpropertiesdialog.cpp:1969
 msgid "Write"
 msgstr "Ysgrifennu"
 
-#: tdefile/kpropertiesdialog.cpp:1938
+#: tdefile/kpropertiesdialog.cpp:1974
 msgid ""
 "This flag allows adding, renaming and deleting of files. Note that deleting and "
 "renaming can be limited using the Sticky flag."
@@ -4730,33 +5482,33 @@ msgstr ""
 " Mae'r faner yma yn gadael ychwanegu, ail-enwi a dileu ffeiliau.  Noder: gellir "
 "cyfyngu dileu ac ail-enwi gan ddefnyddio'r faner Gludiog."
 
-#: tdefile/kpropertiesdialog.cpp:1941
+#: tdefile/kpropertiesdialog.cpp:1977
 msgid "The Write flag allows modifying the content of the file."
 msgstr "Mae'r faner Ysgrifennu yn gadael addasu cynnwys y ffeil."
 
-#: tdefile/kpropertiesdialog.cpp:1946
+#: tdefile/kpropertiesdialog.cpp:1982
 msgid ""
 "_: Enter folder\n"
 "Enter"
 msgstr "Mynd i mewn"
 
-#: tdefile/kpropertiesdialog.cpp:1947
+#: tdefile/kpropertiesdialog.cpp:1983
 msgid "Enable this flag to allow entering the folder."
 msgstr "Galluogi'r faner yma i adael mynd i mewn i'r plygell."
 
-#: tdefile/kpropertiesdialog.cpp:1950
+#: tdefile/kpropertiesdialog.cpp:1986
 msgid "Exec"
 msgstr "Gweithredu"
 
-#: tdefile/kpropertiesdialog.cpp:1951
+#: tdefile/kpropertiesdialog.cpp:1987
 msgid "Enable this flag to allow executing the file as a program."
 msgstr "Galluogi'r faner yma i adael gweithredu'r ffeil fel rhaglen."
 
-#: tdefile/kpropertiesdialog.cpp:1961
+#: tdefile/kpropertiesdialog.cpp:1997
 msgid "Special"
 msgstr "Arbennig"
 
-#: tdefile/kpropertiesdialog.cpp:1965
+#: tdefile/kpropertiesdialog.cpp:2001
 msgid ""
 "Special flag. Valid for the whole folder, the exact meaning of the flag can be "
 "seen in the right hand column."
@@ -4764,31 +5516,29 @@ msgstr ""
 "Baner arbennig.  Dilys i'r plygell cyfan.  Gall ystyr cywir y faner gael ei "
 "weld yn y golofn dde."
 
-#: tdefile/kpropertiesdialog.cpp:1968
+#: tdefile/kpropertiesdialog.cpp:2004
 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."
 
-#. i18n: file ./tdefile/kpropertiesdesktopadvbase.ui line 95
-#: tdefile/kpropertiesdialog.cpp:1972 rc.cpp:96
-#, no-c-format
+#: tdefile/kpropertiesdialog.cpp:2008
 msgid "User"
 msgstr "Defnyddiwr"
 
-#: tdefile/kpropertiesdialog.cpp:1984
+#: tdefile/kpropertiesdialog.cpp:2020
 msgid "Set UID"
 msgstr "Gosod UID"
 
-#: tdefile/kpropertiesdialog.cpp:1988
+#: tdefile/kpropertiesdialog.cpp:2024
 msgid ""
 "If this flag is set, the owner of this folder will be the owner of all new "
 "files."
 msgstr ""
 "Os osodir y faner yma, bydd perchennog y plygell yma yn biau pob ffeil newydd."
 
-#: tdefile/kpropertiesdialog.cpp:1991
+#: tdefile/kpropertiesdialog.cpp:2027
 msgid ""
 "If this file is an executable and the flag is set, it will be executed with the "
 "permissions of the owner."
@@ -4796,18 +5546,18 @@ msgstr ""
 "Os mae'r ffeil yma yn weithredadwy ac mae'r faner wedi ei gosod, bydd o'n cael "
 "ei weithredu efo caniatadau'r perchennog."
 
-#: tdefile/kpropertiesdialog.cpp:1995
+#: tdefile/kpropertiesdialog.cpp:2031
 msgid "Set GID"
 msgstr "Gosod GID"
 
-#: tdefile/kpropertiesdialog.cpp:1999
+#: tdefile/kpropertiesdialog.cpp:2035
 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."
 
-#: tdefile/kpropertiesdialog.cpp:2002
+#: tdefile/kpropertiesdialog.cpp:2038
 msgid ""
 "If this file is an executable and the flag is set, it will be executed with the "
 "permissions of the group."
@@ -4815,13 +5565,13 @@ msgstr ""
 "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."
 
-#: tdefile/kpropertiesdialog.cpp:2006
+#: tdefile/kpropertiesdialog.cpp:2042
 msgid ""
 "_: File permission\n"
 "Sticky"
 msgstr "Gludiog"
 
-#: tdefile/kpropertiesdialog.cpp:2010
+#: tdefile/kpropertiesdialog.cpp:2046
 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."
@@ -4830,22 +5580,22 @@ msgstr ""
 "dileu neu ail-enwi ffeiliau.  Fel arall, mae pawb sydd efo caniatadau "
 "ysgrifennu yn gallu gwneud hyn."
 
-#: tdefile/kpropertiesdialog.cpp:2014
+#: tdefile/kpropertiesdialog.cpp:2050
 msgid ""
 "The Sticky flag on a file is ignored on Linux, but may be used on some systems"
 msgstr ""
 " Mae'r faner Gludiog ar ffeil yn cael ei anywbyddu ar Linux, ond gall ei "
 "defnyddio ar rhai cysodau"
 
-#: tdefile/kpropertiesdialog.cpp:2193
+#: tdefile/kpropertiesdialog.cpp:2229
 msgid "Link"
 msgstr " Cyswllt"
 
-#: tdefile/kpropertiesdialog.cpp:2209
+#: tdefile/kpropertiesdialog.cpp:2245
 msgid "Varying (No Change)"
 msgstr "Amrywio (Dim Newid)"
 
-#: tdefile/kpropertiesdialog.cpp:2308
+#: tdefile/kpropertiesdialog.cpp:2344
 msgid ""
 "_n: This file uses advanced permissions\n"
 "These files use advanced permissions."
@@ -4853,7 +5603,7 @@ msgstr ""
 "Mae'r %n ffeil yma yn defnyddio caniatadau uwch. \n"
 "Mae'r %n ffeiliau yma yn defnyddio caniatadau uwch."
 
-#: tdefile/kpropertiesdialog.cpp:2329
+#: tdefile/kpropertiesdialog.cpp:2365
 msgid ""
 "_n: This folder uses advanced permissions.\n"
 "These folders use advanced permissions."
@@ -4861,73 +5611,69 @@ msgstr ""
 "Mae'r %n plygell yma yn defnyddio caniatadau uwch. \n"
 "Mae'r %n plygyll yma yn defnyddio caniatadau uwch."
 
-#: tdefile/kpropertiesdialog.cpp:2344
+#: tdefile/kpropertiesdialog.cpp:2380
 msgid "These files use advanced permissions."
 msgstr "Mae'r ffeiliau yma yn defnyddio caniatadau uwch."
 
-#: tdefile/kpropertiesdialog.cpp:2560
+#: tdefile/kpropertiesdialog.cpp:2596
 msgid "U&RL"
 msgstr "U&RL"
 
-#: tdefile/kpropertiesdialog.cpp:2665
+#: tdefile/kpropertiesdialog.cpp:2733
 msgid "A&ssociation"
 msgstr "&Cyd"
 
-#: tdefile/kpropertiesdialog.cpp:2674
+#: tdefile/kpropertiesdialog.cpp:2742
 msgid "Pattern ( example: *.html;*.htm )"
 msgstr "Patrwm (enghraifft: *.html;*.htm )"
 
-#: tdefile/kpropertiesdialog.cpp:2707
+#: tdefile/kpropertiesdialog.cpp:2775
 msgid "Left click previews"
 msgstr "Rhagolygon chwith-glic"
 
-#: tdefile/kpropertiesdialog.cpp:2826
+#: tdefile/kpropertiesdialog.cpp:2894
 msgid "De&vice"
 msgstr "Dy&fais"
 
-#: tdefile/kpropertiesdialog.cpp:2856
+#: tdefile/kpropertiesdialog.cpp:2924
 msgid "Device (/dev/fd0):"
 msgstr "Dyfais (/dev/fd0):"
 
-#: tdefile/kpropertiesdialog.cpp:2857
+#: tdefile/kpropertiesdialog.cpp:2925
 msgid "Device:"
 msgstr "Dyfais:"
 
-#: tdefile/kpropertiesdialog.cpp:2867
+#: tdefile/kpropertiesdialog.cpp:2937
 msgid "Read only"
 msgstr "Darllen yn unig"
 
-#: tdefile/kpropertiesdialog.cpp:2871
+#: tdefile/kpropertiesdialog.cpp:2941
 #, fuzzy
 msgid "File system:"
 msgstr "Cysodau ffeil"
 
-#: tdefile/kpropertiesdialog.cpp:2879
+#: tdefile/kpropertiesdialog.cpp:2949
 msgid "Mount point (/mnt/floppy):"
 msgstr "Man gosod (/mnt/floppy):"
 
-#: tdefile/kpropertiesdialog.cpp:2880
+#: tdefile/kpropertiesdialog.cpp:2950
 msgid "Mount point:"
 msgstr "Man gosod:"
 
-#: tdefile/kpropertiesdialog.cpp:2911
+#: tdefile/kpropertiesdialog.cpp:2981
 msgid "Unmounted Icon"
 msgstr "Eicon diosod"
 
-#: tdefile/kpropertiesdialog.cpp:3091 tdefile/kpropertiesdialog.cpp:3896
+#: tdefile/kpropertiesdialog.cpp:3178 tdefile/kpropertiesdialog.cpp:3986
 msgid "&Application"
 msgstr "&Cymhwysiad"
 
-#: tdefile/kpropertiesdialog.cpp:3213
+#: tdefile/kpropertiesdialog.cpp:3303
 #, c-format
 msgid "Add File Type for %1"
 msgstr "Ychwanegu Math Ffeil am %1"
 
-#: bookmarks/kbookmarkmenu.cc:829 tdefile/kpropertiesdialog.cpp:3216
-msgid "&Add"
-msgstr "&Ychwanegu"
-
-#: tdefile/kpropertiesdialog.cpp:3217 tdefile/kpropertiesdialog.cpp:3218
+#: tdefile/kpropertiesdialog.cpp:3307 tdefile/kpropertiesdialog.cpp:3308
 msgid ""
 "Add the selected file types to\n"
 "the list of supported file types."
@@ -4935,24 +5681,24 @@ msgstr ""
 "Ychwanegu'r mathau ffeiliau penodol\n"
 "i'r rhestr o fathau ffeil a gynhelir."
 
-#: tdefile/kpropertiesdialog.cpp:3412 tdefile/kpropertiesdialog.cpp:3868
+#: tdefile/kpropertiesdialog.cpp:3502 tdefile/kpropertiesdialog.cpp:3958
 msgid "Only executables on local file systems are supported."
 msgstr "Cynhelir 'mond gweithredadweau  ar gysodau ffeil lleol."
 
-#: tdefile/kpropertiesdialog.cpp:3424
+#: tdefile/kpropertiesdialog.cpp:3514
 #, c-format
 msgid "Advanced Options for %1"
 msgstr "Dewisiadau Uwch am %1"
 
-#: tdefile/kpropertiesdialog.cpp:3583
+#: tdefile/kpropertiesdialog.cpp:3673
 msgid "E&xecute"
 msgstr "G&weithredu"
 
-#: tdefile/kpropertiesdialog.cpp:3590
+#: tdefile/kpropertiesdialog.cpp:3680
 msgid "Comman&d:"
 msgstr "Gorchym&n:"
 
-#: tdefile/kpropertiesdialog.cpp:3599
+#: tdefile/kpropertiesdialog.cpp:3689
 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"
@@ -4980,871 +5726,195 @@ msgstr ""
 "%m - yr eicon bach\n"
 "%c - y sylwad"
 
-#: tdefile/kpropertiesdialog.cpp:3620
+#: tdefile/kpropertiesdialog.cpp:3710
 msgid "Panel Embedding"
 msgstr "Mewnadeiladu Panel"
 
-#: tdefile/kpropertiesdialog.cpp:3629
+#: tdefile/kpropertiesdialog.cpp:3719
 msgid "&Execute on click:"
 msgstr "&Gweithredu ar glic:"
 
-#: tdefile/kpropertiesdialog.cpp:3637
+#: tdefile/kpropertiesdialog.cpp:3727
 msgid "&Window title:"
 msgstr "&Teitl Ffenestr:"
 
-#. i18n: file ./tdefile/kpropertiesdesktopadvbase.ui line 55
-#: tdefile/kpropertiesdialog.cpp:3657 rc.cpp:81
-#, no-c-format
+#: tdefile/kpropertiesdialog.cpp:3747
 msgid "&Run in terminal"
 msgstr "&Rhedeg mewn terfynell"
 
-#. i18n: file ./tdefile/kpropertiesdesktopadvbase.ui line 77
-#: tdefile/kpropertiesdialog.cpp:3672 rc.cpp:90
-#, no-c-format
+#: tdefile/kpropertiesdialog.cpp:3762
 msgid "Do not &close when command exits"
 msgstr "Peidiwch a c&hau pan bydd y gorchymyn yn terfynu."
 
-#. i18n: file ./tdefile/kpropertiesdesktopadvbase.ui line 66
-#: tdefile/kpropertiesdialog.cpp:3676 rc.cpp:87
-#, no-c-format
+#: tdefile/kpropertiesdialog.cpp:3766
 msgid "&Terminal options:"
 msgstr "&Dewisiadau Terfynell"
 
-#. i18n: file ./tdefile/kpropertiesdesktopadvbase.ui line 106
-#: tdefile/kpropertiesdialog.cpp:3696 rc.cpp:99
-#, no-c-format
+#: tdefile/kpropertiesdialog.cpp:3786
 msgid "Ru&n as a different user"
 msgstr "Rhede&g fel defnyddiwr gwahanol"
 
-#: tdefile/kpropertiesdialog.cpp:3937
+#: tdefile/kpropertiesdialog.cpp:4027
 msgid "Description:"
 msgstr "Disgrifiad:"
 
-#: tdefile/kpropertiesdialog.cpp:3943
+#: tdefile/kpropertiesdialog.cpp:4033
 msgid "Comment:"
 msgstr "Esboniad:"
 
-#: tdefile/kpropertiesdialog.cpp:3949
+#: tdefile/kpropertiesdialog.cpp:4039
 msgid "File types:"
 msgstr "Mathau o Ffeil:"
 
-#: tdefile/tdefilesharedlg.cpp:56
-msgid "&Share"
-msgstr "&Rhaniad"
-
-#: tdefile/tdefilesharedlg.cpp:128
-#, fuzzy
-msgid "Only folders in your home folder can be shared."
-msgstr "Gellir rhannu dim ond cyfeiriaduron yn eich cyfeiriadur cartref."
-
-#: tdefile/tdefilesharedlg.cpp:139
-msgid "Not shared"
-msgstr "Dim wedi'i rhannu.  "
-
-#: tdefile/tdefilesharedlg.cpp:144
-msgid "Shared"
-msgstr "Wedi ei rhannu."
-
-#: tdefile/tdefilesharedlg.cpp:156
-#, fuzzy
-msgid ""
-"Sharing this folder makes it available under Linux/UNIX (NFS) and Windows "
-"(Samba)."
-msgstr ""
-"Mae rhannu'r cyfeiriadur yma yn trefnu ei fod ar gael dan Linux/Unix (NFS) a "
-"Windows (Samba)."
-
-#: tdefile/tdefilesharedlg.cpp:162
-msgid "You can also reconfigure file sharing authorization."
-msgstr "Gallwch hefyd ailffurfweddu awdurdodi rhannu ffeiliau."
-
-#: tdefile/tdefilesharedlg.cpp:165 tdefile/tdefilesharedlg.cpp:189
-msgid "Configure File Sharing..."
-msgstr "Ffurfweddu Cyfrannu Ffeiliau..."
-
-#: tdefile/tdefilesharedlg.cpp:174
-msgid ""
-"Error running 'filesharelist'. Check if installed and in $PATH or /usr/sbin."
-msgstr ""
-"Gwall wrth redeg 'filesharelist'. Cywiro os wedi'i osod ac yn $PATH neu "
-"/usr/sbin."
-
-#: tdefile/tdefilesharedlg.cpp:181
-#, fuzzy
-msgid "You need to be authorized to share folders."
-msgstr "Rhaid i chi gael eich awdurdodi er mwyn rhannu cyfeiriaduron."
-
-#: tdefile/tdefilesharedlg.cpp:184
-#, fuzzy
-msgid "File sharing is disabled."
-msgstr "Analluogir golygu"
-
-#: tdefile/tdefilesharedlg.cpp:249
-msgid "Sharing folder '%1' failed."
-msgstr ""
-
-#: tdefile/tdefilesharedlg.cpp:250
-msgid ""
-"An error occurred while trying to share folder '%1'. Make sure that the Perl "
-"script 'fileshareset' is set suid root."
-msgstr ""
+#: tdefile/tdefilefiltercombo.cpp:164
+msgid "All Supported Files"
+msgstr "Pob Ffeil a Cynhelir"
 
-#: tdefile/tdefilesharedlg.cpp:255
-msgid "Unsharing folder '%1' failed."
-msgstr ""
+#: tdefile/kcustommenueditor.cpp:88
+msgid "Menu Editor"
+msgstr "Golygydd Dewislen"
 
-#: tdefile/tdefilesharedlg.cpp:256
-msgid ""
-"An error occurred while trying to unshare folder '%1'. Make sure that the Perl "
-"script 'fileshareset' is set suid root."
-msgstr ""
+#: tdefile/kcustommenueditor.cpp:98
+msgid "New..."
+msgstr "Newydd ..."
 
-#: tdefile/kurlbar.cpp:348
-msgid ""
-"<qt>The <b>Quick Access</b> panel provides easy access to commonly used file "
-"locations."
-"<p>Clicking on one of the shortcut entries will take you to that location."
-"<p>By right clicking on an entry you can add, edit and remove shortcuts.</qt>"
-msgstr ""
-"<qt>Mae'r panel <b>Cyrchu ar Frys</b> yn darparu cyrchiad hawdd i leoliadau "
-"ffeil a ddefnyddir yn aml."
-"<p>Bydd clicio ar un o'r cofnodion byrlwybr yn mynd â chi i'r lleoliad yna."
-"<p>Drwy dde-glicio ar gofnod, gallwch ychwanegu, golygu a diddymu "
-"byrlwybrau.</qt>"
+#: tdefile/kcustommenueditor.cpp:100
+msgid "Move Up"
+msgstr "Symud i Fyny"
 
-#: tdefile/kurlbar.cpp:730
-msgid "&Large Icons"
-msgstr "Eiconau &Mawr"
+#: tdefile/kcustommenueditor.cpp:101
+msgid "Move Down"
+msgstr "Symud i Lawr"
 
-#: tdefile/kurlbar.cpp:730
-msgid "&Small Icons"
-msgstr "Eiconau &Bach"
+#: tdefile/knotifydialog.cpp:81
+msgid "Sounds"
+msgstr "Syniau"
 
-#: tdefile/kurlbar.cpp:736
-msgid "&Edit Entry..."
-msgstr "&Golygu cofnod ..."
+#: tdefile/knotifydialog.cpp:82
+msgid "Logging"
+msgstr "Cofnodi"
 
-#: tdefile/kurlbar.cpp:740
-msgid "&Add Entry..."
-msgstr "&Ychwanegu cofnod ..."
+#: tdefile/knotifydialog.cpp:83
+msgid "Program Execution"
+msgstr "Gweithrediad Rhaglen"
 
-#: tdefile/kurlbar.cpp:744
-msgid "&Remove Entry"
-msgstr "&Diddymu Cofnod"
+#: tdefile/knotifydialog.cpp:84
+msgid "Message Windows"
+msgstr "Ffenestri Negesau"
 
-#: tdefile/kurlbar.cpp:776
-msgid "Enter a description"
-msgstr "Rhoi disgrifiad"
+#: tdefile/knotifydialog.cpp:85
+msgid "Passive Windows"
+msgstr "Ffenestri Goddefol"
 
-#: tdefile/kurlbar.cpp:922
-msgid "Edit Quick Access Entry"
-msgstr "Golygu Cofnod Cyrchu ar Frys"
+#: tdefile/knotifydialog.cpp:86
+msgid "Standard Error Output"
+msgstr "Allbwn Gwall Safonol"
 
-#: tdefile/kurlbar.cpp:925
-msgid ""
-"<qt><b>Please provide a description, URL and icon for this Quick Access "
-"entry.</b></br></qt>"
-msgstr ""
-"<qt><b>Mae angen darparu disgrifiad, URL ac eicon i'r cofnod Cyrchu ar Frys "
-"yma.</b></br></qt>"
+#: tdefile/knotifydialog.cpp:87
+msgid "Taskbar"
+msgstr "Bar Tasgiau"
 
-#: tdefile/kurlbar.cpp:932
-msgid ""
-"<qt>This is the text that will appear in the Quick Access panel."
-"<p>The description should consist of one or two words that will help you "
-"remember what this entry refers to.</qt>"
-msgstr ""
-"<qt>Dyma'r testun a fydd yn ymddangos yn y panel Cyrchu ar Frys."
-"<p>Dylai'r disgrifiad gynnwys un neu ddau o eiriau a fydd yn helpu chi gofio be "
-"mae'r cofnod hwn yn cyfeirio ato.</qt>"
+#: tdefile/knotifydialog.cpp:121
+msgid "Execute a program"
+msgstr "Gweithredu rhaglen"
 
-#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 125
-#: tdefile/kurlbar.cpp:935 rc.cpp:239
-#, no-c-format
-msgid "&Description:"
-msgstr "&Disgrifiad:"
+#: tdefile/knotifydialog.cpp:122
+msgid "Print to Standard error output"
+msgstr "Argraffu i allbwn gwall safonol"
 
-#: tdefile/kurlbar.cpp:942
-msgid ""
-"<qt>This is the location associated with the entry. Any valid URL may be used. "
-"For example:"
-"<p>%1"
-"<br>http://www.kde.org"
-"<br>ftp://ftp.kde.org/pub/kde/stable"
-"<p>By clicking on the button next to the text edit box you can browse to an "
-"appropriate URL.</qt>"
-msgstr ""
-"<qt>Y lleoliad sydd ar y cyd efo'r cofnod.  Gellir defnyddio unrhyw URL dilys.  "
-"Er enghraifft: "
-"<p>%1"
-"<br>http://www.kde.org"
-"<br>ftp://ftp.kde.org/pub/kde/stable "
-"<p>Gan glicio ar y botwm wrth ymyl y blwch golygu testun, gallwch pori at URL "
-"addas. </qt>"
+#: tdefile/knotifydialog.cpp:123
+msgid "Display a messagebox"
+msgstr "Dangos blwch neges"
 
-#: tdefile/kurlbar.cpp:946
-msgid "&URL:"
-msgstr "&URL:"
+#: tdefile/knotifydialog.cpp:124
+msgid "Log to a file"
+msgstr "Ysgrifennu i ffeil cofnod"
 
-#: tdefile/kurlbar.cpp:953
-msgid ""
-"<qt>This is the icon that will appear in the Quick Access panel."
-"<p>Click on the button to select a different icon.</qt>"
-msgstr ""
-"<qt>Yr eicon a ymddenygs yn y panel Cyrchu ar Frys."
-"<p>Cliciwch ar y botwm i ddewis eicon gwahanol.</qt>"
+#: tdefile/knotifydialog.cpp:125
+msgid "Play a sound"
+msgstr "Chwarae sŵn"
 
-#: tdefile/kurlbar.cpp:955
-msgid "Choose an &icon:"
-msgstr "Dewis &eicon:"
+#: tdefile/knotifydialog.cpp:126
+msgid "Flash the taskbar entry"
+msgstr "Fflachio cofnod y bar tasgiau"
 
-#: tdefile/kurlbar.cpp:971
-msgid "&Only show when using this application (%1)"
-msgstr "Dangos 'mond &pan ddefnyddir y cymhwysiad yma (%1)"
+#: tdefile/knotifydialog.cpp:163
+msgid "Notification Settings"
+msgstr "Gosodiadau Hysbysau"
 
-#: tdefile/kurlbar.cpp:974
+#: tdefile/knotifydialog.cpp:309
 msgid ""
-"<qt>Select this setting if you want this entry to show only when using the "
-"current application (%1)."
-"<p>If this setting is not selected, the entry will be available in all "
-"applications.</qt>"
+"<qt>You may use the following macros"
+"<br>in the commandline:"
+"<br><b>%e</b>: for the event name,"
+"<br><b>%a</b>: for the name of the application that sent the event,"
+"<br><b>%s</b>: for the notification message,"
+"<br><b>%w</b>: for the numeric window ID where the event originated,"
+"<br><b>%i</b>: for the numeric event ID."
 msgstr ""
-"<qt>Dewis y gosodiad yma os ydych eisiau i'r cofnod yma ddangos 'mond pan "
-"ddefnyddir y cymhwysiad yma (%1)."
-"<p>Os ni ddewisir y gosodiad yma, bydd y cofnod ar gael ym mhob "
-"chymhwysiad.</qt>"
+"<qt>Gallwch ddefnyddio'r macros isod "
+"<br>yn y llinell gorchymyn:"
+"<br><b>%e</b>: am enw'r digwyddiad,"
+"<br><b>%a</b>: am enw'r cymhwysiad a anfonodd y digwyddiad,"
+"<br><b>%s</b>: am y neges hysbysu,"
+"<br><b>%w</b>: am yr ID ffenestr rhifol lle cychwynnodd y digwyddiad, "
+"<br><b>%i</b>: am yr ID digwyddiad rhifol."
 
-#: tests/kurifiltertest.cpp:144
+#: tdefile/knotifydialog.cpp:339
 #, fuzzy
-msgid "kurifiltertest"
-msgstr "Arbrawf Argraffu"
-
-#: tests/kurifiltertest.cpp:145
-msgid "Unit test for the URI filter plugin framework."
-msgstr ""
-
-#: tests/kurifiltertest.cpp:150
-msgid "Use space as keyword delimeter for web shortcuts"
-msgstr ""
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "KD wrth KGyfieithu"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "kyfieithu@dotmon.com"
-
-#. i18n: file ./kssl/keygenwizard2.ui line 25
-#: rc.cpp:3
-#, no-c-format
-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 line 38
-#: rc.cpp:6
-#, no-c-format
-msgid "&Repeat password:"
-msgstr "&Ailadrodd cyfrinair:"
-
-#. i18n: file ./kssl/keygenwizard2.ui line 49
-#: rc.cpp:9
-#, no-c-format
-msgid "&Choose password:"
-msgstr "&Dewis cyfrinair:"
-
-#. i18n: file ./kssl/keygenwizard.ui line 25
-#: rc.cpp:12
-#, no-c-format
-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."
-
-#. i18n: file ./misc/tdewalletd/tdewalletwizard.ui line 16
-#: rc.cpp:15
-#, no-c-format
-msgid "TDE Wallet Wizard"
-msgstr "Dewin Waled TDE"
-
-#. i18n: file ./misc/tdewalletd/tdewalletwizard.ui line 23
-#: rc.cpp:18
-#, no-c-format
-msgid "Introduction"
-msgstr "Rhagymadrodd"
-
-#. i18n: file ./misc/tdewalletd/tdewalletwizard.ui line 56
-#: rc.cpp:21
-#, no-c-format
-msgid "<u>TDEWallet</u> - The TDE Wallet System"
-msgstr "<u>KWaled</u> - Y Cyfundrefn Waled TDE"
-
-#. i18n: file ./misc/tdewalletd/tdewalletwizard.ui line 81
-#: rc.cpp:24
-#, no-c-format
-msgid ""
-"Welcome to TDEWallet, the TDE Wallet System.  TDEWallet 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 TDEWallet and help you configure it for the first time."
-msgstr ""
-"Croeso i KWaled, y Gyfundrefn Waled TDE.  Mae KWaled yn gadael i chi gronni "
-"eich cyfrineiriau a data personol arall ar y ddisg mewn ffeil wedi'i "
-"gêl-ysgrifennu, yn atal i eraill weld y wybodaeth.  bydd y dewin yma yn rhoi "
-"manylion i chi a'ch cymorthwyo ei ffurfweddu am y tro cyntaf."
-
-#. i18n: file ./misc/tdewalletd/tdewalletwizard.ui line 112
-#: rc.cpp:27
-#, no-c-format
-msgid "&Basic setup (recommended)"
-msgstr "Gosod s&ylfaenol (argymelledig)"
-
-#. i18n: file ./misc/tdewalletd/tdewalletwizard.ui line 123
-#: rc.cpp:30
-#, no-c-format
-msgid "&Advanced setup"
+msgid "Advanced <<"
 msgstr "Gosod &uwch"
 
-#. i18n: file ./misc/tdewalletd/tdewalletwizard.ui line 180
-#: rc.cpp:36
-#, no-c-format
-msgid ""
-"The TDE 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 blowfish algorithm with your password as the key.  When a "
-"wallet is opened, the wallet manager application will launch and display an "
-"icon in the system tray.  You can use this application to manage your wallets.  "
-"It even permits you to drag wallets and wallet contents, allowing you to easily "
-"copy a wallet to a remote system."
-msgstr " "
-
-#. i18n: file ./misc/tdewalletd/tdewalletwizard.ui line 193
-#: rc.cpp:39
-#, no-c-format
-msgid "Password Selection"
-msgstr "Dewis Cyfrinair"
-
-#. i18n: file ./misc/tdewalletd/tdewalletwizard.ui line 204
-#: rc.cpp:42
-#, no-c-format
-msgid ""
-"Various applications may attempt to use the TDE wallet to store passwords or "
-"other information such as web form data and cookies.  If you would like these "
-"applications to use the wallet, you must enable it now and choose a password.  "
-"The password you choose <i>cannot</i> be recovered if it is lost, and will "
-"allow anyone who knows it to obtain all the information contained in the "
-"wallet."
-msgstr " "
-
-#. i18n: file ./misc/tdewalletd/tdewalletwizard.ui line 234
-#: rc.cpp:45
-#, no-c-format
-msgid "Enter a new password:"
-msgstr "Mewnosodwch cyfrinair newydd:"
-
-#. i18n: file ./misc/tdewalletd/tdewalletwizard.ui line 251
-#: rc.cpp:48
-#, no-c-format
-msgid "Verify password:"
-msgstr "Gwirio cyfrinair"
-
-#. i18n: file ./misc/tdewalletd/tdewalletwizard.ui line 301
-#: rc.cpp:51
-#, no-c-format
-msgid "Yes, I wish to use the TDE wallet to store my personal information."
-msgstr "Rydw i eisiau defnyddio'r waled TDE i gronni fy ngwybodaeth personol."
-
-#. i18n: file ./misc/tdewalletd/tdewalletwizard.ui line 390
-#: rc.cpp:54
-#, no-c-format
-msgid "Security Level"
-msgstr "Lefel Diogelwch"
-
-#. i18n: file ./misc/tdewalletd/tdewalletwizard.ui line 401
-#: rc.cpp:57
-#, no-c-format
-msgid ""
-"The TDE 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 TDEWallet control module."
-msgstr ""
-
-#. i18n: file ./misc/tdewalletd/tdewalletwizard.ui line 432
-#: rc.cpp:60
-#, no-c-format
-msgid "Store network passwords and local passwords in separate wallet files"
-msgstr ""
-"Cronni cyfrineiriau rhwydwaith a cyfrineiriau lleol mewn ffeiliau waled "
-"gwahanol"
-
-#. i18n: file ./misc/tdewalletd/tdewalletwizard.ui line 440
-#: rc.cpp:63
-#, no-c-format
-msgid "Automatically close idle wallets"
-msgstr "Cau waledau segur yn ymysgogol"
-
-#. i18n: file ./misc/tdewalletd/kbetterthankdialogbase.ui line 60
-#: rc.cpp:66
-#, no-c-format
-msgid "Allow &Once"
-msgstr "Caniatau U&nwaith"
-
-#. i18n: file ./misc/tdewalletd/kbetterthankdialogbase.ui line 71
-#: rc.cpp:69
-#, no-c-format
-msgid "Allow &Always"
-msgstr "Gadael o &Hyd"
-
-#. i18n: file ./misc/tdewalletd/kbetterthankdialogbase.ui line 79
-#: rc.cpp:72
-#, no-c-format
-msgid "&Deny"
-msgstr "Gwa&hardd"
-
-#. i18n: file ./misc/tdewalletd/kbetterthankdialogbase.ui line 87
-#: rc.cpp:75
-#, fuzzy, no-c-format
-msgid "Deny &Forever"
-msgstr "&Am Byth"
-
-#. i18n: file ./tdefile/kpropertiesdesktopadvbase.ui line 27
-#: rc.cpp:78
-#, no-c-format
-msgid "Terminal"
-msgstr "Terfynell"
-
-#. i18n: file ./tdefile/kpropertiesdesktopadvbase.ui line 58
-#: rc.cpp:84
-#, no-c-format
-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 " "
-
-#. i18n: file ./tdefile/kpropertiesdesktopadvbase.ui line 80
-#: rc.cpp:93
-#, no-c-format
-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 ""
-
-#. i18n: file ./tdefile/kpropertiesdesktopadvbase.ui line 109
-#: rc.cpp:102
-#, no-c-format
-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 ""
-
-#. i18n: file ./tdefile/kpropertiesdesktopadvbase.ui line 140
-#: rc.cpp:108
-#, no-c-format
-msgid "Enter the user name you want to run the application as."
-msgstr "Mewnosodwch enw'r defnyddiwr yr ydych eisiau rhedeg y cymhwysiad fel."
-
-#. i18n: file ./tdefile/kpropertiesdesktopadvbase.ui line 148
-#: rc.cpp:111
-#, no-c-format
-msgid "Enter the user name you want to run the application as here."
-msgstr ""
-"Mewnosodwch yma enw'r defnyddiwr yr ydych eisiau rhedeg y cymhwysiad fel."
-
-#. i18n: file ./tdefile/kpropertiesdesktopadvbase.ui line 158
-#: rc.cpp:114
-#, no-c-format
-msgid "Startup"
-msgstr "Ymgychwyn"
-
-#. i18n: file ./tdefile/kpropertiesdesktopadvbase.ui line 169
-#: rc.cpp:117
-#, no-c-format
-msgid "Enable &launch feedback"
-msgstr "Galluogi adbor&th ymgychwyn"
-
-#. i18n: file ./tdefile/kpropertiesdesktopadvbase.ui line 172
-#: rc.cpp:120
-#, no-c-format
-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."
-
-#. i18n: file ./tdefile/kpropertiesdesktopadvbase.ui line 180
-#: rc.cpp:123
-#, no-c-format
-msgid "&Place in system tray"
-msgstr ""
-
-#. i18n: file ./tdefile/kpropertiesdesktopadvbase.ui line 183
-#: rc.cpp:126
-#, fuzzy, no-c-format
-msgid ""
-"Check this option if you want to have a system tray handle for your "
-"application."
-msgstr ""
-"Cliciwch ar y botwm yma os ydych eisiau ychwanegu math o ffeil (math mime) y "
-"gall eich cymhwysiad ei drin."
-
-#. i18n: file ./tdefile/kpropertiesdesktopadvbase.ui line 191
-#: rc.cpp:129
-#, no-c-format
-msgid "&DCOP registration:"
-msgstr "Cofrestru &DCOP"
-
-#. i18n: file ./tdefile/kpropertiesdesktopadvbase.ui line 200
-#: rc.cpp:132
-#, no-c-format
-msgid "None"
-msgstr "Dim"
-
-#. i18n: file ./tdefile/kpropertiesdesktopadvbase.ui line 205
-#: rc.cpp:135
-#, no-c-format
-msgid "Multiple Instances"
-msgstr "Enghreifftiau Lluosol"
-
-#. i18n: file ./tdefile/kpropertiesdesktopadvbase.ui line 210
-#: rc.cpp:138
-#, no-c-format
-msgid "Single Instance"
-msgstr "Enghraifft Sengl"
-
-#. i18n: file ./tdefile/kpropertiesdesktopadvbase.ui line 215
-#: rc.cpp:141
-#, no-c-format
-msgid "Run Until Finished"
-msgstr "Rhedeg tan i'w Orffen"
-
-#. i18n: file ./tdefile/knotifywidgetbase.ui line 91
-#: rc.cpp:144
-#, no-c-format
-msgid "Events"
-msgstr "Digwyddiadau"
-
-#. i18n: file ./tdefile/knotifywidgetbase.ui line 117
-#: rc.cpp:147
-#, no-c-format
-msgid "Quick Controls"
-msgstr "Rheoliadau ar Frys"
-
-#. i18n: file ./tdefile/knotifywidgetbase.ui line 128
-#: rc.cpp:150
-#, no-c-format
-msgid "Apply to &all applications"
-msgstr "Gweithredu i bob cym&hwysiad"
-
-#. i18n: file ./tdefile/knotifywidgetbase.ui line 170
-#: rc.cpp:153
-#, no-c-format
-msgid "Turn O&ff All"
-msgstr "Cuddio &Popeth"
-
-#. i18n: file ./tdefile/knotifywidgetbase.ui line 173
-#: rc.cpp:156 rc.cpp:162
-#, no-c-format
-msgid "Allows you to change the behavior for all events at once"
-msgstr "Gadael i chi newid ymddwyn pob ddigwyddiad ar unwaith"
-
-#. i18n: file ./tdefile/knotifywidgetbase.ui line 181
-#: rc.cpp:159
-#, no-c-format
-msgid "Turn O&n All"
-msgstr "Da&tguddio Popeth"
-
-#. i18n: file ./tdefile/knotifywidgetbase.ui line 215
-#: rc.cpp:168
-#, no-c-format
-msgid "Print a message to standard &error output"
-msgstr "Ar&graffu neges i allbwn gwall safonol"
-
-#. i18n: file ./tdefile/knotifywidgetbase.ui line 223
-#: rc.cpp:171
-#, no-c-format
-msgid "Show a &message in a pop-up window"
-msgstr "Dangos &neges mewn ffenest naidlen"
-
-#. i18n: file ./tdefile/knotifywidgetbase.ui line 231
-#: rc.cpp:174
-#, no-c-format
-msgid "E&xecute a program:"
-msgstr "Gwei&thredu rhaglen:"
+#: tdefile/knotifydialog.cpp:340
+msgid "Hide advanced options"
+msgstr "Cuddio dewisiadau uwch"
 
-#. i18n: file ./tdefile/knotifywidgetbase.ui line 247
-#: rc.cpp:177
-#, no-c-format
-msgid "Play a &sound:"
-msgstr "Chwarae &sw^n:"
+#: tdefile/knotifydialog.cpp:356
+#, fuzzy
+msgid "Advanced >>"
+msgstr "Gosod &uwch"
 
-#. i18n: file ./tdefile/knotifywidgetbase.ui line 258
-#: rc.cpp:180
-#, no-c-format
-msgid "Test the Sound"
-msgstr "Arbrofi'r Sw^n"
+#: tdefile/knotifydialog.cpp:357
+msgid "Show advanced options"
+msgstr "Dangos dewisiadau uwch"
 
-#. i18n: file ./tdefile/knotifywidgetbase.ui line 268
-#: rc.cpp:183
-#, no-c-format
-msgid "Mark &taskbar entry"
-msgstr "Nodi cofnod y bar &tasgiau"
+#: tdefile/knotifydialog.cpp:782
+#, fuzzy
+msgid "This will cause the notifications to be reset to their defaults."
+msgstr "Achosir i'r hysbysau gael ei ail-osod i'w rhagosodiadau!"
 
-#. i18n: file ./tdefile/knotifywidgetbase.ui line 276
-#: rc.cpp:186
-#, no-c-format
-msgid "&Log to a file:"
-msgstr "&Ysgrifennu i ffeil cofnod:"
+#: tdefile/knotifydialog.cpp:784
+msgid "Are You Sure?"
+msgstr "Ydych Yn Sicr?"
 
-#. i18n: file ./tdefile/knotifywidgetbase.ui line 352
-#: rc.cpp:189
-#, no-c-format
-msgid "&Use a passive window that does not interrupt other work"
-msgstr "&Defnyddio ffenest goddefol sy ddim yn torri ar draws gwaith arall"
+#: tdefile/knotifydialog.cpp:785
+msgid "&Reset"
+msgstr "&Ailosod"
 
-#. i18n: file ./tdefile/knotifywidgetbase.ui line 378
-#: rc.cpp:192
-#, no-c-format
-msgid "Less Options"
-msgstr "Llai o Ddewisiadau"
+#: tdefile/knotifydialog.cpp:858
+msgid "Select Sound File"
+msgstr "Dewis Ffeil Sw^n"
 
-#. i18n: file ./tdefile/knotifywidgetbase.ui line 406
-#: rc.cpp:195
-#, no-c-format
-msgid "Player Settings"
-msgstr "Gosodiadau'r Chwaraewr"
+#: tdefile/knotifydialog.cpp:894
+msgid "Select Log File"
+msgstr "Dewis Ffeil Cofnodi"
 
-#. i18n: file ./tdefile/kpropertiesmimetypebase.ui line 27
-#: rc.cpp:198
-#, no-c-format
-msgid "Select one or more file types to add:"
-msgstr "Dewis un neu fwy o fathau ffeil i'w ychwanegu:"
+#: tdefile/knotifydialog.cpp:908
+msgid "Select File to Execute"
+msgstr "Dewis Ffeil i Weithredu"
 
-#. i18n: file ./tdefile/kpropertiesmimetypebase.ui line 36
-#: rc.cpp:201 rc.cpp:219
-#, no-c-format
-msgid "Mimetype"
-msgstr "Math MIME"
+#: tdefile/knotifydialog.cpp:942
+#, fuzzy
+msgid "The specified file does not exist."
+msgstr "Efallai nad yw'r plygell penodol mewn bod."
 
-#. i18n: file ./tdefile/kpropertiesmimetypebase.ui line 47
-#: rc.cpp:204 rc.cpp:222
-#, no-c-format
-msgid "Description"
+#: tdefile/knotifydialog.cpp:1012
+msgid "No description available"
 msgstr "Disgrifiad"
 
-#. i18n: file ./tdefile/kpropertiesmimetypebase.ui line 61
-#: rc.cpp:207
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select one or more types of file that your application can handle here. 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>"
-msgstr ""
-
-#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 44
-#: rc.cpp:211
-#, no-c-format
-msgid "&Supported file types:"
-msgstr "Mat&hau ffeil a gynhelir:"
-
-#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 52
-#: rc.cpp:214 rc.cpp:225
-#, no-c-format
-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 ""
-
-#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 103
-#: rc.cpp:230
-#, no-c-format
-msgid "&Name:"
-msgstr "&Enw:"
-
-#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 109
-#: rc.cpp:233 rc.cpp:236
-#, no-c-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."
-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."
-
-#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 131
-#: rc.cpp:242 rc.cpp:245
-#, no-c-format
-msgid ""
-"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\"."
-
-#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 147
-#: rc.cpp:248
-#, no-c-format
-msgid "Comm&ent:"
-msgstr "Syl&wad:"
-
-#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 153
-#: rc.cpp:251 rc.cpp:254
-#, no-c-format
-msgid "Type any comment you think is useful here."
-msgstr "Teipiwch yma unrhyw sylwad o ddefnydd."
-
-#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 169
-#: rc.cpp:257
-#, no-c-format
-msgid "Co&mmand:"
-msgstr "G&orchymyn:"
-
-#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 186
-#: rc.cpp:260 rc.cpp:274
-#, 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"
-
-#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 216
-#: rc.cpp:291
-#, no-c-format
-msgid ""
-"Click here to browse your file system in order to find the desired executable."
-msgstr ""
-"Cliciwch yma i bori'ch cysawd ffeil er mwyn canfod y gweithredadwyn penodol."
-
-#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 224
-#: rc.cpp:294
-#, no-c-format
-msgid "&Work path:"
-msgstr "Llwybr g&waith:"
-
-#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 230
-#: rc.cpp:297 rc.cpp:300
-#, fuzzy, no-c-format
-msgid "Sets the working directory for your application."
-msgstr "Dileuwch y cyfeiriadur cyfredol a ceisiwch eto."
-
-#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 246
-#: rc.cpp:303
-#, no-c-format
-msgid "Add..."
-msgstr "Ychwanegu..."
-
-#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 249
-#: rc.cpp:306
-#, no-c-format
-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."
-
-#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 277
-#: rc.cpp:312
-#, no-c-format
-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."
-
-#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 302
-#: rc.cpp:315
-#, no-c-format
-msgid "Ad&vanced Options"
-msgstr "De&wisiadau Uwch"
-
-#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 305
-#: rc.cpp:318
-#, no-c-format
-msgid ""
-"Click here to modify the way this application will run, launch feedback, DCOP "
-"options or to run it as a different user."
-msgstr ""
-"Cliciwch ym i addasu'r ffordd y rheda'r cymhwysiad yma, ymgychwyn adborth, "
-"desisiadau DCOP, neu ei redeg fel defnyddiwr arall."
-
-#: ../tdeioslave/http/http.cc:5155 kpasswdserver/kpasswdserver.cpp:346
-msgid "  Do you want to retry?"
-msgstr "Ydych eisiau ail-geisio?"
-
-#: ../tdeioslave/http/http.cc:5156 kpasswdserver/kpasswdserver.cpp:348
-msgid "Authentication"
-msgstr "Dilysiant"
-
-#: kpasswdserver/kpasswdserver.cpp:348
-msgid "Retry"
-msgstr "Ail-geisio..."
+#: tdefile/tdefilemetainfowidget.cpp:111
+msgid "<Error>"
+msgstr "<Gwall>"
 
 #: httpfilter/httpfilter.cc:278
 msgid "Unexpected end of data, some information may be lost."
@@ -5854,144 +5924,6 @@ msgstr "Diwedd annisgwyl i'r ddata, efallai mae gwybodaeth wedi'i cholli."
 msgid "Receiving corrupt data."
 msgstr "Derbyn data llygredig."
 
-#: bookmarks/kbookmarkimporter_ns.cc:110 bookmarks/kbookmarkimporter_ns.cc:113
-msgid "*.html|HTML Files (*.html)"
-msgstr "Ffeiliau *.html|HTML (*.html)"
-
-#: bookmarks/kbookmarkimporter_ns.cc:197
-msgid "<!-- This file was generated by Konqueror -->"
-msgstr "<!-- Creuwyd y ffeil yma gan Konqueror -->"
-
-#: bookmarks/kbookmarkimporter_opera.cc:110
-#: bookmarks/kbookmarkimporter_opera.cc:113
-msgid "*.adr|Opera Bookmark Files (*.adr)"
-msgstr "*.adr|Ffeiliau Tudnodau Opera (*.adr)"
-
-#: bookmarks/kbookmarkmenu.cc:506 bookmarks/kbookmarkmenu_p.h:146
-msgid "Add Bookmark"
-msgstr "Ychwanegu Tudnod"
-
-#: bookmarks/kbookmarkmenu.cc:259
-msgid "Add Bookmark Here"
-msgstr "Ychwanegu Tudnod Yma"
-
-#: bookmarks/kbookmarkmenu.cc:276
-msgid "Open Folder in Bookmark Editor"
-msgstr "Agor y Blygell yn y Golygydd Tudnodau"
-
-#: bookmarks/kbookmarkmenu.cc:279
-msgid "Delete Folder"
-msgstr "Dileu Plygell"
-
-#: bookmarks/kbookmarkmenu.cc:287
-msgid "Copy Link Address"
-msgstr "Copïo Cyfeiriad Cyswllt"
-
-#: bookmarks/kbookmarkmenu.cc:290
-msgid "Delete Bookmark"
-msgstr "Dileu y Tudnod"
-
-#: bookmarks/kbookmarkmenu.cc:318
-#, fuzzy
-msgid "Bookmark Properties"
-msgstr "Priodweddau"
-
-#: bookmarks/kbookmarkmanager.cc:506 bookmarks/kbookmarkmenu.cc:343
-#, fuzzy
-msgid "Cannot add bookmark with empty URL."
-msgstr "Methu ychwanegu tudnod efo URL gwag"
-
-#: bookmarks/kbookmarkmenu.cc:381
-#, fuzzy
-msgid ""
-"Are you sure you wish to remove the bookmark folder\n"
-"\"%1\"?"
-msgstr "Ydych wir eisiau gwaredu'r plygell tudnodau yma?"
-
-#: bookmarks/kbookmarkmenu.cc:382
-#, fuzzy
-msgid ""
-"Are you sure you wish to remove the bookmark\n"
-"\"%1\"?"
-msgstr "Ydych wir eisiau gwaredu'r tudnod yma?"
-
-#: bookmarks/kbookmarkmenu.cc:383
-#, fuzzy
-msgid "Bookmark Folder Deletion"
-msgstr "Gwaredu Plygell Tudnodau"
-
-#: bookmarks/kbookmarkmenu.cc:384
-#, fuzzy
-msgid "Bookmark Deletion"
-msgstr "Dewis y Baner"
-
-#: bookmarks/kbookmarkmenu.cc:486
-msgid "Bookmark Tabs as Folder..."
-msgstr "Creu Plygell allan o'r Tabiau Tudnodau..."
-
-#: bookmarks/kbookmarkmenu.cc:495
-msgid "Add a folder of bookmarks for all open tabs."
-msgstr "Ychwanegu plygell o dudnodau am bob tab sy'n agored."
-
-#: bookmarks/kbookmarkmenu.cc:515
-msgid "Add a bookmark for the current document"
-msgstr "Ychwanegu tudnod am y ddogfen gyfredol"
-
-#: bookmarks/kbookmarkmenu.cc:529
-msgid "Edit your bookmark collection in a separate window"
-msgstr "Golygu eich casgliad tudnodau mewn ffenest gwahanol"
-
-#: bookmarks/kbookmarkmenu.cc:538
-msgid "&New Bookmark Folder..."
-msgstr "&Plygell Newydd i Tudnodau..."
-
-#: bookmarks/kbookmarkmenu.cc:550
-msgid "Create a new bookmark folder in this menu"
-msgstr "Creu plygell newydd i dudnodau yn y ddewislen yma"
-
-#: bookmarks/kbookmarkmenu.cc:684
-msgid "Quick Actions"
-msgstr "Gweithrediadau Brys"
-
-#: bookmarks/kbookmarkmenu.cc:831
-msgid "&New Folder..."
-msgstr "&Plygell Newydd"
-
-#: bookmarks/kbookmarkmenu.cc:948
-msgid "Bookmark"
-msgstr "Tudnod"
-
-#: bookmarks/kbookmarkmenu.cc:1115
-msgid "Netscape Bookmarks"
-msgstr "Tudnodau Netscape"
-
-#: bookmarks/kbookmark.cc:117
-msgid "Create New Bookmark Folder"
-msgstr "Creu Plygell Newydd i Dudnodau"
-
-#: bookmarks/kbookmark.cc:118
-#, c-format
-msgid "Create New Bookmark Folder in %1"
-msgstr "Creu Plygell Newydd i Dudnodau yn %1"
-
-#: bookmarks/kbookmark.cc:120
-msgid "New folder:"
-msgstr "Plygell newydd:"
-
-#: bookmarks/kbookmark.cc:286
-msgid "--- separator ---"
-msgstr "--- gwahanydd ---"
-
-#: bookmarks/kbookmarkmanager.cc:365
-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."
-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."
-
 #: ../tdeioslave/ftp/ftp.cc:451
 #, c-format
 msgid "Opening connection to host %1"
@@ -6032,12 +5964,12 @@ msgstr ""
 " %2 \n"
 "\n"
 
-#: ../tdeioslave/ftp/ftp.cc:596 ../tdeioslave/http/http.cc:5167
+#: ../tdeioslave/ftp/ftp.cc:596 ../tdeioslave/http/http.cc:5201
 #, fuzzy
 msgid "You need to supply a username and a password to access this site."
 msgstr "Rhaid i chi ddarparu defnydd-enw a cyfrinair i gyrchu'r wefan yma."
 
-#: ../tdeioslave/ftp/ftp.cc:598 ../tdeioslave/http/http.cc:5175
+#: ../tdeioslave/ftp/ftp.cc:598 ../tdeioslave/http/http.cc:5209
 msgid "Site:"
 msgstr "Gwefan:"
 
@@ -6054,7 +5986,7 @@ msgstr "Mewngofnod iawn"
 msgid "Could not login to %1."
 msgstr "Methu mewngofnodi i %1"
 
-#: ../tdeioslave/file/file.cc:564 ../tdeioslave/file/file.cc:798
+#: ../tdeioslave/file/file.cc:565 ../tdeioslave/file/file.cc:799
 #, c-format
 msgid ""
 "Could not change permissions for\n"
@@ -6063,75 +5995,43 @@ msgstr ""
 "Methu newid caniatadau i \n"
 " %1"
 
-#: ../tdeioslave/file/file.cc:730
+#: ../tdeioslave/file/file.cc:731
 msgid "Cannot copy file from %1 to %2. (Errno: %3)"
 msgstr ""
 
-#: ../tdeioslave/file/file.cc:1209
+#: ../tdeioslave/file/file.cc:1210
 #, fuzzy, c-format
 msgid "No media in device for %1"
 msgstr "Dim meta-wybodaeth am %1 "
 
-#: ../tdeioslave/file/file.cc:1375
+#: ../tdeioslave/file/file.cc:1385
 #, fuzzy
 msgid "No Media inserted or Media not recognized."
 msgstr "Ni adnabyddwyd math yr argraffydd."
 
-#: ../tdeioslave/file/file.cc:1385 ../tdeioslave/file/file.cc:1591
+#: ../tdeioslave/file/file.cc:1395 ../tdeioslave/file/file.cc:1601
 msgid "\"vold\" is not running."
 msgstr ""
 
-#: ../tdeioslave/file/file.cc:1419
+#: ../tdeioslave/file/file.cc:1429
 #, fuzzy
 msgid "Could not find program \"mount\""
 msgstr "Methu darganfod y rhaglen '%1'"
 
-#: ../tdeioslave/file/file.cc:1604
+#: ../tdeioslave/file/file.cc:1614
 #, fuzzy
 msgid "Could not find program \"umount\""
 msgstr "Methu darganfod y rhaglen '%1'"
 
-#: ../tdeioslave/file/file.cc:1709
+#: ../tdeioslave/file/file.cc:1794
 #, c-format
 msgid "Could not read %1"
 msgstr "Methu darllen %1"
 
-#: ../tdeioslave/http/http_cache_cleaner.cpp:53
-#: ../tdeioslave/http/http_cache_cleaner.cpp:194
-msgid "TDE HTTP cache maintenance tool"
-msgstr "Erfyn TDE am gynnal a chadw y storfa HTTP"
-
-#: ../tdeioslave/http/http_cache_cleaner.cpp:59
-msgid "Empty the cache"
-msgstr "Gwagu'r celc"
-
-#: ../tdeioslave/http/kcookiejar/main.cpp:30
-msgid "HTTP Cookie Daemon"
-msgstr "Daemon Cwci HTTP"
-
-#: ../tdeioslave/http/kcookiejar/main.cpp:36
-#, fuzzy
-msgid "Shut down cookie jar"
-msgstr "Cau'r jar cwci."
-
-#: ../tdeioslave/http/kcookiejar/main.cpp:37
-#, fuzzy
-msgid "Remove cookies for domain"
-msgstr "Gwaredu cwcis am y parth."
-
-#: ../tdeioslave/http/kcookiejar/main.cpp:38
-#, fuzzy
-msgid "Remove all cookies"
-msgstr "Dileu pob cwci."
-
-#: ../tdeioslave/http/kcookiejar/main.cpp:39
-#, fuzzy
-msgid "Reload configuration file"
-msgstr "Ail-lwytho'r ffeil ffurfweddiad. "
-
-#: ../tdeioslave/http/kcookiejar/main.cpp:46
-msgid "HTTP cookie daemon"
-msgstr "Daemon Cwci HTTP"
+#: ../tdeioslave/metainfo/metainfo.cpp:99
+#, c-format
+msgid "No metainfo for %1"
+msgstr "Dim meta-wybodaeth am %1 "
 
 #: ../tdeioslave/http/kcookiejar/kcookiewin.cpp:80
 msgid "Cookie Alert"
@@ -6284,68 +6184,105 @@ msgstr "Gweinyddion"
 msgid "Servers, page scripts"
 msgstr "Gweinyddion, sgriptiau tudalen"
 
-#: ../tdeioslave/http/http.cc:467
+#: ../tdeioslave/http/kcookiejar/main.cpp:30
+msgid "HTTP Cookie Daemon"
+msgstr "Daemon Cwci HTTP"
+
+#: ../tdeioslave/http/kcookiejar/main.cpp:36
+#, fuzzy
+msgid "Shut down cookie jar"
+msgstr "Cau'r jar cwci."
+
+#: ../tdeioslave/http/kcookiejar/main.cpp:37
+#, fuzzy
+msgid "Remove cookies for domain"
+msgstr "Gwaredu cwcis am y parth."
+
+#: ../tdeioslave/http/kcookiejar/main.cpp:38
+#, fuzzy
+msgid "Remove all cookies"
+msgstr "Dileu pob cwci."
+
+#: ../tdeioslave/http/kcookiejar/main.cpp:39
+#, fuzzy
+msgid "Reload configuration file"
+msgstr "Ail-lwytho'r ffeil ffurfweddiad. "
+
+#: ../tdeioslave/http/kcookiejar/main.cpp:46
+msgid "HTTP cookie daemon"
+msgstr "Daemon Cwci HTTP"
+
+#: ../tdeioslave/http/http_cache_cleaner.cpp:53
+#: ../tdeioslave/http/http_cache_cleaner.cpp:194
+msgid "TDE HTTP cache maintenance tool"
+msgstr "Erfyn TDE am gynnal a chadw y storfa HTTP"
+
+#: ../tdeioslave/http/http_cache_cleaner.cpp:59
+msgid "Empty the cache"
+msgstr "Gwagu'r celc"
+
+#: ../tdeioslave/http/http.cc:489
 #, fuzzy
 msgid "No host specified."
 msgstr "Dim gwesteiwr wedi'i benodi!"
 
-#: ../tdeioslave/http/http.cc:1553
+#: ../tdeioslave/http/http.cc:1580
 msgid "Otherwise, the request would have succeeded."
 msgstr "Fel arall, buasai'r cais wedi llwyddo."
 
-#: ../tdeioslave/http/http.cc:1557
+#: ../tdeioslave/http/http.cc:1584
 msgid "retrieve property values"
 msgstr "nôl gwerthoedd priodwedd"
 
-#: ../tdeioslave/http/http.cc:1560
+#: ../tdeioslave/http/http.cc:1587
 msgid "set property values"
 msgstr "gosod gwerthoedd priodwedd"
 
-#: ../tdeioslave/http/http.cc:1563
+#: ../tdeioslave/http/http.cc:1590
 msgid "create the requested folder"
 msgstr "creu'r plygell penodol"
 
-#: ../tdeioslave/http/http.cc:1566
+#: ../tdeioslave/http/http.cc:1593
 msgid "copy the specified file or folder"
 msgstr "copïo'r ffeil neu plygell penodol"
 
-#: ../tdeioslave/http/http.cc:1569
+#: ../tdeioslave/http/http.cc:1596
 msgid "move the specified file or folder"
 msgstr "symud y ffeil neu plygell penodol"
 
-#: ../tdeioslave/http/http.cc:1572
+#: ../tdeioslave/http/http.cc:1599
 msgid "search in the specified folder"
 msgstr "chwilio yn y plygell penodol"
 
-#: ../tdeioslave/http/http.cc:1575
+#: ../tdeioslave/http/http.cc:1602
 msgid "lock the specified file or folder"
 msgstr "cloi'r ffeil neu blygell penodol"
 
-#: ../tdeioslave/http/http.cc:1578
+#: ../tdeioslave/http/http.cc:1605
 msgid "unlock the specified file or folder"
 msgstr "datgloi'r ffeil neu blygell penodol"
 
-#: ../tdeioslave/http/http.cc:1581
+#: ../tdeioslave/http/http.cc:1608
 msgid "delete the specified file or folder"
 msgstr "dileu'r ffeil neu blygell penodol"
 
-#: ../tdeioslave/http/http.cc:1584
+#: ../tdeioslave/http/http.cc:1611
 msgid "query the server's capabilities"
 msgstr "holi gallu'r gweinydd"
 
-#: ../tdeioslave/http/http.cc:1587
+#: ../tdeioslave/http/http.cc:1614
 msgid "retrieve the contents of the specified file or folder"
 msgstr "nôl cynnwys y ffeil neu blygell penodol"
 
-#: ../tdeioslave/http/http.cc:1599 ../tdeioslave/http/http.cc:1752
+#: ../tdeioslave/http/http.cc:1626 ../tdeioslave/http/http.cc:1779
 msgid "An unexpected error (%1) occurred while attempting to %2."
 msgstr "Digwyddodd gwall annisgwyl (%1) wrth geisio cysylltu i %2"
 
-#: ../tdeioslave/http/http.cc:1607
+#: ../tdeioslave/http/http.cc:1634
 msgid "The server does not support the WebDAV protocol."
 msgstr "Nid yw'r gweinydd yn cynnal y protocol WebDAV."
 
-#: ../tdeioslave/http/http.cc:1648
+#: ../tdeioslave/http/http.cc:1675
 msgid ""
 "An error occurred while attempting to %1, %2. A summary of the reasons is "
 "below."
@@ -6354,16 +6291,16 @@ msgstr ""
 "Digwyddodd gwall wrth geisio %1, %2.  Mae crynodeb o'r rhesymau yn isod."
 "<ul>"
 
-#: ../tdeioslave/http/http.cc:1660 ../tdeioslave/http/http.cc:1763
+#: ../tdeioslave/http/http.cc:1687 ../tdeioslave/http/http.cc:1790
 #, c-format
 msgid "Access was denied while attempting to %1."
 msgstr "Gwrthodwyd cynhyrchiad wrth geisio %1."
 
-#: ../tdeioslave/http/http.cc:1667
+#: ../tdeioslave/http/http.cc:1694
 msgid "The specified folder already exists."
 msgstr "Mae'r plygell penodol mewn bod yn barod. "
 
-#: ../tdeioslave/http/http.cc:1673 ../tdeioslave/http/http.cc:1768
+#: ../tdeioslave/http/http.cc:1700 ../tdeioslave/http/http.cc:1795
 msgid ""
 "A resource cannot be created at the destination until one or more intermediate "
 "collections (folders) have been created."
@@ -6371,7 +6308,7 @@ msgstr ""
 "Ni ellir creu adnodd yn y cyrchfan nes bydd un neu mwy o'r gasgliadau (plygyll) "
 "canolraddol wedi'u creu."
 
-#: ../tdeioslave/http/http.cc:1682
+#: ../tdeioslave/http/http.cc:1709
 #, c-format
 msgid ""
 "The server was unable to maintain the liveness of the properties listed in the "
@@ -6382,31 +6319,31 @@ msgstr ""
 "propertybehaviour XML, neu rydych wedi ceisio ysgrifennu dros ffeil wrth ofyn "
 "peidio ag ysgrifennu dros ffeiliau. %1"
 
-#: ../tdeioslave/http/http.cc:1692
+#: ../tdeioslave/http/http.cc:1719
 #, c-format
 msgid "The requested lock could not be granted. %1"
 msgstr "Methu rhoi'r clo penodol. %1"
 
-#: ../tdeioslave/http/http.cc:1698
+#: ../tdeioslave/http/http.cc:1725
 msgid "The server does not support the request type of the body."
 msgstr "Nid yw'r gweinydd yn cynnal math cais y corff."
 
-#: ../tdeioslave/http/http.cc:1703 ../tdeioslave/http/http.cc:1775
+#: ../tdeioslave/http/http.cc:1730 ../tdeioslave/http/http.cc:1802
 msgid "Unable to %1 because the resource is locked."
 msgstr "Methu %1 o achos mae'r adnodd ar glo."
 
-#: ../tdeioslave/http/http.cc:1707
+#: ../tdeioslave/http/http.cc:1734
 msgid "This action was prevented by another error."
 msgstr "Rhwystrwyd y gweithrediad gan wall arall. "
 
-#: ../tdeioslave/http/http.cc:1714 ../tdeioslave/http/http.cc:1780
+#: ../tdeioslave/http/http.cc:1741 ../tdeioslave/http/http.cc:1807
 msgid ""
 "Unable to %1 because the destination server refuses to accept the file or "
 "folder."
 msgstr ""
 "Methu %1 o achos mae'r gweinydd cyrchfan yn gwrthod derbyn y ffeil neu blygell."
 
-#: ../tdeioslave/http/http.cc:1721 ../tdeioslave/http/http.cc:1786
+#: ../tdeioslave/http/http.cc:1748 ../tdeioslave/http/http.cc:1813
 msgid ""
 "The destination resource does not have sufficient space to record the state of "
 "the resource after the execution of this method."
@@ -6414,66 +6351,66 @@ msgstr ""
 "Nid oes gan yr adnodd cyrchfan ddigon o le i gofnodi cyflwr yr adnodd ar ôl "
 "gweithrediad y dull yma.  "
 
-#: ../tdeioslave/http/http.cc:1743
+#: ../tdeioslave/http/http.cc:1770
 #, c-format
 msgid "upload %1"
 msgstr "fyny-lwytho %1"
 
-#: ../tdeioslave/http/http.cc:2062
+#: ../tdeioslave/http/http.cc:2091
 msgid "Connecting to %1..."
 msgstr "Wrthi'n cysylltu i %1... "
 
-#: ../tdeioslave/http/http.cc:2080 ../tdeioslave/http/http.cc:2084
+#: ../tdeioslave/http/http.cc:2109 ../tdeioslave/http/http.cc:2113
 msgid "Proxy %1 at port %2"
 msgstr "Dirpwy %1 wrth borth %2"
 
-#: ../tdeioslave/http/http.cc:2110
+#: ../tdeioslave/http/http.cc:2139
 msgid "Connection was to %1 at port %2"
 msgstr "Roedd y cysylltiad i %1 wrth borth %2"
 
-#: ../tdeioslave/http/http.cc:2116
+#: ../tdeioslave/http/http.cc:2145
 msgid "%1 (port %2)"
 msgstr "%1 (porth %2)"
 
-#: ../tdeioslave/http/http.cc:2640
+#: ../tdeioslave/http/http.cc:2674
 msgid "%1 contacted. Waiting for reply..."
 msgstr "%1 wedi'i cysylltu. Yn disgwyl am ateb..."
 
-#: ../tdeioslave/http/http.cc:3008
+#: ../tdeioslave/http/http.cc:3042
 msgid "Server processing request, please wait..."
 msgstr "Mae'r gweinydd yn prosesu'r cais, arhoswch..."
 
-#: ../tdeioslave/http/http.cc:3884
+#: ../tdeioslave/http/http.cc:3918
 msgid "Requesting data to send"
 msgstr "Gofyn am ddata i'w danfon"
 
-#: ../tdeioslave/http/http.cc:3925
+#: ../tdeioslave/http/http.cc:3959
 #, c-format
 msgid "Sending data to %1"
 msgstr "Anfon data i %1"
 
-#: ../tdeioslave/http/http.cc:4344
+#: ../tdeioslave/http/http.cc:4378
 msgid "Retrieving %1 from %2..."
 msgstr "Nôl %1 oddiwrth %2..."
 
-#: ../tdeioslave/http/http.cc:4353
+#: ../tdeioslave/http/http.cc:4387
 msgid "Retrieving from %1..."
 msgstr "Nôl oddiwrth %1..."
 
-#: ../tdeioslave/http/http.cc:5147 ../tdeioslave/http/http.cc:5295
+#: ../tdeioslave/http/http.cc:5181 ../tdeioslave/http/http.cc:5329
 msgid "Authentication Failed."
 msgstr "Methodd dilysiant."
 
-#: ../tdeioslave/http/http.cc:5150 ../tdeioslave/http/http.cc:5298
+#: ../tdeioslave/http/http.cc:5184 ../tdeioslave/http/http.cc:5332
 #, fuzzy
 msgid "Proxy Authentication Failed."
 msgstr "Methodd Dilysiant Dirprwy!"
 
-#: ../tdeioslave/http/http.cc:5176 ../tdeioslave/http/http.cc:5193
+#: ../tdeioslave/http/http.cc:5210 ../tdeioslave/http/http.cc:5227
 msgid "<b>%1</b> at <b>%2</b>"
 msgstr "<b>%1</b> wrth <b>%2</b>"
 
-#: ../tdeioslave/http/http.cc:5183
+#: ../tdeioslave/http/http.cc:5217
 #, fuzzy
 msgid ""
 "You need to supply a username and a password for the proxy server listed below "
@@ -6482,23 +6419,83 @@ msgstr ""
 "Rhaid i chi gynnig defnydd-enw a cyfrinair am y gweinydd dirprwy a rhestrir "
 "isod cyn caniateir cyrchiad i unrhyw fan."
 
-#: ../tdeioslave/http/http.cc:5192
+#: ../tdeioslave/http/http.cc:5226
 msgid "Proxy:"
 msgstr "Dirprwy:"
 
-#: ../tdeioslave/http/http.cc:5214
+#: ../tdeioslave/http/http.cc:5248
 msgid "Authentication needed for %1 but authentication is disabled."
 msgstr "Mae angen dilysiant am %1, ond analluogir dilysiant."
 
-#: ../tdeioslave/http/http.cc:5836
+#: ../tdeioslave/http/http.cc:5870
 msgid ""
 "Unsupported method: authentication will fail. Please submit a bug report."
 msgstr "Dull ni chynhelir: bydd dilysu yn methu.  Hysbyswch y nam!"
 
-#: ../tdeioslave/metainfo/metainfo.cpp:99
-#, c-format
-msgid "No metainfo for %1"
-msgstr "Dim meta-wybodaeth am %1 "
+#: ../tdeioslave/iso/tdeiso_info.cpp:37
+msgid "TDE utility for getting ISO information"
+msgstr ""
+
+#: ../tdeioslave/iso/tdeiso_info.cpp:43
+msgid "Returns 0 if the file exists, -1 if it does not"
+msgstr ""
+
+#: ../tdeioslave/iso/tdeiso_info.cpp:44
+msgid ""
+"The device on which to execute the specified command.  Example: /dev/sr0"
+msgstr ""
+
+#: ../tdeioslave/iso/tdeiso_info.cpp:50
+msgid "Kerberos Realm Manager"
+msgstr ""
+
+#: ../tdeioslave/iso/tdeiso_info.cpp:93
+#, fuzzy
+msgid "No device was specified"
+msgstr "Dim ffeiliau wedi'u pennu"
+
+#~ msgid "Shared"
+#~ msgstr "Wedi ei rhannu."
+
+#~ msgid "Terminal"
+#~ msgstr "Terfynell"
+
+#~ 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 " "
+
+#~ msgid "Enter the user name you want to run the application as."
+#~ msgstr "Mewnosodwch enw'r defnyddiwr yr ydych eisiau rhedeg y cymhwysiad fel."
+
+#~ msgid "Enter the user name you want to run the application as here."
+#~ msgstr "Mewnosodwch yma enw'r defnyddiwr yr ydych eisiau rhedeg y cymhwysiad fel."
+
+#~ msgid "Startup"
+#~ msgstr "Ymgychwyn"
+
+#~ msgid "Enable &launch feedback"
+#~ msgstr "Galluogi adbor&th ymgychwyn"
+
+#~ 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."
+
+#, fuzzy
+#~ msgid "Check this option if you want to have a system tray handle for your application."
+#~ msgstr "Cliciwch ar y botwm yma os ydych eisiau ychwanegu math o ffeil (math mime) y gall eich cymhwysiad ei drin."
+
+#~ msgid "&DCOP registration:"
+#~ msgstr "Cofrestru &DCOP"
+
+#~ msgid "None"
+#~ msgstr "Dim"
+
+#~ msgid "Multiple Instances"
+#~ msgstr "Enghreifftiau Lluosol"
+
+#~ msgid "Single Instance"
+#~ msgstr "Enghraifft Sengl"
+
+#~ msgid "Run Until Finished"
+#~ msgstr "Rhedeg tan i'w Orffen"
 
 #~ msgid "Floppy"
 #~ msgstr "Disg meddal"
@@ -7604,9 +7601,6 @@ msgstr "Dim meta-wybodaeth am %1 "
 #~ msgid "Resources"
 #~ msgstr "Adnoddau"
 
-#~ msgid "Public"
-#~ msgstr "Cyhoeddus"
-
 #~ msgid "Private"
 #~ msgstr "Preivat"
 
@@ -7652,9 +7646,6 @@ msgstr "Dim meta-wybodaeth am %1 "
 #~ "Mobile"
 #~ msgstr "Ffôn Symudol"
 
-#~ msgid "Video"
-#~ msgstr "Fideo"
-
 #~ msgid "Mailbox"
 #~ msgstr "Bocs ebost"
 
@@ -8095,9 +8086,6 @@ msgstr "Dim meta-wybodaeth am %1 "
 #~ msgid "TDELauncher could not be reached via DCOP.\n"
 #~ msgstr "Methu cyrraedd Klauncher drwy DCOP.\n"
 
-#~ msgid "Desktop %1"
-#~ msgstr "Penbwrdd %1"
-
 #~ msgid "Will not save configuration.\n"
 #~ msgstr "Ni fydd yn cadw'r ffurfweddiad.\n"
 
@@ -14934,9 +14922,6 @@ msgstr "Dim meta-wybodaeth am %1 "
 #~ msgid "File Resource"
 #~ msgstr "Adnodd Ffeil"
 
-#~ msgid "(search)"
-#~ msgstr "(chwilio)"
-
 #~ msgid "Format:"
 #~ msgstr "Fformat:"
 
diff --git a/tde-i18n-cy/messages/tdelibs/tdeio_help.po b/tde-i18n-cy/messages/tdelibs/tdeio_help.po
index 24d2149a69a..b5ec0a2e270 100644
--- a/tde-i18n-cy/messages/tdelibs/tdeio_help.po
+++ b/tde-i18n-cy/messages/tdelibs/tdeio_help.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_help\n"
-"POT-Creation-Date: 2006-05-03 03:51+0200\n"
+"POT-Creation-Date: 2014-09-29 00:46-0500\n"
 "PO-Revision-Date: 2003-11-20 23:14+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,41 +27,6 @@ msgid ""
 "Your emails"
 msgstr "kyfieithu@dotmon.com"
 
-#: tdeio_help.cpp:115
-#, c-format
-msgid "There is no documentation available for %1."
-msgstr ""
-
-#: tdeio_help.cpp:158
-msgid "Looking up correct file"
-msgstr "Chwilio am y ffeil iawn"
-
-#: tdeio_help.cpp:209
-msgid "Preparing document"
-msgstr "Paratoi'r ddogfen"
-
-#: tdeio_help.cpp:218 tdeio_help.cpp:251
-#, fuzzy, c-format
-msgid "The requested help file could not be parsed:<br>%1"
-msgstr "Methu dosrannu'r ffeil cymorth penodol:"
-
-#: tdeio_help.cpp:240
-msgid "Saving to cache"
-msgstr "Cadw i'r celc"
-
-#: tdeio_help.cpp:246
-msgid "Using cached version"
-msgstr "Defnyddio'r fersiwn sydd yn y celc"
-
-#: tdeio_help.cpp:308
-msgid "Looking up section"
-msgstr "Cwhilio am yr adran"
-
-#: tdeio_help.cpp:319
-#, fuzzy
-msgid "Could not find filename %1 in %2."
-msgstr "<html>Methu canfod enw ffeil %1 yn %2</html>"
-
 #: meinproc.cpp:74
 msgid "Stylesheet to use"
 msgstr "Llen arddull i ddefnyddio"
@@ -111,11 +77,46 @@ msgstr "XML-Cyfieithydd"
 msgid "TDE Translator for XML"
 msgstr "Cyfieithydd TDE am XML"
 
-#: meinproc.cpp:264
+#: meinproc.cpp:280
 #, fuzzy, c-format
 msgid "Could not write to cache file %1."
 msgstr "Methu ysgrifennu i ffeil celc %1."
 
+#: tdeio_help.cpp:122
+#, c-format
+msgid "Sorry, there is no documentation available at all for %1."
+msgstr ""
+
+#: tdeio_help.cpp:166
+msgid "Looking up correct file"
+msgstr "Chwilio am y ffeil iawn"
+
+#: tdeio_help.cpp:217
+msgid "Preparing document"
+msgstr "Paratoi'r ddogfen"
+
+#: tdeio_help.cpp:226 tdeio_help.cpp:259
+#, fuzzy, c-format
+msgid "The requested help file could not be parsed:<br>%1"
+msgstr "Methu dosrannu'r ffeil cymorth penodol:"
+
+#: tdeio_help.cpp:248
+msgid "Saving to cache"
+msgstr "Cadw i'r celc"
+
+#: tdeio_help.cpp:254
+msgid "Using cached version"
+msgstr "Defnyddio'r fersiwn sydd yn y celc"
+
+#: tdeio_help.cpp:316
+msgid "Looking up section"
+msgstr "Cwhilio am yr adran"
+
+#: tdeio_help.cpp:327
+#, fuzzy
+msgid "Could not find filename %1 in %2."
+msgstr "<html>Methu canfod enw ffeil %1 yn %2</html>"
+
 #: xslt.cpp:55
 msgid "Parsing stylesheet"
 msgstr "Dosrannu'r len arddull"
diff --git a/tde-i18n-cy/messages/tdelibs/tdeioexec.po b/tde-i18n-cy/messages/tdelibs/tdeioexec.po
index 9790ad85500..48e3e64f0d3 100644
--- a/tde-i18n-cy/messages/tdelibs/tdeioexec.po
+++ b/tde-i18n-cy/messages/tdelibs/tdeioexec.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeioexec\n"
-"POT-Creation-Date: 2007-04-13 02:13+0200\n"
+"POT-Creation-Date: 2014-09-29 00:46-0500\n"
 "PO-Revision-Date: 2003-11-20 20:13+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -16,7 +17,8 @@ msgstr ""
 
 #: main.cpp:50
 msgid "TDEIO Exec - Opens remote files, watches modifications, asks for upload"
-msgstr "TDEIO Exec - Agor ffeiliau pell, arsylwi newidiadau, gofyn am lanlwytho"
+msgstr ""
+"TDEIO Exec - Agor ffeiliau pell, arsylwi newidiadau, gofyn am lanlwytho"
 
 #: main.cpp:54
 msgid "Treat URLs as local files and delete them afterwards"
diff --git a/tde-i18n-cy/messages/tdelibs/tdelibs.po b/tde-i18n-cy/messages/tdelibs/tdelibs.po
index 6827f7c5277..b38511b94f2 100644
--- a/tde-i18n-cy/messages/tdelibs/tdelibs.po
+++ b/tde-i18n-cy/messages/tdelibs/tdelibs.po
@@ -17,10 +17,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdelibs\n"
-"POT-Creation-Date: 2008-07-08 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:46-0500\n"
 "PO-Revision-Date: 2005-01-28 17:54+0000\n"
 "Last-Translator: Kevin Donnelly <kevin@dotmon.com>\n"
 "Language-Team: Cymraeg\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -47,151 +48,130 @@ msgstr ""
 ", bydd y cymhwysiad yn ufuddhau eich newidiadau yn y Ganolfan Rheolaeth.  Bydd "
 "pob un dewis arall yn gwrthwneud y gosodiad yna."
 
-#. i18n: file ./tdecert/tdecertpart.rc line 4
+#. i18n: file ./tdehtml/tdehtml_popupmenu.rc line 11
 #: rc.cpp:9
 #, no-c-format
-msgid "&Certificate"
-msgstr "&Tystysgrif"
+msgid "Frame"
+msgstr "Ffrâm"
 
-#. i18n: file ./tdeui/tdeshortcutdialog_advanced.ui line 58
-#: rc.cpp:12
+#. i18n: file ./tdehtml/tdehtml.rc line 4
+#: common_texts.cpp:81 rc.cpp:12 rc.cpp:30 rc.cpp:229
 #, no-c-format
-msgid "Alternate shortcut:"
-msgstr "Byrlwybr arall:"
+msgid "&Edit"
+msgstr "&Golygu"
 
-#. i18n: file ./tdeui/tdeshortcutdialog_advanced.ui line 69
+#. i18n: file ./tdehtml/kjserrordlg.ui line 17
 #: rc.cpp:15
 #, no-c-format
-msgid "Primary shortcut:"
-msgstr "Prif fyrlwybr:"
+msgid "JavaScript Errors"
+msgstr "Gwallau JavaScript"
 
-#. i18n: file ./tdeui/tdeshortcutdialog_advanced.ui line 155
+#. i18n: file ./tdehtml/kjserrordlg.ui line 20
 #: rc.cpp:18
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"The currently set shortcut or the shortcut you are entering will show up here."
+"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.trinitydesktop.org/. A test case which illustrates "
+"the problem will be appreciated."
 msgstr ""
-"Bydd y byrlwybr sydd mewn bod yn barod, neu'r byrlwybr yr ydych yn ei fewnosod, "
-"yn ymddangos yma."
-
-#. i18n: file ./tdeui/tdeshortcutdialog_advanced.ui line 182
-#: rc.cpp:21 rc.cpp:27 rc.cpp:84
-#, no-c-format
-msgid "x"
-msgstr "x"
-
-#. i18n: file ./tdeui/tdeshortcutdialog_advanced.ui line 188
-#: rc.cpp:24 rc.cpp:30 rc.cpp:87
-#, no-c-format
-msgid "Clear shortcut"
-msgstr "Diddymu byrlwybr"
-
-#. i18n: file ./tdeui/tdeshortcutdialog_advanced.ui line 213
-#: rc.cpp:33
-#, no-c-format
-msgid "Multi-key mode"
-msgstr "Modd aml-fysell"
-
-#. i18n: file ./tdeui/tdeshortcutdialog_advanced.ui line 216
-#: rc.cpp:36
-#, no-c-format
-msgid "Enable the entry of multi-key shortcuts"
-msgstr "Galluogi mewnosod byrlwybrau aml-fysell"
+"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 ./tdeui/tdeshortcutdialog_advanced.ui line 219
-#: rc.cpp:39
+#. i18n: file ./tdehtml/kjserrordlg.ui line 39
+#: tdeui/kstdaction_p.h:58 tdeui/kstdguiitem.cpp:161 rc.cpp:24
 #, no-c-format
-msgid ""
-"Select this checkbox to enable the entry of multi-key shortcuts.  A multi-key "
-"shortcut consists of a sequence of up to 4 keys.  For example, you could assign "
-"\"Ctrl+F,B\" to Font-Bold and \"Ctrl+F,U\" to Font-Underline."
-msgstr ""
-"Brithwch y blwch yma i alluogi mewnosod byrlwybrau aml-fysell.  Mae byrlwybr "
-"aml-allwedd yn ddilyniant o hyd at 4 allwedd.  Er enghraifft, gallwch ddiffinio "
-"\"Ctrl+F,B\" i Wynebfath-Italig a \"Ctrl+F,U\" i Wynebfath-Danlinellu."
+msgid "C&lear"
+msgstr "C&lirio"
 
-#. i18n: file ./tdeui/ui_standards.rc line 4
-#: common_texts.cpp:77 rc.cpp:42 rc.cpp:262
+#. i18n: file ./tdehtml/tdehtml_browser.rc line 4
+#: common_texts.cpp:77 rc.cpp:27 rc.cpp:223
 #, no-c-format
 msgid "&File"
 msgstr "&Ffeil"
 
-#. i18n: file ./tdeui/ui_standards.rc line 33
-#: common_texts.cpp:131 rc.cpp:45
+#. i18n: file ./tdehtml/tdehtml_browser.rc line 20
+#: common_texts.cpp:84 rc.cpp:33 rc.cpp:235
 #, no-c-format
-msgid "&Game"
-msgstr "&Gêm"
+msgid "&View"
+msgstr "&Golwg"
 
-#. i18n: file ./tdeui/ui_standards.rc line 57
-#: common_texts.cpp:81 rc.cpp:48 rc.cpp:229 rc.cpp:265
+#. i18n: file ./tdehtml/tdehtml_browser.rc line 37
+#: common_texts.cpp:254 rc.cpp:36 rc.cpp:256
 #, no-c-format
-msgid "&Edit"
-msgstr "&Golygu"
+msgid "Main Toolbar"
+msgstr "Prif Far Offer"
 
-#. i18n: file ./tdeui/ui_standards.rc line 80
-#: rc.cpp:51
+#. i18n: file ./tdehtml/htmlpageinfo.ui line 26
+#: rc.cpp:39
 #, no-c-format
-msgid ""
-"_: Menu title\n"
-"&Move"
-msgstr "&Symud"
+msgid "Document Information"
+msgstr "Gwybodaeth am y Ddogfen"
 
-#. i18n: file ./tdeui/ui_standards.rc line 97
-#: common_texts.cpp:84 rc.cpp:54 rc.cpp:268
+#. i18n: file ./tdehtml/htmlpageinfo.ui line 37
+#: rc.cpp:42
 #, no-c-format
-msgid "&View"
-msgstr "&Golwg"
+msgid "General"
+msgstr "Cyffredinol"
 
-#. i18n: file ./tdeui/ui_standards.rc line 112
-#: rc.cpp:57 rc.cpp:60
+#. i18n: file ./tdehtml/htmlpageinfo.ui line 64
+#: rc.cpp:45
 #, no-c-format
-msgid "&Go"
-msgstr "&Mynd"
+msgid "URL:"
+msgstr "URL:"
 
-#. i18n: file ./tdeui/ui_standards.rc line 133
-#: common_texts.cpp:182 rc.cpp:63
+#. i18n: file ./tdehtml/htmlpageinfo.ui line 122
+#: rc.cpp:48
 #, no-c-format
-msgid "&Bookmarks"
-msgstr "&Tudnodau"
+msgid "Title:"
+msgstr "Teitl:"
 
-#. i18n: file ./tdeui/ui_standards.rc line 139
-#: common_texts.cpp:185 rc.cpp:66
+#. i18n: file ./tdehtml/htmlpageinfo.ui line 141
+#: rc.cpp:51
 #, no-c-format
-msgid "&Tools"
-msgstr "&Offer"
+msgid "Last modified:"
+msgstr "Newid diweddaraf:"
 
-#. i18n: file ./tdeui/ui_standards.rc line 143
-#: common_texts.cpp:192 rc.cpp:69
+#. i18n: file ./tdehtml/htmlpageinfo.ui line 160
+#: rc.cpp:54
 #, no-c-format
-msgid "&Settings"
-msgstr "Gosod&iadau"
+msgid "Document encoding:"
+msgstr "Amgodiad y ddogfen:"
 
-#. i18n: file ./tdeui/ui_standards.rc line 186
-#: common_texts.cpp:254 rc.cpp:75 rc.cpp:271
+#. i18n: file ./tdehtml/htmlpageinfo.ui line 188
+#: rc.cpp:57
 #, no-c-format
-msgid "Main Toolbar"
-msgstr "Prif Far Offer"
+msgid "HTTP Headers"
+msgstr "Penodau HTTP"
 
-#. i18n: file ./tdeui/tdeshortcutdialog_simple.ui line 27
-#: rc.cpp:78
+#. i18n: file ./tdehtml/htmlpageinfo.ui line 197
+#: rc.cpp:60
 #, no-c-format
-msgid "Shortcut:"
-msgstr "Byrlwybr:"
+msgid "Property"
+msgstr "Priodwedd"
 
-#. i18n: file ./tdeui/tdeshortcutdialog_simple.ui line 65
-#: rc.cpp:81
+#. i18n: file ./tdehtml/htmlpageinfo.ui line 208
+#: tdehtml/java/kjavaappletviewer.cpp:132 rc.cpp:63
 #, no-c-format
-msgid "Alt+Tab"
-msgstr "Alt+Tab"
+msgid "Value"
+msgstr "Gwerth"
 
 #. i18n: file ./tdeui/tdespellui.ui line 38
-#: rc.cpp:90 rc.cpp:307
+#: rc.cpp:69 rc.cpp:307
 #, no-c-format
 msgid "Unknown word:"
 msgstr "Gair anhysbys"
 
 #. i18n: file ./tdeui/tdespellui.ui line 44
-#: rc.cpp:93 rc.cpp:105 rc.cpp:310 rc.cpp:322
+#: rc.cpp:72 rc.cpp:84 rc.cpp:310 rc.cpp:322
 #, no-c-format
 msgid ""
 "<qt>"
@@ -222,25 +202,25 @@ msgstr ""
 "</qt>"
 
 #. i18n: file ./tdeui/tdespellui.ui line 52
-#: rc.cpp:99 rc.cpp:316
+#: rc.cpp:78 rc.cpp:316
 #, no-c-format
 msgid "<b>misspelled</b>"
 msgstr "<b>wedi'i gamsillafu</b>"
 
 #. i18n: file ./tdeui/tdespellui.ui line 55
-#: rc.cpp:102 rc.cpp:319
+#: rc.cpp:81 rc.cpp:319
 #, no-c-format
 msgid "Unknown word"
 msgstr "Gair anhysbys"
 
 #. i18n: file ./tdeui/tdespellui.ui line 69
-#: rc.cpp:111 rc.cpp:328
+#: rc.cpp:90 rc.cpp:328
 #, no-c-format
 msgid "&Language:"
 msgstr "&Iaith:"
 
 #. i18n: file ./tdeui/tdespellui.ui line 77
-#: rc.cpp:114 rc.cpp:209 rc.cpp:331 rc.cpp:389
+#: rc.cpp:93 rc.cpp:188 rc.cpp:331 rc.cpp:389
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -252,19 +232,19 @@ msgstr ""
 "</qt>"
 
 #. i18n: file ./tdeui/tdespellui.ui line 88
-#: rc.cpp:119 rc.cpp:336
+#: rc.cpp:98 rc.cpp:336
 #, no-c-format
 msgid "... the <b>misspelled</b> word shown in context ..."
 msgstr "... y gair <b>a gamsillafwyd</b> yn ei gyd-destun ..."
 
 #. i18n: file ./tdeui/tdespellui.ui line 94
-#: rc.cpp:122 rc.cpp:339
+#: rc.cpp:101 rc.cpp:339
 #, no-c-format
 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 ./tdeui/tdespellui.ui line 99
-#: rc.cpp:125 rc.cpp:342
+#: rc.cpp:104 rc.cpp:342
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -283,13 +263,13 @@ msgstr ""
 "</qt>"
 
 #. i18n: file ./tdeui/tdespellui.ui line 107
-#: rc.cpp:130 rc.cpp:347
+#: rc.cpp:109 rc.cpp:347
 #, no-c-format
 msgid "<< Add to Dictionary"
 msgstr "<< Ychwanegu i'r Geiriadur"
 
 #. i18n: file ./tdeui/tdespellui.ui line 113
-#: rc.cpp:133 rc.cpp:350
+#: rc.cpp:112 rc.cpp:350
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -313,13 +293,13 @@ msgstr ""
 "</qt>"
 
 #. i18n: file ./tdeui/tdespellui.ui line 138
-#: rc.cpp:139 rc.cpp:405
+#: rc.cpp:118 rc.cpp:405
 #, no-c-format
 msgid "R&eplace All"
 msgstr "Amnewid y &Cwbl"
 
 #. i18n: file ./tdeui/tdespellui.ui line 143
-#: rc.cpp:142 rc.cpp:408
+#: rc.cpp:121 rc.cpp:408
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -333,19 +313,19 @@ msgstr ""
 "</qt>"
 
 #. i18n: file ./tdeui/tdespellui.ui line 149
-#: rc.cpp:147 rc.cpp:356
+#: rc.cpp:126 rc.cpp:356
 #, no-c-format
 msgid "Suggested Words"
 msgstr "Geiriau Awgrymedig"
 
 #. i18n: file ./tdeui/tdespellui.ui line 165
-#: rc.cpp:150 rc.cpp:359
+#: rc.cpp:129 rc.cpp:359
 #, no-c-format
 msgid "Suggestion List"
 msgstr "Rhestr Awgrymiadau"
 
 #. i18n: file ./tdeui/tdespellui.ui line 171
-#: rc.cpp:153 rc.cpp:362
+#: rc.cpp:132 rc.cpp:362
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -367,13 +347,13 @@ msgstr ""
 "</qt>"
 
 #. i18n: file ./tdeui/tdespellui.ui line 179
-#: tdeui/keditcl2.cpp:833 tdeutils/kfinddialog.cpp:231 rc.cpp:159 rc.cpp:397
+#: tdeui/keditcl2.cpp:833 tdeutils/kfinddialog.cpp:232 rc.cpp:138 rc.cpp:397
 #, no-c-format
 msgid "&Replace"
 msgstr "&Amnewid"
 
 #. i18n: file ./tdeui/tdespellui.ui line 184
-#: rc.cpp:162 rc.cpp:400
+#: rc.cpp:141 rc.cpp:400
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -387,13 +367,13 @@ msgstr ""
 "</qt>"
 
 #. i18n: file ./tdeui/tdespellui.ui line 192
-#: rc.cpp:167 rc.cpp:368
+#: rc.cpp:146 rc.cpp:368
 #, no-c-format
 msgid "Replace &with:"
 msgstr "Amnewid &efo:"
 
 #. i18n: file ./tdeui/tdespellui.ui line 201
-#: rc.cpp:170 rc.cpp:194 rc.cpp:371 rc.cpp:377
+#: rc.cpp:149 rc.cpp:173 rc.cpp:371 rc.cpp:377
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -413,13 +393,13 @@ msgstr ""
 "</qt>"
 
 #. i18n: file ./tdeui/tdespellui.ui line 209
-#: rc.cpp:176 rc.cpp:413
+#: tdersync/tdersync.cpp:687 rc.cpp:155 rc.cpp:413
 #, no-c-format
 msgid "&Ignore"
 msgstr "&Anwybyddu:"
 
 #. i18n: file ./tdeui/tdespellui.ui line 215
-#: rc.cpp:179 rc.cpp:416
+#: rc.cpp:158 rc.cpp:416
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -437,13 +417,13 @@ msgstr ""
 "</qt>"
 
 #. i18n: file ./tdeui/tdespellui.ui line 223
-#: rc.cpp:185 rc.cpp:422
+#: rc.cpp:164 rc.cpp:422
 #, no-c-format
 msgid "I&gnore All"
 msgstr "A&nwybyddu Popeth:"
 
 #. i18n: file ./tdeui/tdespellui.ui line 229
-#: rc.cpp:188 rc.cpp:425 rc.cpp:434
+#: rc.cpp:167 rc.cpp:425 rc.cpp:434
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -462,114 +442,135 @@ msgstr ""
 "</qt>"
 
 #. i18n: file ./tdeui/tdespellui.ui line 248
-#: rc.cpp:200 rc.cpp:394
+#: rc.cpp:179 rc.cpp:394
 #, no-c-format
 msgid "S&uggest"
 msgstr "A&wgrymu:"
 
 #. i18n: file ./tdeui/tdespellui.ui line 254
-#: tdeui/ksconfig.cpp:294 rc.cpp:203 rc.cpp:383
+#: tdeui/ksconfig.cpp:294 rc.cpp:182 rc.cpp:383
 #, no-c-format
 msgid "English"
 msgstr "Saesneg"
 
 #. i18n: file ./tdeui/tdespellui.ui line 261
-#: rc.cpp:206 rc.cpp:386
+#: rc.cpp:185 rc.cpp:386
 #, no-c-format
 msgid "Language Selection"
 msgstr "Dewis Iaith"
 
-#. i18n: file ./tdehtml/tdehtml_popupmenu.rc line 11
+#. i18n: file ./tdeui/tdeshortcutdialog_advanced.ui line 58
+#: rc.cpp:193
+#, no-c-format
+msgid "Alternate shortcut:"
+msgstr "Byrlwybr arall:"
+
+#. i18n: file ./tdeui/tdeshortcutdialog_advanced.ui line 69
+#: rc.cpp:196
+#, no-c-format
+msgid "Primary shortcut:"
+msgstr "Prif fyrlwybr:"
+
+#. i18n: file ./tdeui/tdeshortcutdialog_advanced.ui line 155
+#: rc.cpp:199
+#, no-c-format
+msgid ""
+"The currently set shortcut or the shortcut you are entering will show up here."
+msgstr ""
+"Bydd y byrlwybr sydd mewn bod yn barod, neu'r byrlwybr yr ydych yn ei fewnosod, "
+"yn ymddangos yma."
+
+#. i18n: file ./tdeui/tdeshortcutdialog_advanced.ui line 182
+#: rc.cpp:202 rc.cpp:208 rc.cpp:265
+#, no-c-format
+msgid "x"
+msgstr "x"
+
+#. i18n: file ./tdeui/tdeshortcutdialog_advanced.ui line 188
+#: rc.cpp:205 rc.cpp:211 rc.cpp:268
+#, no-c-format
+msgid "Clear shortcut"
+msgstr "Diddymu byrlwybr"
+
+#. i18n: file ./tdeui/tdeshortcutdialog_advanced.ui line 213
 #: rc.cpp:214
 #, no-c-format
-msgid "Frame"
-msgstr "Ffrâm"
+msgid "Multi-key mode"
+msgstr "Modd aml-fysell"
 
-#. i18n: file ./tdehtml/kjserrordlg.ui line 17
+#. i18n: file ./tdeui/tdeshortcutdialog_advanced.ui line 216
 #: rc.cpp:217
 #, no-c-format
-msgid "JavaScript Errors"
-msgstr "Gwallau JavaScript"
+msgid "Enable the entry of multi-key shortcuts"
+msgstr "Galluogi mewnosod byrlwybrau aml-fysell"
 
-#. i18n: file ./tdehtml/kjserrordlg.ui line 20
+#. i18n: file ./tdeui/tdeshortcutdialog_advanced.ui line 219
 #: rc.cpp:220
 #, no-c-format
 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."
+"Select this checkbox to enable the entry of multi-key shortcuts.  A multi-key "
+"shortcut consists of a sequence of up to 4 keys.  For example, you could assign "
+"\"Ctrl+F,B\" to Font-Bold and \"Ctrl+F,U\" to Font-Underline."
 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."
+"Brithwch y blwch yma i alluogi mewnosod byrlwybrau aml-fysell.  Mae byrlwybr "
+"aml-allwedd yn ddilyniant o hyd at 4 allwedd.  Er enghraifft, gallwch ddiffinio "
+"\"Ctrl+F,B\" i Wynebfath-Italig a \"Ctrl+F,U\" i Wynebfath-Danlinellu."
 
-#. i18n: file ./tdehtml/kjserrordlg.ui line 39
-#: tdeui/kstdaction_p.h:58 tdeui/kstdguiitem.cpp:161 rc.cpp:226
+#. i18n: file ./tdeui/ui_standards.rc line 33
+#: common_texts.cpp:131 rc.cpp:226
 #, no-c-format
-msgid "C&lear"
-msgstr "C&lirio"
+msgid "&Game"
+msgstr "&Gêm"
 
-#. i18n: file ./tdehtml/htmlpageinfo.ui line 26
+#. i18n: file ./tdeui/ui_standards.rc line 80
 #: rc.cpp:232
 #, no-c-format
-msgid "Document Information"
-msgstr "Gwybodaeth am y Ddogfen"
-
-#. i18n: file ./tdehtml/htmlpageinfo.ui line 37
-#: rc.cpp:235
-#, no-c-format
-msgid "General"
-msgstr "Cyffredinol"
+msgid ""
+"_: Menu title\n"
+"&Move"
+msgstr "&Symud"
 
-#. i18n: file ./tdehtml/htmlpageinfo.ui line 64
-#: rc.cpp:238
+#. i18n: file ./tdeui/ui_standards.rc line 112
+#: rc.cpp:238 rc.cpp:241
 #, no-c-format
-msgid "URL:"
-msgstr "URL:"
+msgid "&Go"
+msgstr "&Mynd"
 
-#. i18n: file ./tdehtml/htmlpageinfo.ui line 122
-#: rc.cpp:241
+#. i18n: file ./tdeui/ui_standards.rc line 133
+#: common_texts.cpp:182 rc.cpp:244
 #, no-c-format
-msgid "Title:"
-msgstr "Teitl:"
+msgid "&Bookmarks"
+msgstr "&Tudnodau"
 
-#. i18n: file ./tdehtml/htmlpageinfo.ui line 141
-#: rc.cpp:244
+#. i18n: file ./tdeui/ui_standards.rc line 139
+#: common_texts.cpp:185 rc.cpp:247
 #, no-c-format
-msgid "Last modified:"
-msgstr "Newid diweddaraf:"
+msgid "&Tools"
+msgstr "&Offer"
 
-#. i18n: file ./tdehtml/htmlpageinfo.ui line 160
-#: rc.cpp:247
+#. i18n: file ./tdeui/ui_standards.rc line 143
+#: common_texts.cpp:192 rc.cpp:250
 #, no-c-format
-msgid "Document encoding:"
-msgstr "Amgodiad y ddogfen:"
+msgid "&Settings"
+msgstr "Gosod&iadau"
 
-#. i18n: file ./tdehtml/htmlpageinfo.ui line 188
-#: rc.cpp:250
+#. i18n: file ./tdeui/tdeshortcutdialog_simple.ui line 27
+#: rc.cpp:259
 #, no-c-format
-msgid "HTTP Headers"
-msgstr "Penodau HTTP"
+msgid "Shortcut:"
+msgstr "Byrlwybr:"
 
-#. i18n: file ./tdehtml/htmlpageinfo.ui line 197
-#: rc.cpp:253
+#. i18n: file ./tdeui/tdeshortcutdialog_simple.ui line 65
+#: rc.cpp:262
 #, no-c-format
-msgid "Property"
-msgstr "Priodwedd"
+msgid "Alt+Tab"
+msgstr "Alt+Tab"
 
-#. i18n: file ./tdehtml/htmlpageinfo.ui line 208
-#: tdehtml/java/kjavaappletviewer.cpp:132 rc.cpp:256
+#. i18n: file ./tdecert/tdecertpart.rc line 4
+#: rc.cpp:271
 #, no-c-format
-msgid "Value"
-msgstr "Gwerth"
+msgid "&Certificate"
+msgstr "&Tystysgrif"
 
 #. i18n: file ./tdespell2/ui/configui.ui line 26
 #: rc.cpp:274
@@ -581,7 +582,7 @@ msgstr ""
 
 #. i18n: file ./tdespell2/ui/configui.ui line 34
 #: common_texts.cpp:118 tdeui/keditcl2.cpp:723 tdeui/keditcl2.cpp:862
-#: tdeutils/kfinddialog.cpp:161 rc.cpp:277
+#: tdeutils/kfinddialog.cpp:162 rc.cpp:277
 #, no-c-format
 msgid "Options"
 msgstr "Dewisiadau"
@@ -689,7 +690,7 @@ msgstr ""
 #. i18n: file ./dnssd/kcm_tdednssd.kcfg line 19
 #: rc.cpp:455
 #, no-c-format
-msgid "Removed in TDE 3.5.0"
+msgid "Removed in KDE 3.5.0"
 msgstr ""
 
 #. i18n: file ./dnssd/kcm_tdednssd.kcfg line 25
@@ -735,8 +736,9 @@ msgid ""
 "Your emails"
 msgstr "kyfieithu@dotmon.com"
 
-#: common_texts.cpp:24 tdeui/tdeconfigdialog.cpp:56 tdeutils/kcmultidialog.cpp:59
-#: tdeutils/kcmultidialog.h:104 tdeutils/ksettings/dialog.cpp:571
+#: common_texts.cpp:24 tdeui/tdeconfigdialog.cpp:56
+#: tdeutils/kcmultidialog.cpp:59 tdeutils/kcmultidialog.h:104
+#: tdeutils/ksettings/dialog.cpp:571
 msgid "Configure"
 msgstr "Ffurfweddu"
 
@@ -768,7 +770,7 @@ msgstr "Tudalen"
 msgid "Border"
 msgstr "Ymyl"
 
-#: common_texts.cpp:32 tdeui/tdetoolbar.cpp:2116
+#: common_texts.cpp:32 tdeui/tdetoolbar.cpp:2122
 msgid "Orientation"
 msgstr "Gogwydd"
 
@@ -852,8 +854,8 @@ msgstr "Chwyddo"
 msgid "&Zoom"
 msgstr "&Chwyddo"
 
-#: arts/message/artsmessage.cc:89 common_texts.cpp:54 tdeabc/lock.cpp:132
-#: tdeui/tdemessagebox.cpp:760 tdeui/tdemessagebox.cpp:790 kjs/object.cpp:493
+#: arts/message/artsmessage.cc:89 common_texts.cpp:54 kjs/object.cpp:493
+#: tdeabc/lock.cpp:132 tdeui/tdemessagebox.cpp:760 tdeui/tdemessagebox.cpp:790
 #: tdeutils/kpluginselector.cpp:248
 msgid "Error"
 msgstr "Gwall"
@@ -897,10 +899,10 @@ msgstr "Y&nghylch"
 msgid "Untitled"
 msgstr "Heb deitl"
 
-#: common_texts.cpp:67 tdecore/tdeapplication.cpp:1417
-#: tdecore/tdeapplication.cpp:2245 tdecore/tdeapplication.cpp:2280
-#: tdecore/tdeapplication.cpp:2551 tdecore/tdeapplication.cpp:2573
-#: tdecore/kdebug.cpp:295 tdeui/kdialogbase.cpp:908 tdeui/kstdguiitem.cpp:99
+#: common_texts.cpp:67 tdecore/kdebug.cpp:339 tdecore/tdeapplication.cpp:1627
+#: tdecore/tdeapplication.cpp:2728 tdecore/tdeapplication.cpp:2763
+#: tdecore/tdeapplication.cpp:3034 tdecore/tdeapplication.cpp:3059
+#: tdeui/kdialogbase.cpp:908 tdeui/kstdguiitem.cpp:99
 msgid "&OK"
 msgstr "&Iawn"
 
@@ -952,7 +954,7 @@ msgstr "Terfynu"
 msgid "&Quit"
 msgstr "&Gorffen"
 
-#: common_texts.cpp:88 tdecore/tdestdaccel.cpp:88 kded/tdebuildsycoca.cpp:753
+#: common_texts.cpp:88 kded/tdebuildsycoca.cpp:753 tdecore/tdestdaccel.cpp:88
 msgid "Reload"
 msgstr "Ail-lwytho"
 
@@ -980,7 +982,8 @@ msgstr "Gêm Newydd"
 msgid "&New Game"
 msgstr "&Gêm Newydd"
 
-#: common_texts.cpp:99 tdecore/kkeyserver_x11.cpp:133 tdecore/tdestdaccel.cpp:53
+#: common_texts.cpp:99 tdecore/kkeyserver_x11.cpp:134
+#: tdecore/tdestdaccel.cpp:53
 msgid "Open"
 msgstr "Agor"
 
@@ -1024,8 +1027,9 @@ msgstr "Cadw"
 msgid "&Save"
 msgstr "&Cadw"
 
-#: common_texts.cpp:111 tdehtml/tdehtml_part.cpp:3937 tdehtml/tdehtml_part.cpp:4141
-#: tdehtml/tdehtml_part.cpp:4462 tdehtml/tdehtml_run.cpp:83 tdeparts/browserrun.cpp:419
+#: common_texts.cpp:111 tdehtml/tdehtml_part.cpp:3941
+#: tdehtml/tdehtml_part.cpp:4145 tdehtml/tdehtml_part.cpp:4466
+#: tdehtml/tdehtml_run.cpp:83 tdeparts/browserrun.cpp:419
 msgid "Save As"
 msgstr "Cadw Fel"
 
@@ -1041,7 +1045,8 @@ msgstr "C&adw Fel..."
 msgid "&Print..."
 msgstr "&Argraffu"
 
-#: common_texts.cpp:117 tdeui/tdemessagebox.cpp:837 tdeui/tdemessagebox.cpp:867
+#: common_texts.cpp:117 tdeui/tdemessagebox.cpp:837
+#: tdeui/tdemessagebox.cpp:867
 msgid "Sorry"
 msgstr "Ymddiheuriad"
 
@@ -1062,7 +1067,8 @@ msgstr "Newid"
 msgid "&Delete"
 msgstr "&Dileu"
 
-#: common_texts.cpp:125 tdeui/tdefontdialog.cpp:225 tdeui/tdefontdialog.cpp:477
+#: common_texts.cpp:125 tdeui/tdefontdialog.cpp:225
+#: tdeui/tdefontdialog.cpp:477
 msgid "Italic"
 msgstr "Italig"
 
@@ -1090,15 +1096,16 @@ msgstr "cysylltiedig yn lleol"
 msgid "Browse..."
 msgstr "Pori..."
 
-#: common_texts.cpp:137 tdecore/kkeyserver_x11.cpp:127 tdeui/keditcl2.cpp:107
+#: common_texts.cpp:137 tdecore/kkeyserver_x11.cpp:128
+#: tdehtml/ecma/kjs_debugwin.cpp:466 tdeui/keditcl2.cpp:107
 #: tdeui/keditcl2.cpp:120 tdeui/keditcl2.cpp:377 tdeui/keditcl2.cpp:390
 #: tdeui/keditcl2.cpp:456 tdeui/keditcl2.cpp:469 tdeui/kstdguiitem.cpp:259
-#: tdehtml/ecma/kjs_debugwin.cpp:466 tdeutils/kreplace.cpp:319
+#: tdeutils/kreplace.cpp:319
 msgid "Stop"
 msgstr "Aros"
 
-#: common_texts.cpp:138 tdeui/keditlistbox.cpp:136
-#: tderesources/configpage.cpp:127
+#: common_texts.cpp:138 tderesources/configpage.cpp:127
+#: tdeui/keditlistbox.cpp:136
 msgid "&Remove"
 msgstr "&Tynnu ymaith"
 
@@ -1154,7 +1161,7 @@ msgstr "Adfer"
 msgid "Appearance"
 msgstr "Golwg"
 
-#: common_texts.cpp:152 tdecore/kkeyserver_x11.cpp:137
+#: common_texts.cpp:152 tdecore/kkeyserver_x11.cpp:138
 #: tdecore/tdestdaccel.cpp:57
 msgid "Print"
 msgstr "Argraffu"
@@ -1224,8 +1231,11 @@ msgid "&Replace..."
 msgstr "&Amnewid"
 
 #: common_texts.cpp:173 tdeabc/ldapconfigwidget.cpp:156
-#: tdeabc/ldapconfigwidget.cpp:168 tdeui/klineedit.cpp:914
-#: tdeui/tdetoolbar.cpp:2058
+#: tdeabc/ldapconfigwidget.cpp:168 tderandr/libtderandr.cc:1300
+#: tderandr/libtderandr.cc:1403 tderandr/libtderandr.cc:1404
+#: tderandr/libtderandr.cc:1405 tderandr/libtderandr.cc:1445
+#: tderandr/libtderandr.cc:1446 tderandr/libtderandr.cc:1447
+#: tdeui/klineedit.cpp:914 tdeui/tdetoolbar.cpp:2064
 msgid "Default"
 msgstr "Rhagosodol"
 
@@ -1245,7 +1255,7 @@ msgstr "Agor Diweddar"
 msgid "Open &Recent"
 msgstr "Agor &Diweddar"
 
-#: common_texts.cpp:179 tdeui/kstdaction_p.h:61 tdehtml/tdehtml_part.cpp:4258
+#: common_texts.cpp:179 tdehtml/tdehtml_part.cpp:4262 tdeui/kstdaction_p.h:61
 msgid "&Find..."
 msgstr "&Canfod"
 
@@ -1294,213 +1304,423 @@ msgstr "&Hoffiannau ..."
 msgid "Do not show this message again"
 msgstr "Peidiwch â dangos y neges yma eto"
 
+#: common_texts.cpp:194
+#, fuzzy
+msgid ""
+"_: TQAccel\n"
+"Escape"
+msgstr "Dianc (Esc)"
+
+#: common_texts.cpp:195
+#, fuzzy
+msgid ""
+"_: TQAccel\n"
+"Tab"
+msgstr " Tab"
+
+#: common_texts.cpp:196
+#, fuzzy
+msgid ""
+"_: TQAccel\n"
+"Backtab"
+msgstr " Ol-dab"
+
+#: common_texts.cpp:197
+#, fuzzy
+msgid ""
+"_: TQAccel\n"
+"Backspace"
+msgstr " Ol-fysell"
+
+#: common_texts.cpp:198
+#, fuzzy
+msgid ""
+"_: TQAccel\n"
+"Return"
+msgstr "Dychwel-fysell"
+
+#: common_texts.cpp:199
+#, fuzzy
+msgid ""
+"_: TQAccel\n"
+"Enter"
+msgstr " Mewnosod"
+
+#: common_texts.cpp:200
+#, fuzzy
+msgid ""
+"_: TQAccel\n"
+"Insert"
+msgstr "Mewnoso"
+
+#: common_texts.cpp:201
+#, fuzzy
+msgid ""
+"_: TQAccel\n"
+"Delete"
+msgstr "Dileu"
+
+#: common_texts.cpp:202
+#, fuzzy
+msgid ""
+"_: TQAccel\n"
+"Pause"
+msgstr "Seibio (Pause)"
+
+#: common_texts.cpp:203
+#, fuzzy
+msgid ""
+"_: TQAccel\n"
+"Print"
+msgstr " Argraffu"
+
+#: common_texts.cpp:204
+#, fuzzy
+msgid ""
+"_: TQAccel\n"
+"SysReq"
+msgstr " SysReq"
+
+#: common_texts.cpp:205
+#, fuzzy
+msgid ""
+"_: TQAccel\n"
+"Home"
+msgstr " Cartref (Home)"
+
+#: common_texts.cpp:206
+#, fuzzy
+msgid ""
+"_: TQAccel\n"
+"End"
+msgstr " Diwedd (End)"
+
+#: common_texts.cpp:207
+#, fuzzy
+msgid ""
+"_: TQAccel\n"
+"Left"
+msgstr "I'r Chwith"
+
+#: common_texts.cpp:208
+#, fuzzy
+msgid ""
+"_: TQAccel\n"
+"Up"
+msgstr "I Fyny"
+
+#: common_texts.cpp:209
+#, fuzzy
+msgid ""
+"_: TQAccel\n"
+"Right"
+msgstr "I'r Dde"
+
+#: common_texts.cpp:210
+#, fuzzy
+msgid ""
+"_: TQAccel\n"
+"Down"
+msgstr " I Lawr"
+
 #: common_texts.cpp:211
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "Prior"
 msgstr "Blaenorol"
 
 #: common_texts.cpp:212
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "Next"
 msgstr "Nesaf"
 
 #: common_texts.cpp:213
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "Shift"
 msgstr "Syflyd (Shift)"
 
 #: common_texts.cpp:214
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "Control"
 msgstr "Rheoli"
 
 #: common_texts.cpp:215
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "Meta"
 msgstr "Meta"
 
 #: common_texts.cpp:216
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "Alt"
 msgstr "Arall (Alt)"
 
+#: common_texts.cpp:217
+#, fuzzy
+msgid ""
+"_: TQAccel\n"
+"CapsLock"
+msgstr "Cloi Llythrennau Mawr (CapsLock)"
+
+#: common_texts.cpp:218
+#, fuzzy
+msgid ""
+"_: TQAccel\n"
+"NumLock"
+msgstr "Cloi Rhifau (NumLock)"
+
+#: common_texts.cpp:219
+#, fuzzy
+msgid ""
+"_: TQAccel\n"
+"ScrollLock"
+msgstr "Cloi Sgrolio (ScrollLock)"
+
+#: common_texts.cpp:220
+#, fuzzy
+msgid ""
+"_: TQAccel\n"
+"Space"
+msgstr "Gofodnod"
+
 #: common_texts.cpp:221
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "ParenLeft"
 msgstr "CromfChwith"
 
 #: common_texts.cpp:222
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "ParenRight"
 msgstr "CromfDe"
 
 #: common_texts.cpp:223
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "Asterisk"
 msgstr "Seren"
 
 #: common_texts.cpp:224
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "Plus"
 msgstr "Ychwanegu"
 
 #: common_texts.cpp:225
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "Comma"
 msgstr "Coma"
 
 #: common_texts.cpp:226
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "Minus"
 msgstr "Minws"
 
 #: common_texts.cpp:227
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "Period"
 msgstr "Atalnod"
 
 #: common_texts.cpp:228
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "Slash"
 msgstr "Slaes"
 
 #: common_texts.cpp:229
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "Colon"
 msgstr "Colon"
 
 #: common_texts.cpp:230
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "Semicolon"
 msgstr "Hannercolon"
 
 #: common_texts.cpp:231
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "Less"
 msgstr "Llai"
 
 #: common_texts.cpp:232
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "Equal"
 msgstr "Cyfartal"
 
 #: common_texts.cpp:233
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "Greater"
 msgstr "Mwy"
 
 #: common_texts.cpp:234
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "Question"
 msgstr "Cwestiwn"
 
 #: common_texts.cpp:235
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "BracketLeft"
 msgstr "CromfachChwith"
 
 #: common_texts.cpp:236
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "Backslash"
 msgstr "SlaesCefn"
 
 #: common_texts.cpp:237
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "BracketRight"
 msgstr "CromfachDe"
 
 #: common_texts.cpp:238
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "AsciiCircum"
 msgstr "AsciiAcenGrom"
 
 #: common_texts.cpp:239
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "Underscore"
 msgstr "Tanlinell"
 
 #: common_texts.cpp:240
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "QuoteLeft"
 msgstr "DyfynnodChwith"
 
 #: common_texts.cpp:241
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "BraceLeft"
 msgstr "CyplysyddChwith"
 
 #: common_texts.cpp:242
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "BraceRight"
 msgstr "CyplysyddDe"
 
 #: common_texts.cpp:243
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "AsciiTilde"
 msgstr "AsciiTilde"
 
+#: common_texts.cpp:244
+#, fuzzy
+msgid ""
+"_: TQAccel\n"
+"PgUp"
+msgstr " Tudalen Cynt (PgUp)"
+
+#: common_texts.cpp:245
+#, fuzzy
+msgid ""
+"_: TQAccel\n"
+"PgDown"
+msgstr "Tudalen Nesaf (PgDown)"
+
 #: common_texts.cpp:246
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "Apostrophe"
 msgstr "Collnod"
 
 #: common_texts.cpp:247
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "Ampersand"
 msgstr "Ampersand"
 
 #: common_texts.cpp:248
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "Exclam"
 msgstr "Ebychnod"
 
 #: common_texts.cpp:249
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "Dollar"
 msgstr "Doler"
 
 #: common_texts.cpp:250
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "Percent"
 msgstr "Canran-nod"
 
+#: common_texts.cpp:251
+#, fuzzy
+msgid ""
+"_: TQAccel\n"
+"Menu"
+msgstr "Dewislen"
+
+#: common_texts.cpp:252
+#, fuzzy
+msgid ""
+"_: TQAccel\n"
+"Help"
+msgstr "Cymorth"
+
 #: common_texts.cpp:253
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "NumberSign"
 msgstr "NodRhif"
 
@@ -1558,1234 +1778,179 @@ msgid ""
 "Un-Sticky"
 msgstr "Di-Gludiog"
 
-#: kjs/object.cpp:349
-msgid "No default value"
-msgstr "Dim gwerth rhagosodol"
-
-#: kjs/object.cpp:494
-msgid "Evaluation error"
-msgstr "Gwall enrhifiad"
-
-#: kjs/object.cpp:495
-msgid "Range error"
-msgstr "Gwall amrediad"
-
-#: kjs/object.cpp:496
-msgid "Reference error"
-msgstr "Gwall cyfeirnod"
-
-#: kjs/object.cpp:497
-msgid "Syntax error"
-msgstr "Gwall cystrawen"
-
-#: kjs/object.cpp:498
-msgid "Type error"
-msgstr "Gwall math"
-
-#: kjs/object.cpp:499
-msgid "URI error"
-msgstr "Gwall URL"
-
-#: kjs/internal.cpp:135
-msgid "Undefined value"
-msgstr "Gwerth anniffiniedig"
-
-#: kjs/internal.cpp:166
-msgid "Null value"
-msgstr "Gwerth nwl"
-
-#: kjs/reference.cpp:96
-msgid "Invalid reference base"
-msgstr "Sail cyfeirnod annilys"
-
-#: kjs/reference.cpp:127
-msgid "Can't find variable: "
-msgstr "Methu canfod newidyn:"
-
-#: kjs/reference.cpp:134
-msgid "Base is not an object"
-msgstr "Nid yw'r sail yn wrthrych"
-
-#: kjs/function_object.cpp:290
-msgid "Syntax error in parameter list"
-msgstr "Gwall cystrawen yn y rhestr paramedrau"
-
-#: interfaces/tdetexteditor/editorchooser.cpp:60
-msgid "System Default (%1)"
-msgstr "Rhagosodiad Cysawd (%1)"
-
-#: interfaces/tdescript/scriptmanager.cpp:106
-msgid "Unable to get KScript Runner for type \"%1\"."
-msgstr "Methu cael Rhedydd KScript am fath \"%1\"."
-
-#: interfaces/tdescript/scriptmanager.cpp:106
-#: interfaces/tdescript/scriptmanager.cpp:129
-msgid "KScript Error"
-msgstr "Gwall KScript"
-
-#: interfaces/tdescript/scriptmanager.cpp:129
-msgid "Unable find script \"%1\"."
-msgstr "Methu canfod sgript \"%1\"."
-
-#: interfaces/tdescript/scriptloader.cpp:40
-msgid "TDE Scripts"
-msgstr "Sgriptiau TDE"
-
-#: arts/kde/kvideowidget.cpp:82
-msgid "Video Toolbar"
-msgstr "Bar Offer Fideo"
-
-#: arts/kde/kvideowidget.cpp:104
-msgid "Fullscreen &Mode"
-msgstr "&Modd Sgrîn Llawn"
-
-#: arts/kde/kvideowidget.cpp:107
-msgid "&Half Size"
-msgstr "&Hanner y Maint"
-
-#: arts/kde/kvideowidget.cpp:110
-msgid "&Normal Size"
-msgstr "M&aint Arferol"
-
-#: arts/kde/kvideowidget.cpp:113
-msgid "&Double Size"
-msgstr "&Dwywaith y Maint"
-
-#: tdeabc/addressbook.cpp:346 tdeabc/addressbook.cpp:365
-msgid "Unable to load resource '%1'"
-msgstr "Methu llwytho adnodd '%1'"
-
-#: tdeabc/key.cpp:127
-msgid "X509"
-msgstr "X509"
-
-#: tdeabc/key.cpp:130
-msgid "PGP"
-msgstr "PGP"
-
-#: kab/addressbook.cc:335 tdeabc/field.cpp:217 tdeabc/key.cpp:133
-#: tdeabc/scripts/field.src.cpp:110
-msgid "Custom"
-msgstr "Addasiedig"
-
-#: tdeabc/key.cpp:136 tdeabc/secrecy.cpp:80
-msgid "Unknown type"
-msgstr "Math anhysbys"
-
-#: tdeabc/field.cpp:192 tdeabc/scripts/field.src.cpp:85
-msgid "Unknown Field"
-msgstr "Maes Anhysbys"
-
-#: tdeabc/field.cpp:205 tdeabc/scripts/field.src.cpp:98
-msgid "All"
-msgstr "Cwbl"
-
-#: tdeabc/field.cpp:207 tdeabc/scripts/field.src.cpp:100
-msgid "Frequent"
-msgstr "Aml"
-
-#: kab/addressbook.cc:192 tdeabc/field.cpp:209 tdeabc/scripts/field.src.cpp:102
-msgid ""
-"_: street/postal\n"
-"Address"
+#: tdersync/rsyncconfigdialog.cpp:125
+msgid "Setting up synchronization for local folder"
 msgstr ""
 
-#: tdeabc/addresseedialog.cpp:71 tdeabc/addresseedialog.cpp:101
-#: tdeabc/distributionlistdialog.cpp:190 tdeabc/distributionlisteditor.cpp:143
-#: tdeabc/field.cpp:211 tdeabc/scripts/field.src.cpp:104 tdeui/tdeaboutdialog.cpp:91
-msgid "Email"
-msgstr "Ebost"
-
-#: tdeabc/field.cpp:213 tdeabc/scripts/field.src.cpp:106
-msgid "Personal"
-msgstr "Personol"
-
-#: kab/addressbook.cc:176 tdeabc/addressee.cpp:727 tdeabc/field.cpp:215
-#: tdeabc/scripts/field.src.cpp:108
-msgid "Organization"
-msgstr "Sefydliad"
-
-#: tdeabc/field.cpp:219 tdeabc/scripts/field.src.cpp:112
-msgid "Undefined"
-msgstr "Anniffiniedig"
-
-#: tdeabc/tdeab2tdeabc.cpp:42
-msgid "Disable automatic startup on login"
-msgstr "Analluogi cychwyn ymysgogol wrth fewngofnodi."
-
-#: tdeabc/tdeab2tdeabc.cpp:45
-msgid "Override existing entries"
-msgstr "Gwrthwneud cofnodion cyfredol"
-
-#: tdeabc/tdeab2tdeabc.cpp:287
-msgid ""
-"Address book file <b>%1</b> not found! Make sure the old address book is "
-"located there and you have read permission for this file."
+#: tdersync/rsyncconfigdialog.cpp:129
+msgid "Synchronization Method"
 msgstr ""
-"Ni chanfuwyd ffeil llyfr cyfeiriadau <b>%1</b>!  Sicrhewch fod yr hen lyfr "
-"cyfeiriadau mewn bod, a bod gennych caniatadau darllen ar gyfer y ffeil yma."
-
-#: tdeabc/tdeab2tdeabc.cpp:435
-msgid "Kab to Kabc Converter"
-msgstr "Trosiadydd Kab i Kabc"
-
-#: tdeabc/resource.cpp:332
-msgid "Loading resource '%1' failed!"
-msgstr "Methodd llwytho adnodd '%1'!"
-
-#: tdeabc/resource.cpp:343
-msgid "Saving resource '%1' failed!"
-msgstr "Methodd cadw adnodd '%1'!"
 
-#: tdeabc/resourceselectdialog.cpp:39 tderesources/selectdialog.cpp:42
-msgid "Resource Selection"
-msgstr "Dewis Adnoddau"
-
-#: tdeabc/resourceselectdialog.cpp:46 tderesources/configpage.cpp:107
-#: tderesources/selectdialog.cpp:49
-msgid "Resources"
-msgstr "Adnoddau"
-
-#: tdeabc/secrecy.cpp:71
-msgid "Public"
-msgstr "Cyhoeddus"
-
-#: kab/addressbook.cc:1950 tdeabc/secrecy.cpp:74
-msgid "Private"
-msgstr "Preivat"
-
-#: tdeabc/secrecy.cpp:77
-msgid "Confidential"
-msgstr "Cyfrinachol"
-
-#: tdeabc/errorhandler.cpp:42
-msgid "Error in libtdeabc"
-msgstr "Gwall yn libtdeabc"
-
-#: tdeabc/ldifconverter.cpp:475
-msgid "List of Emails"
-msgstr "Rhestr o Gyfeiriadau Ebost"
-
-#: tdeabc/locknull.cpp:60
-msgid "LockNull: All locks succeed but no actual locking is done."
-msgstr "LockNull: Mae pob clo yn llwyddo, ond nid yw cloi yn cael ei wneud."
-
-#: tdeabc/locknull.cpp:62
-msgid "LockNull: All locks fail."
-msgstr "LockNull: Mae pob clo yn methu."
-
-#: tdeabc/phonenumber.cpp:147
+#: tdersync/rsyncconfigdialog.cpp:134
 msgid ""
-"_: Preferred phone\n"
-"Preferred"
-msgstr "Hoffter"
-
-#: tdeabc/phonenumber.cpp:151
-msgid ""
-"_: Home phone\n"
-"Home"
-msgstr "Cartref"
-
-#: tdeabc/phonenumber.cpp:154
-msgid ""
-"_: Work phone\n"
-"Work"
-msgstr "Cartref"
-
-#: tdeabc/phonenumber.cpp:157
-msgid "Messenger"
-msgstr "Negesydd"
-
-#: tdeabc/phonenumber.cpp:160
-msgid "Preferred Number"
-msgstr "Rhif Dewisiedig"
-
-#: tdeabc/phonenumber.cpp:163
-msgid "Voice"
-msgstr "Llais"
-
-#: tdeabc/phonenumber.cpp:166
-msgid "Fax"
-msgstr "Ffacs"
-
-#: tdeabc/phonenumber.cpp:169
-msgid ""
-"_: Mobile Phone\n"
-"Mobile"
-msgstr "Ffôn Symudol"
-
-#: tdeabc/phonenumber.cpp:172
-msgid "Video"
-msgstr "Fideo"
-
-#: tdeabc/phonenumber.cpp:175
-msgid "Mailbox"
-msgstr "Bocs ebost"
-
-#: tdeabc/phonenumber.cpp:178
-msgid "Modem"
-msgstr "Modem"
-
-#: tdeabc/phonenumber.cpp:181
-msgid ""
-"_: Car Phone\n"
-"Car"
-msgstr "Ffôn Car"
-
-#: tdeabc/addressee.cpp:601 tdeabc/phonenumber.cpp:184
-msgid "ISDN"
-msgstr "ISDN"
-
-#: tdeabc/phonenumber.cpp:187
-msgid "PCS"
-msgstr "PCS"
-
-#: tdeabc/addressee.cpp:607 tdeabc/phonenumber.cpp:190
-msgid "Pager"
-msgstr "Blîp"
-
-#: tdeabc/addressee.cpp:583 tdeabc/phonenumber.cpp:193
-msgid "Home Fax"
-msgstr "Facs Cartref"
-
-#: tdeabc/phonenumber.cpp:196
-msgid "Work Fax"
-msgstr "Ffacs Gwaith"
-
-#: tdeabc/address.cpp:312 tdeabc/phonenumber.cpp:199 tdecore/kcharsets.cpp:43
-msgid "Other"
-msgstr "Eraill"
-
-#: tdeabc/distributionlistdialog.cpp:44
-msgid "Configure Distribution Lists"
-msgstr "Ffurfweddu Rhestrau Dosbarthu"
-
-#: tdeabc/distributionlistdialog.cpp:61 tdeabc/distributionlisteditor.cpp:43
-msgid "Select Email Address"
-msgstr "Dewiswch Gyfeiriad Ebost"
-
-#: kab/addressbook.cc:303 tdeabc/distributionlistdialog.cpp:69
-#: tdeabc/distributionlisteditor.cpp:49
-msgid "Email Addresses"
-msgstr "Cyfeiriadau Ebost"
-
-#: tdeabc/distributionlistdialog.cpp:152
-msgid "New List..."
-msgstr "Rhestr Newydd..."
-
-#: tdeabc/distributionlistdialog.cpp:156
-msgid "Rename List..."
-msgstr "Ail-enwi Rhestr..."
-
-#: tdeabc/distributionlistdialog.cpp:160 tdeabc/distributionlisteditor.cpp:137
-msgid "Remove List"
-msgstr "Diddymu Rhestr"
-
-#: tdeabc/distributionlistdialog.cpp:167
-msgid "Available addresses:"
-msgstr "Cyfeiriadau ar gael:"
-
-#: tdeabc/addressee.cpp:335 tdeabc/addresseedialog.cpp:70
-#: tdeabc/addresseedialog.cpp:100 tdeabc/distributionlistdialog.cpp:174
-#: tdeabc/distributionlistdialog.cpp:189 tdeabc/distributionlisteditor.cpp:142
-#: tdeabc/distributionlisteditor.cpp:161 knewstuff/downloaddialog.cpp:270
-#: knewstuff/downloaddialog.cpp:276 knewstuff/downloaddialog.cpp:282
-#: knewstuff/providerdialog.cpp:65 tderesources/configpage.cpp:119
-#: tdeutils/kpluginselector.cpp:200
-msgid "Name"
-msgstr "Enw"
-
-#: tdeabc/distributionlistdialog.cpp:175 tdeabc/distributionlisteditor.cpp:162
-msgid "Preferred Email"
-msgstr "Ebost Dewisedig"
-
-#: tdeabc/distributionlistdialog.cpp:183 tdeabc/distributionlisteditor.cpp:156
-msgid "Add Entry"
-msgstr "Ychwanegu Cofnod"
-
-#: tdeabc/distributionlistdialog.cpp:191 tdeabc/distributionlisteditor.cpp:144
-msgid "Use Preferred"
-msgstr "Defnyddio Dewisedig"
-
-#: tdeabc/distributionlistdialog.cpp:198
-msgid "Change Email..."
-msgstr "Newid Ebost..."
-
-#: tdeabc/distributionlistdialog.cpp:202 tdeabc/distributionlisteditor.cpp:152
-msgid "Remove Entry"
-msgstr "Diddymu Cofnod"
-
-#: tdeabc/distributionlistdialog.cpp:237 tdeabc/distributionlisteditor.cpp:196
-msgid "New Distribution List"
-msgstr "Rhestr Dosbarthiad Newydd"
-
-#: tdeabc/distributionlistdialog.cpp:238
-msgid "Please enter &name:"
-msgstr "Mewnosodwch &enw:"
-
-#: tdeabc/distributionlistdialog.cpp:255
-msgid "Distribution List"
-msgstr "Rhestr Dosbarthu"
-
-#: tdeabc/distributionlistdialog.cpp:256
-msgid "Please change &name:"
-msgstr "Newidiwch &enw:"
-
-#: tdeabc/distributionlistdialog.cpp:273
-msgid "Delete distribution list '%1'?"
-msgstr "Dileu rhestr dosbarthu '%1'?"
-
-#: tdeabc/distributionlistdialog.cpp:339
-msgid "Selected addressees:"
-msgstr "Derbynyddion dewisedig"
-
-#: tdeabc/distributionlistdialog.cpp:341
-msgid "Selected addresses in '%1':"
-msgstr "Derbynyddion dewisedig yn '%1':"
-
-#: tdeabc/addresseehelper.cpp:67
-msgid "Dr."
-msgstr "Dr."
-
-#: tdeabc/addresseehelper.cpp:68
-msgid "Miss"
-msgstr "Miss"
-
-#: tdeabc/addresseehelper.cpp:69
-msgid "Mr."
-msgstr "Mr."
-
-#: tdeabc/addresseehelper.cpp:70
-msgid "Mrs."
-msgstr "Mrs."
-
-#: tdeabc/addresseehelper.cpp:71
-msgid "Ms."
-msgstr "Ms."
-
-#: tdeabc/addresseehelper.cpp:72
-msgid "Prof."
-msgstr "Yr Athro"
-
-#: tdeabc/addresseehelper.cpp:74
-msgid "I"
-msgstr "I"
-
-#: tdeabc/addresseehelper.cpp:75
-msgid "II"
-msgstr "II"
-
-#: tdeabc/addresseehelper.cpp:76
-msgid "III"
-msgstr "III"
-
-#: tdeabc/addresseehelper.cpp:77
-msgid "Jr."
-msgstr "Jr."
-
-#: tdeabc/addresseehelper.cpp:78
-msgid "Sr."
-msgstr "Sr."
-
-#: tdeabc/ldapconfigwidget.cpp:83
-msgid "User:"
-msgstr "Defnyddiwr:"
-
-#: tdeabc/ldapconfigwidget.cpp:92
-msgid "Bind DN:"
-msgstr "DN Rhwymo:"
-
-#: tdeabc/ldapconfigwidget.cpp:101
-msgid "Realm:"
-msgstr "Bro:"
-
-#: tdeabc/ldapconfigwidget.cpp:110
-msgid "Password:"
-msgstr "Cyfrinair:"
-
-#: tdeabc/ldapconfigwidget.cpp:120
-msgid "Host:"
-msgstr "Gwesteiwr:"
-
-#: tdeabc/ldapconfigwidget.cpp:130
-msgid "Port:"
-msgstr "Porth:"
-
-#: tdeabc/ldapconfigwidget.cpp:141
-msgid "LDAP version:"
-msgstr "Fersiwn LDAP:"
-
-#: tdeabc/ldapconfigwidget.cpp:152
-msgid "Size limit:"
-msgstr "Terfyn maint:"
-
-#: tdeabc/ldapconfigwidget.cpp:163
-msgid "Time limit:"
-msgstr "Terfyn amser:"
-
-#: tdeabc/ldapconfigwidget.cpp:167
-msgid " sec"
-msgstr "sec"
-
-#: tdeabc/ldapconfigwidget.cpp:175
-msgid ""
-"_: Distinguished Name\n"
-"DN:"
-msgstr "DN:"
-
-#: tdeabc/ldapconfigwidget.cpp:182 tdeabc/ldapconfigwidget.cpp:231
-msgid "Query Server"
-msgstr "Gweinydd Ymholiad"
-
-#: tdeabc/ldapconfigwidget.cpp:190
-msgid "Filter:"
-msgstr "Hidl:"
-
-#: tdeabc/ldapconfigwidget.cpp:199
-msgid "Security"
-msgstr "Diogelwch"
-
-#: tdeabc/ldapconfigwidget.cpp:201
-msgid "TLS"
-msgstr "TLS"
-
-#: tdeabc/ldapconfigwidget.cpp:202
-msgid "SSL"
-msgstr "SSL"
-
-#: tdeabc/ldapconfigwidget.cpp:216
-msgid "Authentication"
-msgstr "Dilysiant"
-
-#: tdeabc/ldapconfigwidget.cpp:218
-msgid "Anonymous"
-msgstr "Dienw"
-
-#: tdeabc/ldapconfigwidget.cpp:219
-msgid "Simple"
-msgstr "Syml"
-
-#: tdeabc/ldapconfigwidget.cpp:220
-msgid "SASL"
-msgstr "SASL"
-
-#: tdeabc/ldapconfigwidget.cpp:222
-msgid "SASL mechanism:"
-msgstr "Peirianwaith SASL:"
-
-#: tdeabc/ldapconfigwidget.cpp:302
-msgid "LDAP Query"
-msgstr "Ymholiad LDAP"
-
-#: tdeabc/address.cpp:145
-msgid "Post Office Box"
-msgstr "Bocs Swyddfa Post"
-
-#: tdeabc/address.cpp:163
-msgid "Extended Address Information"
-msgstr "Gwybodaeth Cyfeiriad Estynedig"
-
-#: tdeabc/address.cpp:181
-msgid "Street"
-msgstr "Stryd"
-
-#: tdeabc/address.cpp:199
-msgid "Locality"
-msgstr "Lleoliad"
-
-#: tdeabc/address.cpp:217 tdeui/ktimezonewidget.cpp:46
-msgid "Region"
-msgstr "Ardal"
-
-#: tdeabc/address.cpp:235
-msgid "Postal Code"
-msgstr "Côd Post"
-
-#: kab/addressbook.cc:204 tdeabc/address.cpp:253
-msgid "Country"
-msgstr "Gwlad"
-
-#: kab/addressbook.cc:188 tdeabc/address.cpp:271
-msgid "Delivery Label"
-msgstr "Label Derbyn"
-
-#: tdeabc/address.cpp:287
-msgid ""
-"_: Preferred address\n"
-"Preferred"
-msgstr "Hoffter"
-
-#: tdeabc/address.cpp:291
-msgid "Domestic"
-msgstr "Mewnol"
-
-#: tdeabc/address.cpp:294
-msgid "International"
-msgstr "Rhyngwladol"
-
-#: tdeabc/address.cpp:297
-msgid "Postal"
-msgstr "Post"
-
-#: tdeabc/address.cpp:300
-msgid "Parcel"
-msgstr "Parsel"
-
-#: tdeabc/address.cpp:303
-msgid ""
-"_: Home Address\n"
-"Home"
-msgstr " Cyfeiriad Cartref"
-
-#: tdeabc/address.cpp:306
-msgid ""
-"_: Work Address\n"
-"Work"
-msgstr "Cyfeiriad Gwaith"
-
-#: tdeabc/address.cpp:309
-msgid "Preferred Address"
-msgstr "Cyfeiriad Dewisiedig"
-
-#: tdeabc/lock.cpp:93
-msgid "Unable to open lock file."
-msgstr "Methu agor ffeil glo."
-
-#: tdeabc/lock.cpp:106
-msgid ""
-"The address book '%1' is locked by application '%2'.\n"
-"If you believe this is incorrect, just remove the lock file from '%3'"
+"&Utilize rsync + ssh for upload to remote server\n"
+"Example: servername:/path/to/remote/folder"
 msgstr ""
 
-#: tdeabc/lock.cpp:146
-msgid "Unlock failed. Lock file is owned by other process: %1 (%2)"
-msgstr "Methodd y dadgloi.  Mae'r ffeil glo yn biau i broses arall: %1 (%2)"
-
-#: tdeabc/stdaddressbook.cpp:148
-msgid "Unable to save to resource '%1'. It is locked."
-msgstr "Methu cadw i adnodd %1.  Mae o wedi'i gloi."
-
-#: tdeabc/addresseedialog.cpp:60
-msgid "Select Addressee"
-msgstr "Dewiswch Derbynnydd"
-
-#: tdeabc/addresseedialog.cpp:95
-msgid "Selected"
-msgstr "Dewisedig"
-
-#: tdeabc/addresseedialog.cpp:107
-msgid "Unselect"
-msgstr "Dad-ddewis"
-
-#: tdeabc/distributionlisteditor.cpp:133
-msgid "New List"
-msgstr "Rhestr Newydd"
-
-#: tdeabc/distributionlisteditor.cpp:148
-msgid "Change Email"
-msgstr "Newid Ebost"
-
-#: tdeabc/distributionlisteditor.cpp:197
-msgid "Please enter name:"
-msgstr "Mewnbynnwch enw:"
-
-#: tdeabc/formatfactory.cpp:55 tdeabc/formatfactory.cpp:119
-msgid "vCard"
-msgstr "vCerdyn"
-
-#: tdeabc/formatfactory.cpp:56 tdeabc/formatfactory.cpp:120
-msgid "vCard Format"
-msgstr "Fformat vCerdyn"
-
-#: tdeabc/formatfactory.cpp:75
-msgid "No description available."
-msgstr "Dim disgrifiad ar gael"
-
-#: tdeabc/addressee.cpp:317 tdeabc/scripts/addressee.src.cpp:180
-msgid "Unique Identifier"
-msgstr "Dynodwr Unigryw"
-
-#: kab/addressbook.cc:271 tdeabc/addressee.cpp:354
-msgid "Formatted Name"
-msgstr "Enw Fformatedig"
-
-#: tdeabc/addressee.cpp:373
-msgid "Family Name"
-msgstr "Enw Teuluol"
-
-#: tdeabc/addressee.cpp:392
-msgid "Given Name"
-msgstr "Enw Gwreiddiol"
-
-#: tdeabc/addressee.cpp:411
-msgid "Additional Names"
-msgstr "Enwau Ychwanegol"
-
-#: tdeabc/addressee.cpp:430
-msgid "Honorific Prefixes"
-msgstr "Rhagddodiaid Anrhydedd"
-
-#: tdeabc/addressee.cpp:449
-msgid "Honorific Suffixes"
-msgstr "Ôlddodiaid Anrhydedd"
-
-#: tdeabc/addressee.cpp:468
-msgid "Nick Name"
-msgstr "Llysenw"
-
-#: kab/addressbook.cc:291 tdeabc/addressee.cpp:487
-msgid "Birthday"
-msgstr "Penblwydd"
-
-#: tdeabc/addressee.cpp:493
-msgid "Home Address Street"
-msgstr "Stryd Cyfeiriad Cartref"
-
-#: tdeabc/addressee.cpp:499
-msgid "Home Address City"
-msgstr "Dinas Gyfeiriad Cartref"
-
-#: tdeabc/addressee.cpp:505
-msgid "Home Address State"
-msgstr "Talaith Gyfeiriad Cartref"
-
-#: tdeabc/addressee.cpp:511
-msgid "Home Address Zip Code"
-msgstr "Côd Post Cyfeiriad Cartref"
-
-#: tdeabc/addressee.cpp:517
-msgid "Home Address Country"
-msgstr "Gwlad Cyfeiriad Cartref"
-
-#: tdeabc/addressee.cpp:523
-msgid "Home Address Label"
-msgstr "Label Cyfeiriad Cartref"
-
-#: tdeabc/addressee.cpp:529
-msgid "Business Address Street"
-msgstr "Stryd Cyfeiriad Busnes"
-
-#: tdeabc/addressee.cpp:535
-msgid "Business Address City"
-msgstr "Dinas Gyfeiriad Busnes"
-
-#: tdeabc/addressee.cpp:541
-msgid "Business Address State"
-msgstr "Talaith Gyfeiriad Busnes"
-
-#: tdeabc/addressee.cpp:547
-msgid "Business Address Zip Code"
-msgstr "Côd Post Cyfeiriad Busnes"
-
-#: tdeabc/addressee.cpp:553
-msgid "Business Address Country"
-msgstr "Gwlad Cyfeiriad Busnes"
-
-#: tdeabc/addressee.cpp:559
-msgid "Business Address Label"
-msgstr "Label Cyfeiriad Busnes"
-
-#: tdeabc/addressee.cpp:565
-msgid "Home Phone"
-msgstr "Ffôn Cartref"
-
-#: tdeabc/addressee.cpp:571
-msgid "Business Phone"
-msgstr "Ffôn Busnes"
-
-#: tdeabc/addressee.cpp:577
-msgid "Mobile Phone"
-msgstr "Ffôn Symudol"
-
-#: tdeabc/addressee.cpp:589
-msgid "Business Fax"
-msgstr "Facs Busnes"
-
-#: tdeabc/addressee.cpp:595
-msgid "Car Phone"
-msgstr "Ffôn Car"
-
-#: tdeabc/addressee.cpp:613
-msgid "Email Address"
-msgstr "Cyfeiriad Ebost"
-
-#: tdeabc/addressee.cpp:632
-msgid "Mail Client"
-msgstr "Cleient Ebost"
-
-#: tdeabc/addressee.cpp:651
-msgid "Time Zone"
-msgstr "Cylchfa Amser"
-
-#: tdeabc/addressee.cpp:670
-msgid "Geographic Position"
-msgstr "Safle Daearyddol"
-
-#: kab/addressbook.cc:263 tdeabc/addressee.cpp:689
-#, fuzzy
+#: tdersync/rsyncconfigdialog.cpp:135
 msgid ""
-"_: person\n"
-"Title"
-msgstr "Tamil"
-
-#: tdeabc/addressee.cpp:708
-msgid ""
-"_: person in organization\n"
-"Role"
+"&Utilize rsync + ssh for download from remote server\n"
+"Example: servername:/path/to/remote/folder"
 msgstr ""
 
-#: kab/addressbook.cc:180 tdeabc/addressee.cpp:746
-msgid "Department"
-msgstr "Adran"
-
-#: tdeabc/addressee.cpp:765
-msgid "Note"
-msgstr "Nodyn"
-
-#: tdeabc/addressee.cpp:784
-msgid "Product Identifier"
-msgstr "Dynodwr Cynnyrch"
-
-#: tdeabc/addressee.cpp:803
-msgid "Revision Date"
-msgstr "Dyddiad Addasiad"
-
-#: tdeabc/addressee.cpp:822
-msgid "Sort String"
-msgstr "Llinyn Trefnu"
-
-#: tdeabc/addressee.cpp:841 tdeui/tdeaboutdialog.cpp:92
-msgid "Homepage"
-msgstr "Tudalen gartref"
-
-#: tdeabc/addressee.cpp:860
-msgid "Security Class"
-msgstr "Dosbarth Diogelwch"
-
-#: tdeabc/addressee.cpp:879
-msgid "Logo"
-msgstr "Logo"
-
-#: tdeabc/addressee.cpp:898
-msgid "Photo"
-msgstr "Ffoto"
-
-#: tdeabc/addressee.cpp:917
-msgid "Sound"
-msgstr "Sŵn"
-
-#: tdeabc/addressee.cpp:936
-msgid "Agent"
-msgstr "Asiant"
-
-#: tdeabc/vcard/testwrite.cpp:11
-msgid "TestWritevCard"
-msgstr "YsgrifennuPrawfvCerdyn"
-
-#: tdeabc/vcardparser/testread.cpp:38
-msgid "vCard 2.1"
-msgstr " vCerdyn 2.1"
-
-#: tdeabc/vcardparser/testread.cpp:39 tdewidgets/maketdewidgets.cpp:112
-msgid "Input file"
-msgstr "Ffeil fewnbwn"
-
-#: kded/tde-menu.cpp:36
-msgid "Output data in UTF-8 instead of local encoding"
-msgstr "Allbynnu'r data mewn UTF-8 yn lle amgodiad lleol"
-
-#: kded/tde-menu.cpp:37
+#: tdersync/rsyncconfigdialog.cpp:136
 msgid ""
-"Print menu-id of the menu that contains\n"
-"the application"
+"&Utilize unison + ssh for bidirectional synchronization with remote server\n"
+"Example: ssh://servername//path/to/remote/folder"
 msgstr ""
-"Argraffu y dynodiad dewislen o'r ddewislen sy'n cynnwys\n"
-"y cymhwysiad"
 
-#: kded/tde-menu.cpp:38
-msgid ""
-"Print menu name (caption) of the menu that\n"
-"contains the application"
+#: tdersync/rsyncconfigdialog.cpp:149
+msgid "Remote Folder"
 msgstr ""
-"Argraffu yr enw (egluryn) o'r ddewislen\n"
-" sy'n cynnwys y cymhwysiad"
-
-#: kded/tde-menu.cpp:39
-msgid "Highlight the entry in the menu"
-msgstr "Amlygu'r gofnod yn y ddewislen"
-
-#: kded/tde-menu.cpp:40
-msgid "Do not check if sycoca database is up to date"
-msgstr "Peidio â gwirio a yw'r cronfa ddata sycoca yn ddiweddar"
 
-#: kded/tde-menu.cpp:41
-msgid "The id of the menu entry to locate"
-msgstr "Y dynodiad o'r gofnod ddewislen i'w chanfod"
+#: tdersync/rsyncconfigdialog.cpp:159
+#, fuzzy
+msgid "Automatic Synchronization"
+msgstr "Datganiad Awtomatig"
 
-#: kded/tde-menu.cpp:99
-msgid "Menu item '%1' could not be highlighted."
-msgstr "Ni ellid amlygu'r eitem dewislen '%1'."
+#: tdersync/rsyncconfigdialog.cpp:164
+msgid "Synchronize on logout"
+msgstr ""
 
-#: kded/tde-menu.cpp:111
-msgid ""
-"TDE Menu query tool.\n"
-"This tool can be used to find in which menu a specific application is shown.\n"
-"The --highlight option can be used to visually indicate to the user where\n"
-"in the TDE menu a specific application is located."
+#: tdersync/tdersync.cpp:468 tdersync/tdersync.cpp:516
+#: tdersync/tdersync.cpp:583 tdersync/tdersync.cpp:592
+#: tdersync/tdersync.cpp:645 tdersync/tdersync.cpp:658
+#: tdersync/tdersync.cpp:966
+msgid "Remote Folder Synchronization"
 msgstr ""
-"Erfyn holi Dewislen TDE.\n"
-"Gellir defnyddio'r erfyn yma i ganfod ym mha ddewislen ymddengys cymhwysiad "
-"penodol.\n"
-"Gellir defnyddio'r dewisiad --highlight i ddangos yn weledol i'r defnyddiwr lle "
-"\n"
-"yn y ddewislen TDE a ellir canfod cymhwysiad penodol."
 
-#: kded/tde-menu.cpp:116
-msgid "tde-menu"
-msgstr "tde-menu"
+#: tdersync/tdersync.cpp:475 tdersync/tdersync.cpp:599
+msgid "Synchronizing Folder..."
+msgstr ""
 
-#: kded/tdebuildsycoca.cpp:724 kded/tdebuildsycoca.cpp:725 kded/tde-menu.cpp:119
-#: kded/khostname.cpp:362 tdeui/tdeaboutdialog.cpp:90
-msgid "Author"
-msgstr "Awdur"
+#: tdersync/tdersync.cpp:501 tdersync/tdersync.cpp:624
+#, fuzzy
+msgid "Remote authorization required"
+msgstr "Angen Cadarnhad"
 
-#: kded/tde-menu.cpp:133
-msgid "You must specify an application-id such as 'tde-konsole.desktop'"
-msgstr "Rhaid i chi benodi dynodiad cymhwysiad fel 'tde-konsole.desktop'"
+#: tdersync/tdersync.cpp:501 tdersync/tdersync.cpp:624
+#, fuzzy
+msgid "Please input"
+msgstr "Clirio'r mewnbwn"
 
-#: kded/tde-menu.cpp:142
-msgid ""
-"You must specify at least one of --print-menu-id, --print-menu-name or "
-"--highlight"
+#: tdersync/tdersync.cpp:587
+msgid "An error ocurred on the remote system"
 msgstr ""
-"Rhaid i chi benodi o leiaf un o --print-menu-id, --print-menu-name or "
-"--highlight"
-
-#: kded/tde-menu.cpp:164
-msgid "No menu item '%1'."
-msgstr "Dim eitem dewislen '%1'."
-
-#: kded/tde-menu.cpp:168
-msgid "Menu item '%1' not found in menu."
-msgstr "Ni chanfuwyd eitem dewislen '%1' yn y ddewislen."
 
-#: kded/khostname.cpp:41
-msgid "Old hostname"
-msgstr "Hen enw'r gwesteiwr"
+#: tdersync/tdersync.cpp:687
+#, fuzzy
+msgid "User Intervention Required"
+msgstr "Angen Cadarnhad"
 
-#: kded/khostname.cpp:42
-msgid "New hostname"
-msgstr "Enw newydd y gwesteiwr"
+#: tdersync/tdersync.cpp:687
+#, fuzzy
+msgid "Use &Local File"
+msgstr "Agor Ffeil"
 
-#: kded/khostname.cpp:79
-msgid ""
-"Error: HOME environment variable not set.\n"
+#: tdersync/tdersync.cpp:687
+msgid "Use &Remote File"
 msgstr ""
-"Gwall: nid yw'r newidyn amgylchedd CARTREF wedi'i osod.\n"
 
-#: kded/khostname.cpp:88
-msgid ""
-"Error: DISPLAY environment variable not set.\n"
+#: tdersync/tdersync.cpp:694
+msgid "WARNING: Both the local and remote file have been modified"
 msgstr ""
-"Gwall: nid yw'r newidyn amgylchedd ARDDANGOS wedi'i osod.\n"
 
-#: kded/khostname.cpp:359
-msgid "KDontChangeTheHostName"
-msgstr "KDontChangeTheHostName"
-
-#: kded/khostname.cpp:360
-msgid "Informs TDE about a change in hostname"
-msgstr "Hysbysu TDE ynglyn â newid enw'r gwesteiwr"
-
-#: kded/kded.cpp:720
-msgid "Check Sycoca database only once"
-msgstr "Gwirio cronfa ddata Sycoca unwaith yn unig"
-
-#: kded/kded.cpp:860
-msgid "TDE Daemon"
-msgstr "Ellyll TDE"
+#: tdersync/tdersync.cpp:694
+#, fuzzy
+msgid "Local"
+msgstr "Lleoliad"
 
-#: kded/kded.cpp:862
-msgid "TDE Daemon - triggers Sycoca database updates when needed"
-msgstr "Ellyll TDE - yn diweddaru cronfa ddata Sycoca pan bo angen"
+#: tdersync/tdersync.cpp:694
+#, fuzzy
+msgid "Remote"
+msgstr "Tynnu ymaith"
 
-#: kded/tdebuildsycoca.cpp:483
-msgid ""
-"Error creating database '%1'.\n"
-"Check that the permissions are correct on the directory and the disk is not "
-"full.\n"
+#: tdersync/tdersync.cpp:694
+msgid "Please select the file to duplicate (the other will be overwritten)"
 msgstr ""
-"Gwall wrth greu cronfa ddata '%1'.\n"
-"Gwiriwch fod y caniatadau yn gywir ar y cyfeiriadur, a nad yw'r ddisg yn "
-"llawn.\n"
-
-#: kded/tdebuildsycoca.cpp:483 kded/tdebuildsycoca.cpp:512
-#: kded/tdebuildsycoca.cpp:721
-msgid "KBuildSycoca"
-msgstr "KBuildSycoca"
 
-#: kded/tdebuildsycoca.cpp:512
-msgid ""
-"Error writing database '%1'.\n"
-"Check that the permissions are correct on the directory and the disk is not "
-"full.\n"
+#: tdersync/tdersync.cpp:694
+msgid "Or, select Ignore to skip synchronization of this file for now"
 msgstr ""
-"Gwall wrth ysgrifennu cronfa ddata '%1'.\n"
-"Gwiriwch fod y caniatadau yn gywir ar y cyfeiriadur, a nad yw'r ddisg yn "
-"llawn.\n"
-
-#: kded/tdebuildsycoca.cpp:695
-msgid "Do not signal applications to update"
-msgstr "Peidio â nodi cymwysiadau i'w diweddaru"
-
-#: kded/tdebuildsycoca.cpp:696
-msgid "Disable incremental update, re-read everything"
-msgstr "Analluogi diweddariad cynnyddol, ail-ddarllen popeth"
 
-#: kded/tdebuildsycoca.cpp:697
-msgid "Check file timestamps"
-msgstr "Gwirio stampiau amser ffeil"
-
-#: kded/tdebuildsycoca.cpp:698
-msgid "Disable checking files (dangerous)"
-msgstr "Analluogi gwirio ffeiliau (peryglus)"
-
-#: kded/tdebuildsycoca.cpp:699
-msgid "Create global database"
-msgstr "Creu cronfa ddata eang"
-
-#: kded/tdebuildsycoca.cpp:700
-msgid "Perform menu generation test run only"
-msgstr "Gweithredu arbrofiad yn unig o'r cread dewislen"
-
-#: kded/tdebuildsycoca.cpp:701
-msgid "Track menu id for debug purposes"
-msgstr "Dilyn dynodiad dewislen i pwrpas dadnamu"
-
-#: kded/tdebuildsycoca.cpp:703
-msgid "Silent - work without windows and stderr"
-msgstr "Distaw - gweithio heb ffenestri a stderr"
-
-#: kded/tdebuildsycoca.cpp:704
-msgid "Show progress information (even if 'silent' mode is on)"
-msgstr "Dangos gwybodaeth gynnydd (hyd yn oed os dewisir modd 'distaw') "
-
-#: kded/tdebuildsycoca.cpp:722
-msgid "Rebuilds the system configuration cache."
-msgstr "Ail-adeiladu celc ffurfweddiad y cysawd."
-
-#: kded/tdebuildsycoca.cpp:750
-msgid "Reloading TDE configuration, please wait..."
-msgstr "Ail-lwytho ffurfweddiad TDE, arhoswch ..."
-
-#: kded/tdebuildsycoca.cpp:751
-msgid "TDE Configuration Manager"
-msgstr "Rheolydd Ffurfweddu TDE"
-
-#: kded/tdebuildsycoca.cpp:753
-msgid "Do you want to reload TDE configuration?"
-msgstr "Ydych eisiau ail-lwytho ffurfweddiad TDE?"
-
-#: kded/tdebuildsycoca.cpp:753
-#, fuzzy
-msgid "Do Not Reload"
-msgstr "&Peidiwch â Chadw"
-
-#: kded/tdebuildsycoca.cpp:953
-msgid "Configuration information reloaded successfully."
-msgstr "Wedi ail-lwytho'r ffurfweddiad yn llwyddiannus."
+#: tdersync/tdersync.cpp:966
+msgid "Configuring Remote Folder Synchronization"
+msgstr ""
 
-#: tdemdi/tdemdi/guiclient.cpp:79 tdemdi/tdemdiguiclient.cpp:139
-msgid "Tool &Views"
-msgstr "Golygfeydd &Offer"
+#: tdecore/kcalendarsystemhebrew.cpp:402
+msgid "Tishrey"
+msgstr " Tishrey"
 
-#: tdemdi/tdemdiguiclient.cpp:142
-msgid "MDI Mode"
-msgstr "Modd MDI"
+#: tdecore/kcalendarsystemhebrew.cpp:404
+msgid "Heshvan"
+msgstr "Heshvan"
 
-#: tdemdi/tdemdiguiclient.cpp:144 tdemdi/tdemdimainfrm.cpp:2594
-msgid "&Toplevel Mode"
-msgstr "&Modd Gwastad Uchaf"
+#: tdecore/kcalendarsystemhebrew.cpp:406
+msgid "Kislev"
+msgstr "Kislev"
 
-#: tdemdi/tdemdiguiclient.cpp:144 tdemdi/tdemdimainfrm.cpp:2595
-msgid "C&hildframe Mode"
-msgstr "Modd Ffrâm &Plentyn"
+#: tdecore/kcalendarsystemhebrew.cpp:408
+msgid "Tevet"
+msgstr "Tevet"
 
-#: tdemdi/tdemdiguiclient.cpp:144 tdemdi/tdemdimainfrm.cpp:2596
-msgid "Ta&b Page Mode"
-msgstr "Modd Tudalen Ta&b"
+#: tdecore/kcalendarsystemhebrew.cpp:410
+msgid "Shvat"
+msgstr "Shvat"
 
-#: tdemdi/tdemdiguiclient.cpp:144 tdemdi/tdemdimainfrm.cpp:2597
-msgid "I&DEAl Mode"
-msgstr "Modd I&DEAI"
+#: tdecore/kcalendarsystemhebrew.cpp:412
+msgid "Adar"
+msgstr "Adar"
 
-#: tdemdi/tdemdi/guiclient.cpp:81 tdemdi/tdemdiguiclient.cpp:154
-msgid "Tool &Docks"
-msgstr "Dociau &Offer"
+#: tdecore/kcalendarsystemhebrew.cpp:414
+msgid "Nisan"
+msgstr "Nisan"
 
-#: tdemdi/tdemdi/guiclient.cpp:82 tdemdi/tdemdiguiclient.cpp:155
-msgid "Switch Top Dock"
-msgstr "Newid y Doc wrth y Pen"
+#: tdecore/kcalendarsystemhebrew.cpp:416
+msgid "Iyar"
+msgstr "Iyar"
 
-#: tdemdi/tdemdi/guiclient.cpp:84 tdemdi/tdemdiguiclient.cpp:157
-msgid "Switch Left Dock"
-msgstr "Newid y Doc ar y Chwith"
+#: tdecore/kcalendarsystemhebrew.cpp:418
+msgid "Sivan"
+msgstr "Sivan"
 
-#: tdemdi/tdemdi/guiclient.cpp:86 tdemdi/tdemdiguiclient.cpp:159
-msgid "Switch Right Dock"
-msgstr "Newid y Doc ar y Dde"
+#: tdecore/kcalendarsystemhebrew.cpp:420
+msgid "Tamuz"
+msgstr "Tamuz"
 
-#: tdemdi/tdemdi/guiclient.cpp:88 tdemdi/tdemdiguiclient.cpp:161
-msgid "Switch Bottom Dock"
-msgstr "Newid y Doc wrth y Gwaelod"
+#: tdecore/kcalendarsystemhebrew.cpp:422
+msgid "Av"
+msgstr "Av"
 
-#: tdemdi/tdemdi/guiclient.cpp:91 tdemdi/tdemdiguiclient.cpp:164
-msgid "Previous Tool View"
-msgstr "Golwg Offer Cynt"
+#: tdecore/kcalendarsystemhebrew.cpp:424
+msgid "Elul"
+msgstr "Elul"
 
-#: tdemdi/tdemdi/guiclient.cpp:93 tdemdi/tdemdiguiclient.cpp:166
-msgid "Next Tool View"
-msgstr "Golwg Offer Nesaf"
+#: tdecore/kcalendarsystemhebrew.cpp:426
+msgid "Adar I"
+msgstr "Adar I"
 
-#: tdeui/kdockwidget.cpp:2945 tdemdi/tdemdi/guiclient.cpp:148
-#: tdemdi/tdemdiguiclient.cpp:260
-#, c-format
-msgid "Show %1"
-msgstr "Dangos %1"
+#: tdecore/kcalendarsystemhebrew.cpp:428
+msgid "Adar II"
+msgstr "Adar II"
 
-#: tdeui/kdockwidget.cpp:2939 tdemdi/tdemdi/guiclient.cpp:152
-#: tdemdi/tdemdiguiclient.cpp:265
+#: tdecore/twinmodule.cpp:458
 #, c-format
-msgid "Hide %1"
-msgstr "Cuddio %1"
-
-#: tdemdi/tdemdimainfrm.cpp:979
-msgid "Window"
-msgstr "Ffenest"
-
-#: tdemdi/tdemdimainfrm.cpp:992
-msgid "Undock"
-msgstr "Dad-ddocio"
-
-#: tdemdi/tdemdimainfrm.cpp:1002
-msgid "Dock"
-msgstr "Docio"
-
-#: tdemdi/tdemdimainfrm.cpp:1007
-msgid "Operations"
-msgstr "Gweithrediadau"
-
-#: tdemdi/tdemdimainfrm.cpp:2577
-msgid "Close &All"
-msgstr "Cau'r &Cwbl"
-
-#: tdemdi/tdemdimainfrm.cpp:2586
-msgid "&Minimize All"
-msgstr "Llei&hau'r Cwbl"
-
-#: tdemdi/tdemdimainfrm.cpp:2592
-msgid "&MDI Mode"
-msgstr "&Modd MDI"
-
-#: tdemdi/tdemdimainfrm.cpp:2619
-msgid "&Tile"
-msgstr "&Teilio"
-
-#: tdemdi/tdemdimainfrm.cpp:2621
-msgid "Ca&scade Windows"
-msgstr "Rhae&adru Ffenestri"
-
-#: tdemdi/tdemdimainfrm.cpp:2622
-msgid "Cascade &Maximized"
-msgstr "Rhaeadru wedi'u &Ehangu"
-
-#: tdemdi/tdemdimainfrm.cpp:2623
-msgid "Expand &Vertically"
-msgstr "Ehangu'n &Fertigol"
-
-#: tdemdi/tdemdimainfrm.cpp:2624
-msgid "Expand &Horizontally"
-msgstr "Ehangu'n &Llorweddol"
-
-#: tdemdi/tdemdimainfrm.cpp:2625
-msgid "Tile &Non-Overlapped"
-msgstr "Teilio wedi'u &Di-orgyffwrdd"
-
-#: tdemdi/tdemdimainfrm.cpp:2626
-msgid "Tile Overla&pped"
-msgstr "Teilio wedi'u &Gorgyffwrdd"
-
-#: tdemdi/tdemdimainfrm.cpp:2627
-msgid "Tile V&ertically"
-msgstr "Teilio'n Fe&rtigol"
-
-#: tdemdi/tdemdimainfrm.cpp:2633
-msgid "&Dock/Undock"
-msgstr "&Docio/Dad-ddocio"
-
-#: tdemdi/tdemdichildfrmcaption.cpp:71 tdemdi/tdemdichildview.cpp:63
-#: tdemdi/tdemdichildview.cpp:89
-msgid "Unnamed"
-msgstr "Di-enw"
-
-#: tdemdi/tdemdichildfrm.cpp:1239
-msgid "R&esize"
-msgstr "Ne&wid Maint"
-
-#: tdemdi/tdemdichildfrm.cpp:1240
-msgid "M&inimize"
-msgstr "Lle&ihau"
-
-#: tdemdi/tdemdichildfrm.cpp:1241
-msgid "M&aximize"
-msgstr "Ch&wyddo"
-
-#: tdemdi/tdemdichildfrm.cpp:1261
-msgid "&Maximize"
-msgstr "&Chwyddo"
-
-#: tdeui/ksystemtray.cpp:155 tdemdi/tdemdichildfrm.cpp:1263
-msgid "&Minimize"
-msgstr "Llei&hau"
-
-#: tdemdi/tdemdichildfrm.cpp:1265
-msgid "M&ove"
-msgstr "&Symud"
-
-#: tdemdi/tdemdichildfrm.cpp:1267
-msgid "&Resize"
-msgstr "Newid &Maint"
-
-#: tdemdi/tdemdichildfrm.cpp:1270
-msgid "&Undock"
-msgstr "&Dad-ddocio"
-
-#: tdemdi/tdemdi/dockcontainer.cpp:196 tdemdi/tdemdidockcontainer.cpp:218
-msgid ""
-"_: Switch between overlap and side by side mode\n"
-"Overlap"
-msgstr "Gorgyffwrdd"
-
-#: tdecore/klibloader.cpp:157
-msgid "The library %1 does not offer an %2 function."
-msgstr "Nid y'w rhaglengell %1 yn cynnig swyddogaeth %2."
-
-#: tdecore/klibloader.cpp:168
-msgid "The library %1 does not offer a TDE compatible factory."
-msgstr "Nid yw'r rhaglengell %1 yn cynnig ffatri sy'n cyfaddas i TDE."
-
-#: tdecore/klibloader.cpp:425
-msgid "Library files for \"%1\" not found in paths."
-msgstr "Ni chanfuwyd ffeiliau llyfrgell ar gyfer \"%1\" ymysg y llwybrau."
+msgid "Desktop %1"
+msgstr "Penbwrdd %1"
 
-#: tdecore/tdeapplication.cpp:931
+#: tdecore/tdeapplication.cpp:1141
 msgid ""
 "_: Dear Translator! Translate this string to the string 'LTR' in left-to-right "
 "languages (as english) or to 'RTL' in right-to-left languages (such as Hebrew "
 "and Arabic) to get proper widget layout."
 msgstr "LTR"
 
-#: tdecore/tdeapplication.cpp:1404
+#: tdecore/tdeapplication.cpp:1614
 msgid ""
 "There was an error setting up inter-process communications for TDE. The message "
 "returned by the system was:\n"
@@ -2795,7 +1960,7 @@ msgstr ""
 "ddychwelwyd gan y cysawd oedd:\n"
 "\n"
 
-#: tdecore/tdeapplication.cpp:1408
+#: tdecore/tdeapplication.cpp:1618
 msgid ""
 "\n"
 "\n"
@@ -2805,23 +1970,23 @@ msgstr ""
 "\n"
 "Gwiriwch fod y rhaglen \"dcopserver\" yn rhedeg!"
 
-#: tdecore/tdeapplication.cpp:1415
+#: tdecore/tdeapplication.cpp:1625
 msgid "DCOP communications error (%1)"
 msgstr "Gwall cyfathrebu DCOP (%1)"
 
-#: tdecore/tdeapplication.cpp:1433
+#: tdecore/tdeapplication.cpp:1643
 msgid "Use the X-server display 'displayname'"
 msgstr "Defnyddio'r arddangosydd gweinydd-X 'displayname'"
 
-#: tdecore/tdeapplication.cpp:1435
+#: tdecore/tdeapplication.cpp:1645
 msgid "Use the QWS display 'displayname'"
 msgstr "Defnyddio'r arddangosydd QWS 'displayname'"
 
-#: tdecore/tdeapplication.cpp:1437
+#: tdecore/tdeapplication.cpp:1647
 msgid "Restore the application for the given 'sessionId'"
 msgstr "Adfer y cymhwysiad ar gyfer y 'sessionId' a rhoddwyd"
 
-#: tdecore/tdeapplication.cpp:1438
+#: tdecore/tdeapplication.cpp:1648
 msgid ""
 "Causes the application to install a private color\n"
 "map on an 8-bit display"
@@ -2829,22 +1994,23 @@ msgstr ""
 " Achosi i'r cymhwysiad arsefydlu map lliw\n"
 " preifat ar arddangosydd 8-did"
 
-#: tdecore/tdeapplication.cpp:1439
+#: tdecore/tdeapplication.cpp:1649
+#, fuzzy
 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"
+"using the TQApplication::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"
 
-#: tdecore/tdeapplication.cpp:1440
+#: tdecore/tdeapplication.cpp:1650
 msgid "tells Qt to never grab the mouse or the keyboard"
 msgstr "Dweud wrth QT na ddylai fyth dwyn y llygoden na'r bysellfwrdd"
 
-#: tdecore/tdeapplication.cpp:1441
+#: tdecore/tdeapplication.cpp:1651
 msgid ""
 "running under a debugger can cause an implicit\n"
 "-nograb, use -dograb to override"
@@ -2852,15 +2018,15 @@ msgstr ""
 "gall redeg dan ddadnamydd achosi -nograb\n"
 "ymhlyg, defnyddiwch -dograb i'w anwybyddu"
 
-#: tdecore/tdeapplication.cpp:1442
+#: tdecore/tdeapplication.cpp:1652
 msgid "switches to synchronous mode for debugging"
 msgstr "newid i fodd cydamseredig i ddadnamu"
 
-#: tdecore/tdeapplication.cpp:1444
+#: tdecore/tdeapplication.cpp:1654
 msgid "defines the application font"
 msgstr "diffinio wynebfath y cymhwysiad"
 
-#: tdecore/tdeapplication.cpp:1446
+#: tdecore/tdeapplication.cpp:1656
 msgid ""
 "sets the default background color and an\n"
 "application palette (light and dark shades are\n"
@@ -2870,23 +2036,23 @@ msgstr ""
 "palêt cymhwysiad (mae cysgodau\n"
 " golau a tywyll yn cael eu cyfrifo)"
 
-#: tdecore/tdeapplication.cpp:1448
+#: tdecore/tdeapplication.cpp:1658
 msgid "sets the default foreground color"
 msgstr "Gosod y lliw blaendir rhagosodol"
 
-#: tdecore/tdeapplication.cpp:1450
+#: tdecore/tdeapplication.cpp:1660
 msgid "sets the default button color"
 msgstr "Gosod y lliw botwm rhagosodol"
 
-#: tdecore/tdeapplication.cpp:1451
+#: tdecore/tdeapplication.cpp:1661
 msgid "sets the application name"
 msgstr "gosod enw'r cymhwysiad"
 
-#: tdecore/tdeapplication.cpp:1452
+#: tdecore/tdeapplication.cpp:1662
 msgid "sets the application title (caption)"
 msgstr "gosod teitl y cymhwysiad (egluryn)"
 
-#: tdecore/tdeapplication.cpp:1454
+#: tdecore/tdeapplication.cpp:1664
 msgid ""
 "forces the application to use a TrueColor visual on\n"
 "an 8-bit display"
@@ -2894,7 +2060,7 @@ msgstr ""
 "gorfod i'r cymhwysiad ddefnydio \n"
 " gwelediad WirLiw ar arddangosydd 8-did"
 
-#: tdecore/tdeapplication.cpp:1455
+#: tdecore/tdeapplication.cpp:1665
 msgid ""
 "sets XIM (X Input Method) input style. Possible\n"
 "values are onthespot, overthespot, offthespot and\n"
@@ -2903,76 +2069,76 @@ msgstr ""
 "gosod arddull fewnbwn XIM (X Input Method). Gwerthoedd\n"
 "posib yw onthespot, overthespot, offthespot a root"
 
-#: tdecore/tdeapplication.cpp:1456
+#: tdecore/tdeapplication.cpp:1666
 msgid "set XIM server"
 msgstr "gosod gweinydd XIM"
 
-#: tdecore/tdeapplication.cpp:1457
+#: tdecore/tdeapplication.cpp:1667
 msgid "disable XIM"
 msgstr "analluogi XIM"
 
-#: tdecore/tdeapplication.cpp:1460
+#: tdecore/tdeapplication.cpp:1670
 msgid "forces the application to run as QWS Server"
 msgstr "gorfod i'r cymhwysiad redeg fel Gweinydd QWS"
 
-#: tdecore/tdeapplication.cpp:1462
+#: tdecore/tdeapplication.cpp:1672
 msgid "mirrors the whole layout of widgets"
 msgstr "adlewyrchu gosodiad cyfan y celfigion"
 
-#: tdecore/tdeapplication.cpp:1468
+#: tdecore/tdeapplication.cpp:1678
 msgid "Use 'caption' as name in the titlebar"
 msgstr "defnyddio 'egluryn' fel enw yn y bar-teitl"
 
-#: tdecore/tdeapplication.cpp:1469
+#: tdecore/tdeapplication.cpp:1679
 msgid "Use 'icon' as the application icon"
 msgstr "defnyddio 'eicon' fel eicon y cymhwysiad"
 
-#: tdecore/tdeapplication.cpp:1470
+#: tdecore/tdeapplication.cpp:1680
 msgid "Use 'icon' as the icon in the titlebar"
 msgstr "defnyddio 'eicon' fel eicon yn y bar-teitl"
 
-#: tdecore/tdeapplication.cpp:1471
+#: tdecore/tdeapplication.cpp:1681
 msgid "Use alternative configuration file"
 msgstr "defnyddio ffeil ffurfweddiad arall"
 
-#: tdecore/tdeapplication.cpp:1472
+#: tdecore/tdeapplication.cpp:1682
 msgid "Use the DCOP Server specified by 'server'"
 msgstr "defnyddio'r gweinydd DCOP a penodir gan 'gweinydd'"
 
-#: tdecore/tdeapplication.cpp:1473
+#: tdecore/tdeapplication.cpp:1683
 msgid "Disable crash handler, to get core dumps"
 msgstr "analluogi'r trinydd chwalfa, er mwyn cael dadlwythiadau craidd"
 
-#: tdecore/tdeapplication.cpp:1474
+#: tdecore/tdeapplication.cpp:1684
 msgid "Waits for a WM_NET compatible windowmanager"
 msgstr "aros am reolydd ffenestri sy'n gyfaddas i WM_NET"
 
-#: tdecore/tdeapplication.cpp:1475
+#: tdecore/tdeapplication.cpp:1685
 msgid "sets the application GUI style"
 msgstr "gosod arddull GUI y cymhwysiad"
 
-#: tdecore/tdeapplication.cpp:1476
+#: tdecore/tdeapplication.cpp:1686
 #, fuzzy
 msgid ""
 "sets the client geometry of the main widget - see man X for the argument format"
 msgstr "gosod geometreg dibynnol y prif gelfigyn"
 
-#: tdecore/tdeapplication.cpp:1516
+#: tdecore/tdeapplication.cpp:1740
 msgid ""
 "The style %1 was not found\n"
 msgstr ""
 "Methu darganfod yr ardull %1\n"
 
-#: tdecore/tdeapplication.cpp:1978 kstyles/klegacy/klegacystyle.cpp:3044
-#: kstyles/web/webstyle.cpp:1604
+#: tdecore/tdeapplication.cpp:2455 tdestyles/klegacy/klegacystyle.cpp:3044
+#: tdestyles/web/webstyle.cpp:1604
 msgid "modified"
 msgstr "newidwyd"
 
-#: tdecore/tdeapplication.cpp:2244 tdecore/tdeapplication.cpp:2279
+#: tdecore/tdeapplication.cpp:2727 tdecore/tdeapplication.cpp:2762
 msgid "Could not Launch Help Center"
 msgstr "Methodd gychwyn Canolfan Gymorth"
 
-#: tdecore/tdeapplication.cpp:2245 tdecore/tdeapplication.cpp:2280
+#: tdecore/tdeapplication.cpp:2728 tdecore/tdeapplication.cpp:2763
 #, c-format
 msgid ""
 "Could not launch the TDE Help Center:\n"
@@ -2983,11 +2149,11 @@ msgstr ""
 "\n"
 "%1"
 
-#: tdecore/tdeapplication.cpp:2550
+#: tdecore/tdeapplication.cpp:3033
 msgid "Could not Launch Mail Client"
 msgstr "Methodd gychwyn Dibynnydd Ebost"
 
-#: tdecore/tdeapplication.cpp:2551
+#: tdecore/tdeapplication.cpp:3034
 #, c-format
 msgid ""
 "Could not launch the mail client:\n"
@@ -2998,11 +2164,11 @@ msgstr ""
 "\n"
 "%1"
 
-#: tdecore/tdeapplication.cpp:2572
+#: tdecore/tdeapplication.cpp:3058
 msgid "Could not Launch Browser"
 msgstr "Methodd gychwyn Porydd"
 
-#: tdecore/tdeapplication.cpp:2573
+#: tdecore/tdeapplication.cpp:3059
 #, c-format
 msgid ""
 "Could not launch the browser:\n"
@@ -3013,348 +2179,411 @@ msgstr ""
 "\n"
 "%1"
 
-#: tdecore/tdeapplication.cpp:2637
+#: tdecore/tdeapplication.cpp:3128
 msgid ""
 "Could not register with DCOP.\n"
 msgstr ""
 "Methodd gofrestru gyda DCOP.\n"
 
-#: tdecore/tdeapplication.cpp:2672
+#: tdecore/tdeapplication.cpp:3163
 msgid ""
 "TDELauncher could not be reached via DCOP.\n"
 msgstr ""
 "Methodd gyrraedd Klauncher drwy DCOP.\n"
 
-#: tdecore/twinmodule.cpp:456
-#, c-format
-msgid "Desktop %1"
-msgstr "Penbwrdd %1"
+#: tdecore/netsupp.cpp:890 tdecore/network/kresolver.cpp:557
+msgid "no error"
+msgstr "dim gwall"
 
-#: tdecore/tdeconfigbackend.cpp:1107 tdecore/tdeconfigbackend.cpp:1116
-msgid ""
-"Will not save configuration.\n"
-msgstr ""
-"Ni fydd yn cadw'r ffurfweddiad.\n"
+#: tdecore/netsupp.cpp:891
+msgid "address family for nodename not supported"
+msgstr "ni chynhalir y teulu cyfeiriad am yr enw nôd"
 
-#: tdecore/tdeconfigbackend.cpp:1109 tdecore/tdeconfigbackend.cpp:1117
-msgid ""
-"Configuration file \"%1\" not writable.\n"
-msgstr ""
-"Methu ysgrifennu i'r ffeil ffurfweddiad \"%1\". \n"
+#: tdecore/netsupp.cpp:892 tdecore/network/kresolver.cpp:559
+msgid "temporary failure in name resolution"
+msgstr "methiant dros dro wrth ddadansoddi'r enw"
 
-#: tdecore/tdeconfigbackend.cpp:1124
-msgid "Please contact your system administrator."
-msgstr "Cysylltwch a'ch gwasanaethwr cysodau."
+#: tdecore/netsupp.cpp:893
+msgid "invalid value for 'ai_flags'"
+msgstr "gwerth dilys am 'ai_flags'"
 
-#: tdecore/tdecmdlineargs.cpp:500 tdecore/tdecmdlineargs.cpp:516
-msgid "Unknown option '%1'."
-msgstr "Dewis anhysbys '%1'."
+#: tdecore/netsupp.cpp:894 tdecore/network/kresolver.cpp:560
+msgid "non-recoverable failure in name resolution"
+msgstr "methiant anadferadwy wrth ddadansoddi'r enw"
 
-#: tdecore/tdecmdlineargs.cpp:524
-msgid "'%1' missing."
-msgstr "'%1' ar goll."
+#: tdecore/netsupp.cpp:895
+msgid "'ai_family' not supported"
+msgstr "ni chynhelir 'ai_family'"
 
-#: tdecore/tdecmdlineargs.cpp:619
+#: tdecore/netsupp.cpp:896 tdecore/network/kresolver.cpp:562
+msgid "memory allocation failure"
+msgstr "methiant wrth ddyrannu cof"
+
+#: tdecore/netsupp.cpp:897
+msgid "no address associated with nodename"
+msgstr "ni chysylltir cyfeiriad efo enw'r nôd"
+
+#: tdecore/netsupp.cpp:898 tdecore/network/kresolver.cpp:563
+msgid "name or service not known"
+msgstr "ni adnabyddir enw neu gwasanaeth"
+
+#: tdecore/netsupp.cpp:899
+msgid "servname not supported for ai_socktype"
+msgstr "ni chynhelir servname am ai_socktype"
+
+#: tdecore/netsupp.cpp:900
+msgid "'ai_socktype' not supported"
+msgstr "ni chynhelir 'ai_socktype'"
+
+#: tdecore/netsupp.cpp:901
+msgid "system error"
+msgstr "gwall cysawd"
+
+#: tdecore/kcalendarsystemgregorian.cpp:91 tdecore/tdelocale.cpp:569
 msgid ""
-"_: the 2nd argument is a list of name+address, one on each line\n"
-"%1 was written by\n"
-"%2"
-msgstr ""
-"ysgrifennwyd %1 gan\n"
-"%2"
+"_: January\n"
+"Jan"
+msgstr "Ion"
 
-#: tdecore/tdecmdlineargs.cpp:622
-#, fuzzy
-msgid "This application was written by somebody who wants to remain anonymous."
-msgstr "Ysgrifennwyd %1 gan berson sy'n dymuno aros yn anhysbys."
+#: tdecore/kcalendarsystemgregorian.cpp:93 tdecore/tdelocale.cpp:570
+msgid ""
+"_: February\n"
+"Feb"
+msgstr "Chwe"
 
-#: tdecore/tdecmdlineargs.cpp:629
-#, fuzzy
+#: tdecore/kcalendarsystemgregorian.cpp:95 tdecore/tdelocale.cpp:571
 msgid ""
-"Please use http://bugs.kde.org to report bugs.\n"
-msgstr ""
-"Defnyddiwch http://bugs.kde.org er mwyn adrodd namau, peidiwch ac anfon ebost "
-"i'r awduron yn uniongyrchol.\n"
+"_: March\n"
+"Mar"
+msgstr "Maw"
 
-#: tdecore/tdecmdlineargs.cpp:632 tdecore/tdecmdlineargs.cpp:634
-#, fuzzy
+#: tdecore/kcalendarsystemgregorian.cpp:97 tdecore/tdelocale.cpp:572
 msgid ""
-"Please report bugs to %1.\n"
-msgstr ""
-"Defnyddiwch %1 er mwyn adrodd namau, peidiwch ac anfon ebost i'r awduron yn "
-"uniongyrchol.\n"
+"_: April\n"
+"Apr"
+msgstr "Ebr"
 
-#: tdecore/tdecmdlineargs.cpp:660
-msgid "Unexpected argument '%1'."
-msgstr "Ymresymiad annisgwyl '%1'."
+#: tdecore/kcalendarsystemgregorian.cpp:99 tdecore/tdelocale.cpp:573
+msgid ""
+"_: May short\n"
+"May"
+msgstr "Mai"
 
-#: tdecore/tdecmdlineargs.cpp:765
-msgid "Use --help to get a list of available command line options."
-msgstr "Defnyddiwch --help i gael rhestr o ddewisiadau llinell gorchymyn."
+#: tdecore/kcalendarsystemgregorian.cpp:101 tdecore/tdelocale.cpp:574
+msgid ""
+"_: June\n"
+"Jun"
+msgstr "Meh"
 
-#: tdecore/tdecmdlineargs.cpp:780
+#: tdecore/kcalendarsystemgregorian.cpp:103 tdecore/tdelocale.cpp:575
 msgid ""
-"\n"
-"%1:\n"
-msgstr ""
-"\n"
-"%1:\n"
+"_: July\n"
+"Jul"
+msgstr "Gor"
 
-#: tdecore/tdecmdlineargs.cpp:789
-msgid "[options] "
-msgstr "[dewisiadau]"
+#: tdecore/kcalendarsystemgregorian.cpp:105 tdecore/tdelocale.cpp:576
+msgid ""
+"_: August\n"
+"Aug"
+msgstr "Awst"
 
-#: tdecore/tdecmdlineargs.cpp:796
-msgid "[%1-options]"
-msgstr "[%1-dewisiadau]"
+#: tdecore/kcalendarsystemgregorian.cpp:107 tdecore/tdelocale.cpp:577
+msgid ""
+"_: September\n"
+"Sep"
+msgstr "Medi"
 
-#: tdecore/tdecmdlineargs.cpp:816
+#: tdecore/kcalendarsystemgregorian.cpp:109 tdecore/tdelocale.cpp:578
 msgid ""
-"Usage: %1 %2\n"
-msgstr ""
-"Defnyddir: %1 %2\n"
+"_: October\n"
+"Oct"
+msgstr "Hydr"
 
-#: tdecore/tdecmdlineargs.cpp:819
-msgid "Generic options"
-msgstr "Dewisiadau generig"
+#: tdecore/kcalendarsystemgregorian.cpp:111 tdecore/tdelocale.cpp:579
+msgid ""
+"_: November\n"
+"Nov"
+msgstr "Tach"
 
-#: tdecore/tdecmdlineargs.cpp:820
-msgid "Show help about options"
-msgstr "Dangos cymorth am ddewisiadau"
+#: tdecore/kcalendarsystemgregorian.cpp:113 tdecore/tdelocale.cpp:580
+msgid ""
+"_: December\n"
+"Dec"
+msgstr "Rhag"
 
-#: tdecore/tdecmdlineargs.cpp:828
-msgid "Show %1 specific options"
-msgstr "Dangos %1 dewisiadau penodol"
+#: tdecore/kcalendarsystemgregorian.cpp:119 tdecore/tdelocale.cpp:585
+msgid "January"
+msgstr "Ionawr"
 
-#: tdecore/tdecmdlineargs.cpp:835
-msgid "Show all options"
-msgstr "Dangos y dewisiadau i gyd"
+#: tdecore/kcalendarsystemgregorian.cpp:121 tdecore/tdelocale.cpp:586
+msgid "February"
+msgstr "Chwefror"
 
-#: tdecore/tdecmdlineargs.cpp:836
-msgid "Show author information"
-msgstr "Dangos gwybodaeth awdur"
+#: tdecore/kcalendarsystemgregorian.cpp:123 tdecore/tdelocale.cpp:587
+msgid "March"
+msgstr "Mawrth"
 
-#: tdecore/tdecmdlineargs.cpp:837
-msgid "Show version information"
-msgstr "Dangos gwybodaeth fersiwn"
+#: tdecore/kcalendarsystemgregorian.cpp:125 tdecore/tdelocale.cpp:588
+msgid "April"
+msgstr "Ebrill"
 
-#: tdecore/tdecmdlineargs.cpp:838
-msgid "Show license information"
-msgstr "Dangos gwybodaeth trwydded"
+#: tdecore/kcalendarsystemgregorian.cpp:127 tdecore/tdelocale.cpp:589
+msgid ""
+"_: May long\n"
+"May"
+msgstr "Mai"
 
-#: tdecore/tdecmdlineargs.cpp:839
-msgid "End of options"
-msgstr "Diwedd y dewisiadau"
+#: tdecore/kcalendarsystemgregorian.cpp:129 tdecore/tdelocale.cpp:590
+msgid "June"
+msgstr "Mehefin"
 
-#: tdecore/tdecmdlineargs.cpp:861
-msgid "%1 options"
-msgstr "%1 o ddewisiadau"
+#: tdecore/kcalendarsystemgregorian.cpp:131 tdecore/tdelocale.cpp:591
+msgid "July"
+msgstr "Gorfennaf"
 
-#: tdecore/tdecmdlineargs.cpp:863
-msgid ""
-"\n"
-"Options:\n"
-msgstr ""
-"\n"
-"Dewisiadau:\n"
+#: tdecore/kcalendarsystemgregorian.cpp:133 tdecore/tdelocale.cpp:592
+msgid "August"
+msgstr "Awst"
 
-#: tdecore/tdecmdlineargs.cpp:920
-msgid ""
-"\n"
-"Arguments:\n"
-msgstr ""
-"\n"
-"Ymresymiadau:\n"
+#: tdecore/kcalendarsystemgregorian.cpp:135 tdecore/tdelocale.cpp:593
+msgid "September"
+msgstr "Medi"
 
-#: tdecore/tdecmdlineargs.cpp:1282
-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"
+#: tdecore/kcalendarsystemgregorian.cpp:137 tdecore/tdelocale.cpp:594
+msgid "October"
+msgstr "Hydref"
 
-#: tdecore/ksockaddr.cpp:112
-msgid "<unknown socket>"
-msgstr "<soced anhysbys>"
+#: tdecore/kcalendarsystemgregorian.cpp:139 tdecore/tdelocale.cpp:595
+msgid "November"
+msgstr "Tachwedd"
 
-#: tdecore/ksockaddr.cpp:568 tdecore/ksockaddr.cpp:587
-msgid "<empty>"
-msgstr "<gwag>"
+#: tdecore/kcalendarsystemgregorian.cpp:141 tdecore/tdelocale.cpp:596
+msgid "December"
+msgstr "Rhagfyr"
 
-#: tdecore/ksockaddr.cpp:571
+#: tdecore/kcalendarsystemgregorian.cpp:156 tdecore/tdelocale.cpp:607
 msgid ""
-"_: 1: hostname, 2: port number\n"
-"%1 port %2"
-msgstr "%1 porth %2"
+"_: of January\n"
+"of Jan"
+msgstr "o Ionawr"
 
-#: tdecore/ksockaddr.cpp:853
-msgid "<empty UNIX socket>"
-msgstr "<soced Unix gwag>"
+#: tdecore/kcalendarsystemgregorian.cpp:158 tdecore/tdelocale.cpp:608
+msgid ""
+"_: of February\n"
+"of Feb"
+msgstr "o Chwefror"
 
-#: tdecore/kcheckaccelerators.cpp:148
-msgid "Dr. Klash' Accelerator Diagnosis"
-msgstr "Diagnosis Cyflymydd Dr Klash"
+#: tdecore/kcalendarsystemgregorian.cpp:160 tdecore/tdelocale.cpp:609
+msgid ""
+"_: of March\n"
+"of Mar"
+msgstr "o Fawrth"
 
-#: tdecore/kcheckaccelerators.cpp:155
-msgid "&Disable automatic checking"
-msgstr " &Analluogi cywiro awtomatig"
+#: tdecore/kcalendarsystemgregorian.cpp:162 tdecore/tdelocale.cpp:610
+msgid ""
+"_: of April\n"
+"of Apr"
+msgstr "o Ebrill"
 
-#: tdecore/kcheckaccelerators.cpp:193
-msgid "<h2>Accelerators changed</h2>"
-msgstr "<h2>Newidwyd cyflymyddion</h2>"
+#: tdecore/kcalendarsystemgregorian.cpp:164 tdecore/tdelocale.cpp:611
+msgid ""
+"_: of May short\n"
+"of May"
+msgstr "o Fai"
 
-#: tdecore/kcheckaccelerators.cpp:199
-msgid "<h2>Accelerators removed</h2>"
-msgstr "<h2>Gwaredwyd cyflymyddion</h2>"
+#: tdecore/kcalendarsystemgregorian.cpp:166 tdecore/tdelocale.cpp:612
+msgid ""
+"_: of June\n"
+"of Jun"
+msgstr "o Fehefin"
 
-#: tdecore/kcheckaccelerators.cpp:204
-msgid "<h2>Accelerators added (just for your info)</h2>"
-msgstr "<h2>Ychwanegwyd cyflymyddion (er eich gwybodaeth)</h2>"
+#: tdecore/kcalendarsystemgregorian.cpp:168 tdecore/tdelocale.cpp:613
+msgid ""
+"_: of July\n"
+"of Jul"
+msgstr "o Orfennaf"
 
-#: tdecore/tdestdaccel.cpp:54
-msgid "New"
-msgstr "Newydd"
+#: tdecore/kcalendarsystemgregorian.cpp:170 tdecore/tdelocale.cpp:614
+msgid ""
+"_: of August\n"
+"of Aug"
+msgstr "o Awst"
 
-#: tdecore/tdestdaccel.cpp:65
-msgid "Paste Selection"
-msgstr "Gludo'r Dewisiad"
+#: tdecore/kcalendarsystemgregorian.cpp:172 tdecore/tdelocale.cpp:615
+msgid ""
+"_: of September\n"
+"of Sep"
+msgstr "o Fedi"
 
-#: tdecore/tdestdaccel.cpp:67
-msgid "Deselect"
-msgstr "Dad-ddewis"
+#: tdecore/kcalendarsystemgregorian.cpp:174 tdecore/tdelocale.cpp:616
+msgid ""
+"_: of October\n"
+"of Oct"
+msgstr "o Hydref"
 
-#: tdecore/tdestdaccel.cpp:68
-msgid "Delete Word Backwards"
-msgstr "Dileu Gair yn Ôl"
+#: tdecore/kcalendarsystemgregorian.cpp:176 tdecore/tdelocale.cpp:617
+msgid ""
+"_: of November\n"
+"of Nov"
+msgstr "o Dachwedd"
 
-#: tdecore/tdestdaccel.cpp:69
-msgid "Delete Word Forward"
-msgstr "Dileu Gair Ymlaen"
+#: tdecore/kcalendarsystemgregorian.cpp:178 tdecore/tdelocale.cpp:618
+msgid ""
+"_: of December\n"
+"of Dec"
+msgstr "o Ragfyr"
 
-#: tdecore/kkeyserver_x11.cpp:135 tdecore/tdestdaccel.cpp:70
-#: tdeui/keditcl2.cpp:107 tdeui/keditcl2.cpp:120 tdeui/keditcl2.cpp:377
-#: tdeui/keditcl2.cpp:390 tdeui/keditcl2.cpp:700 tdeutils/kfinddialog.cpp:119
-msgid "Find"
-msgstr "Canfod"
+#: tdecore/kcalendarsystemgregorian.cpp:184 tdecore/tdelocale.cpp:623
+msgid "of January"
+msgstr "o Ionawr"
 
-#: tdecore/tdestdaccel.cpp:71 tdeutils/kfind.cpp:47
-msgid "Find Next"
-msgstr "Canfod Nesaf"
+#: tdecore/kcalendarsystemgregorian.cpp:186 tdecore/tdelocale.cpp:624
+msgid "of February"
+msgstr "o Chwefror"
 
-#: tdecore/tdestdaccel.cpp:72
-msgid "Find Prev"
-msgstr "Canfod Blaenorol"
+#: tdecore/kcalendarsystemgregorian.cpp:188 tdecore/tdelocale.cpp:625
+msgid "of March"
+msgstr "o Fawrth"
 
-#: tdecore/tdestdaccel.cpp:74
-msgid "Navigation"
-msgstr "Morlywiaeth"
+#: tdecore/kcalendarsystemgregorian.cpp:190 tdecore/tdelocale.cpp:626
+msgid "of April"
+msgstr "o Ebrill"
 
-#: tdecore/tdestdaccel.cpp:75
+#: tdecore/kcalendarsystemgregorian.cpp:192 tdecore/tdelocale.cpp:627
 msgid ""
-"_: Opposite to End\n"
-"Home"
-msgstr "Cartref"
-
-#: tdecore/tdestdaccel.cpp:76
-msgid "End"
-msgstr "Diwedd"
+"_: of May long\n"
+"of May"
+msgstr "o Fai"
 
-#: tdecore/tdestdaccel.cpp:77
-msgid "Beginning of Line"
-msgstr "Dechrau'r Llinell"
+#: tdecore/kcalendarsystemgregorian.cpp:194 tdecore/tdelocale.cpp:628
+msgid "of June"
+msgstr "o Fehefin"
 
-#: tdecore/tdestdaccel.cpp:78 tdeutils/kfinddialog.cpp:451
-msgid "End of Line"
-msgstr "Diwedd y Llinell"
+#: tdecore/kcalendarsystemgregorian.cpp:196 tdecore/tdelocale.cpp:629
+msgid "of July"
+msgstr "o Orfennaf"
 
-#: tdecore/tdestdaccel.cpp:79
-msgid "Prior"
-msgstr "Cynt"
+#: tdecore/kcalendarsystemgregorian.cpp:198 tdecore/tdelocale.cpp:630
+msgid "of August"
+msgstr "o Awst"
 
-#: tdecore/tdestdaccel.cpp:80
-msgid ""
-"_: Opposite to Prior\n"
-"Next"
-msgstr "Nesaf"
+#: tdecore/kcalendarsystemgregorian.cpp:200 tdecore/tdelocale.cpp:631
+msgid "of September"
+msgstr "o Fedi"
 
-#: tdecore/tdestdaccel.cpp:81 tdeui/keditcl2.cpp:976
-msgid "Go to Line"
-msgstr "Mynd i Linell"
+#: tdecore/kcalendarsystemgregorian.cpp:202 tdecore/tdelocale.cpp:632
+msgid "of October"
+msgstr "o Hydref"
 
-#: tdecore/tdestdaccel.cpp:82
-msgid "Add Bookmark"
-msgstr "Ychwanegu Tudnod"
+#: tdecore/kcalendarsystemgregorian.cpp:204 tdecore/tdelocale.cpp:633
+msgid "of November"
+msgstr "o Dachwedd"
 
-#: tdecore/tdestdaccel.cpp:83
-msgid "Zoom In"
-msgstr "Nesàu"
+#: tdecore/kcalendarsystemgregorian.cpp:206 tdecore/tdelocale.cpp:634
+msgid "of December"
+msgstr "o Ragfyr"
 
-#: tdecore/tdestdaccel.cpp:84
-msgid "Zoom Out"
-msgstr "Pellhàu"
+#: tdecore/kcalendarsystem.cpp:124
+msgid ""
+"_: Monday\n"
+"Mon"
+msgstr "Llun"
 
-#: tdecore/tdestdaccel.cpp:85
-msgid "Up"
-msgstr "I fyny"
+#: tdecore/kcalendarsystem.cpp:125
+msgid ""
+"_: Tuesday\n"
+"Tue"
+msgstr "Maw"
 
-#: tdecore/tdestdaccel.cpp:87
-msgid "Forward"
-msgstr "Ymlaen"
+#: tdecore/kcalendarsystem.cpp:126
+msgid ""
+"_: Wednesday\n"
+"Wed"
+msgstr "Mer"
 
-#: tdecore/tdestdaccel.cpp:89
-msgid "Popup Menu Context"
-msgstr "Cyd-destun Naidlen"
+#: tdecore/kcalendarsystem.cpp:127
+msgid ""
+"_: Thursday\n"
+"Thu"
+msgstr "Iau"
 
-#: tdecore/tdestdaccel.cpp:90
-msgid "Show Menu Bar"
-msgstr "Dangos y Bar Dewislen"
+#: tdecore/kcalendarsystem.cpp:128
+msgid ""
+"_: Friday\n"
+"Fri"
+msgstr "Gwe"
 
-#: tdecore/tdestdaccel.cpp:91
-msgid "Backward Word"
-msgstr "Yn Ôl un Gair"
+#: tdecore/kcalendarsystem.cpp:129
+msgid ""
+"_: Saturday\n"
+"Sat"
+msgstr "Sad"
 
-#: tdecore/tdestdaccel.cpp:92
-msgid "Forward Word"
-msgstr "Ymlaen un Gair"
+#: tdecore/kcalendarsystem.cpp:130
+msgid ""
+"_: Sunday\n"
+"Sun"
+msgstr "Sul"
 
-#: tdecore/tdestdaccel.cpp:93
-msgid "Activate Next Tab"
-msgstr "Gweithredoli'r Tab Nesaf"
+#: tdecore/tdeglobalsettings.cpp:570
+msgid "Trash"
+msgstr "Sbwriel"
 
-#: tdecore/tdestdaccel.cpp:94
-msgid "Activate Previous Tab"
-msgstr "Gweithredoli'r Tab Cynt"
+#: tdecore/ksocks.cpp:135
+msgid "NEC SOCKS client"
+msgstr "dibynnydd NEC SOCKS"
 
-#: tdecore/tdestdaccel.cpp:95
-msgid "Full Screen Mode"
-msgstr "Modd Sgrîn Llawn"
+#: tdecore/ksocks.cpp:170
+msgid "Dante SOCKS client"
+msgstr "dibynnydd Dante SOCKS"
 
-#: tdecore/tdestdaccel.cpp:98
-msgid "What's This"
-msgstr "Beth yw Hwn"
+#: tdecore/tdeaboutdata.cpp:388
+#, fuzzy
+msgid ""
+"_: replace this with information about your translation team\n"
+"<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 ""
+"<p>Cyfieithir TDE i mewn i lawer o ieithoedd diolch i tîmau cyfieithu dros y "
+"byd i gyd.</p>"
+"<p>Am ragor o wybodaeth ar rhyngwledeiddio TDE, ymwelwch â "
+"http://i18n.kde.org.</p>Am ragor o wybodaeth ar TDE a meddalwedd rhydd yn "
+"Gymraeg, ewch i http://www.kyfieithu.co.uk</p>"
 
-#: tdecore/tdestdaccel.cpp:99 tdecore/tdestdaccel.cpp:100 tdeui/klineedit.cpp:886
-msgid "Text Completion"
-msgstr "Cwblhâd testun"
+#: tdecore/tdeaboutdata.cpp:444
+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"
 
-#: tdecore/tdestdaccel.cpp:101
-msgid "Previous Completion Match"
-msgstr "Cydweddiad Cwblhâd Blaenorol"
+#: tdecore/tdeaboutdata.cpp:451
+#, c-format
+msgid "This program is distributed under the terms of the %1."
+msgstr "Dosbarthir y rhaglen yma dan dermau'r %1."
 
-#: tdecore/tdestdaccel.cpp:102
-msgid "Next Completion Match"
-msgstr "Cydweddiad Cwblhâd Nesaf"
+#: tdecore/ksockaddr.cpp:112
+msgid "<unknown socket>"
+msgstr "<soced anhysbys>"
 
-#: tdecore/tdestdaccel.cpp:103
-msgid "Substring Completion"
-msgstr "Cwblhâd Is-linyn"
+#: tdecore/ksockaddr.cpp:568 tdecore/ksockaddr.cpp:587
+msgid "<empty>"
+msgstr "<gwag>"
 
-#: tdecore/tdestdaccel.cpp:104
-msgid "Previous Item in List"
-msgstr "Eitem Cynt yn y Rhestr"
+#: tdecore/ksockaddr.cpp:571
+msgid ""
+"_: 1: hostname, 2: port number\n"
+"%1 port %2"
+msgstr "%1 porth %2"
 
-#: tdecore/tdestdaccel.cpp:105
-msgid "Next Item in List"
-msgstr "Eitem Nesaf yn y Rhestr"
+#: tdecore/ksockaddr.cpp:853
+msgid "<empty UNIX socket>"
+msgstr "<soced Unix gwag>"
 
 #: tdecore/kcalendarsystemhijri.cpp:298 tdecore/kcalendarsystemhijri.cpp:326
 msgid "Muharram"
@@ -3556,7 +2785,7 @@ msgstr "Yaum al-Sabt"
 msgid "Yaum al-Ahad"
 msgstr "Yaum al-Ahad"
 
-#: tdecore/tdelocale.cpp:217
+#: tdecore/tdelocale.cpp:226
 msgid ""
 "_: Dear translator, please do not translate this string in any form, but pick "
 "the _right_ value out of NoPlural/TwoForms/French... If not sure what to do "
@@ -3565,315 +2794,45 @@ msgid ""
 "Definition of PluralForm - to be set by the translator of tdelibs.po"
 msgstr "TwoForms"
 
-#: tdecore/kcalendarsystemgregorian.cpp:91 tdecore/tdelocale.cpp:553
-msgid ""
-"_: January\n"
-"Jan"
-msgstr "Ion"
-
-#: tdecore/kcalendarsystemgregorian.cpp:93 tdecore/tdelocale.cpp:554
-msgid ""
-"_: February\n"
-"Feb"
-msgstr "Chwe"
-
-#: tdecore/kcalendarsystemgregorian.cpp:95 tdecore/tdelocale.cpp:555
-msgid ""
-"_: March\n"
-"Mar"
-msgstr "Maw"
-
-#: tdecore/kcalendarsystemgregorian.cpp:97 tdecore/tdelocale.cpp:556
-msgid ""
-"_: April\n"
-"Apr"
-msgstr "Ebr"
-
-#: tdecore/kcalendarsystemgregorian.cpp:99 tdecore/tdelocale.cpp:557
-msgid ""
-"_: May short\n"
-"May"
-msgstr "Mai"
-
-#: tdecore/kcalendarsystemgregorian.cpp:101 tdecore/tdelocale.cpp:558
-msgid ""
-"_: June\n"
-"Jun"
-msgstr "Meh"
-
-#: tdecore/kcalendarsystemgregorian.cpp:103 tdecore/tdelocale.cpp:559
-msgid ""
-"_: July\n"
-"Jul"
-msgstr "Gor"
-
-#: tdecore/kcalendarsystemgregorian.cpp:105 tdecore/tdelocale.cpp:560
-msgid ""
-"_: August\n"
-"Aug"
-msgstr "Awst"
-
-#: tdecore/kcalendarsystemgregorian.cpp:107 tdecore/tdelocale.cpp:561
-msgid ""
-"_: September\n"
-"Sep"
-msgstr "Medi"
-
-#: tdecore/kcalendarsystemgregorian.cpp:109 tdecore/tdelocale.cpp:562
-msgid ""
-"_: October\n"
-"Oct"
-msgstr "Hydr"
-
-#: tdecore/kcalendarsystemgregorian.cpp:111 tdecore/tdelocale.cpp:563
-msgid ""
-"_: November\n"
-"Nov"
-msgstr "Tach"
-
-#: tdecore/kcalendarsystemgregorian.cpp:113 tdecore/tdelocale.cpp:564
-msgid ""
-"_: December\n"
-"Dec"
-msgstr "Rhag"
-
-#: tdecore/kcalendarsystemgregorian.cpp:119 tdecore/tdelocale.cpp:569
-msgid "January"
-msgstr "Ionawr"
-
-#: tdecore/kcalendarsystemgregorian.cpp:121 tdecore/tdelocale.cpp:570
-msgid "February"
-msgstr "Chwefror"
-
-#: tdecore/kcalendarsystemgregorian.cpp:123 tdecore/tdelocale.cpp:571
-msgid "March"
-msgstr "Mawrth"
-
-#: tdecore/kcalendarsystemgregorian.cpp:125 tdecore/tdelocale.cpp:572
-msgid "April"
-msgstr "Ebrill"
-
-#: tdecore/kcalendarsystemgregorian.cpp:127 tdecore/tdelocale.cpp:573
-msgid ""
-"_: May long\n"
-"May"
-msgstr "Mai"
-
-#: tdecore/kcalendarsystemgregorian.cpp:129 tdecore/tdelocale.cpp:574
-msgid "June"
-msgstr "Mehefin"
-
-#: tdecore/kcalendarsystemgregorian.cpp:131 tdecore/tdelocale.cpp:575
-msgid "July"
-msgstr "Gorfennaf"
-
-#: tdecore/kcalendarsystemgregorian.cpp:133 tdecore/tdelocale.cpp:576
-msgid "August"
-msgstr "Awst"
-
-#: tdecore/kcalendarsystemgregorian.cpp:135 tdecore/tdelocale.cpp:577
-msgid "September"
-msgstr "Medi"
-
-#: tdecore/kcalendarsystemgregorian.cpp:137 tdecore/tdelocale.cpp:578
-msgid "October"
-msgstr "Hydref"
-
-#: tdecore/kcalendarsystemgregorian.cpp:139 tdecore/tdelocale.cpp:579
-msgid "November"
-msgstr "Tachwedd"
-
-#: tdecore/kcalendarsystemgregorian.cpp:141 tdecore/tdelocale.cpp:580
-msgid "December"
-msgstr "Rhagfyr"
-
-#: tdecore/kcalendarsystemgregorian.cpp:156 tdecore/tdelocale.cpp:591
-msgid ""
-"_: of January\n"
-"of Jan"
-msgstr "o Ionawr"
-
-#: tdecore/kcalendarsystemgregorian.cpp:158 tdecore/tdelocale.cpp:592
-msgid ""
-"_: of February\n"
-"of Feb"
-msgstr "o Chwefror"
-
-#: tdecore/kcalendarsystemgregorian.cpp:160 tdecore/tdelocale.cpp:593
-msgid ""
-"_: of March\n"
-"of Mar"
-msgstr "o Fawrth"
-
-#: tdecore/kcalendarsystemgregorian.cpp:162 tdecore/tdelocale.cpp:594
-msgid ""
-"_: of April\n"
-"of Apr"
-msgstr "o Ebrill"
-
-#: tdecore/kcalendarsystemgregorian.cpp:164 tdecore/tdelocale.cpp:595
-msgid ""
-"_: of May short\n"
-"of May"
-msgstr "o Fai"
-
-#: tdecore/kcalendarsystemgregorian.cpp:166 tdecore/tdelocale.cpp:596
-msgid ""
-"_: of June\n"
-"of Jun"
-msgstr "o Fehefin"
-
-#: tdecore/kcalendarsystemgregorian.cpp:168 tdecore/tdelocale.cpp:597
-msgid ""
-"_: of July\n"
-"of Jul"
-msgstr "o Orfennaf"
-
-#: tdecore/kcalendarsystemgregorian.cpp:170 tdecore/tdelocale.cpp:598
-msgid ""
-"_: of August\n"
-"of Aug"
-msgstr "o Awst"
-
-#: tdecore/kcalendarsystemgregorian.cpp:172 tdecore/tdelocale.cpp:599
-msgid ""
-"_: of September\n"
-"of Sep"
-msgstr "o Fedi"
-
-#: tdecore/kcalendarsystemgregorian.cpp:174 tdecore/tdelocale.cpp:600
-msgid ""
-"_: of October\n"
-"of Oct"
-msgstr "o Hydref"
-
-#: tdecore/kcalendarsystemgregorian.cpp:176 tdecore/tdelocale.cpp:601
-msgid ""
-"_: of November\n"
-"of Nov"
-msgstr "o Dachwedd"
-
-#: tdecore/kcalendarsystemgregorian.cpp:178 tdecore/tdelocale.cpp:602
-msgid ""
-"_: of December\n"
-"of Dec"
-msgstr "o Ragfyr"
-
-#: tdecore/kcalendarsystemgregorian.cpp:184 tdecore/tdelocale.cpp:607
-msgid "of January"
-msgstr "o Ionawr"
-
-#: tdecore/kcalendarsystemgregorian.cpp:186 tdecore/tdelocale.cpp:608
-msgid "of February"
-msgstr "o Chwefror"
-
-#: tdecore/kcalendarsystemgregorian.cpp:188 tdecore/tdelocale.cpp:609
-msgid "of March"
-msgstr "o Fawrth"
-
-#: tdecore/kcalendarsystemgregorian.cpp:190 tdecore/tdelocale.cpp:610
-msgid "of April"
-msgstr "o Ebrill"
-
-#: tdecore/kcalendarsystemgregorian.cpp:192 tdecore/tdelocale.cpp:611
-msgid ""
-"_: of May long\n"
-"of May"
-msgstr "o Fai"
-
-#: tdecore/kcalendarsystemgregorian.cpp:194 tdecore/tdelocale.cpp:612
-msgid "of June"
-msgstr "o Fehefin"
-
-#: tdecore/kcalendarsystemgregorian.cpp:196 tdecore/tdelocale.cpp:613
-msgid "of July"
-msgstr "o Orfennaf"
-
-#: tdecore/kcalendarsystemgregorian.cpp:198 tdecore/tdelocale.cpp:614
-msgid "of August"
-msgstr "o Awst"
-
-#: tdecore/kcalendarsystemgregorian.cpp:200 tdecore/tdelocale.cpp:615
-msgid "of September"
-msgstr "o Fedi"
-
-#: tdecore/kcalendarsystemgregorian.cpp:202 tdecore/tdelocale.cpp:616
-msgid "of October"
-msgstr "o Hydref"
-
-#: tdecore/kcalendarsystemgregorian.cpp:204 tdecore/tdelocale.cpp:617
-msgid "of November"
-msgstr "o Dachwedd"
-
-#: tdecore/kcalendarsystemgregorian.cpp:206 tdecore/tdelocale.cpp:618
-msgid "of December"
-msgstr "o Ragfyr"
-
-#: tdecore/tdelocale.cpp:1773 tdecore/tdelocale.cpp:1913
+#: tdecore/tdelocale.cpp:1789 tdecore/tdelocale.cpp:1929
 msgid "pm"
 msgstr "yp"
 
-#: tdecore/tdelocale.cpp:1782 tdecore/tdelocale.cpp:1915
+#: tdecore/tdelocale.cpp:1798 tdecore/tdelocale.cpp:1931
 msgid "am"
 msgstr "yb"
 
-#: tdecore/tdelocale.cpp:1956
+#: tdecore/tdelocale.cpp:1972
 msgid ""
 "_: concatenation of dates and time\n"
 "%1 %2"
 msgstr "%1 %2"
 
-#: tdecore/tdelocale.cpp:2447
+#: tdecore/tdelocale.cpp:2473
 msgid "&Next"
 msgstr "&Nesaf"
 
-#: tdecore/netsupp.cpp:890 tdecore/network/kresolver.cpp:557
-msgid "no error"
-msgstr "dim gwall"
-
-#: tdecore/netsupp.cpp:891
-msgid "address family for nodename not supported"
-msgstr "ni chynhalir y teulu cyfeiriad am yr enw nôd"
-
-#: tdecore/netsupp.cpp:892 tdecore/network/kresolver.cpp:559
-msgid "temporary failure in name resolution"
-msgstr "methiant dros dro wrth ddadansoddi'r enw"
-
-#: tdecore/netsupp.cpp:893
-msgid "invalid value for 'ai_flags'"
-msgstr "gwerth dilys am 'ai_flags'"
-
-#: tdecore/netsupp.cpp:894 tdecore/network/kresolver.cpp:560
-msgid "non-recoverable failure in name resolution"
-msgstr "methiant anadferadwy wrth ddadansoddi'r enw"
-
-#: tdecore/netsupp.cpp:895
-msgid "'ai_family' not supported"
-msgstr "ni chynhelir 'ai_family'"
-
-#: tdecore/netsupp.cpp:896 tdecore/network/kresolver.cpp:562
-msgid "memory allocation failure"
-msgstr "methiant wrth ddyrannu cof"
-
-#: tdecore/netsupp.cpp:897
-msgid "no address associated with nodename"
-msgstr "ni chysylltir cyfeiriad efo enw'r nôd"
-
-#: tdecore/netsupp.cpp:898 tdecore/network/kresolver.cpp:563
-msgid "name or service not known"
-msgstr "ni adnabyddir enw neu gwasanaeth"
-
-#: tdecore/netsupp.cpp:899
-msgid "servname not supported for ai_socktype"
-msgstr "ni chynhelir servname am ai_socktype"
+#: tdecore/kcompletion.cpp:632
+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"
 
-#: tdecore/netsupp.cpp:900
-msgid "'ai_socktype' not supported"
-msgstr "ni chynhelir 'ai_socktype'"
+#: tdecore/kcompletion.cpp:638
+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"
 
-#: tdecore/netsupp.cpp:901
-msgid "system error"
-msgstr "gwall cysawd"
+#: tdecore/kcompletion.cpp:644
+msgid ""
+"There is no matching item available.\n"
+msgstr ""
+"Dim cydweddiad ar gael.\n"
 
 #: tdecore/kcalendarsystemjalali.cpp:392
 msgid "Far"
@@ -4019,49 +2978,165 @@ msgstr "Shanbe"
 msgid "Yek-shanbe"
 msgstr "Yek-shanbe"
 
-#: tdecore/kkeyserver_x11.cpp:113
-msgid "Win"
-msgstr " Win"
+#: tdecore/kdetcompmgr.cpp:35
+msgid "TDE composition manager detection utility"
+msgstr ""
 
-#: tdecore/kkeyserver_x11.cpp:119
-msgid "Backspace"
-msgstr "Yn ôl"
+#: tdecore/kdetcompmgr.cpp:46
+msgid "kdetcompmgr"
+msgstr ""
 
-#: tdecore/kkeyserver_x11.cpp:120
-msgid "SysReq"
-msgstr "SysReq"
+#: tdecore/tdestdaccel.cpp:54
+msgid "New"
+msgstr "Newydd"
 
-#: tdecore/kkeyserver_x11.cpp:121
-msgid "CapsLock"
-msgstr "PriflythGlo"
+#: tdecore/tdestdaccel.cpp:65
+msgid "Paste Selection"
+msgstr "Gludo'r Dewisiad"
 
-#: tdecore/kkeyserver_x11.cpp:122
-msgid "NumLock"
-msgstr "RhifGlo"
+#: tdecore/tdestdaccel.cpp:67
+msgid "Deselect"
+msgstr "Dad-ddewis"
 
-#: tdecore/kkeyserver_x11.cpp:123
-msgid "ScrollLock"
-msgstr "SgrolGlo"
+#: tdecore/tdestdaccel.cpp:68
+msgid "Delete Word Backwards"
+msgstr "Dileu Gair yn Ôl"
 
-#: tdecore/kkeyserver_x11.cpp:124
-msgid "PageUp"
-msgstr "Tudalen i Fyny"
+#: tdecore/tdestdaccel.cpp:69
+msgid "Delete Word Forward"
+msgstr "Dileu Gair Ymlaen"
 
-#: tdecore/kkeyserver_x11.cpp:125
-msgid "PageDown"
-msgstr "Tudalen i Lawr"
+#: tdecore/kkeyserver_x11.cpp:136 tdecore/tdestdaccel.cpp:70
+#: tdeui/keditcl2.cpp:107 tdeui/keditcl2.cpp:120 tdeui/keditcl2.cpp:377
+#: tdeui/keditcl2.cpp:390 tdeui/keditcl2.cpp:700 tdeutils/kfinddialog.cpp:119
+msgid "Find"
+msgstr "Canfod"
 
-#: tdecore/kkeyserver_x11.cpp:128
-msgid "Again"
-msgstr "Eto"
+#: tdecore/tdestdaccel.cpp:71 tdeutils/kfind.cpp:47
+msgid "Find Next"
+msgstr "Canfod Nesaf"
 
-#: tdecore/kkeyserver_x11.cpp:129
-msgid "Props"
-msgstr "Ategion"
+#: tdecore/tdestdaccel.cpp:72
+msgid "Find Prev"
+msgstr "Canfod Blaenorol"
 
-#: tdecore/kkeyserver_x11.cpp:131
-msgid "Front"
-msgstr "Ffront"
+#: tdecore/tdestdaccel.cpp:74
+msgid "Navigation"
+msgstr "Morlywiaeth"
+
+#: tdecore/tdestdaccel.cpp:75
+msgid ""
+"_: Opposite to End\n"
+"Home"
+msgstr "Cartref"
+
+#: tdecore/tdestdaccel.cpp:76
+msgid "End"
+msgstr "Diwedd"
+
+#: tdecore/tdestdaccel.cpp:77
+msgid "Beginning of Line"
+msgstr "Dechrau'r Llinell"
+
+#: tdecore/tdestdaccel.cpp:78 tdeutils/kfinddialog.cpp:464
+msgid "End of Line"
+msgstr "Diwedd y Llinell"
+
+#: tdecore/tdestdaccel.cpp:79
+msgid "Prior"
+msgstr "Cynt"
+
+#: tdecore/tdestdaccel.cpp:80
+msgid ""
+"_: Opposite to Prior\n"
+"Next"
+msgstr "Nesaf"
+
+#: tdecore/tdestdaccel.cpp:81 tdeui/keditcl2.cpp:976
+msgid "Go to Line"
+msgstr "Mynd i Linell"
+
+#: tdecore/tdestdaccel.cpp:82
+msgid "Add Bookmark"
+msgstr "Ychwanegu Tudnod"
+
+#: tdecore/tdestdaccel.cpp:83
+msgid "Zoom In"
+msgstr "Nesàu"
+
+#: tdecore/tdestdaccel.cpp:84
+msgid "Zoom Out"
+msgstr "Pellhàu"
+
+#: tdecore/tdestdaccel.cpp:85
+msgid "Up"
+msgstr "I fyny"
+
+#: tdecore/tdestdaccel.cpp:87
+msgid "Forward"
+msgstr "Ymlaen"
+
+#: tdecore/tdestdaccel.cpp:89
+msgid "Popup Menu Context"
+msgstr "Cyd-destun Naidlen"
+
+#: tdecore/tdestdaccel.cpp:90
+msgid "Show Menu Bar"
+msgstr "Dangos y Bar Dewislen"
+
+#: tdecore/tdestdaccel.cpp:91
+msgid "Backward Word"
+msgstr "Yn Ôl un Gair"
+
+#: tdecore/tdestdaccel.cpp:92
+msgid "Forward Word"
+msgstr "Ymlaen un Gair"
+
+#: tdecore/tdestdaccel.cpp:93
+msgid "Activate Next Tab"
+msgstr "Gweithredoli'r Tab Nesaf"
+
+#: tdecore/tdestdaccel.cpp:94
+msgid "Activate Previous Tab"
+msgstr "Gweithredoli'r Tab Cynt"
+
+#: tdecore/tdestdaccel.cpp:95
+msgid "Full Screen Mode"
+msgstr "Modd Sgrîn Llawn"
+
+#: tdecore/tdestdaccel.cpp:98
+msgid "What's This"
+msgstr "Beth yw Hwn"
+
+#: tdecore/tdestdaccel.cpp:99 tdecore/tdestdaccel.cpp:100
+#: tdeui/klineedit.cpp:886
+msgid "Text Completion"
+msgstr "Cwblhâd testun"
+
+#: tdecore/tdestdaccel.cpp:101
+msgid "Previous Completion Match"
+msgstr "Cydweddiad Cwblhâd Blaenorol"
+
+#: tdecore/tdestdaccel.cpp:102
+msgid "Next Completion Match"
+msgstr "Cydweddiad Cwblhâd Nesaf"
+
+#: tdecore/tdestdaccel.cpp:103
+msgid "Substring Completion"
+msgstr "Cwblhâd Is-linyn"
+
+#: tdecore/tdestdaccel.cpp:104
+msgid "Previous Item in List"
+msgstr "Eitem Cynt yn y Rhestr"
+
+#: tdecore/tdestdaccel.cpp:105
+msgid "Next Item in List"
+msgstr "Eitem Nesaf yn y Rhestr"
+
+#: tdeabc/address.cpp:312 tdeabc/phonenumber.cpp:199 tdecore/kcharsets.cpp:43
+#: tdecore/tdehw/tdenetworkconnections.cpp:802
+msgid "Other"
+msgstr "Eraill"
 
 #: tdecore/kcharsets.cpp:44 tdehtml/tdehtml_part.cpp:280
 msgid "Arabic"
@@ -4091,8 +3166,8 @@ msgstr "Cyrilig"
 msgid "Greek"
 msgstr "Groeg"
 
-#: tdecore/kcharsets.cpp:51 tdeui/ksconfig.cpp:235 tdeui/ksconfig.cpp:395
-#: tdeui/ksconfig.cpp:656 tdehtml/tdehtml_part.cpp:285
+#: tdecore/kcharsets.cpp:51 tdehtml/tdehtml_part.cpp:285
+#: tdeui/ksconfig.cpp:235 tdeui/ksconfig.cpp:395 tdeui/ksconfig.cpp:656
 msgid "Hebrew"
 msgstr "Hebraeg"
 
@@ -4108,8 +3183,8 @@ msgstr "Coreeg"
 msgid "Thai"
 msgstr "Taieg"
 
-#: tdecore/kcharsets.cpp:55 tdeui/ksconfig.cpp:240 tdeui/ksconfig.cpp:400
-#: tdeui/ksconfig.cpp:661 tdehtml/tdehtml_part.cpp:290
+#: tdecore/kcharsets.cpp:55 tdehtml/tdehtml_part.cpp:290
+#: tdeui/ksconfig.cpp:240 tdeui/ksconfig.cpp:400 tdeui/ksconfig.cpp:661
 msgid "Turkish"
 msgstr "Twrceg"
 
@@ -4144,2846 +3219,2251 @@ msgid ""
 "%1 ( %2 )"
 msgstr "%1 ( %2 )"
 
-#: tdecore/tdeglobalsettings.cpp:494
-msgid "Trash"
-msgstr "Sbwriel"
-
-#: tdecore/kcompletion.cpp:632
-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"
+#: tdecore/tdecmdlineargs.cpp:500 tdecore/tdecmdlineargs.cpp:516
+msgid "Unknown option '%1'."
+msgstr "Dewis anhysbys '%1'."
 
-#: tdecore/kcompletion.cpp:638
-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"
+#: tdecore/tdecmdlineargs.cpp:524
+msgid "'%1' missing."
+msgstr "'%1' ar goll."
 
-#: tdecore/kcompletion.cpp:644
+#: tdecore/tdecmdlineargs.cpp:619
 msgid ""
-"There is no matching item available.\n"
+"_: the 2nd argument is a list of name+address, one on each line\n"
+"%1 was written by\n"
+"%2"
 msgstr ""
-"Dim cydweddiad ar gael.\n"
-
-#: tdecore/kcalendarsystemhebrew.cpp:402
-msgid "Tishrey"
-msgstr " Tishrey"
-
-#: tdecore/kcalendarsystemhebrew.cpp:404
-msgid "Heshvan"
-msgstr "Heshvan"
-
-#: tdecore/kcalendarsystemhebrew.cpp:406
-msgid "Kislev"
-msgstr "Kislev"
-
-#: tdecore/kcalendarsystemhebrew.cpp:408
-msgid "Tevet"
-msgstr "Tevet"
-
-#: tdecore/kcalendarsystemhebrew.cpp:410
-msgid "Shvat"
-msgstr "Shvat"
-
-#: tdecore/kcalendarsystemhebrew.cpp:412
-msgid "Adar"
-msgstr "Adar"
-
-#: tdecore/kcalendarsystemhebrew.cpp:414
-msgid "Nisan"
-msgstr "Nisan"
-
-#: tdecore/kcalendarsystemhebrew.cpp:416
-msgid "Iyar"
-msgstr "Iyar"
-
-#: tdecore/kcalendarsystemhebrew.cpp:418
-msgid "Sivan"
-msgstr "Sivan"
-
-#: tdecore/kcalendarsystemhebrew.cpp:420
-msgid "Tamuz"
-msgstr "Tamuz"
-
-#: tdecore/kcalendarsystemhebrew.cpp:422
-msgid "Av"
-msgstr "Av"
-
-#: tdecore/kcalendarsystemhebrew.cpp:424
-msgid "Elul"
-msgstr "Elul"
-
-#: tdecore/kcalendarsystemhebrew.cpp:426
-msgid "Adar I"
-msgstr "Adar I"
+"ysgrifennwyd %1 gan\n"
+"%2"
 
-#: tdecore/kcalendarsystemhebrew.cpp:428
-msgid "Adar II"
-msgstr "Adar II"
+#: tdecore/tdecmdlineargs.cpp:622
+#, fuzzy
+msgid "This application was written by somebody who wants to remain anonymous."
+msgstr "Ysgrifennwyd %1 gan berson sy'n dymuno aros yn anhysbys."
 
-#: tdecore/tdeaboutdata.cpp:388
+#: tdecore/tdecmdlineargs.cpp:629
 #, fuzzy
 msgid ""
-"_: replace this with information about your translation team\n"
-"<p>TDE is translated into many languages thanks to the work of the translation "
-"teams all over the world.</p>"
-"<p>For more information on TDE internationalization visit <a "
-"href=\"http://l10n.kde.org\">http://l10n.kde.org</a></p>"
+"Please use http://bugs.pearsoncomputing.net to report bugs.\n"
 msgstr ""
-"<p>Cyfieithir TDE i mewn i lawer o ieithoedd diolch i tîmau cyfieithu dros y "
-"byd i gyd.</p>"
-"<p>Am ragor o wybodaeth ar rhyngwledeiddio TDE, ymwelwch â "
-"http://i18n.kde.org.</p>Am ragor o wybodaeth ar TDE a meddalwedd rhydd yn "
-"Gymraeg, ewch i http://www.kyfieithu.co.uk</p>"
+"Defnyddiwch http://bugs.kde.org er mwyn adrodd namau, peidiwch ac anfon ebost "
+"i'r awduron yn uniongyrchol.\n"
 
-#: tdecore/tdeaboutdata.cpp:444
+#: tdecore/tdecmdlineargs.cpp:632 tdecore/tdecmdlineargs.cpp:634
+#, fuzzy
 msgid ""
-"No licensing terms for this program have been specified.\n"
-"Please check the documentation or the source for any\n"
-"licensing terms.\n"
+"Please report bugs to %1.\n"
 msgstr ""
-"Ni phenodwyd termau trwyddedu am y rhaglen yma.\n"
-"Gwiriwch y ddogfeniaeth neu'r côd am unrhyw dermau \n"
-"trwyddedu.\n"
-
-#: tdecore/tdeaboutdata.cpp:451
-#, c-format
-msgid "This program is distributed under the terms of the %1."
-msgstr "Dosbarthir y rhaglen yma dan dermau'r %1."
-
-#: tdecore/kcalendarsystem.cpp:124
-msgid ""
-"_: Monday\n"
-"Mon"
-msgstr "Llun"
+"Defnyddiwch %1 er mwyn adrodd namau, peidiwch ac anfon ebost i'r awduron yn "
+"uniongyrchol.\n"
 
-#: tdecore/kcalendarsystem.cpp:125
-msgid ""
-"_: Tuesday\n"
-"Tue"
-msgstr "Maw"
+#: tdecore/tdecmdlineargs.cpp:660
+msgid "Unexpected argument '%1'."
+msgstr "Ymresymiad annisgwyl '%1'."
 
-#: tdecore/kcalendarsystem.cpp:126
-msgid ""
-"_: Wednesday\n"
-"Wed"
-msgstr "Mer"
+#: tdecore/tdecmdlineargs.cpp:765
+msgid "Use --help to get a list of available command line options."
+msgstr "Defnyddiwch --help i gael rhestr o ddewisiadau llinell gorchymyn."
 
-#: tdecore/kcalendarsystem.cpp:127
+#: tdecore/tdecmdlineargs.cpp:780
 msgid ""
-"_: Thursday\n"
-"Thu"
-msgstr "Iau"
+"\n"
+"%1:\n"
+msgstr ""
+"\n"
+"%1:\n"
 
-#: tdecore/kcalendarsystem.cpp:128
-msgid ""
-"_: Friday\n"
-"Fri"
-msgstr "Gwe"
+#: tdecore/tdecmdlineargs.cpp:789
+msgid "[options] "
+msgstr "[dewisiadau]"
 
-#: tdecore/kcalendarsystem.cpp:129
-msgid ""
-"_: Saturday\n"
-"Sat"
-msgstr "Sad"
+#: tdecore/tdecmdlineargs.cpp:796
+msgid "[%1-options]"
+msgstr "[%1-dewisiadau]"
 
-#: tdecore/kcalendarsystem.cpp:130
+#: tdecore/tdecmdlineargs.cpp:816
 msgid ""
-"_: Sunday\n"
-"Sun"
-msgstr "Sul"
-
-#: tdecore/ksocks.cpp:135
-msgid "NEC SOCKS client"
-msgstr "dibynnydd NEC SOCKS"
-
-#: tdecore/ksocks.cpp:170
-msgid "Dante SOCKS client"
-msgstr "dibynnydd Dante SOCKS"
-
-#: tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp:45
-msgid "Directory to generate files in"
-msgstr "Cyfeiriadur i greu ffeiliau ynddo"
-
-#: tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp:46
-msgid "Input kcfg XML file"
-msgstr "Mewnosod ffeil XML kcfg"
+"Usage: %1 %2\n"
+msgstr ""
+"Defnyddir: %1 %2\n"
 
-#: tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp:47
-msgid "Code generation options file"
-msgstr "Ffeil ddewisiadau am greu côd"
+#: tdecore/tdecmdlineargs.cpp:819
+msgid "Generic options"
+msgstr "Dewisiadau generig"
 
-#: tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp:955
-msgid "TDE .kcfg compiler"
-msgstr "Crynhoydd .kcfg TDE"
+#: tdecore/tdecmdlineargs.cpp:820
+msgid "Show help about options"
+msgstr "Dangos cymorth am ddewisiadau"
 
-#: tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp:956
-msgid "TDEConfig Compiler"
-msgstr "Crynhoydd TDEConfig"
+#: tdecore/tdecmdlineargs.cpp:828
+msgid "Show %1 specific options"
+msgstr "Dangos %1 dewisiadau penodol"
 
-#: tdecore/network/kresolver.cpp:558
-msgid "requested family not supported for this host name"
-msgstr "ni chynhelir y deulu benodol i'r enw gwesteiwr yma"
+#: tdecore/tdecmdlineargs.cpp:835
+msgid "Show all options"
+msgstr "Dangos y dewisiadau i gyd"
 
-#: tdecore/network/kresolver.cpp:561
-msgid "invalid flags"
-msgstr "baneri annilys"
+#: tdecore/tdecmdlineargs.cpp:836
+msgid "Show author information"
+msgstr "Dangos gwybodaeth awdur"
 
-#: tdecore/network/kresolver.cpp:564
-msgid "requested family not supported"
-msgstr "ni chynhelir deulu benodol"
+#: tdecore/tdecmdlineargs.cpp:837
+msgid "Show version information"
+msgstr "Dangos gwybodaeth fersiwn"
 
-#: tdecore/network/kresolver.cpp:565
-msgid "requested service not supported for this socket type"
-msgstr "ni chynhelir y gwasanaeth benodol am y math yma o soced"
+#: tdecore/tdecmdlineargs.cpp:838
+msgid "Show license information"
+msgstr "Dangos gwybodaeth trwydded"
 
-#: tdecore/network/kresolver.cpp:566
-msgid "requested socket type not supported"
-msgstr "ni chynhelir y math penodol o soced"
+#: tdecore/tdecmdlineargs.cpp:839
+msgid "End of options"
+msgstr "Diwedd y dewisiadau"
 
-#: tdecore/network/kresolver.cpp:567
-msgid "unknown error"
-msgstr "gwall anhysbys"
+#: tdecore/tdecmdlineargs.cpp:861
+msgid "%1 options"
+msgstr "%1 o ddewisiadau"
 
-#: tdecore/network/kresolver.cpp:569
-#, c-format
+#: tdecore/tdecmdlineargs.cpp:863
 msgid ""
-"_: 1: the i18n'ed system error code, from errno\n"
-"system error: %1"
-msgstr "gwall cysawd : %1"
-
-#: tdecore/network/kresolver.cpp:574
-msgid "request was canceled"
-msgstr "diddymwyd y cais"
+"\n"
+"Options:\n"
+msgstr ""
+"\n"
+"Dewisiadau:\n"
 
-#: tdecore/network/tdesocketbase.cpp:172
+#: tdecore/tdecmdlineargs.cpp:920
 msgid ""
-"_: Socket error code NoError\n"
-"no error"
-msgstr "dim gwall"
+"\n"
+"Arguments:\n"
+msgstr ""
+"\n"
+"Ymresymiadau:\n"
 
-#: tdecore/network/tdesocketbase.cpp:177
-msgid ""
-"_: Socket error code LookupFailure\n"
-"name lookup has failed"
-msgstr "methodd chwilio'r enw"
+#: tdecore/tdecmdlineargs.cpp:1282
+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"
 
-#: tdecore/network/tdesocketbase.cpp:182
-msgid ""
-"_: Socket error code AddressInUse\n"
-"address already in use"
-msgstr "mae'r cyfeiriad mewn defnydd eisoes"
+#: tdecore/kcheckaccelerators.cpp:148
+msgid "Dr. Klash' Accelerator Diagnosis"
+msgstr "Diagnosis Cyflymydd Dr Klash"
 
-#: tdecore/network/tdesocketbase.cpp:187
-msgid ""
-"_: Socket error code AlreadyBound\n"
-"socket is already bound"
-msgstr "mae'r soced wedi'i rhwymo eisoes"
+#: tdecore/kcheckaccelerators.cpp:155
+msgid "&Disable automatic checking"
+msgstr " &Analluogi cywiro awtomatig"
 
-#: tdecore/network/tdesocketbase.cpp:192
-msgid ""
-"_: Socket error code AlreadyCreated\n"
-"socket is already created"
-msgstr "mae'r soced wedi'i greu eisoes"
+#: tdecore/kcheckaccelerators.cpp:193
+msgid "<h2>Accelerators changed</h2>"
+msgstr "<h2>Newidwyd cyflymyddion</h2>"
 
-#: tdecore/network/tdesocketbase.cpp:197
-msgid ""
-"_: Socket error code NotBound\n"
-"socket is not bound"
-msgstr "ni rhwymir y soced"
+#: tdecore/kcheckaccelerators.cpp:199
+msgid "<h2>Accelerators removed</h2>"
+msgstr "<h2>Gwaredwyd cyflymyddion</h2>"
 
-#: tdecore/network/tdesocketbase.cpp:202
-msgid ""
-"_: Socket error code NotCreated\n"
-"socket has not been created"
-msgstr "ni chreuwyd y soced"
+#: tdecore/kcheckaccelerators.cpp:204
+msgid "<h2>Accelerators added (just for your info)</h2>"
+msgstr "<h2>Ychwanegwyd cyflymyddion (er eich gwybodaeth)</h2>"
 
-#: tdecore/network/tdesocketbase.cpp:207
-msgid ""
-"_: Socket error code WouldBlock\n"
-"operation would block"
-msgstr "bydd y gweithrediad yn rhwystro"
+#: tdecore/kkeyserver_x11.cpp:114
+msgid "Win"
+msgstr " Win"
 
-#: tdecore/network/tdesocketbase.cpp:212
-msgid ""
-"_: Socket error code ConnectionRefused\n"
-"connection actively refused"
-msgstr "gwrthodwyd y cysyltiad yn weithredol"
+#: tdecore/kkeyserver_x11.cpp:120
+msgid "Backspace"
+msgstr "Yn ôl"
 
-#: tdecore/network/tdesocketbase.cpp:217
-msgid ""
-"_: Socket error code ConnectionTimedOut\n"
-"connection timed out"
-msgstr "mae'r cysylltiad wedi goramseru"
+#: tdecore/kkeyserver_x11.cpp:121
+msgid "SysReq"
+msgstr "SysReq"
 
-#: tdecore/network/tdesocketbase.cpp:222
-msgid ""
-"_: Socket error code InProgress\n"
-"operation is already in progress"
-msgstr "mae'r gweithrediad ar y gweill eisoes"
+#: tdecore/kkeyserver_x11.cpp:122
+msgid "CapsLock"
+msgstr "PriflythGlo"
 
-#: tdecore/network/tdesocketbase.cpp:227
-msgid ""
-"_: Socket error code NetFailure\n"
-"network failure occurred"
-msgstr "methodd y rhwydwaith"
+#: tdecore/kkeyserver_x11.cpp:123
+msgid "NumLock"
+msgstr "RhifGlo"
 
-#: tdecore/network/tdesocketbase.cpp:232
-msgid ""
-"_: Socket error code NotSupported\n"
-"operation is not supported"
-msgstr "ni chynhelir y gweithrediad "
+#: tdecore/kkeyserver_x11.cpp:124
+msgid "ScrollLock"
+msgstr "SgrolGlo"
 
-#: tdecore/network/tdesocketbase.cpp:237
-msgid ""
-"_: Socket error code Timeout\n"
-"timed operation timed out"
-msgstr "mae gweithrediad amseredig wedi goramseru"
+#: tdecore/kkeyserver_x11.cpp:125
+msgid "PageUp"
+msgstr "Tudalen i Fyny"
 
-#: tdecore/network/tdesocketbase.cpp:242
-msgid ""
-"_: Socket error code UnknownError\n"
-"an unknown/unexpected error has happened"
-msgstr "digwyddodd gwall anhysbys/annisgwyl"
+#: tdecore/kkeyserver_x11.cpp:126
+msgid "PageDown"
+msgstr "Tudalen i Lawr"
 
-#: tdecore/network/tdesocketbase.cpp:247
-msgid ""
-"_: Socket error code RemotelyDisconnected\n"
-"remote host closed connection"
-msgstr "caeodd y gwesteiwr pell y cysylltiad"
+#: tdecore/kkeyserver_x11.cpp:129
+msgid "Again"
+msgstr "Eto"
 
-#: tdecore/network/tdesocketaddress.cpp:625
-#, c-format
-msgid ""
-"_: 1: the unknown socket address family number\n"
-"Unknown family %1"
-msgstr ""
+#: tdecore/kkeyserver_x11.cpp:130
+msgid "Props"
+msgstr "Ategion"
 
-#: knewstuff/uploaddialog.cpp:47
-msgid "Share Hot New Stuff"
-msgstr "Rhannu y Diweddaraf"
+#: tdecore/kkeyserver_x11.cpp:132
+msgid "Front"
+msgstr "Ffront"
 
-#: tdeui/kcolordialog.cpp:1133 knewstuff/uploaddialog.cpp:58
-#: tderesources/configdialog.cpp:53
-msgid "Name:"
-msgstr "Enw:"
+#: tdecore/klibloader.cpp:157
+msgid "The library %1 does not offer an %2 function."
+msgstr "Nid y'w rhaglengell %1 yn cynnig swyddogaeth %2."
 
-#: knewstuff/uploaddialog.cpp:63
-msgid "Author:"
-msgstr "Awdur:"
+#: tdecore/klibloader.cpp:168
+msgid "The library %1 does not offer a TDE compatible factory."
+msgstr "Nid yw'r rhaglengell %1 yn cynnig ffatri sy'n cyfaddas i TDE."
 
-#: knewstuff/uploaddialog.cpp:68
+#: tdecore/klibloader.cpp:184
 #, fuzzy
-msgid "Email:"
-msgstr "Ebost"
+msgid " %1 %2"
+msgstr "%1 %2, %3"
 
-#: tdeui/kbugreport.cpp:174 knewstuff/uploaddialog.cpp:73
-msgid "Version:"
-msgstr "Fersiwn :"
+#: tdecore/klibloader.cpp:425
+msgid "Library files for \"%1\" not found in paths."
+msgstr "Ni chanfuwyd ffeiliau llyfrgell ar gyfer \"%1\" ymysg y llwybrau."
 
-#: knewstuff/uploaddialog.cpp:78
-msgid "Release:"
-msgstr "Rhyddhâd:"
+#: tdecore/tdeconfigbackend.cpp:1162 tdecore/tdeconfigbackend.cpp:1171
+msgid ""
+"Will not save configuration.\n"
+msgstr ""
+"Ni fydd yn cadw'r ffurfweddiad.\n"
 
-#: knewstuff/uploaddialog.cpp:84
-msgid "License:"
-msgstr "Trwydded:"
+#: tdecore/tdeconfigbackend.cpp:1164 tdecore/tdeconfigbackend.cpp:1172
+msgid ""
+"Configuration file \"%1\" not writable.\n"
+msgstr ""
+"Methu ysgrifennu i'r ffeil ffurfweddiad \"%1\". \n"
 
-#: knewstuff/uploaddialog.cpp:88
-msgid "GPL"
-msgstr "GPL"
+#: tdecore/tdeconfigbackend.cpp:1179
+msgid "Please contact your system administrator."
+msgstr "Cysylltwch a'ch gwasanaethwr cysodau."
 
-#: knewstuff/uploaddialog.cpp:89
-msgid "LGPL"
-msgstr "LGPL"
+#: tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp:45
+msgid "Directory to generate files in"
+msgstr "Cyfeiriadur i greu ffeiliau ynddo"
 
-#: knewstuff/uploaddialog.cpp:90
-msgid "BSD"
-msgstr "BSD"
+#: tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp:46
+msgid "Input kcfg XML file"
+msgstr "Mewnosod ffeil XML kcfg"
 
-#: knewstuff/uploaddialog.cpp:93
-msgid "Language:"
-msgstr "Iaith:"
+#: tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp:47
+msgid "Code generation options file"
+msgstr "Ffeil ddewisiadau am greu côd"
 
-#: knewstuff/uploaddialog.cpp:99
-msgid "Preview URL:"
-msgstr "URL Rhagolwg:"
+#: tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp:955
+msgid "TDE .kcfg compiler"
+msgstr "Crynhoydd .kcfg TDE"
 
-#: knewstuff/uploaddialog.cpp:104
-msgid "Summary:"
-msgstr "Crynodeb:"
+#: tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp:956
+msgid "TDEConfig Compiler"
+msgstr "Crynhoydd TDEConfig"
 
-#: knewstuff/uploaddialog.cpp:121
-msgid "Please put in a name."
-msgstr "Rhowch enw, os gwelwch yn dda."
+#: tdecore/tdehw/tdestoragedevice.cpp:526
+msgid "%1 Removable Device"
+msgstr ""
 
-#: knewstuff/uploaddialog.cpp:191
-msgid "Old upload information found, fill out fields?"
-msgstr "Canfuwyd hen wybodaeth lanlwytho, llenwi'r meyseydd?"
+#: tdecore/tdehw/tdestoragedevice.cpp:529
+msgid "%1 Fixed Storage Device"
+msgstr ""
 
-#: knewstuff/uploaddialog.cpp:191
-msgid "Fill Out"
+#: tdecore/tdehw/tdestoragedevice.cpp:546
+#: tdecore/tdehw/tdestoragedevice.cpp:581
+msgid "Hard Disk Drive"
 msgstr ""
 
-#: knewstuff/uploaddialog.cpp:191
-msgid "Do Not Fill Out"
+#: tdecore/tdehw/tdestoragedevice.cpp:550
+msgid "Floppy Drive"
 msgstr ""
 
-#: knewstuff/knewstuffgeneric.cpp:139
-#, fuzzy
-msgid "The file '%1' already exists. Do you want to overwrite it?"
-msgstr "Mae'r ffeil '%1' mewn bod eisoes.  Ydych eisiau ysgrifennu drosto?"
+#: tdecore/tdehw/tdestoragedevice.cpp:553
+msgid "Optical Drive"
+msgstr ""
 
-#: tdehtml/tdehtml_ext.cpp:828 knewstuff/knewstuffgeneric.cpp:141
-msgid "Overwrite"
-msgstr " Dros-ysgrifennu"
+#: tdecore/tdehw/tdestoragedevice.cpp:556
+msgid "CDROM Drive"
+msgstr ""
 
-#: knewstuff/provider.cpp:270
-msgid "Error parsing providers list."
-msgstr "Gwall wrth ddosrannu'r rhestr o ddarparwyr."
+#: tdecore/tdehw/tdestoragedevice.cpp:559
+msgid "CDRW Drive"
+msgstr ""
 
-#: knewstuff/downloaddialog.cpp:101 knewstuff/downloaddialog.cpp:108
-#: knewstuff/downloaddialog.cpp:124 knewstuff/downloaddialog.cpp:131
-msgid "Get Hot New Stuff"
-msgstr "Nôl y Diweddaraf"
+#: tdecore/tdehw/tdestoragedevice.cpp:562
+msgid "DVD Drive"
+msgstr ""
 
-#: knewstuff/downloaddialog.cpp:228
-msgid "Welcome"
-msgstr "Croeso"
+#: tdecore/tdehw/tdestoragedevice.cpp:565
+msgid "DVDRW Drive"
+msgstr ""
 
-#: knewstuff/downloaddialog.cpp:259
-msgid "Highest Rated"
-msgstr "Ystyriedir y Gorau"
+#: tdecore/tdehw/tdestoragedevice.cpp:568
+msgid "DVDRAM Drive"
+msgstr ""
 
-#: knewstuff/downloaddialog.cpp:260
-msgid "Most Downloads"
-msgstr "Lawrlwythir yn Amlaf"
+#: tdecore/tdehw/tdestoragedevice.cpp:571
+msgid "Zip Drive"
+msgstr ""
 
-#: knewstuff/downloaddialog.cpp:261
-msgid "Latest"
-msgstr "Diweddaraf"
+#: tdecore/tdehw/tdestoragedevice.cpp:574
+msgid "Tape Drive"
+msgstr ""
 
-#: knewstuff/downloaddialog.cpp:271 knewstuff/downloaddialog.cpp:277
-#: knewstuff/downloaddialog.cpp:283
-msgid "Version"
-msgstr " Fersiwn"
+#: tdecore/tdehw/tdestoragedevice.cpp:577
+msgid "Digital Camera"
+msgstr ""
 
-#: knewstuff/downloaddialog.cpp:272
-msgid "Rating"
-msgstr "Poblogrwydd"
+#: tdecore/tdehw/tdestoragedevice.cpp:583
+#, fuzzy
+msgid "Removable Storage"
+msgstr "Diddymu Cofnod"
 
-#: knewstuff/downloaddialog.cpp:278
-msgid "Downloads"
-msgstr "Lawrlwythiadau"
+#: tdecore/tdehw/tdestoragedevice.cpp:586
+msgid "Compact Flash"
+msgstr ""
 
-#: knewstuff/downloaddialog.cpp:284
-msgid "Release Date"
-msgstr "Dyddiad Rhyddháu"
+#: tdecore/tdehw/tdestoragedevice.cpp:589
+msgid "Memory Stick"
+msgstr ""
 
-#: knewstuff/downloaddialog.cpp:294
-msgid "Install"
-msgstr "Arsefydlu"
+#: tdecore/tdehw/tdestoragedevice.cpp:592
+msgid "Smart Media"
+msgstr ""
 
-#: tdeui/tdemessagebox.cpp:246 knewstuff/downloaddialog.cpp:295
-#: knewstuff/downloaddialog.cpp:505
-msgid "Details"
-msgstr " Manylion"
+#: tdecore/tdehw/tdestoragedevice.cpp:595
+#, fuzzy
+msgid "Secure Digital"
+msgstr "Diogelwch"
 
-#: knewstuff/downloaddialog.cpp:477
-msgid ""
-"Name: %1\n"
-"Author: %2\n"
-"License: %3\n"
-"Version: %4\n"
-"Release: %5\n"
-"Rating: %6\n"
-"Downloads: %7\n"
-"Release date: %8\n"
-"Summary: %9\n"
+#: tdecore/tdehw/tdestoragedevice.cpp:600
+msgid "Random Access Memory"
 msgstr ""
-"Enw: %1\n"
-"Awdur: %2\n"
-"Trwydded: %3\n"
-"Fersiwn: %4\n"
-"Rhyddhâd: %5\n"
-"Poblogrwydd: %6\n"
-"Lawrlwythiadau: %7\n"
-"Dyddiad rhyddháu: %8\n"
-"Crynodeb: %9\n"
 
-#: knewstuff/downloaddialog.cpp:499
-msgid ""
-"Preview: %1\n"
-"Payload: %2\n"
+#: tdecore/tdehw/tdestoragedevice.cpp:603
+msgid "Loop Device"
 msgstr ""
-"Rhagolwg: %1\n"
-"Prif lwyth: %2\n"
 
-#: knewstuff/downloaddialog.cpp:600
-msgid "Installation successful."
-msgstr "Llwyddodd yr arsefydlu."
-
-#: knewstuff/downloaddialog.cpp:600 knewstuff/downloaddialog.cpp:602
-msgid "Installation"
-msgstr "Arsefydlu"
-
-#: knewstuff/downloaddialog.cpp:602
-msgid "Installation failed."
-msgstr "Methodd yr arsefydlu."
+#: tdecore/tdehw/tdestoragedevice.cpp:946
+msgid "No supported mounting methods were detected on your system"
+msgstr ""
 
-#: knewstuff/downloaddialog.cpp:696
-#, fuzzy
-msgid "Preview not available."
+#: tdecore/tdehw/tdestoragedevice.cpp:1124
+msgid "No supported unmounting methods were detected on your system"
 msgstr ""
-"Dim cydweddiad ar gael.\n"
 
-#: knewstuff/knewstuff.cpp:38 knewstuff/knewstuffbutton.cpp:61
+#: tdecore/tdehw/tdegenericdevice.cpp:256
 #, c-format
-msgid "Download New %1"
-msgstr "Lawrlwytho %1 Newydd"
-
-#: knewstuff/engine.cpp:218
-msgid "Successfully installed hot new stuff."
-msgstr "Wedi arsefydlu'r diweddaraf yn llwyddiannus."
-
-#: knewstuff/engine.cpp:223
-msgid "Failed to install hot new stuff."
-msgstr "Wedi methu arsefydlu'r diweddaraf yn llwyddiannus."
-
-#: knewstuff/engine.cpp:278
-msgid "Unable to create file to upload."
-msgstr "Wedi methu creu ffeil i lanlwytho."
-
-#: knewstuff/engine.cpp:293
-msgid ""
-"The files to be uploaded have been created at:\n"
+msgid "ACPI Node %1"
 msgstr ""
-"Mae'r ffeiliau i lanlwytho wedi eu creu wrth:\n"
 
-#: knewstuff/engine.cpp:294
-msgid ""
-"Data file: %1\n"
+#: tdecore/tdehw/tdegenericdevice.cpp:277
+#: tdecore/tdehw/tdegenericdevice.cpp:295
+msgid "ACPI Lid Switch"
 msgstr ""
-"Ffeil ddata: %1\n"
 
-#: knewstuff/engine.cpp:296
-msgid ""
-"Preview image: %1\n"
+#: tdecore/tdehw/tdegenericdevice.cpp:280
+#: tdecore/tdehw/tdegenericdevice.cpp:298
+msgid "ACPI Sleep Button"
 msgstr ""
-"Rhagolygu delwedd: %1\n"
 
-#: knewstuff/engine.cpp:298
-msgid ""
-"Content information: %1\n"
+#: tdecore/tdehw/tdegenericdevice.cpp:283
+#: tdecore/tdehw/tdegenericdevice.cpp:301
+msgid "ACPI Power Button"
 msgstr ""
-"Gwybodaeth gynnwys: %1\n"
 
-#: knewstuff/engine.cpp:299
-msgid ""
-"Those files can now be uploaded.\n"
+#: tdecore/tdehw/tdegenericdevice.cpp:290
+msgid "Generic Event Device"
 msgstr ""
-"Gellir lanlwytho'r ffeiliau yma rwan.\n"
-
-#: knewstuff/engine.cpp:300
-msgid "Beware that any people might have access to them at any time."
-msgstr "Sylwer: gall unrhyw berson eu cyrchu wrth unrhyw amser."
 
-#: knewstuff/engine.cpp:302
-msgid "Upload Files"
-msgstr "Lanlwytho Ffeiliau"
-
-#: knewstuff/engine.cpp:307
-msgid "Please upload the files manually."
-msgstr "Lanlwythwch y ffeiliau â llaw, os gwelwch yn dda."
+#: tdecore/tdehw/tdegenericdevice.cpp:308
+#, fuzzy
+msgid "Generic Input Device"
+msgstr "Dewisiadau generig"
 
-#: knewstuff/engine.cpp:311
-msgid "Upload Info"
-msgstr "Gwybodaeth Lanlwytho"
+#: tdecore/tdehw/tdegenericdevice.cpp:315
+#: tdecore/tdehw/tdehardwaredevices.cpp:3140
+msgid "Generic %1 Device"
+msgstr ""
 
-#: knewstuff/engine.cpp:319
-msgid "&Upload"
-msgstr "&Lanlwytho"
+#: tdecore/tdehw/tdegenericdevice.cpp:322
+#, c-format
+msgid "Virtual Device %1"
+msgstr ""
 
-#: knewstuff/engine.cpp:421
-msgid "Successfully uploaded new stuff."
-msgstr "Wedi lanlwytho'r diweddaraf yn llyddiannus."
+#: tdecore/tdehw/tdegenericdevice.cpp:325
+msgid "Unknown Virtual Device"
+msgstr ""
 
-#: knewstuff/knewstuffbutton.cpp:49
-msgid "Download New Stuff"
-msgstr "Lawrlwytho y Diweddaraf"
+#: tdecore/tdehw/tdegenericdevice.cpp:330
+#: tdecore/tdehw/tdehardwaredevices.cpp:4088
+#, fuzzy
+msgid "Unknown Device"
+msgstr "Maes Anhysbys"
 
-#: knewstuff/knewstuffsecure.cpp:83
-msgid ""
-"There was an error with the downloaded resource tarball file. Possible causes "
-"are damaged archive or invalid directory structure in the archive."
+#: tdecore/tdehw/tdeeventdevice.cpp:288
+msgid "Lid Switch"
 msgstr ""
 
-#: knewstuff/knewstuffsecure.cpp:83
+#: tdecore/tdehw/tdeeventdevice.cpp:291
 #, fuzzy
-msgid "Resource Installation Error"
-msgstr "Dewis Adnoddau"
+msgid "Tablet Mode"
+msgstr "Modd Tudalen Ta&b"
 
-#: knewstuff/knewstuffsecure.cpp:94
-msgid "No keys were found."
+#: tdecore/tdehw/tdeeventdevice.cpp:294
+msgid "Headphone Inserted"
 msgstr ""
 
-#: knewstuff/knewstuffsecure.cpp:99
-msgid "The validation failed for unknown reason."
+#: tdecore/tdehw/tdeeventdevice.cpp:297
+msgid "Radio Frequency Device Kill Switch"
 msgstr ""
 
-#: knewstuff/knewstuffsecure.cpp:106
-msgid "The MD5SUM check failed, the archive might be broken."
+#: tdecore/tdehw/tdeeventdevice.cpp:300
+msgid "Enable Radio"
 msgstr ""
 
-#: knewstuff/knewstuffsecure.cpp:111
-msgid "The signature is bad, the archive might be broken or altered."
+#: tdecore/tdehw/tdeeventdevice.cpp:303
+msgid "Microphone Inserted"
 msgstr ""
 
-#: knewstuff/knewstuffsecure.cpp:121
-msgid "The signature is valid, but untrusted."
+#: tdecore/tdehw/tdeeventdevice.cpp:306
+#, fuzzy
+msgid "Docked"
+msgstr "Docio"
+
+#: tdecore/tdehw/tdeeventdevice.cpp:309
+msgid "Line Out Inserted"
 msgstr ""
 
-#: knewstuff/knewstuffsecure.cpp:127
-msgid "The signature is unknown."
+#: tdecore/tdehw/tdeeventdevice.cpp:312
+msgid "Physical Jack Inserted"
 msgstr ""
 
-#: knewstuff/knewstuffsecure.cpp:131
-msgid ""
-"The resource was signed with key <i>0x%1</i>, belonging to <i>%2 &lt;%3&gt;</i>"
-"."
+#: tdecore/tdehw/tdeeventdevice.cpp:315
+msgid "Video Out Inserted"
 msgstr ""
 
-#: knewstuff/knewstuffsecure.cpp:137
-msgid ""
-"<qt>There is a problem with the resource file you have downloaded. The errors "
-"are :<b>%1</b>"
-"<br>%2"
-"<br>"
-"<br>Installation of the resource is <b>not recommended</b>."
-"<br>"
-"<br>Do you want to proceed with the installation?</qt>"
+#: tdecore/tdehw/tdeeventdevice.cpp:318
+msgid "Camera Lens Cover"
 msgstr ""
 
-#: knewstuff/knewstuffsecure.cpp:137
-msgid "Problematic Resource File"
+#: tdecore/tdehw/tdeeventdevice.cpp:321
+msgid "Keypad Slide"
 msgstr ""
 
-#: knewstuff/knewstuffsecure.cpp:140
-msgid "<qt>%1<br><br>Press OK to install it.</qt>"
+#: tdecore/tdehw/tdeeventdevice.cpp:324
+msgid "Front Proximity"
 msgstr ""
 
-#: knewstuff/knewstuffsecure.cpp:140
+#: tdecore/tdehw/tdeeventdevice.cpp:327
 #, fuzzy
-msgid "Valid Resource"
-msgstr "Adnoddau"
+msgid "Rotate Lock"
+msgstr "Cylchdroi yn &Glocwedd"
 
-#: knewstuff/knewstuffsecure.cpp:190
-msgid "The signing failed for unknown reason."
+#: tdecore/tdehw/tdeeventdevice.cpp:330
+msgid "Line In Inserted"
 msgstr ""
 
-#: knewstuff/knewstuffsecure.cpp:195
-msgid ""
-"There are no keys usable for signing or you did not entered the correct "
-"passphrase.\n"
-"Proceed without signing the resource?"
+#: tdecore/tdehw/tdeeventdevice.cpp:333
+msgid "Power Button"
 msgstr ""
 
-#: knewstuff/security.cpp:63
-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>"
+#: tdecore/tdehw/tdeeventdevice.cpp:336
+msgid "Sleep Button"
 msgstr ""
 
-#: knewstuff/security.cpp:177
-msgid ""
-"<qt>Enter passphrase for key <b>0x%1</b>, belonging to"
-"<br><i>%2&lt;%3&gt;</i>:</qt>"
+#: tdecore/tdehw/tdenetworkconnections.cpp:525
+msgid "hidden"
 msgstr ""
 
-#: knewstuff/security.cpp:257
-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>"
+#: tdecore/tdehw/tdenetworkconnections.cpp:769
+msgid "Wired Ethernet"
 msgstr ""
 
-#: knewstuff/security.cpp:317
-#, fuzzy
-msgid "Select Signing Key"
-msgstr "Dewis Ardal Delwedd"
-
-#: knewstuff/security.cpp:317
-msgid "Key used for signing:"
+#: tdecore/tdehw/tdenetworkconnections.cpp:772
+msgid "802.11 WiFi"
 msgstr ""
 
-#: knewstuff/security.cpp:338
-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>"
+#: tdecore/tdehw/tdehardwaredevices.cpp:4049
+#: tdecore/tdehw/tdenetworkconnections.cpp:775
+msgid "Bluetooth"
 msgstr ""
 
-#: knewstuff/ghns.cpp:50
-msgid "Get hot new stuff:"
-msgstr "Nôl y diweddaraf:"
-
-#: knewstuff/tdehotnewstuff.cpp:31
-msgid "Display only media of this type"
-msgstr "Arddangos cyfryngau o'r math yma yn unig"
-
-#: knewstuff/tdehotnewstuff.cpp:32
-msgid "Provider list to use"
-msgstr "Rhestr darparwyr i'w defnyddio"
+#: tdecore/tdehw/tdenetworkconnections.cpp:778
+msgid "OLPC Mesh"
+msgstr ""
 
-#: knewstuff/providerdialog.cpp:53
-msgid "Hot New Stuff Providers"
-msgstr "Darparwyr y Diweddaraf"
+#: tdecore/tdehw/tdenetworkconnections.cpp:781
+msgid "WiMax"
+msgstr ""
 
-#: knewstuff/providerdialog.cpp:61
-msgid "Please select one of the providers listed below:"
-msgstr "Dewiswch un o'r darparwyr o'r rhestr isod:"
+#: tdecore/tdehw/tdenetworkconnections.cpp:784
+msgid "Cellular Modem"
+msgstr ""
 
-#: knewstuff/providerdialog.cpp:88
-msgid "No provider selected."
-msgstr "Nid oes darparwr wedi ei dewis."
+#: tdecore/tdehw/tdenetworkconnections.cpp:787
+msgid "Infiniband"
+msgstr ""
 
-#: tdeui/kkeydialog.cpp:321
-msgid "Clear Search"
-msgstr "Gwagu'r Chwiliad"
+#: tdecore/tdehw/tdenetworkconnections.cpp:790
+msgid "Bond"
+msgstr ""
 
-#: tdeui/kkeydialog.cpp:324
-msgid "&Search:"
-msgstr "&Chwilio:"
+#: tdecore/tdehw/tdenetworkconnections.cpp:793
+msgid "Virtual LAN"
+msgstr ""
 
-#: tdeui/kkeydialog.cpp:331
-msgid ""
-"Search interactively for shortcut names (e.g. Copy) or combination of keys "
-"(e.g. Ctrl+C) by typing them here."
+#: tdecore/tdehw/tdenetworkconnections.cpp:796
+msgid "ADSL"
 msgstr ""
-"Chwilio yn rhyngweithiol ar gyfer enwau byrlwybrau (e.e. Copïo) neu cyfuniad o "
-"fysellau (e.e. Ctrl+C) gan eu teipio yma."
 
-#: tdeui/kkeydialog.cpp:354
-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."
+#: tdecore/tdehw/tdenetworkconnections.cpp:799
+msgid "Virtual Private Network"
 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."
 
-#: tdeui/kkeydialog.cpp:363
-msgid "Action"
-msgstr "Gweithrediad"
+#: tdecore/tdehw/tdehardwaredevices.cpp:3145
+msgid "Disconnected %1 Port"
+msgstr ""
 
-#: tdeui/kkeydialog.cpp:364
-msgid "Shortcut"
-msgstr "Byrlwybr"
+#: tdecore/tdehw/tdehardwaredevices.cpp:3513
+#: tdecore/tdehw/tdehardwaredevices.cpp:3593
+#: tdecore/tdehw/tdehardwaredevices.cpp:3605
+#, fuzzy
+msgid "Unknown PCI Device"
+msgstr "Maes Anhysbys"
 
-#: tdeui/kkeydialog.cpp:365
-msgid "Alternate"
-msgstr "Eiledol"
+#: tdecore/tdehw/tdehardwaredevices.cpp:3623
+#: tdecore/tdehw/tdehardwaredevices.cpp:3703
+#: tdecore/tdehw/tdehardwaredevices.cpp:3715
+#, fuzzy
+msgid "Unknown USB Device"
+msgstr "Maes Anhysbys"
 
-#: tdeui/kkeydialog.cpp:380
-msgid "Shortcut for Selected Action"
-msgstr "Byrlwybr i'r gweithrediad a ddewiswyd"
+#: tdecore/tdehw/tdehardwaredevices.cpp:3744
+#: tdecore/tdehw/tdehardwaredevices.cpp:3785
+#, fuzzy
+msgid "Unknown PNP Device"
+msgstr "Maes Anhysbys"
 
-#: tdeui/kkeydialog.cpp:393
-msgid ""
-"_: no key\n"
-"&None"
-msgstr "&Dim"
+#: tdecore/tdehw/tdehardwaredevices.cpp:3814
+#: tdecore/tdehw/tdehardwaredevices.cpp:3855
+msgid "Unknown Monitor Device"
+msgstr ""
 
-#: tdeui/kkeydialog.cpp:398
-msgid "The selected action will not be associated with any key."
-msgstr "Ni chysylltir y gweithrediad a ddewiswyd efo unrhyw bysell."
+#: tdecore/tdehw/tdehardwaredevices.cpp:3944
+#, fuzzy
+msgid "Root"
+msgstr "DimGwraiddCA"
 
-#: tdeui/kkeydialog.cpp:401
-msgid ""
-"_: default key\n"
-"De&fault"
-msgstr "&Rhagosodol"
+#: tdecore/tdehw/tdehardwaredevices.cpp:3947
+#, fuzzy
+msgid "System Root"
+msgstr "Dewislen y Cysawd"
 
-#: tdeui/kkeydialog.cpp:406
-msgid ""
-"This will bind the default key to the selected action. Usually a reasonable "
-"choice."
+#: tdecore/tdehw/tdehardwaredevices.cpp:3950
+msgid "CPU"
 msgstr ""
-"Fe rhwymir y fysell rhagosodol i'r gweithrediad a ddewiswyd. Dewis rhesymol fel "
-"arfer."
 
-#: tdeui/kkeydialog.cpp:409
-msgid "C&ustom"
-msgstr "A&ddasu"
+#: tdecore/tdehw/tdehardwaredevices.cpp:3953
+#, fuzzy
+msgid "Graphics Processor"
+msgstr "Safle Daearyddol"
 
-#: tdeui/kkeydialog.cpp:414
-msgid ""
-"If this option is selected you can create a customized key binding for the "
-"selected action using the buttons below."
+#: tdecore/tdehw/tdehardwaredevices.cpp:3956
+msgid "RAM"
 msgstr ""
-"Pan detholir y dewis yma, cewch greu rhwymiad bysell addasol i'r gweithrediad a "
-"ddewiswyd wrth ddefnyddio'r botymau isod."
 
-#: tdeui/kkeydialog.cpp:428
-msgid ""
-"Use this button to choose a new shortcut key. Once you click it, you can press "
-"the key-combination which you would like to be assigned to the currently "
-"selected action."
+#: tdecore/tdehw/tdehardwaredevices.cpp:3959
+msgid "Bus"
 msgstr ""
-"Defnyddiwch y botwm yma i greu bysell newydd byrlwybr. Ar ôl i chi ei glicio, "
-"cewch wthio'r gyfuniad o fysellau i'w neilltuo i'r gweithrediad a ddewisir ar "
-"hyn o bryd."
 
-#: tdeui/kkeydialog.cpp:470
-msgid "Shortcuts"
-msgstr "Byrlwybrau"
-
-#: tdeui/kkeydialog.cpp:536
-msgid "Default key:"
-msgstr "Bysell rhagosodol:"
-
-#: tdeui/kkeybutton.cpp:89 tdeui/kkeydialog.cpp:536 tdeui/klineedit.cpp:889
-msgid "None"
-msgstr "Dim"
-
-#: tdeui/kkeydialog.cpp:715
-msgid ""
-"In order to use the '%1' key as a shortcut, it must be combined with the Win, "
-"Alt, Ctrl, and/or Shift keys."
+#: tdecore/tdehw/tdehardwaredevices.cpp:3962
+msgid "I2C Bus"
 msgstr ""
-"Er mwyn defnyddio'r fysell '%1' fel byrlwybr, rhaid ei chyfuno efo'r bysellau "
-"Win, Alt, Ctrl, a/neu Shift."
 
-#: tdeui/kkeydialog.cpp:718
-msgid "Invalid Shortcut Key"
-msgstr "Bysell Fyrlwybr Annilys"
-
-#: tdeui/kkeydialog.cpp:943
-msgid ""
-"The '%1' key combination has already been allocated to the \"%2\" action.\n"
-"Please choose a unique key combination."
+#: tdecore/tdehw/tdehardwaredevices.cpp:3965
+msgid "MDIO Bus"
 msgstr ""
-"Mae cyfuniad bysell %1 wedi ei dyrannu yn barod i'r gweithrediad \"%2\".\n"
-" Dewiswch cyfuniad bysell unigryw."
 
-#: tdeui/kkeydialog.cpp:958
-msgid "Conflict with Standard Application Shortcut"
-msgstr "Croestyniad efo Byrlwybr Cymhwysiad Arferol"
+#: tdecore/tdehw/tdehardwaredevices.cpp:3968
+#, fuzzy
+msgid "Mainboard"
+msgstr "Prif Far Offer"
 
-#: tdeui/kkeydialog.cpp:959
-msgid ""
-"The '%1' key combination has already been allocated to the standard action "
-"\"%2\".\n"
-"Do you want to reassign it from that action to the current one?"
+#: tdecore/tdehw/tdehardwaredevices.cpp:3971
+msgid "Disk"
 msgstr ""
-"Mae cyfuniad bysell '%1' wedi ei dyrannu yn barod i'r weithred safonol \"%2\".\n"
-"Ydych eisiau ei ail-neilltuo o'r weithred yna i'r un gyfredol?"
-
-#: tdeui/kkeydialog.cpp:964
-msgid "Conflict with Global Shortcut"
-msgstr "Croestyniad efo Byrlwybr Eang"
 
-#: tdeui/kkeydialog.cpp:965
-msgid ""
-"The '%1' key combination has already been allocated to the global action "
-"\"%2\".\n"
-"Do you want to reassign it from that action to the current one?"
+#: tdecore/tdehw/tdehardwaredevices.cpp:3974
+msgid "SCSI"
 msgstr ""
-"Mae cyfuniad bysell '%1' wedi ei dyrannu yn barod i'r weithred eang \"%2\".\n"
-"Ydych eisiau ei ail-neilltuo o'r weithred yna i'r un gyfredol?"
 
-#: tdeui/kkeydialog.cpp:970
-msgid "Key Conflict"
-msgstr "Croestyniad Bysell"
+#: tdecore/tdehw/tdehardwaredevices.cpp:3977
+msgid "Storage Controller"
+msgstr ""
 
-#: tdeui/kkeydialog.cpp:971
-msgid ""
-"The '%1' key combination has already been allocated to the \"%2\" action.\n"
-"Do you want to reassign it from that action to the current one?"
+#: tdecore/tdehw/tdehardwaredevices.cpp:3980
+msgid "Mouse"
 msgstr ""
-"Mae cyfuniad bysell '%1' wedi ei dyrannu yn barod i'r weithred \"%2\".\n"
-"Ydych eisiau ei ail-neilltuo o'r weithred yna i'r un gyfredol?"
 
-#: tdeui/kkeydialog.cpp:977
-#, fuzzy
-msgid "Reassign"
-msgstr "Rwsieg"
+#: tdecore/tdehw/tdehardwaredevices.cpp:3983
+msgid "Keyboard"
+msgstr ""
 
-#: tdeui/kkeydialog.cpp:1091 tdeui/kkeydialog.cpp:1103
-msgid "Configure Shortcuts"
-msgstr "Ffurfweddu Byrlwybrau"
+#: tdecore/tdehw/tdehardwaredevices.cpp:3986
+msgid "HID"
+msgstr ""
 
-#: tdeui/ktabbar.cpp:196
-msgid "Close this tab"
-msgstr "Cau'r tab yma"
+#: tdeabc/phonenumber.cpp:178 tdecore/tdehw/tdehardwaredevices.cpp:3989
+msgid "Modem"
+msgstr "Modem"
 
-#: tdeui/kpixmapregionselectordialog.cpp:28
-msgid "Select Region of Image"
-msgstr "Dewis Ardal Delwedd"
+#: tdecore/tdehw/tdehardwaredevices.cpp:3992
+msgid "Monitor and Display"
+msgstr ""
 
-#: tdeui/kpixmapregionselectordialog.cpp:31
-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:"
+#: tdecore/tdehw/tdehardwaredevices.cpp:3995
+msgid "Network"
+msgstr ""
 
-#: tdeui/kswitchlanguagedialog.cpp:90
+#: tdecore/tdehw/tdehardwaredevices.cpp:3998
 #, fuzzy
-msgid "Switch application language"
-msgstr "gosod enw'r cymhwysiad"
+msgid "Printer"
+msgstr "Argraffu"
 
-#: tdeui/kswitchlanguagedialog.cpp:96
-msgid "Please choose language which should be used for this application"
+#: tdecore/tdehw/tdehardwaredevices.cpp:4001
+msgid "Scanner"
 msgstr ""
 
-#: tdeui/kswitchlanguagedialog.cpp:123
+#: tdeabc/addressee.cpp:936 tdecore/tdehw/tdehardwaredevices.cpp:4004
+msgid "Sound"
+msgstr "Sŵn"
+
+#: tdecore/tdehw/tdehardwaredevices.cpp:4007
 #, fuzzy
-msgid "Add fallback language"
-msgstr "Iaith rhagosodol:"
+msgid "Video Capture"
+msgstr "Bar Offer Fideo"
 
-#: tdeui/kswitchlanguagedialog.cpp:124
-msgid ""
-"Adds one more language which will be used if other translations do not contain "
-"proper translation"
+#: tdecore/tdehw/tdehardwaredevices.cpp:4010
+msgid "IEEE1394"
 msgstr ""
 
-#: tdeui/kswitchlanguagedialog.cpp:222
-msgid ""
-"Language for this application has been changed. The change will take effect "
-"upon next start of application"
+#: tdecore/tdehw/tdehardwaredevices.cpp:4013
+msgid "PCMCIA"
 msgstr ""
 
-#: tdeui/kswitchlanguagedialog.cpp:223
-#, fuzzy
-msgid "Application language changed"
-msgstr "Cymhwysiad:"
-
-#: tdeui/kswitchlanguagedialog.cpp:282
-#, fuzzy
-msgid "Primary language:"
-msgstr "Iaith rhagosodol:"
+#: tdecore/tdehw/tdehardwaredevices.cpp:4016
+msgid "Camera"
+msgstr ""
 
-#: tdeui/kswitchlanguagedialog.cpp:282
+#: tdecore/tdehw/tdehardwaredevices.cpp:4019
 #, fuzzy
-msgid "Fallback language:"
-msgstr "Iaith rhagosodol:"
+msgid "Text I/O"
+msgstr "Testun yn Unig"
 
-#: tdeui/kswitchlanguagedialog.cpp:316
-msgid ""
-"This is main application language which will be used first before any other "
-"languages"
+#: tdecore/tdehw/tdehardwaredevices.cpp:4022
+msgid "Serial Communications Controller"
 msgstr ""
 
-#: tdeui/kswitchlanguagedialog.cpp:320
-msgid ""
-"This is language which will be used if any previous languages does not contain "
-"proper translation"
+#: tdecore/tdehw/tdehardwaredevices.cpp:4025
+msgid "Parallel Port"
 msgstr ""
 
-#: tdeui/ksconfig.cpp:102
-msgid "Create &root/affix combinations not in dictionary"
-msgstr "Creu cyfuniadau &gwraidd/at-ddodiad sy ddim yn y geiriadur"
-
-#: tdeui/ksconfig.cpp:107
-msgid "Consider run-together &words as spelling errors"
-msgstr "Ystyried geiriau &difwlch fel camgymeriadau sillafu"
-
-#: tdeui/ksconfig.cpp:118
-msgid "&Dictionary:"
-msgstr "&Geiriadur:"
-
-#: tdeui/ksconfig.cpp:143
-msgid "&Encoding:"
-msgstr "&Amgodiad:"
-
-#: tdeui/ksconfig.cpp:148
-msgid "International Ispell"
-msgstr "Ispell Rhyngwladol"
-
-#: tdeui/ksconfig.cpp:149
-msgid "Aspell"
-msgstr "Aspell"
-
-#: tdeui/ksconfig.cpp:150
-msgid "Hspell"
-msgstr " Hspell"
+#: tdecore/tdehw/tdehardwaredevices.cpp:4028
+msgid "Peripheral"
+msgstr ""
 
-#: tdeui/ksconfig.cpp:151
+#: tdecore/tdehw/tdehardwaredevices.cpp:4031
 #, fuzzy
-msgid "Zemberek"
-msgstr "Tachwedd"
-
-#: tdeui/ksconfig.cpp:156
-msgid "&Client:"
-msgstr "&Dibynnydd:"
-
-#: tdeui/ksconfig.cpp:297
-msgid "Spanish"
-msgstr "Sbaeneg"
-
-#: tdeui/ksconfig.cpp:300
-msgid "Danish"
-msgstr "Daneg"
-
-#: tdeui/ksconfig.cpp:303
-msgid "German"
-msgstr "Almaeneg"
-
-#: tdeui/ksconfig.cpp:306
-msgid "German (new spelling)"
-msgstr "Almaeneg (sillafu newydd)"
-
-#: tdeui/ksconfig.cpp:309
-msgid "Brazilian Portuguese"
-msgstr "Portiwgaleg o Frasil"
+msgid "Backlight"
+msgstr "Yn ôl"
 
-#: tdeui/ksconfig.cpp:312
-msgid "Portuguese"
-msgstr "Portiwgaleg"
+#: tdecore/tdehw/tdehardwaredevices.cpp:4034
+msgid "Battery"
+msgstr ""
 
-#: tdeui/ksconfig.cpp:315
-msgid "Esperanto"
-msgstr "Esperanto"
+#: tdecore/tdehw/tdehardwaredevices.cpp:4037
+msgid "Power Supply"
+msgstr ""
 
-#: tdeui/ksconfig.cpp:318
-msgid "Norwegian"
-msgstr "Norwyeg"
+#: tdecore/tdehw/tdehardwaredevices.cpp:4040
+#, fuzzy
+msgid "Docking Station"
+msgstr "Gogwydd"
 
-#: tdeui/ksconfig.cpp:321
-msgid "Polish"
-msgstr "Pwyleg"
+#: tdecore/tdehw/tdehardwaredevices.cpp:4043
+#, fuzzy
+msgid "Thermal Sensor"
+msgstr "Gosodiadau Cyffredinol"
 
-#: tdeui/ksconfig.cpp:324 tdehtml/tdehtml_part.cpp:288
-msgid "Russian"
-msgstr "Rwsieg"
+#: tdecore/tdehw/tdehardwaredevices.cpp:4046
+msgid "Thermal Control"
+msgstr ""
 
-#: tdeui/ksconfig.cpp:327
-msgid "Slovenian"
-msgstr "Slofeneg"
+#: tdecore/tdehw/tdehardwaredevices.cpp:4052
+msgid "Bridge"
+msgstr ""
 
-#: tdeui/ksconfig.cpp:330
-msgid "Slovak"
-msgstr "Slofaceg"
+#: tdecore/tdehw/tdehardwaredevices.cpp:4055
+msgid "Platform"
+msgstr ""
 
-#: tdeui/ksconfig.cpp:333
-msgid "Czech"
-msgstr "Tsieceg"
+#: tdecore/tdehw/tdehardwaredevices.cpp:4058
+msgid "Cryptography"
+msgstr ""
 
-#: tdeui/ksconfig.cpp:336
-msgid "Swedish"
-msgstr "Swedeg"
+#: tdecore/tdehw/tdehardwaredevices.cpp:4061
+msgid "Platform Event"
+msgstr ""
 
-#: tdeui/ksconfig.cpp:339
-msgid "Swiss German"
-msgstr "Almaeneg y Swistir"
+#: tdecore/tdehw/tdehardwaredevices.cpp:4064
+#, fuzzy
+msgid "Platform Input"
+msgstr "Clirio'r mewnbwn"
 
-#: tdeui/ksconfig.cpp:342 tdehtml/tdehtml_part.cpp:291
-msgid "Ukrainian"
-msgstr "Wcraneg"
+#: tdecore/tdehw/tdehardwaredevices.cpp:4067
+msgid "Plug and Play"
+msgstr ""
 
-#: tdeui/ksconfig.cpp:345
-msgid "Lithuanian"
-msgstr "Lithuaneg"
+#: tdecore/tdehw/tdehardwaredevices.cpp:4070
+#, fuzzy
+msgid "Other ACPI"
+msgstr "Eraill"
 
-#: tdeui/ksconfig.cpp:348
-msgid "French"
-msgstr "Ffrangeg"
+#: tdecore/tdehw/tdehardwaredevices.cpp:4073
+#, fuzzy
+msgid "Other USB"
+msgstr "Eraill"
 
-#: tdeui/ksconfig.cpp:351
-msgid "Belarusian"
-msgstr "Belarwsieg"
+#: tdecore/tdehw/tdehardwaredevices.cpp:4076
+msgid "Other Multimedia"
+msgstr ""
 
-#: tdeui/ksconfig.cpp:354
-msgid "Hungarian"
-msgstr "Hwngareg"
+#: tdecore/tdehw/tdehardwaredevices.cpp:4079
+msgid "Other Peripheral"
+msgstr ""
 
-#: tdeui/ksconfig.cpp:358
-msgid ""
-"_: Unknown ispell dictionary\n"
-"Unknown"
-msgstr "Anhysbys"
+#: tdecore/tdehw/tdehardwaredevices.cpp:4082
+msgid "Other Sensor"
+msgstr ""
 
-#: tdeui/ksconfig.cpp:440 tdeui/ksconfig.cpp:594
-msgid "ISpell Default"
-msgstr "Rhagosodiad Ispell"
+#: tdecore/tdehw/tdehardwaredevices.cpp:4085
+msgid "Other Virtual"
+msgstr ""
 
-#: tdeui/ksconfig.cpp:488 tdeui/ksconfig.cpp:642
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1470
 msgid ""
-"_: default spelling dictionary\n"
-"Default - %1 [%2]"
-msgstr " Rhagosodiad - %1 [%2]"
-
-#: tdeui/ksconfig.cpp:508 tdeui/ksconfig.cpp:668
-msgid "ASpell Default"
-msgstr "Rhagosodiad Aspell"
+"Connection attempt failed!"
+"<br>Secrets were required to establish a connection, but no secrets were "
+"available."
+msgstr ""
 
-#: tdeui/ksconfig.cpp:573 tdeui/ksconfig.cpp:733
-#, c-format
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1479
 msgid ""
-"_: default spelling dictionary\n"
-"Default - %1"
-msgstr "Rhagosodiad - %1"
-
-#: tdeui/tdefontrequester.cpp:38
-msgid "Choose..."
-msgstr "Dewis..."
-
-#: tdeui/tdefontrequester.cpp:102
-msgid "Click to select a font"
-msgstr "Cliciwch i ddewis wynebfath"
-
-#: tdeui/tdefontrequester.cpp:109
-msgid "Preview of the selected font"
-msgstr "Rhagolwg y r wynebfath penodol"
+"Connection attempt failed!"
+"<br>The supplicant failed while attempting to establish a wireless connection."
+msgstr ""
 
-#: tdeui/tdefontrequester.cpp:111
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1482
 msgid ""
-"This is a preview of the selected font. You can change it by clicking the "
-"\"Choose...\" button."
+"Connection attempt failed!"
+"<br>The supplicant timed out while attempting to establish a wireless "
+"connection."
 msgstr ""
-"Mae hyn yn rhagolwg yr wynebfath penodol.  Cewch ei newid gan glicio'r botwm "
-"\"Dewis...\"."
 
-#: tdeui/tdefontrequester.cpp:117
-msgid "Preview of the \"%1\" font"
-msgstr "Rhagolwg y font \"%1\""
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1485
+msgid "Connection attempt failed!<br>The PPP client failed to start."
+msgstr ""
 
-#: tdeui/tdefontrequester.cpp:119
-msgid ""
-"This is a preview of the \"%1\" font. You can change it by clicking the "
-"\"Choose...\" button."
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1488
+msgid "Connection attempt failed!<br>The PPP client was disconnected."
 msgstr ""
-"Mae hyn yn rhagolwg o'r wynebfath \"%1\".  Cewch ei newid gan glicio'r botwm "
-"\"Dewis...\"."
 
-#. i18n "??" is displayed as (pseudo-)version when no data is known about the application
-#: tdeui/tdeaboutapplication.cpp:63
-msgid "??"
-msgstr "??"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1491
+msgid "Connection attempt failed!<br>Unknown PPP failure."
+msgstr ""
 
-#: tdeui/tdeaboutapplication.cpp:67
-msgid ""
-"No information available.\n"
-"The supplied TDEAboutData object does not exist."
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1494
+msgid "Connection attempt failed!<br>The DHCP client failed to start."
 msgstr ""
-"Dim gwybodaeth ar gael. \n"
-" Nid ydy'r gwrthrych TDEAboutData a ddarparwyd ddim yn bodoli."
 
-#: tdeui/tdeaboutapplication.cpp:107
-msgid "A&uthor"
-msgstr "A&wdur"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1497
+msgid "Connection attempt failed!<br>The DHCP client encountered an error."
+msgstr ""
 
-#: tdeui/tdeaboutapplication.cpp:107
-msgid "A&uthors"
-msgstr "A&wduron"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1500
+msgid "Connection attempt failed!<br>Uknown DHCP failure."
+msgstr ""
 
-#: tdeui/tdeaboutapplication.cpp:117
-#, fuzzy
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1503
 msgid ""
-"Please use <a href=\"http://bugs.kde.org\">http://bugs.kde.org</a> "
-"to report bugs.\n"
+"Connection attempt failed!"
+"<br>The connection sharing service failed to start."
 msgstr ""
-"Defnyddiwch <a href=\"http://bugs.kde.org\">http://bugs.kde.org</a> "
-"er mwyn adrodd namau; peidiwch ac anfon ebost i'r awduron yn uniongyrchol."
 
-#: tdeui/tdeaboutapplication.cpp:121 tdeui/tdeaboutapplication.cpp:124
-#, fuzzy
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1506
 msgid ""
-"Please report bugs to <a href=\"mailto:%1\">%2</a>.\n"
+"Connection attempt failed!"
+"<br>The connection sharing service encountered an error."
 msgstr ""
-"Defnyddiwch <a href=\"mailto:%1\">%1</a> er mwyn adrodd namau; peidiwch ac "
-"anfon ebost i'r awduron yn uniongyrchol.\n"
-
-#: tdeui/tdeaboutapplication.cpp:149
-msgid "&Thanks To"
-msgstr "&Diolch i"
 
-#: tdeui/tdeaboutapplication.cpp:176
-msgid "T&ranslation"
-msgstr "C&yfieithiad"
-
-#: tdeui/tdeaboutapplication.cpp:181
-msgid "&License Agreement"
-msgstr "Cytundeb &Trwydded"
-
-#: tdeui/tdefontdialog.cpp:101
-msgid "Here you can choose the font to be used."
-msgstr "Yma y dewisir yr wynebfath a ddefnyddir."
-
-#: tdeui/tdefontdialog.cpp:113
-msgid "Requested Font"
-msgstr "Wynebfath a Ddymunwyd"
-
-#: tdeui/tdefontdialog.cpp:136
-msgid "Change font family?"
-msgstr "Newid y teulu wynebfath?"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1509
+msgid "Connection attempt failed!<br>The AutoIP service failed to start."
+msgstr ""
 
-#: tdeui/tdefontdialog.cpp:138
-msgid "Enable this checkbox to change the font family settings."
-msgstr "Alluogi'r blwch britho yma er mwyn newid gosodiadau'r teulu wynebfath."
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1512
+msgid "Connection attempt failed!<br>The AutoIP service encountered an error."
+msgstr ""
 
-#: tdeui/kcharselect.cpp:383 tdeui/tdefontdialog.cpp:144
-msgid "Font:"
-msgstr "Wynebfath:"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1515
+msgid "Connection attempt failed!<br>Unknown AutoIP failure."
+msgstr ""
 
-#: tdeui/tdefontdialog.cpp:151
-msgid "Font style"
-msgstr "Ardull wynebfath"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1518
+msgid "Connection attempt failed!<br>Modem was busy."
+msgstr ""
 
-#: tdeui/tdefontdialog.cpp:155
-msgid "Change font style?"
-msgstr "Newid ardull wynebfath?"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1521
+msgid "Connection attempt failed!<br>No dial tone."
+msgstr ""
 
-#: tdeui/tdefontdialog.cpp:157
-msgid "Enable this checkbox to change the font style settings."
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1524
+msgid "Connection attempt failed!<br>No carrier detected."
 msgstr ""
-"Alluogi'r blwch britho yma er mwyn newid gosodiadau'r arddull wynebfath."
 
-#: tdeui/tdefontdialog.cpp:163
-msgid "Font style:"
-msgstr "Ardull wynebfath:"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1527
+msgid "Connection attempt failed!<br>Modem timed out while dialing."
+msgstr ""
 
-#: tdeui/tdefontdialog.cpp:171
-msgid "Size"
-msgstr "Maint"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1530
+msgid "Connection attempt failed!<br>The modem failed to dial."
+msgstr ""
 
-#: tdeui/tdefontdialog.cpp:175
-msgid "Change font size?"
-msgstr "Newid maint yr wynebfath?"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1533
+msgid "Connection attempt failed!<br>Modem initialization failed."
+msgstr ""
 
-#: tdeui/tdefontdialog.cpp:177
-msgid "Enable this checkbox to change the font size settings."
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1536
+msgid "Connection attempt failed!<br>GSM APN failure."
 msgstr ""
-"Alluogi'r blwch britho yma er mwyn newid gosodiadau maint yr wynebfath."
 
-#: tdeui/tdefontdialog.cpp:183
-msgid "Size:"
-msgstr "Maint:"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1539
+msgid ""
+"Connection attempt failed!"
+"<br>GSM registration failed to search for networks."
+msgstr ""
 
-#: tdeui/tdefontdialog.cpp:199
-msgid "Here you can choose the font family to be used."
-msgstr "Yma y dewisir y teulu wynebfath a ddefnyddir."
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1542
+msgid "Connection attempt failed!<br>GSM registration attempt was rejected."
+msgstr ""
 
-#: tdeui/tdefontdialog.cpp:221
-msgid "Here you can choose the font style to be used."
-msgstr "Yma y dewisir yr arddull wynebfath a ddefnyddir."
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1545
+msgid "Connection attempt failed!<br>GSM registration attempt timed out."
+msgstr ""
 
-#: tdeui/tdefontdialog.cpp:224 tdeui/tdefontdialog.cpp:473
-#: tdeui/tdefontdialog.cpp:475 tdeui/tdefontdialog.cpp:484
-#: tdeui/tdefontdialog.cpp:485
-msgid "Regular"
-msgstr "Cyffredin"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1548
+msgid "Connection attempt failed!<br>GSM registration attempt failed."
+msgstr ""
 
-#: tdeui/tdefontdialog.cpp:226
-msgid "Bold"
-msgstr "Trwm"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1551
+msgid "Connection attempt failed!<br>GSM PIN check failed."
+msgstr ""
 
-#: tdeui/tdefontdialog.cpp:227
-msgid "Bold Italic"
-msgstr "Trwm Italig"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1554
+msgid "Connection attempt failed!<br>Network device firmware is missing."
+msgstr ""
 
-#: tdeui/tdefontdialog.cpp:244
-msgid "Relative"
-msgstr " Cymharol"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1557
+msgid "Connection attempt failed!<br>Network device was removed."
+msgstr ""
 
-#: tdeui/tdefontdialog.cpp:246
-msgid "Font size<br><i>fixed</i> or <i>relative</i><br>to environment"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1560
+msgid "Connection attempt failed!<br>Network device is sleeping."
 msgstr ""
-"Mae maint yr wynebfath yn "
-"<br><i>osodedig</i> neu <i>gymharol</i>"
-"<br> i'r amgylchedd"
 
-#: tdeui/tdefontdialog.cpp:248
-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)."
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1563
+msgid "Connection attempt failed!<br>Connection was removed."
 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)."
 
-#: tdeui/tdefontdialog.cpp:272
-msgid "Here you can choose the font size to be used."
-msgstr "Yma y dewisir maint yr wynebfath a ddefnyddir."
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1566
+msgid "Connection attempt failed!<br>User requested device disconnection."
+msgstr ""
 
-#. i18n: This is a classical test phrase. (It contains all letters from A to Z.)
-#: tdeui/tdefontdialog.cpp:296
-msgid "The Quick Brown Fox Jumps Over The Lazy Dog"
-msgstr "Duw a'm gwaredo, ni allaf ddianc rhag hon"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1569
+msgid "Connection attempt failed!<br>Carrier or link status changed."
+msgstr ""
 
-#: tdeui/tdefontdialog.cpp:301
-msgid ""
-"This sample text illustrates the current settings. You may edit it to test "
-"special characters."
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1572
+msgid "Connection attempt failed!<br>Device and/or connection already active."
 msgstr ""
-"Mae'r testun engraifft yma yn dangos y gosodiadau cyfredol. Cewch ei golygu er "
-"mwyn arbrofi llythrennau arbennig."
 
-#: tdeui/tdefontdialog.cpp:310 tdeui/tdefontdialog.cpp:320
-msgid "Actual Font"
-msgstr "Gwir Wynebfath"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1575
+msgid "Connection attempt failed!<br>The supplicant is now available."
+msgstr ""
 
-#: tdeui/tdeactionselector.cpp:69
-msgid "&Available:"
-msgstr "&Ar gael:"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1578
+msgid "Connection attempt failed!<br>Requested modem was not found."
+msgstr ""
 
-#: tdeui/tdeactionselector.cpp:84
-msgid "&Selected:"
-msgstr "&Wedi'u dewis:"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1581
+msgid "Connection attempt failed!<br>Bluetooth connection timeout."
+msgstr ""
 
-#: tdeui/kcharselect.cpp:366
-msgid ""
-"_: Character\n"
-"<qt><font size=\"+4\" face=\"%1\">%2</font>"
-"<br>Unicode code point: U+%3"
-"<br>(In decimal: %4)"
-"<br>(Character: %5)</qt>"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1584
+msgid "Connection attempt failed!<br>GSM SIM not inserted."
 msgstr ""
-"<qt><font size=\"+4\" face=\"%1\">%2</font>"
-"<br>Pwynt nod Unicode: U+%3"
-"<br>(Mewn degolion: %4)"
-"<br>(Nod: %5)</qt>"
 
-#: tdeui/kcharselect.cpp:394
-msgid "Table:"
-msgstr "Tabl:"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1587
+msgid "Connection attempt failed!<br>GSM PIN required."
+msgstr ""
 
-#: tdeui/kcharselect.cpp:404
-msgid "&Unicode code point:"
-msgstr "Pwynt nod &Unicode:"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1590
+msgid "Connection attempt failed!<br>GSM PUK required."
+msgstr ""
 
-#: tdeui/tdemessagebox.cpp:428 tdeui/tdemessagebox.cpp:479
-msgid "Question"
-msgstr "Cwestiwn"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1593
+msgid "Connection attempt failed!<br>GSM SIM incorrect."
+msgstr ""
 
-#: tdeui/tdemessagebox.cpp:442 tdeui/tdemessagebox.cpp:494
-#: tdeui/tdemessagebox.cpp:575 tdeui/tdemessagebox.cpp:647
-#: tdeui/tdemessagebox.cpp:723
-msgid "Do not ask again"
-msgstr "Peidiwch a gofyn eto"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1596
+msgid "Connection attempt failed!<br>Incorrect Infiniband mode."
+msgstr ""
 
-#: tdeui/tdeaboutdialog.cpp:1535 tdeui/khelpmenu.cpp:227
-#: tdeui/tdemessagebox.cpp:975
-#, c-format
-msgid "About %1"
-msgstr "Ynglyn â %1"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1599
+msgid "Connection attempt failed!<br>Dependency failure."
+msgstr ""
 
-#: tdeui/klineedit.cpp:890
-msgid "Manual"
-msgstr "Llawlyfr"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1602
+msgid "Connection attempt failed!<br>Unknown bridge failure."
+msgstr ""
 
-#: tdeui/klineedit.cpp:891
-msgid "Automatic"
-msgstr "Awtomatig"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1605
+msgid "Connection attempt failed!<br>ModemManager not available."
+msgstr ""
 
-#: tdeui/klineedit.cpp:892
-msgid "Dropdown List"
-msgstr "Rhestr Cwymplen"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1608
+msgid "Connection attempt failed!<br>SSID not found."
+msgstr ""
 
-#: tdeui/klineedit.cpp:893
-msgid "Short Automatic"
-msgstr "Awtomatig Byr"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1611
+msgid "Connection attempt failed!<br>Secondary connection failure."
+msgstr ""
 
-#: tdeui/klineedit.cpp:894
-msgid "Dropdown List && Automatic"
-msgstr "Rhestr Cwymplen && Ymysgogol"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1793
+msgid "NetworkManager"
+msgstr ""
 
-#: tdeui/tdeabouttde.cpp:34
-#, fuzzy
-msgid ""
-"The <b>K Desktop Environment</b> is written and maintained by the TDE Team, a "
-"world-wide network of software engineers committed to <a "
-"href=\"http://www.gnu.org/philosophy/free-sw.html\">Free Software</a> "
-"development."
-"<br>"
-"<br>No single group, company or organization controls the TDE source code. "
-"Everyone is welcome to contribute to TDE."
-"<br>"
-"<br>Visit <A HREF=\"http://www.kde.org/\">http://www.kde.org</A> "
-"for more information on the TDE project. "
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4800
+msgid "Connection name is invalid"
 msgstr ""
-"Ysgrifennwyd a chynhelir yr <b>Amgylchedd Penbwrdd K</b>  "
-"gan y tîm TDE, rhydwaith fyd-eang o peiriannwyr meddalwedd wedi ymrwymo i "
-"ddatblygiad meddalwedd rhydd. "
-"<br>"
-"<br>Ni reolir y côd gwreiddiol TDE gan unrhyw un grŵp, cwmni neu corff. Mae "
-"croeso i bawb cyfrannu i TDE."
-"<br>"
-"<br>Ewch i <A HREF=\"http://www.kde.org/\">http://www.kde.org</A>"
-"am fwy o fanylion am y cywaith TDE."
 
-#: tdeui/tdeabouttde.cpp:43
-msgid ""
-"Software can always be improved, and the TDE 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>The K Desktop Environment has a bug tracking system. Visit <A "
-"HREF=\"http://bugs.kde.org/\">http://bugs.kde.org</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\"."
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4812
+msgid "IPv4 address is invalid"
 msgstr ""
-"Mae o hyd yn bosib gwella meddalwedd, ac mae'r tîm TDE yn barod i wneud hynny. "
-"Ond  rhaid i chi - y defnyddiwr - ddweud wrthym os nad oes rhywbeth yn gweithio "
-"fel y disgwylir, neu pan mae'n bosib gwneud rhywbeth yn well.  "
-"<br>"
-"<br>Mae gan yr Amgylchedd Penbwrdd K gysawd dilyn namau. Ewch i: <A "
-"HREF=\"http://bugs.kde.org/\">http://bugs.kde.org/</A> "
-"neu defnyddiwch yr ymgom \"Adrodd Nam...\" o'r ddewislen \"Cymorth\" i adrodd "
-"nam. "
-"<br>"
-"<br>Os oes ganddoch awgrymiad gwelliant, mae croeso i chi ddefnyddio'r cysawd "
-"dilyn namau i cofnodi eich dymuniad. Cofiwch defnyddio'r llymder \"Rhestr "
-"dymuniadau\"."
 
-#: tdeui/tdeabouttde.cpp:54
-msgid ""
-"You do not have to be a software developer to be a member of the TDE 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=\"http://www.kde.org/jobs/\">http://www.kde.org/jobs/</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=\"http://developer.kde.org/\">http://developer.kde.org</A> "
-"will provide you with what you need."
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4821
+msgid "IPv6 address is invalid"
 msgstr ""
-"Does dim angen i chi fod yn ddatblygwr meddalwedd i fod yn aelod o dîm TDE. "
-"Mae'n bosib ymaelodi â'r timoedd cenedlaethol sy'n cyfieithu rhyngwynebau "
-"rhaglenni.  Gallwch gyfrannu graffeg, themau, sain a dogfennaeth well. Medrwch "
-"chi ddewis!"
-"<br>"
-"<br>Ewch i: <A HREF=\"http://www.kde.org/jobs.html\">"
-"http://www.kde.org/jobs.html</A> am fwy o fanylion ynglyn â chyweithiau y "
-"medrwch gymryd rhan ynddynt."
-"<br>"
-"<br>Os dymunwch fwy o fanylion neu ddogfennaeth, ewch i <A "
-"HREF=\"http://developer.kde.org/\">http://developer.kde.org</A> "
-"i gael popeth sydd angen."
 
-#: tdeui/tdeabouttde.cpp:67
-msgid ""
-"TDE is available free of charge, but making it is not free."
-"<br>"
-"<br>Thus, the TDE team formed the TDE e.V., a non-profit organization legally "
-"founded in Tuebingen, Germany. The TDE e.V. represents the TDE project in legal "
-"and financial matters. See <a href=\"http://www.kde-ev.org/\">"
-"http://www.kde-ev.org</a> for information on the TDE e.V."
-"<br>"
-"<br>The TDE team does need financial support. Most of the money is used to "
-"reimburse members and others on expenses they experienced when contributing to "
-"TDE. You are encouraged to support TDE through a financial donation, using one "
-"of the ways described at <a href=\"http://www.kde.org/support/\">"
-"http://www.kde.org/support/</a>."
-"<br>"
-"<br>Thank you very much in advance for your support."
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4833
+msgid "No SSID provided"
 msgstr ""
-"Mae TDE ar gael am ddim, ond nid ydy ei wneud yn ddi-gost."
-"<br>"
-"<br>Felly, ffurffiodd y tîm TDE TDE e.V., sefydliad di-elw wedi ei sylfaenu yn "
-"gyfreithiol yn Tübingen, yr Almaen.  Mae TDE e.V. yn cynrychioli y cywaith TDE "
-"mewn materion cyfreithiol a cyllidol.  Gweler  <a "
-"href=\"http://www.kde-ev.org/\">http://www.kde-ev.org/</a> "
-"am wybodaeth am TDE e.V."
-"<br>"
-"<br>Mae angen cefnogaeth ariannol gan y tîm TDE.  Defnyddir y rhan fwyaf o'r "
-"arian i ad-dalu aelodau ac eraill am dreuliau y talwyd wrth gyfrannu at TDE.  "
-"Rydym yn eich annog i gefnogi TDE drwy rhodd ariannol, gan ddefnyddio un o'r "
-"ffyrdd a disgrifir ar <a  href=\"http://www.kde.org/support/\">"
-"http://www.kde.org/support/</a>. "
-"<br>"
-"<br>Diolch yn fawr iawn i chi ymlaen llaw am eich cefnogaeth. "
 
-#: tdeui/tdeabouttde.cpp:81
-#, c-format
-msgid "K Desktop Environment. Release %1"
-msgstr "Amgylchedd Penbwrdd TDE.  Rhyddhad %1"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4843
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4878
+msgid "WEP key 0 has invalid length"
+msgstr ""
 
-#: tdeui/tdeabouttde.cpp:83
-msgid ""
-"_: About TDE\n"
-"&About"
-msgstr "&Ynghylch"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4850
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4885
+msgid "WEP key 1 has invalid length"
+msgstr ""
 
-#: tdeui/tdeabouttde.cpp:84
-msgid "&Report Bugs or Wishes"
-msgstr "&Adrodd Namau neu Dymuniadau"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4857
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4892
+msgid "WEP key 2 has invalid length"
+msgstr ""
 
-#: tdeui/tdeabouttde.cpp:85
-msgid "&Join the TDE Team"
-msgstr "&Ymaelodi a'r tîm TDE"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4864
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4899
+msgid "WEP key 3 has invalid length"
+msgstr ""
 
-#: tdeui/tdeabouttde.cpp:86
-msgid "&Support TDE"
-msgstr "&Cefnogi TDE"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4870
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4905
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4912
+msgid "No WEP key(s) provided"
+msgstr ""
 
-#: tdeui/kstdguiitem.cpp:110 tdehtml/java/kjavaappletserver.cpp:804
-msgid "&Yes"
-msgstr "&Ie"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4920
+msgid "LEAP username and/or password not provided"
+msgstr ""
 
-#: tdeui/kstdguiitem.cpp:115 tdehtml/java/kjavaappletserver.cpp:797
-msgid "&No"
-msgstr "&Nage"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4931
+msgid "Hexadecimal length PSK contains non-hexadecimal characters"
+msgstr ""
 
-#: tdeui/kstdguiitem.cpp:120
-msgid "Discard changes"
-msgstr "Taflu newidiadau"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4937
+#, fuzzy
+msgid "No PSK provided"
+msgstr "Nid oes darparwr wedi ei dewis."
 
-#: tdeui/kstdguiitem.cpp:121
+#: tdecore/network/tdesocketaddress.cpp:625
+#, c-format
 msgid ""
-"Pressing this button will discard all recent changes made in this dialog"
+"_: 1: the unknown socket address family number\n"
+"Unknown family %1"
 msgstr ""
-" Bydd gwthio'r botwm yma yn taflu pob newid diweddar a wnaethpwyd yn y blwch "
-"dewis"
 
-#: tdeui/kstdguiitem.cpp:127
-msgid "Save data"
-msgstr "Cadw'r data"
+#: tdecore/network/kresolver.cpp:558
+msgid "requested family not supported for this host name"
+msgstr "ni chynhelir y deulu benodol i'r enw gwesteiwr yma"
 
-#: tdeui/kstdguiitem.cpp:132
-msgid "&Do Not Save"
-msgstr "&Peidiwch â Chadw"
+#: tdecore/network/kresolver.cpp:561
+msgid "invalid flags"
+msgstr "baneri annilys"
 
-#: tdeui/kstdguiitem.cpp:133
-msgid "Don't save data"
-msgstr "Peidio a chadw'r data"
+#: tdecore/network/kresolver.cpp:564
+msgid "requested family not supported"
+msgstr "ni chynhelir deulu benodol"
 
-#: tdeui/kstdaction_p.h:44 tdeui/kstdguiitem.cpp:138
-msgid "Save &As..."
-msgstr "Cadw &Fel..."
+#: tdecore/network/kresolver.cpp:565
+msgid "requested service not supported for this socket type"
+msgstr "ni chynhelir y gwasanaeth benodol am y math yma o soced"
 
-#: tdeui/kstdguiitem.cpp:139
-msgid "Save file with another name"
-msgstr "Cadw'r ffeil efo enw arall"
+#: tdecore/network/kresolver.cpp:566
+msgid "requested socket type not supported"
+msgstr "ni chynhelir y math penodol o soced"
 
-#: tdeui/kstdguiitem.cpp:144
-msgid "Apply changes"
-msgstr "Cymhwyso'r newidiadau"
+#: tdecore/network/kresolver.cpp:567
+msgid "unknown error"
+msgstr "gwall anhysbys"
 
-#: tdeui/kstdguiitem.cpp:145
+#: tdecore/network/kresolver.cpp:569
+#, c-format
 msgid ""
-"When clicking <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 ""
-"Wrth wthio<b>Gweithredu</b>, rhoddir y gosodiadau i'r rhaglen, ond ni chaeir y "
-"blwch dewis.\n"
-" Defnyddiwch hwn i arbrofi dewisiadau gwahanol."
-
-#: tdeui/kstdguiitem.cpp:153
-msgid "Administrator &Mode..."
-msgstr "Modd G&weinyddwr..."
+"_: 1: the i18n'ed system error code, from errno\n"
+"system error: %1"
+msgstr "gwall cysawd : %1"
 
-#: tdeui/kstdguiitem.cpp:153
-msgid "Enter Administrator Mode"
-msgstr "Newid i Fodd Gweinyddwr"
+#: tdecore/network/kresolver.cpp:574
+msgid "request was canceled"
+msgstr "diddymwyd y cais"
 
-#: tdeui/kstdguiitem.cpp:154
+#: tdecore/network/tdesocketbase.cpp:172
 msgid ""
-"When clicking <b>Administrator Mode</b> you will be prompted for the "
-"administrator (root) password in order to make changes which require root "
-"privileges."
-msgstr ""
-"Ar ôl clicio <b>Modd Gweinyddwr</b> byddwch yn eich gofyn am y cyfrinair "
-"gweinyddwr (gwraidd) er mwyn gwneud newidiadau sydd angen breintiau gwraidd."
-
-#: tdeui/kstdguiitem.cpp:162
-msgid "Clear input"
-msgstr "Clirio'r mewnbwn"
+"_: Socket error code NoError\n"
+"no error"
+msgstr "dim gwall"
 
-#: tdeui/kstdguiitem.cpp:163
-msgid "Clear the input in the edit field"
-msgstr "Clirio'r mewnbwn yn y maes golygu"
+#: tdecore/network/tdesocketbase.cpp:177
+msgid ""
+"_: Socket error code LookupFailure\n"
+"name lookup has failed"
+msgstr "methodd chwilio'r enw"
 
-#: tdeui/kstdaction.cpp:62 tdeui/kstdguiitem.cpp:168
+#: tdecore/network/tdesocketbase.cpp:182
 msgid ""
-"_: show help\n"
-"&Help"
-msgstr "&Cymorth"
+"_: Socket error code AddressInUse\n"
+"address already in use"
+msgstr "mae'r cyfeiriad mewn defnydd eisoes"
 
-#: tdeui/kstdguiitem.cpp:169
-msgid "Show help"
-msgstr "Dangos cymorth"
+#: tdecore/network/tdesocketbase.cpp:187
+msgid ""
+"_: Socket error code AlreadyBound\n"
+"socket is already bound"
+msgstr "mae'r soced wedi'i rhwymo eisoes"
 
-#: tdeui/kstdguiitem.cpp:175
-msgid "Close the current window or document"
-msgstr "Cau'r ffenest neu ddogfen cyfredol"
+#: tdecore/network/tdesocketbase.cpp:192
+msgid ""
+"_: Socket error code AlreadyCreated\n"
+"socket is already created"
+msgstr "mae'r soced wedi'i greu eisoes"
 
-#: tdeui/kstdguiitem.cpp:181
-msgid "Reset all items to their default values"
-msgstr "Ailosod pob eitem i'w werth rhagosodol"
+#: tdecore/network/tdesocketbase.cpp:197
+msgid ""
+"_: Socket error code NotBound\n"
+"socket is not bound"
+msgstr "ni rhwymir y soced"
 
-#: tdeui/kstdaction.cpp:51 tdeui/kstdguiitem.cpp:188
+#: tdecore/network/tdesocketbase.cpp:202
 msgid ""
-"_: go back\n"
-"&Back"
-msgstr "Y&n ôl"
+"_: Socket error code NotCreated\n"
+"socket has not been created"
+msgstr "ni chreuwyd y soced"
 
-#: tdeui/kstdguiitem.cpp:189
-msgid "Go back one step"
-msgstr "Ewch cam yn ôl"
+#: tdecore/network/tdesocketbase.cpp:207
+msgid ""
+"_: Socket error code WouldBlock\n"
+"operation would block"
+msgstr "bydd y gweithrediad yn rhwystro"
 
-#: tdeui/kstdaction.cpp:56 tdeui/kstdguiitem.cpp:196
+#: tdecore/network/tdesocketbase.cpp:212
 msgid ""
-"_: go forward\n"
-"&Forward"
-msgstr "&Ymlaen"
+"_: Socket error code ConnectionRefused\n"
+"connection actively refused"
+msgstr "gwrthodwyd y cysyltiad yn weithredol"
 
-#: tdeui/kstdguiitem.cpp:197
-msgid "Go forward one step"
-msgstr "Ewch cam ymlaen"
+#: tdecore/network/tdesocketbase.cpp:217
+msgid ""
+"_: Socket error code ConnectionTimedOut\n"
+"connection timed out"
+msgstr "mae'r cysylltiad wedi goramseru"
 
-#: tdeui/kstdguiitem.cpp:208
-msgid "Opens the print dialog to print the current document"
-msgstr "Agor y blwch dewisiadau argraffu er mwyn argraffu'r ddogfen gyfredol"
+#: tdecore/network/tdesocketbase.cpp:222
+msgid ""
+"_: Socket error code InProgress\n"
+"operation is already in progress"
+msgstr "mae'r gweithrediad ar y gweill eisoes"
 
-#: tdeui/kstdguiitem.cpp:214
-msgid "C&ontinue"
-msgstr "&Mynd ymlaen"
+#: tdecore/network/tdesocketbase.cpp:227
+msgid ""
+"_: Socket error code NetFailure\n"
+"network failure occurred"
+msgstr "methodd y rhwydwaith"
 
-#: tdeui/kstdguiitem.cpp:215
-msgid "Continue operation"
-msgstr "Ewch ymlaen a'r gweithrediad"
+#: tdecore/network/tdesocketbase.cpp:232
+msgid ""
+"_: Socket error code NotSupported\n"
+"operation is not supported"
+msgstr "ni chynhelir y gweithrediad "
 
-#: tdeui/kstdguiitem.cpp:221
-msgid "Delete item(s)"
-msgstr " Dileu eitem(au)"
+#: tdecore/network/tdesocketbase.cpp:237
+msgid ""
+"_: Socket error code Timeout\n"
+"timed operation timed out"
+msgstr "mae gweithrediad amseredig wedi goramseru"
 
-#: tdeui/kstdguiitem.cpp:227
-msgid "Open file"
-msgstr "Agor ffeil"
+#: tdecore/network/tdesocketbase.cpp:242
+msgid ""
+"_: Socket error code UnknownError\n"
+"an unknown/unexpected error has happened"
+msgstr "digwyddodd gwall anhysbys/annisgwyl"
 
-#: tdeui/kstdguiitem.cpp:233
-msgid "Quit application"
-msgstr "Gadael y cymhwysiant"
+#: tdecore/network/tdesocketbase.cpp:247
+msgid ""
+"_: Socket error code RemotelyDisconnected\n"
+"remote host closed connection"
+msgstr "caeodd y gwesteiwr pell y cysylltiad"
 
-#: tdeui/kstdguiitem.cpp:238
-msgid "&Reset"
-msgstr "A&ilosod"
+#: interfaces/tdescript/scriptmanager.cpp:106
+msgid "Unable to get KScript Runner for type \"%1\"."
+msgstr "Methu cael Rhedydd KScript am fath \"%1\"."
 
-#: tdeui/kstdguiitem.cpp:239
-msgid "Reset configuration"
-msgstr "Ailodosd ffurfweddiad"
+#: interfaces/tdescript/scriptmanager.cpp:106
+#: interfaces/tdescript/scriptmanager.cpp:129
+msgid "KScript Error"
+msgstr "Gwall KScript"
 
-#: tdeui/kstdguiitem.cpp:244
-msgid ""
-"_: Verb\n"
-"&Insert"
-msgstr "&Mewnosod"
+#: interfaces/tdescript/scriptmanager.cpp:129
+msgid "Unable find script \"%1\"."
+msgstr "Methu canfod sgript \"%1\"."
 
-#: tdeui/kstdguiitem.cpp:249
-msgid "Confi&gure..."
-msgstr "Ffurf&weddu..."
+#: interfaces/tdescript/scriptloader.cpp:40
+#, fuzzy
+msgid "KDE Scripts"
+msgstr "Sgriptiau TDE"
 
-#: tdeui/keditcl2.cpp:701 tdeui/keditcl2.cpp:833 tdeui/kstdguiitem.cpp:254
-#: tdeutils/kfinddialog.cpp:239
-msgid "&Find"
-msgstr "&Canfod"
+#: interfaces/tdetexteditor/editorchooser.cpp:60
+msgid "System Default (%1)"
+msgstr "Rhagosodiad Cysawd (%1)"
 
-#: tdeui/kstdguiitem.cpp:274
-msgid "Test"
-msgstr "Profi"
+#: tderandr/ktimerdialog.cpp:154
+#, c-format
+msgid ""
+"_n: 1 second remaining:\n"
+"%n seconds remaining:"
+msgstr ""
 
-#: tdeui/kstdguiitem.cpp:284
-msgid "&Overwrite"
-msgstr "&Trosysgrifo"
+#: tderandr/randr.cpp:260
+msgid "Confirm Display Setting Change"
+msgstr ""
 
-#: tdeui/kjanuswidget.cpp:156
+#: tderandr/randr.cpp:264 tderandr/randr.cpp:856
 #, fuzzy
-msgid "Empty Page"
-msgstr "Tudalen &Olaf"
-
-#: tdeui/ksyntaxhighlighter.cpp:477 tdeui/ksyntaxhighlighter.cpp:586
-msgid "As-you-type spell checking enabled."
-msgstr "Galluogir cywiro sillafu wrth deipio."
+msgid "&Accept Configuration"
+msgstr "Ffurfwedd"
 
-#: tdeui/ksyntaxhighlighter.cpp:479
-msgid "As-you-type spell checking disabled."
-msgstr "Galluogir cywiro sillafu wrth deipio."
+#: tderandr/randr.cpp:265 tderandr/randr.cpp:857
+#, fuzzy
+msgid "&Return to Previous Configuration"
+msgstr "Ffurfweddiad Adnoddau"
 
-#: tdeui/ksyntaxhighlighter.cpp:528
-msgid "Incremental Spellcheck"
-msgstr "Gwirio Sillafu Cynnyddol"
+#: tderandr/randr.cpp:267
+msgid ""
+"Your screen orientation, size and refresh rate have 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 ""
 
-#: tdeui/ksyntaxhighlighter.cpp:588
-msgid "Too many misspelled words. As-you-type spell checking disabled."
+#: tderandr/randr.cpp:298
+msgid ""
+"New configuration:\n"
+"Resolution: %1 x %2\n"
+"Orientation: %3"
 msgstr ""
-"Gormod o eiriau sydd wedi cael eu cam-sillafu.  Analluogir cywiro sillafu wrth "
-"deipio."
 
-#: tdeui/kxmlguibuilder.cpp:166 tdeui/kxmlguibuilder.cpp:365
-msgid "No text!"
-msgstr "Dim testun!"
+#: tderandr/randr.cpp:303
+msgid ""
+"New configuration:\n"
+"Resolution: %1 x %2\n"
+"Orientation: %3\n"
+"Refresh rate: %4"
+msgstr ""
 
-#: tdeui/kauthicon.cpp:99
-msgid "Editing disabled"
-msgstr "Analluogir golygu"
+#: tderandr/randr.cpp:332 tderandr/randr.cpp:349
+#, fuzzy
+msgid "Normal"
+msgstr "Normaleiddio"
 
-#: tdeui/kauthicon.cpp:100
-msgid "Editing enabled"
-msgstr "Alluogir golygu"
+#: tderandr/randr.cpp:334
+msgid "Left (90 degrees)"
+msgstr ""
 
-#: tdeui/tdetoolbarhandler.cpp:86
-msgid "Show Toolbar"
-msgstr "Dangos Bar Offer"
+#: tderandr/randr.cpp:336
+msgid "Upside-down (180 degrees)"
+msgstr ""
 
-#: tdeui/tdetoolbarhandler.cpp:87
-msgid "Hide Toolbar"
-msgstr "Cuddio Bar Offer"
+#: tderandr/randr.cpp:338
+msgid "Right (270 degrees)"
+msgstr ""
 
-#: tdeui/tdetoolbarhandler.cpp:91
-msgid "Toolbars"
-msgstr "Barrau Offer:"
+#: tderandr/randr.cpp:340
+#, fuzzy
+msgid "Mirror horizontally"
+msgstr "Llorweddol"
 
-#: tdeui/kdatepicker.cpp:88
-#, c-format
-msgid "Week %1"
-msgstr "Wythnos %1"
+#: tderandr/randr.cpp:342
+#, fuzzy
+msgid "Mirror vertically"
+msgstr "Teilio'n Fe&rtigol"
 
-#: tdeui/kdatepicker.cpp:163
-msgid "Next year"
-msgstr "Blwyddyn nesaf"
+#: tderandr/randr.cpp:344 tderandr/randr.cpp:375
+#, fuzzy
+msgid "Unknown orientation"
+msgstr "Gogwydd"
 
-#: tdeui/kdatepicker.cpp:164
-msgid "Previous year"
-msgstr "Blwyddyn cynt"
+#: tderandr/randr.cpp:351
+#, fuzzy
+msgid "Rotated 90 degrees counterclockwise"
+msgstr "Cylchdroi yn &Wrthglocwedd"
 
-#: tdeui/kdatepicker.cpp:165
-msgid "Next month"
-msgstr "Mis nesaf"
+#: tderandr/randr.cpp:353
+#, fuzzy
+msgid "Rotated 180 degrees counterclockwise"
+msgstr "Cylchdroi yn &Wrthglocwedd"
 
-#: tdeui/kdatepicker.cpp:166
-msgid "Previous month"
-msgstr "Mis cynt"
+#: tderandr/randr.cpp:355
+#, fuzzy
+msgid "Rotated 270 degrees counterclockwise"
+msgstr "Cylchdroi yn &Wrthglocwedd"
 
-#: tdeui/kdatepicker.cpp:167
-msgid "Select a week"
-msgstr "Dewiswch wythnos"
+#: tderandr/randr.cpp:360
+msgid "Mirrored horizontally and vertically"
+msgstr ""
 
-#: tdeui/kdatepicker.cpp:168
-msgid "Select a month"
-msgstr "Dewiswch mis"
+#: tderandr/randr.cpp:362
+msgid "mirrored horizontally and vertically"
+msgstr ""
 
-#: tdeui/kdatepicker.cpp:169
-msgid "Select a year"
-msgstr "Dewiswch blwyddyn"
+#: tderandr/randr.cpp:365
+#, fuzzy
+msgid "Mirrored horizontally"
+msgstr "Ehangu'n &Llorweddol"
 
-#: tdeui/kdatepicker.cpp:170
-msgid "Select the current day"
-msgstr "Dewis y diwrnod cyfredol"
+#: tderandr/randr.cpp:367
+#, fuzzy
+msgid "mirrored horizontally"
+msgstr "Ehangu'n &Llorweddol"
 
-#: tdeui/kwhatsthismanager.cpp:50
+#: tderandr/randr.cpp:370
 #, fuzzy
-msgid ""
-"<b>Not Defined</b>"
-"<br>There is no \"What's This?\" help assigned to this widget. If you want to "
-"help us to  describe the widget, you are welcome to <a "
-"href=\"submit-whatsthis\">send us your own \"What's This?\" help</a> for it."
-msgstr ""
-"<b>Heb ei ddiffinio</b>"
-"<br>Nid oes cymorth \"Beth yw Hwn?\" wedi'i neilltuo i'r celfigyn yma.  Os "
-"hoffech ein helpu ni gan ddisgrifio'r celfigyn, croeso i chi <a "
-"href=\"submit-whatsthis\">anfon cymorth \"Beth yw Hwn?\"</a> ar ei gyfer."
+msgid "Mirrored vertically"
+msgstr "Teilio'n Fe&rtigol"
 
-#: tdeui/tdeshortcutdialog.cpp:68
-msgid "Configure Shortcut"
-msgstr "Ffurfweddu Byrlwybr"
+#: tderandr/randr.cpp:372
+#, fuzzy
+msgid "mirrored vertically"
+msgstr "Teilio'n Fe&rtigol"
 
-#: tdeui/tdeshortcutdialog.cpp:71
-msgid "Advanced"
-msgstr "Uwch"
+#: tderandr/randr.cpp:377
+#, fuzzy
+msgid "unknown orientation"
+msgstr "Gogwydd"
 
-#: tdeui/kedittoolbar.cpp:49
-msgid "--- line separator ---"
+#: tderandr/randr.cpp:519 tderandr/randr.cpp:524
+msgid ""
+"_: Refresh rate in Hertz (Hz)\n"
+"%1 Hz"
 msgstr ""
 
-#: tdeui/kedittoolbar.cpp:50
-msgid "--- separator ---"
-msgstr "--- gwahanydd ---"
+#: tderandr/randr.cpp:693
+#, fuzzy
+msgid "No screens detected"
+msgstr "Nid oes darparwr wedi ei dewis."
 
-#: tdeui/kedittoolbar.cpp:380 tdeui/kedittoolbar.cpp:392
-#: tdeui/kedittoolbar.cpp:402 tdeui/kedittoolbar.cpp:411
-msgid "Configure Toolbars"
-msgstr "Ffurfio Bar Offer"
+#: tderandr/randr.cpp:852
+#, fuzzy
+msgid "Confirm Display Settings"
+msgstr "Gosodiadau Cyffredinol"
 
-#: tdeui/kedittoolbar.cpp:447
+#: tderandr/randr.cpp:859
 msgid ""
-"Do you really want to reset all toolbars of this application to their default? "
-"The changes will be applied immediately."
+"Your display devices has been configured to match the settings shown above. "
+"Please indicate whether you wish to keep this configuration. In 15 seconds the "
+"display will revert to your previous settings."
 msgstr ""
 
-#: tdeui/kedittoolbar.cpp:447
+#: tdeinit/tdelauncher_main.cpp:58
 #, fuzzy
-msgid "Reset Toolbars"
-msgstr "Barrau Offer:"
-
-#: tdeui/kedittoolbar.cpp:447 tdehtml/html/html_formimpl.cpp:2129
-#: tdehtml/tdehtmlview.cpp:2541 tdehtml/tdehtmlview.cpp:2574
-msgid "Reset"
-msgstr "Ail-osod"
-
-#: tdeui/kedittoolbar.cpp:761
-msgid "&Toolbar:"
-msgstr "&Bar Offer:"
-
-#: tdeui/kedittoolbar.cpp:777
-msgid "A&vailable actions:"
-msgstr "G&weithrediadau ar gael:"
-
-#: tdeui/kedittoolbar.cpp:795
-msgid "Curr&ent actions:"
-msgstr "Gweith&rediadau cyfredol:"
-
-#: tdeui/kedittoolbar.cpp:818
-msgid "Change &Icon..."
-msgstr "Newid E&icon..."
-
-#: tdeui/kedittoolbar.cpp:991
 msgid ""
-"This element will be replaced with all the elements of an embedded component."
+"[tdelauncher] This program is not supposed to be started manually.\n"
+"[tdelauncher] It is started automatically by tdeinit.\n"
 msgstr ""
-"Amnewidir yr elfen yma gan yr elfennau i gyd sy'n biau i gydran mewnol."
+"tdelauncher: Ni ddylir cychwyn y rhaglen yma â llaw.\n"
+"tdelauncher: Cychwynnir yn ymysgogol gan tdeinit.\n"
 
-#: tdeui/kedittoolbar.cpp:993
-msgid "<Merge>"
-msgstr "<Cyfuno>"
+#: tdeinit/tdelauncher.cpp:744
+msgid "TDEInit could not launch '%1'."
+msgstr "Ni allodd TDEInit gychwyn '%1'."
 
-#: tdeui/kedittoolbar.cpp:995
-msgid "<Merge %1>"
-msgstr "<Cyfuno %1>"
+#: tdeinit/tdelauncher.cpp:919 tdeinit/tdelauncher.cpp:944
+#: tdeinit/tdelauncher.cpp:961
+msgid "Could not find service '%1'."
+msgstr "Methu canfod gwasanaeth '%1'."
 
-#: tdeui/kedittoolbar.cpp:1001
-msgid ""
-"This is a dynamic list of actions. You can move it, but if you remove it you "
-"won't be able to re-add it."
-msgstr ""
-"Rhestr ddinamig o weithrediadau yw hon.  Cewch ei symud, ond ar ôl ei diddymu "
-"na chewch ei ail-ychwanegu. "
+#: tdeinit/tdelauncher.cpp:976 tdeinit/tdelauncher.cpp:1012
+msgid "Service '%1' is malformatted."
+msgstr "Mae gwasanaeth '%1' wedi'i gam-fformatio."
 
-#: tdeui/kedittoolbar.cpp:1002
+#: tdeinit/tdelauncher.cpp:1088
 #, c-format
-msgid "ActionList: %1"
-msgstr "RhestrGweithred: %1"
-
-#: tdeui/kcolordialog.cpp:84
-msgid ""
-"_: palette name\n"
-"* Recent Colors *"
-msgstr "* Lliwiau Diweddar *"
+msgid "Launching %1"
+msgstr "Ymgychwyn %1"
 
-#: tdeui/kcolordialog.cpp:85
+#: tdeinit/tdelauncher.cpp:1282
 msgid ""
-"_: palette name\n"
-"* Custom Colors *"
-msgstr "* Lliwiau Arferu *"
+"Unknown protocol '%1'.\n"
+msgstr ""
+"Protocol anhysbys '%1'. \n"
 
-#: tdeui/kcolordialog.cpp:86
+#: tdeinit/tdelauncher.cpp:1335
 msgid ""
-"_: palette name\n"
-"Forty Colors"
+"Error loading '%1'.\n"
 msgstr ""
+"Gwall wrth lwytho '%1'. \n"
 
-#: tdeui/kcolordialog.cpp:87
-#, fuzzy
+#: tdeinit/tdeinit.cpp:475
 msgid ""
-"_: palette name\n"
-"Rainbow Colors"
-msgstr "* Lliwiau Diweddar *"
+"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 ""
 
-#: tdeui/kcolordialog.cpp:88
+#: tdeinit/tdeinit.cpp:497
 msgid ""
-"_: palette name\n"
-"Royal Colors"
+"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 ""
 
-#: tdeui/kcolordialog.cpp:89
+#: tdeinit/tdeinit.cpp:589
+msgid "Could not find '%1' executable."
+msgstr "Methu canfod gweithredadwyn '%1'"
+
+#: tdeinit/tdeinit.cpp:605
 msgid ""
-"_: palette name\n"
-"Web Colors"
+"Could not open library '%1'.\n"
+"%2"
 msgstr ""
+"Methu agor rhaglengell '%1'.\n"
+"%2"
 
-#: tdeui/kcolordialog.cpp:563
-msgid "Named Colors"
-msgstr "Lliwiau a Enwir"
+#: tdeinit/tdeinit.cpp:606 tdeinit/tdeinit.cpp:649
+msgid "Unknown error"
+msgstr "Gwall anhysbys"
 
-#: tdeui/kcolordialog.cpp:717
+#: tdeinit/tdeinit.cpp:648
 msgid ""
-"Unable to read X11 RGB color strings. The following file location(s) were "
-"examined:\n"
+"Could not find 'kdemain' in '%1'.\n"
+"%2"
 msgstr ""
-"Methu darllen llinynnau lliw RGB X11. Fe edrychwyd yn y lleoliadau ffeil "
-"canlynol:\n"
-
-#: tdeui/kcolordialog.cpp:940
-msgid "Select Color"
-msgstr "Dewis Lliw"
+"Methu canfod 'kdemain' yn '%1'.\n"
+"%2"
 
-#: tdeui/kcolordialog.cpp:1005
-msgid "H:"
-msgstr "H:"
+#: tdeabc/addresseehelper.cpp:67
+msgid "Dr."
+msgstr "Dr."
 
-#: tdeui/kcolordialog.cpp:1014
-msgid "S:"
-msgstr "S:"
+#: tdeabc/addresseehelper.cpp:68
+msgid "Miss"
+msgstr "Miss"
 
-#: tdeui/kcolordialog.cpp:1023
-msgid "V:"
-msgstr "V:"
+#: tdeabc/addresseehelper.cpp:69
+msgid "Mr."
+msgstr "Mr."
 
-#: tdeui/kcolordialog.cpp:1035
-msgid "R:"
-msgstr "R:"
+#: tdeabc/addresseehelper.cpp:70
+msgid "Mrs."
+msgstr "Mrs."
 
-#: tdeui/kcolordialog.cpp:1044
-msgid "G:"
-msgstr "G:"
+#: tdeabc/addresseehelper.cpp:71
+msgid "Ms."
+msgstr "Ms."
 
-#: tdeui/kcolordialog.cpp:1053
-msgid "B:"
-msgstr "B:"
+#: tdeabc/addresseehelper.cpp:72
+msgid "Prof."
+msgstr "Yr Athro"
 
-#: tdeui/kcolordialog.cpp:1108
-msgid "&Add to Custom Colors"
-msgstr "&Ychwanegu at Liwiau Rhagosodedig"
+#: tdeabc/addresseehelper.cpp:74
+msgid "I"
+msgstr "I"
 
-#: tdeui/kcolordialog.cpp:1140
-msgid "HTML:"
-msgstr "HTML:"
+#: tdeabc/addresseehelper.cpp:75
+msgid "II"
+msgstr "II"
 
-#: tdeui/kcolordialog.cpp:1219
-msgid "Default color"
-msgstr "Lliw rhagosodol"
+#: tdeabc/addresseehelper.cpp:76
+msgid "III"
+msgstr "III"
 
-#: tdeui/kcolordialog.cpp:1247
-msgid "-default-"
-msgstr "-rhagosodol-"
+#: tdeabc/addresseehelper.cpp:77
+msgid "Jr."
+msgstr "Jr."
 
-#: tdeui/kcolordialog.cpp:1463
-msgid "-unnamed-"
-msgstr "-ddi-enw-"
+#: tdeabc/addresseehelper.cpp:78
+msgid "Sr."
+msgstr "Sr."
 
-#: tdeui/kstdaction.cpp:61
-msgid ""
-"_: beginning (of line)\n"
-"&Home"
-msgstr "&Cartref"
+#: tdeabc/resource.cpp:332
+msgid "Loading resource '%1' failed!"
+msgstr "Methodd llwytho adnodd '%1'!"
 
-#: tdeui/kstdaction.cpp:240
-msgid "Show Menubar<p>Shows the menubar again after it has been hidden"
-msgstr ""
-"Dangos Bar Dewislen"
-"<p>Dangos y bar dewislen eto ar ôl iddo gael ei guddio"
+#: tdeabc/resource.cpp:343
+msgid "Saving resource '%1' failed!"
+msgstr "Methodd cadw adnodd '%1'!"
 
-#: tdeui/kstdaction.cpp:242
-msgid "Hide &Menubar"
-msgstr "Cuddio Bar &Dewislen"
+#: tdeabc/locknull.cpp:60
+msgid "LockNull: All locks succeed but no actual locking is done."
+msgstr "LockNull: Mae pob clo yn llwyddo, ond nid yw cloi yn cael ei wneud."
 
-#: tdeui/kstdaction.cpp:243
-msgid ""
-"Hide Menubar"
-"<p>Hide the menubar. You can usually get it back using the right mouse button "
-"inside the window itself."
-msgstr ""
-"Cuddio Bar Dewislen "
-"<p>Cuddio'r bar dewislen.  Fel rheol, gewch chi'r bar yn ôl eto gan "
-"ddefnyddio'r botwm de tu mewn i'r ffenest ei hun."
+#: tdeabc/locknull.cpp:62
+msgid "LockNull: All locks fail."
+msgstr "LockNull: Mae pob clo yn methu."
 
-#: tdeui/kstdaction.cpp:274 tdeui/kstdaction_p.h:97
-msgid "Show St&atusbar"
-msgstr "Dangos Bar Cyfl&wr"
+#: tdeabc/addresseedialog.cpp:60
+msgid "Select Addressee"
+msgstr "Dewiswch Derbynnydd"
 
-#: tdeui/kstdaction.cpp:276
-msgid ""
-"Show Statusbar"
-"<p>Shows the statusbar, which is the bar at the bottom of the window used for "
-"status information."
-msgstr ""
-"Dangos Bar Cyflwr"
-"<p>Dangos y bar cyflwr, sef y bar wrth waelod y ffenestr, a ddefnyddir ar gyfer "
-"gwybodaeth cyflwr."
+#: tdeabc/addressee.cpp:354 tdeabc/addresseedialog.cpp:70
+#: tdeabc/addresseedialog.cpp:100 tdeabc/distributionlistdialog.cpp:174
+#: tdeabc/distributionlistdialog.cpp:189 tdeabc/distributionlisteditor.cpp:142
+#: tdeabc/distributionlisteditor.cpp:161
+#: tdehtml/misc/knsplugininstaller.cpp:380 tdenewstuff/downloaddialog.cpp:281
+#: tdenewstuff/downloaddialog.cpp:287 tdenewstuff/downloaddialog.cpp:293
+#: tdenewstuff/providerdialog.cpp:65 tderesources/configpage.cpp:119
+#: tdeutils/kpluginselector.cpp:200
+msgid "Name"
+msgstr "Enw"
 
-#: tdeui/kstdaction.cpp:278
-msgid "Hide St&atusbar"
-msgstr "Cuddio Bar Cyf&lwr"
+#: tdeabc/addresseedialog.cpp:71 tdeabc/addresseedialog.cpp:101
+#: tdeabc/distributionlistdialog.cpp:190 tdeabc/distributionlisteditor.cpp:143
+#: tdeabc/field.cpp:211 tdeabc/scripts/field.src.cpp:104
+#: tdeui/tdeaboutdialog.cpp:91
+msgid "Email"
+msgstr "Ebost"
 
-#: tdeui/kstdaction.cpp:279
-msgid ""
-"Hide Statusbar"
-"<p>Hides the statusbar, which is the bar at the bottom of the window used for "
-"status information."
-msgstr ""
-"Cuddio Bar Cyflwr"
-"<p>Cuddio'r bar cyflwr, sef y bar wrth waelod y ffenestr, a ddefnyddir ar gyfer "
-"gwybodaeth cyflwr."
+#: tdeabc/addresseedialog.cpp:95
+msgid "Selected"
+msgstr "Dewisedig"
 
-#: tdeui/kpassdlg.cpp:372
-msgid "&Password:"
-msgstr "&Cyfrinair:"
+#: tdeabc/addresseedialog.cpp:107
+msgid "Unselect"
+msgstr "Dad-ddewis"
 
-#: tdeui/kpassdlg.cpp:391
-msgid "&Keep password"
-msgstr "&Cadw cyfrinair"
+#: tdeabc/formatfactory.cpp:55 tdeabc/formatfactory.cpp:119
+msgid "vCard"
+msgstr "vCerdyn"
 
-#: tdeui/kpassdlg.cpp:403
-msgid "&Verify:"
-msgstr "&Gwireddu:"
+#: tdeabc/formatfactory.cpp:56 tdeabc/formatfactory.cpp:120
+msgid "vCard Format"
+msgstr "Fformat vCerdyn"
 
-#: tdeui/kpassdlg.cpp:425
-msgid "Password strength meter:"
-msgstr "Faint mor gryf yw'r cyfrinair:"
+#: tdeabc/formatfactory.cpp:75
+msgid "No description available."
+msgstr "Dim disgrifiad ar gael"
 
-#: tdeui/kpassdlg.cpp:429
-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."
-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."
+#: tdeabc/field.cpp:192 tdeabc/scripts/field.src.cpp:85
+msgid "Unknown Field"
+msgstr "Maes Anhysbys"
 
-#: tdeui/kpassdlg.cpp:445 tdeui/kpassdlg.cpp:617
-msgid "Passwords do not match"
-msgstr "Nid yw'r cyfrineiriau yn cydweddu"
+#: tdeabc/field.cpp:205 tdeabc/scripts/field.src.cpp:98
+msgid "All"
+msgstr "Cwbl"
 
-#: tdeui/kpassdlg.cpp:515
-msgid "You entered two different passwords. Please try again."
-msgstr "Rhoddwyd dau gyfrinair gwahanol.  Ceisiwch eto.  "
+#: tdeabc/field.cpp:207 tdeabc/scripts/field.src.cpp:100
+msgid "Frequent"
+msgstr "Aml"
 
-#: tdeui/kpassdlg.cpp:522
+#: kab/addressbook.cc:192 tdeabc/field.cpp:209
+#: tdeabc/scripts/field.src.cpp:102
 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?"
+"_: street/postal\n"
+"Address"
 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?"
 
-#: tdeui/kpassdlg.cpp:530
-msgid "Low Password Strength"
-msgstr "Nid yw'r cyfrinair yn gryf iawn"
+#: tdeabc/field.cpp:213 tdeabc/scripts/field.src.cpp:106
+msgid "Personal"
+msgstr "Personol"
 
-#: tdeui/kpassdlg.cpp:611
-msgid "Password is empty"
-msgstr "Mae'r cyfrineiriau yn wag"
+#: kab/addressbook.cc:176 tdeabc/addressee.cpp:746 tdeabc/field.cpp:215
+#: tdeabc/scripts/field.src.cpp:108 tdefile-plugins/elf/tdefile_elf.cpp:70
+#: tdefile-plugins/elf/tdefile_elf.cpp:92
+msgid "Organization"
+msgstr "Sefydliad"
 
-#: tdeui/kpassdlg.cpp:614
-#, c-format
-msgid ""
-"_n: Password must be at least 1 character long\n"
-"Password must be at least %n characters long"
-msgstr ""
-"Rhaid i'r cyfrinair fod o leiaf 1 nod\n"
-"Rhaid i'r cyfrinair fod o leiaf %n o nodau"
+#: kab/addressbook.cc:335 tdeabc/field.cpp:217 tdeabc/key.cpp:133
+#: tdeabc/scripts/field.src.cpp:110
+msgid "Custom"
+msgstr "Addasiedig"
 
-#: tdeui/kpassdlg.cpp:616
-msgid "Passwords match"
-msgstr "Mae'r cyfrineiriau yn cydweddu"
+#: tdeabc/field.cpp:219 tdeabc/scripts/field.src.cpp:112
+msgid "Undefined"
+msgstr "Anniffiniedig"
 
-#: tdeui/tdespelldlg.cpp:53 tdespell2/ui/dialog.cpp:62
-msgid "Check Spelling"
-msgstr "Gwirio Sillafu"
+#: tdeabc/ldapconfigwidget.cpp:83
+msgid "User:"
+msgstr "Defnyddiwr:"
 
-#: tdeui/tdespelldlg.cpp:54 tdespell2/ui/dialog.cpp:64
-msgid "&Finished"
-msgstr "Wedi'i Orffe&n"
+#: tdeabc/ldapconfigwidget.cpp:92
+msgid "Bind DN:"
+msgstr "DN Rhwymo:"
 
-#: tdeui/kcombobox.cpp:444 tdehtml/rendering/render_form.cpp:388
-msgid "Clear &History"
-msgstr "Gwaredu &Hanes"
+#: tdeabc/ldapconfigwidget.cpp:101
+msgid "Realm:"
+msgstr "Bro:"
 
-#: tdeui/kcombobox.cpp:584
-msgid "No further item in the history."
-msgstr "Dim mwy o eitemau yn yr hanes."
+#: tdeabc/ldapconfigwidget.cpp:110
+msgid "Password:"
+msgstr "Cyfrinair:"
 
-#: tdeui/klineeditdlg.cpp:92
-msgid "&Browse..."
-msgstr "&Pori..."
+#: tdeabc/ldapconfigwidget.cpp:120
+msgid "Host:"
+msgstr "Gwesteiwr:"
 
-#: tdeui/kdialogbase.cpp:636
-msgid "&Try"
-msgstr "&Arbrofi"
+#: tdeabc/ldapconfigwidget.cpp:130
+msgid "Port:"
+msgstr "Porth:"
 
-#: tdeui/kdialogbase.cpp:904
-msgid ""
-"If you press the <b>OK</b> button, all changes\n"
-"you made will be used to proceed."
-msgstr ""
-" Os gwthiwch y botwm <b>Iawn</b>, defnyddir\n"
-" pob newid a wnaethoch i fynd ymlaen."
+#: tdeabc/ldapconfigwidget.cpp:141
+msgid "LDAP version:"
+msgstr "Fersiwn LDAP:"
 
-#: tdeui/kdialogbase.cpp:911
-msgid "Accept settings"
-msgstr "Derbyn gosodiadau"
+#: tdeabc/ldapconfigwidget.cpp:152
+msgid "Size limit:"
+msgstr "Terfyn maint:"
 
-#: tdeui/kdialogbase.cpp:932
+#: tdeabc/ldapconfigwidget.cpp:163
+msgid "Time limit:"
+msgstr "Terfyn amser:"
+
+#: tdeabc/ldapconfigwidget.cpp:167
+msgid " sec"
+msgstr "sec"
+
+#: tdeabc/ldapconfigwidget.cpp:175
 msgid ""
-"When clicking <b>Apply</b>, the settings will be\n"
-"handed over to the program, but the dialog\n"
-"will not be closed. Use this to try different settings. "
-msgstr ""
-" Wrth wthio<b>Gweithredu</b>, rhoddir y gosodiadau\n"
-" i'r rhaglen, ond ni chaeir y blwch dewis.\n"
-" Defnyddiwch hwn er mwyn arbrofi dewisiadau gwahanol."
+"_: Distinguished Name\n"
+"DN:"
+msgstr "DN:"
 
-#: tdeui/kdialogbase.cpp:941
-msgid "Apply settings"
-msgstr "Gweithredu gosodiadau"
+#: tdeabc/ldapconfigwidget.cpp:182 tdeabc/ldapconfigwidget.cpp:231
+msgid "Query Server"
+msgstr "Gweinydd Ymholiad"
 
-#: tdeui/kdialogbase.cpp:1130
-msgid "&Details"
-msgstr "&Manylion"
+#: tdeabc/ldapconfigwidget.cpp:190
+msgid "Filter:"
+msgstr "Hidl:"
 
-#: tdeui/kdialogbase.cpp:1538
-msgid "Get help..."
-msgstr "Nôl cymorth..."
+#: tdeabc/ldapconfigwidget.cpp:199
+msgid "Security"
+msgstr "Diogelwch"
 
-#: tdeui/keditlistbox.cpp:124
-msgid "&Add"
-msgstr "&Ychwanegu"
+#: tdeabc/ldapconfigwidget.cpp:201
+msgid "TLS"
+msgstr "TLS"
 
-#: tdeui/keditlistbox.cpp:148
-msgid "Move &Up"
-msgstr "Sym&ud i fyny"
+#: tdeabc/ldapconfigwidget.cpp:202
+msgid "SSL"
+msgstr "SSL"
 
-#: tdeui/keditlistbox.cpp:153
-msgid "Move &Down"
-msgstr "Symu&d i lawr"
+#: tdeabc/ldapconfigwidget.cpp:216
+msgid "Authentication"
+msgstr "Dilysiant"
 
-#: tdeui/kbugreport.cpp:70
-msgid "Submit Bug Report"
-msgstr "Cyflwyno Adroddiad Nam"
+#: tdeabc/ldapconfigwidget.cpp:218
+msgid "Anonymous"
+msgstr "Dienw"
 
-#: tdeui/kbugreport.cpp:110
-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."
+#: tdeabc/ldapconfigwidget.cpp:219
+msgid "Simple"
+msgstr "Syml"
 
-#: tdeui/kbugreport.cpp:111
-msgid "From:"
-msgstr "Oddiwrth:"
+#: tdeabc/ldapconfigwidget.cpp:220
+msgid "SASL"
+msgstr "SASL"
 
-#: tdeui/kbugreport.cpp:120
-msgid "Configure Email..."
-msgstr "Ffurfweddu Ebost ..."
+#: tdeabc/ldapconfigwidget.cpp:222
+msgid "SASL mechanism:"
+msgstr "Peirianwaith SASL:"
 
-#: tdeui/kbugreport.cpp:127
-msgid "The email address this bug report is sent to."
-msgstr "Y gyfeiriad ebost a anfonir yr adroddiad nam yma iddi."
+#: tdeabc/ldapconfigwidget.cpp:302
+msgid "LDAP Query"
+msgstr "Ymholiad LDAP"
 
-#: tdeui/kbugreport.cpp:128
-msgid "To:"
-msgstr "I:"
+#: tdeabc/address.cpp:145
+msgid "Post Office Box"
+msgstr "Bocs Swyddfa Post"
 
-#: tdeui/kbugreport.cpp:135
-msgid "&Send"
-msgstr "&Anfon"
+#: tdeabc/address.cpp:163
+msgid "Extended Address Information"
+msgstr "Gwybodaeth Cyfeiriad Estynedig"
 
-#: tdeui/kbugreport.cpp:135
-msgid "Send bug report."
-msgstr "Anfon Adroddiad Nam"
+#: tdeabc/address.cpp:181
+msgid "Street"
+msgstr "Stryd"
 
-#: tdeui/kbugreport.cpp:136
-#, c-format
-msgid "Send this bug report to %1."
-msgstr "Anfonwch yr adroddiad nam yma i %1."
+#: tdeabc/address.cpp:199
+msgid "Locality"
+msgstr "Lleoliad"
 
-#: tdeui/kbugreport.cpp:147
-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."
+#: tdeabc/address.cpp:217 tdeui/ktimezonewidget.cpp:46
+msgid "Region"
+msgstr "Ardal"
 
-#: tdeui/kbugreport.cpp:148
-msgid "Application: "
-msgstr "Cymhwysiad:"
+#: tdeabc/address.cpp:235
+msgid "Postal Code"
+msgstr "Côd Post"
 
-#: tdeui/kbugreport.cpp:173
-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"
+#: kab/addressbook.cc:204 tdeabc/address.cpp:253
+msgid "Country"
+msgstr "Gwlad"
 
-#: tdeui/kbugreport.cpp:180
-msgid "no version set (programmer error!)"
-msgstr "dim fersiwn eto (nam gan y rhaglennwr!)"
+#: kab/addressbook.cc:188 tdeabc/address.cpp:271
+msgid "Delivery Label"
+msgstr "Label Derbyn"
 
-#: tdeui/kbugreport.cpp:190
-msgid "OS:"
-msgstr "SG:"
+#: tdeabc/address.cpp:287
+msgid ""
+"_: Preferred address\n"
+"Preferred"
+msgstr "Hoffter"
 
-#: tdeui/kbugreport.cpp:202
-msgid "Compiler:"
-msgstr "Crynhoydd:"
+#: tdeabc/address.cpp:291
+msgid "Domestic"
+msgstr "Mewnol"
 
-#: tdeui/kbugreport.cpp:210
-msgid "Se&verity"
-msgstr "Lly&mder"
+#: tdeabc/address.cpp:294
+msgid "International"
+msgstr "Rhyngwladol"
 
-#: tdeui/kbugreport.cpp:212
-msgid "Critical"
-msgstr "Critigol"
+#: tdeabc/address.cpp:297
+msgid "Postal"
+msgstr "Post"
 
-#: tdeui/kbugreport.cpp:212
-msgid "Grave"
-msgstr "Peryglus"
+#: tdeabc/address.cpp:300
+msgid "Parcel"
+msgstr "Parsel"
 
-#: tdeui/kbugreport.cpp:212
+#: tdeabc/address.cpp:303
 msgid ""
-"_: normal severity\n"
-"Normal"
-msgstr "Arferol"
+"_: Home Address\n"
+"Home"
+msgstr " Cyfeiriad Cartref"
 
-#: tdeui/kbugreport.cpp:212
-msgid "Wishlist"
-msgstr "Rhestr dymuniadau"
+#: tdeabc/address.cpp:306
+msgid ""
+"_: Work Address\n"
+"Work"
+msgstr "Cyfeiriad Gwaith"
 
-#: tdeui/kbugreport.cpp:212
-msgid "Translation"
-msgstr "Cyfieithiad"
+#: tdeabc/address.cpp:309
+msgid "Preferred Address"
+msgstr "Cyfeiriad Dewisiedig"
 
-#: tdeui/kbugreport.cpp:225
-msgid "S&ubject: "
-msgstr " &Pwnc:"
+#: tdeabc/lock.cpp:93
+msgid "Unable to open lock file."
+msgstr "Methu agor ffeil glo."
 
-#: tdeui/kbugreport.cpp:232
+#: tdeabc/lock.cpp:106
 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"
+"The address book '%1' is locked by application '%2'.\n"
+"If you believe this is incorrect, just remove the lock file from '%3'"
 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"
 
-#: tdeui/kbugreport.cpp:252
-msgid ""
-"To submit a bug report, click on the button below.\n"
-"This will open a web browser window on http://bugs.kde.org where you will find "
-"a form to fill in.\n"
-"The information displayed above will be transferred to that server."
-msgstr ""
-" I gyflwyno adroddiad nam, cliciwch ar y botwm isod.\n"
-" Bydd hyn yn agor ffenest porydd ar http://bugs.kde.org\n"
-" lle welwch ffurflen i'w llenwi.\n"
-" Trosglwyddir y wybodaeth a arddangosir uchod i'r gweinydd hwnnw."
+#: tdeabc/lock.cpp:146
+msgid "Unlock failed. Lock file is owned by other process: %1 (%2)"
+msgstr "Methodd y dadgloi.  Mae'r ffeil glo yn biau i broses arall: %1 (%2)"
 
-#: tdeui/kbugreport.cpp:260
-msgid "&Launch Bug Report Wizard"
-msgstr "&Cychwyn Dewin Adrodd Namau"
+#: tdeabc/distributionlistdialog.cpp:44
+msgid "Configure Distribution Lists"
+msgstr "Ffurfweddu Rhestrau Dosbarthu"
 
-#: tdeui/kbugreport.cpp:298
-msgid ""
-"_: unknown program name\n"
-"unknown"
-msgstr " anhysbys"
+#: tdeabc/distributionlistdialog.cpp:61 tdeabc/distributionlisteditor.cpp:43
+msgid "Select Email Address"
+msgstr "Dewiswch Gyfeiriad Ebost"
 
-#: tdeui/kbugreport.cpp:376
-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."
+#: kab/addressbook.cc:303 tdeabc/distributionlistdialog.cpp:69
+#: tdeabc/distributionlisteditor.cpp:49
+msgid "Email Addresses"
+msgstr "Cyfeiriadau Ebost"
 
-#: tdeui/kbugreport.cpp:386
-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 ""
-" "
-"<p>Rydych wedi dewis y llymder <b>Hanfodol</b>.  Bwriadir y llymder yma am "
-"namau sy'n </p>"
-"<ul>"
-"<li>torri meddalwedd di-berthnasol ar y cysawd (neu ar y cysawd cyfan)</li>"
-"<li>achosi colled difrifol o ddata</li>"
-"<li>cyflwyno twll diogelwch ar y cysawd lle arsefydlwyd y pecyn dan "
-"effaith.</li></ul>\n"
-"<p>Ydy'r nam yr ydych yn ei adrodd yn achosi unrhyw un o'r niweidiau uchod?  Os "
-"nac ydy, dewiswch llymder is.  Diolch!</p>"
+#: tdeabc/distributionlistdialog.cpp:152
+msgid "New List..."
+msgstr "Rhestr Newydd..."
 
-#: tdeui/kbugreport.cpp:397
-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 ""
-"<p>Rydych wedi dewis y llymder <b>Difrifol</b>. Bwriadir y llymder yma am namau "
-"sy'n </p> "
-"<ul>"
-"<li>gwrthod i'r pecyn mewn cwestiwn gael ei ddefnyddio, neu bron felly</li>"
-"<li>achosi colled data</li>"
-"<li>cyflwyno twll diogelwch sy'n gadael cyrchu cyfrifon defnyddwyr sy'n "
-"defnyddio'r pecyn dan effaith</li></ul>\n"
-"<p>Ydy'r nam yr ydych yn ei adrodd yn achosi unrhyw un o'r niweidiau uchod? Os "
-"nac ydy, dewiswch llymder is. Diolch!</p>"
+#: tdeabc/distributionlistdialog.cpp:156
+msgid "Rename List..."
+msgstr "Ail-enwi Rhestr..."
 
-#: tdeui/kbugreport.cpp:409
-msgid ""
-"Unable to send the bug report.\n"
-"Please submit a bug report manually...\n"
-"See http://bugs.kde.org/ for instructions."
-msgstr ""
-" Methu gyrru'r adroddiad nam.\n"
-" Anfonwch adroddiad nam â llaw ...\n"
-" Gweler http://bugs.kde.org am fanylion."
+#: tdeabc/distributionlistdialog.cpp:160 tdeabc/distributionlisteditor.cpp:137
+msgid "Remove List"
+msgstr "Diddymu Rhestr"
 
-#: tdeui/kbugreport.cpp:417
-msgid "Bug report sent, thank you for your input."
-msgstr "Wedi gyrru'r adroddiad nam, diolch am eich cymorth."
+#: tdeabc/distributionlistdialog.cpp:167
+msgid "Available addresses:"
+msgstr "Cyfeiriadau ar gael:"
 
-#: tdeui/kbugreport.cpp:426
-msgid ""
-"Close and discard\n"
-"edited message?"
-msgstr ""
-"Cau a taflu'r neges\n"
-" a olygwyd?"
+#: tdeabc/distributionlistdialog.cpp:175 tdeabc/distributionlisteditor.cpp:162
+msgid "Preferred Email"
+msgstr "Ebost Dewisedig"
 
-#: tdeui/kbugreport.cpp:427
-msgid "Close Message"
-msgstr "Cau Neges"
+#: tdeabc/distributionlistdialog.cpp:183 tdeabc/distributionlisteditor.cpp:156
+msgid "Add Entry"
+msgstr "Ychwanegu Cofnod"
 
-#: tdeui/kcolorcombo.cpp:187 tdeui/kcolorcombo.cpp:240
-msgid "Custom..."
-msgstr "Addasu ..."
+#: tdeabc/distributionlistdialog.cpp:191 tdeabc/distributionlisteditor.cpp:144
+msgid "Use Preferred"
+msgstr "Defnyddio Dewisedig"
 
-#: tdeui/ksystemtray.cpp:190
-msgid "<qt>Are you sure you want to quit <b>%1</b>?</qt>"
-msgstr "<qt>Ydych wir eisiau terfynu <b>'%1'</b>?</qt>"
+#: tdeabc/distributionlistdialog.cpp:198
+msgid "Change Email..."
+msgstr "Newid Ebost..."
 
-#: tdeui/ksystemtray.cpp:193
-msgid "Confirm Quit From System Tray"
-msgstr "Cadarnhau Terfynu o'r Cafn Cysawd"
+#: tdeabc/distributionlistdialog.cpp:202 tdeabc/distributionlisteditor.cpp:152
+msgid "Remove Entry"
+msgstr "Diddymu Cofnod"
 
-#: tdeui/kpixmapregionselectorwidget.cpp:141
-msgid "Image Operations"
-msgstr "Gweithrediadau Delwedd"
+#: tdeabc/distributionlistdialog.cpp:237 tdeabc/distributionlisteditor.cpp:196
+msgid "New Distribution List"
+msgstr "Rhestr Dosbarthiad Newydd"
 
-#: tdeui/kpixmapregionselectorwidget.cpp:143
-msgid "&Rotate Clockwise"
-msgstr "Cylchdroi yn &Glocwedd"
+#: tdeabc/distributionlistdialog.cpp:238
+msgid "Please enter &name:"
+msgstr "Mewnosodwch &enw:"
 
-#: tdeui/kpixmapregionselectorwidget.cpp:148
-msgid "Rotate &Counterclockwise"
-msgstr "Cylchdroi yn &Wrthglocwedd"
+#: tdeabc/distributionlistdialog.cpp:255
+msgid "Distribution List"
+msgstr "Rhestr Dosbarthu"
 
-#: tdeui/kdockwidget.cpp:237
+#: tdeabc/distributionlistdialog.cpp:256
+msgid "Please change &name:"
+msgstr "Newidiwch &enw:"
+
+#: tdeabc/distributionlistdialog.cpp:273
+msgid "Delete distribution list '%1'?"
+msgstr "Dileu rhestr dosbarthu '%1'?"
+
+#: tdeabc/distributionlistdialog.cpp:339
+msgid "Selected addressees:"
+msgstr "Derbynyddion dewisedig"
+
+#: tdeabc/distributionlistdialog.cpp:341
+msgid "Selected addresses in '%1':"
+msgstr "Derbynyddion dewisedig yn '%1':"
+
+#: tdeabc/resourceselectdialog.cpp:39 tderesources/selectdialog.cpp:42
+msgid "Resource Selection"
+msgstr "Dewis Adnoddau"
+
+#: tdeabc/resourceselectdialog.cpp:46 tderesources/configpage.cpp:107
+#: tderesources/selectdialog.cpp:49
+msgid "Resources"
+msgstr "Adnoddau"
+
+#: tdeabc/ldifconverter.cpp:475
+msgid "List of Emails"
+msgstr "Rhestr o Gyfeiriadau Ebost"
+
+#: tdeabc/phonenumber.cpp:147
 msgid ""
-"_: Freeze the window geometry\n"
-"Freeze"
-msgstr "Rhewi"
+"_: Preferred phone\n"
+"Preferred"
+msgstr "Hoffter"
 
-#: tdeui/kdockwidget.cpp:244
+#: tdeabc/phonenumber.cpp:151
 msgid ""
-"_: Dock this window\n"
-"Dock"
-msgstr "Clymu"
+"_: Home phone\n"
+"Home"
+msgstr "Cartref"
 
-#: tdeui/kdockwidget.cpp:251
-msgid "Detach"
-msgstr "Dat-glymu"
+#: tdeabc/phonenumber.cpp:154
+msgid ""
+"_: Work phone\n"
+"Work"
+msgstr "Cartref"
 
-#: tdeui/kwizard.cpp:48
-msgid "&Back"
-msgstr "&Yn ôl"
+#: tdeabc/phonenumber.cpp:157
+msgid "Messenger"
+msgstr "Negesydd"
 
-#: tdeui/kwizard.cpp:49
-msgid ""
-"_: Opposite to Back\n"
-"&Next"
-msgstr "&Nesaf"
+#: tdeabc/phonenumber.cpp:160
+msgid "Preferred Number"
+msgstr "Rhif Dewisiedig"
 
-#: tdeui/khelpmenu.cpp:130 tdeui/kstdaction_p.h:108
-msgid "%1 &Handbook"
-msgstr "%1 &Llawlyfr"
+#: tdeabc/phonenumber.cpp:163
+msgid "Voice"
+msgstr "Llais"
 
-#: tdeui/khelpmenu.cpp:139
-msgid "What's &This"
-msgstr "Beth yw &Hyn"
+#: tdeabc/phonenumber.cpp:166
+msgid "Fax"
+msgstr "Ffacs"
 
-#: tdeui/khelpmenu.cpp:150 tdeui/kstdaction_p.h:111
-msgid "&Report Bug..."
-msgstr "&Adroddi nam"
+#: tdeabc/phonenumber.cpp:169
+msgid ""
+"_: Mobile Phone\n"
+"Mobile"
+msgstr "Ffôn Symudol"
 
-#: tdeui/khelpmenu.cpp:159 tdeui/kstdaction_p.h:112
-#, fuzzy
-msgid "Switch application &language..."
-msgstr "gosod enw'r cymhwysiad"
+#: tdeabc/phonenumber.cpp:172
+msgid "Video"
+msgstr "Fideo"
 
-#: tdeui/khelpmenu.cpp:170 tdeui/kstdaction_p.h:113
-#, c-format
-msgid "&About %1"
-msgstr "&Ynglyn a %1"
+#: tdeabc/phonenumber.cpp:175
+msgid "Mailbox"
+msgstr "Bocs ebost"
 
-#: tdeui/khelpmenu.cpp:176 tdeui/kstdaction_p.h:114
-msgid "About &TDE"
-msgstr "Ynglyn a &Kde"
+#: tdeabc/phonenumber.cpp:181
+msgid ""
+"_: Car Phone\n"
+"Car"
+msgstr "Ffôn Car"
 
-#: tdeui/tdeactionclasses.cpp:2072
-msgid "Exit F&ull Screen Mode"
-msgstr "Gadael &Modd Sgrîn Llawn"
+#: tdeabc/addressee.cpp:620 tdeabc/phonenumber.cpp:184
+msgid "ISDN"
+msgstr "ISDN"
 
-#: tdeui/tdeactionclasses.cpp:2077 tdeui/kstdaction_p.h:98
-msgid "F&ull Screen Mode"
-msgstr "&Modd Sgrîn Llawn"
+#: tdeabc/phonenumber.cpp:187
+msgid "PCS"
+msgstr "PCS"
 
-#: tdeui/tdelistviewsearchline.cpp:243
-msgid "Search Columns"
-msgstr "Chwilio Colofnau"
+#: tdeabc/addressee.cpp:626 tdeabc/phonenumber.cpp:190
+msgid "Pager"
+msgstr "Blîp"
 
-#: tdeui/tdelistviewsearchline.cpp:245
-msgid "All Visible Columns"
-msgstr "Pob Colofn Weledig"
+#: tdeabc/addressee.cpp:602 tdeabc/phonenumber.cpp:193
+msgid "Home Fax"
+msgstr "Facs Cartref"
 
-#: tdeui/tdelistviewsearchline.cpp:260
-msgid ""
-"_: Column number %1\n"
-"Column No. %1"
-msgstr "Colofn %1"
+#: tdeabc/phonenumber.cpp:196
+msgid "Work Fax"
+msgstr "Ffacs Gwaith"
 
-#: tdeui/tdelistviewsearchline.cpp:455
-msgid "S&earch:"
-msgstr "C&hwilio"
+#: tdeabc/addressbook.cpp:346 tdeabc/addressbook.cpp:365
+msgid "Unable to load resource '%1'"
+msgstr "Methu llwytho adnodd '%1'"
 
-#: tdeui/ktip.cpp:206
-msgid "Tip of the Day"
-msgstr "Awgrymiad y Dydd"
+#: tdeabc/key.cpp:127
+msgid "X509"
+msgstr "X509"
 
-#: tdeui/ktip.cpp:224
-msgid ""
-"Did you know...?\n"
-msgstr ""
-" Oeddech chi'n gwybod ...?\n"
+#: tdeabc/key.cpp:130
+msgid "PGP"
+msgstr "PGP"
 
-#: tdeui/ktip.cpp:287
-msgid "&Show tips on startup"
-msgstr "&Dangos awgrymiadau wrth gychwyn"
+#: tdeabc/key.cpp:136 tdeabc/secrecy.cpp:80
+msgid "Unknown type"
+msgstr "Math anhysbys"
 
-#: tdeui/tdetoolbar.cpp:2040
-msgid "Toolbar Menu"
-msgstr "Dewislen Bar Offer"
+#: tdeabc/distributionlisteditor.cpp:133
+msgid "New List"
+msgstr "Rhestr Newydd"
 
-#: tdeui/tdetoolbar.cpp:2043
-msgid ""
-"_: toolbar position string\n"
-"Top"
-msgstr " Top"
+#: tdeabc/distributionlisteditor.cpp:148
+msgid "Change Email"
+msgstr "Newid Ebost"
 
-#: tdeui/tdetoolbar.cpp:2044
-msgid ""
-"_: toolbar position string\n"
-"Left"
-msgstr "Chwith"
+#: tdeabc/distributionlisteditor.cpp:197
+msgid "Please enter name:"
+msgstr "Mewnbynnwch enw:"
 
-#: tdeui/tdetoolbar.cpp:2045
-msgid ""
-"_: toolbar position string\n"
-"Right"
-msgstr "De"
+#: tdeabc/errorhandler.cpp:42
+msgid "Error in libtdeabc"
+msgstr "Gwall yn libtdeabc"
 
-#: tdeui/tdetoolbar.cpp:2046
-msgid ""
-"_: toolbar position string\n"
-"Bottom"
-msgstr " Gwaelod"
+#: tdeabc/tdeab2tdeabc.cpp:42
+msgid "Disable automatic startup on login"
+msgstr "Analluogi cychwyn ymysgogol wrth fewngofnodi."
 
-#: tdeui/tdetoolbar.cpp:2048
-msgid ""
-"_: toolbar position string\n"
-"Floating"
-msgstr "Arnofio"
+#: tdeabc/tdeab2tdeabc.cpp:45
+msgid "Override existing entries"
+msgstr "Gwrthwneud cofnodion cyfredol"
 
-#: tdeui/tdetoolbar.cpp:2049
+#: tdeabc/tdeab2tdeabc.cpp:287
 msgid ""
-"_: min toolbar\n"
-"Flat"
-msgstr " Gwastad"
+"Address book file <b>%1</b> not found! Make sure the old address book is "
+"located there and you have read permission for this file."
+msgstr ""
+"Ni chanfuwyd ffeil llyfr cyfeiriadau <b>%1</b>!  Sicrhewch fod yr hen lyfr "
+"cyfeiriadau mewn bod, a bod gennych caniatadau darllen ar gyfer y ffeil yma."
 
-#: tdeui/tdetoolbar.cpp:2052
-msgid "Icons Only"
-msgstr "Eiconau yn Unig"
+#: tdeabc/tdeab2tdeabc.cpp:435
+msgid "Kab to Kabc Converter"
+msgstr "Trosiadydd Kab i Kabc"
 
-#: tdeui/tdetoolbar.cpp:2053
-msgid "Text Only"
-msgstr "Testun yn Unig"
+#: tdeabc/secrecy.cpp:71
+msgid "Public"
+msgstr "Cyhoeddus"
 
-#: tdeui/tdetoolbar.cpp:2054
-msgid "Text Alongside Icons"
-msgstr "Testun wrth Ochr Eiconau"
+#: kab/addressbook.cc:1950 tdeabc/secrecy.cpp:74
+msgid "Private"
+msgstr "Preivat"
 
-#: tdeui/tdetoolbar.cpp:2055
-msgid "Text Under Icons"
-msgstr "Testun dan Eiconau"
+#: tdeabc/secrecy.cpp:77
+msgid "Confidential"
+msgstr "Cyfrinachol"
 
-#: tdeui/tdetoolbar.cpp:2080 tdeui/tdetoolbar.cpp:2101
-msgid "Small (%1x%2)"
-msgstr "Bach (%1x%2)"
+#: tdeabc/stdaddressbook.cpp:148
+msgid "Unable to save to resource '%1'. It is locked."
+msgstr "Methu cadw i adnodd %1.  Mae o wedi'i gloi."
 
-#: tdeui/tdetoolbar.cpp:2082 tdeui/tdetoolbar.cpp:2103
-msgid "Medium (%1x%2)"
-msgstr "Canol (%1x%2)"
+#: tdeabc/addressee.cpp:318 tdeabc/scripts/addressee.src.cpp:181
+msgid "Unique Identifier"
+msgstr "Dynodwr Unigryw"
 
-#: tdeui/tdetoolbar.cpp:2084 tdeui/tdetoolbar.cpp:2105
-msgid "Large (%1x%2)"
-msgstr "Mawr (%1x%2)"
+#: tdeabc/addressee.cpp:336 tdeabc/scripts/addressee.src.cpp:199
+#, fuzzy
+msgid "Unique Resource Identifier"
+msgstr "Dynodwr Unigryw"
 
-#: tdeui/tdetoolbar.cpp:2086 tdeui/tdetoolbar.cpp:2107
-msgid "Huge (%1x%2)"
-msgstr "Enfawr (%1x%2)"
+#: kab/addressbook.cc:271 tdeabc/addressee.cpp:373
+msgid "Formatted Name"
+msgstr "Enw Fformatedig"
 
-#: tdeui/tdetoolbar.cpp:2118
-msgid "Text Position"
-msgstr "Lleoliad Testun"
+#: tdeabc/addressee.cpp:392
+msgid "Family Name"
+msgstr "Enw Teuluol"
 
-#: tdeui/tdetoolbar.cpp:2120
-msgid "Icon Size"
-msgstr "Maint Eicon"
+#: tdeabc/addressee.cpp:411
+msgid "Given Name"
+msgstr "Enw Gwreiddiol"
 
-#: tdeui/tdeaboutdialog.cpp:93
-msgid "Task"
-msgstr "Tasg"
+#: tdeabc/addressee.cpp:430
+msgid "Additional Names"
+msgstr "Enwau Ychwanegol"
 
-#: tdeui/tdeaboutdialog.cpp:704
-msgid "%1 %2 (Using TDE %3)"
-msgstr "%1 %2 (Defnyddio TDE %3)"
+#: tdeabc/addressee.cpp:449
+msgid "Honorific Prefixes"
+msgstr "Rhagddodiaid Anrhydedd"
 
-#: tdeui/tdeaboutdialog.cpp:706
-msgid "%1 %2, %3"
-msgstr "%1 %2, %3"
+#: tdeabc/addressee.cpp:468
+msgid "Honorific Suffixes"
+msgstr "Ôlddodiaid Anrhydedd"
 
-#: tdeui/tdeaboutdialog.cpp:1326
-msgid "Other Contributors:"
-msgstr "Cyfrannwyr Eraill:"
+#: tdeabc/addressee.cpp:487
+msgid "Nick Name"
+msgstr "Llysenw"
 
-#: tdeui/tdeaboutdialog.cpp:1327
-msgid "(No logo available)"
-msgstr "(dim logo ar gael)"
+#: kab/addressbook.cc:291 tdeabc/addressee.cpp:506
+msgid "Birthday"
+msgstr "Penblwydd"
 
-#: tdeui/tdeaboutdialog.cpp:1772
-msgid "Image missing"
-msgstr "Llun ar goll"
+#: tdeabc/addressee.cpp:512
+msgid "Home Address Street"
+msgstr "Stryd Cyfeiriad Cartref"
 
-#: tdeui/ktimezonewidget.cpp:45
-msgid "Area"
-msgstr "Ardal"
+#: tdeabc/addressee.cpp:518
+msgid "Home Address City"
+msgstr "Dinas Gyfeiriad Cartref"
 
-#: kab/addressbook.cc:295 tdeui/ktimezonewidget.cpp:47
-msgid "Comment"
-msgstr "Esboniad"
+#: tdeabc/addressee.cpp:524
+msgid "Home Address State"
+msgstr "Talaith Gyfeiriad Cartref"
 
-#: tdeui/keditcl2.cpp:105 tdeui/keditcl2.cpp:375 tdeui/keditcl2.cpp:454
-msgid ""
-"End of document reached.\n"
-"Continue from the beginning?"
-msgstr ""
-" Wedi cyrraedd diwedd y ddogfen.\n"
-" Ail-ddechrau o'r dechrau?"
+#: tdeabc/addressee.cpp:530
+msgid "Home Address Zip Code"
+msgstr "Côd Post Cyfeiriad Cartref"
 
-#: tdeui/keditcl2.cpp:118 tdeui/keditcl2.cpp:388 tdeui/keditcl2.cpp:467
-msgid ""
-"Beginning of document reached.\n"
-"Continue from the end?"
-msgstr ""
-"  Wedi cyrraedd dechrau'r ddogfen.\n"
-" Ail-ddechrau o'r diwedd?"
+#: tdeabc/addressee.cpp:536
+msgid "Home Address Country"
+msgstr "Gwlad Cyfeiriad Cartref"
 
-#: tdeui/keditcl2.cpp:711 tdeui/keditcl2.cpp:844
-msgid "Find:"
-msgstr "Canfod:"
+#: tdeabc/addressee.cpp:542
+msgid "Home Address Label"
+msgstr "Label Cyfeiriad Cartref"
 
-#: tdeui/keditcl2.cpp:728 tdeui/keditcl2.cpp:868
-msgid "Case &sensitive"
-msgstr "Mae llythrennau bras o &bwys"
+#: tdeabc/addressee.cpp:548
+msgid "Business Address Street"
+msgstr "Stryd Cyfeiriad Busnes"
 
-#: tdeui/keditcl2.cpp:730 tdeui/keditcl2.cpp:870 tdeutils/kfinddialog.cpp:171
-msgid "Find &backwards"
-msgstr "Canfod &yn ôl"
+#: tdeabc/addressee.cpp:554
+msgid "Business Address City"
+msgstr "Dinas Gyfeiriad Busnes"
 
-#: tdeui/keditcl2.cpp:833
-msgid "Replace &All"
-msgstr "Amnewid y &Cwbl"
+#: tdeabc/addressee.cpp:560
+msgid "Business Address State"
+msgstr "Talaith Gyfeiriad Busnes"
 
-#: tdeui/keditcl2.cpp:852
-msgid "Replace with:"
-msgstr "Amnewid efo:"
+#: tdeabc/addressee.cpp:566
+msgid "Business Address Zip Code"
+msgstr "Côd Post Cyfeiriad Busnes"
 
-#: tdeui/keditcl2.cpp:984
-msgid "Go to line:"
-msgstr "Mynd i linell:"
+#: tdeabc/addressee.cpp:572
+msgid "Business Address Country"
+msgstr "Gwlad Cyfeiriad Busnes"
 
-#: tdeui/twindowlistmenu.cpp:129
-msgid "Unclutter Windows"
-msgstr "Dad-lanastrio Ffenestri"
+#: tdeabc/addressee.cpp:578
+msgid "Business Address Label"
+msgstr "Label Cyfeiriad Busnes"
 
-#: tdeui/twindowlistmenu.cpp:131
-msgid "Cascade Windows"
-msgstr "Rhaeadru Ffenestri"
+#: tdeabc/addressee.cpp:584
+msgid "Home Phone"
+msgstr "Ffôn Cartref"
 
-#: tdeui/twindowlistmenu.cpp:185
-msgid "On All Desktops"
-msgstr "Ar Bob Penbwrdd"
+#: tdeabc/addressee.cpp:590
+msgid "Business Phone"
+msgstr "Ffôn Busnes"
 
-#: tdeui/twindowlistmenu.cpp:213
-msgid "No Windows"
-msgstr "Dim Ffenestri"
+#: tdeabc/addressee.cpp:596
+msgid "Mobile Phone"
+msgstr "Ffôn Symudol"
 
-#: tdeui/ktextedit.cpp:231
-msgid "Check Spelling..."
-msgstr "Gwirio Sillafu..."
+#: tdeabc/addressee.cpp:608
+msgid "Business Fax"
+msgstr "Facs Busnes"
 
-#: tdeui/ktextedit.cpp:237
-msgid "Auto Spell Check"
-msgstr "Hunan-wirio Sillafu"
+#: tdeabc/addressee.cpp:614
+msgid "Car Phone"
+msgstr "Ffôn Car"
 
-#: tdeui/ktextedit.cpp:241
-msgid "Allow Tabulations"
-msgstr "Gadael Tablyddion"
+#: tdeabc/addressee.cpp:632
+msgid "Email Address"
+msgstr "Cyfeiriad Ebost"
 
-#: tdeui/ktextedit.cpp:353 tdehtml/rendering/render_form.cpp:331
-msgid "Spell Checking"
-msgstr "Cywiro Sillafu"
+#: tdeabc/addressee.cpp:651
+msgid "Mail Client"
+msgstr "Cleient Ebost"
 
-#: tdeui/tdespell.cpp:1176
-msgid "You have to restart the dialog for changes to take effect"
-msgstr "Rhaid i chi ailgychwyn yr ymgom i'r newidiadau gymryd effaith"
+#: tdeabc/addressee.cpp:670
+msgid "Time Zone"
+msgstr "Cylchfa Amser"
 
-#: tdeui/tdespell.cpp:1402
-msgid "Spell Checker"
-msgstr "Cywirydd Sillafu"
+#: tdeabc/addressee.cpp:689
+msgid "Geographic Position"
+msgstr "Safle Daearyddol"
 
-#: tdeui/kcommand.cpp:151 tdeui/kcommand.cpp:166 tdeui/kcommand.cpp:199
-#: tdeui/kcommand.cpp:241
-#, c-format
-msgid "&Undo: %1"
-msgstr "&Dadwneud: %1"
+#: kab/addressbook.cc:263 tdeabc/addressee.cpp:708
+#, fuzzy
+msgid ""
+"_: person\n"
+"Title"
+msgstr "Tamil"
 
-#: tdeui/kcommand.cpp:192 tdeui/kcommand.cpp:247
-#, c-format
-msgid "&Redo: %1"
-msgstr "&Ail-wneud: %1"
+#: tdeabc/addressee.cpp:727
+msgid ""
+"_: person in organization\n"
+"Role"
+msgstr ""
 
-#: tdeui/kcommand.cpp:322
-#, c-format
-msgid "Undo: %1"
-msgstr "Dadwneud: %1"
+#: kab/addressbook.cc:180 tdeabc/addressee.cpp:765
+msgid "Department"
+msgstr "Adran"
 
-#: tdeui/kcommand.cpp:341 tdeui/kcommand.cpp:346
-#, c-format
-msgid "Redo: %1"
-msgstr "Ail-wneud: %1"
+#: tdeabc/addressee.cpp:784
+msgid "Note"
+msgstr "Nodyn"
 
-#: tdehtml/tdehtmlimage.cpp:199
-msgid "%1 (%2 - %3x%4 Pixels)"
-msgstr "%1 (%2 - %3x%4 o Bicseli)"
+#: tdeabc/addressee.cpp:803
+msgid "Product Identifier"
+msgstr "Dynodwr Cynnyrch"
 
-#: tdehtml/tdehtmlimage.cpp:201
-msgid "%1 - %2x%3 Pixels"
-msgstr "%1 - %2x%3 o Bicseli"
+#: tdeabc/addressee.cpp:822
+msgid "Revision Date"
+msgstr "Dyddiad Addasiad"
 
-#: tdehtml/tdehtmlimage.cpp:206
-msgid "%1 (%2x%3 Pixels)"
-msgstr "%1 (%2x%3 o Bicseli)"
+#: tdeabc/addressee.cpp:841
+msgid "Sort String"
+msgstr "Llinyn Trefnu"
 
-#: tdehtml/tdehtmlimage.cpp:208
-msgid "Image - %1x%2 Pixels"
-msgstr "Delwedd - %1x%2 o Bicseli"
+#: tdeabc/addressee.cpp:860 tdeui/tdeaboutdialog.cpp:92
+msgid "Homepage"
+msgstr "Tudalen gartref"
 
-#: tdehtml/tdehtmlimage.cpp:214
-msgid "Done."
-msgstr "Wedi gorffen."
+#: tdeabc/addressee.cpp:879
+msgid "Security Class"
+msgstr "Dosbarth Diogelwch"
 
-#: tdehtml/tdehtml_ext.cpp:434
-msgid "&Copy Text"
-msgstr "&Copïo Testun"
+#: tdeabc/addressee.cpp:898
+msgid "Logo"
+msgstr "Logo"
 
-#: tdehtml/tdehtml_ext.cpp:480
-#, fuzzy
-msgid "Search for '%1' with %2"
-msgstr "Chwilio '%1' yn '%2'"
+#: tdeabc/addressee.cpp:917
+msgid "Photo"
+msgstr "Ffoto"
 
-#: tdehtml/tdehtml_ext.cpp:489
-#, fuzzy
-msgid "Search for '%1' with"
-msgstr "Chwilio '%1' yn '%2'"
+#: tdeabc/addressee.cpp:955
+msgid "Agent"
+msgstr "Asiant"
 
-#: tdehtml/tdehtml_ext.cpp:518
-msgid "Open '%1'"
-msgstr "Agor '%1'"
+#: tdeabc/vcard/testwrite.cpp:11
+msgid "TestWritevCard"
+msgstr "YsgrifennuPrawfvCerdyn"
 
-#: tdehtml/tdehtml_ext.cpp:525 tdehtml/tdehtml_ext.cpp:582
-msgid "Stop Animations"
-msgstr "Atal Bywluniadau"
+#: tdeabc/vcardparser/testread.cpp:38
+msgid "vCard 2.1"
+msgstr " vCerdyn 2.1"
 
-#: tdehtml/tdehtml_ext.cpp:533
-msgid "Copy Email Address"
-msgstr "Copïo Cyfeiriad Ebost"
+#: tdeabc/vcardparser/testread.cpp:39 tdewidgets/maketdewidgets.cpp:112
+msgid "Input file"
+msgstr "Ffeil fewnbwn"
 
-#: tdehtml/tdehtml_ext.cpp:538
-msgid "&Save Link As..."
-msgstr "&Cadw Cyswllt Fel ..."
+#: kjs/reference.cpp:96
+msgid "Invalid reference base"
+msgstr "Sail cyfeirnod annilys"
 
-#: tdehtml/tdehtml_ext.cpp:540
-msgid "Copy &Link Address"
-msgstr "Copïo Cyfeiriad C&yswllt"
+#: kjs/reference.cpp:127
+msgid "Can't find variable: "
+msgstr "Methu canfod newidyn:"
 
-#: tdehtml/tdehtml_ext.cpp:550
-msgid "Open in New &Window"
-msgstr "Agor mewn &Ffenest Newydd"
+#: kjs/reference.cpp:134
+msgid "Base is not an object"
+msgstr "Nid yw'r sail yn wrthrych"
 
-#: tdehtml/tdehtml_ext.cpp:552
-msgid "Open in &This Window"
-msgstr "Agor yn y Ffenest &Hon"
+#: kjs/function_object.cpp:290
+msgid "Syntax error in parameter list"
+msgstr "Gwall cystrawen yn y rhestr paramedrau"
 
-#: tdehtml/tdehtml_ext.cpp:554
-msgid "Open in &New Tab"
-msgstr "Agor mewn Tab New&ydd"
+#: kjs/object.cpp:349
+msgid "No default value"
+msgstr "Dim gwerth rhagosodol"
 
-#: tdehtml/tdehtml_ext.cpp:556
-msgid "Reload Frame"
-msgstr "Ail-lwytho Ffrâm"
+#: kjs/object.cpp:494
+msgid "Evaluation error"
+msgstr "Gwall enrhifiad"
 
-#: tdehtml/tdehtml_ext.cpp:561
-#, fuzzy
-msgid "Block IFrame..."
-msgstr "Copïo Delwedd"
+#: kjs/object.cpp:495
+msgid "Range error"
+msgstr "Gwall amrediad"
 
-#: tdehtml/tdehtml_ext.cpp:564 tdehtml/tdehtml_part.cpp:256
-msgid "View Frame Source"
-msgstr "Gweld Ffynhonell y Ffram"
+#: kjs/object.cpp:496
+msgid "Reference error"
+msgstr "Gwall cyfeirnod"
 
-#: tdehtml/tdehtml_ext.cpp:566
-msgid "View Frame Information"
-msgstr "Gweld Gwybodaeth Ffrâm"
+#: kjs/object.cpp:497
+msgid "Syntax error"
+msgstr "Gwall cystrawen"
 
-#: tdehtml/tdehtml_ext.cpp:570 tdehtml/tdehtml_part.cpp:404
-msgid "Print Frame..."
-msgstr "Argraffu Ffrâm ..."
+#: kjs/object.cpp:498
+msgid "Type error"
+msgstr "Gwall math"
 
-#: tdehtml/tdehtml_ext.cpp:571 tdehtml/tdehtml_part.cpp:262
-msgid "Save &Frame As..."
-msgstr "Cadw &Ffram Fel ..."
+#: kjs/object.cpp:499
+msgid "URI error"
+msgstr "Gwall URL"
 
-#: tdehtml/tdehtml_ext.cpp:601
-msgid "Save Image As..."
-msgstr "Cadw Delwedd Fel ..."
+#: kjs/internal.cpp:135
+msgid "Undefined value"
+msgstr "Gwerth anniffiniedig"
 
-#: tdehtml/tdehtml_ext.cpp:603
-msgid "Send Image..."
-msgstr "Anfon Delwedd ..."
+#: kjs/internal.cpp:166
+msgid "Null value"
+msgstr "Gwerth nwl"
 
-#: tdehtml/tdehtml_ext.cpp:608
-msgid "Copy Image"
-msgstr "Copïo Delwedd"
+#: tdefile-plugins/elf/tdefile_elf.cpp:59
+#: tdefile-plugins/elf/tdefile_elf.cpp:83
+msgid "Embedded Metadata"
+msgstr ""
 
-#: tdehtml/tdehtml_ext.cpp:613
-msgid "Copy Image Location"
-msgstr "Copïo Lleoliad Delwedd"
+#: tdefile-plugins/elf/tdefile_elf.cpp:60
+#: tdefile-plugins/elf/tdefile_elf.cpp:84
+msgid "Embedded Icon(s)"
+msgstr ""
 
-#: tdehtml/tdehtml_ext.cpp:618
-msgid "View Image (%1)"
-msgstr "Gweld Delwedd (%1)"
+#: tdefile-plugins/elf/tdefile_elf.cpp:64
+#: tdefile-plugins/elf/tdefile_elf.cpp:86
+#, fuzzy
+msgid "Internal Name"
+msgstr "Enwau Ychwanegol"
 
-#: tdehtml/tdehtml_ext.cpp:623
+#: tdefile-plugins/elf/tdefile_elf.cpp:65
+#: tdefile-plugins/elf/tdefile_elf.cpp:87
 #, fuzzy
-msgid "Block Image..."
-msgstr "Copïo Delwedd"
+msgid "Description"
+msgstr "Disgrifiad:"
 
-#: tdehtml/tdehtml_ext.cpp:629
-#, c-format
-msgid "Block Images From %1"
-msgstr ""
+#: tdefile-plugins/elf/tdefile_elf.cpp:66
+#: tdefile-plugins/elf/tdefile_elf.cpp:88
+#, fuzzy
+msgid "License"
+msgstr "Trwydded:"
 
-#: tdehtml/tdehtml_ext.cpp:653
-msgid "Save Link As"
-msgstr "Cadw Cyswllt Fel"
+#: tdefile-plugins/elf/tdefile_elf.cpp:67
+#: tdefile-plugins/elf/tdefile_elf.cpp:89
+#, fuzzy
+msgid "Copyright"
+msgstr "Copio"
 
-#: tdehtml/tdehtml_ext.cpp:673
-msgid "Save Image As"
-msgstr "Cadw Delwedd Fel"
+#: tdefile-plugins/elf/tdefile_elf.cpp:68
+#: tdefile-plugins/elf/tdefile_elf.cpp:90
+#, fuzzy
+msgid "Author(s)"
+msgstr "A&wduron"
 
-#: tdehtml/tdehtml_ext.cpp:687 tdehtml/tdehtml_ext.cpp:700
-msgid "Add URL to Filter"
+#: tdefile-plugins/elf/tdefile_elf.cpp:69
+#: tdefile-plugins/elf/tdefile_elf.cpp:91
+msgid "Product"
 msgstr ""
 
-#: tdehtml/tdehtml_ext.cpp:688 tdehtml/tdehtml_ext.cpp:701
-msgid "Enter the URL:"
-msgstr ""
+#: tdefile-plugins/elf/tdefile_elf.cpp:71
+#: tdefile-plugins/elf/tdefile_elf.cpp:93 tdenewstuff/downloaddialog.cpp:282
+#: tdenewstuff/downloaddialog.cpp:288 tdenewstuff/downloaddialog.cpp:294
+msgid "Version"
+msgstr " Fersiwn"
 
-#: tdehtml/tdehtml_ext.cpp:828
-msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+#: tdefile-plugins/elf/tdefile_elf.cpp:72
+#: tdefile-plugins/elf/tdefile_elf.cpp:94
+msgid "Compilation Date/Time"
 msgstr ""
-"Mae ffeil o'r enw \"%1\" yn bodoli yn barod. Ydych chi'n sicr yr ydych eisiau "
-"sgrifennu drosto?"
 
-#: tdehtml/tdehtml_ext.cpp:828
-msgid "Overwrite File?"
-msgstr "Ysgrifennu dros y Ffeil?"
+#: tdefile-plugins/elf/tdefile_elf.cpp:73
+#: tdefile-plugins/elf/tdefile_elf.cpp:95
+#, fuzzy
+msgid "Requested Icon"
+msgstr "Wynebfath a Ddymunwyd"
 
-#: tdehtml/tdehtml_ext.cpp:889 tdeparts/browserrun.cpp:390
-msgid "The Download Manager (%1) could not be found in your $PATH "
-msgstr "Methu canfod y Rheolydd Lawrlwytho (%1) yn eich $PATH"
+#: tdefile-plugins/elf/tdefile_elf.cpp:74
+#: tdefile-plugins/elf/tdefile_elf.cpp:96
+#, fuzzy
+msgid "SCM Module"
+msgstr "Modd MDI"
 
-#: tdehtml/tdehtml_ext.cpp:890 tdeparts/browserrun.cpp:391
-msgid ""
-"Try to reinstall it  \n"
-"\n"
-"The integration with Konqueror will be disabled!"
-msgstr ""
-"Ceisiwch ei ail-arsefydlu.\n"
-"\n"
-" Analluogir yr integreiddio efo Konqueror!"
+#: tdefile-plugins/elf/tdefile_elf.cpp:75
+#: tdefile-plugins/elf/tdefile_elf.cpp:97
+#, fuzzy
+msgid "SCM Revision"
+msgstr "Dyddiad Addasiad"
 
-#: tdehtml/tdehtml_ext.cpp:983
-#, no-c-format
-msgid "Default Font Size (100%)"
-msgstr "Maint yr Wynebfath Rhagosodol (100%)"
+#: tdefile-plugins/elf/tdefile_elf.cpp:76
+#: tdefile-plugins/elf/tdefile_elf.cpp:98
+#, fuzzy
+msgid "Comments"
+msgstr "Esboniad"
 
-#: tdehtml/tdehtml_ext.cpp:996
-#, no-c-format
-msgid "%1%"
-msgstr "%1%"
+#: tdefile-plugins/elf/tdefile_elf.cpp:78
+#: tdefile-plugins/elf/tdefile_elf.cpp:100
+msgid "Icon Name(s)"
+msgstr ""
 
 #: tdehtml/tdehtml_printsettings.cpp:31
 msgid ""
@@ -7041,6 +5521,10 @@ msgstr "Pennawd argraffydd"
 msgid "View Do&cument Source"
 msgstr "Gweld Côd Ta&rddiad y Ddogfen"
 
+#: tdehtml/tdehtml_ext.cpp:564 tdehtml/tdehtml_part.cpp:256
+msgid "View Frame Source"
+msgstr "Gweld Ffynhonell y Ffram"
+
 #: tdehtml/tdehtml_part.cpp:257
 msgid "View Document Information"
 msgstr "Gweld Gwybodaeth y Ddogfen"
@@ -7049,6 +5533,10 @@ msgstr "Gweld Gwybodaeth y Ddogfen"
 msgid "Save &Background Image As..."
 msgstr "Cadw Delwedd &Gefndir fel ..."
 
+#: tdehtml/tdehtml_ext.cpp:571 tdehtml/tdehtml_part.cpp:262
+msgid "Save &Frame As..."
+msgstr "Cadw &Ffram Fel ..."
+
 #: tdehtml/tdehtml_part.cpp:263
 msgid "Security..."
 msgstr "Diogelwch..."
@@ -7088,7 +5576,15 @@ msgstr "&Gosod Amgodiad"
 msgid "Semi-Automatic"
 msgstr "Hanner-Awtomatig"
 
-#: tdehtml/tdehtml_part.cpp:297 tdehtml/tdehtml_part.cpp:2298
+#: tdehtml/tdehtml_part.cpp:288 tdeui/ksconfig.cpp:324
+msgid "Russian"
+msgstr "Rwsieg"
+
+#: tdehtml/tdehtml_part.cpp:291 tdeui/ksconfig.cpp:342
+msgid "Ukrainian"
+msgstr "Wcraneg"
+
+#: tdehtml/tdehtml_part.cpp:297 tdehtml/tdehtml_part.cpp:2302
 msgid "Automatic Detection"
 msgstr "Datganiad Awtomatig"
 
@@ -7170,6 +5666,10 @@ msgstr "Dechrau -- canfod testun wrth deipio"
 msgid "Find Links as You Type"
 msgstr "Dechrau -- canfod cysylltau wrth deipio"
 
+#: tdehtml/tdehtml_ext.cpp:570 tdehtml/tdehtml_part.cpp:404
+msgid "Print Frame..."
+msgstr "Argraffu Ffrâm ..."
+
 #: tdehtml/tdehtml_part.cpp:405
 msgid ""
 "Print Frame"
@@ -7212,71 +5712,71 @@ msgstr "<b>Gwall</b>: nôd %1: %2"
 msgid "Display Images on Page"
 msgstr "Arddangos Delweddau ar y Dudalen"
 
-#: tdehtml/tdehtml_part.cpp:1539 tdehtml/tdehtml_part.cpp:1629
+#: tdehtml/tdehtml_part.cpp:1543 tdehtml/tdehtml_part.cpp:1633
 msgid "Session is secured with %1 bit %2."
 msgstr "Diogelir y sesiwn gan %1 did %2."
 
-#: tdehtml/tdehtml_part.cpp:1540 tdehtml/tdehtml_part.cpp:1631
+#: tdehtml/tdehtml_part.cpp:1544 tdehtml/tdehtml_part.cpp:1635
 msgid "Session is not secured."
 msgstr "Ni ddiogelir y sesiwn."
 
-#: tdehtml/tdehtml_part.cpp:1727
+#: tdehtml/tdehtml_part.cpp:1731
 #, c-format
 msgid "Error while loading %1"
 msgstr "Gwall wrth lwytho ffeil %1"
 
-#: tdehtml/tdehtml_part.cpp:1729
+#: tdehtml/tdehtml_part.cpp:1733
 msgid "An error occurred while loading <B>%1</B>:"
 msgstr "Gwall wrth lwytho <B>%1</B>:"
 
-#: tdehtml/tdehtml_part.cpp:1764
+#: tdehtml/tdehtml_part.cpp:1768
 msgid "Error: "
 msgstr "Gwall:"
 
-#: tdehtml/tdehtml_part.cpp:1767
+#: tdehtml/tdehtml_part.cpp:1771
 msgid "The requested operation could not be completed"
 msgstr "Methu cwblhau'r gweithrediad ceisiedig"
 
-#: tdehtml/tdehtml_part.cpp:1773
+#: tdehtml/tdehtml_part.cpp:1777
 msgid "Technical Reason: "
 msgstr "Rheswm Technegol:"
 
-#: tdehtml/tdehtml_part.cpp:1778
+#: tdehtml/tdehtml_part.cpp:1782
 msgid "Details of the Request:"
 msgstr "Manylion y Cais:"
 
-#: tdehtml/tdehtml_part.cpp:1780
+#: tdehtml/tdehtml_part.cpp:1784
 #, c-format
 msgid "URL: %1"
 msgstr "URL: %1"
 
-#: tdehtml/tdehtml_part.cpp:1787
+#: tdehtml/tdehtml_part.cpp:1791
 #, c-format
 msgid "Date and Time: %1"
 msgstr "Dyddiad ac Amser: %1"
 
-#: tdehtml/tdehtml_part.cpp:1789
+#: tdehtml/tdehtml_part.cpp:1793
 #, c-format
 msgid "Additional Information: %1"
 msgstr "Gwybodaeth Ychwanegol: %1"
 
-#: tdehtml/tdehtml_part.cpp:1791
+#: tdehtml/tdehtml_part.cpp:1795
 msgid "Description:"
 msgstr "Disgrifiad:"
 
-#: tdehtml/tdehtml_part.cpp:1797
+#: tdehtml/tdehtml_part.cpp:1801
 msgid "Possible Causes:"
 msgstr "Achosion Posib:"
 
-#: tdehtml/tdehtml_part.cpp:1804
+#: tdehtml/tdehtml_part.cpp:1808
 msgid "Possible Solutions:"
 msgstr "Datrysiadau Posib:"
 
-#: tdehtml/tdehtml_part.cpp:2135
+#: tdehtml/tdehtml_part.cpp:2139
 msgid "Page loaded."
 msgstr "Ffeil wedi ei ail-lwytho."
 
-#: tdehtml/tdehtml_part.cpp:2137
+#: tdehtml/tdehtml_part.cpp:2141
 msgid ""
 "_n: %n Image of %1 loaded.\n"
 "%n Images of %1 loaded."
@@ -7284,48 +5784,48 @@ msgstr ""
 "Llwythwyd %n o %1 Delwedd...\n"
 "Llwythwyd %n o %1 Delwedd..."
 
-#: tdehtml/tdehtml_part.cpp:3738 tdehtml/tdehtml_part.cpp:3825
-#: tdehtml/tdehtml_part.cpp:3836
+#: tdehtml/tdehtml_part.cpp:3742 tdehtml/tdehtml_part.cpp:3829
+#: tdehtml/tdehtml_part.cpp:3840
 msgid " (In new window)"
 msgstr "(Mewn ffenest newydd)"
 
-#: tdehtml/tdehtml_part.cpp:3777
+#: tdehtml/tdehtml_part.cpp:3781
 msgid "Symbolic Link"
 msgstr "Cyswllt Symbolaidd"
 
-#: tdehtml/tdehtml_part.cpp:3779
+#: tdehtml/tdehtml_part.cpp:3783
 msgid "%1 (Link)"
 msgstr "%1 (Cyswllt)"
 
-#: tdehtml/tdehtml_part.cpp:3799
+#: tdehtml/tdehtml_part.cpp:3803
 msgid "%2 (%1 bytes)"
 msgstr "%2 (%1 beit)"
 
-#: tdehtml/tdehtml_part.cpp:3803
+#: tdehtml/tdehtml_part.cpp:3807
 msgid "%2 (%1 K)"
 msgstr "%2 (%1 K)"
 
-#: tdehtml/tdehtml_part.cpp:3838
+#: tdehtml/tdehtml_part.cpp:3842
 msgid " (In other frame)"
 msgstr "(Mewn ffram arall)"
 
-#: tdehtml/tdehtml_part.cpp:3843
+#: tdehtml/tdehtml_part.cpp:3847
 msgid "Email to: "
 msgstr "E-bostio i:"
 
-#: tdehtml/tdehtml_part.cpp:3849
+#: tdehtml/tdehtml_part.cpp:3853
 msgid " - Subject: "
 msgstr "- Pwnc:"
 
-#: tdehtml/tdehtml_part.cpp:3851
+#: tdehtml/tdehtml_part.cpp:3855
 msgid " - CC: "
 msgstr "- CC:"
 
-#: tdehtml/tdehtml_part.cpp:3853
+#: tdehtml/tdehtml_part.cpp:3857
 msgid " - BCC: "
 msgstr " - BCC:"
 
-#: tdehtml/tdehtml_part.cpp:3942
+#: tdehtml/tdehtml_part.cpp:3946
 msgid ""
 "<qt>This untrusted page links to<BR><B>%1</B>.<BR>Do you want to follow the "
 "link?"
@@ -7333,31 +5833,31 @@ msgstr ""
 "<qt>Mae'r dudalen ddiymddiried yma yn cysylltu â  <BR><B>%1</B>.<BR> "
 "Hoffech ddilyn y cyswllt?"
 
-#: tdehtml/tdehtml_part.cpp:3943
+#: tdehtml/tdehtml_part.cpp:3947
 msgid "Follow"
 msgstr "Dilyn"
 
-#: tdehtml/tdehtml_part.cpp:4043
+#: tdehtml/tdehtml_part.cpp:4047
 msgid "Frame Information"
 msgstr "Gwybodaeth Ffrâm"
 
-#: tdehtml/tdehtml_part.cpp:4049
+#: tdehtml/tdehtml_part.cpp:4053
 msgid "   <a href=\"%1\">[Properties]</a>"
 msgstr "<a href=\"%1\">[Priodweddau]</a>"
 
-#: tdehtml/tdehtml_part.cpp:4129
+#: tdehtml/tdehtml_part.cpp:4133
 msgid "Save Background Image As"
 msgstr "Cadw Delwedd y Gefndir Fel ..."
 
-#: tdehtml/tdehtml_part.cpp:4216
+#: tdehtml/tdehtml_part.cpp:4220
 msgid "Save Frame As"
 msgstr "Cadw Ffram Fel"
 
-#: tdehtml/tdehtml_part.cpp:4256
+#: tdehtml/tdehtml_part.cpp:4260
 msgid "&Find in Frame..."
 msgstr "&Canfod mewn Ffrâm ..."
 
-#: tdehtml/tdehtml_part.cpp:4763
+#: tdehtml/tdehtml_part.cpp:4767
 msgid ""
 "Warning:  This is a secure form but it is attempting to send your data back "
 "unencrypted.\n"
@@ -7369,16 +5869,16 @@ msgstr ""
 " Gall rhywun arall ryng-gipio a gweld yr wybodaeth yma. \n"
 " Ydych yn siwr eich bod chi eisiau fynd ymlaen?"
 
-#: tdehtml/tdehtml_part.cpp:4766 tdehtml/tdehtml_part.cpp:4775
-#: tdehtml/tdehtml_part.cpp:4799
+#: tdehtml/tdehtml_part.cpp:4770 tdehtml/tdehtml_part.cpp:4779
+#: tdehtml/tdehtml_part.cpp:4803
 msgid "Network Transmission"
 msgstr "Trosglwyddiad Rhwydwaith"
 
-#: tdehtml/tdehtml_part.cpp:4766 tdehtml/tdehtml_part.cpp:4776
+#: tdehtml/tdehtml_part.cpp:4770 tdehtml/tdehtml_part.cpp:4780
 msgid "&Send Unencrypted"
 msgstr "&Anfon heb ei Gêl-ysgrifo"
 
-#: tdehtml/tdehtml_part.cpp:4773
+#: tdehtml/tdehtml_part.cpp:4777
 msgid ""
 "Warning: Your data is about to be transmitted across the network unencrypted.\n"
 "Are you sure you wish to continue?"
@@ -7387,7 +5887,7 @@ msgstr ""
 "rhwydwaith.\n"
 " Ydych yn siwr eich bod chi eisiau fynd ymlaen?"
 
-#: tdehtml/tdehtml_part.cpp:4797
+#: tdehtml/tdehtml_part.cpp:4801
 msgid ""
 "This site is attempting to submit form data via email.\n"
 "Do you want to continue?"
@@ -7395,11 +5895,11 @@ msgstr ""
 "Mae'r safwê yma yn ceisio cyflwyno data ffurflen drwy e-bost. \n"
 " Ydych eisiau fynd ymlaen?"
 
-#: tdehtml/tdehtml_part.cpp:4800
+#: tdehtml/tdehtml_part.cpp:4804
 msgid "&Send Email"
 msgstr "Anfon E&bost"
 
-#: tdehtml/tdehtml_part.cpp:4821
+#: tdehtml/tdehtml_part.cpp:4825
 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?"
@@ -7407,12 +5907,13 @@ msgstr ""
 "<qt>Bydd y ffurflen yn cael ei chyflwyno i <BR><B>%1</B><BR> "
 "ar eich cysawd ffeiliau lleol. <BR> Ydych eisiau cyflwyno'r ffurlen?"
 
-#: tdehtml/html/html_formimpl.cpp:1531 tdehtml/html/html_formimpl.cpp:2137
-#: tdehtml/tdehtml_part.cpp:4822 tdehtml/tdehtmlview.cpp:2527 tdehtml/tdehtmlview.cpp:2569
+#: tdehtml/html/html_formimpl.cpp:1527 tdehtml/html/html_formimpl.cpp:2133
+#: tdehtml/tdehtml_part.cpp:4826 tdehtml/tdehtmlview.cpp:2558
+#: tdehtml/tdehtmlview.cpp:2600
 msgid "Submit"
 msgstr "Cyflwyno"
 
-#: tdehtml/tdehtml_part.cpp:4870
+#: tdehtml/tdehtml_part.cpp:4874
 msgid ""
 "This site attempted to attach a file from your computer in the form submission. "
 "The attachment was removed for your protection."
@@ -7420,41 +5921,41 @@ msgstr ""
 "Ceisiodd y safwê yma glymu ffeil oddiar eich cyfrifiadur yn y cyflwyniad "
 "ffurflen.  Tynnwyd yr atodiad er eich gwarchodaeth."
 
-#: tdehtml/tdehtml_part.cpp:4870
+#: tdehtml/tdehtml_part.cpp:4874
 msgid "TDE"
 msgstr "TDE"
 
-#: tdehtml/tdehtml_part.cpp:5776
+#: tdehtml/tdehtml_part.cpp:5782
 msgid "(%1/s)"
 msgstr "(%1/s)"
 
-#: tdehtml/tdehtml_part.cpp:6829
+#: tdehtml/tdehtml_part.cpp:6835
 msgid "Security Warning"
 msgstr "Rhybudd Diogelwch"
 
-#: tdehtml/tdehtml_part.cpp:6835
+#: tdehtml/tdehtml_part.cpp:6841
 msgid "<qt>Access by untrusted page to<BR><B>%1</B><BR> denied."
 msgstr "<qt>Gwaharddwyd cyrchiad gan dudalen ddiymddiried i <BR><B>%1</B><BR>."
 
-#: tdehtml/java/kjavaappletserver.cpp:784 tdehtml/tdehtml_part.cpp:6836
+#: tdehtml/java/kjavaappletserver.cpp:784 tdehtml/tdehtml_part.cpp:6842
 msgid "Security Alert"
 msgstr "Larwm Diogelwch"
 
-#: tdehtml/tdehtml_part.cpp:7261
+#: tdehtml/tdehtml_part.cpp:7267
 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."
 
-#: tdehtml/tdehtml_part.cpp:7315
+#: tdehtml/tdehtml_part.cpp:7321
 msgid "&Close Wallet"
 msgstr "&Cau'r Waled"
 
-#: tdehtml/tdehtml_part.cpp:7358
+#: tdehtml/tdehtml_part.cpp:7364
 msgid "JavaScript &Debugger"
 msgstr "&Dadnamydd JavaScript"
 
-#: tdehtml/tdehtml_part.cpp:7393
+#: tdehtml/tdehtml_part.cpp:7399
 #, fuzzy
 msgid "This page was prevented from opening a new window via JavaScript."
 msgstr ""
@@ -7462,271 +5963,372 @@ msgstr ""
 "Javascript. \n"
 " Ydych eisiau gadael hynny?"
 
-#: tdehtml/tdehtml_part.cpp:7399
+#: tdehtml/tdehtml_part.cpp:7405
 msgid "Popup Window Blocked"
 msgstr ""
 
-#: tdehtml/tdehtml_part.cpp:7399
+#: tdehtml/tdehtml_part.cpp:7405
 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 ""
 
-#: tdehtml/tdehtml_part.cpp:7413
+#: tdehtml/tdehtml_part.cpp:7419
 #, c-format
 msgid ""
 "_n: &Show Blocked Popup Window\n"
 "Show %n Blocked Popup Windows"
 msgstr ""
 
-#: tdehtml/tdehtml_part.cpp:7414
+#: tdehtml/tdehtml_part.cpp:7420
 msgid "Show Blocked Window Passive Popup &Notification"
 msgstr ""
 
-#: tdehtml/tdehtml_part.cpp:7416
+#: tdehtml/tdehtml_part.cpp:7422
 msgid "&Configure JavaScript New Window Policies..."
 msgstr ""
 
-#: tdehtml/tdehtmlview.cpp:1625
+#: tdehtml/tdehtml_factory.cpp:177
+msgid "TDEHTML"
+msgstr "TDEHTML"
+
+#: tdehtml/tdehtml_factory.cpp:178
+msgid "Embeddable HTML component"
+msgstr "Cydran HTML mewnadeiladedig"
+
+#: tdehtml/tdehtmlimage.cpp:199
+msgid "%1 (%2 - %3x%4 Pixels)"
+msgstr "%1 (%2 - %3x%4 o Bicseli)"
+
+#: tdehtml/tdehtmlimage.cpp:201
+msgid "%1 - %2x%3 Pixels"
+msgstr "%1 - %2x%3 o Bicseli"
+
+#: tdehtml/tdehtmlimage.cpp:206
+msgid "%1 (%2x%3 Pixels)"
+msgstr "%1 (%2x%3 o Bicseli)"
+
+#: tdehtml/tdehtmlimage.cpp:208
+msgid "Image - %1x%2 Pixels"
+msgstr "Delwedd - %1x%2 o Bicseli"
+
+#: tdehtml/tdehtmlimage.cpp:214
+msgid "Done."
+msgstr "Wedi gorffen."
+
+#: tdehtml/tdehtml_ext.cpp:434
+msgid "&Copy Text"
+msgstr "&Copïo Testun"
+
+#: tdehtml/tdehtml_ext.cpp:480
+#, fuzzy
+msgid "Search for '%1' with %2"
+msgstr "Chwilio '%1' yn '%2'"
+
+#: tdehtml/tdehtml_ext.cpp:489
+#, fuzzy
+msgid "Search for '%1' with"
+msgstr "Chwilio '%1' yn '%2'"
+
+#: tdehtml/tdehtml_ext.cpp:518
+msgid "Open '%1'"
+msgstr "Agor '%1'"
+
+#: tdehtml/tdehtml_ext.cpp:525 tdehtml/tdehtml_ext.cpp:582
+msgid "Stop Animations"
+msgstr "Atal Bywluniadau"
+
+#: tdehtml/tdehtml_ext.cpp:533
+msgid "Copy Email Address"
+msgstr "Copïo Cyfeiriad Ebost"
+
+#: tdehtml/tdehtml_ext.cpp:538
+msgid "&Save Link As..."
+msgstr "&Cadw Cyswllt Fel ..."
+
+#: tdehtml/tdehtml_ext.cpp:540
+msgid "Copy &Link Address"
+msgstr "Copïo Cyfeiriad C&yswllt"
+
+#: tdehtml/tdehtml_ext.cpp:550
+msgid "Open in New &Window"
+msgstr "Agor mewn &Ffenest Newydd"
+
+#: tdehtml/tdehtml_ext.cpp:552
+msgid "Open in &This Window"
+msgstr "Agor yn y Ffenest &Hon"
+
+#: tdehtml/tdehtml_ext.cpp:554
+msgid "Open in &New Tab"
+msgstr "Agor mewn Tab New&ydd"
+
+#: tdehtml/tdehtml_ext.cpp:556
+msgid "Reload Frame"
+msgstr "Ail-lwytho Ffrâm"
+
+#: tdehtml/tdehtml_ext.cpp:561
+#, fuzzy
+msgid "Block IFrame..."
+msgstr "Copïo Delwedd"
+
+#: tdehtml/tdehtml_ext.cpp:566
+msgid "View Frame Information"
+msgstr "Gweld Gwybodaeth Ffrâm"
+
+#: tdehtml/tdehtml_ext.cpp:601
+msgid "Save Image As..."
+msgstr "Cadw Delwedd Fel ..."
+
+#: tdehtml/tdehtml_ext.cpp:603
+msgid "Send Image..."
+msgstr "Anfon Delwedd ..."
+
+#: tdehtml/tdehtml_ext.cpp:608
+msgid "Copy Image"
+msgstr "Copïo Delwedd"
+
+#: tdehtml/tdehtml_ext.cpp:613
+msgid "Copy Image Location"
+msgstr "Copïo Lleoliad Delwedd"
+
+#: tdehtml/tdehtml_ext.cpp:618
+msgid "View Image (%1)"
+msgstr "Gweld Delwedd (%1)"
+
+#: tdehtml/tdehtml_ext.cpp:623
+#, fuzzy
+msgid "Block Image..."
+msgstr "Copïo Delwedd"
+
+#: tdehtml/tdehtml_ext.cpp:629
+#, c-format
+msgid "Block Images From %1"
+msgstr ""
+
+#: tdehtml/tdehtml_ext.cpp:653
+msgid "Save Link As"
+msgstr "Cadw Cyswllt Fel"
+
+#: tdehtml/tdehtml_ext.cpp:673
+msgid "Save Image As"
+msgstr "Cadw Delwedd Fel"
+
+#: tdehtml/tdehtml_ext.cpp:687 tdehtml/tdehtml_ext.cpp:700
+msgid "Add URL to Filter"
+msgstr ""
+
+#: tdehtml/tdehtml_ext.cpp:688 tdehtml/tdehtml_ext.cpp:701
+msgid "Enter the URL:"
+msgstr ""
+
+#: tdehtml/tdehtml_ext.cpp:828
+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?"
+
+#: tdehtml/tdehtml_ext.cpp:828
+msgid "Overwrite File?"
+msgstr "Ysgrifennu dros y Ffeil?"
+
+#: tdehtml/tdehtml_ext.cpp:828 tdenewstuff/knewstuffgeneric.cpp:141
+msgid "Overwrite"
+msgstr " Dros-ysgrifennu"
+
+#: tdehtml/tdehtml_ext.cpp:889 tdeparts/browserrun.cpp:390
+msgid "The Download Manager (%1) could not be found in your $PATH "
+msgstr "Methu canfod y Rheolydd Lawrlwytho (%1) yn eich $PATH"
+
+#: tdehtml/tdehtml_ext.cpp:890 tdeparts/browserrun.cpp:391
+msgid ""
+"Try to reinstall it  \n"
+"\n"
+"The integration with Konqueror will be disabled!"
+msgstr ""
+"Ceisiwch ei ail-arsefydlu.\n"
+"\n"
+" Analluogir yr integreiddio efo Konqueror!"
+
+#: tdehtml/tdehtml_ext.cpp:983
+#, no-c-format
+msgid "Default Font Size (100%)"
+msgstr "Maint yr Wynebfath Rhagosodol (100%)"
+
+#: tdehtml/tdehtml_ext.cpp:996
+#, no-c-format
+msgid "%1%"
+msgstr "%1%"
+
+#: tdehtml/tdehtmlview.cpp:1644
 msgid "Find stopped."
 msgstr "Arhosodd y canfod."
 
-#: tdehtml/tdehtmlview.cpp:1636
+#: tdehtml/tdehtmlview.cpp:1655
 msgid "Starting -- find links as you type"
 msgstr "Dechrau -- canfod cysylltau wrth deipio"
 
-#: tdehtml/tdehtmlview.cpp:1642
+#: tdehtml/tdehtmlview.cpp:1661
 msgid "Starting -- find text as you type"
 msgstr "Dechrau -- canfod testun wrth deipio"
 
-#: tdehtml/tdehtmlview.cpp:1663
+#: tdehtml/tdehtmlview.cpp:1682
 msgid "Link found: \"%1\"."
 msgstr "Canfuwyd y cyswllt: \"%1\"."
 
-#: tdehtml/tdehtmlview.cpp:1668
+#: tdehtml/tdehtmlview.cpp:1687
 msgid "Link not found: \"%1\"."
 msgstr "Ni chanfuwyd y cyswllt: \"%1\"."
 
-#: tdehtml/tdehtmlview.cpp:1676
+#: tdehtml/tdehtmlview.cpp:1695
 msgid "Text found: \"%1\"."
 msgstr "Canfuwyd y testun: \"%1\"."
 
-#: tdehtml/tdehtmlview.cpp:1681
+#: tdehtml/tdehtmlview.cpp:1700
 msgid "Text not found: \"%1\"."
 msgstr "Ni chanfuwyd y testun: \"%1\"."
 
-#: tdehtml/tdehtmlview.cpp:1725
+#: tdehtml/tdehtmlview.cpp:1752
 msgid "Access Keys activated"
 msgstr "Gweithredoliwyd Bysellau Cyrchiad"
 
-#: tdehtml/tdehtmlview.cpp:2756
+#: tdehtml/html/html_formimpl.cpp:2125 tdehtml/tdehtmlview.cpp:2572
+#: tdehtml/tdehtmlview.cpp:2605 tdeui/kedittoolbar.cpp:447
+msgid "Reset"
+msgstr "Ail-osod"
+
+#: tdehtml/tdehtmlview.cpp:2787
 #, c-format
 msgid "Print %1"
 msgstr "Argraffu %1"
 
-#: tdehtml/tdehtml_factory.cpp:177
-msgid "TDEHTML"
-msgstr "TDEHTML"
-
-#: tdehtml/tdehtml_factory.cpp:178
-msgid "Embeddable HTML component"
-msgstr "Cydran HTML mewnadeiladedig"
-
-#: tdehtml/xml/xml_tokenizer.cpp:312
-msgid "the document is not in the correct file format"
-msgstr "nid yw'r ddogfen yn y fformat ffeil cywir"
-
-#: tdehtml/xml/xml_tokenizer.cpp:318
-msgid "fatal parsing error: %1 in line %2, column %3"
-msgstr "gwall gramadegu angheuol: %1 yn llinell %2, colofn %3"
-
-#: tdehtml/xml/xml_tokenizer.cpp:477
-msgid "XML parsing error"
-msgstr "Gwall gramadegu XML"
+#: tdehtml/rendering/render_frames.cpp:957
+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?"
 
-#: tdehtml/xml/dom_docimpl.cpp:2077
-msgid "Basic Page Style"
-msgstr "Ardull Sylfaenol i Dudalen"
+#: tdehtml/rendering/render_frames.cpp:958
+msgid "Missing Plugin"
+msgstr "Ategyn ar Goll"
 
-#: tdehtml/ecma/kjs_debugwin.cpp:291
-msgid "JavaScript Error"
-msgstr "Gwall JavaScript"
+#: tdehtml/rendering/render_frames.cpp:958
+msgid "Download"
+msgstr "Lawrlwytho"
 
-#: tdehtml/ecma/kjs_debugwin.cpp:305
-msgid "&Do not show this message again"
-msgstr "&Peidio a dangos y neges yma eto"
+#: tdehtml/rendering/render_frames.cpp:958
+#, fuzzy
+msgid "Do Not Download"
+msgstr "Lawrlwythir yn Amlaf"
 
-#: tdehtml/ecma/kjs_debugwin.cpp:369
-msgid "JavaScript Debugger"
-msgstr "Dadfygiwr JavaScript"
+#: tdehtml/rendering/render_form.cpp:331 tdeui/ktextedit.cpp:353
+msgid "Spell Checking"
+msgstr "Cywiro Sillafu"
 
-#: tdehtml/ecma/kjs_debugwin.cpp:383
-msgid "Call stack"
-msgstr "Pentwr galwadau"
+#: tdehtml/rendering/render_form.cpp:388 tdeui/kcombobox.cpp:458
+#, fuzzy
+msgid "&Edit History..."
+msgstr "&Golygu..."
 
-#: tdehtml/ecma/kjs_debugwin.cpp:418
-msgid "JavaScript console"
-msgstr "Terfynell JavaScript"
+#: tdehtml/rendering/render_form.cpp:390 tdeui/kcombobox.cpp:461
+msgid "Clear &History"
+msgstr "Gwaredu &Hanes"
 
-#: tdehtml/ecma/kjs_debugwin.cpp:448
-msgid ""
-"_: Next breakpoint\n"
-"&Next"
-msgstr "&Nesaf"
+#: tdehtml/tdemultipart/tdemultipart.cpp:320
+msgid "No handler found for %1!"
+msgstr "Methu canfod trinydd i %1!"
 
-#: tdehtml/ecma/kjs_debugwin.cpp:450
-msgid "&Step"
-msgstr "&Cam"
+#: tdehtml/tdemultipart/tdemultipart.cpp:576
+msgid "KMultiPart"
+msgstr "KMultiPart"
 
-#: tdehtml/ecma/kjs_debugwin.cpp:455
-msgid "&Continue"
-msgstr "&Parhau"
+#: tdehtml/tdemultipart/tdemultipart.cpp:578
+msgid "Embeddable component for multipart/mixed"
+msgstr "Cydran mewnadeiladadwy i aml-ran/cymysglyd"
 
-#: tdehtml/ecma/kjs_debugwin.cpp:459
-msgid "&Break at Next Statement"
-msgstr "&Torri wrth Ddatganiad Nesaf"
+#: tdehtml/xml/dom_docimpl.cpp:2077
+msgid "Basic Page Style"
+msgstr "Ardull Sylfaenol i Dudalen"
 
-#: tdehtml/ecma/kjs_debugwin.cpp:463
-msgid ""
-"_: Next breakpoint\n"
-"Next"
-msgstr "Nesaf"
+#: tdehtml/xml/xml_tokenizer.cpp:312
+msgid "the document is not in the correct file format"
+msgstr "nid yw'r ddogfen yn y fformat ffeil cywir"
 
-#: tdehtml/ecma/kjs_debugwin.cpp:464
-msgid "Step"
-msgstr "Cam"
+#: tdehtml/xml/xml_tokenizer.cpp:318
+msgid "fatal parsing error: %1 in line %2, column %3"
+msgstr "gwall gramadegu angheuol: %1 yn llinell %2, colofn %3"
 
-#: tdehtml/ecma/kjs_debugwin.cpp:826
-msgid "Parse error at %1 line %2"
-msgstr "Gwall dosrannu wrth %1 llinell %2"
+#: tdehtml/xml/xml_tokenizer.cpp:477
+msgid "XML parsing error"
+msgstr "Gwall gramadegu XML"
 
-#: tdehtml/ecma/kjs_debugwin.cpp:837
-#, c-format
-msgid ""
-"An error occurred while attempting to run a script on this page.\n"
-"\n"
-"%1"
+#: tdehtml/misc/knsplugininstaller.cpp:348
+msgid "TDE plugin wizard"
 msgstr ""
-"Digwyddodd gwall wrth geisio rhedeg sgript ar y dudalen yma.\n"
-"\n"
-"%1"
 
-#: tdehtml/ecma/kjs_debugwin.cpp:846
-msgid ""
-"An error occurred while attempting to run a script on this page.\n"
-"\n"
-"%1 line %2:\n"
-"%3"
+#: tdehtml/misc/knsplugininstaller.cpp:378
+#, fuzzy
+msgid "The following plugins are available."
 msgstr ""
-"Digwyddodd gwall wrth geisio rhedeg sgript ar y dudalen yma.\n"
-"\n"
-"%1 llinell %2:\n"
-"%3"
-
-#: tdehtml/ecma/kjs_html.cpp:2160 tdehtml/ecma/kjs_window.cpp:1562
-msgid "Confirmation: JavaScript Popup"
-msgstr "Cadarnhad: Naidlen Javascript"
+"Dim cydweddiad ar gael.\n"
 
-#: tdehtml/ecma/kjs_window.cpp:1565
-msgid ""
-"This site is requesting to open up a new browser window via JavaScript.\n"
-"Do you want to allow this?"
+#: tdehtml/misc/knsplugininstaller.cpp:382
+msgid "Click on next to install the selected plugin."
 msgstr ""
-"Mae'r safwe yma yn ceisio agor ffenestr newydd i borydd, wrth ddefnyddio "
-"Javascript. \n"
-" Ydych eisiau gadael hynny?"
 
-#: tdehtml/ecma/kjs_window.cpp:1568
-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>"
+#: tdehtml/misc/knsplugininstaller.cpp:383
+msgid "Plugin installation confirmation"
 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>"
-
-#: tdehtml/ecma/kjs_html.cpp:2167 tdehtml/ecma/kjs_window.cpp:1570
-msgid "Allow"
-msgstr "Caniatáu"
-
-#: tdehtml/ecma/kjs_html.cpp:2167 tdehtml/ecma/kjs_window.cpp:1570
-#, fuzzy
-msgid "Do Not Allow"
-msgstr "Mewnforio &Popeth"
-
-#: tdehtml/ecma/kjs_window.cpp:1862
-msgid "Close window?"
-msgstr "Cau'r ffenest?"
 
-#: tdehtml/ecma/kjs_window.cpp:1862
-msgid "Confirmation Required"
-msgstr "Angen Cadarnhad"
-
-#: tdehtml/ecma/kjs_window.cpp:2744
-msgid ""
-"Do you want a bookmark pointing to the location \"%1\" to be added to your "
-"collection?"
+#: tdehtml/misc/knsplugininstaller.cpp:414
+msgid "I agree."
 msgstr ""
-"Ydych eisiau i dudnod sy'n cyfeirio at y lleoliad \"%1\" gael ei ychwanegu i'ch "
-"casgliad?"
 
-#: tdehtml/ecma/kjs_window.cpp:2747
-msgid ""
-"Do you want a bookmark pointing to the location \"%1\" titled \"%2\" to be "
-"added to your collection?"
+#: tdehtml/misc/knsplugininstaller.cpp:416
+msgid "I do not agree (plugin will not be installed)."
 msgstr ""
-"Ydych eisiau i dudnod sy'n cyfeirio at y lleoliad \"%1\", efo'r teitl \"%2\",  "
-"gael ei ychwanegu i'ch casgliad?"
 
-#: tdehtml/ecma/kjs_window.cpp:2755
-msgid "JavaScript Attempted Bookmark Insert"
-msgstr "Ceisiodd JavaScript Mewnosod Tudnod"
+#: tdehtml/misc/knsplugininstaller.cpp:422
+msgid "Plugin licence"
+msgstr ""
 
-#: tdehtml/ecma/kjs_window.cpp:2759
-msgid "Disallow"
-msgstr "Gwrthwneud"
+#: tdehtml/misc/knsplugininstaller.cpp:432
+#, fuzzy
+msgid "Installation in progress."
+msgstr "Methodd yr arsefydlu."
 
-#: tdehtml/ecma/kjs_proxy.cpp:405
-msgid ""
-"A script on this page is causing TDEHTML to freeze. If it continues to run, other "
-"applications may become less responsive.\n"
-"Do you want to abort the script?"
-msgstr ""
-"Mae sgript ar y dudalen yma yn achosi i TDEHTML rewi.  Os mae'n parhau rhedeg, "
-"efallai bydd cymhwysiadau eraill yn dechrau mynd yn llai ymatebol.\n"
-"Ydych eisiau terfynu'r sgript?"
+#: tdehtml/misc/knsplugininstaller.cpp:438
+#, fuzzy
+msgid "Plugin installation"
+msgstr "Arsefydlu"
 
-#: tdehtml/ecma/kjs_proxy.cpp:405
-msgid "JavaScript"
-msgstr "JavaScript"
+#: tdehtml/misc/knsplugininstaller.cpp:451
+#, fuzzy
+msgid "Installation status"
+msgstr "Arsefydlu"
 
-#: tdehtml/ecma/kjs_proxy.cpp:405
-msgid "&Abort"
-msgstr "&Terfynnu"
+#: tdehtml/misc/knsplugininstaller.cpp:498
+#, fuzzy
+msgid "To install "
+msgstr "Arsefydlu"
 
-#: tdehtml/ecma/kjs_html.cpp:2162
-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?"
+#: tdehtml/misc/knsplugininstaller.cpp:498
+msgid " you need to agree to the following"
 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?"
 
-#: tdehtml/ecma/kjs_html.cpp:2165
-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>"
+#: tdehtml/misc/knsplugininstaller.cpp:529
+msgid "Installation completed. Reload the page."
 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>"
 
-#: tdehtml/html/htmlparser.cpp:1709
+#: tdehtml/misc/knsplugininstaller.cpp:532
+#, fuzzy
+msgid "Installation failed"
+msgstr "Methodd yr arsefydlu."
+
+#: tdehtml/html/htmlparser.cpp:1707
 msgid "This is a searchable index. Enter search keywords: "
 msgstr "Mynegai chwiliadwy yw hwn.  Rhowch allweddeiriau i'r ymchwil: "
 
@@ -7783,27 +6385,9 @@ msgstr "&Byth am y Wefan Yma"
 msgid "Do Not Store"
 msgstr "&Peidiwch â Chadw"
 
-#: tdehtml/html/html_formimpl.cpp:618
-#, fuzzy
-msgid ""
-"Konqueror has the ability to store the password in an encrypted wallet. When "
-"the wallet is unlocked, it can then automatically restore the login information "
-"next time you submit this form. Do you want to store the information now?"
+#: tdehtml/html/html_formimpl.cpp:617
+msgid "Store passwords on this page?"
 msgstr ""
-"Gall Konqueror cadw'r cyfrinair mewn waled wedi'i gêl-ysgrifennu.  Pan dadgloir "
-"y waled, gall adfer y wybodaeth fewngofnodi y tro nesaf yr ewch i'r wefan yma.  "
-"Ydych eisiau cadw'r wybodaeth rwan?"
-
-#: tdehtml/html/html_formimpl.cpp:623
-#, fuzzy
-msgid ""
-"Konqueror has the ability to store the password in an encrypted wallet. When "
-"the wallet is unlocked, it can then automatically restore the login information "
-"next time you visit %1. Do you want to store the information now?"
-msgstr ""
-"Gall Konqueror cadw'r cyfrinair mewn waled wedi'i gêl-ysgrifennu.  Pan dadgloir "
-"y waled, gall adfer y wybodaeth fewngofnodi y tro nesaf yr ewch i'r wefan yma.  "
-"Ydych eisiau cadw'r wybodaeth rwan?"
 
 #: tdehtml/java/kjavaappletviewer.cpp:122
 msgid "Applet Parameters"
@@ -7829,22 +6413,6 @@ msgstr "Archifau"
 msgid "TDE Java Applet Plugin"
 msgstr "Ategyn Rhaglennig Jave TDE"
 
-#: tdehtml/java/kjavaapplet.cpp:225
-msgid "Initializing Applet \"%1\"..."
-msgstr "Ymgychwyn Rhaglennig \"%1\"..."
-
-#: tdehtml/java/kjavaapplet.cpp:232
-msgid "Starting Applet \"%1\"..."
-msgstr "Cychwyn Rhaglennig \"%1\"..."
-
-#: tdehtml/java/kjavaapplet.cpp:239
-msgid "Applet \"%1\" started"
-msgstr " Mae rhaglennig \"%1\" wedi cychwyn"
-
-#: tdehtml/java/kjavaapplet.cpp:245
-msgid "Applet \"%1\" stopped"
-msgstr " Mae rhaglennig \"%1\" wedi aros"
-
 #: tdehtml/java/kjavaappletserver.cpp:145
 msgid "Loading Applet"
 msgstr "Llwytho rhaglennig"
@@ -7929,121 +6497,276 @@ msgstr "Ydych am roi i'r rhaglennig Java gyda thystysgrif(au):"
 msgid "the following permission"
 msgstr "y caniatadau dilynol"
 
+#: tdehtml/java/kjavaappletserver.cpp:797 tdeui/kstdguiitem.cpp:115
+msgid "&No"
+msgstr "&Nage"
+
 #: tdehtml/java/kjavaappletserver.cpp:801
 msgid "&Reject All"
 msgstr "&Gwrthod Popeth"
 
+#: tdehtml/java/kjavaappletserver.cpp:804 tdeui/kstdguiitem.cpp:110
+msgid "&Yes"
+msgstr "&Ie"
+
 #: tdehtml/java/kjavaappletserver.cpp:807
 msgid "&Grant All"
 msgstr "&Caniatàu Popeth"
 
-#: tdehtml/tdemultipart/tdemultipart.cpp:320
-msgid "No handler found for %1!"
-msgstr "Methu canfod trinydd i %1!"
+#: tdehtml/java/kjavaapplet.cpp:225
+msgid "Initializing Applet \"%1\"..."
+msgstr "Ymgychwyn Rhaglennig \"%1\"..."
 
-#: tdehtml/tdemultipart/tdemultipart.cpp:576
-msgid "KMultiPart"
-msgstr "KMultiPart"
+#: tdehtml/java/kjavaapplet.cpp:232
+msgid "Starting Applet \"%1\"..."
+msgstr "Cychwyn Rhaglennig \"%1\"..."
 
-#: tdehtml/tdemultipart/tdemultipart.cpp:578
-msgid "Embeddable component for multipart/mixed"
-msgstr "Cydran mewnadeiladadwy i aml-ran/cymysglyd"
+#: tdehtml/java/kjavaapplet.cpp:239
+msgid "Applet \"%1\" started"
+msgstr " Mae rhaglennig \"%1\" wedi cychwyn"
 
-#: tdehtml/rendering/render_frames.cpp:944
+#: tdehtml/java/kjavaapplet.cpp:245
+msgid "Applet \"%1\" stopped"
+msgstr " Mae rhaglennig \"%1\" wedi aros"
+
+#: tdehtml/ecma/kjs_html.cpp:2163 tdehtml/ecma/kjs_window.cpp:1562
+msgid "Confirmation: JavaScript Popup"
+msgstr "Cadarnhad: Naidlen Javascript"
+
+#: tdehtml/ecma/kjs_html.cpp:2165
 msgid ""
-"No plugin found for '%1'.\n"
-"Do you want to download one from %2?"
+"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 ""
-"Methu canfod atodyn i '%1'. \n"
-" Ydych eisiau lawrlwytho un oddiwrth %2?"
+"Mae'r safwe yma yn ceisio agor ffenestr newydd i borydd, wrth ddefnyddio "
+"Javascript. \n"
+" Ydych eisiau gadael i'r ffurflen gael ei anfon?"
 
-#: tdehtml/rendering/render_frames.cpp:945
-msgid "Missing Plugin"
-msgstr "Ategyn ar Goll"
+#: tdehtml/ecma/kjs_html.cpp:2168
+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>"
 
-#: tdehtml/rendering/render_frames.cpp:945
-msgid "Download"
-msgstr "Lawrlwytho"
+#: tdehtml/ecma/kjs_html.cpp:2170 tdehtml/ecma/kjs_window.cpp:1570
+msgid "Allow"
+msgstr "Caniatáu"
 
-#: tdehtml/rendering/render_frames.cpp:945
+#: tdehtml/ecma/kjs_html.cpp:2170 tdehtml/ecma/kjs_window.cpp:1570
 #, fuzzy
-msgid "Do Not Download"
-msgstr "Lawrlwythir yn Amlaf"
+msgid "Do Not Allow"
+msgstr "Mewnforio &Popeth"
 
-#: tdeinit/tdeinit.cpp:475
+#: tdehtml/ecma/kjs_debugwin.cpp:291
+msgid "JavaScript Error"
+msgstr "Gwall JavaScript"
+
+#: tdehtml/ecma/kjs_debugwin.cpp:305
+msgid "&Do not show this message again"
+msgstr "&Peidio a dangos y neges yma eto"
+
+#: tdehtml/ecma/kjs_debugwin.cpp:369
+msgid "JavaScript Debugger"
+msgstr "Dadfygiwr JavaScript"
+
+#: tdehtml/ecma/kjs_debugwin.cpp:383
+msgid "Call stack"
+msgstr "Pentwr galwadau"
+
+#: tdehtml/ecma/kjs_debugwin.cpp:418
+msgid "JavaScript console"
+msgstr "Terfynell JavaScript"
+
+#: tdehtml/ecma/kjs_debugwin.cpp:448
 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."
+"_: Next breakpoint\n"
+"&Next"
+msgstr "&Nesaf"
+
+#: tdehtml/ecma/kjs_debugwin.cpp:450
+msgid "&Step"
+msgstr "&Cam"
+
+#: tdehtml/ecma/kjs_debugwin.cpp:455
+msgid "&Continue"
+msgstr "&Parhau"
+
+#: tdehtml/ecma/kjs_debugwin.cpp:459
+msgid "&Break at Next Statement"
+msgstr "&Torri wrth Ddatganiad Nesaf"
+
+#: tdehtml/ecma/kjs_debugwin.cpp:463
+msgid ""
+"_: Next breakpoint\n"
+"Next"
+msgstr "Nesaf"
+
+#: tdehtml/ecma/kjs_debugwin.cpp:464
+msgid "Step"
+msgstr "Cam"
+
+#: tdehtml/ecma/kjs_debugwin.cpp:826
+msgid "Parse error at %1 line %2"
+msgstr "Gwall dosrannu wrth %1 llinell %2"
+
+#: tdehtml/ecma/kjs_debugwin.cpp:837
+#, c-format
+msgid ""
+"An error occurred while attempting to run a script on this page.\n"
+"\n"
+"%1"
 msgstr ""
+"Digwyddodd gwall wrth geisio rhedeg sgript ar y dudalen yma.\n"
+"\n"
+"%1"
 
-#: tdeinit/tdeinit.cpp:497
+#: tdehtml/ecma/kjs_debugwin.cpp:846
 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."
+"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"
 
-#: tdeinit/tdeinit.cpp:589
-msgid "Could not find '%1' executable."
-msgstr "Methu canfod gweithredadwyn '%1'"
+#: tdehtml/ecma/kjs_window.cpp:1565
+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?"
 
-#: tdeinit/tdeinit.cpp:605
+#: tdehtml/ecma/kjs_window.cpp:1568
 msgid ""
-"Could not open library '%1'.\n"
-"%2"
+"<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 ""
-"Methu agor rhaglengell '%1'.\n"
-"%2"
+"<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>"
 
-#: tdeinit/tdeinit.cpp:606 tdeinit/tdeinit.cpp:649
-msgid "Unknown error"
-msgstr "Gwall anhysbys"
+#: tdehtml/ecma/kjs_window.cpp:1862
+msgid "Close window?"
+msgstr "Cau'r ffenest?"
 
-#: tdeinit/tdeinit.cpp:648
+#: tdehtml/ecma/kjs_window.cpp:1862
+msgid "Confirmation Required"
+msgstr "Angen Cadarnhad"
+
+#: tdehtml/ecma/kjs_window.cpp:2744
 msgid ""
-"Could not find 'kdemain' in '%1'.\n"
-"%2"
+"Do you want a bookmark pointing to the location \"%1\" to be added to your "
+"collection?"
 msgstr ""
-"Methu canfod 'kdemain' yn '%1'.\n"
-"%2"
+"Ydych eisiau i dudnod sy'n cyfeirio at y lleoliad \"%1\" gael ei ychwanegu i'ch "
+"casgliad?"
 
-#: tdeinit/tdelauncher_main.cpp:58
+#: tdehtml/ecma/kjs_window.cpp:2747
 msgid ""
-"tdelauncher: This program is not supposed to be started manually.\n"
-"tdelauncher: It is started automatically by tdeinit.\n"
+"Do you want a bookmark pointing to the location \"%1\" titled \"%2\" to be "
+"added to your collection?"
 msgstr ""
-"tdelauncher: Ni ddylir cychwyn y rhaglen yma â llaw.\n"
-"tdelauncher: Cychwynnir yn ymysgogol gan tdeinit.\n"
+"Ydych eisiau i dudnod sy'n cyfeirio at y lleoliad \"%1\", efo'r teitl \"%2\",  "
+"gael ei ychwanegu i'ch casgliad?"
 
-#: tdeinit/tdelauncher.cpp:743
-msgid "TDEInit could not launch '%1'."
-msgstr "Ni allodd TDEInit gychwyn '%1'."
+#: tdehtml/ecma/kjs_window.cpp:2755
+msgid "JavaScript Attempted Bookmark Insert"
+msgstr "Ceisiodd JavaScript Mewnosod Tudnod"
 
-#: tdeinit/tdelauncher.cpp:918 tdeinit/tdelauncher.cpp:943 tdeinit/tdelauncher.cpp:960
-msgid "Could not find service '%1'."
-msgstr "Methu canfod gwasanaeth '%1'."
+#: tdehtml/ecma/kjs_window.cpp:2759
+msgid "Disallow"
+msgstr "Gwrthwneud"
 
-#: tdeinit/tdelauncher.cpp:975 tdeinit/tdelauncher.cpp:1011
-msgid "Service '%1' is malformatted."
-msgstr "Mae gwasanaeth '%1' wedi'i gam-fformatio."
+#: tdehtml/ecma/kjs_proxy.cpp:405
+msgid ""
+"A script on this page is causing TDEHTML to freeze. If it continues to run, "
+"other applications may become less responsive.\n"
+"Do you want to abort the script?"
+msgstr ""
+"Mae sgript ar y dudalen yma yn achosi i TDEHTML rewi.  Os mae'n parhau rhedeg, "
+"efallai bydd cymhwysiadau eraill yn dechrau mynd yn llai ymatebol.\n"
+"Ydych eisiau terfynu'r sgript?"
 
-#: tdeinit/tdelauncher.cpp:1087
-#, c-format
-msgid "Launching %1"
-msgstr "Ymgychwyn %1"
+#: tdehtml/ecma/kjs_proxy.cpp:405
+msgid "JavaScript"
+msgstr "JavaScript"
 
-#: tdeinit/tdelauncher.cpp:1281
+#: tdehtml/ecma/kjs_proxy.cpp:405
+msgid "&Abort"
+msgstr "&Terfynnu"
+
+#: arts/kde/kvideowidget.cpp:82
+msgid "Video Toolbar"
+msgstr "Bar Offer Fideo"
+
+#: arts/kde/kvideowidget.cpp:104
+msgid "Fullscreen &Mode"
+msgstr "&Modd Sgrîn Llawn"
+
+#: arts/kde/kvideowidget.cpp:107
+msgid "&Half Size"
+msgstr "&Hanner y Maint"
+
+#: arts/kde/kvideowidget.cpp:110
+msgid "&Normal Size"
+msgstr "M&aint Arferol"
+
+#: arts/kde/kvideowidget.cpp:113
+msgid "&Double Size"
+msgstr "&Dwywaith y Maint"
+
+#: networkstatus/networkstatusindicator.cpp:39
+msgid "The desktop is offline"
+msgstr ""
+
+#: networkstatus/connectionmanager.cpp:146
 msgid ""
-"Unknown protocol '%1'.\n"
+"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 ""
-"Protocol anhysbys '%1'. \n"
 
-#: tdeinit/tdelauncher.cpp:1334
+#: networkstatus/connectionmanager.cpp:147
+msgid "This application is currently in offline mode.  Do you want to connect?"
+msgstr ""
+
+#: networkstatus/connectionmanager.cpp:148
 msgid ""
-"Error loading '%1'.\n"
+"_: Message shown when a network connection failed.  The placeholder contains "
+"the concrete description of the operation eg 'while performing this operation\n"
+"A network connection failed %1.  Do you want to place the application in "
+"offline mode?"
+msgstr ""
+
+#: networkstatus/connectionmanager.cpp:150
+msgid ""
+"This application is currently in offline mode.  Do you want to connect in order "
+"to carry out this operation?"
 msgstr ""
-"Gwall wrth lwytho '%1'. \n"
+
+#: networkstatus/connectionmanager.cpp:151
+msgid "Leave Offline Mode?"
+msgstr ""
+
+#: networkstatus/connectionmanager.cpp:152
+msgid "Connect"
+msgstr ""
+
+#: networkstatus/connectionmanager.cpp:152
+#, fuzzy
+msgid "Do Not Connect"
+msgstr "&Peidiwch â Chadw"
 
 #: tdeconf_update/tdeconf_update.cpp:43
 msgid "Keep output results from scripts"
@@ -8069,138 +6792,132 @@ msgstr "Diweddariad KConf"
 msgid "TDE Tool for updating user configuration files"
 msgstr "Erfyn TDE am ddiweddaru ffeiliau ffurfweddiad y defnyddwyr."
 
-#: tdespell2/ui/configdialog.cpp:38
-msgid "KSpell2 Configuration"
-msgstr "Ffurfweddiad KSpell2"
-
-#: tdewidgets/maketdewidgets.cpp:15
-msgid "Builds Qt widget plugins from an ini style description file."
-msgstr "Adeiladu ategion celfigyn Qt o ffeil ddisgrifiad arddull ini."
-
-#: tdewidgets/maketdewidgets.cpp:113
-msgid "Output file"
-msgstr "Ffeil allbwn"
-
-#: tdewidgets/maketdewidgets.cpp:114
-msgid "Name of the plugin class to generate"
-msgstr "Enw'r dosbarth ategyn i'w greu"
+#: tdeutils/kreplace.cpp:49
+msgid "&All"
+msgstr "&Popeth"
 
-#: tdewidgets/maketdewidgets.cpp:115
-msgid "Default widget group name to display in designer"
-msgstr "Enw rhagosodol i'r grŵp celfigion i'w arddangos yn y dylunydd"
+#: tdeutils/kreplace.cpp:49
+msgid "&Skip"
+msgstr "&Hepgor"
 
-#: tdewidgets/maketdewidgets.cpp:116
-msgid "Embed pixmaps from a source directory"
-msgstr "Caethu picsfapiau o gyfeiriadur tarddiad"
+#: tdeutils/kreplace.cpp:58
+msgid "Replace '%1' with '%2'?"
+msgstr "Amnewid '%1' efo '%2'?"
 
-#: tdewidgets/maketdewidgets.cpp:129
-msgid "maketdewidgets"
-msgstr "maketdewidgets"
+#: tdeutils/kreplace.cpp:105 tdeutils/kreplace.cpp:300
+msgid "No text was replaced."
+msgstr "Ni amnewidwyd testun. "
 
-#: kstyles/web/plugin.cpp:9
-msgid "Web style plugin"
-msgstr "Ategyn arddull wê"
+#: tdeutils/kreplace.cpp:107 tdeutils/kreplace.cpp:302
+#, c-format
+msgid ""
+"_n: 1 replacement done.\n"
+"%n replacements done."
+msgstr ""
+"%n o amnewidau wedi eu gwneud. \n"
+"%n o amnewidau wedi eu gwneud."
 
-#: kstyles/klegacy/plugin.cpp:28
-msgid "TDE LegacyStyle plugin"
-msgstr "Ategyn arddull TDE Etifeddol"
+#: tdeutils/kfind.cpp:650 tdeutils/kreplace.cpp:307
+msgid "Beginning of document reached."
+msgstr " Wedi cyrraedd diwedd y ddogfen."
 
-#: kstyles/utils/installtheme/main.cpp:35
-msgid "TDE Tool to build a cache list of all pixmap themes installed"
-msgstr "Erfyn TDE i adeiladu rhestr gelc o bob thema picsfap a arsefydlwyd"
+#: tdeutils/kfind.cpp:652 tdeutils/kreplace.cpp:309
+msgid "End of document reached."
+msgstr " Wedi cyrraedd diwedd y ddogfen."
 
-#: kstyles/utils/installtheme/main.cpp:40
-msgid "KInstalltheme"
-msgstr "KInstalltheme"
+#: tdeutils/kreplace.cpp:316
+msgid "Do you want to restart search from the end?"
+msgstr "Ydych eisiau ail-ddechrau'r chwiliad o'r diwedd?"
 
-#: tdeunittest/modrunner.cpp:36
-msgid "A command-line application that can be used to run KUnitTest modules."
-msgstr ""
+#: tdeutils/kreplace.cpp:317
+msgid "Do you want to restart search at the beginning?"
+msgstr "Ydych eisiau ail-ddechrau'r chwiliad o'r dechrau?"
 
-#: tdeunittest/modrunner.cpp:42
-msgid "Only run modules whose filenames match the regexp."
-msgstr ""
+#: tdeutils/kreplace.cpp:319
+msgid "Restart"
+msgstr "Ail-gychwyn"
 
-#: tdeunittest/modrunner.cpp:43
+#: tdeutils/tdecmoduleproxy.cpp:213
 msgid ""
-"Only run tests modules which are found in the folder. Use the query option to "
-"select modules."
+"<b>Changes in this section requires root access.</b><br />"
+"Click the \"Administrator Mode\" button to allow modifications."
 msgstr ""
 
-#: tdeunittest/modrunner.cpp:44
+#: tdeutils/tdecmoduleproxy.cpp:220
 msgid ""
-"Disables debug capturing. You typically use this option when you use the GUI."
+"This section requires special permissions, probably for system-wide changes; "
+"therefore, it is required that you provide the root password to be able to "
+"change the module's properties. If you do not provide the password, the module "
+"will be disabled."
 msgstr ""
 
-#: tdeunittest/modrunner.cpp:53
-msgid "KUnitTest ModRunner"
+#: tdeutils/tdecmoduleproxy.cpp:252
+#, c-format
+msgid ""
+"_: Argument is application name\n"
+"This configuration section is already opened in %1"
 msgstr ""
 
-#: tdeparts/browserextension.cpp:485
-msgid "<qt>Do you want to search the Internet for <b>%1</b>?"
-msgstr "<qt>Ydych eisiau chwilio'r Rhyngrwyd am <b>%1</b>?"
-
-#: tdeparts/browserextension.cpp:486
-msgid "Internet Search"
-msgstr "Chwiliad Rhyngrwyd"
+#: tdeutils/tdecmoduleproxy.cpp:325
+msgid "<big>Loading...</big>"
+msgstr "<big>Yn Llwytho</big>"
 
-#: tdeparts/browserextension.cpp:486
-msgid "&Search"
-msgstr " &Chwilio"
+#: tdeutils/kreplacedialog.cpp:142
+msgid "Your replacement string is referencing a capture greater than '\\%1', "
+msgstr ""
 
-#: tdeparts/part.cpp:492
+#: tdeutils/kreplacedialog.cpp:145
+#, c-format
 msgid ""
-"The document \"%1\" has been modified.\n"
-"Do you want to save your changes or discard them?"
+"_n: but your pattern only defines 1 capture.\n"
+"but your pattern only defines %n captures."
 msgstr ""
-"Mae'r ddogfen \"%1\" wedi ei newid.\n"
-"Ydych eisiau cadw eich newidiadau, neu eu taflu?"
 
-#: tdeparts/part.cpp:494
-msgid "Close Document"
-msgstr "Cau Dogfen"
-
-#: tdeparts/browserrun.cpp:275
-msgid "Do you really want to execute '%1'? "
-msgstr "Ydych wir eisiau gweithredu '%1'?"
-
-#: tdeparts/browserrun.cpp:276
-msgid "Execute File?"
-msgstr "Gweithredu Ffeil?"
-
-#: tdeparts/browserrun.cpp:276
-msgid "Execute"
-msgstr "Gweithredu"
+#: tdeutils/kreplacedialog.cpp:146
+msgid "but your pattern defines no captures."
+msgstr ""
 
-#: tdeparts/browserrun.cpp:294
+#: tdeutils/kreplacedialog.cpp:147
 msgid ""
-"Open '%2'?\n"
-"Type: %1"
+"\n"
+"Please correct."
 msgstr ""
-"Agor '%2'?\n"
-"Math: %1"
 
-#: tdeparts/browserrun.cpp:296
+#: tdeutils/kpluginselector.cpp:111
 msgid ""
-"Open '%3'?\n"
-"Name: %2\n"
-"Type: %1"
+"<qt>"
+"<table>"
+"<tr>"
+"<td><b>Description:</b></td>"
+"<td>%1</td></tr>"
+"<tr>"
+"<td><b>Author:</b></td>"
+"<td>%2</td></tr>"
+"<tr>"
+"<td><b>Version:</b></td>"
+"<td>%3</td></tr>"
+"<tr>"
+"<td><b>License:</b></td>"
+"<td>%4</td></tr></table></qt>"
 msgstr ""
-"Agor '%3'?\n"
-"Enw: %2\n"
-"Math: %1"
-
-#: tdeparts/browserrun.cpp:310
-msgid "&Open with '%1'"
-msgstr "A&gor efo '%1'"
-
-#: tdeparts/browserrun.cpp:311
-msgid "&Open With..."
-msgstr "&Agor Gyda..."
+"<qt>"
+"<table>"
+"<tr>"
+"<td><b>Disgrifiad:</b></td>"
+"<td>%1</td></tr>"
+"<tr>"
+"<td><b>Awdur:</b></td>"
+"<td>%2</td></tr>"
+"<tr>"
+"<td><b>Fersiwn:</b></td>"
+"<td>%3</td></tr>"
+"<tr>"
+"<td><b>Trwydded:</b></td>"
+"<td>%4</td></tr></table></qt>"
 
-#: tdeparts/browserrun.cpp:353
-msgid "&Open"
-msgstr "&Agor"
+#: tdeutils/kpluginselector.cpp:536
+msgid "(This plugin is not configurable)"
+msgstr "(Nid yw'r ategyn yma yn ffurfweddadwy)"
 
 #: tdeutils/kfinddialog.cpp:55 tdeutils/kfinddialog.cpp:66
 msgid "Find Text"
@@ -8234,35 +6951,39 @@ msgstr "Testun &amnewid:"
 msgid "Use p&laceholders"
 msgstr "De&fnyddio dalfannau"
 
-#: tdeutils/kfinddialog.cpp:152
+#: tdeutils/kfinddialog.cpp:153
 msgid "Insert Place&holder"
 msgstr "Mewnosod Da&lfan"
 
-#: tdeutils/kfinddialog.cpp:168
+#: tdeutils/kfinddialog.cpp:169
 msgid "C&ase sensitive"
 msgstr "Mae llythrennau bach/mawr o &bwys"
 
-#: tdeutils/kfinddialog.cpp:169
+#: tdeutils/kfinddialog.cpp:170
 msgid "&Whole words only"
 msgstr "D&im ond geiriau cyfan"
 
-#: tdeutils/kfinddialog.cpp:170
+#: tdeutils/kfinddialog.cpp:171
 msgid "From c&ursor"
 msgstr "&O'r cyrchyd"
 
-#: tdeutils/kfinddialog.cpp:172
+#: tdeui/keditcl2.cpp:730 tdeui/keditcl2.cpp:870 tdeutils/kfinddialog.cpp:172
+msgid "Find &backwards"
+msgstr "Canfod &yn ôl"
+
+#: tdeutils/kfinddialog.cpp:173
 msgid "&Selected text"
 msgstr "&Testun dewisiedig"
 
-#: tdeutils/kfinddialog.cpp:179
+#: tdeutils/kfinddialog.cpp:180
 msgid "&Prompt on replace"
 msgstr "&Cofweini wrth amnewid"
 
-#: tdeutils/kfinddialog.cpp:232
+#: tdeutils/kfinddialog.cpp:233
 msgid "Start replace"
 msgstr "Dechrau amnewid"
 
-#: tdeutils/kfinddialog.cpp:233
+#: tdeutils/kfinddialog.cpp:234
 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 "
@@ -8272,11 +6993,16 @@ msgstr ""
 "cael ei chwilio amdano tu mewn y ddogfen, ac mae pob digwyddiad yn cael ei "
 "amnewid gan y testun amnewid.</qt>"
 
+#: tdeui/keditcl2.cpp:701 tdeui/keditcl2.cpp:833 tdeui/kstdguiitem.cpp:254
 #: tdeutils/kfinddialog.cpp:240
+msgid "&Find"
+msgstr "&Canfod"
+
+#: tdeutils/kfinddialog.cpp:241
 msgid "Start searching"
 msgstr "Dechrau chwilio"
 
-#: tdeutils/kfinddialog.cpp:241
+#: tdeutils/kfinddialog.cpp:242
 msgid ""
 "<qt>If you press the <b>Find</b> button, the text you entered above is searched "
 "for within the document.</qt>"
@@ -8284,26 +7010,26 @@ 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>"
 
-#: tdeutils/kfinddialog.cpp:247
+#: tdeutils/kfinddialog.cpp:248
 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."
 
-#: tdeutils/kfinddialog.cpp:250
+#: tdeutils/kfinddialog.cpp:251
 msgid "If enabled, search for a regular expression."
 msgstr "Os alluog, chwilio am fynegiad rheolaidd."
 
-#: tdeutils/kfinddialog.cpp:252
+#: tdeutils/kfinddialog.cpp:253
 msgid "Click here to edit your regular expression using a graphical editor."
 msgstr ""
 "Cliciwch yma i olygu eich mynegiad rheolaidd gan ddefnyddio golygydd graffegol."
 
-#: tdeutils/kfinddialog.cpp:254
+#: tdeutils/kfinddialog.cpp:255
 msgid "Enter a replacement string, or select a previous one from the list."
 msgstr "Rhowch llinyn amnewid, neu ddewiswch un blaenorol o'r rhestr."
 
-#: tdeutils/kfinddialog.cpp:256
+#: tdeutils/kfinddialog.cpp:257
 msgid ""
 "<qt>If enabled, any occurrence of <code><b>\\N</b></code>, where <code><b>N</b>"
 "</code> is a integer number, will be replaced with the corresponding capture "
@@ -8312,24 +7038,24 @@ msgid ""
 "extra backslash in front of it, like <code><b>\\\\N</b></code>.</qt>"
 msgstr ""
 
-#: tdeutils/kfinddialog.cpp:263
+#: tdeutils/kfinddialog.cpp:264
 msgid "Click for a menu of available captures."
 msgstr "Cliciwch am ddewislen o'r cipiadau sydd ar gael."
 
-#: tdeutils/kfinddialog.cpp:265
+#: tdeutils/kfinddialog.cpp:266
 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."
 
-#: tdeutils/kfinddialog.cpp:267
+#: tdeutils/kfinddialog.cpp:268
 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."
 
-#: tdeutils/kfinddialog.cpp:269
+#: tdeutils/kfinddialog.cpp:270
 msgid "Only search within the current selection."
 msgstr "Chwilio tu mewn y detholiad cyfredol yn unig."
 
-#: tdeutils/kfinddialog.cpp:271
+#: tdeutils/kfinddialog.cpp:272
 msgid ""
 "Perform a case sensitive search: entering the pattern 'Joe' will not match "
 "'joe' or 'JOE', only 'Joe'."
@@ -8337,78 +7063,111 @@ msgstr ""
 "Gweithredu chwiliad lle mae priflythrennau o bwys: ni fydd y patrwm 'Joe' yn "
 "cydweddu â 'joe' neu 'JOE', ond â 'Joe' yn unig."
 
-#: tdeutils/kfinddialog.cpp:274
+#: tdeutils/kfinddialog.cpp:275
 msgid "Search backwards."
 msgstr "Chwilio yn ôl."
 
-#: tdeutils/kfinddialog.cpp:276
+#: tdeutils/kfinddialog.cpp:277
 msgid "Ask before replacing each match found."
 msgstr "Gofyn cyn disodli pob cydweddiad a ganfyddir."
 
-#: tdeutils/kfinddialog.cpp:449
+#: tdeutils/kfinddialog.cpp:462
 msgid "Any Character"
 msgstr "Unrhyw Nod"
 
-#: tdeutils/kfinddialog.cpp:450
+#: tdeutils/kfinddialog.cpp:463
 msgid "Start of Line"
 msgstr "Dechrau'r Llinell"
 
-#: tdeutils/kfinddialog.cpp:452
+#: tdeutils/kfinddialog.cpp:465
 msgid "Set of Characters"
 msgstr "Set o Nodau"
 
-#: tdeutils/kfinddialog.cpp:453
+#: tdeutils/kfinddialog.cpp:466
 msgid "Repeats, Zero or More Times"
 msgstr "Ailadrodd, Sero neu Mwy o Weithiau"
 
-#: tdeutils/kfinddialog.cpp:454
+#: tdeutils/kfinddialog.cpp:467
 msgid "Repeats, One or More Times"
 msgstr "Ailadrodd, Un neu Mwy o Weithiau"
 
-#: tdeutils/kfinddialog.cpp:455
+#: tdeutils/kfinddialog.cpp:468
 msgid "Optional"
 msgstr "Dewisol"
 
-#: tdeutils/kfinddialog.cpp:456
+#: tdeutils/kfinddialog.cpp:469
 msgid "Escape"
 msgstr "Esc"
 
-#: tdeutils/kfinddialog.cpp:457
+#: tdeutils/kfinddialog.cpp:470
 msgid "TAB"
 msgstr "TAB"
 
-#: tdeutils/kfinddialog.cpp:458
+#: tdeutils/kfinddialog.cpp:471
 msgid "Newline"
 msgstr "Llinell newydd"
 
-#: tdeutils/kfinddialog.cpp:459
+#: tdeutils/kfinddialog.cpp:472
 msgid "Carriage Return"
 msgstr "Dychwelydd"
 
-#: tdeutils/kfinddialog.cpp:460
+#: tdeutils/kfinddialog.cpp:473
 msgid "White Space"
 msgstr "Gofodnod"
 
-#: tdeutils/kfinddialog.cpp:461
+#: tdeutils/kfinddialog.cpp:474
 msgid "Digit"
 msgstr "Digid"
 
-#: tdeutils/kfinddialog.cpp:510
+#: tdeutils/kfinddialog.cpp:523
 msgid "Complete Match"
 msgstr "Cydweddiad Cyfan"
 
-#: tdeutils/kfinddialog.cpp:515
+#: tdeutils/kfinddialog.cpp:528
 msgid "Captured Text (%1)"
 msgstr "Testun a Gipiwyd (%1)"
 
-#: tdeutils/kfinddialog.cpp:523
+#: tdeutils/kfinddialog.cpp:536
 msgid "You must enter some text to search for."
 msgstr "Rhaid i chi fewnosod testun i chwilio amdano."
 
-#: tdeutils/kfinddialog.cpp:534
+#: tdeutils/kfinddialog.cpp:547
 msgid "Invalid regular expression."
 msgstr "Mynegiad rheolaidd annilys."
 
+#: tdeutils/kfind.cpp:53
+msgid "<qt>Find next occurrence of '<b>%1</b>'?</qt>"
+msgstr "<qt>Canfod y digwyddiad nesaf o '<b>%1</b>'?</qt>"
+
+#: tdeutils/kfind.cpp:623 tdeutils/kfind.cpp:643
+#, c-format
+msgid ""
+"_n: 1 match found.\n"
+"%n matches found."
+msgstr ""
+"Canfuwyd %n o gydweddiadau. \n"
+"Canfuwyd %n o gydweddiadau."
+
+#: tdeutils/kfind.cpp:625
+msgid "<qt>No matches found for '<b>%1</b>'.</qt>"
+msgstr "<qt>Ni chanfuwyd cydweddiad am '<b>%1</b>'.</qt>"
+
+#: tdeutils/kfind.cpp:645
+msgid "No matches found for '<b>%1</b>'."
+msgstr "Ni chanfuwyd cydweddiad am '<b>%1</b>'."
+
+#: tdeutils/kfind.cpp:659
+#, fuzzy
+msgid "Continue from the end?"
+msgstr "Ewch ymlaen a'r gweithrediad"
+
+#: tdeutils/kfind.cpp:660
+#, fuzzy
+msgid "Continue from the beginning?"
+msgstr ""
+" Wedi cyrraedd diwedd y ddogfen.\n"
+" Ail-ddechrau o'r dechrau?"
+
 #: tdeutils/tdecmoduleloader.cpp:98
 msgid ""
 "<qt>There was an error when loading the module '%1'."
@@ -8427,29 +7186,39 @@ msgstr ""
 msgid "The specified library %1 could not be found."
 msgstr "Methu canfod y rhaglengell benodol %1."
 
-#: tdeutils/tdecmoduleloader.cpp:132
+#: tdeutils/tdecmoduleloader.cpp:134 tdeutils/tdecmoduleloader.cpp:143
 msgid "The module %1 could not be found."
 msgstr "Methu canfod y modiwl %1."
 
-#: tdeutils/tdecmoduleloader.cpp:133
+#: tdeutils/tdecmoduleloader.cpp:136
+msgid ""
+"<qt>"
+"<p>The Lisa and lan:/ ioslave modules are not installed by default in Kubuntu, "
+"because they are obsolete and replaced by zeroconf."
+"<br> If you still wish to use them, you should install the lisa package from "
+"the Universe repository.</p></qt>"
+msgstr ""
+
+#: tdeutils/tdecmoduleloader.cpp:145
+#, fuzzy
 msgid ""
 "<qt>"
 "<p>The diagnostics is:"
-"<br>The desktop file %1 could not be found.</qt>"
+"<br>The desktop file %1 could not be found.</p></qt>"
 msgstr ""
 "<qt>"
 "<p>Y diagnosteg yw:"
 "<br>Ni allwyd dod o hyd i'r ffeil benbwrdd %1.</qt>"
 
-#: tdeutils/tdecmoduleloader.cpp:152
+#: tdeutils/tdecmoduleloader.cpp:166
 msgid "The module %1 could not be loaded."
 msgstr "Methu llwytho'r modiwl %1."
 
-#: tdeutils/tdecmoduleloader.cpp:171
+#: tdeutils/tdecmoduleloader.cpp:185
 msgid "The module %1 is not a valid configuration module."
 msgstr "Nid modiwl ffurfweddu dilys yw modiwl %1."
 
-#: tdeutils/tdecmoduleloader.cpp:172
+#: tdeutils/tdecmoduleloader.cpp:186
 msgid ""
 "<qt>"
 "<p>The diagnostics is:"
@@ -8459,11 +7228,11 @@ msgstr ""
 "<p>Y diagnosteg yw: "
 "<br>Nid yw'r ffeil benbwrdd %1 yn penodi rhaglengell.</qt>"
 
-#: tdeutils/tdecmoduleloader.cpp:206
+#: tdeutils/tdecmoduleloader.cpp:220
 msgid "There was an error loading the module."
 msgstr "Gwall wrth lwytho'r modiwl."
 
-#: tdeutils/tdecmoduleloader.cpp:206 tdeutils/tdecmoduleloader.cpp:274
+#: tdeutils/tdecmoduleloader.cpp:220 tdeutils/tdecmoduleloader.cpp:288
 msgid ""
 "<qt>"
 "<p>The diagnostics is:"
@@ -8489,193 +7258,2230 @@ msgstr ""
 "enwi yn y neges gwall.  Os nid yw hyn yn gweithio, ystyriwch cysylltu â'ch "
 "dosbarthwr neu pecynnwr.</p></qt>"
 
-#: tdeutils/kreplace.cpp:49
-msgid "&All"
-msgstr "&Popeth"
+#: tdeutils/ksettings/componentsdialog.cpp:48
+msgid "Select Components"
+msgstr "Dewis Cydrannau"
 
-#: tdeutils/kreplace.cpp:49
-msgid "&Skip"
-msgstr "&Hepgor"
+#: tdeutils/ksettings/dialog.cpp:590
+msgid "Select Components..."
+msgstr "Dewis Cydrannau ..."
 
-#: tdeutils/kreplace.cpp:58
-msgid "Replace '%1' with '%2'?"
-msgstr "Amnewid '%1' efo '%2'?"
+#: tdeui/keditcl2.cpp:105 tdeui/keditcl2.cpp:375 tdeui/keditcl2.cpp:454
+msgid ""
+"End of document reached.\n"
+"Continue from the beginning?"
+msgstr ""
+" Wedi cyrraedd diwedd y ddogfen.\n"
+" Ail-ddechrau o'r dechrau?"
 
-#: tdeutils/kreplace.cpp:105 tdeutils/kreplace.cpp:300
-msgid "No text was replaced."
-msgstr "Ni amnewidwyd testun. "
+#: tdeui/keditcl2.cpp:118 tdeui/keditcl2.cpp:388 tdeui/keditcl2.cpp:467
+msgid ""
+"Beginning of document reached.\n"
+"Continue from the end?"
+msgstr ""
+"  Wedi cyrraedd dechrau'r ddogfen.\n"
+" Ail-ddechrau o'r diwedd?"
 
-#: tdeutils/kreplace.cpp:107 tdeutils/kreplace.cpp:302
+#: tdeui/keditcl2.cpp:711 tdeui/keditcl2.cpp:844
+msgid "Find:"
+msgstr "Canfod:"
+
+#: tdeui/keditcl2.cpp:728 tdeui/keditcl2.cpp:868
+msgid "Case &sensitive"
+msgstr "Mae llythrennau bras o &bwys"
+
+#: tdeui/keditcl2.cpp:833
+msgid "Replace &All"
+msgstr "Amnewid y &Cwbl"
+
+#: tdeui/keditcl2.cpp:852
+msgid "Replace with:"
+msgstr "Amnewid efo:"
+
+#: tdeui/keditcl2.cpp:984
+msgid "Go to line:"
+msgstr "Mynd i linell:"
+
+#: kded/khostname.cpp:372 kded/tde-menu.cpp:119 kded/tdebuildsycoca.cpp:724
+#: kded/tdebuildsycoca.cpp:725 tdeui/tdeaboutdialog.cpp:90
+msgid "Author"
+msgstr "Awdur"
+
+#: tdeui/tdeaboutdialog.cpp:93
+msgid "Task"
+msgstr "Tasg"
+
+#: tdeui/tdeaboutdialog.cpp:704
+#, fuzzy
+msgid "%1 %2 (Using Trinity %3)"
+msgstr "%1 %2 (Defnyddio TDE %3)"
+
+#: tdeui/tdeaboutdialog.cpp:706
+msgid "%1 %2, %3"
+msgstr "%1 %2, %3"
+
+#: tdeui/tdeaboutdialog.cpp:1326
+msgid "Other Contributors:"
+msgstr "Cyfrannwyr Eraill:"
+
+#: tdeui/tdeaboutdialog.cpp:1327
+msgid "(No logo available)"
+msgstr "(dim logo ar gael)"
+
+#: tdeui/khelpmenu.cpp:228 tdeui/tdeaboutdialog.cpp:1535
+#: tdeui/tdemessagebox.cpp:975
+#, c-format
+msgid "About %1"
+msgstr "Ynglyn â %1"
+
+#: tdeui/tdeaboutdialog.cpp:1772
+msgid "Image missing"
+msgstr "Llun ar goll"
+
+#: tdeui/tdeactionclasses.cpp:2093
+msgid "Exit F&ull Screen Mode"
+msgstr "Gadael &Modd Sgrîn Llawn"
+
+#: tdeui/kstdaction_p.h:98 tdeui/tdeactionclasses.cpp:2098
+msgid "F&ull Screen Mode"
+msgstr "&Modd Sgrîn Llawn"
+
+#: tdespell2/ui/dialog.cpp:62 tdeui/tdespelldlg.cpp:53
+msgid "Check Spelling"
+msgstr "Gwirio Sillafu"
+
+#: tdespell2/ui/dialog.cpp:64 tdeui/tdespelldlg.cpp:54
+msgid "&Finished"
+msgstr "Wedi'i Orffe&n"
+
+#: tdeui/ktabbar.cpp:196
+msgid "Close this tab"
+msgstr "Cau'r tab yma"
+
+#: tdeui/ksconfig.cpp:102
+msgid "Create &root/affix combinations not in dictionary"
+msgstr "Creu cyfuniadau &gwraidd/at-ddodiad sy ddim yn y geiriadur"
+
+#: tdeui/ksconfig.cpp:107
+msgid "Consider run-together &words as spelling errors"
+msgstr "Ystyried geiriau &difwlch fel camgymeriadau sillafu"
+
+#: tdeui/ksconfig.cpp:118
+msgid "&Dictionary:"
+msgstr "&Geiriadur:"
+
+#: tdeui/ksconfig.cpp:143
+msgid "&Encoding:"
+msgstr "&Amgodiad:"
+
+#: tdeui/ksconfig.cpp:148
+msgid "International Ispell"
+msgstr "Ispell Rhyngwladol"
+
+#: tdeui/ksconfig.cpp:149
+msgid "Aspell"
+msgstr "Aspell"
+
+#: tdeui/ksconfig.cpp:150
+msgid "Hspell"
+msgstr " Hspell"
+
+#: tdeui/ksconfig.cpp:151
+#, fuzzy
+msgid "Zemberek"
+msgstr "Tachwedd"
+
+#: tdeui/ksconfig.cpp:156
+msgid "&Client:"
+msgstr "&Dibynnydd:"
+
+#: tdeui/ksconfig.cpp:297
+msgid "Spanish"
+msgstr "Sbaeneg"
+
+#: tdeui/ksconfig.cpp:300
+msgid "Danish"
+msgstr "Daneg"
+
+#: tdeui/ksconfig.cpp:303
+msgid "German"
+msgstr "Almaeneg"
+
+#: tdeui/ksconfig.cpp:306
+msgid "German (new spelling)"
+msgstr "Almaeneg (sillafu newydd)"
+
+#: tdeui/ksconfig.cpp:309
+msgid "Brazilian Portuguese"
+msgstr "Portiwgaleg o Frasil"
+
+#: tdeui/ksconfig.cpp:312
+msgid "Portuguese"
+msgstr "Portiwgaleg"
+
+#: tdeui/ksconfig.cpp:315
+msgid "Esperanto"
+msgstr "Esperanto"
+
+#: tdeui/ksconfig.cpp:318
+msgid "Norwegian"
+msgstr "Norwyeg"
+
+#: tdeui/ksconfig.cpp:321
+msgid "Polish"
+msgstr "Pwyleg"
+
+#: tdeui/ksconfig.cpp:327
+msgid "Slovenian"
+msgstr "Slofeneg"
+
+#: tdeui/ksconfig.cpp:330
+msgid "Slovak"
+msgstr "Slofaceg"
+
+#: tdeui/ksconfig.cpp:333
+msgid "Czech"
+msgstr "Tsieceg"
+
+#: tdeui/ksconfig.cpp:336
+msgid "Swedish"
+msgstr "Swedeg"
+
+#: tdeui/ksconfig.cpp:339
+msgid "Swiss German"
+msgstr "Almaeneg y Swistir"
+
+#: tdeui/ksconfig.cpp:345
+msgid "Lithuanian"
+msgstr "Lithuaneg"
+
+#: tdeui/ksconfig.cpp:348
+msgid "French"
+msgstr "Ffrangeg"
+
+#: tdeui/ksconfig.cpp:351
+msgid "Belarusian"
+msgstr "Belarwsieg"
+
+#: tdeui/ksconfig.cpp:354
+msgid "Hungarian"
+msgstr "Hwngareg"
+
+#: tdeui/ksconfig.cpp:358
+msgid ""
+"_: Unknown ispell dictionary\n"
+"Unknown"
+msgstr "Anhysbys"
+
+#: tdeui/ksconfig.cpp:440 tdeui/ksconfig.cpp:594
+msgid "ISpell Default"
+msgstr "Rhagosodiad Ispell"
+
+#: tdeui/ksconfig.cpp:488 tdeui/ksconfig.cpp:642
+msgid ""
+"_: default spelling dictionary\n"
+"Default - %1 [%2]"
+msgstr " Rhagosodiad - %1 [%2]"
+
+#: tdeui/ksconfig.cpp:508 tdeui/ksconfig.cpp:668
+msgid "ASpell Default"
+msgstr "Rhagosodiad Aspell"
+
+#: tdeui/ksconfig.cpp:573 tdeui/ksconfig.cpp:733
 #, c-format
 msgid ""
-"_n: 1 replacement done.\n"
-"%n replacements done."
+"_: default spelling dictionary\n"
+"Default - %1"
+msgstr "Rhagosodiad - %1"
+
+#. i18n "??" is displayed as (pseudo-)version when no data is known about the application
+#: tdeui/tdeaboutapplication.cpp:63
+msgid "??"
+msgstr "??"
+
+#: tdeui/tdeaboutapplication.cpp:67
+msgid ""
+"No information available.\n"
+"The supplied TDEAboutData object does not exist."
 msgstr ""
-"%n o amnewidau wedi eu gwneud. \n"
-"%n o amnewidau wedi eu gwneud."
+"Dim gwybodaeth ar gael. \n"
+" Nid ydy'r gwrthrych TDEAboutData a ddarparwyd ddim yn bodoli."
 
-#: tdeutils/kfind.cpp:650 tdeutils/kreplace.cpp:307
-msgid "Beginning of document reached."
-msgstr " Wedi cyrraedd diwedd y ddogfen."
+#: tdeui/tdeaboutapplication.cpp:107
+msgid "A&uthor"
+msgstr "A&wdur"
 
-#: tdeutils/kfind.cpp:652 tdeutils/kreplace.cpp:309
-msgid "End of document reached."
-msgstr " Wedi cyrraedd diwedd y ddogfen."
+#: tdeui/tdeaboutapplication.cpp:107
+msgid "A&uthors"
+msgstr "A&wduron"
 
-#: tdeutils/kreplace.cpp:316
-msgid "Do you want to restart search from the end?"
-msgstr "Ydych eisiau ail-ddechrau'r chwiliad o'r diwedd?"
+#: tdeui/tdeaboutapplication.cpp:117
+#, fuzzy
+msgid ""
+"Please use <a href=\"http://bugs.pearsoncomputing.net\">"
+"http://bugs.pearsoncomputing.net</a> to report bugs.\n"
+msgstr ""
+"Defnyddiwch <a href=\"http://bugs.kde.org\">http://bugs.kde.org</a> "
+"er mwyn adrodd namau; peidiwch ac anfon ebost i'r awduron yn uniongyrchol."
 
-#: tdeutils/kreplace.cpp:317
-msgid "Do you want to restart search at the beginning?"
-msgstr "Ydych eisiau ail-ddechrau'r chwiliad o'r dechrau?"
+#: tdeui/tdeaboutapplication.cpp:121 tdeui/tdeaboutapplication.cpp:124
+#, fuzzy
+msgid ""
+"Please report bugs to <a href=\"mailto:%1\">%2</a>.\n"
+msgstr ""
+"Defnyddiwch <a href=\"mailto:%1\">%1</a> er mwyn adrodd namau; peidiwch ac "
+"anfon ebost i'r awduron yn uniongyrchol.\n"
 
-#: tdeutils/kreplace.cpp:319
-msgid "Restart"
-msgstr "Ail-gychwyn"
+#: tdeui/tdeaboutapplication.cpp:149
+msgid "&Thanks To"
+msgstr "&Diolch i"
 
-#: tdeutils/kpluginselector.cpp:111
+#: tdeui/tdeaboutapplication.cpp:176
+msgid "T&ranslation"
+msgstr "C&yfieithiad"
+
+#: tdeui/tdeaboutapplication.cpp:181
+msgid "&License Agreement"
+msgstr "Cytundeb &Trwydded"
+
+#: tdeui/kbugreport.cpp:70
+msgid "Submit Bug Report"
+msgstr "Cyflwyno Adroddiad Nam"
+
+#: tdeui/kbugreport.cpp:111
 msgid ""
-"<qt>"
-"<table>"
-"<tr>"
-"<td><b>Description:</b></td>"
-"<td>%1</td></tr>"
-"<tr>"
-"<td><b>Author:</b></td>"
-"<td>%2</td></tr>"
-"<tr>"
-"<td><b>Version:</b></td>"
-"<td>%3</td></tr>"
-"<tr>"
-"<td><b>License:</b></td>"
-"<td>%4</td></tr></table></qt>"
+"Your email address. If incorrect, use the Configure Email button to change it"
 msgstr ""
-"<qt>"
-"<table>"
-"<tr>"
-"<td><b>Disgrifiad:</b></td>"
-"<td>%1</td></tr>"
-"<tr>"
-"<td><b>Awdur:</b></td>"
-"<td>%2</td></tr>"
-"<tr>"
-"<td><b>Fersiwn:</b></td>"
-"<td>%3</td></tr>"
-"<tr>"
-"<td><b>Trwydded:</b></td>"
-"<td>%4</td></tr></table></qt>"
+" Eich cyfeiriad ebost. Os bo'n anghywir, defnyddiwch y botwm Ffurfweddu Ebost "
+"i'w newid."
 
-#: tdeutils/kpluginselector.cpp:536
-msgid "(This plugin is not configurable)"
-msgstr "(Nid yw'r ategyn yma yn ffurfweddadwy)"
+#: tdeui/kbugreport.cpp:112
+msgid "From:"
+msgstr "Oddiwrth:"
 
-#: tdeutils/kreplacedialog.cpp:142
-msgid "Your replacement string is referencing a capture greater than '\\%1', "
+#: tdeui/kbugreport.cpp:121
+msgid "Configure Email..."
+msgstr "Ffurfweddu Ebost ..."
+
+#: tdeui/kbugreport.cpp:128
+msgid "The email address this bug report is sent to."
+msgstr "Y gyfeiriad ebost a anfonir yr adroddiad nam yma iddi."
+
+#: tdeui/kbugreport.cpp:129
+msgid "To:"
+msgstr "I:"
+
+#: tdeui/kbugreport.cpp:136
+msgid "&Send"
+msgstr "&Anfon"
+
+#: tdeui/kbugreport.cpp:136
+msgid "Send bug report."
+msgstr "Anfon Adroddiad Nam"
+
+#: tdeui/kbugreport.cpp:137
+#, c-format
+msgid "Send this bug report to %1."
+msgstr "Anfonwch yr adroddiad nam yma i %1."
+
+#: tdeui/kbugreport.cpp:148
+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."
 
-#: tdeutils/kreplacedialog.cpp:145
+#: tdeui/kbugreport.cpp:149
+msgid "Application: "
+msgstr "Cymhwysiad:"
+
+#: tdeui/kbugreport.cpp:174
+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"
+
+#: tdenewstuff/uploaddialog.cpp:73 tdeui/kbugreport.cpp:175
+msgid "Version:"
+msgstr "Fersiwn :"
+
+#: tdeui/kbugreport.cpp:181
+msgid "no version set (programmer error!)"
+msgstr "dim fersiwn eto (nam gan y rhaglennwr!)"
+
+#: tdeui/kbugreport.cpp:192
+msgid "OS:"
+msgstr "SG:"
+
+#: tdeui/kbugreport.cpp:204
+msgid "Compiler:"
+msgstr "Crynhoydd:"
+
+#: tdeui/kbugreport.cpp:212
+msgid "Se&verity"
+msgstr "Lly&mder"
+
+#: tdeui/kbugreport.cpp:214
+msgid "Critical"
+msgstr "Critigol"
+
+#: tdeui/kbugreport.cpp:214
+msgid "Grave"
+msgstr "Peryglus"
+
+#: tdeui/kbugreport.cpp:214
+msgid ""
+"_: normal severity\n"
+"Normal"
+msgstr "Arferol"
+
+#: tdeui/kbugreport.cpp:214
+msgid "Wishlist"
+msgstr "Rhestr dymuniadau"
+
+#: tdeui/kbugreport.cpp:214
+msgid "Translation"
+msgstr "Cyfieithiad"
+
+#: tdeui/kbugreport.cpp:227
+msgid "S&ubject: "
+msgstr " &Pwnc:"
+
+#: tdeui/kbugreport.cpp:234
+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"
+
+#: tdeui/kbugreport.cpp:254
+msgid ""
+"Reporting bugs and requesting enhancements are maintained using the Bugzilla "
+"reporting system.\n"
+"You'll need a login account and password to use the reporting system.\n"
+"To control spam and rogue elements the login requires a valid email address.\n"
+"Consider using any large email service if you want to avoid using your private "
+"email address.\n"
+"\n"
+"Selecting the button below opens your web browser to "
+"http://bugs.trinitydesktop.org,\n"
+"where you will find the report form.\n"
+"The information displayed above will be transferred to the reporting system.\n"
+"Session cookies must be enabled to use the reporting system.\n"
+"\n"
+"Thank you for helping!"
+msgstr ""
+
+#: tdeui/kbugreport.cpp:270
+msgid "&Launch Bug Report Wizard"
+msgstr "&Cychwyn Dewin Adrodd Namau"
+
+#: tdeui/kbugreport.cpp:309
+msgid ""
+"_: unknown program name\n"
+"unknown"
+msgstr " anhysbys"
+
+#: tdeui/kbugreport.cpp:387
+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."
+
+#: tdeui/kbugreport.cpp:397
+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 ""
+" "
+"<p>Rydych wedi dewis y llymder <b>Hanfodol</b>.  Bwriadir y llymder yma am "
+"namau sy'n </p>"
+"<ul>"
+"<li>torri meddalwedd di-berthnasol ar y cysawd (neu ar y cysawd cyfan)</li>"
+"<li>achosi colled difrifol o ddata</li>"
+"<li>cyflwyno twll diogelwch ar y cysawd lle arsefydlwyd y pecyn dan "
+"effaith.</li></ul>\n"
+"<p>Ydy'r nam yr ydych yn ei adrodd yn achosi unrhyw un o'r niweidiau uchod?  Os "
+"nac ydy, dewiswch llymder is.  Diolch!</p>"
+
+#: tdeui/kbugreport.cpp:408
+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 ""
+"<p>Rydych wedi dewis y llymder <b>Difrifol</b>. Bwriadir y llymder yma am namau "
+"sy'n </p> "
+"<ul>"
+"<li>gwrthod i'r pecyn mewn cwestiwn gael ei ddefnyddio, neu bron felly</li>"
+"<li>achosi colled data</li>"
+"<li>cyflwyno twll diogelwch sy'n gadael cyrchu cyfrifon defnyddwyr sy'n "
+"defnyddio'r pecyn dan effaith</li></ul>\n"
+"<p>Ydy'r nam yr ydych yn ei adrodd yn achosi unrhyw un o'r niweidiau uchod? Os "
+"nac ydy, dewiswch llymder is. Diolch!</p>"
+
+#: tdeui/kbugreport.cpp:420
+#, fuzzy
+msgid ""
+"Unable to send the bug report.\n"
+"Please submit a bug report manually...\n"
+"See http://bugs.pearsoncomputing.net/ for instructions."
+msgstr ""
+" Methu gyrru'r adroddiad nam.\n"
+" Anfonwch adroddiad nam â llaw ...\n"
+" Gweler http://bugs.kde.org am fanylion."
+
+#: tdeui/kbugreport.cpp:428
+msgid "Bug report sent, thank you for your input."
+msgstr "Wedi gyrru'r adroddiad nam, diolch am eich cymorth."
+
+#: tdeui/kbugreport.cpp:437
+msgid ""
+"Close and discard\n"
+"edited message?"
+msgstr ""
+"Cau a taflu'r neges\n"
+" a olygwyd?"
+
+#: tdeui/kbugreport.cpp:438
+msgid "Close Message"
+msgstr "Cau Neges"
+
+#: tdeui/kedittoolbar.cpp:49
+msgid "--- line separator ---"
+msgstr ""
+
+#: tdeui/kedittoolbar.cpp:50
+msgid "--- separator ---"
+msgstr "--- gwahanydd ---"
+
+#: tdeui/kedittoolbar.cpp:380 tdeui/kedittoolbar.cpp:392
+#: tdeui/kedittoolbar.cpp:402 tdeui/kedittoolbar.cpp:411
+msgid "Configure Toolbars"
+msgstr "Ffurfio Bar Offer"
+
+#: tdeui/kedittoolbar.cpp:447
+msgid ""
+"Do you really want to reset all toolbars of this application to their default? "
+"The changes will be applied immediately."
+msgstr ""
+
+#: tdeui/kedittoolbar.cpp:447
+#, fuzzy
+msgid "Reset Toolbars"
+msgstr "Barrau Offer:"
+
+#: tdeui/kedittoolbar.cpp:761
+msgid "&Toolbar:"
+msgstr "&Bar Offer:"
+
+#: tdeui/kedittoolbar.cpp:777
+msgid "A&vailable actions:"
+msgstr "G&weithrediadau ar gael:"
+
+#: tdeui/kedittoolbar.cpp:795
+msgid "Curr&ent actions:"
+msgstr "Gweith&rediadau cyfredol:"
+
+#: tdeui/kedittoolbar.cpp:818
+msgid "Change &Icon..."
+msgstr "Newid E&icon..."
+
+#: tdeui/kedittoolbar.cpp:991
+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."
+
+#: tdeui/kedittoolbar.cpp:993
+msgid "<Merge>"
+msgstr "<Cyfuno>"
+
+#: tdeui/kedittoolbar.cpp:995
+msgid "<Merge %1>"
+msgstr "<Cyfuno %1>"
+
+#: tdeui/kedittoolbar.cpp:1001
+msgid ""
+"This is a dynamic list of actions. You can move it, but if you remove it you "
+"won't be able to re-add it."
+msgstr ""
+"Rhestr ddinamig o weithrediadau yw hon.  Cewch ei symud, ond ar ôl ei diddymu "
+"na chewch ei ail-ychwanegu. "
+
+#: tdeui/kedittoolbar.cpp:1002
 #, c-format
+msgid "ActionList: %1"
+msgstr "RhestrGweithred: %1"
+
+#: tdeui/kauthicon.cpp:99
+msgid "Editing disabled"
+msgstr "Analluogir golygu"
+
+#: tdeui/kauthicon.cpp:100
+msgid "Editing enabled"
+msgstr "Alluogir golygu"
+
+#: tdeui/tdespell.cpp:1176
+msgid "You have to restart the dialog for changes to take effect"
+msgstr "Rhaid i chi ailgychwyn yr ymgom i'r newidiadau gymryd effaith"
+
+#: tdeui/tdespell.cpp:1402
+msgid "Spell Checker"
+msgstr "Cywirydd Sillafu"
+
+#: tdeui/kcharselect.cpp:366
 msgid ""
-"_n: but your pattern only defines 1 capture.\n"
-"but your pattern only defines %n captures."
+"_: Character\n"
+"<qt><font size=\"+4\" face=\"%1\">%2</font>"
+"<br>Unicode code point: U+%3"
+"<br>(In decimal: %4)"
+"<br>(Character: %5)</qt>"
 msgstr ""
+"<qt><font size=\"+4\" face=\"%1\">%2</font>"
+"<br>Pwynt nod Unicode: U+%3"
+"<br>(Mewn degolion: %4)"
+"<br>(Nod: %5)</qt>"
 
-#: tdeutils/kreplacedialog.cpp:146
-msgid "but your pattern defines no captures."
+#: tdeui/kcharselect.cpp:383 tdeui/tdefontdialog.cpp:144
+msgid "Font:"
+msgstr "Wynebfath:"
+
+#: tdeui/kcharselect.cpp:394
+msgid "Table:"
+msgstr "Tabl:"
+
+#: tdeui/kcharselect.cpp:404
+msgid "&Unicode code point:"
+msgstr "Pwynt nod &Unicode:"
+
+#: tdeui/tdetoolbarhandler.cpp:86
+msgid "Show Toolbar"
+msgstr "Dangos Bar Offer"
+
+#: tdeui/tdetoolbarhandler.cpp:87
+msgid "Hide Toolbar"
+msgstr "Cuddio Bar Offer"
+
+#: tdeui/tdetoolbarhandler.cpp:91
+msgid "Toolbars"
+msgstr "Barrau Offer:"
+
+#: tdeui/khelpmenu.cpp:131 tdeui/kstdaction_p.h:108
+msgid "%1 &Handbook"
+msgstr "%1 &Llawlyfr"
+
+#: tdeui/khelpmenu.cpp:140
+msgid "What's &This"
+msgstr "Beth yw &Hyn"
+
+#: tdeui/khelpmenu.cpp:151 tdeui/kstdaction_p.h:111
+msgid "&Report Bug/Request Enhancement..."
 msgstr ""
 
-#: tdeutils/kreplacedialog.cpp:147
+#: tdeui/khelpmenu.cpp:160 tdeui/kstdaction_p.h:112
+#, fuzzy
+msgid "Switch application &language..."
+msgstr "gosod enw'r cymhwysiad"
+
+#: tdeui/khelpmenu.cpp:171 tdeui/kstdaction_p.h:113
+#, c-format
+msgid "&About %1"
+msgstr "&Ynglyn a %1"
+
+#: tdeui/khelpmenu.cpp:177 tdeui/kstdaction_p.h:114
+#, fuzzy
+msgid "About &Trinity"
+msgstr "Ynglyn a &Kde"
+
+#: tdeui/klineeditdlg.cpp:92
+msgid "&Browse..."
+msgstr "&Pori..."
+
+#: tdeui/ktip.cpp:206
+msgid "Tip of the Day"
+msgstr "Awgrymiad y Dydd"
+
+#: tdeui/ktip.cpp:224
+msgid ""
+"Did you know...?\n"
+msgstr ""
+" Oeddech chi'n gwybod ...?\n"
+
+#: tdeui/ktip.cpp:287
+msgid "&Show tips on startup"
+msgstr "&Dangos awgrymiadau wrth gychwyn"
+
+#: tdeui/kpixmapregionselectordialog.cpp:28
+msgid "Select Region of Image"
+msgstr "Dewis Ardal Delwedd"
+
+#: tdeui/kpixmapregionselectordialog.cpp:31
+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:"
+
+#: tdeui/kpassdlg.cpp:250
+msgid "&Password:"
+msgstr "&Cyfrinair:"
+
+#: tdeui/kpassdlg.cpp:269
+msgid "&Keep password"
+msgstr "&Cadw cyfrinair"
+
+#: tdeui/kpassdlg.cpp:289
+msgid "&Verify:"
+msgstr "&Gwireddu:"
+
+#: tdeui/kpassdlg.cpp:311
+msgid "Password strength meter:"
+msgstr "Faint mor gryf yw'r cyfrinair:"
+
+#: tdeui/kpassdlg.cpp:315
+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."
+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."
+
+#: tdeui/kpassdlg.cpp:331 tdeui/kpassdlg.cpp:525
+msgid "Passwords do not match"
+msgstr "Nid yw'r cyfrineiriau yn cydweddu"
+
+#: tdeui/kpassdlg.cpp:408
+msgid "You entered two different passwords. Please try again."
+msgstr "Rhoddwyd dau gyfrinair gwahanol.  Ceisiwch eto.  "
+
+#: tdeui/kpassdlg.cpp:415
 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"
-"Please correct."
+"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?"
 
-#: tdeutils/kfind.cpp:53
-msgid "<qt>Find next occurrence of '<b>%1</b>'?</qt>"
-msgstr "<qt>Canfod y digwyddiad nesaf o '<b>%1</b>'?</qt>"
+#: tdeui/kpassdlg.cpp:423
+msgid "Low Password Strength"
+msgstr "Nid yw'r cyfrinair yn gryf iawn"
 
-#: tdeutils/kfind.cpp:623 tdeutils/kfind.cpp:643
+#: tdeui/kpassdlg.cpp:519
+msgid "Password is empty"
+msgstr "Mae'r cyfrineiriau yn wag"
+
+#: tdeui/kpassdlg.cpp:522
 #, c-format
 msgid ""
-"_n: 1 match found.\n"
-"%n matches found."
+"_n: Password must be at least 1 character long\n"
+"Password must be at least %n characters long"
 msgstr ""
-"Canfuwyd %n o gydweddiadau. \n"
-"Canfuwyd %n o gydweddiadau."
+"Rhaid i'r cyfrinair fod o leiaf 1 nod\n"
+"Rhaid i'r cyfrinair fod o leiaf %n o nodau"
 
-#: tdeutils/kfind.cpp:625
-msgid "<qt>No matches found for '<b>%1</b>'.</qt>"
-msgstr "<qt>Ni chanfuwyd cydweddiad am '<b>%1</b>'.</qt>"
+#: tdeui/kpassdlg.cpp:524
+msgid "Passwords match"
+msgstr "Mae'r cyfrineiriau yn cydweddu"
 
-#: tdeutils/kfind.cpp:645
-msgid "No matches found for '<b>%1</b>'."
-msgstr "Ni chanfuwyd cydweddiad am '<b>%1</b>'."
+#: tdeui/tdelistviewsearchline.cpp:243
+msgid "Search Columns"
+msgstr "Chwilio Colofnau"
 
-#: tdeutils/kfind.cpp:659
+#: tdeui/tdelistviewsearchline.cpp:245
+msgid "All Visible Columns"
+msgstr "Pob Colofn Weledig"
+
+#: tdeui/tdelistviewsearchline.cpp:260
+msgid ""
+"_: Column number %1\n"
+"Column No. %1"
+msgstr "Colofn %1"
+
+#: tdeui/tdelistviewsearchline.cpp:455
+msgid "S&earch:"
+msgstr "C&hwilio"
+
+#: tdeui/kcolordialog.cpp:84
+msgid ""
+"_: palette name\n"
+"* Recent Colors *"
+msgstr "* Lliwiau Diweddar *"
+
+#: tdeui/kcolordialog.cpp:85
+msgid ""
+"_: palette name\n"
+"* Custom Colors *"
+msgstr "* Lliwiau Arferu *"
+
+#: tdeui/kcolordialog.cpp:86
+msgid ""
+"_: palette name\n"
+"Forty Colors"
+msgstr ""
+
+#: tdeui/kcolordialog.cpp:87
 #, fuzzy
-msgid "Continue from the end?"
-msgstr "Ewch ymlaen a'r gweithrediad"
+msgid ""
+"_: palette name\n"
+"Rainbow Colors"
+msgstr "* Lliwiau Diweddar *"
 
-#: tdeutils/kfind.cpp:660
+#: tdeui/kcolordialog.cpp:88
+msgid ""
+"_: palette name\n"
+"Royal Colors"
+msgstr ""
+
+#: tdeui/kcolordialog.cpp:89
+msgid ""
+"_: palette name\n"
+"Web Colors"
+msgstr ""
+
+#: tdeui/kcolordialog.cpp:563
+msgid "Named Colors"
+msgstr "Lliwiau a Enwir"
+
+#: tdeui/kcolordialog.cpp:717
+msgid ""
+"Unable to read X11 RGB color strings. The following file location(s) were "
+"examined:\n"
+msgstr ""
+"Methu darllen llinynnau lliw RGB X11. Fe edrychwyd yn y lleoliadau ffeil "
+"canlynol:\n"
+
+#: tdeui/kcolordialog.cpp:940
+msgid "Select Color"
+msgstr "Dewis Lliw"
+
+#: tdeui/kcolordialog.cpp:1005
+msgid "H:"
+msgstr "H:"
+
+#: tdeui/kcolordialog.cpp:1014
+msgid "S:"
+msgstr "S:"
+
+#: tdeui/kcolordialog.cpp:1023
+msgid "V:"
+msgstr "V:"
+
+#: tdeui/kcolordialog.cpp:1035
+msgid "R:"
+msgstr "R:"
+
+#: tdeui/kcolordialog.cpp:1044
+msgid "G:"
+msgstr "G:"
+
+#: tdeui/kcolordialog.cpp:1053
+msgid "B:"
+msgstr "B:"
+
+#: tdeui/kcolordialog.cpp:1108
+msgid "&Add to Custom Colors"
+msgstr "&Ychwanegu at Liwiau Rhagosodedig"
+
+#: tdenewstuff/uploaddialog.cpp:58 tderesources/configdialog.cpp:53
+#: tdeui/kcolordialog.cpp:1133
+msgid "Name:"
+msgstr "Enw:"
+
+#: tdeui/kcolordialog.cpp:1140
+msgid "HTML:"
+msgstr "HTML:"
+
+#: tdeui/kcolordialog.cpp:1219
+msgid "Default color"
+msgstr "Lliw rhagosodol"
+
+#: tdeui/kcolordialog.cpp:1247
+msgid "-default-"
+msgstr "-rhagosodol-"
+
+#: tdeui/kcolordialog.cpp:1463
+msgid "-unnamed-"
+msgstr "-ddi-enw-"
+
+#: tdeui/kstdaction.cpp:51 tdeui/kstdguiitem.cpp:188
+msgid ""
+"_: go back\n"
+"&Back"
+msgstr "Y&n ôl"
+
+#: tdeui/kstdaction.cpp:56 tdeui/kstdguiitem.cpp:196
+msgid ""
+"_: go forward\n"
+"&Forward"
+msgstr "&Ymlaen"
+
+#: tdeui/kstdaction.cpp:61
+msgid ""
+"_: beginning (of line)\n"
+"&Home"
+msgstr "&Cartref"
+
+#: tdeui/kstdaction.cpp:62 tdeui/kstdguiitem.cpp:168
+msgid ""
+"_: show help\n"
+"&Help"
+msgstr "&Cymorth"
+
+#: tdeui/kstdaction.cpp:240
+msgid "Show Menubar<p>Shows the menubar again after it has been hidden"
+msgstr ""
+"Dangos Bar Dewislen"
+"<p>Dangos y bar dewislen eto ar ôl iddo gael ei guddio"
+
+#: tdeui/kstdaction.cpp:242
+msgid "Hide &Menubar"
+msgstr "Cuddio Bar &Dewislen"
+
+#: tdeui/kstdaction.cpp:243
+msgid ""
+"Hide Menubar"
+"<p>Hide the menubar. You can usually get it back using the right mouse button "
+"inside the window itself."
+msgstr ""
+"Cuddio Bar Dewislen "
+"<p>Cuddio'r bar dewislen.  Fel rheol, gewch chi'r bar yn ôl eto gan "
+"ddefnyddio'r botwm de tu mewn i'r ffenest ei hun."
+
+#: tdeui/kstdaction.cpp:274 tdeui/kstdaction_p.h:97
+msgid "Show St&atusbar"
+msgstr "Dangos Bar Cyfl&wr"
+
+#: tdeui/kstdaction.cpp:276
+msgid ""
+"Show Statusbar"
+"<p>Shows the statusbar, which is the bar at the bottom of the window used for "
+"status information."
+msgstr ""
+"Dangos Bar Cyflwr"
+"<p>Dangos y bar cyflwr, sef y bar wrth waelod y ffenestr, a ddefnyddir ar gyfer "
+"gwybodaeth cyflwr."
+
+#: tdeui/kstdaction.cpp:278
+msgid "Hide St&atusbar"
+msgstr "Cuddio Bar Cyf&lwr"
+
+#: tdeui/kstdaction.cpp:279
+msgid ""
+"Hide Statusbar"
+"<p>Hides the statusbar, which is the bar at the bottom of the window used for "
+"status information."
+msgstr ""
+"Cuddio Bar Cyflwr"
+"<p>Cuddio'r bar cyflwr, sef y bar wrth waelod y ffenestr, a ddefnyddir ar gyfer "
+"gwybodaeth cyflwr."
+
+#: tdeui/kswitchlanguagedialog.cpp:90
 #, fuzzy
-msgid "Continue from the beginning?"
+msgid "Switch application language"
+msgstr "gosod enw'r cymhwysiad"
+
+#: tdeui/kswitchlanguagedialog.cpp:96
+msgid "Please choose language which should be used for this application"
+msgstr ""
+
+#: tdeui/kswitchlanguagedialog.cpp:123
+#, fuzzy
+msgid "Add fallback language"
+msgstr "Iaith rhagosodol:"
+
+#: tdeui/kswitchlanguagedialog.cpp:124
+msgid ""
+"Adds one more language which will be used if other translations do not contain "
+"proper translation"
 msgstr ""
-" Wedi cyrraedd diwedd y ddogfen.\n"
-" Ail-ddechrau o'r dechrau?"
 
-#: tdeutils/tdecmoduleproxy.cpp:212
+#: tdeui/kswitchlanguagedialog.cpp:222
 msgid ""
-"<b>Changes in this section requires root access.</b><br />"
-"Click the \"Administrator Mode\" button to allow modifications."
+"Language for this application has been changed. The change will take effect "
+"upon next start of application"
 msgstr ""
 
-#: tdeutils/tdecmoduleproxy.cpp:219
+#: tdeui/kswitchlanguagedialog.cpp:223
+#, fuzzy
+msgid "Application language changed"
+msgstr "Cymhwysiad:"
+
+#: tdeui/kswitchlanguagedialog.cpp:282
+#, fuzzy
+msgid "Primary language:"
+msgstr "Iaith rhagosodol:"
+
+#: tdeui/kswitchlanguagedialog.cpp:282
+#, fuzzy
+msgid "Fallback language:"
+msgstr "Iaith rhagosodol:"
+
+#: tdeui/kswitchlanguagedialog.cpp:316
 msgid ""
-"This section requires special permissions, probably for system-wide changes; "
-"therefore, it is required that you provide the root password to be able to "
-"change the module's properties. If you do not provide the password, the module "
-"will be disabled."
+"This is main application language which will be used first before any other "
+"languages"
+msgstr ""
+
+#: tdeui/kswitchlanguagedialog.cpp:320
+msgid ""
+"This is language which will be used if any previous languages does not contain "
+"proper translation"
+msgstr ""
+
+#: tdeui/tdeabouttde.cpp:34
+msgid ""
+"The <b>Trinity Desktop Environment</b> was born as a fork of the K Desktop "
+"Environment version 3.5, which was originally written by the KDE Team, a "
+"world-wide network of software engineers committed to <a "
+"href=\"http://www.gnu.org/philosophy/free-sw.html\">Free Software</a> "
+"development. The name <i>Trinity</i> was chosen because the word means <i>"
+"Three</i> as in <i>continuation of KDE 3</i>."
+"<br>Since then, TDE has evolved to be an indipendent and standalone computer "
+"desktop environment project. The developers have molded the code to its own "
+"identity without giving up on the efficiency, productivity and traditional user "
+"interface experience characteristic of the original KDE 3 series."
+"<br>"
+"<br>No single group, company or organization controls the Trinity source code. "
+"Everyone is welcome to contribute to Trinity."
+"<br>"
+"<br>Visit <A HREF=\"http://www.trinitydesktop.org\">"
+"http://www.trinitydesktop.org</A> for more information about Trinity, and <A "
+"HREF=\"http://www.kde.org\">http://www.kde.org</A> for more information on the "
+"KDE project. "
+msgstr ""
+
+#: tdeui/tdeabouttde.cpp:50
+#, fuzzy
+msgid ""
+"Software can always be improved, and the Trinity 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>The Trinity Desktop Environment has a bug tracking system. Visit <A "
+"HREF=\"http://bugs.pearsoncomputing.net\">http://bugs.pearsoncomputing.net</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\"."
+msgstr ""
+"Mae o hyd yn bosib gwella meddalwedd, ac mae'r tîm TDE yn barod i wneud hynny. "
+"Ond  rhaid i chi - y defnyddiwr - ddweud wrthym os nad oes rhywbeth yn gweithio "
+"fel y disgwylir, neu pan mae'n bosib gwneud rhywbeth yn well.  "
+"<br>"
+"<br>Mae gan yr Amgylchedd Penbwrdd K gysawd dilyn namau. Ewch i: <A "
+"HREF=\"http://bugs.kde.org/\">http://bugs.kde.org/</A> "
+"neu defnyddiwch yr ymgom \"Adrodd Nam...\" o'r ddewislen \"Cymorth\" i adrodd "
+"nam. "
+"<br>"
+"<br>Os oes ganddoch awgrymiad gwelliant, mae croeso i chi ddefnyddio'r cysawd "
+"dilyn namau i cofnodi eich dymuniad. Cofiwch defnyddio'r llymder \"Rhestr "
+"dymuniadau\"."
+
+#: tdeui/tdeabouttde.cpp:61
+#, fuzzy
+msgid ""
+"You do not have to be a software developer to be a member of the Trinity 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 the <A HREF=\"http://www.trinitydesktop.org/jobs\">TDE Development</A> "
+"webpage to find out how you can contribute or mail us using one of the "
+"available <A HREF=\"http://www.trinitydesktop.org/mailinglist.php\">"
+"mailing lists</A>."
+"<br>"
+"<br>If you need more information or documentation, then a visit to <A "
+"HREF=\"http://www.trinitydesktop.org/docs\">http://www.trinitydesktop.org/docs</"
+"A> will provide you with what you need."
 msgstr ""
+"Does dim angen i chi fod yn ddatblygwr meddalwedd i fod yn aelod o dîm TDE. "
+"Mae'n bosib ymaelodi â'r timoedd cenedlaethol sy'n cyfieithu rhyngwynebau "
+"rhaglenni.  Gallwch gyfrannu graffeg, themau, sain a dogfennaeth well. Medrwch "
+"chi ddewis!"
+"<br>"
+"<br>Ewch i: <A HREF=\"http://www.kde.org/jobs.html\">"
+"http://www.kde.org/jobs.html</A> am fwy o fanylion ynglyn â chyweithiau y "
+"medrwch gymryd rhan ynddynt."
+"<br>"
+"<br>Os dymunwch fwy o fanylion neu ddogfennaeth, ewch i <A "
+"HREF=\"http://developer.kde.org/\">http://developer.kde.org</A> "
+"i gael popeth sydd angen."
+
+#: tdeui/tdeabouttde.cpp:76
+#, fuzzy
+msgid ""
+"TDE is available free of charge, but making it is not free."
+"<br>"
+"<br>The Trinity team <i>does need</i> financial support. The money is used to "
+"support the expenses incurred to keep the TDE servers running, so that you - "
+"the user - can access them at any time. You are encouraged to support Trinity "
+"through a financial or hardware donation, using one of the ways described at <a "
+"href=\"http://www.trinitydesktop.org/donate.php\">http://www.trinitydesktop.org/"
+"donate.php</a>."
+"<br>"
+"<br>Thank you very much in advance for your support!"
+msgstr ""
+"Mae TDE ar gael am ddim, ond nid ydy ei wneud yn ddi-gost."
+"<br>"
+"<br>Felly, ffurffiodd y tîm TDE TDE e.V., sefydliad di-elw wedi ei sylfaenu yn "
+"gyfreithiol yn Tübingen, yr Almaen.  Mae TDE e.V. yn cynrychioli y cywaith TDE "
+"mewn materion cyfreithiol a cyllidol.  Gweler  <a "
+"href=\"http://www.kde-ev.org/\">http://www.kde-ev.org/</a> "
+"am wybodaeth am TDE e.V."
+"<br>"
+"<br>Mae angen cefnogaeth ariannol gan y tîm TDE.  Defnyddir y rhan fwyaf o'r "
+"arian i ad-dalu aelodau ac eraill am dreuliau y talwyd wrth gyfrannu at TDE.  "
+"Rydym yn eich annog i gefnogi TDE drwy rhodd ariannol, gan ddefnyddio un o'r "
+"ffyrdd a disgrifir ar <a  href=\"http://www.kde.org/support/\">"
+"http://www.kde.org/support/</a>. "
+"<br>"
+"<br>Diolch yn fawr iawn i chi ymlaen llaw am eich cefnogaeth. "
+
+#: tdeui/tdeabouttde.cpp:86
+#, fuzzy, c-format
+msgid "Trinity Desktop Environment. Release %1"
+msgstr "Amgylchedd Penbwrdd TDE.  Rhyddhad %1"
 
-#: tdeutils/tdecmoduleproxy.cpp:251
+#: tdeui/tdeabouttde.cpp:88
+#, fuzzy
+msgid ""
+"_: About Trinity\n"
+"&About"
+msgstr "&Ynghylch"
+
+#: tdeui/tdeabouttde.cpp:89
+msgid "&Report Bugs/Request Enhancements"
+msgstr ""
+
+#: tdeui/tdeabouttde.cpp:90
+#, fuzzy
+msgid "&Join the Trinity Team"
+msgstr "&Ymaelodi a'r tîm TDE"
+
+#: tdeui/tdeabouttde.cpp:91
+#, fuzzy
+msgid "&Support Trinity"
+msgstr "&Cefnogi TDE"
+
+#: tdeui/kcolorcombo.cpp:187 tdeui/kcolorcombo.cpp:240
+msgid "Custom..."
+msgstr "Addasu ..."
+
+#: tdeui/kdialog.cpp:381
+#, fuzzy
+msgid "Trinity Desktop Environment"
+msgstr "Amgylchedd Penbwrdd TDE.  Rhyddhad %1"
+
+#: tdeui/kdialog.cpp:418 tdeui/kdialog.cpp:481
+msgid "Pondering what to do next"
+msgstr ""
+
+#: tdeui/kdialog.cpp:449
+#, fuzzy
+msgid "Please wait..."
+msgstr "Ail-enwi Rhestr..."
+
+#: tdeui/kdialog.cpp:507
+msgid "Starting DCOP"
+msgstr ""
+
+#: tdeui/kdialog.cpp:508
+#, fuzzy
+msgid "Starting TDE daemon"
+msgstr "Ellyll TDE"
+
+#: tdeui/kdialog.cpp:509
+#, fuzzy
+msgid "Starting services"
+msgstr "Gwasanaethau"
+
+#: tdeui/kdialog.cpp:510
+#, fuzzy
+msgid "Starting session"
+msgstr "Dechrau chwilio"
+
+#: tdeui/kdialog.cpp:511
+msgid "Initializing window manager"
+msgstr ""
+
+#: tdeui/kdialog.cpp:512
+#, fuzzy
+msgid "Loading desktop"
+msgstr "Llwytho rhaglennig"
+
+#: tdeui/kdialog.cpp:513
+#, fuzzy
+msgid "Loading panels"
+msgstr "Llwytho rhaglennig"
+
+#: tdeui/kdialog.cpp:514
+#, fuzzy
+msgid "Restoring applications"
+msgstr "Gadael y cymhwysiant"
+
+#: tdeui/kwhatsthismanager.cpp:50
+#, fuzzy
+msgid ""
+"<b>Not Defined</b>"
+"<br>There is no \"What's This?\" help assigned to this widget. If you want to "
+"help us to  describe the widget, you are welcome to <a "
+"href=\"submit-whatsthis\">send us your own \"What's This?\" help</a> for it."
+msgstr ""
+"<b>Heb ei ddiffinio</b>"
+"<br>Nid oes cymorth \"Beth yw Hwn?\" wedi'i neilltuo i'r celfigyn yma.  Os "
+"hoffech ein helpu ni gan ddisgrifio'r celfigyn, croeso i chi <a "
+"href=\"submit-whatsthis\">anfon cymorth \"Beth yw Hwn?\"</a> ar ei gyfer."
+
+#: tdemdi/tdemdichildfrm.cpp:1263 tdeui/ksystemtray.cpp:160
+msgid "&Minimize"
+msgstr "Llei&hau"
+
+#: tdeui/ksystemtray.cpp:195
+msgid "<qt>Are you sure you want to quit <b>%1</b>?</qt>"
+msgstr "<qt>Ydych wir eisiau terfynu <b>'%1'</b>?</qt>"
+
+#: tdeui/ksystemtray.cpp:198
+msgid "Confirm Quit From System Tray"
+msgstr "Cadarnhau Terfynu o'r Cafn Cysawd"
+
+#: tdeui/ksyntaxhighlighter.cpp:477 tdeui/ksyntaxhighlighter.cpp:586
+msgid "As-you-type spell checking enabled."
+msgstr "Galluogir cywiro sillafu wrth deipio."
+
+#: tdeui/ksyntaxhighlighter.cpp:479
+msgid "As-you-type spell checking disabled."
+msgstr "Galluogir cywiro sillafu wrth deipio."
+
+#: tdeui/ksyntaxhighlighter.cpp:528
+msgid "Incremental Spellcheck"
+msgstr "Gwirio Sillafu Cynnyddol"
+
+#: tdeui/ksyntaxhighlighter.cpp:588
+msgid "Too many misspelled words. As-you-type spell checking disabled."
+msgstr ""
+"Gormod o eiriau sydd wedi cael eu cam-sillafu.  Analluogir cywiro sillafu wrth "
+"deipio."
+
+#: tdeui/kcombobox.cpp:601
+msgid "No further item in the history."
+msgstr "Dim mwy o eitemau yn yr hanes."
+
+#: tdeui/kcombobox.cpp:730
+msgid "History Editor"
+msgstr ""
+
+#: tdeui/kcombobox.cpp:732
+#, fuzzy
+msgid "&Delete Entry"
+msgstr "&Dileu"
+
+#: tdeui/kcombobox.cpp:738
+msgid "This dialog allows you to delete unwanted history items."
+msgstr ""
+
+#: tdeui/kcombobox.cpp:745 tdeui/kkeydialog.cpp:321
+msgid "Clear Search"
+msgstr "Gwagu'r Chwiliad"
+
+#: tdeui/kcombobox.cpp:747 tdeui/kkeydialog.cpp:324
+msgid "&Search:"
+msgstr "&Chwilio:"
+
+#: tdeui/kdialogbase.cpp:636
+msgid "&Try"
+msgstr "&Arbrofi"
+
+#: tdeui/kdialogbase.cpp:904
+msgid ""
+"If you press the <b>OK</b> button, all changes\n"
+"you made will be used to proceed."
+msgstr ""
+" Os gwthiwch y botwm <b>Iawn</b>, defnyddir\n"
+" pob newid a wnaethoch i fynd ymlaen."
+
+#: tdeui/kdialogbase.cpp:911
+msgid "Accept settings"
+msgstr "Derbyn gosodiadau"
+
+#: tdeui/kdialogbase.cpp:932
+msgid ""
+"When clicking <b>Apply</b>, the settings will be\n"
+"handed over to the program, but the dialog\n"
+"will not be closed. Use this to try different settings. "
+msgstr ""
+" Wrth wthio<b>Gweithredu</b>, rhoddir y gosodiadau\n"
+" i'r rhaglen, ond ni chaeir y blwch dewis.\n"
+" Defnyddiwch hwn er mwyn arbrofi dewisiadau gwahanol."
+
+#: tdeui/kdialogbase.cpp:941
+msgid "Apply settings"
+msgstr "Gweithredu gosodiadau"
+
+#: tdeui/kdialogbase.cpp:1130
+msgid "&Details"
+msgstr "&Manylion"
+
+#: tdeui/kdialogbase.cpp:1538
+msgid "Get help..."
+msgstr "Nôl cymorth..."
+
+#: tdeui/twindowlistmenu.cpp:129
+msgid "Unclutter Windows"
+msgstr "Dad-lanastrio Ffenestri"
+
+#: tdeui/twindowlistmenu.cpp:131
+msgid "Cascade Windows"
+msgstr "Rhaeadru Ffenestri"
+
+#: tdeui/twindowlistmenu.cpp:185
+msgid "On All Desktops"
+msgstr "Ar Bob Penbwrdd"
+
+#: tdeui/twindowlistmenu.cpp:213
+msgid "No Windows"
+msgstr "Dim Ffenestri"
+
+#: tdeui/tdefontrequester.cpp:38
+msgid "Choose..."
+msgstr "Dewis..."
+
+#: tdeui/tdefontrequester.cpp:102
+msgid "Click to select a font"
+msgstr "Cliciwch i ddewis wynebfath"
+
+#: tdeui/tdefontrequester.cpp:109
+msgid "Preview of the selected font"
+msgstr "Rhagolwg y r wynebfath penodol"
+
+#: tdeui/tdefontrequester.cpp:111
+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...\"."
+
+#: tdeui/tdefontrequester.cpp:117
+msgid "Preview of the \"%1\" font"
+msgstr "Rhagolwg y font \"%1\""
+
+#: tdeui/tdefontrequester.cpp:119
+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...\"."
+
+#: tdeui/kpixmapregionselectorwidget.cpp:141
+msgid "Image Operations"
+msgstr "Gweithrediadau Delwedd"
+
+#: tdeui/kpixmapregionselectorwidget.cpp:143
+msgid "&Rotate Clockwise"
+msgstr "Cylchdroi yn &Glocwedd"
+
+#: tdeui/kpixmapregionselectorwidget.cpp:148
+msgid "Rotate &Counterclockwise"
+msgstr "Cylchdroi yn &Wrthglocwedd"
+
+#: tdeui/tdeactionselector.cpp:69
+msgid "&Available:"
+msgstr "&Ar gael:"
+
+#: tdeui/tdeactionselector.cpp:84
+msgid "&Selected:"
+msgstr "&Wedi'u dewis:"
+
+#: tdeui/kdockwidget.cpp:237
+msgid ""
+"_: Freeze the window geometry\n"
+"Freeze"
+msgstr "Rhewi"
+
+#: tdeui/kdockwidget.cpp:244
+msgid ""
+"_: Dock this window\n"
+"Dock"
+msgstr "Clymu"
+
+#: tdeui/kdockwidget.cpp:251
+msgid "Detach"
+msgstr "Dat-glymu"
+
+#: tdemdi/tdemdi/guiclient.cpp:152 tdemdi/tdemdiguiclient.cpp:265
+#: tdeui/kdockwidget.cpp:2939
+#, c-format
+msgid "Hide %1"
+msgstr "Cuddio %1"
+
+#: tdemdi/tdemdi/guiclient.cpp:148 tdemdi/tdemdiguiclient.cpp:260
+#: tdeui/kdockwidget.cpp:2945
 #, c-format
+msgid "Show %1"
+msgstr "Dangos %1"
+
+#: tdeui/kkeydialog.cpp:331
 msgid ""
-"_: Argument is application name\n"
-"This configuration section is already opened in %1"
+"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."
 
-#: tdeutils/tdecmoduleproxy.cpp:324
-msgid "<big>Loading...</big>"
-msgstr "<big>Yn Llwytho</big>"
+#: tdeui/kkeydialog.cpp:354
+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."
 
-#: tdeutils/ksettings/componentsdialog.cpp:48
-msgid "Select Components"
-msgstr "Dewis Cydrannau"
+#: tdeui/kkeydialog.cpp:363
+msgid "Action"
+msgstr "Gweithrediad"
 
-#: tdeutils/ksettings/dialog.cpp:590
-msgid "Select Components..."
-msgstr "Dewis Cydrannau ..."
+#: tdeui/kkeydialog.cpp:364
+msgid "Shortcut"
+msgstr "Byrlwybr"
 
-#: tderesources/resource.cpp:61
-msgid "resource"
-msgstr "adnodd"
+#: tdeui/kkeydialog.cpp:365
+msgid "Alternate"
+msgstr "Eiledol"
 
-#: tderesources/selectdialog.cpp:95
-msgid "There is no resource available!"
-msgstr "Nid oes adnodd ar gael.!"
+#: tdeui/kkeydialog.cpp:380
+msgid "Shortcut for Selected Action"
+msgstr "Byrlwybr i'r gweithrediad a ddewiswyd"
 
-#: tderesources/kcmtderesources.cpp:44
-msgid "kcmtderesources"
-msgstr "kcmtderesources"
+#: tdeui/kkeydialog.cpp:393
+msgid ""
+"_: no key\n"
+"&None"
+msgstr "&Dim"
 
-#: tderesources/kcmtderesources.cpp:45
-msgid "TDE Resources configuration module"
-msgstr "Modiwl ffurfweddu Adnoddau TDE."
+#: tdeui/kkeydialog.cpp:398
+msgid "The selected action will not be associated with any key."
+msgstr "Ni chysylltir y gweithrediad a ddewiswyd efo unrhyw bysell."
 
-#: tderesources/kcmtderesources.cpp:47
-msgid "(c) 2003 Tobias Koenig"
-msgstr "(c) 2003 Tobias Koenig"
+#: tdeui/kkeydialog.cpp:401
+msgid ""
+"_: default key\n"
+"De&fault"
+msgstr "&Rhagosodol"
+
+#: tdeui/kkeydialog.cpp:406
+msgid ""
+"This will bind the default key to the selected action. Usually a reasonable "
+"choice."
+msgstr ""
+"Fe rhwymir y fysell rhagosodol i'r gweithrediad a ddewiswyd. Dewis rhesymol fel "
+"arfer."
+
+#: tdeui/kkeydialog.cpp:409
+msgid "C&ustom"
+msgstr "A&ddasu"
+
+#: tdeui/kkeydialog.cpp:414
+msgid ""
+"If this option is selected you can create a customized key binding for the "
+"selected action using the buttons below."
+msgstr ""
+"Pan detholir y dewis yma, cewch greu rhwymiad bysell addasol i'r gweithrediad a "
+"ddewiswyd wrth ddefnyddio'r botymau isod."
+
+#: tdeui/kkeydialog.cpp:428
+msgid ""
+"Use this button to choose a new shortcut key. Once you click it, you can press "
+"the key-combination which you would like to be assigned to the currently "
+"selected action."
+msgstr ""
+"Defnyddiwch y botwm yma i greu bysell newydd byrlwybr. Ar ôl i chi ei glicio, "
+"cewch wthio'r gyfuniad o fysellau i'w neilltuo i'r gweithrediad a ddewisir ar "
+"hyn o bryd."
+
+#: tdeui/kkeydialog.cpp:470
+msgid "Shortcuts"
+msgstr "Byrlwybrau"
+
+#: tdeui/kkeydialog.cpp:536
+msgid "Default key:"
+msgstr "Bysell rhagosodol:"
+
+#: tdeui/kkeybutton.cpp:89 tdeui/kkeydialog.cpp:536 tdeui/klineedit.cpp:889
+msgid "None"
+msgstr "Dim"
+
+#: tdeui/kkeydialog.cpp:715
+msgid ""
+"In order to use the '%1' key as a shortcut, it must be combined with the Win, "
+"Alt, Ctrl, and/or Shift keys."
+msgstr ""
+"Er mwyn defnyddio'r fysell '%1' fel byrlwybr, rhaid ei chyfuno efo'r bysellau "
+"Win, Alt, Ctrl, a/neu Shift."
+
+#: tdeui/kkeydialog.cpp:718
+msgid "Invalid Shortcut Key"
+msgstr "Bysell Fyrlwybr Annilys"
+
+#: tdeui/kkeydialog.cpp:943
+msgid ""
+"The '%1' key combination has already been allocated to the \"%2\" action.\n"
+"Please choose a unique key combination."
+msgstr ""
+"Mae cyfuniad bysell %1 wedi ei dyrannu yn barod i'r gweithrediad \"%2\".\n"
+" Dewiswch cyfuniad bysell unigryw."
+
+#: tdeui/kkeydialog.cpp:958
+msgid "Conflict with Standard Application Shortcut"
+msgstr "Croestyniad efo Byrlwybr Cymhwysiad Arferol"
+
+#: tdeui/kkeydialog.cpp:959
+msgid ""
+"The '%1' key combination has already been allocated to the standard action "
+"\"%2\".\n"
+"Do you want to reassign it from that action to the current one?"
+msgstr ""
+"Mae cyfuniad bysell '%1' wedi ei dyrannu yn barod i'r weithred safonol \"%2\".\n"
+"Ydych eisiau ei ail-neilltuo o'r weithred yna i'r un gyfredol?"
+
+#: tdeui/kkeydialog.cpp:964
+msgid "Conflict with Global Shortcut"
+msgstr "Croestyniad efo Byrlwybr Eang"
+
+#: tdeui/kkeydialog.cpp:965
+msgid ""
+"The '%1' key combination has already been allocated to the global action "
+"\"%2\".\n"
+"Do you want to reassign it from that action to the current one?"
+msgstr ""
+"Mae cyfuniad bysell '%1' wedi ei dyrannu yn barod i'r weithred eang \"%2\".\n"
+"Ydych eisiau ei ail-neilltuo o'r weithred yna i'r un gyfredol?"
+
+#: tdeui/kkeydialog.cpp:970
+msgid "Key Conflict"
+msgstr "Croestyniad Bysell"
+
+#: tdeui/kkeydialog.cpp:971
+msgid ""
+"The '%1' key combination has already been allocated to the \"%2\" action.\n"
+"Do you want to reassign it from that action to the current one?"
+msgstr ""
+"Mae cyfuniad bysell '%1' wedi ei dyrannu yn barod i'r weithred \"%2\".\n"
+"Ydych eisiau ei ail-neilltuo o'r weithred yna i'r un gyfredol?"
+
+#: tdeui/kkeydialog.cpp:977
+#, fuzzy
+msgid "Reassign"
+msgstr "Rwsieg"
+
+#: tdeui/kkeydialog.cpp:1091 tdeui/kkeydialog.cpp:1103
+msgid "Configure Shortcuts"
+msgstr "Ffurfweddu Byrlwybrau"
+
+#: tdeui/kjanuswidget.cpp:161
+#, fuzzy
+msgid "Empty Page"
+msgstr "Tudalen &Olaf"
+
+#: tdeui/tdeshortcutdialog.cpp:68
+msgid "Configure Shortcut"
+msgstr "Ffurfweddu Byrlwybr"
+
+#: tdeui/tdeshortcutdialog.cpp:71
+msgid "Advanced"
+msgstr "Uwch"
+
+#: tdeui/ktextedit.cpp:231
+msgid "Check Spelling..."
+msgstr "Gwirio Sillafu..."
+
+#: tdeui/ktextedit.cpp:237
+msgid "Auto Spell Check"
+msgstr "Hunan-wirio Sillafu"
+
+#: tdeui/ktextedit.cpp:241
+msgid "Allow Tabulations"
+msgstr "Gadael Tablyddion"
+
+#: tdeui/keditlistbox.cpp:124
+msgid "&Add"
+msgstr "&Ychwanegu"
+
+#: tdeui/keditlistbox.cpp:148
+msgid "Move &Up"
+msgstr "Sym&ud i fyny"
+
+#: tdeui/keditlistbox.cpp:153
+msgid "Move &Down"
+msgstr "Symu&d i lawr"
+
+#: tdeui/kdatepicker.cpp:88
+#, c-format
+msgid "Week %1"
+msgstr "Wythnos %1"
+
+#: tdeui/kdatepicker.cpp:163
+msgid "Next year"
+msgstr "Blwyddyn nesaf"
+
+#: tdeui/kdatepicker.cpp:164
+msgid "Previous year"
+msgstr "Blwyddyn cynt"
+
+#: tdeui/kdatepicker.cpp:165
+msgid "Next month"
+msgstr "Mis nesaf"
+
+#: tdeui/kdatepicker.cpp:166
+msgid "Previous month"
+msgstr "Mis cynt"
+
+#: tdeui/kdatepicker.cpp:167
+msgid "Select a week"
+msgstr "Dewiswch wythnos"
+
+#: tdeui/kdatepicker.cpp:168
+msgid "Select a month"
+msgstr "Dewiswch mis"
+
+#: tdeui/kdatepicker.cpp:169
+msgid "Select a year"
+msgstr "Dewiswch blwyddyn"
+
+#: tdeui/kdatepicker.cpp:170
+msgid "Select the current day"
+msgstr "Dewis y diwrnod cyfredol"
+
+#: tdeui/kxmlguibuilder.cpp:166 tdeui/kxmlguibuilder.cpp:365
+msgid "No text!"
+msgstr "Dim testun!"
+
+#: tdeui/kwizard.cpp:48
+msgid "&Back"
+msgstr "&Yn ôl"
+
+#: tdeui/kwizard.cpp:49
+msgid ""
+"_: Opposite to Back\n"
+"&Next"
+msgstr "&Nesaf"
+
+#: tdeui/kstdguiitem.cpp:120
+msgid "Discard changes"
+msgstr "Taflu newidiadau"
+
+#: tdeui/kstdguiitem.cpp:121
+msgid ""
+"Pressing this button will discard all recent changes made in this dialog"
+msgstr ""
+" Bydd gwthio'r botwm yma yn taflu pob newid diweddar a wnaethpwyd yn y blwch "
+"dewis"
+
+#: tdeui/kstdguiitem.cpp:127
+msgid "Save data"
+msgstr "Cadw'r data"
+
+#: tdeui/kstdguiitem.cpp:132
+msgid "&Do Not Save"
+msgstr "&Peidiwch â Chadw"
+
+#: tdeui/kstdguiitem.cpp:133
+msgid "Don't save data"
+msgstr "Peidio a chadw'r data"
+
+#: tdeui/kstdaction_p.h:44 tdeui/kstdguiitem.cpp:138
+msgid "Save &As..."
+msgstr "Cadw &Fel..."
+
+#: tdeui/kstdguiitem.cpp:139
+msgid "Save file with another name"
+msgstr "Cadw'r ffeil efo enw arall"
+
+#: tdeui/kstdguiitem.cpp:144
+msgid "Apply changes"
+msgstr "Cymhwyso'r newidiadau"
+
+#: tdeui/kstdguiitem.cpp:145
+msgid ""
+"When clicking <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 ""
+"Wrth wthio<b>Gweithredu</b>, rhoddir y gosodiadau i'r rhaglen, ond ni chaeir y "
+"blwch dewis.\n"
+" Defnyddiwch hwn i arbrofi dewisiadau gwahanol."
+
+#: tdeui/kstdguiitem.cpp:153
+msgid "Administrator &Mode..."
+msgstr "Modd G&weinyddwr..."
+
+#: tdeui/kstdguiitem.cpp:153
+msgid "Enter Administrator Mode"
+msgstr "Newid i Fodd Gweinyddwr"
+
+#: tdeui/kstdguiitem.cpp:154
+msgid ""
+"When clicking <b>Administrator Mode</b> you will be prompted for the "
+"administrator (root) password in order to make changes which require root "
+"privileges."
+msgstr ""
+"Ar ôl clicio <b>Modd Gweinyddwr</b> byddwch yn eich gofyn am y cyfrinair "
+"gweinyddwr (gwraidd) er mwyn gwneud newidiadau sydd angen breintiau gwraidd."
+
+#: tdeui/kstdguiitem.cpp:162
+msgid "Clear input"
+msgstr "Clirio'r mewnbwn"
+
+#: tdeui/kstdguiitem.cpp:163
+msgid "Clear the input in the edit field"
+msgstr "Clirio'r mewnbwn yn y maes golygu"
+
+#: tdeui/kstdguiitem.cpp:169
+msgid "Show help"
+msgstr "Dangos cymorth"
+
+#: tdeui/kstdguiitem.cpp:175
+msgid "Close the current window or document"
+msgstr "Cau'r ffenest neu ddogfen cyfredol"
+
+#: tdeui/kstdguiitem.cpp:181
+msgid "Reset all items to their default values"
+msgstr "Ailosod pob eitem i'w werth rhagosodol"
+
+#: tdeui/kstdguiitem.cpp:189
+msgid "Go back one step"
+msgstr "Ewch cam yn ôl"
+
+#: tdeui/kstdguiitem.cpp:197
+msgid "Go forward one step"
+msgstr "Ewch cam ymlaen"
+
+#: tdeui/kstdguiitem.cpp:208
+msgid "Opens the print dialog to print the current document"
+msgstr "Agor y blwch dewisiadau argraffu er mwyn argraffu'r ddogfen gyfredol"
+
+#: tdeui/kstdguiitem.cpp:214
+msgid "C&ontinue"
+msgstr "&Mynd ymlaen"
+
+#: tdeui/kstdguiitem.cpp:215
+msgid "Continue operation"
+msgstr "Ewch ymlaen a'r gweithrediad"
+
+#: tdeui/kstdguiitem.cpp:221
+msgid "Delete item(s)"
+msgstr " Dileu eitem(au)"
+
+#: tdeui/kstdguiitem.cpp:227
+msgid "Open file"
+msgstr "Agor ffeil"
+
+#: tdeui/kstdguiitem.cpp:233
+msgid "Quit application"
+msgstr "Gadael y cymhwysiant"
+
+#: tdeui/kstdguiitem.cpp:238
+msgid "&Reset"
+msgstr "A&ilosod"
+
+#: tdeui/kstdguiitem.cpp:239
+msgid "Reset configuration"
+msgstr "Ailodosd ffurfweddiad"
+
+#: tdeui/kstdguiitem.cpp:244
+msgid ""
+"_: Verb\n"
+"&Insert"
+msgstr "&Mewnosod"
+
+#: tdeui/kstdguiitem.cpp:249
+msgid "Confi&gure..."
+msgstr "Ffurf&weddu..."
+
+#: tdeui/kstdguiitem.cpp:274
+msgid "Test"
+msgstr "Profi"
+
+#: tdeui/kstdguiitem.cpp:284
+msgid "&Overwrite"
+msgstr "&Trosysgrifo"
+
+#: tdeui/ktimezonewidget.cpp:45
+msgid "Area"
+msgstr "Ardal"
+
+#: kab/addressbook.cc:295 tdeui/ktimezonewidget.cpp:47
+msgid "Comment"
+msgstr "Esboniad"
+
+#: tdeui/klineedit.cpp:890
+msgid "Manual"
+msgstr "Llawlyfr"
+
+#: tdeui/klineedit.cpp:891
+msgid "Automatic"
+msgstr "Awtomatig"
+
+#: tdeui/klineedit.cpp:892
+msgid "Dropdown List"
+msgstr "Rhestr Cwymplen"
+
+#: tdeui/klineedit.cpp:893
+msgid "Short Automatic"
+msgstr "Awtomatig Byr"
+
+#: tdeui/klineedit.cpp:894
+msgid "Dropdown List && Automatic"
+msgstr "Rhestr Cwymplen && Ymysgogol"
+
+#: tdeui/tdetoolbar.cpp:2046
+msgid "Toolbar Menu"
+msgstr "Dewislen Bar Offer"
+
+#: tdeui/tdetoolbar.cpp:2049
+msgid ""
+"_: toolbar position string\n"
+"Top"
+msgstr " Top"
+
+#: tdeui/tdetoolbar.cpp:2050
+msgid ""
+"_: toolbar position string\n"
+"Left"
+msgstr "Chwith"
+
+#: tdeui/tdetoolbar.cpp:2051
+msgid ""
+"_: toolbar position string\n"
+"Right"
+msgstr "De"
+
+#: tdeui/tdetoolbar.cpp:2052
+msgid ""
+"_: toolbar position string\n"
+"Bottom"
+msgstr " Gwaelod"
+
+#: tdeui/tdetoolbar.cpp:2054
+msgid ""
+"_: toolbar position string\n"
+"Floating"
+msgstr "Arnofio"
+
+#: tdeui/tdetoolbar.cpp:2055
+msgid ""
+"_: min toolbar\n"
+"Flat"
+msgstr " Gwastad"
+
+#: tdeui/tdetoolbar.cpp:2058
+msgid "Icons Only"
+msgstr "Eiconau yn Unig"
+
+#: tdeui/tdetoolbar.cpp:2059
+msgid "Text Only"
+msgstr "Testun yn Unig"
+
+#: tdeui/tdetoolbar.cpp:2060
+msgid "Text Alongside Icons"
+msgstr "Testun wrth Ochr Eiconau"
+
+#: tdeui/tdetoolbar.cpp:2061
+msgid "Text Under Icons"
+msgstr "Testun dan Eiconau"
+
+#: tdeui/tdetoolbar.cpp:2086 tdeui/tdetoolbar.cpp:2107
+msgid "Small (%1x%2)"
+msgstr "Bach (%1x%2)"
+
+#: tdeui/tdetoolbar.cpp:2088 tdeui/tdetoolbar.cpp:2109
+msgid "Medium (%1x%2)"
+msgstr "Canol (%1x%2)"
+
+#: tdeui/tdetoolbar.cpp:2090 tdeui/tdetoolbar.cpp:2111
+msgid "Large (%1x%2)"
+msgstr "Mawr (%1x%2)"
+
+#: tdeui/tdetoolbar.cpp:2092 tdeui/tdetoolbar.cpp:2113
+msgid "Huge (%1x%2)"
+msgstr "Enfawr (%1x%2)"
+
+#: tdeui/tdetoolbar.cpp:2124
+msgid "Text Position"
+msgstr "Lleoliad Testun"
+
+#: tdeui/tdetoolbar.cpp:2126
+msgid "Icon Size"
+msgstr "Maint Eicon"
+
+#: tdenewstuff/downloaddialog.cpp:306 tdenewstuff/downloaddialog.cpp:544
+#: tdeui/tdemessagebox.cpp:246
+msgid "Details"
+msgstr " Manylion"
+
+#: tdeui/tdemessagebox.cpp:428 tdeui/tdemessagebox.cpp:479
+msgid "Question"
+msgstr "Cwestiwn"
+
+#: tdeui/tdemessagebox.cpp:442 tdeui/tdemessagebox.cpp:494
+#: tdeui/tdemessagebox.cpp:575 tdeui/tdemessagebox.cpp:647
+#: tdeui/tdemessagebox.cpp:723
+msgid "Do not ask again"
+msgstr "Peidiwch a gofyn eto"
+
+#: tdeui/kcommand.cpp:151 tdeui/kcommand.cpp:166 tdeui/kcommand.cpp:199
+#: tdeui/kcommand.cpp:241
+#, c-format
+msgid "&Undo: %1"
+msgstr "&Dadwneud: %1"
+
+#: tdeui/kcommand.cpp:192 tdeui/kcommand.cpp:247
+#, c-format
+msgid "&Redo: %1"
+msgstr "&Ail-wneud: %1"
+
+#: tdeui/kcommand.cpp:322
+#, c-format
+msgid "Undo: %1"
+msgstr "Dadwneud: %1"
+
+#: tdeui/kcommand.cpp:341 tdeui/kcommand.cpp:346
+#, c-format
+msgid "Redo: %1"
+msgstr "Ail-wneud: %1"
+
+#: tdeui/tdefontdialog.cpp:101
+msgid "Here you can choose the font to be used."
+msgstr "Yma y dewisir yr wynebfath a ddefnyddir."
+
+#: tdeui/tdefontdialog.cpp:113
+msgid "Requested Font"
+msgstr "Wynebfath a Ddymunwyd"
+
+#: tdeui/tdefontdialog.cpp:136
+msgid "Change font family?"
+msgstr "Newid y teulu wynebfath?"
+
+#: tdeui/tdefontdialog.cpp:138
+msgid "Enable this checkbox to change the font family settings."
+msgstr "Alluogi'r blwch britho yma er mwyn newid gosodiadau'r teulu wynebfath."
+
+#: tdeui/tdefontdialog.cpp:151
+msgid "Font style"
+msgstr "Ardull wynebfath"
+
+#: tdeui/tdefontdialog.cpp:155
+msgid "Change font style?"
+msgstr "Newid ardull wynebfath?"
+
+#: tdeui/tdefontdialog.cpp:157
+msgid "Enable this checkbox to change the font style settings."
+msgstr ""
+"Alluogi'r blwch britho yma er mwyn newid gosodiadau'r arddull wynebfath."
+
+#: tdeui/tdefontdialog.cpp:163
+msgid "Font style:"
+msgstr "Ardull wynebfath:"
+
+#: tdeui/tdefontdialog.cpp:171
+msgid "Size"
+msgstr "Maint"
+
+#: tdeui/tdefontdialog.cpp:175
+msgid "Change font size?"
+msgstr "Newid maint yr wynebfath?"
+
+#: tdeui/tdefontdialog.cpp:177
+msgid "Enable this checkbox to change the font size settings."
+msgstr ""
+"Alluogi'r blwch britho yma er mwyn newid gosodiadau maint yr wynebfath."
+
+#: tdeui/tdefontdialog.cpp:183
+msgid "Size:"
+msgstr "Maint:"
+
+#: tdeui/tdefontdialog.cpp:199
+msgid "Here you can choose the font family to be used."
+msgstr "Yma y dewisir y teulu wynebfath a ddefnyddir."
+
+#: tdeui/tdefontdialog.cpp:221
+msgid "Here you can choose the font style to be used."
+msgstr "Yma y dewisir yr arddull wynebfath a ddefnyddir."
+
+#: tdeui/tdefontdialog.cpp:224 tdeui/tdefontdialog.cpp:473
+#: tdeui/tdefontdialog.cpp:475 tdeui/tdefontdialog.cpp:484
+#: tdeui/tdefontdialog.cpp:485
+msgid "Regular"
+msgstr "Cyffredin"
+
+#: tdeui/tdefontdialog.cpp:226
+msgid "Bold"
+msgstr "Trwm"
+
+#: tdeui/tdefontdialog.cpp:227
+msgid "Bold Italic"
+msgstr "Trwm Italig"
+
+#: tdeui/tdefontdialog.cpp:244
+msgid "Relative"
+msgstr " Cymharol"
+
+#: tdeui/tdefontdialog.cpp:246
+msgid "Font size<br><i>fixed</i> or <i>relative</i><br>to environment"
+msgstr ""
+"Mae maint yr wynebfath yn "
+"<br><i>osodedig</i> neu <i>gymharol</i>"
+"<br> i'r amgylchedd"
+
+#: tdeui/tdefontdialog.cpp:248
+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)."
+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)."
+
+#: tdeui/tdefontdialog.cpp:272
+msgid "Here you can choose the font size to be used."
+msgstr "Yma y dewisir maint yr wynebfath a ddefnyddir."
+
+#. i18n: This is a classical test phrase. (It contains all letters from A to Z.)
+#: tdeui/tdefontdialog.cpp:296
+msgid "The Quick Brown Fox Jumps Over The Lazy Dog"
+msgstr "Duw a'm gwaredo, ni allaf ddianc rhag hon"
+
+#: tdeui/tdefontdialog.cpp:301
+msgid ""
+"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."
+
+#: tdeui/tdefontdialog.cpp:310 tdeui/tdefontdialog.cpp:320
+msgid "Actual Font"
+msgstr "Gwir Wynebfath"
+
+#: tdemdi/tdemdi/guiclient.cpp:79 tdemdi/tdemdiguiclient.cpp:139
+msgid "Tool &Views"
+msgstr "Golygfeydd &Offer"
+
+#: tdemdi/tdemdiguiclient.cpp:142
+msgid "MDI Mode"
+msgstr "Modd MDI"
+
+#: tdemdi/tdemdiguiclient.cpp:144 tdemdi/tdemdimainfrm.cpp:2594
+msgid "&Toplevel Mode"
+msgstr "&Modd Gwastad Uchaf"
+
+#: tdemdi/tdemdiguiclient.cpp:144 tdemdi/tdemdimainfrm.cpp:2595
+msgid "C&hildframe Mode"
+msgstr "Modd Ffrâm &Plentyn"
+
+#: tdemdi/tdemdiguiclient.cpp:144 tdemdi/tdemdimainfrm.cpp:2596
+msgid "Ta&b Page Mode"
+msgstr "Modd Tudalen Ta&b"
+
+#: tdemdi/tdemdiguiclient.cpp:144 tdemdi/tdemdimainfrm.cpp:2597
+msgid "I&DEAl Mode"
+msgstr "Modd I&DEAI"
+
+#: tdemdi/tdemdi/guiclient.cpp:81 tdemdi/tdemdiguiclient.cpp:154
+msgid "Tool &Docks"
+msgstr "Dociau &Offer"
+
+#: tdemdi/tdemdi/guiclient.cpp:82 tdemdi/tdemdiguiclient.cpp:155
+msgid "Switch Top Dock"
+msgstr "Newid y Doc wrth y Pen"
+
+#: tdemdi/tdemdi/guiclient.cpp:84 tdemdi/tdemdiguiclient.cpp:157
+msgid "Switch Left Dock"
+msgstr "Newid y Doc ar y Chwith"
+
+#: tdemdi/tdemdi/guiclient.cpp:86 tdemdi/tdemdiguiclient.cpp:159
+msgid "Switch Right Dock"
+msgstr "Newid y Doc ar y Dde"
+
+#: tdemdi/tdemdi/guiclient.cpp:88 tdemdi/tdemdiguiclient.cpp:161
+msgid "Switch Bottom Dock"
+msgstr "Newid y Doc wrth y Gwaelod"
+
+#: tdemdi/tdemdi/guiclient.cpp:91 tdemdi/tdemdiguiclient.cpp:164
+msgid "Previous Tool View"
+msgstr "Golwg Offer Cynt"
+
+#: tdemdi/tdemdi/guiclient.cpp:93 tdemdi/tdemdiguiclient.cpp:166
+msgid "Next Tool View"
+msgstr "Golwg Offer Nesaf"
+
+#: tdemdi/tdemdichildfrmcaption.cpp:71 tdemdi/tdemdichildview.cpp:63
+#: tdemdi/tdemdichildview.cpp:89
+msgid "Unnamed"
+msgstr "Di-enw"
+
+#: tdemdi/tdemdichildfrm.cpp:1239
+msgid "R&esize"
+msgstr "Ne&wid Maint"
+
+#: tdemdi/tdemdichildfrm.cpp:1240
+msgid "M&inimize"
+msgstr "Lle&ihau"
+
+#: tdemdi/tdemdichildfrm.cpp:1241
+msgid "M&aximize"
+msgstr "Ch&wyddo"
+
+#: tdemdi/tdemdichildfrm.cpp:1261
+msgid "&Maximize"
+msgstr "&Chwyddo"
+
+#: tdemdi/tdemdichildfrm.cpp:1265
+msgid "M&ove"
+msgstr "&Symud"
+
+#: tdemdi/tdemdichildfrm.cpp:1267
+msgid "&Resize"
+msgstr "Newid &Maint"
+
+#: tdemdi/tdemdichildfrm.cpp:1270
+msgid "&Undock"
+msgstr "&Dad-ddocio"
+
+#: tdemdi/tdemdi/dockcontainer.cpp:195 tdemdi/tdemdidockcontainer.cpp:218
+msgid ""
+"_: Switch between overlap and side by side mode\n"
+"Overlap"
+msgstr "Gorgyffwrdd"
+
+#: tdemdi/tdemdimainfrm.cpp:979
+msgid "Window"
+msgstr "Ffenest"
+
+#: tdemdi/tdemdimainfrm.cpp:992
+msgid "Undock"
+msgstr "Dad-ddocio"
+
+#: tdemdi/tdemdimainfrm.cpp:1002
+msgid "Dock"
+msgstr "Docio"
+
+#: tdemdi/tdemdimainfrm.cpp:1007
+msgid "Operations"
+msgstr "Gweithrediadau"
+
+#: tdemdi/tdemdimainfrm.cpp:2577
+msgid "Close &All"
+msgstr "Cau'r &Cwbl"
+
+#: tdemdi/tdemdimainfrm.cpp:2586
+msgid "&Minimize All"
+msgstr "Llei&hau'r Cwbl"
+
+#: tdemdi/tdemdimainfrm.cpp:2592
+msgid "&MDI Mode"
+msgstr "&Modd MDI"
+
+#: tdemdi/tdemdimainfrm.cpp:2619
+msgid "&Tile"
+msgstr "&Teilio"
+
+#: tdemdi/tdemdimainfrm.cpp:2621
+msgid "Ca&scade Windows"
+msgstr "Rhae&adru Ffenestri"
+
+#: tdemdi/tdemdimainfrm.cpp:2622
+msgid "Cascade &Maximized"
+msgstr "Rhaeadru wedi'u &Ehangu"
+
+#: tdemdi/tdemdimainfrm.cpp:2623
+msgid "Expand &Vertically"
+msgstr "Ehangu'n &Fertigol"
+
+#: tdemdi/tdemdimainfrm.cpp:2624
+msgid "Expand &Horizontally"
+msgstr "Ehangu'n &Llorweddol"
+
+#: tdemdi/tdemdimainfrm.cpp:2625
+msgid "Tile &Non-Overlapped"
+msgstr "Teilio wedi'u &Di-orgyffwrdd"
+
+#: tdemdi/tdemdimainfrm.cpp:2626
+msgid "Tile Overla&pped"
+msgstr "Teilio wedi'u &Gorgyffwrdd"
+
+#: tdemdi/tdemdimainfrm.cpp:2627
+msgid "Tile V&ertically"
+msgstr "Teilio'n Fe&rtigol"
+
+#: tdemdi/tdemdimainfrm.cpp:2633
+msgid "&Dock/Undock"
+msgstr "&Docio/Dad-ddocio"
+
+#: tdewidgets/maketdewidgets.cpp:15
+msgid "Builds Qt widget plugins from an ini style description file."
+msgstr "Adeiladu ategion celfigyn Qt o ffeil ddisgrifiad arddull ini."
+
+#: tdewidgets/maketdewidgets.cpp:113
+msgid "Output file"
+msgstr "Ffeil allbwn"
+
+#: tdewidgets/maketdewidgets.cpp:114
+msgid "Name of the plugin class to generate"
+msgstr "Enw'r dosbarth ategyn i'w greu"
+
+#: tdewidgets/maketdewidgets.cpp:115
+msgid "Default widget group name to display in designer"
+msgstr "Enw rhagosodol i'r grŵp celfigion i'w arddangos yn y dylunydd"
+
+#: tdewidgets/maketdewidgets.cpp:116
+msgid "Embed pixmaps from a source directory"
+msgstr "Caethu picsfapiau o gyfeiriadur tarddiad"
+
+#: tdewidgets/maketdewidgets.cpp:129
+msgid "maketdewidgets"
+msgstr "maketdewidgets"
+
+#: tderesources/resource.cpp:61
+msgid "resource"
+msgstr "adnodd"
 
 #: tderesources/configdialog.cpp:40 tderesources/configpage.cpp:103
 #: tderesources/configpage.cpp:297
@@ -8698,6 +9504,22 @@ msgstr "%1 Gosodiadau Adnoddau"
 msgid "Please enter a resource name."
 msgstr "Rhowch enw adnodd."
 
+#: tderesources/selectdialog.cpp:95
+msgid "There is no resource available!"
+msgstr "Nid oes adnodd ar gael.!"
+
+#: tderesources/kcmtderesources.cpp:44
+msgid "kcmtderesources"
+msgstr "kcmtderesources"
+
+#: tderesources/kcmtderesources.cpp:45
+msgid "TDE Resources configuration module"
+msgstr "Modiwl ffurfweddu Adnoddau TDE."
+
+#: tderesources/kcmtderesources.cpp:47
+msgid "(c) 2003 Tobias Koenig"
+msgstr "(c) 2003 Tobias Koenig"
+
 #: tderesources/configpage.cpp:120
 msgid "Type"
 msgstr "Math"
@@ -8757,6 +9579,696 @@ msgstr ""
 "Does dim adnoddau safonol sy'n ddilys! Dewiswch un sy ddim yn darllenadwy yn "
 "unig neu yn anweithredol."
 
+#: tdeunittest/modrunner.cpp:36
+msgid "A command-line application that can be used to run KUnitTest modules."
+msgstr ""
+
+#: tdeunittest/modrunner.cpp:42
+msgid "Only run modules whose filenames match the regexp."
+msgstr ""
+
+#: tdeunittest/modrunner.cpp:43
+msgid ""
+"Only run tests modules which are found in the folder. Use the query option to "
+"select modules."
+msgstr ""
+
+#: tdeunittest/modrunner.cpp:44
+msgid ""
+"Disables debug capturing. You typically use this option when you use the GUI."
+msgstr ""
+
+#: tdeunittest/modrunner.cpp:53
+msgid "KUnitTest ModRunner"
+msgstr ""
+
+#: kded/tde-menu.cpp:36
+msgid "Output data in UTF-8 instead of local encoding"
+msgstr "Allbynnu'r data mewn UTF-8 yn lle amgodiad lleol"
+
+#: kded/tde-menu.cpp:37
+msgid ""
+"Print menu-id of the menu that contains\n"
+"the application"
+msgstr ""
+"Argraffu y dynodiad dewislen o'r ddewislen sy'n cynnwys\n"
+"y cymhwysiad"
+
+#: kded/tde-menu.cpp:38
+msgid ""
+"Print menu name (caption) of the menu that\n"
+"contains the application"
+msgstr ""
+"Argraffu yr enw (egluryn) o'r ddewislen\n"
+" sy'n cynnwys y cymhwysiad"
+
+#: kded/tde-menu.cpp:39
+msgid "Highlight the entry in the menu"
+msgstr "Amlygu'r gofnod yn y ddewislen"
+
+#: kded/tde-menu.cpp:40
+msgid "Do not check if sycoca database is up to date"
+msgstr "Peidio â gwirio a yw'r cronfa ddata sycoca yn ddiweddar"
+
+#: kded/tde-menu.cpp:41
+msgid "The id of the menu entry to locate"
+msgstr "Y dynodiad o'r gofnod ddewislen i'w chanfod"
+
+#: kded/tde-menu.cpp:99
+msgid "Menu item '%1' could not be highlighted."
+msgstr "Ni ellid amlygu'r eitem dewislen '%1'."
+
+#: kded/tde-menu.cpp:111
+msgid ""
+"TDE Menu query tool.\n"
+"This tool can be used to find in which menu a specific application is shown.\n"
+"The --highlight option can be used to visually indicate to the user where\n"
+"in the TDE menu a specific application is located."
+msgstr ""
+"Erfyn holi Dewislen TDE.\n"
+"Gellir defnyddio'r erfyn yma i ganfod ym mha ddewislen ymddengys cymhwysiad "
+"penodol.\n"
+"Gellir defnyddio'r dewisiad --highlight i ddangos yn weledol i'r defnyddiwr lle "
+"\n"
+"yn y ddewislen TDE a ellir canfod cymhwysiad penodol."
+
+#: kded/tde-menu.cpp:116
+msgid "tde-menu"
+msgstr "tde-menu"
+
+#: kded/tde-menu.cpp:133
+msgid "You must specify an application-id such as 'tde-konsole.desktop'"
+msgstr "Rhaid i chi benodi dynodiad cymhwysiad fel 'tde-konsole.desktop'"
+
+#: kded/tde-menu.cpp:142
+msgid ""
+"You must specify at least one of --print-menu-id, --print-menu-name or "
+"--highlight"
+msgstr ""
+"Rhaid i chi benodi o leiaf un o --print-menu-id, --print-menu-name or "
+"--highlight"
+
+#: kded/tde-menu.cpp:164
+msgid "No menu item '%1'."
+msgstr "Dim eitem dewislen '%1'."
+
+#: kded/tde-menu.cpp:168
+msgid "Menu item '%1' not found in menu."
+msgstr "Ni chanfuwyd eitem dewislen '%1' yn y ddewislen."
+
+#: kded/khostname.cpp:41
+msgid "Old hostname"
+msgstr "Hen enw'r gwesteiwr"
+
+#: kded/khostname.cpp:42
+msgid "New hostname"
+msgstr "Enw newydd y gwesteiwr"
+
+#: kded/khostname.cpp:79
+msgid ""
+"Error: HOME environment variable not set.\n"
+msgstr ""
+"Gwall: nid yw'r newidyn amgylchedd CARTREF wedi'i osod.\n"
+
+#: kded/khostname.cpp:88
+msgid ""
+"Error: DISPLAY environment variable not set.\n"
+msgstr ""
+"Gwall: nid yw'r newidyn amgylchedd ARDDANGOS wedi'i osod.\n"
+
+#: kded/khostname.cpp:369
+msgid "KDontChangeTheHostName"
+msgstr "KDontChangeTheHostName"
+
+#: kded/khostname.cpp:370
+msgid "Informs TDE about a change in hostname"
+msgstr "Hysbysu TDE ynglyn â newid enw'r gwesteiwr"
+
+#: kded/tdebuildsycoca.cpp:483
+msgid ""
+"Error creating database '%1'.\n"
+"Check that the permissions are correct on the directory and the disk is not "
+"full.\n"
+msgstr ""
+"Gwall wrth greu cronfa ddata '%1'.\n"
+"Gwiriwch fod y caniatadau yn gywir ar y cyfeiriadur, a nad yw'r ddisg yn "
+"llawn.\n"
+
+#: kded/tdebuildsycoca.cpp:483 kded/tdebuildsycoca.cpp:512
+#: kded/tdebuildsycoca.cpp:721
+msgid "KBuildSycoca"
+msgstr "KBuildSycoca"
+
+#: kded/tdebuildsycoca.cpp:512
+#, fuzzy
+msgid ""
+"[tdebuildsycoca] Error writing database '%1'.\n"
+"Check that the permissions are correct on the directory and the disk is not "
+"full.\n"
+msgstr ""
+"Gwall wrth ysgrifennu cronfa ddata '%1'.\n"
+"Gwiriwch fod y caniatadau yn gywir ar y cyfeiriadur, a nad yw'r ddisg yn "
+"llawn.\n"
+
+#: kded/tdebuildsycoca.cpp:695
+msgid "Do not signal applications to update"
+msgstr "Peidio â nodi cymwysiadau i'w diweddaru"
+
+#: kded/tdebuildsycoca.cpp:696
+msgid "Disable incremental update, re-read everything"
+msgstr "Analluogi diweddariad cynnyddol, ail-ddarllen popeth"
+
+#: kded/tdebuildsycoca.cpp:697
+msgid "Check file timestamps"
+msgstr "Gwirio stampiau amser ffeil"
+
+#: kded/tdebuildsycoca.cpp:698
+msgid "Disable checking files (dangerous)"
+msgstr "Analluogi gwirio ffeiliau (peryglus)"
+
+#: kded/tdebuildsycoca.cpp:699
+msgid "Create global database"
+msgstr "Creu cronfa ddata eang"
+
+#: kded/tdebuildsycoca.cpp:700
+msgid "Perform menu generation test run only"
+msgstr "Gweithredu arbrofiad yn unig o'r cread dewislen"
+
+#: kded/tdebuildsycoca.cpp:701
+msgid "Track menu id for debug purposes"
+msgstr "Dilyn dynodiad dewislen i pwrpas dadnamu"
+
+#: kded/tdebuildsycoca.cpp:703
+msgid "Silent - work without windows and stderr"
+msgstr "Distaw - gweithio heb ffenestri a stderr"
+
+#: kded/tdebuildsycoca.cpp:704
+msgid "Show progress information (even if 'silent' mode is on)"
+msgstr "Dangos gwybodaeth gynnydd (hyd yn oed os dewisir modd 'distaw') "
+
+#: kded/tdebuildsycoca.cpp:722
+msgid "Rebuilds the system configuration cache."
+msgstr "Ail-adeiladu celc ffurfweddiad y cysawd."
+
+#: kded/tdebuildsycoca.cpp:750
+msgid "Reloading TDE configuration, please wait..."
+msgstr "Ail-lwytho ffurfweddiad TDE, arhoswch ..."
+
+#: kded/tdebuildsycoca.cpp:751
+msgid "TDE Configuration Manager"
+msgstr "Rheolydd Ffurfweddu TDE"
+
+#: kded/tdebuildsycoca.cpp:753
+msgid "Do you want to reload TDE configuration?"
+msgstr "Ydych eisiau ail-lwytho ffurfweddiad TDE?"
+
+#: kded/tdebuildsycoca.cpp:753
+#, fuzzy
+msgid "Do Not Reload"
+msgstr "&Peidiwch â Chadw"
+
+#: kded/tdebuildsycoca.cpp:953
+#, fuzzy
+msgid "[tdebuildsycoca] Configuration information reloaded successfully."
+msgstr "Wedi ail-lwytho'r ffurfweddiad yn llwyddiannus."
+
+#: kded/kded.cpp:737
+msgid "Check Sycoca database only once"
+msgstr "Gwirio cronfa ddata Sycoca unwaith yn unig"
+
+#: kded/kded.cpp:877
+msgid "TDE Daemon"
+msgstr "Ellyll TDE"
+
+#: kded/kded.cpp:879
+msgid "TDE Daemon - triggers Sycoca database updates when needed"
+msgstr "Ellyll TDE - yn diweddaru cronfa ddata Sycoca pan bo angen"
+
+#: tdeparts/part.cpp:492
+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?"
+
+#: tdeparts/part.cpp:494
+msgid "Close Document"
+msgstr "Cau Dogfen"
+
+#: tdeparts/browserextension.cpp:485
+msgid "<qt>Do you want to search the Internet for <b>%1</b>?"
+msgstr "<qt>Ydych eisiau chwilio'r Rhyngrwyd am <b>%1</b>?"
+
+#: tdeparts/browserextension.cpp:486
+msgid "Internet Search"
+msgstr "Chwiliad Rhyngrwyd"
+
+#: tdeparts/browserextension.cpp:486
+msgid "&Search"
+msgstr " &Chwilio"
+
+#: tdeparts/browserrun.cpp:275
+msgid "Do you really want to execute '%1'? "
+msgstr "Ydych wir eisiau gweithredu '%1'?"
+
+#: tdeparts/browserrun.cpp:276
+msgid "Execute File?"
+msgstr "Gweithredu Ffeil?"
+
+#: tdeparts/browserrun.cpp:276
+msgid "Execute"
+msgstr "Gweithredu"
+
+#: tdeparts/browserrun.cpp:294
+msgid ""
+"Open '%2'?\n"
+"Type: %1"
+msgstr ""
+"Agor '%2'?\n"
+"Math: %1"
+
+#: tdeparts/browserrun.cpp:296
+msgid ""
+"Open '%3'?\n"
+"Name: %2\n"
+"Type: %1"
+msgstr ""
+"Agor '%3'?\n"
+"Enw: %2\n"
+"Math: %1"
+
+#: tdeparts/browserrun.cpp:310
+msgid "&Open with '%1'"
+msgstr "A&gor efo '%1'"
+
+#: tdeparts/browserrun.cpp:311
+msgid "&Open With..."
+msgstr "&Agor Gyda..."
+
+#: tdeparts/browserrun.cpp:353
+msgid "&Open"
+msgstr "&Agor"
+
+#: tdestyles/web/plugin.cpp:9
+msgid "Web style plugin"
+msgstr "Ategyn arddull wê"
+
+#: tdestyles/utils/installtheme/main.cpp:35
+msgid "TDE Tool to build a cache list of all pixmap themes installed"
+msgstr "Erfyn TDE i adeiladu rhestr gelc o bob thema picsfap a arsefydlwyd"
+
+#: tdestyles/utils/installtheme/main.cpp:40
+msgid "KInstalltheme"
+msgstr "KInstalltheme"
+
+#: tdestyles/klegacy/plugin.cpp:28
+#, fuzzy
+msgid "KDE LegacyStyle plugin"
+msgstr "Ategyn arddull TDE Etifeddol"
+
+#: tdenewstuff/provider.cpp:261
+#, fuzzy
+msgid "Error parsing category list."
+msgstr "Gwall wrth ddosrannu'r rhestr o ddarparwyr."
+
+#: tdenewstuff/provider.cpp:394
+msgid "Error parsing providers list."
+msgstr "Gwall wrth ddosrannu'r rhestr o ddarparwyr."
+
+#: tdenewstuff/knewstuff.cpp:38 tdenewstuff/knewstuffbutton.cpp:61
+#, c-format
+msgid "Download New %1"
+msgstr "Lawrlwytho %1 Newydd"
+
+#: tdenewstuff/providerdialog.cpp:53
+msgid "Hot New Stuff Providers"
+msgstr "Darparwyr y Diweddaraf"
+
+#: tdenewstuff/providerdialog.cpp:61
+msgid "Please select one of the providers listed below:"
+msgstr "Dewiswch un o'r darparwyr o'r rhestr isod:"
+
+#: tdenewstuff/providerdialog.cpp:88
+msgid "No provider selected."
+msgstr "Nid oes darparwr wedi ei dewis."
+
+#: tdenewstuff/knewstuffgeneric.cpp:139
+#, fuzzy
+msgid "The file '%1' already exists. Do you want to overwrite it?"
+msgstr "Mae'r ffeil '%1' mewn bod eisoes.  Ydych eisiau ysgrifennu drosto?"
+
+#: tdenewstuff/ghns.cpp:50
+msgid "Get hot new stuff:"
+msgstr "Nôl y diweddaraf:"
+
+#: tdenewstuff/knewstuffsecure.cpp:83
+msgid ""
+"There was an error with the downloaded resource tarball file. Possible causes "
+"are damaged archive or invalid directory structure in the archive."
+msgstr ""
+
+#: tdenewstuff/knewstuffsecure.cpp:83
+#, fuzzy
+msgid "Resource Installation Error"
+msgstr "Dewis Adnoddau"
+
+#: tdenewstuff/knewstuffsecure.cpp:94
+msgid "No keys were found."
+msgstr ""
+
+#: tdenewstuff/knewstuffsecure.cpp:99
+msgid "The validation failed for unknown reason."
+msgstr ""
+
+#: tdenewstuff/knewstuffsecure.cpp:106
+msgid "The MD5SUM check failed, the archive might be broken."
+msgstr ""
+
+#: tdenewstuff/knewstuffsecure.cpp:111
+msgid "The signature is bad, the archive might be broken or altered."
+msgstr ""
+
+#: tdenewstuff/knewstuffsecure.cpp:121
+msgid "The signature is valid, but untrusted."
+msgstr ""
+
+#: tdenewstuff/knewstuffsecure.cpp:127
+msgid "The signature is unknown."
+msgstr ""
+
+#: tdenewstuff/knewstuffsecure.cpp:131
+msgid ""
+"The resource was signed with key <i>0x%1</i>, belonging to <i>%2 &lt;%3&gt;</i>"
+"."
+msgstr ""
+
+#: tdenewstuff/knewstuffsecure.cpp:137
+msgid ""
+"<qt>There is a problem with the resource file you have downloaded. The errors "
+"are :<b>%1</b>"
+"<br>%2"
+"<br>"
+"<br>Installation of the resource is <b>not recommended</b>."
+"<br>"
+"<br>Do you want to proceed with the installation?</qt>"
+msgstr ""
+
+#: tdenewstuff/knewstuffsecure.cpp:137
+msgid "Problematic Resource File"
+msgstr ""
+
+#: tdenewstuff/knewstuffsecure.cpp:140
+msgid "<qt>%1<br><br>Press OK to install it.</qt>"
+msgstr ""
+
+#: tdenewstuff/knewstuffsecure.cpp:140
+#, fuzzy
+msgid "Valid Resource"
+msgstr "Adnoddau"
+
+#: tdenewstuff/knewstuffsecure.cpp:190
+msgid "The signing failed for unknown reason."
+msgstr ""
+
+#: tdenewstuff/knewstuffsecure.cpp:195
+msgid ""
+"There are no keys usable for signing or you did not entered the correct "
+"passphrase.\n"
+"Proceed without signing the resource?"
+msgstr ""
+
+#: tdenewstuff/tdehotnewstuff.cpp:31
+msgid "Display only media of this type"
+msgstr "Arddangos cyfryngau o'r math yma yn unig"
+
+#: tdenewstuff/tdehotnewstuff.cpp:32
+msgid "Provider list to use"
+msgstr "Rhestr darparwyr i'w defnyddio"
+
+#: tdenewstuff/security.cpp:63
+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 ""
+
+#: tdenewstuff/security.cpp:177
+msgid ""
+"<qt>Enter passphrase for key <b>0x%1</b>, belonging to"
+"<br><i>%2&lt;%3&gt;</i>:</qt>"
+msgstr ""
+
+#: tdenewstuff/security.cpp:257
+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 ""
+
+#: tdenewstuff/security.cpp:317
+#, fuzzy
+msgid "Select Signing Key"
+msgstr "Dewis Ardal Delwedd"
+
+#: tdenewstuff/security.cpp:317
+msgid "Key used for signing:"
+msgstr ""
+
+#: tdenewstuff/security.cpp:338
+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 ""
+
+#: tdenewstuff/uploaddialog.cpp:47
+msgid "Share Hot New Stuff"
+msgstr "Rhannu y Diweddaraf"
+
+#: tdenewstuff/uploaddialog.cpp:63
+msgid "Author:"
+msgstr "Awdur:"
+
+#: tdenewstuff/uploaddialog.cpp:68
+#, fuzzy
+msgid "Email:"
+msgstr "Ebost"
+
+#: tdenewstuff/uploaddialog.cpp:78
+msgid "Release:"
+msgstr "Rhyddhâd:"
+
+#: tdenewstuff/uploaddialog.cpp:84
+msgid "License:"
+msgstr "Trwydded:"
+
+#: tdenewstuff/uploaddialog.cpp:88
+msgid "GPL"
+msgstr "GPL"
+
+#: tdenewstuff/uploaddialog.cpp:89
+msgid "LGPL"
+msgstr "LGPL"
+
+#: tdenewstuff/uploaddialog.cpp:90
+msgid "BSD"
+msgstr "BSD"
+
+#: tdenewstuff/uploaddialog.cpp:93
+msgid "Language:"
+msgstr "Iaith:"
+
+#: tdenewstuff/uploaddialog.cpp:99
+msgid "Preview URL:"
+msgstr "URL Rhagolwg:"
+
+#: tdenewstuff/uploaddialog.cpp:104
+msgid "Summary:"
+msgstr "Crynodeb:"
+
+#: tdenewstuff/uploaddialog.cpp:121
+msgid "Please put in a name."
+msgstr "Rhowch enw, os gwelwch yn dda."
+
+#: tdenewstuff/uploaddialog.cpp:191
+msgid "Old upload information found, fill out fields?"
+msgstr "Canfuwyd hen wybodaeth lanlwytho, llenwi'r meyseydd?"
+
+#: tdenewstuff/uploaddialog.cpp:191
+msgid "Fill Out"
+msgstr ""
+
+#: tdenewstuff/uploaddialog.cpp:191
+msgid "Do Not Fill Out"
+msgstr ""
+
+#: tdenewstuff/engine.cpp:219
+msgid "Successfully installed hot new stuff."
+msgstr "Wedi arsefydlu'r diweddaraf yn llwyddiannus."
+
+#: tdenewstuff/engine.cpp:224
+msgid "Failed to install hot new stuff."
+msgstr "Wedi methu arsefydlu'r diweddaraf yn llwyddiannus."
+
+#: tdenewstuff/engine.cpp:279
+msgid "Unable to create file to upload."
+msgstr "Wedi methu creu ffeil i lanlwytho."
+
+#: tdenewstuff/engine.cpp:294
+msgid ""
+"The files to be uploaded have been created at:\n"
+msgstr ""
+"Mae'r ffeiliau i lanlwytho wedi eu creu wrth:\n"
+
+#: tdenewstuff/engine.cpp:295
+msgid ""
+"Data file: %1\n"
+msgstr ""
+"Ffeil ddata: %1\n"
+
+#: tdenewstuff/engine.cpp:297
+msgid ""
+"Preview image: %1\n"
+msgstr ""
+"Rhagolygu delwedd: %1\n"
+
+#: tdenewstuff/engine.cpp:299
+msgid ""
+"Content information: %1\n"
+msgstr ""
+"Gwybodaeth gynnwys: %1\n"
+
+#: tdenewstuff/engine.cpp:300
+msgid ""
+"Those files can now be uploaded.\n"
+msgstr ""
+"Gellir lanlwytho'r ffeiliau yma rwan.\n"
+
+#: tdenewstuff/engine.cpp:301
+msgid "Beware that any people might have access to them at any time."
+msgstr "Sylwer: gall unrhyw berson eu cyrchu wrth unrhyw amser."
+
+#: tdenewstuff/engine.cpp:303
+msgid "Upload Files"
+msgstr "Lanlwytho Ffeiliau"
+
+#: tdenewstuff/engine.cpp:308
+msgid "Please upload the files manually."
+msgstr "Lanlwythwch y ffeiliau â llaw, os gwelwch yn dda."
+
+#: tdenewstuff/engine.cpp:312
+msgid "Upload Info"
+msgstr "Gwybodaeth Lanlwytho"
+
+#: tdenewstuff/engine.cpp:320
+msgid "&Upload"
+msgstr "&Lanlwytho"
+
+#: tdenewstuff/engine.cpp:422
+msgid "Successfully uploaded new stuff."
+msgstr "Wedi lanlwytho'r diweddaraf yn llyddiannus."
+
+#: tdenewstuff/knewstuffbutton.cpp:49
+msgid "Download New Stuff"
+msgstr "Lawrlwytho y Diweddaraf"
+
+#: tdenewstuff/downloaddialog.cpp:106 tdenewstuff/downloaddialog.cpp:113
+#: tdenewstuff/downloaddialog.cpp:129 tdenewstuff/downloaddialog.cpp:136
+msgid "Get Hot New Stuff"
+msgstr "Nôl y Diweddaraf"
+
+#: tdenewstuff/downloaddialog.cpp:151
+msgid "Welcome"
+msgstr "Croeso"
+
+#: tdenewstuff/downloaddialog.cpp:153
+msgid "Loading data providers..."
+msgstr ""
+
+#: tdenewstuff/downloaddialog.cpp:212
+msgid "Loading data listings..."
+msgstr ""
+
+#: tdenewstuff/downloaddialog.cpp:270
+msgid "Highest Rated"
+msgstr "Ystyriedir y Gorau"
+
+#: tdenewstuff/downloaddialog.cpp:271
+msgid "Most Downloads"
+msgstr "Lawrlwythir yn Amlaf"
+
+#: tdenewstuff/downloaddialog.cpp:272
+msgid "Latest"
+msgstr "Diweddaraf"
+
+#: tdenewstuff/downloaddialog.cpp:283
+msgid "Rating"
+msgstr "Poblogrwydd"
+
+#: tdenewstuff/downloaddialog.cpp:289
+msgid "Downloads"
+msgstr "Lawrlwythiadau"
+
+#: tdenewstuff/downloaddialog.cpp:295
+msgid "Release Date"
+msgstr "Dyddiad Rhyddháu"
+
+#: tdenewstuff/downloaddialog.cpp:305
+msgid "Install"
+msgstr "Arsefydlu"
+
+#: tdenewstuff/downloaddialog.cpp:516
+msgid ""
+"Name: %1\n"
+"Author: %2\n"
+"License: %3\n"
+"Version: %4\n"
+"Release: %5\n"
+"Rating: %6\n"
+"Downloads: %7\n"
+"Release date: %8\n"
+"Summary: %9\n"
+msgstr ""
+"Enw: %1\n"
+"Awdur: %2\n"
+"Trwydded: %3\n"
+"Fersiwn: %4\n"
+"Rhyddhâd: %5\n"
+"Poblogrwydd: %6\n"
+"Lawrlwythiadau: %7\n"
+"Dyddiad rhyddháu: %8\n"
+"Crynodeb: %9\n"
+
+#: tdenewstuff/downloaddialog.cpp:538
+msgid ""
+"Preview: %1\n"
+"Payload: %2\n"
+msgstr ""
+"Rhagolwg: %1\n"
+"Prif lwyth: %2\n"
+
+#: tdenewstuff/downloaddialog.cpp:718
+msgid "Installation successful."
+msgstr "Llwyddodd yr arsefydlu."
+
+#: tdenewstuff/downloaddialog.cpp:718 tdenewstuff/downloaddialog.cpp:720
+msgid "Installation"
+msgstr "Arsefydlu"
+
+#: tdenewstuff/downloaddialog.cpp:720
+msgid "Installation failed."
+msgstr "Methodd yr arsefydlu."
+
+#: tdenewstuff/downloaddialog.cpp:814
+#, fuzzy
+msgid "Preview not available."
+msgstr ""
+"Dim cydweddiad ar gael.\n"
+
+#: tdespell2/ui/configdialog.cpp:38
+msgid "KSpell2 Configuration"
+msgstr "Ffurfweddiad KSpell2"
+
 #: kab/addressbook.cc:168
 msgid "Headline"
 msgstr "Pennawd"
@@ -9108,6 +10620,99 @@ msgstr "Dyddiadau"
 msgid "Your new entry could not be added."
 msgstr "Methu ychwanegu eich cofnod newydd."
 
+#: tdewallet/backend/tdewalletbackend.cc:258
+#, fuzzy
+msgid "Already open."
+msgstr "Agorwyd y ffeil."
+
+#: tdewallet/backend/tdewalletbackend.cc:260
+msgid "Error opening file."
+msgstr "Gwall tra'n agor y ffeil."
+
+#: tdewallet/backend/tdewalletbackend.cc:262
+#, fuzzy
+msgid "Not a wallet file."
+msgstr "Dim mwy o hidlau ar gael"
+
+#: tdewallet/backend/tdewalletbackend.cc:264
+#, fuzzy
+msgid "Unsupported file format revision."
+msgstr "Ni chynhelir y gweithrediad."
+
+#: tdewallet/backend/tdewalletbackend.cc:266
+#, fuzzy
+msgid "Unknown encryption scheme."
+msgstr "Dewis anhysbys '%1'."
+
+#: tdewallet/backend/tdewalletbackend.cc:268
+#, fuzzy
+msgid "Corrupt file?"
+msgstr "Ffeil &allbwn:"
+
+#: tdewallet/backend/tdewalletbackend.cc:270
+msgid "Error validating wallet integrity. Possibly corrupted."
+msgstr ""
+
+#: tdewallet/backend/tdewalletbackend.cc:274
+msgid "Read error - possibly incorrect password."
+msgstr ""
+
+#: tdewallet/backend/tdewalletbackend.cc:276
+#, fuzzy
+msgid "Decryption error."
+msgstr "Disgrifiad"
+
+#: tderandr/libtderandr.cc:703
+#, fuzzy
+msgid "Setting gamma failed."
+msgstr "Methodd y cadw."
+
+#: tderandr/libtderandr.cc:708
+msgid "XRandR encountered a problem"
+msgstr ""
+
+#: tderandr/libtderandr.cc:1224
+msgid "%1:%2"
+msgstr ""
+
+#: tderandr/libtderandr.cc:1225
+msgid "%1. %2 output on %3"
+msgstr ""
+
+#: tderandr/libtderandr.cc:1231
+msgid "%1. %2 on %3 on card %4"
+msgstr ""
+
+#: tderandr/libtderandr.cc:1281 tderandr/libtderandr.cc:1285
+msgid "%1 x %2"
+msgstr ""
+
+#: tderandr/libtderandr.cc:1400
+#, fuzzy
+msgid "disconnected"
+msgstr "cysylltiedig yn lleol"
+
+#: tderandr/libtderandr.cc:1406 tderandr/libtderandr.cc:1448
+msgid "N/A"
+msgstr ""
+
+#: tderandr/libtderandr.cc:1441
+msgid "Default output on generic video card"
+msgstr ""
+
+#: tdehtml/tdehtml_settings.cc:152
+msgid "Accept"
+msgstr "Derbyn"
+
+#: tdehtml/tdehtml_settings.cc:153
+msgid "Reject"
+msgstr "Gwrthod"
+
+#: tdehtml/tdehtml_settings.cc:779
+#, fuzzy
+msgid "Filter error"
+msgstr "Gwall Ffeil"
+
 #: arts/kde/kconverttest.cc:23 arts/kde/kiotest.cc:17
 #: arts/kde/kiotestslow.cc:83
 msgid "URL to open"
@@ -9174,7 +10779,8 @@ msgstr "Dibynnydd:"
 msgid "Import &All"
 msgstr "Mewnforio &Popeth"
 
-#: tdecert/tdecertpart.cc:183 tdecert/tdecertpart.cc:274 tdecert/tdecertpart.cc:359
+#: tdecert/tdecertpart.cc:183 tdecert/tdecertpart.cc:274
+#: tdecert/tdecertpart.cc:359
 msgid "TDE Secure Certificate Import"
 msgstr "Mewnforio Tystysgrif Ddiogel TDE"
 
@@ -9258,10 +10864,12 @@ msgstr "&Wedi'i orffen"
 msgid "Save failed."
 msgstr "Methodd y cadw."
 
-#: tdecert/tdecertpart.cc:418 tdecert/tdecertpart.cc:440 tdecert/tdecertpart.cc:455
-#: tdecert/tdecertpart.cc:460 tdecert/tdecertpart.cc:496 tdecert/tdecertpart.cc:532
-#: tdecert/tdecertpart.cc:566 tdecert/tdecertpart.cc:600 tdecert/tdecertpart.cc:730
-#: tdecert/tdecertpart.cc:741 tdecert/tdecertpart.cc:746 tdecert/tdecertpart.cc:759
+#: tdecert/tdecertpart.cc:418 tdecert/tdecertpart.cc:440
+#: tdecert/tdecertpart.cc:455 tdecert/tdecertpart.cc:460
+#: tdecert/tdecertpart.cc:496 tdecert/tdecertpart.cc:532
+#: tdecert/tdecertpart.cc:566 tdecert/tdecertpart.cc:600
+#: tdecert/tdecertpart.cc:730 tdecert/tdecertpart.cc:741
+#: tdecert/tdecertpart.cc:746 tdecert/tdecertpart.cc:759
 #: tdecert/tdecertpart.cc:873
 msgid "Certificate Import"
 msgstr "Mewnforio Tystysgrif"
@@ -9329,61 +10937,6 @@ msgstr ""
 msgid "TDE Certificate Part"
 msgstr "Rhan Tystysgrif TDE"
 
-#: tdehtml/tdehtml_settings.cc:152
-msgid "Accept"
-msgstr "Derbyn"
-
-#: tdehtml/tdehtml_settings.cc:153
-msgid "Reject"
-msgstr "Gwrthod"
-
-#: tdehtml/tdehtml_settings.cc:779
-#, fuzzy
-msgid "Filter error"
-msgstr "Gwall Ffeil"
-
-#: tdewallet/backend/tdewalletbackend.cc:258
-#, fuzzy
-msgid "Already open."
-msgstr "Agorwyd y ffeil."
-
-#: tdewallet/backend/tdewalletbackend.cc:260
-msgid "Error opening file."
-msgstr "Gwall tra'n agor y ffeil."
-
-#: tdewallet/backend/tdewalletbackend.cc:262
-#, fuzzy
-msgid "Not a wallet file."
-msgstr "Dim mwy o hidlau ar gael"
-
-#: tdewallet/backend/tdewalletbackend.cc:264
-#, fuzzy
-msgid "Unsupported file format revision."
-msgstr "Ni chynhelir y gweithrediad."
-
-#: tdewallet/backend/tdewalletbackend.cc:266
-#, fuzzy
-msgid "Unknown encryption scheme."
-msgstr "Dewis anhysbys '%1'."
-
-#: tdewallet/backend/tdewalletbackend.cc:268
-#, fuzzy
-msgid "Corrupt file?"
-msgstr "Ffeil &allbwn:"
-
-#: tdewallet/backend/tdewalletbackend.cc:270
-msgid "Error validating wallet integrity. Possibly corrupted."
-msgstr ""
-
-#: tdewallet/backend/tdewalletbackend.cc:274
-msgid "Read error - possibly incorrect password."
-msgstr ""
-
-#: tdewallet/backend/tdewalletbackend.cc:276
-#, fuzzy
-msgid "Decryption error."
-msgstr "Disgrifiad"
-
 #: tdeui/kstdaction_p.h:40
 msgid "&New"
 msgstr "&Newydd"
@@ -9557,115 +11110,115 @@ msgstr ""
 msgid "Prefix to install resource files to"
 msgstr ""
 
-#: tdecore/tde-config.cpp.in:168
+#: tdecore/tde-config.cpp.in:169
 msgid "Applications menu (.desktop files)"
 msgstr ""
 
-#: tdecore/tde-config.cpp.in:169
+#: tdecore/tde-config.cpp.in:170
 msgid "CGIs to run from kdehelp"
 msgstr ""
 
-#: tdecore/tde-config.cpp.in:170
+#: tdecore/tde-config.cpp.in:171
 #, fuzzy
 msgid "Configuration files"
 msgstr "Ffurfwedd"
 
-#: tdecore/tde-config.cpp.in:171
+#: tdecore/tde-config.cpp.in:172
 #, fuzzy
 msgid "Where applications store data"
 msgstr "Peidio â nodi cymwysiadau i'w diweddaru"
 
-#: tdecore/tde-config.cpp.in:172
+#: tdecore/tde-config.cpp.in:173
 msgid "Executables in $prefix/bin"
 msgstr ""
 
-#: tdecore/tde-config.cpp.in:173
+#: tdecore/tde-config.cpp.in:174
 #, fuzzy
 msgid "HTML documentation"
 msgstr "Gosodiadau HTML"
 
-#: tdecore/tde-config.cpp.in:174
+#: tdecore/tde-config.cpp.in:175
 msgid "Icons"
 msgstr "Eiconau"
 
-#: tdecore/tde-config.cpp.in:175
+#: tdecore/tde-config.cpp.in:176
 #, fuzzy
 msgid "Configuration description files"
 msgstr "Ffeil ddewisiadau am greu côd"
 
-#: tdecore/tde-config.cpp.in:176
+#: tdecore/tde-config.cpp.in:177
 msgid "Libraries"
 msgstr ""
 
-#: tdecore/tde-config.cpp.in:177
+#: tdecore/tde-config.cpp.in:178
 msgid "Includes/Headers"
 msgstr ""
 
-#: tdecore/tde-config.cpp.in:178
+#: tdecore/tde-config.cpp.in:179
 msgid "Translation files for TDELocale"
 msgstr ""
 
-#: tdecore/tde-config.cpp.in:179
+#: tdecore/tde-config.cpp.in:180
 msgid "Mime types"
 msgstr ""
 
-#: tdecore/tde-config.cpp.in:180
+#: tdecore/tde-config.cpp.in:181
 msgid "Loadable modules"
 msgstr ""
 
-#: tdecore/tde-config.cpp.in:181
+#: tdecore/tde-config.cpp.in:182
 #, fuzzy
 msgid "Qt plugins"
 msgstr "Ategyn arddull wê"
 
-#: tdecore/tde-config.cpp.in:182
+#: tdecore/tde-config.cpp.in:183
 msgid "Services"
 msgstr "Gwasanaethau"
 
-#: tdecore/tde-config.cpp.in:183
+#: tdecore/tde-config.cpp.in:184
 msgid "Service types"
 msgstr ""
 
-#: tdecore/tde-config.cpp.in:184
+#: tdecore/tde-config.cpp.in:185
 #, fuzzy
 msgid "Application sounds"
 msgstr "Cymhwysiad:"
 
-#: tdecore/tde-config.cpp.in:185
+#: tdecore/tde-config.cpp.in:186
 msgid "Templates"
 msgstr "Patrymluniau"
 
-#: tdecore/tde-config.cpp.in:186
+#: tdecore/tde-config.cpp.in:187
 msgid "Wallpapers"
 msgstr "Papurau Wal"
 
-#: tdecore/tde-config.cpp.in:187
+#: tdecore/tde-config.cpp.in:188
 msgid "XDG Application menu (.desktop files)"
 msgstr ""
 
-#: tdecore/tde-config.cpp.in:188
+#: tdecore/tde-config.cpp.in:189
 msgid "XDG Menu descriptions (.directory files)"
 msgstr ""
 
-#: tdecore/tde-config.cpp.in:189
+#: tdecore/tde-config.cpp.in:190
 msgid "XDG Menu layout (.menu files)"
 msgstr ""
 
-#: tdecore/tde-config.cpp.in:190
+#: tdecore/tde-config.cpp.in:191
 msgid "Temporary files (specific for both current host and current user)"
 msgstr ""
 
-#: tdecore/tde-config.cpp.in:191
+#: tdecore/tde-config.cpp.in:192
 msgid "UNIX Sockets (specific for both current host and current user)"
 msgstr ""
 
-#: tdecore/tde-config.cpp.in:203
+#: tdecore/tde-config.cpp.in:204
 #, fuzzy
 msgid ""
 "%1 - unknown type\n"
 msgstr "Math anhysbys"
 
-#: tdecore/tde-config.cpp.in:228
+#: tdecore/tde-config.cpp.in:229
 msgid ""
 "%1 - unknown type of userpath\n"
 msgstr ""
@@ -11066,6 +12619,34 @@ msgid ""
 "error in the text declaration of an external entity"
 msgstr " gwall yn y datganiad testun o endid allanol "
 
+#, fuzzy
+#~ msgid "The <b>K Desktop Environment</b> is written and maintained by the TDE Team, a world-wide network of software engineers committed to <a href=\"http://www.gnu.org/philosophy/free-sw.html\">Free Software</a> development.<br><br>No single group, company or organization controls the TDE source code. Everyone is welcome to contribute to TDE.<br><br>Visit <A HREF=\"http://www.kde.org/\">http://www.kde.org</A> for more information on the TDE project. "
+#~ msgstr "Ysgrifennwyd a chynhelir yr <b>Amgylchedd Penbwrdd K</b>  gan y tîm TDE, rhydwaith fyd-eang o peiriannwyr meddalwedd wedi ymrwymo i ddatblygiad meddalwedd rhydd. <br><br>Ni reolir y côd gwreiddiol TDE gan unrhyw un grŵp, cwmni neu corff. Mae croeso i bawb cyfrannu i TDE.<br><br>Ewch i <A HREF=\"http://www.kde.org/\">http://www.kde.org</A>am fwy o fanylion am y cywaith TDE."
+
+#~ msgid "&Report Bugs or Wishes"
+#~ msgstr "&Adrodd Namau neu Dymuniadau"
+
+#~ msgid ""
+#~ "To submit a bug report, click on the button below.\n"
+#~ "This will open a web browser window on http://bugs.kde.org where you will find a form to fill in.\n"
+#~ "The information displayed above will be transferred to that server."
+#~ msgstr ""
+#~ " I gyflwyno adroddiad nam, cliciwch ar y botwm isod.\n"
+#~ " Bydd hyn yn agor ffenest porydd ar http://bugs.kde.org\n"
+#~ " lle welwch ffurflen i'w llenwi.\n"
+#~ " Trosglwyddir y wybodaeth a arddangosir uchod i'r gweinydd hwnnw."
+
+#~ msgid "&Report Bug..."
+#~ msgstr "&Adroddi nam"
+
+#, fuzzy
+#~ msgid "Konqueror has the ability to store the password in an encrypted wallet. When the wallet is unlocked, it can then automatically restore the login information next time you submit this form. Do you want to store the information now?"
+#~ msgstr "Gall Konqueror cadw'r cyfrinair mewn waled wedi'i gêl-ysgrifennu.  Pan dadgloir y waled, gall adfer y wybodaeth fewngofnodi y tro nesaf yr ewch i'r wefan yma.  Ydych eisiau cadw'r wybodaeth rwan?"
+
+#, fuzzy
+#~ msgid "Konqueror has the ability to store the password in an encrypted wallet. When the wallet is unlocked, it can then automatically restore the login information next time you visit %1. Do you want to store the information now?"
+#~ msgstr "Gall Konqueror cadw'r cyfrinair mewn waled wedi'i gêl-ysgrifennu.  Pan dadgloir y waled, gall adfer y wybodaeth fewngofnodi y tro nesaf yr ewch i'r wefan yma.  Ydych eisiau cadw'r wybodaeth rwan?"
+
 #~ msgid "Address"
 #~ msgstr "Cyfeiriad"
 
@@ -11107,10 +12688,6 @@ msgstr " gwall yn y datganiad testun o endid allanol "
 #~ msgid "Please report bugs to <a href=\"mailto:%1\">%2</a>, do not mail the authors directly.\n"
 #~ msgstr "Defnyddiwch <a href=\"mailto:%1\">%1</a> er mwyn adrodd namau; peidiwch ac anfon ebost i'r awduron yn uniongyrchol.\n"
 
-#, fuzzy
-#~ msgid "Do Not Close"
-#~ msgstr "&Peidiwch â Chadw"
-
 #~ msgid "Test Address LineEdit"
 #~ msgstr "Arbrofi Golygu Llinell y Cyfeiriad"
 
diff --git a/tde-i18n-cy/messages/tdelibs/tdelibs_colors.po b/tde-i18n-cy/messages/tdelibs/tdelibs_colors.po
index 900f813642e..a7a49ff321d 100644
--- a/tde-i18n-cy/messages/tdelibs/tdelibs_colors.po
+++ b/tde-i18n-cy/messages/tdelibs/tdelibs_colors.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdelibs_colors\n"
-"POT-Creation-Date: 2005-05-18 21:23+0200\n"
+"POT-Creation-Date: 2014-09-29 00:46-0500\n"
 "PO-Revision-Date: 2004-09-06 10:40+0100\n"
 "Last-Translator: Kyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdelibs/tdeprint.po b/tde-i18n-cy/messages/tdelibs/tdeprint.po
index fa6c9ea174e..39a33a26426 100644
--- a/tde-i18n-cy/messages/tdelibs/tdeprint.po
+++ b/tde-i18n-cy/messages/tdelibs/tdeprint.po
@@ -15,470 +15,28 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeprint\n"
-"POT-Creation-Date: 2007-08-27 01:12+0200\n"
+"POT-Creation-Date: 2014-09-29 00:46-0500\n"
 "PO-Revision-Date: 2004-08-19 09:54+0100\n"
 "Last-Translator: Kyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.2\n"
 "\n"
 
-#: ext/kextprinterimpl.cpp:47
-msgid "Empty print command."
-msgstr "Mae'r gorchymyn argraffu yn wag."
-
-#: ext/kmextmanager.cpp:41
-msgid "PS_printer"
-msgstr "Argraffydd_PS"
-
-#: ext/kmextmanager.cpp:43
-msgid "PostScript file generator"
-msgstr "Creuydd ffeil PostScript"
-
-#: kpgeneralpage.cpp:88 lpd/lpdtools.cpp:28
-msgid "Ledger"
-msgstr "Llyfr cyfrifon "
-
-#: kpgeneralpage.cpp:87 lpd/lpdtools.cpp:29
-msgid "US Legal"
-msgstr "Cyfreithiol UD"
-
-#: kpgeneralpage.cpp:86 lpd/lpdtools.cpp:30
-msgid "US Letter"
-msgstr "Llythyren UD"
-
-#: lpd/lpdtools.cpp:31
-msgid "A4"
-msgstr "A4"
-
-#: lpd/lpdtools.cpp:32
-msgid "A3"
-msgstr "A3"
-
-#: lpd/lpdtools.cpp:33
-msgid "B4"
-msgstr "A4"
-
-#: lpd/lpdtools.cpp:34
-msgid "B5"
-msgstr "B5"
-
-#: kpgeneralpage.cpp:416 lpd/lpdtools.cpp:39 lpr/editentrydialog.cpp:50
-msgid "Enabled"
-msgstr "Alluogir"
-
-#: kpgeneralpage.cpp:415 lpd/lpdtools.cpp:40 management/kmconfiggeneral.cpp:52
-msgid "Disabled"
-msgstr "Analluogir"
-
-#: lpd/lpdtools.cpp:233
-msgid "GhostScript settings"
-msgstr "Gosodiadau GhostScript"
-
-#: lpd/lpdtools.cpp:239 management/kmpropdriver.cpp:53
-#: management/kmwend.cpp:104
-msgid "Driver"
-msgstr "Gyrrydd"
-
-#: lpd/lpdtools.cpp:254
-msgid "Resolution"
-msgstr "Cydraniad"
-
-#: lpd/lpdtools.cpp:277
-msgid "Color depth"
-msgstr "Dyfnder lliw"
-
-#: lpd/lpdtools.cpp:301
-msgid "Additional GS options"
-msgstr "Dewisiadau GS ychwanegol"
-
-#: driver.cpp:377 kpgeneralpage.cpp:260 lpd/lpdtools.cpp:307
-#: management/kmconfiggeneral.cpp:44 management/kmpropgeneral.cpp:54
-#: management/kmwend.cpp:49
-msgid "General"
-msgstr "Cyffredinol"
-
-#: lpd/lpdtools.cpp:313
-msgid "Page size"
-msgstr "Maint papur"
-
-#: lpd/lpdtools.cpp:329
-msgid "Pages per sheet"
-msgstr "Tudalennau ar y ddalen"
-
-#: lpd/lpdtools.cpp:345
-msgid "Left/right margin (1/72 in)"
-msgstr "Ymyl chwith/de (1/72 in)"
-
-#: lpd/lpdtools.cpp:350
-msgid "Top/bottom margin (1/72 in)"
-msgstr "Ymyl pen/gwaelod (1/72 in)"
-
-#: lpd/lpdtools.cpp:356
-msgid "Text options"
-msgstr "Dewisiadau testun"
-
-#: lpd/lpdtools.cpp:362
-msgid "Send EOF after job to eject page"
-msgstr "Anfon EOF ar ôl y sywdd i all-daflu'r dudalen"
-
-#: lpd/lpdtools.cpp:370
-msgid "Fix stair-stepping text"
-msgstr "Trwsio testun ffurf grisiau"
-
-#: lpd/lpdtools.cpp:382
-msgid "Fast text printing (non-PS printers only)"
-msgstr "Argraffu testun cyflym (dim ond argraffyddion di-PS)"
-
-#: lpd/klpdprinterimpl.cpp:46 rlpr/krlprprinterimpl.cpp:53
-msgid ""
-"The <b>%1</b> executable could not be found in your path. Check your "
-"installation."
-msgstr ""
-"Methu canfod y gweithredadwyn <b>%1</b> yn eich llwybr. Gwiriwch eich gosodiad."
-
-#: lpd/kmlpduimanager.cpp:44
-msgid "Local printer (parallel, serial, USB)"
-msgstr "Argraffydd lleol (paralel, cyfresol, USB)"
-
-#: lpd/kmlpduimanager.cpp:45 management/kmpropbackend.cpp:68
-#: rlpr/kmwrlpr.cpp:116
-msgid "Remote LPD queue"
-msgstr "Ciw LPD pell"
-
-#: lpd/kmlpduimanager.cpp:46
-msgid "SMB shared printer (Windows)"
-msgstr "Argraffydd cyfrannol SMB (Windows)"
-
-#: lpd/kmlpduimanager.cpp:47
-msgid "Network printer (TCP)"
-msgstr "Argraffydd rhwydwaith (TCP)"
-
-#: lpd/kmlpduimanager.cpp:48
-msgid "File printer (print to file)"
-msgstr "Argraffydd ffeil (argraffu i ffeil)"
-
-#: lpd/kmlpdmanager.cpp:87
-msgid "Local printer queue (%1)"
-msgstr "Ciw argraffydd lleol (%1)"
-
-#: lpd/kmlpdmanager.cpp:87
-msgid ""
-"_: Unknown type of local printer queue\n"
-"Unknown"
-msgstr "Anhysbys"
-
-#: lpd/kmlpdmanager.cpp:88
-msgid "<Not available>"
-msgstr "<Dim ar gael>"
-
-#: lpd/kmlpdmanager.cpp:89
-msgid ""
-"_: Unknown Driver\n"
-"Unknown"
-msgstr "Anhysbys"
-
-#: lpd/kmlpdmanager.cpp:95
-msgid "Remote LPD queue %1@%2"
-msgstr "Ciw LPD pell %1@%2"
-
-#: lpd/kmlpdmanager.cpp:158
-msgid "Unable to create spool directory %1 for printer %2."
-msgstr "Methu creu cyfeiriadur sbwlio %1 i argraffydd %2."
-
-#: lpd/kmlpdmanager.cpp:165
-msgid "Unable to save information for printer <b>%1</b>."
-msgstr "Methu cadw gwybodaeth i argraffydd <b>%1</b>."
-
-#: lpd/kmlpdmanager.cpp:193
-msgid ""
-"Unable to set correct permissions on spool directory %1 for printer <b>%2</b>."
-msgstr ""
-"Methu gosod caniatadau cywir ar y cyfeiriadur sbwlio %1 am argraffydd <b>%2</b>"
-"."
-
-#: lpd/kmlpdmanager.cpp:237
-msgid "Permission denied: you must be root."
-msgstr "Gwrthodwyd caniatà d: rhaid i chi fod yn wraidd."
-
-#: lpd/kmlpdmanager.cpp:244
-msgid "Unable to execute command \"%1\"."
-msgstr "Methu gweithredu gorchymyn \"%1\"."
-
-#: lpd/kmlpdmanager.cpp:317
-msgid "Unable to write printcap file."
-msgstr "Methu ysgrifennu i'r ffeil printcap."
-
-#: lpd/kmlpdmanager.cpp:372
-msgid "Couldn't find driver <b>%1</b> in printtool database."
-msgstr "Methu canfod gyrrydd <b>%1</b> yn y cronfa ddata printtool."
-
-#: lpd/kmlpdmanager.cpp:411
-msgid "Couldn't find printer <b>%1</b> in printcap file."
-msgstr "Methu canfod argraffydd <b>%1</b> yn y ffeil printcap."
-
-#: lpd/kmlpdmanager.cpp:440
-msgid "No driver found (raw printer)"
-msgstr "Ni chanfuwyd gyrrydd (argraffydd crau)"
-
-#: lpd/kmlpdmanager.cpp:442
-msgid "Printer type not recognized."
-msgstr "Ni adnabyddwyd math yr argraffydd."
-
-#: lpd/kmlpdmanager.cpp:452
-msgid ""
-"The driver device <b>%1</b> is not compiled in your GhostScript distribution. "
-"Check your installation or use another driver."
-msgstr ""
-"Nid yw'r dyfais gyrrydd <b>%1</b> wedi ei grynhoi yn eich gosodiad GhostScript. "
-" Gwiriwch eich gosodiad neu defnyddiwch gyrrydd arall."
-
-#: lpd/kmlpdmanager.cpp:560
-msgid "Unable to write driver associated files in spool directory."
-msgstr ""
-"Methu ysgrifennu ffeiliau sy'n ymwneud â'r gyrrydd yn y cyfeiriadur sbwlio."
-
-#: lpr/apshandler.cpp:68
-msgid "APS Driver (%1)"
-msgstr "Gyrrydd APS (%1)"
-
-#: lpr/apshandler.cpp:112 lpr/lprhandler.cpp:74 lpr/lprngtoolhandler.cpp:72
-msgid "Network printer (%1)"
-msgstr "Argraffydd rhwydwaith (%1)"
-
-#: lpr/apshandler.cpp:215 lpr/lprhandler.cpp:127 lpr/lprngtoolhandler.cpp:276
-#: lpr/matichandler.cpp:421
-#, c-format
-msgid "Unsupported backend: %1."
-msgstr "Ôl-wyneb ni chynhelir: %1."
-
-#: lpr/apshandler.cpp:221
-#, c-format
-msgid "Unable to create directory %1."
-msgstr "Methru creu cyfeiriadur %1."
-
-#: lpr/apshandler.cpp:241
-#, c-format
-msgid "Missing element: %1."
-msgstr "Elfen ar goll: %1. "
-
-#: lpr/apshandler.cpp:258 lpr/apshandler.cpp:289 lpr/lprngtoolhandler.cpp:323
-#, c-format
-msgid "Invalid printer backend specification: %1"
-msgstr "Penodiaeth ol-wyneb annilys i'r argraffydd: %1"
-
-#: lpr/apshandler.cpp:264 lpr/apshandler.cpp:295 lpr/apshandler.cpp:367
-#, c-format
-msgid "Unable to create the file %1."
-msgstr "Methu creu'r ffeil %1."
-
-#: lpr/apshandler.cpp:322
-msgid "The APS driver is not defined."
-msgstr "Ni ddiffinir y gyrrydd APS."
-
-#: lpr/apshandler.cpp:380
-#, c-format
-msgid "Unable to remove directory %1."
-msgstr "Methu gwaredu cyfeiriadur %1."
-
-#: lpr/lprhandler.cpp:59 lpr/lprhandler.cpp:97
-msgid "Unknown (unrecognized entry)"
-msgstr "Anhysbys (cofnod anadnabyddus)"
-
-#: lpr/lprhandler.cpp:67 lpr/lprhandler.cpp:91
-msgid "Remote queue (%1) on %2"
-msgstr "Ciw pell (%1) ar %2"
-
-#: lpr/lprhandler.cpp:81 lpr/matichandler.cpp:86
-#, c-format
-msgid "Local printer on %1"
-msgstr "Argraffydd lleol ar %1"
-
-#: lpr/lprhandler.cpp:104 lpr/lprhandler.cpp:110 lpr/lprhandler.cpp:116
-msgid "Unrecognized entry."
-msgstr "Cofnod anadnabyddus. "
-
-#: lpr/kmlprmanager.cpp:289
-msgid "The printcap file is a remote file (NIS). It cannot be written."
-msgstr "Mae'r ffeil printcap yn ffeil pell (NIS).  Ni ellir ei ysgrifennu."
-
-#: lpr/kmlprmanager.cpp:305
-msgid ""
-"Unable to save printcap file. Check that you have write permissions for that "
-"file."
-msgstr ""
-"Methu cadw'r ffeil printcap. Gwiriwch fod ganddoch ganiatadau ysgrifennu am y "
-"ffeil yna."
-
-#: lpr/kmlprmanager.cpp:330
-msgid "Internal error: no handler defined."
-msgstr "Gwall mewnol: ni ddiffinir trinydd."
-
-#: lpr/kmlprmanager.cpp:344
-msgid "Couldn't determine spool directory. See options dialog."
-msgstr "Methu pennu cyfeiriadur sbwlio.    Gweler yr ymgom dewisiadau."
-
-#: lpr/kmlprmanager.cpp:350
-msgid ""
-"Unable to create the spool directory %1. Check that you have the required "
-"permissions for that operation."
-msgstr ""
-"Methu creu'r cyfeiriadur sbwlio %1. Gwiriwch fod ganddoch ganiatadau gofynnol "
-"i'r gweithrediad yna."
-
-#: lpr/kmlprmanager.cpp:382
-#, c-format
-msgid ""
-"The printer has been created but the print daemon could not be restarted. %1"
-msgstr "Creuwyd yr argraffydd, on ni ellid ail-gychwyn y daemon argraffu.  %1"
-
-#: lpr/kmlprmanager.cpp:410
-msgid ""
-"Unable to remove spool directory %1. Check that you have write permissions for "
-"that directory."
-msgstr ""
-"Methu gwaredu'r cyfeiriadur sbwlyn %1. Gwiriwch fod ganddoch ganiatadau "
-"ysgrifennu i'r cyfeiriadur yna. "
-
-#: lpr/kmlprmanager.cpp:458
-msgid "&Edit printcap Entry..."
-msgstr "&Golygu Cofnod printcap..."
-
-#: lpr/kmlprmanager.cpp:473
-msgid ""
-"Editing a printcap entry manually should only be done by confirmed system "
-"administrator. This may prevent your printer from working. Do you want to "
-"continue?"
-msgstr ""
-"Dylai golygu cofnod printcap â llaw gael ei wneud gan neb ond gwasanaethwr "
-"cysawd dawnus.  Gall hyn rwystro eich argraffydd rhag weithio.  Ydych eisiau "
-"mynd ymlaen?"
-
-#: lpr/kmlprmanager.cpp:489
-#, c-format
-msgid "Spooler type: %1"
-msgstr "Math y sbwlydd: %1"
-
-#: lpr/kmlprjobmanager.cpp:83
-msgid "Unsupported operation."
-msgstr "Ni chynhelir y gweithrediad."
-
-#: lpr/kmconfiglpr.cpp:33 lpr/kmconfiglpr.cpp:37
-msgid "Spooler"
-msgstr "Sbwlydd"
-
-#: lpr/kmconfiglpr.cpp:34
-msgid "Spooler Settings"
-msgstr "Gosodiadau Sbwlydd"
-
-#: lpr/lpchelper.cpp:235 lpr/lpchelper.cpp:273 lpr/lpchelper.cpp:291
-#: lpr/lpchelper.cpp:314
-msgid "The executable %1 couldn't be found in your PATH."
-msgstr "Methu canfod y gweithredadwyn %1 yn eich PATH."
-
-#: lpr/lpchelper.cpp:256 lpr/lpchelper.cpp:280 lpr/lpchelper.cpp:298
-msgid "Permission denied."
-msgstr "Atalwyd caniatad. "
-
-#: lpr/lpchelper.cpp:259
-msgid "Printer %1 does not exist."
-msgstr "Nid yw argraffydd %1 mewn bod."
-
-#: lpr/lpchelper.cpp:263
-#, c-format
-msgid "Unknown error: %1"
-msgstr "Gwall anhysbys: %1"
-
-#: lpr/lpchelper.cpp:282
-#, c-format
-msgid "Execution of lprm failed: %1"
-msgstr "Methodd gweithrediad lprm: %1"
-
-#: lpr/lprngtoolhandler.cpp:99
-msgid "IFHP Driver (%1)"
-msgstr "Gyrrydd IFHP (%1)"
-
-#: lpr/lprngtoolhandler.cpp:99 lpr/lprngtoolhandler.cpp:170
-msgid "unknown"
-msgstr "anhysbys"
-
-#: lpr/lprngtoolhandler.cpp:162
-msgid "No driver defined for that printer. It might be a raw printer."
-msgstr ""
-"Ni ddiffinir gyrrydd i'r argraffydd yna.  Efallai mae'n argraffydd crai."
-
-#: lpr/lprngtoolhandler.cpp:170
-msgid "LPRngTool Common Driver (%1)"
-msgstr "Gyrrydd Cyffredinol LPRngTool (%1)"
-
-#: lpr/matichandler.cpp:82
-msgid "Network printer"
-msgstr "Argraffydd rhwydwaith"
-
-#: lpr/matichandler.cpp:245
-msgid "Internal error."
-msgstr "Gwall mewnol. "
-
-#: cups/kmcupsmanager.cpp:583 lpr/matichandler.cpp:254
-#: lpr/matichandler.cpp:358
-msgid ""
-"Unable to find the executable foomatic-datafile in your PATH. Check that "
-"Foomatic is correctly installed."
-msgstr ""
-"Methu canfod y gweithredadwyn foomatic-datafile yn eich PATH.  Gwiriwch fod "
-"Foomatic wedi ei osod yn gywir."
-
-#: cups/kmcupsmanager.cpp:615 lpr/matichandler.cpp:286
-#: lpr/matichandler.cpp:405
-msgid ""
-"Unable to create the Foomatic driver [%1,%2]. Either that driver does not "
-"exist, or you don't have the required permissions to perform that operation."
-msgstr ""
-"Methu creu y gyrrydd Foomatic [%1,%2].  Ai nid yw'r gyrrydd yna mewn bod, neu "
-"nid oes ganddoch y caniatadau gofynnol i  gyflawni'r gweithrediad yna.  "
-
-#: lpr/matichandler.cpp:339
-msgid ""
-"You probably don't have the required permissions to perform that operation."
-msgstr ""
-"Mwy na thebyg nid oes ganddoch y caniatadau gofynnol i gyflawni'r weithrediad "
-"yna."
-
-#: lpr/matichandler.cpp:426
-msgid ""
-"Unable to find executable lpdomatic. Check that Foomatic is correctly installed "
-"and that lpdomatic is installed in a standard location."
+#: ppdloader.cpp:173
+msgid "(line %1): "
 msgstr ""
-"Methu canfod y gweithredadwyn lpdomatic.  Gwiriwch fod Ffoomatic wedi'i osod yn "
-"iawn, a bod lpdomatic wedi'i osod mewn lleoliad safonol."
-
-#: lpr/matichandler.cpp:457
-#, c-format
-msgid "Unable to remove driver file %1."
-msgstr "Methu gwaredu ffeil gyrrydd %1."
-
-#: lpr/editentrydialog.cpp:40
-msgid "Aliases:"
-msgstr "Arallenwau:"
 
-#: lpr/editentrydialog.cpp:46 management/kxmlcommanddlg.cpp:107
-msgid "String"
-msgstr "Llinell"
-
-#: lpr/editentrydialog.cpp:47
-msgid "Number"
-msgstr "Rhif"
-
-#: lpr/editentrydialog.cpp:48 management/kxmlcommanddlg.cpp:111
-msgid "Boolean"
-msgstr "Boolaidd"
+#: marginpreview.cpp:135
+msgid "No preview available"
+msgstr "Dim rhagolwg ar gael"
 
-#: lpr/editentrydialog.cpp:72
-#, c-format
-msgid "Printcap Entry: %1"
-msgstr "Cofnod Printcap: %1"
+#: kmfactory.cpp:221
+msgid "<qt>There was an error loading %1. The diagnostic is:<p>%2</p></qt>"
+msgstr "<qt>Gwall wrth lwytho %1.  Y  ddeiagnostig yw:<p>%2</p></qt>"
 
 #: kprintdialog.cpp:97
 #, fuzzy
@@ -632,7 +190,7 @@ msgid ""
 "<p>This button starts a new dialog where you can adjust various settings of "
 "your printing system. Amongst them: "
 "<ul>"
-"<li> Should TDE applications embed all fonts into the PostScript they generate "
+"<li> Should \tDE applications embed all fonts into the PostScript they generate "
 "for printing? "
 "<li> Should TDE use an external PostScript viewer like <em>gv</em> "
 "for print page previews? "
@@ -769,7 +327,7 @@ msgid ""
 "is disabled.) </qt>"
 msgstr ""
 
-#: kprintdialog.cpp:265 management/kmmainview.cpp:290 management/kmwend.cpp:90
+#: kprintdialog.cpp:265 management/kmmainview.cpp:289 management/kmwend.cpp:90
 #: management/smbview.cpp:43
 msgid "Printer"
 msgstr "Argraffydd"
@@ -883,526 +441,307 @@ msgstr "Argraffu i Ffeil"
 msgid "All Files"
 msgstr "Pob Ffeil"
 
-#: cups/kpschedulepage.cpp:40
-msgid ""
-" <qt> "
-"<p><b>Print Job Billing and Accounting</b></p>  "
-"<p>Insert a meaningful string here to associate the current print job with a "
-"certain account. This string will appear in the CUPS \"page_log\" to help with "
-"the print accounting in your organization. (Leave it empty if you do not need "
-"it.) "
-"<p> It is useful for people who print on behalf of different \"customers\", "
-"like print service bureaux, letter shops, press and prepress companies, or "
-"secretaries who serve different bosses, etc.</p> "
-"<br>  "
-"<hr>  "
-"<p><em><b>Additional hint for power users:</b> This TDEPrint GUI element "
-"matches  with the CUPS commandline job option parameter:</em>  "
-"<pre>    -o job-billing=...         # example: \"Marketing_Department\" or "
-"\"Joe_Doe\"  </pre> </p>  </qt>"
-msgstr ""
-
-#: cups/kpschedulepage.cpp:60
-msgid ""
-" <qt> "
-"<p><b>Scheduled Printing</b></p>  "
-"<p>Scheduled printing lets you control the time of the actual printout, while "
-"you can still send away your job <b>now</b> and have it out of your way. "
-"<p> Especially useful is the \"Never (hold indefinitely)\" option. It allows "
-"you to park your job until a time when you (or a printer administrator) decides "
-"to manually release it. "
-"<p> This is often required in enterprise environments, where you normally are "
-"not allowed to directly and immediately access the huge production printers in "
-"your <em>Central Repro Department</em>. However it is okay to send jobs to the "
-"queue which is under the control of the operators (who, after all, need to make "
-"sure that the 10,000 sheets of pink paper which is required by the Marketing "
-"Department for a particular job are available and loaded into the paper "
-"trays).</p> "
-"<br>  "
-"<hr>  "
-"<p><em><b>Additional hint for power users:</b> This TDEPrint GUI element "
-"matches  with the CUPS commandline job option parameter:</em>  "
-"<pre>    -o job-hold-until=...      # example: \"indefinite\" or \"no-hold\"  "
-"</pre> </p>  </qt>"
-msgstr ""
-
-#: cups/kpschedulepage.cpp:87
-#, fuzzy
-msgid ""
-" <qt> "
-"<p><b>Page Labels</b></p>  "
-"<p>Page Labels are printed by CUPS at the top and bottom of each page. They "
-"appear on the pages surrounded by a little frame box. "
-"<p>They contain any string you type into the line edit field.</p> "
-"<br>  "
-"<hr>  "
-"<p><em><b>Additional hint for power users:</b> This TDEPrint GUI element "
-"matches  with the CUPS commandline job option parameter:</em>  "
-"<pre>    -o page-label=\"...\"      # example: \"Company Confidential\"  </pre> "
-"</p>  </qt>"
-msgstr ""
-" <qt> "
-"<p>Argraffir Labeli Tudalennau gan CUPS wrth ben a gwaelod pob tudalen.  Maent "
-"yn ymddangos ar y tudalennau wedi'u amgylchynnu gan blwch bach ffrâm."
-"<p>Maent yn cynnwys unrhyw llinell yr ydych yn teipio i mewn i'r faes golygu am "
-"y llinell.</qt>"
-
-#: cups/kpschedulepage.cpp:102
-msgid ""
-" <qt> "
-"<p><b>Job Priority</b></p>  "
-"<p>Usually CUPS prints all jobs per queue according to the \"FIFO\" principle: "
-"<em>First In, First Out</em>. "
-"<p> The job priority option allows you to re-order the queue according to your "
-"needs. "
-"<p> It works in both directions: you can increase as well as decrease "
-"priorities. (Usually you can only control your <b>own</b> jobs). "
-"<p> Since the default job priority is \"50\", any job sent with, for example, "
-"\"49\" will be printed only after all those others have finished. Conversely, a "
-"\"51\" or higher priority job will go right to the top of a populated queue (if "
-"no other, higher prioritized one is present).</p> "
-"<br>  "
-"<hr>  "
-"<p><em><b>Additional hint for power users:</b> This TDEPrint GUI element "
-"matches  with the CUPS commandline job option parameter:</em>  "
-"<pre>    -o job-priority=...   # example: \"10\" or \"66\" or \"99\"  </pre> "
-"</p>  </qt>"
-msgstr ""
-
-#: cups/kpschedulepage.cpp:126
-msgid "Advanced Options"
-msgstr "Dewisiadau Uwch"
-
-#: cups/kpschedulepage.cpp:137
-msgid "Immediately"
-msgstr "Syth bin"
-
-#: cups/kpschedulepage.cpp:138
-msgid "Never (hold indefinitely)"
-msgstr "Byth (cadw am gyfnod amhenodol)"
-
-#: cups/kpschedulepage.cpp:139
-msgid "Daytime (6 am - 6 pm)"
-msgstr "Amser dydd (6am-6pm)"
-
-#: cups/kpschedulepage.cpp:140
-msgid "Evening (6 pm - 6 am)"
-msgstr "Hwyrnos (6pm-6am)"
-
-#: cups/kpschedulepage.cpp:141
-msgid "Night (6 pm - 6 am)"
-msgstr "Nos (6pm-6am)"
-
-#: cups/kpschedulepage.cpp:142
-msgid "Weekend"
-msgstr "Penwythnos"
-
-#: cups/kpschedulepage.cpp:143
-msgid "Second Shift (4 pm - 12 am)"
-msgstr "Ail Gyfnod (4pm-12am)"
-
-#: cups/kpschedulepage.cpp:144
-msgid "Third Shift (12 am - 8 am)"
-msgstr "Trydydd Cyfnod (12am-8am)"
-
-#: cups/kpschedulepage.cpp:145
-msgid "Specified Time"
-msgstr "Amser Penodol"
-
-#: cups/kpschedulepage.cpp:160
-#, fuzzy
-msgid "&Scheduled printing:"
-msgstr "&Trefnlennu argraffu:"
-
-#: cups/kpschedulepage.cpp:163
-msgid "&Billing information:"
-msgstr "&Gwybodaeth anfonebau:"
-
-#: cups/kpschedulepage.cpp:166
-msgid "T&op/Bottom page label:"
-msgstr "Label &Pen/Gwaelod y dudalen"
-
-#: cups/kpschedulepage.cpp:169
-msgid "&Job priority:"
-msgstr "&Blaenoriaeth y Swydd"
-
-#: cups/kpschedulepage.cpp:200
-msgid "The time specified is not valid."
-msgstr "Mae'r amser a phenodwyd yn annilys."
-
-#: cups/kmwbanners.cpp:57
-msgid "No Banner"
-msgstr "Dim Baner"
-
-#: cups/kmwbanners.cpp:58
-msgid "Classified"
-msgstr "Dosbarthedig"
-
-#: cups/kmwbanners.cpp:59
-msgid "Confidential"
-msgstr "Cyfrinachol"
-
-#: cups/kmwbanners.cpp:60
-msgid "Secret"
-msgstr "Cyfrinachol"
+#: kprintprocess.cpp:75
+msgid "File transfer failed."
+msgstr "Methu trosglwyddo'r ffeil."
 
-#: cups/kmwbanners.cpp:61
-msgid "Standard"
-msgstr "Safonol"
+#: kprintprocess.cpp:81
+msgid "Abnormal process termination (<b>%1</b>)."
+msgstr "Terfyniad proses anarferol  (<b>%1</b>)."
 
-#: cups/kmwbanners.cpp:62
-msgid "Top Secret"
-msgstr "Cyfrinachol Iawn"
+#: kprintprocess.cpp:83
+msgid "<b>%1</b>: execution failed with message:<p>%2</p>"
+msgstr "<b>%1</b>: methodd gweithrediad efo'r neges:<p>%2</p>"
 
-#: cups/kmwbanners.cpp:63
-msgid "Unclassified"
-msgstr "Annosbarthedig"
+#: lpr/kmlprjobmanager.cpp:83
+msgid "Unsupported operation."
+msgstr "Ni chynhelir y gweithrediad."
 
-#: cups/kmwbanners.cpp:86
-msgid "Banner Selection"
-msgstr "Dewis y Baner"
+#: lpr/kmconfiglpr.cpp:33 lpr/kmconfiglpr.cpp:37
+msgid "Spooler"
+msgstr "Sbwlydd"
 
-#: cups/kmpropbanners.cpp:35 cups/kmwbanners.cpp:92
-msgid "&Starting banner:"
-msgstr "Baner &dechrau:"
+#: lpr/kmconfiglpr.cpp:34
+msgid "Spooler Settings"
+msgstr "Gosodiadau Sbwlydd"
 
-#: cups/kmpropbanners.cpp:36 cups/kmwbanners.cpp:93
-msgid "&Ending banner:"
-msgstr "Baner d&iweddu:"
+#: lpr/kmlprmanager.cpp:289
+msgid "The printcap file is a remote file (NIS). It cannot be written."
+msgstr "Mae'r ffeil printcap yn ffeil pell (NIS).  Ni ellir ei ysgrifennu."
 
-#: cups/kmwbanners.cpp:99
+#: lpr/kmlprmanager.cpp:305
 msgid ""
-"<p>Select the default banners associated with this printer. These banners will "
-"be inserted before and/or after each print job sent to the printer. If you "
-"don't want to use banners, select <b>No Banner</b>.</p>"
+"Unable to save printcap file. Check that you have write permissions for that "
+"file."
 msgstr ""
-"<p>Dewis y baneri rhagosodedig sy'n mynd efo'r argraffydd yma.  Bydd y baneri "
-"yma yn cael eu mewnosod cyn/ar ol pob swydd argraffu sy'n cael ei anfon i'r "
-"argraffydd.  Os nid ydych eisiau defnyddio baneri, dewiswch <b>Dim</b>.</p>"
-
-#: cups/cupsaddsmb2.cpp:55 cups/cupsaddsmb2.cpp:363
-msgid "&Export"
-msgstr "Allf&orio"
-
-#: cups/cupsaddsmb2.cpp:61
-msgid "Export Printer Driver to Windows Clients"
-msgstr "Allforio'r gyrrydd argraffydd i ddibynyddion Windows"
-
-#: cups/cupsaddsmb2.cpp:72
-msgid "&Username:"
-msgstr "&Enw Defnyddiwr:"
+"Methu cadw'r ffeil printcap. Gwiriwch fod ganddoch ganiatadau ysgrifennu am y "
+"ffeil yna."
 
-#: cups/cupsaddsmb2.cpp:73
-msgid "&Samba server:"
-msgstr "Gweinydd &Samba:"
+#: lpr/kmlprmanager.cpp:330
+msgid "Internal error: no handler defined."
+msgstr "Gwall mewnol: ni ddiffinir trinydd."
 
-#: cups/cupsaddsmb2.cpp:74 management/kmwpassword.cpp:50
-msgid "&Password:"
-msgstr "&Cyfrinair"
+#: lpr/kmlprmanager.cpp:344
+msgid "Couldn't determine spool directory. See options dialog."
+msgstr "Methu pennu cyfeiriadur sbwlio.    Gweler yr ymgom dewisiadau."
 
-#: cups/cupsaddsmb2.cpp:79
+#: lpr/kmlprmanager.cpp:350
 msgid ""
-"<p><b>Samba server</b></p>Adobe Windows PostScript driver files plus the CUPS "
-"printer PPD will be exported to the <tt>[print$]</tt> "
-"special share of the Samba server (to change the source CUPS server, use the "
-"<nobr><i>Configure Manager -> CUPS server</i></nobr> first). The <tt>"
-"[print$]</tt> share must exist on the Samba side prior to clicking the <b>"
-"Export</b> button below."
+"Unable to create the spool directory %1. Check that you have the required "
+"permissions for that operation."
 msgstr ""
-"<p><b>Gweinydd Samba</b></p>Bydd ffeiliau gyrrydd Adobe Windows PostScript a "
-"PPD i'r argraffydd CUPS yn cael eu allforio i'r rhanniad arbennig <tt>"
-"[print$]</tt> o'r gweinydd Samba (i newid y gweinydd tarddiad CUPS, defnyddiwch "
-"<nobr><i>Rheoli Gosodiadau -> gweinydd CUPS </i></nobr> "
-"yn gyntaf). Rhaid i'r rhanniad <tt>[print$]</tt> fodoli ar yr ochr Samba cyn i "
-"chi glicio ar  y botwm <b>Allforio</b> isod."
+"Methu creu'r cyfeiriadur sbwlio %1. Gwiriwch fod ganddoch ganiatadau gofynnol "
+"i'r gweithrediad yna."
 
-#: cups/cupsaddsmb2.cpp:88
-#, fuzzy
+#: lpr/kmlprmanager.cpp:382
+#, c-format
 msgid ""
-"<p><b>Samba username</b></p>User needs to have write access to the <tt>"
-"[print$]</tt> share on the Samba server. <tt>[print$]</tt> "
-"holds printer drivers prepared for download to Windows clients. This dialog "
-"does not work for Samba servers configured with <tt>security = share</tt> "
-"(but works fine with <tt>security = user</tt>)."
-msgstr ""
-"<p><b>Defnydd-enw Samba</b></p>Rhaid i'r defnyddiwr cael cyrchu y rhanniad <tt>"
-"[print$]</tt> ar y gweinydd Samba.  Mae <tt>[print$]</tt> "
-"yn cynnwys gyryddion argraffydd sydd wedi'u paratoi i lawrlwytho i ddibynyddion "
-"Windows.  Nid yw'r ymgom yma yn gweithio is weinyddion Samba sydd wedi'u "
-"ffurfweddu efo <tt>security = share</tt> (ond mae'n gweithio yn iawn efo <tt>"
-"security = user</tt>)."
+"The printer has been created but the print daemon could not be restarted. %1"
+msgstr "Creuwyd yr argraffydd, on ni ellid ail-gychwyn y daemon argraffu.  %1"
 
-#: cups/cupsaddsmb2.cpp:96
+#: lpr/kmlprmanager.cpp:410
 msgid ""
-"<p><b>Samba password</b></p>The Samba setting <tt>encrypt passwords = yes</tt> "
-"(default) requires prior use of <tt>smbpasswd -a [username]</tt> "
-"command, to create an encrypted Samba password and have Samba recognize it."
+"Unable to remove spool directory %1. Check that you have write permissions for "
+"that directory."
 msgstr ""
-"<p><b>Cyfrinair Samba </b></p>Mae'r gosodiad Samba <tt>"
-"encrypt passwords = yes</tt> (rhagosodedig) yn golygu bod rhaid i chi "
-"defnyddio'r gorchymyn <tt>smbpasswd -a [username]</tt> "
-"yn gyntaf, er mwyn creu cyfrinair amgryptiedig Samba a chaiff  ei adnabod gan "
-"Samba."
+"Methu gwaredu'r cyfeiriadur sbwlyn %1. Gwiriwch fod ganddoch ganiatadau "
+"ysgrifennu i'r cyfeiriadur yna. "
 
-#: cups/cupsaddsmb2.cpp:267
-#, c-format
-msgid "Creating folder %1"
-msgstr "Creu plygell %1"
+#: lpr/kmlprmanager.cpp:458
+msgid "&Edit printcap Entry..."
+msgstr "&Golygu Cofnod printcap..."
 
-#: cups/cupsaddsmb2.cpp:275
-#, c-format
-msgid "Uploading %1"
-msgstr "Llwytho %1"
+#: lpr/kmlprmanager.cpp:473
+msgid ""
+"Editing a printcap entry manually should only be done by confirmed system "
+"administrator. This may prevent your printer from working. Do you want to "
+"continue?"
+msgstr ""
+"Dylai golygu cofnod printcap â llaw gael ei wneud gan neb ond gwasanaethwr "
+"cysawd dawnus.  Gall hyn rwystro eich argraffydd rhag weithio.  Ydych eisiau "
+"mynd ymlaen?"
 
-#: cups/cupsaddsmb2.cpp:283
+#: lpr/kmlprmanager.cpp:489
 #, c-format
-msgid "Installing driver for %1"
-msgstr "Gosod gyrrydd i %1"
+msgid "Spooler type: %1"
+msgstr "Math y sbwlydd: %1"
 
-#: cups/cupsaddsmb2.cpp:291
+#: lpr/matichandler.cpp:82
+msgid "Network printer"
+msgstr "Argraffydd rhwydwaith"
+
+#: lpr/lprhandler.cpp:81 lpr/matichandler.cpp:86
 #, c-format
-msgid "Installing printer %1"
-msgstr "Gosod argraffydd %1"
+msgid "Local printer on %1"
+msgstr "Argraffydd lleol ar %1"
 
-#: cups/cupsaddsmb2.cpp:333
-msgid "Driver successfully exported."
-msgstr "Allforiwyd y gyrrydd yn llwyddiannus."
+#: lpr/matichandler.cpp:245
+msgid "Internal error."
+msgstr "Gwall mewnol. "
 
-#: cups/cupsaddsmb2.cpp:343
+#: cups/kmcupsmanager.cpp:634 lpr/matichandler.cpp:254
+#: lpr/matichandler.cpp:358
 msgid ""
-"Operation failed. Possible reasons are: permission denied or invalid Samba "
-"configuration (see <a href=\"man:/cupsaddsmb\">cupsaddsmb</a> "
-"manual page for detailed information, you need <a href=\"http://www.cups.org\">"
-"CUPS</a> version 1.1.11 or higher). You may want to try again with another "
-"login/password."
+"Unable to find the executable foomatic-datafile in your PATH. Check that "
+"Foomatic is correctly installed."
 msgstr ""
-"Methodd y gweithrediad.  Mae rhesymau posibl yn cynnwys: gwrthodwyd caniatà d, "
-"neu ffurfweddiad Samba annilys (gweler y dudalen llawlyfr <a "
-"href=\"man:/cupsaddsmb\">cupsaddsmb</a> am wybodaeth manwl - mae angen<a "
-"href=\"http://www.cups.org\">CUPS</a>   fersiwn 1.1.11 neu uwch).  Efallai y "
-"byddwch eisiau ceisio eto efo mewnosodiad/cyfrinair arall."
-
-#: cups/cupsaddsmb2.cpp:352
-msgid "Operation aborted (process killed)."
-msgstr "Terfynnwyd y gwithrediad (lladdwyd y proses). "
-
-#: cups/cupsaddsmb2.cpp:358
-#, fuzzy
-msgid "<h3>Operation failed.</h3><p>%1</p>"
-msgstr "<h3>Methodd y gweithrediad!</h3><p>%1</p>"
+"Methu canfod y gweithredadwyn foomatic-datafile yn eich PATH.  Gwiriwch fod "
+"Foomatic wedi ei osod yn gywir."
 
-#: cups/cupsaddsmb2.cpp:373
+#: cups/kmcupsmanager.cpp:666 lpr/matichandler.cpp:286
+#: lpr/matichandler.cpp:405
 msgid ""
-"You are about to prepare the <b>%1</b> driver to be shared out to Windows "
-"clients through Samba. This operation requires the <a "
-"href=\"http://www.adobe.com/products/printerdrivers/main.html\">"
-"Adobe PostScript Driver</a>, a recent version of Samba 2.2.x and a running SMB "
-"service on the target server. Click <b>Export</b> to start the operation. Read "
-"the <a href=\"man:/cupsaddsmb\">cupsaddsmb</a> manual page in Konqueror or type "
-"<tt>man cupsaddsmb</tt> in a console window to learn more about this "
-"functionality."
+"Unable to create the Foomatic driver [%1,%2]. Either that driver does not "
+"exist, or you don't have the required permissions to perform that operation."
 msgstr ""
-"Rydych ar fin paratoi y gyrrydd <b>%1</b> i gael ei rannu i ddibynyddion "
-"Windows drwy Samba.  Mae gan y gweithrediad yma angen y <a "
-"href=\"http://www.adobe.com/products/printerdrivers/main.html\">"
-"Adobe PostScript Driver</a>, fersiwn diweddar o Samba 2.2.x a gwasanaeth SMB "
-"wrthi'n rhedeg ar y gweinydd tarddiad.  Cliciwch <b>Allforio</b> "
-"i ddechrau'r gweithrediad.Darllenwch y dudalen llawlyfr <a "
-"href=\"man:/cupsaddsmb\">cupsaddsmb</a> yn Konqueror, neu teipiwch <tt>"
-"man cupsaddsmb</tt> mewn ffenest terfynnell i ddysgu mwy am y galluogrwydd hwn."
+"Methu creu y gyrrydd Foomatic [%1,%2].  Ai nid yw'r gyrrydd yna mewn bod, neu "
+"nid oes ganddoch y caniatadau gofynnol i  gyflawni'r gweithrediad yna.  "
 
-#: cups/cupsaddsmb2.cpp:393
+#: lpr/matichandler.cpp:339
 msgid ""
-"Some driver files are missing. You can get them on <a "
-"href=\"http://www.adobe.com\">Adobe</a> web site. See <a "
-"href=\"man:/cupsaddsmb\">cupsaddsmb</a> manual page for more details (you need "
-"<a href=\"http://www.cups.org\">CUPS</a> version 1.1.11 or higher)."
+"You probably don't have the required permissions to perform that operation."
 msgstr ""
-"Mae rhai ffeiliau gyrrydd ar goll.  Cewch afael arnynt ar y wefan <a "
-"href=\"http://www.adobe.com\">Adobe</a> Gweler y dudalen llawlyfr <a "
-"href=\"man:/cupsaddsmb\">cupsaddsmb</a> am fwy o fanylion (rhaid i chi gael <a "
-"href=\"http://www.cups.org\">CUPS</a> fersiwn 1.1.11 neu uwch)."
+"Mwy na thebyg nid oes ganddoch y caniatadau gofynnol i gyflawni'r weithrediad "
+"yna."
 
-#: cups/cupsaddsmb2.cpp:404
+#: lpr/apshandler.cpp:215 lpr/lprhandler.cpp:127 lpr/lprngtoolhandler.cpp:276
+#: lpr/matichandler.cpp:421
 #, c-format
-msgid "Preparing to upload driver to host %1"
-msgstr "Paratoi llwytho'r gyrrydd i westeiwr %1"
-
-#: cups/cupsaddsmb2.cpp:409 management/networkscanner.cpp:149
-msgid "&Abort"
-msgstr "&Terfynnu"
+msgid "Unsupported backend: %1."
+msgstr "Ôl-wyneb ni chynhelir: %1."
 
-#: cups/cupsaddsmb2.cpp:415
-msgid "The driver for printer <b>%1</b> could not be found."
-msgstr "Methu canfod y gyrrydd i argraffydd <b>%1</b>."
+#: lpr/matichandler.cpp:426
+msgid ""
+"Unable to find executable lpdomatic. Check that Foomatic is correctly installed "
+"and that lpdomatic is installed in a standard location."
+msgstr ""
+"Methu canfod y gweithredadwyn lpdomatic.  Gwiriwch fod Ffoomatic wedi'i osod yn "
+"iawn, a bod lpdomatic wedi'i osod mewn lleoliad safonol."
 
-#: cups/cupsaddsmb2.cpp:455
+#: lpr/matichandler.cpp:457
 #, c-format
-msgid "Preparing to install driver on host %1"
-msgstr "Paratoi gosod gyrrydd ar westeiwr %1"
-
-#: cups/kmwippselect.cpp:36
-msgid "Remote IPP Printer Selection"
-msgstr "Dewis Argraffydd IPP Pell"
-
-#: cups/kmwippselect.cpp:49
-#, fuzzy
-msgid "You must select a printer."
-msgstr "Rhaid i chi ddewis argraffydd!"
+msgid "Unable to remove driver file %1."
+msgstr "Methu gwaredu ffeil gyrrydd %1."
 
-#: cups/ipprequest.cpp:110
-msgid "You don't have access to the requested resource."
-msgstr "Nid oes ganddoch gyrchiad at yr adnodd oedd ceisiedig."
+#: lpr/editentrydialog.cpp:40
+msgid "Aliases:"
+msgstr "Arallenwau:"
 
-#: cups/ipprequest.cpp:113
-msgid "You are not authorized to access the requested resource."
-msgstr "Nid ydych wedi cael eich awdurdodi i gyrchu'r adnodd ceisiedig."
+#: lpr/editentrydialog.cpp:46 management/kxmlcommanddlg.cpp:107
+msgid "String"
+msgstr "Llinell"
 
-#: cups/ipprequest.cpp:116
-msgid "The requested operation cannot be completed."
-msgstr "Methu cwblhau'r gweithred geisiedig."
+#: lpr/editentrydialog.cpp:47
+msgid "Number"
+msgstr "Rhif"
 
-#: cups/ipprequest.cpp:119
-msgid "The requested service is currently unavailable."
-msgstr "Nid yw'r gwasanaeth ceisiedig ar gael ar hyn o bryd."
+#: lpr/editentrydialog.cpp:48 management/kxmlcommanddlg.cpp:111
+msgid "Boolean"
+msgstr "Boolaidd"
 
-#: cups/ipprequest.cpp:122
-msgid "The target printer is not accepting print jobs."
-msgstr "Ni dderbynnir swyddi argraffu gan yr argraffydd cyrchfan."
+#: kpgeneralpage.cpp:417 lpd/lpdtools.cpp:39 lpr/editentrydialog.cpp:50
+msgid "Enabled"
+msgstr "Alluogir"
 
-#: cups/ipprequest.cpp:233
-msgid ""
-"Connection to CUPS server failed. Check that the CUPS server is correctly "
-"installed and running."
-msgstr ""
-"Methodd y cysylltiad i'r gweinydd CUPS.  Gwiriwch fod y gweinydd CUPS wedi ei "
-"osod yn iawn, a rhedeg."
+#: lpr/editentrydialog.cpp:72
+#, c-format
+msgid "Printcap Entry: %1"
+msgstr "Cofnod Printcap: %1"
 
-#: cups/ipprequest.cpp:236
-msgid "The IPP request failed for an unknown reason."
-msgstr "Methodd y cais IPP am reswm anhysbys."
+#: lpr/lprhandler.cpp:59 lpr/lprhandler.cpp:97
+msgid "Unknown (unrecognized entry)"
+msgstr "Anhysbys (cofnod anadnabyddus)"
 
-#: cups/ipprequest.cpp:356
-msgid "Attribute"
-msgstr "Priodoleddau"
+#: lpr/lprhandler.cpp:67 lpr/lprhandler.cpp:91
+msgid "Remote queue (%1) on %2"
+msgstr "Ciw pell (%1) ar %2"
 
-#: cups/ipprequest.cpp:357
-msgid "Values"
-msgstr "Gwerthoedd"
+#: lpr/apshandler.cpp:112 lpr/lprhandler.cpp:74 lpr/lprngtoolhandler.cpp:72
+msgid "Network printer (%1)"
+msgstr "Argraffydd rhwydwaith (%1)"
 
-#: cups/ipprequest.cpp:388
-msgid "True"
-msgstr "Gwir"
+#: lpr/lprhandler.cpp:104 lpr/lprhandler.cpp:110 lpr/lprhandler.cpp:116
+msgid "Unrecognized entry."
+msgstr "Cofnod anadnabyddus. "
 
-#: cups/ipprequest.cpp:388
-msgid "False"
-msgstr "Ffug"
+#: lpr/lprngtoolhandler.cpp:99
+msgid "IFHP Driver (%1)"
+msgstr "Gyrrydd IFHP (%1)"
 
-#: cups/kmpropquota.cpp:39 cups/kmwquota.cpp:96
-msgid "&Period:"
-msgstr "&Cyfnod:"
+#: lpr/lprngtoolhandler.cpp:99 lpr/lprngtoolhandler.cpp:170
+msgid "unknown"
+msgstr "anhysbys"
 
-#: cups/kmpropquota.cpp:40 cups/kmwquota.cpp:97
-msgid "&Size limit (KB):"
-msgstr "&Terfyn maint (KB):"
+#: lpr/lprngtoolhandler.cpp:162
+msgid "No driver defined for that printer. It might be a raw printer."
+msgstr ""
+"Ni ddiffinir gyrrydd i'r argraffydd yna.  Efallai mae'n argraffydd crai."
 
-#: cups/kmpropquota.cpp:41 cups/kmwquota.cpp:98
-msgid "&Page limit:"
-msgstr "Terfyn tu&dalen:"
+#: lpr/lprngtoolhandler.cpp:170
+msgid "LPRngTool Common Driver (%1)"
+msgstr "Gyrrydd Cyffredinol LPRngTool (%1)"
 
-#: cups/kmpropquota.cpp:57
-msgid "Quotas"
-msgstr "Cwotau"
+#: lpr/apshandler.cpp:258 lpr/apshandler.cpp:289 lpr/lprngtoolhandler.cpp:323
+#, c-format
+msgid "Invalid printer backend specification: %1"
+msgstr "Penodiaeth ol-wyneb annilys i'r argraffydd: %1"
 
-#: cups/kmpropquota.cpp:58
-msgid "Quota Settings"
-msgstr "Gosodiadau Cwota"
+#: lpr/lpchelper.cpp:235 lpr/lpchelper.cpp:273 lpr/lpchelper.cpp:291
+#: lpr/lpchelper.cpp:314
+msgid "The executable %1 couldn't be found in your PATH."
+msgstr "Methu canfod y gweithredadwyn %1 yn eich PATH."
 
-#: cups/kmpropquota.cpp:78 cups/kmwquota.cpp:84
-msgid "No quota"
-msgstr "Dim cwota"
+#: lpr/lpchelper.cpp:256 lpr/lpchelper.cpp:280 lpr/lpchelper.cpp:298
+msgid "Permission denied."
+msgstr "Atalwyd caniatad. "
 
-#: cups/kmpropquota.cpp:79 cups/kmpropquota.cpp:80 cups/kmwquota.cpp:87
-#: cups/kmwquota.cpp:90
-msgid "None"
-msgstr "Dim"
+#: lpr/lpchelper.cpp:259
+msgid "Printer %1 does not exist."
+msgstr "Nid yw argraffydd %1 mewn bod."
 
-#: cups/kmwipp.cpp:35
-msgid "Remote IPP server"
-msgstr "Gweinydd IPP pell"
+#: lpr/lpchelper.cpp:263
+#, c-format
+msgid "Unknown error: %1"
+msgstr "Gwall anhysbys: %1"
 
-#: cups/kmwipp.cpp:39
-msgid ""
-"<p>Enter the information concerning the remote IPP server owning the targeted "
-"printer. This wizard will poll the server before continuing.</p>"
-msgstr ""
-"<p>Mewnosodwch y gwybodaeth ynghylch y gweinydd IPP pell sy'n biau'r argraffydd "
-"penodol.  Bydd y dewin yma yn ceisio'r gweinydd cyn fynd ymalen.</p>"
+#: lpr/lpchelper.cpp:282
+#, c-format
+msgid "Execution of lprm failed: %1"
+msgstr "Methodd gweithrediad lprm: %1"
 
-#: cups/kmwipp.cpp:42 management/kmwlpd.cpp:46 rlpr/kmproprlpr.cpp:34
-#: rlpr/kmwrlpr.cpp:62
-msgid "Host:"
-msgstr "Gwesteiwr:"
+#: lpr/apshandler.cpp:68
+msgid "APS Driver (%1)"
+msgstr "Gyrrydd APS (%1)"
 
-#: cups/kmwipp.cpp:43
-msgid "Port:"
-msgstr "Porth:"
+#: lpr/apshandler.cpp:221
+#, c-format
+msgid "Unable to create directory %1."
+msgstr "Methru creu cyfeiriadur %1."
 
-#: cups/kmwipp.cpp:52 management/kmwsmb.cpp:79
-msgid "Empty server name."
-msgstr "Mae enw'r gweinydd yn wag."
+#: lpr/apshandler.cpp:241
+#, c-format
+msgid "Missing element: %1."
+msgstr "Elfen ar goll: %1. "
 
-#: cups/kmwipp.cpp:59
-#, fuzzy
-msgid "Incorrect port number."
-msgstr "Mae'r rhif porth yn anghywir!"
+#: lpr/apshandler.cpp:264 lpr/apshandler.cpp:295 lpr/apshandler.cpp:367
+#, c-format
+msgid "Unable to create the file %1."
+msgstr "Methu creu'r ffeil %1."
 
-#: cups/kmwipp.cpp:72
-#, fuzzy
-msgid "<nobr>Unable to connect to <b>%1</b> on port <b>%2</b> .</nobr>"
-msgstr "<nobr>Methu cysylltu i  <b>%1</b> ar borth <b>%2</b> !</nobr>"
+#: lpr/apshandler.cpp:322
+msgid "The APS driver is not defined."
+msgstr "Ni ddiffinir y gyrrydd APS."
 
-#: cups/kmpropbanners.cpp:49 kpgeneralpage.cpp:297
-msgid "Banners"
-msgstr "Baneri"
+#: lpr/apshandler.cpp:380
+#, c-format
+msgid "Unable to remove directory %1."
+msgstr "Methu gwaredu cyfeiriadur %1."
 
-#: cups/kmpropbanners.cpp:50
-msgid "Banner Settings"
-msgstr "Gosodiadau'r Faner"
+#: kpdriverpage.cpp:30 management/kmpropdriver.cpp:54
+msgid "Driver Settings"
+msgstr "Gosodiadau Gyrrydd"
 
-#: cups/ippreportdlg.cpp:34
-msgid "IPP Report"
-msgstr "Adroddiad IPP"
+#: kpdriverpage.cpp:48
+#, fuzzy
+msgid ""
+"<qt>Some options selected are in conflict. You must resolve these conflicts "
+"before continuing. See <b>Driver Settings</b> tab for detailed information.</qt>"
+msgstr ""
+"<qt>Mae rhai dewisiadau yn gwrthdaro.  Rhaid i chi ddatrys y gwrthdaro yna cyn "
+"fynd ymlaen.  Gweler y tab <b>Uwch</b> am wybodaeth manwl.</qt>  "
 
-#: cups/ippreportdlg.cpp:93
-msgid "Internal error: unable to generate HTML report."
-msgstr "Gwall mewnol: methu creu adroddiad HTML."
+#: posterpreview.cpp:115
+#, fuzzy
+msgid ""
+"Poster preview not available. Either the <b>poster</b> "
+"executable is not properly installed, or you don't have the required version"
+msgstr ""
+"Nid yw'r rhagolwg poster ar gael.  Un ai nid yw'r gweithredadwyn <b>poster</b> "
+"wedi'i osod yn iawn, neu nid oes gennych y fersiwn priodol."
 
-#: cups/kmpropusers.cpp:39 cups/kmwusers.cpp:36
-msgid "Users Access Settings"
-msgstr "Gosodiadau Cyrchiad y Defnyddwyr"
+#: cups/kptextpage.cpp:195 kpmarginpage.cpp:42 kpmarginpage.cpp:45
+msgid "Margins"
+msgstr "Ymylon"
 
 #: cups/kmpropusers.cpp:38 cups/kmwusers.cpp:39
 msgid "Users"
 msgstr "Defnyddwyr"
 
-#: cups/kmwusers.cpp:41
-msgid "Allowed Users"
-msgstr "Defnyddwyr a Chaniateir"
+#: cups/kmpropusers.cpp:39 cups/kmwusers.cpp:36
+msgid "Users Access Settings"
+msgstr "Gosodiadau Cyrchiad y Defnyddwyr"
 
-#: cups/kmwusers.cpp:42
-msgid "Denied Users"
-msgstr "Defnyddwyr a Wrthodir"
+#: cups/kmpropusers.cpp:55
+msgid "Denied users"
+msgstr "Defnyddwyr a wrthodir"
 
-#: cups/kmwusers.cpp:44
-msgid "Define here a group of allowed/denied users for this printer."
-msgstr ""
-"Diffiniwch yma grwp o ddefnyddwyr a chaniateir neu a wrthodir am yr argraffydd "
-"yma."
+#: cups/kmpropusers.cpp:62
+msgid "Allowed users"
+msgstr "Defnyddwyr a chaniateir"
 
-#: cups/kmwusers.cpp:45 management/kxmlcommanddlg.cpp:117
-msgid "&Type:"
-msgstr "&Math:"
+#: cups/kmpropusers.cpp:76
+msgid "All users allowed"
+msgstr "Caniateir pob defnyddiwr"
 
 #: cups/kptextpage.cpp:41
 msgid ""
@@ -1457,7 +796,7 @@ msgid ""
 "<p>These settings control the appearance of text on printouts. They are only "
 "valid for  printing text files or input directly through kprinter. </p>  "
 "<p><b>Note:</b> These settings have no effect whatsoever for other input "
-"formats than  text, or for printing from applications such as the TDE Advanced "
+"formats than  text, or for printing from applications such as the KDE Advanced "
 "Text Editor. (Applications  in general send PostScript to the print system, and "
 "'kate' in particular has its own  knobs to control the print output. </p>. "
 "<hr>  "
@@ -1476,7 +815,7 @@ msgid ""
 "valid for  jobs originating from applications which define their own page "
 "layout internally and  send PostScript to TDEPrint (such as KOffice or "
 "OpenOffice.org). </p>  "
-"<p>When printing from TDE applications, such as KMail and Konqueror, or "
+"<p>When printing from KDE applications, such as KMail and Konqueror, or "
 "printing an ASCII text  file through kprinter, you can choose your preferred "
 "margin settings here. </p>  "
 "<p>Margins may be set individually for each edge of the paper. The combo box at "
@@ -1556,10 +895,6 @@ msgstr "Fformat y Testun"
 msgid "Syntax Highlighting"
 msgstr "Amlygu Cystrawen"
 
-#: cups/kptextpage.cpp:195 kpmarginpage.cpp:42 kpmarginpage.cpp:45
-msgid "Margins"
-msgstr "Ymylon"
-
 #: cups/kptextpage.cpp:200
 msgid "&Chars per inch:"
 msgstr "&Nodau y modfedd:"
@@ -1580,93 +915,113 @@ msgstr "&Analluogir"
 msgid "&Enabled"
 msgstr "All&uogir"
 
-#: cups/kmconfigcupsdir.cpp:34
-msgid "Folder"
-msgstr "Plygell"
+#: cups/kmconfigcups.cpp:32
+msgid "CUPS Server"
+msgstr "Gweinydd CUPS"
 
-#: cups/kmconfigcupsdir.cpp:35
-msgid "CUPS Folder Settings"
-msgstr "Gosodiadau Plygell CUPS"
+#: cups/kmconfigcups.cpp:33
+msgid "CUPS Server Settings"
+msgstr "Gosodiadau Gweinydd CUPS"
 
-#: cups/kmconfigcupsdir.cpp:38
-msgid "Installation Folder"
-msgstr "Plygell Gosod"
+#: cups/kphpgl2page.cpp:33
+msgid ""
+" <qt>  <b>Print in Black Only (Blackplot)</b>  "
+"<p>The 'blackplot' option specifies that all pens should plot in black-only: "
+"The default is to use the colors defined in the plot file, or the standard  pen "
+"colors defined in the HP-GL/2 reference manual from Hewlett Packard. </p>  "
+"<br>  "
+"<hr>  "
+"<p><em><b>Additional hint for power users:</b> This TDEPrint GUI element "
+"matches  with the CUPS commandline job option parameter:</em>  "
+"<pre>    -o blackplot=true  </pre>  </p>  </qt>"
+msgstr ""
 
-#: cups/kmconfigcupsdir.cpp:41
-msgid "Standard installation (/)"
-msgstr "Gosod arferol (/)"
+#: cups/kphpgl2page.cpp:48
+msgid ""
+" <qt>  <b>Scale Print Image to Page Size</b>  "
+"<p>The 'fitplot' option specifies that the HP-GL image should be scaled to fill "
+" exactly the page with the (elsewhere selected) media size. </p>  "
+"<p>The default is 'fitplot is disabled'. The default will therefore use the "
+"absolute  distances specified in the plot file. (You should be aware that HP-GL "
+"files are very  often CAD drawings intended for large format plotters. On "
+"standard office printers  they will therefore lead to the drawing printout "
+"being spread across multiple pages.) </p>  "
+"<p><b>Note:</b>This feature depends upon an accurate plot size (PS) command in "
+"the  HP-GL/2 file. If no plot size is given in the file the filter converting "
+"the HP-GL  to PostScript assumes the plot is ANSI E size. </p>  "
+"<br>  "
+"<hr>  "
+"<p><em><b>Additional hint for power users:</b> This TDEPrint GUI element "
+"matches with the CUPS commandline job option parameter:</em>  "
+"<pre>     -o fitplot=true   </pre> </p>  </qt>"
+msgstr ""
 
-#: cups/kptagspage.cpp:36
+#: cups/kphpgl2page.cpp:68
 msgid ""
-" <qt>"
-"<p><b>Additional Tags</b></p> You may send additional commands to the CUPS "
-"server via this editable list.  There are 3 purposes for this: "
-"<ul> "
-"<li>Use any current or future standard CUPS job option not supported by the  "
-"TDEPrint GUI. </li> "
-"<li>Control any custom job option you may want to support in custom CUPS "
-"filters  and backends plugged into the CUPS filtering chain.</li>  "
-"<li>Send short messages to the operators of your production printers in your  "
-"<em>Central Repro Department</em>. </ul>  "
-"<p><b>Standard CUPS job options:</b> A complete list of standard CUPS job  "
-"options is in the <a href=\"http://localhost:631/sum.html\">CUPS User Manual</a>"
-".  Mappings of the kprinter user interface widgets to respective CUPS job "
-"option  names are named in the various <em>WhatsThis</em> help items..</p> "
-"<p><b>Custom CUPS job options:</b> CUPS print servers may be customized with "
-"additional  print filters and backends which understand custom job options. You "
-"can specify such  custom job options here. If in doubt, ask your system "
-"administrator..</p> "
-"<p><b> </b></p> "
-"<p><b>Operator Messages:</b> You may send additional messages to the "
-"operator(s) of your production printers (e.g. in your <em>"
-"Central Repro Department</p>) Messages can be read by the operator(s) (or "
-"yourself) by viewing the <em>\"Job IPP Report\"</em> for the job.</p> <b>"
-"Examples:</b>"
-"<br> "
-"<pre> A standard CUPS job option:"
-"<br>    <em>(Name) number-up</em>                -- <em>(Value) 9</em>                     "
-"<br> "
-"<br> A job option for custom CUPS filters or backends:"
-"<br>    <em>(Name) DANKA_watermark</em>          -- <em>"
-"(Value) Company_Confidential</em>   "
-"<br> "
-"<br> A message to the operator(s):"
-"<br>    <em>(Name) Deliver_after_completion</em> -- <em>"
-"(Value) to_Marketing_Departm.</em>"
-"<br> </pre> "
-"<p><b>Note:</b> the fields must not include spaces, tabs or quotes. You may "
-"need to  double-click on a field to edit it. "
-"<p><b>Warning:</b> Do not use such standard CUPS option names which also can be "
-"used  through the TDEPrint GUI. Results may be  unpredictable if they conflict, "
-" or if they are sent multiple times. For all options supported by the GUI, "
-"please do use  the GUI. (Each GUI element's  'WhatsThis' names the related CUPS "
-"option name.) </p>  </qt>"
+" <qt>  <b>Set Pen Width for HP-GL (if not defined in file)</b>.  "
+"<p>The pen width value can be set here in case the original HP-GL file does not "
+"have it  set. The pen width specifies the value in micrometers. The default "
+"value of 1000 produces  lines that are 1000 micrometers == 1 millimeter in "
+"width. Specifying a pen width of 0  produces lines that are exactly 1 pixel "
+"wide. </p>  "
+"<p><b>Note:</b> The penwidth option set here is ignored if the pen widths are "
+"set inside  the plot file itself..</p>  "
+"<br>  "
+"<hr>  "
+"<p><em><b>Additional hint for power users:</b> This TDEPrint GUI element "
+"matches with the CUPS commandline job option parameter:</em>  "
+"<pre>    -o penwidth=...   # example: \"2000\" or \"500\"  </pre> </p>  </qt>"
 msgstr ""
 
-#: cups/kptagspage.cpp:77
-msgid "Additional Tags"
-msgstr "Tagiau Ychwanegol"
+#: cups/kphpgl2page.cpp:85
+msgid ""
+" <qt>  <b>HP-GL Print Options</b>  "
+"<p>All options on this page are only applicable if you use TDEPrint to send "
+"HP-GL and  HP-GL/2 files to one of your printers. </p>  "
+"<p>HP-GL and HP-GL/2 are page description languages developed by "
+"Hewlett-Packard to drive  Pen Plotting devices. </p>  "
+"<p>TDEPrint can (with the help of CUPS) convert the HP-GL file format and print "
+"it  on any installed printer. </p>  "
+"<p><b>Note 1:</b> To print HP-GL files, start 'kprinter' and simply load the "
+"file into  the running kprinter.</p> "
+"<p><b>Note 2:</b> The 'fitplot' parameter provided on this dialog does also "
+"work for  printing PDF files (if your CUPS version is more recent than "
+"1.1.22).</p>  "
+"<br>  "
+"<hr>  "
+"<p><em><b>Additional hint for power users:</b> These TDEPrint GUI elements "
+"match with CUPS commandline job option parameters:</em>  "
+"<pre>     -o blackplot=...  # examples: \"true\" or \"false\"  "
+"<br>     -o fitplot=...    # examples: \"true\" or \"false\"  "
+"<br>     -o penwidth=...   # examples: \"true\" or \"false\"  </pre> </p>  </qt>"
+msgstr ""
 
-#: cups/kptagspage.cpp:82 tdefilelist.cpp:101 kpfilterpage.cpp:406
-#: management/kmjobviewer.cpp:237 management/kmwend.cpp:51
-#: management/kxmlcommanddlg.cpp:141 management/kxmlcommanddlg.cpp:545
-msgid "Name"
-msgstr "Enw"
+#: cups/kphpgl2page.cpp:113
+msgid "HP-GL/2 Options"
+msgstr "Dewisiadau HP-GL/2 "
 
-#: cups/kptagspage.cpp:83
-msgid "Value"
-msgstr "Gwerth"
+#: cups/kphpgl2page.cpp:115
+msgid "&Use only black pen"
+msgstr "&Defnyddiwch dim ond pen-ysgrifennu du"
 
-#: cups/kptagspage.cpp:92
-msgid "Read-Only"
-msgstr "Darllenadwy yn Unig"
+#: cups/kphpgl2page.cpp:118
+msgid "&Fit plot to page"
+msgstr "&Ffitio'r plot i'r dudalen"
 
-#: cups/kptagspage.cpp:115
+#: cups/kphpgl2page.cpp:122
+msgid "&Pen width:"
+msgstr "&Lled y pen-ysgrifennu"
+
+#: cups/kmwippselect.cpp:38
+msgid "Remote IPP Printer Selection"
+msgstr "Dewis Argraffydd IPP Pell"
+
+#: cups/kmwippselect.cpp:51
 #, fuzzy
-msgid "The tag name must not contain any spaces, tabs or quotes: <b>%1</b>."
-msgstr "Ni chaiff enw'r tag gynnwys bylchnodau: <b>%1</b>."
+msgid "You must select a printer."
+msgstr "Rhaid i chi ddewis argraffydd!"
 
-#: cups/kmcupsuimanager.cpp:85
+#: cups/kmcupsuimanager.cpp:87
 msgid ""
 "<qt>"
 "<p>Print queue on remote CUPS server</p>"
@@ -1675,7 +1030,7 @@ msgid ""
 "</qt>"
 msgstr ""
 
-#: cups/kmcupsuimanager.cpp:92
+#: cups/kmcupsuimanager.cpp:94
 msgid ""
 "<qt>"
 "<p>Network IPP printer</p>"
@@ -1684,7 +1039,7 @@ msgid ""
 "printer can do both.</p></qt>"
 msgstr ""
 
-#: cups/kmcupsuimanager.cpp:99
+#: cups/kmcupsuimanager.cpp:101
 msgid ""
 "<qt>"
 "<p>Fax/Modem printer</p>"
@@ -1694,7 +1049,7 @@ msgid ""
 "number.</p></qt>"
 msgstr ""
 
-#: cups/kmcupsuimanager.cpp:106
+#: cups/kmcupsuimanager.cpp:108
 msgid ""
 "<qt>"
 "<p>Other printer</p>"
@@ -1704,7 +1059,7 @@ msgid ""
 "types using 3rd party backends not covered by the other possibilities.</p></qt>"
 msgstr ""
 
-#: cups/kmcupsuimanager.cpp:114
+#: cups/kmcupsuimanager.cpp:116
 msgid ""
 "<qt>"
 "<p>Class of printers</p>"
@@ -1714,82 +1069,526 @@ msgid ""
 "printers.</p></qt>"
 msgstr ""
 
-#: cups/kmcupsuimanager.cpp:127
+#: cups/kmcupsuimanager.cpp:129
 msgid "Re&mote CUPS server (IPP/HTTP)"
 msgstr "Gweinydd pell &CUPS (IPP/HTTP)"
 
-#: cups/kmcupsuimanager.cpp:128
+#: cups/kmcupsuimanager.cpp:130
 msgid "Network printer w/&IPP (IPP/HTTP)"
 msgstr "Argraffydd rhwydwaith efo &IPP (IPP/HTTP)"
 
-#: cups/kmcupsuimanager.cpp:129
+#: cups/kmcupsuimanager.cpp:131
 msgid "S&erial Fax/Modem printer"
 msgstr "Argraffydd &Cyfresol Ffacs/Modem"
 
-#: cups/kmcupsuimanager.cpp:130
+#: cups/kmcupsuimanager.cpp:132
 msgid "Other &printer type"
 msgstr "&Math arall o argraffydd"
 
-#: cups/kmcupsuimanager.cpp:132
+#: cups/kmcupsuimanager.cpp:134
 msgid "Cl&ass of printers"
 msgstr "D&osbarth o argraffyddion"
 
-#: cups/kmcupsuimanager.cpp:169
+#: cups/kmcupsuimanager.cpp:190
 #, fuzzy
 msgid "An error occurred while retrieving the list of available backends:"
 msgstr "Gwall wrth nôl y rhestr argraffyddion:"
 
-#: cups/kmcupsuimanager.cpp:215
+#: cups/kmcupsuimanager.cpp:236
 msgid "Priority"
 msgstr "Blaenoriaeth"
 
-#: cups/kmcupsuimanager.cpp:217
+#: cups/kmcupsuimanager.cpp:238
 msgid "Billing Information"
 msgstr "Gwybodaeth Anfoneb"
 
-#: cups/kmwfax.cpp:37
-msgid "Fax Serial Device"
-msgstr "Dyfais Cyfresol Ffacs"
+#: cups/kmconfigcupsdir.cpp:34
+msgid "Folder"
+msgstr "Plygell"
 
-#: cups/kmwfax.cpp:41
-msgid "<p>Select the device which your serial Fax/Modem is connected to.</p>"
+#: cups/kmconfigcupsdir.cpp:35
+msgid "CUPS Folder Settings"
+msgstr "Gosodiadau Plygell CUPS"
+
+#: cups/kmconfigcupsdir.cpp:38
+msgid "Installation Folder"
+msgstr "Plygell Gosod"
+
+#: cups/kmconfigcupsdir.cpp:41
+msgid "Standard installation (/)"
+msgstr "Gosod arferol (/)"
+
+#: cups/kmwusers.cpp:41
+msgid "Allowed Users"
+msgstr "Defnyddwyr a Chaniateir"
+
+#: cups/kmwusers.cpp:42
+msgid "Denied Users"
+msgstr "Defnyddwyr a Wrthodir"
+
+#: cups/kmwusers.cpp:44
+msgid "Define here a group of allowed/denied users for this printer."
 msgstr ""
-"<p>Dewis y dyfais y mae eich Ffacs/Modem cyfresol wedi'i gysylltu iddo.</p>"
+"Diffiniwch yma grwp o ddefnyddwyr a chaniateir neu a wrthodir am yr argraffydd "
+"yma."
 
-#: cups/kmwfax.cpp:71
-msgid "You must select a device."
-msgstr "Rhaid i chi ddewis dyfais."
+#: cups/kmwusers.cpp:45 management/kxmlcommanddlg.cpp:117
+msgid "&Type:"
+msgstr "&Math:"
+
+#: cups/cupsaddsmb2.cpp:55 cups/cupsaddsmb2.cpp:363
+msgid "&Export"
+msgstr "Allf&orio"
+
+#: cups/cupsaddsmb2.cpp:61
+msgid "Export Printer Driver to Windows Clients"
+msgstr "Allforio'r gyrrydd argraffydd i ddibynyddion Windows"
+
+#: cups/cupsaddsmb2.cpp:72
+msgid "&Username:"
+msgstr "&Enw Defnyddiwr:"
+
+#: cups/cupsaddsmb2.cpp:73
+msgid "&Samba server:"
+msgstr "Gweinydd &Samba:"
+
+#: cups/cupsaddsmb2.cpp:74 management/kmwpassword.cpp:50
+msgid "&Password:"
+msgstr "&Cyfrinair"
+
+#: cups/cupsaddsmb2.cpp:79
+msgid ""
+"<p><b>Samba server</b></p>Adobe Windows PostScript driver files plus the CUPS "
+"printer PPD will be exported to the <tt>[print$]</tt> "
+"special share of the Samba server (to change the source CUPS server, use the "
+"<nobr><i>Configure Manager -> CUPS server</i></nobr> first). The <tt>"
+"[print$]</tt> share must exist on the Samba side prior to clicking the <b>"
+"Export</b> button below."
+msgstr ""
+"<p><b>Gweinydd Samba</b></p>Bydd ffeiliau gyrrydd Adobe Windows PostScript a "
+"PPD i'r argraffydd CUPS yn cael eu allforio i'r rhanniad arbennig <tt>"
+"[print$]</tt> o'r gweinydd Samba (i newid y gweinydd tarddiad CUPS, defnyddiwch "
+"<nobr><i>Rheoli Gosodiadau -> gweinydd CUPS </i></nobr> "
+"yn gyntaf). Rhaid i'r rhanniad <tt>[print$]</tt> fodoli ar yr ochr Samba cyn i "
+"chi glicio ar  y botwm <b>Allforio</b> isod."
+
+#: cups/cupsaddsmb2.cpp:88
+#, fuzzy
+msgid ""
+"<p><b>Samba username</b></p>User needs to have write access to the <tt>"
+"[print$]</tt> share on the Samba server. <tt>[print$]</tt> "
+"holds printer drivers prepared for download to Windows clients. This dialog "
+"does not work for Samba servers configured with <tt>security = share</tt> "
+"(but works fine with <tt>security = user</tt>)."
+msgstr ""
+"<p><b>Defnydd-enw Samba</b></p>Rhaid i'r defnyddiwr cael cyrchu y rhanniad <tt>"
+"[print$]</tt> ar y gweinydd Samba.  Mae <tt>[print$]</tt> "
+"yn cynnwys gyryddion argraffydd sydd wedi'u paratoi i lawrlwytho i ddibynyddion "
+"Windows.  Nid yw'r ymgom yma yn gweithio is weinyddion Samba sydd wedi'u "
+"ffurfweddu efo <tt>security = share</tt> (ond mae'n gweithio yn iawn efo <tt>"
+"security = user</tt>)."
+
+#: cups/cupsaddsmb2.cpp:96
+msgid ""
+"<p><b>Samba password</b></p>The Samba setting <tt>encrypt passwords = yes</tt> "
+"(default) requires prior use of <tt>smbpasswd -a [username]</tt> "
+"command, to create an encrypted Samba password and have Samba recognize it."
+msgstr ""
+"<p><b>Cyfrinair Samba </b></p>Mae'r gosodiad Samba <tt>"
+"encrypt passwords = yes</tt> (rhagosodedig) yn golygu bod rhaid i chi "
+"defnyddio'r gorchymyn <tt>smbpasswd -a [username]</tt> "
+"yn gyntaf, er mwyn creu cyfrinair amgryptiedig Samba a chaiff  ei adnabod gan "
+"Samba."
+
+#: cups/cupsaddsmb2.cpp:267
+#, c-format
+msgid "Creating folder %1"
+msgstr "Creu plygell %1"
+
+#: cups/cupsaddsmb2.cpp:275
+#, c-format
+msgid "Uploading %1"
+msgstr "Llwytho %1"
+
+#: cups/cupsaddsmb2.cpp:283
+#, c-format
+msgid "Installing driver for %1"
+msgstr "Gosod gyrrydd i %1"
+
+#: cups/cupsaddsmb2.cpp:291
+#, c-format
+msgid "Installing printer %1"
+msgstr "Gosod argraffydd %1"
+
+#: cups/cupsaddsmb2.cpp:333
+msgid "Driver successfully exported."
+msgstr "Allforiwyd y gyrrydd yn llwyddiannus."
+
+#: cups/cupsaddsmb2.cpp:343
+msgid ""
+"Operation failed. Possible reasons are: permission denied or invalid Samba "
+"configuration (see <a href=\"man:/cupsaddsmb\">cupsaddsmb</a> "
+"manual page for detailed information, you need <a href=\"http://www.cups.org\">"
+"CUPS</a> version 1.1.11 or higher). You may want to try again with another "
+"login/password."
+msgstr ""
+"Methodd y gweithrediad.  Mae rhesymau posibl yn cynnwys: gwrthodwyd caniatà d, "
+"neu ffurfweddiad Samba annilys (gweler y dudalen llawlyfr <a "
+"href=\"man:/cupsaddsmb\">cupsaddsmb</a> am wybodaeth manwl - mae angen<a "
+"href=\"http://www.cups.org\">CUPS</a>   fersiwn 1.1.11 neu uwch).  Efallai y "
+"byddwch eisiau ceisio eto efo mewnosodiad/cyfrinair arall."
+
+#: cups/cupsaddsmb2.cpp:352
+msgid "Operation aborted (process killed)."
+msgstr "Terfynnwyd y gwithrediad (lladdwyd y proses). "
+
+#: cups/cupsaddsmb2.cpp:358
+#, fuzzy
+msgid "<h3>Operation failed.</h3><p>%1</p>"
+msgstr "<h3>Methodd y gweithrediad!</h3><p>%1</p>"
+
+#: cups/cupsaddsmb2.cpp:373
+msgid ""
+"You are about to prepare the <b>%1</b> driver to be shared out to Windows "
+"clients through Samba. This operation requires the <a "
+"href=\"http://www.adobe.com/products/printerdrivers/main.html\">"
+"Adobe PostScript Driver</a>, a recent version of Samba 2.2.x and a running SMB "
+"service on the target server. Click <b>Export</b> to start the operation. Read "
+"the <a href=\"man:/cupsaddsmb\">cupsaddsmb</a> manual page in Konqueror or type "
+"<tt>man cupsaddsmb</tt> in a console window to learn more about this "
+"functionality."
+msgstr ""
+"Rydych ar fin paratoi y gyrrydd <b>%1</b> i gael ei rannu i ddibynyddion "
+"Windows drwy Samba.  Mae gan y gweithrediad yma angen y <a "
+"href=\"http://www.adobe.com/products/printerdrivers/main.html\">"
+"Adobe PostScript Driver</a>, fersiwn diweddar o Samba 2.2.x a gwasanaeth SMB "
+"wrthi'n rhedeg ar y gweinydd tarddiad.  Cliciwch <b>Allforio</b> "
+"i ddechrau'r gweithrediad.Darllenwch y dudalen llawlyfr <a "
+"href=\"man:/cupsaddsmb\">cupsaddsmb</a> yn Konqueror, neu teipiwch <tt>"
+"man cupsaddsmb</tt> mewn ffenest terfynnell i ddysgu mwy am y galluogrwydd hwn."
+
+#: cups/cupsaddsmb2.cpp:393
+msgid ""
+"Some driver files are missing. You can get them on <a "
+"href=\"http://www.adobe.com\">Adobe</a> web site. See <a "
+"href=\"man:/cupsaddsmb\">cupsaddsmb</a> manual page for more details (you need "
+"<a href=\"http://www.cups.org\">CUPS</a> version 1.1.11 or higher)."
+msgstr ""
+"Mae rhai ffeiliau gyrrydd ar goll.  Cewch afael arnynt ar y wefan <a "
+"href=\"http://www.adobe.com\">Adobe</a> Gweler y dudalen llawlyfr <a "
+"href=\"man:/cupsaddsmb\">cupsaddsmb</a> am fwy o fanylion (rhaid i chi gael <a "
+"href=\"http://www.cups.org\">CUPS</a> fersiwn 1.1.11 neu uwch)."
+
+#: cups/cupsaddsmb2.cpp:404
+#, c-format
+msgid "Preparing to upload driver to host %1"
+msgstr "Paratoi llwytho'r gyrrydd i westeiwr %1"
+
+#: cups/cupsaddsmb2.cpp:409 management/networkscanner.cpp:149
+msgid "&Abort"
+msgstr "&Terfynnu"
+
+#: cups/cupsaddsmb2.cpp:415
+msgid "The driver for printer <b>%1</b> could not be found."
+msgstr "Methu canfod y gyrrydd i argraffydd <b>%1</b>."
+
+#: cups/cupsaddsmb2.cpp:455
+#, c-format
+msgid "Preparing to install driver on host %1"
+msgstr "Paratoi gosod gyrrydd ar westeiwr %1"
+
+#: cups/kmwquota.cpp:46
+msgid "second(s)"
+msgstr "eiliad(au)"
+
+#: cups/kmwquota.cpp:47
+msgid "minute(s)"
+msgstr "munud(au)"
+
+#: cups/kmwquota.cpp:48
+msgid "hour(s)"
+msgstr "awr/oriau"
+
+#: cups/kmwquota.cpp:49
+msgid "day(s)"
+msgstr "dydd(iau)"
+
+#: cups/kmwquota.cpp:50
+msgid "week(s)"
+msgstr "wythnos(au)"
+
+#: cups/kmwquota.cpp:51
+msgid "month(s)"
+msgstr "mis(oedd)"
+
+#: cups/kmwquota.cpp:79
+msgid "Printer Quota Settings"
+msgstr "Gosodiadau Cwota'r Argraffydd"
+
+#: cups/kmpropquota.cpp:78 cups/kmwquota.cpp:84
+msgid "No quota"
+msgstr "Dim cwota"
+
+#: cups/kmpropquota.cpp:79 cups/kmpropquota.cpp:80 cups/kmwquota.cpp:87
+#: cups/kmwquota.cpp:90
+msgid "None"
+msgstr "Dim"
+
+#: cups/kmpropquota.cpp:39 cups/kmwquota.cpp:96
+msgid "&Period:"
+msgstr "&Cyfnod:"
+
+#: cups/kmpropquota.cpp:40 cups/kmwquota.cpp:97
+msgid "&Size limit (KB):"
+msgstr "&Terfyn maint (KB):"
+
+#: cups/kmpropquota.cpp:41 cups/kmwquota.cpp:98
+msgid "&Page limit:"
+msgstr "Terfyn tu&dalen:"
+
+#: cups/kmwquota.cpp:104
+msgid ""
+"<p>Set here the quota for this printer. Using limits of <b>0</b> "
+"means that no quota will be used. This is equivalent to set quota period to <b>"
+"<nobr>No quota</nobr></b> (-1). Quota limits are defined on a per-user base and "
+"applied to all users.</p>"
+msgstr ""
+"<p>Gosodwch yma'r cwota i'r argraffydd yma.  Bydd defnyddio terfynau o <b>0</b> "
+"yn golygu na fydd cwota yn cael ei ddefnyddio.  Mae hyn yn cyfatebu at osod y "
+"cyfnod cwota i <b><nobr>Dim cwota</nobr></b> (-1). Diffinir terfynau cwota ar "
+"sail y defnyddiwr unigol, a gweithredir ar bob ddefnyddiwr.</p>"
+
+#: cups/kmwquota.cpp:130
+#, fuzzy
+msgid "You must specify at least one quota limit."
+msgstr "Rhaid i chi benodi o leiaf un terfyn cwota!"
+
+#: cups/kmcupsconfigwidget.cpp:65
+msgid "Server Information"
+msgstr "Gwybodaeth Gweinydd"
+
+#: cups/kmcupsconfigwidget.cpp:66
+msgid "Account Information"
+msgstr "Gwybodaeth Cyfrif"
+
+#: cups/kmcupsconfigwidget.cpp:67 rlpr/kmproxywidget.cpp:34
+msgid "&Host:"
+msgstr "&Gwesteiwr:"
+
+#: cups/kmcupsconfigwidget.cpp:68 management/kmwsocketutil.cpp:53
+#: management/networkscanner.cpp:339 rlpr/kmproxywidget.cpp:35
+msgid "&Port:"
+msgstr "&Porth:"
+
+#: cups/kmcupsconfigwidget.cpp:75
+msgid "&User:"
+msgstr "&Defnyddiwr:"
+
+#: cups/kmcupsconfigwidget.cpp:76
+msgid "Pass&word:"
+msgstr "&Cyfrinair:"
+
+#: cups/kmcupsconfigwidget.cpp:79
+msgid "&Store password in configuration file"
+msgstr "&Cadw'r cyfrinair yn y ffeil ffurfweddiad. "
+
+#: cups/kmcupsconfigwidget.cpp:81
+msgid "Use &anonymous access"
+msgstr "De&fnyddio cyrchiad di-enw"
+
+#: cups/kpschedulepage.cpp:40
+msgid ""
+" <qt> "
+"<p><b>Print Job Billing and Accounting</b></p>  "
+"<p>Insert a meaningful string here to associate the current print job with a "
+"certain account. This string will appear in the CUPS \"page_log\" to help with "
+"the print accounting in your organization. (Leave it empty if you do not need "
+"it.) "
+"<p> It is useful for people who print on behalf of different \"customers\", "
+"like print service bureaux, letter shops, press and prepress companies, or "
+"secretaries who serve different bosses, etc.</p> "
+"<br>  "
+"<hr>  "
+"<p><em><b>Additional hint for power users:</b> This TDEPrint GUI element "
+"matches  with the CUPS commandline job option parameter:</em>  "
+"<pre>    -o job-billing=...         # example: \"Marketing_Department\" or "
+"\"Joe_Doe\"  </pre> </p>  </qt>"
+msgstr ""
+
+#: cups/kpschedulepage.cpp:60
+msgid ""
+" <qt> "
+"<p><b>Scheduled Printing</b></p>  "
+"<p>Scheduled printing lets you control the time of the actual printout, while "
+"you can still send away your job <b>now</b> and have it out of your way. "
+"<p> Especially useful is the \"Never (hold indefinitely)\" option. It allows "
+"you to park your job until a time when you (or a printer administrator) decides "
+"to manually release it. "
+"<p> This is often required in enterprise environments, where you normally are "
+"not allowed to directly and immediately access the huge production printers in "
+"your <em>Central Repro Department</em>. However it is okay to send jobs to the "
+"queue which is under the control of the operators (who, after all, need to make "
+"sure that the 10,000 sheets of pink paper which is required by the Marketing "
+"Department for a particular job are available and loaded into the paper "
+"trays).</p> "
+"<br>  "
+"<hr>  "
+"<p><em><b>Additional hint for power users:</b> This TDEPrint GUI element "
+"matches  with the CUPS commandline job option parameter:</em>  "
+"<pre>    -o job-hold-until=...      # example: \"indefinite\" or \"no-hold\"  "
+"</pre> </p>  </qt>"
+msgstr ""
+
+#: cups/kpschedulepage.cpp:87
+#, fuzzy
+msgid ""
+" <qt> "
+"<p><b>Page Labels</b></p>  "
+"<p>Page Labels are printed by CUPS at the top and bottom of each page. They "
+"appear on the pages surrounded by a little frame box. "
+"<p>They contain any string you type into the line edit field.</p> "
+"<br>  "
+"<hr>  "
+"<p><em><b>Additional hint for power users:</b> This TDEPrint GUI element "
+"matches  with the CUPS commandline job option parameter:</em>  "
+"<pre>    -o page-label=\"...\"      # example: \"Company Confidential\"  </pre> "
+"</p>  </qt>"
+msgstr ""
+" <qt> "
+"<p>Argraffir Labeli Tudalennau gan CUPS wrth ben a gwaelod pob tudalen.  Maent "
+"yn ymddangos ar y tudalennau wedi'u amgylchynnu gan blwch bach ffrâm."
+"<p>Maent yn cynnwys unrhyw llinell yr ydych yn teipio i mewn i'r faes golygu am "
+"y llinell.</qt>"
+
+#: cups/kpschedulepage.cpp:102
+msgid ""
+" <qt> "
+"<p><b>Job Priority</b></p>  "
+"<p>Usually CUPS prints all jobs per queue according to the \"FIFO\" principle: "
+"<em>First In, First Out</em>. "
+"<p> The job priority option allows you to re-order the queue according to your "
+"needs. "
+"<p> It works in both directions: you can increase as well as decrease "
+"priorities. (Usually you can only control your <b>own</b> jobs). "
+"<p> Since the default job priority is \"50\", any job sent with, for example, "
+"\"49\" will be printed only after all those others have finished. Conversely, a "
+"\"51\" or higher priority job will go right to the top of a populated queue (if "
+"no other, higher prioritized one is present).</p> "
+"<br>  "
+"<hr>  "
+"<p><em><b>Additional hint for power users:</b> This TDEPrint GUI element "
+"matches  with the CUPS commandline job option parameter:</em>  "
+"<pre>    -o job-priority=...   # example: \"10\" or \"66\" or \"99\"  </pre> "
+"</p>  </qt>"
+msgstr ""
+
+#: cups/kpschedulepage.cpp:126
+msgid "Advanced Options"
+msgstr "Dewisiadau Uwch"
+
+#: cups/kpschedulepage.cpp:137
+msgid "Immediately"
+msgstr "Syth bin"
+
+#: cups/kpschedulepage.cpp:138
+msgid "Never (hold indefinitely)"
+msgstr "Byth (cadw am gyfnod amhenodol)"
+
+#: cups/kpschedulepage.cpp:139
+msgid "Daytime (6 am - 6 pm)"
+msgstr "Amser dydd (6am-6pm)"
 
-#: cups/kmcupsmanager.cpp:768
+#: cups/kpschedulepage.cpp:140
+msgid "Evening (6 pm - 6 am)"
+msgstr "Hwyrnos (6pm-6am)"
+
+#: cups/kpschedulepage.cpp:141
+msgid "Night (6 pm - 6 am)"
+msgstr "Nos (6pm-6am)"
+
+#: cups/kpschedulepage.cpp:142
+msgid "Weekend"
+msgstr "Penwythnos"
+
+#: cups/kpschedulepage.cpp:143
+msgid "Second Shift (4 pm - 12 am)"
+msgstr "Ail Gyfnod (4pm-12am)"
+
+#: cups/kpschedulepage.cpp:144
+msgid "Third Shift (12 am - 8 am)"
+msgstr "Trydydd Cyfnod (12am-8am)"
+
+#: cups/kpschedulepage.cpp:145
+msgid "Specified Time"
+msgstr "Amser Penodol"
+
+#: cups/kpschedulepage.cpp:160
+#, fuzzy
+msgid "&Scheduled printing:"
+msgstr "&Trefnlennu argraffu:"
+
+#: cups/kpschedulepage.cpp:163
+msgid "&Billing information:"
+msgstr "&Gwybodaeth anfonebau:"
+
+#: cups/kpschedulepage.cpp:166
+msgid "T&op/Bottom page label:"
+msgstr "Label &Pen/Gwaelod y dudalen"
+
+#: cups/kpschedulepage.cpp:169
+msgid "&Job priority:"
+msgstr "&Blaenoriaeth y Swydd"
+
+#: cups/kpschedulepage.cpp:200
+msgid "The time specified is not valid."
+msgstr "Mae'r amser a phenodwyd yn annilys."
+
+#: cups/kmpropquota.cpp:57
+msgid "Quotas"
+msgstr "Cwotau"
+
+#: cups/kmpropquota.cpp:58
+msgid "Quota Settings"
+msgstr "Gosodiadau Cwota"
+
+#: cups/ippreportdlg.cpp:34
+msgid "IPP Report"
+msgstr "Adroddiad IPP"
+
+#: cups/ippreportdlg.cpp:93
+msgid "Internal error: unable to generate HTML report."
+msgstr "Gwall mewnol: methu creu adroddiad HTML."
+
+#: cups/kmcupsmanager.cpp:819
 msgid "Library cupsdconf not found. Check your installation."
 msgstr "Methu canfod y rhaglengell libcupsdconf.  Gwiriwch eich gosodiad."
 
-#: cups/kmcupsmanager.cpp:774
+#: cups/kmcupsmanager.cpp:825
 msgid "Symbol %1 not found in cupsdconf library."
 msgstr "Methu canfod symbol %1 yn y rhaglengell libcupsdconf.  "
 
-#: cups/kmcupsmanager.cpp:849
+#: cups/kmcupsmanager.cpp:920
 msgid "&Export Driver..."
 msgstr "&Allforio Gyrrydd..."
 
-#: cups/kmcupsmanager.cpp:851
+#: cups/kmcupsmanager.cpp:922
 msgid "&Printer IPP Report"
 msgstr "Adroddiad IPP yr &Argraffydd"
 
-#: cups/kmcupsmanager.cpp:897 cups/kmwippprinter.cpp:218
+#: cups/kmcupsmanager.cpp:968 cups/kmwippprinter.cpp:218
 #, c-format
 msgid "IPP Report for %1"
 msgstr "Adroddiad IPP am %1 "
 
-#: cups/kmcupsmanager.cpp:901
+#: cups/kmcupsmanager.cpp:972
 msgid "Unable to retrieve printer information. Error received:"
 msgstr "Methu nôl gwybodaeth argraffydd.  Derbynwyd gwall:"
 
-#: cups/kmcupsmanager.cpp:914
+#: cups/kmcupsmanager.cpp:985
 msgid "Server"
 msgstr "Gweinydd"
 
-#: cups/kmcupsmanager.cpp:954
+#: cups/kmcupsmanager.cpp:1025
 #, c-format
 msgid ""
 "Connection to CUPS server failed. Check that the CUPS server is correctly "
@@ -1798,24 +1597,24 @@ msgstr ""
 "Methodd y cysylltiad i'r gweinydd CUPS.  Gwiriwch fod y gweinydd CUPS wedi ei "
 "osod yn gywir, ac yn rhedeg.  Gwall: %1."
 
-#: cups/kmcupsmanager.cpp:955
+#: cups/kmcupsmanager.cpp:1026
 msgid "the IPP request failed for an unknown reason"
 msgstr "methodd y cais IPP am reswm anhysbys"
 
-#: cups/kmcupsmanager.cpp:989
+#: cups/kmcupsmanager.cpp:1060
 msgid "connection refused"
 msgstr "gwrthodwyd y cysylltiad"
 
-#: cups/kmcupsmanager.cpp:992
+#: cups/kmcupsmanager.cpp:1063
 msgid "host not found"
 msgstr "ni chanfuwyd y gwesteiwr"
 
-#: cups/kmcupsmanager.cpp:996
+#: cups/kmcupsmanager.cpp:1067
 #, fuzzy
 msgid "read failed (%1)"
 msgstr "Methu darllen ffeil %1"
 
-#: cups/kmcupsmanager.cpp:1000
+#: cups/kmcupsmanager.cpp:1071
 #, fuzzy
 msgid ""
 "Connection to CUPS server failed. Check that the CUPS server is correctly "
@@ -1824,94 +1623,53 @@ msgstr ""
 "Methodd y cysylltiad i'r gweinydd CUPS.  Gwiriwch fod y gweinydd CUPS wedi ei "
 "osod yn gywir, ac yn rhedeg.  Gwall: %1."
 
-#: cups/kphpgl2page.cpp:33
-msgid ""
-" <qt>  <b>Print in Black Only (Blackplot)</b>  "
-"<p>The 'blackplot' option specifies that all pens should plot in black-only: "
-"The default is to use the colors defined in the plot file, or the standard  pen "
-"colors defined in the HP-GL/2 reference manual from Hewlett Packard. </p>  "
-"<br>  "
-"<hr>  "
-"<p><em><b>Additional hint for power users:</b> This TDEPrint GUI element "
-"matches  with the CUPS commandline job option parameter:</em>  "
-"<pre>    -o blackplot=true  </pre>  </p>  </qt>"
-msgstr ""
+#: cups/ipprequest.cpp:164
+msgid "You don't have access to the requested resource."
+msgstr "Nid oes ganddoch gyrchiad at yr adnodd oedd ceisiedig."
 
-#: cups/kphpgl2page.cpp:48
-msgid ""
-" <qt>  <b>Scale Print Image to Page Size</b>  "
-"<p>The 'fitplot' option specifies that the HP-GL image should be scaled to fill "
-" exactly the page with the (elsewhere selected) media size. </p>  "
-"<p>The default is 'fitplot is disabled'. The default will therefore use the "
-"absolute  distances specified in the plot file. (You should be aware that HP-GL "
-"files are very  often CAD drawings intended for large format plotters. On "
-"standard office printers  they will therefore lead to the drawing printout "
-"being spread across multiple pages.) </p>  "
-"<p><b>Note:</b>This feature depends upon an accurate plot size (PS) command in "
-"the  HP-GL/2 file. If no plot size is given in the file the filter converting "
-"the HP-GL  to PostScript assumes the plot is ANSI E size. </p>  "
-"<br>  "
-"<hr>  "
-"<p><em><b>Additional hint for power users:</b> This TDEPrint GUI element "
-"matches with the CUPS commandline job option parameter:</em>  "
-"<pre>     -o fitplot=true   </pre> </p>  </qt>"
-msgstr ""
+#: cups/ipprequest.cpp:167
+msgid "You are not authorized to access the requested resource."
+msgstr "Nid ydych wedi cael eich awdurdodi i gyrchu'r adnodd ceisiedig."
 
-#: cups/kphpgl2page.cpp:68
-msgid ""
-" <qt>  <b>Set Pen Width for HP-GL (if not defined in file)</b>.  "
-"<p>The pen width value can be set here in case the original HP-GL file does not "
-"have it  set. The pen width specifies the value in micrometers. The default "
-"value of 1000 produces  lines that are 1000 micrometers == 1 millimeter in "
-"width. Specifying a pen width of 0  produces lines that are exactly 1 pixel "
-"wide. </p>  "
-"<p><b>Note:</b> The penwidth option set here is ignored if the pen widths are "
-"set inside  the plot file itself..</p>  "
-"<br>  "
-"<hr>  "
-"<p><em><b>Additional hint for power users:</b> This TDEPrint GUI element "
-"matches with the CUPS commandline job option parameter:</em>  "
-"<pre>    -o penwidth=...   # example: \"2000\" or \"500\"  </pre> </p>  </qt>"
-msgstr ""
+#: cups/ipprequest.cpp:170
+msgid "The requested operation cannot be completed."
+msgstr "Methu cwblhau'r gweithred geisiedig."
 
-#: cups/kphpgl2page.cpp:85
+#: cups/ipprequest.cpp:173
+msgid "The requested service is currently unavailable."
+msgstr "Nid yw'r gwasanaeth ceisiedig ar gael ar hyn o bryd."
+
+#: cups/ipprequest.cpp:176
+msgid "The target printer is not accepting print jobs."
+msgstr "Ni dderbynnir swyddi argraffu gan yr argraffydd cyrchfan."
+
+#: cups/ipprequest.cpp:313
 msgid ""
-" <qt>  <b>HP-GL Print Options</b>  "
-"<p>All options on this page are only applicable if you use TDEPrint to send "
-"HP-GL and  HP-GL/2 files to one of your printers. </p>  "
-"<p>HP-GL and HP-GL/2 are page description languages developed by "
-"Hewlett-Packard to drive  Pen Plotting devices. </p>  "
-"<p>TDEPrint can (with the help of CUPS) convert the HP-GL file format and print "
-"it  on any installed printer. </p>  "
-"<p><b>Note 1:</b> To print HP-GL files, start 'kprinter' and simply load the "
-"file into  the running kprinter.</p> "
-"<p><b>Note 2:</b> The 'fitplot' parameter provided on this dialog does also "
-"work for  printing PDF files (if your CUPS version is more recent than "
-"1.1.22).</p>  "
-"<br>  "
-"<hr>  "
-"<p><em><b>Additional hint for power users:</b> These TDEPrint GUI elements "
-"match with CUPS commandline job option parameters:</em>  "
-"<pre>     -o blackplot=...  # examples: \"true\" or \"false\"  "
-"<br>     -o fitplot=...    # examples: \"true\" or \"false\"  "
-"<br>     -o penwidth=...   # examples: \"true\" or \"false\"  </pre> </p>  </qt>"
+"Connection to CUPS server failed. Check that the CUPS server is correctly "
+"installed and running."
 msgstr ""
+"Methodd y cysylltiad i'r gweinydd CUPS.  Gwiriwch fod y gweinydd CUPS wedi ei "
+"osod yn iawn, a rhedeg."
 
-#: cups/kphpgl2page.cpp:113
-msgid "HP-GL/2 Options"
-msgstr "Dewisiadau HP-GL/2 "
+#: cups/ipprequest.cpp:316
+msgid "The IPP request failed for an unknown reason."
+msgstr "Methodd y cais IPP am reswm anhysbys."
 
-#: cups/kphpgl2page.cpp:115
-msgid "&Use only black pen"
-msgstr "&Defnyddiwch dim ond pen-ysgrifennu du"
+#: cups/ipprequest.cpp:461
+msgid "Attribute"
+msgstr "Priodoleddau"
 
-#: cups/kphpgl2page.cpp:118
-msgid "&Fit plot to page"
-msgstr "&Ffitio'r plot i'r dudalen"
+#: cups/ipprequest.cpp:462
+msgid "Values"
+msgstr "Gwerthoedd"
 
-#: cups/kphpgl2page.cpp:122
-msgid "&Pen width:"
-msgstr "&Lled y pen-ysgrifennu"
+#: cups/ipprequest.cpp:500 cups/ipprequest.cpp:567
+msgid "True"
+msgstr "Gwir"
+
+#: cups/ipprequest.cpp:500 cups/ipprequest.cpp:567
+msgid "False"
+msgstr "Ffug"
 
 #: cups/kmwippprinter.cpp:45
 msgid "IPP Printer Information"
@@ -1938,12 +1696,12 @@ msgstr "&Adroddiad IPP"
 msgid "You must enter a printer URI."
 msgstr "Rhaid i chi fewnosod URI argraffydd!"
 
-#: cups/kmwippprinter.cpp:119 management/kmwsocket.cpp:116
+#: cups/kmwippprinter.cpp:119 management/kmwsocket.cpp:117
 #, fuzzy
 msgid "No printer found at this address/port."
 msgstr "Ni chanfuwyd argraffydd wrth y gyfeiriad/borth yma!"
 
-#: cups/kmwippprinter.cpp:139 management/kmwsocket.cpp:135
+#: cups/kmwippprinter.cpp:139 management/kmwsocket.cpp:136
 msgid ""
 "_: Unknown host - 1 is the IP\n"
 "<Unknown> (%1)"
@@ -2023,103 +1781,21 @@ msgstr "URI"
 msgid "CUPS Server %1:%2"
 msgstr "Gweinydd CUPS %1:%2"
 
-#: cups/kmcupsconfigwidget.cpp:65
-msgid "Server Information"
-msgstr "Gwybodaeth Gweinydd"
-
-#: cups/kmcupsconfigwidget.cpp:66
-msgid "Account Information"
-msgstr "Gwybodaeth Cyfrif"
-
-#: cups/kmcupsconfigwidget.cpp:67 rlpr/kmproxywidget.cpp:34
-msgid "&Host:"
-msgstr "&Gwesteiwr:"
-
-#: cups/kmcupsconfigwidget.cpp:68 management/kmwsocketutil.cpp:53
-#: management/networkscanner.cpp:339 rlpr/kmproxywidget.cpp:35
-msgid "&Port:"
-msgstr "&Porth:"
-
-#: cups/kmcupsconfigwidget.cpp:75
-msgid "&User:"
-msgstr "&Defnyddiwr:"
-
-#: cups/kmcupsconfigwidget.cpp:76
-msgid "Pass&word:"
-msgstr "&Cyfrinair:"
-
-#: cups/kmcupsconfigwidget.cpp:79
-msgid "&Store password in configuration file"
-msgstr "&Cadw'r cyfrinair yn y ffeil ffurfweddiad. "
-
-#: cups/kmcupsconfigwidget.cpp:81
-msgid "Use &anonymous access"
-msgstr "De&fnyddio cyrchiad di-enw"
-
-#: cups/kmwquota.cpp:46
-msgid "second(s)"
-msgstr "eiliad(au)"
-
-#: cups/kmwquota.cpp:47
-msgid "minute(s)"
-msgstr "munud(au)"
-
-#: cups/kmwquota.cpp:48
-msgid "hour(s)"
-msgstr "awr/oriau"
-
-#: cups/kmwquota.cpp:49
-msgid "day(s)"
-msgstr "dydd(iau)"
-
-#: cups/kmwquota.cpp:50
-msgid "week(s)"
-msgstr "wythnos(au)"
-
-#: cups/kmwquota.cpp:51
-msgid "month(s)"
-msgstr "mis(oedd)"
-
-#: cups/kmwquota.cpp:79
-msgid "Printer Quota Settings"
-msgstr "Gosodiadau Cwota'r Argraffydd"
-
-#: cups/kmwquota.cpp:104
-msgid ""
-"<p>Set here the quota for this printer. Using limits of <b>0</b> "
-"means that no quota will be used. This is equivalent to set quota period to <b>"
-"<nobr>No quota</nobr></b> (-1). Quota limits are defined on a per-user base and "
-"applied to all users.</p>"
-msgstr ""
-"<p>Gosodwch yma'r cwota i'r argraffydd yma.  Bydd defnyddio terfynau o <b>0</b> "
-"yn golygu na fydd cwota yn cael ei ddefnyddio.  Mae hyn yn cyfatebu at osod y "
-"cyfnod cwota i <b><nobr>Dim cwota</nobr></b> (-1). Diffinir terfynau cwota ar "
-"sail y defnyddiwr unigol, a gweithredir ar bob ddefnyddiwr.</p>"
-
-#: cups/kmwquota.cpp:130
-#, fuzzy
-msgid "You must specify at least one quota limit."
-msgstr "Rhaid i chi benodi o leiaf un terfyn cwota!"
-
-#: cups/kmconfigcups.cpp:32
-msgid "CUPS Server"
-msgstr "Gweinydd CUPS"
-
-#: cups/kmconfigcups.cpp:33
-msgid "CUPS Server Settings"
-msgstr "Gosodiadau Gweinydd CUPS"
+#: cups/kmpropbanners.cpp:35 cups/kmwbanners.cpp:92
+msgid "&Starting banner:"
+msgstr "Baner &dechrau:"
 
-#: cups/kmpropusers.cpp:55
-msgid "Denied users"
-msgstr "Defnyddwyr a wrthodir"
+#: cups/kmpropbanners.cpp:36 cups/kmwbanners.cpp:93
+msgid "&Ending banner:"
+msgstr "Baner d&iweddu:"
 
-#: cups/kmpropusers.cpp:62
-msgid "Allowed users"
-msgstr "Defnyddwyr a chaniateir"
+#: cups/kmpropbanners.cpp:49 kpgeneralpage.cpp:298
+msgid "Banners"
+msgstr "Baneri"
 
-#: cups/kmpropusers.cpp:76
-msgid "All users allowed"
-msgstr "Caniateir pob defnyddiwr"
+#: cups/kmpropbanners.cpp:50
+msgid "Banner Settings"
+msgstr "Gosodiadau'r Faner"
 
 #: cups/kpimagepage.cpp:44
 msgid ""
@@ -2392,127 +2068,606 @@ msgstr "% o Faint Naturiol y Ddelwedd"
 msgid "&Image size type:"
 msgstr "&Math maint y ddelwedd"
 
-#: cups/kmcupsjobmanager.cpp:277
+#: cups/kmcupsjobmanager.cpp:349
 msgid "Job Report"
 msgstr "Adroddiad Swydd"
 
-#: cups/kmcupsjobmanager.cpp:279 cups/kmcupsjobmanager.cpp:384
+#: cups/kmcupsjobmanager.cpp:351 cups/kmcupsjobmanager.cpp:456
 msgid "Unable to retrieve job information: "
 msgstr "Methu nol gwybodaeth swydd:"
 
-#: cups/kmcupsjobmanager.cpp:288
+#: cups/kmcupsjobmanager.cpp:360
 msgid "&Job IPP Report"
 msgstr "&Adroddiad IPP y Swydd"
 
-#: cups/kmcupsjobmanager.cpp:290
+#: cups/kmcupsjobmanager.cpp:362
 msgid "&Increase Priority"
 msgstr "&Cynyddu Blaenoriaeth"
 
-#: cups/kmcupsjobmanager.cpp:292
+#: cups/kmcupsjobmanager.cpp:364
 msgid "&Decrease Priority"
 msgstr "&Lleihau Blaenoriaeth"
 
-#: cups/kmcupsjobmanager.cpp:294
+#: cups/kmcupsjobmanager.cpp:366
 msgid "&Edit Attributes..."
 msgstr "&Golygu Priodoleddau..."
 
-#: cups/kmcupsjobmanager.cpp:347
+#: cups/kmcupsjobmanager.cpp:419
 msgid "Unable to change job priority: "
 msgstr "Methu newid blaenoriaeth y swydd:"
 
-#: cups/kmcupsjobmanager.cpp:405
+#: cups/kmcupsjobmanager.cpp:477
 #, c-format
 msgid "Unable to find printer %1."
 msgstr "Methu canfod argraffydd %1."
 
-#: cups/kmcupsjobmanager.cpp:422
+#: cups/kmcupsjobmanager.cpp:494
 msgid "Attributes of Job %1@%2 (%3)"
 msgstr "Priodoleddau Swydd %1@%2 (%3)  "
 
-#: cups/kmcupsjobmanager.cpp:444
+#: cups/kmcupsjobmanager.cpp:516
 msgid "Unable to set job attributes: "
 msgstr "Methu gosod priodoleddau'r swydd:"
 
-#: rlpr/krlprprinterimpl.cpp:73
-msgid "The printer is incompletely defined. Try to reinstall it."
+#: cups/kmwipp.cpp:35
+msgid "Remote IPP server"
+msgstr "Gweinydd IPP pell"
+
+#: cups/kmwipp.cpp:39
+msgid ""
+"<p>Enter the information concerning the remote IPP server owning the targeted "
+"printer. This wizard will poll the server before continuing.</p>"
 msgstr ""
-"Nid yw'r argraffydd wedi ei ddiffinio yn gyflawn.  Ceisiwch ei ail-osod."
+"<p>Mewnosodwch y gwybodaeth ynghylch y gweinydd IPP pell sy'n biau'r argraffydd "
+"penodol.  Bydd y dewin yma yn ceisio'r gweinydd cyn fynd ymalen.</p>"
 
-#: rlpr/kmproprlpr.cpp:49 rlpr/kmwrlpr.cpp:50
-msgid "Remote LPD Queue Settings"
-msgstr "Gosodiadau Ciw Pell LPD"
+#: cups/kmwipp.cpp:42 management/kmwlpd.cpp:46 rlpr/kmproprlpr.cpp:34
+#: rlpr/kmwrlpr.cpp:62
+msgid "Host:"
+msgstr "Gwesteiwr:"
 
-#: management/kmwlpd.cpp:47 rlpr/kmproprlpr.cpp:35 rlpr/kmwrlpr.cpp:63
-msgid "Queue:"
-msgstr "Ciw:"
+#: cups/kmwipp.cpp:43
+msgid "Port:"
+msgstr "Porth:"
 
-#: rlpr/kmrlprmanager.cpp:47 rlpr/kmwrlpr.cpp:85
-msgid "Empty host name."
-msgstr "Mae enw'r gwesteiwr yn wag."
+#: cups/kmwipp.cpp:52 management/kmwsmb.cpp:79
+msgid "Empty server name."
+msgstr "Mae enw'r gweinydd yn wag."
 
-#: rlpr/kmrlprmanager.cpp:49 rlpr/kmwrlpr.cpp:87
-msgid "Empty queue name."
-msgstr "Mae enw'r ciw yn wag."
+#: cups/kmwipp.cpp:59
+#, fuzzy
+msgid "Incorrect port number."
+msgstr "Mae'r rhif porth yn anghywir!"
 
-#: rlpr/kmwrlpr.cpp:124
-msgid "Remote queue %1 on %2"
-msgstr "Ciw pell %1 ar %2"
+#: cups/kmwipp.cpp:72
+#, fuzzy
+msgid "<nobr>Unable to connect to <b>%1</b> on port <b>%2</b> .</nobr>"
+msgstr "<nobr>Methu cysylltu i  <b>%1</b> ar borth <b>%2</b> !</nobr>"
 
-#: rlpr/kmwrlpr.cpp:199
-msgid "No Predefined Printers"
-msgstr "Nid yw argraffydd wedi'i ddiffinio eto"
+#: cups/kptagspage.cpp:36
+msgid ""
+" <qt>"
+"<p><b>Additional Tags</b></p> You may send additional commands to the CUPS "
+"server via this editable list.  There are 3 purposes for this: "
+"<ul> "
+"<li>Use any current or future standard CUPS job option not supported by the  "
+"TDEPrint GUI. </li> "
+"<li>Control any custom job option you may want to support in custom CUPS "
+"filters  and backends plugged into the CUPS filtering chain.</li>  "
+"<li>Send short messages to the operators of your production printers in your  "
+"<em>Central Repro Department</em>. </ul>  "
+"<p><b>Standard CUPS job options:</b> A complete list of standard CUPS job  "
+"options is in the <a href=\"http://localhost:631/sum.html\">CUPS User Manual</a>"
+".  Mappings of the kprinter user interface widgets to respective CUPS job "
+"option  names are named in the various <em>WhatsThis</em> help items..</p> "
+"<p><b>Custom CUPS job options:</b> CUPS print servers may be customized with "
+"additional  print filters and backends which understand custom job options. You "
+"can specify such  custom job options here. If in doubt, ask your system "
+"administrator..</p> "
+"<p><b> </b></p> "
+"<p><b>Operator Messages:</b> You may send additional messages to the "
+"operator(s) of your production printers (e.g. in your <em>"
+"Central Repro Department</p>) Messages can be read by the operator(s) (or "
+"yourself) by viewing the <em>\"Job IPP Report\"</em> for the job.</p> <b>"
+"Examples:</b>"
+"<br> "
+"<pre> A standard CUPS job option:"
+"<br>    <em>(Name) number-up</em>                -- <em>(Value) 9</em>                     "
+"<br> "
+"<br> A job option for custom CUPS filters or backends:"
+"<br>    <em>(Name) DANKA_watermark</em>          -- <em>"
+"(Value) Company_Confidential</em>   "
+"<br> "
+"<br> A message to the operator(s):"
+"<br>    <em>(Name) Deliver_after_completion</em> -- <em>"
+"(Value) to_Marketing_Departm.</em>"
+"<br> </pre> "
+"<p><b>Note:</b> the fields must not include spaces, tabs or quotes. You may "
+"need to  double-click on a field to edit it. "
+"<p><b>Warning:</b> Do not use such standard CUPS option names which also can be "
+"used  through the TDEPrint GUI. Results may be  unpredictable if they conflict, "
+" or if they are sent multiple times. For all options supported by the GUI, "
+"please do use  the GUI. (Each GUI element's  'WhatsThis' names the related CUPS "
+"option name.) </p>  </qt>"
+msgstr ""
 
-#: management/kmwend.cpp:82 rlpr/kmproprlpr.cpp:48
-msgid "Queue"
-msgstr "Ciw"
+#: cups/kptagspage.cpp:77
+msgid "Additional Tags"
+msgstr "Tagiau Ychwanegol"
 
-#: management/kmwsmb.cpp:81 rlpr/kmrlprmanager.cpp:45
-msgid "Empty printer name."
-msgstr "Mae enw'r argraffydd yn wag."
+#: cups/kptagspage.cpp:82 kpfilterpage.cpp:406 management/kmjobviewer.cpp:237
+#: management/kmwend.cpp:51 management/kxmlcommanddlg.cpp:141
+#: management/kxmlcommanddlg.cpp:545 tdefilelist.cpp:101
+msgid "Name"
+msgstr "Enw"
 
-#: rlpr/kmrlprmanager.cpp:63
-msgid "Printer not found."
-msgstr "Ni chanfuwyd argraffydd."
+#: cups/kptagspage.cpp:83
+msgid "Value"
+msgstr "Gwerth"
 
-#: rlpr/kmrlprmanager.cpp:75
-msgid "Not implemented yet."
-msgstr "Ni chynhelir eto."
+#: cups/kptagspage.cpp:92
+msgid "Read-Only"
+msgstr "Darllenadwy yn Unig"
 
-#: rlpr/kmconfigproxy.cpp:29
-msgid "Proxy"
-msgstr "Dirprwy"
+#: cups/kptagspage.cpp:115
+#, fuzzy
+msgid "The tag name must not contain any spaces, tabs or quotes: <b>%1</b>."
+msgstr "Ni chaiff enw'r tag gynnwys bylchnodau: <b>%1</b>."
 
-#: rlpr/kmconfigproxy.cpp:30
-msgid "RLPR Proxy Server Settings"
-msgstr "Gosodiadau Gweinydd Dirpwry RLPR"
+#: cups/kmwbanners.cpp:57
+msgid "No Banner"
+msgstr "Dim Baner"
 
-#: rlpr/kmproxywidget.cpp:32
-msgid "Proxy Settings"
-msgstr "Gosodiadau Dirprwy"
+#: cups/kmwbanners.cpp:58
+msgid "Classified"
+msgstr "Dosbarthedig"
 
-#: rlpr/kmproxywidget.cpp:36
-msgid "&Use proxy server"
-msgstr "&Defnyddio gweinydd dirprwy"
+#: cups/kmwbanners.cpp:59
+msgid "Confidential"
+msgstr "Cyfrinachol"
 
-#: kmjob.cpp:114
-msgid "Queued"
-msgstr "Mewn Ciw"
+#: cups/kmwbanners.cpp:60
+msgid "Secret"
+msgstr "Cyfrinachol"
 
-#: kmjob.cpp:117
-msgid "Held"
-msgstr "Ar afael"
+#: cups/kmwbanners.cpp:61
+msgid "Standard"
+msgstr "Safonol"
 
-#: kmjob.cpp:123
-msgid "Canceled"
-msgstr "Gwrthwnaed"
+#: cups/kmwbanners.cpp:62
+msgid "Top Secret"
+msgstr "Cyfrinachol Iawn"
 
-#: kmjob.cpp:126
-msgid "Aborted"
-msgstr "Terfynwyd"
+#: cups/kmwbanners.cpp:63
+msgid "Unclassified"
+msgstr "Annosbarthedig"
 
-#: kmjob.cpp:129
-msgid "Completed"
-msgstr "Gorffenwyd"
+#: cups/kmwbanners.cpp:86
+msgid "Banner Selection"
+msgstr "Dewis y Baner"
+
+#: cups/kmwbanners.cpp:99
+msgid ""
+"<p>Select the default banners associated with this printer. These banners will "
+"be inserted before and/or after each print job sent to the printer. If you "
+"don't want to use banners, select <b>No Banner</b>.</p>"
+msgstr ""
+"<p>Dewis y baneri rhagosodedig sy'n mynd efo'r argraffydd yma.  Bydd y baneri "
+"yma yn cael eu mewnosod cyn/ar ol pob swydd argraffu sy'n cael ei anfon i'r "
+"argraffydd.  Os nid ydych eisiau defnyddio baneri, dewiswch <b>Dim</b>.</p>"
+
+#: cups/kmwfax.cpp:39
+msgid "Fax Serial Device"
+msgstr "Dyfais Cyfresol Ffacs"
+
+#: cups/kmwfax.cpp:43
+msgid "<p>Select the device which your serial Fax/Modem is connected to.</p>"
+msgstr ""
+"<p>Dewis y dyfais y mae eich Ffacs/Modem cyfresol wedi'i gysylltu iddo.</p>"
+
+#: cups/kmwfax.cpp:81
+msgid "You must select a device."
+msgstr "Rhaid i chi ddewis dyfais."
+
+#: foomatic/kfoomaticprinterimpl.cpp:51 lpdunix/klpdunixprinterimpl.cpp:72
+msgid ""
+"No valid print executable was found in your path. Check your installation."
+msgstr ""
+"Ni chanfuwyd gweithredadwyn argraffu dilys yn eich llwybr.  Gwiriwch eich "
+"gosodiad."
+
+#: foomatic/kmfoomaticmanager.cpp:70
+msgid "This is not a Foomatic printer"
+msgstr "Nid yw hwn yn argraffydd Foomatic"
+
+#: foomatic/kmfoomaticmanager.cpp:75
+msgid "Some printer information are missing"
+msgstr "Mae gwybodaeth argraffydd ar goll"
+
+#: kmmanager.cpp:70
+msgid "This operation is not implemented."
+msgstr "Ni chynhelir y gweithrediad yma."
+
+#: kmmanager.cpp:169
+msgid "Unable to locate test page."
+msgstr "Methu canfod tudalen arbrawf."
+
+#: kmmanager.cpp:449
+msgid "Can't overwrite regular printer with special printer settings."
+msgstr ""
+"Methu ysgrifennu dros yr argraffydd arferol efo gosodiadau argraffydd arbennig."
+
+#: kmmanager.cpp:478
+#, c-format
+msgid "Parallel Port #%1"
+msgstr "Porth Paralel #%1"
+
+#: kmmanager.cpp:486 kmmanager.cpp:502 kxmlcommand.cpp:661
+#, c-format
+msgid "Unable to load TDE print management library: %1"
+msgstr "Methu llwytho rhaglengell rheoli argraffu TDE: %1"
+
+#: kmmanager.cpp:491 kxmlcommand.cpp:669
+msgid "Unable to find wizard object in management library."
+msgstr "Methu canfod gwrthrych dewin yn y rhaglengell rheoli."
+
+#: kmmanager.cpp:507
+msgid "Unable to find options dialog in management library."
+msgstr "Methu canfod ymgom dewisiadau yn y rhaglengell rheoli."
+
+#: kmmanager.cpp:534
+msgid "No plugin information available"
+msgstr "Dim gwybodaeth ategyn ar gael."
+
+#: kprintpreview.cpp:140
+msgid "Do you want to continue printing anyway?"
+msgstr "Ydych eisiau dal i argraffu beth bynnag?"
+
+#: kprintpreview.cpp:148 kprintpreview.cpp:227
+msgid "Print Preview"
+msgstr "Rhagolwg Argraffu"
+
+#: kprintpreview.cpp:278
+msgid ""
+"The preview program %1 cannot be found. Check that the program is correctly "
+"installed and located in a directory included in your PATH environment "
+"variable."
+msgstr ""
+"Methu canfod y rhaglen rhagolwg %1.  Cywirwch fod y rhaglen wedi'i gosod yn "
+"iawn ac wedi'i lleoli mewn cyfeiriadur sydd yn cael ei cynnwys yn eich newidyn "
+"amgylchedd PATH."
+
+#: kprintpreview.cpp:303
+msgid ""
+"Preview failed: neither the internal TDE PostScript viewer (KGhostView) nor any "
+"other external PostScript viewer could be found."
+msgstr ""
+"Methodd y rhagolwg: ni chanfodwyd ai'r gwelydd PostScript TDE mewnol neu unrhyw "
+"gwelydd PostScript allanol."
+
+#: kprintpreview.cpp:307
+#, c-format
+msgid ""
+"Preview failed: TDE could not find any application to preview files of type %1."
+msgstr ""
+" Methodd y rhagolwg: ni allodd TDE ganfod unrhyw cymhwysiant i ragolygu "
+"ffeiliau o fath %1."
+
+#: kprintpreview.cpp:317
+#, c-format
+msgid "Preview failed: unable to start program %1."
+msgstr "Methodd y rhagolwg: methu cychwyn rhaglen %1."
+
+#: kprintpreview.cpp:322
+msgid "Do you want to continue printing?"
+msgstr "Ydych eisiau dal i argraffu?"
+
+#: marginwidget.cpp:37
+msgid ""
+" <qt>  "
+"<p><b>Top Margin</b></p>.  "
+"<p>This spinbox/text edit field lets you control the top margin of your "
+"printout if the printing  application does not define its margins internally. "
+"</p>  "
+"<p>The setting works for instance for ASCII text file printing, or for printing "
+"from KMail and  and Konqueror.. </p> "
+"<p><b>Note:</b></p>This margin setting is not intended for KOffice or "
+"OpenOffice.org printing,  because these applications (or rather their users) "
+"are expected to do it by themselves.  It also does not work for PostScript or "
+"PDF file, which in most cases have their margins hardcoded  internally.</p>  "
+"<br>  "
+"<hr>  "
+"<p><em><b>Additional hint for power users:</b> This TDEPrint GUI element "
+"matches  with the CUPS commandline job option parameter:</em>  "
+"<pre>    -o page-top=...      # use values from \"0\" or higher. \"72\" is "
+"equal to 1 inch.  </pre> </p>  </qt>"
+msgstr ""
+
+#: marginwidget.cpp:57
+msgid ""
+" <qt>  "
+"<p><b>Bottom Margin</b></p>.  "
+"<p>This spinbox/text edit field lets you control the bottom margin of your "
+"printout if the printing  application does not define its margins internally. "
+"</p>  "
+"<p>The setting works for instance for ASCII text file printing, or for printing "
+"from KMail and  and Konqueror. </p> "
+"<p><b>Note:</b></p>This margin setting is not intended for KOffice or "
+"OpenOffice.org printing,  because these applications (or rather their users) "
+"are expected to do it by themselves.  It also does not work for PostScript or "
+"PDF file, which in most cases have their margins hardcoded  internally.</p>  "
+"<br>  "
+"<hr>  "
+"<p><em><b>Additional hint for power users:</b> This TDEPrint GUI element "
+"matches  with the CUPS commandline job option parameter:</em>  "
+"<pre>    -o page-bottom=...      # use values from \"0\" or higher. \"72\" is "
+"equal to 1 inch.  </pre> </qt>"
+msgstr ""
+
+#: marginwidget.cpp:76
+msgid ""
+" <qt>  "
+"<p><b>Left Margin</b></p>.  "
+"<p>This spinbox/text edit field lets you control the left margin of your "
+"printout if the printing  application does not define its margins internally. "
+"</p>  "
+"<p>The setting works for instance for ASCII text file printing, or for printing "
+"from KMail and  and Konqueror. </p> "
+"<p><b>Note:</b></p>This margin setting is not intended for KOffice or "
+"OpenOffice.org printing,  because these applications (or rather their users) "
+"are expected to do it by themselves.  It also does not work for PostScript or "
+"PDF file, which in most cases have their margins hardcoded  internally.</p>  "
+"<br>  "
+"<hr>  "
+"<p><em><b>Additional hint for power users:</b> This TDEPrint GUI element "
+"matches  with the CUPS commandline job option parameter:</em>  "
+"<pre>    -o page-left=...      # use values from \"0\" or higher. \"72\" is "
+"equal to 1 inch.  </pre> </qt>"
+msgstr ""
+
+#: marginwidget.cpp:95
+msgid ""
+" <qt>  "
+"<p><b>Right Margin</b></p>.  "
+"<p>This spinbox/text edit field lets you control the right margin of your "
+"printout if the printing  application does not define its margins internally. "
+"</p>  "
+"<p>The setting works for instance for ASCII text file printing, or for printing "
+"from KMail and  and Konqueror. </p> "
+"<p><b>Note:</b></p>This margin setting is not intended for KOffice or "
+"OpenOffice.org printing,  because these applications (or rather their users) "
+"are expected to do it by themselves.  It also does not work for PostScript or "
+"PDF file, which in most cases have their margins hardcoded  internally.</p>  "
+"<br>  "
+"<hr>  "
+"<p><em><b>Additional hint for power users:</b> This TDEPrint GUI element "
+"matches  with the CUPS commandline job option parameter:</em>  "
+"<pre>    -o page-right=...      # use values from \"0\" or higher. \"72\" is "
+"equal to 1 inch.  </pre> </qt>"
+msgstr ""
+
+#: marginwidget.cpp:114
+msgid ""
+" <qt>  "
+"<p><b>Change Measurement Unit<b></p>.  "
+"<p>You can change the units of measurement for the page margins here. Select "
+"from Millimeter, Centimeter, Inch or Pixels (1 pixel == 1/72 inch).  </p>  </qt>"
+msgstr ""
+
+#: marginwidget.cpp:121
+msgid ""
+" <qt>  "
+"<p><b>Custom Margins Checkbox</b></p>.  "
+"<p>Enable this checkbox if you want to modify the margins of your printouts  "
+"<p>You can change margin settings in 4 ways:  "
+"<ul>  "
+"<li>Edit the text fields. </li>  "
+"<li>Click spinbox arrows. </li>  "
+"<li>Scroll wheel of wheelmouses. </li>  "
+"<li>Drag margins in preview frame with mouse. </li>  </ul>  <b>Note:</b> "
+"The margin setting does not work if you load such files directly into  "
+"kprinter, which have their print margins hardcoded internally, like as most  "
+"PDF or PostScript files. It works for all ASCII text files however. It also may "
+"not  work with non-TDE applications which fail to  fully utilize the TDEPrint "
+"framework, such as OpenOffice.org. </p>  </qt>"
+msgstr ""
+
+#: marginwidget.cpp:138
+msgid ""
+" <qt>  "
+"<p><b>\"Drag-your-Margins\" </p>.  "
+"<p>Use your mouse to drag and set each margin on this little preview window. "
+"</p>  </qt>"
+msgstr ""
+
+#: marginwidget.cpp:148
+msgid "&Use custom margins"
+msgstr "&Defnyddio ymylon addasiedig"
+
+#: marginwidget.cpp:158
+msgid "&Top:"
+msgstr "&Pen:"
+
+#: marginwidget.cpp:159
+msgid "&Bottom:"
+msgstr "&Gwaelod:"
+
+#: marginwidget.cpp:160
+msgid "Le&ft:"
+msgstr "&Chwith:"
+
+#: marginwidget.cpp:161
+msgid "&Right:"
+msgstr "&De:"
+
+#: marginwidget.cpp:164
+msgid "Pixels (1/72nd in)"
+msgstr "Picseli (1/72nd in)"
+
+#: marginwidget.cpp:167
+msgid "Inches (in)"
+msgstr "Modfeddi (in)"
+
+#: marginwidget.cpp:168
+msgid "Centimeters (cm)"
+msgstr "Centimedrau (cm)"
+
+#: marginwidget.cpp:169
+msgid "Millimeters (mm)"
+msgstr "Milimedrau (mm)"
+
+#: kprinterimpl.cpp:156
+msgid "Cannot copy multiple files into one file."
+msgstr "Methu copïo ffeiliau lluosol i mewn i un ffeil."
+
+#: kprinterimpl.cpp:165
+msgid "Cannot save print file to %1. Check that you have write access to it."
+msgstr ""
+"Methu cadw ffeil argraffu i %1.  Cywirwch fod ganddoch cyrchiad ysgrifennu "
+"iddo."
+
+#: kprinterimpl.cpp:233
+#, c-format
+msgid "Printing document: %1"
+msgstr "Argraffu dogfen: %1"
+
+#: kprinterimpl.cpp:251
+#, c-format
+msgid "Sending print data to printer: %1"
+msgstr "Anfon data argraffu i argraffydd: %1"
+
+#: kprinterimpl.cpp:279
+msgid "Unable to start child print process. "
+msgstr "Methu cychwyn proses argraffu plentyn."
+
+#: kprinterimpl.cpp:281
+msgid ""
+"The TDE print server (<b>tdeprintd</b>) could not be contacted. Check that this "
+"server is running."
+msgstr ""
+"Methu cysylltu â'r gweinydd argraffu TDE (<b>tdeprintd</b>"
+"). Cywirwch fod y gweinydd yma yn rhedeg."
+
+#: kprinterimpl.cpp:283
+msgid ""
+"_: 1 is the command that <files> is given to\n"
+"Check the command syntax:\n"
+"%1 <files>"
+msgstr ""
+"Cywirwch y gystrawen gorchymyn: \n"
+" %1 <files>"
+
+#: kprinterimpl.cpp:290
+msgid "No valid file was found for printing. Operation aborted."
+msgstr "Methu canfod ffeil dilys i argraffu.  Terfynwyd y gweithrediad."
+
+#: kprinterimpl.cpp:325
+msgid ""
+"<p>Unable to perform the requested page selection. The filter <b>psselect</b> "
+"cannot be inserted in the current filter chain. See <b>Filter</b> "
+"tab in the printer properties dialog for further information.</p>"
+msgstr ""
+"<p>Methu cyflawni y dewisiad tudalen ceisiedig.  Ni ellir mewnosod yr hidl <b>"
+"psselect</b> yn y cadwyn hidl cyfredol.  Gweler y tab <b>Filter</b> "
+"yn yr ymgom priodweddau argraffydd am fwy o fanylion.</p>"
+
+#: kprinterimpl.cpp:355
+#, fuzzy
+msgid "<p>Could not load filter description for <b>%1</b>.</p>"
+msgstr "<qt>nid oes ganddoch ganiatàd i redeg <b>%1</b>.</qt>"
+
+#: kprinterimpl.cpp:371
+msgid ""
+"<p>Error while reading filter description for <b>%1</b>"
+". Empty command line received.</p>"
+msgstr ""
+"<p>Gwall wrth ddarllen disgrifiad hidl i <b>%1</b>. Derbynnwyd llinell "
+"gorchymyn a oedd yn wag. </p>"
+
+#: kprinterimpl.cpp:385
+msgid ""
+"The MIME type %1 is not supported as input of the filter chain (this may happen "
+"with non-CUPS spoolers when performing page selection on a non-PostScript "
+"file). Do you want TDE to convert the file to a supported format?</p>"
+msgstr ""
+"Ni chynhelir y math MIME %1 fel mewnbwn i'r cadwyn hidl (gall hyn ddigwydd efo "
+"sbwlwyr di-CUPS wrth cyflawni dewisiad tudalen ar ffeil ddi-PostScript).  Ydych "
+"eisiau i TDE drosi'r ffeil i fformat a gynhelir?</p>"
+
+#: kprinterimpl.cpp:389 kprinterimpl.cpp:509
+msgid "Convert"
+msgstr "Trosi"
+
+#: kprinterimpl.cpp:399
+msgid "Select MIME Type"
+msgstr "Dewis Math MIME"
+
+#: kprinterimpl.cpp:400
+msgid "Select the target format for the conversion:"
+msgstr "Dewis y fformat cyrchfan i'r trosi:"
+
+#: kprinterimpl.cpp:404 kprinterimpl.cpp:430
+msgid "Operation aborted."
+msgstr "Terfynwyd y gweithrediad."
+
+#: kprinterimpl.cpp:410
+msgid "No appropriate filter found. Select another target format."
+msgstr "Methu canfod hidl addas.  Dewis fformat cyrchfan arall."
+
+#: kprinterimpl.cpp:423
+msgid ""
+"<qt>Operation failed with message:"
+"<br>%1"
+"<br>Select another target format.</qt>"
+msgstr ""
+"<qt>Methodd y gweithrediad efo'r neges:"
+"<br>%1"
+"<br>Dewis fformat cyrchfan arall.</qt>"
+
+#: kprinterimpl.cpp:441
+msgid "Filtering print data"
+msgstr "Hidlo data argraffu"
+
+#: kprinterimpl.cpp:445
+msgid "Error while filtering. Command was: <b>%1</b>."
+msgstr "Gwall wrth hidlo.  Y gorchymyn oedd: <b>%1</b>."
+
+#: kprinterimpl.cpp:487
+msgid "<qt>The print file is empty and will be ignored:<p>%1</p></qt>"
+msgstr ""
+
+#: kprinterimpl.cpp:497
+#, fuzzy
+msgid ""
+"<qt>The file format <em> %1 </em> is not directly supported by the current "
+"print system. You now have 3 options: "
+"<ul> "
+"<li> TDE can attempt to convert this file automatically to a supported format. "
+"(Select <em>Convert</em>) </li>"
+"<li> You can try to send the file to the printer without any conversion. "
+"(Select <em>Keep</em>) </li>"
+"<li> You can cancel the printjob. (Select <em>Cancel</em>) </li></ul> "
+"Do you want TDE to attempt and convert this file to %2?</qt>"
+msgstr ""
+"Ni chynhelir y fformat ffeil %1 yn uniongyrchol gan y cysawd argraffu cyfredol. "
+" Gall TDE geisio trosi'r ffeil yma yn awtomatig i fformat a gynhelir.  Ond "
+"gallwch dal i geisio anfon y ffeil i'r argraffydd heb drosiad o gwbl.  Ydych "
+"eisiau i TDE geisio trosi'r ffeil yma i %2?"
+
+#: kprinterimpl.cpp:510 management/kmwname.cpp:62
+msgid "Keep"
+msgstr "Cadw"
+
+#: kprinterimpl.cpp:518
+msgid ""
+"<qt>No appropriate filter was found to convert the file format %1 into %2."
+"<br>"
+"<ul>"
+"<li>Go to <i>System Options -> Commands</i> to look through the list of "
+"possible filters. Each filter executes an external program.</li>"
+"<li> See if the required external program is available.on your system.</li></ul>"
+"</qt>"
+msgstr ""
 
 #: tools/escputil/escpwidget.cpp:45
 msgid "EPSON InkJet Printer Utilities"
@@ -2589,7 +2744,23 @@ msgstr "Terfynodd y gweithrediad efo gwallau. "
 msgid "Output"
 msgstr "Allbwn"
 
-#: management/kmmainview.cpp:71
+#: kprintaction.cpp:117 kprintaction.cpp:122 kprintaction.cpp:127
+msgid "&Export..."
+msgstr "&Allforio..."
+
+#: driver.cpp:385 foomatic2loader.cpp:268
+msgid "Adjustments"
+msgstr "Addasiadau"
+
+#: kmprinter.cpp:144
+msgid "(rejecting jobs)"
+msgstr "(gwrthod swyddi)"
+
+#: kmprinter.cpp:144
+msgid "(accepting jobs)"
+msgstr "(derbyn swyddi)"
+
+#: management/kmmainview.cpp:72
 msgid ""
 "The printer %1 already exists. Continuing will overwrite existing printer. Do "
 "you want to continue?"
@@ -2597,229 +2768,222 @@ msgstr ""
 "Mae'r argraffydd %1 mewn bod yn barod.  Bydd mynd ymlaen yn ysgrifennu dros yr "
 "argraffydd sy'n bodoli.  Ydych eisiau mynd ymlaen?"
 
-#: management/kmmainview.cpp:132 management/kmmainview.cpp:779
-#: management/kmmainview.cpp:855 management/kmmainview.cpp:879
+#: management/kmmainview.cpp:133 management/kmmainview.cpp:783
+#: management/kmmainview.cpp:859 management/kmmainview.cpp:883
 msgid "Initializing manager..."
 msgstr "Cychwyn y rheolydd..."
 
-#: management/kmmainview.cpp:179
+#: management/kmmainview.cpp:180
 msgid "&Icons,&List,&Tree"
 msgstr "&Eiconau,&Rhestr,&Coeden"
 
-#: management/kmmainview.cpp:183
+#: management/kmmainview.cpp:184
 msgid "Start/Stop Printer"
 msgstr "Cychwyn/Stopio Argraffydd"
 
-#: management/kmmainview.cpp:185
+#: management/kmmainview.cpp:186
 msgid "&Start Printer"
 msgstr "&Cychwyn Argraffydd"
 
-#: management/kmmainview.cpp:186
+#: management/kmmainview.cpp:187
 msgid "Sto&p Printer"
 msgstr "&Stopio Argraffydd"
 
-#: management/kmmainview.cpp:188
+#: management/kmmainview.cpp:189
 msgid "Enable/Disable Job Spooling"
 msgstr "Alluogi/Analluogi Sbwlio Swyddi"
 
-#: management/kmmainview.cpp:190
+#: management/kmmainview.cpp:191
 msgid "&Enable Job Spooling"
 msgstr "&Alluogi Sbwlio Swyddi"
 
-#: management/kmmainview.cpp:191
+#: management/kmmainview.cpp:192
 msgid "&Disable Job Spooling"
 msgstr "A&nalluogi Sbwlio Swyddi"
 
-#: management/kmmainview.cpp:194
+#: management/kmmainview.cpp:195
 msgid "&Configure..."
 msgstr "&Ffurweddu..."
 
-#: management/kmmainview.cpp:195
+#: management/kmmainview.cpp:196
 msgid "Add &Printer/Class..."
 msgstr "&Ychwanegu Argraffydd/Dosbarth..."
 
-#: management/kmmainview.cpp:196
+#: management/kmmainview.cpp:197
 msgid "Add &Special (pseudo) Printer..."
 msgstr "Ychwanegu (ffug-)&Argraffydd Arbennig"
 
-#: management/kmmainview.cpp:197
+#: management/kmmainview.cpp:198
 msgid "Set as &Local Default"
 msgstr "&Gosod fel Rhagosodiad Lleol"
 
-#: management/kmmainview.cpp:198
+#: management/kmmainview.cpp:199
 msgid "Set as &User Default"
 msgstr "Gosod fel Rhagosodiad &Defnyddiwr"
 
-#: management/kmmainview.cpp:199
+#: management/kmmainview.cpp:200
 msgid "&Test Printer..."
 msgstr "A&rbrofi Argraffydd..."
 
-#: management/kmmainview.cpp:200
+#: management/kmmainview.cpp:201
 msgid "Configure &Manager..."
 msgstr "Ffur&fweddu Rheolydd..."
 
-#: management/kmmainview.cpp:201
+#: management/kmmainview.cpp:202
 msgid "Initialize Manager/&View"
 msgstr "Cychwyn Rheloydd/&Golwg"
 
-#: management/kmmainview.cpp:203
+#: management/kmmainview.cpp:204
 msgid "&Orientation"
 msgstr "&Cyfeiriadaeth"
 
-#: management/kmmainview.cpp:206
+#: management/kmmainview.cpp:207
 msgid "&Vertical,&Horizontal"
 msgstr "&Fertigol,&Llorweddol"
 
-#: management/kmmainview.cpp:210
+#: management/kmmainview.cpp:211
 msgid "R&estart Server"
 msgstr "A&il-gychwyn Gweinydd"
 
-#: management/kmmainview.cpp:211
+#: management/kmmainview.cpp:212
 msgid "Configure &Server..."
 msgstr "Ffurweddu Gwei&nydd..."
 
-#: management/kmmainview.cpp:214
+#: management/kmmainview.cpp:213
+#, fuzzy
+msgid "Configure Server Access..."
+msgstr "Ffurweddu Gwei&nydd..."
+
+#: management/kmmainview.cpp:216
 msgid "Hide &Toolbar"
 msgstr "Cuddi&o Bar Offer"
 
-#: management/kmmainview.cpp:216
+#: management/kmmainview.cpp:218
 #, fuzzy
 msgid "Show Me&nu Toolbar"
 msgstr "Dangos Bar &Offer"
 
-#: management/kmmainview.cpp:217
+#: management/kmmainview.cpp:219
 #, fuzzy
 msgid "Hide Me&nu Toolbar"
 msgstr "Gweld &Bar Dewislenni"
 
-#: management/kmmainview.cpp:219
+#: management/kmmainview.cpp:221
 #, fuzzy
 msgid "Show Pr&inter Details"
 msgstr "Dangos/Cuddio &Manylion Argraffydd"
 
-#: management/kmmainview.cpp:220
+#: management/kmmainview.cpp:222
 #, fuzzy
 msgid "Hide Pr&inter Details"
 msgstr "Dangos/Cuddio &Manylion Argraffydd"
 
-#: management/kmmainview.cpp:224
+#: management/kmmainview.cpp:226
 msgid "Toggle Printer &Filtering"
 msgstr "Cychwyn/Stopio &Hidlo Argraffydd"
 
-#: management/kmmainview.cpp:228
-msgid "%1 &Handbook"
-msgstr "&Llawlyfr %1"
-
-#: management/kmmainview.cpp:229
-msgid "%1 &Web Site"
-msgstr "%1 &Gwefan"
-
-#: management/kmmainview.cpp:231
+#: management/kmmainview.cpp:230
 msgid "Pri&nter Tools"
 msgstr "&Offer Argraffydd"
 
-#: management/kmmainview.cpp:296
+#: management/kmmainview.cpp:295
 msgid "Print Server"
 msgstr "Gweinydd Argraffu"
 
-#: management/kmmainview.cpp:302
+#: management/kmmainview.cpp:301
 msgid "Print Manager"
 msgstr "Rheolydd Argraffu"
 
-#: management/kmmainview.cpp:319
-msgid "Documentation"
-msgstr "Dogfenniaeth"
-
-#: management/kmmainview.cpp:340
+#: management/kmmainview.cpp:334
 msgid "An error occurred while retrieving the printer list."
 msgstr "Digwyddodd gwall wrth nôl y rhestr argraffyddion."
 
-#: management/kmmainview.cpp:514
+#: management/kmmainview.cpp:511
 #, c-format
 msgid "Unable to modify the state of printer %1."
 msgstr "Methu newid cyflwr argraffydd %1."
 
-#: management/kmmainview.cpp:525
+#: management/kmmainview.cpp:522
 msgid "Do you really want to remove %1?"
 msgstr "Ydych wir eisiau gwaredu %1?"
 
-#: management/kmmainview.cpp:529
+#: management/kmmainview.cpp:526
 #, c-format
 msgid "Unable to remove special printer %1."
 msgstr "Methu gwaredu argraffydd arbennig %1."
 
-#: management/kmmainview.cpp:532
+#: management/kmmainview.cpp:529
 #, c-format
 msgid "Unable to remove printer %1."
 msgstr "Methu gwaredu argraffydd %1."
 
-#: management/kmmainview.cpp:562
+#: management/kmmainview.cpp:559
 #, c-format
 msgid "Configure %1"
 msgstr "Ffurweddu %1 "
 
-#: management/kmmainview.cpp:569
+#: management/kmmainview.cpp:566
 #, c-format
 msgid "Unable to modify settings of printer %1."
 msgstr "Methu newid gosodiadau argraffydd %1."
 
-#: management/kmmainview.cpp:573
+#: management/kmmainview.cpp:570
 #, c-format
 msgid "Unable to load a valid driver for printer %1."
 msgstr "Methu llwytho gyrrydd dilys am argraffydd %1."
 
-#: management/kmmainview.cpp:585
+#: management/kmmainview.cpp:582
 msgid "Unable to create printer."
 msgstr "Methu creu argraffydd."
 
-#: management/kmmainview.cpp:597
+#: management/kmmainview.cpp:594
 msgid "Unable to define printer %1 as default."
 msgstr "Methu diffinio argraffydd %1 fel rhagosodiad."
 
-#: management/kminstancepage.cpp:265 management/kmmainview.cpp:632
+#: management/kminstancepage.cpp:265 management/kmmainview.cpp:629
 msgid "You are about to print a test page on %1. Do you want to continue?"
 msgstr ""
 "Rydych ar fin argraffu tudalen arbrawf ar %1.  Ydych eisiau mynd ymlaen?"
 
-#: management/kminstancepage.cpp:265 management/kmmainview.cpp:632
+#: management/kminstancepage.cpp:265 management/kmmainview.cpp:629
 msgid "Print Test Page"
 msgstr "Argraffu Tudalen Arbrawf"
 
-#: management/kminstancepage.cpp:270 management/kmmainview.cpp:635
+#: management/kminstancepage.cpp:270 management/kmmainview.cpp:632
 #, c-format
 msgid "Test page successfully sent to printer %1."
 msgstr "Anfonwyd y dudalen arbrawf yn llwyddiannus i argraffydd %1."
 
-#: management/kmmainview.cpp:637
+#: management/kmmainview.cpp:634
 #, c-format
 msgid "Unable to test printer %1."
 msgstr "Methu arbrofi argraffydd %1."
 
-#: management/kmmainview.cpp:650
+#: management/kmmainview.cpp:647
 msgid "Error message received from manager:</p><p>%1</p>"
 msgstr "Derbynwyd neges gwall oddiwrth y rheolydd: </p><p>%1</p>"
 
-#: management/kmmainview.cpp:652
+#: management/kmmainview.cpp:649
 msgid "Internal error (no error message)."
 msgstr "Gwall mewnol (dim neges gwall)."
 
-#: management/kmmainview.cpp:670
+#: management/kmmainview.cpp:667
 msgid "Unable to restart print server."
 msgstr "Methu ail-gychwyn y gweinydd argraffu."
 
-#: management/kmmainview.cpp:675
+#: management/kmmainview.cpp:672
 msgid "Restarting server..."
 msgstr "Ail-gychwyn gweinydd... "
 
-#: management/kmmainview.cpp:685
+#: management/kmmainview.cpp:682
 msgid "Unable to configure print server."
 msgstr "Methu ffurfweddu'r gweinydd argraffu."
 
-#: management/kmmainview.cpp:690
+#: management/kmmainview.cpp:687
 msgid "Configuring server..."
 msgstr "Ffurfweddu'r gweinydd..."
 
-#: management/kmmainview.cpp:838
+#: management/kmmainview.cpp:842
 msgid ""
 "Unable to start printer tool. Possible reasons are: no printer selected, the "
 "selected printer doesn't have any local device defined (printer port), or the "
@@ -2830,167 +2994,10 @@ msgstr ""
 "wedi'i ddiffinio (porth argraffydd), neu nid oedd yn bosibl canfod y "
 "rhaglengell offer."
 
-#: management/kmmainview.cpp:862
+#: management/kmmainview.cpp:866
 msgid "Unable to retrieve the printer list."
 msgstr "Methu nôl y rhestr argraffyddion."
 
-#: management/kmconfigcommand.cpp:33
-msgid "Commands"
-msgstr "Gorchmynion"
-
-#: management/kmconfigcommand.cpp:34
-msgid "Command Settings"
-msgstr "Gosodiadau Gorchmynion"
-
-#: management/kmconfigcommand.cpp:37
-msgid "Edit/Create Commands"
-msgstr "Golygu/Creu Gorchmynion"
-
-#: management/kmconfigcommand.cpp:39
-msgid ""
-"<p>Command objects perform a conversion from input to output."
-"<br>They are used as the basis to build both print filters and special "
-"printers. They are described by a command string, a set of options, a set of "
-"requirements and associated mime types. Here you can create new command objects "
-"and edit existing ones. All changes will only be effective for you."
-msgstr ""
-"<p>Mae gwrthrychau gorchymyn yn trosi o fewnbwn i allbwn."
-"<br> Maent yn cael eu defnyddio fel sail i adeiladu arno hidlau argraffu ac "
-"argraffyddion arbennig.  Disgrifir gan llinell gorchymyn, set o ddewisiadau, "
-"set o ofynion a mathau mime cyd.  Yn y fan yma, cewch greu gwrthrychau "
-"gorchymyn newydd, a golygu rhai sydd mewn bod.  Bydd pob newid yn effeithiol i "
-"neb ond ti."
-
-#: management/kmwizard.cpp:64 management/kmwizard.cpp:209
-msgid "&Next >"
-msgstr "&Nesaf >"
-
-#: management/kmwizard.cpp:66
-msgid "< &Back"
-msgstr "< &Yn Ol"
-
-#: management/kmwizard.cpp:131 management/kmwizard.cpp:166
-#: management/kmwizard.cpp:191
-msgid "Add Printer Wizard"
-msgstr "Dewin Ychwanegu Argraffydd"
-
-#: management/kmwizard.cpp:166
-msgid "Modify Printer"
-msgstr "Addasu Argraffydd"
-
-#: management/kmwizard.cpp:191
-msgid "Unable to find the requested page."
-msgstr "Methu canfod y dudalen a ofynnwyd amdani."
-
-#: management/kmwizard.cpp:207 management/kmwizard.cpp:234
-msgid "&Finish"
-msgstr "&Gorffen"
-
-#: management/tdeprint_management_module.cpp:48
-msgid "Select Command"
-msgstr "Dewis Gorchymyn"
-
-#: management/kmwlocal.cpp:38
-msgid "Local Port Selection"
-msgstr "Dewis y Borth Leol"
-
-#: management/kmwlocal.cpp:50
-msgid "Local System"
-msgstr "Cysawd Lleol"
-
-#: management/kmwlocal.cpp:57
-msgid "Parallel"
-msgstr "Paralel"
-
-#: management/kmwlocal.cpp:58
-msgid "Serial"
-msgstr "Cyfresol"
-
-#: management/kmwlocal.cpp:59
-msgid "USB"
-msgstr "USB"
-
-#: driver.cpp:389 management/kmwlocal.cpp:60
-msgid "Others"
-msgstr "Eraill"
-
-#: management/kmwlocal.cpp:63
-msgid ""
-"<p>Select a valid detected port, or enter directly the corresponding URI in the "
-"bottom edit field.</p>"
-msgstr ""
-"<p>Dewiswch borth ddilys sydd wedi ei darganfod, neu mewnosodwch yn "
-"uniongyrchol yr URI cyfatebol yn y maes golygu wrth y gwaelod.</p>"
-
-#: management/kmwlocal.cpp:78
-msgid ""
-"_: The URI is empty\n"
-"Empty URI."
-msgstr "Mae'r URI yn wag."
-
-#: management/kmwlocal.cpp:83
-msgid "The local URI doesn't correspond to a detected port. Continue?"
-msgstr ""
-"Nid yw'r URI lleol yn cyfatebu i borth sydd wedi ei darganfod.  Mynd ymlaen?"
-
-#: management/kmwlocal.cpp:85
-msgid "Select a valid port."
-msgstr "Dewis porth ddilys."
-
-#: management/kmwlocal.cpp:166
-msgid "Unable to detect local ports."
-msgstr "Methu darganfod pyrth lleol."
-
-#: management/kmpropbackend.cpp:34
-msgid "Printer type:"
-msgstr "Math ye argraffydd:"
-
-#: management/kmpropbackend.cpp:48
-msgid "Interface"
-msgstr "Rhyngwyneb"
-
-#: management/kmpropbackend.cpp:49
-msgid "Interface Settings"
-msgstr "Gosodiadau'r Rhyngwyneb"
-
-#: management/kmpropbackend.cpp:62
-msgid "IPP Printer"
-msgstr "Argraffydd IPP"
-
-#: management/kmpropbackend.cpp:63
-msgid "Local USB Printer"
-msgstr "Argraffydd USB Lleol"
-
-#: management/kmpropbackend.cpp:64
-msgid "Local Parallel Printer"
-msgstr "Argraffydd Paralel Lleol"
-
-#: management/kmpropbackend.cpp:65
-msgid "Local Serial Printer"
-msgstr "Argraffydd Cyfresol Lleol"
-
-#: management/kmpropbackend.cpp:66
-msgid "Network Printer (socket)"
-msgstr "Argraffydd Rhwydwaith (soced)"
-
-#: management/kmpropbackend.cpp:67
-msgid "SMB printers (Windows)"
-msgstr "Argrafyddion SMB (Windows)"
-
-#: management/kmpropbackend.cpp:69
-msgid "File printer"
-msgstr "Argraffydd Ffeil"
-
-#: management/kmpropbackend.cpp:70
-msgid "Serial Fax/Modem printer"
-msgstr "Argraffydd cyfresol Ffacs/Modem"
-
-#: management/kmpropbackend.cpp:71
-msgid ""
-"_: Unknown Protocol\n"
-"Unknown"
-msgstr "Anhysbys"
-
 #: management/kminfopage.cpp:44 management/kmpropgeneral.cpp:38
 msgid ""
 "_: Physical Location\n"
@@ -3042,145 +3049,9 @@ msgid ""
 "Unknown"
 msgstr "Anhysbys"
 
-#: management/kmwclass.cpp:37
-msgid "Class Composition"
-msgstr "Cyfansoddiad y Dosbarth"
-
-#: management/kmwclass.cpp:52
-msgid "Available printers:"
-msgstr "Argraffyddion ar gael:"
-
-#: management/kmwclass.cpp:53
-msgid "Class printers:"
-msgstr "Dosbarthiad yr argraffydd:"
-
-#: management/kmwclass.cpp:79
-#, fuzzy
-msgid "You must select at least one printer."
-msgstr "Rhaid i chi ddewis o leiaf un argraffydd!"
-
-#: management/kmpropgeneral.cpp:37
-msgid "Printer name:"
-msgstr "Enw'r argraffydd:"
-
-#: management/kmconfiggeneral.cpp:45 management/kmpropgeneral.cpp:55
-msgid "General Settings"
-msgstr "Gosodiadau Cyffredinol"
-
-#: management/networkscanner.cpp:104 management/networkscanner.cpp:184
-msgid "Sc&an"
-msgstr "Sy&llu"
-
-#: management/networkscanner.cpp:111
-msgid "Network scan:"
-msgstr "Syllu ar y rhwydwaith:"
-
-#: management/networkscanner.cpp:112 management/networkscanner.cpp:299
-#: management/networkscanner.cpp:310
-#, c-format
-msgid "Subnet: %1"
-msgstr "Is-rwydwaith: %1"
-
-#: management/networkscanner.cpp:161
-msgid ""
-"You are about to scan a subnet (%1.*) that does not correspond to the current "
-"subnet of this computer (%2.*). Do you want to scan the specified subnet "
-"anyway?"
-msgstr ""
-"Rydych ar fin syllu ar is-rwydwaith (%1.*) nad yw'n cyfateb i is-rwydwaith "
-"cyfredol y cyfeiriadur yma (%2.*).  Ydych eisiau syllu ar yr is-rwydwaith "
-"penodol beth bynnag?"
-
-#: management/networkscanner.cpp:164
-msgid "&Scan"
-msgstr "&Syllu"
-
-#: management/kmwsocketutil.cpp:52 management/networkscanner.cpp:338
-msgid "&Subnetwork:"
-msgstr "&Is-rwydwaith:"
-
-#: management/kmwsocketutil.cpp:54 management/networkscanner.cpp:340
-msgid "&Timeout (ms):"
-msgstr "&Goramser (ms):"
-
-#: management/kmwsocketutil.cpp:92 management/networkscanner.cpp:378
-msgid "Scan Configuration"
-msgstr "Syllu ar y Ffurfweddiad"
-
-#: management/kmwsocketutil.cpp:104 management/kmwsocketutil.cpp:110
-#: management/networkscanner.cpp:390 management/networkscanner.cpp:396
-msgid "Wrong subnetwork specification."
-msgstr "Penodiad is-rwydwaith anghywir."
-
-#: management/kmwsocketutil.cpp:118 management/networkscanner.cpp:404
-msgid "Wrong timeout specification."
-msgstr "Penodiad goramser anghywir."
-
-#: management/kmwsocketutil.cpp:121 management/networkscanner.cpp:407
-msgid "Wrong port specification."
-msgstr "Penodiad porth anghywir."
-
-#: management/kmdriverdialog.cpp:48
-msgid ""
-"Some options are in conflict. You must resolve those conflicts before "
-"continuing."
-msgstr ""
-"Mae rhai dewisiadau yn gwrthdaro.  Rhaid i chi ddatrys y gwrthdaro yma cyn i "
-"chi fynd ymlaen."
-
-#: management/kmwfile.cpp:35
-msgid "File Selection"
-msgstr "Dewis Ffeil"
-
-#: management/kmwfile.cpp:41
-msgid ""
-"<p>The printing will be redirected to a file. Enter here the path of the file "
-"you want to use for redirection. Use an absolute path or the browse button for "
-"graphical selection.</p>"
-msgstr ""
-"<p>Bydd yr argraffu yn cael ei ail-gyfeirio i ffeil.  Mewnosodwch yma llwybr y "
-"ffeil yr ydych eisiau ei ddefnyddio am yr ail-gyfeirio.  Defnyddiwch llwybr "
-"llwyr, neu'r botwm pori am ddewis graffegol.</p>"
-
-#: management/kmwfile.cpp:44
-msgid "Print to file:"
-msgstr "Argraffu i ffeil:"
-
-#: management/kmconfiggeneral.cpp:137 management/kmwfile.cpp:60
-msgid "Empty file name."
-msgstr "Mae enw'r ffeil yn wag."
-
-#: management/kmwfile.cpp:66
-#, fuzzy
-msgid "Directory does not exist."
-msgstr "Nid yw'r cyfeiriadur yn bodoli!"
-
-#: management/kmconfigpreview.cpp:35
-msgid "Preview"
-msgstr "Rhagweld"
-
-#: management/kmconfigpreview.cpp:36
-msgid "Preview Settings"
-msgstr "Rhagolygu Gosodiadau"
-
-#: management/kmconfigpreview.cpp:39
-msgid "Preview Program"
-msgstr "Rhagolygu Rhaglen"
-
-#: management/kmconfigpreview.cpp:41
-msgid "&Use external preview program"
-msgstr "&Defnyddio rhaglen rhagolygu allanol"
-
-#: management/kmconfigpreview.cpp:44
-msgid ""
-"You can use an external preview program (PS viewer) instead of the TDE built-in "
-"preview system. Note that if the TDE default PS viewer (KGhostView) cannot be "
-"found, TDE tries automatically to find another external PostScript viewer"
-msgstr ""
-"Cewch ddefnyddio rhaglen rhagolygu allanol (gwelydd PS) yn lle'r cysawd "
-"rhagolygu mewnol TDE.  Noder os ni ellir canfod y gwelydd PS rhagosodedig TDE "
-"(KGhostView), mae TDE yn ceisio  yn awtomatig i ganfod gwelydd allanol "
-"PostScript arall. "
+#: management/kmpropcontainer.cpp:35
+msgid "Change..."
+msgstr "Newid..."
 
 #: management/kmwdrivertest.cpp:41
 msgid "Printer Test"
@@ -3238,149 +3109,6 @@ msgstr "Methu gwaredu argraffydd dros dro."
 msgid "Unable to create temporary printer."
 msgstr "Methu creu argraffydd dros dro."
 
-#: management/kmpropwidget.cpp:50
-msgid ""
-"<qt>Unable to change printer properties. Error received from manager:"
-"<p>%1</p></qt>"
-msgstr ""
-"<qt>Methu newid priodweddau'r argraffydd.  Derbynwyd gwall oddiwrth y rheolydd:"
-"<p>%1</p></qt> "
-
-#: management/kaddprinterwizard.cpp:10
-msgid "Configure TDE Print"
-msgstr "Ffurfweddu TDE Argraffu"
-
-#: management/kaddprinterwizard.cpp:11
-msgid "Configure print server"
-msgstr "Ffurweddu gweinydd argraffu"
-
-#: management/kaddprinterwizard.cpp:18
-msgid "Start the add printer wizard"
-msgstr "Cychwyn y dewin ychwanegu argraffydd"
-
-#: management/kmdbcreator.cpp:92
-msgid ""
-"No executable defined for the creation of the driver database. This operation "
-"is not implemented."
-msgstr ""
-"Ni ddiffiniwyd gweithredadwyn i greu'r cronfa gyrryddion.  Ni chynhelir y "
-"gweithrediad yma."
-
-#: management/kmdbcreator.cpp:95
-msgid ""
-"The executable %1 could not be found in your PATH. Check that this program "
-"exists and is accessible in your PATH variable."
-msgstr ""
-"Ni chanfuwyd y gweithredadwyn %1 yn eich PATH.  Gwiriwch fod y rhaglen yma yn "
-"bodoli ac yn cyrchadwy yn eich newidyn PATH."
-
-#: management/kmdbcreator.cpp:99
-msgid ""
-"Unable to start the creation of the driver database. The execution of %1 "
-"failed."
-msgstr "Methu cychwyn creu'r cronfa gyrryddion.  Methodd gweithredu %1."
-
-#: management/kmdbcreator.cpp:113
-msgid "Please wait while TDE rebuilds a driver database."
-msgstr "Arhoswch wrth i TDE ail-adeiladu cronfa gyrryddion."
-
-#: management/kmdbcreator.cpp:114
-msgid "Driver Database"
-msgstr "Cronfa Gyrryddion"
-
-#: management/kmdbcreator.cpp:171
-#, fuzzy
-msgid ""
-"Error while creating driver database: abnormal child-process termination."
-msgstr ""
-"Gwall wrth greu cronfa gyrryddion: terfynwyd y proses plentyn yn anarferol!"
-
-#: management/kmwpassword.cpp:37
-msgid "User Identification"
-msgstr "Dynodiad y Defnyddiwr"
-
-#: management/kmwpassword.cpp:43
-#, fuzzy
-msgid ""
-"<p>This backend may require a login/password to work properly. Select the type "
-"of access to use and fill in the login and password entries if needed.</p>"
-msgstr ""
-"<p>Efallai bydd gan yr ol-wyneb yma angen mewnosodiad/cyfrinair i weithio yn "
-"gywir.  Llenwch y mewnosodiadau gofynnol, neu alluogwch <b>Cyfrif gwestai</b> "
-"er mwyn defnyddio cyrchiad di-enw.</p>"
-
-#: management/kmwpassword.cpp:49
-msgid "&Login:"
-msgstr "&Mewnosod:"
-
-#: management/kmwpassword.cpp:53
-msgid "&Anonymous (no login/password)"
-msgstr ""
-
-#: management/kmwpassword.cpp:54
-#, fuzzy
-msgid "&Guest account (login=\"guest\")"
-msgstr "&Cyfrif gwestai"
-
-#: management/kmwpassword.cpp:55
-#, fuzzy
-msgid "Nor&mal account"
-msgstr "&Cyfrif gwestai"
-
-#: management/kmwpassword.cpp:88
-#, fuzzy
-msgid "Select one option"
-msgstr "Dewis Ffont"
-
-#: management/kmwpassword.cpp:90
-#, fuzzy
-msgid "User name is empty."
-msgstr "Mae enw'r defnyddiwr yn wag!"
-
-#: management/kmwsocket.cpp:38
-msgid "Network Printer Information"
-msgstr "Gwybodaeth Argraffydd Rhwydwaith"
-
-#: management/kmwsocket.cpp:48
-msgid "&Printer address:"
-msgstr "&Cyfeiriad yr argraffydd:"
-
-#: management/kmwsocket.cpp:49
-msgid "P&ort:"
-msgstr "&Porth:"
-
-#: management/kmwsocket.cpp:98
-#, fuzzy
-msgid "You must enter a printer address."
-msgstr "Rhaid i chi fewnosod cyfeiriad argraffydd!"
-
-#: management/kmwsocket.cpp:109
-#, fuzzy
-msgid "Wrong port number."
-msgstr "Rhif porth anghywir!"
-
-#: management/kmpropcontainer.cpp:35
-msgid "Change..."
-msgstr "Newid..."
-
-#: management/kmconfigdialog.cpp:38
-msgid "TDE Print Configuration"
-msgstr "Ffurfweddiad Argraffu TDE"
-
-#: management/kmwdriver.cpp:33
-msgid "Printer Model Selection"
-msgstr "Dewis Model o Argraffydd"
-
-#: management/kmwdriver.cpp:80 management/kmwend.cpp:106
-#: management/kmwname.cpp:83
-msgid "Raw printer"
-msgstr "Argraffydd crau"
-
-#: management/kmwdriver.cpp:113
-#, fuzzy
-msgid "Internal error: unable to locate the driver."
-msgstr "Gwall mewnol: methu lleoli'r gyrrydd!"
-
 #: management/kmjobviewer.cpp:101 management/kmjobviewer.cpp:158
 msgid "No Printer"
 msgstr "Dim argraffydd"
@@ -3510,210 +3238,662 @@ msgstr "Mehtodd y gweithrediad."
 msgid "Print Job Settings"
 msgstr "Gosodiadau Swydd Argraffu"
 
-#: management/kmconfiggeneral.cpp:48
-msgid "Refresh Interval"
-msgstr "Cyfnod Adnewyddu"
+#: management/kmconfigcommand.cpp:33
+msgid "Commands"
+msgstr "Gorchmynion"
 
-#: management/kmconfiggeneral.cpp:51
-msgid " sec"
-msgstr "sec"
+#: management/kmconfigcommand.cpp:34
+msgid "Command Settings"
+msgstr "Gosodiadau Gorchmynion"
 
-#: management/kmconfiggeneral.cpp:53
+#: management/kmconfigcommand.cpp:37
+msgid "Edit/Create Commands"
+msgstr "Golygu/Creu Gorchmynion"
+
+#: management/kmconfigcommand.cpp:39
 msgid ""
-"This time setting controls the refresh rate of various <b>TDE Print</b> "
-"components like the print manager and the job viewer."
+"<p>Command objects perform a conversion from input to output."
+"<br>They are used as the basis to build both print filters and special "
+"printers. They are described by a command string, a set of options, a set of "
+"requirements and associated mime types. Here you can create new command objects "
+"and edit existing ones. All changes will only be effective for you."
 msgstr ""
-"Mae'r gosodiad amser yma yn rheoli graddfa adnewyddu cydrannau amrywiol <b>"
-"Argraffu TDE</b> fel y rheolydd argraffu a'r gwelydd swydd."
+"<p>Mae gwrthrychau gorchymyn yn trosi o fewnbwn i allbwn."
+"<br> Maent yn cael eu defnyddio fel sail i adeiladu arno hidlau argraffu ac "
+"argraffyddion arbennig.  Disgrifir gan llinell gorchymyn, set o ddewisiadau, "
+"set o ofynion a mathau mime cyd.  Yn y fan yma, cewch greu gwrthrychau "
+"gorchymyn newydd, a golygu rhai sydd mewn bod.  Bydd pob newid yn effeithiol i "
+"neb ond ti."
 
-#: management/kmconfiggeneral.cpp:57
-msgid "Test Page"
-msgstr "Tudalen Arbrawf"
+#: management/tdeprint_management_module.cpp:48
+msgid "Select Command"
+msgstr "Dewis Gorchymyn"
 
-#: management/kmconfiggeneral.cpp:58
-msgid "&Specify personal test page"
-msgstr "&Penodi tudalen arbrawf personol"
+#: management/kmwbackend.cpp:54
+msgid "Backend Selection"
+msgstr "Dewis Ol-wyneb"
 
-#: management/kmconfiggeneral.cpp:60
-msgid "Preview..."
-msgstr "Rhagolygu... "
+#: management/kmwbackend.cpp:68
+#, fuzzy
+msgid "You must select a backend."
+msgstr "Rhaid i chi ddewis ol-wyneb!"
 
-#: management/kmconfiggeneral.cpp:70
-msgid "Sho&w printing status message box"
-msgstr "&Dangos blwch neges cyflwr argraffu"
+#: management/kmwbackend.cpp:115
+msgid "&Local printer (parallel, serial, USB)"
+msgstr "Argraffydd &lleol (paralel, cyfresol, USB)"
 
-#: management/kmconfiggeneral.cpp:71
-msgid "De&faults to the last printer used in the application"
+#: management/kmwbackend.cpp:116
+msgid ""
+"<qt>"
+"<p>Locally-connected printer</p>"
+"<p>Use this for a printer connected to the computer via a parallel, serial or "
+"USB port.</p></qt>"
 msgstr ""
-"Y rhagosodiad yw'r &argraffydd diwethaf a chafodd ei ddefnyddio yn y "
-"cymhwysiad."
 
-#: management/kmconfiggeneral.cpp:127
+#: management/kmwbackend.cpp:122
+msgid "&SMB shared printer (Windows)"
+msgstr "Argraffydd &SMB wedi ei rannu (Windows)"
+
+#: management/kmwbackend.cpp:123
 msgid ""
-"The selected test page is not a PostScript file. You may not be able to test "
-"your printer anymore."
+"<qt>"
+"<p>Shared Windows printer</p>"
+"<p>Use this for a printer installed on a Windows server and shared on the "
+"network using the SMB protocol (samba).</p></qt>"
 msgstr ""
-"Nid yw'r dudalen arbrawf a ddewiswyd yn ffeil PostScript.  Efallai ni fyddwch "
-"yn gallu arbrofi eich argraffydd dim mwy."
 
-#: management/smbview.cpp:44
-msgid "Comment"
-msgstr "Esboniad"
+#: management/kmwbackend.cpp:130
+msgid "&Remote LPD queue"
+msgstr "Ciw LPD &pell"
 
-#: management/kmwend.cpp:33
-msgid "Confirmation"
-msgstr "Gwybodaeth"
+#: management/kmwbackend.cpp:131
+msgid ""
+"<qt>"
+"<p>Print queue on a remote LPD server</p>"
+"<p>Use this for a print queue existing on a remote machine running a LPD print "
+"server.</p></qt>"
+msgstr ""
 
-#: tdefilelist.cpp:102 management/kmwend.cpp:50 management/kmwend.cpp:106
-#: management/kmwend.cpp:109
-msgid "Type"
-msgstr "Math"
+#: management/kmwbackend.cpp:137
+msgid "Ne&twork printer (TCP)"
+msgstr "Argraffydd rhwydwai&th (TCP)"
 
-#: management/kmwend.cpp:52
-msgid "Location"
-msgstr "Lleoliad"
+#: management/kmwbackend.cpp:138
+msgid ""
+"<qt>"
+"<p>Network TCP printer</p>"
+"<p>Use this for a network-enabled printer using TCP (usually on port 9100) as "
+"communication protocol. Most network printers can use this mode.</p></qt>"
+msgstr ""
 
-#: management/kmwend.cpp:53 management/kmwend.cpp:112
-#: management/kxmlcommanddlg.cpp:142 management/kxmlcommanddlg.cpp:545
-msgid "Description"
-msgstr "Disgrifiad"
+#: management/kmwfile.cpp:35
+msgid "File Selection"
+msgstr "Dewis Ffeil"
+
+#: management/kmwfile.cpp:41
+msgid ""
+"<p>The printing will be redirected to a file. Enter here the path of the file "
+"you want to use for redirection. Use an absolute path or the browse button for "
+"graphical selection.</p>"
+msgstr ""
+"<p>Bydd yr argraffu yn cael ei ail-gyfeirio i ffeil.  Mewnosodwch yma llwybr y "
+"ffeil yr ydych eisiau ei ddefnyddio am yr ail-gyfeirio.  Defnyddiwch llwybr "
+"llwyr, neu'r botwm pori am ddewis graffegol.</p>"
+
+#: management/kmwfile.cpp:44
+msgid "Print to file:"
+msgstr "Argraffu i ffeil:"
+
+#: management/kmconfiggeneral.cpp:137 management/kmwfile.cpp:60
+msgid "Empty file name."
+msgstr "Mae enw'r ffeil yn wag."
+
+#: management/kmwfile.cpp:66
+#, fuzzy
+msgid "Directory does not exist."
+msgstr "Nid yw'r cyfeiriadur yn bodoli!"
+
+#: management/kmdriverdbwidget.cpp:51
+msgid "&PostScript printer"
+msgstr "&Argraffydd PostScript"
+
+#: management/kmdriverdbwidget.cpp:52
+msgid "&Raw printer (no driver needed)"
+msgstr "Argraffydd &Crau (dim angen argraffydd)"
+
+#: management/kmdriverdbwidget.cpp:55
+msgid "&Other..."
+msgstr "&Eraill..."
+
+#: management/kmdriverdbwidget.cpp:56
+msgid "&Manufacturer:"
+msgstr "&Gwneuthurwr:"
+
+#: management/kmdriverdbwidget.cpp:57
+msgid "Mo&del:"
+msgstr "&Model:"
+
+#: management/kmdriverdbwidget.cpp:157 management/kmdriverdbwidget.cpp:166
+msgid "Loading..."
+msgstr "Llwytho..."
+
+#: management/kmdriverdbwidget.cpp:217
+msgid "Unable to find the PostScript driver."
+msgstr "Methu canfod y gyrrydd PostScript."
+
+#: management/kmdriverdbwidget.cpp:230
+msgid "Select Driver"
+msgstr "Dewiswch Gyrrydd"
+
+#: management/kmdriverdbwidget.cpp:247 management/kmdriverdbwidget.cpp:249
+msgid "<Unknown>"
+msgstr "<Anhysbys>"
+
+#: management/kmdriverdbwidget.cpp:252
+msgid "Database"
+msgstr "Cronfa ddata"
+
+#: management/kmdriverdbwidget.cpp:259
+msgid "Wrong driver format."
+msgstr "Fformat gyrrydd anghywir."
+
+#: management/kmdriverdbwidget.cpp:268
+msgid "Other"
+msgstr "Eraill"
+
+#: management/networkscanner.cpp:104 management/networkscanner.cpp:184
+msgid "Sc&an"
+msgstr "Sy&llu"
+
+#: management/networkscanner.cpp:111
+msgid "Network scan:"
+msgstr "Syllu ar y rhwydwaith:"
+
+#: management/networkscanner.cpp:112 management/networkscanner.cpp:299
+#: management/networkscanner.cpp:310
+#, c-format
+msgid "Subnet: %1"
+msgstr "Is-rwydwaith: %1"
+
+#: management/networkscanner.cpp:161
+msgid ""
+"You are about to scan a subnet (%1.*) that does not correspond to the current "
+"subnet of this computer (%2.*). Do you want to scan the specified subnet "
+"anyway?"
+msgstr ""
+"Rydych ar fin syllu ar is-rwydwaith (%1.*) nad yw'n cyfateb i is-rwydwaith "
+"cyfredol y cyfeiriadur yma (%2.*).  Ydych eisiau syllu ar yr is-rwydwaith "
+"penodol beth bynnag?"
+
+#: management/networkscanner.cpp:164
+msgid "&Scan"
+msgstr "&Syllu"
+
+#: management/kmwsocketutil.cpp:52 management/networkscanner.cpp:338
+msgid "&Subnetwork:"
+msgstr "&Is-rwydwaith:"
+
+#: management/kmwsocketutil.cpp:54 management/networkscanner.cpp:340
+msgid "&Timeout (ms):"
+msgstr "&Goramser (ms):"
+
+#: management/kmwsocketutil.cpp:92 management/networkscanner.cpp:378
+msgid "Scan Configuration"
+msgstr "Syllu ar y Ffurfweddiad"
+
+#: management/kmwsocketutil.cpp:104 management/kmwsocketutil.cpp:110
+#: management/networkscanner.cpp:390 management/networkscanner.cpp:396
+msgid "Wrong subnetwork specification."
+msgstr "Penodiad is-rwydwaith anghywir."
+
+#: management/kmwsocketutil.cpp:118 management/networkscanner.cpp:404
+msgid "Wrong timeout specification."
+msgstr "Penodiad goramser anghywir."
+
+#: management/kmwsocketutil.cpp:121 management/networkscanner.cpp:407
+msgid "Wrong port specification."
+msgstr "Penodiad porth anghywir."
+
+#: management/kxmlcommandselector.cpp:54
+msgid "New command"
+msgstr "Gorchymyn newydd"
+
+#: management/kxmlcommandselector.cpp:55
+msgid "Edit command"
+msgstr "Golygu gorchymyn"
+
+#: management/kxmlcommandselector.cpp:72
+msgid "&Browse..."
+msgstr "&Pori..."
+
+#: management/kxmlcommandselector.cpp:73
+msgid "Use co&mmand:"
+msgstr "Defnyddio G&orchymyn"
+
+#: management/kxmlcommandselector.cpp:174
+msgid "Command Name"
+msgstr "Enw Gorchymyn"
+
+#: management/kxmlcommandselector.cpp:174
+msgid "Enter an identification name for the new command:"
+msgstr "Mewnosodwch enw dynodiad i'r gorchymyn newydd:"
+
+#: management/kxmlcommandselector.cpp:183
+msgid ""
+"A command named %1 already exists. Do you want to continue and edit the "
+"existing one?"
+msgstr ""
+"Mae gorchymyn o'r enw %1 mewn bod yn barod.  Ydych eisiau mynd ymlaen a golygu "
+"yr un sy'n bodoli?"
+
+#: management/kxmlcommandselector.cpp:220
+#, fuzzy
+msgid "Internal error. The XML driver for the command %1 could not be found."
+msgstr "Gwall mewnol.  Methu canfod y gyrrydd XML am y gorchymyn %1."
+
+#: management/kxmlcommandselector.cpp:238
+msgid "output"
+msgstr "allbwn"
+
+#: management/kxmlcommandselector.cpp:242
+msgid "undefined"
+msgstr "aniffiniedig"
+
+#: management/kxmlcommandselector.cpp:247
+msgid "not allowed"
+msgstr "ni chaniateir"
+
+#: management/kxmlcommandselector.cpp:253
+msgid "(Unavailable: requirements not satisfied)"
+msgstr "(Dim ar gael: nid yw'r anghenion wedi'u cyflawni)"
+
+#: management/kmconfigpreview.cpp:35
+msgid "Preview"
+msgstr "Rhagweld"
+
+#: management/kmconfigpreview.cpp:36
+msgid "Preview Settings"
+msgstr "Rhagolygu Gosodiadau"
+
+#: management/kmconfigpreview.cpp:39
+msgid "Preview Program"
+msgstr "Rhagolygu Rhaglen"
+
+#: management/kmconfigpreview.cpp:41
+msgid "&Use external preview program"
+msgstr "&Defnyddio rhaglen rhagolygu allanol"
+
+#: management/kmconfigpreview.cpp:44
+msgid ""
+"You can use an external preview program (PS viewer) instead of the TDE built-in "
+"preview system. Note that if the TDE default PS viewer (KGhostView) cannot be "
+"found, TDE tries automatically to find another external PostScript viewer"
+msgstr ""
+"Cewch ddefnyddio rhaglen rhagolygu allanol (gwelydd PS) yn lle'r cysawd "
+"rhagolygu mewnol TDE.  Noder os ni ellir canfod y gwelydd PS rhagosodedig TDE "
+"(KGhostView), mae TDE yn ceisio  yn awtomatig i ganfod gwelydd allanol "
+"PostScript arall. "
+
+#: management/kmwclass.cpp:37
+msgid "Class Composition"
+msgstr "Cyfansoddiad y Dosbarth"
+
+#: management/kmwclass.cpp:52
+msgid "Available printers:"
+msgstr "Argraffyddion ar gael:"
+
+#: management/kmwclass.cpp:53
+msgid "Class printers:"
+msgstr "Dosbarthiad yr argraffydd:"
+
+#: management/kmwclass.cpp:79
+#, fuzzy
+msgid "You must select at least one printer."
+msgstr "Rhaid i chi ddewis o leiaf un argraffydd!"
 
 #: management/kmpropmembers.cpp:39 management/kmwend.cpp:59
 msgid "Members"
 msgstr "Aelodau"
 
-#: management/kmwend.cpp:69
-msgid "Backend"
-msgstr "Ol-wyneb"
+#: management/kmpropmembers.cpp:40
+msgid "Class Members"
+msgstr "Aelodau'r Dosbarthiad"
 
-#: management/kmwend.cpp:74
-msgid "Device"
-msgstr "Dyfais"
+#: management/kaddprinterwizard.cpp:10
+msgid "Configure TDE Print"
+msgstr "Ffurfweddu TDE Argraffu"
 
-#: management/kmwend.cpp:77
-msgid "Printer IP"
-msgstr "IP yr Argraffydd"
+#: management/kaddprinterwizard.cpp:11
+msgid "Configure print server"
+msgstr "Ffurweddu gweinydd argraffu"
 
-#: management/kmwend.cpp:78 management/kmwend.cpp:89
-msgid "Port"
-msgstr "Porth"
+#: management/kaddprinterwizard.cpp:18
+msgid "Start the add printer wizard"
+msgstr "Cychwyn y dewin ychwanegu argraffydd"
 
-#: management/kmwend.cpp:81 management/kmwend.cpp:88
-msgid "Host"
-msgstr "Gwesteiwr"
+#: management/kmpropwidget.cpp:50
+msgid ""
+"<qt>Unable to change printer properties. Error received from manager:"
+"<p>%1</p></qt>"
+msgstr ""
+"<qt>Methu newid priodweddau'r argraffydd.  Derbynwyd gwall oddiwrth y rheolydd:"
+"<p>%1</p></qt> "
 
-#: management/kmwend.cpp:91
-msgid "Account"
-msgstr "Cyfrif"
+#: management/kmdbcreator.cpp:92
+msgid ""
+"No executable defined for the creation of the driver database. This operation "
+"is not implemented."
+msgstr ""
+"Ni ddiffiniwyd gweithredadwyn i greu'r cronfa gyrryddion.  Ni chynhelir y "
+"gweithrediad yma."
 
-#: management/kmwend.cpp:96
-msgid "URI"
-msgstr "URI"
+#: management/kmdbcreator.cpp:95
+msgid ""
+"The executable %1 could not be found in your PATH. Check that this program "
+"exists and is accessible in your PATH variable."
+msgstr ""
+"Ni chanfuwyd y gweithredadwyn %1 yn eich PATH.  Gwiriwch fod y rhaglen yma yn "
+"bodoli ac yn cyrchadwy yn eich newidyn PATH."
 
-#: management/kmwend.cpp:109
-msgid "DB driver"
-msgstr "Gyrrydd cronfa ddata"
+#: management/kmdbcreator.cpp:99
+msgid ""
+"Unable to start the creation of the driver database. The execution of %1 "
+"failed."
+msgstr "Methu cychwyn creu'r cronfa gyrryddion.  Methodd gweithredu %1."
 
-#: management/kmwend.cpp:109
-msgid "External driver"
-msgstr "Gyrrydd allanol"
+#: management/kmdbcreator.cpp:113
+msgid "Please wait while TDE rebuilds a driver database."
+msgstr "Arhoswch wrth i TDE ail-adeiladu cronfa gyrryddion."
 
-#: management/kmwend.cpp:110
-msgid "Manufacturer"
-msgstr "Gwneuthurwr"
+#: management/kmdbcreator.cpp:114
+msgid "Driver Database"
+msgstr "Cronfa Gyrryddion"
 
-#: management/kmwend.cpp:111
-msgid "Model"
-msgstr "Model"
+#: management/kmdbcreator.cpp:171
+#, fuzzy
+msgid ""
+"Error while creating driver database: abnormal child-process termination."
+msgstr ""
+"Gwall wrth greu cronfa gyrryddion: terfynwyd y proses plentyn yn anarferol!"
 
-#: management/kmconfigfonts.cpp:43
-msgid "Font Settings"
-msgstr "Gosodiadau Ffont"
+#: management/kmwname.cpp:34
+msgid "General Information"
+msgstr "Gwybodaeth Cyffredinol"
 
-#: management/kmconfigfonts.cpp:46
-msgid "Fonts Embedding"
-msgstr "Mewnadeiladu Ffontiau"
+#: management/kmwname.cpp:37
+msgid ""
+"<p>Enter the information concerning your printer or class. <b>Name</b> "
+"is mandatory, <b>Location</b> and <b>Description</b> "
+"are not (they may even not be used on some systems).</p>"
+msgstr ""
+"<p>Mewnosodwch y gwybodaeth sy'n ymwneud â'ch argraffydd neu dosbarth. Mae <b>"
+"Enw</b> yn ofynnol, ond dim <b>Safle</b> a <b>Disgrifiad</b> "
+"(efallai nid ydynt yn cael eu defnyddio ar rai cysodau).</p> "
 
-#: management/kmconfigfonts.cpp:47
-msgid "Fonts Path"
-msgstr "Llwyr Ffontiau"
+#: management/kmwname.cpp:39
+msgid "Name:"
+msgstr "Enw:"
 
-#: management/kmconfigfonts.cpp:49
-msgid "&Embed fonts in PostScript data when printing"
-msgstr "&Mewnadeiladu ffontiau mewn data PostScript wrth argraffu"
+#: management/kmwname.cpp:48
+#, fuzzy
+msgid "You must supply at least a name."
+msgstr "Rhaid i chi ddarparu o leiaf enw!"
 
-#: management/kmconfigfonts.cpp:57
-msgid "&Up"
-msgstr "&Fyny"
+#: management/kmwname.cpp:56
+#, fuzzy
+msgid ""
+"It is usually not a good idea to include spaces in printer name: it may prevent "
+"your printer from working correctly. The wizard can strip all spaces from the "
+"string you entered, resulting in %1; what do you want to do?"
+msgstr ""
+"Nid yw cynnwys bwlchnodau mewn enw argraffydd yn syniad da fel arfer.  Efallai "
+"bydd hyn yn atal eich argraffydd rhag weithio yn iawn.  mae'r dewin yn gallu "
+"tynnu pob bwlchnod o'r llinyn y wnaethoch mewnosod, yn rhoi %1 fel canlyniad.  "
+"Beth ydych eisiau ei wneud?  "
 
-#: management/kmconfigfonts.cpp:58
-msgid "&Down"
-msgstr "&I Lawr"
+#: management/kmwname.cpp:62
+msgid "Strip"
+msgstr "Tynnu"
 
-#: management/kmconfigfonts.cpp:59
-msgid "&Add"
-msgstr "&Ychwanegu"
+#: management/kmwdriver.cpp:80 management/kmwend.cpp:106
+#: management/kmwname.cpp:83
+msgid "Raw printer"
+msgstr "Argraffydd crau"
 
-#: management/kmconfigfonts.cpp:61
-msgid "Additional director&y:"
-msgstr "&Cyfeiriadur Ychawanegol"
+#: management/kmwpassword.cpp:37
+msgid "User Identification"
+msgstr "Dynodiad y Defnyddiwr"
 
-#: management/kmconfigfonts.cpp:85
+#: management/kmwpassword.cpp:43
+#, fuzzy
 msgid ""
-"These options will automatically put fonts in the PostScript file which are not "
-"present on the printer. Font embedding usually produces better print results "
-"(closer to what you see on the screen), but larger print data as well."
+"<p>This backend may require a login/password to work properly. Select the type "
+"of access to use and fill in the login and password entries if needed.</p>"
 msgstr ""
-"Bydd y dewisiadau yma yn rhoi ffontiau yn awtomatig i mewn i'r ffeil PostScript "
-"sydd ddim yn bresennol ar yr argraffydd.  Mae mewnadeiladu ffontiau fel arfer "
-"yn cynhyrchu canlyniadau argraffu gwell (yn agosach i be welwch ar y sgrîn), "
-"ond data argraffu mwy hefyd."
+"<p>Efallai bydd gan yr ol-wyneb yma angen mewnosodiad/cyfrinair i weithio yn "
+"gywir.  Llenwch y mewnosodiadau gofynnol, neu alluogwch <b>Cyfrif gwestai</b> "
+"er mwyn defnyddio cyrchiad di-enw.</p>"
 
-#: management/kmconfigfonts.cpp:89
+#: management/kmwpassword.cpp:49
+msgid "&Login:"
+msgstr "&Mewnosod:"
+
+#: management/kmwpassword.cpp:53
+msgid "&Anonymous (no login/password)"
+msgstr ""
+
+#: management/kmwpassword.cpp:54
+#, fuzzy
+msgid "&Guest account (login=\"guest\")"
+msgstr "&Cyfrif gwestai"
+
+#: management/kmwpassword.cpp:55
+#, fuzzy
+msgid "Nor&mal account"
+msgstr "&Cyfrif gwestai"
+
+#: management/kmwpassword.cpp:88
+#, fuzzy
+msgid "Select one option"
+msgstr "Dewis Ffont"
+
+#: management/kmwpassword.cpp:90
+#, fuzzy
+msgid "User name is empty."
+msgstr "Mae enw'r defnyddiwr yn wag!"
+
+#: management/kmwdriverselect.cpp:37
+msgid "Driver Selection"
+msgstr "Dewis Gyrrydd"
+
+#: management/kmwdriverselect.cpp:43
 msgid ""
-"When using font embedding you can select additional directories where TDE "
-"should search for embeddable font files. By default, the X server font path is "
-"used, so adding those directories is not needed. The default search path should "
-"be sufficient in most cases."
+"<p>Several drivers have been detected for this model. Select the driver you "
+"want to use. You will have the opportunity to test it as well as to change it "
+"if necessary.</p>"
 msgstr ""
-"Wrth ddefnyddio mewnadeiladu ffontiau, cewch ddewis cyfeiriaduron ychwanegol "
-"lle ddylai TDE chwilio am ffeiliau ffontiau mewnadeiladadwy.  Wrth ragosodiad, "
-"defnyddir y llwybr ffont gweinydd X, felly nid oes angen ychwanegu'r "
-"cyfeiriaduron yna.  Dylai'r llwybr chwiliad rhagososdedig fod yn ddigonol yn y "
-"mwyafrif o sefyllfaoedd. "
+"<p>Mae mwy nac un gyrrydd wedi ei ddarganfod i'r model yma.  Dewiswch y gyrrydd "
+"yr ydych eisiau ei ddefnyddio.  Bydd ganddoch y gyfle i'w arbrofi, ac i'w newid "
+"hefyd os bo angen.</p>"
 
-#: management/kmwsmb.cpp:35
-msgid "SMB Printer Settings"
-msgstr "Gosodiadau Argraffydd SMB"
+#: management/kmwdriverselect.cpp:46
+msgid "Driver Information"
+msgstr "Gwybodaeth Gyrrydd"
 
-#: management/kmwsmb.cpp:41
-msgid "Scan"
-msgstr "Syllu"
+#: management/kmwdriverselect.cpp:62
+#, fuzzy
+msgid "You must select a driver."
+msgstr "Rhaid i chi ddewis gyrrydd!"
 
-#: management/kmwsmb.cpp:42
-msgid "Abort"
-msgstr "Terfynu"
+#: management/kmwdriverselect.cpp:82
+msgid " [recommended]"
+msgstr "[argymelledig]"
 
-#: management/kmwsmb.cpp:44
-msgid "Workgroup:"
-msgstr "Grwp gwaith:"
+#: management/kmwdriverselect.cpp:113
+msgid "No information about the selected driver."
+msgstr "Dim gwybodaeth am y gyrrydd penodol."
 
-#: management/kmwsmb.cpp:45
-msgid "Server:"
-msgstr " Gweinydd:"
+#: management/kmpropbackend.cpp:34
+msgid "Printer type:"
+msgstr "Math ye argraffydd:"
 
-#: management/kmwsmb.cpp:99
-#, c-format
-msgid "Login: %1"
-msgstr "Mewngofnod: %1"
+#: management/kmpropbackend.cpp:48
+msgid "Interface"
+msgstr "Rhyngwyneb"
 
-#: management/kmwsmb.cpp:99
-msgid "<anonymous>"
+#: management/kmpropbackend.cpp:49
+msgid "Interface Settings"
+msgstr "Gosodiadau'r Rhyngwyneb"
+
+#: management/kmpropbackend.cpp:62
+msgid "IPP Printer"
+msgstr "Argraffydd IPP"
+
+#: management/kmpropbackend.cpp:63
+msgid "Local USB Printer"
+msgstr "Argraffydd USB Lleol"
+
+#: management/kmpropbackend.cpp:64
+msgid "Local Parallel Printer"
+msgstr "Argraffydd Paralel Lleol"
+
+#: management/kmpropbackend.cpp:65
+msgid "Local Serial Printer"
+msgstr "Argraffydd Cyfresol Lleol"
+
+#: management/kmpropbackend.cpp:66
+msgid "Network Printer (socket)"
+msgstr "Argraffydd Rhwydwaith (soced)"
+
+#: management/kmpropbackend.cpp:67
+msgid "SMB printers (Windows)"
+msgstr "Argrafyddion SMB (Windows)"
+
+#: lpd/kmlpduimanager.cpp:45 management/kmpropbackend.cpp:68
+#: rlpr/kmwrlpr.cpp:116
+msgid "Remote LPD queue"
+msgstr "Ciw LPD pell"
+
+#: management/kmpropbackend.cpp:69
+msgid "File printer"
+msgstr "Argraffydd Ffeil"
+
+#: management/kmpropbackend.cpp:70
+msgid "Serial Fax/Modem printer"
+msgstr "Argraffydd cyfresol Ffacs/Modem"
+
+#: management/kmpropbackend.cpp:71
+msgid ""
+"_: Unknown Protocol\n"
+"Unknown"
+msgstr "Anhysbys"
+
+#: management/kmconfigdialog.cpp:38
+msgid "TDE Print Configuration"
+msgstr "Ffurfweddiad Argraffu TDE"
+
+#: management/kmpropdriver.cpp:36
+msgid "Manufacturer:"
+msgstr "Gwneuthurwr:"
+
+#: management/kmpropdriver.cpp:37
+msgid "Printer model:"
+msgstr "Model yr argraffydd:"
+
+#: management/kmpropdriver.cpp:38
+msgid "Driver info:"
+msgstr "Gwybodaeth gyrrydd:"
+
+#: lpd/lpdtools.cpp:239 management/kmpropdriver.cpp:53
+#: management/kmwend.cpp:104
+msgid "Driver"
+msgstr "Gyrrydd"
+
+#: management/kmwsocket.cpp:38
+msgid "Network Printer Information"
+msgstr "Gwybodaeth Argraffydd Rhwydwaith"
+
+#: management/kmwsocket.cpp:48
+msgid "&Printer address:"
+msgstr "&Cyfeiriad yr argraffydd:"
+
+#: management/kmwsocket.cpp:49
+msgid "P&ort:"
+msgstr "&Porth:"
+
+#: management/kmwsocket.cpp:99
+#, fuzzy
+msgid "You must enter a printer address."
+msgstr "Rhaid i chi fewnosod cyfeiriad argraffydd!"
+
+#: management/kmwsocket.cpp:110
+#, fuzzy
+msgid "Wrong port number."
+msgstr "Rhif porth anghywir!"
+
+#: management/kmwizard.cpp:64 management/kmwizard.cpp:209
+msgid "&Next >"
+msgstr "&Nesaf >"
+
+#: management/kmwizard.cpp:66
+msgid "< &Back"
+msgstr "< &Yn Ol"
+
+#: management/kmwizard.cpp:131 management/kmwizard.cpp:166
+#: management/kmwizard.cpp:191
+msgid "Add Printer Wizard"
+msgstr "Dewin Ychwanegu Argraffydd"
+
+#: management/kmwizard.cpp:166
+msgid "Modify Printer"
+msgstr "Addasu Argraffydd"
+
+#: management/kmwizard.cpp:191
+msgid "Unable to find the requested page."
+msgstr "Methu canfod y dudalen a ofynnwyd amdani."
+
+#: management/kmwizard.cpp:207 management/kmwizard.cpp:234
+msgid "&Finish"
+msgstr "&Gorffen"
+
+#: management/kmwinfopage.cpp:32
+msgid "Introduction"
+msgstr "Rhagymadrodd"
+
+#: management/kmwinfopage.cpp:37
+#, fuzzy
+msgid ""
+"<p>Welcome,</p>"
+"<br>"
+"<p>This wizard will help to install a new printer on your computer. It will "
+"guide you through the various steps of the process of installing and "
+"configuring a printer for your printing system. At each step, you can always go "
+"back using the <b>Back</b> button.</p>"
+"<br>"
+"<p>We hope you enjoy this tool!</p>"
+"<br>"
 msgstr ""
+"<p>Croeso!</p>"
+"<br>"
+"<p>Bydd y dewin yma yn eich cymorth i osod argraffydd newydd ar eich "
+"cyfrifiadur.  Bydd o'n eich arwain drwy gamau amrywiol y proses o osod a "
+"ffurweddu argraffydd am eich cysawd argraffu.  Wrth bob cam, cewch ddychwelyd "
+"gan ddefnyddio'r botwm <b>Yn ol</b>. </p>"
+"<br>"
+"<p>Gobeithiwn y byddwch yn mwynhau yr erfyn yma!</p>"
+"<br><p align=right><i>Y tim argraffu TDE </i>.</p>"
 
-#: management/kmpropmembers.cpp:40
-msgid "Class Members"
-msgstr "Aelodau'r Dosbarthiad"
+#: management/kmconfigjobs.cpp:33 management/kmpages.cpp:59
+msgid "Jobs"
+msgstr "Swyddi"
+
+#: management/kmconfigjobs.cpp:37
+msgid "Jobs Shown"
+msgstr "Swyddi a Ddangosir"
+
+#: management/kmconfigjobs.cpp:42
+msgid "Maximum number of jobs shown:"
+msgstr "Nifer uchaf o swyddi a ddangosir:"
 
 #: management/kxmlcommanddlg.cpp:108
 msgid "Integer"
@@ -3760,6 +3940,11 @@ msgstr "Gwerth i&safrif:"
 msgid "Ma&ximum value:"
 msgstr "Gwerth u&chafrif:"
 
+#: management/kmwend.cpp:53 management/kmwend.cpp:112
+#: management/kxmlcommanddlg.cpp:142 management/kxmlcommanddlg.cpp:545
+msgid "Description"
+msgstr "Disgrifiad"
+
 #: management/kxmlcommanddlg.cpp:150
 msgid "Add value"
 msgstr "Ychwanegu gwerth"
@@ -3784,11 +3969,11 @@ msgstr "Ychwanegu dewisiad"
 msgid "Delete item"
 msgstr " Dileu eitem"
 
-#: tdefilelist.cpp:135 management/kxmlcommanddlg.cpp:157
+#: management/kxmlcommanddlg.cpp:157 tdefilelist.cpp:135
 msgid "Move up"
 msgstr "Symud i fyny"
 
-#: tdefilelist.cpp:142 management/kxmlcommanddlg.cpp:158
+#: management/kxmlcommanddlg.cpp:158 tdefilelist.cpp:142
 msgid "Move down"
 msgstr "Symud i lawr"
 
@@ -3975,362 +4160,65 @@ msgstr "Enw ID:"
 msgid "exec:/"
 msgstr "exec:/"
 
-#: management/kmwlpd.cpp:41
-msgid "LPD Queue Information"
-msgstr "Gwybodaeth Ciw LPD"
-
-#: management/kmwlpd.cpp:44
-#, fuzzy
-msgid ""
-"<p>Enter the information concerning the remote LPD queue; this wizard will "
-"check it before continuing.</p>"
-msgstr ""
-"<p>Mewnosodwch y gwybodaeth ynghylch y ciw LPD pell.  Bydd y dewin yma yn ei "
-"wirio cyn mynd ymlaen.</p>"
-
-#: management/kmwlpd.cpp:54
-#, fuzzy
-msgid "Some information is missing."
-msgstr "Mae gwybodaeth ar goll!"
-
-#: management/kmwlpd.cpp:61
-#, fuzzy
-msgid "Cannot find queue %1 on server %2; do you want to continue anyway?"
-msgstr ""
-"Methu canfod ciw %1 ar weinydd %2!  ydych eisiau mynd ymlaen beth bynnag?"
-
-#: management/kmconfigfilter.cpp:40
-msgid "Filter"
-msgstr "Hidl"
-
-#: management/kmconfigfilter.cpp:41
-msgid "Printer Filtering Settings"
-msgstr "Gosodiadau Hidl Argraffydd"
-
-#: management/kmconfigfilter.cpp:44
-msgid "Printer Filter"
-msgstr "Hidl Argraffydd"
-
-#: management/kmconfigfilter.cpp:56
-msgid ""
-"The printer filtering allows you to view only a specific set of printers "
-"instead of all of them. This may be useful when there are a lot of printers "
-"available but you only use a few ones. Select the printers you want to see from "
-"the list on the left or enter a <b>Location</b> filter (ex: Group_1*). Both are "
-"cumulative and ignored if empty."
-msgstr ""
-"Mae'r hidlo argraffydd yn gadael i chi weld dim ond set penodol o argraffyddion "
-"yn lle pob un ohonynt.  Efallai bydd hyn o ddefnydd pan mae llawer o "
-"argraffyddion ar gael, ond rydych eisiau defnyddio dim ond un neu ddau.  "
-"Dewiswch yr argraffyddion yr ydych eisiau eu gweld oddiar y rhestr i'r chwith, "
-"neu mewnosodwch hidl <b>Lleoliad</b> (ee: Group_1*).  Mae'r dau yn gronnus, ac "
-"eu anwybyddu os yn wag."
-
-#: management/kmconfigfilter.cpp:62
-msgid "Location filter:"
-msgstr "Hidl lleoliad:"
-
-#: management/kmwdriverselect.cpp:37
-msgid "Driver Selection"
-msgstr "Dewis Gyrrydd"
-
-#: management/kmwdriverselect.cpp:43
-msgid ""
-"<p>Several drivers have been detected for this model. Select the driver you "
-"want to use. You will have the opportunity to test it as well as to change it "
-"if necessary.</p>"
-msgstr ""
-"<p>Mae mwy nac un gyrrydd wedi ei ddarganfod i'r model yma.  Dewiswch y gyrrydd "
-"yr ydych eisiau ei ddefnyddio.  Bydd ganddoch y gyfle i'w arbrofi, ac i'w newid "
-"hefyd os bo angen.</p>"
-
-#: management/kmwdriverselect.cpp:46
-msgid "Driver Information"
-msgstr "Gwybodaeth Gyrrydd"
-
-#: management/kmwdriverselect.cpp:62
-#, fuzzy
-msgid "You must select a driver."
-msgstr "Rhaid i chi ddewis gyrrydd!"
-
-#: management/kmwdriverselect.cpp:82
-msgid " [recommended]"
-msgstr "[argymelledig]"
-
-#: management/kmwdriverselect.cpp:113
-msgid "No information about the selected driver."
-msgstr "Dim gwybodaeth am y gyrrydd penodol."
-
-#: management/kmwinfopage.cpp:32
-msgid "Introduction"
-msgstr "Rhagymadrodd"
-
-#: management/kmwinfopage.cpp:37
-msgid ""
-"<p>Welcome,</p>"
-"<br>"
-"<p>This wizard will help to install a new printer on your computer. It will "
-"guide you through the various steps of the process of installing and "
-"configuring a printer for your printing system. At each step, you can always go "
-"back using the <b>Back</b> button.</p>"
-"<br>"
-"<p>We hope you'll enjoy this tool!</p>"
-"<br><p align=right><i>The TDE printing team</i>.</p>"
-msgstr ""
-"<p>Croeso!</p>"
-"<br>"
-"<p>Bydd y dewin yma yn eich cymorth i osod argraffydd newydd ar eich "
-"cyfrifiadur.  Bydd o'n eich arwain drwy gamau amrywiol y proses o osod a "
-"ffurweddu argraffydd am eich cysawd argraffu.  Wrth bob cam, cewch ddychwelyd "
-"gan ddefnyddio'r botwm <b>Yn ol</b>. </p>"
-"<br>"
-"<p>Gobeithiwn y byddwch yn mwynhau yr erfyn yma!</p>"
-"<br><p align=right><i>Y tim argraffu TDE </i>.</p>"
-
-#: management/kmdriverdbwidget.cpp:51
-msgid "&PostScript printer"
-msgstr "&Argraffydd PostScript"
-
-#: management/kmdriverdbwidget.cpp:52
-msgid "&Raw printer (no driver needed)"
-msgstr "Argraffydd &Crau (dim angen argraffydd)"
-
-#: management/kmdriverdbwidget.cpp:55
-msgid "&Other..."
-msgstr "&Eraill..."
-
-#: management/kmdriverdbwidget.cpp:56
-msgid "&Manufacturer:"
-msgstr "&Gwneuthurwr:"
-
-#: management/kmdriverdbwidget.cpp:57
-msgid "Mo&del:"
-msgstr "&Model:"
-
-#: management/kmdriverdbwidget.cpp:157 management/kmdriverdbwidget.cpp:166
-msgid "Loading..."
-msgstr "Llwytho..."
-
-#: management/kmdriverdbwidget.cpp:217
-msgid "Unable to find the PostScript driver."
-msgstr "Methu canfod y gyrrydd PostScript."
-
-#: management/kmdriverdbwidget.cpp:230
-msgid "Select Driver"
-msgstr "Dewiswch Gyrrydd"
-
-#: management/kmdriverdbwidget.cpp:247 management/kmdriverdbwidget.cpp:249
-msgid "<Unknown>"
-msgstr "<Anhysbys>"
-
-#: management/kmdriverdbwidget.cpp:252
-msgid "Database"
-msgstr "Cronfa ddata"
-
-#: management/kmdriverdbwidget.cpp:259
-msgid "Wrong driver format."
-msgstr "Fformat gyrrydd anghywir."
-
-#: management/kmdriverdbwidget.cpp:268
-msgid "Other"
-msgstr "Eraill"
-
-#: management/kxmlcommandselector.cpp:54
-msgid "New command"
-msgstr "Gorchymyn newydd"
-
-#: management/kxmlcommandselector.cpp:55
-msgid "Edit command"
-msgstr "Golygu gorchymyn"
-
-#: management/kxmlcommandselector.cpp:72
-msgid "&Browse..."
-msgstr "&Pori..."
-
-#: management/kxmlcommandselector.cpp:73
-msgid "Use co&mmand:"
-msgstr "Defnyddio G&orchymyn"
-
-#: management/kxmlcommandselector.cpp:174
-msgid "Command Name"
-msgstr "Enw Gorchymyn"
-
-#: management/kxmlcommandselector.cpp:174
-msgid "Enter an identification name for the new command:"
-msgstr "Mewnosodwch enw dynodiad i'r gorchymyn newydd:"
-
-#: management/kxmlcommandselector.cpp:183
-msgid ""
-"A command named %1 already exists. Do you want to continue and edit the "
-"existing one?"
-msgstr ""
-"Mae gorchymyn o'r enw %1 mewn bod yn barod.  Ydych eisiau mynd ymlaen a golygu "
-"yr un sy'n bodoli?"
-
-#: management/kxmlcommandselector.cpp:220
-#, fuzzy
-msgid "Internal error. The XML driver for the command %1 could not be found."
-msgstr "Gwall mewnol.  Methu canfod y gyrrydd XML am y gorchymyn %1."
-
-#: management/kxmlcommandselector.cpp:238
-msgid "output"
-msgstr "allbwn"
-
-#: management/kxmlcommandselector.cpp:242
-msgid "undefined"
-msgstr "aniffiniedig"
-
-#: management/kxmlcommandselector.cpp:247
-msgid "not allowed"
-msgstr "ni chaniateir"
-
-#: management/kxmlcommandselector.cpp:253
-msgid "(Unavailable: requirements not satisfied)"
-msgstr "(Dim ar gael: nid yw'r anghenion wedi'u cyflawni)"
-
-#: management/kmlistview.cpp:125
-msgid "Print System"
-msgstr "Cysawd Argraffu"
-
-#: management/kmlistview.cpp:128
-msgid "Classes"
-msgstr "Dosbarthiadau"
-
-#: management/kmlistview.cpp:131
-msgid "Printers"
-msgstr "Argraffyddion"
-
-#: management/kmlistview.cpp:134
-msgid "Specials"
-msgstr "Arbenigion"
-
-#: management/kmpropdriver.cpp:36
-msgid "Manufacturer:"
-msgstr "Gwneuthurwr:"
-
-#: management/kmpropdriver.cpp:37
-msgid "Printer model:"
-msgstr "Model yr argraffydd:"
-
-#: management/kmpropdriver.cpp:38
-msgid "Driver info:"
-msgstr "Gwybodaeth gyrrydd:"
-
-#: kpdriverpage.cpp:30 management/kmpropdriver.cpp:54
-msgid "Driver Settings"
-msgstr "Gosodiadau Gyrrydd"
-
-#: management/kmconfigjobs.cpp:33 management/kmpages.cpp:59
-msgid "Jobs"
-msgstr "Swyddi"
-
-#: management/kmconfigjobs.cpp:37
-msgid "Jobs Shown"
-msgstr "Swyddi a Ddangosir"
-
-#: management/kmconfigjobs.cpp:42
-msgid "Maximum number of jobs shown:"
-msgstr "Nifer uchaf o swyddi a ddangosir:"
+#: driver.cpp:377 kpgeneralpage.cpp:261 lpd/lpdtools.cpp:307
+#: management/kmconfiggeneral.cpp:44 management/kmpropgeneral.cpp:54
+#: management/kmwend.cpp:49
+msgid "General"
+msgstr "Cyffredinol"
 
-#: management/kmwname.cpp:34
-msgid "General Information"
-msgstr "Gwybodaeth Cyffredinol"
+#: management/kmconfiggeneral.cpp:45 management/kmpropgeneral.cpp:55
+msgid "General Settings"
+msgstr "Gosodiadau Cyffredinol"
 
-#: management/kmwname.cpp:37
-msgid ""
-"<p>Enter the information concerning your printer or class. <b>Name</b> "
-"is mandatory, <b>Location</b> and <b>Description</b> "
-"are not (they may even not be used on some systems).</p>"
-msgstr ""
-"<p>Mewnosodwch y gwybodaeth sy'n ymwneud â'ch argraffydd neu dosbarth. Mae <b>"
-"Enw</b> yn ofynnol, ond dim <b>Safle</b> a <b>Disgrifiad</b> "
-"(efallai nid ydynt yn cael eu defnyddio ar rai cysodau).</p> "
+#: management/kmconfiggeneral.cpp:48
+msgid "Refresh Interval"
+msgstr "Cyfnod Adnewyddu"
 
-#: management/kmwname.cpp:39
-msgid "Name:"
-msgstr "Enw:"
+#: management/kmconfiggeneral.cpp:51
+msgid " sec"
+msgstr "sec"
 
-#: management/kmwname.cpp:48
-#, fuzzy
-msgid "You must supply at least a name."
-msgstr "Rhaid i chi ddarparu o leiaf enw!"
+#: kpgeneralpage.cpp:416 lpd/lpdtools.cpp:40 management/kmconfiggeneral.cpp:52
+msgid "Disabled"
+msgstr "Analluogir"
 
-#: management/kmwname.cpp:56
-#, fuzzy
+#: management/kmconfiggeneral.cpp:53
 msgid ""
-"It is usually not a good idea to include spaces in printer name: it may prevent "
-"your printer from working correctly. The wizard can strip all spaces from the "
-"string you entered, resulting in %1; what do you want to do?"
+"This time setting controls the refresh rate of various <b>TDE Print</b> "
+"components like the print manager and the job viewer."
 msgstr ""
-"Nid yw cynnwys bwlchnodau mewn enw argraffydd yn syniad da fel arfer.  Efallai "
-"bydd hyn yn atal eich argraffydd rhag weithio yn iawn.  mae'r dewin yn gallu "
-"tynnu pob bwlchnod o'r llinyn y wnaethoch mewnosod, yn rhoi %1 fel canlyniad.  "
-"Beth ydych eisiau ei wneud?  "
-
-#: management/kmwname.cpp:62
-msgid "Strip"
-msgstr "Tynnu"
-
-#: kprinterimpl.cpp:510 management/kmwname.cpp:62
-msgid "Keep"
-msgstr "Cadw"
-
-#: management/kmwbackend.cpp:54
-msgid "Backend Selection"
-msgstr "Dewis Ol-wyneb"
-
-#: management/kmwbackend.cpp:68
-#, fuzzy
-msgid "You must select a backend."
-msgstr "Rhaid i chi ddewis ol-wyneb!"
-
-#: management/kmwbackend.cpp:115
-msgid "&Local printer (parallel, serial, USB)"
-msgstr "Argraffydd &lleol (paralel, cyfresol, USB)"
+"Mae'r gosodiad amser yma yn rheoli graddfa adnewyddu cydrannau amrywiol <b>"
+"Argraffu TDE</b> fel y rheolydd argraffu a'r gwelydd swydd."
 
-#: management/kmwbackend.cpp:116
-msgid ""
-"<qt>"
-"<p>Locally-connected printer</p>"
-"<p>Use this for a printer connected to the computer via a parallel, serial or "
-"USB port.</p></qt>"
-msgstr ""
+#: management/kmconfiggeneral.cpp:57
+msgid "Test Page"
+msgstr "Tudalen Arbrawf"
 
-#: management/kmwbackend.cpp:122
-msgid "&SMB shared printer (Windows)"
-msgstr "Argraffydd &SMB wedi ei rannu (Windows)"
+#: management/kmconfiggeneral.cpp:58
+msgid "&Specify personal test page"
+msgstr "&Penodi tudalen arbrawf personol"
 
-#: management/kmwbackend.cpp:123
-msgid ""
-"<qt>"
-"<p>Shared Windows printer</p>"
-"<p>Use this for a printer installed on a Windows server and shared on the "
-"network using the SMB protocol (samba).</p></qt>"
-msgstr ""
+#: management/kmconfiggeneral.cpp:60
+msgid "Preview..."
+msgstr "Rhagolygu... "
 
-#: management/kmwbackend.cpp:130
-msgid "&Remote LPD queue"
-msgstr "Ciw LPD &pell"
+#: management/kmconfiggeneral.cpp:70
+msgid "Sho&w printing status message box"
+msgstr "&Dangos blwch neges cyflwr argraffu"
 
-#: management/kmwbackend.cpp:131
-msgid ""
-"<qt>"
-"<p>Print queue on a remote LPD server</p>"
-"<p>Use this for a print queue existing on a remote machine running a LPD print "
-"server.</p></qt>"
+#: management/kmconfiggeneral.cpp:71
+msgid "De&faults to the last printer used in the application"
 msgstr ""
+"Y rhagosodiad yw'r &argraffydd diwethaf a chafodd ei ddefnyddio yn y "
+"cymhwysiad."
 
-#: management/kmwbackend.cpp:137
-msgid "Ne&twork printer (TCP)"
-msgstr "Argraffydd rhwydwai&th (TCP)"
-
-#: management/kmwbackend.cpp:138
+#: management/kmconfiggeneral.cpp:127
 msgid ""
-"<qt>"
-"<p>Network TCP printer</p>"
-"<p>Use this for a network-enabled printer using TCP (usually on port 9100) as "
-"communication protocol. Most network printers can use this mode.</p></qt>"
+"The selected test page is not a PostScript file. You may not be able to test "
+"your printer anymore."
 msgstr ""
+"Nid yw'r dudalen arbrawf a ddewiswyd yn ffeil PostScript.  Efallai ni fyddwch "
+"yn gallu arbrofi eich argraffydd dim mwy."
 
 #: management/kminstancepage.cpp:61
 msgid ""
@@ -4428,9 +4316,195 @@ msgstr "Gwall mewnol: methu canfod argraffydd."
 msgid "Unable to send test page to %1."
 msgstr "Methu anfon tudalen arbrawf i %1."
 
-#: management/kmpages.cpp:69
-msgid "Instances"
-msgstr "Enghreifftiau"
+#: management/kmdriverdialog.cpp:48
+msgid ""
+"Some options are in conflict. You must resolve those conflicts before "
+"continuing."
+msgstr ""
+"Mae rhai dewisiadau yn gwrthdaro.  Rhaid i chi ddatrys y gwrthdaro yma cyn i "
+"chi fynd ymlaen."
+
+#: management/kmlistview.cpp:125
+msgid "Print System"
+msgstr "Cysawd Argraffu"
+
+#: management/kmlistview.cpp:128
+msgid "Classes"
+msgstr "Dosbarthiadau"
+
+#: management/kmlistview.cpp:131
+msgid "Printers"
+msgstr "Argraffyddion"
+
+#: management/kmlistview.cpp:134
+msgid "Specials"
+msgstr "Arbenigion"
+
+#: management/kmwlocal.cpp:38
+msgid "Local Port Selection"
+msgstr "Dewis y Borth Leol"
+
+#: management/kmwlocal.cpp:50
+msgid "Local System"
+msgstr "Cysawd Lleol"
+
+#: management/kmwlocal.cpp:57
+msgid "Parallel"
+msgstr "Paralel"
+
+#: management/kmwlocal.cpp:58
+msgid "Serial"
+msgstr "Cyfresol"
+
+#: management/kmwlocal.cpp:59
+msgid "USB"
+msgstr "USB"
+
+#: driver.cpp:389 management/kmwlocal.cpp:60
+msgid "Others"
+msgstr "Eraill"
+
+#: management/kmwlocal.cpp:63
+msgid ""
+"<p>Select a valid detected port, or enter directly the corresponding URI in the "
+"bottom edit field.</p>"
+msgstr ""
+"<p>Dewiswch borth ddilys sydd wedi ei darganfod, neu mewnosodwch yn "
+"uniongyrchol yr URI cyfatebol yn y maes golygu wrth y gwaelod.</p>"
+
+#: management/kmwlocal.cpp:78
+msgid ""
+"_: The URI is empty\n"
+"Empty URI."
+msgstr "Mae'r URI yn wag."
+
+#: management/kmwlocal.cpp:83
+msgid "The local URI doesn't correspond to a detected port. Continue?"
+msgstr ""
+"Nid yw'r URI lleol yn cyfatebu i borth sydd wedi ei darganfod.  Mynd ymlaen?"
+
+#: management/kmwlocal.cpp:85
+msgid "Select a valid port."
+msgstr "Dewis porth ddilys."
+
+#: management/kmwlocal.cpp:166
+msgid "Unable to detect local ports."
+msgstr "Methu darganfod pyrth lleol."
+
+#: management/kmwlpd.cpp:41
+msgid "LPD Queue Information"
+msgstr "Gwybodaeth Ciw LPD"
+
+#: management/kmwlpd.cpp:44
+#, fuzzy
+msgid ""
+"<p>Enter the information concerning the remote LPD queue; this wizard will "
+"check it before continuing.</p>"
+msgstr ""
+"<p>Mewnosodwch y gwybodaeth ynghylch y ciw LPD pell.  Bydd y dewin yma yn ei "
+"wirio cyn mynd ymlaen.</p>"
+
+#: management/kmwlpd.cpp:47 rlpr/kmproprlpr.cpp:35 rlpr/kmwrlpr.cpp:63
+msgid "Queue:"
+msgstr "Ciw:"
+
+#: management/kmwlpd.cpp:54
+#, fuzzy
+msgid "Some information is missing."
+msgstr "Mae gwybodaeth ar goll!"
+
+#: management/kmwlpd.cpp:61
+#, fuzzy
+msgid "Cannot find queue %1 on server %2; do you want to continue anyway?"
+msgstr ""
+"Methu canfod ciw %1 ar weinydd %2!  ydych eisiau mynd ymlaen beth bynnag?"
+
+#: management/kmconfigfilter.cpp:40
+msgid "Filter"
+msgstr "Hidl"
+
+#: management/kmconfigfilter.cpp:41
+msgid "Printer Filtering Settings"
+msgstr "Gosodiadau Hidl Argraffydd"
+
+#: management/kmconfigfilter.cpp:44
+msgid "Printer Filter"
+msgstr "Hidl Argraffydd"
+
+#: management/kmconfigfilter.cpp:56
+msgid ""
+"The printer filtering allows you to view only a specific set of printers "
+"instead of all of them. This may be useful when there are a lot of printers "
+"available but you only use a few ones. Select the printers you want to see from "
+"the list on the left or enter a <b>Location</b> filter (ex: Group_1*). Both are "
+"cumulative and ignored if empty."
+msgstr ""
+"Mae'r hidlo argraffydd yn gadael i chi weld dim ond set penodol o argraffyddion "
+"yn lle pob un ohonynt.  Efallai bydd hyn o ddefnydd pan mae llawer o "
+"argraffyddion ar gael, ond rydych eisiau defnyddio dim ond un neu ddau.  "
+"Dewiswch yr argraffyddion yr ydych eisiau eu gweld oddiar y rhestr i'r chwith, "
+"neu mewnosodwch hidl <b>Lleoliad</b> (ee: Group_1*).  Mae'r dau yn gronnus, ac "
+"eu anwybyddu os yn wag."
+
+#: management/kmconfigfilter.cpp:62
+msgid "Location filter:"
+msgstr "Hidl lleoliad:"
+
+#: management/kmconfigfonts.cpp:43
+msgid "Font Settings"
+msgstr "Gosodiadau Ffont"
+
+#: management/kmconfigfonts.cpp:46
+msgid "Fonts Embedding"
+msgstr "Mewnadeiladu Ffontiau"
+
+#: management/kmconfigfonts.cpp:47
+msgid "Fonts Path"
+msgstr "Llwyr Ffontiau"
+
+#: management/kmconfigfonts.cpp:49
+msgid "&Embed fonts in PostScript data when printing"
+msgstr "&Mewnadeiladu ffontiau mewn data PostScript wrth argraffu"
+
+#: management/kmconfigfonts.cpp:57
+msgid "&Up"
+msgstr "&Fyny"
+
+#: management/kmconfigfonts.cpp:58
+msgid "&Down"
+msgstr "&I Lawr"
+
+#: management/kmconfigfonts.cpp:59
+msgid "&Add"
+msgstr "&Ychwanegu"
+
+#: management/kmconfigfonts.cpp:61
+msgid "Additional director&y:"
+msgstr "&Cyfeiriadur Ychawanegol"
+
+#: management/kmconfigfonts.cpp:85
+msgid ""
+"These options will automatically put fonts in the PostScript file which are not "
+"present on the printer. Font embedding usually produces better print results "
+"(closer to what you see on the screen), but larger print data as well."
+msgstr ""
+"Bydd y dewisiadau yma yn rhoi ffontiau yn awtomatig i mewn i'r ffeil PostScript "
+"sydd ddim yn bresennol ar yr argraffydd.  Mae mewnadeiladu ffontiau fel arfer "
+"yn cynhyrchu canlyniadau argraffu gwell (yn agosach i be welwch ar y sgrîn), "
+"ond data argraffu mwy hefyd."
+
+#: management/kmconfigfonts.cpp:89
+msgid ""
+"When using font embedding you can select additional directories where TDE "
+"should search for embeddable font files. By default, the X server font path is "
+"used, so adding those directories is not needed. The default search path should "
+"be sufficient in most cases."
+msgstr ""
+"Wrth ddefnyddio mewnadeiladu ffontiau, cewch ddewis cyfeiriaduron ychwanegol "
+"lle ddylai TDE chwilio am ffeiliau ffontiau mewnadeiladadwy.  Wrth ragosodiad, "
+"defnyddir y llwybr ffont gweinydd X, felly nid oes angen ychwanegu'r "
+"cyfeiriaduron yna.  Dylai'r llwybr chwiliad rhagososdedig fod yn ddigonol yn y "
+"mwyafrif o sefyllfaoedd. "
 
 #: management/kmspecialprinterdlg.cpp:46
 msgid "Add Special Printer"
@@ -4520,492 +4594,194 @@ msgstr "Gosodiadau annilys. %1"
 msgid "Configuring %1"
 msgstr "Wrthi'n ffurfweddu %1"
 
-#: tdefilelist.cpp:42
-msgid ""
-" <qt> <b>Add File button</b> "
-"<p>This button calls the <em>'File Open'</em> dialog to let you select a file "
-"for printing. Note, that  "
-"<ul>"
-"<li>you can select ASCII or International Text, PDF, PostScript, JPEG, TIFF, "
-"PNG, GIF and many other graphic formats. "
-"<li>you can select various files from different paths and send them as one "
-"\"multi-file job\" to the printing system. </ul> </qt>"
-msgstr ""
-
-#: tdefilelist.cpp:54
-#, fuzzy
-msgid ""
-" <qt> <b>Remove File button</b> "
-"<p>This button removes the highlighted file from the list of to-be-printed "
-"files. </qt>"
-msgstr ""
-" <qt> Mae'r botwm yma yn gwaredu'r ffeil amlygedig o'r rhestr o ffeiliau i'w "
-"argraffu.</qt>"
-
-#: tdefilelist.cpp:59
-#, fuzzy
-msgid ""
-" <qt> <b>Move File Up button</b> "
-"<p>This button moves the highlighted file up in the list of files to be "
-"printed.</p> "
-"<p>In effect, this changes the order of the files' printout.</p> </qt>"
-msgstr ""
-"<qt> "
-"<p>Mae'r botwm yma yn symud y ffeil amlygedig i fyny yn y rhestr o ffeiliau i'w "
-"argraffu.</p> "
-"<p>Mewn effaith, newida hwn trefn argraffu'r ffeiliau.</p> </qt>"
-
-#: tdefilelist.cpp:66
-#, fuzzy
-msgid ""
-" <qt> <b>Move File Down button</b> "
-"<p>This button moves the highlighted file down in the list of files to be "
-"printed.</p> "
-"<p>In effect, this changes the order of the files' printout.</p> </qt>"
-msgstr ""
-"<qt> "
-"<p>Mae'r botwm yma yn symud y ffeil amlygedig i lawr yn y rhestr o ffeiliau i'w "
-"argraffu.</p> "
-"<p>Mewn effaith, newida hwn trefn argraffu'r ffeiliau.</p> </qt>"
-
-#: tdefilelist.cpp:73
-#, fuzzy
-msgid ""
-" <qt> <b>File Open button</b> "
-"<p>This button tries to open the highlighted file, so you can view or edit it "
-"before you send it to the printing system.</p> "
-"<p>If you open files, TDEPrint will use the application matching the MIME type "
-"of the file.</p> </qt>"
-msgstr ""
-" <qt> "
-"<p>Mae'r botwm yma yn ceisio agor y ffeil amlygedig, er mwyn i chi ei weld neu "
-"ei olygu cyn i chi ei anfon i'r cysawd argraffu. </p> "
-"<p>Os agorwch ffeiliau, bydd TDEArgraffu yn defnyddio'r cymhwysiad sy'n "
-"cydweddu math MIME y ffeil.</p> </qt>"
-
-#: tdefilelist.cpp:82
-msgid ""
-" <qt> <b>File List view</b> "
-"<p>This list displays all the files you selected for printing. You can see the "
-"file name(s), file path(s) and the file (MIME) type(s) as determined by "
-"TDEPrint. You may re-arrange the  initial order of the list  with the help of "
-"the arrow buttons on the right.</p> "
-"<p>The files will be printed as a single job, in the same order as displayed in "
-"the list.</p> "
-"<p><b>Note:</b> You can select multiple files. The files may be in multiple "
-"locations. The files may be of multiple MIME types. The buttons on the right "
-"side let you add more files, remove already selected files from the list,  "
-"re-order the list (by moving files up or down), and open files. If you open "
-"files, TDEPrint will use the application matching the MIME type of the file.</p> "
-"</qt>"
-msgstr ""
-
-#: tdefilelist.cpp:103
-msgid "Path"
-msgstr "Llwybr"
-
-#: tdefilelist.cpp:115
-msgid "Add file"
-msgstr "Ychwanegu  ffeil"
-
-#: tdefilelist.cpp:121
-msgid "Remove file"
-msgstr "Gwaredu ffeil"
-
-#: tdefilelist.cpp:128
-msgid "Open file"
-msgstr "Agor ffeil"
-
-#: tdefilelist.cpp:149
-msgid ""
-"Drag file(s) here or use the button to open a file dialog. Leave empty for <b>"
-"&lt;STDIN&gt;</b>."
-msgstr ""
-"Tynnwch y ffeil(iau) yma, neu defnyddwiwch y botwm i agor ymgom ffeil.  Gadewch "
-"yn wag am <b>&lt;STDIN&gt;</b>."
-
-#: driver.cpp:385 foomatic2loader.cpp:268
-msgid "Adjustments"
-msgstr "Addasiadau"
-
-#: plugincombobox.cpp:33
-msgid ""
-" <qt><b>Print Subsystem Selection</b> "
-"<p>This combo box shows (and lets you select) a print subsystem to be used by "
-"TDEPrint. (This print subsystem must, of course, be installed inside your "
-"Operating System.) TDEPrint usually auto-detects the correct print subsystem by "
-"itself upon first startup. Most Linux distributions have \"CUPS\", the <em>"
-"Common UNIX Printing System</em>. </qt>"
-msgstr ""
-
-#: plugincombobox.cpp:45
-msgid "Print s&ystem currently used:"
-msgstr "&Cysawd argraffu mewn defnydd ar hyn o bryd:"
+#: management/smbview.cpp:44
+msgid "Comment"
+msgstr "Esboniad"
 
-#: plugincombobox.cpp:91
-msgid ""
-" <qt><b>Current Connection</b> "
-"<p>This line shows which CUPS server your PC is currently connected to for "
-"printing and retrieving printer info. To switch to a different CUPS server, "
-"click \"System Options\", then select \"Cups server\" and fill in the required "
-"info. </qt>"
-msgstr ""
+#: management/kmwend.cpp:33
+msgid "Confirmation"
+msgstr "Gwybodaeth"
 
-#: driverview.cpp:47
-msgid ""
-" <qt>  <b>List of Driver Options (from PPD)</b>.  "
-"<p>The upper pane of this dialog page contains all printjob options as laid  "
-"down in the printer's description file (PostScript Printer Description == "
-"'PPD') </p> "
-"<p>Click on any item in the list and watch the lower pane of this dialog page  "
-"display the available values. </p>  "
-"<p>Set the values as needed. Then use one of the pushbuttons below to "
-"proceed:</p>  "
-"<ul>  "
-"<li><em>'Save'</em> your settings if you want to re-use  them in your next "
-"job(s) too. <em>'Save'</em> will store your settings permanently until  you "
-"change them again. </li>. "
-"<li>Click <em>'OK'</em> (without a prior click on <em>'Save'</em>"
-", if you want to use  your selected settings just once, for the next print job. "
-"<em>'OK'</em>  will forget your current settings when kprinter is closed again, "
-"and will start next time  with the previously saved defaults. </li> "
-"<li><em>'Cancel'</em> will not change anything. If you proceed to print after "
-"clicking  <em>'Cancel'</em>, the job will print with the default settings of "
-"this queue.  </ul> "
-"<p><b>Note.</b> The number of available job options depends strongly on the "
-"actual  driver used for your print queue. <em>'Raw'</em> "
-"queues do not have a driver or a   PPD. For raw queues this tab page is not "
-"loaded by TDEPrint, and thus is not present  in the kprinter dialog.</p>  </qt>"
-msgstr ""
+#: management/kmwend.cpp:50 management/kmwend.cpp:106
+#: management/kmwend.cpp:109 tdefilelist.cpp:102
+msgid "Type"
+msgstr "Math"
 
-#: driverview.cpp:71
-msgid ""
-" <qt>  <b>List of Possible Values for given Option (from PPD)</b>.  "
-"<p>The lower pane of this dialog page contains all possible values of the "
-"printoption  highlighted above, as laid  down in the printer's description file "
-"(PostScript Printer Description == 'PPD') </p> "
-"<p>Select the value you want and proceed. </p>  "
-"<p>Then use one of the pushbuttons below to leave this dialog:</p>  "
-"<ul>  "
-"<li><em>'Save'</em> your settings if you want to re-use  them in your next "
-"job(s) too. <em>'Save'</em> will store your settings permanently until  you "
-"change them again. </li>. "
-"<li>Click <em>'OK'</em> if you want to use your selected settings just once, "
-"for the  next print job. <em>'OK'</em>  will forget your current settings when "
-"kprinter is closed again, and will start next time  with your previous "
-"defaults. </li> "
-"<li><em>'Cancel'</em> will not change anything. If you proceed to print after "
-"clicking  <em>'Cancel'</em>, the job will print with the default settings of "
-"this queue.  </ul> "
-"<p><b>Note.</b> The number of available job options depends strongly on the "
-"actual  driver used for your print queue. <em>'Raw'</em> "
-"queues do not have a driver or a   PPD. For raw queues this tab page is not "
-"loaded by TDEPrint, and thus is not present  in the kprinter dialog.</p>  </qt>"
-msgstr ""
+#: management/kmwend.cpp:52
+msgid "Location"
+msgstr "Lleoliad"
 
-#: kprinter.cpp:280
-msgid "Initialization..."
-msgstr "Ymgychwyn..."
+#: management/kmwend.cpp:69
+msgid "Backend"
+msgstr "Ol-wyneb"
 
-#: kprinter.cpp:283 kprinter.cpp:909
-#, c-format
-msgid "Generating print data: page %1"
-msgstr "Cynhyrchu data argraffu: tudalen %1"
+#: management/kmwend.cpp:74
+msgid "Device"
+msgstr "Dyfais"
 
-#: kprinter.cpp:429
-msgid "Previewing..."
-msgstr "Rhagolygu..."
+#: management/kmwend.cpp:77
+msgid "Printer IP"
+msgstr "IP yr Argraffydd"
 
-#: tdeprintd.cpp:158 kprinter.cpp:690
-#, c-format
-msgid ""
-"<p><nobr>A print error occurred. Error message received from system:</nobr></p>"
-"<br>%1"
-msgstr ""
-"<p><nobr>Digwyddodd gwall argraffu. Y neges gwall a dderbynwyd o'r cysawd "
-"oedd:</nobr></p>"
-"<br>%1"
+#: management/kmwend.cpp:78 management/kmwend.cpp:89
+msgid "Port"
+msgstr "Porth"
 
-#: foomatic/kfoomaticprinterimpl.cpp:51 lpdunix/klpdunixprinterimpl.cpp:72
-msgid ""
-"No valid print executable was found in your path. Check your installation."
-msgstr ""
-"Ni chanfuwyd gweithredadwyn argraffu dilys yn eich llwybr.  Gwiriwch eich "
-"gosodiad."
+#: management/kmwend.cpp:81 management/kmwend.cpp:88
+msgid "Host"
+msgstr "Gwesteiwr"
 
-#: foomatic/kmfoomaticmanager.cpp:70
-msgid "This is not a Foomatic printer"
-msgstr "Nid yw hwn yn argraffydd Foomatic"
+#: management/kmwend.cpp:82 rlpr/kmproprlpr.cpp:48
+msgid "Queue"
+msgstr "Ciw"
 
-#: foomatic/kmfoomaticmanager.cpp:75
-msgid "Some printer information are missing"
-msgstr "Mae gwybodaeth argraffydd ar goll"
+#: management/kmwend.cpp:91
+msgid "Account"
+msgstr "Cyfrif"
 
-#: kmmanager.cpp:70
-msgid "This operation is not implemented."
-msgstr "Ni chynhelir y gweithrediad yma."
+#: management/kmwend.cpp:96
+msgid "URI"
+msgstr "URI"
 
-#: kmmanager.cpp:169
-msgid "Unable to locate test page."
-msgstr "Methu canfod tudalen arbrawf."
+#: management/kmwend.cpp:109
+msgid "DB driver"
+msgstr "Gyrrydd cronfa ddata"
 
-#: kmmanager.cpp:449
-msgid "Can't overwrite regular printer with special printer settings."
-msgstr ""
-"Methu ysgrifennu dros yr argraffydd arferol efo gosodiadau argraffydd arbennig."
+#: management/kmwend.cpp:109
+msgid "External driver"
+msgstr "Gyrrydd allanol"
 
-#: kmmanager.cpp:478
-#, c-format
-msgid "Parallel Port #%1"
-msgstr "Porth Paralel #%1"
+#: management/kmwend.cpp:110
+msgid "Manufacturer"
+msgstr "Gwneuthurwr"
 
-#: kmmanager.cpp:486 kmmanager.cpp:502 kxmlcommand.cpp:661
-#, c-format
-msgid "Unable to load TDE print management library: %1"
-msgstr "Methu llwytho rhaglengell rheoli argraffu TDE: %1"
+#: management/kmwend.cpp:111
+msgid "Model"
+msgstr "Model"
 
-#: kmmanager.cpp:491 kxmlcommand.cpp:669
-msgid "Unable to find wizard object in management library."
-msgstr "Methu canfod gwrthrych dewin yn y rhaglengell rheoli."
+#: management/kmwdriver.cpp:33
+msgid "Printer Model Selection"
+msgstr "Dewis Model o Argraffydd"
 
-#: kmmanager.cpp:507
-msgid "Unable to find options dialog in management library."
-msgstr "Methu canfod ymgom dewisiadau yn y rhaglengell rheoli."
+#: management/kmwdriver.cpp:113
+#, fuzzy
+msgid "Internal error: unable to locate the driver."
+msgstr "Gwall mewnol: methu lleoli'r gyrrydd!"
 
-#: kmmanager.cpp:534
-msgid "No plugin information available"
-msgstr "Dim gwybodaeth ategyn ar gael."
+#: management/kmpropgeneral.cpp:37
+msgid "Printer name:"
+msgstr "Enw'r argraffydd:"
 
-#: lpdunix/kmlpdunixmanager.cpp:210
-msgid "Description unavailable"
-msgstr "Dim disgrifiad ar gael."
+#: management/kmwsmb.cpp:35
+msgid "SMB Printer Settings"
+msgstr "Gosodiadau Argraffydd SMB"
 
-#: lpdunix/kmlpdunixmanager.cpp:220 lpdunix/kmlpdunixmanager.cpp:271
-#: lpdunix/kmlpdunixmanager.cpp:318 lpdunix/kmlpdunixmanager.cpp:380
-#, c-format
-msgid "Remote printer queue on %1"
-msgstr "Ciw argraffydd pell ar %1"
+#: management/kmwsmb.cpp:41
+msgid "Scan"
+msgstr "Syllu"
 
-#: kmspecialmanager.cpp:53
-msgid ""
-"A file share/tdeprint/specials.desktop was found in your local TDE directory. "
-"This file probably comes from a previous TDE release and should be removed in "
-"order to manage global pseudo printers."
-msgstr ""
-"Canfuwyd ffeil share/tdeprint/specials.desktop yn eich cyfeiriadur lleol TDE.  "
-"Mae'r ffeil yma yn dod o ryddhâd cynt o TDE, mwy na thebyg, a dylai ei waredu "
-"er mwyn rheoli ffug-argraffyddion  eang."
+#: management/kmwsmb.cpp:42
+msgid "Abort"
+msgstr "Terfynu"
 
-#: kprinterimpl.cpp:156
-msgid "Cannot copy multiple files into one file."
-msgstr "Methu copïo ffeiliau lluosol i mewn i un ffeil."
+#: management/kmwsmb.cpp:44
+msgid "Workgroup:"
+msgstr "Grwp gwaith:"
 
-#: kprinterimpl.cpp:165
-msgid "Cannot save print file to %1. Check that you have write access to it."
-msgstr ""
-"Methu cadw ffeil argraffu i %1.  Cywirwch fod ganddoch cyrchiad ysgrifennu "
-"iddo."
+#: management/kmwsmb.cpp:45
+msgid "Server:"
+msgstr " Gweinydd:"
 
-#: kprinterimpl.cpp:233
-#, c-format
-msgid "Printing document: %1"
-msgstr "Argraffu dogfen: %1"
+#: management/kmwsmb.cpp:81 rlpr/kmrlprmanager.cpp:45
+msgid "Empty printer name."
+msgstr "Mae enw'r argraffydd yn wag."
 
-#: kprinterimpl.cpp:251
+#: management/kmwsmb.cpp:99
 #, c-format
-msgid "Sending print data to printer: %1"
-msgstr "Anfon data argraffu i argraffydd: %1"
-
-#: kprinterimpl.cpp:279
-msgid "Unable to start child print process. "
-msgstr "Methu cychwyn proses argraffu plentyn."
-
-#: kprinterimpl.cpp:281
-msgid ""
-"The TDE print server (<b>tdeprintd</b>) could not be contacted. Check that this "
-"server is running."
-msgstr ""
-"Methu cysylltu â'r gweinydd argraffu TDE (<b>tdeprintd</b>"
-"). Cywirwch fod y gweinydd yma yn rhedeg."
-
-#: kprinterimpl.cpp:283
-msgid ""
-"_: 1 is the command that <files> is given to\n"
-"Check the command syntax:\n"
-"%1 <files>"
-msgstr ""
-"Cywirwch y gystrawen gorchymyn: \n"
-" %1 <files>"
-
-#: kprinterimpl.cpp:290
-msgid "No valid file was found for printing. Operation aborted."
-msgstr "Methu canfod ffeil dilys i argraffu.  Terfynwyd y gweithrediad."
-
-#: kprinterimpl.cpp:325
-msgid ""
-"<p>Unable to perform the requested page selection. The filter <b>psselect</b> "
-"cannot be inserted in the current filter chain. See <b>Filter</b> "
-"tab in the printer properties dialog for further information.</p>"
-msgstr ""
-"<p>Methu cyflawni y dewisiad tudalen ceisiedig.  Ni ellir mewnosod yr hidl <b>"
-"psselect</b> yn y cadwyn hidl cyfredol.  Gweler y tab <b>Filter</b> "
-"yn yr ymgom priodweddau argraffydd am fwy o fanylion.</p>"
-
-#: kprinterimpl.cpp:355
-#, fuzzy
-msgid "<p>Could not load filter description for <b>%1</b>.</p>"
-msgstr "<qt>nid oes ganddoch ganiatàd i redeg <b>%1</b>.</qt>"
-
-#: kprinterimpl.cpp:371
-msgid ""
-"<p>Error while reading filter description for <b>%1</b>"
-". Empty command line received.</p>"
-msgstr ""
-"<p>Gwall wrth ddarllen disgrifiad hidl i <b>%1</b>. Derbynnwyd llinell "
-"gorchymyn a oedd yn wag. </p>"
-
-#: kprinterimpl.cpp:385
-msgid ""
-"The MIME type %1 is not supported as input of the filter chain (this may happen "
-"with non-CUPS spoolers when performing page selection on a non-PostScript "
-"file). Do you want TDE to convert the file to a supported format?</p>"
-msgstr ""
-"Ni chynhelir y math MIME %1 fel mewnbwn i'r cadwyn hidl (gall hyn ddigwydd efo "
-"sbwlwyr di-CUPS wrth cyflawni dewisiad tudalen ar ffeil ddi-PostScript).  Ydych "
-"eisiau i TDE drosi'r ffeil i fformat a gynhelir?</p>"
-
-#: kprinterimpl.cpp:389 kprinterimpl.cpp:509
-msgid "Convert"
-msgstr "Trosi"
-
-#: kprinterimpl.cpp:399
-msgid "Select MIME Type"
-msgstr "Dewis Math MIME"
-
-#: kprinterimpl.cpp:400
-msgid "Select the target format for the conversion:"
-msgstr "Dewis y fformat cyrchfan i'r trosi:"
-
-#: kprinterimpl.cpp:404 kprinterimpl.cpp:430
-msgid "Operation aborted."
-msgstr "Terfynwyd y gweithrediad."
-
-#: kprinterimpl.cpp:410
-msgid "No appropriate filter found. Select another target format."
-msgstr "Methu canfod hidl addas.  Dewis fformat cyrchfan arall."
+msgid "Login: %1"
+msgstr "Mewngofnod: %1"
 
-#: kprinterimpl.cpp:423
-msgid ""
-"<qt>Operation failed with message:"
-"<br>%1"
-"<br>Select another target format.</qt>"
+#: management/kmwsmb.cpp:99
+msgid "<anonymous>"
 msgstr ""
-"<qt>Methodd y gweithrediad efo'r neges:"
-"<br>%1"
-"<br>Dewis fformat cyrchfan arall.</qt>"
-
-#: kprinterimpl.cpp:441
-msgid "Filtering print data"
-msgstr "Hidlo data argraffu"
 
-#: kprinterimpl.cpp:445
-msgid "Error while filtering. Command was: <b>%1</b>."
-msgstr "Gwall wrth hidlo.  Y gorchymyn oedd: <b>%1</b>."
+#: management/kmpages.cpp:69
+msgid "Instances"
+msgstr "Enghreifftiau"
 
-#: kprinterimpl.cpp:487
-msgid "<qt>The print file is empty and will be ignored:<p>%1</p></qt>"
-msgstr ""
+#: kpgeneralpage.cpp:86
+msgid "ISO A4"
+msgstr "ISO A4"
 
-#: kprinterimpl.cpp:497
-#, fuzzy
-msgid ""
-"<qt>The file format <em> %1 </em> is not directly supported by the current "
-"print system. You now have 3 options: "
-"<ul> "
-"<li> TDE can attempt to convert this file automatically to a supported format. "
-"(Select <em>Convert</em>) </li>"
-"<li> You can try to send the file to the printer without any conversion. "
-"(Select <em>Keep</em>) </li>"
-"<li> You can cancel the printjob. (Select <em>Cancel</em>) </li></ul> "
-"Do you want TDE to attempt and convert this file to %2?</qt>"
-msgstr ""
-"Ni chynhelir y fformat ffeil %1 yn uniongyrchol gan y cysawd argraffu cyfredol. "
-" Gall TDE geisio trosi'r ffeil yma yn awtomatig i fformat a gynhelir.  Ond "
-"gallwch dal i geisio anfon y ffeil i'r argraffydd heb drosiad o gwbl.  Ydych "
-"eisiau i TDE geisio trosi'r ffeil yma i %2?"
+#: kpgeneralpage.cpp:87 lpd/lpdtools.cpp:30
+msgid "US Letter"
+msgstr "Llythyren UD"
 
-#: kprinterimpl.cpp:518
-msgid ""
-"<qt>No appropriate filter was found to convert the file format %1 into %2."
-"<br>"
-"<ul>"
-"<li>Go to <i>System Options -> Commands</i> to look through the list of "
-"possible filters. Each filter executes an external program.</li>"
-"<li> See if the required external program is available.on your system.</li></ul>"
-"</qt>"
-msgstr ""
+#: kpgeneralpage.cpp:88 lpd/lpdtools.cpp:29
+msgid "US Legal"
+msgstr "Cyfreithiol UD"
 
-#: kpgeneralpage.cpp:85
-msgid "ISO A4"
-msgstr "ISO A4"
+#: kpgeneralpage.cpp:89 lpd/lpdtools.cpp:28
+msgid "Ledger"
+msgstr "Llyfr cyfrifon "
 
-#: kpgeneralpage.cpp:89
+#: kpgeneralpage.cpp:90
 msgid "Folio"
 msgstr "Ffolio"
 
-#: kpgeneralpage.cpp:90
+#: kpgeneralpage.cpp:91
 msgid "US #10 Envelope"
 msgstr "Amlen UD #10"
 
-#: kpgeneralpage.cpp:91
+#: kpgeneralpage.cpp:92
 msgid "ISO DL Envelope"
 msgstr "Amlen ISO DL"
 
-#: kpgeneralpage.cpp:92
+#: kpgeneralpage.cpp:93
 msgid "Tabloid"
 msgstr "Tabloid"
 
-#: kpgeneralpage.cpp:93
+#: kpgeneralpage.cpp:94
 msgid "ISO A3"
 msgstr "ISO A3"
 
-#: kpgeneralpage.cpp:94
+#: kpgeneralpage.cpp:95
 msgid "ISO A2"
 msgstr "ISO A2"
 
-#: kpgeneralpage.cpp:95
+#: kpgeneralpage.cpp:96
 msgid "ISO A1"
 msgstr "ISO A1"
 
-#: kpgeneralpage.cpp:96
+#: kpgeneralpage.cpp:97
 msgid "ISO A0"
 msgstr "ISO A0"
 
-#: kpgeneralpage.cpp:106
+#: kpgeneralpage.cpp:107
 msgid "Upper Tray"
 msgstr "Hambwrdd Uwch"
 
-#: kpgeneralpage.cpp:107
+#: kpgeneralpage.cpp:108
 msgid "Lower Tray"
 msgstr "Hambwrdd Is"
 
-#: kpgeneralpage.cpp:108
+#: kpgeneralpage.cpp:109
 msgid "Multi-Purpose Tray"
 msgstr "Hambwrdd Aml-Bwrpas"
 
-#: kpgeneralpage.cpp:109
+#: kpgeneralpage.cpp:110
 msgid "Large Capacity Tray"
 msgstr "Hambwrdd Maint Mawr"
 
-#: kpgeneralpage.cpp:113
+#: kpgeneralpage.cpp:114
 msgid "Normal"
 msgstr "Arferol"
 
-#: kpgeneralpage.cpp:114
+#: kpgeneralpage.cpp:115
 msgid "Transparency"
 msgstr "Tryloywder"
 
-#: kpgeneralpage.cpp:123
+#: kpgeneralpage.cpp:124
 msgid ""
 " <qt>  "
 "<p><b>\"General\"</b> </p>  "
@@ -5015,7 +4791,7 @@ msgid ""
 "of the  text labels or GUI elements of this dialog.  </qt>"
 msgstr ""
 
-#: kpgeneralpage.cpp:131
+#: kpgeneralpage.cpp:132
 msgid ""
 " <qt>  "
 "<p><b>Page size:</b> Select paper size to be printed on from  the drop-down "
@@ -5030,7 +4806,7 @@ msgid ""
 "</qt>"
 msgstr ""
 
-#: kpgeneralpage.cpp:144
+#: kpgeneralpage.cpp:145
 msgid ""
 " <qt>  "
 "<p><b>Paper type:</b> Select paper type to be printed on from  the drop-down "
@@ -5044,7 +4820,7 @@ msgid ""
 "<pre>    -o MediaType=...        # example: \"Transparency\"  </pre> </p>  </qt>"
 msgstr ""
 
-#: kpgeneralpage.cpp:157
+#: kpgeneralpage.cpp:158
 msgid ""
 " <qt>  "
 "<p><b>Paper source:</b> Select paper source tray for the paper to be printed on "
@@ -5059,7 +4835,7 @@ msgid ""
 "</pre> </p>  </qt>"
 msgstr ""
 
-#: kpgeneralpage.cpp:170
+#: kpgeneralpage.cpp:171
 msgid ""
 " <qt>  "
 "<p><b>Image Orientation:</b> Orientation of the printed  page image on your "
@@ -5081,7 +4857,7 @@ msgid ""
 "\"reverse-portrait\"  </pre> </p>  </qt>"
 msgstr ""
 
-#: kpgeneralpage.cpp:191
+#: kpgeneralpage.cpp:192
 msgid ""
 " <qt>  "
 "<p><b>Duplex Printing:</b> These controls may be grayed out if your printer  "
@@ -5107,7 +4883,7 @@ msgid ""
 " </pre> </p>  </qt>"
 msgstr ""
 
-#: kpgeneralpage.cpp:217
+#: kpgeneralpage.cpp:218
 msgid ""
 " <qt>  "
 "<p><b>Banner Page(s):</b> Select banner(s) to print one or two special sheets  "
@@ -5132,7 +4908,7 @@ msgid ""
 "</pre> </p>  </qt>"
 msgstr ""
 
-#: kpgeneralpage.cpp:239
+#: kpgeneralpage.cpp:240
 msgid ""
 " <qt>  "
 "<p><b>Pages per Sheet:</b>  You can choose to print more than one page onto "
@@ -5152,108 +4928,451 @@ msgid ""
 "<pre>    -o number-up=...        # examples: \"2\" or \"4\"  </pre> </p>  </qt>"
 msgstr ""
 
-#: kpgeneralpage.cpp:263 kpqtpage.cpp:118
+#: kpgeneralpage.cpp:264 kpqtpage.cpp:118
 msgid "Page s&ize:"
 msgstr "&Maint papur:"
 
-#: kpgeneralpage.cpp:267
+#: kpgeneralpage.cpp:268
 msgid "Paper t&ype:"
 msgstr "Ma&th papur:"
 
-#: kpgeneralpage.cpp:271
+#: kpgeneralpage.cpp:272
 msgid "Paper so&urce:"
 msgstr "&Tarddiad papur:"
 
-#: kpgeneralpage.cpp:291
+#: kpgeneralpage.cpp:292
 msgid "Duplex Printing"
 msgstr "Argraffu ar y ddwy ochr"
 
-#: kpgeneralpage.cpp:294 kpqtpage.cpp:143
+#: kpgeneralpage.cpp:295 kpqtpage.cpp:143
 msgid "Pages per Sheet"
 msgstr "Tudalennau y Dalen"
 
-#: kpgeneralpage.cpp:300 kpqtpage.cpp:125
+#: kpgeneralpage.cpp:301 kpqtpage.cpp:125
 msgid "&Portrait"
 msgstr "&Darlun"
 
-#: kpgeneralpage.cpp:301 kpqtpage.cpp:128
+#: kpgeneralpage.cpp:302 kpqtpage.cpp:128
 msgid "&Landscape"
 msgstr "&Tirlun"
 
-#: kpgeneralpage.cpp:302
+#: kpgeneralpage.cpp:303
 msgid "&Reverse landscape"
 msgstr "Ti&rlun gwrthdroi"
 
-#: kpgeneralpage.cpp:303
+#: kpgeneralpage.cpp:304
 msgid "R&everse portrait"
 msgstr "Dar&lun gwrthdroi"
 
-#: kpgeneralpage.cpp:308
+#: kpgeneralpage.cpp:309
 msgid ""
 "_: duplex orientation\n"
 "&None"
 msgstr "&Dim"
 
-#: kpgeneralpage.cpp:309
+#: kpgeneralpage.cpp:310
 msgid ""
 "_: duplex orientation\n"
 "Lon&g side"
 msgstr "Ochr &hir"
 
-#: kpgeneralpage.cpp:310
+#: kpgeneralpage.cpp:311
 msgid ""
 "_: duplex orientation\n"
 "S&hort side"
 msgstr "Ochr &byr"
 
-#: kpgeneralpage.cpp:322
+#: kpgeneralpage.cpp:323
 msgid "S&tart:"
 msgstr "&Dechrau:"
 
-#: kpgeneralpage.cpp:323
+#: kpgeneralpage.cpp:324
 msgid "En&d:"
 msgstr "Di&wedd:"
 
-#: ppdloader.cpp:173
-msgid "(line %1): "
+#: kpfileselectpage.cpp:33
+msgid "&Files"
+msgstr "&Ffeiliau"
+
+#: kpqtpage.cpp:70
+msgid ""
+" <qt>  <b>Selection of color mode:</b> You can choose between 2 options:  "
+"<ul>"
+"<li><b>Color</b> and</li>  "
+"<li><b>Grayscale</b></li></ul>  <b>Note:</b> This selection field may be grayed "
+"out and made inactive.  This happens if TDEPrint can not retrieve  enough "
+"information about your print file. In this case the embedded color- or "
+"grayscale information  of your printfile, and the default handling of the "
+"printer take precedence.  </qt>"
 msgstr ""
 
-#: droptionview.cpp:61
-msgid "Value:"
-msgstr "Gwerth:"
+#: kpqtpage.cpp:79
+msgid ""
+" <qt>  <b>Selection of page size:</b> Select paper size to be printed on from  "
+"the drop-down menu.  "
+"<p>The exact list of choices depends on the printer driver (\"PPD\") you have "
+"installed.  </qt>"
+msgstr ""
 
-#: droptionview.cpp:167
-msgid "String value:"
-msgstr "Gwerth llinyn:"
+#: kpqtpage.cpp:84
+msgid ""
+" <qt>  <b>Selection of pages per sheet:</b>  You can choose to print more than "
+"one page onto each sheet of paper.  This is sometimes useful to save paper.  "
+"<p><b>Note 1:</b> the page images get scaled down accordingly to print 2 or 4 "
+"pages per sheet.  The page image does not get scaled if you print 1 page per "
+"sheet (the default setting.).  "
+"<p><b>Note 2:</b> If you select multiple pages per sheet here, the scaling and "
+"re-arranging is done  by your printing system.  "
+"<p><b>Note 3, regarding \"Other\":</b> You cannot really select <em>Other</em> "
+"as the number of  pages to print on one sheet.\"Other\" is checkmarked here for "
+"information purposes only.  "
+"<p>To select 8, 9, 16 or other numbers of  pages per sheet:  "
+"<ul>  "
+"<li> go to the tab headlined \"Filter\"</li> "
+"<li> enable the <em>Multiple Pages per Sheet</em> filter </li> "
+"<li> and configure it (bottom-most button on the right of the \"Filters\" tab). "
+"</li> </ul> </qt>"
+msgstr ""
 
-#: droptionview.cpp:306 droptionview.cpp:341
-msgid "No Option Selected"
-msgstr "Dim Dewis wedi ei Wneud"
+#: kpqtpage.cpp:102
+msgid ""
+" <qt>  <b>Selection of image orientation:</b> Orientation of the printed  "
+"pageimage on your paper is controlled by the radio buttons. By default,  the "
+"orientation is <em>Portrait</em>  "
+"<p>You can select 2 alternatives:  "
+"<ul>  "
+"<li> <b>Portrait.</b>.Portrait is the default setting. </li>  "
+"<li> <b>Landscape.</b> </li>  </ul>  The icon changes according to your "
+"selection. </qt>"
+msgstr ""
+
+#: kpqtpage.cpp:113
+msgid "Print Format"
+msgstr "Ffurfweddiad Argraffu"
+
+#: kpqtpage.cpp:123
+msgid "Color Mode"
+msgstr "Modd Lliw"
+
+#: kpqtpage.cpp:135
+msgid "Colo&r"
+msgstr "Ll&iw"
+
+#: kpqtpage.cpp:138
+msgid "&Grayscale"
+msgstr "&Graddlwyd"
+
+#: kpqtpage.cpp:151
+msgid "Ot&her"
+msgstr "E&raill"
+
+#: lpdunix/kmlpdunixmanager.cpp:210
+msgid "Description unavailable"
+msgstr "Dim disgrifiad ar gael."
+
+#: lpdunix/kmlpdunixmanager.cpp:220 lpdunix/kmlpdunixmanager.cpp:271
+#: lpdunix/kmlpdunixmanager.cpp:318 lpdunix/kmlpdunixmanager.cpp:380
+#, c-format
+msgid "Remote printer queue on %1"
+msgstr "Ciw argraffydd pell ar %1"
+
+#: kprinterpropertydialog.cpp:78 kprinterpropertydialog.cpp:138
+msgid "Printer Configuration"
+msgstr "Ffurfweddiad Argraffydd"
+
+#: kprinterpropertydialog.cpp:138
+#, fuzzy
+msgid "No configurable options for that printer."
+msgstr "Dim dewisiadau ffurfweddiedadwy i'r argraffydd yna!"
+
+#: kmvirtualmanager.cpp:161
+msgid ""
+"<qt>You are about to set a pseudo-printer as your personal default. This "
+"setting is specific to TDE and will not be available outside TDE applications. "
+"Note that this will only make your personal default printer as undefined for "
+"non-TDE applications and should not prevent you from printing normally. Do you "
+"really want to set <b>%1</b> as your personal default?</qt>"
+msgstr ""
+
+#: rlpr/kmrlprmanager.cpp:47 rlpr/kmwrlpr.cpp:85
+msgid "Empty host name."
+msgstr "Mae enw'r gwesteiwr yn wag."
+
+#: rlpr/kmrlprmanager.cpp:49 rlpr/kmwrlpr.cpp:87
+msgid "Empty queue name."
+msgstr "Mae enw'r ciw yn wag."
+
+#: rlpr/kmrlprmanager.cpp:63
+msgid "Printer not found."
+msgstr "Ni chanfuwyd argraffydd."
+
+#: rlpr/kmrlprmanager.cpp:75
+msgid "Not implemented yet."
+msgstr "Ni chynhelir eto."
+
+#: rlpr/kmconfigproxy.cpp:29
+msgid "Proxy"
+msgstr "Dirprwy"
+
+#: rlpr/kmconfigproxy.cpp:30
+msgid "RLPR Proxy Server Settings"
+msgstr "Gosodiadau Gweinydd Dirpwry RLPR"
+
+#: rlpr/kmproprlpr.cpp:49 rlpr/kmwrlpr.cpp:50
+msgid "Remote LPD Queue Settings"
+msgstr "Gosodiadau Ciw Pell LPD"
+
+#: rlpr/kmproxywidget.cpp:32
+msgid "Proxy Settings"
+msgstr "Gosodiadau Dirprwy"
+
+#: rlpr/kmproxywidget.cpp:36
+msgid "&Use proxy server"
+msgstr "&Defnyddio gweinydd dirprwy"
+
+#: rlpr/kmwrlpr.cpp:124
+msgid "Remote queue %1 on %2"
+msgstr "Ciw pell %1 ar %2"
+
+#: rlpr/kmwrlpr.cpp:199
+msgid "No Predefined Printers"
+msgstr "Nid yw argraffydd wedi'i ddiffinio eto"
+
+#: lpd/klpdprinterimpl.cpp:46 rlpr/krlprprinterimpl.cpp:53
+msgid ""
+"The <b>%1</b> executable could not be found in your path. Check your "
+"installation."
+msgstr ""
+"Methu canfod y gweithredadwyn <b>%1</b> yn eich llwybr. Gwiriwch eich gosodiad."
+
+#: rlpr/krlprprinterimpl.cpp:73
+msgid "The printer is incompletely defined. Try to reinstall it."
+msgstr ""
+"Nid yw'r argraffydd wedi ei ddiffinio yn gyflawn.  Ceisiwch ei ail-osod."
+
+#: kmspecialmanager.cpp:53
+#, fuzzy
+msgid ""
+"A file share/tdeprint/specials.desktop was found in your local KDE directory. "
+"This file probably comes from a previous KDE release and should be removed in "
+"order to manage global pseudo printers."
+msgstr ""
+"Canfuwyd ffeil share/tdeprint/specials.desktop yn eich cyfeiriadur lleol TDE.  "
+"Mae'r ffeil yma yn dod o ryddhâd cynt o TDE, mwy na thebyg, a dylai ei waredu "
+"er mwyn rheoli ffug-argraffyddion  eang."
+
+#: kmjob.cpp:114
+msgid "Queued"
+msgstr "Mewn Ciw"
+
+#: kmjob.cpp:117
+msgid "Held"
+msgstr "Ar afael"
+
+#: kmjob.cpp:123
+msgid "Canceled"
+msgstr "Gwrthwnaed"
+
+#: kmjob.cpp:126
+msgid "Aborted"
+msgstr "Terfynwyd"
+
+#: kmjob.cpp:129
+msgid "Completed"
+msgstr "Gorffenwyd"
+
+#. i18n: file kprintpreviewui.rc line 13
+#: rc.cpp:9 rc.cpp:21
+#, no-c-format
+msgid "&PageMarks"
+msgstr "&NodauDalen"
 
 #: kmuimanager.cpp:158
 #, c-format
 msgid "Configuration of %1"
 msgstr "Ffurfweddiad %1"
 
-#: kmprinter.cpp:144
-msgid "(rejecting jobs)"
-msgstr "(gwrthod swyddi)"
+#: ext/kextprinterimpl.cpp:47
+msgid "Empty print command."
+msgstr "Mae'r gorchymyn argraffu yn wag."
 
-#: kmprinter.cpp:144
-msgid "(accepting jobs)"
-msgstr "(derbyn swyddi)"
+#: ext/kmextmanager.cpp:41
+msgid "PS_printer"
+msgstr "Argraffydd_PS"
 
-#: kprintprocess.cpp:75
-msgid "File transfer failed."
-msgstr "Methu trosglwyddo'r ffeil."
+#: ext/kmextmanager.cpp:43
+msgid "PostScript file generator"
+msgstr "Creuydd ffeil PostScript"
 
-#: kprintprocess.cpp:81
-msgid "Abnormal process termination (<b>%1</b>)."
-msgstr "Terfyniad proses anarferol  (<b>%1</b>)."
+#: kpposterpage.cpp:42
+#, fuzzy
+msgid " <qt>  5.  </qt>"
+msgstr "<qt><p> </p>. </qt>"
 
-#: kprintprocess.cpp:83
-msgid "<b>%1</b>: execution failed with message:<p>%2</p>"
-msgstr "<b>%1</b>: methodd gweithrediad efo'r neges:<p>%2</p>"
+#: kpposterpage.cpp:46
+msgid ""
+" <qt>  <b>Print Poster</b> (enabled or disabled).  "
+"<p>If you enable this option, you can print posters of different sizes  The "
+"printout will happen in the form <em>'tiles'</em> printed on smaller  paper "
+"sizes, which you can stitch together later. <em>If you enable this  option "
+"here, the <em>'Poster Printing' filter</em> will be auto-loaded in  the "
+"'Filters' tab of this dialog. </p> "
+"<p>This tab is only visible if the external <em>'poster'</em> "
+"utility is  discovered by TDEPrint on your system. [<em>'poster'</em> "
+"is a commandline  utility that enables you to convert PostScript files into "
+"tiled printouts  which allow for oversized appearance of the stitched-together "
+"tiles.] </p> "
+"<p><b>Note:</b> The standard version of 'poster' will not work. Your system  "
+"must use a patched version of 'poster'. Ask your operating system vendor to  "
+"provide a patched version of 'poster' if he does not already. </p> </qt>"
+msgstr ""
+
+#: kpposterpage.cpp:62
+msgid ""
+" <qt>  <b>Tile Selection widget</b>  "
+"<p>This GUI element is <em>not only for viewing</em> "
+"your selections: it also  lets you interactively select the tile(s) you want to "
+"print.  </p> "
+"<p><b>Hints</b>  "
+"<ul>  "
+"<li>Click any tile to select it for printing.</li>  "
+"<li>To select multiple tiles to be printed  at once, <em>'shift-click'</em> "
+"on the tiles ('shift-click' means: hold down the  [SHIFT]-key on your keyboard "
+"and click with the mouse while [SHIFT]-key is held.)   <em>Be aware</em> "
+"that the order  of your clicking is also significant to the order of printing "
+"the different tiles. </li> </ul>  <b>Note 1:</b> The order of your selection "
+"(and the order for printout of the tiles)  is indicated by the contents of the "
+"text field below,  labelled as <em>'Tile pages (to be printed):'</em>"
+"<p> <b>Note 2:</b> By default no tile is selected. Before you can print (a part "
+" of) your poster, you must select at least one tile. </p>  </qt>"
+msgstr ""
+
+#: kpposterpage.cpp:83
+msgid ""
+" <qt>  <b>Poster Size</b>  "
+"<p>Select the poster size you want from the dropdown list. </p>  "
+"Available sizes are all standard paper sizes up to  'A0'. [A0 is the same size "
+"as 16 sheets of A4, or '84cm x 118.2cm'.] </p>  "
+"<p><b>Notice</b>, how the little preview window below changes with your change "
+"of poster  size. It indicates to you how many tiles need to be printed to make "
+"the poster,  given the selected paper size.</p>   "
+"<p><b>Hint:</b> The little preview window below is not just a passive icon. You "
+"can click  on its individual tiles to select them for printing. To select "
+"multiple tiles to be printed  at once, you need to <em>'shift-click'</em> "
+"on the tiles ('shift-click' means: hold down the  [SHIFT]-key on your keyboard "
+"and click with the mouse while [SHIFT]-key is held.) The order  of your "
+"clicking is significant to the order of printing the different tiles. The order "
+"of  your selection (and for the printed tiles) is indicated by the contents of "
+"the text field  labelled as <em>'Tile pages (to be printed):'</em>"
+"<p> <b>Note:</b> By default no tile is selected. Before you can print (a part  "
+"of) your poster, you must select at least one tile. </p>  </qt>"
+msgstr ""
+
+#: kpposterpage.cpp:102
+msgid ""
+" <qt>  <b>Paper Size</b>  "
+"<p>This field indicates the paper size the poster tiles will be printed on.  To "
+"select a different paper size for your poster tiles, go to the 'General' tab  "
+"of this dialog and select one from the dropdown list. </p>  "
+"Available sizes are most standard paper sizes supported by your printer. Your "
+"printer's  supported paper sizes are read from the printer driver info (as laid "
+"down in the <em>'PPD'</em>,  the printer description file). <em>"
+"Be aware that the 'Paper Size' selected may not be supported  by 'poster' "
+"(example: 'HalfLetter') while it may well be supported by your printer.</em>  "
+"If  you hit that obstacle, simply use another, supported Paper Size, like 'A4' "
+"or 'Letter'.  "
+"<p><b>Notice</b>, how the little preview window below changes with your change "
+"of paper  size. It indicates how many tiles need to be printed to make up the "
+"poster,  given the selected paper and poster size.</p>   "
+"<p><b>Hint:</b> The little preview window below is not just a passive icon. You "
+"can click  on its individual tiles to select them for printing. To select "
+"multiple tiles to be printed  at once, you need to <em>'shift-click'</em> "
+"on the tiles ('shift-click' means: hold down the  [SHIFT]-key on your keyboard "
+"and click with the mouse while [SHIFT]-key is held.) The order  of your "
+"clicking is significant to the order of printing the different tiles. The order "
+"of  your selection (and for the printed tiles) is indicated by the contents of "
+"the text field  labelled as <em>'Tile pages (to be printed):'</em>"
+"<p> <b>Note:</b> By default no tile is selected. Before you can print (a part  "
+"of) your poster, you must select at least one tile. </p>  </qt>"
+msgstr ""
+
+#: kpposterpage.cpp:126
+msgid ""
+" <qt>  <b>Cut Margin selection</b>  "
+"<p>Slider and spinbox let you determine a <em>'cut margin'</em> "
+"which will be printed onto  each tile of your poster to help you cut the pieces "
+"as needed. </p> "
+"<p><b>Notice</b>, how the little preview window above changes with your change "
+"of cut  margins. It indicates to you how much space the cut margins will take "
+"away from each tile.  "
+"<p><b>Be aware</b>, that your cut margins need to be equal to or greater than "
+"the margins your  printer uses. The printer's capabilities are described in the "
+"<em>'ImageableArea'</em>  keywords of its driver PPD file. </p>  </qt>"
+msgstr ""
+
+#: kpposterpage.cpp:137
+msgid ""
+" <qt>  <b>Order and number of tile pages to be printed</b>  "
+"<p>This field displays and sets the individual tiles to be printed, as well as "
+"the order  for their printout. </p>  You can file the field with 2 different "
+"methods:  "
+"<ul>  "
+"<li>Either use the interactive thumbnail preview above and '[SHIFT]-click' on "
+"the tiles. </li>  "
+"<li>Or edit this text field accordingly. </li>  </ul>  "
+"<p>When editing the field, you can use a '3-7' syntax instead of a '3,4,5,6,7' "
+"one. </p>  "
+"<p><b>Examples:</b></p>  "
+"<pre>    \"2,3,7,9,3\"  "
+"<br>    \"1-3,6,8-11\"  </qt>"
+msgstr ""
+
+#: kpposterpage.cpp:154
+msgid "Poster"
+msgstr "Poster"
+
+#: kpposterpage.cpp:156
+msgid "&Print poster"
+msgstr "&Argraffu poster"
+
+#: kpposterpage.cpp:170
+msgid "Poste&r size:"
+msgstr "Maint y poste&r:"
+
+#: kpposterpage.cpp:172
+msgid "Media size:"
+msgstr "Maint y cyfryngau:"
+
+#: kpposterpage.cpp:174
+msgid "Pri&nt size:"
+msgstr " Mai&nt yr argraffu:"
+
+#: kpposterpage.cpp:181
+#, no-c-format
+msgid "C&ut margin (% of media):"
+msgstr "Ym&yl torri (% y cyfryngau):"
+
+#: kpposterpage.cpp:185
+msgid "&Tile pages (to be printed):"
+msgstr "&Teilsio'r tudalennau (i'w argraffu):"
+
+#: kpposterpage.cpp:192
+msgid "Link/unlink poster and print size"
+msgstr "Cysylltu/dad-gysylltu maint y poster a'r argraffu"
+
+#: kpposterpage.cpp:257
+msgid "Unknown"
+msgstr "Anhysbys"
+
+#: kprinter.cpp:690 tdeprintd.cpp:158
+#, c-format
+msgid ""
+"<p><nobr>A print error occurred. Error message received from system:</nobr></p>"
+"<br>%1"
+msgstr ""
+"<p><nobr>Digwyddodd gwall argraffu. Y neges gwall a dderbynwyd o'r cysawd "
+"oedd:</nobr></p>"
+"<br>%1"
 
 #: tdeprintd.cpp:176
 msgid ""
@@ -5284,11 +5403,70 @@ msgstr " Cysawd argraffu"
 msgid "Authentication failed (user name=%1)"
 msgstr "Methodd y dilysiant (enw'r defnyddiwr=%1)"
 
-#. i18n: file kprintpreviewui.rc line 13
-#: rc.cpp:9 rc.cpp:21
-#, no-c-format
-msgid "&PageMarks"
-msgstr "&NodauDalen"
+#: kprinter.cpp:280
+msgid "Initialization..."
+msgstr "Ymgychwyn..."
+
+#: kprinter.cpp:283 kprinter.cpp:909
+#, c-format
+msgid "Generating print data: page %1"
+msgstr "Cynhyrchu data argraffu: tudalen %1"
+
+#: kprinter.cpp:429
+msgid "Previewing..."
+msgstr "Rhagolygu..."
+
+#: driverview.cpp:47
+msgid ""
+" <qt>  <b>List of Driver Options (from PPD)</b>.  "
+"<p>The upper pane of this dialog page contains all printjob options as laid  "
+"down in the printer's description file (PostScript Printer Description == "
+"'PPD') </p> "
+"<p>Click on any item in the list and watch the lower pane of this dialog page  "
+"display the available values. </p>  "
+"<p>Set the values as needed. Then use one of the pushbuttons below to "
+"proceed:</p>  "
+"<ul>  "
+"<li><em>'Save'</em> your settings if you want to re-use  them in your next "
+"job(s) too. <em>'Save'</em> will store your settings permanently until  you "
+"change them again. </li>. "
+"<li>Click <em>'OK'</em> (without a prior click on <em>'Save'</em>"
+", if you want to use  your selected settings just once, for the next print job. "
+"<em>'OK'</em>  will forget your current settings when kprinter is closed again, "
+"and will start next time  with the previously saved defaults. </li> "
+"<li><em>'Cancel'</em> will not change anything. If you proceed to print after "
+"clicking  <em>'Cancel'</em>, the job will print with the default settings of "
+"this queue.  </ul> "
+"<p><b>Note.</b> The number of available job options depends strongly on the "
+"actual  driver used for your print queue. <em>'Raw'</em> "
+"queues do not have a driver or a   PPD. For raw queues this tab page is not "
+"loaded by TDEPrint, and thus is not present  in the kprinter dialog.</p>  </qt>"
+msgstr ""
+
+#: driverview.cpp:71
+msgid ""
+" <qt>  <b>List of Possible Values for given Option (from PPD)</b>.  "
+"<p>The lower pane of this dialog page contains all possible values of the "
+"printoption  highlighted above, as laid  down in the printer's description file "
+"(PostScript Printer Description == 'PPD') </p> "
+"<p>Select the value you want and proceed. </p>  "
+"<p>Then use one of the pushbuttons below to leave this dialog:</p>  "
+"<ul>  "
+"<li><em>'Save'</em> your settings if you want to re-use  them in your next "
+"job(s) too. <em>'Save'</em> will store your settings permanently until  you "
+"change them again. </li>. "
+"<li>Click <em>'OK'</em> if you want to use your selected settings just once, "
+"for the  next print job. <em>'OK'</em>  will forget your current settings when "
+"kprinter is closed again, and will start next time  with your previous "
+"defaults. </li> "
+"<li><em>'Cancel'</em> will not change anything. If you proceed to print after "
+"clicking  <em>'Cancel'</em>, the job will print with the default settings of "
+"this queue.  </ul> "
+"<p><b>Note.</b> The number of available job options depends strongly on the "
+"actual  driver used for your print queue. <em>'Raw'</em> "
+"queues do not have a driver or a   PPD. For raw queues this tab page is not "
+"loaded by TDEPrint, and thus is not present  in the kprinter dialog.</p>  </qt>"
+msgstr ""
 
 #: kpcopiespage.cpp:46
 #, fuzzy
@@ -5313,7 +5491,7 @@ msgstr ""
 #: kpcopiespage.cpp:55
 msgid ""
 " <qt><b>Current Page:</b> Select <em>\"Current\"</em> "
-"if you want  to print the page currently visible in your TDE application.</p> "
+"if you want  to print the page currently visible in your KDE application.</p> "
 "<p><b>Note:</b> this field is disabled if you print from non-TDE applications "
 "like Mozilla or OpenOffice.org, since here TDEPrint has no means to determine "
 "which document page you are currently viewing.</p></qt>"
@@ -5517,413 +5695,308 @@ msgstr "&Set o dudalennau"
 msgid "Pages"
 msgstr "Tudalennau"
 
-#: kprintpreview.cpp:137
-msgid "Do you want to continue printing anyway?"
-msgstr "Ydych eisiau dal i argraffu beth bynnag?"
+#: plugincombobox.cpp:33
+msgid ""
+" <qt><b>Print Subsystem Selection</b> "
+"<p>This combo box shows (and lets you select) a print subsystem to be used by "
+"TDEPrint. (This print subsystem must, of course, be installed inside your "
+"Operating System.) TDEPrint usually auto-detects the correct print subsystem by "
+"itself upon first startup. Most Linux distributions have \"CUPS\", the <em>"
+"Common UNIX Printing System</em>. </qt>"
+msgstr ""
 
-#: kprintpreview.cpp:145 kprintpreview.cpp:224
-msgid "Print Preview"
-msgstr "Rhagolwg Argraffu"
+#: plugincombobox.cpp:45
+msgid "Print s&ystem currently used:"
+msgstr "&Cysawd argraffu mewn defnydd ar hyn o bryd:"
 
-#: kprintpreview.cpp:275
+#: plugincombobox.cpp:91
 msgid ""
-"The preview program %1 cannot be found. Check that the program is correctly "
-"installed and located in a directory included in your PATH environment "
-"variable."
+" <qt><b>Current Connection</b> "
+"<p>This line shows which CUPS server your PC is currently connected to for "
+"printing and retrieving printer info. To switch to a different CUPS server, "
+"click \"System Options\", then select \"Cups server\" and fill in the required "
+"info. </qt>"
 msgstr ""
-"Methu canfod y rhaglen rhagolwg %1.  Cywirwch fod y rhaglen wedi'i gosod yn "
-"iawn ac wedi'i lleoli mewn cyfeiriadur sydd yn cael ei cynnwys yn eich newidyn "
-"amgylchedd PATH."
 
-#: kprintpreview.cpp:300
+#: tdefilelist.cpp:42
 msgid ""
-"Preview failed: neither the internal TDE PostScript viewer (KGhostView) nor any "
-"other external PostScript viewer could be found."
+" <qt> <b>Add File button</b> "
+"<p>This button calls the <em>'File Open'</em> dialog to let you select a file "
+"for printing. Note, that  "
+"<ul>"
+"<li>you can select ASCII or International Text, PDF, PostScript, JPEG, TIFF, "
+"PNG, GIF and many other graphic formats. "
+"<li>you can select various files from different paths and send them as one "
+"\"multi-file job\" to the printing system. </ul> </qt>"
 msgstr ""
-"Methodd y rhagolwg: ni chanfodwyd ai'r gwelydd PostScript TDE mewnol neu unrhyw "
-"gwelydd PostScript allanol."
 
-#: kprintpreview.cpp:304
-#, c-format
+#: tdefilelist.cpp:54
+#, fuzzy
 msgid ""
-"Preview failed: TDE could not find any application to preview files of type %1."
+" <qt> <b>Remove File button</b> "
+"<p>This button removes the highlighted file from the list of to-be-printed "
+"files. </qt>"
 msgstr ""
-" Methodd y rhagolwg: ni allodd TDE ganfod unrhyw cymhwysiant i ragolygu "
-"ffeiliau o fath %1."
-
-#: kprintpreview.cpp:314
-#, c-format
-msgid "Preview failed: unable to start program %1."
-msgstr "Methodd y rhagolwg: methu cychwyn rhaglen %1."
+" <qt> Mae'r botwm yma yn gwaredu'r ffeil amlygedig o'r rhestr o ffeiliau i'w "
+"argraffu.</qt>"
 
-#: kprintpreview.cpp:319
-msgid "Do you want to continue printing?"
-msgstr "Ydych eisiau dal i argraffu?"
+#: tdefilelist.cpp:59
+#, fuzzy
+msgid ""
+" <qt> <b>Move File Up button</b> "
+"<p>This button moves the highlighted file up in the list of files to be "
+"printed.</p> "
+"<p>In effect, this changes the order of the files' printout.</p> </qt>"
+msgstr ""
+"<qt> "
+"<p>Mae'r botwm yma yn symud y ffeil amlygedig i fyny yn y rhestr o ffeiliau i'w "
+"argraffu.</p> "
+"<p>Mewn effaith, newida hwn trefn argraffu'r ffeiliau.</p> </qt>"
 
-#: kmfactory.cpp:221
-msgid "<qt>There was an error loading %1. The diagnostic is:<p>%2</p></qt>"
-msgstr "<qt>Gwall wrth lwytho %1.  Y  ddeiagnostig yw:<p>%2</p></qt>"
+#: tdefilelist.cpp:66
+#, fuzzy
+msgid ""
+" <qt> <b>Move File Down button</b> "
+"<p>This button moves the highlighted file down in the list of files to be "
+"printed.</p> "
+"<p>In effect, this changes the order of the files' printout.</p> </qt>"
+msgstr ""
+"<qt> "
+"<p>Mae'r botwm yma yn symud y ffeil amlygedig i lawr yn y rhestr o ffeiliau i'w "
+"argraffu.</p> "
+"<p>Mewn effaith, newida hwn trefn argraffu'r ffeiliau.</p> </qt>"
 
-#: kpdriverpage.cpp:48
+#: tdefilelist.cpp:73
 #, fuzzy
 msgid ""
-"<qt>Some options selected are in conflict. You must resolve these conflicts "
-"before continuing. See <b>Driver Settings</b> tab for detailed information.</qt>"
+" <qt> <b>File Open button</b> "
+"<p>This button tries to open the highlighted file, so you can view or edit it "
+"before you send it to the printing system.</p> "
+"<p>If you open files, TDEPrint will use the application matching the MIME type "
+"of the file.</p> </qt>"
 msgstr ""
-"<qt>Mae rhai dewisiadau yn gwrthdaro.  Rhaid i chi ddatrys y gwrthdaro yna cyn "
-"fynd ymlaen.  Gweler y tab <b>Uwch</b> am wybodaeth manwl.</qt>  "
+" <qt> "
+"<p>Mae'r botwm yma yn ceisio agor y ffeil amlygedig, er mwyn i chi ei weld neu "
+"ei olygu cyn i chi ei anfon i'r cysawd argraffu. </p> "
+"<p>Os agorwch ffeiliau, bydd TDEArgraffu yn defnyddio'r cymhwysiad sy'n "
+"cydweddu math MIME y ffeil.</p> </qt>"
 
-#: posterpreview.cpp:115
+#: tdefilelist.cpp:82
 msgid ""
-"Poster preview not available. Either the <b>poster</b> "
-"executable is not properly installed, or you don't have the required version."
+" <qt> <b>File List view</b> "
+"<p>This list displays all the files you selected for printing. You can see the "
+"file name(s), file path(s) and the file (MIME) type(s) as determined by "
+"TDEPrint. You may re-arrange the  initial order of the list  with the help of "
+"the arrow buttons on the right.</p> "
+"<p>The files will be printed as a single job, in the same order as displayed in "
+"the list.</p> "
+"<p><b>Note:</b> You can select multiple files. The files may be in multiple "
+"locations. The files may be of multiple MIME types. The buttons on the right "
+"side let you add more files, remove already selected files from the list,  "
+"re-order the list (by moving files up or down), and open files. If you open "
+"files, TDEPrint will use the application matching the MIME type of the file.</p> "
+"</qt>"
 msgstr ""
-"Nid yw'r rhagolwg poster ar gael.  Un ai nid yw'r gweithredadwyn <b>poster</b> "
-"wedi'i osod yn iawn, neu nid oes gennych y fersiwn priodol."
 
-#: kprinterpropertydialog.cpp:78 kprinterpropertydialog.cpp:138
-msgid "Printer Configuration"
-msgstr "Ffurfweddiad Argraffydd"
+#: tdefilelist.cpp:103
+msgid "Path"
+msgstr "Llwybr"
 
-#: kprinterpropertydialog.cpp:138
-#, fuzzy
-msgid "No configurable options for that printer."
-msgstr "Dim dewisiadau ffurfweddiedadwy i'r argraffydd yna!"
+#: tdefilelist.cpp:115
+msgid "Add file"
+msgstr "Ychwanegu  ffeil"
 
-#: marginpreview.cpp:135
-msgid "No preview available"
-msgstr "Dim rhagolwg ar gael"
+#: tdefilelist.cpp:121
+msgid "Remove file"
+msgstr "Gwaredu ffeil"
 
-#: kpfileselectpage.cpp:33
-msgid "&Files"
-msgstr "&Ffeiliau"
+#: tdefilelist.cpp:128
+msgid "Open file"
+msgstr "Agor ffeil"
 
-#: marginwidget.cpp:37
+#: tdefilelist.cpp:149
 msgid ""
-" <qt>  "
-"<p><b>Top Margin</b></p>.  "
-"<p>This spinbox/text edit field lets you control the top margin of your "
-"printout if the printing  application does not define its margins internally. "
-"</p>  "
-"<p>The setting works for instance for ASCII text file printing, or for printing "
-"from KMail and  and Konqueror.. </p> "
-"<p><b>Note:</b></p>This margin setting is not intended for KOffice or "
-"OpenOffice.org printing,  because these applications (or rather their users) "
-"are expected to do it by themselves.  It also does not work for PostScript or "
-"PDF file, which in most cases have their margins hardcoded  internally.</p>  "
-"<br>  "
-"<hr>  "
-"<p><em><b>Additional hint for power users:</b> This TDEPrint GUI element "
-"matches  with the CUPS commandline job option parameter:</em>  "
-"<pre>    -o page-top=...      # use values from \"0\" or higher. \"72\" is "
-"equal to 1 inch.  </pre> </p>  </qt>"
+"Drag file(s) here or use the button to open a file dialog. Leave empty for <b>"
+"&lt;STDIN&gt;</b>."
 msgstr ""
+"Tynnwch y ffeil(iau) yma, neu defnyddwiwch y botwm i agor ymgom ffeil.  Gadewch "
+"yn wag am <b>&lt;STDIN&gt;</b>."
 
-#: marginwidget.cpp:57
-msgid ""
-" <qt>  "
-"<p><b>Bottom Margin</b></p>.  "
-"<p>This spinbox/text edit field lets you control the bottom margin of your "
-"printout if the printing  application does not define its margins internally. "
-"</p>  "
-"<p>The setting works for instance for ASCII text file printing, or for printing "
-"from KMail and  and Konqueror. </p> "
-"<p><b>Note:</b></p>This margin setting is not intended for KOffice or "
-"OpenOffice.org printing,  because these applications (or rather their users) "
-"are expected to do it by themselves.  It also does not work for PostScript or "
-"PDF file, which in most cases have their margins hardcoded  internally.</p>  "
-"<br>  "
-"<hr>  "
-"<p><em><b>Additional hint for power users:</b> This TDEPrint GUI element "
-"matches  with the CUPS commandline job option parameter:</em>  "
-"<pre>    -o page-bottom=...      # use values from \"0\" or higher. \"72\" is "
-"equal to 1 inch.  </pre> </qt>"
-msgstr ""
+#: droptionview.cpp:61
+msgid "Value:"
+msgstr "Gwerth:"
 
-#: marginwidget.cpp:76
-msgid ""
-" <qt>  "
-"<p><b>Left Margin</b></p>.  "
-"<p>This spinbox/text edit field lets you control the left margin of your "
-"printout if the printing  application does not define its margins internally. "
-"</p>  "
-"<p>The setting works for instance for ASCII text file printing, or for printing "
-"from KMail and  and Konqueror. </p> "
-"<p><b>Note:</b></p>This margin setting is not intended for KOffice or "
-"OpenOffice.org printing,  because these applications (or rather their users) "
-"are expected to do it by themselves.  It also does not work for PostScript or "
-"PDF file, which in most cases have their margins hardcoded  internally.</p>  "
-"<br>  "
-"<hr>  "
-"<p><em><b>Additional hint for power users:</b> This TDEPrint GUI element "
-"matches  with the CUPS commandline job option parameter:</em>  "
-"<pre>    -o page-left=...      # use values from \"0\" or higher. \"72\" is "
-"equal to 1 inch.  </pre> </qt>"
-msgstr ""
+#: droptionview.cpp:167
+msgid "String value:"
+msgstr "Gwerth llinyn:"
 
-#: marginwidget.cpp:95
-msgid ""
-" <qt>  "
-"<p><b>Right Margin</b></p>.  "
-"<p>This spinbox/text edit field lets you control the right margin of your "
-"printout if the printing  application does not define its margins internally. "
-"</p>  "
-"<p>The setting works for instance for ASCII text file printing, or for printing "
-"from KMail and  and Konqueror. </p> "
-"<p><b>Note:</b></p>This margin setting is not intended for KOffice or "
-"OpenOffice.org printing,  because these applications (or rather their users) "
-"are expected to do it by themselves.  It also does not work for PostScript or "
-"PDF file, which in most cases have their margins hardcoded  internally.</p>  "
-"<br>  "
-"<hr>  "
-"<p><em><b>Additional hint for power users:</b> This TDEPrint GUI element "
-"matches  with the CUPS commandline job option parameter:</em>  "
-"<pre>    -o page-right=...      # use values from \"0\" or higher. \"72\" is "
-"equal to 1 inch.  </pre> </qt>"
-msgstr ""
+#: droptionview.cpp:306 droptionview.cpp:341
+msgid "No Option Selected"
+msgstr "Dim Dewis wedi ei Wneud"
 
-#: marginwidget.cpp:114
-msgid ""
-" <qt>  "
-"<p><b>Change Measurement Unit<b></p>.  "
-"<p>You can change the units of measurement for the page margins here. Select "
-"from Millimeter, Centimeter, Inch or Pixels (1 pixel == 1/72 inch).  </p>  </qt>"
-msgstr ""
+#: lpd/kmlpduimanager.cpp:44
+msgid "Local printer (parallel, serial, USB)"
+msgstr "Argraffydd lleol (paralel, cyfresol, USB)"
 
-#: marginwidget.cpp:121
-msgid ""
-" <qt>  "
-"<p><b>Custom Margins Checkbox</b></p>.  "
-"<p>Enable this checkbox if you want to modify the margins of your printouts  "
-"<p>You can change margin settings in 4 ways:  "
-"<ul>  "
-"<li>Edit the text fields. </li>  "
-"<li>Click spinbox arrows. </li>  "
-"<li>Scroll wheel of wheelmouses. </li>  "
-"<li>Drag margins in preview frame with mouse. </li>  </ul>  <b>Note:</b> "
-"The margin setting does not work if you load such files directly into  "
-"kprinter, which have their print margins hardcoded internally, like as most  "
-"PDF or PostScript files. It works for all ASCII text files however. It also may "
-"not  work with non-TDE applications which fail to  fully utilize the TDEPrint "
-"framework, such as OpenOffice.org. </p>  </qt>"
-msgstr ""
+#: lpd/kmlpduimanager.cpp:46
+msgid "SMB shared printer (Windows)"
+msgstr "Argraffydd cyfrannol SMB (Windows)"
 
-#: marginwidget.cpp:138
-msgid ""
-" <qt>  "
-"<p><b>\"Drag-your-Margins\" </p>.  "
-"<p>Use your mouse to drag and set each margin on this little preview window. "
-"</p>  </qt>"
-msgstr ""
+#: lpd/kmlpduimanager.cpp:47
+msgid "Network printer (TCP)"
+msgstr "Argraffydd rhwydwaith (TCP)"
 
-#: marginwidget.cpp:148
-msgid "&Use custom margins"
-msgstr "&Defnyddio ymylon addasiedig"
+#: lpd/kmlpduimanager.cpp:48
+msgid "File printer (print to file)"
+msgstr "Argraffydd ffeil (argraffu i ffeil)"
 
-#: marginwidget.cpp:158
-msgid "&Top:"
-msgstr "&Pen:"
+#: lpd/lpdtools.cpp:31
+msgid "A4"
+msgstr "A4"
 
-#: marginwidget.cpp:159
-msgid "&Bottom:"
-msgstr "&Gwaelod:"
+#: lpd/lpdtools.cpp:32
+msgid "A3"
+msgstr "A3"
 
-#: marginwidget.cpp:160
-msgid "Le&ft:"
-msgstr "&Chwith:"
+#: lpd/lpdtools.cpp:33
+msgid "B4"
+msgstr "A4"
 
-#: marginwidget.cpp:161
-msgid "&Right:"
-msgstr "&De:"
+#: lpd/lpdtools.cpp:34
+msgid "B5"
+msgstr "B5"
 
-#: marginwidget.cpp:164
-msgid "Pixels (1/72nd in)"
-msgstr "Picseli (1/72nd in)"
+#: lpd/lpdtools.cpp:233
+msgid "GhostScript settings"
+msgstr "Gosodiadau GhostScript"
 
-#: marginwidget.cpp:167
-msgid "Inches (in)"
-msgstr "Modfeddi (in)"
+#: lpd/lpdtools.cpp:254
+msgid "Resolution"
+msgstr "Cydraniad"
 
-#: marginwidget.cpp:168
-msgid "Centimeters (cm)"
-msgstr "Centimedrau (cm)"
+#: lpd/lpdtools.cpp:277
+msgid "Color depth"
+msgstr "Dyfnder lliw"
 
-#: marginwidget.cpp:169
-msgid "Millimeters (mm)"
-msgstr "Milimedrau (mm)"
+#: lpd/lpdtools.cpp:301
+msgid "Additional GS options"
+msgstr "Dewisiadau GS ychwanegol"
 
-#: driver.cpp:387
-msgid "JCL"
-msgstr "JCL"
+#: lpd/lpdtools.cpp:313
+msgid "Page size"
+msgstr "Maint papur"
 
-#: kmvirtualmanager.cpp:161
-msgid ""
-"<qt>You are about to set a pseudo-printer as your personal default. This "
-"setting is specific to TDE and will not be available outside TDE applications. "
-"Note that this will only make your personal default printer as undefined for "
-"non-TDE applications and should not prevent you from printing normally. Do you "
-"really want to set <b>%1</b> as your personal default?</qt>"
-msgstr ""
+#: lpd/lpdtools.cpp:329
+msgid "Pages per sheet"
+msgstr "Tudalennau ar y ddalen"
 
-#: kpposterpage.cpp:42
-#, fuzzy
-msgid " <qt>  5.  </qt>"
-msgstr "<qt><p> </p>. </qt>"
+#: lpd/lpdtools.cpp:345
+msgid "Left/right margin (1/72 in)"
+msgstr "Ymyl chwith/de (1/72 in)"
 
-#: kpposterpage.cpp:46
-msgid ""
-" <qt>  <b>Print Poster</b> (enabled or disabled).  "
-"<p>If you enable this option, you can print posters of different sizes  The "
-"printout will happen in the form <em>'tiles'</em> printed on smaller  paper "
-"sizes, which you can stitch together later. <em>If you enable this  option "
-"here, the <em>'Poster Printing' filter</em> will be auto-loaded in  the "
-"'Filters' tab of this dialog. </p> "
-"<p>This tab is only visible if the external <em>'poster'</em> "
-"utility is  discovered by TDEPrint on your system. [<em>'poster'</em> "
-"is a commandline  utility that enables you to convert PostScript files into "
-"tiled printouts  which allow for oversized appearance of the stitched-together "
-"tiles.] </p> "
-"<p><b>Note:</b> The standard version of 'poster' will not work. Your system  "
-"must use a patched version of 'poster'. Ask your operating system vendor to  "
-"provide a patched version of 'poster' if he does not already. </p></qt>"
-msgstr ""
+#: lpd/lpdtools.cpp:350
+msgid "Top/bottom margin (1/72 in)"
+msgstr "Ymyl pen/gwaelod (1/72 in)"
 
-#: kpposterpage.cpp:68
-msgid ""
-" <qt>  <b>Tile Selection widget</b>  "
-"<p>This GUI element is <em>not only for viewing</em> "
-"your selections: it also  lets you interactively select the tile(s) you want to "
-"print.  </p> "
-"<p><b>Hints</b>  "
-"<ul>  "
-"<li>Click any tile to select it for printing.</li>  "
-"<li>To select multiple tiles to be printed  at once, <em>'shift-click'</em> "
-"on the tiles ('shift-click' means: hold down the  [SHIFT]-key on your keyboard "
-"and click with the mouse while [SHIFT]-key is held.)   <em>Be aware</em> "
-"that the order  of your clicking is also significant to the order of printing "
-"the different tiles. </li> </ul>  <b>Note 1:</b> The order of your selection "
-"(and the order for printout of the tiles)  is indicated by the contents of the "
-"text field below,  labelled as <em>'Tile pages (to be printed):'</em>"
-"<p> <b>Note 2:</b> By default no tile is selected. Before you can print (a part "
-" of) your poster, you must select at least one tile. </p>  </qt>"
-msgstr ""
+#: lpd/lpdtools.cpp:356
+msgid "Text options"
+msgstr "Dewisiadau testun"
 
-#: kpposterpage.cpp:89
-msgid ""
-" <qt>  <b>Poster Size</b>  "
-"<p>Select the poster size you want from the dropdown list. </p>  "
-"Available sizes are all standard paper sizes up to  'A0'. [A0 is the same size "
-"as 16 sheets of A4, or '84cm x 118.2cm'.] </p>  "
-"<p><b>Notice</b>, how the little preview window below changes with your change "
-"of poster  size. It indicates to you how many tiles need to be printed to make "
-"the poster,  given the selected paper size.</p>   "
-"<p><b>Hint:</b> The little preview window below is not just a passive icon. You "
-"can click  on its individual tiles to select them for printing. To select "
-"multiple tiles to be printed  at once, you need to <em>'shift-click'</em> "
-"on the tiles ('shift-click' means: hold down the  [SHIFT]-key on your keyboard "
-"and click with the mouse while [SHIFT]-key is held.) The order  of your "
-"clicking is significant to the order of printing the different tiles. The order "
-"of  your selection (and for the printed tiles) is indicated by the contents of "
-"the text field  labelled as <em>'Tile pages (to be printed):'</em>"
-"<p> <b>Note:</b> By default no tile is selected. Before you can print (a part  "
-"of) your poster, you must select at least one tile. </p>  </qt>"
-msgstr ""
+#: lpd/lpdtools.cpp:362
+msgid "Send EOF after job to eject page"
+msgstr "Anfon EOF ar ôl y sywdd i all-daflu'r dudalen"
+
+#: lpd/lpdtools.cpp:370
+msgid "Fix stair-stepping text"
+msgstr "Trwsio testun ffurf grisiau"
+
+#: lpd/lpdtools.cpp:382
+msgid "Fast text printing (non-PS printers only)"
+msgstr "Argraffu testun cyflym (dim ond argraffyddion di-PS)"
+
+#: lpd/kmlpdmanager.cpp:87
+msgid "Local printer queue (%1)"
+msgstr "Ciw argraffydd lleol (%1)"
 
-#: kpposterpage.cpp:108
+#: lpd/kmlpdmanager.cpp:87
 msgid ""
-" <qt>  <b>Paper Size</b>  "
-"<p>This field indicates the paper size the poster tiles will be printed on.  To "
-"select a different paper size for your poster tiles, go to the 'General' tab  "
-"of this dialog and select one from the dropdown list. </p>  "
-"Available sizes are most standard paper sizes supported by your printer. Your "
-"printer's  supported paper sizes are read from the printer driver info (as laid "
-"down in the <em>'PPD'</em>,  the printer description file). <em>"
-"Be aware that the 'Paper Size' selected may not be supported  by 'poster' "
-"(example: 'HalfLetter') while it may well be supported by your printer.</em>  "
-"If  you hit that obstacle, simply use another, supported Paper Size, like 'A4' "
-"or 'Letter'.  "
-"<p><b>Notice</b>, how the little preview window below changes with your change "
-"of paper  size. It indicates how many tiles need to be printed to make up the "
-"poster,  given the selected paper and poster size.</p>   "
-"<p><b>Hint:</b> The little preview window below is not just a passive icon. You "
-"can click  on its individual tiles to select them for printing. To select "
-"multiple tiles to be printed  at once, you need to <em>'shift-click'</em> "
-"on the tiles ('shift-click' means: hold down the  [SHIFT]-key on your keyboard "
-"and click with the mouse while [SHIFT]-key is held.) The order  of your "
-"clicking is significant to the order of printing the different tiles. The order "
-"of  your selection (and for the printed tiles) is indicated by the contents of "
-"the text field  labelled as <em>'Tile pages (to be printed):'</em>"
-"<p> <b>Note:</b> By default no tile is selected. Before you can print (a part  "
-"of) your poster, you must select at least one tile. </p>  </qt>"
-msgstr ""
+"_: Unknown type of local printer queue\n"
+"Unknown"
+msgstr "Anhysbys"
+
+#: lpd/kmlpdmanager.cpp:88
+msgid "<Not available>"
+msgstr "<Dim ar gael>"
 
-#: kpposterpage.cpp:132
+#: lpd/kmlpdmanager.cpp:89
 msgid ""
-" <qt>  <b>Cut Margin selection</b>  "
-"<p>Slider and spinbox let you determine a <em>'cut margin'</em> "
-"which will be printed onto  each tile of your poster to help you cut the pieces "
-"as needed. </p> "
-"<p><b>Notice</b>, how the little preview window above changes with your change "
-"of cut  margins. It indicates to you how much space the cut margins will take "
-"away from each tile.  "
-"<p><b>Be aware</b>, that your cut margins need to be equal to or greater than "
-"the margins your  printer uses. The printer's capabilities are described in the "
-"<em>'ImageableArea'</em>  keywords of its driver PPD file. </p>  </qt>"
-msgstr ""
+"_: Unknown Driver\n"
+"Unknown"
+msgstr "Anhysbys"
+
+#: lpd/kmlpdmanager.cpp:95
+msgid "Remote LPD queue %1@%2"
+msgstr "Ciw LPD pell %1@%2"
+
+#: lpd/kmlpdmanager.cpp:158
+msgid "Unable to create spool directory %1 for printer %2."
+msgstr "Methu creu cyfeiriadur sbwlio %1 i argraffydd %2."
 
-#: kpposterpage.cpp:143
+#: lpd/kmlpdmanager.cpp:165
+msgid "Unable to save information for printer <b>%1</b>."
+msgstr "Methu cadw gwybodaeth i argraffydd <b>%1</b>."
+
+#: lpd/kmlpdmanager.cpp:193
 msgid ""
-" <qt>  <b>Order and number of tile pages to be printed</b>  "
-"<p>This field displays and sets the individual tiles to be printed, as well as "
-"the order  for their printout. </p>  You can file the field with 2 different "
-"methods:  "
-"<ul>  "
-"<li>Either use the interactive thumbnail preview above and '[SHIFT]-click' on "
-"the tiles. </li>  "
-"<li>Or edit this text field accordingly. </li>  </ul>  "
-"<p>When editing the field, you can use a '3-7' syntax instead of a '3,4,5,6,7' "
-"one. </p>  "
-"<p><b>Examples:</b></p>  "
-"<pre>    \"2,3,7,9,3\"  "
-"<br>    \"1-3,6,8-11\"  </qt>"
+"Unable to set correct permissions on spool directory %1 for printer <b>%2</b>."
 msgstr ""
+"Methu gosod caniatadau cywir ar y cyfeiriadur sbwlio %1 am argraffydd <b>%2</b>"
+"."
 
-#: kpposterpage.cpp:160
-msgid "Poster"
-msgstr "Poster"
+#: lpd/kmlpdmanager.cpp:237
+msgid "Permission denied: you must be root."
+msgstr "Gwrthodwyd caniatà d: rhaid i chi fod yn wraidd."
 
-#: kpposterpage.cpp:162
-msgid "&Print poster"
-msgstr "&Argraffu poster"
+#: lpd/kmlpdmanager.cpp:244
+msgid "Unable to execute command \"%1\"."
+msgstr "Methu gweithredu gorchymyn \"%1\"."
 
-#: kpposterpage.cpp:176
-msgid "Poste&r size:"
-msgstr "Maint y poste&r:"
+#: lpd/kmlpdmanager.cpp:317
+msgid "Unable to write printcap file."
+msgstr "Methu ysgrifennu i'r ffeil printcap."
 
-#: kpposterpage.cpp:178
-msgid "Media size:"
-msgstr "Maint y cyfryngau:"
+#: lpd/kmlpdmanager.cpp:372
+msgid "Couldn't find driver <b>%1</b> in printtool database."
+msgstr "Methu canfod gyrrydd <b>%1</b> yn y cronfa ddata printtool."
 
-#: kpposterpage.cpp:180
-msgid "Pri&nt size:"
-msgstr " Mai&nt yr argraffu:"
+#: lpd/kmlpdmanager.cpp:411
+msgid "Couldn't find printer <b>%1</b> in printcap file."
+msgstr "Methu canfod argraffydd <b>%1</b> yn y ffeil printcap."
 
-#: kpposterpage.cpp:187
-#, no-c-format
-msgid "C&ut margin (% of media):"
-msgstr "Ym&yl torri (% y cyfryngau):"
+#: lpd/kmlpdmanager.cpp:440
+msgid "No driver found (raw printer)"
+msgstr "Ni chanfuwyd gyrrydd (argraffydd crau)"
 
-#: kpposterpage.cpp:191
-msgid "&Tile pages (to be printed):"
-msgstr "&Teilsio'r tudalennau (i'w argraffu):"
+#: lpd/kmlpdmanager.cpp:442
+msgid "Printer type not recognized."
+msgstr "Ni adnabyddwyd math yr argraffydd."
 
-#: kpposterpage.cpp:198
-msgid "Link/unlink poster and print size"
-msgstr "Cysylltu/dad-gysylltu maint y poster a'r argraffu"
+#: lpd/kmlpdmanager.cpp:452
+msgid ""
+"The driver device <b>%1</b> is not compiled in your GhostScript distribution. "
+"Check your installation or use another driver."
+msgstr ""
+"Nid yw'r dyfais gyrrydd <b>%1</b> wedi ei grynhoi yn eich gosodiad GhostScript. "
+" Gwiriwch eich gosodiad neu defnyddiwch gyrrydd arall."
 
-#: kpposterpage.cpp:263
-msgid "Unknown"
-msgstr "Anhysbys"
+#: lpd/kmlpdmanager.cpp:560
+msgid "Unable to write driver associated files in spool directory."
+msgstr ""
+"Methu ysgrifennu ffeiliau sy'n ymwneud â'r gyrrydd yn y cyfeiriadur sbwlio."
+
+#: driver.cpp:387
+msgid "JCL"
+msgstr "JCL"
 
 #: kxmlcommand.cpp:789
 msgid "One of the command object's requirements is not met."
@@ -5934,10 +6007,6 @@ msgstr "Ni chynhelir un o ofynion y gwrthrych gorchymyn."
 msgid "The command does not contain the required tag %1."
 msgstr "Nid yw'r gorchymyn yn cynnwys y tag gofynnol %1."
 
-#: kprintaction.cpp:117 kprintaction.cpp:122 kprintaction.cpp:127
-msgid "&Export..."
-msgstr "&Allforio..."
-
 #: kpfilterpage.cpp:42
 msgid ""
 " <qt> <b>Add Filter button</b> "
@@ -6086,77 +6155,14 @@ msgstr ""
 msgid "Input"
 msgstr "Mewnbwn"
 
-#: kpqtpage.cpp:70
-msgid ""
-" <qt>  <b>Selection of color mode:</b> You can choose between 2 options:  "
-"<ul>"
-"<li><b>Color</b> and</li>  "
-"<li><b>Grayscale</b></li></ul>  <b>Note:</b> This selection field may be grayed "
-"out and made inactive.  This happens if TDEPrint can not retrieve  enough "
-"information about your print file. In this case the embedded color- or "
-"grayscale information  of your printfile, and the default handling of the "
-"printer take precedence.  </qt>"
-msgstr ""
-
-#: kpqtpage.cpp:79
-msgid ""
-" <qt>  <b>Selection of page size:</b> Select paper size to be printed on from  "
-"the drop-down menu.  "
-"<p>The exact list of choices depends on the printer driver (\"PPD\") you have "
-"installed.  </qt>"
-msgstr ""
-
-#: kpqtpage.cpp:84
-msgid ""
-" <qt>  <b>Selection of pages per sheet:</b>  You can choose to print more than "
-"one page onto each sheet of paper.  This is sometimes useful to save paper.  "
-"<p><b>Note 1:</b> the page images get scaled down accordingly to print 2 or 4 "
-"pages per sheet.  The page image does not get scaled if you print 1 page per "
-"sheet (the default setting.).  "
-"<p><b>Note 2:</b> If you select multiple pages per sheet here, the scaling and "
-"re-arranging is done  by your printing system.  "
-"<p><b>Note 3, regarding \"Other\":</b> You cannot really select <em>Other</em> "
-"as the number of  pages to print on one sheet.\"Other\" is checkmarked here for "
-"information purposes only.  "
-"<p>To select 8, 9, 16 or other numbers of  pages per sheet:  "
-"<ul>  "
-"<li> go to the tab headlined \"Filter\"</li> "
-"<li> enable the <em>Multiple Pages per Sheet</em> filter </li> "
-"<li> and configure it (bottom-most button on the right of the \"Filters\" tab). "
-"</li> </ul> </qt>"
-msgstr ""
-
-#: kpqtpage.cpp:102
-msgid ""
-" <qt>  <b>Selection of image orientation:</b> Orientation of the printed  "
-"pageimage on your paper is controlled by the radio buttons. By default,  the "
-"orientation is <em>Portrait</em>  "
-"<p>You can select 2 alternatives:  "
-"<ul>  "
-"<li> <b>Portrait.</b>.Portrait is the default setting. </li>  "
-"<li> <b>Landscape.</b> </li>  </ul>  The icon changes according to your "
-"selection. </qt>"
-msgstr ""
-
-#: kpqtpage.cpp:113
-msgid "Print Format"
-msgstr "Ffurfweddiad Argraffu"
+#~ msgid "%1 &Handbook"
+#~ msgstr "&Llawlyfr %1"
 
-#: kpqtpage.cpp:123
-msgid "Color Mode"
-msgstr "Modd Lliw"
+#~ msgid "%1 &Web Site"
+#~ msgstr "%1 &Gwefan"
 
-#: kpqtpage.cpp:135
-msgid "Colo&r"
-msgstr "Ll&iw"
-
-#: kpqtpage.cpp:138
-msgid "&Grayscale"
-msgstr "&Graddlwyd"
-
-#: kpqtpage.cpp:151
-msgid "Ot&her"
-msgstr "E&raill"
+#~ msgid "Documentation"
+#~ msgstr "Dogfenniaeth"
 
 #~ msgid "&Settings..."
 #~ msgstr " &Gosodiadau..."
diff --git a/tde-i18n-cy/messages/tdelibs/tdestyle_highcontrast_config.po b/tde-i18n-cy/messages/tdelibs/tdestyle_highcontrast_config.po
index f9e14ef7ae3..d7a9c2b3a42 100644
--- a/tde-i18n-cy/messages/tdelibs/tdestyle_highcontrast_config.po
+++ b/tde-i18n-cy/messages/tdelibs/tdestyle_highcontrast_config.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../../cy/messages//tdelibs/tdestyle_highcontrast_config.po\n"
-"POT-Creation-Date: 2005-05-18 21:23+0200\n"
+"POT-Creation-Date: 2014-09-29 00:46-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdelibs/tdestyle_plastik_config.po b/tde-i18n-cy/messages/tdelibs/tdestyle_plastik_config.po
index 70dce2eba71..46b996ec1ce 100644
--- a/tde-i18n-cy/messages/tdelibs/tdestyle_plastik_config.po
+++ b/tde-i18n-cy/messages/tdelibs/tdestyle_plastik_config.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: all.po\n"
-"POT-Creation-Date: 2005-05-18 21:23+0200\n"
+"POT-Creation-Date: 2014-09-29 00:46-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdelibs/tdetexteditor_autobookmarker.po b/tde-i18n-cy/messages/tdelibs/tdetexteditor_autobookmarker.po
index 43486527932..4ec92654c56 100644
--- a/tde-i18n-cy/messages/tdelibs/tdetexteditor_autobookmarker.po
+++ b/tde-i18n-cy/messages/tdelibs/tdetexteditor_autobookmarker.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdelibs/tdetexteditor_autobookmarker.po\n"
-"POT-Creation-Date: 2005-06-14 01:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:46-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -17,43 +18,43 @@ msgstr ""
 msgid "Configure AutoBookmarks"
 msgstr ""
 
-#: autobookmarker.cpp:280
+#: autobookmarker.cpp:279
 msgid "Edit Entry"
 msgstr "Golygu cofnod ..."
 
-#: autobookmarker.cpp:288
+#: autobookmarker.cpp:287
 msgid "&Pattern:"
 msgstr "&Patrwm:"
 
-#: autobookmarker.cpp:294
+#: autobookmarker.cpp:293
 msgid "<p>A regular expression. Matching lines will be bookmarked.</p>"
 msgstr ""
 
-#: autobookmarker.cpp:298
+#: autobookmarker.cpp:297
 msgid "Case &sensitive"
 msgstr "Mae llythrennau bras o &bwys"
 
-#: autobookmarker.cpp:302
+#: autobookmarker.cpp:301
 msgid ""
 "<p>If enabled, the pattern matching will be case sensitive, otherwise not.</p>"
 msgstr ""
 
-#: autobookmarker.cpp:305
+#: autobookmarker.cpp:304
 msgid "&Minimal matching"
 msgstr ""
 
-#: autobookmarker.cpp:309
+#: autobookmarker.cpp:308
 msgid ""
 "<p>If enabled, the pattern matching will use minimal matching; if you do not "
 "know what that is, please read the appendix on regular expressions in the kate "
 "manual.</p>"
 msgstr ""
 
-#: autobookmarker.cpp:313
+#: autobookmarker.cpp:312
 msgid "&File mask:"
 msgstr ""
 
-#: autobookmarker.cpp:319
+#: autobookmarker.cpp:318
 msgid ""
 "<p>A list of filename masks, separated by semicolons. This can be used to limit "
 "the usage of this entity to files with matching names.</p>"
@@ -61,11 +62,11 @@ msgid ""
 "fill out both lists.</p>"
 msgstr ""
 
-#: autobookmarker.cpp:324
+#: autobookmarker.cpp:323
 msgid "MIME &types:"
 msgstr ""
 
-#: autobookmarker.cpp:330
+#: autobookmarker.cpp:329
 msgid ""
 "<p>A list of mime types, separated by semicolon. This can be used to limit the "
 "usage of this entity to files with matching mime types.</p>"
@@ -73,41 +74,41 @@ msgid ""
 "choose from, using it will fill in the file masks as well.</p>"
 msgstr ""
 
-#: autobookmarker.cpp:340
+#: autobookmarker.cpp:339
 msgid ""
 "<p>Click this button to display a checkable list of mimetypes available on your "
 "system. When used, the file masks entry above will be filled in with the "
 "corresponding masks.</p>"
 msgstr ""
 
-#: autobookmarker.cpp:365
+#: autobookmarker.cpp:364
 msgid ""
 "Select the MimeTypes for this pattern.\n"
 "Please note that this will automatically edit the associated file extensions as "
 "well."
 msgstr ""
 
-#: autobookmarker.cpp:367
+#: autobookmarker.cpp:366
 msgid "Select Mime Types"
 msgstr ""
 
-#: autobookmarker.cpp:385
+#: autobookmarker.cpp:384
 msgid "&Patterns"
 msgstr "&Patrymau"
 
-#: autobookmarker.cpp:388
+#: autobookmarker.cpp:387
 msgid "Pattern"
 msgstr "Patrwm"
 
-#: autobookmarker.cpp:389
+#: autobookmarker.cpp:388
 msgid "Mime Types"
 msgstr ""
 
-#: autobookmarker.cpp:390
+#: autobookmarker.cpp:389
 msgid "File Masks"
 msgstr ""
 
-#: autobookmarker.cpp:394
+#: autobookmarker.cpp:393
 msgid ""
 "<p>This list shows your configured autobookmark entities. When a document is "
 "opened, each entity is used in the following way: "
@@ -119,22 +120,22 @@ msgid ""
 "<p>Use the buttons below to manage your collection of entities.</p>"
 msgstr ""
 
-#: autobookmarker.cpp:406
+#: autobookmarker.cpp:405
 msgid "&New..."
 msgstr "&Newydd..."
 
-#: autobookmarker.cpp:409
+#: autobookmarker.cpp:408
 msgid "Press this button to create a new autobookmark entity."
 msgstr ""
 
-#: autobookmarker.cpp:414
+#: autobookmarker.cpp:413
 msgid "Press this button to delete the currently selected entity."
 msgstr ""
 
-#: autobookmarker.cpp:416
+#: autobookmarker.cpp:415
 msgid "&Edit..."
 msgstr "&Golygu..."
 
-#: autobookmarker.cpp:419
+#: autobookmarker.cpp:418
 msgid "Press this button to edit the currently selected entity."
 msgstr ""
diff --git a/tde-i18n-cy/messages/tdelibs/tdetexteditor_docwordcompletion.po b/tde-i18n-cy/messages/tdelibs/tdetexteditor_docwordcompletion.po
index bc2e51e9b53..39165d2de48 100644
--- a/tde-i18n-cy/messages/tdelibs/tdetexteditor_docwordcompletion.po
+++ b/tde-i18n-cy/messages/tdelibs/tdetexteditor_docwordcompletion.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdelibs/tdetexteditor_docwordcompletion.po\n"
-"POT-Creation-Date: 2007-02-18 02:38+0100\n"
+"POT-Creation-Date: 2014-09-29 00:46-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdelibs/tdetexteditor_insertfile.po b/tde-i18n-cy/messages/tdelibs/tdetexteditor_insertfile.po
index e32343a8da3..76152ca215b 100644
--- a/tde-i18n-cy/messages/tdelibs/tdetexteditor_insertfile.po
+++ b/tde-i18n-cy/messages/tdelibs/tdetexteditor_insertfile.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdetexteditor_insertfile\n"
-"POT-Creation-Date: 2005-06-14 01:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:46-0500\n"
 "PO-Revision-Date: 2003-07-16 20:35+0100\n"
 "Last-Translator: KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdelibs/tdetexteditor_isearch.po b/tde-i18n-cy/messages/tdelibs/tdetexteditor_isearch.po
index 41c0f42e5ff..2a72a0440f9 100644
--- a/tde-i18n-cy/messages/tdelibs/tdetexteditor_isearch.po
+++ b/tde-i18n-cy/messages/tdelibs/tdetexteditor_isearch.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdetexteditor_isearch\n"
-"POT-Creation-Date: 2007-05-29 02:14+0200\n"
+"POT-Creation-Date: 2014-09-29 00:46-0500\n"
 "PO-Revision-Date: 2003-07-16 20:36+0100\n"
 "Last-Translator: KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdelibs/tdetexteditor_kdatatool.po b/tde-i18n-cy/messages/tdelibs/tdetexteditor_kdatatool.po
index afae0fbc984..fe294d18a5a 100644
--- a/tde-i18n-cy/messages/tdelibs/tdetexteditor_kdatatool.po
+++ b/tde-i18n-cy/messages/tdelibs/tdetexteditor_kdatatool.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdetexteditor_kdatatool\n"
-"POT-Creation-Date: 2005-05-18 21:23+0200\n"
+"POT-Creation-Date: 2014-09-29 00:46-0500\n"
 "PO-Revision-Date: 2003-07-16 20:37+0100\n"
 "Last-Translator: KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdemultimedia/artsbuilder.po b/tde-i18n-cy/messages/tdemultimedia/artsbuilder.po
index 4aa656b788a..170b505bc3d 100644
--- a/tde-i18n-cy/messages/tdemultimedia/artsbuilder.po
+++ b/tde-i18n-cy/messages/tdemultimedia/artsbuilder.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdemultimedia/artsbuilder.po\n"
-"POT-Creation-Date: 2005-07-24 01:37+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdemultimedia/artscontrol.po b/tde-i18n-cy/messages/tdemultimedia/artscontrol.po
index b6dcc0488e5..3927ba8026d 100644
--- a/tde-i18n-cy/messages/tdemultimedia/artscontrol.po
+++ b/tde-i18n-cy/messages/tdemultimedia/artscontrol.po
@@ -1,19 +1,20 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdemultimedia/artscontrol.po\n"
-"POT-Creation-Date: 2005-01-08 01:21+0100\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: artscontrolapplet_private.h:85
+#: artscontrolapplet_private.h:86
 msgid "Toggle &Inline FFT Scope"
 msgstr ""
 
-#: artscontrolapplet_private.h:98 fftscopeview.cpp:89
+#: artscontrolapplet_private.h:99 fftscopeview.cpp:89
 msgid "VU-Style"
 msgstr ""
 
diff --git a/tde-i18n-cy/messages/tdemultimedia/artsmodules.po b/tde-i18n-cy/messages/tdemultimedia/artsmodules.po
index 2de3e13d3de..8095e4d9f28 100644
--- a/tde-i18n-cy/messages/tdemultimedia/artsmodules.po
+++ b/tde-i18n-cy/messages/tdemultimedia/artsmodules.po
@@ -3,10 +3,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: artsmodules\n"
-"POT-Creation-Date: 2007-10-24 01:15+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2005-10-14 11:29+0100\n"
 "Last-Translator: Kevin Donnelly <kevin@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdemultimedia/audiocd_encoder_lame.po b/tde-i18n-cy/messages/tdemultimedia/audiocd_encoder_lame.po
index 582db523d28..a2283275d88 100644
--- a/tde-i18n-cy/messages/tdemultimedia/audiocd_encoder_lame.po
+++ b/tde-i18n-cy/messages/tdemultimedia/audiocd_encoder_lame.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: all2.po\n"
-"POT-Creation-Date: 2005-05-09 01:19+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdemultimedia/audiocd_encoder_vorbis.po b/tde-i18n-cy/messages/tdemultimedia/audiocd_encoder_vorbis.po
index 4e87e7781ef..22898608b4e 100644
--- a/tde-i18n-cy/messages/tdemultimedia/audiocd_encoder_vorbis.po
+++ b/tde-i18n-cy/messages/tdemultimedia/audiocd_encoder_vorbis.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: all2.po\n"
-"POT-Creation-Date: 2005-05-09 01:19+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdemultimedia/juk.po b/tde-i18n-cy/messages/tdemultimedia/juk.po
index 7e48a6c5de8..2fe973b9f91 100644
--- a/tde-i18n-cy/messages/tdemultimedia/juk.po
+++ b/tde-i18n-cy/messages/tdemultimedia/juk.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdemultimedia/juk.po\n"
-"POT-Creation-Date: 2008-07-08 01:20+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -487,15 +488,15 @@ msgstr "Hanes"
 msgid "&Output To"
 msgstr "&Allosod I"
 
-#: playermanager.cpp:249 playermanager.cpp:552
+#: playermanager.cpp:249 playermanager.cpp:563
 msgid "aRts"
 msgstr "celfyddydau"
 
-#: playermanager.cpp:252 playermanager.cpp:554
+#: playermanager.cpp:252 playermanager.cpp:565
 msgid "GStreamer"
 msgstr ""
 
-#: playermanager.cpp:255 playermanager.cpp:260 playermanager.cpp:556
+#: playermanager.cpp:255 playermanager.cpp:260 playermanager.cpp:567
 msgid "aKode"
 msgstr ""
 
@@ -538,13 +539,13 @@ msgid "Track Name"
 msgstr ""
 
 #. i18n: file coverdialogbase.ui line 25
-#: playlist.cpp:1518 rc.cpp:48 rc.cpp:122 rc.cpp:322 tagrenameroptions.cpp:95
+#: playlist.cpp:1518 rc.cpp:48 rc.cpp:122 rc.cpp:322 tagrenameroptions.cpp:97
 #, no-c-format
 msgid "Artist"
 msgstr "Artist"
 
 #. i18n: file exampleoptionsbase.ui line 109
-#: playlist.cpp:1519 rc.cpp:128 rc.cpp:325 tagrenameroptions.cpp:95
+#: playlist.cpp:1519 rc.cpp:128 rc.cpp:325 tagrenameroptions.cpp:97
 #, no-c-format
 msgid "Album"
 msgstr "Album:"
@@ -554,19 +555,19 @@ msgid "Cover"
 msgstr ""
 
 #. i18n: file trackpickerdialogbase.ui line 122
-#: playlist.cpp:1521 rc.cpp:328 tagrenameroptions.cpp:96
+#: playlist.cpp:1521 rc.cpp:328 tagrenameroptions.cpp:98
 #, no-c-format
 msgid "Track"
 msgstr ""
 
 #. i18n: file exampleoptionsbase.ui line 179
-#: playlist.cpp:1522 rc.cpp:146 tagrenameroptions.cpp:96
+#: playlist.cpp:1522 rc.cpp:146 tagrenameroptions.cpp:98
 #, no-c-format
 msgid "Genre"
 msgstr ""
 
 #. i18n: file trackpickerdialogbase.ui line 133
-#: playlist.cpp:1523 rc.cpp:331 tagrenameroptions.cpp:96
+#: playlist.cpp:1523 rc.cpp:331 tagrenameroptions.cpp:98
 #, no-c-format
 msgid "Year"
 msgstr "Blwyddyn"
@@ -765,7 +766,7 @@ msgid "&Rename File"
 msgstr ""
 
 #. i18n: file coverdialogbase.ui line 16
-#: playlistcollection.cpp:885 rc.cpp:45 viewmode.h:155
+#: playlistcollection.cpp:885 rc.cpp:45 viewmode.h:158
 #, no-c-format
 msgid "Cover Manager"
 msgstr ""
@@ -978,7 +979,7 @@ msgid "Example Tags"
 msgstr ""
 
 #. i18n: file exampleoptionsbase.ui line 101
-#: rc.cpp:125 tagrenameroptions.cpp:95
+#: rc.cpp:125 tagrenameroptions.cpp:97
 #, no-c-format
 msgid "Title"
 msgstr "Teitl"
@@ -1459,7 +1460,7 @@ msgstr "Galluogi"
 msgid "Tag Guesser Configuration"
 msgstr ""
 
-#: tagrenameroptions.cpp:102
+#: tagrenameroptions.cpp:104
 msgid "Unknown"
 msgstr "Anhysbys"
 
@@ -1552,11 +1553,11 @@ msgstr "Gwaredu Plygell"
 msgid "Playlist"
 msgstr "Rhestr chwarae:"
 
-#: viewmode.h:103
+#: viewmode.h:104
 msgid "Compact"
 msgstr "Cywasgu"
 
-#: viewmode.h:128
+#: viewmode.h:130
 msgid "Tree"
 msgstr "Coeden"
 
diff --git a/tde-i18n-cy/messages/tdemultimedia/kaboodle.po b/tde-i18n-cy/messages/tdemultimedia/kaboodle.po
index 8592fb109b9..fb929cbe3a7 100644
--- a/tde-i18n-cy/messages/tdemultimedia/kaboodle.po
+++ b/tde-i18n-cy/messages/tdemultimedia/kaboodle.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdemultimedia/kaboodle.po\n"
-"POT-Creation-Date: 2005-01-24 01:34+0100\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -62,7 +63,7 @@ msgid "URL to open"
 msgstr "URL i agor"
 
 #: main.cpp:40
-msgid "Turn on Qt Debug output"
+msgid "Turn on TQt Debug output"
 msgstr ""
 
 #: player.cpp:63
diff --git a/tde-i18n-cy/messages/tdemultimedia/kaudiocreator.po b/tde-i18n-cy/messages/tdemultimedia/kaudiocreator.po
index 164cdcc1727..6ddba00bd04 100644
--- a/tde-i18n-cy/messages/tdemultimedia/kaudiocreator.po
+++ b/tde-i18n-cy/messages/tdemultimedia/kaudiocreator.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdemultimedia/kaudiocreator.po\n"
-"POT-Creation-Date: 2008-07-08 01:20+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdemultimedia/kcmaudiocd.po b/tde-i18n-cy/messages/tdemultimedia/kcmaudiocd.po
index c8d268603ce..5010920a0d5 100644
--- a/tde-i18n-cy/messages/tdemultimedia/kcmaudiocd.po
+++ b/tde-i18n-cy/messages/tdemultimedia/kcmaudiocd.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdemultimedia/kcmaudiocd.po\n"
-"POT-Creation-Date: 2007-03-26 02:15+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdemultimedia/kcmcddb.po b/tde-i18n-cy/messages/tdemultimedia/kcmcddb.po
index 6861c512a5c..4c1447cf0c4 100644
--- a/tde-i18n-cy/messages/tdemultimedia/kcmcddb.po
+++ b/tde-i18n-cy/messages/tdemultimedia/kcmcddb.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdemultimedia/kcmcddb.po\n"
-"POT-Creation-Date: 2005-01-31 01:32+0100\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdemultimedia/kmix.po b/tde-i18n-cy/messages/tdemultimedia/kmix.po
index 3623687ebca..5abb73b6327 100644
--- a/tde-i18n-cy/messages/tdemultimedia/kmix.po
+++ b/tde-i18n-cy/messages/tdemultimedia/kmix.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdemultimedia/kmix.po\n"
-"POT-Creation-Date: 2008-08-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -47,7 +48,7 @@ msgstr "Ff&urfweddu Byrlwybrau"
 msgid "Hardware &Information"
 msgstr ""
 
-#: kmix.cpp:120 kmixdockwidget.cpp:369
+#: kmix.cpp:120 kmixdockwidget.cpp:399
 msgid "Hide Mixer Window"
 msgstr ""
 
@@ -75,11 +76,11 @@ msgstr ""
 msgid "Select Channel"
 msgstr "&Sianeli"
 
-#: kmix.cpp:513
+#: kmix.cpp:520
 msgid "The change of orientation will be adopted on the next start of KMix."
 msgstr ""
 
-#: kmix.cpp:594
+#: kmix.cpp:601
 msgid "Mixer Hardware Information"
 msgstr ""
 
@@ -134,28 +135,28 @@ msgstr ""
 msgid "KMixCtrl"
 msgstr ""
 
-#: kmixdockwidget.cpp:82
+#: kmixdockwidget.cpp:84
 msgid "M&ute"
 msgstr ""
 
-#: kmixdockwidget.cpp:90
+#: kmixdockwidget.cpp:92
 #, fuzzy
 msgid "Select Master Channel..."
 msgstr "&Sianeli"
 
-#: kmixdockwidget.cpp:177
+#: kmixdockwidget.cpp:183
 msgid "Mixer cannot be found"
 msgstr ""
 
-#: kmixdockwidget.cpp:188
+#: kmixdockwidget.cpp:194
 msgid "Volume at %1%"
 msgstr ""
 
-#: kmixdockwidget.cpp:190
+#: kmixdockwidget.cpp:196
 msgid " (Muted)"
 msgstr ""
 
-#: kmixdockwidget.cpp:373
+#: kmixdockwidget.cpp:403
 msgid "Show Mixer Window"
 msgstr ""
 
@@ -220,35 +221,47 @@ msgid "Restore volumes on login"
 msgstr ""
 
 #: kmixprefdlg.cpp:72
+msgid "Middle click on system tray icon toggles muting"
+msgstr ""
+
+#: kmixprefdlg.cpp:76
 msgid "Numbers"
 msgstr "Rhifau"
 
-#: kmixprefdlg.cpp:74
+#: kmixprefdlg.cpp:78
 #, fuzzy
 msgid "Volume Values: "
 msgstr "Lefel Sain"
 
-#: kmixprefdlg.cpp:75
+#: kmixprefdlg.cpp:79
 msgid "&None"
 msgstr "&Dim"
 
-#: kmixprefdlg.cpp:76
+#: kmixprefdlg.cpp:80
 msgid "A&bsolute"
 msgstr ""
 
-#: kmixprefdlg.cpp:77
+#: kmixprefdlg.cpp:81
 msgid "&Relative"
 msgstr "& Cymharol"
 
 #: kmixprefdlg.cpp:93
+msgid "&Autostart"
+msgstr ""
+
+#: kmixprefdlg.cpp:95
+msgid "Automatically start mixer when you login"
+msgstr ""
+
+#: kmixprefdlg.cpp:101
 msgid "Slider Orientation: "
 msgstr ""
 
-#: kmixprefdlg.cpp:94
+#: kmixprefdlg.cpp:102
 msgid "&Horizontal"
 msgstr "&Llorweddol"
 
-#: kmixprefdlg.cpp:95
+#: kmixprefdlg.cpp:103
 msgid "&Vertical"
 msgstr "&Fertigol"
 
@@ -358,13 +371,13 @@ msgstr ""
 msgid "unknown"
 msgstr "anhysbys"
 
-#: mixer_alsa9.cpp:807
+#: mixer_alsa9.cpp:795
 msgid ""
 "You do not have permission to access the alsa mixer device.\n"
 "Please verify if all alsa devices are properly created."
 msgstr ""
 
-#: mixer_alsa9.cpp:811
+#: mixer_alsa9.cpp:799
 msgid ""
 "Alsa mixer cannot be found.\n"
 "Please check that the soundcard is installed and the\n"
@@ -528,13 +541,13 @@ msgstr ""
 msgid "unused"
 msgstr ""
 
-#: mixer_oss.cpp:211 mixer_oss4.cpp:341
+#: mixer_oss.cpp:211 mixer_oss4.cpp:364
 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 ""
 
-#: mixer_oss.cpp:215 mixer_oss4.cpp:345
+#: mixer_oss.cpp:215
 msgid ""
 "kmix: Mixer cannot be found.\n"
 "Please check that the soundcard is installed and the\n"
@@ -543,6 +556,21 @@ msgid ""
 "Use 'soundon' when using commercial OSS."
 msgstr ""
 
+#: mixer_oss4.cpp:368
+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."
+msgstr ""
+
+#: mixer_oss4.cpp:375
+msgid ""
+"kmix expected an OSSv4 mixer module,\n"
+"but instead found an older version."
+msgstr ""
+
 #: mixer_sun.cpp:66
 msgid "Master Volume"
 msgstr ""
@@ -573,11 +601,11 @@ msgid ""
 "Ask your system administrator to fix /dev/audioctl to allow access."
 msgstr ""
 
-#: mixertoolbox.cpp:196
+#: mixertoolbox.cpp:225
 msgid "Sound drivers supported:"
 msgstr ""
 
-#: mixertoolbox.cpp:197
+#: mixertoolbox.cpp:226
 msgid "Sound drivers used:"
 msgstr ""
 
diff --git a/tde-i18n-cy/messages/tdemultimedia/krec.po b/tde-i18n-cy/messages/tdemultimedia/krec.po
index 22c92f05e4b..4017d597ebc 100644
--- a/tde-i18n-cy/messages/tdemultimedia/krec.po
+++ b/tde-i18n-cy/messages/tdemultimedia/krec.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdemultimedia/krec.po\n"
-"POT-Creation-Date: 2006-08-20 04:11+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -443,7 +444,7 @@ msgstr ""
 
 #: main.cpp:30
 msgid ""
-"This is a recording tool for TDE.\n"
+"This is a recording tool for KDE.\n"
 "It uses aRts, just look at the audiomanager\n"
 "and you will find it there accepting sound\n"
 "for recording."
@@ -486,7 +487,7 @@ msgstr "Chwarae"
 msgid "Compressor"
 msgstr ""
 
-#: tips.cpp:3
+#: tips.txt:3
 msgid ""
 "<h4>...that KRec does non-destructive Recording?</h4>\n"
 "<p>\n"
@@ -497,7 +498,7 @@ msgid ""
 "</p>\n"
 msgstr ""
 
-#: tips.cpp:11
+#: tips.txt:11
 msgid ""
 "<h4>...which event caused the first version of KRec?</h4>\n"
 "<p>\n"
@@ -508,7 +509,7 @@ msgid ""
 "</p>\n"
 msgstr ""
 
-#: tips.cpp:19
+#: tips.txt:19
 msgid ""
 "<h4>...that developers are very happy to hear from the users?</h4>\n"
 "<p>\n"
@@ -519,7 +520,7 @@ msgid ""
 "</p>\n"
 msgstr ""
 
-#: tips.cpp:27
+#: tips.txt:27
 msgid ""
 "<h4>...that you are invited to report bugs?</h4>\n"
 "<p>\n"
@@ -529,7 +530,7 @@ msgid ""
 "</p>\n"
 msgstr ""
 
-#: tips.cpp:35
+#: tips.txt:35
 msgid ""
 "<h4>...that KRec is far from complete?</h4>\n"
 "<p>\n"
diff --git a/tde-i18n-cy/messages/tdemultimedia/kscd.po b/tde-i18n-cy/messages/tdemultimedia/kscd.po
index 88f1ac4ec90..b64f0969c0e 100644
--- a/tde-i18n-cy/messages/tdemultimedia/kscd.po
+++ b/tde-i18n-cy/messages/tdemultimedia/kscd.po
@@ -3,10 +3,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kscd\n"
-"POT-Creation-Date: 2008-07-08 01:20+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2004-07-06 21:04+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdemultimedia/libkcddb.po b/tde-i18n-cy/messages/tdemultimedia/libkcddb.po
index e523cffbef1..264b551aa04 100644
--- a/tde-i18n-cy/messages/tdemultimedia/libkcddb.po
+++ b/tde-i18n-cy/messages/tdemultimedia/libkcddb.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdemultimedia/libkcddb.po\n"
-"POT-Creation-Date: 2008-07-08 01:20+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdemultimedia/noatun.po b/tde-i18n-cy/messages/tdemultimedia/noatun.po
index 8f96a40caa4..34ca198f969 100644
--- a/tde-i18n-cy/messages/tdemultimedia/noatun.po
+++ b/tde-i18n-cy/messages/tdemultimedia/noatun.po
@@ -1,403 +1,416 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdemultimedia/noatun.po\n"
-"POT-Creation-Date: 2008-07-08 01:20+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. i18n: file ./library/equalizerwidget.ui line 16
-#: library/equalizerview.cpp:111 rc.cpp:3
-#, no-c-format
-msgid "Equalizer"
-msgstr ""
-
-#. i18n: file ./library/equalizerwidget.ui line 38
-#: rc.cpp:6
-#, no-c-format
-msgid "Pre&amp:"
-msgstr ""
-
-#. i18n: file ./library/equalizerwidget.ui line 123
-#: rc.cpp:9
-#, no-c-format
-msgid "+/-"
-msgstr "+/-  "
-
-#. i18n: file ./library/equalizerwidget.ui line 138
+#. i18n: file ./modules/simple/propertiesdialog.ui line 38
 #: rc.cpp:12
 #, no-c-format
-msgid "&Bands"
-msgstr ""
+msgid "&Details"
+msgstr "&Manylion"
 
-#. i18n: file ./library/equalizerwidget.ui line 173
+#. i18n: file ./modules/simple/propertiesdialog.ui line 138
 #: rc.cpp:15
 #, no-c-format
-msgid "&Presets"
-msgstr ""
+msgid "Type:"
+msgstr "Math:"
 
-#. i18n: file ./library/equalizerwidget.ui line 217
+#. i18n: file ./modules/simple/propertiesdialog.ui line 163
+#: rc.cpp:18
+#, no-c-format
+msgid "Length:"
+msgstr "Hyd:"
+
+#. i18n: file ./modules/simple/propertiesdialog.ui line 184
 #: rc.cpp:21
 #, no-c-format
-msgid "A&dd"
-msgstr "&Ychwcanegu"
+msgid "Audio:"
+msgstr "Sain :"
 
-#. i18n: file ./library/equalizerwidget.ui line 252
+#. i18n: file ./modules/simple/propertiesdialog.ui line 205
 #: rc.cpp:24
 #, no-c-format
-msgid "&Enabled"
-msgstr "&Galluogir"
+msgid "Video:"
+msgstr "Fideo :"
 
-#. i18n: file ./library/equalizerwidget.ui line 277
+#. i18n: file ./modules/simple/propertiesdialog.ui line 228
 #: rc.cpp:27
 #, no-c-format
-msgid "&Number of bands:"
+msgid "&PlayObject"
 msgstr ""
 
-#. i18n: file ./library/equalizerwidget.ui line 316
+#. i18n: file ./modules/simple/propertiesdialog.ui line 257
 #: rc.cpp:30
 #, no-c-format
-msgid "Re&set EQ"
+msgid "Description:"
+msgstr "Disgrifiad:"
+
+#. i18n: file ./modules/simple/propertiesdialog.ui line 268
+#: rc.cpp:33
+#, no-c-format
+msgid "Capabilities"
 msgstr ""
 
-#. i18n: file ./modules/excellent/excellentui.rc line 12
-#: rc.cpp:36 rc.cpp:120
+#. i18n: file ./modules/kaiman/kaimanui.rc line 16
+#: rc.cpp:42 rc.cpp:57
 #, no-c-format
 msgid "&Go"
 msgstr "&Ewch"
 
 #. i18n: file ./modules/systray/yhconfigwidget.ui line 31
-#: rc.cpp:48
+#: rc.cpp:66
 #, no-c-format
 msgid "&General"
 msgstr "&Cyffredinol"
 
 #. i18n: file ./modules/systray/yhconfigwidget.ui line 42
-#: rc.cpp:51
+#: rc.cpp:69
 #, no-c-format
 msgid "Show a &tooltip for the current track"
 msgstr ""
 
 #. i18n: file ./modules/systray/yhconfigwidget.ui line 50
-#: rc.cpp:54
+#: rc.cpp:72
 #, no-c-format
 msgid "Show &covers in popup window and tooltip"
 msgstr ""
 
 #. i18n: file ./modules/systray/yhconfigwidget.ui line 58
-#: rc.cpp:57
+#: rc.cpp:75
 #, no-c-format
 msgid "Popup Window"
 msgstr ""
 
 #. i18n: file ./modules/systray/yhconfigwidget.ui line 69
-#: rc.cpp:60
+#: rc.cpp:78
 #, no-c-format
 msgid "Display popup window t&ime:"
 msgstr ""
 
 #. i18n: file ./modules/systray/yhconfigwidget.ui line 80
-#: rc.cpp:63
+#: rc.cpp:81
 #, no-c-format
 msgid "Show &buttons in popup window"
 msgstr ""
 
 #. i18n: file ./modules/systray/yhconfigwidget.ui line 88
-#: rc.cpp:66
+#: rc.cpp:84
 #, no-c-format
 msgid "s"
 msgstr "s"
 
 #. i18n: file ./modules/systray/yhconfigwidget.ui line 106
-#: rc.cpp:69
+#: rc.cpp:87
 #, no-c-format
 msgid "Announce tracks with a &popup window"
 msgstr ""
 
 #. i18n: file ./modules/systray/yhconfigwidget.ui line 116
-#: rc.cpp:72
+#: rc.cpp:90
 #, no-c-format
 msgid "State Icon Display"
 msgstr ""
 
 #. i18n: file ./modules/systray/yhconfigwidget.ui line 130
-#: rc.cpp:75
+#: rc.cpp:93
 #, no-c-format
 msgid "&Animated"
 msgstr ""
 
 #. i18n: file ./modules/systray/yhconfigwidget.ui line 138
-#: rc.cpp:78
+#: rc.cpp:96
 #, no-c-format
 msgid "&Flashing"
 msgstr ""
 
 #. i18n: file ./modules/systray/yhconfigwidget.ui line 146
-#: rc.cpp:81
+#: rc.cpp:99
 #, no-c-format
 msgid "&Static"
 msgstr ""
 
 #. i18n: file ./modules/systray/yhconfigwidget.ui line 157
 #: library/noatunstdaction.cpp:165 modules/kaiman/userinterface.cpp:539
-#: modules/kjofol-skin/kjbutton.cpp:230 rc.cpp:84 rc.cpp:190
+#: modules/kjofol-skin/kjbutton.cpp:230 rc.cpp:102 rc.cpp:144
 #, no-c-format
 msgid "&None"
 msgstr "&Dim"
 
 #. i18n: file ./modules/systray/yhconfigwidget.ui line 186
-#: rc.cpp:87
+#: rc.cpp:105
 #, no-c-format
 msgid "Ad&vanced"
 msgstr "&Uwch"
 
 #. i18n: file ./modules/systray/yhconfigwidget.ui line 197
-#: rc.cpp:90
+#: rc.cpp:108
 #, no-c-format
 msgid "Middle Mouse Button Action"
 msgstr ""
 
 #. i18n: file ./modules/systray/yhconfigwidget.ui line 208
-#: rc.cpp:93
+#: rc.cpp:111
 #, no-c-format
 msgid "Hide / Show play&list"
 msgstr ""
 
 #. i18n: file ./modules/systray/yhconfigwidget.ui line 216
-#: rc.cpp:96
+#: rc.cpp:114
 #, fuzzy, no-c-format
 msgid "&Play / Pause"
 msgstr "Chwarae/Seibio"
 
 #. i18n: file ./modules/systray/yhconfigwidget.ui line 226
-#: rc.cpp:99
+#: rc.cpp:117
 #, no-c-format
 msgid "Mouse &Wheel"
 msgstr ""
 
 #. i18n: file ./modules/systray/yhconfigwidget.ui line 245
-#: rc.cpp:102
+#: rc.cpp:120
 #, no-c-format
 msgid "&Keyboard modifier:"
 msgstr ""
 
 #. i18n: file ./modules/systray/yhconfigwidget.ui line 263
-#: rc.cpp:105
+#: rc.cpp:123
 #, no-c-format
 msgid "Action:"
 msgstr "Gweithred:"
 
 #. i18n: file ./modules/systray/yhconfigwidget.ui line 271
-#: rc.cpp:108
+#: rc.cpp:126
 #, no-c-format
 msgid "&Nothing"
 msgstr "&Dim"
 
 #. i18n: file ./modules/systray/yhconfigwidget.ui line 279
-#: rc.cpp:111
+#: rc.cpp:129
 #, fuzzy, no-c-format
 msgid "Change v&olume"
 msgstr "Lefel Sain"
 
 #. i18n: file ./modules/systray/yhconfigwidget.ui line 287
-#: rc.cpp:114
-#, no-c-format
-msgid "Switch &track"
-msgstr ""
-
-#. i18n: file ./modules/simple/propertiesdialog.ui line 38
 #: rc.cpp:132
 #, no-c-format
-msgid "&Details"
-msgstr "&Manylion"
-
-#. i18n: file ./modules/simple/propertiesdialog.ui line 138
-#: rc.cpp:135
-#, no-c-format
-msgid "Type:"
-msgstr "Math:"
-
-#. i18n: file ./modules/simple/propertiesdialog.ui line 163
-#: rc.cpp:138
-#, no-c-format
-msgid "Length:"
-msgstr "Hyd:"
-
-#. i18n: file ./modules/simple/propertiesdialog.ui line 184
-#: rc.cpp:141
-#, no-c-format
-msgid "Audio:"
-msgstr "Sain :"
-
-#. i18n: file ./modules/simple/propertiesdialog.ui line 205
-#: rc.cpp:144
-#, no-c-format
-msgid "Video:"
-msgstr "Fideo :"
-
-#. i18n: file ./modules/simple/propertiesdialog.ui line 228
-#: rc.cpp:147
-#, no-c-format
-msgid "&PlayObject"
-msgstr ""
-
-#. i18n: file ./modules/simple/propertiesdialog.ui line 257
-#: rc.cpp:150
-#, no-c-format
-msgid "Description:"
-msgstr "Disgrifiad:"
-
-#. i18n: file ./modules/simple/propertiesdialog.ui line 268
-#: rc.cpp:153
-#, no-c-format
-msgid "Capabilities"
-msgstr ""
-
-#. i18n: file ./modules/kjofol-skin/kjskinselectorwidget.ui line 51
-#: rc.cpp:165
-#, no-c-format
-msgid "Preview"
-msgstr "Rhagolwg"
-
-#. i18n: file ./modules/kjofol-skin/kjskinselectorwidget.ui line 153
-#: rc.cpp:168
-#, no-c-format
-msgid "About skin:"
-msgstr ""
-
-#. i18n: file ./modules/kjofol-skin/kjskinselectorwidget.ui line 170
-#: rc.cpp:171
-#, no-c-format
-msgid ""
-"Here you will see all the comments people wrote about their skins.\n"
-"It can be several lines and usually does not contain anything interesting but "
-"still this will be shown."
-msgstr ""
-
-#. i18n: file ./modules/kjofol-skin/kjskinselectorwidget.ui line 205
-#: rc.cpp:175
-#, no-c-format
-msgid "Install Skin"
-msgstr ""
-
-#. i18n: file ./modules/kjofol-skin/kjskinselectorwidget.ui line 213
-#: rc.cpp:178
-#, no-c-format
-msgid "Remove Skin"
+msgid "Switch &track"
 msgstr ""
 
 #. i18n: file ./modules/kjofol-skin/kjguisettingswidget.ui line 38
-#: rc.cpp:181
+#: rc.cpp:135
 #, no-c-format
 msgid "Visualization"
 msgstr "Delweddu"
 
 #. i18n: file ./modules/kjofol-skin/kjguisettingswidget.ui line 55
-#: rc.cpp:184
+#: rc.cpp:138
 #, no-c-format
 msgid "Oscillo&scope"
 msgstr ""
 
 #. i18n: file ./modules/kjofol-skin/kjguisettingswidget.ui line 63
-#: rc.cpp:187
+#: rc.cpp:141
 #, no-c-format
 msgid "&Analyzer"
 msgstr ""
 
 #. i18n: file ./modules/kjofol-skin/kjguisettingswidget.ui line 101
-#: rc.cpp:193
+#: rc.cpp:147
 #, no-c-format
 msgid "U&pdate every:"
 msgstr ""
 
 #. i18n: file ./modules/kjofol-skin/kjguisettingswidget.ui line 121
-#: rc.cpp:196
+#: rc.cpp:150
 #, no-c-format
 msgid "ms"
 msgstr "ms"
 
 #. i18n: file ./modules/kjofol-skin/kjguisettingswidget.ui line 133
 #: modules/kjofol-skin/kjsliders.cpp:244
-#: modules/kjofol-skin/kjtextdisplay.cpp:537 rc.cpp:199
+#: modules/kjofol-skin/kjtextdisplay.cpp:537 rc.cpp:153
 #, no-c-format
 msgid "Pitch"
 msgstr "Traw"
 
 #. i18n: file ./modules/kjofol-skin/kjguisettingswidget.ui line 172
-#: rc.cpp:202
+#: rc.cpp:156
 #, no-c-format
 msgid "&Lower limit:"
 msgstr "&Terfyn is:"
 
 #. i18n: file ./modules/kjofol-skin/kjguisettingswidget.ui line 192
-#: rc.cpp:205 rc.cpp:211
+#: rc.cpp:159 rc.cpp:165
 #, no-c-format
 msgid "%"
 msgstr "%"
 
 #. i18n: file ./modules/kjofol-skin/kjguisettingswidget.ui line 224
-#: rc.cpp:208
+#: rc.cpp:162
 #, no-c-format
 msgid "&Upper limit:"
 msgstr "&Terfyn uwch:"
 
 #. i18n: file ./modules/kjofol-skin/kjguisettingswidget.ui line 258
-#: rc.cpp:214
+#: rc.cpp:168
 #, no-c-format
 msgid "Display &tooltips"
 msgstr ""
 
 #. i18n: file ./modules/kjofol-skin/kjguisettingswidget.ui line 266
-#: rc.cpp:217
+#: rc.cpp:171
 #, no-c-format
 msgid "Display splash sc&reen"
 msgstr ""
 
 #. i18n: file ./modules/kjofol-skin/kjguisettingswidget.ui line 305
-#: rc.cpp:220
+#: rc.cpp:174
 #, no-c-format
 msgid "T&itle display scrolling speed:"
 msgstr ""
 
 #. i18n: file ./modules/kjofol-skin/kjguisettingswidget.ui line 316
-#: rc.cpp:223
+#: rc.cpp:177
 #, no-c-format
 msgid "Slow"
 msgstr "Araf"
 
 #. i18n: file ./modules/kjofol-skin/kjguisettingswidget.ui line 356
-#: modules/winskin/winSkinConfig.cpp:74 rc.cpp:226
+#: modules/winskin/winSkinConfig.cpp:74 rc.cpp:180
 #, no-c-format
 msgid "Fast"
 msgstr "Cyflym"
 
 #. i18n: file ./modules/kjofol-skin/kjguisettingswidget.ui line 366
-#: rc.cpp:229
+#: rc.cpp:183
 #, no-c-format
 msgid "System Font"
 msgstr ""
 
 #. i18n: file ./modules/kjofol-skin/kjguisettingswidget.ui line 389
-#: rc.cpp:232
+#: rc.cpp:186
 #, no-c-format
 msgid "Color:"
 msgstr "Lliw:"
 
 #. i18n: file ./modules/kjofol-skin/kjguisettingswidget.ui line 397
-#: rc.cpp:235
+#: rc.cpp:189
 #, no-c-format
 msgid "Font:"
 msgstr "Wynebfath:"
 
 #. i18n: file ./modules/kjofol-skin/kjguisettingswidget.ui line 416
-#: rc.cpp:238
+#: rc.cpp:192
 #, no-c-format
 msgid "Use system font"
 msgstr ""
 
+#. i18n: file ./modules/kjofol-skin/kjskinselectorwidget.ui line 51
+#: rc.cpp:195
+#, no-c-format
+msgid "Preview"
+msgstr "Rhagolwg"
+
+#. i18n: file ./modules/kjofol-skin/kjskinselectorwidget.ui line 153
+#: rc.cpp:198
+#, no-c-format
+msgid "About skin:"
+msgstr ""
+
+#. i18n: file ./modules/kjofol-skin/kjskinselectorwidget.ui line 170
+#: rc.cpp:201
+#, no-c-format
+msgid ""
+"Here you will see all the comments people wrote about their skins.\n"
+"It can be several lines and usually does not contain anything interesting but "
+"still this will be shown."
+msgstr ""
+
+#. i18n: file ./modules/kjofol-skin/kjskinselectorwidget.ui line 205
+#: rc.cpp:205
+#, no-c-format
+msgid "Install Skin"
+msgstr ""
+
+#. i18n: file ./modules/kjofol-skin/kjskinselectorwidget.ui line 213
+#: rc.cpp:208
+#, no-c-format
+msgid "Remove Skin"
+msgstr ""
+
+#. i18n: file ./library/equalizerwidget.ui line 16
+#: library/equalizerview.cpp:111 rc.cpp:211
+#, no-c-format
+msgid "Equalizer"
+msgstr ""
+
+#. i18n: file ./library/equalizerwidget.ui line 38
+#: rc.cpp:214
+#, no-c-format
+msgid "Pre&amp:"
+msgstr ""
+
+#. i18n: file ./library/equalizerwidget.ui line 123
+#: rc.cpp:217
+#, no-c-format
+msgid "+/-"
+msgstr "+/-  "
+
+#. i18n: file ./library/equalizerwidget.ui line 138
+#: rc.cpp:220
+#, no-c-format
+msgid "&Bands"
+msgstr ""
+
+#. i18n: file ./library/equalizerwidget.ui line 173
+#: rc.cpp:223
+#, no-c-format
+msgid "&Presets"
+msgstr ""
+
+#. i18n: file ./library/equalizerwidget.ui line 217
+#: rc.cpp:229
+#, no-c-format
+msgid "A&dd"
+msgstr "&Ychwcanegu"
+
+#. i18n: file ./library/equalizerwidget.ui line 252
+#: rc.cpp:232
+#, no-c-format
+msgid "&Enabled"
+msgstr "&Galluogir"
+
+#. i18n: file ./library/equalizerwidget.ui line 277
+#: rc.cpp:235
+#, no-c-format
+msgid "&Number of bands:"
+msgstr ""
+
+#. i18n: file ./library/equalizerwidget.ui line 316
+#: rc.cpp:238
+#, no-c-format
+msgid "Re&set EQ"
+msgstr ""
+
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "KD wrth KGyfieithu"
+
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "kyfieithu@dotmon.com"
+
 #: app/main.cpp:8
 msgid "The Fusion of Frequencies"
 msgstr ""
@@ -448,421 +461,359 @@ msgstr ""
 msgid "Special help with the equalizer"
 msgstr ""
 
-#: library/video.cpp:119
-msgid "Video - Noatun"
-msgstr ""
+#: modules/simple/propertiesdialog.ui.h:39
+#: modules/simple/propertiesdialog.ui.h:40
+#: modules/simple/propertiesdialog.ui.h:41
+#: modules/simple/propertiesdialog.ui.h:42
+#: modules/simple/propertiesdialog.ui.h:43
+msgid "unknown"
+msgstr "anhysbys"
 
-#: library/ksaver.cpp:81 modules/splitplaylist/view.cpp:470
+#: modules/simple/propertiesdialog.ui.h:49
 #, c-format
-msgid "Could not write to %1."
-msgstr ""
-
-#: library/cmodule.cpp:32
-msgid "General"
-msgstr "Cyffredinol"
+msgid "Properties for %1"
+msgstr "Priodweddau i %1"
 
-#: library/cmodule.cpp:32
-msgid "General Options"
-msgstr "Dewisiadau Cyffredinol"
+#: modules/simple/userinterface.cpp:130
+msgid "&Properties"
+msgstr "&Priodweddau"
 
-#: library/cmodule.cpp:34
-msgid "&Return to start of playlist on finish"
+#: modules/simple/userinterface.cpp:208
+msgid "Play / Pause"
 msgstr ""
 
-#: library/cmodule.cpp:36
-msgid ""
-"When the playlist is finished playing, return to the start, but do not start "
-"playing."
-msgstr ""
+#: modules/keyz/keyz.cpp:42 modules/kjofol-skin/kjbutton.cpp:139
+#: modules/noatunui/userinterface.cpp:60 modules/simple/userinterface.cpp:214
+msgid "Forward"
+msgstr "Ymlaen"
 
-#: library/cmodule.cpp:38
-msgid "Allow only one &instance of Noatun"
-msgstr ""
+#: modules/kjofol-skin/kjbutton.cpp:123 modules/noatunui/userinterface.cpp:67
+#: modules/simple/userinterface.cpp:227 modules/splitplaylist/view.cpp:935
+msgid "Playlist"
+msgstr "Rhestr chwarae:"
 
-#: library/cmodule.cpp:40
-msgid ""
-"Starting noatun a second time will cause it to just append items from the start "
-"to the current instance."
-msgstr ""
+#: modules/kjofol-skin/kjsliders.cpp:53 modules/kjofol-skin/kjsliders.cpp:143
+#: modules/kjofol-skin/kjtextdisplay.cpp:429
+#: modules/simple/userinterface.cpp:233
+msgid "Volume"
+msgstr "Lefel Sain"
 
-#: library/cmodule.cpp:42
-msgid "Clear playlist &when opening a file"
+#: modules/winskin/winSkinConfig.cpp:27
+msgid "Winskin"
 msgstr ""
 
-#: library/cmodule.cpp:44
-msgid ""
-"Opening a file with the global Open menu item will clear the playlist first."
+#: modules/winskin/winSkinConfig.cpp:28
+msgid "Skin Selection for the Winskin Plugin"
 msgstr ""
 
-#: library/cmodule.cpp:46
-msgid "&Use fast hardware volume control"
+#: modules/winskin/winSkinConfig.cpp:43
+msgid "&Install New Skin..."
 msgstr ""
 
-#: library/cmodule.cpp:48
-msgid ""
-"Use the hardware mixer instead of aRts'. It affects all streams, not just "
-"Noatun's, but is a little faster."
+#: modules/winskin/winSkinConfig.cpp:46
+msgid "&Remove Skin"
 msgstr ""
 
-#: library/cmodule.cpp:50
-msgid "Display &remaining play time"
-msgstr ""
+#: modules/winskin/winSkinConfig.cpp:58
+msgid "Settings"
+msgstr "Gosodiadau"
 
-#: library/cmodule.cpp:52
-msgid ""
-"Counters count down towards zero, showing remaining time instead of elapsed "
-"time."
+#: modules/winskin/winSkinConfig.cpp:62
+msgid "T&itle scrolling speed:"
 msgstr ""
 
-#: library/cmodule.cpp:54
-msgid "Title &format:"
-msgstr ""
+#: modules/infrared/irprefs.cpp:170 modules/systray/cmodule.cpp:55
+#: modules/winskin/winSkinConfig.cpp:63
+msgid "None"
+msgstr "Dim"
 
-#: library/cmodule.cpp:59
-msgid ""
-"Select a title to use for each file (in the playlist and user interface). Each "
-"element such as $(title) is replaced with the property with the name as given "
-"in the parentheses. The properties include, but are not limited to: title, "
-"author, date, comments and album."
+#: modules/winskin/winSkinConfig.cpp:159
+msgid "You cannot remove this skin."
 msgstr ""
 
-#: library/cmodule.cpp:64
-msgid "&Download folder:"
+#: modules/winskin/winSkinConfig.cpp:166
+msgid "<qt>Are you sure you want to remove the <b>%1</b> skin?</qt>"
 msgstr ""
 
-#: library/cmodule.cpp:69
-msgid "When opening a non-local file, download it to the selected folder."
+#: modules/winskin/waSkin.cpp:451
+msgid "Seek to: %1/%2 (%3%)"
 msgstr ""
 
-#: library/cmodule.cpp:71
-msgid "Play Behavior on Startup"
+#: modules/winskin/waSkin.cpp:558
+msgid "Balance: Center"
 msgstr ""
 
-#: library/cmodule.cpp:74
-msgid "Restore &play state"
+#: modules/winskin/waSkin.cpp:561
+msgid "Balance: %1% Left"
 msgstr ""
 
-#: library/cmodule.cpp:78
-msgid "Automatically play &first file"
+#: modules/winskin/waSkin.cpp:563
+msgid "Balance: %1% Right"
 msgstr ""
 
-#: library/cmodule.cpp:82
-msgid "&Do not start playing"
+#: modules/winskin/waSkin.cpp:675
+msgid "Volume: %1%"
 msgstr ""
 
-#: library/pluginmodule.cpp:140
-msgid "Plugins"
-msgstr "Ategion"
+#: modules/winskin/guiSpectrumAnalyser.cpp:37
+msgid "Visualization Mode"
+msgstr ""
 
-#: library/pluginmodule.cpp:140
-msgid "Select Your Plugins"
+#: modules/winskin/guiSpectrumAnalyser.cpp:38
+msgid "Analyzer Mode"
 msgstr ""
 
-#: library/pluginmodule.cpp:148
-msgid "<b>Select one or more interfaces to use:</b>"
+#: modules/winskin/guiSpectrumAnalyser.cpp:40
+msgid "Analyzer"
 msgstr ""
 
-#: library/pluginmodule.cpp:151 library/pluginmodule.cpp:163
-#: library/pluginmodule.cpp:174 library/pluginmodule.cpp:186
-msgid "Name"
-msgstr "Enw"
+#: modules/winskin/guiSpectrumAnalyser.cpp:41
+msgid "Disabled"
+msgstr "Analluogir"
 
-#: library/pluginmodule.cpp:152 library/pluginmodule.cpp:164
-#: library/pluginmodule.cpp:175 library/pluginmodule.cpp:187
-msgid "Description"
-msgstr "Disgrifiad"
+#: modules/winskin/guiSpectrumAnalyser.cpp:45
+msgid "Normal"
+msgstr "Arferol"
 
-#: library/pluginmodule.cpp:153 library/pluginmodule.cpp:165
-#: library/pluginmodule.cpp:176 library/pluginmodule.cpp:188
-msgid "Author"
-msgstr "Awdur"
+#: modules/winskin/guiSpectrumAnalyser.cpp:46
+msgid "Fire"
+msgstr ""
 
-#: library/pluginmodule.cpp:154 library/pluginmodule.cpp:166
-#: library/pluginmodule.cpp:177 library/pluginmodule.cpp:189
-msgid "License"
-msgstr "Trwydded"
+#: modules/winskin/guiSpectrumAnalyser.cpp:47
+msgid "Vertical Lines"
+msgstr "Llinellau Fertigol"
 
-#: library/pluginmodule.cpp:156
-msgid "&Interfaces"
-msgstr "&Rhyngwynebau"
+#: library/noatunstdaction.cpp:25 library/noatunstdaction.cpp:45
+#: modules/infrared/irprefs.cpp:252 modules/kjofol-skin/kjbutton.cpp:117
+#: modules/noatunui/userinterface.cpp:54
+msgid "Play"
+msgstr "Chwarae"
 
-#: library/pluginmodule.cpp:160
-msgid "<b>Select one playlist to use:</b>"
+#: modules/noatunui/userinterface.cpp:73
+msgid "Change loop style"
 msgstr ""
 
-#: library/noatunstdaction.cpp:175 library/pluginmodule.cpp:168
-#: modules/kaiman/userinterface.cpp:543 modules/kjofol-skin/kjbutton.cpp:232
-msgid "&Playlist"
-msgstr "Rhestr &chwarae:"
-
-#: library/pluginmodule.cpp:172
-msgid "<b>Select any visualizations to use:</b>"
-msgstr ""
+#: modules/noatunui/userinterface.cpp:104
+#: modules/noatunui/userinterface.cpp:218
+msgid "No File Loaded"
+msgstr "Heb Lwytho Ffeil"
 
-#: library/noatunstdaction.cpp:115 library/pluginmodule.cpp:179
-msgid "&Visualizations"
+#: modules/excellent/userinterface.cpp:317
+#: modules/noatunui/userinterface.cpp:263
+msgid "No looping"
 msgstr ""
 
-#: library/pluginmodule.cpp:184
-msgid "<b>Select any other plugins to use:</b>"
+#: modules/excellent/userinterface.cpp:320
+#: modules/noatunui/userinterface.cpp:267
+msgid "Song looping"
 msgstr ""
 
-#: library/pluginmodule.cpp:191
-msgid "O&ther Plugins"
+#: modules/excellent/userinterface.cpp:323
+#: modules/noatunui/userinterface.cpp:271
+msgid "Playlist looping"
 msgstr ""
 
-#: library/pluginmodule.cpp:401
-msgid ""
-"<qt>Changing your playlist plugin will stop playback. Different playlists may "
-"use different methods of storing information, so after changing playlists you "
-"may have to recreate your playlist.</qt>"
+#: modules/excellent/userinterface.cpp:326
+#: modules/noatunui/userinterface.cpp:275
+msgid "Random play"
 msgstr ""
 
-#: library/downloader.cpp:101
-msgid "Unknown"
-msgstr "Anhysbys"
-
-#: library/equalizerview.cpp:45 library/equalizerview.cpp:51
-#: library/equalizerview.cpp:146 library/equalizerview.cpp:270
-msgid "Custom"
-msgstr "Addasiedig"
+#: modules/infrared/irprefs.cpp:55
+msgid "Infrared Control"
+msgstr "Rheolaeth Isgoch"
 
-#: library/equalizerview.cpp:284
-msgid "New Preset"
+#: modules/infrared/irprefs.cpp:55
+msgid "Configure Infrared Commands"
 msgstr ""
 
-#: library/noatuntags/tags.cpp:181
-msgid "Tagging"
+#: modules/infrared/irprefs.cpp:60
+msgid "Remote control &commands:"
 msgstr ""
 
-#: library/noatuntags/tags.cpp:181
-msgid "Settings for Tag Loaders"
-msgstr ""
+#: modules/infrared/irprefs.cpp:66
+msgid "&Action:"
+msgstr "&Gweithred:"
 
-#: library/noatuntags/tags.cpp:184
-msgid "Rescan All Tags"
-msgstr ""
+#: modules/infrared/irprefs.cpp:73
+msgid "&Repeat"
+msgstr "&Ail-adrodd"
 
-#: library/noatuntags/tags.cpp:189
-msgid "Load tags &automatically"
+#: modules/infrared/irprefs.cpp:77
+msgid "&Interval:"
 msgstr ""
 
-#: library/noatuntags/tags.cpp:202
-msgid ""
-"_: The time between each time noatun scans for a new file, and updates tags "
-"(e.g., ID3)\n"
-"Interval:"
+#: modules/infrared/irprefs.cpp:132
+msgid "You do not have any remote control configured."
 msgstr ""
 
-#: library/noatuntags/tags.cpp:210
-msgid ""
-"_: Milliseconds\n"
-" ms"
-msgstr "meil"
-
-#: library/pref.cpp:12
-msgid "Preferences - Noatun"
+#: modules/infrared/irprefs.cpp:133
+msgid "Please make sure lirc is setup correctly."
 msgstr ""
 
-#: library/engine.cpp:257
-msgid "There was an error communicating to the aRts daemon."
+#: modules/infrared/irprefs.cpp:137
+msgid "Connection could not be established."
 msgstr ""
 
-#: library/engine.cpp:257
-msgid "aRts error"
+#: modules/infrared/irprefs.cpp:138
+msgid "Please make sure lirc is setup correctly and lircd is running."
 msgstr ""
 
-#: library/engine.cpp:577
-msgid ""
-"Connecting/starting aRts soundserver failed. Make sure that artsd is configured "
-"properly."
-msgstr ""
+#: modules/infrared/irprefs.cpp:144
+msgid "Button"
+msgstr "Botwm"
 
-#: library/app.cpp:118 modules/marquis/marquis.cpp:161
-msgid ""
-"No playlist plugin was found. Please make sure that Noatun was installed "
-"correctly."
-msgstr ""
+#: modules/infrared/irprefs.cpp:145
+msgid "Action"
+msgstr "Gweithred"
 
-#: library/app.cpp:409 modules/kjofol-skin/kjbutton.cpp:217
-#: modules/splitplaylist/view.cpp:896
-msgid "Select File to Play"
+#: modules/infrared/irprefs.cpp:146
+msgid "Interval"
 msgstr ""
 
-#: library/playlistsaver.cpp:110 library/playlistsaver.cpp:306
-#: library/playlistsaver.cpp:559
-#, c-format
-msgid "Stream from %1"
-msgstr ""
+#: modules/infrared/irprefs.cpp:258 modules/kjofol-skin/kjbutton.cpp:135
+msgid "Next"
+msgstr "Nesaf"
 
-#: library/playlistsaver.cpp:751
-msgid "Stream from %1 (port: %2)"
+#: modules/infrared/irprefs.cpp:260 modules/keyz/keyz.cpp:60
+msgid "Volume Down"
 msgstr ""
 
-#: library/playlistsaver.cpp:753
-msgid "Stream from %1, (ip: %2, port: %3)"
+#: modules/infrared/irprefs.cpp:262 modules/keyz/keyz.cpp:57
+msgid "Volume Up"
 msgstr ""
 
-#: library/noatunstdaction.cpp:25 library/noatunstdaction.cpp:45
-#: modules/infrared/irprefs.cpp:252 modules/kjofol-skin/kjbutton.cpp:117
-#: modules/noatunui/userinterface.cpp:54
-msgid "Play"
-msgstr "Chwarae"
+#: modules/infrared/irprefs.cpp:264 modules/keyz/keyz.cpp:63
+msgid "Mute"
+msgstr ""
 
 #: library/noatunstdaction.cpp:39 modules/infrared/irprefs.cpp:266
 #: modules/kjofol-skin/kjbutton.cpp:119
 msgid "Pause"
 msgstr "Seibio"
 
+#: modules/infrared/irprefs.cpp:268 modules/keyz/keyz.cpp:69
+msgid "Seek Backward"
+msgstr ""
+
+#: modules/infrared/irprefs.cpp:270 modules/keyz/keyz.cpp:66
+msgid "Seek Forward"
+msgstr ""
+
 #: library/noatunstdaction.cpp:50 modules/infrared/irprefs.cpp:272
 msgid "Show Playlist"
 msgstr "Dangos y rhestr ganu"
 
-#: library/noatunstdaction.cpp:52
-msgid "Hide Playlist"
+#: modules/infrared/irprefs.cpp:274 modules/keyz/keyz.cpp:72
+msgid "Next Section"
 msgstr ""
 
-#: library/noatunstdaction.cpp:71
-msgid "&Actions"
-msgstr "&Gweithredoedd"
-
-#: library/noatunstdaction.cpp:163
-msgid "&Loop"
-msgstr "&Cylchu"
-
-#: library/noatunstdaction.cpp:170 modules/kaiman/userinterface.cpp:541
-#: modules/kjofol-skin/kjbutton.cpp:231
-msgid "&Song"
+#: modules/infrared/irprefs.cpp:276 modules/keyz/keyz.cpp:75
+msgid "Previous Section"
 msgstr ""
 
-#: library/noatunstdaction.cpp:180 modules/kaiman/userinterface.cpp:545
-#: modules/kjofol-skin/kjbutton.cpp:233
-msgid "&Random"
-msgstr "&Hap"
+#: modules/infrared/lirc.cpp:22
+msgid ""
+"Could not create a socket to receive infrared signals. The error is:\n"
+msgstr ""
 
-#: library/noatunstdaction.cpp:242
-msgid "&Effects..."
-msgstr "E&ffeithiau ..."
+#: modules/infrared/lirc.cpp:30
+msgid ""
+"Could not establish a connection to receive infrared signals. The error is:\n"
+msgstr ""
 
-#: library/noatunstdaction.cpp:247
-msgid "E&qualizer..."
+#: library/app.cpp:118 modules/marquis/marquis.cpp:161
+msgid ""
+"No playlist plugin was found. Please make sure that Noatun was installed "
+"correctly."
 msgstr ""
 
-#: library/noatunstdaction.cpp:252
-msgid "&Back"
-msgstr "&Yn ôl"
+#: modules/metatag/edit.cpp:27
+msgid "Tag Editor"
+msgstr ""
 
-#: library/noatunstdaction.cpp:270
-msgid "&Forward"
-msgstr "&Ymlaen"
+#: modules/metatag/edit.cpp:84
+msgid "&Title"
+msgstr "&Teitl"
 
-#: library/noatunstdaction.cpp:275
-msgid "&Play"
-msgstr "&Chwarae"
+#: modules/metatag/edit.cpp:85
+msgid "&Artist"
+msgstr "&Artist"
 
-#: library/noatunstdaction.cpp:288
-msgid "&Pause"
-msgstr "&Seibio"
+#: modules/metatag/edit.cpp:86
+msgid "A&lbum"
+msgstr "A&lbum:"
 
-#: library/vequalizer.cpp:845
-msgid "Trance"
-msgstr ""
+#: modules/metatag/edit.cpp:87
+msgid "&Date"
+msgstr "&Dyddiad"
 
-#: library/vequalizer.cpp:846
-msgid "Dance"
+#: modules/metatag/edit.cpp:88
+msgid "T&rack"
 msgstr ""
 
-#: library/vequalizer.cpp:847
-msgid "Metal"
+#: modules/metatag/edit.cpp:89
+msgid "&Genre"
 msgstr ""
 
-#: library/vequalizer.cpp:848
-msgid "Jazz"
-msgstr "Jazz"
+#: modules/metatag/edit.cpp:90
+msgid "Co&mment"
+msgstr "Sy&lwad"
 
-#: library/vequalizer.cpp:849
-msgid "Zero"
+#: modules/metatag/metatag.cpp:35
+msgid "&Tag Editor..."
 msgstr ""
 
-#: library/vequalizer.cpp:850
-msgid "Eclectic Guitar"
+#: modules/htmlexport/htmlexport.cpp:20
+msgid "&Export Playlist..."
 msgstr ""
 
-#: library/effectview.cpp:75
-msgid "Effects"
-msgstr "Effeithiau"
-
-#: library/effectview.cpp:104
-msgid "Effects - Noatun"
+#: modules/htmlexport/htmlexport.cpp:42
+msgid "Export Playlist"
 msgstr ""
 
-#: library/effectview.cpp:112
-msgid "Available Effects"
+#: modules/htmlexport/htmlexport.cpp:60 modules/htmlexport/htmlexport.cpp:90
+msgid "Noatun Playlist"
 msgstr ""
 
-#: library/effectview.cpp:122
-msgid "Active Effects"
+#: modules/htmlexport/htmlexport.cpp:175
+msgid "Playlist Export"
 msgstr ""
 
-#: library/effectview.cpp:156
-msgid "Up"
-msgstr "I fyny"
-
-#: library/effectview.cpp:157
-msgid "Down"
-msgstr "I Lawr"
-
-#: library/effectview.cpp:170
-msgid ""
-"This shows all available effects.\n"
-"\n"
-"To activate a plugin, drag files from here to the active pane on the right."
+#: modules/htmlexport/htmlexport.cpp:175
+msgid "Colors & Settings for HTML Export"
 msgstr ""
 
-#: library/effectview.cpp:171
-msgid "This will place the selected effect at the bottom of your chain."
+#: modules/htmlexport/htmlexport.cpp:201
+msgid "HTML Color Settings"
 msgstr ""
 
-#: library/effectview.cpp:172
-msgid ""
-"This shows your effect chain. Noatun supports an unlimited amount of effects in "
-"any order. You can even have the same effect twice.\n"
-"\n"
-"Drag the items to and from here to add and remove them, respectively. You may "
-"also reorder them with drag-and-drop. These actions can also be performed with "
-"the buttons to the right."
-msgstr ""
+#: modules/htmlexport/htmlexport.cpp:215
+msgid "Text:"
+msgstr "Testun:"
 
-#: library/effectview.cpp:173
-msgid "Move the currently selected effect up in the chain."
-msgstr ""
+#: modules/htmlexport/htmlexport.cpp:219
+msgid "Background:"
+msgstr "Cefndir:"
 
-#: library/effectview.cpp:174
-msgid "Move the currently selected effect down in the chain."
+#: modules/htmlexport/htmlexport.cpp:223
+msgid "Heading:"
 msgstr ""
 
-#: library/effectview.cpp:175
-msgid ""
-"Configure the currently selected effect.\n"
-"\n"
-"You can change things such as intensity from here."
+#: modules/htmlexport/htmlexport.cpp:227
+msgid "Link hover:"
 msgstr ""
 
-#: library/effectview.cpp:176
-msgid "This will remove the selected effect from your chain."
-msgstr ""
+#: modules/htmlexport/htmlexport.cpp:248
+msgid "Background Image"
+msgstr "Delwedd Gefndir"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "KD wrth KGyfieithu"
+#: modules/htmlexport/htmlexport.cpp:259
+msgid "Hyper&link playlist entries to their URL"
+msgstr ""
 
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "kyfieithu@dotmon.com"
+#: modules/htmlexport/htmlexport.cpp:263
+msgid "&Number playlist entries"
+msgstr ""
 
 #: modules/keyz/keyz.cpp:33
 msgid "Play/Pause"
@@ -872,11 +823,6 @@ msgstr "Chwarae/Seibio"
 msgid "Stop Playing"
 msgstr ""
 
-#: modules/keyz/keyz.cpp:42 modules/kjofol-skin/kjbutton.cpp:139
-#: modules/noatunui/userinterface.cpp:60 modules/simple/userinterface.cpp:214
-msgid "Forward"
-msgstr "Ymlaen"
-
 #: modules/keyz/keyz.cpp:45
 msgid "Show/Hide Playlist"
 msgstr ""
@@ -893,34 +839,6 @@ msgstr ""
 msgid "Preferences"
 msgstr "Hoffterau"
 
-#: modules/infrared/irprefs.cpp:262 modules/keyz/keyz.cpp:57
-msgid "Volume Up"
-msgstr ""
-
-#: modules/infrared/irprefs.cpp:260 modules/keyz/keyz.cpp:60
-msgid "Volume Down"
-msgstr ""
-
-#: modules/infrared/irprefs.cpp:264 modules/keyz/keyz.cpp:63
-msgid "Mute"
-msgstr ""
-
-#: modules/infrared/irprefs.cpp:270 modules/keyz/keyz.cpp:66
-msgid "Seek Forward"
-msgstr ""
-
-#: modules/infrared/irprefs.cpp:268 modules/keyz/keyz.cpp:69
-msgid "Seek Backward"
-msgstr ""
-
-#: modules/infrared/irprefs.cpp:274 modules/keyz/keyz.cpp:72
-msgid "Next Section"
-msgstr ""
-
-#: modules/infrared/irprefs.cpp:276 modules/keyz/keyz.cpp:75
-msgid "Previous Section"
-msgstr ""
-
 #: modules/keyz/keyz.cpp:78
 msgid "Copy Song Title to Clipboard"
 msgstr ""
@@ -945,72 +863,74 @@ msgstr "Monoscope"
 msgid "Toggle Monoscope"
 msgstr ""
 
-#: modules/excellent/userinterface.cpp:85
-msgid "Show &Volume Control"
-msgstr ""
+#: modules/voiceprint/prefs.cpp:12 modules/voiceprint/voiceprint.cpp:25
+msgid "Voiceprint"
+msgstr "Argraff Lais"
 
-#: modules/excellent/userinterface.cpp:86
-msgid "Hide &Volume Control"
+#: modules/voiceprint/prefs.cpp:12
+msgid "Options for the Voiceprint Visualization"
 msgstr ""
 
-#: modules/excellent/userinterface.cpp:317
-#: modules/noatunui/userinterface.cpp:263
-msgid "No looping"
-msgstr ""
+#: modules/voiceprint/prefs.cpp:19
+msgid "&Foreground color:"
+msgstr "Lliw'r &blaendir:"
 
-#: modules/excellent/userinterface.cpp:320
-#: modules/noatunui/userinterface.cpp:267
-msgid "Song looping"
+#: modules/voiceprint/prefs.cpp:25
+msgid "&Background color:"
+msgstr "Lliw'r &cefndir:"
+
+#: modules/voiceprint/prefs.cpp:31
+msgid "&Sweep color:"
 msgstr ""
 
-#: modules/excellent/userinterface.cpp:323
-#: modules/noatunui/userinterface.cpp:271
-msgid "Playlist looping"
+#: modules/kaiman/style.cpp:1381
+msgid "Cannot load style. Style not installed."
 msgstr ""
 
-#: modules/excellent/userinterface.cpp:326
-#: modules/noatunui/userinterface.cpp:275
-msgid "Random play"
+#: modules/kaiman/style.cpp:1385
+msgid "Cannot load style. Unsupported or faulty style description."
 msgstr ""
 
-#: modules/excellent/userinterface.cpp:338
-msgid "<qt>Press %1 to show the menubar.</qt>"
+#: modules/kaiman/userinterface.cpp:91
+msgid "Cannot load skin %1. Switching to default skin."
 msgstr ""
 
-#: modules/metatag/edit.cpp:27
-msgid "Tag Editor"
+#: modules/kaiman/userinterface.cpp:94
+#, c-format
+msgid "Cannot load default skin %1."
 msgstr ""
 
-#: modules/metatag/edit.cpp:84
-msgid "&Title"
-msgstr "&Teitl"
+#: modules/kaiman/userinterface.cpp:523
+msgid ""
+"_: TITLE (LENGTH)\n"
+"%1 (%2)"
+msgstr "%1(%2)"
 
-#: modules/metatag/edit.cpp:85
-msgid "&Artist"
-msgstr "&Artist"
+#: modules/kaiman/userinterface.cpp:538 modules/kjofol-skin/kjbutton.cpp:229
+msgid "Loop Style"
+msgstr ""
 
-#: modules/metatag/edit.cpp:86
-msgid "A&lbum"
-msgstr "A&lbum:"
+#: library/noatunstdaction.cpp:170 modules/kaiman/userinterface.cpp:541
+#: modules/kjofol-skin/kjbutton.cpp:231
+msgid "&Song"
+msgstr ""
 
-#: modules/metatag/edit.cpp:87
-msgid "&Date"
-msgstr "&Dyddiad"
+#: library/noatunstdaction.cpp:175 library/pluginmodule.cpp:168
+#: modules/kaiman/userinterface.cpp:543 modules/kjofol-skin/kjbutton.cpp:232
+msgid "&Playlist"
+msgstr "Rhestr &chwarae:"
 
-#: modules/metatag/edit.cpp:88
-msgid "T&rack"
-msgstr ""
+#: library/noatunstdaction.cpp:180 modules/kaiman/userinterface.cpp:545
+#: modules/kjofol-skin/kjbutton.cpp:233
+msgid "&Random"
+msgstr "&Hap"
 
-#: modules/metatag/edit.cpp:89
-msgid "&Genre"
+#: modules/kaiman/pref.cpp:35 modules/kaiman/pref.cpp:39
+msgid "Kaiman Skins"
 msgstr ""
 
-#: modules/metatag/edit.cpp:90
-msgid "Co&mment"
-msgstr "Sy&lwad"
-
-#: modules/metatag/metatag.cpp:35
-msgid "&Tag Editor..."
+#: modules/kaiman/pref.cpp:35
+msgid "Skin Selection for the Kaiman Plugin"
 msgstr ""
 
 #: modules/splitplaylist/find.cpp:8
@@ -1033,6 +953,11 @@ msgstr "Canfod &yn ôl"
 msgid "Time"
 msgstr "Amser"
 
+#: library/ksaver.cpp:81 modules/splitplaylist/view.cpp:470
+#, c-format
+msgid "Could not write to %1."
+msgstr ""
+
 #: modules/splitplaylist/view.cpp:645
 msgid "Add &Files..."
 msgstr ""
@@ -1061,39 +986,26 @@ msgstr ""
 msgid "Open Playlist"
 msgstr ""
 
+#: library/app.cpp:409 modules/kjofol-skin/kjbutton.cpp:217
+#: modules/splitplaylist/view.cpp:896
+msgid "Select File to Play"
+msgstr ""
+
 #: modules/splitplaylist/view.cpp:907
 msgid "Select Folder"
 msgstr "Dewis Plygell"
 
-#: modules/kjofol-skin/kjbutton.cpp:123 modules/noatunui/userinterface.cpp:67
-#: modules/simple/userinterface.cpp:227 modules/splitplaylist/view.cpp:935
-msgid "Playlist"
-msgstr "Rhestr chwarae:"
-
-#: modules/systray/cmodule.cpp:48
-msgid "System Tray Icon"
+#: modules/excellent/userinterface.cpp:85
+msgid "Show &Volume Control"
 msgstr ""
 
-#: modules/systray/cmodule.cpp:48
-msgid "Configure System Tray Icon"
+#: modules/excellent/userinterface.cpp:86
+msgid "Hide &Volume Control"
 msgstr ""
 
-#: modules/infrared/irprefs.cpp:170 modules/systray/cmodule.cpp:55
-#: modules/winskin/winSkinConfig.cpp:63
-msgid "None"
-msgstr "Dim"
-
-#: modules/systray/cmodule.cpp:56
-msgid "Shift"
-msgstr "Syflyd (Shift)"
-
-#: modules/systray/cmodule.cpp:57
-msgid "Alt"
-msgstr "Alt"
-
-#: modules/systray/cmodule.cpp:58
-msgid "Ctrl"
-msgstr "Rheoli (Ctrl)"
+#: modules/excellent/userinterface.cpp:338
+msgid "<qt>Press %1 to show the menubar.</qt>"
+msgstr ""
 
 #: modules/systray/systray.cpp:202
 msgid "Noatun - Paused"
@@ -1107,68 +1019,30 @@ msgstr ""
 msgid "Noatun - Stopped"
 msgstr ""
 
-#: modules/kaiman/style.cpp:1381
-msgid "Cannot load style. Style not installed."
-msgstr ""
-
-#: modules/kaiman/style.cpp:1385
-msgid "Cannot load style. Unsupported or faulty style description."
-msgstr ""
-
-#: modules/kaiman/userinterface.cpp:91
-msgid "Cannot load skin %1. Switching to default skin."
-msgstr ""
-
-#: modules/kaiman/userinterface.cpp:94
-#, c-format
-msgid "Cannot load default skin %1."
-msgstr ""
-
-#: modules/kaiman/userinterface.cpp:523
-msgid ""
-"_: TITLE (LENGTH)\n"
-"%1 (%2)"
-msgstr "%1(%2)"
-
-#: modules/kaiman/userinterface.cpp:538 modules/kjofol-skin/kjbutton.cpp:229
-msgid "Loop Style"
-msgstr ""
-
-#: modules/kaiman/pref.cpp:35 modules/kaiman/pref.cpp:39
-msgid "Kaiman Skins"
+#: modules/systray/cmodule.cpp:48
+msgid "System Tray Icon"
 msgstr ""
 
-#: modules/kaiman/pref.cpp:35
-msgid "Skin Selection for the Kaiman Plugin"
+#: modules/systray/cmodule.cpp:48
+msgid "Configure System Tray Icon"
 msgstr ""
 
-#: modules/simple/propertiesdialog.ui.h:39
-#: modules/simple/propertiesdialog.ui.h:40
-#: modules/simple/propertiesdialog.ui.h:41
-#: modules/simple/propertiesdialog.ui.h:42
-#: modules/simple/propertiesdialog.ui.h:43
-msgid "unknown"
-msgstr "anhysbys"
+#: modules/systray/cmodule.cpp:56
+msgid "Shift"
+msgstr "Syflyd (Shift)"
 
-#: modules/simple/propertiesdialog.ui.h:49
-#, c-format
-msgid "Properties for %1"
-msgstr "Priodweddau i %1"
+#: modules/systray/cmodule.cpp:57
+msgid "Alt"
+msgstr "Alt"
 
-#: modules/simple/userinterface.cpp:130
-msgid "&Properties"
-msgstr "&Priodweddau"
+#: modules/systray/cmodule.cpp:58
+msgid "Ctrl"
+msgstr "Rheoli (Ctrl)"
 
-#: modules/simple/userinterface.cpp:208
-msgid "Play / Pause"
+#: modules/kjofol-skin/kjloader.cpp:145
+msgid "There was trouble loading skin %1. Please select another skin file."
 msgstr ""
 
-#: modules/kjofol-skin/kjsliders.cpp:53 modules/kjofol-skin/kjsliders.cpp:143
-#: modules/kjofol-skin/kjtextdisplay.cpp:429
-#: modules/simple/userinterface.cpp:233
-msgid "Volume"
-msgstr "Lefel Sain"
-
 #: modules/kjofol-skin/kjprefs.cpp:49
 msgid "K-Jöfol Skins"
 msgstr ""
@@ -1229,30 +1103,6 @@ msgstr ""
 msgid "Confirmation"
 msgstr "Gwiriad"
 
-#: modules/kjofol-skin/kjtextdisplay.cpp:66
-msgid "Welcome to Noatun"
-msgstr ""
-
-#: modules/kjofol-skin/kjtextdisplay.cpp:177
-msgid "Filename"
-msgstr "Enw Ffeil"
-
-#: modules/kjofol-skin/kjtextdisplay.cpp:335
-msgid "Play time left"
-msgstr ""
-
-#: modules/kjofol-skin/kjtextdisplay.cpp:337
-msgid "Current play time"
-msgstr ""
-
-#: modules/kjofol-skin/kjtextdisplay.cpp:643
-msgid "Sample rate in kHz"
-msgstr ""
-
-#: modules/kjofol-skin/kjtextdisplay.cpp:645
-msgid "Bitrate in kbps"
-msgstr ""
-
 #: modules/kjofol-skin/kjbutton.cpp:111
 msgid "Minimize"
 msgstr "Lleihau"
@@ -1277,10 +1127,6 @@ msgstr ""
 msgid "Reset Equalizer"
 msgstr ""
 
-#: modules/infrared/irprefs.cpp:258 modules/kjofol-skin/kjbutton.cpp:135
-msgid "Next"
-msgstr "Nesaf"
-
 #: modules/kjofol-skin/kjbutton.cpp:137
 msgid "Previous"
 msgstr "Cynt"
@@ -1301,232 +1147,387 @@ msgstr ""
 msgid "Return from dockmode"
 msgstr ""
 
-#: modules/kjofol-skin/kjloader.cpp:145
-msgid "There was trouble loading skin %1. Please select another skin file."
+#: modules/kjofol-skin/kjtextdisplay.cpp:66
+msgid "Welcome to Noatun"
 msgstr ""
 
-#: modules/voiceprint/prefs.cpp:12 modules/voiceprint/voiceprint.cpp:25
-msgid "Voiceprint"
-msgstr "Argraff Lais"
+#: modules/kjofol-skin/kjtextdisplay.cpp:177
+msgid "Filename"
+msgstr "Enw Ffeil"
 
-#: modules/voiceprint/prefs.cpp:12
-msgid "Options for the Voiceprint Visualization"
+#: modules/kjofol-skin/kjtextdisplay.cpp:335
+msgid "Play time left"
 msgstr ""
 
-#: modules/voiceprint/prefs.cpp:19
-msgid "&Foreground color:"
-msgstr "Lliw'r &blaendir:"
+#: modules/kjofol-skin/kjtextdisplay.cpp:337
+msgid "Current play time"
+msgstr ""
 
-#: modules/voiceprint/prefs.cpp:25
-msgid "&Background color:"
-msgstr "Lliw'r &cefndir:"
+#: modules/kjofol-skin/kjtextdisplay.cpp:643
+msgid "Sample rate in kHz"
+msgstr ""
 
-#: modules/voiceprint/prefs.cpp:31
-msgid "&Sweep color:"
+#: modules/kjofol-skin/kjtextdisplay.cpp:645
+msgid "Bitrate in kbps"
 msgstr ""
 
-#: modules/infrared/lirc.cpp:22
+#: library/noatuntags/tags.cpp:181
+msgid "Tagging"
+msgstr ""
+
+#: library/noatuntags/tags.cpp:181
+msgid "Settings for Tag Loaders"
+msgstr ""
+
+#: library/noatuntags/tags.cpp:184
+msgid "Rescan All Tags"
+msgstr ""
+
+#: library/noatuntags/tags.cpp:189
+msgid "Load tags &automatically"
+msgstr ""
+
+#: library/noatuntags/tags.cpp:202
 msgid ""
-"Could not create a socket to receive infrared signals. The error is:\n"
+"_: The time between each time noatun scans for a new file, and updates tags "
+"(e.g., ID3)\n"
+"Interval:"
 msgstr ""
 
-#: modules/infrared/lirc.cpp:30
+#: library/noatuntags/tags.cpp:210
 msgid ""
-"Could not establish a connection to receive infrared signals. The error is:\n"
+"_: Milliseconds\n"
+" ms"
+msgstr "meil"
+
+#: library/noatunstdaction.cpp:52
+msgid "Hide Playlist"
 msgstr ""
 
-#: modules/infrared/irprefs.cpp:55
-msgid "Infrared Control"
-msgstr "Rheolaeth Isgoch"
+#: library/noatunstdaction.cpp:71
+msgid "&Actions"
+msgstr "&Gweithredoedd"
 
-#: modules/infrared/irprefs.cpp:55
-msgid "Configure Infrared Commands"
+#: library/noatunstdaction.cpp:115 library/pluginmodule.cpp:179
+msgid "&Visualizations"
 msgstr ""
 
-#: modules/infrared/irprefs.cpp:60
-msgid "Remote control &commands:"
+#: library/noatunstdaction.cpp:163
+msgid "&Loop"
+msgstr "&Cylchu"
+
+#: library/noatunstdaction.cpp:242
+msgid "&Effects..."
+msgstr "E&ffeithiau ..."
+
+#: library/noatunstdaction.cpp:247
+msgid "E&qualizer..."
 msgstr ""
 
-#: modules/infrared/irprefs.cpp:66
-msgid "&Action:"
-msgstr "&Gweithred:"
+#: library/noatunstdaction.cpp:252
+msgid "&Back"
+msgstr "&Yn ôl"
 
-#: modules/infrared/irprefs.cpp:73
-msgid "&Repeat"
-msgstr "&Ail-adrodd"
+#: library/noatunstdaction.cpp:270
+msgid "&Forward"
+msgstr "&Ymlaen"
 
-#: modules/infrared/irprefs.cpp:77
-msgid "&Interval:"
+#: library/noatunstdaction.cpp:275
+msgid "&Play"
+msgstr "&Chwarae"
+
+#: library/noatunstdaction.cpp:288
+msgid "&Pause"
+msgstr "&Seibio"
+
+#: library/effectview.cpp:75
+msgid "Effects"
+msgstr "Effeithiau"
+
+#: library/effectview.cpp:104
+msgid "Effects - Noatun"
 msgstr ""
 
-#: modules/infrared/irprefs.cpp:132
-msgid "You do not have any remote control configured."
+#: library/effectview.cpp:112
+msgid "Available Effects"
 msgstr ""
 
-#: modules/infrared/irprefs.cpp:133
-msgid "Please make sure lirc is setup correctly."
+#: library/effectview.cpp:122
+msgid "Active Effects"
 msgstr ""
 
-#: modules/infrared/irprefs.cpp:137
-msgid "Connection could not be established."
+#: library/effectview.cpp:156
+msgid "Up"
+msgstr "I fyny"
+
+#: library/effectview.cpp:157
+msgid "Down"
+msgstr "I Lawr"
+
+#: library/effectview.cpp:170
+msgid ""
+"This shows all available effects.\n"
+"\n"
+"To activate a plugin, drag files from here to the active pane on the right."
 msgstr ""
 
-#: modules/infrared/irprefs.cpp:138
-msgid "Please make sure lirc is setup correctly and lircd is running."
+#: library/effectview.cpp:171
+msgid "This will place the selected effect at the bottom of your chain."
 msgstr ""
 
-#: modules/infrared/irprefs.cpp:144
-msgid "Button"
-msgstr "Botwm"
+#: library/effectview.cpp:172
+msgid ""
+"This shows your effect chain. Noatun supports an unlimited amount of effects in "
+"any order. You can even have the same effect twice.\n"
+"\n"
+"Drag the items to and from here to add and remove them, respectively. You may "
+"also reorder them with drag-and-drop. These actions can also be performed with "
+"the buttons to the right."
+msgstr ""
 
-#: modules/infrared/irprefs.cpp:145
-msgid "Action"
-msgstr "Gweithred"
+#: library/effectview.cpp:173
+msgid "Move the currently selected effect up in the chain."
+msgstr ""
 
-#: modules/infrared/irprefs.cpp:146
-msgid "Interval"
+#: library/effectview.cpp:174
+msgid "Move the currently selected effect down in the chain."
 msgstr ""
 
-#: modules/htmlexport/htmlexport.cpp:20
-msgid "&Export Playlist..."
+#: library/effectview.cpp:175
+msgid ""
+"Configure the currently selected effect.\n"
+"\n"
+"You can change things such as intensity from here."
 msgstr ""
 
-#: modules/htmlexport/htmlexport.cpp:42
-msgid "Export Playlist"
+#: library/effectview.cpp:176
+msgid "This will remove the selected effect from your chain."
 msgstr ""
 
-#: modules/htmlexport/htmlexport.cpp:60 modules/htmlexport/htmlexport.cpp:90
-msgid "Noatun Playlist"
+#: library/playlistsaver.cpp:110 library/playlistsaver.cpp:306
+#: library/playlistsaver.cpp:559
+#, c-format
+msgid "Stream from %1"
 msgstr ""
 
-#: modules/htmlexport/htmlexport.cpp:175
-msgid "Playlist Export"
+#: library/playlistsaver.cpp:751
+msgid "Stream from %1 (port: %2)"
 msgstr ""
 
-#: modules/htmlexport/htmlexport.cpp:175
-msgid "Colors & Settings for HTML Export"
+#: library/playlistsaver.cpp:753
+msgid "Stream from %1, (ip: %2, port: %3)"
 msgstr ""
 
-#: modules/htmlexport/htmlexport.cpp:201
-msgid "HTML Color Settings"
+#: library/downloader.cpp:101
+msgid "Unknown"
+msgstr "Anhysbys"
+
+#: library/pref.cpp:12
+msgid "Preferences - Noatun"
 msgstr ""
 
-#: modules/htmlexport/htmlexport.cpp:215
-msgid "Text:"
-msgstr "Testun:"
+#: library/pluginmodule.cpp:140
+msgid "Plugins"
+msgstr "Ategion"
 
-#: modules/htmlexport/htmlexport.cpp:219
-msgid "Background:"
-msgstr "Cefndir:"
+#: library/pluginmodule.cpp:140
+msgid "Select Your Plugins"
+msgstr ""
 
-#: modules/htmlexport/htmlexport.cpp:223
-msgid "Heading:"
+#: library/pluginmodule.cpp:148
+msgid "<b>Select one or more interfaces to use:</b>"
 msgstr ""
 
-#: modules/htmlexport/htmlexport.cpp:227
-msgid "Link hover:"
+#: library/pluginmodule.cpp:151 library/pluginmodule.cpp:163
+#: library/pluginmodule.cpp:174 library/pluginmodule.cpp:186
+msgid "Name"
+msgstr "Enw"
+
+#: library/pluginmodule.cpp:152 library/pluginmodule.cpp:164
+#: library/pluginmodule.cpp:175 library/pluginmodule.cpp:187
+msgid "Description"
+msgstr "Disgrifiad"
+
+#: library/pluginmodule.cpp:153 library/pluginmodule.cpp:165
+#: library/pluginmodule.cpp:176 library/pluginmodule.cpp:188
+msgid "Author"
+msgstr "Awdur"
+
+#: library/pluginmodule.cpp:154 library/pluginmodule.cpp:166
+#: library/pluginmodule.cpp:177 library/pluginmodule.cpp:189
+msgid "License"
+msgstr "Trwydded"
+
+#: library/pluginmodule.cpp:156
+msgid "&Interfaces"
+msgstr "&Rhyngwynebau"
+
+#: library/pluginmodule.cpp:160
+msgid "<b>Select one playlist to use:</b>"
 msgstr ""
 
-#: modules/htmlexport/htmlexport.cpp:248
-msgid "Background Image"
-msgstr "Delwedd Gefndir"
+#: library/pluginmodule.cpp:172
+msgid "<b>Select any visualizations to use:</b>"
+msgstr ""
 
-#: modules/htmlexport/htmlexport.cpp:259
-msgid "Hyper&link playlist entries to their URL"
+#: library/pluginmodule.cpp:184
+msgid "<b>Select any other plugins to use:</b>"
 msgstr ""
 
-#: modules/htmlexport/htmlexport.cpp:263
-msgid "&Number playlist entries"
+#: library/pluginmodule.cpp:191
+msgid "O&ther Plugins"
 msgstr ""
 
-#: modules/winskin/waSkin.cpp:451
-msgid "Seek to: %1/%2 (%3%)"
+#: library/pluginmodule.cpp:401
+msgid ""
+"<qt>Changing your playlist plugin will stop playback. Different playlists may "
+"use different methods of storing information, so after changing playlists you "
+"may have to recreate your playlist.</qt>"
 msgstr ""
 
-#: modules/winskin/waSkin.cpp:558
-msgid "Balance: Center"
+#: library/vequalizer.cpp:845
+msgid "Trance"
 msgstr ""
 
-#: modules/winskin/waSkin.cpp:561
-msgid "Balance: %1% Left"
+#: library/vequalizer.cpp:846
+msgid "Dance"
 msgstr ""
 
-#: modules/winskin/waSkin.cpp:563
-msgid "Balance: %1% Right"
+#: library/vequalizer.cpp:847
+msgid "Metal"
 msgstr ""
 
-#: modules/winskin/waSkin.cpp:675
-msgid "Volume: %1%"
+#: library/vequalizer.cpp:848
+msgid "Jazz"
+msgstr "Jazz"
+
+#: library/vequalizer.cpp:849
+msgid "Zero"
 msgstr ""
 
-#: modules/winskin/guiSpectrumAnalyser.cpp:37
-msgid "Visualization Mode"
+#: library/vequalizer.cpp:850
+msgid "Eclectic Guitar"
 msgstr ""
 
-#: modules/winskin/guiSpectrumAnalyser.cpp:38
-msgid "Analyzer Mode"
+#: library/equalizerview.cpp:45 library/equalizerview.cpp:51
+#: library/equalizerview.cpp:146 library/equalizerview.cpp:270
+msgid "Custom"
+msgstr "Addasiedig"
+
+#: library/equalizerview.cpp:284
+msgid "New Preset"
 msgstr ""
 
-#: modules/winskin/guiSpectrumAnalyser.cpp:40
-msgid "Analyzer"
+#: library/engine.cpp:257
+msgid "There was an error communicating to the aRts daemon."
 msgstr ""
 
-#: modules/winskin/guiSpectrumAnalyser.cpp:41
-msgid "Disabled"
-msgstr "Analluogir"
+#: library/engine.cpp:257
+msgid "aRts error"
+msgstr ""
 
-#: modules/winskin/guiSpectrumAnalyser.cpp:45
-msgid "Normal"
-msgstr "Arferol"
+#: library/engine.cpp:577
+msgid ""
+"Connecting/starting aRts soundserver failed. Make sure that artsd is configured "
+"properly."
+msgstr ""
 
-#: modules/winskin/guiSpectrumAnalyser.cpp:46
-msgid "Fire"
+#: library/video.cpp:119
+msgid "Video - Noatun"
 msgstr ""
 
-#: modules/winskin/guiSpectrumAnalyser.cpp:47
-msgid "Vertical Lines"
-msgstr "Llinellau Fertigol"
+#: library/cmodule.cpp:32
+msgid "General"
+msgstr "Cyffredinol"
 
-#: modules/winskin/winSkinConfig.cpp:27
-msgid "Winskin"
+#: library/cmodule.cpp:32
+msgid "General Options"
+msgstr "Dewisiadau Cyffredinol"
+
+#: library/cmodule.cpp:34
+msgid "&Return to start of playlist on finish"
 msgstr ""
 
-#: modules/winskin/winSkinConfig.cpp:28
-msgid "Skin Selection for the Winskin Plugin"
+#: library/cmodule.cpp:36
+msgid ""
+"When the playlist is finished playing, return to the start, but do not start "
+"playing."
 msgstr ""
 
-#: modules/winskin/winSkinConfig.cpp:43
-msgid "&Install New Skin..."
+#: library/cmodule.cpp:38
+msgid "Allow only one &instance of Noatun"
 msgstr ""
 
-#: modules/winskin/winSkinConfig.cpp:46
-msgid "&Remove Skin"
+#: library/cmodule.cpp:40
+msgid ""
+"Starting noatun a second time will cause it to just append items from the start "
+"to the current instance."
 msgstr ""
 
-#: modules/winskin/winSkinConfig.cpp:58
-msgid "Settings"
-msgstr "Gosodiadau"
+#: library/cmodule.cpp:42
+msgid "Clear playlist &when opening a file"
+msgstr ""
 
-#: modules/winskin/winSkinConfig.cpp:62
-msgid "T&itle scrolling speed:"
+#: library/cmodule.cpp:44
+msgid ""
+"Opening a file with the global Open menu item will clear the playlist first."
 msgstr ""
 
-#: modules/winskin/winSkinConfig.cpp:159
-msgid "You cannot remove this skin."
+#: library/cmodule.cpp:46
+msgid "&Use fast hardware volume control"
 msgstr ""
 
-#: modules/winskin/winSkinConfig.cpp:166
-msgid "<qt>Are you sure you want to remove the <b>%1</b> skin?</qt>"
+#: library/cmodule.cpp:48
+msgid ""
+"Use the hardware mixer instead of aRts'. It affects all streams, not just "
+"Noatun's, but is a little faster."
 msgstr ""
 
-#: modules/noatunui/userinterface.cpp:73
-msgid "Change loop style"
+#: library/cmodule.cpp:50
+msgid "Display &remaining play time"
 msgstr ""
 
-#: modules/noatunui/userinterface.cpp:104
-#: modules/noatunui/userinterface.cpp:218
-msgid "No File Loaded"
-msgstr "Heb Lwytho Ffeil"
+#: library/cmodule.cpp:52
+msgid ""
+"Counters count down towards zero, showing remaining time instead of elapsed "
+"time."
+msgstr ""
+
+#: library/cmodule.cpp:54
+msgid "Title &format:"
+msgstr ""
+
+#: library/cmodule.cpp:59
+msgid ""
+"Select a title to use for each file (in the playlist and user interface). Each "
+"element such as $(title) is replaced with the property with the name as given "
+"in the parentheses. The properties include, but are not limited to: title, "
+"author, date, comments and album."
+msgstr ""
+
+#: library/cmodule.cpp:64
+msgid "&Download folder:"
+msgstr ""
+
+#: library/cmodule.cpp:69
+msgid "When opening a non-local file, download it to the selected folder."
+msgstr ""
+
+#: library/cmodule.cpp:71
+msgid "Play Behavior on Startup"
+msgstr ""
+
+#: library/cmodule.cpp:74
+msgid "Restore &play state"
+msgstr ""
+
+#: library/cmodule.cpp:78
+msgid "Automatically play &first file"
+msgstr ""
+
+#: library/cmodule.cpp:82
+msgid "&Do not start playing"
+msgstr ""
 
 #~ msgid "Blink"
 #~ msgstr "Amrantu"
diff --git a/tde-i18n-cy/messages/tdemultimedia/tdefile_au.po b/tde-i18n-cy/messages/tdemultimedia/tdefile_au.po
index f889a8d39c4..74fd97b86ce 100644
--- a/tde-i18n-cy/messages/tdemultimedia/tdefile_au.po
+++ b/tde-i18n-cy/messages/tdemultimedia/tdefile_au.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdemultimedia/tdefile_au.po\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdemultimedia/tdefile_avi.po b/tde-i18n-cy/messages/tdemultimedia/tdefile_avi.po
index 94746474706..6d0f4a4abab 100644
--- a/tde-i18n-cy/messages/tdemultimedia/tdefile_avi.po
+++ b/tde-i18n-cy/messages/tdemultimedia/tdefile_avi.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdemultimedia/tdefile_avi.po\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdemultimedia/tdefile_flac.po b/tde-i18n-cy/messages/tdemultimedia/tdefile_flac.po
index ab30c575b63..dbe300e0ba3 100644
--- a/tde-i18n-cy/messages/tdemultimedia/tdefile_flac.po
+++ b/tde-i18n-cy/messages/tdemultimedia/tdefile_flac.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdemultimedia/tdefile_flac.po\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdemultimedia/tdefile_m3u.po b/tde-i18n-cy/messages/tdemultimedia/tdefile_m3u.po
index 29879202a44..f3714ca5319 100644
--- a/tde-i18n-cy/messages/tdemultimedia/tdefile_m3u.po
+++ b/tde-i18n-cy/messages/tdemultimedia/tdefile_m3u.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdemultimedia/tdefile_m3u.po\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdemultimedia/tdefile_mp3.po b/tde-i18n-cy/messages/tdemultimedia/tdefile_mp3.po
index cb9d600f2a8..ef8044dde7e 100644
--- a/tde-i18n-cy/messages/tdemultimedia/tdefile_mp3.po
+++ b/tde-i18n-cy/messages/tdemultimedia/tdefile_mp3.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdemultimedia/tdefile_mp3.po\n"
-"POT-Creation-Date: 2005-05-26 01:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdemultimedia/tdefile_mpc.po b/tde-i18n-cy/messages/tdemultimedia/tdefile_mpc.po
index 0c9b57ce2fb..a8c4134b6c5 100644
--- a/tde-i18n-cy/messages/tdemultimedia/tdefile_mpc.po
+++ b/tde-i18n-cy/messages/tdemultimedia/tdefile_mpc.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdemultimedia/tdefile_mpc.po\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdemultimedia/tdefile_mpeg.po b/tde-i18n-cy/messages/tdemultimedia/tdefile_mpeg.po
index 43b89b6fb32..1e8f4be9f9e 100644
--- a/tde-i18n-cy/messages/tdemultimedia/tdefile_mpeg.po
+++ b/tde-i18n-cy/messages/tdemultimedia/tdefile_mpeg.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2006-08-16 04:08+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdemultimedia/tdefile_ogg.po b/tde-i18n-cy/messages/tdemultimedia/tdefile_ogg.po
index f8dcb8e7deb..51c3ebfce65 100644
--- a/tde-i18n-cy/messages/tdemultimedia/tdefile_ogg.po
+++ b/tde-i18n-cy/messages/tdemultimedia/tdefile_ogg.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdemultimedia/tdefile_ogg.po\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -81,7 +82,8 @@ msgstr " Hz"
 msgid "Upper Bitrate"
 msgstr ""
 
-#: tdefile_ogg.cpp:131 tdefile_ogg.cpp:135 tdefile_ogg.cpp:139 tdefile_ogg.cpp:145
+#: tdefile_ogg.cpp:131 tdefile_ogg.cpp:135 tdefile_ogg.cpp:139
+#: tdefile_ogg.cpp:145
 msgid " kbps"
 msgstr ""
 
diff --git a/tde-i18n-cy/messages/tdemultimedia/tdefile_sid.po b/tde-i18n-cy/messages/tdemultimedia/tdefile_sid.po
index e2e98fef070..e99bf667042 100644
--- a/tde-i18n-cy/messages/tdemultimedia/tdefile_sid.po
+++ b/tde-i18n-cy/messages/tdemultimedia/tdefile_sid.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdemultimedia/tdefile_sid.po\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdemultimedia/tdefile_theora.po b/tde-i18n-cy/messages/tdemultimedia/tdefile_theora.po
index 31efdb0a1cf..da07e100cb8 100644
--- a/tde-i18n-cy/messages/tdemultimedia/tdefile_theora.po
+++ b/tde-i18n-cy/messages/tdemultimedia/tdefile_theora.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: all.po\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdemultimedia/tdefile_wav.po b/tde-i18n-cy/messages/tdemultimedia/tdefile_wav.po
index 00d22d41839..4ca4839a9af 100644
--- a/tde-i18n-cy/messages/tdemultimedia/tdefile_wav.po
+++ b/tde-i18n-cy/messages/tdemultimedia/tdefile_wav.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdemultimedia/tdefile_wav.po\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdemultimedia/tdeio_audiocd.po b/tde-i18n-cy/messages/tdemultimedia/tdeio_audiocd.po
index 9ceb85aa1b1..ed65e072cdb 100644
--- a/tde-i18n-cy/messages/tdemultimedia/tdeio_audiocd.po
+++ b/tde-i18n-cy/messages/tdemultimedia/tdeio_audiocd.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdemultimedia/tdeio_audiocd.po\n"
-"POT-Creation-Date: 2007-01-19 02:40+0100\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -29,29 +30,29 @@ msgstr "Enw protocol"
 msgid "Socket name"
 msgstr "Enw soced"
 
-#: audiocd.cpp:110
+#: audiocd.cpp:109
 msgid "Full CD"
 msgstr ""
 
-#: audiocd.cpp:201
+#: audiocd.cpp:200
 msgid ""
 "You cannot specify a host with this protocol. Please use the audiocd:/ format "
 "instead."
 msgstr ""
 
-#: audiocd.cpp:755
+#: audiocd.cpp:754
 msgid ""
 "Device doesn't have read permissions for this account.  Check the read "
 "permissions on the device."
 msgstr ""
 
-#: audiocd.cpp:757
+#: audiocd.cpp:756
 msgid ""
 "Device doesn't have write permissions for this account.  Check the write "
 "permissions on the device."
 msgstr ""
 
-#: audiocd.cpp:761
+#: audiocd.cpp:760
 msgid ""
 "Unknown error.  If you have a cd in the drive try running cdparanoia -vsQ as "
 "yourself (not root). Do you see a track list? If not, make sure you have "
@@ -62,19 +63,19 @@ msgid ""
 "(or similar) to tell tdeio_audiocd which device your CD-ROM is."
 msgstr ""
 
-#: audiocd.cpp:835
+#: audiocd.cpp:834
 msgid "AudioCD: Disk damage detected on this track, risk of data corruption."
 msgstr ""
 
-#: audiocd.cpp:841
+#: audiocd.cpp:840
 msgid "Error reading audio data for %1 from the CD"
 msgstr ""
 
-#: audiocd.cpp:851 audiocd.cpp:929
+#: audiocd.cpp:850 audiocd.cpp:928
 msgid "Couldn't read %1: encoding failed"
 msgstr ""
 
-#: audiocd.cpp:1061
+#: audiocd.cpp:1060
 #, c-format
 msgid "Track %1"
 msgstr ""
diff --git a/tde-i18n-cy/messages/tdemultimedia/tdemid.po b/tde-i18n-cy/messages/tdemultimedia/tdemid.po
index c5fdba729d8..eaac8a04827 100644
--- a/tde-i18n-cy/messages/tdemultimedia/tdemid.po
+++ b/tde-i18n-cy/messages/tdemultimedia/tdemid.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdemultimedia/tdemid.po\n"
-"POT-Creation-Date: 2005-08-24 02:38+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -98,6 +99,46 @@ msgstr ""
 msgid "Enter the name of the selected collection:"
 msgstr ""
 
+#: main.cpp:63
+msgid "File to open"
+msgstr "Ffeil i agor"
+
+#: midicfgdlg.cpp:42
+msgid "Configure MIDI Devices"
+msgstr ""
+
+#: midicfgdlg.cpp:49
+msgid "Select the MIDI device you want to use:"
+msgstr "Dewiswch y dyfais MIDI yr ydych eisiau ei ddefnyddio:"
+
+#: midicfgdlg.cpp:68
+msgid "Use the MIDI map:"
+msgstr ""
+
+#: midicfgdlg.cpp:82 midicfgdlg.cpp:92 midicfgdlg.cpp:132
+msgid "None"
+msgstr "Dim"
+
+#: midicfgdlg.cpp:117 tdemidframe.cpp:286 tdemidframe.cpp:561
+msgid "Only local files are currently supported."
+msgstr "Cynhelir ffeiliau lleol yn unig."
+
+#. i18n: file tdemidui.rc line 7
+#: rc.cpp:6
+#, no-c-format
+msgid "&Song"
+msgstr ""
+
+#. i18n: file tdemidui.rc line 15
+#: rc.cpp:9
+#, no-c-format
+msgid "&Collections"
+msgstr ""
+
+#: slman.cpp:225
+msgid "Temporary Collection"
+msgstr ""
+
 #: tdemid_part.cpp:51
 msgid "MIDI/Karaoke file player"
 msgstr ""
@@ -277,10 +318,6 @@ msgstr ""
 msgid "MIDI &Setup..."
 msgstr ""
 
-#: tdemidframe.cpp:286 tdemidframe.cpp:561 midicfgdlg.cpp:117
-msgid "Only local files are currently supported."
-msgstr "Cynhelir ffeiliau lleol yn unig."
-
 #: tdemidframe.cpp:469
 msgid ""
 "Could not open /dev/sequencer to get some info.\n"
@@ -297,42 +334,6 @@ msgstr ""
 msgid "Overwrite"
 msgstr "Trosysgrifo"
 
-#: main.cpp:63
-msgid "File to open"
-msgstr "Ffeil i agor"
-
-#: midicfgdlg.cpp:42
-msgid "Configure MIDI Devices"
-msgstr ""
-
-#: midicfgdlg.cpp:49
-msgid "Select the MIDI device you want to use:"
-msgstr "Dewiswch y dyfais MIDI yr ydych eisiau ei ddefnyddio:"
-
-#: midicfgdlg.cpp:68
-msgid "Use the MIDI map:"
-msgstr ""
-
-#: midicfgdlg.cpp:82 midicfgdlg.cpp:92 midicfgdlg.cpp:132
-msgid "None"
-msgstr "Dim"
-
-#. i18n: file tdemidui.rc line 7
-#: rc.cpp:6
-#, no-c-format
-msgid "&Song"
-msgstr ""
-
-#. i18n: file tdemidui.rc line 15
-#: rc.cpp:9
-#, no-c-format
-msgid "&Collections"
-msgstr ""
-
-#: slman.cpp:225
-msgid "Temporary Collection"
-msgstr ""
-
 #: instrname.i18n:6
 msgid "Acoustic Grand Piano"
 msgstr ""
diff --git a/tde-i18n-cy/messages/tdenetwork/dcoprss.po b/tde-i18n-cy/messages/tdenetwork/dcoprss.po
index 9f25b383928..92dff869295 100644
--- a/tde-i18n-cy/messages/tdenetwork/dcoprss.po
+++ b/tde-i18n-cy/messages/tdenetwork/dcoprss.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dcopservice\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2004-01-06 09:31+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdenetwork/kcm_krfb.po b/tde-i18n-cy/messages/tdenetwork/kcm_krfb.po
index 510fdfe1890..c5102d14d97 100644
--- a/tde-i18n-cy/messages/tdenetwork/kcm_krfb.po
+++ b/tde-i18n-cy/messages/tdenetwork/kcm_krfb.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcm_krfb\n"
-"POT-Creation-Date: 2008-01-11 01:16+0100\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2004-01-08 20:15+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdenetwork/kcmktalkd.po b/tde-i18n-cy/messages/tdenetwork/kcmktalkd.po
index b9eee8a1731..64d96883df7 100644
--- a/tde-i18n-cy/messages/tdenetwork/kcmktalkd.po
+++ b/tde-i18n-cy/messages/tdenetwork/kcmktalkd.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmktalkd\n"
-"POT-Creation-Date: 2005-08-24 02:37+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2004-01-06 11:58+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdenetwork/kcmlanbrowser.po b/tde-i18n-cy/messages/tdenetwork/kcmlanbrowser.po
index 7e7191bddc2..41f0a8d1db7 100644
--- a/tde-i18n-cy/messages/tdenetwork/kcmlanbrowser.po
+++ b/tde-i18n-cy/messages/tdenetwork/kcmlanbrowser.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmlanbrowser\n"
-"POT-Creation-Date: 2005-08-10 10:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2004-01-06 12:12+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -553,40 +554,40 @@ msgstr ""
 "Ffurfweddwyd yr ellyll ResLISa yn gywir nawr, gobeithio."
 "<br>Sicrhewch bod deuolyn reslisa wedi'i sefydlu <i>suid root</i>."
 
-#: kcmkiolan.cpp:41
+#: kcmtdeiolan.cpp:41
 msgid "Show Links for Following Services"
 msgstr ""
 
-#: kcmkiolan.cpp:43
+#: kcmtdeiolan.cpp:43
 #, fuzzy
 msgid "FTP (TCP, port 21): "
 msgstr "Dangos Cysylltau Gwasanaeth FTP (TCP, porth 21)"
 
-#: kcmkiolan.cpp:44
+#: kcmtdeiolan.cpp:44
 #, fuzzy
 msgid "HTTP (TCP, port 80): "
 msgstr "Dangos Cysylltau Gwasanaeth HTTP (TCP, porth 80)"
 
-#: kcmkiolan.cpp:45
+#: kcmtdeiolan.cpp:45
 #, fuzzy
 msgid "NFS (TCP, port 2049): "
 msgstr "Dangos Cysylltau Gwasanaeth NFS (TCP, porth 2049)"
 
-#: kcmkiolan.cpp:46
+#: kcmtdeiolan.cpp:46
 #, fuzzy
 msgid "Windows shares (TCP, ports 445 and 139):"
 msgstr "Dangos Cysylltau Gwasanaeth SMB (TCP, porth 139)"
 
-#: kcmkiolan.cpp:47
+#: kcmtdeiolan.cpp:47
 msgid "Secure Shell/Fish (TCP, port 22): "
 msgstr ""
 
-#: kcmkiolan.cpp:48
+#: kcmtdeiolan.cpp:48
 #, fuzzy
 msgid "Show &short hostnames (without domain suffix)"
 msgstr "Dangos enwau &byr gwesteiwyr (heb ôl-ddodiad parth)"
 
-#: kcmkiolan.cpp:51
+#: kcmtdeiolan.cpp:51
 msgid "Default LISa server host: "
 msgstr ""
 
diff --git a/tde-i18n-cy/messages/tdenetwork/kcmwifi.po b/tde-i18n-cy/messages/tdenetwork/kcmwifi.po
index 0f75eab7bb6..de99149b3df 100644
--- a/tde-i18n-cy/messages/tdenetwork/kcmwifi.po
+++ b/tde-i18n-cy/messages/tdenetwork/kcmwifi.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmwifi\n"
-"POT-Creation-Date: 2006-11-25 02:36+0100\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2004-01-06 12:28+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -621,10 +622,9 @@ msgid ""
 "Center module."
 msgstr ""
 
-#: wificonfig.cpp:239 wificonfig.cpp:261 wificonfig.cpp:280
 #, fuzzy
-msgid "Unable to autodetect wireless interface."
-msgstr "Canfod Rhyngwyneb yn Ymysgogol"
+#~ msgid "Unable to autodetect wireless interface."
+#~ msgstr "Canfod Rhyngwyneb yn Ymysgogol"
 
 #, fuzzy
 #~ msgid "ConfigCrypto"
diff --git a/tde-i18n-cy/messages/tdenetwork/kdict.po b/tde-i18n-cy/messages/tdenetwork/kdict.po
index 2565912e731..8a7173d6f10 100644
--- a/tde-i18n-cy/messages/tdenetwork/kdict.po
+++ b/tde-i18n-cy/messages/tdenetwork/kdict.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kdict\n"
-"POT-Creation-Date: 2005-05-16 01:23+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2004-01-06 12:38+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdenetwork/kdictapplet.po b/tde-i18n-cy/messages/tdenetwork/kdictapplet.po
index 711105e8367..3441d562573 100644
--- a/tde-i18n-cy/messages/tdenetwork/kdictapplet.po
+++ b/tde-i18n-cy/messages/tdenetwork/kdictapplet.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kdictapplet\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2004-01-06 12:41+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdenetwork/kget.po b/tde-i18n-cy/messages/tdenetwork/kget.po
index 9b1b957b677..8870b61810b 100644
--- a/tde-i18n-cy/messages/tdenetwork/kget.po
+++ b/tde-i18n-cy/messages/tdenetwork/kget.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kget\n"
-"POT-Creation-Date: 2008-07-08 01:20+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2004-01-15 16:48+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -144,6 +145,419 @@ msgstr "Lleihau"
 msgid "Sticky"
 msgstr "Gludiog"
 
+#: logwindow.cpp:96
+msgid "Id"
+msgstr "Dynodiad (Id)"
+
+#: logwindow.cpp:97
+msgid "Name"
+msgstr "Enw"
+
+#: logwindow.cpp:159
+msgid "Log Window"
+msgstr "Ffenestr Gofnodion"
+
+#: logwindow.cpp:163
+msgid "Mixed"
+msgstr "Cymysg"
+
+#: logwindow.cpp:172
+msgid "Separated"
+msgstr "Ar wahan"
+
+#: main.cpp:44
+#, fuzzy
+msgid "An advanced download manager for TDE"
+msgstr "Trefnydd lawrlwytho uwch ar gyfer TDE"
+
+#: main.cpp:50
+msgid "Start KGet with drop target"
+msgstr "Dechrau KGet â tharged ollwng"
+
+#: main.cpp:51
+#, fuzzy
+msgid "URL(s) to download"
+msgstr "URL(au) i'w lawrlwytho."
+
+#: kget_plug_in/kget_linkview.cpp:43 main.cpp:199
+msgid "KGet"
+msgstr "KGet"
+
+#. i18n: file dlgadvancedbase.ui line 27
+#: rc.cpp:3
+#, no-c-format
+msgid "Advanced Options"
+msgstr "Dewisiadau Uwch"
+
+#. i18n: file dlgadvancedbase.ui line 38
+#: rc.cpp:6
+#, no-c-format
+msgid "Add new transfers as:"
+msgstr "Ychwanegu trosglwyddiadau newydd  fel:"
+
+#. i18n: file dlgadvancedbase.ui line 63
+#: rc.cpp:9
+#, no-c-format
+msgid "Iconified"
+msgstr "Eiconeiddio"
+
+#. i18n: file dlgadvancedbase.ui line 71
+#: rc.cpp:12
+#, no-c-format
+msgid "Advanced individual windows"
+msgstr "Ffenestri unigol uwch"
+
+#. i18n: file dlgadvancedbase.ui line 79
+#: rc.cpp:15
+#, no-c-format
+msgid "Mark partial downloads"
+msgstr "Nodi lawrlwythiadau rhannol"
+
+#. i18n: file dlgadvancedbase.ui line 87
+#: rc.cpp:18
+#, no-c-format
+msgid "Remove files from a list after success"
+msgstr "Tynnu ffeiliau cyflawn o restr "
+
+#. i18n: file dlgadvancedbase.ui line 95
+#: rc.cpp:21
+#, no-c-format
+msgid "Get file sizes"
+msgstr "Nôl maint ffeieliau"
+
+#. i18n: file dlgadvancedbase.ui line 103
+#: rc.cpp:24
+#, fuzzy, no-c-format
+msgid "Expert mode (do not prompt for Cancel or Delete)"
+msgstr "Modd uwch (dim anogiad am Ddileu na Ddiddymu)"
+
+#. i18n: file dlgadvancedbase.ui line 111
+#: rc.cpp:27
+#, no-c-format
+msgid "Use KGet as Download Manager for Konqueror"
+msgstr ""
+
+#. i18n: file dlgadvancedbase.ui line 119
+#: rc.cpp:30
+#, no-c-format
+msgid "Show main window at startup"
+msgstr "Dangos y brif ffenestr wrth gychwyn"
+
+#. i18n: file dlgadvancedbase.ui line 127
+#: rc.cpp:33
+#, no-c-format
+msgid "Show individual windows"
+msgstr "Dangos ffenestri unigol"
+
+#. i18n: file dlgadvancedbase.ui line 158
+#: rc.cpp:36
+#, no-c-format
+msgid "Queued"
+msgstr "Wedi rhesi"
+
+#. i18n: file dlgadvancedbase.ui line 166
+#: rc.cpp:39
+#, no-c-format
+msgid "Delayed"
+msgstr "Oediad"
+
+#. i18n: file dlgautomationbase.ui line 27
+#: rc.cpp:42
+#, no-c-format
+msgid "Automation Options"
+msgstr "Dewisiadau Ymysgogi"
+
+#. i18n: file dlgautomationbase.ui line 38
+#: rc.cpp:45 rc.cpp:78 rc.cpp:93 rc.cpp:99
+#, no-c-format
+msgid " min"
+msgstr "mun"
+
+#. i18n: file dlgautomationbase.ui line 52
+#: rc.cpp:48
+#, no-c-format
+msgid "Auto disconnect after completing downloads"
+msgstr "Datgysylltu'n ymysgogol ar ôl cwblhau lawrlwytho"
+
+#. i18n: file dlgautomationbase.ui line 60
+#: rc.cpp:51
+#, no-c-format
+msgid "Autosave file list every:"
+msgstr "Cadw'r rhestr ffeiliau'n ymysgogol bob:"
+
+#. i18n: file dlgautomationbase.ui line 68
+#: rc.cpp:54
+#, no-c-format
+msgid "Timed disconnect"
+msgstr "Datgysylltiad Amseredig"
+
+#. i18n: file dlgautomationbase.ui line 76
+#: rc.cpp:57
+#, no-c-format
+msgid "Disconnect command:"
+msgstr "Gorchymyn Datgysylltu:"
+
+#. i18n: file dlgautomationbase.ui line 94
+#: rc.cpp:60
+#, no-c-format
+msgid "Auto paste from clipboard"
+msgstr "Gludo ymysgogol o'r clipfwrdd"
+
+#. i18n: file dlgautomationbase.ui line 102
+#: rc.cpp:63
+#, no-c-format
+msgid "Auto shutdown after completing downloads"
+msgstr "Cau'n ymysgogol wedi gorffen lawrlwytho"
+
+#. i18n: file dlgconnectionbase.ui line 27
+#: rc.cpp:66
+#, no-c-format
+msgid "Reconnect Options"
+msgstr "Dewisiadau Ailgysylltu"
+
+#. i18n: file dlgconnectionbase.ui line 38
+#: rc.cpp:69
+#, no-c-format
+msgid "On login or timeout error"
+msgstr "Ar wall mewngofnodi neu oramser"
+
+#. i18n: file dlgconnectionbase.ui line 46
+#: rc.cpp:72
+#, no-c-format
+msgid "Reconnect after:"
+msgstr "Ailgysylltu ar ôl:"
+
+#. i18n: file dlgconnectionbase.ui line 54
+#: rc.cpp:75
+#, no-c-format
+msgid "Number of retries:"
+msgstr "Nifer ail-geisiau:"
+
+#. i18n: file dlgconnectionbase.ui line 84
+#: rc.cpp:81
+#, no-c-format
+msgid "On broken connection"
+msgstr "Ar gysylltiad dorredig"
+
+#. i18n: file dlgconnectionbase.ui line 128
+#: rc.cpp:84
+#, no-c-format
+msgid "Timeout Options"
+msgstr "Dewisiadau Goramser"
+
+#. i18n: file dlgconnectionbase.ui line 156
+#: rc.cpp:87
+#, no-c-format
+msgid "If no data arrives in:"
+msgstr "Os na gyrhaedda data o fewn:"
+
+#. i18n: file dlgconnectionbase.ui line 164
+#: rc.cpp:90
+#, fuzzy, no-c-format
+msgid "If server cannot resume:"
+msgstr "Os na all y gweinydd barhau:"
+
+#. i18n: file dlgconnectionbase.ui line 203
+#: rc.cpp:96
+#, no-c-format
+msgid "or"
+msgstr "neu"
+
+#. i18n: file dlgconnectionbase.ui line 227
+#: rc.cpp:102
+#, no-c-format
+msgid "Connection Type"
+msgstr "Math Cysylltiad"
+
+#. i18n: file dlgconnectionbase.ui line 236
+#: rc.cpp:105
+#, no-c-format
+msgid "Permanent"
+msgstr "Parhaol"
+
+#. i18n: file dlgconnectionbase.ui line 241
+#: rc.cpp:108
+#, no-c-format
+msgid "Ethernet"
+msgstr "Ethernet"
+
+#. i18n: file dlgconnectionbase.ui line 246
+#: rc.cpp:111
+#, no-c-format
+msgid "PLIP"
+msgstr "PLIP"
+
+#. i18n: file dlgconnectionbase.ui line 251
+#: rc.cpp:114
+#, no-c-format
+msgid "SLIP"
+msgstr "SLIP"
+
+#. i18n: file dlgconnectionbase.ui line 256
+#: rc.cpp:117
+#, no-c-format
+msgid "PPP"
+msgstr "PPP"
+
+#. i18n: file dlgconnectionbase.ui line 261
+#: rc.cpp:120
+#, no-c-format
+msgid "ISDN"
+msgstr "ISDN"
+
+#. i18n: file dlgconnectionbase.ui line 273
+#: rc.cpp:123
+#, no-c-format
+msgid "Offline mode"
+msgstr "Modd All-lein"
+
+#. i18n: file dlgconnectionbase.ui line 298
+#: rc.cpp:126
+#, no-c-format
+msgid "Link number:"
+msgstr "Rhif Cyswllt:"
+
+#. i18n: file dlgdirectoriesbase.ui line 78
+#: rc.cpp:129
+#, no-c-format
+msgid "Extension"
+msgstr "Estyniad"
+
+#. i18n: file dlgdirectoriesbase.ui line 89
+#: rc.cpp:132
+#, no-c-format
+msgid "Default Folder"
+msgstr "Plygell Ragosodedig"
+
+#. i18n: file dlgdirectoriesbase.ui line 186
+#: rc.cpp:144
+#, no-c-format
+msgid "Extension (* for all files):"
+msgstr ""
+
+#. i18n: file dlgdirectoriesbase.ui line 199
+#: rc.cpp:147
+#, fuzzy, no-c-format
+msgid "Default folder:"
+msgstr "Plygell Ragosodedig"
+
+#. i18n: file dlglimitsbase.ui line 27
+#: rc.cpp:150
+#, no-c-format
+msgid "Limits Options"
+msgstr "Dewisiadau Terfynnau"
+
+#. i18n: file dlglimitsbase.ui line 38
+#: rc.cpp:153
+#, no-c-format
+msgid "Maximum open connections:"
+msgstr "Uchafswm cysylltiadau wedi'u hagor:"
+
+#. i18n: file dlglimitsbase.ui line 46
+#: rc.cpp:156
+#, no-c-format
+msgid "Minimum network bandwidth:"
+msgstr "Isafswm ystod rhwydwaith:"
+
+#. i18n: file dlglimitsbase.ui line 54
+#: rc.cpp:159
+#, no-c-format
+msgid "Maximum network bandwidth:"
+msgstr "Uchafswm ystod rhwydwaith:"
+
+#. i18n: file dlglimitsbase.ui line 70
+#: rc.cpp:162 rc.cpp:165
+#, no-c-format
+msgid " bytes/sec"
+msgstr "beit/eil"
+
+#. i18n: file dlgsystembase.ui line 27
+#: rc.cpp:168
+#, no-c-format
+msgid "Use animation"
+msgstr "Defnyddio bywlunio"
+
+#. i18n: file dlgsystembase.ui line 38
+#: rc.cpp:171
+#, no-c-format
+msgid "Window style:"
+msgstr "Arddull ffenestr:"
+
+#. i18n: file dlgsystembase.ui line 46
+#: rc.cpp:174
+#, no-c-format
+msgid "Font:"
+msgstr "Wynebfath:"
+
+#. i18n: file dlgsystembase.ui line 79
+#: rc.cpp:177
+#, no-c-format
+msgid "Normal"
+msgstr "Arferol"
+
+#. i18n: file dlgsystembase.ui line 87
+#: rc.cpp:180
+#, no-c-format
+msgid "Docked"
+msgstr "Wedi'i Ddocio"
+
+#. i18n: file dlgsystembase.ui line 95
+#: rc.cpp:183
+#, no-c-format
+msgid "Drop target"
+msgstr "Targed ollwng"
+
+#. i18n: file kgetui.rc line 14
+#: rc.cpp:189
+#, no-c-format
+msgid "&Transfer"
+msgstr "&Trosglwyddo"
+
+#: safedelete.cpp:18
+msgid ""
+"Not deleting\n"
+"%1\n"
+"as it is a directory."
+msgstr ""
+"Ddim yn dileu\n"
+" %1\n"
+" gan ei fod yn gyfeiriadur."
+
+#: safedelete.cpp:20 safedelete.cpp:32
+msgid "Not Deleted"
+msgstr "Heb ei Ddileu"
+
+#: safedelete.cpp:30
+msgid ""
+"Not deleting\n"
+"%1\n"
+"as it is not a local file."
+msgstr ""
+"Ddim yn dileu\n"
+" %1\n"
+" gan na'i fod yn ffeil lleol."
+
+#: settings.cpp:131
+#, fuzzy
+msgid ""
+"This is the first time that you have run KGet.\n"
+"Do you want to use KGet as Download Manager for Konqueror?"
+msgstr ""
+"Dyma'r tro cyntaf i chi redeg KGet.\n"
+" A ydych am weithredoli'r cyfuno â Konqueror?"
+
+#: settings.cpp:131
+msgid "Konqueror Integration"
+msgstr "Cyfuno â Konqueror"
+
+#: settings.cpp:131
+msgid "Enable"
+msgstr "Galluogi"
+
+#: settings.cpp:131
+msgid "Do Not Enable"
+msgstr ""
+
 #: tdefileio.cpp:45
 #, c-format
 msgid ""
@@ -258,7 +672,7 @@ msgstr "Croeso i KGet"
 msgid "Could not create valid socket"
 msgstr "Methwyd creu soced ddilys."
 
-#: tdemainwidget.cpp:253 tdemainwidget.cpp:1765 tdemainwidget.cpp:2247
+#: tdemainwidget.cpp:253 tdemainwidget.cpp:1763 tdemainwidget.cpp:2247
 msgid "Offline"
 msgstr "All-lein"
 
@@ -294,27 +708,27 @@ msgstr "Symud i'r &Dechrau"
 msgid "Move to &End"
 msgstr "Symud i'r Di&wedd"
 
-#: tdemainwidget.cpp:366 transfer.cpp:127
+#: tdemainwidget.cpp:366 transfer.cpp:129
 msgid "&Resume"
 msgstr "&Parhau"
 
-#: tdemainwidget.cpp:367 transfer.cpp:129
+#: tdemainwidget.cpp:367 transfer.cpp:131
 msgid "&Pause"
 msgstr "&Seibio"
 
-#: tdemainwidget.cpp:369 transfer.cpp:133
+#: tdemainwidget.cpp:369 transfer.cpp:135
 msgid "Re&start"
 msgstr "Ail-&ddechrau"
 
-#: tdemainwidget.cpp:371 transfer.cpp:135
+#: tdemainwidget.cpp:371 transfer.cpp:137
 msgid "&Queue"
 msgstr "&Rhesu"
 
-#: tdemainwidget.cpp:372 transfer.cpp:137
+#: tdemainwidget.cpp:372 transfer.cpp:139
 msgid "&Timer"
 msgstr "&Amserydd"
 
-#: tdemainwidget.cpp:373 transfer.cpp:139
+#: tdemainwidget.cpp:373 transfer.cpp:141
 msgid "De&lay"
 msgstr "&Oediad"
 
@@ -355,23 +769,23 @@ msgstr "Dangos Ffenestr &Gofnod"
 msgid "Hide &Log Window"
 msgstr "Ffenestr Gofnodion"
 
-#: tdemainwidget.cpp:402 tdemainwidget.cpp:1906
+#: tdemainwidget.cpp:402 tdemainwidget.cpp:1904
 msgid "Show Drop &Target"
 msgstr "Dangos Tar&ged Ollwng"
 
-#: tdemainwidget.cpp:403 tdemainwidget.cpp:1934
+#: tdemainwidget.cpp:403 tdemainwidget.cpp:1932
 msgid "Enable &KGet as Konqueror Download Manager"
 msgstr ""
 
-#: tdemainwidget.cpp:405 tdemainwidget.cpp:1930
+#: tdemainwidget.cpp:405 tdemainwidget.cpp:1928
 msgid "Disable &KGet as Konqueror Download Manager"
 msgstr ""
 
-#: tdemainwidget.cpp:414 tdemainwidget.cpp:2169
+#: tdemainwidget.cpp:414 tdemainwidget.cpp:2167
 msgid " Transfers: %1 "
 msgstr "Trosglwyddiadau: %1"
 
-#: tdemainwidget.cpp:415 tdemainwidget.cpp:2170
+#: tdemainwidget.cpp:415 tdemainwidget.cpp:2168
 msgid " Files: %1 "
 msgstr "Ffeiliau: %1"
 
@@ -379,7 +793,7 @@ msgstr "Ffeiliau: %1"
 msgid " Size: %1 KB "
 msgstr "Maint: %1 KB"
 
-#: tdemainwidget.cpp:417 tdemainwidget.cpp:2172
+#: tdemainwidget.cpp:417 tdemainwidget.cpp:2170
 msgid " Time: %1 "
 msgstr "Amser: %1"
 
@@ -658,12 +1072,12 @@ msgstr ""
 msgid "Are you sure you want to delete these transfers?"
 msgstr "A ydych yn sicr eich bod am ddileu'r trosglwyddiadau yma?"
 
-#: tdemainwidget.cpp:824 tdemainwidget.cpp:833 tdemainwidget.cpp:2216
+#: tdemainwidget.cpp:824 tdemainwidget.cpp:833 tdemainwidget.cpp:2214
 #: tdemainwidget.cpp:2486
 msgid "Question"
 msgstr "Cwestiwn"
 
-#: tdemainwidget.cpp:832 transfer.cpp:457
+#: tdemainwidget.cpp:832 transfer.cpp:463
 msgid "Are you sure you want to delete this transfer?"
 msgstr "A ydych yn sicr eich bod am ddileu'r trosglwyddiad yma?"
 
@@ -739,113 +1153,113 @@ msgstr ""
 msgid "Starting another queued job."
 msgstr "Yn dechrau swydd arall wedi'i resu."
 
-#: tdemainwidget.cpp:1510
+#: tdemainwidget.cpp:1508
 #, fuzzy
 msgid "All the downloads are finished."
 msgstr "Lawrlwythiad wedi gorffen"
 
-#: tdemainwidget.cpp:1514
+#: tdemainwidget.cpp:1512
 msgid "<i>%1</i> successfully downloaded."
 msgstr ""
 
-#: tdemainwidget.cpp:1763
+#: tdemainwidget.cpp:1761
 msgid "Offline mode on."
 msgstr "Modd all-lein ynghyn."
 
-#: tdemainwidget.cpp:1768
+#: tdemainwidget.cpp:1766
 msgid "Offline mode off."
 msgstr "Modd all-lein wedi'i ddiffodd"
 
-#: tdemainwidget.cpp:1793
+#: tdemainwidget.cpp:1791
 msgid "Expert mode on."
 msgstr "Modd arbenigwr ynghyn."
 
-#: tdemainwidget.cpp:1795
+#: tdemainwidget.cpp:1793
 msgid "Expert mode off."
 msgstr "Modd arbenigwr wedi'i ddiffodd"
 
-#: tdemainwidget.cpp:1814
+#: tdemainwidget.cpp:1812
 msgid "Use last folder on."
 msgstr "Defnyddio'r blygell ddiwethaf ynghyn."
 
-#: tdemainwidget.cpp:1816
+#: tdemainwidget.cpp:1814
 msgid "Use last folder off."
 msgstr "Defnyddio'r blygell ddiwethaf wedi'i diffodd."
 
-#: tdemainwidget.cpp:1834
+#: tdemainwidget.cpp:1832
 msgid "Auto disconnect on."
 msgstr "Datgysylltu ymysgogol ynghyn"
 
-#: tdemainwidget.cpp:1836
+#: tdemainwidget.cpp:1834
 msgid "Auto disconnect off."
 msgstr "Datgysylltu ymysgogol wedi'i ddiffodd"
 
-#: tdemainwidget.cpp:1855
+#: tdemainwidget.cpp:1853
 msgid "Auto shutdown on."
 msgstr "Cau i lawr ymysgogol ynghyn"
 
-#: tdemainwidget.cpp:1857
+#: tdemainwidget.cpp:1855
 msgid "Auto shutdown off."
 msgstr "Cau i lawr ymysgogol wedi'i ddiffodd."
 
-#: tdemainwidget.cpp:1878
+#: tdemainwidget.cpp:1876
 msgid "Auto paste on."
 msgstr "Gludo ymysgogol ynghyn."
 
-#: tdemainwidget.cpp:1881
+#: tdemainwidget.cpp:1879
 msgid "Auto paste off."
 msgstr "Gludo ymysgogol wedi'i ddiffodd."
 
-#: tdemainwidget.cpp:1902
+#: tdemainwidget.cpp:1900
 #, fuzzy
 msgid "Hide Drop &Target"
 msgstr "&Targed Ollwng"
 
-#: tdemainwidget.cpp:2171
+#: tdemainwidget.cpp:2169
 msgid " Size: %1 "
 msgstr "Maint: %1"
 
-#: tdemainwidget.cpp:2173
+#: tdemainwidget.cpp:2171
 msgid " %1/s "
 msgstr "%1/eil"
 
-#: tdemainwidget.cpp:2182
+#: tdemainwidget.cpp:2180
 #, fuzzy
 msgid "<b>Transfers:</b> %1 "
 msgstr "Trosglwyddiadau: %1"
 
-#: tdemainwidget.cpp:2183
+#: tdemainwidget.cpp:2181
 #, fuzzy
 msgid "<br /><b>Files:</b> %1 "
 msgstr "Ffeiliau: %1"
 
-#: tdemainwidget.cpp:2184
+#: tdemainwidget.cpp:2182
 #, fuzzy
 msgid "<br /><b>Size:</b> %1 "
 msgstr "Maint: %1"
 
-#: tdemainwidget.cpp:2185
+#: tdemainwidget.cpp:2183
 #, fuzzy
 msgid "<br /><b>Time:</b> %1 "
 msgstr "Amser: %1"
 
-#: tdemainwidget.cpp:2186
+#: tdemainwidget.cpp:2184
 msgid "<br /><b>Speed:</b> %1/s"
 msgstr ""
 
-#: tdemainwidget.cpp:2215
+#: tdemainwidget.cpp:2213
 msgid "Do you really want to disconnect?"
 msgstr "A ydych wir am ddatgysylltu?"
 
-#: tdemainwidget.cpp:2217
+#: tdemainwidget.cpp:2215
 msgid "Disconnect"
 msgstr "Datgysylltu"
 
-#: tdemainwidget.cpp:2217
+#: tdemainwidget.cpp:2215
 msgid "Stay Connected"
 msgstr "Aros ar Gyswllt"
 
-#: tdemainwidget.cpp:2223
+#: tdemainwidget.cpp:2221
 msgid "Disconnecting..."
 msgstr "Yn Datgysylltu..."
 
@@ -883,508 +1297,95 @@ msgstr ""
 msgid "Download Again"
 msgstr "Trefnydd Lawrlwytho"
 
-#: logwindow.cpp:96
-msgid "Id"
-msgstr "Dynodiad (Id)"
-
-#: logwindow.cpp:97
-msgid "Name"
-msgstr "Enw"
-
-#: logwindow.cpp:159
-msgid "Log Window"
-msgstr "Ffenestr Gofnodion"
-
-#: logwindow.cpp:163
-msgid "Mixed"
-msgstr "Cymysg"
-
-#: logwindow.cpp:172
-msgid "Separated"
-msgstr "Ar wahan"
-
-#: main.cpp:45
-#, fuzzy
-msgid "An advanced download manager for TDE"
-msgstr "Trefnydd lawrlwytho uwch ar gyfer TDE"
-
-#: main.cpp:51
-msgid "Start KGet with drop target"
-msgstr "Dechrau KGet â tharged ollwng"
-
-#: main.cpp:52
-#, fuzzy
-msgid "URL(s) to download"
-msgstr "URL(au) i'w lawrlwytho."
-
-#: kget_plug_in/kget_linkview.cpp:43 main.cpp:200
-msgid "KGet"
-msgstr "KGet"
-
-#. i18n: file dlgadvancedbase.ui line 27
-#: rc.cpp:3
-#, no-c-format
-msgid "Advanced Options"
-msgstr "Dewisiadau Uwch"
-
-#. i18n: file dlgadvancedbase.ui line 38
-#: rc.cpp:6
-#, no-c-format
-msgid "Add new transfers as:"
-msgstr "Ychwanegu trosglwyddiadau newydd  fel:"
-
-#. i18n: file dlgadvancedbase.ui line 63
-#: rc.cpp:9
-#, no-c-format
-msgid "Iconified"
-msgstr "Eiconeiddio"
-
-#. i18n: file dlgadvancedbase.ui line 71
-#: rc.cpp:12
-#, no-c-format
-msgid "Advanced individual windows"
-msgstr "Ffenestri unigol uwch"
-
-#. i18n: file dlgadvancedbase.ui line 79
-#: rc.cpp:15
-#, no-c-format
-msgid "Mark partial downloads"
-msgstr "Nodi lawrlwythiadau rhannol"
-
-#. i18n: file dlgadvancedbase.ui line 87
-#: rc.cpp:18
-#, no-c-format
-msgid "Remove files from a list after success"
-msgstr "Tynnu ffeiliau cyflawn o restr "
-
-#. i18n: file dlgadvancedbase.ui line 95
-#: rc.cpp:21
-#, no-c-format
-msgid "Get file sizes"
-msgstr "Nôl maint ffeieliau"
-
-#. i18n: file dlgadvancedbase.ui line 103
-#: rc.cpp:24
-#, fuzzy, no-c-format
-msgid "Expert mode (do not prompt for Cancel or Delete)"
-msgstr "Modd uwch (dim anogiad am Ddileu na Ddiddymu)"
-
-#. i18n: file dlgadvancedbase.ui line 111
-#: rc.cpp:27
-#, no-c-format
-msgid "Use KGet as Download Manager for Konqueror"
-msgstr ""
-
-#. i18n: file dlgadvancedbase.ui line 119
-#: rc.cpp:30
-#, no-c-format
-msgid "Show main window at startup"
-msgstr "Dangos y brif ffenestr wrth gychwyn"
-
-#. i18n: file dlgadvancedbase.ui line 127
-#: rc.cpp:33
-#, no-c-format
-msgid "Show individual windows"
-msgstr "Dangos ffenestri unigol"
-
-#. i18n: file dlgadvancedbase.ui line 158
-#: rc.cpp:36
-#, no-c-format
-msgid "Queued"
-msgstr "Wedi rhesi"
-
-#. i18n: file dlgadvancedbase.ui line 166
-#: rc.cpp:39
-#, no-c-format
-msgid "Delayed"
-msgstr "Oediad"
-
-#. i18n: file dlgautomationbase.ui line 27
-#: rc.cpp:42
-#, no-c-format
-msgid "Automation Options"
-msgstr "Dewisiadau Ymysgogi"
-
-#. i18n: file dlgautomationbase.ui line 38
-#: rc.cpp:45 rc.cpp:78 rc.cpp:93 rc.cpp:99
-#, no-c-format
-msgid " min"
-msgstr "mun"
-
-#. i18n: file dlgautomationbase.ui line 52
-#: rc.cpp:48
-#, no-c-format
-msgid "Auto disconnect after completing downloads"
-msgstr "Datgysylltu'n ymysgogol ar ôl cwblhau lawrlwytho"
-
-#. i18n: file dlgautomationbase.ui line 60
-#: rc.cpp:51
-#, no-c-format
-msgid "Autosave file list every:"
-msgstr "Cadw'r rhestr ffeiliau'n ymysgogol bob:"
-
-#. i18n: file dlgautomationbase.ui line 68
-#: rc.cpp:54
-#, no-c-format
-msgid "Timed disconnect"
-msgstr "Datgysylltiad Amseredig"
-
-#. i18n: file dlgautomationbase.ui line 76
-#: rc.cpp:57
-#, no-c-format
-msgid "Disconnect command:"
-msgstr "Gorchymyn Datgysylltu:"
-
-#. i18n: file dlgautomationbase.ui line 94
-#: rc.cpp:60
-#, no-c-format
-msgid "Auto paste from clipboard"
-msgstr "Gludo ymysgogol o'r clipfwrdd"
-
-#. i18n: file dlgautomationbase.ui line 102
-#: rc.cpp:63
-#, no-c-format
-msgid "Auto shutdown after completing downloads"
-msgstr "Cau'n ymysgogol wedi gorffen lawrlwytho"
-
-#. i18n: file dlgconnectionbase.ui line 27
-#: rc.cpp:66
-#, no-c-format
-msgid "Reconnect Options"
-msgstr "Dewisiadau Ailgysylltu"
-
-#. i18n: file dlgconnectionbase.ui line 38
-#: rc.cpp:69
-#, no-c-format
-msgid "On login or timeout error"
-msgstr "Ar wall mewngofnodi neu oramser"
-
-#. i18n: file dlgconnectionbase.ui line 46
-#: rc.cpp:72
-#, no-c-format
-msgid "Reconnect after:"
-msgstr "Ailgysylltu ar ôl:"
-
-#. i18n: file dlgconnectionbase.ui line 54
-#: rc.cpp:75
-#, no-c-format
-msgid "Number of retries:"
-msgstr "Nifer ail-geisiau:"
-
-#. i18n: file dlgconnectionbase.ui line 84
-#: rc.cpp:81
-#, no-c-format
-msgid "On broken connection"
-msgstr "Ar gysylltiad dorredig"
-
-#. i18n: file dlgconnectionbase.ui line 128
-#: rc.cpp:84
-#, no-c-format
-msgid "Timeout Options"
-msgstr "Dewisiadau Goramser"
-
-#. i18n: file dlgconnectionbase.ui line 156
-#: rc.cpp:87
-#, no-c-format
-msgid "If no data arrives in:"
-msgstr "Os na gyrhaedda data o fewn:"
-
-#. i18n: file dlgconnectionbase.ui line 164
-#: rc.cpp:90
-#, fuzzy, no-c-format
-msgid "If server cannot resume:"
-msgstr "Os na all y gweinydd barhau:"
-
-#. i18n: file dlgconnectionbase.ui line 203
-#: rc.cpp:96
-#, no-c-format
-msgid "or"
-msgstr "neu"
-
-#. i18n: file dlgconnectionbase.ui line 227
-#: rc.cpp:102
-#, no-c-format
-msgid "Connection Type"
-msgstr "Math Cysylltiad"
-
-#. i18n: file dlgconnectionbase.ui line 236
-#: rc.cpp:105
-#, no-c-format
-msgid "Permanent"
-msgstr "Parhaol"
-
-#. i18n: file dlgconnectionbase.ui line 241
-#: rc.cpp:108
-#, no-c-format
-msgid "Ethernet"
-msgstr "Ethernet"
-
-#. i18n: file dlgconnectionbase.ui line 246
-#: rc.cpp:111
-#, no-c-format
-msgid "PLIP"
-msgstr "PLIP"
-
-#. i18n: file dlgconnectionbase.ui line 251
-#: rc.cpp:114
-#, no-c-format
-msgid "SLIP"
-msgstr "SLIP"
-
-#. i18n: file dlgconnectionbase.ui line 256
-#: rc.cpp:117
-#, no-c-format
-msgid "PPP"
-msgstr "PPP"
-
-#. i18n: file dlgconnectionbase.ui line 261
-#: rc.cpp:120
-#, no-c-format
-msgid "ISDN"
-msgstr "ISDN"
-
-#. i18n: file dlgconnectionbase.ui line 273
-#: rc.cpp:123
-#, no-c-format
-msgid "Offline mode"
-msgstr "Modd All-lein"
-
-#. i18n: file dlgconnectionbase.ui line 298
-#: rc.cpp:126
-#, no-c-format
-msgid "Link number:"
-msgstr "Rhif Cyswllt:"
-
-#. i18n: file dlgdirectoriesbase.ui line 78
-#: rc.cpp:129
-#, no-c-format
-msgid "Extension"
-msgstr "Estyniad"
-
-#. i18n: file dlgdirectoriesbase.ui line 89
-#: rc.cpp:132
-#, no-c-format
-msgid "Default Folder"
-msgstr "Plygell Ragosodedig"
-
-#. i18n: file dlgdirectoriesbase.ui line 186
-#: rc.cpp:144
-#, no-c-format
-msgid "Extension (* for all files):"
-msgstr ""
-
-#. i18n: file dlgdirectoriesbase.ui line 199
-#: rc.cpp:147
-#, fuzzy, no-c-format
-msgid "Default folder:"
-msgstr "Plygell Ragosodedig"
-
-#. i18n: file dlglimitsbase.ui line 27
-#: rc.cpp:150
-#, no-c-format
-msgid "Limits Options"
-msgstr "Dewisiadau Terfynnau"
-
-#. i18n: file dlglimitsbase.ui line 38
-#: rc.cpp:153
-#, no-c-format
-msgid "Maximum open connections:"
-msgstr "Uchafswm cysylltiadau wedi'u hagor:"
-
-#. i18n: file dlglimitsbase.ui line 46
-#: rc.cpp:156
-#, no-c-format
-msgid "Minimum network bandwidth:"
-msgstr "Isafswm ystod rhwydwaith:"
-
-#. i18n: file dlglimitsbase.ui line 54
-#: rc.cpp:159
-#, no-c-format
-msgid "Maximum network bandwidth:"
-msgstr "Uchafswm ystod rhwydwaith:"
-
-#. i18n: file dlglimitsbase.ui line 70
-#: rc.cpp:162 rc.cpp:165
-#, no-c-format
-msgid " bytes/sec"
-msgstr "beit/eil"
-
-#. i18n: file dlgsystembase.ui line 27
-#: rc.cpp:168
-#, no-c-format
-msgid "Use animation"
-msgstr "Defnyddio bywlunio"
-
-#. i18n: file dlgsystembase.ui line 38
-#: rc.cpp:171
-#, no-c-format
-msgid "Window style:"
-msgstr "Arddull ffenestr:"
-
-#. i18n: file dlgsystembase.ui line 46
-#: rc.cpp:174
-#, no-c-format
-msgid "Font:"
-msgstr "Wynebfath:"
-
-#. i18n: file dlgsystembase.ui line 79
-#: rc.cpp:177
-#, no-c-format
-msgid "Normal"
-msgstr "Arferol"
-
-#. i18n: file dlgsystembase.ui line 87
-#: rc.cpp:180
-#, no-c-format
-msgid "Docked"
-msgstr "Wedi'i Ddocio"
-
-#. i18n: file dlgsystembase.ui line 95
-#: rc.cpp:183
-#, no-c-format
-msgid "Drop target"
-msgstr "Targed ollwng"
-
-#. i18n: file kgetui.rc line 14
-#: rc.cpp:189
-#, no-c-format
-msgid "&Transfer"
-msgstr "&Trosglwyddo"
-
-#: safedelete.cpp:18
-msgid ""
-"Not deleting\n"
-"%1\n"
-"as it is a directory."
-msgstr ""
-"Ddim yn dileu\n"
-" %1\n"
-" gan ei fod yn gyfeiriadur."
-
-#: safedelete.cpp:20 safedelete.cpp:32
-msgid "Not Deleted"
-msgstr "Heb ei Ddileu"
-
-#: safedelete.cpp:30
-msgid ""
-"Not deleting\n"
-"%1\n"
-"as it is not a local file."
-msgstr ""
-"Ddim yn dileu\n"
-" %1\n"
-" gan na'i fod yn ffeil lleol."
-
-#: settings.cpp:131
-#, fuzzy
-msgid ""
-"This is the first time that you have run KGet.\n"
-"Do you want to use KGet as Download Manager for Konqueror?"
-msgstr ""
-"Dyma'r tro cyntaf i chi redeg KGet.\n"
-" A ydych am weithredoli'r cyfuno â Konqueror?"
-
-#: settings.cpp:131
-msgid "Konqueror Integration"
-msgstr "Cyfuno â Konqueror"
-
-#: settings.cpp:131
-msgid "Enable"
-msgstr "Galluogi"
-
-#: settings.cpp:131
-msgid "Do Not Enable"
-msgstr ""
-
-#: transfer.cpp:275
+#: transfer.cpp:278
 #, c-format
 msgid "Copy file from: %1"
 msgstr "Copĩo ffeil o: %1"
 
-#: transfer.cpp:276
+#: transfer.cpp:279
 #, c-format
 msgid "To: %1"
 msgstr "At: %1"
 
-#: transfer.cpp:298
+#: transfer.cpp:300
 msgid "unknown"
 msgstr "anhysbys"
 
-#: transfer.cpp:389
+#: transfer.cpp:391
 #, c-format
 msgid "Attempt number %1"
 msgstr "Cais rhif %1"
 
-#: transfer.cpp:402
+#: transfer.cpp:405
 msgid "Stopping"
 msgstr ""
 
-#: transfer.cpp:424
+#: transfer.cpp:428
 msgid "Pausing"
 msgstr "Yn Seibio"
 
-#: transfer.cpp:493
+#: transfer.cpp:502
 msgid "Queueing"
 msgstr "Yn Ciwio"
 
-#: transfer.cpp:508
+#: transfer.cpp:517
 msgid "Scheduling"
 msgstr "Yn Trefnlennu"
 
-#: transfer.cpp:532
+#: transfer.cpp:542
 msgid "Delaying"
 msgstr "Yn Oedi"
 
-#: transfer.cpp:562
+#: transfer.cpp:573
 msgid "Download finished"
 msgstr "Lawrlwythiad wedi gorffen"
 
-#: transfer.cpp:605 transfer.cpp:606 transfer.cpp:608
+#: transfer.cpp:616 transfer.cpp:617 transfer.cpp:619
 msgid "Stalled"
 msgstr "Wedi Seibio"
 
-#: transfer.cpp:611 transfer.cpp:704
+#: transfer.cpp:622 transfer.cpp:715
 msgid ""
 "_: OK as in 'finished'\n"
 "OK"
 msgstr "Iawn"
 
-#: transfer.cpp:612 transfer.cpp:613 transfer.cpp:615
+#: transfer.cpp:623 transfer.cpp:624 transfer.cpp:626
 msgid "Finished"
 msgstr "Wedi Gorffen"
 
-#: transfer.cpp:620 transfer.cpp:621 transfer.cpp:623
+#: transfer.cpp:631 transfer.cpp:632 transfer.cpp:634
 msgid "Stopped"
 msgstr "Wedi aros"
 
-#: transfer.cpp:626
+#: transfer.cpp:637
 msgid "%1/s"
 msgstr "%1/eil"
 
-#: transfer.cpp:647
+#: transfer.cpp:658
 msgid "Total size is %1 bytes"
 msgstr "%1 beit yw'r maint cyfan"
 
-#: transfer.cpp:663
+#: transfer.cpp:674
 #, fuzzy
 msgid "The file size does not match."
 msgstr "Nid yw maint y ffeil yn cydweddu!"
 
-#: transfer.cpp:665
+#: transfer.cpp:676
 msgid "File Size checked"
 msgstr "Gwiriwyd Maint Ffeil"
 
-#: transfer.cpp:785
+#: transfer.cpp:796
 msgid ""
 "Malformed URL:\n"
 msgstr ""
 "URL wedi'i gamffurfio:\n"
 
-#: transfer.cpp:924
+#: transfer.cpp:936
 msgid "Download resumed"
 msgstr "Parhäwyd â'r lawrlwythiad"
 
-#: transfer.cpp:1017
+#: transfer.cpp:1030
 msgid "checking if file is in cache...no"
 msgstr ""
 
diff --git a/tde-i18n-cy/messages/tdenetwork/kinetd.po b/tde-i18n-cy/messages/tdenetwork/kinetd.po
index b1494fb656c..5d801b28366 100644
--- a/tde-i18n-cy/messages/tdenetwork/kinetd.po
+++ b/tde-i18n-cy/messages/tdenetwork/kinetd.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kinetd\n"
-"POT-Creation-Date: 2006-07-28 03:25+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2004-01-06 13:29+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdenetwork/knewsticker.po b/tde-i18n-cy/messages/tdenetwork/knewsticker.po
index fbba00b3a26..5eb586283eb 100644
--- a/tde-i18n-cy/messages/tdenetwork/knewsticker.po
+++ b/tde-i18n-cy/messages/tdenetwork/knewsticker.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: knewsticker_new\n"
-"POT-Creation-Date: 2008-07-08 01:20+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2004-01-01 20:28+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -120,7 +121,7 @@ msgstr "Cyfnod holi newyddion:"
 msgid "All News Sources"
 msgstr "Pob Tarddiad Newyddion"
 
-#: common/newsengine.cpp:88 common/newsengine.h:71 knewstickerconfig.cpp:242
+#: common/newsengine.cpp:88 common/newsengine.h:72 knewstickerconfig.cpp:242
 #: knewstickerstub/knewstickerstub.cpp:59 newsscroller.cpp:192
 msgid "Unknown"
 msgstr "Anhysbys"
@@ -647,7 +648,7 @@ msgid "Hide"
 msgstr "Cuddio"
 
 #. i18n: file knewstickerconfigwidget.ui line 546
-#: common/configaccess.cpp:394 common/configaccess.cpp:616 rc.cpp:165
+#: common/configaccess.cpp:277 common/configaccess.cpp:499 rc.cpp:165
 #: rc.cpp:689
 #, no-c-format
 msgid "Show"
@@ -676,7 +677,7 @@ msgid "articles from"
 msgstr "erthyglau o"
 
 #. i18n: file knewstickerconfigwidget.ui line 587
-#: common/configaccess.cpp:376 common/configaccess.cpp:617 rc.cpp:177
+#: common/configaccess.cpp:259 common/configaccess.cpp:500 rc.cpp:177
 #: rc.cpp:701
 #, no-c-format
 msgid "all news sources"
@@ -721,8 +722,8 @@ msgid ""
 "<ul>\n"
 "<li><b>contain</b>, <b>does not contain</b> - you should probably enter a "
 "keyword here, like \"TDE\", \"Baseball\" or \"Business\". The keyword is not "
-"case-sensitive so it does not matter whether you type \"kde\", \"TDE\" or "
-"\"kDe\".</li>\n"
+"case-sensitive so it does not matter whether you type \"tde\", \"TDE\" or "
+"\"tDe\".</li>\n"
 "<li><b>equals</b>, <b>does not equal</b> - enter a phrase or expression here to "
 "have the filter match only those articles whose headlines match <b>exactly</b> "
 "the text you typed. The phrase you type will be considered to be "
@@ -758,26 +759,26 @@ msgid "headlines"
 msgstr "penawdau"
 
 #. i18n: file knewstickerconfigwidget.ui line 650
-#: common/configaccess.cpp:381 common/configaccess.cpp:618 rc.cpp:201
+#: common/configaccess.cpp:264 common/configaccess.cpp:501 rc.cpp:201
 #: rc.cpp:725
 #, no-c-format
 msgid "contain"
 msgstr "yn cynnwys"
 
 #. i18n: file knewstickerconfigwidget.ui line 655
-#: common/configaccess.cpp:383 rc.cpp:204 rc.cpp:728
+#: common/configaccess.cpp:266 rc.cpp:204 rc.cpp:728
 #, fuzzy, no-c-format
 msgid "do not contain"
 msgstr "nid yw'n cynnwys"
 
 #. i18n: file knewstickerconfigwidget.ui line 660
-#: common/configaccess.cpp:385 rc.cpp:207 rc.cpp:731
+#: common/configaccess.cpp:268 rc.cpp:207 rc.cpp:731
 #, no-c-format
 msgid "equal"
 msgstr "yn gyfartal i"
 
 #. i18n: file knewstickerconfigwidget.ui line 665
-#: common/configaccess.cpp:387 rc.cpp:210 rc.cpp:734
+#: common/configaccess.cpp:270 rc.cpp:210 rc.cpp:734
 #, fuzzy, no-c-format
 msgid "do not equal"
 msgstr "nid yw'n gyfartal i"
diff --git a/tde-i18n-cy/messages/tdenetwork/kopete.po b/tde-i18n-cy/messages/tdenetwork/kopete.po
index 958f2821a2a..5d7ba4ecf54 100644
--- a/tde-i18n-cy/messages/tdenetwork/kopete.po
+++ b/tde-i18n-cy/messages/tdenetwork/kopete.po
@@ -3,199 +3,374 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kopete\n"
-"POT-Creation-Date: 2008-07-08 01:20+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2005-10-14 12:01+0100\n"
 "Last-Translator: Kevin Donnelly <kevin@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10\n"
 
-#. i18n: file ./libkopete/ui/fileconfirmbase.ui line 16
-#: libkopete/ui/kopetefileconfirmdialog.cpp:35 rc.cpp:24
-#, no-c-format
-msgid "A User Would Like to Send You a File"
+#: _translatorinfo.cpp:1 kopete/main.cpp:96
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "KD wrth KGyfieithu"
+
+#: _translatorinfo.cpp:3 kopete/main.cpp:97
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "kyfieithu@dotmon.com"
+
+#: plugins/translator/translatorguiclient.cpp:44
+msgid "Translate"
+msgstr "Trosi"
+
+#: plugins/translator/translatordialog.cpp:24
+msgid "Translator Plugin"
 msgstr ""
 
-#: libkopete/ui/kopetefileconfirmdialog.cpp:36
-msgid "&Refuse"
-msgstr "&Gwrthod"
+#: libkopete/kopeteonlinestatus.cpp:126 plugins/cryptography/kgpgselkey.cpp:89
+#: plugins/translator/translatorlanguages.cpp:35
+#: protocols/groupwise/gwprotocol.cpp:62 protocols/irc/ircaccount.cpp:270
+#: protocols/oscar/icq/icqpresence.cpp:131
+msgid "Unknown"
+msgstr "Anhysbys"
 
-#: libkopete/ui/kopetefileconfirmdialog.cpp:36
-msgid "&Accept"
-msgstr "&Derbyn"
+#: plugins/translator/translatorlanguages.cpp:36
+msgid "English"
+msgstr "Saesneg"
 
-#: libkopete/ui/kopetefileconfirmdialog.cpp:64
-msgid "File Transfer"
-msgstr "Trosglwyddo ffeiliau"
+#: plugins/translator/translatorlanguages.cpp:37
+msgid "Chinese"
+msgstr "Tseineg"
 
-#: libkopete/ui/kopetefileconfirmdialog.cpp:86
+#: plugins/translator/translatorlanguages.cpp:38
+msgid "French"
+msgstr "Ffrengig"
+
+#: plugins/translator/translatorlanguages.cpp:39
+msgid "German"
+msgstr "Almaenaidd"
+
+#: plugins/translator/translatorlanguages.cpp:40
+msgid "Italian"
+msgstr "Eidalaidd"
+
+#: plugins/translator/translatorlanguages.cpp:41
+msgid "Japanese"
+msgstr "Siapanëaidd"
+
+#: plugins/translator/translatorlanguages.cpp:42
+msgid "Korean"
+msgstr "Coreeg"
+
+#: plugins/translator/translatorlanguages.cpp:43
+msgid "Portuguese"
+msgstr "Portwgëaidd"
+
+#: plugins/translator/translatorlanguages.cpp:44
+msgid "Russian"
+msgstr "Rwsiaidd"
+
+#: plugins/translator/translatorlanguages.cpp:45
+msgid "Spanish"
+msgstr "Sbaenaidd"
+
+#: plugins/translator/translatorplugin.cpp:48
+msgid "Translator"
+msgstr "Cyfieithydd"
+
+#: plugins/translator/translatorplugin.cpp:79
+msgid "Set &Language"
+msgstr ""
+
+#: plugins/translator/translatorplugin.cpp:367
 msgid ""
-"The file '%1' already exists.\n"
-"Do you want to overwrite it ?"
+"%2 \n"
+"Auto Translated: \n"
+"%1"
 msgstr ""
 
-#: libkopete/ui/kopetefileconfirmdialog.cpp:87
-msgid "Overwrite File"
-msgstr "Trosysgrifo Ffeil"
+#: plugins/cryptography/cryptographyselectuserkey.cpp:29
+msgid "Select Contact's Public Key"
+msgstr ""
 
-#: libkopete/ui/kopetefileconfirmdialog.cpp:96
-msgid "You must provide a valid local filename"
+#: plugins/cryptography/cryptographyselectuserkey.cpp:38
+#, c-format
+msgid "Select public key for %1"
 msgstr ""
 
-#: libkopete/ui/contactaddednotifydialog.cpp:62
-msgid "Someone Has Added You"
+#: plugins/cryptography/cryptographyguiclient.cpp:51
+msgid "Encrypt Messages"
 msgstr ""
 
-#: libkopete/ui/contactaddednotifydialog.cpp:73
-msgid ""
-"<qt><img src=\"kopete-account-icon:%1\" /> The contact <b>%2</b> "
-"has added you to his/her contactlist. (Account %3)</qt>"
+#: plugins/cryptography/kgpgselkey.cpp:41
+msgid "Private Key List"
 msgstr ""
 
-#. i18n: file ./libkopete/ui/addressbookselectorwidget_base.ui line 99
-#: libkopete/ui/addressbookselectorwidget.cpp:77
-#: plugins/cryptography/popuppublic.cpp:128 rc.cpp:116 rc.cpp:3556 rc.cpp:4737
+#. i18n: file ./kopete/addaccountwizard/addaccountwizardpage1.ui line 72
+#: plugins/cryptography/kgpgselkey.cpp:53
+#: plugins/cryptography/popuppublic.cpp:127 rc.cpp:1816 rc.cpp:2701
+#: rc.cpp:4164 rc.cpp:4221 rc.cpp:4977
 #, no-c-format
-msgid "Email"
-msgstr "Ebost"
+msgid "Name"
+msgstr "Enw"
 
-#: libkopete/ui/addressbookselectorwidget.cpp:147
-msgid "New Address Book Entry"
+#: plugins/cryptography/kgpgselkey.cpp:57
+msgid "Choose secret key:"
 msgstr ""
 
-#: libkopete/ui/addressbookselectorwidget.cpp:147
-msgid "Name the new entry:"
+#: plugins/cryptography/kgpgselkey.cpp:64
+msgid "Local signature (cannot be exported)"
 msgstr ""
 
-#: libkopete/ui/userinfodialog.cpp:62 protocols/winpopup/wpuserinfo.cpp:41
+#: plugins/cryptography/kgpgselkey.cpp:84
+#: plugins/cryptography/popuppublic.cpp:401
+msgid "Unlimited"
+msgstr "Heb derfyn"
+
+#: plugins/cryptography/kgpgselkey.cpp:92
+msgid "Invalid"
+msgstr "Annilys"
+
+#: plugins/cryptography/kgpgselkey.cpp:95
+msgid "Disabled"
+msgstr "Analluogir"
+
+#: plugins/cryptography/kgpgselkey.cpp:98
+msgid "Revoked"
+msgstr "Dirymir"
+
+#: plugins/cryptography/kgpgselkey.cpp:101
+msgid "Expired"
+msgstr "Darfyddir"
+
+#: plugins/cryptography/kgpgselkey.cpp:104
+msgid "Undefined"
+msgstr "Anniffiniedig"
+
+#: plugins/cryptography/kgpgselkey.cpp:107
+msgid "None"
+msgstr "Dim"
+
+#: plugins/cryptography/kgpgselkey.cpp:110
+msgid "Marginal"
+msgstr ""
+
+#: plugins/cryptography/kgpgselkey.cpp:113
+msgid "Full"
+msgstr "Llawn"
+
+#: plugins/cryptography/kgpgselkey.cpp:116
+msgid "Ultimate"
+msgstr "Eithaf"
+
+#: plugins/cryptography/kgpgselkey.cpp:119
+msgid "?"
+msgstr "?"
+
+#: plugins/cryptography/kgpgselkey.cpp:150
+msgid "ID: %1, trust: %2, expiration: %3"
+msgstr ""
+
+#: plugins/cryptography/popuppublic.cpp:94
+msgid "Select Public Key"
+msgstr ""
+
+#: plugins/cryptography/popuppublic.cpp:111
 #, c-format
-msgid "User Info for %1"
+msgid "Select Public Key for %1"
 msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 435
-#: libkopete/ui/userinfodialog.cpp:209 rc.cpp:3160 rc.cpp:3214 rc.cpp:3457
-#: rc.cpp:3989
+#: plugins/cryptography/popuppublic.cpp:119
+msgid "Clear Search"
+msgstr "Gwagu'r Chwiliad"
+
+#: plugins/cryptography/popuppublic.cpp:122
+msgid "Search: "
+msgstr "Chwiliad: "
+
+#. i18n: file ./protocols/jabber/ui/dlgbrowse.ui line 79
+#: libkopete/ui/addressbookselectorwidget.cpp:77
+#: plugins/cryptography/popuppublic.cpp:128 rc.cpp:2680 rc.cpp:3441
+#: rc.cpp:4980
 #, no-c-format
-msgid "Name:"
-msgstr "Enw:"
+msgid "Email"
+msgstr "Ebost"
 
-#: libkopete/ui/userinfodialog.cpp:213
-msgid "Contact ID:"
+#: plugins/cryptography/popuppublic.cpp:129
+msgid "ID"
+msgstr "ID"
+
+#: plugins/cryptography/popuppublic.cpp:147
+msgid "&Go to Default Key"
 msgstr ""
 
-#. i18n: file ./protocols/groupwise/ui/gwcontactpropswidget.ui line 76
-#: libkopete/ui/userinfodialog.cpp:217 rc.cpp:5213
-#, no-c-format
-msgid "Status:"
-msgstr "Cyflwr:"
+#: plugins/cryptography/popuppublic.cpp:150
+msgid "ASCII armored encryption"
+msgstr ""
 
-#. i18n: file ./protocols/oscar/aim/ui/aiminfobase.ui line 106
-#: libkopete/ui/userinfodialog.cpp:221 rc.cpp:3310
-#, no-c-format
-msgid "Warning level:"
-msgstr "Lefel rybudd :"
+#: plugins/cryptography/popuppublic.cpp:151
+msgid "Allow encryption with untrusted keys"
+msgstr ""
 
-#. i18n: file ./protocols/oscar/aim/ui/aiminfobase.ui line 148
-#: libkopete/ui/userinfodialog.cpp:225 rc.cpp:3316
-#, no-c-format
-msgid "Online since:"
+#: plugins/cryptography/popuppublic.cpp:152
+msgid "Hide user id"
 msgstr ""
 
-#. i18n: file ./protocols/oscar/icq/ui/icqworkinfowidget.ui line 128
-#: libkopete/ui/userinfodialog.cpp:229 rc.cpp:3463 rc.cpp:3998
-#, no-c-format
-msgid "Address:"
-msgstr "Cyfeiriad:"
+#: plugins/cryptography/popuppublic.cpp:155
+msgid ""
+"<b>Public keys list</b>: select the key that will be used for encryption."
+msgstr ""
 
-#. i18n: file ./protocols/oscar/icq/ui/icqworkinfowidget.ui line 35
-#: libkopete/ui/userinfodialog.cpp:233 rc.cpp:3442 rc.cpp:3983
-#, no-c-format
-msgid "Phone:"
-msgstr "Ffôn:"
+#: plugins/cryptography/popuppublic.cpp:157
+msgid ""
+"<b>ASCII encryption</b>: makes it possible to open the encrypted file/message "
+"in a text editor"
+msgstr ""
 
-#. i18n: file ./protocols/oscar/aim/ui/aiminfobase.ui line 174
-#: libkopete/ui/userinfodialog.cpp:238 rc.cpp:3319
-#, no-c-format
-msgid "Away message:"
+#: plugins/cryptography/popuppublic.cpp:159
+msgid ""
+"<b>Hide user ID</b>: Do not put the keyid into encrypted packets. This option "
+"hides the receiver of the message and is a countermeasure against traffic "
+"analysis. It may slow down the decryption process because all available secret "
+"keys are tried."
 msgstr ""
 
-#: libkopete/ui/userinfodialog.cpp:246
-msgid "User info:"
+#: plugins/cryptography/popuppublic.cpp:163
+msgid ""
+"<b>Allow encryption with untrusted keys</b>: when you import a public key, it "
+"is usually marked as untrusted and you cannot use it unless you sign it in "
+"order to make it 'trusted'. Checking this box enables you to use any key, even "
+"if it has not be signed."
 msgstr ""
 
-#: libkopete/ui/kopetestdaction.cpp:43
-msgid "&Configure Kopete..."
+#: plugins/cryptography/popuppublic.cpp:172
+msgid "Shred source file"
 msgstr ""
 
-#: libkopete/ui/kopetestdaction.cpp:73
-msgid "Start &Chat..."
+#: plugins/cryptography/popuppublic.cpp:174
+msgid ""
+"<b>Shred source file</b>: permanently remove source file. No recovery will be "
+"possible"
 msgstr ""
 
-#: libkopete/ui/kopetestdaction.cpp:78
-msgid "&Send Single Message..."
-msgstr "&Anfon Neges Sengl..."
+#: plugins/cryptography/popuppublic.cpp:176
+msgid ""
+"<qt><b>Shred source file:</b><br />"
+"<p>Checking this option will shred (overwrite several times before erasing) the "
+"files you have encrypted. This way, it is almost impossible that the source "
+"file is recovered.</p>"
+"<p><b>But you must be aware that this is not secure</b> "
+"on all file systems, and that parts of the file may have been saved in a "
+"temporary file or in the spooler of your printer if you previously opened it in "
+"an editor or tried to print it. Only works on files (not on folders).</p></qt>"
+msgstr ""
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 515
-#: libkopete/ui/kopetestdaction.cpp:83 rc.cpp:2447
-#, no-c-format
-msgid "User &Info"
-msgstr "Gwybo&daeth am Ddefnyddwyr"
+#: plugins/cryptography/popuppublic.cpp:177
+msgid "<a href=\"whatsthis:%1\">Read this before using shredding</a>"
+msgstr ""
 
-#: libkopete/ui/kopetestdaction.cpp:88
-msgid "Send &File..."
-msgstr "Anfon& Ffeil..."
+#: plugins/cryptography/popuppublic.cpp:182
+msgid "Symmetrical encryption"
+msgstr ""
 
-#: libkopete/ui/kopetestdaction.cpp:93
-msgid "View &History..."
+#: plugins/cryptography/popuppublic.cpp:184
+msgid ""
+"<b>Symmetrical encryption</b>: encryption does not use keys. You just need to "
+"give a password to encrypt/decrypt the file"
 msgstr ""
 
-#: libkopete/ui/kopetestdaction.cpp:98
-msgid "&Create Group..."
+#: plugins/cryptography/cryptographyplugin.cpp:51
+msgid "Cryptography"
+msgstr "Cêl-ysgrifennaeth"
+
+#: plugins/cryptography/cryptographyplugin.cpp:71
+msgid "&Select Cryptography Public Key..."
 msgstr ""
 
-#: libkopete/ui/kopetestdaction.cpp:103
-msgid "Cha&nge Meta Contact..."
+#: plugins/cryptography/cryptographyplugin.cpp:188
+msgid "Outgoing Encrypted Message: "
 msgstr ""
 
-#: libkopete/ui/kopetestdaction.cpp:108
-msgid "&Delete Contact"
-msgstr "&Dileu y Cyswllt"
+#: plugins/cryptography/cryptographyplugin.cpp:219
+msgid "Incoming Encrypted Message: "
+msgstr ""
 
-#: libkopete/ui/kopetestdaction.cpp:113
-msgid "Change A&lias..."
+#: plugins/cryptography/kgpginterface.cpp:99
+msgid "Enter passphrase for <b>%1</b>:"
 msgstr ""
 
-#: libkopete/ui/kopetestdaction.cpp:118
-msgid "&Block Contact"
-msgstr "&Atal Cyswllt"
+#: plugins/cryptography/kgpginterface.cpp:101
+msgid "<b>Bad passphrase</b><br> You have %1 tries left.<br>"
+msgstr ""
 
-#: libkopete/ui/kopetestdaction.cpp:123
-msgid "Un&block Contact"
-msgstr "&Dadatal y Cyswllt"
+#: plugins/smpppdcs/smpppdcsprefsimpl.cpp:97
+#: protocols/groupwise/ui/gwsearch.cpp:135
+msgid "Searching"
+msgstr "Yn chwilio"
 
-#: libkopete/ui/addressbooklinkwidget.cpp:77
-msgid "Choose the corresponding entry for '%1'"
+#: plugins/smpppdcs/smpppdcsprefsimpl.cpp:97
+msgid "Searching for a SMPPPD on the local network..."
 msgstr ""
 
-#: libkopete/ui/addressbooklinkwidget.cpp:79
-msgid "Choose the corresponding entry in the address book"
+#: plugins/smpppdcs/unittest/main.cpp:26 plugins/smpppdcs/unittest/main.cpp:31
+msgid "SMPPPDClientTests"
 msgstr ""
 
-#: kopete/config/identity/kopeteidentityconfig.cpp:506
-#: libkopete/ui/addressbooklinkwidget.cpp:81
-msgid "Addressbook Association"
-msgstr "Cyfeiriadur"
+#: plugins/smpppdcs/smpppdcspreferences.cpp:57
+#, fuzzy
+msgid "connection status is managed by Kopete"
+msgstr "Cysylltiad wedi goramseru"
 
-#: libkopete/knotification.cpp:121 libkopete/knotification.cpp:142
-#: protocols/jabber/jabberaccount.cpp:1125
-#: protocols/jabber/jabbercontact.cpp:920
-msgid "Notification"
-msgstr "Hysbysiad"
+#: plugins/statistics/statisticsdialog.cpp:45
+#, c-format
+msgid "Statistics for %1"
+msgstr ""
 
-#: libkopete/knotification.cpp:130 libkopete/knotification.cpp:151
-msgid "Fatal"
+#. i18n: file ./kopete/config/behavior/kopeteawayconfigbase.ui line 33
+#: plugins/statistics/statisticsdialog.cpp:62 rc.cpp:1148 rc.cpp:1194
+#, no-c-format
+msgid "General"
+msgstr "Cyffredinol"
+
+#: plugins/statistics/statisticsdialog.cpp:193
+msgid "<h1>Statistics for %1</h1>"
+msgstr ""
+
+#: plugins/statistics/statisticsdialog.cpp:196
+msgid ""
+"<div class=\"statgroup\"><b><a href=\"main:generalinfo\" title=\"General "
+"summary view\">General</a></b>"
+"<br><span title=\"Select the a day or a month to view the stat for\"><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 ""
+
+#: plugins/statistics/statisticsdialog.cpp:227
+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 ""
 
 #: libkopete/kopetemetacontact.cpp:503 libkopete/kopeteonlinestatus.cpp:110
@@ -207,7 +382,7 @@ msgstr ""
 #: protocols/jabber/jabbercontact.cpp:156
 #: protocols/jabber/jabberprotocol.cpp:75
 #: protocols/meanwhile/meanwhileprotocol.cpp:42
-#: protocols/msn/msnprotocol.cpp:52 protocols/oscar/aim/aimaccount.cpp:311
+#: protocols/oscar/aim/aimaccount.cpp:311
 #: protocols/oscar/aim/aimprotocol.cpp:232
 #: protocols/oscar/icq/icqpresence.cpp:77 protocols/sms/smsprotocol.cpp:37
 #: protocols/winpopup/wpprotocol.cpp:53 protocols/yahoo/yahooprotocol.cpp:43
@@ -228,20 +403,6 @@ msgstr "Ar-lein"
 msgid "Away"
 msgstr "I ffwrdd"
 
-#: libkopete/kopeteonlinestatus.cpp:116 protocols/gadu/gaduprotocol.cpp:75
-#: protocols/groupwise/gwprotocol.cpp:66 protocols/irc/ircprotocol.cpp:145
-#: protocols/jabber/jabberprotocol.cpp:81 protocols/msn/msnprotocol.cpp:62
-#: protocols/sms/smsprotocol.cpp:38 protocols/yahoo/yahooprotocol.cpp:56
-msgid "Connecting"
-msgstr "Cysylltu"
-
-#: libkopete/kopeteonlinestatus.cpp:119 protocols/gadu/gaduprotocol.cpp:67
-#: protocols/gadu/gaduprotocol.cpp:69 protocols/jabber/jabbercontact.cpp:166
-#: protocols/jabber/jabberprotocol.cpp:80 protocols/msn/msnprotocol.cpp:59
-#: protocols/yahoo/yahooprotocol.cpp:53
-msgid "Invisible"
-msgstr ""
-
 #: libkopete/kopetemetacontact.cpp:507 libkopete/kopeteonlinestatus.cpp:122
 #: plugins/statistics/statisticscontact.cpp:364
 #: plugins/statistics/statisticsdialog.cpp:350
@@ -250,693 +411,1058 @@ msgstr ""
 #: protocols/irc/ircprotocol.cpp:118 protocols/irc/ircprotocol.cpp:147
 #: protocols/jabber/jabberprotocol.cpp:79
 #: protocols/meanwhile/meanwhileprotocol.cpp:37
-#: protocols/msn/msnprotocol.cpp:58 protocols/oscar/aim/aimaccount.cpp:319
+#: protocols/oscar/aim/aimaccount.cpp:319
 #: protocols/oscar/aim/aimprotocol.cpp:233
 #: protocols/oscar/icq/icqpresence.cpp:71 protocols/sms/smsprotocol.cpp:39
 #: protocols/winpopup/wpprotocol.cpp:55 protocols/yahoo/yahooprotocol.cpp:42
 msgid "Offline"
 msgstr "All-lein"
 
-#: libkopete/kopeteonlinestatus.cpp:126 plugins/cryptography/kgpgselkey.cpp:89
-#: plugins/translator/translatorlanguages.cpp:35
-#: protocols/groupwise/gwprotocol.cpp:62 protocols/irc/ircaccount.cpp:270
-#: protocols/oscar/icq/icqpresence.cpp:131
-msgid "Unknown"
-msgstr "Anhysbys"
-
-#: libkopete/kopetetransfermanager.cpp:190
-msgid "<unknown>"
-msgstr "<anhysbys>"
+#: plugins/statistics/statisticsdialog.cpp:387
+msgid "<div class=\"statgroup\">"
+msgstr ""
 
-#: libkopete/kopetetransfermanager.cpp:237 protocols/gadu/gaducontact.cpp:99
-#: protocols/irc/ircusercontact.cpp:150
-#: protocols/jabber/jabbercontact.cpp:1018
-#: protocols/jabber/jabbergroupcontact.cpp:299
-#: protocols/jabber/jabbergroupmembercontact.cpp:153
-#: protocols/msn/msncontact.cpp:593
-msgid "Kopete File Transfer"
+#: plugins/statistics/statisticsdialog.cpp:388
+msgid ""
+"<b title=\"The total time I have been able to see %1 status\">"
+"Total seen time :</b> %2 hour(s)"
+"<br>"
 msgstr ""
 
-#: libkopete/kopetetransfermanager.cpp:258
+#: plugins/statistics/statisticsdialog.cpp:390
 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."
+"<b title=\"The total time I have seen %1 online\">Total online time :</b> "
+"%2 hour(s)"
+"<br>"
 msgstr ""
 
-#: libkopete/tests/kopetepasswordtest_program.cpp:35
-msgid "Config group to store password in"
+#: plugins/statistics/statisticsdialog.cpp:392
+msgid ""
+"<b title=\"The total time I have seen %1 away\">Total busy time :</b> "
+"%2 hour(s)"
+"<br>"
 msgstr ""
 
-#: libkopete/tests/kopetepasswordtest_program.cpp:36
-msgid "Set password to new"
+#: plugins/statistics/statisticsdialog.cpp:393
+msgid ""
+"<b title=\"The total time I have seen %1 offline\">Total offline time :</b> "
+"%2 hour(s)"
 msgstr ""
 
-#: libkopete/tests/kopetepasswordtest_program.cpp:37
-msgid "Claim password was erroneous"
+#: plugins/statistics/statisticsdialog.cpp:396
+#: plugins/statistics/statisticsdialog.cpp:464
+#: plugins/statistics/statisticsdialog.cpp:482
+msgid "General information"
+msgstr "Gwybodaeth Cyffredinol"
+
+#: plugins/statistics/statisticsdialog.cpp:402
+msgid "<b>Average message length :</b> %1 characters<br>"
 msgstr ""
 
-#: libkopete/tests/kopetepasswordtest_program.cpp:38
-msgid "Password prompt"
+#: plugins/statistics/statisticsdialog.cpp:403
+msgid "<b>Time between two messages : </b> %1 second(s)"
 msgstr ""
 
-#: libkopete/tests/kopetepasswordtest_program.cpp:39
-msgid "Image to display in password dialog"
+#: plugins/statistics/statisticsdialog.cpp:407
+msgid "<b title=\"The last time you talked with %1\">Last talk :</b> %2<br>"
 msgstr ""
 
-#: libkopete/tests/kopetepasswordtest_program.cpp:120
+#: plugins/statistics/statisticsdialog.cpp:408
 msgid ""
-"Hopefully this popped up because you set the password to the empty string."
+"<b title=\"The last time I have seen %1 online or away\">"
+"Last time contact was present :</b> %2"
 msgstr ""
 
-#: libkopete/kopetechatsession.cpp:251
-msgid "Outgoing Message Sent"
-msgstr ""
+#: plugins/statistics/statisticsdialog.cpp:418
+#, fuzzy
+msgid "Current status"
+msgstr "Cyfrinair cyfredol:"
 
-#: libkopete/kopetechatsession.cpp:267
-msgid "A contact sent you a buzz/nudge."
+#: plugins/statistics/statisticsdialog.cpp:419
+msgid "Is <b>%1</b> since <b>%2</b>"
 msgstr ""
 
-#: libkopete/kopetechatsession.cpp:451
-msgid ""
-"<qt>An error has occurred while creating a new chat window. The chat window has "
-"not been created.</qt>"
+#: plugins/statistics/statisticsdialog.cpp:429
+msgid "When have I seen this contact ?"
 msgstr ""
 
-#: libkopete/kopetechatsession.cpp:452
-msgid "Error While Creating Chat Window"
+#: plugins/statistics/statisticsdialog.cpp:443
+msgid "Between %1:00 and %2:00, I was able to see %3 status %4% of the hour."
 msgstr ""
 
-#: libkopete/kopeteprotocol.cpp:61
-#: protocols/meanwhile/meanwhileprotocol.cpp:60
-msgid "Account Offline"
-msgstr "Cyfrif All-lein"
+#: plugins/statistics/statisticsdialog.cpp:452
+#, fuzzy
+msgid "Online time"
+msgstr "Ar-lein"
 
-#: libkopete/connectionmanager.cpp:144
+#: plugins/statistics/statisticsdialog.cpp:452
+#, fuzzy
+msgid "Away time"
+msgstr "&Cadw Gosodiadau"
+
+#: plugins/statistics/statisticsdialog.cpp:452
+#, fuzzy
+msgid "Offline time"
+msgstr "All-lein"
+
+#: plugins/statistics/statisticsdialog.cpp:457
+msgid "online"
+msgstr "arlein"
+
+#: plugins/statistics/statisticsdialog.cpp:459
+msgid "away"
+msgstr "i ffwrdd"
+
+#: plugins/statistics/statisticsdialog.cpp:461
+msgid "offline"
+msgstr "all-lein"
+
+#: plugins/statistics/statisticsdialog.cpp:502
+msgid "Between %1:00 and %2:00, I have seen %3 %4% %5."
+msgstr ""
+
+#: plugins/statistics/statisticsdialog.cpp:526
 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?"
+"_: 1 is date, 2 is contact name, 3 is online status\n"
+"%1, %2 was %3"
 msgstr ""
 
-#: libkopete/connectionmanager.cpp:145
-msgid "This application is currently in offline mode.  Do you want to connect?"
+#: plugins/statistics/statisticsplugin.cpp:46
+msgid "Statistics"
+msgstr "Ystadegau"
+
+#: plugins/statistics/statisticsplugin.cpp:55
+#, fuzzy
+msgid "View &Statistics"
+msgstr "&Cadw Gosodiadau"
+
+#: plugins/latex/latexguiclient.cpp:44
+msgid "Preview Latex Images"
 msgstr ""
 
-#: libkopete/connectionmanager.cpp:147
+#: plugins/latex/latexguiclient.cpp:62
 msgid ""
-"This application is currently in offline mode.  Do you want to connect in order "
-"to carry out this operation?"
+"There are no latex in the message you are typing.  The latex formula must be "
+"included between $$ and $$ "
 msgstr ""
 
-#: libkopete/connectionmanager.cpp:148
-msgid "Leave Offline Mode?"
+#: plugins/latex/latexguiclient.cpp:62
+msgid "No Latex Formula"
 msgstr ""
 
-#: libkopete/connectionmanager.cpp:149
-#: protocols/jabber/ui/dlgjabberchangepassword.cpp:81
-msgid "Connect"
-msgstr "Cysylltu"
+#: plugins/latex/latexguiclient.cpp:67
+#, c-format
+msgid "<b>Preview of the latex message :</b> <br />%1"
+msgstr ""
 
-#: libkopete/connectionmanager.cpp:149
-#: protocols/jabber/ui/dlgjabberchangepassword.cpp:81
-msgid "Stay Offline"
-msgstr "Aros All-lein"
+#: plugins/latex/latexplugin.cpp:95
+msgid ""
+"I cannot find the Magick convert program.\n"
+"convert is required to render the Latex formulas.\n"
+"Please go to www.imagemagick.org or to your distribution site and get the right "
+"package."
+msgstr ""
 
-#: libkopete/kopeteutils.cpp:38
-msgid "You have been disconnected."
+#: plugins/highlight/highlightpreferences.cpp:207
+msgid "Rename Filter"
+msgstr "Ailenwi Hidlen"
+
+#: plugins/highlight/highlightpreferences.cpp:207
+msgid "Please enter the new name for the filter:"
 msgstr ""
 
-#: libkopete/kopeteutils.cpp:39
-#, fuzzy
-msgid "Connection Lost."
-msgstr "Collwyd Cysylltiad"
+#: plugins/highlight/highlightconfig.cpp:72
+msgid "-New filter-"
+msgstr ""
 
-#: libkopete/kopeteutils.cpp:40
+#: plugins/nowlistening/nowlisteningguiclient.cpp:37
+msgid "Send Media Info"
+msgstr ""
+
+#: plugins/nowlistening/nowlisteningguiclient.cpp:60
 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."
+"None of the supported media players (KsCD, JuK, amaroK, Noatun or Kaffeine) are "
+"playing anything."
 msgstr ""
 
-#: libkopete/kopeteutils.cpp:42
-msgid "Can't connect with the instant messaging server or peers."
+#: plugins/nowlistening/nowlisteningguiclient.cpp:61
+msgid "Nothing to Send"
 msgstr ""
 
-#: libkopete/kopeteutils.cpp:43
-msgid "Can't connect."
-msgstr "Methu cysylltu."
+#: plugins/nowlistening/nowlisteningplugin.cpp:135
+msgid "USAGE: /media - Displays information on current song"
+msgstr ""
 
-#: libkopete/kopeteutils.cpp:44
+#: plugins/nowlistening/nowlisteningplugin.cpp:174
 msgid ""
-"This means Kopete can't 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."
+"_: Message from Kopete user to another user; used when sending media "
+"information even though there are no songs playing or no media players running\n"
+"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 ""
 
-#: libkopete/kopeteutils.cpp:55
-msgid "More Information..."
-msgstr "Mwy o Wybodaeth..."
+#: plugins/nowlistening/nowlisteningplugin.cpp:405
+msgid "Unknown track"
+msgstr ""
 
-#: libkopete/kopeteaccount.cpp:142
-msgid "You have been disconnected"
+#: plugins/nowlistening/nowlisteningplugin.cpp:414
+msgid "Unknown artist"
 msgstr ""
 
-#: libkopete/kopeteaccount.cpp:142
-msgid "You have connected from another client or computer to the account '%1'"
+#: plugins/nowlistening/nowlisteningplugin.cpp:421
+msgid "Unknown album"
 msgstr ""
 
-#: libkopete/kopeteaccount.cpp:142
-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."
+#: plugins/nowlistening/nowlisteningplugin.cpp:428
+msgid "Unknown player"
 msgstr ""
 
-#: libkopete/kopeteaccount.cpp:258 libkopete/kopeteaccount.cpp:324
+#: plugins/autoreplace/autoreplaceconfig.cpp:67
 msgid ""
-"You are not allowed to add yourself to the contact list. The addition of \"%1\" "
-"to account \"%2\" will not take place."
+"_: list_of_words_to_replace\n"
+"ur,your,r,are,u,you,theres,there is,arent,are not,dont,do not"
 msgstr ""
 
-#: libkopete/kopeteaccount.cpp:258 libkopete/kopeteaccount.cpp:324
-msgid "Error Creating Contact"
+#: plugins/autoreplace/autoreplacepreferences.cpp:46
+msgid "Text"
+msgstr "Testun"
+
+#: plugins/autoreplace/autoreplacepreferences.cpp:47
+msgid "Replacement"
+msgstr "Amnewidiad"
+
+#. i18n: file ./plugins/autoreplace/autoreplaceprefs.ui line 108
+#: plugins/alias/aliaspreferences.cpp:326
+#: protocols/oscar/oscarlistnonservercontacts.cpp:33 rc.cpp:384 rc.cpp:4170
+#, no-c-format
+msgid "&Add"
+msgstr "&Ychwanegu"
+
+#: plugins/alias/aliaspreferences.cpp:336
+#: plugins/alias/aliaspreferences.cpp:425
+msgid ""
+"<qt>Could not add alias <b>%1</b>. An alias name cannot contain the characters "
+"\"_\" or \"=\".</qt>"
 msgstr ""
 
-#: libkopete/kopeteaccount.cpp:368 protocols/jabber/jabbertransport.cpp:130
-#: protocols/oscar/aim/aimaccount.cpp:309
-msgid "%2 <%1>"
+#: plugins/alias/aliaspreferences.cpp:338
+#: plugins/alias/aliaspreferences.cpp:427
+msgid "Invalid Alias Name"
 msgstr ""
 
-#: kopete/config/accounts/kopeteaccountconfig.cpp:198
-#: libkopete/kopeteaccount.cpp:514
-msgid "Edit Account"
-msgstr "Golygu Cyfrif:"
+#: plugins/alias/aliaspreferences.cpp:354
+#: plugins/alias/aliaspreferences.cpp:450
+msgid ""
+"<qt>Could not add alias <b>%1</b>. This command is already being handled by "
+"either another alias or Kopete itself.</qt>"
+msgstr ""
 
-#: kopete/kopetewindow.cpp:998 libkopete/kopeteawayaction.cpp:85
-msgid "No Message"
-msgstr "Dim Neges"
+#: plugins/alias/aliaspreferences.cpp:356
+#: plugins/alias/aliaspreferences.cpp:452
+msgid "Could Not Add Alias"
+msgstr ""
 
-#: libkopete/kopeteawayaction.cpp:86
-msgid "New Message..."
-msgstr "Neges Newydd..."
+#: plugins/alias/aliaspreferences.cpp:469
+msgid "Are you sure you want to delete the selected aliases?"
+msgstr ""
 
-#: libkopete/kopeteawayaction.cpp:113
-msgid "New Away Message"
+#: plugins/alias/aliaspreferences.cpp:469
+msgid "Delete Aliases"
 msgstr ""
 
-#: libkopete/kopeteawayaction.cpp:113
-msgid "Please enter your away reason:"
+#: plugins/history/historyguiclient.cpp:44
+msgid "History Last"
 msgstr ""
 
-#: libkopete/kopeteaway.cpp:170
-msgid "Sorry, I am busy right now"
+#: plugins/history/converter.cpp:40
+msgid "Would you like to remove old history files?"
 msgstr ""
 
-#: libkopete/kopeteaway.cpp:171 libkopete/kopeteaway.cpp:184
-msgid "I am gone right now, but I will be back later"
+#: plugins/history/converter.cpp:40
+msgid "History Converter"
 msgstr ""
 
-#: libkopete/kopeteawaydialog.cpp:37
-msgid "Global Away Message"
+#: plugins/history/converter.cpp:40 protocols/jabber/jabberaccount.cpp:1125
+#: protocols/jabber/jabbercontact.cpp:921
+msgid "Keep"
+msgstr "Cadw"
+
+#: plugins/history/converter.cpp:42
+msgid "History converter"
 msgstr ""
 
-#: libkopete/kopetemimetypehandler.cpp:153
+#: plugins/history/converter.cpp:109
 #, c-format
-msgid "Unable to find the file %1."
+msgid "Parsing old history in %1"
 msgstr ""
 
-#: libkopete/kopetemimetypehandler.cpp:157
+#: plugins/history/converter.cpp:119
 msgid ""
-"<qt>Unable to download the requested file;"
-"<br>please check that address %1 is correct.</qt>"
+"Parsing old history in %1:\n"
+"%2"
 msgstr ""
 
-#: libkopete/tdeabcpersistence.cpp:294
-msgid "<qt>\"%1\" is not supported by Kopete.</qt>"
+#: plugins/history/historydialog.cpp:98 plugins/history/historydialog.cpp:556
+#, c-format
+msgid "History for %1"
 msgstr ""
 
-#: libkopete/tdeabcpersistence.cpp:295
-msgid "Could Not Sync with TDE Address Book"
+#: plugins/history/historydialog.cpp:119
+msgid "All"
+msgstr "Popeth"
+
+#: kopete/chatwindow/chatmessagepart.cpp:267
+#: plugins/history/historydialog.cpp:178
+msgid "Copy Link Address"
+msgstr "Copïo Cyfeiriad Cyswllt"
+
+#: plugins/history/historydialog.cpp:213
+msgid "Loading..."
+msgstr "Llwytho..."
+
+#: plugins/history/historydialog.cpp:470
+msgid "Searching..."
+msgstr "Yn chwilio..."
+
+#. i18n: file ./plugins/history/historyviewer.ui line 125
+#: plugins/history/historydialog.cpp:536 rc.cpp:469
+#, fuzzy, no-c-format
+msgid "Se&arch"
+msgstr "&Chwiliad:"
+
+#: plugins/history/historydialog.cpp:549
+msgid "History for All Contacts"
 msgstr ""
 
-#: libkopete/tdeabcpersistence.cpp:342
+#. i18n: file ./plugins/history/historyviewer.ui line 55
+#: plugins/history/historydialog.cpp:572 rc.cpp:463
+#, no-c-format
+msgid "Ready"
+msgstr "Parod"
+
+#: plugins/history/historyplugin.cpp:41
+msgid "History"
+msgstr "Hanes"
+
+#: plugins/history/historyplugin.cpp:47
+msgid "View &History"
+msgstr ""
+
+#: plugins/history/historyplugin.cpp:66
 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>"
+"Old history files from Kopete 0.6.x or older has been detected.\n"
+"Do you want to import and convert it to the new history format?"
 msgstr ""
 
-#: libkopete/tdeabcpersistence.cpp:342
-msgid "Import Address From Address Book"
+#: plugins/history/historyplugin.cpp:68
+msgid "History Plugin"
+msgstr "Ategyn Hanes"
+
+#: plugins/history/historyplugin.cpp:68
+#, fuzzy
+msgid "Import && Convert"
+msgstr "Cysylltau"
+
+#: plugins/history/historyplugin.cpp:68
+msgid "Do Not Import"
 msgstr ""
 
-#: libkopete/tdeabcpersistence.cpp:342
-msgid "Use"
-msgstr "Defnydd"
+#: plugins/contactnotes/contactnotesedit.cpp:29
+msgid "Contact Notes"
+msgstr "Nodiadau Cysylltiad"
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 304
-#: libkopete/tdeabcpersistence.cpp:342 rc.cpp:3130
-#, no-c-format
-msgid "Do Not Use"
+#: plugins/contactnotes/contactnotesedit.cpp:36
+msgid "Notes about %1:"
 msgstr ""
 
-#: libkopete/tdeabcpersistence.cpp:356
+#: plugins/contactnotes/contactnotesplugin.cpp:40
+msgid "&Notes"
+msgstr "&Nodiadau"
+
+#: plugins/webpresence/webpresenceplugin.cpp:208
 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>"
+"An error occurred when uploading your presence page.\n"
+"Check the path and write permissions of the destination."
 msgstr ""
 
-#: libkopete/tdeabcpersistence.cpp:357 protocols/gadu/gadusession.cpp:217
-#: protocols/gadu/gadusession.cpp:230 protocols/gadu/gadusession.cpp:242
-#: protocols/gadu/gadusession.cpp:275 protocols/gadu/gadusession.cpp:289
-#: protocols/gadu/gadusession.cpp:307 protocols/irc/ui/channellist.cpp:304
-msgid "Not Connected"
-msgstr "Heb gysylltu"
+#: plugins/webpresence/webpresenceplugin.cpp:218
+msgid "Not yet known"
+msgstr ""
 
-#: libkopete/tdeabcpersistence.cpp:367 protocols/oscar/aim/aimprotocol.cpp:164
-#: protocols/oscar/icq/icqprotocol.cpp:119
-msgid "Choose Account"
+#: kopete/chatwindow/kopeteemoticonaction.cpp:65
+msgid "Add Smiley"
 msgstr ""
 
-#: libkopete/tdeabcpersistence.cpp:381
-msgid ""
-"<qt>You do not have an account configured for <b>%1</b> "
-"yet.  Please create an account, connect it, and try again.</qt>"
+#: kopete/chatwindow/krichtexteditpart.cpp:117
+msgid "KopeteRichTextEditPart"
 msgstr ""
 
-#: libkopete/tdeabcpersistence.cpp:382
-msgid "No Account Found"
+#: kopete/chatwindow/krichtexteditpart.cpp:118
+msgid "A simple rich text editor part for Kopete"
 msgstr ""
 
-#: libkopete/tdeabcpersistence.cpp:398
-msgid "<qt>It was not possible to add the contact.</qt>"
+#: kopete/chatwindow/krichtexteditpart.cpp:127
+msgid "Enable &Rich Text"
 msgstr ""
 
-#: libkopete/tdeabcpersistence.cpp:399
-msgid "Could Not Add Contact"
+#: kopete/chatwindow/krichtexteditpart.cpp:129
+msgid "Disable &Rich Text"
 msgstr ""
 
-#: libkopete/kopetemetacontact.cpp:345 libkopete/kopetemetacontact.cpp:363
-#: libkopete/kopetemetacontact.cpp:439
+#: kopete/chatwindow/krichtexteditpart.cpp:133
+msgid "Check &Spelling"
+msgstr " Cywiro Sillafu"
+
+#: kopete/chatwindow/krichtexteditpart.cpp:137
+msgid "Text &Color..."
+msgstr "Lliw &Testun..."
+
+#: kopete/chatwindow/krichtexteditpart.cpp:142
+msgid "Background Co&lor..."
+msgstr "&Lliw Cefndir ..."
+
+#: kopete/chatwindow/krichtexteditpart.cpp:147
+msgid "&Font"
+msgstr "&Wynebfath"
+
+#: kopete/chatwindow/krichtexteditpart.cpp:153
+msgid "Font &Size"
+msgstr "Maint& Ffont"
+
+#: kopete/chatwindow/krichtexteditpart.cpp:159
+msgid "&Bold"
+msgstr "&Bras"
+
+#: kopete/chatwindow/krichtexteditpart.cpp:164
+msgid "&Italic"
+msgstr "&Italig"
+
+#: kopete/chatwindow/krichtexteditpart.cpp:169
+msgid "&Underline"
+msgstr "&Danlinellu"
+
+#: kopete/chatwindow/krichtexteditpart.cpp:183
+msgid "Align &Left"
+msgstr "Alinio i'r Ch&with"
+
+#: kopete/chatwindow/krichtexteditpart.cpp:188
+msgid "Align &Center"
+msgstr "Alinio i'r &Canol"
+
+#: kopete/chatwindow/krichtexteditpart.cpp:193
+msgid "Align &Right"
+msgstr "Alinio i'r D&de"
+
+#: kopete/chatwindow/krichtexteditpart.cpp:198
+msgid "&Justify"
+msgstr "&Unioni"
+
+#: kopete/chatwindow/chatmessagepart.cpp:266
+#: kopete/chatwindow/chatmessagepart.cpp:291
+#, fuzzy
+msgid "Import Emoticon"
+msgstr "Gwall Mewnforio"
+
+#: kopete/chatwindow/chatmessagepart.cpp:292
 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."
+"<qt><img src=\"%1\">"
+"<br>Insert the string for the emoticon"
+"<br>separated by space if you want multiple strings</qt>"
 msgstr ""
 
-#: libkopete/kopetecontact.cpp:453 libkopete/kopetemetacontact.cpp:346
-#: libkopete/kopetemetacontact.cpp:364 libkopete/kopetemetacontact.cpp:440
-msgid "User is Not Reachable"
+#: kopete/chatwindow/chatmessagepart.cpp:339
+msgid "Save Conversation"
 msgstr ""
 
-#: libkopete/kopetemetacontact.cpp:510 protocols/irc/ircprotocol.cpp:150
-#: protocols/msn/msnprotocol.cpp:61
-msgid "Status not available"
+#: kopete/chatwindow/chatmessagepart.cpp:377
+msgid "<qt>Could not open <b>%1</b> for writing.</qt>"
 msgstr ""
 
-#: libkopete/kopetetask.cpp:32
-msgid "The operation has not finished yet"
+#: kopete/chatwindow/chatmessagepart.cpp:378
+msgid "Error While Saving"
 msgstr ""
 
-#: libkopete/kopetetask.cpp:67
-msgid "Aborted"
-msgstr "Terfynwyd"
+#: kopete/chatwindow/chatmessagepart.cpp:726
+msgid "User Has Left"
+msgstr ""
 
-#: libkopete/kopetepasswordedaccount.cpp:83
-msgid ""
-"<b>The password was wrong;</b> please re-enter your password for %1 account <b>"
-"%2</b>"
+#: kopete/chatwindow/kopeteemailwindow.cpp:155
+msgid "<< Prev"
 msgstr ""
 
-#: libkopete/kopetepasswordedaccount.cpp:85
-msgid "Please enter your password for %1 account <b>%2</b>"
+#: kopete/chatwindow/kopeteemailwindow.cpp:160
+msgid "(0) Next >>"
 msgstr ""
 
-#: libkopete/kopetecommandhandler.cpp:107
-msgid ""
-"USAGE: /help [<command>] - Used to list available commands, or show help for a "
-"specified command."
+#: kopete/chatwindow/kopetechatwindow.cpp:316
+#: kopete/chatwindow/kopeteemailwindow.cpp:209
+msgid "&Send Message"
 msgstr ""
 
-#: libkopete/kopetecommandhandler.cpp:110
-msgid "USAGE: /close - Closes the current view."
+#: kopete/chatwindow/kopeteemailwindow.cpp:220
+msgid "&Set Font..."
 msgstr ""
 
-#: libkopete/kopetecommandhandler.cpp:114
-msgid "USAGE: /part - Closes the current view."
+#: kopete/chatwindow/kopeteemailwindow.cpp:222
+msgid "Set Text &Color..."
 msgstr ""
 
-#: libkopete/kopetecommandhandler.cpp:117
-msgid "USAGE: /clear - Clears the active view's chat buffer."
+#: kopete/chatwindow/kopetechatwindow.cpp:359
+#: kopete/chatwindow/kopeteemailwindow.cpp:224
+msgid "Set &Background Color..."
 msgstr ""
 
-#: libkopete/kopetecommandhandler.cpp:123
-msgid ""
-"USAGE: /away [<reason>] - Marks you as away/back for the current account only."
+#: kopete/chatwindow/kopetechatwindow.cpp:415
+#: kopete/chatwindow/kopeteemailwindow.cpp:248
+msgid "Toolbar Animation"
 msgstr ""
 
-#: libkopete/kopetecommandhandler.cpp:126
-msgid "USAGE: /awayall [<reason>] - Marks you as away/back for all accounts."
+#: kopete/chatwindow/kopeteemailwindow.cpp:347
+msgid "(%1) Next >>"
 msgstr ""
 
-#: libkopete/kopetecommandhandler.cpp:129
+#: kopete/chatwindow/chatview.cpp:356
+#: kopete/chatwindow/kopeteemailwindow.cpp:425
 msgid ""
-"USAGE: /say <text> - Say text in this chat. This is the same as just typing a "
-"message, but is very useful for scripts."
+"<qt>You are about to leave the group chat session <b>%1</b>."
+"<br>You will not receive future messages from this conversation.</qt>"
 msgstr ""
 
-#: libkopete/kopetecommandhandler.cpp:133
-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."
+#: kopete/chatwindow/chatview.cpp:357
+#: kopete/chatwindow/kopeteemailwindow.cpp:426
+msgid "Closing Group Chat"
 msgstr ""
 
-#: libkopete/kopetecommandhandler.cpp:236
+#: kopete/chatwindow/chatview.cpp:358 kopete/chatwindow/chatview.cpp:365
+#: kopete/chatwindow/chatview.cpp:372
+#: kopete/chatwindow/kopeteemailwindow.cpp:427
+#: kopete/chatwindow/kopeteemailwindow.cpp:434
+#: kopete/chatwindow/kopeteemailwindow.cpp:441
+msgid "Cl&ose Chat"
+msgstr ""
+
+#: kopete/chatwindow/chatview.cpp:363
+#: kopete/chatwindow/kopeteemailwindow.cpp:432
 msgid ""
-"Available Commands:\n"
+"<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 ""
 
-#: libkopete/kopetecommandhandler.cpp:249
+#: kopete/chatwindow/chatview.cpp:364
+#: kopete/chatwindow/kopeteemailwindow.cpp:433
+msgid "Unread Message"
+msgstr ""
+
+#: kopete/chatwindow/chatview.cpp:370
+#: kopete/chatwindow/kopeteemailwindow.cpp:439
 msgid ""
-"\n"
-"Type /help <command> for more information."
+"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 ""
 
-#: libkopete/kopetecommandhandler.cpp:258
-msgid "There is no help available for '%1'."
+#: kopete/chatwindow/chatview.cpp:371
+#: kopete/chatwindow/kopeteemailwindow.cpp:440
+msgid "Message in Transit"
 msgstr ""
 
-#: libkopete/kopetecommandhandler.cpp:304
+#: kopete/chatwindow/kopetechatwindow.cpp:194
+#: kopete/chatwindow/kopeteemailwindow.cpp:466
+#: kopete/chatwindow/kopeteemailwindow.cpp:484
+msgid "Send"
+msgstr "Anfon"
+
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 774
+#: kopete/chatwindow/kopeteemailwindow.cpp:473 rc.cpp:4935
+#, no-c-format
+msgid "Reply"
+msgstr "Ymateb"
+
+#: kopete/chatwindow/chatview.cpp:408
+#, c-format
 msgid ""
-"ERROR: Shell access has been restricted on your system. The /exec command will "
-"not function."
+"_n: One other person in the chat\n"
+"%n other people in the chat"
 msgstr ""
 
-#: libkopete/kopetepassword.cpp:181
-msgid "Password Required"
-msgstr "Mae angen cyfrinair"
+#: kopete/chatwindow/chatview.cpp:551
+msgid "%1 is typing a message"
+msgstr ""
 
-#: libkopete/kopetepassword.cpp:293
+#: kopete/chatwindow/chatview.cpp:555
 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>"
+"_: %1 is a list of names\n"
+"%1 are typing a message"
 msgstr ""
 
-#: libkopete/kopetepassword.cpp:295
-msgid "Unable to Store Secure Password"
+#: kopete/chatwindow/chatview.cpp:597 kopete/chatwindow/chatview.cpp:606
+msgid "%1 is now known as %2"
 msgstr ""
 
-#: libkopete/kopetepassword.cpp:296
-msgid "Store &Unsafe"
+#: kopete/chatwindow/chatview.cpp:635
+msgid "%1 has joined the chat."
 msgstr ""
 
-#: kopete/contactlist/kopetegrouplistaction.cpp:62
-#: libkopete/kopetegroup.cpp:47
-msgid "Top Level"
-msgstr "Lefel Uchaf"
+#: kopete/chatwindow/chatview.cpp:686
+msgid "%1 has left the chat."
+msgstr ""
 
-#: libkopete/kopetegroup.cpp:55
-msgid "Not in your contact list"
+#: kopete/chatwindow/chatview.cpp:688
+msgid "%1 has left the chat (%2)."
 msgstr ""
 
-#: libkopete/kopetegroup.cpp:217
-msgid "(Unnamed Group)"
+#: kopete/chatwindow/chatview.cpp:788
+#, c-format
+msgid "You are now marked as %1."
 msgstr ""
 
-#: libkopete/kopetecontact.cpp:212
-msgid "&Add to Your Contact List"
+#: kopete/chatwindow/chatview.cpp:795 kopete/chatwindow/chatview.cpp:801
+msgid "%2 is now %1."
 msgstr ""
 
-#: libkopete/kopetecontact.cpp:270 libkopete/kopetecontact.cpp:318
-msgid "Move Contact"
+#: kopete/chatwindow/kopetechatwindow.cpp:205
+msgid "Ready."
+msgstr "Parod."
+
+#: kopete/chatwindow/kopetechatwindow.cpp:323
+msgid "Close All Chats"
 msgstr ""
 
-#: libkopete/kopetecontact.cpp:276
-msgid "Select the meta contact to which you want to move this contact:"
+#: kopete/chatwindow/kopetechatwindow.cpp:327
+msgid "&Activate Next Tab"
+msgstr "&Gweithredu'r Tab Nesaf"
+
+#: kopete/chatwindow/kopetechatwindow.cpp:329
+msgid "&Activate Previous Tab"
+msgstr "&Gweithredu'r Tab Cynt"
+
+#: kopete/chatwindow/kopetechatwindow.cpp:334
+msgid "Nic&k Completion"
 msgstr ""
 
-#: libkopete/kopetecontact.cpp:279
-msgid "Create a new metacontact for this contact"
+#: kopete/chatwindow/kopetechatwindow.cpp:337
+msgid "&Detach Chat"
 msgstr ""
 
-#: libkopete/kopetecontact.cpp:280
-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."
+#: kopete/chatwindow/kopetechatwindow.cpp:341
+msgid "&Move Tab to Window"
 msgstr ""
 
-#: libkopete/kopetecontact.cpp:315
-msgid ""
-"You are moving the contact `%1' to the meta contact `%2'.\n"
-"`%3' will be empty afterwards. Do you want to delete this contact?"
+#: kopete/chatwindow/kopetechatwindow.cpp:347
+msgid "&Tab Placement"
 msgstr ""
 
-#: libkopete/kopetecontact.cpp:318
-msgid "&Keep"
-msgstr "&Cadw"
+#: kopete/chatwindow/kopetechatwindow.cpp:357
+msgid "Set Default &Font..."
+msgstr ""
 
-#: libkopete/kopetecontact.cpp:452
-msgid ""
-"This user is not reachable at the moment. Please try a protocol that supports "
-"offline sending, or wait until this user comes online."
+#: kopete/chatwindow/kopetechatwindow.cpp:358
+msgid "Set Default Text &Color..."
 msgstr ""
 
-#: libkopete/kopetecontact.cpp:460
-msgid ""
-"Are you sure you want to remove the contact  '%1' from your contact list?"
+#: kopete/chatwindow/kopetechatwindow.cpp:361
+msgid "Previous History"
 msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:1375
-#: libkopete/kopetecontact.cpp:461
-msgid "Remove Contact"
-msgstr "Gwaredu Cyswllt"
+#: kopete/chatwindow/kopetechatwindow.cpp:365
+msgid "Next History"
+msgstr ""
 
-#: libkopete/kopetecontact.cpp:658
-msgid ""
-"_: <b>DISPLAY NAME</b>"
-"<br><img src=\"%2\">&nbsp;CONTACT STATUS\n"
-"<b><nobr>%3</nobr></b>"
-"<br><img src=\"%2\">&nbsp;%1"
+#: kopete/chatwindow/kopetechatwindow.cpp:374
+msgid "Place to Left of Chat Area"
 msgstr ""
 
-#: libkopete/kopetecontact.cpp:665
-msgid ""
-"_: <b>DISPLAY NAME</b> (CONTACT ID)"
-"<br><img src=\"%2\">&nbsp;CONTACT STATUS\n"
-"<nobr><b>%4</b> (%3)</nobr>"
-"<br><img src=\"%2\">&nbsp;%1"
+#: kopete/chatwindow/kopetechatwindow.cpp:376
+msgid "Place to Right of Chat Area"
 msgstr ""
 
-#: libkopete/kopetecontact.cpp:682
-msgid ""
-"_: "
-"<br><b>Full Name:</b>&nbsp;FORMATTED NAME\n"
-"<br><b>Full Name:</b>&nbsp;<nobr>%1</nobr>"
+#: kopete/chatwindow/kopetechatwindow.cpp:378
+msgid "Show"
+msgstr "Dangos"
+
+#: kopete/chatwindow/kopetechatwindow.cpp:380
+msgid "Hide"
+msgstr "Cuddio"
+
+#: kopete/chatwindow/kopetechatwindow.cpp:381
+msgid "Automatic Spell Checking"
 msgstr ""
 
-#: libkopete/kopetecontact.cpp:691
+#: kopete/chatwindow/kopetechatwindow.cpp:389
+msgid "Co&ntacts"
+msgstr "Cy&sylltau"
+
+#: kopete/chatwindow/kopetechatwindow.cpp:608
+msgid "Close the current tab"
+msgstr "Cau'r tab cyfredol"
+
+#: kopete/chatwindow/kopetechatwindow.cpp:996
+msgid "More..."
+msgstr "Mwy..."
+
+#: kopete/chatwindow/kopetechatwindow.cpp:1199
+msgid "Plugin Actions"
+msgstr ""
+
+#: kopete/kimifaceimpl.cpp:383
 msgid ""
-"_: "
-"<br><b>Idle:</b>&nbsp;FORMATTED IDLE TIME\n"
-"<br><b>Idle:</b>&nbsp;<nobr>%1</nobr>"
+"Another TDE application tried to use Kopete for instant messaging, but Kopete "
+"could not find the specified contact in the TDE address book."
 msgstr ""
 
-#: libkopete/kopetecontact.cpp:700
+#: kopete/contactlist/kopetecontactlistview.cpp:1451
+#: kopete/contactlist/kopetecontactlistview.cpp:1454
+#: kopete/kimifaceimpl.cpp:383
+msgid "Not Found in Address Book"
+msgstr ""
+
+#: kopete/kimifaceimpl.cpp:388
 msgid ""
-"_: "
-"<br><b>Home Page:</b>&nbsp;FORMATTED URL\n"
-"<br><b>Home Page:</b>&nbsp;<a href=\"%1\"><nobr>%2</nobr></a>"
+"_: Translators: %1 is the name of a person taken from the TDE address book, who "
+"Kopete doesn't know about.  Kopete must either be told that an existing contact "
+"in Kopete is this person, or add a new contact for them\n"
+"<qt>"
+"<p>The TDE Address Book has no instant messaging information for</p>"
+"<p><b>%1</b>.</p>"
+"<p>If he/she is already present in the Kopete contact list, indicate the "
+"correct addressbook entry in their properties.</p>"
+"<p>Otherwise, add a new contact using the Add Contact wizard.</p></qt>"
 msgstr ""
 
-#: libkopete/kopetecontact.cpp:710
-#, c-format
+#: kopete/kimifaceimpl.cpp:390
+msgid "No Instant Messaging Address"
+msgstr ""
+
+#: kopete/addcontactwizard/fastaddcontactwizard.cpp:89
 msgid ""
-"_: "
-"<br><b>Away Message:</b>&nbsp;FORMATTED AWAY MESSAGE\n"
-"<br><b>Away&nbsp;Message:</b>&nbsp;%1"
+"_: The account name is prepended here\n"
+"%1 contact information"
 msgstr ""
 
-#: libkopete/kopetecontact.cpp:747
+#: kopete/addcontactwizard/addcontactwizard.cpp:163
+#: kopete/contactlist/kopetecontactlistview.cpp:599
+#: kopete/contactlist/kopetemetacontactlvi.cpp:645
+msgid "New Group"
+msgstr "Grwp Newydd"
+
+#: kopete/addcontactwizard/addcontactwizard.cpp:164
+#: kopete/contactlist/kopetecontactlistview.cpp:600
+#: kopete/contactlist/kopetemetacontactlvi.cpp:645
+msgid "Please enter the name for the new group:"
+msgstr ""
+
+#: kopete/addcontactwizard/addcontactwizard.cpp:286
 msgid ""
-"_: "
-"<br><b>PROPERTY LABEL:</b>&nbsp;PROPERTY VALUE\n"
-"<br><nobr><b>%2:</b></nobr>&nbsp;%1"
+"_: The user has to select the contact to add to the given account name\n"
+"Choose New Contact For %1 Account <b>%2</b>"
 msgstr ""
 
-#: libkopete/kopetecontact.cpp:770
+#: kopete/contactlist/kopetecontactlistview.cpp:291
+msgid "Online contacts (%1)"
+msgstr ""
+
+#: kopete/contactlist/kopetecontactlistview.cpp:292
+msgid "Offline contacts (%1)"
+msgstr ""
+
+#: kopete/contactlist/kopetecontactlistview.cpp:447
+msgid "Contacts"
+msgstr "Cysylltau"
+
+#: kopete/contactlist/kopetecontactlistview.cpp:470
+msgid "Create New Group..."
+msgstr ""
+
+#: kopete/contactlist/kopetecontactlistview.cpp:478
+msgid "&Move To"
+msgstr "&Symud I"
+
+#: kopete/contactlist/kopetecontactlistview.cpp:480
+msgid "&Copy To"
+msgstr "&Copïo I"
+
+#: kopete/contactlist/kopetecontactlistview.cpp:485
+msgid "Send Email..."
+msgstr "Anfon Ebost ..."
+
+#: kopete/contactlist/kopetecontactlistview.cpp:488
+#: kopete/contactlist/kopetecontactlistview.cpp:1395
+msgid "Rename"
+msgstr "Ail-enwi"
+
+#. i18n: file ./protocols/irc/ui/ircadd.ui line 34
+#: kopete/contactlist/kopetecontactlistview.cpp:493
+#: kopete/kopetewindow.cpp:208 rc.cpp:4650
+#, no-c-format
+msgid "&Add Contact"
+msgstr "&Ychwanegu Cyswllt"
+
+#: kopete/contactlist/kopetecontactlistview.cpp:495
+msgid "Select Account"
+msgstr ""
+
+#: kopete/contactlist/kopetecontactlistview.cpp:497
+msgid "Add to Your Contact List"
+msgstr ""
+
+#. i18n: file ./protocols/groupwise/ui/gwchatsearchwidget.ui line 79
+#: kopete/contactlist/kopetecontactlistview.cpp:505 rc.cpp:4122
+#, no-c-format
+msgid "&Properties"
+msgstr "&Priodweddau"
+
+#: kopete/contactlist/kopetecontactlistview.cpp:690
 msgid ""
-"_: firstName lastName\n"
-"%2 %1"
+"_: Translators: format: '<nickname> (<online status>)'\n"
+"%1 (%2)"
+msgstr "%1(%2)"
+
+#: kopete/contactlist/kopetecontactlistview.cpp:715
+msgid ""
+"_: Translators: format: '<displayName> (<id>)'\n"
+"%2 <%1>"
 msgstr ""
 
-#: libkopete/kopetecontact.cpp:806
+#. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 479
+#: kopete/contactlist/kopetecontactlistview.cpp:760
+#: kopete/contactlist/kopetecontactlistview.cpp:991
+#: kopete/contactlist/kopetecontactlistview.cpp:1007
+#: kopete/contactlist/kopetecontactlistview.cpp:1477 kopete/main.cpp:52
+#: protocols/irc/ui/irceditaccountwidget.cpp:275
+#: protocols/oscar/liboscar/userdetails.cpp:323 rc.cpp:3064
+#, no-c-format
+msgid "Kopete"
+msgstr "Kopete"
+
+#: kopete/contactlist/kopetecontactlistview.cpp:989
 msgid ""
-"_: <days>d <hours>h <minutes>m <seconds>s\n"
-"%4d %3h %2m %1s"
+"<qt>Would you like to add <b>%1</b> to your contact list as a member of <b>"
+"%2</b>?</qt>"
 msgstr ""
 
-#: libkopete/kopetecontact.cpp:814
+#: kopete/contactlist/kopetecontactlistview.cpp:991
+#: kopete/contactlist/kopetecontactlistview.cpp:1007
+#: kopete/contactlist/kopetecontactlistview.cpp:1477
+#: protocols/oscar/aim/aimprotocol.cpp:193
+#: protocols/oscar/icq/icqprotocol.cpp:148
+msgid "Do Not Add"
+msgstr "Na Ychwaneger"
+
+#: kopete/contactlist/kopetecontactlistview.cpp:1005
 msgid ""
-"_: <hours>h <minutes>m <seconds>s\n"
-"%3h %2m %1s"
+"<qt>Would you like to add <b>%1</b> to your contact list as a child contact of "
+"<b>%2</b>?</qt>"
 msgstr ""
 
-#: libkopete/kopetecontact.cpp:821
-#, c-format
+#: kopete/contactlist/kopetecontactlistview.cpp:1056
 msgid ""
-"_: <minutes>m <seconds>s\n"
-"%2m %1s"
+"<qt>This contact is already on your contact list. It is a child contact of <b>"
+"%1</b></qt>"
 msgstr ""
 
-#: libkopete/private/kopetecommand.cpp:64
-msgid "Enter Arguments"
+#: kopete/contactlist/kopetecontactlistview.cpp:1374
+msgid "Rename Contact"
 msgstr ""
 
-#: libkopete/private/kopetecommand.cpp:64
-msgid "Enter the arguments to %1:"
+#: kopete/contactlist/kopetecontactlistview.cpp:1375
+#: libkopete/kopetecontact.cpp:461
+msgid "Remove Contact"
+msgstr "Gwaredu Cyswllt"
+
+#: kopete/contactlist/kopetecontactlistview.cpp:1376
+msgid "Send Single Message..."
+msgstr "Anfon Neges Sengl..."
+
+#: kopete/contactlist/kopetecontactlistview.cpp:1379
+msgid "&Add Subcontact"
+msgstr "&Ychwanegu Isgyswllt"
+
+#: kopete/contactlist/kopetecontactlistview.cpp:1384
+msgid "Rename Group"
+msgstr "Ail-enwi'r Grŵp"
+
+#: kopete/contactlist/kopetecontactlistview.cpp:1385
+msgid "Remove Group"
+msgstr "Gwaredu Grŵp"
+
+#: kopete/contactlist/kopetecontactlistview.cpp:1386
+msgid "Send Message to Group"
 msgstr ""
 
-#: libkopete/private/kopetecommand.cpp:77
-msgid "Alias \"%1\" expands to itself."
+#: kopete/contactlist/kopetecontactlistview.cpp:1390
+msgid "&Add Contact to Group"
+msgstr "&Ychwanegu Cyswllt i'r Grŵp"
+
+#: kopete/contactlist/kopetecontactlistview.cpp:1448
+msgid "There is no email address set for this contact in the TDE address book."
 msgstr ""
 
-#: libkopete/private/kopetecommand.cpp:82
+#: kopete/contactlist/kopetecontactlistview.cpp:1448
+msgid "No Email Address in Address Book"
+msgstr ""
+
+#: kopete/contactlist/kopetecontactlistview.cpp:1451
 msgid ""
-"_n: \"%1\" requires at least %n argument.\n"
-"\"%1\" requires at least %n arguments."
+"This contact was not found in the TDE address book. Check that a contact is "
+"selected in the properties dialog."
 msgstr ""
 
-#: libkopete/private/kopetecommand.cpp:88
+#: kopete/contactlist/kopetecontactlistview.cpp:1454
 msgid ""
-"_n: \"%1\" has a maximum of %n argument.\n"
-"\"%1\" has a maximum of %n arguments."
+"This contact is not associated with a TDE address book entry, where the email "
+"address is stored. Check that a contact is selected in the properties dialog."
 msgstr ""
 
-#: libkopete/private/kopetecommand.cpp:93
-msgid "You are not authorized to perform the command \"%1\"."
+#: kopete/contactlist/kopetecontactlistview.cpp:1476
+msgid "<qt>Would you like to add this contact to your contact list?</qt>"
 msgstr ""
 
-#: libkopete/private/kopetecommand.cpp:132
-msgid "Command Error"
+#: kopete/contactlist/kopetecontactlistview.cpp:1556
+msgid ""
+"<qt>Are you sure you want to remove the contact <b>%1</b> "
+"from your contact list?</qt>"
 msgstr ""
 
-#: libkopete/private/kopeteviewmanager.cpp:225
-msgid "<qt>Incoming message from %1<br>\"%2\"</qt>"
+#: kopete/contactlist/kopetecontactlistview.cpp:1562
+msgid ""
+"<qt>Are you sure you want to remove the group <b>%1</b> "
+"and all contacts that are contained within it?</qt>"
 msgstr ""
 
-#: libkopete/private/kopeteviewmanager.cpp:234
-msgid "<qt>A highlighted message arrived from %1<br>\"%2\"</qt>"
+#: kopete/contactlist/kopetecontactlistview.cpp:1579
+msgid "Are you sure you want to remove these contacts from your contact list?"
 msgstr ""
 
-#: libkopete/kopeteglobal.cpp:112 protocols/irc/ircprotocol.cpp:160
-msgid "Full Name"
-msgstr "Enw Llawn"
+#: kopete/contactlist/kopetecontactlistview.cpp:1581
+msgid ""
+"Are you sure you want to remove these groups and contacts from your contact "
+"list?"
+msgstr ""
 
-#: libkopete/kopeteglobal.cpp:118
-msgid "Idle Time"
-msgstr "Amser segur"
+#: kopete/contactlist/kopetecontactlistview.cpp:1689
+#: kopete/kopetewindow.cpp:1061
+msgid "Add Contact"
+msgstr "Ychwanegu Cyswllt"
 
-#: libkopete/kopeteglobal.cpp:124
-msgid "Online Since"
+#: kopete/contactlist/tdeabcexport.cpp:90
+msgid "No writeable addressbook resource found."
 msgstr ""
 
-#: libkopete/kopeteglobal.cpp:130
-msgid "Last Seen"
+#: kopete/contactlist/tdeabcexport.cpp:91
+msgid "Add or enable one using the Trinity Control Center."
 msgstr ""
 
-#: libkopete/kopeteglobal.cpp:136
-msgid "Away Message"
+#: kopete/contactlist/tdeabcexport.cpp:102
+msgid " (already in address book)"
 msgstr ""
 
-#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 383
-#: libkopete/kopeteglobal.cpp:142 rc.cpp:3550 rc.cpp:4728 rc.cpp:5066
-#, no-c-format
-msgid "First Name"
-msgstr "Enw Cyntaf "
+#: kopete/contactlist/kopetemetacontactlvi.cpp:134
+msgid ""
+"_: "
+"<tr>"
+"<td>STATUS ICON <b>PROTOCOL NAME</b> (ACCOUNT NAME)</td>"
+"<td>STATUS DESCRIPTION</td></tr>\n"
+"<tr>"
+"<td><img src=\"%1\">&nbsp;<nobr><b>%2</b></nobr>&nbsp;<nobr>(%3)</nobr></td>"
+"<td align=\"right\"><nobr>%4</nobr></td></tr>"
+msgstr ""
 
-#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 394
-#: libkopete/kopeteglobal.cpp:148 rc.cpp:3553 rc.cpp:4731 rc.cpp:5069
+#: kopete/contactlist/kopetemetacontactlvi.cpp:384
+msgid "<qt><i>%1</i> is now %2.</qt>"
+msgstr ""
+
+#. i18n: file ./kopete/config/behavior/behaviorconfig_chat.ui line 16
+#: kopete/contactlist/kopetemetacontactlvi.cpp:441
+#: kopete/contactlist/kopetemetacontactlvi.cpp:445 rc.cpp:1269
 #, no-c-format
-msgid "Last Name"
-msgstr "Enw Olaf"
+msgid "Chat"
+msgstr "Sgwrsio"
 
-#: libkopete/kopeteglobal.cpp:154
-msgid "Private Phone"
+#: kopete/contactlist/kopeteaddrbookexport.cpp:76
+#: kopete/contactlist/kopeteaddrbookexport.cpp:83
+#: kopete/contactlist/kopeteaddrbookexport.cpp:90
+#: kopete/contactlist/kopeteaddrbookexport.cpp:99
+#: kopete/contactlist/kopeteaddrbookexport.cpp:119
+msgid "<Not Set>"
 msgstr ""
 
-#: libkopete/kopeteglobal.cpp:160
-msgid "Private Mobile Phone"
+#: kopete/contactlist/kopeteaddrbookexport.cpp:177
+msgid "Export to Address Book"
 msgstr ""
 
-#: libkopete/kopeteglobal.cpp:166
-msgid "Work Phone"
+#: kopete/contactlist/kopeteaddrbookexport.cpp:181
+msgid "Set address book fields using the selected data from Kopete"
 msgstr ""
 
-#: libkopete/kopeteglobal.cpp:172
-msgid "Work Mobile Phone"
+#: kopete/contactlist/kopetegroupviewitem.cpp:169
+msgid ""
+"_: (NUMBER OF ONLINE CONTACTS/NUMBER OF CONTACTS IN GROUP)\n"
+"(%1/%2)"
 msgstr ""
 
-#: libkopete/kopeteglobal.cpp:178
-#: protocols/groupwise/ui/gwcontactproperties.cpp:116
-msgid "Email Address"
-msgstr "Cyfeiriad Ebost"
-
-#. i18n: file ./protocols/gadu/ui/gadusearch.ui line 439
-#: libkopete/kopeteglobal.cpp:184 rc.cpp:3259
-#, no-c-format
-msgid "Nick Name"
-msgstr "Llysenw"
-
-#. i18n: file ./libkopete/ui/addressbookselectorwidget_base.ui line 77
-#: libkopete/kopeteglobal.cpp:190 rc.cpp:110 rc.cpp:1079 rc.cpp:4359
-#, no-c-format
-msgid "Photo"
-msgstr "Ffoto"
+#: kopete/contactlist/kopetegrouplistaction.cpp:62
+#: libkopete/kopetegroup.cpp:47
+msgid "Top Level"
+msgstr "Lefel Uchaf"
 
-#: libkopete/kopeteglobal.cpp:232
-msgid "Could not find suitable place to install emoticon themes into."
+#: kopete/contactlist/kopetelviprops.cpp:69
+#, c-format
+msgid "Properties of Group %1"
 msgstr ""
 
-#: libkopete/kopeteglobal.cpp:238
-msgid "Installing Emoticon Themes..."
+#: kopete/contactlist/kopetelviprops.cpp:76
+#: kopete/contactlist/kopetelviprops.cpp:169
+msgid "Custom &Notifications"
 msgstr ""
 
-#: libkopete/kopeteglobal.cpp:260
-msgid "Could not open \"%1\" for unpacking."
+#: kopete/contactlist/kopetelviprops.cpp:149
+#, c-format
+msgid "Properties of Meta Contact %1"
 msgstr ""
 
-#: libkopete/kopeteglobal.cpp:285
-msgid "<qt>The file \"%1\" is not a valid emoticon theme archive.</qt>"
+#: kopete/contactlist/kopetelviprops.cpp:164
+msgid "Sync KABC..."
 msgstr ""
 
-#: libkopete/kopeteglobal.cpp:296
-msgid "<qt>Installing <strong>%1</strong> emoticon theme</qt>"
+#: kopete/config/identity/kopeteidentityconfig.cpp:367
+#: kopete/contactlist/kopetelviprops.cpp:357
+msgid "No Contacts with Photo Support"
+msgstr "Dim Cysylltau sy'n Cynnal Ffoto"
+
+#: kopete/contactlist/kopetelviprops.cpp:513
+msgid "No contacts were imported from the address book."
 msgstr ""
 
-#: libkopete/kopeteglobal.cpp:334
+#: kopete/contactlist/kopetelviprops.cpp:514
+msgid "No Change"
+msgstr "Dim Newid"
+
+#: kopete/kopeteiface.cpp:160
 msgid ""
-"<qt>A problem occurred during the installation process. However, some of the "
-"emoticon themes in the archive may have been installed.</qt>"
+"An external application is attempting to add the  '%1' contact '%2' to your "
+"contact list. Do you want to allow this?"
 msgstr ""
 
-#: _translatorinfo.cpp:1 kopete/main.cpp:95
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "KD wrth KGyfieithu"
+#: kopete/kopeteiface.cpp:162
+msgid "Allow Contact?"
+msgstr ""
+
+#: kopete/kopeteiface.cpp:162
+msgid "Allow"
+msgstr "Caniatáu"
+
+#: kopete/kopeteiface.cpp:162
+msgid "Reject"
+msgstr "Gwrthod"
 
-#: _translatorinfo.cpp:3 kopete/main.cpp:96
+#: kopete/kopeteiface.cpp:175
 msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "kyfieithu@dotmon.com"
+"An external application has attempted to add a contact using  the %1 protocol, "
+"which either does not exist or is not loaded."
+msgstr ""
+
+#: kopete/kopeteiface.cpp:177
+msgid "Missing Protocol"
+msgstr ""
 
 #: kopete/systemtray.cpp:304
 msgid ""
@@ -944,21 +1470,28 @@ msgid ""
 "<br><nobr>\"%2\"</nobr></qt>"
 msgstr ""
 
+#: kopete/kopeteballoon.cpp:98
+msgid ""
+"_: to view\n"
+"View"
+msgstr "Gweld"
+
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 602
+#: kopete/kopeteballoon.cpp:100 protocols/yahoo/yahooaccount.cpp:1231
+#: protocols/yahoo/yahooaccount.cpp:1685 protocols/yahoo/yahooaccount.cpp:1896
+#: rc.cpp:4875 rc.cpp:4890 rc.cpp:4908 rc.cpp:4926
+#, no-c-format
+msgid "Ignore"
+msgstr "Anwybyddu"
+
 #: kopete/kopetewindow.cpp:145
 msgid "Global status message"
 msgstr ""
 
-#. i18n: file ./protocols/irc/ui/ircadd.ui line 34
-#: kopete/contactlist/kopetecontactlistview.cpp:493
-#: kopete/kopetewindow.cpp:208 rc.cpp:2260
-#, no-c-format
-msgid "&Add Contact"
-msgstr "&Ychwanegu Cyswllt"
-
 #. i18n: file ./protocols/gadu/ui/gaduawayui.ui line 122
 #: kopete/kopetewindow.cpp:222 protocols/gadu/gaduprotocol.cpp:59
 #: protocols/groupwise/gwprotocol.cpp:48
-#: protocols/oscar/icq/icqpresence.cpp:71 rc.cpp:3036
+#: protocols/oscar/icq/icqpresence.cpp:71 rc.cpp:4292
 #, no-c-format
 msgid "O&ffline"
 msgstr "A&ll-lein"
@@ -968,19 +1501,19 @@ msgid "&Export Contacts..."
 msgstr "&Allforio Cyswlltau..."
 
 #: kopete/kopetewindow.cpp:240 protocols/groupwise/gwprotocol.cpp:54
-#: protocols/msn/msnprotocol.cpp:55 protocols/oscar/icq/icqpresence.cpp:75
+#: protocols/oscar/icq/icqpresence.cpp:75
 msgid "&Away"
 msgstr "&I ffwrdd"
 
 #. i18n: file ./protocols/gadu/ui/gaduawayui.ui line 88
 #: kopete/kopetewindow.cpp:244 protocols/groupwise/gwprotocol.cpp:52
-#: protocols/msn/msnprotocol.cpp:53 rc.cpp:3018
+#: rc.cpp:4274
 #, no-c-format
 msgid "&Busy"
 msgstr "&Prysur"
 
 #. i18n: file ./protocols/gadu/ui/gaduawayui.ui line 105
-#: kopete/kopetewindow.cpp:249 protocols/msn/msnprotocol.cpp:59 rc.cpp:3027
+#: kopete/kopetewindow.cpp:249 rc.cpp:4283
 #, no-c-format
 msgid "&Invisible"
 msgstr ""
@@ -988,7 +1521,7 @@ msgstr ""
 #. i18n: file ./protocols/yahoo/ui/yahoostealthsetting.ui line 61
 #: kopete/kopetewindow.cpp:260 protocols/gadu/gaduprotocol.cpp:71
 #: protocols/gadu/gaduprotocol.cpp:73 protocols/groupwise/gwprotocol.cpp:50
-#: rc.cpp:3974
+#: rc.cpp:2203
 #, no-c-format
 msgid "&Online"
 msgstr "&Ar-lein"
@@ -1026,13 +1559,13 @@ msgid "Se&arch:"
 msgstr "&Chwiliad:"
 
 #. i18n: file ./kopete/kopeteui.rc line 55
-#: kopete/kopetewindow.cpp:303 rc.cpp:908
+#: kopete/kopetewindow.cpp:303 rc.cpp:1838
 #, no-c-format
 msgid "Quick Search Bar"
 msgstr "Bar Chwilio Brys"
 
 #. i18n: file ./plugins/history/historyviewer.ui line 89
-#: kopete/kopetewindow.cpp:304 rc.cpp:1768
+#: kopete/kopetewindow.cpp:304 rc.cpp:466
 #, no-c-format
 msgid "Search:"
 msgstr "Chwiliad:"
@@ -1057,7 +1590,7 @@ msgid "Set Status Message"
 msgstr "&Gosod Cyflwr"
 
 #. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 284
-#: kopete/kopetewindow.cpp:330 rc.cpp:5327
+#: kopete/kopetewindow.cpp:330 rc.cpp:3834
 #, no-c-format
 msgid "Read Message"
 msgstr ""
@@ -1101,38 +1634,368 @@ msgid ""
 "<br/>"
 msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:1689
-#: kopete/kopetewindow.cpp:1059
-msgid "Add Contact"
-msgstr "Ychwanegu Cyswllt"
+#: kopete/kopetewindow.cpp:1000 libkopete/kopeteawayaction.cpp:85
+msgid "No Message"
+msgstr "Dim Neges"
 
-#: kopete/kimifaceimpl.cpp:383
+#: kopete/config/plugins/kopetepluginconfig.cpp:43
+msgid "Configure Plugins"
+msgstr "Ffurfweddu Ategion"
+
+#: kopete/config/plugins/kopetepluginconfig.cpp:44
+msgid "&Reset"
+msgstr "&Ailosod"
+
+#: kopete/config/plugins/kopetepluginconfig.cpp:62
+msgid "General Plugins"
+msgstr ""
+
+#. i18n: file ./kopete/contactlist/kopetegvipropswidget.ui line 31
+#: kopete/config/behavior/behaviorconfig.cpp:59 rc.cpp:827 rc.cpp:845
+#: rc.cpp:2818
+#, no-c-format
+msgid "&General"
+msgstr "&Cyffredinol"
+
+#: kopete/config/behavior/behaviorconfig.cpp:63
+msgid "&Events"
+msgstr "&Digwyddiadau:"
+
+#: kopete/config/behavior/behaviorconfig.cpp:67
+msgid "A&way Settings"
+msgstr "Gosodiadau I Ffwrdd"
+
+#: kopete/config/behavior/behaviorconfig.cpp:71
+msgid "Cha&t"
+msgstr "S&gwrsio"
+
+#: kopete/config/avdevice/avdeviceconfig.cpp:69
+msgid "&Video"
+msgstr "&Fideo"
+
+#: kopete/config/appearance/appearanceconfig.cpp:152
+#: kopete/config/appearance/appearanceconfig.cpp:653
+msgid "The Chat Window style was successfully installed."
+msgstr ""
+
+#: kopete/config/appearance/appearanceconfig.cpp:152
+#: kopete/config/appearance/appearanceconfig.cpp:653
+msgid "Install successful"
+msgstr ""
+
+#: kopete/config/appearance/appearanceconfig.cpp:157
+#: kopete/config/appearance/appearanceconfig.cpp:640
 msgid ""
-"Another TDE application tried to use Kopete for instant messaging, but Kopete "
-"could not find the specified contact in the TDE address book."
+"The specified archive cannot be opened.\n"
+"Make sure that the archive is valid ZIP or TAR archive."
 msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:1451
-#: kopete/contactlist/kopetecontactlistview.cpp:1454
-#: kopete/kimifaceimpl.cpp:383
-msgid "Not Found in Address Book"
+#: kopete/config/appearance/appearanceconfig.cpp:157
+msgid "Cannot open archive"
 msgstr ""
 
-#: kopete/kimifaceimpl.cpp:388
+#: kopete/config/appearance/appearanceconfig.cpp:162
+#: kopete/config/appearance/appearanceconfig.cpp:645
 msgid ""
-"_: Translators: %1 is the name of a person taken from the TDE address book, who "
-"Kopete doesn't know about.  Kopete must either be told that an existing contact "
-"in Kopete is this person, or add a new contact for them\n"
-"<qt>"
-"<p>The TDE Address Book has no instant messaging information for</p>"
-"<p><b>%1</b>.</p>"
-"<p>If he/she is already present in the Kopete contact list, indicate the "
-"correct addressbook entry in their properties.</p>"
-"<p>Otherwise, add a new contact using the Add Contact wizard.</p></qt>"
+"Could not find a suitable place to install the Chat Window style in user "
+"directory."
 msgstr ""
 
-#: kopete/kimifaceimpl.cpp:390
-msgid "No Instant Messaging Address"
+#: kopete/config/appearance/appearanceconfig.cpp:162
+msgid "Cannot find styles directory"
+msgstr ""
+
+#: kopete/config/appearance/appearanceconfig.cpp:167
+#: kopete/config/appearance/appearanceconfig.cpp:649
+msgid "The specified archive does not contain a valid Chat Window style."
+msgstr ""
+
+#: kopete/config/appearance/appearanceconfig.cpp:167
+#: kopete/config/appearance/appearanceconfig.cpp:649
+msgid "Invalid Style"
+msgstr ""
+
+#: kopete/config/appearance/appearanceconfig.cpp:174
+#: kopete/config/appearance/appearanceconfig.cpp:659
+msgid "An unknow error occurred while trying to install the Chat Window style."
+msgstr ""
+
+#: kopete/config/appearance/appearanceconfig.cpp:174
+#: kopete/config/appearance/appearanceconfig.cpp:659
+#, fuzzy
+msgid "Unknow error"
+msgstr "Gwall anhysbys."
+
+#: kopete/config/appearance/appearanceconfig.cpp:212
+msgid "&Emoticons"
+msgstr ""
+
+#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 33
+#: kopete/config/appearance/appearanceconfig.cpp:251 rc.cpp:1464
+#, no-c-format
+msgid "Chat Window"
+msgstr "Ffenest Sgwrsio"
+
+#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 190
+#: kopete/config/appearance/appearanceconfig.cpp:287 rc.cpp:1497
+#, no-c-format
+msgid "Contact List"
+msgstr ""
+
+#: kopete/config/appearance/appearanceconfig.cpp:325
+msgid "Colors && Fonts"
+msgstr ""
+
+#: kopete/config/appearance/appearanceconfig.cpp:589
+msgid "(No Variant)"
+msgstr ""
+
+#: kopete/config/appearance/appearanceconfig.cpp:627
+msgid "Choose Chat Window style to install."
+msgstr ""
+
+#: kopete/config/appearance/appearanceconfig.cpp:640
+msgid "Can't open archive"
+msgstr ""
+
+#: kopete/config/appearance/appearanceconfig.cpp:645
+msgid "Can't find styles directory"
+msgstr ""
+
+#: kopete/config/appearance/appearanceconfig.cpp:676
+msgid ""
+"_: It's the deleted style name\n"
+"The style %1 was successfully deleted."
+msgstr ""
+
+#: kopete/config/appearance/appearanceconfig.cpp:685
+msgid ""
+"_: It's the deleted style name\n"
+"An error occured while trying to delete %1 style."
+msgstr ""
+
+#: kopete/config/appearance/appearanceconfig.cpp:743
+msgid ""
+"_: This is the myself preview contact id\n"
+"myself@preview"
+msgstr ""
+
+#: kopete/config/appearance/appearanceconfig.cpp:744
+msgid ""
+"_: This is the myself preview contact nickname\n"
+"Myself"
+msgstr ""
+
+#: kopete/config/appearance/appearanceconfig.cpp:746
+msgid ""
+"_: This is the other preview contact id\n"
+"jack@preview"
+msgstr ""
+
+#: kopete/config/appearance/appearanceconfig.cpp:747
+msgid ""
+"_: This is the other preview contact nickname\n"
+"Jack"
+msgstr ""
+
+#: kopete/config/appearance/appearanceconfig.cpp:748
+msgid "Myself"
+msgstr ""
+
+#: kopete/config/appearance/appearanceconfig.cpp:750
+msgid "Jack"
+msgstr ""
+
+#: kopete/config/appearance/appearanceconfig.cpp:762
+msgid "Hello, this is an incoming message :-)"
+msgstr ""
+
+#: kopete/config/appearance/appearanceconfig.cpp:763
+msgid "Hello, this is an incoming consecutive message."
+msgstr ""
+
+#: kopete/config/appearance/appearanceconfig.cpp:765
+msgid "Ok, this is an outgoing message"
+msgstr ""
+
+#: kopete/config/appearance/appearanceconfig.cpp:766
+msgid "Ok, a outgoing consecutive message."
+msgstr ""
+
+#: kopete/config/appearance/appearanceconfig.cpp:768
+msgid "Here is an incoming colored message"
+msgstr ""
+
+#: kopete/config/appearance/appearanceconfig.cpp:771
+msgid "This is an internal message"
+msgstr ""
+
+#: kopete/config/appearance/appearanceconfig.cpp:772
+msgid "performed an action"
+msgstr ""
+
+#: kopete/config/appearance/appearanceconfig.cpp:774
+msgid "This is a highlighted message"
+msgstr ""
+
+#: kopete/config/appearance/appearanceconfig.cpp:777
+msgid ""
+"_: This special UTF-8 string is to test if the style support Right-to-Left "
+"language display.\n"
+"הודעות טקסט"
+msgstr ""
+
+#: kopete/config/appearance/appearanceconfig.cpp:778
+msgid ""
+"That message was in a Right-to-Left language, which Kopete also supports."
+msgstr ""
+
+#: kopete/config/appearance/appearanceconfig.cpp:779
+msgid "Bye"
+msgstr "Ta ra"
+
+#: kopete/config/appearance/appearanceconfig.cpp:814
+msgid "Drag or Type Emoticon Theme URL"
+msgstr ""
+
+#: kopete/config/appearance/appearanceconfig.cpp:821
+msgid "Sorry, emoticon themes must be installed from local files."
+msgstr ""
+
+#: kopete/config/appearance/appearanceconfig.cpp:822
+msgid "Could Not Install Emoticon Theme"
+msgstr ""
+
+#: kopete/config/appearance/appearanceconfig.cpp:838
+msgid ""
+"<qt>Are you sure you want to remove the <strong>%1</strong> emoticon theme?"
+"<br>"
+"<br>This will delete the files installed by this theme.</qt>"
+msgstr ""
+
+#: kopete/config/appearance/appearanceconfig.cpp:844
+msgid "Confirmation"
+msgstr "Gwiriad"
+
+#: kopete/config/appearance/appearanceconfig.cpp:865
+#: kopete/config/appearance/appearanceconfig.cpp:867
+msgid "Get New Emoticons"
+msgstr "Nôl Teimladnoddau Newydd"
+
+#: kopete/config/appearance/tooltipeditdialog.cpp:56
+msgid "Tooltip Editor"
+msgstr ""
+
+#: kopete/config/appearance/emoticonseditdialog.cpp:58
+msgid ""
+"Insert the string for the emoticon\n"
+"separated by space if you want multiple strings"
+msgstr ""
+
+#: kopete/config/appearance/emoticonseditdialog.cpp:82
+msgid "Emoticons Editor"
+msgstr ""
+
+#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 167
+#: kopete/config/appearance/emoticonseditdialog.cpp:90
+#: protocols/gadu/gaducontact.cpp:204 rc.cpp:269 rc.cpp:1524
+#, no-c-format
+msgid "Edit..."
+msgstr "Golygu..."
+
+#: kopete/config/identity/kopeteidentityconfig.cpp:416
+msgid "New Identity"
+msgstr "Dynodiad Newydd"
+
+#: kopete/config/identity/kopeteidentityconfig.cpp:416
+#: kopete/config/identity/kopeteidentityconfig.cpp:431
+#: kopete/config/identity/kopeteidentityconfig.cpp:456
+msgid "Identity name:"
+msgstr "Enw dynodiad:"
+
+#: kopete/config/identity/kopeteidentityconfig.cpp:431
+msgid "Copy Identity"
+msgstr ""
+
+#: kopete/config/identity/kopeteidentityconfig.cpp:446
+#: kopete/config/identity/kopeteidentityconfig.cpp:474
+msgid "An identity with the same name was found."
+msgstr ""
+
+#: kopete/config/identity/kopeteidentityconfig.cpp:446
+#: kopete/config/identity/kopeteidentityconfig.cpp:474
+#: kopete/config/identity/kopeteidentityconfig.cpp:573
+#: kopete/config/identity/kopeteidentityconfig.cpp:582
+msgid "Identity Configuration"
+msgstr "Ffurfweddu Dynodiad"
+
+#: kopete/config/identity/kopeteidentityconfig.cpp:456
+msgid "Rename Identity"
+msgstr "Ailenwi Dynodiad"
+
+#: kopete/config/identity/kopeteidentityconfig.cpp:506
+#: libkopete/ui/addressbooklinkwidget.cpp:81
+msgid "Addressbook Association"
+msgstr "Cyfeiriadur"
+
+#: kopete/config/identity/kopeteidentityconfig.cpp:506
+msgid "Choose the person who is yourself."
+msgstr ""
+
+#: kopete/config/identity/kopeteidentityconfig.cpp:572
+#: kopete/config/identity/kopeteidentityconfig.cpp:581
+msgid "An error occurred when trying to save the custom photo for %1 identity."
+msgstr ""
+
+#: kopete/config/identity/globalidentitiesmanager.cpp:164
+msgid "Default Identity"
+msgstr ""
+
+#: kopete/config/accounts/kopeteaccountconfig.cpp:198
+#: libkopete/kopeteaccount.cpp:514
+msgid "Edit Account"
+msgstr "Golygu Cyfrif:"
+
+#: kopete/config/accounts/kopeteaccountconfig.cpp:234
+msgid "Are you sure you want to remove the account \"%1\"?"
+msgstr ""
+
+#: kopete/config/accounts/kopeteaccountconfig.cpp:235
+msgid "Remove Account"
+msgstr ""
+
+#: kopete/addaccountwizard/addaccountwizard.cpp:49
+msgid ""
+"_: 1st message shown to users on first run of Kopete. Please keep the "
+"formatting.\n"
+"<h2>Welcome to Kopete</h2>"
+"<p>Which messaging service do you want to connect to?</p>"
+msgstr ""
+
+#: kopete/addaccountwizard/addaccountwizard.cpp:56
+msgid ""
+"_: 2nd message shown to users on first run of Kopete. Please keep the "
+"formatting.\n"
+"<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:131
+msgid "Cannot load the %1 protocol plugin."
+msgstr ""
+
+#: kopete/addaccountwizard/addaccountwizard.cpp:132
+#: kopete/addaccountwizard/addaccountwizard.cpp:141
+msgid "Error While Adding Account"
+msgstr ""
+
+#: kopete/addaccountwizard/addaccountwizard.cpp:140
+msgid "This protocol does not currently support adding accounts."
+msgstr ""
+
+#: kopete/addaccountwizard/addaccountwizard.cpp:145
+msgid "Step Two: Account Information"
 msgstr ""
 
 #: kopete/kopeteeditglobalidentitywidget.cpp:166
@@ -1185,20 +2048,9 @@ msgstr ""
 msgid "URLs to pass to kopete / emoticon themes to install"
 msgstr ""
 
-#. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 479
-#: kopete/contactlist/kopetecontactlistview.cpp:760
-#: kopete/contactlist/kopetecontactlistview.cpp:991
-#: kopete/contactlist/kopetecontactlistview.cpp:1007
-#: kopete/contactlist/kopetecontactlistview.cpp:1477 kopete/main.cpp:52
-#: protocols/irc/ui/irceditaccountwidget.cpp:275
-#: protocols/msn/msncontact.cpp:321
-#: protocols/oscar/liboscar/userdetails.cpp:323 rc.cpp:4614
-#, no-c-format
-msgid "Kopete"
-msgstr "Kopete"
-
 #: kopete/main.cpp:54
 msgid ""
+"(c) 2009-2010, Timothy Pearson\n"
 "(c) 2001-2004, Duncan Mac-Vicar Prett\n"
 "(c) 2002-2005, Kopete Development Team"
 msgstr ""
@@ -1209,4084 +2061,5274 @@ msgid "Developer and Project founder"
 msgstr "Datblygwr, cynhaliwr y rhyngwyneb defnyddiwr"
 
 #: kopete/main.cpp:57
+#, fuzzy
+msgid "Developer, maintainer"
+msgstr "Datblygwr, cynhaliwr y rhyngwyneb defnyddiwr"
+
+#: kopete/main.cpp:58
 msgid "Developer, Yahoo plugin maintainer"
 msgstr "Datblygwr, cynhaliwr yr ategyn Yahoo"
 
-#: kopete/main.cpp:58 kopete/main.cpp:64
+#: kopete/main.cpp:59 kopete/main.cpp:65
 msgid "Developer"
 msgstr "Datblygwr"
 
-#: kopete/main.cpp:59
+#: kopete/main.cpp:60
 msgid "Developer, Yahoo"
 msgstr "Datblygwr, Yahoo"
 
-#: kopete/main.cpp:60
+#: kopete/main.cpp:61
 msgid "Developer, Connection status plugin author"
 msgstr "Datblygwr, cynhaliwr yr ategyn cyflwr cysylltiad"
 
-#: kopete/main.cpp:61
+#: kopete/main.cpp:62
 msgid "Developer, Video device support"
 msgstr "Datblygwr, cynhaliaeth dyfais fideo"
 
-#: kopete/main.cpp:62
+#: kopete/main.cpp:63
 msgid "Developer, MSN"
 msgstr "Datblygwr, MSN"
 
-#: kopete/main.cpp:63
+#: kopete/main.cpp:64
 msgid "Developer, Gadu plugin maintainer"
 msgstr "Datblygwr, cynhaliwr yr ategyn Gadu"
 
-#: kopete/main.cpp:65
+#: kopete/main.cpp:66
 #, fuzzy
 msgid "Lead Developer, AIM and ICQ plugin maintainer"
 msgstr "Prif ddatblygwr, cynhaliwr yr ategyn MSN"
 
-#: kopete/main.cpp:66
+#: kopete/main.cpp:67
 msgid "IRC plugin maintainer"
 msgstr "Cynhaliwr yr ategyn IRC"
 
-#: kopete/main.cpp:67
+#: kopete/main.cpp:68
 #, fuzzy
 msgid "Lead Developer"
 msgstr "Datblygwr"
 
-#: kopete/main.cpp:68
+#: kopete/main.cpp:69
 msgid "Lead Developer, MSN plugin maintainer"
 msgstr "Prif ddatblygwr, cynhaliwr yr ategyn MSN"
 
-#: kopete/main.cpp:69
+#: kopete/main.cpp:70
 #, fuzzy
 msgid "Artist / Developer, Artwork maintainer"
 msgstr "Datblygwr, cynhaliwr y rhyngwyneb defnyddiwr"
 
-#: kopete/main.cpp:70
+#: kopete/main.cpp:71
 msgid "Developer, UI maintainer"
 msgstr "Datblygwr, cynhaliwr y rhyngwyneb defnyddiwr"
 
-#: kopete/main.cpp:71
+#: kopete/main.cpp:72
 msgid "Developer, Jabber plugin maintainer"
 msgstr "Datblygwr, cynhaliwr yr ategyn Jabber"
 
-#: kopete/main.cpp:72
+#: kopete/main.cpp:73
 #, fuzzy
 msgid "Lead Developer, GroupWise maintainer"
 msgstr "Datblygwr, cynhaliwr GroupWise"
 
-#: kopete/main.cpp:74
+#: kopete/main.cpp:75
 msgid "Konki style author"
 msgstr ""
 
-#: kopete/main.cpp:75
+#: kopete/main.cpp:76
 msgid "Hacker style author"
 msgstr ""
 
-#: kopete/main.cpp:76
+#: kopete/main.cpp:77
 msgid "Kopete's icon author"
 msgstr "Awdur eicon Kopete"
 
-#: kopete/main.cpp:77
+#: kopete/main.cpp:78
 msgid "Sounds"
 msgstr "Syniau"
 
-#: kopete/main.cpp:78
+#: kopete/main.cpp:79
 msgid "Kopete Docugoddess, Bug and Patch Testing."
 msgstr ""
 
-#: kopete/main.cpp:79
+#: kopete/main.cpp:80
 msgid "Iris Jabber Backend Library"
 msgstr ""
 
-#: kopete/main.cpp:80
+#: kopete/main.cpp:81
 msgid "OscarSocket author"
 msgstr ""
 
-#: kopete/main.cpp:81
+#: kopete/main.cpp:82
 msgid "Kmerlin MSN code"
 msgstr ""
 
-#: kopete/main.cpp:82
+#: kopete/main.cpp:83
 msgid "Former developer, project co-founder"
 msgstr ""
 
-#: kopete/main.cpp:83 kopete/main.cpp:84 kopete/main.cpp:85 kopete/main.cpp:86
-#: kopete/main.cpp:89 kopete/main.cpp:92
+#: kopete/main.cpp:84 kopete/main.cpp:85 kopete/main.cpp:86 kopete/main.cpp:87
+#: kopete/main.cpp:90 kopete/main.cpp:93
 msgid "Former developer"
 msgstr "Cyn-ddatblygwr"
 
-#: kopete/main.cpp:87
+#: kopete/main.cpp:88
 msgid "Misc bugfixes and enhancements"
 msgstr ""
 
-#: kopete/main.cpp:88
+#: kopete/main.cpp:89
 msgid "Former developer, original Gadu plugin author"
 msgstr ""
 
-#: kopete/main.cpp:90
+#: kopete/main.cpp:91
 msgid "Former developer, Jabber plugin author"
 msgstr ""
 
-#: kopete/main.cpp:91
+#: kopete/main.cpp:92
 msgid "Former developer, Oscar plugin"
 msgstr ""
 
-#: kopete/main.cpp:93
+#: kopete/main.cpp:94
 msgid "Former developer and WinPopup maintainer"
 msgstr ""
 
-#: kopete/config/avdevice/avdeviceconfig.cpp:69
-msgid "&Video"
-msgstr "&Fideo"
+#: protocols/winpopup/wpprotocol.cpp:144
+msgid "The Samba configuration file is modified."
+msgstr ""
 
-#. i18n: file ./kopete/contactlist/kopetegvipropswidget.ui line 31
-#: kopete/config/behavior/behaviorconfig.cpp:59 rc.cpp:1025 rc.cpp:1043
-#: rc.cpp:4338
-#, no-c-format
-msgid "&General"
-msgstr "&Cyffredinol"
+#: protocols/winpopup/wpprotocol.cpp:144
+msgid "Configuration Succeeded"
+msgstr ""
 
-#: kopete/config/behavior/behaviorconfig.cpp:63
-msgid "&Events"
-msgstr "&Digwyddiadau:"
+#: protocols/winpopup/wpprotocol.cpp:146
+msgid "Updating the Samba configuration file failed."
+msgstr ""
 
-#: kopete/config/behavior/behaviorconfig.cpp:67
-msgid "A&way Settings"
-msgstr "Gosodiadau I Ffwrdd"
+#: protocols/winpopup/wpprotocol.cpp:146
+msgid "Configuration Failed"
+msgstr ""
 
-#: kopete/config/behavior/behaviorconfig.cpp:71
-msgid "Cha&t"
-msgstr "S&gwrsio"
+#: protocols/winpopup/wpaddcontact.cpp:90
+msgid "<qt>You must enter a valid hostname.</qt>"
+msgstr ""
 
-#: kopete/config/identity/kopeteidentityconfig.cpp:367
-#: kopete/contactlist/kopetelviprops.cpp:357
-msgid "No Contacts with Photo Support"
-msgstr "Dim Cysylltau sy'n Cynnal Ffoto"
+#: protocols/winpopup/wpaddcontact.cpp:90
+#: protocols/winpopup/wpaddcontact.cpp:97
+#: protocols/winpopup/wpeditaccount.cpp:100
+#: protocols/winpopup/wpeditaccount.cpp:106
+msgid "WinPopup"
+msgstr "WinPopup"
 
-#: kopete/config/identity/kopeteidentityconfig.cpp:416
-msgid "New Identity"
-msgstr "Dynodiad Newydd"
+#: protocols/winpopup/wpaddcontact.cpp:97
+msgid "<qt>LOCALHOST is not allowed as contact.</qt>"
+msgstr ""
 
-#: kopete/config/identity/kopeteidentityconfig.cpp:416
-#: kopete/config/identity/kopeteidentityconfig.cpp:431
-#: kopete/config/identity/kopeteidentityconfig.cpp:456
-msgid "Identity name:"
-msgstr "Enw dynodiad:"
+#: protocols/winpopup/wpuserinfo.cpp:37
+msgid "N/A"
+msgstr "N/A"
 
-#: kopete/config/identity/kopeteidentityconfig.cpp:431
-msgid "Copy Identity"
+#: libkopete/ui/userinfodialog.cpp:62 protocols/winpopup/wpuserinfo.cpp:41
+#, c-format
+msgid "User Info for %1"
 msgstr ""
 
-#: kopete/config/identity/kopeteidentityconfig.cpp:446
-#: kopete/config/identity/kopeteidentityconfig.cpp:474
-msgid "An identity with the same name was found."
+#: protocols/winpopup/wpuserinfo.cpp:48 protocols/winpopup/wpuserinfo.cpp:49
+#: protocols/winpopup/wpuserinfo.cpp:50 protocols/winpopup/wpuserinfo.cpp:51
+#, fuzzy
+msgid "Looking"
+msgstr "Cofnodion"
+
+#: protocols/winpopup/libwinpopup/libwinpopup.cpp:106
+msgid ""
+"Working directory %1 does not exist.\n"
+"If you have not configured anything yet (samba) please see\n"
+"Install Into Samba (Configure... -> Account -> Edit) information\n"
+"on how to do this.\n"
+"Should the directory be created? (May need root password)"
 msgstr ""
 
-#: kopete/config/identity/kopeteidentityconfig.cpp:446
-#: kopete/config/identity/kopeteidentityconfig.cpp:474
-#: kopete/config/identity/kopeteidentityconfig.cpp:573
-#: kopete/config/identity/kopeteidentityconfig.cpp:582
-msgid "Identity Configuration"
-msgstr "Ffurfweddu Dynodiad"
+#: protocols/winpopup/libwinpopup/libwinpopup.cpp:111
+msgid "Create Directory"
+msgstr ""
 
-#: kopete/config/identity/kopeteidentityconfig.cpp:456
-msgid "Rename Identity"
-msgstr "Ailenwi Dynodiad"
+#: protocols/winpopup/libwinpopup/libwinpopup.cpp:111
+#, fuzzy
+msgid "Do Not Create"
+msgstr "Heb gysylltu"
 
-#: kopete/config/identity/kopeteidentityconfig.cpp:506
-msgid "Choose the person who is yourself."
+#: protocols/winpopup/libwinpopup/libwinpopup.cpp:125
+msgid ""
+"Permissions of the working directory %1 are wrong!\n"
+"You will not receive messages if you say no.\n"
+"You can also correct it manually (chmod 0777 %1) and restart kopete.\n"
+"Fix? (May need root password)"
 msgstr ""
 
-#: kopete/config/identity/kopeteidentityconfig.cpp:572
-#: kopete/config/identity/kopeteidentityconfig.cpp:581
-msgid "An error occurred when trying to save the custom photo for %1 identity."
+#: protocols/winpopup/libwinpopup/libwinpopup.cpp:130
+#: protocols/winpopup/libwinpopup/libwinpopup.cpp:306
+#, fuzzy
+msgid "Fix"
+msgstr "Ffacs"
+
+#: protocols/winpopup/libwinpopup/libwinpopup.cpp:130
+#: protocols/winpopup/libwinpopup/libwinpopup.cpp:306
+msgid "Do Not Fix"
 msgstr ""
 
-#: kopete/config/identity/globalidentitiesmanager.cpp:164
-msgid "Default Identity"
+#: protocols/winpopup/libwinpopup/libwinpopup.cpp:234
+msgid ""
+"Connection to localhost failed!\n"
+"Is your samba server running?"
 msgstr ""
 
-#: kopete/config/accounts/kopeteaccountconfig.cpp:234
-msgid "Are you sure you want to remove the account \"%1\"?"
+#: protocols/winpopup/libwinpopup/libwinpopup.cpp:303
+msgid ""
+"A message file could not be removed; maybe the permissions are wrong.\n"
+"Fix? (May need root password)"
 msgstr ""
 
-#: kopete/config/accounts/kopeteaccountconfig.cpp:235
-msgid "Remove Account"
+#: protocols/winpopup/libwinpopup/libwinpopup.cpp:311
+msgid "Still cannot remove it; please fix manually."
 msgstr ""
 
-#: kopete/config/appearance/tooltipeditdialog.cpp:56
-msgid "Tooltip Editor"
+#: protocols/winpopup/wpaccount.cpp:163
+msgid "WinPopup (%1)"
 msgstr ""
 
-#: kopete/config/appearance/appearanceconfig.cpp:150
-#: kopete/config/appearance/appearanceconfig.cpp:641
-msgid "The Chat Window style was successfully installed."
+#: protocols/meanwhile/meanwhileeditaccountwidget.cpp:151
+#: protocols/oscar/aim/ui/aimaddcontactpage.cpp:65
+#: protocols/winpopup/wpeditaccount.cpp:100
+#: protocols/yahoo/yahooeditaccount.cpp:108
+msgid "<qt>You must enter a valid screen name.</qt>"
 msgstr ""
 
-#: kopete/config/appearance/appearanceconfig.cpp:150
-#: kopete/config/appearance/appearanceconfig.cpp:641
-msgid "Install successful"
+#: protocols/winpopup/wpeditaccount.cpp:106
+msgid "<qt>You must enter a valid smbclient path.</qt>"
 msgstr ""
 
-#: kopete/config/appearance/appearanceconfig.cpp:155
-#: kopete/config/appearance/appearanceconfig.cpp:628
-msgid ""
-"The specified archive cannot be opened.\n"
-"Make sure that the archive is valid ZIP or TAR archive."
+#: protocols/yahoo/yahooconferencemessagemanager.cpp:50
+#, fuzzy
+msgid "&Invite others"
+msgstr "G&wahodd"
+
+#: protocols/yahoo/yahooverifyaccount.cpp:41
+msgid "Account Verification - Yahoo"
 msgstr ""
 
-#: kopete/config/appearance/appearanceconfig.cpp:155
-msgid "Cannot open archive"
+#: protocols/yahoo/yahoochatsession.cpp:56
+#, fuzzy
+msgid "Buzz Contact"
+msgstr "&Ychwanegu Cyswllt"
+
+#: protocols/yahoo/yahoochatsession.cpp:57
+#, fuzzy
+msgid "Show User Info"
+msgstr "Gwybo&daeth am Ddefnyddwyr"
+
+#: protocols/yahoo/yahoochatsession.cpp:58
+msgid "Request Webcam"
 msgstr ""
 
-#: kopete/config/appearance/appearanceconfig.cpp:160
-#: kopete/config/appearance/appearanceconfig.cpp:633
-msgid ""
-"Could not find a suitable place to install the Chat Window style in user "
-"directory."
+#: protocols/yahoo/yahoochatsession.cpp:59
+#: protocols/yahoo/yahoocontact.cpp:380
+msgid "Invite to view your Webcam"
 msgstr ""
 
-#: kopete/config/appearance/appearanceconfig.cpp:160
-msgid "Cannot find styles directory"
+#: protocols/jabber/jabberchatsession.cpp:88
+#: protocols/yahoo/yahoochatsession.cpp:60
+#, fuzzy
+msgid "Send File"
+msgstr "Anfon& Ffeil..."
+
+#: protocols/yahoo/yahoochatsession.cpp:65
+msgid "Yahoo Display Picture"
 msgstr ""
 
-#: kopete/config/appearance/appearanceconfig.cpp:165
-#: kopete/config/appearance/appearanceconfig.cpp:637
-msgid "The specified archive does not contain a valid Chat Window style."
+#: protocols/yahoo/yahooprotocol.cpp:44
+msgid "Be right back"
 msgstr ""
 
-#: kopete/config/appearance/appearanceconfig.cpp:165
-#: kopete/config/appearance/appearanceconfig.cpp:637
-msgid "Invalid Style"
+#: protocols/gadu/gaduprotocol.cpp:63 protocols/gadu/gaduprotocol.cpp:65
+#: protocols/groupwise/gwprotocol.cpp:52
+#: protocols/meanwhile/meanwhileprotocol.cpp:51
+#: protocols/yahoo/yahooprotocol.cpp:45
+msgid "Busy"
+msgstr "Prysur"
+
+#: protocols/yahoo/yahooprotocol.cpp:46
+msgid "Not at home"
 msgstr ""
 
-#: kopete/config/appearance/appearanceconfig.cpp:172
-#: kopete/config/appearance/appearanceconfig.cpp:647
-msgid "An unknow error occurred while trying to install the Chat Window style."
+#: protocols/yahoo/yahooprotocol.cpp:47
+msgid "Not at my desk"
 msgstr ""
 
-#: kopete/config/appearance/appearanceconfig.cpp:172
-#: kopete/config/appearance/appearanceconfig.cpp:647
-#, fuzzy
-msgid "Unknow error"
-msgstr "Gwall anhysbys."
+#: protocols/yahoo/yahooprotocol.cpp:48
+msgid "Not in the office"
+msgstr ""
 
-#: kopete/config/appearance/appearanceconfig.cpp:208
-msgid "&Emoticons"
+#: protocols/yahoo/yahooprotocol.cpp:49
+msgid "On the phone"
 msgstr ""
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 33
-#: kopete/config/appearance/appearanceconfig.cpp:247 rc.cpp:772
-#, no-c-format
-msgid "Chat Window"
-msgstr "Ffenest Sgwrsio"
+#: protocols/yahoo/yahooprotocol.cpp:50
+msgid "On vacation"
+msgstr ""
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 190
-#: kopete/config/appearance/appearanceconfig.cpp:281 rc.cpp:805
-#, no-c-format
-msgid "Contact List"
+#: protocols/yahoo/yahooprotocol.cpp:51
+msgid "Out to lunch"
 msgstr ""
 
-#: kopete/config/appearance/appearanceconfig.cpp:317
-msgid "Colors && Fonts"
+#: protocols/yahoo/yahooprotocol.cpp:52
+msgid "Stepped out"
 msgstr ""
 
-#: kopete/config/appearance/appearanceconfig.cpp:577
-msgid "(No Variant)"
+#: libkopete/kopeteonlinestatus.cpp:119 protocols/gadu/gaduprotocol.cpp:67
+#: protocols/gadu/gaduprotocol.cpp:69 protocols/jabber/jabbercontact.cpp:166
+#: protocols/jabber/jabberprotocol.cpp:80 protocols/yahoo/yahooprotocol.cpp:53
+msgid "Invisible"
 msgstr ""
 
-#: kopete/config/appearance/appearanceconfig.cpp:615
-msgid "Choose Chat Window style to install."
+#: protocols/yahoo/yahooprotocol.cpp:54
+msgid "Custom"
+msgstr "Addasiedig"
+
+#: protocols/groupwise/gwprotocol.cpp:56
+#: protocols/meanwhile/meanwhileprotocol.cpp:56
+#: protocols/yahoo/yahooprotocol.cpp:55
+msgid "Idle"
+msgstr "Segur"
+
+#: libkopete/kopeteonlinestatus.cpp:116 protocols/gadu/gaduprotocol.cpp:75
+#: protocols/groupwise/gwprotocol.cpp:66 protocols/irc/ircprotocol.cpp:145
+#: protocols/jabber/jabberprotocol.cpp:81 protocols/sms/smsprotocol.cpp:38
+#: protocols/yahoo/yahooprotocol.cpp:56
+msgid "Connecting"
+msgstr "Cysylltu"
+
+#: protocols/yahoo/yahooprotocol.cpp:58
+msgid "Buddy Icon Checksum"
 msgstr ""
 
-#: kopete/config/appearance/appearanceconfig.cpp:628
-msgid "Can't open archive"
+#: protocols/yahoo/yahooprotocol.cpp:59
+msgid "Buddy Icon Expire"
 msgstr ""
 
-#: kopete/config/appearance/appearanceconfig.cpp:633
-msgid "Can't find styles directory"
+#: protocols/yahoo/yahooprotocol.cpp:60
+msgid "Buddy Icon Remote Url"
 msgstr ""
 
-#: kopete/config/appearance/appearanceconfig.cpp:664
-msgid ""
-"_: It's the deleted style name\n"
-"The style %1 was successfully deleted."
+#: protocols/groupwise/ui/gwcontactproperties.cpp:114
+#: protocols/yahoo/yahooprotocol.cpp:65
+msgid "Title"
+msgstr "Teitl"
+
+#: protocols/yahoo/yahooprotocol.cpp:68
+msgid "YAB Id"
 msgstr ""
 
-#: kopete/config/appearance/appearanceconfig.cpp:673
-msgid ""
-"_: It's the deleted style name\n"
-"An error occured while trying to delete %1 style."
+#: protocols/yahoo/yahooprotocol.cpp:69
+#, fuzzy
+msgid "Pager number"
+msgstr "Rhifau ffôn"
+
+#: protocols/yahoo/yahooprotocol.cpp:70
+msgid "Fax number"
 msgstr ""
 
-#: kopete/config/appearance/appearanceconfig.cpp:731
-msgid ""
-"_: This is the myself preview contact id\n"
-"myself@preview"
+#: protocols/yahoo/yahooprotocol.cpp:71
+msgid "Additional number"
 msgstr ""
 
-#: kopete/config/appearance/appearanceconfig.cpp:732
-msgid ""
-"_: This is the myself preview contact nickname\n"
-"Myself"
+#: protocols/yahoo/yahooprotocol.cpp:72 protocols/yahoo/yahooprotocol.cpp:73
+msgid "Alternative email 1"
 msgstr ""
 
-#: kopete/config/appearance/appearanceconfig.cpp:734
-msgid ""
-"_: This is the other preview contact id\n"
-"jack@preview"
+#: protocols/oscar/aim/aimprotocol.cpp:187
+#: protocols/oscar/oscaraccount.cpp:809 protocols/yahoo/yahooprotocol.cpp:74
+msgid "AIM"
+msgstr "AIM"
+
+#: protocols/oscar/icq/icqprotocol.cpp:139
+#: protocols/oscar/oscaraccount.cpp:809 protocols/yahoo/yahooprotocol.cpp:75
+msgid "ICQ"
+msgstr "ICQ"
+
+#: protocols/yahoo/yahooprotocol.cpp:76
+msgid "GoogleTalk"
 msgstr ""
 
-#: kopete/config/appearance/appearanceconfig.cpp:735
-msgid ""
-"_: This is the other preview contact nickname\n"
-"Jack"
+#: protocols/yahoo/yahooprotocol.cpp:77
+#, fuzzy
+msgid "Skype"
+msgstr "Gofodnod"
+
+#. i18n: file ./protocols/irc/ircchatui.rc line 5
+#: protocols/yahoo/yahooprotocol.cpp:78 rc.cpp:4647
+#, no-c-format
+msgid "IRC"
+msgstr "IRC"
+
+#: protocols/yahoo/yahooprotocol.cpp:79
+msgid "QQ"
 msgstr ""
 
-#: kopete/config/appearance/appearanceconfig.cpp:736
-msgid "Myself"
+#: protocols/yahoo/yahooprotocol.cpp:80
+#, fuzzy
+msgid "Private Address"
+msgstr "Cyfeiriad IP"
+
+#: protocols/yahoo/yahooprotocol.cpp:81
+#, fuzzy
+msgid "Private City"
+msgstr "Preifatwydd"
+
+#: protocols/yahoo/yahooprotocol.cpp:82
+msgid "Private State"
 msgstr ""
 
-#: kopete/config/appearance/appearanceconfig.cpp:738
-msgid "Jack"
+#: protocols/yahoo/yahooprotocol.cpp:83
+msgid "Private ZIP"
 msgstr ""
 
-#: kopete/config/appearance/appearanceconfig.cpp:750
-msgid "Hello, this is an incoming message :-)"
+#: protocols/yahoo/yahooprotocol.cpp:84
+#, fuzzy
+msgid "Private Country"
+msgstr "Gwlad:"
+
+#: protocols/yahoo/yahooprotocol.cpp:86
+msgid "Private URL"
 msgstr ""
 
-#: kopete/config/appearance/appearanceconfig.cpp:751
-msgid "Hello, this is an incoming consecutive message."
+#: protocols/yahoo/yahooprotocol.cpp:87
+#, fuzzy
+msgid "Corporation"
+msgstr "Gwiriad"
+
+#: protocols/yahoo/yahooprotocol.cpp:88
+#, fuzzy
+msgid "Work Address"
+msgstr "Cyfeiriad &Gwaith"
+
+#: protocols/jabber/jabberprotocol.cpp:109
+#: protocols/yahoo/yahooprotocol.cpp:89
+#, fuzzy
+msgid "Work City"
+msgstr "Dinas"
+
+#: protocols/yahoo/yahooprotocol.cpp:90
+#, fuzzy
+msgid "Work State"
+msgstr "Stryd:"
+
+#: protocols/yahoo/yahooprotocol.cpp:91
+#, fuzzy
+msgid "Work ZIP"
+msgstr "&Gwybodaeth am Ddefnyddwyr"
+
+#: protocols/jabber/jabberprotocol.cpp:111
+#: protocols/yahoo/yahooprotocol.cpp:92
+#, fuzzy
+msgid "Work Country"
+msgstr "Gwlad:"
+
+#: protocols/yahoo/yahooprotocol.cpp:94
+#, fuzzy
+msgid "Work URL"
+msgstr "Gwaith :"
+
+#: protocols/jabber/jabberprotocol.cpp:99 protocols/yahoo/yahooprotocol.cpp:95
+msgid "Birthday"
+msgstr "Penblwydd"
+
+#: protocols/yahoo/yahooprotocol.cpp:96
+msgid "Anniversary"
 msgstr ""
 
-#: kopete/config/appearance/appearanceconfig.cpp:753
-msgid "Ok, this is an outgoing message"
+#: protocols/yahoo/yahooprotocol.cpp:97
+#, fuzzy
+msgid "Notes"
+msgstr "&Nodiadau"
+
+#: protocols/yahoo/yahooprotocol.cpp:98
+msgid "Additional 1"
 msgstr ""
 
-#: kopete/config/appearance/appearanceconfig.cpp:754
-msgid "Ok, a outgoing consecutive message."
+#: protocols/yahoo/yahooprotocol.cpp:99
+msgid "Additional 2"
 msgstr ""
 
-#: kopete/config/appearance/appearanceconfig.cpp:756
-msgid "Here is an incoming colored message"
+#: protocols/yahoo/yahooprotocol.cpp:100
+msgid "Additional 3"
 msgstr ""
 
-#: kopete/config/appearance/appearanceconfig.cpp:759
-msgid "This is an internal message"
+#: protocols/yahoo/yahooprotocol.cpp:101
+msgid "Additional 4"
 msgstr ""
 
-#: kopete/config/appearance/appearanceconfig.cpp:760
-msgid "performed an action"
+#: protocols/yahoo/yahooeditaccount.cpp:108
+#: protocols/yahoo/yahooeditaccount.cpp:113
+msgid "Yahoo"
+msgstr "Yahoo"
+
+#: protocols/yahoo/yahooeditaccount.cpp:113
+msgid "<qt>You must enter a valid password.</qt>"
 msgstr ""
 
-#: kopete/config/appearance/appearanceconfig.cpp:762
-msgid "This is a highlighted message"
+#: protocols/yahoo/yahooeditaccount.cpp:167
+msgid "Yahoo Buddy Icon"
 msgstr ""
 
-#: kopete/config/appearance/appearanceconfig.cpp:765
-msgid ""
-"_: This special UTF-8 string is to test if the style support Right-to-Left "
-"language display.\n"
-"הודעות טקסט"
+#: protocols/yahoo/yahooaccount.cpp:1806
+#: protocols/yahoo/yahooeditaccount.cpp:180
+msgid "An error occurred when trying to change the display picture."
 msgstr ""
 
-#: kopete/config/appearance/appearanceconfig.cpp:766
+#: protocols/yahoo/yahooaccount.cpp:829 protocols/yahoo/yahooaccount.cpp:832
+#: protocols/yahoo/yahooaccount.cpp:1501 protocols/yahoo/yahooaccount.cpp:1693
+#: protocols/yahoo/yahooaccount.cpp:1791 protocols/yahoo/yahooaccount.cpp:1806
+#: protocols/yahoo/yahooeditaccount.cpp:180
+#: protocols/yahoo/yahooeditaccount.cpp:186
+msgid "Yahoo Plugin"
+msgstr ""
+
+#: protocols/yahoo/yahooeditaccount.cpp:186
 msgid ""
-"That message was in a Right-to-Left language, which Kopete also supports."
+"<qt>The selected buddy icon could not be opened. "
+"<br>Please set a new buddy icon.</qt>"
 msgstr ""
 
-#: kopete/config/appearance/appearanceconfig.cpp:767
-msgid "Bye"
-msgstr "Ta ra"
+#: protocols/yahoo/yahoocontact.cpp:117
+msgid "%1|Stealthed"
+msgstr ""
 
-#: kopete/config/appearance/appearanceconfig.cpp:802
-msgid "Drag or Type Emoticon Theme URL"
+#: protocols/yahoo/yahoocontact.cpp:369
+msgid "View &Webcam"
 msgstr ""
 
-#: kopete/config/appearance/appearanceconfig.cpp:809
-msgid "Sorry, emoticon themes must be installed from local files."
+#: protocols/yahoo/yahoocontact.cpp:391
+#, fuzzy
+msgid "&Buzz Contact"
+msgstr "&Ychwanegu Cyswllt"
+
+#: protocols/yahoo/yahoocontact.cpp:401
+#, fuzzy
+msgid "&Stealth Setting"
+msgstr "&Cadw Gosodiadau"
+
+#: protocols/yahoo/yahoocontact.cpp:411
+msgid "&Invite to Conference"
 msgstr ""
 
-#: kopete/config/appearance/appearanceconfig.cpp:810
-msgid "Could Not Install Emoticon Theme"
+#: protocols/yahoo/yahoocontact.cpp:421
+msgid "&View Yahoo Profile"
+msgstr ""
+
+#: protocols/yahoo/yahoocontact.cpp:465
+#, fuzzy
+msgid "Stealth Setting"
+msgstr "&Cadw Gosodiadau"
+
+#: protocols/yahoo/yahoocontact.cpp:519
+msgid "Buzzz!!!"
 msgstr ""
 
-#: kopete/config/appearance/appearanceconfig.cpp:826
+#: protocols/yahoo/yahoocontact.cpp:609 protocols/yahoo/yahoocontact.cpp:664
 msgid ""
-"<qt>Are you sure you want to remove the <strong>%1</strong> emoticon theme?"
-"<br>"
-"<br>This will delete the files installed by this theme.</qt>"
+"I cannot find the jasper image convert program.\n"
+"jasper is required to render the yahoo webcam images.\n"
+"Please see %1 for further information."
 msgstr ""
 
-#: kopete/config/appearance/appearanceconfig.cpp:832
-msgid "Confirmation"
-msgstr "Gwiriad"
+#: protocols/yahoo/yahooaccount.cpp:97
+msgid "Open Inbo&x..."
+msgstr ""
 
-#: kopete/config/appearance/appearanceconfig.cpp:853
-#: kopete/config/appearance/appearanceconfig.cpp:855
-msgid "Get New Emoticons"
-msgstr "Nôl Teimladnoddau Newydd"
+#: protocols/yahoo/yahooaccount.cpp:98
+#, fuzzy
+msgid "Open &Addressbook..."
+msgstr "&Cyfeiriad ebost:"
 
-#: kopete/config/plugins/kopetepluginconfig.cpp:43
-msgid "Configure Plugins"
-msgstr "Ffurfweddu Ategion"
+#: protocols/yahoo/yahooaccount.cpp:99
+#, fuzzy
+msgid "&Edit my contact details..."
+msgstr "&Allforio Cyswlltau..."
 
-#: kopete/config/plugins/kopetepluginconfig.cpp:44
-msgid "&Reset"
-msgstr "&Ailosod"
+#: protocols/yahoo/yahooaccount.cpp:100
+#, fuzzy
+msgid "&Join chat room..."
+msgstr "Ymuno â'r Sianel..."
 
-#: kopete/config/plugins/kopetepluginconfig.cpp:62
-msgid "General Plugins"
+#: protocols/yahoo/yahooaccount.cpp:753
+msgid ""
+"Could not log into the Yahoo service: your account has been locked.\n"
+"Visit %1 to reactivate it."
 msgstr ""
 
-#: kopete/kopeteiface.cpp:160
+#: protocols/yahoo/yahooaccount.cpp:762
 msgid ""
-"An external application is attempting to add the  '%1' contact '%2' to your "
-"contact list. Do you want to allow this?"
+"Could not log into the Yahoo service: the username specified was invalid."
 msgstr ""
 
-#: kopete/kopeteiface.cpp:162
-msgid "Allow Contact?"
+#: protocols/yahoo/yahooaccount.cpp:771
+msgid ""
+"You have been logged out of the Yahoo service, possibly due to a duplicate "
+"login."
 msgstr ""
 
-#: kopete/kopeteiface.cpp:162
-msgid "Allow"
-msgstr "Caniatáu"
+#: protocols/yahoo/yahooaccount.cpp:803
+msgid ""
+"%1 has been disconnected.\n"
+"Error message:\n"
+"%2 - %3"
+msgstr ""
 
-#: kopete/kopeteiface.cpp:162
-msgid "Reject"
-msgstr "Gwrthod"
+#: protocols/yahoo/yahooaccount.cpp:816
+msgid ""
+"There was an error while connecting %1 to the Yahoo server.\n"
+"Error message:\n"
+"%2 - %3"
+msgstr ""
 
-#: kopete/kopeteiface.cpp:175
+#: protocols/yahoo/yahooaccount.cpp:828 protocols/yahoo/yahooaccount.cpp:831
+#, fuzzy
 msgid ""
-"An external application has attempted to add a contact using  the %1 protocol, "
-"which either does not exist or is not loaded."
+"%1\n"
+"\n"
+"Reason: %2"
+msgstr "Rheswm:"
+
+#: protocols/yahoo/yahooaccount.cpp:891
+msgid "User %1 has granted your authorization request."
 msgstr ""
 
-#: kopete/kopeteiface.cpp:177
-msgid "Missing Protocol"
+#: protocols/yahoo/yahooaccount.cpp:902
+msgid ""
+"User %1 has rejected your authorization request.\n"
+"%2"
 msgstr ""
 
-#: kopete/addaccountwizard/addaccountwizard.cpp:49
+#: protocols/yahoo/yahooaccount.cpp:1192
 msgid ""
-"_: 1st message shown to users on first run of Kopete. Please keep the "
-"formatting.\n"
-"<h2>Welcome to Kopete</h2>"
-"<p>Which messaging service do you want to connect to?</p>"
+"_: This string is shown when the user is buzzed by a contact\n"
+"Buzz"
 msgstr ""
 
-#: kopete/addaccountwizard/addaccountwizard.cpp:56
+#: protocols/yahoo/yahooaccount.cpp:1230
 msgid ""
-"_: 2nd message shown to users on first run of Kopete. Please keep the "
-"formatting.\n"
-"<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>"
+"%1 has invited you to join a conference with %2.\n"
+"\n"
+"His/her message: %3\n"
+"\n"
+"Accept?"
 msgstr ""
 
-#: kopete/addaccountwizard/addaccountwizard.cpp:131
-msgid "Cannot load the %1 protocol plugin."
+#: protocols/yahoo/yahooaccount.cpp:1231 protocols/yahoo/yahooaccount.cpp:1685
+#: protocols/yahoo/yahooaccount.cpp:1896
+msgid "Accept"
+msgstr "Derbyn"
+
+#: protocols/yahoo/yahooaccount.cpp:1332
+msgid "%1 has declined to join the conference: \"%2\""
 msgstr ""
 
-#: kopete/addaccountwizard/addaccountwizard.cpp:132
-#: kopete/addaccountwizard/addaccountwizard.cpp:141
-msgid "Error While Adding Account"
+#: protocols/yahoo/yahooaccount.cpp:1646
+#, c-format
+msgid ""
+"_n: You have one unread message in your Yahoo inbox.\n"
+"You have %n unread messages in your Yahoo inbox."
 msgstr ""
 
-#: kopete/addaccountwizard/addaccountwizard.cpp:140
-msgid "This protocol does not currently support adding accounts."
+#: protocols/yahoo/yahooaccount.cpp:1654
+msgid "You have a message from %1 in your Yahoo inbox. <br><br>Subject: %2"
 msgstr ""
 
-#: kopete/addaccountwizard/addaccountwizard.cpp:145
-msgid "Step Two: Account Information"
+#: protocols/yahoo/yahooaccount.cpp:1684
+msgid "%1 has invited you to view his/her webcam. Accept?"
 msgstr ""
 
-#: kopete/contactlist/kopetelviprops.cpp:69
+#: protocols/yahoo/yahooaccount.cpp:1693
+#, fuzzy
+msgid "Webcam for %1 is not available."
+msgstr "A&r gael"
+
+#: protocols/yahoo/yahooaccount.cpp:1791
+msgid ""
+"<qt>The selected buddy icon could not be opened. <br />"
+"Please set a new buddy icon.</qt>"
+msgstr ""
+
+#: protocols/yahoo/yahooaccount.cpp:1895
+msgid "%1 wants to view your webcam. Grant access?"
+msgstr ""
+
+#: protocols/yahoo/ui/yahoouserinfodialog.cpp:43
+#, fuzzy
+msgid "Yahoo User Information"
+msgstr "Gwybodaeth Defnyddiwr"
+
+#: protocols/yahoo/ui/yahoouserinfodialog.cpp:43
+msgid "Save and Close"
+msgstr ""
+
+#: protocols/yahoo/ui/yahoouserinfodialog.cpp:43
+msgid "Merge with existing entry"
+msgstr ""
+
+#: protocols/oscar/icq/ui/icquserinfowidget.cpp:48
+#: protocols/yahoo/ui/yahoouserinfodialog.cpp:48
+#, fuzzy
+msgid "General Info"
+msgstr "Cyffredinol"
+
+#: protocols/yahoo/ui/yahoouserinfodialog.cpp:49
+#, fuzzy
+msgid "General Yahoo Information"
+msgstr "Gwybodaeth Defnyddiwr"
+
+#: protocols/oscar/icq/ui/icquserinfowidget.cpp:55
+#: protocols/yahoo/ui/yahoouserinfodialog.cpp:55
+#, fuzzy
+msgid "Work Info"
+msgstr "&Gwybodaeth am Ddefnyddwyr"
+
+#: protocols/oscar/icq/ui/icquserinfowidget.cpp:56
+#: protocols/yahoo/ui/yahoouserinfodialog.cpp:56
+msgid "Work Information"
+msgstr ""
+
+#: protocols/oscar/icq/ui/icquserinfowidget.cpp:62
+#: protocols/yahoo/ui/yahoouserinfodialog.cpp:62
+#, fuzzy
+msgid "Other Info"
+msgstr "&Gwybodaeth am Ddefnyddwyr"
+
+#: protocols/yahoo/ui/yahoouserinfodialog.cpp:63
+#, fuzzy
+msgid "Other Yahoo Information"
+msgstr "Gwybodaeth Defnyddiwr"
+
+#: protocols/yahoo/ui/yahoouserinfodialog.cpp:209
+#, fuzzy
+msgid "Replace existing entry"
+msgstr "Amnewidiad"
+
+#: protocols/yahoo/ui/yahoowebcamdialog.cpp:31
 #, c-format
-msgid "Properties of Group %1"
+msgid "Webcam for %1"
 msgstr ""
 
-#: kopete/contactlist/kopetelviprops.cpp:76
-#: kopete/contactlist/kopetelviprops.cpp:169
-msgid "Custom &Notifications"
+#: protocols/yahoo/ui/yahoowebcamdialog.cpp:45
+msgid "No webcam image received"
 msgstr ""
 
-#: kopete/contactlist/kopetelviprops.cpp:149
+#: protocols/yahoo/ui/yahoowebcamdialog.cpp:80
+msgid "%1 has stopped broadcasting"
+msgstr ""
+
+#: protocols/yahoo/ui/yahoowebcamdialog.cpp:82
+msgid "%1 has cancelled viewing permission"
+msgstr ""
+
+#: protocols/yahoo/ui/yahoowebcamdialog.cpp:84
+msgid "%1 has declined permission to view webcam"
+msgstr ""
+
+#: protocols/yahoo/ui/yahoowebcamdialog.cpp:86
+msgid "%1 does not have his/her webcam online"
+msgstr ""
+
+#: protocols/yahoo/ui/yahoowebcamdialog.cpp:88
+msgid "Unable to view the webcam of %1 for an unknown reason"
+msgstr ""
+
+#: protocols/yahoo/ui/yahoowebcamdialog.cpp:97
+msgid "%1 viewer(s)"
+msgstr ""
+
+#: protocols/yahoo/libkyahoo/picturenotifiertask.cpp:151
+#: protocols/yahoo/libkyahoo/sendpicturetask.cpp:79
+msgid "The picture was not successfully uploaded"
+msgstr ""
+
+#: protocols/yahoo/libkyahoo/sendpicturetask.cpp:108
 #, c-format
-msgid "Properties of Meta Contact %1"
+msgid "Error opening file: %1"
 msgstr ""
 
-#: kopete/contactlist/kopetelviprops.cpp:164
-msgid "Sync KABC..."
+#: protocols/yahoo/libkyahoo/webcamtask.cpp:199
+msgid ""
+"Webcam connection to the user %1 could not be established.\n"
+"\n"
+"Please relogin and try again."
 msgstr ""
 
-#: kopete/contactlist/kopetelviprops.cpp:513
-msgid "No contacts were imported from the address book."
+#: protocols/yahoo/libkyahoo/webcamtask.cpp:537
+msgid "An error occurred closing the webcam session. "
 msgstr ""
 
-#: kopete/contactlist/kopetelviprops.cpp:514
-msgid "No Change"
-msgstr "Dim Newid"
+#: protocols/yahoo/libkyahoo/webcamtask.cpp:537
+msgid "You tried to close a connection that did not exist."
+msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:291
-msgid "Online contacts (%1)"
+#: protocols/yahoo/libkyahoo/sendmessagetask.cpp:42
+msgid "An error occurred while sending the message"
 msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:292
-msgid "Offline contacts (%1)"
+#: protocols/yahoo/libkyahoo/sendmessagetask.cpp:42
+msgid "The message is empty."
 msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:447
-msgid "Contacts"
-msgstr "Cysylltau"
+#: protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp:84
+msgid "An error occurred while downloading a buddy icon (%1)"
+msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:470
-msgid "Create New Group..."
+#: protocols/yahoo/libkyahoo/statusnotifiertask.cpp:103
+#, fuzzy
+msgid "An unknown error has occurred."
+msgstr "Gwall anhysbys."
+
+#: protocols/yahoo/libkyahoo/yahoochattask.cpp:270
+#: protocols/yahoo/libkyahoo/yahoochattask.cpp:274
+#: protocols/yahoo/libkyahoo/yahoochattask.cpp:278
+msgid "Could not join chat"
 msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:478
-msgid "&Move To"
-msgstr "&Symud I"
+#: protocols/yahoo/libkyahoo/yahoochattask.cpp:271
+msgid "The room is full. Please choose another one."
+msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:480
-msgid "&Copy To"
-msgstr "&Copïo I"
+#: protocols/yahoo/libkyahoo/yahoochattask.cpp:275
+#, fuzzy
+msgid "Invalid user."
+msgstr "Annilys"
 
-#: kopete/contactlist/kopetecontactlistview.cpp:485
-#: protocols/msn/msncontact.cpp:144
-msgid "Send Email..."
-msgstr "Anfon Ebost ..."
+#: protocols/yahoo/libkyahoo/yahoochattask.cpp:279
+#, fuzzy
+msgid "An unknown error occurred while joining the chat room."
+msgstr "Gwall anhysbys."
 
-#: kopete/contactlist/kopetecontactlistview.cpp:488
-#: kopete/contactlist/kopetecontactlistview.cpp:1395
-msgid "Rename"
-msgstr "Ail-enwi"
+#: protocols/yahoo/libkyahoo/yabtask.cpp:119
+msgid "Could not retrieve server side address book for user info."
+msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:495
-msgid "Select Account"
+#: protocols/yahoo/libkyahoo/sendfiletask.cpp:101
+#, fuzzy
+msgid "Unknown error"
+msgstr "Gwall anhysbys."
+
+#: protocols/yahoo/libkyahoo/sendfiletask.cpp:144
+msgid "Unable to connect to file transfer server"
 msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:497
-msgid "Add to Your Contact List"
+#: protocols/yahoo/libkyahoo/sendfiletask.cpp:209
+msgid "An error occurred while sending the file."
 msgstr ""
 
-#. i18n: file ./protocols/groupwise/ui/gwchatsearchwidget.ui line 79
-#: kopete/contactlist/kopetecontactlistview.cpp:505 rc.cpp:5156
-#, no-c-format
-msgid "&Properties"
-msgstr "&Priodweddau"
+#: protocols/yahoo/libkyahoo/receivefiletask.cpp:55
+#: protocols/yahoo/libkyahoo/receivefiletask.cpp:174
+#, fuzzy
+msgid "Could not open file for writing."
+msgstr "Methu agor ffeil ar gyfer ysgrifennu"
 
-#: kopete/addcontactwizard/addcontactwizard.cpp:163
-#: kopete/contactlist/kopetecontactlistview.cpp:599
-#: kopete/contactlist/kopetemetacontactlvi.cpp:644
-msgid "New Group"
-msgstr "Grwp Newydd"
+#: protocols/yahoo/libkyahoo/receivefiletask.cpp:143
+msgid "An error occurred while downloading the file."
+msgstr ""
 
-#: kopete/addcontactwizard/addcontactwizard.cpp:164
-#: kopete/contactlist/kopetecontactlistview.cpp:600
-#: kopete/contactlist/kopetemetacontactlvi.cpp:644
-msgid "Please enter the name for the new group:"
+#: protocols/yahoo/libkyahoo/modifyyabtask.cpp:93
+#: protocols/yahoo/libkyahoo/modifyyabtask.cpp:121
+msgid "An error occurred while saving the address book entry."
 msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:690
+#: protocols/yahoo/libkyahoo/modifyyabtask.cpp:177
 msgid ""
-"_: Translators: format: '<nickname> (<online status>)'\n"
-"%1 (%2)"
-msgstr "%1(%2)"
+"The Yahoo Address Book entry could not be saved:\n"
+"%1 - %2"
+msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:715
+#: protocols/yahoo/libkyahoo/modifyyabtask.cpp:184
 msgid ""
-"_: Translators: format: '<displayName> (<id>)'\n"
-"%2 <%1>"
+"The Yahoo Address Book entry could not be created:\n"
+"%1 - %2"
 msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:989
+#: protocols/yahoo/libkyahoo/modifyyabtask.cpp:191
 msgid ""
-"<qt>Would you like to add <b>%1</b> to your contact list as a member of <b>"
-"%2</b>?</qt>"
+"The Yahoo Address Book entry could not be deleted:\n"
+"%1 - %2"
 msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:991
-#: kopete/contactlist/kopetecontactlistview.cpp:1007
-#: kopete/contactlist/kopetecontactlistview.cpp:1477
-#: protocols/oscar/aim/aimprotocol.cpp:193
-#: protocols/oscar/icq/icqprotocol.cpp:148
-msgid "Do Not Add"
-msgstr "Na Ychwaneger"
+#: protocols/meanwhile/meanwhileaccount.cpp:141
+msgid "&Change Status Message"
+msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:1005
-msgid ""
-"<qt>Would you like to add <b>%1</b> to your contact list as a child contact of "
-"<b>%2</b>?</qt>"
+#: protocols/meanwhile/meanwhileaccount.cpp:204
+msgid "Meanwhile Plugin: Message from server"
 msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:1056
+#: protocols/meanwhile/meanwhileeditaccountwidget.cpp:152
+#: protocols/meanwhile/meanwhileeditaccountwidget.cpp:159
+#: protocols/meanwhile/meanwhileeditaccountwidget.cpp:166
+#: protocols/meanwhile/meanwhileeditaccountwidget.cpp:173
+#: protocols/meanwhile/meanwhilesession.cpp:202
+msgid "Meanwhile Plugin"
+msgstr ""
+
+#: protocols/meanwhile/meanwhileeditaccountwidget.cpp:158
 msgid ""
-"<qt>This contact is already on your contact list. It is a child contact of <b>"
-"%1</b></qt>"
+"<qt>You must deselect password remembering or enter a valid password.</qt>"
 msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:1374
-msgid "Rename Contact"
+#: protocols/meanwhile/meanwhileeditaccountwidget.cpp:165
+msgid "<qt>You must enter the server's hostname/ip address.</qt>"
 msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:1376
-msgid "Send Single Message..."
-msgstr "Anfon Neges Sengl..."
+#: protocols/meanwhile/meanwhileeditaccountwidget.cpp:172
+msgid "<qt>0 is not a valid port number.</qt>"
+msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:1379
-msgid "&Add Subcontact"
-msgstr "&Ychwanegu Isgyswllt"
+#: libkopete/kopeteprotocol.cpp:61
+#: protocols/meanwhile/meanwhileprotocol.cpp:60
+msgid "Account Offline"
+msgstr "Cyfrif All-lein"
 
-#: kopete/contactlist/kopetecontactlistview.cpp:1384
-msgid "Rename Group"
-msgstr "Ail-enwi'r Grŵp"
+#: protocols/meanwhile/meanwhileprotocol.cpp:63
+msgid "Status Message"
+msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:1385
-msgid "Remove Group"
-msgstr "Gwaredu Grŵp"
+#: protocols/meanwhile/meanwhilesession.cpp:202
+msgid "Could not connect to server"
+msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:1386
-msgid "Send Message to Group"
+#: protocols/meanwhile/meanwhilesession.cpp:961
+msgid "Meanwhile Plugin: Conference invitation"
 msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:1390
-msgid "&Add Contact to Group"
-msgstr "&Ychwanegu Cyswllt i'r Grŵp"
+#. i18n: file ./kopete/addaccountwizard/addaccountwizardpage1.ui line 83
+#: protocols/sms/smseditaccountwidget.cpp:134 rc.cpp:1819 rc.cpp:2719
+#, no-c-format
+msgid "Description"
+msgstr "Disgrifiad"
 
-#: kopete/contactlist/kopetecontactlistview.cpp:1448
-msgid "There is no email address set for this contact in the TDE address book."
+#: protocols/sms/services/gsmlib.cpp:447
+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 ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:1448
-msgid "No Email Address in Address Book"
+#: protocols/sms/services/smsclient.cpp:66
+msgid "No provider configured"
 msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:1451
-msgid ""
-"This contact was not found in the TDE address book. Check that a contact is "
-"selected in the properties dialog."
+#: protocols/sms/services/smsclient.cpp:66
+#: protocols/sms/services/smssend.cpp:57
+#: protocols/sms/services/smssendprovider.cpp:216
+#: protocols/sms/services/smssendprovider.cpp:224
+#: protocols/sms/smscontact.cpp:57
+msgid "Could Not Send Message"
 msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:1454
+#: protocols/sms/services/smsclient.cpp:178
 msgid ""
-"This contact is not associated with a TDE address book entry, where the email "
-"address is stored. Check that a contact is selected in the properties dialog."
+"<qt>SMSClient is a program for sending SMS with the modem. The program can be "
+"found on <a href=\"%1\">%1</a></qt>"
 msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:1476
-msgid "<qt>Would you like to add this contact to your contact list?</qt>"
+#: protocols/sms/services/smssend.cpp:57
+msgid "No provider configured."
 msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:1556
+#: protocols/sms/services/smssend.cpp:64
 msgid ""
-"<qt>Are you sure you want to remove the contact <b>%1</b> "
-"from your contact list?</qt>"
+"No prefix set for SMSSend, please change it in the configuration dialog."
 msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:1562
-msgid ""
-"<qt>Are you sure you want to remove the group <b>%1</b> "
-"and all contacts that are contained within it?</qt>"
+#: protocols/sms/services/smssend.cpp:64
+msgid "No Prefix"
 msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:1579
-msgid "Are you sure you want to remove these contacts from your contact list?"
+#: protocols/sms/services/smssend.cpp:184
+msgid "%1 Settings"
 msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:1581
+#: protocols/sms/services/smssend.cpp:240
 msgid ""
-"Are you sure you want to remove these groups and contacts from your contact "
-"list?"
+"<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 ""
 
-#: kopete/contactlist/tdeabcexport.cpp:90
-msgid "No writeable addressbook resource found."
+#: protocols/sms/services/smssendprovider.cpp:215
+msgid "Could not determine which argument which should contain the message."
 msgstr ""
 
-#: kopete/contactlist/tdeabcexport.cpp:91
-msgid "Add or enable one using the Trinity Control Center."
+#: protocols/sms/services/smssendprovider.cpp:223
+msgid "Could not determine which argument which should contain the number."
 msgstr ""
 
-#: kopete/contactlist/tdeabcexport.cpp:102
-msgid " (already in address book)"
+#: protocols/sms/serviceloader.cpp:46
+#, c-format
+msgid "Could not load service %1."
 msgstr ""
 
-#: kopete/contactlist/kopeteaddrbookexport.cpp:76
-#: kopete/contactlist/kopeteaddrbookexport.cpp:83
-#: kopete/contactlist/kopeteaddrbookexport.cpp:90
-#: kopete/contactlist/kopeteaddrbookexport.cpp:99
-#: kopete/contactlist/kopeteaddrbookexport.cpp:119
-msgid "<Not Set>"
+#: protocols/sms/serviceloader.cpp:47
+msgid "Error Loading Service"
 msgstr ""
 
-#: kopete/contactlist/kopeteaddrbookexport.cpp:177
-msgid "Export to Address Book"
+#: protocols/sms/smscontact.cpp:56
+msgid "Something went wrong when sending message."
 msgstr ""
 
-#: kopete/contactlist/kopeteaddrbookexport.cpp:181
-msgid "Set address book fields using the selected data from Kopete"
+#: protocols/sms/smscontact.cpp:126
+msgid "&Contact Settings"
 msgstr ""
 
-#: kopete/contactlist/kopetegroupviewitem.cpp:163
+#: protocols/sms/smsaccount.cpp:86
 msgid ""
-"_: (NUMBER OF ONLINE CONTACTS/NUMBER OF CONTACTS IN GROUP)\n"
-"(%1/%2)"
+"This message is longer than the maximum length (%1). Should it be divided to %2 "
+"messages?"
 msgstr ""
 
-#: kopete/contactlist/kopetemetacontactlvi.cpp:134
-msgid ""
-"_: "
-"<tr>"
-"<td>STATUS ICON <b>PROTOCOL NAME</b> (ACCOUNT NAME)</td>"
-"<td>STATUS DESCRIPTION</td></tr>\n"
-"<tr>"
-"<td><img src=\"%1\">&nbsp;<nobr><b>%2</b></nobr>&nbsp;<nobr>(%3)</nobr></td>"
-"<td align=\"right\"><nobr>%4</nobr></td></tr>"
+#: protocols/sms/smsaccount.cpp:87
+msgid "Message Too Long"
 msgstr ""
 
-#: kopete/contactlist/kopetemetacontactlvi.cpp:383
-msgid "<qt><i>%1</i> is now %2.</qt>"
+#: protocols/sms/smsaccount.cpp:87
+#, fuzzy
+msgid "Divide"
+msgstr "Dyfais"
+
+#: protocols/sms/smsaccount.cpp:87
+msgid "Do Not Divide"
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_chat.ui line 16
-#: kopete/contactlist/kopetemetacontactlvi.cpp:440
-#: kopete/contactlist/kopetemetacontactlvi.cpp:444 rc.cpp:386
-#, no-c-format
-msgid "Chat"
-msgstr "Sgwrsio"
+#: protocols/sms/smsaccount.cpp:149
+msgid "Message too long."
+msgstr ""
 
-#: kopete/kopeteballoon.cpp:98
-msgid ""
-"_: to view\n"
-"View"
-msgstr "Gweld"
+#: protocols/sms/smsuserpreferences.cpp:27
+msgid "User Preferences"
+msgstr ""
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 602
-#: kopete/kopeteballoon.cpp:100 protocols/yahoo/yahooaccount.cpp:1086
-#: protocols/yahoo/yahooaccount.cpp:1527 protocols/yahoo/yahooaccount.cpp:1750
-#: rc.cpp:2170 rc.cpp:2185 rc.cpp:2203 rc.cpp:2221
-#, no-c-format
-msgid "Ignore"
-msgstr "Anwybyddu"
+#: protocols/jabber/jabbergroupcontact.cpp:116
+#, fuzzy
+msgid "Change nick name"
+msgstr "Llysenw"
 
-#: kopete/chatwindow/kopetechatwindow.cpp:194
-#: kopete/chatwindow/kopeteemailwindow.cpp:466
-#: kopete/chatwindow/kopeteemailwindow.cpp:484
-msgid "Send"
-msgstr "Anfon"
+#: protocols/jabber/jabbercontact.cpp:340
+#: protocols/jabber/jabbergroupcontact.cpp:164
+#: protocols/jabber/jabbergroupmembercontact.cpp:120
+msgid "Your message could not be delivered: \"%1\", Reason: \"%2\""
+msgstr ""
 
-#: kopete/chatwindow/kopetechatwindow.cpp:205
-msgid "Ready."
-msgstr "Parod."
+#: libkopete/kopetetransfermanager.cpp:237 protocols/gadu/gaducontact.cpp:99
+#: protocols/irc/ircusercontact.cpp:150
+#: protocols/jabber/jabbercontact.cpp:1018
+#: protocols/jabber/jabbergroupcontact.cpp:299
+#: protocols/jabber/jabbergroupmembercontact.cpp:153
+msgid "Kopete File Transfer"
+msgstr ""
 
-#: kopete/chatwindow/kopetechatwindow.cpp:316
-#: kopete/chatwindow/kopeteemailwindow.cpp:209
-msgid "&Send Message"
+#: protocols/jabber/jabbergroupcontact.cpp:356
+msgid "Change nickanme - Jabber Plugin"
 msgstr ""
 
-#: kopete/chatwindow/kopetechatwindow.cpp:323
-msgid "Close All Chats"
+#: protocols/jabber/jabbergroupcontact.cpp:357
+msgid "Please enter the new nick name you want to have on the room <i>%1</i>"
 msgstr ""
 
-#: kopete/chatwindow/kopetechatwindow.cpp:327
-msgid "&Activate Next Tab"
-msgstr "&Gweithredu'r Tab Nesaf"
+#: protocols/jabber/jabberchatsession.cpp:68
+#: protocols/jabber/jabbercontact.cpp:233
+#, fuzzy
+msgid "Voice call"
+msgstr "Llais"
 
-#: kopete/chatwindow/kopetechatwindow.cpp:329
-msgid "&Activate Previous Tab"
-msgstr "&Gweithredu'r Tab Cynt"
+#: protocols/jabber/jabberchatsession.cpp:120
+msgid ""
+"_: a contact's online status in parenthesis.\n"
+" (%1)"
+msgstr ""
 
-#: kopete/chatwindow/kopetechatwindow.cpp:334
-msgid "Nic&k Completion"
+#: protocols/jabber/jabberchatsession.cpp:267
+#: protocols/jabber/jabbergroupchatmanager.cpp:103
+msgid "This message is encrypted."
 msgstr ""
 
-#: kopete/chatwindow/kopetechatwindow.cpp:337
-msgid "&Detach Chat"
+#: libkopete/kopeteaccount.cpp:368 protocols/jabber/jabbertransport.cpp:128
+#: protocols/oscar/aim/aimaccount.cpp:309
+msgid "%2 <%1>"
 msgstr ""
 
-#: kopete/chatwindow/kopetechatwindow.cpp:341
-msgid "&Move Tab to Window"
+#: protocols/jabber/jabberbasecontact.cpp:133
+msgid "You cannot see each others' status."
 msgstr ""
 
-#: kopete/chatwindow/kopetechatwindow.cpp:347
-msgid "&Tab Placement"
+#: protocols/jabber/jabberbasecontact.cpp:137
+msgid "You can see this contact's status but they cannot see your status."
 msgstr ""
 
-#: kopete/chatwindow/kopetechatwindow.cpp:357
-msgid "Set Default &Font..."
+#: protocols/jabber/jabberbasecontact.cpp:141
+msgid "This contact can see your status but you cannot see their status."
 msgstr ""
 
-#: kopete/chatwindow/kopetechatwindow.cpp:358
-msgid "Set Default Text &Color..."
+#: protocols/jabber/jabberbasecontact.cpp:145
+msgid "You can see each others' status."
 msgstr ""
 
-#: kopete/chatwindow/kopetechatwindow.cpp:359
-#: kopete/chatwindow/kopeteemailwindow.cpp:224
-msgid "Set &Background Color..."
+#: protocols/jabber/jabberbasecontact.cpp:255
+msgid "Client"
+msgstr "Dibynnydd:"
+
+#: protocols/jabber/jabberbasecontact.cpp:280
+msgid "Timestamp"
 msgstr ""
 
-#: kopete/chatwindow/kopetechatwindow.cpp:361
-msgid "Previous History"
+#: protocols/jabber/jabberbasecontact.cpp:287
+msgid "Message"
+msgstr "Neges"
+
+#: protocols/jabber/jabberbasecontact.cpp:651
+#: protocols/jabber/ui/dlgjabbervcard.cpp:480
+msgid "Downloading of Jabber contact photo failed!"
 msgstr ""
 
-#: kopete/chatwindow/kopetechatwindow.cpp:365
-msgid "Next History"
+#: protocols/jabber/jingle/jinglevoicesessiondialog.cpp:47
+#, c-format
+msgid "Voice session with %1"
 msgstr ""
 
-#: kopete/chatwindow/kopetechatwindow.cpp:374
-msgid "Place to Left of Chat Area"
+#: protocols/jabber/jingle/jinglevoicesessiondialog.cpp:72
+#, fuzzy
+msgid "Incoming Session..."
+msgstr "Negeseuon newydd Gyraedd"
+
+#: protocols/jabber/jingle/jinglevoicesessiondialog.cpp:98
+#, fuzzy
+msgid "Waiting for other peer..."
+msgstr "Yn aros am awdurdodiad"
+
+#: protocols/jabber/jingle/jinglevoicesessiondialog.cpp:109
+#: protocols/jabber/jingle/jinglevoicesessiondialog.cpp:162
+msgid "Session accepted."
 msgstr ""
 
-#: kopete/chatwindow/kopetechatwindow.cpp:376
-msgid "Place to Right of Chat Area"
+#: protocols/jabber/jingle/jinglevoicesessiondialog.cpp:121
+#: protocols/jabber/jingle/jinglevoicesessiondialog.cpp:174
+msgid "Session declined."
 msgstr ""
 
-#: kopete/chatwindow/kopetechatwindow.cpp:378
-msgid "Show"
-msgstr "Dangos"
+#: protocols/jabber/jingle/jinglevoicesessiondialog.cpp:134
+#: protocols/jabber/jingle/jinglevoicesessiondialog.cpp:186
+msgid "Session terminated."
+msgstr ""
 
-#: kopete/chatwindow/kopetechatwindow.cpp:380
-msgid "Hide"
-msgstr "Cuddio"
+#: protocols/jabber/jingle/jinglevoicesessiondialog.cpp:150
+msgid "Session in progress."
+msgstr ""
 
-#: kopete/chatwindow/kopetechatwindow.cpp:381
-msgid "Automatic Spell Checking"
+#: protocols/gadu/gadudcctransaction.cpp:237
+#: protocols/jabber/jabberfiletransfer.cpp:148
+msgid "&Resume"
+msgstr "Ai&l-ddechrau"
+
+#: protocols/gadu/gadudcctransaction.cpp:238
+#: protocols/jabber/jabberfiletransfer.cpp:149
+msgid "Over&write"
+msgstr "Tros&ysgrifo"
+
+#: protocols/gadu/gadudcctransaction.cpp:240
+#: protocols/jabber/jabberfiletransfer.cpp:152
+msgid "The file %1 already exists, do you want to resume or overwrite it?"
 msgstr ""
 
-#: kopete/chatwindow/kopetechatwindow.cpp:389
-msgid "Co&ntacts"
-msgstr "Cy&sylltau"
+#: protocols/gadu/gadudcctransaction.cpp:241
+#: protocols/jabber/jabberfiletransfer.cpp:153
+#, c-format
+msgid "File Exists: %1"
+msgstr "Ffeil yn Bodoli : %1"
 
-#: kopete/chatwindow/kopetechatwindow.cpp:415
-#: kopete/chatwindow/kopeteemailwindow.cpp:248
-msgid "Toolbar Animation"
+#: protocols/jabber/jabberaccount.cpp:166
+msgid ""
+"Could not bind Jabber file transfer manager to local port. Please check if the "
+"file transfer port is already in use or choose another port in the account "
+"settings."
 msgstr ""
 
-#: kopete/chatwindow/kopetechatwindow.cpp:608
-msgid "Close the current tab"
-msgstr "Cau'r tab cyfredol"
+#: protocols/jabber/jabberaccount.cpp:167
+msgid "Failed to start Jabber File Transfer Manager"
+msgstr ""
 
-#: kopete/chatwindow/kopetechatwindow.cpp:996
-msgid "More..."
-msgstr "Mwy..."
+#: protocols/jabber/jabberaccount.cpp:181
+msgid "Join Groupchat..."
+msgstr ""
 
-#: kopete/chatwindow/kopetechatwindow.cpp:1199
-msgid "Plugin Actions"
+#: protocols/jabber/jabberaccount.cpp:192
+msgid "Services..."
+msgstr "Gwasanaethau ..."
+
+#: protocols/jabber/jabberaccount.cpp:197
+msgid "Send Raw Packet to Server..."
 msgstr ""
 
-#: kopete/chatwindow/chatmessagepart.cpp:262
-#: plugins/history/historydialog.cpp:178
-msgid "Copy Link Address"
-msgstr "Copïo Cyfeiriad Cyswllt"
+#: protocols/jabber/jabberaccount.cpp:202
+#: protocols/oscar/aim/aimaccount.cpp:334
+msgid "Edit User Info..."
+msgstr ""
 
-#: kopete/chatwindow/chatmessagepart.cpp:287
-msgid "Save Conversation"
+#: protocols/jabber/jabberaccount.cpp:259
+msgid "Please connect first."
 msgstr ""
 
-#: kopete/chatwindow/chatmessagepart.cpp:325
-msgid "<qt>Could not open <b>%1</b> for writing.</qt>"
+#: protocols/jabber/jabberaccount.cpp:259
+#: protocols/jabber/ui/dlgjabberbrowse.cpp:63
+#: protocols/jabber/ui/dlgjabberchatroomslist.cpp:89
+#: protocols/jabber/ui/dlgjabberregister.cpp:53
+#: protocols/jabber/ui/dlgjabberservices.cpp:125
+msgid "Jabber Error"
 msgstr ""
 
-#: kopete/chatwindow/chatmessagepart.cpp:326
-msgid "Error While Saving"
+#: protocols/groupwise/gwaccount.cpp:251
+#: protocols/jabber/jabberaccount.cpp:424
+#: protocols/jabber/ui/jabberregisteraccount.cpp:267
+msgid ""
+"SSL support could not be initialized for account %1. This is most likely "
+"because the TQCA TLS plugin is not installed on your system."
 msgstr ""
 
-#: kopete/chatwindow/chatmessagepart.cpp:674
-msgid "User Has Left"
+#: protocols/jabber/jabberaccount.cpp:426
+#: protocols/jabber/ui/jabberregisteraccount.cpp:269
+msgid "Jabber SSL Error"
 msgstr ""
 
-#: kopete/chatwindow/kopeteemailwindow.cpp:155
-msgid "<< Prev"
+#: protocols/groupwise/gwaccount.cpp:720
+#: protocols/jabber/jabberaccount.cpp:455
+msgid "No certificate was presented."
 msgstr ""
 
-#: kopete/chatwindow/kopeteemailwindow.cpp:160
-msgid "(0) Next >>"
+#: protocols/groupwise/gwaccount.cpp:724
+#: protocols/jabber/jabberaccount.cpp:459
+msgid "The host name does not match the one in the certificate."
 msgstr ""
 
-#: kopete/chatwindow/kopeteemailwindow.cpp:220
-msgid "&Set Font..."
+#: protocols/groupwise/gwaccount.cpp:728
+#: protocols/jabber/jabberaccount.cpp:463
+msgid "The Certificate Authority rejected the certificate."
 msgstr ""
 
-#: kopete/chatwindow/kopeteemailwindow.cpp:222
-msgid "Set Text &Color..."
+#: protocols/groupwise/gwaccount.cpp:733
+#: protocols/jabber/jabberaccount.cpp:468
+msgid "The certificate is untrusted."
 msgstr ""
 
-#: kopete/chatwindow/kopeteemailwindow.cpp:347
-msgid "(%1) Next >>"
+#: protocols/groupwise/gwaccount.cpp:737
+#: protocols/jabber/jabberaccount.cpp:472
+msgid "The signature is invalid."
 msgstr ""
 
-#: kopete/chatwindow/chatview.cpp:355
-#: kopete/chatwindow/kopeteemailwindow.cpp:425
-msgid ""
-"<qt>You are about to leave the group chat session <b>%1</b>."
-"<br>You will not receive future messages from this conversation.</qt>"
+#: protocols/groupwise/gwaccount.cpp:741
+#: protocols/jabber/jabberaccount.cpp:476
+msgid "The Certificate Authority is invalid."
 msgstr ""
 
-#: kopete/chatwindow/chatview.cpp:356
-#: kopete/chatwindow/kopeteemailwindow.cpp:426
-msgid "Closing Group Chat"
+#: protocols/groupwise/gwaccount.cpp:746
+#: protocols/jabber/jabberaccount.cpp:481
+msgid "Invalid certificate purpose."
 msgstr ""
 
-#: kopete/chatwindow/chatview.cpp:357 kopete/chatwindow/chatview.cpp:364
-#: kopete/chatwindow/chatview.cpp:371
-#: kopete/chatwindow/kopeteemailwindow.cpp:427
-#: kopete/chatwindow/kopeteemailwindow.cpp:434
-#: kopete/chatwindow/kopeteemailwindow.cpp:441
-msgid "Cl&ose Chat"
+#: protocols/groupwise/gwaccount.cpp:750
+#: protocols/jabber/jabberaccount.cpp:485
+msgid "The certificate is self-signed."
 msgstr ""
 
-#: kopete/chatwindow/chatview.cpp:362
-#: kopete/chatwindow/kopeteemailwindow.cpp:432
+#: protocols/groupwise/gwaccount.cpp:754
+#: protocols/jabber/jabberaccount.cpp:489
+msgid "The certificate has been revoked."
+msgstr ""
+
+#: protocols/groupwise/gwaccount.cpp:758
+#: protocols/jabber/jabberaccount.cpp:493
+msgid "Maximum certificate chain length was exceeded."
+msgstr ""
+
+#: protocols/groupwise/gwaccount.cpp:762
+#: protocols/jabber/jabberaccount.cpp:497
+msgid "The certificate has expired."
+msgstr ""
+
+#: protocols/groupwise/gwaccount.cpp:767
+#: protocols/jabber/jabberaccount.cpp:502
+msgid "An unknown error occurred trying to validate the certificate."
+msgstr ""
+
+#: protocols/jabber/jabberaccount.cpp:508
 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>"
+"<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 ""
 
-#: kopete/chatwindow/chatview.cpp:363
-#: kopete/chatwindow/kopeteemailwindow.cpp:433
-msgid "Unread Message"
+#: protocols/jabber/jabberaccount.cpp:510
+msgid "Jabber Connection Certificate Problem"
 msgstr ""
 
-#: kopete/chatwindow/chatview.cpp:369
-#: kopete/chatwindow/kopeteemailwindow.cpp:439
+#: protocols/jabber/jabberaccount.cpp:542
 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?"
+"An encrypted connection with the Jabber server could not be established."
 msgstr ""
 
-#: kopete/chatwindow/chatview.cpp:370
-#: kopete/chatwindow/kopeteemailwindow.cpp:440
-msgid "Message in Transit"
+#: protocols/jabber/jabberaccount.cpp:543
+#, fuzzy
+msgid "Jabber Connection Error"
+msgstr "Cysylltiad"
+
+#: protocols/jabber/jabberaccount.cpp:743
+msgid "Malformed packet received."
 msgstr ""
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 774
-#: kopete/chatwindow/kopeteemailwindow.cpp:473 rc.cpp:2230
-#, no-c-format
-msgid "Reply"
-msgstr "Ymateb"
+#: protocols/jabber/jabberaccount.cpp:748
+msgid "There was an unrecoverable error in the protocol."
+msgstr ""
 
-#: kopete/chatwindow/kopeteemoticonaction.cpp:65
-msgid "Add Smiley"
+#: protocols/jabber/jabberaccount.cpp:755
+msgid "Generic stream error (sorry, I do not have a more-detailed reason)"
 msgstr ""
 
-#: kopete/chatwindow/krichtexteditpart.cpp:117
-msgid "KopeteRichTextEditPart"
+#: protocols/jabber/jabberaccount.cpp:759
+msgid "There was a conflict in the information received."
 msgstr ""
 
-#: kopete/chatwindow/krichtexteditpart.cpp:118
-msgid "A simple rich text editor part for Kopete"
+#: protocols/jabber/jabberaccount.cpp:762
+msgid "The stream timed out."
 msgstr ""
 
-#: kopete/chatwindow/krichtexteditpart.cpp:127
-msgid "Enable &Rich Text"
+#: protocols/jabber/jabberaccount.cpp:765
+msgid "Internal server error."
 msgstr ""
 
-#: kopete/chatwindow/krichtexteditpart.cpp:129
-msgid "Disable &Rich Text"
+#: protocols/jabber/jabberaccount.cpp:768
+msgid "Stream packet received from an invalid address."
 msgstr ""
 
-#: kopete/chatwindow/krichtexteditpart.cpp:133
-msgid "Check &Spelling"
-msgstr " Cywiro Sillafu"
+#: protocols/jabber/jabberaccount.cpp:771
+msgid "Malformed stream packet received."
+msgstr ""
 
-#: kopete/chatwindow/krichtexteditpart.cpp:137
-msgid "Text &Color..."
-msgstr "Lliw &Testun..."
+#: protocols/jabber/jabberaccount.cpp:775
+msgid "Policy violation in the protocol stream."
+msgstr ""
 
-#: kopete/chatwindow/krichtexteditpart.cpp:142
-msgid "Background Co&lor..."
-msgstr "&Lliw Cefndir ..."
+#: protocols/jabber/jabberaccount.cpp:779
+msgid "Resource constraint."
+msgstr ""
 
-#: kopete/chatwindow/krichtexteditpart.cpp:147
-msgid "&Font"
-msgstr "&Wynebfath"
+#: protocols/jabber/jabberaccount.cpp:783
+msgid "System shutdown."
+msgstr ""
 
-#: kopete/chatwindow/krichtexteditpart.cpp:153
-msgid "Font &Size"
-msgstr "Maint& Ffont"
+#: protocols/jabber/jabberaccount.cpp:786
+msgid "Unknown reason."
+msgstr ""
 
-#: kopete/chatwindow/krichtexteditpart.cpp:159
-msgid "&Bold"
-msgstr "&Bras"
+#: protocols/jabber/jabberaccount.cpp:790
+#, c-format
+msgid "There was an error in the protocol stream: %1"
+msgstr ""
 
-#: kopete/chatwindow/krichtexteditpart.cpp:164
-msgid "&Italic"
-msgstr "&Italig"
+#: protocols/jabber/jabberaccount.cpp:798
+msgid "Host not found."
+msgstr "Ni chafwyd gweinydd."
 
-#: kopete/chatwindow/krichtexteditpart.cpp:169
-msgid "&Underline"
-msgstr "&Danlinellu"
+#: protocols/jabber/jabberaccount.cpp:801
+msgid "Address is already in use."
+msgstr ""
 
-#: kopete/chatwindow/krichtexteditpart.cpp:183
-msgid "Align &Left"
-msgstr "Alinio i'r Ch&with"
+#: protocols/jabber/jabberaccount.cpp:804
+msgid "Cannot recreate the socket."
+msgstr ""
 
-#: kopete/chatwindow/krichtexteditpart.cpp:188
-msgid "Align &Center"
-msgstr "Alinio i'r &Canol"
+#: protocols/jabber/jabberaccount.cpp:807
+msgid "Cannot bind the socket again."
+msgstr ""
 
-#: kopete/chatwindow/krichtexteditpart.cpp:193
-msgid "Align &Right"
-msgstr "Alinio i'r D&de"
+#: protocols/jabber/jabberaccount.cpp:810
+msgid "Socket is already connected."
+msgstr ""
 
-#: kopete/chatwindow/krichtexteditpart.cpp:198
-msgid "&Justify"
-msgstr "&Unioni"
+#: protocols/jabber/jabberaccount.cpp:813
+msgid "Socket is not connected."
+msgstr ""
 
-#: kopete/chatwindow/chatview.cpp:407
-#, c-format
-msgid ""
-"_n: One other person in the chat\n"
-"%n other people in the chat"
+#: protocols/jabber/jabberaccount.cpp:816
+msgid "Socket is not bound."
 msgstr ""
 
-#: kopete/chatwindow/chatview.cpp:550
-msgid "%1 is typing a message"
+#: protocols/jabber/jabberaccount.cpp:819
+msgid "Socket has not been created."
 msgstr ""
 
-#: kopete/chatwindow/chatview.cpp:554
+#: protocols/jabber/jabberaccount.cpp:822
 msgid ""
-"_: %1 is a list of names\n"
-"%1 are typing a message"
+"Socket operation would block. You should not see this error, please use "
+"\"Report Bug\" from the Help menu."
 msgstr ""
 
-#: kopete/chatwindow/chatview.cpp:596 kopete/chatwindow/chatview.cpp:605
-msgid "%1 is now known as %2"
+#: protocols/jabber/jabberaccount.cpp:825
+msgid "Connection refused."
+msgstr "Gwrthodwyd y cysylltiad."
+
+#: protocols/jabber/jabberaccount.cpp:828
+msgid "Connection timed out."
+msgstr "Cysylltiad wedi goramseru."
+
+#: protocols/jabber/jabberaccount.cpp:831
+msgid "Connection attempt already in progress."
 msgstr ""
 
-#: kopete/chatwindow/chatview.cpp:634
-msgid "%1 has joined the chat."
+#: protocols/jabber/jabberaccount.cpp:834
+msgid "Network failure."
 msgstr ""
 
-#: kopete/chatwindow/chatview.cpp:685
-msgid "%1 has left the chat."
+#: protocols/jabber/jabberaccount.cpp:837
+msgid "Operation is not supported."
 msgstr ""
 
-#: kopete/chatwindow/chatview.cpp:687
-msgid "%1 has left the chat (%2)."
+#: protocols/jabber/jabberaccount.cpp:840
+msgid "Socket timed out."
 msgstr ""
 
-#: kopete/chatwindow/chatview.cpp:787
+#: protocols/jabber/jabberaccount.cpp:848
 #, c-format
-msgid "You are now marked as %1."
+msgid "There was a connection error: %1"
 msgstr ""
 
-#: kopete/chatwindow/chatview.cpp:794 kopete/chatwindow/chatview.cpp:800
-msgid "%2 is now %1."
+#: protocols/jabber/jabberaccount.cpp:856
+msgid "Unknown host."
 msgstr ""
 
-#: kopete/addcontactwizard/fastaddcontactwizard.cpp:89
-msgid ""
-"_: The account name is prepended here\n"
-"%1 contact information"
+#: protocols/jabber/jabberaccount.cpp:860
+msgid "Could not connect to a required remote resource."
 msgstr ""
 
-#: kopete/addcontactwizard/addcontactwizard.cpp:286
+#: protocols/jabber/jabberaccount.cpp:863
 msgid ""
-"_: The user has to select the contact to add to the given account name\n"
-"Choose New Contact For %1 Account <b>%2</b>"
+"It appears we have been redirected to another server; I do not know how to "
+"handle this."
 msgstr ""
 
-#. i18n: file ./libkopete/ui/kopetepassworddialog.ui line 64
-#: rc.cpp:3 rc.cpp:1990 rc.cpp:2869
-#, no-c-format
-msgid "&Password:"
-msgstr "&Cyfrinair:"
+#: protocols/jabber/jabberaccount.cpp:866
+msgid "Unsupported protocol version."
+msgstr ""
 
-#. i18n: file ./libkopete/ui/kopetepassworddialog.ui line 82
-#: rc.cpp:6
-#, no-c-format
-msgid "&Remember password"
-msgstr "&Cofio cyfrinair"
+#: protocols/jabber/jabberaccount.cpp:869
+#: protocols/jabber/jabberaccount.cpp:886
+#: protocols/jabber/jabberaccount.cpp:930
+#: protocols/jabber/jabberaccount.cpp:947
+#: protocols/jabber/jabberaccount.cpp:964
+#: protocols/jabber/jabberaccount.cpp:972
+msgid "Unknown error."
+msgstr "Gwall anhysbys."
 
-#. i18n: file ./libkopete/ui/kopetepasswordwidgetbase.ui line 36
-#: rc.cpp:9
-#, no-c-format
-msgid "Remember password"
-msgstr "Cofio cyfrinair"
+#: protocols/jabber/jabberaccount.cpp:873
+#, c-format
+msgid "There was a negotiation error: %1"
+msgstr ""
 
-#. i18n: file ./libkopete/ui/kopetepasswordwidgetbase.ui line 39
-#: rc.cpp:12
-#, no-c-format
-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."
+#: protocols/jabber/jabberaccount.cpp:880
+msgid "Server rejected our request to start the TLS handshake."
 msgstr ""
 
-#. i18n: file ./libkopete/ui/kopetepasswordwidgetbase.ui line 64
-#: rc.cpp:15
-#, no-c-format
-msgid "Password:"
-msgstr "Cyfrinair:"
+#: protocols/jabber/jabberaccount.cpp:883
+msgid "Failed to establish a secure connection."
+msgstr ""
 
-#. i18n: file ./libkopete/ui/kopetepasswordwidgetbase.ui line 83
-#: rc.cpp:18
-#, no-c-format
-msgid "Enter your password here."
+#: protocols/jabber/jabberaccount.cpp:890
+#, c-format
+msgid "There was a Transport Layer Security (TLS) error: %1"
 msgstr ""
 
-#. i18n: file ./libkopete/ui/kopetepasswordwidgetbase.ui line 86
-#: rc.cpp:21
-#, no-c-format
-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."
+#: protocols/jabber/jabberaccount.cpp:897
+msgid "Login failed with unknown reason."
 msgstr ""
 
-#. i18n: file ./libkopete/ui/fileconfirmbase.ui line 33
-#: rc.cpp:27
-#, no-c-format
-msgid ""
-"A user is trying to send you a file. The file will only be downloaded if you "
-"accept this dialog. If you do not wish to receive it, please click 'Refuse'. "
-"This file will never be executed by Kopete at any point during or after the "
-"transfer."
+#: protocols/jabber/jabberaccount.cpp:900
+msgid "No appropriate authentication mechanism available."
 msgstr ""
 
-#. i18n: file ./libkopete/ui/fileconfirmbase.ui line 44
-#: rc.cpp:30
-#, no-c-format
-msgid "From:"
-msgstr "Oddiwrth:"
+#: protocols/jabber/jabberaccount.cpp:903
+msgid "Bad SASL authentication protocol."
+msgstr ""
 
-#. i18n: file ./libkopete/ui/fileconfirmbase.ui line 52
-#: rc.cpp:33
-#, no-c-format
-msgid "File name:"
-msgstr "Enw'r ffeil:"
+#: protocols/jabber/jabberaccount.cpp:906
+msgid "Server failed mutual authentication."
+msgstr ""
 
-#. i18n: file ./libkopete/ui/fileconfirmbase.ui line 65
-#: rc.cpp:36
-#, no-c-format
-msgid "&Browse..."
-msgstr "&Pori..."
+#: protocols/jabber/jabberaccount.cpp:909
+msgid "Encryption is required but not present."
+msgstr ""
 
-#. i18n: file ./libkopete/ui/fileconfirmbase.ui line 73
-#: rc.cpp:39
-#, no-c-format
-msgid "Size:"
-msgstr "Maint:"
+#: protocols/jabber/jabberaccount.cpp:912
+msgid "Invalid user ID."
+msgstr ""
 
-#. i18n: file ./libkopete/ui/fileconfirmbase.ui line 81
-#: rc.cpp:42 rc.cpp:5309
-#, no-c-format
-msgid "Description:"
-msgstr "Disgrifiad:"
+#: protocols/jabber/jabberaccount.cpp:915
+msgid "Invalid mechanism."
+msgstr ""
 
-#. i18n: file ./libkopete/ui/fileconfirmbase.ui line 114
-#: rc.cpp:45
-#, no-c-format
-msgid "Save to:"
-msgstr "Cadw i:"
+#: protocols/jabber/jabberaccount.cpp:918
+msgid "Invalid realm."
+msgstr ""
 
-#. i18n: file ./libkopete/ui/addressbooklinkwidget_base.ui line 41
-#: rc.cpp:48
-#, no-c-format
-msgid "The TDE Address Book entry associated with this Kopete Contact"
+#: protocols/jabber/jabberaccount.cpp:921
+msgid "Mechanism too weak."
 msgstr ""
 
-#. i18n: file ./libkopete/ui/addressbooklinkwidget_base.ui line 63
-#: rc.cpp:54 rc.cpp:546
-#, no-c-format
-msgid "C&hange..."
-msgstr "N&ewid..."
+#: protocols/jabber/jabberaccount.cpp:924
+msgid "Wrong credentials supplied. (check your user ID and password)"
+msgstr ""
 
-#. i18n: file ./libkopete/ui/addressbooklinkwidget_base.ui line 66
-#: rc.cpp:57
-#, no-c-format
-msgid "Select an address book entry"
+#: protocols/jabber/jabberaccount.cpp:927
+msgid "Temporary failure, please try again later."
 msgstr ""
 
-#. i18n: file ./libkopete/ui/contactaddednotifywidget.ui line 25
-#: rc.cpp:60
-#, no-c-format
-msgid "The contact XXX added you in his contactlist"
+#: protocols/jabber/jabberaccount.cpp:934
+#, c-format
+msgid "There was an error authenticating with the server: %1"
 msgstr ""
 
-#. i18n: file ./libkopete/ui/contactaddednotifywidget.ui line 61
-#: rc.cpp:63
-#, no-c-format
-msgid "Read More Info About This Contact"
+#: protocols/jabber/jabberaccount.cpp:941
+msgid "Transport Layer Security (TLS) problem."
 msgstr ""
 
-#. i18n: file ./libkopete/ui/contactaddednotifywidget.ui line 71
-#: rc.cpp:66
-#, no-c-format
-msgid "Authorize this contact to see my status"
+#: protocols/jabber/jabberaccount.cpp:944
+msgid "Simple Authentication and Security Layer (SASL) problem."
 msgstr ""
 
-#. i18n: file ./libkopete/ui/contactaddednotifywidget.ui line 82
-#: rc.cpp:69
-#, no-c-format
-msgid "Add this contact in my contactlist"
-msgstr "Ychwanegu'r cyswllt yma i'm rhestr cysylltau"
+#: protocols/jabber/jabberaccount.cpp:951
+#, c-format
+msgid "There was an error in the security layer: %1"
+msgstr ""
 
-#. i18n: file ./libkopete/ui/contactaddednotifywidget.ui line 112
-#: rc.cpp:72 rc.cpp:2574
-#, no-c-format
-msgid "Display name:"
+#: protocols/jabber/jabberaccount.cpp:958
+msgid "No permission to bind the resource."
 msgstr ""
 
-#. i18n: file ./libkopete/ui/contactaddednotifywidget.ui line 115
-#: rc.cpp:75 rc.cpp:82
-#, no-c-format
-msgid ""
-"The display name of the contact.  Leave it empty to use the contact nickname"
+#: protocols/jabber/jabberaccount.cpp:961
+msgid "The resource is already in use."
 msgstr ""
 
-#. i18n: file ./libkopete/ui/contactaddednotifywidget.ui line 119
-#: rc.cpp:78 rc.cpp:85
-#, no-c-format
-msgid ""
-"Enter the contact display name. This is how the contact will appears in the "
-"contactlist.\n"
-"Leave it empty if you want to see the contact nickname as display name."
+#: protocols/jabber/jabberaccount.cpp:968
+#, c-format
+msgid "Could not bind a resource: %1"
 msgstr ""
 
-#. i18n: file ./libkopete/ui/contactaddednotifywidget.ui line 149
-#: rc.cpp:89
-#, no-c-format
-msgid "In the group:"
+#: protocols/jabber/jabberaccount.cpp:984
+#, c-format
+msgid "Connection problem with Jabber server %1"
 msgstr ""
 
-#. i18n: file ./libkopete/ui/contactaddednotifywidget.ui line 152
-#: rc.cpp:92 rc.cpp:95
-#, no-c-format
+#: protocols/jabber/jabberaccount.cpp:1122
 msgid ""
-"Enter the group where the contact should be added. Leave it empty to add it in "
-"the top level group."
+"The Jabber user %1 removed %2's subscription to them. This account will no "
+"longer be able to view their online/offline status. Do you want to delete the "
+"contact?"
 msgstr ""
 
-#. i18n: file ./libkopete/ui/contactaddednotifywidget.ui line 181
-#: rc.cpp:98
-#, no-c-format
-msgid "Addressbook link:"
-msgstr "Dolen llyfr cyfeiriadau"
+#: libkopete/knotification.cpp:121 libkopete/knotification.cpp:142
+#: protocols/jabber/jabberaccount.cpp:1125
+#: protocols/jabber/jabbercontact.cpp:920
+msgid "Notification"
+msgstr "Hysbysiad"
 
-#. i18n: file ./libkopete/ui/addressbookselectorwidget_base.ui line 24
-#: rc.cpp:101 rc.cpp:128
-#, no-c-format
-msgid "Select Contact"
-msgstr "Dewis Cyswllt"
+#: protocols/jabber/jabberaccount.cpp:1302
+msgid "Waiting for authorization"
+msgstr "Yn aros am awdurdodiad"
 
-#. i18n: file ./libkopete/ui/addressbookselectorwidget_base.ui line 55
-#: rc.cpp:104
-#, no-c-format
-msgid "Create New Entr&y..."
+#: protocols/jabber/jabberaccount.cpp:1515
+#, c-format
+msgid "A password is required to join the room %1."
 msgstr ""
 
-#. i18n: file ./libkopete/ui/addressbookselectorwidget_base.ui line 58
-#: rc.cpp:107
-#, no-c-format
-msgid "Create a new entry in your address book"
+#: protocols/jabber/jabberaccount.cpp:1524
+msgid "Error trying to join %1 : nickname %2 is already in use"
 msgstr ""
 
-#. i18n: file ./libkopete/ui/addressbookselectorwidget_base.ui line 88
-#: plugins/cryptography/kgpgselkey.cpp:53
-#: plugins/cryptography/popuppublic.cpp:127 rc.cpp:113 rc.cpp:826 rc.cpp:3256
-#: rc.cpp:4326 rc.cpp:5171
-#, no-c-format
-msgid "Name"
-msgstr "Enw"
+#: protocols/jabber/jabberaccount.cpp:1525
+#, fuzzy
+msgid "Give your nickname"
+msgstr "Llysenw"
 
-#. i18n: file ./libkopete/ui/addressbookselectorwidget_base.ui line 126
-#: rc.cpp:119
-#, no-c-format
-msgid "Select the contact you want to communicate with via Instant Messaging"
+#: protocols/jabber/jabberaccount.cpp:1538
+msgid "You can't join the room %1 because you were banned"
 msgstr ""
 
-#. i18n: file ./libkopete/ui/addressbookselectorwidget_base.ui line 150
-#: rc.cpp:122 rc.cpp:131
-#, no-c-format
-msgid "S&earch:"
-msgstr "C&hwilio"
+#: protocols/jabber/jabberaccount.cpp:1539
+#: protocols/jabber/jabberaccount.cpp:1546
+#: protocols/jabber/jabberaccount.cpp:1556
+msgid "Jabber Group Chat"
+msgstr ""
 
-#. i18n: file ./libkopete/ui/kopeteawaydialogbase.ui line 27
-#: rc.cpp:125
-#, no-c-format
-msgid "Please specify an away message, or choose a predefined one."
+#: protocols/jabber/jabberaccount.cpp:1545
+msgid "You can't join the room %1 because the maximum users has been reached"
 msgstr ""
 
-#. i18n: file ./libkopete/ui/metacontactselectorwidget_base.ui line 80
-#: rc.cpp:134
-#, no-c-format
-msgid "Meta Contact"
-msgstr "Meta Gyswllt"
+#: protocols/jabber/jabberaccount.cpp:1551
+msgid "No reason given by the server"
+msgstr ""
 
-#. i18n: file ./libkopete/kopetecommandui.rc line 6
-#: rc.cpp:137
-#, no-c-format
-msgid "Commands"
-msgstr "Gorchmynion:"
+#: protocols/jabber/jabberaccount.cpp:1555
+msgid ""
+"There was an error processing your request for group chat %1. (Reason: %2, Code "
+"%3)"
+msgstr ""
 
-#. i18n: file ./kopete/groupkabcselectorwidget.ui line 49
-#: rc.cpp:140
-#, fuzzy, no-c-format
-msgid "Addressbook entry:"
-msgstr "Dolen llyfr cyfeiriadau"
+#: protocols/jabber/jabberaccount.cpp:1688
+msgid ""
+"Do you want to also unregister \"%1\" from the Jabber server ?\n"
+"If you unregister, all your contact list may be removed on the server,And you "
+"will never be able to connect to this account with any client"
+msgstr ""
 
-#. i18n: file ./kopete/groupkabcselectorwidget.ui line 65
-#: rc.cpp:143
-#, fuzzy, no-c-format
-msgid "&Group"
-msgstr "&Grwpiau"
+#: protocols/jabber/jabberaccount.cpp:1691
+msgid "Unregister"
+msgstr ""
 
-#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 24
-#: rc.cpp:146
-#, no-c-format
-msgid "Video"
-msgstr "Fideo"
+#: protocols/jabber/jabberaccount.cpp:1692
+msgid "Remove and Unregister"
+msgstr ""
 
-#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 47
-#: rc.cpp:149
-#, no-c-format
-msgid "Device"
-msgstr "Dyfais"
+#: protocols/jabber/jabberaccount.cpp:1693
+msgid "Remove from kopete only"
+msgstr ""
 
-#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 66
-#: rc.cpp:152
-#, no-c-format
-msgid "&Video Device Configuration"
+#: protocols/jabber/jabberaccount.cpp:1737
+#, c-format
+msgid ""
+"An error occured when trying to remove the account:\n"
+"%1"
 msgstr ""
 
-#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 93
-#: rc.cpp:155 rc.cpp:2806
-#, no-c-format
-msgid "Device:"
-msgstr "Dyfais:"
+#: protocols/jabber/jabberaccount.cpp:1738
+#, fuzzy
+msgid "Jabber Account Unregistration"
+msgstr "Gwybodaeth Cyfrif"
 
-#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 101
-#: rc.cpp:158
-#, no-c-format
-msgid "Input:"
-msgstr "Mewnbwn:"
+#: protocols/jabber/jabbercontact.cpp:135
+msgid "Authorization"
+msgstr "Awdurdodi"
 
-#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 109
-#: rc.cpp:161
-#, no-c-format
-msgid "Standard:"
-msgstr "Safonol :"
+#: protocols/jabber/jabbercontact.cpp:139
+msgid "(Re)send Authorization To"
+msgstr ""
 
-#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 174
-#: rc.cpp:164
-#, no-c-format
-msgid "Con&trols"
-msgstr "R&heoliadau"
+#: protocols/jabber/jabbercontact.cpp:144
+msgid "(Re)request Authorization From"
+msgstr ""
 
-#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 193
-#: rc.cpp:167
-#, no-c-format
-msgid "&Image Adjustment"
+#: protocols/jabber/jabbercontact.cpp:149
+msgid "Remove Authorization From"
 msgstr ""
 
-#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 228
-#: rc.cpp:170
-#, no-c-format
-msgid "Brightness:"
-msgstr "Disgleirdeb:"
+#: protocols/jabber/jabbercontact.cpp:154
+msgid "Set Availability"
+msgstr ""
 
-#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 244
-#: rc.cpp:173
-#, no-c-format
-msgid "Contrast:"
-msgstr "Cyferbyniant :"
+#: protocols/jabber/jabbercontact.cpp:158
+msgid "Free to Chat"
+msgstr ""
 
-#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 260
-#: rc.cpp:176
-#, no-c-format
-msgid "Saturation:"
-msgstr "Dirlawnder:"
+#: protocols/jabber/jabbercontact.cpp:162
+#: protocols/jabber/jabberprotocol.cpp:77
+msgid "Extended Away"
+msgstr ""
 
-#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 276
-#: rc.cpp:179
-#, fuzzy, no-c-format
-msgid "Whiteness:"
-msgstr "Hidlenni"
+#: protocols/jabber/jabbercontact.cpp:164
+#: protocols/oscar/icq/icqpresence.cpp:72
+msgid "Do Not Disturb"
+msgstr ""
 
-#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 292
-#: rc.cpp:182
-#, no-c-format
-msgid "Hue:"
-msgstr "Arlliw :"
+#: protocols/jabber/jabbercontact.cpp:169
+msgid "Select Resource"
+msgstr ""
 
-#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 443
-#: rc.cpp:185
-#, no-c-format
-msgid "Optio&ns"
-msgstr "De&wisiadau"
+#: protocols/jabber/jabbercontact.cpp:186
+msgid "Automatic (best/default resource)"
+msgstr ""
 
-#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 470
-#: rc.cpp:188
-#, fuzzy, no-c-format
-msgid "Image options"
-msgstr "Dewisiada&u Uwch"
+#: protocols/jabber/jabbercontact.cpp:266
+msgid "The original message is : <i>\" %1 \"</i><br>"
+msgstr ""
 
-#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 489
-#: rc.cpp:191
-#, no-c-format
-msgid "Au&tomatic brightness/contrast adjustment"
+#: protocols/jabber/jabbercontact.cpp:267
+msgid ""
+"<qt><i>%1</i> 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 ""
 
-#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 505
-#: rc.cpp:194
-#, no-c-format
-msgid "Automatic color correction"
+#: protocols/jabber/jabbercontact.cpp:273
+msgid "Invited to a conference - Jabber Plugin"
 msgstr ""
 
-#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 524
-#: rc.cpp:197
-#, no-c-format
-msgid "See preview mirrored"
+#: protocols/jabber/jabbercontact.cpp:290
+msgid "Message has been displayed"
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 16
-#: plugins/statistics/statisticsdialog.cpp:62 rc.cpp:200 rc.cpp:446
-#: rc.cpp:2608
-#, no-c-format
-msgid "General"
-msgstr "Cyffredinol"
+#: protocols/jabber/jabbercontact.cpp:292
+msgid "Message has been delivered"
+msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 27
-#: rc.cpp:203
-#, no-c-format
-msgid "System Tray"
-msgstr "Bar Tasgau"
+#: protocols/jabber/jabbercontact.cpp:295
+msgid "Message stored on the server, contact offline"
+msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 38
-#: rc.cpp:206
-#, no-c-format
-msgid "Show system tray &icon"
-msgstr "D&angos eicon y teclyn cysawd"
+#: protocols/jabber/jabbercontact.cpp:302
+msgid "%1 has ended their participation in the chat session."
+msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 41
-#: rc.cpp:209
-#, no-c-format
-msgid "Show the icon in the system tray"
+#: protocols/jabber/jabbercontact.cpp:919
+msgid ""
+"Do you also want to remove the authorization from user %1 to see your status?"
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 44
-#: rc.cpp:212
-#, no-c-format
+#: protocols/jabber/jabbercontact.cpp:1089
 msgid ""
-"By default, the system tray icon indicates new incoming messages by flashing "
-"and showing a bubble. A left or middle mouse click on the icon will open the "
-"message in a new chat window. Pressing the \"View\" button in the bubble has "
-"the same effect."
+"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 ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 55
-#: rc.cpp:215
-#, no-c-format
-msgid "Start with hidden &main window"
+#: protocols/jabber/jabbercontact.cpp:1093
+msgid "Jabber Resource Selector"
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 58
-#: rc.cpp:218
-#, no-c-format
-msgid "Start with the main window minimized to the system tray"
+#: protocols/jabber/jabberbookmarks.cpp:132
+#, fuzzy
+msgid "Groupchat bookmark"
+msgstr "Gr?p"
+
+#: protocols/jabber/jabberprotocol.cpp:74
+#, fuzzy
+msgid "Free for Chat"
+msgstr "Segur"
+
+#: protocols/jabber/jabberprotocol.cpp:78
+msgid "Do not Disturb"
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 61
-#: rc.cpp:221
+#. i18n: file ./protocols/jabber/ui/dlgsendraw.ui line 96
+#: protocols/jabber/jabberprotocol.cpp:93 rc.cpp:2755
 #, no-c-format
-msgid ""
-"Start with the main window hidden. The only visible item is the system tray "
-"icon."
+msgid "Subscription"
+msgstr "Tanysgrifiad"
+
+#: protocols/jabber/jabberprotocol.cpp:94
+msgid "Authorization Status"
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 71
-#: rc.cpp:224
-#, fuzzy, no-c-format
-msgid "Message Handling"
-msgstr "Neges"
+#: protocols/jabber/jabberprotocol.cpp:95
+msgid "Available Resources"
+msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 82
-#: rc.cpp:227
-#, no-c-format
-msgid "Open messages instantl&y"
+#: protocols/jabber/jabberprotocol.cpp:96
+msgid "vCard Cache Timestamp"
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 85
-#: rc.cpp:230
-#, fuzzy, no-c-format
-msgid "Instantly open incoming messages"
-msgstr "Negeseuon newydd Gyraedd"
+#: protocols/jabber/jabberprotocol.cpp:98
+#, fuzzy
+msgid "Jabber ID"
+msgstr "Dynodiad Defnyddiwr"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 88
-#: rc.cpp:233
-#, no-c-format
-msgid ""
-"If there is no existing chat window a new window will be opened when a new "
-"message comes in. If there is already a chat window opened for the sender of "
-"the message it will be displayed there instantly."
+#: protocols/jabber/jabberprotocol.cpp:100
+msgid "Timezone"
+msgstr "Cylchfa amser:"
+
+#: protocols/jabber/jabberprotocol.cpp:101
+msgid "Homepage"
+msgstr "Tudalen gartref"
+
+#: protocols/jabber/jabberprotocol.cpp:102
+msgid "Company name"
+msgstr "Enw cwmni"
+
+#: protocols/jabber/jabberprotocol.cpp:103
+#, fuzzy
+msgid "Company Departement"
+msgstr "Adran"
+
+#: protocols/jabber/jabberprotocol.cpp:104
+#, fuzzy
+msgid "Company Position"
+msgstr "Lleoliad:"
+
+#: protocols/jabber/jabberprotocol.cpp:105
+#, fuzzy
+msgid "Company Role"
+msgstr "Cwmni:"
+
+#: protocols/jabber/jabberprotocol.cpp:106
+#, fuzzy
+msgid "Work Street"
+msgstr "Stryd:"
+
+#: protocols/jabber/jabberprotocol.cpp:107
+#, fuzzy
+msgid "Work Extra Address"
+msgstr "Cyfeiriad Gwaith"
+
+#: protocols/jabber/jabberprotocol.cpp:108
+#, fuzzy
+msgid "Work PO Box"
+msgstr "&Gwybodaeth am Ddefnyddwyr"
+
+#: protocols/jabber/jabberprotocol.cpp:110
+#, fuzzy
+msgid "Work Postal Code"
+msgstr "Côd post:"
+
+#: protocols/jabber/jabberprotocol.cpp:112
+#, fuzzy
+msgid "Work Email Address"
+msgstr "Cyfeiriad Ebost"
+
+#: protocols/jabber/jabberprotocol.cpp:113
+#, fuzzy
+msgid "Home Street"
+msgstr "Stryd:"
+
+#: protocols/jabber/jabberprotocol.cpp:114
+#, fuzzy
+msgid "Home Extra Address"
+msgstr "Cyfeiriad Cartref"
+
+#: protocols/jabber/jabberprotocol.cpp:115
+msgid "Home PO Box"
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 96
-#: rc.cpp:236
-#, no-c-format
-msgid "Use message &queue"
+#: protocols/jabber/jabberprotocol.cpp:116
+#, fuzzy
+msgid "Home City"
+msgstr "Dinas"
+
+#: protocols/jabber/jabberprotocol.cpp:117
+#, fuzzy
+msgid "Home Postal Code"
+msgstr "Côd post:"
+
+#: protocols/jabber/jabberprotocol.cpp:118
+#, fuzzy
+msgid "Home Country"
+msgstr "Gwlad:"
+
+#: protocols/jabber/jabberprotocol.cpp:119
+msgid "Fax"
+msgstr "Ffacs"
+
+#: protocols/jabber/jabbergroupchatmanager.cpp:148
+#, c-format
+msgid "You have been invited to %1"
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 99
-#: rc.cpp:239
-#, no-c-format
-msgid "Use a message queue to store incoming messages"
+#: protocols/jabber/ui/jabberchooseserver.cpp:34
+msgid "Choose Jabber Server"
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 102
-#: rc.cpp:242
-#, no-c-format
-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 or stacked "
-"messages trigger notification via bubble, a flashing tray icon, or both.."
+#: protocols/jabber/ui/jabberchooseserver.cpp:44
+msgid "Retrieving server list..."
+msgstr "Nôl y rhestr weinyddion..."
+
+#: protocols/jabber/ui/jabberchooseserver.cpp:111
+msgid "Could not retrieve server list."
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 110
-#: rc.cpp:245
-#, no-c-format
-msgid "Use message stac&k"
+#: protocols/jabber/ui/jabberchooseserver.cpp:126
+msgid "Could not parse the server list."
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 113
-#: rc.cpp:248
-#, no-c-format
-msgid "Use a message stack to store incoming messages"
+#: protocols/jabber/ui/jabberregisteraccount.cpp:51
+msgid "Register New Jabber Account"
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 116
-#: rc.cpp:251
-#, no-c-format
-msgid ""
-"Store new incoming messages in a message stack. New messages are messages that "
-"cannot be displayed in an already open chat window. Only queued or stacked "
-"messages trigger notification via bubble and flashing tray."
+#: protocols/jabber/ui/jabberregisteraccount.cpp:63
+msgid "Register"
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 127
-#: rc.cpp:254
-#, no-c-format
-msgid "Queue/stack &unread messages"
+#: protocols/jabber/ui/jabberregisteraccount.cpp:128
+msgid "Please enter a server name, or click Choose."
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 130
-#: rc.cpp:257
-#, no-c-format
-msgid "Also add unread messages to queue/stack"
+#: protocols/jabber/ui/jabberregisteraccount.cpp:139
+msgid "Please enter a valid Jabber ID."
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 133
-#: rc.cpp:260
-#, no-c-format
+#: protocols/gadu/gaduregisteraccount.cpp:99
+#: protocols/jabber/ui/jabberregisteraccount.cpp:152
+msgid "Please enter the same password twice."
+msgstr ""
+
+#: protocols/gadu/gaduregisteraccount.cpp:106
+#: protocols/jabber/ui/jabberregisteraccount.cpp:161
+msgid "Password entries do not match."
+msgstr ""
+
+#: protocols/jabber/ui/jabberregisteraccount.cpp:193
 msgid ""
-"Unread messages are messages that will be displayed in an already opened but "
-"inactive chat window. Only incoming queued messages trigger notification via "
-"the bubble, the flashing tray icon, or both. With this option disabled only new "
-"incoming messages are queued, i.e. messages that cannot be displayed in an "
-"already open chat window."
+"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 ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 154
-#: rc.cpp:266
-#, no-c-format
-msgid "Connect automatically at &startup"
+#: protocols/jabber/ui/jabberregisteraccount.cpp:248
+msgid "Connecting to server..."
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 157
-#: rc.cpp:269
-#, no-c-format
-msgid "Connect all your accounts automatically when starting Kopete"
+#: protocols/jabber/ui/jabberregisteraccount.cpp:314
+msgid "Protocol error."
+msgstr "Gwall protocol."
+
+#: protocols/jabber/ui/jabberregisteraccount.cpp:327
+msgid "Connected successfully, registering new account..."
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 160
-#: rc.cpp:272
-#, no-c-format
+#: protocols/jabber/ui/jabberregisteraccount.cpp:342
+msgid "Registration successful."
+msgstr ""
+
+#: protocols/jabber/ui/jabberregisteraccount.cpp:376
+msgid "Registration failed."
+msgstr ""
+
+#: protocols/jabber/ui/jabberregisteraccount.cpp:378
 msgid ""
-"When starting Kopete all your accounts will be connected automatically. Note: "
-"You can exclude accounts individually in their properties."
+"Unable to create account on the server. The Jabber ID is probably already in "
+"use."
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 16
-#: rc.cpp:275
-#, no-c-format
-msgid "Events"
-msgstr "Digwyddiadau"
+#: protocols/jabber/ui/jabberregisteraccount.cpp:379
+msgid "Jabber Account Registration"
+msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 27
-#: rc.cpp:278
-#, no-c-format
-msgid "Tray Flash && Bubble"
+#: protocols/jabber/ui/dlgjabbervcard.cpp:64
+msgid "Jabber vCard"
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 38
-#: rc.cpp:281
-#, fuzzy, no-c-format
-msgid "Flash s&ystem tray"
-msgstr "&Amrantu'r cafn cysawd"
+#: protocols/jabber/ui/dlgjabbervcard.cpp:64
+msgid "&Save User Info"
+msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 41
-#: rc.cpp:284
-#, no-c-format
-msgid "Flash the system tray icon on an incoming message"
+#: protocols/jabber/ui/dlgjabbervcard.cpp:64
+msgid "&Fetch vCard"
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 44
-#: rc.cpp:287
-#, no-c-format
-msgid "Flash the system tray icon whenever a message comes in."
+#: protocols/jabber/ui/dlgjabbervcard.cpp:299
+msgid "Saving vCard to server..."
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 80
-#: rc.cpp:290
-#, no-c-format
-msgid "&Left mouse click opens message"
+#: protocols/jabber/ui/dlgjabbervcard.cpp:421
+msgid "vCard save sucessful."
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 83
-#: rc.cpp:293
-#, no-c-format
+#: protocols/jabber/ui/dlgjabbervcard.cpp:426
+msgid "Error: Unable to save vCard."
+msgstr ""
+
+#: protocols/jabber/ui/dlgjabbervcard.cpp:434
+msgid "Fetching contact vCard..."
+msgstr ""
+
+#: protocols/jabber/ui/dlgjabbervcard.cpp:457
+msgid "vCard fetching Done."
+msgstr ""
+
+#: protocols/jabber/ui/dlgjabbervcard.cpp:461
 msgid ""
-"Left mouse click on flashing system tray opens message instead of "
-"restoring/minimizing contact list"
+"Error: vCard could not be fetched correctly. Check connectivity with the Jabber "
+"server."
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 86
-#: rc.cpp:296
-#, no-c-format
+#: protocols/jabber/ui/dlgjabbervcard.cpp:472
+#, fuzzy
+msgid "Jabber Photo"
+msgstr "Dynodiad Defnyddiwr"
+
+#: protocols/jabber/ui/dlgjabbervcard.cpp:535
 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."
+"<qt>An error occurred when trying to change the photo."
+"<br>Make sure that you have selected a correct image file</qt>"
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 96
-#: rc.cpp:299
-#, no-c-format
-msgid "Sho&w bubble"
+#: protocols/jabber/ui/dlgjabberchangepassword.cpp:34
+#, fuzzy
+msgid "Change Jabber Password"
+msgstr "Cyfrinair anghywir."
+
+#: protocols/jabber/ui/dlgjabberchangepassword.cpp:56
+msgid "You entered your current password incorrectly."
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 99
-#: rc.cpp:302
-#, no-c-format
-msgid "Show a bubble on an incoming message"
+#: protocols/jabber/ui/dlgjabberchangepassword.cpp:57
+#: protocols/jabber/ui/dlgjabberchangepassword.cpp:65
+#: protocols/jabber/ui/dlgjabberchangepassword.cpp:73
+msgid "Password Incorrect"
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 102
-#: rc.cpp:305
-#, no-c-format
-msgid "Show a bubble whenever a message comes in."
+#: protocols/jabber/ui/dlgjabberchangepassword.cpp:64
+msgid "Your new passwords do not match. Please enter them again."
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 138
-#: rc.cpp:308
-#, no-c-format
-msgid "Button \"&Ignore\" closes chat"
+#: protocols/jabber/ui/dlgjabberchangepassword.cpp:72
+msgid "For security reasons, you are not allowed to set an empty password."
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 141
-#: rc.cpp:311
-#, no-c-format
+#: protocols/jabber/ui/dlgjabberchangepassword.cpp:80
 msgid ""
-"The \"Ignore\" button of the bubble closes the chat window for the sender"
+"Your account needs to be connected before the password can be changed. Do you "
+"want to try to connect now?"
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 144
-#: rc.cpp:314
-#, no-c-format
+#: protocols/jabber/ui/dlgjabberchangepassword.cpp:81
+#: protocols/jabber/ui/dlgjabberchangepassword.cpp:121
+msgid "Jabber Password Change"
+msgstr ""
+
+#: libkopete/connectionmanager.cpp:149
+#: protocols/jabber/ui/dlgjabberchangepassword.cpp:81
+msgid "Connect"
+msgstr "Cysylltu"
+
+#: libkopete/connectionmanager.cpp:149
+#: protocols/jabber/ui/dlgjabberchangepassword.cpp:81
+msgid "Stay Offline"
+msgstr "Aros All-lein"
+
+#: protocols/jabber/ui/dlgjabberchangepassword.cpp:120
 msgid ""
-"If there is already a chat window opened for the sender of the message "
-"displayed in the bubble the \"Ignore\" button will close this chat window."
+"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 ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 182
-#: rc.cpp:317
-#, no-c-format
-msgid "Close &bubble automatically after"
+#: protocols/jabber/ui/dlgjabberchangepassword.cpp:128
+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 ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 188
-#: rc.cpp:320
-#, no-c-format
-msgid "Automatically close bubble after fixed amount of time"
+#: protocols/jabber/ui/dlgjabberchatjoin.cpp:34
+msgid "Join Jabber Groupchat"
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 191
-#: rc.cpp:323
-#, no-c-format
-msgid ""
-"Bubbles will automatically be closed after a fixed amount of time. A closed one "
-"will be replaced by a new one if another message is waiting."
+#: protocols/jabber/ui/jabberaddcontactpage.cpp:52
+msgid "Loading instruction from gateway..."
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 202
-#: rc.cpp:326 rc.cpp:685
-#, no-c-format
-msgid " Sec"
-msgstr "eil"
+#: protocols/groupwise/ui/gwaddcontactpage.cpp:63
+#: protocols/jabber/ui/jabberaddcontactpage.cpp:62
+#: protocols/oscar/aim/aimprotocol.cpp:186
+#: protocols/oscar/aim/ui/aimaddcontactpage.cpp:42
+msgid "You need to be connected to be able to add contacts."
+msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 238
-#: rc.cpp:329
-#, no-c-format
-msgid "Exclude non-highlighted messages in grou&p chats"
+#: protocols/jabber/ui/jabberaddcontactpage.cpp:63
+msgid "Connect to the Jabber network and try again."
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 241
-#: rc.cpp:332
-#, no-c-format
-msgid "Notify only highlighted messages in group chats"
+#: protocols/jabber/ui/jabberaddcontactpage.cpp:150
+msgid "An error occured while loading instructions from gateway."
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 244
-#: rc.cpp:335
-#, no-c-format
+#: protocols/jabber/ui/dlgjabberregister.cpp:53
 msgid ""
-"In very active group chats important messages can be singled out by excluding "
-"non-highlighted messages from notification."
+"Unable to retrieve registration form.\n"
+"Reason: \"%1\""
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 252
-#: rc.cpp:338
-#, no-c-format
-msgid "Exclude messages in chats on current des&ktop"
+#: protocols/jabber/ui/dlgjabberregister.cpp:95
+msgid "Registration sent successfully."
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 255
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"Do not display notification for messages in chat windows on current desktop"
+#: protocols/jabber/ui/dlgjabberregister.cpp:95
+#: protocols/jabber/ui/dlgjabberregister.cpp:102
+msgid "Jabber Registration"
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 258
-#: rc.cpp:344
-#, no-c-format
+#: protocols/jabber/ui/dlgjabberregister.cpp:102
 msgid ""
-"This option allows you to turn off the notification of events for chat windows "
-"that are on the current desktop. If this option is turned on, then only chat "
-"windows on different desktops than the current one will notify you that an "
-"event has occured. Otherwise, all chat windows will notify you that an event "
-"has occured."
+"The server denied the registration form.\n"
+"Reason: \"%1\""
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 279
-#: rc.cpp:350
-#, no-c-format
-msgid "E&nable events while away"
+#: protocols/jabber/ui/dlgjabberbrowse.cpp:63
+msgid "Unable to retrieve search form."
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 282
-#: rc.cpp:353
-#, no-c-format
-msgid "Enable events if your account status is \"Away\""
+#: protocols/jabber/ui/dlgjabberbrowse.cpp:114
+msgid "The Jabber server declined the search."
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 285
-#: rc.cpp:356
+#. i18n: file ./protocols/jabber/ui/dlgbrowse.ui line 16
+#: protocols/jabber/ui/dlgjabberbrowse.cpp:114 rc.cpp:2659
 #, no-c-format
+msgid "Jabber Search"
+msgstr ""
+
+#: protocols/jabber/ui/dlgjabberservices.cpp:125
+#, c-format
 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."
+"Unable to retrieve the list of services.\n"
+"Reason: %1"
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 293
-#: rc.cpp:359
-#, no-c-format
-msgid "Enable events for acti&ve chat windows"
+#: protocols/jabber/ui/jabbereditaccountwidget.cpp:149
+msgid ""
+"The changes you just made will take effect next time you log in with Jabber."
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 296
-#: rc.cpp:362
-#, no-c-format
-msgid "Enable events for incoming messages if the chat window is active"
+#: protocols/jabber/ui/jabbereditaccountwidget.cpp:150
+msgid "Jabber Changes During Online Jabber Session"
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 299
-#: rc.cpp:365
-#, no-c-format
+#: protocols/jabber/ui/jabbereditaccountwidget.cpp:205
 msgid ""
-"Enable notification events for incoming messages even if the receiving chat "
-"window is active. Note: Neither the system tray icon flashes nor the bubble is "
-"shown."
+"The Jabber ID you have chosen is invalid. Please make sure it is in the form "
+"user@server.com, like an email address."
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 307
-#: rc.cpp:368
-#, no-c-format
-msgid "Switch &to desktop containing chat on opening message"
+#: protocols/jabber/ui/jabbereditaccountwidget.cpp:207
+msgid "Invalid Jabber ID"
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 310
-#: rc.cpp:371
+#. i18n: file ./protocols/jabber/ui/dlgchatroomslist.ui line 16
+#: protocols/jabber/ui/dlgjabberchatroomslist.cpp:36 rc.cpp:2767
 #, no-c-format
-msgid ""
-"Switch to the desktop which contains the chat window for the sender when "
-"opening his/her message"
+msgid "List Chatrooms"
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 313
-#: rc.cpp:374
-#, no-c-format
-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."
+#: protocols/jabber/ui/dlgjabberchatroomslist.cpp:89
+msgid "Unable to retrieve the list of chat rooms."
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 321
-#: rc.cpp:377
-#, no-c-format
-msgid "&Raise window on incoming message"
+#: protocols/jabber/tdeioslave/jabberdisco.cpp:109
+#: protocols/jabber/tdeioslave/jabberdisco.cpp:210
+msgid "TLS"
+msgstr "TLS"
+
+#: protocols/jabber/tdeioslave/jabberdisco.cpp:188
+#, fuzzy
+msgid "The server certificate is invalid. Do you want to continue? "
+msgstr "Methodd y tystysgrif gweinydd y prawf dilysiant (%1)."
+
+#: protocols/jabber/tdeioslave/jabberdisco.cpp:189
+msgid "Certificate Warning"
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 324
-#: rc.cpp:380
-#, no-c-format
-msgid "Raise the chat window/tab on an incoming message"
+#: protocols/jabber/tdeioslave/jabberdisco.cpp:320
+msgid "The login details are incorrect. Do you want to try again?"
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 327
-#: rc.cpp:383
-#, no-c-format
+#: protocols/oscar/icq/icqcontact.cpp:542
+#: protocols/oscar/liboscar/userdetails.cpp:129
 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."
+"_: Translators: client-name client-version\n"
+"%1 %2"
+msgstr "%1 %2"
+
+#: protocols/oscar/liboscar/userdetails.cpp:328
+#, fuzzy
+msgid "MICQ"
+msgstr "ICQ"
+
+#: protocols/oscar/liboscar/userdetails.cpp:333
+#, fuzzy
+msgid "SIM"
+msgstr "AIM"
+
+#: protocols/oscar/liboscar/userdetails.cpp:338
+msgid "Trillian"
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_chat.ui line 27
-#: rc.cpp:389
-#, no-c-format
-msgid "&Interface Preference"
+#: protocols/oscar/liboscar/userdetails.cpp:343
+#, fuzzy
+msgid "MacICQ"
+msgstr "ICQ"
+
+#: protocols/oscar/liboscar/userdetails.cpp:350
+msgid "Licq SSL"
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_chat.ui line 90
-#: rc.cpp:392
-#, no-c-format
-msgid "Chat Window Grouping &Policy"
+#: protocols/oscar/liboscar/userdetails.cpp:352
+msgid "Licq"
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_chat.ui line 99
-#: rc.cpp:395
-#, no-c-format
-msgid "Open All Messages in New Chat Window"
+#: protocols/oscar/oscarencodingselectiondialog.cpp:28
+#, fuzzy
+msgid "Select Encoding"
+msgstr "A&mgodiad"
+
+#: protocols/oscar/icq/icqprotocol.cpp:537
+#: protocols/oscar/oscarencodingselectiondialog.cpp:36
+msgid "Big5"
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_chat.ui line 104
-#: rc.cpp:398
-#, no-c-format
-msgid "Group Messages From Same Account in Same Chat Window"
+#: protocols/oscar/icq/icqprotocol.cpp:538
+#: protocols/oscar/oscarencodingselectiondialog.cpp:37
+msgid "Big5-HKSCS"
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_chat.ui line 109
-#: rc.cpp:401
-#, no-c-format
-msgid "Group All Messages in Same Chat Window"
+#: protocols/oscar/icq/icqprotocol.cpp:539
+#: protocols/oscar/oscarencodingselectiondialog.cpp:38
+msgid "euc-JP Japanese"
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_chat.ui line 114
-#: rc.cpp:404
-#, no-c-format
-msgid "Group Messages From Contacts in Same Group in Same Chat Window"
+#: protocols/oscar/icq/icqprotocol.cpp:540
+#: protocols/oscar/oscarencodingselectiondialog.cpp:39
+msgid "euc-KR Korean"
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_chat.ui line 119
-#: rc.cpp:407
-#, no-c-format
-msgid "Group Messages From Same Metacontact in Same Chat Window"
+#: protocols/oscar/icq/icqprotocol.cpp:541
+#: protocols/oscar/oscarencodingselectiondialog.cpp:40
+msgid "GB-2312 Chinese"
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_chat.ui line 138
-#: rc.cpp:410
-#, no-c-format
-msgid ""
-"<dl>\n"
-"                                <dt><tt>Open all messages in a new chat "
-"window</tt>\n"
-"                                <dd>Every chat will have its own window.\n"
-"                                <dt><tt>Group messages from the same account in "
-"the same chat window</tt>\n"
-"                                <dd>All chats for one account get grouped in to "
-"one window by using tabs.\n"
-"                                <dt><tt>Group all messages in the same chat "
-"window</tt>\n"
-"                                <dd>All chats get grouped in to one window by "
-"using tabs.\n"
-"                                <dt><tt>Group messages from contacts in the "
-"same group in the same chat window</tt>\n"
-"                                <dd>All chats from one group get grouped in to "
-"one window by using tabs.\n"
-"                                <dt><tt>Group messages from the same "
-"metacontact in the same chat window</tt>\n"
-"                                <dd>All chats from one metacontact get grouped "
-"in to one window by using tabs.\n"
-"                                </dl>\n"
-"                        "
+#: protocols/oscar/icq/icqprotocol.cpp:542
+#: protocols/oscar/oscarencodingselectiondialog.cpp:41
+msgid "GBK Chinese"
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_chat.ui line 156
-#: rc.cpp:425
-#, no-c-format
-msgid "High&light messages containing your nickname"
+#: protocols/oscar/icq/icqprotocol.cpp:543
+#: protocols/oscar/oscarencodingselectiondialog.cpp:42
+msgid "GB18030 Chinese"
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_chat.ui line 172
-#: rc.cpp:428
-#, no-c-format
-msgid "E&nable automatic spell checking"
+#: protocols/oscar/icq/icqprotocol.cpp:545
+#: protocols/oscar/oscarencodingselectiondialog.cpp:44
+msgid "JIS Japanese"
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_chat.ui line 180
-#: rc.cpp:431
-#, no-c-format
-msgid "&Show events in chat window"
+#: protocols/oscar/icq/icqprotocol.cpp:546
+#: protocols/oscar/oscarencodingselectiondialog.cpp:45
+msgid "Shift-JIS Japanese"
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_chat.ui line 196
-#: rc.cpp:434
-#, no-c-format
-msgid "T&runcate contact name with more characters than:"
+#: protocols/oscar/icq/icqprotocol.cpp:548
+#: protocols/oscar/oscarencodingselectiondialog.cpp:47
+msgid "KOI8-R Russian"
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_chat.ui line 245
-#: rc.cpp:437
-#, no-c-format
-msgid "&Maximum number of chat window lines:"
+#: protocols/oscar/icq/icqprotocol.cpp:549
+#: protocols/oscar/oscarencodingselectiondialog.cpp:48
+msgid "KOI8-U Ukrainian"
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_chat.ui line 251
-#: rc.cpp:440
-#, no-c-format
-msgid ""
-"Limit the maximum number of lines visible in a chat window to improve speed for "
-"complex layouts."
+#: protocols/oscar/icq/icqprotocol.cpp:551
+#: protocols/oscar/oscarencodingselectiondialog.cpp:50
+msgid "ISO-8859-1 Western"
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/kopeteawayconfigbase.ui line 16
-#: rc.cpp:443
-#, no-c-format
-msgid "Away Configuration"
+#: protocols/oscar/icq/icqprotocol.cpp:552
+#: protocols/oscar/oscarencodingselectiondialog.cpp:51
+msgid "ISO-8859-2 Central European"
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/kopeteawayconfigbase.ui line 44
-#: rc.cpp:449
-#, no-c-format
-msgid "Number of away messages to remember:"
+#: protocols/oscar/icq/icqprotocol.cpp:553
+#: protocols/oscar/oscarencodingselectiondialog.cpp:52
+msgid "ISO-8859-3 Central European"
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/kopeteawayconfigbase.ui line 47
-#: rc.cpp:452 rc.cpp:455 rc.cpp:458 rc.cpp:461
-#, no-c-format
-msgid ""
-"Kopete will remember this many away messages for use at a later date; if this "
-"limit is exceeded, the least-used message will be removed."
+#: protocols/oscar/icq/icqprotocol.cpp:554
+#: protocols/oscar/oscarencodingselectiondialog.cpp:53
+msgid "ISO-8859-4 Baltic"
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/kopeteawayconfigbase.ui line 94
-#: rc.cpp:464
-#, no-c-format
-msgid "Auto Away"
+#: protocols/oscar/icq/icqprotocol.cpp:555
+#: protocols/oscar/oscarencodingselectiondialog.cpp:54
+msgid "ISO-8859-5 Cyrillic"
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/kopeteawayconfigbase.ui line 98
-#: rc.cpp:467
-#, no-c-format
-msgid ""
-"<p>If you check the <i>Use auto away</i> checkbox, Kopete will automaticaly set "
-"you globaly away when the TDE screen saver start, or after the selected minutes "
-"of user inactivity (i.e no mouse move, or key pressed)</p>\n"
-"<p>Kopete will set you available again when you come back if you checked <i>"
-"Become available when detecting activity again</i></p>"
+#: protocols/oscar/icq/icqprotocol.cpp:556
+#: protocols/oscar/oscarencodingselectiondialog.cpp:55
+msgid "ISO-8859-6 Arabic"
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/kopeteawayconfigbase.ui line 109
-#: rc.cpp:471
-#, no-c-format
-msgid "&Use auto away"
+#: protocols/oscar/icq/icqprotocol.cpp:557
+#: protocols/oscar/oscarencodingselectiondialog.cpp:56
+msgid "ISO-8859-7 Greek"
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/kopeteawayconfigbase.ui line 128
-#: rc.cpp:474
-#, no-c-format
-msgid "Become away after"
+#: protocols/oscar/icq/icqprotocol.cpp:558
+#: protocols/oscar/oscarencodingselectiondialog.cpp:57
+msgid "ISO-8859-8 Hebrew, visually ordered"
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/kopeteawayconfigbase.ui line 153
-#: rc.cpp:477
-#, no-c-format
-msgid "minutes of user inactivity"
+#: protocols/oscar/icq/icqprotocol.cpp:559
+#: protocols/oscar/oscarencodingselectiondialog.cpp:58
+msgid "ISO-8859-8-I Hebrew, logically ordered"
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/kopeteawayconfigbase.ui line 183
-#: rc.cpp:480
-#, no-c-format
-msgid "Become available when detecting activity again"
+#: protocols/oscar/icq/icqprotocol.cpp:560
+#: protocols/oscar/oscarencodingselectiondialog.cpp:59
+msgid "ISO-8859-9 Turkish"
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/kopeteawayconfigbase.ui line 196
-#: rc.cpp:483
-#, fuzzy, no-c-format
-msgid "Auto Away Message"
-msgstr "Negeseuon Allan"
+#: protocols/oscar/icq/icqprotocol.cpp:561
+#: protocols/oscar/oscarencodingselectiondialog.cpp:60
+msgid "ISO-8859-10"
+msgstr ""
 
-#. i18n: file ./kopete/config/behavior/kopeteawayconfigbase.ui line 210
-#: rc.cpp:486
-#, no-c-format
-msgid "Display the last away message used"
+#: protocols/oscar/icq/icqprotocol.cpp:562
+#: protocols/oscar/oscarencodingselectiondialog.cpp:61
+msgid "ISO-8859-13"
 msgstr ""
 
-#. i18n: file ./kopete/config/behavior/kopeteawayconfigbase.ui line 224
-#: rc.cpp:489
-#, no-c-format
-msgid "Display the following away message:"
+#: protocols/oscar/icq/icqprotocol.cpp:563
+#: protocols/oscar/oscarencodingselectiondialog.cpp:62
+msgid "ISO-8859-14"
 msgstr ""
 
-#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 25
-#: rc.cpp:492
-#, no-c-format
-msgid "Enable &global identity"
+#: protocols/oscar/icq/icqprotocol.cpp:564
+#: protocols/oscar/oscarencodingselectiondialog.cpp:63
+msgid "ISO-8859-15 Western"
 msgstr ""
 
-#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 41
-#: rc.cpp:495
-#, no-c-format
-msgid "Identity:"
-msgstr "Dynodiad:"
+#: protocols/oscar/icq/icqprotocol.cpp:566
+#: protocols/oscar/oscarencodingselectiondialog.cpp:65
+msgid "Windows-1250 Central European"
+msgstr ""
 
-#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 75
-#: rc.cpp:498
-#, no-c-format
-msgid "Ne&w Identity..."
-msgstr "Dynodiad Ne&wydd"
+#: protocols/oscar/icq/icqprotocol.cpp:567
+#: protocols/oscar/oscarencodingselectiondialog.cpp:66
+msgid "Windows-1251 Cyrillic"
+msgstr ""
 
-#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 83
-#: rc.cpp:501
-#, fuzzy, no-c-format
-msgid "Cop&y Identity..."
-msgstr "Gwaredu Cyswllt"
+#: protocols/oscar/icq/icqprotocol.cpp:568
+#: protocols/oscar/oscarencodingselectiondialog.cpp:67
+msgid "Windows-1252 Western"
+msgstr ""
 
-#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 91
-#: rc.cpp:504
-#, no-c-format
-msgid "Rename I&dentity..."
-msgstr "A&ilenwi Dynodiad..."
+#: protocols/oscar/icq/icqprotocol.cpp:569
+#: protocols/oscar/oscarencodingselectiondialog.cpp:68
+msgid "Windows-1253 Greek"
+msgstr ""
 
-#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 99
-#: rc.cpp:507
-#, fuzzy, no-c-format
-msgid "Remo&ve Identity"
+#: protocols/oscar/icq/icqprotocol.cpp:570
+#: protocols/oscar/oscarencodingselectiondialog.cpp:69
+msgid "Windows-1254 Turkish"
+msgstr ""
+
+#: protocols/oscar/icq/icqprotocol.cpp:571
+#: protocols/oscar/oscarencodingselectiondialog.cpp:70
+msgid "Windows-1255 Hebrew"
+msgstr ""
+
+#: protocols/oscar/icq/icqprotocol.cpp:572
+#: protocols/oscar/oscarencodingselectiondialog.cpp:71
+msgid "Windows-1256 Arabic"
+msgstr ""
+
+#: protocols/oscar/icq/icqprotocol.cpp:573
+#: protocols/oscar/oscarencodingselectiondialog.cpp:72
+msgid "Windows-1257 Baltic"
+msgstr ""
+
+#: protocols/oscar/icq/icqprotocol.cpp:574
+#: protocols/oscar/oscarencodingselectiondialog.cpp:73
+msgid "Windows-1258 Viet Nam"
+msgstr ""
+
+#: protocols/oscar/icq/icqprotocol.cpp:576
+#: protocols/oscar/oscarencodingselectiondialog.cpp:75
+msgid "IBM 850"
+msgstr ""
+
+#: protocols/oscar/icq/icqprotocol.cpp:577
+#: protocols/oscar/oscarencodingselectiondialog.cpp:76
+msgid "IBM 866"
+msgstr ""
+
+#: protocols/oscar/icq/icqprotocol.cpp:579
+#: protocols/oscar/oscarencodingselectiondialog.cpp:78
+msgid "TIS-620 Thai"
+msgstr ""
+
+#: protocols/oscar/icq/icqprotocol.cpp:581
+#: protocols/oscar/oscarencodingselectiondialog.cpp:80
+msgid "UTF-8 Unicode"
+msgstr ""
+
+#: protocols/oscar/icq/icqprotocol.cpp:582
+#: protocols/oscar/oscarencodingselectiondialog.cpp:81
+msgid "UTF-16 Unicode"
+msgstr ""
+
+#: protocols/oscar/oscarcontact.cpp:174
+#, fuzzy
+msgid "Mobile AIM Client"
 msgstr "Gwaredu Cyswllt"
 
-#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 113
-#: rc.cpp:510
-#, no-c-format
-msgid "&Nickname"
-msgstr "&Ffugenw"
+#: protocols/oscar/oscarcontact.cpp:180
+#, c-format
+msgid ""
+"_: Translators: client name and version\n"
+"%1"
+msgstr "%1"
 
-#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 152
-#: rc.cpp:513
-#, no-c-format
-msgid "Cu&stom:"
-msgstr "Ad&dasiedig:"
+#: protocols/oscar/oscarcontact.cpp:186
+msgid "Buddy icons"
+msgstr ""
 
-#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 165
-#: rc.cpp:516
-#, no-c-format
-msgid "Use address boo&k name (need address book link)"
+#: protocols/oscar/icq/icqcontact.cpp:551 protocols/oscar/oscarcontact.cpp:188
+msgid "UTF-8"
+msgstr "UTF-8"
+
+#: protocols/oscar/oscarcontact.cpp:190
+msgid "Rich text messages"
 msgstr ""
 
-#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 173
-#: rc.cpp:519
-#, no-c-format
-msgid "Use nickname from con&tact for global nickname:"
+#: protocols/oscar/oscarcontact.cpp:192
+#, fuzzy
+msgid "Group chat"
+msgstr "Gr?p"
+
+#: protocols/oscar/oscarcontact.cpp:194
+#, fuzzy
+msgid "Voice chat"
+msgstr "Llais"
+
+#: protocols/oscar/icq/icqcontact.cpp:555 protocols/oscar/oscarcontact.cpp:196
+msgid "DirectIM/IMImage"
 msgstr ""
 
-#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 189
-#: rc.cpp:522 rc.cpp:1070 rc.cpp:1088
-#, no-c-format
-msgid "Contact to synchronize the displayname with."
+#: protocols/oscar/oscarcontact.cpp:198
+msgid "Send buddy list"
 msgstr ""
 
-#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 220
-#: rc.cpp:525
-#, fuzzy, no-c-format
-msgid "P&hoto"
-msgstr "Ffoto"
+#: protocols/oscar/oscarcontact.cpp:200
+#, fuzzy
+msgid "File transfers"
+msgstr "Hidlenni"
 
-#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 275
-#: rc.cpp:528
-#, no-c-format
-msgid "S&ync address book photo with global photo"
+#: protocols/oscar/icq/icqprotocol.cpp:616
+#: protocols/oscar/oscarcontact.cpp:202
+msgid "Games"
+msgstr "Gemau"
+
+#: protocols/oscar/oscarcontact.cpp:204
+msgid "Trillian user"
 msgstr ""
 
-#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 296
-#: rc.cpp:531 rc.cpp:1073
-#, no-c-format
-msgid "Cus&tom:"
-msgstr "Adda&siedig :"
+#: libkopete/tdeabcpersistence.cpp:367 protocols/oscar/aim/aimprotocol.cpp:164
+#: protocols/oscar/icq/icqprotocol.cpp:119
+msgid "Choose Account"
+msgstr ""
 
-#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 304
-#: rc.cpp:534
-#, no-c-format
-msgid "U&se photo from contact for global photo:"
+#: protocols/oscar/icq/icqprotocol.cpp:139
+#: protocols/oscar/icq/ui/icqaddcontactpage.cpp:86
+msgid "You must be online to add a contact."
 msgstr ""
 
-#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 312
-#: rc.cpp:537
-#, no-c-format
-msgid "Use a&ddress book photo (needs address book link)"
+#: protocols/oscar/icq/icqprotocol.cpp:144
+msgid "'%1'"
 msgstr ""
 
-#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 365
-#: rc.cpp:540
-#, no-c-format
-msgid "<center>Photo</center>"
+#: protocols/oscar/icq/icqprotocol.cpp:145
+msgid "'%1' (%2)"
 msgstr ""
 
-#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 419
-#: rc.cpp:543
-#, fuzzy, no-c-format
-msgid "Address &Book Link"
-msgstr "&Cyfeiriad ebost:"
+#: protocols/oscar/icq/icqprotocol.cpp:148
+msgid "Do you want to add %1 to your contact list?"
+msgstr ""
 
-#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 460
-#: rc.cpp:549
-#, no-c-format
-msgid ""
-"<b>Note:</b> The address book link uses KAddressBook's \n"
-"current user contact."
+#: protocols/oscar/icq/icqprotocol.cpp:182
+msgid "IP Address"
+msgstr "Cyfeiriad IP"
+
+#: protocols/oscar/aim/aimprotocol.cpp:242
+#: protocols/oscar/icq/icqprotocol.cpp:183
+msgid "Client Features"
 msgstr ""
 
-#. i18n: file ./kopete/config/accounts/kopeteaccountconfigbase.ui line 17
-#: rc.cpp:553
-#, no-c-format
-msgid "Manage Accounts"
+#: protocols/oscar/aim/aimprotocol.cpp:244
+#: protocols/oscar/icq/icqprotocol.cpp:184
+msgid "Buddy Icon MD5 Hash"
 msgstr ""
 
-#. i18n: file ./kopete/config/accounts/kopeteaccountconfigbase.ui line 31
-#: rc.cpp:556 rc.cpp:2005
-#, no-c-format
-msgid "&New..."
-msgstr "&Newydd..."
+#: protocols/oscar/icq/icqprotocol.cpp:185
+#, fuzzy
+msgid "Contact Encoding"
+msgstr "Gwybodaeth Cysylltu"
 
-#. i18n: file ./kopete/config/accounts/kopeteaccountconfigbase.ui line 34
-#: rc.cpp:559
+#. i18n: file ./protocols/gadu/ui/gadusearch.ui line 267
+#: protocols/oscar/icq/icqprotocol.cpp:215 rc.cpp:4203 rc.cpp:4506
 #, no-c-format
-msgid "Add new account"
+msgid "Female"
 msgstr ""
 
-#. i18n: file ./kopete/config/accounts/kopeteaccountconfigbase.ui line 42
-#: rc.cpp:562
+#. i18n: file ./protocols/gadu/ui/gadusearch.ui line 262
+#: protocols/oscar/icq/icqprotocol.cpp:216 rc.cpp:4200 rc.cpp:4509
 #, no-c-format
-msgid "&Modify..."
-msgstr "&Addasu..."
+msgid "Male"
+msgstr ""
 
-#. i18n: file ./kopete/config/accounts/kopeteaccountconfigbase.ui line 45
-#: rc.cpp:565
-#, no-c-format
-msgid "Modify selected account"
+#: protocols/oscar/icq/icqprotocol.cpp:235
+msgid "Ascension Island"
 msgstr ""
 
-#. i18n: file ./kopete/config/accounts/kopeteaccountconfigbase.ui line 48
-#: rc.cpp:568
-#, no-c-format
-msgid "Let you edit the account's properties."
+#: protocols/oscar/icq/icqprotocol.cpp:237
+msgid "Australian Antarctic Territory"
 msgstr ""
 
-#. i18n: file ./kopete/config/accounts/kopeteaccountconfigbase.ui line 59
-#: rc.cpp:574 rc.cpp:577
-#, no-c-format
-msgid "Remove selected account"
+#: protocols/oscar/icq/icqprotocol.cpp:244
+msgid "Barbuda"
 msgstr ""
 
-#. i18n: file ./kopete/config/accounts/kopeteaccountconfigbase.ui line 68
-#: rc.cpp:580 rc.cpp:1184 rc.cpp:1266
-#, no-c-format
-msgid "Protocol"
-msgstr "Protocol"
+#: protocols/oscar/icq/icqprotocol.cpp:255
+msgid "British Virgin Islands"
+msgstr ""
 
-#. i18n: file ./kopete/config/accounts/kopeteaccountconfigbase.ui line 79
-#: rc.cpp:583 rc.cpp:1181 rc.cpp:1263 rc.cpp:1903
-#, no-c-format
-msgid "Account"
-msgstr "Cyfrif"
+#: protocols/oscar/icq/icqprotocol.cpp:281
+msgid "Diego Garcia"
+msgstr ""
 
-#. i18n: file ./kopete/config/accounts/kopeteaccountconfigbase.ui line 100
-#: rc.cpp:586
-#, no-c-format
-msgid "Use &custom color"
+#: protocols/oscar/icq/icqprotocol.cpp:297
+msgid "French Antilles"
 msgstr ""
 
-#. i18n: file ./kopete/config/accounts/kopeteaccountconfigbase.ui line 103
-#: rc.cpp:589
-#, no-c-format
-msgid "Use custom color for account"
+#: protocols/oscar/icq/icqprotocol.cpp:311
+msgid "Guantanamo Bay"
 msgstr ""
 
-#. i18n: file ./kopete/config/accounts/kopeteaccountconfigbase.ui line 106
-#: rc.cpp:592
-#, no-c-format
-msgid "Allows you to set a custom color for this account"
+#: protocols/oscar/icq/icqprotocol.cpp:320
+msgid "INMARSAT (Atlantic-East)"
 msgstr ""
 
-#. i18n: file ./kopete/config/accounts/kopeteaccountconfigbase.ui line 117
-#: rc.cpp:595 rc.cpp:853 rc.cpp:884
-#, no-c-format
-msgid "Account custom color selector"
+#: protocols/oscar/icq/icqprotocol.cpp:321
+msgid "INMARSAT (Atlantic-West)"
 msgstr ""
 
-#. i18n: file ./kopete/config/accounts/kopeteaccountconfigbase.ui line 121
-#: rc.cpp:598
-#, no-c-format
+#: protocols/oscar/icq/icqprotocol.cpp:322
+msgid "INMARSAT (Indian)"
+msgstr ""
+
+#: protocols/oscar/icq/icqprotocol.cpp:323
+msgid "INMARSAT (Pacific)"
+msgstr ""
+
+#: protocols/oscar/icq/icqprotocol.cpp:324
+msgid "INMARSAT"
+msgstr ""
+
+#: protocols/oscar/icq/icqprotocol.cpp:328
+msgid "International Freephone Service"
+msgstr ""
+
+#: protocols/oscar/icq/icqprotocol.cpp:334
+#: protocols/oscar/icq/icqprotocol.cpp:408
+msgid "Ivory Coast"
+msgstr "Yr Arfordir Ifori"
+
+#: protocols/oscar/icq/icqprotocol.cpp:380
+msgid "Nevis"
+msgstr ""
+
+#: protocols/oscar/icq/icqprotocol.cpp:402
+msgid "Reunion Island"
+msgstr ""
+
+#: protocols/oscar/icq/icqprotocol.cpp:404
+msgid "Rota Island"
+msgstr ""
+
+#: protocols/oscar/icq/icqprotocol.cpp:437
+msgid "Tinian Island"
+msgstr ""
+
+#. i18n("Arabic")
+#: protocols/oscar/icq/icqprotocol.cpp:475
+msgid "Bhojpuri"
+msgstr ""
+
+#. i18n("Bulgarian")
+#. i18n("Burmese")
+#: protocols/oscar/icq/icqprotocol.cpp:478
+msgid "Cantonese"
+msgstr ""
+
+#. i18n("Catalan")
+#. i18n("Chinese")
+#. i18n("Croatian")
+#. i18n("Czech")
+#. i18n("Danish")
+#. i18n("Dutch")
+#. i18n("English")
+#. i18n("Esperanto")
+#. i18n("Estonian")
+#: protocols/oscar/icq/icqprotocol.cpp:488
+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")
+#: protocols/oscar/icq/icqprotocol.cpp:528
+msgid "Taiwanese"
+msgstr ""
+
+#: protocols/oscar/icq/icqprotocol.cpp:596
+msgid "Single"
+msgstr "Sengl"
+
+#: protocols/oscar/icq/icqprotocol.cpp:597
+msgid "Long term relationship"
+msgstr ""
+
+#: protocols/oscar/icq/icqprotocol.cpp:598
+#, fuzzy
+msgid "Engaged"
+msgstr "Ieithoedd"
+
+#: protocols/oscar/icq/icqprotocol.cpp:599
+msgid "Married"
+msgstr ""
+
+#: protocols/oscar/icq/icqprotocol.cpp:600
+#, fuzzy
+msgid "Divorced"
+msgstr "Datleisio"
+
+#: protocols/oscar/icq/icqprotocol.cpp:601
+msgid "Separated"
+msgstr "Ar wahan"
+
+#: protocols/oscar/icq/icqprotocol.cpp:602
+msgid "Widowed"
+msgstr ""
+
+#: protocols/oscar/icq/icqprotocol.cpp:609
+#, fuzzy
+msgid "Art"
+msgstr "Terfynwyd"
+
+#: protocols/oscar/icq/icqprotocol.cpp:610
+#, fuzzy
+msgid "Cars"
+msgstr "Ffarsi"
+
+#: protocols/oscar/icq/icqprotocol.cpp:611
+msgid "Celebrities"
+msgstr ""
+
+#: protocols/oscar/icq/icqprotocol.cpp:612
+#, fuzzy
+msgid "Collections"
+msgstr "Cysylltiad"
+
+#: protocols/oscar/icq/icqprotocol.cpp:613
+msgid "Computers"
+msgstr "Cyfrifiaduron"
+
+#: protocols/oscar/icq/icqprotocol.cpp:614
+msgid "Culture"
+msgstr ""
+
+#: protocols/oscar/icq/icqprotocol.cpp:615
+#, fuzzy
+msgid "Fitness"
+msgstr "Hidlenni"
+
+#: protocols/oscar/icq/icqprotocol.cpp:617
+msgid "Hobbies"
+msgstr ""
+
+#: protocols/oscar/icq/icqprotocol.cpp:618
+msgid "ICQ - Help"
+msgstr ""
+
+#: protocols/oscar/icq/icqprotocol.cpp:619
+msgid "Internet"
+msgstr "Rhyngrwyd"
+
+#: protocols/oscar/icq/icqprotocol.cpp:620
+#, fuzzy
+msgid "Lifestyle"
+msgstr "Ardull"
+
+#: protocols/oscar/icq/icqprotocol.cpp:621
+msgid "Movies"
+msgstr ""
+
+#: protocols/oscar/icq/icqprotocol.cpp:622
+msgid "Music"
+msgstr ""
+
+#: protocols/oscar/icq/icqprotocol.cpp:623
+msgid "Outdoors"
+msgstr ""
+
+#: protocols/oscar/icq/icqprotocol.cpp:624
+msgid "Parenting"
+msgstr ""
+
+#: protocols/oscar/icq/icqprotocol.cpp:625
+msgid "Pets and animals"
+msgstr ""
+
+#: protocols/oscar/icq/icqprotocol.cpp:626
+msgid "Religion"
+msgstr ""
+
+#: protocols/oscar/icq/icqprotocol.cpp:627
+msgid "Science"
+msgstr "Gwyddoniaeth"
+
+#: protocols/oscar/icq/icqprotocol.cpp:628
+msgid "Skills"
+msgstr ""
+
+#: protocols/oscar/icq/icqprotocol.cpp:629
+msgid "Sports"
+msgstr "Chwaraeon"
+
+#: protocols/oscar/icq/icqprotocol.cpp:630
+#, fuzzy
+msgid "Web design"
+msgstr "Neges"
+
+#: protocols/oscar/icq/icqprotocol.cpp:631
+msgid "Ecology"
+msgstr ""
+
+#: protocols/oscar/icq/icqprotocol.cpp:632
+msgid "News and media"
+msgstr ""
+
+#: protocols/oscar/icq/icqprotocol.cpp:633
+#, fuzzy
+msgid "Government"
+msgstr "Almaenaidd"
+
+#: protocols/oscar/icq/icqprotocol.cpp:634
+msgid "Business"
+msgstr "Busnes"
+
+#: protocols/oscar/icq/icqprotocol.cpp:635
+msgid "Mystics"
+msgstr ""
+
+#: protocols/oscar/icq/icqprotocol.cpp:636
+msgid "Travel"
+msgstr "Teithio"
+
+#: protocols/oscar/icq/icqprotocol.cpp:637
+msgid "Astronomy"
+msgstr "Astroleg"
+
+#: protocols/oscar/icq/icqprotocol.cpp:638
+msgid "Space"
+msgstr "Gofodnod"
+
+#: protocols/oscar/icq/icqprotocol.cpp:639
+#, fuzzy
+msgid "Clothing"
+msgstr "Cysylltu"
+
+#: protocols/oscar/icq/icqprotocol.cpp:640
+#, fuzzy
+msgid "Parties"
+msgstr "&Priodweddau"
+
+#: protocols/oscar/icq/icqprotocol.cpp:641
+#, fuzzy
+msgid "Women"
+msgstr "Sylwad:"
+
+#: protocols/oscar/icq/icqprotocol.cpp:642
+#, fuzzy
+msgid "Social science"
+msgstr "Gwyddoniaeth"
+
+#: protocols/oscar/icq/icqprotocol.cpp:643
+msgid "60's"
+msgstr ""
+
+#: protocols/oscar/icq/icqprotocol.cpp:644
+msgid "70's"
+msgstr ""
+
+#: protocols/oscar/icq/icqprotocol.cpp:645
+msgid "40's"
+msgstr ""
+
+#: protocols/oscar/icq/icqprotocol.cpp:646
+msgid "50's"
+msgstr ""
+
+#: protocols/oscar/icq/icqprotocol.cpp:647
+msgid "Finance and corporate"
+msgstr ""
+
+#: protocols/oscar/icq/icqprotocol.cpp:648
+#, fuzzy
+msgid "Entertainment"
+msgstr "Rhyngrwyd"
+
+#: protocols/oscar/icq/icqprotocol.cpp:649
+msgid "Consumer electronics"
+msgstr ""
+
+#: protocols/oscar/icq/icqprotocol.cpp:650
+msgid "Retail stores"
+msgstr ""
+
+#: protocols/oscar/icq/icqprotocol.cpp:651
+msgid "Health and beauty"
+msgstr ""
+
+#: protocols/oscar/icq/icqprotocol.cpp:652
+msgid "Media"
+msgstr ""
+
+#: protocols/oscar/icq/icqprotocol.cpp:653
+msgid "Household products"
+msgstr ""
+
+#: protocols/oscar/icq/icqprotocol.cpp:654
+msgid "Mail order catalog"
+msgstr ""
+
+#: protocols/oscar/icq/icqprotocol.cpp:655
+#, fuzzy
+msgid "Business services"
+msgstr "Busnes"
+
+#: protocols/oscar/icq/icqprotocol.cpp:656
+msgid "Audio and visual"
+msgstr ""
+
+#: protocols/oscar/icq/icqprotocol.cpp:657
+msgid "Sporting and athletic"
+msgstr ""
+
+#: protocols/oscar/icq/icqprotocol.cpp:658
+msgid "Publishing"
+msgstr "Cyhoeddi"
+
+#: protocols/oscar/icq/icqprotocol.cpp:659
+msgid "Home automation"
+msgstr ""
+
+#: protocols/oscar/icq/icqcontact.cpp:253
+msgid "Request Authorization"
+msgstr ""
+
+#: protocols/oscar/icq/icqcontact.cpp:254
+msgid "Reason for requesting authorization:"
+msgstr ""
+
+#: protocols/oscar/icq/icqcontact.cpp:278
 msgid ""
-"Allows you to set a custom color for this account.\n"
-"The icon of every contact of this account will be coloured with this color. "
-"Useful if you have several accounts of the same protocol"
+"User %1 has granted your authorization request.\n"
+"Reason: %2"
 msgstr ""
 
-#. i18n: file ./kopete/config/accounts/kopeteaccountconfigbase.ui line 163
-#: rc.cpp:602
-#, no-c-format
-msgid "Increase the priority"
+#: protocols/oscar/icq/icqcontact.cpp:287
+msgid ""
+"User %1 has rejected the authorization request.\n"
+"Reason: %2"
 msgstr ""
 
-#. i18n: file ./kopete/config/accounts/kopeteaccountconfigbase.ui line 167
-#: rc.cpp:605 rc.cpp:612
-#, no-c-format
+#: protocols/oscar/icq/icqcontact.cpp:553
+msgid "RTF-Messages"
+msgstr ""
+
+#: protocols/oscar/icq/icqcontact.cpp:557
+msgid "Groupchat"
+msgstr ""
+
+#: protocols/oscar/icq/icqcontact.cpp:628
 msgid ""
-"Uses these buttons to increase or decrease the priority.\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.)"
+"<qt>You must be logged on to ICQ before you can send a message to a user.</qt>"
 msgstr ""
 
-#. i18n: file ./kopete/config/accounts/kopeteaccountconfigbase.ui line 201
-#: rc.cpp:609
-#, no-c-format
-msgid "Decrease the priority"
+#: protocols/oscar/icq/icqcontact.cpp:630
+msgid "Not Signed On"
 msgstr ""
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_chatwindow.ui line 24
-#: rc.cpp:616
-#, no-c-format
-msgid "Chat Window Appearance"
+#: protocols/oscar/icq/icqcontact.cpp:690
+msgid "&Request Authorization"
 msgstr ""
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_chatwindow.ui line 43
-#: rc.cpp:619
-#, no-c-format
-msgid "Styles"
-msgstr "Arddulliau"
+#: protocols/oscar/icq/icqcontact.cpp:692
+#, fuzzy
+msgid "&Grant Authorization"
+msgstr "Yn aros am awdurdodiad"
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_chatwindow.ui line 113
-#: rc.cpp:622
-#, fuzzy, no-c-format
-msgid "&Get New..."
-msgstr "&Newydd..."
+#: protocols/oscar/icq/icqcontact.cpp:703
+msgid "&Ignore"
+msgstr "&Anwybyddu"
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_chatwindow.ui line 116
-#: rc.cpp:625
-#, no-c-format
-msgid "Get new Chat Window styles over the Internet"
+#: protocols/oscar/aim/aimcontact.cpp:95
+#: protocols/oscar/icq/icqcontact.cpp:705
+#, fuzzy
+msgid "Always &Visible To"
+msgstr "Segur"
+
+#: protocols/oscar/aim/aimcontact.cpp:97
+#: protocols/oscar/icq/icqcontact.cpp:707
+#, fuzzy
+msgid "Always &Invisible To"
+msgstr "Segur"
+
+#: protocols/oscar/icq/icqcontact.cpp:719
+#, fuzzy
+msgid "Select Encoding..."
+msgstr "Dewis..."
+
+#: protocols/oscar/icq/icqpresence.cpp:72
+msgid "&Do Not Disturb"
 msgstr ""
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_chatwindow.ui line 124
-#: rc.cpp:628
-#, fuzzy, no-c-format
-msgid "&Install..."
-msgstr "Gosod Thema Newydd..."
+#: protocols/oscar/icq/icqpresence.cpp:72
+msgid "Do Not Disturb (Invisible)"
+msgstr ""
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_chatwindow.ui line 142
-#: rc.cpp:634
-#, no-c-format
-msgid "Style Variant:"
+#: protocols/oscar/icq/icqpresence.cpp:73
+msgid "O&ccupied"
 msgstr ""
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_chatwindow.ui line 165
-#: rc.cpp:637
-#, fuzzy, no-c-format
-msgid "Display"
-msgstr "Enw Dangos"
+#: protocols/oscar/icq/icqpresence.cpp:73
+msgid "Occupied"
+msgstr ""
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_chatwindow.ui line 176
-#: rc.cpp:640
-#, no-c-format
-msgid "Group consecuti&ve messages"
+#: protocols/oscar/icq/icqpresence.cpp:73
+#, fuzzy
+msgid "Occupied (Invisible)"
+msgstr "Segur"
+
+#: protocols/oscar/icq/icqpresence.cpp:74
+msgid "Not A&vailable"
+msgstr "Dim a&r gael"
+
+#: protocols/oscar/icq/icqpresence.cpp:74
+msgid "Not Available"
+msgstr "Dim ar gael"
+
+#: protocols/oscar/icq/icqpresence.cpp:74
+#, fuzzy
+msgid "Not Available (Invisible)"
+msgstr "A&r gael"
+
+#: protocols/oscar/icq/icqpresence.cpp:75
+#, fuzzy
+msgid "Away (Invisible)"
+msgstr "Segur"
+
+#: protocols/oscar/icq/icqpresence.cpp:76
+msgid "&Free for Chat"
 msgstr ""
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 16
-#: rc.cpp:643
-#, no-c-format
-msgid "Contact List Appearance"
+#: protocols/oscar/icq/icqpresence.cpp:76
+msgid "Free For Chat"
 msgstr ""
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 27
-#: rc.cpp:646
-#, no-c-format
-msgid "Layout"
-msgstr "Cynllun"
+#: protocols/oscar/icq/icqpresence.cpp:76
+#, fuzzy
+msgid "Free For Chat (Invisible)"
+msgstr "Segur"
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 38
-#: rc.cpp:649
+#. i18n: file ./protocols/gadu/ui/gaduawayui.ui line 71
+#: protocols/oscar/icq/icqpresence.cpp:77 rc.cpp:4265
 #, no-c-format
-msgid "Arrange metacontacts by &group"
+msgid "O&nline"
+msgstr "A&r-lein"
+
+#: protocols/oscar/icq/icqpresence.cpp:77
+#, fuzzy
+msgid "Online (Invisible)"
+msgstr "Segur"
+
+#: protocols/oscar/aim/aimprotocol.cpp:240
+#: protocols/oscar/icq/icqpresence.cpp:129
+msgid "Connecting..."
+msgstr "Yn cysylltu..."
+
+#: protocols/oscar/icq/icqpresence.cpp:133
+msgid "Waiting for Authorization"
+msgstr "Yn aros am awdurdodiad"
+
+#: protocols/oscar/icq/icqreadaway.cpp:34
+msgid "&Fetch Again"
 msgstr ""
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 46
-#: rc.cpp:652
-#, no-c-format
-msgid "Show tree &branch lines"
+#: protocols/oscar/icq/icqreadaway.cpp:40
+#: protocols/oscar/icq/icqreadaway.cpp:82
+msgid "'%2' Message for %1"
 msgstr ""
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 79
-#: rc.cpp:655
-#, no-c-format
-msgid "In&dent contacts"
+#: protocols/oscar/icq/icqreadaway.cpp:77
+msgid "Fetching '%2' Message for %1..."
 msgstr ""
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 91
-#: rc.cpp:658
-#, no-c-format
-msgid "Contact Display Mode"
+#: protocols/oscar/icq/ui/icqauthreplydialog.cpp:28
+msgid "Authorization Reply"
 msgstr ""
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 102
-#: rc.cpp:661
-#, fuzzy, no-c-format
-msgid "List Style"
-msgstr "Ardull"
+#: protocols/oscar/icq/ui/icqauthreplydialog.cpp:53
+msgid "<b>%1</b> requested authorization to add you to his/her contact list."
+msgstr ""
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 113
-#: rc.cpp:664
-#, no-c-format
-msgid "&Classic, left-aligned status icons"
+#: protocols/oscar/icq/ui/icqauthreplydialog.cpp:55
+msgid "Authorization reply to <b>%1</b>."
 msgstr ""
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 124
-#: rc.cpp:667
-#, no-c-format
-msgid "&Right-aligned status icons"
+#: protocols/oscar/aim/aimaccount.cpp:790
+#: protocols/oscar/icq/icqaccount.cpp:227
+#: protocols/oscar/icq/ui/icqaddcontactpage.cpp:86
+#: protocols/oscar/icq/ui/icqaddcontactpage.cpp:94
+#: protocols/oscar/icq/ui/icqsearchdialog.cpp:83
+#: protocols/oscar/icq/ui/icqsearchdialog.cpp:108
+#: protocols/oscar/icq/ui/icqsearchdialog.cpp:147
+#: protocols/oscar/icq/ui/icqsearchdialog.cpp:196
+msgid "ICQ Plugin"
 msgstr ""
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 132
-#: rc.cpp:670
-#, no-c-format
-msgid "Detailed &view"
-msgstr "&Golwg Manwl"
+#: protocols/oscar/icq/ui/icqaddcontactpage.cpp:94
+#: protocols/oscar/icq/ui/icqsearchdialog.cpp:108
+msgid "You must enter a valid UIN."
+msgstr ""
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 142
-#: rc.cpp:673
-#, no-c-format
-msgid "Use contact photos when available"
+#: protocols/oscar/icq/ui/icquserinfowidget.cpp:44
+#, fuzzy
+msgid "ICQ User Information"
+msgstr "Gwybodaeth Defnyddiwr"
+
+#: protocols/oscar/icq/ui/icquserinfowidget.cpp:49
+#, fuzzy
+msgid "General ICQ Information"
+msgstr "Gwybodaeth Defnyddiwr"
+
+#: protocols/oscar/icq/ui/icquserinfowidget.cpp:63
+#, fuzzy
+msgid "Other ICQ Information"
+msgstr "Gwybodaeth Defnyddiwr"
+
+#: protocols/oscar/icq/ui/icquserinfowidget.cpp:69
+#, fuzzy
+msgid "Interest Info"
+msgstr "&Gwybodaeth am Ddefnyddwyr"
+
+#: protocols/oscar/icq/ui/icquserinfowidget.cpp:70
+#, fuzzy
+msgid "Interest"
+msgstr "Rhyngrwyd"
+
+#: protocols/oscar/icq/ui/icqsearchdialog.cpp:45
+msgid "ICQ User Search"
 msgstr ""
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 152
-#: rc.cpp:676
-#, no-c-format
-msgid "Contact List Auto-Hide"
+#: protocols/oscar/icq/ui/icqsearchdialog.cpp:83
+msgid "You must be online to search the ICQ Whitepages."
 msgstr ""
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 155
-#: rc.cpp:679
-#, no-c-format
+#: protocols/oscar/icq/ui/icqsearchdialog.cpp:147
+msgid "You must enter search criteria."
+msgstr ""
+
+#: protocols/oscar/icq/ui/icqsearchdialog.cpp:196
+msgid "You must be online to display user info."
+msgstr ""
+
+#: protocols/oscar/icq/icqaccount.cpp:130
+#, fuzzy
+msgid "In&visible"
+msgstr "Segur"
+
+#: protocols/oscar/aim/aimaccount.cpp:328
+#: protocols/oscar/icq/icqaccount.cpp:137
+msgid "Set Visibility..."
+msgstr ""
+
+#: protocols/oscar/aim/aimaccount.cpp:789
+#: protocols/oscar/icq/icqaccount.cpp:226
+msgid "You must be online to set users visibility."
+msgstr ""
+
+#: protocols/oscar/oscarlistnonservercontacts.cpp:28
+#, fuzzy
+msgid "Add Contacts to Server List"
+msgstr "&Ychwanegu Cyswllt"
+
+#: protocols/oscar/oscarlistnonservercontacts.cpp:34
+msgid "Do &Not Add"
+msgstr "&Na Ychwaneger"
+
+#: protocols/oscar/aim/aimaccount.cpp:211
 msgid ""
-"When enabled, the contact list will automatically be hidden a fixed amount of "
-"time after the mouse cursor leaves the window. You can set the amount of time "
-"in the 'Time until autohide' box below."
+"Visit the Kopete website at <a href=\"http://kopete.kde.org\">"
+"http://kopete.kde.org</a>"
 msgstr ""
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 166
-#: rc.cpp:682
-#, no-c-format
-msgid "A&uto-hide contact list"
+#: protocols/oscar/aim/aimaccount.cpp:325
+#, fuzzy
+msgid "Join Chat..."
+msgstr "Ymuno â'r Sianel..."
+
+#: protocols/oscar/aim/aimaccount.cpp:385
+msgid "Editing your user info is not possible because you are not connected."
 msgstr ""
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 214
-#: rc.cpp:688
-#, no-c-format
-msgid "The timeout value for both contact list and scrollbar auto-hiding."
+#: protocols/oscar/aim/aimaccount.cpp:387
+msgid "Unable to edit user info"
 msgstr ""
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 225
-#: rc.cpp:691
-#, no-c-format
-msgid "after the cursor left the window"
+#: protocols/oscar/aim/aimaccount.cpp:511
+msgid "Joining an AIM chat room is not possible because you are not connected."
 msgstr ""
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 254
-#: rc.cpp:694
-#, no-c-format
-msgid "Contact List Animations"
+#: protocols/oscar/aim/aimaccount.cpp:513
+msgid "Unable to Join AIM Chat Room"
 msgstr ""
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 265
-#: rc.cpp:697
-#, no-c-format
-msgid "&Animate changes to contact list items"
+#: protocols/oscar/aim/aimcontact.cpp:93
+#, fuzzy
+msgid "&Warn User"
+msgstr "&Rhybuddio"
+
+#: protocols/oscar/aim/aimcontact.cpp:350
+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>"
 msgstr ""
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 273
-#: rc.cpp:700
-#, no-c-format
-msgid "Fade in / out contacts as the&y appear / disappear"
+#: protocols/oscar/aim/aimcontact.cpp:358
+msgid "Warn User %1?"
 msgstr ""
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 281
-#: rc.cpp:703
-#, no-c-format
-msgid "Fo&ld in / out contacts as they appear / disappear"
+#: protocols/oscar/aim/aimcontact.cpp:359
+msgid "Warn Anonymously"
 msgstr ""
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 299
-#: rc.cpp:706
-#, no-c-format
-msgid "Change &Tooltip Contents..."
+#: protocols/oscar/aim/aimcontact.cpp:359
+msgid "Warn"
+msgstr "Rhybuddio"
+
+#: protocols/oscar/aim/aimprotocol.cpp:192
+msgid "Do you want to add '%1' to your contact list?"
 msgstr ""
 
-#. i18n: file ./kopete/config/appearance/tooltipeditwidget.ui line 46
-#: rc.cpp:709
-#, no-c-format
+#: protocols/oscar/aim/aimprotocol.cpp:214
 msgid ""
-"Using the arrow buttons, put on the right the items you want to see in the "
-"contact tooltips. You can then sort them."
+"Unable to connect to the chat room %1 because the account for %2 is not "
+"connected."
 msgstr ""
 
-#. i18n: file ./kopete/config/appearance/tooltipeditwidget.ui line 57
-#: rc.cpp:712
-#, no-c-format
-msgid "<b>Here you can customize the contact tooltips</b>"
+#: protocols/oscar/aim/aimprotocol.cpp:236
+#, fuzzy
+msgid "Mobile"
+msgstr "Ffôn Symudol :"
+
+#: protocols/oscar/aim/aimprotocol.cpp:239
+msgid "Mobile Away"
 msgstr ""
 
-#. i18n: file ./kopete/config/appearance/tooltipeditwidget.ui line 87
-#: rc.cpp:715
-#, no-c-format
+#: protocols/oscar/aim/aimprotocol.cpp:243
+#, fuzzy
+msgid "User Profile"
+msgstr "Diffinir gan y Defnyddiwr"
+
+#: protocols/oscar/aim/ui/aimaddcontactpage.cpp:43
+msgid "Connect to the AIM network and try again."
+msgstr ""
+
+#: protocols/oscar/aim/ui/aimaddcontactpage.cpp:66
+msgid "No Screen Name"
+msgstr ""
+
+#: protocols/oscar/aim/aimuserinfo.cpp:41
+#: protocols/oscar/aim/aimuserinfo.cpp:136
+#: protocols/oscar/aim/aimuserinfo.cpp:153
+#, c-format
+msgid "User Information on %1"
+msgstr ""
+
+#: protocols/oscar/aim/aimuserinfo.cpp:90
+msgid "&Save Profile"
+msgstr ""
+
+#: protocols/oscar/aim/aimuserinfo.cpp:116
+msgid "Requesting User Profile, please wait..."
+msgstr ""
+
+#: protocols/oscar/aim/aimuserinfo.cpp:198
+msgid "<html><body><I>No user information provided</I></body></html>"
+msgstr ""
+
+#: protocols/oscar/aim/aimjoinchat.cpp:31
+msgid "Join AIM Chat Room"
+msgstr ""
+
+#: protocols/oscar/aim/aimjoinchat.cpp:32
+msgid "Join"
+msgstr "Uniad"
+
+#: protocols/oscar/oscaraccount.cpp:237 protocols/oscar/oscaraccount.cpp:616
+#: protocols/oscar/oscaraccount.cpp:622
+msgid "Buddies"
+msgstr ""
+
+#: protocols/oscar/oscaraccount.cpp:406
+msgid "ICQ Web Express"
+msgstr ""
+
+#: protocols/oscar/oscaraccount.cpp:408
+#, fuzzy
+msgid "ICQ Email Express"
+msgstr "Cyfeiriad Ebost"
+
+#: protocols/oscar/oscaraccount.cpp:730 protocols/oscar/oscaraccount.cpp:747
 msgid ""
-"This list contains elements which are currently <b>not present</b> "
-"in the contact tooltip."
+"_: account has been disconnected\n"
+"%1 disconnected"
+msgstr "Datgysylltwyd %1"
+
+#: protocols/oscar/oscaraccount.cpp:771
+msgid ""
+"There was an error in the protocol handling; it was not fatal, so you will not "
+"be disconnected."
 msgstr ""
 
-#. i18n: file ./kopete/config/appearance/tooltipeditwidget.ui line 128
-#: rc.cpp:718
-#, no-c-format
-msgid "v"
-msgstr "v"
+#: protocols/oscar/oscaraccount.cpp:773
+msgid ""
+"There was an error in the protocol handling; automatic reconnection occurring."
+msgstr ""
 
-#. i18n: file ./kopete/config/appearance/tooltipeditwidget.ui line 131
-#: rc.cpp:721
-#, no-c-format
-msgid "Use this arrow to reorder the items in the list."
+#: protocols/oscar/oscaraccount.cpp:775
+#, fuzzy
+msgid "OSCAR Protocol error"
+msgstr "Gwall protocol."
+
+#: protocols/oscar/oscaraccount.cpp:810
+msgid ""
+"_: ICQ user id\n"
+"UIN"
 msgstr ""
 
-#. i18n: file ./kopete/config/appearance/tooltipeditwidget.ui line 139
-#: rc.cpp:724
-#, no-c-format
-msgid "^"
+#: protocols/oscar/oscaraccount.cpp:810
+msgid ""
+"_: AIM user id\n"
+"screen name"
 msgstr ""
 
-#. i18n: file ./kopete/config/appearance/tooltipeditwidget.ui line 147
-#: rc.cpp:727
-#, no-c-format
-msgid "<"
-msgstr "<"
+#: protocols/oscar/oscaraccount.cpp:820
+msgid ""
+"You have logged in more than once with the same %1, account %2 is now "
+"disconnected."
+msgstr ""
 
-#. i18n: file ./kopete/config/appearance/tooltipeditwidget.ui line 155
-#: rc.cpp:730
-#, no-c-format
-msgid ">"
-msgstr ">"
+#: protocols/oscar/oscaraccount.cpp:826
+msgid ""
+"Sign on failed because either your %1 or password are invalid. Please check "
+"your settings for account %2."
+msgstr ""
 
-#. i18n: file ./kopete/config/appearance/tooltipeditwidget.ui line 158
-#: rc.cpp:733
-#, no-c-format
-msgid "Use this arrows to add or remove items to your contact tooltips."
+#: protocols/oscar/oscaraccount.cpp:834
+msgid "The %1 service is temporarily unavailable. Please try again later."
 msgstr ""
 
-#. i18n: file ./kopete/config/appearance/tooltipeditwidget.ui line 201
-#: rc.cpp:736
-#, no-c-format
+#: protocols/oscar/oscaraccount.cpp:839
 msgid ""
-"This list contains elements which are currently <b>present</b> "
-"in the contact tooltips."
+"Could not sign on to %1 with account %2 because the password was incorrect."
 msgstr ""
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_emoticons.ui line 24
-#: rc.cpp:739
-#, no-c-format
-msgid "&Use emoticons"
+#: protocols/oscar/oscaraccount.cpp:844
+msgid "Could not sign on to %1 with nonexistent account %2."
 msgstr ""
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_emoticons.ui line 30
-#: rc.cpp:742
-#, no-c-format
+#: protocols/oscar/oscaraccount.cpp:848
+msgid "Sign on to %1 failed because your account %2 expired."
+msgstr ""
+
+#: protocols/oscar/oscaraccount.cpp:852
+msgid "Sign on to %1 failed because your account %2 is currently suspended."
+msgstr ""
+
+#: protocols/oscar/oscaraccount.cpp:858
 msgid ""
-"If this is checked, the text representation of emoticons in messages will be "
-"replaced by an image"
+"Could not sign on to %1 as there are too many clients from the same computer."
 msgstr ""
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_emoticons.ui line 38
-#: rc.cpp:745
-#, no-c-format
-msgid "&Require separators (spaces) around emoticons"
+#: protocols/oscar/oscaraccount.cpp:864
+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 ""
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_emoticons.ui line 44
-#: rc.cpp:748
-#, no-c-format
+#: protocols/oscar/oscaraccount.cpp:873
 msgid ""
-"If this is checked, only emoticons that are separated from the text by spaces "
-"will be shown as images."
+"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 ""
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_emoticons.ui line 55
-#: rc.cpp:751
-#, fuzzy, no-c-format
-msgid "Select emoticon theme:"
-msgstr "&Dileu y Cyswllt"
+#: protocols/oscar/oscaraccount.cpp:885 protocols/oscar/oscaraccount.cpp:905
+msgid "Sign on to %1 with your account %2 failed."
+msgstr ""
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_emoticons.ui line 68
-#: rc.cpp:754
-#, no-c-format
-msgid "Preview:"
-msgstr "Rhagolwg:"
+#: protocols/oscar/oscaraccount.cpp:892
+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 ""
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_emoticons.ui line 106
-#: rc.cpp:757
-#, fuzzy, no-c-format
-msgid "&Get New Themes..."
-msgstr "Gosod Thema Newydd..."
+#: protocols/oscar/oscaraccount.cpp:898
+msgid ""
+"Account %1 was disabled on the %2 server because of your age (less than 13)."
+msgstr ""
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_emoticons.ui line 109
-#: rc.cpp:760
-#, no-c-format
-msgid "Download emoticon theme from the Internet"
+#: protocols/oscar/oscarvisibilitydialog.cpp:29
+#, fuzzy
+msgid "Add Contacts to Visible or Invisible List"
+msgstr "&Ychwanegu Cyswllt"
+
+#: protocols/groupwise/gwmessagemanager.cpp:65
+msgid "&Invite"
+msgstr "G&wahodd"
+
+#: protocols/groupwise/gwmessagemanager.cpp:68
+#: protocols/groupwise/gwmessagemanager.cpp:506
+msgid "Security Status"
 msgstr ""
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_emoticons.ui line 117
-#: rc.cpp:763
-#, fuzzy, no-c-format
-msgid "&Install Theme File..."
-msgstr "Gosod Thema Newydd..."
+#: protocols/groupwise/gwmessagemanager.cpp:69
+msgid "Conversation is secure"
+msgstr ""
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_emoticons.ui line 133
-#: rc.cpp:766
-#, no-c-format
-msgid "Remove Theme"
-msgstr "Gwaredu Thema"
+#: protocols/groupwise/gwmessagemanager.cpp:71
+#: protocols/groupwise/gwmessagemanager.cpp:513
+msgid "Archiving Status"
+msgstr ""
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 16
-#: rc.cpp:769 rc.cpp:1394
-#, no-c-format
-msgid "Colors"
-msgstr "Lliwiau"
+#: protocols/groupwise/gwmessagemanager.cpp:199
+#, c-format
+msgid "An error occurred when trying to start a chat: %1"
+msgstr ""
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 44
-#: rc.cpp:775
-#, no-c-format
-msgid "Base font:"
+#: protocols/groupwise/gwmessagemanager.cpp:226
+msgid ""
+"Your message could not be sent. You cannot send messages while your status is "
+"Appear Offline. "
 msgstr ""
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 60
-#: rc.cpp:778
-#, no-c-format
-msgid "Highlight foreground:"
+#: protocols/groupwise/gwmessagemanager.cpp:319
+msgid "&Other..."
+msgstr "&Eraill..."
+
+#: protocols/groupwise/gwmessagemanager.cpp:338
+#: protocols/groupwise/gwmessagemanager.cpp:384
+msgid "Enter Invitation Message"
 msgstr ""
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 91
-#: rc.cpp:781
-#, no-c-format
-msgid "Base font color:"
+#: protocols/groupwise/gwmessagemanager.cpp:339
+#: protocols/groupwise/gwmessagemanager.cpp:385
+msgid "Enter the reason for the invitation, or leave blank for no reason:"
 msgstr ""
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 122
-#: rc.cpp:784
-#, no-c-format
-msgid "Highlight background:"
+#: protocols/groupwise/gwmessagemanager.cpp:363
+#, fuzzy
+msgid "Search for Contact to Invite"
+msgstr "&Dileu y Cyswllt"
+
+#: protocols/groupwise/gwmessagemanager.cpp:398
+msgid ""
+"_: label attached to contacts who have been invited but are yet to join a chat\n"
+"(pending)"
 msgstr ""
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 130
-#: rc.cpp:787
-#, no-c-format
-msgid "Link color:"
+#: protocols/groupwise/gwmessagemanager.cpp:445
+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."
 msgstr ""
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 138
-#: rc.cpp:790
-#, no-c-format
-msgid "Background color:"
-msgstr "Lliw'r cefndir:"
+#: protocols/groupwise/gwmessagemanager.cpp:471
+msgid "%1 has rejected an invitation to join this conversation."
+msgstr ""
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 153
-#: rc.cpp:793
-#, no-c-format
-msgid "Formatting Overrides"
+#: protocols/groupwise/gwmessagemanager.cpp:493
+msgid "Conversation is being administratively logged"
 msgstr ""
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 164
-#: rc.cpp:796
-#, no-c-format
-msgid "Do not show user specified &background color"
+#: protocols/groupwise/gwmessagemanager.cpp:498
+msgid "Conversation is not being administratively logged"
 msgstr ""
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 172
-#: rc.cpp:799
-#, no-c-format
-msgid "Do not show user specified &foreground color"
+#: protocols/groupwise/gwmessagemanager.cpp:506
+msgid "This conversation is secured with SSL security."
 msgstr ""
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 180
-#: rc.cpp:802
-#, no-c-format
-msgid "Do not show user specified &rich text"
+#: protocols/groupwise/gwmessagemanager.cpp:513
+msgid "This conversation is being logged administratively."
 msgstr ""
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 201
-#: rc.cpp:808
-#, no-c-format
-msgid "Use custom fonts for contact list items"
+#: protocols/groupwise/gwaccount.cpp:82
+msgid "&Set Auto-Reply..."
 msgstr ""
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 245
-#: rc.cpp:811
-#, no-c-format
-msgid "Small font:"
+#: protocols/groupwise/gwaccount.cpp:84
+#, fuzzy
+msgid "&Join Channel..."
+msgstr "Ymuno â'r Sianel..."
+
+#: protocols/groupwise/gwaccount.cpp:86
+msgid "&Manage Privacy..."
 msgstr ""
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 264
-#: rc.cpp:814
-#, no-c-format
-msgid "Normal font:"
+#: protocols/groupwise/gwaccount.cpp:253
+msgid "GroupWise SSL Error"
 msgstr ""
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 311
-#: rc.cpp:817
-#, no-c-format
-msgid "Recolor contacts marked as idle:"
+#: protocols/groupwise/gwaccount.cpp:367
+msgid ""
+"_: Message Sending Failed\n"
+"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 ""
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 319
-#: rc.cpp:820
-#, no-c-format
-msgid "Group name color:"
+#: protocols/groupwise/gwaccount.cpp:367
+msgid "Unable to Send Message on Account '%1'"
 msgstr ""
 
-#. i18n: file ./kopete/addaccountwizard/addaccountwizardpage1.ui line 22
-#: rc.cpp:823
-#, no-c-format
-msgid "Step One: Select Messaging Service"
+#: protocols/groupwise/gwaccount.cpp:577
+msgid "Conflicting Changes Made Offline"
 msgstr ""
 
-#. i18n: file ./kopete/addaccountwizard/addaccountwizardpage1.ui line 83
-#: protocols/sms/smseditaccountwidget.cpp:134 rc.cpp:829 rc.cpp:4259
-#, no-c-format
-msgid "Description"
-msgstr "Disgrifiad"
+#: protocols/groupwise/gwaccount.cpp:577
+msgid ""
+"A change happened to your GroupWise contact list while you were offline which "
+"was impossible to reconcile."
+msgstr ""
 
-#. i18n: file ./kopete/addaccountwizard/addaccountwizardpage1.ui line 122
-#: rc.cpp:832
-#, no-c-format
+#: protocols/groupwise/gwaccount.cpp:650
 msgid ""
-"<h2>Welcome to the Add Account Wizard</h2>\n"
-"<p>Select the messaging service from the list below.</p>"
+"_: Error shown when connecting failed\n"
+"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 ""
 
-#. i18n: file ./kopete/addaccountwizard/addaccountwizardpage2.ui line 16
-#: rc.cpp:836 rc.cpp:865 rc.cpp:1281
-#, no-c-format
-msgid "Finished"
-msgstr "Wedi Gorffen"
+#: protocols/groupwise/gwaccount.cpp:650
+msgid "Unable to Connect '%1'"
+msgstr ""
 
-#. i18n: file ./kopete/addaccountwizard/addaccountwizardpage2.ui line 39
-#: rc.cpp:839
-#, no-c-format
+#: protocols/groupwise/gwaccount.cpp:773
+msgid "The certificate of server %1 could not be validated for account %2: %3"
+msgstr ""
+
+#: protocols/groupwise/gwaccount.cpp:777
+msgid "GroupWise Connection Certificate Problem"
+msgstr ""
+
+#: protocols/groupwise/gwaccount.cpp:826
 msgid ""
-"<h2>Congratulations</h2>\n"
-"<p>You have finished configuring the account. Please click the \"Finish\" "
-"button.</p>"
+"_: Prefix used for automatically generated auto-reply messages when the contact "
+"is Away, contains contact's name\n"
+"Auto reply from %1: "
 msgstr ""
 
-#. i18n: file ./kopete/addaccountwizard/addaccountwizardpage2.ui line 59
-#: rc.cpp:843 rc.cpp:874
-#, no-c-format
+#: protocols/groupwise/gwaccount.cpp:832
 msgid ""
-"Use &custom color\n"
-"for account:"
+"_: Prefix used for broadcast messages\n"
+"Broadcast message from %1: "
 msgstr ""
 
-#. i18n: file ./kopete/addaccountwizard/addaccountwizardpage2.ui line 62
-#: rc.cpp:847 rc.cpp:878
-#, no-c-format
-msgid "Use a custom color for this account"
+#: protocols/groupwise/gwaccount.cpp:838
+msgid ""
+"_: Prefix used for system broadcast messages\n"
+"System Broadcast message from %1: "
 msgstr ""
 
-#. i18n: file ./kopete/addaccountwizard/addaccountwizardpage2.ui line 65
-#: rc.cpp:850 rc.cpp:881
-#, no-c-format
+#: protocols/groupwise/gwaccount.cpp:1212
 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."
+"The contact %1 could not be added to the contact list, with error message: %2"
 msgstr ""
 
-#. i18n: file ./kopete/addaccountwizard/addaccountwizardpage2.ui line 131
-#: rc.cpp:856 rc.cpp:887
-#, fuzzy, no-c-format
-msgid "Co&nnect now"
-msgstr "Cy&sylltiad"
+#: protocols/groupwise/gwaccount.cpp:1214
+#, fuzzy
+msgid "Error Adding Contact"
+msgstr "Cyswllt"
 
-#. i18n: file ./kopete/addaccountwizard/addaccountwizardpage2.ui line 137
-#: rc.cpp:859 rc.cpp:890
-#, no-c-format
-msgid "Connect right after Finish is pressed"
+#: protocols/groupwise/gwaccount.cpp:1258
+msgid "Signed in as %1 Elsewhere"
 msgstr ""
 
-#. i18n: file ./kopete/addaccountwizard/addaccountwizardpage2.ui line 140
-#: rc.cpp:862 rc.cpp:893
-#, no-c-format
+#: protocols/groupwise/gwaccount.cpp:1259
 msgid ""
-"If this is checked, the account will be connected right after you clicked on <i>"
-"Finished</i>."
+"_: The parameter is the user's own account id for this protocol\n"
+"You have been disconnected from GroupWise Messenger because you signed in as %1 "
+"elsewhere"
 msgstr ""
 
-#. i18n: file ./kopete/addaccountwizard/addaccountwizardpage3.ui line 41
-#: rc.cpp:868
-#, no-c-format
+#: protocols/groupwise/gwaccount.cpp:1367
+msgid "%1 has been invited to join this conversation."
+msgstr ""
+
+#: protocols/groupwise/gwaccount.cpp:1393
+msgid "Enter Auto-Reply Message"
+msgstr ""
+
+#: protocols/groupwise/gwaccount.cpp:1394
 msgid ""
-"<h2>Congratulations</h2> \n"
-"<p>You have finished configuring the account. Please click the \"Finish\" "
-"button.</p>\n"
-"\n"
+"Please enter an Auto-Reply message that will be shown to users who message you "
+"while Away or Busy"
 msgstr ""
 
-#. i18n: file ./kopete/kopeteui.rc line 61
-#: rc.cpp:911
-#, no-c-format
-msgid "Global Identity Bar"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:29
+msgid "Access denied"
 msgstr ""
 
-#. i18n: file ./kopete/kopeteui.rc line 70
-#: rc.cpp:914
-#, no-c-format
-msgid "&Other Actions"
-msgstr "Gweithredoedd &eraill"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:32
+#, fuzzy
+msgid "Not supported"
+msgstr "Heb gysylltu"
 
-#. i18n: file ./kopete/kopeteui.rc line 77
-#: rc.cpp:917
-#, no-c-format
-msgid "&Groups"
-msgstr "&Grwpiau"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:35
+#, fuzzy
+msgid "Password expired"
+msgstr "Mae angen cyfrinair"
 
-#. i18n: file ./kopete/contactlist/tdeabcexport_base.ui line 16
-#: rc.cpp:920
-#, fuzzy, no-c-format
-msgid "Export Contacts"
-msgstr "Cysylltau"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:38
+#, fuzzy
+msgid "Invalid password"
+msgstr "Cyfrinair anghywir."
 
-#. i18n: file ./kopete/contactlist/tdeabcexport_base.ui line 23
-#: rc.cpp:923
-#, fuzzy, no-c-format
-msgid "Export Contacts to Address Book"
-msgstr "Cysylltau"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:41
+#, fuzzy
+msgid "User not found"
+msgstr "Ni chafwyd gweinydd."
 
-#. i18n: file ./kopete/contactlist/tdeabcexport_base.ui line 42
-#: rc.cpp:926
-#, no-c-format
-msgid ""
-"This wizard helps you export instant messaging contacts to the TDE address "
-"book."
+#: protocols/groupwise/libgroupwise/gwerror.cpp:44
+#, fuzzy
+msgid "Attribute not found"
+msgstr "Ni chafwyd gweinydd."
+
+#: protocols/groupwise/libgroupwise/gwerror.cpp:47
+msgid "User is disabled"
 msgstr ""
 
-#. i18n: file ./kopete/contactlist/tdeabcexport_base.ui line 61
-#: rc.cpp:929
-#, fuzzy, no-c-format
-msgid "&Select Address Book"
-msgstr "&Cyfeiriad ebost:"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:50
+msgid "Directory failure"
+msgstr ""
 
-#. i18n: file ./kopete/contactlist/tdeabcexport_base.ui line 92
-#: rc.cpp:932
-#, fuzzy, no-c-format
-msgid "Select Contacts to Export"
-msgstr "&Dileu y Cyswllt"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:53
+#, fuzzy
+msgid "Host not found"
+msgstr "Ni chafwyd gweinydd."
 
-#. i18n: file ./kopete/contactlist/tdeabcexport_base.ui line 111
-#: rc.cpp:935
-#, no-c-format
-msgid "Selected contacts will be added to the TDE address book."
+#: protocols/groupwise/libgroupwise/gwerror.cpp:56
+msgid "Locked by admin"
 msgstr ""
 
-#. i18n: file ./kopete/contactlist/tdeabcexport_base.ui line 117
-#: rc.cpp:938 rc.cpp:1777
-#, no-c-format
-msgid "Contact"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:59
+msgid "Duplicate participant"
+msgstr ""
+
+#: protocols/groupwise/libgroupwise/gwerror.cpp:62
+#, fuzzy
+msgid "Server busy"
+msgstr "Gweinydd"
+
+#: protocols/groupwise/libgroupwise/gwerror.cpp:65
+#, fuzzy
+msgid "Object not found"
+msgstr "Ni chafwyd gweinydd."
+
+#: protocols/groupwise/libgroupwise/gwerror.cpp:68
+msgid "Directory update"
+msgstr ""
+
+#: protocols/groupwise/libgroupwise/gwerror.cpp:71
+msgid "Duplicate folder"
+msgstr ""
+
+#: protocols/groupwise/libgroupwise/gwerror.cpp:74
+msgid "Contact list entry already exists"
+msgstr ""
+
+#: protocols/groupwise/libgroupwise/gwerror.cpp:77
+msgid "User not allowed"
+msgstr ""
+
+#: protocols/groupwise/libgroupwise/gwerror.cpp:80
+#, fuzzy
+msgid "Too many contacts"
 msgstr "Cyswllt"
 
-#. i18n: file ./kopete/contactlist/tdeabcexport_base.ui line 149
-#: rc.cpp:941
-#, no-c-format
-msgid "Select &All"
-msgstr "Dewis Pope&th"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:83
+#, fuzzy
+msgid "Conference not found"
+msgstr "Ni chafwyd gweinydd."
 
-#. i18n: file ./kopete/contactlist/tdeabcexport_base.ui line 157
-#: rc.cpp:944
-#, no-c-format
-msgid "&Deselect All"
-msgstr "Da&tddewis Popeth"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:86
+#, fuzzy
+msgid "Too many folders"
+msgstr "Cwmni:"
 
-#. i18n: file ./kopete/contactlist/kopeteaddrbookexportui.ui line 16
-#: rc.cpp:947
-#, no-c-format
-msgid "Merge with Address Book"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:89
+#, fuzzy
+msgid "Server protocol error"
+msgstr "Gwall protocol."
+
+#: protocols/groupwise/libgroupwise/gwerror.cpp:92
+msgid "Conversation invitation error"
 msgstr ""
 
-#. i18n: file ./kopete/contactlist/kopeteaddrbookexportui.ui line 27
-#: rc.cpp:950 rc.cpp:3860 rc.cpp:5222
-#, no-c-format
-msgid "First name:"
-msgstr "Enw cyntaf:"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:95
+msgid "User is blocked"
+msgstr ""
 
-#. i18n: file ./kopete/contactlist/kopeteaddrbookexportui.ui line 38
-#: rc.cpp:953
-#, no-c-format
-msgid "Home phone:"
-msgstr "Ffôn cartref :"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:98
+msgid "Master archive is missing"
+msgstr ""
 
-#. i18n: file ./kopete/contactlist/kopeteaddrbookexportui.ui line 73
-#: rc.cpp:956
-#, no-c-format
-msgid "Work phone:"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:101
+msgid "Expired password in use"
 msgstr ""
 
-#. i18n: file ./kopete/contactlist/kopeteaddrbookexportui.ui line 84
-#: rc.cpp:959
-#, no-c-format
-msgid "Mobile phone:"
-msgstr "Ffôn Symudol :"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:104
+msgid "Credentials missing"
+msgstr ""
 
-#. i18n: file ./kopete/contactlist/kopeteaddrbookexportui.ui line 95
-#: rc.cpp:962
-#, no-c-format
-msgid "URL:"
-msgstr "URL:"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:107
+#, fuzzy
+msgid "Authentication failed"
+msgstr "Dilysiant Gweinydd"
 
-#. i18n: file ./kopete/contactlist/kopeteaddrbookexportui.ui line 121
-#: rc.cpp:965 rc.cpp:3866 rc.cpp:5231
-#, no-c-format
-msgid "Last name:"
-msgstr "Enw olaf:"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:110
+#, fuzzy
+msgid "Eval connection limit"
+msgstr "Cysylltiad wedi goramseru"
 
-#. i18n: file ./kopete/contactlist/kopeteaddrbookexportui.ui line 140
-#: rc.cpp:968 rc.cpp:4386 rc.cpp:4398
-#, no-c-format
-msgid "Email:"
-msgstr "Ebost:"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:113
+msgid "Unsupported client version"
+msgstr ""
 
-#. i18n: file ./kopete/contactlist/customnotifications.ui line 32
-#: rc.cpp:971
-#, no-c-format
-msgid "On &event:"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:116
+msgid "A duplicate chat was found"
 msgstr ""
 
-#. i18n: file ./kopete/contactlist/customnotifications.ui line 43
-#: rc.cpp:974
-#, no-c-format
-msgid "Choose the event that should have a custom notification"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:119
+#, fuzzy
+msgid "Chat not found"
+msgstr "Ni chafwyd gweinydd."
+
+#: protocols/groupwise/libgroupwise/gwerror.cpp:122
+msgid "Invalid chat name"
 msgstr ""
 
-#. i18n: file ./kopete/contactlist/customnotifications.ui line 64
-#: rc.cpp:977
-#, no-c-format
-msgid "Select the sound to play"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:125
+msgid "The chat is active"
 msgstr ""
 
-#. i18n: file ./kopete/contactlist/customnotifications.ui line 72
-#: rc.cpp:980
-#, no-c-format
-msgid "&Play a sound:"
-msgstr "&Chwarae sŵn :"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:128
+msgid "Chat is busy; try again"
+msgstr ""
 
-#. i18n: file ./kopete/contactlist/customnotifications.ui line 75
-#: rc.cpp:983
-#, no-c-format
-msgid "Play a sound when this event occurs for this contact"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:131
+msgid "Tried request too soon after another; try again"
 msgstr ""
 
-#. i18n: file ./kopete/contactlist/customnotifications.ui line 100
-#: rc.cpp:986
-#, no-c-format
-msgid "Start a cha&t"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:134
+msgid "Server's chat subsystem is not active"
 msgstr ""
 
-#. i18n: file ./kopete/contactlist/customnotifications.ui line 103
-#: rc.cpp:989
-#, no-c-format
+#: protocols/groupwise/libgroupwise/gwerror.cpp:137
+msgid "The chat update request is invalid"
+msgstr ""
+
+#: protocols/groupwise/libgroupwise/gwerror.cpp:140
+msgid "Write failed due to directory mismatch"
+msgstr ""
+
+#: protocols/groupwise/libgroupwise/gwerror.cpp:143
+msgid "Recipient's client version is too old"
+msgstr ""
+
+#: protocols/groupwise/libgroupwise/gwerror.cpp:146
+msgid "Chat has been removed from server"
+msgstr ""
+
+#: protocols/groupwise/libgroupwise/gwerror.cpp:149
+#, c-format
+msgid "Unrecognized error code: %s"
+msgstr ""
+
+#: protocols/groupwise/gwprotocol.cpp:59
+msgid "Appear Offline"
+msgstr ""
+
+#: protocols/groupwise/gwprotocol.cpp:59
+msgid "A&ppear Offline"
+msgstr ""
+
+#: protocols/groupwise/gwprotocol.cpp:64
+msgid "Invalid Status"
+msgstr ""
+
+#: protocols/groupwise/gwprotocol.cpp:71
+msgid "Auto Reply Message"
+msgstr ""
+
+#: protocols/groupwise/gwprotocol.cpp:72
+msgid "Common Name"
+msgstr "Enw Cyffredin"
+
+#: protocols/groupwise/ui/gwcontactproperties.cpp:81
+msgid "Contact Properties"
+msgstr ""
+
+#: protocols/groupwise/ui/gwcontactproperties.cpp:104
+msgid "Telephone Number"
+msgstr "Rhif Teleffôn"
+
+#: protocols/groupwise/ui/gwcontactproperties.cpp:106
+msgid "Department"
+msgstr "Adran"
+
+#: protocols/groupwise/ui/gwcontactproperties.cpp:108
+msgid "Location"
+msgstr "Lleoliad"
+
+#: protocols/groupwise/ui/gwcontactproperties.cpp:110
+msgid "Mailstop"
+msgstr ""
+
+#: protocols/groupwise/ui/gwcontactproperties.cpp:112
+msgid "Personal Title"
+msgstr ""
+
+#: libkopete/kopeteglobal.cpp:178
+#: protocols/groupwise/ui/gwcontactproperties.cpp:116
+msgid "Email Address"
+msgstr "Cyfeiriad Ebost"
+
+#: protocols/groupwise/ui/gwprivacydialog.cpp:52
+#, c-format
 msgid ""
-"Open a chat window with this contact when this event occurs for this contact"
+"_: Account specific privacy settings\n"
+"Manage Privacy for %1"
 msgstr ""
 
-#. i18n: file ./kopete/contactlist/customnotifications.ui line 111
-#: rc.cpp:992
-#, no-c-format
-msgid "&Display a message:"
+#: protocols/groupwise/ui/gwprivacydialog.cpp:62
+msgid "Privacy settings have been administratively locked"
 msgstr ""
 
-#. i18n: file ./kopete/contactlist/customnotifications.ui line 114
-#: rc.cpp:995
-#, no-c-format
+#: protocols/groupwise/ui/gwprivacydialog.cpp:100
+msgid "<Everyone Else>"
+msgstr ""
+
+#: protocols/groupwise/ui/gwprivacydialog.cpp:180
+#, fuzzy
+msgid "Search for Contact to Block"
+msgstr "&Dileu y Cyswllt"
+
+#: protocols/groupwise/ui/gwprivacydialog.cpp:346
 msgid ""
-"Display a message on your screen when this event occurs for this contact"
+"You can only change privacy settings while you are logged in to the GroupWise "
+"Messenger server."
 msgstr ""
 
-#. i18n: file ./kopete/contactlist/customnotifications.ui line 125
-#: rc.cpp:998
-#, no-c-format
-msgid "Enter the message to display"
+#: protocols/groupwise/ui/gwprivacydialog.cpp:346
+msgid "'%1' Not Logged In"
 msgstr ""
 
-#. i18n: file ./kopete/contactlist/customnotifications.ui line 136
-#: rc.cpp:1001
-#, no-c-format
-msgid "D&isplay once"
+#: protocols/groupwise/ui/gwchatsearchdialog.cpp:38
+#, fuzzy
+msgid "Search Chatrooms"
+msgstr "Chwilio am:"
+
+#: protocols/groupwise/ui/gwchatsearchdialog.cpp:67
+msgid "Updating chatroom list..."
 msgstr ""
 
-#. i18n: file ./kopete/contactlist/customnotifications.ui line 139
-#: rc.cpp:1004
-#, no-c-format
-msgid "Only display a message the next time the event occurs"
+#: protocols/groupwise/ui/gwsearch.cpp:167
+#, c-format
+msgid ""
+"_n: 1 matching user found\n"
+"%n matching users found"
 msgstr ""
 
-#. i18n: file ./kopete/contactlist/customnotifications.ui line 150
-#: rc.cpp:1007
-#, no-c-format
-msgid "P&lay once"
+#: protocols/groupwise/ui/gwreceiveinvitationdialog.cpp:37
+msgid "Invitation to Conversation"
 msgstr ""
 
-#. i18n: file ./kopete/contactlist/customnotifications.ui line 153
-#: rc.cpp:1010
-#, no-c-format
-msgid "Only play a sound the next time the event occurs"
+#: protocols/groupwise/ui/gwchatpropsdialog.cpp:33
+#: protocols/groupwise/ui/gwchatpropsdialog.cpp:41
+#, fuzzy
+msgid "Chatroom properties"
+msgstr "&Priodweddau"
+
+#: protocols/groupwise/ui/gweditaccountwidget.cpp:104
+msgid ""
+"The changes you just made will take effect next time you log in with GroupWise."
 msgstr ""
 
-#. i18n: file ./kopete/contactlist/customnotifications.ui line 164
-#: rc.cpp:1013
-#, no-c-format
-msgid "T&rigger once"
+#: protocols/groupwise/ui/gweditaccountwidget.cpp:105
+msgid "GroupWise Settings Changed While Signed In"
 msgstr ""
 
-#. i18n: file ./kopete/contactlist/customnotifications.ui line 167
-#: rc.cpp:1016
-#, no-c-format
-msgid "Only start a chat the next time the event occurs"
+#: protocols/groupwise/ui/gwaddcontactpage.cpp:64
+msgid "Connect to GroupWise Messenger and try again."
 msgstr ""
 
-#. i18n: file ./kopete/contactlist/customnotifications.ui line 177
-#: rc.cpp:1019
-#, no-c-format
-msgid "S&uppress standard notifications"
+#: protocols/groupwise/gwcontact.cpp:166
+msgid "Unblock User"
 msgstr ""
 
-#. i18n: file ./kopete/contactlist/customnotifications.ui line 183
-#: rc.cpp:1022
-#, no-c-format
+#: protocols/groupwise/gwcontact.cpp:166
+msgid "Block User"
+msgstr ""
+
+#: protocols/groupwise/gwcontact.cpp:240
+msgid "%1|Blocked"
+msgstr ""
+
+#: protocols/gadu/gadudcctransaction.cpp:408
 msgid ""
-"Check to prevent notifications common to all contacts from happening for this "
-"contact"
+"Connection to peer was refused; it possibly does not listen for incoming "
+"connections."
 msgstr ""
 
-#. i18n: file ./kopete/contactlist/kopetegvipropswidget.ui line 50
-#: rc.cpp:1028 rc.cpp:5168
-#, no-c-format
-msgid "&Name:"
-msgstr "&Enw:"
+#: protocols/gadu/gadudcctransaction.cpp:412
+msgid "File transfer transaction was not agreed by peer."
+msgstr ""
 
-#. i18n: file ./kopete/contactlist/kopetegvipropswidget.ui line 68
-#: rc.cpp:1031 rc.cpp:1100
-#, no-c-format
-msgid "Icons"
-msgstr "Eiconau"
+#: protocols/gadu/gadudcctransaction.cpp:416
+msgid "File-transfer handshake failure."
+msgstr ""
 
-#. i18n: file ./kopete/contactlist/kopetegvipropswidget.ui line 87
-#: rc.cpp:1034
-#, no-c-format
-msgid "O&pen:"
+#: protocols/gadu/gadudcctransaction.cpp:419
+msgid "File transfer had problems with the file."
 msgstr ""
 
-#. i18n: file ./kopete/contactlist/kopetegvipropswidget.ui line 98
-#: rc.cpp:1037
+#: protocols/gadu/gadudcctransaction.cpp:422
+msgid "There was network error during file transfer."
+msgstr ""
+
+#: protocols/gadu/gadudcctransaction.cpp:425
+msgid "Unknown File-Transfer error."
+msgstr ""
+
+#: protocols/gadu/gaducontact.cpp:198
+msgid "Show Profile"
+msgstr ""
+
+#: protocols/gadu/gaducontact.cpp:229
+msgid "Gadu contact"
+msgstr ""
+
+#: protocols/gadu/gaducontact.cpp:247
+msgid "<qt>Please go online to remove a contact from your contact list.</qt>"
+msgstr ""
+
+#: protocols/gadu/gaducontact.cpp:248
+msgid "Gadu-Gadu Plugin"
+msgstr ""
+
+#. i18n: file ./protocols/gadu/ui/gaduawayui.ui line 19
+#: protocols/gadu/gaduaway.cpp:40 rc.cpp:4254
 #, no-c-format
-msgid "C&losed:"
+msgid "Away Dialog"
 msgstr ""
 
-#. i18n: file ./kopete/contactlist/kopetegvipropswidget.ui line 117
-#: rc.cpp:1040
+#: protocols/gadu/gadueditcontact.cpp:50 protocols/gadu/gadueditcontact.cpp:68
+msgid "Edit Contact's Properties"
+msgstr ""
+
+#: protocols/gadu/gaduregisteraccount.cpp:39
+msgid "Register New Account"
+msgstr ""
+
+#. i18n: file ./protocols/jabber/ui/dlgservices.ui line 151
+#: protocols/gadu/gaduregisteraccount.cpp:45 rc.cpp:2704 rc.cpp:3175
 #, no-c-format
-msgid "Use custom &icons"
-msgstr "Defnyddio &eiconau addasiedig"
+msgid "&Register"
+msgstr ""
 
-#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 50
-#: rc.cpp:1046
-#, fuzzy, no-c-format
-msgid "Address Book Link"
-msgstr "&Cyfeiriad ebost:"
+#: protocols/gadu/gaduregisteraccount.cpp:67
+msgid "Retrieving token"
+msgstr ""
 
-#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 77
-#: rc.cpp:1049
-#, fuzzy, no-c-format
-msgid "E&xport Details..."
-msgstr "Manyl&ion..."
+#: protocols/gadu/gaduregisteraccount.cpp:89
+msgid "Please enter a valid E-Mail Address."
+msgstr ""
 
-#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 80
-#: rc.cpp:1052
-#, fuzzy, no-c-format
-msgid "Export contact's details to the TDE Address Book"
-msgstr "Cysylltau"
+#: protocols/gadu/gaduregisteraccount.cpp:113
+msgid "Please enter the verification sequence."
+msgstr ""
 
-#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 108
-#: rc.cpp:1055
-#, fuzzy, no-c-format
-msgid "&Import Contacts"
-msgstr "Cysylltau"
+#: protocols/gadu/gaduregisteraccount.cpp:159
+#, c-format
+msgid "Account created; your new UIN is %1."
+msgstr ""
 
-#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 111
-#: rc.cpp:1058
-#, fuzzy, no-c-format
-msgid "Import contacts from the TDE Address Book"
-msgstr "Cysylltau"
+#: protocols/gadu/gaduregisteraccount.cpp:167
+#, c-format
+msgid "Registration failed: %1"
+msgstr ""
 
-#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 123
-#: rc.cpp:1061
-#, fuzzy, no-c-format
-msgid "Display Name Source"
-msgstr "Enw Dangos"
+#: protocols/gadu/gaduprotocol.cpp:57
+msgid "Blocked"
+msgstr ""
 
-#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 134
-#: rc.cpp:1064
-#, no-c-format
-msgid "Use addressbook &name (needs addressbook link)"
+#: protocols/gadu/gaduprotocol.cpp:61
+msgid "A&way"
+msgstr "I& ffwrdd"
+
+#: protocols/gadu/gaduprotocol.cpp:63 protocols/gadu/gaduprotocol.cpp:65
+msgid "B&usy"
+msgstr "P&rysur"
+
+#: protocols/gadu/gaduprotocol.cpp:67 protocols/gadu/gaduprotocol.cpp:69
+#, fuzzy
+msgid "I&nvisible"
+msgstr "Segur"
+
+#: protocols/gadu/gaduaccount.cpp:186
+msgid "&Search for Friends"
 msgstr ""
 
-#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 150
-#: rc.cpp:1067 rc.cpp:1085
-#, fuzzy, no-c-format
-msgid "From contact:"
-msgstr "Cyswllt"
+#: protocols/gadu/gaduaccount.cpp:188
+msgid "Export Contacts to Server"
+msgstr ""
 
-#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 235
-#: rc.cpp:1076
-#, no-c-format
-msgid "Photo Source"
+#: protocols/gadu/gaduaccount.cpp:190
+msgid "Export Contacts to File..."
 msgstr ""
 
-#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 275
-#: rc.cpp:1082
-#, no-c-format
-msgid "U&se addressbook photo (needs addressbook link)"
+#: protocols/gadu/gaduaccount.cpp:192
+msgid "Import Contacts From File..."
 msgstr ""
 
-#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 342
-#: rc.cpp:1091
-#, no-c-format
-msgid "Custom:"
-msgstr "Addasiedig:"
+#: protocols/gadu/gaduaccount.cpp:194
+msgid "Only for Friends"
+msgstr ""
 
-#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 398
-#: rc.cpp:1094
-#, no-c-format
-msgid "S&ync photo to addressbook"
+#: protocols/gadu/gaduaccount.cpp:255
+msgid "%1 <%2> "
 msgstr ""
 
-#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 408
-#: rc.cpp:1097 rc.cpp:5396
-#, no-c-format
-msgid "Ad&vanced"
-msgstr "&Uwch"
+#: protocols/gadu/gaduaccount.cpp:289
+msgid "Go O&nline"
+msgstr ""
 
-#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 430
-#: rc.cpp:1103
-#, no-c-format
-msgid "Awa&y:"
-msgstr "I f&fwrdd :"
+#: protocols/gadu/gaduaccount.cpp:293
+msgid "Set &Busy"
+msgstr ""
 
-#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 441
-#: rc.cpp:1106
-#, no-c-format
-msgid "&Online:"
-msgstr "&Ar-lein :"
+#: protocols/gadu/gaduaccount.cpp:297
+msgid "Set &Invisible"
+msgstr ""
 
-#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 452
-#: rc.cpp:1109
-#, fuzzy, no-c-format
-msgid "Use custom status &icons"
-msgstr "Defnyddio &eiconau addasiedig"
+#: protocols/gadu/gaduaccount.cpp:301
+#, fuzzy
+msgid "Go &Offline"
+msgstr "All-lein"
 
-#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 455
-#: rc.cpp:1112
-#, no-c-format
-msgid "Check to set custom icons for this contact"
+#: protocols/gadu/gaduaccount.cpp:305
+msgid "Set &Description..."
 msgstr ""
 
-#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 495
-#: rc.cpp:1115
-#, no-c-format
-msgid "O&ffline:"
-msgstr "A&ll-lein :"
+#: protocols/gadu/gaduaccount.cpp:685
+msgid "connection using SSL was not possible, retrying without."
+msgstr ""
 
-#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 506
-#: rc.cpp:1118
-#, no-c-format
-msgid "Un&known:"
+#: protocols/gadu/gaduaccount.cpp:713
+msgid "unable to connect to the Gadu-Gadu server(\"%1\")."
 msgstr ""
 
-#. i18n: file ./kopete/chatwindow/kopeterichtexteditpartfull.rc line 4
-#: rc.cpp:1121
-#, no-c-format
-msgid "F&ormat"
-msgstr "&Fformat"
+#: protocols/gadu/gaduaccount.cpp:714 protocols/gadu/gaducommands.cpp:328
+#: protocols/gadu/gaducommands.cpp:336 protocols/gadu/gaducommands.cpp:384
+msgid "Connection Error"
+msgstr ""
 
-#. i18n: file ./kopete/chatwindow/kopeterichtexteditpartfull.rc line 11
-#: rc.cpp:1124
-#, no-c-format
-msgid "&Alignment"
-msgstr "&Aliniad"
+#: protocols/gadu/gaduaccount.cpp:897
+msgid "Contacts exported to the server."
+msgstr ""
 
-#. i18n: file ./kopete/chatwindow/kopeterichtexteditpartfull.rc line 32
-#: rc.cpp:1130 rc.cpp:1169
-#, no-c-format
-msgid "Format Toolbar"
+#: protocols/gadu/gaduaccount.cpp:928
+msgid "Save Contacts List for Account %1 As"
 msgstr ""
 
-#. i18n: file ./kopete/chatwindow/kopeteemailwindow.rc line 5
-#: rc.cpp:1133 rc.cpp:1148 rc.cpp:2602 rc.cpp:4130 rc.cpp:4812 rc.cpp:5399
-#, no-c-format
-msgid "&Chat"
-msgstr "&Sgwrsio"
+#: protocols/gadu/gaduaccount.cpp:936
+msgid "Unable to create temporary file."
+msgstr ""
 
-#. i18n: file ./kopete/chatwindow/kopeteemailwindow.rc line 14
-#: rc.cpp:1136 rc.cpp:1151
-#, no-c-format
-msgid "&Format"
-msgstr "&Fformat"
+#: protocols/gadu/gaduaccount.cpp:936 protocols/gadu/gaduaccount.cpp:950
+msgid "Save Contacts List Failed"
+msgstr ""
 
-#. i18n: file ./kopete/chatwindow/kopeteemailwindow.rc line 41
-#: rc.cpp:1145 rc.cpp:1166 rc.cpp:3001 rc.cpp:3253 rc.cpp:5063
-#, no-c-format
-msgid "Status"
-msgstr "Cyflwr"
+#: protocols/gadu/gaduaccount.cpp:974
+msgid "Load Contacts List for Account %1 As"
+msgstr ""
 
-#. i18n: file ./kopete/chatwindow/kopetechatwindow.rc line 23
-#: rc.cpp:1154
-#, no-c-format
-msgid "&Tabs"
+#: protocols/gadu/gaduaccount.cpp:994 protocols/gadu/gaduaccount.cpp:1000
+msgid "Contacts List Load Has Failed"
 msgstr ""
 
-#. i18n: file ./kopete/chatwindow/kopetechatwindow.rc line 35
-#: rc.cpp:1160
-#, no-c-format
-msgid "&Chat Members List"
+#: protocols/gadu/gadupubdir.cpp:74 protocols/gadu/gadupubdir.cpp:315
+msgid "Search &More..."
 msgstr ""
 
-#. i18n: file ./kopete/addcontactwizard/fastaddcontactwizard_base.ui line 16
-#: rc.cpp:1172
-#, no-c-format
-msgid "Fast Contact Addition Wizard"
+#: protocols/gadu/gadupubdir.cpp:95
+msgid "Gadu-Gadu Public Directory"
 msgstr ""
 
-#. i18n: file ./kopete/addcontactwizard/fastaddcontactwizard_base.ui line 23
-#: rc.cpp:1175 rc.cpp:1251
-#, no-c-format
-msgid "Select Instant Messaging Accounts"
+#: protocols/gadu/gadupubdir.cpp:102
+msgid "&New Search"
 msgstr ""
 
-#. i18n: file ./kopete/addcontactwizard/fastaddcontactwizard_base.ui line 80
-#: rc.cpp:1178
-#, no-c-format
-msgid "<p><h2>Select IM Accounts</h2></p>"
+#: protocols/gadu/gadupubdir.cpp:103 protocols/gadu/gadupubdir.cpp:280
+#: protocols/irc/ui/channellist.cpp:207
+msgid "S&earch"
+msgstr "C&hwilio"
+
+#: protocols/gadu/gadupubdir.cpp:104
+msgid "&Add User..."
 msgstr ""
 
-#. i18n: file ./kopete/addcontactwizard/fastaddcontactwizard_base.ui line 113
-#: rc.cpp:1187 rc.cpp:1269
-#, no-c-format
-msgid ""
-"Select the Instant Messaging systems to message the contact.  If they use more "
-"than one IM system, select them all here"
+#: libkopete/tdeabcpersistence.cpp:357 protocols/gadu/gadusession.cpp:217
+#: protocols/gadu/gadusession.cpp:230 protocols/gadu/gadusession.cpp:242
+#: protocols/gadu/gadusession.cpp:275 protocols/gadu/gadusession.cpp:289
+#: protocols/gadu/gadusession.cpp:307 protocols/irc/ui/channellist.cpp:304
+msgid "Not Connected"
+msgstr "Heb gysylltu"
+
+#: protocols/gadu/gadusession.cpp:217 protocols/gadu/gadusession.cpp:230
+#: protocols/gadu/gadusession.cpp:242 protocols/gadu/gadusession.cpp:275
+msgid "You are not connected to the server."
 msgstr ""
 
-#. i18n: file ./kopete/addcontactwizard/fastaddcontactwizard_base.ui line 125
-#: rc.cpp:1190
-#, no-c-format
-msgid "Done"
-msgstr "Wedi gorffen"
+#: protocols/gadu/gadusession.cpp:289 protocols/gadu/gadusession.cpp:307
+msgid "You have to be connected to the server to change your status."
+msgstr ""
 
-#. i18n: file ./kopete/addcontactwizard/fastaddcontactwizard_base.ui line 183
-#: rc.cpp:1193
-#, no-c-format
+#: protocols/gadu/gadusession.cpp:574
+msgid "idle"
+msgstr "segur"
+
+#: protocols/gadu/gadusession.cpp:576
+msgid "resolving host"
+msgstr ""
+
+#: protocols/gadu/gadusession.cpp:578
+msgid "connecting"
+msgstr "cysylltu"
+
+#: protocols/gadu/gadusession.cpp:580
+msgid "reading data"
+msgstr ""
+
+#: protocols/gadu/gadusession.cpp:582
+msgid "error"
+msgstr "gwall"
+
+#: protocols/gadu/gadusession.cpp:584
+msgid "connecting to hub"
+msgstr ""
+
+#: protocols/gadu/gadusession.cpp:586
+msgid "connecting to server"
+msgstr ""
+
+#: protocols/gadu/gadusession.cpp:588
+msgid "retrieving key"
+msgstr ""
+
+#: protocols/gadu/gadusession.cpp:590
+msgid "waiting for reply"
+msgstr ""
+
+#: protocols/gadu/gadusession.cpp:592
+msgid "connected"
+msgstr "wedi cysylltu"
+
+#: protocols/gadu/gadusession.cpp:594
+msgid "sending query"
+msgstr ""
+
+#: protocols/gadu/gadusession.cpp:596
+msgid "reading header"
+msgstr ""
+
+#: protocols/gadu/gadusession.cpp:598
+msgid "parse data"
+msgstr ""
+
+#: protocols/gadu/gadusession.cpp:600
+msgid "done"
+msgstr "wedi gorffen"
+
+#: protocols/gadu/gadusession.cpp:602
+msgid "Tls connection negotiation"
+msgstr ""
+
+#: protocols/gadu/gadusession.cpp:604
+msgid "unknown"
+msgstr "anhysbys"
+
+#: protocols/gadu/gadusession.cpp:612
+msgid "Resolving error."
+msgstr ""
+
+#: protocols/gadu/gadusession.cpp:614
+msgid "Connecting error."
+msgstr ""
+
+#: protocols/gadu/gadusession.cpp:616
+msgid "Reading error."
+msgstr ""
+
+#: protocols/gadu/gadusession.cpp:618
+msgid "Writing error."
+msgstr ""
+
+#: protocols/gadu/gadusession.cpp:620 protocols/gadu/gadusession.cpp:645
+#, c-format
+msgid "Unknown error number %1."
+msgstr ""
+
+#: protocols/gadu/gadusession.cpp:629
+msgid "Unable to resolve server address. DNS failure."
+msgstr ""
+
+#: protocols/gadu/gadusession.cpp:631
+msgid "Unable to connect to server."
+msgstr ""
+
+#: protocols/gadu/gadusession.cpp:633
+msgid "Server send incorrect data. Protocol error."
+msgstr ""
+
+#: protocols/gadu/gadusession.cpp:635
+msgid "Problem reading data from server."
+msgstr ""
+
+#: protocols/gadu/gadusession.cpp:637
+msgid "Problem sending data to server."
+msgstr ""
+
+#: protocols/gadu/gadusession.cpp:639
+msgid "Incorrect password."
+msgstr "Cyfrinair anghywir."
+
+#: protocols/gadu/gadusession.cpp:643
 msgid ""
-"<p>"
-"<h2>Contact added.</h2></p>\n"
-"<p>That was <i>fast.</i></p>"
+"Unable to connect over encrypted channel.\n"
+"Try to turn off encryption support in Gadu account settings and reconnect."
 msgstr ""
 
-#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 16
-#: rc.cpp:1197
-#, no-c-format
-msgid "Contact Addition Wizard"
+#: protocols/gadu/gaducommands.cpp:146 protocols/gadu/gaducommands.cpp:183
+#: protocols/gadu/gaducommands.cpp:199 protocols/gadu/gaducommands.cpp:234
+#: protocols/gadu/gaducommands.cpp:250 protocols/gadu/gadueditaccount.cpp:194
+#: protocols/gadu/gadueditaccount.cpp:215
+#: protocols/gadu/gadueditaccount.cpp:220
+#: protocols/gadu/gadueditaccount.cpp:225
+#: protocols/gadu/gadueditaccount.cpp:256
+msgid "Gadu-Gadu"
+msgstr "Gadu-Gadu"
+
+#: protocols/gadu/gaducommands.cpp:146 protocols/gadu/gaducommands.cpp:234
+msgid "Unable to retrieve token."
 msgstr ""
 
-#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 23
-#: rc.cpp:1200
-#, no-c-format
-msgid "Introduction"
-msgstr "Cyflwyniad"
+#: protocols/gadu/gaducommands.cpp:183
+msgid "Registration FAILED"
+msgstr ""
 
-#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 44
-#: rc.cpp:1203
-#, no-c-format
+#: protocols/gadu/gaducommands.cpp:199
+msgid "Unknown connection error while retrieving token."
+msgstr ""
+
+#: protocols/gadu/gaducommands.cpp:207
+#, c-format
+msgid "Token retrieving status: %1"
+msgstr ""
+
+#: protocols/gadu/gaducommands.cpp:216
+msgid "Gadu-Gadu token retrieve problem"
+msgstr ""
+
+#: protocols/gadu/gaducommands.cpp:250
+msgid "Unknown connection error while registering."
+msgstr ""
+
+#: protocols/gadu/gaducommands.cpp:257
+#, c-format
+msgid "Registration status: %1"
+msgstr ""
+
+#: protocols/gadu/gaducommands.cpp:266
+msgid "Gadu-Gadu Registration Error"
+msgstr ""
+
+#: protocols/gadu/gaducommands.cpp:278
+msgid "Registration Finished"
+msgstr ""
+
+#: protocols/gadu/gaducommands.cpp:278
+msgid "Registration has completed successfully."
+msgstr ""
+
+#: protocols/gadu/gaducommands.cpp:281
+msgid "Registration Error"
+msgstr ""
+
+#: protocols/gadu/gaducommands.cpp:281
+msgid "Incorrect data sent to server."
+msgstr ""
+
+#: protocols/gadu/gaducommands.cpp:328 protocols/gadu/gaducommands.cpp:336
+msgid "Password reminding finished prematurely due to a connection error."
+msgstr ""
+
+#: protocols/gadu/gaducommands.cpp:344
+msgid "Successfully"
+msgstr ""
+
+#: protocols/gadu/gaducommands.cpp:344
+msgid "Unsuccessful. Please retry."
+msgstr ""
+
+#: protocols/gadu/gaducommands.cpp:345
+msgid "Remind Password"
+msgstr ""
+
+#: protocols/gadu/gaducommands.cpp:345
+msgid "Remind password finished: "
+msgstr ""
+
+#: protocols/gadu/gaducommands.cpp:384
+msgid "Password changing finished prematurely due to a connection error."
+msgstr ""
+
+#: protocols/gadu/gaducommands.cpp:392
+msgid "State Error"
+msgstr ""
+
+#: protocols/gadu/gaducommands.cpp:393
 msgid ""
-"<h2>Welcome to the Add Contact Wizard</h2>\n"
-"\n"
-"<p>This wizard will guide you through the process of adding a new contact to "
-"Kopete.</p>"
+"Password changing finished prematurely due to a session related problem (try "
+"again later)."
 msgstr ""
 
-#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 56
-#: rc.cpp:1208
-#, no-c-format
+#: protocols/gadu/gaducommands.cpp:400
+msgid "Changed Password"
+msgstr ""
+
+#: protocols/gadu/gaducommands.cpp:400
+msgid "Your password has been changed."
+msgstr "Newidwyd eich cyfrinair."
+
+#: protocols/gadu/gadueditaccount.cpp:88
 msgid ""
-"<p>Kopete shares contact information with the TDE Addressbook.  This gives you "
-"seamless integration between instant messaging, e-mail and other personal "
-"information management applications.</p>\n"
-"<p>If you prefer not to store instant messaging information in the TDE "
-"Addressbook, uncheck the box below.</p>"
+"_: personal information being fetched from server\n"
+"<p align=\"center\">Fetching from server</p>"
 msgstr ""
 
-#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 64
-#: rc.cpp:1212
-#, no-c-format
-msgid "<p>Press the \"Next\" button to begin.</p>"
+#: protocols/gadu/gadueditaccount.cpp:194
+msgid "<b>Registration FAILED.</b>"
 msgstr ""
 
-#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 123
-#: rc.cpp:1215
-#, no-c-format
-msgid "&Use the TDE address book for this contact"
+#: protocols/gadu/gadueditaccount.cpp:215
+msgid "<b>Enter UIN please.</b>"
 msgstr ""
 
-#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 129
-#: rc.cpp:1218
-#, no-c-format
+#: protocols/gadu/gadueditaccount.cpp:220
+msgid "<b>UIN should be a positive number.</b>"
+msgstr ""
+
+#: protocols/gadu/gadueditaccount.cpp:225
+msgid "<b>Enter password please.</b>"
+msgstr ""
+
+#: protocols/gadu/gadueditaccount.cpp:256
+msgid "<b>Starting DCC listening socket failed; dcc is not working now.</b>"
+msgstr ""
+
+#: protocols/irc/ircservercontact.cpp:95 protocols/irc/ircusercontact.cpp:219
+msgid "%1 @ %2"
+msgstr ""
+
+#: protocols/irc/ircservercontact.cpp:106
+msgid "KIRC Error - Parse error: "
+msgstr ""
+
+#: protocols/irc/ircservercontact.cpp:109
+msgid "KIRC Error - Unknown command: "
+msgstr ""
+
+#: protocols/irc/ircservercontact.cpp:112
+msgid "KIRC Error - Unknown numeric reply: "
+msgstr ""
+
+#: protocols/irc/ircservercontact.cpp:115
+msgid "KIRC Error - Invalid number of arguments: "
+msgstr ""
+
+#: protocols/irc/ircservercontact.cpp:118
+msgid "KIRC Error - Method failed: "
+msgstr ""
+
+#: protocols/irc/ircservercontact.cpp:121
+msgid "KIRC Error - Unknown error: "
+msgstr ""
+
+#: protocols/irc/ircservercontact.cpp:131
 msgid ""
-"Check this box if you do not want to integrate other TDE applications with "
-"Kopete"
+"You can not talk to the server, you can only issue commands here. Type /help "
+"for supported commands."
 msgstr ""
 
-#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 156
-#: rc.cpp:1221
-#, no-c-format
-msgid "Select Address Book Entry"
+#: protocols/irc/ircservercontact.cpp:150
+#: protocols/irc/ircservercontact.cpp:164
+msgid "NOTICE from %1: %2"
 msgstr ""
 
-#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 169
-#: rc.cpp:1224
-#, fuzzy, no-c-format
-msgid "Select Display Name & Group"
-msgstr "Enw Dangos"
+#: protocols/irc/ircservercontact.cpp:158
+msgid "NOTICE from %1 (%2): %3"
+msgstr ""
 
-#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 180
-#: rc.cpp:1227
-#, no-c-format
-msgid "<qt><p><h2>Select Display Name and Group</h2></p></qt>"
+#: protocols/irc/ircusercontact.cpp:188
+msgid "%1 is away (%2)"
 msgstr ""
 
-#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 194
-#: rc.cpp:1230
-#, no-c-format
+#: protocols/irc/ircusercontact.cpp:417
+msgid "True"
+msgstr "Gwir"
+
+#: protocols/irc/ircusercontact.cpp:435
+msgid "%1 is (%2@%3): %4<br/>"
+msgstr ""
+
+#: protocols/irc/ircusercontact.cpp:442
+msgid "%1 is authenticated with NICKSERV<br/>"
+msgstr ""
+
+#: protocols/irc/ircusercontact.cpp:445
+msgid "%1 is an IRC operator<br/>"
+msgstr ""
+
+#: protocols/irc/ircusercontact.cpp:448
+msgid "on channels %1<br/>"
+msgstr ""
+
+#: protocols/irc/ircusercontact.cpp:451
+msgid "on IRC via server %1 ( %2 )<br/>"
+msgstr ""
+
+#: protocols/irc/ircusercontact.cpp:455
+msgid "idle: %2<br/>"
+msgstr ""
+
+#: protocols/irc/ircusercontact.cpp:468
 msgid ""
-"Enter the contact's displa&y name.  This is how the contact will appear in "
-"Kopete:"
+"%1 was (%2@%3): %4\n"
 msgstr ""
 
-#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 205
-#: rc.cpp:1233
-#, no-c-format
-msgid "Leave this blank to use any display name set by the contact"
+#: protocols/irc/ircusercontact.cpp:474
+msgid ""
+"Last Online: %1\n"
 msgstr ""
 
-#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 244
-#: rc.cpp:1236
-#, no-c-format
-msgid "Select the contact list &group(s) that this contact should belong to :"
+#: protocols/irc/ircusercontact.cpp:538
+msgid "C&TCP"
 msgstr ""
 
-#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 256
-#: rc.cpp:1239
-#, no-c-format
-msgid "Groups"
-msgstr "Grwpiau"
+#: protocols/irc/ircusercontact.cpp:539
+msgid "&Version"
+msgstr "&Fersiwn"
 
-#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 272
-#: rc.cpp:1242
-#, no-c-format
-msgid "A contact may be present in more than one group"
+#: protocols/irc/ircusercontact.cpp:541
+msgid "&Ping"
+msgstr "&Ping"
+
+#: protocols/irc/ircusercontact.cpp:544
+msgid "&Modes"
 msgstr ""
 
-#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 280
-#: rc.cpp:1245
-#, no-c-format
-msgid "Create New G&roup..."
+#: protocols/irc/ircusercontact.cpp:545
+msgid "&Op"
+msgstr "Gwei&thredu (Op)"
+
+#: protocols/irc/ircusercontact.cpp:547
+msgid "&Deop"
+msgstr "Dadweit&hredu (Deop)"
+
+#: protocols/irc/ircusercontact.cpp:549
+msgid "&Voice"
+msgstr "&Lleisio"
+
+#: protocols/irc/ircusercontact.cpp:551
+msgid "Devoice"
+msgstr "Datleisio"
+
+#: protocols/irc/ircusercontact.cpp:555
+msgid "&Kick"
+msgstr "&Lluchio"
+
+#: protocols/irc/ircusercontact.cpp:558
+msgid "&Ban"
+msgstr "G&wahardd"
+
+#: protocols/irc/ircusercontact.cpp:559
+msgid "Host (*!*@host.domain.net)"
 msgstr ""
 
-#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 283
-#: rc.cpp:1248
-#, no-c-format
-msgid "Click here to create a new group"
+#: protocols/irc/ircusercontact.cpp:561
+msgid "Domain (*!*@*.domain.net)"
 msgstr ""
 
-#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 321
-#: rc.cpp:1254
-#, no-c-format
-msgid "<p><h2>Select Instant Messaging Accounts</h2></p>"
+#: protocols/irc/ircusercontact.cpp:563
+msgid "User@Host (*!*user@host.domain.net)"
 msgstr ""
 
-#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 332
-#: rc.cpp:1257
+#: protocols/irc/ircusercontact.cpp:565
+msgid "User@Domain (*!*user@*.domain.net)"
+msgstr ""
+
+#: protocols/irc/ircchannelcontact.cpp:683
+#: protocols/irc/ircusercontact.cpp:569
+msgid "&Encoding"
+msgstr "A&mgodiad"
+
+#: protocols/irc/irccontact.cpp:189
+msgid "Quit: \"%1\" "
+msgstr ""
+
+#: protocols/irc/ircprotocol.cpp:121 protocols/irc/ircprotocol.cpp:127
+msgid "Op"
+msgstr "Gweithredu (Op)"
+
+#: protocols/irc/ircprotocol.cpp:133
+msgid "Voice"
+msgstr "Llais"
+
+#: libkopete/kopetemetacontact.cpp:510 protocols/irc/ircprotocol.cpp:150
+msgid "Status not available"
+msgstr ""
+
+#: protocols/irc/ircprotocol.cpp:152 protocols/irc/ui/channellist.cpp:193
+#: protocols/irc/ui/channellist.cpp:213
+msgid "Topic"
+msgstr ""
+
+#. i18n: file ./protocols/groupwise/ui/gwchatsearchwidget.ui line 44
+#: protocols/irc/ircprotocol.cpp:153 rc.cpp:4119
 #, no-c-format
+msgid "Members"
+msgstr "Aelodau"
+
+#: protocols/irc/ircprotocol.cpp:154
+msgid "Home Page"
+msgstr ""
+
+#: protocols/irc/ircprotocol.cpp:156
+msgid "IRC User"
+msgstr ""
+
+#: protocols/irc/ircprotocol.cpp:157
+msgid "IRC Server"
+msgstr ""
+
+#: protocols/irc/ircprotocol.cpp:158
+msgid "IRC Channels"
+msgstr ""
+
+#: protocols/irc/ircprotocol.cpp:159
+msgid "IRC Hops"
+msgstr ""
+
+#: libkopete/kopeteglobal.cpp:112 protocols/irc/ircprotocol.cpp:160
+msgid "Full Name"
+msgstr "Enw Llawn"
+
+#: protocols/irc/ircprotocol.cpp:161
+#, fuzzy
+msgid "User Is Authenticated"
+msgstr "Dilysiant Gweinydd"
+
+#: protocols/irc/ircprotocol.cpp:173
+msgid "USAGE: /raw <text> - Sends the text in raw form to the server."
+msgstr ""
+
+#: protocols/irc/ircprotocol.cpp:177
+msgid "USAGE: /quote <text> - Sends the text in quoted form to the server."
+msgstr ""
+
+#: protocols/irc/ircprotocol.cpp:181
+msgid "USAGE: /ctcp <nick> <message> - Send the CTCP message to nick<action>."
+msgstr ""
+
+#: protocols/irc/ircprotocol.cpp:185
+msgid "USAGE: /ping <nickname> - Alias for /CTCP <nickname> PING."
+msgstr ""
+
+#: protocols/irc/ircprotocol.cpp:189
 msgid ""
-"Select the &account(s) you would like to use for this contact from the list "
-"below."
+"USAGE: /motd [<server>] - Shows the message of the day for the current or the "
+"given server."
 msgstr ""
 
-#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 343
-#: rc.cpp:1260
-#, no-c-format
+#: protocols/irc/ircprotocol.cpp:193
+msgid "USAGE: /list - List the public channels on the server."
+msgstr ""
+
+#: protocols/irc/ircprotocol.cpp:197
+msgid "USAGE: /join <#channel 1> [<password>] - Joins the specified channel."
+msgstr ""
+
+#: protocols/irc/ircprotocol.cpp:201
 msgid ""
-"<p><i>Note</i>: If a messaging service is missing from the list, please make "
-"sure you have created an account for it in Kopete, and that it ready to add new "
-"contacts.</p>"
+"USAGE: /topic [<topic>] - Sets and/or displays the topic for the active "
+"channel."
 msgstr ""
 
-#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 399
-#: rc.cpp:1272 rc.cpp:1278
-#, no-c-format
+#: protocols/irc/ircprotocol.cpp:206
+msgid "USAGE: /whois <nickname> - Display whois info on this user."
+msgstr ""
+
+#: protocols/irc/ircprotocol.cpp:210
+msgid "USAGE: /whowas <nickname> - Display whowas info on this user."
+msgstr ""
+
+#: protocols/irc/ircprotocol.cpp:214
+msgid "USAGE: /who <nickname|channel> - Display who info on this user/channel."
+msgstr ""
+
+#: protocols/irc/ircprotocol.cpp:218
 msgid ""
-"How do you want to message the contact?  If they use more than one Instant "
-"Messaging system, select them all here"
+"USAGE: /query <nickname> [<message>] - Open a private chat with this user."
 msgstr ""
 
-#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 407
-#: rc.cpp:1275
-#, no-c-format
-msgid "You can always add more ways to message this contact later."
+#: protocols/irc/ircprotocol.cpp:222
+msgid "USAGE: /mode <channel> <modes> - Set modes on the given channel."
 msgstr ""
 
-#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 443
-#: rc.cpp:1284
-#, no-c-format
+#: protocols/irc/ircprotocol.cpp:226
+msgid "USAGE: /nick <nickname> - Change your nickname to the given one."
+msgstr ""
+
+#: protocols/irc/ircprotocol.cpp:230
+msgid "USAGE: /me <action> - Do something."
+msgstr ""
+
+#: protocols/irc/ircprotocol.cpp:234
+msgid "USAGE: /ame <action> - Do something in every open chat."
+msgstr ""
+
+#: protocols/irc/ircprotocol.cpp:238
 msgid ""
-"<p>"
-"<h2>Congratulations</h2></p>\n"
-"\n"
-"<p>You have finished configuring a contact. Please click Finish and your "
-"contact will be added to your contact list.</p>\n"
-"\n"
-"<p><i>Note</i>: If adding this contact requires authorization from one or more "
-"of the messaging services, Kopete may prompt you for further information after "
-"this screen.</p>"
+"USAGE: /kick <nickname> [<reason>] - Kick someone from the channel (requires "
+"operator status)."
 msgstr ""
 
-#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 16
-#: rc.cpp:1294
-#, no-c-format
-msgid "Now Listening"
-msgstr "Rwan yn Gwrando ar"
+#: protocols/irc/ircprotocol.cpp:243
+msgid ""
+"USAGE: /ban <mask> - Add someone to this channel's ban list. (requires operator "
+"status)."
+msgstr ""
 
-#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 33
-#: rc.cpp:1297
-#, no-c-format
-msgid "<b>Share Your Musical Taste</b>"
+#: protocols/irc/ircprotocol.cpp:248
+msgid ""
+"USAGE: /bannick <nickname> - Add someone to this channel's ban list. Uses the "
+"hostmask nickname!*@* (requires operator status)."
 msgstr ""
 
-#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 59
-#: rc.cpp:1300
-#, no-c-format
-msgid "Messa&ge"
-msgstr "Neg&es"
+#: protocols/irc/ircprotocol.cpp:252
+msgid ""
+"USAGE: /op <nickname 1> [<nickname 2> <...>] - Give channel operator status to "
+"someone (requires operator status)."
+msgstr ""
 
-#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 78
-#: rc.cpp:1303
-#, no-c-format
-msgid "Use this message when advertising:"
+#: protocols/irc/ircprotocol.cpp:257
+msgid ""
+"USAGE: /deop <nickname> [<nickname 2> <...>]- Remove channel operator status "
+"from someone (requires operator status)."
 msgstr ""
 
-#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 87
-#: rc.cpp:1306
-#, no-c-format
+#: protocols/irc/ircprotocol.cpp:261
 msgid ""
-"%track, %artist, %album, %player will be substituted if known.\n"
-"Expressions in brackets depend on a substitution being made."
+"USAGE: /voice <nickname> [<nickname 2> <...>]- Give channel voice status to "
+"someone (requires operator status)."
 msgstr ""
 
-#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 106
-#: rc.cpp:1310
-#, fuzzy, no-c-format
-msgid "Start with:"
-msgstr "Talaith:"
+#: protocols/irc/ircprotocol.cpp:266
+msgid ""
+"USAGE: /devoice <nickname> [<nickname 2> <...>]- Remove channel voice status "
+"from someone (requires operator status)."
+msgstr ""
 
-#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 120
-#: rc.cpp:1313
-#, no-c-format
-msgid "Now Listening To: "
+#: protocols/irc/ircprotocol.cpp:270
+msgid ""
+"USAGE: /quit [<reason>] - Disconnect from IRC, optionally leaving a message."
 msgstr ""
 
-#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 128
-#: rc.cpp:1316
-#, no-c-format
-msgid "For each track:"
+#: protocols/irc/ircprotocol.cpp:274
+msgid ""
+"USAGE: /part [<reason>] - Part from a channel, optionally leaving a message."
 msgstr ""
 
-#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 142
-#: rc.cpp:1319
-#, no-c-format
-msgid "%track (by %artist)(on %album)"
+#: protocols/irc/ircprotocol.cpp:278
+msgid ""
+"USAGE: /invite <nickname> [<channel>] - Invite a user to join a channel."
 msgstr ""
 
-#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 150
-#: rc.cpp:1322
-#, no-c-format
-msgid "Conjunction (if >1 track):"
+#: protocols/irc/ircprotocol.cpp:282
+msgid "USAGE: /j <#channel 1> [<password>] - Alias for JOIN."
 msgstr ""
 
-#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 164
-#: rc.cpp:1325
-#, no-c-format
-msgid ", and "
-msgstr ", a"
+#: protocols/irc/ircprotocol.cpp:287
+msgid ""
+"USAGE: /msg <nickname> [<message>] - Alias for QUERY <nickname> <message>."
+msgstr ""
 
-#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 195
-#: rc.cpp:1328
-#, no-c-format
-msgid "A&dvertising Mode"
+#: protocols/irc/ircprotocol.cpp:457 protocols/irc/ircprotocol.cpp:472
+msgid "You must enter some text to send to the server."
 msgstr ""
 
-#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 222
-#: rc.cpp:1331
-#, no-c-format
+#: protocols/irc/ircprotocol.cpp:521 protocols/irc/ircprotocol.cpp:721
+msgid "You must be in a channel to use this command."
+msgstr ""
+
+#: protocols/irc/ircaccount.cpp:784 protocols/irc/ircprotocol.cpp:538
+#: protocols/irc/ircprotocol.cpp:558
 msgid ""
-"Explicit &via \"Tools->Send Media Info\",\n"
-"or by typing \"/media\" in the chat\n"
-"window edit area."
+"\"%1\" is an invalid channel. Channels must start with '#', '!', '+', or '&'."
 msgstr ""
 
-#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 230
-#: rc.cpp:1336
-#, no-c-format
-msgid "&Show in chat window (automatic)"
+#: protocols/irc/ircprotocol.cpp:578 protocols/irc/ircprotocol.cpp:682
+#: protocols/irc/ircprotocol.cpp:699 protocols/irc/ircprotocol.cpp:764
+msgid "You must be a channel operator to perform this operation."
 msgstr ""
 
-#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 239
-#: rc.cpp:1339
-#, no-c-format
+#: protocols/irc/ircprotocol.cpp:602
 msgid ""
-"Show &the music you are listening to \n"
-"in place of your status message."
+"\"%1\" is an invalid nickname. Nicknames must not start with '#','!','+', or "
+"'&'."
 msgstr ""
 
-#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 247
-#: rc.cpp:1343
-#, no-c-format
-msgid "Appe&nd to your status message"
+#: protocols/irc/ircprotocol.cpp:919
+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>"
 msgstr ""
 
-#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 276
-#: rc.cpp:1346
-#, no-c-format
-msgid "Media Pla&yer"
-msgstr "Chwar&aewr Cyfryngau"
+#: protocols/irc/ircprotocol.cpp:921
+msgid "Deleting Network"
+msgstr ""
 
-#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 295
-#: rc.cpp:1349
-#, no-c-format
-msgid "Use &specified media player"
+#: protocols/irc/ircprotocol.cpp:922
+msgid "&Delete Network"
 msgstr ""
 
-#. i18n: file ./plugins/translator/translatorprefsbase.ui line 38
-#: rc.cpp:1358
-#, no-c-format
-msgid "Translation service:"
+#: protocols/irc/ircprotocol.cpp:946
+msgid "<qt>Are you sure you want to delete the host <b>%1</b>?</qt>"
 msgstr ""
 
-#. i18n: file ./plugins/translator/translatorprefsbase.ui line 46
-#: rc.cpp:1361
-#, no-c-format
-msgid "Default native language:"
+#: protocols/irc/ircprotocol.cpp:947
+msgid "Deleting Host"
 msgstr ""
 
-#. i18n: file ./plugins/translator/translatorprefsbase.ui line 67
-#: rc.cpp:1364
-#, no-c-format
-msgid "Incoming Messages"
-msgstr "Negeseuon newydd Gyraedd"
+#: protocols/irc/ircprotocol.cpp:948
+msgid "&Delete Host"
+msgstr ""
 
-#. i18n: file ./plugins/translator/translatorprefsbase.ui line 78
-#: rc.cpp:1367 rc.cpp:1379
-#, no-c-format
-msgid "Do not translate"
+#: protocols/irc/ircprotocol.cpp:1001
+msgid "New Host"
 msgstr ""
 
-#. i18n: file ./plugins/translator/translatorprefsbase.ui line 92
-#: rc.cpp:1370 rc.cpp:1382
-#, no-c-format
-msgid "Show the original message"
+#: protocols/irc/ircprotocol.cpp:1002
+msgid "Enter the hostname of the new server:"
 msgstr ""
 
-#. i18n: file ./plugins/translator/translatorprefsbase.ui line 106
-#: rc.cpp:1373 rc.cpp:1385
-#, no-c-format
-msgid "Translate directly"
+#: protocols/irc/ircprotocol.cpp:1009
+msgid "A host already exists with that name"
 msgstr ""
 
-#. i18n: file ./plugins/translator/translatorprefsbase.ui line 119
-#: rc.cpp:1376
-#, no-c-format
-msgid "Outgoing Messages"
-msgstr "Negeseuon i fynd"
+#: protocols/irc/ircprotocol.cpp:1039
+msgid "Rename Network"
+msgstr ""
 
-#. i18n: file ./plugins/translator/translatorprefsbase.ui line 166
-#: rc.cpp:1388
-#, no-c-format
-msgid "Show dialog before sending"
+#: protocols/irc/ircprotocol.cpp:1040
+msgid "Enter the new name for this network:"
 msgstr ""
 
-#. i18n: file ./plugins/texteffect/texteffectprefs.ui line 35
-#: rc.cpp:1391
-#, no-c-format
-msgid "&Colors"
-msgstr "&Lliwiau"
+#: protocols/irc/ircprotocol.cpp:1050
+msgid "A network already exists with that name"
+msgstr ""
 
-#. i18n: file ./plugins/texteffect/texteffectprefs.ui line 62
-#: rc.cpp:1397
-#, no-c-format
-msgid "&Add..."
-msgstr "Ychw&anegu..."
+#: protocols/irc/ircchannelcontact.cpp:62
+msgid "Only Operators Can Change &Topic"
+msgstr ""
 
-#. i18n: file ./plugins/texteffect/texteffectprefs.ui line 78
-#: rc.cpp:1403
-#, no-c-format
-msgid "Move &Up"
-msgstr "Symud i &Fyny"
+#: protocols/irc/ircchannelcontact.cpp:63
+msgid "&No Outside Messages"
+msgstr ""
 
-#. i18n: file ./plugins/texteffect/texteffectprefs.ui line 86
-#: rc.cpp:1406
-#, no-c-format
-msgid "Move &Down"
-msgstr "Symud i &Lawr"
+#: protocols/irc/ircchannelcontact.cpp:64
+msgid "&Secret"
+msgstr "&Cyfrinachol"
 
-#. i18n: file ./plugins/texteffect/texteffectprefs.ui line 113
-#: rc.cpp:1409
-#, no-c-format
-msgid "Random order"
+#: protocols/irc/ircchannelcontact.cpp:65
+msgid "&Moderated"
 msgstr ""
 
-#. i18n: file ./plugins/texteffect/texteffectprefs.ui line 135
-#: rc.cpp:1412
-#, no-c-format
-msgid "Change global text foreground color"
+#: protocols/irc/ircchannelcontact.cpp:66
+msgid "&Invite Only"
 msgstr ""
 
-#. i18n: file ./plugins/texteffect/texteffectprefs.ui line 143
-#: rc.cpp:1415
-#, no-c-format
-msgid "Change color every letter"
+#: protocols/irc/ircchannelcontact.cpp:275
+msgid "Topic for %1 is set empty."
 msgstr ""
 
-#. i18n: file ./plugins/texteffect/texteffectprefs.ui line 151
-#: rc.cpp:1418
-#, no-c-format
-msgid "Change color every word"
+#: protocols/irc/ircchannelcontact.cpp:280
+msgid "Topic for %1 is %2"
 msgstr ""
 
-#. i18n: file ./plugins/texteffect/texteffectprefs.ui line 161
-#: rc.cpp:1421
-#, no-c-format
-msgid "Effects"
-msgstr "Effeithiau"
+#: protocols/irc/ircchannelcontact.cpp:365
+#, c-format
+msgid "You have joined channel %1"
+msgstr ""
 
-#. i18n: file ./plugins/texteffect/texteffectprefs.ui line 180
-#: rc.cpp:1424
-#, no-c-format
-msgid "L4m3r t4lk"
+#: protocols/irc/ircchannelcontact.cpp:381
+msgid "User <b>%1</b> joined channel %2"
 msgstr ""
 
-#. i18n: file ./plugins/texteffect/texteffectprefs.ui line 196
-#: rc.cpp:1427
-#, no-c-format
-msgid "CasE wAVes"
+#: protocols/irc/ircchannelcontact.cpp:416
+msgid "%1 was kicked by %2. Reason: %3"
 msgstr ""
 
-#. i18n: file ./plugins/netmeeting/netmeetingprefs_ui.ui line 27
-#: rc.cpp:1433
-#, no-c-format
-msgid ""
-"The NetMeeting Plugin allows you to start a video or voice chat with your MSN "
-"Messenger contacts.\n"
-"\n"
-"This is not the same as webcam chat you can find in the newer Windows "
-"Messenger®,  but uses the older NetMeeting chat you can find in old versions."
+#: protocols/irc/ircchannelcontact.cpp:418
+msgid "%1 was kicked by %2."
 msgstr ""
 
-#. i18n: file ./plugins/netmeeting/netmeetingprefs_ui.ui line 60
-#: rc.cpp:1438
-#, no-c-format
-msgid "Application to launch:"
+#: protocols/irc/ircchannelcontact.cpp:437
+msgid "You were kicked from %1 by %2. Reason: %3"
 msgstr ""
 
-#. i18n: file ./plugins/netmeeting/netmeetingprefs_ui.ui line 66
-#: rc.cpp:1441
-#, no-c-format
-msgid "ekiga -c callto://%1"
+#: protocols/irc/ircchannelcontact.cpp:439
+msgid "You were kicked from %1 by %2."
 msgstr ""
 
-#. i18n: file ./plugins/netmeeting/netmeetingprefs_ui.ui line 71
-#: rc.cpp:1444
-#, no-c-format
-msgid "konference callto://%1"
+#: protocols/irc/ircaccount.cpp:228 protocols/irc/ircaccount.cpp:246
+#: protocols/irc/ircaccount.cpp:698 protocols/irc/ircaccount.cpp:785
+#: protocols/irc/ircchannelcontact.cpp:442
+#: protocols/irc/ircchannelcontact.cpp:568
+#: protocols/irc/ircchannelcontact.cpp:575
+#: protocols/irc/ircchannelcontact.cpp:583
+#: protocols/irc/ircchannelcontact.cpp:589
+msgid "IRC Plugin"
 msgstr ""
 
-#. i18n: file ./plugins/netmeeting/netmeetingprefs_ui.ui line 99
-#: rc.cpp:1447
-#, no-c-format
-msgid "<b>%1</b> will be replaced by the ip to call"
+#: protocols/irc/ircchannelcontact.cpp:459
+msgid "New Topic"
 msgstr ""
 
-#. i18n: file ./plugins/netmeeting/netmeetingprefs_ui.ui line 135
-#: rc.cpp:1450
-#, no-c-format
-msgid ""
-"You can download Konference here: <a "
-"href=\"http://www.kde-apps.org/content/show.php?content=10395\">"
-"http://www.kde-apps.org/content/show.php?content=10395</a>"
+#: protocols/irc/ircchannelcontact.cpp:459
+msgid "Enter the new topic:"
 msgstr ""
 
-#. i18n: file ./plugins/alias/aliasdialogbase.ui line 22
-#: rc.cpp:1453
-#, no-c-format
-msgid "Alias"
-msgstr "Ffugenw"
+#: protocols/irc/ircchannelcontact.cpp:471
+msgid "You must be a channel operator on %1 to do that."
+msgstr ""
 
-#. i18n: file ./plugins/alias/aliasdialogbase.ui line 33
-#: rc.cpp:1456 rc.cpp:2251
-#, no-c-format
-msgid "Command"
-msgstr "Gorchymyn"
+#: protocols/irc/ircchannelcontact.cpp:486
+msgid "%1 has changed the topic to: %2"
+msgstr ""
 
-#. i18n: file ./plugins/alias/aliasdialogbase.ui line 44
-#: rc.cpp:1459 rc.cpp:1505
-#, no-c-format
-msgid "Protocols"
-msgstr "Protocolau"
+#: protocols/irc/ircchannelcontact.cpp:497
+msgid "Topic set by %1 at %2"
+msgstr ""
 
-#. i18n: file ./plugins/alias/aliasdialogbase.ui line 69
-#: rc.cpp:1462
-#, no-c-format
+#: protocols/irc/ircchannelcontact.cpp:506
+msgid "%1 sets mode %2 on %3"
+msgstr ""
+
+#: protocols/irc/ircchannelcontact.cpp:567
+msgid "<qt>You can not join %1 because you have been banned.</qt>"
+msgstr ""
+
+#: protocols/irc/ircchannelcontact.cpp:575
 msgid ""
-"This is the list of custom aliases and the commands that you have already added"
+"<qt>You can not join %1 because it is set to invite only, and no one has "
+"invited you.</qt>"
 msgstr ""
 
-#. i18n: file ./plugins/alias/aliasdialogbase.ui line 77
-#: rc.cpp:1465
-#, no-c-format
-msgid "&Add New Alias..."
+#: protocols/irc/ircchannelcontact.cpp:582
+msgid "<qt>You can not join %1 because it has reached its user limit.</qt>"
 msgstr ""
 
-#. i18n: file ./plugins/alias/aliasdialogbase.ui line 85
-#: rc.cpp:1468
-#, no-c-format
-msgid "&Delete Selected"
+#: protocols/irc/ircchannelcontact.cpp:590
+msgid "Please enter key for channel %1: "
 msgstr ""
 
-#. i18n: file ./plugins/alias/aliasdialogbase.ui line 93
-#: rc.cpp:1471
+#. i18n: file ./protocols/jabber/ui/dlgchatroomslist.ui line 128
+#: protocols/irc/ircchannelcontact.cpp:661 rc.cpp:2782 rc.cpp:3160
 #, no-c-format
-msgid "Edit Alias..."
+msgid "&Join"
+msgstr "&Uniad"
+
+#: protocols/irc/ircchannelcontact.cpp:662
+msgid "&Part"
 msgstr ""
 
-#. i18n: file ./plugins/alias/aliasdialog.ui line 16
-#: rc.cpp:1474
-#, no-c-format
-msgid "Add New Alias"
+#: protocols/irc/ircchannelcontact.cpp:663
+msgid "Change &Topic..."
 msgstr ""
 
-#. i18n: file ./plugins/alias/aliasdialog.ui line 27
-#: rc.cpp:1477
-#, no-c-format
-msgid "Command:"
-msgstr "Gorchymyn:"
+#: protocols/irc/ircchannelcontact.cpp:664
+msgid "Channel Modes"
+msgstr "Moddau Sianel"
 
-#. i18n: file ./plugins/alias/aliasdialog.ui line 38
-#: rc.cpp:1480
-#, no-c-format
-msgid "This is the command that you want to run when you execute this alias. "
+#: protocols/irc/ircchannelcontact.cpp:668
+msgid "Visit &Homepage"
 msgstr ""
 
-#. i18n: file ./plugins/alias/aliasdialog.ui line 45
-#: rc.cpp:1483
-#, 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>"
+#: protocols/irc/ui/irceditaccountwidget.cpp:177
+msgid "Remove Command"
+msgstr "Gwaredu Gorchymyn"
+
+#: protocols/irc/ui/irceditaccountwidget.cpp:185
+msgid "Remove CTCP Reply"
 msgstr ""
 
-#. i18n: file ./plugins/alias/aliasdialog.ui line 53
-#: rc.cpp:1490
-#, no-c-format
-msgid "Alias:"
-msgstr "Ffugenw :"
+#: protocols/irc/ui/irceditaccountwidget.cpp:275
+msgid "<qt>You must enter a nickname.</qt>"
+msgstr ""
 
-#. i18n: file ./plugins/alias/aliasdialog.ui line 64
-#: rc.cpp:1493
-#, no-c-format
-msgid ""
-"This is the alias you are adding (what you will type after the command "
-"identifier, '/')."
+#: protocols/irc/ui/channellist.cpp:182
+msgid " members"
 msgstr ""
 
-#. i18n: file ./plugins/alias/aliasdialog.ui line 67
-#: rc.cpp:1496
-#, no-c-format
+#: protocols/irc/ui/channellist.cpp:190 protocols/irc/ui/channellist.cpp:211
+msgid "Channel"
+msgstr "Sianel"
+
+#: protocols/irc/ui/channellist.cpp:191 protocols/irc/ui/channellist.cpp:212
+msgid "Users"
+msgstr "Defnyddwyr"
+
+#: protocols/irc/ui/channellist.cpp:200
+msgid "Search for:"
+msgstr "Chwilio am:"
+
+#: protocols/irc/ui/channellist.cpp:201 protocols/irc/ui/channellist.cpp:205
 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)."
+"You may search for channels on the IRC server for a text string entered here."
 msgstr ""
 
-#. i18n: file ./plugins/alias/aliasdialog.ui line 123
-#: rc.cpp:1508 rc.cpp:1511
-#, no-c-format
+#: protocols/irc/ui/channellist.cpp:202 protocols/irc/ui/channellist.cpp:203
+msgid "Channels returned must have at least this many members."
+msgstr ""
+
+#: protocols/irc/ui/channellist.cpp:204 protocols/irc/ui/channellist.cpp:206
 msgid ""
-"If you want this alias to only be active for certain protocols, select those "
-"protocols here."
+"You may search for channels on the IRC server for a text string entered here.  "
+"For instance, you may type 'linux' to find channels that have something to do "
+"with linux."
 msgstr ""
 
-#. i18n: file ./plugins/alias/aliasdialog.ui line 137
-#: rc.cpp:1514
-#, no-c-format
-msgid "For protocols:"
+#: protocols/irc/ui/channellist.cpp:208
+msgid "Perform a channel search."
 msgstr ""
 
-#. i18n: file ./plugins/latex/latexprefsbase.ui line 29
-#: rc.cpp:1520
-#, no-c-format
+#: protocols/irc/ui/channellist.cpp:209
 msgid ""
-"<p>The <font size=\"+1\">KopeTeX</font> plugin allows <font size=\"+1\">"
-"Kopet</font>e to render Latex formulas in the chat window. The sender must "
-"enclose the formula between two $ signs. ie: $$formula$$</p>\n"
-"<p>This plugin requires ImageMagick convert program installed in order to "
-"work.</p>"
+"Perform a channel search.  Please be patient, as this can be slow depending on "
+"the number of channels on the server."
 msgstr ""
 
-#. i18n: file ./plugins/latex/latexprefsbase.ui line 73
-#: rc.cpp:1527
-#, no-c-format
-msgid "Rendering resolution (DPI):"
+#: protocols/irc/ui/channellist.cpp:210
+msgid "Double click on a channel to select it."
 msgstr ""
 
-#. i18n: file ./plugins/latex/latexprefsbase.ui line 113
-#: rc.cpp:1530
-#, no-c-format
-msgid "x"
-msgstr "x"
+#: protocols/irc/ui/channellist.cpp:255
+msgid "You have been disconnected from the IRC server."
+msgstr ""
 
-#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 33
-#: rc.cpp:1533
-#, no-c-format
-msgid "Uploading"
-msgstr "Llwytho"
+#: protocols/irc/ui/channellist.cpp:256
+msgid "Disconnected"
+msgstr "Datgysylltwyd"
 
-#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 56
-#: rc.cpp:1536
-#, fuzzy, no-c-format
-msgid "Uplo&ad to:"
-msgstr "Llwytho"
+#: protocols/irc/ui/channellist.cpp:303
+msgid "You must be connected to the IRC server to perform a channel listing."
+msgstr ""
 
-#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 91
-#: rc.cpp:1539
-#, no-c-format
-msgid "Formatting"
+#: protocols/irc/ircaccount.cpp:82
+msgid "Kopete IRC Plugin %1 [http://kopete.kde.org]"
 msgstr ""
 
-#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 108
-#: rc.cpp:1542
-#, no-c-format
-msgid "HTML (simple loo&k)"
+#: protocols/irc/ircaccount.cpp:112
+msgid "Set Away"
 msgstr ""
 
-#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 114
-#: rc.cpp:1545
-#, no-c-format
-msgid ""
-"HTML 4.01 Transitional using the ISO-8859-1 (aka. Latin 1) character set "
-"encoding."
+#: protocols/irc/ircaccount.cpp:176
+#, c-format
+msgid "Temporary Network - %1"
 msgstr ""
 
-#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 119
-#: rc.cpp:1548
-#, no-c-format
+#: protocols/irc/ircaccount.cpp:177
+msgid "Network imported from previous version of Kopete, or an IRC URI"
+msgstr ""
+
+#: protocols/irc/ircaccount.cpp:210
+msgid "Join Channel..."
+msgstr "Ymuno â'r Sianel..."
+
+#: protocols/irc/ircaccount.cpp:212
+msgid "Search Channels..."
+msgstr ""
+
+#: protocols/irc/ircaccount.cpp:219
+msgid "Plugin Unloaded"
+msgstr ""
+
+#: protocols/irc/ircaccount.cpp:229
+msgid "The nickname %1 is already in use. Please enter an alternate nickname:"
+msgstr ""
+
+#: protocols/irc/ircaccount.cpp:246
+msgid "The nickname %1 is already in use"
+msgstr ""
+
+#: protocols/irc/ircaccount.cpp:308
 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."
+"<qt>The network associated with this account, <b>%1</b>"
+", no longer exists. Please ensure that the account has a valid network. The "
+"account will not be enabled until you do so.</qt>"
 msgstr ""
 
-#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 127
-#: rc.cpp:1553
-#, no-c-format
-msgid "XHTML (simple look)"
+#: protocols/irc/ircaccount.cpp:310
+#, c-format
+msgid "Problem Loading %1"
 msgstr ""
 
-#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 130
-#: rc.cpp:1556
-#, no-c-format
-msgid "XHTML 1.0 Strict"
+#: protocols/irc/ircaccount.cpp:429
+msgid "Show Server Window"
 msgstr ""
 
-#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 135
-#: rc.cpp:1559
-#, no-c-format
+#: protocols/irc/ircaccount.cpp:433
+msgid "Show Security Information"
+msgstr ""
+
+#: protocols/irc/ircaccount.cpp:458
 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."
+"<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 ""
 
-#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 143
-#: rc.cpp:1564
-#, no-c-format
-msgid "&XML"
-msgstr "&XML"
+#: protocols/irc/ircaccount.cpp:459
+msgid "Network is Empty"
+msgstr ""
 
-#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 146
-#: rc.cpp:1567
-#, no-c-format
-msgid "Save the output in XML format using UTF-8 character set."
+#: protocols/irc/ircaccount.cpp:465
+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 ""
 
-#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 149
-#: rc.cpp:1570
-#, no-c-format
-msgid "Save the output in XML format using the UTF-8 encoding."
+#: protocols/irc/ircaccount.cpp:466
+#, fuzzy
+msgid "Network is Unavailable"
+msgstr "A&r gael"
+
+#: protocols/irc/ircaccount.cpp:493
+msgid "Connecting to %1..."
+msgstr "Wrthi'n cysylltu i %1... "
+
+#: protocols/irc/ircaccount.cpp:495
+#, fuzzy
+msgid "Using SSL"
+msgstr "Defnyddier SS&L"
+
+#: protocols/irc/ircaccount.cpp:590
+msgid "The IRC server is currently too busy to respond to this request."
 msgstr ""
 
-#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 157
-#: rc.cpp:1573
-#, no-c-format
-msgid "XML transformation &using this XSLT sheet:"
+#: protocols/irc/ircaccount.cpp:591
+msgid "Server is Busy"
 msgstr ""
 
-#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 200
-#: rc.cpp:1576
-#, no-c-format
-msgid "Repla&ce protocol text with images in (X)HTML"
+#: protocols/irc/ircaccount.cpp:600
+#, c-format
+msgid "Channel List for %1"
 msgstr ""
 
-#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 203
-#: rc.cpp:1579
-#, no-c-format
-msgid "Replaces the protocol names, such as MSN and IRC with images."
+#: protocols/irc/ircaccount.cpp:698
+msgid "\"You are not allowed to add yourself to your contact list."
 msgstr ""
 
-#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 220
-#: rc.cpp:1582
-#, no-c-format
-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"
+#: protocols/irc/ircaccount.cpp:751
+msgid "Please enter name of the channel you want to join:"
 msgstr ""
 
-#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 230
-#: rc.cpp:1599
-#, no-c-format
-msgid "Display Name"
-msgstr "Enw Dangos"
+#: protocols/irc/ircaccount.cpp:792
+msgid "CTCP %1 REPLY: %2"
+msgstr ""
 
-#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 247
-#: rc.cpp:1602
-#, no-c-format
-msgid "Use one of &your IM names"
+#: protocols/irc/ircaccount.cpp:798
+msgid "The channel \"%1\" does not exist"
 msgstr ""
 
-#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 258
-#: rc.cpp:1605
-#, no-c-format
-msgid "Use another &name:"
+#: protocols/irc/ircaccount.cpp:800
+msgid "The nickname \"%1\" does not exist"
 msgstr ""
 
-#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 301
-#: rc.cpp:1608
-#, no-c-format
-msgid "Include &IM addresses"
+#: protocols/irc/ircaddcontactpage.cpp:74
+msgid "<qt>You need to specify a channel to join, or query to open.</qt>"
 msgstr ""
 
-#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 17
-#: rc.cpp:1611
-#, no-c-format
-msgid "HighlighPrefsUI"
+#: protocols/irc/ircaddcontactpage.cpp:74
+msgid "You Must Specify a Channel"
 msgstr ""
 
-#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 36
-#: rc.cpp:1614
-#, no-c-format
-msgid "Available Filters"
-msgstr "Hidlau ar Gael"
+#: protocols/irc/libkirc/kirctransfer.cpp:359
+msgid "Acknowledge size is greater than the expected file size"
+msgstr ""
 
-#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 69
-#: rc.cpp:1623
+#: protocols/irc/libkirc/ksslsocket.cpp:371
+msgid ""
+"The IP address of the host %1 does not match the one the certificate was issued "
+"to."
+msgstr ""
+"Nid yw cyfeiriad IP gwesteiwr %1 yn cydweddu â'r un a rowyd y tystysgrif iddo."
+
+#: protocols/irc/libkirc/ksslsocket.cpp:376
+#: protocols/irc/libkirc/ksslsocket.cpp:386
+#: protocols/irc/libkirc/ksslsocket.cpp:407
+msgid "Server Authentication"
+msgstr "Dilysiant Gweinydd"
+
+#: protocols/irc/libkirc/ksslsocket.cpp:377
+#: protocols/irc/libkirc/ksslsocket.cpp:387
+msgid "&Details"
+msgstr "&Manylion"
+
+#: protocols/irc/libkirc/ksslsocket.cpp:378
+#: protocols/irc/libkirc/ksslsocket.cpp:388
+msgid "Co&ntinue"
+msgstr "Par&hau"
+
+#: protocols/irc/libkirc/ksslsocket.cpp:382
+msgid "The server certificate failed the authenticity test (%1)."
+msgstr "Methodd y tystysgrif gweinydd y prawf dilysiant (%1)."
+
+#: protocols/irc/libkirc/ksslsocket.cpp:404
+msgid ""
+"Would you like to accept this certificate forever without being prompted?"
+msgstr "Liciwch chi dderbyn y tystysgrif yma am byth heb gofweini arnoch?"
+
+#: protocols/irc/libkirc/ksslsocket.cpp:408
+msgid "&Forever"
+msgstr "&Am Byth"
+
+#: protocols/irc/libkirc/ksslsocket.cpp:409
+msgid "&Current Sessions Only"
+msgstr "&Sesiynau Cyfredol yn Unig"
+
+#. i18n: file ./plugins/translator/translatorprefsbase.ui line 38
+#: rc.cpp:9
 #, no-c-format
-msgid "Rename..."
-msgstr "Ail-enwi..."
+msgid "Translation service:"
+msgstr ""
 
-#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 75
-#: rc.cpp:1626
+#. i18n: file ./plugins/translator/translatorprefsbase.ui line 46
+#: rc.cpp:12
 #, no-c-format
-msgid "Filters"
-msgstr "Hidlenni"
+msgid "Default native language:"
+msgstr ""
 
-#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 111
-#: rc.cpp:1629
+#. i18n: file ./plugins/translator/translatorprefsbase.ui line 67
+#: rc.cpp:15
 #, no-c-format
-msgid "Criteria"
-msgstr "Meini prawf"
+msgid "Incoming Messages"
+msgstr "Negeseuon newydd Gyraedd"
 
-#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 130
-#: rc.cpp:1632
+#. i18n: file ./plugins/translator/translatorprefsbase.ui line 78
+#: rc.cpp:18 rc.cpp:30
 #, no-c-format
-msgid "If the message contains:"
+msgid "Do not translate"
 msgstr ""
 
-#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 151
-#: rc.cpp:1635
+#. i18n: file ./plugins/translator/translatorprefsbase.ui line 92
+#: rc.cpp:21 rc.cpp:33
 #, no-c-format
-msgid "Regular expression"
-msgstr "Mynegiad rheolaidd"
+msgid "Show the original message"
+msgstr ""
 
-#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 167
-#: protocols/gadu/gaducontact.cpp:204 rc.cpp:1638
+#. i18n: file ./plugins/translator/translatorprefsbase.ui line 106
+#: rc.cpp:24 rc.cpp:36
 #, no-c-format
-msgid "Edit..."
-msgstr "Golygu..."
+msgid "Translate directly"
+msgstr ""
 
-#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 194
-#: rc.cpp:1641
+#. i18n: file ./plugins/translator/translatorprefsbase.ui line 119
+#: rc.cpp:27
 #, no-c-format
-msgid "Case sensitive"
-msgstr "Llythrennau mawr/bach o bwys"
+msgid "Outgoing Messages"
+msgstr "Negeseuon i fynd"
 
-#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 212
-#: rc.cpp:1644
+#. i18n: file ./plugins/translator/translatorprefsbase.ui line 166
+#: rc.cpp:39
 #, no-c-format
-msgid "Action"
-msgstr "Gweithred"
+msgid "Show dialog before sending"
+msgstr ""
 
-#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 239
-#: rc.cpp:1647
+#. i18n: file ./plugins/addbookmarks/addbookmarksprefsui.ui line 24
+#: rc.cpp:42
 #, no-c-format
-msgid "Set the message importance to:"
+msgid "Use Subfolder for Each Contact"
 msgstr ""
 
-#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 245
-#: rc.cpp:1650
+#. i18n: file ./plugins/addbookmarks/addbookmarksprefsui.ui line 38
+#: rc.cpp:45
 #, no-c-format
-msgid "Low"
-msgstr "Isel"
+msgid "Always"
+msgstr "Bob tro"
 
-#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 250
-#: rc.cpp:1653
+#. i18n: file ./plugins/addbookmarks/addbookmarksprefsui.ui line 52
+#: rc.cpp:48 rc.cpp:109
 #, no-c-format
-msgid "Normal"
-msgstr "Arferol"
+msgid "Never"
+msgstr "Byth"
 
-#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 255
-#: rc.cpp:1656
+#. i18n: file ./plugins/addbookmarks/addbookmarksprefsui.ui line 66
+#: rc.cpp:51
+#, fuzzy, no-c-format
+msgid "Onl&y the selected contacts"
+msgstr "&Dileu y Cyswllt"
+
+#. i18n: file ./plugins/addbookmarks/addbookmarksprefsui.ui line 83
+#: rc.cpp:54
+#, fuzzy, no-c-format
+msgid "Not the selected contacts"
+msgstr "&Dileu y Cyswllt"
+
+#. i18n: file ./plugins/addbookmarks/addbookmarksprefsui.ui line 98
+#: rc.cpp:57
 #, no-c-format
-msgid "Highlight"
-msgstr "Amlygu"
+msgid "Add Bookmarks from Contacts Not In Your Contact List"
+msgstr ""
 
-#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 302
-#: rc.cpp:1659
+#. i18n: file ./plugins/motionautoaway/motionawayprefs.ui line 33
+#: rc.cpp:60
 #, no-c-format
-msgid "Change the background color to:"
+msgid ""
+"<p>Motion Auto-Away can set you to be away automatically when it does not "
+"detect motion from your webcam or any video4linux device.</p> "
+"<p>It will put you online again when it detects you moving in front of the "
+"camera.</p>"
 msgstr ""
 
-#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 353
-#: rc.cpp:1662
+#. i18n: file ./plugins/motionautoaway/motionawayprefs.ui line 55
+#: rc.cpp:63
+#, fuzzy, no-c-format
+msgid "Video Settings"
+msgstr "&Cadw Gosodiadau"
+
+#. i18n: file ./plugins/motionautoaway/motionawayprefs.ui line 74
+#: rc.cpp:66
 #, no-c-format
-msgid "Change the foreground color to:"
+msgid "&Video4Linux device:"
 msgstr ""
 
-#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 404
-#: rc.cpp:1665
+#. i18n: file ./plugins/motionautoaway/motionawayprefs.ui line 102
+#: rc.cpp:69
 #, no-c-format
-msgid "Play a sound:"
-msgstr "Chwarae sŵn :"
+msgid "/dev/video0"
+msgstr ""
 
-#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 427
-#: rc.cpp:1668
+#. i18n: file ./plugins/motionautoaway/motionawayprefs.ui line 131
+#: rc.cpp:72
 #, no-c-format
-msgid "Raise window"
-msgstr "Codi'r Ffenestr"
+msgid "Away Settings"
+msgstr "Gosodiadau I Ffwrdd"
 
-#. i18n: file ./plugins/cryptography/cryptographyuserkey_ui.ui line 24
-#: rc.cpp:1671
+#. i18n: file ./plugins/motionautoaway/motionawayprefs.ui line 150
+#: rc.cpp:75
 #, no-c-format
-msgid "PGP key:"
+msgid "Become available when &detecting activity again"
 msgstr ""
 
-#. i18n: file ./plugins/cryptography/cryptographyuserkey_ui.ui line 40
-#: rc.cpp:1674 rc.cpp:1692
+#. i18n: file ./plugins/motionautoaway/motionawayprefs.ui line 188
+#: rc.cpp:78
 #, no-c-format
-msgid "Select..."
-msgstr "Dewis..."
+msgid "&Become away after this many minutes of inactivity:"
+msgstr ""
 
-#. i18n: file ./plugins/cryptography/cryptographyuserkey_ui.ui line 73
-#: rc.cpp:1680
+#. i18n: file ./plugins/motionautoaway/motionawayprefs.ui line 231
+#: rc.cpp:81 rc.cpp:103
 #, no-c-format
-msgid "TextLabel2"
-msgstr ""
+msgid "minutes"
+msgstr "munudau"
 
 #. i18n: file ./plugins/cryptography/cryptographyprefsbase.ui line 25
-#: rc.cpp:1689
+#: rc.cpp:84
 #, no-c-format
 msgid "Your private PGP key:"
 msgstr ""
 
+#. i18n: file ./plugins/cryptography/cryptographyprefsbase.ui line 33
+#: rc.cpp:87 rc.cpp:124
+#, no-c-format
+msgid "Select..."
+msgstr "Dewis..."
+
 #. i18n: file ./plugins/cryptography/cryptographyprefsbase.ui line 49
-#: rc.cpp:1695
+#: rc.cpp:90
 #, no-c-format
 msgid "Encrypt outgoing messages with this key"
 msgstr ""
 
 #. i18n: file ./plugins/cryptography/cryptographyprefsbase.ui line 53
-#: rc.cpp:1698
+#: rc.cpp:93
 #, no-c-format
 msgid ""
 "<qt>Check this box if you want to encrypt outgoing messages with this key, so "
@@ -5297,3220 +7339,3364 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./plugins/cryptography/cryptographyprefsbase.ui line 78
-#: rc.cpp:1702
+#: rc.cpp:97
 #, no-c-format
 msgid "Cache Passphrase"
 msgstr ""
 
 #. i18n: file ./plugins/cryptography/cryptographyprefsbase.ui line 89
-#: rc.cpp:1705
+#: rc.cpp:100
 #, no-c-format
 msgid "Until Kopete closes"
 msgstr ""
 
-#. i18n: file ./plugins/cryptography/cryptographyprefsbase.ui line 130
-#: rc.cpp:1708 rc.cpp:1963
-#, no-c-format
-msgid "minutes"
-msgstr "munudau"
-
 #. i18n: file ./plugins/cryptography/cryptographyprefsbase.ui line 146
-#: rc.cpp:1711
+#: rc.cpp:106
 #, no-c-format
 msgid "For"
 msgstr "Ar gyfer"
 
-#. i18n: file ./plugins/cryptography/cryptographyprefsbase.ui line 154
-#: rc.cpp:1714 rc.cpp:1828
-#, no-c-format
-msgid "Never"
-msgstr "Byth"
-
 #. i18n: file ./plugins/cryptography/cryptographyprefsbase.ui line 164
-#: rc.cpp:1717
+#: rc.cpp:112
 #, no-c-format
 msgid "Do not ask for the passphrase"
 msgstr ""
 
-#. i18n: file ./plugins/history/historyprefsui.ui line 17
-#: rc.cpp:1723
+#. i18n: file ./plugins/cryptography/cryptographyuserkey_ui.ui line 24
+#: rc.cpp:121
 #, no-c-format
-msgid "HistoryPrefsWidget"
+msgid "PGP key:"
 msgstr ""
 
-#. i18n: file ./plugins/history/historyprefsui.ui line 28
-#: rc.cpp:1726
+#. i18n: file ./plugins/cryptography/cryptographyuserkey_ui.ui line 73
+#: rc.cpp:130
 #, no-c-format
-msgid "Chat History"
+msgid "TextLabel2"
 msgstr ""
 
-#. i18n: file ./plugins/history/historyprefsui.ui line 39
-#: rc.cpp:1729
+#. i18n: file ./plugins/smpppdcs/smpppdcsprefs.ui line 17
+#: rc.cpp:133
 #, no-c-format
-msgid "Number of messages per page:"
+msgid "SMPPPDCS Preferences"
 msgstr ""
 
-#. i18n: file ./plugins/history/historyprefsui.ui line 42
-#: rc.cpp:1732
+#. i18n: file ./plugins/smpppdcs/smpppdcsprefs.ui line 32
+#: rc.cpp:136
 #, no-c-format
-msgid ""
-"The number of messages that are shown when browsing history in the chat window"
+msgid "&Connection"
+msgstr "&Cysylltiad"
+
+#. i18n: file ./plugins/smpppdcs/smpppdcsprefs.ui line 57
+#: rc.cpp:139
+#, no-c-format
+msgid "Method of Connection Status Detection"
 msgstr ""
 
-#. i18n: file ./plugins/history/historyprefsui.ui line 59
-#: rc.cpp:1735
+#. i18n: file ./plugins/smpppdcs/smpppdcsprefs.ui line 74
+#: rc.cpp:142
 #, no-c-format
-msgid ""
-"The number of message that are shown when borwsing history in the chat window"
+msgid "&netstat - Standard method of connection status detection"
 msgstr ""
 
-#. i18n: file ./plugins/history/historyprefsui.ui line 67
-#: rc.cpp:1738
+#. i18n: file ./plugins/smpppdcs/smpppdcsprefs.ui line 80
+#: rc.cpp:145
 #, no-c-format
-msgid "Color of messages:"
+msgid ""
+"Uses the netstat command to find a gateway; suitable on dial-up computers"
 msgstr ""
 
-#. i18n: file ./plugins/history/historyprefsui.ui line 73
-#: rc.cpp:1741 rc.cpp:1744
+#. i18n: file ./plugins/smpppdcs/smpppdcsprefs.ui line 88
+#: rc.cpp:148
 #, no-c-format
-msgid "Color of history messages in the chat window"
+msgid "smpppd - Ad&vanced method of connection status detection"
 msgstr ""
 
-#. i18n: file ./plugins/history/historyprefsui.ui line 108
-#: rc.cpp:1747 rc.cpp:1753
+#. i18n: file ./plugins/smpppdcs/smpppdcsprefs.ui line 91
+#: rc.cpp:151
 #, no-c-format
 msgid ""
-"This is the number of messages that will be added automatically in the chat "
-"window when opening a new chat."
+"Uses the smpppd on a gateway; suitable for a computer in a private network"
 msgstr ""
 
-#. i18n: file ./plugins/history/historyprefsui.ui line 116
-#: rc.cpp:1750
+#. i18n: file ./plugins/smpppdcs/smpppdcsprefs.ui line 107
+#: rc.cpp:154
+#, fuzzy, no-c-format
+msgid "&Try to Detect Automatically"
+msgstr "Awtomatig"
+
+#. i18n: file ./plugins/smpppdcs/smpppdcsprefs.ui line 110
+#: rc.cpp:157
 #, no-c-format
-msgid "Number of messages to show:"
+msgid "Tries to find an appropriate connection method"
 msgstr ""
 
-#. i18n: file ./plugins/history/historyprefsui.ui line 130
-#: rc.cpp:1756
+#. i18n: file ./plugins/smpppdcs/smpppdcsprefs.ui line 142
+#: rc.cpp:160
 #, no-c-format
-msgid "Show chat history in new chats"
+msgid "Location of the SMPPPD"
 msgstr ""
 
-#. i18n: file ./plugins/history/historyprefsui.ui line 136
-#: rc.cpp:1759
+#. i18n: file ./plugins/smpppdcs/smpppdcsprefs.ui line 187
+#: rc.cpp:163
 #, no-c-format
-msgid ""
-"When a new chat is opened, automatically add the last few messages between you "
-"and that contact."
+msgid "Acco&unts"
+msgstr "Cyfr&ifon"
+
+#. i18n: file ./plugins/smpppdcs/smpppdcsprefs.ui line 218
+#: rc.cpp:166
+#, no-c-format
+msgid "Choose the accounts to ignore:"
 msgstr ""
 
-#. i18n: file ./plugins/history/historyviewer.ui line 55
-#: plugins/history/historydialog.cpp:572 rc.cpp:1765
+#. i18n: file ./plugins/smpppdcs/smpppdcsprefs.ui line 224
+#: rc.cpp:169 rc.cpp:774 rc.cpp:811 rc.cpp:1720
 #, no-c-format
-msgid "Ready"
-msgstr "Parod"
+msgid "Account"
+msgstr "Cyfrif"
 
-#. i18n: file ./plugins/history/historyviewer.ui line 125
-#: plugins/history/historydialog.cpp:536 rc.cpp:1771
+#. i18n: file ./plugins/smpppdcs/smpppdlocationui.ui line 16
+#: rc.cpp:172
 #, fuzzy, no-c-format
-msgid "Se&arch"
-msgstr "&Chwiliad:"
+msgid "SMPPPDLocation"
+msgstr "Lleoliad"
 
-#. i18n: file ./plugins/history/historyviewer.ui line 179
-#: rc.cpp:1774
+#. i18n: file ./plugins/smpppdcs/smpppdlocationui.ui line 27
+#: rc.cpp:175 rc.cpp:2281 rc.cpp:2389 rc.cpp:3022 rc.cpp:3660 rc.cpp:3915
 #, no-c-format
-msgid "Date"
-msgstr "Dyddiad"
+msgid "Ser&ver:"
+msgstr " Gweinydd:"
 
-#. i18n: file ./plugins/history/historyviewer.ui line 275
-#: rc.cpp:1780
+#. i18n: file ./plugins/smpppdcs/smpppdlocationui.ui line 41
+#: rc.cpp:178
 #, no-c-format
-msgid "Contact:"
-msgstr "Cyswllt :"
+msgid "localhost"
+msgstr "localhost (y gyfrifiadur yma)"
 
-#. i18n: file ./plugins/history/historyviewer.ui line 296
-#: rc.cpp:1783
-#, fuzzy, no-c-format
-msgid "Message Filter:"
-msgstr "Ailenwi Hidlen"
+#. i18n: file ./plugins/smpppdcs/smpppdlocationui.ui line 47
+#: rc.cpp:181
+#, no-c-format
+msgid "The server on which the SMPPPD is running"
+msgstr ""
 
-#. i18n: file ./plugins/history/historyviewer.ui line 302
-#: rc.cpp:1786
-#, fuzzy, no-c-format
-msgid "All messages"
-msgstr "Negeseuon Allan"
+#. i18n: file ./plugins/smpppdcs/smpppdlocationui.ui line 55
+#: rc.cpp:184 rc.cpp:2299
+#, no-c-format
+msgid "P&ort:"
+msgstr "&Porth:"
 
-#. i18n: file ./plugins/history/historyviewer.ui line 307
-#: rc.cpp:1789
+#. i18n: file ./plugins/smpppdcs/smpppdlocationui.ui line 83
+#: rc.cpp:187
 #, no-c-format
-msgid "Only incoming"
+msgid "The port on which the SMPPPD is running on"
 msgstr ""
 
-#. i18n: file ./plugins/history/historyviewer.ui line 312
-#: rc.cpp:1792
+#. i18n: file ./plugins/smpppdcs/smpppdlocationui.ui line 91
+#: rc.cpp:190
 #, no-c-format
-msgid "Only outgoing"
+msgid "Default: 3185"
+msgstr ""
+
+#. i18n: file ./plugins/smpppdcs/smpppdlocationui.ui line 118
+#: rc.cpp:193 rc.cpp:2797
+#, no-c-format
+msgid "Pass&word:"
+msgstr "Cyf&rinair"
+
+#. i18n: file ./plugins/smpppdcs/smpppdlocationui.ui line 135
+#: rc.cpp:196
+#, no-c-format
+msgid "The password to authenticate with the smpppd"
 msgstr ""
 
 #. i18n: file ./plugins/statistics/statisticswidget.ui line 36
-#: rc.cpp:1795
+#: rc.cpp:199
 #, no-c-format
 msgid "Ask &Database"
 msgstr ""
 
 #. i18n: file ./plugins/statistics/statisticswidget.ui line 47
-#: rc.cpp:1798
+#: rc.cpp:202
 #, no-c-format
 msgid "Date && Time"
 msgstr "Dyddiad ac Amser"
 
 #. i18n: file ./plugins/statistics/statisticswidget.ui line 112
-#: rc.cpp:1801
+#: rc.cpp:205
 #, fuzzy, no-c-format
 msgid "Time :"
 msgstr "Cylchfa amser:"
 
 #. i18n: file ./plugins/statistics/statisticswidget.ui line 167
-#: rc.cpp:1804
+#: rc.cpp:208
 #, no-c-format
 msgid "Question"
 msgstr "Cwestiwn"
 
 #. i18n: file ./plugins/statistics/statisticswidget.ui line 184
-#: rc.cpp:1807
+#: rc.cpp:211
 #, no-c-format
 msgid "Contact Status at Date & Time"
 msgstr ""
 
 #. i18n: file ./plugins/statistics/statisticswidget.ui line 189
-#: rc.cpp:1810
+#: rc.cpp:214
 #, no-c-format
 msgid "Most Used Status at Date"
 msgstr ""
 
 #. i18n: file ./plugins/statistics/statisticswidget.ui line 209
-#: rc.cpp:1813
+#: rc.cpp:217
 #, no-c-format
 msgid "&Ask"
 msgstr "&Gofyn"
 
 #. i18n: file ./plugins/statistics/statisticswidget.ui line 221
-#: rc.cpp:1816
+#: rc.cpp:220
 #, no-c-format
 msgid "Answer"
 msgstr "Ateb"
 
-#. i18n: file ./plugins/addbookmarks/addbookmarksprefsui.ui line 24
-#: rc.cpp:1822
+#. i18n: file ./plugins/latex/latexprefsbase.ui line 29
+#: rc.cpp:226
 #, no-c-format
-msgid "Use Subfolder for Each Contact"
+msgid ""
+"<p>The <font size=\"+1\">KopeTeX</font> plugin allows <font size=\"+1\">"
+"Kopet</font>e to render Latex formulas in the chat window. The sender must "
+"enclose the formula between two $ signs. ie: $$formula$$</p>\n"
+"<p>This plugin requires ImageMagick convert program installed in order to "
+"work.</p>"
 msgstr ""
 
-#. i18n: file ./plugins/addbookmarks/addbookmarksprefsui.ui line 38
-#: rc.cpp:1825
+#. i18n: file ./plugins/latex/latexprefsbase.ui line 73
+#: rc.cpp:233
 #, no-c-format
-msgid "Always"
-msgstr "Bob tro"
+msgid "Rendering resolution (DPI):"
+msgstr ""
 
-#. i18n: file ./plugins/addbookmarks/addbookmarksprefsui.ui line 66
-#: rc.cpp:1831
-#, fuzzy, no-c-format
-msgid "Onl&y the selected contacts"
-msgstr "&Dileu y Cyswllt"
+#. i18n: file ./plugins/latex/latexprefsbase.ui line 113
+#: rc.cpp:236
+#, no-c-format
+msgid "x"
+msgstr "x"
 
-#. i18n: file ./plugins/addbookmarks/addbookmarksprefsui.ui line 83
-#: rc.cpp:1834
-#, fuzzy, no-c-format
-msgid "Not the selected contacts"
-msgstr "&Dileu y Cyswllt"
+#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 17
+#: rc.cpp:242
+#, no-c-format
+msgid "HighlighPrefsUI"
+msgstr ""
 
-#. i18n: file ./plugins/addbookmarks/addbookmarksprefsui.ui line 98
-#: rc.cpp:1837
+#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 36
+#: rc.cpp:245
 #, no-c-format
-msgid "Add Bookmarks from Contacts Not In Your Contact List"
+msgid "Available Filters"
+msgstr "Hidlau ar Gael"
+
+#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 69
+#: rc.cpp:254
+#, no-c-format
+msgid "Rename..."
+msgstr "Ail-enwi..."
+
+#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 75
+#: rc.cpp:257
+#, no-c-format
+msgid "Filters"
+msgstr "Hidlenni"
+
+#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 111
+#: rc.cpp:260
+#, no-c-format
+msgid "Criteria"
+msgstr "Meini prawf"
+
+#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 130
+#: rc.cpp:263
+#, no-c-format
+msgid "If the message contains:"
 msgstr ""
 
-#. i18n: file ./plugins/smpppdcs/smpppdlocationui.ui line 16
-#: rc.cpp:1840
-#, fuzzy, no-c-format
-msgid "SMPPPDLocation"
-msgstr "Lleoliad"
+#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 151
+#: rc.cpp:266
+#, no-c-format
+msgid "Regular expression"
+msgstr "Mynegiad rheolaidd"
 
-#. i18n: file ./plugins/smpppdcs/smpppdlocationui.ui line 27
-#: rc.cpp:1843 rc.cpp:3376 rc.cpp:4088 rc.cpp:4199 rc.cpp:4572 rc.cpp:5111
+#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 194
+#: rc.cpp:272
 #, no-c-format
-msgid "Ser&ver:"
-msgstr " Gweinydd:"
+msgid "Case sensitive"
+msgstr "Llythrennau mawr/bach o bwys"
 
-#. i18n: file ./plugins/smpppdcs/smpppdlocationui.ui line 41
-#: rc.cpp:1846
+#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 212
+#: rc.cpp:275
 #, no-c-format
-msgid "localhost"
-msgstr "localhost (y gyfrifiadur yma)"
+msgid "Action"
+msgstr "Gweithred"
 
-#. i18n: file ./plugins/smpppdcs/smpppdlocationui.ui line 47
-#: rc.cpp:1849
+#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 239
+#: rc.cpp:278
 #, no-c-format
-msgid "The server on which the SMPPPD is running"
+msgid "Set the message importance to:"
 msgstr ""
 
-#. i18n: file ./plugins/smpppdcs/smpppdlocationui.ui line 55
-#: rc.cpp:1852 rc.cpp:4106
+#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 245
+#: rc.cpp:281
 #, no-c-format
-msgid "P&ort:"
-msgstr "&Porth:"
+msgid "Low"
+msgstr "Isel"
 
-#. i18n: file ./plugins/smpppdcs/smpppdlocationui.ui line 83
-#: rc.cpp:1855
+#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 250
+#: rc.cpp:284
 #, no-c-format
-msgid "The port on which the SMPPPD is running on"
+msgid "Normal"
+msgstr "Arferol"
+
+#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 255
+#: rc.cpp:287
+#, no-c-format
+msgid "Highlight"
+msgstr "Amlygu"
+
+#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 302
+#: rc.cpp:290
+#, no-c-format
+msgid "Change the background color to:"
 msgstr ""
 
-#. i18n: file ./plugins/smpppdcs/smpppdlocationui.ui line 91
-#: rc.cpp:1858
+#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 353
+#: rc.cpp:293
 #, no-c-format
-msgid "Default: 3185"
+msgid "Change the foreground color to:"
 msgstr ""
 
-#. i18n: file ./plugins/smpppdcs/smpppdlocationui.ui line 118
-#: rc.cpp:1861 rc.cpp:4473
+#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 404
+#: rc.cpp:296
 #, no-c-format
-msgid "Pass&word:"
-msgstr "Cyf&rinair"
+msgid "Play a sound:"
+msgstr "Chwarae sŵn :"
 
-#. i18n: file ./plugins/smpppdcs/smpppdlocationui.ui line 135
-#: rc.cpp:1864
+#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 427
+#: rc.cpp:299
 #, no-c-format
-msgid "The password to authenticate with the smpppd"
+msgid "Raise window"
+msgstr "Codi'r Ffenestr"
+
+#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 16
+#: rc.cpp:305
+#, no-c-format
+msgid "Now Listening"
+msgstr "Rwan yn Gwrando ar"
+
+#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 33
+#: rc.cpp:308
+#, no-c-format
+msgid "<b>Share Your Musical Taste</b>"
 msgstr ""
 
-#. i18n: file ./plugins/smpppdcs/smpppdcsprefs.ui line 17
-#: rc.cpp:1867
+#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 59
+#: rc.cpp:311
 #, no-c-format
-msgid "SMPPPDCS Preferences"
+msgid "Messa&ge"
+msgstr "Neg&es"
+
+#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 78
+#: rc.cpp:314
+#, no-c-format
+msgid "Use this message when advertising:"
 msgstr ""
 
-#. i18n: file ./plugins/smpppdcs/smpppdcsprefs.ui line 32
-#: rc.cpp:1870
+#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 87
+#: rc.cpp:317
 #, no-c-format
-msgid "&Connection"
-msgstr "&Cysylltiad"
+msgid ""
+"%track, %artist, %album, %player will be substituted if known.\n"
+"Expressions in brackets depend on a substitution being made."
+msgstr ""
 
-#. i18n: file ./plugins/smpppdcs/smpppdcsprefs.ui line 57
-#: rc.cpp:1873
+#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 106
+#: rc.cpp:321
+#, fuzzy, no-c-format
+msgid "Start with:"
+msgstr "Talaith:"
+
+#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 120
+#: rc.cpp:324
 #, no-c-format
-msgid "Method of Connection Status Detection"
+msgid "Now Listening To: "
 msgstr ""
 
-#. i18n: file ./plugins/smpppdcs/smpppdcsprefs.ui line 74
-#: rc.cpp:1876
+#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 128
+#: rc.cpp:327
 #, no-c-format
-msgid "&netstat - Standard method of connection status detection"
+msgid "For each track:"
 msgstr ""
 
-#. i18n: file ./plugins/smpppdcs/smpppdcsprefs.ui line 80
-#: rc.cpp:1879
+#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 142
+#: rc.cpp:330
 #, no-c-format
-msgid ""
-"Uses the netstat command to find a gateway; suitable on dial-up computers"
+msgid "%track (by %artist)(on %album)"
 msgstr ""
 
-#. i18n: file ./plugins/smpppdcs/smpppdcsprefs.ui line 88
-#: rc.cpp:1882
+#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 150
+#: rc.cpp:333
 #, no-c-format
-msgid "smpppd - Ad&vanced method of connection status detection"
+msgid "Conjunction (if >1 track):"
 msgstr ""
 
-#. i18n: file ./plugins/smpppdcs/smpppdcsprefs.ui line 91
-#: rc.cpp:1885
+#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 164
+#: rc.cpp:336
+#, no-c-format
+msgid ", and "
+msgstr ", a"
+
+#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 195
+#: rc.cpp:339
+#, no-c-format
+msgid "A&dvertising Mode"
+msgstr ""
+
+#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 222
+#: rc.cpp:342
 #, no-c-format
 msgid ""
-"Uses the smpppd on a gateway; suitable for a computer in a private network"
+"Explicit &via \"Tools->Send Media Info\",\n"
+"or by typing \"/media\" in the chat\n"
+"window edit area."
 msgstr ""
 
-#. i18n: file ./plugins/smpppdcs/smpppdcsprefs.ui line 107
-#: rc.cpp:1888
-#, fuzzy, no-c-format
-msgid "&Try to Detect Automatically"
-msgstr "Awtomatig"
+#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 230
+#: rc.cpp:347
+#, no-c-format
+msgid "&Show in chat window (automatic)"
+msgstr ""
 
-#. i18n: file ./plugins/smpppdcs/smpppdcsprefs.ui line 110
-#: rc.cpp:1891
+#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 239
+#: rc.cpp:350
 #, no-c-format
-msgid "Tries to find an appropriate connection method"
+msgid ""
+"Show &the music you are listening to \n"
+"in place of your status message."
 msgstr ""
 
-#. i18n: file ./plugins/smpppdcs/smpppdcsprefs.ui line 142
-#: rc.cpp:1894
+#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 247
+#: rc.cpp:354
 #, no-c-format
-msgid "Location of the SMPPPD"
+msgid "Appe&nd to your status message"
 msgstr ""
 
-#. i18n: file ./plugins/smpppdcs/smpppdcsprefs.ui line 187
-#: rc.cpp:1897
+#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 276
+#: rc.cpp:357
 #, no-c-format
-msgid "Acco&unts"
-msgstr "Cyfr&ifon"
+msgid "Media Pla&yer"
+msgstr "Chwar&aewr Cyfryngau"
 
-#. i18n: file ./plugins/smpppdcs/smpppdcsprefs.ui line 218
-#: rc.cpp:1900
+#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 295
+#: rc.cpp:360
 #, no-c-format
-msgid "Choose the accounts to ignore:"
+msgid "Use &specified media player"
 msgstr ""
 
 #. i18n: file ./plugins/autoreplace/autoreplaceprefs.ui line 25
-#: rc.cpp:1906
+#: rc.cpp:363
 #, fuzzy, no-c-format
 msgid "Sentence Options"
 msgstr "Dewisiada&u Uwch"
 
 #. i18n: file ./plugins/autoreplace/autoreplaceprefs.ui line 36
-#: rc.cpp:1909
+#: rc.cpp:366
 #, no-c-format
 msgid "Add a dot at the end of each sent line"
 msgstr ""
 
 #. i18n: file ./plugins/autoreplace/autoreplaceprefs.ui line 44
-#: rc.cpp:1912
+#: rc.cpp:369
 #, no-c-format
 msgid "Start each sent line with a capital letter"
 msgstr ""
 
 #. i18n: file ./plugins/autoreplace/autoreplaceprefs.ui line 54
-#: rc.cpp:1915
+#: rc.cpp:372
 #, fuzzy, no-c-format
 msgid "Replacement Options"
 msgstr "Dewisiada&u Uwch"
 
 #. i18n: file ./plugins/autoreplace/autoreplaceprefs.ui line 65
-#: rc.cpp:1918
+#: rc.cpp:375
 #, no-c-format
 msgid "Auto replace on incoming messages"
 msgstr ""
 
 #. i18n: file ./plugins/autoreplace/autoreplaceprefs.ui line 73
-#: rc.cpp:1921
+#: rc.cpp:378
 #, no-c-format
 msgid "Auto replace on outgoing messages"
 msgstr ""
 
 #. i18n: file ./plugins/autoreplace/autoreplaceprefs.ui line 86
-#: rc.cpp:1924
+#: rc.cpp:381
 #, no-c-format
 msgid "Replacements List"
 msgstr ""
 
-#. i18n: file ./plugins/autoreplace/autoreplaceprefs.ui line 108
-#: plugins/alias/aliaspreferences.cpp:326
-#: protocols/oscar/oscarlistnonservercontacts.cpp:33 rc.cpp:1927 rc.cpp:5177
-#, no-c-format
-msgid "&Add"
-msgstr "&Ychwanegu"
-
 #. i18n: file ./plugins/autoreplace/autoreplaceprefs.ui line 171
-#: rc.cpp:1936
+#: rc.cpp:393
 #, fuzzy, no-c-format
 msgid "Te&xt:"
 msgstr "&Testun:"
 
 #. i18n: file ./plugins/autoreplace/autoreplaceprefs.ui line 187
-#: rc.cpp:1939
+#: rc.cpp:396
 #, no-c-format
 msgid "Re&placement:"
 msgstr "Am&newidiad:"
 
-#. i18n: file ./plugins/motionautoaway/motionawayprefs.ui line 33
-#: rc.cpp:1942
+#. i18n: file ./plugins/alias/aliasdialog.ui line 16
+#: rc.cpp:399
 #, no-c-format
-msgid ""
-"<p>Motion Auto-Away can set you to be away automatically when it does not "
-"detect motion from your webcam or any video4linux device.</p> "
-"<p>It will put you online again when it detects you moving in front of the "
-"camera.</p>"
+msgid "Add New Alias"
 msgstr ""
 
-#. i18n: file ./plugins/motionautoaway/motionawayprefs.ui line 55
-#: rc.cpp:1945
-#, fuzzy, no-c-format
-msgid "Video Settings"
-msgstr "&Cadw Gosodiadau"
+#. i18n: file ./plugins/alias/aliasdialog.ui line 27
+#: rc.cpp:402
+#, no-c-format
+msgid "Command:"
+msgstr "Gorchymyn:"
 
-#. i18n: file ./plugins/motionautoaway/motionawayprefs.ui line 74
-#: rc.cpp:1948
+#. i18n: file ./plugins/alias/aliasdialog.ui line 38
+#: rc.cpp:405
 #, no-c-format
-msgid "&Video4Linux device:"
+msgid "This is the command that you want to run when you execute this alias. "
 msgstr ""
 
-#. i18n: file ./plugins/motionautoaway/motionawayprefs.ui line 102
-#: rc.cpp:1951
+#. i18n: file ./plugins/alias/aliasdialog.ui line 45
+#: rc.cpp:408
 #, no-c-format
-msgid "/dev/video0"
+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 ./plugins/motionautoaway/motionawayprefs.ui line 131
-#: rc.cpp:1954
+#. i18n: file ./plugins/alias/aliasdialog.ui line 53
+#: rc.cpp:415
 #, no-c-format
-msgid "Away Settings"
-msgstr "Gosodiadau I Ffwrdd"
+msgid "Alias:"
+msgstr "Ffugenw :"
 
-#. i18n: file ./plugins/motionautoaway/motionawayprefs.ui line 150
-#: rc.cpp:1957
+#. i18n: file ./plugins/alias/aliasdialog.ui line 64
+#: rc.cpp:418
 #, no-c-format
-msgid "Become available when &detecting activity again"
+msgid ""
+"This is the alias you are adding (what you will type after the command "
+"identifier, '/')."
 msgstr ""
 
-#. i18n: file ./plugins/motionautoaway/motionawayprefs.ui line 188
-#: rc.cpp:1960
+#. i18n: file ./plugins/alias/aliasdialog.ui line 67
+#: rc.cpp:421
 #, no-c-format
-msgid "&Become away after this many minutes of inactivity:"
+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)."
 msgstr ""
 
-#. i18n: file ./protocols/irc/ui/networkconfig.ui line 16
-#: rc.cpp:1969
-#, no-c-format
-msgid "Network Configuration"
-msgstr "Ffurfweddiad y Rhwydwaith"
-
-#. i18n: file ./protocols/irc/ui/networkconfig.ui line 40
-#: rc.cpp:1972
+#. i18n: file ./plugins/alias/aliasdialog.ui line 92
+#: rc.cpp:430 rc.cpp:448
 #, no-c-format
-msgid "&Description:"
-msgstr "&Disgrifiad:"
+msgid "Protocols"
+msgstr "Protocolau"
 
-#. i18n: file ./protocols/irc/ui/networkconfig.ui line 62
-#: rc.cpp:1975
+#. i18n: file ./plugins/alias/aliasdialog.ui line 123
+#: rc.cpp:433 rc.cpp:436
 #, no-c-format
-msgid "Host Con&figuration"
+msgid ""
+"If you want this alias to only be active for certain protocols, select those "
+"protocols here."
 msgstr ""
 
-#. i18n: file ./protocols/irc/ui/networkconfig.ui line 81
-#: rc.cpp:1978
+#. i18n: file ./plugins/alias/aliasdialog.ui line 137
+#: rc.cpp:439
 #, no-c-format
-msgid "The IRC servers associated with this network"
+msgid "For protocols:"
 msgstr ""
 
-#. i18n: file ./protocols/irc/ui/networkconfig.ui line 84
-#: rc.cpp:1981
+#. i18n: file ./plugins/alias/aliasdialogbase.ui line 22
+#: rc.cpp:442
 #, no-c-format
-msgid ""
-"The IRC servers associated with this network. Use the up and down buttons to "
-"alter the order in which connections are attempted."
-msgstr ""
+msgid "Alias"
+msgstr "Ffugenw"
 
-#. i18n: file ./protocols/irc/ui/networkconfig.ui line 95
-#: rc.cpp:1984
+#. i18n: file ./plugins/alias/aliasdialogbase.ui line 33
+#: rc.cpp:445 rc.cpp:4956
 #, no-c-format
-msgid "Most IRC servers do not require a password"
-msgstr ""
+msgid "Command"
+msgstr "Gorchymyn"
 
-#. i18n: file ./protocols/irc/ui/networkconfig.ui line 103
-#: rc.cpp:1987 rc.cpp:4646
+#. i18n: file ./plugins/alias/aliasdialogbase.ui line 69
+#: rc.cpp:451
 #, no-c-format
-msgid "Por&t:"
-msgstr "Por&th:"
+msgid ""
+"This is the list of custom aliases and the commands that you have already added"
+msgstr ""
 
-#. i18n: file ./protocols/irc/ui/networkconfig.ui line 139
-#: rc.cpp:1993
+#. i18n: file ./plugins/alias/aliasdialogbase.ui line 77
+#: rc.cpp:454
 #, no-c-format
-msgid "&Host:"
-msgstr "&Gwesteiwr:"
+msgid "&Add New Alias..."
+msgstr ""
 
-#. i18n: file ./protocols/irc/ui/networkconfig.ui line 161
-#: rc.cpp:1996
+#. i18n: file ./plugins/alias/aliasdialogbase.ui line 85
+#: rc.cpp:457
 #, no-c-format
-msgid "Use SS&L"
-msgstr "Defnyddier SS&L"
+msgid "&Delete Selected"
+msgstr ""
 
-#. i18n: file ./protocols/irc/ui/networkconfig.ui line 164
-#: rc.cpp:1999
+#. i18n: file ./plugins/alias/aliasdialogbase.ui line 93
+#: rc.cpp:460
 #, no-c-format
-msgid "Check this to enable SSL for this connection"
+msgid "Edit Alias..."
 msgstr ""
 
-#. i18n: file ./protocols/irc/ui/networkconfig.ui line 224
-#: rc.cpp:2008
+#. i18n: file ./plugins/history/historyviewer.ui line 179
+#: rc.cpp:472
 #, no-c-format
-msgid "Down"
-msgstr "I Lawr"
+msgid "Date"
+msgstr "Dyddiad"
 
-#. i18n: file ./protocols/irc/ui/networkconfig.ui line 227
-#: rc.cpp:2011
+#. i18n: file ./plugins/history/historyviewer.ui line 190
+#: rc.cpp:475 rc.cpp:965
 #, no-c-format
-msgid "Move this server down"
-msgstr ""
+msgid "Contact"
+msgstr "Cyswllt"
 
-#. i18n: file ./protocols/irc/ui/networkconfig.ui line 230
-#: rc.cpp:2014
+#. i18n: file ./plugins/history/historyviewer.ui line 275
+#: rc.cpp:478
 #, no-c-format
-msgid "Move this server down in connection attempt priority"
-msgstr ""
+msgid "Contact:"
+msgstr "Cyswllt :"
 
-#. i18n: file ./protocols/irc/ui/networkconfig.ui line 258
-#: rc.cpp:2017
-#, no-c-format
-msgid "Up"
-msgstr "I fyny"
+#. i18n: file ./plugins/history/historyviewer.ui line 296
+#: rc.cpp:481
+#, fuzzy, no-c-format
+msgid "Message Filter:"
+msgstr "Ailenwi Hidlen"
 
-#. i18n: file ./protocols/irc/ui/networkconfig.ui line 261
-#: rc.cpp:2020
+#. i18n: file ./plugins/history/historyviewer.ui line 302
+#: rc.cpp:484
+#, fuzzy, no-c-format
+msgid "All messages"
+msgstr "Negeseuon Allan"
+
+#. i18n: file ./plugins/history/historyviewer.ui line 307
+#: rc.cpp:487
 #, no-c-format
-msgid "Move this server up"
+msgid "Only incoming"
 msgstr ""
 
-#. i18n: file ./protocols/irc/ui/networkconfig.ui line 264
-#: rc.cpp:2023
+#. i18n: file ./plugins/history/historyviewer.ui line 312
+#: rc.cpp:490
 #, no-c-format
-msgid "Move this server up in connection attempt priority"
+msgid "Only outgoing"
 msgstr ""
 
-#. i18n: file ./protocols/irc/ui/networkconfig.ui line 290
-#: rc.cpp:2032
+#. i18n: file ./plugins/history/historyprefsui.ui line 17
+#: rc.cpp:493
 #, no-c-format
-msgid "Ne&w"
-msgstr "Ne&wydd"
+msgid "HistoryPrefsWidget"
+msgstr ""
 
-#. i18n: file ./protocols/irc/ui/networkconfig.ui line 328
-#: rc.cpp:2035
+#. i18n: file ./plugins/history/historyprefsui.ui line 28
+#: rc.cpp:496
 #, no-c-format
-msgid "Rena&me..."
-msgstr "Ail-&enwi..."
+msgid "Chat History"
+msgstr ""
 
-#. i18n: file ./protocols/irc/ui/networkconfig.ui line 336
-#: rc.cpp:2038
+#. i18n: file ./plugins/history/historyprefsui.ui line 39
+#: rc.cpp:499
 #, no-c-format
-msgid "Remo&ve"
-msgstr "&Gwaredu"
+msgid "Number of messages per page:"
+msgstr ""
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 50
-#: rc.cpp:2041 rc.cpp:2653 rc.cpp:3063 rc.cpp:4166 rc.cpp:5084
+#. i18n: file ./plugins/history/historyprefsui.ui line 42
+#: rc.cpp:502
 #, no-c-format
-msgid "B&asic Setup"
+msgid ""
+"The number of messages that are shown when browsing history in the chat window"
 msgstr ""
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 92
-#: rc.cpp:2044
+#. i18n: file ./plugins/history/historyprefsui.ui line 59
+#: rc.cpp:505
 #, no-c-format
 msgid ""
-"<p><b>Note:</b> Most IRC servers do not require a password, and only a nickname "
-"is required to connect</p>"
+"The number of message that are shown when borwsing history in the chat window"
 msgstr ""
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 109
-#: rc.cpp:2047 rc.cpp:2335 rc.cpp:2656 rc.cpp:3066 rc.cpp:3331 rc.cpp:4037
-#: rc.cpp:4169 rc.cpp:4500 rc.cpp:4890 rc.cpp:5087
+#. i18n: file ./plugins/history/historyprefsui.ui line 67
+#: rc.cpp:508
 #, no-c-format
-msgid "Account Information"
-msgstr "Gwybodaeth Cyfrif"
+msgid "Color of messages:"
+msgstr ""
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 120
-#: rc.cpp:2050 rc.cpp:2929
+#. i18n: file ./plugins/history/historyprefsui.ui line 73
+#: rc.cpp:511 rc.cpp:514
 #, no-c-format
-msgid "N&ickname:"
-msgstr "F&fugenw:"
+msgid "Color of history messages in the chat window"
+msgstr ""
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 126
-#: rc.cpp:2053 rc.cpp:2062
+#. i18n: file ./plugins/history/historyprefsui.ui line 108
+#: rc.cpp:517 rc.cpp:523
 #, no-c-format
-msgid "This is the name that everyone will see everytime you say something"
+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/irc/ui/irceditaccount.ui line 134
-#: rc.cpp:2056
+#. i18n: file ./plugins/history/historyprefsui.ui line 116
+#: rc.cpp:520
 #, no-c-format
-msgid "Alternate ni&ckname:"
+msgid "Number of messages to show:"
 msgstr ""
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 140
-#: rc.cpp:2059 rc.cpp:2068 rc.cpp:2071
+#. i18n: file ./plugins/history/historyprefsui.ui line 130
+#: rc.cpp:526
 #, no-c-format
-msgid ""
-"When the nickname is already in use when connecting, this name will be used "
-"instead"
+msgid "Show chat history in new chats"
 msgstr ""
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 159
-#: rc.cpp:2065
+#. i18n: file ./plugins/history/historyprefsui.ui line 136
+#: rc.cpp:529
 #, no-c-format
 msgid ""
-"The alias you would like to use on IRC.  You may change this once online with "
-"the /nick command."
+"When a new chat is opened, automatically add the last few messages between you "
+"and that contact."
 msgstr ""
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 183
-#: rc.cpp:2074
+#. i18n: file ./plugins/texteffect/texteffectprefs.ui line 35
+#: rc.cpp:538
 #, no-c-format
-msgid "&Real name:"
-msgstr "&Enw go iawn:"
+msgid "&Colors"
+msgstr "&Lliwiau"
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 194
-#: rc.cpp:2077
+#. i18n: file ./plugins/texteffect/texteffectprefs.ui line 46
+#: rc.cpp:541 rc.cpp:1461
 #, no-c-format
-msgid "&Username:"
-msgstr "&Enw Defnyddiwr:"
+msgid "Colors"
+msgstr "Lliwiau"
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 200
-#: rc.cpp:2080 rc.cpp:2083 rc.cpp:2086 rc.cpp:2092
+#. i18n: file ./plugins/texteffect/texteffectprefs.ui line 62
+#: rc.cpp:544
 #, no-c-format
-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 ""
+msgid "&Add..."
+msgstr "Ychw&anegu..."
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 241
-#: rc.cpp:2089
+#. i18n: file ./plugins/texteffect/texteffectprefs.ui line 78
+#: rc.cpp:550
 #, no-c-format
-msgid ""
-"The username you would prefer to use on IRC, if your system does not have "
-"identd support."
-msgstr ""
+msgid "Move &Up"
+msgstr "Symud i &Fyny"
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 256
-#: rc.cpp:2095 rc.cpp:4193
+#. i18n: file ./plugins/texteffect/texteffectprefs.ui line 86
+#: rc.cpp:553
 #, no-c-format
-msgid "Connection"
-msgstr "Cysylltiad"
+msgid "Move &Down"
+msgstr "Symud i &Lawr"
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 323
-#: rc.cpp:2098
+#. i18n: file ./plugins/texteffect/texteffectprefs.ui line 113
+#: rc.cpp:556
 #, no-c-format
-msgid "&Edit..."
-msgstr "&Golygu..."
+msgid "Random order"
+msgstr ""
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 350
-#: rc.cpp:2101
+#. i18n: file ./plugins/texteffect/texteffectprefs.ui line 135
+#: rc.cpp:559
 #, no-c-format
-msgid "&Network:"
-msgstr "&Rhwydwaith :"
+msgid "Change global text foreground color"
+msgstr ""
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 371
-#: rc.cpp:2104 rc.cpp:3109 rc.cpp:3370 rc.cpp:3629 rc.cpp:4082 rc.cpp:4196
-#: rc.cpp:4554
+#. i18n: file ./plugins/texteffect/texteffectprefs.ui line 143
+#: rc.cpp:562
 #, no-c-format
-msgid "Connection Preferences"
+msgid "Change color every letter"
 msgstr ""
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 382
-#: rc.cpp:2107
+#. i18n: file ./plugins/texteffect/texteffectprefs.ui line 151
+#: rc.cpp:565
 #, no-c-format
-msgid "&Prefer SSL-based connections"
+msgid "Change color every word"
 msgstr ""
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 390
-#: rc.cpp:2110 rc.cpp:2353 rc.cpp:3084 rc.cpp:3352 rc.cpp:3607 rc.cpp:4055
-#: rc.cpp:4187 rc.cpp:4518 rc.cpp:5105
+#. i18n: file ./plugins/texteffect/texteffectprefs.ui line 161
+#: rc.cpp:568
 #, no-c-format
-msgid "E&xclude from connect all"
-msgstr ""
+msgid "Effects"
+msgstr "Effeithiau"
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 393
-#: rc.cpp:2113 rc.cpp:3355 rc.cpp:3610
+#. i18n: file ./plugins/texteffect/texteffectprefs.ui line 180
+#: rc.cpp:571
 #, no-c-format
-msgid ""
-"If you check that case, the account will not be connected when you press the "
-"\"Connect All\" button, or at startup even if you selected to automatically "
-"connect at startup"
+msgid "L4m3r t4lk"
 msgstr ""
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 409
-#: rc.cpp:2116
+#. i18n: file ./plugins/texteffect/texteffectprefs.ui line 196
+#: rc.cpp:574
 #, no-c-format
-msgid "Default &charset:"
+msgid "CasE wAVes"
 msgstr ""
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 446
-#: rc.cpp:2119
+#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 33
+#: rc.cpp:580
 #, no-c-format
-msgid "Default Messages"
-msgstr ""
+msgid "Uploading"
+msgstr "Llwytho"
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 457
-#: rc.cpp:2122
+#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 56
+#: rc.cpp:583
+#, fuzzy, no-c-format
+msgid "Uplo&ad to:"
+msgstr "Llwytho"
+
+#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 91
+#: rc.cpp:586
 #, no-c-format
-msgid "&Part message:"
+msgid "Formatting"
 msgstr ""
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 468
-#: rc.cpp:2125
+#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 108
+#: rc.cpp:589
 #, no-c-format
-msgid "&Quit message:"
+msgid "HTML (simple loo&k)"
 msgstr ""
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 479
-#: rc.cpp:2128 rc.cpp:2131
+#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 114
+#: rc.cpp:592
 #, no-c-format
 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."
+"HTML 4.01 Transitional using the ISO-8859-1 (aka. Latin 1) character set "
+"encoding."
 msgstr ""
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 490
-#: rc.cpp:2134 rc.cpp:2137
+#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 119
+#: rc.cpp:595
 #, no-c-format
 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."
+"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/irc/ui/irceditaccount.ui line 522
-#: rc.cpp:2140
+#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 127
+#: rc.cpp:600
 #, no-c-format
-msgid "A&dvanced Configuration"
-msgstr "F&furfweddiad Uwch"
+msgid "XHTML (simple look)"
+msgstr ""
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 533
-#: rc.cpp:2143
+#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 130
+#: rc.cpp:603
 #, no-c-format
-msgid "Message Destinations"
+msgid "XHTML 1.0 Strict"
 msgstr ""
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 544
-#: rc.cpp:2146
+#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 135
+#: rc.cpp:606
 #, no-c-format
-msgid "Auto-show anonymous windows"
+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."
 msgstr ""
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 552
-#: rc.cpp:2149
+#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 143
+#: rc.cpp:611
 #, no-c-format
-msgid "Auto-show the server window"
+msgid "&XML"
+msgstr "&XML"
+
+#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 146
+#: rc.cpp:614
+#, no-c-format
+msgid "Save the output in XML format using UTF-8 character set."
 msgstr ""
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 568
-#: rc.cpp:2152
+#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 149
+#: rc.cpp:617
 #, no-c-format
-msgid "Server messages:"
+msgid "Save the output in XML format using the UTF-8 encoding."
 msgstr ""
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 576
-#: rc.cpp:2155
+#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 157
+#: rc.cpp:620
 #, no-c-format
-msgid "Server notices:"
+msgid "XML transformation &using this XSLT sheet:"
 msgstr ""
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 582
-#: rc.cpp:2158 rc.cpp:2173 rc.cpp:2191 rc.cpp:2209
+#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 200
+#: rc.cpp:623
 #, no-c-format
-msgid "Active Window"
-msgstr "Ffenestr Weithredol"
+msgid "Repla&ce protocol text with images in (X)HTML"
+msgstr ""
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 587
-#: rc.cpp:2161 rc.cpp:2176 rc.cpp:2194 rc.cpp:2212
+#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 203
+#: rc.cpp:626
 #, no-c-format
-msgid "Server Window"
+msgid "Replaces the protocol names, such as IRC with images."
 msgstr ""
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 592
-#: rc.cpp:2164 rc.cpp:2179 rc.cpp:2197 rc.cpp:2215
+#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 219
+#: rc.cpp:629
 #, no-c-format
-msgid "Anonymous Window"
+msgid ""
+"Replaces the protocol names, such as 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/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/irc/ui/irceditaccount.ui line 597
-#: rc.cpp:2167 rc.cpp:2182 rc.cpp:2200 rc.cpp:2218
+#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 229
+#: rc.cpp:645
 #, no-c-format
-msgid "KNotify"
-msgstr "KHysbysu"
+msgid "Display Name"
+msgstr "Enw Dangos"
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 660
-#: rc.cpp:2188
+#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 246
+#: rc.cpp:648
 #, no-c-format
-msgid "Error messages:"
+msgid "Use one of &your IM names"
 msgstr ""
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 698
-#: rc.cpp:2206
+#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 257
+#: rc.cpp:651
 #, no-c-format
-msgid "Information replies:"
+msgid "Use another &name:"
 msgstr ""
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 754
-#: rc.cpp:2224
+#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 300
+#: rc.cpp:654
 #, no-c-format
-msgid "Custom CTCP Replies"
+msgid "Include &IM addresses"
 msgstr ""
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 763
-#: rc.cpp:2227
+#. i18n: file ./kopete/chatwindow/kopeteemailwindow.rc line 5
+#: rc.cpp:657 rc.cpp:672 rc.cpp:2026 rc.cpp:2632 rc.cpp:3741
 #, no-c-format
-msgid "CTCP"
-msgstr ""
+msgid "&Chat"
+msgstr "&Sgwrsio"
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 807
-#: rc.cpp:2233
+#. i18n: file ./kopete/chatwindow/kopeteemailwindow.rc line 14
+#: rc.cpp:660 rc.cpp:675
 #, no-c-format
-msgid ""
-"You can use this dialog to add custom replies for when people send CTCP "
-"requests to you. You can also use this dialog to override the built-in replies "
-"for VERSION, USERINFO, and CLIENTINFO."
-msgstr ""
+msgid "&Format"
+msgstr "&Fformat"
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 823
-#: rc.cpp:2236
+#. i18n: file ./kopete/chatwindow/kopeteemailwindow.rc line 41
+#: rc.cpp:669 rc.cpp:690 rc.cpp:4053 rc.cpp:4218 rc.cpp:4257
 #, no-c-format
-msgid "&CTCP:"
-msgstr ""
+msgid "Status"
+msgstr "Cyflwr"
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 839
-#: rc.cpp:2239
+#. i18n: file ./kopete/chatwindow/kopetechatwindow.rc line 23
+#: rc.cpp:678
 #, no-c-format
-msgid "&Reply:"
-msgstr "&Ymateb :"
+msgid "&Tabs"
+msgstr ""
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 855
-#: rc.cpp:2242
+#. i18n: file ./kopete/chatwindow/kopetechatwindow.rc line 35
+#: rc.cpp:684
 #, no-c-format
-msgid "Add Repl&y"
+msgid "&Chat Members List"
 msgstr ""
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 881
-#: rc.cpp:2245
+#. i18n: file ./kopete/chatwindow/kopetechatwindow.rc line 60
+#: rc.cpp:693 rc.cpp:705
 #, no-c-format
-msgid "Run Following Commands on Connect"
+msgid "Format Toolbar"
 msgstr ""
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 913
-#: rc.cpp:2248
+#. i18n: file ./kopete/chatwindow/kopeterichtexteditpartfull.rc line 4
+#: rc.cpp:696
 #, no-c-format
-msgid "Add Co&mmand"
-msgstr "Ychwan&egu Gorchymyn"
+msgid "F&ormat"
+msgstr "&Fformat"
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 954
-#: rc.cpp:2254 rc.cpp:2257
+#. i18n: file ./kopete/chatwindow/kopeterichtexteditpartfull.rc line 11
+#: rc.cpp:699
 #, no-c-format
-msgid ""
-"Any commands added here will be run as soon as you are connected to the IRC "
-"server."
-msgstr ""
+msgid "&Alignment"
+msgstr "&Aliniad"
 
-#. i18n: file ./protocols/irc/ui/ircadd.ui line 59
-#: rc.cpp:2263
+#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 16
+#: rc.cpp:708
 #, no-c-format
-msgid "N&ickname/channel to add:"
+msgid "Contact Addition Wizard"
 msgstr ""
 
-#. i18n: file ./protocols/irc/ui/ircadd.ui line 65
-#: rc.cpp:2266 rc.cpp:2272
+#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 23
+#: rc.cpp:711
 #, no-c-format
-msgid "The name of the IRC contact or channel you would like to add."
-msgstr ""
+msgid "Introduction"
+msgstr "Cyflwyniad"
 
-#. i18n: file ./protocols/irc/ui/ircadd.ui line 68
-#: rc.cpp:2269
+#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 44
+#: rc.cpp:714
 #, no-c-format
 msgid ""
-"The name of the IRC contact or channel you would like to add.  You may type "
-"simply the text of a person's nickname, or you may type a channel name, "
-"preceded by a pound sign ('#')."
+"<h2>Welcome to the Add Contact Wizard</h2>\n"
+"\n"
+"<p>This wizard will guide you through the process of adding a new contact to "
+"Kopete.</p>"
 msgstr ""
 
-#. i18n: file ./protocols/irc/ui/ircadd.ui line 79
-#: rc.cpp:2275
+#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 56
+#: rc.cpp:719
 #, no-c-format
 msgid ""
-"The name of the IRC contact or channel you would like to add.  You may type "
-"simply the text of a person's nickname, or you may type a channel name, "
-"preceded by a pound sign ('#')"
+"<p>Kopete shares contact information with the TDE Addressbook.  This gives you "
+"seamless integration between instant messaging, e-mail and other personal "
+"information management applications.</p>\n"
+"<p>If you prefer not to store instant messaging information in the TDE "
+"Addressbook, uncheck the box below.</p>"
 msgstr ""
 
-#. i18n: file ./protocols/irc/ui/ircadd.ui line 89
-#: rc.cpp:2278
+#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 64
+#: rc.cpp:723
 #, no-c-format
-msgid "<i>(for example: joe_bob or #somechannel)</i>"
+msgid "<p>Press the \"Next\" button to begin.</p>"
 msgstr ""
 
-#. i18n: file ./protocols/irc/ui/ircadd.ui line 119
-#: rc.cpp:2281
+#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 123
+#: rc.cpp:726
 #, no-c-format
-msgid "&Search Channels"
+msgid "&Use the TDE address book for this contact"
 msgstr ""
 
-#. i18n: file ./protocols/irc/ircchatui.rc line 5
-#: protocols/yahoo/yahooprotocol.cpp:79 rc.cpp:2284
-#, no-c-format
-msgid "IRC"
-msgstr "IRC"
-
-#. i18n: file ./protocols/msn/ui/msndebugrawcommand_base.ui line 30
-#: rc.cpp:2287
-#, no-c-format
-msgid "&Parameters:"
-msgstr "&Paramedrau:"
-
-#. i18n: file ./protocols/msn/ui/msndebugrawcommand_base.ui line 46
-#: rc.cpp:2290
-#, no-c-format
-msgid "Co&mmand:"
-msgstr "Gorchy&myn:"
-
-#. i18n: file ./protocols/msn/ui/msndebugrawcommand_base.ui line 62
-#: rc.cpp:2293
+#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 129
+#: rc.cpp:729
 #, no-c-format
-msgid "Add &ID"
+msgid ""
+"Check this box if you do not want to integrate other TDE applications with "
+"Kopete"
 msgstr ""
 
-#. i18n: file ./protocols/msn/ui/msndebugrawcommand_base.ui line 73
-#: rc.cpp:2296
+#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 156
+#: rc.cpp:732
 #, no-c-format
-msgid "Add &new line"
+msgid "Select Address Book Entry"
 msgstr ""
 
-#. i18n: file ./protocols/msn/ui/msndebugrawcommand_base.ui line 92
-#: rc.cpp:2299
-#, no-c-format
-msgid "Message:"
-msgstr "Neges:"
-
-#. i18n: file ./protocols/msn/ui/msnadd.ui line 38
-#: rc.cpp:2302 rc.cpp:2338
-#, no-c-format
-msgid "&MSN Passport ID:"
-msgstr ""
+#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 169
+#: rc.cpp:735
+#, fuzzy, no-c-format
+msgid "Select Display Name & Group"
+msgstr "Enw Dangos"
 
-#. i18n: file ./protocols/msn/ui/msnadd.ui line 47
-#: rc.cpp:2305 rc.cpp:2311
+#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 180
+#: rc.cpp:738
 #, no-c-format
-msgid "The user ID of the MSN contact you would like to add."
+msgid "<qt><p><h2>Select Display Name and Group</h2></p></qt>"
 msgstr ""
 
-#. i18n: file ./protocols/msn/ui/msnadd.ui line 50
-#: rc.cpp:2308 rc.cpp:2314
+#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 194
+#: rc.cpp:741
 #, no-c-format
 msgid ""
-"The user ID of the MSN contact you would like to add.  This should be in the "
-"form of a valid E-mail address."
+"Enter the contact's displa&y name.  This is how the contact will appear in "
+"Kopete:"
 msgstr ""
 
-#. i18n: file ./protocols/msn/ui/msnadd.ui line 71
-#: rc.cpp:2317
+#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 205
+#: rc.cpp:744
 #, no-c-format
-msgid "<i>(for example: joe@hotmail.com)</i>"
+msgid "Leave this blank to use any display name set by the contact"
 msgstr ""
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 17
-#: rc.cpp:2320
+#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 244
+#: rc.cpp:747
 #, no-c-format
-msgid "Account Preferences - MSN"
+msgid "Select the contact list &group(s) that this contact should belong to :"
 msgstr ""
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 41
-#: rc.cpp:2323 rc.cpp:3328 rc.cpp:3586 rc.cpp:4034 rc.cpp:4497
-#, fuzzy, no-c-format
-msgid "&Basic Setup"
-msgstr "&Sylfaenol"
+#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 256
+#: rc.cpp:750
+#, no-c-format
+msgid "Groups"
+msgstr "Grwpiau"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 77
-#: rc.cpp:2326 rc.cpp:3090 rc.cpp:3358 rc.cpp:3616 rc.cpp:4064 rc.cpp:4527
+#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 272
+#: rc.cpp:753
 #, no-c-format
-msgid "Registration"
+msgid "A contact may be present in more than one group"
 msgstr ""
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 102
-#: rc.cpp:2329
+#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 280
+#: rc.cpp:756
 #, no-c-format
-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."
+msgid "Create New G&roup..."
 msgstr ""
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 113
-#: rc.cpp:2332 rc.cpp:3097 rc.cpp:3364 rc.cpp:3623 rc.cpp:4533
+#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 283
+#: rc.cpp:759
 #, no-c-format
-msgid "Re&gister New Account"
+msgid "Click here to create a new group"
 msgstr ""
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 156
-#: rc.cpp:2341 rc.cpp:2347
+#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 310
+#: rc.cpp:762 rc.cpp:805
 #, no-c-format
-msgid "The user ID of the MSN contact you would like to use."
+msgid "Select Instant Messaging Accounts"
 msgstr ""
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 159
-#: rc.cpp:2344 rc.cpp:2350
+#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 321
+#: rc.cpp:765
 #, no-c-format
-msgid ""
-"The user ID of the MSN contact you would like to use.  This should be in the "
-"form of a valid E-mail address."
+msgid "<p><h2>Select Instant Messaging Accounts</h2></p>"
 msgstr ""
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 194
-#: rc.cpp:2356
+#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 332
+#: rc.cpp:768
 #, no-c-format
 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."
+"Select the &account(s) you would like to use for this contact from the list "
+"below."
 msgstr ""
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 202
-#: rc.cpp:2359 rc.cpp:3349 rc.cpp:3613 rc.cpp:4524
+#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 343
+#: rc.cpp:771
 #, no-c-format
-msgid "Exclu&de from Global Identity"
+msgid ""
+"<p><i>Note</i>: If a messaging service is missing from the list, please make "
+"sure you have created an account for it in Kopete, and that it ready to add new "
+"contacts.</p>"
 msgstr ""
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 214
-#: rc.cpp:2362
-#, fuzzy, no-c-format
-msgid "MSN &Settings"
-msgstr "&Cadw Gosodiadau"
-
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 230
-#: rc.cpp:2365
+#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 360
+#: rc.cpp:777 rc.cpp:814 rc.cpp:1717
 #, no-c-format
-msgid "<qt><b>Note:</b> These settings are applicable to all MSN accounts"
-msgstr ""
+msgid "Protocol"
+msgstr "Protocol"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 241
-#: rc.cpp:2368
+#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 379
+#: rc.cpp:780 rc.cpp:817
 #, no-c-format
-msgid "Global MSN Options"
+msgid ""
+"Select the Instant Messaging systems to message the contact.  If they use more "
+"than one IM system, select them all here"
 msgstr ""
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 260
-#: rc.cpp:2371
+#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 399
+#: rc.cpp:783 rc.cpp:789
 #, no-c-format
-msgid "Au&tomatically open a chat window when someone starts a conversation"
+msgid ""
+"How do you want to message the contact?  If they use more than one Instant "
+"Messaging system, select them all here"
 msgstr ""
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 263
-#: rc.cpp:2374
+#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 407
+#: rc.cpp:786
 #, no-c-format
-msgid ""
-"This option will notify you when a contact starts typing their message, before "
-"the message is sent or finished."
+msgid "You can always add more ways to message this contact later."
 msgstr ""
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 279
-#: rc.cpp:2377
+#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 420
+#: rc.cpp:792 rc.cpp:1753 rc.cpp:1782
 #, no-c-format
-msgid "Download the msn picture:"
-msgstr ""
+msgid "Finished"
+msgstr "Wedi Gorffen"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 285
-#: rc.cpp:2380
+#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 443
+#: rc.cpp:795
 #, no-c-format
 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>"
+"<p>"
+"<h2>Congratulations</h2></p>\n"
+"\n"
+"<p>You have finished configuring a contact. Please click Finish and your "
+"contact will be added to your contact list.</p>\n"
+"\n"
+"<p><i>Note</i>: If adding this contact requires authorization from one or more "
+"of the messaging services, Kopete may prompt you for further information after "
+"this screen.</p>"
 msgstr ""
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 291
-#: rc.cpp:2386
+#. i18n: file ./kopete/addcontactwizard/fastaddcontactwizard_base.ui line 16
+#: rc.cpp:802
 #, no-c-format
-msgid "Only Manually"
+msgid "Fast Contact Addition Wizard"
 msgstr ""
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 296
-#: rc.cpp:2389
+#. i18n: file ./kopete/addcontactwizard/fastaddcontactwizard_base.ui line 80
+#: rc.cpp:808
 #, no-c-format
-msgid "When a Chat is Open"
+msgid "<p><h2>Select IM Accounts</h2></p>"
 msgstr ""
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 301
-#: rc.cpp:2392
-#, fuzzy, no-c-format
-msgid "Automatically"
-msgstr "Awtomatig"
+#. i18n: file ./kopete/addcontactwizard/fastaddcontactwizard_base.ui line 125
+#: rc.cpp:820
+#, no-c-format
+msgid "Done"
+msgstr "Wedi gorffen"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 322
-#: rc.cpp:2395
+#. i18n: file ./kopete/addcontactwizard/fastaddcontactwizard_base.ui line 183
+#: rc.cpp:823
 #, no-c-format
 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>"
+"<p>"
+"<h2>Contact added.</h2></p>\n"
+"<p>That was <i>fast.</i></p>"
 msgstr ""
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 332
-#: rc.cpp:2401
+#. i18n: file ./kopete/contactlist/kopetegvipropswidget.ui line 50
+#: rc.cpp:830 rc.cpp:3882
 #, no-c-format
-msgid "&Download and show custom emoticons"
-msgstr ""
+msgid "&Name:"
+msgstr "&Enw:"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 338
-#: rc.cpp:2404
+#. i18n: file ./kopete/contactlist/kopetegvipropswidget.ui line 68
+#: rc.cpp:833 rc.cpp:902
 #, no-c-format
-msgid ""
-"MSN Messenger allows users to download and use custom emoticons. If this option "
-"is enabled, Kopete will download these emoticons and show them."
-msgstr ""
+msgid "Icons"
+msgstr "Eiconau"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 346
-#: rc.cpp:2407
+#. i18n: file ./kopete/contactlist/kopetegvipropswidget.ui line 87
+#: rc.cpp:836
 #, no-c-format
-msgid "E&xport the current emoticon theme to users"
+msgid "O&pen:"
 msgstr ""
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 349
-#: rc.cpp:2410
+#. i18n: file ./kopete/contactlist/kopetegvipropswidget.ui line 98
+#: rc.cpp:839
 #, no-c-format
-msgid "Only work with emoticons in the PNG format"
+msgid "C&losed:"
 msgstr ""
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 353
-#: rc.cpp:2413
+#. i18n: file ./kopete/contactlist/kopetegvipropswidget.ui line 117
+#: rc.cpp:842
 #, no-c-format
-msgid ""
-"Export all the emoticon themes as custom emoticons.\n"
-"Only works for emoticons in the PNG format."
-msgstr ""
+msgid "Use custom &icons"
+msgstr "Defnyddio &eiconau addasiedig"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 363
-#: rc.cpp:2417
-#, no-c-format
-msgid "Privacy"
-msgstr "Preifatwydd"
+#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 50
+#: rc.cpp:848
+#, fuzzy, no-c-format
+msgid "Address Book Link"
+msgstr "&Cyfeiriad ebost:"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 377
-#: rc.cpp:2420
+#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 77
+#: rc.cpp:851
 #, fuzzy, no-c-format
-msgid "Send client information"
-msgstr "Gwybodaeth Cyffredinol"
+msgid "E&xport Details..."
+msgstr "Manyl&ion..."
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 386
-#: rc.cpp:2423
-#, no-c-format
-msgid ""
-"<qt>Make it possible for your contacts to detect if you are using Kopete."
-"<br>We recommend leaving this checked.</qt>"
-msgstr ""
+#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 80
+#: rc.cpp:854
+#, fuzzy, no-c-format
+msgid "Export contact's details to the TDE Address Book"
+msgstr "Cysylltau"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 389
-#: rc.cpp:2426
-#, no-c-format
-msgid ""
-"Third party MSN clients, such as Kopete, give users the ability to let other "
-"third party clients guess which client they are using. We recommend leaving "
-"this checkbox checked."
-msgstr ""
+#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 108
+#: rc.cpp:857
+#, fuzzy, no-c-format
+msgid "&Import Contacts"
+msgstr "Cysylltau"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 400
-#: rc.cpp:2429
+#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 111
+#: rc.cpp:860
 #, fuzzy, no-c-format
-msgid "Send &typing notifications"
-msgstr "Hysbysiad"
+msgid "Import contacts from the TDE Address Book"
+msgstr "Cysylltau"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 406
-#: rc.cpp:2432
+#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 123
+#: rc.cpp:863
+#, fuzzy, no-c-format
+msgid "Display Name Source"
+msgstr "Enw Dangos"
+
+#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 134
+#: rc.cpp:866
 #, no-c-format
-msgid ""
-"<qt>Check this box to send <b>Typing notifications</b> "
-"to your contacts. When you are composing a message, you might want your contact "
-"to know that you are typing so that he knows you are answering.</qt>"
+msgid "Use addressbook &name (needs addressbook link)"
 msgstr ""
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 422
-#: rc.cpp:2435
+#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 150
+#: rc.cpp:869 rc.cpp:887
+#, fuzzy, no-c-format
+msgid "From contact:"
+msgstr "Cyswllt"
+
+#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 183
+#: rc.cpp:872 rc.cpp:890 rc.cpp:1659
 #, no-c-format
-msgid "Expose my Jabber account to Jabber users"
+msgid "Contact to synchronize the displayname with."
 msgstr ""
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 428
-#: rc.cpp:2438 rc.cpp:2441
+#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 201
+#: rc.cpp:875 rc.cpp:1668
 #, no-c-format
-msgid ""
-"If you have a Jabber account, you may let Jabber users on an MSN gateway know "
-"that you are also using Jabber."
-msgstr ""
+msgid "Cus&tom:"
+msgstr "Adda&siedig :"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 483
-#: rc.cpp:2444
+#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 235
+#: rc.cpp:878
 #, no-c-format
-msgid "There are also privacy options in the \"Contacts\" tab"
+msgid "Photo Source"
 msgstr ""
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 548
-#: rc.cpp:2450 rc.cpp:3526 rc.cpp:3740 rc.cpp:3869
+#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 264
+#: libkopete/kopeteglobal.cpp:190 rc.cpp:881 rc.cpp:2839 rc.cpp:4974
 #, no-c-format
-msgid "&Nickname:"
-msgstr "Ffuge&nw:"
+msgid "Photo"
+msgstr "Ffoto"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 554
-#: rc.cpp:2453 rc.cpp:2456
+#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 275
+#: rc.cpp:884
 #, no-c-format
-msgid ""
-"The alias you would like to use on MSN.  You may change this at any time you "
-"wish."
+msgid "U&se addressbook photo (needs addressbook link)"
 msgstr ""
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 575
-#: rc.cpp:2459
+#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 342
+#: rc.cpp:893
 #, no-c-format
-msgid "Phone Numbers"
-msgstr "Rhifau ffôn"
+msgid "Custom:"
+msgstr "Addasiedig:"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 586
-#: rc.cpp:2462
+#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 398
+#: rc.cpp:896
 #, no-c-format
-msgid "Hom&e:"
-msgstr "Car&tref :"
+msgid "S&ync photo to addressbook"
+msgstr ""
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 597
-#: rc.cpp:2465
+#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 408
+#: rc.cpp:899 rc.cpp:3978
 #, no-c-format
-msgid "&Work:"
-msgstr "&Gwaith :"
+msgid "Ad&vanced"
+msgstr "&Uwch"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 618
-#: rc.cpp:2468
+#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 430
+#: rc.cpp:905
 #, no-c-format
-msgid "&Mobile:"
-msgstr ""
+msgid "Awa&y:"
+msgstr "I f&fwrdd :"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 636
-#: rc.cpp:2471
+#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 441
+#: rc.cpp:908
 #, no-c-format
-msgid "Display Picture"
-msgstr ""
+msgid "&Online:"
+msgstr "&Ar-lein :"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 655
-#: rc.cpp:2474
+#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 452
+#: rc.cpp:911
+#, fuzzy, no-c-format
+msgid "Use custom status &icons"
+msgstr "Defnyddio &eiconau addasiedig"
+
+#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 455
+#: rc.cpp:914
 #, no-c-format
-msgid "E&xport a display picture"
+msgid "Check to set custom icons for this contact"
 msgstr ""
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 674
-#: rc.cpp:2477
+#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 495
+#: rc.cpp:917
 #, no-c-format
-msgid "Please select a square image. The image will be scaled to 96x96."
-msgstr ""
+msgid "O&ffline:"
+msgstr "A&ll-lein :"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 696
-#: rc.cpp:2480
+#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 506
+#: rc.cpp:920
 #, no-c-format
-msgid "&Select Image..."
+msgid "Un&known:"
 msgstr ""
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 837
-#: rc.cpp:2483
+#. i18n: file ./kopete/contactlist/kopeteaddrbookexportui.ui line 16
+#: rc.cpp:923
 #, no-c-format
-msgid "WARNING: You need to be connected to modify this page."
+msgid "Merge with Address Book"
 msgstr ""
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 850
-#: rc.cpp:2486
+#. i18n: file ./kopete/contactlist/kopeteaddrbookexportui.ui line 27
+#: rc.cpp:926 rc.cpp:2125 rc.cpp:4143
 #, no-c-format
-msgid "Con&tacts"
-msgstr "Cys&ylltau"
+msgid "First name:"
+msgstr "Enw cyntaf:"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 863
-#: rc.cpp:2489
+#. i18n: file ./kopete/contactlist/kopeteaddrbookexportui.ui line 38
+#: rc.cpp:929
 #, no-c-format
-msgid ""
-"<i>Italics</i> contacts are not on your contact list."
-"<br>\n"
-"<br>\n"
-"<b>Bold</b> contacts are in your contact list but you are not in their contact "
-"list."
-msgstr ""
+msgid "Home phone:"
+msgstr "Ffôn cartref :"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 879
-#: rc.cpp:2494
+#. i18n: file ./kopete/contactlist/kopeteaddrbookexportui.ui line 73
+#: rc.cpp:932
 #, no-c-format
-msgid "Bloc&ked contacts:"
+msgid "Work phone:"
 msgstr ""
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 903
-#: rc.cpp:2497
+#. i18n: file ./kopete/contactlist/kopeteaddrbookexportui.ui line 84
+#: rc.cpp:935
 #, no-c-format
-msgid "&>"
-msgstr "&>"
+msgid "Mobile phone:"
+msgstr "Ffôn Symudol :"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 911
-#: rc.cpp:2500
+#. i18n: file ./kopete/contactlist/kopeteaddrbookexportui.ui line 95
+#: rc.cpp:938
 #, no-c-format
-msgid "&<"
-msgstr "&<"
+msgid "URL:"
+msgstr "URL:"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 938
-#: rc.cpp:2503
+#. i18n: file ./kopete/contactlist/kopeteaddrbookexportui.ui line 121
+#: rc.cpp:941 rc.cpp:2131 rc.cpp:4152
 #, no-c-format
-msgid "Allo&wed contacts:"
-msgstr ""
+msgid "Last name:"
+msgstr "Enw olaf:"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 981
-#: rc.cpp:2506
+#. i18n: file ./kopete/contactlist/kopeteaddrbookexportui.ui line 140
+#: rc.cpp:944 rc.cpp:2866 rc.cpp:2878
 #, no-c-format
-msgid "Block all users not in 'Allowed' &list"
-msgstr ""
+msgid "Email:"
+msgstr "Ebost:"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 984
-#: rc.cpp:2509
-#, no-c-format
-msgid ""
-"Checking this box will block all users not explicitly shown in the allowed list "
-"here, including any contacts not on your contact list."
-msgstr ""
+#. i18n: file ./kopete/contactlist/tdeabcexport_base.ui line 16
+#: rc.cpp:947
+#, fuzzy, no-c-format
+msgid "Export Contacts"
+msgstr "Cysylltau"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 1042
-#: rc.cpp:2512
-#, no-c-format
-msgid "View &Reverse List"
-msgstr ""
+#. i18n: file ./kopete/contactlist/tdeabcexport_base.ui line 23
+#: rc.cpp:950
+#, fuzzy, no-c-format
+msgid "Export Contacts to Address Book"
+msgstr "Cysylltau"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 1045
-#: rc.cpp:2515 rc.cpp:2518
+#. i18n: file ./kopete/contactlist/tdeabcexport_base.ui line 42
+#: rc.cpp:953
 #, no-c-format
 msgid ""
-"The reverse list is the list of contacts who added you to their own contact "
-"list."
+"This wizard helps you export instant messaging contacts to the TDE address "
+"book."
 msgstr ""
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 1087
-#: rc.cpp:2521
+#. i18n: file ./kopete/contactlist/tdeabcexport_base.ui line 61
+#: rc.cpp:956
+#, fuzzy, no-c-format
+msgid "&Select Address Book"
+msgstr "&Cyfeiriad ebost:"
+
+#. i18n: file ./kopete/contactlist/tdeabcexport_base.ui line 92
+#: rc.cpp:959
+#, fuzzy, no-c-format
+msgid "Select Contacts to Export"
+msgstr "&Dileu y Cyswllt"
+
+#. i18n: file ./kopete/contactlist/tdeabcexport_base.ui line 111
+#: rc.cpp:962
 #, no-c-format
-msgid "WARNING: You need to be connected to modify this page"
+msgid "Selected contacts will be added to the TDE address book."
 msgstr ""
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 1100
-#: rc.cpp:2524 rc.cpp:4551
+#. i18n: file ./kopete/contactlist/tdeabcexport_base.ui line 149
+#: rc.cpp:968
 #, no-c-format
-msgid "Co&nnection"
-msgstr "Cy&sylltiad"
+msgid "Select &All"
+msgstr "Dewis Pope&th"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 1111
-#: rc.cpp:2527
+#. i18n: file ./kopete/contactlist/tdeabcexport_base.ui line 157
+#: rc.cpp:971
 #, no-c-format
-msgid "Connection Preferences (for advanced users)"
-msgstr ""
+msgid "&Deselect All"
+msgstr "Da&tddewis Popeth"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 1122
-#: rc.cpp:2530 rc.cpp:3373 rc.cpp:3665 rc.cpp:4569
+#. i18n: file ./kopete/contactlist/customnotifications.ui line 32
+#: rc.cpp:974
 #, no-c-format
-msgid "&Override default server information"
+msgid "On &event:"
 msgstr ""
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 1152
-#: rc.cpp:2533 rc.cpp:3656
+#. i18n: file ./kopete/contactlist/customnotifications.ui line 43
+#: rc.cpp:977
 #, no-c-format
-msgid "Ser&ver /"
+msgid "Choose the event that should have a custom notification"
 msgstr ""
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 1166
-#: rc.cpp:2536 rc.cpp:3208
+#. i18n: file ./kopete/contactlist/customnotifications.ui line 64
+#: rc.cpp:980
 #, no-c-format
-msgid "po&rt:"
-msgstr "po&rth:"
+msgid "Select the sound to play"
+msgstr ""
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 1190
-#: rc.cpp:2539
+#. i18n: file ./kopete/contactlist/customnotifications.ui line 72
+#: rc.cpp:983
 #, no-c-format
-msgid "messenger.hotmail.com"
-msgstr ""
+msgid "&Play a sound:"
+msgstr "&Chwarae sŵn :"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 1193
-#: rc.cpp:2542 rc.cpp:2545 rc.cpp:2548 rc.cpp:2551
+#. i18n: file ./kopete/contactlist/customnotifications.ui line 75
+#: rc.cpp:986
 #, no-c-format
-msgid ""
-"Only modify these values if you want to use a special IM proxy server, like "
-"SIMP"
+msgid "Play a sound when this event occurs for this contact"
 msgstr ""
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 1229
-#: rc.cpp:2554
+#. i18n: file ./kopete/contactlist/customnotifications.ui line 100
+#: rc.cpp:989
 #, no-c-format
-msgid "Use &HTTP method"
+msgid "Start a cha&t"
 msgstr ""
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 1234
-#: rc.cpp:2557
+#. i18n: file ./kopete/contactlist/customnotifications.ui line 103
+#: rc.cpp:992
 #, no-c-format
 msgid ""
-"Connect to MSN Messenger using an HTTP-like protocol on port 80.\n"
-"This may be used to connect on a network with a restrictive firewall.\n"
-"Only check this option if the normal connection doesn't work."
+"Open a chat window with this contact when this event occurs for this contact"
 msgstr ""
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 1250
-#: rc.cpp:2562
+#. i18n: file ./kopete/contactlist/customnotifications.ui line 111
+#: rc.cpp:995
 #, no-c-format
-msgid "S&pecify a base port for incoming webcam connections:"
+msgid "&Display a message:"
 msgstr ""
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 1253
-#: rc.cpp:2565 rc.cpp:2568
+#. i18n: file ./kopete/contactlist/customnotifications.ui line 114
+#: rc.cpp:998
 #, no-c-format
 msgid ""
-"If you are behind a firewall, you may specify a base port to use for the "
-"incoming connection, and configure your firewall to accept connections on a "
-"range of 10 ports, starting at this one. Incoming connections are used for the "
-"webcam. If you don't specify a port yourself, the operating system will choose "
-"an available port for you. It is recommended to leave the checkbox unchecked."
+"Display a message on your screen when this event occurs for this contact"
 msgstr ""
 
-#. i18n: file ./protocols/msn/ui/msninfo.ui line 46
-#: rc.cpp:2571
+#. i18n: file ./kopete/contactlist/customnotifications.ui line 125
+#: rc.cpp:1001
 #, no-c-format
-msgid "Email address:"
-msgstr "Cyfeiriad Ebost:"
+msgid "Enter the message to display"
+msgstr ""
 
-#. i18n: file ./protocols/msn/ui/msninfo.ui line 112
-#: rc.cpp:2577
-#, fuzzy, no-c-format
-msgid "Personal message:"
-msgstr "Neges:"
+#. i18n: file ./kopete/contactlist/customnotifications.ui line 136
+#: rc.cpp:1004
+#, no-c-format
+msgid "D&isplay once"
+msgstr ""
 
-#. i18n: file ./protocols/msn/ui/msninfo.ui line 130
-#: rc.cpp:2580
+#. i18n: file ./kopete/contactlist/customnotifications.ui line 139
+#: rc.cpp:1007
 #, no-c-format
-msgid "Phones"
+msgid "Only display a message the next time the event occurs"
 msgstr ""
 
-#. i18n: file ./protocols/msn/ui/msninfo.ui line 141
-#: rc.cpp:2583 rc.cpp:4437
+#. i18n: file ./kopete/contactlist/customnotifications.ui line 150
+#: rc.cpp:1010
 #, no-c-format
-msgid "Home:"
-msgstr "Cartref :"
+msgid "P&lay once"
+msgstr ""
 
-#. i18n: file ./protocols/msn/ui/msninfo.ui line 149
-#: rc.cpp:2586 rc.cpp:4434
+#. i18n: file ./kopete/contactlist/customnotifications.ui line 153
+#: rc.cpp:1013
 #, no-c-format
-msgid "Work:"
-msgstr "Gwaith :"
+msgid "Only play a sound the next time the event occurs"
+msgstr ""
 
-#. i18n: file ./protocols/msn/ui/msninfo.ui line 173
-#: rc.cpp:2589
+#. i18n: file ./kopete/contactlist/customnotifications.ui line 164
+#: rc.cpp:1016
 #, no-c-format
-msgid "Mobile:"
+msgid "T&rigger once"
 msgstr ""
 
-#. i18n: file ./protocols/msn/ui/msninfo.ui line 191
-#: rc.cpp:2592
+#. i18n: file ./kopete/contactlist/customnotifications.ui line 167
+#: rc.cpp:1019
 #, no-c-format
-msgid "I am on &the contact list of this contact"
+msgid "Only start a chat the next time the event occurs"
 msgstr ""
 
-#. i18n: file ./protocols/msn/ui/msninfo.ui line 194
-#: rc.cpp:2595
+#. i18n: file ./kopete/contactlist/customnotifications.ui line 177
+#: rc.cpp:1022
 #, no-c-format
-msgid "Show whether you are on the contact list of this user"
+msgid "S&uppress standard notifications"
 msgstr ""
 
-#. i18n: file ./protocols/msn/ui/msninfo.ui line 198
-#: rc.cpp:2598
+#. i18n: file ./kopete/contactlist/customnotifications.ui line 183
+#: rc.cpp:1025
 #, no-c-format
 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."
+"Check to prevent notifications common to all contacts from happening for this "
+"contact"
 msgstr ""
 
-#. i18n: file ./protocols/msn/msnchatui.rc line 13
-#: rc.cpp:2605
+#. i18n: file ./kopete/grouptdeabcselectorwidget.ui line 49
+#: rc.cpp:1028
+#, fuzzy, no-c-format
+msgid "Addressbook entry:"
+msgstr "Dolen llyfr cyfeiriadau"
+
+#. i18n: file ./kopete/grouptdeabcselectorwidget.ui line 65
+#: rc.cpp:1031
+#, fuzzy, no-c-format
+msgid "&Group"
+msgstr "&Grwpiau"
+
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 16
+#: rc.cpp:1034
 #, no-c-format
-msgid "&Debug"
-msgstr ""
+msgid "Events"
+msgstr "Digwyddiadau"
 
-#. i18n: file ./protocols/msn/config/msnprefs.ui line 57
-#: rc.cpp:2611
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 27
+#: rc.cpp:1037
 #, no-c-format
-msgid "&Automatically open a chat window when someone starts a conversation"
+msgid "Tray Flash && Bubble"
 msgstr ""
 
-#. i18n: file ./protocols/msn/config/msnprefs.ui line 65
-#: rc.cpp:2614
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 38
+#: rc.cpp:1040
+#, fuzzy, no-c-format
+msgid "Flash s&ystem tray"
+msgstr "&Amrantu'r cafn cysawd"
+
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 41
+#: rc.cpp:1043
 #, no-c-format
-msgid "&Automatically download the display picture if possible"
+msgid "Flash the system tray icon on an incoming message"
 msgstr ""
 
-#. i18n: file ./protocols/msn/config/msnprefs.ui line 76
-#: rc.cpp:2617
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 44
+#: rc.cpp:1046
 #, no-c-format
-msgid "Download and show custom emoticons (experimental)"
+msgid "Flash the system tray icon whenever a message comes in."
 msgstr ""
 
-#. i18n: file ./protocols/msn/config/msnprefs.ui line 97
-#: rc.cpp:2620
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 80
+#: rc.cpp:1049
 #, no-c-format
-msgid "Away Messages"
-msgstr "Negeseuon Allan"
+msgid "&Left mouse click opens message"
+msgstr ""
 
-#. i18n: file ./protocols/msn/config/msnprefs.ui line 132
-#: rc.cpp:2623
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 83
+#: rc.cpp:1052
 #, no-c-format
-msgid "Send &away messages"
+msgid ""
+"Left mouse click on flashing system tray opens message instead of "
+"restoring/minimizing contact list"
 msgstr ""
 
-#. i18n: file ./protocols/msn/config/msnprefs.ui line 151
-#: rc.cpp:2626
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 86
+#: rc.cpp:1055
 #, no-c-format
-msgid "Do not send more than one away message every"
+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/msn/config/msnprefs.ui line 170
-#: rc.cpp:2629
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 96
+#: rc.cpp:1058
 #, no-c-format
-msgid "seconds"
-msgstr "eiliad"
+msgid "Sho&w bubble"
+msgstr ""
 
-#. i18n: file ./protocols/sms/ui/smsuserprefs.ui line 40
-#: rc.cpp:2632
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 99
+#: rc.cpp:1061
 #, no-c-format
-msgid "Some One"
+msgid "Show a bubble on an incoming message"
 msgstr ""
 
-#. i18n: file ./protocols/sms/ui/smsuserprefs.ui line 70
-#: rc.cpp:2635 rc.cpp:2761 rc.cpp:2947
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 102
+#: rc.cpp:1064
 #, no-c-format
-msgid "&Telephone number:"
+msgid "Show a bubble whenever a message comes in."
 msgstr ""
 
-#. i18n: file ./protocols/sms/ui/smsuserprefs.ui line 76
-#: rc.cpp:2638 rc.cpp:2644
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 138
+#: rc.cpp:1067
 #, no-c-format
-msgid "The telephone number of the contact."
+msgid "Button \"&Ignore\" closes chat"
 msgstr ""
 
-#. i18n: file ./protocols/sms/ui/smsuserprefs.ui line 79
-#: rc.cpp:2641 rc.cpp:2647
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 141
+#: rc.cpp:1070
 #, no-c-format
 msgid ""
-"The telephone number of the contact.  This should be a number with SMS service "
-"available."
+"The \"Ignore\" button of the bubble closes the chat window for the sender"
 msgstr ""
 
-#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 25
-#: rc.cpp:2650
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 144
+#: rc.cpp:1073
 #, no-c-format
-msgid "Account Preferences - SMS"
+msgid ""
+"If there is already a chat window opened for the sender of the message "
+"displayed in the bubble the \"Ignore\" button will close this chat window."
 msgstr ""
 
-#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 82
-#: rc.cpp:2659 rc.cpp:5402
-#, no-c-format
-msgid "&Account name:"
-msgstr "Enw &Cyfrif:"
-
-#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 88
-#: rc.cpp:2662 rc.cpp:2665 rc.cpp:2677 rc.cpp:2773 rc.cpp:2776 rc.cpp:2785
-#: rc.cpp:2788
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 182
+#: rc.cpp:1076
 #, no-c-format
-msgid "A unique name for this SMS account."
+msgid "Close &bubble automatically after"
 msgstr ""
 
-#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 99
-#: rc.cpp:2668
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 188
+#: rc.cpp:1079
 #, no-c-format
-msgid "&SMS delivery service:"
+msgid "Automatically close bubble after fixed amount of time"
 msgstr ""
 
-#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 105
-#: rc.cpp:2671 rc.cpp:2680
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 191
+#: rc.cpp:1082
 #, no-c-format
-msgid "The delivery service that you would like to use."
+msgid ""
+"Bubbles will automatically be closed after a fixed amount of time. A closed one "
+"will be replaced by a new one if another message is waiting."
 msgstr ""
 
-#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 108
-#: rc.cpp:2674 rc.cpp:2683
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 202
+#: rc.cpp:1085 rc.cpp:1449
 #, no-c-format
-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 ""
+msgid " Sec"
+msgstr "eil"
 
-#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 151
-#: rc.cpp:2686
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 238
+#: rc.cpp:1088
 #, no-c-format
-msgid "&Description"
-msgstr "&Disgrifiad"
+msgid "Exclude non-highlighted messages in grou&p chats"
+msgstr ""
 
-#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 154
-#: rc.cpp:2689
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 241
+#: rc.cpp:1091
 #, no-c-format
-msgid "Description of the SMS delivery service."
+msgid "Notify only highlighted messages in group chats"
 msgstr ""
 
-#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 157
-#: rc.cpp:2692
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 244
+#: rc.cpp:1094
 #, no-c-format
-msgid "Description of the SMS delivery service, including download locations."
+msgid ""
+"In very active group chats important messages can be singled out by excluding "
+"non-highlighted messages from notification."
 msgstr ""
 
-#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 188
-#: rc.cpp:2698
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 252
+#: rc.cpp:1097
 #, no-c-format
-msgid "To use SMS, you will need an account with a delivery service."
+msgid "Exclude messages in chats on current des&ktop"
 msgstr ""
 
-#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 220
-#: rc.cpp:2701 rc.cpp:3106
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 255
+#: rc.cpp:1100
 #, no-c-format
-msgid "A&ccount Preferences"
+msgid ""
+"Do not display notification for messages in chat windows on current desktop"
 msgstr ""
 
-#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 231
-#: rc.cpp:2704
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 258
+#: rc.cpp:1103
 #, no-c-format
-msgid "Messaging Preferences"
+msgid ""
+"This option allows you to turn off the notification of events for chat windows "
+"that are on the current desktop. If this option is turned on, then only chat "
+"windows on different desktops than the current one will notify you that an "
+"event has occured. Otherwise, all chat windows will notify you that an event "
+"has occured."
 msgstr ""
 
-#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 250
-#: rc.cpp:2707
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 279
+#: rc.cpp:1109
 #, no-c-format
-msgid "If the message is too &long:"
+msgid "E&nable events while away"
 msgstr ""
 
-#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 256
-#: rc.cpp:2710 rc.cpp:2725
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 282
+#: rc.cpp:1112
 #, no-c-format
-msgid ""
-"What should happen if you type a message that is too long to fit in a single "
-"SMS message."
+msgid "Enable events if your account status is \"Away\""
 msgstr ""
 
-#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 259
-#: rc.cpp:2713 rc.cpp:2728
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 285
+#: rc.cpp:1115
 #, no-c-format
 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."
+"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/sms/ui/smsactprefs.ui line 265
-#: rc.cpp:2716
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 293
+#: rc.cpp:1118
 #, no-c-format
-msgid "Prompt (recommended)"
+msgid "Enable events for acti&ve chat windows"
 msgstr ""
 
-#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 270
-#: rc.cpp:2719
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 296
+#: rc.cpp:1121
 #, no-c-format
-msgid "Break Into Multiple"
+msgid "Enable events for incoming messages if the chat window is active"
 msgstr ""
 
-#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 275
-#: rc.cpp:2722
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 299
+#: rc.cpp:1124
 #, no-c-format
-msgid "Cancel Sending"
+msgid ""
+"Enable notification events for incoming messages even if the receiving chat "
+"window is active. Note: Neither the system tray icon flashes nor the bubble is "
+"shown."
 msgstr ""
 
-#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 295
-#: rc.cpp:2731
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 307
+#: rc.cpp:1127
 #, no-c-format
-msgid "&Enable phone number internationalization"
+msgid "Switch &to desktop containing chat on opening message"
 msgstr ""
 
-#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 298
-#: rc.cpp:2734
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 310
+#: rc.cpp:1130
 #, no-c-format
-msgid "Check if you would like to enable phone number internationalization."
+msgid ""
+"Switch to the desktop which contains the chat window for the sender when "
+"opening his/her message"
 msgstr ""
 
-#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 301
-#: rc.cpp:2737
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 313
+#: rc.cpp:1133
 #, no-c-format
 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."
+"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/sms/ui/smsactprefs.ui line 328
-#: rc.cpp:2740
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 321
+#: rc.cpp:1136
 #, no-c-format
-msgid "Substitute leading &zero with code:"
+msgid "&Raise window on incoming message"
 msgstr ""
 
-#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 334
-#: rc.cpp:2743 rc.cpp:2746 rc.cpp:2755 rc.cpp:2758
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 324
+#: rc.cpp:1139
 #, no-c-format
-msgid "What you would like to substitute a leading zero with."
+msgid "Raise the chat window/tab on an incoming message"
 msgstr ""
 
-#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 356
-#: rc.cpp:2749
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 327
+#: rc.cpp:1142
 #, no-c-format
-msgid "+"
-msgstr "+"
+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/sms/ui/smsactprefs.ui line 359
-#: rc.cpp:2752
+#. i18n: file ./kopete/config/behavior/kopeteawayconfigbase.ui line 16
+#: rc.cpp:1145
 #, no-c-format
-msgid "1234567890+"
+msgid "Away Configuration"
 msgstr ""
 
-#. i18n: file ./protocols/sms/ui/smsadd.ui line 60
-#: rc.cpp:2764 rc.cpp:2779
+#. i18n: file ./kopete/config/behavior/kopeteawayconfigbase.ui line 44
+#: rc.cpp:1151
 #, no-c-format
-msgid "The telephone number of the contact you would like to add."
+msgid "Number of away messages to remember:"
 msgstr ""
 
-#. i18n: file ./protocols/sms/ui/smsadd.ui line 63
-#: rc.cpp:2767 rc.cpp:2782
+#. i18n: file ./kopete/config/behavior/kopeteawayconfigbase.ui line 47
+#: rc.cpp:1154 rc.cpp:1157 rc.cpp:1160 rc.cpp:1163
 #, no-c-format
 msgid ""
-"The telephone number of the contact you would like to add.  This should be a "
-"number with SMS service available."
+"Kopete will remember this many away messages for use at a later date; if this "
+"limit is exceeded, the least-used message will be removed."
 msgstr ""
 
-#. i18n: file ./protocols/sms/ui/smsadd.ui line 71
-#: rc.cpp:2770
+#. i18n: file ./kopete/config/behavior/kopeteawayconfigbase.ui line 94
+#: rc.cpp:1166
 #, no-c-format
-msgid "Contact na&me:"
+msgid "Auto Away"
 msgstr ""
 
-#. i18n: file ./protocols/sms/services/smsclientprefs.ui line 49
-#: rc.cpp:2791
+#. i18n: file ./kopete/config/behavior/kopeteawayconfigbase.ui line 98
+#: rc.cpp:1169
 #, no-c-format
-msgid "SMSClient Settings"
+msgid ""
+"<p>If you check the <i>Use auto away</i> checkbox, Kopete will automaticaly set "
+"you globally away when the TDE screen saver starts, or after the selected "
+"minutes of user inactivity (i.e no mouse move, or key pressed)</p>\n"
+"<p>Kopete will set you available again when you come back if you checked <i>"
+"Become available when detecting activity again</i></p>"
 msgstr ""
 
-#. i18n: file ./protocols/sms/services/smsclientprefs.ui line 79
-#: rc.cpp:2794
+#. i18n: file ./kopete/config/behavior/kopeteawayconfigbase.ui line 109
+#: rc.cpp:1173
 #, no-c-format
-msgid "SMSClient &program:"
+msgid "&Use auto away"
 msgstr ""
 
-#. i18n: file ./protocols/sms/services/smsclientprefs.ui line 90
-#: rc.cpp:2797 rc.cpp:2812
+#. i18n: file ./kopete/config/behavior/kopeteawayconfigbase.ui line 128
+#: rc.cpp:1176
 #, no-c-format
-msgid "Pro&vider:"
-msgstr "Dar&parwr:"
+msgid "Become away after"
+msgstr ""
 
-#. i18n: file ./protocols/sms/services/smsclientprefs.ui line 116
-#: rc.cpp:2800
+#. i18n: file ./kopete/config/behavior/kopeteawayconfigbase.ui line 153
+#: rc.cpp:1179
 #, no-c-format
-msgid "SMSClient &config path:"
+msgid "minutes of user inactivity"
 msgstr ""
 
-#. i18n: file ./protocols/sms/services/gsmlibprefs.ui line 49
-#: rc.cpp:2803
-#, fuzzy, no-c-format
-msgid "GSMLib Settings"
-msgstr "&Cadw Gosodiadau"
-
-#. i18n: file ./protocols/sms/services/smssendprefs.ui line 49
-#: rc.cpp:2809
+#. i18n: file ./kopete/config/behavior/kopeteawayconfigbase.ui line 183
+#: rc.cpp:1182
 #, no-c-format
-msgid "SMSSend Options"
+msgid "Become available when detecting activity again"
 msgstr ""
 
-#. i18n: file ./protocols/sms/services/smssendprefs.ui line 124
-#: rc.cpp:2815
+#. i18n: file ./kopete/config/behavior/kopeteawayconfigbase.ui line 196
+#: rc.cpp:1185
+#, fuzzy, no-c-format
+msgid "Auto Away Message"
+msgstr "Negeseuon Allan"
+
+#. i18n: file ./kopete/config/behavior/kopeteawayconfigbase.ui line 210
+#: rc.cpp:1188
 #, no-c-format
-msgid "SMSSend prefi&x:"
+msgid "Display the last away message used"
 msgstr ""
 
-#. i18n: file ./protocols/sms/services/smssendprefs.ui line 159
-#: rc.cpp:2818
+#. i18n: file ./kopete/config/behavior/kopeteawayconfigbase.ui line 224
+#: rc.cpp:1191
 #, no-c-format
-msgid "Provider Options"
+msgid "Display the following away message:"
 msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gaduregisteraccountui.ui line 16
-#: rc.cpp:2821
+#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 27
+#: rc.cpp:1197
 #, no-c-format
-msgid "Register Account - Gadu-Gadu"
-msgstr ""
+msgid "System Tray"
+msgstr "Bar Tasgau"
 
-#. i18n: file ./protocols/gadu/ui/gaduregisteraccountui.ui line 66
-#: rc.cpp:2824
+#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 38
+#: rc.cpp:1200
 #, no-c-format
-msgid "Repeat pass&word:"
-msgstr "Ailadrodd c&yfrinair:"
+msgid "Show system tray &icon"
+msgstr "D&angos eicon y teclyn cysawd"
 
-#. i18n: file ./protocols/gadu/ui/gaduregisteraccountui.ui line 72
-#: rc.cpp:2827 rc.cpp:2878
+#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 41
+#: rc.cpp:1203
 #, no-c-format
-msgid "A confirmation of the password you would like to use."
+msgid "Show the icon in the system tray"
 msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gaduregisteraccountui.ui line 75
-#: rc.cpp:2830 rc.cpp:2881
+#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 44
+#: rc.cpp:1206
 #, no-c-format
-msgid "A confirmation of the password you would like to use for this account."
+msgid ""
+"By default, the system tray icon indicates new incoming messages by flashing "
+"and showing a bubble. A left or middle mouse click on the icon will open the "
+"message in a new chat window. Pressing the \"View\" button in the bubble has "
+"the same effect."
 msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gaduregisteraccountui.ui line 86
-#: rc.cpp:2833 rc.cpp:2872
+#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 55
+#: rc.cpp:1209
 #, no-c-format
-msgid "The password you would like to use."
+msgid "Start with hidden &main window"
 msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gaduregisteraccountui.ui line 89
-#: rc.cpp:2836 rc.cpp:2875
+#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 58
+#: rc.cpp:1212
 #, no-c-format
-msgid "The password you would like to use for this account."
+msgid "Start with the main window minimized to the system tray"
 msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gaduregisteraccountui.ui line 97
-#: rc.cpp:2839 rc.cpp:2848
+#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 61
+#: rc.cpp:1215
 #, no-c-format
-msgid "Your E-mail address."
+msgid ""
+"Start with the main window hidden. The only visible item is the system tray "
+"icon."
 msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gaduregisteraccountui.ui line 100
-#: rc.cpp:2842 rc.cpp:2851
+#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 71
+#: rc.cpp:1218
+#, fuzzy, no-c-format
+msgid "Message Handling"
+msgstr "Neges"
+
+#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 82
+#: rc.cpp:1221
 #, no-c-format
-msgid "The E-mail address you would like to use to register this account."
+msgid "Open messages instantl&y"
 msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gaduregisteraccountui.ui line 136
-#: rc.cpp:2845
+#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 85
+#: rc.cpp:1224
+#, fuzzy, no-c-format
+msgid "Instantly open incoming messages"
+msgstr "Negeseuon newydd Gyraedd"
+
+#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 88
+#: rc.cpp:1227
 #, no-c-format
-msgid "&E-Mail address:"
+msgid ""
+"If there is no existing chat window a new window will be opened when a new "
+"message comes in. If there is already a chat window opened for the sender of "
+"the message it will be displayed there instantly."
 msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gaduregisteraccountui.ui line 184
-#: rc.cpp:2854
+#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 96
+#: rc.cpp:1230
 #, no-c-format
-msgid "&Verification sequence:"
+msgid "Use message &queue"
 msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gaduregisteraccountui.ui line 190
-#: rc.cpp:2857 rc.cpp:2863
+#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 99
+#: rc.cpp:1233
 #, no-c-format
-msgid "The text from the image below."
+msgid "Use a message queue to store incoming messages"
 msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gaduregisteraccountui.ui line 193
-#: rc.cpp:2860 rc.cpp:2866
+#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 102
+#: rc.cpp:1236
 #, no-c-format
 msgid ""
-"The text from the image below.  This is used to prevent abusive automated "
-"registration scripts."
+"Store new incoming messages in a message queue. New messages are messages that "
+"cannot be displayed in an already open chat window. Only queued or stacked "
+"messages trigger notification via bubble, a flashing tray icon, or both.."
 msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gaduregisteraccountui.ui line 337
-#: rc.cpp:2884
+#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 110
+#: rc.cpp:1239
 #, no-c-format
-msgid "Gadu-Gadu registration token."
+msgid "Use message stac&k"
 msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gaduregisteraccountui.ui line 340
-#: rc.cpp:2887
+#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 113
+#: rc.cpp:1242
 #, no-c-format
-msgid ""
-"This field contains an image with number that you need to type into the <b>"
-"Verification Sequence</b> field above."
+msgid "Use a message stack to store incoming messages"
 msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gaduregisteraccountui.ui line 375
-#: rc.cpp:2890
+#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 116
+#: rc.cpp:1245
 #, no-c-format
 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>"
+"Store new incoming messages in a message stack. New messages are messages that "
+"cannot be displayed in an already open chat window. Only queued or stacked "
+"messages trigger notification via bubble and flashing tray."
 msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gaduadd.ui line 40
-#: rc.cpp:2893 rc.cpp:3069
+#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 127
+#: rc.cpp:1248
 #, no-c-format
-msgid "Gadu-Gadu &UIN:"
+msgid "Queue/stack &unread messages"
 msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gaduadd.ui line 55
-#: rc.cpp:2896 rc.cpp:2902
+#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 130
+#: rc.cpp:1251
 #, no-c-format
-msgid "The user ID of the Gadu-Gadu account you would like to add."
+msgid "Also add unread messages to queue/stack"
 msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gaduadd.ui line 58
-#: rc.cpp:2899 rc.cpp:2905
+#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 133
+#: rc.cpp:1254
 #, no-c-format
 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."
-msgstr ""
-
-#. i18n: file ./protocols/gadu/ui/gaduadd.ui line 79
-#: rc.cpp:2908
-#, no-c-format
-msgid "<i>(for example: 1234567)</i>"
+"Unread messages are messages that will be displayed in an already opened but "
+"inactive chat window. Only incoming queued messages trigger notification via "
+"the bubble, the flashing tray icon, or both. 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/gadu/ui/gaduadd.ui line 109
-#: rc.cpp:2911
+#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 154
+#: rc.cpp:1260
 #, no-c-format
-msgid "&Forename:"
+msgid "Connect automatically at &startup"
 msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gaduadd.ui line 115
-#: rc.cpp:2914 rc.cpp:2956
+#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 157
+#: rc.cpp:1263
 #, no-c-format
-msgid "The forename of the contact you wish to add."
+msgid "Connect all your accounts automatically when starting Kopete"
 msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gaduadd.ui line 118
-#: rc.cpp:2917 rc.cpp:2959
+#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 160
+#: rc.cpp:1266
 #, no-c-format
 msgid ""
-"The forename (first name) of the contact you wish to add.  Optionally this may "
-"include a middle name."
+"When starting Kopete all your accounts will be connected automatically. Note: "
+"You can exclude accounts individually in their properties."
 msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gaduadd.ui line 129
-#: rc.cpp:2920
+#. i18n: file ./kopete/config/behavior/behaviorconfig_chat.ui line 27
+#: rc.cpp:1272
 #, no-c-format
-msgid "&Surname:"
-msgstr "&Cyfenw :"
+msgid "&Interface Preference"
+msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gaduadd.ui line 135
-#: rc.cpp:2923 rc.cpp:2962
+#. i18n: file ./kopete/config/behavior/behaviorconfig_chat.ui line 90
+#: rc.cpp:1275
 #, no-c-format
-msgid "The surname of the contact you wish to add."
+msgid "Chat Window Grouping &Policy"
 msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gaduadd.ui line 138
-#: rc.cpp:2926 rc.cpp:2965
+#. i18n: file ./kopete/config/behavior/behaviorconfig_chat.ui line 99
+#: rc.cpp:1278
 #, no-c-format
-msgid "The surname (last name) of the contact you wish to add."
+msgid "Open All Messages in New Chat Window"
 msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gaduadd.ui line 160
-#: rc.cpp:2932 rc.cpp:2935 rc.cpp:2968 rc.cpp:2971
+#. i18n: file ./kopete/config/behavior/behaviorconfig_chat.ui line 104
+#: rc.cpp:1281
 #, no-c-format
-msgid "A nickname for the contact you wish to add."
+msgid "Group Messages From Same Account in Same Chat Window"
 msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gaduadd.ui line 182
-#: rc.cpp:2938
+#. i18n: file ./kopete/config/behavior/behaviorconfig_chat.ui line 109
+#: rc.cpp:1284
 #, no-c-format
-msgid "&Email address:"
-msgstr "&Cyfeiriad ebost:"
+msgid "Group All Messages in Same Chat Window"
+msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gaduadd.ui line 188
-#: rc.cpp:2941 rc.cpp:2944 rc.cpp:2950 rc.cpp:2953 rc.cpp:2974 rc.cpp:2977
-#: rc.cpp:2980 rc.cpp:2983
+#. i18n: file ./kopete/config/behavior/behaviorconfig_chat.ui line 114
+#: rc.cpp:1287
 #, no-c-format
-msgid "E-Mail address for this contact."
+msgid "Group Messages From Contacts in Same Group in Same Chat Window"
 msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gaduadd.ui line 311
-#: rc.cpp:2986
+#. i18n: file ./kopete/config/behavior/behaviorconfig_chat.ui line 119
+#: rc.cpp:1290
 #, no-c-format
-msgid "Offline to contact when you set \"&Just for friends\""
+msgid "Group Messages From Same Metacontact in Same Chat Window"
 msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gaduadd.ui line 314
-#: rc.cpp:2989 rc.cpp:2992
+#. i18n: file ./kopete/config/behavior/behaviorconfig_chat.ui line 138
+#: rc.cpp:1293
 #, no-c-format
 msgid ""
-"Check if you want to exclude this contact from the \"Just for friends\" status "
-"mode."
+"<dl>\n"
+"                                <dt><tt>Open all messages in a new chat "
+"window</tt>\n"
+"                                <dd>Every chat will have its own window.\n"
+"                                <dt><tt>Group messages from the same account in "
+"the same chat window</tt>\n"
+"                                <dd>All chats for one account get grouped in to "
+"one window by using tabs.\n"
+"                                <dt><tt>Group all messages in the same chat "
+"window</tt>\n"
+"                                <dd>All chats get grouped in to one window by "
+"using tabs.\n"
+"                                <dt><tt>Group messages from contacts in the "
+"same group in the same chat window</tt>\n"
+"                                <dd>All chats from one group get grouped in to "
+"one window by using tabs.\n"
+"                                <dt><tt>Group messages from the same "
+"metacontact in the same chat window</tt>\n"
+"                                <dd>All chats from one metacontact get grouped "
+"in to one window by using tabs.\n"
+"                                </dl>\n"
+"                        "
 msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gaduadd.ui line 323
-#: rc.cpp:2995
+#. i18n: file ./kopete/config/behavior/behaviorconfig_chat.ui line 156
+#: rc.cpp:1308
 #, no-c-format
-msgid "Group"
-msgstr "Gr?p"
+msgid "High&light messages containing your nickname"
+msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gaduawayui.ui line 19
-#: protocols/gadu/gaduaway.cpp:40 rc.cpp:2998
+#. i18n: file ./kopete/config/behavior/behaviorconfig_chat.ui line 172
+#: rc.cpp:1311
 #, no-c-format
-msgid "Away Dialog"
+msgid "E&nable automatic spell checking"
 msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gaduawayui.ui line 52
-#: rc.cpp:3004
+#. i18n: file ./kopete/config/behavior/behaviorconfig_chat.ui line 180
+#: rc.cpp:1314
 #, no-c-format
-msgid ""
-"Choose status, by default present 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."
+msgid "&Show events in chat window"
 msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gaduawayui.ui line 71
-#: protocols/msn/msnprotocol.cpp:52 protocols/oscar/icq/icqpresence.cpp:77
-#: rc.cpp:3009
+#. i18n: file ./kopete/config/behavior/behaviorconfig_chat.ui line 196
+#: rc.cpp:1317
 #, no-c-format
-msgid "O&nline"
-msgstr "A&r-lein"
+msgid "T&runcate contact name with more characters than:"
+msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gaduawayui.ui line 77
-#: rc.cpp:3012
+#. i18n: file ./kopete/config/behavior/behaviorconfig_chat.ui line 245
+#: rc.cpp:1320
 #, no-c-format
-msgid "Set your status to Online."
+msgid "&Maximum number of chat window lines:"
 msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gaduawayui.ui line 80
-#: rc.cpp:3015
+#. i18n: file ./kopete/config/behavior/behaviorconfig_chat.ui line 251
+#: rc.cpp:1323
 #, no-c-format
 msgid ""
-"Set your status to Online, indicating that you are available to chat with "
-"anyone who wishes."
+"Limit the maximum number of lines visible in a chat window to improve speed for "
+"complex layouts."
 msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gaduawayui.ui line 94
-#: rc.cpp:3021
+#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 24
+#: rc.cpp:1326
 #, no-c-format
-msgid "Set your status to busy."
-msgstr ""
+msgid "Video"
+msgstr "Fideo"
 
-#. i18n: file ./protocols/gadu/ui/gaduawayui.ui line 97
-#: rc.cpp:3024
+#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 47
+#: rc.cpp:1329
 #, no-c-format
-msgid ""
-"Set your status to busy, indicating that you may should not be bothered with "
-"trivial chat, and may not be able to reply immediately."
-msgstr ""
+msgid "Device"
+msgstr "Dyfais"
 
-#. i18n: file ./protocols/gadu/ui/gaduawayui.ui line 111
-#: rc.cpp:3030
+#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 66
+#: rc.cpp:1332
 #, no-c-format
-msgid ""
-"Set status to invisible, which will hide your presence from other users."
+msgid "&Video Device Configuration"
 msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gaduawayui.ui line 114
-#: rc.cpp:3033
+#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 93
+#: rc.cpp:1335 rc.cpp:2470
 #, no-c-format
-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 ""
+msgid "Device:"
+msgstr "Dyfais:"
 
-#. i18n: file ./protocols/gadu/ui/gaduawayui.ui line 128
-#: rc.cpp:3039 rc.cpp:3042
+#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 101
+#: rc.cpp:1338
 #, no-c-format
-msgid "Choose this status to disconnect with description entered below."
-msgstr ""
+msgid "Input:"
+msgstr "Mewnbwn:"
 
-#. i18n: file ./protocols/gadu/ui/gaduawayui.ui line 151
-#: rc.cpp:3045
+#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 109
+#: rc.cpp:1341
 #, no-c-format
-msgid "&Message:"
-msgstr "&Neges:"
+msgid "Standard:"
+msgstr "Safonol :"
 
-#. i18n: file ./protocols/gadu/ui/gaduawayui.ui line 157
-#: rc.cpp:3048 rc.cpp:3054
+#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 174
+#: rc.cpp:1344
 #, no-c-format
-msgid "Description of your status."
-msgstr ""
+msgid "Con&trols"
+msgstr "R&heoliadau"
 
-#. i18n: file ./protocols/gadu/ui/gaduawayui.ui line 160
-#: rc.cpp:3051 rc.cpp:3057
+#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 193
+#: rc.cpp:1347
 #, no-c-format
-msgid "Description of your status (up to 70 characters)."
+msgid "&Image Adjustment"
 msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 24
-#: rc.cpp:3060
+#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 228
+#: rc.cpp:1350
 #, no-c-format
-msgid "Account Preferences - Gadu-Gadu"
-msgstr ""
+msgid "Brightness:"
+msgstr "Disgleirdeb:"
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 78
-#: rc.cpp:3072 rc.cpp:3078
+#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 244
+#: rc.cpp:1353
 #, no-c-format
-msgid "The user ID of your Gadu-Gadu account."
-msgstr ""
+msgid "Contrast:"
+msgstr "Cyferbyniant :"
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 81
-#: rc.cpp:3075 rc.cpp:3081
+#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 260
+#: rc.cpp:1356
 #, no-c-format
-msgid ""
-"The user ID of your Gadu-Gadu account.  This should be in the form of a number "
-"(no decimals, no spaces)."
-msgstr ""
+msgid "Saturation:"
+msgstr "Dirlawnder:"
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 125
-#: rc.cpp:3087
-#, no-c-format
-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 ""
+#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 276
+#: rc.cpp:1359
+#, fuzzy, no-c-format
+msgid "Whiteness:"
+msgstr "Hidlenni"
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 169
-#: rc.cpp:3093
+#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 292
+#: rc.cpp:1362
 #, no-c-format
-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 ""
+msgid "Hue:"
+msgstr "Arlliw :"
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 186
-#: rc.cpp:3100 rc.cpp:3103 rc.cpp:4073 rc.cpp:4076 rc.cpp:4536 rc.cpp:4539
+#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 443
+#: rc.cpp:1365
 #, no-c-format
-msgid "Register a new account on this network."
-msgstr ""
+msgid "Optio&ns"
+msgstr "De&wisiadau"
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 260
-#: rc.cpp:3112
+#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 470
+#: rc.cpp:1368
+#, fuzzy, no-c-format
+msgid "Image options"
+msgstr "Dewisiada&u Uwch"
+
+#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 489
+#: rc.cpp:1371
 #, no-c-format
-msgid "&Use direct connections (DCC)"
+msgid "Au&tomatic brightness/contrast adjustment"
 msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 279
-#: rc.cpp:3115
+#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 505
+#: rc.cpp:1374
 #, no-c-format
-msgid "Use protocol encr&yption (SSL):"
+msgid "Automatic color correction"
 msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 285
-#: rc.cpp:3118 rc.cpp:3133
+#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 524
+#: rc.cpp:1377
 #, no-c-format
-msgid ""
-"Whether or not you want to enable SSL encrypted communication with the server."
+msgid "See preview mirrored"
 msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 288
-#: rc.cpp:3121 rc.cpp:3136
+#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 16
+#: rc.cpp:1380
 #, no-c-format
-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."
+msgid "Contact List Appearance"
 msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 294
-#: rc.cpp:3124
+#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 35
+#: rc.cpp:1383
 #, no-c-format
-msgid "If Available"
-msgstr ""
+msgid "Layout"
+msgstr "Cynllun"
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 299
-#: rc.cpp:3127
+#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 46
+#: rc.cpp:1386
 #, no-c-format
-msgid "Required"
-msgstr "Angenrheidiol"
+msgid "Arrange metacontacts by &group"
+msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 333
-#: rc.cpp:3139
+#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 54
+#: rc.cpp:1389
 #, no-c-format
-msgid "C&ache server information"
+msgid "Show tree &branch lines"
 msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 339
-#: rc.cpp:3142
+#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 87
+#: rc.cpp:1392
 #, no-c-format
-msgid ""
-"Cache connection information for each server connected to in case the main "
-"load-balancing server fails."
+msgid "In&dent contacts"
 msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 342
-#: rc.cpp:3145
+#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 99
+#: rc.cpp:1395
 #, no-c-format
-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."
+msgid "Contact Display Mode"
 msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 353
-#: rc.cpp:3148
+#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 110
+#: rc.cpp:1398
 #, fuzzy, no-c-format
-msgid "Ignore people off your contact list"
-msgstr "&Dileu y Cyswllt"
+msgid "List Style"
+msgstr "Ardull"
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 371
-#: rc.cpp:3151
+#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 121
+#: rc.cpp:1401
 #, no-c-format
-msgid "U&ser Information"
-msgstr "G&wybodaeth Defnyddiwr"
+msgid "&Classic, left-aligned status icons"
+msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 397
-#: rc.cpp:3154
+#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 124
+#: rc.cpp:1404
 #, no-c-format
-msgid ""
-"<p align=\"center\">You must be connected to change your Personal "
-"Information.</p>"
+msgid "Alt+C"
 msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 408
-#: rc.cpp:3157
+#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 135
+#: rc.cpp:1407
 #, no-c-format
-msgid "User Information"
-msgstr "Gwybodaeth Defnyddiwr"
+msgid "&Right-aligned status icons"
+msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 443
-#: rc.cpp:3163 rc.cpp:3217
+#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 138
+#: rc.cpp:1410
 #, no-c-format
-msgid "Surname:"
-msgstr "Cyfenw :"
+msgid "Alt+R"
+msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 451
-#: rc.cpp:3166
-#, fuzzy, no-c-format
-msgid "Your nick name:"
-msgstr "Llysenw"
+#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 146
+#: rc.cpp:1413
+#, no-c-format
+msgid "Detailed &view"
+msgstr "&Golwg Manwl"
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 459
-#: rc.cpp:3169 rc.cpp:3232
+#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 149
+#: rc.cpp:1416
 #, no-c-format
-msgid "Gender:"
+msgid "Alt+V"
 msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 467
-#: rc.cpp:3172
+#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 159
+#: rc.cpp:1419
 #, no-c-format
-msgid "Year of birth:"
+msgid "Use contact photos when available"
 msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 475
-#: rc.cpp:3175 rc.cpp:3223 rc.cpp:3472 rc.cpp:3767 rc.cpp:4004 rc.cpp:4377
-#: rc.cpp:4392
-#, no-c-format
-msgid "City:"
-msgstr "Dinas:"
+#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 171
+#: rc.cpp:1422
+#, fuzzy, no-c-format
+msgid "Displayed Theme Path"
+msgstr "Enw Dangos"
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 520
-#: protocols/oscar/icq/icqprotocol.cpp:215 rc.cpp:3178 rc.cpp:3238
+#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 192
+#: rc.cpp:1425
 #, no-c-format
-msgid "Female"
+msgid "Contact List Animations"
 msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 525
-#: protocols/oscar/icq/icqprotocol.cpp:216 rc.cpp:3181 rc.cpp:3235
+#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 203
+#: rc.cpp:1428
 #, no-c-format
-msgid "Male"
+msgid "&Animate changes to contact list items"
 msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 560
-#: rc.cpp:3184
+#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 206
+#: rc.cpp:1431
 #, no-c-format
-msgid ""
-"Values below are going to be used in search, but will not appear in results."
+msgid "Alt+A"
 msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 601
-#: rc.cpp:3187
-#, no-c-format
-msgid "Maiden name:"
-msgstr "Enw Morwynol:"
-
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 609
-#: rc.cpp:3190
+#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 214
+#: rc.cpp:1434
 #, no-c-format
-msgid "City of origin:"
+msgid "Fade in / out contacts as the&y appear / disappear"
 msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 651
-#: rc.cpp:3193
+#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 222
+#: rc.cpp:1437
 #, no-c-format
-msgid "&File Transfer"
-msgstr "Trosglwyddo &ffeiliau"
+msgid "Fo&ld in / out contacts as they appear / disappear"
+msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 665
-#: rc.cpp:3196
+#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 232
+#: rc.cpp:1440
 #, no-c-format
-msgid "Global DCC Options"
+msgid "Contact List Auto-Hide"
 msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 676
-#: rc.cpp:3199
+#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 235
+#: rc.cpp:1443
 #, no-c-format
 msgid ""
-"<qt><p align=\"center\"><font color=\"#ff0000\">These options affect <b>all</b> "
-"Gadu-Gadu accounts.</font></p></qt>"
+"When enabled, the contact list will automatically be hidden a fixed amount of "
+"time after the mouse cursor leaves the window. You can set the amount of time "
+"in the 'Time until autohide' box below."
 msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 684
-#: rc.cpp:3202
+#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 246
+#: rc.cpp:1446
 #, no-c-format
-msgid "&Override default configuration"
+msgid "A&uto-hide contact list"
 msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 714
-#: rc.cpp:3205
+#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 294
+#: rc.cpp:1452
 #, no-c-format
-msgid "Local &IP address /"
-msgstr "Cyfeiriadau Lleol /"
-
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 752
-#: rc.cpp:3211
-#, no-c-format
-msgid "0.0.0.0"
+msgid "The timeout value for both contact list and scrollbar auto-hiding."
 msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gadusearch.ui line 104
-#: rc.cpp:3220 rc.cpp:4701
+#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 305
+#: rc.cpp:1455
 #, no-c-format
-msgid "Nick:"
-msgstr "Ffugenw :"
-
-#. i18n: file ./protocols/gadu/ui/gadusearch.ui line 162
-#: rc.cpp:3226
-#, no-c-format
-msgid "Age from:"
+msgid "after the cursor left the window"
 msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gadusearch.ui line 190
-#: rc.cpp:3229
-#, no-c-format
-msgid "to:"
-msgstr "i:"
-
-#. i18n: file ./protocols/gadu/ui/gadusearch.ui line 304
-#: rc.cpp:3241
+#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 342
+#: rc.cpp:1458
 #, no-c-format
-msgid "User number:"
+msgid "Change &Tooltip Contents..."
 msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gadusearch.ui line 327
-#: rc.cpp:3244
+#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 44
+#: rc.cpp:1467
 #, no-c-format
-msgid "Request information about user:"
+msgid "Base font:"
 msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gadusearch.ui line 341
-#: rc.cpp:3247
+#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 60
+#: rc.cpp:1470
 #, no-c-format
-msgid "Search by specified data:"
+msgid "Highlight foreground:"
 msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gadusearch.ui line 357
-#: rc.cpp:3250
+#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 91
+#: rc.cpp:1473
 #, no-c-format
-msgid "Lookup only those that are currently online"
+msgid "Base font color:"
 msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gadusearch.ui line 450
-#: rc.cpp:3262
-#, no-c-format
-msgid "Age"
-msgstr "Oedran"
-
-#. i18n: file ./protocols/gadu/ui/gadusearch.ui line 461
-#: rc.cpp:3265
+#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 122
+#: rc.cpp:1476
 #, no-c-format
-msgid "City"
-msgstr "Dinas"
+msgid "Highlight background:"
+msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gadusearch.ui line 472
-#: rc.cpp:3268 rc.cpp:3544
+#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 130
+#: rc.cpp:1479
 #, no-c-format
-msgid "UIN"
+msgid "Link color:"
 msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gadusearch.ui line 483
-#: rc.cpp:3271
+#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 138
+#: rc.cpp:1482
 #, no-c-format
-msgid "12"
-msgstr "12"
+msgid "Background color:"
+msgstr "Lliw'r cefndir:"
 
-#. i18n: file ./protocols/gadu/ui/gadusearch.ui line 486
-#: rc.cpp:3274
+#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 153
+#: rc.cpp:1485
 #, no-c-format
-msgid "DONT_TRANSLATE"
+msgid "Formatting Overrides"
 msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gadusearch.ui line 489
-#: rc.cpp:3277 rc.cpp:3283
+#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 164
+#: rc.cpp:1488
 #, no-c-format
-msgid "DONT_TRANSL"
+msgid "Do not show user specified &background color"
 msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gadusearch.ui line 492
-#: rc.cpp:3280
+#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 172
+#: rc.cpp:1491
 #, no-c-format
-msgid "999"
+msgid "Do not show user specified &foreground color"
 msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gadusearch.ui line 498
-#: rc.cpp:3286
+#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 180
+#: rc.cpp:1494
 #, no-c-format
-msgid "245324956234"
+msgid "Do not show user specified &rich text"
 msgstr ""
 
-#. i18n: file ./protocols/oscar/aim/ui/aimjoinchatbase.ui line 27
-#: rc.cpp:3289
+#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 201
+#: rc.cpp:1500
 #, no-c-format
-msgid "Please enter the name of the chat room you wish to join."
+msgid "Use custom fonts for contact list items"
 msgstr ""
 
-#. i18n: file ./protocols/oscar/aim/ui/aimjoinchatbase.ui line 69
-#: rc.cpp:3292
-#, fuzzy, no-c-format
-msgid "Room &name:"
-msgstr "&Enw gwesteiwr:"
-
-#. i18n: file ./protocols/oscar/aim/ui/aimjoinchatbase.ui line 80
-#: rc.cpp:3295
+#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 253
+#: rc.cpp:1503
 #, fuzzy, no-c-format
-msgid "E&xchange:"
-msgstr "N&ewid..."
-
-#. i18n: file ./protocols/oscar/aim/ui/aimaddcontactui.ui line 27
-#: rc.cpp:3298 rc.cpp:3884
-#, no-c-format
-msgid "Contact Information"
-msgstr "Gwybodaeth Cysylltu"
+msgid "Group font:"
+msgstr "Gr?p"
 
-#. i18n: file ./protocols/oscar/aim/ui/aimaddcontactui.ui line 53
-#: rc.cpp:3301
+#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 282
+#: rc.cpp:1506
 #, no-c-format
-msgid "AIM screen name:"
+msgid "Normal font:"
 msgstr ""
 
-#. i18n: file ./protocols/oscar/aim/ui/aiminfobase.ui line 51
-#: rc.cpp:3304 rc.cpp:4356
-#, no-c-format
-msgid "Nickname:"
-msgstr "Ffugenw:"
-
-#. i18n: file ./protocols/oscar/aim/ui/aiminfobase.ui line 80
-#: rc.cpp:3307
+#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 311
+#: rc.cpp:1509
 #, no-c-format
-msgid "Screen name:"
-msgstr "Enw sgrîn:"
+msgid "Small font:"
+msgstr ""
 
-#. i18n: file ./protocols/oscar/aim/ui/aiminfobase.ui line 122
-#: rc.cpp:3313
+#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 360
+#: rc.cpp:1512
 #, no-c-format
-msgid "Idle minutes:"
+msgid "Recolor contacts marked as idle:"
 msgstr ""
 
-#. i18n: file ./protocols/oscar/aim/ui/aiminfobase.ui line 201
-#: rc.cpp:3322
+#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 368
+#: rc.cpp:1515
 #, no-c-format
-msgid "Profile:"
-msgstr "Proffiliau :"
+msgid "Group name color:"
+msgstr ""
 
-#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 24
-#: rc.cpp:3325
+#. i18n: file ./kopete/config/appearance/emoticonseditwidget.ui line 16
+#: rc.cpp:1518
 #, no-c-format
-msgid "Account Preferences - AIM"
+msgid "EmoticonsEditWidget"
 msgstr ""
 
-#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 86
-#: rc.cpp:3334
+#. i18n: file ./kopete/config/appearance/emoticonseditwidget.ui line 35
+#: rc.cpp:1521
 #, fuzzy, no-c-format
-msgid "AIM &screen name:"
-msgstr "Enw sgrîn:"
+msgid "Add..."
+msgstr "Ychw&anegu..."
 
-#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 92
-#: rc.cpp:3337 rc.cpp:3343
+#. i18n: file ./kopete/config/appearance/appearanceconfig_emoticons.ui line 24
+#: rc.cpp:1530
 #, no-c-format
-msgid "The screen name of your AIM account."
+msgid "&Use emoticons"
 msgstr ""
 
-#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 95
-#: rc.cpp:3340 rc.cpp:3346
+#. i18n: file ./kopete/config/appearance/appearanceconfig_emoticons.ui line 30
+#: rc.cpp:1533
 #, no-c-format
 msgid ""
-"The screen name of your AIM account.  This should be in the form of an "
-"alphanumeric string (spaces allowed, not case sensitive)."
+"If this is checked, the text representation of emoticons in messages will be "
+"replaced by an image"
 msgstr ""
 
-#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 175
-#: rc.cpp:3361
+#. i18n: file ./kopete/config/appearance/appearanceconfig_emoticons.ui line 38
+#: rc.cpp:1536
+#, no-c-format
+msgid "&Require separators (spaces) around emoticons"
+msgstr ""
+
+#. i18n: file ./kopete/config/appearance/appearanceconfig_emoticons.ui line 44
+#: rc.cpp:1539
 #, no-c-format
 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."
+"If this is checked, only emoticons that are separated from the text by spaces "
+"will be shown as images."
 msgstr ""
 
-#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 215
-#: rc.cpp:3367 rc.cpp:3626
+#. i18n: file ./kopete/config/appearance/appearanceconfig_emoticons.ui line 55
+#: rc.cpp:1542
 #, fuzzy, no-c-format
-msgid "Accou&nt Preferences"
-msgstr "Gwall protocol."
+msgid "Select emoticon theme:"
+msgstr "&Dileu y Cyswllt"
 
-#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 265
-#: rc.cpp:3379 rc.cpp:3388
+#. i18n: file ./kopete/config/appearance/appearanceconfig_emoticons.ui line 68
+#: rc.cpp:1545
 #, no-c-format
-msgid "The IP address or hostmask of the AIM server you wish to connect to."
-msgstr ""
+msgid "Preview:"
+msgstr "Rhagolwg:"
 
-#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 268
-#: rc.cpp:3382 rc.cpp:3391
-#, no-c-format
-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 ./kopete/config/appearance/appearanceconfig_emoticons.ui line 106
+#: rc.cpp:1548
+#, fuzzy, no-c-format
+msgid "&Get New Themes..."
+msgstr "Gosod Thema Newydd..."
 
-#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 279
-#: rc.cpp:3385
+#. i18n: file ./kopete/config/appearance/appearanceconfig_emoticons.ui line 109
+#: rc.cpp:1551
 #, no-c-format
-msgid "login.oscar.aol.com"
+msgid "Download emoticon theme from the Internet"
 msgstr ""
 
-#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 296
-#: rc.cpp:3394 rc.cpp:3647 rc.cpp:4214 rc.cpp:4587 rc.cpp:5126
+#. i18n: file ./kopete/config/appearance/appearanceconfig_emoticons.ui line 117
+#: rc.cpp:1554 rc.cpp:1560
+#, fuzzy, no-c-format
+msgid "&Edit Theme..."
+msgstr "&Golygu..."
+
+#. i18n: file ./kopete/config/appearance/appearanceconfig_emoticons.ui line 120
+#: rc.cpp:1557 rc.cpp:1563
+#, fuzzy, no-c-format
+msgid "Edit the selected emoticons theme"
+msgstr "&Dileu y Cyswllt"
+
+#. i18n: file ./kopete/config/appearance/appearanceconfig_emoticons.ui line 139
+#: rc.cpp:1566
+#, fuzzy, no-c-format
+msgid "&Install Theme File..."
+msgstr "Gosod Thema Newydd..."
+
+#. i18n: file ./kopete/config/appearance/appearanceconfig_emoticons.ui line 155
+#: rc.cpp:1569
 #, no-c-format
-msgid "Po&rt:"
-msgstr "Po&rth:"
+msgid "Remove Theme"
+msgstr "Gwaredu Thema"
 
-#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 302
-#: rc.cpp:3397 rc.cpp:3403
+#. i18n: file ./kopete/config/appearance/appearanceconfig_chatwindow.ui line 24
+#: rc.cpp:1572
 #, no-c-format
-msgid "The port on the AIM server that you would like to connect to."
+msgid "Chat Window Appearance"
 msgstr ""
 
-#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 305
-#: rc.cpp:3400 rc.cpp:3406
+#. i18n: file ./kopete/config/appearance/appearanceconfig_chatwindow.ui line 43
+#: rc.cpp:1575
 #, no-c-format
-msgid ""
-"The port on the AIM server that you would like to connect to.  Normally this is "
-"5190."
-msgstr ""
+msgid "Styles"
+msgstr "Arddulliau"
 
-#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 368
-#: rc.cpp:3409 rc.cpp:3698
+#. i18n: file ./kopete/config/appearance/appearanceconfig_chatwindow.ui line 113
+#: rc.cpp:1578
+#, fuzzy, no-c-format
+msgid "&Get New..."
+msgstr "&Newydd..."
+
+#. i18n: file ./kopete/config/appearance/appearanceconfig_chatwindow.ui line 116
+#: rc.cpp:1581
 #, no-c-format
-msgid "Default to the following &encoding for messages:"
+msgid "Get new Chat Window styles over the Internet"
 msgstr ""
 
-#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 381
-#: rc.cpp:3412 rc.cpp:4659
+#. i18n: file ./kopete/config/appearance/appearanceconfig_chatwindow.ui line 124
+#: rc.cpp:1584
 #, fuzzy, no-c-format
-msgid "Pri&vacy"
-msgstr "Preifatwydd"
+msgid "&Install..."
+msgstr "Gosod Thema Newydd..."
 
-#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 392
-#: rc.cpp:3415
+#. i18n: file ./kopete/config/appearance/appearanceconfig_chatwindow.ui line 142
+#: rc.cpp:1590
+#, no-c-format
+msgid "Style Variant:"
+msgstr ""
+
+#. i18n: file ./kopete/config/appearance/appearanceconfig_chatwindow.ui line 165
+#: rc.cpp:1593
 #, fuzzy, no-c-format
-msgid "Visibility settings"
-msgstr "&Cadw Gosodiadau"
+msgid "Display"
+msgstr "Enw Dangos"
 
-#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 403
-#: rc.cpp:3418
+#. i18n: file ./kopete/config/appearance/appearanceconfig_chatwindow.ui line 176
+#: rc.cpp:1596
 #, no-c-format
-msgid "Allow only from visible list"
+msgid "Group consecuti&ve messages"
 msgstr ""
 
-#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 411
-#: rc.cpp:3421
+#. i18n: file ./kopete/config/appearance/tooltipeditwidget.ui line 46
+#: rc.cpp:1599
 #, no-c-format
-msgid "Block all users"
+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/oscar/aim/ui/aimeditaccountui.ui line 419
-#: rc.cpp:3424
+#. i18n: file ./kopete/config/appearance/tooltipeditwidget.ui line 57
+#: rc.cpp:1602
 #, no-c-format
-msgid "Block AIM users"
+msgid "<b>Here you can customize the contact tooltips</b>"
 msgstr ""
 
-#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 427
-#: rc.cpp:3427
+#. i18n: file ./kopete/config/appearance/tooltipeditwidget.ui line 87
+#: rc.cpp:1605
 #, no-c-format
-msgid "Block only from invisible list"
+msgid ""
+"This list contains elements which are currently <b>not present</b> "
+"in the contact tooltip."
 msgstr ""
 
-#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 435
-#: rc.cpp:3430
+#. i18n: file ./kopete/config/appearance/tooltipeditwidget.ui line 128
+#: rc.cpp:1608
 #, no-c-format
-msgid "Allow all users"
-msgstr ""
+msgid "v"
+msgstr "v"
 
-#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 443
-#: rc.cpp:3433
+#. i18n: file ./kopete/config/appearance/tooltipeditwidget.ui line 131
+#: rc.cpp:1611
 #, no-c-format
-msgid "Allow only contact list's users"
+msgid "Use this arrow to reorder the items in the list."
 msgstr ""
 
-#. i18n: file ./protocols/oscar/icq/ui/icqinterestinfowidget.ui line 24
-#: rc.cpp:3436
-#, fuzzy, no-c-format
-msgid "Interests"
-msgstr "Rhyngrwyd"
-
-#. i18n: file ./protocols/oscar/icq/ui/icqworkinfowidget.ui line 24
-#: rc.cpp:3439 rc.cpp:3980
-#, fuzzy, no-c-format
-msgid "Personal Work Information"
-msgstr "Gwybodaeth Defnyddiwr"
-
-#. i18n: file ./protocols/oscar/icq/ui/icqworkinfowidget.ui line 43
-#: rc.cpp:3445 rc.cpp:4428
+#. i18n: file ./kopete/config/appearance/tooltipeditwidget.ui line 139
+#: rc.cpp:1614
 #, no-c-format
-msgid "Fax:"
-msgstr "Ffacs:"
+msgid "^"
+msgstr ""
 
-#. i18n: file ./protocols/oscar/icq/ui/icqworkinfowidget.ui line 51
-#: rc.cpp:3448 rc.cpp:4419
+#. i18n: file ./kopete/config/appearance/tooltipeditwidget.ui line 147
+#: rc.cpp:1617
 #, no-c-format
-msgid "Department:"
-msgstr "Adran:"
+msgid "<"
+msgstr "<"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqworkinfowidget.ui line 67
-#: rc.cpp:3451 rc.cpp:4413
+#. i18n: file ./kopete/config/appearance/tooltipeditwidget.ui line 155
+#: rc.cpp:1620
 #, no-c-format
-msgid "Position:"
-msgstr "Lleoliad:"
-
-#. i18n: file ./protocols/oscar/icq/ui/icqworkinfowidget.ui line 101
-#: rc.cpp:3454 rc.cpp:3986
-#, fuzzy, no-c-format
-msgid "Company Location Information"
-msgstr "Gwybodaeth Cyfrif"
+msgid ">"
+msgstr ">"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqworkinfowidget.ui line 120
-#: rc.cpp:3460 rc.cpp:3992 rc.cpp:4344
+#. i18n: file ./kopete/config/appearance/tooltipeditwidget.ui line 158
+#: rc.cpp:1623
 #, no-c-format
-msgid "Homepage:"
-msgstr "Tudalen Gartref:"
+msgid "Use this arrows to add or remove items to your contact tooltips."
+msgstr ""
 
-#. i18n: file ./protocols/oscar/icq/ui/icqworkinfowidget.ui line 136
-#: rc.cpp:3466 rc.cpp:4007
+#. i18n: file ./kopete/config/appearance/tooltipeditwidget.ui line 201
+#: rc.cpp:1626
 #, no-c-format
-msgid "Zip:"
-msgstr "Zip :"
+msgid ""
+"This list contains elements which are currently <b>present</b> "
+"in the contact tooltips."
+msgstr ""
 
-#. i18n: file ./protocols/oscar/icq/ui/icqworkinfowidget.ui line 144
-#: rc.cpp:3469 rc.cpp:3773 rc.cpp:4001
+#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 25
+#: rc.cpp:1629
 #, no-c-format
-msgid "State:"
-msgstr "Talaith:"
+msgid "Enable &global identity"
+msgstr ""
 
-#. i18n: file ./protocols/oscar/icq/ui/icqworkinfowidget.ui line 168
-#: rc.cpp:3475 rc.cpp:3770 rc.cpp:3995 rc.cpp:4380 rc.cpp:4401
+#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 41
+#: rc.cpp:1632
 #, no-c-format
-msgid "Country:"
-msgstr "Gwlad:"
+msgid "Identity:"
+msgstr "Dynodiad:"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 27
-#: rc.cpp:3478
+#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 75
+#: rc.cpp:1635
 #, no-c-format
-msgid "C&lear"
-msgstr "&Gwaredu"
+msgid "Ne&w Identity..."
+msgstr "Dynodiad Ne&wydd"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 33
-#: rc.cpp:3481
+#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 83
+#: rc.cpp:1638
 #, fuzzy, no-c-format
-msgid "Clear the results"
-msgstr "Gwagio& Canlyniadau"
-
-#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 47
-#: rc.cpp:3487
-#, no-c-format
-msgid "Close this dialog"
-msgstr ""
+msgid "Cop&y Identity..."
+msgstr "Gwaredu Cyswllt"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 67
-#: rc.cpp:3493
+#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 91
+#: rc.cpp:1641
 #, no-c-format
-msgid "Stops the search"
-msgstr ""
+msgid "Rename I&dentity..."
+msgstr "A&ilenwi Dynodiad..."
 
-#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 87
-#: rc.cpp:3499
+#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 99
+#: rc.cpp:1644
 #, fuzzy, no-c-format
-msgid "Add the selected user to your contact list"
-msgstr "&Dileu y Cyswllt"
+msgid "Remo&ve Identity"
+msgstr "Gwaredu Cyswllt"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 98
-#: rc.cpp:3502
+#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 113
+#: rc.cpp:1647
 #, no-c-format
-msgid "User Info"
-msgstr "Gwybodaeth am Ddefnyddwyr"
-
-#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 104
-#: rc.cpp:3505
-#, fuzzy, no-c-format
-msgid "Show information about the selected contact"
-msgstr "&Dileu y Cyswllt"
+msgid "&Nickname"
+msgstr "&Ffugenw"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 133
-#: rc.cpp:3508
-#, fuzzy, no-c-format
-msgid "UIN Search"
-msgstr "Chwiliad:"
+#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 152
+#: rc.cpp:1650
+#, no-c-format
+msgid "Cu&stom:"
+msgstr "Ad&dasiedig:"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 144
-#: rc.cpp:3511 rc.cpp:3743
+#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 165
+#: rc.cpp:1653
 #, no-c-format
-msgid "&UIN #:"
+msgid "Use address boo&k name (need address book link)"
 msgstr ""
 
-#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 179
-#: rc.cpp:3514
+#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 173
+#: rc.cpp:1656
 #, no-c-format
-msgid "ICQ Whitepages Search"
+msgid "Use nickname from con&tact for global nickname:"
 msgstr ""
 
-#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 200
-#: rc.cpp:3517
-#, no-c-format
-msgid "&Last name:"
-msgstr "&Enw olaf:"
+#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 220
+#: rc.cpp:1662
+#, fuzzy, no-c-format
+msgid "P&hoto"
+msgstr "Ffoto"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 211
-#: rc.cpp:3520
+#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 275
+#: rc.cpp:1665
 #, no-c-format
-msgid "&First name:"
-msgstr "&Enw cyntaf:"
+msgid "S&ync address book photo with global photo"
+msgstr ""
 
-#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 222
-#: rc.cpp:3523 rc.cpp:3719 rc.cpp:3893
+#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 304
+#: rc.cpp:1671
 #, no-c-format
-msgid "&Email:"
-msgstr "E&bost:"
+msgid "U&se photo from contact for global photo:"
+msgstr ""
 
-#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 249
-#: rc.cpp:3529
+#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 312
+#: rc.cpp:1674
 #, no-c-format
-msgid "Lan&guage:"
-msgstr "Iai&th:"
+msgid "Use a&ddress book photo (needs address book link)"
+msgstr ""
 
-#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 270
-#: rc.cpp:3532 rc.cpp:3704 rc.cpp:3926
+#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 365
+#: rc.cpp:1677
 #, no-c-format
-msgid "&City:"
-msgstr "&Dinas:"
+msgid "<center>Photo</center>"
+msgstr ""
 
-#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 291
-#: rc.cpp:3535
+#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 419
+#: rc.cpp:1680
 #, fuzzy, no-c-format
-msgid "&Gender:"
-msgstr "&Cyffredinol"
+msgid "Address &Book Link"
+msgstr "&Cyfeiriad ebost:"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 307
-#: rc.cpp:3538
+#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 449
+#: rc.cpp:1683 rc.cpp:5078
 #, no-c-format
-msgid "Only search for online contacts"
-msgstr ""
+msgid "C&hange..."
+msgstr "N&ewid..."
 
-#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 315
-#: rc.cpp:3541
+#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 460
+#: rc.cpp:1686
 #, no-c-format
-msgid "C&ountry:"
-msgstr "G&wlad:"
+msgid ""
+"<b>Note:</b> The address book link uses KAddressBook's \n"
+"current user contact."
+msgstr ""
 
-#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 372
-#: rc.cpp:3547
+#. i18n: file ./kopete/config/accounts/kopeteaccountconfigbase.ui line 17
+#: rc.cpp:1690
 #, no-c-format
-msgid "Nickname"
-msgstr "Ffugenw"
+msgid "Manage Accounts"
+msgstr ""
 
-#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 416
-#: rc.cpp:3559
-#, fuzzy, no-c-format
-msgid "Requires Authorization?"
-msgstr "Dilysiant Gweinydd"
+#. i18n: file ./kopete/config/accounts/kopeteaccountconfigbase.ui line 31
+#: rc.cpp:1693 rc.cpp:4710
+#, no-c-format
+msgid "&New..."
+msgstr "&Newydd..."
 
-#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 432
-#: rc.cpp:3562
+#. i18n: file ./kopete/config/accounts/kopeteaccountconfigbase.ui line 34
+#: rc.cpp:1696
 #, no-c-format
-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."
+msgid "Add new account"
 msgstr ""
 
-#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 440
-#: rc.cpp:3565 rc.cpp:3803 rc.cpp:4740 rc.cpp:5048
+#. i18n: file ./kopete/config/accounts/kopeteaccountconfigbase.ui line 42
+#: rc.cpp:1699
 #, no-c-format
-msgid "&Search"
-msgstr " &Chwilio"
+msgid "&Modify..."
+msgstr "&Addasu..."
 
-#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 443
-#: rc.cpp:3568
+#. i18n: file ./kopete/config/accounts/kopeteaccountconfigbase.ui line 45
+#: rc.cpp:1702
 #, no-c-format
-msgid "Search the ICQ Whitepages with your search criteria"
+msgid "Modify selected account"
 msgstr ""
 
-#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 454
-#: rc.cpp:3571
-#, fuzzy, no-c-format
-msgid "New Search"
-msgstr "Chwiliad:"
-
-#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 457
-#: rc.cpp:3574
+#. i18n: file ./kopete/config/accounts/kopeteaccountconfigbase.ui line 48
+#: rc.cpp:1705
 #, no-c-format
-msgid "Clears both search fields and results"
+msgid "Let you edit the account's properties."
 msgstr ""
 
-#. i18n: file ./protocols/oscar/icq/ui/icqotherinfowidget.ui line 41
-#: rc.cpp:3577
+#. i18n: file ./kopete/config/accounts/kopeteaccountconfigbase.ui line 59
+#: rc.cpp:1711 rc.cpp:1714
 #, no-c-format
-msgid "Email addresses:"
-msgstr "Cyfeiriadau ebost:"
+msgid "Remove selected account"
+msgstr ""
 
-#. i18n: file ./protocols/oscar/icq/ui/icqotherinfowidget.ui line 54
-#: rc.cpp:3580
+#. i18n: file ./kopete/config/accounts/kopeteaccountconfigbase.ui line 100
+#: rc.cpp:1723
 #, no-c-format
-msgid "Contact notes:"
-msgstr "Nodiadau Cysylltiad :"
+msgid "Use &custom color"
+msgstr ""
 
-#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 16
-#: rc.cpp:3583
+#. i18n: file ./kopete/config/accounts/kopeteaccountconfigbase.ui line 103
+#: rc.cpp:1726
 #, no-c-format
-msgid "Account Preferences - ICQ"
+msgid "Use custom color for account"
 msgstr ""
 
-#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 48
-#: rc.cpp:3589
+#. i18n: file ./kopete/config/accounts/kopeteaccountconfigbase.ui line 106
+#: rc.cpp:1729
 #, no-c-format
-msgid "Account Preferences"
+msgid "Allows you to set a custom color for this account"
 msgstr ""
 
-#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 67
-#: rc.cpp:3592
+#. i18n: file ./kopete/config/accounts/kopeteaccountconfigbase.ui line 117
+#: rc.cpp:1732 rc.cpp:1770 rc.cpp:1801
 #, no-c-format
-msgid "IC&Q UIN:"
+msgid "Account custom color selector"
 msgstr ""
 
-#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 73
-#: rc.cpp:3595 rc.cpp:3601
+#. i18n: file ./kopete/config/accounts/kopeteaccountconfigbase.ui line 121
+#: rc.cpp:1735
 #, no-c-format
-msgid "The user ID of your ICQ account."
+msgid ""
+"Allows you to set a custom color for this account.\n"
+"The icon of every contact of this account will be coloured with this color. "
+"Useful if you have several accounts of the same protocol"
 msgstr ""
 
-#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 76
-#: rc.cpp:3598 rc.cpp:3604
+#. i18n: file ./kopete/config/accounts/kopeteaccountconfigbase.ui line 163
+#: rc.cpp:1739
 #, no-c-format
-msgid ""
-"The user ID of your ICQ account.  This should be in the form of a number (no "
-"decimals, no spaces)."
+msgid "Increase the priority"
 msgstr ""
 
-#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 160
-#: rc.cpp:3619
+#. i18n: file ./kopete/config/accounts/kopeteaccountconfigbase.ui line 167
+#: rc.cpp:1742 rc.cpp:1749
 #, no-c-format
 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."
+"Uses these buttons to increase or decrease the priority.\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/oscar/icq/ui/icqeditaccountui.ui line 234
-#: rc.cpp:3632 rc.cpp:3650
+#. i18n: file ./kopete/config/accounts/kopeteaccountconfigbase.ui line 201
+#: rc.cpp:1746
 #, no-c-format
-msgid "The port on the ICQ server that you would like to connect to."
+msgid "Decrease the priority"
 msgstr ""
 
-#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 237
-#: rc.cpp:3635 rc.cpp:3653
+#. i18n: file ./kopete/addaccountwizard/addaccountwizardpage2.ui line 39
+#: rc.cpp:1756
 #, no-c-format
 msgid ""
-"The port on the ICQ server that you would like to connect to.  Normally this is "
-"5190."
+"<h2>Congratulations</h2>\n"
+"<p>You have finished configuring the account. Please click the \"Finish\" "
+"button.</p>"
 msgstr ""
 
-#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 248
-#: rc.cpp:3638
+#. i18n: file ./kopete/addaccountwizard/addaccountwizardpage2.ui line 59
+#: rc.cpp:1760 rc.cpp:1791
 #, no-c-format
-msgid "login.icq.com"
+msgid ""
+"Use &custom color\n"
+"for account:"
 msgstr ""
 
-#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 251
-#: rc.cpp:3641 rc.cpp:3659
+#. i18n: file ./kopete/addaccountwizard/addaccountwizardpage2.ui line 62
+#: rc.cpp:1764 rc.cpp:1795
 #, no-c-format
-msgid "The IP address or hostmask of the ICQ server you wish to connect to."
+msgid "Use a custom color for this account"
 msgstr ""
 
-#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 254
-#: rc.cpp:3644 rc.cpp:3662
+#. i18n: file ./kopete/addaccountwizard/addaccountwizardpage2.ui line 65
+#: rc.cpp:1767 rc.cpp:1798
 #, no-c-format
 msgid ""
-"The IP address or hostmask of the ICQ server you wish to connect to.  Normally "
-"you will want the default (login.icq.com)."
+"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 ./protocols/oscar/icq/ui/icqeditaccountui.ui line 312
-#: rc.cpp:3668
-#, no-c-format
-msgid "Privacy Options"
-msgstr ""
+#. i18n: file ./kopete/addaccountwizard/addaccountwizardpage2.ui line 131
+#: rc.cpp:1773 rc.cpp:1804
+#, fuzzy, no-c-format
+msgid "Co&nnect now"
+msgstr "Cy&sylltiad"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 323
-#: rc.cpp:3671
+#. i18n: file ./kopete/addaccountwizard/addaccountwizardpage2.ui line 137
+#: rc.cpp:1776 rc.cpp:1807
 #, no-c-format
-msgid "&Require authorization before someone can add you to their contact list"
+msgid "Connect right after Finish is pressed"
 msgstr ""
 
-#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 326
-#: rc.cpp:3674
+#. i18n: file ./kopete/addaccountwizard/addaccountwizardpage2.ui line 140
+#: rc.cpp:1779 rc.cpp:1810
 #, no-c-format
 msgid ""
-"Enable authorization requirement, which will not allow users to add you to "
-"their contact list without authorization from you."
+"If this is checked, the account will be connected right after you clicked on <i>"
+"Finished</i>."
 msgstr ""
 
-#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 329
-#: rc.cpp:3677
+#. i18n: file ./kopete/addaccountwizard/addaccountwizardpage3.ui line 41
+#: rc.cpp:1785
 #, no-c-format
 msgid ""
-"Enable 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."
+"<h2>Congratulations</h2> \n"
+"<p>You have finished configuring the account. Please click the \"Finish\" "
+"button.</p>\n"
+"\n"
 msgstr ""
 
-#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 337
-#: rc.cpp:3680
-#, fuzzy, no-c-format
-msgid "Hide &IP address"
-msgstr "Cyfeiriad Cartref"
-
-#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 340
-#: rc.cpp:3683
+#. i18n: file ./kopete/addaccountwizard/addaccountwizardpage1.ui line 22
+#: rc.cpp:1813
 #, no-c-format
-msgid ""
-"Check this to hide your IP address from people when they view your user info"
+msgid "Step One: Select Messaging Service"
 msgstr ""
 
-#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 343
-#: rc.cpp:3686
+#. i18n: file ./kopete/addaccountwizard/addaccountwizardpage1.ui line 122
+#: rc.cpp:1822
 #, no-c-format
 msgid ""
-"Checking this box will not allow people to see what your IP address if they "
-"view your ICQ user details such as name, address, or age."
+"<h2>Welcome to the Add Account Wizard</h2>\n"
+"<p>Select the messaging service from the list below.</p>"
 msgstr ""
 
-#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 351
-#: rc.cpp:3689
+#. i18n: file ./kopete/kopeteui.rc line 61
+#: rc.cpp:1841
 #, no-c-format
-msgid "Make my status available via &ICQ's unified messaging center"
+msgid "Global Identity Bar"
 msgstr ""
 
-#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 357
-#: rc.cpp:3692
+#. i18n: file ./kopete/kopeteui.rc line 70
+#: rc.cpp:1844
 #, no-c-format
-msgid "Check this box to enable Web Aware functionality."
-msgstr ""
+msgid "&Other Actions"
+msgstr "Gweithredoedd &eraill"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 360
-#: rc.cpp:3695
+#. i18n: file ./kopete/kopeteui.rc line 77
+#: rc.cpp:1847
 #, no-c-format
-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."
+msgid "&Groups"
+msgstr "&Grwpiau"
+
+#. i18n: file ./protocols/winpopup/ui/wpeditaccountbase.ui line 16
+#: rc.cpp:1850
+#, no-c-format
+msgid "Account Preferences - WinPopup"
 msgstr ""
 
-#. i18n: file ./protocols/oscar/icq/ui/icqgeneralinfo.ui line 24
-#: rc.cpp:3701
+#. i18n: file ./protocols/winpopup/ui/wpeditaccountbase.ui line 48
+#: rc.cpp:1853
 #, fuzzy, no-c-format
-msgid "Location && Contact Information"
-msgstr "Gwybodaeth Cyfrif"
+msgid "Basi&c Setup"
+msgstr "&Sylfaenol"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqgeneralinfo.ui line 46
-#: rc.cpp:3707 rc.cpp:3917
+#. i18n: file ./protocols/winpopup/ui/wpeditaccountbase.ui line 59
+#: rc.cpp:1856 rc.cpp:2230 rc.cpp:2359 rc.cpp:2509 rc.cpp:2950 rc.cpp:3615
+#: rc.cpp:3891 rc.cpp:4394 rc.cpp:4752
 #, no-c-format
-msgid "&Address:"
-msgstr "Cyf&eiriad:"
+msgid "Account Information"
+msgstr "Gwybodaeth Cyfrif"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqgeneralinfo.ui line 57
-#: rc.cpp:3710 rc.cpp:3908
+#. i18n: file ./protocols/winpopup/ui/wpeditaccountbase.ui line 78
+#: rc.cpp:1859
 #, no-c-format
-msgid "&Phone:"
-msgstr "&Ffôn:"
+msgid "Hos&tname:"
+msgstr "&Enw gwesteiwr:"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqgeneralinfo.ui line 68
-#: rc.cpp:3713 rc.cpp:3923
+#. i18n: file ./protocols/winpopup/ui/wpeditaccountbase.ui line 84
+#: rc.cpp:1862 rc.cpp:1868
 #, no-c-format
-msgid "&State:"
-msgstr "&Talaith:"
+msgid "The hostname you would like to use to send WinPopup messages as."
+msgstr ""
 
-#. i18n: file ./protocols/oscar/icq/ui/icqgeneralinfo.ui line 95
-#: rc.cpp:3716 rc.cpp:3920
+#. i18n: file ./protocols/winpopup/ui/wpeditaccountbase.ui line 87
+#: rc.cpp:1865 rc.cpp:1871
 #, no-c-format
-msgid "Countr&y:"
-msgstr "Gwlad:"
+msgid ""
+"The hostname you would like to use to send WinPopup messages as.  Note that "
+"this does not have to be the actual hostname of the machine to send messages, "
+"but it does to receive them."
+msgstr ""
 
-#. i18n: file ./protocols/oscar/icq/ui/icqgeneralinfo.ui line 149
-#: rc.cpp:3722 rc.cpp:3890
+#. i18n: file ./protocols/winpopup/ui/wpeditaccountbase.ui line 106
+#: rc.cpp:1874
 #, no-c-format
-msgid "&Homepage:"
-msgstr "T&udalen Gartref:"
+msgid "I&nstall Into Samba"
+msgstr ""
 
-#. i18n: file ./protocols/oscar/icq/ui/icqgeneralinfo.ui line 200
-#: rc.cpp:3725 rc.cpp:3902
+#. i18n: file ./protocols/winpopup/ui/wpeditaccountbase.ui line 109
+#: rc.cpp:1877 rc.cpp:1880
 #, no-c-format
-msgid "Fa&x:"
-msgstr "Ff&acs:"
+msgid "Install support into Samba to enable this service."
+msgstr ""
 
-#. i18n: file ./protocols/oscar/icq/ui/icqgeneralinfo.ui line 230
-#: rc.cpp:3728 rc.cpp:3911
+#. i18n: file ./protocols/winpopup/ui/wpeditaccountbase.ui line 143
+#: rc.cpp:1886
 #, no-c-format
-msgid "Ce&ll:"
-msgstr "Ce&ll:"
+msgid ""
+"To receive WinPopup messages sent from other machines, the hostname above must "
+"be set to this machine's hostname."
+msgstr ""
 
-#. i18n: file ./protocols/oscar/icq/ui/icqgeneralinfo.ui line 257
-#: rc.cpp:3731 rc.cpp:3929
+#. i18n: file ./protocols/winpopup/ui/wpeditaccountbase.ui line 154
+#: rc.cpp:1889
 #, no-c-format
-msgid "&Zip:"
-msgstr "&Zip :"
+msgid "The samba server must be configured and running."
+msgstr ""
 
-#. i18n: file ./protocols/oscar/icq/ui/icqgeneralinfo.ui line 289
-#: rc.cpp:3734 rc.cpp:3857
+#. i18n: file ./protocols/winpopup/ui/wpeditaccountbase.ui line 164
+#: rc.cpp:1892
 #, no-c-format
-msgid "Personal Information"
-msgstr "Gwybodaeth Bersonol"
+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 add\n"
+"'message command = _PATH_TO_/winpopup-send.sh %s %m %t &' (substitute _PATH_TO_ "
+"by the real path) to your smb.conf [global]-section."
+msgstr ""
 
-#. i18n: file ./protocols/oscar/icq/ui/icqgeneralinfo.ui line 316
-#: rc.cpp:3737
+#. i18n: file ./protocols/winpopup/ui/wpeditaccountbase.ui line 196
+#: rc.cpp:1897
 #, no-c-format
-msgid "&Full name:"
-msgstr "&Enw llawn:"
+msgid "S&ystem"
+msgstr "C&ysawd:"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqgeneralinfo.ui line 398
-#: rc.cpp:3746
+#. i18n: file ./protocols/winpopup/ui/wpeditaccountbase.ui line 235
+#: rc.cpp:1903
 #, no-c-format
-msgid "&Birthday:"
-msgstr "&Penblwydd :"
+msgid "<i>These options apply to all WinPopup accounts.</i>"
+msgstr ""
 
-#. i18n: file ./protocols/oscar/icq/ui/icqgeneralinfo.ui line 414
-#: rc.cpp:3749
+#. i18n: file ./protocols/winpopup/ui/wpeditaccountbase.ui line 245
+#: rc.cpp:1906
 #, fuzzy, no-c-format
-msgid "Gen&der:"
-msgstr "Cyffredinol"
+msgid "Protocol Preferences"
+msgstr "Gwall protocol."
 
-#. i18n: file ./protocols/oscar/icq/ui/icqgeneralinfo.ui line 449
-#: rc.cpp:3752
+#. i18n: file ./protocols/winpopup/ui/wpeditaccountbase.ui line 256
+#: rc.cpp:1909
 #, no-c-format
-msgid "&IP:"
-msgstr "&IP :"
+msgid "Host check frequency:"
+msgstr ""
 
-#. i18n: file ./protocols/oscar/icq/ui/icqgeneralinfo.ui line 460
-#: rc.cpp:3755
+#. i18n: file ./protocols/winpopup/ui/wpeditaccountbase.ui line 264
+#: rc.cpp:1912
 #, no-c-format
-msgid "&Timezone:"
-msgstr "&Amserfa:"
+msgid "Path to 'smbclient' executable:"
+msgstr ""
 
-#. i18n: file ./protocols/oscar/icq/ui/icqgeneralinfo.ui line 471
-#: rc.cpp:3758
+#. i18n: file ./protocols/winpopup/ui/wpeditaccountbase.ui line 315
+#: rc.cpp:1915
 #, no-c-format
-msgid "Marital status:"
+msgid "second(s)"
+msgstr "eiliad(au)"
+
+#. i18n: file ./protocols/winpopup/ui/wpuserinfowidget.ui line 48
+#: rc.cpp:1918
+#, fuzzy, no-c-format
+msgid "&Computer name:"
+msgstr "Cyfrifiaduron"
+
+#. i18n: file ./protocols/winpopup/ui/wpuserinfowidget.ui line 54
+#: rc.cpp:1921 rc.cpp:1924 rc.cpp:1957 rc.cpp:1960
+#, no-c-format
+msgid "The hostname of the computer for this contact."
 msgstr ""
 
-#. i18n: file ./protocols/oscar/icq/ui/icqgeneralinfo.ui line 487
-#: rc.cpp:3761
+#. i18n: file ./protocols/winpopup/ui/wpuserinfowidget.ui line 65
+#: rc.cpp:1927
 #, no-c-format
-msgid "A&ge:"
-msgstr "O&edran :"
+msgid "Comment:"
+msgstr "Sylwad:"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqgeneralinfo.ui line 508
-#: rc.cpp:3764
+#. i18n: file ./protocols/winpopup/ui/wpuserinfowidget.ui line 73
+#: rc.cpp:1930 rc.cpp:1996
 #, no-c-format
-msgid "Origin"
+msgid "&Workgroup/domain:"
 msgstr ""
 
-#. i18n: file ./protocols/oscar/icq/ui/icqauthreplyui.ui line 16
-#: rc.cpp:3776
+#. i18n: file ./protocols/winpopup/ui/wpuserinfowidget.ui line 79
+#: rc.cpp:1933 rc.cpp:1936 rc.cpp:1969 rc.cpp:1972
 #, no-c-format
-msgid "ICQ Authorization Reply"
+msgid "The workgroup or domain the contact's computer is on."
 msgstr ""
 
-#. i18n: file ./protocols/oscar/icq/ui/icqauthreplyui.ui line 43
-#: rc.cpp:3779
+#. i18n: file ./protocols/winpopup/ui/wpuserinfowidget.ui line 90
+#: rc.cpp:1939
 #, no-c-format
-msgid "Reason:"
-msgstr "Rheswm:"
+msgid "Operating s&ystem:"
+msgstr ""
 
-#. i18n: file ./protocols/oscar/icq/ui/icqauthreplyui.ui line 108
-#: rc.cpp:3782
-#, fuzzy, no-c-format
-msgid "&Grant authorization"
-msgstr "Yn aros am awdurdodiad"
+#. i18n: file ./protocols/winpopup/ui/wpuserinfowidget.ui line 96
+#: rc.cpp:1942 rc.cpp:1945 rc.cpp:1975 rc.cpp:1978
+#, no-c-format
+msgid "The operating system the contact's computer is running."
+msgstr ""
 
-#. i18n: file ./protocols/oscar/icq/ui/icqauthreplyui.ui line 119
-#: rc.cpp:3785
-#, fuzzy, no-c-format
-msgid "&Decline authorization"
-msgstr "Yn aros am awdurdodiad"
+#. i18n: file ./protocols/winpopup/ui/wpuserinfowidget.ui line 107
+#: rc.cpp:1948
+#, no-c-format
+msgid "Ser&ver software:"
+msgstr ""
 
-#. i18n: file ./protocols/oscar/icq/ui/icqauthreplyui.ui line 148
-#: rc.cpp:3788
+#. i18n: file ./protocols/winpopup/ui/wpuserinfowidget.ui line 113
+#: rc.cpp:1951 rc.cpp:1954 rc.cpp:1981 rc.cpp:1984
 #, no-c-format
-msgid "%1 requested authorization to add you to his/her contact list."
+msgid "The software the contact's computer is running."
 msgstr ""
 
-#. i18n: file ./protocols/oscar/icq/ui/icqauthreplyui.ui line 172
-#: rc.cpp:3791
+#. i18n: file ./protocols/winpopup/ui/wpuserinfowidget.ui line 151
+#: rc.cpp:1963 rc.cpp:1966
 #, no-c-format
-msgid "Request Reason:"
+msgid "The comment of the computer for this contact."
 msgstr ""
 
-#. i18n: file ./protocols/oscar/icq/ui/icqauthreplyui.ui line 188
-#: rc.cpp:3794
-#, fuzzy, no-c-format
-msgid "Some reason..."
-msgstr "Gwasanaethau ..."
+#. i18n: file ./protocols/winpopup/ui/wpaddcontactbase.ui line 50
+#: rc.cpp:1987
+#, no-c-format
+msgid "Com&puter hostname:"
+msgstr ""
 
-#. i18n: file ./protocols/oscar/icq/ui/icqadd.ui line 38
-#: rc.cpp:3797
+#. i18n: file ./protocols/winpopup/ui/wpaddcontactbase.ui line 56
+#: rc.cpp:1990 rc.cpp:1993 rc.cpp:2005 rc.cpp:2008
 #, no-c-format
-msgid "UIN #:"
+msgid "The hostname you would like to use to send WinPopup messages to."
 msgstr ""
 
-#. i18n: file ./protocols/oscar/icq/ui/icqadd.ui line 61
-#: rc.cpp:3800
+#. i18n: file ./protocols/winpopup/ui/wpaddcontactbase.ui line 73
+#: rc.cpp:1999 rc.cpp:2002 rc.cpp:2011 rc.cpp:2014
 #, no-c-format
-msgid "Alternatively, you can search the ICQ Whitepages :"
+msgid ""
+"The workgroup or domain the computer is on that you would like to use to send "
+"WinPopup messages to."
 msgstr ""
 
-#. i18n: file ./protocols/oscar/oscarencodingselectionbase.ui line 27
-#: rc.cpp:3806
+#. i18n: file ./protocols/winpopup/ui/wpaddcontactbase.ui line 148
+#: rc.cpp:2017 rc.cpp:4125
 #, no-c-format
-msgid "Use this &encoding when chatting with this contact:"
+msgid "&Refresh"
+msgstr "&Ailfywio"
+
+#. i18n: file ./protocols/winpopup/ui/wpaddcontactbase.ui line 151
+#: rc.cpp:2020 rc.cpp:2023
+#, no-c-format
+msgid ""
+"Refresh the list of available workgroups & domains on the Windows network."
 msgstr ""
 
-#. i18n: file ./protocols/oscar/oscarvisibilitybase.ui line 24
-#: rc.cpp:3809
+#. i18n: file ./protocols/yahoo/ui/yahooworkinfowidget.ui line 24
+#: rc.cpp:2029 rc.cpp:3321
 #, fuzzy, no-c-format
-msgid "Always visible:"
-msgstr "Segur"
+msgid "Personal Work Information"
+msgstr "Gwybodaeth Defnyddiwr"
 
-#. i18n: file ./protocols/oscar/oscarvisibilitybase.ui line 32
-#: rc.cpp:3812
-#, fuzzy, no-c-format
-msgid "Contacts:"
-msgstr "Cyswllt :"
+#. i18n: file ./protocols/yahoo/ui/yahooworkinfowidget.ui line 35
+#: libkopete/ui/userinfodialog.cpp:233 rc.cpp:2032 rc.cpp:3324
+#, no-c-format
+msgid "Phone:"
+msgstr "Ffôn:"
 
-#. i18n: file ./protocols/oscar/oscarvisibilitybase.ui line 155
-#: rc.cpp:3827
+#. i18n: file ./protocols/yahoo/ui/yahooworkinfowidget.ui line 61
+#: rc.cpp:2035 rc.cpp:3336
 #, fuzzy, no-c-format
-msgid "Always invisible:"
-msgstr "Segur"
+msgid "Company Location Information"
+msgstr "Gwybodaeth Cyfrif"
 
-#. i18n: file ./protocols/oscar/oscarlistcontactsbase.ui line 24
-#: rc.cpp:3830
+#. i18n: file ./protocols/yahoo/ui/yahooworkinfowidget.ui line 72
+#: libkopete/ui/userinfodialog.cpp:209 rc.cpp:2038 rc.cpp:3339 rc.cpp:4179
+#: rc.cpp:4488
 #, no-c-format
-msgid ""
-"The following contacts are not on your contact list. Would you like to add "
-"them?"
-msgstr ""
+msgid "Name:"
+msgstr "Enw:"
 
-#. i18n: file ./protocols/oscar/oscarlistcontactsbase.ui line 43
-#: rc.cpp:3833
+#. i18n: file ./protocols/yahoo/ui/yahooworkinfowidget.ui line 80
+#: rc.cpp:2041 rc.cpp:2824 rc.cpp:3342
 #, no-c-format
-msgid "Do &not ask again"
-msgstr "P&eidio a gofyn eto"
+msgid "Homepage:"
+msgstr "Tudalen Gartref:"
+
+#. i18n: file ./protocols/yahoo/ui/yahooworkinfowidget.ui line 112
+#: rc.cpp:2044 rc.cpp:2860 rc.cpp:2881 rc.cpp:3357 rc.cpp:3561
+#, no-c-format
+msgid "Country:"
+msgstr "Gwlad:"
+
+#. i18n: file ./protocols/yahoo/ui/yahooworkinfowidget.ui line 133
+#: libkopete/ui/userinfodialog.cpp:229 rc.cpp:2047 rc.cpp:3345
+#, no-c-format
+msgid "Address:"
+msgstr "Cyfeiriad:"
+
+#. i18n: file ./protocols/yahoo/ui/yahooworkinfowidget.ui line 174
+#: rc.cpp:2050 rc.cpp:3351 rc.cpp:3564
+#, no-c-format
+msgid "State:"
+msgstr "Talaith:"
+
+#. i18n: file ./protocols/yahoo/ui/yahooworkinfowidget.ui line 182
+#: rc.cpp:2053 rc.cpp:2857 rc.cpp:2872 rc.cpp:3354 rc.cpp:3558 rc.cpp:4188
+#: rc.cpp:4503
+#, no-c-format
+msgid "City:"
+msgstr "Dinas:"
+
+#. i18n: file ./protocols/yahoo/ui/yahooworkinfowidget.ui line 190
+#: rc.cpp:2056 rc.cpp:3348
+#, no-c-format
+msgid "Zip:"
+msgstr "Zip :"
 
 #. i18n: file ./protocols/yahoo/ui/yahooadd.ui line 16
-#: rc.cpp:3836
+#: rc.cpp:2059
 #, no-c-format
 msgid "Add Yahoo Contact"
 msgstr ""
 
 #. i18n: file ./protocols/yahoo/ui/yahooadd.ui line 41
-#: rc.cpp:3839 rc.cpp:4040
+#: rc.cpp:2062 rc.cpp:2233
 #, no-c-format
 msgid "&Yahoo username:"
 msgstr "Enw'r defnyddiwr &Yahoo :"
 
 #. i18n: file ./protocols/yahoo/ui/yahooadd.ui line 47
-#: rc.cpp:3842 rc.cpp:3848
+#: rc.cpp:2065 rc.cpp:2071
 #, no-c-format
 msgid "The account name of the Yahoo account you would like to add."
 msgstr ""
 
 #. i18n: file ./protocols/yahoo/ui/yahooadd.ui line 50
-#: rc.cpp:3845 rc.cpp:3851
+#: rc.cpp:2068 rc.cpp:2074
 #, no-c-format
 msgid ""
 "The account name of the Yahoo account you would like to add.  This should be in "
@@ -8518,209 +10704,300 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./protocols/yahoo/ui/yahooadd.ui line 71
-#: rc.cpp:3854
+#: rc.cpp:2077
 #, no-c-format
 msgid "<i>(for example: joe8752)</i>"
 msgstr ""
 
+#. i18n: file ./protocols/yahoo/ui/yahooverifyaccountbase.ui line 30
+#: rc.cpp:2080
+#, no-c-format
+msgid ""
+"Your Account has to be verified because of too many false login attempts."
+"<br>"
+msgstr ""
+
+#. i18n: file ./protocols/yahoo/ui/yahooverifyaccountbase.ui line 46
+#: rc.cpp:2083
+#, no-c-format
+msgid "Please enter the chars shown in the picture:"
+msgstr ""
+
+#. i18n: file ./protocols/yahoo/ui/yahooinvitelistbase.ui line 16
+#: rc.cpp:2086
+#, no-c-format
+msgid "Invite Friends to Conference"
+msgstr ""
+
+#. i18n: file ./protocols/yahoo/ui/yahooinvitelistbase.ui line 35
+#: rc.cpp:2089
+#, no-c-format
+msgid "Conference Members"
+msgstr ""
+
+#. i18n: file ./protocols/yahoo/ui/yahooinvitelistbase.ui line 54
+#: rc.cpp:2092
+#, no-c-format
+msgid "Friend List"
+msgstr ""
+
+#. i18n: file ./protocols/yahoo/ui/yahooinvitelistbase.ui line 60
+#: rc.cpp:2095 rc.cpp:2101
+#, fuzzy, no-c-format
+msgid "New Item"
+msgstr "Dynodiad Newydd"
+
+#. i18n: file ./protocols/yahoo/ui/yahooinvitelistbase.ui line 88
+#: rc.cpp:2098
+#, no-c-format
+msgid "Chat Invitation List"
+msgstr ""
+
+#. i18n: file ./protocols/yahoo/ui/yahooinvitelistbase.ui line 162
+#: rc.cpp:2107
+#, fuzzy, no-c-format
+msgid "Add >>"
+msgstr "&Ychwanegu"
+
+#. i18n: file ./protocols/yahoo/ui/yahooinvitelistbase.ui line 170
+#: rc.cpp:2110
+#, fuzzy, no-c-format
+msgid "<< Remove"
+msgstr "&Gwaredu"
+
+#. i18n: file ./protocols/yahoo/ui/yahooinvitelistbase.ui line 207
+#: rc.cpp:2113
+#, fuzzy, no-c-format
+msgid "Invitation Message"
+msgstr "Negeseuon newydd Gyraedd"
+
+#. i18n: file ./protocols/yahoo/ui/yahooinvitelistbase.ui line 288
+#: rc.cpp:2119
+#, fuzzy, no-c-format
+msgid "Invite"
+msgstr "G&wahodd"
+
+#. i18n: file ./protocols/yahoo/ui/yahoogeneralinfowidget.ui line 24
+#: rc.cpp:2122 rc.cpp:3525
+#, no-c-format
+msgid "Personal Information"
+msgstr "Gwybodaeth Bersonol"
+
 #. i18n: file ./protocols/yahoo/ui/yahoogeneralinfowidget.ui line 46
-#: rc.cpp:3863
+#: rc.cpp:2128
 #, fuzzy, no-c-format
 msgid "Second name:"
 msgstr "Enw sgrîn:"
 
+#. i18n: file ./protocols/yahoo/ui/yahoogeneralinfowidget.ui line 92
+#: rc.cpp:2134 rc.cpp:3411 rc.cpp:3531
+#, no-c-format
+msgid "&Nickname:"
+msgstr "Ffuge&nw:"
+
 #. i18n: file ./protocols/yahoo/ui/yahoogeneralinfowidget.ui line 119
-#: rc.cpp:3872
+#: rc.cpp:2137
 #, no-c-format
 msgid "Yahoo ID:"
 msgstr ""
 
 #. i18n: file ./protocols/yahoo/ui/yahoogeneralinfowidget.ui line 130
-#: rc.cpp:3875
+#: rc.cpp:2140
 #, fuzzy, no-c-format
 msgid "Title:"
 msgstr "Teitl"
 
 #. i18n: file ./protocols/yahoo/ui/yahoogeneralinfowidget.ui line 141
-#: rc.cpp:3878
+#: rc.cpp:2143
 #, no-c-format
 msgid "Anniversary:"
 msgstr ""
 
 #. i18n: file ./protocols/yahoo/ui/yahoogeneralinfowidget.ui line 203
-#: rc.cpp:3881 rc.cpp:4341
+#: rc.cpp:2146 rc.cpp:2821
 #, no-c-format
 msgid "Birthday:"
 msgstr "Penblwydd :"
 
+#. i18n: file ./protocols/yahoo/ui/yahoogeneralinfowidget.ui line 233
+#: rc.cpp:2149 rc.cpp:3603
+#, no-c-format
+msgid "Contact Information"
+msgstr "Gwybodaeth Cysylltu"
+
 #. i18n: file ./protocols/yahoo/ui/yahoogeneralinfowidget.ui line 244
-#: rc.cpp:3887
+#: rc.cpp:2152
 #, no-c-format
 msgid "Pager:"
 msgstr ""
 
+#. i18n: file ./protocols/yahoo/ui/yahoogeneralinfowidget.ui line 255
+#: rc.cpp:2155 rc.cpp:3513
+#, no-c-format
+msgid "&Homepage:"
+msgstr "T&udalen Gartref:"
+
+#. i18n: file ./protocols/yahoo/ui/yahoogeneralinfowidget.ui line 282
+#: rc.cpp:2158 rc.cpp:3408 rc.cpp:3510
+#, no-c-format
+msgid "&Email:"
+msgstr "E&bost:"
+
 #. i18n: file ./protocols/yahoo/ui/yahoogeneralinfowidget.ui line 293
-#: rc.cpp:3896
+#: rc.cpp:2161
 #, fuzzy, no-c-format
 msgid "Email &3:"
 msgstr "Ebost:"
 
 #. i18n: file ./protocols/yahoo/ui/yahoogeneralinfowidget.ui line 304
-#: rc.cpp:3899
+#: rc.cpp:2164
 #, fuzzy, no-c-format
 msgid "Email &2:"
 msgstr "Ebost:"
 
+#. i18n: file ./protocols/yahoo/ui/yahoogeneralinfowidget.ui line 371
+#: rc.cpp:2167 rc.cpp:3516
+#, no-c-format
+msgid "Fa&x:"
+msgstr "Ff&acs:"
+
 #. i18n: file ./protocols/yahoo/ui/yahoogeneralinfowidget.ui line 382
-#: rc.cpp:3905
+#: rc.cpp:2170
 #, fuzzy, no-c-format
 msgid "Additional:"
 msgstr "Lleoliad:"
 
+#. i18n: file ./protocols/yahoo/ui/yahoogeneralinfowidget.ui line 425
+#: rc.cpp:2173 rc.cpp:3501
+#, no-c-format
+msgid "&Phone:"
+msgstr "&Ffôn:"
+
+#. i18n: file ./protocols/yahoo/ui/yahoogeneralinfowidget.ui line 452
+#: rc.cpp:2176 rc.cpp:3519
+#, no-c-format
+msgid "Ce&ll:"
+msgstr "Ce&ll:"
+
 #. i18n: file ./protocols/yahoo/ui/yahoogeneralinfowidget.ui line 476
-#: rc.cpp:3914
+#: rc.cpp:2179
 #, fuzzy, no-c-format
 msgid "Location Information"
 msgstr "Gwybodaeth Cyfrif"
 
-#. i18n: file ./protocols/yahoo/ui/yahooinvitelistbase.ui line 16
-#: rc.cpp:3932
+#. i18n: file ./protocols/yahoo/ui/yahoogeneralinfowidget.ui line 487
+#: rc.cpp:2182 rc.cpp:3498
 #, no-c-format
-msgid "Invite Friends to Conference"
-msgstr ""
+msgid "&Address:"
+msgstr "Cyf&eiriad:"
 
-#. i18n: file ./protocols/yahoo/ui/yahooinvitelistbase.ui line 35
-#: rc.cpp:3935
+#. i18n: file ./protocols/yahoo/ui/yahoogeneralinfowidget.ui line 498
+#: rc.cpp:2185 rc.cpp:3507
 #, no-c-format
-msgid "Conference Members"
-msgstr ""
+msgid "Countr&y:"
+msgstr "Gwlad:"
 
-#. i18n: file ./protocols/yahoo/ui/yahooinvitelistbase.ui line 54
-#: rc.cpp:3938
+#. i18n: file ./protocols/yahoo/ui/yahoogeneralinfowidget.ui line 531
+#: rc.cpp:2188 rc.cpp:3504
 #, no-c-format
-msgid "Friend List"
-msgstr ""
-
-#. i18n: file ./protocols/yahoo/ui/yahooinvitelistbase.ui line 60
-#: rc.cpp:3941 rc.cpp:3947
-#, fuzzy, no-c-format
-msgid "New Item"
-msgstr "Dynodiad Newydd"
+msgid "&State:"
+msgstr "&Talaith:"
 
-#. i18n: file ./protocols/yahoo/ui/yahooinvitelistbase.ui line 88
-#: rc.cpp:3944
+#. i18n: file ./protocols/yahoo/ui/yahoogeneralinfowidget.ui line 558
+#: rc.cpp:2191 rc.cpp:3417 rc.cpp:3495
 #, no-c-format
-msgid "Chat Invitation List"
-msgstr ""
-
-#. i18n: file ./protocols/yahoo/ui/yahooinvitelistbase.ui line 162
-#: rc.cpp:3953
-#, fuzzy, no-c-format
-msgid "Add >>"
-msgstr "&Ychwanegu"
-
-#. i18n: file ./protocols/yahoo/ui/yahooinvitelistbase.ui line 170
-#: rc.cpp:3956
-#, fuzzy, no-c-format
-msgid "<< Remove"
-msgstr "&Gwaredu"
-
-#. i18n: file ./protocols/yahoo/ui/yahooinvitelistbase.ui line 207
-#: rc.cpp:3959
-#, fuzzy, no-c-format
-msgid "Invitation Message"
-msgstr "Negeseuon newydd Gyraedd"
+msgid "&City:"
+msgstr "&Dinas:"
 
-#. i18n: file ./protocols/yahoo/ui/yahooinvitelistbase.ui line 288
-#: rc.cpp:3965
-#, fuzzy, no-c-format
-msgid "Invite"
-msgstr "G&wahodd"
+#. i18n: file ./protocols/yahoo/ui/yahoogeneralinfowidget.ui line 593
+#: rc.cpp:2194 rc.cpp:3522
+#, no-c-format
+msgid "&Zip:"
+msgstr "&Zip :"
 
 #. i18n: file ./protocols/yahoo/ui/yahoostealthsetting.ui line 30
-#: rc.cpp:3968
+#: rc.cpp:2197
 #, fuzzy, no-c-format
 msgid "Show Me As"
 msgstr "Gwasanaethau ..."
 
 #. i18n: file ./protocols/yahoo/ui/yahoostealthsetting.ui line 45
-#: rc.cpp:3971
+#: rc.cpp:2200
 #, no-c-format
 msgid "Perma&nently offline"
 msgstr ""
 
 #. i18n: file ./protocols/yahoo/ui/yahoostealthsetting.ui line 83
-#: rc.cpp:3977
+#: rc.cpp:2206
 #, fuzzy, no-c-format
 msgid "Off&line"
 msgstr "All-lein"
 
 #. i18n: file ./protocols/yahoo/ui/yahoootherinfowidget.ui line 24
-#: rc.cpp:4010
+#: rc.cpp:2209
 #, fuzzy, no-c-format
 msgid "Contact comments:"
 msgstr "Nodiadau Cysylltiad :"
 
 #. i18n: file ./protocols/yahoo/ui/yahoootherinfowidget.ui line 40
-#: rc.cpp:4013
+#: rc.cpp:2212
 #, fuzzy, no-c-format
 msgid "Note 1:"
 msgstr "&Nodiadau"
 
 #. i18n: file ./protocols/yahoo/ui/yahoootherinfowidget.ui line 56
-#: rc.cpp:4016
+#: rc.cpp:2215
 #, fuzzy, no-c-format
 msgid "Note 2:"
 msgstr "&Nodiadau"
 
 #. i18n: file ./protocols/yahoo/ui/yahoootherinfowidget.ui line 80
-#: rc.cpp:4019
+#: rc.cpp:2218
 #, fuzzy, no-c-format
 msgid "Note 3:"
 msgstr "&Nodiadau"
 
 #. i18n: file ./protocols/yahoo/ui/yahoootherinfowidget.ui line 96
-#: rc.cpp:4022
+#: rc.cpp:2221
 #, fuzzy, no-c-format
 msgid "Note 4:"
 msgstr "&Nodiadau"
 
-#. i18n: file ./protocols/yahoo/ui/yahooverifyaccountbase.ui line 30
-#: rc.cpp:4025
-#, no-c-format
-msgid ""
-"Your Account has to be verified because of too many false login attempts."
-"<br>"
-msgstr ""
-
-#. i18n: file ./protocols/yahoo/ui/yahooverifyaccountbase.ui line 46
-#: rc.cpp:4028
-#, no-c-format
-msgid "Please enter the chars shown in the picture:"
-msgstr ""
-
 #. i18n: file ./protocols/yahoo/ui/yahooeditaccountbase.ui line 16
-#: rc.cpp:4031
+#: rc.cpp:2224
 #, no-c-format
 msgid "Account Preferences - Yahoo"
 msgstr ""
 
+#. i18n: file ./protocols/yahoo/ui/yahooeditaccountbase.ui line 43
+#: rc.cpp:2227 rc.cpp:2947 rc.cpp:3200 rc.cpp:3612
+#, fuzzy, no-c-format
+msgid "&Basic Setup"
+msgstr "&Sylfaenol"
+
 #. i18n: file ./protocols/yahoo/ui/yahooeditaccountbase.ui line 79
-#: rc.cpp:4043 rc.cpp:4049
+#: rc.cpp:2236 rc.cpp:2242
 #, no-c-format
 msgid "The account name of your Yahoo account."
 msgstr ""
 
 #. i18n: file ./protocols/yahoo/ui/yahooeditaccountbase.ui line 82
-#: rc.cpp:4046 rc.cpp:4052
+#: rc.cpp:2239 rc.cpp:2245
 #, no-c-format
 msgid ""
 "The account name of your Yahoo account.  This should be in the form of an "
 "alphanumeric string (no spaces)."
 msgstr ""
 
+#. i18n: file ./protocols/yahoo/ui/yahooeditaccountbase.ui line 103
+#: rc.cpp:2248 rc.cpp:2377 rc.cpp:2968 rc.cpp:3221 rc.cpp:3636 rc.cpp:3909
+#: rc.cpp:4412 rc.cpp:4815
+#, no-c-format
+msgid "E&xclude from connect all"
+msgstr ""
+
 #. i18n: file ./protocols/yahoo/ui/yahooeditaccountbase.ui line 106
-#: rc.cpp:4058 rc.cpp:4190 rc.cpp:4521 rc.cpp:5108
+#: rc.cpp:2251 rc.cpp:2380 rc.cpp:2971 rc.cpp:3912
 #, no-c-format
 msgid ""
 "Check to disable automatic connection.  If checked, you may connect to this "
@@ -8728,13 +11005,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./protocols/yahoo/ui/yahooeditaccountbase.ui line 114
-#: rc.cpp:4061
+#: rc.cpp:2254
 #, no-c-format
 msgid "Exclude from &Global Identity"
 msgstr ""
 
+#. i18n: file ./protocols/yahoo/ui/yahooeditaccountbase.ui line 132
+#: rc.cpp:2257 rc.cpp:2977 rc.cpp:3230 rc.cpp:3642 rc.cpp:4418
+#, no-c-format
+msgid "Registration"
+msgstr ""
+
 #. i18n: file ./protocols/yahoo/ui/yahooeditaccountbase.ui line 157
-#: rc.cpp:4067
+#: rc.cpp:2260
 #, no-c-format
 msgid ""
 "To connect to the Yahoo network, you will need a Yahoo account."
@@ -8744,31 +11027,44 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./protocols/yahoo/ui/yahooeditaccountbase.ui line 171
-#: rc.cpp:4070
+#: rc.cpp:2263
 #, fuzzy, no-c-format
 msgid "Register &New Account"
 msgstr "Golygu Cyfrif:"
 
+#. i18n: file ./protocols/yahoo/ui/yahooeditaccountbase.ui line 174
+#: rc.cpp:2266 rc.cpp:2269 rc.cpp:2986 rc.cpp:2989 rc.cpp:4428 rc.cpp:4431
+#, no-c-format
+msgid "Register a new account on this network."
+msgstr ""
+
 #. i18n: file ./protocols/yahoo/ui/yahooeditaccountbase.ui line 206
-#: rc.cpp:4079
+#: rc.cpp:2272
 #, fuzzy, no-c-format
 msgid "Accoun&t Preferences"
 msgstr "Gwall protocol."
 
+#. i18n: file ./protocols/yahoo/ui/yahooeditaccountbase.ui line 234
+#: rc.cpp:2275 rc.cpp:2386 rc.cpp:3004 rc.cpp:3243 rc.cpp:3654 rc.cpp:4437
+#: rc.cpp:4809
+#, no-c-format
+msgid "Connection Preferences"
+msgstr ""
+
 #. i18n: file ./protocols/yahoo/ui/yahooeditaccountbase.ui line 245
-#: rc.cpp:4085
+#: rc.cpp:2278
 #, no-c-format
 msgid "O&verride default server information"
 msgstr ""
 
 #. i18n: file ./protocols/yahoo/ui/yahooeditaccountbase.ui line 273
-#: rc.cpp:4091 rc.cpp:4100
+#: rc.cpp:2284 rc.cpp:2293
 #, no-c-format
 msgid "The IP address or hostmask of the Yahoo server you wish to connect to."
 msgstr ""
 
 #. i18n: file ./protocols/yahoo/ui/yahooeditaccountbase.ui line 276
-#: rc.cpp:4094 rc.cpp:4103
+#: rc.cpp:2287 rc.cpp:2296
 #, no-c-format
 msgid ""
 "The IP address or hostmask of the Yahoo server you wish to connect to.  "
@@ -8776,19 +11072,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./protocols/yahoo/ui/yahooeditaccountbase.ui line 287
-#: rc.cpp:4097
+#: rc.cpp:2290
 #, no-c-format
 msgid "scs.msg.yahoo.com"
 msgstr ""
 
 #. i18n: file ./protocols/yahoo/ui/yahooeditaccountbase.ui line 310
-#: rc.cpp:4109
+#: rc.cpp:2302
 #, no-c-format
 msgid "The port on the Yahoo server that you would like to connect to."
 msgstr ""
 
 #. i18n: file ./protocols/yahoo/ui/yahooeditaccountbase.ui line 313
-#: rc.cpp:4112 rc.cpp:4118
+#: rc.cpp:2305 rc.cpp:2311
 #, no-c-format
 msgid ""
 "The port on the Yahoo server that you would like to connect to.  Normally this "
@@ -8796,98 +11092,116 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./protocols/yahoo/ui/yahooeditaccountbase.ui line 333
-#: rc.cpp:4115
+#: rc.cpp:2308
 #, no-c-format
 msgid "The port on the Yahoo server that you would like to connect  to."
 msgstr ""
 
 #. i18n: file ./protocols/yahoo/ui/yahooeditaccountbase.ui line 348
-#: rc.cpp:4121
+#: rc.cpp:2314
 #, no-c-format
 msgid "Buddy Icon"
 msgstr ""
 
 #. i18n: file ./protocols/yahoo/ui/yahooeditaccountbase.ui line 364
-#: rc.cpp:4124
+#: rc.cpp:2317
 #, no-c-format
 msgid "Select Picture..."
 msgstr "Dewis Llun ..."
 
 #. i18n: file ./protocols/yahoo/ui/yahooeditaccountbase.ui line 404
-#: rc.cpp:4127
+#: rc.cpp:2320
 #, no-c-format
 msgid "Se&nd buddy icon to other users"
 msgstr ""
 
 #. i18n: file ./protocols/meanwhile/ui/meanwhileaddcontactbase.ui line 16
-#: rc.cpp:4133
+#: rc.cpp:2323
 #, no-c-format
 msgid "Add Sametime Contact"
 msgstr ""
 
 #. i18n: file ./protocols/meanwhile/ui/meanwhileaddcontactbase.ui line 41
-#: rc.cpp:4136
+#: rc.cpp:2326
 #, no-c-format
 msgid "&Userid:"
 msgstr ""
 
 #. i18n: file ./protocols/meanwhile/ui/meanwhileaddcontactbase.ui line 47
-#: rc.cpp:4139 rc.cpp:4142 rc.cpp:4145 rc.cpp:4148
+#: rc.cpp:2329 rc.cpp:2332 rc.cpp:2335 rc.cpp:2338
 #, no-c-format
 msgid "The user id of the contact you would like to add."
 msgstr ""
 
 #. i18n: file ./protocols/meanwhile/ui/meanwhileaddcontactbase.ui line 69
-#: rc.cpp:4151
+#: rc.cpp:2341
 #, no-c-format
 msgid "&Find"
 msgstr "&Canfod"
 
 #. i18n: file ./protocols/meanwhile/ui/meanwhileaddcontactbase.ui line 72
-#: rc.cpp:4154 rc.cpp:4157
+#: rc.cpp:2344 rc.cpp:2347
 #, no-c-format
 msgid "Find Userid"
 msgstr ""
 
 #. i18n: file ./protocols/meanwhile/ui/meanwhileaddcontactbase.ui line 85
-#: rc.cpp:4160
+#: rc.cpp:2350
 #, no-c-format
 msgid "<i>(for example: johndoe)</i>"
 msgstr ""
 
 #. i18n: file ./protocols/meanwhile/ui/meanwhileeditaccountbase.ui line 16
-#: rc.cpp:4163
+#: rc.cpp:2353
 #, no-c-format
 msgid "Edit Meanwhile Account"
 msgstr ""
 
+#. i18n: file ./protocols/meanwhile/ui/meanwhileeditaccountbase.ui line 31
+#: rc.cpp:2356 rc.cpp:2506 rc.cpp:3888 rc.cpp:4391 rc.cpp:4746
+#, no-c-format
+msgid "B&asic Setup"
+msgstr ""
+
 #. i18n: file ./protocols/meanwhile/ui/meanwhileeditaccountbase.ui line 61
-#: rc.cpp:4172
+#: rc.cpp:2362
 #, fuzzy, no-c-format
 msgid "Meanwhile &username:"
 msgstr "&Enw'r defnyddiwr Yahoo :"
 
 #. i18n: file ./protocols/meanwhile/ui/meanwhileeditaccountbase.ui line 67
-#: rc.cpp:4175 rc.cpp:4178 rc.cpp:4181 rc.cpp:4184
+#: rc.cpp:2365 rc.cpp:2368 rc.cpp:2371 rc.cpp:2374
 #, no-c-format
 msgid "Your Sametime userid"
 msgstr ""
 
+#. i18n: file ./protocols/meanwhile/ui/meanwhileeditaccountbase.ui line 111
+#: rc.cpp:2383 rc.cpp:4800
+#, no-c-format
+msgid "Connection"
+msgstr "Cysylltiad"
+
 #. i18n: file ./protocols/meanwhile/ui/meanwhileeditaccountbase.ui line 155
-#: rc.cpp:4202 rc.cpp:4205 rc.cpp:4208 rc.cpp:4211
+#: rc.cpp:2392 rc.cpp:2395 rc.cpp:2398 rc.cpp:2401
 #, no-c-format
 msgid ""
 "The IP address or hostname of the Sametime server you wish to connect to."
 msgstr ""
 
+#. i18n: file ./protocols/meanwhile/ui/meanwhileeditaccountbase.ui line 187
+#: rc.cpp:2404 rc.cpp:3037 rc.cpp:3261 rc.cpp:3678 rc.cpp:3930
+#, no-c-format
+msgid "Po&rt:"
+msgstr "Po&rth:"
+
 #. i18n: file ./protocols/meanwhile/ui/meanwhileeditaccountbase.ui line 193
-#: rc.cpp:4217 rc.cpp:4223
+#: rc.cpp:2407 rc.cpp:2413
 #, no-c-format
 msgid "The port on the Sametime server that you would like to connect to."
 msgstr ""
 
 #. i18n: file ./protocols/meanwhile/ui/meanwhileeditaccountbase.ui line 196
-#: rc.cpp:4220 rc.cpp:4226
+#: rc.cpp:2410 rc.cpp:2416
 #, no-c-format
 msgid ""
 "The port on the Sametime server that you would like to connect to.  Usually "
@@ -8895,287 +11209,741 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./protocols/meanwhile/ui/meanwhileeditaccountbase.ui line 228
-#: rc.cpp:4229
+#: rc.cpp:2419
 #, fuzzy, no-c-format
 msgid "Client Identifier"
 msgstr "Alinio i'r &Canol"
 
 #. i18n: file ./protocols/meanwhile/ui/meanwhileeditaccountbase.ui line 239
-#: rc.cpp:4232
+#: rc.cpp:2422
 #, no-c-format
 msgid "Use custom client identifier"
 msgstr ""
 
 #. i18n: file ./protocols/meanwhile/ui/meanwhileeditaccountbase.ui line 266
-#: rc.cpp:4235
+#: rc.cpp:2425
 #, fuzzy, no-c-format
 msgid "Client identifier"
 msgstr "Alinio i'r &Canol"
 
 #. i18n: file ./protocols/meanwhile/ui/meanwhileeditaccountbase.ui line 299
-#: rc.cpp:4238
+#: rc.cpp:2428
 #, no-c-format
 msgid "."
 msgstr ""
 
 #. i18n: file ./protocols/meanwhile/ui/meanwhileeditaccountbase.ui line 326
-#: rc.cpp:4241
+#: rc.cpp:2431
 #, no-c-format
 msgid "Client version (major.minor)"
 msgstr ""
 
 #. i18n: file ./protocols/meanwhile/ui/meanwhileeditaccountbase.ui line 341
-#: rc.cpp:4244
+#: rc.cpp:2434
 #, no-c-format
 msgid "Restore &Defaults"
 msgstr ""
 
 #. i18n: file ./protocols/meanwhile/ui/meanwhileeditaccountbase.ui line 344
-#: rc.cpp:4247 rc.cpp:4250
+#: rc.cpp:2437 rc.cpp:2440
 #, no-c-format
 msgid "Restore the server and port values to their defaults."
 msgstr ""
 
+#. i18n: file ./protocols/sms/services/smsclientprefs.ui line 49
+#: rc.cpp:2443
+#, no-c-format
+msgid "SMSClient Settings"
+msgstr ""
+
+#. i18n: file ./protocols/sms/services/smsclientprefs.ui line 79
+#: rc.cpp:2446
+#, no-c-format
+msgid "SMSClient &program:"
+msgstr ""
+
+#. i18n: file ./protocols/sms/services/smsclientprefs.ui line 90
+#: rc.cpp:2449 rc.cpp:2458
+#, no-c-format
+msgid "Pro&vider:"
+msgstr "Dar&parwr:"
+
+#. i18n: file ./protocols/sms/services/smsclientprefs.ui line 116
+#: rc.cpp:2452
+#, no-c-format
+msgid "SMSClient &config path:"
+msgstr ""
+
+#. i18n: file ./protocols/sms/services/smssendprefs.ui line 49
+#: rc.cpp:2455
+#, no-c-format
+msgid "SMSSend Options"
+msgstr ""
+
+#. i18n: file ./protocols/sms/services/smssendprefs.ui line 124
+#: rc.cpp:2461
+#, no-c-format
+msgid "SMSSend prefi&x:"
+msgstr ""
+
+#. i18n: file ./protocols/sms/services/smssendprefs.ui line 159
+#: rc.cpp:2464
+#, no-c-format
+msgid "Provider Options"
+msgstr ""
+
+#. i18n: file ./protocols/sms/services/gsmlibprefs.ui line 49
+#: rc.cpp:2467
+#, fuzzy, no-c-format
+msgid "GSMLib Settings"
+msgstr "&Cadw Gosodiadau"
+
+#. i18n: file ./protocols/sms/ui/smsadd.ui line 54
+#: rc.cpp:2473 rc.cpp:2617 rc.cpp:4596
+#, no-c-format
+msgid "&Telephone number:"
+msgstr ""
+
+#. i18n: file ./protocols/sms/ui/smsadd.ui line 60
+#: rc.cpp:2476 rc.cpp:2491
+#, no-c-format
+msgid "The telephone number of the contact you would like to add."
+msgstr ""
+
+#. i18n: file ./protocols/sms/ui/smsadd.ui line 63
+#: rc.cpp:2479 rc.cpp:2494
+#, no-c-format
+msgid ""
+"The telephone number of the contact you would like to add.  This should be a "
+"number with SMS service available."
+msgstr ""
+
+#. i18n: file ./protocols/sms/ui/smsadd.ui line 71
+#: rc.cpp:2482
+#, no-c-format
+msgid "Contact na&me:"
+msgstr ""
+
+#. i18n: file ./protocols/sms/ui/smsadd.ui line 77
+#: rc.cpp:2485 rc.cpp:2488 rc.cpp:2497 rc.cpp:2500 rc.cpp:2515 rc.cpp:2518
+#: rc.cpp:2530
+#, no-c-format
+msgid "A unique name for this SMS account."
+msgstr ""
+
+#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 25
+#: rc.cpp:2503
+#, no-c-format
+msgid "Account Preferences - SMS"
+msgstr ""
+
+#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 82
+#: rc.cpp:2512 rc.cpp:3744
+#, no-c-format
+msgid "&Account name:"
+msgstr "Enw &Cyfrif:"
+
+#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 99
+#: rc.cpp:2521
+#, no-c-format
+msgid "&SMS delivery service:"
+msgstr ""
+
+#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 105
+#: rc.cpp:2524 rc.cpp:2533
+#, no-c-format
+msgid "The delivery service that you would like to use."
+msgstr ""
+
+#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 108
+#: rc.cpp:2527 rc.cpp:2536
+#, no-c-format
+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 ""
+
+#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 151
+#: rc.cpp:2539
+#, no-c-format
+msgid "&Description"
+msgstr "&Disgrifiad"
+
+#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 154
+#: rc.cpp:2542
+#, no-c-format
+msgid "Description of the SMS delivery service."
+msgstr ""
+
+#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 157
+#: rc.cpp:2545
+#, no-c-format
+msgid "Description of the SMS delivery service, including download locations."
+msgstr ""
+
+#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 188
+#: rc.cpp:2551
+#, no-c-format
+msgid "To use SMS, you will need an account with a delivery service."
+msgstr ""
+
+#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 220
+#: rc.cpp:2554 rc.cpp:4434
+#, no-c-format
+msgid "A&ccount Preferences"
+msgstr ""
+
+#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 231
+#: rc.cpp:2557
+#, no-c-format
+msgid "Messaging Preferences"
+msgstr ""
+
+#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 250
+#: rc.cpp:2560
+#, no-c-format
+msgid "If the message is too &long:"
+msgstr ""
+
+#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 256
+#: rc.cpp:2563 rc.cpp:2578
+#, no-c-format
+msgid ""
+"What should happen if you type a message that is too long to fit in a single "
+"SMS message."
+msgstr ""
+
+#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 259
+#: rc.cpp:2566 rc.cpp:2581
+#, no-c-format
+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 ./protocols/sms/ui/smsactprefs.ui line 265
+#: rc.cpp:2569
+#, no-c-format
+msgid "Prompt (recommended)"
+msgstr ""
+
+#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 270
+#: rc.cpp:2572
+#, no-c-format
+msgid "Break Into Multiple"
+msgstr ""
+
+#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 275
+#: rc.cpp:2575
+#, no-c-format
+msgid "Cancel Sending"
+msgstr ""
+
+#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 295
+#: rc.cpp:2584
+#, no-c-format
+msgid "&Enable phone number internationalization"
+msgstr ""
+
+#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 298
+#: rc.cpp:2587
+#, no-c-format
+msgid "Check if you would like to enable phone number internationalization."
+msgstr ""
+
+#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 301
+#: rc.cpp:2590
+#, no-c-format
+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 ""
+
+#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 328
+#: rc.cpp:2593
+#, no-c-format
+msgid "Substitute leading &zero with code:"
+msgstr ""
+
+#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 334
+#: rc.cpp:2596 rc.cpp:2599 rc.cpp:2608 rc.cpp:2611
+#, no-c-format
+msgid "What you would like to substitute a leading zero with."
+msgstr ""
+
+#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 356
+#: rc.cpp:2602
+#, no-c-format
+msgid "+"
+msgstr "+"
+
+#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 359
+#: rc.cpp:2605
+#, no-c-format
+msgid "1234567890+"
+msgstr ""
+
+#. i18n: file ./protocols/sms/ui/smsuserprefs.ui line 40
+#: rc.cpp:2614
+#, no-c-format
+msgid "Some One"
+msgstr ""
+
+#. i18n: file ./protocols/sms/ui/smsuserprefs.ui line 76
+#: rc.cpp:2620 rc.cpp:2626
+#, no-c-format
+msgid "The telephone number of the contact."
+msgstr ""
+
+#. i18n: file ./protocols/sms/ui/smsuserprefs.ui line 79
+#: rc.cpp:2623 rc.cpp:2629
+#, no-c-format
+msgid ""
+"The telephone number of the contact.  This should be a number with SMS service "
+"available."
+msgstr ""
+
+#. i18n: file ./protocols/jabber/jingle/jinglevoicesessiondialogbase.ui line 16
+#: rc.cpp:2635
+#, no-c-format
+msgid "JabberVoiceSessionDialogBase"
+msgstr ""
+
+#. i18n: file ./protocols/jabber/jingle/jinglevoicesessiondialogbase.ui line 60
+#: rc.cpp:2638
+#, no-c-format
+msgid "Voice session with:"
+msgstr ""
+
+#. i18n: file ./protocols/jabber/jingle/jinglevoicesessiondialogbase.ui line 178
+#: rc.cpp:2641
+#, fuzzy, no-c-format
+msgid "Contact displayname"
+msgstr "Gwybodaeth Cysylltu"
+
+#. i18n: file ./protocols/jabber/jingle/jinglevoicesessiondialogbase.ui line 266
+#: rc.cpp:2644
+#, fuzzy, no-c-format
+msgid "Accep&t"
+msgstr "Derbyn"
+
+#. i18n: file ./protocols/jabber/jingle/jinglevoicesessiondialogbase.ui line 277
+#: rc.cpp:2647
+#, fuzzy, no-c-format
+msgid "&Decline"
+msgstr "Gwrthod"
+
+#. i18n: file ./protocols/jabber/jingle/jinglevoicesessiondialogbase.ui line 288
+#: rc.cpp:2650
+#, fuzzy, no-c-format
+msgid "Termi&nate"
+msgstr "Trosi"
+
+#. i18n: file ./protocols/jabber/jingle/jinglevoicesessiondialogbase.ui line 323
+#: rc.cpp:2653
+#, fuzzy, no-c-format
+msgid "Current status:"
+msgstr "Cyfrinair cyfredol:"
+
+#. i18n: file ./protocols/jabber/jingle/jinglevoicesessiondialogbase.ui line 339
+#: rc.cpp:2656
+#, fuzzy, no-c-format
+msgid "Session status"
+msgstr "Cyfrinair cyfredol:"
+
+#. i18n: file ./protocols/jabber/ui/dlgbrowse.ui line 34
+#: rc.cpp:2662
+#, no-c-format
+msgid "Search For"
+msgstr "Chwilio am:"
+
+#. i18n: file ./protocols/jabber/ui/dlgbrowse.ui line 48
+#: rc.cpp:2665
+#, no-c-format
+msgid "Please wait while retrieving search form..."
+msgstr ""
+
+#. i18n: file ./protocols/jabber/ui/dlgbrowse.ui line 59
+#: rc.cpp:2668
+#, no-c-format
+msgid "JID"
+msgstr ""
+
+#. i18n: file ./protocols/jabber/ui/dlgbrowse.ui line 64
+#: libkopete/kopeteglobal.cpp:142 rc.cpp:2671 rc.cpp:3435 rc.cpp:4056
+#, no-c-format
+msgid "First Name"
+msgstr "Enw Cyntaf "
+
+#. i18n: file ./protocols/jabber/ui/dlgbrowse.ui line 69
+#: libkopete/kopeteglobal.cpp:148 rc.cpp:2674 rc.cpp:3438 rc.cpp:4059
+#, no-c-format
+msgid "Last Name"
+msgstr "Enw Olaf"
+
+#. i18n: file ./protocols/jabber/ui/dlgbrowse.ui line 74
+#: rc.cpp:2677
+#, no-c-format
+msgid "Nick"
+msgstr "Ffugenw"
+
+#. i18n: file ./protocols/jabber/ui/dlgbrowse.ui line 154
+#: rc.cpp:2683 rc.cpp:3450 rc.cpp:3489 rc.cpp:4038
+#, no-c-format
+msgid "&Search"
+msgstr " &Chwilio"
+
+#. i18n: file ./protocols/jabber/ui/dlgservices.ui line 16
+#: rc.cpp:2689
+#, no-c-format
+msgid "Jabber Service Management"
+msgstr ""
+
+#. i18n: file ./protocols/jabber/ui/dlgservices.ui line 46
+#: rc.cpp:2692 rc.cpp:3157
+#, no-c-format
+msgid "Server:"
+msgstr " Gweinydd:"
+
+#. i18n: file ./protocols/jabber/ui/dlgservices.ui line 75
+#: rc.cpp:2695
+#, no-c-format
+msgid "&Query Server"
+msgstr "&Gweinydd Ymholiad"
+
+#. i18n: file ./protocols/jabber/ui/dlgservices.ui line 89
+#: rc.cpp:2698
+#, no-c-format
+msgid "Jid"
+msgstr ""
+
+#. i18n: file ./protocols/jabber/ui/dlgservices.ui line 167
+#: rc.cpp:2707
+#, no-c-format
+msgid "&Browse"
+msgstr "&Pori"
+
 #. i18n: file ./protocols/jabber/ui/dlgjabberchooseserver.ui line 22
-#: rc.cpp:4253
+#: rc.cpp:2713
 #, no-c-format
 msgid "Choose Server - Jabber"
 msgstr ""
 
 #. i18n: file ./protocols/jabber/ui/dlgjabberchooseserver.ui line 31
-#: rc.cpp:4256 rc.cpp:4296
+#: rc.cpp:2716 rc.cpp:2770
 #, no-c-format
 msgid "Server"
 msgstr "Gweinydd"
 
 #. i18n: file ./protocols/jabber/ui/dlgjabberchooseserver.ui line 85
-#: rc.cpp:4262
+#: rc.cpp:2722
 #, no-c-format
 msgid ""
 "<a href=\"http://www.jabber.org/network/\">Details about free public Jabber "
 "servers</a>"
 msgstr ""
 
-#. i18n: file ./protocols/jabber/ui/dlgregister.ui line 24
-#: rc.cpp:4265
+#. i18n: file ./protocols/jabber/ui/dlgsendraw.ui line 16
+#: rc.cpp:2725
 #, no-c-format
-msgid "Register with Jabber Service"
+msgid "Send Raw XML Packet"
 msgstr ""
 
-#. i18n: file ./protocols/jabber/ui/dlgregister.ui line 49
-#: rc.cpp:4268
+#. i18n: file ./protocols/jabber/ui/dlgsendraw.ui line 42
+#: rc.cpp:2728
 #, no-c-format
-msgid "Registration Form"
+msgid "Type in the packet that should be sent to the server:"
 msgstr ""
 
-#. i18n: file ./protocols/jabber/ui/dlgregister.ui line 68
-#: rc.cpp:4271
+#. i18n: file ./protocols/jabber/ui/dlgsendraw.ui line 56
+#: rc.cpp:2731
 #, no-c-format
-msgid "Please wait while querying the server..."
+msgid "User Defined"
+msgstr "Diffinir gan y Defnyddiwr"
+
+#. i18n: file ./protocols/jabber/ui/dlgsendraw.ui line 61
+#: rc.cpp:2734
+#, no-c-format
+msgid "Account Deletion"
 msgstr ""
 
-#. i18n: file ./protocols/jabber/ui/dlgregister.ui line 129
-#: protocols/gadu/gaduregisteraccount.cpp:45 rc.cpp:4274 rc.cpp:4329
+#. i18n: file ./protocols/jabber/ui/dlgsendraw.ui line 66
+#: rc.cpp:2737
 #, no-c-format
-msgid "&Register"
+msgid "Availability Status"
 msgstr ""
 
-#. i18n: file ./protocols/jabber/ui/dlgchangepassword.ui line 24
-#: rc.cpp:4280
+#. i18n: file ./protocols/jabber/ui/dlgsendraw.ui line 71
+#: rc.cpp:2740
 #, no-c-format
-msgid "Current password:"
-msgstr "Cyfrinair cyfredol:"
+msgid "Last Active Time"
+msgstr ""
 
-#. i18n: file ./protocols/jabber/ui/dlgchangepassword.ui line 32
-#: rc.cpp:4283 rc.cpp:4286
+#. i18n: file ./protocols/jabber/ui/dlgsendraw.ui line 76
+#: rc.cpp:2743
 #, no-c-format
-msgid "New password:"
-msgstr "Cyfrinair newydd:"
+msgid "Message with Body"
+msgstr ""
 
-#. i18n: file ./protocols/jabber/ui/dlgchangepassword.ui line 72
-#: rc.cpp:4289
+#. i18n: file ./protocols/jabber/ui/dlgsendraw.ui line 81
+#: rc.cpp:2746
 #, no-c-format
-msgid ""
-"Please enter your current password first\n"
-"and then your new password twice."
+msgid "Message with Subject"
 msgstr ""
 
-#. i18n: file ./protocols/jabber/ui/dlgchatroomslist.ui line 16
-#: protocols/jabber/ui/dlgjabberchatroomslist.cpp:36 rc.cpp:4293
+#. i18n: file ./protocols/jabber/ui/dlgsendraw.ui line 86
+#: rc.cpp:2749
 #, no-c-format
-msgid "List Chatrooms"
+msgid "Add Roster Item"
+msgstr ""
+
+#. i18n: file ./protocols/jabber/ui/dlgsendraw.ui line 91
+#: rc.cpp:2752
+#, no-c-format
+msgid "Delete Roster Item"
 msgstr ""
 
+#. i18n: file ./protocols/jabber/ui/dlgsendraw.ui line 116
+#: rc.cpp:2758
+#, no-c-format
+msgid "Clea&r"
+msgstr "Clir&io"
+
+#. i18n: file ./protocols/jabber/ui/dlgsendraw.ui line 124
+#: rc.cpp:2761
+#, no-c-format
+msgid "&Send"
+msgstr "&Anfon"
+
 #. i18n: file ./protocols/jabber/ui/dlgchatroomslist.ui line 48
-#: rc.cpp:4299
+#: rc.cpp:2773
 #, fuzzy, no-c-format
 msgid "&Query"
 msgstr "&Gweinydd Ymholiad"
 
 #. i18n: file ./protocols/jabber/ui/dlgchatroomslist.ui line 56
-#: rc.cpp:4302
+#: rc.cpp:2776
 #, fuzzy, no-c-format
 msgid "Chatroom Name"
 msgstr "Enw Cyffredin"
 
 #. i18n: file ./protocols/jabber/ui/dlgchatroomslist.ui line 64
-#: rc.cpp:4305
+#: rc.cpp:2779
 #, fuzzy, no-c-format
 msgid "Chatroom Description"
 msgstr "Disgrifiad"
 
-#. i18n: file ./protocols/jabber/ui/dlgchatroomslist.ui line 128
-#: protocols/irc/ircchannelcontact.cpp:661 rc.cpp:4308 rc.cpp:4710
-#, no-c-format
-msgid "&Join"
-msgstr "&Uniad"
-
 #. i18n: file ./protocols/jabber/ui/dlgchatroomslist.ui line 136
-#: rc.cpp:4311
+#: rc.cpp:2785
 #, fuzzy, no-c-format
 msgid "Clos&e"
 msgstr "Cl&irio"
 
-#. i18n: file ./protocols/jabber/ui/dlgservices.ui line 16
-#: rc.cpp:4314
+#. i18n: file ./protocols/jabber/ui/dlgjabberregisteraccount.ui line 22
+#: rc.cpp:2788
 #, no-c-format
-msgid "Jabber Service Management"
+msgid "Register Account - Jabber"
 msgstr ""
 
-#. i18n: file ./protocols/jabber/ui/dlgservices.ui line 46
-#: rc.cpp:4317 rc.cpp:4707
+#. i18n: file ./protocols/jabber/ui/dlgjabberregisteraccount.ui line 33
+#: rc.cpp:2791
 #, no-c-format
-msgid "Server:"
-msgstr " Gweinydd:"
+msgid "Desired Jabber &ID:"
+msgstr ""
 
-#. i18n: file ./protocols/jabber/ui/dlgservices.ui line 75
-#: rc.cpp:4320
+#. i18n: file ./protocols/jabber/ui/dlgjabberregisteraccount.ui line 77
+#: rc.cpp:2794
 #, no-c-format
-msgid "&Query Server"
-msgstr "&Gweinydd Ymholiad"
+msgid "C&hoose..."
+msgstr "&Dewis..."
 
-#. i18n: file ./protocols/jabber/ui/dlgservices.ui line 89
-#: rc.cpp:4323
+#. i18n: file ./protocols/jabber/ui/dlgjabberregisteraccount.ui line 122
+#: rc.cpp:2800 rc.cpp:3007
 #, no-c-format
-msgid "Jid"
+msgid "Use protocol encr&yption (SSL)"
 msgstr ""
 
-#. i18n: file ./protocols/jabber/ui/dlgservices.ui line 167
-#: rc.cpp:4332
+#. i18n: file ./protocols/jabber/ui/dlgjabberregisteraccount.ui line 128
+#: rc.cpp:2803 rc.cpp:3010
 #, no-c-format
-msgid "&Browse"
-msgstr "&Pori"
+msgid "Check this box to enable SSL encrypted communication with the server."
+msgstr ""
+
+#. i18n: file ./protocols/jabber/ui/dlgjabberregisteraccount.ui line 131
+#: rc.cpp:2806 rc.cpp:3013
+#, no-c-format
+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 ./protocols/jabber/ui/dlgjabberregisteraccount.ui line 156
+#: rc.cpp:2809
+#, no-c-format
+msgid "&Port:"
+msgstr "&Porth:"
+
+#. i18n: file ./protocols/jabber/ui/dlgjabberregisteraccount.ui line 170
+#: rc.cpp:2812
+#, no-c-format
+msgid "&Repeat password:"
+msgstr "&Ailadrodd cyfrinair:"
+
+#. i18n: file ./protocols/jabber/ui/dlgjabberregisteraccount.ui line 206
+#: rc.cpp:2815
+#, no-c-format
+msgid "Jabber &server:"
+msgstr ""
 
 #. i18n: file ./protocols/jabber/ui/dlgvcard.ui line 173
-#: rc.cpp:4347
+#: rc.cpp:2827
 #, no-c-format
 msgid "Timezone:"
 msgstr "Cylchfa amser:"
 
 #. i18n: file ./protocols/jabber/ui/dlgvcard.ui line 204
-#: rc.cpp:4350
+#: rc.cpp:2830
 #, no-c-format
 msgid "Jabber ID:"
 msgstr ""
 
 #. i18n: file ./protocols/jabber/ui/dlgvcard.ui line 235
-#: rc.cpp:4353
+#: rc.cpp:2833
 #, no-c-format
 msgid "Full name:"
 msgstr "Enw llawn:"
 
+#. i18n: file ./protocols/jabber/ui/dlgvcard.ui line 269
+#: rc.cpp:2836 rc.cpp:3582
+#, no-c-format
+msgid "Nickname:"
+msgstr "Ffugenw:"
+
 #. i18n: file ./protocols/jabber/ui/dlgvcard.ui line 337
-#: rc.cpp:4362
+#: rc.cpp:2842
 #, fuzzy, no-c-format
 msgid "&Select Photo..."
 msgstr "Dewis Llun ..."
 
 #. i18n: file ./protocols/jabber/ui/dlgvcard.ui line 345
-#: rc.cpp:4365
+#: rc.cpp:2845
 #, fuzzy, no-c-format
 msgid "Clear Pho&to"
 msgstr "Ffo&to"
 
 #. i18n: file ./protocols/jabber/ui/dlgvcard.ui line 422
-#: rc.cpp:4368
+#: rc.cpp:2848
 #, no-c-format
 msgid "&Home Address"
 msgstr "Cyfeiriad &Cartref"
 
 #. i18n: file ./protocols/jabber/ui/dlgvcard.ui line 441
-#: rc.cpp:4371 rc.cpp:4404
+#: rc.cpp:2851 rc.cpp:2884
 #, no-c-format
 msgid "Postal code:"
 msgstr "Côd post:"
 
 #. i18n: file ./protocols/jabber/ui/dlgvcard.ui line 449
-#: rc.cpp:4374 rc.cpp:4395
+#: rc.cpp:2854 rc.cpp:2875
 #, no-c-format
 msgid "PO box:"
 msgstr ""
 
 #. i18n: file ./protocols/jabber/ui/dlgvcard.ui line 550
-#: rc.cpp:4383 rc.cpp:4407
+#: rc.cpp:2863 rc.cpp:2887
 #, no-c-format
 msgid "Street:"
 msgstr "Stryd:"
 
 #. i18n: file ./protocols/jabber/ui/dlgvcard.ui line 620
-#: rc.cpp:4389
+#: rc.cpp:2869
 #, no-c-format
 msgid "&Work Address"
 msgstr "Cyfeiriad &Gwaith"
 
 #. i18n: file ./protocols/jabber/ui/dlgvcard.ui line 818
-#: rc.cpp:4410
+#: rc.cpp:2890
 #, fuzzy, no-c-format
 msgid "Wor&k Information"
 msgstr "Gwybodaeth Defnyddiwr"
 
+#. i18n: file ./protocols/jabber/ui/dlgvcard.ui line 864
+#: rc.cpp:2893 rc.cpp:3333
+#, no-c-format
+msgid "Position:"
+msgstr "Lleoliad:"
+
 #. i18n: file ./protocols/jabber/ui/dlgvcard.ui line 882
-#: rc.cpp:4416
+#: rc.cpp:2896
 #, no-c-format
 msgid "Role:"
 msgstr "Swyddogaeth:"
 
+#. i18n: file ./protocols/jabber/ui/dlgvcard.ui line 890
+#: rc.cpp:2899 rc.cpp:3330
+#, no-c-format
+msgid "Department:"
+msgstr "Adran:"
+
 #. i18n: file ./protocols/jabber/ui/dlgvcard.ui line 898
-#: rc.cpp:4422
+#: rc.cpp:2902
 #, no-c-format
 msgid "Company:"
 msgstr "Cwmni:"
 
 #. i18n: file ./protocols/jabber/ui/dlgvcard.ui line 910
-#: rc.cpp:4425
+#: rc.cpp:2905
 #, no-c-format
 msgid "Phone &Numbers"
 msgstr "&Rhifau ffôn"
 
+#. i18n: file ./protocols/jabber/ui/dlgvcard.ui line 956
+#: rc.cpp:2908 rc.cpp:3327
+#, no-c-format
+msgid "Fax:"
+msgstr "Ffacs:"
+
 #. i18n: file ./protocols/jabber/ui/dlgvcard.ui line 969
-#: rc.cpp:4431
+#: rc.cpp:2911
 #, no-c-format
 msgid "Cell:"
 msgstr "Cell:"
 
+#. i18n: file ./protocols/jabber/ui/dlgvcard.ui line 982
+#: rc.cpp:2914
+#, no-c-format
+msgid "Work:"
+msgstr "Gwaith :"
+
+#. i18n: file ./protocols/jabber/ui/dlgvcard.ui line 990
+#: rc.cpp:2917
+#, no-c-format
+msgid "Home:"
+msgstr "Cartref :"
+
 #. i18n: file ./protocols/jabber/ui/dlgaddcontact.ui line 16
-#: rc.cpp:4443
+#: rc.cpp:2923
 #, no-c-format
 msgid "Add Contacts"
 msgstr ""
 
 #. i18n: file ./protocols/jabber/ui/dlgaddcontact.ui line 41
-#: rc.cpp:4446 rc.cpp:4503
+#: rc.cpp:2926 rc.cpp:2953
 #, no-c-format
 msgid "&Jabber ID:"
 msgstr ""
 
 #. i18n: file ./protocols/jabber/ui/dlgaddcontact.ui line 50
-#: rc.cpp:4449 rc.cpp:4455
+#: rc.cpp:2929 rc.cpp:2935
 #, no-c-format
 msgid "The Jabber ID for the account you would like to add."
 msgstr ""
 
 #. i18n: file ./protocols/jabber/ui/dlgaddcontact.ui line 53
-#: rc.cpp:4452 rc.cpp:4458
+#: rc.cpp:2932 rc.cpp:2938
 #, no-c-format
 msgid ""
 "The Jabber ID for the account you would like to add.  Note that this must "
@@ -9184,82 +11952,25 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./protocols/jabber/ui/dlgaddcontact.ui line 74
-#: rc.cpp:4461
+#: rc.cpp:2941
 #, no-c-format
 msgid "<i>(for example: joe@jabber.org)</i>"
 msgstr ""
 
-#. i18n: file ./protocols/jabber/ui/dlgjabberregisteraccount.ui line 22
-#: rc.cpp:4464
-#, no-c-format
-msgid "Register Account - Jabber"
-msgstr ""
-
-#. i18n: file ./protocols/jabber/ui/dlgjabberregisteraccount.ui line 33
-#: rc.cpp:4467
-#, no-c-format
-msgid "Desired Jabber &ID:"
-msgstr ""
-
-#. i18n: file ./protocols/jabber/ui/dlgjabberregisteraccount.ui line 77
-#: rc.cpp:4470
-#, no-c-format
-msgid "C&hoose..."
-msgstr "&Dewis..."
-
-#. i18n: file ./protocols/jabber/ui/dlgjabberregisteraccount.ui line 122
-#: rc.cpp:4476 rc.cpp:4557
-#, no-c-format
-msgid "Use protocol encr&yption (SSL)"
-msgstr ""
-
-#. i18n: file ./protocols/jabber/ui/dlgjabberregisteraccount.ui line 128
-#: rc.cpp:4479 rc.cpp:4560
-#, no-c-format
-msgid "Check this box to enable SSL encrypted communication with the server."
-msgstr ""
-
-#. i18n: file ./protocols/jabber/ui/dlgjabberregisteraccount.ui line 131
-#: rc.cpp:4482 rc.cpp:4563
-#, no-c-format
-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 ./protocols/jabber/ui/dlgjabberregisteraccount.ui line 156
-#: rc.cpp:4485
-#, no-c-format
-msgid "&Port:"
-msgstr "&Porth:"
-
-#. i18n: file ./protocols/jabber/ui/dlgjabberregisteraccount.ui line 170
-#: rc.cpp:4488
-#, no-c-format
-msgid "&Repeat password:"
-msgstr "&Ailadrodd cyfrinair:"
-
-#. i18n: file ./protocols/jabber/ui/dlgjabberregisteraccount.ui line 206
-#: rc.cpp:4491
-#, no-c-format
-msgid "Jabber &server:"
-msgstr ""
-
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 17
-#: rc.cpp:4494
+#: rc.cpp:2944
 #, no-c-format
 msgid "Account Preferences - Jabber"
 msgstr ""
 
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 77
-#: rc.cpp:4506 rc.cpp:4512
+#: rc.cpp:2956 rc.cpp:2962
 #, no-c-format
 msgid "The Jabber ID for the account you would like to use."
 msgstr ""
 
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 80
-#: rc.cpp:4509
+#: rc.cpp:2959
 #, no-c-format
 msgid ""
 "The Jabber ID for the account you would like to use.  Note that this must "
@@ -9268,7 +11979,7 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 94
-#: rc.cpp:4515
+#: rc.cpp:2965
 #, no-c-format
 msgid ""
 "The Jabber ID for the account you would like to use.  Note that this must "
@@ -9276,48 +11987,72 @@ msgid ""
 "many Jabber servers."
 msgstr ""
 
+#. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 120
+#: rc.cpp:2974 rc.cpp:3227 rc.cpp:3633
+#, no-c-format
+msgid "Exclu&de from Global Identity"
+msgstr ""
+
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 163
-#: rc.cpp:4530
+#: rc.cpp:2980
 #, no-c-format
 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 ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 174
+#: rc.cpp:2983 rc.cpp:3237 rc.cpp:3648 rc.cpp:4425
+#, no-c-format
+msgid "Re&gister New Account"
+msgstr ""
+
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 198
-#: rc.cpp:4542
+#: rc.cpp:2992
 #, no-c-format
 msgid "Change Password"
 msgstr "Newid Cyfrinair"
 
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 209
-#: rc.cpp:4545
+#: rc.cpp:2995
 #, fuzzy, no-c-format
 msgid "Change &Your Password"
 msgstr "Cyfrinair anghywir."
 
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 228
-#: rc.cpp:4548
+#: rc.cpp:2998
 #, no-c-format
 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 line 260
+#: rc.cpp:3001
+#, no-c-format
+msgid "Co&nnection"
+msgstr "Cy&sylltiad"
+
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 296
-#: rc.cpp:4566
+#: rc.cpp:3016
 #, no-c-format
 msgid "Allow plain-te&xt password authentication"
 msgstr ""
 
+#. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 307
+#: rc.cpp:3019 rc.cpp:3279 rc.cpp:3657
+#, no-c-format
+msgid "&Override default server information"
+msgstr ""
+
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 343
-#: rc.cpp:4575 rc.cpp:4581 rc.cpp:5114 rc.cpp:5120
+#: rc.cpp:3025 rc.cpp:3031 rc.cpp:3918 rc.cpp:3924
 #, no-c-format
 msgid "The IP address or hostname of the server you would like to connect to."
 msgstr ""
 
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 346
-#: rc.cpp:4578 rc.cpp:4584
+#: rc.cpp:3028 rc.cpp:3034
 #, no-c-format
 msgid ""
 "The IP address or hostname of the server you would like to connect to (for "
@@ -9325,38 +12060,38 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 388
-#: rc.cpp:4590 rc.cpp:4596 rc.cpp:5129 rc.cpp:5135
+#: rc.cpp:3040 rc.cpp:3046 rc.cpp:3933 rc.cpp:3939
 #, no-c-format
 msgid "The port on the server that you would like to connect to."
 msgstr ""
 
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 391
-#: rc.cpp:4593 rc.cpp:4599 rc.cpp:5132 rc.cpp:5138
+#: rc.cpp:3043 rc.cpp:3049 rc.cpp:3936 rc.cpp:3942
 #, no-c-format
 msgid ""
 "The port on the server that you would like to connect to (default is 5222)."
 msgstr ""
 
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 437
-#: rc.cpp:4602
+#: rc.cpp:3052
 #, no-c-format
 msgid "Location Settings"
 msgstr ""
 
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 448
-#: rc.cpp:4605
+#: rc.cpp:3055
 #, no-c-format
 msgid "R&esource:"
 msgstr "A&dnodd :"
 
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 454
-#: rc.cpp:4608 rc.cpp:4617 rc.cpp:4626
+#: rc.cpp:3058 rc.cpp:3067 rc.cpp:3076
 #, no-c-format
 msgid "The resource name you would like to use on the Jabber network."
 msgstr ""
 
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 457
-#: rc.cpp:4611 rc.cpp:4620 rc.cpp:4629
+#: rc.cpp:3061 rc.cpp:3070 rc.cpp:3079
 #, no-c-format
 msgid ""
 "The resource name you would like to use on the Jabber network.  Jabber allows "
@@ -9365,13 +12100,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 518
-#: rc.cpp:4623
+#: rc.cpp:3073
 #, no-c-format
 msgid "P&riority:"
 msgstr "B&laenoriaeth:"
 
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 563
-#: rc.cpp:4632
+#: rc.cpp:3082
 #, no-c-format
 msgid ""
 "<qt>Each resource can have different <b>priority </b> "
@@ -9383,31 +12118,37 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 592
-#: rc.cpp:4637
+#: rc.cpp:3087
 #, no-c-format
 msgid "Fi&le Transfer"
 msgstr "T&rosglwyddo ffeiliau"
 
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 603
-#: rc.cpp:4640
+#: rc.cpp:3090
 #, no-c-format
 msgid "File Transfer Settings"
 msgstr ""
 
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 627
-#: rc.cpp:4643
+#: rc.cpp:3093
 #, no-c-format
 msgid "Pro&xy JID:"
 msgstr ""
 
+#. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 651
+#: rc.cpp:3096 rc.cpp:4692
+#, no-c-format
+msgid "Por&t:"
+msgstr "Por&th:"
+
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 675
-#: rc.cpp:4649
+#: rc.cpp:3099
 #, fuzzy, no-c-format
 msgid "Public &IP address:"
 msgstr "Cyfeiriad Cartref"
 
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 692
-#: rc.cpp:4652
+#: rc.cpp:3102
 #, no-c-format
 msgid ""
 "<i>"
@@ -9421,20 +12162,26 @@ msgid ""
 "<li>The \"Proxy JID\" can be configured per account.</li></ul></i>"
 msgstr ""
 
+#. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 724
+#: rc.cpp:3109 rc.cpp:3696
+#, fuzzy, no-c-format
+msgid "Pri&vacy"
+msgstr "Preifatwydd"
+
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 735
-#: rc.cpp:4662
+#: rc.cpp:3112
 #, fuzzy, no-c-format
 msgid "General Privacy"
 msgstr "Cyffredinol"
 
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 763
-#: rc.cpp:4665
+#: rc.cpp:3115
 #, no-c-format
 msgid "&Hide system and client info"
 msgstr ""
 
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 766
-#: rc.cpp:4668
+#: rc.cpp:3118
 #, no-c-format
 msgid ""
 "By default, Kopete gives the other users some info about your system and the "
@@ -9442,32 +12189,32 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 776
-#: rc.cpp:4671
+#: rc.cpp:3121
 #, fuzzy, no-c-format
 msgid "Notifications"
 msgstr "Hysbysiad"
 
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 790
-#: rc.cpp:4674
+#: rc.cpp:3124
 #, fuzzy, no-c-format
 msgid "Always send not&ifications"
 msgstr "Hysbysiad"
 
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 796
-#: rc.cpp:4677
+#: rc.cpp:3127
 #, no-c-format
 msgid ""
 "Check this box if you want to always send notifications to your contacts."
 msgstr ""
 
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 840
-#: rc.cpp:4680
+#: rc.cpp:3130
 #, no-c-format
 msgid "Alwa&ys send delivered notifications"
 msgstr ""
 
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 846
-#: rc.cpp:4683
+#: rc.cpp:3133
 #, no-c-format
 msgid ""
 "<qt>Check this box to send the <b>Delivered notification</b> "
@@ -9476,13 +12223,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 857
-#: rc.cpp:4686
+#: rc.cpp:3136
 #, no-c-format
 msgid "Al&ways send displayed notifications"
 msgstr ""
 
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 863
-#: rc.cpp:4689
+#: rc.cpp:3139
 #, no-c-format
 msgid ""
 "<qt>Check this box to send the <b>Displayed notification</b> "
@@ -9491,13 +12238,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 874
-#: rc.cpp:4692
+#: rc.cpp:3142
 #, no-c-format
 msgid "Always send &typing notifications"
 msgstr ""
 
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 880
-#: rc.cpp:4695
+#: rc.cpp:3145
 #, no-c-format
 msgid ""
 "<qt>Check this box to send the <b>Typing notification</b> "
@@ -9506,6901 +12253,3284 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 888
-#: rc.cpp:4698
+#: rc.cpp:3148
 #, fuzzy, no-c-format
 msgid "Always send &gone notifications (closing the window)"
 msgstr "Hysbysiad"
 
+#. i18n: file ./protocols/jabber/ui/dlgchatjoin.ui line 24
+#: rc.cpp:3151 rc.cpp:4185
+#, no-c-format
+msgid "Nick:"
+msgstr "Ffugenw :"
+
 #. i18n: file ./protocols/jabber/ui/dlgchatjoin.ui line 47
-#: rc.cpp:4704
+#: rc.cpp:3154
 #, no-c-format
 msgid "Room:"
 msgstr ""
 
 #. i18n: file ./protocols/jabber/ui/dlgchatjoin.ui line 99
-#: rc.cpp:4713
+#: rc.cpp:3163
 #, fuzzy, no-c-format
 msgid "Bro&wse"
 msgstr "&Pori"
 
-#. i18n: file ./protocols/jabber/ui/dlgbrowse.ui line 16
-#: protocols/jabber/ui/dlgjabberbrowse.cpp:114 rc.cpp:4716
+#. i18n: file ./protocols/jabber/ui/dlgregister.ui line 24
+#: rc.cpp:3166
 #, no-c-format
-msgid "Jabber Search"
+msgid "Register with Jabber Service"
 msgstr ""
 
-#. i18n: file ./protocols/jabber/ui/dlgbrowse.ui line 34
-#: rc.cpp:4719
+#. i18n: file ./protocols/jabber/ui/dlgregister.ui line 49
+#: rc.cpp:3169
 #, no-c-format
-msgid "Search For"
-msgstr "Chwilio am:"
+msgid "Registration Form"
+msgstr ""
 
-#. i18n: file ./protocols/jabber/ui/dlgbrowse.ui line 48
-#: rc.cpp:4722
+#. i18n: file ./protocols/jabber/ui/dlgregister.ui line 68
+#: rc.cpp:3172
 #, no-c-format
-msgid "Please wait while retrieving search form..."
+msgid "Please wait while querying the server..."
 msgstr ""
 
-#. i18n: file ./protocols/jabber/ui/dlgbrowse.ui line 59
-#: rc.cpp:4725
+#. i18n: file ./protocols/jabber/ui/dlgchangepassword.ui line 24
+#: rc.cpp:3181
 #, no-c-format
-msgid "JID"
-msgstr ""
+msgid "Current password:"
+msgstr "Cyfrinair cyfredol:"
 
-#. i18n: file ./protocols/jabber/ui/dlgbrowse.ui line 74
-#: rc.cpp:4734
+#. i18n: file ./protocols/jabber/ui/dlgchangepassword.ui line 32
+#: rc.cpp:3184 rc.cpp:3187
 #, no-c-format
-msgid "Nick"
-msgstr "Ffugenw"
+msgid "New password:"
+msgstr "Cyfrinair newydd:"
 
-#. i18n: file ./protocols/jabber/ui/dlgsendraw.ui line 16
-#: rc.cpp:4746
+#. i18n: file ./protocols/jabber/ui/dlgchangepassword.ui line 72
+#: rc.cpp:3190
 #, no-c-format
-msgid "Send Raw XML Packet"
+msgid ""
+"Please enter your current password first\n"
+"and then your new password twice."
 msgstr ""
 
-#. i18n: file ./protocols/jabber/ui/dlgsendraw.ui line 42
-#: rc.cpp:4749
+#. i18n: file ./protocols/oscar/oscarencodingselectionbase.ui line 27
+#: rc.cpp:3194
 #, no-c-format
-msgid "Type in the packet that should be sent to the server:"
+msgid "Use this &encoding when chatting with this contact:"
 msgstr ""
 
-#. i18n: file ./protocols/jabber/ui/dlgsendraw.ui line 56
-#: rc.cpp:4752
+#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 16
+#: rc.cpp:3197
 #, no-c-format
-msgid "User Defined"
-msgstr "Diffinir gan y Defnyddiwr"
+msgid "Account Preferences - ICQ"
+msgstr ""
 
-#. i18n: file ./protocols/jabber/ui/dlgsendraw.ui line 61
-#: rc.cpp:4755
+#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 48
+#: rc.cpp:3203
 #, no-c-format
-msgid "Account Deletion"
+msgid "Account Preferences"
 msgstr ""
 
-#. i18n: file ./protocols/jabber/ui/dlgsendraw.ui line 66
-#: rc.cpp:4758
+#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 67
+#: rc.cpp:3206
 #, no-c-format
-msgid "Availability Status"
+msgid "IC&Q UIN:"
 msgstr ""
 
-#. i18n: file ./protocols/jabber/ui/dlgsendraw.ui line 71
-#: rc.cpp:4761
+#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 73
+#: rc.cpp:3209 rc.cpp:3215
 #, no-c-format
-msgid "Last Active Time"
+msgid "The user ID of your ICQ account."
 msgstr ""
 
-#. i18n: file ./protocols/jabber/ui/dlgsendraw.ui line 76
-#: rc.cpp:4764
+#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 76
+#: rc.cpp:3212 rc.cpp:3218
 #, no-c-format
-msgid "Message with Body"
+msgid ""
+"The user ID of your ICQ account.  This should be in the form of a number (no "
+"decimals, no spaces)."
 msgstr ""
 
-#. i18n: file ./protocols/jabber/ui/dlgsendraw.ui line 81
-#: rc.cpp:4767
+#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 108
+#: rc.cpp:3224 rc.cpp:3639 rc.cpp:4818
 #, no-c-format
-msgid "Message with Subject"
+msgid ""
+"If you check that case, the account will not be connected when you press the "
+"\"Connect All\" button, or at startup even if you selected to automatically "
+"connect at startup"
 msgstr ""
 
-#. i18n: file ./protocols/jabber/ui/dlgsendraw.ui line 86
-#: rc.cpp:4770
+#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 160
+#: rc.cpp:3233
 #, no-c-format
-msgid "Add Roster Item"
+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/jabber/ui/dlgsendraw.ui line 91
-#: rc.cpp:4773
+#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 200
+#: rc.cpp:3240 rc.cpp:3651
+#, fuzzy, no-c-format
+msgid "Accou&nt Preferences"
+msgstr "Gwall protocol."
+
+#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 234
+#: rc.cpp:3246 rc.cpp:3264
 #, no-c-format
-msgid "Delete Roster Item"
+msgid "The port on the ICQ server that you would like to connect to."
 msgstr ""
 
-#. i18n: file ./protocols/jabber/ui/dlgsendraw.ui line 96
-#: protocols/jabber/jabberprotocol.cpp:93 rc.cpp:4776
+#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 237
+#: rc.cpp:3249 rc.cpp:3267
 #, no-c-format
-msgid "Subscription"
-msgstr "Tanysgrifiad"
+msgid ""
+"The port on the ICQ server that you would like to connect to.  Normally this is "
+"5190."
+msgstr ""
 
-#. i18n: file ./protocols/jabber/ui/dlgsendraw.ui line 116
-#: rc.cpp:4779
+#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 248
+#: rc.cpp:3252
 #, no-c-format
-msgid "Clea&r"
-msgstr "Clir&io"
+msgid "login.icq.com"
+msgstr ""
 
-#. i18n: file ./protocols/jabber/ui/dlgsendraw.ui line 124
-#: rc.cpp:4782
+#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 251
+#: rc.cpp:3255 rc.cpp:3273
 #, no-c-format
-msgid "&Send"
-msgstr "&Anfon"
+msgid "The IP address or hostmask of the ICQ server you wish to connect to."
+msgstr ""
 
-#. i18n: file ./protocols/jabber/jingle/jinglevoicesessiondialogbase.ui line 16
-#: rc.cpp:4788
+#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 254
+#: rc.cpp:3258 rc.cpp:3276
 #, no-c-format
-msgid "JabberVoiceSessionDialogBase"
+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/jabber/jingle/jinglevoicesessiondialogbase.ui line 60
-#: rc.cpp:4791
+#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 285
+#: rc.cpp:3270
 #, no-c-format
-msgid "Voice session with:"
+msgid "Ser&ver /"
 msgstr ""
 
-#. i18n: file ./protocols/jabber/jingle/jinglevoicesessiondialogbase.ui line 178
-#: rc.cpp:4794
-#, fuzzy, no-c-format
-msgid "Contact displayname"
-msgstr "Gwybodaeth Cysylltu"
-
-#. i18n: file ./protocols/jabber/jingle/jinglevoicesessiondialogbase.ui line 266
-#: rc.cpp:4797
-#, fuzzy, no-c-format
-msgid "Accep&t"
-msgstr "Derbyn"
-
-#. i18n: file ./protocols/jabber/jingle/jinglevoicesessiondialogbase.ui line 277
-#: rc.cpp:4800
-#, fuzzy, no-c-format
-msgid "&Decline"
-msgstr "Gwrthod"
-
-#. i18n: file ./protocols/jabber/jingle/jinglevoicesessiondialogbase.ui line 288
-#: rc.cpp:4803
-#, fuzzy, no-c-format
-msgid "Termi&nate"
-msgstr "Trosi"
-
-#. i18n: file ./protocols/jabber/jingle/jinglevoicesessiondialogbase.ui line 323
-#: rc.cpp:4806
-#, fuzzy, no-c-format
-msgid "Current status:"
-msgstr "Cyfrinair cyfredol:"
-
-#. i18n: file ./protocols/jabber/jingle/jinglevoicesessiondialogbase.ui line 339
-#: rc.cpp:4809
-#, fuzzy, no-c-format
-msgid "Session status"
-msgstr "Cyfrinair cyfredol:"
-
-#. i18n: file ./protocols/winpopup/ui/wpuserinfowidget.ui line 48
-#: rc.cpp:4815
-#, fuzzy, no-c-format
-msgid "&Computer name:"
-msgstr "Cyfrifiaduron"
-
-#. i18n: file ./protocols/winpopup/ui/wpuserinfowidget.ui line 54
-#: rc.cpp:4818 rc.cpp:4821 rc.cpp:4854 rc.cpp:4857
+#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 312
+#: rc.cpp:3282
 #, no-c-format
-msgid "The hostname of the computer for this contact."
+msgid "Privacy Options"
 msgstr ""
 
-#. i18n: file ./protocols/winpopup/ui/wpuserinfowidget.ui line 65
-#: rc.cpp:4824
+#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 323
+#: rc.cpp:3285
 #, no-c-format
-msgid "Comment:"
-msgstr "Sylwad:"
+msgid "&Require authorization before someone can add you to their contact list"
+msgstr ""
 
-#. i18n: file ./protocols/winpopup/ui/wpuserinfowidget.ui line 73
-#: rc.cpp:4827 rc.cpp:4961
+#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 326
+#: rc.cpp:3288
 #, no-c-format
-msgid "&Workgroup/domain:"
+msgid ""
+"Enable authorization requirement, which will not allow users to add you to "
+"their contact list without authorization from you."
 msgstr ""
 
-#. i18n: file ./protocols/winpopup/ui/wpuserinfowidget.ui line 79
-#: rc.cpp:4830 rc.cpp:4833 rc.cpp:4866 rc.cpp:4869
+#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 329
+#: rc.cpp:3291
 #, no-c-format
-msgid "The workgroup or domain the contact's computer is on."
+msgid ""
+"Enable 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/winpopup/ui/wpuserinfowidget.ui line 90
-#: rc.cpp:4836
+#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 337
+#: rc.cpp:3294
+#, fuzzy, no-c-format
+msgid "Hide &IP address"
+msgstr "Cyfeiriad Cartref"
+
+#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 340
+#: rc.cpp:3297
 #, no-c-format
-msgid "Operating s&ystem:"
+msgid ""
+"Check this to hide your IP address from people when they view your user info"
 msgstr ""
 
-#. i18n: file ./protocols/winpopup/ui/wpuserinfowidget.ui line 96
-#: rc.cpp:4839 rc.cpp:4842 rc.cpp:4872 rc.cpp:4875
+#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 343
+#: rc.cpp:3300
 #, no-c-format
-msgid "The operating system the contact's computer is running."
+msgid ""
+"Checking this box will not allow people to see what your IP address if they "
+"view your ICQ user details such as name, address, or age."
 msgstr ""
 
-#. i18n: file ./protocols/winpopup/ui/wpuserinfowidget.ui line 107
-#: rc.cpp:4845
+#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 351
+#: rc.cpp:3303
 #, no-c-format
-msgid "Ser&ver software:"
+msgid "Make my status available via &ICQ's unified messaging center"
 msgstr ""
 
-#. i18n: file ./protocols/winpopup/ui/wpuserinfowidget.ui line 113
-#: rc.cpp:4848 rc.cpp:4851 rc.cpp:4878 rc.cpp:4881
+#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 357
+#: rc.cpp:3306
 #, no-c-format
-msgid "The software the contact's computer is running."
+msgid "Check this box to enable Web Aware functionality."
 msgstr ""
 
-#. i18n: file ./protocols/winpopup/ui/wpuserinfowidget.ui line 151
-#: rc.cpp:4860 rc.cpp:4863
+#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 360
+#: rc.cpp:3309
 #, no-c-format
-msgid "The comment of the computer for this contact."
+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/winpopup/ui/wpeditaccountbase.ui line 16
-#: rc.cpp:4884
+#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 398
+#: rc.cpp:3312 rc.cpp:3693
 #, no-c-format
-msgid "Account Preferences - WinPopup"
+msgid "Default to the following &encoding for messages:"
 msgstr ""
 
-#. i18n: file ./protocols/winpopup/ui/wpeditaccountbase.ui line 48
-#: rc.cpp:4887
-#, fuzzy, no-c-format
-msgid "Basi&c Setup"
-msgstr "&Sylfaenol"
+#. i18n: file ./protocols/oscar/icq/ui/icqotherinfowidget.ui line 41
+#: rc.cpp:3315
+#, no-c-format
+msgid "Email addresses:"
+msgstr "Cyfeiriadau ebost:"
 
-#. i18n: file ./protocols/winpopup/ui/wpeditaccountbase.ui line 78
-#: rc.cpp:4893
+#. i18n: file ./protocols/oscar/icq/ui/icqotherinfowidget.ui line 54
+#: rc.cpp:3318
 #, no-c-format
-msgid "Hos&tname:"
-msgstr "&Enw gwesteiwr:"
+msgid "Contact notes:"
+msgstr "Nodiadau Cysylltiad :"
 
-#. i18n: file ./protocols/winpopup/ui/wpeditaccountbase.ui line 84
-#: rc.cpp:4896 rc.cpp:4902
+#. i18n: file ./protocols/oscar/icq/ui/icqinterestinfowidget.ui line 24
+#: rc.cpp:3360
+#, fuzzy, no-c-format
+msgid "Interests"
+msgstr "Rhyngrwyd"
+
+#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 27
+#: rc.cpp:3363
 #, no-c-format
-msgid "The hostname you would like to use to send WinPopup messages as."
-msgstr ""
+msgid "C&lear"
+msgstr "&Gwaredu"
 
-#. i18n: file ./protocols/winpopup/ui/wpeditaccountbase.ui line 87
-#: rc.cpp:4899 rc.cpp:4905
+#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 33
+#: rc.cpp:3366
+#, fuzzy, no-c-format
+msgid "Clear the results"
+msgstr "Gwagio& Canlyniadau"
+
+#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 47
+#: rc.cpp:3372
 #, no-c-format
-msgid ""
-"The hostname you would like to use to send WinPopup messages as.  Note that "
-"this does not have to be the actual hostname of the machine to send messages, "
-"but it does to receive them."
+msgid "Close this dialog"
 msgstr ""
 
-#. i18n: file ./protocols/winpopup/ui/wpeditaccountbase.ui line 106
-#: rc.cpp:4908
+#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 67
+#: rc.cpp:3378
 #, no-c-format
-msgid "I&nstall Into Samba"
+msgid "Stops the search"
 msgstr ""
 
-#. i18n: file ./protocols/winpopup/ui/wpeditaccountbase.ui line 109
-#: rc.cpp:4911 rc.cpp:4914
+#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 87
+#: rc.cpp:3384
+#, fuzzy, no-c-format
+msgid "Add the selected user to your contact list"
+msgstr "&Dileu y Cyswllt"
+
+#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 98
+#: rc.cpp:3387
 #, no-c-format
-msgid "Install support into Samba to enable this service."
-msgstr ""
+msgid "User Info"
+msgstr "Gwybodaeth am Ddefnyddwyr"
 
-#. i18n: file ./protocols/winpopup/ui/wpeditaccountbase.ui line 143
-#: rc.cpp:4920
+#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 104
+#: rc.cpp:3390
+#, fuzzy, no-c-format
+msgid "Show information about the selected contact"
+msgstr "&Dileu y Cyswllt"
+
+#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 133
+#: rc.cpp:3393
+#, fuzzy, no-c-format
+msgid "UIN Search"
+msgstr "Chwiliad:"
+
+#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 144
+#: rc.cpp:3396 rc.cpp:3534
 #, no-c-format
-msgid ""
-"To receive WinPopup messages sent from other machines, the hostname above must "
-"be set to this machine's hostname."
+msgid "&UIN #:"
 msgstr ""
 
-#. i18n: file ./protocols/winpopup/ui/wpeditaccountbase.ui line 154
-#: rc.cpp:4923
+#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 179
+#: rc.cpp:3399
 #, no-c-format
-msgid "The samba server must be configured and running."
+msgid "ICQ Whitepages Search"
 msgstr ""
 
-#. i18n: file ./protocols/winpopup/ui/wpeditaccountbase.ui line 164
-#: rc.cpp:4926
+#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 200
+#: rc.cpp:3402
 #, 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 add\n"
-"'message command = _PATH_TO_/winpopup-send.sh %s %m %t &' (substitute _PATH_TO_ "
-"by the real path) to your smb.conf [global]-section."
-msgstr ""
+msgid "&Last name:"
+msgstr "&Enw olaf:"
 
-#. i18n: file ./protocols/winpopup/ui/wpeditaccountbase.ui line 196
-#: rc.cpp:4931
+#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 211
+#: rc.cpp:3405
 #, no-c-format
-msgid "S&ystem"
-msgstr "C&ysawd:"
+msgid "&First name:"
+msgstr "&Enw cyntaf:"
 
-#. i18n: file ./protocols/winpopup/ui/wpeditaccountbase.ui line 235
-#: rc.cpp:4937
+#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 249
+#: rc.cpp:3414
 #, no-c-format
-msgid "<i>These options apply to all WinPopup accounts.</i>"
-msgstr ""
+msgid "Lan&guage:"
+msgstr "Iai&th:"
 
-#. i18n: file ./protocols/winpopup/ui/wpeditaccountbase.ui line 245
-#: rc.cpp:4940
+#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 291
+#: rc.cpp:3420
 #, fuzzy, no-c-format
-msgid "Protocol Preferences"
-msgstr "Gwall protocol."
+msgid "&Gender:"
+msgstr "&Cyffredinol"
 
-#. i18n: file ./protocols/winpopup/ui/wpeditaccountbase.ui line 256
-#: rc.cpp:4943
+#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 307
+#: rc.cpp:3423
 #, no-c-format
-msgid "Host check frequency:"
+msgid "Only search for online contacts"
 msgstr ""
 
-#. i18n: file ./protocols/winpopup/ui/wpeditaccountbase.ui line 264
-#: rc.cpp:4946
+#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 315
+#: rc.cpp:3426
 #, no-c-format
-msgid "Path to 'smbclient' executable:"
+msgid "C&ountry:"
+msgstr "G&wlad:"
+
+#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 361
+#: rc.cpp:3429 rc.cpp:4233
+#, no-c-format
+msgid "UIN"
 msgstr ""
 
-#. i18n: file ./protocols/winpopup/ui/wpeditaccountbase.ui line 315
-#: rc.cpp:4949
+#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 372
+#: rc.cpp:3432
 #, no-c-format
-msgid "second(s)"
-msgstr "eiliad(au)"
+msgid "Nickname"
+msgstr "Ffugenw"
 
-#. i18n: file ./protocols/winpopup/ui/wpaddcontactbase.ui line 50
-#: rc.cpp:4952
+#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 416
+#: rc.cpp:3444
+#, fuzzy, no-c-format
+msgid "Requires Authorization?"
+msgstr "Dilysiant Gweinydd"
+
+#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 432
+#: rc.cpp:3447
 #, no-c-format
-msgid "Com&puter hostname:"
+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/winpopup/ui/wpaddcontactbase.ui line 56
-#: rc.cpp:4955 rc.cpp:4958 rc.cpp:4970 rc.cpp:4973
+#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 443
+#: rc.cpp:3453
 #, no-c-format
-msgid "The hostname you would like to use to send WinPopup messages to."
+msgid "Search the ICQ Whitepages with your search criteria"
 msgstr ""
 
-#. i18n: file ./protocols/winpopup/ui/wpaddcontactbase.ui line 73
-#: rc.cpp:4964 rc.cpp:4967 rc.cpp:4976 rc.cpp:4979
+#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 454
+#: rc.cpp:3456
+#, fuzzy, no-c-format
+msgid "New Search"
+msgstr "Chwiliad:"
+
+#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 457
+#: rc.cpp:3459
 #, no-c-format
-msgid ""
-"The workgroup or domain the computer is on that you would like to use to send "
-"WinPopup messages to."
+msgid "Clears both search fields and results"
 msgstr ""
 
-#. i18n: file ./protocols/winpopup/ui/wpaddcontactbase.ui line 148
-#: rc.cpp:4982 rc.cpp:5159
+#. i18n: file ./protocols/oscar/icq/ui/icqauthreplyui.ui line 16
+#: rc.cpp:3462
 #, no-c-format
-msgid "&Refresh"
-msgstr "&Ailfywio"
+msgid "ICQ Authorization Reply"
+msgstr ""
 
-#. i18n: file ./protocols/winpopup/ui/wpaddcontactbase.ui line 151
-#: rc.cpp:4985 rc.cpp:4988
+#. i18n: file ./protocols/oscar/icq/ui/icqauthreplyui.ui line 43
+#: rc.cpp:3465
 #, no-c-format
-msgid ""
-"Refresh the list of available workgroups & domains on the Windows network."
-msgstr ""
+msgid "Reason:"
+msgstr "Rheswm:"
 
-#. i18n: file ./protocols/groupwise/ui/gwcontactsearch.ui line 16
-#: rc.cpp:4991
+#. i18n: file ./protocols/oscar/icq/ui/icqauthreplyui.ui line 108
+#: rc.cpp:3468
 #, fuzzy, no-c-format
-msgid "Search GroupWise Messenger"
-msgstr "Neges"
+msgid "&Grant authorization"
+msgstr "Yn aros am awdurdodiad"
 
-#. i18n: file ./protocols/groupwise/ui/gwcontactsearch.ui line 35
-#: rc.cpp:4994
-#, no-c-format
-msgid "&First name"
-msgstr "&Enw cyntaf"
+#. i18n: file ./protocols/oscar/icq/ui/icqauthreplyui.ui line 119
+#: rc.cpp:3471
+#, fuzzy, no-c-format
+msgid "&Decline authorization"
+msgstr "Yn aros am awdurdodiad"
 
-#. i18n: file ./protocols/groupwise/ui/gwcontactsearch.ui line 46
-#: rc.cpp:4997
+#. i18n: file ./protocols/oscar/icq/ui/icqauthreplyui.ui line 148
+#: rc.cpp:3474
 #, no-c-format
-msgid "&User ID"
-msgstr "&Dynodiad Defnyddiwr"
+msgid "%1 requested authorization to add you to his/her contact list."
+msgstr ""
 
-#. i18n: file ./protocols/groupwise/ui/gwcontactsearch.ui line 57
-#: rc.cpp:5000
+#. i18n: file ./protocols/oscar/icq/ui/icqauthreplyui.ui line 172
+#: rc.cpp:3477
 #, no-c-format
-msgid "&Title"
-msgstr "&Teitl"
+msgid "Request Reason:"
+msgstr ""
 
-#. i18n: file ./protocols/groupwise/ui/gwcontactsearch.ui line 78
-#: rc.cpp:5003
-#, no-c-format
-msgid "&Department"
-msgstr "&Adran"
+#. i18n: file ./protocols/oscar/icq/ui/icqauthreplyui.ui line 188
+#: rc.cpp:3480
+#, fuzzy, no-c-format
+msgid "Some reason..."
+msgstr "Gwasanaethau ..."
 
-#. i18n: file ./protocols/groupwise/ui/gwcontactsearch.ui line 87
-#: rc.cpp:5006 rc.cpp:5015 rc.cpp:5024 rc.cpp:5039 rc.cpp:5051
+#. i18n: file ./protocols/oscar/icq/ui/icqadd.ui line 38
+#: rc.cpp:3483
 #, no-c-format
-msgid "contains"
-msgstr "yn cynnwys"
+msgid "UIN #:"
+msgstr ""
 
-#. i18n: file ./protocols/groupwise/ui/gwcontactsearch.ui line 92
-#: rc.cpp:5009 rc.cpp:5018 rc.cpp:5027 rc.cpp:5042 rc.cpp:5054
+#. i18n: file ./protocols/oscar/icq/ui/icqadd.ui line 61
+#: rc.cpp:3486
 #, no-c-format
-msgid "begins with"
+msgid "Alternatively, you can search the ICQ Whitepages :"
 msgstr ""
 
-#. i18n: file ./protocols/groupwise/ui/gwcontactsearch.ui line 97
-#: rc.cpp:5012 rc.cpp:5021 rc.cpp:5030 rc.cpp:5045 rc.cpp:5057
+#. i18n: file ./protocols/oscar/icq/ui/icqgeneralinfo.ui line 24
+#: rc.cpp:3492
+#, fuzzy, no-c-format
+msgid "Location && Contact Information"
+msgstr "Gwybodaeth Cyfrif"
+
+#. i18n: file ./protocols/oscar/icq/ui/icqgeneralinfo.ui line 316
+#: rc.cpp:3528
 #, no-c-format
-msgid "equals"
-msgstr "yn gyfartal i"
+msgid "&Full name:"
+msgstr "&Enw llawn:"
 
-#. i18n: file ./protocols/groupwise/ui/gwcontactsearch.ui line 154
-#: rc.cpp:5033
+#. i18n: file ./protocols/oscar/icq/ui/icqgeneralinfo.ui line 398
+#: rc.cpp:3537
 #, no-c-format
-msgid "Last &name"
-msgstr "&Enw olaf"
+msgid "&Birthday:"
+msgstr "&Penblwydd :"
 
-#. i18n: file ./protocols/groupwise/ui/gwcontactsearch.ui line 165
-#: rc.cpp:5036
+#. i18n: file ./protocols/oscar/icq/ui/icqgeneralinfo.ui line 414
+#: rc.cpp:3540
+#, fuzzy, no-c-format
+msgid "Gen&der:"
+msgstr "Cyffredinol"
+
+#. i18n: file ./protocols/oscar/icq/ui/icqgeneralinfo.ui line 449
+#: rc.cpp:3543
 #, no-c-format
-msgid "Cl&ear"
-msgstr "Cl&irio"
+msgid "&IP:"
+msgstr "&IP :"
 
-#. i18n: file ./protocols/groupwise/ui/gwcontactsearch.ui line 250
-#: rc.cpp:5060
+#. i18n: file ./protocols/oscar/icq/ui/icqgeneralinfo.ui line 460
+#: rc.cpp:3546
 #, no-c-format
-msgid "&Results:"
-msgstr "&Canlyniadau:"
+msgid "&Timezone:"
+msgstr "&Amserfa:"
 
-#. i18n: file ./protocols/groupwise/ui/gwcontactsearch.ui line 300
-#: rc.cpp:5072
+#. i18n: file ./protocols/oscar/icq/ui/icqgeneralinfo.ui line 471
+#: rc.cpp:3549
 #, no-c-format
-msgid "User ID"
-msgstr "Dynodiad Defnyddiwr"
+msgid "Marital status:"
+msgstr ""
 
-#. i18n: file ./protocols/groupwise/ui/gwcontactsearch.ui line 335
-#: rc.cpp:5075
+#. i18n: file ./protocols/oscar/icq/ui/icqgeneralinfo.ui line 487
+#: rc.cpp:3552
 #, no-c-format
-msgid "Detai&ls"
-msgstr "Manyl&ion"
+msgid "A&ge:"
+msgstr "O&edran :"
 
-#. i18n: file ./protocols/groupwise/ui/gwcontactsearch.ui line 364
-#: rc.cpp:5078
+#. i18n: file ./protocols/oscar/icq/ui/icqgeneralinfo.ui line 508
+#: rc.cpp:3555
 #, no-c-format
-msgid "0 matching users found"
+msgid "Origin"
 msgstr ""
 
-#. i18n: file ./protocols/groupwise/ui/gwaccountpreferences.ui line 16
-#: rc.cpp:5081
+#. i18n: file ./protocols/oscar/oscarlistcontactsbase.ui line 24
+#: rc.cpp:3567
 #, no-c-format
-msgid "Account Preferences - Groupwise"
+msgid ""
+"The following contacts are not on your contact list. Would you like to add "
+"them?"
 msgstr ""
 
-#. i18n: file ./protocols/groupwise/ui/gwaccountpreferences.ui line 67
-#: rc.cpp:5090
+#. i18n: file ./protocols/oscar/oscarlistcontactsbase.ui line 43
+#: rc.cpp:3570
 #, no-c-format
-msgid "&User ID:"
-msgstr "C&lustnod Defnyddiwr:"
+msgid "Do &not ask again"
+msgstr "P&eidio a gofyn eto"
 
-#. i18n: file ./protocols/groupwise/ui/gwaccountpreferences.ui line 73
-#: rc.cpp:5093 rc.cpp:5096 rc.cpp:5099 rc.cpp:5102
+#. i18n: file ./protocols/oscar/aim/ui/aimjoinchatbase.ui line 27
+#: rc.cpp:3573
 #, no-c-format
-msgid "The account name of your account."
+msgid "Please enter the name of the chat room you wish to join."
 msgstr ""
 
-#. i18n: file ./protocols/groupwise/ui/gwaccountpreferences.ui line 155
-#: rc.cpp:5117 rc.cpp:5123
+#. i18n: file ./protocols/oscar/aim/ui/aimjoinchatbase.ui line 69
+#: rc.cpp:3576
+#, fuzzy, no-c-format
+msgid "Room &name:"
+msgstr "&Enw gwesteiwr:"
+
+#. i18n: file ./protocols/oscar/aim/ui/aimjoinchatbase.ui line 80
+#: rc.cpp:3579
+#, fuzzy, no-c-format
+msgid "E&xchange:"
+msgstr "N&ewid..."
+
+#. i18n: file ./protocols/oscar/aim/ui/aiminfobase.ui line 80
+#: rc.cpp:3585
 #, no-c-format
-msgid ""
-"The IP address or hostname of the server you would like to connect to (for "
-"example im.yourcorp.com)."
-msgstr ""
+msgid "Screen name:"
+msgstr "Enw sgrîn:"
 
-#. i18n: file ./protocols/groupwise/ui/gwaccountpreferences.ui line 248
-#: rc.cpp:5141
+#. i18n: file ./protocols/oscar/aim/ui/aiminfobase.ui line 106
+#: libkopete/ui/userinfodialog.cpp:221 rc.cpp:3588
 #, no-c-format
-msgid "Advanced &Options"
-msgstr "Dewisiada&u Uwch"
+msgid "Warning level:"
+msgstr "Lefel rybudd :"
 
-#. i18n: file ./protocols/groupwise/ui/gwaccountpreferences.ui line 259
-#: rc.cpp:5144 rc.cpp:5204
+#. i18n: file ./protocols/oscar/aim/ui/aiminfobase.ui line 122
+#: rc.cpp:3591
 #, no-c-format
-msgid "A&lways accept invitations"
+msgid "Idle minutes:"
 msgstr ""
 
-#. i18n: file ./protocols/groupwise/ui/gwchatsearchwidget.ui line 22
-#: rc.cpp:5147
-#, fuzzy, no-c-format
-msgid "Chatroom "
-msgstr "Sgwrsio"
+#. i18n: file ./protocols/oscar/aim/ui/aiminfobase.ui line 148
+#: libkopete/ui/userinfodialog.cpp:225 rc.cpp:3594
+#, no-c-format
+msgid "Online since:"
+msgstr ""
 
-#. i18n: file ./protocols/groupwise/ui/gwchatsearchwidget.ui line 33
-#: rc.cpp:5150
+#. i18n: file ./protocols/oscar/aim/ui/aiminfobase.ui line 174
+#: libkopete/ui/userinfodialog.cpp:238 rc.cpp:3597
 #, no-c-format
-msgid "Owner"
+msgid "Away message:"
 msgstr ""
 
-#. i18n: file ./protocols/groupwise/ui/gwchatsearchwidget.ui line 44
-#: protocols/irc/ircprotocol.cpp:153 rc.cpp:5153
+#. i18n: file ./protocols/oscar/aim/ui/aiminfobase.ui line 201
+#: rc.cpp:3600
 #, no-c-format
-msgid "Members"
-msgstr "Aelodau"
+msgid "Profile:"
+msgstr "Proffiliau :"
 
-#. i18n: file ./protocols/groupwise/ui/gwcustomstatusedit.ui line 54
-#: rc.cpp:5162
+#. i18n: file ./protocols/oscar/aim/ui/aimaddcontactui.ui line 53
+#: rc.cpp:3606
 #, no-c-format
-msgid "&Status:"
-msgstr "&Cyflwr :"
+msgid "AIM screen name:"
+msgstr ""
 
-#. i18n: file ./protocols/groupwise/ui/gwcustomstatusedit.ui line 65
-#: rc.cpp:5165
-#, fuzzy, no-c-format
-msgid "Awa&y message:"
-msgstr "Negeseuon Allan"
+#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 24
+#: rc.cpp:3609
+#, no-c-format
+msgid "Account Preferences - AIM"
+msgstr ""
 
-#. i18n: file ./protocols/groupwise/ui/gwcustomstatuswidget.ui line 36
-#: rc.cpp:5174
+#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 86
+#: rc.cpp:3618
 #, fuzzy, no-c-format
-msgid "Auto Reply"
-msgstr "Ymateb"
+msgid "AIM &screen name:"
+msgstr "Enw sgrîn:"
 
-#. i18n: file ./protocols/groupwise/ui/gwshowinvitation.ui line 35
-#: rc.cpp:5186
+#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 92
+#: rc.cpp:3621 rc.cpp:3627
 #, no-c-format
-msgid "<p align=\"right\">From:</p>"
+msgid "The screen name of your AIM account."
 msgstr ""
 
-#. i18n: file ./protocols/groupwise/ui/gwshowinvitation.ui line 43
-#: rc.cpp:5189
+#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 95
+#: rc.cpp:3624 rc.cpp:3630
 #, no-c-format
-msgid "<p align=\"right\">Sent:</p>"
+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/groupwise/ui/gwshowinvitation.ui line 59
-#: rc.cpp:5192
+#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 175
+#: rc.cpp:3645
 #, no-c-format
-msgid "INVITE_DATE_TIME"
+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/groupwise/ui/gwshowinvitation.ui line 67
-#: rc.cpp:5195
+#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 265
+#: rc.cpp:3663 rc.cpp:3672
 #, no-c-format
-msgid "CONTACT_NAME"
+msgid "The IP address or hostmask of the AIM server you wish to connect to."
 msgstr ""
 
-#. i18n: file ./protocols/groupwise/ui/gwshowinvitation.ui line 83
-#: rc.cpp:5198
+#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 268
+#: rc.cpp:3666 rc.cpp:3675
 #, no-c-format
-msgid "INVITE_MESSAGE"
+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/groupwise/ui/gwshowinvitation.ui line 102
-#: rc.cpp:5201
+#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 279
+#: rc.cpp:3669
 #, no-c-format
-msgid "Would you like to join the conversation?"
+msgid "login.oscar.aol.com"
 msgstr ""
 
-#. i18n: file ./protocols/groupwise/ui/gwcontactpropswidget.ui line 32
-#: rc.cpp:5207
+#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 302
+#: rc.cpp:3681 rc.cpp:3687
 #, no-c-format
-msgid "USER_ID"
+msgid "The port on the AIM server that you would like to connect to."
 msgstr ""
 
-#. i18n: file ./protocols/groupwise/ui/gwcontactpropswidget.ui line 68
-#: rc.cpp:5210 rc.cpp:5216 rc.cpp:5228
+#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 305
+#: rc.cpp:3684 rc.cpp:3690
 #, no-c-format
-msgid "Change the display name used for this contact"
+msgid ""
+"The port on the AIM server that you would like to connect to.  Normally this is "
+"5190."
 msgstr ""
 
-#. i18n: file ./protocols/groupwise/ui/gwcontactpropswidget.ui line 98
-#: rc.cpp:5219
+#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 392
+#: rc.cpp:3699
+#, fuzzy, no-c-format
+msgid "Visibility settings"
+msgstr "&Cadw Gosodiadau"
+
+#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 403
+#: rc.cpp:3702
 #, no-c-format
-msgid "USER_STATUS"
+msgid "Allow only from visible list"
 msgstr ""
 
-#. i18n: file ./protocols/groupwise/ui/gwcontactpropswidget.ui line 114
-#: rc.cpp:5225
-#, fuzzy, no-c-format
-msgid "&Display name:"
-msgstr "Enw Dangos"
-
-#. i18n: file ./protocols/groupwise/ui/gwcontactpropswidget.ui line 163
-#: rc.cpp:5234
+#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 411
+#: rc.cpp:3705
 #, no-c-format
-msgid "Additional properties:"
+msgid "Block all users"
 msgstr ""
 
-#. i18n: file ./protocols/groupwise/ui/gwcontactpropswidget.ui line 169
-#: rc.cpp:5237
+#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 419
+#: rc.cpp:3708
 #, no-c-format
-msgid "Property"
-msgstr "Priodwedd"
+msgid "Block AIM users"
+msgstr ""
 
-#. i18n: file ./protocols/groupwise/ui/gwcontactpropswidget.ui line 180
-#: rc.cpp:5240
+#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 427
+#: rc.cpp:3711
 #, no-c-format
-msgid "Value"
-msgstr "Gwerth"
+msgid "Block only from invisible list"
+msgstr ""
 
-#. i18n: file ./protocols/groupwise/ui/gwprivacy.ui line 24
-#: rc.cpp:5243
+#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 435
+#: rc.cpp:3714
 #, no-c-format
-msgid "Who can see my online status and send me messages:"
+msgid "Allow all users"
 msgstr ""
 
-#. i18n: file ./protocols/groupwise/ui/gwprivacy.ui line 48
-#: rc.cpp:5246
+#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 443
+#: rc.cpp:3717
 #, no-c-format
-msgid "A&llowed"
+msgid "Allow only contact list's users"
 msgstr ""
 
-#. i18n: file ./protocols/groupwise/ui/gwprivacy.ui line 91
-#: rc.cpp:5249
+#. i18n: file ./protocols/oscar/oscarvisibilitybase.ui line 24
+#: rc.cpp:3720
+#, fuzzy, no-c-format
+msgid "Always visible:"
+msgstr "Segur"
+
+#. i18n: file ./protocols/oscar/oscarvisibilitybase.ui line 32
+#: rc.cpp:3723
+#, fuzzy, no-c-format
+msgid "Contacts:"
+msgstr "Cyswllt :"
+
+#. i18n: file ./protocols/oscar/oscarvisibilitybase.ui line 155
+#: rc.cpp:3738
+#, fuzzy, no-c-format
+msgid "Always invisible:"
+msgstr "Segur"
+
+#. i18n: file ./protocols/groupwise/gwaddui.ui line 44
+#: rc.cpp:3747 rc.cpp:3750 rc.cpp:3753 rc.cpp:3756
 #, no-c-format
-msgid "&Block >>"
+msgid "The account name of the account you would like to add."
 msgstr ""
 
-#. i18n: file ./protocols/groupwise/ui/gwprivacy.ui line 99
-#: rc.cpp:5252
+#. i18n: file ./protocols/groupwise/gwaddui.ui line 68
+#: rc.cpp:3759
 #, no-c-format
-msgid "<< Allo&w"
+msgid "Contact Type"
 msgstr ""
 
-#. i18n: file ./protocols/groupwise/ui/gwprivacy.ui line 124
-#: rc.cpp:5255
+#. i18n: file ./protocols/groupwise/gwaddui.ui line 79
+#: rc.cpp:3762
 #, no-c-format
-msgid "A&dd..."
-msgstr "Yc&hwanegu..."
+msgid "&Echo"
+msgstr ""
 
-#. i18n: file ./protocols/groupwise/ui/gwprivacy.ui line 167
-#: rc.cpp:5261
+#. i18n: file ./protocols/groupwise/gwaddui.ui line 85
+#: rc.cpp:3765 rc.cpp:3768
 #, no-c-format
-msgid "Bloc&ked"
+msgid ""
+"Hey look!  Only one option.  Could you please make this a dropdown and add "
+"Null?"
 msgstr ""
 
 #. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 16
-#: rc.cpp:5264
+#: rc.cpp:3771
 #, no-c-format
 msgid "GroupWiseChatPropertiesWidget"
 msgstr ""
 
 #. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 27
-#: rc.cpp:5267
+#: rc.cpp:3774
 #, no-c-format
 msgid "DISPLAY NAME"
 msgstr ""
 
 #. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 49
-#: rc.cpp:5270
+#: rc.cpp:3777
 #, no-c-format
 msgid "The user who created the chatroom"
 msgstr ""
 
 #. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 57
-#: rc.cpp:5273
+#: rc.cpp:3780
 #, fuzzy, no-c-format
 msgid "Query:"
 msgstr "Arlliw :"
 
 #. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 68
-#: rc.cpp:5276
+#: rc.cpp:3783
 #, no-c-format
 msgid "Topic:"
 msgstr ""
 
 #. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 85
-#: rc.cpp:5279
+#: rc.cpp:3786
 #, no-c-format
 msgid "A disclaimer for users entering the chatroom"
 msgstr ""
 
 #. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 93
-#: rc.cpp:5282
+#: rc.cpp:3789
 #, no-c-format
 msgid "Owner:"
 msgstr ""
 
 #. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 110
-#: rc.cpp:5285
+#: rc.cpp:3792
 #, no-c-format
 msgid "The current topic of the discussion"
 msgstr ""
 
 #. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 124
-#: rc.cpp:5288
+#: rc.cpp:3795
 #, no-c-format
 msgid "UNKNOWN"
 msgstr ""
 
 #. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 132
-#: rc.cpp:5291
+#: rc.cpp:3798
 #, no-c-format
 msgid "Maximum Users:"
 msgstr ""
 
 #. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 143
-#: rc.cpp:5294
+#: rc.cpp:3801
 #, no-c-format
 msgid "Created on:"
 msgstr ""
 
 #. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 154
-#: rc.cpp:5297
+#: rc.cpp:3804
 #, fuzzy, no-c-format
 msgid "Disclaimer:"
 msgstr "Enw Dangos"
 
 #. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 171
-#: rc.cpp:5300
+#: rc.cpp:3807
 #, no-c-format
 msgid "General description of the chatroom"
 msgstr ""
 
 #. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 185
-#: rc.cpp:5303
+#: rc.cpp:3810
 #, no-c-format
 msgid "Maximum simultaneous users allowed in the chatroom"
 msgstr ""
 
 #. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 193
-#: rc.cpp:5306
+#: rc.cpp:3813
 #, no-c-format
 msgid "Creator:"
 msgstr ""
 
+#. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 204
+#: rc.cpp:3816 rc.cpp:5022
+#, no-c-format
+msgid "Description:"
+msgstr "Disgrifiad:"
+
 #. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 221
-#: rc.cpp:5312
+#: rc.cpp:3819
 #, no-c-format
 msgid "Date and time the chatroom was created"
 msgstr ""
 
 #. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 229
-#: rc.cpp:5315
+#: rc.cpp:3822
 #, no-c-format
 msgid "Archived"
 msgstr ""
 
 #. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 235
-#: rc.cpp:5318
+#: rc.cpp:3825
 #, no-c-format
 msgid "Indicates if the chatroom is being archived on the server"
 msgstr ""
 
 #. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 249
-#: rc.cpp:5321
+#: rc.cpp:3828
 #, no-c-format
 msgid "The user who owns this chatroom"
 msgstr ""
 
 #. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 273
-#: rc.cpp:5324
+#: rc.cpp:3831
 #, no-c-format
 msgid "Default Access"
 msgstr ""
 
 #. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 290
-#: rc.cpp:5330
+#: rc.cpp:3837
 #, no-c-format
 msgid "General permission to read messages in the chatroom"
 msgstr ""
 
 #. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 298
-#: rc.cpp:5333
+#: rc.cpp:3840
 #, fuzzy, no-c-format
 msgid "Write Message"
 msgstr "Neges"
 
 #. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 304
-#: rc.cpp:5336
+#: rc.cpp:3843
 #, no-c-format
 msgid "General permission to write messages in the chatroom"
 msgstr ""
 
 #. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 312
-#: rc.cpp:5339
+#: rc.cpp:3846
 #, no-c-format
 msgid "Modify Access"
 msgstr ""
 
 #. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 318
-#: rc.cpp:5342
+#: rc.cpp:3849
 #, no-c-format
 msgid "General permission to modify the chatroom's access control list"
 msgstr ""
 
 #. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 328
-#: rc.cpp:5345
+#: rc.cpp:3852
 #, no-c-format
 msgid "Access Control List"
 msgstr ""
 
 #. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 339
-#: rc.cpp:5348
+#: rc.cpp:3855
 #, no-c-format
 msgid "Access permissions for specific users"
 msgstr ""
 
 #. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 355
-#: rc.cpp:5351
+#: rc.cpp:3858
 #, fuzzy, no-c-format
 msgid "A&dd"
 msgstr "&Ychwanegu"
 
 #. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 358
-#: rc.cpp:5354
+#: rc.cpp:3861
 #, no-c-format
 msgid "Add a new ACL entry"
 msgstr ""
 
 #. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 366
-#: rc.cpp:5357
+#: rc.cpp:3864
 #, fuzzy, no-c-format
 msgid "Ed&it"
 msgstr "Golygu..."
 
 #. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 369
-#: rc.cpp:5360
+#: rc.cpp:3867
 #, no-c-format
 msgid "Edit an existing ACL entry"
 msgstr ""
 
 #. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 377
-#: rc.cpp:5363
+#: rc.cpp:3870
 #, fuzzy, no-c-format
 msgid "D&elete"
 msgstr "&Ailosod"
 
 #. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 380
-#: rc.cpp:5366
+#: rc.cpp:3873
 #, fuzzy, no-c-format
 msgid "Delete a ACL entry"
 msgstr "&Dileu y Cyswllt"
 
+#. i18n: file ./protocols/groupwise/ui/gwcustomstatusedit.ui line 54
+#: rc.cpp:3876
+#, no-c-format
+msgid "&Status:"
+msgstr "&Cyflwr :"
+
+#. i18n: file ./protocols/groupwise/ui/gwcustomstatusedit.ui line 65
+#: rc.cpp:3879
+#, fuzzy, no-c-format
+msgid "Awa&y message:"
+msgstr "Negeseuon Allan"
+
+#. i18n: file ./protocols/groupwise/ui/gwaccountpreferences.ui line 16
+#: rc.cpp:3885
+#, no-c-format
+msgid "Account Preferences - Groupwise"
+msgstr ""
+
+#. i18n: file ./protocols/groupwise/ui/gwaccountpreferences.ui line 67
+#: rc.cpp:3894
+#, no-c-format
+msgid "&User ID:"
+msgstr "C&lustnod Defnyddiwr:"
+
+#. i18n: file ./protocols/groupwise/ui/gwaccountpreferences.ui line 73
+#: rc.cpp:3897 rc.cpp:3900 rc.cpp:3903 rc.cpp:3906
+#, no-c-format
+msgid "The account name of your account."
+msgstr ""
+
+#. i18n: file ./protocols/groupwise/ui/gwaccountpreferences.ui line 155
+#: rc.cpp:3921 rc.cpp:3927
+#, no-c-format
+msgid ""
+"The IP address or hostname of the server you would like to connect to (for "
+"example im.yourcorp.com)."
+msgstr ""
+
+#. i18n: file ./protocols/groupwise/ui/gwaccountpreferences.ui line 248
+#: rc.cpp:3945
+#, no-c-format
+msgid "Advanced &Options"
+msgstr "Dewisiada&u Uwch"
+
+#. i18n: file ./protocols/groupwise/ui/gwaccountpreferences.ui line 259
+#: rc.cpp:3948 rc.cpp:4110
+#, no-c-format
+msgid "A&lways accept invitations"
+msgstr ""
+
 #. i18n: file ./protocols/groupwise/ui/gwaddui.ui line 16
-#: rc.cpp:5369
+#: rc.cpp:3951
 #, no-c-format
 msgid "TestbedAddUI"
 msgstr ""
 
 #. i18n: file ./protocols/groupwise/ui/gwaddui.ui line 40
-#: rc.cpp:5372
+#: rc.cpp:3954
 #, no-c-format
 msgid "&Basic"
 msgstr "&Sylfaenol"
 
 #. i18n: file ./protocols/groupwise/ui/gwaddui.ui line 51
-#: rc.cpp:5375
+#: rc.cpp:3957
 #, no-c-format
 msgid "Add Using"
 msgstr ""
 
 #. i18n: file ./protocols/groupwise/ui/gwaddui.ui line 65
-#: rc.cpp:5378
+#: rc.cpp:3960
 #, no-c-format
 msgid "A full or partial name. Asterisks are ignored"
 msgstr ""
 
 #. i18n: file ./protocols/groupwise/ui/gwaddui.ui line 68
-#: rc.cpp:5381
+#: rc.cpp:3963
 #, no-c-format
 msgid "Type some or all of the contact's name.  Matches will be shown below"
 msgstr ""
 
 #. i18n: file ./protocols/groupwise/ui/gwaddui.ui line 76
-#: rc.cpp:5384
+#: rc.cpp:3966
 #, no-c-format
 msgid "User &ID:"
 msgstr "Dynod&iad Defnyddiwr:"
 
 #. i18n: file ./protocols/groupwise/ui/gwaddui.ui line 90
-#: rc.cpp:5387
+#: rc.cpp:3969
 #, no-c-format
 msgid "Userna&me:"
 msgstr "Enw de&fnyddiwr:"
 
 #. i18n: file ./protocols/groupwise/ui/gwaddui.ui line 101
-#: rc.cpp:5390
+#: rc.cpp:3972
 #, no-c-format
 msgid "A correct User ID"
 msgstr ""
 
 #. i18n: file ./protocols/groupwise/ui/gwaddui.ui line 104
-#: rc.cpp:5393
+#: rc.cpp:3975
 #, no-c-format
 msgid ""
 "Use this field to add a contact if you already know the user's exact User ID"
 msgstr ""
 
-#. i18n: file ./protocols/groupwise/gwaddui.ui line 44
-#: rc.cpp:5405 rc.cpp:5408 rc.cpp:5411 rc.cpp:5414
-#, no-c-format
-msgid "The account name of the account you would like to add."
-msgstr ""
+#. i18n: file ./protocols/groupwise/ui/gwcontactsearch.ui line 16
+#: rc.cpp:3981
+#, fuzzy, no-c-format
+msgid "Search GroupWise Messenger"
+msgstr "Neges"
 
-#. i18n: file ./protocols/groupwise/gwaddui.ui line 68
-#: rc.cpp:5417
+#. i18n: file ./protocols/groupwise/ui/gwcontactsearch.ui line 35
+#: rc.cpp:3984
 #, no-c-format
-msgid "Contact Type"
-msgstr ""
+msgid "&First name"
+msgstr "&Enw cyntaf"
 
-#. i18n: file ./protocols/groupwise/gwaddui.ui line 79
-#: rc.cpp:5420
+#. i18n: file ./protocols/groupwise/ui/gwcontactsearch.ui line 46
+#: rc.cpp:3987
 #, no-c-format
-msgid "&Echo"
-msgstr ""
+msgid "&User ID"
+msgstr "&Dynodiad Defnyddiwr"
 
-#. i18n: file ./protocols/groupwise/gwaddui.ui line 85
-#: rc.cpp:5423 rc.cpp:5426
+#. i18n: file ./protocols/groupwise/ui/gwcontactsearch.ui line 57
+#: rc.cpp:3990
 #, no-c-format
-msgid ""
-"Hey look!  Only one option.  Could you please make this a dropdown and add "
-"Null?"
-msgstr ""
-
-#: plugins/nowlistening/nowlisteningguiclient.cpp:37
-msgid "Send Media Info"
-msgstr ""
-
-#: plugins/nowlistening/nowlisteningguiclient.cpp:60
-msgid ""
-"None of the supported media players (KsCD, JuK, amaroK, Noatun or Kaffeine) are "
-"playing anything."
-msgstr ""
-
-#: plugins/nowlistening/nowlisteningguiclient.cpp:61
-msgid "Nothing to Send"
-msgstr ""
-
-#: plugins/nowlistening/nowlisteningplugin.cpp:134
-msgid "USAGE: /media - Displays information on current song"
-msgstr ""
-
-#: plugins/nowlistening/nowlisteningplugin.cpp:173
-msgid ""
-"_: Message from Kopete user to another user; used when sending media "
-"information even though there are no songs playing or no media players running\n"
-"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 ""
-
-#: plugins/nowlistening/nowlisteningplugin.cpp:452
-msgid "Unknown track"
-msgstr ""
+msgid "&Title"
+msgstr "&Teitl"
 
-#: plugins/nowlistening/nowlisteningplugin.cpp:461
-msgid "Unknown artist"
-msgstr ""
+#. i18n: file ./protocols/groupwise/ui/gwcontactsearch.ui line 78
+#: rc.cpp:3993
+#, no-c-format
+msgid "&Department"
+msgstr "&Adran"
 
-#: plugins/nowlistening/nowlisteningplugin.cpp:468
-msgid "Unknown album"
-msgstr ""
+#. i18n: file ./protocols/groupwise/ui/gwcontactsearch.ui line 87
+#: rc.cpp:3996 rc.cpp:4005 rc.cpp:4014 rc.cpp:4029 rc.cpp:4041
+#, no-c-format
+msgid "contains"
+msgstr "yn cynnwys"
 
-#: plugins/nowlistening/nowlisteningplugin.cpp:475
-msgid "Unknown player"
+#. i18n: file ./protocols/groupwise/ui/gwcontactsearch.ui line 92
+#: rc.cpp:3999 rc.cpp:4008 rc.cpp:4017 rc.cpp:4032 rc.cpp:4044
+#, no-c-format
+msgid "begins with"
 msgstr ""
 
-#: plugins/translator/translatorlanguages.cpp:36
-msgid "English"
-msgstr "Saesneg"
-
-#: plugins/translator/translatorlanguages.cpp:37
-msgid "Chinese"
-msgstr "Tseineg"
-
-#: plugins/translator/translatorlanguages.cpp:38
-msgid "French"
-msgstr "Ffrengig"
-
-#: plugins/translator/translatorlanguages.cpp:39
-msgid "German"
-msgstr "Almaenaidd"
-
-#: plugins/translator/translatorlanguages.cpp:40
-msgid "Italian"
-msgstr "Eidalaidd"
-
-#: plugins/translator/translatorlanguages.cpp:41
-msgid "Japanese"
-msgstr "Siapanëaidd"
-
-#: plugins/translator/translatorlanguages.cpp:42
-msgid "Korean"
-msgstr "Coreeg"
+#. i18n: file ./protocols/groupwise/ui/gwcontactsearch.ui line 97
+#: rc.cpp:4002 rc.cpp:4011 rc.cpp:4020 rc.cpp:4035 rc.cpp:4047
+#, no-c-format
+msgid "equals"
+msgstr "yn gyfartal i"
 
-#: plugins/translator/translatorlanguages.cpp:43
-msgid "Portuguese"
-msgstr "Portwgëaidd"
+#. i18n: file ./protocols/groupwise/ui/gwcontactsearch.ui line 154
+#: rc.cpp:4023
+#, no-c-format
+msgid "Last &name"
+msgstr "&Enw olaf"
 
-#: plugins/translator/translatorlanguages.cpp:44
-msgid "Russian"
-msgstr "Rwsiaidd"
+#. i18n: file ./protocols/groupwise/ui/gwcontactsearch.ui line 165
+#: rc.cpp:4026
+#, no-c-format
+msgid "Cl&ear"
+msgstr "Cl&irio"
 
-#: plugins/translator/translatorlanguages.cpp:45
-msgid "Spanish"
-msgstr "Sbaenaidd"
+#. i18n: file ./protocols/groupwise/ui/gwcontactsearch.ui line 250
+#: rc.cpp:4050
+#, no-c-format
+msgid "&Results:"
+msgstr "&Canlyniadau:"
 
-#: plugins/translator/translatordialog.cpp:24
-msgid "Translator Plugin"
-msgstr ""
+#. i18n: file ./protocols/groupwise/ui/gwcontactsearch.ui line 300
+#: rc.cpp:4062
+#, no-c-format
+msgid "User ID"
+msgstr "Dynodiad Defnyddiwr"
 
-#: plugins/translator/translatorplugin.cpp:46
-msgid "Translator"
-msgstr "Cyfieithydd"
+#. i18n: file ./protocols/groupwise/ui/gwcontactsearch.ui line 335
+#: rc.cpp:4065
+#, no-c-format
+msgid "Detai&ls"
+msgstr "Manyl&ion"
 
-#: plugins/translator/translatorplugin.cpp:77
-msgid "Set &Language"
+#. i18n: file ./protocols/groupwise/ui/gwcontactsearch.ui line 364
+#: rc.cpp:4068
+#, no-c-format
+msgid "0 matching users found"
 msgstr ""
 
-#: plugins/translator/translatorplugin.cpp:363
-msgid ""
-"%2\n"
-"Auto Translated: %1"
+#. i18n: file ./protocols/groupwise/ui/gwprivacy.ui line 24
+#: rc.cpp:4071
+#, no-c-format
+msgid "Who can see my online status and send me messages:"
 msgstr ""
 
-#: plugins/translator/translatorguiclient.cpp:44
-msgid "Translate"
-msgstr "Trosi"
-
-#: plugins/netmeeting/netmeetinginvitation.cpp:36
-#: plugins/netmeeting/netmeetingplugin.cpp:35
-msgid "NetMeeting"
+#. i18n: file ./protocols/groupwise/ui/gwprivacy.ui line 48
+#: rc.cpp:4074
+#, no-c-format
+msgid "A&llowed"
 msgstr ""
 
-#: plugins/netmeeting/netmeetingguiclient.cpp:41
-msgid "Invite to Use NetMeeting"
+#. i18n: file ./protocols/groupwise/ui/gwprivacy.ui line 91
+#: rc.cpp:4077
+#, no-c-format
+msgid "&Block >>"
 msgstr ""
 
-#: plugins/netmeeting/netmeetinginvitation.cpp:67
-msgid "%1 wants to start a chat with NetMeeting; do you want to accept it? "
+#. i18n: file ./protocols/groupwise/ui/gwprivacy.ui line 99
+#: rc.cpp:4080
+#, no-c-format
+msgid "<< Allo&w"
 msgstr ""
 
-#: plugins/netmeeting/netmeetinginvitation.cpp:68
-#: protocols/msn/msnaccount.cpp:346 protocols/msn/msnaccount.cpp:1285
-#: protocols/msn/msnaddcontactpage.cpp:76 protocols/msn/msnchatsession.cpp:356
-#: protocols/msn/msnchatsession.cpp:365 protocols/msn/msncontact.cpp:175
-#: protocols/msn/msncontact.cpp:252
-#: protocols/msn/ui/msneditaccountwidget.cpp:238
-#: protocols/msn/ui/msneditaccountwidget.cpp:278
-#: protocols/msn/ui/msneditaccountwidget.cpp:336
-#: protocols/msn/ui/msneditaccountwidget.cpp:356
-msgid "MSN Plugin"
-msgstr "Ategyn MSN"
-
-#: plugins/netmeeting/netmeetinginvitation.cpp:68 protocols/msn/webcam.cpp:91
-#: protocols/yahoo/yahooaccount.cpp:1086 protocols/yahoo/yahooaccount.cpp:1527
-#: protocols/yahoo/yahooaccount.cpp:1750
-msgid "Accept"
-msgstr "Derbyn"
-
-#: plugins/netmeeting/netmeetinginvitation.cpp:68
-msgid "Refuse"
-msgstr "Gwrthod"
+#. i18n: file ./protocols/groupwise/ui/gwprivacy.ui line 124
+#: rc.cpp:4083
+#, no-c-format
+msgid "A&dd..."
+msgstr "Yc&hwanegu..."
 
-#: plugins/alias/aliaspreferences.cpp:336
-#: plugins/alias/aliaspreferences.cpp:425
-msgid ""
-"<qt>Could not add alias <b>%1</b>. An alias name cannot contain the characters "
-"\"_\" or \"=\".</qt>"
+#. i18n: file ./protocols/groupwise/ui/gwprivacy.ui line 167
+#: rc.cpp:4089
+#, no-c-format
+msgid "Bloc&ked"
 msgstr ""
 
-#: plugins/alias/aliaspreferences.cpp:338
-#: plugins/alias/aliaspreferences.cpp:427
-msgid "Invalid Alias Name"
+#. i18n: file ./protocols/groupwise/ui/gwshowinvitation.ui line 35
+#: rc.cpp:4092
+#, no-c-format
+msgid "<p align=\"right\">From:</p>"
 msgstr ""
 
-#: plugins/alias/aliaspreferences.cpp:354
-#: plugins/alias/aliaspreferences.cpp:450
-msgid ""
-"<qt>Could not add alias <b>%1</b>. This command is already being handled by "
-"either another alias or Kopete itself.</qt>"
+#. i18n: file ./protocols/groupwise/ui/gwshowinvitation.ui line 43
+#: rc.cpp:4095
+#, no-c-format
+msgid "<p align=\"right\">Sent:</p>"
 msgstr ""
 
-#: plugins/alias/aliaspreferences.cpp:356
-#: plugins/alias/aliaspreferences.cpp:452
-msgid "Could Not Add Alias"
+#. i18n: file ./protocols/groupwise/ui/gwshowinvitation.ui line 59
+#: rc.cpp:4098
+#, no-c-format
+msgid "INVITE_DATE_TIME"
 msgstr ""
 
-#: plugins/alias/aliaspreferences.cpp:469
-msgid "Are you sure you want to delete the selected aliases?"
+#. i18n: file ./protocols/groupwise/ui/gwshowinvitation.ui line 67
+#: rc.cpp:4101
+#, no-c-format
+msgid "CONTACT_NAME"
 msgstr ""
 
-#: plugins/alias/aliaspreferences.cpp:469
-msgid "Delete Aliases"
+#. i18n: file ./protocols/groupwise/ui/gwshowinvitation.ui line 83
+#: rc.cpp:4104
+#, no-c-format
+msgid "INVITE_MESSAGE"
 msgstr ""
 
-#: plugins/latex/latexplugin.cpp:95
-msgid ""
-"I cannot find the Magick convert program.\n"
-"convert is required to render the Latex formulas.\n"
-"Please go to www.imagemagick.org or to your distribution site and get the right "
-"package."
+#. i18n: file ./protocols/groupwise/ui/gwshowinvitation.ui line 102
+#: rc.cpp:4107
+#, no-c-format
+msgid "Would you like to join the conversation?"
 msgstr ""
 
-#: plugins/latex/latexguiclient.cpp:44
-msgid "Preview Latex Images"
-msgstr ""
+#. i18n: file ./protocols/groupwise/ui/gwchatsearchwidget.ui line 22
+#: rc.cpp:4113
+#, fuzzy, no-c-format
+msgid "Chatroom "
+msgstr "Sgwrsio"
 
-#: plugins/latex/latexguiclient.cpp:62
-msgid ""
-"There are no latex in the message you are typing.  The latex formula must be "
-"included between $$ and $$ "
+#. i18n: file ./protocols/groupwise/ui/gwchatsearchwidget.ui line 33
+#: rc.cpp:4116
+#, no-c-format
+msgid "Owner"
 msgstr ""
 
-#: plugins/latex/latexguiclient.cpp:62
-msgid "No Latex Formula"
+#. i18n: file ./protocols/groupwise/ui/gwcontactpropswidget.ui line 32
+#: rc.cpp:4128
+#, no-c-format
+msgid "USER_ID"
 msgstr ""
 
-#: plugins/latex/latexguiclient.cpp:67
-#, c-format
-msgid "<b>Preview of the latex message :</b> <br />%1"
+#. i18n: file ./protocols/groupwise/ui/gwcontactpropswidget.ui line 68
+#: rc.cpp:4131 rc.cpp:4137 rc.cpp:4149
+#, no-c-format
+msgid "Change the display name used for this contact"
 msgstr ""
 
-#: plugins/webpresence/webpresenceplugin.cpp:208
-msgid ""
-"An error occurred when uploading your presence page.\n"
-"Check the path and write permissions of the destination."
-msgstr ""
+#. i18n: file ./protocols/groupwise/ui/gwcontactpropswidget.ui line 76
+#: libkopete/ui/userinfodialog.cpp:217 rc.cpp:4134
+#, no-c-format
+msgid "Status:"
+msgstr "Cyflwr:"
 
-#: plugins/webpresence/webpresenceplugin.cpp:218
-msgid "Not yet known"
+#. i18n: file ./protocols/groupwise/ui/gwcontactpropswidget.ui line 98
+#: rc.cpp:4140
+#, no-c-format
+msgid "USER_STATUS"
 msgstr ""
 
-#: plugins/highlight/highlightpreferences.cpp:207
-msgid "Rename Filter"
-msgstr "Ailenwi Hidlen"
-
-#: plugins/highlight/highlightpreferences.cpp:207
-msgid "Please enter the new name for the filter:"
-msgstr ""
+#. i18n: file ./protocols/groupwise/ui/gwcontactpropswidget.ui line 114
+#: rc.cpp:4146
+#, fuzzy, no-c-format
+msgid "&Display name:"
+msgstr "Enw Dangos"
 
-#: plugins/highlight/highlightconfig.cpp:72
-msgid "-New filter-"
+#. i18n: file ./protocols/groupwise/ui/gwcontactpropswidget.ui line 163
+#: rc.cpp:4155
+#, no-c-format
+msgid "Additional properties:"
 msgstr ""
 
-#: plugins/cryptography/cryptographyselectuserkey.cpp:29
-msgid "Select Contact's Public Key"
-msgstr ""
+#. i18n: file ./protocols/groupwise/ui/gwcontactpropswidget.ui line 169
+#: rc.cpp:4158
+#, no-c-format
+msgid "Property"
+msgstr "Priodwedd"
 
-#: plugins/cryptography/cryptographyselectuserkey.cpp:38
-#, c-format
-msgid "Select public key for %1"
-msgstr ""
+#. i18n: file ./protocols/groupwise/ui/gwcontactpropswidget.ui line 180
+#: rc.cpp:4161
+#, no-c-format
+msgid "Value"
+msgstr "Gwerth"
 
-#: plugins/cryptography/kgpgselkey.cpp:41
-msgid "Private Key List"
-msgstr ""
+#. i18n: file ./protocols/groupwise/ui/gwcustomstatuswidget.ui line 36
+#: rc.cpp:4167
+#, fuzzy, no-c-format
+msgid "Auto Reply"
+msgstr "Ymateb"
 
-#: plugins/cryptography/kgpgselkey.cpp:57
-msgid "Choose secret key:"
-msgstr ""
+#. i18n: file ./protocols/gadu/ui/gadusearch.ui line 96
+#: rc.cpp:4182 rc.cpp:4491
+#, no-c-format
+msgid "Surname:"
+msgstr "Cyfenw :"
 
-#: plugins/cryptography/kgpgselkey.cpp:64
-msgid "Local signature (cannot be exported)"
+#. i18n: file ./protocols/gadu/ui/gadusearch.ui line 162
+#: rc.cpp:4191
+#, no-c-format
+msgid "Age from:"
 msgstr ""
 
-#: plugins/cryptography/kgpgselkey.cpp:84
-#: plugins/cryptography/popuppublic.cpp:401
-msgid "Unlimited"
-msgstr "Heb derfyn"
-
-#: plugins/cryptography/kgpgselkey.cpp:92
-msgid "Invalid"
-msgstr "Annilys"
-
-#: plugins/cryptography/kgpgselkey.cpp:95
-msgid "Disabled"
-msgstr "Analluogir"
-
-#: plugins/cryptography/kgpgselkey.cpp:98
-msgid "Revoked"
-msgstr "Dirymir"
-
-#: plugins/cryptography/kgpgselkey.cpp:101
-msgid "Expired"
-msgstr "Darfyddir"
-
-#: plugins/cryptography/kgpgselkey.cpp:104
-msgid "Undefined"
-msgstr "Anniffiniedig"
-
-#: plugins/cryptography/kgpgselkey.cpp:107
-msgid "None"
-msgstr "Dim"
+#. i18n: file ./protocols/gadu/ui/gadusearch.ui line 190
+#: rc.cpp:4194
+#, no-c-format
+msgid "to:"
+msgstr "i:"
 
-#: plugins/cryptography/kgpgselkey.cpp:110
-msgid "Marginal"
+#. i18n: file ./protocols/gadu/ui/gadusearch.ui line 245
+#: rc.cpp:4197 rc.cpp:4497
+#, no-c-format
+msgid "Gender:"
 msgstr ""
 
-#: plugins/cryptography/kgpgselkey.cpp:113
-msgid "Full"
-msgstr "Llawn"
-
-#: plugins/cryptography/kgpgselkey.cpp:116
-msgid "Ultimate"
-msgstr "Eithaf"
-
-#: plugins/cryptography/kgpgselkey.cpp:119
-msgid "?"
-msgstr "?"
+#. i18n: file ./protocols/gadu/ui/gadusearch.ui line 304
+#: rc.cpp:4206
+#, no-c-format
+msgid "User number:"
+msgstr ""
 
-#: plugins/cryptography/kgpgselkey.cpp:150
-msgid "ID: %1, trust: %2, expiration: %3"
+#. i18n: file ./protocols/gadu/ui/gadusearch.ui line 327
+#: rc.cpp:4209
+#, no-c-format
+msgid "Request information about user:"
 msgstr ""
 
-#: plugins/cryptography/popuppublic.cpp:94
-msgid "Select Public Key"
+#. i18n: file ./protocols/gadu/ui/gadusearch.ui line 341
+#: rc.cpp:4212
+#, no-c-format
+msgid "Search by specified data:"
 msgstr ""
 
-#: plugins/cryptography/popuppublic.cpp:111
-#, c-format
-msgid "Select Public Key for %1"
+#. i18n: file ./protocols/gadu/ui/gadusearch.ui line 357
+#: rc.cpp:4215
+#, no-c-format
+msgid "Lookup only those that are currently online"
 msgstr ""
 
-#: plugins/cryptography/popuppublic.cpp:119
-msgid "Clear Search"
-msgstr "Gwagu'r Chwiliad"
+#. i18n: file ./protocols/gadu/ui/gadusearch.ui line 439
+#: libkopete/kopeteglobal.cpp:184 rc.cpp:4224
+#, no-c-format
+msgid "Nick Name"
+msgstr "Llysenw"
 
-#: plugins/cryptography/popuppublic.cpp:122
-msgid "Search: "
-msgstr "Chwiliad: "
+#. i18n: file ./protocols/gadu/ui/gadusearch.ui line 450
+#: rc.cpp:4227
+#, no-c-format
+msgid "Age"
+msgstr "Oedran"
 
-#: plugins/cryptography/popuppublic.cpp:129
-msgid "ID"
-msgstr "ID"
+#. i18n: file ./protocols/gadu/ui/gadusearch.ui line 461
+#: rc.cpp:4230
+#, no-c-format
+msgid "City"
+msgstr "Dinas"
 
-#: plugins/cryptography/popuppublic.cpp:147
-msgid "&Go to Default Key"
-msgstr ""
+#. i18n: file ./protocols/gadu/ui/gadusearch.ui line 483
+#: rc.cpp:4236
+#, no-c-format
+msgid "12"
+msgstr "12"
 
-#: plugins/cryptography/popuppublic.cpp:150
-msgid "ASCII armored encryption"
+#. i18n: file ./protocols/gadu/ui/gadusearch.ui line 486
+#: rc.cpp:4239
+#, no-c-format
+msgid "DONT_TRANSLATE"
 msgstr ""
 
-#: plugins/cryptography/popuppublic.cpp:151
-msgid "Allow encryption with untrusted keys"
+#. i18n: file ./protocols/gadu/ui/gadusearch.ui line 489
+#: rc.cpp:4242 rc.cpp:4248
+#, no-c-format
+msgid "DONT_TRANSL"
 msgstr ""
 
-#: plugins/cryptography/popuppublic.cpp:152
-msgid "Hide user id"
+#. i18n: file ./protocols/gadu/ui/gadusearch.ui line 492
+#: rc.cpp:4245
+#, no-c-format
+msgid "999"
 msgstr ""
 
-#: plugins/cryptography/popuppublic.cpp:155
-msgid ""
-"<b>Public keys list</b>: select the key that will be used for encryption."
+#. i18n: file ./protocols/gadu/ui/gadusearch.ui line 498
+#: rc.cpp:4251
+#, no-c-format
+msgid "245324956234"
 msgstr ""
 
-#: plugins/cryptography/popuppublic.cpp:157
+#. i18n: file ./protocols/gadu/ui/gaduawayui.ui line 52
+#: rc.cpp:4260
+#, no-c-format
 msgid ""
-"<b>ASCII encryption</b>: makes it possible to open the encrypted file/message "
-"in a text editor"
+"Choose status, by default present 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 ""
 
-#: plugins/cryptography/popuppublic.cpp:159
-msgid ""
-"<b>Hide user ID</b>: Do not put the keyid into encrypted packets. This option "
-"hides the receiver of the message and is a countermeasure against traffic "
-"analysis. It may slow down the decryption process because all available secret "
-"keys are tried."
+#. i18n: file ./protocols/gadu/ui/gaduawayui.ui line 77
+#: rc.cpp:4268
+#, no-c-format
+msgid "Set your status to Online."
 msgstr ""
 
-#: plugins/cryptography/popuppublic.cpp:163
+#. i18n: file ./protocols/gadu/ui/gaduawayui.ui line 80
+#: rc.cpp:4271
+#, no-c-format
 msgid ""
-"<b>Allow encryption with untrusted keys</b>: when you import a public key, it "
-"is usually marked as untrusted and you cannot use it unless you sign it in "
-"order to make it 'trusted'. Checking this box enables you to use any key, even "
-"if it has not be signed."
+"Set your status to Online, indicating that you are available to chat with "
+"anyone who wishes."
 msgstr ""
 
-#: plugins/cryptography/popuppublic.cpp:172
-msgid "Shred source file"
+#. i18n: file ./protocols/gadu/ui/gaduawayui.ui line 94
+#: rc.cpp:4277
+#, no-c-format
+msgid "Set your status to busy."
 msgstr ""
 
-#: plugins/cryptography/popuppublic.cpp:174
+#. i18n: file ./protocols/gadu/ui/gaduawayui.ui line 97
+#: rc.cpp:4280
+#, no-c-format
 msgid ""
-"<b>Shred source file</b>: permanently remove source file. No recovery will be "
-"possible"
+"Set your status to busy, indicating that you may should not be bothered with "
+"trivial chat, and may not be able to reply immediately."
 msgstr ""
 
-#: plugins/cryptography/popuppublic.cpp:176
+#. i18n: file ./protocols/gadu/ui/gaduawayui.ui line 111
+#: rc.cpp:4286
+#, no-c-format
 msgid ""
-"<qt><b>Shred source file:</b><br />"
-"<p>Checking this option will shred (overwrite several times before erasing) the "
-"files you have encrypted. This way, it is almost impossible that the source "
-"file is recovered.</p>"
-"<p><b>But you must be aware that this is not secure</b> "
-"on all file systems, and that parts of the file may have been saved in a "
-"temporary file or in the spooler of your printer if you previously opened it in "
-"an editor or tried to print it. Only works on files (not on folders).</p></qt>"
-msgstr ""
-
-#: plugins/cryptography/popuppublic.cpp:177
-msgid "<a href=\"whatsthis:%1\">Read this before using shredding</a>"
-msgstr ""
-
-#: plugins/cryptography/popuppublic.cpp:182
-msgid "Symmetrical encryption"
+"Set status to invisible, which will hide your presence from other users."
 msgstr ""
 
-#: plugins/cryptography/popuppublic.cpp:184
+#. i18n: file ./protocols/gadu/ui/gaduawayui.ui line 114
+#: rc.cpp:4289
+#, no-c-format
 msgid ""
-"<b>Symmetrical encryption</b>: encryption does not use keys. You just need to "
-"give a password to encrypt/decrypt the file"
+"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 ""
 
-#: plugins/cryptography/cryptographyplugin.cpp:51
-msgid "Cryptography"
-msgstr "Cêl-ysgrifennaeth"
-
-#: plugins/cryptography/cryptographyplugin.cpp:71
-msgid "&Select Cryptography Public Key..."
+#. i18n: file ./protocols/gadu/ui/gaduawayui.ui line 128
+#: rc.cpp:4295 rc.cpp:4298
+#, no-c-format
+msgid "Choose this status to disconnect with description entered below."
 msgstr ""
 
-#: plugins/cryptography/cryptographyplugin.cpp:188
-msgid "Outgoing Encrypted Message: "
-msgstr ""
+#. i18n: file ./protocols/gadu/ui/gaduawayui.ui line 151
+#: rc.cpp:4301
+#, no-c-format
+msgid "&Message:"
+msgstr "&Neges:"
 
-#: plugins/cryptography/cryptographyplugin.cpp:219
-msgid "Incoming Encrypted Message: "
+#. i18n: file ./protocols/gadu/ui/gaduawayui.ui line 157
+#: rc.cpp:4304 rc.cpp:4310
+#, no-c-format
+msgid "Description of your status."
 msgstr ""
 
-#: plugins/cryptography/kgpginterface.cpp:99
-msgid "Enter passphrase for <b>%1</b>:"
+#. i18n: file ./protocols/gadu/ui/gaduawayui.ui line 160
+#: rc.cpp:4307 rc.cpp:4313
+#, no-c-format
+msgid "Description of your status (up to 70 characters)."
 msgstr ""
 
-#: plugins/cryptography/kgpginterface.cpp:101
-msgid "<b>Bad passphrase</b><br> You have %1 tries left.<br>"
+#. i18n: file ./protocols/gadu/ui/gaduregisteraccountui.ui line 16
+#: rc.cpp:4316
+#, no-c-format
+msgid "Register Account - Gadu-Gadu"
 msgstr ""
 
-#: plugins/cryptography/cryptographyguiclient.cpp:51
-msgid "Encrypt Messages"
-msgstr ""
+#. i18n: file ./protocols/gadu/ui/gaduregisteraccountui.ui line 66
+#: rc.cpp:4319
+#, no-c-format
+msgid "Repeat pass&word:"
+msgstr "Ailadrodd c&yfrinair:"
 
-#: plugins/history/historydialog.cpp:98 plugins/history/historydialog.cpp:556
-#, c-format
-msgid "History for %1"
+#. i18n: file ./protocols/gadu/ui/gaduregisteraccountui.ui line 72
+#: rc.cpp:4322 rc.cpp:4373
+#, no-c-format
+msgid "A confirmation of the password you would like to use."
 msgstr ""
 
-#: plugins/history/historydialog.cpp:119
-msgid "All"
-msgstr "Popeth"
-
-#: plugins/history/historydialog.cpp:213
-msgid "Loading..."
-msgstr "Llwytho..."
-
-#: plugins/history/historydialog.cpp:470
-msgid "Searching..."
-msgstr "Yn chwilio..."
-
-#: plugins/history/historydialog.cpp:549
-msgid "History for All Contacts"
+#. i18n: file ./protocols/gadu/ui/gaduregisteraccountui.ui line 75
+#: rc.cpp:4325 rc.cpp:4376
+#, no-c-format
+msgid "A confirmation of the password you would like to use for this account."
 msgstr ""
 
-#: plugins/history/historyplugin.cpp:41
-msgid "History"
-msgstr "Hanes"
-
-#: plugins/history/historyplugin.cpp:47
-msgid "View &History"
+#. i18n: file ./protocols/gadu/ui/gaduregisteraccountui.ui line 86
+#: rc.cpp:4328 rc.cpp:4367
+#, no-c-format
+msgid "The password you would like to use."
 msgstr ""
 
-#: plugins/history/historyplugin.cpp:66
-msgid ""
-"Old history files from Kopete 0.6.x or older has been detected.\n"
-"Do you want to import and convert it to the new history format?"
+#. i18n: file ./protocols/gadu/ui/gaduregisteraccountui.ui line 89
+#: rc.cpp:4331 rc.cpp:4370
+#, no-c-format
+msgid "The password you would like to use for this account."
 msgstr ""
 
-#: plugins/history/historyplugin.cpp:68
-msgid "History Plugin"
-msgstr "Ategyn Hanes"
-
-#: plugins/history/historyplugin.cpp:68
-#, fuzzy
-msgid "Import && Convert"
-msgstr "Cysylltau"
-
-#: plugins/history/historyplugin.cpp:68
-msgid "Do Not Import"
+#. i18n: file ./protocols/gadu/ui/gaduregisteraccountui.ui line 97
+#: rc.cpp:4334 rc.cpp:4343
+#, no-c-format
+msgid "Your E-mail address."
 msgstr ""
 
-#: plugins/history/converter.cpp:40
-msgid "Would you like to remove old history files?"
+#. i18n: file ./protocols/gadu/ui/gaduregisteraccountui.ui line 100
+#: rc.cpp:4337 rc.cpp:4346
+#, no-c-format
+msgid "The E-mail address you would like to use to register this account."
 msgstr ""
 
-#: plugins/history/converter.cpp:40
-msgid "History Converter"
+#. i18n: file ./protocols/gadu/ui/gaduregisteraccountui.ui line 136
+#: rc.cpp:4340
+#, no-c-format
+msgid "&E-Mail address:"
 msgstr ""
 
-#: plugins/history/converter.cpp:40 protocols/jabber/jabberaccount.cpp:1125
-#: protocols/jabber/jabbercontact.cpp:921
-msgid "Keep"
-msgstr "Cadw"
-
-#: plugins/history/converter.cpp:42
-msgid "History converter"
+#. i18n: file ./protocols/gadu/ui/gaduregisteraccountui.ui line 184
+#: rc.cpp:4349
+#, no-c-format
+msgid "&Verification sequence:"
 msgstr ""
 
-#: plugins/history/converter.cpp:115
-#, c-format
-msgid "Parsing old history in %1"
+#. i18n: file ./protocols/gadu/ui/gaduregisteraccountui.ui line 190
+#: rc.cpp:4352 rc.cpp:4358
+#, no-c-format
+msgid "The text from the image below."
 msgstr ""
 
-#: plugins/history/converter.cpp:125
+#. i18n: file ./protocols/gadu/ui/gaduregisteraccountui.ui line 193
+#: rc.cpp:4355 rc.cpp:4361
+#, no-c-format
 msgid ""
-"Parsing old history in %1:\n"
-"%2"
-msgstr ""
-
-#: plugins/history/historyguiclient.cpp:44
-msgid "History Last"
+"The text from the image below.  This is used to prevent abusive automated "
+"registration scripts."
 msgstr ""
 
-#: plugins/statistics/statisticsdialog.cpp:45
-#, c-format
-msgid "Statistics for %1"
-msgstr ""
+#. i18n: file ./protocols/gadu/ui/gaduregisteraccountui.ui line 240
+#: rc.cpp:4364 rc.cpp:4695 rc.cpp:4998
+#, no-c-format
+msgid "&Password:"
+msgstr "&Cyfrinair:"
 
-#: plugins/statistics/statisticsdialog.cpp:193
-msgid "<h1>Statistics for %1</h1>"
+#. i18n: file ./protocols/gadu/ui/gaduregisteraccountui.ui line 337
+#: rc.cpp:4379
+#, no-c-format
+msgid "Gadu-Gadu registration token."
 msgstr ""
 
-#: plugins/statistics/statisticsdialog.cpp:196
+#. i18n: file ./protocols/gadu/ui/gaduregisteraccountui.ui line 340
+#: rc.cpp:4382
+#, no-c-format
 msgid ""
-"<div class=\"statgroup\"><b><a href=\"main:generalinfo\" title=\"General "
-"summary view\">General</a></b>"
-"<br><span title=\"Select the a day or a month to view the stat for\"><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>"
+"This field contains an image with number that you need to type into the <b>"
+"Verification Sequence</b> field above."
 msgstr ""
 
-#: plugins/statistics/statisticsdialog.cpp:227
+#. i18n: file ./protocols/gadu/ui/gaduregisteraccountui.ui line 375
+#: rc.cpp:4385
+#, no-c-format
 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>"
+"<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 ""
 
-#: plugins/statistics/statisticsdialog.cpp:387
-msgid "<div class=\"statgroup\">"
+#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 24
+#: rc.cpp:4388
+#, no-c-format
+msgid "Account Preferences - Gadu-Gadu"
 msgstr ""
 
-#: plugins/statistics/statisticsdialog.cpp:388
-msgid ""
-"<b title=\"The total time I have been able to see %1 status\">"
-"Total seen time :</b> %2 hour(s)"
-"<br>"
+#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 72
+#: rc.cpp:4397 rc.cpp:4542
+#, no-c-format
+msgid "Gadu-Gadu &UIN:"
 msgstr ""
 
-#: plugins/statistics/statisticsdialog.cpp:390
-msgid ""
-"<b title=\"The total time I have seen %1 online\">Total online time :</b> "
-"%2 hour(s)"
-"<br>"
+#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 78
+#: rc.cpp:4400 rc.cpp:4406
+#, no-c-format
+msgid "The user ID of your Gadu-Gadu account."
 msgstr ""
 
-#: plugins/statistics/statisticsdialog.cpp:392
+#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 81
+#: rc.cpp:4403 rc.cpp:4409
+#, no-c-format
 msgid ""
-"<b title=\"The total time I have seen %1 away\">Total busy time :</b> "
-"%2 hour(s)"
-"<br>"
+"The user ID of your Gadu-Gadu account.  This should be in the form of a number "
+"(no decimals, no spaces)."
 msgstr ""
 
-#: plugins/statistics/statisticsdialog.cpp:393
+#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 125
+#: rc.cpp:4415
+#, no-c-format
 msgid ""
-"<b title=\"The total time I have seen %1 offline\">Total offline time :</b> "
-"%2 hour(s)"
-msgstr ""
-
-#: plugins/statistics/statisticsdialog.cpp:396
-#: plugins/statistics/statisticsdialog.cpp:464
-#: plugins/statistics/statisticsdialog.cpp:482
-msgid "General information"
-msgstr "Gwybodaeth Cyffredinol"
-
-#: plugins/statistics/statisticsdialog.cpp:402
-msgid "<b>Average message length :</b> %1 characters<br>"
-msgstr ""
-
-#: plugins/statistics/statisticsdialog.cpp:403
-msgid "<b>Time between two messages : </b> %1 second(s)"
-msgstr ""
-
-#: plugins/statistics/statisticsdialog.cpp:407
-msgid "<b title=\"The last time you talked with %1\">Last talk :</b> %2<br>"
+"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 ""
 
-#: plugins/statistics/statisticsdialog.cpp:408
+#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 169
+#: rc.cpp:4421
+#, no-c-format
 msgid ""
-"<b title=\"The last time I have seen %1 online or away\">"
-"Last time contact was present :</b> %2"
-msgstr ""
-
-#: plugins/statistics/statisticsdialog.cpp:418
-#, fuzzy
-msgid "Current status"
-msgstr "Cyfrinair cyfredol:"
-
-#: plugins/statistics/statisticsdialog.cpp:419
-msgid "Is <b>%1</b> since <b>%2</b>"
-msgstr ""
-
-#: plugins/statistics/statisticsdialog.cpp:429
-msgid "When have I seen this contact ?"
+"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 ""
 
-#: plugins/statistics/statisticsdialog.cpp:443
-msgid "Between %1:00 and %2:00, I was able to see %3 status %4% of the hour."
+#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 260
+#: rc.cpp:4440
+#, no-c-format
+msgid "&Use direct connections (DCC)"
 msgstr ""
 
-#: plugins/statistics/statisticsdialog.cpp:452
-#, fuzzy
-msgid "Online time"
-msgstr "Ar-lein"
-
-#: plugins/statistics/statisticsdialog.cpp:452
-#, fuzzy
-msgid "Away time"
-msgstr "&Cadw Gosodiadau"
-
-#: plugins/statistics/statisticsdialog.cpp:452
-#, fuzzy
-msgid "Offline time"
-msgstr "All-lein"
-
-#: plugins/statistics/statisticsdialog.cpp:457
-msgid "online"
-msgstr "arlein"
-
-#: plugins/statistics/statisticsdialog.cpp:459
-msgid "away"
-msgstr "i ffwrdd"
-
-#: plugins/statistics/statisticsdialog.cpp:461
-msgid "offline"
-msgstr "all-lein"
-
-#: plugins/statistics/statisticsdialog.cpp:502
-msgid "Between %1:00 and %2:00, I have seen %3 %4% %5."
+#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 279
+#: rc.cpp:4443
+#, no-c-format
+msgid "Use protocol encr&yption (SSL):"
 msgstr ""
 
-#: plugins/statistics/statisticsdialog.cpp:526
+#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 285
+#: rc.cpp:4446 rc.cpp:4461
+#, no-c-format
 msgid ""
-"_: 1 is date, 2 is contact name, 3 is online status\n"
-"%1, %2 was %3"
-msgstr ""
-
-#: plugins/statistics/statisticsplugin.cpp:46
-msgid "Statistics"
-msgstr "Ystadegau"
-
-#: plugins/statistics/statisticsplugin.cpp:55
-#, fuzzy
-msgid "View &Statistics"
-msgstr "&Cadw Gosodiadau"
-
-#: plugins/smpppdcs/smpppdcsprefsimpl.cpp:97
-#: protocols/groupwise/ui/gwsearch.cpp:135
-msgid "Searching"
-msgstr "Yn chwilio"
-
-#: plugins/smpppdcs/smpppdcsprefsimpl.cpp:97
-msgid "Searching for a SMPPPD on the local network..."
-msgstr ""
-
-#: plugins/smpppdcs/smpppdcspreferences.cpp:57
-#, fuzzy
-msgid "connection status is managed by Kopete"
-msgstr "Cysylltiad wedi goramseru"
-
-#: plugins/smpppdcs/unittest/main.cpp:26 plugins/smpppdcs/unittest/main.cpp:31
-msgid "SMPPPDClientTests"
+"Whether or not you want to enable SSL encrypted communication with the server."
 msgstr ""
 
-#: plugins/autoreplace/autoreplacepreferences.cpp:46
-msgid "Text"
-msgstr "Testun"
-
-#: plugins/autoreplace/autoreplacepreferences.cpp:47
-msgid "Replacement"
-msgstr "Amnewidiad"
-
-#: plugins/autoreplace/autoreplaceconfig.cpp:67
+#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 288
+#: rc.cpp:4449 rc.cpp:4464
+#, no-c-format
 msgid ""
-"_: list_of_words_to_replace\n"
-"ur,your,r,are,u,you,theres,there is,arent,are not,dont,do not"
-msgstr ""
-
-#: plugins/contactnotes/contactnotesedit.cpp:29
-msgid "Contact Notes"
-msgstr "Nodiadau Cysylltiad"
-
-#: plugins/contactnotes/contactnotesedit.cpp:36
-msgid "Notes about %1:"
-msgstr ""
-
-#: plugins/contactnotes/contactnotesplugin.cpp:40
-msgid "&Notes"
-msgstr "&Nodiadau"
-
-#: protocols/irc/ui/irceditaccountwidget.cpp:177
-msgid "Remove Command"
-msgstr "Gwaredu Gorchymyn"
-
-#: protocols/irc/ui/irceditaccountwidget.cpp:185
-msgid "Remove CTCP Reply"
-msgstr ""
-
-#: protocols/irc/ui/irceditaccountwidget.cpp:275
-msgid "<qt>You must enter a nickname.</qt>"
-msgstr ""
-
-#: protocols/irc/ui/channellist.cpp:182
-msgid " members"
+"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 ""
 
-#: protocols/irc/ui/channellist.cpp:190 protocols/irc/ui/channellist.cpp:211
-msgid "Channel"
-msgstr "Sianel"
-
-#: protocols/irc/ui/channellist.cpp:191 protocols/irc/ui/channellist.cpp:212
-msgid "Users"
-msgstr "Defnyddwyr"
-
-#: protocols/irc/ircprotocol.cpp:152 protocols/irc/ui/channellist.cpp:193
-#: protocols/irc/ui/channellist.cpp:213
-msgid "Topic"
+#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 294
+#: rc.cpp:4452
+#, no-c-format
+msgid "If Available"
 msgstr ""
 
-#: protocols/irc/ui/channellist.cpp:200
-msgid "Search for:"
-msgstr "Chwilio am:"
+#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 299
+#: rc.cpp:4455
+#, no-c-format
+msgid "Required"
+msgstr "Angenrheidiol"
 
-#: protocols/irc/ui/channellist.cpp:201 protocols/irc/ui/channellist.cpp:205
-msgid ""
-"You may search for channels on the IRC server for a text string entered here."
+#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 304
+#: libkopete/tdeabcpersistence.cpp:342 rc.cpp:4458
+#, no-c-format
+msgid "Do Not Use"
 msgstr ""
 
-#: protocols/irc/ui/channellist.cpp:202 protocols/irc/ui/channellist.cpp:203
-msgid "Channels returned must have at least this many members."
+#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 333
+#: rc.cpp:4467
+#, no-c-format
+msgid "C&ache server information"
 msgstr ""
 
-#: protocols/irc/ui/channellist.cpp:204 protocols/irc/ui/channellist.cpp:206
+#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 339
+#: rc.cpp:4470
+#, no-c-format
 msgid ""
-"You may search for channels on the IRC server for a text string entered here.  "
-"For instance, you may type 'linux' to find channels that have something to do "
-"with linux."
-msgstr ""
-
-#: protocols/gadu/gadupubdir.cpp:103 protocols/gadu/gadupubdir.cpp:280
-#: protocols/irc/ui/channellist.cpp:207
-msgid "S&earch"
-msgstr "C&hwilio"
-
-#: protocols/irc/ui/channellist.cpp:208
-msgid "Perform a channel search."
+"Cache connection information for each server connected to in case the main "
+"load-balancing server fails."
 msgstr ""
 
-#: protocols/irc/ui/channellist.cpp:209
+#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 342
+#: rc.cpp:4473
+#, no-c-format
 msgid ""
-"Perform a channel search.  Please be patient, as this can be slow depending on "
-"the number of channels on the server."
-msgstr ""
-
-#: protocols/irc/ui/channellist.cpp:210
-msgid "Double click on a channel to select it."
-msgstr ""
-
-#: protocols/irc/ui/channellist.cpp:255
-msgid "You have been disconnected from the IRC server."
-msgstr ""
-
-#: protocols/irc/ui/channellist.cpp:256
-msgid "Disconnected"
-msgstr "Datgysylltwyd"
-
-#: protocols/irc/ui/channellist.cpp:303
-msgid "You must be connected to the IRC server to perform a channel listing."
-msgstr ""
-
-#: protocols/irc/ircusercontact.cpp:188
-msgid "%1 is away (%2)"
-msgstr ""
-
-#: protocols/irc/ircservercontact.cpp:95 protocols/irc/ircusercontact.cpp:219
-msgid "%1 @ %2"
-msgstr ""
-
-#: protocols/irc/ircusercontact.cpp:417
-msgid "True"
-msgstr "Gwir"
-
-#: protocols/irc/ircusercontact.cpp:435
-msgid "%1 is (%2@%3): %4<br/>"
-msgstr ""
-
-#: protocols/irc/ircusercontact.cpp:442
-msgid "%1 is authenticated with NICKSERV<br/>"
-msgstr ""
-
-#: protocols/irc/ircusercontact.cpp:445
-msgid "%1 is an IRC operator<br/>"
-msgstr ""
-
-#: protocols/irc/ircusercontact.cpp:448
-msgid "on channels %1<br/>"
-msgstr ""
-
-#: protocols/irc/ircusercontact.cpp:451
-msgid "on IRC via server %1 ( %2 )<br/>"
+"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 ""
 
-#: protocols/irc/ircusercontact.cpp:455
-msgid "idle: %2<br/>"
-msgstr ""
+#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 353
+#: rc.cpp:4476
+#, fuzzy, no-c-format
+msgid "Ignore people off your contact list"
+msgstr "&Dileu y Cyswllt"
 
-#: protocols/irc/ircusercontact.cpp:468
-msgid ""
-"%1 was (%2@%3): %4\n"
-msgstr ""
+#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 371
+#: rc.cpp:4479
+#, no-c-format
+msgid "U&ser Information"
+msgstr "G&wybodaeth Defnyddiwr"
 
-#: protocols/irc/ircusercontact.cpp:474
+#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 397
+#: rc.cpp:4482
+#, no-c-format
 msgid ""
-"Last Online: %1\n"
-msgstr ""
-
-#: protocols/irc/ircusercontact.cpp:538
-msgid "C&TCP"
-msgstr ""
-
-#: protocols/irc/ircusercontact.cpp:539
-msgid "&Version"
-msgstr "&Fersiwn"
-
-#: protocols/irc/ircusercontact.cpp:541
-msgid "&Ping"
-msgstr "&Ping"
-
-#: protocols/irc/ircusercontact.cpp:544
-msgid "&Modes"
-msgstr ""
-
-#: protocols/irc/ircusercontact.cpp:545
-msgid "&Op"
-msgstr "Gwei&thredu (Op)"
-
-#: protocols/irc/ircusercontact.cpp:547
-msgid "&Deop"
-msgstr "Dadweit&hredu (Deop)"
-
-#: protocols/irc/ircusercontact.cpp:549
-msgid "&Voice"
-msgstr "&Lleisio"
-
-#: protocols/irc/ircusercontact.cpp:551
-msgid "Devoice"
-msgstr "Datleisio"
-
-#: protocols/irc/ircusercontact.cpp:555
-msgid "&Kick"
-msgstr "&Lluchio"
-
-#: protocols/irc/ircusercontact.cpp:558
-msgid "&Ban"
-msgstr "G&wahardd"
-
-#: protocols/irc/ircusercontact.cpp:559
-msgid "Host (*!*@host.domain.net)"
-msgstr ""
-
-#: protocols/irc/ircusercontact.cpp:561
-msgid "Domain (*!*@*.domain.net)"
-msgstr ""
-
-#: protocols/irc/ircusercontact.cpp:563
-msgid "User@Host (*!*user@host.domain.net)"
-msgstr ""
-
-#: protocols/irc/ircusercontact.cpp:565
-msgid "User@Domain (*!*user@*.domain.net)"
+"<p align=\"center\">You must be connected to change your Personal "
+"Information.</p>"
 msgstr ""
 
-#: protocols/irc/ircchannelcontact.cpp:683
-#: protocols/irc/ircusercontact.cpp:569
-msgid "&Encoding"
-msgstr "A&mgodiad"
-
-#: protocols/irc/irccontact.cpp:189
-msgid "Quit: \"%1\" "
-msgstr ""
+#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 408
+#: rc.cpp:4485
+#, no-c-format
+msgid "User Information"
+msgstr "Gwybodaeth Defnyddiwr"
 
-#: protocols/irc/libkirc/kirctransfer.cpp:359
-msgid "Acknowledge size is greater than the expected file size"
-msgstr ""
+#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 451
+#: rc.cpp:4494
+#, fuzzy, no-c-format
+msgid "Your nick name:"
+msgstr "Llysenw"
 
-#: protocols/irc/libkirc/ksslsocket.cpp:367
-msgid ""
-"The IP address of the host %1 does not match the one the certificate was issued "
-"to."
+#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 467
+#: rc.cpp:4500
+#, no-c-format
+msgid "Year of birth:"
 msgstr ""
-"Nid yw cyfeiriad IP gwesteiwr %1 yn cydweddu â'r un a rowyd y tystysgrif iddo."
-
-#: protocols/irc/libkirc/ksslsocket.cpp:372
-#: protocols/irc/libkirc/ksslsocket.cpp:382
-#: protocols/irc/libkirc/ksslsocket.cpp:403
-msgid "Server Authentication"
-msgstr "Dilysiant Gweinydd"
-
-#: protocols/irc/libkirc/ksslsocket.cpp:373
-#: protocols/irc/libkirc/ksslsocket.cpp:383
-msgid "&Details"
-msgstr "&Manylion"
-
-#: protocols/irc/libkirc/ksslsocket.cpp:374
-#: protocols/irc/libkirc/ksslsocket.cpp:384
-msgid "Co&ntinue"
-msgstr "Par&hau"
-
-#: protocols/irc/libkirc/ksslsocket.cpp:378
-msgid "The server certificate failed the authenticity test (%1)."
-msgstr "Methodd y tystysgrif gweinydd y prawf dilysiant (%1)."
 
-#: protocols/irc/libkirc/ksslsocket.cpp:400
+#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 560
+#: rc.cpp:4512
+#, no-c-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?"
-
-#: protocols/irc/libkirc/ksslsocket.cpp:404
-msgid "&Forever"
-msgstr "&Am Byth"
-
-#: protocols/irc/libkirc/ksslsocket.cpp:405
-msgid "&Current Sessions Only"
-msgstr "&Sesiynau Cyfredol yn Unig"
-
-#: protocols/irc/ircaddcontactpage.cpp:74
-msgid "<qt>You need to specify a channel to join, or query to open.</qt>"
-msgstr ""
-
-#: protocols/irc/ircaddcontactpage.cpp:74
-msgid "You Must Specify a Channel"
-msgstr ""
-
-#: protocols/irc/ircaccount.cpp:82
-msgid "Kopete IRC Plugin %1 [http://kopete.kde.org]"
-msgstr ""
-
-#: protocols/irc/ircaccount.cpp:112
-msgid "Set Away"
-msgstr ""
-
-#: protocols/irc/ircaccount.cpp:176
-#, c-format
-msgid "Temporary Network - %1"
-msgstr ""
-
-#: protocols/irc/ircaccount.cpp:177
-msgid "Network imported from previous version of Kopete, or an IRC URI"
-msgstr ""
-
-#: protocols/irc/ircaccount.cpp:210
-msgid "Join Channel..."
-msgstr "Ymuno â'r Sianel..."
-
-#: protocols/irc/ircaccount.cpp:212
-msgid "Search Channels..."
+"Values below are going to be used in search, but will not appear in results."
 msgstr ""
 
-#: protocols/irc/ircaccount.cpp:219
-msgid "Plugin Unloaded"
-msgstr ""
+#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 601
+#: rc.cpp:4515
+#, no-c-format
+msgid "Maiden name:"
+msgstr "Enw Morwynol:"
 
-#: protocols/irc/ircaccount.cpp:228 protocols/irc/ircaccount.cpp:246
-#: protocols/irc/ircaccount.cpp:698 protocols/irc/ircaccount.cpp:785
-#: protocols/irc/ircchannelcontact.cpp:442
-#: protocols/irc/ircchannelcontact.cpp:568
-#: protocols/irc/ircchannelcontact.cpp:575
-#: protocols/irc/ircchannelcontact.cpp:583
-#: protocols/irc/ircchannelcontact.cpp:589
-msgid "IRC Plugin"
+#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 609
+#: rc.cpp:4518
+#, no-c-format
+msgid "City of origin:"
 msgstr ""
 
-#: protocols/irc/ircaccount.cpp:229
-msgid "The nickname %1 is already in use. Please enter an alternate nickname:"
-msgstr ""
+#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 651
+#: rc.cpp:4521
+#, no-c-format
+msgid "&File Transfer"
+msgstr "Trosglwyddo &ffeiliau"
 
-#: protocols/irc/ircaccount.cpp:246
-msgid "The nickname %1 is already in use"
+#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 665
+#: rc.cpp:4524
+#, no-c-format
+msgid "Global DCC Options"
 msgstr ""
 
-#: protocols/irc/ircaccount.cpp:308
+#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 676
+#: rc.cpp:4527
+#, no-c-format
 msgid ""
-"<qt>The network associated with this account, <b>%1</b>"
-", no longer exists. Please ensure that the account has a valid network. The "
-"account will not be enabled until you do so.</qt>"
+"<qt><p align=\"center\"><font color=\"#ff0000\">These options affect <b>all</b> "
+"Gadu-Gadu accounts.</font></p></qt>"
 msgstr ""
 
-#: protocols/irc/ircaccount.cpp:310
-#, c-format
-msgid "Problem Loading %1"
+#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 684
+#: rc.cpp:4530
+#, no-c-format
+msgid "&Override default configuration"
 msgstr ""
 
-#: protocols/irc/ircaccount.cpp:429
-msgid "Show Server Window"
-msgstr ""
+#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 714
+#: rc.cpp:4533
+#, no-c-format
+msgid "Local &IP address /"
+msgstr "Cyfeiriadau Lleol /"
 
-#: protocols/irc/ircaccount.cpp:433
-msgid "Show Security Information"
-msgstr ""
+#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 728
+#: rc.cpp:4536
+#, no-c-format
+msgid "po&rt:"
+msgstr "po&rth:"
 
-#: protocols/irc/ircaccount.cpp:458
-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>"
+#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 752
+#: rc.cpp:4539
+#, no-c-format
+msgid "0.0.0.0"
 msgstr ""
 
-#: protocols/irc/ircaccount.cpp:459
-msgid "Network is Empty"
+#. i18n: file ./protocols/gadu/ui/gaduadd.ui line 55
+#: rc.cpp:4545 rc.cpp:4551
+#, no-c-format
+msgid "The user ID of the Gadu-Gadu account you would like to add."
 msgstr ""
 
-#: protocols/irc/ircaccount.cpp:465
+#. i18n: file ./protocols/gadu/ui/gaduadd.ui line 58
+#: rc.cpp:4548 rc.cpp:4554
+#, no-c-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/irc/ircaccount.cpp:466
-#, fuzzy
-msgid "Network is Unavailable"
-msgstr "A&r gael"
-
-#: protocols/irc/ircaccount.cpp:493
-msgid "Connecting to %1..."
-msgstr "Wrthi'n cysylltu i %1... "
-
-#: protocols/irc/ircaccount.cpp:495
-#, fuzzy
-msgid "Using SSL"
-msgstr "Defnyddier SS&L"
-
-#: protocols/irc/ircaccount.cpp:590
-msgid "The IRC server is currently too busy to respond to this request."
-msgstr ""
-
-#: protocols/irc/ircaccount.cpp:591
-msgid "Server is Busy"
+"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 ""
 
-#: protocols/irc/ircaccount.cpp:600
-#, c-format
-msgid "Channel List for %1"
+#. i18n: file ./protocols/gadu/ui/gaduadd.ui line 79
+#: rc.cpp:4557
+#, no-c-format
+msgid "<i>(for example: 1234567)</i>"
 msgstr ""
 
-#: protocols/irc/ircaccount.cpp:698
-msgid "\"You are not allowed to add yourself to your contact list."
+#. i18n: file ./protocols/gadu/ui/gaduadd.ui line 109
+#: rc.cpp:4560
+#, no-c-format
+msgid "&Forename:"
 msgstr ""
 
-#: protocols/irc/ircaccount.cpp:751
-msgid "Please enter name of the channel you want to join:"
+#. i18n: file ./protocols/gadu/ui/gaduadd.ui line 115
+#: rc.cpp:4563 rc.cpp:4605
+#, no-c-format
+msgid "The forename of the contact you wish to add."
 msgstr ""
 
-#: protocols/irc/ircaccount.cpp:784 protocols/irc/ircprotocol.cpp:538
-#: protocols/irc/ircprotocol.cpp:558
+#. i18n: file ./protocols/gadu/ui/gaduadd.ui line 118
+#: rc.cpp:4566 rc.cpp:4608
+#, no-c-format
 msgid ""
-"\"%1\" is an invalid channel. Channels must start with '#', '!', '+', or '&'."
-msgstr ""
-
-#: protocols/irc/ircaccount.cpp:792
-msgid "CTCP %1 REPLY: %2"
+"The forename (first name) of the contact you wish to add.  Optionally this may "
+"include a middle name."
 msgstr ""
 
-#: protocols/irc/ircaccount.cpp:798
-msgid "The channel \"%1\" does not exist"
-msgstr ""
+#. i18n: file ./protocols/gadu/ui/gaduadd.ui line 129
+#: rc.cpp:4569
+#, no-c-format
+msgid "&Surname:"
+msgstr "&Cyfenw :"
 
-#: protocols/irc/ircaccount.cpp:800
-msgid "The nickname \"%1\" does not exist"
+#. i18n: file ./protocols/gadu/ui/gaduadd.ui line 135
+#: rc.cpp:4572 rc.cpp:4611
+#, no-c-format
+msgid "The surname of the contact you wish to add."
 msgstr ""
 
-#: protocols/irc/ircservercontact.cpp:106
-msgid "KIRC Error - Parse error: "
+#. i18n: file ./protocols/gadu/ui/gaduadd.ui line 138
+#: rc.cpp:4575 rc.cpp:4614
+#, no-c-format
+msgid "The surname (last name) of the contact you wish to add."
 msgstr ""
 
-#: protocols/irc/ircservercontact.cpp:109
-msgid "KIRC Error - Unknown command: "
-msgstr ""
+#. i18n: file ./protocols/gadu/ui/gaduadd.ui line 154
+#: rc.cpp:4578 rc.cpp:4755
+#, no-c-format
+msgid "N&ickname:"
+msgstr "F&fugenw:"
 
-#: protocols/irc/ircservercontact.cpp:112
-msgid "KIRC Error - Unknown numeric reply: "
+#. i18n: file ./protocols/gadu/ui/gaduadd.ui line 160
+#: rc.cpp:4581 rc.cpp:4584 rc.cpp:4617 rc.cpp:4620
+#, no-c-format
+msgid "A nickname for the contact you wish to add."
 msgstr ""
 
-#: protocols/irc/ircservercontact.cpp:115
-msgid "KIRC Error - Invalid number of arguments: "
-msgstr ""
+#. i18n: file ./protocols/gadu/ui/gaduadd.ui line 182
+#: rc.cpp:4587
+#, no-c-format
+msgid "&Email address:"
+msgstr "&Cyfeiriad ebost:"
 
-#: protocols/irc/ircservercontact.cpp:118
-msgid "KIRC Error - Method failed: "
+#. i18n: file ./protocols/gadu/ui/gaduadd.ui line 188
+#: rc.cpp:4590 rc.cpp:4593 rc.cpp:4599 rc.cpp:4602 rc.cpp:4623 rc.cpp:4626
+#: rc.cpp:4629 rc.cpp:4632
+#, no-c-format
+msgid "E-Mail address for this contact."
 msgstr ""
 
-#: protocols/irc/ircservercontact.cpp:121
-msgid "KIRC Error - Unknown error: "
+#. i18n: file ./protocols/gadu/ui/gaduadd.ui line 311
+#: rc.cpp:4635
+#, no-c-format
+msgid "Offline to contact when you set \"&Just for friends\""
 msgstr ""
 
-#: protocols/irc/ircservercontact.cpp:131
+#. i18n: file ./protocols/gadu/ui/gaduadd.ui line 314
+#: rc.cpp:4638 rc.cpp:4641
+#, no-c-format
 msgid ""
-"You can not talk to the server, you can only issue commands here. Type /help "
-"for supported commands."
-msgstr ""
-
-#: protocols/irc/ircservercontact.cpp:150
-#: protocols/irc/ircservercontact.cpp:164
-msgid "NOTICE from %1: %2"
-msgstr ""
-
-#: protocols/irc/ircservercontact.cpp:158
-msgid "NOTICE from %1 (%2): %3"
-msgstr ""
-
-#: protocols/irc/ircchannelcontact.cpp:62
-msgid "Only Operators Can Change &Topic"
-msgstr ""
-
-#: protocols/irc/ircchannelcontact.cpp:63
-msgid "&No Outside Messages"
-msgstr ""
-
-#: protocols/irc/ircchannelcontact.cpp:64
-msgid "&Secret"
-msgstr "&Cyfrinachol"
-
-#: protocols/irc/ircchannelcontact.cpp:65
-msgid "&Moderated"
-msgstr ""
-
-#: protocols/irc/ircchannelcontact.cpp:66
-msgid "&Invite Only"
-msgstr ""
-
-#: protocols/irc/ircchannelcontact.cpp:275
-msgid "Topic for %1 is set empty."
-msgstr ""
-
-#: protocols/irc/ircchannelcontact.cpp:280
-msgid "Topic for %1 is %2"
-msgstr ""
-
-#: protocols/irc/ircchannelcontact.cpp:365
-#, c-format
-msgid "You have joined channel %1"
-msgstr ""
-
-#: protocols/irc/ircchannelcontact.cpp:381
-msgid "User <b>%1</b> joined channel %2"
-msgstr ""
-
-#: protocols/irc/ircchannelcontact.cpp:416
-msgid "%1 was kicked by %2. Reason: %3"
-msgstr ""
-
-#: protocols/irc/ircchannelcontact.cpp:418
-msgid "%1 was kicked by %2."
-msgstr ""
-
-#: protocols/irc/ircchannelcontact.cpp:437
-msgid "You were kicked from %1 by %2. Reason: %3"
-msgstr ""
-
-#: protocols/irc/ircchannelcontact.cpp:439
-msgid "You were kicked from %1 by %2."
-msgstr ""
-
-#: protocols/irc/ircchannelcontact.cpp:459
-msgid "New Topic"
-msgstr ""
-
-#: protocols/irc/ircchannelcontact.cpp:459
-msgid "Enter the new topic:"
-msgstr ""
-
-#: protocols/irc/ircchannelcontact.cpp:471
-msgid "You must be a channel operator on %1 to do that."
-msgstr ""
-
-#: protocols/irc/ircchannelcontact.cpp:486
-msgid "%1 has changed the topic to: %2"
+"Check if you want to exclude this contact from the \"Just for friends\" status "
+"mode."
 msgstr ""
 
-#: protocols/irc/ircchannelcontact.cpp:497
-msgid "Topic set by %1 at %2"
-msgstr ""
+#. i18n: file ./protocols/gadu/ui/gaduadd.ui line 323
+#: rc.cpp:4644
+#, no-c-format
+msgid "Group"
+msgstr "Gr?p"
 
-#: protocols/irc/ircchannelcontact.cpp:506
-msgid "%1 sets mode %2 on %3"
+#. i18n: file ./protocols/irc/ui/ircadd.ui line 59
+#: rc.cpp:4653
+#, no-c-format
+msgid "N&ickname/channel to add:"
 msgstr ""
 
-#: protocols/irc/ircchannelcontact.cpp:567
-msgid "<qt>You can not join %1 because you have been banned.</qt>"
+#. i18n: file ./protocols/irc/ui/ircadd.ui line 65
+#: rc.cpp:4656 rc.cpp:4662
+#, no-c-format
+msgid "The name of the IRC contact or channel you would like to add."
 msgstr ""
 
-#: protocols/irc/ircchannelcontact.cpp:575
+#. i18n: file ./protocols/irc/ui/ircadd.ui line 68
+#: rc.cpp:4659
+#, no-c-format
 msgid ""
-"<qt>You can not join %1 because it is set to invite only, and no one has "
-"invited you.</qt>"
-msgstr ""
-
-#: protocols/irc/ircchannelcontact.cpp:582
-msgid "<qt>You can not join %1 because it has reached its user limit.</qt>"
-msgstr ""
-
-#: protocols/irc/ircchannelcontact.cpp:590
-msgid "Please enter key for channel %1: "
-msgstr ""
-
-#: protocols/irc/ircchannelcontact.cpp:662
-msgid "&Part"
-msgstr ""
-
-#: protocols/irc/ircchannelcontact.cpp:663
-msgid "Change &Topic..."
-msgstr ""
-
-#: protocols/irc/ircchannelcontact.cpp:664
-msgid "Channel Modes"
-msgstr "Moddau Sianel"
-
-#: protocols/irc/ircchannelcontact.cpp:668
-msgid "Visit &Homepage"
-msgstr ""
-
-#: protocols/irc/ircprotocol.cpp:121 protocols/irc/ircprotocol.cpp:127
-msgid "Op"
-msgstr "Gweithredu (Op)"
-
-#: protocols/irc/ircprotocol.cpp:133
-msgid "Voice"
-msgstr "Llais"
-
-#: protocols/irc/ircprotocol.cpp:154
-msgid "Home Page"
-msgstr ""
-
-#: protocols/irc/ircprotocol.cpp:156
-msgid "IRC User"
-msgstr ""
-
-#: protocols/irc/ircprotocol.cpp:157
-msgid "IRC Server"
-msgstr ""
-
-#: protocols/irc/ircprotocol.cpp:158
-msgid "IRC Channels"
-msgstr ""
-
-#: protocols/irc/ircprotocol.cpp:159
-msgid "IRC Hops"
-msgstr ""
-
-#: protocols/irc/ircprotocol.cpp:161
-#, fuzzy
-msgid "User Is Authenticated"
-msgstr "Dilysiant Gweinydd"
-
-#: protocols/irc/ircprotocol.cpp:173
-msgid "USAGE: /raw <text> - Sends the text in raw form to the server."
-msgstr ""
-
-#: protocols/irc/ircprotocol.cpp:177
-msgid "USAGE: /quote <text> - Sends the text in quoted form to the server."
-msgstr ""
-
-#: protocols/irc/ircprotocol.cpp:181
-msgid "USAGE: /ctcp <nick> <message> - Send the CTCP message to nick<action>."
-msgstr ""
-
-#: protocols/irc/ircprotocol.cpp:185
-msgid "USAGE: /ping <nickname> - Alias for /CTCP <nickname> PING."
+"The name of the IRC contact or channel you would like to add.  You may type "
+"simply the text of a person's nickname, or you may type a channel name, "
+"preceded by a pound sign ('#')."
 msgstr ""
 
-#: protocols/irc/ircprotocol.cpp:189
+#. i18n: file ./protocols/irc/ui/ircadd.ui line 79
+#: rc.cpp:4665
+#, no-c-format
 msgid ""
-"USAGE: /motd [<server>] - Shows the message of the day for the current or the "
-"given server."
+"The name of the IRC contact or channel you would like to add.  You may type "
+"simply the text of a person's nickname, or you may type a channel name, "
+"preceded by a pound sign ('#')"
 msgstr ""
 
-#: protocols/irc/ircprotocol.cpp:193
-msgid "USAGE: /list - List the public channels on the server."
+#. i18n: file ./protocols/irc/ui/ircadd.ui line 89
+#: rc.cpp:4668
+#, no-c-format
+msgid "<i>(for example: joe_bob or #somechannel)</i>"
 msgstr ""
 
-#: protocols/irc/ircprotocol.cpp:197
-msgid "USAGE: /join <#channel 1> [<password>] - Joins the specified channel."
+#. i18n: file ./protocols/irc/ui/ircadd.ui line 119
+#: rc.cpp:4671
+#, no-c-format
+msgid "&Search Channels"
 msgstr ""
 
-#: protocols/irc/ircprotocol.cpp:201
-msgid ""
-"USAGE: /topic [<topic>] - Sets and/or displays the topic for the active "
-"channel."
-msgstr ""
+#. i18n: file ./protocols/irc/ui/networkconfig.ui line 16
+#: rc.cpp:4674
+#, no-c-format
+msgid "Network Configuration"
+msgstr "Ffurfweddiad y Rhwydwaith"
 
-#: protocols/irc/ircprotocol.cpp:206
-msgid "USAGE: /whois <nickname> - Display whois info on this user."
-msgstr ""
+#. i18n: file ./protocols/irc/ui/networkconfig.ui line 40
+#: rc.cpp:4677
+#, no-c-format
+msgid "&Description:"
+msgstr "&Disgrifiad:"
 
-#: protocols/irc/ircprotocol.cpp:210
-msgid "USAGE: /whowas <nickname> - Display whowas info on this user."
+#. i18n: file ./protocols/irc/ui/networkconfig.ui line 62
+#: rc.cpp:4680
+#, no-c-format
+msgid "Host Con&figuration"
 msgstr ""
 
-#: protocols/irc/ircprotocol.cpp:214
-msgid "USAGE: /who <nickname|channel> - Display who info on this user/channel."
+#. i18n: file ./protocols/irc/ui/networkconfig.ui line 81
+#: rc.cpp:4683
+#, no-c-format
+msgid "The IRC servers associated with this network"
 msgstr ""
 
-#: protocols/irc/ircprotocol.cpp:218
+#. i18n: file ./protocols/irc/ui/networkconfig.ui line 84
+#: rc.cpp:4686
+#, no-c-format
 msgid ""
-"USAGE: /query <nickname> [<message>] - Open a private chat with this user."
-msgstr ""
-
-#: protocols/irc/ircprotocol.cpp:222
-msgid "USAGE: /mode <channel> <modes> - Set modes on the given channel."
-msgstr ""
-
-#: protocols/irc/ircprotocol.cpp:226
-msgid "USAGE: /nick <nickname> - Change your nickname to the given one."
+"The IRC servers associated with this network. Use the up and down buttons to "
+"alter the order in which connections are attempted."
 msgstr ""
 
-#: protocols/irc/ircprotocol.cpp:230
-msgid "USAGE: /me <action> - Do something."
+#. i18n: file ./protocols/irc/ui/networkconfig.ui line 95
+#: rc.cpp:4689
+#, no-c-format
+msgid "Most IRC servers do not require a password"
 msgstr ""
 
-#: protocols/irc/ircprotocol.cpp:234
-msgid "USAGE: /ame <action> - Do something in every open chat."
-msgstr ""
+#. i18n: file ./protocols/irc/ui/networkconfig.ui line 139
+#: rc.cpp:4698
+#, no-c-format
+msgid "&Host:"
+msgstr "&Gwesteiwr:"
 
-#: protocols/irc/ircprotocol.cpp:238
-msgid ""
-"USAGE: /kick <nickname> [<reason>] - Kick someone from the channel (requires "
-"operator status)."
-msgstr ""
+#. i18n: file ./protocols/irc/ui/networkconfig.ui line 161
+#: rc.cpp:4701
+#, no-c-format
+msgid "Use SS&L"
+msgstr "Defnyddier SS&L"
 
-#: protocols/irc/ircprotocol.cpp:243
-msgid ""
-"USAGE: /ban <mask> - Add someone to this channel's ban list. (requires operator "
-"status)."
+#. i18n: file ./protocols/irc/ui/networkconfig.ui line 164
+#: rc.cpp:4704
+#, no-c-format
+msgid "Check this to enable SSL for this connection"
 msgstr ""
 
-#: protocols/irc/ircprotocol.cpp:248
-msgid ""
-"USAGE: /bannick <nickname> - Add someone to this channel's ban list. Uses the "
-"hostmask nickname!*@* (requires operator status)."
-msgstr ""
+#. i18n: file ./protocols/irc/ui/networkconfig.ui line 224
+#: rc.cpp:4713
+#, no-c-format
+msgid "Down"
+msgstr "I Lawr"
 
-#: protocols/irc/ircprotocol.cpp:252
-msgid ""
-"USAGE: /op <nickname 1> [<nickname 2> <...>] - Give channel operator status to "
-"someone (requires operator status)."
+#. i18n: file ./protocols/irc/ui/networkconfig.ui line 227
+#: rc.cpp:4716
+#, no-c-format
+msgid "Move this server down"
 msgstr ""
 
-#: protocols/irc/ircprotocol.cpp:257
-msgid ""
-"USAGE: /deop <nickname> [<nickname 2> <...>]- Remove channel operator status "
-"from someone (requires operator status)."
+#. i18n: file ./protocols/irc/ui/networkconfig.ui line 230
+#: rc.cpp:4719
+#, no-c-format
+msgid "Move this server down in connection attempt priority"
 msgstr ""
 
-#: protocols/irc/ircprotocol.cpp:261
-msgid ""
-"USAGE: /voice <nickname> [<nickname 2> <...>]- Give channel voice status to "
-"someone (requires operator status)."
-msgstr ""
+#. i18n: file ./protocols/irc/ui/networkconfig.ui line 258
+#: rc.cpp:4722
+#, no-c-format
+msgid "Up"
+msgstr "I fyny"
 
-#: protocols/irc/ircprotocol.cpp:266
-msgid ""
-"USAGE: /devoice <nickname> [<nickname 2> <...>]- Remove channel voice status "
-"from someone (requires operator status)."
+#. i18n: file ./protocols/irc/ui/networkconfig.ui line 261
+#: rc.cpp:4725
+#, no-c-format
+msgid "Move this server up"
 msgstr ""
 
-#: protocols/irc/ircprotocol.cpp:270
-msgid ""
-"USAGE: /quit [<reason>] - Disconnect from IRC, optionally leaving a message."
+#. i18n: file ./protocols/irc/ui/networkconfig.ui line 264
+#: rc.cpp:4728
+#, no-c-format
+msgid "Move this server up in connection attempt priority"
 msgstr ""
 
-#: protocols/irc/ircprotocol.cpp:274
-msgid ""
-"USAGE: /part [<reason>] - Part from a channel, optionally leaving a message."
-msgstr ""
+#. i18n: file ./protocols/irc/ui/networkconfig.ui line 290
+#: rc.cpp:4737
+#, no-c-format
+msgid "Ne&w"
+msgstr "Ne&wydd"
 
-#: protocols/irc/ircprotocol.cpp:278
-msgid ""
-"USAGE: /invite <nickname> [<channel>] - Invite a user to join a channel."
-msgstr ""
+#. i18n: file ./protocols/irc/ui/networkconfig.ui line 328
+#: rc.cpp:4740
+#, no-c-format
+msgid "Rena&me..."
+msgstr "Ail-&enwi..."
 
-#: protocols/irc/ircprotocol.cpp:282
-msgid "USAGE: /j <#channel 1> [<password>] - Alias for JOIN."
-msgstr ""
+#. i18n: file ./protocols/irc/ui/networkconfig.ui line 336
+#: rc.cpp:4743
+#, no-c-format
+msgid "Remo&ve"
+msgstr "&Gwaredu"
 
-#: protocols/irc/ircprotocol.cpp:287
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 92
+#: rc.cpp:4749
+#, no-c-format
 msgid ""
-"USAGE: /msg <nickname> [<message>] - Alias for QUERY <nickname> <message>."
-msgstr ""
-
-#: protocols/irc/ircprotocol.cpp:457 protocols/irc/ircprotocol.cpp:472
-msgid "You must enter some text to send to the server."
-msgstr ""
-
-#: protocols/irc/ircprotocol.cpp:521 protocols/irc/ircprotocol.cpp:721
-msgid "You must be in a channel to use this command."
+"<p><b>Note:</b> Most IRC servers do not require a password, and only a nickname "
+"is required to connect</p>"
 msgstr ""
 
-#: protocols/irc/ircprotocol.cpp:578 protocols/irc/ircprotocol.cpp:682
-#: protocols/irc/ircprotocol.cpp:699 protocols/irc/ircprotocol.cpp:764
-msgid "You must be a channel operator to perform this operation."
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 126
+#: rc.cpp:4758 rc.cpp:4767
+#, no-c-format
+msgid "This is the name that everyone will see everytime you say something"
 msgstr ""
 
-#: protocols/irc/ircprotocol.cpp:602
-msgid ""
-"\"%1\" is an invalid nickname. Nicknames must not start with '#','!','+', or "
-"'&'."
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 134
+#: rc.cpp:4761
+#, no-c-format
+msgid "Alternate ni&ckname:"
 msgstr ""
 
-#: protocols/irc/ircprotocol.cpp:919
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 140
+#: rc.cpp:4764 rc.cpp:4773 rc.cpp:4776
+#, no-c-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>"
-msgstr ""
-
-#: protocols/irc/ircprotocol.cpp:921
-msgid "Deleting Network"
-msgstr ""
-
-#: protocols/irc/ircprotocol.cpp:922
-msgid "&Delete Network"
-msgstr ""
-
-#: protocols/irc/ircprotocol.cpp:946
-msgid "<qt>Are you sure you want to delete the host <b>%1</b>?</qt>"
-msgstr ""
-
-#: protocols/irc/ircprotocol.cpp:947
-msgid "Deleting Host"
-msgstr ""
-
-#: protocols/irc/ircprotocol.cpp:948
-msgid "&Delete Host"
-msgstr ""
-
-#: protocols/irc/ircprotocol.cpp:1001
-msgid "New Host"
-msgstr ""
-
-#: protocols/irc/ircprotocol.cpp:1002
-msgid "Enter the hostname of the new server:"
-msgstr ""
-
-#: protocols/irc/ircprotocol.cpp:1009
-msgid "A host already exists with that name"
-msgstr ""
-
-#: protocols/irc/ircprotocol.cpp:1039
-msgid "Rename Network"
-msgstr ""
-
-#: protocols/irc/ircprotocol.cpp:1040
-msgid "Enter the new name for this network:"
-msgstr ""
-
-#: protocols/irc/ircprotocol.cpp:1050
-msgid "A network already exists with that name"
+"When the nickname is already in use when connecting, this name will be used "
+"instead"
 msgstr ""
 
-#: protocols/msn/ui/msneditaccountwidget.cpp:237
-#: protocols/msn/ui/msneditaccountwidget.cpp:355
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 159
+#: rc.cpp:4770
+#, no-c-format
 msgid ""
-"<qt>An error occurred when trying to change the display picture."
-"<br>Make sure that you have selected a correct image file</qt>"
-msgstr ""
-
-#: protocols/msn/msnaccount.cpp:346 protocols/msn/msnaddcontactpage.cpp:76
-#: protocols/msn/msnchatsession.cpp:365
-#: protocols/msn/ui/msneditaccountwidget.cpp:278
-msgid "<qt>You must enter a valid email address.</qt>"
-msgstr ""
-
-#: protocols/msn/ui/msneditaccountwidget.cpp:322
-msgid "Here you can see a list of contacts who added you to their contact list"
-msgstr ""
-
-#: protocols/msn/ui/msneditaccountwidget.cpp:323
-msgid "Reverse List - MSN Plugin"
+"The alias you would like to use on IRC.  You may change this once online with "
+"the /nick command."
 msgstr ""
 
-#: protocols/msn/msnchatsession.cpp:105
-#: protocols/msn/ui/msneditaccountwidget.cpp:330
-msgid "MSN Display Picture"
-msgstr ""
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 183
+#: rc.cpp:4779
+#, no-c-format
+msgid "&Real name:"
+msgstr "&Enw go iawn:"
 
-#: protocols/msn/ui/msneditaccountwidget.cpp:336
-msgid "Downloading of display image failed"
-msgstr ""
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 194
+#: rc.cpp:4782
+#, no-c-format
+msgid "&Username:"
+msgstr "&Enw Defnyddiwr:"
 
-#: protocols/msn/webcam.cpp:88
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 200
+#: rc.cpp:4785 rc.cpp:4788 rc.cpp:4791 rc.cpp:4797
+#, no-c-format
 msgid ""
-"<qt>The contact %1 wants to see <b>your</b> webcam, do you want them to see "
-"it?</qt>"
-msgstr ""
-
-#: protocols/msn/webcam.cpp:89
-msgid "The contact %1 wants to show you his/her webcam, do you want to see it?"
-msgstr ""
-
-#: protocols/msn/webcam.cpp:91
-msgid "Webcam invitation - Kopete MSN Plugin"
-msgstr ""
-
-#: protocols/msn/webcam.cpp:91
-msgid "Decline"
-msgstr "Gwrthod"
-
-#: protocols/msn/msnfiletransfersocket.cpp:44
-msgid "File Transfer - MSN Plugin"
-msgstr ""
-
-#: protocols/msn/msnfiletransfersocket.cpp:158
-#: protocols/msn/msnfiletransfersocket.cpp:213
-#: protocols/msn/msnfiletransfersocket.cpp:450
-msgid "An unknown error occurred"
-msgstr ""
-
-#: protocols/msn/msnfiletransfersocket.cpp:225
-msgid "Connection timed out"
-msgstr "Cysylltiad wedi goramseru"
-
-#: protocols/msn/msnfiletransfersocket.cpp:413
-msgid "The remote user aborted"
-msgstr ""
-
-#: protocols/msn/incomingtransfer.cpp:112
-msgid "Cannot open file for writing"
-msgstr "Methu agor ffeil ar gyfer ysgrifennu"
-
-#: protocols/msn/incomingtransfer.cpp:297
-#: protocols/msn/outgoingtransfer.cpp:211
-#: protocols/msn/outgoingtransfer.cpp:318
-#, fuzzy
-msgid "File transfer canceled."
-msgstr "Hidlenni"
-
-#: protocols/msn/msnprotocol.cpp:42
-msgid "MSN Messenger"
-msgstr "Negesydd MSN"
-
-#: protocols/gadu/gaduprotocol.cpp:63 protocols/gadu/gaduprotocol.cpp:65
-#: protocols/groupwise/gwprotocol.cpp:52
-#: protocols/meanwhile/meanwhileprotocol.cpp:51
-#: protocols/msn/msnprotocol.cpp:53 protocols/yahoo/yahooprotocol.cpp:45
-msgid "Busy"
-msgstr "Prysur"
-
-#: protocols/msn/msnprotocol.cpp:54
-msgid "Be Right Back"
-msgstr ""
-
-#: protocols/msn/msnprotocol.cpp:54
-msgid "Be &Right Back"
-msgstr ""
-
-#: protocols/msn/msnprotocol.cpp:55
-msgid "Away From Computer"
-msgstr ""
-
-#: protocols/msn/msnprotocol.cpp:56
-msgid "On the Phone"
-msgstr ""
-
-#: protocols/msn/msnprotocol.cpp:56
-#, fuzzy
-msgid "On The &Phone"
-msgstr "Ffôn:"
-
-#: protocols/msn/msnprotocol.cpp:57
-msgid "Out to Lunch"
-msgstr ""
-
-#: protocols/msn/msnprotocol.cpp:57
-msgid "Out To &Lunch"
+"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 ""
 
-#: protocols/msn/msnprotocol.cpp:58
-msgid "&Offline"
-msgstr "&All-lein"
-
-#: protocols/groupwise/gwprotocol.cpp:56
-#: protocols/meanwhile/meanwhileprotocol.cpp:56
-#: protocols/msn/msnprotocol.cpp:60 protocols/yahoo/yahooprotocol.cpp:55
-msgid "Idle"
-msgstr "Segur"
-
-#: protocols/msn/msnprotocol.cpp:60
-msgid "&Idle"
-msgstr "&Segur"
-
-#: protocols/msn/msnprotocol.cpp:67
-#, fuzzy
-msgid "Remote Client"
-msgstr "Gwaredu Cyswllt"
-
-#: protocols/msn/msnprotocol.cpp:68
-#, fuzzy
-msgid "Contact GUID"
-msgstr "Cyswllt"
-
-#: protocols/msn/msnswitchboardsocket.cpp:122
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 241
+#: rc.cpp:4794
+#, no-c-format
 msgid ""
-"Invalid user:\n"
-"this MSN user does not exist; please check the MSN ID."
-msgstr ""
-
-#: protocols/msn/msnswitchboardsocket.cpp:126
-msgid "user never joined"
+"The username you would prefer to use on IRC, if your system does not have "
+"identd support."
 msgstr ""
 
-#: protocols/msn/msnswitchboardsocket.cpp:131
-msgid "The user %1 is already in this chat."
-msgstr ""
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 323
+#: rc.cpp:4803
+#, no-c-format
+msgid "&Edit..."
+msgstr "&Golygu..."
 
-#: protocols/msn/msnswitchboardsocket.cpp:139
-msgid ""
-"The user %1 is online but has blocked you:\n"
-"you can not talk to this user."
-msgstr ""
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 350
+#: rc.cpp:4806
+#, no-c-format
+msgid "&Network:"
+msgstr "&Rhwydwaith :"
 
-#: protocols/msn/msnswitchboardsocket.cpp:142
-#: protocols/msn/msnswitchboardsocket.cpp:159
-msgid "user blocked you"
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 382
+#: rc.cpp:4812
+#, no-c-format
+msgid "&Prefer SSL-based connections"
 msgstr ""
 
-#: protocols/msn/msnswitchboardsocket.cpp:148
-msgid ""
-"The user %1 is currently not signed in.\n"
-"Messages will not be delivered."
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 409
+#: rc.cpp:4821
+#, no-c-format
+msgid "Default &charset:"
 msgstr ""
 
-#: protocols/msn/msnswitchboardsocket.cpp:151
-msgid "user disconnected"
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 446
+#: rc.cpp:4824
+#, no-c-format
+msgid "Default Messages"
 msgstr ""
 
-#: protocols/msn/msnswitchboardsocket.cpp:156
-msgid ""
-"You are trying to invite too many contacts to this chat at the same time"
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 457
+#: rc.cpp:4827
+#, no-c-format
+msgid "&Part message:"
 msgstr ""
 
-#: protocols/msn/msnswitchboardsocket.cpp:164
-msgid "Kopete MSN plugin has trouble authenticating with switchboard server."
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 468
+#: rc.cpp:4830
+#, no-c-format
+msgid "&Quit message:"
 msgstr ""
 
-#: protocols/msn/msnswitchboardsocket.cpp:218
-msgid "timeout"
-msgstr "goramser"
-
-#: protocols/msn/msnswitchboardsocket.cpp:771
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 479
+#: rc.cpp:4833 rc.cpp:4836
+#, no-c-format
 msgid ""
-"The message you are trying to send is too long; it will be split into %1 "
-"messages."
-msgstr ""
-
-#: protocols/msn/msnswitchboardsocket.cpp:772
-msgid "Message too big - MSN Plugin"
-msgstr ""
-
-#: protocols/msn/msnswitchboardsocket.cpp:843
-msgid "connection closed"
-msgstr "ceuwyd cysylltiad"
-
-#: protocols/msn/msnswitchboardsocket.cpp:923
-msgid "<img src=\"%1\" alt=\"Typewrited message\" />"
-msgstr ""
-
-#: protocols/msn/msnnotifysocket.cpp:125
-msgid "<qt>The MSN user '%1' does not exist.<br>Please check the MSN ID.</qt>"
+"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 ""
 
-#: protocols/msn/msnnotifysocket.cpp:133
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 490
+#: rc.cpp:4839 rc.cpp:4842
+#, no-c-format
 msgid ""
-"<qt>An internal error occurred in the MSN plugin."
-"<br>MSN Error: %1"
-"<br>please send us a detailed bug report at kopete-devel@kde.org containing the "
-"raw debug output on the console (in gzipped format, as it is probably a lot of "
-"output.)"
+"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 ""
 
-#: protocols/msn/msnnotifysocket.cpp:145
-msgid ""
-"Unable to change your display name.\n"
-"Please ensure your display is not too long and does not contains censored "
-"words."
-msgstr ""
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 522
+#: rc.cpp:4845
+#, no-c-format
+msgid "A&dvanced Configuration"
+msgstr "F&furfweddiad Uwch"
 
-#: protocols/msn/msnnotifysocket.cpp:160
-msgid "Your contact list is full; you cannot add any new contacts."
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 533
+#: rc.cpp:4848
+#, no-c-format
+msgid "Message Destinations"
 msgstr ""
 
-#: protocols/msn/msnnotifysocket.cpp:166
-msgid ""
-"<qt>The user '%1' already exists in this group on the MSN server;"
-"<br>if Kopete does not show the user, please send us a detailed bug report at "
-"kopete-devel@kde.org containing the raw debug output on the console (in gzipped "
-"format, as it is probably a lot of output.)</qt>"
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 544
+#: rc.cpp:4851
+#, no-c-format
+msgid "Auto-show anonymous windows"
 msgstr ""
 
-#: protocols/msn/msnnotifysocket.cpp:183
-msgid "The user '%1' seems to already be blocked or allowed on the server."
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 552
+#: rc.cpp:4854
+#, no-c-format
+msgid "Auto-show the server window"
 msgstr ""
 
-#: protocols/msn/msnnotifysocket.cpp:189
-msgid ""
-"You have reached the maximum number of groups:\n"
-"MSN does not support more than 30 groups."
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 568
+#: rc.cpp:4857
+#, no-c-format
+msgid "Server messages:"
 msgstr ""
 
-#: protocols/msn/msnnotifysocket.cpp:198
-msgid ""
-"Kopete is trying to perform an operation on a group or a contact that does not "
-"exists on the server.\n"
-"This might happen if the Kopete contact list and the MSN-server contact list "
-"are not correctly synchronized; if this is the case, you probably should send a "
-"bug report."
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 576
+#: rc.cpp:4860
+#, no-c-format
+msgid "Server notices:"
 msgstr ""
 
-#: protocols/msn/msnnotifysocket.cpp:206
-msgid "The group name is too long; it has not been changed on the MSN server."
-msgstr ""
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 582
+#: rc.cpp:4863 rc.cpp:4878 rc.cpp:4896 rc.cpp:4914
+#, no-c-format
+msgid "Active Window"
+msgstr "Ffenestr Weithredol"
 
-#: protocols/msn/msnnotifysocket.cpp:212
-msgid ""
-"You cannot open a Hotmail inbox because you do not have an MSN account with a "
-"valid Hotmail or MSN mailbox."
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 587
+#: rc.cpp:4866 rc.cpp:4881 rc.cpp:4899 rc.cpp:4917
+#, no-c-format
+msgid "Server Window"
 msgstr ""
 
-#: protocols/msn/msnnotifysocket.cpp:245
-msgid ""
-"You can not send messages when you are offline or when you are invisible."
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 592
+#: rc.cpp:4869 rc.cpp:4884 rc.cpp:4902 rc.cpp:4920
+#, no-c-format
+msgid "Anonymous Window"
 msgstr ""
 
-#: protocols/msn/msnnotifysocket.cpp:251
-msgid ""
-"You are trying to perform an action you are not allowed to perform in 'kid "
-"mode'."
-msgstr ""
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 597
+#: rc.cpp:4872 rc.cpp:4887 rc.cpp:4905 rc.cpp:4923
+#, no-c-format
+msgid "KNotify"
+msgstr "KHysbysu"
 
-#: protocols/msn/msnnotifysocket.cpp:757
-#, c-format
-msgid ""
-"_n: You have one unread message in your MSN inbox.\n"
-"You have %n unread messages in your MSN inbox."
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 660
+#: rc.cpp:4893
+#, no-c-format
+msgid "Error messages:"
 msgstr ""
 
-#: protocols/msn/msnnotifysocket.cpp:757 protocols/msn/msnnotifysocket.cpp:779
-#: protocols/yahoo/yahooaccount.cpp:1491 protocols/yahoo/yahooaccount.cpp:1498
-msgid "Open Inbox..."
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 698
+#: rc.cpp:4911
+#, no-c-format
+msgid "Information replies:"
 msgstr ""
 
-#: protocols/msn/msnnotifysocket.cpp:778
-msgid "You have one new email from %1 in your MSN inbox."
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 754
+#: rc.cpp:4929
+#, no-c-format
+msgid "Custom CTCP Replies"
 msgstr ""
 
-#: protocols/msn/msnnotifysocket.cpp:905
-#, fuzzy
-msgid "More Information"
-msgstr "Mwy o Wybodaeth..."
-
-#: protocols/msn/msnnotifysocket.cpp:908
-#, fuzzy
-msgid "Manage Subscription"
-msgstr "Tanysgrifiad"
-
-#: protocols/msn/msnnotifysocket.cpp:1017
-msgid "Now Listening: ♫ %1 ♫"
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 763
+#: rc.cpp:4932
+#, no-c-format
+msgid "CTCP"
 msgstr ""
 
-#: protocols/msn/msnsocket.cpp:184
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 807
+#: rc.cpp:4938
+#, no-c-format
 msgid ""
-"There was an error while connecting to the MSN server.\n"
-"Error message:\n"
+"You can use this dialog to add custom replies for when people send CTCP "
+"requests to you. You can also use this dialog to override the built-in replies "
+"for VERSION, USERINFO, and CLIENTINFO."
 msgstr ""
 
-#: protocols/msn/msnsocket.cpp:186
-#, c-format
-msgid "Unable to lookup %1"
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 823
+#: rc.cpp:4941
+#, no-c-format
+msgid "&CTCP:"
 msgstr ""
 
-#: protocols/msn/msnsocket.cpp:568
-msgid "An internal server error occurred. Please try again later."
-msgstr ""
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 839
+#: rc.cpp:4944
+#, no-c-format
+msgid "&Reply:"
+msgstr "&Ymateb :"
 
-#: protocols/msn/msnsocket.cpp:572
-msgid ""
-"It is no longer possible to perform this operation. The MSN server does not "
-"allow it anymore."
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 855
+#: rc.cpp:4947
+#, no-c-format
+msgid "Add Repl&y"
 msgstr ""
 
-#: protocols/msn/msnsocket.cpp:580
-msgid "The MSN server is busy. Please try again later."
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 881
+#: rc.cpp:4950
+#, no-c-format
+msgid "Run Following Commands on Connect"
 msgstr ""
 
-#: protocols/msn/msnsocket.cpp:590
-msgid "The server is not available at the moment. Please try again later."
-msgstr ""
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 913
+#: rc.cpp:4953
+#, no-c-format
+msgid "Add Co&mmand"
+msgstr "Ychwan&egu Gorchymyn"
 
-#: protocols/msn/msnsocket.cpp:596
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 954
+#: rc.cpp:4959 rc.cpp:4962
+#, no-c-format
 msgid ""
-"Unhandled MSN error code %1 \n"
-"Please fill a bug report with a detailed description and if possible the last "
-"console debug output."
-msgstr ""
-
-#: protocols/groupwise/gwcontact.cpp:166 protocols/msn/msncontact.cpp:133
-msgid "Unblock User"
-msgstr ""
-
-#: protocols/groupwise/gwcontact.cpp:166 protocols/msn/msncontact.cpp:133
-msgid "Block User"
-msgstr ""
-
-#: protocols/gadu/gaducontact.cpp:198 protocols/msn/msncontact.cpp:140
-msgid "Show Profile"
-msgstr ""
-
-#: protocols/msn/msnchatsession.cpp:89 protocols/msn/msncontact.cpp:148
-msgid "View Contact's Webcam"
-msgstr ""
-
-#: protocols/msn/msnchatsession.cpp:92 protocols/msn/msncontact.cpp:151
-msgid "Send Webcam"
-msgstr ""
-
-#: protocols/msn/msncontact.cpp:174
-msgid "<qt>Please go online to block or unblock a contact.</qt>"
-msgstr ""
-
-#: protocols/gadu/gaducontact.cpp:247 protocols/msn/msncontact.cpp:252
-msgid "<qt>Please go online to remove a contact from your contact list.</qt>"
-msgstr ""
-
-#: protocols/msn/msncontact.cpp:315
-#, fuzzy
-msgid "Web Messenger"
-msgstr "Neges"
-
-#: protocols/msn/msncontact.cpp:317
-msgid "Windows Mobile"
-msgstr ""
-
-#: protocols/msn/msncontact.cpp:319
-msgid "MSN Mobile"
-msgstr ""
-
-#: protocols/groupwise/gwcontact.cpp:240 protocols/msn/msncontact.cpp:618
-msgid "%1|Blocked"
-msgstr ""
-
-#: protocols/msn/webcam/msnwebcamdialog.cpp:31
-#: protocols/yahoo/ui/yahoowebcamdialog.cpp:31
-#, c-format
-msgid "Webcam for %1"
-msgstr ""
-
-#: protocols/groupwise/gwmessagemanager.cpp:65
-#: protocols/msn/msnchatsession.cpp:78
-msgid "&Invite"
-msgstr "G&wahodd"
-
-#: protocols/msn/msnaccount.cpp:271 protocols/msn/msnchatsession.cpp:82
-msgid "Send Raw C&ommand..."
-msgstr ""
-
-#: protocols/msn/msnchatsession.cpp:86
-msgid "Send Nudge"
+"Any commands added here will be run as soon as you are connected to the IRC "
+"server."
 msgstr ""
 
-#: protocols/jabber/jabberchatsession.cpp:87
-#: protocols/msn/msnchatsession.cpp:95 protocols/yahoo/yahoochatsession.cpp:60
-#, fuzzy
-msgid "Send File"
-msgstr "Anfon& Ffeil..."
+#. i18n: file ./libkopete/ui/addressbookselectorwidget_base.ui line 24
+#: rc.cpp:4965 rc.cpp:4989
+#, no-c-format
+msgid "Select Contact"
+msgstr "Dewis Cyswllt"
 
-#: protocols/msn/msnchatsession.cpp:98
-msgid "Request Display Picture"
+#. i18n: file ./libkopete/ui/addressbookselectorwidget_base.ui line 55
+#: rc.cpp:4968
+#, no-c-format
+msgid "Create New Entr&y..."
 msgstr ""
 
-#: protocols/msn/msnchatsession.cpp:247
-msgid "Connection closed"
-msgstr "Ceuwyd y cysylltiad"
-
-#: protocols/msn/msnchatsession.cpp:327
-msgid "Other..."
-msgstr "Eraill..."
-
-#: protocols/msn/msnchatsession.cpp:357
-msgid "Please enter the email address of the person you want to invite:"
+#. i18n: file ./libkopete/ui/addressbookselectorwidget_base.ui line 58
+#: rc.cpp:4971
+#, no-c-format
+msgid "Create a new entry in your address book"
 msgstr ""
 
-#: protocols/msn/msnchatsession.cpp:411
-#, c-format
-msgid ""
-"The following message has not been sent correctly:\n"
-"%1"
+#. i18n: file ./libkopete/ui/addressbookselectorwidget_base.ui line 126
+#: rc.cpp:4983
+#, no-c-format
+msgid "Select the contact you want to communicate with via Instant Messaging"
 msgstr ""
 
-#: protocols/msn/msnchatsession.cpp:468
-msgid ""
-"%1 has sent an unimplemented invitation, the invitation was rejected.\n"
-"The invitation was: %2"
-msgstr ""
+#. i18n: file ./libkopete/ui/addressbookselectorwidget_base.ui line 150
+#: rc.cpp:4986 rc.cpp:4992
+#, no-c-format
+msgid "S&earch:"
+msgstr "C&hwilio"
 
-#: protocols/msn/msnchatsession.cpp:624
-msgid "%1 has started a chat with you"
-msgstr ""
+#. i18n: file ./libkopete/ui/metacontactselectorwidget_base.ui line 80
+#: rc.cpp:4995
+#, no-c-format
+msgid "Meta Contact"
+msgstr "Meta Gyswllt"
 
-#: protocols/msn/msnchatsession.cpp:639
-msgid "has sent a nudge"
-msgstr ""
+#. i18n: file ./libkopete/ui/kopetepassworddialog.ui line 82
+#: rc.cpp:5001
+#, no-c-format
+msgid "&Remember password"
+msgstr "&Cofio cyfrinair"
 
-#: protocols/msn/msnchatsession.cpp:652
-msgid "has sent you a nudge"
+#. i18n: file ./libkopete/ui/fileconfirmbase.ui line 16
+#: libkopete/ui/kopetefileconfirmdialog.cpp:35 rc.cpp:5004
+#, no-c-format
+msgid "A User Would Like to Send You a File"
 msgstr ""
 
-#: protocols/msn/msnchatsession.cpp:718
+#. i18n: file ./libkopete/ui/fileconfirmbase.ui line 33
+#: rc.cpp:5007
+#, no-c-format
 msgid ""
-"The following message has not been sent correctly  (%1): \n"
-"%2"
+"A user is trying to send you a file. The file will only be downloaded if you "
+"accept this dialog. If you do not wish to receive it, please click 'Refuse'. "
+"This file will never be executed by Kopete at any point during or after the "
+"transfer."
 msgstr ""
 
-#: protocols/msn/msnchatsession.cpp:725
-msgid "These messages have not been sent correctly (%1): <br /><ul>"
-msgstr ""
+#. i18n: file ./libkopete/ui/fileconfirmbase.ui line 44
+#: rc.cpp:5010
+#, no-c-format
+msgid "From:"
+msgstr "Oddiwrth:"
 
-#: protocols/msn/msnchatsession.cpp:760
-msgid "Impossible to establish the connection"
-msgstr ""
+#. i18n: file ./libkopete/ui/fileconfirmbase.ui line 52
+#: rc.cpp:5013
+#, no-c-format
+msgid "File name:"
+msgstr "Enw'r ffeil:"
 
-#: protocols/msn/msndebugrawcmddlg.cpp:32
-msgid "DEBUG: Send Raw Command - MSN Plugin"
-msgstr ""
+#. i18n: file ./libkopete/ui/fileconfirmbase.ui line 65
+#: rc.cpp:5016
+#, no-c-format
+msgid "&Browse..."
+msgstr "&Pori..."
 
-#: protocols/msn/msnaccount.cpp:83 protocols/yahoo/yahooaccount.cpp:99
-msgid "Open Inbo&x..."
-msgstr ""
+#. i18n: file ./libkopete/ui/fileconfirmbase.ui line 73
+#: rc.cpp:5019
+#, no-c-format
+msgid "Size:"
+msgstr "Maint:"
 
-#: protocols/msn/msnaccount.cpp:84
-msgid "&Change Display Name..."
-msgstr ""
+#. i18n: file ./libkopete/ui/fileconfirmbase.ui line 114
+#: rc.cpp:5025
+#, no-c-format
+msgid "Save to:"
+msgstr "Cadw i:"
 
-#: protocols/msn/msnaccount.cpp:85
-msgid "&Start Chat..."
+#. i18n: file ./libkopete/ui/contactaddednotifywidget.ui line 25
+#: rc.cpp:5028
+#, no-c-format
+msgid "The contact XXX added you in his contactlist"
 msgstr ""
 
-#: protocols/msn/msnaccount.cpp:332
-msgid "Start Chat - MSN Plugin"
+#. i18n: file ./libkopete/ui/contactaddednotifywidget.ui line 61
+#: rc.cpp:5031
+#, no-c-format
+msgid "Read More Info About This Contact"
 msgstr ""
 
-#: protocols/msn/msnaccount.cpp:333
-msgid ""
-"Please enter the email address of the person with whom you want to chat:"
+#. i18n: file ./libkopete/ui/contactaddednotifywidget.ui line 71
+#: rc.cpp:5034
+#, no-c-format
+msgid "Authorize this contact to see my status"
 msgstr ""
 
-#: protocols/msn/msnaccount.cpp:377 protocols/msn/msnaccount.cpp:388
-msgid "Change Display Name - MSN Plugin"
-msgstr ""
+#. i18n: file ./libkopete/ui/contactaddednotifywidget.ui line 82
+#: rc.cpp:5037
+#, no-c-format
+msgid "Add this contact in my contactlist"
+msgstr "Ychwanegu'r cyswllt yma i'm rhestr cysylltau"
 
-#: protocols/msn/msnaccount.cpp:378
-msgid ""
-"Enter the new display name by which you want to be visible to your friends on "
-"MSN:"
+#. i18n: file ./libkopete/ui/contactaddednotifywidget.ui line 112
+#: rc.cpp:5040
+#, no-c-format
+msgid "Display name:"
 msgstr ""
 
-#: protocols/msn/msnaccount.cpp:386
+#. i18n: file ./libkopete/ui/contactaddednotifywidget.ui line 115
+#: rc.cpp:5043 rc.cpp:5050
+#, no-c-format
 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>"
+"The display name of the contact.  Leave it empty to use the contact nickname"
 msgstr ""
 
-#: protocols/msn/msnaccount.cpp:434
+#. i18n: file ./libkopete/ui/contactaddednotifywidget.ui line 119
+#: rc.cpp:5046 rc.cpp:5053
+#, no-c-format
 msgid ""
-"The connection with the MSN server was lost unexpectedly.\n"
-"If you cannot reconnect now, the server might be down. In that case, please try "
-"again later."
-msgstr ""
-
-#: protocols/msn/msnaccount.cpp:436
-msgid "Connection Lost - MSN Plugin"
-msgstr ""
-
-#: protocols/sms/serviceloader.cpp:46
-#, c-format
-msgid "Could not load service %1."
-msgstr ""
-
-#: protocols/sms/serviceloader.cpp:47
-msgid "Error Loading Service"
-msgstr ""
-
-#: protocols/sms/smscontact.cpp:56
-msgid "Something went wrong when sending message."
-msgstr ""
-
-#: protocols/sms/services/smsclient.cpp:66
-#: protocols/sms/services/smssend.cpp:57
-#: protocols/sms/services/smssendprovider.cpp:216
-#: protocols/sms/services/smssendprovider.cpp:224
-#: protocols/sms/smscontact.cpp:57
-msgid "Could Not Send Message"
-msgstr ""
-
-#: protocols/sms/smscontact.cpp:126
-msgid "&Contact Settings"
+"Enter the contact display name. This is how the contact will appears in the "
+"contactlist.\n"
+"Leave it empty if you want to see the contact nickname as display name."
 msgstr ""
 
-#: protocols/sms/smsuserpreferences.cpp:27
-msgid "User Preferences"
+#. i18n: file ./libkopete/ui/contactaddednotifywidget.ui line 149
+#: rc.cpp:5057
+#, no-c-format
+msgid "In the group:"
 msgstr ""
 
-#: protocols/sms/smsaccount.cpp:86
+#. i18n: file ./libkopete/ui/contactaddednotifywidget.ui line 152
+#: rc.cpp:5060 rc.cpp:5063
+#, no-c-format
 msgid ""
-"This message is longer than the maximum length (%1). Should it be divided to %2 "
-"messages?"
-msgstr ""
-
-#: protocols/sms/smsaccount.cpp:87
-msgid "Message Too Long"
+"Enter the group where the contact should be added. Leave it empty to add it in "
+"the top level group."
 msgstr ""
 
-#: protocols/sms/smsaccount.cpp:87
-#, fuzzy
-msgid "Divide"
-msgstr "Dyfais"
+#. i18n: file ./libkopete/ui/contactaddednotifywidget.ui line 181
+#: rc.cpp:5066
+#, no-c-format
+msgid "Addressbook link:"
+msgstr "Dolen llyfr cyfeiriadau"
 
-#: protocols/sms/smsaccount.cpp:87
-msgid "Do Not Divide"
+#. i18n: file ./libkopete/ui/kopeteawaydialogbase.ui line 27
+#: rc.cpp:5069
+#, no-c-format
+msgid "Please specify an away message, or choose a predefined one."
 msgstr ""
 
-#: protocols/sms/smsaccount.cpp:149
-msgid "Message too long."
+#. i18n: file ./libkopete/ui/addressbooklinkwidget_base.ui line 41
+#: rc.cpp:5072
+#, no-c-format
+msgid "The TDE Address Book entry associated with this Kopete Contact"
 msgstr ""
 
-#: protocols/sms/services/gsmlib.cpp:447
-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>"
+#. i18n: file ./libkopete/ui/addressbooklinkwidget_base.ui line 66
+#: rc.cpp:5081
+#, no-c-format
+msgid "Select an address book entry"
 msgstr ""
 
-#: protocols/sms/services/smssend.cpp:57
-msgid "No provider configured."
-msgstr ""
+#. i18n: file ./libkopete/ui/kopetepasswordwidgetbase.ui line 36
+#: rc.cpp:5084
+#, no-c-format
+msgid "Remember password"
+msgstr "Cofio cyfrinair"
 
-#: protocols/sms/services/smssend.cpp:64
+#. i18n: file ./libkopete/ui/kopetepasswordwidgetbase.ui line 39
+#: rc.cpp:5087
+#, no-c-format
 msgid ""
-"No prefix set for SMSSend, please change it in the configuration dialog."
-msgstr ""
-
-#: protocols/sms/services/smssend.cpp:64
-msgid "No Prefix"
-msgstr ""
-
-#: protocols/sms/services/smssend.cpp:184
-msgid "%1 Settings"
+"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 ""
 
-#: protocols/sms/services/smssend.cpp:240
-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 ""
+#. i18n: file ./libkopete/ui/kopetepasswordwidgetbase.ui line 64
+#: rc.cpp:5090
+#, no-c-format
+msgid "Password:"
+msgstr "Cyfrinair:"
 
-#: protocols/sms/services/smsclient.cpp:66
-msgid "No provider configured"
+#. i18n: file ./libkopete/ui/kopetepasswordwidgetbase.ui line 83
+#: rc.cpp:5093
+#, no-c-format
+msgid "Enter your password here."
 msgstr ""
 
-#: protocols/sms/services/smsclient.cpp:179
+#. i18n: file ./libkopete/ui/kopetepasswordwidgetbase.ui line 86
+#: rc.cpp:5096
+#, no-c-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>"
-msgstr ""
-
-#: protocols/sms/services/smssendprovider.cpp:215
-msgid "Could not determine which argument which should contain the message."
-msgstr ""
-
-#: protocols/sms/services/smssendprovider.cpp:223
-msgid "Could not determine which argument which should contain the number."
-msgstr ""
-
-#: protocols/gadu/gadusession.cpp:217 protocols/gadu/gadusession.cpp:230
-#: protocols/gadu/gadusession.cpp:242 protocols/gadu/gadusession.cpp:275
-msgid "You are not connected to the server."
-msgstr ""
-
-#: protocols/gadu/gadusession.cpp:289 protocols/gadu/gadusession.cpp:307
-msgid "You have to be connected to the server to change your status."
-msgstr ""
-
-#: protocols/gadu/gadusession.cpp:574
-msgid "idle"
-msgstr "segur"
-
-#: protocols/gadu/gadusession.cpp:576
-msgid "resolving host"
-msgstr ""
-
-#: protocols/gadu/gadusession.cpp:578
-msgid "connecting"
-msgstr "cysylltu"
-
-#: protocols/gadu/gadusession.cpp:580
-msgid "reading data"
-msgstr ""
-
-#: protocols/gadu/gadusession.cpp:582
-msgid "error"
-msgstr "gwall"
-
-#: protocols/gadu/gadusession.cpp:584
-msgid "connecting to hub"
-msgstr ""
-
-#: protocols/gadu/gadusession.cpp:586
-msgid "connecting to server"
-msgstr ""
-
-#: protocols/gadu/gadusession.cpp:588
-msgid "retrieving key"
-msgstr ""
-
-#: protocols/gadu/gadusession.cpp:590
-msgid "waiting for reply"
-msgstr ""
-
-#: protocols/gadu/gadusession.cpp:592
-msgid "connected"
-msgstr "wedi cysylltu"
-
-#: protocols/gadu/gadusession.cpp:594
-msgid "sending query"
-msgstr ""
-
-#: protocols/gadu/gadusession.cpp:596
-msgid "reading header"
-msgstr ""
-
-#: protocols/gadu/gadusession.cpp:598
-msgid "parse data"
-msgstr ""
-
-#: protocols/gadu/gadusession.cpp:600
-msgid "done"
-msgstr "wedi gorffen"
-
-#: protocols/gadu/gadusession.cpp:602
-msgid "Tls connection negotiation"
-msgstr ""
-
-#: protocols/gadu/gadusession.cpp:604
-msgid "unknown"
-msgstr "anhysbys"
-
-#: protocols/gadu/gadusession.cpp:612
-msgid "Resolving error."
-msgstr ""
-
-#: protocols/gadu/gadusession.cpp:614
-msgid "Connecting error."
-msgstr ""
-
-#: protocols/gadu/gadusession.cpp:616
-msgid "Reading error."
-msgstr ""
-
-#: protocols/gadu/gadusession.cpp:618
-msgid "Writing error."
+"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 ""
 
-#: protocols/gadu/gadusession.cpp:620 protocols/gadu/gadusession.cpp:645
-#, c-format
-msgid "Unknown error number %1."
-msgstr ""
+#. i18n: file ./libkopete/kopetecommandui.rc line 6
+#: rc.cpp:5099
+#, no-c-format
+msgid "Commands"
+msgstr "Gorchmynion:"
 
-#: protocols/gadu/gadusession.cpp:629
-msgid "Unable to resolve server address. DNS failure."
+#: libkopete/tests/kopetepasswordtest_program.cpp:35
+msgid "Config group to store password in"
 msgstr ""
 
-#: protocols/gadu/gadusession.cpp:631
-msgid "Unable to connect to server."
+#: libkopete/tests/kopetepasswordtest_program.cpp:36
+msgid "Set password to new"
 msgstr ""
 
-#: protocols/gadu/gadusession.cpp:633
-msgid "Server send incorrect data. Protocol error."
+#: libkopete/tests/kopetepasswordtest_program.cpp:37
+msgid "Claim password was erroneous"
 msgstr ""
 
-#: protocols/gadu/gadusession.cpp:635
-msgid "Problem reading data from server."
+#: libkopete/tests/kopetepasswordtest_program.cpp:38
+msgid "Password prompt"
 msgstr ""
 
-#: protocols/gadu/gadusession.cpp:637
-msgid "Problem sending data to server."
+#: libkopete/tests/kopetepasswordtest_program.cpp:39
+msgid "Image to display in password dialog"
 msgstr ""
 
-#: protocols/gadu/gadusession.cpp:639
-msgid "Incorrect password."
-msgstr "Cyfrinair anghywir."
-
-#: protocols/gadu/gadusession.cpp:643
+#: libkopete/tests/kopetepasswordtest_program.cpp:120
 msgid ""
-"Unable to connect over encrypted channel.\n"
-"Try to turn off encryption support in Gadu account settings and reconnect."
-msgstr ""
-
-#: protocols/gadu/gaduregisteraccount.cpp:39
-msgid "Register New Account"
-msgstr ""
-
-#: protocols/gadu/gaduregisteraccount.cpp:67
-msgid "Retrieving token"
-msgstr ""
-
-#: protocols/gadu/gaduregisteraccount.cpp:89
-msgid "Please enter a valid E-Mail Address."
-msgstr ""
-
-#: protocols/gadu/gaduregisteraccount.cpp:99
-#: protocols/jabber/ui/jabberregisteraccount.cpp:152
-msgid "Please enter the same password twice."
-msgstr ""
-
-#: protocols/gadu/gaduregisteraccount.cpp:106
-#: protocols/jabber/ui/jabberregisteraccount.cpp:161
-msgid "Password entries do not match."
-msgstr ""
-
-#: protocols/gadu/gaduregisteraccount.cpp:113
-msgid "Please enter the verification sequence."
-msgstr ""
-
-#: protocols/gadu/gaduregisteraccount.cpp:159
-#, c-format
-msgid "Account created; your new UIN is %1."
-msgstr ""
-
-#: protocols/gadu/gaduregisteraccount.cpp:167
-#, c-format
-msgid "Registration failed: %1"
-msgstr ""
-
-#: protocols/gadu/gadueditcontact.cpp:50 protocols/gadu/gadueditcontact.cpp:68
-msgid "Edit Contact's Properties"
-msgstr ""
-
-#: protocols/gadu/gaducontact.cpp:229
-msgid "Gadu contact"
-msgstr ""
-
-#: protocols/gadu/gaducontact.cpp:248
-msgid "Gadu-Gadu Plugin"
-msgstr ""
-
-#: protocols/gadu/gaducommands.cpp:146 protocols/gadu/gaducommands.cpp:183
-#: protocols/gadu/gaducommands.cpp:199 protocols/gadu/gaducommands.cpp:234
-#: protocols/gadu/gaducommands.cpp:250 protocols/gadu/gadueditaccount.cpp:194
-#: protocols/gadu/gadueditaccount.cpp:215
-#: protocols/gadu/gadueditaccount.cpp:220
-#: protocols/gadu/gadueditaccount.cpp:225
-#: protocols/gadu/gadueditaccount.cpp:256
-msgid "Gadu-Gadu"
-msgstr "Gadu-Gadu"
-
-#: protocols/gadu/gaducommands.cpp:146 protocols/gadu/gaducommands.cpp:234
-msgid "Unable to retrieve token."
-msgstr ""
-
-#: protocols/gadu/gaducommands.cpp:183
-msgid "Registration FAILED"
-msgstr ""
-
-#: protocols/gadu/gaducommands.cpp:199
-msgid "Unknown connection error while retrieving token."
-msgstr ""
-
-#: protocols/gadu/gaducommands.cpp:207
-#, c-format
-msgid "Token retrieving status: %1"
-msgstr ""
-
-#: protocols/gadu/gaducommands.cpp:216
-msgid "Gadu-Gadu token retrieve problem"
-msgstr ""
-
-#: protocols/gadu/gaducommands.cpp:250
-msgid "Unknown connection error while registering."
-msgstr ""
-
-#: protocols/gadu/gaducommands.cpp:257
-#, c-format
-msgid "Registration status: %1"
-msgstr ""
-
-#: protocols/gadu/gaducommands.cpp:266
-msgid "Gadu-Gadu Registration Error"
-msgstr ""
-
-#: protocols/gadu/gaducommands.cpp:278
-msgid "Registration Finished"
-msgstr ""
-
-#: protocols/gadu/gaducommands.cpp:278
-msgid "Registration has completed successfully."
-msgstr ""
-
-#: protocols/gadu/gaducommands.cpp:281
-msgid "Registration Error"
-msgstr ""
-
-#: protocols/gadu/gaducommands.cpp:281
-msgid "Incorrect data sent to server."
-msgstr ""
-
-#: protocols/gadu/gaduaccount.cpp:714 protocols/gadu/gaducommands.cpp:328
-#: protocols/gadu/gaducommands.cpp:336 protocols/gadu/gaducommands.cpp:384
-msgid "Connection Error"
-msgstr ""
-
-#: protocols/gadu/gaducommands.cpp:328 protocols/gadu/gaducommands.cpp:336
-msgid "Password reminding finished prematurely due to a connection error."
-msgstr ""
-
-#: protocols/gadu/gaducommands.cpp:344
-msgid "Successfully"
-msgstr ""
-
-#: protocols/gadu/gaducommands.cpp:344
-msgid "Unsuccessful. Please retry."
-msgstr ""
-
-#: protocols/gadu/gaducommands.cpp:345
-msgid "Remind Password"
-msgstr ""
-
-#: protocols/gadu/gaducommands.cpp:345
-msgid "Remind password finished: "
-msgstr ""
-
-#: protocols/gadu/gaducommands.cpp:384
-msgid "Password changing finished prematurely due to a connection error."
+"Hopefully this popped up because you set the password to the empty string."
 msgstr ""
 
-#: protocols/gadu/gaducommands.cpp:392
-msgid "State Error"
-msgstr ""
+#: libkopete/kopetetransfermanager.cpp:190
+msgid "<unknown>"
+msgstr "<anhysbys>"
 
-#: protocols/gadu/gaducommands.cpp:393
+#: libkopete/kopetetransfermanager.cpp:258
 msgid ""
-"Password changing finished prematurely due to a session related problem (try "
-"again later)."
-msgstr ""
-
-#: protocols/gadu/gaducommands.cpp:400
-msgid "Changed Password"
+"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 ""
 
-#: protocols/gadu/gaducommands.cpp:400
-msgid "Your password has been changed."
-msgstr "Newidwyd eich cyfrinair."
-
-#: protocols/gadu/gadueditaccount.cpp:88
+#: libkopete/kopetemetacontact.cpp:345 libkopete/kopetemetacontact.cpp:363
+#: libkopete/kopetemetacontact.cpp:439
 msgid ""
-"_: personal information being fetched from server\n"
-"<p align=\"center\">Fetching from server</p>"
-msgstr ""
-
-#: protocols/gadu/gadueditaccount.cpp:194
-msgid "<b>Registration FAILED.</b>"
-msgstr ""
-
-#: protocols/gadu/gadueditaccount.cpp:215
-msgid "<b>Enter UIN please.</b>"
-msgstr ""
-
-#: protocols/gadu/gadueditaccount.cpp:220
-msgid "<b>UIN should be a positive number.</b>"
-msgstr ""
-
-#: protocols/gadu/gadueditaccount.cpp:225
-msgid "<b>Enter password please.</b>"
-msgstr ""
-
-#: protocols/gadu/gadueditaccount.cpp:256
-msgid "<b>Starting DCC listening socket failed; dcc is not working now.</b>"
-msgstr ""
-
-#: protocols/gadu/gaduaccount.cpp:186
-msgid "&Search for Friends"
-msgstr ""
-
-#: protocols/gadu/gaduaccount.cpp:188
-msgid "Export Contacts to Server"
-msgstr ""
-
-#: protocols/gadu/gaduaccount.cpp:190
-msgid "Export Contacts to File..."
-msgstr ""
-
-#: protocols/gadu/gaduaccount.cpp:192
-msgid "Import Contacts From File..."
-msgstr ""
-
-#: protocols/gadu/gaduaccount.cpp:194
-msgid "Only for Friends"
-msgstr ""
-
-#: protocols/gadu/gaduaccount.cpp:255
-msgid "%1 <%2> "
-msgstr ""
-
-#: protocols/gadu/gaduaccount.cpp:289
-msgid "Go O&nline"
-msgstr ""
-
-#: protocols/gadu/gaduaccount.cpp:293
-msgid "Set &Busy"
-msgstr ""
-
-#: protocols/gadu/gaduaccount.cpp:297
-msgid "Set &Invisible"
-msgstr ""
-
-#: protocols/gadu/gaduaccount.cpp:301
-#, fuzzy
-msgid "Go &Offline"
-msgstr "All-lein"
-
-#: protocols/gadu/gaduaccount.cpp:305
-msgid "Set &Description..."
-msgstr ""
-
-#: protocols/gadu/gaduaccount.cpp:685
-msgid "connection using SSL was not possible, retrying without."
-msgstr ""
-
-#: protocols/gadu/gaduaccount.cpp:713
-msgid "unable to connect to the Gadu-Gadu server(\"%1\")."
-msgstr ""
-
-#: protocols/gadu/gaduaccount.cpp:897
-msgid "Contacts exported to the server."
-msgstr ""
-
-#: protocols/gadu/gaduaccount.cpp:928
-msgid "Save Contacts List for Account %1 As"
-msgstr ""
-
-#: protocols/gadu/gaduaccount.cpp:936
-msgid "Unable to create temporary file."
-msgstr ""
-
-#: protocols/gadu/gaduaccount.cpp:936 protocols/gadu/gaduaccount.cpp:950
-msgid "Save Contacts List Failed"
+"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 ""
 
-#: protocols/gadu/gaduaccount.cpp:974
-msgid "Load Contacts List for Account %1 As"
+#: libkopete/kopetecontact.cpp:453 libkopete/kopetemetacontact.cpp:346
+#: libkopete/kopetemetacontact.cpp:364 libkopete/kopetemetacontact.cpp:440
+msgid "User is Not Reachable"
 msgstr ""
 
-#: protocols/gadu/gaduaccount.cpp:994 protocols/gadu/gaduaccount.cpp:1000
-msgid "Contacts List Load Has Failed"
+#: libkopete/kopetechatsession.cpp:251
+msgid "Outgoing Message Sent"
 msgstr ""
 
-#: protocols/gadu/gadudcctransaction.cpp:237
-#: protocols/jabber/jabberfiletransfer.cpp:148
-msgid "&Resume"
-msgstr "Ai&l-ddechrau"
-
-#: protocols/gadu/gadudcctransaction.cpp:238
-#: protocols/jabber/jabberfiletransfer.cpp:149
-msgid "Over&write"
-msgstr "Tros&ysgrifo"
-
-#: protocols/gadu/gadudcctransaction.cpp:240
-#: protocols/jabber/jabberfiletransfer.cpp:152
-msgid "The file %1 already exists, do you want to resume or overwrite it?"
+#: libkopete/kopetechatsession.cpp:267
+msgid "A contact sent you a buzz/nudge."
 msgstr ""
 
-#: protocols/gadu/gadudcctransaction.cpp:241
-#: protocols/jabber/jabberfiletransfer.cpp:153
-#, c-format
-msgid "File Exists: %1"
-msgstr "Ffeil yn Bodoli : %1"
-
-#: protocols/gadu/gadudcctransaction.cpp:408
+#: libkopete/kopetechatsession.cpp:451
 msgid ""
-"Connection to peer was refused; it possibly does not listen for incoming "
-"connections."
-msgstr ""
-
-#: protocols/gadu/gadudcctransaction.cpp:412
-msgid "File transfer transaction was not agreed by peer."
-msgstr ""
-
-#: protocols/gadu/gadudcctransaction.cpp:416
-msgid "File-transfer handshake failure."
-msgstr ""
-
-#: protocols/gadu/gadudcctransaction.cpp:419
-msgid "File transfer had problems with the file."
-msgstr ""
-
-#: protocols/gadu/gadudcctransaction.cpp:422
-msgid "There was network error during file transfer."
-msgstr ""
-
-#: protocols/gadu/gadudcctransaction.cpp:425
-msgid "Unknown File-Transfer error."
-msgstr ""
-
-#: protocols/gadu/gadupubdir.cpp:74 protocols/gadu/gadupubdir.cpp:315
-msgid "Search &More..."
-msgstr ""
-
-#: protocols/gadu/gadupubdir.cpp:95
-msgid "Gadu-Gadu Public Directory"
-msgstr ""
-
-#: protocols/gadu/gadupubdir.cpp:102
-msgid "&New Search"
-msgstr ""
-
-#: protocols/gadu/gadupubdir.cpp:104
-msgid "&Add User..."
-msgstr ""
-
-#: protocols/gadu/gaduprotocol.cpp:57
-msgid "Blocked"
+"<qt>An error has occurred while creating a new chat window. The chat window has "
+"not been created.</qt>"
 msgstr ""
 
-#: protocols/gadu/gaduprotocol.cpp:61
-msgid "A&way"
-msgstr "I& ffwrdd"
-
-#: protocols/gadu/gaduprotocol.cpp:63 protocols/gadu/gaduprotocol.cpp:65
-msgid "B&usy"
-msgstr "P&rysur"
-
-#: protocols/gadu/gaduprotocol.cpp:67 protocols/gadu/gaduprotocol.cpp:69
-#, fuzzy
-msgid "I&nvisible"
-msgstr "Segur"
-
-#: protocols/groupwise/ui/gwaddcontactpage.cpp:63
-#: protocols/jabber/ui/jabberaddcontactpage.cpp:62
-#: protocols/oscar/aim/aimprotocol.cpp:186
-#: protocols/oscar/aim/ui/aimaddcontactpage.cpp:42
-msgid "You need to be connected to be able to add contacts."
+#: libkopete/kopetechatsession.cpp:452
+msgid "Error While Creating Chat Window"
 msgstr ""
 
-#: protocols/oscar/aim/ui/aimaddcontactpage.cpp:43
-msgid "Connect to the AIM network and try again."
+#: libkopete/knotification.cpp:130 libkopete/knotification.cpp:151
+msgid "Fatal"
 msgstr ""
 
-#: protocols/meanwhile/meanwhileeditaccountwidget.cpp:151
-#: protocols/oscar/aim/ui/aimaddcontactpage.cpp:65
-#: protocols/winpopup/wpeditaccount.cpp:100
-#: protocols/yahoo/yahooeditaccount.cpp:108
-msgid "<qt>You must enter a valid screen name.</qt>"
+#: libkopete/kopetegroup.cpp:55
+msgid "Not in your contact list"
 msgstr ""
 
-#: protocols/oscar/aim/ui/aimaddcontactpage.cpp:66
-msgid "No Screen Name"
+#: libkopete/kopetegroup.cpp:217
+msgid "(Unnamed Group)"
 msgstr ""
 
-#: protocols/oscar/aim/aimcontact.cpp:93
-#, fuzzy
-msgid "&Warn User"
-msgstr "&Rhybuddio"
-
-#: protocols/oscar/aim/aimcontact.cpp:95
-#: protocols/oscar/icq/icqcontact.cpp:705
-#, fuzzy
-msgid "Always &Visible To"
-msgstr "Segur"
-
-#: protocols/oscar/aim/aimcontact.cpp:97
-#: protocols/oscar/icq/icqcontact.cpp:707
-#, fuzzy
-msgid "Always &Invisible To"
-msgstr "Segur"
+#: libkopete/kopetepassword.cpp:181
+msgid "Password Required"
+msgstr "Mae angen cyfrinair"
 
-#: protocols/oscar/aim/aimcontact.cpp:350
+#: libkopete/kopetepassword.cpp:293
 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>"
-msgstr ""
-
-#: protocols/oscar/aim/aimcontact.cpp:358
-msgid "Warn User %1?"
-msgstr ""
-
-#: protocols/oscar/aim/aimcontact.cpp:359
-msgid "Warn Anonymously"
-msgstr ""
-
-#: protocols/oscar/aim/aimcontact.cpp:359
-msgid "Warn"
-msgstr "Rhybuddio"
-
-#: protocols/oscar/aim/aimuserinfo.cpp:41
-#: protocols/oscar/aim/aimuserinfo.cpp:136
-#: protocols/oscar/aim/aimuserinfo.cpp:153
-#, c-format
-msgid "User Information on %1"
-msgstr ""
-
-#: protocols/oscar/aim/aimuserinfo.cpp:90
-msgid "&Save Profile"
+"<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 ""
 
-#: protocols/oscar/aim/aimuserinfo.cpp:116
-msgid "Requesting User Profile, please wait..."
+#: libkopete/kopetepassword.cpp:295
+msgid "Unable to Store Secure Password"
 msgstr ""
 
-#: protocols/oscar/aim/aimuserinfo.cpp:198
-msgid "<html><body><I>No user information provided</I></body></html>"
+#: libkopete/kopetepassword.cpp:296
+msgid "Store &Unsafe"
 msgstr ""
 
-#: protocols/oscar/aim/aimaccount.cpp:211
+#: libkopete/connectionmanager.cpp:144
 msgid ""
-"Visit the Kopete website at <a href=\"http://kopete.kde.org\">"
-"http://kopete.kde.org</a>"
-msgstr ""
-
-#: protocols/oscar/aim/aimaccount.cpp:325
-#, fuzzy
-msgid "Join Chat..."
-msgstr "Ymuno â'r Sianel..."
-
-#: protocols/oscar/aim/aimaccount.cpp:328
-#: protocols/oscar/icq/icqaccount.cpp:137
-msgid "Set Visibility..."
-msgstr ""
-
-#: protocols/jabber/jabberaccount.cpp:202
-#: protocols/oscar/aim/aimaccount.cpp:334
-msgid "Edit User Info..."
-msgstr ""
-
-#: protocols/oscar/aim/aimaccount.cpp:385
-msgid "Editing your user info is not possible because you are not connected."
-msgstr ""
-
-#: protocols/oscar/aim/aimaccount.cpp:387
-msgid "Unable to edit user info"
-msgstr ""
-
-#: protocols/oscar/aim/aimaccount.cpp:511
-msgid "Joining an AIM chat room is not possible because you are not connected."
-msgstr ""
-
-#: protocols/oscar/aim/aimaccount.cpp:513
-msgid "Unable to Join AIM Chat Room"
-msgstr ""
-
-#: protocols/oscar/aim/aimaccount.cpp:789
-#: protocols/oscar/icq/icqaccount.cpp:226
-msgid "You must be online to set users visibility."
-msgstr ""
-
-#: protocols/oscar/aim/aimaccount.cpp:790
-#: protocols/oscar/icq/icqaccount.cpp:227
-#: protocols/oscar/icq/ui/icqaddcontactpage.cpp:86
-#: protocols/oscar/icq/ui/icqaddcontactpage.cpp:94
-#: protocols/oscar/icq/ui/icqsearchdialog.cpp:83
-#: protocols/oscar/icq/ui/icqsearchdialog.cpp:108
-#: protocols/oscar/icq/ui/icqsearchdialog.cpp:147
-#: protocols/oscar/icq/ui/icqsearchdialog.cpp:196
-msgid "ICQ Plugin"
+"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 ""
 
-#: protocols/oscar/aim/aimprotocol.cpp:187
-#: protocols/oscar/oscaraccount.cpp:809 protocols/yahoo/yahooprotocol.cpp:74
-msgid "AIM"
-msgstr "AIM"
-
-#: protocols/oscar/aim/aimprotocol.cpp:192
-msgid "Do you want to add '%1' to your contact list?"
+#: libkopete/connectionmanager.cpp:145
+msgid "This application is currently in offline mode.  Do you want to connect?"
 msgstr ""
 
-#: protocols/oscar/aim/aimprotocol.cpp:214
+#: libkopete/connectionmanager.cpp:147
 msgid ""
-"Unable to connect to the chat room %1 because the account for %2 is not "
-"connected."
-msgstr ""
-
-#: protocols/oscar/aim/aimprotocol.cpp:236
-#, fuzzy
-msgid "Mobile"
-msgstr "Ffôn Symudol :"
-
-#: protocols/oscar/aim/aimprotocol.cpp:239
-msgid "Mobile Away"
-msgstr ""
-
-#: protocols/oscar/aim/aimprotocol.cpp:240
-#: protocols/oscar/icq/icqpresence.cpp:129
-msgid "Connecting..."
-msgstr "Yn cysylltu..."
-
-#: protocols/oscar/aim/aimprotocol.cpp:242
-#: protocols/oscar/icq/icqprotocol.cpp:183
-msgid "Client Features"
-msgstr ""
-
-#: protocols/oscar/aim/aimprotocol.cpp:243
-#, fuzzy
-msgid "User Profile"
-msgstr "Diffinir gan y Defnyddiwr"
-
-#: protocols/oscar/aim/aimprotocol.cpp:244
-#: protocols/oscar/icq/icqprotocol.cpp:184
-msgid "Buddy Icon MD5 Hash"
-msgstr ""
-
-#: protocols/oscar/aim/aimjoinchat.cpp:31
-msgid "Join AIM Chat Room"
-msgstr ""
-
-#: protocols/oscar/aim/aimjoinchat.cpp:32
-msgid "Join"
-msgstr "Uniad"
-
-#: protocols/oscar/icq/icqprotocol.cpp:139
-#: protocols/oscar/icq/ui/icqaddcontactpage.cpp:86
-msgid "You must be online to add a contact."
-msgstr ""
-
-#: protocols/oscar/icq/ui/icqaddcontactpage.cpp:94
-#: protocols/oscar/icq/ui/icqsearchdialog.cpp:108
-msgid "You must enter a valid UIN."
-msgstr ""
-
-#: protocols/oscar/icq/ui/icqauthreplydialog.cpp:28
-msgid "Authorization Reply"
-msgstr ""
-
-#: protocols/oscar/icq/ui/icqauthreplydialog.cpp:53
-msgid "<b>%1</b> requested authorization to add you to his/her contact list."
-msgstr ""
-
-#: protocols/oscar/icq/ui/icqauthreplydialog.cpp:55
-msgid "Authorization reply to <b>%1</b>."
-msgstr ""
-
-#: protocols/oscar/icq/ui/icquserinfowidget.cpp:44
-#, fuzzy
-msgid "ICQ User Information"
-msgstr "Gwybodaeth Defnyddiwr"
-
-#: protocols/oscar/icq/ui/icquserinfowidget.cpp:48
-#: protocols/yahoo/ui/yahoouserinfodialog.cpp:48
-#, fuzzy
-msgid "General Info"
-msgstr "Cyffredinol"
-
-#: protocols/oscar/icq/ui/icquserinfowidget.cpp:49
-#, fuzzy
-msgid "General ICQ Information"
-msgstr "Gwybodaeth Defnyddiwr"
-
-#: protocols/oscar/icq/ui/icquserinfowidget.cpp:55
-#: protocols/yahoo/ui/yahoouserinfodialog.cpp:55
-#, fuzzy
-msgid "Work Info"
-msgstr "&Gwybodaeth am Ddefnyddwyr"
-
-#: protocols/oscar/icq/ui/icquserinfowidget.cpp:56
-#: protocols/yahoo/ui/yahoouserinfodialog.cpp:56
-msgid "Work Information"
-msgstr ""
-
-#: protocols/oscar/icq/ui/icquserinfowidget.cpp:62
-#: protocols/yahoo/ui/yahoouserinfodialog.cpp:62
-#, fuzzy
-msgid "Other Info"
-msgstr "&Gwybodaeth am Ddefnyddwyr"
-
-#: protocols/oscar/icq/ui/icquserinfowidget.cpp:63
-#, fuzzy
-msgid "Other ICQ Information"
-msgstr "Gwybodaeth Defnyddiwr"
-
-#: protocols/oscar/icq/ui/icquserinfowidget.cpp:69
-#, fuzzy
-msgid "Interest Info"
-msgstr "&Gwybodaeth am Ddefnyddwyr"
-
-#: protocols/oscar/icq/ui/icquserinfowidget.cpp:70
-#, fuzzy
-msgid "Interest"
-msgstr "Rhyngrwyd"
-
-#: protocols/oscar/icq/ui/icqsearchdialog.cpp:45
-msgid "ICQ User Search"
-msgstr ""
-
-#: protocols/oscar/icq/ui/icqsearchdialog.cpp:83
-msgid "You must be online to search the ICQ Whitepages."
-msgstr ""
-
-#: protocols/oscar/icq/ui/icqsearchdialog.cpp:147
-msgid "You must enter search criteria."
-msgstr ""
-
-#: protocols/oscar/icq/ui/icqsearchdialog.cpp:196
-msgid "You must be online to display user info."
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:139
-#: protocols/oscar/oscaraccount.cpp:809 protocols/yahoo/yahooprotocol.cpp:75
-msgid "ICQ"
-msgstr "ICQ"
-
-#: protocols/oscar/icq/icqprotocol.cpp:144
-msgid "'%1'"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:145
-msgid "'%1' (%2)"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:148
-msgid "Do you want to add %1 to your contact list?"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:182
-msgid "IP Address"
-msgstr "Cyfeiriad IP"
-
-#: protocols/oscar/icq/icqprotocol.cpp:185
-#, fuzzy
-msgid "Contact Encoding"
-msgstr "Gwybodaeth Cysylltu"
-
-#: protocols/oscar/icq/icqprotocol.cpp:235
-msgid "Ascension Island"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:237
-msgid "Australian Antarctic Territory"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:244
-msgid "Barbuda"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:255
-msgid "British Virgin Islands"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:281
-msgid "Diego Garcia"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:297
-msgid "French Antilles"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:311
-msgid "Guantanamo Bay"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:320
-msgid "INMARSAT (Atlantic-East)"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:321
-msgid "INMARSAT (Atlantic-West)"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:322
-msgid "INMARSAT (Indian)"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:323
-msgid "INMARSAT (Pacific)"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:324
-msgid "INMARSAT"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:328
-msgid "International Freephone Service"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:334
-#: protocols/oscar/icq/icqprotocol.cpp:408
-msgid "Ivory Coast"
-msgstr "Yr Arfordir Ifori"
-
-#: protocols/oscar/icq/icqprotocol.cpp:380
-msgid "Nevis"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:402
-msgid "Reunion Island"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:404
-msgid "Rota Island"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:437
-msgid "Tinian Island"
-msgstr ""
-
-#. i18n("Arabic")
-#: protocols/oscar/icq/icqprotocol.cpp:475
-msgid "Bhojpuri"
-msgstr ""
-
-#. i18n("Bulgarian")
-#. i18n("Burmese")
-#: protocols/oscar/icq/icqprotocol.cpp:478
-msgid "Cantonese"
-msgstr ""
-
-#. i18n("Catalan")
-#. i18n("Chinese")
-#. i18n("Croatian")
-#. i18n("Czech")
-#. i18n("Danish")
-#. i18n("Dutch")
-#. i18n("English")
-#. i18n("Esperanto")
-#. i18n("Estonian")
-#: protocols/oscar/icq/icqprotocol.cpp:488
-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")
-#: protocols/oscar/icq/icqprotocol.cpp:528
-msgid "Taiwanese"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:537
-#: protocols/oscar/oscarencodingselectiondialog.cpp:36
-msgid "Big5"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:538
-#: protocols/oscar/oscarencodingselectiondialog.cpp:37
-msgid "Big5-HKSCS"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:539
-#: protocols/oscar/oscarencodingselectiondialog.cpp:38
-msgid "euc-JP Japanese"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:540
-#: protocols/oscar/oscarencodingselectiondialog.cpp:39
-msgid "euc-KR Korean"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:541
-#: protocols/oscar/oscarencodingselectiondialog.cpp:40
-msgid "GB-2312 Chinese"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:542
-#: protocols/oscar/oscarencodingselectiondialog.cpp:41
-msgid "GBK Chinese"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:543
-#: protocols/oscar/oscarencodingselectiondialog.cpp:42
-msgid "GB18030 Chinese"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:545
-#: protocols/oscar/oscarencodingselectiondialog.cpp:44
-msgid "JIS Japanese"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:546
-#: protocols/oscar/oscarencodingselectiondialog.cpp:45
-msgid "Shift-JIS Japanese"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:548
-#: protocols/oscar/oscarencodingselectiondialog.cpp:47
-msgid "KOI8-R Russian"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:549
-#: protocols/oscar/oscarencodingselectiondialog.cpp:48
-msgid "KOI8-U Ukrainian"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:551
-#: protocols/oscar/oscarencodingselectiondialog.cpp:50
-msgid "ISO-8859-1 Western"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:552
-#: protocols/oscar/oscarencodingselectiondialog.cpp:51
-msgid "ISO-8859-2 Central European"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:553
-#: protocols/oscar/oscarencodingselectiondialog.cpp:52
-msgid "ISO-8859-3 Central European"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:554
-#: protocols/oscar/oscarencodingselectiondialog.cpp:53
-msgid "ISO-8859-4 Baltic"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:555
-#: protocols/oscar/oscarencodingselectiondialog.cpp:54
-msgid "ISO-8859-5 Cyrillic"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:556
-#: protocols/oscar/oscarencodingselectiondialog.cpp:55
-msgid "ISO-8859-6 Arabic"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:557
-#: protocols/oscar/oscarencodingselectiondialog.cpp:56
-msgid "ISO-8859-7 Greek"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:558
-#: protocols/oscar/oscarencodingselectiondialog.cpp:57
-msgid "ISO-8859-8 Hebrew, visually ordered"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:559
-#: protocols/oscar/oscarencodingselectiondialog.cpp:58
-msgid "ISO-8859-8-I Hebrew, logically ordered"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:560
-#: protocols/oscar/oscarencodingselectiondialog.cpp:59
-msgid "ISO-8859-9 Turkish"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:561
-#: protocols/oscar/oscarencodingselectiondialog.cpp:60
-msgid "ISO-8859-10"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:562
-#: protocols/oscar/oscarencodingselectiondialog.cpp:61
-msgid "ISO-8859-13"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:563
-#: protocols/oscar/oscarencodingselectiondialog.cpp:62
-msgid "ISO-8859-14"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:564
-#: protocols/oscar/oscarencodingselectiondialog.cpp:63
-msgid "ISO-8859-15 Western"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:566
-#: protocols/oscar/oscarencodingselectiondialog.cpp:65
-msgid "Windows-1250 Central European"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:567
-#: protocols/oscar/oscarencodingselectiondialog.cpp:66
-msgid "Windows-1251 Cyrillic"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:568
-#: protocols/oscar/oscarencodingselectiondialog.cpp:67
-msgid "Windows-1252 Western"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:569
-#: protocols/oscar/oscarencodingselectiondialog.cpp:68
-msgid "Windows-1253 Greek"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:570
-#: protocols/oscar/oscarencodingselectiondialog.cpp:69
-msgid "Windows-1254 Turkish"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:571
-#: protocols/oscar/oscarencodingselectiondialog.cpp:70
-msgid "Windows-1255 Hebrew"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:572
-#: protocols/oscar/oscarencodingselectiondialog.cpp:71
-msgid "Windows-1256 Arabic"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:573
-#: protocols/oscar/oscarencodingselectiondialog.cpp:72
-msgid "Windows-1257 Baltic"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:574
-#: protocols/oscar/oscarencodingselectiondialog.cpp:73
-msgid "Windows-1258 Viet Nam"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:576
-#: protocols/oscar/oscarencodingselectiondialog.cpp:75
-msgid "IBM 850"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:577
-#: protocols/oscar/oscarencodingselectiondialog.cpp:76
-msgid "IBM 866"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:579
-#: protocols/oscar/oscarencodingselectiondialog.cpp:78
-msgid "TIS-620 Thai"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:581
-#: protocols/oscar/oscarencodingselectiondialog.cpp:80
-msgid "UTF-8 Unicode"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:582
-#: protocols/oscar/oscarencodingselectiondialog.cpp:81
-msgid "UTF-16 Unicode"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:596
-msgid "Single"
-msgstr "Sengl"
-
-#: protocols/oscar/icq/icqprotocol.cpp:597
-msgid "Long term relationship"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:598
-#, fuzzy
-msgid "Engaged"
-msgstr "Ieithoedd"
-
-#: protocols/oscar/icq/icqprotocol.cpp:599
-msgid "Married"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:600
-#, fuzzy
-msgid "Divorced"
-msgstr "Datleisio"
-
-#: protocols/oscar/icq/icqprotocol.cpp:601
-msgid "Separated"
-msgstr "Ar wahan"
-
-#: protocols/oscar/icq/icqprotocol.cpp:602
-msgid "Widowed"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:609
-#, fuzzy
-msgid "Art"
-msgstr "Terfynwyd"
-
-#: protocols/oscar/icq/icqprotocol.cpp:610
-#, fuzzy
-msgid "Cars"
-msgstr "Ffarsi"
-
-#: protocols/oscar/icq/icqprotocol.cpp:611
-msgid "Celebrities"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:612
-#, fuzzy
-msgid "Collections"
-msgstr "Cysylltiad"
-
-#: protocols/oscar/icq/icqprotocol.cpp:613
-msgid "Computers"
-msgstr "Cyfrifiaduron"
-
-#: protocols/oscar/icq/icqprotocol.cpp:614
-msgid "Culture"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:615
-#, fuzzy
-msgid "Fitness"
-msgstr "Hidlenni"
-
-#: protocols/oscar/icq/icqprotocol.cpp:616
-#: protocols/oscar/oscarcontact.cpp:202
-msgid "Games"
-msgstr "Gemau"
-
-#: protocols/oscar/icq/icqprotocol.cpp:617
-msgid "Hobbies"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:618
-msgid "ICQ - Help"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:619
-msgid "Internet"
-msgstr "Rhyngrwyd"
-
-#: protocols/oscar/icq/icqprotocol.cpp:620
-#, fuzzy
-msgid "Lifestyle"
-msgstr "Ardull"
-
-#: protocols/oscar/icq/icqprotocol.cpp:621
-msgid "Movies"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:622
-msgid "Music"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:623
-msgid "Outdoors"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:624
-msgid "Parenting"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:625
-msgid "Pets and animals"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:626
-msgid "Religion"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:627
-msgid "Science"
-msgstr "Gwyddoniaeth"
-
-#: protocols/oscar/icq/icqprotocol.cpp:628
-msgid "Skills"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:629
-msgid "Sports"
-msgstr "Chwaraeon"
-
-#: protocols/oscar/icq/icqprotocol.cpp:630
-#, fuzzy
-msgid "Web design"
-msgstr "Neges"
-
-#: protocols/oscar/icq/icqprotocol.cpp:631
-msgid "Ecology"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:632
-msgid "News and media"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:633
-#, fuzzy
-msgid "Government"
-msgstr "Almaenaidd"
-
-#: protocols/oscar/icq/icqprotocol.cpp:634
-msgid "Business"
-msgstr "Busnes"
-
-#: protocols/oscar/icq/icqprotocol.cpp:635
-msgid "Mystics"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:636
-msgid "Travel"
-msgstr "Teithio"
-
-#: protocols/oscar/icq/icqprotocol.cpp:637
-msgid "Astronomy"
-msgstr "Astroleg"
-
-#: protocols/oscar/icq/icqprotocol.cpp:638
-msgid "Space"
-msgstr "Gofodnod"
-
-#: protocols/oscar/icq/icqprotocol.cpp:639
-#, fuzzy
-msgid "Clothing"
-msgstr "Cysylltu"
-
-#: protocols/oscar/icq/icqprotocol.cpp:640
-#, fuzzy
-msgid "Parties"
-msgstr "&Priodweddau"
-
-#: protocols/oscar/icq/icqprotocol.cpp:641
-#, fuzzy
-msgid "Women"
-msgstr "Sylwad:"
-
-#: protocols/oscar/icq/icqprotocol.cpp:642
-#, fuzzy
-msgid "Social science"
-msgstr "Gwyddoniaeth"
-
-#: protocols/oscar/icq/icqprotocol.cpp:643
-msgid "60's"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:644
-msgid "70's"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:645
-msgid "40's"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:646
-msgid "50's"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:647
-msgid "Finance and corporate"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:648
-#, fuzzy
-msgid "Entertainment"
-msgstr "Rhyngrwyd"
-
-#: protocols/oscar/icq/icqprotocol.cpp:649
-msgid "Consumer electronics"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:650
-msgid "Retail stores"
+"This application is currently in offline mode.  Do you want to connect in order "
+"to carry out this operation?"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:651
-msgid "Health and beauty"
+#: libkopete/connectionmanager.cpp:148
+msgid "Leave Offline Mode?"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:652
-msgid "Media"
+#: libkopete/kopeteaway.cpp:170
+msgid "Sorry, I am busy right now"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:653
-msgid "Household products"
+#: libkopete/kopeteaway.cpp:171 libkopete/kopeteaway.cpp:184
+msgid "I am gone right now, but I will be back later"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:654
-msgid "Mail order catalog"
+#: libkopete/kopeteutils.cpp:38
+msgid "You have been disconnected."
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:655
+#: libkopete/kopeteutils.cpp:39
 #, fuzzy
-msgid "Business services"
-msgstr "Busnes"
-
-#: protocols/oscar/icq/icqprotocol.cpp:656
-msgid "Audio and visual"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:657
-msgid "Sporting and athletic"
-msgstr ""
-
-#: protocols/oscar/icq/icqprotocol.cpp:658
-msgid "Publishing"
-msgstr "Cyhoeddi"
-
-#: protocols/oscar/icq/icqprotocol.cpp:659
-msgid "Home automation"
-msgstr ""
-
-#: protocols/oscar/icq/icqcontact.cpp:253
-msgid "Request Authorization"
-msgstr ""
-
-#: protocols/oscar/icq/icqcontact.cpp:254
-msgid "Reason for requesting authorization:"
-msgstr ""
-
-#: protocols/oscar/icq/icqcontact.cpp:278
-msgid ""
-"User %1 has granted your authorization request.\n"
-"Reason: %2"
-msgstr ""
-
-#: protocols/oscar/icq/icqcontact.cpp:287
-msgid ""
-"User %1 has rejected the authorization request.\n"
-"Reason: %2"
-msgstr ""
+msgid "Connection Lost."
+msgstr "Collwyd Cysylltiad"
 
-#: protocols/oscar/icq/icqcontact.cpp:542
-#: protocols/oscar/liboscar/userdetails.cpp:129
+#: libkopete/kopeteutils.cpp:40
 msgid ""
-"_: Translators: client-name client-version\n"
-"%1 %2"
-msgstr "%1 %2"
-
-#: protocols/oscar/icq/icqcontact.cpp:551 protocols/oscar/oscarcontact.cpp:188
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: protocols/oscar/icq/icqcontact.cpp:553
-msgid "RTF-Messages"
+"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 ""
 
-#: protocols/oscar/icq/icqcontact.cpp:555 protocols/oscar/oscarcontact.cpp:196
-msgid "DirectIM/IMImage"
+#: libkopete/kopeteutils.cpp:42
+msgid "Can't connect with the instant messaging server or peers."
 msgstr ""
 
-#: protocols/oscar/icq/icqcontact.cpp:557
-msgid "Groupchat"
-msgstr ""
+#: libkopete/kopeteutils.cpp:43
+msgid "Can't connect."
+msgstr "Methu cysylltu."
 
-#: protocols/oscar/icq/icqcontact.cpp:628
+#: libkopete/kopeteutils.cpp:44
 msgid ""
-"<qt>You must be logged on to ICQ before you can send a message to a user.</qt>"
-msgstr ""
-
-#: protocols/oscar/icq/icqcontact.cpp:630
-msgid "Not Signed On"
-msgstr ""
-
-#: protocols/oscar/icq/icqcontact.cpp:690
-msgid "&Request Authorization"
-msgstr ""
-
-#: protocols/oscar/icq/icqcontact.cpp:692
-#, fuzzy
-msgid "&Grant Authorization"
-msgstr "Yn aros am awdurdodiad"
-
-#: protocols/oscar/icq/icqcontact.cpp:703
-msgid "&Ignore"
-msgstr "&Anwybyddu"
-
-#: protocols/oscar/icq/icqcontact.cpp:719
-#, fuzzy
-msgid "Select Encoding..."
-msgstr "Dewis..."
-
-#: protocols/oscar/icq/icqaccount.cpp:130
-#, fuzzy
-msgid "In&visible"
-msgstr "Segur"
-
-#: protocols/oscar/icq/icqpresence.cpp:72
-msgid "&Do Not Disturb"
-msgstr ""
-
-#: protocols/jabber/jabbercontact.cpp:164
-#: protocols/oscar/icq/icqpresence.cpp:72
-msgid "Do Not Disturb"
-msgstr ""
-
-#: protocols/oscar/icq/icqpresence.cpp:72
-msgid "Do Not Disturb (Invisible)"
-msgstr ""
-
-#: protocols/oscar/icq/icqpresence.cpp:73
-msgid "O&ccupied"
-msgstr ""
-
-#: protocols/oscar/icq/icqpresence.cpp:73
-msgid "Occupied"
-msgstr ""
-
-#: protocols/oscar/icq/icqpresence.cpp:73
-#, fuzzy
-msgid "Occupied (Invisible)"
-msgstr "Segur"
-
-#: protocols/oscar/icq/icqpresence.cpp:74
-msgid "Not A&vailable"
-msgstr "Dim a&r gael"
-
-#: protocols/oscar/icq/icqpresence.cpp:74
-msgid "Not Available"
-msgstr "Dim ar gael"
-
-#: protocols/oscar/icq/icqpresence.cpp:74
-#, fuzzy
-msgid "Not Available (Invisible)"
-msgstr "A&r gael"
-
-#: protocols/oscar/icq/icqpresence.cpp:75
-#, fuzzy
-msgid "Away (Invisible)"
-msgstr "Segur"
-
-#: protocols/oscar/icq/icqpresence.cpp:76
-msgid "&Free for Chat"
-msgstr ""
-
-#: protocols/oscar/icq/icqpresence.cpp:76
-msgid "Free For Chat"
-msgstr ""
-
-#: protocols/oscar/icq/icqpresence.cpp:76
-#, fuzzy
-msgid "Free For Chat (Invisible)"
-msgstr "Segur"
-
-#: protocols/oscar/icq/icqpresence.cpp:77
-#, fuzzy
-msgid "Online (Invisible)"
-msgstr "Segur"
-
-#: protocols/oscar/icq/icqpresence.cpp:133
-msgid "Waiting for Authorization"
-msgstr "Yn aros am awdurdodiad"
-
-#: protocols/oscar/icq/icqreadaway.cpp:34
-msgid "&Fetch Again"
-msgstr ""
-
-#: protocols/oscar/icq/icqreadaway.cpp:40
-#: protocols/oscar/icq/icqreadaway.cpp:82
-msgid "'%2' Message for %1"
-msgstr ""
-
-#: protocols/oscar/icq/icqreadaway.cpp:77
-msgid "Fetching '%2' Message for %1..."
+"This means Kopete can't 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 ""
 
-#: protocols/oscar/oscarlistnonservercontacts.cpp:28
-#, fuzzy
-msgid "Add Contacts to Server List"
-msgstr "&Ychwanegu Cyswllt"
-
-#: protocols/oscar/oscarlistnonservercontacts.cpp:34
-msgid "Do &Not Add"
-msgstr "&Na Ychwaneger"
-
-#: protocols/oscar/oscarcontact.cpp:174
-#, fuzzy
-msgid "Mobile AIM Client"
-msgstr "Gwaredu Cyswllt"
+#: libkopete/kopeteutils.cpp:55
+msgid "More Information..."
+msgstr "Mwy o Wybodaeth..."
 
-#: protocols/oscar/oscarcontact.cpp:180
+#: libkopete/kopetemimetypehandler.cpp:153
 #, c-format
-msgid ""
-"_: Translators: client name and version\n"
-"%1"
-msgstr "%1"
-
-#: protocols/oscar/oscarcontact.cpp:186
-msgid "Buddy icons"
-msgstr ""
-
-#: protocols/oscar/oscarcontact.cpp:190
-msgid "Rich text messages"
-msgstr ""
-
-#: protocols/oscar/oscarcontact.cpp:192
-#, fuzzy
-msgid "Group chat"
-msgstr "Gr?p"
-
-#: protocols/oscar/oscarcontact.cpp:194
-#, fuzzy
-msgid "Voice chat"
-msgstr "Llais"
-
-#: protocols/oscar/oscarcontact.cpp:198
-msgid "Send buddy list"
-msgstr ""
-
-#: protocols/oscar/oscarcontact.cpp:200
-#, fuzzy
-msgid "File transfers"
-msgstr "Hidlenni"
-
-#: protocols/oscar/oscarcontact.cpp:204
-msgid "Trillian user"
-msgstr ""
-
-#: protocols/oscar/oscarencodingselectiondialog.cpp:28
-#, fuzzy
-msgid "Select Encoding"
-msgstr "A&mgodiad"
-
-#: protocols/oscar/oscaraccount.cpp:237 protocols/oscar/oscaraccount.cpp:616
-#: protocols/oscar/oscaraccount.cpp:622
-msgid "Buddies"
-msgstr ""
-
-#: protocols/oscar/oscaraccount.cpp:406
-msgid "ICQ Web Express"
-msgstr ""
-
-#: protocols/oscar/oscaraccount.cpp:408
-#, fuzzy
-msgid "ICQ Email Express"
-msgstr "Cyfeiriad Ebost"
-
-#: protocols/oscar/oscaraccount.cpp:730 protocols/oscar/oscaraccount.cpp:747
-msgid ""
-"_: account has been disconnected\n"
-"%1 disconnected"
-msgstr "Datgysylltwyd %1"
-
-#: protocols/oscar/oscaraccount.cpp:771
-msgid ""
-"There was an error in the protocol handling; it was not fatal, so you will not "
-"be disconnected."
-msgstr ""
-
-#: protocols/oscar/oscaraccount.cpp:773
-msgid ""
-"There was an error in the protocol handling; automatic reconnection occurring."
-msgstr ""
-
-#: protocols/oscar/oscaraccount.cpp:775
-#, fuzzy
-msgid "OSCAR Protocol error"
-msgstr "Gwall protocol."
-
-#: protocols/oscar/oscaraccount.cpp:810
-msgid ""
-"_: ICQ user id\n"
-"UIN"
-msgstr ""
-
-#: protocols/oscar/oscaraccount.cpp:810
-msgid ""
-"_: AIM user id\n"
-"screen name"
-msgstr ""
-
-#: protocols/oscar/oscaraccount.cpp:820
-msgid ""
-"You have logged in more than once with the same %1, account %2 is now "
-"disconnected."
-msgstr ""
-
-#: protocols/oscar/oscaraccount.cpp:826
-msgid ""
-"Sign on failed because either your %1 or password are invalid. Please check "
-"your settings for account %2."
-msgstr ""
-
-#: protocols/oscar/oscaraccount.cpp:834
-msgid "The %1 service is temporarily unavailable. Please try again later."
-msgstr ""
-
-#: protocols/oscar/oscaraccount.cpp:839
-msgid ""
-"Could not sign on to %1 with account %2 because the password was incorrect."
-msgstr ""
-
-#: protocols/oscar/oscaraccount.cpp:844
-msgid "Could not sign on to %1 with nonexistent account %2."
-msgstr ""
-
-#: protocols/oscar/oscaraccount.cpp:848
-msgid "Sign on to %1 failed because your account %2 expired."
-msgstr ""
-
-#: protocols/oscar/oscaraccount.cpp:852
-msgid "Sign on to %1 failed because your account %2 is currently suspended."
-msgstr ""
-
-#: protocols/oscar/oscaraccount.cpp:858
-msgid ""
-"Could not sign on to %1 as there are too many clients from the same computer."
-msgstr ""
-
-#: protocols/oscar/oscaraccount.cpp:864
-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/oscaraccount.cpp:873
-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/oscaraccount.cpp:885 protocols/oscar/oscaraccount.cpp:905
-msgid "Sign on to %1 with your account %2 failed."
-msgstr ""
-
-#: protocols/oscar/oscaraccount.cpp:892
-msgid ""
-"The %1 server thinks the client you are using is too old. Please report this as "
-"a bug at http://bugs.kde.org"
+msgid "Unable to find the file %1."
 msgstr ""
 
-#: protocols/oscar/oscaraccount.cpp:898
+#: libkopete/kopetemimetypehandler.cpp:157
 msgid ""
-"Account %1 was disabled on the %2 server because of your age (less than 13)."
-msgstr ""
-
-#: protocols/oscar/oscarvisibilitydialog.cpp:29
-#, fuzzy
-msgid "Add Contacts to Visible or Invisible List"
-msgstr "&Ychwanegu Cyswllt"
-
-#: protocols/oscar/liboscar/userdetails.cpp:328
-#, fuzzy
-msgid "MICQ"
-msgstr "ICQ"
-
-#: protocols/oscar/liboscar/userdetails.cpp:333
-#, fuzzy
-msgid "SIM"
-msgstr "AIM"
-
-#: protocols/oscar/liboscar/userdetails.cpp:338
-msgid "Trillian"
-msgstr ""
-
-#: protocols/oscar/liboscar/userdetails.cpp:343
-#, fuzzy
-msgid "MacICQ"
-msgstr "ICQ"
-
-#: protocols/oscar/liboscar/userdetails.cpp:350
-msgid "Licq SSL"
-msgstr ""
-
-#: protocols/oscar/liboscar/userdetails.cpp:352
-msgid "Licq"
-msgstr ""
-
-#: protocols/yahoo/ui/yahoouserinfodialog.cpp:43
-#, fuzzy
-msgid "Yahoo User Information"
-msgstr "Gwybodaeth Defnyddiwr"
-
-#: protocols/yahoo/ui/yahoouserinfodialog.cpp:43
-msgid "Save and Close"
-msgstr ""
-
-#: protocols/yahoo/ui/yahoouserinfodialog.cpp:43
-msgid "Merge with existing entry"
-msgstr ""
-
-#: protocols/yahoo/ui/yahoouserinfodialog.cpp:49
-#, fuzzy
-msgid "General Yahoo Information"
-msgstr "Gwybodaeth Defnyddiwr"
-
-#: protocols/yahoo/ui/yahoouserinfodialog.cpp:63
-#, fuzzy
-msgid "Other Yahoo Information"
-msgstr "Gwybodaeth Defnyddiwr"
-
-#: protocols/yahoo/ui/yahoouserinfodialog.cpp:211
-#, fuzzy
-msgid "Replace existing entry"
-msgstr "Amnewidiad"
-
-#: protocols/yahoo/ui/yahoowebcamdialog.cpp:45
-msgid "No webcam image received"
-msgstr ""
-
-#: protocols/yahoo/ui/yahoowebcamdialog.cpp:80
-msgid "%1 has stopped broadcasting"
-msgstr ""
-
-#: protocols/yahoo/ui/yahoowebcamdialog.cpp:82
-msgid "%1 has cancelled viewing permission"
-msgstr ""
-
-#: protocols/yahoo/ui/yahoowebcamdialog.cpp:84
-msgid "%1 has declined permission to view webcam"
-msgstr ""
-
-#: protocols/yahoo/ui/yahoowebcamdialog.cpp:86
-msgid "%1 does not have his/her webcam online"
-msgstr ""
-
-#: protocols/yahoo/ui/yahoowebcamdialog.cpp:88
-msgid "Unable to view the webcam of %1 for an unknown reason"
-msgstr ""
-
-#: protocols/yahoo/ui/yahoowebcamdialog.cpp:97
-msgid "%1 viewer(s)"
-msgstr ""
-
-#: protocols/yahoo/yahoocontact.cpp:117
-msgid "%1|Stealthed"
-msgstr ""
-
-#: protocols/yahoo/yahoocontact.cpp:369
-msgid "View &Webcam"
-msgstr ""
-
-#: protocols/yahoo/yahoochatsession.cpp:59
-#: protocols/yahoo/yahoocontact.cpp:380
-msgid "Invite to view your Webcam"
+"<qt>Unable to download the requested file;"
+"<br>please check that address %1 is correct.</qt>"
 msgstr ""
 
-#: protocols/yahoo/yahoocontact.cpp:391
-#, fuzzy
-msgid "&Buzz Contact"
-msgstr "&Ychwanegu Cyswllt"
-
-#: protocols/yahoo/yahoocontact.cpp:401
-#, fuzzy
-msgid "&Stealth Setting"
-msgstr "&Cadw Gosodiadau"
-
-#: protocols/yahoo/yahoocontact.cpp:411
-msgid "&Invite to Conference"
-msgstr ""
+#: libkopete/kopeteawayaction.cpp:86
+msgid "New Message..."
+msgstr "Neges Newydd..."
 
-#: protocols/yahoo/yahoocontact.cpp:421
-msgid "&View Yahoo Profile"
+#: libkopete/kopeteawayaction.cpp:113
+msgid "New Away Message"
 msgstr ""
 
-#: protocols/yahoo/yahoocontact.cpp:465
-#, fuzzy
-msgid "Stealth Setting"
-msgstr "&Cadw Gosodiadau"
-
-#: protocols/yahoo/yahoocontact.cpp:519
-msgid "Buzzz!!!"
+#: libkopete/kopeteawayaction.cpp:113
+msgid "Please enter your away reason:"
 msgstr ""
 
-#: protocols/yahoo/yahoocontact.cpp:602 protocols/yahoo/yahoocontact.cpp:657
-msgid ""
-"I cannot find the jasper image convert program.\n"
-"jasper is required to render the yahoo webcam images.\n"
-"Please see %1 for further information."
+#: libkopete/private/kopeteviewmanager.cpp:225
+msgid "<qt>Incoming message from %1<br>\"%2\"</qt>"
 msgstr ""
 
-#: protocols/yahoo/libkyahoo/sendmessagetask.cpp:42
-msgid "An error occured sending the message"
+#: libkopete/private/kopeteviewmanager.cpp:234
+msgid "<qt>A highlighted message arrived from %1<br>\"%2\"</qt>"
 msgstr ""
 
-#: protocols/yahoo/libkyahoo/sendmessagetask.cpp:42
-msgid "The message is empty."
+#: libkopete/private/kopetecommand.cpp:64
+msgid "Enter Arguments"
 msgstr ""
 
-#: protocols/yahoo/libkyahoo/modifyyabtask.cpp:93
-#: protocols/yahoo/libkyahoo/modifyyabtask.cpp:120
-msgid "An error occured saving the Addressbook entry."
+#: libkopete/private/kopetecommand.cpp:64
+msgid "Enter the arguments to %1:"
 msgstr ""
 
-#: protocols/yahoo/libkyahoo/modifyyabtask.cpp:178
-msgid ""
-"The Yahoo Addressbook entry could not be saved:\n"
-"%1 - %2"
+#: libkopete/private/kopetecommand.cpp:77
+msgid "Alias \"%1\" expands to itself."
 msgstr ""
 
-#: protocols/yahoo/libkyahoo/modifyyabtask.cpp:185
+#: libkopete/private/kopetecommand.cpp:82
 msgid ""
-"The Yahoo Addressbook entry could not be created:\n"
-"%1 - %2"
+"_n: \"%1\" requires at least %n argument.\n"
+"\"%1\" requires at least %n arguments."
 msgstr ""
 
-#: protocols/yahoo/libkyahoo/modifyyabtask.cpp:192
+#: libkopete/private/kopetecommand.cpp:88
 msgid ""
-"The Yahoo Addressbook entry could not be deleted:\n"
-"%1 - %2"
+"_n: \"%1\" has a maximum of %n argument.\n"
+"\"%1\" has a maximum of %n arguments."
 msgstr ""
 
-#: protocols/yahoo/libkyahoo/webcamtask.cpp:200
-msgid ""
-"Webcam connection to the user %1 could not be established.\n"
-"\n"
-"Please relogin and try again."
+#: libkopete/private/kopetecommand.cpp:93
+msgid "You are not authorized to perform the command \"%1\"."
 msgstr ""
 
-#: protocols/yahoo/libkyahoo/webcamtask.cpp:526
-msgid "An error occured closing the webcam session. "
+#: libkopete/private/kopetecommand.cpp:132
+msgid "Command Error"
 msgstr ""
 
-#: protocols/yahoo/libkyahoo/webcamtask.cpp:526
-msgid "You tried to close a connection that didn't exist."
+#: libkopete/kopeteawaydialog.cpp:37
+msgid "Global Away Message"
 msgstr ""
 
-#: protocols/yahoo/libkyahoo/receivefiletask.cpp:54
-#: protocols/yahoo/libkyahoo/receivefiletask.cpp:173
-#, fuzzy
-msgid "Could not open file for writing."
-msgstr "Methu agor ffeil ar gyfer ysgrifennu"
-
-#: protocols/yahoo/libkyahoo/receivefiletask.cpp:142
-msgid "An error occured while downloading the file."
-msgstr ""
+#: libkopete/kopeteglobal.cpp:118
+msgid "Idle Time"
+msgstr "Amser segur"
 
-#: protocols/yahoo/libkyahoo/picturenotifiertask.cpp:148
-#: protocols/yahoo/libkyahoo/sendpicturetask.cpp:78
-msgid "The picture was not successfully uploaded"
+#: libkopete/kopeteglobal.cpp:124
+msgid "Online Since"
 msgstr ""
 
-#: protocols/yahoo/libkyahoo/sendfiletask.cpp:93
-msgid "An error occured sending the file."
+#: libkopete/kopeteglobal.cpp:130
+msgid "Last Seen"
 msgstr ""
 
-#: protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp:85
-msgid "An error occured while downloading buddy icon (%1)"
+#: libkopete/kopeteglobal.cpp:136
+msgid "Away Message"
 msgstr ""
 
-#: protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp:98
-msgid "Fatal Error occured while downloading buddy icon."
+#: libkopete/kopeteglobal.cpp:154
+msgid "Private Phone"
 msgstr ""
 
-#: protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp:98
-msgid "IconLoadJob has an empty KTempFile pointer."
+#: libkopete/kopeteglobal.cpp:160
+msgid "Private Mobile Phone"
 msgstr ""
 
-#: protocols/yahoo/libkyahoo/statusnotifiertask.cpp:105
-#, fuzzy
-msgid "An unknown error has occured."
-msgstr "Gwall anhysbys."
-
-#: protocols/yahoo/libkyahoo/yabtask.cpp:121
-msgid "Could not retrieve server side addressbook for user info."
+#: libkopete/kopeteglobal.cpp:166
+msgid "Work Phone"
 msgstr ""
 
-#: protocols/yahoo/libkyahoo/sendpicturetask.cpp:107
-#, c-format
-msgid "Error opening file: %1"
+#: libkopete/kopeteglobal.cpp:172
+msgid "Work Mobile Phone"
 msgstr ""
 
-#: protocols/yahoo/yahooaccount.cpp:100
-#, fuzzy
-msgid "Open &Addressbook..."
-msgstr "&Cyfeiriad ebost:"
-
-#: protocols/yahoo/yahooaccount.cpp:101
-#, fuzzy
-msgid "&Edit my contact details..."
-msgstr "&Allforio Cyswlltau..."
-
-#: protocols/yahoo/yahooaccount.cpp:692
-msgid ""
-"Could not log into Yahoo service: your account has been locked.\n"
-"Visit %1 to reactivate it."
+#: libkopete/kopeteglobal.cpp:232
+msgid "Could not find suitable place to install emoticon themes into."
 msgstr ""
 
-#: protocols/yahoo/yahooaccount.cpp:701
-msgid ""
-"Could not log into the Yahoo service: the username specified was invalid."
+#: libkopete/kopeteglobal.cpp:238
+msgid "Installing Emoticon Themes..."
 msgstr ""
 
-#: protocols/yahoo/yahooaccount.cpp:710
-msgid ""
-"You have been logged out of the Yahoo service, possibly due to a duplicate "
-"login."
+#: libkopete/kopeteglobal.cpp:260
+msgid "Could not open \"%1\" for unpacking."
 msgstr ""
 
-#: protocols/yahoo/yahooaccount.cpp:741
-msgid ""
-"%1 has been disconnected.\n"
-"Error message:\n"
-"%2 - %3"
+#: libkopete/kopeteglobal.cpp:285
+msgid "<qt>The file \"%1\" is not a valid emoticon theme archive.</qt>"
 msgstr ""
 
-#: protocols/yahoo/yahooaccount.cpp:754
-msgid ""
-"There was an error while connecting %1 to the Yahoo server.\n"
-"Error message:\n"
-"%2 - %3"
+#: libkopete/kopeteglobal.cpp:296
+msgid "<qt>Installing <strong>%1</strong> emoticon theme</qt>"
 msgstr ""
 
-#: protocols/yahoo/yahooaccount.cpp:765 protocols/yahoo/yahooaccount.cpp:768
+#: libkopete/kopeteglobal.cpp:334
 msgid ""
-"%1\n"
-"\n"
-"Reason: %2 - %3"
-msgstr ""
-
-#: protocols/yahoo/yahooaccount.cpp:766 protocols/yahoo/yahooaccount.cpp:769
-#: protocols/yahoo/yahooaccount.cpp:1348 protocols/yahoo/yahooaccount.cpp:1535
-#: protocols/yahoo/yahooaccount.cpp:1639 protocols/yahoo/yahooaccount.cpp:1654
-#: protocols/yahoo/yahooeditaccount.cpp:180
-#: protocols/yahoo/yahooeditaccount.cpp:186
-msgid "Yahoo Plugin"
-msgstr ""
-
-#: protocols/yahoo/yahooaccount.cpp:790
-msgid "User %1 has granted your authorization request."
+"<qt>A problem occurred during the installation process. However, some of the "
+"emoticon themes in the archive may have been installed.</qt>"
 msgstr ""
 
-#: protocols/yahoo/yahooaccount.cpp:802
-msgid ""
-"User %1 has granted your authorization request.\n"
-"%2"
+#: libkopete/kopeteaccount.cpp:142
+msgid "You have been disconnected"
 msgstr ""
 
-#: protocols/yahoo/yahooaccount.cpp:1048
-msgid ""
-"_: This string is shown when the user is buzzed by a contact\n"
-"Buzz!!"
+#: libkopete/kopeteaccount.cpp:142
+msgid "You have connected from another client or computer to the account '%1'"
 msgstr ""
 
-#: protocols/yahoo/yahooaccount.cpp:1085
+#: libkopete/kopeteaccount.cpp:142
 msgid ""
-"%1 has invited you to join a conference with %2.\n"
-"\n"
-"His message: %3\n"
-"\n"
-" Accept?"
-msgstr ""
-
-#: protocols/yahoo/yahooaccount.cpp:1179
-msgid "%1 declined to join the conference: \"%2\""
+"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 ""
 
-#: protocols/yahoo/yahooaccount.cpp:1491
-#, c-format
+#: libkopete/kopeteaccount.cpp:258 libkopete/kopeteaccount.cpp:324
 msgid ""
-"_n: You have one unread message in your Yahoo inbox.\n"
-"You have %n unread messages in your Yahoo inbox."
-msgstr ""
-
-#: protocols/yahoo/yahooaccount.cpp:1497
-msgid "You have a message from %1 in your Yahoo inbox."
+"You are not allowed to add yourself to the contact list. The addition of \"%1\" "
+"to account \"%2\" will not take place."
 msgstr ""
 
-#: protocols/yahoo/yahooaccount.cpp:1526
-msgid "%1 has invited you to view his/her webcam. Accept?"
+#: libkopete/kopeteaccount.cpp:258 libkopete/kopeteaccount.cpp:324
+msgid "Error Creating Contact"
 msgstr ""
 
-#: protocols/yahoo/yahooaccount.cpp:1535
-#, fuzzy
-msgid "Webcam for %1 is not available."
-msgstr "A&r gael"
-
-#: protocols/yahoo/yahooaccount.cpp:1639
-#: protocols/yahoo/yahooeditaccount.cpp:186
+#: libkopete/kopetepasswordedaccount.cpp:83
 msgid ""
-"<qt>The selected buddy icon could not be opened. "
-"<br>Please set a new buddy icon.</qt>"
-msgstr ""
-
-#: protocols/yahoo/yahooaccount.cpp:1654
-#: protocols/yahoo/yahooeditaccount.cpp:180
-msgid "An error occurred when trying to change the display picture."
-msgstr ""
-
-#: protocols/yahoo/yahooaccount.cpp:1749
-msgid "%1 wants to view your webcam. Grant access?"
-msgstr ""
-
-#: protocols/yahoo/yahooprotocol.cpp:44
-msgid "Be right back"
-msgstr ""
-
-#: protocols/yahoo/yahooprotocol.cpp:46
-msgid "Not at home"
-msgstr ""
-
-#: protocols/yahoo/yahooprotocol.cpp:47
-msgid "Not at my desk"
-msgstr ""
-
-#: protocols/yahoo/yahooprotocol.cpp:48
-msgid "Not in the office"
-msgstr ""
-
-#: protocols/yahoo/yahooprotocol.cpp:49
-msgid "On the phone"
-msgstr ""
-
-#: protocols/yahoo/yahooprotocol.cpp:50
-msgid "On vacation"
-msgstr ""
-
-#: protocols/yahoo/yahooprotocol.cpp:51
-msgid "Out to lunch"
-msgstr ""
-
-#: protocols/yahoo/yahooprotocol.cpp:52
-msgid "Stepped out"
-msgstr ""
-
-#: protocols/yahoo/yahooprotocol.cpp:54
-msgid "Custom"
-msgstr "Addasiedig"
-
-#: protocols/yahoo/yahooprotocol.cpp:58
-msgid "Buddy Icon Checksum"
-msgstr ""
-
-#: protocols/yahoo/yahooprotocol.cpp:59
-msgid "Buddy Icon Expire"
-msgstr ""
-
-#: protocols/yahoo/yahooprotocol.cpp:60
-msgid "Buddy Icon Remote Url"
-msgstr ""
-
-#: protocols/groupwise/ui/gwcontactproperties.cpp:114
-#: protocols/yahoo/yahooprotocol.cpp:65
-msgid "Title"
-msgstr "Teitl"
-
-#: protocols/yahoo/yahooprotocol.cpp:68
-msgid "YAB Id"
-msgstr ""
-
-#: protocols/yahoo/yahooprotocol.cpp:69
-#, fuzzy
-msgid "Pager number"
-msgstr "Rhifau ffôn"
-
-#: protocols/yahoo/yahooprotocol.cpp:70
-msgid "Fax number"
-msgstr ""
-
-#: protocols/yahoo/yahooprotocol.cpp:71
-msgid "Additional number"
-msgstr ""
-
-#: protocols/yahoo/yahooprotocol.cpp:72 protocols/yahoo/yahooprotocol.cpp:73
-msgid "Alternative email 1"
-msgstr ""
-
-#: protocols/yahoo/yahooprotocol.cpp:76
-msgid "MSN"
-msgstr ""
-
-#: protocols/yahoo/yahooprotocol.cpp:77
-msgid "GoogleTalk"
-msgstr ""
-
-#: protocols/yahoo/yahooprotocol.cpp:78
-#, fuzzy
-msgid "Skype"
-msgstr "Gofodnod"
-
-#: protocols/yahoo/yahooprotocol.cpp:80
-msgid "QQ"
-msgstr ""
-
-#: protocols/yahoo/yahooprotocol.cpp:81
-#, fuzzy
-msgid "Private Address"
-msgstr "Cyfeiriad IP"
-
-#: protocols/yahoo/yahooprotocol.cpp:82
-#, fuzzy
-msgid "Private City"
-msgstr "Preifatwydd"
-
-#: protocols/yahoo/yahooprotocol.cpp:83
-msgid "Private State"
-msgstr ""
-
-#: protocols/yahoo/yahooprotocol.cpp:84
-msgid "Private ZIP"
-msgstr ""
-
-#: protocols/yahoo/yahooprotocol.cpp:85
-#, fuzzy
-msgid "Private Country"
-msgstr "Gwlad:"
-
-#: protocols/yahoo/yahooprotocol.cpp:87
-msgid "Private URL"
-msgstr ""
-
-#: protocols/yahoo/yahooprotocol.cpp:88
-#, fuzzy
-msgid "Corporation"
-msgstr "Gwiriad"
-
-#: protocols/yahoo/yahooprotocol.cpp:89
-#, fuzzy
-msgid "Work Address"
-msgstr "Cyfeiriad &Gwaith"
-
-#: protocols/jabber/jabberprotocol.cpp:109
-#: protocols/yahoo/yahooprotocol.cpp:90
-#, fuzzy
-msgid "Work City"
-msgstr "Dinas"
-
-#: protocols/yahoo/yahooprotocol.cpp:91
-#, fuzzy
-msgid "Work State"
-msgstr "Stryd:"
-
-#: protocols/yahoo/yahooprotocol.cpp:92
-#, fuzzy
-msgid "Work ZIP"
-msgstr "&Gwybodaeth am Ddefnyddwyr"
-
-#: protocols/jabber/jabberprotocol.cpp:111
-#: protocols/yahoo/yahooprotocol.cpp:93
-#, fuzzy
-msgid "Work Country"
-msgstr "Gwlad:"
-
-#: protocols/yahoo/yahooprotocol.cpp:95
-#, fuzzy
-msgid "Work URL"
-msgstr "Gwaith :"
-
-#: protocols/jabber/jabberprotocol.cpp:99 protocols/yahoo/yahooprotocol.cpp:96
-msgid "Birthday"
-msgstr "Penblwydd"
-
-#: protocols/yahoo/yahooprotocol.cpp:97
-msgid "Anniversary"
-msgstr ""
-
-#: protocols/yahoo/yahooprotocol.cpp:98
-#, fuzzy
-msgid "Notes"
-msgstr "&Nodiadau"
-
-#: protocols/yahoo/yahooprotocol.cpp:99
-msgid "Additional 1"
-msgstr ""
-
-#: protocols/yahoo/yahooprotocol.cpp:100
-msgid "Additional 2"
-msgstr ""
-
-#: protocols/yahoo/yahooprotocol.cpp:101
-msgid "Additional 3"
-msgstr ""
-
-#: protocols/yahoo/yahooprotocol.cpp:102
-msgid "Additional 4"
+"<b>The password was wrong;</b> please re-enter your password for %1 account <b>"
+"%2</b>"
 msgstr ""
 
-#: protocols/yahoo/yahooeditaccount.cpp:108
-#: protocols/yahoo/yahooeditaccount.cpp:113
-msgid "Yahoo"
-msgstr "Yahoo"
-
-#: protocols/yahoo/yahooeditaccount.cpp:113
-msgid "<qt>You must enter a valid password.</qt>"
+#: libkopete/kopetepasswordedaccount.cpp:85
+msgid "Please enter your password for %1 account <b>%2</b>"
 msgstr ""
 
-#: protocols/yahoo/yahooeditaccount.cpp:167
-msgid "Yahoo Buddy Icon"
+#: libkopete/ui/kopetestdaction.cpp:43
+msgid "&Configure Kopete..."
 msgstr ""
 
-#: protocols/yahoo/yahooverifyaccount.cpp:41
-msgid "Account Verification - Yahoo"
+#: libkopete/ui/kopetestdaction.cpp:73
+msgid "Start &Chat..."
 msgstr ""
 
-#: protocols/yahoo/yahoochatsession.cpp:56
-#, fuzzy
-msgid "Buzz Contact"
-msgstr "&Ychwanegu Cyswllt"
+#: libkopete/ui/kopetestdaction.cpp:78
+msgid "&Send Single Message..."
+msgstr "&Anfon Neges Sengl..."
 
-#: protocols/yahoo/yahoochatsession.cpp:57
-#, fuzzy
-msgid "Show User Info"
+#: libkopete/ui/kopetestdaction.cpp:83
+msgid "User &Info"
 msgstr "Gwybo&daeth am Ddefnyddwyr"
 
-#: protocols/yahoo/yahoochatsession.cpp:58
-msgid "Request Webcam"
-msgstr ""
-
-#: protocols/yahoo/yahoochatsession.cpp:65
-msgid "Yahoo Display Picture"
-msgstr ""
-
-#: protocols/yahoo/yahooconferencemessagemanager.cpp:50
-#, fuzzy
-msgid "&Invite others"
-msgstr "G&wahodd"
-
-#: protocols/meanwhile/meanwhileaccount.cpp:141
-msgid "&Change Status Message"
-msgstr ""
-
-#: protocols/meanwhile/meanwhileaccount.cpp:204
-msgid "Meanwhile Plugin: Message from server"
-msgstr ""
-
-#: protocols/meanwhile/meanwhileprotocol.cpp:63
-msgid "Status Message"
-msgstr ""
-
-#: protocols/meanwhile/meanwhileeditaccountwidget.cpp:152
-#: protocols/meanwhile/meanwhileeditaccountwidget.cpp:159
-#: protocols/meanwhile/meanwhileeditaccountwidget.cpp:166
-#: protocols/meanwhile/meanwhileeditaccountwidget.cpp:173
-#: protocols/meanwhile/meanwhilesession.cpp:202
-msgid "Meanwhile Plugin"
-msgstr ""
-
-#: protocols/meanwhile/meanwhileeditaccountwidget.cpp:158
-msgid ""
-"<qt>You must deselect password remembering or enter a valid password.</qt>"
-msgstr ""
-
-#: protocols/meanwhile/meanwhileeditaccountwidget.cpp:165
-msgid "<qt>You must enter the server's hostname/ip address.</qt>"
-msgstr ""
+#: libkopete/ui/kopetestdaction.cpp:88
+msgid "Send &File..."
+msgstr "Anfon& Ffeil..."
 
-#: protocols/meanwhile/meanwhileeditaccountwidget.cpp:172
-msgid "<qt>0 is not a valid port number.</qt>"
+#: libkopete/ui/kopetestdaction.cpp:93
+msgid "View &History..."
 msgstr ""
 
-#: protocols/meanwhile/meanwhilesession.cpp:202
-msgid "Could not connect to server"
+#: libkopete/ui/kopetestdaction.cpp:98
+msgid "&Create Group..."
 msgstr ""
 
-#: protocols/meanwhile/meanwhilesession.cpp:961
-msgid "Meanwhile Plugin: Conference invitation"
+#: libkopete/ui/kopetestdaction.cpp:103
+msgid "Cha&nge Meta Contact..."
 msgstr ""
 
-#: protocols/jabber/ui/jabberregisteraccount.cpp:51
-msgid "Register New Jabber Account"
-msgstr ""
+#: libkopete/ui/kopetestdaction.cpp:108
+msgid "&Delete Contact"
+msgstr "&Dileu y Cyswllt"
 
-#: protocols/jabber/ui/jabberregisteraccount.cpp:63
-msgid "Register"
+#: libkopete/ui/kopetestdaction.cpp:113
+msgid "Change A&lias..."
 msgstr ""
 
-#: protocols/jabber/ui/jabberregisteraccount.cpp:128
-msgid "Please enter a server name, or click Choose."
-msgstr ""
+#: libkopete/ui/kopetestdaction.cpp:118
+msgid "&Block Contact"
+msgstr "&Atal Cyswllt"
 
-#: protocols/jabber/ui/jabberregisteraccount.cpp:139
-msgid "Please enter a valid Jabber ID."
-msgstr ""
+#: libkopete/ui/kopetestdaction.cpp:123
+msgid "Un&block Contact"
+msgstr "&Dadatal y Cyswllt"
 
-#: protocols/jabber/ui/jabberregisteraccount.cpp:193
-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\"."
+#: libkopete/ui/addressbookselectorwidget.cpp:147
+msgid "New Address Book Entry"
 msgstr ""
 
-#: protocols/jabber/ui/jabberregisteraccount.cpp:248
-msgid "Connecting to server..."
+#: libkopete/ui/addressbookselectorwidget.cpp:147
+msgid "Name the new entry:"
 msgstr ""
 
-#: protocols/groupwise/gwaccount.cpp:251
-#: protocols/jabber/jabberaccount.cpp:424
-#: protocols/jabber/ui/jabberregisteraccount.cpp:267
-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."
+#: libkopete/ui/addressbooklinkwidget.cpp:77
+msgid "Choose the corresponding entry for '%1'"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:426
-#: protocols/jabber/ui/jabberregisteraccount.cpp:269
-msgid "Jabber SSL Error"
+#: libkopete/ui/addressbooklinkwidget.cpp:79
+msgid "Choose the corresponding entry in the address book"
 msgstr ""
 
-#: protocols/jabber/ui/jabberregisteraccount.cpp:314
-msgid "Protocol error."
-msgstr "Gwall protocol."
-
-#: protocols/jabber/ui/jabberregisteraccount.cpp:327
-msgid "Connected successfully, registering new account..."
-msgstr ""
+#: libkopete/ui/kopetefileconfirmdialog.cpp:36
+msgid "&Refuse"
+msgstr "&Gwrthod"
 
-#: protocols/jabber/ui/jabberregisteraccount.cpp:342
-msgid "Registration successful."
-msgstr ""
+#: libkopete/ui/kopetefileconfirmdialog.cpp:36
+msgid "&Accept"
+msgstr "&Derbyn"
 
-#: protocols/jabber/ui/jabberregisteraccount.cpp:376
-msgid "Registration failed."
-msgstr ""
+#: libkopete/ui/kopetefileconfirmdialog.cpp:64
+msgid "File Transfer"
+msgstr "Trosglwyddo ffeiliau"
 
-#: protocols/jabber/ui/jabberregisteraccount.cpp:378
+#: libkopete/ui/kopetefileconfirmdialog.cpp:86
 msgid ""
-"Unable to create account on the server. The Jabber ID is probably already in "
-"use."
-msgstr ""
-
-#: protocols/jabber/ui/jabberregisteraccount.cpp:379
-msgid "Jabber Account Registration"
-msgstr ""
-
-#: protocols/jabber/ui/dlgjabberchatroomslist.cpp:89
-msgid "Unable to retrieve the list of chat rooms."
+"The file '%1' already exists.\n"
+"Do you want to overwrite it ?"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:259
-#: protocols/jabber/ui/dlgjabberbrowse.cpp:63
-#: protocols/jabber/ui/dlgjabberchatroomslist.cpp:89
-#: protocols/jabber/ui/dlgjabberregister.cpp:53
-#: protocols/jabber/ui/dlgjabberservices.cpp:125
-msgid "Jabber Error"
-msgstr ""
+#: libkopete/ui/kopetefileconfirmdialog.cpp:87
+msgid "Overwrite File"
+msgstr "Trosysgrifo Ffeil"
 
-#: protocols/jabber/ui/jabbereditaccountwidget.cpp:149
-msgid ""
-"The changes you just made will take effect next time you log in with Jabber."
+#: libkopete/ui/kopetefileconfirmdialog.cpp:96
+msgid "You must provide a valid local filename"
 msgstr ""
 
-#: protocols/jabber/ui/jabbereditaccountwidget.cpp:150
-msgid "Jabber Changes During Online Jabber Session"
+#: libkopete/ui/contactaddednotifydialog.cpp:62
+msgid "Someone Has Added You"
 msgstr ""
 
-#: protocols/jabber/ui/jabbereditaccountwidget.cpp:205
+#: libkopete/ui/contactaddednotifydialog.cpp:73
 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/jabbereditaccountwidget.cpp:207
-msgid "Invalid Jabber ID"
-msgstr ""
-
-#: protocols/jabber/ui/dlgjabbervcard.cpp:64
-msgid "Jabber vCard"
-msgstr ""
-
-#: protocols/jabber/ui/dlgjabbervcard.cpp:64
-msgid "&Save User Info"
-msgstr ""
-
-#: protocols/jabber/ui/dlgjabbervcard.cpp:64
-msgid "&Fetch vCard"
-msgstr ""
-
-#: protocols/jabber/ui/dlgjabbervcard.cpp:299
-msgid "Saving vCard to server..."
-msgstr ""
-
-#: protocols/jabber/ui/dlgjabbervcard.cpp:421
-msgid "vCard save sucessful."
-msgstr ""
-
-#: protocols/jabber/ui/dlgjabbervcard.cpp:426
-msgid "Error: Unable to save vCard."
+"<qt><img src=\"kopete-account-icon:%1\" /> The contact <b>%2</b> "
+"has added you to his/her contactlist. (Account %3)</qt>"
 msgstr ""
 
-#: protocols/jabber/ui/dlgjabbervcard.cpp:434
-msgid "Fetching contact vCard..."
+#: libkopete/ui/userinfodialog.cpp:213
+msgid "Contact ID:"
 msgstr ""
 
-#: protocols/jabber/ui/dlgjabbervcard.cpp:457
-msgid "vCard fetching Done."
+#: libkopete/ui/userinfodialog.cpp:246
+msgid "User info:"
 msgstr ""
 
-#: protocols/jabber/ui/dlgjabbervcard.cpp:461
-msgid ""
-"Error: vCard could not be fetched correctly. Check connectivity with the Jabber "
-"server."
+#: libkopete/kopetecontact.cpp:212
+msgid "&Add to Your Contact List"
 msgstr ""
 
-#: protocols/jabber/ui/dlgjabbervcard.cpp:472
-#, fuzzy
-msgid "Jabber Photo"
-msgstr "Dynodiad Defnyddiwr"
-
-#: protocols/jabber/jabberbasecontact.cpp:651
-#: protocols/jabber/ui/dlgjabbervcard.cpp:480
-msgid "Downloading of Jabber contact photo failed!"
+#: libkopete/kopetecontact.cpp:270 libkopete/kopetecontact.cpp:318
+msgid "Move Contact"
 msgstr ""
 
-#: protocols/jabber/ui/dlgjabbervcard.cpp:535
-msgid ""
-"<qt>An error occurred when trying to change the photo."
-"<br>Make sure that you have selected a correct image file</qt>"
+#: libkopete/kopetecontact.cpp:276
+msgid "Select the meta contact to which you want to move this contact:"
 msgstr ""
 
-#: protocols/jabber/ui/dlgjabberchatjoin.cpp:34
-msgid "Join Jabber Groupchat"
+#: libkopete/kopetecontact.cpp:279
+msgid "Create a new metacontact for this contact"
 msgstr ""
 
-#: protocols/jabber/ui/dlgjabberservices.cpp:125
-#, c-format
+#: libkopete/kopetecontact.cpp:280
 msgid ""
-"Unable to retrieve the list of services.\n"
-"Reason: %1"
-msgstr ""
-
-#: protocols/jabber/ui/dlgjabberchangepassword.cpp:34
-#, fuzzy
-msgid "Change Jabber Password"
-msgstr "Cyfrinair anghywir."
-
-#: protocols/jabber/ui/dlgjabberchangepassword.cpp:56
-msgid "You entered your current password incorrectly."
-msgstr ""
-
-#: protocols/jabber/ui/dlgjabberchangepassword.cpp:57
-#: protocols/jabber/ui/dlgjabberchangepassword.cpp:65
-#: protocols/jabber/ui/dlgjabberchangepassword.cpp:73
-msgid "Password Incorrect"
-msgstr ""
-
-#: protocols/jabber/ui/dlgjabberchangepassword.cpp:64
-msgid "Your new passwords do not match. Please enter them again."
-msgstr ""
-
-#: protocols/jabber/ui/dlgjabberchangepassword.cpp:72
-msgid "For security reasons, you are not allowed to set an empty password."
+"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 ""
 
-#: protocols/jabber/ui/dlgjabberchangepassword.cpp:80
+#: libkopete/kopetecontact.cpp:315
 msgid ""
-"Your account needs to be connected before the password can be changed. Do you "
-"want to try to connect now?"
+"You are moving the contact `%1' to the meta contact `%2'.\n"
+"`%3' will be empty afterwards. Do you want to delete this contact?"
 msgstr ""
 
-#: protocols/jabber/ui/dlgjabberchangepassword.cpp:81
-#: protocols/jabber/ui/dlgjabberchangepassword.cpp:121
-msgid "Jabber Password Change"
-msgstr ""
+#: libkopete/kopetecontact.cpp:318
+msgid "&Keep"
+msgstr "&Cadw"
 
-#: protocols/jabber/ui/dlgjabberchangepassword.cpp:120
+#: libkopete/kopetecontact.cpp:452
 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."
+"This user is not reachable at the moment. Please try a protocol that supports "
+"offline sending, or wait until this user comes online."
 msgstr ""
 
-#: protocols/jabber/ui/dlgjabberchangepassword.cpp:128
+#: libkopete/kopetecontact.cpp:460
 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/jabberchooseserver.cpp:34
-msgid "Choose Jabber Server"
-msgstr ""
-
-#: protocols/jabber/ui/jabberchooseserver.cpp:44
-msgid "Retrieving server list..."
-msgstr "Nôl y rhestr weinyddion..."
-
-#: protocols/jabber/ui/jabberchooseserver.cpp:111
-msgid "Could not retrieve server list."
-msgstr ""
-
-#: protocols/jabber/ui/jabberchooseserver.cpp:126
-msgid "Could not parse the server list."
+"Are you sure you want to remove the contact  '%1' from your contact list?"
 msgstr ""
 
-#: protocols/jabber/ui/dlgjabberregister.cpp:53
+#: libkopete/kopetecontact.cpp:658
 msgid ""
-"Unable to retrieve registration form.\n"
-"Reason: \"%1\""
-msgstr ""
-
-#: protocols/jabber/ui/dlgjabberregister.cpp:95
-msgid "Registration sent successfully."
-msgstr ""
-
-#: protocols/jabber/ui/dlgjabberregister.cpp:95
-#: protocols/jabber/ui/dlgjabberregister.cpp:102
-msgid "Jabber Registration"
+"_: <b>DISPLAY NAME</b>"
+"<br><img src=\"%2\">&nbsp;CONTACT STATUS\n"
+"<b><nobr>%3</nobr></b>"
+"<br><img src=\"%2\">&nbsp;%1"
 msgstr ""
 
-#: protocols/jabber/ui/dlgjabberregister.cpp:102
+#: libkopete/kopetecontact.cpp:665
 msgid ""
-"The server denied the registration form.\n"
-"Reason: \"%1\""
-msgstr ""
-
-#: protocols/jabber/ui/jabberaddcontactpage.cpp:52
-msgid "Loading instruction from gateway..."
-msgstr ""
-
-#: protocols/jabber/ui/jabberaddcontactpage.cpp:63
-msgid "Connect to the Jabber network and try again."
-msgstr ""
-
-#: protocols/jabber/ui/jabberaddcontactpage.cpp:150
-msgid "An error occured while loading instructions from gateway."
-msgstr ""
-
-#: protocols/jabber/ui/dlgjabberbrowse.cpp:63
-msgid "Unable to retrieve search form."
-msgstr ""
-
-#: protocols/jabber/ui/dlgjabberbrowse.cpp:114
-msgid "The Jabber server declined the search."
-msgstr ""
-
-#: protocols/jabber/jabbercontact.cpp:135
-msgid "Authorization"
-msgstr "Awdurdodi"
-
-#: protocols/jabber/jabbercontact.cpp:139
-msgid "(Re)send Authorization To"
-msgstr ""
-
-#: protocols/jabber/jabbercontact.cpp:144
-msgid "(Re)request Authorization From"
-msgstr ""
-
-#: protocols/jabber/jabbercontact.cpp:149
-msgid "Remove Authorization From"
-msgstr ""
-
-#: protocols/jabber/jabbercontact.cpp:154
-msgid "Set Availability"
-msgstr ""
-
-#: protocols/jabber/jabbercontact.cpp:158
-msgid "Free to Chat"
-msgstr ""
-
-#: protocols/jabber/jabbercontact.cpp:162
-#: protocols/jabber/jabberprotocol.cpp:77
-msgid "Extended Away"
-msgstr ""
-
-#: protocols/jabber/jabbercontact.cpp:169
-msgid "Select Resource"
-msgstr ""
-
-#: protocols/jabber/jabbercontact.cpp:186
-msgid "Automatic (best/default resource)"
-msgstr ""
-
-#: protocols/jabber/jabberchatsession.cpp:67
-#: protocols/jabber/jabbercontact.cpp:233
-#, fuzzy
-msgid "Voice call"
-msgstr "Llais"
-
-#: protocols/jabber/jabbercontact.cpp:266
-msgid "The original message is : <i>\" %1 \"</i><br>"
+"_: <b>DISPLAY NAME</b> (CONTACT ID)"
+"<br><img src=\"%2\">&nbsp;CONTACT STATUS\n"
+"<nobr><b>%4</b> (%3)</nobr>"
+"<br><img src=\"%2\">&nbsp;%1"
 msgstr ""
 
-#: protocols/jabber/jabbercontact.cpp:267
+#: libkopete/kopetecontact.cpp:682
 msgid ""
-"<qt><i>%1</i> 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/jabber/jabbercontact.cpp:273
-msgid "Invited to a conference - Jabber Plugin"
-msgstr ""
-
-#: protocols/jabber/jabbercontact.cpp:290
-msgid "Message has been displayed"
-msgstr ""
-
-#: protocols/jabber/jabbercontact.cpp:292
-msgid "Message has been delivered"
-msgstr ""
-
-#: protocols/jabber/jabbercontact.cpp:295
-msgid "Message stored on the server, contact offline"
-msgstr ""
-
-#: protocols/jabber/jabbercontact.cpp:302
-msgid "%1 has ended their participation in the chat session."
-msgstr ""
-
-#: protocols/jabber/jabbercontact.cpp:340
-#: protocols/jabber/jabbergroupcontact.cpp:164
-#: protocols/jabber/jabbergroupmembercontact.cpp:120
-msgid "Your message could not be delivered: \"%1\", Reason: \"%2\""
+"_: "
+"<br><b>Full Name:</b>&nbsp;FORMATTED NAME\n"
+"<br><b>Full Name:</b>&nbsp;<nobr>%1</nobr>"
 msgstr ""
 
-#: protocols/jabber/jabbercontact.cpp:919
+#: libkopete/kopetecontact.cpp:691
 msgid ""
-"Do you also want to remove the authorization from user %1 to see your status?"
+"_: "
+"<br><b>Idle:</b>&nbsp;FORMATTED IDLE TIME\n"
+"<br><b>Idle:</b>&nbsp;<nobr>%1</nobr>"
 msgstr ""
 
-#: protocols/jabber/jabbercontact.cpp:1089
+#: libkopete/kopetecontact.cpp:700
 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/jabber/jabbercontact.cpp:1093
-msgid "Jabber Resource Selector"
-msgstr ""
-
-#: protocols/jabber/jabberbookmarks.cpp:132
-#, fuzzy
-msgid "Groupchat bookmark"
-msgstr "Gr?p"
-
-#: protocols/jabber/jabberprotocol.cpp:74
-#, fuzzy
-msgid "Free for Chat"
-msgstr "Segur"
-
-#: protocols/jabber/jabberprotocol.cpp:78
-msgid "Do not Disturb"
-msgstr ""
-
-#: protocols/jabber/jabberprotocol.cpp:94
-msgid "Authorization Status"
-msgstr ""
-
-#: protocols/jabber/jabberprotocol.cpp:95
-msgid "Available Resources"
-msgstr ""
-
-#: protocols/jabber/jabberprotocol.cpp:96
-msgid "vCard Cache Timestamp"
-msgstr ""
-
-#: protocols/jabber/jabberprotocol.cpp:98
-#, fuzzy
-msgid "Jabber ID"
-msgstr "Dynodiad Defnyddiwr"
-
-#: protocols/jabber/jabberprotocol.cpp:100
-msgid "Timezone"
-msgstr "Cylchfa amser:"
-
-#: protocols/jabber/jabberprotocol.cpp:101
-msgid "Homepage"
-msgstr "Tudalen gartref"
-
-#: protocols/jabber/jabberprotocol.cpp:102
-msgid "Company name"
-msgstr "Enw cwmni"
-
-#: protocols/jabber/jabberprotocol.cpp:103
-#, fuzzy
-msgid "Company Departement"
-msgstr "Adran"
-
-#: protocols/jabber/jabberprotocol.cpp:104
-#, fuzzy
-msgid "Company Position"
-msgstr "Lleoliad:"
-
-#: protocols/jabber/jabberprotocol.cpp:105
-#, fuzzy
-msgid "Company Role"
-msgstr "Cwmni:"
-
-#: protocols/jabber/jabberprotocol.cpp:106
-#, fuzzy
-msgid "Work Street"
-msgstr "Stryd:"
-
-#: protocols/jabber/jabberprotocol.cpp:107
-#, fuzzy
-msgid "Work Extra Address"
-msgstr "Cyfeiriad Gwaith"
-
-#: protocols/jabber/jabberprotocol.cpp:108
-#, fuzzy
-msgid "Work PO Box"
-msgstr "&Gwybodaeth am Ddefnyddwyr"
-
-#: protocols/jabber/jabberprotocol.cpp:110
-#, fuzzy
-msgid "Work Postal Code"
-msgstr "Côd post:"
-
-#: protocols/jabber/jabberprotocol.cpp:112
-#, fuzzy
-msgid "Work Email Address"
-msgstr "Cyfeiriad Ebost"
-
-#: protocols/jabber/jabberprotocol.cpp:113
-#, fuzzy
-msgid "Home Street"
-msgstr "Stryd:"
-
-#: protocols/jabber/jabberprotocol.cpp:114
-#, fuzzy
-msgid "Home Extra Address"
-msgstr "Cyfeiriad Cartref"
-
-#: protocols/jabber/jabberprotocol.cpp:115
-msgid "Home PO Box"
-msgstr ""
-
-#: protocols/jabber/jabberprotocol.cpp:116
-#, fuzzy
-msgid "Home City"
-msgstr "Dinas"
-
-#: protocols/jabber/jabberprotocol.cpp:117
-#, fuzzy
-msgid "Home Postal Code"
-msgstr "Côd post:"
-
-#: protocols/jabber/jabberprotocol.cpp:118
-#, fuzzy
-msgid "Home Country"
-msgstr "Gwlad:"
-
-#: protocols/jabber/jabberprotocol.cpp:119
-msgid "Fax"
-msgstr "Ffacs"
-
-#: protocols/jabber/jabberchatsession.cpp:266
-#: protocols/jabber/jabbergroupchatmanager.cpp:103
-msgid "This message is encrypted."
+"_: "
+"<br><b>Home Page:</b>&nbsp;FORMATTED URL\n"
+"<br><b>Home Page:</b>&nbsp;<a href=\"%1\"><nobr>%2</nobr></a>"
 msgstr ""
 
-#: protocols/jabber/jabbergroupchatmanager.cpp:148
+#: libkopete/kopetecontact.cpp:710
 #, c-format
-msgid "You have been invited to %1"
-msgstr ""
-
-#: protocols/jabber/tdeioslave/jabberdisco.cpp:109
-#: protocols/jabber/tdeioslave/jabberdisco.cpp:210
-msgid "TLS"
-msgstr "TLS"
-
-#: protocols/jabber/tdeioslave/jabberdisco.cpp:188
-#, fuzzy
-msgid "The server certificate is invalid. Do you want to continue? "
-msgstr "Methodd y tystysgrif gweinydd y prawf dilysiant (%1)."
-
-#: protocols/jabber/tdeioslave/jabberdisco.cpp:189
-msgid "Certificate Warning"
-msgstr ""
-
-#: protocols/jabber/tdeioslave/jabberdisco.cpp:320
-msgid "The login details are incorrect. Do you want to try again?"
-msgstr ""
-
-#: protocols/jabber/jabberaccount.cpp:166
 msgid ""
-"Could not bind Jabber file transfer manager to local port. Please check if the "
-"file transfer port is already in use or choose another port in the account "
-"settings."
-msgstr ""
-
-#: protocols/jabber/jabberaccount.cpp:167
-msgid "Failed to start Jabber File Transfer Manager"
-msgstr ""
-
-#: protocols/jabber/jabberaccount.cpp:181
-msgid "Join Groupchat..."
-msgstr ""
-
-#: protocols/jabber/jabberaccount.cpp:192
-msgid "Services..."
-msgstr "Gwasanaethau ..."
-
-#: protocols/jabber/jabberaccount.cpp:197
-msgid "Send Raw Packet to Server..."
-msgstr ""
-
-#: protocols/jabber/jabberaccount.cpp:259
-msgid "Please connect first."
-msgstr ""
-
-#: protocols/groupwise/gwaccount.cpp:720
-#: protocols/jabber/jabberaccount.cpp:455
-msgid "No certificate was presented."
-msgstr ""
-
-#: protocols/groupwise/gwaccount.cpp:724
-#: protocols/jabber/jabberaccount.cpp:459
-msgid "The host name does not match the one in the certificate."
-msgstr ""
-
-#: protocols/groupwise/gwaccount.cpp:728
-#: protocols/jabber/jabberaccount.cpp:463
-msgid "The Certificate Authority rejected the certificate."
-msgstr ""
-
-#: protocols/groupwise/gwaccount.cpp:733
-#: protocols/jabber/jabberaccount.cpp:468
-msgid "The certificate is untrusted."
-msgstr ""
-
-#: protocols/groupwise/gwaccount.cpp:737
-#: protocols/jabber/jabberaccount.cpp:472
-msgid "The signature is invalid."
-msgstr ""
-
-#: protocols/groupwise/gwaccount.cpp:741
-#: protocols/jabber/jabberaccount.cpp:476
-msgid "The Certificate Authority is invalid."
-msgstr ""
-
-#: protocols/groupwise/gwaccount.cpp:746
-#: protocols/jabber/jabberaccount.cpp:481
-msgid "Invalid certificate purpose."
-msgstr ""
-
-#: protocols/groupwise/gwaccount.cpp:750
-#: protocols/jabber/jabberaccount.cpp:485
-msgid "The certificate is self-signed."
-msgstr ""
-
-#: protocols/groupwise/gwaccount.cpp:754
-#: protocols/jabber/jabberaccount.cpp:489
-msgid "The certificate has been revoked."
-msgstr ""
-
-#: protocols/groupwise/gwaccount.cpp:758
-#: protocols/jabber/jabberaccount.cpp:493
-msgid "Maximum certificate chain length was exceeded."
-msgstr ""
-
-#: protocols/groupwise/gwaccount.cpp:762
-#: protocols/jabber/jabberaccount.cpp:497
-msgid "The certificate has expired."
-msgstr ""
-
-#: protocols/groupwise/gwaccount.cpp:767
-#: protocols/jabber/jabberaccount.cpp:502
-msgid "An unknown error occurred trying to validate the certificate."
+"_: "
+"<br><b>Away Message:</b>&nbsp;FORMATTED AWAY MESSAGE\n"
+"<br><b>Away&nbsp;Message:</b>&nbsp;%1"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:508
+#: libkopete/kopetecontact.cpp:747
 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 ""
-
-#: protocols/jabber/jabberaccount.cpp:510
-msgid "Jabber Connection Certificate Problem"
+"_: "
+"<br><b>PROPERTY LABEL:</b>&nbsp;PROPERTY VALUE\n"
+"<br><nobr><b>%2:</b></nobr>&nbsp;%1"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:542
+#: libkopete/kopetecontact.cpp:770
 msgid ""
-"An encrypted connection with the Jabber server could not be established."
-msgstr ""
-
-#: protocols/jabber/jabberaccount.cpp:543
-#, fuzzy
-msgid "Jabber Connection Error"
-msgstr "Cysylltiad"
-
-#: protocols/jabber/jabberaccount.cpp:743
-msgid "Malformed packet received."
-msgstr ""
-
-#: protocols/jabber/jabberaccount.cpp:748
-msgid "There was an unrecoverable error in the protocol."
-msgstr ""
-
-#: protocols/jabber/jabberaccount.cpp:755
-msgid "Generic stream error (sorry, I do not have a more-detailed reason)"
-msgstr ""
-
-#: protocols/jabber/jabberaccount.cpp:759
-msgid "There was a conflict in the information received."
-msgstr ""
-
-#: protocols/jabber/jabberaccount.cpp:762
-msgid "The stream timed out."
-msgstr ""
-
-#: protocols/jabber/jabberaccount.cpp:765
-msgid "Internal server error."
-msgstr ""
-
-#: protocols/jabber/jabberaccount.cpp:768
-msgid "Stream packet received from an invalid address."
-msgstr ""
-
-#: protocols/jabber/jabberaccount.cpp:771
-msgid "Malformed stream packet received."
-msgstr ""
-
-#: protocols/jabber/jabberaccount.cpp:775
-msgid "Policy violation in the protocol stream."
-msgstr ""
-
-#: protocols/jabber/jabberaccount.cpp:779
-msgid "Resource constraint."
-msgstr ""
-
-#: protocols/jabber/jabberaccount.cpp:783
-msgid "System shutdown."
-msgstr ""
-
-#: protocols/jabber/jabberaccount.cpp:786
-msgid "Unknown reason."
-msgstr ""
-
-#: protocols/jabber/jabberaccount.cpp:790
-#, c-format
-msgid "There was an error in the protocol stream: %1"
-msgstr ""
-
-#: protocols/jabber/jabberaccount.cpp:798
-msgid "Host not found."
-msgstr "Ni chafwyd gweinydd."
-
-#: protocols/jabber/jabberaccount.cpp:801
-msgid "Address is already in use."
-msgstr ""
-
-#: protocols/jabber/jabberaccount.cpp:804
-msgid "Cannot recreate the socket."
-msgstr ""
-
-#: protocols/jabber/jabberaccount.cpp:807
-msgid "Cannot bind the socket again."
-msgstr ""
-
-#: protocols/jabber/jabberaccount.cpp:810
-msgid "Socket is already connected."
-msgstr ""
-
-#: protocols/jabber/jabberaccount.cpp:813
-msgid "Socket is not connected."
-msgstr ""
-
-#: protocols/jabber/jabberaccount.cpp:816
-msgid "Socket is not bound."
-msgstr ""
-
-#: protocols/jabber/jabberaccount.cpp:819
-msgid "Socket has not been created."
+"_: firstName lastName\n"
+"%2 %1"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:822
+#: libkopete/kopetecontact.cpp:806
 msgid ""
-"Socket operation would block. You should not see this error, please use "
-"\"Report Bug\" from the Help menu."
-msgstr ""
-
-#: protocols/jabber/jabberaccount.cpp:825
-msgid "Connection refused."
-msgstr "Gwrthodwyd y cysylltiad."
-
-#: protocols/jabber/jabberaccount.cpp:828
-msgid "Connection timed out."
-msgstr "Cysylltiad wedi goramseru."
-
-#: protocols/jabber/jabberaccount.cpp:831
-msgid "Connection attempt already in progress."
-msgstr ""
-
-#: protocols/jabber/jabberaccount.cpp:834
-msgid "Network failure."
-msgstr ""
-
-#: protocols/jabber/jabberaccount.cpp:837
-msgid "Operation is not supported."
-msgstr ""
-
-#: protocols/jabber/jabberaccount.cpp:840
-msgid "Socket timed out."
-msgstr ""
-
-#: protocols/jabber/jabberaccount.cpp:848
-#, c-format
-msgid "There was a connection error: %1"
-msgstr ""
-
-#: protocols/jabber/jabberaccount.cpp:856
-msgid "Unknown host."
-msgstr ""
-
-#: protocols/jabber/jabberaccount.cpp:860
-msgid "Could not connect to a required remote resource."
+"_: <days>d <hours>h <minutes>m <seconds>s\n"
+"%4d %3h %2m %1s"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:863
+#: libkopete/kopetecontact.cpp:814
 msgid ""
-"It appears we have been redirected to another server; I do not know how to "
-"handle this."
-msgstr ""
-
-#: protocols/jabber/jabberaccount.cpp:866
-msgid "Unsupported protocol version."
-msgstr ""
-
-#: protocols/jabber/jabberaccount.cpp:869
-#: protocols/jabber/jabberaccount.cpp:886
-#: protocols/jabber/jabberaccount.cpp:930
-#: protocols/jabber/jabberaccount.cpp:947
-#: protocols/jabber/jabberaccount.cpp:964
-#: protocols/jabber/jabberaccount.cpp:972
-msgid "Unknown error."
-msgstr "Gwall anhysbys."
-
-#: protocols/jabber/jabberaccount.cpp:873
-#, c-format
-msgid "There was a negotiation error: %1"
-msgstr ""
-
-#: protocols/jabber/jabberaccount.cpp:880
-msgid "Server rejected our request to start the TLS handshake."
-msgstr ""
-
-#: protocols/jabber/jabberaccount.cpp:883
-msgid "Failed to establish a secure connection."
-msgstr ""
-
-#: protocols/jabber/jabberaccount.cpp:890
-#, c-format
-msgid "There was a Transport Layer Security (TLS) error: %1"
-msgstr ""
-
-#: protocols/jabber/jabberaccount.cpp:897
-msgid "Login failed with unknown reason."
-msgstr ""
-
-#: protocols/jabber/jabberaccount.cpp:900
-msgid "No appropriate authentication mechanism available."
-msgstr ""
-
-#: protocols/jabber/jabberaccount.cpp:903
-msgid "Bad SASL authentication protocol."
-msgstr ""
-
-#: protocols/jabber/jabberaccount.cpp:906
-msgid "Server failed mutual authentication."
-msgstr ""
-
-#: protocols/jabber/jabberaccount.cpp:909
-msgid "Encryption is required but not present."
-msgstr ""
-
-#: protocols/jabber/jabberaccount.cpp:912
-msgid "Invalid user ID."
-msgstr ""
-
-#: protocols/jabber/jabberaccount.cpp:915
-msgid "Invalid mechanism."
-msgstr ""
-
-#: protocols/jabber/jabberaccount.cpp:918
-msgid "Invalid realm."
-msgstr ""
-
-#: protocols/jabber/jabberaccount.cpp:921
-msgid "Mechanism too weak."
-msgstr ""
-
-#: protocols/jabber/jabberaccount.cpp:924
-msgid "Wrong credentials supplied. (check your user ID and password)"
-msgstr ""
-
-#: protocols/jabber/jabberaccount.cpp:927
-msgid "Temporary failure, please try again later."
-msgstr ""
-
-#: protocols/jabber/jabberaccount.cpp:934
-#, c-format
-msgid "There was an error authenticating with the server: %1"
-msgstr ""
-
-#: protocols/jabber/jabberaccount.cpp:941
-msgid "Transport Layer Security (TLS) problem."
-msgstr ""
-
-#: protocols/jabber/jabberaccount.cpp:944
-msgid "Simple Authentication and Security Layer (SASL) problem."
-msgstr ""
-
-#: protocols/jabber/jabberaccount.cpp:951
-#, c-format
-msgid "There was an error in the security layer: %1"
-msgstr ""
-
-#: protocols/jabber/jabberaccount.cpp:958
-msgid "No permission to bind the resource."
-msgstr ""
-
-#: protocols/jabber/jabberaccount.cpp:961
-msgid "The resource is already in use."
-msgstr ""
-
-#: protocols/jabber/jabberaccount.cpp:968
-#, c-format
-msgid "Could not bind a resource: %1"
+"_: <hours>h <minutes>m <seconds>s\n"
+"%3h %2m %1s"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:984
+#: libkopete/kopetecontact.cpp:821
 #, c-format
-msgid "Connection problem with Jabber server %1"
-msgstr ""
-
-#: protocols/jabber/jabberaccount.cpp:1122
 msgid ""
-"The Jabber user %1 removed %2's subscription to them. This account will no "
-"longer be able to view their online/offline status. Do you want to delete the "
-"contact?"
-msgstr ""
-
-#: protocols/jabber/jabberaccount.cpp:1302
-msgid "Waiting for authorization"
-msgstr "Yn aros am awdurdodiad"
-
-#: protocols/jabber/jabberaccount.cpp:1515
-#, c-format
-msgid "A password is required to join the room %1."
-msgstr ""
-
-#: protocols/jabber/jabberaccount.cpp:1524
-msgid "Error trying to join %1 : nickname %2 is already in use"
-msgstr ""
-
-#: protocols/jabber/jabberaccount.cpp:1525
-#, fuzzy
-msgid "Give your nickname"
-msgstr "Llysenw"
-
-#: protocols/jabber/jabberaccount.cpp:1538
-msgid "You can't join the room %1 because you were banned"
-msgstr ""
-
-#: protocols/jabber/jabberaccount.cpp:1539
-#: protocols/jabber/jabberaccount.cpp:1546
-#: protocols/jabber/jabberaccount.cpp:1556
-msgid "Jabber Group Chat"
-msgstr ""
-
-#: protocols/jabber/jabberaccount.cpp:1545
-msgid "You can't join the room %1 because the maximum users has been reached"
+"_: <minutes>m <seconds>s\n"
+"%2m %1s"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:1551
-msgid "No reason given by the server"
+#: libkopete/tdeabcpersistence.cpp:294
+msgid "<qt>\"%1\" is not supported by Kopete.</qt>"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:1555
-msgid ""
-"There was an error processing your request for group chat %1. (Reason: %2, Code "
-"%3)"
+#: libkopete/tdeabcpersistence.cpp:295
+msgid "Could Not Sync with TDE Address Book"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:1688
+#: libkopete/tdeabcpersistence.cpp:342
 msgid ""
-"Do you want to also unregister \"%1\" from the Jabber server ?\n"
-"If you unregister, all your contact list may be removed on the server,And you "
-"will never be able to connect to this account with any client"
-msgstr ""
-
-#: protocols/jabber/jabberaccount.cpp:1691
-msgid "Unregister"
+"<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 ""
 
-#: protocols/jabber/jabberaccount.cpp:1692
-msgid "Remove and Unregister"
+#: libkopete/tdeabcpersistence.cpp:342
+msgid "Import Address From Address Book"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:1693
-msgid "Remove from kopete only"
-msgstr ""
+#: libkopete/tdeabcpersistence.cpp:342
+msgid "Use"
+msgstr "Defnydd"
 
-#: protocols/jabber/jabberaccount.cpp:1737
-#, c-format
+#: libkopete/tdeabcpersistence.cpp:356
 msgid ""
-"An error occured when trying to remove the account:\n"
-"%1"
-msgstr ""
-
-#: protocols/jabber/jabberaccount.cpp:1738
-#, fuzzy
-msgid "Jabber Account Unregistration"
-msgstr "Gwybodaeth Cyfrif"
-
-#: protocols/jabber/jingle/jinglevoicesessiondialog.cpp:47
-#, c-format
-msgid "Voice session with %1"
-msgstr ""
-
-#: protocols/jabber/jingle/jinglevoicesessiondialog.cpp:72
-#, fuzzy
-msgid "Incoming Session..."
-msgstr "Negeseuon newydd Gyraedd"
-
-#: protocols/jabber/jingle/jinglevoicesessiondialog.cpp:98
-#, fuzzy
-msgid "Waiting for other peer..."
-msgstr "Yn aros am awdurdodiad"
-
-#: protocols/jabber/jingle/jinglevoicesessiondialog.cpp:109
-#: protocols/jabber/jingle/jinglevoicesessiondialog.cpp:162
-msgid "Session accepted."
-msgstr ""
-
-#: protocols/jabber/jingle/jinglevoicesessiondialog.cpp:121
-#: protocols/jabber/jingle/jinglevoicesessiondialog.cpp:174
-msgid "Session declined."
-msgstr ""
-
-#: protocols/jabber/jingle/jinglevoicesessiondialog.cpp:134
-#: protocols/jabber/jingle/jinglevoicesessiondialog.cpp:186
-msgid "Session terminated."
-msgstr ""
-
-#: protocols/jabber/jingle/jinglevoicesessiondialog.cpp:150
-msgid "Session in progress."
+"<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 ""
 
-#: protocols/jabber/jabberchatsession.cpp:119
+#: libkopete/tdeabcpersistence.cpp:381
 msgid ""
-"_: a contact's online status in parenthesis.\n"
-" (%1)"
-msgstr ""
-
-#: protocols/jabber/jabberbasecontact.cpp:133
-msgid "You cannot see each others' status."
+"<qt>You do not have an account configured for <b>%1</b> "
+"yet.  Please create an account, connect it, and try again.</qt>"
 msgstr ""
 
-#: protocols/jabber/jabberbasecontact.cpp:137
-msgid "You can see this contact's status but they cannot see your status."
+#: libkopete/tdeabcpersistence.cpp:382
+msgid "No Account Found"
 msgstr ""
 
-#: protocols/jabber/jabberbasecontact.cpp:141
-msgid "This contact can see your status but you cannot see their status."
+#: libkopete/tdeabcpersistence.cpp:398
+msgid "<qt>It was not possible to add the contact.</qt>"
 msgstr ""
 
-#: protocols/jabber/jabberbasecontact.cpp:145
-msgid "You can see each others' status."
+#: libkopete/tdeabcpersistence.cpp:399
+msgid "Could Not Add Contact"
 msgstr ""
 
-#: protocols/jabber/jabberbasecontact.cpp:255
-msgid "Client"
-msgstr "Dibynnydd:"
-
-#: protocols/jabber/jabberbasecontact.cpp:280
-msgid "Timestamp"
+#: libkopete/kopetetask.cpp:32
+msgid "The operation has not finished yet"
 msgstr ""
 
-#: protocols/jabber/jabberbasecontact.cpp:287
-msgid "Message"
-msgstr "Neges"
-
-#: protocols/jabber/jabbergroupcontact.cpp:116
-#, fuzzy
-msgid "Change nick name"
-msgstr "Llysenw"
-
-#: protocols/jabber/jabbergroupcontact.cpp:356
-msgid "Change nickanme - Jabber Plugin"
-msgstr ""
+#: libkopete/kopetetask.cpp:67
+msgid "Aborted"
+msgstr "Terfynwyd"
 
-#: protocols/jabber/jabbergroupcontact.cpp:357
-msgid "Please enter the new nick name you want to have on the room <i>%1</i>"
+#: libkopete/kopetecommandhandler.cpp:107
+msgid ""
+"USAGE: /help [<command>] - Used to list available commands, or show help for a "
+"specified command."
 msgstr ""
 
-#: protocols/winpopup/wpuserinfo.cpp:37
-msgid "N/A"
-msgstr "N/A"
-
-#: protocols/winpopup/wpuserinfo.cpp:48 protocols/winpopup/wpuserinfo.cpp:49
-#: protocols/winpopup/wpuserinfo.cpp:50 protocols/winpopup/wpuserinfo.cpp:51
-#, fuzzy
-msgid "Looking"
-msgstr "Cofnodion"
-
-#: protocols/winpopup/wpaddcontact.cpp:90
-#: protocols/winpopup/wpaddcontact.cpp:97
-#: protocols/winpopup/wpeditaccount.cpp:100
-#: protocols/winpopup/wpeditaccount.cpp:106
-msgid "WinPopup"
-msgstr "WinPopup"
-
-#: protocols/winpopup/wpeditaccount.cpp:106
-msgid "<qt>You must enter a valid smbclient path.</qt>"
+#: libkopete/kopetecommandhandler.cpp:110
+msgid "USAGE: /close - Closes the current view."
 msgstr ""
 
-#: protocols/winpopup/libwinpopup/libwinpopup.cpp:106
-msgid ""
-"Working directory %1 does not exist.\n"
-"If you have not configured anything yet (samba) please see\n"
-"Install Into Samba (Configure... -> Account -> Edit) information\n"
-"on how to do this.\n"
-"Should the directory be created? (May need root password)"
+#: libkopete/kopetecommandhandler.cpp:114
+msgid "USAGE: /part - Closes the current view."
 msgstr ""
 
-#: protocols/winpopup/libwinpopup/libwinpopup.cpp:111
-msgid "Create Directory"
+#: libkopete/kopetecommandhandler.cpp:117
+msgid "USAGE: /clear - Clears the active view's chat buffer."
 msgstr ""
 
-#: protocols/winpopup/libwinpopup/libwinpopup.cpp:111
-#, fuzzy
-msgid "Do Not Create"
-msgstr "Heb gysylltu"
-
-#: protocols/winpopup/libwinpopup/libwinpopup.cpp:125
+#: libkopete/kopetecommandhandler.cpp:123
 msgid ""
-"Permissions of the working directory %1 are wrong!\n"
-"You will not receive messages if you say no.\n"
-"You can also correct it manually (chmod 0777 %1) and restart kopete.\n"
-"Fix? (May need root password)"
+"USAGE: /away [<reason>] - Marks you as away/back for the current account only."
 msgstr ""
 
-#: protocols/winpopup/libwinpopup/libwinpopup.cpp:130
-#: protocols/winpopup/libwinpopup/libwinpopup.cpp:306
-#, fuzzy
-msgid "Fix"
-msgstr "Ffacs"
-
-#: protocols/winpopup/libwinpopup/libwinpopup.cpp:130
-#: protocols/winpopup/libwinpopup/libwinpopup.cpp:306
-msgid "Do Not Fix"
+#: libkopete/kopetecommandhandler.cpp:126
+msgid "USAGE: /awayall [<reason>] - Marks you as away/back for all accounts."
 msgstr ""
 
-#: protocols/winpopup/libwinpopup/libwinpopup.cpp:234
+#: libkopete/kopetecommandhandler.cpp:129
 msgid ""
-"Connection to localhost failed!\n"
-"Is your samba server running?"
+"USAGE: /say <text> - Say text in this chat. This is the same as just typing a "
+"message, but is very useful for scripts."
 msgstr ""
 
-#: protocols/winpopup/libwinpopup/libwinpopup.cpp:303
+#: libkopete/kopetecommandhandler.cpp:133
 msgid ""
-"A message file could not be removed; maybe the permissions are wrong.\n"
-"Fix? (May need root password)"
-msgstr ""
-
-#: protocols/winpopup/libwinpopup/libwinpopup.cpp:311
-msgid "Still cannot remove it; please fix manually."
-msgstr ""
-
-#: protocols/winpopup/wpprotocol.cpp:144
-msgid "The Samba configuration file is modified."
-msgstr ""
-
-#: protocols/winpopup/wpprotocol.cpp:144
-msgid "Configuration Succeeded"
-msgstr ""
-
-#: protocols/winpopup/wpprotocol.cpp:146
-msgid "Updating the Samba configuration file failed."
-msgstr ""
-
-#: protocols/winpopup/wpprotocol.cpp:146
-msgid "Configuration Failed"
-msgstr ""
-
-#: protocols/winpopup/wpaddcontact.cpp:90
-msgid "<qt>You must enter a valid hostname.</qt>"
-msgstr ""
-
-#: protocols/winpopup/wpaddcontact.cpp:97
-msgid "<qt>LOCALHOST is not allowed as contact.</qt>"
-msgstr ""
-
-#: protocols/winpopup/wpaccount.cpp:163
-msgid "WinPopup (%1)"
+"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 ""
 
-#: protocols/groupwise/ui/gweditaccountwidget.cpp:104
+#: libkopete/kopetecommandhandler.cpp:236
 msgid ""
-"The changes you just made will take effect next time you log in with GroupWise."
-msgstr ""
-
-#: protocols/groupwise/ui/gweditaccountwidget.cpp:105
-msgid "GroupWise Settings Changed While Signed In"
-msgstr ""
-
-#: protocols/groupwise/ui/gwreceiveinvitationdialog.cpp:37
-msgid "Invitation to Conversation"
+"Available Commands:\n"
 msgstr ""
 
-#: protocols/groupwise/ui/gwprivacydialog.cpp:52
-#, c-format
+#: libkopete/kopetecommandhandler.cpp:249
 msgid ""
-"_: Account specific privacy settings\n"
-"Manage Privacy for %1"
-msgstr ""
-
-#: protocols/groupwise/ui/gwprivacydialog.cpp:62
-msgid "Privacy settings have been administratively locked"
+"\n"
+"Type /help <command> for more information."
 msgstr ""
 
-#: protocols/groupwise/ui/gwprivacydialog.cpp:100
-msgid "<Everyone Else>"
+#: libkopete/kopetecommandhandler.cpp:258
+msgid "There is no help available for '%1'."
 msgstr ""
 
-#: protocols/groupwise/ui/gwprivacydialog.cpp:180
-#, fuzzy
-msgid "Search for Contact to Block"
-msgstr "&Dileu y Cyswllt"
-
-#: protocols/groupwise/ui/gwprivacydialog.cpp:346
+#: libkopete/kopetecommandhandler.cpp:304
 msgid ""
-"You can only change privacy settings while you are logged in to the GroupWise "
-"Messenger server."
-msgstr ""
-
-#: protocols/groupwise/ui/gwprivacydialog.cpp:346
-msgid "'%1' Not Logged In"
+"ERROR: Shell access has been restricted on your system. The /exec command will "
+"not function."
 msgstr ""
 
-#: protocols/groupwise/ui/gwaddcontactpage.cpp:64
-msgid "Connect to GroupWise Messenger and try again."
-msgstr ""
+#~ msgid "&Parameters:"
+#~ msgstr "&Paramedrau:"
 
-#: protocols/groupwise/ui/gwchatsearchdialog.cpp:38
-#, fuzzy
-msgid "Search Chatrooms"
-msgstr "Chwilio am:"
+#~ msgid "Co&mmand:"
+#~ msgstr "Gorchy&myn:"
 
-#: protocols/groupwise/ui/gwchatsearchdialog.cpp:67
-msgid "Updating chatroom list..."
-msgstr ""
+#~ msgid "Message:"
+#~ msgstr "Neges:"
 
-#: protocols/groupwise/ui/gwchatpropsdialog.cpp:33
-#: protocols/groupwise/ui/gwchatpropsdialog.cpp:41
 #, fuzzy
-msgid "Chatroom properties"
-msgstr "&Priodweddau"
-
-#: protocols/groupwise/ui/gwsearch.cpp:167
-#, c-format
-msgid ""
-"_n: 1 matching user found\n"
-"%n matching users found"
-msgstr ""
-
-#: protocols/groupwise/ui/gwcontactproperties.cpp:81
-msgid "Contact Properties"
-msgstr ""
-
-#: protocols/groupwise/ui/gwcontactproperties.cpp:104
-msgid "Telephone Number"
-msgstr "Rhif Teleffôn"
-
-#: protocols/groupwise/ui/gwcontactproperties.cpp:106
-msgid "Department"
-msgstr "Adran"
+#~ msgid "MSN &Settings"
+#~ msgstr "&Cadw Gosodiadau"
 
-#: protocols/groupwise/ui/gwcontactproperties.cpp:108
-msgid "Location"
-msgstr "Lleoliad"
-
-#: protocols/groupwise/ui/gwcontactproperties.cpp:110
-msgid "Mailstop"
-msgstr ""
-
-#: protocols/groupwise/ui/gwcontactproperties.cpp:112
-msgid "Personal Title"
-msgstr ""
-
-#: protocols/groupwise/libgroupwise/gwerror.cpp:29
-msgid "Access denied"
-msgstr ""
-
-#: protocols/groupwise/libgroupwise/gwerror.cpp:32
 #, fuzzy
-msgid "Not supported"
-msgstr "Heb gysylltu"
+#~ msgid "Automatically"
+#~ msgstr "Awtomatig"
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:35
-#, fuzzy
-msgid "Password expired"
-msgstr "Mae angen cyfrinair"
+#~ msgid "Privacy"
+#~ msgstr "Preifatwydd"
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:38
 #, fuzzy
-msgid "Invalid password"
-msgstr "Cyfrinair anghywir."
+#~ msgid "Send client information"
+#~ msgstr "Gwybodaeth Cyffredinol"
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:41
 #, fuzzy
-msgid "User not found"
-msgstr "Ni chafwyd gweinydd."
+#~ msgid "Send &typing notifications"
+#~ msgstr "Hysbysiad"
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:44
-#, fuzzy
-msgid "Attribute not found"
-msgstr "Ni chafwyd gweinydd."
+#~ msgid "Phone Numbers"
+#~ msgstr "Rhifau ffôn"
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:47
-msgid "User is disabled"
-msgstr ""
+#~ msgid "Hom&e:"
+#~ msgstr "Car&tref :"
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:50
-msgid "Directory failure"
-msgstr ""
+#~ msgid "&Work:"
+#~ msgstr "&Gwaith :"
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:53
-#, fuzzy
-msgid "Host not found"
-msgstr "Ni chafwyd gweinydd."
+#~ msgid "Con&tacts"
+#~ msgstr "Cys&ylltau"
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:56
-msgid "Locked by admin"
-msgstr ""
+#~ msgid "&>"
+#~ msgstr "&>"
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:59
-msgid "Duplicate participant"
-msgstr ""
+#~ msgid "&<"
+#~ msgstr "&<"
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:62
-#, fuzzy
-msgid "Server busy"
-msgstr "Gweinydd"
+#~ msgid "Email address:"
+#~ msgstr "Cyfeiriad Ebost:"
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:65
 #, fuzzy
-msgid "Object not found"
-msgstr "Ni chafwyd gweinydd."
+#~ msgid "Personal message:"
+#~ msgstr "Neges:"
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:68
-msgid "Directory update"
-msgstr ""
+#~ msgid "Away Messages"
+#~ msgstr "Negeseuon Allan"
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:71
-msgid "Duplicate folder"
-msgstr ""
+#~ msgid "seconds"
+#~ msgstr "eiliad"
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:74
-msgid "Contact list entry already exists"
-msgstr ""
+#~ msgid "MSN Plugin"
+#~ msgstr "Ategyn MSN"
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:77
-msgid "User not allowed"
-msgstr ""
+#~ msgid "Refuse"
+#~ msgstr "Gwrthod"
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:80
-#, fuzzy
-msgid "Too many contacts"
-msgstr "Cyswllt"
+#~ msgid "Decline"
+#~ msgstr "Gwrthod"
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:83
-#, fuzzy
-msgid "Conference not found"
-msgstr "Ni chafwyd gweinydd."
+#~ msgid "Connection timed out"
+#~ msgstr "Cysylltiad wedi goramseru"
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:86
-#, fuzzy
-msgid "Too many folders"
-msgstr "Cwmni:"
+#~ msgid "Cannot open file for writing"
+#~ msgstr "Methu agor ffeil ar gyfer ysgrifennu"
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:89
 #, fuzzy
-msgid "Server protocol error"
-msgstr "Gwall protocol."
-
-#: protocols/groupwise/libgroupwise/gwerror.cpp:92
-msgid "Conversation invitation error"
-msgstr ""
-
-#: protocols/groupwise/libgroupwise/gwerror.cpp:95
-msgid "User is blocked"
-msgstr ""
-
-#: protocols/groupwise/libgroupwise/gwerror.cpp:98
-msgid "Master archive is missing"
-msgstr ""
-
-#: protocols/groupwise/libgroupwise/gwerror.cpp:101
-msgid "Expired password in use"
-msgstr ""
-
-#: protocols/groupwise/libgroupwise/gwerror.cpp:104
-msgid "Credentials missing"
-msgstr ""
+#~ msgid "File transfer canceled."
+#~ msgstr "Hidlenni"
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:107
-#, fuzzy
-msgid "Authentication failed"
-msgstr "Dilysiant Gweinydd"
+#~ msgid "MSN Messenger"
+#~ msgstr "Negesydd MSN"
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:110
 #, fuzzy
-msgid "Eval connection limit"
-msgstr "Cysylltiad wedi goramseru"
+#~ msgid "On The &Phone"
+#~ msgstr "Ffôn:"
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:113
-msgid "Unsupported client version"
-msgstr ""
+#~ msgid "&Offline"
+#~ msgstr "&All-lein"
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:116
-msgid "A duplicate chat was found"
-msgstr ""
+#~ msgid "&Idle"
+#~ msgstr "&Segur"
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:119
 #, fuzzy
-msgid "Chat not found"
-msgstr "Ni chafwyd gweinydd."
-
-#: protocols/groupwise/libgroupwise/gwerror.cpp:122
-msgid "Invalid chat name"
-msgstr ""
-
-#: protocols/groupwise/libgroupwise/gwerror.cpp:125
-msgid "The chat is active"
-msgstr ""
-
-#: protocols/groupwise/libgroupwise/gwerror.cpp:128
-msgid "Chat is busy; try again"
-msgstr ""
-
-#: protocols/groupwise/libgroupwise/gwerror.cpp:131
-msgid "Tried request too soon after another; try again"
-msgstr ""
-
-#: protocols/groupwise/libgroupwise/gwerror.cpp:134
-msgid "Server's chat subsystem is not active"
-msgstr ""
-
-#: protocols/groupwise/libgroupwise/gwerror.cpp:137
-msgid "The chat update request is invalid"
-msgstr ""
-
-#: protocols/groupwise/libgroupwise/gwerror.cpp:140
-msgid "Write failed due to directory mismatch"
-msgstr ""
-
-#: protocols/groupwise/libgroupwise/gwerror.cpp:143
-msgid "Recipient's client version is too old"
-msgstr ""
-
-#: protocols/groupwise/libgroupwise/gwerror.cpp:146
-msgid "Chat has been removed from server"
-msgstr ""
-
-#: protocols/groupwise/libgroupwise/gwerror.cpp:149
-#, c-format
-msgid "Unrecognized error code: %s"
-msgstr ""
-
-#: protocols/groupwise/gwprotocol.cpp:59
-msgid "Appear Offline"
-msgstr ""
-
-#: protocols/groupwise/gwprotocol.cpp:59
-msgid "A&ppear Offline"
-msgstr ""
-
-#: protocols/groupwise/gwprotocol.cpp:64
-msgid "Invalid Status"
-msgstr ""
-
-#: protocols/groupwise/gwprotocol.cpp:71
-msgid "Auto Reply Message"
-msgstr ""
-
-#: protocols/groupwise/gwprotocol.cpp:72
-msgid "Common Name"
-msgstr "Enw Cyffredin"
-
-#: protocols/groupwise/gwaccount.cpp:82
-msgid "&Set Auto-Reply..."
-msgstr ""
+#~ msgid "Remote Client"
+#~ msgstr "Gwaredu Cyswllt"
 
-#: protocols/groupwise/gwaccount.cpp:84
 #, fuzzy
-msgid "&Join Channel..."
-msgstr "Ymuno â'r Sianel..."
-
-#: protocols/groupwise/gwaccount.cpp:86
-msgid "&Manage Privacy..."
-msgstr ""
-
-#: protocols/groupwise/gwaccount.cpp:253
-msgid "GroupWise SSL Error"
-msgstr ""
-
-#: protocols/groupwise/gwaccount.cpp:367
-msgid ""
-"_: Message Sending Failed\n"
-"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 ""
+#~ msgid "Contact GUID"
+#~ msgstr "Cyswllt"
 
-#: protocols/groupwise/gwaccount.cpp:367
-msgid "Unable to Send Message on Account '%1'"
-msgstr ""
-
-#: protocols/groupwise/gwaccount.cpp:577
-msgid "Conflicting Changes Made Offline"
-msgstr ""
+#~ msgid "timeout"
+#~ msgstr "goramser"
 
-#: protocols/groupwise/gwaccount.cpp:577
-msgid ""
-"A change happened to your GroupWise contact list while you were offline which "
-"was impossible to reconcile."
-msgstr ""
+#~ msgid "connection closed"
+#~ msgstr "ceuwyd cysylltiad"
 
-#: protocols/groupwise/gwaccount.cpp:650
-msgid ""
-"_: Error shown when connecting failed\n"
-"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 ""
-
-#: protocols/groupwise/gwaccount.cpp:650
-msgid "Unable to Connect '%1'"
-msgstr ""
-
-#: protocols/groupwise/gwaccount.cpp:773
-msgid "The certificate of server %1 could not be validated for account %2: %3"
-msgstr ""
-
-#: protocols/groupwise/gwaccount.cpp:777
-msgid "GroupWise Connection Certificate Problem"
-msgstr ""
-
-#: protocols/groupwise/gwaccount.cpp:826
-msgid ""
-"_: Prefix used for automatically generated auto-reply messages when the contact "
-"is Away, contains contact's name\n"
-"Auto reply from %1: "
-msgstr ""
-
-#: protocols/groupwise/gwaccount.cpp:832
-msgid ""
-"_: Prefix used for broadcast messages\n"
-"Broadcast message from %1: "
-msgstr ""
-
-#: protocols/groupwise/gwaccount.cpp:838
-msgid ""
-"_: Prefix used for system broadcast messages\n"
-"System Broadcast message from %1: "
-msgstr ""
-
-#: protocols/groupwise/gwaccount.cpp:1212
-msgid ""
-"The contact %1 could not be added to the contact list, with error message: %2"
-msgstr ""
-
-#: protocols/groupwise/gwaccount.cpp:1214
 #, fuzzy
-msgid "Error Adding Contact"
-msgstr "Cyswllt"
-
-#: protocols/groupwise/gwaccount.cpp:1258
-msgid "Signed in as %1 Elsewhere"
-msgstr ""
-
-#: protocols/groupwise/gwaccount.cpp:1259
-msgid ""
-"_: The parameter is the user's own account id for this protocol\n"
-"You have been disconnected from GroupWise Messenger because you signed in as %1 "
-"elsewhere"
-msgstr ""
-
-#: protocols/groupwise/gwaccount.cpp:1367
-msgid "%1 has been invited to join this conversation."
-msgstr ""
-
-#: protocols/groupwise/gwaccount.cpp:1393
-msgid "Enter Auto-Reply Message"
-msgstr ""
+#~ msgid "More Information"
+#~ msgstr "Mwy o Wybodaeth..."
 
-#: protocols/groupwise/gwaccount.cpp:1394
-msgid ""
-"Please enter an Auto-Reply message that will be shown to users who message you "
-"while Away or Busy"
-msgstr ""
-
-#: protocols/groupwise/gwmessagemanager.cpp:68
-#: protocols/groupwise/gwmessagemanager.cpp:506
-msgid "Security Status"
-msgstr ""
-
-#: protocols/groupwise/gwmessagemanager.cpp:69
-msgid "Conversation is secure"
-msgstr ""
-
-#: protocols/groupwise/gwmessagemanager.cpp:71
-#: protocols/groupwise/gwmessagemanager.cpp:513
-msgid "Archiving Status"
-msgstr ""
-
-#: protocols/groupwise/gwmessagemanager.cpp:199
-#, c-format
-msgid "An error occurred when trying to start a chat: %1"
-msgstr ""
-
-#: protocols/groupwise/gwmessagemanager.cpp:226
-msgid ""
-"Your message could not be sent. You cannot send messages while your status is "
-"Appear Offline. "
-msgstr ""
-
-#: protocols/groupwise/gwmessagemanager.cpp:319
-msgid "&Other..."
-msgstr "&Eraill..."
-
-#: protocols/groupwise/gwmessagemanager.cpp:338
-#: protocols/groupwise/gwmessagemanager.cpp:384
-msgid "Enter Invitation Message"
-msgstr ""
-
-#: protocols/groupwise/gwmessagemanager.cpp:339
-#: protocols/groupwise/gwmessagemanager.cpp:385
-msgid "Enter the reason for the invitation, or leave blank for no reason:"
-msgstr ""
-
-#: protocols/groupwise/gwmessagemanager.cpp:363
 #, fuzzy
-msgid "Search for Contact to Invite"
-msgstr "&Dileu y Cyswllt"
-
-#: protocols/groupwise/gwmessagemanager.cpp:398
-msgid ""
-"_: label attached to contacts who have been invited but are yet to join a chat\n"
-"(pending)"
-msgstr ""
+#~ msgid "Manage Subscription"
+#~ msgstr "Tanysgrifiad"
 
-#: protocols/groupwise/gwmessagemanager.cpp:445
-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."
-msgstr ""
-
-#: protocols/groupwise/gwmessagemanager.cpp:471
-msgid "%1 has rejected an invitation to join this conversation."
-msgstr ""
-
-#: protocols/groupwise/gwmessagemanager.cpp:493
-msgid "Conversation is being administratively logged"
-msgstr ""
-
-#: protocols/groupwise/gwmessagemanager.cpp:498
-msgid "Conversation is not being administratively logged"
-msgstr ""
+#, fuzzy
+#~ msgid "Web Messenger"
+#~ msgstr "Neges"
 
-#: protocols/groupwise/gwmessagemanager.cpp:506
-msgid "This conversation is secured with SSL security."
-msgstr ""
+#~ msgid "Connection closed"
+#~ msgstr "Ceuwyd y cysylltiad"
 
-#: protocols/groupwise/gwmessagemanager.cpp:513
-msgid "This conversation is being logged administratively."
-msgstr ""
+#~ msgid "Other..."
+#~ msgstr "Eraill..."
 
 #, fuzzy
 #~ msgid "Device options"
@@ -16421,9 +15551,6 @@ msgstr ""
 #~ msgid "Project Maintainer, Lead Developer, AIM and ICQ plugin maintainer"
 #~ msgstr "Cynhaliwr y Cywaith, Prif Ddatblygwr, Cynhaliwr yr ategynnau AIM ac ICQ"
 
-#~ msgid "Import Error"
-#~ msgstr "Gwall Mewnforio"
-
 #~ msgid "Change..."
 #~ msgstr "Newid..."
 
diff --git a/tde-i18n-cy/messages/tdenetwork/kpf.po b/tde-i18n-cy/messages/tdenetwork/kpf.po
index b7ba15f5dbf..d8508e427b7 100644
--- a/tde-i18n-cy/messages/tdenetwork/kpf.po
+++ b/tde-i18n-cy/messages/tdenetwork/kpf.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kpf\n"
-"POT-Creation-Date: 2008-08-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2004-02-25 12:45+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -172,19 +173,19 @@ msgstr "%1 Mb/eil"
 msgid "Idle"
 msgstr "Segur"
 
-#: ConfigDialogPage.cpp:51 PropertiesDialogPlugin.cpp:326 ServerWizard.cpp:132
+#: ConfigDialogPage.cpp:51 PropertiesDialogPlugin.cpp:325 ServerWizard.cpp:132
 msgid "&Listen port:"
 msgstr "Porth &gwrando:"
 
-#: ConfigDialogPage.cpp:52 PropertiesDialogPlugin.cpp:327 ServerWizard.cpp:135
+#: ConfigDialogPage.cpp:52 PropertiesDialogPlugin.cpp:326 ServerWizard.cpp:135
 msgid "&Bandwidth limit:"
 msgstr "Terfyn &ystod:"
 
-#: ConfigDialogPage.cpp:59 PropertiesDialogPlugin.cpp:329 ServerWizard.cpp:141
+#: ConfigDialogPage.cpp:59 PropertiesDialogPlugin.cpp:328 ServerWizard.cpp:141
 msgid "&Server name:"
 msgstr "&Enw Gweinydd :"
 
-#: ConfigDialogPage.cpp:66 PropertiesDialogPlugin.cpp:340
+#: ConfigDialogPage.cpp:66 PropertiesDialogPlugin.cpp:339
 msgid "&Follow symbolic links"
 msgstr "&Dilyn cysylltau symbolaidd"
 
@@ -192,7 +193,7 @@ msgstr "&Dilyn cysylltau symbolaidd"
 msgid " kB/s"
 msgstr "kB/eil"
 
-#: ConfigDialogPage.cpp:133 PropertiesDialogPlugin.cpp:403 ServerWizard.cpp:82
+#: ConfigDialogPage.cpp:133 PropertiesDialogPlugin.cpp:402 ServerWizard.cpp:82
 msgid ""
 "<p>Specify the network `port' on which the server should listen for "
 "connections.</p>"
@@ -200,7 +201,7 @@ msgstr ""
 "<p>Penodwch y 'borth' rwydwaith y dylai'r gweinydd wrando am gysylltiadau "
 "arni.</p>"
 
-#: ConfigDialogPage.cpp:142 PropertiesDialogPlugin.cpp:412 ServerWizard.cpp:95
+#: ConfigDialogPage.cpp:142 PropertiesDialogPlugin.cpp:411 ServerWizard.cpp:95
 msgid ""
 "<p>Specify the maximum amount of data (in kilobytes) that will be sent out per "
 "second.</p>"
@@ -211,7 +212,7 @@ msgstr ""
 "<p>Mae hyn yn eich galluogi i gadw rhan o'r ystod i'ch hunan, yn lle caniatáu i "
 "gysylltiadau â kpf i fynnu'ch cysylltiad cyfan.</p>"
 
-#: ConfigDialogPage.cpp:155 PropertiesDialogPlugin.cpp:425
+#: ConfigDialogPage.cpp:155 PropertiesDialogPlugin.cpp:424
 msgid ""
 "<p>Specify the maximum number of connections allowed at any one time.</p>"
 msgstr "<p>Penodwch uchafswm nifer y cysylltiadau ar un adeg.</p>"
@@ -326,33 +327,35 @@ msgid "&Sharing"
 msgstr "&Rhannu"
 
 #: PropertiesDialogPlugin.cpp:285
+#, fuzzy
 msgid ""
 "<p>To share files via the web, you need to be running an 'applet' in your TDE "
-"panel. This 'applet' is a small program which provides file sharing "
-"capabilities.</p>"
+"panel named kpf. This 'applet' is a small program that provides public file "
+"sharing capabilities.</p>"
 msgstr ""
 "<p>I rannu ffeiliau drwy'r wê, mae angen eich bod yn rhedeg 'rhaglennig' yn "
 "eich panel TDE. Rhaglen fach yw'r 'rhaglennig' hon sy'n darparu galluoedd "
 "rhannu ffeiliau.</p>"
 
-#: PropertiesDialogPlugin.cpp:295
+#: PropertiesDialogPlugin.cpp:294
 msgid "Start Applet"
 msgstr "Cycwhyn rhaglennig"
 
-#: PropertiesDialogPlugin.cpp:302 PropertiesDialogPlugin.cpp:558
-msgid "Applet status: <strong>not running</strong>"
+#: PropertiesDialogPlugin.cpp:301 PropertiesDialogPlugin.cpp:557
+#, fuzzy
+msgid "kpf applet status: <strong>not running</strong>"
 msgstr "Cyflwr rhaglennig: <strong>dim yn rhedeg</strong>"
 
-#: PropertiesDialogPlugin.cpp:324
+#: PropertiesDialogPlugin.cpp:323
 #, fuzzy
 msgid "Share this directory on the &Web"
 msgstr "Rhannu'r cyfeiriadur yma ar y &wê"
 
-#: PropertiesDialogPlugin.cpp:349
+#: PropertiesDialogPlugin.cpp:348
 msgid "kB/s"
 msgstr "kB/eil"
 
-#: PropertiesDialogPlugin.cpp:378
+#: PropertiesDialogPlugin.cpp:377
 msgid ""
 "<p>Setting this option makes all files in this directory and any subdirectories "
 "available for reading to anyone who wishes to view them.</p>"
@@ -370,7 +373,7 @@ msgstr ""
 "llyfr cyfeiriadau, ayyb.</p>"
 "<p>Noder na ellwch rannu'ch cyfeiriadur cartref (%1)</p>"
 
-#: PropertiesDialogPlugin.cpp:434
+#: PropertiesDialogPlugin.cpp:433
 msgid ""
 "<p>Allow serving of files which have a symbolic link in the path from / to the "
 "file, or are a symbolic link themselves.</p>"
@@ -382,19 +385,22 @@ msgstr ""
 "<p><strong>Rhybudd!</strong>Gall hyn fod yn risg diogelwch. Defnyddiwch os "
 "ydych yn deall y materion perthnasol.</p>"
 
-#: PropertiesDialogPlugin.cpp:511
-msgid "Applet status: <strong>starting...</strong>"
+#: PropertiesDialogPlugin.cpp:510
+#, fuzzy
+msgid "kpf applet status: <strong>starting...</strong>"
 msgstr "Cyflwr rhaglennig: <strong>yn cychwyn...</strong>"
 
-#: PropertiesDialogPlugin.cpp:523
-msgid "Applet status: <strong>failed to start</strong>"
+#: PropertiesDialogPlugin.cpp:522
+#, fuzzy
+msgid "kpf applet status: <strong>failed to start</strong>"
 msgstr "Cyflwr rhaglennig: <strong>methodd cychwyn</strong>"
 
-#: PropertiesDialogPlugin.cpp:536
-msgid "Applet status: <strong>running</strong>"
+#: PropertiesDialogPlugin.cpp:535
+#, fuzzy
+msgid "kpf applet status: <strong>running</strong>"
 msgstr "Cyflwr rhaglennig: <strong>yn rhedeg</strong>"
 
-#: PropertiesDialogPlugin.cpp:678
+#: PropertiesDialogPlugin.cpp:677
 msgid ""
 "<p>Before you share a directory, be <strong>absolutely certain</strong> "
 "that it does not contain sensitive information.</p>"
@@ -412,11 +418,11 @@ msgstr ""
 "<p>Os oes gennych reolwr cysawd, gofynnwch am ganiatâd cyn rhannu cyfeiriadur "
 "yn y modd yma, os gwelwch yn dda.</p>"
 
-#: PropertiesDialogPlugin.cpp:693
+#: PropertiesDialogPlugin.cpp:692
 msgid "Warning - Sharing Sensitive Information?"
 msgstr "Rhybudd - Rhannu Gwybodaeth Dringar?"
 
-#: PropertiesDialogPlugin.cpp:694
+#: PropertiesDialogPlugin.cpp:693
 msgid "&Share Directory"
 msgstr "&Rhannu Cyfeiriadur"
 
@@ -465,7 +471,8 @@ msgid "Configuring Server %1 - kpf"
 msgstr "Ffurfweddu Gweinydd %1 - kpf"
 
 #: StartingKPFDialog.cpp:57
-msgid "Starting TDE public fileserver applet"
+#, fuzzy
+msgid "Starting KDE public fileserver applet"
 msgstr "Cychwyn rhaglennig gweinydd ffeiliau cyhoeddus TDE"
 
 #: StartingKPFDialog.cpp:70
diff --git a/tde-i18n-cy/messages/tdenetwork/kppp.po b/tde-i18n-cy/messages/tdenetwork/kppp.po
index 3ddfeb0b903..405ec432b63 100644
--- a/tde-i18n-cy/messages/tdenetwork/kppp.po
+++ b/tde-i18n-cy/messages/tdenetwork/kppp.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kppp\n"
-"POT-Creation-Date: 2006-06-13 04:00+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2004-02-26 17:41+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -561,15 +562,15 @@ msgstr "Rhedeg y gorchymyn cychwyn..."
 msgid "Done"
 msgstr "Wedi gorffen"
 
-#: connect.cpp:1279 edit.cpp:157 general.cpp:262 modem.cpp:187
+#: connect.cpp:1280 edit.cpp:157 general.cpp:262 modem.cpp:187
 msgid "None"
 msgstr "Dim"
 
-#: connect.cpp:1281 general.cpp:260 modem.cpp:188 pppdata.cpp:546
+#: connect.cpp:1282 general.cpp:260 modem.cpp:188 pppdata.cpp:546
 msgid "Hardware [CRTSCTS]"
 msgstr "Caledwedd [CRTSCTS]"
 
-#: connect.cpp:1339
+#: connect.cpp:1340
 msgid "pppd command + command-line arguments exceed 2024 characters in length."
 msgstr ""
 "Gorchymyn pppd + ymresymiadau'r llinell orchymyn dros 2024 cymeriad o hyd."
@@ -2297,11 +2298,11 @@ msgstr ""
 " \"%1\"\n"
 " Gall hyn roi cliw ichi pam fod y cysylltiad wedi methu."
 
-#: ppplog.cpp:191
+#: ppplog.cpp:192
 msgid "Unable to provide help."
 msgstr "Methu darparu cymorth."
 
-#: ppplog.cpp:215
+#: ppplog.cpp:218
 msgid ""
 "KPPP could not prepare a PPP log. It's very likely that pppd was started "
 "without the \"debug\" option.\n"
@@ -2315,16 +2316,16 @@ msgstr ""
 "dewisiad debug ymlaen.\n"
 " Wna'i ei droi ymlaen yn awr?"
 
-#: ppplog.cpp:219
+#: ppplog.cpp:222
 #, fuzzy
 msgid "Restart pppd"
 msgstr "Yn cychwyn pppd..."
 
-#: ppplog.cpp:219
+#: ppplog.cpp:222
 msgid "Do Not Restart"
 msgstr "Peidio ag Ailddechrau"
 
-#: ppplog.cpp:224
+#: ppplog.cpp:227
 msgid ""
 "The \"debug\" option has been added. You should now try to reconnect. If that "
 "fails again, you will get a PPP log that may help you to track down the "
@@ -2334,19 +2335,19 @@ msgstr ""
 "Os metha hynny eto, cewch gofnod PPP all eich helpu darganfod y problem "
 "cysylltu."
 
-#: ppplog.cpp:238
+#: ppplog.cpp:241
 msgid "PPP Log"
 msgstr "Cofnod PPP"
 
-#: ppplog.cpp:242
+#: ppplog.cpp:245
 msgid "kppp's diagnosis (just guessing):"
 msgstr "Deiagnosis kppp ('mond dyfalu):"
 
-#: ppplog.cpp:247
+#: ppplog.cpp:250
 msgid "Write to File"
 msgstr "Ysgrifennu i Ffeil"
 
-#: ppplog.cpp:281
+#: ppplog.cpp:284
 msgid ""
 "The PPP log has been saved\n"
 "as \"%1\"!\n"
diff --git a/tde-i18n-cy/messages/tdenetwork/kppplogview.po b/tde-i18n-cy/messages/tdenetwork/kppplogview.po
index 2571d83ca6c..71440a4bfaf 100644
--- a/tde-i18n-cy/messages/tdenetwork/kppplogview.po
+++ b/tde-i18n-cy/messages/tdenetwork/kppplogview.po
@@ -10,10 +10,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kppplogview\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2004-01-06 13:49+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdenetwork/krdc.po b/tde-i18n-cy/messages/tdenetwork/krdc.po
index 3a3692c46bc..5fb5ef114be 100644
--- a/tde-i18n-cy/messages/tdenetwork/krdc.po
+++ b/tde-i18n-cy/messages/tdenetwork/krdc.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: krdc\n"
-"POT-Creation-Date: 2008-07-08 01:20+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2004-02-25 12:40+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -33,19 +34,19 @@ msgstr "kyfieithu@dotmon.com"
 msgid "Enter Key Combination"
 msgstr "Rhowch Gyfuniad Bysyll"
 
-#: krdc.cpp:133 krdc.cpp:156
+#: krdc.cpp:134 krdc.cpp:157
 msgid "The entered host does not have the required form."
 msgstr "Nid oes gan y gwesteiwr a roddwyd y ffurf angenrheidiol."
 
-#: krdc.cpp:134 krdc.cpp:157
+#: krdc.cpp:135 krdc.cpp:158
 msgid "Malformed URL or Host"
 msgstr "URL neu westeiwr wedi'i gamffurfio"
 
-#: krdc.cpp:163
+#: krdc.cpp:164
 msgid "%1 - Remote Desktop Connection"
 msgstr "%1 - Cysylltiad Penbwrdd Pell"
 
-#: krdc.cpp:192
+#: krdc.cpp:193
 msgid ""
 "Here you can see the remote desktop. If the other side allows you to control "
 "it, you can also move the mouse, click or enter keystrokes. If the content does "
@@ -57,47 +58,47 @@ msgstr ""
 "ffitio'ch sgrîn, cliciwch ar fotwm sgrîn-lawn neu fotwm chwyddo y bar offer. I "
 "ddiweddu'r cysylltiad, ceuwch y ffenestr."
 
-#: krdc.cpp:225
+#: krdc.cpp:228
 msgid "Establishing connection..."
 msgstr "Yn sefydlu cysylltiad..."
 
-#: krdc.cpp:231
+#: krdc.cpp:234
 msgid "Authenticating..."
 msgstr "Yn dilysu..."
 
-#: krdc.cpp:236
+#: krdc.cpp:239
 msgid "Preparing desktop..."
 msgstr "Yn paratoi'r penbwrdd..."
 
-#: krdc.cpp:383
+#: krdc.cpp:390
 msgid "View Only"
 msgstr "Golwg yn Unig"
 
-#: krdc.cpp:387
+#: krdc.cpp:394
 msgid "Always Show Local Cursor"
 msgstr ""
 
-#: krdc.cpp:472
+#: krdc.cpp:491
 msgid "Autohide on/off"
 msgstr "Cuddio ymysgogol ymlaen/i ffwrdd"
 
-#: krdc.cpp:479 krdc.cpp:573 krdc.cpp:575
+#: krdc.cpp:497 krdc.cpp:595 krdc.cpp:597
 msgid "Fullscreen"
 msgstr "Sgrîn-lawn"
 
-#: krdc.cpp:485 krdc.cpp:487 krdc.cpp:605
+#: krdc.cpp:503 krdc.cpp:505 krdc.cpp:627
 msgid "Advanced options"
 msgstr "Gosodiadau uwch"
 
-#: krdc.cpp:500 krdc.cpp:584
+#: krdc.cpp:517 krdc.cpp:606
 msgid "Scale view"
 msgstr "Graddu'r Olwg"
 
-#: krdc.cpp:508
+#: krdc.cpp:525
 msgid "Minimize"
 msgstr "Lleihau"
 
-#: krdc.cpp:576
+#: krdc.cpp:598
 msgid ""
 "Switches to full screen. If the remote desktop has a different screen "
 "resolution, Remote Desktop Connection will automatically switch to the nearest "
@@ -106,24 +107,24 @@ msgstr ""
 "Newida i'r sgrîn lawn. Os oes cydraniad gwahanol ar y penbwrdd pell, bydd "
 "Cysylltiad Penbwrdd Pell yn newid yn ymysgogol i'r cydraniad agosaf."
 
-#: krdc.cpp:582
+#: krdc.cpp:604
 msgid "Scale"
 msgstr "Chwyddo"
 
-#: krdc.cpp:585
+#: krdc.cpp:607
 msgid "This option scales the remote screen to fit your window size."
 msgstr ""
 "Mae'r dewisiad yma'n chwyddo'r sgrîn pell i ffitio maint eich ffenestr."
 
-#: krdc.cpp:591
+#: krdc.cpp:613
 msgid "Special Keys"
 msgstr "Bysyll Arbennig"
 
-#: krdc.cpp:593
+#: krdc.cpp:615
 msgid "Enter special keys."
 msgstr "Rhowch fysyll arbennig"
 
-#: krdc.cpp:594
+#: krdc.cpp:616
 msgid ""
 "This option allows you to send special key combinations like Ctrl-Alt-Del to "
 "the remote host."
@@ -131,7 +132,7 @@ msgstr ""
 "Galluoga'r dewisiad hwn i chi anfon cyfuniadau bysyll arbennig megis "
 "Rheoli-Eil-Dileu (Ctrl-Alt-Del) at y gwesteiwr pell."
 
-#: krdc.cpp:603
+#: krdc.cpp:625
 msgid "Advanced"
 msgstr "Uwch"
 
@@ -192,27 +193,27 @@ msgstr "Enw'r gwesteiwr, e.e. 'localhost:1'."
 msgid "Remote Desktop Connection"
 msgstr "Cysylltiad Penbwrdd Pell"
 
-#: main.cpp:86
+#: main.cpp:88
 msgid "RDP backend"
 msgstr "Pen-ôl RDP"
 
-#: main.cpp:88
+#: main.cpp:90
 msgid "Original VNC viewer and protocol design"
 msgstr "Gwelydd VNC gwreiddiol a dyluno protocol"
 
-#: main.cpp:90
+#: main.cpp:92
 msgid "TightVNC encoding"
 msgstr "Amgodiad VNCTyn"
 
-#: main.cpp:92
+#: main.cpp:94
 msgid "ZLib encoding"
 msgstr "Amgodiad ZLib"
 
-#: main.cpp:136
+#: main.cpp:138
 msgid "The password file '%1' does not exist."
 msgstr "Nid yw'r ffeil gyfrinair '%1' yn bodoli."
 
-#: main.cpp:150
+#: main.cpp:152
 msgid "Wrong geometry format, must be widthXheight"
 msgstr "Fformat geometreg anghywir, rhaid bod yn lledXtaldra"
 
@@ -514,7 +515,7 @@ msgstr ""
 "Cliciwch ar eitem i'w ddewis, cliciwch yn ddwbl i gysylltu ar unwaith."
 
 #. i18n: file rdp/rdpprefs.ui line 27
-#: rc.cpp:173 rc.cpp:335
+#: rc.cpp:173 rc.cpp:338
 #, no-c-format
 msgid "Connection"
 msgstr "Cysylltiad"
@@ -543,9 +544,15 @@ msgstr "Mawr (1024x768)"
 msgid "Custom (...)"
 msgstr "Addasiedig (...)"
 
-#. i18n: file rdp/rdpprefs.ui line 92
+#. i18n: file rdp/rdpprefs.ui line 73
 #: rc.cpp:188
 #, no-c-format
+msgid "Full Screen (Maximized)"
+msgstr ""
+
+#. i18n: file rdp/rdpprefs.ui line 97
+#: rc.cpp:191
+#, no-c-format
 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."
@@ -553,8 +560,8 @@ msgstr ""
 "Yma gallwch benodi cydraniad y penbwrdd pell.  Byd y cydraniad yma yn penodi "
 "maint y penbwrdd a ddangosir i chi."
 
-#. i18n: file rdp/rdpprefs.ui line 109
-#: rc.cpp:191
+#. i18n: file rdp/rdpprefs.ui line 114
+#: rc.cpp:194
 #, no-c-format
 msgid ""
 "This is the width of the remote desktop. You can only change this value "
@@ -563,14 +570,14 @@ msgstr ""
 "Lled y penbwrdd pell.  Gallwch newid y gwerth yma â llaw os benodwch Addasiedig "
 "fel cydraniad penbwrdd yn uchod yn unig."
 
-#. i18n: file rdp/rdpprefs.ui line 120
-#: rc.cpp:194
+#. i18n: file rdp/rdpprefs.ui line 125
+#: rc.cpp:197
 #, no-c-format
 msgid "H&eight:"
 msgstr "&Taldra:"
 
-#. i18n: file rdp/rdpprefs.ui line 143
-#: rc.cpp:197
+#. i18n: file rdp/rdpprefs.ui line 148
+#: rc.cpp:200
 #, no-c-format
 msgid ""
 "This is the height of the remote desktop. You can only change this value "
@@ -579,206 +586,206 @@ msgstr ""
 "Taldra'r penbwrdd pell.  Gallwch newid y gwerth yma â llaw os benodwch "
 "Addasiedig fel cydraniad penbwrdd yn uchod yn unig."
 
-#. i18n: file rdp/rdpprefs.ui line 149
-#: rc.cpp:200
+#. i18n: file rdp/rdpprefs.ui line 154
+#: rc.cpp:203
 #, no-c-format
 msgid "Arabic (ar)"
 msgstr "Arabeg (ar)"
 
-#. i18n: file rdp/rdpprefs.ui line 154
-#: rc.cpp:203
+#. i18n: file rdp/rdpprefs.ui line 159
+#: rc.cpp:206
 #, no-c-format
 msgid "Czech (cs)"
 msgstr ""
 
-#. i18n: file rdp/rdpprefs.ui line 159
-#: rc.cpp:206
+#. i18n: file rdp/rdpprefs.ui line 164
+#: rc.cpp:209
 #, no-c-format
 msgid "Danish (da)"
 msgstr "Daneg (da)"
 
-#. i18n: file rdp/rdpprefs.ui line 164
-#: rc.cpp:209
+#. i18n: file rdp/rdpprefs.ui line 169
+#: rc.cpp:212
 #, no-c-format
 msgid "German (de)"
 msgstr "Almaeneg (de)"
 
-#. i18n: file rdp/rdpprefs.ui line 169
-#: rc.cpp:212
+#. i18n: file rdp/rdpprefs.ui line 174
+#: rc.cpp:215
 #, fuzzy, no-c-format
 msgid "Swiss German (de-ch)"
 msgstr "Almaeneg (de)"
 
-#. i18n: file rdp/rdpprefs.ui line 174
-#: rc.cpp:215
+#. i18n: file rdp/rdpprefs.ui line 179
+#: rc.cpp:218
 #, fuzzy, no-c-format
 msgid "British English (en-gb)"
 msgstr "Saesneg PF (en-gb)"
 
-#. i18n: file rdp/rdpprefs.ui line 179
-#: rc.cpp:218
+#. i18n: file rdp/rdpprefs.ui line 184
+#: rc.cpp:221
 #, fuzzy, no-c-format
 msgid "US English (en-us)"
 msgstr "Saesneg UD (en-us)"
 
-#. i18n: file rdp/rdpprefs.ui line 184
-#: rc.cpp:221
+#. i18n: file rdp/rdpprefs.ui line 189
+#: rc.cpp:224
 #, no-c-format
 msgid "Spanish (es)"
 msgstr "Sbaeneg (es)"
 
-#. i18n: file rdp/rdpprefs.ui line 189
-#: rc.cpp:224
+#. i18n: file rdp/rdpprefs.ui line 194
+#: rc.cpp:227
 #, fuzzy, no-c-format
 msgid "Estonian (et)"
 msgstr "Lithwaneg (lt)"
 
-#. i18n: file rdp/rdpprefs.ui line 194
-#: rc.cpp:227
+#. i18n: file rdp/rdpprefs.ui line 199
+#: rc.cpp:230
 #, no-c-format
 msgid "Finnish (fi)"
 msgstr "Ffineg (fi)"
 
-#. i18n: file rdp/rdpprefs.ui line 199
-#: rc.cpp:230
+#. i18n: file rdp/rdpprefs.ui line 204
+#: rc.cpp:233
 #, no-c-format
 msgid "French (fr)"
 msgstr "Ffrangeg (fr)"
 
-#. i18n: file rdp/rdpprefs.ui line 204
-#: rc.cpp:233
+#. i18n: file rdp/rdpprefs.ui line 209
+#: rc.cpp:236
 #, no-c-format
 msgid "Belgium (fr-be)"
 msgstr "Frangeg Belg (fr-be)"
 
-#. i18n: file rdp/rdpprefs.ui line 209
-#: rc.cpp:236
+#. i18n: file rdp/rdpprefs.ui line 214
+#: rc.cpp:239
 #, fuzzy, no-c-format
 msgid "French Canadian (fr-ca)"
 msgstr "Ffrangeg (fr)"
 
-#. i18n: file rdp/rdpprefs.ui line 214
-#: rc.cpp:239
+#. i18n: file rdp/rdpprefs.ui line 219
+#: rc.cpp:242
 #, fuzzy, no-c-format
 msgid "Swiss French (fr-ch)"
 msgstr "Ffrangeg (fr)"
 
-#. i18n: file rdp/rdpprefs.ui line 219
-#: rc.cpp:242
+#. i18n: file rdp/rdpprefs.ui line 224
+#: rc.cpp:245
 #, fuzzy, no-c-format
 msgid "Croatian (hr)"
 msgstr "Croateg (hr)"
 
-#. i18n: file rdp/rdpprefs.ui line 224
-#: rc.cpp:245
+#. i18n: file rdp/rdpprefs.ui line 229
+#: rc.cpp:248
 #, no-c-format
 msgid "Hungarian (hu)"
 msgstr "Hwngareg (hu)"
 
-#. i18n: file rdp/rdpprefs.ui line 229
-#: rc.cpp:248
+#. i18n: file rdp/rdpprefs.ui line 234
+#: rc.cpp:251
 #, fuzzy, no-c-format
 msgid "Icelandic (is)"
 msgstr "Eidaleg (it)"
 
-#. i18n: file rdp/rdpprefs.ui line 234
-#: rc.cpp:251
+#. i18n: file rdp/rdpprefs.ui line 239
+#: rc.cpp:254
 #, no-c-format
 msgid "Italian (it)"
 msgstr "Eidaleg (it)"
 
-#. i18n: file rdp/rdpprefs.ui line 239
-#: rc.cpp:254
+#. i18n: file rdp/rdpprefs.ui line 244
+#: rc.cpp:257
 #, no-c-format
 msgid "Japanese (ja)"
 msgstr "Siaponeg (ja)"
 
-#. i18n: file rdp/rdpprefs.ui line 244
-#: rc.cpp:257
+#. i18n: file rdp/rdpprefs.ui line 249
+#: rc.cpp:260
 #, no-c-format
 msgid "Lithuanian (lt)"
 msgstr "Lithwaneg (lt)"
 
-#. i18n: file rdp/rdpprefs.ui line 249
-#: rc.cpp:260
+#. i18n: file rdp/rdpprefs.ui line 254
+#: rc.cpp:263
 #, no-c-format
 msgid "Latvian (lv)"
 msgstr "Latfieg (lv)"
 
-#. i18n: file rdp/rdpprefs.ui line 254
-#: rc.cpp:263
+#. i18n: file rdp/rdpprefs.ui line 259
+#: rc.cpp:266
 #, no-c-format
 msgid "Macedonian (mk)"
 msgstr "Macedoneg (mk)"
 
-#. i18n: file rdp/rdpprefs.ui line 259
-#: rc.cpp:266
+#. i18n: file rdp/rdpprefs.ui line 264
+#: rc.cpp:269
 #, no-c-format
 msgid "Dutch (nl)"
 msgstr ""
 
-#. i18n: file rdp/rdpprefs.ui line 264
-#: rc.cpp:269
+#. i18n: file rdp/rdpprefs.ui line 269
+#: rc.cpp:272
 #, fuzzy, no-c-format
 msgid "Belgian Dutch (nl-be)"
 msgstr "Frangeg Belg (fr-be)"
 
-#. i18n: file rdp/rdpprefs.ui line 269
-#: rc.cpp:272
+#. i18n: file rdp/rdpprefs.ui line 274
+#: rc.cpp:275
 #, no-c-format
 msgid "Norwegian (no)"
 msgstr "Norwyeg (no)"
 
-#. i18n: file rdp/rdpprefs.ui line 274
-#: rc.cpp:275
+#. i18n: file rdp/rdpprefs.ui line 279
+#: rc.cpp:278
 #, no-c-format
 msgid "Polish (pl)"
 msgstr "Poleg (po)"
 
-#. i18n: file rdp/rdpprefs.ui line 279
-#: rc.cpp:278
+#. i18n: file rdp/rdpprefs.ui line 284
+#: rc.cpp:281
 #, no-c-format
 msgid "Portuguese (pt)"
 msgstr "Portiwgaleg (pt)"
 
-#. i18n: file rdp/rdpprefs.ui line 284
-#: rc.cpp:281
+#. i18n: file rdp/rdpprefs.ui line 289
+#: rc.cpp:284
 #, no-c-format
 msgid "Brazilian (pt-br)"
 msgstr "Portiwgaleg Brasil (pt-br)"
 
-#. i18n: file rdp/rdpprefs.ui line 289
-#: rc.cpp:284
+#. i18n: file rdp/rdpprefs.ui line 294
+#: rc.cpp:287
 #, no-c-format
 msgid "Russian (ru)"
 msgstr "Rwsieg (ru)"
 
-#. i18n: file rdp/rdpprefs.ui line 294
-#: rc.cpp:287
+#. i18n: file rdp/rdpprefs.ui line 299
+#: rc.cpp:290
 #, no-c-format
 msgid "Slovenian (sl)"
 msgstr "Slofeneg (sl)"
 
-#. i18n: file rdp/rdpprefs.ui line 299
-#: rc.cpp:290
+#. i18n: file rdp/rdpprefs.ui line 304
+#: rc.cpp:293
 #, no-c-format
 msgid "Swedish (sv)"
 msgstr "Swedeg (sv)"
 
-#. i18n: file rdp/rdpprefs.ui line 304
-#: rc.cpp:293
+#. i18n: file rdp/rdpprefs.ui line 309
+#: rc.cpp:296
 #, no-c-format
 msgid "Thai (th)"
 msgstr "Thai (th)"
 
-#. i18n: file rdp/rdpprefs.ui line 309
-#: rc.cpp:296
+#. i18n: file rdp/rdpprefs.ui line 314
+#: rc.cpp:299
 #, no-c-format
 msgid "Turkish (tr)"
 msgstr "Twrceg (tr)"
 
-#. i18n: file rdp/rdpprefs.ui line 336
-#: rc.cpp:299
+#. i18n: file rdp/rdpprefs.ui line 341
+#: rc.cpp:302
 #, no-c-format
 msgid ""
 "Use this to specify your keyboard layout. This layout setting is used to send "
@@ -787,68 +794,68 @@ msgstr ""
 "Defnyddiwch hwn i benodi cynllun eich bysellfwrdd.  Defnyddir y gosodiad "
 "cynllun yma i anfon y codau bysellfwrdd iawn i'r gweinydd."
 
-#. i18n: file rdp/rdpprefs.ui line 352
-#: rc.cpp:302
+#. i18n: file rdp/rdpprefs.ui line 357
+#: rc.cpp:305
 #, no-c-format
 msgid "&Keyboard layout:"
 msgstr "Cynllun &bysellfwrdd:"
 
-#. i18n: file rdp/rdpprefs.ui line 366
-#: rc.cpp:305 rc.cpp:344
+#. i18n: file rdp/rdpprefs.ui line 371
+#: rc.cpp:308 rc.cpp:347
 #, no-c-format
 msgid "Use K&Wallet for passwords"
 msgstr ""
 
-#. i18n: file rdp/rdpprefs.ui line 369
-#: rc.cpp:308 rc.cpp:347
+#. i18n: file rdp/rdpprefs.ui line 374
+#: rc.cpp:311 rc.cpp:350
 #, no-c-format
 msgid "Enable this option to store your passwords with TDEWallet."
 msgstr ""
 
-#. i18n: file rdp/rdpprefs.ui line 385
-#: rc.cpp:311
+#. i18n: file rdp/rdpprefs.ui line 390
+#: rc.cpp:314
 #, no-c-format
 msgid "Desktop &resolution:"
 msgstr "Cy&draniad y penbwrdd:"
 
-#. i18n: file rdp/rdpprefs.ui line 404
-#: rc.cpp:314
+#. i18n: file rdp/rdpprefs.ui line 409
+#: rc.cpp:317
 #, no-c-format
 msgid "Color &depth:"
 msgstr "Dyfnde&r lliw :"
 
-#. i18n: file rdp/rdpprefs.ui line 418
-#: rc.cpp:317
+#. i18n: file rdp/rdpprefs.ui line 423
+#: rc.cpp:320
 #, no-c-format
 msgid "&Width:"
 msgstr "&Lled:"
 
-#. i18n: file rdp/rdpprefs.ui line 430
-#: rc.cpp:320
+#. i18n: file rdp/rdpprefs.ui line 435
+#: rc.cpp:323
 #, no-c-format
 msgid "Low Color (8 Bit)"
 msgstr ""
 
-#. i18n: file rdp/rdpprefs.ui line 435
-#: rc.cpp:323
+#. i18n: file rdp/rdpprefs.ui line 440
+#: rc.cpp:326
 #, no-c-format
 msgid "High Color (16 Bit)"
 msgstr ""
 
-#. i18n: file rdp/rdpprefs.ui line 440
-#: rc.cpp:326
+#. i18n: file rdp/rdpprefs.ui line 445
+#: rc.cpp:329
 #, no-c-format
 msgid "True Color (24 Bit)"
 msgstr ""
 
-#. i18n: file rdp/rdpprefs.ui line 454
-#: rc.cpp:329 rc.cpp:365
+#. i18n: file rdp/rdpprefs.ui line 459
+#: rc.cpp:332 rc.cpp:368
 #, no-c-format
 msgid "&Show this dialog again for this host"
 msgstr "D&angos yr ymgom yma eto ar gyfer y gwesteiwr yma"
 
-#. i18n: file rdp/rdpprefs.ui line 457
-#: rc.cpp:332 rc.cpp:368
+#. i18n: file rdp/rdpprefs.ui line 462
+#: rc.cpp:335 rc.cpp:371
 #, no-c-format
 msgid ""
 "Select this option if you do not want to be asked for the settings when "
@@ -860,14 +867,14 @@ msgstr ""
 "westeiwyr. Ffurfweddir gwesteiwyr newydd â'r rhagosodion."
 
 #. i18n: file vnc/vncprefs.ui line 41
-#: rc.cpp:338
+#: rc.cpp:341
 #, no-c-format
 msgid "&Enable encryption (secure, but slow and not always possible)"
 msgstr ""
 "&Galluogi cêl-ysgrifaeth (diogel, ond araf ac nid yw ar gael bob amser)"
 
 #. i18n: file vnc/vncprefs.ui line 44
-#: rc.cpp:341
+#: rc.cpp:344
 #, no-c-format
 msgid ""
 "Enable this option to encrypt the connection. Only newer servers support this "
@@ -879,31 +886,31 @@ msgstr ""
 "clustfeinio, ond gall arafu'r cysylltiad yn sylweddol."
 
 #. i18n: file vnc/vncprefs.ui line 74
-#: rc.cpp:350
+#: rc.cpp:353
 #, no-c-format
 msgid "Connection &type:"
 msgstr "&Math cysylltiad:"
 
 #. i18n: file vnc/vncprefs.ui line 83
-#: rc.cpp:353
+#: rc.cpp:356
 #, no-c-format
 msgid "High Quality (LAN, direct connection)"
 msgstr "Ansawdd Uchel (LAN, cysylltiad uniongyrchol)"
 
 #. i18n: file vnc/vncprefs.ui line 88
-#: rc.cpp:356
+#: rc.cpp:359
 #, no-c-format
 msgid "Medium Quality (DSL, Cable, fast Internet)"
 msgstr "Ansawdd Canolig (DSL, Cêbl, Rhyngrwyd cyflym)"
 
 #. i18n: file vnc/vncprefs.ui line 93
-#: rc.cpp:359
+#: rc.cpp:362
 #, no-c-format
 msgid "Low Quality (Modem, ISDN, slow Internet)"
 msgstr "Ansawdd Isel (Modem, ISDN, Rhyngrwyd araf)"
 
 #. i18n: file vnc/vncprefs.ui line 114
-#: rc.cpp:362
+#: rc.cpp:365
 #, fuzzy, no-c-format
 msgid ""
 "Use this to specify the performance of your connection. Note that you should "
@@ -921,39 +928,39 @@ msgstr ""
 "arafach. Bydd dewis ansawdd is yn codi cuddni ar gysylltiadau cyflymder uchel "
 "ac yn achosi ansawdd delwedd is, yn arbennig ym modd 'Ansawdd Isel'."
 
-#: rdp/krdpview.cpp:170
+#: rdp/krdpview.cpp:172
 #, c-format
 msgid "RDP Host Preferences for %1"
 msgstr "Hoffterau Gwesteiwr RDP ar gyfer %1"
 
-#: rdp/krdpview.cpp:262
+#: rdp/krdpview.cpp:279
 msgid "Please enter the password."
 msgstr ""
 
-#: rdp/krdpview.cpp:284
+#: rdp/krdpview.cpp:301
 msgid "Could not start rdesktop; make sure rdesktop is properly installed."
 msgstr ""
 
-#: rdp/krdpview.cpp:285
+#: rdp/krdpview.cpp:302
 #, fuzzy
 msgid "rdesktop Failure"
 msgstr "Methiant Cysylltiad"
 
-#: rdp/krdpview.cpp:345 vnc/kvncview.cpp:458
+#: rdp/krdpview.cpp:367 vnc/kvncview.cpp:467
 msgid "Connection attempt to host failed."
 msgstr "Methodd y cais cysylltu â'r gwesteiwr."
 
-#: rdp/krdpview.cpp:346 vnc/kvncview.cpp:223 vnc/kvncview.cpp:459
-#: vnc/kvncview.cpp:464 vnc/kvncview.cpp:469 vnc/kvncview.cpp:474
-#: vnc/kvncview.cpp:479 vnc/kvncview.cpp:484
+#: rdp/krdpview.cpp:368 vnc/kvncview.cpp:225 vnc/kvncview.cpp:468
+#: vnc/kvncview.cpp:473 vnc/kvncview.cpp:478 vnc/kvncview.cpp:483
+#: vnc/kvncview.cpp:488 vnc/kvncview.cpp:493
 msgid "Connection Failure"
 msgstr "Methiant Cysylltiad"
 
 #: rdp/rdphostpref.cpp:112
 #, fuzzy
 msgid ""
-"Show Preferences: %1, Resolution: %2x%3, Color Depth: %4, Keymap: %5, TDEWallet: "
-"%6"
+"Show Preferences: %1, Resolution: %2x%3, Color Depth: %4, Keymap: %5, "
+"TDEWallet: %6"
 msgstr "Dangos Hoffterau: %1, Cydraniad: %2x%3, Bysellfap: %4"
 
 #: rdp/rdphostpref.cpp:113 rdp/rdphostpref.cpp:114 vnc/vnchostpref.cpp:99
@@ -964,56 +971,59 @@ msgstr "ie"
 msgid "no"
 msgstr "nage"
 
-#: vnc/kvncview.cpp:222
+#: vnc/kvncview.cpp:224
 #, fuzzy
 msgid "It is not possible to connect to a local desktop sharing service."
 msgstr "Ni ellir cysylltu â gwasanaeth Rhannu Penbwrdd lleol."
 
-#: vnc/kvncview.cpp:237
+#: vnc/kvncview.cpp:239
 #, c-format
 msgid "VNC Host Preferences for %1"
 msgstr "Hoffterau Gwesteiwr VNC ar gyfer %1"
 
-#: vnc/kvncview.cpp:407
+#: vnc/kvncview.cpp:416
 msgid "Access to the system requires a password."
 msgstr "Mae angen cyfrinair i gael mynediad i'r cysawd."
 
-#: vnc/kvncview.cpp:463
+#: vnc/kvncview.cpp:472
 msgid "Remote host is using an incompatible protocol."
 msgstr "Mae'r gwesteiwr pell yn defnyddio protocol anghydnaws."
 
-#: vnc/kvncview.cpp:468
+#: vnc/kvncview.cpp:477
 msgid "The connection to the host has been interrupted."
 msgstr "Ymyrrwyd y cysylltiad i'r gwesteiwr."
 
-#: vnc/kvncview.cpp:473
+#: vnc/kvncview.cpp:482
 msgid "Connection failed. The server does not accept new connections."
 msgstr ""
 "Methodd y cysylltiad.  Nid yw'r gweinydd yn derbyn cysylltiadau newydd."
 
-#: vnc/kvncview.cpp:478
+#: vnc/kvncview.cpp:487
 msgid "Connection failed. A server with the given name cannot be found."
 msgstr "Methodd y cysylltiad.  Ni ellir canfod gweinydd efo'r enw a roddwyd."
 
-#: vnc/kvncview.cpp:483
-msgid "Connection failed. No server running at the given address and port."
+#: vnc/kvncview.cpp:492
+#, fuzzy
+msgid ""
+"Connection failed. No server running at the given address and port. Verify the "
+"KDED TDE Internet Daemon is running at the remote server."
 msgstr ""
 "Methodd y cysylltiad.  Nid yw gweinydd yn rhedeg wrth y cyfeiriad a phorth a "
 "roddwyd."
 
-#: vnc/kvncview.cpp:492
+#: vnc/kvncview.cpp:501
 msgid "Authentication failed. Connection aborted."
 msgstr "Methodd y dilysiant.  Erthylwyd y cysylltiad."
 
-#: vnc/kvncview.cpp:493
+#: vnc/kvncview.cpp:502
 msgid "Authentication Failure"
 msgstr "Methiant Dilysiant"
 
-#: vnc/kvncview.cpp:497
+#: vnc/kvncview.cpp:506
 msgid "Unknown error."
 msgstr "Gwall anhysbys."
 
-#: vnc/kvncview.cpp:498
+#: vnc/kvncview.cpp:507
 msgid "Unknown Error"
 msgstr "Gwall Anhysbys"
 
diff --git a/tde-i18n-cy/messages/tdenetwork/krfb.po b/tde-i18n-cy/messages/tdenetwork/krfb.po
index 53bc4f14857..dc58725567c 100644
--- a/tde-i18n-cy/messages/tdenetwork/krfb.po
+++ b/tde-i18n-cy/messages/tdenetwork/krfb.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: krfb\n"
-"POT-Creation-Date: 2008-07-08 01:20+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2004-01-06 16:42+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdenetwork/ksirc.po b/tde-i18n-cy/messages/tdenetwork/ksirc.po
index 80767be5028..292b2568873 100644
--- a/tde-i18n-cy/messages/tdenetwork/ksirc.po
+++ b/tde-i18n-cy/messages/tdenetwork/ksirc.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ksirc\n"
-"POT-Creation-Date: 2008-07-08 01:20+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2004-02-26 18:27+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdenetwork/kwifimanager.po b/tde-i18n-cy/messages/tdenetwork/kwifimanager.po
index df33ed205b8..c86819553ed 100644
--- a/tde-i18n-cy/messages/tdenetwork/kwifimanager.po
+++ b/tde-i18n-cy/messages/tdenetwork/kwifimanager.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kwifimanager\n"
-"POT-Creation-Date: 2006-11-26 03:33+0100\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2004-01-06 18:37+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -33,45 +34,45 @@ msgstr "kyfieithu@dotmon.com"
 msgid "UNKNOWN"
 msgstr "ANHYSBYS"
 
-#: interface_wireless_wirelessextensions.cpp:524
+#: interface_wireless_wirelessextensions.cpp:528
 #, fuzzy
 msgid "Network Name"
 msgstr "Enw rhwydwaith:"
 
-#: interface_wireless_wirelessextensions.cpp:525
+#: interface_wireless_wirelessextensions.cpp:529
 msgid "Mode"
 msgstr "Modd"
 
-#: interface_wireless_wirelessextensions.cpp:526
+#: interface_wireless_wirelessextensions.cpp:530
 msgid "Quality"
 msgstr "Ansawdd"
 
-#: interface_wireless_wirelessextensions.cpp:527
+#: interface_wireless_wirelessextensions.cpp:531
 msgid "WEP"
 msgstr ""
 
-#: interface_wireless_wirelessextensions.cpp:541
+#: interface_wireless_wirelessextensions.cpp:545
 msgid ""
 "Unable to perform the scan. Please make sure the executable \"iwlist\" is in "
 "your $PATH."
 msgstr ""
 
-#: interface_wireless_wirelessextensions.cpp:542
-#: interface_wireless_wirelessextensions.cpp:567
+#: interface_wireless_wirelessextensions.cpp:546
+#: interface_wireless_wirelessextensions.cpp:571
 msgid "Scanning not possible"
 msgstr ""
 
-#: interface_wireless_wirelessextensions.cpp:566
+#: interface_wireless_wirelessextensions.cpp:570
 msgid ""
 "Your card does not support scanning. The results window will not contain any "
 "results."
 msgstr ""
 
-#: interface_wireless_wirelessextensions.cpp:584 networkscanning.cpp:130
+#: interface_wireless_wirelessextensions.cpp:588 networkscanning.cpp:130
 msgid "Managed"
 msgstr "Rheolwyd"
 
-#: interface_wireless_wirelessextensions.cpp:586
+#: interface_wireless_wirelessextensions.cpp:590
 msgid "Ad-Hoc"
 msgstr "Ad-hoc"
 
diff --git a/tde-i18n-cy/messages/tdenetwork/kwireless.po b/tde-i18n-cy/messages/tdenetwork/kwireless.po
index cbc2c99459b..992a24a835a 100644
--- a/tde-i18n-cy/messages/tdenetwork/kwireless.po
+++ b/tde-i18n-cy/messages/tdenetwork/kwireless.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kwireless\n"
-"POT-Creation-Date: 2004-12-11 01:20+0100\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2004-01-06 18:38+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdenetwork/tdefile_torrent.po b/tde-i18n-cy/messages/tdenetwork/tdefile_torrent.po
index d34d95bd88e..184c0bb20a8 100644
--- a/tde-i18n-cy/messages/tdenetwork/tdefile_torrent.po
+++ b/tde-i18n-cy/messages/tdenetwork/tdefile_torrent.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: all.po\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdenetwork/tdefileshare.po b/tde-i18n-cy/messages/tdenetwork/tdefileshare.po
index ee106594d92..660401d4a6f 100644
--- a/tde-i18n-cy/messages/tdenetwork/tdefileshare.po
+++ b/tde-i18n-cy/messages/tdenetwork/tdefileshare.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdenetwork/tdefileshare.po\n"
-"POT-Creation-Date: 2008-07-08 01:20+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -121,7 +122,7 @@ msgid "Shared Folders"
 msgstr ""
 
 #. i18n: file ./simple/controlcenter.ui line 303
-#: rc.cpp:54 rc.cpp:914
+#: rc.cpp:54 rc.cpp:1443
 #, no-c-format
 msgid "Path"
 msgstr "Llwybr"
@@ -151,7 +152,7 @@ msgid "Chang&e..."
 msgstr "N&ewid..."
 
 #. i18n: file ./simple/controlcenter.ui line 388
-#: rc.cpp:69 rc.cpp:986
+#: rc.cpp:69 rc.cpp:1515
 #, no-c-format
 msgid "Rem&ove"
 msgstr "Tyn&nu ymaith"
@@ -578,810 +579,1604 @@ msgstr ""
 msgid "&Domain:"
 msgstr "&Parth:"
 
-#. i18n: file ./advanced/kcm_sambaconf/userselectdlg.ui line 16
+#. i18n: file ./advanced/kcm_sambaconf/groupselectdlg.ui line 16
 #: rc.cpp:306
 #, no-c-format
-msgid "Select Users"
+msgid "Select Groups"
 msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/userselectdlg.ui line 36
-#: rc.cpp:309
+#. i18n: file ./advanced/kcm_sambaconf/groupselectdlg.ui line 136
+#: rc.cpp:315
 #, no-c-format
-msgid "Select &Users"
+msgid "Selec&t Groups"
 msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/userselectdlg.ui line 51
-#: rc.cpp:312 rc.cpp:657 rc.cpp:911 rc.cpp:941 rc.cpp:971 rc.cpp:992
-#: rc.cpp:2150 rc.cpp:2285
+#. i18n: file ./advanced/kcm_sambaconf/groupselectdlg.ui line 151
+#: rc.cpp:318 rc.cpp:825 rc.cpp:1440 rc.cpp:1470 rc.cpp:1500 rc.cpp:1521
+#: rc.cpp:2679 rc.cpp:2718
 #, no-c-format
 msgid "Name"
 msgstr "Enw"
 
-#. i18n: file ./advanced/kcm_sambaconf/userselectdlg.ui line 62
-#: rc.cpp:315 rc.cpp:974 rc.cpp:995 rc.cpp:2153
-#, no-c-format
-msgid "UID"
-msgstr "UID"
-
-#. i18n: file ./advanced/kcm_sambaconf/userselectdlg.ui line 73
-#: rc.cpp:318 rc.cpp:660 rc.cpp:2156
+#. i18n: file ./advanced/kcm_sambaconf/groupselectdlg.ui line 162
+#: rc.cpp:321 rc.cpp:2685 rc.cpp:2724
 #, no-c-format
 msgid "GID"
 msgstr "GID"
 
-#. i18n: file ./advanced/kcm_sambaconf/userselectdlg.ui line 104
-#: rc.cpp:321 rc.cpp:663
+#. i18n: file ./advanced/kcm_sambaconf/groupselectdlg.ui line 201
+#: rc.cpp:324 rc.cpp:2727
 #, no-c-format
 msgid "Acc&ess"
 msgstr "&Cyrchiad"
 
-#. i18n: file ./advanced/kcm_sambaconf/userselectdlg.ui line 121
-#: rc.cpp:324 rc.cpp:666
+#. i18n: file ./advanced/kcm_sambaconf/groupselectdlg.ui line 226
+#: rc.cpp:327 rc.cpp:2730
 #, no-c-format
 msgid "&Default"
 msgstr "&Rhagosod"
 
-#. i18n: file ./advanced/kcm_sambaconf/userselectdlg.ui line 135
-#: rc.cpp:327 rc.cpp:669
+#. i18n: file ./advanced/kcm_sambaconf/groupselectdlg.ui line 248
+#: rc.cpp:330 rc.cpp:2733
 #, no-c-format
 msgid "&Read access"
 msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/userselectdlg.ui line 146
-#: rc.cpp:330 rc.cpp:672
+#. i18n: file ./advanced/kcm_sambaconf/groupselectdlg.ui line 267
+#: rc.cpp:333 rc.cpp:2736
 #, no-c-format
 msgid "&Write access"
 msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/userselectdlg.ui line 157
-#: rc.cpp:333 rc.cpp:675
+#. i18n: file ./advanced/kcm_sambaconf/groupselectdlg.ui line 286
+#: rc.cpp:336 rc.cpp:2739
 #, no-c-format
 msgid "&Admin access"
 msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/userselectdlg.ui line 168
-#: rc.cpp:336 rc.cpp:678
+#. i18n: file ./advanced/kcm_sambaconf/groupselectdlg.ui line 305
+#: rc.cpp:339 rc.cpp:2742
 #, no-c-format
 msgid "&No access at all"
 msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 37
+#. i18n: file ./advanced/kcm_sambaconf/groupselectdlg.ui line 318
+#: rc.cpp:342
+#, no-c-format
+msgid "&Kind of Group"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/groupselectdlg.ui line 343
 #: rc.cpp:345
 #, no-c-format
+msgid "&UNIX group"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/groupselectdlg.ui line 368
+#: rc.cpp:348
+#, no-c-format
+msgid "NI&S group"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/groupselectdlg.ui line 393
+#: rc.cpp:351
+#, no-c-format
+msgid "UNIX and NIS gr&oup"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/expertuserdlg.ui line 16
+#: rc.cpp:354
+#, no-c-format
+msgid "User Settings"
+msgstr "Gosodiadau Defnyddiwr"
+
+#. i18n: file ./advanced/kcm_sambaconf/expertuserdlg.ui line 38
+#: rc.cpp:357
+#, no-c-format
+msgid "&Valid users:"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/expertuserdlg.ui line 62
+#: rc.cpp:360
+#, no-c-format
+msgid "&Admin users:"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/expertuserdlg.ui line 86
+#: rc.cpp:363
+#, no-c-format
+msgid "&Invalid users:"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/expertuserdlg.ui line 202
+#: rc.cpp:372
+#, no-c-format
+msgid "&Write list:"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/expertuserdlg.ui line 231
+#: rc.cpp:375
+#, no-c-format
+msgid "&Read list:"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/socketoptionsdlg.ui line 37
+#: rc.cpp:378 rc.cpp:2182
+#, no-c-format
+msgid "Socket Options"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/socketoptionsdlg.ui line 71
+#: rc.cpp:381
+#, no-c-format
+msgid "SO_SNDLOWAT:"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/socketoptionsdlg.ui line 79
+#: rc.cpp:384
+#, no-c-format
+msgid "IPTOS_THROUGHPUT"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/socketoptionsdlg.ui line 87
+#: rc.cpp:387
+#, no-c-format
+msgid "SO_SNDBUF:"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/socketoptionsdlg.ui line 95
+#: rc.cpp:390
+#, no-c-format
+msgid "SO_KEEPALIVE"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/socketoptionsdlg.ui line 103
+#: rc.cpp:393 rc.cpp:2212
+#, no-c-format
+msgid "SO_RCVBUF:"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/socketoptionsdlg.ui line 133
+#: rc.cpp:396 rc.cpp:2191
+#, no-c-format
+msgid "SO_BROADCAST"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/socketoptionsdlg.ui line 141
+#: rc.cpp:399 rc.cpp:2197
+#, no-c-format
+msgid "IPTOS_LOWDELAY"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/socketoptionsdlg.ui line 149
+#: rc.cpp:402
+#, no-c-format
+msgid "TCP_NODELAY"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/socketoptionsdlg.ui line 157
+#: rc.cpp:405
+#, no-c-format
+msgid "SO_RCVLOWAT:"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/socketoptionsdlg.ui line 187
+#: rc.cpp:408
+#, no-c-format
+msgid "SO_REUSEADDR"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/socketoptionsdlg.ui line 225
+#: rc.cpp:414 rc.cpp:714 rc.cpp:1282 rc.cpp:1330
+#, no-c-format
+msgid "F1"
+msgstr "F1"
+
+#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 72
+#: rc.cpp:423
+#, no-c-format
+msgid "Not share&d"
+msgstr "Dim wedi'&i rhannu"
+
+#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 86
+#: rc.cpp:426
+#, no-c-format
+msgid "&Shared"
+msgstr "&Wedi ei rhannu"
+
+#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 103
+#: rc.cpp:429
+#, no-c-format
+msgid "Bas&e Options"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 124
+#: rc.cpp:432 rc.cpp:1446 rc.cpp:1476
+#, no-c-format
+msgid "Comment"
+msgstr "Sylwad"
+
+#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 127
+#: rc.cpp:435 rc.cpp:453
+#, no-c-format
+msgid ""
+"This is a text field that is seen next to a share when a client queries the "
+"server, either via the network neighborhood or via net view, to list what "
+"shares are available."
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 139
+#: rc.cpp:438
+#, no-c-format
+msgid "Name of the share"
+msgstr "Enw'r gyfran"
+
+#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 142
+#: rc.cpp:441 rc.cpp:447
+#, no-c-format
+msgid "This is the name of the share"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 154
+#: rc.cpp:444 rc.cpp:540
+#, no-c-format
+msgid "&Name:"
+msgstr "&Enw:"
+
+#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 178
+#: rc.cpp:450
+#, no-c-format
+msgid "Commen&t:"
+msgstr "Sylwad&:"
+
+#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 198
+#: rc.cpp:456
+#, no-c-format
+msgid "Security Options"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 219
+#: rc.cpp:459 rc.cpp:468 rc.cpp:624 rc.cpp:627 rc.cpp:639 rc.cpp:645
+#: rc.cpp:786 rc.cpp:798
+#, no-c-format
+msgid ""
+"The opposite of hosts allow - hosts listed here are NOT permitted access to "
+"services unless the specific services have their own lists to override this "
+"one. Where the lists conflict, the allow list takes precedence."
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 231
+#: rc.cpp:462 rc.cpp:474 rc.cpp:630 rc.cpp:636 rc.cpp:792 rc.cpp:801
+#: rc.cpp:907 rc.cpp:913 rc.cpp:919 rc.cpp:925 rc.cpp:958 rc.cpp:964
+#: rc.cpp:970 rc.cpp:994 rc.cpp:1018
+#, no-c-format
+msgid ""
+"This parameter is a comma, space, or tab delimited set of hosts which are "
+"permitted to access a service."
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 243
+#: rc.cpp:465
+#, no-c-format
+msgid "Hosts den&y:"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 261
+#: rc.cpp:471
+#, no-c-format
+msgid "&Hosts allow:"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 279
+#: rc.cpp:477
+#, no-c-format
+msgid "Guest &account:"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 285
+#: rc.cpp:480 rc.cpp:651 rc.cpp:774
+#, no-c-format
+msgid ""
+"This is a username which will be used for access to services which are "
+"specified as guest ok. Whatever privileges this user has will be available to "
+"any client connecting to the guest service. Typically this user will exist in "
+"the password file, but will not have a valid login. The user account "
+"\\\"ftp\\\" is often a good choice for this parameter. If a username is "
+"specified in a given service, the specified username overrides this one."
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 297
+#: rc.cpp:483
+#, no-c-format
+msgid "&Read only"
+msgstr "&Darllen yn unig"
+
+#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 300
+#: rc.cpp:486
+#, no-c-format
+msgid ""
+"If this is checked, then users of a service may not create or modify files in "
+"the service's directory."
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 312
+#: rc.cpp:489
+#, no-c-format
+msgid "G&uests allowed"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 318
+#: rc.cpp:492 rc.cpp:780 rc.cpp:819
+#, no-c-format
+msgid ""
+"If this is checked , then no password is required to connect to the service. "
+"Privileges will be those of the guest account."
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 333
+#: rc.cpp:495
+#, no-c-format
+msgid ""
+"This is a username which will be used for access this directory if guests are "
+"allowed"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 347
+#: rc.cpp:498 rc.cpp:1105
+#, no-c-format
+msgid "Other Options"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 368
+#: rc.cpp:501 rc.cpp:552 rc.cpp:759
+#, no-c-format
+msgid "Bro&wseable"
+msgstr "P&oradwy"
+
+#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 371
+#: rc.cpp:504
+#, no-c-format
+msgid ""
+"This controls whether this share is seen in the list of available shares in a "
+"net view and in the browse list."
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 391
+#: rc.cpp:507 rc.cpp:549 rc.cpp:762
+#, no-c-format
+msgid "A&vailable"
+msgstr "A&r gael"
+
+#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 394
+#: rc.cpp:510
+#, no-c-format
+msgid ""
+"Checkbox lets you \\\"turn off\\\" a service. If not checked, then ALL attempts "
+"to connect to the service will fail. Such failures are logged."
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 435
+#: rc.cpp:513
+#, no-c-format
+msgid "More Opt&ions"
+msgstr "Mwy o ddew&isiadau"
+
+#. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 37
+#: rc.cpp:516
+#, no-c-format
 msgid "Printer Settings"
 msgstr "Gosodiadau Argraffyddion"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 58
-#: rc.cpp:348 rc.cpp:827 rc.cpp:2186
+#: rc.cpp:519 rc.cpp:726 rc.cpp:1356
 #, no-c-format
 msgid "&Base Settings"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 111
-#: rc.cpp:351 rc.cpp:2189
+#: rc.cpp:522 rc.cpp:729
 #, no-c-format
 msgid "Pixmap"
 msgstr "Picsfap"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 127
-#: rc.cpp:354
+#: rc.cpp:525
 #, no-c-format
 msgid "Pr&inter"
 msgstr "Ar&graffydd"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 163
-#: rc.cpp:357
+#: rc.cpp:528
 #, no-c-format
 msgid "Pa&th:"
 msgstr "Ll&wybr:"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 174
-#: rc.cpp:360
+#: rc.cpp:531
 #, no-c-format
 msgid "&Queue:"
 msgstr "&Rhesu :"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 207
-#: rc.cpp:363
+#: rc.cpp:534
 #, no-c-format
 msgid "Sha&re all printers"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 223
-#: rc.cpp:366
+#: rc.cpp:537
 #, no-c-format
 msgid "I&dentifier"
 msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 240
-#: rc.cpp:369 rc.cpp:714
-#, no-c-format
-msgid "&Name:"
-msgstr "&Enw:"
-
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 251
-#: rc.cpp:372
+#: rc.cpp:543
 #, no-c-format
 msgid "Comm&ent:"
 msgstr "Syl&wad:"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 274
-#: rc.cpp:375
+#: rc.cpp:546
 #, no-c-format
 msgid "Main Properties"
 msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 291
-#: rc.cpp:378 rc.cpp:777 rc.cpp:2222
-#, no-c-format
-msgid "A&vailable"
-msgstr "A&r gael"
-
-#. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 299
-#: rc.cpp:381 rc.cpp:771 rc.cpp:2219
-#, no-c-format
-msgid "Bro&wseable"
-msgstr "P&oradwy"
-
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 307
-#: rc.cpp:384 rc.cpp:2216
+#: rc.cpp:555 rc.cpp:756
 #, no-c-format
 msgid "Pub&lic"
 msgstr "Cyh&oeddus"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 336
-#: rc.cpp:387
+#: rc.cpp:558
 #, no-c-format
 msgid "&Printing"
 msgstr "&Argraffu"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 369
-#: rc.cpp:390
+#: rc.cpp:561
 #, fuzzy, no-c-format
 msgid "Printer dri&ver:"
 msgstr "Argraffydd"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 390
-#: rc.cpp:393
+#: rc.cpp:564
 #, no-c-format
 msgid "Print&er driver location:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 406
-#: rc.cpp:396
+#: rc.cpp:567
 #, no-c-format
 msgid "PostScr&ipt"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 414
-#: rc.cpp:399
+#: rc.cpp:570
 #, no-c-format
 msgid "Printin&g:"
 msgstr "Argraff&u :"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 423
-#: rc.cpp:402
+#: rc.cpp:573
 #, no-c-format
 msgid "sysv"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 428
-#: rc.cpp:405
+#: rc.cpp:576
 #, no-c-format
 msgid "aix"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 433
-#: rc.cpp:408
+#: rc.cpp:579
 #, no-c-format
 msgid "hpux"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 438
-#: rc.cpp:411
+#: rc.cpp:582
 #, no-c-format
 msgid "bsd"
 msgstr "bsd"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 443
-#: rc.cpp:414
+#: rc.cpp:585
 #, no-c-format
 msgid "qnx"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 448
-#: rc.cpp:417
+#: rc.cpp:588
 #, no-c-format
 msgid "plp"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 453
-#: rc.cpp:420
+#: rc.cpp:591
 #, no-c-format
 msgid "lprng"
 msgstr "lprng"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 458
-#: rc.cpp:423
+#: rc.cpp:594
 #, no-c-format
 msgid "softq"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 463
-#: rc.cpp:426
+#: rc.cpp:597
 #, no-c-format
 msgid "cups"
 msgstr "cups"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 468
-#: rc.cpp:429
+#: rc.cpp:600
 #, no-c-format
 msgid "nt"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 473
-#: rc.cpp:432
+#: rc.cpp:603
 #, no-c-format
 msgid "os2"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 485
-#: rc.cpp:435
+#: rc.cpp:606
 #, no-c-format
 msgid "Max reported print &jobs:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 496
-#: rc.cpp:438
+#: rc.cpp:609
 #, no-c-format
 msgid "Ma&x print jobs:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 550
-#: rc.cpp:441
+#: rc.cpp:612
 #, no-c-format
 msgid "Use c&lient driver"
 msgstr "D&efnyddio gyrrwr cleient"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 558
-#: rc.cpp:444
+#: rc.cpp:615
 #, no-c-format
 msgid "De&fault devmode"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 568
-#: rc.cpp:447 rc.cpp:2225
+#: rc.cpp:618 rc.cpp:765
 #, no-c-format
 msgid "&Security"
 msgstr "&Diogelwch"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 579
-#: rc.cpp:450 rc.cpp:2255
+#: rc.cpp:621 rc.cpp:795
 #, no-c-format
 msgid "Hosts &deny:"
 msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 585
-#: rc.cpp:453 rc.cpp:456 rc.cpp:468 rc.cpp:474 rc.cpp:729 rc.cpp:738
-#: rc.cpp:2246 rc.cpp:2258
-#, no-c-format
-msgid ""
-"The opposite of hosts allow - hosts listed here are NOT permitted access to "
-"services unless the specific services have their own lists to override this "
-"one. Where the lists conflict, the allow list takes precedence."
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 601
-#: rc.cpp:459 rc.cpp:465 rc.cpp:732 rc.cpp:744 rc.cpp:2252 rc.cpp:2261
-#: rc.cpp:2367 rc.cpp:2373 rc.cpp:2379 rc.cpp:2385 rc.cpp:2418 rc.cpp:2424
-#: rc.cpp:2430 rc.cpp:2454 rc.cpp:2478
-#, no-c-format
-msgid ""
-"This parameter is a comma, space, or tab delimited set of hosts which are "
-"permitted to access a service."
-msgstr ""
-
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 609
-#: rc.cpp:462
+#: rc.cpp:633
 #, no-c-format
 msgid "Hosts a&llow:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 648
-#: rc.cpp:471
+#: rc.cpp:642
 #, fuzzy, no-c-format
 msgid "P&rinter admin:"
 msgstr "Argraffydd"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 662
-#: rc.cpp:477 rc.cpp:2231
+#: rc.cpp:648 rc.cpp:771
 #, no-c-format
 msgid "&Guest account:"
 msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 668
-#: rc.cpp:480 rc.cpp:750 rc.cpp:2234
-#, no-c-format
-msgid ""
-"This is a username which will be used for access to services which are "
-"specified as guest ok. Whatever privileges this user has will be available to "
-"any client connecting to the guest service. Typically this user will exist in "
-"the password file, but will not have a valid login. The user account "
-"\\\"ftp\\\" is often a good choice for this parameter. If a username is "
-"specified in a given service, the specified username overrides this one."
-msgstr ""
-
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 700
-#: rc.cpp:483
+#: rc.cpp:654
 #, no-c-format
 msgid "Co&mmands"
 msgstr "Go&rchmynion"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 717
-#: rc.cpp:486
+#: rc.cpp:657
 #, no-c-format
 msgid "Pr&int command:"
 msgstr "Gorch&ymyn argraffu:"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 733
-#: rc.cpp:489
+#: rc.cpp:660
 #, no-c-format
 msgid "lpq comma&nd:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 754
-#: rc.cpp:492
+#: rc.cpp:663
 #, no-c-format
 msgid "lprm comman&d:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 775
-#: rc.cpp:495
+#: rc.cpp:666
 #, no-c-format
 msgid "lp&resume:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 786
-#: rc.cpp:498
+#: rc.cpp:669
 #, no-c-format
 msgid "&queuepause:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 797
-#: rc.cpp:501
+#: rc.cpp:672
 #, no-c-format
 msgid "&lppause:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 818
-#: rc.cpp:504
+#: rc.cpp:675
 #, no-c-format
 msgid "qu&eueresume:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 848
-#: rc.cpp:507 rc.cpp:2348
+#: rc.cpp:678 rc.cpp:888
 #, no-c-format
 msgid "&Advanced"
 msgstr "&Uwch"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 859
-#: rc.cpp:510
+#: rc.cpp:681
 #, no-c-format
 msgid "Miscella&neous"
 msgstr "Amrywiol"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 886
-#: rc.cpp:513
+#: rc.cpp:684
 #, no-c-format
 msgid "p&reexec:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 897
-#: rc.cpp:516
+#: rc.cpp:687
 #, no-c-format
 msgid "root pr&eexec:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 918
-#: rc.cpp:519
+#: rc.cpp:690
 #, no-c-format
 msgid "root postexec:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 929
-#: rc.cpp:522
+#: rc.cpp:693
 #, no-c-format
 msgid "poste&xec:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 959
-#: rc.cpp:525
+#: rc.cpp:696
 #, no-c-format
 msgid "Tunin&g"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 984
-#: rc.cpp:528
+#: rc.cpp:699
 #, no-c-format
 msgid "M&in print space:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 1008
-#: rc.cpp:531
+#: rc.cpp:702
 #, no-c-format
 msgid "kB"
 msgstr "kB"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 1019
-#: rc.cpp:534
+#: rc.cpp:705
 #, no-c-format
 msgid "&Logging"
 msgstr "&Cofnodi"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 1036
-#: rc.cpp:537
+#: rc.cpp:708
 #, no-c-format
 msgid "S&tatus"
 msgstr "C&yflwr"
 
-#. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 1066
-#: rc.cpp:543 rc.cpp:588 rc.cpp:636 rc.cpp:2742
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 37
+#: rc.cpp:723
 #, no-c-format
-msgid "F1"
-msgstr "F1"
+msgid "Add/Edit Share"
+msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/socketoptionsdlg.ui line 37
-#: rc.cpp:552 rc.cpp:1653
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 130
+#: rc.cpp:732
 #, no-c-format
-msgid "Socket Options"
+msgid "D&irectory"
+msgstr "C&yfeiriadur"
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 164
+#: rc.cpp:735
+#, no-c-format
+msgid "&Path:"
+msgstr "&Llwybr:"
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 185
+#: rc.cpp:738
+#, no-c-format
+msgid "Share all home &directories"
 msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/socketoptionsdlg.ui line 71
-#: rc.cpp:555
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 197
+#: rc.cpp:741
 #, no-c-format
-msgid "SO_SNDLOWAT:"
+msgid "Iden&tifier"
 msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/socketoptionsdlg.ui line 79
-#: rc.cpp:558
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 214
+#: rc.cpp:744
 #, no-c-format
-msgid "IPTOS_THROUGHPUT"
+msgid "Na&me:"
+msgstr "&Enw:"
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 225
+#: rc.cpp:747
+#, no-c-format
+msgid "Comme&nt:"
+msgstr "Sylwa&d:"
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 248
+#: rc.cpp:750
+#, no-c-format
+msgid "Main P&roperties"
 msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/socketoptionsdlg.ui line 87
-#: rc.cpp:561
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 265
+#: rc.cpp:753
 #, no-c-format
-msgid "SO_SNDBUF:"
+msgid "Read onl&y"
+msgstr "Darllen &yn unig"
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 338
+#: rc.cpp:768
+#, no-c-format
+msgid "Gu&ests"
 msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/socketoptionsdlg.ui line 95
-#: rc.cpp:564
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 397
+#: rc.cpp:777
 #, no-c-format
-msgid "SO_KEEPALIVE"
+msgid "Only allow guest connect&ions"
 msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/socketoptionsdlg.ui line 103
-#: rc.cpp:567 rc.cpp:1683
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 410
+#: rc.cpp:783
 #, no-c-format
-msgid "SO_RCVBUF:"
+msgid "Hos&ts"
 msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/socketoptionsdlg.ui line 133
-#: rc.cpp:570 rc.cpp:1662
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 435
+#: rc.cpp:789
 #, no-c-format
-msgid "SO_BROADCAST"
+msgid "Hosts allo&w:"
 msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/socketoptionsdlg.ui line 141
-#: rc.cpp:573 rc.cpp:1668
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 473
+#: rc.cpp:804
 #, no-c-format
-msgid "IPTOS_LOWDELAY"
+msgid "Sy&mbolic Links"
+msgstr "Cy&sylltau Symbolaidd"
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 490
+#: rc.cpp:807
+#, no-c-format
+msgid "Allow following of symbolic lin&ks"
 msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/socketoptionsdlg.ui line 149
-#: rc.cpp:576
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 501
+#: rc.cpp:810
 #, no-c-format
-msgid "TCP_NODELAY"
+msgid ""
+"Allow following of symbolic links that &point to areas outside the directory "
+"tree"
 msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/socketoptionsdlg.ui line 157
-#: rc.cpp:579
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 511
+#: rc.cpp:813
 #, no-c-format
-msgid "SO_RCVLOWAT:"
+msgid ""
+"<qt>Validate password against the following usernames if the client cannot "
+"supply a username:</qt>"
 msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/socketoptionsdlg.ui line 187
-#: rc.cpp:582
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 527
+#: rc.cpp:816
 #, no-c-format
-msgid "SO_REUSEADDR"
+msgid "Only allow connections with use&rnames specified in this username list"
 msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/filemodedlg.ui line 16
-#: rc.cpp:597
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 557
+#: rc.cpp:822
 #, no-c-format
-msgid "Access Modifiers"
+msgid "Hidden &Files"
 msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/filemodedlg.ui line 34
-#: rc.cpp:600
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 583
+#: rc.cpp:828
 #, no-c-format
-msgid "Access Permissions"
-msgstr "Caniatadau Cyrchu"
+msgid "Hidden"
+msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/filemodedlg.ui line 103
-#: rc.cpp:603
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 594
+#: rc.cpp:831
 #, no-c-format
-msgid "Others"
-msgstr "Eraill"
+msgid "Veto"
+msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/filemodedlg.ui line 115
-#: rc.cpp:606
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 605
+#: rc.cpp:834
 #, no-c-format
-msgid "Read"
-msgstr "Darllen"
+msgid "Veto Oplock"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 616
+#: rc.cpp:837
+#, no-c-format
+msgid "Size"
+msgstr "Maint"
 
-#. i18n: file ./advanced/kcm_sambaconf/filemodedlg.ui line 139
-#: rc.cpp:609 rc.cpp:2688
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 627
+#: rc.cpp:840
 #, no-c-format
-msgid "Exec"
-msgstr "Gweithredu"
+msgid "Date"
+msgstr "Dyddiad"
 
-#. i18n: file ./advanced/kcm_sambaconf/filemodedlg.ui line 151
-#: rc.cpp:612
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 638
+#: rc.cpp:843
 #, no-c-format
-msgid "Write"
-msgstr "Ysgrifennu"
+msgid "Permissions"
+msgstr "Caniatadau"
 
-#. i18n: file ./advanced/kcm_sambaconf/filemodedlg.ui line 235
-#: rc.cpp:615 rc.cpp:2306
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 649
+#: rc.cpp:846 rc.cpp:1309
 #, no-c-format
 msgid "Owner"
 msgstr "Perchennog"
 
-#. i18n: file ./advanced/kcm_sambaconf/filemodedlg.ui line 259
-#: rc.cpp:618 rc.cpp:2309
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 660
+#: rc.cpp:849 rc.cpp:1312
 #, no-c-format
 msgid "Group"
 msgstr "Gr?p"
 
-#. i18n: file ./advanced/kcm_sambaconf/filemodedlg.ui line 283
-#: rc.cpp:621
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 681
+#: rc.cpp:852
 #, no-c-format
-msgid "Sticky"
-msgstr "Gludiog"
+msgid "Se&lected Files"
+msgstr "Ff&eiliau Dewisiedig"
 
-#. i18n: file ./advanced/kcm_sambaconf/filemodedlg.ui line 295
-#: rc.cpp:624
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 698
+#: rc.cpp:855
 #, no-c-format
-msgid "Set GID"
-msgstr "Gosod GID"
+msgid "Hi&de"
+msgstr "Cu&ddio"
 
-#. i18n: file ./advanced/kcm_sambaconf/filemodedlg.ui line 307
-#: rc.cpp:627
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 706
+#: advanced/kcm_sambaconf/hiddenfileview.cpp:116 rc.cpp:858
 #, no-c-format
-msgid "Set UID"
-msgstr "Gosod UID"
+msgid "&Veto"
+msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/filemodedlg.ui line 319
-#: rc.cpp:630
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 714
+#: rc.cpp:861
 #, no-c-format
-msgid "Special"
-msgstr "Arbennig"
+msgid "Veto oploc&k"
+msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/groupselectdlg.ui line 16
-#: rc.cpp:645
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 724
+#: rc.cpp:864
 #, no-c-format
-msgid "Select Groups"
+msgid "&Manual Configuration"
 msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/groupselectdlg.ui line 136
-#: rc.cpp:654
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 755
+#: rc.cpp:867
 #, no-c-format
-msgid "Selec&t Groups"
+msgid "Ve&to files:"
 msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/groupselectdlg.ui line 318
-#: rc.cpp:681
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 766
+#: rc.cpp:870
 #, no-c-format
-msgid "&Kind of Group"
+msgid "Veto oplock f&iles:"
 msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/groupselectdlg.ui line 343
-#: rc.cpp:684
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 792
+#: rc.cpp:873
 #, no-c-format
-msgid "&UNIX group"
+msgid "Hidde&n files:"
 msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/groupselectdlg.ui line 368
-#: rc.cpp:687
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 819
+#: rc.cpp:876
 #, no-c-format
-msgid "NI&S group"
+msgid "Hide un&writable files"
 msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/groupselectdlg.ui line 393
-#: rc.cpp:690
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 827
+#: rc.cpp:879
 #, no-c-format
-msgid "UNIX and NIS gr&oup"
+msgid "Hide s&pecial files"
 msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 72
-#: rc.cpp:693
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 835
+#: rc.cpp:882
 #, no-c-format
-msgid "Not share&d"
-msgstr "Dim wedi'&i rhannu"
+msgid "Hide files startin&g with a dot "
+msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 86
-#: rc.cpp:696
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 843
+#: rc.cpp:885
 #, no-c-format
-msgid "&Shared"
-msgstr "&Wedi ei rhannu"
+msgid "Hide un&readable files"
+msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 103
-#: rc.cpp:699
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 932
+#: rc.cpp:891 rc.cpp:1536
 #, no-c-format
-msgid "Bas&e Options"
+msgid ""
+"Here you can change advanced options of the SAMBA server.\n"
+"Only change something if you know what you are doing."
 msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 124
-#: rc.cpp:702 rc.cpp:917 rc.cpp:947
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 944
+#: rc.cpp:895 rc.cpp:1540
 #, no-c-format
-msgid "Comment"
-msgstr "Sylwad"
+msgid "Advanced Dump"
+msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 127
-#: rc.cpp:705 rc.cpp:723
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 959
+#: advanced/kcm_sambaconf/kcmsambaconf.cpp:295 rc.cpp:898 rc.cpp:1543
 #, no-c-format
-msgid ""
-"This is a text field that is seen next to a share when a client queries the "
-"server, either via the network neighborhood or via net view, to list what "
-"shares are available."
+msgid "Security"
+msgstr "Diogelwch"
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 973
+#: rc.cpp:901
+#, no-c-format
+msgid "Force Modes"
 msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 139
-#: rc.cpp:708
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 990
+#: rc.cpp:904
 #, no-c-format
-msgid "Name of the share"
-msgstr "Enw'r gyfran"
+msgid "Forc&e directory security mode:"
+msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 142
-#: rc.cpp:711 rc.cpp:717
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1004
+#: rc.cpp:910
 #, no-c-format
-msgid "This is the name of the share"
+msgid "Fo&rce security mode:"
 msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 178
-#: rc.cpp:720
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1018
+#: rc.cpp:916
 #, no-c-format
-msgid "Commen&t:"
-msgstr "Sylwad&:"
+msgid "Force director&y mode:"
+msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 198
-#: rc.cpp:726
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1032
+#: rc.cpp:922
 #, no-c-format
-msgid "Security Options"
+msgid "Force create mo&de:"
 msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 243
-#: rc.cpp:735
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1060
+#: rc.cpp:928 rc.cpp:931 rc.cpp:946 rc.cpp:949 rc.cpp:973 rc.cpp:976
+#: rc.cpp:979 rc.cpp:1000
 #, no-c-format
-msgid "Hosts den&y:"
+msgid "..."
+msgstr "..."
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1096
+#: rc.cpp:934 rc.cpp:937 rc.cpp:940 rc.cpp:943 rc.cpp:982 rc.cpp:985
+#: rc.cpp:988 rc.cpp:997 rc.cpp:1024
+#, no-c-format
+msgid "01234567"
 msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 261
-#: rc.cpp:741
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1209
+#: rc.cpp:952
 #, no-c-format
-msgid "&Hosts allow:"
+msgid "Masks"
 msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 279
-#: rc.cpp:747
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1226
+#: rc.cpp:955
 #, no-c-format
-msgid "Guest &account:"
+msgid "Directory security mask:"
 msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 297
-#: rc.cpp:753
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1240
+#: rc.cpp:961
 #, no-c-format
-msgid "&Read only"
-msgstr "&Darllen yn unig"
+msgid "Security &mask:"
+msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 300
-#: rc.cpp:756
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1254
+#: rc.cpp:967
 #, no-c-format
-msgid ""
-"If this is checked, then users of a service may not create or modify files in "
-"the service's directory."
+msgid "Direc&tory mask:"
 msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 312
-#: rc.cpp:759
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1376
+#: rc.cpp:991
 #, no-c-format
-msgid "G&uests allowed"
+msgid "Create mas&k:"
 msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 318
-#: rc.cpp:762 rc.cpp:2240 rc.cpp:2279
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1428
+#: rc.cpp:1003
 #, no-c-format
-msgid ""
-"If this is checked , then no password is required to connect to the service. "
-"Privileges will be those of the guest account."
+msgid "ACL"
 msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 333
-#: rc.cpp:765
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1445
+#: rc.cpp:1006
 #, no-c-format
-msgid ""
-"This is a username which will be used for access this directory if guests are "
-"allowed"
+msgid "&Profile acls"
 msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 347
-#: rc.cpp:768 rc.cpp:2565
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1453
+#: rc.cpp:1009
 #, no-c-format
-msgid "Other Options"
+msgid "Inherit ac&ls"
 msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 371
-#: rc.cpp:774
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1461
+#: rc.cpp:1012
 #, no-c-format
-msgid ""
-"This controls whether this share is seen in the list of available shares in a "
-"net view and in the browse list."
+msgid "&NT ACL support"
 msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 394
-#: rc.cpp:780
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1472
+#: rc.cpp:1015
 #, no-c-format
-msgid ""
-"Checkbox lets you \\\"turn off\\\" a service. If not checked, then ALL attempts "
-"to connect to the service will fail. Such failures are logged."
+msgid "Force unkno&wn acl user:"
 msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 435
-#: rc.cpp:783
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1486
+#: rc.cpp:1021
 #, no-c-format
-msgid "More Opt&ions"
-msgstr "Mwy o ddew&isiadau"
+msgid "Map acl &inherit"
+msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/expertuserdlg.ui line 16
-#: rc.cpp:786
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1510
+#: rc.cpp:1027 rc.cpp:1576 rc.cpp:1774
 #, no-c-format
-msgid "User Settings"
-msgstr "Gosodiadau Defnyddiwr"
+msgid "General"
+msgstr "Cyffredinol"
 
-#. i18n: file ./advanced/kcm_sambaconf/expertuserdlg.ui line 38
-#: rc.cpp:789
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1527
+#: rc.cpp:1030
 #, no-c-format
-msgid "&Valid users:"
+msgid "Inherit permissions from parent directory"
 msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/expertuserdlg.ui line 62
-#: rc.cpp:792
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1535
+#: rc.cpp:1033
 #, no-c-format
-msgid "&Admin users:"
+msgid "Allow deletion of readonly files"
 msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/expertuserdlg.ui line 86
-#: rc.cpp:795
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1545
+#: rc.cpp:1036
 #, no-c-format
-msgid "&Invalid users:"
+msgid "DOS Attribute Mapping"
 msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/expertuserdlg.ui line 202
-#: rc.cpp:804
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1562
+#: rc.cpp:1039
 #, no-c-format
-msgid "&Write list:"
+msgid "Map DOS archi&ve to UNIX owner execute"
 msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/expertuserdlg.ui line 231
-#: rc.cpp:807
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1570
+#: rc.cpp:1042
 #, no-c-format
-msgid "&Read list:"
+msgid "Map DOS hidden to UNI&X world execute"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1578
+#: rc.cpp:1045
+#, no-c-format
+msgid "Map DOS system to UNIX &group execute"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1586
+#: rc.cpp:1048
+#, no-c-format
+msgid "Store DOS attributes onto extended attribute"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1599
+#: rc.cpp:1051
+#, no-c-format
+msgid "OS/2"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1610
+#: rc.cpp:1054
+#, no-c-format
+msgid "OS/2 style extended attributes support"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1622
+#: advanced/kcm_sambaconf/kcmsambaconf.cpp:301 rc.cpp:1057 rc.cpp:1813
+#, no-c-format
+msgid "Tuning"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1642
+#: rc.cpp:1060
+#, no-c-format
+msgid "Sync al&ways"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1650
+#: rc.cpp:1063
+#, no-c-format
+msgid "Strict s&ync"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1658
+#: rc.cpp:1066
+#, no-c-format
+msgid "St&rict allocate"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1666
+#: rc.cpp:1069
+#, no-c-format
+msgid "Use sen&dfile"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1691
+#: rc.cpp:1072
+#, no-c-format
+msgid "Bloc&k size:"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1702
+#: rc.cpp:1075
+#, no-c-format
+msgid "Client-side cachin&g policy:"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1713
+#: rc.cpp:1078 rc.cpp:1096
+#, no-c-format
+msgid "bytes"
+msgstr "beitiau"
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1721
+#: rc.cpp:1081
+#, no-c-format
+msgid "Write cache si&ze:"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1730
+#: rc.cpp:1084
+#, no-c-format
+msgid "manual"
+msgstr "Â llaw"
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1735
+#: rc.cpp:1087
+#, no-c-format
+msgid "documents"
+msgstr "dogfennau"
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1740
+#: rc.cpp:1090
+#, no-c-format
+msgid "programs"
+msgstr "rhaglenni"
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1745
+#: rc.cpp:1093
+#, no-c-format
+msgid "disable"
+msgstr "analluogi"
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1804
+#: rc.cpp:1099
+#, no-c-format
+msgid "&Maximum number of simultaneous connections:"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1828
+#: advanced/kcm_sambaconf/kcmsambaconf.cpp:304 rc.cpp:1102 rc.cpp:2017
+#, no-c-format
+msgid "Filenames"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1876
+#: rc.cpp:1108
+#, no-c-format
+msgid "Hide traili&ng dot"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1886
+#: rc.cpp:1111
+#, no-c-format
+msgid "DOS"
+msgstr "DOS"
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1903
+#: rc.cpp:1114
+#, no-c-format
+msgid "&DOS file mode"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1911
+#: rc.cpp:1117
+#, no-c-format
+msgid "DOS f&ile times"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1919
+#: rc.cpp:1120
+#, no-c-format
+msgid "DOS file time resolution"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1972
+#: rc.cpp:1123
+#, no-c-format
+msgid "Name Mangling"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1995
+#: rc.cpp:1126
+#, no-c-format
+msgid "Mangling cha&r:"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2066
+#: rc.cpp:1129
+#, no-c-format
+msgid "Mangled ma&p:"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2098
+#: rc.cpp:1132
+#, no-c-format
+msgid "Enable na&me mangling"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2114
+#: rc.cpp:1135
+#, no-c-format
+msgid "Man&gle case"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2130
+#: rc.cpp:1138
+#, no-c-format
+msgid "Mangling method:"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2139
+#: rc.cpp:1141
+#, no-c-format
+msgid "hash"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2144
+#: rc.cpp:1144
+#, no-c-format
+msgid "hash2"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2172
+#: rc.cpp:1147
+#, no-c-format
+msgid "Preser&ve case"
+msgstr "C&adw maint"
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2191
+#: rc.cpp:1150
+#, no-c-format
+msgid "Short pr&eserve case"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2207
+#: rc.cpp:1153
+#, no-c-format
+msgid "Defau&lt case:"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2216
+#: rc.cpp:1156
+#, no-c-format
+msgid "Lower"
+msgstr "Gostwng"
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2221
+#: rc.cpp:1159
+#, no-c-format
+msgid "Upper"
+msgstr "Uchaf"
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2247
+#: rc.cpp:1162 rc.cpp:1204
+#, fuzzy, no-c-format
+msgid "Automatic"
+msgstr "Ymysgogol"
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2293
+#: rc.cpp:1171
+#, fuzzy, no-c-format
+msgid "Case sensi&tive:"
+msgstr "Llythrenna&u mawr/bach o bwys"
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2306
+#: advanced/kcm_sambaconf/kcmsambaconf.cpp:307 rc.cpp:1174 rc.cpp:2041
+#, no-c-format
+msgid "Locking"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2343
+#: rc.cpp:1177
+#, no-c-format
+msgid "Locki&ng"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2360
+#: rc.cpp:1180
+#, no-c-format
+msgid "Issue oppo&rtunistic locks (oplocks) "
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2368
+#: rc.cpp:1183
+#, no-c-format
+msgid "O&plocks"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2411
+#: rc.cpp:1186
+#, no-c-format
+msgid "Oplock contention li&mit:"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2422
+#: rc.cpp:1189
+#, no-c-format
+msgid "Le&vel2 oplocks"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2432
+#: rc.cpp:1192
+#, no-c-format
+msgid "Fak&e oplocks"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2443
+#: rc.cpp:1195
+#, no-c-format
+msgid "Share mo&des"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2451
+#: rc.cpp:1198
+#, no-c-format
+msgid "Posi&x locking"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2467
+#: rc.cpp:1201
+#, no-c-format
+msgid "S&trict locking:"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2525
+#: rc.cpp:1213
+#, no-c-format
+msgid "Blockin&g locks"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2535
+#: rc.cpp:1216
+#, no-c-format
+msgid "Enable lock&ing"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2545
+#: rc.cpp:1219 rc.cpp:2514
+#, no-c-format
+msgid "VFS"
 msgstr ""
 
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2584
+#: rc.cpp:1222
+#, no-c-format
+msgid "Vfs ob&jects:"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2595
+#: rc.cpp:1225
+#, no-c-format
+msgid "Vfs o&ptions:"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2613
+#: rc.cpp:1228 rc.cpp:1303
+#, no-c-format
+msgid "Exec"
+msgstr "Gweithredu"
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2630
+#: rc.cpp:1231
+#, no-c-format
+msgid "preexec c&lose"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2638
+#: rc.cpp:1234
+#, no-c-format
+msgid "root pree&xec close"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2663
+#: rc.cpp:1237
+#, no-c-format
+msgid "Pos&texec:"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2674
+#: rc.cpp:1240
+#, no-c-format
+msgid "Root pr&eexec:"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2685
+#: rc.cpp:1243
+#, no-c-format
+msgid "P&reexec:"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2701
+#: rc.cpp:1246
+#, no-c-format
+msgid "Root &postexec:"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2729
+#: advanced/kcm_sambaconf/kcmsambaconf.cpp:331 rc.cpp:1249 rc.cpp:2607
+#, no-c-format
+msgid "Misc"
+msgstr "Amrywiol"
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2760
+#: rc.cpp:1252
+#, no-c-format
+msgid "Fst&ype:"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2781
+#: rc.cpp:1255
+#, no-c-format
+msgid "Ma&gic script:"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2792
+#: rc.cpp:1258
+#, no-c-format
+msgid "&Volume:"
+msgstr "&Lefel sain:"
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2808
+#: rc.cpp:1261
+#, no-c-format
+msgid "Mag&ic output:"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2819
+#: rc.cpp:1264
+#, no-c-format
+msgid "Fa&ke directory create times"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2827
+#: rc.cpp:1267
+#, no-c-format
+msgid "Ms&dfs root"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2835
+#: rc.cpp:1270
+#, no-c-format
+msgid "Setdir command allo&wed"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2843
+#: rc.cpp:1273
+#, no-c-format
+msgid "Do &not descend:"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2859
+#: rc.cpp:1276
+#, no-c-format
+msgid "Msdfs pro&xy:"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/filemodedlg.ui line 16
+#: rc.cpp:1291
+#, no-c-format
+msgid "Access Modifiers"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/filemodedlg.ui line 34
+#: rc.cpp:1294
+#, no-c-format
+msgid "Access Permissions"
+msgstr "Caniatadau Cyrchu"
+
+#. i18n: file ./advanced/kcm_sambaconf/filemodedlg.ui line 103
+#: rc.cpp:1297
+#, no-c-format
+msgid "Others"
+msgstr "Eraill"
+
+#. i18n: file ./advanced/kcm_sambaconf/filemodedlg.ui line 115
+#: rc.cpp:1300
+#, no-c-format
+msgid "Read"
+msgstr "Darllen"
+
+#. i18n: file ./advanced/kcm_sambaconf/filemodedlg.ui line 151
+#: rc.cpp:1306
+#, no-c-format
+msgid "Write"
+msgstr "Ysgrifennu"
+
+#. i18n: file ./advanced/kcm_sambaconf/filemodedlg.ui line 283
+#: rc.cpp:1315
+#, no-c-format
+msgid "Sticky"
+msgstr "Gludiog"
+
+#. i18n: file ./advanced/kcm_sambaconf/filemodedlg.ui line 295
+#: rc.cpp:1318
+#, no-c-format
+msgid "Set GID"
+msgstr "Gosod GID"
+
+#. i18n: file ./advanced/kcm_sambaconf/filemodedlg.ui line 307
+#: rc.cpp:1321
+#, no-c-format
+msgid "Set UID"
+msgstr "Gosod UID"
+
+#. i18n: file ./advanced/kcm_sambaconf/filemodedlg.ui line 319
+#: rc.cpp:1324
+#, no-c-format
+msgid "Special"
+msgstr "Arbennig"
+
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 73
-#: rc.cpp:810
+#: rc.cpp:1339
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -1403,92 +2198,92 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 117
-#: rc.cpp:830
+#: rc.cpp:1359
 #, no-c-format
 msgid "Samba config file:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 136
-#: rc.cpp:833
+#: rc.cpp:1362
 #, no-c-format
 msgid "&Load"
 msgstr "&Llwytho"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 150
-#: rc.cpp:836
+#: rc.cpp:1365
 #, no-c-format
 msgid "Server Identification"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 171
-#: rc.cpp:839
+#: rc.cpp:1368
 #, no-c-format
 msgid "Wor&kgroup:"
 msgstr "Grŵp gwaith:"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 186
-#: rc.cpp:842
+#: rc.cpp:1371
 #, no-c-format
 msgid "Enter here the name of your workgroup/domain."
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 216
-#: rc.cpp:845
+#: rc.cpp:1374
 #, no-c-format
 msgid "Server strin&g:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 231
-#: rc.cpp:848
+#: rc.cpp:1377
 #, no-c-format
 msgid "NetBIOS name:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 248
-#: rc.cpp:851
+#: rc.cpp:1380
 #, no-c-format
 msgid "Securit&y Level"
 msgstr "Lefel D&diogelwch"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 283
-#: rc.cpp:854
+#: rc.cpp:1383
 #, no-c-format
 msgid "Share"
 msgstr "Rhaniad"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 286
-#: rc.cpp:857 rc.cpp:863 rc.cpp:869 rc.cpp:878 rc.cpp:932 rc.cpp:1026
-#: rc.cpp:1032 rc.cpp:1044 rc.cpp:1065 rc.cpp:1787
+#: rc.cpp:1386 rc.cpp:1392 rc.cpp:1398 rc.cpp:1407 rc.cpp:1461 rc.cpp:1555
+#: rc.cpp:1561 rc.cpp:1573 rc.cpp:1594 rc.cpp:2316
 #, no-c-format
-msgid "Alt+"
+msgid "Alt+ "
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 301
-#: rc.cpp:860
+#: rc.cpp:1389
 #, no-c-format
 msgid "User"
 msgstr "Defnyddiwr"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 316
-#: rc.cpp:866 rc.cpp:1206
+#: rc.cpp:1395 rc.cpp:1735
 #, no-c-format
 msgid "Server"
 msgstr "Gweinydd"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 331
-#: rc.cpp:872
+#: rc.cpp:1401
 #, no-c-format
 msgid "Domai&n"
 msgstr "Parth"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 343
-#: rc.cpp:875
+#: rc.cpp:1404
 #, no-c-format
 msgid "ADS"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 368
-#: rc.cpp:881
+#: rc.cpp:1410
 #, no-c-format
 msgid ""
 "Use the <i>share</i> security level if you have a home network or a small "
@@ -1497,1349 +2292,1311 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 391
-#: rc.cpp:884
+#: rc.cpp:1413
 #, no-c-format
 msgid "Further Options"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 415
-#: rc.cpp:887
+#: rc.cpp:1416
 #, no-c-format
 msgid "Password server address/name:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 441
-#: rc.cpp:890
+#: rc.cpp:1419
 #, no-c-format
 msgid "Real&m:"
 msgstr "Bro:"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 459
-#: rc.cpp:893
+#: rc.cpp:1422
 #, no-c-format
 msgid "Allo&w guest logins"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 496
-#: rc.cpp:896
+#: rc.cpp:1425
 #, no-c-format
 msgid "Guest acc&ount:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 585
-#: rc.cpp:902
+#: rc.cpp:1431
 #, no-c-format
 msgid "For detailed help about every option please look at:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 604
-#: rc.cpp:905
+#: rc.cpp:1434
 #, no-c-format
 msgid "man:smb.conf"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 650
-#: rc.cpp:908
+#: rc.cpp:1437
 #, no-c-format
 msgid "&Shares"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 742
-#: rc.cpp:923
+#: rc.cpp:1452
 #, no-c-format
 msgid "Edit Defau&lts..."
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 767
-#: rc.cpp:926
+#: rc.cpp:1455
 #, no-c-format
 msgid "Add &New Share..."
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 775
-#: rc.cpp:929
+#: rc.cpp:1458
 #, no-c-format
 msgid "Edit Share..."
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 786
-#: rc.cpp:935
+#: rc.cpp:1464
 #, no-c-format
 msgid "Re&move Share"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 798
-#: rc.cpp:938
+#: rc.cpp:1467
 #, no-c-format
 msgid "Prin&ters"
 msgstr "Argr&affyddion"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 824
-#: rc.cpp:944
+#: rc.cpp:1473
 #, no-c-format
 msgid "Printer"
 msgstr "Argraffydd"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 890
-#: rc.cpp:953
+#: rc.cpp:1482
 #, no-c-format
 msgid "Edit Defau&lts"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 915
-#: rc.cpp:956
+#: rc.cpp:1485
 #, no-c-format
 msgid "Add Ne&w Printer"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 923
-#: rc.cpp:959
+#: rc.cpp:1488
 #, no-c-format
 msgid "Edit Pri&nter"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 931
-#: rc.cpp:962
+#: rc.cpp:1491
 #, no-c-format
 msgid "Re&move Printer"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 943
 #: advanced/kcm_sambaconf/printerdlgimpl.cpp:109
-#: advanced/kcm_sambaconf/sharedlgimpl.cpp:123 rc.cpp:965
+#: advanced/kcm_sambaconf/sharedlgimpl.cpp:123 rc.cpp:1494
 #, no-c-format
 msgid "&Users"
 msgstr "&Defnyddwyr"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 974
-#: rc.cpp:968
+#: rc.cpp:1497
 #, no-c-format
 msgid "Sa&mba Users"
 msgstr "D&efnyddwyr Samba"
 
+#. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1000
+#: rc.cpp:1503 rc.cpp:1524 rc.cpp:2682 rc.cpp:2721
+#, no-c-format
+msgid "UID"
+msgstr "UID"
+
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1011
-#: rc.cpp:977 rc.cpp:1185 rc.cpp:1221
+#: rc.cpp:1506 rc.cpp:1714 rc.cpp:1750
 #, no-c-format
 msgid "Disabled"
 msgstr "Analluogir"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1022
-#: rc.cpp:980
+#: rc.cpp:1509
 #, no-c-format
 msgid "No Password"
 msgstr "Dim cyfrinair"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1152
-#: rc.cpp:989
+#: rc.cpp:1518
 #, no-c-format
 msgid "UNI&X Users"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1222
-#: rc.cpp:998
+#: rc.cpp:1527
 #, no-c-format
 msgid "Chan&ge Password..."
 msgstr "&Newid Cyfrinair..."
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1233
-#: rc.cpp:1001
+#: rc.cpp:1530
 #, no-c-format
 msgid "&Join Domain"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1262
-#: rc.cpp:1004
+#: rc.cpp:1533
 #, no-c-format
 msgid "Advan&ced"
 msgstr "Uwch"
 
-#. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1337
-#: rc.cpp:1007 rc.cpp:2351
-#, no-c-format
-msgid ""
-"Here you can change advanced options of the SAMBA server.\n"
-"Only change something if you know what you are doing."
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1349
-#: rc.cpp:1011 rc.cpp:2355
-#, no-c-format
-msgid "Advanced Dump"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1373
-#: advanced/kcm_sambaconf/kcmsambaconf.cpp:295 rc.cpp:1014 rc.cpp:2358
-#, no-c-format
-msgid "Security"
-msgstr "Diogelwch"
-
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1394
-#: rc.cpp:1017 rc.cpp:1377 rc.cpp:1515
+#: rc.cpp:1546 rc.cpp:1906 rc.cpp:2044
 #, no-c-format
 msgid "&General"
 msgstr "&Cyffredinol"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1428
-#: rc.cpp:1020
+#: rc.cpp:1549
 #, no-c-format
 msgid "PAM"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1449
-#: rc.cpp:1023
+#: rc.cpp:1552
 #, no-c-format
 msgid "Obey PAM restrictions"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1464
-#: rc.cpp:1029
+#: rc.cpp:1558
 #, no-c-format
 msgid "PAM password change"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1477
-#: rc.cpp:1035
+#: rc.cpp:1564
 #, no-c-format
 msgid "Other Switches"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1498
-#: rc.cpp:1038
+#: rc.cpp:1567
 #, no-c-format
 msgid "A&llow trusted domains"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1506
-#: rc.cpp:1041
+#: rc.cpp:1570
 #, no-c-format
 msgid "Paranoid server security"
 msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1519
-#: rc.cpp:1047 rc.cpp:1245 rc.cpp:2487
-#, no-c-format
-msgid "General"
-msgstr "Cyffredinol"
-
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1540
-#: rc.cpp:1050
+#: rc.cpp:1579
 #, no-c-format
 msgid "Auth methods:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1555
-#: rc.cpp:1053
+#: rc.cpp:1582
 #, no-c-format
 msgid "Root director&y:"
 msgstr "Cyfeiriadur g&wraidd:"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1566
-#: rc.cpp:1056
+#: rc.cpp:1585
 #, no-c-format
 msgid "I&nterfaces:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1589
-#: rc.cpp:1059
+#: rc.cpp:1588
 #, no-c-format
 msgid "Map to guest:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1600
-#: rc.cpp:1062
+#: rc.cpp:1591
 #, no-c-format
 msgid "Bind interfaces only"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1609
-#: rc.cpp:1068
+#: rc.cpp:1597
 #, no-c-format
 msgid "Never"
 msgstr "Byth"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1614
-#: rc.cpp:1071
+#: rc.cpp:1600
 #, no-c-format
 msgid "Bad User"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1619
-#: rc.cpp:1074
+#: rc.cpp:1603
 #, no-c-format
 msgid "Bad Password"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1635
-#: rc.cpp:1077
+#: rc.cpp:1606
 #, no-c-format
 msgid "Hosts e&quiv:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1692
-#: rc.cpp:1080
+#: rc.cpp:1609
 #, no-c-format
 msgid "Algorithmic rid base:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1746
-#: rc.cpp:1083
+#: rc.cpp:1612
 #, no-c-format
 msgid "Private dir:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1770
-#: rc.cpp:1086
+#: rc.cpp:1615
 #, no-c-format
 msgid "Pass&word"
 msgstr "Cyfr&inair"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1804
-#: rc.cpp:1089
+#: rc.cpp:1618
 #, no-c-format
 msgid "Migration"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1825
-#: rc.cpp:1092
+#: rc.cpp:1621
 #, no-c-format
 msgid "Update encr&ypted"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1835
-#: rc.cpp:1095
+#: rc.cpp:1624
 #, no-c-format
 msgid "Samba Passwords"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1856
-#: rc.cpp:1098
+#: rc.cpp:1627
 #, no-c-format
 msgid "E&ncrypt passwords"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1871
-#: rc.cpp:1101
+#: rc.cpp:1630
 #, no-c-format
 msgid "Smb passwd file:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1895
-#: rc.cpp:1104
+#: rc.cpp:1633
 #, no-c-format
 msgid "Passdb bac&kend:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1928
-#: rc.cpp:1107
+#: rc.cpp:1636
 #, no-c-format
 msgid "Passwd chat:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1943
-#: rc.cpp:1110
+#: rc.cpp:1639
 #, no-c-format
 msgid "Passwd chat debug"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1951
-#: rc.cpp:1113 rc.cpp:1131 rc.cpp:1326 rc.cpp:1332 rc.cpp:1344 rc.cpp:1347
-#: rc.cpp:1464 rc.cpp:1467 rc.cpp:1772 rc.cpp:1886 rc.cpp:1931
+#: rc.cpp:1642 rc.cpp:1660 rc.cpp:1855 rc.cpp:1861 rc.cpp:1873 rc.cpp:1876
+#: rc.cpp:1993 rc.cpp:1996 rc.cpp:2301 rc.cpp:2415 rc.cpp:2460
 #, no-c-format
 msgid "Sec"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1964
-#: rc.cpp:1116
+#: rc.cpp:1645
 #, no-c-format
 msgid "Passwd chat timeout:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1985
-#: rc.cpp:1119
+#: rc.cpp:1648
 #, no-c-format
 msgid "Password"
 msgstr "Cyfrinair"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2006
-#: rc.cpp:1122
+#: rc.cpp:1651
 #, no-c-format
 msgid "Password level:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2021
-#: rc.cpp:1125
+#: rc.cpp:1654
 #, no-c-format
 msgid "Min password length:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2032
-#: rc.cpp:1128
+#: rc.cpp:1657
 #, no-c-format
 msgid "Machine password timeout:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2093
-#: rc.cpp:1134
+#: rc.cpp:1663
 #, no-c-format
 msgid "Nu&ll passwords"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2115
-#: rc.cpp:1137
+#: rc.cpp:1666
 #, no-c-format
 msgid "UNIX Passwords"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2136
-#: rc.cpp:1140
+#: rc.cpp:1669
 #, no-c-format
 msgid "Passwd program:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2160
-#: rc.cpp:1143
+#: rc.cpp:1672
 #, no-c-format
 msgid "UNI&X password sync"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2172
-#: rc.cpp:1146
+#: rc.cpp:1675
 #, no-c-format
 msgid "Userna&me"
 msgstr "Enw de&fnyddiwr"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2193
-#: rc.cpp:1149
+#: rc.cpp:1678
 #, no-c-format
 msgid "User&name map:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2217
-#: rc.cpp:1152
+#: rc.cpp:1681
 #, no-c-format
 msgid "Username &level:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2261
-#: rc.cpp:1155
+#: rc.cpp:1684
 #, no-c-format
 msgid "Hide local users"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2273
-#: rc.cpp:1158
+#: rc.cpp:1687
 #, no-c-format
 msgid "Restrict anon&ymous"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2285
-#: rc.cpp:1161
+#: rc.cpp:1690
 #, no-c-format
 msgid "Use rhosts"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2312
-#: rc.cpp:1164
+#: rc.cpp:1693
 #, no-c-format
 msgid "Authenticati&on"
 msgstr "Dilysiant"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2329
-#: rc.cpp:1167
+#: rc.cpp:1696
 #, no-c-format
 msgid "Client"
 msgstr "Dibynnydd:"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2346
-#: rc.cpp:1170
+#: rc.cpp:1699
 #, no-c-format
 msgid "C&lient signing:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2361
-#: rc.cpp:1173
+#: rc.cpp:1702
 #, no-c-format
 msgid "Client plainte&xt authentication"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2373
-#: rc.cpp:1176
+#: rc.cpp:1705
 #, no-c-format
 msgid "Client lanman authentication"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2379
-#: rc.cpp:1179 rc.cpp:1194 rc.cpp:1215 rc.cpp:1230 rc.cpp:1898 rc.cpp:1943
+#: rc.cpp:1708 rc.cpp:1723 rc.cpp:1744 rc.cpp:1759 rc.cpp:2427 rc.cpp:2472
 #, no-c-format
 msgid "Auto"
 msgstr "Ymysgogol"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2384
-#: rc.cpp:1182 rc.cpp:1218
+#: rc.cpp:1711 rc.cpp:1747
 #, no-c-format
 msgid "Mandatory"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2421
-#: rc.cpp:1197
+#: rc.cpp:1726
 #, no-c-format
 msgid "Client channel:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2436
-#: rc.cpp:1200
+#: rc.cpp:1729
 #, no-c-format
 msgid "Client use spnego"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2448
-#: rc.cpp:1203
+#: rc.cpp:1732
 #, no-c-format
 msgid "Client NTLMv&2 authentication"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2492
-#: rc.cpp:1209
+#: rc.cpp:1738
 #, no-c-format
 msgid "Server signing:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2507
-#: rc.cpp:1212
+#: rc.cpp:1741
 #, no-c-format
 msgid "Lanman authentication"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2555
-#: rc.cpp:1233
+#: rc.cpp:1762
 #, no-c-format
 msgid "Server channel:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2570
-#: rc.cpp:1236
+#: rc.cpp:1765
 #, no-c-format
 msgid "Use sp&nego"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2582
-#: rc.cpp:1239
+#: rc.cpp:1768
 #, no-c-format
 msgid "NTLM authentication"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2631
-#: advanced/kcm_sambaconf/kcmsambaconf.cpp:298 rc.cpp:1242
+#: advanced/kcm_sambaconf/kcmsambaconf.cpp:298 rc.cpp:1771
 #, no-c-format
 msgid "Logging"
 msgstr "Cofnodi"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2693
-#: rc.cpp:1248
+#: rc.cpp:1777
 #, no-c-format
 msgid "L&og file:"
 msgstr "F&feil cofnod:"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2709
-#: rc.cpp:1251
+#: rc.cpp:1780
 #, no-c-format
 msgid "KB"
 msgstr "KB"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2717
-#: rc.cpp:1254
+#: rc.cpp:1783
 #, no-c-format
 msgid "Ma&x log size:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2745
-#: rc.cpp:1257
+#: rc.cpp:1786
 #, no-c-format
 msgid "S&yslog:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2778
-#: rc.cpp:1260
+#: rc.cpp:1789
 #, no-c-format
 msgid "Log &level:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2804
-#: rc.cpp:1263 rc.cpp:1407 rc.cpp:1775
+#: rc.cpp:1792 rc.cpp:1936 rc.cpp:2304
 #, no-c-format
 msgid "S&witches"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2829
-#: rc.cpp:1266
+#: rc.cpp:1795
 #, no-c-format
 msgid "Syslog o&nly"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2837
-#: rc.cpp:1269
+#: rc.cpp:1798
 #, no-c-format
 msgid "Status"
 msgstr "Cyflwr"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2856
-#: rc.cpp:1272
+#: rc.cpp:1801
 #, no-c-format
 msgid "Ti&mestamp"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2870
-#: rc.cpp:1275 rc.cpp:1533
+#: rc.cpp:1804 rc.cpp:2062
 #, no-c-format
 msgid "microseconds"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2886
-#: rc.cpp:1278
+#: rc.cpp:1807
 #, no-c-format
 msgid "Debug pid"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2894
-#: rc.cpp:1281
+#: rc.cpp:1810
 #, no-c-format
 msgid "Debu&g uid"
 msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2925
-#: advanced/kcm_sambaconf/kcmsambaconf.cpp:301 rc.cpp:1284 rc.cpp:2517
-#, no-c-format
-msgid "Tuning"
-msgstr ""
-
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2942
-#: rc.cpp:1287
+#: rc.cpp:1816
 #, no-c-format
 msgid "Modules"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2959
-#: rc.cpp:1290
+#: rc.cpp:1819
 #, no-c-format
 msgid "Pre&load modules:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2977
-#: rc.cpp:1293
+#: rc.cpp:1822
 #, no-c-format
 msgid "Numbers"
 msgstr "Rhifau"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2994
-#: rc.cpp:1296
+#: rc.cpp:1825
 #, no-c-format
 msgid "Max smbd processes:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3005
-#: rc.cpp:1299
+#: rc.cpp:1828
 #, no-c-format
 msgid "Max open files:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3068
-#: rc.cpp:1302
+#: rc.cpp:1831
 #, no-c-format
 msgid "Sizes"
 msgstr "Meintiau"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3085
-#: rc.cpp:1305
+#: rc.cpp:1834
 #, no-c-format
 msgid "Max disk size:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3096
-#: rc.cpp:1308
+#: rc.cpp:1837
 #, no-c-format
 msgid "Read si&ze:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3107
-#: rc.cpp:1311
+#: rc.cpp:1840
 #, no-c-format
 msgid "Stat cache size:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3159
-#: rc.cpp:1314
+#: rc.cpp:1843
 #, no-c-format
 msgid "MB"
 msgstr "MB"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3183
-#: rc.cpp:1317
+#: rc.cpp:1846
 #, no-c-format
 msgid "Ma&x xmit:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3196
-#: rc.cpp:1320
+#: rc.cpp:1849
 #, no-c-format
 msgid "Times"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3213
-#: rc.cpp:1323
+#: rc.cpp:1852
 #, no-c-format
 msgid "Change notify timeout:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3233
-#: rc.cpp:1329
+#: rc.cpp:1858
 #, no-c-format
 msgid "&Keepalive:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3269
-#: rc.cpp:1335 rc.cpp:2099
+#: rc.cpp:1864 rc.cpp:2628
 #, no-c-format
 msgid "Min"
 msgstr "Isaf"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3278
-#: rc.cpp:1338
+#: rc.cpp:1867
 #, no-c-format
 msgid "Deadtime:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3297
-#: rc.cpp:1341
+#: rc.cpp:1870
 #, no-c-format
 msgid "Lp&q cache time:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3334
-#: rc.cpp:1350
+#: rc.cpp:1879
 #, no-c-format
 msgid "&Name cache timeout:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3355
-#: rc.cpp:1353
+#: rc.cpp:1882
 #, no-c-format
 msgid "Switches"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3372
-#: rc.cpp:1356
+#: rc.cpp:1885
 #, no-c-format
 msgid "&Getwd cache"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3380
-#: rc.cpp:1359
+#: rc.cpp:1888
 #, no-c-format
 msgid "Use &mmap"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3388
-#: rc.cpp:1362
+#: rc.cpp:1891
 #, no-c-format
 msgid "Kernel change notif&y"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3396
-#: rc.cpp:1365
+#: rc.cpp:1894
 #, no-c-format
 msgid "H&ostname lookups"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3408
-#: rc.cpp:1368
+#: rc.cpp:1897
 #, no-c-format
 msgid "Read ra&w"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3423
-#: rc.cpp:1371
+#: rc.cpp:1900
 #, no-c-format
 msgid "Write raw"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3438
-#: advanced/kcm_sambaconf/kcmsambaconf.cpp:310 rc.cpp:1374
+#: advanced/kcm_sambaconf/kcmsambaconf.cpp:310 rc.cpp:1903
 #, no-c-format
 msgid "Printing"
 msgstr "Argraffu"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3472
-#: rc.cpp:1380
+#: rc.cpp:1909
 #, no-c-format
 msgid "Total print &jobs:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3510
-#: rc.cpp:1383
+#: rc.cpp:1912
 #, no-c-format
 msgid "Drivers"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3527
-#: rc.cpp:1386
+#: rc.cpp:1915
 #, no-c-format
 msgid "OS&2 driver map:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3538
-#: rc.cpp:1389
+#: rc.cpp:1918
 #, no-c-format
 msgid "Printcap na&me:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3564
-#: rc.cpp:1392
+#: rc.cpp:1921
 #, no-c-format
 msgid "Pri&nter driver file: "
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3582
-#: advanced/kcm_sambaconf/kcmsambaconf.cpp:334 rc.cpp:1395 rc.cpp:2051
+#: advanced/kcm_sambaconf/kcmsambaconf.cpp:334 rc.cpp:1924 rc.cpp:2580
 #, no-c-format
 msgid "Commands"
 msgstr "Gorchmynion:"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3599
-#: rc.cpp:1398
+#: rc.cpp:1927
 #, no-c-format
 msgid "Enumports command:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3610
-#: rc.cpp:1401
+#: rc.cpp:1930
 #, no-c-format
 msgid "Addprinter command:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3621
-#: rc.cpp:1404
+#: rc.cpp:1933
 #, no-c-format
 msgid "Deleteprinter command:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3666
-#: rc.cpp:1410
+#: rc.cpp:1939
 #, no-c-format
 msgid "L&oad printers"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3674
-#: rc.cpp:1413
+#: rc.cpp:1942
 #, fuzzy, no-c-format
 msgid "Disab&le spools"
 msgstr "Analluogir"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3682
-#: rc.cpp:1416
+#: rc.cpp:1945
 #, no-c-format
 msgid "Show add printer wi&zard"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3711
-#: rc.cpp:1419
+#: rc.cpp:1948
 #, no-c-format
 msgid "Domain"
 msgstr "Parth"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3769
-#: rc.cpp:1422
+#: rc.cpp:1951
 #, no-c-format
 msgid "L&ocal master"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3777
-#: rc.cpp:1425
+#: rc.cpp:1954
 #, no-c-format
 msgid "Domai&n master"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3785
-#: rc.cpp:1428
+#: rc.cpp:1957
 #, no-c-format
 msgid "Domain lo&gons"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3801
-#: rc.cpp:1431
+#: rc.cpp:1960
 #, no-c-format
 msgid "Preferred &master"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3834
-#: rc.cpp:1434
+#: rc.cpp:1963
 #, no-c-format
 msgid "OS &level:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3849
-#: rc.cpp:1437
+#: rc.cpp:1966
 #, no-c-format
 msgid "Domain admin group:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3864
-#: rc.cpp:1440
+#: rc.cpp:1969
 #, no-c-format
 msgid "Domain guest group:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3887
-#: rc.cpp:1443
+#: rc.cpp:1972
 #, no-c-format
 msgid "WINS"
 msgstr "ENNILL"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3930
-#: rc.cpp:1446
+#: rc.cpp:1975
 #, no-c-format
 msgid "Deactivate &WINS"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3944
-#: rc.cpp:1449
+#: rc.cpp:1978
 #, no-c-format
 msgid "Act as a WI&NS server"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3952
-#: rc.cpp:1452
+#: rc.cpp:1981
 #, no-c-format
 msgid "Use an&other WINS server"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3965
-#: rc.cpp:1455
+#: rc.cpp:1984
 #, no-c-format
 msgid "WINS Server Settin&gs"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3986
-#: rc.cpp:1458
+#: rc.cpp:1987
 #, no-c-format
 msgid "Max WINS tt&l:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4001
-#: rc.cpp:1461
+#: rc.cpp:1990
 #, no-c-format
 msgid "&Min WINS ttl:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4078
-#: rc.cpp:1470
+#: rc.cpp:1999
 #, no-c-format
 msgid "WINS hoo&k:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4100
-#: rc.cpp:1473
+#: rc.cpp:2002
 #, no-c-format
 msgid "DNS prox&y"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4116
-#: rc.cpp:1476
+#: rc.cpp:2005
 #, no-c-format
 msgid "WINS Server IP or DNS Name"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4143
-#: rc.cpp:1479
+#: rc.cpp:2008
 #, no-c-format
 msgid "General Options"
 msgstr "Dewisiadau Cyffredinol"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4160
-#: rc.cpp:1482
+#: rc.cpp:2011
 #, no-c-format
 msgid "WINS partners:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4187
-#: rc.cpp:1485
+#: rc.cpp:2014
 #, no-c-format
 msgid "WINS pro&xy"
 msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4219
-#: advanced/kcm_sambaconf/kcmsambaconf.cpp:304 rc.cpp:1488 rc.cpp:2562
-#, no-c-format
-msgid "Filenames"
-msgstr ""
-
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4236
-#: rc.cpp:1491
+#: rc.cpp:2020
 #, no-c-format
 msgid "Ge&neral"
 msgstr "Cy&ffredinol"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4253
-#: rc.cpp:1494
+#: rc.cpp:2023
 #, no-c-format
 msgid "Strip d&ot"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4263
-#: rc.cpp:1497
+#: rc.cpp:2026
 #, no-c-format
 msgid "&Mangling"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4304
-#: rc.cpp:1500
+#: rc.cpp:2029
 #, no-c-format
 msgid "Mangled stac&k:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4323
-#: rc.cpp:1503
+#: rc.cpp:2032
 #, no-c-format
 msgid "Mangle prefi&x:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4364
-#: rc.cpp:1506
+#: rc.cpp:2035
 #, no-c-format
 msgid "Specia&l"
 msgstr "Arbenn&ig"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4381
-#: rc.cpp:1509
+#: rc.cpp:2038
 #, no-c-format
 msgid "Stat cache"
 msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4410
-#: advanced/kcm_sambaconf/kcmsambaconf.cpp:307 rc.cpp:1512 rc.cpp:2634
-#, no-c-format
-msgid "Locking"
-msgstr ""
-
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4444
-#: rc.cpp:1518
+#: rc.cpp:2047
 #, no-c-format
 msgid "Use ker&nel oplocks"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4454
-#: rc.cpp:1521
+#: rc.cpp:2050
 #, no-c-format
 msgid "Direct&ories"
 msgstr "Cyfeir&iaduron"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4471
-#: rc.cpp:1524
+#: rc.cpp:2053
 #, no-c-format
 msgid "Loc&k directory:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4487
-#: rc.cpp:1527
+#: rc.cpp:2056
 #, no-c-format
 msgid "Pid director&y:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4505
-#: rc.cpp:1530
+#: rc.cpp:2059
 #, no-c-format
 msgid "Lock Spin"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4546
-#: rc.cpp:1536
+#: rc.cpp:2065
 #, no-c-format
 msgid "&Lock spin count:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4557
-#: rc.cpp:1539
+#: rc.cpp:2068
 #, no-c-format
 msgid "Lock spin ti&me:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4587
-#: rc.cpp:1542
+#: rc.cpp:2071
 #, no-c-format
 msgid "Very Advanced"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4608
-#: rc.cpp:1545
+#: rc.cpp:2074
 #, no-c-format
 msgid "Oplock break &wait time:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4630
-#: rc.cpp:1548 rc.cpp:2030
+#: rc.cpp:2077 rc.cpp:2559
 #, no-c-format
 msgid "milliseconds"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4676
-#: advanced/kcm_sambaconf/kcmsambaconf.cpp:319 rc.cpp:1551
+#: advanced/kcm_sambaconf/kcmsambaconf.cpp:319 rc.cpp:2080
 #, no-c-format
 msgid "Charset"
 msgstr "Set Nodau"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4693
-#: rc.cpp:1554
+#: rc.cpp:2083
 #, no-c-format
 msgid "Samba &3.x"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4714
-#: rc.cpp:1557
+#: rc.cpp:2086
 #, no-c-format
 msgid "D&OS charset:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4738
-#: rc.cpp:1560
+#: rc.cpp:2089
 #, no-c-format
 msgid "UNI&X charset:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4762
-#: rc.cpp:1563
+#: rc.cpp:2092
 #, no-c-format
 msgid "Displa&y charset:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4782
-#: rc.cpp:1566
+#: rc.cpp:2095
 #, no-c-format
 msgid "U&nicode"
 msgstr "U&ngôd"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4792
-#: rc.cpp:1569
+#: rc.cpp:2098
 #, no-c-format
 msgid "Samba &2.x"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4809
-#: rc.cpp:1572
+#: rc.cpp:2101
 #, no-c-format
 msgid "Character set:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4834
-#: rc.cpp:1575
+#: rc.cpp:2104
 #, no-c-format
 msgid "Va&lid chars:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4863
-#: rc.cpp:1578
+#: rc.cpp:2107
 #, no-c-format
 msgid "Code page directory:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4887
-#: rc.cpp:1581
+#: rc.cpp:2110
 #, no-c-format
 msgid "Codin&g system:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4902
-#: rc.cpp:1584
+#: rc.cpp:2113
 #, no-c-format
 msgid "Client code page:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4934
-#: advanced/kcm_sambaconf/kcmsambaconf.cpp:313 rc.cpp:1587 rc.cpp:1632
+#: advanced/kcm_sambaconf/kcmsambaconf.cpp:313 rc.cpp:2116 rc.cpp:2161
 #, no-c-format
 msgid "Logon"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4951
-#: rc.cpp:1590
+#: rc.cpp:2119
 #, no-c-format
 msgid "Add Scripts"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4968
-#: rc.cpp:1593
+#: rc.cpp:2122
 #, no-c-format
 msgid "Add user script:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4984
-#: rc.cpp:1596
+#: rc.cpp:2125
 #, no-c-format
 msgid "Add user to group script:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4995
-#: rc.cpp:1599
+#: rc.cpp:2128
 #, no-c-format
 msgid "Add gr&oup script:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5016
-#: rc.cpp:1602
+#: rc.cpp:2131
 #, no-c-format
 msgid "Add machine script:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5051
-#: rc.cpp:1605
+#: rc.cpp:2134
 #, no-c-format
 msgid "Delete Scripts"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5083
-#: rc.cpp:1608
+#: rc.cpp:2137
 #, no-c-format
 msgid "Delete group script:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5094
-#: rc.cpp:1611
+#: rc.cpp:2140
 #, no-c-format
 msgid "Delete user script:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5105
-#: rc.cpp:1614
+#: rc.cpp:2143
 #, no-c-format
 msgid "Delete user from group script:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5118
-#: rc.cpp:1617
+#: rc.cpp:2146
 #, no-c-format
 msgid "Primary Group Script"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5135
-#: rc.cpp:1620
+#: rc.cpp:2149
 #, no-c-format
 msgid "Set primar&y group script:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5153
-#: rc.cpp:1623
+#: rc.cpp:2152
 #, no-c-format
 msgid "Shutdown"
 msgstr "Cau i Lawr"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5170
-#: rc.cpp:1626
+#: rc.cpp:2155
 #, no-c-format
 msgid "Shutdo&wn script:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5181
-#: rc.cpp:1629
+#: rc.cpp:2158
 #, no-c-format
 msgid "Abort shutdown script:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5221
-#: rc.cpp:1635
+#: rc.cpp:2164
 #, no-c-format
 msgid "Logo&n path:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5237
-#: rc.cpp:1638
+#: rc.cpp:2167
 #, no-c-format
 msgid "Logon ho&me:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5253
-#: rc.cpp:1641
+#: rc.cpp:2170
 #, no-c-format
 msgid "&Logon drive:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5269
-#: rc.cpp:1644
+#: rc.cpp:2173
 #, no-c-format
 msgid "Lo&gon script:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5289
-#: advanced/kcm_sambaconf/kcmsambaconf.cpp:322 rc.cpp:1647
+#: advanced/kcm_sambaconf/kcmsambaconf.cpp:322 rc.cpp:2176
 #, no-c-format
 msgid "Socket"
 msgstr "Soced"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5320
-#: rc.cpp:1650
+#: rc.cpp:2179
 #, no-c-format
 msgid "Socket address:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5355
-#: rc.cpp:1656
+#: rc.cpp:2185
 #, no-c-format
 msgid "SO_&KEEPALIVE"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5363
-#: rc.cpp:1659
+#: rc.cpp:2188
 #, no-c-format
 msgid "SO_S&NDBUF:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5401
-#: rc.cpp:1665
+#: rc.cpp:2194
 #, no-c-format
 msgid "TCP_NODELA&Y"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5417
-#: rc.cpp:1671
+#: rc.cpp:2200
 #, no-c-format
 msgid "SO_RCV&LOWAT:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5425
-#: rc.cpp:1674
+#: rc.cpp:2203
 #, no-c-format
 msgid "S&O_REUSEADDR"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5433
-#: rc.cpp:1677
+#: rc.cpp:2206
 #, no-c-format
 msgid "SO_SNDLO&WAT:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5452
-#: rc.cpp:1680
+#: rc.cpp:2209
 #, no-c-format
 msgid "IPTOS_THROU&GHPUT"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5517
-#: advanced/kcm_sambaconf/kcmsambaconf.cpp:325 rc.cpp:1686
+#: advanced/kcm_sambaconf/kcmsambaconf.cpp:325 rc.cpp:2215
 #, no-c-format
 msgid "SSL"
 msgstr "SSL"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5534
-#: rc.cpp:1689
+#: rc.cpp:2218
 #, no-c-format
 msgid "E&nable SSL"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5537
-#: rc.cpp:1692
+#: rc.cpp:2221
 #, no-c-format
 msgid "Enables or disables the entire SSL mode"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5542
-#: rc.cpp:1695
+#: rc.cpp:2224
 #, no-c-format
 msgid ""
 "This enables or disables the entire SSL mode. If it is set to no, the "
@@ -2852,1545 +3609,789 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5587
-#: rc.cpp:1700
+#: rc.cpp:2229
 #, no-c-format
 msgid "SSL h&osts:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5617
-#: rc.cpp:1703
+#: rc.cpp:2232
 #, no-c-format
 msgid "SSL entrop&y bytes:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5658
-#: rc.cpp:1706
+#: rc.cpp:2235
 #, no-c-format
 msgid "SSL ciphers:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5669
-#: rc.cpp:1709
+#: rc.cpp:2238
 #, no-c-format
 msgid "SSL hosts resi&gn:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5692
-#: rc.cpp:1712
+#: rc.cpp:2241
 #, no-c-format
 msgid "ssl2"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5697
-#: rc.cpp:1715
+#: rc.cpp:2244
 #, no-c-format
 msgid "ssl3"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5702
-#: rc.cpp:1718
+#: rc.cpp:2247
 #, no-c-format
 msgid "ssl2or3"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5707
-#: rc.cpp:1721
+#: rc.cpp:2250
 #, no-c-format
 msgid "tls1"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5719
-#: rc.cpp:1724
+#: rc.cpp:2253
 #, no-c-format
 msgid "SSL co&mpatibility"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5746
-#: rc.cpp:1727
+#: rc.cpp:2256
 #, no-c-format
 msgid "SSL CA certDir:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5762
-#: rc.cpp:1730
+#: rc.cpp:2259
 #, no-c-format
 msgid "SSL entropy file:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5773
-#: rc.cpp:1733
+#: rc.cpp:2262
 #, no-c-format
 msgid "SSL egd socket:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5784
-#: rc.cpp:1736
+#: rc.cpp:2265
 #, no-c-format
 msgid "SSL version:"
 msgstr "Fersiwn SSL:"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5800
-#: rc.cpp:1739
+#: rc.cpp:2268
 #, no-c-format
 msgid "SSL CA certFile:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5832
-#: rc.cpp:1742
+#: rc.cpp:2271
 #, no-c-format
 msgid "SSL require clientcert"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5840
-#: rc.cpp:1745
+#: rc.cpp:2274
 #, no-c-format
 msgid "SSL client key:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5851
-#: rc.cpp:1748
+#: rc.cpp:2277
 #, no-c-format
 msgid "SSL re&quire servercert"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5864
-#: rc.cpp:1751
+#: rc.cpp:2280
 #, no-c-format
 msgid "SS&L server cert:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5875
-#: rc.cpp:1754
+#: rc.cpp:2283
 #, no-c-format
 msgid "SSL client cert:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5896
-#: rc.cpp:1757
+#: rc.cpp:2286
 #, no-c-format
 msgid "SSL server &key:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5930
-#: advanced/kcm_sambaconf/kcmsambaconf.cpp:316 rc.cpp:1760
+#: advanced/kcm_sambaconf/kcmsambaconf.cpp:316 rc.cpp:2289
 #, no-c-format
 msgid "Protocol"
 msgstr "Protocol"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5964
-#: rc.cpp:1763
+#: rc.cpp:2292
 #, no-c-format
 msgid "Limits"
 msgstr "Terfynau"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5996
-#: rc.cpp:1766
+#: rc.cpp:2295
 #, no-c-format
 msgid "Ma&x mux:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6011
-#: rc.cpp:1769
+#: rc.cpp:2298
 #, no-c-format
 msgid "Max tt&l:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6078
-#: rc.cpp:1778
+#: rc.cpp:2307
 #, no-c-format
 msgid "Ti&me server"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6086
-#: rc.cpp:1781
+#: rc.cpp:2310
 #, no-c-format
 msgid "Lar&ge readwrite"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6094
-#: rc.cpp:1784
+#: rc.cpp:2313
 #, no-c-format
 msgid "UNIX extensions"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6109
-#: rc.cpp:1790
+#: rc.cpp:2319
 #, no-c-format
 msgid "Read bmpx"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6119
-#: rc.cpp:1793
+#: rc.cpp:2322
 #, no-c-format
 msgid "Protocol Versions"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6136
-#: rc.cpp:1796
+#: rc.cpp:2325
 #, no-c-format
 msgid "Max protocol:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6147
-#: rc.cpp:1799
+#: rc.cpp:2328
 #, no-c-format
 msgid "Announce version:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6158
-#: rc.cpp:1802
+#: rc.cpp:2331
 #, no-c-format
 msgid "A&nnounce as:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6169
-#: rc.cpp:1805
+#: rc.cpp:2334
 #, no-c-format
 msgid "Min protocol:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6180
-#: rc.cpp:1808
+#: rc.cpp:2337
 #, no-c-format
 msgid "Pr&otocol:"
 msgstr "Pr&otocol :"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6206
-#: rc.cpp:1811 rc.cpp:1826 rc.cpp:1841
+#: rc.cpp:2340 rc.cpp:2355 rc.cpp:2370
 #, no-c-format
 msgid "NT1"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6211
-#: rc.cpp:1814 rc.cpp:1829 rc.cpp:1844
+#: rc.cpp:2343 rc.cpp:2358 rc.cpp:2373
 #, no-c-format
 msgid "LANMAN2"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6216
-#: rc.cpp:1817 rc.cpp:1832 rc.cpp:1847
+#: rc.cpp:2346 rc.cpp:2361 rc.cpp:2376
 #, no-c-format
 msgid "LANMAN1"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6221
-#: rc.cpp:1820 rc.cpp:1835 rc.cpp:1850
+#: rc.cpp:2349 rc.cpp:2364 rc.cpp:2379
 #, no-c-format
 msgid "CORE"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6226
-#: rc.cpp:1823 rc.cpp:1838 rc.cpp:1853
+#: rc.cpp:2352 rc.cpp:2367 rc.cpp:2382
 #, no-c-format
 msgid "COREPLUS"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6320
-#: rc.cpp:1856
+#: rc.cpp:2385
 #, no-c-format
 msgid "NT"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6325
-#: rc.cpp:1859
+#: rc.cpp:2388
 #, no-c-format
 msgid "NT Workstation"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6330
-#: rc.cpp:1862
+#: rc.cpp:2391
 #, no-c-format
 msgid "win95"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6335
-#: rc.cpp:1865
+#: rc.cpp:2394
 #, no-c-format
 msgid "WfW"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6363
-#: rc.cpp:1868
+#: rc.cpp:2397
 #, no-c-format
 msgid "4.2"
 msgstr "4.2"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6373
-#: rc.cpp:1871
+#: rc.cpp:2400
 #, no-c-format
 msgid "Listening SMB Ports"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6390
-#: rc.cpp:1874
+#: rc.cpp:2403
 #, no-c-format
 msgid "SMB ports:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6427
-#: advanced/kcm_sambaconf/kcmsambaconf.cpp:328 rc.cpp:1877
+#: advanced/kcm_sambaconf/kcmsambaconf.cpp:328 rc.cpp:2406
 #, no-c-format
 msgid "Browsing"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6444
-#: rc.cpp:1880
+#: rc.cpp:2409
 #, no-c-format
 msgid "LM i&nterval:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6455
-#: rc.cpp:1883
+#: rc.cpp:2412
 #, no-c-format
 msgid "L&M announce:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6504
-#: rc.cpp:1889
+#: rc.cpp:2418
 #, no-c-format
 msgid "Remote browse s&ync:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6535
-#: rc.cpp:1901
+#: rc.cpp:2430
 #, no-c-format
 msgid "Bro&wse list"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6543
-#: rc.cpp:1904
+#: rc.cpp:2433
 #, no-c-format
 msgid "Enhanced browsin&g"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6568
-#: rc.cpp:1907
+#: rc.cpp:2436
 #, no-c-format
 msgid "Pre&load:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6586
-#: rc.cpp:1910
+#: rc.cpp:2439
 #, no-c-format
 msgid "Winbind"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6600
-#: rc.cpp:1913
+#: rc.cpp:2442
 #, no-c-format
 msgid "&Winbind/Idmap UID:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6621
-#: rc.cpp:1916
+#: rc.cpp:2445
 #, no-c-format
 msgid "Winbind/Idmap &GID:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6632
-#: rc.cpp:1919
+#: rc.cpp:2448
 #, no-c-format
 msgid "Template h&omedir:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6648
-#: rc.cpp:1922
+#: rc.cpp:2451
 #, no-c-format
 msgid "Temp&late shell:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6664
-#: rc.cpp:1925
+#: rc.cpp:2454
 #, no-c-format
 msgid "Winbind separator:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6680
-#: rc.cpp:1928
+#: rc.cpp:2457
 #, no-c-format
 msgid "Template primary group:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6704
-#: rc.cpp:1934
+#: rc.cpp:2463
 #, no-c-format
 msgid "Winbind cache ti&me:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6741
-#: rc.cpp:1937
+#: rc.cpp:2466
 #, no-c-format
 msgid "Windows NT 4"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6746
-#: rc.cpp:1940
+#: rc.cpp:2469
 #, no-c-format
 msgid "Windows 2000"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6763
-#: rc.cpp:1946
+#: rc.cpp:2475
 #, no-c-format
 msgid "Acl compatibilit&y:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6774
-#: rc.cpp:1949
+#: rc.cpp:2478
 #, no-c-format
 msgid "Wi&nbind enum users"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6782
-#: rc.cpp:1952
+#: rc.cpp:2481
 #, no-c-format
 msgid "Winbind enum groups"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6790
-#: rc.cpp:1955
+#: rc.cpp:2484
 #, no-c-format
 msgid "Winbind use default domain"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6798
-#: rc.cpp:1958
+#: rc.cpp:2487
 #, no-c-format
 msgid "Winbind enable local accounts"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6806
-#: rc.cpp:1961
+#: rc.cpp:2490
 #, no-c-format
 msgid "Winbind trusted domains only"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6814
-#: rc.cpp:1964
+#: rc.cpp:2493
 #, no-c-format
 msgid "Winbind nested groups"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6841
-#: rc.cpp:1967
+#: rc.cpp:2496
 #, no-c-format
 msgid "NetBIOS"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6879
-#: rc.cpp:1970
+#: rc.cpp:2499
 #, no-c-format
 msgid "NetBIOS sc&ope:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6894
-#: rc.cpp:1973
+#: rc.cpp:2502
 #, no-c-format
 msgid "&NetBIOS aliases:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6905
-#: rc.cpp:1976
+#: rc.cpp:2505
 #, no-c-format
 msgid "Disab&le netbios"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6913
-#: rc.cpp:1979
+#: rc.cpp:2508
 #, no-c-format
 msgid "Na&me resolve order:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6956
-#: rc.cpp:1982
+#: rc.cpp:2511
 #, no-c-format
 msgid "lmhosts host wins bcast"
 msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6966
-#: rc.cpp:1985 rc.cpp:2679
-#, no-c-format
-msgid "VFS"
-msgstr ""
-
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6983
-#: rc.cpp:1988
+#: rc.cpp:2517
 #, no-c-format
 msgid "H&ost msdfs"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7010
-#: rc.cpp:1991
+#: rc.cpp:2520
 #, no-c-format
 msgid "LDAP"
 msgstr "LDAP"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7031
-#: rc.cpp:1994
+#: rc.cpp:2523
 #, no-c-format
 msgid "LDAP suffi&x:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7046
-#: rc.cpp:1997
+#: rc.cpp:2526
 #, no-c-format
 msgid "LDAP machine suffix:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7061
-#: rc.cpp:2000
+#: rc.cpp:2529
 #, no-c-format
 msgid "LDAP user suffix:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7076
-#: rc.cpp:2003
+#: rc.cpp:2532
 #, no-c-format
 msgid "LDAP &group suffix:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7091
-#: rc.cpp:2006
+#: rc.cpp:2535
 #, no-c-format
 msgid "LDAP idmap suffix:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7106
-#: rc.cpp:2009
+#: rc.cpp:2538
 #, no-c-format
 msgid "LDAP filter:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7121
-#: rc.cpp:2012
+#: rc.cpp:2541
 #, no-c-format
 msgid "LDAP ad&min dn:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7149
-#: rc.cpp:2015
+#: rc.cpp:2544
 #, no-c-format
 msgid "LDAP delete d&n"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7157
-#: rc.cpp:2018
+#: rc.cpp:2547
 #, no-c-format
 msgid "LDAP s&ync:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7168
-#: rc.cpp:2021
+#: rc.cpp:2550
 #, no-c-format
 msgid "&LDAP ssl:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7183
-#: rc.cpp:2024
+#: rc.cpp:2553
 #, no-c-format
 msgid "Idmap bac&kend:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7198
-#: rc.cpp:2027
+#: rc.cpp:2556
 #, no-c-format
 msgid "LDAP replication sleep:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7300
-#: rc.cpp:2036
+#: rc.cpp:2565
 #, no-c-format
 msgid "Start_tls"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7325
-#: rc.cpp:2048
+#: rc.cpp:2577
 #, no-c-format
 msgid "Only"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7373
-#: rc.cpp:2054
+#: rc.cpp:2583
 #, no-c-format
 msgid "Add share c&ommand:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7384
-#: rc.cpp:2057
+#: rc.cpp:2586
 #, no-c-format
 msgid "Change share command:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7395
-#: rc.cpp:2060
+#: rc.cpp:2589
 #, no-c-format
 msgid "De&lete share command:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7406
-#: rc.cpp:2063
+#: rc.cpp:2592
 #, no-c-format
 msgid "Messa&ge command:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7417
-#: rc.cpp:2066
+#: rc.cpp:2595
 #, no-c-format
 msgid "Dfree co&mmand:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7428
-#: rc.cpp:2069
+#: rc.cpp:2598
 #, no-c-format
 msgid "Set &quota command:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7439
-#: rc.cpp:2072
+#: rc.cpp:2601
 #, no-c-format
 msgid "Get quota command:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7467
-#: rc.cpp:2075
+#: rc.cpp:2604
 #, no-c-format
 msgid "Pa&nic action:"
 msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7520
-#: advanced/kcm_sambaconf/kcmsambaconf.cpp:331 rc.cpp:2078 rc.cpp:2709
-#, no-c-format
-msgid "Misc"
-msgstr "Amrywiol"
-
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7554
-#: rc.cpp:2084
+#: rc.cpp:2613
 #, no-c-format
 msgid "Time &offset:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7575
-#: rc.cpp:2087
+#: rc.cpp:2616
 #, no-c-format
 msgid "Default service:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7586
-#: rc.cpp:2090
+#: rc.cpp:2619
 #, no-c-format
 msgid "Remote a&nnounce:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7602
-#: rc.cpp:2093
+#: rc.cpp:2622
 #, no-c-format
 msgid "Source environment:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7613
-#: rc.cpp:2096
+#: rc.cpp:2625
 #, no-c-format
 msgid "Hide &local users"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7660
-#: rc.cpp:2102
+#: rc.cpp:2631
 #, no-c-format
 msgid "NIS"
 msgstr "NIS"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7677
-#: rc.cpp:2105
+#: rc.cpp:2634
 #, no-c-format
 msgid "NIS homedir"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7685
-#: rc.cpp:2108
+#: rc.cpp:2637
 #, no-c-format
 msgid "Homedir map:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7703
-#: rc.cpp:2111
+#: rc.cpp:2640
 #, no-c-format
 msgid "UTMP"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7720
-#: rc.cpp:2114
+#: rc.cpp:2643
 #, no-c-format
 msgid "Utmp director&y:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7736
-#: rc.cpp:2117
+#: rc.cpp:2646
 #, no-c-format
 msgid "&Wtmp directory:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7752
-#: rc.cpp:2120
+#: rc.cpp:2649
 #, no-c-format
 msgid "Ut&mp"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7781
-#: rc.cpp:2123
+#: rc.cpp:2652
 #, no-c-format
 msgid "Debug"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7798
-#: rc.cpp:2126
+#: rc.cpp:2655
 #, no-c-format
 msgid "&NT status support"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7810
-#: rc.cpp:2129
+#: rc.cpp:2658
 #, no-c-format
 msgid "NT S&MB support"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7825
-#: rc.cpp:2132
+#: rc.cpp:2661
 #, no-c-format
 msgid "NT pipe supp&ort"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/usertab.ui line 16
-#: rc.cpp:2135
+#: rc.cpp:2664
 #, no-c-format
 msgid "Users"
 msgstr "Defnyddwyr"
 
 #. i18n: file ./advanced/kcm_sambaconf/usertab.ui line 27
-#: rc.cpp:2138
+#: rc.cpp:2667
 #, no-c-format
 msgid "All U&nspecified Users"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/usertab.ui line 36
-#: rc.cpp:2141
+#: rc.cpp:2670
 #, no-c-format
 msgid "Allow"
 msgstr "Caniatáu"
 
 #. i18n: file ./advanced/kcm_sambaconf/usertab.ui line 41
-#: advanced/kcm_sambaconf/usertabimpl.cpp:222 rc.cpp:2144
+#: advanced/kcm_sambaconf/usertabimpl.cpp:222 rc.cpp:2673
 #, no-c-format
 msgid "Reject"
 msgstr "Gwrthod"
 
 #. i18n: file ./advanced/kcm_sambaconf/usertab.ui line 63
-#: rc.cpp:2147
+#: rc.cpp:2676
 #, no-c-format
 msgid "Spec&ified Users"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/usertab.ui line 87
-#: rc.cpp:2159
+#: rc.cpp:2688
 #, no-c-format
 msgid "Access Rights"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/usertab.ui line 125
-#: rc.cpp:2162
+#: rc.cpp:2691
 #, no-c-format
 msgid "A&dd User..."
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/usertab.ui line 133
-#: rc.cpp:2165
+#: rc.cpp:2694
 #, no-c-format
 msgid "E&xpert"
 msgstr "H&en law"
 
 #. i18n: file ./advanced/kcm_sambaconf/usertab.ui line 141
-#: rc.cpp:2168
+#: rc.cpp:2697
 #, no-c-format
 msgid "Add &Group..."
 msgstr "Ychw&anegu Grŵp..."
 
 #. i18n: file ./advanced/kcm_sambaconf/usertab.ui line 149
-#: rc.cpp:2171
+#: rc.cpp:2700
 #, no-c-format
 msgid "Remo&ve Selected"
 msgstr "Tynn&u'r Dewis"
 
 #. i18n: file ./advanced/kcm_sambaconf/usertab.ui line 184
-#: rc.cpp:2174
+#: rc.cpp:2703
 #, no-c-format
 msgid "All Users Should be Forced to the Follo&wing User/Group"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/usertab.ui line 203
-#: rc.cpp:2177
+#: rc.cpp:2706
 #, no-c-format
 msgid "Forc&e user:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/usertab.ui line 235
-#: rc.cpp:2180
+#: rc.cpp:2709
 #, no-c-format
 msgid "Fo&rce group:"
 msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 37
-#: rc.cpp:2183
-#, no-c-format
-msgid "Add/Edit Share"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 130
-#: rc.cpp:2192
-#, no-c-format
-msgid "D&irectory"
-msgstr "C&yfeiriadur"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 164
-#: rc.cpp:2195
-#, no-c-format
-msgid "&Path:"
-msgstr "&Llwybr:"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 185
-#: rc.cpp:2198
-#, no-c-format
-msgid "Share all home &directories"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 197
-#: rc.cpp:2201
-#, no-c-format
-msgid "Iden&tifier"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 214
-#: rc.cpp:2204
-#, no-c-format
-msgid "Na&me:"
-msgstr "&Enw:"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 225
-#: rc.cpp:2207
-#, no-c-format
-msgid "Comme&nt:"
-msgstr "Sylwa&d:"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 248
-#: rc.cpp:2210
-#, no-c-format
-msgid "Main P&roperties"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 265
-#: rc.cpp:2213
-#, no-c-format
-msgid "Read onl&y"
-msgstr "Darllen &yn unig"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 338
-#: rc.cpp:2228
-#, no-c-format
-msgid "Gu&ests"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 397
-#: rc.cpp:2237
-#, no-c-format
-msgid "Only allow guest connect&ions"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 410
-#: rc.cpp:2243
-#, no-c-format
-msgid "Hos&ts"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 435
-#: rc.cpp:2249
-#, no-c-format
-msgid "Hosts allo&w:"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 473
-#: rc.cpp:2264
-#, no-c-format
-msgid "Sy&mbolic Links"
-msgstr "Cy&sylltau Symbolaidd"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 490
-#: rc.cpp:2267
-#, no-c-format
-msgid "Allow following of symbolic lin&ks"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 501
-#: rc.cpp:2270
-#, no-c-format
-msgid ""
-"Allow following of symbolic links that &point to areas outside the directory "
-"tree"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 511
-#: rc.cpp:2273
-#, no-c-format
-msgid ""
-"<qt>Validate password against the following usernames if the client cannot "
-"supply a username:</qt>"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 527
-#: rc.cpp:2276
-#, no-c-format
-msgid "Only allow connections with use&rnames specified in this username list"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 557
-#: rc.cpp:2282
-#, no-c-format
-msgid "Hidden &Files"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 583
-#: rc.cpp:2288
-#, no-c-format
-msgid "Hidden"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 594
-#: rc.cpp:2291
-#, no-c-format
-msgid "Veto"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 605
-#: rc.cpp:2294
-#, no-c-format
-msgid "Veto Oplock"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 616
-#: rc.cpp:2297
-#, no-c-format
-msgid "Size"
-msgstr "Maint"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 627
-#: rc.cpp:2300
-#, no-c-format
-msgid "Date"
-msgstr "Dyddiad"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 638
-#: rc.cpp:2303
-#, no-c-format
-msgid "Permissions"
-msgstr "Caniatadau"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 681
-#: rc.cpp:2312
-#, no-c-format
-msgid "Se&lected Files"
-msgstr "Ff&eiliau Dewisiedig"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 698
-#: rc.cpp:2315
-#, no-c-format
-msgid "Hi&de"
-msgstr "Cu&ddio"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 706
-#: advanced/kcm_sambaconf/hiddenfileview.cpp:116 rc.cpp:2318
-#, no-c-format
-msgid "&Veto"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 714
-#: rc.cpp:2321
-#, no-c-format
-msgid "Veto oploc&k"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 724
-#: rc.cpp:2324
-#, no-c-format
-msgid "&Manual Configuration"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 755
-#: rc.cpp:2327
-#, no-c-format
-msgid "Ve&to files:"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 766
-#: rc.cpp:2330
-#, no-c-format
-msgid "Veto oplock f&iles:"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 792
-#: rc.cpp:2333
-#, no-c-format
-msgid "Hidde&n files:"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 819
-#: rc.cpp:2336
-#, no-c-format
-msgid "Hide un&writable files"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 827
-#: rc.cpp:2339
-#, no-c-format
-msgid "Hide s&pecial files"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 835
-#: rc.cpp:2342
-#, no-c-format
-msgid "Hide files startin&g with a dot "
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 843
-#: rc.cpp:2345
-#, no-c-format
-msgid "Hide un&readable files"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 973
-#: rc.cpp:2361
-#, no-c-format
-msgid "Force Modes"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 990
-#: rc.cpp:2364
-#, no-c-format
-msgid "Forc&e directory security mode:"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1004
-#: rc.cpp:2370
-#, no-c-format
-msgid "Fo&rce security mode:"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1018
-#: rc.cpp:2376
-#, no-c-format
-msgid "Force director&y mode:"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1032
-#: rc.cpp:2382
-#, no-c-format
-msgid "Force create mo&de:"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1060
-#: rc.cpp:2388 rc.cpp:2391 rc.cpp:2406 rc.cpp:2409 rc.cpp:2433 rc.cpp:2436
-#: rc.cpp:2439 rc.cpp:2460
-#, no-c-format
-msgid "..."
-msgstr "..."
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1096
-#: rc.cpp:2394 rc.cpp:2397 rc.cpp:2400 rc.cpp:2403 rc.cpp:2442 rc.cpp:2445
-#: rc.cpp:2448 rc.cpp:2457 rc.cpp:2484
-#, no-c-format
-msgid "01234567"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1209
-#: rc.cpp:2412
-#, no-c-format
-msgid "Masks"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1226
-#: rc.cpp:2415
-#, no-c-format
-msgid "Directory security mask:"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1240
-#: rc.cpp:2421
-#, no-c-format
-msgid "Security &mask:"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1254
-#: rc.cpp:2427
-#, no-c-format
-msgid "Direc&tory mask:"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1376
-#: rc.cpp:2451
-#, no-c-format
-msgid "Create mas&k:"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1428
-#: rc.cpp:2463
-#, no-c-format
-msgid "ACL"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1445
-#: rc.cpp:2466
-#, no-c-format
-msgid "&Profile acls"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1453
-#: rc.cpp:2469
-#, no-c-format
-msgid "Inherit ac&ls"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1461
-#: rc.cpp:2472
-#, no-c-format
-msgid "&NT ACL support"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1472
-#: rc.cpp:2475
-#, no-c-format
-msgid "Force unkno&wn acl user:"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1486
-#: rc.cpp:2481
-#, no-c-format
-msgid "Map acl &inherit"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1527
-#: rc.cpp:2490
-#, no-c-format
-msgid "Inherit permissions from parent directory"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1535
-#: rc.cpp:2493
-#, no-c-format
-msgid "Allow deletion of readonly files"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1545
-#: rc.cpp:2496
-#, no-c-format
-msgid "DOS Attribute Mapping"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1562
-#: rc.cpp:2499
-#, no-c-format
-msgid "Map DOS archi&ve to UNIX owner execute"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1570
-#: rc.cpp:2502
-#, no-c-format
-msgid "Map DOS hidden to UNI&X world execute"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1578
-#: rc.cpp:2505
-#, no-c-format
-msgid "Map DOS system to UNIX &group execute"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1586
-#: rc.cpp:2508
-#, no-c-format
-msgid "Store DOS attributes onto extended attribute"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1599
-#: rc.cpp:2511
-#, no-c-format
-msgid "OS/2"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1610
-#: rc.cpp:2514
-#, no-c-format
-msgid "OS/2 style extended attributes support"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1642
-#: rc.cpp:2520
-#, no-c-format
-msgid "Sync al&ways"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1650
-#: rc.cpp:2523
-#, no-c-format
-msgid "Strict s&ync"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1658
-#: rc.cpp:2526
-#, no-c-format
-msgid "St&rict allocate"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1666
-#: rc.cpp:2529
-#, no-c-format
-msgid "Use sen&dfile"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1691
-#: rc.cpp:2532
-#, no-c-format
-msgid "Bloc&k size:"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1702
-#: rc.cpp:2535
-#, no-c-format
-msgid "Client-side cachin&g policy:"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1713
-#: rc.cpp:2538 rc.cpp:2556
-#, no-c-format
-msgid "bytes"
-msgstr "beitiau"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1721
-#: rc.cpp:2541
-#, no-c-format
-msgid "Write cache si&ze:"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1730
-#: rc.cpp:2544
-#, no-c-format
-msgid "manual"
-msgstr "Â llaw"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1735
-#: rc.cpp:2547
-#, no-c-format
-msgid "documents"
-msgstr "dogfennau"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1740
-#: rc.cpp:2550
-#, no-c-format
-msgid "programs"
-msgstr "rhaglenni"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1745
-#: rc.cpp:2553
-#, no-c-format
-msgid "disable"
-msgstr "analluogi"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1804
-#: rc.cpp:2559
-#, no-c-format
-msgid "&Maximum number of simultaneous connections:"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1876
-#: rc.cpp:2568
-#, no-c-format
-msgid "Hide traili&ng dot"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1886
-#: rc.cpp:2571
-#, no-c-format
-msgid "DOS"
-msgstr "DOS"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1903
-#: rc.cpp:2574
-#, no-c-format
-msgid "&DOS file mode"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1911
-#: rc.cpp:2577
-#, no-c-format
-msgid "DOS f&ile times"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1919
-#: rc.cpp:2580
-#, no-c-format
-msgid "DOS file time resolution"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1972
-#: rc.cpp:2583
-#, no-c-format
-msgid "Name Mangling"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1995
-#: rc.cpp:2586
-#, no-c-format
-msgid "Mangling cha&r:"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2066
-#: rc.cpp:2589
-#, no-c-format
-msgid "Mangled ma&p:"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2098
-#: rc.cpp:2592
-#, no-c-format
-msgid "Enable na&me mangling"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2114
-#: rc.cpp:2595
-#, no-c-format
-msgid "Man&gle case"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2130
-#: rc.cpp:2598
-#, no-c-format
-msgid "Mangling method:"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2139
-#: rc.cpp:2601
-#, no-c-format
-msgid "hash"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2144
-#: rc.cpp:2604
-#, no-c-format
-msgid "hash2"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2172
-#: rc.cpp:2607
-#, no-c-format
-msgid "Preser&ve case"
-msgstr "C&adw maint"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2191
-#: rc.cpp:2610
-#, no-c-format
-msgid "Short pr&eserve case"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2207
-#: rc.cpp:2613
-#, no-c-format
-msgid "Defau&lt case:"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2216
-#: rc.cpp:2616
-#, no-c-format
-msgid "Lower"
-msgstr "Gostwng"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2221
-#: rc.cpp:2619
-#, no-c-format
-msgid "Upper"
-msgstr "Uchaf"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2247
-#: rc.cpp:2622 rc.cpp:2664
-#, fuzzy, no-c-format
-msgid "Automatic"
-msgstr "Ymysgogol"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2293
-#: rc.cpp:2631
-#, fuzzy, no-c-format
-msgid "Case sensi&tive:"
-msgstr "Llythrenna&u mawr/bach o bwys"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2343
-#: rc.cpp:2637
-#, no-c-format
-msgid "Locki&ng"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2360
-#: rc.cpp:2640
-#, no-c-format
-msgid "Issue oppo&rtunistic locks (oplocks) "
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2368
-#: rc.cpp:2643
-#, no-c-format
-msgid "O&plocks"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2411
-#: rc.cpp:2646
-#, no-c-format
-msgid "Oplock contention li&mit:"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2422
-#: rc.cpp:2649
-#, no-c-format
-msgid "Le&vel2 oplocks"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2432
-#: rc.cpp:2652
-#, no-c-format
-msgid "Fak&e oplocks"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2443
-#: rc.cpp:2655
-#, no-c-format
-msgid "Share mo&des"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2451
-#: rc.cpp:2658
-#, no-c-format
-msgid "Posi&x locking"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2467
-#: rc.cpp:2661
-#, no-c-format
-msgid "S&trict locking:"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2525
-#: rc.cpp:2673
-#, no-c-format
-msgid "Blockin&g locks"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2535
-#: rc.cpp:2676
-#, no-c-format
-msgid "Enable lock&ing"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2584
-#: rc.cpp:2682
-#, no-c-format
-msgid "Vfs ob&jects:"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2595
-#: rc.cpp:2685
-#, no-c-format
-msgid "Vfs o&ptions:"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2630
-#: rc.cpp:2691
-#, no-c-format
-msgid "preexec c&lose"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2638
-#: rc.cpp:2694
-#, no-c-format
-msgid "root pree&xec close"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2663
-#: rc.cpp:2697
-#, no-c-format
-msgid "Pos&texec:"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2674
-#: rc.cpp:2700
-#, no-c-format
-msgid "Root pr&eexec:"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2685
-#: rc.cpp:2703
-#, no-c-format
-msgid "P&reexec:"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2701
-#: rc.cpp:2706
-#, no-c-format
-msgid "Root &postexec:"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2760
+#. i18n: file ./advanced/kcm_sambaconf/userselectdlg.ui line 16
 #: rc.cpp:2712
 #, no-c-format
-msgid "Fst&ype:"
+msgid "Select Users"
 msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2781
+#. i18n: file ./advanced/kcm_sambaconf/userselectdlg.ui line 36
 #: rc.cpp:2715
 #, no-c-format
-msgid "Ma&gic script:"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2792
-#: rc.cpp:2718
-#, no-c-format
-msgid "&Volume:"
-msgstr "&Lefel sain:"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2808
-#: rc.cpp:2721
-#, no-c-format
-msgid "Mag&ic output:"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2819
-#: rc.cpp:2724
-#, no-c-format
-msgid "Fa&ke directory create times"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2827
-#: rc.cpp:2727
-#, no-c-format
-msgid "Ms&dfs root"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2835
-#: rc.cpp:2730
-#, no-c-format
-msgid "Setdir command allo&wed"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2843
-#: rc.cpp:2733
-#, no-c-format
-msgid "Do &not descend:"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2859
-#: rc.cpp:2736
-#, no-c-format
-msgid "Msdfs pro&xy:"
+msgid "Select &Users"
 msgstr ""
 
 #. i18n: file ./advanced/propsdlgplugin/propertiespagegui.ui line 35
@@ -4465,27 +4466,27 @@ msgstr "C&yhoeddus"
 msgid "Mor&e Samba Options"
 msgstr ""
 
-#: simple/fileshare.cpp:98
+#: simple/fileshare.cpp:99
 msgid "No NFS server installed on this system"
 msgstr ""
 
-#: simple/fileshare.cpp:104
+#: simple/fileshare.cpp:105
 msgid "No Samba server installed on this system"
 msgstr ""
 
-#: simple/fileshare.cpp:300
+#: simple/fileshare.cpp:301
 msgid "Could not save settings."
 msgstr ""
 
-#: simple/fileshare.cpp:301
+#: simple/fileshare.cpp:302
 msgid "Could not open file '%1' for writing: %2"
 msgstr ""
 
-#: simple/fileshare.cpp:303
+#: simple/fileshare.cpp:304
 msgid "Saving Failed"
 msgstr ""
 
-#: simple/fileshare.cpp:344
+#: simple/fileshare.cpp:345
 msgid ""
 "<h1>File Sharing</h1>"
 "<p>This module can be used to enable file sharing over the network using the "
@@ -4493,7 +4494,7 @@ msgid ""
 "share your files with Windows(R) computers on your network.</p>"
 msgstr ""
 
-#: simple/fileshare.cpp:358
+#: simple/fileshare.cpp:359
 msgid "Share Folder"
 msgstr ""
 
@@ -4601,9 +4602,9 @@ msgstr ""
 msgid "The host '%1' already exists."
 msgstr ""
 
-#: advanced/kcm_sambaconf/sambafile.cpp:217
-msgid "Unnamed"
-msgstr "Di-enw"
+#: advanced/kcm_sambaconf/dictmanager.cpp:61
+msgid "The option <em>%1</em> is not supported by your Samba version"
+msgstr ""
 
 #: advanced/kcm_sambaconf/linuxpermissionchecker.cpp:116
 msgid ""
@@ -4666,6 +4667,10 @@ msgstr ""
 msgid "<h1>Samba Configuration</h1> here you can configure your SAMBA server."
 msgstr ""
 
+#: advanced/kcm_sambaconf/sambafile.cpp:217
+msgid "Unnamed"
+msgstr "Di-enw"
+
 #: advanced/kcm_sambaconf/hiddenfileview.cpp:115
 msgid "&Hide"
 msgstr "Cudd&io"
@@ -4746,10 +4751,6 @@ msgstr ""
 msgid "Admin"
 msgstr "Gweinyddwr"
 
-#: advanced/kcm_sambaconf/dictmanager.cpp:61
-msgid "The option <em>%1</em> is not supported by your Samba version"
-msgstr ""
-
 #: advanced/kcm_sambaconf/kcminterface.ui.h:101
 msgid ""
 "Use the <i>share</i> security level if you have a home network or a small "
diff --git a/tde-i18n-cy/messages/tdenetwork/tdeio_jabberdisco.po b/tde-i18n-cy/messages/tdenetwork/tdeio_jabberdisco.po
index 3222dbbf86f..48d840bed14 100644
--- a/tde-i18n-cy/messages/tdenetwork/tdeio_jabberdisco.po
+++ b/tde-i18n-cy/messages/tdenetwork/tdeio_jabberdisco.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2005-06-03 01:26+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdenetwork/tdeio_lan.po b/tde-i18n-cy/messages/tdenetwork/tdeio_lan.po
index f062a0035ab..e5860afba47 100644
--- a/tde-i18n-cy/messages/tdenetwork/tdeio_lan.po
+++ b/tde-i18n-cy/messages/tdenetwork/tdeio_lan.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_lan\n"
-"POT-Creation-Date: 2005-03-25 01:18+0100\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2004-01-06 13:32+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdenetwork/tdeio_zeroconf.po b/tde-i18n-cy/messages/tdenetwork/tdeio_zeroconf.po
index 24dbe1e57b9..5a17f873f5f 100644
--- a/tde-i18n-cy/messages/tdenetwork/tdeio_zeroconf.po
+++ b/tde-i18n-cy/messages/tdenetwork/tdeio_zeroconf.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: all2.po\n"
-"POT-Creation-Date: 2007-04-13 02:15+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdepim/akregator.po b/tde-i18n-cy/messages/tdepim/akregator.po
index a9c01586d9b..298622245c0 100644
--- a/tde-i18n-cy/messages/tdepim/akregator.po
+++ b/tde-i18n-cy/messages/tdepim/akregator.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: all2.po\n"
-"POT-Creation-Date: 2008-07-08 01:23+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,7 +22,7 @@ msgid ""
 "Your emails"
 msgstr "kyfieithu@dotmon.com"
 
-#: aboutdata.cpp:32 akregator_part.cpp:946 articleviewer.cpp:396
+#: aboutdata.cpp:32 akregator_part.cpp:956 articleviewer.cpp:396
 msgid "Akregator"
 msgstr ""
 
@@ -193,25 +194,25 @@ msgid "Ma&rk All Feeds as Read"
 msgstr ""
 
 #. i18n: file akregator.kcfg line 9
-#: actionmanagerimpl.cpp:317 rc.cpp:312 rc.cpp:819
+#: actionmanagerimpl.cpp:317 rc.cpp:321 rc.cpp:675
 #, no-c-format
 msgid "Show Quick Filter"
 msgstr ""
 
 #. i18n: file settings_browser.ui line 108
-#: actionmanagerimpl.cpp:320 rc.cpp:240 rc.cpp:255 rc.cpp:639 rc.cpp:654
+#: actionmanagerimpl.cpp:320 rc.cpp:246 rc.cpp:261 rc.cpp:651 rc.cpp:666
 #, no-c-format
 msgid "Open in Tab"
 msgstr ""
 
 #. i18n: file settings_browser.ui line 113
-#: actionmanagerimpl.cpp:321 rc.cpp:243 rc.cpp:258 rc.cpp:642 rc.cpp:657
+#: actionmanagerimpl.cpp:321 rc.cpp:249 rc.cpp:264 rc.cpp:654 rc.cpp:669
 #, no-c-format
 msgid "Open in Background Tab"
 msgstr ""
 
 #. i18n: file settings_browser.ui line 118
-#: actionmanagerimpl.cpp:322 rc.cpp:246 rc.cpp:261 rc.cpp:645 rc.cpp:660
+#: actionmanagerimpl.cpp:322 rc.cpp:252 rc.cpp:267 rc.cpp:657 rc.cpp:672
 #, no-c-format
 msgid "Open in External Browser"
 msgstr ""
@@ -361,7 +362,7 @@ msgid "&Close Tab"
 msgstr "&Cau Tab"
 
 #. i18n: file addfeedwidgetbase.ui line 16
-#: addfeeddialog.cpp:53 rc.cpp:48 rc.cpp:609
+#: addfeeddialog.cpp:53 rc.cpp:48 rc.cpp:621
 #, no-c-format
 msgid "Add Feed"
 msgstr ""
@@ -394,105 +395,97 @@ msgid "Feeds"
 msgstr ""
 
 #: akregator_part.cpp:366
-msgid "Akregator News"
+msgid "Trinity Desktop News"
 msgstr ""
 
 #: akregator_part.cpp:371
-msgid "Akregator Blog"
+msgid "LXer Linux News"
 msgstr ""
 
 #: akregator_part.cpp:376
-msgid "TDE Dot News"
+msgid "Tuxmachines"
 msgstr ""
 
 #: akregator_part.cpp:381
-msgid "Planet TDE"
+msgid "lwn.net"
 msgstr ""
 
-#: akregator_part.cpp:386
-msgid "TDE Apps"
-msgstr ""
-
-#: akregator_part.cpp:391
-msgid "TDE Look"
-msgstr ""
-
-#: akregator_part.cpp:400
+#: akregator_part.cpp:390
 msgid "Opening Feed List..."
 msgstr ""
 
-#: akregator_part.cpp:435
+#: akregator_part.cpp:425
 msgid ""
 "<qt>The standard feed list is corrupted (invalid XML). A backup was created:"
 "<p><b>%2</b></p></qt>"
 msgstr ""
 
-#: akregator_part.cpp:435
+#: akregator_part.cpp:425
 msgid "XML Parsing Error"
 msgstr "Gwall gramadegu XML"
 
-#: akregator_part.cpp:450
+#: akregator_part.cpp:440
 msgid ""
 "<qt>The standard feed list is corrupted (no valid OPML). A backup was created:"
 "<p><b>%2</b></p></qt>"
 msgstr ""
 
-#: akregator_part.cpp:450 akregator_part.cpp:642
+#: akregator_part.cpp:440 akregator_part.cpp:632
 msgid "OPML Parsing Error"
 msgstr ""
 
-#: akregator_part.cpp:489
+#: akregator_part.cpp:479
 msgid "Access denied: cannot save feed list (%1)"
 msgstr ""
 
-#: akregator_part.cpp:489
+#: akregator_part.cpp:479
 msgid "Write error"
 msgstr ""
 
-#: akregator_part.cpp:593
+#: akregator_part.cpp:583
 msgid "Interesting"
 msgstr ""
 
-#: akregator_part.cpp:642
+#: akregator_part.cpp:632
 msgid "Could not import the file %1 (no valid OPML)"
 msgstr ""
 
-#: akregator_part.cpp:645
+#: akregator_part.cpp:635
 msgid ""
 "The file %1 could not be read, check if it exists or if it is readable for the "
 "current user."
 msgstr ""
 
-#: akregator_part.cpp:645
+#: akregator_part.cpp:635
 msgid "Read Error"
 msgstr ""
 
-#: akregator_part.cpp:659
+#: akregator_part.cpp:649
 msgid "The file %1 already exists; do you want to overwrite it?"
 msgstr ""
 
-#: akregator_part.cpp:661
+#: akregator_part.cpp:651
 msgid "Overwrite"
 msgstr "Trosysgrifo"
 
-#: akregator_part.cpp:667
+#: akregator_part.cpp:657
 #, c-format
 msgid "Access denied: cannot write to file %1"
 msgstr ""
 
-#: akregator_part.cpp:667
+#: akregator_part.cpp:657
 msgid "Write Error"
 msgstr ""
 
-#: akregator_part.cpp:696 akregator_part.cpp:706
+#: akregator_part.cpp:686 akregator_part.cpp:696
 msgid "OPML Outlines (*.opml, *.xml)"
 msgstr ""
 
-#: akregator_part.cpp:697 akregator_part.cpp:707
+#: akregator_part.cpp:687 akregator_part.cpp:697
 msgid "All Files"
 msgstr "Pob Ffeil"
 
-#: akregator_part.cpp:975
+#: akregator_part.cpp:985
 msgid ""
 "<qt>%1 already seems to be running on another display on this machine. <b>"
 "Running %2 more than once is not supported by the %3 backend and can cause the "
@@ -501,7 +494,7 @@ msgid ""
 "already running.</qt>"
 msgstr ""
 
-#: akregator_part.cpp:987
+#: akregator_part.cpp:997
 msgid ""
 "<qt>%1 seems to be running on another display on this machine. <b>"
 "Running %1 and %2 at the same time is not supported by the %3 backend and can "
@@ -510,7 +503,7 @@ msgid ""
 "already running.</qt>"
 msgstr ""
 
-#: akregator_part.cpp:998
+#: akregator_part.cpp:1008
 msgid ""
 "<qt>%1 already seems to be running on %2. <b>Running %1 more than once is not "
 "supported by the %3 backend and can cause the loss of archived articles and "
@@ -518,7 +511,7 @@ msgid ""
 "sure that it is not already running on %2.</qt>"
 msgstr ""
 
-#: akregator_part.cpp:1006
+#: akregator_part.cpp:1016
 msgid ""
 "<qt>%1 seems to be running on %3. <b>Running %1 and %2 at the same time is not "
 "supported by the %4 backend and can cause the loss of archived articles and "
@@ -526,11 +519,11 @@ msgid ""
 "sure that %1 is not running on %3.</qt>"
 msgstr ""
 
-#: akregator_part.cpp:1018
+#: akregator_part.cpp:1028
 msgid "Force Access"
 msgstr ""
 
-#: akregator_part.cpp:1019
+#: akregator_part.cpp:1029
 #, fuzzy
 msgid "Disable Archive"
 msgstr "Archif"
@@ -591,46 +584,46 @@ msgstr ""
 msgid "Browsing area."
 msgstr ""
 
-#: akregator_view.cpp:320 akregator_view.cpp:789
+#: akregator_view.cpp:320 akregator_view.cpp:797
 msgid "Articles"
 msgstr "Erhyglau"
 
-#: akregator_view.cpp:510 main.cpp:70
+#: akregator_view.cpp:518 main.cpp:70
 msgid "Imported Folder"
 msgstr ""
 
-#: akregator_view.cpp:513
+#: akregator_view.cpp:521
 msgid "Add Imported Folder"
 msgstr ""
 
-#: akregator_view.cpp:513
+#: akregator_view.cpp:521
 msgid "Imported folder name:"
 msgstr ""
 
-#: akregator_view.cpp:949
+#: akregator_view.cpp:957
 msgid "Add Folder"
 msgstr ""
 
-#: akregator_view.cpp:949
+#: akregator_view.cpp:957
 msgid "Folder name:"
 msgstr ""
 
-#: akregator_view.cpp:1065
+#: akregator_view.cpp:1073
 msgid "Fetching Feeds..."
 msgstr ""
 
-#: akregator_view.cpp:1307
+#: akregator_view.cpp:1315
 msgid "<qt>Are you sure you want to delete article <b>%1</b>?</qt>"
 msgstr ""
 
-#: akregator_view.cpp:1311
+#: akregator_view.cpp:1319
 #, c-format
 msgid ""
 "_n: <qt>Are you sure you want to delete the selected article?</qt>\n"
 "<qt>Are you sure you want to delete the %n selected articles?</qt>"
 msgstr ""
 
-#: akregator_view.cpp:1315
+#: akregator_view.cpp:1323
 msgid "Delete Article"
 msgstr "Dileu Erthygl"
 
@@ -702,8 +695,8 @@ msgid ""
 "_: %1: Akregator version; %2: help:// URL; %3: homepage URL; --- end of comment "
 "---\n"
 "<h2 style='margin-top: 0px;'>Welcome to Akregator %1</h2>"
-"<p>Akregator is an RSS feed aggregator for the K Desktop Environment. Feed "
-"aggregators provide a convenient way to browse different kinds of content, "
+"<p>Akregator is an RSS feed aggregator for the Trinity Desktop Environment. "
+"Feed aggregators provide a convenient way to browse different kinds of content, "
 "including news, blogs, and other content from online sites. Instead of checking "
 "all your favorite web sites manually for updates, Akregator collects the "
 "content for you.</p>"
@@ -716,7 +709,7 @@ msgid ""
 msgstr ""
 
 #: articleviewer.cpp:398
-msgid "An RSS feed reader for the K Desktop Environment."
+msgid "An RSS feed reader for the Trinity Desktop Environment."
 msgstr ""
 
 #: articleviewer.cpp:428 articleviewer.cpp:429 articleviewer.cpp:524
@@ -749,13 +742,13 @@ msgid "Keep Enabled"
 msgstr ""
 
 #. i18n: file settings_appearance.ui line 17
-#: configdialog.cpp:46 rc.cpp:159 rc.cpp:264 rc.cpp:486 rc.cpp:528
+#: configdialog.cpp:46 rc.cpp:159 rc.cpp:270 rc.cpp:852 rc.cpp:897
 #, no-c-format
 msgid "General"
 msgstr "Cyffredinol"
 
 #. i18n: file settings_advancedbase.ui line 28
-#: configdialog.cpp:47 rc.cpp:138 rc.cpp:189 rc.cpp:561 rc.cpp:786
+#: configdialog.cpp:47 rc.cpp:138 rc.cpp:195 rc.cpp:585 rc.cpp:960
 #, no-c-format
 msgid "Archive"
 msgstr "Archif"
@@ -805,7 +798,7 @@ msgid ""
 msgstr ""
 
 #: mainwindow.cpp:268
-msgid "Docking in System Tray"
+msgid "TQt::Docking in System Tray"
 msgstr ""
 
 #: notificationmanager.cpp:79
@@ -893,7 +886,7 @@ msgid "Fetch aborted"
 msgstr ""
 
 #. i18n: file propertieswidgetbase.ui line 16
-#: propertiesdialog.cpp:69 propertiesdialog.cpp:103 rc.cpp:60 rc.cpp:663
+#: propertiesdialog.cpp:69 propertiesdialog.cpp:103 rc.cpp:60 rc.cpp:498
 #, no-c-format
 msgid "Feed Properties"
 msgstr ""
@@ -904,818 +897,848 @@ msgid "Properties of %1"
 msgstr "Priodweddau %1"
 
 #. i18n: file akregator_part.rc line 29
-#: rc.cpp:9 rc.cpp:27 rc.cpp:45 rc.cpp:483 rc.cpp:591 rc.cpp:777
+#: rc.cpp:9 rc.cpp:27 rc.cpp:45 rc.cpp:579 rc.cpp:612 rc.cpp:942
 #, no-c-format
 msgid "&Go"
 msgstr "&Ewch"
 
 #. i18n: file akregator_part.rc line 43
-#: rc.cpp:12 rc.cpp:780
+#: rc.cpp:12 rc.cpp:615
 #, no-c-format
 msgid "F&eed"
 msgstr ""
 
 #. i18n: file akregator_part.rc line 56
-#: rc.cpp:15 rc.cpp:33 rc.cpp:597 rc.cpp:783
+#: rc.cpp:15 rc.cpp:33 rc.cpp:618 rc.cpp:948
 #, no-c-format
 msgid "&Article"
 msgstr "&Erthygl"
 
 #. i18n: file akregator_shell.rc line 26
-#: rc.cpp:30 rc.cpp:594
+#: rc.cpp:30 rc.cpp:945
 #, no-c-format
 msgid "&Feed"
 msgstr ""
 
 #. i18n: file akregator_shell.rc line 52
-#: rc.cpp:42 rc.cpp:606
+#: rc.cpp:42 rc.cpp:957
 #, no-c-format
 msgid "Speech Toolbar"
 msgstr ""
 
 #. i18n: file addfeedwidgetbase.ui line 95
-#: rc.cpp:51 rc.cpp:612
+#: rc.cpp:51 rc.cpp:624
 #, no-c-format
 msgid "Add New Source"
 msgstr ""
 
 #. i18n: file addfeedwidgetbase.ui line 103
-#: rc.cpp:54 rc.cpp:615
+#: rc.cpp:54 rc.cpp:627
 #, no-c-format
 msgid "Feed &URL:"
 msgstr ""
 
 #. i18n: file addfeedwidgetbase.ui line 118
-#: rc.cpp:57 rc.cpp:618
+#: rc.cpp:57 rc.cpp:630
 #, no-c-format
 msgid "Status"
 msgstr "Cyflwr"
 
 #. i18n: file propertieswidgetbase.ui line 34
-#: rc.cpp:63 rc.cpp:666
+#: rc.cpp:63 rc.cpp:501
 #, no-c-format
 msgid "&General"
 msgstr "&Cyffredinol"
 
 #. i18n: file propertieswidgetbase.ui line 53
-#: rc.cpp:66 rc.cpp:669
+#: rc.cpp:66 rc.cpp:504
 #, no-c-format
 msgid "&URL:"
 msgstr "&URL:"
 
 #. i18n: file propertieswidgetbase.ui line 64
-#: rc.cpp:69 rc.cpp:672
+#: rc.cpp:69 rc.cpp:507
 #, no-c-format
 msgid "&Name:"
 msgstr "&Enw:"
 
 #. i18n: file propertieswidgetbase.ui line 83
-#: rc.cpp:72 rc.cpp:675
+#: rc.cpp:72 rc.cpp:510
 #, no-c-format
 msgid "Display name of RSS column"
 msgstr ""
 
 #. i18n: file propertieswidgetbase.ui line 98
-#: rc.cpp:75 rc.cpp:678
+#: rc.cpp:75 rc.cpp:513
 #, no-c-format
 msgid "U&se a custom update interval"
 msgstr ""
 
 #. i18n: file propertieswidgetbase.ui line 134
-#: rc.cpp:78 rc.cpp:681
+#: rc.cpp:78 rc.cpp:516
 #, no-c-format
 msgid "Update &every:"
 msgstr ""
 
 #. i18n: file propertieswidgetbase.ui line 160
-#: rc.cpp:81 rc.cpp:684
+#: rc.cpp:81 rc.cpp:519
 #, no-c-format
 msgid "Minutes"
 msgstr "Munudau"
 
 #. i18n: file propertieswidgetbase.ui line 165
-#: rc.cpp:84 rc.cpp:687
+#: rc.cpp:84 rc.cpp:522
 #, no-c-format
 msgid "Hours"
 msgstr "Oriau"
 
 #. i18n: file propertieswidgetbase.ui line 170
-#: rc.cpp:87 rc.cpp:690
+#: rc.cpp:87 rc.cpp:525
 #, no-c-format
 msgid "Days"
 msgstr "Dydd"
 
 #. i18n: file propertieswidgetbase.ui line 175
-#: rc.cpp:90 rc.cpp:693
+#: rc.cpp:90 rc.cpp:528
 #, no-c-format
 msgid "Never"
 msgstr "Byth"
 
 #. i18n: file propertieswidgetbase.ui line 192
-#: rc.cpp:93 rc.cpp:696
+#: rc.cpp:93 rc.cpp:531
 #, no-c-format
 msgid "Notify when new articles arri&ve"
 msgstr ""
 
 #. i18n: file propertieswidgetbase.ui line 202
-#: rc.cpp:96 rc.cpp:699
+#: rc.cpp:96 rc.cpp:534
 #, no-c-format
 msgid "Ar&chive"
 msgstr "Ar&chif"
 
 #. i18n: file propertieswidgetbase.ui line 233
-#: rc.cpp:99 rc.cpp:702
+#: rc.cpp:99 rc.cpp:537
 #, fuzzy, no-c-format
 msgid "&Keep all articles"
 msgstr "&Dileu Erthygl"
 
 #. i18n: file propertieswidgetbase.ui line 241
-#: rc.cpp:102 rc.cpp:705
+#: rc.cpp:102 rc.cpp:540
 #, no-c-format
 msgid "Limit archi&ve to:"
 msgstr ""
 
 #. i18n: file propertieswidgetbase.ui line 249
-#: rc.cpp:105 rc.cpp:708
+#: rc.cpp:105 rc.cpp:543
 #, fuzzy, no-c-format
 msgid "&Delete articles older than:"
 msgstr "&Dileu Erthygl"
 
 #. i18n: file propertieswidgetbase.ui line 260
-#: rc.cpp:108 rc.cpp:213 rc.cpp:711 rc.cpp:810
+#: rc.cpp:108 rc.cpp:219 rc.cpp:546 rc.cpp:984
 #, no-c-format
 msgid " days"
 msgstr "o ddiwrnodau"
 
 #. i18n: file propertieswidgetbase.ui line 263
-#: rc.cpp:111 rc.cpp:216 rc.cpp:714 rc.cpp:813
+#: rc.cpp:111 rc.cpp:222 rc.cpp:549 rc.cpp:987
 #, no-c-format
 msgid "1 day"
 msgstr ""
 
 #. i18n: file propertieswidgetbase.ui line 317
-#: rc.cpp:114 rc.cpp:207 rc.cpp:717 rc.cpp:804
+#: rc.cpp:114 rc.cpp:213 rc.cpp:552 rc.cpp:978
 #, no-c-format
 msgid " articles"
 msgstr ""
 
 #. i18n: file propertieswidgetbase.ui line 320
-#: rc.cpp:117 rc.cpp:210 rc.cpp:720 rc.cpp:807
+#: rc.cpp:117 rc.cpp:216 rc.cpp:555 rc.cpp:981
 #, no-c-format
 msgid "1 article"
 msgstr ""
 
 #. i18n: file propertieswidgetbase.ui line 334
-#: rc.cpp:120 rc.cpp:723
+#: rc.cpp:120 rc.cpp:558
 #, no-c-format
 msgid "Di&sable archiving"
 msgstr ""
 
 #. i18n: file propertieswidgetbase.ui line 342
-#: rc.cpp:123 rc.cpp:726
+#: rc.cpp:123 rc.cpp:561
 #, no-c-format
 msgid "&Use default settings"
 msgstr ""
 
 #. i18n: file propertieswidgetbase.ui line 357
-#: rc.cpp:126 rc.cpp:729
+#: rc.cpp:126 rc.cpp:564
 #, no-c-format
 msgid "Adva&nced"
 msgstr "Uw&ch"
 
 #. i18n: file propertieswidgetbase.ui line 376
-#: rc.cpp:129 rc.cpp:732
+#: rc.cpp:129 rc.cpp:567
 #, no-c-format
 msgid "Load the &full website when reading articles"
 msgstr ""
 
 #. i18n: file propertieswidgetbase.ui line 384
-#: rc.cpp:132 rc.cpp:735
+#: rc.cpp:132 rc.cpp:570
 #, no-c-format
 msgid "Mar&k articles as read when they arrive"
 msgstr ""
 
 #. i18n: file settings_advancedbase.ui line 17
-#: rc.cpp:135 rc.cpp:558
+#: rc.cpp:135 rc.cpp:582
 #, fuzzy, no-c-format
 msgid "SettingsAdvanced"
 msgstr "Uwch"
 
 #. i18n: file settings_advancedbase.ui line 39
-#: rc.cpp:141 rc.cpp:564
+#: rc.cpp:141 rc.cpp:588
 #, fuzzy, no-c-format
 msgid "Archive backend:"
 msgstr "Archif"
 
 #. i18n: file settings_advancedbase.ui line 52
-#: rc.cpp:144 rc.cpp:567
+#: rc.cpp:144 rc.cpp:591
 #, no-c-format
 msgid "&Configure..."
 msgstr "&Ffurfweddu..."
 
 #. i18n: file settings_advancedbase.ui line 62
-#: rc.cpp:147 rc.cpp:570
+#: rc.cpp:147 rc.cpp:594
 #, no-c-format
 msgid "Article List"
 msgstr "Rhestr Erthyglau"
 
 #. i18n: file settings_advancedbase.ui line 76
-#: rc.cpp:150 rc.cpp:573
+#: rc.cpp:150 rc.cpp:597
 #, no-c-format
 msgid " sec"
 msgstr "eil"
 
 #. i18n: file settings_advancedbase.ui line 104
-#: rc.cpp:153 rc.cpp:576
+#: rc.cpp:153 rc.cpp:600
 #, no-c-format
 msgid "Reset search bar when changing feeds"
 msgstr ""
 
 #. i18n: file settings_advancedbase.ui line 118
-#: rc.cpp:156 rc.cpp:579
+#: rc.cpp:156 rc.cpp:603
 #, no-c-format
 msgid "Mar&k selected article read after"
 msgstr ""
 
 #. i18n: file settings_appearance.ui line 42
-#: rc.cpp:165 rc.cpp:534
+#: rc.cpp:165 rc.cpp:903
 #, no-c-format
 msgid "Minimum font size:"
 msgstr "Maint wynebfath lleiaf:"
 
 #. i18n: file settings_appearance.ui line 81
-#: rc.cpp:168 rc.cpp:537
+#: rc.cpp:168 rc.cpp:906
 #, no-c-format
 msgid "Medium font size:"
 msgstr "Maint wynebfath canolig:"
 
 #. i18n: file settings_appearance.ui line 133
-#: rc.cpp:174 rc.cpp:543
+#: rc.cpp:174 rc.cpp:912
 #, no-c-format
 msgid "Standard font:"
 msgstr "Wynebfath safonol: "
 
 #. i18n: file settings_appearance.ui line 146
-#: rc.cpp:177 rc.cpp:546
+#: rc.cpp:177 rc.cpp:915
 #, no-c-format
 msgid "Fixed font:"
 msgstr "Wynebfath gosodedig:"
 
 #. i18n: file settings_appearance.ui line 159
-#: rc.cpp:180 rc.cpp:549
+#: rc.cpp:180 rc.cpp:918
 #, no-c-format
 msgid "Serif font:"
 msgstr "Wynebfath seriff:"
 
 #. i18n: file settings_appearance.ui line 172
-#: rc.cpp:183 rc.cpp:552
+#: rc.cpp:183 rc.cpp:921
 #, no-c-format
 msgid "Sans serif font:"
 msgstr "Wynebfath sans seriff:"
 
 #. i18n: file settings_appearance.ui line 187
-#: rc.cpp:186 rc.cpp:555
+#: rc.cpp:186 rc.cpp:924
 #, no-c-format
 msgid "&Underline links"
 msgstr ""
 
+#. i18n: file settings_appearance.ui line 195
+#: rc.cpp:189 rc.cpp:927
+#, no-c-format
+msgid "&Enable favicons"
+msgstr ""
+
+#. i18n: file settings_appearance.ui line 203
+#: rc.cpp:192 rc.cpp:930
+#, no-c-format
+msgid "Automatically load &images"
+msgstr ""
+
 #. i18n: file settings_archive.ui line 39
-#: rc.cpp:192 rc.cpp:789
+#: rc.cpp:198 rc.cpp:963
 #, no-c-format
 msgid "Default Archive Settings"
 msgstr ""
 
 #. i18n: file settings_archive.ui line 50
-#: rc.cpp:195 rc.cpp:792
+#: rc.cpp:201 rc.cpp:966
 #, no-c-format
 msgid "Keep all articles"
 msgstr ""
 
 #. i18n: file settings_archive.ui line 58
-#: rc.cpp:198 rc.cpp:795
+#: rc.cpp:204 rc.cpp:969
 #, no-c-format
 msgid "Limit feed archive size to:"
 msgstr ""
 
 #. i18n: file settings_archive.ui line 66
-#: rc.cpp:201 rc.cpp:798
+#: rc.cpp:207 rc.cpp:972
 #, no-c-format
 msgid "Delete articles older than: "
 msgstr ""
 
 #. i18n: file settings_archive.ui line 74
-#: rc.cpp:204 rc.cpp:801
+#: rc.cpp:210 rc.cpp:975
 #, no-c-format
 msgid "Disable archiving"
 msgstr ""
 
 #. i18n: file settings_archive.ui line 133
-#: rc.cpp:219 rc.cpp:816
+#: rc.cpp:225 rc.cpp:990
 #, no-c-format
 msgid "Do not expire important articles"
 msgstr ""
 
 #. i18n: file settings_browser.ui line 17
-#: rc.cpp:222 rc.cpp:621
+#: rc.cpp:228 rc.cpp:633
 #, no-c-format
 msgid "ExternalBrowser"
 msgstr ""
 
 #. i18n: file settings_browser.ui line 31
-#: rc.cpp:225 rc.cpp:624
+#: rc.cpp:231 rc.cpp:636
 #, no-c-format
 msgid "For External Browsing"
 msgstr ""
 
 #. i18n: file settings_browser.ui line 45
-#: rc.cpp:228 rc.cpp:447 rc.cpp:627 rc.cpp:954
+#: rc.cpp:234 rc.cpp:462 rc.cpp:639 rc.cpp:816
 #, no-c-format
 msgid "Use default TDE web browser"
 msgstr ""
 
 #. i18n: file settings_browser.ui line 56
-#: rc.cpp:231 rc.cpp:453 rc.cpp:630 rc.cpp:960
+#: rc.cpp:237 rc.cpp:468 rc.cpp:642 rc.cpp:822
 #, no-c-format
 msgid "Use this command:"
 msgstr ""
 
 #. i18n: file settings_browser.ui line 67
-#: rc.cpp:234 rc.cpp:633
+#: rc.cpp:240 rc.cpp:645
 #, no-c-format
 msgid "firefox %u"
 msgstr ""
 
 #. i18n: file settings_browser.ui line 77
-#: rc.cpp:237 rc.cpp:636
+#: rc.cpp:243 rc.cpp:648
 #, no-c-format
 msgid "Show tab close button on hover"
 msgstr ""
 
 #. i18n: file settings_browser.ui line 146
-#: rc.cpp:249 rc.cpp:648
+#: rc.cpp:255 rc.cpp:660
 #, no-c-format
 msgid "Middle mouse click:"
 msgstr ""
 
 #. i18n: file settings_browser.ui line 162
-#: rc.cpp:252 rc.cpp:651
+#: rc.cpp:258 rc.cpp:663
 #, no-c-format
 msgid "Left mouse click:"
 msgstr ""
 
 #. i18n: file settings_general.ui line 31
-#: rc.cpp:267 rc.cpp:489
+#: rc.cpp:273 rc.cpp:855
 #, no-c-format
 msgid "Global"
 msgstr "Eang"
 
 #. i18n: file settings_general.ui line 42
-#: rc.cpp:270 rc.cpp:492
+#: rc.cpp:276 rc.cpp:858
 #, no-c-format
 msgid "&Use interval fetching"
 msgstr ""
 
 #. i18n: file settings_general.ui line 50
-#: rc.cpp:273 rc.cpp:495
+#: rc.cpp:279 rc.cpp:861
 #, no-c-format
 msgid "Use &notifications for all feeds"
 msgstr ""
 
 #. i18n: file settings_general.ui line 56
-#: rc.cpp:276 rc.cpp:498
+#: rc.cpp:282 rc.cpp:864
 #, no-c-format
 msgid "Select this if you want to get notified when there are new articles."
 msgstr ""
 
 #. i18n: file settings_general.ui line 64
-#: rc.cpp:279 rc.cpp:501
+#: rc.cpp:285 rc.cpp:867
 #, no-c-format
 msgid "Show tra&y icon"
 msgstr ""
 
 #. i18n: file settings_general.ui line 75
-#: rc.cpp:282 rc.cpp:504
+#: rc.cpp:288 rc.cpp:870
 #, no-c-format
 msgid "Fetch feeds every:"
 msgstr ""
 
 #. i18n: file settings_general.ui line 86
-#: rc.cpp:285 rc.cpp:507
+#: rc.cpp:291 rc.cpp:873
 #, no-c-format
 msgid " minutes"
 msgstr " munud"
 
 #. i18n: file settings_general.ui line 89
-#: rc.cpp:288 rc.cpp:510
+#: rc.cpp:294 rc.cpp:876
 #, no-c-format
 msgid "1 minute"
 msgstr "1 funud"
 
 #. i18n: file settings_general.ui line 108
-#: rc.cpp:291 rc.cpp:513
+#: rc.cpp:297 rc.cpp:879
 #, no-c-format
 msgid "Startup"
 msgstr "Ymgychwyn"
 
 #. i18n: file settings_general.ui line 119
-#: rc.cpp:294 rc.cpp:516
+#: rc.cpp:300 rc.cpp:882
 #, no-c-format
 msgid "Mark &all feeds as read on startup"
 msgstr ""
 
 #. i18n: file settings_general.ui line 127
-#: rc.cpp:297 rc.cpp:519
+#: rc.cpp:303 rc.cpp:885
 #, no-c-format
 msgid "Fetch all fee&ds on startup"
 msgstr ""
 
-#. i18n: file settings_general.ui line 154
-#: rc.cpp:300 rc.cpp:522
+#. i18n: file settings_general.ui line 135
+#: rc.cpp:306 rc.cpp:888
+#, no-c-format
+msgid "Disable the &introduction page"
+msgstr ""
+
+#. i18n: file settings_general.ui line 162
+#: rc.cpp:309 rc.cpp:891
 #, no-c-format
 msgid "Network"
 msgstr "Rhwydwaith"
 
-#. i18n: file settings_general.ui line 165
-#: rc.cpp:303 rc.cpp:525
+#. i18n: file settings_general.ui line 173
+#: rc.cpp:312 rc.cpp:894
 #, no-c-format
 msgid "Use the &browser cache (less network traffic)"
 msgstr ""
 
 #. i18n: file tagpropertieswidgetbase.ui line 36
-#: rc.cpp:306 rc.cpp:738
+#: rc.cpp:315 rc.cpp:573
 #, no-c-format
 msgid "Title:"
 msgstr "Teitl:"
 
 #. i18n: file tagpropertieswidgetbase.ui line 76
-#: rc.cpp:309 rc.cpp:741
+#: rc.cpp:318 rc.cpp:576
 #, no-c-format
 msgid "Icon:"
 msgstr "Eicon:"
 
 #. i18n: file akregator.kcfg line 10
-#: rc.cpp:315 rc.cpp:822
+#: rc.cpp:324 rc.cpp:678
 #, no-c-format
 msgid "Show Quick Filter Bar"
 msgstr ""
 
 #. i18n: file akregator.kcfg line 14
-#: rc.cpp:318 rc.cpp:825
+#: rc.cpp:327 rc.cpp:681
 #, fuzzy, no-c-format
 msgid "Status Filter"
 msgstr "Cyflwr"
 
 #. i18n: file akregator.kcfg line 15
-#: rc.cpp:321 rc.cpp:828
+#: rc.cpp:330 rc.cpp:684
 #, no-c-format
 msgid "Stores the last status filter setting"
 msgstr ""
 
 #. i18n: file akregator.kcfg line 19
-#: rc.cpp:324 rc.cpp:831
+#: rc.cpp:333 rc.cpp:687
 #, fuzzy, no-c-format
 msgid "Text Filter"
 msgstr "Gwagio hidlen"
 
 #. i18n: file akregator.kcfg line 20
-#: rc.cpp:327 rc.cpp:834
+#: rc.cpp:336 rc.cpp:690
 #, no-c-format
 msgid "Stores the last search line text"
 msgstr ""
 
 #. i18n: file akregator.kcfg line 23
-#: rc.cpp:330 rc.cpp:837
+#: rc.cpp:339 rc.cpp:693
 #, no-c-format
 msgid "View Mode"
 msgstr "Modd Golwg"
 
 #. i18n: file akregator.kcfg line 24
-#: rc.cpp:333 rc.cpp:840
+#: rc.cpp:342 rc.cpp:696
 #, no-c-format
 msgid "Article display mode."
 msgstr ""
 
 #. i18n: file akregator.kcfg line 28
-#: rc.cpp:336 rc.cpp:843
+#: rc.cpp:345 rc.cpp:699
 #, no-c-format
 msgid "Sizes for first splitter"
 msgstr ""
 
 #. i18n: file akregator.kcfg line 29
-#: rc.cpp:339 rc.cpp:846
+#: rc.cpp:348 rc.cpp:702
 #, no-c-format
 msgid "First (usually vertical) splitter widget sizes."
 msgstr ""
 
 #. i18n: file akregator.kcfg line 33
-#: rc.cpp:342 rc.cpp:849
+#: rc.cpp:351 rc.cpp:705
 #, no-c-format
 msgid "Sizes for second splitter"
 msgstr ""
 
 #. i18n: file akregator.kcfg line 34
-#: rc.cpp:345 rc.cpp:852
+#: rc.cpp:354 rc.cpp:708
 #, no-c-format
 msgid "Second (usually horizontal) splitter widget sizes."
 msgstr ""
 
-#. i18n: file akregator.kcfg line 57
-#: rc.cpp:348 rc.cpp:855
+#. i18n: file akregator.kcfg line 61
+#: rc.cpp:357 rc.cpp:711
 #, no-c-format
 msgid "Archive Mode"
 msgstr ""
 
-#. i18n: file akregator.kcfg line 61
-#: rc.cpp:351 rc.cpp:858
+#. i18n: file akregator.kcfg line 65
+#: rc.cpp:360 rc.cpp:714
 #, no-c-format
 msgid "Keep All Articles"
 msgstr ""
 
-#. i18n: file akregator.kcfg line 62
-#: rc.cpp:354 rc.cpp:861
+#. i18n: file akregator.kcfg line 66
+#: rc.cpp:363 rc.cpp:717
 #, no-c-format
 msgid "Save an unlimited number of articles."
 msgstr ""
 
-#. i18n: file akregator.kcfg line 65
-#: rc.cpp:357 rc.cpp:864
+#. i18n: file akregator.kcfg line 69
+#: rc.cpp:366 rc.cpp:720
 #, no-c-format
 msgid "Limit Number of Articles"
 msgstr ""
 
-#. i18n: file akregator.kcfg line 66
-#: rc.cpp:360 rc.cpp:867
+#. i18n: file akregator.kcfg line 70
+#: rc.cpp:369 rc.cpp:723
 #, no-c-format
 msgid "Limit the number of articles in a feed"
 msgstr ""
 
-#. i18n: file akregator.kcfg line 69
-#: rc.cpp:363 rc.cpp:870
+#. i18n: file akregator.kcfg line 73
+#: rc.cpp:372 rc.cpp:726
 #, no-c-format
 msgid "Delete Expired Articles"
 msgstr ""
 
-#. i18n: file akregator.kcfg line 70
-#: rc.cpp:366 rc.cpp:873
+#. i18n: file akregator.kcfg line 74
+#: rc.cpp:375 rc.cpp:729
 #, no-c-format
 msgid "Delete expired articles"
 msgstr ""
 
-#. i18n: file akregator.kcfg line 73
-#: rc.cpp:369 rc.cpp:876
+#. i18n: file akregator.kcfg line 77
+#: rc.cpp:378 rc.cpp:732
 #, no-c-format
 msgid "Disable Archiving"
 msgstr ""
 
-#. i18n: file akregator.kcfg line 74
-#: rc.cpp:372 rc.cpp:879
+#. i18n: file akregator.kcfg line 78
+#: rc.cpp:381 rc.cpp:735
 #, no-c-format
 msgid "Do not save any articles"
 msgstr ""
 
-#. i18n: file akregator.kcfg line 79
-#: rc.cpp:375 rc.cpp:882
+#. i18n: file akregator.kcfg line 83
+#: rc.cpp:384 rc.cpp:738
 #, no-c-format
 msgid "Expiry Age"
 msgstr ""
 
-#. i18n: file akregator.kcfg line 80
-#: rc.cpp:378 rc.cpp:885
+#. i18n: file akregator.kcfg line 84
+#: rc.cpp:387 rc.cpp:741
 #, no-c-format
 msgid "Default expiry age for articles in days."
 msgstr ""
 
-#. i18n: file akregator.kcfg line 84
-#: rc.cpp:381 rc.cpp:888
+#. i18n: file akregator.kcfg line 88
+#: rc.cpp:390 rc.cpp:744
 #, no-c-format
 msgid "Article Limit"
 msgstr ""
 
-#. i18n: file akregator.kcfg line 85
-#: rc.cpp:384 rc.cpp:891
+#. i18n: file akregator.kcfg line 89
+#: rc.cpp:393 rc.cpp:747
 #, no-c-format
 msgid "Number of articles to keep per feed."
 msgstr ""
 
-#. i18n: file akregator.kcfg line 89
-#: rc.cpp:387 rc.cpp:894
+#. i18n: file akregator.kcfg line 93
+#: rc.cpp:396 rc.cpp:750
 #, no-c-format
 msgid "Do Not Expire Important Articles"
 msgstr ""
 
-#. i18n: file akregator.kcfg line 90
-#: rc.cpp:390 rc.cpp:897
+#. i18n: file akregator.kcfg line 94
+#: rc.cpp:399 rc.cpp:753
 #, no-c-format
 msgid ""
 "When this option is enabled, articles you marked as important will not be "
 "removed when limit the archive size by either age or number of the articles."
 msgstr ""
 
-#. i18n: file akregator.kcfg line 96
-#: rc.cpp:393 rc.cpp:900
+#. i18n: file akregator.kcfg line 100
+#: rc.cpp:402 rc.cpp:756
 #, no-c-format
 msgid "Concurrent Fetches"
 msgstr ""
 
-#. i18n: file akregator.kcfg line 97
-#: rc.cpp:396 rc.cpp:903
+#. i18n: file akregator.kcfg line 101
+#: rc.cpp:405 rc.cpp:759
 #, no-c-format
 msgid "Number of concurrent fetches"
 msgstr ""
 
-#. i18n: file akregator.kcfg line 101
-#: rc.cpp:399 rc.cpp:906
+#. i18n: file akregator.kcfg line 105
+#: rc.cpp:408 rc.cpp:762
 #, no-c-format
 msgid "Use HTML Cache"
 msgstr ""
 
-#. i18n: file akregator.kcfg line 102
-#: rc.cpp:402 rc.cpp:909
+#. i18n: file akregator.kcfg line 106
+#: rc.cpp:411 rc.cpp:765
 #, no-c-format
 msgid ""
 "Use the TDE-wide HTML cache settings when downloading feeds, to avoid "
 "unnecessary traffic. Disable only when necessary."
 msgstr ""
 
-#. i18n: file akregator.kcfg line 108
-#: rc.cpp:405 rc.cpp:912
+#. i18n: file akregator.kcfg line 112
+#: rc.cpp:414 rc.cpp:768
+#, no-c-format
+msgid "Disable the introduction page"
+msgstr ""
+
+#. i18n: file akregator.kcfg line 113
+#: rc.cpp:417 rc.cpp:771
+#, no-c-format
+msgid "Disable the introduction page."
+msgstr ""
+
+#. i18n: file akregator.kcfg line 117
+#: rc.cpp:420 rc.cpp:774
 #, no-c-format
 msgid "Fetch on startup"
 msgstr ""
 
-#. i18n: file akregator.kcfg line 109
-#: rc.cpp:408 rc.cpp:915
+#. i18n: file akregator.kcfg line 118
+#: rc.cpp:423 rc.cpp:777
 #, no-c-format
 msgid "Fetch feedlist on startup."
 msgstr ""
 
-#. i18n: file akregator.kcfg line 113
-#: rc.cpp:411 rc.cpp:918
+#. i18n: file akregator.kcfg line 122
+#: rc.cpp:426 rc.cpp:780
 #, no-c-format
 msgid "Mark all feeds as read on startup"
 msgstr ""
 
-#. i18n: file akregator.kcfg line 114
-#: rc.cpp:414 rc.cpp:921
+#. i18n: file akregator.kcfg line 123
+#: rc.cpp:429 rc.cpp:783
 #, no-c-format
 msgid "Mark all feeds as read on startup."
 msgstr ""
 
-#. i18n: file akregator.kcfg line 118
-#: rc.cpp:417 rc.cpp:924
+#. i18n: file akregator.kcfg line 127
+#: rc.cpp:432 rc.cpp:786
 #, no-c-format
 msgid "Use interval fetching"
 msgstr ""
 
-#. i18n: file akregator.kcfg line 119
-#: rc.cpp:420 rc.cpp:927
+#. i18n: file akregator.kcfg line 128
+#: rc.cpp:435 rc.cpp:789
 #, no-c-format
 msgid "Fetch all feeds every %1 minutes."
 msgstr ""
 
-#. i18n: file akregator.kcfg line 123
-#: rc.cpp:423 rc.cpp:930
+#. i18n: file akregator.kcfg line 132
+#: rc.cpp:438 rc.cpp:792
 #, no-c-format
 msgid "Interval for autofetching"
 msgstr ""
 
-#. i18n: file akregator.kcfg line 124
-#: rc.cpp:426 rc.cpp:933
+#. i18n: file akregator.kcfg line 133
+#: rc.cpp:441 rc.cpp:795
 #, no-c-format
 msgid "Interval for autofetching in minutes."
 msgstr ""
 
-#. i18n: file akregator.kcfg line 128
-#: rc.cpp:429 rc.cpp:936
+#. i18n: file akregator.kcfg line 137
+#: rc.cpp:444 rc.cpp:798
 #, no-c-format
 msgid "Use notifications"
 msgstr ""
 
-#. i18n: file akregator.kcfg line 129
-#: rc.cpp:432 rc.cpp:939
+#. i18n: file akregator.kcfg line 138
+#: rc.cpp:447 rc.cpp:801
 #, no-c-format
 msgid "Specifies if the balloon notifications are used or not."
 msgstr ""
 
-#. i18n: file akregator.kcfg line 133
-#: rc.cpp:435 rc.cpp:942
+#. i18n: file akregator.kcfg line 142
+#: rc.cpp:450 rc.cpp:804
 #, no-c-format
 msgid "Show tray icon"
 msgstr ""
 
-#. i18n: file akregator.kcfg line 134
-#: rc.cpp:438 rc.cpp:945
+#. i18n: file akregator.kcfg line 143
+#: rc.cpp:453 rc.cpp:807
 #, no-c-format
 msgid "Specifies if the tray icon is shown or not."
 msgstr ""
 
-#. i18n: file akregator.kcfg line 140
-#: rc.cpp:441 rc.cpp:948
+#. i18n: file akregator.kcfg line 149
+#: rc.cpp:456 rc.cpp:810
 #, no-c-format
 msgid "Show close buttons on tabs"
 msgstr ""
 
-#. i18n: file akregator.kcfg line 141
-#: rc.cpp:444 rc.cpp:951
+#. i18n: file akregator.kcfg line 150
+#: rc.cpp:459 rc.cpp:813
 #, no-c-format
 msgid "Show close buttons on tabs instead of icons"
 msgstr ""
 
-#. i18n: file akregator.kcfg line 147
-#: rc.cpp:450 rc.cpp:957
+#. i18n: file akregator.kcfg line 156
+#: rc.cpp:465 rc.cpp:819
 #, no-c-format
 msgid "Use TDE web browser when opening in external browser."
 msgstr ""
 
-#. i18n: file akregator.kcfg line 152
-#: rc.cpp:456 rc.cpp:963
+#. i18n: file akregator.kcfg line 161
+#: rc.cpp:471 rc.cpp:825
 #, no-c-format
 msgid "Use the specified command when opening in external browser."
 msgstr ""
 
-#. i18n: file akregator.kcfg line 156
-#: rc.cpp:459 rc.cpp:966
+#. i18n: file akregator.kcfg line 165
+#: rc.cpp:474 rc.cpp:828
 #, no-c-format
 msgid "Command to launch external browser.  URL will substitute for %u."
 msgstr ""
 
-#. i18n: file akregator.kcfg line 160
-#: rc.cpp:462 rc.cpp:969
+#. i18n: file akregator.kcfg line 169
+#: rc.cpp:477 rc.cpp:831
 #, no-c-format
 msgid "What the click with left mouse button should do."
 msgstr ""
 
-#. i18n: file akregator.kcfg line 169
-#: rc.cpp:465 rc.cpp:972
+#. i18n: file akregator.kcfg line 178
+#: rc.cpp:480 rc.cpp:834
 #, no-c-format
 msgid "What the click with middle mouse button should do."
 msgstr ""
 
-#. i18n: file akregator.kcfg line 197
-#: rc.cpp:468 rc.cpp:975
+#. i18n: file akregator.kcfg line 206
+#: rc.cpp:483 rc.cpp:837
 #, fuzzy, no-c-format
 msgid "Archive Backend"
 msgstr "Archif"
 
-#. i18n: file akregator.kcfg line 201
-#: rc.cpp:471 rc.cpp:978
+#. i18n: file akregator.kcfg line 210
+#: rc.cpp:486 rc.cpp:840
 #, no-c-format
 msgid "Whether to delay before marking an article as read upon selecting it."
 msgstr ""
 
-#. i18n: file akregator.kcfg line 205
-#: rc.cpp:474 rc.cpp:981
+#. i18n: file akregator.kcfg line 214
+#: rc.cpp:489 rc.cpp:843
 #, no-c-format
 msgid ""
 "Configurable delay between selecting and article and it being marked as read."
 msgstr ""
 
-#. i18n: file akregator.kcfg line 209
-#: rc.cpp:477 rc.cpp:984
+#. i18n: file akregator.kcfg line 218
+#: rc.cpp:492 rc.cpp:846
 #, no-c-format
 msgid "Resets the quick filter when changing feeds."
 msgstr ""
 
-#. i18n: file akregator.kcfg line 214
-#: rc.cpp:480 rc.cpp:987
+#. i18n: file akregator.kcfg line 223
+#: rc.cpp:495 rc.cpp:849
 #, no-c-format
 msgid "Show Tagging GUI elements (unfinished)"
 msgstr ""
 
-#. i18n: file ./mk4storage/mk4config.kcfg line 9
-#: rc.cpp:744
+#. i18n: file ./mk4storage/mk4confwidgetbase.ui line 16
+#: rc.cpp:993
 #, no-c-format
-msgid "Commit Interval"
+msgid "Metakit Settings"
 msgstr ""
 
-#. i18n: file ./mk4storage/mk4config.kcfg line 10
-#: rc.cpp:747
+#. i18n: file ./mk4storage/mk4confwidgetbase.ui line 41
+#: rc.cpp:996
 #, no-c-format
-msgid "Commit interval in seconds for writing back changes"
+msgid "Use default location"
 msgstr ""
 
-#. i18n: file ./mk4storage/mk4config.kcfg line 14
-#: rc.cpp:750
+#. i18n: file ./mk4storage/mk4confwidgetbase.ui line 60
+#: rc.cpp:999
 #, fuzzy, no-c-format
-msgid "Path to archive"
+msgid "Archive location:"
 msgstr "Archif"
 
-#. i18n: file ./mk4storage/mk4confwidgetbase.ui line 16
-#: rc.cpp:753
+#. i18n: file ./mk4storage/mk4config.kcfg line 9
+#: rc.cpp:1011
 #, no-c-format
-msgid "Metakit Settings"
+msgid "Commit Interval"
 msgstr ""
 
-#. i18n: file ./mk4storage/mk4confwidgetbase.ui line 41
-#: rc.cpp:756
+#. i18n: file ./mk4storage/mk4config.kcfg line 10
+#: rc.cpp:1014
 #, no-c-format
-msgid "Use default location"
+msgid "Commit interval in seconds for writing back changes"
 msgstr ""
 
-#. i18n: file ./mk4storage/mk4confwidgetbase.ui line 60
-#: rc.cpp:759
+#. i18n: file ./mk4storage/mk4config.kcfg line 14
+#: rc.cpp:1017
 #, fuzzy, no-c-format
-msgid "Archive location:"
+msgid "Path to archive"
 msgstr "Archif"
 
 #: searchbar.cpp:75
@@ -1785,7 +1808,7 @@ msgstr ""
 msgid "Akregator - RSS Feed Reader"
 msgstr ""
 
-#: trayicon.cpp:134
+#: trayicon.cpp:146
 #, c-format
 msgid ""
 "_n: Akregator - 1 unread article\n"
diff --git a/tde-i18n-cy/messages/tdepim/kaddressbook.po b/tde-i18n-cy/messages/tdepim/kaddressbook.po
index de421341659..bb1c5b081e9 100644
--- a/tde-i18n-cy/messages/tdepim/kaddressbook.po
+++ b/tde-i18n-cy/messages/tdepim/kaddressbook.po
@@ -8,17 +8,18 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kaddressbook\n"
-"POT-Creation-Date: 2008-08-19 01:19+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2004-01-07 21:14+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.2\n"
 "\n"
 
-#: customfieldswidget.h:156
+#: customfieldswidget.h:159
 #, fuzzy
 msgid "Custom Fields"
 msgstr "Cwsmer"
@@ -1033,7 +1034,7 @@ msgid ""
 "Address Types"
 msgstr "Cyfeiriadau stryd"
 
-#: addresseeeditordialog.cpp:39 undocmds.cpp:197
+#: addresseeeditordialog.cpp:39 undocmds.cpp:213
 msgid "Edit Contact"
 msgstr "Golygu Cyswllt"
 
@@ -1041,7 +1042,7 @@ msgstr "Golygu Cyswllt"
 msgid "Edit Contact '%1'"
 msgstr "Golygu Cyswllt '%1'"
 
-#: addresseeeditorextension.cpp:68
+#: addresseeeditorextension.cpp:74
 msgid "Contact Editor"
 msgstr "Golygydd Cysylltiadau"
 
@@ -1079,7 +1080,7 @@ msgstr " %1:"
 msgid "Blog feed:"
 msgstr ""
 
-#: addresseeeditorwidget.cpp:292 tdeabcore.cpp:1356
+#: addresseeeditorwidget.cpp:292 kabcore.cpp:1418
 msgid "Select Categories..."
 msgstr "Gosod Categorïau..."
 
@@ -1210,52 +1211,52 @@ msgstr "Amser"
 msgid "Date & Time"
 msgstr "Dyddiad ac Amser"
 
-#: customfieldswidget.cpp:405
+#: customfieldswidget.cpp:433
 msgid "A field with the same name already exists, please choose another one."
 msgstr ""
 
-#: customfieldswidget.cpp:434
+#: customfieldswidget.cpp:462
 #, fuzzy
 msgid "Remove Field"
 msgstr "Gwaredu Rhestr"
 
-#: customfieldswidget.cpp:435
+#: customfieldswidget.cpp:463
 #, fuzzy
 msgid "Select the field you want to remove:"
 msgstr "Dewiswch y math o allwedd:"
 
-#: customfieldswidget.cpp:466
+#: customfieldswidget.cpp:494
 #, fuzzy
 msgid "Add Field..."
 msgstr "Ychwanegu Golwg..."
 
-#: customfieldswidget.cpp:469
+#: customfieldswidget.cpp:497
 #, fuzzy
 msgid "Remove Field..."
 msgstr "Ailenwi Rhestr..."
 
-#: distributionlisteditor.cpp:161
+#: distributionlisteditor.cpp:165
 #, fuzzy
 msgid "Edit Distribution List"
 msgstr "Rhestr Ddosbarthu"
 
-#: distributionlisteditor.cpp:170 filtereditdialog.cpp:122
+#: distributionlisteditor.cpp:174 filtereditdialog.cpp:122
 #: simpleaddresseeeditor.cpp:70
 msgid "Name:"
 msgstr "Enw:"
 
-#: distributionlisteditor.cpp:180
+#: distributionlisteditor.cpp:184
 #, fuzzy
 msgid "Distribution list members:"
 msgstr "Rhestr Ddosbarthu"
 
-#: distributionlisteditor.cpp:259
+#: distributionlisteditor.cpp:264
 msgid ""
 "A distribution list with the name %1 already exists. Please choose another "
 "name."
 msgstr ""
 
-#: distributionlisteditor.cpp:259
+#: distributionlisteditor.cpp:264
 msgid "Name in Use"
 msgstr ""
 
@@ -1376,11 +1377,11 @@ msgstr "Dangos y cysylltiadau sydd ddim yn cydweddu â'r categorïau a ddewiswyd
 msgid "Edit Address Book Filters"
 msgstr "Golygu Hidlenni y Llyfrau Cyfeiriadau"
 
-#: filtereditdialog.cpp:269
+#: features/resourceselection.cpp:187 filtereditdialog.cpp:269
 msgid "&Add..."
 msgstr "&Ychwanegu..."
 
-#: filtereditdialog.cpp:270
+#: features/resourceselection.cpp:182 filtereditdialog.cpp:270
 msgid "&Edit..."
 msgstr "&Golygu..."
 
@@ -1444,7 +1445,7 @@ msgstr ""
 msgid "Reset"
 msgstr "Ailosod"
 
-#: imagewidget.cpp:258
+#: imagewidget.cpp:260
 msgid "Picture"
 msgstr "Llun"
 
@@ -1497,142 +1498,153 @@ msgstr "Pob Maes"
 msgid "All Fields"
 msgstr "Pob Maes"
 
-#: tdeabcore.cpp:115
+#: kabcore.cpp:117
 #, fuzzy
 msgid "Unable to load '%1'."
 msgstr "Methu Cadw"
 
-#: tdeabcore.cpp:121 ldapsearchdialog.cpp:95 ldapsearchdialog.cpp:307
+#: kabcore.cpp:123 ldapsearchdialog.cpp:95 ldapsearchdialog.cpp:307
 msgid "Department"
 msgstr "Adran"
 
-#: tdeabcore.cpp:124
+#: kabcore.cpp:126
 msgid "Profession"
 msgstr "Galwedigaeth"
 
-#: tdeabcore.cpp:126
+#: kabcore.cpp:128
 msgid "Assistant's Name"
 msgstr "Enw'r Cynorthwy-ydd"
 
-#: tdeabcore.cpp:128
+#: kabcore.cpp:130
 msgid "Manager's Name"
 msgstr "Enw'r Rheolwr"
 
-#: tdeabcore.cpp:130
+#: kabcore.cpp:132
 #, fuzzy
 msgid "Partner's Name"
 msgstr "Enw'r Rheolwr"
 
-#: tdeabcore.cpp:132
+#: kabcore.cpp:134
 msgid "Office"
 msgstr "Swyddfa"
 
-#: tdeabcore.cpp:134
+#: kabcore.cpp:136
 msgid "IM Address"
 msgstr "Cyfeiriad NU (IM)"
 
-#: tdeabcore.cpp:136
+#: kabcore.cpp:138
 msgid "Anniversary"
 msgstr "Dathliad"
 
-#: tdeabcore.cpp:138
+#: kabcore.cpp:140
 msgid "Blog"
 msgstr ""
 
-#: tdeabcore.cpp:297
+#: kabcore.cpp:315
 msgid "KAddressBook"
 msgstr "KAddressBook/LlyfrKyfeiriadau"
 
-#: tdeabcore.cpp:298
+#: kabcore.cpp:316
 msgid "The TDE Address Book"
 msgstr "Llyfr Cyfeiriadau TDE"
 
-#: tdeabcore.cpp:300
+#: kabcore.cpp:318
 #, fuzzy
-msgid "(c) 1997-2005, The TDE PIM Team"
+msgid ""
+"(c) 2008-2010, The Trinity Team\n"
+"(c) 1997-2005, The KDE PIM Team"
 msgstr "(h)(c) 1997-2003, Tîm PIM TDE"
 
-#: tdeabcore.cpp:301
+#: kabcore.cpp:319
 msgid "Current maintainer"
 msgstr "Cynhaliwr Cyfredol"
 
-#: tdeabcore.cpp:302
+#: kabcore.cpp:320
+#, fuzzy
+msgid "Previous maintainer"
+msgstr "Cynhaliwr Cyfredol"
+
+#: kabcore.cpp:321
 msgid "Original author"
 msgstr "Awdur gwreiddiol"
 
-#: tdeabcore.cpp:304
+#: kabcore.cpp:323
 msgid "Co-maintainer, libtdeabc port, CSV import/export"
 msgstr "Cyd-gynhaliwr, porthiad libtdeabc, mewnforio/allforio CSV"
 
-#: tdeabcore.cpp:306
+#: kabcore.cpp:325
 msgid "GUI and framework redesign"
 msgstr "Ailgynllunio GUI a fframwaith"
 
-#: tdeabcore.cpp:308
+#: kabcore.cpp:327
 msgid "DCOP interface"
 msgstr "Rhyngwyneb DCOP"
 
-#: tdeabcore.cpp:309
+#: kabcore.cpp:328
 msgid "Contact pinning"
 msgstr "Pinio cyswllt"
 
-#: tdeabcore.cpp:310 tdeabcore.cpp:312
+#: kabcore.cpp:329 kabcore.cpp:331
 msgid "LDAP Lookup"
 msgstr "Chwiliad LDAP"
 
-#: tdeabcore.cpp:467
+#: kabcore.cpp:500
 #, fuzzy, c-format
 msgid ""
 "_n: Do you really want to delete this distribution list?\n"
 "Do you really want to delete these %n distribution lists?"
 msgstr "<qt>Ydych chi wir am waredu'r allwedd <b>%1</b>?</qt>"
 
-#: tdeabcore.cpp:493
-#, fuzzy, c-format
+#: kabcore.cpp:531
+#, c-format
 msgid ""
-"_n: Do you really want to delete this contact?\n"
-"Do you really want to delete these %n contacts?"
-msgstr "<qt>Ydych chi wir am waredu'r allwedd <b>%1</b>?</qt>"
+"_n: <qt>Do you really want to delete this contact from your addressbook?"
+"<br><b>Note:</b>The contact will be also removed from all distribution "
+"lists.</qt>\n"
+"<qt>Do you really want to delete these %n contacts from your addressbook?"
+"<br><b>Note:</b>The contacts will be also removed from all distribution "
+"lists.</qt>"
+msgstr ""
 
-#: tdeabcore.cpp:589
+#: kabcore.cpp:638
 msgid "Please select only one contact."
 msgstr "Dewiswch un cyswllt yn unig os gwelwch yn dda."
 
-#: tdeabcore.cpp:593
+#: kabcore.cpp:642
 msgid ""
 "<qt>Do you really want to use <b>%1</b> as your new personal contact?</qt>"
 msgstr ""
 "<qt>A ydych wir eisiau defnyddio <b>%1</b> fel eich cyswllt personol "
 "newydd?</qt>"
 
-#: tdeabcore.cpp:594
+#: kabcore.cpp:643
 msgid "Use"
 msgstr "Defnydd"
 
-#: tdeabcore.cpp:594
+#: kabcore.cpp:643
 msgid "Do Not Use"
 msgstr ""
 
-#: features/distributionlistwidget.cpp:266 tdeabcore.cpp:664
+#: features/distributionlistwidget.cpp:266 kabcore.cpp:717
 msgid "New Distribution List"
 msgstr "Rhestr Ddosbarthu Newydd"
 
-#: tdeabcore.cpp:670
+#: kabcore.cpp:723
 #, fuzzy
 msgid "New Distribution List (%1)"
 msgstr "Rhestr Ddosbarthu Newydd"
 
-#: tdeabcore.cpp:859
+#: kabcore.cpp:900
 #, fuzzy
 msgid "<qt>Unable to save address book <b>%1</b>.</qt>"
 msgstr "<qt>Methu cyrchu <b>%1</b>.</qt>"
 
-#: tdeabcore.cpp:866
+#: kabcore.cpp:907
 #, fuzzy
 msgid "<qt>Unable to get access for saving the address book <b>%1</b>.</qt>"
 msgstr "<qt>Methu cyrchu <b>%1</b>.</qt>"
 
-#: tdeabcore.cpp:970
+#: kabcore.cpp:1021
 #, fuzzy
 msgid ""
 "Your TDE installation is missing LDAP support, please ask your administrator or "
@@ -1641,45 +1653,68 @@ msgstr ""
 "Mae eich gosodiad TDE yn colli cynhaliaeth LDAP - gofynnwch i'ch gweinyddwr neu "
 "ddosbarthwr am fwy o wybodaeth!"
 
-#: tdeabcore.cpp:972
+#: kabcore.cpp:1023
 msgid "No LDAP IO Slave Available"
 msgstr "Dim gwas IO LDAP ar gael"
 
-#: tdeabcore.cpp:1008
+#: kabcore.cpp:1059
 msgid "Address Book"
 msgstr "Llyfr Cyfeiriadau"
 
-#: tdeabcore.cpp:1011
+#: kabcore.cpp:1062
 msgid "Print Addresses"
 msgstr "Argraffu Cyfeiriadau"
 
-#: tdeabcore.cpp:1177 tdeabcore.cpp:1630
+#: kabcore.cpp:1228 kabcore.cpp:1731
 #, fuzzy
 msgid "Contacts"
 msgstr "Cyswllt"
 
-#: tdeabcore.cpp:1258
+#: kabcore.cpp:1242
+#, fuzzy
+msgid "Add contacts to the distribution list"
+msgstr "Rhestr Ddosbarthu"
+
+#: kabcore.cpp:1244
+msgid ""
+"Click this button if you want to add more contacts to the current distribution "
+"list. You will be shown a dialog that allows to enter a list of existing "
+"contacts to this distribution list."
+msgstr ""
+
+#: kabcore.cpp:1256
+#, fuzzy
+msgid "Remove contacts from the distribution list"
+msgstr "Rhestr Ddosbarthu Newydd"
+
+#: kabcore.cpp:1258
+msgid ""
+"Click this button if you want to remove the selected contacts from the current "
+"distribution list."
+msgstr ""
+
+#: kabcore.cpp:1320
 #, fuzzy
 msgid "&Send Email to Contact..."
 msgstr "&Dileu y Cyswllt"
 
-#: tdeabcore.cpp:1261
+#: kabcore.cpp:1323
 msgid "Send a mail to all selected contacts."
 msgstr "Gyrru ebost at yr holl gysylltiadau a ddewiswyd."
 
-#: tdeabcore.cpp:1262
+#: kabcore.cpp:1324
 msgid "Print a special number of contacts."
 msgstr "Argraffu nifer arbennig o gysylltiadau."
 
-#: tdeabcore.cpp:1266
+#: kabcore.cpp:1328
 msgid "Save all changes of the address book to the storage backend."
 msgstr "Cadw'r holl newidiadau i'r llyfr cyfeiriadau yn yr ôl-storfa"
 
-#: tdeabcore.cpp:1268
+#: kabcore.cpp:1330
 msgid "&New Contact..."
 msgstr "&Cyswllt Newydd..."
 
-#: tdeabcore.cpp:1270
+#: kabcore.cpp:1332
 #, fuzzy
 msgid ""
 "Create a new contact"
@@ -1690,12 +1725,12 @@ msgstr ""
 "<p>Cyflwynir ymgom i chi lle y gallwch ychwanegu holl ddata ar gyfer person, yn "
 "cynnwys cyfeiriadau a rhifau ffôn."
 
-#: tdeabcore.cpp:1272
+#: kabcore.cpp:1334
 #, fuzzy
 msgid "&New Distribution List..."
 msgstr "Rhestr Ddosbarthu Newydd"
 
-#: tdeabcore.cpp:1274
+#: kabcore.cpp:1336
 #, fuzzy
 msgid ""
 "Create a new distribution list"
@@ -1705,28 +1740,28 @@ msgstr ""
 "Golygu'r hidlennu cysylltau"
 "<p>Ymddengys ymgom, lle gallwch ychwanegu, waredu, a golygu hidlenni."
 
-#: tdeabcore.cpp:1276
+#: kabcore.cpp:1338
 msgid "Send &Contact..."
 msgstr "&Anfon Cyswllt..."
 
-#: tdeabcore.cpp:1279
+#: kabcore.cpp:1341
 msgid "Send a mail with the selected contact as attachment."
 msgstr "Gyrru ebost efo'r cyswllt a ddewiswyd fel atodiad."
 
-#: tdeabcore.cpp:1281
+#: kabcore.cpp:1343
 msgid "Chat &With..."
 msgstr ""
 
-#: tdeabcore.cpp:1284
+#: kabcore.cpp:1346
 #, fuzzy
 msgid "Start a chat with the selected contact."
 msgstr "Gyrru ebost efo'r cyswllt a ddewiswyd fel atodiad."
 
-#: tdeabcore.cpp:1286
+#: kabcore.cpp:1348
 msgid "&Edit Contact..."
 msgstr "&Golygu Cyswllt..."
 
-#: tdeabcore.cpp:1289
+#: kabcore.cpp:1351
 #, fuzzy
 msgid ""
 "Edit a contact"
@@ -1737,45 +1772,45 @@ msgstr ""
 "<p>Cyflwynir ymgom i chi lle y gallwch newid data ar gyfer person, yn cynnwys "
 "cyfeiriadau a rhifau ffôn."
 
-#: tdeabcore.cpp:1291
+#: kabcore.cpp:1353
 #, fuzzy
 msgid "&Merge Contacts"
 msgstr "Golygydd Cyfuno Cysylltau"
 
-#: tdeabcore.cpp:1300
+#: kabcore.cpp:1362
 msgid ""
 "Copy the currently selected contact(s) to system clipboard in vCard format."
 msgstr ""
 "Copïo y cyswllt/cysylltau a ddewiswyd i'r clipfwrdd mewn fformat vCard."
 
-#: tdeabcore.cpp:1301
+#: kabcore.cpp:1363
 msgid ""
 "Cuts the currently selected contact(s) to system clipboard in vCard format."
 msgstr ""
 "Torri y cyswllt/cysylltau a ddewiswyd i'r clipfwrdd mewn fformat vCard."
 
-#: tdeabcore.cpp:1302
+#: kabcore.cpp:1364
 msgid "Paste the previously cut or copied contacts from clipboard."
 msgstr "Gludo y cysylltiadau a gopïwyd neu dorrwyd o'r clipfwrdd."
 
-#: tdeabcore.cpp:1303
+#: kabcore.cpp:1365
 msgid "Selects all visible contacts from current view."
 msgstr "Dewis pob cyswllt gweladwy o'r golwg cyfredol "
 
-#: tdeabcore.cpp:1307
+#: kabcore.cpp:1369
 msgid "&Delete Contact"
 msgstr "&Dileu y Cyswllt"
 
-#: tdeabcore.cpp:1310
+#: kabcore.cpp:1372
 msgid "Delete all selected contacts."
 msgstr "Dileu'r holl gysylltiadau a ddewiswyd."
 
-#: tdeabcore.cpp:1313
+#: kabcore.cpp:1375
 #, fuzzy
 msgid "&Copy Contact To..."
 msgstr "&Cyswllt Newydd..."
 
-#: tdeabcore.cpp:1316
+#: kabcore.cpp:1378
 #, fuzzy
 msgid ""
 "Store a contact in a different Addressbook"
@@ -1785,43 +1820,43 @@ msgstr ""
 "Golygu'r hidlennu cysylltau"
 "<p>Ymddengys ymgom, lle gallwch ychwanegu, waredu, a golygu hidlenni."
 
-#: tdeabcore.cpp:1319
+#: kabcore.cpp:1381
 #, fuzzy
 msgid "M&ove Contact To..."
 msgstr "&Cyswllt Newydd..."
 
-#: tdeabcore.cpp:1325
+#: kabcore.cpp:1387
 msgid "Show Jump Bar"
 msgstr "Dangos y Bar Neidio"
 
-#: tdeabcore.cpp:1327
+#: kabcore.cpp:1389
 msgid "Toggle whether the jump button bar shall be visible."
 msgstr "Newid a ddylid dangos y bar neidio ai peidio."
 
-#: tdeabcore.cpp:1328
+#: kabcore.cpp:1390
 #, fuzzy
 msgid "Hide Jump Bar"
 msgstr "Dangos y Bar Neidio"
 
-#: tdeabcore.cpp:1331
+#: kabcore.cpp:1393
 msgid "Show Details"
 msgstr "Dangos Manylion"
 
-#: tdeabcore.cpp:1333
+#: kabcore.cpp:1395
 msgid "Toggle whether the details page shall be visible."
 msgstr "Newid a ddylid dangos y dudalen fanylion ai peidio."
 
-#: tdeabcore.cpp:1334
+#: kabcore.cpp:1396
 #, fuzzy
 msgid "Hide Details"
 msgstr "&Manylion"
 
-#: tdeabcore.cpp:1338
+#: kabcore.cpp:1400
 #, fuzzy
 msgid "&Configure Address Book..."
 msgstr "&Ffurfweddu KLlyfrCyfeiriadau..."
 
-#: tdeabcore.cpp:1344
+#: kabcore.cpp:1406
 msgid ""
 "You will be presented with a dialog, that offers you all possibilities to "
 "configure KAddressBook."
@@ -1829,11 +1864,11 @@ msgstr ""
 "Cyflwynir ymgom i chi a fydd yn eich galluogi i ffurfweddu KLlyfrCyfeiriadau yn "
 "yr holl ffyrdd posib."
 
-#: tdeabcore.cpp:1347
+#: kabcore.cpp:1409
 msgid "&Lookup Addresses in LDAP Directory..."
 msgstr "&Chwilio am Gyfeiriad yn y Cyfeiriadur LDAP..."
 
-#: tdeabcore.cpp:1349
+#: kabcore.cpp:1411
 msgid ""
 "Search for contacts on a LDAP server"
 "<p>You will be presented with a dialog, where you can search for contacts and "
@@ -1843,11 +1878,11 @@ msgstr ""
 "<p>Cyflwynir ymgom i ch lle gallwch chwilio am gysylltau a dewis y rhai yr "
 "ydych eisiau eu hychwanegu i'ch llyfr cyfeiriadau lleol."
 
-#: tdeabcore.cpp:1351
+#: kabcore.cpp:1413
 msgid "Set as Personal Contact Data"
 msgstr ""
 
-#: tdeabcore.cpp:1354
+#: kabcore.cpp:1416
 #, fuzzy
 msgid ""
 "Set the personal contact"
@@ -1858,31 +1893,31 @@ msgstr ""
 "<p>Bydd data y cyswllt yn cael ei ddefnyddio mewn amryw o raglenni TDE, fel nad "
 "oes rhaid mewnosod eich manylion personol fwy nag unwaith."
 
-#: tdeabcore.cpp:1359
+#: kabcore.cpp:1421
 msgid "Set the categories for all selected contacts."
 msgstr "Gosod categorïau ar gyfer pob cyswllt a ddewiswyd."
 
-#: tdeabcore.cpp:1361
+#: kabcore.cpp:1423
 msgid "Clear Search Bar"
 msgstr ""
 
-#: tdeabcore.cpp:1364
+#: kabcore.cpp:1426
 msgid "Clear Search Bar<p>Clears the content of the quick search bar."
 msgstr ""
 
-#: tdeabcore.cpp:1438
+#: kabcore.cpp:1505
 msgid "Merge with existing categories?"
 msgstr "Cyfuno â chategorïau cyfredol?"
 
-#: tdeabcore.cpp:1439
+#: kabcore.cpp:1506
 msgid "Merge"
 msgstr "Cyfuno"
 
-#: tdeabcore.cpp:1439
+#: kabcore.cpp:1506
 msgid "Do Not Merge"
 msgstr ""
 
-#: tdeabcore.cpp:1490
+#: kabcore.cpp:1557
 #, fuzzy, c-format
 msgid ""
 "_n: %n contact matches\n"
@@ -1891,7 +1926,19 @@ msgstr ""
 "Canfuwyd un cyswllt:\n"
 "Canfuwyd %n o gysylltau:"
 
-#: tdeabcore.cpp:1630
+#: kabcore.cpp:1632
+msgid ""
+"_n: <qt>Do you really want to remove this contact from the %1 distribution "
+"list?"
+"<br><b>Note:</b>The contact will be not be removed from your addressbook nor "
+"from any other distribution list.</qt>\n"
+"<qt>Do you really want to remove these %n contacts from the %1 distribution "
+"list?"
+"<br><b>Note:</b>The contacts will be not be removed from your addressbook nor "
+"from any other distribution list.</qt>"
+msgstr ""
+
+#: kabcore.cpp:1732
 #, fuzzy, c-format
 msgid "Distribution List: %1"
 msgstr "Rhestr Ddosbarthu"
@@ -1900,7 +1947,7 @@ msgstr "Rhestr Ddosbarthu"
 msgid "Address Book Browser"
 msgstr "Porydd Llyfrau Cyfeiriadau"
 
-#: kaddressbookmain.cpp:151
+#: kaddressbookmain.cpp:157
 msgid ""
 "You will be presented with a dialog, where you can configure the application "
 "wide shortcuts."
@@ -1924,7 +1971,7 @@ msgstr "Math Allwedd"
 msgid "Select the key type:"
 msgstr "Dewiswch y math o allwedd:"
 
-#: keywidget.cpp:124 xxport/csv_xxport.cpp:68 xxport/ldif_xxport.cpp:117
+#: keywidget.cpp:124 xxport/csv_xxport.cpp:73 xxport/ldif_xxport.cpp:123
 msgid "<qt>Unable to open file <b>%1</b>.</qt>"
 msgstr "<qt>Methu agor y ffeil <b>%1</b>.</qt>"
 
@@ -2080,7 +2127,7 @@ msgid ""
 "Imported from LDAP directory %1 on %2"
 msgstr ""
 
-#: ldapsearchdialog.cpp:588
+#: ldapsearchdialog.cpp:595
 #, fuzzy, c-format
 msgid ""
 "_n: The following contact was imported into your address book:\n"
@@ -2089,11 +2136,11 @@ msgstr ""
 "Mewnforio un cyswllt i'ch llyfr cyfeiriad?\n"
 " Mewnforio %n o gysylltau i'ch llyfr cyfeiriad?"
 
-#: ldapsearchdialog.cpp:603
+#: ldapsearchdialog.cpp:607
 msgid "Please select the contacts you want to add to the distribution list."
 msgstr ""
 
-#: ldapsearchdialog.cpp:603
+#: ldapsearchdialog.cpp:607
 msgid "No Contacts Selected"
 msgstr ""
 
@@ -2243,7 +2290,7 @@ msgid "Contact Toolbar"
 msgstr "Bar Offer Cysylltiadau"
 
 #. i18n: file editors/imaddressbase.ui line 24
-#: editors/imeditorwidget.cpp:369 rc.cpp:63
+#: editors/imeditorwidget.cpp:371 rc.cpp:63
 #, no-c-format
 msgid ""
 "_: Instant messaging\n"
@@ -2474,8 +2521,8 @@ msgstr ""
 
 #. i18n: file common/kaddressbook.kcfg line 34
 #: rc.cpp:174
-#, no-c-format
-msgid "Honor TDE single click"
+#, fuzzy, no-c-format
+msgid "Honor KDE single click"
 msgstr "Parchu clic unigol TDE"
 
 #. i18n: file common/kaddressbook.kcfg line 59
@@ -2504,7 +2551,7 @@ msgstr ""
 msgid "Save only the URL to the sound file, not the whole object."
 msgstr ""
 
-#: undocmds.cpp:46
+#: undocmds.cpp:58
 #, fuzzy, c-format
 msgid ""
 "_n: Delete Contact\n"
@@ -2513,7 +2560,7 @@ msgstr ""
 "Canfuwyd un cyswllt:\n"
 "Canfuwyd %n o gysylltau:"
 
-#: undocmds.cpp:97
+#: undocmds.cpp:111
 #, fuzzy, c-format
 msgid ""
 "_n: Paste Contact\n"
@@ -2522,7 +2569,7 @@ msgstr ""
 "Canfuwyd un cyswllt:\n"
 "Canfuwyd %n o gysylltau:"
 
-#: undocmds.cpp:153
+#: undocmds.cpp:167
 #, fuzzy, c-format
 msgid ""
 "_n: New Contact\n"
@@ -2531,7 +2578,7 @@ msgstr ""
 "Canfuwyd un cyswllt:\n"
 "Canfuwyd %n o gysylltau:"
 
-#: undocmds.cpp:222
+#: undocmds.cpp:244
 #, fuzzy, c-format
 msgid ""
 "_n: Cut Contact\n"
@@ -2540,6 +2587,24 @@ msgstr ""
 "Canfuwyd un cyswllt:\n"
 "Canfuwyd %n o gysylltau:"
 
+#: undocmds.cpp:310
+#, fuzzy, c-format
+msgid ""
+"_n: Copy Contact To\n"
+"Copy %n Contacts To"
+msgstr ""
+"Canfuwyd un cyswllt:\n"
+"Canfuwyd %n o gysylltau:"
+
+#: undocmds.cpp:359
+#, fuzzy, c-format
+msgid ""
+"_n: Move Contact To\n"
+"Move %n Contacts To"
+msgstr ""
+"Canfuwyd un cyswllt:\n"
+"Canfuwyd %n o gysylltau:"
+
 #: viewconfigurefieldspage.cpp:205
 msgid "Select Fields to Display"
 msgstr "Dewiswch Meysydd i Ddangos"
@@ -2588,7 +2653,7 @@ msgstr "Addasu Golwg:"
 msgid "<qt>Are you sure that you want to delete the view <b>%1</b>?</qt>"
 msgstr "<qt>A ydych yn sicr eich bod am ddileu'r olwg<b>%1</b>?</qt>"
 
-#: editors/imeditorwidget.cpp:424 viewmanager.cpp:311
+#: editors/imeditorwidget.cpp:426 viewmanager.cpp:311
 msgid "Confirm Delete"
 msgstr "Cadarnhau Dileu"
 
@@ -2610,25 +2675,25 @@ msgstr "Mewnforio Cysylltau?"
 msgid "Do Not Import"
 msgstr "&Mewnforio"
 
-#: viewmanager.cpp:538 views/configuretableviewdialog.cpp:123
+#: viewmanager.cpp:543 views/configuretableviewdialog.cpp:123
 #: xxport/csvimportdialog.cpp:419
 msgid "None"
 msgstr "Dim un"
 
-#: viewmanager.cpp:539
+#: viewmanager.cpp:544
 #, fuzzy
 msgid "Unfiled"
 msgstr "Anniffiniedig"
 
-#: viewmanager.cpp:562
+#: viewmanager.cpp:567
 msgid "Select View"
 msgstr "Dewis Golwg"
 
-#: viewmanager.cpp:571
+#: viewmanager.cpp:576
 msgid "Modify View..."
 msgstr "Addasu Golwg..."
 
-#: viewmanager.cpp:574
+#: viewmanager.cpp:579
 msgid ""
 "By pressing this button a dialog opens that allows you to modify the view of "
 "the addressbook. There you can add or remove fields that you want to be shown "
@@ -2638,11 +2703,11 @@ msgstr ""
 "cyfeiriadau. Yno gallwch ychwanegu neu waredu meysydd yr ydych am eu dangos "
 "neu'u cuddio yn y llyfr cyfeiriadau, er enghraifft yr enw."
 
-#: viewmanager.cpp:576
+#: viewmanager.cpp:581
 msgid "Add View..."
 msgstr "Ychwanegu Golwg..."
 
-#: viewmanager.cpp:579
+#: viewmanager.cpp:584
 #, fuzzy
 msgid ""
 "You can add a new view by choosing one from the dialog that appears after "
@@ -2653,30 +2718,30 @@ msgstr ""
 "gwasgu'r botwm. Rhaid i chi enwi'r olwg, fel y gallwch wahaniaethu rhwng y "
 "gwahanol olygon."
 
-#: viewmanager.cpp:581
+#: viewmanager.cpp:586
 msgid "Delete View"
 msgstr "Dileu Golwg"
 
-#: viewmanager.cpp:584
+#: viewmanager.cpp:589
 msgid ""
 "By pressing this button you can delete the actual view, which you have added "
 "before."
 msgstr ""
 "Drwy wasgu'r botwm yma gallwch ddileu'r olwg ei hun, yr ychwanegoch o'r blaen."
 
-#: viewmanager.cpp:586
+#: viewmanager.cpp:591
 msgid "Refresh View"
 msgstr "Ailfywio'r Olwg"
 
-#: viewmanager.cpp:589
+#: viewmanager.cpp:594
 msgid "The view will be refreshed by pressing this button."
 msgstr "Ailfywir yr olwg drwy wasgu'r botwm yma."
 
-#: viewmanager.cpp:591
+#: viewmanager.cpp:596
 msgid "Edit &Filters..."
 msgstr "Golygu &Hidlenni..."
 
-#: viewmanager.cpp:594
+#: viewmanager.cpp:599
 msgid ""
 "Edit the contact filters"
 "<p>You will be presented with a dialog, where you can add, remove and edit "
@@ -2859,34 +2924,34 @@ msgid ""
 "Add Address"
 msgstr ""
 
-#: editors/imeditorwidget.cpp:423
+#: editors/imeditorwidget.cpp:425
 #, fuzzy, c-format
 msgid ""
 "_n: Do you really want to delete the selected address?\n"
 "Do you really want to delete the %n selected addresses?"
 msgstr "<qt>Ydych chi wir am waredu'r allwedd <b>%1</b>?</qt>"
 
-#: features/distributionlistngwidget.cpp:111
+#: features/distributionlistngwidget.cpp:110
 #, fuzzy
 msgid "Distribution List Editor NG"
 msgstr "Golygydd Rhestri Dosbarthu"
 
-#: features/distributionlistngwidget.cpp:128
+#: features/distributionlistngwidget.cpp:127
 #, fuzzy
 msgid "Distribution Lists"
 msgstr "Rhestr Ddosbarthu"
 
-#: features/distributionlistngwidget.cpp:134
+#: features/distributionlistngwidget.cpp:133
 #, fuzzy
 msgid "Add distribution list"
 msgstr "Rhestr Ddosbarthu"
 
-#: features/distributionlistngwidget.cpp:140
+#: features/distributionlistngwidget.cpp:139
 #, fuzzy
 msgid "Edit distribution list"
 msgstr "Rhestr Ddosbarthu"
 
-#: features/distributionlistngwidget.cpp:146
+#: features/distributionlistngwidget.cpp:145
 #, fuzzy
 msgid "Remove distribution list"
 msgstr "Rhestr Ddosbarthu Newydd"
@@ -2896,6 +2961,7 @@ msgstr "Rhestr Ddosbarthu Newydd"
 msgid "New Distribution List..."
 msgstr "Rhestr Ddosbarthu Newydd"
 
+#: features/distributionlistngwidget.cpp:175
 #: features/distributionlistngwidget.cpp:236
 #, fuzzy
 msgid "All Contacts"
@@ -2976,47 +3042,46 @@ msgstr "Cyfeiriadau Ebost"
 msgid "Preferred address"
 msgstr "Cyfeiriad Dewisiedig"
 
-#: features/resourceselection.cpp:166 features/resourceselection.cpp:374
-#: features/resourceselection.cpp:395
+#: features/resourceselection.cpp:172
+msgid "Re&load"
+msgstr ""
+
+#: features/resourceselection.cpp:224 features/resourceselection.cpp:494
+#: features/resourceselection.cpp:515
 msgid "Address Books"
 msgstr "Llyfrau Cyfeiriadau"
 
-#: features/resourceselection.cpp:180
+#: features/resourceselection.cpp:238
 #, fuzzy
 msgid "Add Address Book"
 msgstr "LlyfrCyfeiriadau"
 
-#: features/resourceselection.cpp:181
+#: features/resourceselection.cpp:239
 #, fuzzy
 msgid "Please select type of the new address book:"
 msgstr "Argraffu'r llyfr cyfeiriadau yn gyfan "
 
-#: features/resourceselection.cpp:191
+#: features/resourceselection.cpp:249
 #, fuzzy
 msgid "<qt>Unable to create an address book of type <b>%1</b>.</qt>"
 msgstr "<qt>Methu cyrchu <b>%1</b>.</qt>"
 
-#: features/resourceselection.cpp:196
-#, fuzzy
-msgid "%1 address book"
-msgstr "LlyfrCyfeiriadau"
-
-#: features/resourceselection.cpp:237
+#: features/resourceselection.cpp:300
 #, fuzzy
 msgid "<qt>Do you really want to remove the address book <b>%1</b>?</qt>"
 msgstr "<qt>Ydych chi wir am waredu'r allwedd <b>%1</b>?</qt>"
 
-#: features/resourceselection.cpp:380
+#: features/resourceselection.cpp:500
 #, fuzzy
 msgid "Add addressbook"
 msgstr "LlyfrCyfeiriadau"
 
-#: features/resourceselection.cpp:385
+#: features/resourceselection.cpp:505
 #, fuzzy
 msgid "Edit addressbook settings"
 msgstr "Golygu Hidlenni y Llyfrau Cyfeiriadau"
 
-#: features/resourceselection.cpp:390
+#: features/resourceselection.cpp:510
 #, fuzzy
 msgid "Remove addressbook"
 msgstr "LlyfrCyfeiriadau"
@@ -3434,11 +3499,17 @@ msgstr "Mewnforio rhestr CSV..."
 msgid "Export CSV List..."
 msgstr "Allforio rhestr CSV..."
 
-#: xxport/csv_xxport.cpp:55 xxport/ldif_xxport.cpp:102
+#: xxport/csv_xxport.cpp:53 xxport/csvimportdialog.cpp:861
+#: xxport/ldif_xxport.cpp:100 xxport/vcard_xxport.cpp:296
+#: xxport/vcard_xxport.cpp:318
+msgid "Do you want to overwrite file \"%1\""
+msgstr ""
+
+#: xxport/csv_xxport.cpp:60 xxport/ldif_xxport.cpp:108
 msgid "<qt>Unable to open file <b>%1</b>.%2.</qt>"
 msgstr "<qt>Methu agor ffeil<b>%1</b>.%2.</qt>"
 
-#: xxport/csv_xxport.cpp:76
+#: xxport/csv_xxport.cpp:81
 msgid "The contacts have been exported successfully."
 msgstr "Allforiwyd y cysylltau yn llwyddiannus."
 
@@ -3573,15 +3644,15 @@ msgstr "Dewis Patrymlun"
 msgid "Please select a template, that matches the CSV file:"
 msgstr "Dewiswch batrymlun sy'n cydweddu â'r ffeil CSV, os gwelwch yn dda:"
 
-#: xxport/csvimportdialog.cpp:860
+#: xxport/csvimportdialog.cpp:864
 msgid "Template Name"
 msgstr "Enw Patrymlun"
 
-#: xxport/csvimportdialog.cpp:860
+#: xxport/csvimportdialog.cpp:864
 msgid "Please enter a name for the template:"
 msgstr "Rhowch enw i'r patrymlun:"
 
-#: xxport/csvimportdialog.cpp:930
+#: xxport/csvimportdialog.cpp:934
 #, fuzzy
 msgid "Cannot open input file."
 msgstr "Methu agor y ffeil fewnbwn!"
@@ -3604,11 +3675,11 @@ msgstr "Mewnforio o Ffôn Symudol Nokia..."
 msgid "Export to Mobile Phone..."
 msgstr "Allforio i ffôn symudol"
 
-#: xxport/gnokii_xxport.cpp:134 xxport/gnokii_xxport.cpp:824
+#: xxport/gnokii_xxport.cpp:134 xxport/gnokii_xxport.cpp:820
 msgid "Failed to initialize the gnokii library."
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:140 xxport/gnokii_xxport.cpp:853
+#: xxport/gnokii_xxport.cpp:140 xxport/gnokii_xxport.cpp:849
 msgid ""
 "<qt>"
 "<center>Mobile Phone interface initialization failed."
@@ -3621,45 +3692,45 @@ msgid ""
 "correct.</center></qt>"
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:179 xxport/gnokii_xxport.cpp:953
+#: xxport/gnokii_xxport.cpp:179 xxport/gnokii_xxport.cpp:949
 msgid "Mobile Phone information:"
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:180 xxport/gnokii_xxport.cpp:954
+#: xxport/gnokii_xxport.cpp:180 xxport/gnokii_xxport.cpp:950
 msgid "Manufacturer"
 msgstr "Gwneuthurwr"
 
-#: xxport/gnokii_xxport.cpp:181 xxport/gnokii_xxport.cpp:955
+#: xxport/gnokii_xxport.cpp:181 xxport/gnokii_xxport.cpp:951
 #, fuzzy
 msgid "Phone model"
 msgstr "Rhifau ffôn"
 
-#: xxport/gnokii_xxport.cpp:182 xxport/gnokii_xxport.cpp:956
+#: xxport/gnokii_xxport.cpp:182 xxport/gnokii_xxport.cpp:952
 #, fuzzy
 msgid "Revision"
 msgstr "Rhanbarth:"
 
-#: xxport/gnokii_xxport.cpp:183 xxport/gnokii_xxport.cpp:957
+#: xxport/gnokii_xxport.cpp:183 xxport/gnokii_xxport.cpp:953
 #, fuzzy
 msgid "IMEI"
 msgstr "II"
 
-#: xxport/gnokii_xxport.cpp:184 xxport/gnokii_xxport.cpp:958
+#: xxport/gnokii_xxport.cpp:184 xxport/gnokii_xxport.cpp:954
 msgid "Phonebook status"
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:185 xxport/gnokii_xxport.cpp:959
+#: xxport/gnokii_xxport.cpp:185 xxport/gnokii_xxport.cpp:955
 msgid "%1 out of %2 contacts used"
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:211 xxport/gnokii_xxport.cpp:995
+#: xxport/gnokii_xxport.cpp:211 xxport/gnokii_xxport.cpp:991
 msgid ""
 "<qt>Importing <b>%1</b> contacts from <b>%2</b> of the Mobile Phone."
 "<br>"
 "<br>%3</qt>"
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:532 xxport/gnokii_xxport.cpp:1327
+#: xxport/gnokii_xxport.cpp:532 xxport/gnokii_xxport.cpp:1323
 msgid ""
 "<qt>Please connect your Mobile Phone to your computer and press <b>Continue</b> "
 "to start importing the personal contacts."
@@ -3669,13 +3740,13 @@ msgid ""
 "KAddressbook will behave unresponsively.</qt>"
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:540 xxport/gnokii_xxport.cpp:1335
+#: xxport/gnokii_xxport.cpp:540 xxport/gnokii_xxport.cpp:1331
 #, fuzzy
 msgid "Mobile Phone Import"
 msgstr "Ffeil i'w mewnforio:"
 
-#: xxport/gnokii_xxport.cpp:541 xxport/gnokii_xxport.cpp:590
-#: xxport/gnokii_xxport.cpp:1336 xxport/gnokii_xxport.cpp:1385
+#: xxport/gnokii_xxport.cpp:541 xxport/gnokii_xxport.cpp:588
+#: xxport/gnokii_xxport.cpp:1332 xxport/gnokii_xxport.cpp:1379
 msgid ""
 "<qt>"
 "<center>Establishing connection to the Mobile Phone."
@@ -3683,12 +3754,12 @@ msgid ""
 "<br>Please wait...</center></qt>"
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:564 xxport/gnokii_xxport.cpp:1359
+#: xxport/gnokii_xxport.cpp:562 xxport/gnokii_xxport.cpp:1353
 #, fuzzy
 msgid "&Stop Import"
 msgstr "&Mewnforio"
 
-#: xxport/gnokii_xxport.cpp:581 xxport/gnokii_xxport.cpp:1376
+#: xxport/gnokii_xxport.cpp:579 xxport/gnokii_xxport.cpp:1370
 msgid ""
 "<qt>Please connect your Mobile Phone to your computer and press <b>Continue</b> "
 "to start exporting the selected personal contacts."
@@ -3698,12 +3769,12 @@ msgid ""
 "KAddressbook will behave unresponsively.</qt>"
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:589 xxport/gnokii_xxport.cpp:773
-#: xxport/gnokii_xxport.cpp:1384 xxport/gnokii_xxport.cpp:1568
+#: xxport/gnokii_xxport.cpp:587 xxport/gnokii_xxport.cpp:769
+#: xxport/gnokii_xxport.cpp:1378 xxport/gnokii_xxport.cpp:1560
 msgid "Mobile Phone Export"
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:645 xxport/gnokii_xxport.cpp:1440
+#: xxport/gnokii_xxport.cpp:641 xxport/gnokii_xxport.cpp:1432
 msgid ""
 "<qt>Do you want the selected contacts to be <b>appended</b> "
 "to the current mobile phonebook or should they <b>replace</b> "
@@ -3714,32 +3785,32 @@ msgid ""
 "contacts will be available from inside your phone.</qt>"
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:651 xxport/gnokii_xxport.cpp:1446
+#: xxport/gnokii_xxport.cpp:647 xxport/gnokii_xxport.cpp:1438
 #, fuzzy
 msgid "Export to Mobile Phone"
 msgstr "Allforio i ffôn symudol"
 
-#: xxport/gnokii_xxport.cpp:652 xxport/gnokii_xxport.cpp:1447
+#: xxport/gnokii_xxport.cpp:648 xxport/gnokii_xxport.cpp:1439
 msgid "&Append to Current Phonebook"
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:653 xxport/gnokii_xxport.cpp:1448
+#: xxport/gnokii_xxport.cpp:649 xxport/gnokii_xxport.cpp:1440
 msgid "&Replace Current Phonebook with New Contacts"
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:660 xxport/gnokii_xxport.cpp:1455
+#: xxport/gnokii_xxport.cpp:656 xxport/gnokii_xxport.cpp:1447
 #, fuzzy
 msgid "&Stop Export"
 msgstr "&Allforio"
 
-#: xxport/gnokii_xxport.cpp:661 xxport/gnokii_xxport.cpp:1456
+#: xxport/gnokii_xxport.cpp:657 xxport/gnokii_xxport.cpp:1448
 msgid ""
 "<qt>Exporting <b>%1</b> contacts to the <b>%2</b> of the Mobile Phone."
 "<br>"
 "<br>%3</qt>"
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:728 xxport/gnokii_xxport.cpp:1523
+#: xxport/gnokii_xxport.cpp:724 xxport/gnokii_xxport.cpp:1515
 msgid ""
 "<qt>"
 "<center>All selected contacts have been sucessfully copied to the Mobile Phone."
@@ -3748,17 +3819,17 @@ msgid ""
 "have been deleted.</center></qt>"
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:733 xxport/gnokii_xxport.cpp:1528
+#: xxport/gnokii_xxport.cpp:729 xxport/gnokii_xxport.cpp:1520
 #, fuzzy
 msgid "&Stop Delete"
 msgstr "Cadarnhau Dileu"
 
-#: xxport/gnokii_xxport.cpp:753 xxport/gnokii_xxport.cpp:1548
+#: xxport/gnokii_xxport.cpp:749 xxport/gnokii_xxport.cpp:1540
 #, fuzzy
 msgid "Export to phone finished."
 msgstr "Allforio i ffôn symudol"
 
-#: xxport/gnokii_xxport.cpp:764 xxport/gnokii_xxport.cpp:1559
+#: xxport/gnokii_xxport.cpp:760 xxport/gnokii_xxport.cpp:1551
 msgid ""
 "<qt>The following contacts could not be exported to the Mobile Phone. Possible "
 "Reasons for this problem could be:"
@@ -3773,12 +3844,12 @@ msgid ""
 "above contacts.</qt>"
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:827
+#: xxport/gnokii_xxport.cpp:823
 #, fuzzy
 msgid "Gnokii is not yet configured."
 msgstr "Nid yw GNOKII wedi'i ffurfweddu eto."
 
-#: xxport/gnokii_xxport.cpp:839
+#: xxport/gnokii_xxport.cpp:835
 #, fuzzy
 msgid ""
 "Gnokii reports a 'Lock File Error'.\n"
@@ -3788,24 +3859,24 @@ msgstr ""
 "Gwall ffeil glo.\n"
 " Ceuwch pob enghraifft arall o gnokii sy'n rhedeg, a cheisiwch eto."
 
-#: xxport/gnokii_xxport.cpp:868
+#: xxport/gnokii_xxport.cpp:864
 msgid "Unknown"
 msgstr "Anhysbys"
 
-#: xxport/gnokii_xxport.cpp:965
+#: xxport/gnokii_xxport.cpp:961
 msgid "internal memory"
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:966
+#: xxport/gnokii_xxport.cpp:962
 msgid "SIM-card memory"
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:967
+#: xxport/gnokii_xxport.cpp:963
 #, fuzzy
 msgid "unknown memory"
 msgstr "anhysbys"
 
-#: xxport/gnokii_xxport.cpp:1586 xxport/gnokii_xxport.cpp:1594
+#: xxport/gnokii_xxport.cpp:1578 xxport/gnokii_xxport.cpp:1586
 #, fuzzy
 msgid ""
 "Gnokii interface is not available.\n"
@@ -3815,12 +3886,13 @@ msgstr ""
 " Gofynwch i'ch dosbarthydd i ychwanegu gnokii yn ystod amser crynhoi."
 
 #: xxport/kde2_xxport.cpp:45
-msgid "Import TDE 2 Addressbook..."
+#, fuzzy
+msgid "Import KDE 2 Addressbook..."
 msgstr "Mewnforio Llyfr Cyfeiriadau TDE 2..."
 
 #: xxport/kde2_xxport.cpp:52
 #, fuzzy
-msgid "<qt>Could not find a TDE 2 address book <b>%1</b>.</qt>"
+msgid "<qt>Could not find a KDE 2 address book <b>%1</b>.</qt>"
 msgstr "<qt>Methu canfod llyfr cyfeiriadau TDE 2 <b>%1</b>.</qt>"
 
 #: xxport/kde2_xxport.cpp:57
@@ -3828,7 +3900,8 @@ msgid "Override previously imported entries?"
 msgstr "Cymeryd blaenoriaeth dros gofnodion a fewnforwyd eisioes?"
 
 #: xxport/kde2_xxport.cpp:58
-msgid "Import TDE 2 Addressbook"
+#, fuzzy
+msgid "Import KDE 2 Addressbook"
 msgstr "Mewnforio Llyfr Cyfeiriadau TDE 2"
 
 #: xxport/ldif_xxport.cpp:56
@@ -3882,91 +3955,101 @@ msgstr "Allforio vCerdyn 2.1..."
 msgid "Export vCard 3.0..."
 msgstr "Allforio vCerdyn 3.0..."
 
-#: xxport/vcard_xxport.cpp:125
+#: xxport/vcard_xxport.cpp:131
 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?"
 
-#: xxport/vcard_xxport.cpp:128
+#: xxport/vcard_xxport.cpp:134
 msgid "Export to Several Files"
 msgstr ""
 
-#: xxport/vcard_xxport.cpp:128
+#: xxport/vcard_xxport.cpp:134
 #, fuzzy
 msgid "Export to One File"
 msgstr "Allforio i ffôn symudol"
 
-#: xxport/vcard_xxport.cpp:190
+#: xxport/vcard_xxport.cpp:212
 msgid "Select vCard to Import"
 msgstr "Dewiswch vGerdyn i'w Fewnforio"
 
-#: xxport/vcard_xxport.cpp:197
+#: xxport/vcard_xxport.cpp:219
 msgid "vCard Import Failed"
 msgstr "Mewnforio vCerdyn wedi Methu"
 
-#: xxport/vcard_xxport.cpp:213
+#: xxport/vcard_xxport.cpp:252
 msgid ""
 "<qt>When trying to read the vCard, there was an error opening the file '%1': "
 "%2</qt>"
 msgstr ""
 
-#: xxport/vcard_xxport.cpp:221
+#: xxport/vcard_xxport.cpp:260
 #, fuzzy
 msgid "<qt>Unable to access vCard: %1</qt>"
 msgstr "<qt>Methu cyrchu <b>%1</b>.</qt>"
 
-#: xxport/vcard_xxport.cpp:232
+#: xxport/vcard_xxport.cpp:271
 msgid "No contacts were imported, due to errors with the vCards."
 msgstr ""
 
-#: xxport/vcard_xxport.cpp:234
+#: xxport/vcard_xxport.cpp:273
 msgid "The vCard does not contain any contacts."
 msgstr ""
 
-#: xxport/vcard_xxport.cpp:402
+#: xxport/vcard_xxport.cpp:469
 msgid "Import vCard"
 msgstr "Mewnforio vCard"
 
-#: xxport/vcard_xxport.cpp:409
+#: xxport/vcard_xxport.cpp:476
 msgid "Do you want to import this contact in your address book?"
 msgstr "Ydych eisiau mewnforio'r cyswllt yma i'ch llyfr cyfeiriad?"
 
-#: xxport/vcard_xxport.cpp:420
+#: xxport/vcard_xxport.cpp:487
 #, fuzzy
 msgid "Import All..."
 msgstr "Mewnforio vCerdyn..."
 
-#: xxport/vcard_xxport.cpp:475
+#: xxport/vcard_xxport.cpp:542
 #, fuzzy
 msgid "Select vCard Fields"
 msgstr "Meysydd &dewisiedig:"
 
-#: xxport/vcard_xxport.cpp:482
+#: xxport/vcard_xxport.cpp:549
 #, fuzzy
 msgid "Select the fields which shall be exported in the vCard."
 msgstr "Yma cewch ddewis y maes a gaiff ei ddefnyddio yn y chwiliad cynyddol."
 
-#: xxport/vcard_xxport.cpp:485
+#: xxport/vcard_xxport.cpp:552
 #, fuzzy
 msgid "Private fields"
 msgstr "Rhagddodiadau"
 
-#: xxport/vcard_xxport.cpp:488
+#: xxport/vcard_xxport.cpp:555
 #, fuzzy
 msgid "Business fields"
 msgstr "Busnes"
 
-#: xxport/vcard_xxport.cpp:491
+#: xxport/vcard_xxport.cpp:558
 #, fuzzy
 msgid "Other fields"
 msgstr "Meysydd &dewisiedig:"
 
-#: xxport/vcard_xxport.cpp:494
+#: xxport/vcard_xxport.cpp:561
 msgid "Encryption keys"
 msgstr "Allweddau cêl-ysgrifo"
 
 #, fuzzy
+#~ msgid ""
+#~ "_n: Do you really want to delete this contact?\n"
+#~ "Do you really want to delete these %n contacts?"
+#~ msgstr "<qt>Ydych chi wir am waredu'r allwedd <b>%1</b>?</qt>"
+
+#, fuzzy
+#~ msgid "%1 address book"
+#~ msgstr "LlyfrCyfeiriadau"
+
+#, fuzzy
 #~ msgid "Show Extension"
 #~ msgstr "Dangos y Bar Estyniadau"
 
diff --git a/tde-i18n-cy/messages/tdepim/kalarm.po b/tde-i18n-cy/messages/tdepim/kalarm.po
index 224de4acdd1..2c3efd95793 100644
--- a/tde-i18n-cy/messages/tdepim/kalarm.po
+++ b/tde-i18n-cy/messages/tdepim/kalarm.po
@@ -8,17 +8,18 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kalarm\n"
-"POT-Creation-Date: 2008-08-19 01:19+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2004-02-25 13:46+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.2\n"
 "\n"
 
-#: fontcolour.h:42
+#: fontcolour.h:43
 msgid "Requested font"
 msgstr "Wynebfath a ddymunwyd"
 
@@ -102,17 +103,17 @@ msgstr ""
 "Methu agor y calendr:\n"
 " %1"
 
-#: alarmevent.cpp:2077
+#: alarmevent.cpp:2082
 msgid ""
 "_: Brief form of 'At Login'\n"
 "Login"
 msgstr "Mewngofnodi"
 
-#: alarmevent.cpp:2077
+#: alarmevent.cpp:2082
 msgid "At login"
 msgstr "Wrth Fewngofnodi"
 
-#: alarmevent.cpp:2085 alarmevent.cpp:2119
+#: alarmevent.cpp:2090 alarmevent.cpp:2124
 #, c-format
 msgid ""
 "_n: 1 Minute\n"
@@ -121,7 +122,7 @@ msgstr ""
 "1 Funud\n"
 "%n o Funudau:"
 
-#: alarmevent.cpp:2087 alarmevent.cpp:2121
+#: alarmevent.cpp:2092 alarmevent.cpp:2126
 #, c-format
 msgid ""
 "_n: 1 Hour\n"
@@ -130,13 +131,13 @@ msgstr ""
 "1 Awr\n"
 " %n o Oriau"
 
-#: alarmevent.cpp:2091 alarmevent.cpp:2123
+#: alarmevent.cpp:2096 alarmevent.cpp:2128
 msgid ""
 "_: Hours and Minutes\n"
 "%1H %2M"
 msgstr "%1A %2M"
 
-#: alarmevent.cpp:2094 alarmevent.cpp:2126
+#: alarmevent.cpp:2099 alarmevent.cpp:2131
 #, c-format
 msgid ""
 "_n: 1 Day\n"
@@ -145,7 +146,7 @@ msgstr ""
 "1 Diwrnod\n"
 " %n o Ddiwrnodau"
 
-#: alarmevent.cpp:2096 alarmevent.cpp:2127
+#: alarmevent.cpp:2101 alarmevent.cpp:2132
 #, c-format
 msgid ""
 "_n: 1 Week\n"
@@ -154,7 +155,7 @@ msgstr ""
 "1 Wythnos\n"
 " %n Wythnos"
 
-#: alarmevent.cpp:2098
+#: alarmevent.cpp:2103
 #, c-format
 msgid ""
 "_n: 1 Month\n"
@@ -163,7 +164,7 @@ msgstr ""
 "1 Mis\n"
 " %n o Fisoedd"
 
-#: alarmevent.cpp:2100
+#: alarmevent.cpp:2105
 #, c-format
 msgid ""
 "_n: 1 Year\n"
@@ -172,7 +173,7 @@ msgstr ""
 "1 Flwyddyn\n"
 " %n o Flynyddoedd"
 
-#: alarmevent.cpp:2106 alarmevent.cpp:2129 soundpicker.cpp:52
+#: alarmevent.cpp:2111 alarmevent.cpp:2134 soundpicker.cpp:52
 msgid "None"
 msgstr "Dim"
 
@@ -587,13 +588,13 @@ msgid ""
 "&From:"
 msgstr "&Oddiwrth:"
 
-#: editdlg.cpp:156 messagewin.cpp:456
+#: editdlg.cpp:156 messagewin.cpp:458
 msgid ""
 "_: Email addressee\n"
 "To:"
 msgstr "I:"
 
-#: editdlg.cpp:157 messagewin.cpp:463
+#: editdlg.cpp:157 messagewin.cpp:465
 msgid ""
 "_: Email subject\n"
 "Subject:"
@@ -934,16 +935,16 @@ msgstr ""
 "Anfonwyd ebost at:\n"
 " %1%2"
 
-#: editdlg.cpp:1550 messagewin.cpp:1541
+#: editdlg.cpp:1551 messagewin.cpp:1543
 msgid "Defer Alarm"
 msgstr "Gohirio'r Larwm"
 
-#: editdlg.cpp:1704
+#: editdlg.cpp:1705
 msgid ""
 "Log file must be the name or path of a local file, with write permission."
 msgstr ""
 
-#: editdlg.cpp:1730
+#: editdlg.cpp:1731
 #, c-format
 msgid ""
 "Invalid email address:\n"
@@ -952,11 +953,11 @@ msgstr ""
 "Cyfeiriad ebost annilys:\n"
 " %1"
 
-#: editdlg.cpp:1737
+#: editdlg.cpp:1738
 msgid "No email address specified"
 msgstr "Ni benodwyd cyfeiriad ebost"
 
-#: editdlg.cpp:1754
+#: editdlg.cpp:1755
 #, c-format
 msgid ""
 "Invalid email attachment:\n"
@@ -965,32 +966,32 @@ msgstr ""
 "Atodiad ebost annilys:\n"
 " %1"
 
-#: editdlg.cpp:1783
+#: editdlg.cpp:1784
 msgid "Display the alarm message now"
 msgstr "Dangos y neges larwm nawr"
 
-#: editdlg.cpp:1800
+#: editdlg.cpp:1801
 msgid "Display the file now"
 msgstr "Dangos y ffeil destun nawr"
 
-#: editdlg.cpp:1812
+#: editdlg.cpp:1813
 msgid "Execute the specified command now"
 msgstr "Gweithredu'r gorchymyn penodedig nawr"
 
-#: editdlg.cpp:1823
+#: editdlg.cpp:1824
 msgid "Send the email to the specified addressees now"
 msgstr "Anfon yr ebost at y cyfeiriadau penodedig nawr"
 
-#: editdlg.cpp:1897
+#: editdlg.cpp:1898
 msgid "Choose File to Attach"
 msgstr "Dewiswch Ffeil i'w Atodi"
 
-#: editdlg.cpp:2004
+#: editdlg.cpp:2005
 #, fuzzy
 msgid "Please select a file to display"
 msgstr "Dewiswch ffeil destun i'w dangos."
 
-#: editdlg.cpp:2006
+#: editdlg.cpp:2007
 msgid ""
 "%1\n"
 "not found"
@@ -998,7 +999,7 @@ msgstr ""
 "%1\n"
 " heb ei chanfod"
 
-#: editdlg.cpp:2007
+#: editdlg.cpp:2008
 msgid ""
 "%1\n"
 "is a folder"
@@ -1006,7 +1007,7 @@ msgstr ""
 "Mae %1\n"
 " yn gyfeiriadur"
 
-#: editdlg.cpp:2008
+#: editdlg.cpp:2009
 msgid ""
 "%1\n"
 "is not readable"
@@ -1014,7 +1015,7 @@ msgstr ""
 "Nid yw %1\n"
 " yn ddarllenadwy"
 
-#: editdlg.cpp:2009
+#: editdlg.cpp:2010
 msgid ""
 "%1\n"
 "appears not to be a text or image file"
@@ -1148,62 +1149,62 @@ msgstr ""
 msgid "Choose Alarm Font & Color"
 msgstr "Dewis Wynebfath a Lliw Larwm"
 
-#: functions.cpp:505
+#: functions.cpp:507
 #, fuzzy
 msgid "Error saving alarms"
 msgstr "Gwall wrth galw KMail"
 
-#: functions.cpp:506
+#: functions.cpp:508
 #, fuzzy
 msgid "Error saving alarm"
 msgstr "Gwall wrth galw KMail"
 
-#: functions.cpp:509
+#: functions.cpp:511
 #, fuzzy
 msgid "Error deleting alarms"
 msgstr "Gwall wrth galw KMail"
 
-#: functions.cpp:510
+#: functions.cpp:512
 #, fuzzy
 msgid "Error deleting alarm"
 msgstr "Gwall wrth galw KMail"
 
-#: functions.cpp:513
+#: functions.cpp:515
 #, fuzzy
 msgid "Error saving reactivated alarms"
 msgstr "Dileu'r holl larymau darfodedig cyfredol"
 
-#: functions.cpp:514
+#: functions.cpp:516
 #, fuzzy
 msgid "Error saving reactivated alarm"
 msgstr "Dileu'r holl larymau darfodedig cyfredol"
 
-#: functions.cpp:517
+#: functions.cpp:519
 #, fuzzy
 msgid "Error saving alarm template"
 msgstr "Gwall wrth galw KMail"
 
-#: functions.cpp:532
+#: functions.cpp:534
 msgid "Unable to show alarms in KOrganizer"
 msgstr ""
 
-#: functions.cpp:533
+#: functions.cpp:535
 msgid "Unable to show alarm in KOrganizer"
 msgstr ""
 
-#: functions.cpp:536
+#: functions.cpp:538
 msgid "Unable to update alarm in KOrganizer"
 msgstr ""
 
-#: functions.cpp:539
+#: functions.cpp:541
 msgid "Unable to delete alarms from KOrganizer"
 msgstr ""
 
-#: functions.cpp:540
+#: functions.cpp:542
 msgid "Unable to delete alarm from KOrganizer"
 msgstr ""
 
-#: functions.cpp:634
+#: functions.cpp:636
 msgid ""
 "_: Please set the 'From' email address...\n"
 "%1\n"
@@ -1212,22 +1213,22 @@ msgstr ""
 "%1\n"
 "Gosodwch fo yn yr ymgom Hoffterau."
 
-#: functions.cpp:638
+#: functions.cpp:640
 msgid ""
 "Alarms are currently disabled.\n"
 "Do you want to enable alarms now?"
 msgstr ""
 
-#: functions.cpp:639
+#: functions.cpp:641
 msgid "Enable"
 msgstr "Galluogi"
 
-#: functions.cpp:639
+#: functions.cpp:641
 #, fuzzy
 msgid "Keep Disabled"
 msgstr "Anal&luogi"
 
-#: functions.cpp:706
+#: functions.cpp:708
 msgid ""
 "Unable to start KMail\n"
 "(%1)"
@@ -1366,7 +1367,8 @@ msgstr ""
 #, fuzzy
 msgid ""
 "No 'From' email address is configured.\n"
-"Please set it in the Trinity Control Center or in the KAlarm Preferences dialog."
+"Please set it in the Trinity Control Center or in the KAlarm Preferences "
+"dialog."
 msgstr ""
 "Ni ffurfweddir cyfeiriad ebost 'Oddi wrth'.\n"
 "Gallwch ei osod yn y Ganolfan Reoli TDE neu yn yr ymgom Hoffterau %1."
@@ -1710,7 +1712,7 @@ msgstr ""
 msgid "&Copy..."
 msgstr "&Copïo..."
 
-#: mainwindow.cpp:334 messagewin.cpp:520 templatedlg.cpp:66
+#: mainwindow.cpp:334 messagewin.cpp:522 templatedlg.cpp:66
 msgid "&Edit..."
 msgstr "&Golygu..."
 
@@ -1755,7 +1757,7 @@ msgstr "Ail&fywio Larymau"
 msgid "New Alarm"
 msgstr "Larwm Newydd"
 
-#: mainwindow.cpp:611 messagewin.cpp:1459
+#: mainwindow.cpp:611 messagewin.cpp:1461
 msgid "Edit Alarm"
 msgstr "Golygu Larwm"
 
@@ -1808,63 +1810,63 @@ msgstr "Gal&luogi"
 msgid "Disa&ble"
 msgstr "Anal&luogi"
 
-#: messagewin.cpp:290 messagewin.cpp:323
+#: messagewin.cpp:292 messagewin.cpp:325
 msgid "Reminder"
 msgstr "Atgof"
 
-#: messagewin.cpp:290
+#: messagewin.cpp:292
 msgid "Message"
 msgstr "Neges"
 
-#: messagewin.cpp:318
+#: messagewin.cpp:320
 msgid ""
 "The scheduled date/time for the message (as opposed to the actual time of "
 "display)."
 msgstr ""
 "Amser/dyddiad trefnlenedig y neges (yn hytrach na'r gwir amser pan ei dengys)"
 
-#: messagewin.cpp:341
+#: messagewin.cpp:343
 msgid "The file whose contents are displayed below"
 msgstr "Y ffeil y dengys ei chynnwys isod"
 
-#: messagewin.cpp:367
+#: messagewin.cpp:369
 msgid "The contents of the file to be displayed"
 msgstr "Cynnwys y ffeil i'w dangos"
 
-#: messagewin.cpp:375
+#: messagewin.cpp:377
 msgid "File is a folder"
 msgstr "Plygell yw'r ffeil"
 
-#: messagewin.cpp:375
+#: messagewin.cpp:377
 msgid "Failed to open file"
 msgstr "Methwyd agor y ffeil"
 
-#: messagewin.cpp:375 sounddlg.cpp:445
+#: messagewin.cpp:377 sounddlg.cpp:445
 msgid "File not found"
 msgstr "Ni chanfuwyd y ffeil"
 
-#: messagewin.cpp:394
+#: messagewin.cpp:396
 msgid "The alarm message"
 msgstr "Y neges larwm"
 
-#: messagewin.cpp:452
+#: messagewin.cpp:454
 msgid "The email to send"
 msgstr "Yr ebost i'w anfon"
 
-#: messagewin.cpp:515
+#: messagewin.cpp:517
 msgid "Acknowledge the alarm"
 msgstr "Cydnabod y larwm"
 
-#: messagewin.cpp:525
+#: messagewin.cpp:527
 #, fuzzy
 msgid "Edit the alarm."
 msgstr "Golygu Larwm"
 
-#: messagewin.cpp:531
+#: messagewin.cpp:533
 msgid "&Defer..."
 msgstr "&Gohirio..."
 
-#: messagewin.cpp:537
+#: messagewin.cpp:539
 msgid ""
 "Defer the alarm until later.\n"
 "You will be prompted to specify when the alarm should be redisplayed."
@@ -1872,49 +1874,49 @@ msgstr ""
 "Gohirio'r larwm tan nes ymlaen.\n"
 " Fe'ch anogir i benodi pryd dylid ailddangos y larwm."
 
-#: messagewin.cpp:553 sounddlg.cpp:314
+#: messagewin.cpp:555 sounddlg.cpp:314
 #, fuzzy
 msgid "Stop sound"
 msgstr "&Sain"
 
-#: messagewin.cpp:554 sounddlg.cpp:315
+#: messagewin.cpp:556 sounddlg.cpp:315
 msgid "Stop playing the sound"
 msgstr ""
 
-#: messagewin.cpp:570
+#: messagewin.cpp:572
 msgid ""
 "_: Locate this email in KMail\n"
 "Locate in KMail"
 msgstr ""
 
-#: messagewin.cpp:571
+#: messagewin.cpp:573
 msgid "Locate and highlight this email in KMail"
 msgstr ""
 
-#: messagewin.cpp:583
+#: messagewin.cpp:585
 #, fuzzy
 msgid "Activate KAlarm"
 msgstr "Gweithredoli %1"
 
-#: messagewin.cpp:625
+#: messagewin.cpp:629
 msgid "Today"
 msgstr "Heddiw"
 
-#: messagewin.cpp:627
+#: messagewin.cpp:631
 #, c-format
 msgid ""
 "_n: Tomorrow\n"
 "in %n days' time"
 msgstr ""
 
-#: messagewin.cpp:629
+#: messagewin.cpp:633
 #, c-format
 msgid ""
 "_n: in 1 week's time\n"
 "in %n weeks' time"
 msgstr ""
 
-#: messagewin.cpp:643
+#: messagewin.cpp:647
 #, fuzzy, c-format
 msgid ""
 "_n: in 1 minute's time\n"
@@ -1923,36 +1925,36 @@ msgstr ""
 "1 Funud\n"
 "%n o Funudau:"
 
-#: messagewin.cpp:645
+#: messagewin.cpp:649
 #, c-format
 msgid ""
 "_n: in 1 hour's time\n"
 "in %n hours' time"
 msgstr ""
 
-#: messagewin.cpp:647
+#: messagewin.cpp:651
 #, c-format
 msgid ""
 "_n: in 1 hour 1 minute's time\n"
 "in %n hours 1 minute's time"
 msgstr ""
 
-#: messagewin.cpp:649
+#: messagewin.cpp:653
 msgid ""
 "_n: in 1 hour %1 minutes' time\n"
 "in %n hours %1 minutes' time"
 msgstr ""
 
-#: messagewin.cpp:822 messagewin.cpp:836
+#: messagewin.cpp:826 messagewin.cpp:840
 #, fuzzy
 msgid "Unable to speak message"
 msgstr "Methu agor y llyfr cyfeiriadau"
 
-#: messagewin.cpp:836
+#: messagewin.cpp:840
 msgid "DCOP Call sayMessage failed"
 msgstr ""
 
-#: messagewin.cpp:858 sounddlg.cpp:302
+#: messagewin.cpp:862 sounddlg.cpp:302
 #, fuzzy, c-format
 msgid ""
 "Cannot open audio file:\n"
@@ -1961,26 +1963,26 @@ msgstr ""
 "Methu agor y calendr:\n"
 " %1"
 
-#: messagewin.cpp:882
+#: messagewin.cpp:885
 msgid ""
 "Unable to set master volume\n"
 "(Error accessing KMix:\n"
 "%1)"
 msgstr ""
 
-#: messagewin.cpp:1403
+#: messagewin.cpp:1405
 msgid "Do you really want to acknowledge this alarm?"
 msgstr "A ydych wir am gydnabod y larwm yma?"
 
-#: messagewin.cpp:1404
+#: messagewin.cpp:1406
 msgid "Acknowledge Alarm"
 msgstr "Cydnabod Larwm"
 
-#: messagewin.cpp:1404
+#: messagewin.cpp:1406
 msgid "&Acknowledge"
 msgstr "&Cydnabod"
 
-#: messagewin.cpp:1449
+#: messagewin.cpp:1451
 msgid "Unable to locate this email in KMail"
 msgstr ""
 
@@ -2277,8 +2279,8 @@ msgstr "Defnyddio'r cyfeiriad o'r Ga&nolfan Reoli"
 
 #: prefdlg.cpp:661
 msgid ""
-"Check to use the email address set in the Trinity Control Center, to identify you "
-"as the sender when sending email alarms."
+"Check to use the email address set in the Trinity Control Center, to identify "
+"you as the sender when sending email alarms."
 msgstr ""
 "Brithwch i ddefnyddio'r cyfeiriad ebost wedi'i osod yng Nghanolfan Reoli TDE, "
 "i'ch dynodi fel yr anfonwr wrth anfon larymau ebost."
@@ -2317,8 +2319,8 @@ msgstr "Defnyddio'r cyfeiriad ebost o'r Ga&nolfan Reoli"
 
 #: prefdlg.cpp:702
 msgid ""
-"Check to use the email address set in the Trinity Control Center, for blind copying "
-"email alarms to yourself."
+"Check to use the email address set in the Trinity Control Center, for blind "
+"copying email alarms to yourself."
 msgstr ""
 "Brithwch i ddefnyddio'r cyfeiriad ebost wedi'i osod yng Nghanolfan Reoli TDE, "
 "ar gyfer ddallgopio larymau ebost i chi eich hun."
@@ -2816,166 +2818,166 @@ msgstr "diwrnod"
 msgid "Enter the number of days between repetitions of the alarm"
 msgstr "Rhowch y nifer o ddiwrnodau rhwng ailadroddion y larwm"
 
-#: recurrenceedit.cpp:1228
+#: recurrenceedit.cpp:1227
 #, fuzzy
 msgid "Select the days of the week on which the alarm is allowed to occur"
 msgstr "Dewiswch ddiwrnod yr wythnos i ailadrodd y larwm arni"
 
-#: recurrenceedit.cpp:1230 recurrenceedit.cpp:1244
-msgid "Select the days of the week on which to repeat the alarm"
-msgstr "Dewiswch ddiwrnod yr wythnos i ailadrodd y larwm arni"
-
-#: recurrenceedit.cpp:1242
+#: recurrenceedit.cpp:1238
 msgid "week(s)"
 msgstr "wythnos"
 
-#: recurrenceedit.cpp:1243
+#: recurrenceedit.cpp:1239
 msgid "Enter the number of weeks between repetitions of the alarm"
 msgstr "Rhowch y nifer o wythnosau rhwng ailadroddion y larwm"
 
-#: recurrenceedit.cpp:1267
+#: recurrenceedit.cpp:1240
+msgid "Select the days of the week on which to repeat the alarm"
+msgstr "Dewiswch ddiwrnod yr wythnos i ailadrodd y larwm arni"
+
+#: recurrenceedit.cpp:1263
 msgid ""
 "_: On day number in the month\n"
 "O&n day"
 msgstr ""
 
-#: recurrenceedit.cpp:1271
+#: recurrenceedit.cpp:1267
 msgid "Repeat the alarm on the selected day of the month"
 msgstr "Ailadrodd y larwm ar y diwrnod dewisiedig o'r mis"
 
-#: recurrenceedit.cpp:1277
+#: recurrenceedit.cpp:1273
 msgid ""
 "_: Last day of month\n"
 "Last"
 msgstr "Olaf"
 
-#: recurrenceedit.cpp:1280
+#: recurrenceedit.cpp:1276
 msgid "Select the day of the month on which to repeat the alarm"
 msgstr "Dewiswch ba ddiwrnod o'r mis i ailadrodd y larwm arno"
 
-#: recurrenceedit.cpp:1292
+#: recurrenceedit.cpp:1288
 msgid ""
 "_: On the 1st Tuesday\n"
 "On t&he"
 msgstr "Ar &y"
 
-#: recurrenceedit.cpp:1297
+#: recurrenceedit.cpp:1293
 msgid ""
 "Repeat the alarm on one day of the week, in the selected week of the month"
 msgstr ""
 "Ailadrodd y larwm ar un diwrnod o'r wythnos, yn wythnos ddewisiedig y mis"
 
-#: recurrenceedit.cpp:1300
+#: recurrenceedit.cpp:1296
 msgid "1st"
 msgstr "1af"
 
-#: recurrenceedit.cpp:1301
+#: recurrenceedit.cpp:1297
 msgid "2nd"
 msgstr "2il"
 
-#: recurrenceedit.cpp:1302
+#: recurrenceedit.cpp:1298
 msgid "3rd"
 msgstr "3ydd"
 
-#: recurrenceedit.cpp:1303
+#: recurrenceedit.cpp:1299
 msgid "4th"
 msgstr "4ydd"
 
-#: recurrenceedit.cpp:1304
+#: recurrenceedit.cpp:1300
 msgid "5th"
 msgstr "5ed"
 
-#: recurrenceedit.cpp:1305
+#: recurrenceedit.cpp:1301
 msgid ""
 "_: Last Monday in March\n"
 "Last"
 msgstr "Olaf"
 
-#: recurrenceedit.cpp:1306
+#: recurrenceedit.cpp:1302
 msgid "2nd Last"
 msgstr "Ail Olaf"
 
-#: recurrenceedit.cpp:1307
+#: recurrenceedit.cpp:1303
 msgid "3rd Last"
 msgstr "Trydydd Olaf"
 
-#: recurrenceedit.cpp:1308
+#: recurrenceedit.cpp:1304
 msgid "4th Last"
 msgstr "Pedwerydd Olaf"
 
-#: recurrenceedit.cpp:1309
+#: recurrenceedit.cpp:1305
 msgid "5th Last"
 msgstr "Pumed Olaf"
 
-#: recurrenceedit.cpp:1312
+#: recurrenceedit.cpp:1308
 msgid ""
 "_: Every (Monday...) in month\n"
 "Every"
 msgstr ""
 
-#: recurrenceedit.cpp:1315
+#: recurrenceedit.cpp:1311
 msgid "Select the week of the month in which to repeat the alarm"
 msgstr "Dewiswch wythnos o'r mis i ailadrodd y larwm ynddi"
 
-#: recurrenceedit.cpp:1328
+#: recurrenceedit.cpp:1324
 msgid "Select the day of the week on which to repeat the alarm"
 msgstr "Dewiswch ddiwrnod yr wythnos i ailadrodd y larwm arni"
 
-#: recurrenceedit.cpp:1446
+#: recurrenceedit.cpp:1442
 msgid "month(s)"
 msgstr "mis"
 
-#: recurrenceedit.cpp:1447
+#: recurrenceedit.cpp:1443
 msgid "Enter the number of months between repetitions of the alarm"
 msgstr "Rhowch y nifer o fisoedd rhwng ailadroddion y larwm"
 
-#: recurrenceedit.cpp:1458
+#: recurrenceedit.cpp:1454
 msgid "year(s)"
 msgstr "blwyddyn"
 
-#: recurrenceedit.cpp:1459
+#: recurrenceedit.cpp:1455
 msgid "Enter the number of years between repetitions of the alarm"
 msgstr "Rhowch y nifer o flynyddoedd rhwn ailadroddion y larwm"
 
-#: recurrenceedit.cpp:1464
+#: recurrenceedit.cpp:1460
 msgid ""
 "_: List of months to select\n"
 "Months:"
 msgstr ""
 
-#: recurrenceedit.cpp:1483
+#: recurrenceedit.cpp:1479
 msgid "Select the months of the year in which to repeat the alarm"
 msgstr "Dewiswch fis o'r flwyddyn i ailadrodd y larwm ynddi"
 
-#: recurrenceedit.cpp:1490
+#: recurrenceedit.cpp:1486
 msgid "February 2&9th alarm in non-leap years:"
 msgstr ""
 
-#: recurrenceedit.cpp:1493
+#: recurrenceedit.cpp:1489
 msgid ""
 "_: No date\n"
 "None"
 msgstr "Dim"
 
-#: recurrenceedit.cpp:1494
+#: recurrenceedit.cpp:1490
 msgid ""
 "_: 1st March (short form)\n"
 "1 Mar"
 msgstr ""
 
-#: recurrenceedit.cpp:1495
+#: recurrenceedit.cpp:1491
 msgid ""
 "_: 28th February (short form)\n"
 "28 Feb"
 msgstr ""
 
-#: recurrenceedit.cpp:1501
+#: recurrenceedit.cpp:1497
 msgid ""
 "Select which date, if any, the February 29th alarm should trigger in non-leap "
 "years"
 msgstr ""
 
-#: recurrenceedit.cpp:1585
+#: recurrenceedit.cpp:1581
 msgid "No month selected"
 msgstr "Dim mis wedi'i ddewis"
 
@@ -3465,12 +3467,12 @@ msgstr "Addasiedig..."
 msgid "Date cannot be earlier than %1"
 msgstr "Ni all y ddyddiad fod cyn %1"
 
-#: lib/dateedit.cpp:68
+#: lib/dateedit.cpp:69
 #, fuzzy, c-format
 msgid "Date cannot be later than %1"
 msgstr "Ni all y ddyddiad fod cyn %1"
 
-#: lib/dateedit.cpp:79
+#: lib/dateedit.cpp:81
 msgid "today"
 msgstr "heddiw"
 
diff --git a/tde-i18n-cy/messages/tdepim/kandy.po b/tde-i18n-cy/messages/tdepim/kandy.po
index e227911de21..7f662d8e047 100644
--- a/tde-i18n-cy/messages/tdepim/kandy.po
+++ b/tde-i18n-cy/messages/tdepim/kandy.po
@@ -10,10 +10,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kandy\n"
-"POT-Creation-Date: 2006-07-25 03:59+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2004-01-07 21:19+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdepim/karm.po b/tde-i18n-cy/messages/tdepim/karm.po
index 0e3e94bbfd9..6c92fd85cdb 100644
--- a/tde-i18n-cy/messages/tdepim/karm.po
+++ b/tde-i18n-cy/messages/tdepim/karm.po
@@ -10,10 +10,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: karm\n"
-"POT-Creation-Date: 2008-04-21 01:46+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2004-01-08 20:59+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdepim/kcmkabconfig.po b/tde-i18n-cy/messages/tdepim/kcmkabconfig.po
index 9a06b2eb70c..74bca562f7e 100644
--- a/tde-i18n-cy/messages/tdepim/kcmkabconfig.po
+++ b/tde-i18n-cy/messages/tdepim/kcmkabconfig.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmkabconfig\n"
-"POT-Creation-Date: 2005-08-13 01:40+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2004-01-08 21:02+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -99,75 +100,75 @@ msgstr "Enw Gwrthdroedig"
 msgid "Extension Settings"
 msgstr "Gosodiadau Estyniad"
 
-#: tdeabconfigwidget.cpp:62 tdeabconfigwidget.cpp:154
+#: kabconfigwidget.cpp:62 kabconfigwidget.cpp:154
 msgid "General"
 msgstr "Cyffredinol"
 
-#: tdeabconfigwidget.cpp:66
+#: kabconfigwidget.cpp:66
 msgid "Honor TDE single click"
 msgstr "Parchu clic unigol TDE"
 
-#: tdeabconfigwidget.cpp:69
+#: kabconfigwidget.cpp:69
 msgid "Automatic name parsing for new addressees"
 msgstr "Dyrannu enwau ymysgogol ar gyfer cyferiadwyr newydd"
 
-#: tdeabconfigwidget.cpp:72
+#: kabconfigwidget.cpp:72
 msgid "Trade single name component as family name"
 msgstr ""
 
-#: tdeabconfigwidget.cpp:80
+#: kabconfigwidget.cpp:80
 msgid "Limit unfiltered display to 100 contacts"
 msgstr ""
 
-#: tdeabconfigwidget.cpp:85
+#: kabconfigwidget.cpp:85
 msgid "Addressee editor type:"
 msgstr ""
 
-#: tdeabconfigwidget.cpp:89
+#: kabconfigwidget.cpp:89
 msgid "Full Editor"
 msgstr ""
 
-#: tdeabconfigwidget.cpp:90
+#: kabconfigwidget.cpp:90
 msgid "Simple Editor"
 msgstr ""
 
-#: tdeabconfigwidget.cpp:99
+#: kabconfigwidget.cpp:99
 msgid "Script-Hooks"
 msgstr "Bachau-Sgript"
 
-#: tdeabconfigwidget.cpp:102
+#: kabconfigwidget.cpp:102
 msgid "Phone:"
 msgstr "Ffôn:"
 
-#: tdeabconfigwidget.cpp:106
+#: kabconfigwidget.cpp:106
 msgid "<ul><li>%N: Phone Number</li></ul>"
 msgstr "<ul><li>%N: Rhif Ffôn</li></ul>"
 
-#: tdeabconfigwidget.cpp:109
+#: kabconfigwidget.cpp:109
 msgid "Fax:"
 msgstr "Ffacs:"
 
-#: tdeabconfigwidget.cpp:113
+#: kabconfigwidget.cpp:113
 msgid "<ul><li>%N: Fax Number</li></ul>"
 msgstr "<ul><li>%N: Rhif Ffacs</li></ul>"
 
-#: tdeabconfigwidget.cpp:117
+#: kabconfigwidget.cpp:117
 #, fuzzy
 msgid "SMS Text:"
 msgstr "Testun"
 
-#: tdeabconfigwidget.cpp:121
+#: kabconfigwidget.cpp:121
 msgid ""
 "<ul>"
 "<li>%N: Phone Number</li>"
 "<li>%F: File containing the text message(s)</li></ul>"
 msgstr ""
 
-#: tdeabconfigwidget.cpp:129
+#: kabconfigwidget.cpp:129
 msgid "Location Map"
 msgstr ""
 
-#: tdeabconfigwidget.cpp:135
+#: kabconfigwidget.cpp:135
 msgid ""
 "<ul> "
 "<li>%s: Street</li>"
@@ -177,7 +178,7 @@ msgid ""
 "<li>%c: Country ISO Code</li> </ul>"
 msgstr ""
 
-#: tdeabconfigwidget.cpp:158
+#: kabconfigwidget.cpp:158
 msgid "Contact"
 msgstr "Cyswllt"
 
diff --git a/tde-i18n-cy/messages/tdepim/kcmkontactnt.po b/tde-i18n-cy/messages/tdepim/kcmkontactnt.po
index 18428cf61c3..af5ee30ed5e 100644
--- a/tde-i18n-cy/messages/tdepim/kcmkontactnt.po
+++ b/tde-i18n-cy/messages/tdepim/kcmkontactnt.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdepim/kcmkontactnt.po\n"
-"POT-Creation-Date: 2006-03-20 03:58+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdepim/kdgantt.po b/tde-i18n-cy/messages/tdepim/kdgantt.po
index 24fdc741a0e..57bb0974dea 100644
--- a/tde-i18n-cy/messages/tdepim/kdgantt.po
+++ b/tde-i18n-cy/messages/tdepim/kdgantt.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kdgantt\n"
-"POT-Creation-Date: 2008-01-26 01:18+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2004-01-08 21:09+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdepim/kgantt.po b/tde-i18n-cy/messages/tdepim/kgantt.po
index a9655012c03..7b21205e4a6 100644
--- a/tde-i18n-cy/messages/tdepim/kgantt.po
+++ b/tde-i18n-cy/messages/tdepim/kgantt.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kgantt\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2004-01-08 21:12+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdepim/kleopatra.po b/tde-i18n-cy/messages/tdepim/kleopatra.po
index 423378131ae..054a659ae73 100644
--- a/tde-i18n-cy/messages/tdepim/kleopatra.po
+++ b/tde-i18n-cy/messages/tdepim/kleopatra.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdepim/kleopatra.po\n"
-"POT-Creation-Date: 2008-08-19 01:19+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -184,7 +185,7 @@ msgstr ""
 msgid "Issuer certificate not found ( %1)"
 msgstr ""
 
-#: certificateinfowidgetimpl.cpp:380 certmanager.cpp:1153
+#: certificateinfowidgetimpl.cpp:380 certmanager.cpp:1154
 msgid "Additional Information for Key"
 msgstr "Gwybodaeth Ychwanegol ar gyfer Allwedd"
 
@@ -214,8 +215,8 @@ msgid "Could not start certificate generation: %1"
 msgstr ""
 
 #: certificatewizardimpl.cpp:259 certificatewizardimpl.cpp:282
-#: certmanager.cpp:876 certmanager.cpp:878 certmanager.cpp:937
-#: certmanager.cpp:992 certmanager.cpp:994 crlview.cpp:111 crlview.cpp:134
+#: certmanager.cpp:876 certmanager.cpp:878 certmanager.cpp:938
+#: certmanager.cpp:993 certmanager.cpp:995 crlview.cpp:111 crlview.cpp:134
 msgid "Certificate Manager Error"
 msgstr "Gwall Rheolwr Tystysgrifau"
 
@@ -239,17 +240,17 @@ msgstr ""
 msgid "DCOP Communication Error, unable to send certificate using KMail."
 msgstr "Gwall cyfathrebu DCOP, wedi methu anfon tystysgrif gyda KMail."
 
-#: certificatewizardimpl.cpp:483 certmanager.cpp:1240
+#: certificatewizardimpl.cpp:483 certmanager.cpp:1241
 msgid ""
 "A file named \"%1\" already exists. Are you sure you want to overwrite it?"
 msgstr ""
 "Mae ffeil o'r enw \"%1\" mewn bod eisoes.  Ydych wir eisiau ysgrifennu drosti?"
 
-#: certificatewizardimpl.cpp:485 certmanager.cpp:1242
+#: certificatewizardimpl.cpp:485 certmanager.cpp:1243
 msgid "Overwrite File?"
 msgstr "Trosysgrifo'r Ffeil?"
 
-#: certificatewizardimpl.cpp:486 certmanager.cpp:1243
+#: certificatewizardimpl.cpp:486 certmanager.cpp:1244
 msgid "&Overwrite"
 msgstr "&Trosysgrifo"
 
@@ -524,29 +525,30 @@ msgstr ""
 msgid "CRL file imported successfully."
 msgstr "Mewnforiwyd y ffeil CRL yn llwyddiannus."
 
-#: certmanager.cpp:880 certmanager.cpp:996
+#: certmanager.cpp:880 certmanager.cpp:997
 msgid "Certificate Manager Information"
 msgstr ""
 
-#: certmanager.cpp:892
-msgid "Certificate Revocation List (*.crl *.arl *-crl.der *-arl.der)"
+#: certmanager.cpp:893
+msgid ""
+"Certificate Revocation List, DER encoded (*.crl *.arl *-crl.der *-arl.der)"
 msgstr ""
 
-#: certmanager.cpp:896
+#: certmanager.cpp:897
 msgid "Select CRL File"
 msgstr "Dewiswch Ffeil CRL"
 
-#: certmanager.cpp:937
+#: certmanager.cpp:938
 msgid "Unable to start %1 process. Please check your installation."
 msgstr ""
 
-#: certmanager.cpp:992
+#: certmanager.cpp:993
 msgid ""
 "The DirMngr process that tried to clear the CRL cache ended prematurely because "
 "of an unexpected error."
 msgstr ""
 
-#: certmanager.cpp:994
+#: certmanager.cpp:995
 #, c-format
 msgid ""
 "An error occurred when trying to clear the CRL cache. The output from DirMngr "
@@ -554,37 +556,37 @@ msgid ""
 "%1"
 msgstr ""
 
-#: certmanager.cpp:996
+#: certmanager.cpp:997
 msgid "CRL cache cleared successfully."
 msgstr ""
 
-#: certmanager.cpp:1002
+#: certmanager.cpp:1003
 msgid ""
 "<qt>"
 "<p>An error occurred while trying to delete the certificates:</p>"
 "<p><b>%1</b></p></qt>"
 msgstr ""
 
-#: certmanager.cpp:1006 certmanager.cpp:1101
+#: certmanager.cpp:1007 certmanager.cpp:1102
 msgid "Certificate Deletion Failed"
 msgstr ""
 
-#: certmanager.cpp:1040
+#: certmanager.cpp:1041
 msgid "Checking key dependencies..."
 msgstr ""
 
-#: certmanager.cpp:1066
+#: certmanager.cpp:1067
 msgid ""
 "Some or all of the selected certificates are issuers (CA certificates) for "
 "other, non-selected certificates.\n"
 "Deleting a CA certificate will also delete all certificates issued by it."
 msgstr ""
 
-#: certmanager.cpp:1071
+#: certmanager.cpp:1072
 msgid "Deleting CA Certificates"
 msgstr ""
 
-#: certmanager.cpp:1077
+#: certmanager.cpp:1078
 msgid ""
 "_n: Do you really want to delete this certificate and the %1 certificates it "
 "certified?\n"
@@ -592,18 +594,18 @@ msgid ""
 "certified?"
 msgstr ""
 
-#: certmanager.cpp:1080
+#: certmanager.cpp:1081
 #, c-format
 msgid ""
 "_n: Do you really want to delete this certificate?\n"
 "Do you really want to delete these %n certificates?"
 msgstr ""
 
-#: certmanager.cpp:1083
+#: certmanager.cpp:1084
 msgid "Delete Certificates"
 msgstr ""
 
-#: certmanager.cpp:1093
+#: certmanager.cpp:1094
 msgid ""
 "<qt>"
 "<p>An error occurred while trying to delete the certificate:</p>"
@@ -611,7 +613,7 @@ msgid ""
 "<p></qt>"
 msgstr ""
 
-#: certmanager.cpp:1096
+#: certmanager.cpp:1097
 msgid ""
 "<qt>"
 "<p>An error occurred while trying to delete the certificates:</p>"
@@ -619,77 +621,77 @@ msgid ""
 "<p></qt>"
 msgstr ""
 
-#: certmanager.cpp:1100
+#: certmanager.cpp:1101
 msgid "Operation not supported by the backend."
 msgstr ""
 
-#: certmanager.cpp:1115
+#: certmanager.cpp:1116
 msgid "Deleting keys..."
 msgstr ""
 
-#: certmanager.cpp:1205
+#: certmanager.cpp:1206
 msgid ""
 "<qt>"
 "<p>An error occurred while trying to export the certificate:</p>"
 "<p><b>%1</b></p></qt>"
 msgstr ""
 
-#: certmanager.cpp:1209
+#: certmanager.cpp:1210
 msgid "Certificate Export Failed"
 msgstr ""
 
-#: certmanager.cpp:1224
+#: certmanager.cpp:1225
 msgid "Exporting certificate..."
 msgstr ""
 
-#: certmanager.cpp:1259
+#: certmanager.cpp:1260
 msgid "ASCII Armored Certificate Bundles (*.pem)"
 msgstr ""
 
-#: certmanager.cpp:1263 certmanager.cpp:1380
+#: certmanager.cpp:1264 certmanager.cpp:1383
 msgid "Save Certificate"
 msgstr ""
 
-#: certmanager.cpp:1279
+#: certmanager.cpp:1280
 msgid "Secret Key Export"
 msgstr ""
 
-#: certmanager.cpp:1280
+#: certmanager.cpp:1282
 msgid ""
 "Select the secret key to export (<b>Warning: The PKCS#12 format is insecure; "
 "exporting secret keys is discouraged</b>):"
 msgstr ""
 
-#: certmanager.cpp:1298
+#: certmanager.cpp:1301
 msgid ""
 "<qt>"
 "<p>An error occurred while trying to export the secret key:</p>"
 "<p><b>%1</b></p></qt>"
 msgstr ""
 
-#: certmanager.cpp:1302
+#: certmanager.cpp:1305
 msgid "Secret-Key Export Failed"
 msgstr ""
 
-#: certmanager.cpp:1344 certmanager.cpp:1359
+#: certmanager.cpp:1347 certmanager.cpp:1362
 msgid "Exporting secret key..."
 msgstr ""
 
-#: certmanager.cpp:1345
+#: certmanager.cpp:1348
 msgid ""
 "Choose a charset for encoding the pkcs#12 passphrase (utf8 is recommended)"
 msgstr ""
 
-#: certmanager.cpp:1376
+#: certmanager.cpp:1379
 msgid "PKCS#12 Key Bundle (*.p12)"
 msgstr ""
 
-#: certmanager.cpp:1427
+#: certmanager.cpp:1430
 msgid ""
 "Could not start GnuPG LogViewer (kwatchgnupg). Please check your installation!"
 msgstr ""
 
-#: certmanager.cpp:1429
+#: certmanager.cpp:1432
 msgid "Kleopatra Error"
 msgstr ""
 
diff --git a/tde-i18n-cy/messages/tdepim/kmail.po b/tde-i18n-cy/messages/tdepim/kmail.po
index e533c7e687c..67ecf475cc7 100644
--- a/tde-i18n-cy/messages/tdepim/kmail.po
+++ b/tde-i18n-cy/messages/tdepim/kmail.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
-"POT-Creation-Date: 2008-08-19 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2004-02-25 13:47+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -103,7 +104,7 @@ msgstr "cofnod amser am negeseuon cyflwr 'Trosglwyddiad wedi'i gwblhau'"
 msgid "multiple encryption keys per address"
 msgstr "allweddau cêl-ysgrifennaeth lluosol am bob cyfeiriad"
 
-#: aboutdata.cpp:212 kmreaderwin.cpp:1336 kmstartup.cpp:148
+#: aboutdata.cpp:212 kmreaderwin.cpp:1300 kmstartup.cpp:149
 #: mailinglistpropertiesdialog.cpp:97
 msgid "KMail"
 msgstr "KMail"
@@ -149,7 +150,7 @@ msgstr "Dull Cloi"
 
 #: accountdialog.cpp:368
 #, fuzzy
-msgid "Procmail loc&kfile:"
+msgid "Procmail loc&tdefile:"
 msgstr "Ffeil g&lo Procmail"
 
 #: accountdialog.cpp:380
@@ -205,7 +206,7 @@ msgid "Check inter&val:"
 msgstr "Cyfnod y&mofyn:"
 
 #: accountdialog.cpp:438 accountdialog.cpp:537 accountdialog.cpp:741
-#: accountdialog.cpp:1059 configuredialog.cpp:2655
+#: accountdialog.cpp:1059 configuredialog.cpp:2733
 msgid " min"
 msgstr "mun"
 
@@ -241,8 +242,8 @@ msgstr "Cynnwys yn yr ymofyn:"
 msgid "Account Type: POP Account"
 msgstr "Math y cyfrif: cyfrif POP"
 
-#: accountdialog.cpp:582 accountdialog.cpp:851 configuredialog.cpp:2526
-#: identitydialog.cpp:109 kmfilterdlg.cpp:160 kmtransport.cpp:376
+#: accountdialog.cpp:582 accountdialog.cpp:851 configuredialog.cpp:2550
+#: identitydialog.cpp:112 kmfilterdlg.cpp:164 kmtransport.cpp:376
 msgid "&General"
 msgstr "&Cyffredinol"
 
@@ -349,7 +350,7 @@ msgstr "Ychwan&egion"
 msgid "Check &What the Server Supports"
 msgstr "Gwi&rio Beth a Gynhelir gan y Gweinydd"
 
-#: accountdialog.cpp:782 accountdialog.cpp:1097 kmheaders.cpp:137
+#: accountdialog.cpp:782 accountdialog.cpp:1097 kmheaders.cpp:140
 #: kmtransport.cpp:502
 msgid "Encryption"
 msgstr "Cêl-ysgrifaeth"
@@ -476,7 +477,8 @@ msgid "Sho&w hidden folders"
 msgstr "Dan&gos plygyll cudd"
 
 #: accountdialog.cpp:987
-msgid "Show only s&ubscribed folders"
+#, fuzzy
+msgid "Show only serverside s&ubscribed folders"
 msgstr "Dangos plygyll tan&ysgrifiedig yn yunig"
 
 #: accountdialog.cpp:992
@@ -530,9 +532,9 @@ msgstr "&Hidlo"
 msgid "<none>"
 msgstr "<dim>"
 
-#: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:244
-#: kmfoldercachedimap.cpp:2085 kmfolderimap.cpp:204 kmfolderimap.cpp:907
-#: kmkernel.cpp:1374 subscriptiondialog.cpp:172
+#: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
+#: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
+#: kmkernel.cpp:1424 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "blwch derbyn"
 
@@ -608,7 +610,7 @@ msgid ""
 "the possibility to turn filtering messages on the server on."
 msgstr ""
 
-#: accountdialog.cpp:1734 vacationdialog.cpp:163
+#: accountdialog.cpp:1734 vacationdialog.cpp:76 vacationdialog.cpp:165
 msgid ""
 "_n:  day\n"
 " days"
@@ -651,12 +653,12 @@ msgstr "Gwag"
 msgid "Edit Namespace '%1'"
 msgstr "amnewid"
 
-#: accountmanager.cpp:101
+#: accountmanager.cpp:103
 #, c-format
 msgid "Account %1"
 msgstr "Cyfrif %1"
 
-#: accountmanager.cpp:181
+#: accountmanager.cpp:183
 #, fuzzy
 msgid ""
 "Account %1 has no mailbox defined:\n"
@@ -667,26 +669,26 @@ msgstr ""
 " Erthylwyd ymofyn am ebost.\n"
 " Cywirwch osodiadau eich cyfrif! "
 
-#: accountmanager.cpp:196
+#: accountmanager.cpp:226
 msgid "Checking account %1 for new mail"
 msgstr "Ymofyn cyfrif %1 am ebost newydd."
 
-#: accountmanager.cpp:214 accountmanager.cpp:217 accountwizard.cpp:441
+#: accountmanager.cpp:244 accountmanager.cpp:247 accountwizard.cpp:441
 #: accountwizard.cpp:477
 msgid "Local Account"
 msgstr "Cyfrif Lleol"
 
-#: accountmanager.cpp:220
+#: accountmanager.cpp:250
 #, fuzzy
 msgid "POP Account"
 msgstr "Cyfrifon"
 
-#: accountmanager.cpp:223 accountmanager.cpp:225
+#: accountmanager.cpp:253 accountmanager.cpp:255
 #, fuzzy
 msgid "IMAP Account"
 msgstr "Ychwanegu Cyfrif"
 
-#: accountmanager.cpp:308
+#: accountmanager.cpp:343
 msgid ""
 "You need to add an account in the network section of the settings in order to "
 "receive mail."
@@ -795,13 +797,13 @@ msgstr ""
 msgid "Server Information"
 msgstr "Gwybodaeth am y Gweinydd"
 
-#. i18n: file customtemplates_base.ui line 248
-#: accountwizard.cpp:329 rc.cpp:212
+#. i18n: file customtemplates_base.ui line 302
+#: accountwizard.cpp:329 rc.cpp:221
 #, no-c-format
 msgid "None"
 msgstr "Dim"
 
-#: accountwizard.cpp:384 configuredialog.cpp:792
+#: accountwizard.cpp:384 configuredialog.cpp:794
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -809,13 +811,13 @@ msgstr "Sendmail"
 msgid "Check for supported security capabilities of %1..."
 msgstr ""
 
-#: actionscheduler.cpp:598 kmfiltermgr.cpp:152 kmfiltermgr.cpp:255
-#: kmfiltermgr.cpp:293
+#: actionscheduler.cpp:598 kmfiltermgr.cpp:150 kmfiltermgr.cpp:253
+#: kmfiltermgr.cpp:291
 msgid "<b>Evaluating filter rules:</b> "
 msgstr ""
 
-#: actionscheduler.cpp:605 kmfiltermgr.cpp:159 kmfiltermgr.cpp:262
-#: kmfiltermgr.cpp:299
+#: actionscheduler.cpp:605 kmfiltermgr.cpp:157 kmfiltermgr.cpp:260
+#: kmfiltermgr.cpp:297
 msgid "<b>Filter rules have matched.</b>"
 msgstr ""
 
@@ -824,115 +826,115 @@ msgstr ""
 msgid "<b>Applying filter action:</b> %1"
 msgstr "G&weithredu Gweithredoedd Hidlo"
 
-#: antispamwizard.cpp:101
+#: antispamwizard.cpp:100
 msgid "Anti-Spam Wizard"
 msgstr ""
 
-#: antispamwizard.cpp:102
+#: antispamwizard.cpp:101
 #, fuzzy
 msgid "Anti-Virus Wizard"
 msgstr "Cynhaliaeth GnuPG"
 
-#: antispamwizard.cpp:106
+#: antispamwizard.cpp:105
 msgid "Welcome to the KMail Anti-Spam Wizard"
 msgstr ""
 
-#: antispamwizard.cpp:107
+#: antispamwizard.cpp:106
 #, fuzzy
 msgid "Welcome to the KMail Anti-Virus Wizard"
 msgstr "Cynhaliaeth GnuPG"
 
-#: antispamwizard.cpp:113
+#: antispamwizard.cpp:112
 msgid "Options to fine-tune the handling of spam messages"
 msgstr ""
 
-#: antispamwizard.cpp:119
+#: antispamwizard.cpp:118
 msgid "Options to fine-tune the handling of virus messages"
 msgstr ""
 
-#: antispamwizard.cpp:131
+#: antispamwizard.cpp:130
 msgid "Summary of changes to be made by this wizard"
 msgstr ""
 
-#: antispamwizard.cpp:200
+#: antispamwizard.cpp:199
 msgid "Virus handling"
 msgstr ""
 
-#: antispamwizard.cpp:284 antispamwizard.cpp:286 antispamwizard.cpp:572
+#: antispamwizard.cpp:283 antispamwizard.cpp:285 antispamwizard.cpp:577
 msgid "Spam handling"
 msgstr ""
 
-#: antispamwizard.cpp:325 antispamwizard.cpp:327 antispamwizard.cpp:585
+#: antispamwizard.cpp:324 antispamwizard.cpp:326 antispamwizard.cpp:590
 msgid "Semi spam (unsure) handling"
 msgstr ""
 
-#: antispamwizard.cpp:387 antispamwizard.cpp:389 antispamwizard.cpp:593
+#: antispamwizard.cpp:386 antispamwizard.cpp:388 antispamwizard.cpp:598
 msgid "Classify as spam"
 msgstr ""
 
-#: antispamwizard.cpp:419 antispamwizard.cpp:421 antispamwizard.cpp:595
+#: antispamwizard.cpp:418 antispamwizard.cpp:420 antispamwizard.cpp:600
 msgid "Classify as NOT spam"
 msgstr ""
 
-#: antispamwizard.cpp:493
+#: antispamwizard.cpp:498
 msgid "Scanning for %1..."
 msgstr ""
 
-#: antispamwizard.cpp:524
+#: antispamwizard.cpp:529
 msgid "Scanning for anti-spam tools finished."
 msgstr ""
 
-#: antispamwizard.cpp:525
+#: antispamwizard.cpp:530
 msgid "Scanning for anti-virus tools finished."
 msgstr ""
 
-#: antispamwizard.cpp:528
+#: antispamwizard.cpp:533
 msgid ""
 "<p>No spam detection tools have been found. Install your spam detection "
 "software and re-run this wizard.</p>"
 msgstr ""
 
-#: antispamwizard.cpp:531
+#: antispamwizard.cpp:536
 msgid "Scanning complete. No anti-virus tools found."
 msgstr ""
 
-#: antispamwizard.cpp:555
+#: antispamwizard.cpp:560
 #, fuzzy
 msgid "<p>Messages classified as spam are marked as read."
 msgstr "Nodi pob neges yn yr edefyn dewisiedig fel wedi'i darllen"
 
-#: antispamwizard.cpp:557
+#: antispamwizard.cpp:562
 #, fuzzy
 msgid "<p>Messages classified as spam are not marked as read."
 msgstr "Nodi pob neges yn yr edefyn dewisiedig fel wedi'i darllen"
 
-#: antispamwizard.cpp:560
+#: antispamwizard.cpp:565
 msgid "<br>Spam messages are moved into the folder named <i>"
 msgstr ""
 
-#: antispamwizard.cpp:563
+#: antispamwizard.cpp:568
 msgid "<br>Spam messages are not moved into a certain folder.</p>"
 msgstr ""
 
-#: antispamwizard.cpp:587
+#: antispamwizard.cpp:592
 msgid "<p>The folder for messages classified as unsure (probably spam) is <i>"
 msgstr ""
 
-#: antispamwizard.cpp:600
+#: antispamwizard.cpp:605
 msgid "<p>The wizard will create the following filters:<ul>"
 msgstr ""
 
-#: antispamwizard.cpp:603
+#: antispamwizard.cpp:608
 msgid "<p>The wizard will replace the following filters:<ul>"
 msgstr ""
 
-#: antispamwizard.cpp:860
+#: antispamwizard.cpp:864
 msgid ""
 "The wizard will search for any tools to do spam detection\n"
 "and setup KMail to work with them."
 msgstr ""
 
-#: antispamwizard.cpp:864
+#: antispamwizard.cpp:868
 msgid ""
 "<p>Here you can get some assistance in setting up KMail's filter rules to use "
 "some commonly-known anti-virus tools.</p>"
@@ -947,39 +949,39 @@ msgid ""
 "former behavior."
 msgstr ""
 
-#: antispamwizard.cpp:915
+#: antispamwizard.cpp:919
 msgid ""
 "<p>Please select the tools to be used for the detection and go to the next "
 "page.</p>"
 msgstr ""
 
-#: antispamwizard.cpp:941
+#: antispamwizard.cpp:945
 #, fuzzy
 msgid "&Mark detected spam messages as read"
 msgstr "Nodi negeseuon dewisiedig fel wedi'u darllen"
 
-#: antispamwizard.cpp:943
+#: antispamwizard.cpp:947
 #, fuzzy
 msgid "Mark messages which have been classified as spam as read."
 msgstr "Nodi pob neges yn yr edefyn dewisiedig fel wedi'i darllen"
 
-#: antispamwizard.cpp:946
+#: antispamwizard.cpp:950
 #, fuzzy
 msgid "Move &known spam to:"
 msgstr "&Symud Pob Neges i'r Sbwriel"
 
-#: antispamwizard.cpp:948
+#: antispamwizard.cpp:952
 msgid ""
 "The default folder for spam messages is the trash folder, but you may change "
 "that in the folder view below."
 msgstr ""
 
-#: antispamwizard.cpp:962
+#: antispamwizard.cpp:966
 #, fuzzy
 msgid "Move &probable spam to:"
 msgstr "&Symud Pob Neges i'r Sbwriel"
 
-#: antispamwizard.cpp:964
+#: antispamwizard.cpp:968
 msgid ""
 "The default folder is the inbox folder, but you may change that in the folder "
 "view below."
@@ -987,11 +989,11 @@ msgid ""
 "capable tool, you can't select a folder as well."
 msgstr ""
 
-#: antispamwizard.cpp:1064
+#: antispamwizard.cpp:1068
 msgid "Check messages using the anti-virus tools"
 msgstr ""
 
-#: antispamwizard.cpp:1066
+#: antispamwizard.cpp:1070
 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 "
@@ -999,30 +1001,190 @@ msgid ""
 "special folder."
 msgstr ""
 
-#: antispamwizard.cpp:1072
+#: antispamwizard.cpp:1076
 #, fuzzy
 msgid "Move detected viral messages to the selected folder"
 msgstr "Symudwyd pob neges i'r sbwriel"
 
-#: antispamwizard.cpp:1074
+#: antispamwizard.cpp:1078
 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."
 msgstr ""
 
-#: antispamwizard.cpp:1080
+#: antispamwizard.cpp:1084
 #, fuzzy
 msgid "Additionally, mark detected viral messages as read"
 msgstr "Nodi negeseuon dewisiedig fel wedi'u darllen"
 
-#: antispamwizard.cpp:1083
+#: antispamwizard.cpp:1087
 msgid ""
 "Mark messages which have been classified as virus-infected as read, as well as "
 "moving them to the selected folder."
 msgstr ""
 
-#: cachedimapjob.cpp:220 cachedimapjob.cpp:271 cachedimapjob.cpp:825
+#: archivefolderdialog.cpp:48
+msgid ""
+"_: Start of the filename for a mail archive file\n"
+"Archive"
+msgstr ""
+
+#: archivefolderdialog.cpp:53
+#, fuzzy
+msgid "Archive Folder"
+msgstr "Creu Plygell"
+
+#: archivefolderdialog.cpp:70 importarchivedialog.cpp:54
+#, fuzzy
+msgid "&Folder:"
+msgstr "&Plygyll"
+
+#: archivefolderdialog.cpp:80
+#, fuzzy
+msgid "F&ormat:"
+msgstr "Ar&ferol:"
+
+#: archivefolderdialog.cpp:86
+msgid "Compressed Zip Archive (.zip)"
+msgstr ""
+
+#: archivefolderdialog.cpp:87
+msgid "Uncompressed Archive (.tar)"
+msgstr ""
+
+#: archivefolderdialog.cpp:88
+msgid "BZ2-Compressed Tar Archive (.tar.bz2)"
+msgstr ""
+
+#: archivefolderdialog.cpp:89
+msgid "GZ-Compressed Tar Archive (.tar.gz)"
+msgstr ""
+
+#: archivefolderdialog.cpp:96 importarchivedialog.cpp:61
+#, fuzzy
+msgid "&Archive File:"
+msgstr "Atodi Ffeil"
+
+#: archivefolderdialog.cpp:111
+#, fuzzy
+msgid "&Delete folders after completion"
+msgstr "Dileu plygyll oddiar y gweinydd"
+
+#: archivefolderdialog.cpp:161
+#, fuzzy
+msgid "Please select the folder that should be archived."
+msgstr "Dewis yr allwedd gyhoeddus a ddylid eu hatodi."
+
+#: archivefolderdialog.cpp:162
+#, fuzzy
+msgid "No folder selected"
+msgstr "R&hestr hir o blygyll"
+
+#: backupjob.cpp:123 importjob.cpp:89
+msgid "The operation was canceled by the user."
+msgstr ""
+
+#: backupjob.cpp:151
+#, fuzzy
+msgid "Failed to archive the folder '%1'."
+msgstr "Methwyd creu plygell"
+
+#: backupjob.cpp:153
+#, fuzzy
+msgid "Archiving failed."
+msgstr "Methodd y trosglwyddiad."
+
+#: backupjob.cpp:163
+msgid "Unable to finalize the archive file."
+msgstr ""
+
+#: backupjob.cpp:168
+msgid "Archiving finished"
+msgstr ""
+
+#: backupjob.cpp:173
+msgid ""
+"Archiving folder '%1' successfully completed. The archive was written to the "
+"file '%2'."
+msgstr ""
+
+#: backupjob.cpp:177
+#, fuzzy
+msgid ""
+"_n: 1 message of size %1 was archived.\n"
+"%n messages with the total size of %1 were archived."
+msgstr ""
+"%n neges wedi'i phrosesu\n"
+"%n o negeseuon wedi'u prosesu"
+
+#: backupjob.cpp:179
+#, c-format
+msgid "The archive file has a size of %1."
+msgstr ""
+
+#: backupjob.cpp:181
+msgid "Archiving finished."
+msgstr ""
+
+#: backupjob.cpp:216 backupjob.cpp:226
+#, fuzzy
+msgid "Unable to retrieve a message for folder '%1'."
+msgstr "Methu ychwanegu neges i'r blygell: "
+
+#: backupjob.cpp:251
+#, fuzzy
+msgid "Internal error while trying to retrieve a message from folder '%1'."
+msgstr ""
+"Gwall wrth ysgrifennu'r ffeil:\n"
+" %1"
+
+#: backupjob.cpp:321
+#, fuzzy
+msgid "Failed to write a message into the archive folder '%1'."
+msgstr "Symudwyd pob neges i'r sbwriel"
+
+#: backupjob.cpp:360
+#, fuzzy
+msgid "Downloading a message in folder '%1' failed."
+msgstr "Methwyd symud y negeseuon."
+
+#: backupjob.cpp:362
+#, fuzzy
+msgid "Downloading a message in the current folder failed."
+msgstr "Dad-ehangu pob edefyn yn y blygell gyfredol"
+
+#: backupjob.cpp:391
+#, fuzzy, c-format
+msgid "Archiving folder %1"
+msgstr "Nôl rhestr plygyll"
+
+#: backupjob.cpp:393 importjob.cpp:210
+#, fuzzy
+msgid "Unable to open folder '%1'."
+msgstr "Rh&estr fer o blygyll"
+
+#: backupjob.cpp:413
+msgid "Unable to create folder structure for folder '%1' within archive file."
+msgstr ""
+
+#: backupjob.cpp:425
+msgid "Unable to backup messages in folder '%1', the index file is corrupted."
+msgstr ""
+
+#: backupjob.cpp:483
+#, fuzzy
+msgid "Unable to open archive for writing."
+msgstr ""
+"Methu agor ffeil ar gyfer ysgrifennu:\n"
+" %1"
+
+#: backupjob.cpp:489
+#, fuzzy
+msgid "Archiving"
+msgstr "&Derbyn"
+
+#: cachedimapjob.cpp:220 cachedimapjob.cpp:271 cachedimapjob.cpp:886
 #, fuzzy
 msgid "Error while deleting messages on the server: "
 msgstr "Gwall wrth lanlwytho'r neges"
@@ -1032,16 +1194,16 @@ msgstr "Gwall wrth lanlwytho'r neges"
 msgid "Error while retrieving message on the server: "
 msgstr "Gwall wrth lanlwytho'r neges"
 
-#: cachedimapjob.cpp:538
+#: cachedimapjob.cpp:541
 msgid "Error while uploading folder"
 msgstr "Gwall wrth lanlwytho'r plygell"
 
-#: cachedimapjob.cpp:539
+#: cachedimapjob.cpp:542
 #, fuzzy
 msgid "Could not make the folder <b>%1</b> on the server."
 msgstr "Methu gwneud y blygell %1 ar y gweinydd."
 
-#: cachedimapjob.cpp:540
+#: cachedimapjob.cpp:543
 #, fuzzy
 msgid ""
 "This could be because you do not have permission to do this, or because the "
@@ -1052,35 +1214,84 @@ msgstr ""
 "cyfeiriadur yn bresennol yn barod ar y gweinydd. Dyma'r neges wall o'r "
 "cyfathrebiaeth gweinydd: "
 
-#: cachedimapjob.cpp:626
+#: cachedimapjob.cpp:629
 #, fuzzy
 msgid "Error while deleting folder %1 on the server: "
 msgstr "Methu gwneud y blygell %1 ar y gweinydd."
 
-#: cachedimapjob.cpp:679
+#: cachedimapjob.cpp:682
 #, fuzzy
 msgid "Error while reading folder %1 on the server: "
 msgstr ""
 "Gwall wrth ddarllen y ffeil: \n"
 " %1"
 
-#: cachedimapjob.cpp:794
+#: cachedimapjob.cpp:811
+msgid ""
+"Error while trying to subscribe to the renamed folder %1.\n"
+"Renaming itself was successful, but the renamed folder might disappear from the "
+"folder list after the next sync since it is unsubscribed on the server.\n"
+"You can try to manually subscribe to the folder yourself.\n"
+"\n"
+"%2"
+msgstr ""
+
+#: cachedimapjob.cpp:857
 #, fuzzy, c-format
 msgid "Error while trying to rename folder %1"
 msgstr ""
 "Gwall wrth ysgrifennu'r ffeil:\n"
 " %1"
 
-#: callback.cpp:170
+#: callback.cpp:71
+msgid ""
+"<qt>The receiver of this invitation doesn't match any of your identities."
+"<br>Please select the transport which should be used to send your reply.</qt>"
+msgstr ""
+
+#: callback.cpp:74
+msgid ""
+"<qt>The identity matching the receiver of this invitation doesn't have an "
+"associated transport configured."
+"<br>Please select the transport which should be used to send your reply.</qt>"
+msgstr ""
+
+#: callback.cpp:78
+#, fuzzy
+msgid "Select Transport"
+msgstr "gosod cludiant i"
+
+#: callback.cpp:97
+#, fuzzy, c-format
+msgid "Declined: %1"
+msgstr "[Gwrthod]"
+
+#: callback.cpp:99
+#, c-format
+msgid "Tentative: %1"
+msgstr ""
+
+#: callback.cpp:101
+#, fuzzy, c-format
+msgid "Accepted: %1"
+msgstr "Atodiad: %1"
+
+#: callback.cpp:103
+#, fuzzy, c-format
+msgid "Delegated: %1"
+msgstr "Wedi'u dileu"
+
+#: callback.cpp:216
 #, fuzzy
 msgid ""
 "<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any:"
+"<br>please choose which of the following addresses is yours, if any, or select "
+"one of your identities to use in the reply:"
 msgstr ""
 "Nid yw un o'ch dynodiadau yn cydweddu â derbyniwr y neges yma, "
 "<br> dewiswch pa un o'r cyfeiriadau dilynnol sy'n biau i chi:"
 
-#: callback.cpp:176
+#: callback.cpp:222
 #, fuzzy
 msgid ""
 "<qt>Several of your identities match the receiver of this message,"
@@ -1089,7 +1300,7 @@ msgstr ""
 "Nid yw un o'ch dynodiadau yn cydweddu â derbyniwr y neges yma, "
 "<br> dewiswch pa un o'r cyfeiriadau dilynnol sy'n biau i chi:"
 
-#: callback.cpp:183
+#: callback.cpp:233
 msgid "Select Address"
 msgstr "Dewis Cyfeiriad"
 
@@ -1114,7 +1325,7 @@ msgstr ""
 msgid "Error occurred while compacting \"%1\". Compaction aborted."
 msgstr ""
 
-#: configuredialog.cpp:155
+#: configuredialog.cpp:156
 msgid ""
 "<qt>"
 "<p>This setting has been fixed by your administrator.</p>"
@@ -1124,148 +1335,148 @@ msgstr ""
 "<p>Mae eich gweinyddwr wedi penderfynu ar y gosodiad yma.</p>"
 "<p>Os meddyliwch mai gwall yw hwn, cysylltwch â fo.</p></qt>"
 
-#: configuredialog.cpp:217
+#: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "Llwytho &Proffil..."
 
-#: configuredialog.cpp:305 simplestringlisteditor.cpp:85
+#: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "&Ychwanegu..."
 
-#: configuredialog.cpp:306 configuredialog.cpp:625 configuredialog.cpp:1096
-#: configuredialog.cpp:3165 simplestringlisteditor.cpp:108
+#: configuredialog.cpp:309 configuredialog.cpp:628 configuredialog.cpp:1102
+#: configuredialog.cpp:3278 simplestringlisteditor.cpp:108
 msgid "&Modify..."
 msgstr "&Addasu..."
 
-#: configuredialog.cpp:307
+#: configuredialog.cpp:310
 msgid "&Rename"
 msgstr "&Ailenwi"
 
-#: configuredialog.cpp:308 configuredialog.cpp:3115 configuredialog.cpp:3164
+#: configuredialog.cpp:311 configuredialog.cpp:3228 configuredialog.cpp:3277
 msgid "Remo&ve"
 msgstr "Gware&du"
 
-#: configuredialog.cpp:309
+#: configuredialog.cpp:312
 msgid "Set as &Default"
 msgstr "&Gosod fel Rhagosod"
 
-#: configuredialog.cpp:450
+#: configuredialog.cpp:453
 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:452
+#: configuredialog.cpp:455
 #, fuzzy
 msgid "Remove Identity"
 msgstr "G&waredu"
 
-#: configuredialog.cpp:493 configuredialog.cpp:3114
+#: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "Ychwanegu..."
 
-#: configuredialog.cpp:495 configuredialog.cpp:3116
+#: configuredialog.cpp:498 configuredialog.cpp:3229
 msgid "Modify..."
 msgstr "Addasu..."
 
-#: configuredialog.cpp:499
+#: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "Gosod fel Rhagosod"
 
-#: configuredialog.cpp:562
+#: configuredialog.cpp:565
 msgid "&Receiving"
 msgstr "&Derbyn"
 
-#: configuredialog.cpp:570
+#: configuredialog.cpp:573
 msgid "&Sending"
 msgstr "&Anfon"
 
-#: configuredialog.cpp:595
+#: configuredialog.cpp:598
 msgid "Outgoing accounts (add at least one):"
 msgstr "Cyfrifon allfynd (ychwanegwch o leiaf un):"
 
-#. i18n: file customtemplates_base.ui line 99
-#: configuredialog.cpp:604 configuredialog.cpp:1074 configuredialog.cpp:3290
-#: distributionlistdialog.cpp:115 favoritefolderview.cpp:378
-#: kmcomposewin.cpp:366 rc.cpp:191 recipientspicker.cpp:389
+#. i18n: file customtemplates_base.ui line 89
+#: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
+#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
+#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "Enw"
 
-#. i18n: file customtemplates_base.ui line 88
-#: configuredialog.cpp:605 configuredialog.cpp:1075 kmcomposewin.cpp:369
-#: kmfilterdlg.cpp:214 kmmimeparttree.cpp:65 rc.cpp:188
+#. i18n: file customtemplates_base.ui line 78
+#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
+#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
 #, no-c-format
 msgid "Type"
 msgstr "Math\t"
 
-#: configuredialog.cpp:618 configuredialog.cpp:1089 configuredialog.cpp:2836
-#: configuredialog.cpp:3087 configuredialog.cpp:3164 configuredialog.cpp:3498
+#: configuredialog.cpp:621 configuredialog.cpp:1095 configuredialog.cpp:2949
+#: configuredialog.cpp:3200 configuredialog.cpp:3277 configuredialog.cpp:3611
 msgid "A&dd..."
 msgstr "Yc&hwanegu..."
 
-#: configuredialog.cpp:633 configuredialog.cpp:1104
+#: configuredialog.cpp:636 configuredialog.cpp:1110
 msgid "R&emove"
 msgstr "G&waredu"
 
-#: configuredialog.cpp:640
+#: configuredialog.cpp:643
 msgid "Set Default"
 msgstr "Gosod yn Ragosodyn"
 
-#: configuredialog.cpp:650
+#: configuredialog.cpp:653
 msgid "Common Options"
 msgstr "Dewisiadau Cyffredin"
 
-#. i18n: file kmail.kcfg line 382
-#: configuredialog.cpp:658 rc.cpp:788
+#. i18n: file kmail.kcfg line 412
+#: configuredialog.cpp:661 rc.cpp:813
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "Cadarnha&u cyn anfon"
 
-#: configuredialog.cpp:666
+#: configuredialog.cpp:669
 msgid "Never Automatically"
 msgstr ""
 
-#: configuredialog.cpp:667
+#: configuredialog.cpp:670
 msgid "On Manual Mail Checks"
 msgstr ""
 
-#: configuredialog.cpp:668
+#: configuredialog.cpp:671
 msgid "On All Mail Checks"
 msgstr ""
 
-#: configuredialog.cpp:676
+#: configuredialog.cpp:679
 msgid "Send Now"
 msgstr "Anfon Rwan "
 
-#: configuredialog.cpp:677
+#: configuredialog.cpp:680
 msgid "Send Later"
 msgstr "Anfon yn Hwyrach"
 
-#: configuredialog.cpp:687
+#: configuredialog.cpp:690
 msgid "Allow 8-bit"
 msgstr "Caniatáu 8-did"
 
-#: configuredialog.cpp:688
+#: configuredialog.cpp:691
 msgid "MIME Compliant (Quoted Printable)"
 msgstr "Cydymffurfiol â MIME (Argraffadwy Dyfynedig)"
 
-#: configuredialog.cpp:701
+#: configuredialog.cpp:704
 #, fuzzy
 msgid "Send &messages in outbox folder:"
 msgstr "Anfon negeseuon yn y b&lwch anfon wrth ymofyn"
 
-#: configuredialog.cpp:709
+#: configuredialog.cpp:712
 msgid "Defa&ult send method:"
 msgstr "Dull anfon r&hagosod"
 
-#: configuredialog.cpp:711
+#: configuredialog.cpp:714
 msgid "Message &property:"
 msgstr "Priodwedd ne&ges:"
 
-#: configuredialog.cpp:713
+#: configuredialog.cpp:716
 msgid "Defaul&t domain:"
 msgstr "Parth &rhagosod:"
 
-#: configuredialog.cpp:717
+#: configuredialog.cpp:720
 msgid ""
 "<qt>"
 "<p>The default domain is used to complete email addresses that only consist of "
@@ -1275,27 +1486,27 @@ msgstr ""
 "<p>Defnyddir y parth rhagosod i gwblhau cyfeiriadau ebost sy'n cynnwys enw'r "
 "defnyddiwr yn unig.</p></qt>"
 
-#: configuredialog.cpp:741
+#: configuredialog.cpp:744
 msgid ""
 "_: %1: name; %2: number appended to it to make it unique among a list of names\n"
 "%1 %2"
 msgstr "%1 %2"
 
-#: configuredialog.cpp:766 configuredialog.cpp:943 configuredialog.cpp:991
+#: configuredialog.cpp:769 configuredialog.cpp:950 configuredialog.cpp:997
 #, fuzzy
 msgid "smtp (Default)"
 msgstr "%1 (Rhagosod)"
 
-#: configuredialog.cpp:768 configuredialog.cpp:945 configuredialog.cpp:993
+#: configuredialog.cpp:771 configuredialog.cpp:952 configuredialog.cpp:999
 #, fuzzy
 msgid "sendmail (Default)"
 msgstr "%1 (Rhagosod)"
 
-#: configuredialog.cpp:799 kmtransport.cpp:248
+#: configuredialog.cpp:801 kmtransport.cpp:248
 msgid "Add Transport"
 msgstr "Ychwanegu Cludiant"
 
-#: configuredialog.cpp:830
+#: configuredialog.cpp:832
 msgid ""
 "_: %1: type of transport. Result used in Configure->Accounts->"
 "Sending listview, \"type\" column, first row, to indicate that this is the "
@@ -1303,415 +1514,407 @@ msgid ""
 "%1 (Default)"
 msgstr "%1 (rhagosod)"
 
-#: configuredialog.cpp:854
+#: configuredialog.cpp:856
 msgid "Modify Transport"
 msgstr "Addasu Cludiant"
 
-#: configuredialog.cpp:890
+#: configuredialog.cpp:892
 #, c-format
 msgid ""
 "_n: This identity has been changed to use the modified transport:\n"
 "These %n identities have been changed to use the modified transport:"
 msgstr ""
 
-#: configuredialog.cpp:921
+#: configuredialog.cpp:927
 #, c-format
 msgid ""
 "_n: This identity has been changed to use the default transport:\n"
 "These %n identities have been changed to use the default transport:"
 msgstr ""
 
-#: configuredialog.cpp:1066
+#: configuredialog.cpp:1072
 msgid "Incoming accounts (add at least one):"
 msgstr "Cyfrifon mewnddod (ychwanegwch o leiaf un)"
 
-#: configuredialog.cpp:1076 kmfolderseldlg.cpp:95 kmfoldertree.cpp:376
-#: searchwindow.cpp:230
+#: configuredialog.cpp:1082 kmfoldertree.cpp:397 searchwindow.cpp:229
+#: simplefoldertree.h:141
 msgid "Folder"
 msgstr "Plygell"
 
-#: configuredialog.cpp:1112
+#: configuredialog.cpp:1118
 msgid "Chec&k mail on startup"
 msgstr "Ym&ofyn ebost wrth gychwyn"
 
-#: configuredialog.cpp:1118
+#: configuredialog.cpp:1124
 msgid "New Mail Notification"
 msgstr "Hysbysiad Ebost Newydd"
 
-#: configuredialog.cpp:1123
+#: configuredialog.cpp:1129
 msgid "&Beep"
 msgstr "&Blîp"
 
-#: configuredialog.cpp:1131
+#: configuredialog.cpp:1137
 #, fuzzy
 msgid "Deta&iled new mail notification"
 msgstr "Hysbysiad Ebost Newydd"
 
-#: configuredialog.cpp:1135
+#: configuredialog.cpp:1141
 #, fuzzy
 msgid "Show for each folder the number of newly arrived messages"
 msgstr "Mynd i'r blygell nesaf efo negeseuon heb eu darllen"
 
-#: configuredialog.cpp:1143
+#: configuredialog.cpp:1149
 msgid "Other Actio&ns"
 msgstr "Gweithre&doedd eraill"
 
-#: configuredialog.cpp:1221
+#: configuredialog.cpp:1227
 msgid "Unknown account type selected"
 msgstr "Dewiswyd math anhysbys o gyfrif"
 
-#: configuredialog.cpp:1230
+#: configuredialog.cpp:1236
 msgid "Unable to create account"
 msgstr "Methu creu cyfrif"
 
-#: configuredialog.cpp:1236 kmacctseldlg.cpp:36
+#: configuredialog.cpp:1242 kmacctseldlg.cpp:36
 msgid "Add Account"
 msgstr "Ychwanegu Cyfrif"
 
-#: configuredialog.cpp:1288
+#: configuredialog.cpp:1294
 msgid "Unable to locate account"
 msgstr "Methu lleoli cyfrif"
 
-#: configuredialog.cpp:1315
+#: configuredialog.cpp:1321
 msgid "Modify Account"
 msgstr "Addasu cyfrif"
 
-#: configuredialog.cpp:1360 configuredialog.cpp:1440
+#: configuredialog.cpp:1366 configuredialog.cpp:1446
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt>Methu lleoli cyfrif<b>%1</b>.</qt>"
 
-#: configuredialog.cpp:1491
+#: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "Lliwi&au"
 
-#: configuredialog.cpp:1497
+#: configuredialog.cpp:1503
 msgid "La&yout"
 msgstr "&Haenlun"
 
-#: configuredialog.cpp:1503
+#: configuredialog.cpp:1509
 msgid "M&essage List"
 msgstr "R&hestr Negeseuon"
 
-#: configuredialog.cpp:1509
+#: configuredialog.cpp:1515
 #, fuzzy
 msgid "Message W&indow"
 msgstr "Rhestr Negeseuon"
 
-#: configuredialog.cpp:1515
+#: configuredialog.cpp:1521
 msgid "System &Tray"
 msgstr "B&ar Tasgau"
 
-#: configuredialog.cpp:1531
+#: configuredialog.cpp:1537
 msgid "Message Body"
 msgstr "Corff y Neges"
 
-#: configuredialog.cpp:1532
+#: configuredialog.cpp:1538
 msgid "Message List"
 msgstr "Rhestr Negeseuon"
 
-#: configuredialog.cpp:1533
+#: configuredialog.cpp:1539
 #, fuzzy
 msgid "Message List - New Messages"
 msgstr "Rhestr Negeseuon - Maes Dyddiad"
 
-#: configuredialog.cpp:1534
+#: configuredialog.cpp:1540
 #, fuzzy
 msgid "Message List - Unread Messages"
 msgstr "Neges Nesaf &Heb ei Darllen"
 
-#: configuredialog.cpp:1535
+#: configuredialog.cpp:1541
 #, fuzzy
 msgid "Message List - Important Messages"
 msgstr "Neges bwysig"
 
-#: configuredialog.cpp:1536
+#: configuredialog.cpp:1542
 #, fuzzy
 msgid "Message List - Todo Messages"
 msgstr "Rhestr Negeseuon - Maes Dyddiad"
 
-#: configuredialog.cpp:1537
+#: configuredialog.cpp:1543
 msgid "Message List - Date Field"
 msgstr "Rhestr Negeseuon - Maes Dyddiad"
 
-#: configuredialog.cpp:1538 configuredialog.cpp:1859
+#: configuredialog.cpp:1544 configuredialog.cpp:1868
 msgid "Folder List"
 msgstr "Rhestr Plygyll"
 
-#: configuredialog.cpp:1539 configuredialog.cpp:1702
+#: configuredialog.cpp:1545 configuredialog.cpp:1708
 msgid "Quoted Text - First Level"
 msgstr "Testun Dyfynedig - Lefel Cyntaf"
 
-#: configuredialog.cpp:1540 configuredialog.cpp:1703
+#: configuredialog.cpp:1546 configuredialog.cpp:1709
 msgid "Quoted Text - Second Level"
 msgstr "Testun Dyfynedig - Ail Lefel"
 
-#: configuredialog.cpp:1541 configuredialog.cpp:1704
+#: configuredialog.cpp:1547 configuredialog.cpp:1710
 msgid "Quoted Text - Third Level"
 msgstr "Testun Dyfynedig - Trydydd Lefel"
 
-#: configuredialog.cpp:1542
+#: configuredialog.cpp:1548
 msgid "Fixed Width Font"
 msgstr "Wynebfath o Led Gosodedig"
 
-#: configuredialog.cpp:1543 kmcomposewin.cpp:356
+#: configuredialog.cpp:1549 kmcomposewin.cpp:386
 msgid "Composer"
 msgstr "Cyfansoddydd"
 
-#: configuredialog.cpp:1544
+#: configuredialog.cpp:1550
 msgid "Printing Output"
 msgstr "Allbwn Argraffu"
 
-#: configuredialog.cpp:1559
+#: configuredialog.cpp:1565
 msgid "&Use custom fonts"
 msgstr "&Defnyddio wynebfathau addasiedig"
 
-#: configuredialog.cpp:1575
+#: configuredialog.cpp:1581
 msgid "Apply &to:"
 msgstr "Gwethr&edu ar:"
 
-#: configuredialog.cpp:1699
+#: configuredialog.cpp:1705
 #, fuzzy
 msgid "Composer Background"
 msgstr "Cefndir y cyfansoddydd"
 
-#: configuredialog.cpp:1700
+#: configuredialog.cpp:1706
 #, fuzzy
 msgid "Alternative Background Color"
 msgstr "Lliw cefndir rall"
 
-#: configuredialog.cpp:1701
+#: configuredialog.cpp:1707
 msgid "Normal Text"
 msgstr "Testun Arferol"
 
-#: configuredialog.cpp:1705
+#: configuredialog.cpp:1711
 msgid "Link"
 msgstr "Cyswllt"
 
-#: configuredialog.cpp:1706
+#: configuredialog.cpp:1712
 msgid "Followed Link"
 msgstr "Cyswllt dilynedig"
 
-#: configuredialog.cpp:1707
+#: configuredialog.cpp:1713
 #, fuzzy
 msgid "Misspelled Words"
 msgstr "Geiriau a gamsillafwyd"
 
 #. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1708 rc.cpp:444
+#: configuredialog.cpp:1714 rc.cpp:450
 #, no-c-format
 msgid "New Message"
 msgstr "Neges Newydd"
 
-#: configuredialog.cpp:1709
+#: configuredialog.cpp:1715
 #, fuzzy
 msgid "Unread Message"
 msgstr "Neges na's darllenwyd"
 
-#: configuredialog.cpp:1710
+#: configuredialog.cpp:1716
 #, fuzzy
 msgid "Important Message"
 msgstr "Neges bwysig"
 
-#: configuredialog.cpp:1711
+#: configuredialog.cpp:1717
 #, fuzzy
 msgid "Todo Message"
 msgstr "G&olygu Neges"
 
-#: configuredialog.cpp:1712
+#: configuredialog.cpp:1718
 #, fuzzy
 msgid "OpenPGP Message - Encrypted"
 msgstr "Neges OpenPGP - wedi'i chelu"
 
-#: configuredialog.cpp:1713
+#: configuredialog.cpp:1719
 #, fuzzy
 msgid "OpenPGP Message - Valid Signature with Trusted Key"
 msgstr "Neges OpenPGP - llofnod dilys efo allwedd ymddiriedig"
 
-#: configuredialog.cpp:1714
+#: configuredialog.cpp:1720
 #, fuzzy
 msgid "OpenPGP Message - Valid Signature with Untrusted Key"
 msgstr "Neges OpenPGP - llofnod dilys efo allwedd diymddirieidig"
 
-#: configuredialog.cpp:1715
+#: configuredialog.cpp:1721
 #, fuzzy
 msgid "OpenPGP Message - Unchecked Signature"
 msgstr "Neges OpenPGP - llofnod na's gwiriwyd"
 
-#: configuredialog.cpp:1716
+#: configuredialog.cpp:1722
 #, fuzzy
 msgid "OpenPGP Message - Bad Signature"
 msgstr "Neges OpenPGP - neges annilys"
 
-#: configuredialog.cpp:1717
+#: configuredialog.cpp:1723
 #, fuzzy
 msgid "Border Around Warning Prepending HTML Messages"
 msgstr "Ymylon o gwmpas y rhybudd sy'n rhagddodi negeseuon HTML"
 
-#: configuredialog.cpp:1718
+#: configuredialog.cpp:1724
 msgid "Folder Name and Size When Close to Quota"
 msgstr ""
 
-#: configuredialog.cpp:1719
+#: configuredialog.cpp:1725
 #, fuzzy
 msgid "HTML Status Bar Background - No HTML Message"
 msgstr "Cefndir bar cyflwr HTML - Dim neges HTML"
 
-#: configuredialog.cpp:1720
+#: configuredialog.cpp:1726
 #, fuzzy
 msgid "HTML Status Bar Foreground - No HTML Message"
 msgstr "Blaendir bar cyflwr HTML - Dim neges HTML"
 
-#: configuredialog.cpp:1721
+#: configuredialog.cpp:1727
 #, fuzzy
 msgid "HTML Status Bar Background - HTML Message"
 msgstr "Cefndir bar cyflwr HTML - Neges HTML"
 
-#: configuredialog.cpp:1722
+#: configuredialog.cpp:1728
 #, fuzzy
 msgid "HTML Status Bar Foreground - HTML Message"
 msgstr "Blaendir bar cyflwr HTML - Neges HTML"
 
-#: configuredialog.cpp:1734
+#: configuredialog.cpp:1740
 msgid "&Use custom colors"
 msgstr "&Defnyddio lliwiau addasiedig"
 
-#: configuredialog.cpp:1749
+#: configuredialog.cpp:1755
 msgid "Recycle colors on deep &quoting"
 msgstr "Ailgylchu'r lliwiau wrth dd&yfynnu'n ddwfn"
 
-#: configuredialog.cpp:1757
+#: configuredialog.cpp:1763
 msgid "Close to quota threshold"
 msgstr ""
 
-#: configuredialog.cpp:1763
+#: configuredialog.cpp:1770
 #, c-format
 msgid "%"
 msgstr ""
 
-#: configuredialog.cpp:1855
+#: configuredialog.cpp:1864
 msgid "Lon&g folder list"
 msgstr "R&hestr hir o blygyll"
 
-#: configuredialog.cpp:1856
+#: configuredialog.cpp:1865
 msgid "Shor&t folder list"
 msgstr "Rh&estr fer o blygyll"
 
-#: configuredialog.cpp:1865
+#: configuredialog.cpp:1874
 msgid "Abo&ve the message pane"
 msgstr "Dros y &cwarel neges"
 
-#: configuredialog.cpp:1866
+#: configuredialog.cpp:1875
 msgid "&Below the message pane"
 msgstr "Dan y c&warel neges"
 
-#: configuredialog.cpp:1869
+#: configuredialog.cpp:1878
 msgid "Message Structure Viewer Placement"
 msgstr "Lleoliad Gwelydd Adeiledd y Neges"
 
-#: configuredialog.cpp:1874
+#: configuredialog.cpp:1883
 msgid "Show &never"
 msgstr "Dangos &byth"
 
-#: configuredialog.cpp:1875
+#: configuredialog.cpp:1884
 msgid "Show only for non-plaintext &messages"
 msgstr "Dan&gos ar gyfer negeseuon heb destun plaen yn unig"
 
-#: configuredialog.cpp:1876
+#: configuredialog.cpp:1885
 msgid "Show alway&s"
 msgstr "Dangos o &hyd"
 
-#: configuredialog.cpp:1879
+#: configuredialog.cpp:1888
 msgid "Message Structure Viewer"
 msgstr "Gwelydd Adeiledd y Neges"
 
-#: configuredialog.cpp:1885
+#: configuredialog.cpp:1894
 #, fuzzy
 msgid "&Do not show a message preview pane"
 msgstr "&Peidio â dangos cwarel rhagolwg y neges"
 
-#: configuredialog.cpp:1886
+#: configuredialog.cpp:1895
 msgid "Show the message preview pane belo&w the message list"
 msgstr "Dango&s cwarel rhagolwg y neges dan y rhestr negeseuon"
 
-#: configuredialog.cpp:1887
+#: configuredialog.cpp:1896
 msgid "Show the message preview pane ne&xt to the message list"
 msgstr "Dangos &cwarel rhagolwg y neges wrth ymyl y rhestr negeseuon"
 
-#: configuredialog.cpp:1890
+#: configuredialog.cpp:1899
 msgid "Message Preview Pane"
 msgstr "Cwarel Rhagolwg y Neges"
 
-#: configuredialog.cpp:1908
+#: configuredialog.cpp:1917
 #, fuzzy
 msgid "Show favorite folder view"
 msgstr "Rh&estr fer o blygyll"
 
-#: configuredialog.cpp:1912
-msgid "Show folder quick search field"
-msgstr ""
-
-#: configuredialog.cpp:1983
+#: configuredialog.cpp:1986
 msgid "Sta&ndard format (%1)"
 msgstr "&Fformat safonol (%1)"
 
-#: configuredialog.cpp:1984
+#: configuredialog.cpp:1987
 msgid "Locali&zed format (%1)"
 msgstr "Fformat &lleol (%1)"
 
-#: configuredialog.cpp:1985
+#: configuredialog.cpp:1988
 msgid "Fancy for&mat (%1)"
 msgstr "Fformat &pert (%1)"
 
-#: configuredialog.cpp:1986
+#: configuredialog.cpp:1989
 msgid "C&ustom format (Shift+F1 for help):"
 msgstr "A&ddasiedig (Syflyd+F1 ar gyfer cymorth) :"
 
-#: configuredialog.cpp:2003
+#: configuredialog.cpp:2006
 msgid "General Options"
 msgstr "Dewisiadau Cyffredin"
 
-#: configuredialog.cpp:2006
-msgid "Show Quick Search"
-msgstr ""
-
-#: configuredialog.cpp:2008
+#: configuredialog.cpp:2009
 #, fuzzy
 msgid "Display messa&ge sizes"
 msgstr "Dan&gos meintiau'r negeseuon"
 
-#: configuredialog.cpp:2010
+#: configuredialog.cpp:2011
 msgid "Show crypto &icons"
 msgstr "Dangos &eiconau celu"
 
-#: configuredialog.cpp:2012
+#: configuredialog.cpp:2013
 #, fuzzy
 msgid "Show attachment icon"
 msgstr "atodiad"
 
-#: configuredialog.cpp:2015
+#: configuredialog.cpp:2016
 #, fuzzy
 msgid "&Threaded message list"
 msgstr "&Edafu Negeseuon"
 
-#: configuredialog.cpp:2033
+#: configuredialog.cpp:2032
 #, fuzzy
 msgid "Threaded Message List Options"
 msgstr "&Edafu Negeseuon"
 
-#: configuredialog.cpp:2037
+#: configuredialog.cpp:2036
 msgid "Always &keep threads open"
 msgstr "Cad&w'r edeifion ar agor o hyd"
 
-#: configuredialog.cpp:2040
+#: configuredialog.cpp:2039
 msgid "Threads default to o&pen"
 msgstr "Rha&gosod yr edeifion yw ar agor"
 
-#: configuredialog.cpp:2043
+#: configuredialog.cpp:2042
 #, fuzzy
 msgid "Threads default to closed"
 msgstr "R&hagosod yr edeifion yw ar gau "
 
-#: configuredialog.cpp:2046
+#: configuredialog.cpp:2045
 msgid ""
 "Open threads that contain ne&w, unread or important messages and open watched "
 "threads."
@@ -1719,11 +1922,11 @@ msgstr ""
 "Agor edeifion sy'n cynnwys &negeseuon newydd, heb eu darllen, neu bwysig, ac "
 "agor edeifion a wylir arnynt."
 
-#: configuredialog.cpp:2056
+#: configuredialog.cpp:2055
 msgid "Date Display"
 msgstr "Ymddangosiad y Dyddiad"
 
-#: configuredialog.cpp:2073
+#: configuredialog.cpp:2072
 msgid ""
 "<qt>"
 "<p><strong>These expressions may be used for the date:</strong></p>"
@@ -1783,123 +1986,172 @@ msgstr ""
 "<li>Z - amserfa mewn ffurf rhifol (-0500)</li></ul>"
 "<p><strong>Anwybyddir pob nod arall o fewnbwn.</strong></p></qt>"
 
-#: configuredialog.cpp:2187
+#: configuredialog.cpp:2185
 msgid ""
 "Changing the global threading setting will override all folder specific values."
 msgstr ""
 "Bydd newid y gosodiad edafu eang yn anwybyddu pob gwerth sy'n benodol i "
 "blygell."
 
-#: configuredialog.cpp:2224
+#: configuredialog.cpp:2221
+msgid "Close message window after replying or forwarding"
+msgstr ""
+
+#: configuredialog.cpp:2225
 msgid "Show HTML stat&us bar"
 msgstr "Dangos b&ar cyflwr HTML"
 
-#: configuredialog.cpp:2228
+#: configuredialog.cpp:2229
 #, fuzzy
 msgid "Show s&pam status in fancy headers"
 msgstr "Dangos pob penawd y negeseuon"
 
-#. i18n: file kmail.kcfg line 541
-#: configuredialog.cpp:2232 rc.cpp:856
+#. i18n: file kmail.kcfg line 583
+#: configuredialog.cpp:2233 rc.cpp:890
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr ""
 
-#: configuredialog.cpp:2236
+#: configuredialog.cpp:2237
 msgid "Use smaller font for quoted text"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 546
-#: configuredialog.cpp:2240 rc.cpp:862
+#. i18n: file kmail.kcfg line 588
+#: configuredialog.cpp:2241 rc.cpp:896
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr ""
 
-#: configuredialog.cpp:2315
+#: configuredialog.cpp:2245
+msgid "Show current sender time"
+msgstr ""
+
+#: configuredialog.cpp:2262
+msgid ""
+"Close the standalone message window after replying or forwarding the message"
+msgstr ""
+
+#: configuredialog.cpp:2328
 #, fuzzy
 msgid "Fallback ch&aracter encoding:"
 msgstr "Goso&d Amgodiad"
 
-#: configuredialog.cpp:2325 configuredialog.cpp:2382 kmreaderwin.cpp:650
+#: configuredialog.cpp:2338 configuredialog.cpp:2400 kmreaderwin.cpp:584
 msgid "Auto"
 msgstr "Ymysgogol"
 
-#: configuredialog.cpp:2336
+#: configuredialog.cpp:2349
 #, fuzzy
 msgid "&Override character encoding:"
 msgstr "Goso&d Amgodiad"
 
-#. i18n: file kmail.kcfg line 103
-#: configuredialog.cpp:2462 rc.cpp:643
+#. i18n: file kmail.kcfg line 105
+#: configuredialog.cpp:2486 rc.cpp:649
 #, fuzzy, no-c-format
 msgid "Enable system tray icon"
 msgstr "hysbysiad cafn cysawd"
 
-#: configuredialog.cpp:2468
+#: configuredialog.cpp:2492
 #, fuzzy
 msgid "System Tray Mode"
 msgstr "Moddau Cafn Cysawd"
 
-#: configuredialog.cpp:2476
+#: configuredialog.cpp:2500
 #, fuzzy
 msgid "Always show KMail in system tray"
 msgstr "&Dangos y cafn cysawd o hyd"
 
-#: configuredialog.cpp:2479
+#: configuredialog.cpp:2503
 msgid "Only show KMail in system tray if there are unread messages"
 msgstr ""
 
-#: configuredialog.cpp:2539 identitydialog.cpp:384
+#: configuredialog.cpp:2563 identitydialog.cpp:408
 #, fuzzy
 msgid "&Templates"
 msgstr "&Amnewid"
 
-#: configuredialog.cpp:2545
+#: configuredialog.cpp:2569
 #, fuzzy
 msgid "&Custom Templates"
 msgstr "&Amnewid"
 
-#: configuredialog.cpp:2551
+#: configuredialog.cpp:2575
 msgid "&Subject"
 msgstr "&Pwnc"
 
-#: configuredialog.cpp:2558
+#: configuredialog.cpp:2582
 msgid "Cha&rset"
 msgstr "&Set Nodau"
 
-#: configuredialog.cpp:2564
+#: configuredialog.cpp:2588
 msgid "H&eaders"
 msgstr "&Penawdau"
 
-#: configuredialog.cpp:2570
+#: configuredialog.cpp:2594
 msgid ""
 "_: Config->Composer->Attachments\n"
 "A&ttachments"
 msgstr "A&todiadau"
 
-#: configuredialog.cpp:2654
+#: configuredialog.cpp:2633
+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:2643
+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:2704
+msgid "Warn if too many recipients are specified"
+msgstr ""
+
+#: configuredialog.cpp:2716
+msgid "Warn if more than this many recipients are specified"
+msgstr ""
+
+#: configuredialog.cpp:2732
 msgid "No autosave"
 msgstr "Dim hunan-gadw"
 
-#: configuredialog.cpp:2661
+#: configuredialog.cpp:2741
+#, fuzzy
+msgid "Default Forwarding Type:"
+msgstr "Parth &rhagosod:"
+
+#: configuredialog.cpp:2744
+#, fuzzy
+msgid "Inline"
+msgstr "&Mewnlin..."
+
+#: configuredialog.cpp:2745
+#, fuzzy
+msgid "As Attachment"
+msgstr "Efo Atodiad"
+
+#: configuredialog.cpp:2753
 #, fuzzy
 msgid "Configure Completion Order"
 msgstr "Ffurfweddu Cylchwedd"
 
-#: configuredialog.cpp:2669 kmlineeditspell.cpp:136
+#: configuredialog.cpp:2761 kmlineeditspell.cpp:159
 msgid "Edit Recent Addresses..."
 msgstr ""
 
-#: configuredialog.cpp:2676 kmedit.cpp:540
+#: configuredialog.cpp:2768 kmedit.cpp:633
 msgid "External Editor"
 msgstr "Golygydd Allanol"
 
-#: configuredialog.cpp:2707
+#: configuredialog.cpp:2799
 #, fuzzy, c-format
 msgid "<b>%f</b> will be replaced with the filename to edit."
 msgstr "Amnewidir <b>%f</b> efo'r enw ffeil i'w olygu."
 
-#: configuredialog.cpp:2817
+#: configuredialog.cpp:2930
 msgid ""
 "<qt>The following placeholders are supported in the reply phrases:"
 "<br><b>%D</b>: date, <b>%S</b>: subject,"
@@ -1918,54 +2170,54 @@ msgstr ""
 "carbon "
 "<br><b>%%</b>: nod canran, <b>%_</b>: gofodnod, <b>%L</b>: llin-dorriad</qt>"
 
-#: configuredialog.cpp:2830
+#: configuredialog.cpp:2943
 msgid "Lang&uage:"
 msgstr "&Iaith:"
 
-#: configuredialog.cpp:2839 configuredialog.cpp:3087 configuredialog.cpp:3303
-#: configuredialog.cpp:3498
+#: configuredialog.cpp:2952 configuredialog.cpp:3200 configuredialog.cpp:3416
+#: configuredialog.cpp:3611
 msgid "Re&move"
 msgstr "G&waredu"
 
-#: configuredialog.cpp:2853
+#: configuredialog.cpp:2966
 msgid "Reply to se&nder:"
 msgstr "Ate&b i'r anfonwr:"
 
-#: configuredialog.cpp:2861
+#: configuredialog.cpp:2974
 msgid "Repl&y to all:"
 msgstr "Ateb i &bawb:"
 
-#: configuredialog.cpp:2869
+#: configuredialog.cpp:2982
 msgid "&Forward:"
 msgstr "B&laenyrru:"
 
 #. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2877 rc.cpp:459
+#: configuredialog.cpp:2990 rc.cpp:465
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr "&Dynodydd dyfynnod:"
 
-#: configuredialog.cpp:2922 kmmessage.cpp:3960
+#: configuredialog.cpp:3035 kmmessage.cpp:4048
 msgid "On %D, you wrote:"
 msgstr "Ar %D, wnaethoch ysgrifennu:"
 
-#: configuredialog.cpp:2923 kmmessage.cpp:3962
+#: configuredialog.cpp:3036 kmmessage.cpp:4050
 msgid "On %D, %F wrote:"
 msgstr "Ar %D, ysgrifennodd %F:"
 
-#: configuredialog.cpp:2924 kmmessage.cpp:3964
+#: configuredialog.cpp:3037 kmmessage.cpp:4052
 msgid "Forwarded Message"
 msgstr "Neges a Flaenyrrwyd"
 
-#: configuredialog.cpp:2925
+#: configuredialog.cpp:3038
 msgid ">%_"
 msgstr ">%_"
 
-#: configuredialog.cpp:3074
+#: configuredialog.cpp:3187
 msgid "Repl&y Subject Prefixes"
 msgstr "Rhagddodiadau ar gyfer P&wnc yr Ateb"
 
-#: configuredialog.cpp:3078 configuredialog.cpp:3107
+#: configuredialog.cpp:3191 configuredialog.cpp:3220
 msgid ""
 "Recognize any sequence of the following prefixes\n"
 "(entries are case-insensitive regular expressions):"
@@ -1974,23 +2226,23 @@ msgstr ""
 " (mae'r cofnodion yn fynegiadau rheolaidd efo llythrennau mawr/bach dim o "
 "bwys):"
 
-#: configuredialog.cpp:3088 configuredialog.cpp:3499
+#: configuredialog.cpp:3201 configuredialog.cpp:3612
 msgid "Mod&ify..."
 msgstr "A&ddasu..."
 
-#: configuredialog.cpp:3089
+#: configuredialog.cpp:3202
 msgid "Enter new reply prefix:"
 msgstr "Mewnodosd rhagddodiad ateb newydd:"
 
-#: configuredialog.cpp:3103
+#: configuredialog.cpp:3216
 msgid "For&ward Subject Prefixes"
 msgstr "Rha&gddodiadau ar gyfer Pwnc y Blaenyrriad"
 
-#: configuredialog.cpp:3117
+#: configuredialog.cpp:3230
 msgid "Enter new forward prefix:"
 msgstr "Mewnodosd rhagddodiad blaenyrriad newydd:"
 
-#: configuredialog.cpp:3156
+#: configuredialog.cpp:3269
 msgid ""
 "This list is checked for every outgoing message from the top to the bottom for "
 "a charset that contains all required characters."
@@ -1998,58 +2250,58 @@ msgstr ""
 "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:3165
+#: configuredialog.cpp:3278
 msgid "Enter charset:"
 msgstr "Mewnosod set nodau:"
 
-#: configuredialog.cpp:3171
+#: configuredialog.cpp:3284
 #, fuzzy
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr "&Cadw'r set nodau gwreiddiol wrth ateb neu flaenyrru (os yn bosibl)."
 
-#: configuredialog.cpp:3205
+#: configuredialog.cpp:3318
 msgid "This charset is not supported."
 msgstr "Ni chynhelir y set nodau yma."
 
-#: configuredialog.cpp:3256
+#: configuredialog.cpp:3369
 msgid "&Use custom message-id suffix"
 msgstr "&Defnyddio ôlddodiad dynodiad neges addasiedig."
 
-#: configuredialog.cpp:3269
+#: configuredialog.cpp:3382
 msgid "Custom message-&id suffix:"
 msgstr "Ôlddodiad dynodiad n&eges addasiedig:"
 
-#: configuredialog.cpp:3283
+#: configuredialog.cpp:3396
 msgid "Define custom mime header fields:"
 msgstr "Diffinio meyseydd pennawd mime addasiedig"
 
-#: configuredialog.cpp:3291
+#: configuredialog.cpp:3404
 msgid "Value"
 msgstr "Gwerth"
 
-#: configuredialog.cpp:3299
+#: configuredialog.cpp:3412
 msgid "Ne&w"
 msgstr "Ne&wydd"
 
 #. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3312 kmfolderdia.cpp:268 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:76 rc.cpp:224
-#: rc.cpp:399
+#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
+#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
+#: rc.cpp:405
 #, no-c-format
 msgid "&Name:"
 msgstr "&Enw:"
 
-#: configuredialog.cpp:3321
+#: configuredialog.cpp:3434
 msgid "&Value:"
 msgstr "&Gwerth:"
 
-#. i18n: file kmail.kcfg line 359
-#: configuredialog.cpp:3468 rc.cpp:782
+#. i18n: file kmail.kcfg line 389
+#: configuredialog.cpp:3581 rc.cpp:807
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr ""
 
-#: configuredialog.cpp:3471
+#: configuredialog.cpp:3584
 #, fuzzy
 msgid ""
 "Turn this option on to make Outlook(tm) understand attachment names containing "
@@ -2058,29 +2310,29 @@ msgstr ""
 "Cynnau'r dewisiad yma er mwyn gwneud i Outlook(tm) ddeall eich atebion i "
 "wahoddiadau"
 
-#: configuredialog.cpp:3482
+#: configuredialog.cpp:3595
 msgid "E&nable detection of missing attachments"
 msgstr "G&alluogi darganfod atodiadau colledig"
 
-#: configuredialog.cpp:3489
+#: configuredialog.cpp:3602
 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:3500
+#: configuredialog.cpp:3613
 msgid "Enter new key word:"
 msgstr "Rhowch allweddair newydd:"
 
-#: configuredialog.cpp:3521 configuredialog.cpp:3522 kmcomposewin.cpp:2232
-#: kmcomposewin.cpp:2233
+#: configuredialog.cpp:3634 configuredialog.cpp:3635 kmcomposewin.cpp:2297
+#: kmcomposewin.cpp:2298
 msgid "attachment"
 msgstr "atodiad"
 
-#: configuredialog.cpp:3523 configuredialog.cpp:3524 kmcomposewin.cpp:2234
-#: kmcomposewin.cpp:2235
+#: configuredialog.cpp:3636 configuredialog.cpp:3637 kmcomposewin.cpp:2299
+#: kmcomposewin.cpp:2300
 msgid "attached"
 msgstr "atodedig"
 
-#: configuredialog.cpp:3542
+#: configuredialog.cpp:3655
 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 not "
@@ -2091,30 +2343,30 @@ msgid ""
 "option."
 msgstr ""
 
-#: configuredialog.cpp:3569
+#: configuredialog.cpp:3682
 #, fuzzy
 msgid "&Reading"
 msgstr "&Anfon"
 
-#: configuredialog.cpp:3575
+#: configuredialog.cpp:3688
 #, fuzzy
 msgid "Composing"
 msgstr "Cyfansoddydd"
 
-#: configuredialog.cpp:3581
+#: configuredialog.cpp:3694
 msgid "Warnings"
 msgstr "Rhybuddion"
 
-#: configuredialog.cpp:3587
+#: configuredialog.cpp:3700
 msgid "S/MIME &Validation"
 msgstr ""
 
-#: configuredialog.cpp:3593
+#: configuredialog.cpp:3706
 #, fuzzy
 msgid "Crypto Backe&nds"
 msgstr "Ategion &Cêl"
 
-#: configuredialog.cpp:3624
+#: configuredialog.cpp:3737
 msgid ""
 "<qt>"
 "<p>Messages sometimes come in both formats. This option controls whether you "
@@ -2147,7 +2399,7 @@ msgstr ""
 "<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>"
 
-#: configuredialog.cpp:3641
+#: configuredialog.cpp:3754
 msgid ""
 "<qt>"
 "<p>Some mail advertisements are in HTML and contain references to, for example, "
@@ -2173,7 +2425,7 @@ msgstr ""
 "wedi'u atodi iddi, gallwch alluogi'r dewisiad yma, ond dylech chi fod yn "
 "ymwybodol o'r problem posibl.</p></qt>"
 
-#: configuredialog.cpp:3654
+#: configuredialog.cpp:3767
 msgid ""
 "<qt>"
 "<h3>Message Disposition Notification Policy</h3>"
@@ -2226,19 +2478,19 @@ msgstr ""
 "gan ei fod yn gwneud llawer o synnwyr ar gyfer e.e. rheoli'r berthynas efo "
 "cwsmeriaid.</li></ul></qt>"
 
-#: configuredialog.cpp:3687
+#: configuredialog.cpp:3800
 msgid "HTML Messages"
 msgstr "Negeseuon HTML"
 
-#: configuredialog.cpp:3690
+#: configuredialog.cpp:3803
 msgid "Prefer H&TML to plain text"
 msgstr "Hoffter yw H&TML yn lle testun plaen"
 
-#: configuredialog.cpp:3694
+#: configuredialog.cpp:3807
 msgid "Allow messages to load e&xternal references from the Internet"
 msgstr "&Caniatáu i negeseuon lwytho cyfeirnodau allanol o'r Ryngrwyd"
 
-#: configuredialog.cpp:3699
+#: configuredialog.cpp:3812
 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 "
@@ -2250,62 +2502,62 @@ msgstr ""
 "href=\"whatsthis:%1\">Mwy am ebostau HTML...</a> <a href=\"whatsthis:%2\">"
 "Mwy am cyfeiriadau allanol...</a>"
 
-#: configuredialog.cpp:3711
+#: configuredialog.cpp:3824
 #, fuzzy
 msgid "Encrypted Messages"
 msgstr "Neges wedi'i chêl-ysgrifo"
 
-#: configuredialog.cpp:3713
+#: configuredialog.cpp:3826
 #, fuzzy
 msgid "Attempt decryption of encrypted messages when viewing"
 msgstr "Cêl-ysgrifennu negeseuon yn ymysgogol lle &bo'n bosibl."
 
-#: configuredialog.cpp:3718
+#: configuredialog.cpp:3831
 msgid "Message Disposition Notifications"
 msgstr "Hysbysiadau Lleoliad Neges"
 
-#: configuredialog.cpp:3730
+#: configuredialog.cpp:3843
 msgid "Send policy:"
 msgstr "Polisi anfon:"
 
-#: configuredialog.cpp:3732 kmmessage.cpp:1361 kmmessage.cpp:1368
+#: configuredialog.cpp:3845 kmmessage.cpp:1381 kmmessage.cpp:1388
 msgid "&Ignore"
 msgstr "&Anwybyddu"
 
-#: configuredialog.cpp:3735
+#: configuredialog.cpp:3848
 msgid "As&k"
 msgstr "Go&fyn"
 
-#: configuredialog.cpp:3738
+#: configuredialog.cpp:3851
 msgid "&Deny"
 msgstr "Gwa&hardd"
 
-#: configuredialog.cpp:3741
+#: configuredialog.cpp:3854
 msgid "Al&ways send"
 msgstr "Anf&on o hyd"
 
-#: configuredialog.cpp:3759
+#: configuredialog.cpp:3872
 msgid "Quote original message:"
 msgstr "Dyfynnu'r neges wreiddiol"
 
-#: configuredialog.cpp:3761
+#: configuredialog.cpp:3874
 msgid "Nothin&g"
 msgstr "Dim by&d"
 
-#: configuredialog.cpp:3764
+#: configuredialog.cpp:3877
 msgid "&Full message"
 msgstr "Ne&ges gyfan"
 
-#: configuredialog.cpp:3767
+#: configuredialog.cpp:3880
 msgid "Onl&y headers"
 msgstr "Penawdau yn &unig"
 
-#: configuredialog.cpp:3773
+#: configuredialog.cpp:3886
 #, fuzzy
 msgid "Do not send MDNs in response to encrypted messages"
 msgstr "Rhy&buddio wrth geisio anfon negeseuon heb eu cêl-ysgrifo"
 
-#: configuredialog.cpp:3777
+#: configuredialog.cpp:3890
 msgid ""
 "<b>WARNING:</b> Unconditionally returning confirmations undermines your "
 "privacy. <a href=\"whatsthis:%1\">More...</a>"
@@ -2313,55 +2565,55 @@ msgstr ""
 "<b>RHYBUDD:</b> Bydd dychwelyd cadarnhadau yn ddiamod yn tanseilio eich "
 "preifatrwydd. <a href=\"whatsthis:%1\">Mwy...</a>"
 
-#: configuredialog.cpp:3786
+#: configuredialog.cpp:3899
 #, fuzzy
 msgid "Certificate && Key Bundle Attachments"
 msgstr "Rheoli Tystysgrifau"
 
-#: configuredialog.cpp:3789
+#: configuredialog.cpp:3902
 #, fuzzy
 msgid "Automatically import keys and certificates"
 msgstr "Atodi llo&fnod yn ymysgogol"
 
-#: configuredialog.cpp:3850
+#: configuredialog.cpp:3963
 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:4138
+#: configuredialog.cpp:4251
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4247 rc.cpp:347
+#: configuredialog.cpp:4360 rc.cpp:353
 #, no-c-format
 msgid "no proxy"
 msgstr ""
 
-#: configuredialog.cpp:4248
+#: configuredialog.cpp:4361
 msgid "(Current system setting: %1)"
 msgstr ""
 
-#: configuredialog.cpp:4425
+#: configuredialog.cpp:4538
 msgid "&Folders"
 msgstr "&Plygyll"
 
-#: configuredialog.cpp:4428
+#: configuredialog.cpp:4541
 msgid "&Groupware"
 msgstr "&Cylchwedd"
 
-#: configuredialog.cpp:4449
+#: configuredialog.cpp:4562
 msgid ""
 "_: Corresponds to Folder->Move All Messages to Trash\n"
 "Ask for co&nfirmation before moving all messages to trash"
 msgstr "Gofyn am gada&rnhad cyn symud pob neges i'r sbwriel"
 
-#: configuredialog.cpp:4456
+#: configuredialog.cpp:4569
 msgid "E&xclude important messages from expiry"
 msgstr ""
 
-#: configuredialog.cpp:4467
+#: configuredialog.cpp:4580
 #, fuzzy
 msgid ""
 "_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
@@ -2369,84 +2621,98 @@ msgid ""
 "When trying to find unread messages:"
 msgstr "Wrth geisio canfod negeseuon nas darllenwyd:"
 
-#: configuredialog.cpp:4470
+#: configuredialog.cpp:4583
 #, fuzzy
 msgid ""
 "_: continuation of \"When trying to find unread messages:\"\n"
 "Do not Loop"
 msgstr "Peidio â Dolennu"
 
-#: configuredialog.cpp:4472
+#: configuredialog.cpp:4585
 msgid ""
 "_: continuation of \"When trying to find unread messages:\"\n"
 "Loop in Current Folder"
 msgstr "Dolennu yn y Blygell Gyfredol"
 
-#: configuredialog.cpp:4474
+#: configuredialog.cpp:4587
 msgid ""
 "_: continuation of \"When trying to find unread messages:\"\n"
 "Loop in All Folders"
 msgstr "Dolennu mewn Pob Plygell"
 
-#: configuredialog.cpp:4487
+#: configuredialog.cpp:4600
 msgid ""
 "_: to be continued with \"jump to first new message\", \"jump to first unread "
 "or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr ""
 
-#: configuredialog.cpp:4490
+#: configuredialog.cpp:4603
 #, fuzzy
 msgid ""
 "_: continuation of \"When entering a folder:\"\n"
 "Jump to First New Message"
 msgstr "Peidio â Dolennu"
 
-#: configuredialog.cpp:4492
+#: configuredialog.cpp:4605
 #, fuzzy
 msgid ""
 "_: continuation of \"When entering a folder:\"\n"
 "Jump to First Unread or New Message"
 msgstr "Peidio â Dolennu"
 
-#: configuredialog.cpp:4494
+#: configuredialog.cpp:4607
 #, fuzzy
 msgid ""
 "_: continuation of \"When entering a folder:\"\n"
 "Jump to Last Selected Message"
 msgstr "Peidio â Dolennu"
 
-#: configuredialog.cpp:4501
+#: configuredialog.cpp:4609
+#, fuzzy
+msgid ""
+"_: continuation of \"When entering a folder:\"\n"
+"Jump to Newest Message"
+msgstr "Peidio â Dolennu"
+
+#: configuredialog.cpp:4611
+#, fuzzy
+msgid ""
+"_: continuation of \"When entering a folder:\"\n"
+"Jump to Oldest Message"
+msgstr "Peidio â Dolennu"
+
+#: configuredialog.cpp:4618
 msgid "Mar&k selected message as read after"
 msgstr "No&di'r neges benodol fel darllenedig ar ôl"
 
-#: configuredialog.cpp:4505
+#: configuredialog.cpp:4622
 msgid " sec"
 msgstr "eil"
 
-#: configuredialog.cpp:4518
+#: configuredialog.cpp:4635
 msgid "Ask for action after &dragging messages to another folder"
 msgstr "Gofyn am weithred ar ôl &llusgo negeseuon i blygell arall"
 
-#: configuredialog.cpp:4529
+#: configuredialog.cpp:4646
 msgid ""
 "_: to be continued with \"flat files\" and \"directories\", resp.\n"
 "By default, &message folders on disk are:"
 msgstr "Gan ragosod, mae'r plygyll ne&ges ar ddisg yn:"
 
-#: configuredialog.cpp:4532
+#: configuredialog.cpp:4649
 msgid ""
 "_: continuation of \"By default, &message folders on disk are\"\n"
 "Flat Files (\"mbox\" format)"
 msgstr "Ffeiliau Fflat (fformat \"mbox\")"
 
-#: configuredialog.cpp:4534
+#: configuredialog.cpp:4651
 msgid ""
 "_: continuation of \"By default, &message folders on disk are\"\n"
 "Directories (\"maildir\" format)"
 msgstr "Cyfeiriaduron (fformat \"maildir\")"
 
-#: configuredialog.cpp:4537
+#: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
 "<qt>"
@@ -2471,38 +2737,38 @@ msgstr ""
 "ar y ddisg, ond dylai fod yn fwy gadarn, e.e. wrth symud negeseuon rhwng "
 "plygyll.</p></qt>"
 
-#: configuredialog.cpp:4562
+#: configuredialog.cpp:4679
 msgid "Open this folder on startup:"
 msgstr "Agor y blygell yma wrth gychwyn:"
 
-#: configuredialog.cpp:4570
+#: configuredialog.cpp:4687
 #, fuzzy
 msgid "Empty local &trash folder on program exit"
 msgstr "Gwagu'r &sbwriel"
 
-#: configuredialog.cpp:4578
+#: configuredialog.cpp:4695
 msgid "Enable full text &indexing"
 msgstr ""
 
-#: configuredialog.cpp:4588
+#: configuredialog.cpp:4705
 #, fuzzy
 msgid "Quota units: "
 msgstr "&Dynodydd dyfynnod:"
 
-#: configuredialog.cpp:4590 quotajobs.h:86
+#: configuredialog.cpp:4707 quotajobs.h:86
 msgid "KB"
 msgstr ""
 
-#: configuredialog.cpp:4591 quotajobs.h:91
+#: configuredialog.cpp:4708 quotajobs.h:91
 #, fuzzy
 msgid "MB"
 msgstr "MB"
 
-#: configuredialog.cpp:4592 quotajobs.h:96
+#: configuredialog.cpp:4709 quotajobs.h:96
 msgid "GB"
 msgstr ""
 
-#: configuredialog.cpp:4601
+#: configuredialog.cpp:4718
 #, fuzzy
 msgid ""
 "_: what's this help\n"
@@ -2534,7 +2800,7 @@ msgstr ""
 "chwiliad yn dechrau o waelod y rhestr negeseuon a mynd ymlaen i'r blygell "
 "flaenorol, yn dibynnu ar ba ddewisiad a ddewisir.</p></qt>"
 
-#: configuredialog.cpp:4618
+#: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
 "<qt>"
@@ -2547,112 +2813,112 @@ msgid ""
 "KMail while this operation is running.</p></qt>"
 msgstr ""
 
-#: configuredialog.cpp:4694
+#: configuredialog.cpp:4811
 msgid "&IMAP Resource Folder Options"
 msgstr "Dewisiadau &Plygell Adnodd IMAP"
 
-#: configuredialog.cpp:4698
+#: configuredialog.cpp:4815
 msgid "&Enable IMAP resource functionality"
 msgstr "&Galluogi swyddogaeth adnodd IMAP"
 
-#: configuredialog.cpp:4699
+#: configuredialog.cpp:4816
 msgid "This enables the IMAP storage for the Kontact applications"
 msgstr ""
 
-#: configuredialog.cpp:4712
+#: configuredialog.cpp:4829
 #, fuzzy
 msgid "&Format used for the groupware folders:"
 msgstr "&Iaith ar gyfer plygyll cylchwedd:"
 
-#: configuredialog.cpp:4714
+#: configuredialog.cpp:4831
 msgid ""
 "Choose the format to use to store the contents of the groupware folders."
 msgstr ""
 
-#: configuredialog.cpp:4723
-msgid "Standard (Ical / Vcard)"
+#: configuredialog.cpp:4840
+msgid "Deprecated Kolab1 (iCal/vCard)"
 msgstr ""
 
-#: configuredialog.cpp:4723
-msgid "Kolab (XML)"
+#: configuredialog.cpp:4840
+msgid "Kolab2 (XML)"
 msgstr ""
 
-#: configuredialog.cpp:4731
+#: configuredialog.cpp:4848
 #, fuzzy
 msgid "&Language of the groupware folders:"
 msgstr "&Iaith ar gyfer plygyll cylchwedd:"
 
-#: configuredialog.cpp:4734
+#: configuredialog.cpp:4851
 msgid "Set the language of the folder names"
 msgstr ""
 
-#: configuredialog.cpp:4743
+#: configuredialog.cpp:4860
 msgid "English"
 msgstr "Saesneg"
 
-#: configuredialog.cpp:4743
+#: configuredialog.cpp:4860
 msgid "German"
 msgstr "Almaeneg"
 
-#: configuredialog.cpp:4743
+#: configuredialog.cpp:4860
 msgid "French"
 msgstr "Ffrangeg"
 
-#: configuredialog.cpp:4743
+#: configuredialog.cpp:4860
 msgid "Dutch"
 msgstr "Iseldireg"
 
-#: configuredialog.cpp:4752
+#: configuredialog.cpp:4869
 msgid "Set the parent of the resource folders"
 msgstr ""
 
-#: configuredialog.cpp:4781
+#: configuredialog.cpp:4898
 #, fuzzy
 msgid "&Hide groupware folders"
 msgstr "&Iaith ar gyfer plygyll cylchwedd:"
 
-#: configuredialog.cpp:4785
+#: configuredialog.cpp:4902
 msgid ""
 "When this is checked, you will not see the IMAP resource folders in the folder "
 "tree."
 msgstr ""
 
-#: configuredialog.cpp:4792
+#: configuredialog.cpp:4909
 #, fuzzy
 msgid "&Only show groupware folders for this account"
 msgstr "Mae'r plygyll adnodd yn is-&blygyll o:"
 
-#: configuredialog.cpp:4796
+#: configuredialog.cpp:4913
 msgid ""
 "When this is checked, you will not see normal  mail folders in the folder tree "
 "for the account configured for groupware."
 msgstr ""
 
-#: configuredialog.cpp:4804
+#: configuredialog.cpp:4921
 msgid "Synchronize groupware changes immediately"
 msgstr ""
 
-#: configuredialog.cpp:4806
+#: configuredialog.cpp:4923
 msgid ""
 "Synchronize groupware changes in disconnected IMAP folders immediately when "
 "being online."
 msgstr ""
 
-#: configuredialog.cpp:4818
+#: configuredialog.cpp:4935
 msgid "Groupware Compatibility && Legacy Options"
 msgstr ""
 
-#: configuredialog.cpp:4823
+#: configuredialog.cpp:4940
 msgid "&Enable groupware functionality"
 msgstr "&Galluogi swyddogaeth cylchwedd"
 
-#: configuredialog.cpp:4831
+#: configuredialog.cpp:4948
 #, fuzzy
 msgid "Mangle From:/To: headers in replies to invitations"
 msgstr ""
 "M&odd etifeddiaeth: Llarpio penawdau Oddiwrth:/I: mewn atebion i wahoddiadau"
 
-#: configuredialog.cpp:4832
+#: configuredialog.cpp:4949
 #, fuzzy
 msgid ""
 "Turn this option on in order to make Outlook(tm) understand your answers to "
@@ -2661,11 +2927,11 @@ msgstr ""
 "Cynnau'r dewisiad yma er mwyn gwneud i Outlook(tm) ddeall eich atebion i "
 "wahoddiadau"
 
-#: configuredialog.cpp:4837
+#: configuredialog.cpp:4954
 msgid "Send invitations in the mail body"
 msgstr ""
 
-#: configuredialog.cpp:4838
+#: configuredialog.cpp:4955
 msgid ""
 "Turn this option on in order to make Outlook(tm) understand your answers to "
 "invitations"
@@ -2673,33 +2939,42 @@ msgstr ""
 "Cynnau'r dewisiad yma er mwyn gwneud i Outlook(tm) ddeall eich atebion i "
 "wahoddiadau"
 
-#: configuredialog.cpp:4846
+#: configuredialog.cpp:4963
 msgid "Exchange compatible invitation naming"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 183
-#: configuredialog.cpp:4847 rc.cpp:685
+#: configuredialog.cpp:4964
+msgid ""
+"Outlook(tm), when used in combination with a Microsoft Exchange server,\n"
+"has a problem understanding standards-compliant groupware e-mail.\n"
+"Turn this option on to send groupware invitations and replies in an Exchange "
+"compatible way."
+msgstr ""
+
+#. i18n: file kmail.kcfg line 190
+#: configuredialog.cpp:4970 rc.cpp:694
 #, no-c-format
+msgid "Outlook compatible invitation reply comments"
+msgstr ""
+
+#: configuredialog.cpp:4971
 msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 188
-#: configuredialog.cpp:4853 rc.cpp:688
+#. i18n: file kmail.kcfg line 196
+#: configuredialog.cpp:4977 rc.cpp:700
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr ""
 
-#: configuredialog.cpp:4854
+#: configuredialog.cpp:4978
 msgid ""
 "When this is on, the user will not see the mail composer window. Invitation "
 "mails are sent automatically"
 msgstr ""
 
-#: configuredialog.cpp:4867
+#: configuredialog.cpp:4991
 msgid ""
 "<qt>Invitations are normally sent as attachments to a mail. This switch changes "
 "the invitation mails to be sent in the text of the mail instead; this is "
@@ -2711,17 +2986,17 @@ msgid ""
 "be able to work with this.</qt>"
 msgstr ""
 
-#: configuredialog.cpp:4922
+#: configuredialog.cpp:5048
 #, fuzzy
 msgid "<Choose a Folder>"
 msgstr "Creu Plygell"
 
-#: configuredialog.cpp:5026
+#: configuredialog.cpp:5154
 #, fuzzy
 msgid "&Resource folders are subfolders of:"
 msgstr "Mae'r plygyll adnodd yn is-&blygyll o:"
 
-#: configuredialog.cpp:5029
+#: configuredialog.cpp:5157
 #, fuzzy
 msgid "&Resource folders are in account:"
 msgstr "Mae'r plygyll adnodd yn is-&blygyll o:"
@@ -2790,35 +3065,35 @@ msgid ""
 "Not available"
 msgstr "Dim ar gael"
 
-#: customtemplates.cpp:87
+#: customtemplates.cpp:100
 #, fuzzy
 msgid ""
 "_: Message->\n"
 "Universal"
 msgstr "&Ateb"
 
-#: customtemplates.cpp:88 customtemplates.cpp:131
+#: customtemplates.cpp:101 customtemplates.cpp:180
 #, fuzzy
 msgid ""
 "_: Message->\n"
 "Reply"
 msgstr "&Ateb"
 
-#: customtemplates.cpp:89 customtemplates.cpp:133
+#: customtemplates.cpp:102 customtemplates.cpp:182
 #, fuzzy
 msgid ""
 "_: Message->\n"
 "Reply to All"
 msgstr "&Ateb"
 
-#: customtemplates.cpp:90 customtemplates.cpp:135
+#: customtemplates.cpp:103 customtemplates.cpp:184
 #, fuzzy
 msgid ""
 "_: Message->\n"
 "Forward"
 msgstr "&Blaenyrru"
 
-#: customtemplates.cpp:93
+#: customtemplates.cpp:106
 msgid ""
 "<qt>"
 "<p>Here you can add, edit, and delete custom message templates to use when you "
@@ -2833,66 +3108,88 @@ msgid ""
 "to <i>Universal</i> templates.</p></qt>"
 msgstr ""
 
-#: customtemplates.cpp:107 templatesconfiguration.cpp:105
+#: customtemplates.cpp:120 templatesconfiguration.cpp:105
 msgid "<a href=\"whatsthis:%1\">How does this work?</a>"
 msgstr ""
 
-#: customtemplates.cpp:137
+#: customtemplates.cpp:122
+#, fuzzy
+msgid "Additional recipients of the message when forwarding"
+msgstr "Cêl-ysgrifennu negeseuon yn ymysgogol lle &bo'n bosibl."
+
+#: customtemplates.cpp:123
+msgid "Additional recipients who get a copy of the message when forwarding"
+msgstr ""
+
+#: customtemplates.cpp:124
+msgid ""
+"When using this template for forwarding, the default recipients are those you "
+"enter here. This is a comma-separated list of mail addresses."
+msgstr ""
+
+#: customtemplates.cpp:125
+msgid ""
+"When using this template for forwarding, the recipients you enter here will by "
+"default get a copy of this message. This is a comma-separated list of mail "
+"addresses."
+msgstr ""
+
+#: customtemplates.cpp:186
 #, fuzzy
 msgid ""
 "_: Message->\n"
 "Unknown"
 msgstr "&Blaenyrru"
 
-#: customtemplates.cpp:347 customtemplates.cpp:364
+#: customtemplates.cpp:420 customtemplates.cpp:437
 msgid "Key Conflict"
 msgstr ""
 
-#: customtemplates.cpp:348
+#: customtemplates.cpp:421
 msgid ""
 "The selected shortcut is already used for another custom template, would you "
 "still like to continue with the assignment?"
 msgstr ""
 
-#: customtemplates.cpp:365
+#: customtemplates.cpp:438
 msgid ""
 "The selected shortcut is already used, would you still like to continue with "
 "the assignment?"
 msgstr ""
 
-#: distributionlistdialog.cpp:96
+#: distributionlistdialog.cpp:97
 #, fuzzy
 msgid "Save Distribution List"
 msgstr "Tanysgrifiad"
 
-#: distributionlistdialog.cpp:97
+#: distributionlistdialog.cpp:98
 #, fuzzy
 msgid "Save List"
 msgstr "&Creu Hidlen"
 
-#: distributionlistdialog.cpp:106
+#: distributionlistdialog.cpp:107
 msgid "Name:"
 msgstr "Enw:"
 
-#: distributionlistdialog.cpp:116 recipientspicker.cpp:390
+#: distributionlistdialog.cpp:117 recipientspicker.cpp:390
 msgid "Email"
 msgstr "Ebost"
 
-#: distributionlistdialog.cpp:170
+#: distributionlistdialog.cpp:169
 msgid ""
 "There are no recipients in your list. First select some recipients, then try "
 "again."
 msgstr ""
 
-#: distributionlistdialog.cpp:185
+#: distributionlistdialog.cpp:184
 msgid "New Distribution List"
 msgstr "Rhestr Dosbarthiad Newydd"
 
-#: distributionlistdialog.cpp:186
+#: distributionlistdialog.cpp:185
 msgid "Please enter name:"
 msgstr "Mewnbynnwch enw:"
 
-#: distributionlistdialog.cpp:197
+#: distributionlistdialog.cpp:198
 msgid ""
 "<qt>Distribution list with the given name <b>%1</b> already exists. Please "
 "select a different name.</qt>"
@@ -2900,123 +3197,123 @@ msgstr ""
 "<qt>Mae rhestr ddosbarthu â'r enw <b>%1</b> yn bodoli eisioes. Dewiswch enw "
 "gwahanol.</qt>"
 
-#: editorwatcher.cpp:86
+#: editorwatcher.cpp:76
 #, fuzzy
 msgid "Edit with:"
 msgstr "Golygu Dynodiad"
 
-#: editorwatcher.cpp:169
+#: editorwatcher.cpp:161
 msgid ""
-"KMail is unable to detect when the choosen editor is closed. To avoid data "
-"loss, editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
+"editing the attachment will be aborted."
 msgstr ""
 
-#: editorwatcher.cpp:170
+#: editorwatcher.cpp:163
 #, fuzzy
 msgid "Unable to edit attachment"
 msgstr "atodiad"
 
-#: encodingdetector.cpp:1250 encodingdetector.cpp:1352
+#: encodingdetector.cpp:1170 encodingdetector.cpp:1272
 msgid ""
 "_: @item Text character set\n"
 "Unicode"
 msgstr ""
 
-#: encodingdetector.cpp:1252 encodingdetector.cpp:1322
+#: encodingdetector.cpp:1172 encodingdetector.cpp:1242
 msgid ""
 "_: @item Text character set\n"
 "Cyrillic"
 msgstr ""
 
-#: encodingdetector.cpp:1254 encodingdetector.cpp:1337
+#: encodingdetector.cpp:1174 encodingdetector.cpp:1257
 msgid ""
 "_: @item Text character set\n"
 "Western European"
 msgstr ""
 
-#: encodingdetector.cpp:1256 encodingdetector.cpp:1319
+#: encodingdetector.cpp:1176 encodingdetector.cpp:1239
 msgid ""
 "_: @item Text character set\n"
 "Central European"
 msgstr ""
 
-#: encodingdetector.cpp:1258 encodingdetector.cpp:1325
+#: encodingdetector.cpp:1178 encodingdetector.cpp:1245
 msgid ""
 "_: @item Text character set\n"
 "Greek"
 msgstr ""
 
-#: encodingdetector.cpp:1260 encodingdetector.cpp:1328
+#: encodingdetector.cpp:1180 encodingdetector.cpp:1248
 msgid ""
 "_: @item Text character set\n"
 "Hebrew"
 msgstr ""
 
-#: encodingdetector.cpp:1262 encodingdetector.cpp:1334
+#: encodingdetector.cpp:1182 encodingdetector.cpp:1254
 msgid ""
 "_: @item Text character set\n"
 "Turkish"
 msgstr ""
 
-#: encodingdetector.cpp:1264 encodingdetector.cpp:1331
+#: encodingdetector.cpp:1184 encodingdetector.cpp:1251
 msgid ""
 "_: @item Text character set\n"
 "Japanese"
 msgstr ""
 
-#: encodingdetector.cpp:1266 encodingdetector.cpp:1316
+#: encodingdetector.cpp:1186 encodingdetector.cpp:1236
 msgid ""
 "_: @item Text character set\n"
 "Baltic"
 msgstr ""
 
-#: encodingdetector.cpp:1268 encodingdetector.cpp:1313
+#: encodingdetector.cpp:1188 encodingdetector.cpp:1233
 msgid ""
 "_: @item Text character set\n"
 "Arabic"
 msgstr ""
 
-#: encodingdetector.cpp:1340
+#: encodingdetector.cpp:1260
 msgid ""
 "_: @item Text character set\n"
 "Chinese Traditional"
 msgstr ""
 
-#: encodingdetector.cpp:1343
+#: encodingdetector.cpp:1263
 msgid ""
 "_: @item Text character set\n"
 "Chinese Simplified"
 msgstr ""
 
-#: encodingdetector.cpp:1346
+#: encodingdetector.cpp:1266
 msgid ""
 "_: @item Text character set\n"
 "Korean"
 msgstr ""
 
-#: encodingdetector.cpp:1349
+#: encodingdetector.cpp:1269
 msgid ""
 "_: @item Text character set\n"
 "Thai"
 msgstr ""
 
-#: expirejob.cpp:164
+#: expirejob.cpp:177
 msgid ""
 "_n: Removing 1 old message from folder %1...\n"
 "Removing %n old messages from folder %1..."
 msgstr ""
 
-#: expirejob.cpp:171
+#: expirejob.cpp:184
 msgid "Cannot expire messages from folder %1: destination folder %2 not found"
 msgstr ""
 
-#: expirejob.cpp:186
+#: expirejob.cpp:199
 msgid ""
 "_n: Moving 1 old message from folder %1 to folder %2...\n"
 "Moving %n old messages from folder %1 to folder %2..."
 msgstr ""
 
-#: expirejob.cpp:214
+#: expirejob.cpp:227
 #, fuzzy
 msgid ""
 "_n: Removed 1 old message from folder %1.\n"
@@ -3025,27 +3322,27 @@ msgstr ""
 "Gwaredwyd %n neges ddyblyg.\n"
 "Gwaredwyd %n o negeseuon dyblyg."
 
-#: expirejob.cpp:220
+#: expirejob.cpp:233
 msgid ""
 "_n: Moved 1 old message from folder %1 to folder %2.\n"
 "Moved %n old messages from folder %1 to folder %2."
 msgstr ""
 
-#: expirejob.cpp:227
+#: expirejob.cpp:240
 #, fuzzy
 msgid "Removing old messages from folder %1 failed."
 msgstr "Methwyd symud y negeseuon."
 
-#: expirejob.cpp:231
+#: expirejob.cpp:244
 msgid "Moving old messages from folder %1 to folder %2 failed."
 msgstr ""
 
-#: expirejob.cpp:237
+#: expirejob.cpp:250
 #, fuzzy
 msgid "Removing old messages from folder %1 was canceled."
 msgstr "Diddymwyd symud y negeseuon."
 
-#: expirejob.cpp:241
+#: expirejob.cpp:254
 msgid "Moving old messages from folder %1 to folder %2 was canceled."
 msgstr ""
 
@@ -3088,88 +3385,104 @@ msgid ""
 "Note: Expiry action will be applied immediately after confirming settings."
 msgstr ""
 
-#: expirypropertiesdialog.cpp:163
+#: expirypropertiesdialog.cpp:167
 msgid "Please select a folder to expire messages into."
 msgstr ""
 
-#: expirypropertiesdialog.cpp:164
+#: expirypropertiesdialog.cpp:168
 #, fuzzy
 msgid "No Folder Selected"
 msgstr "R&hestr hir o blygyll"
 
+#: expirypropertiesdialog.cpp:176
+msgid ""
+"Please select a different folder than the current folder to expire message "
+"into."
+msgstr ""
+
+#: expirypropertiesdialog.cpp:178
+#, fuzzy
+msgid "Wrong Folder Selected"
+msgstr "R&hestr hir o blygyll"
+
 #: favoritefolderview.cpp:90
 #, fuzzy
 msgid "Favorite Folders"
 msgstr "Creu Plygell"
 
-#: favoritefolderview.cpp:326
+#: favoritefolderview.cpp:337 kmfoldertree.cpp:1190 kmmainwidget.cpp:2790
+msgid "&Assign Shortcut..."
+msgstr ""
+
+#: favoritefolderview.cpp:338 kmfoldertree.cpp:1195
+msgid "Expire..."
+msgstr "Darfod ..."
+
+#: favoritefolderview.cpp:342
 #, fuzzy
 msgid "Remove From Favorites"
 msgstr "G&waredu Nodau Dyfynnu"
 
-#: favoritefolderview.cpp:328 favoritefolderview.cpp:378
+#: favoritefolderview.cpp:344 favoritefolderview.cpp:389
 #, fuzzy
 msgid "Rename Favorite"
 msgstr "Ailenwi Hidlen"
 
-#: favoritefolderview.cpp:337 kmfoldertree.cpp:1153 kmmainwidget.cpp:2767
-msgid "&Assign Shortcut..."
-msgstr ""
-
-#: favoritefolderview.cpp:338 kmfoldertree.cpp:1158
-msgid "Expire..."
-msgstr "Darfod ..."
-
-#: favoritefolderview.cpp:341
+#: favoritefolderview.cpp:347
 #, fuzzy
 msgid "Add Favorite Folder..."
 msgstr "&Plygell Newydd"
 
-#: favoritefolderview.cpp:395
+#: favoritefolderview.cpp:406
 #, fuzzy
 msgid "Local Inbox"
 msgstr "Blwch Ebost Lleol"
 
-#: favoritefolderview.cpp:397
+#: favoritefolderview.cpp:408
 #, c-format
 msgid "Inbox of %1"
 msgstr ""
 
-#: favoritefolderview.cpp:401
+#: favoritefolderview.cpp:412
 msgid "%1 on %2"
 msgstr ""
 
-#: favoritefolderview.cpp:403
+#: favoritefolderview.cpp:414
 msgid "%1 (local)"
 msgstr ""
 
-#: favoritefolderview.cpp:443
+#: favoritefolderview.cpp:454
 #, fuzzy
 msgid "Add Favorite Folder"
 msgstr "Creu Plygell"
 
-#: filterimporterexporter.cpp:51
+#: filterimporterexporter.cpp:50
 #, fuzzy
 msgid "Select Filters"
 msgstr "Dewis Plygell"
 
-#: filterimporterexporter.cpp:58
+#: filterimporterexporter.cpp:61
 #, fuzzy
 msgid "Filters"
 msgstr "Hidlo %1"
 
-#: filterimporterexporter.cpp:182
+#: filterimporterexporter.cpp:67
+#, fuzzy
+msgid "Unselect All"
+msgstr "Dewis &Pob Neges"
+
+#: filterimporterexporter.cpp:213
 #, fuzzy
 msgid "Import Filters"
 msgstr "Mewnforio vCerdyn wedi Methu"
 
-#: filterimporterexporter.cpp:189
+#: filterimporterexporter.cpp:220
 msgid ""
 "The selected file is not readable. Your file access permissions might be "
 "insufficient."
 msgstr ""
 
-#: filterimporterexporter.cpp:204
+#: filterimporterexporter.cpp:235
 #, fuzzy
 msgid "Export Filters"
 msgstr "Darfod Plygell"
@@ -3240,8 +3553,8 @@ msgid ""
 "\"%2\" is the detailed error description."
 msgstr ""
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2706 kmcommands.cpp:2730
-#: kmmainwidget.cpp:1795 kmmainwidget.cpp:1812 urlhandlermanager.cpp:489
+#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "Gwall KMail"
 
@@ -3287,77 +3600,93 @@ msgid ""
 "account on the server will tell you which one it is."
 msgstr ""
 
-#: folderdiaacltab.cpp:106 folderdiaacltab.cpp:341
+#: folderdiaacltab.cpp:103 recipientseditor.cpp:776
+msgid "Se&lect..."
+msgstr "De&wis..."
+
+#: folderdiaacltab.cpp:106 folderdiaacltab.cpp:340
 msgid "Permissions"
 msgstr "Caniatadau"
 
-#: folderdiaacltab.cpp:247
+#: folderdiaacltab.cpp:118
+msgid "<b>Note: </b>Renaming requires write permissions on the parent folder."
+msgstr ""
+
+#: folderdiaacltab.cpp:245
 msgid "Custom Permissions"
 msgstr ""
 
-#: folderdiaacltab.cpp:249
+#: folderdiaacltab.cpp:247
 msgid "Custom Permissions (%1)"
 msgstr ""
 
-#: folderdiaacltab.cpp:340
+#: folderdiaacltab.cpp:339
 msgid "User Id"
 msgstr "Dynodiad Defnyddiwr"
 
-#: folderdiaacltab.cpp:352
+#: folderdiaacltab.cpp:351
 msgid "Add Entry..."
 msgstr "Ychwanegu cofnod ..."
 
-#: folderdiaacltab.cpp:353
+#: folderdiaacltab.cpp:352
 #, fuzzy
 msgid "Modify Entry..."
 msgstr "Addasu cyfrif"
 
-#: folderdiaacltab.cpp:354
+#: folderdiaacltab.cpp:353
 msgid "Remove Entry"
 msgstr "Diddymu Cofnod"
 
-#: folderdiaacltab.cpp:426
+#: folderdiaacltab.cpp:428
 msgid "Error retrieving user permissions."
 msgstr ""
 
-#: folderdiaacltab.cpp:431
-msgid "Information not retrieved from server yet, please use \"Check Mail\"."
+#: folderdiaacltab.cpp:430
+#, fuzzy
+msgid ""
+"You might not have enough permissions to see the permissions of this folder."
+msgstr "Nid oes gennych ganiatád darllen/ysgrifennu i'ch plygell sbwriel."
+
+#: folderdiaacltab.cpp:435
+msgid ""
+"Information not retrieved from server, you need to use \"Check Mail\" and have "
+"administrative privileges on the folder."
 msgstr ""
 
-#: folderdiaacltab.cpp:446 folderdiaquotatab.cpp:114
+#: folderdiaacltab.cpp:450 folderdiaquotatab.cpp:114
 msgid "Error: no IMAP account defined for this folder"
 msgstr ""
 
-#: folderdiaacltab.cpp:452 folderdiaquotatab.cpp:120
+#: folderdiaacltab.cpp:456 folderdiaquotatab.cpp:120
 msgid "Connecting to server %1, please wait..."
 msgstr ""
 
-#: folderdiaacltab.cpp:470 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:843
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
+#: kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr ""
 
-#: folderdiaacltab.cpp:490 folderdiaacltab.cpp:517
+#: folderdiaacltab.cpp:494 folderdiaacltab.cpp:522
 msgid "This IMAP server does not have support for access control lists (ACL)"
 msgstr ""
 
-#: folderdiaacltab.cpp:519
+#: folderdiaacltab.cpp:524
 #, c-format
 msgid ""
 "Error retrieving access control list (ACL) from server\n"
 "%1"
 msgstr ""
 
-#: folderdiaacltab.cpp:564
+#: folderdiaacltab.cpp:569
 msgid "Modify Permissions"
 msgstr ""
 
-#: folderdiaacltab.cpp:598
+#: folderdiaacltab.cpp:603
 msgid "Add Permissions"
 msgstr ""
 
-#: folderdiaacltab.cpp:631
+#: folderdiaacltab.cpp:636
 msgid ""
 "Do you really want to remove your own permissions for this folder? You will not "
 "be able to access it afterwards."
@@ -3390,8 +3719,8 @@ msgstr ""
 msgid "Select Folder"
 msgstr "Dewis Plygell"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1831 kmfoldermgr.cpp:45
-#: kmfoldertree.cpp:552
+#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "Plygyll Lleol"
 
@@ -3422,7 +3751,7 @@ msgid ""
 "this folder.</qt>"
 msgstr ""
 
-#: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:526 snippetdlg.cpp:93
+#: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:530 snippetdlg.cpp:100
 msgid "The selected shortcut is already used, please select a different one."
 msgstr ""
 
@@ -3438,13 +3767,20 @@ msgstr "&Copïo Yma"
 msgid "C&ancel"
 msgstr "Didd&ymu"
 
-#: headeritem.cpp:157 headeritem.cpp:164
+#: folderutil.cpp:93
+msgid ""
+"<qt>The folder you deleted was associated with the account <b>%1</b> "
+"which delivered mail into it. The folder the account delivers new mail into was "
+"reset to the main Inbox folder.</qt>"
+msgstr ""
+
+#: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
 msgstr "Anhysbys"
 
-#: headeritem.cpp:171 headerstyle.cpp:140 headerstyle.cpp:238
-#: headerstyle.cpp:442 headerstyle.cpp:625 headerstyle.cpp:778
-#: kmmainwidget.cpp:1057
+#: headeritem.cpp:193 headerstyle.cpp:141 headerstyle.cpp:240
+#: headerstyle.cpp:445 headerstyle.cpp:743 headerstyle.cpp:898
+#: kmmainwidget.cpp:1029
 msgid "No Subject"
 msgstr "Dim Pwnc"
 
@@ -3463,48 +3799,48 @@ msgstr ""
 msgid "Stat&us:"
 msgstr "&Cyflwr:"
 
-#: headerlistquicksearch.cpp:72
+#: headerlistquicksearch.cpp:73
 #, fuzzy
 msgid "Any Status"
 msgstr "Cyflwr"
 
-#: headerlistquicksearch.cpp:91
+#: headerlistquicksearch.cpp:93
 #, fuzzy
 msgid "Open Full Search"
 msgstr "<derbynwyr>"
 
-#: headerstyle.cpp:169 headerstyle.cpp:296 headerstyle.cpp:647
-#: headerstyle.cpp:860
+#: headerstyle.cpp:170 headerstyle.cpp:298 headerstyle.cpp:765
+#: headerstyle.cpp:974
 msgid "[vCard]"
 msgstr "[vCerdyn]"
 
-#: headerstyle.cpp:174 headerstyle.cpp:314 headerstyle.cpp:672
-#: headerstyle.cpp:797
+#: headerstyle.cpp:175 headerstyle.cpp:316 headerstyle.cpp:790
+#: headerstyle.cpp:998
 msgid "CC: "
 msgstr "CC:"
 
-#: headerstyle.cpp:177 headerstyle.cpp:318 headerstyle.cpp:679
-#: headerstyle.cpp:800
+#: headerstyle.cpp:178 headerstyle.cpp:320 headerstyle.cpp:797
+#: headerstyle.cpp:1008
 msgid "BCC: "
 msgstr "BCC:"
 
-#: headerstyle.cpp:272 headerstyle.cpp:685
+#: headerstyle.cpp:274 headerstyle.cpp:803
 msgid "Date: "
 msgstr "Dyddiad:"
 
-#: headerstyle.cpp:292 headerstyle.cpp:639 headerstyle.cpp:865
+#: headerstyle.cpp:294 headerstyle.cpp:757 headerstyle.cpp:979
 msgid "From: "
 msgstr "Oddiwrth:"
 
-#: headerstyle.cpp:310 headerstyle.cpp:665 headerstyle.cpp:873
+#: headerstyle.cpp:312 headerstyle.cpp:783 headerstyle.cpp:988
 msgid "To: "
 msgstr "I:"
 
-#: headerstyle.cpp:322
+#: headerstyle.cpp:324
 msgid "Reply to: "
 msgstr "Ateb i:"
 
-#: headerstyle.cpp:408
+#: headerstyle.cpp:410
 msgid ""
 "%1% probability of being spam.\n"
 "\n"
@@ -3512,24 +3848,47 @@ msgid ""
 "%2"
 msgstr ""
 
-#: headerstyle.cpp:609
+#: headerstyle.cpp:612
 msgid "Launch IM"
 msgstr ""
 
-#: headerstyle.cpp:642
+#: headerstyle.cpp:660
+msgid "Night"
+msgstr ""
+
+#: headerstyle.cpp:669
+#, fuzzy
+msgid "Morning"
+msgstr "Rhybuddion"
+
+#: headerstyle.cpp:678
+#, fuzzy
+msgid "Afternoon"
+msgstr "Ar ôl"
+
+#: headerstyle.cpp:687
+msgid "Evening"
+msgstr ""
+
+#: headerstyle.cpp:724
+#, fuzzy
+msgid "Sender's Current Time:"
+msgstr "Dynodiad yr &Anfonwr:"
+
+#: headerstyle.cpp:760
 msgid "(resent from %1)"
 msgstr ""
 
-#: headerstyle.cpp:694
+#: headerstyle.cpp:812
 #, fuzzy
 msgid "User-Agent: "
 msgstr "Ar &Frys"
 
-#: headerstyle.cpp:703
+#: headerstyle.cpp:821
 msgid "X-Mailer: "
 msgstr ""
 
-#: headerstyle.cpp:723
+#: headerstyle.cpp:843
 #, fuzzy
 msgid "Spam Status:"
 msgstr "Cyflwr:"
@@ -3586,15 +3945,15 @@ msgstr ""
 "<br>M"
 "<br>L</qt>"
 
-#: identitydialog.cpp:90
+#: identitydialog.cpp:93
 msgid "Edit Identity"
 msgstr "Golygu Dynodiad"
 
-#: identitydialog.cpp:118
+#: identitydialog.cpp:121
 msgid "&Your name:"
 msgstr "&Eich enw:"
 
-#: identitydialog.cpp:120
+#: identitydialog.cpp:123
 #, fuzzy
 msgid ""
 "<qt>"
@@ -3611,11 +3970,11 @@ msgstr ""
 "<p>Os gadewch hwn yn wag, ni ddengys eich enw go iawn, ond cyfeiriad ebost yn "
 "unig.</p></qt>"
 
-#: identitydialog.cpp:132
+#: identitydialog.cpp:135
 msgid "Organi&zation:"
 msgstr "Mu&diad:"
 
-#: identitydialog.cpp:134
+#: identitydialog.cpp:137
 msgid ""
 "<qt>"
 "<h3>Organization</h3>"
@@ -3629,15 +3988,19 @@ msgstr ""
 "mhenawd yr ebost a anfonir.</p>"
 "<p>Mae'n ddiogel (ac arferol) i adael hwn yn wag.</p></qt>"
 
-#: identitydialog.cpp:147
+#: identitydialog.cpp:149
 msgid "&Email address:"
 msgstr "C&yfeiriad ebost:"
 
-#: identitydialog.cpp:149
+#: identitydialog.cpp:151
+#, fuzzy
 msgid ""
 "<qt>"
 "<h3>Email address</h3>"
-"<p>This field should have your full email address.</p>"
+"<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 ""
@@ -3647,21 +4010,45 @@ msgstr ""
 "<p>Os gadewch hwn yn wag, neu roi un anghywir, bydd pawb yn cael trafferth wrth "
 "ateb i chi.</p></qt>"
 
-#: identitydialog.cpp:161
+#: identitydialog.cpp:165
+#, fuzzy
+msgid "Email a&liases:"
+msgstr "C&yfeiriad ebost:"
+
+#: identitydialog.cpp:167
+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>first@example.org"
+"<br>last@example.org</td></tr></table>"
+"<p>Type one alias address per line.</p></qt>"
+msgstr ""
+
+#: identitydialog.cpp:185
 msgid "Cryptograph&y"
 msgstr "C&êl-ysgrifennaeth"
 
-#: identitydialog.cpp:168 identitydialog.cpp:192 identitydialog.cpp:217
-#: identitydialog.cpp:243
+#: identitydialog.cpp:192 identitydialog.cpp:216 identitydialog.cpp:241
+#: identitydialog.cpp:267
 msgid "Chang&e..."
 msgstr "Ne&wid..."
 
-#: identitydialog.cpp:169
+#: identitydialog.cpp:193
 #, fuzzy
 msgid "Your OpenPGP Signature Key"
 msgstr "Eich Allwedd OpenPGP"
 
-#: identitydialog.cpp:170
+#: identitydialog.cpp:194
 #, fuzzy
 msgid ""
 "Select the OpenPGP key which should be used to digitally sign your messages."
@@ -3669,7 +4056,7 @@ msgstr ""
 "Dewiswch yr allwedd OpenPGP a ddylai ei defnyddio i lofnodi eich negeseuon ac "
 "wrth gêl-ysgrifennu i'ch hunan."
 
-#: identitydialog.cpp:174
+#: identitydialog.cpp:198
 #, fuzzy
 msgid ""
 "<qt>"
@@ -3686,17 +4073,17 @@ msgstr ""
 "gêl-ysgrifol.  Ni fydd effaith ar swyddogaethau ebostio arferol.</p>"
 "Gallwch ddarganfod mwy ynglyn ag allweddau wrth <a>http://www.gnupg.org</a></qt>"
 
-#: identitydialog.cpp:181
+#: identitydialog.cpp:205
 #, fuzzy
 msgid "OpenPGP signing key:"
 msgstr "Allwedd OpenPGP:"
 
-#: identitydialog.cpp:193
+#: identitydialog.cpp:217
 #, fuzzy
 msgid "Your OpenPGP Encryption Key"
 msgstr "Eich Allwedd OpenPGP"
 
-#: identitydialog.cpp:194
+#: identitydialog.cpp:218
 #, fuzzy
 msgid ""
 "Select the OpenPGP key which should be used when encrypting to yourself and for "
@@ -3705,7 +4092,7 @@ msgstr ""
 "Dewiswch yr allwedd OpenPGP a ddylai ei defnyddio i lofnodi eich negeseuon ac "
 "wrth gêl-ysgrifennu i'ch hunan."
 
-#: identitydialog.cpp:199
+#: identitydialog.cpp:223
 #, fuzzy
 msgid ""
 "<qt>"
@@ -3724,17 +4111,17 @@ msgstr ""
 "gêl-ysgrifol.  Ni fydd effaith ar swyddogaethau ebostio arferol.</p>"
 "Gallwch ddarganfod mwy ynglyn ag allweddau wrth <a>http://www.gnupg.org</a></qt>"
 
-#: identitydialog.cpp:206
+#: identitydialog.cpp:230
 #, fuzzy
 msgid "OpenPGP encryption key:"
 msgstr "Allwedd OpenPGP:"
 
-#: identitydialog.cpp:218
+#: identitydialog.cpp:242
 #, fuzzy
 msgid "Your S/MIME Signature Certificate"
 msgstr "Gwall: Ni wiriwyd y llofnod"
 
-#: identitydialog.cpp:219
+#: identitydialog.cpp:243
 #, fuzzy
 msgid ""
 "Select the S/MIME certificate which should be used to digitally sign your "
@@ -3743,7 +4130,7 @@ msgstr ""
 "Dewiswch yr allwedd OpenPGP a ddylai ei defnyddio i lofnodi eich negeseuon ac "
 "wrth gêl-ysgrifennu i'ch hunan."
 
-#: identitydialog.cpp:223
+#: identitydialog.cpp:247
 #, fuzzy
 msgid ""
 "<qt>"
@@ -3759,22 +4146,22 @@ msgstr ""
 "gêl-ysgrifol.  Ni fydd effaith ar swyddogaethau ebostio arferol.</p>"
 "Gallwch ddarganfod mwy ynglyn ag allweddau wrth <a>http://www.gnupg.org</a></qt>"
 
-#: identitydialog.cpp:228
+#: identitydialog.cpp:252
 #, fuzzy
 msgid "S/MIME signing certificate:"
 msgstr "Anfon Tystysgrifau"
 
-#: identitydialog.cpp:244
+#: identitydialog.cpp:268
 msgid "Your S/MIME Encryption Certificate"
 msgstr ""
 
-#: identitydialog.cpp:245
+#: identitydialog.cpp:269
 msgid ""
 "Select the S/MIME certificate which should be used when encrypting to yourself "
 "and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
 
-#: identitydialog.cpp:250
+#: identitydialog.cpp:274
 #, fuzzy
 msgid ""
 "<qt>"
@@ -3791,24 +4178,24 @@ msgstr ""
 "gêl-ysgrifol.  Ni fydd effaith ar swyddogaethau ebostio arferol.</p>"
 "Gallwch ddarganfod mwy ynglyn ag allweddau wrth <a>http://www.gnupg.org</a></qt>"
 
-#: identitydialog.cpp:256
+#: identitydialog.cpp:280
 #, fuzzy
 msgid "S/MIME encryption certificate:"
 msgstr "&Dewis tystysgrif:"
 
-#: identitydialog.cpp:277
+#: identitydialog.cpp:301
 msgid "Preferred crypto message format:"
 msgstr ""
 
-#: identitydialog.cpp:290
+#: identitydialog.cpp:314
 msgid "&Advanced"
 msgstr "&Uwch"
 
-#: identitydialog.cpp:300
+#: identitydialog.cpp:324
 msgid "&Reply-To address:"
 msgstr "&Cyfeiriad Ateb-I:"
 
-#: identitydialog.cpp:302
+#: identitydialog.cpp:326
 msgid ""
 "<qt>"
 "<h3>Reply-To addresses</h3>"
@@ -3829,11 +4216,11 @@ msgstr ""
 "gyfeiriad cylch.</p>"
 "<p>Os mewn amheuaeth, gadewch y maes yma'n wag.</p></qt>"
 
-#: identitydialog.cpp:319
+#: identitydialog.cpp:343
 msgid "&BCC addresses:"
 msgstr "Cyfeiriadau &BCC:"
 
-#: identitydialog.cpp:321
+#: identitydialog.cpp:345
 #, fuzzy
 msgid ""
 "<qt>"
@@ -3854,49 +4241,54 @@ msgstr ""
 "sy'n biau i chi.</p>"
 "<p>Os mewn amheuaeth, gadewch y maes yma'n wag.</p></qt>"
 
-#: identitydialog.cpp:337
+#: identitydialog.cpp:361
 msgid "D&ictionary:"
 msgstr "&Geiriadur:"
 
-#: identitydialog.cpp:346
+#: identitydialog.cpp:370
 msgid "Sent-mail &folder:"
 msgstr "&Plygell ebost a anfonwyd:"
 
-#: identitydialog.cpp:355
+#: identitydialog.cpp:379
 msgid "&Drafts folder:"
 msgstr "Plygell &brasluniau:"
 
-#: identitydialog.cpp:364
+#: identitydialog.cpp:388
 #, fuzzy
 msgid "&Templates folder:"
 msgstr "Plygell S&bwriel:"
 
-#: identitydialog.cpp:369
+#: identitydialog.cpp:393
 msgid "Special &transport:"
 msgstr "Cludiant &arbennig:"
 
-#: identitydialog.cpp:386 kmfolderdia.cpp:717
+#: identitydialog.cpp:410 kmfolderdia.cpp:808
 #, fuzzy
 msgid "&Use custom message templates"
 msgstr "&Defnyddio ôlddodiad dynodiad neges addasiedig."
 
-#: identitydialog.cpp:392 kmfolderdia.cpp:725
+#: identitydialog.cpp:416 kmfolderdia.cpp:816
 msgid "&Copy global templates"
 msgstr ""
 
-#: identitydialog.cpp:407
+#: identitydialog.cpp:431
 msgid "&Signature"
 msgstr "&Llofnod"
 
-#: identitydialog.cpp:411
+#: identitydialog.cpp:435
 msgid "&Picture"
 msgstr "&Llun"
 
-#: identitydialog.cpp:486 identitydialog.cpp:498 kmcomposewin.cpp:4004
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
 msgid "Invalid Email Address"
 msgstr "Cyfeiriad Ebost Annilys"
 
-#: identitydialog.cpp:518
+#: identitydialog.cpp:530
+#, fuzzy
+msgid "Invalid Email Alias \"%1\""
+msgstr "Cyfeiriad Ebost Annilys"
+
+#: identitydialog.cpp:551
 msgid ""
 "One of the configured OpenPGP signing keys does not contain any user ID with "
 "the configured email address for this identity (%1).\n"
@@ -3904,13 +4296,13 @@ msgid ""
 "verify signatures made with this configuration."
 msgstr ""
 
-#: identitydialog.cpp:527
+#: identitydialog.cpp:560
 msgid ""
 "One of the configured OpenPGP encryption keys does not contain any user ID with "
 "the configured email address for this identity (%1)."
 msgstr ""
 
-#: identitydialog.cpp:534
+#: identitydialog.cpp:567
 msgid ""
 "One of the configured S/MIME signing certificates does not contain the "
 "configured email address for this identity (%1).\n"
@@ -3918,27 +4310,27 @@ msgid ""
 "verify signatures made with this configuration."
 msgstr ""
 
-#: identitydialog.cpp:543
+#: identitydialog.cpp:576
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
 "configured email address for this identity (%1)."
 msgstr ""
 
-#: identitydialog.cpp:551
+#: identitydialog.cpp:584
 #, fuzzy
 msgid "Email Address Not Found in Key/Certificates"
 msgstr "Cy&feiriad ebost y CA sy'n cyhoeddi tystysgrifau:"
 
-#: identitydialog.cpp:562
+#: identitydialog.cpp:595
 #, fuzzy
 msgid "The signature file is not valid"
 msgstr "Mae'r llofnod wedi darfod."
 
-#: identitydialog.cpp:582
+#: identitydialog.cpp:615
 msgid "Edit Identity \"%1\""
 msgstr "Golygu Dynodiad \"%1\""
 
-#: identitydialog.cpp:606
+#: identitydialog.cpp:640
 #, fuzzy
 msgid ""
 "The custom sent-mail folder for identity \"%1\" does not exist (anymore); "
@@ -3947,7 +4339,7 @@ msgstr ""
 "Nid yw'r blygell addasiedig ebost anfonedig ar gyfer dynodiad \"%1\" mewn "
 "bodolaeth (dim mwy).  Felly defnyddir y blygell ragosod ebost anfonedig."
 
-#: identitydialog.cpp:617
+#: identitydialog.cpp:651
 #, fuzzy
 msgid ""
 "The custom drafts folder for identity \"%1\" does not exist (anymore); "
@@ -3956,7 +4348,7 @@ msgstr ""
 "Nid yw'r blygell addasiedig drafftiau ar gyfer dynodiad \"%1\" mewn bodolaeth "
 "(dim mwy).  Felly defnyddir y blygell ragosod drafftiau."
 
-#: identitydialog.cpp:628
+#: identitydialog.cpp:662
 #, fuzzy
 msgid ""
 "The custom templates folder for identity \"%1\" does not exist (anymore); "
@@ -3980,119 +4372,119 @@ msgstr "Enw Dynodiad"
 msgid "Email Address"
 msgstr "Cyfeiriad Ebost"
 
-#: imapaccountbase.cpp:291 popaccount.cpp:154
+#: imapaccountbase.cpp:293 popaccount.cpp:154
 msgid "You need to supply a username and a password to access this mailbox."
 msgstr ""
 "Rhaid i chi ddarparu defnydd-enw a chyfrinair i gyrchu'r blwch ebost yma."
 
-#: imapaccountbase.cpp:296
+#: imapaccountbase.cpp:298
 msgid "Authorization Dialog"
 msgstr "Ymgom Awdurdodi"
 
-#: imapaccountbase.cpp:297 popaccount.cpp:155
+#: imapaccountbase.cpp:299 popaccount.cpp:155
 msgid "Account:"
 msgstr "Cyfrif:"
 
-#: imapaccountbase.cpp:318
+#: imapaccountbase.cpp:320
 #, c-format
 msgid "Could not start process for %1."
 msgstr "Methu cychwyn proses ar gyfer %1."
 
-#: imapaccountbase.cpp:399
+#: imapaccountbase.cpp:403
 #, fuzzy
 msgid "Error while trying to subscribe to %1:"
 msgstr ""
 "Gwall wrth ysgrifennu'r ffeil:\n"
 " %1"
 
-#: imapaccountbase.cpp:637
+#: imapaccountbase.cpp:645
 #, fuzzy
 msgid "Retrieving Namespaces"
 msgstr "Nôl y rhestr negeseuon"
 
-#: imapaccountbase.cpp:728
+#: imapaccountbase.cpp:736
 msgid ""
 "KMail has detected a prefix entry in the configuration of the account \"%1\" "
 "which is obsolete with the support of IMAP namespaces."
 msgstr ""
 
-#: imapaccountbase.cpp:742 imapaccountbase.cpp:756
+#: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
 "The configuration was automatically migrated but you should check your account "
 "configuration."
 msgstr ""
 
-#: imapaccountbase.cpp:760
+#: imapaccountbase.cpp:768
 msgid ""
 "It was not possible to migrate your configuration automatically so please check "
 "your account configuration."
 msgstr ""
 
-#: imapaccountbase.cpp:874 imapaccountbase.cpp:875
+#: imapaccountbase.cpp:882 imapaccountbase.cpp:883
 msgid "<unknown>"
 msgstr "<anhysbys>"
 
-#: imapaccountbase.cpp:876
+#: imapaccountbase.cpp:884
 msgid "Error while uploading message"
 msgstr "Gwall wrth lanlwytho'r neges"
 
-#: imapaccountbase.cpp:878
+#: imapaccountbase.cpp:886
 #, fuzzy
 msgid ""
 "Could not upload the message dated %1 from <i>%2</i> with subject <i>%3</i> "
 "to the server."
 msgstr "Methu lanlwytho'r neges %1 ar y gweinydd o blygell %2 efo URL %3."
 
-#: imapaccountbase.cpp:880
+#: imapaccountbase.cpp:888
 #, fuzzy
 msgid "The destination folder was: <b>%1</b>."
 msgstr "Plygell cyrchfan: "
 
-#: imapaccountbase.cpp:882
+#: imapaccountbase.cpp:890
 msgid "The server reported:"
 msgstr ""
 
-#: imapaccountbase.cpp:892
+#: imapaccountbase.cpp:900
 #, fuzzy
 msgid "No detailed quota information available."
 msgstr "Dim data cyflwr ar gael."
 
-#: imapaccountbase.cpp:903
+#: imapaccountbase.cpp:911
 msgid "The folder is too close to its quota limit. (%1)"
 msgstr ""
 
-#: imapaccountbase.cpp:905
+#: imapaccountbase.cpp:913
 msgid ""
 "\n"
 "Since you do not have write privileges on this folder, please ask the owner of "
 "the folder to free up some space in it."
 msgstr ""
 
-#: imapaccountbase.cpp:951
+#: imapaccountbase.cpp:959
 msgid ""
 "The connection to the server %1 was unexpectedly closed or timed out. It will "
 "be re-established automatically if possible."
 msgstr ""
 
-#: imapaccountbase.cpp:957
+#: imapaccountbase.cpp:965
 msgid "The connection to account %1 was broken."
 msgstr ""
 
-#: imapaccountbase.cpp:960
+#: imapaccountbase.cpp:968
 msgid "The connection to account %1 timed out."
 msgstr ""
 
-#: imapaccountbase.cpp:1245
+#: imapaccountbase.cpp:1253
 #, fuzzy
 msgid "Error while uploading status of messages to server: "
 msgstr "Gwall wrth lanlwytho'r neges"
 
-#: imapaccountbase.cpp:1290 listjob.cpp:118
+#: imapaccountbase.cpp:1298 listjob.cpp:118
 #, fuzzy
 msgid "retrieving folders"
 msgstr "Nôl rhestr plygyll"
 
-#: imapjob.cpp:153 kmfolderimap.cpp:496
+#: imapjob.cpp:153 kmfolderimap.cpp:490
 #, fuzzy
 msgid "Uploading message data"
 msgstr "Lanlwytho negeseuon i'r gweinydd"
@@ -4122,49 +4514,292 @@ msgstr "Rhestr Negeseuon"
 msgid "Error while retrieving messages from the server."
 msgstr "Dim negeseuon newydd o'r gweinydd"
 
-#: imapjob.cpp:483
+#: imapjob.cpp:485
 msgid "Error while retrieving information on the structure of a message."
 msgstr ""
 
-#: imapjob.cpp:541
+#: imapjob.cpp:543
 #, fuzzy
 msgid "Uploading message data failed."
 msgstr "Lanlwytho negeseuon i'r gweinydd"
 
-#: imapjob.cpp:546
+#: imapjob.cpp:548
 #, fuzzy
 msgid "Uploading message data completed."
 msgstr "Lanlwytho negeseuon i'r gweinydd"
 
-#: imapjob.cpp:650
+#: imapjob.cpp:652
 #, fuzzy
 msgid "Error while copying messages."
 msgstr "Gwall wrth lanlwytho'r neges"
 
-#: keyresolver.cpp:234
+#: importarchivedialog.cpp:36
+#, fuzzy
+msgid "Import Archive"
+msgstr "Mewnforio vCerdyn wedi Methu"
+
+#: importarchivedialog.cpp:87
+msgid "Please select an archive file that should be imported."
+msgstr ""
+
+#: importarchivedialog.cpp:88
+#, fuzzy
+msgid "No archive file selected"
+msgstr "R&hestr hir o blygyll"
+
+#: importarchivedialog.cpp:93
+msgid "Please select the folder where the archive should be imported to."
+msgstr ""
+
+#: importarchivedialog.cpp:94
+#, fuzzy
+msgid "No target folder selected"
+msgstr "R&hestr hir o blygyll"
+
+#: importjob.cpp:80
+msgid "Importing the archive file '%1' into the folder '%2' succeeded."
+msgstr ""
+
+#: importjob.cpp:82
+#, fuzzy, c-format
+msgid ""
+"_n: 1 message was imported.\n"
+"%n messages were imported."
+msgstr ""
+"%n neges wedi'i phrosesu\n"
+"%n o negeseuon wedi'u prosesu"
+
+#: importjob.cpp:83
+#, fuzzy
+msgid "Import finished."
+msgstr "Mewnforio vCerdyn wedi Methu"
+
+#: importjob.cpp:98
+#, fuzzy
+msgid "Failed to import the archive into folder '%1'."
+msgstr "Methwyd creu plygell"
+
+#: importjob.cpp:105
+#, fuzzy
+msgid "Importing archive failed."
+msgstr "Diweddaru ffeil celc"
+
+#: importjob.cpp:114 importjob.cpp:287
+#, fuzzy
+msgid "Unable to create subfolder for folder '%1'."
+msgstr "Methwyd creu plygell"
+
+#: importjob.cpp:214
+#, fuzzy, c-format
+msgid "Importing folder %1"
+msgstr "Atgoffydd"
+
+#: importjob.cpp:234
+#, fuzzy
+msgid "Failed to add a message to the folder '%1'."
+msgstr "Methu ychwanegu neges i'r blygell: "
+
+#: importjob.cpp:254
+#, fuzzy
+msgid "Failed to upload a message to the IMAP server."
+msgstr "Dileu negeseuon a waredwyd o'r gelc"
+
+#: importjob.cpp:337
+msgid "Unexpected subdirectory named '%1'."
+msgstr ""
+
+#: importjob.cpp:371
+msgid "The file '%1' does not appear to be a valid archive."
+msgstr ""
+
+#: importjob.cpp:376
+msgid "Unable to open archive file '%1'"
+msgstr ""
+
+#: importjob.cpp:382
+msgid "Importing Archive"
+msgstr ""
+
+#: keyresolver.cpp:306
 msgid ""
 "One or more of your configured OpenPGP encryption keys or S/MIME certificates "
 "is not fully trusted for encryption."
 msgstr ""
 
-#: keyresolver.cpp:240
+#: keyresolver.cpp:309
+msgid ""
+"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
+"\"%1\" is not fully trusted for encryption."
+msgstr ""
+
+#: keyresolver.cpp:315
 msgid ""
 "\n"
 "The following keys are only marginally trusted: \n"
 msgstr ""
 
-#: keyresolver.cpp:244
+#: keyresolver.cpp:319
 msgid ""
 "\n"
 "The following keys or certificates have unknown trust level: \n"
 msgstr ""
 
-#: keyresolver.cpp:248
+#: keyresolver.cpp:323
+msgid ""
+"\n"
+"The following keys or certificates are <b>revoked</b>: \n"
+msgstr ""
+
+#: keyresolver.cpp:327
 #, fuzzy
 msgid "Not Fully Trusted Encryption Keys"
 msgstr "Allwedd Gêl-ysgrifo Anniffiniedig"
 
-#: keyresolver.cpp:553
+#: keyresolver.cpp:642
+msgid ""
+"_n: "
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
+"<p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
+"<p>expired %n days ago.</p>"
+msgstr ""
+
+#: keyresolver.cpp:647
+msgid ""
+"_n: "
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
+"<p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
+"<p>expired %n days ago.</p>"
+msgstr ""
+
+#: keyresolver.cpp:652
+msgid ""
+"_n: "
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
+"<p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
+"<p>expired %n days ago.</p>"
+msgstr ""
+
+#: keyresolver.cpp:662
+msgid ""
+"_n: "
+"<p>The root certificate</p><p align=center><b>%3</b></p>"
+"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p>"
+"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired %n days ago.</p>"
+msgstr ""
+
+#: keyresolver.cpp:669
+msgid ""
+"_n: "
+"<p>The root certificate</p><p align=center><b>%3</b></p>"
+"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p>"
+"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired %n days ago.</p>"
+msgstr ""
+
+#: keyresolver.cpp:676
+msgid ""
+"_n: "
+"<p>The root certificate</p><p align=center><b>%3</b></p>"
+"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
+"<p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p>"
+"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
+"<p>expired %n days ago.</p>"
+msgstr ""
+
+#: keyresolver.cpp:684
+msgid ""
+"_n: "
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
+"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
+"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired %n days ago.</p>"
+msgstr ""
+
+#: keyresolver.cpp:691
+msgid ""
+"_n: "
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
+"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
+"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired %n days ago.</p>"
+msgstr ""
+
+#: keyresolver.cpp:698
+msgid ""
+"_n: "
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
+"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
+"<p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
+"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
+"<p>expired %n days ago.</p>"
+msgstr ""
+
+#: keyresolver.cpp:707
+msgid ""
+"_n: "
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired %n days ago.</p>"
+msgstr ""
+
+#: keyresolver.cpp:712
+msgid ""
+"_n: "
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired %n days ago.</p>"
+msgstr ""
+
+#: keyresolver.cpp:717
+msgid ""
+"_n: "
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired %n days ago.</p>"
+msgstr ""
+
+#: keyresolver.cpp:724
+#, fuzzy
+msgid "OpenPGP Key Expired"
+msgstr "Allwedd OpenPGP 0x%1"
+
+#: keyresolver.cpp:725
+#, fuzzy
+msgid "S/MIME Certificate Expired"
+msgstr "Dewin Tystygrif"
+
+#: keyresolver.cpp:750
 msgid ""
 "_n: "
 "<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
@@ -4173,7 +4808,7 @@ msgid ""
 "<p>expires in less than %n days.</p>"
 msgstr ""
 
-#: keyresolver.cpp:558
+#: keyresolver.cpp:755
 msgid ""
 "_n: "
 "<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
@@ -4182,7 +4817,7 @@ msgid ""
 "<p>expires in less than %n days.</p>"
 msgstr ""
 
-#: keyresolver.cpp:563
+#: keyresolver.cpp:760
 msgid ""
 "_n: "
 "<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
@@ -4191,7 +4826,7 @@ msgid ""
 "<p>expires in less than %n days.</p>"
 msgstr ""
 
-#: keyresolver.cpp:573
+#: keyresolver.cpp:770
 msgid ""
 "_n: "
 "<p>The root certificate</p><p align=center><b>%3</b></p>"
@@ -4204,7 +4839,7 @@ msgid ""
 "<p>expires in less than %n days.</p>"
 msgstr ""
 
-#: keyresolver.cpp:580
+#: keyresolver.cpp:777
 msgid ""
 "_n: "
 "<p>The root certificate</p><p align=center><b>%3</b></p>"
@@ -4217,7 +4852,7 @@ msgid ""
 "<p>expires in less than %n days.</p>"
 msgstr ""
 
-#: keyresolver.cpp:587
+#: keyresolver.cpp:784
 msgid ""
 "_n: "
 "<p>The root certificate</p><p align=center><b>%3</b></p>"
@@ -4228,7 +4863,7 @@ msgid ""
 "<p>expires in less than %n days.</p>"
 msgstr ""
 
-#: keyresolver.cpp:595
+#: keyresolver.cpp:792
 msgid ""
 "_n: "
 "<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
@@ -4241,7 +4876,7 @@ msgid ""
 "<p>expires in less than %n days.</p>"
 msgstr ""
 
-#: keyresolver.cpp:602
+#: keyresolver.cpp:799
 msgid ""
 "_n: "
 "<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
@@ -4254,7 +4889,7 @@ msgid ""
 "<p>expires in less than %n days.</p>"
 msgstr ""
 
-#: keyresolver.cpp:609
+#: keyresolver.cpp:806
 msgid ""
 "_n: "
 "<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
@@ -4265,7 +4900,7 @@ msgid ""
 "<p>expires in less than %n days.</p>"
 msgstr ""
 
-#: keyresolver.cpp:618
+#: keyresolver.cpp:815
 msgid ""
 "_n: "
 "<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
@@ -4276,7 +4911,7 @@ msgid ""
 "<p>expires in less than %n days.</p>"
 msgstr ""
 
-#: keyresolver.cpp:623
+#: keyresolver.cpp:820
 msgid ""
 "_n: "
 "<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
@@ -4287,7 +4922,7 @@ msgid ""
 "<p>expires in less than %n days.</p>"
 msgstr ""
 
-#: keyresolver.cpp:628
+#: keyresolver.cpp:825
 msgid ""
 "_n: "
 "<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
@@ -4298,16 +4933,16 @@ msgid ""
 "<p>expires in less than %n days.</p>"
 msgstr ""
 
-#: keyresolver.cpp:634
+#: keyresolver.cpp:832
 #, fuzzy
 msgid "OpenPGP Key Expires Soon"
 msgstr "Allwedd OpenPGP 0x%1"
 
-#: keyresolver.cpp:635
+#: keyresolver.cpp:833
 msgid "S/MIME Certificate Expires Soon"
 msgstr ""
 
-#: keyresolver.cpp:668
+#: keyresolver.cpp:867
 msgid ""
 "One or more of your configured OpenPGP encryption keys or S/MIME certificates "
 "is not usable for encryption. Please reconfigure your encryption keys and "
@@ -4316,12 +4951,12 @@ msgid ""
 "prompted to specify the keys to use."
 msgstr ""
 
-#: keyresolver.cpp:676 keyresolver.cpp:989 keyresolver.cpp:1016
+#: keyresolver.cpp:875 keyresolver.cpp:1204 keyresolver.cpp:1231
 #, fuzzy
 msgid "Unusable Encryption Keys"
 msgstr "Allwedd Gêl-ysgrifo Anniffiniedig"
 
-#: keyresolver.cpp:712
+#: keyresolver.cpp:911
 msgid ""
 "One or more of your configured OpenPGP signing keys or S/MIME signing "
 "certificates is not usable for signing. Please reconfigure your signing keys "
@@ -4330,12 +4965,12 @@ msgid ""
 "prompted to specify the keys to use."
 msgstr ""
 
-#: keyresolver.cpp:720 keyresolver.cpp:1043 keyresolver.cpp:1059
+#: keyresolver.cpp:919 keyresolver.cpp:1258 keyresolver.cpp:1274
 #, fuzzy
 msgid "Unusable Signing Keys"
 msgstr "Allwedd Lofnodi heb ei Diffinio"
 
-#: keyresolver.cpp:980
+#: keyresolver.cpp:1195
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
@@ -4345,7 +4980,7 @@ msgid ""
 "be able to read your own messages if you do so."
 msgstr ""
 
-#: keyresolver.cpp:1007
+#: keyresolver.cpp:1222
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
@@ -4355,7 +4990,7 @@ msgid ""
 "be able to read your own messages if you do so."
 msgstr ""
 
-#: keyresolver.cpp:1037
+#: keyresolver.cpp:1252
 msgid ""
 "Examination of recipient's signing preferences yielded that the message should "
 "be signed using OpenPGP, at least for some recipients;\n"
@@ -4363,11 +4998,11 @@ msgid ""
 "identity."
 msgstr ""
 
-#: keyresolver.cpp:1044
+#: keyresolver.cpp:1259
 msgid "Do Not OpenPGP-Sign"
 msgstr ""
 
-#: keyresolver.cpp:1053
+#: keyresolver.cpp:1268
 msgid ""
 "Examination of recipient's signing preferences yielded that the message should "
 "be signed using S/MIME, at least for some recipients;\n"
@@ -4375,39 +5010,39 @@ msgid ""
 "identity."
 msgstr ""
 
-#: keyresolver.cpp:1060
+#: keyresolver.cpp:1275
 msgid "Do Not S/MIME-Sign"
 msgstr ""
 
-#: keyresolver.cpp:1116
+#: keyresolver.cpp:1331
 msgid ""
 "Examination of recipient's signing preferences showed no common type of "
 "signature matching your available signing keys.\n"
 "Send message without signing?"
 msgstr ""
 
-#: keyresolver.cpp:1120
+#: keyresolver.cpp:1335
 #, fuzzy
 msgid "No signing possible"
 msgstr "Defnyddio ar gyfer &Llofnodi"
 
-#: keyresolver.cpp:1275
+#: keyresolver.cpp:1490
 msgid ""
 "You did not select an encryption key for yourself (encrypt to self). You will "
 "not be able to decrypt your own message if you encrypt it."
 msgstr ""
 
-#: keyresolver.cpp:1279 keyresolver.cpp:1303 keyresolver.cpp:1317
+#: keyresolver.cpp:1494 keyresolver.cpp:1518 keyresolver.cpp:1532
 #, fuzzy
 msgid "Missing Key Warning"
 msgstr "Colli Allwedd Lofnodi"
 
-#: keyresolver.cpp:1280 keyresolver.cpp:1318 messagecomposer.cpp:885
-#: messagecomposer.cpp:910 messagecomposer.cpp:957
+#: keyresolver.cpp:1495 keyresolver.cpp:1533 messagecomposer.cpp:883
+#: messagecomposer.cpp:908 messagecomposer.cpp:955
 msgid "&Encrypt"
 msgstr "Cêl-ysg&rifo"
 
-#: keyresolver.cpp:1296
+#: keyresolver.cpp:1511
 #, fuzzy
 msgid ""
 "You did not select an encryption key for the recipient of this message; "
@@ -4418,75 +5053,79 @@ msgstr ""
 "yma.</p>"
 "<p>A ddylai'r neges yma gael ei chêl-ysgrifo?</p></qt>"
 
-#: keyresolver.cpp:1299
+#: keyresolver.cpp:1514
 msgid ""
 "You did not select an encryption key for any of the recipients of this message; "
 "therefore, the message will not be encrypted."
 msgstr ""
 
-#: keyresolver.cpp:1304 messagecomposer.cpp:933
+#: keyresolver.cpp:1519 messagecomposer.cpp:931
 msgid "Send &Unencrypted"
 msgstr "Anfon &heb ei Chêl-ysgrifo "
 
-#: keyresolver.cpp:1309
+#: keyresolver.cpp:1524
 msgid ""
 "You did not select an encryption key for one of the recipients: this person "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
 
-#: keyresolver.cpp:1312
+#: keyresolver.cpp:1527
 msgid ""
 "You did not select encryption keys for some of the recipients: these persons "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
 
-#: keyresolver.cpp:1367
+#: keyresolver.cpp:1585
 msgid "Encryption Key Selection"
 msgstr "Dewis Allwedd Cêl-ysgrifo"
 
-#: keyresolver.cpp:1408
+#: keyresolver.cpp:1628
+#, fuzzy
 msgid ""
-"_: if in your language something like 'key(s)' isn't possible please use the "
-"plural in the translation\n"
-"There is a problem with the encryption key(s) for \"%1\".\n"
+"_: if in your language something like 'certificate(s)' isn't possible please "
+"use the plural in the translation\n"
+"There is a problem with the encryption certificate(s) for \"%1\".\n"
 "\n"
-"Please re-select the key(s) which should be used for this recipient."
+"Please re-select the certificate(s) which should be used for this recipient."
 msgstr ""
 "Mae problem efo'r allwedd(au) cêl-ysgrifo ar gyfer \"%1\".\n"
 "\n"
 "Ail-ddewiswch yr allwedd(au) a ddylir eu defnyddio ar gyfer y derbyniwr yma."
 
-#: keyresolver.cpp:1452
+#: keyresolver.cpp:1678
 msgid ""
-"_: if in your language something like 'key(s)' isn't possible please use the "
-"plural in the translation\n"
-"No valid and trusted encryption key was found for \"%1\".\n"
-"\n"
-"Select the key(s) which should be used for this recipient."
+"_: if in your language something like 'certificate(s)' isn't possible please "
+"use the plural in the translation\n"
+"<qt>No valid and trusted encryption certificate was found for \"%1\"."
+"<br/>"
+"<br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for external "
+"certificates by clicking the button: search for external certificates.</qt>"
 msgstr ""
 
-#: keyresolver.cpp:1459
+#: keyresolver.cpp:1687
+#, fuzzy
 msgid ""
-"_: if in your language something like 'key(s)' isn't possible please use the "
-"plural in the translation\n"
-"More than one key matches \"%1\".\n"
+"_: if in your language something like 'certificate(s)' isn't possible please "
+"use the plural in the translation\n"
+"More than one certificate matches \"%1\".\n"
 "\n"
-"Select the key(s) which should be used for this recipient."
+"Select the certificate(s) which should be used for this recipient."
 msgstr ""
 "Mae mwy nag un allwedd yn cydweddu â \"%1\".\n"
 "\n"
 "Dewiswch yr allwedd(au) a ddylir eu defnyddio ar gyfer y derbyniwr yma."
 
-#: keyresolver.cpp:1567
+#: keyresolver.cpp:1800
 #, fuzzy
 msgid "Name Selection"
 msgstr "Gwagu Dewisiad"
 
-#: keyresolver.cpp:1567
+#: keyresolver.cpp:1800
 msgid "Which name shall the contact '%1' have in your addressbook?"
 msgstr ""
 
-#: kmaccount.cpp:49 kmaccount.cpp:381 kmsender.cpp:538
+#: kmaccount.cpp:49 kmaccount.cpp:381 kmsender.cpp:539
 #, c-format
 msgid "Executing precommand %1"
 msgstr "Gweithredu cyn-orchymyn %1"
@@ -4519,11 +5158,11 @@ msgstr ""
 msgid "Checking account: %1"
 msgstr "Ymofyn cyfrif %1 am ebost newydd."
 
-#: kmacctimap.cpp:398 kmfolderimap.cpp:858
+#: kmacctimap.cpp:398 kmfolderimap.cpp:852
 msgid " completed"
 msgstr " gorffenwyd"
 
-#: kmacctimap.cpp:607 kmheaders.cpp:1275
+#: kmacctimap.cpp:607 kmheaders.cpp:1313
 msgid "Unable to process messages: "
 msgstr "Methu prosesu'r negeseuon:"
 
@@ -4555,11 +5194,11 @@ msgstr "Methodd y trosglwyddiad: Methu cloi %1."
 msgid "Moving message %3 of %2 from %1."
 msgstr "Symud neges %3 o %2 oddiwrth %1."
 
-#: kmacctlocal.cpp:244
+#: kmacctlocal.cpp:245
 msgid "<qt>Cannot remove mail from mailbox <b>%1</b>:<br>%2</qt>"
 msgstr "<qt>Methu gwaredu ebost o'r blwch ebost <b>%1</b>:%2</qt>"
 
-#: kmacctlocal.cpp:254
+#: kmacctlocal.cpp:255
 #, fuzzy
 msgid ""
 "_n: Fetched 1 message from mailbox %1.\n"
@@ -4605,44 +5244,44 @@ msgstr "IMAP wedi'i Dda&d-gysylltu"
 msgid "&Maildir mailbox"
 msgstr "Blwch &ebost Maildir"
 
-#: kmailicalifaceimpl.cpp:90 kmfolderdia.cpp:448 newfolderdialog.cpp:125
+#: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "Post"
 
-#: kmailicalifaceimpl.cpp:91 kmfolderdia.cpp:449 newfolderdialog.cpp:126
+#: kmailicalifaceimpl.cpp:94 kmfolderdia.cpp:507 newfolderdialog.cpp:131
 msgid "Calendar"
 msgstr "Calendr"
 
-#: kmailicalifaceimpl.cpp:92 kmfolderdia.cpp:450 newfolderdialog.cpp:127
+#: kmailicalifaceimpl.cpp:95 kmfolderdia.cpp:508 newfolderdialog.cpp:132
 msgid "Contacts"
 msgstr "Cysylltau"
 
-#: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:451 newfolderdialog.cpp:128
+#: kmailicalifaceimpl.cpp:96 kmfolderdia.cpp:509 newfolderdialog.cpp:133
 msgid "Notes"
 msgstr "Nodau"
 
-#: kmailicalifaceimpl.cpp:94 kmfolderdia.cpp:452 newfolderdialog.cpp:129
+#: kmailicalifaceimpl.cpp:97 kmfolderdia.cpp:510 newfolderdialog.cpp:134
 msgid "Tasks"
 msgstr "Tasgau"
 
-#: kmailicalifaceimpl.cpp:95 kmfolderdia.cpp:453 newfolderdialog.cpp:130
+#: kmailicalifaceimpl.cpp:98 kmfolderdia.cpp:511 newfolderdialog.cpp:135
 msgid "Journal"
 msgstr "Dyddlyfr"
 
-#: kmailicalifaceimpl.cpp:667
+#: kmailicalifaceimpl.cpp:684
 msgid "%1's %2"
 msgstr ""
 
-#: kmailicalifaceimpl.cpp:681
+#: kmailicalifaceimpl.cpp:700
 msgid "My %1 (%2)"
 msgstr ""
 
-#: kmailicalifaceimpl.cpp:685
+#: kmailicalifaceimpl.cpp:704 kmailicalifaceimpl.cpp:708
 #, c-format
 msgid "My %1"
 msgstr ""
 
-#: kmailicalifaceimpl.cpp:1726
+#: kmailicalifaceimpl.cpp:1777
 #, fuzzy
 msgid ""
 "KMail will now create the required groupware folders as subfolders of %1; if "
@@ -4652,15 +5291,15 @@ msgstr ""
 "is-blygyll %1.  Os na ddymunwch hyn, gwthiwch \"Na\", ac analluogir yr adnodd "
 "IMAP."
 
-#: kmailicalifaceimpl.cpp:1736
+#: kmailicalifaceimpl.cpp:1787
 msgid "%1: no folder found. It will be created."
 msgstr ""
 
-#: kmailicalifaceimpl.cpp:1738
+#: kmailicalifaceimpl.cpp:1789
 msgid "%1: found folder %2. It will be set as the main groupware folder."
 msgstr ""
 
-#: kmailicalifaceimpl.cpp:1744
+#: kmailicalifaceimpl.cpp:1795
 #, fuzzy
 msgid ""
 "<qt>KMail found the following groupware folders in %1 and needs to perform the "
@@ -4671,25 +5310,34 @@ msgstr ""
 "is-blygyll %1.  Os na ddymunwch hyn, gwthiwch \"Na\", ac analluogir yr adnodd "
 "IMAP."
 
-#: kmailicalifaceimpl.cpp:1751
+#: kmailicalifaceimpl.cpp:1802
 #, fuzzy
 msgid "Standard Groupware Folders"
 msgstr "&Iaith ar gyfer plygyll cylchwedd:"
 
-#: kmailicalifaceimpl.cpp:1953
+#: kmailicalifaceimpl.cpp:1992
+#, fuzzy
+msgid "Default folder"
+msgstr "Dileu Plygell"
+
+#: kmailicalifaceimpl.cpp:1993
+msgid "There are multiple %1 default folders, please choose one:"
+msgstr ""
+
+#: kmailicalifaceimpl.cpp:2019
 msgid "You do not have read/write permission to your %1 folder."
 msgstr "Nid oes gennych ganiatâd darllen/ysgrifennu ar gyfer eich plygell %1."
 
-#: kmailicalifaceimpl.cpp:2007
+#: kmailicalifaceimpl.cpp:2073
 #, fuzzy
 msgid "You do not have read/write permission to your folder."
 msgstr "Nid oes gennych ganiatâd darllen/ysgrifennu ar gyfer eich plygell %1."
 
-#: kmcommands.cpp:300
+#: kmcommands.cpp:304
 msgid "Please wait"
 msgstr "Disgwyliwch"
 
-#: kmcommands.cpp:302 kmcommands.cpp:403
+#: kmcommands.cpp:306 kmcommands.cpp:407
 #, c-format
 msgid ""
 "_n: Please wait while the message is transferred\n"
@@ -4698,35 +5346,41 @@ msgstr ""
 "Disgwyliwch tra trosglwyddir y neges.\n"
 "Disgwyliwch tra trosglwyddir y %n o negeseuon."
 
-#: kmcommands.cpp:594
+#: kmcommands.cpp:598
 msgid "Address copied to clipboard."
 msgstr "Copiwyd y cyfeiriad i'r gludfwrdd."
 
-#: kmcommands.cpp:601
+#: kmcommands.cpp:605
 msgid "URL copied to clipboard."
 msgstr "Copiwyd yr URL i'r gludfwrdd."
 
-#: kmcommands.cpp:638
+#: kmcommands.cpp:642
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr "<qt>Mae ffeil <b>%1</b> mewn bod.<br>Ydych eisiau ei amnewid?</qt>"
 
-#: kmcommands.cpp:639 kmcommands.cpp:939 kmkernel.cpp:1940
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2050
 msgid "Save to File"
 msgstr "Cadw i Ffeil"
 
-#: kmcommands.cpp:639 kmcommands.cpp:939 kmkernel.cpp:1940
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2050
 msgid "&Replace"
 msgstr "&Amnewid"
 
-#: kmcommands.cpp:739
+#: kmcommands.cpp:743
 msgid "Message as Plain Text"
 msgstr "Neges fel Testun Plaen"
 
-#: kmcommands.cpp:882
+#: kmcommands.cpp:775
+msgid ""
+"*.mbox|email messages (*.mbox)\n"
+"*|all files (*)"
+msgstr ""
+
+#: kmcommands.cpp:908
 msgid "The message was removed while saving it. It has not been saved."
 msgstr ""
 
-#: kmcommands.cpp:938 kmkernel.cpp:1939
+#: kmcommands.cpp:965 kmkernel.cpp:2049
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -4734,21 +5388,21 @@ msgstr ""
 "Mae ffeil %1 mewn bod.\n"
 " Ydych eisiau ei amnewid?"
 
-#: kmcommands.cpp:982
+#: kmcommands.cpp:1009
 #, fuzzy
 msgid "Open Message"
 msgstr "&Neges Nesaf"
 
-#: kmcommands.cpp:1020 kmcommands.cpp:1048
+#: kmcommands.cpp:1047 kmcommands.cpp:1075
 #, fuzzy
 msgid "The file does not contain a message."
 msgstr "nid yw'n cynnwys"
 
-#: kmcommands.cpp:1066
+#: kmcommands.cpp:1093
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr ""
 
-#: kmcommands.cpp:1363
+#: kmcommands.cpp:1404
 msgid ""
 "\n"
 "This is a MIME digest forward. The content of the message is contained in the "
@@ -4762,89 +5416,89 @@ msgstr ""
 "\n"
 "\n"
 
-#: kmcommands.cpp:1697 kmheaders.cpp:1407
+#: kmcommands.cpp:1750 kmheaders.cpp:1445
 #, fuzzy
 msgid "Filtering messages"
 msgstr "Dileu Negeseuon"
 
-#: kmcommands.cpp:1705 kmheaders.cpp:1415
+#: kmcommands.cpp:1758 kmheaders.cpp:1453
 #, fuzzy
 msgid "Filtering message %1 of %2"
 msgstr "Symud neges %3 o %2 oddiwrth %1."
 
-#: kmcommands.cpp:1715
+#: kmcommands.cpp:1768
 msgid "Not enough free disk space?"
 msgstr "Dim digon o le gwag ar y ddisg?"
 
-#: kmcommands.cpp:1881 kmfoldertree.cpp:1891
+#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr "Symud i'r Blygell Yma"
 
-#: kmcommands.cpp:1883 kmfoldertree.cpp:1893
+#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr "Copïo i'r Blygell Yma"
 
-#: kmcommands.cpp:1959
+#: kmcommands.cpp:2012
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr ""
 
-#: kmcommands.cpp:2133
+#: kmcommands.cpp:2186
 #, fuzzy
 msgid "Moving messages"
 msgstr "Methwyd symud y negeseuon."
 
-#: kmcommands.cpp:2133
+#: kmcommands.cpp:2186
 #, fuzzy
 msgid "Deleting messages"
 msgstr "Dileu Negeseuon"
 
-#: kmcommands.cpp:2406
+#: kmcommands.cpp:2471
 msgid "Opening URL..."
 msgstr "Agor URL..."
 
-#: kmcommands.cpp:2413
+#: kmcommands.cpp:2478
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt>Ydych wir eisiau gweithredu <b>%1</b>?</qt>"
 
-#: kmcommands.cpp:2414
+#: kmcommands.cpp:2479
 msgid "Execute"
 msgstr "Gweithredu"
 
-#: kmcommands.cpp:2495
+#: kmcommands.cpp:2561
 msgid "Found no attachments to save."
 msgstr "Ni chanfuwyd atodiadau i'w cadw."
 
-#: kmcommands.cpp:2508
+#: kmcommands.cpp:2574
 #, fuzzy
 msgid "Save Attachments To"
 msgstr "Cadw Atodiad Fel..."
 
-#: kmcommands.cpp:2528
+#: kmcommands.cpp:2594
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr ""
 
-#: kmcommands.cpp:2556
+#: kmcommands.cpp:2622
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr ""
 
-#: kmcommands.cpp:2595
+#: kmcommands.cpp:2661
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr ""
 "Mae ffeil o'r enw %1 mewn bod yn barod.  Ydych eisiau ysgrifennu drosto?"
 
-#: kmcommands.cpp:2597
+#: kmcommands.cpp:2663
 msgid "File Already Exists"
 msgstr "Ffeil yn Bodoli'n Barod"
 
-#: kmcommands.cpp:2597 util.h:211
+#: kmcommands.cpp:2663 util.h:211
 msgid "&Overwrite"
 msgstr "&Trosysgrifo"
 
-#: kmcommands.cpp:2619
+#: kmcommands.cpp:2685
 #, fuzzy
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
@@ -4853,21 +5507,21 @@ msgstr ""
 "Mae'r rhan yma o'r neges wedi'i chêl-ysgrifo.  Ydych eisiau dal y "
 "cêl-ysgrifaeth wrth gadw?"
 
-#: kmcommands.cpp:2621 kmcommands.cpp:2630
+#: kmcommands.cpp:2687 kmcommands.cpp:2696
 msgid "KMail Question"
 msgstr "Cwestiwn KMail"
 
-#: kmcommands.cpp:2621
+#: kmcommands.cpp:2687
 #, fuzzy
 msgid "Keep Encryption"
 msgstr "Cêl-ysgrifaeth"
 
-#: kmcommands.cpp:2621 kmcommands.cpp:2630
+#: kmcommands.cpp:2687 kmcommands.cpp:2696
 #, fuzzy
 msgid "Do Not Keep"
 msgstr "Peidio â Chêl-ysg&rifo"
 
-#: kmcommands.cpp:2628
+#: kmcommands.cpp:2694
 #, fuzzy
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
@@ -4876,211 +5530,240 @@ msgstr ""
 "Mae'r rhan yma o'r neges wedi'i llofnodi.  Ydych eisiau dal y llofnod wrth "
 "gadw?"
 
-#: kmcommands.cpp:2630
+#: kmcommands.cpp:2696
 #, fuzzy
 msgid "Keep Signature"
 msgstr "Llofnod"
 
-#: kmcommands.cpp:2703
+#: kmcommands.cpp:2769
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
 "%2"
 msgstr ""
 
-#: kmcommands.cpp:2728
+#: kmcommands.cpp:2794
 #, fuzzy, c-format
 msgid "Could not write the file %1."
 msgstr "Methu ysgrifennu'r ffeil."
 
-#: kmcommands.cpp:2952
+#: kmcommands.cpp:3018
 msgid ""
 "There is no Address Book entry for this email address. Add them to the Address "
 "Book and then add instant messaging addresses using your preferred messaging "
 "client."
 msgstr ""
 
-#: kmcommands.cpp:2955
+#: kmcommands.cpp:3021
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
 " it is not possible to determine who to chat with."
 msgstr ""
 
-#: kmcommands.cpp:3179 kmcomposewin.cpp:5128 objecttreeparser.cpp:1632
+#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
 msgid ""
 "Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
 "this bug."
 msgstr ""
 
-#: kmcommands.cpp:3181 kmcommands.cpp:3186 kmcommands.cpp:3195
-#: kmcommands.cpp:3204 kmcommands.cpp:3222 kmcommands.cpp:3233
-#: kmcommands.cpp:3273 kmcomposewin.cpp:5130 kmcomposewin.cpp:5135
-#: kmcomposewin.cpp:5144 messagecomposer.cpp:558 messagecomposer.cpp:566
-#: messagecomposer.cpp:580 objecttreeparser.cpp:1638
+#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
+#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
+#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
+#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr ""
 
-#: kmcommands.cpp:3192 kmcomposewin.cpp:5141 objecttreeparser.cpp:1644
+#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
 msgid ""
 "Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
 "did not return a string list. Please report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3201 kmcomposewin.cpp:5150 objecttreeparser.cpp:1652
+#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
 msgid ""
 "No keys have been found. Please check that a valid key path has been set in the "
 "Chiasmus configuration."
 msgstr ""
 
-#: kmcommands.cpp:3208 objecttreeparser.cpp:1659
+#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
 #, fuzzy
 msgid "Chiasmus Decryption Key Selection"
 msgstr "Dewis Allwedd Cêl-ysgrifo"
 
-#: kmcommands.cpp:3220 objecttreeparser.cpp:1671
+#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
 msgid ""
 "Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
 "bug."
 msgstr ""
 
-#: kmcommands.cpp:3231 objecttreeparser.cpp:1679
+#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3239 kmcommands.cpp:3265 objecttreeparser.cpp:1685
+#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr ""
 
-#: kmcommands.cpp:3270 objecttreeparser.cpp:1691
+#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
 msgid ""
 "Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
 "not return a byte array. Please report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3425
-#, fuzzy
-msgid "This attachment has been deleted."
-msgstr "Dangos atodiadau fel yr awgrymir gan yr anfonwr."
-
-#: kmcommands.cpp:3427
-#, fuzzy
-msgid "The attachment '%1' has been deleted."
-msgstr "Diddymwyd y digwyddiad %1"
-
-#: kmcommands.cpp:3541
+#: kmcommands.cpp:3581
 msgid ""
 "From: %1\n"
 "To: %2\n"
 "Subject: %3"
 msgstr ""
 
-#: kmcommands.cpp:3551
+#: kmcommands.cpp:3591
 #, fuzzy, c-format
 msgid "Mail: %1"
 msgstr "Post"
 
-#: kmcomposewin.cpp:233
+#: kmcomposewin.cpp:207
+#, fuzzy
+msgid "Select an identity for this message"
+msgstr "Defnyddio llunio HTML ar gyfer y neges yma."
+
+#: kmcomposewin.cpp:211
+msgid "Select the dictionary to use when spell-checking this message"
+msgstr ""
+
+#: kmcomposewin.cpp:216
+msgid "Select the sent-mail folder where a copy of this message will be saved"
+msgstr ""
+
+#: kmcomposewin.cpp:220
+msgid "Select the outgoing account to use for sending this message"
+msgstr ""
+
+#: kmcomposewin.cpp:224
+msgid "Set the \"From:\" email address for this message"
+msgstr ""
+
+#: kmcomposewin.cpp:228
+msgid "Set the \"Reply-To:\" email address for this message"
+msgstr ""
+
+#: kmcomposewin.cpp:248
 msgid "Select email address(es)"
 msgstr "Dewis cyfeiriad(au) ebost"
 
-#: kmcomposewin.cpp:286
+#: kmcomposewin.cpp:295
+#, fuzzy
+msgid "Set a subject for this message"
+msgstr "Gosd pwnc y neges."
+
+#: kmcomposewin.cpp:297
+msgid "&Identity:"
+msgstr "&Dynodiad:"
+
+#: kmcomposewin.cpp:298
+msgid "&Dictionary:"
+msgstr "&Geiriadur:"
+
+#: kmcomposewin.cpp:299
+msgid "&Sent-Mail folder:"
+msgstr "Plygell Ebost Anfonedig:"
+
+#: kmcomposewin.cpp:300
+msgid "&Mail transport:"
+msgstr "&Cludiant ebost:"
+
+#: kmcomposewin.cpp:301
+msgid ""
+"_: sender address field\n"
+"&From:"
+msgstr "&Oddi wrth:"
+
+#: kmcomposewin.cpp:302
+msgid "&Reply to:"
+msgstr "&Ateb i:"
+
+#: kmcomposewin.cpp:303
+msgid "S&ubject:"
+msgstr "P&wnc:"
+
+#: kmcomposewin.cpp:305
 msgid "Sticky"
 msgstr "Gludiog"
 
-#: kmcomposewin.cpp:367 kmfoldertree.cpp:1681 kmheaders.cpp:138
-#: kmheaders.cpp:183 kmmainwidget.cpp:424 kmmainwidget.cpp:431
-#: kmmainwidget.cpp:438 kmmimeparttree.cpp:67 kmpopfiltercnfrmdlg.cpp:43
+#: kmcomposewin.cpp:308
+msgid "Use the selected value as your identity for future messages"
+msgstr ""
+
+#: kmcomposewin.cpp:311
+msgid "Use the selected value as your sent-mail folder for future messages"
+msgstr ""
+
+#: kmcomposewin.cpp:314
+msgid "Use the selected value as your outgoing account for future messages"
+msgstr ""
+
+#: kmcomposewin.cpp:317
+msgid "Use the selected value as your dictionary for future messages"
+msgstr ""
+
+#: kmcomposewin.cpp:398 kmfoldertree.cpp:1719 kmheaders.cpp:141
+#: kmheaders.cpp:187 kmmainwidget.cpp:416 kmmainwidget.cpp:423
+#: kmmainwidget.cpp:430 kmmimeparttree.cpp:67 kmpopfiltercnfrmdlg.cpp:43
 msgid "Size"
 msgstr "Maint"
 
-#: kmcomposewin.cpp:368 kmmimeparttree.cpp:66
+#: kmcomposewin.cpp:399 kmmimeparttree.cpp:66
 msgid "Encoding"
 msgstr "Amgodiad"
 
-#: kmcomposewin.cpp:375 kmcomposewin.cpp:3247
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
 msgid "Compress"
 msgstr "Compress"
 
-#: kmcomposewin.cpp:377
+#: kmcomposewin.cpp:408
 msgid "Encrypt"
 msgstr "Cêl-ysgrifo"
 
-#: kmcomposewin.cpp:379
+#: kmcomposewin.cpp:410
 msgid "Sign"
 msgstr "Llofnodi"
 
-#: kmcomposewin.cpp:590 kmcomposewin.cpp:3616
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
 #, fuzzy
 msgid "Name of the attachment:"
 msgstr "atodiad"
 
-#: kmcomposewin.cpp:828
+#: kmcomposewin.cpp:868
 #, fuzzy
 msgid ""
 "Autosaving the message as %1 failed.\n"
 "Reason: %2"
 msgstr "Methwyd symud y negeseuon."
 
-#: kmcomposewin.cpp:832
+#: kmcomposewin.cpp:872
 #, fuzzy
 msgid "Autosaving Failed"
 msgstr "Methwyd symud y negeseuon."
 
-#: kmcomposewin.cpp:970
-msgid "&Identity:"
-msgstr "&Dynodiad:"
-
-#: kmcomposewin.cpp:974
-msgid "&Dictionary:"
-msgstr "&Geiriadur:"
-
-#: kmcomposewin.cpp:978
-msgid "&Sent-Mail folder:"
-msgstr "Plygell Ebost Anfonedig:"
-
-#: kmcomposewin.cpp:982
-msgid "&Mail transport:"
-msgstr "&Cludiant ebost:"
-
-#: kmcomposewin.cpp:986
-msgid ""
-"_: sender address field\n"
-"&From:"
-msgstr "&Oddi wrth:"
-
-#: kmcomposewin.cpp:992
-msgid "&Reply to:"
-msgstr "&Ateb i:"
-
-#: kmcomposewin.cpp:1000
-msgid ""
-"_: recipient address field\n"
-"&To:"
-msgstr "A&t:"
-
-#: kmcomposewin.cpp:1002
+#: kmcomposewin.cpp:1042
 #, fuzzy
 msgid "Primary Recipients"
 msgstr "<derbynwyr>"
 
-#: kmcomposewin.cpp:1003
+#: kmcomposewin.cpp:1043
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email.</qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:1010
-#, fuzzy
-msgid "&Copy to (CC):"
-msgstr "&Copïo I"
-
-#: kmcomposewin.cpp:1012
+#: kmcomposewin.cpp:1052
 msgid "Additional Recipients"
 msgstr ""
 
-#: kmcomposewin.cpp:1013
+#: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
 "Technically it is the same thing as putting all the addresses in the <b>To:</b> "
@@ -5088,363 +5771,375 @@ msgid ""
 "(CC) is a listener, not the main recipient.</qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:1025
-msgid "&Blind copy to (BCC):"
-msgstr ""
-
-#: kmcomposewin.cpp:1027
+#: kmcomposewin.cpp:1067
 #, fuzzy
 msgid "Hidden Recipients"
 msgstr "<derbynwyr>"
 
-#: kmcomposewin.cpp:1028
+#: kmcomposewin.cpp:1068
 msgid ""
 "<qt>Essentially the same thing as the <b>Copy To:</b> "
 "field but differs in that all other recipients do not see who receives a blind "
 "copy.</qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:1060
-msgid "S&ubject:"
-msgstr "P&wnc:"
-
-#: kmcomposewin.cpp:1198 kmcomposewin.cpp:1220
+#: kmcomposewin.cpp:1236 kmcomposewin.cpp:1258
 msgid "&Send Mail"
 msgstr "&Anfon Ebost"
 
-#: kmcomposewin.cpp:1202 kmcomposewin.cpp:1224
+#: kmcomposewin.cpp:1240 kmcomposewin.cpp:1262
 #, fuzzy
 msgid "&Send Mail Via"
 msgstr "&Sendmail"
 
-#: kmcomposewin.cpp:1205 kmcomposewin.cpp:1214 kmcomposewin.cpp:4329
-#: redirectdialog.cpp:83
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "Anfon yn &Nes Ymlaen"
 
-#: kmcomposewin.cpp:1207 kmcomposewin.cpp:1217
+#: kmcomposewin.cpp:1245 kmcomposewin.cpp:1255
 #, fuzzy
 msgid "Send &Later Via"
 msgstr "Anfon yn &Nes Ymlaen"
 
-#: kmcomposewin.cpp:1255
+#: kmcomposewin.cpp:1293
 #, fuzzy
 msgid "Save as &Draft"
 msgstr "&Cadw fel Drafft"
 
-#: kmcomposewin.cpp:1258
+#: kmcomposewin.cpp:1296
 #, fuzzy
 msgid "Save as &Template"
 msgstr "&Amnewid"
 
-#: kmcomposewin.cpp:1261
+#: kmcomposewin.cpp:1299
 msgid "&Insert File..."
 msgstr "Mewn&osod Ffeil..."
 
-#: kmcomposewin.cpp:1264
+#: kmcomposewin.cpp:1302
 #, fuzzy
 msgid "&Insert File Recent"
 msgstr "Mewnosod Ffeil"
 
-#: kmcomposewin.cpp:1271
+#: kmcomposewin.cpp:1309
 msgid "&Address Book"
 msgstr "&Llyfr Cyfeiriadau"
 
-#: kmcomposewin.cpp:1274
+#: kmcomposewin.cpp:1312
 msgid "&New Composer"
 msgstr "Cyfan&soddydd Newydd"
 
-#: kmcomposewin.cpp:1278
+#: kmcomposewin.cpp:1316
 msgid "New Main &Window"
 msgstr "Prif Ffenest&r Newydd"
 
-#: kmcomposewin.cpp:1283
+#: kmcomposewin.cpp:1321
 #, fuzzy
 msgid "Select &Recipients..."
 msgstr "<derbynwyr>"
 
-#: kmcomposewin.cpp:1285
+#: kmcomposewin.cpp:1323
 #, fuzzy
 msgid "Save &Distribution List..."
 msgstr "Tanysgrifiad"
 
-#: kmcomposewin.cpp:1307
+#: kmcomposewin.cpp:1345
 msgid "Pa&ste as Quotation"
 msgstr "Gl&udo fel Dyfyniad"
 
-#: kmcomposewin.cpp:1310
+#: kmcomposewin.cpp:1348
 #, fuzzy
 msgid "Paste as Attac&hment"
 msgstr "atodiad"
 
-#: kmcomposewin.cpp:1313
+#: kmcomposewin.cpp:1351
 msgid "Add &Quote Characters"
 msgstr "&Ychwanegu Nodau Dyfynnu"
 
-#: kmcomposewin.cpp:1316
+#: kmcomposewin.cpp:1356
 msgid "Re&move Quote Characters"
 msgstr "G&waredu Nodau Dyfynnu"
 
-#: kmcomposewin.cpp:1320
+#: kmcomposewin.cpp:1362
 msgid "Cl&ean Spaces"
 msgstr "Glan&hau Gofodnodau"
 
-#. i18n: file kmail.kcfg line 341
-#: kmcomposewin.cpp:1323 kmreaderwin.cpp:683 rc.cpp:779
+#. i18n: file kmail.kcfg line 358
+#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "Def&nyddio Wynebfath Penodol"
 
-#: kmcomposewin.cpp:1328
+#: kmcomposewin.cpp:1370
 msgid "&Urgent"
 msgstr "Ar &Frys"
 
-#: kmcomposewin.cpp:1331
+#: kmcomposewin.cpp:1373
 msgid "&Request Disposition Notification"
 msgstr "&Gofyn am Hysbysiad Lleoliad"
 
-#: kmcomposewin.cpp:1336
+#: kmcomposewin.cpp:1378
 msgid "Se&t Encoding"
 msgstr "Goso&d Amgodiad"
 
-#: kmcomposewin.cpp:1339
+#: kmcomposewin.cpp:1381
 msgid "&Wordwrap"
 msgstr "&Amlapio testun"
 
-#: kmcomposewin.cpp:1344
+#: kmcomposewin.cpp:1386
 msgid "&Snippets"
 msgstr ""
 
-#: kmcomposewin.cpp:1350
+#: kmcomposewin.cpp:1392
 msgid "&Automatic Spellchecking"
 msgstr "G&wirio Sillafu Ymysgogol"
 
-#: kmcomposewin.cpp:1360
+#: kmcomposewin.cpp:1402
 msgid "Auto-Detect"
 msgstr "Hunan-ddarganfod"
 
-#: kmcomposewin.cpp:1365
+#: kmcomposewin.cpp:1407
 msgid "Formatting (HTML)"
 msgstr ""
 
-#: kmcomposewin.cpp:1369
+#: kmcomposewin.cpp:1411
 msgid "&All Fields"
 msgstr "&Pob Maes"
 
-#: kmcomposewin.cpp:1372
+#: kmcomposewin.cpp:1414
 msgid "&Identity"
 msgstr "&dynodiad"
 
-#: kmcomposewin.cpp:1375
+#: kmcomposewin.cpp:1417
 msgid "&Dictionary"
 msgstr "&Geiriadur"
 
-#: kmcomposewin.cpp:1378
+#: kmcomposewin.cpp:1420
 msgid "&Sent-Mail Folder"
 msgstr "&Plygell Ebostau Anfonedig"
 
-#: kmcomposewin.cpp:1381
+#: kmcomposewin.cpp:1423
 msgid "&Mail Transport"
 msgstr "&Cludiant Ebost"
 
-#: kmcomposewin.cpp:1384
+#: kmcomposewin.cpp:1426
 msgid "&From"
 msgstr "&Oddiwrth"
 
-#: kmcomposewin.cpp:1387
+#: kmcomposewin.cpp:1429
 msgid "&Reply To"
 msgstr "&Ateb I"
 
-#: kmcomposewin.cpp:1391
+#: kmcomposewin.cpp:1433
 msgid "&To"
 msgstr "&I"
 
-#: kmcomposewin.cpp:1394
+#: kmcomposewin.cpp:1436
 msgid "&CC"
 msgstr "&CC"
 
-#: kmcomposewin.cpp:1397
+#: kmcomposewin.cpp:1439
 msgid "&BCC"
 msgstr "&BCC"
 
-#: kmcomposewin.cpp:1401
+#: kmcomposewin.cpp:1443
 msgid "S&ubject"
 msgstr "P&wnc"
 
-#: kmcomposewin.cpp:1406
+#: kmcomposewin.cpp:1448
 msgid "Append S&ignature"
 msgstr "Atodi &Llofnod"
 
-#: kmcomposewin.cpp:1409
+#: kmcomposewin.cpp:1451
 #, fuzzy
 msgid "Prepend S&ignature"
 msgstr "Atodi &Llofnod"
 
-#: kmcomposewin.cpp:1413
+#: kmcomposewin.cpp:1455
 #, fuzzy
 msgid "Insert Signature At C&ursor Position"
 msgstr "Lleoliad y Blygell"
 
-#: kmcomposewin.cpp:1417
+#: kmcomposewin.cpp:1459
 msgid "Attach &Public Key..."
 msgstr "Atodi Allwedd &Gyhoeddus..."
 
-#: kmcomposewin.cpp:1420
+#: kmcomposewin.cpp:1462
 msgid "Attach &My Public Key"
 msgstr "Atodi &F'Allwedd Gyhoeddus..."
 
-#: kmcomposewin.cpp:1423 kmcomposewin.cpp:2272
+#: kmcomposewin.cpp:1465 kmcomposewin.cpp:2337
 msgid "&Attach File..."
 msgstr "A&todi Ffeil..."
 
-#: kmcomposewin.cpp:1426
+#: kmcomposewin.cpp:1468
 msgid "&Remove Attachment"
 msgstr "&Gwaredu Atodiad"
 
-#: kmcomposewin.cpp:1429
+#: kmcomposewin.cpp:1471
 msgid "&Save Attachment As..."
 msgstr "&Cadw Atodiad Fel..."
 
-#: kmcomposewin.cpp:1432
+#: kmcomposewin.cpp:1474
 msgid "Attachment Pr&operties"
 msgstr "Priodweddau y&r Atodiad"
 
-#: kmcomposewin.cpp:1442
+#: kmcomposewin.cpp:1484
 msgid "&Spellchecker..."
 msgstr "Gwirydd &Sillafu..."
 
-#: kmcomposewin.cpp:1446 kmcomposewin.cpp:1449
+#: kmcomposewin.cpp:1488 kmcomposewin.cpp:1491
 #, fuzzy
 msgid "Encrypt Message with Chiasmus..."
 msgstr "Deiws y Blygell efo'r Canolbwynt"
 
-#: kmcomposewin.cpp:1457
+#: kmcomposewin.cpp:1499
 msgid "&Encrypt Message"
 msgstr "C&êl-ysgrifo Neges"
 
-#: kmcomposewin.cpp:1460
+#: kmcomposewin.cpp:1502
 msgid "&Sign Message"
 msgstr "Llof&odi Neges"
 
-#: kmcomposewin.cpp:1507
+#: kmcomposewin.cpp:1549
 msgid "&Cryptographic Message Format"
 msgstr ""
 
-#: kmcomposewin.cpp:1515 kmcomposewin.cpp:4970
+#: kmcomposewin.cpp:1554
+#, fuzzy
+msgid "Select a cryptographic format for this message"
+msgstr "Cêl-ysgrifo pob rhan o'r neges yma?"
+
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
 msgid "Standard"
 msgstr "Safonol"
 
-#: kmcomposewin.cpp:1516 kmcomposewin.cpp:4972
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
 msgid "Bulleted List (Disc)"
 msgstr ""
 
-#: kmcomposewin.cpp:1517 kmcomposewin.cpp:4974
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
 msgid "Bulleted List (Circle)"
 msgstr ""
 
-#: kmcomposewin.cpp:1518 kmcomposewin.cpp:4976
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
 msgid "Bulleted List (Square)"
 msgstr ""
 
-#: kmcomposewin.cpp:1519 kmcomposewin.cpp:4978
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
 msgid "Ordered List (Decimal)"
 msgstr ""
 
-#: kmcomposewin.cpp:1520 kmcomposewin.cpp:4980
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
 msgid "Ordered List (Alpha lower)"
 msgstr ""
 
-#: kmcomposewin.cpp:1521 kmcomposewin.cpp:4982
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
 msgid "Ordered List (Alpha upper)"
 msgstr ""
 
-#: kmcomposewin.cpp:1523
+#: kmcomposewin.cpp:1566
 #, fuzzy
 msgid "Select Style"
 msgstr "Dewis Ffeil Sŵn"
 
-#: kmcomposewin.cpp:1537
+#: kmcomposewin.cpp:1569
+#, fuzzy
+msgid "Select a list style"
+msgstr "Dewis Ffeil Sŵn"
+
+#: kmcomposewin.cpp:1574
+#, fuzzy
+msgid "Select a font"
+msgstr "Dewis &Pob Neges"
+
+#: kmcomposewin.cpp:1579
+#, fuzzy
+msgid "Select a font size"
+msgstr "Dewis Ffeil Sŵn"
+
+#: kmcomposewin.cpp:1583
 msgid "Align Left"
 msgstr "Alinio Chwith"
 
-#: kmcomposewin.cpp:1541
+#: kmcomposewin.cpp:1587
 msgid "Align Right"
 msgstr "Alinio Dde"
 
-#: kmcomposewin.cpp:1544
+#: kmcomposewin.cpp:1590
 msgid "Align Center"
 msgstr "Alinio i'r Canol"
 
-#: kmcomposewin.cpp:1547
+#: kmcomposewin.cpp:1593
 msgid "&Bold"
 msgstr "&Trwm"
 
-#: kmcomposewin.cpp:1550
+#: kmcomposewin.cpp:1596
 msgid "&Italic"
 msgstr "&Italig"
 
-#: kmcomposewin.cpp:1553
+#: kmcomposewin.cpp:1599
 msgid "&Underline"
 msgstr "&Tanlinellu"
 
-#: kmcomposewin.cpp:1556
+#: kmcomposewin.cpp:1602
 msgid "Reset Font Settings"
 msgstr ""
 
-#: kmcomposewin.cpp:1559
+#: kmcomposewin.cpp:1605
 msgid "Text Color..."
 msgstr "Lliw Testun..."
 
-#: kmcomposewin.cpp:1573
+#: kmcomposewin.cpp:1619
 #, fuzzy
 msgid "Configure KMail..."
 msgstr "&Furffweddu KMail..."
 
-#: kmcomposewin.cpp:1582
+#: kmcomposewin.cpp:1628
 #, fuzzy
 msgid " Spellcheck: %1 "
 msgstr "Gwirydd Sillafu"
 
-#: kmcomposewin.cpp:1583 kmcomposewin.cpp:1597
+#: kmcomposewin.cpp:1629 kmcomposewin.cpp:1643
 msgid " Column: %1 "
 msgstr "Colofn: %1"
 
-#: kmcomposewin.cpp:1584 kmcomposewin.cpp:1595
+#: kmcomposewin.cpp:1630 kmcomposewin.cpp:1641
 msgid " Line: %1 "
 msgstr "Llinell: %1"
 
-#: kmcomposewin.cpp:2188
+#: kmcomposewin.cpp:2252
 #, fuzzy
 msgid "Re&save as Template"
 msgstr "&Amnewid"
 
-#: kmcomposewin.cpp:2189
+#: kmcomposewin.cpp:2253
 msgid "&Save as Draft"
 msgstr "&Cadw fel Drafft"
 
-#: kmcomposewin.cpp:2191
+#: kmcomposewin.cpp:2255
 msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
 "time."
 msgstr ""
 
-#: kmcomposewin.cpp:2193
+#: kmcomposewin.cpp:2257
 msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
 "later time."
 msgstr ""
 
-#: kmcomposewin.cpp:2197
+#: kmcomposewin.cpp:2261
 #, fuzzy
 msgid "Do you want to save the message for later or discard it?"
 msgstr "Hoffech daflu'r neges neu ei chadw tan hwyrach?"
 
-#: kmcomposewin.cpp:2198
+#: kmcomposewin.cpp:2262
 #, fuzzy
 msgid "Close Composer"
 msgstr "Cyfan&soddydd Newydd"
 
-#: kmcomposewin.cpp:2268
+#: kmcomposewin.cpp:2333
 msgid ""
 "The message you have composed seems to refer to an attached file but you have "
 "not attached anything.\n"
@@ -5454,15 +6149,15 @@ msgstr ""
 "ond nid ydych wedi atodi rhywbeth.\n"
 "Ydych eisiau atodi ffeil i'ch neges?"
 
-#: kmcomposewin.cpp:2271
+#: kmcomposewin.cpp:2336
 msgid "File Attachment Reminder"
 msgstr "Atgoffydd Atodiad Ffeil"
 
-#: kmcomposewin.cpp:2273
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
 msgid "&Send as Is"
 msgstr "&Anfon e"
 
-#: kmcomposewin.cpp:2350
+#: kmcomposewin.cpp:2415
 #, fuzzy
 msgid ""
 "<qt>"
@@ -5473,86 +6168,86 @@ msgstr ""
 "<p>Methodd KMail adnabod lleoliad yr atodiad (%1).</p>"
 "<p>Rhaid i chi benodi'r llwybr llawn os hoffech atodi ffeil.</p></qt>"
 
-#: kmcomposewin.cpp:2359
+#: kmcomposewin.cpp:2424
 msgid ""
 "<qt>"
 "<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
 msgstr ""
 
-#: kmcomposewin.cpp:2697
+#: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "Atodi Ffeil"
 
 #. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2698 rc.cpp:57
+#: kmcomposewin.cpp:2778 rc.cpp:57
 #, no-c-format
 msgid "&Attach"
 msgstr "&Atodi"
 
-#: kmcomposewin.cpp:2878
+#: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "Mewnosod Ffeil"
 
-#: kmcomposewin.cpp:3048
+#: kmcomposewin.cpp:3129
 msgid ""
 "<qt>"
 "<p>An error occurred while trying to export the key from the backend:</p>"
 "<p><b>%1</b></p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:3052
+#: kmcomposewin.cpp:3133
 msgid "Key Export Failed"
 msgstr ""
 
-#: kmcomposewin.cpp:3079
+#: kmcomposewin.cpp:3160
 #, fuzzy
 msgid "Exporting key..."
 msgstr "Gwagu'r sbwriel..."
 
-#: kmcomposewin.cpp:3090
+#: kmcomposewin.cpp:3171
 #, c-format
 msgid "OpenPGP key 0x%1"
 msgstr "Allwedd OpenPGP 0x%1"
 
-#: kmcomposewin.cpp:3105
+#: kmcomposewin.cpp:3186
 msgid "Attach Public OpenPGP Key"
 msgstr "Atodi Allwedd OpenPGP Gyhoeddus"
 
-#: kmcomposewin.cpp:3106
+#: kmcomposewin.cpp:3187
 msgid "Select the public key which should be attached."
 msgstr "Dewis yr allwedd gyhoeddus a ddylid eu hatodi."
 
-#: kmcomposewin.cpp:3128 kmmimeparttree.cpp:137 kmreaderwin.cpp:1967
+#: kmcomposewin.cpp:3209 kmmimeparttree.cpp:135 kmreaderwin.cpp:2032
 msgid ""
 "_: to open\n"
 "Open"
 msgstr "Agor"
 
-#: kmcomposewin.cpp:3130 kmmimeparttree.cpp:138 kmreaderwin.cpp:1968
+#: kmcomposewin.cpp:3211 kmmimeparttree.cpp:136 kmreaderwin.cpp:2033
 msgid "Open With..."
 msgstr "Agor Efo..."
 
-#: kmcomposewin.cpp:3132
+#: kmcomposewin.cpp:3213
 msgid ""
 "_: to view\n"
 "View"
 msgstr "Gweld"
 
-#: kmcomposewin.cpp:3135
+#: kmcomposewin.cpp:3216
 #, fuzzy
 msgid "Edit With..."
 msgstr "Golygu..."
 
-#: kmcomposewin.cpp:3143
+#: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "Ychwanegu Atodiad..."
 
-#: kmcomposewin.cpp:3232 kmcomposewin.cpp:3240
+#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
 #, fuzzy
 msgid "KMail could not compress the file."
 msgstr "Methu ysgrifennu'r ffeil."
 
-#: kmcomposewin.cpp:3246
+#: kmcomposewin.cpp:3326
 #, fuzzy
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
@@ -5561,45 +6256,45 @@ msgstr ""
 "Mae'r rhan yma o'r neges wedi'i llofnodi.  Ydych eisiau dal y llofnod wrth "
 "gadw?"
 
-#: kmcomposewin.cpp:3247
+#: kmcomposewin.cpp:3327
 msgid "Keep"
 msgstr "Cadw"
 
-#: kmcomposewin.cpp:3313 kmcomposewin.cpp:3321
+#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
 #, fuzzy
 msgid "KMail could not uncompress the file."
 msgstr "Methu ysgrifennu'r ffeil."
 
-#: kmcomposewin.cpp:3519
+#: kmcomposewin.cpp:3601
 msgid "Save Attachment As"
 msgstr "Cadw Atodiad Fel..."
 
-#: kmcomposewin.cpp:3769 kmedit.cpp:178
+#: kmcomposewin.cpp:3856 kmedit.cpp:178
 msgid "Add as Text"
 msgstr ""
 
-#: kmcomposewin.cpp:3770 kmedit.cpp:179
+#: kmcomposewin.cpp:3857 kmedit.cpp:179
 #, fuzzy
 msgid "Add as Attachment"
 msgstr "Ychwanegu Atodiad..."
 
-#: kmcomposewin.cpp:3771
+#: kmcomposewin.cpp:3858
 msgid ""
 "Please select whether you want to insert the content as text into the editor, "
 "or append the referenced file as an attachment."
 msgstr ""
 
-#: kmcomposewin.cpp:3773
+#: kmcomposewin.cpp:3860
 #, fuzzy
 msgid "Paste as text or attachment?"
 msgstr "atodiad"
 
-#: kmcomposewin.cpp:3848 kmfilterdlg.cpp:705 kmfolderdia.cpp:274
-#: kmfolderdia.cpp:632 kmfoldertree.cpp:1603 managesievescriptsdialog.cpp:280
+#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "di-enw"
 
-#: kmcomposewin.cpp:3873
+#: kmcomposewin.cpp:3961
 msgid ""
 "<qt>"
 "<p>You have requested that messages be encrypted to yourself, but the currently "
@@ -5608,11 +6303,11 @@ msgid ""
 "<p>Please select the key(s) to use in the identity configuration.</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:3880
+#: kmcomposewin.cpp:3968
 msgid "Undefined Encryption Key"
 msgstr "Allwedd Gêl-ysgrifo Anniffiniedig"
 
-#: kmcomposewin.cpp:3924
+#: kmcomposewin.cpp:4015
 #, fuzzy
 msgid ""
 "<qt>"
@@ -5626,99 +6321,99 @@ msgstr ""
 "<p>Gallwch ddiffinio'r allwedd OpenPGP a ddylir ei defnyddio efo'r dynodiad "
 "cyfredol yn y ffurfweddiad dynodiad.</p></qt>"
 
-#: kmcomposewin.cpp:3931
+#: kmcomposewin.cpp:4022
 msgid "Undefined Signing Key"
 msgstr "Allwedd Lofnodi heb ei Diffinio"
 
-#: kmcomposewin.cpp:4016
+#: kmcomposewin.cpp:4129
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
 msgstr ""
 
-#: kmcomposewin.cpp:4018 kmkernel.cpp:1243
+#: kmcomposewin.cpp:4131 kmkernel.cpp:1285
 msgid "Online/Offline"
 msgstr ""
 
-#: kmcomposewin.cpp:4033
+#: kmcomposewin.cpp:4146
 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 ""
 
-#: kmcomposewin.cpp:4044
+#: kmcomposewin.cpp:4157
 #, fuzzy
 msgid ""
 "You must specify at least one receiver,either in the To: field or as CC or as "
 "BCC."
 msgstr "Rhaid i chi benodi o leiaf un derbyniwr yn y maes I:."
 
-#: kmcomposewin.cpp:4052
+#: kmcomposewin.cpp:4165
 #, fuzzy
 msgid "To field is missing.Send message anyway?"
 msgstr "Nid ydych wedi penodi pwnc.  Anfon y neges beth bynnag?"
 
-#: kmcomposewin.cpp:4054
+#: kmcomposewin.cpp:4167
 #, fuzzy
 msgid "No To: specified"
 msgstr "Dim Enw wedi'i Benodi"
 
-#: kmcomposewin.cpp:4079
+#: kmcomposewin.cpp:4192
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Nid ydych wedi penodi pwnc.  Anfon y neges beth bynnag?"
 
-#: kmcomposewin.cpp:4081
+#: kmcomposewin.cpp:4194
 msgid "No Subject Specified"
 msgstr "Ni Phenodwyd Pwnc"
 
-#: kmcomposewin.cpp:4082
+#: kmcomposewin.cpp:4195
 msgid "S&end as Is"
 msgstr "A&nfon e"
 
-#: kmcomposewin.cpp:4083
+#: kmcomposewin.cpp:4196
 #, fuzzy
 msgid "&Specify the Subject"
 msgstr "&Na, Gadewch i Mi Benodi'r Pwnc"
 
-#: kmcomposewin.cpp:4121
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not sign/encrypt"
 msgstr ""
 
-#: kmcomposewin.cpp:4122
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not encrypt"
 msgstr ""
 
-#: kmcomposewin.cpp:4123
+#: kmcomposewin.cpp:4236
 msgid "&Keep markup, do not sign"
 msgstr ""
 
-#: kmcomposewin.cpp:4125
+#: kmcomposewin.cpp:4238
 #, fuzzy
 msgid "Sign/Encrypt (delete markup)"
 msgstr "Llofnodi/Cêl-ysgrifo"
 
-#: kmcomposewin.cpp:4126
+#: kmcomposewin.cpp:4239
 msgid "Encrypt (delete markup)"
 msgstr ""
 
-#: kmcomposewin.cpp:4127
+#: kmcomposewin.cpp:4240
 msgid "Sign (delete markup)"
 msgstr ""
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4242
 msgid ""
 "<qt>"
 "<p>Inline signing/encrypting of HTML messages is not possible;</p>"
 "<p>do you want to delete your markup?</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:4131
+#: kmcomposewin.cpp:4244
 #, fuzzy
 msgid "Sign/Encrypt Message?"
 msgstr "Cêl-ysgrifo'r Neges?"
 
-#: kmcomposewin.cpp:4180
+#: kmcomposewin.cpp:4293
 #, fuzzy
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
@@ -5727,104 +6422,135 @@ msgstr ""
 "Nid yw'r blygell addasiedig drafftiau ar gyfer dynodiad \"%1\" mewn bodolaeth "
 "(dim mwy).  Felly defnyddir y blygell ragosod drafftiau."
 
-#: kmcomposewin.cpp:4326
+#: kmcomposewin.cpp:4393 kmsender.cpp:114
+msgid "Please create an account for sending and try again."
+msgstr "Creuwch gyfrif ar gyfer anfon a ceisiwch eto."
+
+#: kmcomposewin.cpp:4456
 msgid "About to send email..."
 msgstr "Ar fin anfon ebost..."
 
-#: kmcomposewin.cpp:4327
+#: kmcomposewin.cpp:4457
 msgid "Send Confirmation"
 msgstr "Anfon Cadarnhad"
 
-#: kmcomposewin.cpp:4328 redirectdialog.cpp:82
+#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "Anfo&n Rwan"
 
-#: kmcomposewin.cpp:4549
+#: kmcomposewin.cpp:4479
+msgid ""
+"You are trying to send the mail to more than %1 recipients. Send message "
+"anyway?"
+msgstr ""
+
+#: kmcomposewin.cpp:4480
+#, fuzzy
+msgid "Too many receipients"
+msgstr "<derbynwyr>"
+
+#: kmcomposewin.cpp:4482
+#, fuzzy
+msgid "&Edit Recipients"
+msgstr "<derbynwyr>"
+
+#: kmcomposewin.cpp:4728
 #, fuzzy
 msgid "Spellcheck: on"
 msgstr "Gwirydd Sillafu"
 
-#: kmcomposewin.cpp:4551
+#: kmcomposewin.cpp:4730
 #, fuzzy
 msgid "Spellcheck: off"
 msgstr "Gwirydd Sillafu"
 
-#: kmcomposewin.cpp:4608
+#: kmcomposewin.cpp:4787
 msgid " Spell check canceled."
 msgstr "Diddymwyd y gwirio sillafu."
 
-#: kmcomposewin.cpp:4611
+#: kmcomposewin.cpp:4790
 msgid " Spell check stopped."
 msgstr "Arhoswyd y gwiriad sillafu."
 
-#: kmcomposewin.cpp:4614
+#: kmcomposewin.cpp:4793
 msgid " Spell check complete."
 msgstr "Gwiriad sillafu yn gyflawn."
 
-#: kmcomposewin.cpp:4798 kmcomposewin.cpp:4806
+#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
 msgid "Spellchecker"
 msgstr "Gwirydd Sillafu"
 
-#: kmcomposewin.cpp:5115
+#: kmcomposewin.cpp:5304
 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."
 msgstr ""
 
-#: kmcomposewin.cpp:5119
+#: kmcomposewin.cpp:5308
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
 msgstr ""
 
-#: kmcomposewin.cpp:5122
+#: kmcomposewin.cpp:5311
 msgid "No Chiasmus Backend Configured"
 msgstr ""
 
-#: kmcomposewin.cpp:5153
+#: kmcomposewin.cpp:5342
 #, fuzzy
 msgid "No Chiasmus Keys Found"
 msgstr "Ni Chanfuwyd Tystysgrif"
 
-#: kmcomposewin.cpp:5157
+#: kmcomposewin.cpp:5346
 #, fuzzy
 msgid "Chiasmus Encryption Key Selection"
 msgstr "Dewis Allwedd Cêl-ysgrifo"
 
-#: kmcomposewin.cpp:5189
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will be signed"
 msgstr "Llofnodwyd y neges gan %1."
 
-#: kmcomposewin.cpp:5189
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will not be signed"
 msgstr "Llofnodwyd y neges gan %1."
 
-#: kmcomposewin.cpp:5190
+#: kmcomposewin.cpp:5379
 #, fuzzy
 msgid "Message will be encrypted"
 msgstr "Neges OpenPGP - wedi'i chelu"
 
-#: kmcomposewin.cpp:5190
+#: kmcomposewin.cpp:5379
 #, fuzzy
 msgid "Message will not be encrypted"
 msgstr "Rhestr Negeseuon"
 
-#: kmedit.cpp:391
+#: kmedit.cpp:458
 msgid "Unable to start external editor."
 msgstr "Methu cychwyn golygydd allanol."
 
-#: kmedit.cpp:442
-msgid "Suggestions"
+#: kmedit.cpp:522
+#, fuzzy
+msgid "No Suggestions"
 msgstr "Awgrymiadau"
 
-#: kmedit.cpp:494
+#: kmedit.cpp:529
+#, fuzzy
+msgid "Add to Dictionary"
+msgstr "&Geiriadur"
+
+#: kmedit.cpp:530
+#, fuzzy
+msgid "Ignore All"
+msgstr "&Anwybyddu"
+
+#: kmedit.cpp:587
 msgid "Automatic spellchecking is not possible on text with markup."
 msgstr ""
 
-#: kmedit.cpp:538
+#: kmedit.cpp:631
 msgid ""
 "The external editor is still running.\n"
 "Abort the external editor or leave it open?"
@@ -5832,19 +6558,19 @@ msgstr ""
 "Mae'r golygydd allanol yn dal i redeg.\n"
 "Erthylu'r golygydd allanol, neu ei adael yn agored?"
 
-#: kmedit.cpp:541
+#: kmedit.cpp:634
 msgid "Abort Editor"
 msgstr "Erthylu'r Golygydd"
 
-#: kmedit.cpp:541
+#: kmedit.cpp:634
 msgid "Leave Editor Open"
 msgstr "Gadael y Golygydd yn Agored"
 
-#: kmedit.cpp:565
+#: kmedit.cpp:661
 msgid "Spellcheck - KMail"
 msgstr "Gwirydd Sillafu - KMail"
 
-#: kmedit.cpp:734
+#: kmedit.cpp:884
 msgid ""
 "ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
 "properly configured and in your PATH."
@@ -5852,15 +6578,20 @@ msgstr ""
 "Ni ellid dechrau ISpell/Aspell.  Sicrhewch bod ISpell neu Aspell wedi ei "
 "ffurfweddu yn iawn, ac yn eich PATH."
 
-#: kmedit.cpp:743
+#: kmedit.cpp:893
 msgid "ISpell/Aspell seems to have crashed."
 msgstr "Ymddengys bod Spell/Aspell wedi chwalu."
 
-#: kmedit.cpp:752
+#: kmedit.cpp:902
 msgid "No misspellings encountered."
 msgstr "Ni chyfarfuwyd camsillafiannau."
 
-#: kmfawidgets.cpp:102
+#: kmfawidgets.cpp:39
+#, fuzzy
+msgid "Open Address Book"
+msgstr "Agor yn y Lyfr Cyfeiriadau"
+
+#: kmfawidgets.cpp:107
 msgid "Select Sound File"
 msgstr "Dewis Ffeil Sŵn"
 
@@ -5886,208 +6617,240 @@ msgstr ""
 "<br>yn y rheol hidlo <b>%2</b>."
 "<br>Yn ei hanwybyddu.</qt>"
 
-#: kmfilteraction.cpp:598
+#: kmfilteraction.cpp:601
 #, fuzzy
 msgid "Confirm Delivery"
 msgstr "cadarnhau derbyn"
 
-#: kmfilteraction.cpp:634
+#: kmfilteraction.cpp:637
 #, fuzzy
 msgid "Set Transport To"
 msgstr "gosod cludiant i"
 
-#: kmfilteraction.cpp:665
+#: kmfilteraction.cpp:668
 #, fuzzy
 msgid "Set Reply-To To"
 msgstr "gosod Ateb-I i"
 
-#: kmfilteraction.cpp:701
+#: kmfilteraction.cpp:704
 #, fuzzy
 msgid "Set Identity To"
 msgstr "gosod dynodiad i"
 
-#: kmfilteraction.cpp:784
+#: kmfilteraction.cpp:787
 #, fuzzy
 msgid "Mark As"
 msgstr "nodi fel"
 
-#: kmfilteraction.cpp:789
+#: kmfilteraction.cpp:792
 msgid ""
 "_: msg status\n"
 "Important"
 msgstr "Pwysig"
 
-#: kmfilteraction.cpp:790
+#: kmfilteraction.cpp:793
 msgid ""
 "_: msg status\n"
 "Read"
 msgstr "Wedi'i ddarllen"
 
-#: kmfilteraction.cpp:791
+#: kmfilteraction.cpp:794
 msgid ""
 "_: msg status\n"
 "Unread"
 msgstr "Heb ei ddarllen"
 
-#: kmfilteraction.cpp:792
+#: kmfilteraction.cpp:795
 msgid ""
 "_: msg status\n"
 "Replied"
 msgstr "Wedi ateb"
 
-#: kmfilteraction.cpp:793
+#: kmfilteraction.cpp:796
 msgid ""
 "_: msg status\n"
 "Forwarded"
 msgstr "Wedi'i flaenyrru"
 
-#: kmfilteraction.cpp:794
+#: kmfilteraction.cpp:797
 msgid ""
 "_: msg status\n"
 "Old"
 msgstr "Hen"
 
-#: kmfilteraction.cpp:795
+#: kmfilteraction.cpp:798
 msgid ""
 "_: msg status\n"
 "New"
 msgstr "Neywdd"
 
-#: kmfilteraction.cpp:796
+#: kmfilteraction.cpp:799
 msgid ""
 "_: msg status\n"
 "Watched"
 msgstr "Gwylir"
 
-#: kmfilteraction.cpp:797
+#: kmfilteraction.cpp:800
 msgid ""
 "_: msg status\n"
 "Ignored"
 msgstr "Anwybyddir"
 
-#: kmfilteraction.cpp:798
+#: kmfilteraction.cpp:801
 msgid ""
 "_: msg status\n"
 "Spam"
 msgstr "Ebostach"
 
-#: kmfilteraction.cpp:799
+#: kmfilteraction.cpp:802
 msgid ""
 "_: msg status\n"
 "Ham"
 msgstr "Ebost Iawn"
 
-#: kmfilteraction.cpp:883
+#: kmfilteraction.cpp:886
 #, fuzzy
 msgid "Send Fake MDN"
 msgstr "anfon ffug-MDN"
 
-#: kmfilteraction.cpp:888
+#: kmfilteraction.cpp:891
 msgid ""
 "_: MDN type\n"
 "Ignore"
 msgstr "Anwybyddu"
 
-#: kmfilteraction.cpp:889
+#: kmfilteraction.cpp:892
 msgid ""
 "_: MDN type\n"
 "Displayed"
 msgstr "Dangosir"
 
-#: kmfilteraction.cpp:890
+#: kmfilteraction.cpp:893
 msgid ""
 "_: MDN type\n"
 "Deleted"
 msgstr "Wedi'i ddileu"
 
-#: kmfilteraction.cpp:891
+#: kmfilteraction.cpp:894
 msgid ""
 "_: MDN type\n"
 "Dispatched"
 msgstr "Wedi'i danfon"
 
-#: kmfilteraction.cpp:892
+#: kmfilteraction.cpp:895
 msgid ""
 "_: MDN type\n"
 "Processed"
 msgstr "Wedi'i brosesu"
 
-#: kmfilteraction.cpp:893
+#: kmfilteraction.cpp:896
 msgid ""
 "_: MDN type\n"
 "Denied"
 msgstr "Wedi'i wahardd"
 
-#: kmfilteraction.cpp:894
+#: kmfilteraction.cpp:897
 msgid ""
 "_: MDN type\n"
 "Failed"
 msgstr "Wedi methu"
 
-#: kmfilteraction.cpp:963
+#: kmfilteraction.cpp:966
 #, fuzzy
 msgid "Remove Header"
 msgstr "gwaredu penawd"
 
-#: kmfilteraction.cpp:1036
+#: kmfilteraction.cpp:1039
 #, fuzzy
 msgid "Add Header"
 msgstr "ychwanegu penawd"
 
-#: kmfilteraction.cpp:1063
+#: kmfilteraction.cpp:1066
 #, fuzzy
 msgid "With value:"
 msgstr "efo gwerth"
 
-#: kmfilteraction.cpp:1177
+#: kmfilteraction.cpp:1180
 #, fuzzy
 msgid "Rewrite Header"
 msgstr "ail-ysgrifennu penawd"
 
-#: kmfilteraction.cpp:1213
+#: kmfilteraction.cpp:1216
 msgid "Replace:"
 msgstr "Amnewid:"
 
-#: kmfilteraction.cpp:1220
+#: kmfilteraction.cpp:1223
 #, fuzzy
 msgid "With:"
 msgstr "efo"
 
-#: kmfilteraction.cpp:1340
+#: kmfilteraction.cpp:1343
 #, fuzzy
 msgid "Move Into Folder"
 msgstr "Symud i'r Blygell Yma"
 
-#: kmfilteraction.cpp:1390
+#: kmfilteraction.cpp:1393
 #, fuzzy
 msgid "Copy Into Folder"
 msgstr "Copïo i'r Blygell Yma"
 
-#: kmfilteraction.cpp:1452
+#: kmfilteraction.cpp:1467
 msgid "Forward To"
 msgstr "Blaenyrru I"
 
-#: kmfilteraction.cpp:1565
+#: kmfilteraction.cpp:1508
+msgid "The addressee the message will be forwarded to"
+msgstr ""
+
+#: kmfilteraction.cpp:1509
+msgid "The filter will forward the message to the addressee entered here."
+msgstr ""
+
+#: kmfilteraction.cpp:1515
+#, fuzzy
+msgid "Default Template"
+msgstr "&Amnewid"
+
+#: kmfilteraction.cpp:1525
+#, fuzzy
+msgid "The template used when forwarding"
+msgstr "Nodi Neges fel Wedi'i &Blaenyrru"
+
+#: kmfilteraction.cpp:1526
+msgid "Set the forwarding template that will be used with this filter."
+msgstr ""
+
+#: kmfilteraction.cpp:1620
+#, fuzzy
+msgid "Forward to %1 with default template "
+msgstr "&Defnyddio ôlddodiad dynodiad neges addasiedig."
+
+#: kmfilteraction.cpp:1622
+#, fuzzy
+msgid "Forward to %1 with template %2"
+msgstr "&Defnyddio ôlddodiad dynodiad neges addasiedig."
+
+#: kmfilteraction.cpp:1643
 #, fuzzy
 msgid "Redirect To"
 msgstr "ail-gyfeirio i "
 
-#: kmfilteraction.cpp:1605
+#: kmfilteraction.cpp:1683
 #, fuzzy
 msgid "Execute Command"
 msgstr "gweithredu gorchymyn"
 
-#: kmfilteraction.cpp:1702
+#: kmfilteraction.cpp:1780
 #, fuzzy
 msgid "Pipe Through"
 msgstr "pibellu drwy"
 
-#: kmfilteraction.cpp:1809
+#: kmfilteraction.cpp:1887
 #, fuzzy
 msgid "Play Sound"
 msgstr "chwarae sŵm"
 
-#: kmfilterdlg.cpp:51
+#: kmfilterdlg.cpp:55
 msgid ""
 "<qt>"
 "<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
@@ -6099,7 +6862,7 @@ msgstr ""
 "<p>Cliciwch ar unrhyw hidlen i'w golygu gan ddefnyddio'r rheolyddion yn hanner "
 "dde yr ymgom.</p></qt>"
 
-#: kmfilterdlg.cpp:57
+#: kmfilterdlg.cpp:61
 #, fuzzy
 msgid ""
 "<qt>"
@@ -6116,7 +6879,7 @@ msgstr ""
 "<p>Os ydych wedi clicio'r botwm yma wrth gamgymeriad, gallwch ddatwneud hyn gan "
 "glicio ar y botwm <em>Dileu</em>.</p></qt>"
 
-#: kmfilterdlg.cpp:64
+#: kmfilterdlg.cpp:68
 #, fuzzy
 msgid ""
 "<qt>"
@@ -6131,7 +6894,7 @@ msgstr ""
 "<p>Os ydych wedi clicio'r botwm yma wrth gamgymeriad, gallwch ddatwneud hyn gan "
 "glicio ar y botwm <em>Dileu</em>.</p></qt>"
 
-#: kmfilterdlg.cpp:68
+#: kmfilterdlg.cpp:72
 #, fuzzy
 msgid ""
 "<qt>"
@@ -6147,7 +6910,7 @@ msgstr ""
 "<p>Nid oes ffordd o gael yr hidlen yn ôl wedi'i dileu, ond gallwch gadael yr "
 "ymgom gan glicio <em>Diddymu</em> i daflu'r newidion a wnaed.</p></qt>"
 
-#: kmfilterdlg.cpp:75
+#: kmfilterdlg.cpp:79
 #, fuzzy
 msgid ""
 "<qt>"
@@ -6165,7 +6928,7 @@ msgstr ""
 "<p>Os ydych wedi clicio'r botwm yma wrth gamgymeriad, gallwch ddatwneud hyn gan "
 "glicio ar y botwm  <em>I Fyny</em>.</p></qt>"
 
-#: kmfilterdlg.cpp:81
+#: kmfilterdlg.cpp:85
 #, fuzzy
 msgid ""
 "<qt>"
@@ -6185,7 +6948,7 @@ msgstr ""
 "<p>Os ydych wedi clicio'r botwm yma wrth gamgymeriad, gallwch ddatwneud hyn gan "
 "glicio ar y botwm  <em>I Lawr</em>.</p></qt>"
 
-#: kmfilterdlg.cpp:89
+#: kmfilterdlg.cpp:93
 #, fuzzy
 msgid ""
 "<qt>"
@@ -6205,7 +6968,7 @@ msgstr ""
 "<p>Os ydych wedi clicio'r botwm yma wrth gamgymeriad, gallwch ddatwneud hyn gan "
 "glicio ar y botwm  <em>I Fyny</em>.</p></qt>"
 
-#: kmfilterdlg.cpp:97
+#: kmfilterdlg.cpp:101
 #, fuzzy
 msgid ""
 "<qt>"
@@ -6223,7 +6986,7 @@ msgstr ""
 "<p>Os ydych wedi clicio'r botwm yma wrth gamgymeriad, gallwch ddatwneud hyn gan "
 "glicio ar y botwm  <em>I Fyny</em>.</p></qt>"
 
-#: kmfilterdlg.cpp:103
+#: kmfilterdlg.cpp:107
 #, fuzzy
 msgid ""
 "<qt>"
@@ -6240,7 +7003,7 @@ msgstr ""
 "cliciwch y botwm yma a dewiswch <em>Gwagu</em> ac wedyn <em>Iawn</em> "
 "yn yr ymgom a ymddengys.</p></qt>"
 
-#: kmfilterdlg.cpp:110
+#: kmfilterdlg.cpp:114
 #, fuzzy
 msgid ""
 "<qt>"
@@ -6259,129 +7022,134 @@ msgstr ""
 "yn aros ar y gweinydd, neu pe baech eisiau newid y casgliad rheolau i nodi'r "
 "negeseuon yn wahanol.</p></qt>"
 
-#: kmfilterdlg.cpp:129
+#: kmfilterdlg.cpp:133
 msgid "POP3 Filter Rules"
 msgstr "Rheolau Hidlo POP3"
 
-#: kmfilterdlg.cpp:129
+#: kmfilterdlg.cpp:133
 msgid "Filter Rules"
 msgstr "Rheolau Hidlo"
 
-#: kmfilterdlg.cpp:151
+#: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "Hidlau ar Gael"
 
-#: kmfilterdlg.cpp:164
+#: kmfilterdlg.cpp:168
 msgid "A&dvanced"
 msgstr "U&wch"
 
-#: kmfilterdlg.cpp:171
+#: kmfilterdlg.cpp:175
 msgid "Filter Criteria"
 msgstr "Meini Prawf Hidlo"
 
-#: kmfilterdlg.cpp:175
+#: kmfilterdlg.cpp:179
 msgid "Filter Action"
 msgstr "Gweithred Hidlo"
 
-#: kmfilterdlg.cpp:178
+#: kmfilterdlg.cpp:182
 msgid "Global Options"
 msgstr "Dewisiadau Eang"
 
-#: kmfilterdlg.cpp:179
+#: kmfilterdlg.cpp:183
 msgid "Always &show matched 'Download Later' messages in confirmation dialog"
 msgstr ""
 "Dan&gos negeseuon 'Lawrlwytho yn Nes Ymlaen' cydwedd yn yr ymgom cadarnhau o "
 "hyd."
 
-#: kmfilterdlg.cpp:184
+#: kmfilterdlg.cpp:188
 msgid "Filter Actions"
 msgstr "Gweithredoedd Hidlo"
 
-#: kmfilterdlg.cpp:189
+#: kmfilterdlg.cpp:193
 msgid "Advanced Options"
 msgstr "Dewisiadau Uwch"
 
-#: kmfilterdlg.cpp:197
+#: kmfilterdlg.cpp:201
 #, fuzzy
 msgid "Apply this filter to incoming messages:"
 msgstr "i negeseuon &cyrraedd"
 
-#: kmfilterdlg.cpp:201
+#: kmfilterdlg.cpp:205
 #, fuzzy
 msgid "from all accounts"
 msgstr "Cyfrifon"
 
-#: kmfilterdlg.cpp:204
+#: kmfilterdlg.cpp:208
 msgid "from all but online IMAP accounts"
 msgstr ""
 
-#: kmfilterdlg.cpp:207
+#: kmfilterdlg.cpp:211
 msgid "from checked accounts only"
 msgstr ""
 
-#: kmfilterdlg.cpp:213
+#: kmfilterdlg.cpp:217
 #, fuzzy
 msgid "Account Name"
 msgstr "Cyfrif:"
 
-#: kmfilterdlg.cpp:220
+#: kmfilterdlg.cpp:224
 #, fuzzy
 msgid "Apply this filter to &sent messages"
 msgstr "Gweithredu'r hidlen yma"
 
-#: kmfilterdlg.cpp:223
+#: kmfilterdlg.cpp:227
 #, fuzzy
 msgid "Apply this filter on manual &filtering"
 msgstr "ar &hidlo â llaw"
 
-#: kmfilterdlg.cpp:226
+#: kmfilterdlg.cpp:230
 msgid "If this filter &matches, stop processing here"
 msgstr "Os &cydwedda'r hidlen, atal prosesu yma/"
 
-#: kmfilterdlg.cpp:230
+#: kmfilterdlg.cpp:234
 #, fuzzy
 msgid "Add this filter to the Apply Filter menu"
 msgstr "Ychwanegu'r hidlen yma i'r ddewislen Gweithredu Gweithredoedd Hidlo"
 
-#: kmfilterdlg.cpp:232
+#: kmfilterdlg.cpp:236
 msgid "Shortcut:"
 msgstr "Byrlwybr:"
 
-#: kmfilterdlg.cpp:238
+#: kmfilterdlg.cpp:242
 #, fuzzy
 msgid "Additionally add this filter to the toolbar"
 msgstr "Ychwanegu'r hidlen yma i'r ddewislen Gweithredu Gweithredoedd Hidlo"
 
-#: kmfilterdlg.cpp:243
+#: kmfilterdlg.cpp:247
 msgid "Icon for this filter:"
 msgstr "eicon ar gyfer yr hidlen yma:"
 
-#: kmfilterdlg.cpp:608
+#: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "I Fyny"
 
-#: kmfilterdlg.cpp:609
+#: kmfilterdlg.cpp:613
 msgid "Down"
 msgstr "I Lawr"
 
-#: kmfilterdlg.cpp:628
+#: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "Ailenwi..."
 
 #. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:629 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
 #, no-c-format
 msgid "New"
 msgstr "Newydd"
 
-#: kmfilterdlg.cpp:744
+#: kmfilterdlg.cpp:645
+#, fuzzy
+msgid "Select Source Folders"
+msgstr "Rh&estr fer o blygyll"
+
+#: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
 "will only be applied when manually filtering and when filtering incoming online "
 "IMAP mail."
 msgstr ""
 
-#: kmfilterdlg.cpp:774
+#: kmfilterdlg.cpp:786
 msgid ""
 "The following filters have not been saved because they were invalid (e.g. "
 "containing no actions or no search rules)."
@@ -6389,29 +7157,34 @@ msgstr ""
 "Ni chedwyd yr hidlau dilynnol gan eu bod yn annilys (e.e. heb gynnwys "
 "gweithredoedd neu reolau chwilio)."
 
-#: kmfilterdlg.cpp:935
+#: kmfilterdlg.cpp:947
 msgid "Rename Filter"
 msgstr "Ailenwi Hidlen"
 
-#: kmfilterdlg.cpp:936
+#: kmfilterdlg.cpp:948
 msgid ""
 "Rename filter \"%1\" to:\n"
 "(leave the field empty for automatic naming)"
 msgstr ""
 
-#: kmfilterdlg.cpp:1113
+#: kmfilterdlg.cpp:973
+#, fuzzy
+msgid "Select Folders to Filter"
+msgstr "Deiws y Blygell efo'r Canolbwynt"
+
+#: kmfilterdlg.cpp:1136
 msgid "Please select an action."
 msgstr "Dewiswch weithred."
 
-#: kmfilterdlg.cpp:1280
+#: kmfilterdlg.cpp:1303
 msgid "&Download mail"
 msgstr "&Lawrlwytho ebost"
 
-#: kmfilterdlg.cpp:1281
+#: kmfilterdlg.cpp:1304
 msgid "Download mail la&ter"
 msgstr "Lawrlwytho ebost yn &nes ymlaen"
 
-#: kmfilterdlg.cpp:1282
+#: kmfilterdlg.cpp:1305
 msgid "D&elete mail from server"
 msgstr "&Dileu ebost oddiar y gweinydd"
 
@@ -6419,10 +7192,28 @@ msgstr "&Dileu ebost oddiar y gweinydd"
 msgid "<qt>Error while creating file <b>%1</b>:<br>%2</qt>"
 msgstr "<qt>Gwall wrth greu'r ffeil:  <b>%1</b>:<br>%2</qt>"
 
-#: kmfolder.cpp:272
+#: kmfolder.cpp:276
 msgid "Failed to create folder"
 msgstr "Methwyd creu plygell"
 
+#: kmfolder.cpp:907
+msgid ""
+"Folder names cannot contain the / (slash) character; please choose another "
+"folder name."
+msgstr ""
+
+#: kmfolder.cpp:913
+msgid ""
+"Folder names cannot start with a . (dot) character; please choose another "
+"folder name."
+msgstr ""
+
+#: kmfolder.cpp:932
+msgid ""
+"Your IMAP server does not allow the character '%1'; please choose another "
+"folder name."
+msgstr ""
+
 #: kmfoldercachedimap.cpp:107
 #, fuzzy
 msgid "Troubleshooting IMAP Cache"
@@ -6482,23 +7273,23 @@ msgstr "Mae'r plygyll adnodd yn is-&blygyll o:"
 msgid "Refresh &Cache"
 msgstr "Ailfywio &Celc"
 
-#: kmfoldercachedimap.cpp:203
+#: kmfoldercachedimap.cpp:216
 msgid ""
 "The UID cache file for folder %1 could not be read. There could be a problem "
 "with file system permission, or it is corrupted."
 msgstr ""
 
-#: kmfoldercachedimap.cpp:452
+#: kmfoldercachedimap.cpp:488
 msgid ""
 "The UID cache file for folder %1 could not be written. There could be a problem "
 "with file system permission."
 msgstr ""
 
-#: kmfoldercachedimap.cpp:562
+#: kmfoldercachedimap.cpp:612
 msgid "You must synchronize with the server before renaming IMAP folders."
 msgstr "Rhaid i chi gydamseru efo'r gweinydd cyn ailenwi plygyll IMAP"
 
-#: kmfoldercachedimap.cpp:679
+#: kmfoldercachedimap.cpp:735
 msgid ""
 "No account setup for this folder.\n"
 "Please try running a sync before this."
@@ -6506,7 +7297,7 @@ msgstr ""
 "Ni osodwyd cyfrif ar gyfer y blygell yma.\n"
 "Ceisiwch gydamseru cyn wneud hyn."
 
-#: kmfoldercachedimap.cpp:683
+#: kmfoldercachedimap.cpp:739
 #, fuzzy
 msgid ""
 "Are you sure you want to refresh the IMAP cache of the folder %1 and all its "
@@ -6516,19 +7307,19 @@ msgstr ""
 "Ydych yn sicr yr hoffech ailfywio celc IMAP plygell %1, a'i holl is-blygyll?n "
 "Bydd hyn yn gwaredu pob newid a wnaethoch yn lleol i'ch plygyll."
 
-#: kmfoldercachedimap.cpp:687 kmmainwidget.cpp:1352
+#: kmfoldercachedimap.cpp:743 kmmainwidget.cpp:1316
 msgid "Refresh IMAP Cache"
 msgstr "Ailfywio'r Gelc IMAP"
 
-#: kmfoldercachedimap.cpp:688 kmmainwidget.cpp:1352
+#: kmfoldercachedimap.cpp:744 kmmainwidget.cpp:1316
 msgid "&Refresh"
 msgstr "&Ailfywio"
 
-#: kmfoldercachedimap.cpp:711
+#: kmfoldercachedimap.cpp:767
 msgid "The index of this folder has been recreated."
 msgstr "Ailgreuwyd mynegai y blygell yma."
 
-#: kmfoldercachedimap.cpp:721
+#: kmfoldercachedimap.cpp:777
 #, fuzzy
 msgid ""
 "Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
@@ -6537,135 +7328,136 @@ msgstr ""
 "Nid yw plygell %1 mewn cyflwr cydamseru cychwynnol (%2 oedd y cyflwr). \n"
 "Ydych am ei ailosod i'r cyflwr cydamseru cychwynnol a cydamseru serch hynny?"
 
-#: kmfoldercachedimap.cpp:721
+#: kmfoldercachedimap.cpp:777
 msgid "Reset && Sync"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:741
+#: kmfoldercachedimap.cpp:798
 msgid "Synchronization skipped"
 msgstr "Cydamseru wedi'i hepgor"
 
-#: kmfoldercachedimap.cpp:831
+#: kmfoldercachedimap.cpp:890
 msgid "Synchronizing"
 msgstr "Cydamseru"
 
-#: kmfoldercachedimap.cpp:850
+#: kmfoldercachedimap.cpp:909
 #, c-format
 msgid "Connecting to %1"
 msgstr "Wrthi'n cysylltu i %1... "
 
-#: kmfoldercachedimap.cpp:872
+#: kmfoldercachedimap.cpp:934
 msgid "Checking permissions"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:886
+#: kmfoldercachedimap.cpp:956
 #, fuzzy
 msgid "Renaming folder"
 msgstr "Atgoffydd"
 
-#: kmfoldercachedimap.cpp:948
+#: kmfoldercachedimap.cpp:1021
 msgid "Retrieving folderlist"
 msgstr "Nôl rhestr plygyll"
 
-#: kmfoldercachedimap.cpp:952
+#: kmfoldercachedimap.cpp:1026
 #, fuzzy
 msgid "Error while retrieving the folderlist"
 msgstr "Nôl rhestr plygyll"
 
-#: kmfoldercachedimap.cpp:959
+#: kmfoldercachedimap.cpp:1035
 msgid "Retrieving subfolders"
 msgstr "Nôl is-blygyll"
 
-#: kmfoldercachedimap.cpp:966
+#: kmfoldercachedimap.cpp:1043
 msgid "Deleting folders from server"
 msgstr "Dileu plygyll oddiar y gweinydd"
 
-#: kmfoldercachedimap.cpp:981
+#: kmfoldercachedimap.cpp:1058
 #, fuzzy
 msgid "Retrieving message list"
 msgstr "Nôl y rhestr negeseuon"
 
-#: kmfoldercachedimap.cpp:994
+#: kmfoldercachedimap.cpp:1071
 msgid "No messages to delete..."
 msgstr "Dim negeseuon i'w dileu..."
 
-#: kmfoldercachedimap.cpp:1005
+#: kmfoldercachedimap.cpp:1082
 msgid "Expunging deleted messages"
 msgstr "Gwaredu negeseuon a ddileuwyd"
 
-#: kmfoldercachedimap.cpp:1019
-msgid "Retrieving new messages"
-msgstr "Nôl negeseuon newydd"
+#: kmfoldercachedimap.cpp:1096
+#, fuzzy, c-format
+msgid ""
+"_n: Retrieving one new message\n"
+"Retrieving %n new messages"
+msgstr ""
+"%n neges, %1.\n"
+"%n o negeseuon, %1."
 
-#: kmfoldercachedimap.cpp:1031
+#: kmfoldercachedimap.cpp:1108
 msgid "No new messages from server"
 msgstr "Dim negeseuon newydd o'r gweinydd"
 
-#: kmfoldercachedimap.cpp:1064
+#: kmfoldercachedimap.cpp:1141
 #, fuzzy
 msgid "Checking annotation support"
 msgstr "Nôl y rhestr negeseuon"
 
-#: kmfoldercachedimap.cpp:1111
+#: kmfoldercachedimap.cpp:1191
 #, fuzzy
 msgid "Retrieving annotations"
 msgstr "Nôl y rhestr negeseuon"
 
-#: kmfoldercachedimap.cpp:1133
+#: kmfoldercachedimap.cpp:1213
 msgid "Setting annotations"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:1174
+#: kmfoldercachedimap.cpp:1260
 msgid "Setting permissions"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:1193
+#: kmfoldercachedimap.cpp:1279
 #, fuzzy
 msgid "Retrieving permissions"
 msgstr "Nôl y rhestr negeseuon"
 
-#: kmfoldercachedimap.cpp:1203
+#: kmfoldercachedimap.cpp:1306
 #, fuzzy
 msgid "Getting quota information"
 msgstr "Gwall wrth lanlwytho'r plygell"
 
-#: kmfoldercachedimap.cpp:1218
-msgid "Updating cache file"
-msgstr "Diweddaru ffeil celc"
-
-#: kmfoldercachedimap.cpp:1244
+#: kmfoldercachedimap.cpp:1321
 msgid "Synchronization done"
 msgstr "Cydamseru wedi'i gyflawni"
 
-#: kmfoldercachedimap.cpp:1326
+#: kmfoldercachedimap.cpp:1464
 msgid "Uploading messages to server"
 msgstr "Lanlwytho negeseuon i'r gweinydd"
 
-#: kmfoldercachedimap.cpp:1342
+#: kmfoldercachedimap.cpp:1480
 msgid ""
 "<p>Your access rights to folder <b>%1</b> have been restricted, it will no "
 "longer be possible to add messages to this folder.</p>"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:1344
+#: kmfoldercachedimap.cpp:1482
 msgid "Acces rights revoked"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:1347 kmfoldercachedimap.cpp:1402
-#: kmfoldercachedimap.cpp:1447
+#: kmfoldercachedimap.cpp:1485 kmfoldercachedimap.cpp:1545
+#: kmfoldercachedimap.cpp:1596
 msgid "No messages to upload to server"
 msgstr "Dim negeseuon i lanlwytho i'r gweinydd"
 
-#: kmfoldercachedimap.cpp:1366 kmfoldercachedimap.cpp:1410
+#: kmfoldercachedimap.cpp:1504 kmfoldercachedimap.cpp:1553
 #, fuzzy
 msgid "Uploading status of messages to server"
 msgstr "Lanlwytho negeseuon i'r gweinydd"
 
-#: kmfoldercachedimap.cpp:1490
+#: kmfoldercachedimap.cpp:1647
 msgid "Creating subfolders on server"
 msgstr "Creu is-blygyll ar y gweinydd"
 
-#: kmfoldercachedimap.cpp:1546
+#: kmfoldercachedimap.cpp:1707
 msgid ""
 "<qt>"
 "<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
@@ -6673,56 +7465,56 @@ msgid ""
 "<br>UIDs: %2</p></qt>"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:1558
+#: kmfoldercachedimap.cpp:1719
 msgid "Deleting removed messages from server"
 msgstr "Dileu negeseuon a waredwyd o'r gelc"
 
-#: kmfoldercachedimap.cpp:1592
+#: kmfoldercachedimap.cpp:1758
 msgid "Checking folder validity"
 msgstr "Gwirio dilysrwydd y blygell"
 
-#: kmfoldercachedimap.cpp:1806
+#: kmfoldercachedimap.cpp:1972
 msgid "Folder listing failed in interesting ways."
 msgstr ""
 
-#: kmfoldercachedimap.cpp:1888
+#: kmfoldercachedimap.cpp:2058
 #, fuzzy, c-format
 msgid "Retrieving folders for namespace %1"
 msgstr "Nôl rhestr plygyll"
 
-#: kmfoldercachedimap.cpp:2130
+#: kmfoldercachedimap.cpp:2300
 msgid ""
 "<qt>"
 "<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
 "from the server?</p></qt>"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:2411
+#: kmfoldercachedimap.cpp:2597
 msgid "Aborted"
 msgstr "Terfynwyd"
 
-#: kmfoldercachedimap.cpp:2592
+#: kmfoldercachedimap.cpp:2812
 msgid ""
 "The IMAP server %1 does not have support for IMAP annotations. The XML storage "
 "cannot be used on this server; please re-configure KMail differently."
 msgstr ""
 
-#: kmfoldercachedimap.cpp:2620
+#: kmfoldercachedimap.cpp:2840
 msgid ""
 "The IMAP server %1 doesn't have support for imap annotations. The XML storage "
 "cannot be used on this server, please re-configure KMail differently"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:2729
+#: kmfoldercachedimap.cpp:2951
 #, fuzzy
 msgid "Error while setting annotation: "
 msgstr "Gwall wrth lanlwytho'r plygell"
 
-#: kmfoldercachedimap.cpp:2857 kmfoldercachedimap.cpp:2860
+#: kmfoldercachedimap.cpp:3079 kmfoldercachedimap.cpp:3082
 msgid "lost+found"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:2895
+#: kmfoldercachedimap.cpp:3117
 msgid ""
 "<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
 "the server yet, but the folder has been deleted on the server or you do not "
@@ -6731,11 +7523,11 @@ msgid ""
 "to avoid data loss.</p>"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:2901
+#: kmfoldercachedimap.cpp:3123
 msgid "Insufficient access rights"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:2907
+#: kmfoldercachedimap.cpp:3129
 msgid ""
 "<p>There are new messages in this folder (%1), which have not been uploaded to "
 "the server yet, but the folder has been deleted on the server or you do not "
@@ -6745,59 +7537,66 @@ msgid ""
 "<p>Do you want to move these messages to another folder now?</p>"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:2914 kmkernel.cpp:1801
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1903
 msgid "Do Not Move"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:2916
+#: kmfoldercachedimap.cpp:3138
 #, fuzzy
 msgid "Move Messages to Folder"
 msgstr "Symud Neges i Blygell"
 
-#: kmfolderdia.cpp:83
+#: kmfolderdia.cpp:84
 #, fuzzy
 msgid "Permissions (ACL)"
 msgstr "Caniatadau"
 
 #. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:121 rc.cpp:221 snippetwidget.cpp:119
+#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "Cyffredinol"
 
-#: kmfolderdia.cpp:124
+#: kmfolderdia.cpp:125
 msgid "Templates"
 msgstr ""
 
-#: kmfolderdia.cpp:133
+#: kmfolderdia.cpp:134
 msgid "Access Control"
 msgstr ""
 
-#: kmfolderdia.cpp:140
+#: kmfolderdia.cpp:141
 #, fuzzy
 msgid "Quota"
 msgstr "Cyfanswm"
 
+#: kmfolderdia.cpp:327
+msgid ""
+"Not enough permissions to rename this folder.\n"
+"The parent folder doesn't have write support.\n"
+"A sync is needed after changing the permissions."
+msgstr ""
+
 #. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:299 rc.cpp:239
+#: kmfolderdia.cpp:356 rc.cpp:245
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "Defnyddio &eiconau addasiedig"
 
-#: kmfolderdia.cpp:304
+#: kmfolderdia.cpp:361
 msgid "&Normal:"
 msgstr "&Arferol:"
 
-#: kmfolderdia.cpp:319
+#: kmfolderdia.cpp:376
 msgid "&Unread:"
 msgstr "&Heb ei ddarllen:"
 
-#: kmfolderdia.cpp:356
+#: kmfolderdia.cpp:413
 #, fuzzy
 msgid "Act on new/unread mail in this folder"
 msgstr "Ymofyn Ebost yn y Blygell yma"
 
-#: kmfolderdia.cpp:358
+#: kmfolderdia.cpp:415
 msgid ""
 "<qt>"
 "<p>If this option is enabled then you will be notified about new/unread mail in "
@@ -6809,53 +7608,53 @@ msgid ""
 "new/unread mail in your trash and spam folder.</p></qt>"
 msgstr ""
 
-#: kmfolderdia.cpp:374
+#: kmfolderdia.cpp:431
 #, fuzzy
 msgid "Include this folder in mail checks"
 msgstr "Cynnwys yn yr ymofyn:"
 
-#: kmfolderdia.cpp:385
+#: kmfolderdia.cpp:442
 #, fuzzy
 msgid "Keep replies in this folder"
 msgstr "&Darfod hen negeseuon yn y blygell yma"
 
-#: kmfolderdia.cpp:387
+#: kmfolderdia.cpp:444
 msgid ""
 "Check this option if you want replies you write to mails in this folder to be "
 "put in this same folder after sending, instead of in the configured sent-mail "
 "folder."
 msgstr ""
 
-#: kmfolderdia.cpp:402
+#: kmfolderdia.cpp:459
 msgid "Show Sender/Receiver Column in List of Messages"
 msgstr ""
 
-#: kmfolderdia.cpp:404
+#: kmfolderdia.cpp:461
 #, fuzzy
 msgid "Sho&w column:"
 msgstr "Colofn Faint"
 
 #. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:411 kmheaders.cpp:181 kmheaders.cpp:243 kmheaders.cpp:378
-#: kmheaders.cpp:549 kmheaders.cpp:765 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:287
+#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
+#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
 #, no-c-format
 msgid "Sender"
 msgstr "Anfonwr"
 
 #. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:412 kmheaders.cpp:139 kmheaders.cpp:184 kmheaders.cpp:240
-#: kmheaders.cpp:245 kmheaders.cpp:380 kmheaders.cpp:551 kmheaders.cpp:767
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:290
+#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
+#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
+#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
 #, no-c-format
 msgid "Receiver"
 msgstr "Derbyniwr"
 
-#: kmfolderdia.cpp:423
+#: kmfolderdia.cpp:480
 #, fuzzy
 msgid "&Sender identity:"
 msgstr "Dynodiad yr &Anfonwr:"
 
-#: kmfolderdia.cpp:429
+#: kmfolderdia.cpp:486
 msgid ""
 "Select the sender identity to be used when writing new mail or replying to mail "
 "in this folder. This means that if you are in one of your work folders, you can "
@@ -6864,16 +7663,16 @@ msgid ""
 "configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
 
-#: kmfolderdia.cpp:442
+#: kmfolderdia.cpp:500
 #, fuzzy
 msgid "&Folder contents:"
 msgstr "Eiconau Plygell"
 
-#: kmfolderdia.cpp:475
+#: kmfolderdia.cpp:533
 msgid "Generate free/&busy and activate alarms for:"
 msgstr ""
 
-#: kmfolderdia.cpp:482
+#: kmfolderdia.cpp:540
 msgid ""
 "This setting defines which users sharing this folder should get \"busy\" "
 "periods in their freebusy lists and should see the alarms for the events or "
@@ -6889,30 +7688,41 @@ msgid ""
 "is not known who will go to those events."
 msgstr ""
 
-#: kmfolderdia.cpp:497
+#: kmfolderdia.cpp:555
 msgid "Nobody"
 msgstr "Neb"
 
-#: kmfolderdia.cpp:498
+#: kmfolderdia.cpp:556
 #, fuzzy
 msgid "Admins of This Folder"
 msgstr "&Darfod hen negeseuon yn y blygell yma"
 
-#: kmfolderdia.cpp:499
+#: kmfolderdia.cpp:557
 #, fuzzy
 msgid "All Readers of This Folder"
 msgstr "&Darfod hen negeseuon yn y blygell yma"
 
-#: kmfolderdia.cpp:502
+#: kmfolderdia.cpp:560
 msgid ""
 "This setting allows you to disable alarms for folders shared by others. "
 msgstr ""
 
-#: kmfolderdia.cpp:506
-msgid "Block free/&busy and alarms locally"
+#: kmfolderdia.cpp:562
+msgid "Block alarms locally"
+msgstr ""
+
+#: kmfolderdia.cpp:576
+msgid "Share unread state with all users"
+msgstr ""
+
+#: kmfolderdia.cpp:579
+msgid ""
+"If enabled, the unread state of messages in this folder will be the same for "
+"all users having access to this folders. If disabled (the default), every user "
+"with access to this folder has her own unread state."
 msgstr ""
 
-#: kmfolderdia.cpp:585
+#: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
 "general configuration option to hide groupware folders is set. That means that "
@@ -6921,79 +7731,79 @@ msgid ""
 "groupware folders to be able to see it."
 msgstr ""
 
-#: kmfolderdir.cpp:184
+#: kmfolderdir.cpp:209
 msgid "<qt>Cannot enter folder <b>%1</b>.</qt>"
 msgstr "<qt>Methu mynd i mewn i blygell <b>%1</b>.</qt>"
 
-#: kmfolderdir.cpp:192
+#: kmfolderdir.cpp:217
 msgid "<qt>Folder <b>%1</b> is unreadable.</qt>"
 msgstr "<qt>Methu darllen plygell <b>%1</b>.</qt>"
 
-#: kmfolderimap.cpp:251
+#: kmfolderimap.cpp:247
 #, fuzzy
 msgid "Removing folder"
 msgstr "Atgoffydd"
 
-#: kmfolderimap.cpp:252 searchjob.cpp:270
+#: kmfolderimap.cpp:248 searchjob.cpp:270
 #, c-format
 msgid "URL: %1"
 msgstr "URL: %1"
 
-#: kmfolderimap.cpp:267
+#: kmfolderimap.cpp:263
 #, fuzzy
 msgid "Error while removing a folder."
 msgstr "Gwall wrth lanlwytho'r plygell"
 
-#: kmfolderimap.cpp:497
+#: kmfolderimap.cpp:491
 #, fuzzy, c-format
 msgid "Destination folder: %1"
 msgstr "Plygell cyrchfan: "
 
-#: kmfolderimap.cpp:1068
+#: kmfolderimap.cpp:1069
 msgid "checking"
 msgstr ""
 
-#: kmfolderimap.cpp:1118
+#: kmfolderimap.cpp:1119
 #, fuzzy
 msgid "Error while querying the server status."
 msgstr "Gwall wrth lanlwytho'r neges"
 
-#: kmfolderimap.cpp:1233
+#: kmfolderimap.cpp:1234
 #, fuzzy
 msgid "Retrieving message status"
 msgstr "Nôl y rhestr negeseuon"
 
-#: kmfolderimap.cpp:1248 kmfolderimap.cpp:1343
+#: kmfolderimap.cpp:1249 kmfolderimap.cpp:1344
 #, fuzzy
 msgid "Retrieving messages"
 msgstr "Nôl y rhestr negeseuon"
 
-#: kmfolderimap.cpp:1273
+#: kmfolderimap.cpp:1274
 #, c-format
 msgid "Error while listing the contents of the folder %1."
 msgstr ""
 
-#: kmfolderimap.cpp:1694
+#: kmfolderimap.cpp:1695
 #, fuzzy
 msgid "Error while retrieving messages."
 msgstr "Gwall wrth lanlwytho'r neges"
 
-#: kmfolderimap.cpp:1763
+#: kmfolderimap.cpp:1764
 #, fuzzy
 msgid "Error while creating a folder."
 msgstr "Gwall wrth lanlwytho'r plygell"
 
-#: kmfolderimap.cpp:2130
+#: kmfolderimap.cpp:2131
 #, fuzzy
 msgid "updating message counts"
 msgstr "Ni chanfuwyd negeseuon dyblyg."
 
-#: kmfolderimap.cpp:2154
+#: kmfolderimap.cpp:2155
 #, fuzzy
 msgid "Error while getting folder information."
 msgstr "Gwall wrth lanlwytho'r plygell"
 
-#: kmfolderindex.cpp:334
+#: kmfolderindex.cpp:369
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
@@ -7004,20 +7814,20 @@ msgstr ""
 "cynnwys baneri cyflwr, yn cael ei cholli.  Ydych eisiau israddio eich ffeil "
 "mynegai?"
 
-#: kmfolderindex.cpp:337
+#: kmfolderindex.cpp:372
 #, fuzzy
 msgid "Downgrade"
 msgstr "I Lawr"
 
-#: kmfolderindex.cpp:337
+#: kmfolderindex.cpp:372
 msgid "Do Not Downgrade"
 msgstr ""
 
-#: kmfolderindex.cpp:491
+#: kmfolderindex.cpp:529
 #, fuzzy
 msgid ""
 "The mail index for '%1' is corrupted and will be regenerated now, but some "
-"information, including status flags, will be lost."
+"information, like status flags, might get lost."
 msgstr ""
 "Mae'r mynegai ebost ar gyfer '%1' o fersiwn anhysbys KMail (%2).\n"
 "Gellir ailgreu'r mynegai o'ch plygell ebost, ond gall fod rhyw wybodaeth, yn "
@@ -7042,24 +7852,24 @@ msgstr ""
 msgid "Folder `%1' changed; recreating index."
 msgstr "Newidwyd plygell '%1'.  Ailgreuir y mynegai."
 
-#: kmfoldermaildir.cpp:252
+#: kmfoldermaildir.cpp:253
 #, fuzzy
 msgid "Could not sync maildir folder."
 msgstr "Methu cydamseru'r blygell maildir."
 
-#: kmfoldermaildir.cpp:417
+#: kmfoldermaildir.cpp:418
 msgid "Message could not be added to the folder, possibly disk space is low."
 msgstr ""
 
-#: kmfoldermaildir.cpp:510
+#: kmfoldermaildir.cpp:514
 msgid "KMFolderMaildir::addMsg: abnormally terminating to prevent data loss."
 msgstr "KMFolderMaildir::addMsg: yn terfynu yn anarferol i atal colli data."
 
-#: kmfoldermaildir.cpp:884 kmfoldermbox.cpp:794
+#: kmfoldermaildir.cpp:888 kmfoldermbox.cpp:799
 msgid "Writing index file"
 msgstr "Ysgrifennu ffeil mynegai."
 
-#: kmfoldermaildir.cpp:892 kmfoldermbox.cpp:803
+#: kmfoldermaildir.cpp:896 kmfoldermbox.cpp:808
 #, fuzzy
 msgid ""
 "Your outbox contains messages which were most-likely not created by KMail;\n"
@@ -7069,7 +7879,7 @@ msgstr ""
 "golwg.\n"
 "Gwaredwch nhw o fan'na, os ni hoffech i KMail eu anfon."
 
-#: kmfoldermbox.cpp:111
+#: kmfoldermbox.cpp:112
 msgid ""
 "Cannot open file \"%1\":\n"
 "%2"
@@ -7077,7 +7887,7 @@ msgstr ""
 "Methu agor ffeil \"%1\":\n"
 "%2"
 
-#: kmfoldermbox.cpp:128
+#: kmfoldermbox.cpp:129
 msgid ""
 "<qt>"
 "<p>The index of folder '%2' seems to be out of date. To prevent message "
@@ -7095,23 +7905,23 @@ msgstr ""
 "adran FAQ (Cwestiynau a Ofynnir yn Aml) o'r llawlyfr KMail</a> "
 "ar gyfer gwybodaeth am sut i atal i'r broblem yma ddigwydd eto.</p></qt>"
 
-#: kmfoldermbox.cpp:152 kmfoldermbox.cpp:158
+#: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
 msgid "Index Out of Date"
 msgstr "Mynegai Wedi Dyddio"
 
-#: kmfoldermbox.cpp:165
+#: kmfoldermbox.cpp:166
 msgid "Folder `%1' changed. Recreating index."
 msgstr "Newidwyd plygell '%1'.  Ailgreuir y mynegai."
 
-#: kmfoldermbox.cpp:298
+#: kmfoldermbox.cpp:300
 msgid "Could not sync index file <b>%1</b>: %2"
 msgstr "Methu cydamseru ffeil mynegai <b>%1</b>: %2"
 
-#: kmfoldermbox.cpp:298
+#: kmfoldermbox.cpp:300
 msgid "Internal error. Please copy down the details and report a bug."
 msgstr "Gwall mewnol.  Copiwch y manylion ac rhowch adroddiad nam."
 
-#: kmfoldermbox.cpp:597
+#: kmfoldermbox.cpp:602
 #, c-format
 msgid ""
 "_n: Creating index file: one message done\n"
@@ -7120,15 +7930,15 @@ msgstr ""
 "Creu ffeil mynegai: gwnaed un neges\n"
 "Creu ffeil mynegai: gwnaed %n o negeseuon"
 
-#: kmfoldermbox.cpp:1038
+#: kmfoldermbox.cpp:1043
 msgid "Could not add message to folder: "
 msgstr "Methu ychwanegu neges i'r blygell: "
 
-#: kmfoldermbox.cpp:1119
+#: kmfoldermbox.cpp:1127
 msgid "Could not add message to folder:"
 msgstr "Methu ychwanegu neges i'r blygell: "
 
-#: kmfoldermbox.cpp:1121
+#: kmfoldermbox.cpp:1129
 msgid "Could not add message to folder (No space left on device?)"
 msgstr "Methu ychwanegu neges i'r blygell (dim lle ar ôl ar y ddyfais?)"
 
@@ -7136,11 +7946,11 @@ msgstr "Methu ychwanegu neges i'r blygell (dim lle ar ôl ar y ddyfais?)"
 msgid "Are you sure you want to expire old messages?"
 msgstr "Ydych wir eisiau darfod hen negeseuon?"
 
-#: kmfoldermgr.cpp:69 kmmainwidget.cpp:1366
+#: kmfoldermgr.cpp:69 kmmainwidget.cpp:1330
 msgid "Expire Old Messages?"
 msgstr "Darfod Hen Negeseuon?"
 
-#: kmfoldermgr.cpp:69 kmmainwidget.cpp:1366
+#: kmfoldermgr.cpp:69 kmmainwidget.cpp:1330
 msgid "Expire"
 msgstr "Darfod"
 
@@ -7152,7 +7962,7 @@ msgstr ""
 "Ymddengys nad yw '%1' yn blygell.\n"
 "Symudwch y ffeil allan o'r ffordd."
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1325
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1368
 #, fuzzy
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
@@ -7161,7 +7971,7 @@ msgstr ""
 "Mae caniatadau plygell '%1' yn anghywir.\n"
 "Sicrhewch y gallwch ddarllen ac addasu cynnwys y blygell yma."
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1317
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1360
 #, fuzzy
 msgid ""
 "KMail could not create folder '%1';\n"
@@ -7181,7 +7991,7 @@ msgstr ""
 msgid "Could Not Create Folder"
 msgstr "Methwyd creu plygell"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1611
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1676
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -7189,118 +7999,118 @@ msgstr ""
 "Methu creu ffeil '%1' yn %2.\n"
 "Ni ellir KMail gychwyn hebddo."
 
-#: kmfolderseldlg.cpp:96 kmfolderseldlg.cpp:380 kmfolderseldlg.cpp:414
-#: kmfolderseldlg.cpp:416
-msgid "Path"
-msgstr "Llwybr"
-
-#: kmfolderseldlg.cpp:283 kmfolderseldlg.cpp:445 kmfolderseldlg.cpp:465
-#: kmfoldertree.cpp:1056 kmfoldertree.cpp:1077
+#: kmfolderseldlg.cpp:25 kmfolderseldlg.cpp:47 kmfoldertree.cpp:1091
+#: kmfoldertree.cpp:1112 treebase.cpp:99
 msgid "&New Subfolder..."
 msgstr "I&s-blygell Newydd..."
 
-#: kmfolderseldlg.cpp:446 kmfolderseldlg.cpp:466
+#: kmfolderseldlg.cpp:26 kmfolderseldlg.cpp:48
 #, fuzzy
 msgid "Create a new subfolder under the currently selected folder"
 msgstr "Cliciwch i waredu'r gwasanaeth a ddewisir yn gyfredol"
 
-#: kmfoldertree.cpp:386 kmheaders.cpp:128
+#: kmfolderseldlg.cpp:36 kmfolderseldlg.cpp:55
+msgid "You can start typing to filter the list of folders"
+msgstr ""
+
+#: kmfoldertree.cpp:407 kmheaders.cpp:130
 msgid "View Columns"
 msgstr "Gwled Colofnau"
 
-#: kmfoldertree.cpp:388
+#: kmfoldertree.cpp:409
 msgid "Unread Column"
 msgstr "Colofn heb ei Darllen"
 
-#: kmfoldertree.cpp:389
+#: kmfoldertree.cpp:410
 msgid "Total Column"
 msgstr "Colofn Gyfanswm"
 
-#: kmfoldertree.cpp:390
+#: kmfoldertree.cpp:411
 #, fuzzy
 msgid "Size Column"
 msgstr "Gwled Colofnau"
 
-#: kmfoldertree.cpp:567 kmfoldertree.cpp:1059
+#: kmfoldertree.cpp:591 kmfoldertree.cpp:1094
 msgid "Searches"
 msgstr "Chwiliadau"
 
-#: kmfoldertree.cpp:884
+#: kmfoldertree.cpp:920
 msgid "<qt>Go to the next unread message in folder <b>%1</b>?</qt>"
 msgstr "<qt>Ewch i'r neges nesaf heb ei ddarllen yn y blygell <b>%1</b>?</qt>"
 
-#: kmfoldertree.cpp:886
+#: kmfoldertree.cpp:922
 #, fuzzy
 msgid "Go to Next Unread Message"
 msgstr "Ewch i'r Neges Nesaf heb ei Ddarllen "
 
-#: kmfoldertree.cpp:887
+#: kmfoldertree.cpp:923
 msgid "Go To"
 msgstr "Ewch I"
 
-#: kmfoldertree.cpp:887
+#: kmfoldertree.cpp:923
 msgid "Do Not Go To"
 msgstr ""
 
-#: kmfoldertree.cpp:1057 kmmainwidget.cpp:2757
+#: kmfoldertree.cpp:1092 kmmainwidget.cpp:2780
 msgid "&New Folder..."
 msgstr "&Plygell Newydd"
 
-#: kmfoldertree.cpp:1068 kmmainwidget.cpp:2645
+#: kmfoldertree.cpp:1103 kmmainwidget.cpp:2668
 msgid "Check &Mail"
 msgstr "Ymofyn am E&bost"
 
-#: kmfoldertree.cpp:1084
+#: kmfoldertree.cpp:1119
 #, fuzzy
 msgid "&Copy Folder To"
 msgstr "Symud i'r Blygell Yma"
 
-#: kmfoldertree.cpp:1090
+#: kmfoldertree.cpp:1125
 #, fuzzy
 msgid "&Move Folder To"
 msgstr "Symud i'r Blygell Yma"
 
-#: kmfoldertree.cpp:1104
+#: kmfoldertree.cpp:1141
 #, fuzzy
 msgid "Add to Favorite Folders"
 msgstr "&Iaith ar gyfer plygyll cylchwedd:"
 
-#: kmfoldertree.cpp:1123
-msgid "Subscription..."
+#: kmfoldertree.cpp:1160
+#, fuzzy
+msgid "Serverside Subscription..."
 msgstr "Tanysgrifiad..."
 
-#: kmfoldertree.cpp:1126
+#: kmfoldertree.cpp:1163
 #, fuzzy
 msgid "Local Subscription..."
 msgstr "Tanysgrifiad..."
 
-#: kmfoldertree.cpp:1133
+#: kmfoldertree.cpp:1170
 #, fuzzy
 msgid "Refresh Folder List"
 msgstr "Rhestr Plygyll"
 
-#: kmfoldertree.cpp:1140 kmmainwidget.cpp:3737
+#: kmfoldertree.cpp:1177 kmmainwidget.cpp:3771
 msgid "&Troubleshoot IMAP Cache..."
 msgstr "&Cywiro Celc IMAP..."
 
-#: kmfoldertree.cpp:1242
+#: kmfoldertree.cpp:1280
 msgid ""
-"<qt>Cannot create folder <b>%1</b> because of insufficient permissions on the "
-"server. If you think you should be able to create subfolders here, ask your "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
+"the server. If you think you should be able to create subfolders here, ask your "
 "administrator to grant you rights to do so.</qt> "
 msgstr ""
 
-#: kmfoldertree.cpp:1657 kmmainwidget.cpp:420 kmmainwidget.cpp:427
-#: kmmainwidget.cpp:434 kmsearchpattern.h:220
+#: kmfoldertree.cpp:1695 kmmainwidget.cpp:412 kmmainwidget.cpp:419
+#: kmmainwidget.cpp:426 kmsearchpattern.h:220
 msgid "Unread"
 msgstr "Heb eu Darllen"
 
-#: kmfoldertree.cpp:1670 kmmainwidget.cpp:422 kmmainwidget.cpp:429
-#: kmmainwidget.cpp:436
+#: kmfoldertree.cpp:1708 kmmainwidget.cpp:414 kmmainwidget.cpp:421
+#: kmmainwidget.cpp:428
 msgid "Total"
 msgstr "Cyfanswm"
 
-#: kmfoldertree.cpp:1951
+#: kmfoldertree.cpp:1989
 #, fuzzy
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> here because a folder with the same "
@@ -7308,77 +8118,82 @@ msgid ""
 msgstr ""
 "<qt>Methwyd creu plygell <b>%1</b>, mae'r blygell mewn bod eisoes.</qt>"
 
-#: kmfoldertree.cpp:1961
+#: kmfoldertree.cpp:2000
 #, fuzzy
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> because it is not completely copied "
 "itself.</qt>"
 msgstr "<qt>Methu symud plygell <b>%1</b> i mewn i is-blygell dan ei hun.</qt>"
 
-#: kmfoldertree.cpp:1970
+#: kmfoldertree.cpp:2010
 #, fuzzy
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> into a subfolder below itself.</qt>"
 msgstr "<qt>Methu symud plygell <b>%1</b> i mewn i is-blygell dan ei hun.</qt>"
 
-#: kmfoldertree.cpp:2012
+#: kmfoldertree.cpp:2055
 #, fuzzy
 msgid "Moving the selected folders is not possible"
 msgstr "Ni chynhelir symud plygyll IMAP"
 
-#: kmheaders.cpp:130
+#: kmheaders.cpp:132
 msgid "Status"
 msgstr "Cyflwr"
 
-#: kmheaders.cpp:131 kmsearchpattern.h:218
+#: kmheaders.cpp:133 kmsearchpattern.h:218
 msgid "Important"
 msgstr "Pwysig"
 
-#: kmheaders.cpp:132
+#: kmheaders.cpp:134
 #, fuzzy
 msgid "Action Item"
 msgstr "Gweth&redu"
 
-#: kmheaders.cpp:133
+#: kmheaders.cpp:135
 msgid "Attachment"
 msgstr "Atodiad"
 
-#: kmheaders.cpp:134
+#: kmheaders.cpp:136 kmsearchpattern.h:233
+#, fuzzy
+msgid "Invitation"
+msgstr "Dogfennaeth"
+
+#: kmheaders.cpp:137
 #, fuzzy
 msgid "Spam/Ham"
 msgstr "ebostach"
 
-#: kmheaders.cpp:135
+#: kmheaders.cpp:138
 #, fuzzy
 msgid "Watched/Ignored"
 msgstr "wedi'u anwybyddu"
 
-#: kmheaders.cpp:136
+#: kmheaders.cpp:139
 msgid "Signature"
 msgstr "Llofnod"
 
-#: kmheaders.cpp:180 kmheaders.cpp:775 kmheaders.cpp:2604
-#: kmpopfiltercnfrmdlg.cpp:39 searchwindow.cpp:224
-#: templatesinsertcommand.cpp:142 templatesinsertcommand.cpp:243
+#: kmheaders.cpp:184 kmheaders.cpp:804 kmheaders.cpp:2646
+#: kmpopfiltercnfrmdlg.cpp:39 kmsearchpatternedit.cpp:41 searchwindow.cpp:223
+#: templatesinsertcommand.cpp:145 templatesinsertcommand.cpp:246
 msgid "Subject"
 msgstr "Pwnc"
 
-#: kmheaders.cpp:182 kmheaders.cpp:770 kmheaders.cpp:2599
-#: kmpopfiltercnfrmdlg.cpp:42 searchwindow.cpp:228
-#: templatesinsertcommand.cpp:66 templatesinsertcommand.cpp:167
+#: kmheaders.cpp:186 kmheaders.cpp:799 kmheaders.cpp:2641
+#: kmpopfiltercnfrmdlg.cpp:42 searchwindow.cpp:227
+#: templatesinsertcommand.cpp:66 templatesinsertcommand.cpp:170
 msgid "Date"
 msgstr "Dyddiad"
 
-#: kmheaders.cpp:772 kmheaders.cpp:2601
+#: kmheaders.cpp:801 kmheaders.cpp:2643
 #, fuzzy
 msgid "Order of Arrival"
 msgstr "Dyddiad (Trefn Cyrraedd)"
 
-#: kmheaders.cpp:777 kmheaders.cpp:2606
+#: kmheaders.cpp:806 kmheaders.cpp:2648
 msgid " (Status)"
 msgstr "(Cyflwr)"
 
-#: kmheaders.cpp:1360
+#: kmheaders.cpp:1398
 #, fuzzy, c-format
 msgid ""
 "_n: 1 unsent\n"
@@ -7387,11 +8202,11 @@ msgstr ""
 "%n heb ei ddarllen\n"
 "%n heb eu darllen"
 
-#: kmheaders.cpp:1360
+#: kmheaders.cpp:1398
 msgid "0 unsent"
 msgstr ""
 
-#: kmheaders.cpp:1362
+#: kmheaders.cpp:1400
 #, fuzzy, c-format
 msgid ""
 "_n: 1 unread\n"
@@ -7400,12 +8215,12 @@ msgstr ""
 "%n heb ei ddarllen\n"
 "%n heb eu darllen"
 
-#: kmheaders.cpp:1362
+#: kmheaders.cpp:1400
 #, fuzzy
 msgid "0 unread"
 msgstr "heb eu darllen"
 
-#: kmheaders.cpp:1364
+#: kmheaders.cpp:1402
 #, fuzzy
 msgid ""
 "_n: 1 message, %1.\n"
@@ -7414,18 +8229,18 @@ msgstr ""
 "%n neges, %1.\n"
 "%n o negeseuon, %1."
 
-#: kmheaders.cpp:1365
+#: kmheaders.cpp:1403
 #, fuzzy
 msgid "0 messages"
 msgstr "<neges>"
 
-#: kmheaders.cpp:1367
+#: kmheaders.cpp:1405
 msgid ""
 "_: %1 = n messages, m unread.\n"
 "%1 Folder is read-only."
 msgstr ""
 
-#: kmheaders.cpp:1560
+#: kmheaders.cpp:1598
 #, fuzzy, c-format
 msgid ""
 "_n: <qt>Do you really want to delete the selected message?"
@@ -7436,55 +8251,55 @@ msgstr ""
 "<qt>Ydych wir eisiau dileu'r negeseuon dewisiedig?"
 "<br>Wedi'u dileu, ni ellir eu adfer!</qt>"
 
-#: kmheaders.cpp:1562
+#: kmheaders.cpp:1600
 msgid "Delete Messages"
 msgstr "Dileu Negeseuon"
 
-#: kmheaders.cpp:1562
+#: kmheaders.cpp:1600
 #, fuzzy
 msgid "Delete Message"
 msgstr "Dileu Negeseuon"
 
-#: kmheaders.cpp:1586
+#: kmheaders.cpp:1624
 #, fuzzy
 msgid "Messages deleted successfully."
 msgstr "Symudwyd y negeseuon yn llwyddiannus."
 
-#: kmheaders.cpp:1586
+#: kmheaders.cpp:1624
 #, fuzzy
 msgid "Messages moved successfully"
 msgstr "Symudwyd y negeseuon yn llwyddiannus."
 
-#: kmheaders.cpp:1609
+#: kmheaders.cpp:1647
 #, fuzzy
 msgid "Deleting messages failed."
 msgstr "Methwyd symud y negeseuon."
 
-#: kmheaders.cpp:1609
+#: kmheaders.cpp:1647
 msgid "Moving messages failed."
 msgstr "Methwyd symud y negeseuon."
 
-#: kmheaders.cpp:1612
+#: kmheaders.cpp:1650
 #, fuzzy
 msgid "Deleting messages canceled."
 msgstr "Diddymwyd symud y negeseuon."
 
-#: kmheaders.cpp:1612
+#: kmheaders.cpp:1650
 #, fuzzy
 msgid "Moving messages canceled."
 msgstr "Diddymwyd symud y negeseuon."
 
-#: kmheaders.cpp:2431 kmmainwidget.cpp:2977 kmreadermainwin.cpp:470
-#: searchwindow.cpp:833
+#: kmheaders.cpp:2470 kmmainwidget.cpp:2989 kmreadermainwin.cpp:508
+#: searchwindow.cpp:856
 msgid "&Copy To"
 msgstr "&Copïo I"
 
-#: kmheaders.cpp:2434 kmheaders.cpp:2440 kmmainwidget.cpp:2974
-#: searchwindow.cpp:834
+#: kmheaders.cpp:2473 kmheaders.cpp:2479 kmmainwidget.cpp:2986
+#: searchwindow.cpp:857
 msgid "&Move To"
 msgstr "&Symud I"
 
-#: kmheaders.cpp:2774 kmheaders.cpp:2814
+#: kmheaders.cpp:2818 kmheaders.cpp:2858
 msgid ""
 "Failure modifying %1\n"
 "(No space left on device?)"
@@ -7492,88 +8307,100 @@ msgstr ""
 "Methiant wrth addasu %1\n"
 "(Dim lle ar ôl ar y ddyfais?)"
 
-#: kmkernel.cpp:684
+#: kmkernel.cpp:712
 msgid "Certificate Signature Request"
 msgstr "Cais Llofnod Tystysgrif"
 
-#: kmkernel.cpp:687
+#: kmkernel.cpp:715
 #, fuzzy
 msgid "Please create a certificate from attachment and return to sender."
 msgstr "Llofnodwch y dystysgrif yma a'i dychwelyd i'r anfonwr."
 
-#: kmkernel.cpp:1210
+#: kmkernel.cpp:1246
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 
-#: kmkernel.cpp:1220
+#: kmkernel.cpp:1256
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr ""
 
-#: kmkernel.cpp:1241
+#: kmkernel.cpp:1283
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr ""
 
-#: kmkernel.cpp:1244 kmmainwidget.cpp:1899
+#: kmkernel.cpp:1286 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr ""
 
-#: kmkernel.cpp:1245 kmmainwidget.cpp:1897
+#: kmkernel.cpp:1287 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr ""
 
-#: kmkernel.cpp:1379
+#: kmkernel.cpp:1429
 msgid "You do not have read/write permission to your inbox folder."
 msgstr "Nid oes gennych ganiatád darllen/ysgrifennu i'ch plygell blwch derbyn."
 
-#: kmkernel.cpp:1387
+#: kmkernel.cpp:1437
 msgid "outbox"
 msgstr "blwch anfon"
 
-#: kmkernel.cpp:1389
+#: kmkernel.cpp:1439
 msgid "You do not have read/write permission to your outbox folder."
 msgstr "Nid oes gennych ganiatád darllen/ysgrifennu i'ch plygell blwch anfon."
 
-#: kmkernel.cpp:1406
+#: kmkernel.cpp:1456
 msgid "sent-mail"
 msgstr "ebostau anfonedig"
 
-#: kmkernel.cpp:1408
+#: kmkernel.cpp:1458
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr ""
 "Nid oes gennych ganiatád darllen/ysgrifennu i'ch plygell blwch anfonedig."
 
-#: kmkernel.cpp:1415
+#: kmkernel.cpp:1465
 msgid "trash"
 msgstr "sbwriel"
 
-#: kmkernel.cpp:1417
+#: kmkernel.cpp:1467
 msgid "You do not have read/write permission to your trash folder."
 msgstr "Nid oes gennych ganiatád darllen/ysgrifennu i'ch plygell sbwriel."
 
-#: kmkernel.cpp:1424
+#: kmkernel.cpp:1474
 msgid "drafts"
 msgstr "drafftiau"
 
-#: kmkernel.cpp:1426
+#: kmkernel.cpp:1476
 msgid "You do not have read/write permission to your drafts folder."
 msgstr "Nid oes gennych ganiatád darllen/ysgrifennu i'ch plygell drafftiau."
 
-#: kmkernel.cpp:1435
+#: kmkernel.cpp:1485
 #, fuzzy
 msgid "templates"
 msgstr "&Amnewid"
 
-#: kmkernel.cpp:1437
+#: kmkernel.cpp:1487
 #, fuzzy
 msgid "You do not have read/write permission to your templates folder."
 msgstr "Nid oes gennych ganiatád darllen/ysgrifennu i'ch plygell sbwriel."
 
-#: kmkernel.cpp:1480 searchwindow.cpp:255 searchwindow.cpp:490
-#: searchwindow.cpp:633
+#: kmkernel.cpp:1531 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "Chwiliad Diwethaf"
 
-#: kmkernel.cpp:1777
+#: kmkernel.cpp:1716
+msgid ""
+"There is a problem with the mail index of the following folders, the indices "
+"will now be regenerated.\n"
+"This can happen because the index files are out of date, missing or corrupted.\n"
+"Contact your administrator if this happens frequently.\n"
+"Some information, like status flags, might get lost."
+msgstr ""
+
+#: kmkernel.cpp:1721
+msgid "Problem with mail indices"
+msgstr ""
+
+#: kmkernel.cpp:1879
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
 "<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
@@ -7583,7 +8410,7 @@ msgid ""
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 
-#: kmkernel.cpp:1789
+#: kmkernel.cpp:1891
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
 "<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
@@ -7592,15 +8419,15 @@ msgid ""
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 
-#: kmkernel.cpp:1798
+#: kmkernel.cpp:1900
 msgid "Migrate Mail Files?"
 msgstr ""
 
-#: kmkernel.cpp:2023
+#: kmkernel.cpp:2135
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr "Ddaeth KMail ar draws gwall angheuol, a bydd yn terfynu rwan."
 
-#: kmkernel.cpp:2025
+#: kmkernel.cpp:2137
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -7610,80 +8437,80 @@ msgstr ""
 "Ddaeth KMail ar draws gwall angheuol, a bydd yn terfynu rwan.\n"
 "Y gwall oedd:n %1"
 
-#: kmkernel.cpp:2158 kmmainwidget.cpp:1176
+#: kmkernel.cpp:2270 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "Gwagu'r Sbwriel"
 
-#: kmkernel.cpp:2159
+#: kmkernel.cpp:2271
 #, fuzzy
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Ydych wir eisiau gwagu'r blygell sbwriel?"
 
-#: kmlineeditspell.cpp:105
+#: kmlineeditspell.cpp:134
 msgid "vCard Import Failed"
 msgstr "Mewnforio vCerdyn wedi Methu"
 
-#: kmlineeditspell.cpp:116
+#: kmlineeditspell.cpp:135
 msgid "<qt>Unable to access <b>%1</b>.</qt>"
 msgstr "<qt>Methu cyrchu <b>%1</b>.</qt>"
 
-#: kmlineeditspell.cpp:168 recipientspicker.cpp:578
+#: kmlineeditspell.cpp:194 recipientspicker.cpp:578
 msgid "Recent Addresses"
 msgstr "Cyfeiriadau Diweddar"
 
-#: kmmainwidget.cpp:611
+#: kmmainwidget.cpp:601
 msgid "S&earch:"
 msgstr "C&hwilio"
 
-#: kmmainwidget.cpp:674 kmmainwidget.cpp:1709
+#: kmmainwidget.cpp:664 kmmainwidget.cpp:1686
 msgid "Move Message to Folder"
 msgstr "Symud Neges i Blygell"
 
-#: kmmainwidget.cpp:679 kmmainwidget.cpp:1818
+#: kmmainwidget.cpp:669 kmmainwidget.cpp:1795
 msgid "Copy Message to Folder"
 msgstr "Copïo Neges i Blygell"
 
-#: kmmainwidget.cpp:684 kmmainwidget.cpp:1697
+#: kmmainwidget.cpp:674 kmmainwidget.cpp:1674
 #, fuzzy
 msgid "Jump to Folder"
 msgstr "Copïo i'r Blygell Yma"
 
-#: kmmainwidget.cpp:743
+#: kmmainwidget.cpp:717
 msgid "Remove Duplicate Messages"
 msgstr "Gwaredu Negeseuon Dyblyg"
 
-#: kmmainwidget.cpp:748
+#: kmmainwidget.cpp:722
 msgid "Abort Current Operation"
 msgstr ""
 
-#: kmmainwidget.cpp:753
+#: kmmainwidget.cpp:727
 msgid "Focus on Next Folder"
 msgstr "Canolbwyntio ar y Blygell Nesaf"
 
-#: kmmainwidget.cpp:758
+#: kmmainwidget.cpp:732
 msgid "Focus on Previous Folder"
 msgstr "Canolbwyntio ar y Blygell Flaenorol"
 
-#: kmmainwidget.cpp:763
+#: kmmainwidget.cpp:737
 msgid "Select Folder with Focus"
 msgstr "Deiws y Blygell efo'r Canolbwynt"
 
-#: kmmainwidget.cpp:768
+#: kmmainwidget.cpp:742
 #, fuzzy
 msgid "Focus on Next Message"
 msgstr "Canolbwyntio ar y Blygell Nesaf"
 
-#: kmmainwidget.cpp:773
+#: kmmainwidget.cpp:747
 #, fuzzy
 msgid "Focus on Previous Message"
 msgstr "Canolbwyntio ar y Blygell Flaenorol"
 
-#: kmmainwidget.cpp:778
+#: kmmainwidget.cpp:752
 #, fuzzy
 msgid "Select Message with Focus"
 msgstr "Deiws y Blygell efo'r Canolbwynt"
 
-#: kmmainwidget.cpp:977
+#: kmmainwidget.cpp:951
 #, fuzzy
 msgid ""
 "_n: 1 new message in %1\n"
@@ -7692,63 +8519,75 @@ msgstr ""
 "%n neges, %1.\n"
 "%n o negeseuon, %1."
 
-#: kmmainwidget.cpp:993
+#: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
 "<b>New mail arrived</b>"
 "<br>%1"
 msgstr ""
 
-#: kmmainwidget.cpp:997
+#: kmmainwidget.cpp:971
 msgid "New mail arrived"
 msgstr "Cyrhaeddodd ebost newydd"
 
-#: kmmainwidget.cpp:1128
+#: kmmainwidget.cpp:1100
 #, c-format
 msgid "Properties of Folder %1"
 msgstr "Priodweddau Plygell %1"
 
-#: kmmainwidget.cpp:1149
+#: kmmainwidget.cpp:1124
 msgid "This folder does not have any expiry options set"
 msgstr "Ni osodir dewisiadau darfod ar gyfer y blygell yma"
 
-#: kmmainwidget.cpp:1157
+#: kmmainwidget.cpp:1132
 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:1158
+#: kmmainwidget.cpp:1133
 msgid "Expire Folder"
 msgstr "Darfod Plygell"
 
-#: kmmainwidget.cpp:1159
+#: kmmainwidget.cpp:1134
 msgid "&Expire"
 msgstr "Darf&od"
 
-#: kmmainwidget.cpp:1176
+#: kmmainwidget.cpp:1151
 msgid "Move to Trash"
 msgstr "Symud i Sbwriel"
 
-#: kmmainwidget.cpp:1178
+#: kmmainwidget.cpp:1153
 msgid "Are you sure you want to empty the trash folder?"
 msgstr "Ydych wir eisiau gwagu'r blygell sbwriel?"
 
-#: kmmainwidget.cpp:1179
+#: kmmainwidget.cpp:1154
 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:1198
+#: kmmainwidget.cpp:1173
 msgid "Moved all messages to the trash"
 msgstr "Symudwyd pob neges i'r sbwriel"
 
-#: kmmainwidget.cpp:1220
+#: kmmainwidget.cpp:1200
+msgid ""
+"It is not possible to delete this folder right now because it is being "
+"syncronized. Please wait until the syncronization of this folder is complete "
+"and then try again."
+msgstr ""
+
+#: kmmainwidget.cpp:1203
+#, fuzzy
+msgid "Unable to delete folder"
+msgstr "Methwyd creu plygell"
+
+#: kmmainwidget.cpp:1209
 #, fuzzy
 msgid "Delete Search"
 msgstr "<derbynwyr>"
 
-#: kmmainwidget.cpp:1221
+#: kmmainwidget.cpp:1210
 #, fuzzy
 msgid ""
 "<qt>Are you sure you want to delete the search <b>%1</b>?"
@@ -7758,15 +8597,15 @@ msgstr ""
 "?  Ni ddileuir y negeseuon a ddangosir ynddi os gwnewch, oherwydd cedwir mewn "
 "plygell wahanol.</qt>"
 
-#: kmmainwidget.cpp:1225
+#: kmmainwidget.cpp:1214
 msgid "Delete Folder"
 msgstr "Dileu Plygell"
 
-#: kmmainwidget.cpp:1228
+#: kmmainwidget.cpp:1217
 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:1233
+#: kmmainwidget.cpp:1222
 #, fuzzy
 msgid ""
 "<qt>Are you sure you want to delete the empty folder <b>%1</b> "
@@ -7779,7 +8618,7 @@ msgstr ""
 "a;i holl is-blygyll?  Mae'n bosibl nad ydy'r is-blygyll yna yn wag, a bydd eu "
 "cynnwys yn cael eu gwaredu hefyd.</qt>"
 
-#: kmmainwidget.cpp:1242
+#: kmmainwidget.cpp:1231
 #, fuzzy
 msgid ""
 "<qt>Are you sure you want to delete the folder <b>%1</b>"
@@ -7789,7 +8628,7 @@ msgid ""
 msgstr ""
 "<qt>Ydych wir eisiau dileu'r blygell <b>%1</b>, gan daflu ei chynnwys?</qt>"
 
-#: kmmainwidget.cpp:1249
+#: kmmainwidget.cpp:1238
 #, fuzzy
 msgid ""
 "<qt>Are you sure you want to delete the folder <b>%1</b> "
@@ -7800,14 +8639,7 @@ msgstr ""
 "<qt>Ydych wir eisiau dileu'r blygell <b>%1</b> a'i holl is-blygyll, gan daflu "
 "ei chynnwys?</qt>"
 
-#: kmmainwidget.cpp:1268
-msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
-"reset to the main Inbox folder.</qt>"
-msgstr ""
-
-#: kmmainwidget.cpp:1349
+#: kmmainwidget.cpp:1313
 msgid ""
 "Are you sure you want to refresh the IMAP cache?\n"
 "This will remove all changes that you have done locally to your IMAP folders."
@@ -7815,11 +8647,11 @@ msgstr ""
 "Ydych wir eisiau ailfywio'r gelc IMAP?\n"
 "Bydd hyn yn gwaredu pog newid a wnaeth yn lleol i'ch plygyll IMAP."
 
-#: kmmainwidget.cpp:1365
+#: kmmainwidget.cpp:1329
 msgid "Are you sure you want to expire all old messages?"
 msgstr "Ydych wir eisiau darfod pob hen neges?"
 
-#: kmmainwidget.cpp:1389
+#: kmmainwidget.cpp:1353
 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 "
@@ -7829,15 +8661,15 @@ msgstr ""
 "a gall cynyddu'r debygrwydd y peryglir eich cysawd gan ymelwadau cyfredol a "
 "disgwyliedig eraill."
 
-#: kmmainwidget.cpp:1392 kmmainwidget.cpp:1416 kmsender.cpp:503
+#: kmmainwidget.cpp:1356 kmmainwidget.cpp:1380 kmsender.cpp:504
 msgid "Security Warning"
 msgstr "Rhybudd Diogelwch"
 
-#: kmmainwidget.cpp:1393
+#: kmmainwidget.cpp:1357
 msgid "Use HTML"
 msgstr ""
 
-#: kmmainwidget.cpp:1413
+#: kmmainwidget.cpp:1377
 #, fuzzy
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
@@ -7848,19 +8680,19 @@ msgstr ""
 "a gall cynyddu'r debygrwydd y peryglir eich cysawd gan ymelwadau cyfredol a "
 "disgwyliedig eraill."
 
-#: kmmainwidget.cpp:1417
+#: kmmainwidget.cpp:1381
 msgid "Load External References"
 msgstr ""
 
-#: kmmainwidget.cpp:1658
+#: kmmainwidget.cpp:1634
 msgid "Filter on Mailing-List..."
 msgstr "Hidlo ar Restr Ebost..."
 
-#: kmmainwidget.cpp:1663
+#: kmmainwidget.cpp:1639
 msgid "Filter on Mailing-List %1..."
 msgstr "Hidlo ar Restr Ebost %1 ..."
 
-#: kmmainwidget.cpp:1761
+#: kmmainwidget.cpp:1738
 msgid ""
 "KMail's Out of Office Reply functionality relies on server-side filtering. You "
 "have not yet configured an IMAP server for this.\n"
@@ -7870,518 +8702,525 @@ msgstr ""
 "gweinydd.  Nid ydych wedi ffurfweddu gweinydd IMAP eto ar gyfer hyn.\n"
 "Gallwch wneud hyn ar dab \"Hidlo\" y ffurfweddiad cyfrif IMAP."
 
-#: kmmainwidget.cpp:1766
+#: kmmainwidget.cpp:1743
 msgid "No Server-Side Filtering Configured"
 msgstr "Ni Ffurfweddir Hidlo ar Ochr y Gweinydd"
 
-#: kmmainwidget.cpp:1793
+#: kmmainwidget.cpp:1770
 #, fuzzy
-msgid "Could not start certificate manager; please check your installation."
+msgid ""
+"Could not start certificate manager 'kleopatra'; please check your "
+"installation."
 msgstr "Methu cychwyn rheolydd tystysgrif.  Gwiriwch eich gosodiad!"
 
-#: kmmainwidget.cpp:1810
+#: kmmainwidget.cpp:1787
 #, fuzzy
 msgid ""
 "Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
 msgstr "Methu cychwyn rheolydd tystysgrif.  Gwiriwch eich gosodiad!"
 
-#: kmmainwidget.cpp:2485
+#: kmmainwidget.cpp:2508
 #, fuzzy
 msgid "Forward With Custom Template"
 msgstr "&Defnyddio ôlddodiad dynodiad neges addasiedig."
 
-#: kmmainwidget.cpp:2494
+#: kmmainwidget.cpp:2517
 #, fuzzy
 msgid "Reply With Custom Template"
 msgstr "&Defnyddio ôlddodiad dynodiad neges addasiedig."
 
-#: kmmainwidget.cpp:2502
+#: kmmainwidget.cpp:2525
 #, fuzzy
 msgid "Reply to All With Custom Template"
 msgstr "&Defnyddio ôlddodiad dynodiad neges addasiedig."
 
-#: kmmainwidget.cpp:2597 kmmainwidget.cpp:2602 kmmainwidget.cpp:2607
+#: kmmainwidget.cpp:2620 kmmainwidget.cpp:2625 kmmainwidget.cpp:2630
 #, fuzzy
 msgid "(no custom templates)"
 msgstr "&Defnyddio ôlddodiad dynodiad neges addasiedig."
 
-#: kmmainwidget.cpp:2622 kmmimeparttree.cpp:141
+#: kmmainwidget.cpp:2645 kmmimeparttree.cpp:139
 msgid "Save &As..."
 msgstr "Cad&w Fel..."
 
-#: kmmainwidget.cpp:2629
+#: kmmainwidget.cpp:2652
 msgid "&Compact All Folders"
 msgstr "&Cywasgu Pob Plygell"
 
-#: kmmainwidget.cpp:2633
+#: kmmainwidget.cpp:2656
 msgid "&Expire All Folders"
 msgstr "&Darfod Pob Plygell"
 
-#: kmmainwidget.cpp:2637
+#: kmmainwidget.cpp:2660
 msgid "&Refresh Local IMAP Cache"
 msgstr "&Ail-fywio Celc IMAP Leol"
 
-#: kmmainwidget.cpp:2641
+#: kmmainwidget.cpp:2664
 #, fuzzy
 msgid "Empty All &Trash Folders"
 msgstr "&Cywasgu Pob Plygell"
 
-#: kmmainwidget.cpp:2649
+#: kmmainwidget.cpp:2672
 #, fuzzy
 msgid "Check Mail in Favorite Folders"
 msgstr "Ymofyn Ebost yn y Blygell yma"
 
-#: kmmainwidget.cpp:2656
+#: kmmainwidget.cpp:2679
 msgid "Check Mail &In"
 msgstr "Ymofyn Ebost &Cyrraedd"
 
-#: kmmainwidget.cpp:2666
+#: kmmainwidget.cpp:2689
 msgid "&Send Queued Messages"
 msgstr "An&fon Negeseuon yn y Rhes"
 
-#: kmmainwidget.cpp:2669
+#: kmmainwidget.cpp:2692
 msgid "Online Status (unknown)"
 msgstr ""
 
-#: kmmainwidget.cpp:2673
+#: kmmainwidget.cpp:2696
 #, fuzzy
 msgid "Send Queued Messages Via"
 msgstr "An&fon Negeseuon yn y Rhes"
 
-#: kmmainwidget.cpp:2684
+#: kmmainwidget.cpp:2707
 msgid "&Address Book..."
 msgstr "&Llyfr Cyfeiriadau..."
 
-#: kmmainwidget.cpp:2689
+#: kmmainwidget.cpp:2712
 msgid "Certificate Manager..."
 msgstr "Trefnydd Tysysgrifau ..."
 
-#: kmmainwidget.cpp:2694
+#: kmmainwidget.cpp:2717
 msgid "GnuPG Log Viewer..."
 msgstr ""
 
-#: kmmainwidget.cpp:2699
+#: kmmainwidget.cpp:2722
 msgid "&Import Messages..."
 msgstr "&Mewnforio Negeseuon..."
 
-#: kmmainwidget.cpp:2704
+#: kmmainwidget.cpp:2727
 #, fuzzy
 msgid "&Debug Sieve..."
 msgstr "&Ychwanegu Gwasanaeth..."
 
-#: kmmainwidget.cpp:2710
+#: kmmainwidget.cpp:2733
 msgid "Edit \"Out of Office\" Replies..."
 msgstr "Golygu Ymatebion \"Allan o'r Swyddfa\"..."
 
-#: kmmainwidget.cpp:2716
+#: kmmainwidget.cpp:2739
 #, fuzzy
 msgid "Filter &Log Viewer..."
 msgstr "Hidlo ar &Oddiwrth..."
 
-#: kmmainwidget.cpp:2719
+#: kmmainwidget.cpp:2742
 msgid "&Anti-Spam Wizard..."
 msgstr ""
 
-#: kmmainwidget.cpp:2721
+#: kmmainwidget.cpp:2744
 msgid "&Anti-Virus Wizard..."
 msgstr ""
 
-#: kmmainwidget.cpp:2725 kmreadermainwin.cpp:316
+#: kmmainwidget.cpp:2748 kmreadermainwin.cpp:367
 msgid "&Move to Trash"
 msgstr "&Symud i Sbwriel"
 
-#: kmmainwidget.cpp:2726 kmreadermainwin.cpp:317
+#: kmmainwidget.cpp:2749 kmreadermainwin.cpp:368
 msgid "Move message to trashcan"
 msgstr "Symud y neges i'r sbwriel"
 
-#: kmmainwidget.cpp:2738
+#: kmmainwidget.cpp:2761
 #, fuzzy
 msgid "M&ove Thread to Trash"
 msgstr "Symud i Sbwriel"
 
-#: kmmainwidget.cpp:2739
+#: kmmainwidget.cpp:2762
 #, fuzzy
 msgid "Move thread to trashcan"
 msgstr "Symud y neges i'r sbwriel"
 
-#: kmmainwidget.cpp:2743
+#: kmmainwidget.cpp:2766
 #, fuzzy
 msgid "Delete T&hread"
 msgstr "wedi'u dileu"
 
-#: kmmainwidget.cpp:2747
+#: kmmainwidget.cpp:2770
 msgid "&Find Messages..."
 msgstr "&Canfod Negeseuon..."
 
-#: kmmainwidget.cpp:2750
+#: kmmainwidget.cpp:2773
 msgid "&Find in Message..."
 msgstr "&Canfod mewn Neges..."
 
-#: kmmainwidget.cpp:2753
+#: kmmainwidget.cpp:2776
 msgid "Select &All Messages"
 msgstr "Dewis &Pob Neges"
 
-#: kmmainwidget.cpp:2760
+#: kmmainwidget.cpp:2783
 msgid "&Properties"
 msgstr "&Priodweddau"
 
-#: kmmainwidget.cpp:2763
+#: kmmainwidget.cpp:2786
 #, fuzzy
 msgid "&Mailing List Management..."
 msgstr "Rhestr Ebost Gysylltiedig"
 
-#: kmmainwidget.cpp:2772
+#: kmmainwidget.cpp:2795
 msgid "Mark All Messages as &Read"
 msgstr "Nodi Pob Neges fel Dda&rllenedig"
 
-#: kmmainwidget.cpp:2775
+#: kmmainwidget.cpp:2798
 #, fuzzy
 msgid "&Expiration Settings"
 msgstr "Dynodiadau &sy'n bodoli:"
 
-#: kmmainwidget.cpp:2778
+#: kmmainwidget.cpp:2801
 msgid "&Compact Folder"
 msgstr "&Crynhoi Plygell"
 
-#: kmmainwidget.cpp:2781
+#: kmmainwidget.cpp:2804
 #, fuzzy
 msgid "Check Mail &in This Folder"
 msgstr "&Ymofyn Ebost yn y Blygell Yma"
 
-#: kmmainwidget.cpp:2793
+#: kmmainwidget.cpp:2816
+#, fuzzy
+msgid "&Archive Folder..."
+msgstr "&Plygell Newydd"
+
+#: kmmainwidget.cpp:2820
 msgid "Prefer &HTML to Plain Text"
 msgstr "Gwell &HTML na Testun Plaen"
 
-#: kmmainwidget.cpp:2796
+#: kmmainwidget.cpp:2823
 msgid "Load E&xternal References"
 msgstr ""
 
-#: kmmainwidget.cpp:2799
+#: kmmainwidget.cpp:2826
 msgid "&Thread Messages"
 msgstr "&Edafu Negeseuon"
 
-#: kmmainwidget.cpp:2802
+#: kmmainwidget.cpp:2829
 msgid "Thread Messages also by &Subject"
 msgstr "Edafu Negeseuon gan &Bwnc hefyd"
 
-#: kmmainwidget.cpp:2805
+#: kmmainwidget.cpp:2832
 #, fuzzy
 msgid "Copy Folder"
 msgstr "Copïo i'r Blygell Yma"
 
-#: kmmainwidget.cpp:2807
+#: kmmainwidget.cpp:2834
 #, fuzzy
 msgid "Cut Folder"
 msgstr "Creu Plygell"
 
-#: kmmainwidget.cpp:2809
+#: kmmainwidget.cpp:2836
 #, fuzzy
 msgid "Paste Folder"
 msgstr "Creu Plygell"
 
-#: kmmainwidget.cpp:2812
+#: kmmainwidget.cpp:2839
 #, fuzzy
 msgid "Copy Messages"
 msgstr "<neges>"
 
-#: kmmainwidget.cpp:2814
+#: kmmainwidget.cpp:2841
 #, fuzzy
 msgid "Cut Messages"
 msgstr "<neges>"
 
-#: kmmainwidget.cpp:2816
+#: kmmainwidget.cpp:2843
 #, fuzzy
 msgid "Paste Messages"
 msgstr "Dileu Negeseuon"
 
-#: kmmainwidget.cpp:2820
+#: kmmainwidget.cpp:2847
 msgid "&New Message..."
 msgstr "&Neges Newydd..."
 
-#: kmmainwidget.cpp:2823 kmmainwidget.cpp:2915
+#: kmmainwidget.cpp:2850 kmmainwidget.cpp:2927
 #, fuzzy
 msgid "New Message From &Template"
 msgstr "Dim negeseuon newydd o'r gweinydd"
 
-#: kmmainwidget.cpp:2831
+#: kmmainwidget.cpp:2858
 msgid "New Message t&o Mailing-List..."
 msgstr "Neges Newydd i &Restr Ebost"
 
-#: kmmainwidget.cpp:2836 kmreadermainwin.cpp:327 searchwindow.cpp:320
+#: kmmainwidget.cpp:2863 kmreadermainwin.cpp:378 searchwindow.cpp:321
 msgid ""
 "_: Message->\n"
 "&Forward"
 msgstr "&Blaenyrru"
 
-#: kmmainwidget.cpp:2840 kmreadermainwin.cpp:330 searchwindow.cpp:329
+#: kmmainwidget.cpp:2867 kmreadermainwin.cpp:381 searchwindow.cpp:330
 msgid "&Inline..."
 msgstr "&Mewnlin..."
 
-#: kmmainwidget.cpp:2846 kmreadermainwin.cpp:336 searchwindow.cpp:325
+#: kmmainwidget.cpp:2873 kmreadermainwin.cpp:387 searchwindow.cpp:326
 msgid ""
 "_: Message->Forward->\n"
 "As &Attachment..."
 msgstr "&Fel Atodiad..."
 
-#: kmmainwidget.cpp:2852 kmreadermainwin.cpp:342 searchwindow.cpp:341
+#: kmmainwidget.cpp:2879 kmreadermainwin.cpp:393 searchwindow.cpp:342
 #, fuzzy
 msgid ""
 "_: Message->Forward->\n"
 "As Di&gest..."
 msgstr "&Fel Atodiad..."
 
-#: kmmainwidget.cpp:2858 kmreadermainwin.cpp:348 searchwindow.cpp:346
+#: kmmainwidget.cpp:2885 kmreadermainwin.cpp:399 searchwindow.cpp:347
 msgid ""
 "_: Message->Forward->\n"
 "&Redirect..."
 msgstr "Ail-&gyfeirio..."
 
-#: kmmainwidget.cpp:2885
+#: kmmainwidget.cpp:2897
 msgid "Send A&gain..."
 msgstr "Anfon E&to..."
 
-#: kmmainwidget.cpp:2890
+#: kmmainwidget.cpp:2902
 msgid "&Create Filter"
 msgstr "&Creu Hidlen"
 
-#: kmmainwidget.cpp:2893
+#: kmmainwidget.cpp:2905
 msgid "Filter on &Subject..."
 msgstr "Hidlo ar &Pwnc..."
 
-#: kmmainwidget.cpp:2898
+#: kmmainwidget.cpp:2910
 msgid "Filter on &From..."
 msgstr "Hidlo ar &Oddiwrth..."
 
-#: kmmainwidget.cpp:2903
+#: kmmainwidget.cpp:2915
 msgid "Filter on &To..."
 msgstr "Hidlo ar &I..."
 
-#: kmmainwidget.cpp:2908
+#: kmmainwidget.cpp:2920
 msgid "Filter on Mailing-&List..."
 msgstr "Hidlo ar &Restr Ebost..."
 
-#: kmmainwidget.cpp:2921
+#: kmmainwidget.cpp:2933
 msgid "Mark &Thread"
 msgstr "Nodi &Edefyn"
 
-#: kmmainwidget.cpp:2924
+#: kmmainwidget.cpp:2936
 msgid "Mark Thread as &Read"
 msgstr "Nodi Edefyn fel Wedi'i Ddar&llen"
 
-#: kmmainwidget.cpp:2925
+#: kmmainwidget.cpp:2937
 msgid "Mark all messages in the selected thread as read"
 msgstr "Nodi pob neges yn yr edefyn dewisiedig fel wedi'i darllen"
 
-#: kmmainwidget.cpp:2930
+#: kmmainwidget.cpp:2942
 msgid "Mark Thread as &New"
 msgstr "Nodi Edefyn fel &Newydd"
 
-#: kmmainwidget.cpp:2931
+#: kmmainwidget.cpp:2943
 msgid "Mark all messages in the selected thread as new"
 msgstr "Nodi pob neges yn yr edefyn dewisiedig fel newydd"
 
-#: kmmainwidget.cpp:2936
+#: kmmainwidget.cpp:2948
 msgid "Mark Thread as &Unread"
 msgstr "Nodi Edefyn fel &Heb ei Ddarllen"
 
-#: kmmainwidget.cpp:2937
+#: kmmainwidget.cpp:2949
 msgid "Mark all messages in the selected thread as unread"
 msgstr "Nodi pob neges yn yr edefyn dewisiedig fel heb ei darllen"
 
-#: kmmainwidget.cpp:2945
+#: kmmainwidget.cpp:2957
 msgid "Mark Thread as &Important"
 msgstr "Nodi Edefyn fel &Pwysig"
 
-#: kmmainwidget.cpp:2948
+#: kmmainwidget.cpp:2960
 msgid "Remove &Important Thread Mark"
 msgstr ""
 
-#: kmmainwidget.cpp:2951
+#: kmmainwidget.cpp:2963
 #, fuzzy
 msgid "Mark Thread as &Action Item"
 msgstr "Nodi Edefyn fel Wedi'i &Anfon"
 
-#: kmmainwidget.cpp:2954
+#: kmmainwidget.cpp:2966
 #, fuzzy
 msgid "Remove &Action Item Thread Mark"
 msgstr "Neges bwysig"
 
-#: kmmainwidget.cpp:2958
+#: kmmainwidget.cpp:2970
 msgid "&Watch Thread"
 msgstr "&Gwylio ar yr Edefyn"
 
-#: kmmainwidget.cpp:2962
+#: kmmainwidget.cpp:2974
 msgid "&Ignore Thread"
 msgstr "&Anwybyddu'r Edefyn"
 
-#: kmmainwidget.cpp:2970
+#: kmmainwidget.cpp:2982
 msgid "Save A&ttachments..."
 msgstr "Cadw A&todiadau..."
 
-#: kmmainwidget.cpp:2980
+#: kmmainwidget.cpp:2992
 #, fuzzy
 msgid "Appl&y All Filters"
 msgstr "Gweithred&u Hidlau"
 
-#. i18n: file kmail_part.rc line 141
-#: kmmainwidget.cpp:2985 rc.cpp:30 rc.cpp:96
+#. i18n: file kmail_part.rc line 142
+#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
 #, fuzzy, no-c-format
 msgid "A&pply Filter"
 msgstr "Gweithred&u Hidlau"
 
-#: kmmainwidget.cpp:2992
+#: kmmainwidget.cpp:3004
 msgid ""
 "_: View->\n"
 "&Unread Count"
 msgstr "Cyfanswm &Heb eu Darllen"
 
-#: kmmainwidget.cpp:2994
+#: kmmainwidget.cpp:3006
 msgid "Choose how to display the count of unread messages"
 msgstr "Dewis sut i ddangos cyfanswm y negeseuon heb eu darllen"
 
-#: kmmainwidget.cpp:2996
+#: kmmainwidget.cpp:3008
 msgid ""
 "_: View->Unread Count\n"
 "View in &Separate Column"
 msgstr "Gwled mewn &Colofn Wahanol"
 
-#: kmmainwidget.cpp:3002
+#: kmmainwidget.cpp:3014
 msgid ""
 "_: View->Unread Count\n"
 "View After &Folder Name"
 msgstr "Gweld ar Ôl Enw'r &Blygell"
 
-#: kmmainwidget.cpp:3009
+#: kmmainwidget.cpp:3021
 msgid ""
 "_: View->\n"
 "&Total Column"
 msgstr "Colofn &Gyfanswm"
 
-#: kmmainwidget.cpp:3012
+#: kmmainwidget.cpp:3024
 msgid ""
 "Toggle display of column showing the total number of messages in folders."
 msgstr "Dangos/cuddio'r golofn sy'n dangos cyfanswm o negeseuon mewn plygyll."
 
-#: kmmainwidget.cpp:3014
+#: kmmainwidget.cpp:3026
 #, fuzzy
 msgid ""
 "_: View->\n"
 "&Size Column"
 msgstr "Colofn &Gyfanswm"
 
-#: kmmainwidget.cpp:3017
+#: kmmainwidget.cpp:3029
 #, fuzzy
 msgid "Toggle display of column showing the total size of messages in folders."
 msgstr "Dangos/cuddio'r golofn sy'n dangos cyfanswm o negeseuon mewn plygyll."
 
-#: kmmainwidget.cpp:3020
+#: kmmainwidget.cpp:3032
 msgid ""
 "_: View->\n"
 "&Expand Thread"
 msgstr "&Ehangu Edefyn"
 
-#: kmmainwidget.cpp:3021
+#: kmmainwidget.cpp:3033
 msgid "Expand the current thread"
 msgstr "Ehangu'r edefyn cyfredol"
 
-#: kmmainwidget.cpp:3026
+#: kmmainwidget.cpp:3038
 msgid ""
 "_: View->\n"
 "&Collapse Thread"
 msgstr "&Dad-ehangu'r Edefyn"
 
-#: kmmainwidget.cpp:3027
+#: kmmainwidget.cpp:3039
 msgid "Collapse the current thread"
 msgstr "Dad-ehangu'r edefyn cyfredol"
 
-#: kmmainwidget.cpp:3032
+#: kmmainwidget.cpp:3044
 msgid ""
 "_: View->\n"
 "Ex&pand All Threads"
 msgstr "Ehangu &Pob Edefyn"
 
-#: kmmainwidget.cpp:3033
+#: kmmainwidget.cpp:3045
 msgid "Expand all threads in the current folder"
 msgstr "Ehangu pob edefyn yn y blygell gyfredol"
 
-#: kmmainwidget.cpp:3038
+#: kmmainwidget.cpp:3050
 msgid ""
 "_: View->\n"
 "C&ollapse All Threads"
 msgstr "Dad-ehangu Po&b Edefyn"
 
-#: kmmainwidget.cpp:3039
+#: kmmainwidget.cpp:3051
 msgid "Collapse all threads in the current folder"
 msgstr "Dad-ehangu pob edefyn yn y blygell gyfredol"
 
-#: kmmainwidget.cpp:3044 kmreadermainwin.cpp:322
+#: kmmainwidget.cpp:3056 kmreadermainwin.cpp:373
 msgid "&View Source"
 msgstr "&Gweld Tarddiad"
 
-#: kmmainwidget.cpp:3048
+#: kmmainwidget.cpp:3060
 msgid "&Display Message"
 msgstr "&Dangos Neges"
 
-#: kmmainwidget.cpp:3054
+#: kmmainwidget.cpp:3066
 msgid "&Next Message"
 msgstr "&Neges Nesaf"
 
-#: kmmainwidget.cpp:3055
+#: kmmainwidget.cpp:3067
 msgid "Go to the next message"
 msgstr "Mynd i'r neges nesaf"
 
-#: kmmainwidget.cpp:3059
+#: kmmainwidget.cpp:3071
 msgid "Next &Unread Message"
 msgstr "Neges Nesaf &Heb ei Darllen"
 
-#: kmmainwidget.cpp:3061
+#: kmmainwidget.cpp:3073
 msgid "Go to the next unread message"
 msgstr "Mynd i'r neges nesaf heb ei darllen"
 
 #. i18n("Go to the next important message") ),
-#: kmmainwidget.cpp:3072
+#: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "Neges &Blaenorol"
 
-#: kmmainwidget.cpp:3073
+#: kmmainwidget.cpp:3085
 msgid "Go to the previous message"
 msgstr "Mynd i'r neges blaenorol"
 
-#: kmmainwidget.cpp:3077
+#: kmmainwidget.cpp:3089
 msgid "Previous Unread &Message"
 msgstr "Neges Bl&aenorol Heb ei Darllen"
 
-#: kmmainwidget.cpp:3079
+#: kmmainwidget.cpp:3091
 msgid "Go to the previous unread message"
 msgstr "Mynd i'r neges blaenorol heb ei darllen"
 
-#: kmmainwidget.cpp:3091
+#: kmmainwidget.cpp:3103
 msgid "Next Unread &Folder"
 msgstr "&Plygell Nesaf Heb ei Darllen"
 
-#: kmmainwidget.cpp:3092
+#: kmmainwidget.cpp:3104
 msgid "Go to the next folder with unread messages"
 msgstr "Mynd i'r blygell nesaf efo negeseuon heb eu darllen"
 
-#: kmmainwidget.cpp:3100
+#: kmmainwidget.cpp:3112
 msgid "Previous Unread F&older"
 msgstr "Plyg&ell Flaenorol Heb ei Ddarllen"
 
-#: kmmainwidget.cpp:3101
+#: kmmainwidget.cpp:3113
 msgid "Go to the previous folder with unread messages"
 msgstr "Mynd i'r blygell flaenorol efo negeseuon heb eu darllen"
 
-#: kmmainwidget.cpp:3108
+#: kmmainwidget.cpp:3120
 msgid ""
 "_: Go->\n"
 "Next Unread &Text"
 msgstr "&Testun Nesaf heb ei Ddarllen"
 
-#: kmmainwidget.cpp:3109
+#: kmmainwidget.cpp:3121
 msgid "Go to the next unread text"
 msgstr "Mynd i'r testun nesaf heb ei ddarllen"
 
-#: kmmainwidget.cpp:3110
+#: kmmainwidget.cpp:3122
 msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
 "message."
@@ -8389,53 +9228,57 @@ msgstr ""
 "Sgrolio i lawr y neges gyfredol.  Os wrth waelod y neges gyfredol, mynd i'r "
 "neges nesaf heb ei darllen."
 
-#: kmmainwidget.cpp:3117
+#: kmmainwidget.cpp:3129
+msgid "Show Quick Search"
+msgstr ""
+
+#: kmmainwidget.cpp:3136
 msgid "Configure &Filters..."
 msgstr "Ffurfweddu &Hidlau..."
 
-#: kmmainwidget.cpp:3119
+#: kmmainwidget.cpp:3138
 msgid "Configure &POP Filters..."
 msgstr "Ffurfweddu Hidlau &POP3..."
 
-#: kmmainwidget.cpp:3121
+#: kmmainwidget.cpp:3140
 #, fuzzy
 msgid "Manage &Sieve Scripts..."
 msgstr "Hidlau ar Gael"
 
-#: kmmainwidget.cpp:3124
+#: kmmainwidget.cpp:3143
 msgid "KMail &Introduction"
 msgstr "&Cyflwyniad KMail"
 
-#: kmmainwidget.cpp:3125
+#: kmmainwidget.cpp:3144
 msgid "Display KMail's Welcome Page"
 msgstr "Dangos Tudalen Groeso KMail"
 
-#: kmmainwidget.cpp:3131
+#: kmmainwidget.cpp:3150
 msgid "Configure &Notifications..."
 msgstr "Ffurfweddu &Hysbysiadau..."
 
-#: kmmainwidget.cpp:3136
+#: kmmainwidget.cpp:3155
 msgid "&Configure KMail..."
 msgstr "&Furffweddu KMail..."
 
-#: kmmainwidget.cpp:3431
+#: kmmainwidget.cpp:3454
 msgid "E&mpty Trash"
 msgstr "Gwagu'r &Sbwriel"
 
-#: kmmainwidget.cpp:3431
+#: kmmainwidget.cpp:3455
 msgid "&Move All Messages to Trash"
 msgstr "&Symud Pob Neges i'r Sbwriel"
 
-#: kmmainwidget.cpp:3434
+#: kmmainwidget.cpp:3464
 #, fuzzy
 msgid "&Delete Search"
 msgstr "Dile&u Plygell"
 
-#: kmmainwidget.cpp:3434
+#: kmmainwidget.cpp:3465
 msgid "&Delete Folder"
 msgstr "Dile&u Plygell"
 
-#: kmmainwidget.cpp:3615
+#: kmmainwidget.cpp:3649
 #, c-format
 msgid ""
 "_n: Removed %n duplicate message.\n"
@@ -8444,25 +9287,25 @@ msgstr ""
 "Gwaredwyd %n neges ddyblyg.\n"
 "Gwaredwyd %n o negeseuon dyblyg."
 
-#: kmmainwidget.cpp:3617
+#: kmmainwidget.cpp:3651
 msgid "No duplicate messages found."
 msgstr "Ni chanfuwyd negeseuon dyblyg."
 
-#: kmmainwidget.cpp:3687
+#: kmmainwidget.cpp:3721
 #, c-format
 msgid "Filter %1"
 msgstr "Hidlo %1"
 
-#: kmmainwidget.cpp:3821
+#: kmmainwidget.cpp:3855
 msgid "Subscription"
 msgstr "Tanysgrifiad"
 
-#: kmmainwidget.cpp:3838
+#: kmmainwidget.cpp:3872
 #, fuzzy
 msgid "Local Subscription"
 msgstr "Tanysgrifiad"
 
-#: kmmainwidget.cpp:3971
+#: kmmainwidget.cpp:4007
 #, fuzzy
 msgid "Out of office reply active"
 msgstr "Gosodwyd ateb Allan-o'r-Swyddfa yn llwyddiannus."
@@ -8475,7 +9318,7 @@ msgstr "&Ffenestr Newydd"
 msgid " Initializing..."
 msgstr "Ymgychwyn..."
 
-#: kmmessage.cpp:1316
+#: kmmessage.cpp:1336
 #, fuzzy
 msgid ""
 "This message contains a request to return a notification about your reception "
@@ -8487,7 +9330,7 @@ msgstr ""
 "Gallwch un ai anwybyddu'r cais, neu adael i KMail anfon ymateb \"gwrthodwyd\" "
 "neu arferol."
 
-#: kmmessage.cpp:1321
+#: kmmessage.cpp:1341
 #, fuzzy
 msgid ""
 "This message contains a request to send a notification about your reception of "
@@ -8501,7 +9344,7 @@ msgstr ""
 "i KMail.\n"
 "Gallwch un ai anwybyddu'r cais, neu adael i KMail anfon ymateb \"methiant\"."
 
-#: kmmessage.cpp:1328
+#: kmmessage.cpp:1348
 #, fuzzy
 msgid ""
 "This message contains a request to send a notification about your reception of "
@@ -8515,7 +9358,7 @@ msgstr ""
 "Gallwch un ai anwybyddu'r cais, neu adael i KMail anfon ymateb \"gwrthodwyd\" "
 "neu arferol."
 
-#: kmmessage.cpp:1335
+#: kmmessage.cpp:1355
 #, fuzzy
 msgid ""
 "This message contains a request to send a notification about your reception of "
@@ -8529,7 +9372,7 @@ msgstr ""
 "Gallwch un ai anwybyddu'r cais, neu adael i KMail anfon ymateb \"gwrthodwyd\" "
 "neu arferol."
 
-#: kmmessage.cpp:1341
+#: kmmessage.cpp:1361
 #, fuzzy
 msgid ""
 "This message contains a request to send a notification about your reception of "
@@ -8545,19 +9388,19 @@ msgstr ""
 "Gallwch un ai anwybyddu'r cais, neu adael i KMail anfon ymateb \"gwrthodwyd\" "
 "neu arferol."
 
-#: kmmessage.cpp:1359 kmmessage.cpp:1366
+#: kmmessage.cpp:1379 kmmessage.cpp:1386
 msgid "Message Disposition Notification Request"
 msgstr "Cais Hysbysiad Lleoliad y Neges"
 
-#: kmmessage.cpp:1361
+#: kmmessage.cpp:1381
 msgid "Send \"&denied\""
 msgstr "Anfon \"&gwrthodwyd\""
 
-#: kmmessage.cpp:1361 kmmessage.cpp:1368
+#: kmmessage.cpp:1381 kmmessage.cpp:1388
 msgid "&Send"
 msgstr "An&fon"
 
-#: kmmessage.cpp:1436
+#: kmmessage.cpp:1458
 msgid ""
 "Header \"Disposition-Notification-Options\" contained required, but unknown "
 "parameter"
@@ -8565,36 +9408,46 @@ msgstr ""
 "Ni wnaeth y penawd \"Dewisiadau-Hysbysiad-Lleoliad\" gynnwys paramedr gofynnol, "
 "ond anhysbys"
 
-#: kmmessage.cpp:1628
+#: kmmessage.cpp:1650
 msgid "Receipt: "
 msgstr "Derbynneb:"
 
-#: kmmessage.cpp:3128 urlhandlermanager.cpp:551
+#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "Atodiad: %1"
 
-#: kmmimeparttree.cpp:139 kmreaderwin.cpp:1969
+#: kmmessage.cpp:3199
+#, fuzzy
+msgid "This attachment has been deleted."
+msgstr "Dangos atodiadau fel yr awgrymir gan yr anfonwr."
+
+#: kmmessage.cpp:3201
+#, fuzzy
+msgid "The attachment '%1' has been deleted."
+msgstr "Diddymwyd y digwyddiad %1"
+
+#: kmmimeparttree.cpp:137 kmreaderwin.cpp:2034
 msgid ""
 "_: to view something\n"
 "View"
 msgstr "Dangos"
 
-#: kmmimeparttree.cpp:147
+#: kmmimeparttree.cpp:145
 msgid "Save All Attachments..."
 msgstr "Cadw Pob Atodiad"
 
-#: kmmimeparttree.cpp:154 kmreaderwin.cpp:1975 kmreaderwin.cpp:2626
+#: kmmimeparttree.cpp:152 kmreaderwin.cpp:2041 kmreaderwin.cpp:2805
 #, fuzzy
 msgid "Delete Attachment"
 msgstr "&Gwaredu Atodiad"
 
-#: kmmimeparttree.cpp:157 kmreaderwin.cpp:1973 kmreaderwin.cpp:2638
+#: kmmimeparttree.cpp:155 kmreaderwin.cpp:2039 kmreaderwin.cpp:2861
 #, fuzzy
 msgid "Edit Attachment"
 msgstr "Atodiad"
 
-#: kmmimeparttree.cpp:370
+#: kmmimeparttree.cpp:368
 msgid "Unspecified Binary Data"
 msgstr "Data Deuol Amhenodol"
 
@@ -8817,230 +9670,242 @@ msgstr "dim pwnc"
 msgid "unknown"
 msgstr "anhysbys"
 
-#: kmreadermainwin.cpp:477 searchwindow.cpp:352
+#: kmreadermainwin.cpp:515 searchwindow.cpp:353
 msgid "Save Attachments..."
 msgstr "Cadw Atodiadau...."
 
-#: kmreaderwin.cpp:562
+#: kmreaderwin.cpp:489
 msgid ""
 "_: View->\n"
 "&Headers"
 msgstr "&Penawdau"
 
-#: kmreaderwin.cpp:563
+#: kmreaderwin.cpp:490
 msgid "Choose display style of message headers"
 msgstr "Dewis arddull dangos penawdau'r negeseuon"
 
-#: kmreaderwin.cpp:568
+#: kmreaderwin.cpp:495
 #, fuzzy
 msgid ""
 "_: View->headers->\n"
 "&Enterprise Headers"
 msgstr "Penawdau &Byr"
 
-#: kmreaderwin.cpp:571
+#: kmreaderwin.cpp:498
 #, fuzzy
 msgid "Show the list of headers in Enterprise style"
 msgstr "Dangos y rhestr penawdau mewn fformat pert"
 
-#: kmreaderwin.cpp:575
+#: kmreaderwin.cpp:502
 msgid ""
 "_: View->headers->\n"
 "&Fancy Headers"
 msgstr "Penawdau &Pert"
 
-#: kmreaderwin.cpp:578
+#: kmreaderwin.cpp:505
 msgid "Show the list of headers in a fancy format"
 msgstr "Dangos y rhestr penawdau mewn fformat pert"
 
-#: kmreaderwin.cpp:582
+#: kmreaderwin.cpp:509
 msgid ""
 "_: View->headers->\n"
 "&Brief Headers"
 msgstr "Penawdau &Byr"
 
-#: kmreaderwin.cpp:585
+#: kmreaderwin.cpp:512
 msgid "Show brief list of message headers"
 msgstr "Dangos rhestr fer o benawdau"
 
-#: kmreaderwin.cpp:589
+#: kmreaderwin.cpp:516
 msgid ""
 "_: View->headers->\n"
 "&Standard Headers"
 msgstr "Penawdau &Safonol"
 
-#: kmreaderwin.cpp:592
+#: kmreaderwin.cpp:519
 msgid "Show standard list of message headers"
 msgstr "Dangos rhestr safonol o benawdau"
 
-#: kmreaderwin.cpp:596
+#: kmreaderwin.cpp:523
 msgid ""
 "_: View->headers->\n"
 "&Long Headers"
 msgstr "Penawdau &Hir"
 
-#: kmreaderwin.cpp:599
+#: kmreaderwin.cpp:526
 msgid "Show long list of message headers"
 msgstr "Dangos rhestr hir o benawdau"
 
-#: kmreaderwin.cpp:603
+#: kmreaderwin.cpp:530
 msgid ""
 "_: View->headers->\n"
 "&All Headers"
 msgstr "P&ob Penawd"
 
-#: kmreaderwin.cpp:606
+#: kmreaderwin.cpp:533
 msgid "Show all message headers"
 msgstr "Dangos pob penawd y negeseuon"
 
-#: kmreaderwin.cpp:612
+#: kmreaderwin.cpp:539
 msgid ""
 "_: View->\n"
 "&Attachments"
 msgstr "&Atodiadau"
 
-#: kmreaderwin.cpp:613
+#: kmreaderwin.cpp:540
 msgid "Choose display style of attachments"
 msgstr "Dewis arddull dangos yr atodiadau"
 
-#: kmreaderwin.cpp:617
+#: kmreaderwin.cpp:544
 msgid ""
 "_: View->attachments->\n"
 "&As Icons"
 msgstr "Fel &Eiconau"
 
-#: kmreaderwin.cpp:620
+#: kmreaderwin.cpp:547
 msgid "Show all attachments as icons. Click to see them."
 msgstr "Dangos pob atodiad fel eicon.  Cliciwch i'w gweld nhw."
 
-#: kmreaderwin.cpp:624
+#: kmreaderwin.cpp:551
 msgid ""
 "_: View->attachments->\n"
 "&Smart"
 msgstr "&Deallus"
 
-#: kmreaderwin.cpp:627
+#: kmreaderwin.cpp:554
 msgid "Show attachments as suggested by sender."
 msgstr "Dangos atodiadau fel yr awgrymir gan yr anfonwr."
 
-#: kmreaderwin.cpp:631
+#: kmreaderwin.cpp:558
 msgid ""
 "_: View->attachments->\n"
 "&Inline"
 msgstr "&Mewnlin"
 
-#: kmreaderwin.cpp:634
+#: kmreaderwin.cpp:561
 msgid "Show all attachments inline (if possible)"
 msgstr "Dangos pob atodiad mewnlin (os bosibl)"
 
-#: kmreaderwin.cpp:638
+#: kmreaderwin.cpp:565
 msgid ""
 "_: View->attachments->\n"
 "&Hide"
 msgstr "&Cuddio"
 
-#: kmreaderwin.cpp:641
+#: kmreaderwin.cpp:568
 #, fuzzy
 msgid "Do not show attachments in the message viewer"
 msgstr "Peidio â dangos atodiadau yn y gwelydd negeseuon"
 
-#: kmreaderwin.cpp:646
+#: kmreaderwin.cpp:572
+#, fuzzy
+msgid ""
+"_: View->attachments->\n"
+"In Header &Only"
+msgstr "&Cuddio"
+
+#: kmreaderwin.cpp:575
+#, fuzzy
+msgid "Show Attachments only in the header of the mail"
+msgstr "Dangos pob atodiad fel eicon.  Cliciwch i'w gweld nhw."
+
+#: kmreaderwin.cpp:580
 msgid "&Set Encoding"
 msgstr "&Gosod Amgodiad"
 
-#: kmreaderwin.cpp:654
+#: kmreaderwin.cpp:588
 msgid "New Message To..."
 msgstr "Neges Newydd I..."
 
-#: kmreaderwin.cpp:657
+#: kmreaderwin.cpp:591
 msgid "Reply To..."
 msgstr "Ateb I..."
 
-#: kmreaderwin.cpp:660
+#: kmreaderwin.cpp:594
 msgid "Forward To..."
 msgstr "Blaenyrru I..."
 
-#: kmreaderwin.cpp:663
+#: kmreaderwin.cpp:597
 msgid "Add to Address Book"
 msgstr "Ychwanegu i'r Llyfr Cyfeiriadau"
 
-#: kmreaderwin.cpp:666
+#: kmreaderwin.cpp:600
 msgid "Open in Address Book"
 msgstr "Agor yn y Lyfr Cyfeiriadau"
 
-#: kmreaderwin.cpp:670
+#: kmreaderwin.cpp:604
 #, fuzzy
 msgid "Select All Text"
 msgstr "Dewis &Pob Neges"
 
-#: kmreaderwin.cpp:672
+#: kmreaderwin.cpp:606 kmreaderwin.cpp:1994
 msgid "Copy Link Address"
 msgstr "Copïo Cyfeiriad Cyswllt"
 
-#: kmreaderwin.cpp:674
+#: kmreaderwin.cpp:608
 msgid "Open URL"
 msgstr "Agor URL"
 
-#: kmreaderwin.cpp:676
+#: kmreaderwin.cpp:610
 msgid "Bookmark This Link"
 msgstr "Tudnodi'r Cyswllt Yma"
 
-#: kmreaderwin.cpp:680
+#: kmreaderwin.cpp:614
 msgid "Save Link As..."
 msgstr "Cadw'r Cyswllt Fel..."
 
-#: kmreaderwin.cpp:687
+#: kmreaderwin.cpp:621
 #, fuzzy
 msgid "Chat &With..."
 msgstr "Agor Efo..."
 
-#: kmreaderwin.cpp:1294
+#: kmreaderwin.cpp:1258
 msgid "Full namespace support for IMAP"
 msgstr ""
 
-#: kmreaderwin.cpp:1295
+#: kmreaderwin.cpp:1259
 msgid "Offline mode"
 msgstr "Modd All-lein"
 
-#: kmreaderwin.cpp:1296
+#: kmreaderwin.cpp:1260
 msgid "Sieve script management and editing"
 msgstr ""
 
-#: kmreaderwin.cpp:1297
+#: kmreaderwin.cpp:1261
 msgid "Account specific filtering"
 msgstr ""
 
-#: kmreaderwin.cpp:1298
+#: kmreaderwin.cpp:1262
 msgid "Filtering of incoming mail for online IMAP accounts"
 msgstr ""
 
-#: kmreaderwin.cpp:1299
+#: kmreaderwin.cpp:1263
 msgid "Online IMAP folders can be used when filtering into folders"
 msgstr ""
 
-#: kmreaderwin.cpp:1300
+#: kmreaderwin.cpp:1264
 #, fuzzy
 msgid "Automatically delete older mails on POP servers"
 msgstr "Anfon cada&rnhadau derbyn yn ymysgogol"
 
-#: kmreaderwin.cpp:1338
-msgid "The email client for the K Desktop Environment."
+#: kmreaderwin.cpp:1302
+msgid "The email client for the Trinity Desktop Environment."
 msgstr ""
 
-#: kmreaderwin.cpp:1346
+#: kmreaderwin.cpp:1310
 msgid ""
 "<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
 "<p>Please wait . . .</p>&nbsp;"
 msgstr ""
 
-#: kmreaderwin.cpp:1354
+#: kmreaderwin.cpp:1318
 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;"
 msgstr ""
 
-#: kmreaderwin.cpp:1371
+#: kmreaderwin.cpp:1335
 #, fuzzy
 msgid ""
 "_: %1: KMail version; %2: help:// URL; %3: homepage URL; %4: prior KMail "
@@ -9088,13 +9953,13 @@ msgstr ""
 "<p>Diolch,</p>\n"
 "<p>&nbsp; &nbsp; Y Tîm KMail</p>"
 
-#: kmreaderwin.cpp:1394 kmreaderwin.cpp:1416
+#: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
 msgid ""
 "<li>%1</li>\n"
 msgstr ""
 "<li>%1</li>\n"
 
-#: kmreaderwin.cpp:1399
+#: kmreaderwin.cpp:1363
 msgid ""
 "<p>Please take a moment to fill in the KMail configuration panel at "
 "Settings-&gt;Configure KMail.\n"
@@ -9106,31 +9971,40 @@ msgstr ""
 "Mae angen i chi greu o leiaf dynodiad rhagosod, cyfrif ebost derbyn, a chyfrif "
 "ebost anfon.</p>\n"
 
-#: kmreaderwin.cpp:1411
+#: kmreaderwin.cpp:1375
 msgid ""
 "<p><span style='font-size:125%; font-weight:bold;'>Important changes</span> "
 "(compared to KMail %1):</p>\n"
 msgstr ""
 
-#: kmreaderwin.cpp:1555
+#: kmreaderwin.cpp:1518
 msgid "( body part )"
 msgstr "( rhan gorff )"
 
-#: kmreaderwin.cpp:1854
+#: kmreaderwin.cpp:1890
 #, fuzzy
 msgid "Could not send MDN."
 msgstr "Methu anfon Hsbysiad Lleoliad Neges (MDN)!"
 
-#: kmreaderwin.cpp:1978
+#: kmreaderwin.cpp:1992
+#, fuzzy
+msgid "Copy Email Address"
+msgstr "Cyfeiriad Ebost"
+
+#: kmreaderwin.cpp:2044
 msgid "Decrypt With Chiasmus..."
 msgstr ""
 
-#: kmreaderwin.cpp:2133 kmreaderwin.cpp:2169 kmreaderwin.cpp:2188
+#: kmreaderwin.cpp:2050
+msgid "Scroll To"
+msgstr ""
+
+#: kmreaderwin.cpp:2208 kmreaderwin.cpp:2244 kmreaderwin.cpp:2264
 #, c-format
 msgid "View Attachment: %1"
 msgstr "Gweld Atodiad: %1"
 
-#: kmreaderwin.cpp:2181
+#: kmreaderwin.cpp:2257
 #, c-format
 msgid ""
 "_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
@@ -9140,15 +10014,15 @@ msgstr ""
 "[KMail: Mae'r atodiad yn cynnwys data deuol.  Ceisio dangos y %n o nodau "
 "cyntaf.]"
 
-#: kmreaderwin.cpp:2277
+#: kmreaderwin.cpp:2353
 msgid "&Open with '%1'"
 msgstr "&Agor efo '%1'"
 
-#: kmreaderwin.cpp:2279
+#: kmreaderwin.cpp:2355
 msgid "&Open With..."
 msgstr "&Agor Gyda..."
 
-#: kmreaderwin.cpp:2281
+#: kmreaderwin.cpp:2357
 #, fuzzy
 msgid ""
 "Open attachment '%1'?\n"
@@ -9157,37 +10031,37 @@ msgstr ""
 "Agor atodiad '%1'?\n"
 "Noder: gall agor atodiad beryglu diogelwch eich cysawd!"
 
-#: kmreaderwin.cpp:2286
+#: kmreaderwin.cpp:2362
 msgid "Open Attachment?"
 msgstr "Agor Atodiad?"
 
-#: kmreaderwin.cpp:2625
+#: kmreaderwin.cpp:2804
 msgid ""
 "Deleting an attachment might invalidate any digital signature on this message."
 msgstr ""
 
-#: kmreaderwin.cpp:2637
+#: kmreaderwin.cpp:2860
 msgid ""
 "Modifying an attachment might invalidate any digital signature on this message."
 msgstr ""
 
-#: kmreaderwin.cpp:2685
+#: kmreaderwin.cpp:2956
 #, fuzzy
 msgid "Attachments:"
 msgstr "Atodiad"
 
-#: kmsearchpattern.cpp:898
+#: kmsearchpattern.cpp:913
 msgid ""
 "_: name used for a virgin filter\n"
 "unknown"
 msgstr "anhysbys"
 
-#: kmsearchpattern.cpp:904
+#: kmsearchpattern.cpp:919
 #, fuzzy
 msgid "(match any of the following)"
 msgstr "Cyd&weddu ag unrhyw un o'r dilynnol"
 
-#: kmsearchpattern.cpp:906
+#: kmsearchpattern.cpp:921
 #, fuzzy
 msgid "(match all of the following)"
 msgstr "Cy&dweddu â pob un o'r dilynnol"
@@ -9227,27 +10101,46 @@ msgstr "<oed mewn diwrnodau>"
 msgid "Message Status"
 msgstr "Rhestr Negeseuon"
 
-#: kmsearchpatternedit.cpp:391
+#: kmsearchpatternedit.cpp:42
+#, fuzzy
+msgid "From"
+msgstr "&Oddiwrth"
+
+#: kmsearchpatternedit.cpp:43 recipientseditor.cpp:100
+msgid "To"
+msgstr "I"
+
+#: kmsearchpatternedit.cpp:44 recipientseditor.cpp:102
+msgid "CC"
+msgstr "CC"
+
+#: kmsearchpatternedit.cpp:45
+#, fuzzy
+msgid "Reply To"
+msgstr "&Ateb I"
+
+#: kmsearchpatternedit.cpp:46
+#, fuzzy
+msgid "Organization"
+msgstr "Sefydliad:"
+
+#: kmsearchpatternedit.cpp:397
 msgid "Search Criteria"
 msgstr "Meini Prawf Chwilio"
 
-#: kmsearchpatternedit.cpp:408
+#: kmsearchpatternedit.cpp:414
 msgid "Match a&ll of the following"
 msgstr "Cy&dweddu â pob un o'r dilynnol"
 
-#: kmsearchpatternedit.cpp:409
+#: kmsearchpatternedit.cpp:415
 msgid "Match an&y of the following"
 msgstr "Cyd&weddu ag unrhyw un o'r dilynnol"
 
-#: kmsender.cpp:114
-msgid "Please create an account for sending and try again."
-msgstr "Creuwch gyfrif ar gyfer anfon a ceisiwch eto."
-
 #: kmsender.cpp:171
 msgid "Cannot add message to outbox folder"
 msgstr "Methu ychwanegu neges i'r blygell blwch anfon"
 
-#: kmsender.cpp:373
+#: kmsender.cpp:374
 msgid ""
 "Critical error: Unable to process sent mail (out of space?)Moving failing "
 "message to \"sent-mail\" folder."
@@ -9255,7 +10148,7 @@ msgstr ""
 "Gwall argyfyngus: Methu prosesu ebost a anfonwyd (allan o le?).  Symudir y "
 "neges fethu i'r blygell \"ebost a anfonwyd\"."
 
-#: kmsender.cpp:385
+#: kmsender.cpp:386
 msgid ""
 "Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
 "failed.\n"
@@ -9267,14 +10160,14 @@ msgstr ""
 "Rhesymau posibl: diffyg lle ar y ddisg, neu ganiatad ysgrifennu.  Ceisiwch "
 "trwsio'r broblem a symud y neges â llaw."
 
-#: kmsender.cpp:431
+#: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
 "Please set the email address of identity '%1' in the Identities section of the "
 "configuration dialog and then try again."
 msgstr ""
 
-#: kmsender.cpp:453
+#: kmsender.cpp:454
 #, c-format
 msgid ""
 "_n: %n queued message successfully sent.\n"
@@ -9283,44 +10176,44 @@ msgstr ""
 "Anfonwyd %n neges yn a rhes yn llwyddiannus.\n"
 "Anfonwyd %n o negeseuon yn y rhes yn llwyddiannus."
 
-#: kmsender.cpp:456
+#: kmsender.cpp:457
 msgid "%1 of %2 queued messages successfully sent."
 msgstr "Anfonwyd %1 o %2 o negeseuon yn y rhes yn llwyddiannus."
 
-#: kmsender.cpp:471
+#: kmsender.cpp:472
 #, fuzzy
 msgid "Sending messages"
 msgstr "i negeseuon &cyrraedd"
 
-#: kmsender.cpp:472
+#: kmsender.cpp:473
 msgid "Initiating sender process..."
 msgstr "Ymgychwyn y broses anfon..."
 
-#: kmsender.cpp:502
+#: kmsender.cpp:503
 msgid ""
 "You have chosen to send all queued email using an unencrypted transport, do you "
 "want to continue? "
 msgstr ""
 
-#: kmsender.cpp:504
+#: kmsender.cpp:505
 msgid "Send Unencrypted"
 msgstr "Anfon heb ei Gêl-ysgrifo"
 
-#: kmsender.cpp:556
+#: kmsender.cpp:557
 msgid "Unrecognized transport protocol. Unable to send message."
 msgstr "Protocol cludiant anadnabyddus.  Methu anfon y neges."
 
-#: kmsender.cpp:597
+#: kmsender.cpp:598
 msgid ""
 "_: %3: subject of message\n"
 "Sending message %1 of %2: %3"
 msgstr "Anfon neges %1 o %2: %3"
 
-#: kmsender.cpp:616
+#: kmsender.cpp:617
 msgid "Failed to send (some) queued messages."
 msgstr "Methodd anfon (rhai) negeseuon yn y rhes."
 
-#: kmsender.cpp:693
+#: kmsender.cpp:694
 msgid ""
 "Sending aborted:\n"
 "%1\n"
@@ -9336,11 +10229,11 @@ msgstr ""
 "Defnyddwyd y protocol cludiant dilynnol:\n"
 "%2"
 
-#: kmsender.cpp:701 kmsender.cpp:746
+#: kmsender.cpp:702 kmsender.cpp:747
 msgid "Sending aborted."
 msgstr "Erthylwyd anfon/"
 
-#: kmsender.cpp:719
+#: kmsender.cpp:720
 msgid ""
 "<p>Sending failed:</p>"
 "<p>%1</p>"
@@ -9357,22 +10250,22 @@ msgstr ""
 "<p>Defnyddwyd y protocol cludiant dilynnol: %2</p>"
 "<p>Ydych eisiau i mi ddal i anfon gweddill y negeseuon?</p> "
 
-#: kmsender.cpp:729
+#: kmsender.cpp:730
 #, fuzzy
 msgid "Continue Sending"
 msgstr "Parhau i anfon"
 
-#: kmsender.cpp:729
+#: kmsender.cpp:730
 #, fuzzy
 msgid "&Continue Sending"
 msgstr "&Parhau i anfon"
 
-#: kmsender.cpp:730
+#: kmsender.cpp:731
 #, fuzzy
 msgid "&Abort Sending"
 msgstr "&Erthylu anfon"
 
-#: kmsender.cpp:732
+#: kmsender.cpp:733
 msgid ""
 "Sending failed:\n"
 "%1\n"
@@ -9388,11 +10281,11 @@ msgstr ""
 "Defnyddwyd y protocol cludiant dilynnol:\n"
 "%2"
 
-#: kmsender.cpp:930
+#: kmsender.cpp:931
 msgid "Please specify a mailer program in the settings."
 msgstr "Penodwch raglen ebostio yn y gosodiadau."
 
-#: kmsender.cpp:931
+#: kmsender.cpp:932
 msgid ""
 "Sending failed:\n"
 "%1\n"
@@ -9408,69 +10301,69 @@ msgstr ""
 "Defnyddwyd y protocol cludiant dilynnol:\n"
 "%2"
 
-#: kmsender.cpp:979
+#: kmsender.cpp:980
 #, c-format
 msgid "Failed to execute mailer program %1"
 msgstr "Methodd weithredu rhaglen ebostio %1"
 
-#: kmsender.cpp:1029
+#: kmsender.cpp:1030
 msgid "Sendmail exited abnormally."
 msgstr "Terfynodd Sendmail yn anarferol."
 
-#: kmsender.cpp:1099
+#: kmsender.cpp:1100
 #, fuzzy
 msgid "You need to supply a username and a password to use this SMTP server."
 msgstr ""
 "Rhaid i chi ddarparu defnydd-enw a chyfrinair i ddefnyddio'r gweinydd SMTP yma."
 
-#: kmstartup.cpp:197
+#: kmstartup.cpp:198
 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 ""
 
-#: kmstartup.cpp:207
+#: kmstartup.cpp:208
 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 ""
 
-#: kmstartup.cpp:215
+#: kmstartup.cpp:216
 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 ""
 
-#: kmstartup.cpp:221
+#: kmstartup.cpp:222
 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 ""
 
-#: kmstartup.cpp:231
+#: kmstartup.cpp:232
 #, c-format
 msgid "Start %1"
 msgstr "Dechrau %1"
 
-#: kmstartup.cpp:232
+#: kmstartup.cpp:233
 msgid "Exit"
 msgstr "Terfynu"
 
-#: kmsystemtray.cpp:337
+#: kmsystemtray.cpp:357
 #, fuzzy
 msgid "New Messages In"
 msgstr "Negeseuon Newydd Yn..."
 
-#: kmsystemtray.cpp:547
+#: kmsystemtray.cpp:567
 #, fuzzy
 msgid "There are no unread messages"
 msgstr "Darfod negeseuon &heb eu darllen"
 
-#: kmsystemtray.cpp:549
+#: kmsystemtray.cpp:569
 #, c-format
 msgid ""
 "_n: There is 1 unread message.\n"
@@ -9755,58 +10648,63 @@ msgstr "Hidlau ar Gael"
 msgid "Available Scripts"
 msgstr "Hidlau ar Gael"
 
-#: managesievescriptsdialog.cpp:116
+#: managesievescriptsdialog.cpp:121
 #, fuzzy
 msgid "No Sieve URL configured"
 msgstr "Ni Ffurfweddir Hidlo ar Ochr y Gweinydd"
 
-#: managesievescriptsdialog.cpp:135
+#: managesievescriptsdialog.cpp:140
 msgid "Failed to fetch the list of scripts"
 msgstr ""
 
-#: managesievescriptsdialog.cpp:160
+#: managesievescriptsdialog.cpp:165
 msgid "Delete Script"
 msgstr "Dileu Sgript"
 
-#: managesievescriptsdialog.cpp:161
+#: managesievescriptsdialog.cpp:166
 #, fuzzy
 msgid "Edit Script..."
 msgstr "Golygu..."
 
-#: managesievescriptsdialog.cpp:164
+#: managesievescriptsdialog.cpp:167
+#, fuzzy
+msgid "Deactivate Script"
+msgstr "Dileu Sgript"
+
+#: managesievescriptsdialog.cpp:170
 #, fuzzy
 msgid "New Script..."
 msgstr "Tanysgrifiad..."
 
-#: managesievescriptsdialog.cpp:233
+#: managesievescriptsdialog.cpp:256
 msgid "Really delete script \"%1\" from the server?"
 msgstr ""
 
-#: managesievescriptsdialog.cpp:234
+#: managesievescriptsdialog.cpp:257
 #, fuzzy
 msgid "Delete Sieve Script Confirmation"
 msgstr "Ffurfweddiad Gwasanaethau Cyfeiriadur"
 
-#: managesievescriptsdialog.cpp:278
+#: managesievescriptsdialog.cpp:300
 #, fuzzy
 msgid "New Sieve Script"
 msgstr "Hidlau ar Gael"
 
-#: managesievescriptsdialog.cpp:279
+#: managesievescriptsdialog.cpp:301
 #, fuzzy
 msgid "Please enter a name for the new Sieve script:"
 msgstr "Penodwch raglen ebostio yn y gosodiadau."
 
-#: managesievescriptsdialog.cpp:293
+#: managesievescriptsdialog.cpp:315
 #, fuzzy
 msgid "Edit Sieve Script"
 msgstr "Hidlau ar Gael"
 
-#: managesievescriptsdialog.cpp:337
+#: managesievescriptsdialog.cpp:367
 msgid "The Sieve script was successfully uploaded."
 msgstr ""
 
-#: managesievescriptsdialog.cpp:338
+#: managesievescriptsdialog.cpp:368
 msgid "Sieve Script Upload"
 msgstr ""
 
@@ -9816,7 +10714,7 @@ msgid ""
 "&Reply"
 msgstr "&Ateb"
 
-#: messageactions.cpp:48 searchwindow.cpp:311
+#: messageactions.cpp:48 searchwindow.cpp:312
 msgid "&Reply..."
 msgstr "A&teb..."
 
@@ -9824,11 +10722,11 @@ msgstr "A&teb..."
 msgid "Reply to A&uthor..."
 msgstr "Ateb i'r A&wdur"
 
-#: messageactions.cpp:58 searchwindow.cpp:313
+#: messageactions.cpp:58 searchwindow.cpp:314
 msgid "Reply to &All..."
 msgstr "Ateb i &Bawb..."
 
-#: messageactions.cpp:63 searchwindow.cpp:316
+#: messageactions.cpp:63 searchwindow.cpp:317
 msgid "Reply to Mailing-&List..."
 msgstr "Ateb i &Rhestr Ebost..."
 
@@ -9891,7 +10789,7 @@ msgstr "Neges bwysig"
 msgid "&Edit Message"
 msgstr "G&olygu Neges"
 
-#: messagecomposer.cpp:222
+#: messagecomposer.cpp:223
 msgid ""
 "<qt>"
 "<p>Structuring information returned by the Crypto plug-in could not be "
@@ -9903,7 +10801,7 @@ msgstr ""
 "efallai mae'r ategyn wedi cael niwed.</p>"
 "<p>Cyswlltwch â gweinyddwr eich cysawd.</p></qt>"
 
-#: messagecomposer.cpp:226
+#: messagecomposer.cpp:227
 msgid ""
 "<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
 "successfully.</p>"
@@ -9923,7 +10821,7 @@ msgstr ""
 "<li><em>neu</em> benodi gosodiadau OpenPGP traddodiadol ar dab Dynodiad->"
 "Uwch yr un un ymgom.</li></ul>"
 
-#: messagecomposer.cpp:444
+#: messagecomposer.cpp:445
 msgid ""
 "No suitable encoding could be found for your message.\n"
 "Please set an encoding using the 'Options' menu."
@@ -9931,153 +10829,153 @@ msgstr ""
 "Ni ellid canfod amgodiad addas ar gyfer eich neges.\n"
 "Gosodwch amgodiad gan ddefnyddio'r ddewislen \"Dewisiadau\"."
 
-#: messagecomposer.cpp:556
+#: messagecomposer.cpp:557
 msgid ""
 "Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
 "bug."
 msgstr ""
 
-#: messagecomposer.cpp:564
+#: messagecomposer.cpp:565
 msgid ""
 "The \"x-encrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
 
-#: messagecomposer.cpp:572
+#: messagecomposer.cpp:573
 msgid "Chiasmus Encryption Error"
 msgstr ""
 
-#: messagecomposer.cpp:577
+#: messagecomposer.cpp:578
 msgid ""
 "Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
 "not return a byte array. Please report this bug."
 msgstr ""
 
-#: messagecomposer.cpp:638
+#: messagecomposer.cpp:636
 msgid ""
 "The inline OpenPGP crypto message format does not support encryption or signing "
 "of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
 
-#: messagecomposer.cpp:642
+#: messagecomposer.cpp:640
 msgid "Insecure Message Format"
 msgstr ""
 
-#: messagecomposer.cpp:643
+#: messagecomposer.cpp:641
 #, fuzzy
 msgid "Use Inline OpenPGP"
 msgstr "OpenPGP mewnlin (mewnadeiledig)"
 
-#: messagecomposer.cpp:644
+#: messagecomposer.cpp:642
 msgid "Use OpenPGP/MIME"
 msgstr ""
 
-#: messagecomposer.cpp:760
+#: messagecomposer.cpp:758
 msgid ""
 "Examination of the recipient's signing preferences yielded that you be asked "
 "whether or not to sign this message.\n"
 "Sign this message?"
 msgstr ""
 
-#: messagecomposer.cpp:765 messagecomposer.cpp:788
+#: messagecomposer.cpp:763 messagecomposer.cpp:786
 #, fuzzy
 msgid "Sign Message?"
 msgstr "Llof&odi Neges"
 
-#: messagecomposer.cpp:766 messagecomposer.cpp:789
+#: messagecomposer.cpp:764 messagecomposer.cpp:787
 msgid ""
 "_: to sign\n"
 "&Sign"
 msgstr "&Llofnodi"
 
-#: messagecomposer.cpp:767 messagecomposer.cpp:790
+#: messagecomposer.cpp:765 messagecomposer.cpp:788
 msgid "Do &Not Sign"
 msgstr ""
 
-#: messagecomposer.cpp:784
+#: messagecomposer.cpp:782
 msgid ""
 "There are conflicting signing preferences for these recipients.\n"
 "Sign this message?"
 msgstr ""
 
-#: messagecomposer.cpp:806
+#: messagecomposer.cpp:804
 msgid ""
 "You have requested to sign this message, but no valid signing keys have been "
 "configured for this identity."
 msgstr ""
 
-#: messagecomposer.cpp:810
+#: messagecomposer.cpp:808
 msgid "Send Unsigned?"
 msgstr "Anfon Heb ei Lofnodi?"
 
-#: messagecomposer.cpp:811
+#: messagecomposer.cpp:809
 msgid "Send &Unsigned"
 msgstr "Anfon heb ei &Llofnodi"
 
-#: messagecomposer.cpp:826
+#: messagecomposer.cpp:824
 msgid ""
 "Some parts of this message will not be signed.\n"
 "Sending only partially signed messages might violate site policy.\n"
 "Sign all parts instead?"
 msgstr ""
 
-#: messagecomposer.cpp:829
+#: messagecomposer.cpp:827
 msgid ""
 "This message will not be signed.\n"
 "Sending unsigned message might violate site policy.\n"
 "Sign message instead?"
 msgstr ""
 
-#: messagecomposer.cpp:833
+#: messagecomposer.cpp:831
 msgid "&Sign All Parts"
 msgstr "Llofnodi &Pob Darn"
 
-#: messagecomposer.cpp:833
+#: messagecomposer.cpp:831
 msgid "&Sign"
 msgstr "&Llofnodi"
 
-#: messagecomposer.cpp:835
+#: messagecomposer.cpp:833
 #, fuzzy
 msgid "Unsigned-Message Warning"
 msgstr "Rhybudd Llofnod"
 
-#: messagecomposer.cpp:837
+#: messagecomposer.cpp:835
 #, fuzzy
 msgid "Send &As Is"
 msgstr "Anfon &fel mae"
 
-#: messagecomposer.cpp:875
+#: messagecomposer.cpp:873
 msgid ""
 "Valid trusted encryption keys were found for all recipients.\n"
 "Encrypt this message?"
 msgstr ""
 
-#: messagecomposer.cpp:877
+#: messagecomposer.cpp:875
 msgid ""
 "Examination of the recipient's encryption preferences yielded that you be asked "
 "whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
 
-#: messagecomposer.cpp:882 messagecomposer.cpp:909
+#: messagecomposer.cpp:880 messagecomposer.cpp:907
 msgid "Encrypt Message?"
 msgstr "Cêl-ysgrifo'r Neges?"
 
-#: messagecomposer.cpp:884
+#: messagecomposer.cpp:882
 msgid "Sign && &Encrypt"
 msgstr "Llofnodi && &Cêl-ysgrifo"
 
-#: messagecomposer.cpp:887 messagecomposer.cpp:962
+#: messagecomposer.cpp:885 messagecomposer.cpp:960
 msgid "&Sign Only"
 msgstr "Llof&nodi yn Unig"
 
-#: messagecomposer.cpp:888 messagecomposer.cpp:963
+#: messagecomposer.cpp:886 messagecomposer.cpp:961
 #, fuzzy
 msgid "&Send As-Is"
 msgstr "&Anfon fel mae"
 
-#: messagecomposer.cpp:905
+#: messagecomposer.cpp:903
 #, fuzzy
 msgid ""
 "There are conflicting encryption preferences for these recipients.\n"
@@ -10087,22 +10985,22 @@ msgstr ""
 "<p>Gwrthdaro yn yr hoffterau cêl-ysgrifo!</p>"
 "<p>Dylai'r neges yma gael ei chêl-ysgrifo?</p></qt>"
 
-#: messagecomposer.cpp:911
+#: messagecomposer.cpp:909
 #, fuzzy
 msgid "Do &Not Encrypt"
 msgstr "Peidio â Chêl-ysg&rifo"
 
-#: messagecomposer.cpp:927
+#: messagecomposer.cpp:925
 msgid ""
 "You have requested to encrypt this message, and to encrypt a copy to yourself, "
 "but no valid trusted encryption keys have been configured for this identity."
 msgstr ""
 
-#: messagecomposer.cpp:932
+#: messagecomposer.cpp:930
 msgid "Send Unencrypted?"
 msgstr "Anfon heb ei Gêl-ysgrifo?"
 
-#: messagecomposer.cpp:948
+#: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
 "Sending only partially encrypted messages might violate site policy and/or leak "
@@ -10110,7 +11008,7 @@ msgid ""
 "Encrypt all parts instead?"
 msgstr ""
 
-#: messagecomposer.cpp:952
+#: messagecomposer.cpp:950
 msgid ""
 "This message will not be encrypted.\n"
 "Sending unencrypted messages might violate site policy and/or leak sensitive "
@@ -10118,16 +11016,16 @@ msgid ""
 "Encrypt messages instead?"
 msgstr ""
 
-#: messagecomposer.cpp:957
+#: messagecomposer.cpp:955
 msgid "&Encrypt All Parts"
 msgstr "Cêl-ys&grifo Pob Darn"
 
-#: messagecomposer.cpp:959
+#: messagecomposer.cpp:957
 #, fuzzy
 msgid "Unencrypted Message Warning"
 msgstr "Neges wedi'i chêl-ysgrifo"
 
-#: messagecomposer.cpp:2040
+#: messagecomposer.cpp:2038
 #, fuzzy
 msgid ""
 "<qt>"
@@ -10140,7 +11038,7 @@ msgstr ""
 "<p>Rhowch adroddiad ynglyn â'r nam yma:"
 "<br>%2</p></qt>"
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2111
 msgid ""
 "<qt>Not all characters fit into the chosen encoding."
 "<br>"
@@ -10150,71 +11048,77 @@ msgstr ""
 "<br>"
 "<br>Anfon y neges beth bynnag?</qt>"
 
-#: messagecomposer.cpp:2115
+#: messagecomposer.cpp:2113
 msgid "Some Characters Will Be Lost"
 msgstr "Bydd rhai nodau yn cael eu colli"
 
-#: messagecomposer.cpp:2116
+#: messagecomposer.cpp:2114
 #, fuzzy
 msgid "Lose Characters"
 msgstr "&Ychwanegu Nodau Dyfynnu"
 
-#: messagecomposer.cpp:2116
+#: messagecomposer.cpp:2114
 #, fuzzy
 msgid "Change Encoding"
 msgstr "Goso&d Amgodiad"
 
-#: messagecomposer.cpp:2164
+#: messagecomposer.cpp:2149
+msgid ""
+"This message could not be signed, since no valid signing keys have been found; "
+"this should actually never happen, please report this bug."
+msgstr ""
+
+#: messagecomposer.cpp:2168
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
 msgstr ""
 
-#: messagecomposer.cpp:2185
+#: messagecomposer.cpp:2195
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2190
+#: messagecomposer.cpp:2200
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
 msgstr ""
 
-#: messagecomposer.cpp:2213
+#: messagecomposer.cpp:2223
 msgid ""
 "This message could not be encrypted, since the chosen backend does not seem to "
 "support encryption; this should actually never happen, please report this bug."
 msgstr ""
 
-#: messagecomposer.cpp:2233 messagecomposer.cpp:2278
+#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2255
+#: messagecomposer.cpp:2271
 msgid ""
 "This message could not be signed and encrypted, since the chosen backend does "
 "not seem to support combined signing and encryption; this should actually never "
 "happen, please report this bug."
 msgstr ""
 
-#: newfolderdialog.cpp:58
+#: newfolderdialog.cpp:59
 msgid "New Folder"
 msgstr "Plygell Newydd:"
 
-#: newfolderdialog.cpp:65
+#: newfolderdialog.cpp:69
 #, fuzzy, c-format
 msgid "New Subfolder of %1"
 msgstr "I&s-blygell Newydd..."
 
-#: newfolderdialog.cpp:81
+#: newfolderdialog.cpp:85
 msgid "Enter a name for the new folder."
 msgstr ""
 
-#: newfolderdialog.cpp:92
+#: newfolderdialog.cpp:96
 msgid "Mailbox &format:"
 msgstr "&Fformat Blwch Ebost"
 
-#: newfolderdialog.cpp:97
+#: newfolderdialog.cpp:101
 msgid ""
 "Select whether you want to store the messages in this folder as one file per  "
 "message (maildir) or as one big file (mbox). KMail uses maildir by default and "
@@ -10222,107 +11126,89 @@ msgid ""
 "this option as-is."
 msgstr ""
 
-#: newfolderdialog.cpp:119
+#: newfolderdialog.cpp:124
 #, fuzzy
 msgid "Folder &contains:"
 msgstr "Eiconau Plygell"
 
-#: newfolderdialog.cpp:124
+#: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
 "storage of groupware items such as tasks or notes. The default is mail. If you "
 "are unsure, leave this option as-is."
 msgstr ""
 
-#: newfolderdialog.cpp:160
+#: newfolderdialog.cpp:165
 msgid "Namespace for &folder:"
 msgstr ""
 
-#: newfolderdialog.cpp:165
+#: newfolderdialog.cpp:170
 #, fuzzy
 msgid "Select the personal namespace the folder should be created in."
 msgstr "Dewis yr allwedd gyhoeddus a ddylid eu hatodi."
 
-#: newfolderdialog.cpp:188
+#: newfolderdialog.cpp:193
 #, fuzzy
 msgid "Please specify a name for the new folder."
 msgstr "Penodwch raglen ebostio yn y gosodiadau."
 
-#: newfolderdialog.cpp:189
+#: newfolderdialog.cpp:194
 msgid "No Name Specified"
 msgstr "Dim Enw wedi'i Benodi"
 
-#: newfolderdialog.cpp:198
-msgid ""
-"Folder names cannot contain the / (slash) character; please choose another "
-"folder name."
-msgstr ""
-
-#: newfolderdialog.cpp:204
-msgid ""
-"Folder names cannot start with a . (dot) character; please choose another "
-"folder name."
-msgstr ""
-
-#: newfolderdialog.cpp:223
-msgid ""
-"Your IMAP server does not allow the character '%1'; please choose another "
-"folder name."
-msgstr ""
-
-#: newfolderdialog.cpp:240
+#: newfolderdialog.cpp:216
 msgid "<qt>Failed to create folder <b>%1</b>, folder already exists.</qt>"
 msgstr ""
 "<qt>Methwyd creu plygell <b>%1</b>, mae'r blygell mewn bod eisoes.</qt>"
 
-#: newfolderdialog.cpp:246
+#: newfolderdialog.cpp:222
 #, fuzzy
 msgid "<qt>Failed to create folder <b>%1</b>.</qt> "
 msgstr "<qt>Methu mynd i mewn i blygell <b>%1</b>.</qt>"
 
-#: objecttreeparser.cpp:450
+#: objecttreeparser.cpp:490
 #, fuzzy
 msgid "Wrong Crypto Plug-In."
 msgstr "Rhaglennig Celu Anghywir!"
 
-#: objecttreeparser.cpp:490 objecttreeparser.cpp:1909
+#: objecttreeparser.cpp:594 objecttreeparser.cpp:2130
 msgid "Different results for signatures"
 msgstr "Canlyniadau gwahanol ar gyfer y llofnodion"
 
-#: objecttreeparser.cpp:573
+#: objecttreeparser.cpp:667
 #, fuzzy
 msgid "The crypto engine returned no cleartext data."
 msgstr "Ni ddychwelodd y peiriant celu ddata testun clir!"
 
-#: objecttreeparser.cpp:576 objecttreeparser.cpp:2350
-#: objecttreeparser.cpp:2393
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
+#: objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr "Cyflwr:"
 
-#: objecttreeparser.cpp:583
+#: objecttreeparser.cpp:677
 msgid "(unknown)"
 msgstr "(anhysbys)"
 
-#: objecttreeparser.cpp:594 objecttreeparser.cpp:748
+#: objecttreeparser.cpp:688 objecttreeparser.cpp:903
 msgid "Crypto plug-in \"%1\" is not initialized."
 msgstr "Ni ymgychwynnir y rhaglennig celu \"%1\"."
 
-#: objecttreeparser.cpp:598
+#: objecttreeparser.cpp:692
 #, fuzzy
 msgid "Crypto plug-in \"%1\" cannot verify signatures."
 msgstr "Ni all y rhaglennig celu \"%1\" wirio llofnodion."
 
-#: objecttreeparser.cpp:603 objecttreeparser.cpp:756
+#: objecttreeparser.cpp:697 objecttreeparser.cpp:911
 msgid "No appropriate crypto plug-in was found."
 msgstr "Ni chanfuwyd rhaglennig celu addas."
 
-#: objecttreeparser.cpp:606
+#: objecttreeparser.cpp:700
 msgid ""
 "_: %1 is either 'OpenPGP' or 'S/MIME'\n"
 "No %1 plug-in was found."
 msgstr "Ni chanfuwyd rhaglennig %1."
 
-#: objecttreeparser.cpp:610
+#: objecttreeparser.cpp:704
 #, fuzzy, c-format
 msgid ""
 "The message is signed, but the validity of the signature cannot be verified.<br "
@@ -10330,36 +11216,41 @@ msgid ""
 msgstr ""
 "Llofnodir y neges, ond ni ellir gwirio dilysrwydd y llofnod.<br />Rheswm: %1"
 
-#: objecttreeparser.cpp:667
+#: objecttreeparser.cpp:737
+#, fuzzy
+msgid "Encrypted data not shown"
+msgstr "Ni ddangosir data na ellir ei ddatgelu."
+
+#: objecttreeparser.cpp:755
 #, fuzzy
 msgid "This message is encrypted."
 msgstr "Cadw negeseuon an&foniedig wedi'u cêl-ysgrifo"
 
-#: objecttreeparser.cpp:672
+#: objecttreeparser.cpp:760
 #, fuzzy
 msgid "Decrypt Message"
 msgstr "C&êl-ysgrifo Neges"
 
-#: objecttreeparser.cpp:731 objecttreeparser.cpp:744 objecttreeparser.cpp:773
+#: objecttreeparser.cpp:886 objecttreeparser.cpp:899 objecttreeparser.cpp:928
 #, fuzzy
 msgid "Encrypted data not shown."
 msgstr "Ni ddangosir data na ellir ei ddatgelu."
 
-#: objecttreeparser.cpp:734
+#: objecttreeparser.cpp:889
 msgid "Crypto plug-in \"%1\" could not decrypt the data."
 msgstr "Methodd y rhaglennig celu \"%1\" ddatgelu'r data."
 
-#: objecttreeparser.cpp:737
+#: objecttreeparser.cpp:892
 #, c-format
 msgid "Error: %1"
 msgstr "Gwall: %1"
 
-#: objecttreeparser.cpp:752
+#: objecttreeparser.cpp:907
 #, fuzzy
 msgid "Crypto plug-in \"%1\" cannot decrypt messages."
 msgstr "Ni all y rhaglennig celu \"%1\" ddatgelu negeseuon."
 
-#: objecttreeparser.cpp:844
+#: objecttreeparser.cpp:1000
 #, fuzzy
 msgid ""
 "<b>Note:</b> This HTML message may contain external references to images etc. "
@@ -10372,7 +11263,7 @@ msgstr ""
 "ymddangosiad HTML wedi'i fformatio ar gyfer y neges hon <a "
 "href=\"kmail:showHTML\">gan glicio yma</a>."
 
-#: objecttreeparser.cpp:854
+#: objecttreeparser.cpp:1010
 msgid ""
 "<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
 "code is shown. If you trust the sender of this message then you can activate "
@@ -10384,227 +11275,253 @@ msgstr ""
 "ymddangosiad HTML wedi'i fformatio ar gyfer y neges hon <a "
 "href=\"kmail:showHTML\">gan glicio yma</a>."
 
-#: objecttreeparser.cpp:1451
+#: objecttreeparser.cpp:1227
+msgid ""
+"This message is a <i>Toltec</i> Groupware object, it can only be viewed with "
+"Microsoft Outlook in combination with the Toltec connector."
+msgstr ""
+
+#: objecttreeparser.cpp:1239
+#, fuzzy
+msgid "Show Raw Message"
+msgstr "Neges a Flaenyrrwyd"
+
+#: objecttreeparser.cpp:1658
 #, c-format
 msgid "Sorry, certificate could not be imported.<br>Reason: %1"
 msgstr ""
 
-#: objecttreeparser.cpp:1461
+#: objecttreeparser.cpp:1668
 #, fuzzy
 msgid "Sorry, no certificates were found in this message."
 msgstr "Tystysgrif a ddefnyddir ar gyfer llofnodi negeseuon:"
 
-#: objecttreeparser.cpp:1464
+#: objecttreeparser.cpp:1671
 #, fuzzy
 msgid "Certificate import status:"
 msgstr "Dewin Tystygrif"
 
-#: objecttreeparser.cpp:1467
+#: objecttreeparser.cpp:1674
 #, c-format
 msgid ""
 "_n: 1 new certificate was imported.\n"
 "%n new certificates were imported."
 msgstr ""
 
-#: objecttreeparser.cpp:1470
+#: objecttreeparser.cpp:1677
 #, c-format
 msgid ""
 "_n: 1 certificate was unchanged.\n"
 "%n certificates were unchanged."
 msgstr ""
 
-#: objecttreeparser.cpp:1473
+#: objecttreeparser.cpp:1680
 #, c-format
 msgid ""
 "_n: 1 new secret key was imported.\n"
 "%n new secret keys were imported."
 msgstr ""
 
-#: objecttreeparser.cpp:1476
+#: objecttreeparser.cpp:1683
 #, c-format
 msgid ""
 "_n: 1 secret key was unchanged.\n"
 "%n secret keys were unchanged."
 msgstr ""
 
-#: objecttreeparser.cpp:1485
+#: objecttreeparser.cpp:1692
 msgid "Sorry, no details on certificate import available."
 msgstr ""
 
-#: objecttreeparser.cpp:1488
+#: objecttreeparser.cpp:1695
 #, fuzzy
 msgid "Certificate import details:"
 msgstr "Dewin Tystygrif"
 
-#: objecttreeparser.cpp:1491
+#: objecttreeparser.cpp:1698
 msgid "Failed: %1 (%2)"
 msgstr ""
 
-#: objecttreeparser.cpp:1496
+#: objecttreeparser.cpp:1703
 msgid "New or changed: %1 (secret key available)"
 msgstr ""
 
-#: objecttreeparser.cpp:1498
+#: objecttreeparser.cpp:1706
 #, c-format
 msgid "New or changed: %1"
 msgstr ""
 
-#: objecttreeparser.cpp:1891
+#: objecttreeparser.cpp:2112
 msgid "Error: Signature not verified"
 msgstr "Gwall: Ni wiriwyd y llofnod"
 
-#: objecttreeparser.cpp:1894
+#: objecttreeparser.cpp:2115
 msgid "Good signature"
 msgstr "Llofnod dilys"
 
-#: objecttreeparser.cpp:1897
+#: objecttreeparser.cpp:2118
 msgid "<b>Bad</b> signature"
 msgstr "Llofnod <b>llwgr</b>"
 
-#: objecttreeparser.cpp:1900
+#: objecttreeparser.cpp:2121
 msgid "No public key to verify the signature"
 msgstr "Dim allwedd gyhoeddus i wirio'r llofnod"
 
-#: objecttreeparser.cpp:1903
+#: objecttreeparser.cpp:2124
 msgid "No signature found"
 msgstr "Ni chanfuwyd llofnod"
 
-#: objecttreeparser.cpp:1906
+#: objecttreeparser.cpp:2127
 msgid "Error verifying the signature"
 msgstr "Gwall wrth wirio'r llofnod"
 
-#: objecttreeparser.cpp:1929
+#: objecttreeparser.cpp:2150
 msgid "No status information available."
 msgstr "Dim data cyflwr ar gael."
 
-#: objecttreeparser.cpp:1936 objecttreeparser.cpp:2020
+#: objecttreeparser.cpp:2157 objecttreeparser.cpp:2241
 msgid "Good signature."
 msgstr "Llofnod dilys."
 
-#: objecttreeparser.cpp:1957
+#: objecttreeparser.cpp:2178
 msgid "One key has expired."
 msgstr "Mae un allwedd wedi darfod."
 
-#: objecttreeparser.cpp:1961
+#: objecttreeparser.cpp:2182
 msgid "The signature has expired."
 msgstr "Mae'r llofnod wedi darfod."
 
-#: objecttreeparser.cpp:1966
+#: objecttreeparser.cpp:2187
 msgid "Unable to verify: key missing."
 msgstr "Methu gwirio: allwedd ar goll."
 
-#: objecttreeparser.cpp:1973
+#: objecttreeparser.cpp:2194
 msgid "CRL not available."
 msgstr "CRL dim ar gael."
 
-#: objecttreeparser.cpp:1977
+#: objecttreeparser.cpp:2198
 msgid "Available CRL is too old."
 msgstr "Mae'r CRL sydd ar gael yn rhy hen."
 
-#: objecttreeparser.cpp:1981
+#: objecttreeparser.cpp:2202
 msgid "A policy was not met."
 msgstr "Ni fodlonwyd polisi."
 
-#: objecttreeparser.cpp:1985
+#: objecttreeparser.cpp:2206
 msgid "A system error occurred."
 msgstr "Digwyddodd gwall cysawd."
 
-#: objecttreeparser.cpp:1996
+#: objecttreeparser.cpp:2217
 msgid "One key has been revoked."
 msgstr "Mae un allwedd wedi'i dirymu."
 
-#: objecttreeparser.cpp:2022
+#: objecttreeparser.cpp:2243
 msgid "<b>Bad</b> signature."
 msgstr "Llofnod <b>llwgr</b>."
 
-#: objecttreeparser.cpp:2049
+#: objecttreeparser.cpp:2270
 #, fuzzy
 msgid "Invalid signature."
 msgstr "&Galluogi llofnod"
 
-#: objecttreeparser.cpp:2051
+#: objecttreeparser.cpp:2272
 #, fuzzy
 msgid "Not enough information to check signature validity."
 msgstr "Dim digon o wybodaeth i wirio'r llofnod. %1"
 
-#: objecttreeparser.cpp:2060
+#: objecttreeparser.cpp:2281
 #, fuzzy
 msgid "Signature is valid."
 msgstr "Llofnodion"
 
-#: objecttreeparser.cpp:2062
+#: objecttreeparser.cpp:2283
 msgid "Signed by <a href=\"mailto:%1\">%2</a>."
 msgstr ""
 
-#: objecttreeparser.cpp:2066
+#: objecttreeparser.cpp:2287
 msgid "Unknown signature state"
 msgstr ""
 
-#: objecttreeparser.cpp:2070
+#: objecttreeparser.cpp:2291
 #, fuzzy
 msgid "Show Details"
 msgstr "[Manylion]"
 
-#: objecttreeparser.cpp:2082
+#: objecttreeparser.cpp:2308
 #, fuzzy
 msgid "No Audit Log available"
 msgstr "Dim ar gael"
 
-#: objecttreeparser.cpp:2089
+#: objecttreeparser.cpp:2310
+#, fuzzy, c-format
+msgid "Error Retrieving Audit Log: %1"
+msgstr "Dim negeseuon newydd o'r gweinydd"
+
+#: objecttreeparser.cpp:2320
 msgid ""
 "_: The Audit Log is a detailed error log from the gnupg backend\n"
 "Show Audit Log"
 msgstr ""
 
-#: objecttreeparser.cpp:2097
+#: objecttreeparser.cpp:2331
 #, fuzzy
 msgid "Hide Details"
 msgstr "[Manylion]"
 
-#: objecttreeparser.cpp:2124 objecttreeparser.cpp:2126
+#: objecttreeparser.cpp:2357 objecttreeparser.cpp:2359
 msgid "Encapsulated message"
 msgstr "Neges ymgrynhoëdig"
 
-#: objecttreeparser.cpp:2135
+#: objecttreeparser.cpp:2368
+#, fuzzy
+msgid "Please wait while the message is being decrypted..."
+msgstr "Cadw negeseuon an&foniedig wedi'u cêl-ysgrifo"
+
+#: objecttreeparser.cpp:2370
 msgid "Encrypted message"
 msgstr "Neges wedi'i chêl-ysgrifo"
 
-#: objecttreeparser.cpp:2137
+#: objecttreeparser.cpp:2372
 msgid "Encrypted message (decryption not possible)"
 msgstr "Neges wedi'i chêl-ysgrifo (ni ellir datgelu)"
 
-#: objecttreeparser.cpp:2139
+#: objecttreeparser.cpp:2374
 #, c-format
 msgid "Reason: %1"
 msgstr "Rheswm: %1"
 
-#: objecttreeparser.cpp:2194
+#: objecttreeparser.cpp:2384
+#, fuzzy
+msgid "Please wait while the signature is being verified..."
+msgstr "Ni ellir gwirio dilysrwydd y llofnod."
+
+#: objecttreeparser.cpp:2438
 msgid "[Details]"
 msgstr "[Manylion]"
 
-#: objecttreeparser.cpp:2233 objecttreeparser.cpp:2235
+#: objecttreeparser.cpp:2477 objecttreeparser.cpp:2479
 #, fuzzy
 msgid "certificate"
 msgstr "Tystysgrif"
 
-#: objecttreeparser.cpp:2242 objecttreeparser.cpp:2267
+#: objecttreeparser.cpp:2486 objecttreeparser.cpp:2511
 msgid "Warning:"
 msgstr "Rhybudd:"
 
-#: objecttreeparser.cpp:2244
+#: objecttreeparser.cpp:2488
 msgid "Sender's mail address is not stored in the %1 used for signing."
 msgstr ""
 "Ni cedwir cyfeiriad ebost yr anfonwr yn y %1 a ddefnyddir ar gyfer llofnodi."
 
-#: objecttreeparser.cpp:2247
+#: objecttreeparser.cpp:2491
 msgid "sender: "
 msgstr "anfonwr:"
 
-#: objecttreeparser.cpp:2250
+#: objecttreeparser.cpp:2494
 msgid "stored: "
 msgstr "cedwyd:"
 
-#: objecttreeparser.cpp:2269
+#: objecttreeparser.cpp:2513
 msgid ""
 "No mail address is stored in the %1 used for signing, so we cannot compare it "
 "to the sender's address %2."
@@ -10612,100 +11529,100 @@ msgstr ""
 "Ni chedwir cyfeiriad ebost yn y %1 a ddefnyddir ar gyfer llofnodi, felly ni "
 "ellir ei gymharu â chyfeiriad yr anfonwr %2."
 
-#: objecttreeparser.cpp:2292
+#: objecttreeparser.cpp:2536
 #, c-format
 msgid "Not enough information to check signature. %1"
 msgstr "Dim digon o wybodaeth i wirio'r llofnod. %1"
 
-#: objecttreeparser.cpp:2309 objecttreeparser.cpp:2387
+#: objecttreeparser.cpp:2553 objecttreeparser.cpp:2631
 msgid "Message was signed with unknown key."
 msgstr "Llofnodwyd y neges efo allwedd anhysbys."
 
-#: objecttreeparser.cpp:2311 objecttreeparser.cpp:2425
-#: objecttreeparser.cpp:2469
+#: objecttreeparser.cpp:2555 objecttreeparser.cpp:2669
+#: objecttreeparser.cpp:2713
 #, c-format
 msgid "Message was signed by %1."
 msgstr "Llofnodwyd y neges gan %1."
 
-#: objecttreeparser.cpp:2318 objecttreeparser.cpp:2327
-#: objecttreeparser.cpp:2338
+#: objecttreeparser.cpp:2562 objecttreeparser.cpp:2571
+#: objecttreeparser.cpp:2582
 #, c-format
 msgid "Message was signed with key %1."
 msgstr "Llofnodwyd y neges efo allwedd %1."
 
-#: objecttreeparser.cpp:2321
+#: objecttreeparser.cpp:2565
 #, fuzzy
 msgid "Message was signed on %1 with key %2."
 msgstr "Llofnodwyd y neges gan %2 efo allwedd %1."
 
-#: objecttreeparser.cpp:2330
+#: objecttreeparser.cpp:2574
 #, fuzzy
 msgid "Message was signed by %3 on %1 with key %2"
 msgstr "Llofnodwyd y neges gan %2 efo allwedd %1."
 
-#: objecttreeparser.cpp:2341
+#: objecttreeparser.cpp:2585
 msgid "Message was signed by %2 with key %1."
 msgstr "Llofnodwyd y neges gan %2 efo allwedd %1."
 
-#: objecttreeparser.cpp:2379
+#: objecttreeparser.cpp:2623
 #, fuzzy
 msgid "Message was signed on %1 with unknown key %2."
 msgstr "Llofnodwyd y neges efo allwedd anhysbys %1."
 
-#: objecttreeparser.cpp:2383
+#: objecttreeparser.cpp:2627
 #, c-format
 msgid "Message was signed with unknown key %1."
 msgstr "Llofnodwyd y neges efo allwedd anhysbys %1."
 
-#: objecttreeparser.cpp:2389
+#: objecttreeparser.cpp:2633
 msgid "The validity of the signature cannot be verified."
 msgstr "Ni ellir gwirio dilysrwydd y llofnod."
 
-#: objecttreeparser.cpp:2421 objecttreeparser.cpp:2465
+#: objecttreeparser.cpp:2665 objecttreeparser.cpp:2709
 msgid "Message was signed by %2 (Key ID: %1)."
 msgstr "Llofnodwyd y neges gan %2 (ID yr Allwedd: %1)."
 
-#: objecttreeparser.cpp:2431
+#: objecttreeparser.cpp:2675
 msgid "The signature is valid, but the key's validity is unknown."
 msgstr "Mae'r llofnod yn ddilys, ond mae dilysrwydd yr allwedd yn anhysbys."
 
-#: objecttreeparser.cpp:2435
+#: objecttreeparser.cpp:2679
 msgid "The signature is valid and the key is marginally trusted."
 msgstr "Mae'r llofnod yn ddilys ac ymddirieidir yr allwedd i ryw radd."
 
-#: objecttreeparser.cpp:2439
+#: objecttreeparser.cpp:2683
 msgid "The signature is valid and the key is fully trusted."
 msgstr "Mae'r llofnod yn ddilys ac ymddiriedir yr allwedd yn llawn."
 
-#: objecttreeparser.cpp:2443
+#: objecttreeparser.cpp:2687
 msgid "The signature is valid and the key is ultimately trusted."
 msgstr "Mae'r llofnod yn ddilys ac ymddiriedir yr allwedd yn eithaf."
 
-#: objecttreeparser.cpp:2447
+#: objecttreeparser.cpp:2691
 msgid "The signature is valid, but the key is untrusted."
 msgstr "Mae'r llofnod yn ddilys, ond ni ymddiriedir yr allwedd."
 
-#: objecttreeparser.cpp:2471
+#: objecttreeparser.cpp:2715
 msgid "Warning: The signature is bad."
 msgstr "Rhybudd:  Mae'r llofnod yn llwgr."
 
-#: objecttreeparser.cpp:2495
+#: objecttreeparser.cpp:2739
 msgid "End of signed message"
 msgstr "Diwedd y neges lofnodedig"
 
-#: objecttreeparser.cpp:2501
+#: objecttreeparser.cpp:2745
 msgid "End of encrypted message"
 msgstr "Diwedd y neges cêl-ysgrifedig"
 
-#: objecttreeparser.cpp:2508
+#: objecttreeparser.cpp:2752
 msgid "End of encapsulated message"
 msgstr "Diwedd y neges ymgrynhoëdig"
 
-#: partNode.cpp:481
+#: partNode.cpp:505
 msgid "internal part"
 msgstr "rhan fewnol "
 
-#: partNode.cpp:483
+#: partNode.cpp:507
 msgid "body part"
 msgstr "rhan gorff"
 
@@ -10792,19 +11709,19 @@ msgstr "&Mynd"
 msgid "F&older"
 msgstr "P&lygell"
 
-#. i18n: file kmail_part.rc line 115
+#. i18n: file kmail_part.rc line 116
 #: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
 #, no-c-format
 msgid "&Message"
 msgstr "&Neges"
 
-#. i18n: file kmail_part.rc line 121
+#. i18n: file kmail_part.rc line 122
 #: rc.cpp:24 rc.cpp:90 rc.cpp:123
 #, no-c-format
 msgid "Reply Special"
 msgstr ""
 
-#. i18n: file kmail_part.rc line 127
+#. i18n: file kmail_part.rc line 128
 #: rc.cpp:27 rc.cpp:93 rc.cpp:126
 #, no-c-format
 msgid "&Forward"
@@ -10956,158 +11873,170 @@ msgstr ""
 msgid "Never sign/encrypt when sa&ving as draft"
 msgstr ""
 
-#. i18n: file customtemplates_base.ui line 180
-#: rc.cpp:194
+#. i18n: file customtemplates_base.ui line 118
+#: rc.cpp:194 rc.cpp:462
+#, no-c-format
+msgid "How does this work?"
+msgstr ""
+
+#. i18n: file customtemplates_base.ui line 169
+#: rc.cpp:197 templateparser.cpp:417
+#, no-c-format
+msgid "To:"
+msgstr "I:"
+
+#. i18n: file customtemplates_base.ui line 177
+#: rc.cpp:200 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "CC:"
+
+#. i18n: file customtemplates_base.ui line 234
+#: rc.cpp:203
 #, fuzzy, no-c-format
 msgid "Universal"
 msgstr "Cyffredinol"
 
-#. i18n: file customtemplates_base.ui line 185
-#: rc.cpp:197
+#. i18n: file customtemplates_base.ui line 239
+#: rc.cpp:206
 #, fuzzy, no-c-format
 msgid "Reply"
 msgstr "&Ateb I"
 
-#. i18n: file customtemplates_base.ui line 190
-#: rc.cpp:200
+#. i18n: file customtemplates_base.ui line 244
+#: rc.cpp:209
 #, fuzzy, no-c-format
 msgid "Reply to All"
 msgstr "Ateb i &Bawb..."
 
-#. i18n: file customtemplates_base.ui line 195
-#: rc.cpp:203
+#. i18n: file customtemplates_base.ui line 249
+#: rc.cpp:212
 #, fuzzy, no-c-format
 msgid "Forward"
 msgstr "B&laenyrru"
 
-#. i18n: file customtemplates_base.ui line 207
-#: rc.cpp:206
+#. i18n: file customtemplates_base.ui line 261
+#: rc.cpp:215
 #, fuzzy, no-c-format
 msgid "Shortc&ut:"
 msgstr "Byrlwybr:"
 
-#. i18n: file customtemplates_base.ui line 229
-#: rc.cpp:209
+#. i18n: file customtemplates_base.ui line 283
+#: rc.cpp:218
 #, fuzzy, no-c-format
 msgid "&Template type:"
 msgstr "&Amnewid"
 
-#. i18n: file customtemplates_base.ui line 256
-#: rc.cpp:215 rc.cpp:456
-#, no-c-format
-msgid "How does this work?"
-msgstr ""
-
 #. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:218
+#: rc.cpp:224
 #, no-c-format
 msgid "Folder Properties"
 msgstr "Priodweddau Plygell"
 
 #. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:227
+#: rc.cpp:233
 #, no-c-format
 msgid "Folder holds a &mailing list"
 msgstr "Mae'r &blygell yn cynnwys rhestr ebost"
 
 #. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:230
+#: rc.cpp:236
 #, no-c-format
 msgid "List &address:"
 msgstr "C&yfeiriad y rhestr:"
 
 #. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:233
+#: rc.cpp:239
 #, no-c-format
 msgid "N&ormal:"
 msgstr "Ar&ferol:"
 
 #. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:236
+#: rc.cpp:242
 #, no-c-format
 msgid "Unr&ead:"
 msgstr "&Heb eu darllen:"
 
 #. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:242
+#: rc.cpp:248
 #, no-c-format
 msgid "Message Expiring"
 msgstr "Neges yn Darfod"
 
 #. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:245
+#: rc.cpp:251
 #, no-c-format
 msgid "E&xpire after:"
 msgstr "Dar&fod ar ôl:"
 
 #. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:248
+#: rc.cpp:254
 #, no-c-format
 msgid "Expire &read messages"
 msgstr "&Darfod negeseuon darlleniedig"
 
 #. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:251
+#: rc.cpp:257
 #, no-c-format
 msgid "Expire a&fter:"
 msgstr "Darfod ar ô&l:"
 
 #. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:254
+#: rc.cpp:260
 #, no-c-format
 msgid "Expire &unread messages"
 msgstr "Darfod negeseuon &heb eu darllen"
 
 #. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:257 rc.cpp:266
+#: rc.cpp:263 rc.cpp:272
 #, no-c-format
 msgid "Day(s)"
 msgstr "Diwrnod(au)"
 
 #. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:260 rc.cpp:269
+#: rc.cpp:266 rc.cpp:275
 #, no-c-format
 msgid "Week(s)"
 msgstr "Wythnos(au)"
 
 #. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:263 rc.cpp:272
+#: rc.cpp:269 rc.cpp:278
 #, no-c-format
 msgid "Month(s)"
 msgstr "Mis(oedd)"
 
 #. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:275
+#: rc.cpp:281
 #, no-c-format
 msgid "Advanced"
 msgstr "Uwch"
 
 #. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:278
+#: rc.cpp:284
 #, fuzzy, no-c-format
 msgid "Sender identit&y:"
 msgstr "Dynodiad yr &Anfonwr:"
 
 #. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:281
+#: rc.cpp:287
 #, fuzzy, no-c-format
 msgid "&Storage format:"
 msgstr "Fformat &Cadw:"
 
 #. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:284
+#: rc.cpp:290
 #, fuzzy, no-c-format
 msgid "&List displays:"
 msgstr "&Ymddangosiad y Rhestri:"
 
 #. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:293
+#: rc.cpp:299
 #, no-c-format
 msgid "Validate certificates using CRLs"
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:296
+#: rc.cpp:302
 #, no-c-format
 msgid ""
 "If this option is selected, S/MIME certificates are validated using Certificate "
@@ -11115,13 +12044,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:299
+#: rc.cpp:305
 #, no-c-format
 msgid "Validate certificates online (OCSP)"
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:302
+#: rc.cpp:308
 #, no-c-format
 msgid ""
 "If this option is selected, S/MIME certificates are validated online using the "
@@ -11130,19 +12059,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:305
+#: rc.cpp:311
 #, fuzzy, no-c-format
 msgid "Online Certificate Validation"
 msgstr "Creu Tystysgrif"
 
 #. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:308
+#: rc.cpp:314
 #, no-c-format
 msgid "OCSP responder URL:"
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:311
+#: rc.cpp:317
 #, no-c-format
 msgid ""
 "Enter here the address of the server for online validation of certificates "
@@ -11150,25 +12079,25 @@ msgid ""
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:314
+#: rc.cpp:320
 #, fuzzy, no-c-format
 msgid "OCSP responder signature:"
 msgstr "Llofnod dilys"
 
 #. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:317
+#: rc.cpp:323
 #, fuzzy, no-c-format
 msgid "Ignore service URL of certificates"
 msgstr "Anfon &eich tystysgrif eich hun"
 
 #. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:320
+#: rc.cpp:326
 #, fuzzy, no-c-format
 msgid "Do not check certificate policies"
 msgstr "&Peidio ac anfon tystysgrifau"
 
 #. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:323
+#: rc.cpp:329
 #, no-c-format
 msgid ""
 "By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
@@ -11176,13 +12105,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:326
+#: rc.cpp:332
 #, no-c-format
 msgid "Never consult a CRL"
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:329
+#: rc.cpp:335
 #, no-c-format
 msgid ""
 "If this option is checked, Certificate Revocation Lists are never used to "
@@ -11190,13 +12119,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:332
+#: rc.cpp:338
 #, fuzzy, no-c-format
 msgid "Fetch missing issuer certificates"
 msgstr "Wrth ychwanegu tystysgrifau"
 
 #. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:335
+#: rc.cpp:341
 #, no-c-format
 msgid ""
 "If this option is checked, missing issuer certificates are fetched when "
@@ -11204,37 +12133,37 @@ msgid ""
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:338
+#: rc.cpp:344
 #, no-c-format
 msgid "HTTP Requests"
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:341
+#: rc.cpp:347
 #, no-c-format
 msgid "Do not perform any HTTP requests"
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:344
+#: rc.cpp:350
 #, no-c-format
 msgid "Entirely disables the use of HTTP for S/MIME."
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:350
+#: rc.cpp:356
 #, no-c-format
 msgid "Use this proxy for HTTP requests: "
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:353
+#: rc.cpp:359
 #, no-c-format
 msgid "Use system HTTP proxy:"
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:356
+#: rc.cpp:362
 #, no-c-format
 msgid ""
 "If this option is selected, the value of the HTTP proxy shown on the right "
@@ -11243,7 +12172,7 @@ msgid ""
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:359
+#: rc.cpp:365
 #, no-c-format
 msgid ""
 "Enter here the location of your HTTP Proxy, which will be used for all HTTP "
@@ -11252,13 +12181,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:362
+#: rc.cpp:368
 #, fuzzy, no-c-format
 msgid "Ignore HTTP CRL distribution point of certificates"
 msgstr "Anfon &eich tystysgrif eich hun"
 
 #. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:365
+#: rc.cpp:371
 #, no-c-format
 msgid ""
 "When looking for the location of a CRL, the to-be-tested certificate usually "
@@ -11269,31 +12198,31 @@ msgid ""
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:368
+#: rc.cpp:374
 #, no-c-format
 msgid "LDAP Requests"
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:371
+#: rc.cpp:377
 #, no-c-format
 msgid "Do not perform any LDAP requests"
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:374
+#: rc.cpp:380
 #, no-c-format
 msgid "Entirely disables the use of LDAP for S/MIME."
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:377
+#: rc.cpp:383
 #, fuzzy, no-c-format
 msgid "Ignore LDAP CRL distribution point of certificates"
 msgstr "Anfon &eich tystysgrif eich hun"
 
 #. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:380
+#: rc.cpp:386
 #, no-c-format
 msgid ""
 "When looking for the location of a CRL, the to-be-tested certificate usually "
@@ -11304,13 +12233,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:383
+#: rc.cpp:389
 #, no-c-format
 msgid "Primary host for LDAP requests:"
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:386
+#: rc.cpp:392
 #, no-c-format
 msgid ""
 "Entering a LDAP server here will make all LDAP requests go to that server "
@@ -11323,86 +12252,86 @@ msgid ""
 msgstr ""
 
 #. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:390
+#: rc.cpp:396
 #, no-c-format
 msgid "Add Snippet"
 msgstr ""
 
 #. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:393
+#: rc.cpp:399
 #, fuzzy, no-c-format
 msgid "&Add"
 msgstr "&Ychwanegu..."
 
 #. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:402
+#: rc.cpp:408
 #, no-c-format
 msgid "&Snippet:"
 msgstr ""
 
 #. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:405
+#: rc.cpp:411
 #, fuzzy, no-c-format
 msgid "Group:"
 msgstr "&Cylchwedd"
 
 #. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:408
+#: rc.cpp:414
 #, fuzzy, no-c-format
 msgid "Snippet Settings"
 msgstr "Dynodiadau &sy'n bodoli:"
 
 #. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:411
+#: rc.cpp:417
 #, no-c-format
 msgid "Tooltips"
 msgstr ""
 
 #. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:414
+#: rc.cpp:420
 #, no-c-format
 msgid "Show snippet's text in &tooltip"
 msgstr ""
 
 #. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:417
+#: rc.cpp:423
 #, no-c-format
 msgid ""
 "Decides if a tooltip should be shown containing text from the bookmarked line"
 msgstr ""
 
 #. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:420
+#: rc.cpp:426
 #, no-c-format
 msgid "Variables"
 msgstr ""
 
 #. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:423
+#: rc.cpp:429
 #, no-c-format
 msgid "Input Method for Variables"
 msgstr ""
 
 #. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:426
+#: rc.cpp:432
 #, no-c-format
 msgid "Single dialog for each variable within a snippet"
 msgstr ""
 
 #. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:429
+#: rc.cpp:435
 #, no-c-format
 msgid "An input dialog will be displayed for every variable within a snippet"
 msgstr ""
 
 #. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:432
+#: rc.cpp:438
 #, no-c-format
 msgid "One dialog for all variables within a snippet"
 msgstr ""
 
 #. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:435
+#: rc.cpp:441
 #, no-c-format
 msgid ""
 "A single dialog will be displayed where you can enter the values for all "
@@ -11410,49 +12339,49 @@ msgid ""
 msgstr ""
 
 #. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:438
+#: rc.cpp:444
 #, fuzzy, no-c-format
 msgid "Delimiter:"
 msgstr "Diderfyn"
 
 #. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:441
+#: rc.cpp:447
 #, fuzzy, no-c-format
 msgid "TemplatesConfiguration"
 msgstr "Ffurfweddu Llofnod"
 
 #. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:447
+#: rc.cpp:453
 #, fuzzy, no-c-format
 msgid "Reply to Sender"
 msgstr "Ate&b i'r anfonwr:"
 
 #. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:450
+#: rc.cpp:456
 #, fuzzy, no-c-format
 msgid "Reply to All / Reply to List"
 msgstr "Ateb i &Bawb..."
 
 #. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:453
+#: rc.cpp:459
 #, fuzzy, no-c-format
 msgid "Forward Message"
 msgstr "Neges a Flaenyrrwyd"
 
 #. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:462
+#: rc.cpp:468
 #, no-c-format
 msgid "Warn when trying to send &unsigned messages"
 msgstr "Rhybuddio wrth geisio anfon negeseuon &heb eu llofnodi"
 
 #. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:465
+#: rc.cpp:471
 #, no-c-format
 msgid "Check to be warned when sending unsigned messages."
 msgstr "Brithwch i gael eich rhybuddio wrth anfon negeseuon heb eu llofnodi."
 
 #. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:468
+#: rc.cpp:474
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -11472,20 +12401,20 @@ msgstr ""
 "</qt>"
 
 #. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:476
+#: rc.cpp:482
 #, no-c-format
 msgid "&Warn when trying to send unencrypted messages"
 msgstr "Rhy&buddio wrth geisio anfon negeseuon heb eu cêl-ysgrifo"
 
 #. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:479
+#: rc.cpp:485
 #, no-c-format
 msgid "Check to be warned when sending unencrypted messages."
 msgstr ""
 "Brithwch i gael eich rhybuddio wrth geisio anfon negeseuon heb eu cêl-ysgrifo."
 
 #. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:482
+#: rc.cpp:488
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -11505,19 +12434,19 @@ msgstr ""
 "</qt>"
 
 #. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:490
+#: rc.cpp:496
 #, fuzzy, no-c-format
 msgid "Warn if &Receiver's Email Address is Not in Certificate"
 msgstr "Rhybuddio os nad oes &cyfeiriad ebost y derbyniwr yn y dystysgrif"
 
 #. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:493
+#: rc.cpp:499
 #, no-c-format
 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 warningconfiguration.ui line 82
-#: rc.cpp:496
+#: rc.cpp:502
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -11537,38 +12466,38 @@ msgstr ""
 "</qt>"
 
 #. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:504
+#: rc.cpp:510
 #, fuzzy, no-c-format
 msgid "Warn if certificates/keys expire soon (configure thresholds below)"
 msgstr "Rhybuddio os bydd y dystys&grif CA yn darfod mewn llai na"
 
 #. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:507
+#: rc.cpp:513
 #, fuzzy, no-c-format
 msgid "For signing"
 msgstr "Defnyddio ar gyfer &Llofnodi"
 
 #. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:510
+#: rc.cpp:516
 #, fuzzy, no-c-format
 msgid "For encryption"
 msgstr "Cêl-ysgrifaeth"
 
 #. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:513 rc.cpp:527 rc.cpp:541 rc.cpp:555 rc.cpp:569 rc.cpp:583
+#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
 #: rulewidgethandlermanager.cpp:1437
 #, no-c-format
 msgid " days"
 msgstr "o ddiwrnodau"
 
 #. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:516 rc.cpp:530 rc.cpp:544 rc.cpp:558 rc.cpp:572 rc.cpp:586
+#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
 #, no-c-format
 msgid "Select the number of days here"
 msgstr "Dewis y nifer o ddiwrnodau yma"
 
 #. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:519
+#: rc.cpp:525
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -11588,7 +12517,7 @@ msgstr ""
 "</qt>"
 
 #. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:533
+#: rc.cpp:539
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -11608,7 +12537,7 @@ msgstr ""
 "</qt>"
 
 #. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:547
+#: rc.cpp:553
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -11628,7 +12557,7 @@ msgstr ""
 "</qt>"
 
 #. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:561
+#: rc.cpp:567
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -11648,7 +12577,7 @@ msgstr ""
 "</qt>"
 
 #. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:575 rc.cpp:589
+#: rc.cpp:581 rc.cpp:595
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -11668,55 +12597,55 @@ msgstr ""
 "</qt>"
 
 #. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:597
+#: rc.cpp:603
 #, fuzzy, no-c-format
 msgid "For root certificates:"
 msgstr "Anfon &eich tystysgrif eich hun"
 
 #. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:600
+#: rc.cpp:606
 #, fuzzy, no-c-format
 msgid "For intermediate CA certificates:"
 msgstr "Chwilio am Dystysgrifau Eraill"
 
 #. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:603
+#: rc.cpp:609
 #, fuzzy, no-c-format
 msgid "For end-user certificates/keys:"
 msgstr "&Peidio ac anfon tystysgrifau"
 
 #. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:606
+#: rc.cpp:612
 #, no-c-format
 msgid "Re-enable All \"Don't Ask Again\" Warnings"
 msgstr ""
 
 #. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:609
+#: rc.cpp:615
 #, fuzzy, no-c-format
 msgid "Template content"
 msgstr "Eiconau Plygell"
 
 #. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:612
+#: rc.cpp:618
 #, fuzzy, no-c-format
 msgid "Template shortcut"
 msgstr "&Amnewid"
 
 #. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:615
+#: rc.cpp:621
 #, fuzzy, no-c-format
 msgid "Template type"
 msgstr "&Amnewid"
 
-#. i18n: file kmail.kcfg line 59
-#: rc.cpp:618
+#. i18n: file kmail.kcfg line 61
+#: rc.cpp:624
 #, no-c-format
 msgid "Send queued mail on mail check"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 60
-#: rc.cpp:621
+#. i18n: file kmail.kcfg line 62
+#: rc.cpp:627
 #, no-c-format
 msgid ""
 "<qt>"
@@ -11725,16 +12654,16 @@ msgid ""
 "automatically at all. </p></qt>"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 70
-#: rc.cpp:624
+#. i18n: file kmail.kcfg line 72
+#: rc.cpp:630
 #, no-c-format
 msgid ""
 "Automatically move non-synced mails from folders with insufficient access "
 "rights"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 71
-#: rc.cpp:627
+#. i18n: file kmail.kcfg line 73
+#: rc.cpp:633
 #, no-c-format
 msgid ""
 "If there are new messages in a folder, which have not been uploaded to the "
@@ -11743,14 +12672,14 @@ msgid ""
 "folder."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 76
-#: rc.cpp:630
+#. i18n: file kmail.kcfg line 78
+#: rc.cpp:636
 #, no-c-format
 msgid "Allow local flags in read-only folders"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 85
-#: rc.cpp:633
+#. i18n: file kmail.kcfg line 87
+#: rc.cpp:639
 #, no-c-format
 msgid ""
 "This setting allows administrators to set a minimum delay between two mail "
@@ -11759,42 +12688,42 @@ msgid ""
 "set here."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 91
-#: rc.cpp:637
+#. i18n: file kmail.kcfg line 93
+#: rc.cpp:643
 #, no-c-format
 msgid "The most recently selected folder in the folder selection dialog."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 99
-#: rc.cpp:640
+#. i18n: file kmail.kcfg line 101
+#: rc.cpp:646
 #, no-c-format
 msgid ""
 "Disregard the users umask setting and use \"read-write for the user only\" "
 "instead"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 107
-#: rc.cpp:646
+#. i18n: file kmail.kcfg line 109
+#: rc.cpp:652
 #, fuzzy, no-c-format
 msgid "Policy for showing the system tray icon"
 msgstr "&Dangos y cafn cysawd o hyd"
 
-#. i18n: file kmail.kcfg line 115
-#: rc.cpp:649
+#. i18n: file kmail.kcfg line 117
+#: rc.cpp:655
 #, no-c-format
 msgid ""
 "Close the application when the mainwindow is closed, even if there is a system "
 "tray icon active."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 119
-#: rc.cpp:652
+#. i18n: file kmail.kcfg line 121
+#: rc.cpp:658
 #, fuzzy, no-c-format
 msgid "Verbose new mail notification"
 msgstr "Hysbysiad Ebost Newydd"
 
-#. i18n: file kmail.kcfg line 120
-#: rc.cpp:655
+#. i18n: file kmail.kcfg line 122
+#: rc.cpp:661
 #, no-c-format
 msgid ""
 "If this option is enabled then for each folder the number of newly arrived "
@@ -11802,41 +12731,41 @@ msgid ""
 "simple 'New mail arrived' message."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 124
-#: rc.cpp:658
+#. i18n: file kmail.kcfg line 126
+#: rc.cpp:664
 #, no-c-format
 msgid "Specify e&ditor:"
 msgstr "Penodi golyg&ydd"
 
-#. i18n: file kmail.kcfg line 128
-#: rc.cpp:661
+#. i18n: file kmail.kcfg line 130
+#: rc.cpp:667
 #, no-c-format
 msgid "Use e&xternal editor instead of composer"
 msgstr "Defny&ddio golygydd allanol yn lle cyfansoddydd"
 
-#. i18n: file kmail.kcfg line 155
-#: rc.cpp:664
+#. i18n: file kmail.kcfg line 157
+#: rc.cpp:670
 #, no-c-format
 msgid ""
 "The threshold for when to warn the user that a folder is nearing its quota "
 "limit."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 164
-#: rc.cpp:667
+#. i18n: file kmail.kcfg line 166
+#: rc.cpp:673
 #, no-c-format
 msgid "Enable groupware functionality"
 msgstr "Galluogi swyddogaeth cylchwedd"
 
-#. i18n: file kmail.kcfg line 170
-#: rc.cpp:670
+#. i18n: file kmail.kcfg line 172
+#: rc.cpp:676
 #, fuzzy, no-c-format
 msgid "Mangle From:/To: headers in replies to replies"
 msgstr ""
 "M&odd etifeddiaeth: Llarpio penawdau Oddiwrth:/I: mewn atebion i wahoddiadau"
 
-#. i18n: file kmail.kcfg line 171
-#: rc.cpp:673
+#. i18n: file kmail.kcfg line 173
+#: rc.cpp:679
 #, no-c-format
 msgid ""
 "Microsoft Outlook has a number of shortcomings in its implementation of the "
@@ -11844,14 +12773,14 @@ msgid ""
 "with Outlook users not being able to get your replies, try setting this option."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 176
-#: rc.cpp:676
+#. i18n: file kmail.kcfg line 178
+#: rc.cpp:682
 #, no-c-format
 msgid "Send groupware invitations in the mail body"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 177
-#: rc.cpp:679
+#. i18n: file kmail.kcfg line 179
+#: rc.cpp:685
 #, no-c-format
 msgid ""
 "Microsoft Outlook has a number of shortcomings  in its implementation of the "
@@ -11860,16 +12789,34 @@ msgid ""
 "option."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 182
-#: rc.cpp:682
+#. i18n: file kmail.kcfg line 184
+#: rc.cpp:688
 #, no-c-format
 msgid "Exchange compatible invitations naming"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 189
+#. i18n: file kmail.kcfg line 185
 #: rc.cpp:691
 #, no-c-format
 msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
+"has a problem understanding standards-compliant groupware e-mail. Turn this "
+"option on to send groupware invitations in a way that Microsoft Exchange "
+"understands."
+msgstr ""
+
+#. i18n: file kmail.kcfg line 191
+#: rc.cpp:697
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#. i18n: file kmail.kcfg line 197
+#: rc.cpp:703
+#, no-c-format
+msgid ""
 "When this is checked, you will not see the mail composer window. Instead, all "
 "invitation mails are sent automatically. If you want to see the mail before "
 "sending it, you can uncheck this option. However, be aware that the text in the "
@@ -11877,22 +12824,38 @@ msgid ""
 "hand."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 205
-#: rc.cpp:694
+#. i18n: file kmail.kcfg line 213
+#: rc.cpp:706
 #, no-c-format
 msgid "Delete invitation emails after the reply to them has been sent"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 206
-#: rc.cpp:697
+#. i18n: file kmail.kcfg line 214
+#: rc.cpp:709
 #, no-c-format
 msgid ""
 "When this is checked, received invitation emails that have been replied to will "
 "be moved to the Trash folder, once the reply has been successfully sent."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 215
-#: rc.cpp:700
+#. i18n: file kmail.kcfg line 219
+#: rc.cpp:712
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#. i18n: file kmail.kcfg line 224
+#: rc.cpp:715
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#. i18n: file kmail.kcfg line 233
+#: rc.cpp:718
 #, no-c-format
 msgid ""
 "<p>Enabling this makes it possible to store the entries from the Kontact "
@@ -11901,16 +12864,16 @@ msgid ""
 "IMAP resource; this is done in the Trinity Control Center.</p>"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 220
-#: rc.cpp:703
+#. i18n: file kmail.kcfg line 238
+#: rc.cpp:721
 #, no-c-format
 msgid ""
 "<p>Usually you will not have any reason to see the folders that hold the IMAP "
 "resources. But if you need to see them, you can set that here.</p>"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 229
-#: rc.cpp:706
+#. i18n: file kmail.kcfg line 247
+#: rc.cpp:724
 #, no-c-format
 msgid ""
 "<p>If the account used for storing groupware information \"\n"
@@ -11921,8 +12884,8 @@ msgid ""
 "          \"mail via an additional online IMAP account.</p>"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:712
+#. i18n: file kmail.kcfg line 251
+#: rc.cpp:730
 #, no-c-format
 msgid ""
 "<p>Choose the storage format of the groupware folders. "
@@ -11935,22 +12898,22 @@ msgid ""
 "Kolab server or a compatible solution.</li></ul></p>"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 242
-#: rc.cpp:715
+#. i18n: file kmail.kcfg line 260
+#: rc.cpp:733
 #, no-c-format
 msgid ""
 "<p>This chooses the parent of the IMAP resource folders.</p>"
 "<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:718
+#. i18n: file kmail.kcfg line 265
+#: rc.cpp:736
 #, no-c-format
 msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 252
-#: rc.cpp:721
+#. i18n: file kmail.kcfg line 270
+#: rc.cpp:739
 #, no-c-format
 msgid ""
 "<p>If you want to set the folder names of the IMAP storage to your local "
@@ -11961,101 +12924,89 @@ msgid ""
 "<p>So do not set this unless you have to.</p>"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 258
-#: rc.cpp:724
-#, no-c-format
-msgid "Only filter mails received in disconnected IMAP inbox."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 262
-#: rc.cpp:727
+#. i18n: file kmail.kcfg line 276
+#: rc.cpp:742
 #, no-c-format
 msgid "Also filter new mails received in groupware folders."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 267
-#: rc.cpp:730
+#. i18n: file kmail.kcfg line 283
+#: rc.cpp:745
 #, no-c-format
 msgid ""
 "Synchronize groupware changes in DIMAP folders immediately when being online."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:733
+#. i18n: file kmail.kcfg line 292
+#: rc.cpp:748
 #, no-c-format
 msgid ""
 "This value is used to decide whether the KMail Introduction should be "
 "displayed."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:736
+#. i18n: file kmail.kcfg line 299
+#: rc.cpp:751
 #, no-c-format
 msgid "Maximal number of connections per host"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 284
-#: rc.cpp:739
+#. i18n: file kmail.kcfg line 300
+#: rc.cpp:754
 #, no-c-format
 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 ""
 
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:742
+#. i18n: file kmail.kcfg line 308
+#: rc.cpp:757
 #, no-c-format
 msgid "Show quick search line edit"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 293
-#: rc.cpp:745
+#. i18n: file kmail.kcfg line 309
+#: rc.cpp:760
 #, no-c-format
 msgid ""
 "This option enables or disables the search line edit above the message list "
 "which can be used to quickly search the information shown in the message list."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 297
-#: rc.cpp:748
-#, no-c-format
-msgid "Show folder quick search line edit"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 301
-#: rc.cpp:751
+#. i18n: file kmail.kcfg line 313
+#: rc.cpp:763
 #, no-c-format
 msgid "Hide local inbox if unused"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:754
+#. i18n: file kmail.kcfg line 321
+#: rc.cpp:766
 #, no-c-format
 msgid "Forward Inline As Default."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:757
+#. i18n: file kmail.kcfg line 325
+#: rc.cpp:769
 #, no-c-format
 msgid ""
 "Allow the semicolon charactor (';') to be used as separator in the message "
 "composer."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 316
-#: rc.cpp:760
+#. i18n: file kmail.kcfg line 328
+#: rc.cpp:772
 #, fuzzy, no-c-format
 msgid "Keep original charset when replying or forwarding if possible"
 msgstr "&Cadw'r set nodau gwreiddiol wrth ateb neu flaenyrru (os yn bosibl)."
 
-#. i18n: file kmail.kcfg line 320
-#: rc.cpp:763
+#. i18n: file kmail.kcfg line 332
+#: rc.cpp:775
 #, fuzzy, no-c-format
 msgid "A&utomatically insert signature"
 msgstr "Atodi llo&fnod yn ymysgogol"
 
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:766
+#. i18n: file kmail.kcfg line 337
+#: rc.cpp:778
 #, no-c-format
 msgid ""
 "Remember this identity, so that it will be used in future composer windows as "
@@ -12063,30 +13014,53 @@ msgid ""
 "        "
 msgstr ""
 
-#. i18n: file kmail.kcfg line 329
-#: rc.cpp:770
+#. i18n: file kmail.kcfg line 341
+#: rc.cpp:782
 #, no-c-format
 msgid ""
 "Remember this folder for sent items, so that it will be used in future composer "
 "windows as well."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 333
-#: rc.cpp:773
+#. i18n: file kmail.kcfg line 345
+#: rc.cpp:785
 #, no-c-format
 msgid ""
 "Remember this mail transport, so that it will be used in future composer "
 "windows as well."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:776
+#. i18n: file kmail.kcfg line 350
+#: rc.cpp:788
+#, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows as "
+"well.\n"
+"        "
+msgstr ""
+
+#. i18n: file kmail.kcfg line 354
+#: rc.cpp:792
 #, no-c-format
 msgid "Word &wrap at column:"
 msgstr "Lapio &geiriau wrth golofn:"
 
-#. i18n: file kmail.kcfg line 360
-#: rc.cpp:785
+#. i18n: file kmail.kcfg line 368
+#: rc.cpp:798
+#, fuzzy, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr "Rhybuddio os bydd y dystysgrif &wraidd yn darfod mewn llai na"
+
+#. i18n: file kmail.kcfg line 370
+#: rc.cpp:801 rc.cpp:804
+#, no-c-format
+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 ""
+
+#. i18n: file kmail.kcfg line 390
+#: rc.cpp:810
 #, fuzzy, no-c-format
 msgid ""
 "Turn this option on to make Outlook &#8482; understand attachment names "
@@ -12095,14 +13069,14 @@ msgstr ""
 "Cynnau'r dewisiad yma er mwyn gwneud i Outlook(tm) ddeall eich atebion i "
 "wahoddiadau"
 
-#. i18n: file kmail.kcfg line 386
-#: rc.cpp:791
+#. i18n: file kmail.kcfg line 416
+#: rc.cpp:816
 #, no-c-format
 msgid "Automatically request &message disposition notifications"
 msgstr "Gofyn yn ymysgogol am &hysbysiadau lleoliad negeseuon"
 
-#. i18n: file kmail.kcfg line 387
-#: rc.cpp:794
+#. i18n: file kmail.kcfg line 417
+#: rc.cpp:819
 #, fuzzy, no-c-format
 msgid ""
 "<qt>"
@@ -12120,28 +13094,28 @@ msgstr ""
 "neu analluogi gofyn am MDNs ar sail pob-neges yn y cyfansoddydd, eitem dewislen "
 "<em>Dewisiadau</em>->&gt; <em>Gofyn am Hysbysiad Lleoliad</em>.</p></qt>"
 
-#. i18n: file kmail.kcfg line 391
-#: rc.cpp:797
+#. i18n: file kmail.kcfg line 421
+#: rc.cpp:822
 #, no-c-format
 msgid "Use recent addresses for autocompletion"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 392
-#: rc.cpp:800
+#. i18n: file kmail.kcfg line 422
+#: rc.cpp:825
 #, no-c-format
 msgid ""
 "Disable this option if you do not want recently used addresses to appear in the "
 "autocompletion list in the composer's address fields."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 413
-#: rc.cpp:803
+#. i18n: file kmail.kcfg line 443
+#: rc.cpp:828
 #, fuzzy, no-c-format
 msgid "Autosave interval:"
 msgstr "Cyfnod y&mofyn:"
 
-#. i18n: file kmail.kcfg line 414
-#: rc.cpp:806
+#. i18n: file kmail.kcfg line 444
+#: rc.cpp:831
 #, no-c-format
 msgid ""
 "A backup copy of the text in the composer window can be created regularly. The "
@@ -12149,93 +13123,111 @@ msgid ""
 "setting it to the value 0."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 418
-#: rc.cpp:809
+#. i18n: file kmail.kcfg line 448
+#: rc.cpp:834
 #, no-c-format
 msgid "Insert signatures above quoted text"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 425
-#: rc.cpp:812
+#. i18n: file kmail.kcfg line 455
+#: rc.cpp:837
 #, no-c-format
 msgid "Replace recognized prefi&x with \"Re:\""
 msgstr "Amnewid rha&gddodiad a adnabyddir gan \"Re:\""
 
-#. i18n: file kmail.kcfg line 432
-#: rc.cpp:815
+#. i18n: file kmail.kcfg line 462
+#: rc.cpp:840
 #, no-c-format
 msgid "Replace recognized prefix with \"&Fwd:\""
 msgstr "Amnewid rhagddodiad a adnabyddir gan \"&Fwd:\""
 
-#. i18n: file kmail.kcfg line 436
-#: rc.cpp:818
+#. i18n: file kmail.kcfg line 466
+#: rc.cpp:843
 #, no-c-format
 msgid "Use smart &quoting"
 msgstr "Defnyddion dyfynnu dea&llus"
 
-#. i18n: file kmail.kcfg line 441
-#: rc.cpp:821
+#. i18n: file kmail.kcfg line 470
+#: rc.cpp:846
+#, fuzzy, no-c-format
+msgid "Remove the signature when replying"
+msgstr "Mae'r llofnod wedi darfod."
+
+#. i18n: file kmail.kcfg line 474
+#: rc.cpp:849
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#. i18n: file kmail.kcfg line 479
+#: rc.cpp:852
 #, no-c-format
 msgid "Type of addressee selector"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:824
+#. i18n: file kmail.kcfg line 481
+#: rc.cpp:855
 #, no-c-format
 msgid ""
 "Sets the type of the dialog for selecting recipients for To,\n"
 "        CC and BCC."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 451
-#: rc.cpp:828
+#. i18n: file kmail.kcfg line 489
+#: rc.cpp:859
 #, no-c-format
 msgid "Type of recipients editor"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 453
-#: rc.cpp:831
+#. i18n: file kmail.kcfg line 491
+#: rc.cpp:862
 #, no-c-format
 msgid ""
 "Sets the type of the recipients editor for editing To,\n"
 "        CC and BCC."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 468
-#: rc.cpp:835
+#. i18n: file kmail.kcfg line 506
+#: rc.cpp:866
 #, no-c-format
 msgid "Maximum number of recipient editor lines."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:838
+#. i18n: file kmail.kcfg line 512
+#: rc.cpp:869
 #, no-c-format
 msgid ""
 "List of message part types to strip off mails that are being forwarded inline."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 478
-#: rc.cpp:841
+#. i18n: file kmail.kcfg line 516
+#: rc.cpp:872
 #, no-c-format
 msgid "The maximum size in MB that email attachments are allowed to have."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 483
-#: rc.cpp:844
+#. i18n: file kmail.kcfg line 521
+#: rc.cpp:875
 #, no-c-format
 msgid "Show the Text Snippet Management and Insertion Panel in the composer."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 490
-#: rc.cpp:847
+#. i18n: file kmail.kcfg line 528
+#: rc.cpp:878
 #, no-c-format
 msgid ""
 "Show the GnuPG Audit Log even after crypto operations that completed "
 "successfully."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 530
-#: rc.cpp:850
+#. i18n: file kmail.kcfg line 557
+#: rc.cpp:881
+#, fuzzy, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr "&Cadw'r set nodau gwreiddiol wrth ateb neu flaenyrru (os yn bosibl)."
+
+#. i18n: file kmail.kcfg line 572
+#: rc.cpp:884
 #, no-c-format
 msgid ""
 "Some emails, especially those generated automatically, do not specify the "
@@ -12245,88 +13237,102 @@ msgid ""
 "As a default the encoding configured for the whole system is used."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 536
-#: rc.cpp:853
+#. i18n: file kmail.kcfg line 578
+#: rc.cpp:887
 #, no-c-format
 msgid ""
 "Changing this from its default 'Auto' will force the use of the specified "
 "encoding for all emails, regardless of what they specify themselves."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 542
-#: rc.cpp:859
+#. i18n: file kmail.kcfg line 584
+#: rc.cpp:893
 #, no-c-format
 msgid ""
 "Enable this if you want smileys like :-) appearing in the message text to be "
 "replaced by emoticons (small pictures)."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 547
-#: rc.cpp:865
+#. i18n: file kmail.kcfg line 589
+#: rc.cpp:899
 #, no-c-format
 msgid ""
 "Enable this option to show different levels of quoted text. Disable to hide the "
 "levels of quoted text."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 550
-#: rc.cpp:868
+#. i18n: file kmail.kcfg line 592
+#: rc.cpp:902
 #, no-c-format
 msgid "Automatic collapse level:"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 558
-#: rc.cpp:871
+#. i18n: file kmail.kcfg line 600
+#: rc.cpp:905
 #, no-c-format
 msgid "Reduce font size for quoted text"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 559
-#: rc.cpp:874
+#. i18n: file kmail.kcfg line 601
+#: rc.cpp:908
 #, no-c-format
 msgid "Enable this option to show quoted text with a smaller font."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 570
-#: rc.cpp:877
+#. i18n: file kmail.kcfg line 612
+#: rc.cpp:911
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "Cadw negeseuon an&foniedig wedi'u cêl-ysgrifo"
+
+#. i18n: file kmail.kcfg line 613
+#: rc.cpp:914
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#. i18n: file kmail.kcfg line 618
+#: rc.cpp:917
 #, fuzzy, no-c-format
 msgid "Show user agent in fancy headers"
 msgstr "Dangos pob penawd y negeseuon"
 
-#. i18n: file kmail.kcfg line 571
-#: rc.cpp:880
+#. i18n: file kmail.kcfg line 619
+#: rc.cpp:920
 #, no-c-format
 msgid ""
 "Enable this option to get the User-Agent and X-Mailer header lines displayed "
 "when using fancy headers."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 576
-#: rc.cpp:883
+#. i18n: file kmail.kcfg line 624
+#: rc.cpp:923
 #, no-c-format
 msgid "Allow to delete attachments of existing mails."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 580
-#: rc.cpp:886
+#. i18n: file kmail.kcfg line 628
+#: rc.cpp:926
 #, no-c-format
 msgid "Allow to edit attachments of existing mails."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 585
-#: rc.cpp:889
+#. i18n: file kmail.kcfg line 633
+#: rc.cpp:929
 #, no-c-format
 msgid "Always decrypt messages when viewing or ask befor decrypting"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 599
-#: rc.cpp:892
+#. i18n: file kmail.kcfg line 647
+#: rc.cpp:932
 #, fuzzy, no-c-format
 msgid "Send Message Disposition Notifications with an empty sender."
 msgstr "Hysbysiadau Lleoliad Neges"
 
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:895
+#. i18n: file kmail.kcfg line 648
+#: rc.cpp:935
 #, no-c-format
 msgid ""
 "Send Message Disposition Notifications with an empty sender string. Some "
@@ -12334,90 +13340,82 @@ msgid ""
 "problems sending MDNs, uncheck this option."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 606
-#: rc.cpp:898
+#. i18n: file kmail.kcfg line 654
+#: rc.cpp:938
 #, no-c-format
 msgid "Phrases has been converted to templates"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 607
-#: rc.cpp:901
+#. i18n: file kmail.kcfg line 655
+#: rc.cpp:941
 #, no-c-format
 msgid "Old phrases have been converted to templates"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 611
-#: rc.cpp:904
+#. i18n: file kmail.kcfg line 659
+#: rc.cpp:944
 #, fuzzy, no-c-format
 msgid "Message template for new message"
 msgstr "Rhestr Negeseuon - Maes Dyddiad"
 
-#. i18n: file kmail.kcfg line 616
-#: rc.cpp:907
+#. i18n: file kmail.kcfg line 664
+#: rc.cpp:947
 #, no-c-format
 msgid "Message template for reply"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 621
-#: rc.cpp:910
+#. i18n: file kmail.kcfg line 669
+#: rc.cpp:950
 #, no-c-format
 msgid "Message template for reply to all"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 626
-#: rc.cpp:913
+#. i18n: file kmail.kcfg line 674
+#: rc.cpp:953
 #, fuzzy, no-c-format
 msgid "Message template for forward"
 msgstr "Nodi Neges fel Wedi'i &Blaenyrru"
 
-#. i18n: file kmail.kcfg line 631
-#: rc.cpp:916
+#. i18n: file kmail.kcfg line 679
+#: rc.cpp:956
 #, fuzzy, no-c-format
 msgid "Quote characters"
 msgstr "&Ychwanegu Nodau Dyfynnu"
 
-#. i18n: file kmail.kcfg line 640
-#: rc.cpp:919
+#. i18n: file kmail.kcfg line 688
+#: rc.cpp:959
 #, no-c-format
 msgid "Allow out-of-office settings to to be changeable by the user."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 644
-#: rc.cpp:922
+#. i18n: file kmail.kcfg line 692
+#: rc.cpp:962
 #, no-c-format
 msgid ""
 "Allow users to upload out-of-office sieve scripts, but disallow them changin "
 "any settings, such as the domain to react to and the spam reaction switch."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:925
+#. i18n: file kmail.kcfg line 696
+#: rc.cpp:965
 #, no-c-format
 msgid "Send out-of-office replies to mails coming from this domain only."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 652
-#: rc.cpp:928
+#. i18n: file kmail.kcfg line 700
+#: rc.cpp:968
 #, no-c-format
 msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 656
-#: rc.cpp:931
+#. i18n: file kmail.kcfg line 704
+#: rc.cpp:971
 #, no-c-format
 msgid ""
 "Check if there is still an active out-of-office reply configured when starting "
 "KMail."
 msgstr ""
 
-#: recipientseditor.cpp:100
-msgid "To"
-msgstr "I"
-
-#: recipientseditor.cpp:102
-msgid "CC"
-msgstr "CC"
-
 #: recipientseditor.cpp:104
 msgid "BCC"
 msgstr "CCD (BCC)"
@@ -12432,48 +13430,48 @@ msgstr "<derbynwyr>"
 msgid "Select type of recipient"
 msgstr "<derbynwyr>"
 
-#: recipientseditor.cpp:181
+#: recipientseditor.cpp:163
+msgid "Set the list of email addresses to receive this message"
+msgstr ""
+
+#: recipientseditor.cpp:183
 #, fuzzy
 msgid "Remove recipient line"
 msgstr "<derbynwyr>"
 
-#: recipientseditor.cpp:737
+#: recipientseditor.cpp:739
 msgid "<b>To:</b><br/>"
 msgstr ""
 
-#: recipientseditor.cpp:738
+#: recipientseditor.cpp:740
 msgid "<b>CC:</b><br/>"
 msgstr ""
 
-#: recipientseditor.cpp:739
+#: recipientseditor.cpp:741
 msgid "<b>BCC:</b><br/>"
 msgstr ""
 
-#: recipientseditor.cpp:766
+#: recipientseditor.cpp:768
 #, fuzzy
 msgid "Save List..."
 msgstr "&Creu Hidlen"
 
-#: recipientseditor.cpp:772
+#: recipientseditor.cpp:774
 #, fuzzy
 msgid "Save recipients as distribution list"
 msgstr "Tanysgrifiad"
 
-#: recipientseditor.cpp:774
-msgid "Se&lect..."
-msgstr "De&wis..."
-
-#: recipientseditor.cpp:777
+#: recipientseditor.cpp:779
 #, fuzzy
 msgid "Select recipients from address book"
 msgstr "Ychwanegu i'r Llyfr Cyfeiriadau"
 
-#: recipientseditor.cpp:810
+#: recipientseditor.cpp:812
 #, fuzzy
 msgid "No recipients"
 msgstr "<derbynwyr>"
 
-#: recipientseditor.cpp:811
+#: recipientseditor.cpp:813
 #, fuzzy, c-format
 msgid ""
 "_n: 1 recipient\n"
@@ -12482,7 +13480,7 @@ msgstr ""
 "%n heb ei ddarllen\n"
 "%n heb eu darllen"
 
-#: recipientseditor.cpp:914
+#: recipientseditor.cpp:917
 msgid "Truncating recipients list to %1 of %2 entries."
 msgstr ""
 
@@ -12574,11 +13572,11 @@ msgid ""
 "available addresses."
 msgstr ""
 
-#: redirectdialog.cpp:107
+#: redirectdialog.cpp:116
 msgid "You cannot redirect the message without an address."
 msgstr ""
 
-#: redirectdialog.cpp:108
+#: redirectdialog.cpp:117
 #, fuzzy
 msgid "Empty Redirection Address"
 msgstr "Agor yn y Lyfr Cyfeiriadau"
@@ -12726,37 +13724,37 @@ msgstr "Chwilio yn &unig yn:"
 msgid "I&nclude sub-folders"
 msgstr "C&ynnwys is-blygyll"
 
-#: searchwindow.cpp:226
+#: searchwindow.cpp:225
 msgid "Sender/Receiver"
 msgstr "Anfonwr/Derbyniwr"
 
-#: searchwindow.cpp:249
+#: searchwindow.cpp:250
 msgid "Search folder &name:"
 msgstr "&Enw'r blygell chwilio:"
 
-#: searchwindow.cpp:259
+#: searchwindow.cpp:260
 #, fuzzy
 msgid "Op&en Search Folder"
 msgstr "Chwilio mewn Plygyll"
 
-#: searchwindow.cpp:268
+#: searchwindow.cpp:269
 #, fuzzy
 msgid "Open &Message"
 msgstr "&Neges Nesaf"
 
-#: searchwindow.cpp:274
+#: searchwindow.cpp:275
 msgid "AMiddleLengthText..."
 msgstr "TestunOHydCanolig..."
 
-#: searchwindow.cpp:275
+#: searchwindow.cpp:276
 msgid "Ready."
 msgstr "Parod."
 
-#: searchwindow.cpp:356
+#: searchwindow.cpp:357
 msgid "Clear Selection"
 msgstr "Gwagu Dewisiad"
 
-#: searchwindow.cpp:415
+#: searchwindow.cpp:416
 #, fuzzy, c-format
 msgid ""
 "_n: %n message searched\n"
@@ -12765,12 +13763,12 @@ msgstr ""
 "%n neges wedi'i phrosesu\n"
 "%n o negeseuon wedi'u prosesu"
 
-#: searchwindow.cpp:418
+#: searchwindow.cpp:419
 #, fuzzy
 msgid "Done."
 msgstr "Cyflawn"
 
-#: searchwindow.cpp:419
+#: searchwindow.cpp:420
 #, fuzzy
 msgid ""
 "_n: %n match in %1\n"
@@ -12779,12 +13777,12 @@ msgstr ""
 "%n cydweddiad (%1)\n"
 "%n o gydweddiadau (%1)"
 
-#: searchwindow.cpp:422
+#: searchwindow.cpp:423
 #, fuzzy
 msgid "Search canceled."
 msgstr "Diddymwyd y chwiliad"
 
-#: searchwindow.cpp:423
+#: searchwindow.cpp:424
 #, fuzzy
 msgid ""
 "_n: %n match so far in %1\n"
@@ -12793,7 +13791,7 @@ msgstr ""
 "%n cydweddiad tan rwan (%1)\n"
 "%n o gydweddiadau tan rwan (%1)"
 
-#: searchwindow.cpp:427
+#: searchwindow.cpp:428
 #, fuzzy, c-format
 msgid ""
 "_n: %n message\n"
@@ -12802,7 +13800,7 @@ msgstr ""
 "%n neges, %1.\n"
 "%n o negeseuon, %1."
 
-#: searchwindow.cpp:428
+#: searchwindow.cpp:429
 #, c-format
 msgid ""
 "_n: %n match\n"
@@ -12811,7 +13809,7 @@ msgstr ""
 "%n cydweddiad\n"
 "%n o gydweddiadau"
 
-#: searchwindow.cpp:429
+#: searchwindow.cpp:430
 #, fuzzy
 msgid "Searching in %1. %2 searched so far"
 msgstr "Chwilio yn %1 (neges %2)"
@@ -12842,42 +13840,42 @@ msgid ""
 "\n"
 msgstr ""
 
-#: sievedebugdialog.cpp:230
+#: sievedebugdialog.cpp:256
 msgid ""
 "Collecting data for account '%1'...\n"
 msgstr ""
 
-#: sievedebugdialog.cpp:231
+#: sievedebugdialog.cpp:257
 msgid ""
 "------------------------------------------------------------\n"
 msgstr ""
 
-#: sievedebugdialog.cpp:239
+#: sievedebugdialog.cpp:265
 #, fuzzy
 msgid ""
 "(Account does not support Sieve)\n"
 "\n"
 msgstr "Ni chynhelir y math cyfrif yma"
 
-#: sievedebugdialog.cpp:266
+#: sievedebugdialog.cpp:278
 #, fuzzy
 msgid ""
 "(Account is not an IMAP account)\n"
 "\n"
 msgstr "Math cyfrif: cyfrif POP"
 
-#: sievedebugdialog.cpp:286
+#: sievedebugdialog.cpp:298
 msgid ""
 "Contents of script '%1':\n"
 msgstr ""
 
-#: sievedebugdialog.cpp:321
+#: sievedebugdialog.cpp:320
 msgid ""
 "(This script is empty.)\n"
 "\n"
 msgstr ""
 
-#: sievedebugdialog.cpp:326
+#: sievedebugdialog.cpp:325
 msgid ""
 "------------------------------------------------------------\n"
 "%1\n"
@@ -12885,40 +13883,40 @@ msgid ""
 "\n"
 msgstr ""
 
-#: sievedebugdialog.cpp:342
+#: sievedebugdialog.cpp:341
 msgid ""
 "Sieve capabilities:\n"
 msgstr ""
 
-#: sievedebugdialog.cpp:346
+#: sievedebugdialog.cpp:345
 msgid "(No special capabilities available)"
 msgstr ""
 
-#: sievedebugdialog.cpp:355
+#: sievedebugdialog.cpp:354
 #, fuzzy
 msgid ""
 "Available Sieve scripts:\n"
 msgstr "Hidlau ar Gael"
 
-#: sievedebugdialog.cpp:359
+#: sievedebugdialog.cpp:358
 msgid ""
 "(No Sieve scripts available on this server)\n"
 "\n"
 msgstr ""
 
-#: sievedebugdialog.cpp:367
+#: sievedebugdialog.cpp:366
 msgid ""
 "Active script: %1\n"
 "\n"
 msgstr ""
 
-#: sievedebugdialog.cpp:394 vacation.cpp:714
+#: sievedebugdialog.cpp:393 vacation.cpp:721
 msgid ""
 "Sieve script installed successfully on the server.\n"
 "Out of Office reply is now active."
 msgstr ""
 
-#: sievedebugdialog.cpp:396 vacation.cpp:716
+#: sievedebugdialog.cpp:395 vacation.cpp:723
 msgid ""
 "Sieve script installed successfully on the server.\n"
 "Out of Office reply has been deactivated."
@@ -13002,19 +14000,23 @@ msgstr "Pen&odi gorchymyn:"
 msgid "New entry:"
 msgstr "Cofnod newydd:"
 
-#: simplestringlisteditor.cpp:205
+#: simplestringlisteditor.cpp:214
 msgid "New Value"
 msgstr "Gwerth Newydd"
 
-#: simplestringlisteditor.cpp:225
+#: simplestringlisteditor.cpp:235
 msgid "Change Value"
 msgstr "Newid Gwerth"
 
-#: snippetdlg.cpp:71
+#: snippetdlg.cpp:78
 #, fuzzy
 msgid "Sh&ortcut:"
 msgstr "Byrlwybr:"
 
+#: snippetitem.cpp:133 snippetwidget.cpp:171
+msgid "GROUP"
+msgstr ""
+
 #: snippetwidget.cpp:148
 #, c-format
 msgid "Snippet %1"
@@ -13099,8 +14101,8 @@ msgstr "&Gosod fel Rhagosod"
 
 #: subscriptiondialog.cpp:376
 msgid ""
-"Currently subscriptions are not used for server %1\n"
-"do you want to enable subscriptions?"
+"Currently subscriptions are not used for server. %1\n"
+"Do you want to enable subscriptions?"
 msgstr ""
 
 #: subscriptiondialog.cpp:378
@@ -13117,39 +14119,44 @@ msgstr "Galluogi"
 msgid "Do Not Enable"
 msgstr "Peidio â Chêl-ysg&rifo"
 
-#: templateparser.cpp:238 templateparser.cpp:271
+#: templateparser.cpp:263 templateparser.cpp:296
 #, fuzzy
 msgid "Cannot insert content from file %1: %2"
 msgstr ""
 "Methu agor ffeil \"%1\":\n"
 "%2"
 
-#: templateparser.cpp:1009 templateparser.cpp:1013
+#: templateparser.cpp:970
+#, fuzzy, c-format
+msgid "Attachment %1"
+msgstr "Atodiad: %1"
+
+#: templateparser.cpp:1150 templateparser.cpp:1154
 #, fuzzy
 msgid "Pipe command exit with status %1: %2"
 msgstr ""
 "Terfynodd y cyn-orchymyn efo côd %1: \n"
 " %2"
 
-#: templateparser.cpp:1024 templateparser.cpp:1028
+#: templateparser.cpp:1165 templateparser.cpp:1169
 msgid "Pipe command killed by signal %1: %2"
 msgstr ""
 
-#: templateparser.cpp:1040
+#: templateparser.cpp:1181
 #, fuzzy
 msgid "Pipe command did not finish within %1 seconds: %2"
 msgstr ""
 "Terfynodd y cyn-orchymyn efo côd %1: \n"
 " %2"
 
-#: templateparser.cpp:1052 templateparser.cpp:1055
+#: templateparser.cpp:1193 templateparser.cpp:1196
 #, fuzzy, c-format
 msgid "Cannot write to process stdin: %1"
 msgstr ""
 "Methu ysgrifennu i ffeil: \n"
 " %1"
 
-#: templateparser.cpp:1063
+#: templateparser.cpp:1204
 #, c-format
 msgid "Cannot start pipe command from template: %1"
 msgstr ""
@@ -13203,9 +14210,9 @@ msgid ""
 "----------  %1  ----------\n"
 "\n"
 "Subject: %OFULLSUBJECT\n"
-"Date: %ODATE\n"
+"Date: %ODATE, %OTIMELONG\n"
 "From: %OFROMADDR\n"
-"To: %OTOADDR\n"
+"%OADDRESSEESADDR\n"
 "\n"
 "%TEXT\n"
 "-------------------------------------------------------\n"
@@ -13214,35 +14221,39 @@ msgstr ""
 #: templatesconfiguration.cpp:511
 msgid ""
 "%REM=\"Default new message template\"%-\n"
-"%BLANK"
+"%BLANK\n"
+"%BLANK\n"
+"%BLANK\n"
 msgstr ""
 
-#: templatesconfiguration.cpp:518
+#: templatesconfiguration.cpp:520
 msgid ""
+"%CURSOR\n"
+"%BLANK\n"
 "%REM=\"Default reply template\"%-\n"
 "On %ODATEEN %OTIMELONGEN you wrote:\n"
 "%QUOTE\n"
-"%CURSOR\n"
 msgstr ""
 
-#: templatesconfiguration.cpp:527
+#: templatesconfiguration.cpp:530
 msgid ""
+"%CURSOR\n"
+"%BLANK\n"
 "%REM=\"Default reply all template\"%-\n"
 "On %ODATEEN %OTIMELONGEN %OFROMNAME wrote:\n"
 "%QUOTE\n"
-"%CURSOR\n"
 msgstr ""
 
-#: templatesconfiguration.cpp:536
+#: templatesconfiguration.cpp:541
 msgid ""
 "%REM=\"Default forward template\"%-\n"
 "\n"
 "----------  Forwarded Message  ----------\n"
 "\n"
 "Subject: %OFULLSUBJECT\n"
-"Date: %ODATE\n"
+"Date: %ODATE, %OTIMELONG\n"
 "From: %OFROMADDR\n"
-"To: %OTOADDR\n"
+"%OADDRESSEESADDR\n"
 "\n"
 "%TEXT\n"
 "-------------------------------------------------------\n"
@@ -13273,178 +14284,182 @@ msgstr "Neges wedi'i chêl-ysgrifo"
 msgid "Message Text as Is"
 msgstr "Rhestr Negeseuon"
 
-#: templatesinsertcommand.cpp:62 templatesinsertcommand.cpp:163
+#: templatesinsertcommand.cpp:62 templatesinsertcommand.cpp:166
 #, fuzzy
 msgid "Message Id"
 msgstr "Corff y Neges"
 
-#: templatesinsertcommand.cpp:70 templatesinsertcommand.cpp:171
+#: templatesinsertcommand.cpp:70 templatesinsertcommand.cpp:174
 msgid "Date in Short Format"
 msgstr ""
 
-#: templatesinsertcommand.cpp:74 templatesinsertcommand.cpp:175
+#: templatesinsertcommand.cpp:74 templatesinsertcommand.cpp:178
 msgid "Date in C Locale"
 msgstr ""
 
-#: templatesinsertcommand.cpp:78 templatesinsertcommand.cpp:179
+#: templatesinsertcommand.cpp:78 templatesinsertcommand.cpp:182
 msgid "Day of Week"
 msgstr ""
 
-#: templatesinsertcommand.cpp:82 templatesinsertcommand.cpp:183
+#: templatesinsertcommand.cpp:82 templatesinsertcommand.cpp:186
 msgid "Time"
 msgstr ""
 
-#: templatesinsertcommand.cpp:86 templatesinsertcommand.cpp:187
+#: templatesinsertcommand.cpp:86 templatesinsertcommand.cpp:190
 msgid "Time in Long Format"
 msgstr ""
 
-#: templatesinsertcommand.cpp:90 templatesinsertcommand.cpp:191
+#: templatesinsertcommand.cpp:90 templatesinsertcommand.cpp:194
 msgid "Time in C Locale"
 msgstr ""
 
-#: templatesinsertcommand.cpp:94 templatesinsertcommand.cpp:195
+#: templatesinsertcommand.cpp:94 templatesinsertcommand.cpp:198
 #, fuzzy
 msgid "To Field Address"
 msgstr "C&yfeiriad ebost:"
 
-#: templatesinsertcommand.cpp:98 templatesinsertcommand.cpp:199
+#: templatesinsertcommand.cpp:98 templatesinsertcommand.cpp:202
 #, fuzzy
 msgid "To Field Name"
 msgstr "Enw go iawn:"
 
-#: templatesinsertcommand.cpp:102 templatesinsertcommand.cpp:203
+#: templatesinsertcommand.cpp:102 templatesinsertcommand.cpp:206
 #, fuzzy
 msgid "To Field First Name"
 msgstr "Enw go iawn:"
 
-#: templatesinsertcommand.cpp:106 templatesinsertcommand.cpp:207
+#: templatesinsertcommand.cpp:106 templatesinsertcommand.cpp:210
 #, fuzzy
 msgid "To Field Last Name"
 msgstr "Enw go iawn:"
 
-#: templatesinsertcommand.cpp:110 templatesinsertcommand.cpp:211
+#: templatesinsertcommand.cpp:110 templatesinsertcommand.cpp:214
 #, fuzzy
 msgid "CC Field Address"
 msgstr "Cyfeiriadau &BCC:"
 
-#: templatesinsertcommand.cpp:114 templatesinsertcommand.cpp:215
+#: templatesinsertcommand.cpp:114 templatesinsertcommand.cpp:218
 #, fuzzy
 msgid "CC Field Name"
 msgstr "Enw go iawn:"
 
-#: templatesinsertcommand.cpp:118 templatesinsertcommand.cpp:219
+#: templatesinsertcommand.cpp:118 templatesinsertcommand.cpp:222
 #, fuzzy
 msgid "CC Field First Name"
 msgstr "Enw go iawn:"
 
-#: templatesinsertcommand.cpp:122 templatesinsertcommand.cpp:223
+#: templatesinsertcommand.cpp:122 templatesinsertcommand.cpp:226
 #, fuzzy
 msgid "CC Field Last Name"
 msgstr "Enw go iawn:"
 
-#: templatesinsertcommand.cpp:126 templatesinsertcommand.cpp:227
+#: templatesinsertcommand.cpp:126 templatesinsertcommand.cpp:230
 #, fuzzy
 msgid "From Field Address"
 msgstr "C&yfeiriad ebost:"
 
-#: templatesinsertcommand.cpp:130 templatesinsertcommand.cpp:231
+#: templatesinsertcommand.cpp:130 templatesinsertcommand.cpp:234
 #, fuzzy
 msgid "From Field Name"
 msgstr "C&yfeiriad ebost:"
 
-#: templatesinsertcommand.cpp:134 templatesinsertcommand.cpp:235
+#: templatesinsertcommand.cpp:134 templatesinsertcommand.cpp:238
 #, fuzzy
 msgid "From Field First Name"
 msgstr "C&yfeiriad ebost:"
 
-#: templatesinsertcommand.cpp:138 templatesinsertcommand.cpp:239
+#: templatesinsertcommand.cpp:138 templatesinsertcommand.cpp:242
 #, fuzzy
 msgid "From Field Last Name"
 msgstr "C&yfeiriad ebost:"
 
-#: templatesinsertcommand.cpp:146
+#: templatesinsertcommand.cpp:142
+msgid "Addresses of all original recipients"
+msgstr ""
+
+#: templatesinsertcommand.cpp:149
 #, fuzzy
 msgid "Quoted Headers"
 msgstr "&Ychwanegu Nodau Dyfynnu"
 
-#: templatesinsertcommand.cpp:150
+#: templatesinsertcommand.cpp:153
 #, fuzzy
 msgid "Headers as Is"
 msgstr "&Penawdau"
 
-#: templatesinsertcommand.cpp:154 templatesinsertcommand.cpp:247
+#: templatesinsertcommand.cpp:157 templatesinsertcommand.cpp:250
 #, fuzzy
 msgid "Header Content"
 msgstr "Eiconau Plygell"
 
-#: templatesinsertcommand.cpp:160
+#: templatesinsertcommand.cpp:163
 #, fuzzy
 msgid "Current Message"
 msgstr "Defnydd Cyfredol"
 
-#: templatesinsertcommand.cpp:253
+#: templatesinsertcommand.cpp:256
 msgid "Process With External Programs"
 msgstr ""
 
-#: templatesinsertcommand.cpp:256
+#: templatesinsertcommand.cpp:259
 #, fuzzy
 msgid "Insert Result of Command"
 msgstr "Mewn&osod Ffeil..."
 
-#: templatesinsertcommand.cpp:260
+#: templatesinsertcommand.cpp:263
 msgid "Pipe Original Message Body and Insert Result as Quoted Text"
 msgstr ""
 
-#: templatesinsertcommand.cpp:264
+#: templatesinsertcommand.cpp:267
 msgid "Pipe Original Message Body and Insert Result as Is"
 msgstr ""
 
-#: templatesinsertcommand.cpp:268
+#: templatesinsertcommand.cpp:271
 msgid "Pipe Original Message with Headers and Insert Result as Is"
 msgstr ""
 
-#: templatesinsertcommand.cpp:272
+#: templatesinsertcommand.cpp:275
 msgid "Pipe Current Message Body and Insert Result as Is"
 msgstr ""
 
-#: templatesinsertcommand.cpp:276
+#: templatesinsertcommand.cpp:279
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr ""
 
-#: templatesinsertcommand.cpp:285
+#: templatesinsertcommand.cpp:288
 #, fuzzy
 msgid "Set Cursor Position"
 msgstr "Lleoliad y Blygell"
 
-#: templatesinsertcommand.cpp:289
+#: templatesinsertcommand.cpp:292
 #, fuzzy
 msgid "Insert File Content"
 msgstr "Mewnosod Ffeil"
 
-#: templatesinsertcommand.cpp:293
+#: templatesinsertcommand.cpp:296
 msgid "DNL"
 msgstr ""
 
-#: templatesinsertcommand.cpp:297
+#: templatesinsertcommand.cpp:300
 #, fuzzy
 msgid "Template Comment"
 msgstr "Eiconau Plygell"
 
-#: templatesinsertcommand.cpp:301
+#: templatesinsertcommand.cpp:304
 #, fuzzy
 msgid "No Operation"
 msgstr "Cadarnhadau Derbyn"
 
-#: templatesinsertcommand.cpp:305
+#: templatesinsertcommand.cpp:308
 #, fuzzy
 msgid "Clear Generated Message"
 msgstr "Neges wedi'i chêl-ysgrifo"
 
-#: templatesinsertcommand.cpp:309
+#: templatesinsertcommand.cpp:312
 msgid "Turn Debug On"
 msgstr ""
 
-#: templatesinsertcommand.cpp:313
+#: templatesinsertcommand.cpp:316
 msgid "Turn Debug Off"
 msgstr ""
 
@@ -13561,60 +14576,70 @@ msgstr ""
 msgid "There is nothing to undo."
 msgstr "Nid oes dim byd i'w ddatwneud!"
 
-#: urlhandlermanager.cpp:422
+#: urlhandlermanager.cpp:482
 msgid "Turn on HTML rendering for this message."
 msgstr "Defnyddio llunio HTML ar gyfer y neges yma."
 
-#: urlhandlermanager.cpp:424
+#: urlhandlermanager.cpp:484
 #, fuzzy
 msgid "Load external references from the Internet for this message."
 msgstr "&Caniatáu i negeseuon lwytho cyfeirnodau allanol o'r Ryngrwyd"
 
-#: urlhandlermanager.cpp:426
+#: urlhandlermanager.cpp:486
 msgid "Work online."
 msgstr ""
 
-#: urlhandlermanager.cpp:428
+#: urlhandlermanager.cpp:488
 #, fuzzy
 msgid "Decrypt message."
 msgstr "Neges wedi'i chêl-ysgrifo"
 
-#: urlhandlermanager.cpp:430
+#: urlhandlermanager.cpp:490
 #, fuzzy
 msgid "Show signature details."
 msgstr "Ni chanfuwyd llofnod"
 
-#: urlhandlermanager.cpp:432
+#: urlhandlermanager.cpp:492
 #, fuzzy
 msgid "Hide signature details."
 msgstr "Llofnod dilys."
 
-#: urlhandlermanager.cpp:464
+#: urlhandlermanager.cpp:494
+#, fuzzy
+msgid "Hide attachment list"
+msgstr "Cadw Atodiad Fel..."
+
+#: urlhandlermanager.cpp:496
+#, fuzzy
+msgid "Show attachment list"
+msgstr "atodiad"
+
+#: urlhandlermanager.cpp:528
 msgid "Expand all quoted text."
 msgstr ""
 
-#: urlhandlermanager.cpp:466
+#: urlhandlermanager.cpp:531
 msgid "Collapse quoted text."
 msgstr ""
 
-#: urlhandlermanager.cpp:487
+#: urlhandlermanager.cpp:554
 msgid "Could not start certificate manager. Please check your installation."
 msgstr "Methu cychwyn rheolydd tystysgrif.  Gwiriwch eich gosodiad!"
 
-#: urlhandlermanager.cpp:497
+#: urlhandlermanager.cpp:564
 #, c-format
 msgid "Show certificate 0x%1"
 msgstr "Dangos tystysgrif 0x%1"
 
-#: urlhandlermanager.cpp:552
+#: urlhandlermanager.cpp:693
 msgid "Attachment #%1 (unnamed)"
 msgstr "Atodiad #%1 (di-enw)"
 
-#: urlhandlermanager.cpp:581
+#: urlhandlermanager.cpp:724
 msgid "Show GnuPG Audit Log for this operation"
 msgstr ""
 
-#: vacation.cpp:562
+#: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
 "\n"
@@ -13638,7 +14663,7 @@ msgstr ""
 "Yr eiddoch yn gywir,\n"
 "-- <rhowch eich enw a cyhyfeiriad ebost yma>\n"
 
-#: vacation.cpp:606
+#: vacation.cpp:612
 #, fuzzy
 msgid ""
 "Your server did not list \"vacation\" in its list of supported Sieve "
@@ -13651,11 +14676,11 @@ msgstr ""
 "Hebddo, ni all KMail osod atebion allan-o'r-swyddfa i chi.\n"
 "Cysylltwch a'ch gweinyddwr cysawd."
 
-#: vacation.cpp:616
+#: vacation.cpp:622
 msgid "Configure \"Out of Office\" Replies"
 msgstr "Ffurfweddu Atebion \"Allan o'r Swyddfa\""
 
-#: vacation.cpp:626
+#: vacation.cpp:632
 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"
@@ -13665,18 +14690,18 @@ msgstr ""
 "Ni all KMail benodi'r paramedrau ar gyfer yr atebion mwyach.\n"
 "Defnyddir gwerthoedd rhagosod."
 
-#: vacation.cpp:651
+#: vacation.cpp:657
 msgid ""
 "There is still an active out-of-office reply configured.\n"
 "Do you want to edit it?"
 msgstr ""
 
-#: vacation.cpp:652
+#: vacation.cpp:658
 #, fuzzy
 msgid "Out-of-office reply still active"
 msgstr "Gosodwyd ateb Allan-o'r-Swyddfa yn llwyddiannus."
 
-#: vacation.cpp:653
+#: vacation.cpp:659
 #, fuzzy
 msgid "Ignore"
 msgstr "&Anwybyddu"
@@ -13689,43 +14714,43 @@ msgstr "ffurfweddu hysbysiadau gwyliau i'w anfon:"
 msgid "&Activate vacation notifications"
 msgstr "&Gweithredoli hysbysiadau gwyliau"
 
-#: vacationdialog.cpp:76
+#: vacationdialog.cpp:78
 msgid "&Resend notification only after:"
 msgstr "&Ail-anfon hysbysiad yn unig ar ôl:"
 
-#: vacationdialog.cpp:82
+#: vacationdialog.cpp:84
 msgid "&Send responses for these addresses:"
 msgstr "A&nfon ymatebion ar gyfer y cyfeiriadau yma:"
 
-#: vacationdialog.cpp:87
+#: vacationdialog.cpp:89
 #, fuzzy
 msgid "Do not send vacation replies to spam messages"
 msgstr "Rhy&buddio wrth geisio anfon negeseuon heb eu cêl-ysgrifo"
 
-#: vacationdialog.cpp:93
+#: vacationdialog.cpp:95
 msgid "Only react to mail coming from domain"
 msgstr ""
 
-#: vcardviewer.cpp:41
+#: vcardviewer.cpp:45
 #, fuzzy
 msgid "VCard Viewer"
 msgstr "Gwelydd vCard"
 
-#: vcardviewer.cpp:42
+#: vcardviewer.cpp:46
 msgid "&Import"
 msgstr "&Mewnforio"
 
-#: vcardviewer.cpp:42
+#: vcardviewer.cpp:46
 #, fuzzy
 msgid "&Next Card"
 msgstr "&Neges Nesaf"
 
-#: vcardviewer.cpp:42
+#: vcardviewer.cpp:46
 #, fuzzy
 msgid "&Previous Card"
 msgstr "Neges &Blaenorol"
 
-#: vcardviewer.cpp:62
+#: vcardviewer.cpp:70
 #, fuzzy
 msgid "Failed to parse vCard."
 msgstr "Methwyd dosrannu'r vCard!"
@@ -13931,7 +14956,7 @@ msgstr "Ebost iawn"
 msgid "To Do"
 msgstr "I:"
 
-#: kmsearchpattern.h:233
+#: kmsearchpattern.h:234
 msgid "Has Attachment"
 msgstr "Efo Atodiad"
 
@@ -13939,6 +14964,11 @@ msgstr "Efo Atodiad"
 msgid "%1 of %2 %3 used"
 msgstr ""
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr "Llwybr"
+
 #: util.h:208
 msgid ""
 "A file named \"%1\" already exists. Are you sure you want to overwrite it?"
@@ -13949,6 +14979,18 @@ msgstr ""
 msgid "Overwrite File?"
 msgstr "Trosysgrifo'r Ffeil?"
 
+#~ msgid ""
+#~ "_: recipient address field\n"
+#~ "&To:"
+#~ msgstr "A&t:"
+
+#, fuzzy
+#~ msgid "&Copy to (CC):"
+#~ msgstr "&Copïo I"
+
+#~ msgid "Retrieving new messages"
+#~ msgstr "Nôl negeseuon newydd"
+
 #~ msgid "Op&en"
 #~ msgstr "A&gor"
 
@@ -14454,9 +15496,6 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid "Always"
 #~ msgstr "O hyd"
 
-#~ msgid "After"
-#~ msgstr "Ar ôl"
-
 #, fuzzy
 #~ msgid "Warn if CA certificate e&xpires in less than:"
 #~ msgstr "Rhybuddio os bydd y dystys&grif CA yn darfod mewn llai na"
@@ -14480,10 +15519,6 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid "Warn if s&ignature certificate expires in less than:"
 #~ msgstr "Rhybuddio os bydd y dystysgrif l&ofnod yn darfod mewn llai na"
 
-#, fuzzy
-#~ msgid "Warn if root certificate expires in &less than:"
-#~ msgstr "Rhybuddio os bydd y dystysgrif &wraidd yn darfod mewn llai na"
-
 #~ msgid "Warn if signer's email address is &not in certificate"
 #~ msgstr "Rhybuddio os nad yw c&yfeiriad ebost yr anfonwr yn y dystysgrif"
 
@@ -14591,9 +15626,6 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid "&Request..."
 #~ msgstr "C&eisio..."
 
-#~ msgid "Certificate Wizard"
-#~ msgstr "Dewin Tystygrif"
-
 #, fuzzy
 #~ msgid ""
 #~ "<b>Welcome to the Certificate Wizard.</b>\n"
@@ -14808,10 +15840,6 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgstr "<qt>Adferwyd plygell cyrchfan y cyfrif <b>%1</b> i'r blwch derbyn.</qt>"
 
 #, fuzzy
-#~ msgid "Move detected spam messages to the selected folder"
-#~ msgstr "Symudwyd pob neges i'r sbwriel"
-
-#, fuzzy
 #~ msgid "Additionally, mark detected spam messages as read"
 #~ msgstr "Nodi negeseuon dewisiedig fel wedi'u darllen"
 
@@ -15042,9 +16070,6 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ "Gwaredwyd %n neges ddyblyg.\n"
 #~ "Gwaredwyd %n o negeseuon dyblyg."
 
-#~ msgid "To:"
-#~ msgstr "I:"
-
 #~ msgid "&Queue"
 #~ msgstr "&Dal mewn rhes"
 
@@ -15392,13 +16417,6 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ "Methu gwneud copi wrth-gefn o %1.\n"
 #~ " Mynd ymlaen beth bynnag?"
 
-#~ msgid ""
-#~ "Could not open file for writing:\n"
-#~ "%1"
-#~ msgstr ""
-#~ "Methu agor ffeil ar gyfer ysgrifennu:\n"
-#~ " %1"
-
 #~ msgid "Could only write %1 bytes of %2."
 #~ msgstr "Gallu ysgrifennu %1 beit o %2 yn unig."
 
@@ -15464,9 +16482,6 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid "You specified not to encrypt this message, but you wanted to be warned not to send unencrypted messages!"
 #~ msgstr "Rydych wedi penderfynu peidio â chêl-ysgrifo'r neges yma, ond roeddech chi eisiau eich rhybuddio i beidio ac anfon negeseuon heb eu cêl-ysgrifo!"
 
-#~ msgid "Encrypt all parts of this message?"
-#~ msgstr "Cêl-ysgrifo pob rhan o'r neges yma?"
-
 #~ msgid "Encryption Warning"
 #~ msgstr "Rhybudd Cêl-ysgrifo"
 
@@ -15723,9 +16738,6 @@ msgstr "Trosysgrifo'r Ffeil?"
 #~ msgid "[Accept&nbsp;cond.]"
 #~ msgstr "[Derbyn&nbsp;dros dro]"
 
-#~ msgid "[Decline]"
-#~ msgstr "[Gwrthod]"
-
 #~ msgid "[Check&nbsp;my&nbsp;calendar...]"
 #~ msgstr "[Ymofyn&nbsp;fy&nbsp;nghalendr...]"
 
diff --git a/tde-i18n-cy/messages/tdepim/kmail_text_calendar_plugin.po b/tde-i18n-cy/messages/tdepim/kmail_text_calendar_plugin.po
index afd7c4763d3..4fcc682bf3e 100644
--- a/tde-i18n-cy/messages/tdepim/kmail_text_calendar_plugin.po
+++ b/tde-i18n-cy/messages/tdepim/kmail_text_calendar_plugin.po
@@ -1,88 +1,266 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdepim/kmail_text_calendar_plugin.po\n"
-"POT-Creation-Date: 2008-08-19 01:19+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: text_calendar.cpp:326
+#: text_calendar.cpp:343
 msgid "Incidence with no summary"
 msgstr ""
 
-#: text_calendar.cpp:330 text_calendar.cpp:341
+#: text_calendar.cpp:347
 #, c-format
 msgid "Answer: %1"
 msgstr "Ateb : %1"
 
-#: text_calendar.cpp:333
+#: text_calendar.cpp:350
 #, c-format
 msgid "Delegated: %1"
 msgstr ""
 
-#: text_calendar.cpp:336
+#: text_calendar.cpp:353
 #, c-format
 msgid "Forwarded: %1"
 msgstr ""
 
-#: text_calendar.cpp:386
+#: text_calendar.cpp:356
+#, c-format
+msgid "Declined Counter Proposal: %1"
+msgstr ""
+
+#: text_calendar.cpp:412
 msgid "Could not save file to KOrganizer"
 msgstr ""
 
-#: text_calendar.cpp:415 text_calendar.cpp:556
+#: text_calendar.cpp:437 text_calendar.cpp:443
+msgid "\"%1\" occurred already."
+msgstr ""
+
+#: text_calendar.cpp:439 text_calendar.cpp:456
+msgid "\"%1\" is currently in-progress."
+msgstr ""
+
+#: text_calendar.cpp:445
+msgid "\"%1\", happening all day today, is currently in-progress."
+msgstr ""
+
+#: text_calendar.cpp:454 text_calendar.cpp:466
+msgid "\"%1\" is past due."
+msgstr ""
+
+#: text_calendar.cpp:460
+msgid "\"%1\" has already started."
+msgstr ""
+
+#: text_calendar.cpp:469
+msgid "\"%1\", happening all-day today, is currently in-progress."
+msgstr ""
+
+#: text_calendar.cpp:474
+msgid "\"%1\", happening all day, has already started."
+msgstr ""
+
+#: text_calendar.cpp:486
+msgid "Do you still want to accept the invitation?"
+msgstr ""
+
+#: text_calendar.cpp:488
+msgid "Do you still want to accept the task?"
+msgstr ""
+
+#: text_calendar.cpp:492
+msgid "Do you still want to send conditional acceptance of the invitation?"
+msgstr ""
+
+#: text_calendar.cpp:494
+msgid "Do you still want to send conditional acceptance of the task?"
+msgstr ""
+
+#: text_calendar.cpp:497
+msgid "Do you still want to accept the counter proposal?"
+msgstr ""
+
+#: text_calendar.cpp:499
+msgid "Do you still want to send a counter proposal?"
+msgstr ""
+
+#: text_calendar.cpp:501
+msgid "Do you still want to send a decline response?"
+msgstr ""
+
+#: text_calendar.cpp:503
+msgid "Do you still want to decline the counter proposal?"
+msgstr ""
+
+#: text_calendar.cpp:505
+msgid "Do you still want to record this reponse in your calendar?"
+msgstr ""
+
+#: text_calendar.cpp:508
+msgid "Do you still want to delegate this invitation?"
+msgstr ""
+
+#: text_calendar.cpp:510
+msgid "Do you still want to delegate this task?"
+msgstr ""
+
+#: text_calendar.cpp:514
+msgid "Do you still want to forward this invitation?"
+msgstr ""
+
+#: text_calendar.cpp:516
+msgid "Do you still want to forward this task?"
+msgstr ""
+
+#: text_calendar.cpp:519
+msgid "Do you still want to check your calendar?"
+msgstr ""
+
+#: text_calendar.cpp:522
+msgid "Do you still want to record this invitation in your calendar?"
+msgstr ""
+
+#: text_calendar.cpp:524
+msgid "Do you still want to record this task in your calendar?"
+msgstr ""
+
+#: text_calendar.cpp:529
+msgid "%1?"
+msgstr ""
+
+#: text_calendar.cpp:534
+msgid ""
+"%1\n"
+"%2"
+msgstr ""
+
+#: text_calendar.cpp:556
 msgid "Reaction to Invitation"
 msgstr ""
 
-#. i18n("Decline Counter Proposal")
-#: text_calendar.cpp:416 text_calendar.cpp:557
+#: text_calendar.cpp:557 text_calendar.cpp:702
 msgid "Comment:"
 msgstr ""
 
-#: text_calendar.cpp:441
+#: text_calendar.cpp:587
 msgid "Delegation to organizer is not possible."
 msgstr ""
 
-#: text_calendar.cpp:648
-msgid "Accept incidence"
+#: text_calendar.cpp:701
+msgid "Decline Counter Proposal"
+msgstr ""
+
+#: text_calendar.cpp:734
+msgid ""
+"You have no writable calendar folders for invitations, so storing or saving a "
+"response will not be possible.\n"
+"Please create at least 1 writable events calendar and re-sync."
+msgstr ""
+
+#: text_calendar.cpp:754
+msgid ""
+"The calendar invitation stored in this email message is broken in some way. "
+"Unable to continue."
 msgstr ""
 
-#: text_calendar.cpp:650
-msgid "Accept incidence conditionally"
+#: text_calendar.cpp:808
+msgid ""
+"The organizer is not expecting a reply to this invitation but you can send them "
+"an email message if you desire.\n"
+"\n"
+"Would you like to send the organizer a message regarding this invitation?\n"
+"Press the [Cancel] button to cancel the recording operation."
 msgstr ""
 
-#: text_calendar.cpp:655
+#: text_calendar.cpp:812
+msgid "Send Email to Organizer"
+msgstr ""
+
+#: text_calendar.cpp:813
+msgid "Do Not Send"
+msgstr ""
+
+#: text_calendar.cpp:814
+msgid "Send EMail"
+msgstr ""
+
+#: text_calendar.cpp:823
+#, fuzzy, c-format
+msgid "Re: %1"
+msgstr "Ateb : %1"
+
+#: text_calendar.cpp:880
+msgid "Open Attachment"
+msgstr ""
+
+#: text_calendar.cpp:881
+msgid "Save Attachment As..."
+msgstr ""
+
+#: text_calendar.cpp:901
+msgid "Accept invitation"
+msgstr ""
+
+#: text_calendar.cpp:903
+msgid "Accept invitation conditionally"
+msgstr ""
+
+#: text_calendar.cpp:905
+msgid "Accept counter proposal"
+msgstr ""
+
+#: text_calendar.cpp:907
 msgid "Create a counter proposal..."
 msgstr ""
 
-#: text_calendar.cpp:657
+#: text_calendar.cpp:909
 msgid "Throw mail away"
 msgstr ""
 
-#: text_calendar.cpp:659
-msgid "Decline incidence"
+#: text_calendar.cpp:911
+msgid "Decline invitation"
 msgstr ""
 
-#: text_calendar.cpp:664
+#: text_calendar.cpp:913
+msgid "Decline counter proposal"
+msgstr ""
+
+#: text_calendar.cpp:915
 msgid "Check my calendar..."
 msgstr ""
 
-#: text_calendar.cpp:666
-msgid "Enter incidence into my calendar"
+#: text_calendar.cpp:917
+msgid "Record response into my calendar"
+msgstr ""
+
+#: text_calendar.cpp:919
+msgid "Record invitation into my calendar"
+msgstr ""
+
+#: text_calendar.cpp:921
+msgid "Move this invitation to my trash folder"
+msgstr ""
+
+#: text_calendar.cpp:923
+msgid "Delegate invitation"
 msgstr ""
 
-#: text_calendar.cpp:668
-msgid "Delegate incidence"
+#: text_calendar.cpp:925
+msgid "Forward invitation"
 msgstr ""
 
-#: text_calendar.cpp:670
-msgid "Forward incidence"
+#: text_calendar.cpp:927
+msgid "Remove invitation from my calendar"
 msgstr ""
 
-#: text_calendar.cpp:672
-msgid "Remove incidence from my calendar"
+#: text_calendar.cpp:930
+msgid "Open attachment \"%1\""
 msgstr ""
 
 #: delegateselector.cpp:32
@@ -97,10 +275,10 @@ msgstr ""
 msgid "Keep me informed about status changes of this incidence."
 msgstr ""
 
-#: attendeeselector.cpp:31
+#: attendeeselector.cpp:32
 msgid "Select Attendees"
 msgstr ""
 
-#: attendeeselector.cpp:44
+#: attendeeselector.cpp:45
 msgid "Click to add a new attendee"
 msgstr ""
diff --git a/tde-i18n-cy/messages/tdepim/kmail_text_vcard_plugin.po b/tde-i18n-cy/messages/tdepim/kmail_text_vcard_plugin.po
index deccdc44868..9a173aefe2e 100644
--- a/tde-i18n-cy/messages/tdepim/kmail_text_vcard_plugin.po
+++ b/tde-i18n-cy/messages/tdepim/kmail_text_vcard_plugin.po
@@ -6,22 +6,47 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: all.po\n"
-"POT-Creation-Date: 2004-12-11 01:22+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: text_vcard.cpp:82
+#: text_vcard.cpp:93
 msgid "Attached business cards"
 msgstr ""
 
-#: text_vcard.cpp:95
+#: text_vcard.cpp:106
 msgid "[Add this contact to the addressbook]"
 msgstr ""
 
-#: text_vcard.cpp:134
+#: text_vcard.cpp:176
+msgid "View Business Card"
+msgstr ""
+
+#: text_vcard.cpp:177
+msgid "Save Business Card As..."
+msgstr ""
+
+#: text_vcard.cpp:196
 msgid "Add this contact to the address book."
 msgstr ""
+
+#: text_vcard.cpp:198
+msgid "Add \"%1\" to the address book."
+msgstr ""
+
+#: text_vcard.cpp:208
+msgid "Failed to parse the business card."
+msgstr ""
+
+#: text_vcard.cpp:225
+msgid "Save Business Card"
+msgstr ""
+
+#: text_vcard.cpp:230
+msgid "%1 already exists. Do you want to overwrite it?"
+msgstr ""
diff --git a/tde-i18n-cy/messages/tdepim/kmailcvt.po b/tde-i18n-cy/messages/tdepim/kmailcvt.po
index 3c56da8dfa0..2deb133d08c 100644
--- a/tde-i18n-cy/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-cy/messages/tdepim/kmailcvt.po
@@ -8,15 +8,28 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2007-12-11 01:17+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2004-01-08 21:25+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.2\n"
 
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Owain Green drwy KGyfieithu - Meddalwedd Gymraeg"
+
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "kyfieithu@dotmon.com"
+
 #: filter_mailapp.cxx:32
 #, fuzzy
 msgid "Import From OS X Mail"
@@ -28,43 +41,43 @@ msgid ""
 "<p>This filter imports e-mails from the Mail client in Apple Mac OS X.</p>"
 msgstr ""
 
-#: filter_evolution.cxx:58 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:53 filter_oe.cxx:61
-#: filter_opera.cxx:60 filter_outlook.cxx:45 filter_plain.cxx:45
+#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
+#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
+#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
 #: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
 #: filter_thunderbird.cxx:65
 msgid "No directory selected."
 msgstr "Dim cyfeiriadur wedi'i ddewis."
 
-#: filter_evolution.cxx:65 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:54 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:51 filter_sylpheed.cxx:63
+#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
+#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
+#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
 #: filter_thebat.cxx:69 filter_thunderbird.cxx:72
 msgid "No files found for import."
 msgstr ""
 
-#: filter_evolution.cxx:125 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:89 filter_mailapp.cxx:63
-#: filter_mbox.cxx:55 filter_opera.cxx:87 filter_outlook.cxx:60
+#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
+#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
+#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
 #: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
 #: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
 msgid "Unable to open %1, skipping"
 msgstr "Methwyd agor %1, yn hepgor"
 
-#: filter_evolution.cxx:146 filter_mailapp.cxx:71 filter_mbox.cxx:61
-#: filter_opera.cxx:89 filter_outlook.cxx:58
+#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
+#: filter_opera.cxx:89 filter_outlook.cxx:57
 msgid "Importing emails from %1..."
 msgstr "Yn mewnforio ebostau o %1"
 
-#: filter_evolution.cxx:77 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:127 filter_mbox.cxx:133
-#: filter_opera.cxx:141 filter_plain.cxx:81 filter_pmail.cxx:79
+#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
+#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
+#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
 #: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
 #, c-format
 msgid "Finished importing emails from %1"
 msgstr "Gorffennwyd mewnforio ebostau o %1"
 
-#: filter_mailapp.cxx:130 filter_mbox.cxx:136
+#: filter_mailapp.cxx:129 filter_mbox.cxx:135
 #, fuzzy
 msgid ""
 "_n: 1 duplicate message not imported to folder %1 in KMail\n"
@@ -72,74 +85,165 @@ msgid ""
 msgstr "Gwall tra'n ychwanegu neges at blygell %1 yng KMail."
 
 #: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:138 filter_mbox.cxx:139 filter_oe.cxx:103
-#: filter_opera.cxx:155 filter_plain.cxx:85 filter_sylpheed.cxx:82
+#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
+#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
 #: filter_thebat.cxx:88 filter_thunderbird.cxx:104
 msgid "Finished import, canceled by user."
 msgstr ""
 
-#: filter_thunderbird.cxx:28
-msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
-msgstr ""
+#: filter_lnotes.cxx:30
+#, fuzzy
+msgid "Import Lotus Notes Emails"
+msgstr "Mewnforio Ebostau Outlook Express"
 
-#: filter_thunderbird.cxx:30
+#: filter_lnotes.cxx:32
+#, fuzzy
 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>"
+"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
+"<p>This filter will import Structured Text files from an exported Lotus Notes "
+"email client into KMail. Use this filter if you want to import mails from Lotus "
+"or other mailers that use the Lotus Notes Structured Text format.</p>"
+"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
+"your local folder, named using the names of the files the messages came "
+"from.</p>"
 msgstr ""
+"<p><b>hidlen mewnforio mbox</b></p>"
+"<p>Bydd yr hidlen hon yn mewnforio ffeiliau mbox i KMail.  Defnyddiwch yr "
+"hidlen yma os hoffech fewnforio o Ximian Evolution neu ebostyddion eraill sy'n "
+"defnyddio'r ffromat traddodiadaol UNIX yma.</p>"
+"<p><b>Noder:</b> Mewnforir ebostau i blygelli wedi'u henwi ar ôl y ffeil y "
+"daethont ohoni, â'r rhagddodiad MBOX.</p>"
 
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
-msgid "Start import file %1..."
+#: filter_lnotes.cxx:55
+#, fuzzy
+msgid "All Files (*)"
+msgstr "ffeiliau mbox (*)"
+
+#: filter_lnotes.cxx:64
+#, c-format
+msgid "Importing emails from %1"
+msgstr "Yn mewnforio ebostau o %1"
+
+#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#, c-format
+msgid "Message %1"
+msgstr "Neges %1"
+
+#: filter_pmail.cxx:31
+msgid "Import Folders From Pegasus-Mail"
+msgstr "Mewnforio Plygelli o Pegasus-Mail"
+
+#: filter_pmail.cxx:33
+#, fuzzy
+msgid ""
+"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
+"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
+"C:\\pmail\\mail\\admin</p>"
+"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"folders will be stored under: \"PegasusMail-Import\".</p>"
 msgstr ""
+"<p>Dewiswch y cyfeiriadur Pegasus-Mail ar eich cysawd (sy'n cynnwys ffeiliau "
+"CNM, PMM, ac MBX). Ar sawl cysawd mae hwn wedi'i gadw yn C:\\PMail\\mail</p>"
+"<p><b>Noder:</b> Bydd yr hidlen fewnforio yma'n mewnforio'ch plygelli, ond nid "
+"yr adeiledd plygelli. Ond mae'n debyg taw dim ond unwaith y gwnewch hyn.</p>"
+"<p><b>Noder:</b> Mewnforir ebostau i blygell â'r rhagddodiad pmail-</p>"
 
-#: filter_evolution.cxx:196 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:59
-#: filter_plain.cxx:83 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
-#, fuzzy, c-format
+#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
+#: filter_pmail.cxx:61
+msgid "Counting files..."
+msgstr "Yn cyfri ffeiliau..."
+
+#: filter_pmail.cxx:69
 msgid ""
-"_n: 1 duplicate message not imported\n"
-"%n duplicate messages not imported"
-msgstr "Gwall tra'n ychwanegu neges at blygell %1 yng KMail."
+"Cannot parse the folder structure; continuing import without subfolder support."
+msgstr ""
+
+#: filter_pmail.cxx:72
+msgid "Importing new mail files ('.cnm')..."
+msgstr "Yn mewnforio ffeiliau ebost newydd ('.cnm')..."
+
+#: filter_pmail.cxx:74
+msgid "Importing mail folders ('.pmm')..."
+msgstr "Yn mewnforio plygelli ebost ('.pmm')..."
+
+#: filter_pmail.cxx:76
+msgid "Importing 'UNIX' mail folders ('.mbx')..."
+msgstr "Yn mewnforio plygelli ebost 'UNIX' ('.mbx')..."
+
+#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#, c-format
+msgid "Importing %1"
+msgstr "Yn mewnforio %1"
+
+#: filter_pmail.cxx:290
+msgid "Parsing the folder structure..."
+msgstr ""
+
+#: filter_outlook.cxx:28
+#, fuzzy
+msgid "Import Outlook Emails"
+msgstr "Mewnforio Ebostau Outlook Express"
 
-#: filters.cxx:145 filters.cxx:180
+#: filter_outlook.cxx:30
+#, fuzzy
 msgid ""
-"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
-"kmail</i> is installed."
+"<p><b>Outlook email import filter</b></p>"
+"<p>This filter will import mails from a Outlook pst-file. You will need to "
+"locate the folder where the pst-file has been stored by searching for .pst "
+"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
+"<p><b>Note:</b> Emails will be imported into a folder named after the account "
+"they came from, prefixed with OUTLOOK-</p>"
 msgstr ""
-"<b>Marwol:</b> Methu cychwyn KMail ar gyfer cyfathrebu DCOP. Sicrhewch bod <i>"
-"kmail</i> wedi'i sefydlu."
+"<p><b>Hidlen Mewnforio Outlook Express 4/5/6 Newydd</b></p>"
+"<p>Hidlen Outlook Express newydd yw hon, sy'n cynnal yn gyflawn fersiynau 4 i "
+"6.</p>"
+"<p>Mae Outlook Express yn cadw ei flychau post yn C:\\Windows\\Application "
+"Data\\Identities\\?????\\Microsoft\\Outlook Express yn gyffredinol</p>"
+"<p><b>Noder:</b>Mewnforir ebostau i blygelli wedi'u henwi ar ôl y ffeil y "
+"daethont ohoni, â'r rhagddodiad OE-</p>"
 
-#: filters.cxx:153 filters.cxx:188
-msgid "Cannot make folder %1 in KMail"
-msgstr "Methu creu plygell %1 yng KMail"
+#: filter_outlook.cxx:46
+#, fuzzy
+msgid "Counting mail..."
+msgstr "Yn cyfri ffeiliau..."
 
-#: filters.cxx:156 filters.cxx:191
-msgid "Cannot add message to folder %1 in KMail"
-msgstr "Methu ychwanegu neges at blygell %1 yng KMail"
+#: filter_outlook.cxx:47
+#, fuzzy
+msgid "Counting directories..."
+msgstr "Yn cyfri ffeiliau..."
 
-#: filters.cxx:162 filters.cxx:194
-msgid "Error while adding message to folder %1 in KMail"
-msgstr "Gwall tra'n ychwanegu neges at blygell %1 yng KMail."
+#: filter_outlook.cxx:48
+#, fuzzy
+msgid "Counting folders..."
+msgstr "Yn cyfri ffeiliau..."
 
-#: _translatorinfo.cpp:1
+#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+msgid "Importing new mail files..."
+msgstr "Yn mewnforio ffeiliau ebost newydd..."
+
+#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
+#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
+#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
+#: filter_thunderbird.cxx:101
+#, fuzzy, c-format
 msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Owain Green drwy KGyfieithu - Meddalwedd Gymraeg"
+"_n: 1 duplicate message not imported\n"
+"%n duplicate messages not imported"
+msgstr "Gwall tra'n ychwanegu neges at blygell %1 yng KMail."
 
-#: _translatorinfo.cpp:3
+#: filter_evolution.cxx:31
+msgid "Import Evolution 1.x Local Mails and Folder Structure"
+msgstr ""
+
+#: filter_evolution.cxx:33
 msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "kyfieithu@dotmon.com"
+"<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_sylpheed.cxx:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
@@ -161,151 +265,176 @@ msgid "Import folder %1..."
 msgstr "Yn mewnforio ebostau o %1"
 
 #: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:68 filter_plain.cxx:72 filter_sylpheed.cxx:153
+#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
 #: filter_sylpheed.cxx:158
 #, c-format
 msgid "Could not import %1"
 msgstr ""
 
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "KMailCVT"
-
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "Hidlenni Mewnforio KMail"
-
-#: main.cpp:35
-#, fuzzy
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "(c) 2000-2003, Y Datblygwyr KMailCVT"
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "Awdur gwreiddiol"
-
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr ""
-
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr "GUI newydd a glanhadau"
-
-#: filter_evolution.cxx:31
-msgid "Import Evolution 1.x Local Mails and Folder Structure"
+#: filter_evolution_v2.cxx:29
+msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr ""
 
-#: filter_evolution.cxx:33
+#: filter_evolution_v2.cxx:31
 msgid ""
-"<p><b>Evolution 1.x import filter</b></p>"
-"<p>Select the base directory of Evolution's mails (usually "
-"~/evolution/local).</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_opera.cxx:28
-#, fuzzy
-msgid "Import Opera Emails"
-msgstr "Mewnforio Ebostau Outlook Express"
-
-#: filter_opera.cxx:30
-#, fuzzy
-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>"
+#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
+#: filter_thunderbird.cxx:129
+msgid "Start import file %1..."
 msgstr ""
-"<p><b>hidlen mewnforio mbox</b></p>"
-"<p>Bydd yr hidlen hon yn mewnforio ffeiliau mbox i KMail.  Defnyddiwch yr "
-"hidlen yma os hoffech fewnforio o Ximian Evolution neu ebostyddion eraill sy'n "
-"defnyddio'r ffromat traddodiadaol UNIX yma.</p>"
-"<p><b>Noder:</b> Mewnforir ebostau i blygelli wedi'u henwi ar ôl y ffeil y "
-"daethont ohoni, â'r rhagddodiad MBOX.</p>"
 
-#: filter_opera.cxx:75 filter_outlook.cxx:46 filter_plain.cxx:52
-#: filter_pmail.cxx:61
-msgid "Counting files..."
-msgstr "Yn cyfri ffeiliau..."
-
-#: filter_opera.cxx:82 filter_outlook.cxx:50 filter_plain.cxx:56
-msgid "Importing new mail files..."
-msgstr "Yn mewnforio ffeiliau ebost newydd..."
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Ysgrifennwyd gan %1.</i></p>"
 
-#: kmailcvt.cpp:26
+#: kmailcvt.cpp:28
 msgid "KMailCVT Import Tool"
 msgstr "Erfyn Mewnforio KMailCVT"
 
-#: kmailcvt.cpp:29
+#: kmailcvt.cpp:31
 msgid "Step 1: Select Filter"
 msgstr "Cam 1: Dewis Hidlen"
 
-#: kmailcvt.cpp:32
+#: kmailcvt.cpp:34
 msgid "Step 2: Importing..."
 msgstr "Cam 2: Mewnforio..."
 
-#: kmailcvt.cpp:53
+#: kmailcvt.cpp:76
 msgid "Import in progress"
 msgstr "Mewnforio ar waith"
 
-#: kmailcvt.cpp:56
+#: kmailcvt.cpp:79
 msgid "Import finished"
 msgstr "Mewnforio wedi gorffen"
 
-#: filter_pmail.cxx:31
-msgid "Import Folders From Pegasus-Mail"
-msgstr "Mewnforio Plygelli o Pegasus-Mail"
+#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+msgid ""
+"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
+"kmail</i> is installed."
+msgstr ""
+"<b>Marwol:</b> Methu cychwyn KMail ar gyfer cyfathrebu DCOP. Sicrhewch bod <i>"
+"kmail</i> wedi'i sefydlu."
 
-#: filter_pmail.cxx:33
+#: filters.cxx:153 filters.cxx:188
+msgid "Cannot make folder %1 in KMail"
+msgstr "Methu creu plygell %1 yng KMail"
+
+#: filters.cxx:156 filters.cxx:191
+msgid "Cannot add message to folder %1 in KMail"
+msgstr "Methu ychwanegu neges at blygell %1 yng KMail"
+
+#: filters.cxx:162 filters.cxx:194
+msgid "Error while adding message to folder %1 in KMail"
+msgstr "Gwall tra'n ychwanegu neges at blygell %1 yng KMail."
+
+#: filter_mbox.cxx:28
+msgid "Import mbox Files (UNIX, Evolution)"
+msgstr "Mewnforio Ffeiliau mbox (UNIX, Evolution)"
+
+#: filter_mbox.cxx:30
+msgid ""
+"<p><b>mbox import filter</b></p>"
+"<p>This filter will import mbox files into KMail. Use this filter if you want "
+"to import mails from Ximian Evolution or other mailers that use this "
+"traditional UNIX format.</p>"
+"<p><b>Note:</b> Emails will be imported into folders named after the file they "
+"came from, prefixed with MBOX-</p>"
+msgstr ""
+"<p><b>hidlen mewnforio mbox</b></p>"
+"<p>Bydd yr hidlen hon yn mewnforio ffeiliau mbox i KMail.  Defnyddiwch yr "
+"hidlen yma os hoffech fewnforio o Ximian Evolution neu ebostyddion eraill sy'n "
+"defnyddio'r ffromat traddodiadaol UNIX yma.</p>"
+"<p><b>Noder:</b> Mewnforir ebostau i blygelli wedi'u henwi ar ôl y ffeil y "
+"daethont ohoni, â'r rhagddodiad MBOX.</p>"
+
+#: filter_mbox.cxx:48
 #, fuzzy
+msgid "mbox Files (*)"
+msgstr "ffeiliau mbox (*)"
+
+#: filter_plain.cxx:27
+msgid "Import Plain Text Emails"
+msgstr "Mewnforio Ebostau Testun Plaen"
+
+#: filter_plain.cxx:29
 msgid ""
-"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
-"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders will be stored under: \"PegasusMail-Import\".</p>"
+"<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 Pegasus-Mail ar eich cysawd (sy'n cynnwys ffeiliau "
-"CNM, PMM, ac MBX). Ar sawl cysawd mae hwn wedi'i gadw yn C:\\PMail\\mail</p>"
-"<p><b>Noder:</b> Bydd yr hidlen fewnforio yma'n mewnforio'ch plygelli, ond nid "
-"yr adeiledd plygelli. Ond mae'n debyg taw dim ond unwaith y gwnewch hyn.</p>"
-"<p><b>Noder:</b> Mewnforir ebostau i blygell â'r rhagddodiad pmail-</p>"
+"<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_pmail.cxx:69
+#: filter_oe.cxx:40
+msgid "Import Outlook Express Emails"
+msgstr "Mewnforio Ebostau Outlook Express"
+
+#: filter_oe.cxx:42
+#, fuzzy
 msgid ""
-"Cannot parse the folder structure; continuing import without subfolder support."
+"<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><i>Documents and Settings</i> in Windows 2000 or later</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 ""
+"<p><b>Hidlen Mewnforio Outlook Express 4/5/6 Newydd</b></p>"
+"<p>Hidlen Outlook Express newydd yw hon, sy'n cynnal yn gyflawn fersiynau 4 i "
+"6.</p>"
+"<p>Mae Outlook Express yn cadw ei flychau post yn C:\\Windows\\Application "
+"Data\\Identities\\?????\\Microsoft\\Outlook Express yn gyffredinol</p>"
+"<p><b>Noder:</b>Mewnforir ebostau i blygelli wedi'u henwi ar ôl y ffeil y "
+"daethont ohoni, â'r rhagddodiad OE-</p>"
 
-#: filter_pmail.cxx:72
-msgid "Importing new mail files ('.cnm')..."
-msgstr "Yn mewnforio ffeiliau ebost newydd ('.cnm')..."
+#: filter_oe.cxx:67
+#, c-format
+msgid "No Outlook Express mailboxes found in directory %1."
+msgstr "Ni ganfuwyd blychau ebost Outlook Express yn y cyfeiriadur %1"
 
-#: filter_pmail.cxx:74
-msgid "Importing mail folders ('.pmm')..."
-msgstr "Yn mewnforio plygelli ebost ('.pmm')..."
+#: filter_oe.cxx:82
+#, fuzzy
+msgid "Import folder structure..."
+msgstr "Yn mewnforio ebostau o %1"
 
-#: filter_pmail.cxx:76
-msgid "Importing 'UNIX' mail folders ('.mbx')..."
-msgstr "Yn mewnforio plygelli ebost 'UNIX' ('.mbx')..."
+#: filter_oe.cxx:101
+msgid "Finished importing Outlook Express emails"
+msgstr "Gorffennwyd mewnforio ebostau Outlook Express"
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#: filter_oe.cxx:119
 #, c-format
-msgid "Importing %1"
-msgstr "Yn mewnforio %1"
+msgid "Unable to open mailbox %1"
+msgstr "Methwyd agor y blwch ebost %1"
 
-#: filter_lnotes.cxx:110 filter_pmail.cxx:279
+#: filter_oe.cxx:130
 #, c-format
-msgid "Message %1"
-msgstr "Neges %1"
+msgid "Importing OE4 Mailbox %1"
+msgstr "Yn mewnforio blwch ebost OE4 %1"
 
-#: filter_pmail.cxx:290
-msgid "Parsing the folder structure..."
-msgstr ""
+#: filter_oe.cxx:144
+#, c-format
+msgid "Importing OE5+ Mailbox %1"
+msgstr "Yn mewnforio blwch ebost OE5+ %1"
+
+#: filter_oe.cxx:150
+#, fuzzy, c-format
+msgid "Importing OE5+ Folder file %1"
+msgstr "Yn anwybyddu ffeil Blygelli OE5+ %1"
 
 #. i18n: file kimportpagedlg.ui line 91
 #: rc.cpp:3
@@ -382,30 +511,32 @@ msgstr ""
 msgid "Remove &duplicate messages during import"
 msgstr ""
 
-#: filter_mbox.cxx:28
-msgid "Import mbox Files (UNIX, Evolution)"
-msgstr "Mewnforio Ffeiliau mbox (UNIX, Evolution)"
+#: filter_thebat.cxx:33
+msgid "Import The Bat! Mails and Folder Structure"
+msgstr ""
 
-#: filter_mbox.cxx:30
+#: filter_thebat.cxx:35
 msgid ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
+"<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 ""
-"<p><b>hidlen mewnforio mbox</b></p>"
-"<p>Bydd yr hidlen hon yn mewnforio ffeiliau mbox i KMail.  Defnyddiwch yr "
-"hidlen yma os hoffech fewnforio o Ximian Evolution neu ebostyddion eraill sy'n "
-"defnyddio'r ffromat traddodiadaol UNIX yma.</p>"
-"<p><b>Noder:</b> Mewnforir ebostau i blygelli wedi'u henwi ar ôl y ffeil y "
-"daethont ohoni, â'r rhagddodiad MBOX.</p>"
 
-#: filter_mbox.cxx:49
-#, fuzzy
-msgid "mbox Files (*)"
-msgstr "ffeiliau mbox (*)"
+#: filter_kmail_archive.cxx:24
+msgid "Import KMail Archive File"
+msgstr ""
+
+#: filter_kmail_archive.cxx:26
+msgid ""
+"<p><b>KMail Archive File Import Filter</b></p>"
+"<p>This filter will import archives files previously exported by KMail.</p>"
+"<p>Archive files contain a complete folder subtree compressed into a single "
+"file.</p>"
+msgstr ""
 
 #: filter_kmail_maildir.cxx:26
 msgid "Import KMail Maildirs and Folder Structure"
@@ -416,104 +547,44 @@ 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 ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck in a "
-"continuous loop. </p>"
+"or ~/.trinity/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_evolution_v2.cxx:29
-msgid "Import Evolution 2.x Local Mails and Folder Structure"
+#: filter_thunderbird.cxx:28
+msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
 msgstr ""
 
-#: filter_evolution_v2.cxx:31
+#: filter_thunderbird.cxx:30
 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>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 "
+"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:40
-msgid "Import Outlook Express Emails"
-msgstr "Mewnforio Ebostau Outlook Express"
-
-#: filter_oe.cxx:42
-#, fuzzy
-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><i>Documents and Settings</i> in Windows 2000 or later</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>"
+"stored under: \"Thunderbird-Import\".</p>"
 msgstr ""
-"<p><b>Hidlen Mewnforio Outlook Express 4/5/6 Newydd</b></p>"
-"<p>Hidlen Outlook Express newydd yw hon, sy'n cynnal yn gyflawn fersiynau 4 i "
-"6.</p>"
-"<p>Mae Outlook Express yn cadw ei flychau post yn C:\\Windows\\Application "
-"Data\\Identities\\?????\\Microsoft\\Outlook Express yn gyffredinol</p>"
-"<p><b>Noder:</b>Mewnforir ebostau i blygelli wedi'u henwi ar ôl y ffeil y "
-"daethont ohoni, â'r rhagddodiad OE-</p>"
-
-#: filter_oe.cxx:68
-#, c-format
-msgid "No Outlook Express mailboxes found in directory %1."
-msgstr "Ni ganfuwyd blychau ebost Outlook Express yn y cyfeiriadur %1"
-
-#: filter_oe.cxx:83
-#, fuzzy
-msgid "Import folder structure..."
-msgstr "Yn mewnforio ebostau o %1"
-
-#: filter_oe.cxx:102
-msgid "Finished importing Outlook Express emails"
-msgstr "Gorffennwyd mewnforio ebostau Outlook Express"
-
-#: filter_oe.cxx:120
-#, c-format
-msgid "Unable to open mailbox %1"
-msgstr "Methwyd agor y blwch ebost %1"
-
-#: filter_oe.cxx:131
-#, c-format
-msgid "Importing OE4 Mailbox %1"
-msgstr "Yn mewnforio blwch ebost OE4 %1"
-
-#: filter_oe.cxx:145
-#, c-format
-msgid "Importing OE5+ Mailbox %1"
-msgstr "Yn mewnforio blwch ebost OE5+ %1"
-
-#: filter_oe.cxx:151
-#, fuzzy, c-format
-msgid "Importing OE5+ Folder file %1"
-msgstr "Yn anwybyddu ffeil Blygelli OE5+ %1"
 
-#: filter_lnotes.cxx:30
+#: filter_opera.cxx:28
 #, fuzzy
-msgid "Import Lotus Notes Emails"
+msgid "Import Opera Emails"
 msgstr "Mewnforio Ebostau Outlook Express"
 
-#: filter_lnotes.cxx:32
+#: filter_opera.cxx:30
 #, fuzzy
 msgid ""
-"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
-"<p>This filter will import Structured Text files from an exported Lotus Notes "
-"email client into KMail. Use this filter if you want to import mails from Lotus "
-"or other mailers that use the Lotus Notes Structured Text format.</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
-"your local folder, named using the names of the files the messages came "
-"from.</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 ""
 "<p><b>hidlen mewnforio mbox</b></p>"
 "<p>Bydd yr hidlen hon yn mewnforio ffeiliau mbox i KMail.  Defnyddiwch yr "
@@ -522,88 +593,30 @@ msgstr ""
 "<p><b>Noder:</b> Mewnforir ebostau i blygelli wedi'u henwi ar ôl y ffeil y "
 "daethont ohoni, â'r rhagddodiad MBOX.</p>"
 
-#: filter_lnotes.cxx:56
-#, fuzzy
-msgid "All Files (*)"
-msgstr "ffeiliau mbox (*)"
-
-#: filter_lnotes.cxx:65
-#, c-format
-msgid "Importing emails from %1"
-msgstr "Yn mewnforio ebostau o %1"
-
-#: filter_thebat.cxx:33
-msgid "Import The Bat! Mails and Folder Structure"
-msgstr ""
-
-#: filter_thebat.cxx:35
-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 ""
-
-#: kselfilterpage.cpp:76
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Ysgrifennwyd gan %1.</i></p>"
-
-#: filter_outlook.cxx:28
-#, fuzzy
-msgid "Import Outlook Emails"
-msgstr "Mewnforio Ebostau Outlook Express"
-
-#: filter_outlook.cxx:30
-#, fuzzy
-msgid ""
-"<p><b>Outlook email import filter</b></p>"
-"<p>This filter will import mails from a Outlook pst-file. You will need to "
-"locate the folder where the pst-file has been stored by searching for .pst "
-"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OUTLOOK-</p>"
-msgstr ""
-"<p><b>Hidlen Mewnforio Outlook Express 4/5/6 Newydd</b></p>"
-"<p>Hidlen Outlook Express newydd yw hon, sy'n cynnal yn gyflawn fersiynau 4 i "
-"6.</p>"
-"<p>Mae Outlook Express yn cadw ei flychau post yn C:\\Windows\\Application "
-"Data\\Identities\\?????\\Microsoft\\Outlook Express yn gyffredinol</p>"
-"<p><b>Noder:</b>Mewnforir ebostau i blygelli wedi'u henwi ar ôl y ffeil y "
-"daethont ohoni, â'r rhagddodiad OE-</p>"
-
-#: filter_outlook.cxx:47
-#, fuzzy
-msgid "Counting mail..."
-msgstr "Yn cyfri ffeiliau..."
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr "KMailCVT"
 
-#: filter_outlook.cxx:48
-#, fuzzy
-msgid "Counting directories..."
-msgstr "Yn cyfri ffeiliau..."
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "Hidlenni Mewnforio KMail"
 
-#: filter_outlook.cxx:49
+#: main.cpp:35
 #, fuzzy
-msgid "Counting folders..."
-msgstr "Yn cyfri ffeiliau..."
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "(c) 2000-2003, Y Datblygwyr KMailCVT"
 
-#: filter_plain.cxx:27
-msgid "Import Plain Text Emails"
-msgstr "Mewnforio Ebostau Testun Plaen"
+#: main.cpp:36
+msgid "Original author"
+msgstr "Awdur gwreiddiol"
 
-#: filter_plain.cxx:29
-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>"
+#: main.cpp:37
+msgid "Maintainer & New filters"
 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>"
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr "GUI newydd a glanhadau"
 
 #, fuzzy
 #~ msgid "File %1 does not seem to be an Outlook Express mailbox"
diff --git a/tde-i18n-cy/messages/tdepim/kmobile.po b/tde-i18n-cy/messages/tdepim/kmobile.po
index b8f0856ba44..555b76f6036 100644
--- a/tde-i18n-cy/messages/tdepim/kmobile.po
+++ b/tde-i18n-cy/messages/tdepim/kmobile.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmobile\n"
-"POT-Creation-Date: 2005-07-25 01:39+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2004-01-08 21:34+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdepim/knode.po b/tde-i18n-cy/messages/tdepim/knode.po
index 73bae3a825b..f0996028031 100644
--- a/tde-i18n-cy/messages/tdepim/knode.po
+++ b/tde-i18n-cy/messages/tdepim/knode.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: knode\n"
-"POT-Creation-Date: 2008-07-22 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2004-02-26 17:15+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,19 +35,19 @@ msgstr "kyfieithu@dotmon.com"
 msgid "Maintainer"
 msgstr "Cynhaliwr"
 
-#: aboutdata.cpp:31
+#: aboutdata.cpp:31 aboutdata.cpp:32
 msgid "Former maintainer"
 msgstr "Cyn-gynhaliwr"
 
-#: aboutdata.cpp:45 knjobdata.cpp:120
+#: aboutdata.cpp:46 knjobdata.cpp:120
 msgid "KNode"
 msgstr "KNode"
 
-#: aboutdata.cpp:47
+#: aboutdata.cpp:48
 msgid "A newsreader for TDE"
 msgstr "Darllenydd newyddion ar gyfer TDE"
 
-#: aboutdata.cpp:49
+#: aboutdata.cpp:50
 #, fuzzy
 msgid "Copyright (c) 1999-2005 the KNode authors"
 msgstr "Hawlfraint (h) 1999-2002 yr Awduron KNode"
@@ -131,7 +132,7 @@ msgstr "Cudd&io"
 msgid "Chars&et"
 msgstr "S&et Nodau"
 
-#: articlewidget.cpp:196 articlewidget.cpp:1362
+#: articlewidget.cpp:196 articlewidget.cpp:1371
 msgid "Automatic"
 msgstr "Ymysgogol"
 
@@ -167,22 +168,22 @@ msgstr "&Agor yr Atodiad"
 msgid "&Save Attachment As..."
 msgstr "&Cadw Atodiad Fel..."
 
-#: articlewidget.cpp:341
+#: articlewidget.cpp:345
 #, fuzzy
 msgid "Unable to load the article."
 msgstr "Methu llwytho'r erthygl!"
 
-#: articlewidget.cpp:373
+#: articlewidget.cpp:377
 #, fuzzy
 msgid "The article contains no data."
 msgstr "does dim data yn yr erthygl"
 
-#: articlewidget.cpp:400
+#: articlewidget.cpp:405
 #, fuzzy
 msgid "Unknown charset. Default charset is used instead."
 msgstr "Set nodau anhysbys!   Defnyddir y set rhagosod yn lle."
 
-#: articlewidget.cpp:460
+#: articlewidget.cpp:465
 #, fuzzy
 msgid ""
 "<br/><b>This article has the MIME type &quot;message/partial&quot;, which KNode "
@@ -195,7 +196,7 @@ msgstr ""
 "<br>Yn y cyfamser, gallwch gadw'r erthygl fel ffeil testun a'u hail-gydosod â "
 "llaw.</b></bodyblock></qt>"
 
-#: articlewidget.cpp:477
+#: articlewidget.cpp:482
 msgid ""
 "<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
 "code is shown. If you trust the sender of this message then you can activate "
@@ -203,73 +204,73 @@ msgid ""
 "by clicking here</a>."
 msgstr ""
 
-#: articlewidget.cpp:523
+#: articlewidget.cpp:528
 msgid "An error occurred."
 msgstr "Digwyddodd gwall."
 
-#: articlewidget.cpp:656
+#: articlewidget.cpp:663
 msgid "References:"
 msgstr "Cyfeiriadau:"
 
-#: articlewidget.cpp:742
+#: articlewidget.cpp:750
 #, c-format
 msgid "Message was signed with unknown key 0x%1."
 msgstr "Llofnodwyd y neges gydag allwedd anhysbys 0x%1."
 
-#: articlewidget.cpp:745
+#: articlewidget.cpp:753
 msgid "The validity of the signature cannot be verified."
 msgstr "Ni ellir gwirio dilysrwydd y llofnod."
 
-#: articlewidget.cpp:763
+#: articlewidget.cpp:771
 msgid "Message was signed by %1 (Key ID: 0x%2)."
 msgstr "Llofnodwyd y neges gan %1 (Nod Allwedd: 0x%2)."
 
-#: articlewidget.cpp:767
+#: articlewidget.cpp:775
 #, c-format
 msgid "Message was signed by %1."
 msgstr "Llofnodwyd y neges gan %1."
 
-#: articlewidget.cpp:777
+#: articlewidget.cpp:785
 msgid "The signature is valid, but the key's validity is unknown."
 msgstr "Mae'r llofnod yn ddilys, ond mae dilysrwydd yr allwedd yn anhysbys."
 
-#: articlewidget.cpp:781
+#: articlewidget.cpp:789
 msgid "The signature is valid and the key is marginally trusted."
 msgstr ""
 "Mae'r llofnod yn ddilys ac mae ymddiriedaeth drwch blewyn yn yr allwedd."
 
-#: articlewidget.cpp:785
+#: articlewidget.cpp:793
 msgid "The signature is valid and the key is fully trusted."
 msgstr "Mae'r llofnod yn ddilys ac mae ymddiriedaeth lwyr yn yr allwedd. "
 
-#: articlewidget.cpp:789
+#: articlewidget.cpp:797
 msgid "The signature is valid and the key is ultimately trusted."
 msgstr ""
 "Mae'r llofnod yn ddilys ac mae ymddiriedaeth yn yr allwedd yn y pen draw."
 
-#: articlewidget.cpp:793
+#: articlewidget.cpp:801
 msgid "The signature is valid, but the key is untrusted."
 msgstr "Mae'r llofnod yn ddilys, ond nid oes ymddiriedaeth yn yr allwedd"
 
-#: articlewidget.cpp:797
+#: articlewidget.cpp:805
 msgid "Warning: The signature is bad."
 msgstr "Rhybudd: Mae'r llofnod yn fudr."
 
-#: articlewidget.cpp:814
+#: articlewidget.cpp:822
 msgid "End of signed message"
 msgstr "Diwedd y neges lofnodedig"
 
-#: articlewidget.cpp:830
+#: articlewidget.cpp:838
 msgid "unnamed"
 msgstr "di-enw"
 
-#: articlewidget.cpp:1024
+#: articlewidget.cpp:1032
 #, fuzzy
 msgid ""
 "An error occurred while downloading the article source:\n"
 msgstr "Bu gwallau wrth ddanfon yr erthyglau hyn:"
 
-#: articlewidget.cpp:1380 kncomposer.cpp:1218
+#: articlewidget.cpp:1389 kncomposer.cpp:1218
 msgid "Select Charset"
 msgstr "Dewis y Set Nodau"
 
@@ -1114,6 +1115,11 @@ msgstr "Yc&hwanegu..."
 msgid "Suggestions"
 msgstr "Cwestiwn"
 
+#: kncomposer.cpp:2072
+#, fuzzy
+msgid "No Suggestions"
+msgstr "Cwestiwn"
+
 #: kncomposer.cpp:2498
 msgid "Type"
 msgstr "Math"
@@ -2666,7 +2672,8 @@ msgid " Ready"
 msgstr "Parod"
 
 #: knmainwidget.cpp:354
-msgid "TDE News Reader"
+#, fuzzy
+msgid "KDE News Reader"
 msgstr "Darllenydd Newyddion TDE"
 
 #: knmainwidget.cpp:552
diff --git a/tde-i18n-cy/messages/tdepim/knotes.po b/tde-i18n-cy/messages/tdepim/knotes.po
index f2f0bf44df2..caa62d9b93e 100644
--- a/tde-i18n-cy/messages/tdepim/knotes.po
+++ b/tde-i18n-cy/messages/tdepim/knotes.po
@@ -10,10 +10,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: knotes\n"
-"POT-Creation-Date: 2008-01-26 01:19+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2004-01-08 21:36+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -88,41 +89,41 @@ msgstr "I'r Penbwrdd"
 msgid "Walk Through Notes"
 msgstr ""
 
-#: knote.cpp:379
+#: knote.cpp:396
 msgid "<qt>Do you really want to delete note <b>%1</b>?</qt>"
 msgstr "<qt>A ydych wir am ddileu'r nodyn <b>%1</b>?</qt>"
 
-#: knote.cpp:380
+#: knote.cpp:397
 msgid "Confirm Delete"
 msgstr "Cadarnhau Dileu"
 
-#: knote.cpp:690
+#: knote.cpp:711
 msgid "Please enter the new name:"
 msgstr "Rhowch yr enw newydd o.g.y.dd.:"
 
-#: knote.cpp:762
+#: knote.cpp:804
 msgid "Send \"%1\""
 msgstr "Anfon « %1 »"
 
-#: knote.cpp:771
+#: knote.cpp:814
 msgid "The host cannot be empty."
 msgstr ""
 
-#: knote.cpp:800
+#: knote.cpp:843
 msgid "Unable to start the mail process."
 msgstr "MEthu dechrau'r broses ebost."
 
-#: knote.cpp:829
+#: knote.cpp:871
 msgid "Save note as plain text"
 msgstr ""
 
-#: knote.cpp:844
+#: knote.cpp:890
 msgid ""
 "<qt>A file named <b>%1</b> already exists."
 "<br>Are you sure you want to overwrite it?</qt>"
 msgstr ""
 
-#: knote.cpp:933
+#: knote.cpp:981
 msgid "&All Desktops"
 msgstr "&Pob Penbwrdd"
 
@@ -272,79 +273,87 @@ msgstr "&Porth:"
 msgid "&Style:"
 msgstr "&Arddull:"
 
-#: knoteedit.cpp:69
+#: knoteedit.cpp:71
 msgid "Bold"
 msgstr "Trwm"
 
-#: knoteedit.cpp:73
+#: knoteedit.cpp:75
 msgid "Underline"
 msgstr "Tanlinellu"
 
-#: knoteedit.cpp:75
+#: knoteedit.cpp:77
 msgid "Strike Out"
 msgstr "Trwylinellu"
 
-#: knoteedit.cpp:83
+#: knoteedit.cpp:85
 msgid "Align Left"
 msgstr "Alinio Chwith"
 
-#: knoteedit.cpp:87
+#: knoteedit.cpp:89
 msgid "Align Center"
 msgstr "Alinio i'r Canol"
 
-#: knoteedit.cpp:90
+#: knoteedit.cpp:92
 msgid "Align Right"
 msgstr "Alinio Dde"
 
-#: knoteedit.cpp:93
+#: knoteedit.cpp:95
 msgid "Align Block"
 msgstr "Alinio'r Bloc"
 
-#: knoteedit.cpp:102
+#: knoteedit.cpp:104
 msgid "List"
 msgstr "Rhestr"
 
-#: knoteedit.cpp:108
+#: knoteedit.cpp:110
 msgid "Superscript"
 msgstr "Uwchysgrif"
 
-#: knoteedit.cpp:111
+#: knoteedit.cpp:113
 msgid "Subscript"
 msgstr "Isysgrif"
 
-#: knoteedit.cpp:130
+#: knoteedit.cpp:132
 msgid "Text Color..."
 msgstr "Lliw Testun..."
 
-#: knoteedit.cpp:133
+#: knoteedit.cpp:135
 msgid "Text Font"
 msgstr "Wynebfath y testun"
 
-#: knoteedit.cpp:138
+#: knoteedit.cpp:140
 msgid "Text Size"
 msgstr "Maint testun"
 
+#: knoteedit.cpp:543
+msgid "Check Spelling..."
+msgstr ""
+
+#: knoteedit.cpp:550
+msgid "Allow Tabulations"
+msgstr ""
+
 #: knotehostdlg.cpp:53
 msgid "Hostname or IP address:"
 msgstr ""
 
-#: knoteprinter.cpp:117
+#: knoteprinter.cpp:120
 #, c-format
 msgid "Print %1"
 msgstr "Argraffu %1"
 
-#: knoteprinter.cpp:133
+#: knoteprinter.cpp:136
 #, c-format
 msgid ""
 "_n: Print Note\n"
 "Print %n notes"
 msgstr ""
 
-#: knotesalarm.cpp:74
+#: knotesalarm.cpp:75
 msgid "The following notes triggered alarms:"
 msgstr ""
 
-#: knotesalarm.cpp:74
+#: knotesalarm.cpp:75
 msgid "Alarm"
 msgstr "Larwm"
 
@@ -378,11 +387,11 @@ msgstr "Dim Nodiadau"
 msgid "Hide All Notes"
 msgstr ""
 
-#: knotesapp.cpp:544
+#: knotesapp.cpp:567
 msgid "Settings"
 msgstr "Gosodiadau"
 
-#: knotesapp.cpp:686
+#: knotesapp.cpp:734
 msgid "No Notes"
 msgstr "Dim Nodiadau"
 
@@ -415,7 +424,8 @@ msgid "Original KNotes Author"
 msgstr "Awdur Gwreiddiol KNotes"
 
 #: main.cpp:104
-msgid "Ported KNotes to TDE 2"
+#, fuzzy
+msgid "Ported KNotes to KDE 2"
 msgstr "Porthodd KNotes i TDE 2"
 
 #: main.cpp:105
@@ -423,7 +433,7 @@ msgid "Network Interface"
 msgstr "Rhyngwyneb Rhwydwaith"
 
 #: main.cpp:106
-msgid "Started TDE Resource Framework Integration"
+msgid "Started KDE Resource Framework Integration"
 msgstr ""
 
 #: main.cpp:108
diff --git a/tde-i18n-cy/messages/tdepim/konsolekalendar.po b/tde-i18n-cy/messages/tdepim/konsolekalendar.po
index 69a1e2d0aa2..15d388621c6 100644
--- a/tde-i18n-cy/messages/tdepim/konsolekalendar.po
+++ b/tde-i18n-cy/messages/tdepim/konsolekalendar.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: konsolekalendar\n"
-"POT-Creation-Date: 2006-06-07 04:03+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2004-02-25 13:50+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -29,74 +30,74 @@ msgid ""
 "Your emails"
 msgstr "kyfieithu@dotmon.com"
 
-#: konsolekalendar.cpp:85
+#: konsolekalendar.cpp:86
 #, fuzzy, c-format
 msgid "Create Calendar <Dry Run>: %1"
 msgstr "Newid Digwyddiad <Rhediad Ffug>:"
 
-#: konsolekalendar.cpp:95
+#: konsolekalendar.cpp:96
 #, fuzzy, c-format
 msgid "Create Calendar <Verbose>: %1"
 msgstr "Mewnosod Digwyddiad <Amleiriog>:"
 
-#: konsolekalendar.cpp:116
+#: konsolekalendar.cpp:117
 msgid "View Events <Dry Run>:"
 msgstr "Gweld Digwyddiadau <Rhediad Ffug>:"
 
-#: konsolekalendar.cpp:144
+#: konsolekalendar.cpp:145
 msgid "View Event <Verbose>:"
 msgstr "Gweld Digwyddiad <Amleiriog>:"
 
-#: konsolekalendar.cpp:246
+#: konsolekalendar.cpp:247
 msgid "Sorry, export to HTML by UID is not supported yet"
 msgstr "Ni chynhelir allforio drwy HTML gan UID eto"
 
-#: konsolekalendar.cpp:269
+#: konsolekalendar.cpp:270
 msgid "Events:"
 msgstr "Digwyddiadau:"
 
-#: konsolekalendar.cpp:273
+#: konsolekalendar.cpp:274
 #, c-format
 msgid "Events: %1"
 msgstr "Digwyddiadau : %1"
 
-#: konsolekalendar.cpp:276
+#: konsolekalendar.cpp:277
 msgid "Events: %1 - %2"
 msgstr ""
 
-#: konsolekalendar.cpp:436 konsolekalendaradd.cpp:144
+#: konsolekalendar.cpp:437 konsolekalendaradd.cpp:144
 #: konsolekalendarchange.cpp:134 konsolekalendarchange.cpp:161
 #: konsolekalendardelete.cpp:99
 #, fuzzy, c-format
 msgid "  What:  %1"
 msgstr "Beth:"
 
-#: konsolekalendar.cpp:440 konsolekalendaradd.cpp:148
+#: konsolekalendar.cpp:441 konsolekalendaradd.cpp:148
 #: konsolekalendarchange.cpp:138 konsolekalendarchange.cpp:165
 #: konsolekalendardelete.cpp:103
 #, fuzzy, c-format
 msgid "  Begin: %1"
 msgstr "Dechrau:"
 
-#: konsolekalendar.cpp:444 konsolekalendaradd.cpp:152
+#: konsolekalendar.cpp:445 konsolekalendaradd.cpp:152
 #: konsolekalendarchange.cpp:142 konsolekalendarchange.cpp:169
 #: konsolekalendardelete.cpp:107
 #, fuzzy, c-format
 msgid "  End:   %1"
 msgstr "Diwedd:"
 
-#: konsolekalendar.cpp:449 konsolekalendaradd.cpp:157
+#: konsolekalendar.cpp:450 konsolekalendaradd.cpp:157
 msgid "  No Time Associated with Event"
 msgstr "Dim Amser wedi'i Gysylltu efo'r Digwyddiad"
 
-#: konsolekalendar.cpp:453 konsolekalendaradd.cpp:161
+#: konsolekalendar.cpp:454 konsolekalendaradd.cpp:161
 #: konsolekalendarchange.cpp:146 konsolekalendarchange.cpp:173
 #: konsolekalendardelete.cpp:111
 #, fuzzy, c-format
 msgid "  Desc:  %1"
 msgstr "Disgrifiad:"
 
-#: konsolekalendar.cpp:457 konsolekalendaradd.cpp:165
+#: konsolekalendar.cpp:458 konsolekalendaradd.cpp:165
 #: konsolekalendarchange.cpp:150 konsolekalendarchange.cpp:177
 #: konsolekalendardelete.cpp:115
 #, c-format
diff --git a/tde-i18n-cy/messages/tdepim/kontact.po b/tde-i18n-cy/messages/tdepim/kontact.po
index 52659dbc3d4..28b73830d9e 100644
--- a/tde-i18n-cy/messages/tdepim/kontact.po
+++ b/tde-i18n-cy/messages/tdepim/kontact.po
@@ -10,10 +10,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kontact\n"
-"POT-Creation-Date: 2008-07-24 01:19+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2004-01-09 10:24+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -65,27 +66,27 @@ msgstr "<p><b>Cyfieithwyr:</b></p>"
 msgid "%1 License"
 msgstr "%1 trwydded"
 
-#: src/iconsidepane.cpp:456
+#: src/iconsidepane.cpp:447
 msgid "Icon Size"
 msgstr "Maint Eicon"
 
-#: src/iconsidepane.cpp:457
+#: src/iconsidepane.cpp:448
 msgid "Large"
 msgstr "Mawr"
 
-#: src/iconsidepane.cpp:459
+#: src/iconsidepane.cpp:450
 msgid "Normal"
 msgstr "Arferol"
 
-#: src/iconsidepane.cpp:461
+#: src/iconsidepane.cpp:452
 msgid "Small"
 msgstr "Bach"
 
-#: src/iconsidepane.cpp:467
+#: src/iconsidepane.cpp:458
 msgid "Show Icons"
 msgstr "Dangos eiconau"
 
-#: src/iconsidepane.cpp:470
+#: src/iconsidepane.cpp:461
 msgid "Show Text"
 msgstr ""
 
@@ -93,7 +94,7 @@ msgstr ""
 msgid "kontactconfig"
 msgstr "kontactconfig"
 
-#: src/kcmkontact.cpp:92 src/mainwindow.cpp:292
+#: src/kcmkontact.cpp:92 src/mainwindow.cpp:301
 msgid "TDE Kontact"
 msgstr "Kyswllt TDE"
 
@@ -101,99 +102,102 @@ msgstr "Kyswllt TDE"
 msgid "(c), 2003 Cornelius Schumacher"
 msgstr "(h)(c) 2003 Cornelius Schumacher"
 
-#: src/main.cpp:47
+#: src/main.cpp:48
 #, fuzzy
 msgid "TDE personal information manager"
 msgstr "Trefnydd Gwybodaeth Bersonol TDE"
 
-#: src/main.cpp:125
+#: src/main.cpp:147
 msgid "Kontact"
 msgstr "Kyswllt"
 
-#: src/main.cpp:126
+#: src/main.cpp:148
 #, fuzzy
-msgid "(C) 2001-2008 The Kontact developers"
+msgid ""
+"(C) 2008-2010 The Trinity Desktop Project\n"
+"(C) 2001-2008 The Kontact developers"
 msgstr "(C) 2001-2003 Y datblygwyr Kyswllt"
 
-#: src/main.cpp:135
+#: src/main.cpp:157
 msgid "Original Author"
 msgstr "Awdur Gwreiddiol"
 
-#: src/mainwindow.cpp:100
+#: src/mainwindow.cpp:101
 #, fuzzy
 msgid "Select Components ..."
 msgstr "Dewis Cydrannau ..."
 
-#: src/mainwindow.cpp:260
+#: src/mainwindow.cpp:139
+#, c-format
+msgid "Switch to plugin %1"
+msgstr ""
+
+#: src/mainwindow.cpp:269
 msgid ""
 "<h2 style='text-align:center; margin-top: 0px; margin-bottom: 0px'>%1</h2>"
 msgstr ""
 
-#: src/mainwindow.cpp:261
+#: src/mainwindow.cpp:270
 #, fuzzy
 msgid "Loading Kontact..."
 msgstr "Ffurfweddu Kyswllt..."
 
-#: src/mainwindow.cpp:271
+#: src/mainwindow.cpp:280
 msgid " Initializing..."
 msgstr "Ymgychwyn..."
 
-#: src/mainwindow.cpp:293
+#: src/mainwindow.cpp:302
 msgid "Get Organized!"
 msgstr ""
 
-#: src/mainwindow.cpp:294
+#: src/mainwindow.cpp:303
 #, fuzzy
 msgid "The TDE Personal Information Management Suite"
 msgstr "Trefnydd Gwybodaeth Bersonol TDE"
 
-#: src/mainwindow.cpp:328
+#: src/mainwindow.cpp:337
 msgid "New"
 msgstr "Newydd"
 
-#: src/mainwindow.cpp:337
+#: src/mainwindow.cpp:346
 #, fuzzy
 msgid "Synchronize"
 msgstr "Maint Eicon"
 
-#: src/mainwindow.cpp:341
+#: src/mainwindow.cpp:350
 msgid "Configure Kontact..."
 msgstr "Ffurfweddu Kyswllt..."
 
-#: src/mainwindow.cpp:344
+#: src/mainwindow.cpp:353
 #, fuzzy
 msgid "Configure &Profiles..."
 msgstr "Golwg Grynodeb Kyswllt"
 
-#: src/mainwindow.cpp:347
+#: src/mainwindow.cpp:356
 #, fuzzy
 msgid "&Kontact Introduction"
 msgstr "Cymhwysiad Cynnwys Kyswllt"
 
-#: src/mainwindow.cpp:349
+#: src/mainwindow.cpp:358
 msgid "&Tip of the Day"
 msgstr "&Cynghoryn y Dydd..."
 
-#: src/mainwindow.cpp:351
-msgid "&Request Feature..."
-msgstr ""
-
-#: src/mainwindow.cpp:683
+#: src/mainwindow.cpp:784
 msgid "Application is running standalone. Foregrounding..."
 msgstr "Mae'r cymhwysiad yn rhedeg yn unigol.  Blaendiro..."
 
-#: src/mainwindow.cpp:695
+#: src/mainwindow.cpp:796
 #, fuzzy, c-format
 msgid "Cannot load part for %1."
 msgstr "Methu llwytho Part ar gyfer %1"
 
-#: src/mainwindow.cpp:749
+#: src/mainwindow.cpp:851
 msgid ""
 "_: Plugin dependent window title\n"
 "%1 - Kontact"
 msgstr "%1 - Kyswllt"
 
-#: src/mainwindow.cpp:1062
+#: src/mainwindow.cpp:1170
 msgid ""
 "<h2 style='text-align:center; margin-top: 0px;'>Welcome to Kontact %1</h2>"
 "<p>%1</p><table align=\"center\">"
@@ -212,32 +216,32 @@ msgid ""
 "0px\"> <a href=\"%1\">Skip this introduction</a></p>"
 msgstr ""
 
-#: src/mainwindow.cpp:1074
+#: src/mainwindow.cpp:1182
 msgid ""
 "Kontact handles your e-mail, addressbook, calendar, to-do list and more."
 msgstr ""
 
-#: src/mainwindow.cpp:1080
+#: src/mainwindow.cpp:1188
 msgid "Read Manual"
 msgstr ""
 
-#: src/mainwindow.cpp:1081
+#: src/mainwindow.cpp:1189
 msgid "Learn more about Kontact and its components"
 msgstr ""
 
-#: src/mainwindow.cpp:1087
+#: src/mainwindow.cpp:1195
 msgid "Visit Kontact Website"
 msgstr ""
 
-#: src/mainwindow.cpp:1088
+#: src/mainwindow.cpp:1196
 msgid "Access online resources and tutorials"
 msgstr ""
 
-#: src/mainwindow.cpp:1094
+#: src/mainwindow.cpp:1202
 msgid "Configure Kontact as Groupware Client"
 msgstr ""
 
-#: src/mainwindow.cpp:1095
+#: src/mainwindow.cpp:1203
 msgid "Prepare Kontact for use in corporate networks"
 msgstr ""
 
@@ -360,6 +364,14 @@ msgstr ""
 msgid "List all possible modules and exit"
 msgstr ""
 
+#: interfaces/uniqueapphandler.cpp:191
+msgid "List all possible profiles and exit"
+msgstr ""
+
+#: interfaces/uniqueapphandler.cpp:192
+msgid "Start with a specific Kontact profile"
+msgstr ""
+
 #: plugins/akregator/akregator_plugin.cpp:57
 #: plugins/newsticker/kcmkontactknt.cpp:380
 #, fuzzy
@@ -379,16 +391,16 @@ msgstr ""
 msgid "Synchronize Contacts"
 msgstr "Gweld &Cyswllt"
 
-#: plugins/kaddressbook/kaddressbook_plugin.cpp:160
-#: plugins/korganizer/korganizerplugin.cpp:194
-#: plugins/korganizer/todoplugin.cpp:208
+#: plugins/kaddressbook/kaddressbook_plugin.cpp:159
+#: plugins/korganizer/korganizerplugin.cpp:219
+#: plugins/korganizer/todoplugin.cpp:210
 #, fuzzy
 msgid "Drops of multiple mails are not supported."
 msgstr "Ni chynhelir gostwng aml ebostiau."
 
-#: plugins/kaddressbook/kaddressbook_plugin.cpp:174
-#: plugins/korganizer/korganizerplugin.cpp:211
-#: plugins/korganizer/todoplugin.cpp:226
+#: plugins/kaddressbook/kaddressbook_plugin.cpp:173
+#: plugins/korganizer/korganizerplugin.cpp:236
+#: plugins/korganizer/todoplugin.cpp:228
 #, fuzzy
 msgid "Cannot handle drop events of type '%1'."
 msgstr "Methu trin digwyddiadau gollwng o'r math '%1'."
@@ -595,22 +607,28 @@ msgstr ""
 msgid "Show today's to-dos only"
 msgstr ""
 
-#: plugins/korganizer/korganizerplugin.cpp:63
+#: plugins/korganizer/korganizerplugin.cpp:67
 msgid "New Event..."
 msgstr "Digwyddiad Newydd ..."
 
-#: plugins/korganizer/korganizerplugin.cpp:67
+#: plugins/korganizer/korganizerplugin.cpp:71
 #, fuzzy
 msgid "Synchronize Calendar"
 msgstr "Calendr Gweithredol"
 
-#: plugins/korganizer/korganizerplugin.cpp:179
-#: plugins/korganizer/todoplugin.cpp:180
+#: plugins/korganizer/korganizerplugin.cpp:184
+#: plugins/korganizer/todoplugin.cpp:176
 msgid "Meeting"
 msgstr "Cyfarfod"
 
-#: plugins/korganizer/korganizerplugin.cpp:197
-#: plugins/korganizer/todoplugin.cpp:211
+#: plugins/korganizer/korganizerplugin.cpp:198
+#: plugins/korganizer/todoplugin.cpp:190
+#, fuzzy, c-format
+msgid "Note: %1"
+msgstr "Nodau"
+
+#: plugins/korganizer/korganizerplugin.cpp:222
+#: plugins/korganizer/todoplugin.cpp:213
 msgid ""
 "From: %1\n"
 "To: %2\n"
@@ -620,8 +638,8 @@ msgstr ""
 "I: %2\n"
 "Pwnc: %3"
 
-#: plugins/korganizer/korganizerplugin.cpp:205
-#: plugins/korganizer/todoplugin.cpp:220
+#: plugins/korganizer/korganizerplugin.cpp:230
+#: plugins/korganizer/todoplugin.cpp:222
 #, c-format
 msgid "Mail: %1"
 msgstr "Ebost: %1"
@@ -630,23 +648,23 @@ msgstr "Ebost: %1"
 msgid "Calendar"
 msgstr "Calendr"
 
-#: plugins/korganizer/summarywidget.cpp:173
+#: plugins/korganizer/summarywidget.cpp:164
 #: plugins/specialdates/sdsummarywidget.cpp:445
 msgid "Today"
 msgstr "Heddiw"
 
-#: plugins/korganizer/summarywidget.cpp:177
+#: plugins/korganizer/summarywidget.cpp:168
 #: plugins/specialdates/sdsummarywidget.cpp:447
 msgid "Tomorrow"
 msgstr "Yfory"
 
-#: plugins/korganizer/summarywidget.cpp:236
+#: plugins/korganizer/summarywidget.cpp:227
 msgid ""
 "_: Time from - to\n"
 "%1 - %2"
 msgstr "%1 - %2"
 
-#: plugins/korganizer/summarywidget.cpp:252
+#: plugins/korganizer/summarywidget.cpp:243
 #, fuzzy, c-format
 msgid ""
 "_n: No appointments pending within the next day\n"
@@ -655,17 +673,17 @@ msgstr ""
 "Dim penblwyddi neu ddathliadau yn y diwrnod nesaf\n"
 "Dim penblwyddi neu ddathliadau yn %n o ddiwrnodau nesaf"
 
-#: plugins/korganizer/summarywidget.cpp:281
+#: plugins/korganizer/summarywidget.cpp:272
 #, fuzzy
 msgid "&Edit Appointment..."
 msgstr "Apwyntiadau"
 
-#: plugins/korganizer/summarywidget.cpp:283
+#: plugins/korganizer/summarywidget.cpp:274
 #, fuzzy
 msgid "&Delete Appointment"
 msgstr "Apwyntiadau"
 
-#: plugins/korganizer/summarywidget.cpp:300
+#: plugins/korganizer/summarywidget.cpp:291
 #, fuzzy
 msgid "Edit Appointment: \"%1\""
 msgstr "Apwyntiadau"
@@ -678,52 +696,47 @@ msgstr "I'w-Wneud newydd..."
 msgid "Synchronize To-do List"
 msgstr ""
 
-#: plugins/korganizer/todoplugin.cpp:192
-#, fuzzy, c-format
-msgid "Note: %1"
-msgstr "Nodau"
-
 #: plugins/korganizer/todosummarywidget.cpp:63
 #, fuzzy
 msgid "To-do"
 msgstr "I-Wneud Newydd"
 
-#: plugins/korganizer/todosummarywidget.cpp:117
+#: plugins/korganizer/todosummarywidget.cpp:116
 msgid "overdue"
 msgstr ""
 
-#: plugins/korganizer/todosummarywidget.cpp:125
+#: plugins/korganizer/todosummarywidget.cpp:124
 msgid "in progress"
 msgstr ""
 
-#: plugins/korganizer/todosummarywidget.cpp:131
+#: plugins/korganizer/todosummarywidget.cpp:130
 msgid "starts today"
 msgstr ""
 
-#: plugins/korganizer/todosummarywidget.cpp:137
+#: plugins/korganizer/todosummarywidget.cpp:136
 msgid "ends today"
 msgstr ""
 
-#: plugins/korganizer/todosummarywidget.cpp:188
+#: plugins/korganizer/todosummarywidget.cpp:187
 #, fuzzy
 msgid "No to-dos pending"
 msgstr "Dim apwyntiadau sy'n disgwyl"
 
-#: plugins/korganizer/todosummarywidget.cpp:230
+#: plugins/korganizer/todosummarywidget.cpp:229
 #, fuzzy
 msgid "&Edit To-do..."
 msgstr "I'w-Wneud newydd..."
 
-#: plugins/korganizer/todosummarywidget.cpp:232
+#: plugins/korganizer/todosummarywidget.cpp:231
 #, fuzzy
 msgid "&Delete To-do"
 msgstr "Dileu'r Porthiant"
 
-#: plugins/korganizer/todosummarywidget.cpp:236
+#: plugins/korganizer/todosummarywidget.cpp:235
 msgid "&Mark To-do Completed"
 msgstr ""
 
-#: plugins/korganizer/todosummarywidget.cpp:257
+#: plugins/korganizer/todosummarywidget.cpp:256
 msgid "Edit To-do: \"%1\""
 msgstr ""
 
@@ -825,7 +838,7 @@ msgstr ""
 msgid "New News Feed"
 msgstr ""
 
-#: plugins/knotes/knotes_part_p.h:136 plugins/newsticker/kcmkontactknt.cpp:66
+#: plugins/knotes/knotes_part_p.h:137 plugins/newsticker/kcmkontactknt.cpp:66
 msgid "Name:"
 msgstr "Enw:"
 
@@ -912,7 +925,7 @@ msgid "Copy URL to Clipboard"
 msgstr "Copïo URL i'r Clipfwrdd"
 
 #: plugins/specialdates/kcmsdsummary.cpp:90
-#: plugins/specialdates/specialdates_plugin.cpp:59
+#: plugins/specialdates/specialdates_plugin.cpp:61
 msgid "Special Dates Summary"
 msgstr ""
 
@@ -974,19 +987,19 @@ msgstr "Adnodd rhagosod KTrefnydd"
 msgid "Active Calendar"
 msgstr "Calendr Gweithredol"
 
-#: plugins/specialdates/sdsummarywidget.cpp:289
+#: plugins/specialdates/sdsummarywidget.cpp:290
 msgid "BIRTHDAY"
 msgstr "PENBLWYDD"
 
-#: plugins/specialdates/sdsummarywidget.cpp:304
+#: plugins/specialdates/sdsummarywidget.cpp:305
 msgid "ANNIVERSARY"
 msgstr "DATHLIAD"
 
-#: plugins/specialdates/sdsummarywidget.cpp:319
+#: plugins/specialdates/sdsummarywidget.cpp:320
 msgid "HOLIDAY"
 msgstr "GŴYL"
 
-#: plugins/specialdates/sdsummarywidget.cpp:337
+#: plugins/specialdates/sdsummarywidget.cpp:338
 msgid "SPECIAL OCCASION"
 msgstr "ACHLYSUR ARBENNIG"
 
@@ -1050,13 +1063,13 @@ msgstr "Gweld &Cyswllt"
 msgid "Mail to:\"%1\""
 msgstr "Ebost i %1"
 
-#: plugins/specialdates/specialdates_plugin.cpp:61
+#: plugins/specialdates/specialdates_plugin.cpp:63
 #, fuzzy
 msgid "Kontact Special Dates Summary"
 msgstr "Crynodeb Kyswllt"
 
-#: plugins/specialdates/specialdates_plugin.cpp:63
-msgid "(c) 2004-2005 The TDE PIM Team"
+#: plugins/specialdates/specialdates_plugin.cpp:65
+msgid "(c) 2004-2005 The KDE PIM Team"
 msgstr ""
 
 #: plugins/summary/kcmkontactsummary.cpp:98
@@ -1096,15 +1109,15 @@ msgstr "Beth sydd nesaf?"
 msgid "Synchronize All"
 msgstr ""
 
-#: plugins/summary/summaryview_plugin.cpp:109
+#: plugins/summary/summaryview_plugin.cpp:112
 msgid "Kontact Summary"
 msgstr "Crynodeb Kyswllt"
 
-#: plugins/summary/summaryview_plugin.cpp:111
+#: plugins/summary/summaryview_plugin.cpp:114
 msgid "Kontact Summary View"
 msgstr "Golwg Grynodeb Kyswllt"
 
-#: plugins/summary/summaryview_plugin.cpp:113
+#: plugins/summary/summaryview_plugin.cpp:116
 msgid "(c) 2003 The Kontact developers"
 msgstr "(c) 2003 Y datblygwyr Kyswllt"
 
@@ -1143,7 +1156,7 @@ msgstr "Gwybodaeth Dywydd"
 msgid "Improvements and more code cleanups"
 msgstr "Gwelliannau a mwy o lanhadau côd"
 
-#: plugins/knotes/knotes_part_p.h:121
+#: plugins/knotes/knotes_part_p.h:122
 msgid "Edit Note"
 msgstr ""
 
diff --git a/tde-i18n-cy/messages/tdepim/korganizer.po b/tde-i18n-cy/messages/tdepim/korganizer.po
index efaa42fa534..f302a4e487e 100644
--- a/tde-i18n-cy/messages/tdepim/korganizer.po
+++ b/tde-i18n-cy/messages/tdepim/korganizer.po
@@ -10,46 +10,29 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: korganizer\n"
-"POT-Creation-Date: 2008-08-19 01:19+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2004-02-25 13:53+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.2\n"
 
-#: actionmanager.cpp:467 actionmanager.cpp:1447 actionmanager.cpp:1475
-#: koeventpopupmenu.cpp:52 kotodoview.cpp:453
-msgid "&Show"
-msgstr "&Dangos"
-
-#: actionmanager.cpp:470 actionmanager.cpp:1448 actionmanager.cpp:1476
-#: koeventpopupmenu.cpp:54 kotodoview.cpp:455 resourceview.cpp:599
-msgid "&Edit..."
-msgstr "&Golygu..."
-
-#: koeventpopupmenu.cpp:76
-#, fuzzy
-msgid "&Toggle Reminder"
-msgstr "&Atgof:"
-
-#: koeventpopupmenu.cpp:81
-#, fuzzy
-msgid "&Dissociate This Occurrence"
-msgstr "Rhestri digwyddiadau'r diwrnod cyfredol"
-
-#: koeventpopupmenu.cpp:84
-#, fuzzy
-msgid "&Dissociate Future Occurrences"
-msgstr "Rhestri digwyddiadau'r diwrnod cyfredol"
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "KGyfieithu"
 
-#: koeventpopupmenu.cpp:88
-#, fuzzy
-msgid "Send as iCalendar..."
-msgstr "&iCalendr..."
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "kyfieithu@dotmon.com"
 
-#: koeditordetails.cpp:194
+#: koeditordetails.cpp:192
 msgid ""
 "Displays information about current attendees. To edit an attendee, select it in "
 "this list and modify the values in the area below. Clicking on a column title "
@@ -58,93 +41,1370 @@ msgid ""
 msgstr ""
 
 #. i18n: file publishdialog_base.ui line 28
-#: koeditordetails.cpp:201 koprefsdialog.cpp:1063 rc.cpp:417 rc.cpp:1859
+#: koeditordetails.cpp:199 koprefsdialog.cpp:1106 rc.cpp:420 rc.cpp:2162
 #, no-c-format
 msgid "Name"
 msgstr "Enw"
 
-#. i18n: file koeditoralarms_base.ui line 282
-#: koeditoralarms.cpp:89 koeditordetails.cpp:202 koprefsdialog.cpp:865
-#: rc.cpp:223 rc.cpp:420 rc.cpp:1862 rc.cpp:1937
+#. i18n: file koeditoralarms_base.ui line 288
+#: koeditoralarms.cpp:119 koeditordetails.cpp:200 koprefsdialog.cpp:903
+#: rc.cpp:223 rc.cpp:423 rc.cpp:2120 rc.cpp:2165
 #, no-c-format
 msgid "Email"
 msgstr "Ebost"
 
-#: koeditordetails.cpp:203
+#: koeditordetails.cpp:201
 msgid "Role"
 msgstr "Rôl"
 
-#: koeditordetails.cpp:204
+#: koeditordetails.cpp:202
 msgid "Status"
 msgstr "Cyflwr"
 
-#: koeditordetails.cpp:205
+#: koeditordetails.cpp:203
 msgid "RSVP"
 msgstr "RSVP"
 
-#: koeditordetails.cpp:206
+#: koeditordetails.cpp:204
 #, fuzzy
 msgid "Delegated to"
 msgstr "Dileu I'w-Wneud"
 
-#: koeditordetails.cpp:207
+#: koeditordetails.cpp:205
 #, fuzzy
 msgid "Delegated from"
 msgstr "Dileu I'w-Wneud"
 
-#: koeditordetails.cpp:311 koeditorfreebusy.cpp:760
+#: koeditordetails.cpp:331 koeditorfreebusy.cpp:785
 msgid ""
 "%1 does not look like a valid email address. Are you sure you want to invite "
 "this participant?"
 msgstr ""
 
-#: koeditordetails.cpp:313 koeditorfreebusy.cpp:762
+#: koeditordetails.cpp:333 koeditorfreebusy.cpp:787
 #, fuzzy
 msgid "Invalid email address"
 msgstr "Cyfeiriad ebost ychwanegol:"
 
-#: koviewmanager.cpp:334
+#: koprefs.cpp:87
+msgid ""
+"_: Default export file\n"
+"calendar.html"
+msgstr "calendar.html"
+
+#: koprefs.cpp:162
+msgid "Appointment"
+msgstr "Apwyntiad"
+
+#: koprefs.cpp:162
+msgid "Business"
+msgstr "Busnes"
+
+#: koprefs.cpp:163
+msgid "Meeting"
+msgstr "Cyfarfod"
+
+#: koprefs.cpp:163
+msgid "Phone Call"
+msgstr "Galwad Ffôn"
+
+#: koprefs.cpp:163
+msgid "Education"
+msgstr "Addysg"
+
+#: koprefs.cpp:164 printing/calprintpluginbase.cpp:286
+msgid "Holiday"
+msgstr "Gŵyl"
+
+#: koprefs.cpp:164
+msgid "Vacation"
+msgstr "Gwyliau"
+
+#: koprefs.cpp:164
+msgid "Special Occasion"
+msgstr "Achlysur Arbennig"
+
+#: koprefs.cpp:165
+msgid "Personal"
+msgstr "Personol"
+
+#: koprefs.cpp:165
+msgid "Travel"
+msgstr "Teithio"
+
+#: koprefs.cpp:166
+msgid "Birthday"
+msgstr "Penblwydd"
+
+#: koeventviewer.cpp:63
+msgid "Open the message in KMail"
+msgstr ""
+
+#: koeventviewer.cpp:65
+#, fuzzy, c-format
+msgid "Send an email message to %1"
+msgstr "Negeseuon i mewn: %1"
+
+#: koeventviewer.cpp:67
+msgid "Lookup the contact in KAddressbook"
+msgstr ""
+
+#: koeventviewer.cpp:73
 #, fuzzy
-msgid "Merged calendar"
-msgstr "Calendr '%1' wedi ei gyfuno."
+msgid "View attachment \"%1\""
+msgstr "Golygu Atodiad"
 
-#: koviewmanager.cpp:336
-msgid "Calendars Side by Side"
+#: koeventviewer.cpp:76
+msgid "Launch a viewer on the link"
 msgstr ""
 
-#: filtereditdialog.cpp:51
-msgid "Edit Calendar Filters"
-msgstr "Golygu Hidlennau Calendr"
+#: koeventviewer.cpp:175
+#, fuzzy
+msgid "Open Attachment"
+msgstr "Ychwanegu Atodiad"
 
-#: filtereditdialog.cpp:99
-msgid "Press this button to define a new filter."
+#: koeventviewer.cpp:176
+#, fuzzy
+msgid "Save Attachment As..."
+msgstr "Atodia&dau"
+
+#: koeventviewerdialog.cpp:33
+msgid "Event Viewer"
+msgstr "Gwelydd Digwyddiadau"
+
+#: aboutdata.cpp:32
+msgid "KOrganizer"
+msgstr "KTrefnydd"
+
+#: aboutdata.cpp:33
+msgid "A Personal Organizer for TDE"
+msgstr "Trefnydd Personol ar gyfer TDE"
+
+#: aboutdata.cpp:41
+#, fuzzy
+msgid "Current Developer/Maintainer"
+msgstr "Cynhaliwr Cyfredol"
+
+#: aboutdata.cpp:43
+#, fuzzy
+msgid "Previous maintainer"
+msgstr "Mis Cynt"
+
+#: aboutdata.cpp:45
+#, fuzzy
+msgid "Co-Maintainer"
+msgstr "Cynhaliwr"
+
+#: aboutdata.cpp:47
+msgid "Original Author"
+msgstr "Awdur Gwreiddiol"
+
+#: kdatenavigator.cpp:190
+msgid ""
+"_: start/end week number of line in date picker\n"
+"%1/%2"
 msgstr ""
 
-#: filtereditdialog.cpp:100
-msgid "Press this button to remove the currently active filter."
+#: kotodoviewitem.cpp:140
+msgid "--"
 msgstr ""
 
-#: filtereditdialog.cpp:189
-#, c-format
-msgid "New Filter %1"
-msgstr "Hidlen newydd %1"
+#: koeditorgeneraljournal.cpp:63
+#, fuzzy
+msgid "Sets the title of this journal."
+msgstr "Dileu Hen Ddigwyddiadau"
 
-#: filtereditdialog.cpp:201 koeditorattachments.cpp:377 koeventeditor.cpp:381
-#: kotodoeditor.cpp:327
-msgid "This item will be permanently deleted."
+#: koeditorgeneral.cpp:108 koeditorgeneraljournal.cpp:64
+msgid "T&itle:"
+msgstr "&Teitl:"
+
+#: koeditorgeneraljournal.cpp:83
+msgid "&Date:"
+msgstr "&Dyddiad:"
+
+#: koeditorgeneraljournal.cpp:92
+msgid "&Time: "
+msgstr "&Amser: "
+
+#: koeditorgeneraljournal.cpp:198
+#, fuzzy
+msgid "Please specify a valid date, for example '%1'."
+msgstr "Rhowch ddyddiad diwedd cywir, er engrhaifft '%1'."
+
+#: plugins/datenums/configdialog.cpp:38
+#, fuzzy
+msgid "Configure Day Numbers"
+msgstr "Ffurfweddu Gwyliau"
+
+#: plugins/datenums/configdialog.cpp:45
+#, fuzzy
+msgid "Show Date Number"
+msgstr "Dangos diwrnod Omer"
+
+#: plugins/datenums/configdialog.cpp:48
+#, fuzzy
+msgid "Show day number"
+msgstr "Dangos diwrnod Omer"
+
+#: plugins/datenums/configdialog.cpp:49
+#, fuzzy
+msgid "Show days to end of year"
+msgstr "Dangos diwrnod Omer"
+
+#: plugins/datenums/configdialog.cpp:50
+#, fuzzy
+msgid "Show both"
+msgstr "Dangos"
+
+#: plugins/datenums/datenums.cpp:59
+msgid ""
+"_: dayOfYear / daysTillEndOfYear\n"
+"%1 / %2"
+msgstr "%1 / %2"
+
+#: plugins/datenums/datenums.cpp:71
+msgid "This plugin provides numbers of days and weeks."
+msgstr "Mae'r ategyn yma yn darparu niferau o ddyddiau ac wythnosau."
+
+#: plugins/hebrew/configdialog.cpp:29
+msgid "Configure Holidays"
+msgstr "Ffurfweddu Gwyliau"
+
+#: plugins/hebrew/configdialog.cpp:37
+msgid "Use Israeli holidays"
+msgstr "Defnyddiwch gwyliau Israeli"
+
+#: plugins/hebrew/configdialog.cpp:41
+msgid "Show weekly parsha"
+msgstr "Dangos parsha wythnosol"
+
+#: plugins/hebrew/configdialog.cpp:45
+msgid "Show day of Omer"
+msgstr "Dangos diwrnod Omer"
+
+#: plugins/hebrew/configdialog.cpp:49
+msgid "Show Chol HaMoed"
+msgstr "Dangos Chol HaMoed"
+
+#: plugins/hebrew/holiday.cpp:63
+msgid ""
+"_: 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\n"
+"Sh. HaHodesh"
+msgstr "Sh. HaHodesh"
+
+#: plugins/hebrew/holiday.cpp:69
+msgid "Erev Pesach"
+msgstr "Erev Pesach"
+
+#: plugins/hebrew/holiday.cpp:79
+msgid "Sh. HaGadol"
+msgstr "Sh. HaGadol"
+
+#: plugins/hebrew/holiday.cpp:87
+msgid "Pesach"
+msgstr "Pesach"
+
+#: plugins/hebrew/holiday.cpp:98 plugins/hebrew/holiday.cpp:262
+msgid "Chol Hamoed"
+msgstr "Chol Hamoed"
+
+#: plugins/hebrew/holiday.cpp:103
+msgid "Yom HaShoah"
+msgstr "Yom HaShoah"
+
+#: plugins/hebrew/holiday.cpp:127 plugins/hebrew/holiday.cpp:133
+#: plugins/hebrew/holiday.cpp:144
+msgid "Yom HaAtzmaut"
+msgstr "Yom HaAtzmaut"
+
+#: plugins/hebrew/holiday.cpp:129 plugins/hebrew/holiday.cpp:142
+msgid "Yom HaZikaron"
+msgstr "Yom HaZikaron"
+
+#: plugins/hebrew/holiday.cpp:151
+msgid "Yom Yerushalayim"
+msgstr "Yom Yerushalayim"
+
+#: plugins/hebrew/holiday.cpp:154
+msgid "Lag BaOmer"
+msgstr "Lag BaOmer"
+
+#: plugins/hebrew/holiday.cpp:179
+msgid "Erev Shavuot"
+msgstr "Erev Shavuot"
+
+#: plugins/hebrew/holiday.cpp:184
+msgid "Shavuot"
+msgstr "Shavuot"
+
+#: plugins/hebrew/holiday.cpp:193
+msgid "Tzom Tammuz"
+msgstr "Tzom Tammuz"
+
+#: plugins/hebrew/holiday.cpp:200
+msgid "Sh. Hazon"
+msgstr "Sh. Hazon"
+
+#: plugins/hebrew/holiday.cpp:202
+msgid "Sh. Nahamu"
+msgstr "Sh. Nahamu"
+
+#: plugins/hebrew/holiday.cpp:206
+msgid "Tisha B'Av"
+msgstr "Tisha B'Av"
+
+#: plugins/hebrew/holiday.cpp:211
+msgid "S'lichot"
+msgstr "S'lichot"
+
+#: plugins/hebrew/holiday.cpp:213
+msgid "Erev R.H."
+msgstr "Erev R.H."
+
+#: plugins/hebrew/holiday.cpp:221
+msgid "Rosh Hashana"
+msgstr "Rosh Hashana"
+
+#: plugins/hebrew/holiday.cpp:225 plugins/hebrew/holiday.cpp:238
+msgid "Sh. Shuvah"
+msgstr "Sh. Shuvah"
+
+#: plugins/hebrew/holiday.cpp:227 plugins/hebrew/holiday.cpp:231
+msgid "Tzom Gedalia"
+msgstr "Tzom Gedalia"
+
+#: plugins/hebrew/holiday.cpp:241
+msgid "Erev Y.K."
+msgstr "Erev Y.K."
+
+#: plugins/hebrew/holiday.cpp:244
+msgid "Yom Kippur"
+msgstr "Yom Kippur"
+
+#: plugins/hebrew/holiday.cpp:247
+msgid "Erev Sukkot"
+msgstr "Erev Sukkot"
+
+#: plugins/hebrew/holiday.cpp:253
+msgid "Sukkot"
+msgstr "Sukkot"
+
+#: plugins/hebrew/holiday.cpp:265
+msgid "Hoshana Rabah"
+msgstr "Hoshana Rabah"
+
+#: plugins/hebrew/holiday.cpp:268
+msgid "Shmini Atzeret"
+msgstr "Shmini Atzeret"
+
+#: plugins/hebrew/holiday.cpp:272
+msgid "Simchat Torah"
+msgstr "Simchat Torah"
+
+#: plugins/hebrew/holiday.cpp:281
+msgid "Erev Hanukah"
+msgstr "Erev Hanukah"
+
+#: plugins/hebrew/holiday.cpp:283 plugins/hebrew/holiday.cpp:289
+msgid "Hanukah"
+msgstr "Hanukah"
+
+#: plugins/hebrew/holiday.cpp:293
+msgid "Tzom Tevet"
+msgstr "Tzom Tevet"
+
+#: plugins/hebrew/holiday.cpp:304 plugins/hebrew/holiday.cpp:312
+#: plugins/hebrew/holiday.cpp:316 plugins/hebrew/holiday.cpp:320
+msgid "Sh. Shirah"
+msgstr "Sh. Shirah"
+
+#: plugins/hebrew/holiday.cpp:317
+msgid "Tu B'Shvat"
+msgstr "Tu B'Shvat"
+
+#: plugins/hebrew/holiday.cpp:330 plugins/hebrew/holiday.cpp:341
+#: plugins/hebrew/holiday.cpp:349
+msgid "Sh. Shekalim"
+msgstr "Sh. Shekalim"
+
+#: plugins/hebrew/holiday.cpp:338
+msgid "Purim Katan"
+msgstr "Purim Katan"
+
+#: plugins/hebrew/holiday.cpp:356 plugins/hebrew/holiday.cpp:373
+msgid "Ta'anit Ester"
+msgstr "Ta'anit Ester"
+
+#: plugins/hebrew/holiday.cpp:364 plugins/hebrew/holiday.cpp:368
+msgid "Sh. Zachor"
+msgstr "Sh. Zachor"
+
+#: plugins/hebrew/holiday.cpp:370
+msgid "Erev Purim"
+msgstr "Erev Purim"
+
+#: plugins/hebrew/holiday.cpp:376
+msgid "Purim"
+msgstr "Purim"
+
+#: plugins/hebrew/holiday.cpp:380 plugins/hebrew/holiday.cpp:384
+msgid "Shushan Purim"
+msgstr "Shushan Purim"
+
+#: plugins/hebrew/holiday.cpp:394
+msgid "Sh. Parah"
+msgstr "Sh. Parah"
+
+#: plugins/hebrew/holiday.cpp:403
+msgid "Sh. HaHodesh"
+msgstr "Sh. HaHodesh"
+
+#: plugins/hebrew/holiday.cpp:428
+msgid " Omer"
+msgstr " Omer"
+
+#: plugins/hebrew/parsha.cpp:33
+#, fuzzy
+msgid ""
+"_: 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\n"
+"Bereshit"
+msgstr "Bereshit"
+
+#: plugins/hebrew/parsha.cpp:33
+msgid "Noach"
+msgstr "Noach"
+
+#: plugins/hebrew/parsha.cpp:33
+msgid "Lech L'cha"
+msgstr "Lech L'cha"
+
+#: plugins/hebrew/parsha.cpp:34
+msgid "Vayera"
+msgstr "Vayera"
+
+#: plugins/hebrew/parsha.cpp:34
+msgid "Chaye Sarah"
+msgstr "Chaye Sarah"
+
+#: plugins/hebrew/parsha.cpp:34
+msgid "Toldot"
+msgstr "Toldot"
+
+#: plugins/hebrew/parsha.cpp:35
+msgid "Vayetze"
+msgstr "Vayetze"
+
+#: plugins/hebrew/parsha.cpp:35
+msgid "Vayishlach"
+msgstr "Vayishlach"
+
+#: plugins/hebrew/parsha.cpp:35
+msgid "Vayeshev"
+msgstr "Vayeshev"
+
+#: plugins/hebrew/parsha.cpp:36
+msgid "Miketz"
+msgstr "Miketz"
+
+#: plugins/hebrew/parsha.cpp:36
+msgid "Vayigash"
+msgstr "Vayigash"
+
+#: plugins/hebrew/parsha.cpp:36
+msgid "Vayechi"
+msgstr "Vayechi"
+
+#: plugins/hebrew/parsha.cpp:37
+msgid "Shemot"
+msgstr "Shemot"
+
+#: plugins/hebrew/parsha.cpp:37
+msgid "Vaera"
+msgstr "Vaera"
+
+#: plugins/hebrew/parsha.cpp:37
+msgid "Bo"
+msgstr "Bo"
+
+#: plugins/hebrew/parsha.cpp:37
+msgid "Beshalach"
+msgstr "Beshalach"
+
+#: plugins/hebrew/parsha.cpp:38
+msgid "Yitro"
+msgstr "Yitro"
+
+#: plugins/hebrew/parsha.cpp:38
+msgid "Mishpatim"
+msgstr "Mishpatim"
+
+#: plugins/hebrew/parsha.cpp:38
+msgid "Terumah"
+msgstr "Terumah"
+
+#: plugins/hebrew/parsha.cpp:39
+msgid "Tetzaveh"
+msgstr "Tetzaveh"
+
+#: plugins/hebrew/parsha.cpp:39
+msgid "Ki Tisa"
+msgstr "Ki Tisa"
+
+#: plugins/hebrew/parsha.cpp:39
+msgid "Vayakhel"
+msgstr "Vayakhel"
+
+#: plugins/hebrew/parsha.cpp:40
+msgid "Pekudei"
+msgstr "Pekudei"
+
+#: plugins/hebrew/parsha.cpp:40
+msgid "Vayikra"
+msgstr "Vayikra"
+
+#: plugins/hebrew/parsha.cpp:40
+msgid "Tzav"
+msgstr "Tzav"
+
+#: plugins/hebrew/parsha.cpp:41
+msgid "Shemini"
+msgstr "Shemini"
+
+#: plugins/hebrew/parsha.cpp:41
+msgid "Tazria"
+msgstr "Tazria"
+
+#: plugins/hebrew/parsha.cpp:41
+msgid "Metzora"
+msgstr "Metzora"
+
+#: plugins/hebrew/parsha.cpp:42
+msgid "Acharei Mot"
+msgstr "Acharei Mot"
+
+#: plugins/hebrew/parsha.cpp:42
+msgid "Kedoshim"
+msgstr "Kedoshim"
+
+#: plugins/hebrew/parsha.cpp:42
+msgid "Emor"
+msgstr "Emor"
+
+#: plugins/hebrew/parsha.cpp:43
+msgid "Behar"
+msgstr "Behar"
+
+#: plugins/hebrew/parsha.cpp:43
+msgid "Bechukotai"
+msgstr "Bechukotai"
+
+#: plugins/hebrew/parsha.cpp:43
+msgid "Bemidbar"
+msgstr "Bemidbar"
+
+#: plugins/hebrew/parsha.cpp:44
+msgid "Naso"
+msgstr "Naso"
+
+#: plugins/hebrew/parsha.cpp:44
+msgid "Behaalotcha"
+msgstr "Behaalotcha"
+
+#: plugins/hebrew/parsha.cpp:44
+msgid "Shelach"
+msgstr "Shelach"
+
+#: plugins/hebrew/parsha.cpp:45
+msgid "Korach"
+msgstr "Korach"
+
+#: plugins/hebrew/parsha.cpp:45
+msgid "Chukat"
+msgstr "Chukat"
+
+#: plugins/hebrew/parsha.cpp:45
+msgid "Balak"
+msgstr "Balak"
+
+#: plugins/hebrew/parsha.cpp:46
+msgid "Pinchas"
+msgstr "Pinchas"
+
+#: plugins/hebrew/parsha.cpp:46
+msgid "Matot"
+msgstr "Matot"
+
+#: plugins/hebrew/parsha.cpp:46
+msgid "Masei"
+msgstr "Masei"
+
+#: plugins/hebrew/parsha.cpp:47
+msgid "Devarim"
+msgstr "Devarim"
+
+#: plugins/hebrew/parsha.cpp:47
+msgid "Vaetchanan"
+msgstr "Vaetchanan"
+
+#: plugins/hebrew/parsha.cpp:47
+msgid "Ekev"
+msgstr "Ekev"
+
+#: plugins/hebrew/parsha.cpp:48
+msgid "Reeh"
+msgstr "Reeh"
+
+#: plugins/hebrew/parsha.cpp:48
+msgid "Shoftim"
+msgstr "Shoftim"
+
+#: plugins/hebrew/parsha.cpp:48
+msgid "Ki Tetze"
+msgstr "Ki Tetze"
+
+#: plugins/hebrew/parsha.cpp:49
+msgid "Ki Tavo"
+msgstr "Ki Tavo"
+
+#: plugins/hebrew/parsha.cpp:49
+msgid "Nitzavim"
+msgstr "Nitzavim"
+
+#: plugins/hebrew/parsha.cpp:49
+msgid "Vayelech"
+msgstr "Vayelech"
+
+#: plugins/hebrew/parsha.cpp:50
+msgid "Haazinu"
+msgstr "Haazinu"
+
+#: plugins/hebrew/hebrew.cpp:103
+msgid "This plugin provides the date in the Jewish calendar."
+msgstr "Mae'r ategyn yma yn darparu'r dyddiad yn y calendr Iddewig."
+
+#: plugins/printing/journal/journalprint.h:43
+#, fuzzy
+msgid "Print &journal"
+msgstr "&Dyddlyfr"
+
+#: plugins/printing/journal/journalprint.h:44
+#, fuzzy
+msgid "Prints all journals for a given date range"
+msgstr "Argraffu pob digwyddiad diwrnod sengl ar un dudalen"
+
+#: plugins/printing/journal/journalprint.cpp:130
+msgid "Journal entries"
+msgstr "Cofnodion dyddlyfr"
+
+#: plugins/printing/whatsnext/whatsnextprint.h:42
+#, fuzzy
+msgid "Print What's Next"
+msgstr "Beth sy'n &Nesaf"
+
+#: plugins/printing/whatsnext/whatsnextprint.h:43
+msgid "Prints a list of all upcoming events and todos."
+msgstr ""
+
+#: plugins/printing/list/listprint.h:42
+#, fuzzy
+msgid "Print list"
+msgstr "Rhestr digwyddiadau"
+
+#: plugins/printing/list/listprint.h:43
+msgid "Prints a list of events and to-dos"
+msgstr ""
+
+#: plugins/printing/year/yearprint.h:42
+#, fuzzy
+msgid "Print &Year"
+msgstr "Argraf&fu wythnos"
+
+#: plugins/printing/year/yearprint.h:43
+#, fuzzy
+msgid "Prints a calendar for an entire year"
+msgstr "Argraffu pob digwyddiad diwrnod sengl ar un dudalen"
+
+#: kowhatsnextview.cpp:283 plugins/printing/year/yearprint.cpp:175
+msgid ""
+"_: date from - to\n"
+"%1 - %2"
+msgstr "%1 - %2"
+
+#: plugins/printing/year/yearprint.cpp:177
+#, fuzzy
+msgid ""
+"_: date from -\n"
+"to\n"
+"%1 -\n"
+"%2"
+msgstr "%1 - %2"
+
+#: plugins/exchange/exchange.cpp:109 plugins/exchange/exchange.cpp:145
+#: plugins/exchange/exchange.cpp:148 plugins/exchange/exchange.cpp:164
+#: plugins/exchange/exchange.cpp:168 plugins/exchange/exchange.cpp:222
+#: plugins/exchange/exchange.cpp:224 plugins/exchange/exchangeconfig.cpp:35
+#: plugins/exchange/exchangedialog.cpp:34
+msgid "Exchange Plugin"
+msgstr "Ategyn Exchange"
+
+#: plugins/exchange/exchangedialog.cpp:39
+msgid "Start date:"
+msgstr "Dyddiad dechrau:"
+
+#: plugins/exchange/exchangedialog.cpp:46
+msgid "End date:"
+msgstr "Dyddiad gorffen:"
+
+#: plugins/exchange/exchange.cpp:72
+msgid "&Download..."
+msgstr "&Lawrlwytho ..."
+
+#: plugins/exchange/exchange.cpp:75
+msgid "&Upload Event..."
+msgstr "&Lanlwytho Digwyddiad..."
+
+#: plugins/exchange/exchange.cpp:83
+msgid "De&lete Event"
+msgstr "Di&leu Digwyddiad"
+
+#: plugins/exchange/exchange.cpp:89
+msgid "&Configure..."
+msgstr "&Ffurfweddu..."
+
+#: plugins/exchange/exchange.cpp:104
+msgid ""
+"This plugin imports and export calendar events from/to a Microsoft Exchange "
+"2000 Server."
+msgstr ""
+"Mae'r ategyn yma yn mewnforio ac allforio digwyddiadau o/i weinydd Microsoft "
+"Exchange 2000."
+
+#: plugins/exchange/exchange.cpp:145 plugins/exchange/exchange.cpp:164
+#, fuzzy
+msgid "Please select an appointment."
+msgstr "Dewiswch apwyntiad os gwelwch yn dda"
+
+#: plugins/exchange/exchange.cpp:148
+msgid "Exchange Upload is EXPERIMENTAL, you may lose data on this appointment!"
+msgstr ""
+"Mae lanlywthiad i Exchange yn ARBROFOL, gallwch golli data am yr apwyntiad hyn!"
+
+#: plugins/exchange/exchange.cpp:148
+msgid "&Upload"
+msgstr "&Lanlwytho"
+
+#: plugins/exchange/exchange.cpp:168
+msgid ""
+"Exchange Delete is EXPERIMENTAL, if this is a recurring event it will delete "
+"all instances!"
+msgstr ""
+"Mae Dileu o Exchange yn ARBROFOL; os mae hwn yn ddigwyddiad ail-digwyddiadol, "
+"bydd pob enghraifft yn cael ei ddileu!"
+
+#: plugins/exchange/exchange.cpp:195
+msgid "No Error"
+msgstr "Dim Gwall"
+
+#: plugins/exchange/exchange.cpp:198
+msgid "The Exchange server could not be reached or returned an error."
+msgstr "Ni ellid cyrchu'r gweinydd Exchange, neu dychwelodd gwall."
+
+#: plugins/exchange/exchange.cpp:201
+msgid "Server response could not be interpreted."
+msgstr "Ni ellid dehongli ymateb y gweinydd."
+
+#: plugins/exchange/exchange.cpp:204
+msgid "Appointment data could not be interpreted."
+msgstr "Ni ellid dehongli data apwyntiadau."
+
+#: plugins/exchange/exchange.cpp:207
+msgid "This should not happen: trying to upload wrong type of event."
+msgstr "Ni ddylir hwn ddigwydd: ceisio lanlwytho y math angywir o ddigwyddiad."
+
+#: plugins/exchange/exchange.cpp:210
+msgid "An error occurred trying to write an appointment to the server."
+msgstr "Digwyddodd gwall wrth geisio ysgrifennu apwyntiad i'r gweinydd."
+
+#: plugins/exchange/exchange.cpp:213
+msgid "Trying to delete an event that is not present on the server."
+msgstr "Ceisio dileu digwyddiad sy ddim yn bresennol ar y gweinydd."
+
+#: plugins/exchange/exchange.cpp:217
+msgid "Unknown Error"
+msgstr "Gwall Anhysbys"
+
+#: plugins/exchange/exchangeconfig.cpp:46
+msgid "Exchange server:"
+msgstr "Gweinydd Exchange:"
+
+#: plugins/exchange/exchangeconfig.cpp:50
+msgid "Port:"
+msgstr "Porth:"
+
+#: plugins/exchange/exchangeconfig.cpp:54
+msgid "User:"
+msgstr "Defnyddiwr:"
+
+#. i18n: file kogroupwareprefspage.ui line 205
+#: plugins/exchange/exchangeconfig.cpp:59 rc.cpp:317 rc.cpp:1912
+#, no-c-format
+msgid "Password:"
+msgstr "Cyfrinair:"
+
+#: plugins/exchange/exchangeconfig.cpp:63
+msgid "Determine mailbox automatically"
+msgstr "Penodi blwch ebost yn ymysgogol"
+
+#: plugins/exchange/exchangeconfig.cpp:68
+msgid "Mailbox URL:"
+msgstr "URL y blwch ebost:"
+
+#: plugins/timespanview/timespanview.cpp:54
+#, fuzzy
+msgid "&Timespan"
+msgstr "&Amrediad Amser"
+
+#: plugins/timespanview/timespanview.cpp:64
+#, fuzzy
+msgid "This plugin provides a Gantt-like Timespan view."
+msgstr "Mae'r ategyn yma yn darparu diagram Gantt fel golwg cywaith."
+
+#: plugins/timespanview/timespanview.cpp:69
+#, fuzzy
+msgid "Timespan View Plugin"
+msgstr "Golwg Cywaith"
+
+#: kolistview.cpp:208 korgac/alarmdialog.cpp:130 kotodoview.cpp:386
+#: plugins/timespanview/timespanwidget.cpp:51
+#: printing/calprintdefaultplugins.cpp:1212
+#: printing/calprintdefaultplugins.cpp:1296
+msgid "Summary"
+msgstr "Crynodeb"
+
+#: plugins/projectview/koprojectview.cpp:80
+#: plugins/timespanview/timespanwidget.cpp:65
+msgid "Zoom In"
+msgstr "Chwyddo"
+
+#: plugins/projectview/koprojectview.cpp:84
+#: plugins/timespanview/timespanwidget.cpp:69
+msgid "Zoom Out"
+msgstr "Pellhau"
+
+#: plugins/timespanview/timespanwidget.cpp:73
+msgid "Center View"
+msgstr "Canoli'r Golwg"
+
+#: plugins/projectview/koprojectview.cpp:76
+msgid "Project View"
+msgstr "Golwg Cywaith"
+
+#: plugins/projectview/koprojectview.cpp:88
+msgid "Select Mode"
+msgstr "Sewid Modd"
+
+#: plugins/projectview/koprojectview.cpp:109
+msgid "main task"
+msgstr "prif dasg"
+
+#: plugins/projectview/projectview.cpp:55
+msgid "&Project"
+msgstr "&Cywaith"
+
+#: plugins/projectview/projectview.cpp:65
+msgid "This plugin provides a Gantt diagram as project view."
+msgstr "Mae'r ategyn yma yn darparu diagram Gantt fel golwg cywaith."
+
+#: plugins/projectview/projectview.cpp:70
+#, fuzzy
+msgid "Project View Plugin"
+msgstr "Golwg Cywaith"
+
+#: calendarview.cpp:264
+msgid ""
+"<p><em>No Item Selected</em></p>"
+"<p>Select an event, to-do or journal entry to view its details here.</p>"
+msgstr ""
+
+#: calendarview.cpp:270
+msgid ""
+"View the details of events, journal entries or to-dos selected in KOrganizer's "
+"main view here."
+msgstr ""
+
+#: calendarview.cpp:456
+msgid "No calendars found, unable to merge the file into your calendar."
+msgstr ""
+
+#: calendarview.cpp:490
+msgid "Could not load calendar '%1'."
+msgstr "Wedi methu llwytho calendr '%1'."
+
+#: calendarview.cpp:719
+msgid ""
+"The timezone 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 timezone?"
+msgstr ""
+
+#: calendarview.cpp:723
+#, fuzzy
+msgid "Keep Absolute Times?"
+msgstr "dim amser"
+
+#: calendarview.cpp:724
+#, fuzzy
+msgid "Keep Times"
+msgstr "dim amser"
+
+#: calendarview.cpp:725
+#, fuzzy
+msgid "Move Times"
+msgstr "dim amser"
+
+#: calendarview.cpp:779
+#, fuzzy
+msgid "To-do completed: %1 (%2)"
+msgstr "cyfla&wn ar %1"
+
+#: calendarview.cpp:790
+#, fuzzy, c-format
+msgid "Journal of %1"
+msgstr "&Dyddlyfr"
+
+#: calendarview.cpp:845
+msgid ""
+"The item \"%1\" is filtered by your current filter rules, so it will be hidden "
+"and not appear in the view."
+msgstr ""
+
+#: calendarview.cpp:848
+#, fuzzy
+msgid "Filter Applied"
+msgstr "Hidlen wedi ei galluogi"
+
+#: calendarview.cpp:904
+#, fuzzy
+msgid "The item \"%1\" will be permanently deleted."
 msgstr "My fydd yr eitem hyn yn cael ei ddileu am byth."
 
-#: filtereditdialog.cpp:201
+#: calendarview.cpp:905 calendarview.cpp:929 calendarview.cpp:966
+#: calendarview.cpp:2338 calendarview.cpp:2401 calendarview.cpp:2409
+#: koeventeditor.cpp:393 kojournaleditor.cpp:202 kotodoeditor.cpp:329
+msgid "KOrganizer Confirmation"
+msgstr "Cadarnhâd KOrganizer"
+
+#: calendarview.cpp:924
+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 ""
+
+#: calendarview.cpp:930
 #, fuzzy
-msgid "Delete Confirmation"
-msgstr "Ffurfweddu Adnoddau"
+msgid "Cut Only This"
+msgstr "Dileu Hen Ddigwyddiadau"
 
-#: koeditorfreebusy.cpp:177
-#, c-format
-msgid "Location: %1"
-msgstr "Lleoliad: %1"
+#: calendarview.cpp:931
+msgid "Cut All"
+msgstr ""
 
-#: koeditorfreebusy.cpp:229
+#: calendarview.cpp:962
+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 ""
+
+#: calendarview.cpp:967
+#, fuzzy
+msgid "Copy Only This"
+msgstr "Dileu Hen Ddigwyddiadau"
+
+#: calendarview.cpp:968
+#, fuzzy
+msgid "Copy All"
+msgstr "&Copïo I"
+
+#: calendarview.cpp:1064
+#, fuzzy
+msgid "Paste failed: unable to determine a valid target date."
+msgstr "Rhowch ddyddiad dechrau dilys os gwelwch yn dda."
+
+#: calendarview.cpp:1394
+msgid ""
+"Unable to turn sub-to-do into a top-level to-do, because it cannot be locked."
+msgstr ""
+
+#: calendarview.cpp:1419
+#, fuzzy
+msgid "Make sub-to-dos independent"
+msgstr "Gwneud Is-I'w-Wneud yn Annibynnol"
+
+#: calendarview.cpp:1504
+#, fuzzy
+msgid "Dissociate occurrence"
+msgstr "Rhestri digwyddiadau'r diwrnod cyfredol"
+
+#: calendarview.cpp:1516
+#, fuzzy
+msgid "Dissociating the occurrence failed."
+msgstr "Rhestri digwyddiadau'r diwrnod cyfredol"
+
+#: calendarview.cpp:1517 calendarview.cpp:1547
+#, fuzzy
+msgid "Dissociating Failed"
+msgstr "Methodd y gosod."
+
+#: calendarview.cpp:1538
+#, fuzzy
+msgid "Dissociate future occurrences"
+msgstr "Rhestri digwyddiadau'r diwrnod cyfredol"
+
+#: calendarview.cpp:1546
+#, fuzzy
+msgid "Dissociating the future occurrences failed."
+msgstr "Rhestri digwyddiadau'r diwrnod cyfredol"
+
+#: calendarview.cpp:1564 calendarview.cpp:1638 calendarview.cpp:1710
+#, fuzzy
+msgid "No item selected."
+msgstr "Nid oes darparwr wedi ei dewis."
+
+#: calendarview.cpp:1585 calendarview.cpp:1658
+msgid "The item information was successfully sent."
+msgstr ""
+
+#: calendarview.cpp:1586
+msgid "Publishing"
+msgstr "Cyhoeddi"
+
+#: calendarview.cpp:1588
+#, fuzzy
+msgid "Unable to publish the item '%1'"
+msgstr "Wedi methu darganfod patrymlun '%1'."
+
+#: calendarview.cpp:1639 calendarview.cpp:1659
+#, fuzzy
+msgid "Forwarding"
+msgstr "Mynd &Ymlaen"
+
+#: calendarview.cpp:1664
+#, fuzzy
+msgid "Unable to forward the item '%1'"
+msgstr "Wedi methu darganfod patrymlun '%1'."
+
+#: calendarview.cpp:1665
+#, fuzzy
+msgid "Forwarding Error"
+msgstr "Mynd &Ymlaen"
+
+#: calendarview.cpp:1688
+#, fuzzy
+msgid "The free/busy information was successfully sent."
+msgstr "Cyhoeddi eich &gwybodaeth rydd/brysur yn ymysgogol"
+
+#: calendarview.cpp:1689 calendarview.cpp:1732
+#, fuzzy
+msgid "Sending Free/Busy"
+msgstr "Rhyddhau Gwrthrych Prysur"
+
+#: calendarview.cpp:1691
+#, fuzzy
+msgid "Unable to publish the free/busy data."
+msgstr "Nôl gwybo&daeth rydd/brysur pobl eraill"
+
+#: calendarview.cpp:1716
+#, fuzzy
+msgid "The item has no attendees."
+msgstr "Nid oes cyfarfotwyr gan y ddigwyddiad."
+
+#: calendarview.cpp:1728
+msgid ""
+"The groupware message for item '%1'was successfully sent.\n"
+"Method: %2"
+msgstr ""
+
+#: calendarview.cpp:1737
+msgid ""
+"_: Groupware message sending failed. %2 is "
+"request/reply/add/cancel/counter/etc.\n"
+"Unable to send the item '%1'.\n"
+"Method: %2"
+msgstr ""
+
+#: calendarview.cpp:1812
+msgid "*.ics|ICalendars"
+msgstr "*.ics|ICalendrau"
+
+#: calendarview.cpp:1820 calendarview.cpp:1848
+msgid "Do you want to overwrite %1?"
+msgstr ""
+
+#: calendarview.cpp:1833
+msgid "The journal entries can not be exported to a vCalendar file."
+msgstr "Ni ellir allforio cofnodion y dyddlyfr i ffeil vCalendr."
+
+#: calendarview.cpp:1834
+msgid "Data Loss Warning"
+msgstr "Rhybydd Colled Data"
+
+#: actionmanager.cpp:996 calendarview.cpp:1834
+msgid "Proceed"
+msgstr "Mynd Ymlaen"
+
+#: calendarview.cpp:1839
+#, fuzzy
+msgid "*.vcs|vCalendars"
+msgstr "*.vcs|VCalendrau"
+
+#: calendarview.cpp:1870
+msgid "&Previous Day"
+msgstr "Dyddiad &Blaenorol"
+
+#: calendarview.cpp:1871
+msgid "&Next Day"
+msgstr "Dyddiad &Nesaf"
+
+#: calendarview.cpp:1873
+msgid "&Previous Week"
+msgstr "Wythnos &Blaenorol"
+
+#: calendarview.cpp:1874
+msgid "&Next Week"
+msgstr "Wythnos &Nesaf"
+
+#: calendarview.cpp:1984 calendarview.cpp:2017
+#, fuzzy
+msgid "No filter"
+msgstr "Dangos Hidlen"
+
+#: calendarview.cpp:2215
+msgid "No resources found. We can not edit the item."
+msgstr ""
+
+#: calendarview.cpp:2333
+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 ""
+
+#: calendarview.cpp:2339
+#, fuzzy
+msgid "Delete Only This"
+msgstr "Dileu Hen Ddigwyddiadau"
+
+#: calendarview.cpp:2342
+#, fuzzy
+msgid "Deleting sub-to-dos"
+msgstr "Dileu I'w-Wneud"
+
+#: calendarview.cpp:2367
+msgid ""
+"The item \"%1\" is marked read-only and cannot be deleted; it probably belongs "
+"to a read-only calendar resource."
+msgstr ""
+
+#: calendarview.cpp:2371
+msgid "Removing not possible"
+msgstr ""
+
+#: calendarview.cpp:2398
+#, fuzzy
+msgid ""
+"The calendar item \"%1\" recurs over multiple dates; are you sure you want to "
+"delete it and all its recurrences?"
+msgstr ""
+"Mae'r digwyddiad hyn yn ail-ddigwydd dros mwy nag un dyddiad. A ydych chi'n "
+"siŵr eich bod eisiau dileu y digwyddiad a phob un o'i ail-ddigwyddiadau?"
+
+#: calendarview.cpp:2404
+#, fuzzy
+msgid ""
+"The calendar item \"%1\" recurs over multiple dates. Do you want to delete only "
+"the current one on %2, only all future recurrences, or all its recurrences?"
+msgstr ""
+"Mae'r digwyddiad hyn an ail-digwydd dros mwy nag un dyddiad.  A ydych chi'n "
+"siŵr eich bod eisiau dileu pob un o'i ail-ddigwyddiadau, neu dim ond y "
+"digwyddiad cyfredol sydd ar %1?"
+
+#: calendarview.cpp:2409
+msgid "Delete C&urrent"
+msgstr "Dileu'r &Cyfredol"
+
+#: calendarview.cpp:2410
+#, fuzzy
+msgid "Delete &Future"
+msgstr "Dileu'r Cyfredol"
+
+#: calendarview.cpp:2411
+msgid "Delete &All"
+msgstr "Dileu'r& cwbl"
+
+#: calendarview.cpp:2514
+msgid "Delete all completed to-dos?"
+msgstr "Dileu pob I'w-Wneud sydd wedi eu gorffen?"
+
+#: calendarview.cpp:2514
+msgid "Purge To-dos"
+msgstr "Carthu I-Wneudau"
+
+#: calendarview.cpp:2514
+msgid "Purge"
+msgstr "Carthu"
+
+#: calendarview.cpp:2518
+#, fuzzy
+msgid "Purging completed to-dos"
+msgstr "Cuddio i'w-wneudau a gwblhawyd"
+
+#: calendarview.cpp:2533
+#, fuzzy
+msgid "Unable to purge to-dos with uncompleted children."
+msgstr "Methu carthu I-Wneud sydd efo plant ni chwblhawyd."
+
+#: calendarview.cpp:2534
+msgid "Delete To-do"
+msgstr "Dileu I'w-Wneud"
+
+#: calendarview.cpp:2545
+#, fuzzy
+msgid "Unable to edit \"%1\" because it is locked by another process."
+msgstr "Methu golygu'r nifer.  Cloir gan broses arall."
+
+#: calendarview.cpp:2579
+#, fuzzy, c-format
+msgid "Unable to copy the item to %1."
+msgstr "Methu cadw'r eitem i-wneud"
+
+#: calendarview.cpp:2580
+#, fuzzy
+msgid "Copying Failed"
+msgstr "Methodd y gosod."
+
+#: calendarview.cpp:2623
+#, fuzzy, c-format
+msgid "Unable to move the item to %1."
+msgstr "Methu cadw'r eitem i-wneud"
+
+#: calendarview.cpp:2624
+#, fuzzy
+msgid "Moving Failed"
+msgstr "Methodd y gosod."
+
+#: calendarview.cpp:2699
+#, fuzzy
+msgid "Cutting Recurring Item"
+msgstr "Mae hwn yn ddigwyddiad ail-ddigwyddiadol."
+
+#: calendarview.cpp:2701
+#, fuzzy
+msgid ""
+"The item you try to cut is a recurring item. Do you want to cut only this "
+"single occurrence, only future items, or all items in the recurrence?"
+msgstr ""
+"Mae'r digwyddiad hyn an ail-digwydd dros mwy nag un dyddiad.  A ydych chi'n "
+"siŵr eich bod eisiau dileu pob un o'i ail-ddigwyddiadau, neu dim ond y "
+"digwyddiad cyfredol sydd ar %1?"
+
+#: calendarview.cpp:2706
+#, fuzzy
+msgid "Copying Recurring Item"
+msgstr "Mae hwn yn ddigwyddiad ail-ddigwyddiadol."
+
+#: calendarview.cpp:2708
+#, fuzzy
+msgid ""
+"The item you try to copy is a recurring item. Do you want to copy only this "
+"single occurrence, only future items, or all items in the recurrence?"
+msgstr ""
+"Mae'r digwyddiad hyn an ail-digwydd dros mwy nag un dyddiad.  A ydych chi'n "
+"siŵr eich bod eisiau dileu pob un o'i ail-ddigwyddiadau, neu dim ond y "
+"digwyddiad cyfredol sydd ar %1?"
+
+#: calendarview.cpp:2712
+#, fuzzy
+msgid "Changing Recurring Item"
+msgstr "Mae hwn yn ddigwyddiad ail-ddigwyddiadol."
+
+#: calendarview.cpp:2714
+msgid ""
+"The item you try to change is a recurring item. Shall the changes be applied "
+"only to this single occurrence, only to the future items, or to all items in "
+"the recurrence?"
+msgstr ""
+
+#: calendarview.cpp:2722
+msgid "Only &This Item"
+msgstr ""
+
+#: calendarview.cpp:2722
+msgid "Only &Future Items"
+msgstr ""
+
+#: calendarview.cpp:2722
+#, fuzzy
+msgid "&All Occurrences"
+msgstr "di&gwyddiad(au)"
+
+#: calendarview.cpp:2738 koagenda.cpp:1123
+#, fuzzy
+msgid "Dissociate event from recurrence"
+msgstr "Rhestri digwyddiadau'r diwrnod cyfredol"
+
+#: calendarview.cpp:2744
+msgid ""
+"Unable to add the exception item to the calendar. No change will be done."
+msgstr ""
+
+#: calendarview.cpp:2745 calendarview.cpp:2766
+msgid "Error Occurred"
+msgstr ""
+
+#: calendarview.cpp:2759
+#, fuzzy
+msgid "Split future recurrences"
+msgstr "Gall&uogi ail-ddigwydd"
+
+#: calendarview.cpp:2765
+msgid "Unable to add the future items to the calendar. No change will be done."
+msgstr ""
+
+#: koviewmanager.cpp:405
+#, fuzzy
+msgid "Merged calendar"
+msgstr "Calendr '%1' wedi ei gyfuno."
+
+#: koviewmanager.cpp:407
+msgid "Calendars Side by Side"
+msgstr ""
+
+#: koeditorfreebusy.cpp:178
+msgid "Freebusy Period"
+msgstr ""
+
+#: koeditorfreebusy.cpp:181
+msgid "Summary:"
+msgstr "Crynodeb:"
+
+#: koeditorattachments.cpp:218 koeditorfreebusy.cpp:186
+msgid "Location:"
+msgstr "Lleoliad:"
+
+#: koeditorfreebusy.cpp:190
+#, fuzzy
+msgid "Start:"
+msgstr "&Dechrau:"
+
+#: koeditorfreebusy.cpp:193
+#, fuzzy
+msgid "End:"
+msgstr "&Gorffen:"
+
+#: koeditorfreebusy.cpp:247
 msgid ""
 "Sets the zoom level on the Gantt chart. 'Hour' shows a range of several hours, "
 "'Day' shows a range of a few days, 'Week' shows a range of a few months, and "
@@ -152,83 +1412,81 @@ msgid ""
 "appropriate for the current event or to-do."
 msgstr ""
 
-#: koeditorfreebusy.cpp:236
+#: koeditorfreebusy.cpp:254
 msgid "Scale: "
 msgstr "Graddfa:"
 
-#: koeditorfreebusy.cpp:242
+#: koeditorfreebusy.cpp:260
 msgid "Hour"
 msgstr "Awr"
 
-#: koeditorfreebusy.cpp:243
+#: koeditorfreebusy.cpp:261
 msgid "Day"
 msgstr "Dydd"
 
-#: koeditorfreebusy.cpp:244
+#: koeditorfreebusy.cpp:262
 msgid "Week"
 msgstr "Wythnos"
 
-#: koeditorfreebusy.cpp:245
+#: koeditorfreebusy.cpp:263
 msgid "Month"
 msgstr "Mis"
 
-#: koeditorfreebusy.cpp:246
+#: koeditorfreebusy.cpp:264
 msgid "Automatic"
 msgstr "Ymysgogol"
 
-#: koeditorfreebusy.cpp:252
+#: koeditorfreebusy.cpp:270
 msgid "Center on Start"
 msgstr "Canoli wrth Gychwyn"
 
-#: koeditorfreebusy.cpp:254
+#: koeditorfreebusy.cpp:272
 msgid "Centers the Gantt chart on the start time and day of this event."
 msgstr ""
 
-#: koeditorfreebusy.cpp:261
+#: koeditorfreebusy.cpp:279
 msgid "Pick Date"
 msgstr "Dewis Dyddiad"
 
-#: koeditorfreebusy.cpp:263
+#: koeditorfreebusy.cpp:281
 msgid "Moves the event to a date and time when all the attendees are free."
 msgstr ""
 
-#: koeditorfreebusy.cpp:272
+#: koeditorfreebusy.cpp:290
 msgid ""
 "Reloads Free/Busy data for all attendees from the corresponding servers."
 msgstr ""
 
-#: koeditorfreebusy.cpp:279
+#: koeditorfreebusy.cpp:297
 msgid ""
 "Shows the free/busy status of all attendees. Double-clicking on an attendees "
 "entry in the list will allow you to enter the location of their Free/Busy "
 "Information."
 msgstr ""
 
-#: koeditorfreebusy.cpp:286
+#: koeditorfreebusy.cpp:304
 #, fuzzy
 msgid "Attendee"
 msgstr "Cyfarfotwyr"
 
-#: koeditorfreebusy.cpp:529
+#: koeditorfreebusy.cpp:547
 #, fuzzy
 msgid "The meeting already has suitable start/end times."
 msgstr "Mae gan y cyfarfod yma amserau dechrau/gorffen addas yn barod."
 
-#: koeditorfreebusy.cpp:535
+#: koeditorfreebusy.cpp:552
 msgid ""
-"The meeting has been moved to\n"
-"Start: %1\n"
-"End: %2."
+"<qt>The next available time slot for the meeting is:"
+"<br>Start: %1"
+"<br>End: %2"
+"<br>Would you like to move the meeting to this time slot?</qt>"
 msgstr ""
-"Symudwyd y cyfarfod i\n"
-"Dechrau: %1\n"
-"Gorffen: %2."
 
-#: koeditorfreebusy.cpp:540
+#: koeditorfreebusy.cpp:564
 msgid "No suitable date found."
 msgstr "Ni chanfuwyd dyddiad addas."
 
-#: koeditorfreebusy.cpp:675
+#: koeditorfreebusy.cpp:700
 msgid ""
 "Of the %1 participants, %2 have accepted, %3 have tentatively accepted, and %4 "
 "have declined."
@@ -236,603 +1494,776 @@ msgstr ""
 "O'r %1 o gyfranogwyr, mae %2 wedi derbyn, %3 wedi derbyn yn betrus, a %4 wedi "
 "gwrthod."
 
-#: koeditorfreebusy.cpp:898
+#: koeditorfreebusy.cpp:957
 msgid ""
 "You are changing the organiser of this event, who is also attending, do you "
 "want to change that attendee as well?"
 msgstr ""
 
-#: koeditorrecurrence.cpp:91
-msgid ""
-"The number of the week from the beginning of the month on which this event or "
-"to-do should recur."
+#: importdialog.cpp:41 previewdialog.cpp:53
+#, fuzzy
+msgid "Import Calendar/Event"
+msgstr "Mewnforio Calendr"
+
+#: importdialog.cpp:48
+#, fuzzy
+msgid "Import calendar/event at '%1' into KOrganizer."
+msgstr "Ydych eisiau ychwanegu calendr wrth '%1' i KTrefnydd"
+
+#: importdialog.cpp:57
+#, fuzzy
+msgid "Add as new calendar"
+msgstr "Calendr Newydd"
+
+#: importdialog.cpp:59
+msgid "Merge into existing calendar"
 msgstr ""
 
-#: koeditorrecurrence.cpp:95 koeditorrecurrence.cpp:259
-msgid "1st"
-msgstr "1af"
+#: importdialog.cpp:62
+msgid "Open in separate window"
+msgstr ""
 
-#: koeditorrecurrence.cpp:96 koeditorrecurrence.cpp:260
-msgid "2nd"
-msgstr "2il"
+#: actionmanager.cpp:255
+#, fuzzy
+msgid "Import &Event/Calendar (ICS-/VCS-File)..."
+msgstr "Mewnforio Calendr"
 
-#: koeditorrecurrence.cpp:97 koeditorrecurrence.cpp:261
-msgid "3rd"
-msgstr "3ydd"
+#: actionmanager.cpp:257
+#, fuzzy
+msgid "&Import From UNIX Ical tool (.calendar-File)"
+msgstr "&Mewnforio o Ical"
 
-#: koeditorrecurrence.cpp:98 koeditorrecurrence.cpp:262
-msgid "4th"
-msgstr "4ydd"
+#: actionmanager.cpp:259
+msgid "Get &Hot New Stuff..."
+msgstr "Cael& y Diweddaraf..."
 
-#: koeditorrecurrence.cpp:99 koeditorrecurrence.cpp:263
-msgid "5th"
-msgstr "5ed"
+#: actionmanager.cpp:263
+msgid "Export &Web Page..."
+msgstr "Allfori&o Tudalen Wê"
 
-#: koeditorrecurrence.cpp:100 koeditorrecurrence.cpp:290
-msgid "Last"
-msgstr "Olaf"
+#: actionmanager.cpp:266
+msgid "&iCalendar..."
+msgstr "&iCalendr..."
 
-#: koeditorrecurrence.cpp:101 koeditorrecurrence.cpp:291
-msgid "2nd Last"
-msgstr "Ail Olaf"
+#: actionmanager.cpp:269
+msgid "&vCalendar..."
+msgstr "&vCalendr..."
 
-#: koeditorrecurrence.cpp:102 koeditorrecurrence.cpp:292
-msgid "3rd Last"
-msgstr "Trydydd Olaf"
+#: actionmanager.cpp:272
+msgid "Upload &Hot New Stuff..."
+msgstr "Fyny-lw&ytho'r Diweddaraf..."
 
-#: koeditorrecurrence.cpp:103 koeditorrecurrence.cpp:293
-msgid "4th Last"
-msgstr "Pedwerydd Olaf"
+#: actionmanager.cpp:278
+msgid "Archive O&ld Entries..."
+msgstr "Archifio &Hen Gofnodion..."
 
-#: koeditorrecurrence.cpp:104 koeditorrecurrence.cpp:294
-msgid "5th Last"
-msgstr "Pumed Olaf"
+#: actionmanager.cpp:280
+#, fuzzy
+msgid ""
+"_: delete completed to-dos\n"
+"Pur&ge Completed To-dos"
+msgstr "&Carthiad wedi'i Gwblhau"
 
-#: koeditorrecurrence.cpp:112
-msgid "The weekday on which this event or to-do should recur."
-msgstr ""
+#: actionmanager.cpp:338
+msgid "What's &Next"
+msgstr "Beth sy'n &Nesaf"
 
-#: koeditorrecurrence.cpp:126
-msgid "The month during which this event or to-do should recur."
-msgstr ""
+#: actionmanager.cpp:342
+msgid "&Day"
+msgstr "&Dydd"
 
-#: koeditorrecurrence.cpp:143
-msgid "Sets how often this event or to-do should recur."
+#: actionmanager.cpp:351
+#, c-format
+msgid ""
+"_n: &Next Day\n"
+"Ne&xt %n Days"
 msgstr ""
+"Diwrnod &Nesaf\n"
+"%n o Ddiwrnodau &Nesaf"
 
-#: koeditorrecurrence.cpp:167 koeditorrecurrence.cpp:181
-#: koeditorrecurrence.cpp:232 koeditorrecurrence.cpp:405
-msgid "&Recur every"
-msgstr "&Ail-ddigwydd pob"
+#: actionmanager.cpp:353
+msgid "W&ork Week"
+msgstr "W&ythnos Gwaith"
 
-#. i18n: file koeditoralarms_base.ui line 70
-#: koeditorgeneral.cpp:230 koeditorrecurrence.cpp:167
-#: korgac/alarmdialog.cpp:122 rc.cpp:178 rc.cpp:1892
-#, no-c-format
-msgid "day(s)"
-msgstr "dydd(iau)"
+#: actionmanager.cpp:357
+msgid "&Week"
+msgstr "&Wythnos"
 
-#: koeditorrecurrence.cpp:181
-msgid "week(s) on:"
-msgstr "wythnos(au) ar:"
+#: actionmanager.cpp:361
+msgid "&Month"
+msgstr "&Mis"
 
-#: koeditorrecurrence.cpp:199
-msgid "Day of the week on which this event or to-do should recur."
-msgstr ""
+#: actionmanager.cpp:365
+msgid "&List"
+msgstr "&Rhestr"
 
-#: koeditorrecurrence.cpp:232
-msgid "month(s)"
-msgstr "mis(oedd)"
+#: actionmanager.cpp:369
+msgid "&To-do List"
+msgstr "&Rhestr I'w-Wneud"
 
-#: koeditorrecurrence.cpp:244
-msgid "&Recur on the"
-msgstr "&Ail-ddigwydd ar y"
+#: actionmanager.cpp:373
+msgid "&Journal"
+msgstr "&Dyddlyfr"
 
-#: koeditorrecurrence.cpp:249
-msgid ""
-"Sets a specific day of the month on which this event or to-do should recur."
+#: actionmanager.cpp:377
+#, fuzzy
+msgid "&Timeline View"
+msgstr "Canoli'r Golwg"
+
+#: actionmanager.cpp:383
+msgid "&Refresh"
+msgstr "&Ailfywio"
+
+#: actionmanager.cpp:391
+msgid "F&ilter"
+msgstr "&Hidlo"
+
+#: actionmanager.cpp:406
+msgid "Zoom In Horizontally"
 msgstr ""
 
-#: koeditorrecurrence.cpp:254 koeditorrecurrence.cpp:430
-msgid "The day of the month on which this event or to-do should recur."
+#: actionmanager.cpp:409
+msgid "Zoom Out Horizontally"
 msgstr ""
 
-#: koeditorrecurrence.cpp:264
-msgid "6th"
-msgstr "6ed"
+#: actionmanager.cpp:412
+msgid "Zoom In Vertically"
+msgstr ""
 
-#: koeditorrecurrence.cpp:265
-msgid "7th"
-msgstr "7fed"
+#: actionmanager.cpp:415
+msgid "Zoom Out Vertically"
+msgstr ""
 
-#: koeditorrecurrence.cpp:266
-msgid "8th"
-msgstr "8fed"
+#: actionmanager.cpp:424
+msgid "Go to &Today"
+msgstr "Mynd at &Heddiw"
 
-#: koeditorrecurrence.cpp:267
-msgid "9th"
-msgstr "9fed"
+#: actionmanager.cpp:428
+msgid "Go &Backward"
+msgstr "Mynd &Yn Ôl"
 
-#: koeditorrecurrence.cpp:268
-msgid "10th"
-msgstr "10fed"
+#: actionmanager.cpp:440
+msgid "Go &Forward"
+msgstr "Mynd &Ymlaen"
 
-#: koeditorrecurrence.cpp:269
-msgid "11th"
-msgstr "11eg"
+#: actionmanager.cpp:450
+msgid "New E&vent..."
+msgstr "D&igwyddiad Newydd..."
 
-#: koeditorrecurrence.cpp:270
-msgid "12th"
-msgstr "12fed"
+#: actionmanager.cpp:454 kotodoview.cpp:464
+msgid "New &To-do..."
+msgstr "&I'w-Gwneud Newydd..."
 
-#: koeditorrecurrence.cpp:271
-msgid "13th"
-msgstr "13eg"
+#: actionmanager.cpp:458 kotodoview.cpp:466
+msgid "New Su&b-to-do..."
+msgstr "Is-I'w-&Gwneud Newydd..."
 
-#: koeditorrecurrence.cpp:272
-msgid "14th"
-msgstr "14eg"
+#: actionmanager.cpp:464
+#, fuzzy
+msgid "New &Journal..."
+msgstr "&Dyddlyfr"
 
-#: koeditorrecurrence.cpp:273
-msgid "15th"
-msgstr "15fed"
+#: actionmanager.cpp:469 actionmanager.cpp:1461 actionmanager.cpp:1489
+#: koeventpopupmenu.cpp:53 kotodoview.cpp:454
+msgid "&Show"
+msgstr "&Dangos"
 
-#: koeditorrecurrence.cpp:274
-msgid "16th"
-msgstr "16eg"
+#: actionmanager.cpp:472 actionmanager.cpp:1462 actionmanager.cpp:1490
+#: koeventpopupmenu.cpp:55 kotodoview.cpp:456 resourceview.cpp:715
+msgid "&Edit..."
+msgstr "&Golygu..."
 
-#: koeditorrecurrence.cpp:275
-msgid "17th"
-msgstr "17eg"
+#: actionmanager.cpp:479
+msgid "&Make Sub-to-do Independent"
+msgstr "&Gwneud Is-I'w-Wneud yn Annibynnol"
 
-#: koeditorrecurrence.cpp:276
-msgid "18th"
-msgstr "18fed"
+#: actionmanager.cpp:498
+msgid "&Publish Item Information..."
+msgstr ""
 
-#: koeditorrecurrence.cpp:277
-msgid "19th"
-msgstr "19eg"
+#: actionmanager.cpp:503
+msgid "Send &Invitation to Attendees"
+msgstr ""
 
-#: koeditorrecurrence.cpp:278
-msgid "20th"
-msgstr "20fed"
+#: actionmanager.cpp:511
+#, fuzzy
+msgid "Re&quest Update"
+msgstr "Ca&is"
 
-#: koeditorrecurrence.cpp:279
-msgid "21st"
-msgstr "21ain"
+#: actionmanager.cpp:518
+msgid "Send &Cancelation to Attendees"
+msgstr ""
 
-#: koeditorrecurrence.cpp:280
-msgid "22nd"
-msgstr "22ain"
+#: actionmanager.cpp:525
+#, fuzzy
+msgid "Send Status &Update"
+msgstr "Dyddiad gorffen:"
 
-#: koeditorrecurrence.cpp:281
-msgid "23rd"
-msgstr "23ain"
+#: actionmanager.cpp:533
+#, fuzzy
+msgid ""
+"_: counter proposal\n"
+"Request Chan&ge"
+msgstr "Gwr&thgynnig"
 
-#: koeditorrecurrence.cpp:282
-msgid "24th"
-msgstr "24ain"
+#: actionmanager.cpp:540
+#, fuzzy
+msgid "&Send as iCalendar..."
+msgstr "&iCalendr..."
 
-#: koeditorrecurrence.cpp:283
-msgid "25th"
-msgstr "25ain"
+#: actionmanager.cpp:545
+#, fuzzy
+msgid "&Mail Free Busy Information..."
+msgstr "Cyhoeddi Gwybodaeth Rhydd Brysur"
 
-#: koeditorrecurrence.cpp:284
-msgid "26th"
-msgstr "26ain"
+#: actionmanager.cpp:550
+#, fuzzy
+msgid "&Upload Free Busy Information"
+msgstr "Cyhoeddi Gwybodaeth Rhydd Brysur"
 
-#: koeditorrecurrence.cpp:285
-msgid "27th"
-msgstr "27ain"
+#: actionmanager.cpp:556
+msgid "&Addressbook"
+msgstr "&Llyfr Cyfeiriadau"
 
-#: koeditorrecurrence.cpp:286
-msgid "28th"
-msgstr "28ain"
+#: actionmanager.cpp:567
+#, fuzzy
+msgid "Show Date Navigator"
+msgstr "Dangos diwrnod Omer"
 
-#: koeditorrecurrence.cpp:287
-msgid "29th"
-msgstr "29ain"
+#: actionmanager.cpp:570
+#, fuzzy
+msgid "Show To-do View"
+msgstr "Math Golwg"
 
-#: koeditorrecurrence.cpp:288
-msgid "30th"
-msgstr "30ain"
+#: actionmanager.cpp:573
+#, fuzzy
+msgid "Show Item Viewer"
+msgstr "Gwelydd Digwyddiadau"
 
-#: koeditorrecurrence.cpp:289
-msgid "31st"
-msgstr "31ain"
+#: actionmanager.cpp:592
+#, fuzzy
+msgid "Show Resource View"
+msgstr "Ffurfweddu Adnoddau"
 
-#: koeditorrecurrence.cpp:325
-msgid "day"
-msgstr "dydd"
+#: actionmanager.cpp:595
+#, fuzzy
+msgid "Show &Resource Buttons"
+msgstr "Ffurfweddu Adnoddau"
 
-#: koeditorrecurrence.cpp:332
-msgid ""
-"Sets a weekday and specific week in the month on which this event or to-do "
-"should recur"
-msgstr ""
+#: actionmanager.cpp:610
+msgid "Configure &Date && Time..."
+msgstr "Ffurfweddu &Dyddiad && Amser..."
 
-#: koeditorrecurrence.cpp:405
-msgid "year(s)"
-msgstr "blwyddyn (blynyddoedd)"
+#: actionmanager.cpp:617
+#, fuzzy
+msgid "Manage View &Filters..."
+msgstr "Golygu'r &Hidlenni"
 
-#: koeditorrecurrence.cpp:419
-msgid ""
-"_: part before XXX of 'Recur on day XXX of month YYY'\n"
-"&Recur on day "
-msgstr ""
+#: actionmanager.cpp:620
+#, fuzzy
+msgid "Manage C&ategories..."
+msgstr "Golygu'r C&ategorïau..."
 
-#: koeditorrecurrence.cpp:421
-msgid "&Day "
-msgstr "&Dydd "
+#: actionmanager.cpp:624
+#, fuzzy
+msgid "&Configure Calendar..."
+msgstr "Ffurfweddu'r &Ategion"
 
-#: koeditorrecurrence.cpp:425
-msgid ""
-"Sets a specific day in a specific month on which this event or to-do should "
-"recur."
-msgstr ""
+#: actionmanager.cpp:649 actionmanager.cpp:651
+msgid "Filter: "
+msgstr "Hidl: "
 
-#: koeditorrecurrence.cpp:434
+#: actionmanager.cpp:713 actionmanager.cpp:801 actionmanager.cpp:1191
+#: previewdialog.cpp:140
+msgid "*.vcs *.ics|Calendar Files"
+msgstr "*.vcs *.ics|Ffeiliau Calendr"
+
+#: actionmanager.cpp:752
+#, fuzzy
 msgid ""
-"_: part between XXX and YYY of 'Recur on day XXX of month YYY'\n"
-" &of "
+"You have no .calendar 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"
 
-#: koeditorrecurrence.cpp:448
+#: actionmanager.cpp:775
 msgid ""
-"_: Part before XXX in 'Recur on NNN. WEEKDAY of MONTH', short version\n"
-"&On"
+"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."
 
-#: koeditorrecurrence.cpp:450
+#: actionmanager.cpp:781
+#, fuzzy
 msgid ""
-"_: Part before XXX in 'Recur on NNN. WEEKDAY of MONTH'\n"
-"&On the"
+"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 ""
+"Mi wnaeth Ktrefnydd ganfod meysydd anhysbys tra'n dosrannu eich ffeil .calendar "
+"ical, ac mi roedd rhaid eu taflu nhw. Os gwelwch yn dda, edrychwch i weld os "
+"oedd pob darn o ddata pwysig wedi ei fewnforio yn gywir."
 
-#: koeditorrecurrence.cpp:454
+#: actionmanager.cpp:785
+#, fuzzy
+msgid "ICal Import Successful with Warning"
+msgstr "Mewnforiad Ical Yn Gywir Ond Gyda Rhybydd"
+
+#: actionmanager.cpp:788
+#, fuzzy
 msgid ""
-"Sets a specific day in a specific week of a specific month on which this event "
-"or to-do should recur."
+"KOrganizer encountered an error parsing your .calendar file from ical; import "
+"has failed."
 msgstr ""
+"My wnaeth KTrefnydd ganfod gwall pan yn dosrannu eich ffeil .calendar o ical. "
+"Mae'r mewnforiad wedi methu."
 
-#: koeditorrecurrence.cpp:465
+#: actionmanager.cpp:792
+#, fuzzy
 msgid ""
-"_: part between WEEKDAY and MONTH in 'Recur on NNN. WEEKDAY of MONTH'\n"
-" o&f "
+"KOrganizer does not think that your .calendar file is a valid ical calendar; "
+"import has failed."
 msgstr ""
+"Nid yw KTrefnydd yn meddwl bod eich ffeil .calendar yn galendr ical dilys. "
+"Mae'r mewnforiad wedi methu."
 
-#: koeditorrecurrence.cpp:480
+#: actionmanager.cpp:874
 #, fuzzy
-msgid "Day #"
-msgstr "Dydd"
+msgid "New calendar '%1'."
+msgstr "Wedi cadw'r calendr '%1'."
 
-#: koeditorrecurrence.cpp:482
+#: actionmanager.cpp:909
+msgid "Cannot download calendar from '%1'."
+msgstr "Methu lawrlywtho calendr oddi wrth '%1'."
+
+#: actionmanager.cpp:947
+msgid "Added calendar resource for URL '%1'."
+msgstr ""
+
+#: actionmanager.cpp:955
 #, fuzzy
-msgid "Recur on &day #"
-msgstr "Ail-ddi&gwydd ar y diwrnod yma"
+msgid "Unable to create calendar resource '%1'."
+msgstr "Methu cadw'r eitem i-wneud"
 
-#: koeditorrecurrence.cpp:484
+#: actionmanager.cpp:966
+msgid "Merged calendar '%1'."
+msgstr "Calendr '%1' wedi ei gyfuno."
+
+#: actionmanager.cpp:969
+msgid "Opened calendar '%1'."
+msgstr "Calendr '%1' wedi ei agor."
+
+#: actionmanager.cpp:994
 msgid ""
-"Sets a specific day within the year on which this event or to-do should recur."
+"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."
 
-#: koeditorrecurrence.cpp:495
-msgid ""
-"_: part after NNN of 'Recur on day #NNN of the year'\n"
-" of the &year"
+#: actionmanager.cpp:996
+msgid "Format Conversion"
+msgstr "Trosiad Fformat"
+
+#: actionmanager.cpp:1020
+msgid "Cannot upload calendar to '%1'"
+msgstr "Methu llwytho calendr i fyny i '%1'"
+
+#: actionmanager.cpp:1033
+msgid "Saved calendar '%1'."
+msgstr "Wedi cadw'r calendr '%1'."
+
+#: actionmanager.cpp:1064
+msgid "Do you want to overwrite file \"%1\""
 msgstr ""
 
-#: koeditorrecurrence.cpp:498
+#: actionmanager.cpp:1098
+msgid "Could not upload file."
+msgstr "Methu llwytho ffeil."
+
+#: actionmanager.cpp:1139
+#, fuzzy, c-format
+msgid "Unable to save calendar to the file %1."
+msgstr "Methu cadw'r eitem i-wneud"
+
+#: actionmanager.cpp:1164
 msgid ""
-"_: part after NNN of 'Recur on day #NNN of the year', short version\n"
-" of the year"
+"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?"
 
-#: koeditorrecurrence.cpp:581
-msgid "E&xceptions"
-msgstr "&Eithriadau"
-
-#: koeditorrecurrence.cpp:591
+#: actionmanager.cpp:1267
+#, c-format
 msgid ""
-"A date that should be considered an exception to the recurrence rules for this "
-"event or to-do."
+"_n: &Next Day\n"
+"&Next %n Days"
 msgstr ""
+"Diwrnod &Nesaf\n"
+"%n o Ddiwrnodau &Nesaf"
 
-#. i18n: file koeditoralarms_base.ui line 546
-#: koeditorrecurrence.cpp:596 rc.cpp:253 rc.cpp:1967
-#, no-c-format
-msgid "&Add"
-msgstr "&Ychwanegu..."
+#: actionmanager.cpp:1301
+#, fuzzy
+msgid "Could not start control module for date and time format."
+msgstr "Methu dechrau modwl reoli'r fformat dyddiad ac amser."
+
+#: actionmanager.cpp:1447
+msgid "&Show Event"
+msgstr "Dango&s Digwyddiad"
+
+#: actionmanager.cpp:1448
+msgid "&Edit Event..."
+msgstr "&Golygu Digwyddiad..."
+
+#: actionmanager.cpp:1449
+msgid "&Delete Event"
+msgstr "&Dileu Digwyddiad"
+
+#: actionmanager.cpp:1453
+msgid "&Show To-do"
+msgstr "Dango&s I'w-Wneud"
+
+#: actionmanager.cpp:1454
+msgid "&Edit To-do..."
+msgstr "&Golygu I'w-Wneud"
 
-#: koeditorrecurrence.cpp:598
+#: actionmanager.cpp:1455
+msgid "&Delete To-do"
+msgstr "&Dileu I'w-Wneud"
+
+#: actionmanager.cpp:1579
 msgid ""
-"Add this date as an exception to the recurrence rules for this event or to-do."
+"\"%1\" is read-only. Please select a writable calendar before attempting to "
+"create a new item."
 msgstr ""
 
-#: koeditorrecurrence.cpp:601
-msgid "&Change"
-msgstr "&Newid"
+#: actionmanager.cpp:1582
+#, fuzzy
+msgid "Read-only calendar"
+msgstr "Argraffu Calendr"
 
-#: koeditorrecurrence.cpp:603
-msgid "Replace the currently selected date with this date."
+#: actionmanager.cpp:1612
+msgid ""
+"You have no active, writable event folder so saving will not be possible.\n"
+"Please create or activate at least one writable event folder and try again."
 msgstr ""
 
-#: koeditorrecurrence.cpp:607
+#: actionmanager.cpp:1616
 msgid ""
-"Delete the currently selected date from the list of dates that should be "
-"considered exceptions to the recurrence rules for this event or to-do."
+"You have no active, writable to-do (task) folders so saving will not be "
+"possible.\n"
+"Please create or activate at least one writable to-do folder and try again."
 msgstr ""
 
-#: koeditorrecurrence.cpp:614
+#: actionmanager.cpp:1620
 msgid ""
-"Displays current dates that are being considered exceptions to the recurrence "
-"rules for this event or to-do."
+"You have no active, writable journal folder so saving will not be possible.\n"
+"Please create or activate at least one writable journal folder and try again."
 msgstr ""
 
-#: koeditorrecurrence.cpp:678
-msgid "Edit Exceptions"
-msgstr "Golygu Eithriadau"
-
-#: koeditorrecurrence.cpp:702
-msgid "Recurrence Range"
-msgstr "Amrediad Ail-ddigwyddiadau"
-
-#: koeditorrecurrence.cpp:705
+#: actionmanager.cpp:1624
 msgid ""
-"Sets a range for which these recurrence rules will apply to this event or "
-"to-do."
+"You have no active, writable calendar folder so saving will not be possible.\n"
+"Please create or activate at least one writable calendar folder and try again."
 msgstr ""
 
-#: koeditorrecurrence.cpp:713
-msgid "Begin on:"
-msgstr "Dechrau ar:"
+#: actionmanager.cpp:1630
+#, fuzzy
+msgid "No writable calendar"
+msgstr "Ni chanfuwyd dyddiad addas."
 
-#: koeditorrecurrence.cpp:715
-msgid "The date on which the recurrences for this event or to-do should begin."
+#: actionmanager.cpp:1671 actionmanager.cpp:1794
+msgid "Attach as &link"
 msgstr ""
 
-#: koeditorrecurrence.cpp:722
-msgid "&No ending date"
-msgstr "&Heb ddyddiad gorffen"
+#: actionmanager.cpp:1672 actionmanager.cpp:1795
+#, fuzzy
+msgid "Attach &inline"
+msgstr "Atodia&dau"
 
-#: koeditorrecurrence.cpp:724
-msgid "Sets the event or to-do to recur forever."
+#: actionmanager.cpp:1673
+msgid "Attach inline &without attachments"
 msgstr ""
 
-#: koeditorrecurrence.cpp:731
-msgid "End &after"
-msgstr "Gorffen &ar ôl"
-
-#: koeditorrecurrence.cpp:733
-msgid ""
-"Sets the event or to-do to stop recurring after a certain number of "
-"occurrences."
+#: actionmanager.cpp:1675 actionmanager.cpp:1797 koeditorattachments.cpp:601
+msgid "C&ancel"
 msgstr ""
 
-#: koeditorrecurrence.cpp:738
-msgid "Number of times the event or to-do should recur before stopping."
+#: actionmanager.cpp:1705
+msgid "Removing attachments from an email might invalidate its signature."
 msgstr ""
 
-#: koeditorrecurrence.cpp:744
-msgid "&occurrence(s)"
-msgstr "di&gwyddiad(au)"
-
-#: koeditorrecurrence.cpp:752
+#: actionmanager.cpp:1706
 #, fuzzy
-msgid "End &on:"
-msgstr "Gorffen &erbyn:"
+msgid "Remove Attachments"
+msgstr "Atodia&dau"
 
-#: koeditorrecurrence.cpp:754
-msgid "Sets the event or to-do to stop recurring on a certain date."
-msgstr ""
+#: actionmanager.cpp:1895
+msgid "Undo (%1)"
+msgstr "Datwneud (%1)"
 
-#: koeditorrecurrence.cpp:761
-msgid "Date after which the event or to-do should stop recurring"
+#: actionmanager.cpp:1907
+msgid "Redo (%1)"
+msgstr "Ailwneud (%1)"
+
+#: actionmanager.cpp:1919
+#, fuzzy
+msgid ""
+"The calendar contains unsaved changes. Do you want to save them before exiting?"
 msgstr ""
+"Mae'r calendr wedi newid.\n"
+"A ydych chi eisiau ei gadw?"
 
-#: koeditorrecurrence.cpp:825
-#, c-format
-msgid "Begins on: %1"
-msgstr "Yn dechrau ar: %1"
+#: actionmanager.cpp:1924
+msgid "Unable to save the calendar. Do you still want to close this window?"
+msgstr ""
 
-#: koeditorrecurrence.cpp:833
-msgid "Edit Recurrence Range"
-msgstr "Golygu Amrediad Ail-ddigwyddiadau"
+#: actionmanager.cpp:1945
+msgid "Unable to exit. Saving still in progress."
+msgstr ""
 
-#: koeditorrecurrence.cpp:880
-msgid "Sets the type of recurrence this event or to-do should have."
+#: actionmanager.cpp:1984
+#, fuzzy
+msgid ""
+"Saving of '%1' failed. Check that the resource is properly configured.\n"
+"Ignore problem and continue without saving or cancel save?"
 msgstr ""
+"Methodd cadw '%1'.  Gwiriwch bod yr adnodd wedi'i ffurfweddu'n gywir.\n"
+"Anwybyddu'r problem a parhau heb gadw, neu ddiddymu'r cadw?"
 
-#: koeditorrecurrence.cpp:882
-msgid "Daily"
-msgstr "Dyddiol"
+#: actionmanager.cpp:1987
+msgid "Save Error"
+msgstr "Gwall Cadw"
 
-#: koeditorrecurrence.cpp:883
-msgid "Weekly"
-msgstr "Wythnosol"
+#: actionmanager.cpp:2009
+msgid "URL '%1' is invalid."
+msgstr ""
 
-#: koeditorrecurrence.cpp:884
-msgid "Monthly"
-msgstr "Misol"
+#: actionmanager.cpp:2025
+#, fuzzy
+msgid "Unable to open the calendar"
+msgstr "Methu cadw'r eitem i-wneud"
 
-#: koeditorrecurrence.cpp:885
-msgid "Yearly"
-msgstr "Blynyddol"
+#: archivedialog.cpp:55
+#, fuzzy
+msgid "Archive/Delete Past Events and To-dos"
+msgstr "Archifio/Dileu Hen Gyfarfodydd"
 
-#: koeditorrecurrence.cpp:897
-msgid "&Daily"
-msgstr "&Dyddiol"
+#: archivedialog.cpp:57
+msgid "&Archive"
+msgstr "&Archifio"
 
-#: koeditorrecurrence.cpp:899
+#: archivedialog.cpp:66
+#, fuzzy
 msgid ""
-"Sets the event or to-do to recur daily according to the specified rules."
+"Archiving saves old items into the given file and then deletes them in the "
+"current calendar. If the archive file already exists they will be added. (<a "
+"href=\"whatsthis:In order to add an archive to your calendar, use the "
+"&quot;Merge Calendar&quot; function. You can view an archive by opening it in "
+"KOrganizer like any other calendar. It is not saved in a special format, but as "
+"vCalendar.\">How to restore</a>)"
 msgstr ""
+"Mae archifio yn cadw hen apwyntiadau i mewn i'r ffeil penodol ac wedyn eu dileu "
+"yn y calendr cyfredol.  Os mae'r ffeil archifio mewn bod yn barod, ychwanegir.  "
+"(<a href=\"whatsthis: Er mwyn ychwnaegu archif i'ch calendr, defnyddiwch y "
+"swyddogaeth &quot;Cyfuno calendr&quot;.  Gallwch weld archif drwy ei agor yn "
+"KTrefnydd fel pob un calendr arall.  Ni chedwir mewn fformat arbennig, ond fel "
+"vCalendar.\">Sut i adfer</a>)"
 
-#: koeditorrecurrence.cpp:901
-msgid "&Weekly"
-msgstr "&Wythnosol"
+#: archivedialog.cpp:82
+#, fuzzy
+msgid "Archive now items older than:"
+msgstr "&Cyfarfodydd hyn na:"
 
-#: koeditorrecurrence.cpp:903
+#: archivedialog.cpp:87
+#, fuzzy
 msgid ""
-"Sets the event or to-do to recur weekly according to the specified rules."
+"The date before which items should be archived. All older events and to-dos "
+"will be saved and deleted, the newer (and events exactly on that date) will be "
+"kept."
 msgstr ""
+"Oed yr apwyntiadau i'w archifo.  Cedwir a dileuir pob apwyntiad hyn, gadewir y "
+"rhai newyddach."
 
-#: koeditorrecurrence.cpp:905
-msgid "&Monthly"
-msgstr "&Misol"
+#: archivedialog.cpp:96
+#, fuzzy
+msgid "Automaticall&y archive items older than:"
+msgstr "&Cyfarfodydd hyn na:"
 
-#: koeditorrecurrence.cpp:907
+#: archivedialog.cpp:99
 msgid ""
-"Sets the event or to-do to recur monthly according to the specified rules."
+"If this feature is enabled, KOrganizer will regularly check if events and "
+"to-dos have to be archived; this means you will not need to use this dialog box "
+"again, except to change the settings."
 msgstr ""
 
-#: koeditorrecurrence.cpp:909
-msgid "&Yearly"
-msgstr "&Blynyddol"
-
-#: koeditorrecurrence.cpp:911
+#: archivedialog.cpp:107
+#, fuzzy
 msgid ""
-"Sets the event or to-do to recur yearly according to the specified rules."
+"The age of the events and to-dos to archive. All older items will be saved and "
+"deleted, the newer will be kept."
 msgstr ""
+"Oed yr apwyntiadau i'w archifo.  Cedwir a dileuir pob apwyntiad hyn, gadewir y "
+"rhai newyddach."
 
-#: koeditorrecurrence.cpp:973
-msgid "&Enable recurrence"
-msgstr "Gall&uogi ail-ddigwydd"
+#: archivedialog.cpp:112
+msgid "Day(s)"
+msgstr "Diwrnod(au)"
 
-#: koeditorrecurrence.cpp:975
-msgid ""
-"Enables recurrence for this event or to-do according to the specified rules."
-msgstr ""
+#: archivedialog.cpp:113
+msgid "Week(s)"
+msgstr "Wythnos(au)"
 
-#: koeditorrecurrence.cpp:982
-msgid "Appointment Time "
-msgstr "Amser Cyfarfod"
+#: archivedialog.cpp:114
+msgid "Month(s)"
+msgstr "Mis(oedd)"
 
-#: koeditorrecurrence.cpp:985
-#, fuzzy
-msgid "Displays appointment time information."
-msgstr "Amser cyfarfod rhagosodedig:"
+#: archivedialog.cpp:119
+msgid "Archive &file:"
+msgstr "Ffeil A&rchif:"
 
-#: koeditorrecurrence.cpp:1004
-msgid "Recurrence Rule"
-msgstr "Rheol Ail-ddigwydd"
+#: archivedialog.cpp:123
+#, fuzzy
+msgid "*.ics|iCalendar Files"
+msgstr "*.vcs|Ffeiliau vCalendr"
 
-#: koeditorrecurrence.cpp:1006
+#: archivedialog.cpp:125
+#, fuzzy
 msgid ""
-"Options concerning the type of recurrence this event or to-do should have."
+"The path of the archive. The events and to-dos will be added to the archive "
+"file, so any events that are already in the file will not be modified or "
+"deleted. You can later load or merge the file like any other calendar. It is "
+"not saved in a special format, it uses the iCalendar format. "
 msgstr ""
+"Llwybr yr archif.  Ychwanegir yr apwyntiadau i'r ffeil archif, er mwyn peidio "
+"ac addasu neu dileu unrhyw apwyntiad sydd yn y ffeil yn barod.  Yn nes ymlaen, "
+"gallwch lwytho neu gyfuno'r ffeil fel unrhyw calendr arall.   Ni chedwir mewn "
+"fformat arbennig, mae'n defnyddio'r fformat vCalendar."
 
-#: koeditorrecurrence.cpp:1043
-msgid "Recurrence Range..."
-msgstr "Amrediad Ail-ddigwydd..."
+#: archivedialog.cpp:134
+msgid "Type of Items to Archive"
+msgstr ""
 
-#: koeditorrecurrence.cpp:1046 koeditorrecurrence.cpp:1063
+#. i18n: file ./plugins/printing/list/calprintlistconfig_base.ui line 141
+#: archivedialog.cpp:136 rc.cpp:990 searchdialog.cpp:72
+#, no-c-format
+msgid "&Events"
+msgstr "&Digwyddiadau:"
+
+#: archivedialog.cpp:137
+#, fuzzy
+msgid "Completed &To-dos"
+msgstr "Cuddio &i'w-wneudau a gwblhawyd"
+
+#: archivedialog.cpp:139
 msgid ""
-"Options concerning the time range during which this event or to-do should "
-"recur."
+"Here you can select which items should be archived. Events are archived if they "
+"ended before the date given above; to-dos are archived if they were finished "
+"before the date."
 msgstr ""
 
-#: koeditorrecurrence.cpp:1055
-msgid "Exceptions..."
-msgstr "Eithriadau..."
+#: archivedialog.cpp:144
+msgid "&Delete only, do not save"
+msgstr "&Dileu yn unig, heb gadw"
 
-#: koeditorrecurrence.cpp:1395
+#: archivedialog.cpp:147
+#, fuzzy
 msgid ""
-"The end date '%1' of the recurrence must be after the start date '%2' of the "
-"event."
+"Select this option to delete old events and to-dos without saving them. It is "
+"not possible to recover the events later."
 msgstr ""
+"Dewis y dewisiad yma i ddileu hen apwyntiadau heb eu cadw.  Ni ellir adfer yr "
+"apwyntiadau wedyn."
 
-#: koeditorrecurrence.cpp:1409
+#: archivedialog.cpp:211
 msgid ""
-"A weekly recurring event or task has to have at least one weekday associated "
-"with it."
+"The archive file name is not valid.\n"
 msgstr ""
+"Nid yw enw'r ffeil archif yn ddilys.\n"
 
-#: koeditorrecurrence.cpp:1443
+#: koagendaview.cpp:320 koagendaview.cpp:815 multiagendaview.cpp:62
 #, fuzzy
-msgid "Recurrence"
-msgstr "Ail-dd&igwydd"
-
-#: koincidenceeditor.cpp:73
-msgid "&Templates..."
-msgstr "&Patrymluniau ..."
+msgid "All Day"
+msgstr "Dydd"
 
-#: koincidenceeditor.cpp:86
-msgid "Atte&ndees"
-msgstr "Cy&farfotwyr"
+#: koeditorgeneralevent.cpp:99 koeditorgeneraltodo.cpp:100
+msgid "Date && Time"
+msgstr "Dyddiad ac Amser"
 
-#: koincidenceeditor.cpp:88
-msgid ""
-"The Attendees tab allows you to Add or Remove Attendees to/from this event or "
-"to-do."
+#: koeditorgeneralevent.cpp:101
+msgid "Sets options related to the date and time of the event or to-do."
 msgstr ""
 
-#: koincidenceeditor.cpp:172
-msgid "Unable to find template '%1'."
-msgstr "Wedi methu darganfod patrymlun '%1'."
+#: koeditorgeneralevent.cpp:111
+msgid "&Start:"
+msgstr "&Dechrau:"
 
-#: koincidenceeditor.cpp:177
-msgid "Error loading template file '%1'."
-msgstr "Gwall wrth lwytho'r ffeil batrymlun '%1'"
+#: koeditorgeneralevent.cpp:121
+msgid "&End:"
+msgstr "&Gorffen:"
 
-#: koincidenceeditor.cpp:376 koincidenceeditor.cpp:377
-msgid "Counter proposal"
-msgstr ""
+#: koeditorgeneralevent.cpp:131
+#, fuzzy
+msgid "All-&day"
+msgstr "Dydd"
 
-#: koeditoralarms.cpp:83
+#: koeditorgeneralevent.cpp:150 koeditorgeneraltodo.cpp:157
 #, fuzzy
-msgid "Reminder Dialog"
+msgid "Recurrence:"
+msgstr "Ail-dd&igwydd"
+
+#: koeditorgeneralevent.cpp:162 koeditorgeneraltodo.cpp:169
+#, fuzzy
+msgid "Reminder:"
 msgstr "&Atgof:"
 
-#. i18n: file koeditoralarms_base.ui line 271
-#: koeditoralarms.cpp:86 rc.cpp:220 rc.cpp:1934
-#, no-c-format
-msgid "Program"
+#: koeditorgeneralevent.cpp:182
+msgid "S&how time as:"
+msgstr "&Dangos amser fel:"
+
+#: koeditorgeneralevent.cpp:183
+msgid "Sets how this time will appear on your Free/Busy information."
 msgstr ""
 
-#: koeditoralarms.cpp:92
-msgid "Audio"
-msgstr "Sain"
+#: koeditorgeneralevent.cpp:190
+msgid "Busy"
+msgstr "Prysur"
 
-#: koeditoralarms.cpp:95 koprefsdialog.cpp:175
-msgid "Unknown"
-msgstr "Anhysbys"
+#: koeditorgeneralevent.cpp:191
+msgid "Free"
+msgstr "Rhydd"
 
-#: koeditoralarms.cpp:106 printing/calprintdefaultplugins.cpp:310
-msgid ""
-"_: N days/hours/minutes before/after the start/end\n"
-"%1 before the start"
+#: koeditorgeneralevent.cpp:205
+msgid "You have not yet definitely responded to this invitation."
 msgstr ""
 
-#: koeditoralarms.cpp:109 printing/calprintdefaultplugins.cpp:313
-msgid ""
-"_: N days/hours/minutes before/after the start/end\n"
-"%1 after the start"
-msgstr ""
+#: kocounterdialog.cpp:37 koeditorgeneralevent.cpp:208
+msgid "Accept"
+msgstr "Derbyn"
 
-#: koeditoralarms.cpp:114 printing/calprintdefaultplugins.cpp:318
-msgid ""
-"_: N days/hours/minutes before/after the start/end\n"
-"%1 before the end"
-msgstr ""
+#: kocounterdialog.cpp:37 koeditorgeneralevent.cpp:212
+msgid "Decline"
+msgstr "Gwrthod"
 
-#: koeditoralarms.cpp:117 printing/calprintdefaultplugins.cpp:321
-msgid ""
-"_: N days/hours/minutes before/after the start/end\n"
-"%1 after the end"
-msgstr ""
+#: koeditorgeneralevent.cpp:434 koeditorgeneralevent.cpp:448
+#: printing/calprintdefaultplugins.cpp:155
+msgid "Duration: "
+msgstr "Hyd:"
 
-#: koeditoralarms.cpp:126 printing/calprintdefaultplugins.cpp:330
+#: koeditorgeneralevent.cpp:435
 #, c-format
 msgid ""
-"_n: 1 day\n"
-"%n days"
+"_n: 1 Day\n"
+"%n Days"
 msgstr ""
 "1 Diwrnod\n"
-" %n o Ddiwrnodau"
+"%n o Ddiwrnodau"
 
-#: koeditoralarms.cpp:129 koeditorgeneralevent.cpp:432
-#: printing/calprintdefaultplugins.cpp:333
+#: koeditoralarms.cpp:173 koeditorgeneralevent.cpp:450
+#: printing/calprintdefaultplugins.cpp:352
 #, c-format
 msgid ""
 "_n: 1 hour\n"
@@ -841,8 +2272,12 @@ msgstr ""
 "1 awr\n"
 "%n o awriau"
 
-#: koeditoralarms.cpp:132 koeditorgeneralevent.cpp:439
-#: printing/calprintdefaultplugins.cpp:336
+#: koeditorgeneralevent.cpp:454
+msgid ", "
+msgstr ","
+
+#: koeditoralarms.cpp:176 koeditorgeneralevent.cpp:457
+#: printing/calprintdefaultplugins.cpp:355
 #, c-format
 msgid ""
 "_n: 1 minute\n"
@@ -851,87 +2286,51 @@ msgstr ""
 "1 munud\n"
 "%n o funudau"
 
-#: koeditoralarms.cpp:148
-#, fuzzy
-msgid "Edit Reminders"
-msgstr "&Atgof:"
-
-#: koagendaitem.cpp:560
-msgid "Attendee \"%1\" added to the calendar item \"%2\""
-msgstr ""
-
-#: koagendaitem.cpp:560
-#, fuzzy
-msgid "Attendee added"
-msgstr "Cyfarfotwyr"
-
-#: koagendaitem.cpp:819 koagendaitem.cpp:917
-msgid "%1 - %2"
-msgstr "%1 - %2"
-
-#: koagendaitem.cpp:828
-#, c-format
-msgid "- %1"
-msgstr "- %1"
-
-#: incidencechanger.cpp:61
+#: koeditorgeneralevent.cpp:465
 msgid ""
-"Some attendees were removed from the incidence. Shall cancel messages be sent "
-"to these attendees?"
+"Shows the duration of the event or to-do with the current start and end dates "
+"and times."
 msgstr ""
 
-#: incidencechanger.cpp:63
-#, fuzzy
-msgid "Attendees Removed"
-msgstr "Cyfarfotwyr"
-
-#: incidencechanger.cpp:63
-msgid "Send Messages"
-msgstr "Anfon Negeseuon"
-
-#: incidencechanger.cpp:63 kogroupware.cpp:279 kogroupware.cpp:291
-#: kogroupware.cpp:299
-msgid "Do Not Send"
-msgstr "Peidio ac anfon"
-
-#: incidencechanger.cpp:344 kodialogmanager.cpp:113
-#, fuzzy
-msgid "Unable to save %1 \"%2\"."
-msgstr "Methu cadw'r digwyddiad."
+#: koeditorgeneralevent.cpp:482
+msgid "From: %1   To: %2   %3"
+msgstr "O: %1 I: %2 %3"
 
-#: importdialog.cpp:41
-msgid "Import Calendar"
-msgstr "Mewnforio Calendr"
+#: koeditorgeneralevent.cpp:495
+msgid "Please specify a valid start time, for example '%1'."
+msgstr "Rhowch amser dechrau dilys, er engrhaifft '%1'."
 
-#: importdialog.cpp:48
-#, fuzzy
-msgid "Import calendar at '%1' into KOrganizer."
-msgstr "Ydych eisiau ychwanegu calendr wrth '%1' i KTrefnydd"
+#: koeditorgeneralevent.cpp:502
+msgid "Please specify a valid end time, for example '%1'."
+msgstr "Rhowch amser diwedd dilys, er engrhaifft '%1'."
 
-#: importdialog.cpp:57
-#, fuzzy
-msgid "Add as new calendar"
-msgstr "Calendr Newydd"
+#: koeditorgeneralevent.cpp:510
+msgid "Please specify a valid start date, for example '%1'."
+msgstr "Rhowch ddyddiad dechrau dilys, er engrhaifft '%1'."
 
-#: importdialog.cpp:59
-msgid "Merge into existing calendar"
-msgstr ""
+#: koeditorgeneralevent.cpp:517
+msgid "Please specify a valid end date, for example '%1'."
+msgstr "Rhowch ddyddiad diwedd cywir, er engrhaifft '%1'."
 
-#: importdialog.cpp:62
-msgid "Open in separate window"
+#: koeditorgeneralevent.cpp:533
+msgid ""
+"The event ends before it starts.\n"
+"Please correct dates and times."
 msgstr ""
+"Mae'r digwyddiad yn gorffen cyn iddo ddechrau.\n"
+" Cywirwch y dyddiadau ac amserau."
 
-#: koprefsdialog.cpp:99
+#: koprefsdialog.cpp:103
 #, fuzzy
 msgid "Saving Calendar"
 msgstr "Argraffu Calendr"
 
-#: koprefsdialog.cpp:161
+#: koprefsdialog.cpp:165
 msgid "Timezone:"
 msgstr "Cylchfa amser:"
 
 #. i18n: file korganizer.kcfg line 135
-#: koprefsdialog.cpp:162 rc.cpp:567 rc.cpp:1154
+#: koprefsdialog.cpp:166 rc.cpp:570 rc.cpp:1200
 #, no-c-format
 msgid ""
 "Select your timezone from the list of locations on this drop down box. If your "
@@ -939,148 +2338,163 @@ msgid ""
 "automatically adjust for daylight savings."
 msgstr ""
 
-#: koprefsdialog.cpp:206
+#: koeditoralarms.cpp:125 koeditorattachments.cpp:198 koprefsdialog.cpp:179
+msgid "Unknown"
+msgstr "Anhysbys"
+
+#: koprefsdialog.cpp:210
 msgid "[No selection]"
 msgstr "[Dim dewisiad]"
 
 #. i18n: file korganizer.kcfg line 138
-#: koprefsdialog.cpp:255 rc.cpp:570 rc.cpp:1157
+#: koprefsdialog.cpp:259 rc.cpp:573 rc.cpp:1203
 #, no-c-format
 msgid "Use holiday region:"
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 139
-#: koprefsdialog.cpp:256 rc.cpp:573 rc.cpp:1160
+#: koprefsdialog.cpp:260 rc.cpp:576 rc.cpp:1206
 #, no-c-format
 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 ""
 
-#: koprefsdialog.cpp:292
+#: koprefsdialog.cpp:296
 msgid "(None)"
 msgstr "(Dim)"
 
-#: koprefsdialog.cpp:319
-msgid "1 minute"
-msgstr "1 funud"
+#: koprefsdialog.cpp:323
+#, fuzzy
+msgid "Reminders"
+msgstr "Atgof"
 
-#: koprefsdialog.cpp:319
-msgid "5 minutes"
-msgstr "5 munud"
+#: koprefsdialog.cpp:328
+#, fuzzy
+msgid "Default reminder time:"
+msgstr "Amser larwm rhagosodedig:"
 
-#: koprefsdialog.cpp:320
-msgid "10 minutes"
-msgstr "10 munud "
+#. i18n: file koeditoralarms_base.ui line 66
+#: koeditorgeneral.cpp:232 koprefsdialog.cpp:335 korgac/alarmdialog.cpp:157
+#: rc.cpp:172 rc.cpp:2069
+#, no-c-format
+msgid "minute(s)"
+msgstr "munud(au)"
 
-#: koprefsdialog.cpp:320
-msgid "15 minutes"
-msgstr "15 munud"
+#. i18n: file koeditoralarms_base.ui line 71
+#: koeditorgeneral.cpp:233 koprefsdialog.cpp:336 korgac/alarmdialog.cpp:158
+#: rc.cpp:175 rc.cpp:2072
+#, no-c-format
+msgid "hour(s)"
+msgstr "awr(oriau)"
 
-#: koprefsdialog.cpp:321
-msgid "30 minutes"
-msgstr "30 munud"
+#. i18n: file koeditoralarms_base.ui line 76
+#: koeditorgeneral.cpp:234 koeditorrecurrence.cpp:167 koprefsdialog.cpp:337
+#: korgac/alarmdialog.cpp:159 rc.cpp:178 rc.cpp:2075
+#, no-c-format
+msgid "day(s)"
+msgstr "dydd(iau)"
 
-#: koprefsdialog.cpp:322
-#, fuzzy
-msgid "Default reminder time:"
-msgstr "Amser larwm rhagosodedig:"
+#: koprefsdialog.cpp:349
+msgid ""
+"*.ogg *.wav *.mp3 *.wma *.flac *.aiff *.raw *.au *.ra|Audio Files (*.ogg *.wav "
+"*.mp3 *.wma *.flac *.aiff *.raw *.au *.ra)"
+msgstr ""
 
-#: koprefsdialog.cpp:325 koprefsdialog.cpp:328
-#, fuzzy
-msgid "Enter the default reminder time here."
-msgstr "Amser larwm rhagosodedig:"
+#: koprefsdialog.cpp:363
+msgid "Enable reminders by default:"
+msgstr ""
 
-#: koprefsdialog.cpp:336
+#: koprefsdialog.cpp:371
 msgid "Working Hours"
 msgstr "Oriau Gweithio"
 
-#: koprefsdialog.cpp:352
+#: koprefsdialog.cpp:387
 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 ""
 
-#: koprefsdialog.cpp:473
+#: koprefsdialog.cpp:514
 msgid "Date Navigator"
 msgstr ""
 
-#: koprefsdialog.cpp:482
+#: koprefsdialog.cpp:524
 msgid "Agenda View"
 msgstr "Golwg agenda:"
 
-#: koprefsdialog.cpp:488
+#: koprefsdialog.cpp:530
 msgid ""
 "_: suffix in the hour size spin box\n"
 " pixel"
 msgstr ""
 
-#: koprefsdialog.cpp:495
+#: koprefsdialog.cpp:537
 msgid ""
 "_: suffix in the N days spin box\n"
 " days"
 msgstr "o ddiwrnodau"
 
-#: koprefsdialog.cpp:520
+#: koprefsdialog.cpp:558
 msgid "Month View"
 msgstr "Golwg mis"
 
-#: koprefsdialog.cpp:532
+#: koprefsdialog.cpp:568
 #, fuzzy
 msgid "To-do View"
 msgstr "Math Golwg"
 
-#: koprefsdialog.cpp:577 koprefsdialog.cpp:585
+#: koprefsdialog.cpp:613 koprefsdialog.cpp:621
 msgid "Event text"
 msgstr "Testun Digwyddiad:"
 
 #. i18n: file filteredit_base.ui line 193
-#: kolistview.cpp:216 koprefsdialog.cpp:666 kotodoview.cpp:395 rc.cpp:141
-#: rc.cpp:2117
+#: kolistview.cpp:221 koprefsdialog.cpp:703 kotodoview.cpp:394 rc.cpp:141
+#: rc.cpp:2225
 #, no-c-format
 msgid "Categories"
 msgstr "Categorïau"
 
-#: koprefsdialog.cpp:673
+#: koprefsdialog.cpp:711
 msgid ""
 "Select here the event category you want to modify. You can change the selected "
 "category color using the button below."
 msgstr ""
 
-#: koprefsdialog.cpp:680
+#: koprefsdialog.cpp:718
 msgid ""
 "Choose here the color of the event category selected using the combo box above."
 msgstr ""
 
-#: koprefsdialog.cpp:686
+#: koprefsdialog.cpp:724
 msgid "Resources"
 msgstr "Adnoddau"
 
-#: koprefsdialog.cpp:692
+#: koprefsdialog.cpp:730
 msgid ""
 "Select here resource you want to modify. You can change the selected resource "
 "color using the button below."
 msgstr ""
 
-#: koprefsdialog.cpp:699
+#: koprefsdialog.cpp:737
 msgid ""
 "Choose here the color of the resource selected using the combo box above."
 msgstr ""
 
-#: koprefsdialog.cpp:844
+#: koprefsdialog.cpp:882
 msgid "Scheduler Mail Client"
 msgstr "Dibynnydd Ebost y Trefnlennydd "
 
-#: koprefsdialog.cpp:847
+#: koprefsdialog.cpp:885
 msgid "Mail client"
 msgstr "Dibynnydd Ebost"
 
-#: koprefsdialog.cpp:852
+#: koprefsdialog.cpp:890
 msgid "Additional email addresses:"
 msgstr "Cyfeiriadau ebost ychwanegol:"
 
-#: koprefsdialog.cpp:853
+#: koprefsdialog.cpp:891
 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 "
@@ -1088,279 +2502,217 @@ msgid ""
 "to list this address here so KOrganizer can recognize it as yours."
 msgstr ""
 
-#: koprefsdialog.cpp:868
+#: koprefsdialog.cpp:906
 msgid "Additional email address:"
 msgstr "Cyfeiriad ebost ychwanegol:"
 
-#: koprefsdialog.cpp:869
+#: koprefsdialog.cpp:907
 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 ""
 
-#: koprefsdialog.cpp:881
+#: koprefsdialog.cpp:919
 msgid "New"
 msgstr "Newydd"
 
-#: koprefsdialog.cpp:882
+#: koprefsdialog.cpp:920
 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 ""
 
-#: koprefsdialog.cpp:929 publishdialog.cpp:102
+#: koprefsdialog.cpp:967 publishdialog.cpp:102
 msgid "(EmptyEmail)"
 msgstr "(EbostGwag)"
 
-#: koprefsdialog.cpp:1080
+#: koprefsdialog.cpp:1123
 #, fuzzy
 msgid "Configure &Plugin..."
 msgstr "Ffurfweddu'r &Ategion"
 
-#: koprefsdialog.cpp:1081
+#: koprefsdialog.cpp:1124
 msgid ""
 "This button allows you to configure the plugin that you have selected in the "
 "list above"
 msgstr ""
 
-#: koprefsdialog.cpp:1142
+#: koprefsdialog.cpp:1185
 msgid "Unable to configure this plugin"
 msgstr "Wedi methu ffurfweddu yr ategyn hwn"
 
-#: history.cpp:185
-#, c-format
-msgid "Delete %1"
-msgstr "Dileu %1"
-
-#: history.cpp:214
-#, c-format
-msgid "Add %1"
-msgstr "Ychwanegu %1"
-
-#: history.cpp:251
-#, c-format
-msgid "Edit %1"
-msgstr "Golygu %1"
-
-#: freebusymanager.cpp:228
-msgid ""
-"<qt>No URL configured for uploading your free/busy list. Please set it in "
-"KOrganizer's configuration dialog, on the \"Free/Busy\" page. "
-"<br>Contact your system administrator for the exact URL and the account "
-"details.</qt>"
-msgstr ""
+#: searchdialog.cpp:49
+msgid "Find Events"
+msgstr "Darganfod Digwyddiadau"
 
-#: freebusymanager.cpp:232
-msgid "No Free/Busy Upload URL"
-msgstr ""
+#: searchdialog.cpp:50
+msgid "&Find"
+msgstr "&Darganfod"
 
-#: freebusymanager.cpp:239
-msgid "<qt>The target URL '%1' provided is invalid.</qt>"
-msgstr ""
+#: searchdialog.cpp:62
+msgid "&Search for:"
+msgstr "&Chwilio am:"
 
-#: freebusymanager.cpp:240
-msgid "Invalid URL"
-msgstr ""
+#: searchdialog.cpp:70
+msgid "Search For"
+msgstr "Chwilio am:"
 
-#: freebusymanager.cpp:330
+#: searchdialog.cpp:73
 #, fuzzy
-msgid ""
-"<qt>The software could not upload your free/busy list to the URL '%1'. There "
-"might be a problem with the access rights, or you specified an incorrect URL. "
-"The system said: <em>%2</em>."
-"<br>Please check the URL or contact your system administrator.</qt>"
-msgstr ""
-"<qt>Ni allodd y feddalwedd lanlwytho eich rhestr rhydd/prysur i'r URL %1.  "
-"Efallai mae problem efo'r hawliau cyrchiad, neu rycych wedi penodi URL "
-"anghywir.  Dywedodd y cysawd: <em>%2</em>."
-"<br>Gwiriwch yr URL neu gysylltwch â'ch gweinyddwr cysawd.</qt>"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "KGyfieithu"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "kyfieithu@dotmon.com"
-
-#: koeditorgeneral.cpp:104
-msgid "Owner:"
-msgstr "Perchennog:"
-
-#: koeditorgeneral.cpp:108
-msgid "Sets the Title of this event or to-do."
-msgstr ""
-
-#: koeditorgeneral.cpp:109 koeditorgeneraljournal.cpp:63
-msgid "T&itle:"
-msgstr "&Teitl:"
+msgid "To-&dos"
+msgstr "I-&Wneudau"
 
-#: koeditorgeneral.cpp:127
-msgid "Sets where the event or to-do will take place."
-msgstr ""
+#: searchdialog.cpp:74
+msgid "&Journal entries"
+msgstr "C&ofnodion dyddlyfr"
 
-#: koeditorgeneral.cpp:128
-msgid "&Location:"
-msgstr "&Lleoliad:"
+#: exportwebdialog.cpp:143 searchdialog.cpp:79
+msgid "Date Range"
+msgstr "Amrediad Dyddiadau"
 
-#: koeditorgeneral.cpp:144
-msgid ""
-"Allows you to select the categories that this event or to-do belongs to."
-msgstr ""
+#: searchdialog.cpp:87
+msgid "Fr&om:"
+msgstr "Od&diwrth:"
 
-#: koeditorgeneral.cpp:145
-#, fuzzy
-msgid "Categories:"
-msgstr "Categorïau"
+#: searchdialog.cpp:91
+msgid "&To:"
+msgstr "&I:"
 
-#: koeditorgeneral.cpp:154
+#: searchdialog.cpp:95
 #, fuzzy
-msgid "&Select..."
-msgstr "Golygu'r Dewisiad..."
-
-#: koeditorgeneral.cpp:164
-msgid "Acc&ess:"
-msgstr "Cyrc&hiad:"
-
-#: koeditorgeneral.cpp:165
-msgid ""
-"Sets whether the access to this event or to-do is restricted. Please note that "
-"KOrganizer currently does not use this setting, so the implementation of the "
-"restrictions will depend on the groupware server. This means that events or "
-"to-dos marked as private or confidential may be visible to others."
-msgstr ""
-
-#: koeditorgeneral.cpp:186
-msgid ""
-"Sets the description for this event or to-do. This will be displayed in a "
-"reminder if one is set, as well as in a tooltip when you hover over the event."
-msgstr ""
+msgid "E&vents have to be completely included"
+msgstr "R&haid i ddigwyddiadau gael eu cynnwys yn gyfangwbl"
 
-#: koeditorgeneral.cpp:210
+#: searchdialog.cpp:98
 #, fuzzy
-msgid "No reminders configured"
-msgstr "Atgof"
-
-#: koeditorgeneral.cpp:216
-msgid "&Reminder:"
-msgstr "&Atgof:"
-
-#: koeditorgeneral.cpp:218
-msgid "Activates a reminder for this event or to-do."
-msgstr ""
-
-#: koeditorgeneral.cpp:220
-msgid "Sets how long before the event occurs the reminder will be triggered."
-msgstr ""
+msgid "Include to-dos &without due date"
+msgstr "Cynnwys i-wneudau &heb ddyddiad disgwyliedig"
 
-#. i18n: file koeditoralarms_base.ui line 60
-#: koeditorgeneral.cpp:228 korgac/alarmdialog.cpp:120 rc.cpp:172 rc.cpp:1886
-#, no-c-format
-msgid "minute(s)"
-msgstr "munud(au)"
+#: searchdialog.cpp:102
+msgid "Search In"
+msgstr "Chwilio Mewn"
 
-#. i18n: file koeditoralarms_base.ui line 65
-#: koeditorgeneral.cpp:229 korgac/alarmdialog.cpp:121 rc.cpp:175 rc.cpp:1889
-#, no-c-format
-msgid "hour(s)"
-msgstr "awr(oriau)"
+#: searchdialog.cpp:105
+msgid "Su&mmaries"
+msgstr "Cr&ynodebau"
 
-#: koeditorgeneral.cpp:237
-msgid "Advanced"
-msgstr "Uwch"
+#: searchdialog.cpp:107
+msgid "Desc&riptions"
+msgstr "Dis&grifiadau"
 
-#: koeditorgeneral.cpp:322 koeditorgeneral.cpp:399
-msgid "Owner: "
-msgstr "Perchennog:"
+#: searchdialog.cpp:108
+msgid "Cate&gories"
+msgstr "Ca&tegorïau"
 
-#: koeditorgeneral.cpp:357
-#, c-format
+#: searchdialog.cpp:149
 msgid ""
-"_n: 1 advanced reminder configured\n"
-"%n advanced reminders configured"
+"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."
 
-#: koeditorgeneral.cpp:384
-msgid "1 advanced reminder configured"
-msgstr ""
+#: searchdialog.cpp:162
+msgid "No events were found matching your search expression."
+msgstr "Ni chanfuwyd digwyddiadau sy'n cydweddu eich mynediad chwilio."
 
-#: koeditorgeneral.cpp:422
-#, fuzzy, c-format
-msgid "Calendar: %1"
-msgstr "Calendr"
+#: konewstuff.cpp:48
+#, fuzzy
+msgid "Could not load calendar."
+msgstr "Wedi methu llwytho calendr."
 
-#: koeditorgeneral.cpp:496
-#, fuzzy, c-format
-msgid ""
-"_n: One attendee\n"
-"%n attendees"
+#: konewstuff.cpp:63
+msgid "The downloaded events will be merged into your current calendar."
 msgstr ""
-"1 munud\n"
-"%n o funudau"
-
-#: koeditorgeneralevent.cpp:102 koeditorgeneraltodo.cpp:102
-msgid "Date && Time"
-msgstr "Dyddiad ac Amser"
+"Mi fydd y disgwyddiadau â lawrlwythwyd yn cael eu cyfuno i'ch calendr cyfredol."
 
-#: koeditorgeneraltodo.cpp:107
+#: koeditorgeneraltodo.cpp:105
 msgid "Sets options for due and start dates and times for this to-do."
 msgstr ""
 
-#: koeditorgeneraltodo.cpp:114
+#: koeditorgeneraltodo.cpp:112
 msgid "Sets the start date for this to-do"
 msgstr ""
 
-#: koeditorgeneraltodo.cpp:115
+#: koeditorgeneraltodo.cpp:113
 msgid "Sta&rt:"
 msgstr "De&chrau:"
 
-#: koeditorgeneraltodo.cpp:128
+#: koeditorgeneraltodo.cpp:126
 msgid "Sets the start time for this to-do."
 msgstr ""
 
-#: koeditorgeneraltodo.cpp:132
+#: koeditorgeneraltodo.cpp:130
 msgid "Sets the due date for this to-do."
 msgstr ""
 
-#: koeditorgeneraltodo.cpp:133
+#: koeditorgeneraltodo.cpp:131
 msgid "&Due:"
 msgstr "D&isgwyliedig:"
 
-#: koeditorgeneraltodo.cpp:148
+#: koeditorgeneraltodo.cpp:145
 msgid "Sets the due time for this to-do."
 msgstr ""
 
-#: koeditorgeneraltodo.cpp:152
+#: koeditorgeneraltodo.cpp:149
 msgid "Ti&me associated"
 msgstr "Amser c&ysylltiedig"
 
-#: koeditorgeneraltodo.cpp:154
+#: koeditorgeneraltodo.cpp:151
 msgid ""
 "Sets whether or not this to-do's start and due dates have times associated with "
 "them."
 msgstr ""
 
-#: koeditorgeneraltodo.cpp:172
-msgid "Sets the current completion status of this to-do as a percentage."
+#: koeditorgeneraltodo.cpp:189
+#, fuzzy
+msgid "&Completed:"
+msgstr "Cyflawn"
+
+#: koeditorgeneraltodo.cpp:194
+msgid "Toggle between 0% and 100% complete"
+msgstr ""
+
+#: koeditorgeneraltodo.cpp:196
+#, c-format
+msgid ""
+"Click this checkbox to toggle the completed percentage of the to-do between 0% "
+"or 100%"
+msgstr ""
+
+#: koeditorgeneraltodo.cpp:204
+msgid "Select the completed percentage"
+msgstr ""
+
+#: koeditorgeneraltodo.cpp:206
+msgid "Use this combobox to set the completion percentage of the to-do."
 msgstr ""
 
-#: koeditorgeneraltodo.cpp:178
+#: koeditorgeneraltodo.cpp:209
 #, no-c-format
 msgid ""
 "_: Percent complete\n"
 "%1 %"
 msgstr "%1 %"
 
-#: koeditorgeneraltodo.cpp:184 koeditorgeneraltodo.cpp:544
-msgid "co&mpleted"
-msgstr "cy&flawn"
+#: koeditorgeneraltodo.cpp:215
+#, fuzzy
+msgid ""
+"_: completed on\n"
+"on"
+msgstr "cyfla&wn ar"
+
+#: koeditorgeneraltodo.cpp:230
+msgid "&Priority:"
+msgstr "&Blaenoriaeth:"
 
-#: koeditorgeneraltodo.cpp:197
+#: koeditorgeneraltodo.cpp:235
+#, fuzzy
+msgid "Set the priority of the to-do"
+msgstr "Cynnwys &blaenoriaeth yr eitem"
+
+#: koeditorgeneraltodo.cpp:237
 msgid ""
 "Sets the priority of this to-do on a scale from one to nine, with one being the "
 "highest priority, five being a medium priority, and nine being the lowest. In "
@@ -1368,983 +2720,961 @@ msgid ""
 "appropriate scale."
 msgstr ""
 
-#: koeditorgeneraltodo.cpp:203
-msgid "&Priority:"
-msgstr "&Blaenoriaeth:"
-
-#: koeditorgeneraltodo.cpp:207
+#: koeditorgeneraltodo.cpp:241
 #, fuzzy
 msgid "unspecified"
 msgstr "Lleoliad:"
 
-#: koeditorgeneraltodo.cpp:208 kotodoview.cpp:417
+#: koeditorgeneraltodo.cpp:242 kotodoview.cpp:418
 #, fuzzy
 msgid "1 (highest)"
 msgstr "1 (Uchaf)"
 
-#: koeditorgeneraltodo.cpp:209 kotodoview.cpp:418
+#: koeditorgeneraltodo.cpp:243 kotodoview.cpp:419
 msgid "2"
 msgstr "2"
 
-#: koeditorgeneraltodo.cpp:210 kotodoview.cpp:419
+#: koeditorgeneraltodo.cpp:244 kotodoview.cpp:420
 msgid "3"
 msgstr "3"
 
-#: koeditorgeneraltodo.cpp:211 kotodoview.cpp:420
+#: koeditorgeneraltodo.cpp:245 kotodoview.cpp:421
 msgid "4"
 msgstr "4"
 
-#: koeditorgeneraltodo.cpp:212 kotodoview.cpp:421
+#: koeditorgeneraltodo.cpp:246 kotodoview.cpp:422
 msgid "5 (medium)"
 msgstr ""
 
-#: koeditorgeneraltodo.cpp:213 kotodoview.cpp:422
+#: koeditorgeneraltodo.cpp:247 kotodoview.cpp:423
 msgid "6"
 msgstr "6"
 
-#: koeditorgeneraltodo.cpp:214 kotodoview.cpp:423
+#: koeditorgeneraltodo.cpp:248 kotodoview.cpp:424
 msgid "7"
 msgstr "7"
 
-#: koeditorgeneraltodo.cpp:215 kotodoview.cpp:424
+#: koeditorgeneraltodo.cpp:249 kotodoview.cpp:425
 msgid "8"
 msgstr "8"
 
-#: koeditorgeneraltodo.cpp:216 kotodoview.cpp:425
+#: koeditorgeneraltodo.cpp:250 kotodoview.cpp:426
 #, fuzzy
 msgid "9 (lowest)"
 msgstr "5 (Isaf)"
 
-#: koeditorgeneraltodo.cpp:451
+#: koeditorgeneraltodo.cpp:492
 msgid "Please specify a valid due date."
 msgstr "Rhowch ddyddiad disgwyliedig dilys os gwelwch yn dda."
 
-#: koeditorgeneraltodo.cpp:456
+#: koeditorgeneraltodo.cpp:497
 msgid "Please specify a valid due time."
 msgstr "Rhowch amser disgwyliedig dilys os gwelwch yn dda."
 
-#: koeditorgeneraltodo.cpp:464
+#: koeditorgeneraltodo.cpp:505
 msgid "Please specify a valid start date."
 msgstr "Rhowch ddyddiad dechrau dilys os gwelwch yn dda."
 
-#: koeditorgeneraltodo.cpp:469
+#: koeditorgeneraltodo.cpp:510
 msgid "Please specify a valid start time."
 msgstr "Rhowch amser dechrau dilys os gwelwch yn dda."
 
-#: koeditorgeneraltodo.cpp:486
+#: koeditorgeneraltodo.cpp:527
 msgid "The start date cannot be after the due date."
 msgstr "Ni all y dyddiad dechrau bod ar ôl y dyddiad gorffen."
 
-#: koeditorgeneraltodo.cpp:508
+#: koeditorgeneraltodo.cpp:572
 #, c-format
 msgid "Start: %1"
 msgstr "Cychwyn: %1"
 
-#: koeditorgeneraltodo.cpp:516
+#: koeditorgeneraltodo.cpp:580
 #, fuzzy, c-format
 msgid "   Due: %1"
 msgstr "Disgwyliedig:"
 
-#: koeditorgeneraltodo.cpp:537
-msgid "co&mpleted on"
-msgstr "cyfla&wn ar"
-
-#: kogroupware.cpp:168
-#, fuzzy, c-format
-msgid "Error message: %1"
-msgstr "Gwall wrth lwytho'r ffeil batrymlun '%1'"
+#: exportwebdialog.cpp:73
+msgid "Export Calendar as Web Page"
+msgstr "Allforio Calendr fel Tudalen Wê"
 
-#: kogroupware.cpp:172
-msgid "Error while processing an invitation or update."
+#: exportwebdialog.cpp:131
+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."
 
-#: kogroupware.cpp:271
-msgid "event"
-msgstr "digwyddiad"
-
-#: kogroupware.cpp:272
-msgid "task"
-msgstr "tasg"
-
-#: kogroupware.cpp:273
-msgid "journal entry"
-msgstr "cofnod dyddlyfr"
+#: exportwebdialog.cpp:132
+msgid "Setting Default Preferences"
+msgstr "Gosod Hoffiannau Rhagosod"
 
-#: kogroupware.cpp:275
-msgid ""
-"This %1 includes other people. Should email be sent out to the attendees?"
+#: exportwebdialog.cpp:133
+msgid "Reset to Defaults"
 msgstr ""
-"Mae'r %1 yma yn cynnwys pobl eraill.  A ddylir anfon ebost i'r cyfarfotwyr?"
-
-#: kogroupware.cpp:279
-msgid "Group Scheduling Email"
-msgstr "Ebost trefnlennu grŵp"
 
-#: kogroupware.cpp:279
-msgid "Send Email"
-msgstr "Anfon Ebost"
+#: exportwebdialog.cpp:140 koeventeditor.cpp:122 kojournaleditor.cpp:76
+#: kotodoeditor.cpp:100
+msgid "General"
+msgstr "Cyffredinol"
 
-#: kogroupware.cpp:289
-msgid "Do you want to send a status update to the organizer of this task?"
-msgstr "A ydych chi am anfon adnewyddiad cyflwr at drefnydd y dasg hon?"
+#: exportwebdialog.cpp:148
+msgid "View Type"
+msgstr "Gweld Math"
 
-#: kogroupware.cpp:291 kogroupware.cpp:299
-#, fuzzy
-msgid "Send Update"
-msgstr "Dyddiad gorffen:"
+#: exportwebdialog.cpp:161
+msgid "Destination"
+msgstr "Cyrchfan"
 
-#: kogroupware.cpp:295
+#: exportwebdialog.cpp:178
 #, fuzzy
-msgid ""
-"Your status as an attendee of this event changed. Do you want to send a status "
-"update to the organizer of this event?"
-msgstr "A ydych chi am anfon adnewyddiad cyflwr at drefnydd y dasg hon?"
+msgid "To-dos"
+msgstr "I-&Wneudau"
 
-#: kogroupware.cpp:302
-msgid ""
-"You are not the organizer of this event. Deleting it will bring your calendar "
-"out of sync with the organizers calendar. Do you really want to delete it?"
-msgstr ""
-"Nid chi yw trefnydd y digwyddiad hwn. Mi fydd dileu hwn yn achosi i'ch calendr "
-"golli cydweddiad â chalendr y trefnydd. A ydych wir eisiau ei ddileu?"
+#: exportwebdialog.cpp:199
+msgid "Events"
+msgstr "Digwyddiadau"
 
-#: kogroupware.cpp:307
+#: datenavigatorcontainer.cpp:52
 msgid ""
-"You are not the organizer of this event. Editing it will bring your calendar "
-"out of sync with the organizers calendar. Do you really want to edit it?"
-msgstr ""
-"Nid chi yw trefnydd y digwyddiad hwn. Mi fydd golygu hwn yn achosi i'ch calendr "
-"golli cydweddiad â chalendr y trefnydd. A ydych wir eisiau ei olygu?"
-
-#: kogroupware.cpp:323
-msgid "<No summary given>"
-msgstr "<Ni roddwyd crynodeb>"
-
-#: kogroupware.cpp:342 mailscheduler.cpp:89
-#, c-format
-msgid "Counter proposal: %1"
-msgstr ""
-
-#: kogroupware.cpp:344
-msgid "Proposed new meeting time: %1 - %2"
+"<qt>"
+"<p>Select the dates you want to display in KOrganizer's main view here. Hold "
+"down 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 ""
 
-#: publishdialog.cpp:43
-msgid "Select Addresses"
-msgstr "Dewis Cyfeiriad"
-
-#: publishdialog.cpp:101
-msgid "(EmptyName)"
-msgstr "(EnwGwag)"
-
-#: kocorehelper.cpp:43 kodaymatrix.cpp:283 komonthview.cpp:913
-msgid ""
-"_: delimiter for joining holiday names\n"
-", "
-msgstr ","
+#: journalentry.cpp:92
+#, fuzzy
+msgid "[Add Journal Entry]"
+msgstr "&Dyddlyfr"
 
-#: kolistview.cpp:205 korgac/alarmdialog.cpp:97 kotodoview.cpp:387
-#: plugins/timespanview/timespanwidget.cpp:51
-#: printing/calprintdefaultplugins.cpp:1003
-#: printing/calprintdefaultplugins.cpp:1085
-msgid "Summary"
-msgstr "Crynodeb"
+#: journalentry.cpp:191
+#, fuzzy
+msgid "Sets the Title of this journal entry."
+msgstr "Dileu Hen Ddigwyddiadau"
 
-#: kolistview.cpp:206 korgac/alarmdialog.cpp:81
-msgid "Reminder"
-msgstr "Atgof"
+#: journalentry.cpp:193
+msgid "&Title: "
+msgstr "&Teitl: "
 
-#: kolistview.cpp:207 kotodoview.cpp:388
-msgid "Recurs"
-msgstr "Yn Ail-ddigwydd"
+#: journalentry.cpp:202
+msgid "Ti&me: "
+msgstr "Am&ser: "
 
-#: kolistview.cpp:208 printing/calprintdefaultplugins.cpp:1004
-msgid "Start Date"
-msgstr "Dyddiad Dechrau"
+#: journalentry.cpp:208
+msgid "Determines whether this journal entry has a time associated with it"
+msgstr ""
 
-#: kolistview.cpp:210
-msgid "Start Time"
-msgstr "Amser Dechrau"
+#: journalentry.cpp:210
+#, fuzzy
+msgid "Sets the time associated with this journal entry"
+msgstr "Dileu Hen Ddigwyddiadau"
 
-#: kolistview.cpp:212
-msgid "End Date"
-msgstr "Dyddiad Gorffen"
+#: journalentry.cpp:217 journalentry.cpp:218
+#, fuzzy
+msgid "Delete this journal entry"
+msgstr "Dileu Hen Ddigwyddiadau"
 
-#: kolistview.cpp:214
-msgid "End Time"
-msgstr "Amser Gorffen"
+#: journalentry.cpp:225
+#, fuzzy
+msgid "Edit this journal entry"
+msgstr "Dileu Hen Ddigwyddiadau"
 
-#: eventarchiver.cpp:104
-#, fuzzy, c-format
-msgid "There are no items before %1"
-msgstr "Nid oes digwyddiadau cyn %1"
+#: journalentry.cpp:226
+#, fuzzy
+msgid "Opens an editor dialog for this journal entry"
+msgstr "Dileu Hen Ddigwyddiadau"
 
-#: eventarchiver.cpp:131
+#: journalentry.cpp:234
 #, fuzzy
-msgid ""
-"Delete all items before %1 without saving?\n"
-"The following items will be deleted:"
-msgstr ""
-"Dileu pob digwyddiad cyn %1 heb gadw?\n"
-" Mi fydd y digwyddiadau hyn yn cael eu dileu:"
+msgid "Print this journal entry"
+msgstr "Dileu Hen Ddigwyddiadau"
 
-#: eventarchiver.cpp:134
+#: journalentry.cpp:235
 #, fuzzy
-msgid "Delete Old Items"
+msgid "Opens the print dialog for this journal entry"
 msgstr "Dileu Hen Ddigwyddiadau"
 
-#: eventarchiver.cpp:202
-#, fuzzy, c-format
-msgid "Cannot write archive file %1."
-msgstr "Methu ysgrifennu'r ffeil archif."
+#: koeditoralarms.cpp:113
+#, fuzzy
+msgid "Reminder Dialog"
+msgstr "&Atgof:"
 
-#: eventarchiver.cpp:211
-msgid "Cannot write archive to final destination."
-msgstr "Methu ysgrifennu'r ffeil archif i'r gyrchfan olaf. "
+#. i18n: file koeditoralarms_base.ui line 277
+#: koeditoralarms.cpp:116 rc.cpp:220 rc.cpp:2117
+#, no-c-format
+msgid "Program"
+msgstr ""
 
-#: kotodoview.cpp:218
-#, fuzzy
-msgid "Cannot move to-do to itself or a child of itself."
-msgstr "Methu symyd I'w-Wneud i'w hun, neu i un o'i blant"
+#: koeditoralarms.cpp:122
+msgid "Audio"
+msgstr "Sain"
 
-#: kotodoview.cpp:219
-msgid "Drop To-do"
-msgstr "Gwaredu I'w-Wneud"
+#: koeditoralarms.cpp:137 printing/calprintdefaultplugins.cpp:329
+msgid ""
+"_: N days/hours/minutes before/after the start/end\n"
+"%1 before the start"
+msgstr ""
 
-#: kotodoview.cpp:231
-msgid "Unable to change to-do's parent, because the to-do cannot be locked."
+#: koeditoralarms.cpp:141 printing/calprintdefaultplugins.cpp:332
+msgid ""
+"_: N days/hours/minutes before/after the start/end\n"
+"%1 after the start"
 msgstr ""
 
-#: kotodoview.cpp:279
+#: koeditoralarms.cpp:148
 msgid ""
-"Unable to add attendees to the to-do, because the to-do cannot be locked."
+"_: N days/hours/minutes before/after the due date\n"
+"%1 before the to-do is due"
 msgstr ""
 
-#: kotodoview.cpp:369
-#, fuzzy
-msgid "To-dos:"
-msgstr "I'w-Wneud:"
+#: koeditoralarms.cpp:151 printing/calprintdefaultplugins.cpp:337
+msgid ""
+"_: N days/hours/minutes before/after the start/end\n"
+"%1 before the end"
+msgstr ""
 
-#: kotodoview.cpp:373
-#, fuzzy
-msgid "Click to add a new to-do"
-msgstr "Cliciwch i ychwanegu I-Wneud newydd"
+#: koeditoralarms.cpp:157
+msgid ""
+"_: N days/hours/minutes before/after the due date\n"
+"%1 after the to-do is due"
+msgstr ""
 
-#: kotodoview.cpp:389 printing/calprintdefaultplugins.cpp:1006
-#: printing/calprintdefaultplugins.cpp:1077
-msgid "Priority"
-msgstr "Blaenoriaeth"
+#: koeditoralarms.cpp:160 printing/calprintdefaultplugins.cpp:340
+msgid ""
+"_: N days/hours/minutes before/after the start/end\n"
+"%1 after the end"
+msgstr ""
 
-#: kotodoview.cpp:391 printing/calprintdefaultplugins.cpp:1092
-msgid "Complete"
-msgstr "Cyflawn"
+#: koeditoralarms.cpp:170 printing/calprintdefaultplugins.cpp:349
+#, c-format
+msgid ""
+"_n: 1 day\n"
+"%n days"
+msgstr ""
+"1 Diwrnod\n"
+" %n o Ddiwrnodau"
 
-#: kotodoview.cpp:393
+#: koeditoralarms.cpp:193
 #, fuzzy
-msgid "Due Date/Time"
-msgstr "Amser Disgwyledig"
-
-#: kotodoview.cpp:397
-msgid "Sort Id"
-msgstr "Trefnu ID"
+msgid "Advanced Reminders"
+msgstr "&Atgof:"
 
-#: kotodoview.cpp:416
+#: koeditoralarms.cpp:204
 msgid ""
-"_: Unspecified priority\n"
-"unspecified"
+"_: Add a new alarm to the alarm list.\n"
+"&Add"
 msgstr ""
 
-#: actionmanager.cpp:452 kotodoview.cpp:463
-msgid "New &To-do..."
-msgstr "&I'w-Gwneud Newydd..."
+#: koeditoralarms.cpp:460
+#, fuzzy
+msgid "before the to-do starts"
+msgstr "Canoli wrth Gychwyn"
 
-#: actionmanager.cpp:456 kotodoview.cpp:465
-msgid "New Su&b-to-do..."
-msgstr "Is-I'w-&Gwneud Newydd..."
+#: koeditoralarms.cpp:461
+#, fuzzy
+msgid "after the to-do starts"
+msgstr "Canoli wrth Gychwyn"
 
-#: kotodoview.cpp:467
+#: koeditoralarms.cpp:462
 #, fuzzy
-msgid "&Make this To-do Independent"
-msgstr "&Gwneud Is-I'w-Wneud yn Annibynnol"
+msgid "before the to-do is due"
+msgstr "Canoli wrth Gychwyn"
 
-#: kotodoview.cpp:469
+#: koeditoralarms.cpp:463
 #, fuzzy
-msgid "Make all Sub-to-dos &Independent"
-msgstr "Gwneud Is-I'w-Wneud yn Annibynnol"
+msgid "after the to-do is due"
+msgstr "Canoli wrth Gychwyn"
 
-#: kotodoview.cpp:472
-msgid "&Copy To"
-msgstr "&Copïo I"
+#: koeditoralarms.cpp:466
+msgid "Select the reminder trigger relative to the start or due time"
+msgstr ""
 
-#: kotodoview.cpp:473
-msgid "&Move To"
-msgstr "&Symud I"
+#: koeditoralarms.cpp:469
+msgid ""
+"Use this combobox to specify if you want the reminder to trigger before or "
+"after the start or due time."
+msgstr ""
 
-#: kotodoview.cpp:475
+#: kocorehelper.cpp:47 kodaymatrix.cpp:287 komonthview.cpp:1006
 msgid ""
-"_: delete completed to-dos\n"
-"Pur&ge Completed"
-msgstr "&Carthiad wedi'i Gwblhau"
+"_: delimiter for joining holiday names\n"
+", "
+msgstr ","
 
-#: kotodoview.cpp:484
-msgid "&New To-do..."
-msgstr "&I'w-Wneud newydd..."
+#: printing/calprintdefaultplugins.cpp:142
+#: printing/calprintdefaultplugins.cpp:171
+#: printing/calprintdefaultplugins.cpp:190
+#, fuzzy
+msgid "Start date: "
+msgstr "Dyddiad dechrau:"
 
-#: kotodoview.cpp:486
-msgid ""
-"_: delete completed to-dos\n"
-"&Purge Completed"
-msgstr "&Carthiad wedi'i Gwblhau"
+#: printing/calprintdefaultplugins.cpp:146
+#: printing/calprintdefaultplugins.cpp:175
+#, fuzzy
+msgid "No start date"
+msgstr "Dyddiad dechrau:"
 
-#: koagendaview.cpp:290 koagendaview.cpp:771 multiagendaview.cpp:58
+#: printing/calprintdefaultplugins.cpp:151
 #, fuzzy
-msgid "All Day"
-msgstr "Dydd"
+msgid "End date: "
+msgstr "Dyddiad gorffen:"
 
-#: koagendaview.cpp:588
+#: printing/calprintdefaultplugins.cpp:158
+#, fuzzy, c-format
 msgid ""
-"_: short_weekday date (e.g. Mon 13)\n"
-"%1 %2"
-msgstr "%1 %2"
-
-#: koagendaview.cpp:1402
-msgid "Unable to modify this to-do, because it cannot be locked."
+"_n: 1 hour \n"
+"%n hours "
 msgstr ""
+"1 awr\n"
+"%n o awriau"
 
-#: kowhatsnextview.cpp:100
-msgid "What's Next?"
-msgstr "Beth sydd nesaf?"
-
-#: kowhatsnextview.cpp:107
+#: printing/calprintdefaultplugins.cpp:161
+#, fuzzy, c-format
 msgid ""
-"_: Date from - to\n"
-"%1 - %2"
-msgstr "%1 - %2"
-
-#: kowhatsnextview.cpp:123
-msgid "Events:"
-msgstr "Digwyddiadau:"
-
-#: kowhatsnextview.cpp:159
-msgid "To-do:"
-msgstr "I'w-Wneud:"
+"_n: 1 minute \n"
+"%n minutes "
+msgstr ""
+"1 munud\n"
+"%n o funudau"
 
-#: kowhatsnextview.cpp:198 kowhatsnextview.cpp:219
-msgid "Events and to-dos that need a reply:"
-msgstr "Digwyddiadau ac I'w-Gwneud sydd angen ateb:"
+#: printing/calprintdefaultplugins.cpp:164
+#, fuzzy
+msgid "No end date"
+msgstr "&Heb ddyddiad gorffen"
 
-#: kowhatsnextview.cpp:282 plugins/printing/year/yearprint.cpp:174
-msgid ""
-"_: date from - to\n"
-"%1 - %2"
-msgstr "%1 - %2"
+#: printing/calprintdefaultplugins.cpp:180
+#, fuzzy
+msgid "Due date: "
+msgstr "Dyddiad Disgwyliedig"
 
-#: kowhatsnextview.cpp:287
+#: printing/calprintdefaultplugins.cpp:184
 #, fuzzy
+msgid "No due date"
+msgstr "Dyddiad Disgwyliedig"
+
+#: printing/calprintdefaultplugins.cpp:298
 msgid ""
-"_: date, from - to\n"
-"%1, %2 - %3"
-msgstr "%1 - %2"
+"_: except for listed dates\n"
+" except"
+msgstr ""
 
-#: kowhatsnextview.cpp:315
+#: printing/calprintdefaultplugins.cpp:306
 #, fuzzy
-msgid "  (Due: %1)"
-msgstr "Disgwyliedig:"
+msgid "Repeats: "
+msgstr "Ail-adrodd"
 
-#: kocounterdialog.cpp:36
+#: printing/calprintdefaultplugins.cpp:313
 #, fuzzy
-msgid "Counter-Event Viewer"
-msgstr "Gwelydd Gwrth-ddigwyddiadau"
-
-#: kocounterdialog.cpp:37 koeditorgeneralevent.cpp:213
-msgid "Decline"
-msgstr "Gwrthod"
+msgid "No reminders"
+msgstr "Atgof"
 
-#: kocounterdialog.cpp:37 koeditorgeneralevent.cpp:209
-msgid "Accept"
-msgstr "Derbyn"
+#: printing/calprintdefaultplugins.cpp:316
+#, fuzzy, c-format
+msgid ""
+"_n: Reminder: \n"
+"%n reminders: "
+msgstr ""
+"1 munud\n"
+"%n o funudau"
 
-#: koprefs.cpp:87
+#: printing/calprintdefaultplugins.cpp:359
+#: printing/calprintdefaultplugins.cpp:604
 msgid ""
-"_: Default export file\n"
-"calendar.html"
-msgstr "calendar.html"
+"_: Spacer for the joined list of categories\n"
+", "
+msgstr ""
 
-#: koprefs.cpp:163
-msgid "Appointment"
-msgstr "Apwyntiad"
+#: printing/calprintdefaultplugins.cpp:366
+#, fuzzy
+msgid "Organizer: "
+msgstr "Trefnydd: %1"
 
-#: koprefs.cpp:163
-msgid "Business"
-msgstr "Busnes"
+#: printing/calprintdefaultplugins.cpp:376
+msgid "Location: "
+msgstr "Lleoliad:"
 
-#: koprefs.cpp:164
-msgid "Meeting"
-msgstr "Cyfarfod"
+#: printing/calprintdefaultplugins.cpp:435
+#, fuzzy
+msgid "Description:"
+msgstr "&Disgrifiad"
 
-#: koprefs.cpp:164
-msgid "Phone Call"
-msgstr "Galwad Ffôn"
+#: printing/calprintdefaultplugins.cpp:441
+msgid "Notes:"
+msgstr ""
 
-#: koprefs.cpp:164
-msgid "Education"
-msgstr "Addysg"
+#: printing/calprintdefaultplugins.cpp:454
+msgid "No Subitems"
+msgstr ""
 
-#: koprefs.cpp:165 printing/calprintpluginbase.cpp:279
-msgid "Holiday"
-msgstr "Gŵyl"
+#: printing/calprintdefaultplugins.cpp:458
+#, fuzzy
+msgid ""
+"_n: 1 Subitem:\n"
+"%1 Subitems:"
+msgstr ""
+"1 munud\n"
+"%n o funudau"
 
-#: koprefs.cpp:165
-msgid "Vacation"
-msgstr "Gwyliau"
+#: printing/calprintdefaultplugins.cpp:475
+msgid ""
+"_: no status\n"
+"none"
+msgstr ""
 
-#: koprefs.cpp:165
-msgid "Special Occasion"
-msgstr "Achlysur Arbennig"
+#: printing/calprintdefaultplugins.cpp:477
+msgid ""
+"_: unknown status\n"
+"unknown"
+msgstr ""
 
-#: koprefs.cpp:166
-msgid "Personal"
-msgstr "Personol"
+#: printing/calprintdefaultplugins.cpp:484
+#, fuzzy
+msgid ""
+"Start Date: %1\n"
+msgstr "Dyddiad Dechrau: %1"
 
-#: koprefs.cpp:166
-msgid "Travel"
-msgstr "Teithio"
+#: printing/calprintdefaultplugins.cpp:489
+#, fuzzy
+msgid ""
+"Start Time: %1\n"
+msgstr "Amser Dechrau: %1"
 
-#: koprefs.cpp:167
-msgid "Birthday"
-msgstr "Penblwydd"
+#: printing/calprintdefaultplugins.cpp:496
+#, fuzzy
+msgid ""
+"Due Date: %1\n"
+msgstr "Dyddiad Disgwyliedig: %1"
 
-#: calendarview.cpp:262
+#: printing/calprintdefaultplugins.cpp:501
 msgid ""
-"<p><em>No Item Selected</em></p>"
-"<p>Select an event, to-do or journal entry to view its details here.</p>"
+"_: subitem due time\n"
+"Due Time: %1\n"
 msgstr ""
 
-#: calendarview.cpp:268
+#: printing/calprintdefaultplugins.cpp:506
 msgid ""
-"View the details of events, journal entries or to-dos selected in KOrganizer's "
-"main view here."
+"_n: subitem counter\n"
+"%1: "
 msgstr ""
 
-#: calendarview.cpp:421
-msgid "Could not load calendar '%1'."
-msgstr "Wedi methu llwytho calendr '%1'."
+#: printing/calprintdefaultplugins.cpp:514
+msgid ""
+"_: subitem Status: statusString\n"
+"Status: %1\n"
+msgstr ""
 
-#: calendarview.cpp:644
+#: printing/calprintdefaultplugins.cpp:517
 msgid ""
-"The timezone 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 timezone?"
+"_: subitem Priority: N\n"
+"Priority: %1\n"
 msgstr ""
 
-#: calendarview.cpp:648
-#, fuzzy
-msgid "Keep Absolute Times?"
-msgstr "dim amser"
+#: printing/calprintdefaultplugins.cpp:519
+msgid ""
+"_: subitem Secrecy: secrecyString\n"
+"Secrecy: %1\n"
+msgstr ""
 
-#: calendarview.cpp:649
-#, fuzzy
-msgid "Keep Times"
-msgstr "dim amser"
+#: printing/calprintdefaultplugins.cpp:522
+msgid "Subitems:"
+msgstr ""
 
-#: calendarview.cpp:650
+#: printing/calprintdefaultplugins.cpp:532
 #, fuzzy
-msgid "Move Times"
-msgstr "dim amser"
+msgid "No Attachments"
+msgstr "Atodia&dau"
 
-#: calendarview.cpp:718
+#: printing/calprintdefaultplugins.cpp:535
 #, fuzzy
-msgid "To-do completed: %1 (%2)"
-msgstr "cyfla&wn ar %1"
-
-#: calendarview.cpp:729
-#, fuzzy, c-format
-msgid "Journal of %1"
-msgstr "&Dyddlyfr"
-
-#: calendarview.cpp:782
 msgid ""
-"The item \"%1\" is filtered by your current filter rules, so it will be hidden "
-"and not appear in the view."
+"_n: 1 Attachment:\n"
+"%1 Attachments:"
 msgstr ""
+"1 munud\n"
+"%n o funudau"
 
-#: calendarview.cpp:785
-#, fuzzy
-msgid "Filter Applied"
-msgstr "Hidlen wedi ei galluogi"
+#: printing/calprintdefaultplugins.cpp:541
+msgid ""
+"_: Spacer for list of attachments\n"
+"  "
+msgstr ""
 
-#: calendarview.cpp:840
+#: printing/calprintdefaultplugins.cpp:555
 #, fuzzy
-msgid "The item \"%1\" will be permanently deleted."
-msgstr "My fydd yr eitem hyn yn cael ei ddileu am byth."
-
-#: calendarview.cpp:841 calendarview.cpp:1979 calendarview.cpp:2041
-#: calendarview.cpp:2049 koeditorattachments.cpp:379 koeventeditor.cpp:382
-#: kojournaleditor.cpp:201 kotodoeditor.cpp:328
-msgid "KOrganizer Confirmation"
-msgstr "Cadarnhâd KOrganizer"
+msgid "No Attendees"
+msgstr "Cy&farfotwyr"
 
-#: calendarview.cpp:1164
+#: printing/calprintdefaultplugins.cpp:557
+#, fuzzy, c-format
 msgid ""
-"Unable to turn sub-to-do into a top-level to-do, because it cannot be locked."
+"_n: 1 Attendee:\n"
+"%n Attendees:"
 msgstr ""
+"1 munud\n"
+"%n o funudau"
 
-#: calendarview.cpp:1187
-#, fuzzy
-msgid "Make sub-to-dos independent"
-msgstr "Gwneud Is-I'w-Wneud yn Annibynnol"
-
-#: calendarview.cpp:1254
-#, fuzzy
-msgid "Dissociate occurrence"
-msgstr "Rhestri digwyddiadau'r diwrnod cyfredol"
+#: printing/calprintdefaultplugins.cpp:564
+msgid ""
+"_: Formatting of an attendee: 'Name (Role): Status', e.g. 'Reinhold Kainhofer "
+"<reinhold@kainhofer.com> (Participant): Awaiting Response'\n"
+"%1 (%2): %3"
+msgstr ""
 
-#: calendarview.cpp:1264
+#: printing/calprintdefaultplugins.cpp:568
 #, fuzzy
-msgid "Dissociating the occurrence failed."
-msgstr "Rhestri digwyddiadau'r diwrnod cyfredol"
+msgid "Attendees:"
+msgstr "Cyfarfotwyr"
 
-#: calendarview.cpp:1265 calendarview.cpp:1292
-#, fuzzy
-msgid "Dissociating Failed"
-msgstr "Methodd y gosod."
+#: printing/calprintdefaultplugins.cpp:575
+#, fuzzy, c-format
+msgid "Status: %1"
+msgstr "Cychwyn: %1"
 
-#: calendarview.cpp:1282
-#, fuzzy
-msgid "Dissociate future occurrences"
-msgstr "Rhestri digwyddiadau'r diwrnod cyfredol"
+#: printing/calprintdefaultplugins.cpp:579
+#, fuzzy, c-format
+msgid "Secrecy: %1"
+msgstr "Crynodeb: %1"
 
-#: calendarview.cpp:1291
-#, fuzzy
-msgid "Dissociating the future occurrences failed."
-msgstr "Rhestri digwyddiadau'r diwrnod cyfredol"
+#: printing/calprintdefaultplugins.cpp:585
+msgid "Show as: Busy"
+msgstr ""
 
-#: calendarview.cpp:1309 calendarview.cpp:1380 calendarview.cpp:1441
-#, fuzzy
-msgid "No item selected."
-msgstr "Nid oes darparwr wedi ei dewis."
+#: printing/calprintdefaultplugins.cpp:587
+msgid "Show as: Free"
+msgstr ""
 
-#: calendarview.cpp:1330 calendarview.cpp:1393
-msgid "The item information was successfully sent."
+#: printing/calprintdefaultplugins.cpp:593
+msgid "This task is overdue!"
 msgstr ""
 
-#: calendarview.cpp:1331
-msgid "Publishing"
-msgstr "Cyhoeddi"
+#: printing/calprintdefaultplugins.cpp:599
+msgid "Settings: "
+msgstr ""
 
-#: calendarview.cpp:1333
+#: printing/calprintdefaultplugins.cpp:603
 #, fuzzy
-msgid "Unable to publish the item '%1'"
-msgstr "Wedi methu darganfod patrymlun '%1'."
+msgid "Categories: "
+msgstr "Categorïau"
 
-#: calendarview.cpp:1394
+#: printing/calprintdefaultplugins.cpp:754
 #, fuzzy
-msgid "Forwarding"
-msgstr "Mynd &Ymlaen"
+msgid "Today's Events"
+msgstr "Darganfod Digwyddiadau"
 
-#: calendarview.cpp:1396
-#, fuzzy
-msgid "Unable to forward the item '%1'"
-msgstr "Wedi methu darganfod patrymlun '%1'."
+#: printing/calprintdefaultplugins.cpp:776 printing/calprintpluginbase.cpp:986
+#: printing/calprintpluginbase.cpp:1010
+msgid ""
+"_: summary, location\n"
+"%1, %2"
+msgstr ""
 
-#: calendarview.cpp:1419
+#: printing/calprintdefaultplugins.cpp:935
 #, fuzzy
-msgid "The free/busy information was successfully sent."
-msgstr "Cyhoeddi eich &gwybodaeth rydd/brysur yn ymysgogol"
+msgid ""
+"_: date from-to\n"
+"%1 - %2"
+msgstr "%1 - %2"
 
-#: calendarview.cpp:1420 calendarview.cpp:1463
+#: printing/calprintdefaultplugins.cpp:937
 #, fuzzy
-msgid "Sending Free/Busy"
-msgstr "Rhyddhau Gwrthrych Prysur"
+msgid ""
+"_: date from-\n"
+"to\n"
+"%1 -\n"
+"%2"
+msgstr "%1 - %2"
 
-#: calendarview.cpp:1422
+#: printing/calprintdefaultplugins.cpp:958
 #, fuzzy
-msgid "Unable to publish the free/busy data."
-msgstr "Nôl gwybo&daeth rydd/brysur pobl eraill"
+msgid ""
+"_: date from - to (week number)\n"
+"%1 - %2 (Week %3)"
+msgstr "%1 - %2"
 
-#: calendarview.cpp:1447
+#: printing/calprintdefaultplugins.cpp:960
 #, fuzzy
-msgid "The item has no attendees."
-msgstr "Nid oes cyfarfotwyr gan y ddigwyddiad."
-
-#: calendarview.cpp:1459
 msgid ""
-"The groupware message for item '%1'was successfully sent.\n"
-"Method: %2"
-msgstr ""
+"_: date from -\n"
+"to (week number)\n"
+"%1 -\n"
+"%2 (Week %3)"
+msgstr "%1 - %2"
 
-#: calendarview.cpp:1468
+#: komonthview.cpp:978 printing/calprintdefaultplugins.cpp:1123
 msgid ""
-"_: Groupware message sending failed. %2 is "
-"request/reply/add/cancel/counter/etc.\n"
-"Unable to send the item '%1'.\n"
-"Method: %2"
-msgstr ""
-
-#: calendarview.cpp:1541
-msgid "*.ics|ICalendars"
-msgstr "*.ics|ICalendrau"
+"_: monthname year\n"
+"%1 %2"
+msgstr "%1 %2"
 
-#: calendarview.cpp:1554
-msgid "The journal entries can not be exported to a vCalendar file."
-msgstr "Ni ellir allforio cofnodion y dyddlyfr i ffeil vCalendr."
+#: printing/calprintdefaultplugins.cpp:1213
+msgid "Start Date"
+msgstr "Dyddiad Dechrau"
 
-#: calendarview.cpp:1555
-msgid "Data Loss Warning"
-msgstr "Rhybydd Colled Data"
+#: printing/calprintdefaultplugins.cpp:1214
+msgid "Due Date"
+msgstr "Dyddiad Disgwyliedig"
 
-#: actionmanager.cpp:992 calendarview.cpp:1555
-msgid "Proceed"
-msgstr "Mynd Ymlaen"
+#: kotodoview.cpp:388 printing/calprintdefaultplugins.cpp:1215
+#: printing/calprintdefaultplugins.cpp:1289
+msgid "Priority"
+msgstr "Blaenoriaeth"
 
-#: calendarview.cpp:1560
+#: printing/calprintdefaultplugins.cpp:1216
 #, fuzzy
-msgid "*.vcs|vCalendars"
-msgstr "*.vcs|VCalendrau"
+msgid "Percent Complete"
+msgstr "Cyflawn"
 
-#: calendarview.cpp:1583
-msgid "&Previous Day"
-msgstr "Dyddiad &Blaenorol"
+#: printing/calprintdefaultplugins.cpp:1222
+msgid "Ascending"
+msgstr "Esgynnol"
 
-#: calendarview.cpp:1584
-msgid "&Next Day"
-msgstr "Dyddiad &Nesaf"
+#: printing/calprintdefaultplugins.cpp:1223
+msgid "Descending"
+msgstr "Disgynnol"
 
-#: calendarview.cpp:1586
-msgid "&Previous Week"
-msgstr "Wythnos &Blaenorol"
+#: printing/calprintdefaultplugins.cpp:1232
+msgid "To-do list"
+msgstr "Rhestr I'w-Wneud"
 
-#: calendarview.cpp:1587
-msgid "&Next Week"
-msgstr "Wythnos &Nesaf"
+#: kotodoview.cpp:390 printing/calprintdefaultplugins.cpp:1303
+msgid "Complete"
+msgstr "Cyflawn"
 
-#: calendarview.cpp:1683 calendarview.cpp:1716
-#, fuzzy
-msgid "No filter"
-msgstr "Dangos Hidlen"
+#: printing/calprintdefaultplugins.cpp:1311
+msgid "Due"
+msgstr "Disgwyliedig"
 
-#: calendarview.cpp:1974
-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?"
+#: printing/calprinter.cpp:133
+msgid "Unable to print, no valid print style was returned."
 msgstr ""
 
-#: calendarview.cpp:1980
+#: printing/calprinter.cpp:134
 #, fuzzy
-msgid "Delete Only This"
-msgstr "Dileu Hen Ddigwyddiadau"
+msgid "Printing error"
+msgstr "Argraffu:"
 
-#: calendarview.cpp:1983
-#, fuzzy
-msgid "Deleting sub-to-dos"
-msgstr "Dileu I'w-Wneud"
+#: printing/calprinter.cpp:155
+msgid "Print Calendar"
+msgstr "Argraffu Calendr"
 
-#: calendarview.cpp:2007
-msgid ""
-"The item \"%1\" is marked read-only and cannot be deleted; it probably belongs "
-"to a read-only calendar resource."
-msgstr ""
+#: printing/calprinter.cpp:179
+msgid "Print Style"
+msgstr "Arddull Argraffu"
 
-#: calendarview.cpp:2011
-msgid "Removing not possible"
-msgstr ""
+#: printing/calprinter.cpp:193
+msgid "Page &orientation:"
+msgstr "Cyf&eiriadaeth y dudalen:"
 
-#: calendarview.cpp:2038
+#: printing/calprinter.cpp:198
 #, fuzzy
-msgid ""
-"The calendar item \"%1\" recurs over multiple dates; are you sure you want to "
-"delete it and all its recurrences?"
-msgstr ""
-"Mae'r digwyddiad hyn yn ail-ddigwydd dros mwy nag un dyddiad. A ydych chi'n "
-"siŵr eich bod eisiau dileu y digwyddiad a phob un o'i ail-ddigwyddiadau?"
+msgid "Use Default Orientation of Selected Style"
+msgstr "Defnyddio Rhagosodyn yr Ardull Dewisiedig"
 
-#: calendarview.cpp:2044
-#, fuzzy
-msgid ""
-"The calendar item \"%1\" recurs over multiple dates. Do you want to delete only "
-"the current one on %2, only all future recurrences, or all its recurrences?"
+#: printing/calprinter.cpp:199
+msgid "Use Printer Default"
 msgstr ""
-"Mae'r digwyddiad hyn an ail-digwydd dros mwy nag un dyddiad.  A ydych chi'n "
-"siŵr eich bod eisiau dileu pob un o'i ail-ddigwyddiadau, neu dim ond y "
-"digwyddiad cyfredol sydd ar %1?"
 
-#: calendarview.cpp:2049
-msgid "Delete C&urrent"
-msgstr "Dileu'r &Cyfredol"
+#: printing/calprinter.cpp:237 printing/calprinter.cpp:239
+msgid "&Preview"
+msgstr "&Rhagolwg"
 
-#: calendarview.cpp:2050
-#, fuzzy
-msgid "Delete &Future"
-msgstr "Dileu'r Cyfredol"
+#: printing/cellitem.cpp:36
+msgid "<undefined>"
+msgstr "<anniffinir>"
 
-#: calendarview.cpp:2051
-msgid "Delete &All"
-msgstr "Dileu'r& cwbl"
+#: printing/calprintpluginbase.cpp:142
+msgid "This printing style does not have any configuration options."
+msgstr "Nid oes dewisiadau ffurfweddu gan yr arddull argraffu yma."
 
-#: calendarview.cpp:2133
-msgid "Delete all completed to-dos?"
-msgstr "Dileu pob I'w-Wneud sydd wedi eu gorffen?"
+#: printing/calprintpluginbase.cpp:563
+#, c-format
+msgid ""
+"_: print date: formatted-datetime\n"
+"printed: %1"
+msgstr ""
 
-#: calendarview.cpp:2133
-msgid "Purge To-dos"
-msgstr "Carthu I-Wneudau"
+#: printing/calprintpluginbase.cpp:908
+msgid ""
+"_: starttime - endtime summary\n"
+"%1-%2 %3"
+msgstr ""
 
-#: calendarview.cpp:2133
-msgid "Purge"
-msgstr "Carthu"
+#: printing/calprintpluginbase.cpp:914
+msgid ""
+"_: starttime - endtime summary, location\n"
+"%1-%2 %3, %4"
+msgstr ""
 
-#: calendarview.cpp:2137
-#, fuzzy
-msgid "Purging completed to-dos"
-msgstr "Cuddio i'w-wneudau a gwblhawyd"
+#: printing/calprintpluginbase.cpp:935
+msgid ""
+"_: weekday month date\n"
+"%1 %2 %3"
+msgstr "%1 %2 %3"
 
-#: calendarview.cpp:2152
+#: printing/calprintpluginbase.cpp:1018 printing/calprintpluginbase.cpp:1022
 #, fuzzy
-msgid "Unable to purge to-dos with uncompleted children."
-msgstr "Methu carthu I-Wneud sydd efo plant ni chwblhawyd."
-
-#: calendarview.cpp:2153
-msgid "Delete To-do"
-msgstr "Dileu I'w-Wneud"
+msgid "%1 (Due: %2)"
+msgstr "Disgwyliedig:"
 
-#: calendarview.cpp:2168
-#, fuzzy
-msgid "Unable to edit item: it is locked by another process."
-msgstr "Methu golygu'r nifer.  Cloir gan broses arall."
+#: printing/calprintpluginbase.cpp:1029
+#, c-format
+msgid "To-do: %1"
+msgstr "I'w-Wneud: %1"
 
-#: calendarview.cpp:2201
-#, fuzzy, c-format
-msgid "Unable to copy the item to %1."
-msgstr "Methu cadw'r eitem i-wneud"
+#: printing/calprintpluginbase.cpp:1575
+msgid "%1%"
+msgstr "%1%"
 
-#: calendarview.cpp:2202
-#, fuzzy
-msgid "Copying Failed"
-msgstr "Methodd y gosod."
+#: printing/calprintpluginbase.cpp:1679
+msgid ""
+"_: Description - date\n"
+"%1 - %2"
+msgstr "%1 - %2"
 
-#: calendarview.cpp:2243
+#: printing/calprintpluginbase.cpp:1700
 #, fuzzy, c-format
-msgid "Unable to move the item to %1."
-msgstr "Methu cadw'r eitem i-wneud"
-
-#: calendarview.cpp:2244
-#, fuzzy
-msgid "Moving Failed"
-msgstr "Methodd y gosod."
+msgid "Person: %1"
+msgstr "Yn Ail-ddigwydd: %1"
 
-#: komailclient.cpp:188
-msgid "No running instance of KMail found."
-msgstr "Nid oes enghraifft o KMail eisioes yn rhedeg."
+#: printing/calprintpluginbase.cpp:1701
+#, c-format
+msgid "%1"
+msgstr "%1"
 
-#: kdatenavigator.cpp:187
+#: printing/calprintpluginbase.cpp:1719
 msgid ""
-"_: start/end week number of line in date picker\n"
-"%1/%2"
+"_: Date range: Month dayStart - dayEnd\n"
+"%1 %2 - %3"
 msgstr ""
 
-#: navigatorbar.cpp:71
-msgid "Previous year"
-msgstr "Blwyddyn Cynt"
-
-#: navigatorbar.cpp:77
-msgid "Previous month"
-msgstr "Mis Cynt"
-
-#: navigatorbar.cpp:84
-msgid "Next month"
-msgstr "Mis Nesaf"
-
-#: navigatorbar.cpp:90
-msgid "Next year"
-msgstr "Blwyddyn Nesaf"
-
-#: navigatorbar.cpp:97
-msgid "Select a month"
-msgstr "Dewiswch mis"
-
-#: komonthview.cpp:883 navigatorbar.cpp:161
-#: printing/calprintdefaultplugins.cpp:917
-msgid ""
-"_: monthname year\n"
-"%1 %2"
-msgstr "%1 %2"
-
-#: datenavigatorcontainer.cpp:51
+#: printing/calprintpluginbase.cpp:1724
 msgid ""
-"<qt>"
-"<p>Select the dates you want to display in KOrganizer's main view here. Hold "
-"down 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>"
+"_: Date range: monthStart dayStart - monthEnd dayEnd\n"
+"%1 %2 - %3 %4"
 msgstr ""
 
-#: journalentry.cpp:92
+#: printing/calprintdefaultplugins.h:47
 #, fuzzy
-msgid "[Add Journal Entry]"
-msgstr "&Dyddlyfr"
+msgid "Print &incidence"
+msgstr "Golygu Amlder"
 
-#: journalentry.cpp:191
+#: printing/calprintdefaultplugins.h:51
 #, fuzzy
-msgid "Sets the Title of this journal entry."
-msgstr "Dileu Hen Ddigwyddiadau"
-
-#: journalentry.cpp:193
-msgid "&Title: "
-msgstr "&Teitl: "
+msgid "Prints an incidence on one page"
+msgstr "Argraffu pob digwyddiad wythnos sengl ar un dudalen"
 
-#: journalentry.cpp:202
-msgid "Ti&me: "
-msgstr "Am&ser: "
+#: printing/calprintdefaultplugins.h:99
+msgid "Print da&y"
+msgstr "Argraffu& diwrnod"
 
-#: journalentry.cpp:208
-msgid "Determines whether this journal entry has a time associated with it"
-msgstr ""
+#: printing/calprintdefaultplugins.h:103
+msgid "Prints all events of a single day on one page"
+msgstr "Argraffu pob digwyddiad diwrnod sengl ar un dudalen"
 
-#: journalentry.cpp:210
-#, fuzzy
-msgid "Sets the time associated with this journal entry"
-msgstr "Dileu Hen Ddigwyddiadau"
+#: printing/calprintdefaultplugins.h:136
+msgid "Print &week"
+msgstr "Argraf&fu wythnos"
 
-#: journalentry.cpp:217 journalentry.cpp:218
-#, fuzzy
-msgid "Delete this journal entry"
-msgstr "Dileu Hen Ddigwyddiadau"
+#: printing/calprintdefaultplugins.h:140
+msgid "Prints all events of one week on one page"
+msgstr "Argraffu pob digwyddiad wythnos sengl ar un dudalen"
 
-#: journalentry.cpp:225
-#, fuzzy
-msgid "Edit this journal entry"
-msgstr "Dileu Hen Ddigwyddiadau"
+#: printing/calprintdefaultplugins.h:178
+msgid "Print mont&h"
+msgstr "Argraffu m&is"
 
-#: journalentry.cpp:226
-#, fuzzy
-msgid "Opens an editor dialog for this journal entry"
-msgstr "Dileu Hen Ddigwyddiadau"
+#: printing/calprintdefaultplugins.h:182
+msgid "Prints all events of one month on one page"
+msgstr "Argraffu pob digwyddiad mis sengl ar un dudalen"
 
-#: journalentry.cpp:234
+#: printing/calprintdefaultplugins.h:221
 #, fuzzy
-msgid "Print this journal entry"
-msgstr "Dileu Hen Ddigwyddiadau"
+msgid "Print to-&dos"
+msgstr "Argraffu i-wneudau"
 
-#: journalentry.cpp:235
+#: printing/calprintdefaultplugins.h:225
 #, fuzzy
-msgid "Opens the print dialog for this journal entry"
-msgstr "Dileu Hen Ddigwyddiadau"
+msgid "Prints all to-dos in a (tree-like) list"
+msgstr "Argraffu i-wneudau mewn rhestr (tebyg i goeden)"
 
-#: korgac/alarmdockwindow.cpp:56 korgac/korgacmain.cpp:65
-#: korgac/korgacmain.cpp:66
-#, fuzzy
-msgid "KOrganizer Reminder Daemon"
-msgstr "Ellyll Larwm KTrefnydd"
+#: komonthview.cpp:427
+msgid ""
+"_: 'Month day' for month view cells\n"
+"%1 %2"
+msgstr "%1 %2"
 
-#: korgac/korgacmain.cpp:70 korgac/korgacmain.cpp:72
-msgid "Maintainer"
-msgstr "Cynhaliwr"
+#: filtereditdialog.cpp:51
+msgid "Edit Calendar Filters"
+msgstr "Golygu Hidlennau Calendr"
 
-#: korgac/alarmdockwindow.cpp:67
-#, fuzzy
-msgid "Suspend All"
-msgstr "Seibio"
+#: filtereditdialog.cpp:99
+msgid "Press this button to define a new filter."
+msgstr ""
 
-#: korgac/alarmdockwindow.cpp:68
-msgid "Dismiss All"
+#: filtereditdialog.cpp:100
+msgid "Press this button to remove the currently active filter."
 msgstr ""
 
-#: korgac/alarmdockwindow.cpp:73
-#, fuzzy
-msgid "Reminders Enabled"
-msgstr "&Atgof:"
+#: filtereditdialog.cpp:189
+#, c-format
+msgid "New Filter %1"
+msgstr "Hidlen newydd %1"
 
-#: korgac/alarmdockwindow.cpp:75
+#: filtereditdialog.cpp:201 koeventeditor.cpp:392 kotodoeditor.cpp:328
+msgid "This item will be permanently deleted."
+msgstr "My fydd yr eitem hyn yn cael ei ddileu am byth."
+
+#: filtereditdialog.cpp:201
 #, fuzzy
-msgid "Start Reminder Daemon at Login"
-msgstr "Cychwyn y Dibynnydd Larwm wrth Fewngofnodi"
+msgid "Delete Confirmation"
+msgstr "Ffurfweddu Adnoddau"
 
-#: korgac/alarmdockwindow.cpp:113
-#, c-format
-msgid ""
-"_n: There is 1 active reminder.\n"
-"There are %n active reminders."
-msgstr ""
+#: timezone.cpp:39
+msgid "KOrganizer Timezone Test"
+msgstr "Prawf Amserfa KTrefnydd"
 
-#: korgac/alarmdockwindow.cpp:180
+#: tips.cpp:3
 #, fuzzy
 msgid ""
-"Do you want to start the KOrganizer reminder daemon at login (note that you "
-"will not get reminders whilst the daemon is not running)?"
+"<p>...that you can synchronize your calendar data with the data on a Palm Pilot "
+"by using <a href=\"http://www.slac.com/pilone/kpilot_home\">KPilot</a>?\n"
+"</p>\n"
 msgstr ""
-"Ydych eisiau cychwyn yr ellyll larwm KTrefnydd wrth fewngofnodi? (Noder na "
-"chewch larymau pan ni rheda'r ellyll.)"
+"<p>...y gallwch gydamseru eich data calendr efo'r data ar Palm Pilot\n"
+" gan ddefnyddio <a href=\"http://www.slac.com/pilone/kpilot_home\">KPilot</a>?\n"
 
-#: korgac/alarmdockwindow.cpp:182
-#, fuzzy
-msgid "Close KOrganizer Reminder Daemon"
-msgstr "Cau Ellyll Larwm KTrefnydd"
+#: tips.cpp:9
+msgid ""
+"<p>...that it is possible to show the current time in the calendar? Enable the "
+"current time line in the dialog which appears after selecting <b>Settings</b>"
+", <b>Configure KOrganizer...</b> from the menu bar.\n"
+"</p>\n"
+msgstr ""
 
-#: korgac/alarmdockwindow.cpp:183
-msgid "Start"
-msgstr "Dechrau"
+#: tips.cpp:15
+msgid ""
+"<p>...that KOrganizer supports Microsoft Exchange? Add the <b>"
+"Microsoft&reg; Exchange 2000 resource</b> using the <b>Resource View</b> "
+"from the KOrganizer sidebar.\n"
+"</p>\n"
+msgstr ""
 
-#: korgac/alarmdockwindow.cpp:183
+#: tips.cpp:21
 #, fuzzy
-msgid "Do Not Start"
-msgstr "Canoli wrth Gychwyn"
-
-#: korgac/testalarmdlg.cpp:37
-msgid "TestKabc"
-msgstr "ProfiKabc"
-
-#: korgac/alarmdialog.cpp:82
-msgid "Dismiss all"
+msgid ""
+"<p>...that you can select whether the week starts on Monday or on Sunday in the "
+"Trinity Control Center? KOrganizer uses this setting. Look at Regional & "
+"Accessibility->Country/Region & Languages in the Trinity Control Center, or "
+"select <b>Settings</b>,\n"
+"<b>Configure Date & Time...</b> from the menu bar. Select the Time & Dates "
+"tab.\n"
+"</p>\n"
 msgstr ""
+"<p>...y gallwch ddewis a ddylai'r wythnos ddechrau ar ddydd Llun neu ddydd Sul "
+"yn y Ganolfan Reoli TDE?\n"
+" Mae kTrefnydd yn defnyddio'r gosodiad yma.  Ewch i Personoleiddio -> Gwlad &\n"
+" Ieithoedd, ar y Tab Amser & Dyddiadau.\n"
 
-#: koeditorgeneralevent.cpp:158 korgac/alarmdialog.cpp:82
-msgid "Edit..."
-msgstr "Golygu..."
+#: tips.cpp:28
+msgid ""
+"<p>...that you can edit to-dos quickly by right clicking on the property you "
+"wish to change; like the priority, the category or the date?\n"
+"</p>\n"
+msgstr ""
 
-#: korgac/alarmdialog.cpp:82
-msgid "Suspend"
-msgstr "Seibio"
+#: tips.cpp:34
+msgid ""
+"<p>...that you can view and edit a calendar from the shell with "
+"konsolekalendar? Run <b>konsolekalendar --help</b> for the available options.\n"
+"</p>\n"
+msgstr ""
 
-#: korgac/alarmdialog.cpp:86
-msgid "Dismiss"
+#: tips.cpp:40
+msgid ""
+"<p>...that your calender can display birthdays from your address book? It is "
+"even possible to set up reminders for them. To activate this, add the "
+"corresponding 'birthdays' resource to your calender.\n"
+"</p>\n"
 msgstr ""
 
-#: korgac/alarmdialog.cpp:92
+#: tips.cpp:46
 #, fuzzy
-msgid "The following events triggered reminders:"
-msgstr "Taniodd y digwyddiadau dilynnol larymau:"
-
-#: korgac/alarmdialog.cpp:98 printing/calprintdefaultplugins.cpp:1100
-msgid "Due"
-msgstr "Disgwyliedig"
+msgid ""
+"<p>...that you can store your calendar on an FTP server? Use the standard file "
+"dialog to save the calendar to a URL like "
+"<b>ftp://username@ftpserver/filename</b>. You can make your calendar active and "
+"load and save it as if it were local, or add it permanently to your resources "
+"list, using the remote file resource. Just make sure that no two KOrganizer "
+"applications are working on the same file, at the same time.\n"
+"</p>\n"
+msgstr ""
+"<p>...y gallwch storio eich calendr ar weinydd FTP? Defnyddiwch yr ymgom\n"
+" ffeil safonol i gadw'r calendr i  URL fel  "
+"<b>ftp://enw-defnyddiwr@gweinydd-ftp/enw-ffeil</b>.\n"
+" Gallwch wneud eich calendr yn weithredol, a'i llwytho a'i gadw, fel petae yn "
+"leol.\n"
+" Ond sicrhewch nad ydy dau gymhwysiant KTrefnydd yn gweithio ar yr un ffeil\n"
+" wrth yr un amser.\n"
 
-#: korgac/alarmdialog.cpp:114
+#: tips.cpp:52
 #, fuzzy
-msgid "Suspend &duration:"
-msgstr "Cyfnod seibio (munudau):"
+msgid ""
+"<p>...that you can create hierarchical to-dos by clicking with the right mouse "
+"button on an existing to-do and selecting <b>New Sub-to-do</b> "
+"from the context menu?\n"
+"</p>\n"
+msgstr ""
+"<p>...y gallwch greu I'w-Wneudau hierarchaidd gan glicio efo\n"
+" botwm dde'r lygoden ar I'w-Wneud sy'n bodoli a dewis <b>Is-I'w-Wneud Newydd</b> "
+"oddiar y ddewislen cyd-destun?\n"
 
-#: korgac/alarmdialog.cpp:123
-msgid "week(s)"
-msgstr "wythnos(au)"
+#: tips.cpp:58
+msgid ""
+"<p>...that a color can be assigned to each category? Events with a certain "
+"category will be shown in that color. You can assign these in the section <b>"
+"Colors</b> within the dialog which appears after selecting <b>Settings</b>, <b>"
+"Configure KOrganizer...</b> from the menu bar.\n"
+"</p>\n"
+msgstr ""
 
-#: korgac/alarmdialog.cpp:251
-#, fuzzy
-msgid "Could not start KOrganizer."
-msgstr "&Ffurfweddu KOrganizer..."
+#: tips.cpp:64
+msgid ""
+"<p>...that you can view and edit a calendar with Konqueror? Just click on the "
+"calendar file to make Konqueror open it.\n"
+"</p>\n"
+msgstr ""
 
-#: korganizer.cpp:290 kotimelineview.cpp:55 kotimelineview.cpp:123
-#: resourceview.cpp:227 resourceview.cpp:278
-msgid "Calendar"
-msgstr "Calendr"
+#: tips.cpp:70
+msgid ""
+"<p>...that it is possible to add an attachment to an event or to-do? To do so, "
+"add a link to the <b>Attachments</b> tab within the <b>Edit Event</b> or <b>"
+"Edit To-do</b> dialog.\n"
+"</p>\n"
+msgstr ""
 
-#: korganizer.cpp:298
-msgid "New Calendar"
-msgstr "Calendr Newydd"
+#: tips.cpp:76
+msgid ""
+"<p>...that you can export your calendar to HTML? Select <b>File</b>, <b>"
+"Export</b>, <b>Export Web Page...</b> from the menu bar to open the <b>"
+"Export calendar as web page</b> dialog.\n"
+"</p>\n"
+msgstr ""
 
-#: korganizer.cpp:302
-msgid "read-only"
-msgstr "darllen-yn-unig"
+#: tips.cpp:82
+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"
+msgstr ""
+
+#: tips.cpp:87
+msgid ""
+"<p>...that you can create a new sub-to-do by pasting a to-do while another one "
+"is selected?\n"
+"</p>\n"
+msgstr ""
 
 #: freebusyurldialog.cpp:40
 #, fuzzy
@@ -2356,71 +3686,71 @@ msgstr "Cyhoeddi Gwybodaeth Rhydd Brysur"
 msgid "Location of Free/Busy information for %1 <%2>:"
 msgstr "dyddiadau o wybodaeth rhydd/prysur"
 
-#: koattendeeeditor.cpp:63
+#: koattendeeeditor.cpp:73
 msgid ""
 "Sets the identity corresponding to the organizer of this to-do or event. "
 "Identities can be set in the 'Personal' section of the KOrganizer "
 "configuration, or in the 'Security & Privacy'->'Password & User Account' "
-"section of the Trinity Control Center. In addition, identities are gathered from "
-"your KMail settings and from your address book. If you choose to set it "
-"globally for TDE in the Control Center, be sure to check 'Use email settings "
+"section of the Trinity Control Center. In addition, identities are gathered "
+"from your KMail settings and from your address book. If you choose to set it "
+"globally for KDE in the Control Center, be sure to check 'Use email settings "
 "from Control Center' in the 'Personal' section of the KOrganizer configuration."
 msgstr ""
 
-#: koattendeeeditor.cpp:75 koattendeeeditor.cpp:283
+#: koattendeeeditor.cpp:85 koattendeeeditor.cpp:292
 msgid "Identity as organizer:"
 msgstr ""
 
-#: koattendeeeditor.cpp:89
+#: koattendeeeditor.cpp:99
 msgid ""
 "Edits the name of the attendee selected in the list above, or adds a new "
 "attendee if there are no attendeesin the list."
 msgstr ""
 
-#: koattendeeeditor.cpp:94
+#: koattendeeeditor.cpp:104
 msgid "Na&me:"
 msgstr "En&w:"
 
-#: koattendeeeditor.cpp:99
+#: koattendeeeditor.cpp:109
 #, fuzzy
 msgid "Click to add a new attendee"
 msgstr "Cliciwch i ychwanegu I-Wneud newydd"
 
-#: koattendeeeditor.cpp:106
+#: koattendeeeditor.cpp:117
 msgid "Edits the role of the attendee selected in the list above."
 msgstr ""
 
-#: koattendeeeditor.cpp:110
+#: koattendeeeditor.cpp:121
 msgid "Ro&le:"
 msgstr "Rô&l:"
 
-#: koattendeeeditor.cpp:124
+#: koattendeeeditor.cpp:135
 msgid ""
 "Edits the current attendance status of the attendee selected in the list above."
 msgstr ""
 
-#: koattendeeeditor.cpp:128
+#: koattendeeeditor.cpp:139
 msgid "Stat&us:"
 msgstr "&Cyflwr:"
 
-#: koattendeeeditor.cpp:151
+#: koattendeeeditor.cpp:162
 msgid ""
 "Edits whether to send an email to the attendee selected in the list above to "
 "request a response concerning attendance."
 msgstr ""
 
-#: koattendeeeditor.cpp:154
+#: koattendeeeditor.cpp:165
 msgid "Re&quest response"
 msgstr "Go&fyn am ymateb"
 
 #. i18n: file filteredit_base.ui line 29
-#: koattendeeeditor.cpp:161 rc.cpp:99 rc.cpp:429 rc.cpp:441 rc.cpp:1481
-#: rc.cpp:1871 rc.cpp:2075
+#: koattendeeeditor.cpp:172 rc.cpp:99 rc.cpp:432 rc.cpp:444 rc.cpp:1848
+#: rc.cpp:2174 rc.cpp:2183
 #, no-c-format
 msgid "&New"
 msgstr "&Newydd"
 
-#: koattendeeeditor.cpp:163
+#: koattendeeeditor.cpp:174
 msgid ""
 "Adds a new attendee to the list. Once the attendee is added, you will be able "
 "to edit the attendee's name, role, attendance status, and whether or not the "
@@ -2428,604 +3758,973 @@ msgid ""
 "your addressbook, click the 'Select Addressee' button instead."
 msgstr ""
 
-#: koattendeeeditor.cpp:175
+#: koattendeeeditor.cpp:186
 msgid "Removes the attendee selected in the list above."
 msgstr ""
 
-#: koattendeeeditor.cpp:179
+#: koattendeeeditor.cpp:190
 msgid "Select Addressee..."
 msgstr "Dewis Derbynnydd..."
 
-#: koattendeeeditor.cpp:182
+#: koattendeeeditor.cpp:193
 msgid "Opens your address book, allowing you to select new attendees from it."
 msgstr ""
 
-#: koattendeeeditor.cpp:263
+#: koattendeeeditor.cpp:265
+msgid "Please edit the example attendee, before adding more."
+msgstr ""
+
+#: koattendeeeditor.cpp:272 koattendeeeditor.cpp:551
 msgid "Firstname Lastname"
 msgstr ""
 
-#: koattendeeeditor.cpp:264
+#: koattendeeeditor.cpp:273
 msgid "name"
 msgstr "enw"
 
-#: koattendeeeditor.cpp:303
+#: koattendeeeditor.cpp:312
 #, c-format
 msgid "Organizer: %1"
 msgstr "Trefnydd: %1"
 
-#: koattendeeeditor.cpp:399
+#: koattendeeeditor.cpp:480
 #, fuzzy, c-format
 msgid "Delegated to %1"
 msgstr "Dileu %1"
 
-#: koattendeeeditor.cpp:401
+#: koattendeeeditor.cpp:482
 #, fuzzy, c-format
 msgid "Delegated from %1"
 msgstr "Dileu %1"
 
-#: koattendeeeditor.cpp:403
+#: koattendeeeditor.cpp:484
 #, fuzzy
 msgid "Not delegated"
 msgstr "Dyddiad Disgwyliedig"
 
-#: kojournaleditor.cpp:47
-#, fuzzy
-msgid "Edit Journal Entry"
-msgstr "&Dyddlyfr"
+#: koeventeditor.cpp:124 koeventeditor.cpp:146
+msgid ""
+"The General tab allows you to set the most common options for the event."
+msgstr ""
 
-#: exportwebdialog.cpp:139 koeventeditor.cpp:122 kojournaleditor.cpp:74
-#: kotodoeditor.cpp:97
-msgid "General"
-msgstr "Cyffredinol"
+#: koeventeditor.cpp:135 kotodoeditor.cpp:112
+msgid "Details"
+msgstr "Manylion"
 
-#: koeventeditor.cpp:147 kojournaleditor.cpp:84 kotodoeditor.cpp:123
+#: koeventeditor.cpp:144 kojournaleditor.cpp:86 kotodoeditor.cpp:124
 msgid "&General"
 msgstr "&Cyffredinol"
 
-#: kojournaleditor.cpp:200
-#, fuzzy
-msgid "This journal entry will be permanently deleted."
-msgstr "My fydd yr eitem hyn yn cael ei ddileu am byth."
+#. i18n: file ./printing/calprintincidenceconfig_base.ui line 59
+#: koeventeditor.cpp:182 rc.cpp:1650
+#, fuzzy, no-c-format
+msgid "&Attendees"
+msgstr "Cyfarfotwyr"
 
-#: kojournaleditor.cpp:216
-#, fuzzy
-msgid "Template does not contain a valid journal."
-msgstr "Nid yw'r patrymlun '%1' yn cynnwys i-wneud dilys."
+#: koeventeditor.cpp:184
+msgid ""
+"The Free/Busy tab allows you to see whether other attendees are free or busy "
+"during your event."
+msgstr ""
 
-#: actionmanager.cpp:253
-#, fuzzy
-msgid "Import &Calendar..."
-msgstr "Mewnforio Calendr"
+#: koeventeditor.cpp:208
+msgid "Edit Event"
+msgstr "Golygu Digwyddiad"
 
-#: actionmanager.cpp:255
-#, fuzzy
-msgid "&Import From UNIX Ical tool"
-msgstr "&Mewnforio o Ical"
+#: koeventeditor.cpp:216
+msgid "New Event"
+msgstr "Digwyddiad Newydd"
 
-#: actionmanager.cpp:257
-msgid "Get &Hot New Stuff..."
-msgstr "Cael& y Diweddaraf..."
+#: koeventeditor.cpp:277
+msgid ""
+"You didn't change the event, thus no counter proposal has been sent to the "
+"organizer."
+msgstr ""
 
-#: actionmanager.cpp:261
-msgid "Export &Web Page..."
-msgstr "Allfori&o Tudalen Wê"
+#: koeventeditor.cpp:277
+#, fuzzy
+msgid "No changes"
+msgstr "Ategyn Exchange"
 
-#: actionmanager.cpp:264
-msgid "&iCalendar..."
-msgstr "&iCalendr..."
+#: koeventeditor.cpp:288
+#, c-format
+msgid "My counter proposal for: %1"
+msgstr ""
 
-#: actionmanager.cpp:267
-msgid "&vCalendar..."
-msgstr "&vCalendr..."
+#: koeventeditor.cpp:401
+msgid "Template does not contain a valid event."
+msgstr "Nid yw'r patrymlun yn cynnwys digwyddiad dilys."
 
-#: actionmanager.cpp:270
-msgid "Upload &Hot New Stuff..."
-msgstr "Fyny-lw&ytho'r Diweddaraf..."
+#: kogroupware.cpp:166
+#, fuzzy, c-format
+msgid "Error message: %1"
+msgstr "Gwall wrth lwytho'r ffeil batrymlun '%1'"
 
-#: actionmanager.cpp:276
-msgid "Archive O&ld Entries..."
-msgstr "Archifio &Hen Gofnodion..."
+#: kogroupware.cpp:170
+msgid "Error while processing an invitation or update."
+msgstr ""
 
-#: actionmanager.cpp:278
-#, fuzzy
+#: kogroupware.cpp:285
 msgid ""
-"_: delete completed to-dos\n"
-"Pur&ge Completed To-dos"
-msgstr "&Carthiad wedi'i Gwblhau"
+"You changed the invitation \"%1\".\n"
+"Do you want to email the attendees an update message?"
+msgstr ""
 
-#: actionmanager.cpp:336
-msgid "What's &Next"
-msgstr "Beth sy'n &Nesaf"
+#: kogroupware.cpp:292
+msgid ""
+"You removed the invitation \"%1\".\n"
+"Do you want to email the attendees that the event is canceled?"
+msgstr ""
 
-#: actionmanager.cpp:340
-msgid "&Day"
-msgstr "&Dydd"
+#: kogroupware.cpp:296
+msgid ""
+"You removed the invitation \"%1\".\n"
+"Do you want to email the attendees that the todo is canceled?"
+msgstr ""
 
-#: actionmanager.cpp:349
-#, c-format
+#: kogroupware.cpp:303
+#, fuzzy
 msgid ""
-"_n: &Next Day\n"
-"Ne&xt %n Days"
+"The event \"%1\" includes other people.\n"
+"Do you want to email the invitation to the attendees?"
 msgstr ""
-"Diwrnod &Nesaf\n"
-"%n o Ddiwrnodau &Nesaf"
+"Mae'r %1 yma yn cynnwys pobl eraill.  A ddylir anfon ebost i'r cyfarfotwyr?"
 
-#: actionmanager.cpp:351
-msgid "W&ork Week"
-msgstr "W&ythnos Gwaith"
+#: kogroupware.cpp:307
+#, fuzzy
+msgid ""
+"The todo \"%1\" includes other people.\n"
+"Do you want to email the invitation to the attendees?"
+msgstr ""
+"Mae'r %1 yma yn cynnwys pobl eraill.  A ddylir anfon ebost i'r cyfarfotwyr?"
 
-#: actionmanager.cpp:355
-msgid "&Week"
-msgstr "&Wythnos"
+#: kogroupware.cpp:311
+#, fuzzy
+msgid ""
+"This incidence includes other people. Should an email be sent to the attendees?"
+msgstr ""
+"Mae'r %1 yma yn cynnwys pobl eraill.  A ddylir anfon ebost i'r cyfarfotwyr?"
 
-#: actionmanager.cpp:359
-msgid "&Month"
-msgstr "&Mis"
+#: kogroupware.cpp:321 kogroupware.cpp:363
+msgid "Group Scheduling Email"
+msgstr "Ebost trefnlennu grŵp"
 
-#: actionmanager.cpp:363
-msgid "&List"
-msgstr "&Rhestr"
+#: kogroupware.cpp:322
+msgid "Send Email"
+msgstr "Anfon Ebost"
 
-#: actionmanager.cpp:367
-msgid "&To-do List"
-msgstr "&Rhestr I'w-Wneud"
+#: incidencechanger.cpp:76 kogroupware.cpp:322 kogroupware.cpp:334
+#: kogroupware.cpp:341 kogroupware.cpp:364
+msgid "Do Not Send"
+msgstr "Peidio ac anfon"
 
-#: actionmanager.cpp:371
-msgid "&Journal"
-msgstr "&Dyddlyfr"
+#: kogroupware.cpp:332
+msgid "Do you want to send a status update to the organizer of this task?"
+msgstr "A ydych chi am anfon adnewyddiad cyflwr at drefnydd y dasg hon?"
 
-#: actionmanager.cpp:375
+#: kogroupware.cpp:334 kogroupware.cpp:341 kogroupware.cpp:364
 #, fuzzy
-msgid "&Timeline View"
-msgstr "Canoli'r Golwg"
+msgid "Send Update"
+msgstr "Dyddiad gorffen:"
 
-#: actionmanager.cpp:381
-msgid "&Refresh"
-msgstr "&Ailfywio"
+#: kogroupware.cpp:338
+#, fuzzy
+msgid ""
+"Your status as an attendee of this event changed. Do you want to send a status "
+"update to the event organizer?"
+msgstr "A ydych chi am anfon adnewyddiad cyflwr at drefnydd y dasg hon?"
 
-#: actionmanager.cpp:389
-msgid "F&ilter"
-msgstr "&Hidlo"
+#: kogroupware.cpp:359
+#, fuzzy
+msgid ""
+"You had previously accepted an invitation to this event. Do you want to send an "
+"updated response to the organizer declining the invitation?"
+msgstr "A ydych chi am anfon adnewyddiad cyflwr at drefnydd y dasg hon?"
 
-#: actionmanager.cpp:404
-msgid "Zoom In Horizontally"
+#: kogroupware.cpp:367
+#, fuzzy
+msgid ""
+"You are not the organizer of this event. Editing it will bring your calendar "
+"out of sync with the organizer's calendar. Do you really want to edit it?"
 msgstr ""
+"Nid chi yw trefnydd y digwyddiad hwn. Mi fydd golygu hwn yn achosi i'ch calendr "
+"golli cydweddiad â chalendr y trefnydd. A ydych wir eisiau ei olygu?"
 
-#: actionmanager.cpp:407
-msgid "Zoom Out Horizontally"
-msgstr ""
+#: kogroupware.cpp:384
+msgid "<No summary given>"
+msgstr "<Ni roddwyd crynodeb>"
 
-#: actionmanager.cpp:410
-msgid "Zoom In Vertically"
+#: kogroupware.cpp:404 mailscheduler.cpp:89
+#, c-format
+msgid "Counter proposal: %1"
 msgstr ""
 
-#: actionmanager.cpp:413
-msgid "Zoom Out Vertically"
+#: kogroupware.cpp:406
+msgid "Proposed new meeting time: %1 - %2"
 msgstr ""
 
-#: actionmanager.cpp:422
-msgid "Go to &Today"
-msgstr "Mynd at &Heddiw"
+#: statusdialog.cpp:41
+msgid "Set Your Status"
+msgstr "Gosod Eich Cyflwr"
 
-#: actionmanager.cpp:426
-msgid "Go &Backward"
-msgstr "Mynd &Yn Ôl"
+#: statusdialog.cpp:49
+msgid "Set your status"
+msgstr "Gosod eich cyflwr"
 
-#: actionmanager.cpp:438
-msgid "Go &Forward"
-msgstr "Mynd &Ymlaen"
+#: history.cpp:185
+#, c-format
+msgid "Delete %1"
+msgstr "Dileu %1"
 
-#: actionmanager.cpp:448
-msgid "New E&vent..."
-msgstr "D&igwyddiad Newydd..."
+#: history.cpp:214
+#, c-format
+msgid "Add %1"
+msgstr "Ychwanegu %1"
+
+#: history.cpp:251
+#, c-format
+msgid "Edit %1"
+msgstr "Golygu %1"
 
-#: actionmanager.cpp:462
+#: koeventpopupmenu.cpp:77
 #, fuzzy
-msgid "New &Journal..."
-msgstr "&Dyddlyfr"
+msgid "&Toggle Reminder"
+msgstr "&Atgof:"
 
-#: actionmanager.cpp:477
-msgid "&Make Sub-to-do Independent"
-msgstr "&Gwneud Is-I'w-Wneud yn Annibynnol"
+#: koeventpopupmenu.cpp:82
+#, fuzzy
+msgid "&Dissociate This Occurrence"
+msgstr "Rhestri digwyddiadau'r diwrnod cyfredol"
 
-#: actionmanager.cpp:496
-msgid "&Publish Item Information..."
-msgstr ""
+#: koeventpopupmenu.cpp:85
+#, fuzzy
+msgid "&Dissociate Future Occurrences"
+msgstr "Rhestri digwyddiadau'r diwrnod cyfredol"
 
-#: actionmanager.cpp:501
-msgid "Send &Invitation to Attendees"
-msgstr ""
+#: koeventpopupmenu.cpp:89
+#, fuzzy
+msgid "Send as iCalendar..."
+msgstr "&iCalendr..."
 
-#: actionmanager.cpp:508
+#: korgac/testalarmdlg.cpp:39
+msgid "TestKabc"
+msgstr "ProfiKabc"
+
+#: korgac/alarmdockwindow.cpp:56 korgac/korgacmain.cpp:65
+#: korgac/korgacmain.cpp:66
 #, fuzzy
-msgid "Re&quest Update"
-msgstr "Ca&is"
+msgid "KOrganizer Reminder Daemon"
+msgstr "Ellyll Larwm KTrefnydd"
 
-#: actionmanager.cpp:515
-msgid "Send &Cancelation to Attendees"
+#: korgac/korgacmain.cpp:70 korgac/korgacmain.cpp:72
+msgid "Maintainer"
+msgstr "Cynhaliwr"
+
+#: korgac/alarmdockwindow.cpp:67
+#, fuzzy
+msgid "Suspend All"
+msgstr "Seibio"
+
+#: korgac/alarmdialog.cpp:104 korgac/alarmdockwindow.cpp:68
+msgid "Dismiss All"
 msgstr ""
 
-#: actionmanager.cpp:522
+#: korgac/alarmdockwindow.cpp:73
 #, fuzzy
-msgid "Send Status &Update"
-msgstr "Dyddiad gorffen:"
+msgid "Reminders Enabled"
+msgstr "&Atgof:"
 
-#: actionmanager.cpp:529
+#: korgac/alarmdockwindow.cpp:75
 #, fuzzy
+msgid "Start Reminder Daemon at Login"
+msgstr "Cychwyn y Dibynnydd Larwm wrth Fewngofnodi"
+
+#: korgac/alarmdockwindow.cpp:134
+#, c-format
 msgid ""
-"_: counter proposal\n"
-"Request Chan&ge"
-msgstr "Gwr&thgynnig"
+"_n: There is 1 active reminder.\n"
+"There are %n active reminders."
+msgstr ""
 
-#: actionmanager.cpp:536
+#: korgac/alarmdockwindow.cpp:201
 #, fuzzy
-msgid "&Send as iCalendar..."
-msgstr "&iCalendr..."
+msgid ""
+"Do you want to start the KOrganizer reminder daemon at login (note that you "
+"will not get reminders whilst the daemon is not running)?"
+msgstr ""
+"Ydych eisiau cychwyn yr ellyll larwm KTrefnydd wrth fewngofnodi? (Noder na "
+"chewch larymau pan ni rheda'r ellyll.)"
 
-#: actionmanager.cpp:541
+#: korgac/alarmdockwindow.cpp:203
 #, fuzzy
-msgid "&Mail Free Busy Information..."
-msgstr "Cyhoeddi Gwybodaeth Rhydd Brysur"
+msgid "Close KOrganizer Reminder Daemon"
+msgstr "Cau Ellyll Larwm KTrefnydd"
 
-#: actionmanager.cpp:546
+#: korgac/alarmdockwindow.cpp:204
+msgid "Start"
+msgstr "Dechrau"
+
+#: korgac/alarmdockwindow.cpp:204
 #, fuzzy
-msgid "&Upload Free Busy Information"
-msgstr "Cyhoeddi Gwybodaeth Rhydd Brysur"
+msgid "Do Not Start"
+msgstr "Canoli wrth Gychwyn"
 
-#: actionmanager.cpp:552
-msgid "&Addressbook"
-msgstr "&Llyfr Cyfeiriadau"
+#: kolistview.cpp:209 korgac/alarmdialog.cpp:102
+msgid "Reminder"
+msgstr "Atgof"
 
-#: actionmanager.cpp:563
-#, fuzzy
-msgid "Show Date Navigator"
-msgstr "Dangos diwrnod Omer"
+#: korgac/alarmdialog.cpp:104
+msgid "Edit..."
+msgstr "Golygu..."
 
-#: actionmanager.cpp:566
+#: korgac/alarmdialog.cpp:104
 #, fuzzy
-msgid "Show To-do View"
-msgstr "Math Golwg"
+msgid "Dismiss Reminder"
+msgstr "&Atgof:"
+
+#: korgac/alarmdialog.cpp:116
+msgid "Suspend"
+msgstr "Seibio"
 
-#: actionmanager.cpp:569
+#: korgac/alarmdialog.cpp:122
 #, fuzzy
-msgid "Show Item Viewer"
-msgstr "Gwelydd Digwyddiadau"
+msgid "The following items triggered reminders:"
+msgstr "Taniodd y digwyddiadau dilynnol larymau:"
 
-#: actionmanager.cpp:588
+#: korgac/alarmdialog.cpp:131
 #, fuzzy
-msgid "Show Resource View"
-msgstr "Ffurfweddu Adnoddau"
+msgid "Date, Time"
+msgstr "Dyddiad ac Amser"
 
-#: actionmanager.cpp:591
+#: korgac/alarmdialog.cpp:151
 #, fuzzy
-msgid "Show &Resource Buttons"
-msgstr "Ffurfweddu Adnoddau"
+msgid "Suspend &duration:"
+msgstr "Cyfnod seibio (munudau):"
 
-#: actionmanager.cpp:606
-msgid "Configure &Date && Time..."
-msgstr "Ffurfweddu &Dyddiad && Amser..."
+#: korgac/alarmdialog.cpp:160
+msgid "week(s)"
+msgstr "wythnos(au)"
 
-#: actionmanager.cpp:613
-#, fuzzy
-msgid "Manage View &Filters..."
-msgstr "Golygu'r &Hidlenni"
+#: koeditorgeneral.cpp:396 korgac/alarmdialog.cpp:190
+msgid ""
+"_: elipsis\n"
+"..."
+msgstr ""
 
-#: actionmanager.cpp:616
-#, fuzzy
-msgid "Manage C&ategories..."
-msgstr "Golygu'r C&ategorïau..."
+#: korgac/alarmdialog.cpp:330
+msgid "\"%1\" is a read-only item so modifications are not possible."
+msgstr ""
 
-#: actionmanager.cpp:620
+#: korgac/alarmdialog.cpp:338
 #, fuzzy
-msgid "&Configure Calendar..."
-msgstr "Ffurfweddu'r &Ategion"
+msgid "Could not start KOrganizer so editing is not possible."
+msgstr "&Ffurfweddu KOrganizer..."
 
-#: actionmanager.cpp:645 actionmanager.cpp:647
-msgid "Filter: "
-msgstr "Hidl: "
+#: korgac/alarmdialog.cpp:352
+msgid ""
+"An internal KOrganizer error occurred attempting to start the incidence editor"
+msgstr ""
 
-#: actionmanager.cpp:709 actionmanager.cpp:797 actionmanager.cpp:1182
-msgid "*.vcs *.ics|Calendar Files"
-msgstr "*.vcs *.ics|Ffeiliau Calendr"
+#: koagendaview.cpp:629
+msgid ""
+"_: short_weekday date (e.g. Mon 13)\n"
+"%1 %2"
+msgstr "%1 %2"
 
-#: actionmanager.cpp:748
+#: koagendaview.cpp:1569
+msgid "Unable to modify this to-do, because it cannot be locked."
+msgstr ""
+
+#: koagendaview.cpp:1756 korganizer.cpp:290 kotimelineview.cpp:55
+#: kotimelineview.cpp:123 kotodoview.cpp:395 resourceview.cpp:270
+#: resourceview.cpp:321
+msgid "Calendar"
+msgstr "Calendr"
+
+#: koeditorrecurrence.cpp:91
 msgid ""
-"You have no ical file in your home directory.\n"
-"Import cannot proceed.\n"
+"The number of the week from the beginning of the month on which this event or "
+"to-do should recur."
 msgstr ""
-"Nid oes gennych ffeil ical yn eich cyfeiriadur cartref.\n"
-" Ni all y mewnforiad fynd ymlaen.\n"
 
-#: actionmanager.cpp:771
+#: koeditorrecurrence.cpp:95 koeditorrecurrence.cpp:259
+msgid "1st"
+msgstr "1af"
+
+#: koeditorrecurrence.cpp:96 koeditorrecurrence.cpp:260
+msgid "2nd"
+msgstr "2il"
+
+#: koeditorrecurrence.cpp:97 koeditorrecurrence.cpp:261
+msgid "3rd"
+msgstr "3ydd"
+
+#: koeditorrecurrence.cpp:98 koeditorrecurrence.cpp:262
+msgid "4th"
+msgstr "4ydd"
+
+#: koeditorrecurrence.cpp:99 koeditorrecurrence.cpp:263
+msgid "5th"
+msgstr "5ed"
+
+#: koeditorrecurrence.cpp:100 koeditorrecurrence.cpp:290
+msgid "Last"
+msgstr "Olaf"
+
+#: koeditorrecurrence.cpp:101 koeditorrecurrence.cpp:291
+msgid "2nd Last"
+msgstr "Ail Olaf"
+
+#: koeditorrecurrence.cpp:102 koeditorrecurrence.cpp:292
+msgid "3rd Last"
+msgstr "Trydydd Olaf"
+
+#: koeditorrecurrence.cpp:103 koeditorrecurrence.cpp:293
+msgid "4th Last"
+msgstr "Pedwerydd Olaf"
+
+#: koeditorrecurrence.cpp:104 koeditorrecurrence.cpp:294
+msgid "5th Last"
+msgstr "Pumed Olaf"
+
+#: koeditorrecurrence.cpp:112
+msgid "The weekday on which this event or to-do should recur."
+msgstr ""
+
+#: koeditorrecurrence.cpp:126
+msgid "The month during which this event or to-do should recur."
+msgstr ""
+
+#: koeditorrecurrence.cpp:143
+msgid "Sets how often this event or to-do should recur."
+msgstr ""
+
+#: koeditorrecurrence.cpp:167 koeditorrecurrence.cpp:181
+#: koeditorrecurrence.cpp:232 koeditorrecurrence.cpp:405
+msgid "&Recur every"
+msgstr "&Ail-ddigwydd pob"
+
+#: koeditorrecurrence.cpp:181
+msgid "week(s) on:"
+msgstr "wythnos(au) ar:"
+
+#: koeditorrecurrence.cpp:199
+msgid "Day of the week on which this event or to-do should recur."
+msgstr ""
+
+#: koeditorrecurrence.cpp:232
+msgid "month(s)"
+msgstr "mis(oedd)"
+
+#: koeditorrecurrence.cpp:244
+msgid "&Recur on the"
+msgstr "&Ail-ddigwydd ar y"
+
+#: koeditorrecurrence.cpp:249
 msgid ""
-"KOrganizer successfully imported and merged your .calendar file from ical into "
-"the currently opened calendar."
+"Sets a specific day of the month on which this event or to-do should recur."
 msgstr ""
-"Mi wnaeth KTrefnydd fewnforio a chyfuno eich ffeil .calendar o ical i'r calendr "
-"agoredig cyfredol."
 
-#: actionmanager.cpp:777
-#, fuzzy
+#: koeditorrecurrence.cpp:254 koeditorrecurrence.cpp:430
+msgid "The day of the month on which this event or to-do should recur."
+msgstr ""
+
+#: koeditorrecurrence.cpp:264
+msgid "6th"
+msgstr "6ed"
+
+#: koeditorrecurrence.cpp:265
+msgid "7th"
+msgstr "7fed"
+
+#: koeditorrecurrence.cpp:266
+msgid "8th"
+msgstr "8fed"
+
+#: koeditorrecurrence.cpp:267
+msgid "9th"
+msgstr "9fed"
+
+#: koeditorrecurrence.cpp:268
+msgid "10th"
+msgstr "10fed"
+
+#: koeditorrecurrence.cpp:269
+msgid "11th"
+msgstr "11eg"
+
+#: koeditorrecurrence.cpp:270
+msgid "12th"
+msgstr "12fed"
+
+#: koeditorrecurrence.cpp:271
+msgid "13th"
+msgstr "13eg"
+
+#: koeditorrecurrence.cpp:272
+msgid "14th"
+msgstr "14eg"
+
+#: koeditorrecurrence.cpp:273
+msgid "15th"
+msgstr "15fed"
+
+#: koeditorrecurrence.cpp:274
+msgid "16th"
+msgstr "16eg"
+
+#: koeditorrecurrence.cpp:275
+msgid "17th"
+msgstr "17eg"
+
+#: koeditorrecurrence.cpp:276
+msgid "18th"
+msgstr "18fed"
+
+#: koeditorrecurrence.cpp:277
+msgid "19th"
+msgstr "19eg"
+
+#: koeditorrecurrence.cpp:278
+msgid "20th"
+msgstr "20fed"
+
+#: koeditorrecurrence.cpp:279
+msgid "21st"
+msgstr "21ain"
+
+#: koeditorrecurrence.cpp:280
+msgid "22nd"
+msgstr "22ain"
+
+#: koeditorrecurrence.cpp:281
+msgid "23rd"
+msgstr "23ain"
+
+#: koeditorrecurrence.cpp:282
+msgid "24th"
+msgstr "24ain"
+
+#: koeditorrecurrence.cpp:283
+msgid "25th"
+msgstr "25ain"
+
+#: koeditorrecurrence.cpp:284
+msgid "26th"
+msgstr "26ain"
+
+#: koeditorrecurrence.cpp:285
+msgid "27th"
+msgstr "27ain"
+
+#: koeditorrecurrence.cpp:286
+msgid "28th"
+msgstr "28ain"
+
+#: koeditorrecurrence.cpp:287
+msgid "29th"
+msgstr "29ain"
+
+#: koeditorrecurrence.cpp:288
+msgid "30th"
+msgstr "30ain"
+
+#: koeditorrecurrence.cpp:289
+msgid "31st"
+msgstr "31ain"
+
+#: koeditorrecurrence.cpp:325
+msgid "day"
+msgstr "dydd"
+
+#: koeditorrecurrence.cpp:332
 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."
+"Sets a weekday and specific week in the month on which this event or to-do "
+"should recur"
 msgstr ""
-"Mi wnaeth Ktrefnydd ganfod meysydd anhysbys tra'n dosrannu eich ffeil .calendar "
-"ical, ac mi roedd rhaid eu taflu nhw. Os gwelwch yn dda, edrychwch i weld os "
-"oedd pob darn o ddata pwysig wedi ei fewnforio yn gywir."
 
-#: actionmanager.cpp:781
-#, fuzzy
-msgid "ICal Import Successful with Warning"
-msgstr "Mewnforiad Ical Yn Gywir Ond Gyda Rhybydd"
+#: koeditorrecurrence.cpp:405
+msgid "year(s)"
+msgstr "blwyddyn (blynyddoedd)"
 
-#: actionmanager.cpp:784
-#, fuzzy
+#: koeditorrecurrence.cpp:419
 msgid ""
-"KOrganizer encountered an error parsing your .calendar file from ical; import "
-"has failed."
+"_: part before XXX of 'Recur on day XXX of month YYY'\n"
+"&Recur on day "
 msgstr ""
-"My wnaeth KTrefnydd ganfod gwall pan yn dosrannu eich ffeil .calendar o ical. "
-"Mae'r mewnforiad wedi methu."
 
-#: actionmanager.cpp:788
-#, fuzzy
+#: koeditorrecurrence.cpp:421
+msgid "&Day "
+msgstr "&Dydd "
+
+#: koeditorrecurrence.cpp:425
 msgid ""
-"KOrganizer does not think that your .calendar file is a valid ical calendar; "
-"import has failed."
+"Sets a specific day in a specific month on which this event or to-do should "
+"recur."
 msgstr ""
-"Nid yw KTrefnydd yn meddwl bod eich ffeil .calendar yn galendr ical dilys. "
-"Mae'r mewnforiad wedi methu."
 
-#: actionmanager.cpp:870
-#, fuzzy
-msgid "New calendar '%1'."
-msgstr "Wedi cadw'r calendr '%1'."
+#: koeditorrecurrence.cpp:434
+msgid ""
+"_: part between XXX and YYY of 'Recur on day XXX of month YYY'\n"
+" &of "
+msgstr ""
 
-#: actionmanager.cpp:905
-msgid "Cannot download calendar from '%1'."
-msgstr "Methu lawrlywtho calendr oddi wrth '%1'."
+#: koeditorrecurrence.cpp:448
+msgid ""
+"_: Part before XXX in 'Recur on NNN. WEEKDAY of MONTH', short version\n"
+"&On"
+msgstr ""
 
-#: actionmanager.cpp:943
-msgid "Added calendar resource for URL '%1'."
+#: koeditorrecurrence.cpp:450
+msgid ""
+"_: Part before XXX in 'Recur on NNN. WEEKDAY of MONTH'\n"
+"&On the"
+msgstr ""
+
+#: koeditorrecurrence.cpp:454
+msgid ""
+"Sets a specific day in a specific week of a specific month on which this event "
+"or to-do should recur."
+msgstr ""
+
+#: koeditorrecurrence.cpp:465
+msgid ""
+"_: part between WEEKDAY and MONTH in 'Recur on NNN. WEEKDAY of MONTH'\n"
+" o&f "
 msgstr ""
 
-#: actionmanager.cpp:951
+#: koeditorrecurrence.cpp:480
 #, fuzzy
-msgid "Unable to create calendar resource '%1'."
-msgstr "Methu cadw'r eitem i-wneud"
+msgid "Day #"
+msgstr "Dydd"
 
-#: actionmanager.cpp:962
-msgid "Merged calendar '%1'."
-msgstr "Calendr '%1' wedi ei gyfuno."
+#: koeditorrecurrence.cpp:482
+#, fuzzy
+msgid "Recur on &day #"
+msgstr "Ail-ddi&gwydd ar y diwrnod yma"
 
-#: actionmanager.cpp:965
-msgid "Opened calendar '%1'."
-msgstr "Calendr '%1' wedi ei agor."
+#: koeditorrecurrence.cpp:484
+msgid ""
+"Sets a specific day within the year on which this event or to-do should recur."
+msgstr ""
 
-#: actionmanager.cpp:990
+#: koeditorrecurrence.cpp:495
 msgid ""
-"Your calendar will be saved in iCalendar format. Use 'Export vCalendar' to save "
-"in vCalendar format."
+"_: part after NNN of 'Recur on day #NNN of the year'\n"
+" of the &year"
 msgstr ""
-"Cedwir eich calendr yn fformat iCalendar. Defnyddiwch 'Allforio vCalendar' i'w "
-"gadw mewn fformat vCalendar."
 
-#: actionmanager.cpp:992
-msgid "Format Conversion"
-msgstr "Trosiad Fformat"
+#: koeditorrecurrence.cpp:498
+msgid ""
+"_: part after NNN of 'Recur on day #NNN of the year', short version\n"
+" of the year"
+msgstr ""
 
-#: actionmanager.cpp:1016
-msgid "Cannot upload calendar to '%1'"
-msgstr "Methu llwytho calendr i fyny i '%1'"
+#: koeditorrecurrence.cpp:581
+msgid "E&xceptions"
+msgstr "&Eithriadau"
 
-#: actionmanager.cpp:1029
-msgid "Saved calendar '%1'."
-msgstr "Wedi cadw'r calendr '%1'."
+#: koeditorrecurrence.cpp:591
+msgid ""
+"A date that should be considered an exception to the recurrence rules for this "
+"event or to-do."
+msgstr ""
 
-#: actionmanager.cpp:1089
-msgid "Could not upload file."
-msgstr "Methu llwytho ffeil."
+#: koeditorrecurrence.cpp:597
+msgid ""
+"_: Add a new recurrence to the recurrence list\n"
+"&Add"
+msgstr ""
 
-#: actionmanager.cpp:1130
-#, fuzzy, c-format
-msgid "Unable to save calendar to the file %1."
-msgstr "Methu cadw'r eitem i-wneud"
+#: koeditorrecurrence.cpp:599
+msgid ""
+"Add this date as an exception to the recurrence rules for this event or to-do."
+msgstr ""
+
+#: koeditorrecurrence.cpp:602
+msgid "&Change"
+msgstr "&Newid"
+
+#: koeditorrecurrence.cpp:604
+msgid "Replace the currently selected date with this date."
+msgstr ""
 
-#: actionmanager.cpp:1155
+#: koeditorrecurrence.cpp:608
 msgid ""
-"The calendar has been modified.\n"
-"Do you want to save it?"
+"Delete the currently selected date from the list of dates that should be "
+"considered exceptions to the recurrence rules for this event or to-do."
 msgstr ""
-"Mae'r calendr wedi newid.\n"
-"A ydych chi eisiau ei gadw?"
 
-#: actionmanager.cpp:1258
-#, c-format
+#: koeditorrecurrence.cpp:615
 msgid ""
-"_n: &Next Day\n"
-"&Next %n Days"
+"Displays current dates that are being considered exceptions to the recurrence "
+"rules for this event or to-do."
 msgstr ""
-"Diwrnod &Nesaf\n"
-"%n o Ddiwrnodau &Nesaf"
 
-#: actionmanager.cpp:1292
-#, fuzzy
-msgid "Could not start control module for date and time format."
-msgstr "Methu dechrau modwl reoli'r fformat dyddiad ac amser."
+#: koeditorrecurrence.cpp:679
+msgid "Edit Exceptions"
+msgstr "Golygu Eithriadau"
 
-#: actionmanager.cpp:1433
-msgid "&Show Event"
-msgstr "Dango&s Digwyddiad"
+#: koeditorrecurrence.cpp:703
+msgid "Recurrence Range"
+msgstr "Amrediad Ail-ddigwyddiadau"
 
-#: actionmanager.cpp:1434
-msgid "&Edit Event..."
-msgstr "&Golygu Digwyddiad..."
+#: koeditorrecurrence.cpp:706
+msgid ""
+"Sets a range for which these recurrence rules will apply to this event or "
+"to-do."
+msgstr ""
 
-#: actionmanager.cpp:1435
-msgid "&Delete Event"
-msgstr "&Dileu Digwyddiad"
+#: koeditorrecurrence.cpp:714
+msgid "Begin on:"
+msgstr "Dechrau ar:"
 
-#: actionmanager.cpp:1439
-msgid "&Show To-do"
-msgstr "Dango&s I'w-Wneud"
+#: koeditorrecurrence.cpp:716
+msgid "The date on which the recurrences for this event or to-do should begin."
+msgstr ""
 
-#: actionmanager.cpp:1440
-msgid "&Edit To-do..."
-msgstr "&Golygu I'w-Wneud"
+#: koeditorrecurrence.cpp:723
+msgid "&No ending date"
+msgstr "&Heb ddyddiad gorffen"
 
-#: actionmanager.cpp:1441
-msgid "&Delete To-do"
-msgstr "&Dileu I'w-Wneud"
+#: koeditorrecurrence.cpp:725
+msgid "Sets the event or to-do to recur forever."
+msgstr ""
 
-#: actionmanager.cpp:1560 actionmanager.cpp:1675
-msgid "Attach as &link"
+#: koeditorrecurrence.cpp:732
+msgid "End &after"
+msgstr "Gorffen &ar ôl"
+
+#: koeditorrecurrence.cpp:734
+msgid ""
+"Sets the event or to-do to stop recurring after a certain number of "
+"occurrences."
 msgstr ""
 
-#: actionmanager.cpp:1561 actionmanager.cpp:1676
+#: koeditorrecurrence.cpp:739
+msgid "Number of times the event or to-do should recur before stopping."
+msgstr ""
+
+#: koeditorrecurrence.cpp:745
+msgid "&occurrence(s)"
+msgstr "di&gwyddiad(au)"
+
+#: koeditorrecurrence.cpp:753
 #, fuzzy
-msgid "Attach &inline"
-msgstr "Atodia&dau"
+msgid "End &on:"
+msgstr "Gorffen &erbyn:"
 
-#: actionmanager.cpp:1562
-msgid "Attach inline &without attachments"
+#: koeditorrecurrence.cpp:755
+msgid "Sets the event or to-do to stop recurring on a certain date."
 msgstr ""
 
-#: actionmanager.cpp:1564 actionmanager.cpp:1678
-msgid "C&ancel"
+#: koeditorrecurrence.cpp:762
+msgid "Date after which the event or to-do should stop recurring"
 msgstr ""
 
-#: actionmanager.cpp:1594
-msgid "Removing attachments from an email might invalidate its signature."
+#: koeditorrecurrence.cpp:826
+#, c-format
+msgid "Begins on: %1"
+msgstr "Yn dechrau ar: %1"
+
+#: koeditorrecurrence.cpp:834
+msgid "Edit Recurrence Range"
+msgstr "Golygu Amrediad Ail-ddigwyddiadau"
+
+#: koeditorrecurrence.cpp:881
+msgid "Sets the type of recurrence this event or to-do should have."
 msgstr ""
 
-#: actionmanager.cpp:1595
-#, fuzzy
-msgid "Remove Attachments"
-msgstr "Atodia&dau"
+#: koeditorrecurrence.cpp:883
+msgid "Daily"
+msgstr "Dyddiol"
 
-#: actionmanager.cpp:1764
-msgid "Undo (%1)"
-msgstr "Datwneud (%1)"
+#: koeditorrecurrence.cpp:884
+msgid "Weekly"
+msgstr "Wythnosol"
 
-#: actionmanager.cpp:1776
-msgid "Redo (%1)"
-msgstr "Ailwneud (%1)"
+#: koeditorrecurrence.cpp:885
+msgid "Monthly"
+msgstr "Misol"
 
-#: actionmanager.cpp:1788
-#, fuzzy
+#: koeditorrecurrence.cpp:886
+msgid "Yearly"
+msgstr "Blynyddol"
+
+#: koeditorrecurrence.cpp:898
+msgid "&Daily"
+msgstr "&Dyddiol"
+
+#: koeditorrecurrence.cpp:900
 msgid ""
-"The calendar contains unsaved changes. Do you want to save them before exiting?"
+"Sets the event or to-do to recur daily according to the specified rules."
 msgstr ""
-"Mae'r calendr wedi newid.\n"
-"A ydych chi eisiau ei gadw?"
 
-#: actionmanager.cpp:1793
-msgid "Unable to save the calendar. Do you still want to close this window?"
+#: koeditorrecurrence.cpp:902
+msgid "&Weekly"
+msgstr "&Wythnosol"
+
+#: koeditorrecurrence.cpp:904
+msgid ""
+"Sets the event or to-do to recur weekly according to the specified rules."
 msgstr ""
 
-#: actionmanager.cpp:1814
-msgid "Unable to exit. Saving still in progress."
+#: koeditorrecurrence.cpp:906
+msgid "&Monthly"
+msgstr "&Misol"
+
+#: koeditorrecurrence.cpp:908
+msgid ""
+"Sets the event or to-do to recur monthly according to the specified rules."
+msgstr ""
+
+#: koeditorrecurrence.cpp:910
+msgid "&Yearly"
+msgstr "&Blynyddol"
+
+#: koeditorrecurrence.cpp:912
+msgid ""
+"Sets the event or to-do to recur yearly according to the specified rules."
 msgstr ""
 
-#: actionmanager.cpp:1853
+#: koeditorrecurrence.cpp:974
+msgid "&Enable recurrence"
+msgstr "Gall&uogi ail-ddigwydd"
+
+#: koeditorrecurrence.cpp:976
+msgid ""
+"Enables recurrence for this event or to-do according to the specified rules."
+msgstr ""
+
+#: koeditorrecurrence.cpp:983
+msgid "Appointment Time "
+msgstr "Amser Cyfarfod"
+
+#: koeditorrecurrence.cpp:986
 #, fuzzy
+msgid "Displays appointment time information."
+msgstr "Amser cyfarfod rhagosodedig:"
+
+#: koeditorrecurrence.cpp:1005
+msgid "Recurrence Rule"
+msgstr "Rheol Ail-ddigwydd"
+
+#: koeditorrecurrence.cpp:1007
 msgid ""
-"Saving of '%1' failed. Check that the resource is properly configured.\n"
-"Ignore problem and continue without saving or cancel save?"
+"Options concerning the type of recurrence this event or to-do should have."
 msgstr ""
-"Methodd cadw '%1'.  Gwiriwch bod yr adnodd wedi'i ffurfweddu'n gywir.\n"
-"Anwybyddu'r problem a parhau heb gadw, neu ddiddymu'r cadw?"
 
-#: actionmanager.cpp:1856
-msgid "Save Error"
-msgstr "Gwall Cadw"
+#: koeditorrecurrence.cpp:1044
+msgid "Recurrence Range..."
+msgstr "Amrediad Ail-ddigwydd..."
 
-#: actionmanager.cpp:1867
-msgid "URL '%1' is invalid."
+#: koeditorrecurrence.cpp:1047 koeditorrecurrence.cpp:1064
+msgid ""
+"Options concerning the time range during which this event or to-do should "
+"recur."
 msgstr ""
 
+#: koeditorrecurrence.cpp:1056
+msgid "Exceptions..."
+msgstr "Eithriadau..."
+
+#: koeditorrecurrence.cpp:1396
+msgid ""
+"The end date '%1' of the recurrence must be after the start date '%2' of the "
+"event."
+msgstr ""
+
+#: koeditorrecurrence.cpp:1410
+msgid ""
+"A weekly recurring event or task has to have at least one weekday associated "
+"with it."
+msgstr ""
+
+#: koeditorrecurrence.cpp:1637
+#, fuzzy
+msgid "Recurrence"
+msgstr "Ail-dd&igwydd"
+
 #. i18n: file korganizer_part.rc line 11
-#: rc.cpp:6 rc.cpp:54 rc.cpp:1496 rc.cpp:1544
+#: rc.cpp:6 rc.cpp:54 rc.cpp:1041 rc.cpp:2018
 #, no-c-format
 msgid "&Import"
 msgstr "&Mewnforio"
 
 #. i18n: file korganizer_part.rc line 18
-#: rc.cpp:9 rc.cpp:57 rc.cpp:1499 rc.cpp:1547
+#: rc.cpp:9 rc.cpp:57 rc.cpp:1044 rc.cpp:2021
 #, no-c-format
 msgid "&Export"
 msgstr "&Allforio"
 
 #. i18n: file korganizer_part.rc line 73
-#: rc.cpp:21 rc.cpp:69 rc.cpp:1511 rc.cpp:1559
+#: rc.cpp:21 rc.cpp:69 rc.cpp:1056 rc.cpp:2033
 #, no-c-format
 msgid "&Go"
 msgstr "&Ewch"
 
 #. i18n: file korganizer_part.rc line 80
-#: rc.cpp:24 rc.cpp:72 rc.cpp:1514 rc.cpp:1562
+#: rc.cpp:24 rc.cpp:72 rc.cpp:1059 rc.cpp:2036
 #, no-c-format
 msgid "&Actions"
 msgstr "&Gweithredau"
 
 #. i18n: file korganizer_part.rc line 95
-#: rc.cpp:27 rc.cpp:75 rc.cpp:1517 rc.cpp:1565
+#: rc.cpp:27 rc.cpp:75 rc.cpp:1062 rc.cpp:2039
 #, no-c-format
 msgid "S&chedule"
 msgstr "&Trefnlen"
 
 #. i18n: file korganizer_part.rc line 108
-#: rc.cpp:33 rc.cpp:81 rc.cpp:1523 rc.cpp:1571
+#: rc.cpp:33 rc.cpp:81 rc.cpp:1068 rc.cpp:2045
 #, fuzzy, no-c-format
 msgid "&Sidebar"
 msgstr "Bar amser:"
 
 #. i18n: file korganizer_part.rc line 131
-#: rc.cpp:39 rc.cpp:87 rc.cpp:1529 rc.cpp:1577
+#: rc.cpp:39 rc.cpp:87 rc.cpp:1074 rc.cpp:2051
 #, no-c-format
 msgid "Main"
 msgstr "Prif"
 
 #. i18n: file korganizer_part.rc line 140
-#: rc.cpp:42 rc.cpp:90 rc.cpp:1532 rc.cpp:1580
+#: rc.cpp:42 rc.cpp:90 rc.cpp:1077 rc.cpp:2054
 #, no-c-format
 msgid "Views"
 msgstr "Golygon"
 
 #. i18n: file korganizer_part.rc line 154
-#: rc.cpp:45 rc.cpp:93 rc.cpp:1535 rc.cpp:1583
+#: rc.cpp:45 rc.cpp:93 rc.cpp:1080 rc.cpp:2057
 #, no-c-format
 msgid "Schedule"
 msgstr "Trefnlen"
 
 #. i18n: file korganizer_part.rc line 160
-#: rc.cpp:48 rc.cpp:96 rc.cpp:1538 rc.cpp:1586
+#: rc.cpp:48 rc.cpp:96 rc.cpp:1083 rc.cpp:2060
 #, fuzzy, no-c-format
 msgid "Filters Toolbar"
 msgstr "Barrau Offer"
 
 #. i18n: file filteredit_base.ui line 45
-#: rc.cpp:105 rc.cpp:2081
+#: rc.cpp:105 rc.cpp:2189
 #, fuzzy, no-c-format
 msgid "Filter Details"
 msgstr "Hidlen wedi ei galluogi"
 
 #. i18n: file filteredit_base.ui line 64
-#: rc.cpp:108 rc.cpp:423 rc.cpp:1865 rc.cpp:2084
+#: rc.cpp:108 rc.cpp:426 rc.cpp:2168 rc.cpp:2192
 #, no-c-format
 msgid "Name:"
 msgstr "Enw:"
 
 #. i18n: file filteredit_base.ui line 79
-#: rc.cpp:111 rc.cpp:2087
+#: rc.cpp:111 rc.cpp:2195
 #, fuzzy, no-c-format
 msgid "Hide &recurring events and to-dos"
 msgstr "Cuddio Digwyddiadau sy'n Ail-ddigwydd"
 
 #. i18n: file filteredit_base.ui line 82
-#: rc.cpp:114 rc.cpp:2090
+#: rc.cpp:114 rc.cpp:2198
 #, no-c-format
 msgid ""
 "Select this option if you do not want to show recurring events and to-dos in "
@@ -3034,13 +4733,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file filteredit_base.ui line 90
-#: rc.cpp:117 rc.cpp:2093
+#: rc.cpp:117 rc.cpp:2201
 #, no-c-format
 msgid "Hide co&mpleted to-dos"
 msgstr "Cuddio &i'w-wneudau a gwblhawyd"
 
 #. i18n: file filteredit_base.ui line 93
-#: rc.cpp:120 rc.cpp:2096
+#: rc.cpp:120 rc.cpp:2204
 #, no-c-format
 msgid ""
 "If this box is checked, the filter will hide all to-do items from the list, "
@@ -3049,13 +4748,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file filteredit_base.ui line 129
-#: rc.cpp:123 rc.cpp:2099
+#: rc.cpp:123 rc.cpp:2207
 #, no-c-format
 msgid "Days after completion:"
 msgstr ""
 
 #. i18n: file filteredit_base.ui line 135
-#: rc.cpp:126 rc.cpp:2102
+#: rc.cpp:126 rc.cpp:2210
 #, no-c-format
 msgid ""
 "This option will allow you to select which completed to-dos should be hidden. "
@@ -3064,13 +4763,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file filteredit_base.ui line 152
-#: rc.cpp:129 rc.cpp:2105
+#: rc.cpp:129 rc.cpp:2213
 #, no-c-format
 msgid "Immediately"
 msgstr "Ar Unwaith"
 
 #. i18n: file filteredit_base.ui line 155
-#: rc.cpp:132 rc.cpp:2108
+#: rc.cpp:132 rc.cpp:2216
 #, no-c-format
 msgid ""
 "Here you can give the number of days a to-do item has to be completed to be "
@@ -3080,13 +4779,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file filteredit_base.ui line 182
-#: rc.cpp:135 rc.cpp:2111
+#: rc.cpp:135 rc.cpp:2219
 #, fuzzy, no-c-format
 msgid "Hide &inactive to-dos"
 msgstr "Cuddio i'w-wneudau a gwblhawyd"
 
 #. i18n: file filteredit_base.ui line 185
-#: rc.cpp:138 rc.cpp:2114
+#: rc.cpp:138 rc.cpp:2222
 #, no-c-format
 msgid ""
 "This option hides all to-dos from your list, where the start date has not been "
@@ -3094,13 +4793,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file filteredit_base.ui line 235
-#: rc.cpp:144 rc.cpp:2120
+#: rc.cpp:144 rc.cpp:2228
 #, fuzzy, no-c-format
 msgid "Show all except selected"
 msgstr "Dangos po&peth ond y dewisiad"
 
 #. i18n: file filteredit_base.ui line 244
-#: rc.cpp:147 rc.cpp:2123
+#: rc.cpp:147 rc.cpp:2231
 #, no-c-format
 msgid ""
 "When this option is enabled, this filter will show all items which do <i>not</i> "
@@ -3108,13 +4807,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file filteredit_base.ui line 252
-#: rc.cpp:150 rc.cpp:2126
+#: rc.cpp:150 rc.cpp:2234
 #, no-c-format
 msgid "Show only selected"
 msgstr "Dangos y dewisiad yn unig"
 
 #. i18n: file filteredit_base.ui line 261
-#: rc.cpp:153 rc.cpp:2129
+#: rc.cpp:153 rc.cpp:2237
 #, no-c-format
 msgid ""
 "When this option is enabled, this filter will show all items containing at "
@@ -3122,19 +4821,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file filteredit_base.ui line 269
-#: rc.cpp:156 rc.cpp:2132
+#: rc.cpp:156 rc.cpp:2240
 #, no-c-format
 msgid "Change..."
 msgstr "Newid..."
 
 #. i18n: file filteredit_base.ui line 282
-#: rc.cpp:159 rc.cpp:2135
+#: rc.cpp:159 rc.cpp:2243
 #, no-c-format
 msgid "Hide to-dos not assigned to me"
 msgstr ""
 
 #. i18n: file filteredit_base.ui line 289
-#: rc.cpp:162 rc.cpp:2138
+#: rc.cpp:162 rc.cpp:2246
 #, no-c-format
 msgid ""
 "This option hides all to-dos from your list which are assigned to someone else."
@@ -3144,187 +4843,183 @@ msgid ""
 msgstr ""
 
 #. i18n: file koeditoralarms_base.ui line 16
-#: rc.cpp:166 rc.cpp:1880
+#: rc.cpp:166 rc.cpp:2063
 #, no-c-format
 msgid "Alarms"
 msgstr "Larymau"
 
 #. i18n: file koeditoralarms_base.ui line 30
-#: rc.cpp:169 rc.cpp:262 rc.cpp:1883 rc.cpp:1976
+#: rc.cpp:169 rc.cpp:259 rc.cpp:2066 rc.cpp:2156
 #, fuzzy, no-c-format
 msgid "Time Offset"
 msgstr "Atred"
 
-#. i18n: file koeditoralarms_base.ui line 80
-#: rc.cpp:181 rc.cpp:1895
+#. i18n: file koeditoralarms_base.ui line 86
+#: koeditorgeneral.cpp:240 koeditorgeneral.cpp:439 koeditorgeneral.cpp:444
+#: rc.cpp:181 rc.cpp:2078
 #, fuzzy, no-c-format
 msgid "before the start"
 msgstr "Canoli wrth Gychwyn"
 
-#. i18n: file koeditoralarms_base.ui line 85
-#: rc.cpp:184 rc.cpp:1898
+#. i18n: file koeditoralarms_base.ui line 91
+#: rc.cpp:184 rc.cpp:2081
 #, fuzzy, no-c-format
 msgid "after the start"
 msgstr "Canoli wrth Gychwyn"
 
-#. i18n: file koeditoralarms_base.ui line 90
-#: rc.cpp:187 rc.cpp:1901
+#. i18n: file koeditoralarms_base.ui line 96
+#: rc.cpp:187 rc.cpp:2084
 #, fuzzy, no-c-format
 msgid "before the end"
 msgstr "Canoli wrth Gychwyn"
 
-#. i18n: file koeditoralarms_base.ui line 95
-#: rc.cpp:190 rc.cpp:1904
+#. i18n: file koeditoralarms_base.ui line 101
+#: rc.cpp:190 rc.cpp:2087
 #, fuzzy, no-c-format
 msgid "after the end"
 msgstr "Canoli wrth Gychwyn"
 
-#. i18n: file koeditoralarms_base.ui line 128
-#: rc.cpp:193 rc.cpp:1907
+#. i18n: file koeditoralarms_base.ui line 134
+#: rc.cpp:193 rc.cpp:2090
 #, no-c-format
 msgid "&How often:"
 msgstr ""
 
-#. i18n: file koeditoralarms_base.ui line 142
-#: rc.cpp:196 rc.cpp:1910
+#. i18n: file koeditoralarms_base.ui line 148
+#: rc.cpp:196 rc.cpp:2093
 #, fuzzy, no-c-format
 msgid " time(s)"
 msgstr "dim amser"
 
-#. i18n: file koeditoralarms_base.ui line 159
-#: rc.cpp:199 rc.cpp:1913
+#. i18n: file koeditoralarms_base.ui line 165
+#: rc.cpp:199 rc.cpp:2096
 #, fuzzy, no-c-format
 msgid "&Interval:"
 msgstr "&Cyffredinol"
 
-#. i18n: file koeditoralarms_base.ui line 178
-#: rc.cpp:202 rc.cpp:1916
+#. i18n: file koeditoralarms_base.ui line 184
+#: rc.cpp:202 rc.cpp:2099
 #, fuzzy, no-c-format
 msgid "&Repeat:"
 msgstr "Ail-adrodd"
 
-#. i18n: file koeditoralarms_base.ui line 189
-#: rc.cpp:205 rc.cpp:1919
+#. i18n: file koeditoralarms_base.ui line 195
+#: rc.cpp:205 rc.cpp:2102
 #, fuzzy, no-c-format
 msgid "every "
 msgstr "bob"
 
-#. i18n: file koeditoralarms_base.ui line 192
-#: rc.cpp:208 rc.cpp:1922
+#. i18n: file koeditoralarms_base.ui line 198
+#: rc.cpp:208 rc.cpp:2105
 #, fuzzy, no-c-format
 msgid " minute(s)"
 msgstr "munud(au)"
 
-#. i18n: file koeditoralarms_base.ui line 210
-#: rc.cpp:211 rc.cpp:259 rc.cpp:1925 rc.cpp:1973
+#. i18n: file koeditoralarms_base.ui line 216
+#: rc.cpp:211 rc.cpp:256 rc.cpp:2108 rc.cpp:2153
 #, no-c-format
 msgid "Type"
 msgstr "Math"
 
-#. i18n: file koeditoralarms_base.ui line 252
-#: rc.cpp:214 rc.cpp:1928
+#. i18n: file koeditoralarms_base.ui line 258
+#: rc.cpp:214 rc.cpp:2111
 #, fuzzy, no-c-format
 msgid "&Reminder Dialog"
 msgstr "&Atgof:"
 
-#. i18n: file koeditoralarms_base.ui line 263
-#: rc.cpp:217 rc.cpp:1931
+#. i18n: file koeditoralarms_base.ui line 269
+#: rc.cpp:217 rc.cpp:2114
 #, fuzzy, no-c-format
 msgid "A&udio"
 msgstr "Sain"
 
-#. i18n: file koeditoralarms_base.ui line 341
-#: rc.cpp:226 rc.cpp:1940
+#. i18n: file koeditoralarms_base.ui line 347
+#: rc.cpp:226 rc.cpp:2123
 #, fuzzy, no-c-format
 msgid "Reminder Dialog &text:"
 msgstr "&Atgof:"
 
-#. i18n: file koeditoralarms_base.ui line 373
-#: rc.cpp:229 rc.cpp:1943
+#. i18n: file koeditoralarms_base.ui line 379
+#: rc.cpp:229 rc.cpp:2126
 #, fuzzy, no-c-format
 msgid "Audio &file:"
 msgstr "&Ffeil sain:"
 
-#. i18n: file koeditoralarms_base.ui line 384
-#: rc.cpp:232 rc.cpp:1946
+#. i18n: file koeditoralarms_base.ui line 390
+#: rc.cpp:232 rc.cpp:2129
 #, no-c-format
 msgid "audio/x-wav audio/x-mp3 application/ogg"
 msgstr ""
 
-#. i18n: file koeditoralarms_base.ui line 425
-#: rc.cpp:235 rc.cpp:1949
+#. i18n: file koeditoralarms_base.ui line 431
+#: rc.cpp:235 rc.cpp:2132
 #, no-c-format
 msgid "&Program file:"
 msgstr ""
 
-#. i18n: file koeditoralarms_base.ui line 436
-#: rc.cpp:238 rc.cpp:1952
+#. i18n: file koeditoralarms_base.ui line 442
+#: rc.cpp:238 rc.cpp:2135
 #, no-c-format
 msgid "*.*|All files"
 msgstr ""
 
-#. i18n: file koeditoralarms_base.ui line 444
-#: rc.cpp:241 rc.cpp:1955
+#. i18n: file koeditoralarms_base.ui line 450
+#: rc.cpp:241 rc.cpp:2138
 #, fuzzy, no-c-format
 msgid "Program ar&guments:"
 msgstr "Ym&resymiadau:"
 
-#. i18n: file koeditoralarms_base.ui line 493
-#: rc.cpp:244 rc.cpp:1958
+#. i18n: file koeditoralarms_base.ui line 499
+#: rc.cpp:244 rc.cpp:2141
 #, no-c-format
 msgid "Email &message text:"
 msgstr ""
 
-#. i18n: file koeditoralarms_base.ui line 514
-#: rc.cpp:247 rc.cpp:1961
+#. i18n: file koeditoralarms_base.ui line 520
+#: rc.cpp:247 rc.cpp:2144
 #, fuzzy, no-c-format
 msgid "Email &address(es):"
 msgstr "Cyfeiriad e&bost:"
 
-#. i18n: file koeditoralarms_base.ui line 538
-#: rc.cpp:250 rc.cpp:1964
-#, no-c-format
-msgid "&Remove..."
-msgstr "&Gwaredu..."
-
-#. i18n: file koeditoralarms_base.ui line 554
-#: rc.cpp:256 rc.cpp:1970
+#. i18n: file koeditoralarms_base.ui line 560
+#: rc.cpp:253 rc.cpp:2150
 #, no-c-format
 msgid "D&uplicate"
 msgstr "D&yblyg"
 
-#. i18n: file koeditoralarms_base.ui line 599
-#: rc.cpp:265 rc.cpp:1979
+#. i18n: file koeditoralarms_base.ui line 605
+#: rc.cpp:262 rc.cpp:2159
 #, no-c-format
 msgid "Repeat"
 msgstr "Ail-adrodd"
 
 #. i18n: file kogroupwareprefspage.ui line 31
-#: rc.cpp:268 rc.cpp:891
+#: rc.cpp:265 rc.cpp:1860
 #, no-c-format
 msgid "P&ublish"
 msgstr "Cyh&oeddi"
 
 #. i18n: file kogroupwareprefspage.ui line 42
-#: rc.cpp:271 rc.cpp:894
-#, no-c-format
+#: rc.cpp:268 rc.cpp:1863
+#, fuzzy, no-c-format
 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."
+"busy are published, not why they are busy. For Kolab2 Server leave this "
+"disabled (the information is generated on the server)."
 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 line 53
-#: rc.cpp:274 rc.cpp:897
+#: rc.cpp:271 rc.cpp:1866
 #, no-c-format
 msgid "Publish your free/&busy information automatically"
 msgstr "Cyhoeddi eich &gwybodaeth rydd/brysur yn ymysgogol"
 
 #. i18n: file kogroupwareprefspage.ui line 58
-#: rc.cpp:277 rc.cpp:900
+#: rc.cpp:274 rc.cpp:1869
 #, no-c-format
 msgid ""
 "Check this box to upload your Free/Busy information automatically.\n"
@@ -3336,13 +5031,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file kogroupwareprefspage.ui line 74
-#: rc.cpp:282 rc.cpp:905
+#: rc.cpp:279 rc.cpp:1874
 #, fuzzy, no-c-format
 msgid "Minimum time between uploads (in minutes):"
 msgstr "Amser lleiaf &rhwng lanlwythiadau (mewn munudau):"
 
 #. i18n: file kogroupwareprefspage.ui line 80
-#: rc.cpp:285 rc.cpp:288 rc.cpp:908 rc.cpp:911
+#: rc.cpp:282 rc.cpp:285 rc.cpp:1877 rc.cpp:1880
 #, no-c-format
 msgid ""
 "Configure minimum the interval of time in minutes between each upload here. "
@@ -3351,13 +5046,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file kogroupwareprefspage.ui line 109
-#: rc.cpp:291 rc.cpp:914
+#: rc.cpp:288 rc.cpp:1883
 #, no-c-format
 msgid "Publish"
 msgstr "Cyhoeddi"
 
 #. i18n: file kogroupwareprefspage.ui line 115
-#: rc.cpp:294 rc.cpp:297 rc.cpp:303 rc.cpp:917 rc.cpp:920 rc.cpp:926
+#: rc.cpp:291 rc.cpp:294 rc.cpp:300 rc.cpp:1886 rc.cpp:1889 rc.cpp:1895
 #, no-c-format
 msgid ""
 "Configure the number of calendar days you wish to be published and available to "
@@ -3365,36 +5060,34 @@ msgid ""
 msgstr ""
 
 #. i18n: file kogroupwareprefspage.ui line 140
-#: rc.cpp:300 rc.cpp:923
+#: rc.cpp:297 rc.cpp:1892
 #, no-c-format
 msgid "days of free/busy information"
 msgstr "dyddiadau o wybodaeth rhydd/prysur"
 
 #. i18n: file kogroupwareprefspage.ui line 170
-#: rc.cpp:306 rc.cpp:372 rc.cpp:929 rc.cpp:995
+#: rc.cpp:303 rc.cpp:367 rc.cpp:1898 rc.cpp:1962
 #, no-c-format
 msgid "Server Information"
 msgstr "Gwybodaeth Gweinydd"
 
-#. i18n: file kogroupwareprefspage.ui line 186
-#: rc.cpp:309 rc.cpp:346 rc.cpp:932 rc.cpp:969
+#. i18n: file kogroupwareprefspage.ui line 185
+#: rc.cpp:306 rc.cpp:342 rc.cpp:1901 rc.cpp:1937
 #, no-c-format
 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.\n"
-"Here is a Kolab2 server URL example: "
-"\"webdavs://kolab2.com/freebusy/joe@kolab2.com.ifb\""
+"Ask the server administrator for this information."
 msgstr ""
 
-#. i18n: file kogroupwareprefspage.ui line 194
-#: rc.cpp:314 rc.cpp:937
+#. i18n: file kogroupwareprefspage.ui line 193
+#: rc.cpp:310 rc.cpp:1905
 #, no-c-format
 msgid "Remember p&assword"
 msgstr "Cofio cyfr&inair"
 
-#. i18n: file kogroupwareprefspage.ui line 198
-#: rc.cpp:317 rc.cpp:413 rc.cpp:940 rc.cpp:1036
+#. i18n: file kogroupwareprefspage.ui line 197
+#: rc.cpp:313 rc.cpp:416 rc.cpp:1908 rc.cpp:2011
 #, no-c-format
 msgid ""
 "Check this box to make KOrganizer remember your password and skip asking you "
@@ -3404,22 +5097,16 @@ msgid ""
 "configuration file."
 msgstr ""
 
-#. i18n: file kogroupwareprefspage.ui line 206
-#: plugins/exchange/exchangeconfig.cpp:59 rc.cpp:321 rc.cpp:944
-#, no-c-format
-msgid "Password:"
-msgstr "Cyfrinair:"
-
-#. i18n: file kogroupwareprefspage.ui line 212
-#: rc.cpp:324 rc.cpp:327 rc.cpp:404 rc.cpp:407 rc.cpp:947 rc.cpp:950
-#: rc.cpp:1027 rc.cpp:1030
+#. i18n: file kogroupwareprefspage.ui line 211
+#: rc.cpp:320 rc.cpp:323 rc.cpp:407 rc.cpp:410 rc.cpp:1915 rc.cpp:1918
+#: rc.cpp:2002 rc.cpp:2005
 #, no-c-format
 msgid "Enter your groupware server login password here."
 msgstr ""
 
-#. i18n: file kogroupwareprefspage.ui line 239
-#: rc.cpp:330 rc.cpp:338 rc.cpp:388 rc.cpp:396 rc.cpp:953 rc.cpp:961
-#: rc.cpp:1011 rc.cpp:1019
+#. i18n: file kogroupwareprefspage.ui line 238
+#: rc.cpp:326 rc.cpp:334 rc.cpp:391 rc.cpp:399 rc.cpp:1921 rc.cpp:1929
+#: rc.cpp:1986 rc.cpp:1994
 #, no-c-format
 msgid ""
 "Enter the login information relative to your account on the server here.\n"
@@ -3429,26 +5116,26 @@ msgid ""
 "also be different. In the last case enter your UID."
 msgstr ""
 
-#. i18n: file kogroupwareprefspage.ui line 247
-#: rc.cpp:335 rc.cpp:958
+#. i18n: file kogroupwareprefspage.ui line 246
+#: rc.cpp:331 rc.cpp:1926
 #, no-c-format
 msgid "Username:"
 msgstr "Enw defnyddiwr:"
 
-#. i18n: file kogroupwareprefspage.ui line 274
-#: rc.cpp:343 rc.cpp:375 rc.cpp:966 rc.cpp:998
+#. i18n: file kogroupwareprefspage.ui line 273
+#: rc.cpp:339 rc.cpp:370 rc.cpp:1934 rc.cpp:1965
 #, no-c-format
 msgid "Server URL:"
 msgstr "URL y gweinydd:"
 
-#. i18n: file kogroupwareprefspage.ui line 311
-#: rc.cpp:351 rc.cpp:974
+#. i18n: file kogroupwareprefspage.ui line 309
+#: rc.cpp:346 rc.cpp:1941
 #, no-c-format
 msgid "&Retrieve"
 msgstr "&Nôl"
 
-#. i18n: file kogroupwareprefspage.ui line 322
-#: rc.cpp:354 rc.cpp:977
+#. i18n: file kogroupwareprefspage.ui line 320
+#: rc.cpp:349 rc.cpp:1944
 #, no-c-format
 msgid ""
 "By retrieving Free/Busy information that others have published, you can take "
@@ -3457,14 +5144,14 @@ 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 line 333
-#: rc.cpp:357 rc.cpp:980
+#. i18n: file kogroupwareprefspage.ui line 331
+#: rc.cpp:352 rc.cpp:1947
 #, fuzzy, no-c-format
 msgid "Retrieve other peoples' free/&busy information automatically"
 msgstr "Nôl gwybo&daeth rydd/brysur pobl eraill"
 
-#. i18n: file kogroupwareprefspage.ui line 336
-#: rc.cpp:360 rc.cpp:983
+#. i18n: file kogroupwareprefspage.ui line 334
+#: rc.cpp:355 rc.cpp:1950
 #, no-c-format
 msgid ""
 "Check this box to retrieve other peoples' Free/Busy information automatically. "
@@ -3472,21 +5159,21 @@ msgid ""
 "possible."
 msgstr ""
 
-#. i18n: file kogroupwareprefspage.ui line 347
-#: rc.cpp:363 rc.cpp:986
+#. i18n: file kogroupwareprefspage.ui line 345
+#: rc.cpp:358 rc.cpp:1953
 #, no-c-format
 msgid "Use full email &address for retrieval"
 msgstr ""
 
-#. i18n: file kogroupwareprefspage.ui line 350
-#: rc.cpp:366 rc.cpp:989
+#. i18n: file kogroupwareprefspage.ui line 348
+#: rc.cpp:361 rc.cpp:1956
 #, no-c-format
 msgid ""
 "Set this to retrieve user@domain.ifb instead of user.ifb from the server"
 msgstr ""
 
-#. i18n: file kogroupwareprefspage.ui line 353
-#: rc.cpp:369 rc.cpp:992
+#. i18n: file kogroupwareprefspage.ui line 351
+#: rc.cpp:364 rc.cpp:1959
 #, no-c-format
 msgid ""
 "Check this box to download a free/busy file in the format \"user@domain.ifb\" "
@@ -3495,54 +5182,58 @@ msgid ""
 "you are not sure about how to configure this option."
 msgstr ""
 
-#. i18n: file kogroupwareprefspage.ui line 388
-#: rc.cpp:378 rc.cpp:383 rc.cpp:1001 rc.cpp:1006
+#. i18n: file kogroupwareprefspage.ui line 390
+#: rc.cpp:373 rc.cpp:382 rc.cpp:1968 rc.cpp:1977
 #, no-c-format
 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: \"webdavs://kolab2.com/freebusy/\""
+"Here is a Kolab2 Server URL example: \"https://kolab2.example.com/freebusy/\"\n"
+"Here is a generic server example: \"http://myserver.net/%u@%d/?internal.ics\"\n"
+"%u expands to the username, and %d expands to the domain name.\n"
+"Alternatively, you can specify a full path to the Free/Busy file,\n"
+"For example: \"https://kolab2.example.com/freebusy/user.xfb\""
 msgstr ""
 
-#. i18n: file kogroupwareprefspage.ui line 440
-#: rc.cpp:393 rc.cpp:1016
+#. i18n: file kogroupwareprefspage.ui line 446
+#: rc.cpp:396 rc.cpp:1991
 #, no-c-format
 msgid "User&name:"
 msgstr "Enw &defnyddiwr:"
 
-#. i18n: file kogroupwareprefspage.ui line 456
-#: rc.cpp:401 rc.cpp:1024
+#. i18n: file kogroupwareprefspage.ui line 462
+#: rc.cpp:404 rc.cpp:1999
 #, no-c-format
 msgid "Passwor&d:"
 msgstr "Cyfrina&ir:"
 
-#. i18n: file kogroupwareprefspage.ui line 486
-#: rc.cpp:410 rc.cpp:1033
+#. i18n: file kogroupwareprefspage.ui line 492
+#: rc.cpp:413 rc.cpp:2008
 #, no-c-format
 msgid "Re&member password"
 msgstr "Co&fio cyfrinair"
 
 #. i18n: file publishdialog_base.ui line 65
-#: rc.cpp:426 rc.cpp:1868
+#: rc.cpp:429 rc.cpp:2171
 #, no-c-format
 msgid "Email:"
 msgstr "Ebost:"
 
 #. i18n: file publishdialog_base.ui line 94
-#: rc.cpp:432 rc.cpp:1874
+#: rc.cpp:435 rc.cpp:2177
 #, no-c-format
 msgid "Select &Addressee..."
 msgstr "D&ewis Derbynnydd..."
 
 #. i18n: file template_management_dialog_base.ui line 16
-#: rc.cpp:438 rc.cpp:1478
+#: rc.cpp:441 rc.cpp:1845
 #, fuzzy, no-c-format
 msgid "Template Management"
 msgstr "Dewisiwch Enw Patrymlun"
 
 #. i18n: file template_management_dialog_base.ui line 57
-#: rc.cpp:447 rc.cpp:1487
+#: rc.cpp:450 rc.cpp:1854
 #, no-c-format
 msgid ""
 "Select a template and click <b>Apply Template</b> to apply it to the current "
@@ -3551,19 +5242,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file template_management_dialog_base.ui line 65
-#: rc.cpp:450 rc.cpp:1490 templatemanagementdialog.cpp:50
+#: rc.cpp:453 rc.cpp:1857 templatemanagementdialog.cpp:50
 #, fuzzy, no-c-format
 msgid "Apply Template"
 msgstr "Cadw Patrymlun"
 
 #. i18n: file korganizer.kcfg line 11
-#: rc.cpp:453 rc.cpp:1040
+#: rc.cpp:456 rc.cpp:1086
 #, fuzzy, no-c-format
 msgid "Enable automatic saving of manually opened calendar files"
 msgstr "Galluogi cadw'r calendr yn ymysgogol"
 
 #. i18n: file korganizer.kcfg line 12
-#: rc.cpp:456 rc.cpp:1043
+#: rc.cpp:459 rc.cpp:1089
 #, no-c-format
 msgid ""
 "Check this box to save your calendar file automatically when you exit "
@@ -3573,13 +5264,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 16
-#: rc.cpp:459 rc.cpp:1046
+#: rc.cpp:462 rc.cpp:1092
 #, no-c-format
 msgid "Save &interval in minutes"
 msgstr "Cyfnod &cadw, mewn munudau:"
 
 #. i18n: file korganizer.kcfg line 17
-#: rc.cpp:462 rc.cpp:1049
+#: rc.cpp:465 rc.cpp:1095
 #, no-c-format
 msgid ""
 "Set the interval between automatic saving of calendar events in minutes here. "
@@ -3588,55 +5279,55 @@ msgid ""
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 22
-#: rc.cpp:465 rc.cpp:1052
+#: rc.cpp:468 rc.cpp:1098
 #, no-c-format
 msgid "Confirm deletes"
 msgstr "Cadarnhau dileuon"
 
 #. i18n: file korganizer.kcfg line 23
-#: rc.cpp:468 rc.cpp:1055
+#: rc.cpp:471 rc.cpp:1101
 #, no-c-format
 msgid "Check this box to display a confirmation dialog when deleting items."
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 28
-#: rc.cpp:471 rc.cpp:1058
+#: rc.cpp:474 rc.cpp:1104
 #, fuzzy, no-c-format
 msgid "Archive events"
 msgstr "Archifio/Dileu Hen Gyfarfodydd"
 
 #. i18n: file korganizer.kcfg line 32
-#: rc.cpp:474 rc.cpp:1061
+#: rc.cpp:477 rc.cpp:1107
 #, fuzzy, no-c-format
 msgid "Archive to-dos"
 msgstr "Argraffu po&b eitem i-wneud"
 
 #. i18n: file korganizer.kcfg line 37
-#: rc.cpp:477 rc.cpp:1064
+#: rc.cpp:480 rc.cpp:1110
 #, no-c-format
 msgid "Regularly archive events"
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 41
-#: rc.cpp:480 rc.cpp:1067
+#: rc.cpp:483 rc.cpp:1113
 #, no-c-format
 msgid "What to do when archiving"
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 44
-#: rc.cpp:483 rc.cpp:1070
+#: rc.cpp:486 rc.cpp:1116
 #, no-c-format
 msgid "Delete old events"
 msgstr "Dileu Hen Ddigwyddiadau"
 
 #. i18n: file korganizer.kcfg line 47
-#: rc.cpp:486 rc.cpp:1073
+#: rc.cpp:489 rc.cpp:1119
 #, no-c-format
 msgid "Archive old events to a separate file"
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 53
-#: rc.cpp:489 rc.cpp:1076
+#: rc.cpp:492 rc.cpp:1122
 #, no-c-format
 msgid ""
 "If auto-archiving is enabled, events older than this amount will be archived. "
@@ -3644,43 +5335,43 @@ msgid ""
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 57
-#: rc.cpp:492 rc.cpp:1079
+#: rc.cpp:495 rc.cpp:1125
 #, no-c-format
 msgid "The unit in which the expiry time is expressed."
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 60
-#: rc.cpp:495 rc.cpp:1082
+#: rc.cpp:498 rc.cpp:1128
 #, fuzzy, no-c-format
 msgid "In days"
 msgstr "Argraffu diwrnod"
 
 #. i18n: file korganizer.kcfg line 63
-#: rc.cpp:498 rc.cpp:1085
+#: rc.cpp:501 rc.cpp:1131
 #, fuzzy, no-c-format
 msgid "In weeks"
 msgstr "Argraffu wythnos"
 
 #. i18n: file korganizer.kcfg line 66
-#: rc.cpp:501 rc.cpp:1088
+#: rc.cpp:504 rc.cpp:1134
 #, fuzzy, no-c-format
 msgid "In months"
 msgstr "mis(oedd)"
 
 #. i18n: file korganizer.kcfg line 72
-#: rc.cpp:504 rc.cpp:1091
+#: rc.cpp:507 rc.cpp:1137
 #, no-c-format
 msgid "URL of the file where old events should be archived"
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 76
-#: rc.cpp:507 rc.cpp:1094
+#: rc.cpp:510 rc.cpp:1140
 #, no-c-format
 msgid "Export to HTML with every save"
 msgstr "Allforio i HTML gyda pob cadwaith"
 
 #. i18n: file korganizer.kcfg line 77
-#: rc.cpp:510 rc.cpp:1097
+#: rc.cpp:513 rc.cpp:1143
 #, no-c-format
 msgid ""
 "Check this box to export the calendar to an HTML-file every time you save it. "
@@ -3689,19 +5380,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 81
-#: rc.cpp:513 rc.cpp:1100
+#: rc.cpp:516 rc.cpp:1146
 #, no-c-format
 msgid "New Events, To-dos and Journal Entries Should"
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 84
-#: rc.cpp:516 rc.cpp:1103
+#: rc.cpp:519 rc.cpp:1149
 #, no-c-format
 msgid "Be added to the standard resource"
 msgstr "Cael eu ychwanegu i'r adnodd safonol"
 
 #. i18n: file korganizer.kcfg line 85
-#: rc.cpp:519 rc.cpp:1106
+#: rc.cpp:522 rc.cpp:1152
 #, no-c-format
 msgid ""
 "Select this option to always record new events, to-dos and journal entries "
@@ -3709,13 +5400,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 88
-#: rc.cpp:522 rc.cpp:1109
+#: rc.cpp:525 rc.cpp:1155
 #, no-c-format
 msgid "Be asked which resource to use"
 msgstr "Cael eu gofyn pa adnodd i'w ddefnyddio"
 
 #. i18n: file korganizer.kcfg line 89
-#: rc.cpp:525 rc.cpp:1112
+#: rc.cpp:528 rc.cpp:1158
 #, no-c-format
 msgid ""
 "Select this option to choose the resource to be used to record the item each "
@@ -3725,13 +5416,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 98
-#: rc.cpp:528 rc.cpp:1115
+#: rc.cpp:531 rc.cpp:1161
 #, no-c-format
 msgid "Send copy to owner when mailing events"
 msgstr "Anfon copi i'r perchennog pan yn postio digwyddiadau"
 
 #. i18n: file korganizer.kcfg line 99
-#: rc.cpp:531 rc.cpp:1118
+#: rc.cpp:534 rc.cpp:1164
 #, no-c-format
 msgid ""
 "Check this box to get a copy of all e-mail messages that KOrganizer sends at "
@@ -3739,28 +5430,28 @@ msgid ""
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 103
-#: rc.cpp:534 rc.cpp:1121
+#: rc.cpp:537 rc.cpp:1167
 #, no-c-format
 msgid "Use email settings from Control Center"
 msgstr "Defnyddiwch gosodiadau ebost o'r Ganolfan Reoli"
 
 #. i18n: file korganizer.kcfg line 104
-#: rc.cpp:537 rc.cpp:1124
+#: rc.cpp:540 rc.cpp:1170
 #, no-c-format
 msgid ""
 "Check this box to use the TDE-wide e-mail settings, which are defined using the "
-"Trinity Control Center &quot;Password & User Account&quot; Module. Uncheck this box "
-"to be able to specify your full name and e-mail."
+"Trinity Control Center &quot;Password & User Account&quot; Module. Uncheck this "
+"box to be able to specify your full name and e-mail."
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 108
-#: rc.cpp:540 rc.cpp:1127
+#: rc.cpp:543 rc.cpp:1173
 #, no-c-format
 msgid "Full &name"
 msgstr "&Enw llawn:"
 
 #. i18n: file korganizer.kcfg line 109
-#: rc.cpp:543 rc.cpp:1130
+#: rc.cpp:546 rc.cpp:1176
 #, no-c-format
 msgid ""
 "Enter your full name here. This name will be displayed as \"Organizer\" in "
@@ -3768,13 +5459,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 113
-#: rc.cpp:546 rc.cpp:1133
+#: rc.cpp:549 rc.cpp:1179
 #, no-c-format
 msgid "E&mail address"
 msgstr "Cyfeiriad e&bost:"
 
 #. i18n: file korganizer.kcfg line 114
-#: rc.cpp:549 rc.cpp:1136
+#: rc.cpp:552 rc.cpp:1182
 #, no-c-format
 msgid ""
 "Enter here your e-mail address. This e-mail address will be used to identify "
@@ -3782,19 +5473,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 118
-#: rc.cpp:552 rc.cpp:1139
+#: rc.cpp:555 rc.cpp:1185
 #, no-c-format
 msgid "Mail Client"
 msgstr "Rhaglen Ebost"
 
 #. i18n: file korganizer.kcfg line 121
-#: rc.cpp:555 rc.cpp:1142
+#: rc.cpp:558 rc.cpp:1188
 #, no-c-format
 msgid "KMail"
 msgstr "KMail"
 
 #. i18n: file korganizer.kcfg line 122
-#: rc.cpp:558 rc.cpp:1145
+#: rc.cpp:561 rc.cpp:1191
 #, no-c-format
 msgid ""
 "Select this option to use KMail as the mail transport. The mail transport is "
@@ -3802,13 +5493,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 125
-#: rc.cpp:561 rc.cpp:1148
+#: rc.cpp:564 rc.cpp:1194
 #, no-c-format
 msgid "Sendmail"
 msgstr "Sendmail"
 
 #. i18n: file korganizer.kcfg line 126
-#: rc.cpp:564 rc.cpp:1151
+#: rc.cpp:567 rc.cpp:1197
 #, no-c-format
 msgid ""
 "Select this option to use sendmail as the mail transport. The mail transport is "
@@ -3817,13 +5508,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 142
-#: rc.cpp:576 rc.cpp:1163
+#: rc.cpp:579 rc.cpp:1209
 #, fuzzy, no-c-format
 msgid "Default appointment time"
 msgstr "Amser cyfarfod rhagosodedig:"
 
 #. i18n: file korganizer.kcfg line 143
-#: rc.cpp:579 rc.cpp:1166
+#: rc.cpp:582 rc.cpp:1212
 #, no-c-format
 msgid ""
 "Enter the default time for events here. The default is used if you do not "
@@ -3831,52 +5522,144 @@ msgid ""
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 147
-#: rc.cpp:582 rc.cpp:1169
+#: rc.cpp:585 rc.cpp:1215
 #, fuzzy, no-c-format
 msgid "Default duration of new appointment (HH:MM)"
 msgstr "Hyd rhagosodedig cyfarfod newydd:"
 
 #. i18n: file korganizer.kcfg line 148
-#: rc.cpp:585 rc.cpp:1172
+#: rc.cpp:588 rc.cpp:1218
 #, no-c-format
 msgid ""
 "Enter default duration for events here. The default is used if you do not "
 "supply an end time."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 152
-#: rc.cpp:588 rc.cpp:1175
+#. i18n: file korganizer.kcfg line 153
+#: rc.cpp:591 rc.cpp:1221
 #, fuzzy, no-c-format
-msgid "Default Reminder Time"
-msgstr "Amser cyfarfod rhagosodedig:"
+msgid "Default reminder time"
+msgstr "Amser larwm rhagosodedig:"
 
-#. i18n: file korganizer.kcfg line 153
-#: rc.cpp:591 rc.cpp:1178
+#. i18n: file korganizer.kcfg line 154
+#: rc.cpp:594 rc.cpp:1224
+#, no-c-format
+msgid ""
+"Enter the default reminder time for all newly created items. The time unit is "
+"specified in the adjacent combobox."
+msgstr ""
+
+#. i18n: file korganizer.kcfg line 155
+#: rc.cpp:597 rc.cpp:1227
 #, fuzzy, no-c-format
-msgid "Enter the reminder time here."
+msgid "Default time for reminders"
 msgstr "Amser larwm rhagosodedig:"
 
+#. i18n: file korganizer.kcfg line 159
+#: rc.cpp:600 rc.cpp:1230
+#, no-c-format
+msgid ""
+"Enter the default reminder time units for all newly created items. The time is "
+"specified in the adjacent spinbox."
+msgstr ""
+
 #. i18n: file korganizer.kcfg line 160
-#: rc.cpp:594 rc.cpp:1181
+#: rc.cpp:603 rc.cpp:1233
+#, fuzzy, no-c-format
+msgid "Default time unit for reminders"
+msgstr "Defnyddio Gosodiad Rhagosod yr Argraffydd"
+
+#. i18n: file korganizer.kcfg line 164
+#: rc.cpp:606 rc.cpp:1236
+#, no-c-format
+msgid "Enable a default sound file for audio reminders"
+msgstr ""
+
+#. i18n: file korganizer.kcfg line 165
+#: rc.cpp:609 rc.cpp:1239
+#, no-c-format
+msgid ""
+"Check this box if you want to enable the specified file to be used as the "
+"default sound file for new reminders. You can always specify another file in "
+"the Advanced Reminder accessible from the Event or To-do editors."
+msgstr ""
+
+#. i18n: file korganizer.kcfg line 169
+#: rc.cpp:612 rc.cpp:1242
+#, fuzzy, no-c-format
+msgid "Default audio file"
+msgstr "Fformat Calendr Rhagosodedig"
+
+#. i18n: file korganizer.kcfg line 170
+#: rc.cpp:615 rc.cpp:1245
+#, no-c-format
+msgid ""
+"Set a file to be used as the default sound file for new reminders. You can "
+"always specify another file in the Advanced Reminder accessible from the Event "
+"or To-do editors."
+msgstr ""
+
+#. i18n: file korganizer.kcfg line 173
+#: rc.cpp:618 rc.cpp:1248
+#, no-c-format
+msgid "Enable reminders for new Events"
+msgstr ""
+
+#. i18n: file korganizer.kcfg line 174
+#: rc.cpp:621 rc.cpp:1251
+#, no-c-format
+msgid ""
+"Check this box if you want to enable reminders for all newly created Events. "
+"You can always turn-off the reminders in the Event editor dialog."
+msgstr ""
+
+#. i18n: file korganizer.kcfg line 175
+#: rc.cpp:624 rc.cpp:1254
+#, no-c-format
+msgid "By default, enable reminders for new events"
+msgstr ""
+
+#. i18n: file korganizer.kcfg line 179
+#: rc.cpp:627 rc.cpp:1257
+#, no-c-format
+msgid "Enable reminders for new To-dos"
+msgstr ""
+
+#. i18n: file korganizer.kcfg line 180
+#: rc.cpp:630 rc.cpp:1260
+#, no-c-format
+msgid ""
+"Check this box if you want to enable reminders for all newly created To-dos. "
+"You can always turn-off the reminders in the To-do editor dialog."
+msgstr ""
+
+#. i18n: file korganizer.kcfg line 181
+#: rc.cpp:633 rc.cpp:1263
+#, no-c-format
+msgid "By default, enable reminders for new to-dos"
+msgstr ""
+
+#. i18n: file korganizer.kcfg line 188
+#: rc.cpp:636 rc.cpp:1266
 #, fuzzy, no-c-format
 msgid "Hour size"
 msgstr "Awr"
 
-#. i18n: file korganizer.kcfg line 161
-#: rc.cpp:597 rc.cpp:1184
+#. i18n: file korganizer.kcfg line 189
+#: rc.cpp:639 rc.cpp:1269
 #, no-c-format
 msgid ""
 "Select on this spin box the height of the hour rows in the schedule view."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 167
-#: rc.cpp:600 rc.cpp:1187
+#. i18n: file korganizer.kcfg line 195
+#: rc.cpp:642 rc.cpp:1272
 #, no-c-format
 msgid "Show events that recur daily in date navigator"
 msgstr "Dangos digwyddiadau sy'n ail-ddigwydd bob dydd yn y llywiwr dyddiadau"
 
-#. i18n: file korganizer.kcfg line 168
-#: rc.cpp:603 rc.cpp:1190
+#. i18n: file korganizer.kcfg line 196
+#: rc.cpp:645 rc.cpp:1275
 #, no-c-format
 msgid ""
 "Check this box to show the days containing daily recurring events in bold "
@@ -3884,15 +5667,15 @@ msgid ""
 "(non daily recurring) events."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 172
-#: rc.cpp:606 rc.cpp:1193
+#. i18n: file korganizer.kcfg line 200
+#: rc.cpp:648 rc.cpp:1278
 #, no-c-format
 msgid "Show events that recur weekly in date navigator"
 msgstr ""
 "Dangos digwyddiadau sy'n ail-ddigwydd bob wythnos yn y llywiwr dyddiadau"
 
-#. i18n: file korganizer.kcfg line 173
-#: rc.cpp:609 rc.cpp:1196
+#. i18n: file korganizer.kcfg line 201
+#: rc.cpp:651 rc.cpp:1281
 #, no-c-format
 msgid ""
 "Check this box to show the days containing weekly recurring events in bold "
@@ -3900,57 +5683,71 @@ msgid ""
 "(non weekly recurring) events."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 177
-#: rc.cpp:612 rc.cpp:1199
+#. i18n: file korganizer.kcfg line 205
+#: rc.cpp:654 rc.cpp:1284
+#, no-c-format
+msgid "Week numbers select a work week when in work week view"
+msgstr ""
+
+#. i18n: file korganizer.kcfg line 206
+#: rc.cpp:657 rc.cpp:1287
+#, no-c-format
+msgid ""
+"Check this box to select a work week when clicking on date navigator's week "
+"numbers or uncheck it to chose the whole week."
+msgstr ""
+
+#. i18n: file korganizer.kcfg line 210
+#: rc.cpp:660 rc.cpp:1290
 #, no-c-format
 msgid "Enable tooltips displaying summary of events"
 msgstr "Galluogi cynghorion offer sy'n dangos crynodeb y digwyddiadau"
 
-#. i18n: file korganizer.kcfg line 178
-#: rc.cpp:615 rc.cpp:1202
+#. i18n: file korganizer.kcfg line 211
+#: rc.cpp:663 rc.cpp:1293
 #, no-c-format
 msgid ""
 "Check this box to display an event summary tooltip when hovering the mouse over "
 "an event."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 182
-#: rc.cpp:618 rc.cpp:1205
+#. i18n: file korganizer.kcfg line 215
+#: rc.cpp:666 rc.cpp:1296
 #, fuzzy, no-c-format
 msgid "Show to-dos in day, week and month views"
 msgstr "Dyddiau i'w dangos yn y golwg X-Diwrnod-Nesaf:"
 
-#. i18n: file korganizer.kcfg line 183
-#: rc.cpp:621 rc.cpp:1208
+#. i18n: file korganizer.kcfg line 216
+#: rc.cpp:669 rc.cpp:1299
 #, no-c-format
 msgid ""
 "Check this box to display to-dos in the day, week, and month view. This is "
 "helpful when you have a lot of (recurring) to-dos."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 187
-#: rc.cpp:624 rc.cpp:1211
+#. i18n: file korganizer.kcfg line 220
+#: rc.cpp:672 rc.cpp:1302
 #, no-c-format
 msgid "Enable scrollbars in month view cells"
 msgstr "Galluogi bariau scrolio tu fewn i gellau'r golwg misol"
 
-#. i18n: file korganizer.kcfg line 188
-#: rc.cpp:627 rc.cpp:1214
+#. i18n: file korganizer.kcfg line 221
+#: rc.cpp:675 rc.cpp:1305
 #, no-c-format
 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 korganizer.kcfg line 192
-#: rc.cpp:630 rc.cpp:1217
+#. i18n: file korganizer.kcfg line 225
+#: rc.cpp:678 rc.cpp:1308
 #, no-c-format
 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 korganizer.kcfg line 193
-#: rc.cpp:633 rc.cpp:1220
+#. i18n: file korganizer.kcfg line 226
+#: rc.cpp:681 rc.cpp:1311
 #, no-c-format
 msgid ""
 "Check this box to start the event editor automatically when you select a time "
@@ -3958,182 +5755,168 @@ msgid ""
 "the start time to the end time of the event you are about to plan."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 198
-#: rc.cpp:636 rc.cpp:1223
+#. i18n: file korganizer.kcfg line 231
+#: rc.cpp:684 rc.cpp:1314
 #, fuzzy, no-c-format
 msgid "Show current-time (Marcus Bains) line"
 msgstr "Dangos amser cyfredol (llinell Marcus Bains)"
 
-#. i18n: file korganizer.kcfg line 199
-#: rc.cpp:639 rc.cpp:1226
+#. i18n: file korganizer.kcfg line 232
+#: rc.cpp:687 rc.cpp:1317
 #, no-c-format
 msgid ""
 "Check this box to display a red line in the day or week view indicating the "
 "current-time line (Marcus Bains line)."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 203
-#: rc.cpp:642 rc.cpp:1229
+#. i18n: file korganizer.kcfg line 236
+#: rc.cpp:690 rc.cpp:1320
 #, fuzzy, no-c-format
 msgid "Show seconds on current-time line"
 msgstr "Dangos eiliadau ar linell Marcus Bain"
 
-#. i18n: file korganizer.kcfg line 204
-#: rc.cpp:645 rc.cpp:1232
+#. i18n: file korganizer.kcfg line 237
+#: rc.cpp:693 rc.cpp:1323
 #, fuzzy, no-c-format
 msgid "Check this box if you want to show seconds on the current-time line."
 msgstr "Dangos eiliadau ar linell Marcus Bain"
 
-#. i18n: file korganizer.kcfg line 209
-#: rc.cpp:648 rc.cpp:1235
+#. i18n: file korganizer.kcfg line 242
+#: rc.cpp:696 rc.cpp:1326
 #, no-c-format
 msgid "Colors used in agenda view"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 210
-#: rc.cpp:651 rc.cpp:1238
+#. i18n: file korganizer.kcfg line 243
+#: rc.cpp:699 rc.cpp:1329
 #, no-c-format
 msgid "Choose the colors of the agenda view items."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 213
-#: rc.cpp:654 rc.cpp:1241
+#. i18n: file korganizer.kcfg line 246
+#: rc.cpp:702 rc.cpp:756 rc.cpp:1332 rc.cpp:1386
 #, no-c-format
 msgid "Category inside, calendar outside"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 216
-#: rc.cpp:657 rc.cpp:1244
+#. i18n: file korganizer.kcfg line 249
+#: rc.cpp:705 rc.cpp:759 rc.cpp:1335 rc.cpp:1389
 #, no-c-format
 msgid "Calendar inside, category outside"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 219
-#: rc.cpp:660 rc.cpp:1247
+#. i18n: file korganizer.kcfg line 252
+#: rc.cpp:708 rc.cpp:762 rc.cpp:1338 rc.cpp:1392
 #, fuzzy, no-c-format
 msgid "Only category"
 msgstr "Categori"
 
-#. i18n: file korganizer.kcfg line 222
-#: rc.cpp:663 rc.cpp:1250
+#. i18n: file korganizer.kcfg line 255
+#: rc.cpp:711 rc.cpp:765 rc.cpp:1341 rc.cpp:1395
 #, fuzzy, no-c-format
 msgid "Only calendar"
 msgstr "Argraffu Calendr"
 
-#. i18n: file korganizer.kcfg line 229
-#: rc.cpp:666 rc.cpp:1253
+#. i18n: file korganizer.kcfg line 262
+#: rc.cpp:714 rc.cpp:1344
 #, no-c-format
 msgid "Agenda View Calendar Display"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 232
-#: rc.cpp:669 rc.cpp:1256
+#. i18n: file korganizer.kcfg line 265
+#: rc.cpp:717 rc.cpp:1347
 #, no-c-format
 msgid "Merge all calendars into one view"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 235
-#: rc.cpp:672 rc.cpp:1259
+#. i18n: file korganizer.kcfg line 268
+#: rc.cpp:720 rc.cpp:1350
 #, fuzzy, no-c-format
 msgid "Show calendars side by side"
 msgstr "Ffeil galendr i'w llwytho"
 
-#. i18n: file korganizer.kcfg line 238
-#: rc.cpp:675 rc.cpp:1262
+#. i18n: file korganizer.kcfg line 271
+#: rc.cpp:723 rc.cpp:1353
 #, no-c-format
 msgid "Switch between views with tabs"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 247
-#: rc.cpp:678 rc.cpp:1265
+#. i18n: file korganizer.kcfg line 278
+#: rc.cpp:726 rc.cpp:1356
 #, no-c-format
 msgid "Day begins at"
 msgstr "Diwrnod yn ddechrau am:"
 
-#. i18n: file korganizer.kcfg line 248
-#: rc.cpp:681 rc.cpp:1268
+#. i18n: file korganizer.kcfg line 279
+#: rc.cpp:729 rc.cpp:1359
 #, no-c-format
 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.kcfg line 253
-#: rc.cpp:684 rc.cpp:1271
+#. i18n: file korganizer.kcfg line 284
+#: rc.cpp:732 rc.cpp:1362
 #, no-c-format
 msgid "Daily starting hour"
 msgstr "Awr ddechrau dyddiol:"
 
-#. i18n: file korganizer.kcfg line 254
-#: rc.cpp:687 rc.cpp:1274
+#. i18n: file korganizer.kcfg line 285
+#: rc.cpp:735 rc.cpp:1365
 #, no-c-format
 msgid ""
 "Enter the start time for the working hours here. The working hours will be "
 "marked with color by KOrganizer."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 258
-#: rc.cpp:690 rc.cpp:1277
+#. i18n: file korganizer.kcfg line 289
+#: rc.cpp:738 rc.cpp:1368
 #, no-c-format
 msgid "Daily ending hour"
 msgstr "Awr orffen dyddiol:"
 
-#. i18n: file korganizer.kcfg line 259
-#: rc.cpp:693 rc.cpp:1280
+#. i18n: file korganizer.kcfg line 290
+#: rc.cpp:741 rc.cpp:1371
 #, no-c-format
 msgid ""
 "Enter the ending time for the working hours here. The working hours will be "
 "marked with color by KOrganizer."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 266
-#: rc.cpp:696 rc.cpp:1283
+#. i18n: file korganizer.kcfg line 297
+#: rc.cpp:744 rc.cpp:1374
 #, no-c-format
 msgid "Exclude holidays"
 msgstr "Gwahardd gwyliau"
 
-#. i18n: file korganizer.kcfg line 267
-#: rc.cpp:699 rc.cpp:1286
+#. i18n: file korganizer.kcfg line 298
+#: rc.cpp:747 rc.cpp:1377
 #, no-c-format
 msgid ""
 "Check this box to prevent KOrganizer from marking the working hours on "
 "holidays."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 272
-#: rc.cpp:702 rc.cpp:1289
+#. i18n: file korganizer.kcfg line 303
+#: rc.cpp:750 rc.cpp:1380
 #, no-c-format
-msgid "Month view uses category colors"
-msgstr "Mae'r golwg misol yn defnyddio lliwiau categorïau"
-
-#. i18n: file korganizer.kcfg line 273
-#: rc.cpp:705 rc.cpp:1292
-#, fuzzy, no-c-format
-msgid ""
-"Check this box to make the month view use the category colors of an item."
-msgstr "Dangos eiliadau ar linell Marcus Bain"
-
-#. i18n: file korganizer.kcfg line 278
-#: rc.cpp:708 rc.cpp:1295
-#, fuzzy, no-c-format
-msgid "Month view uses resource colors"
-msgstr "Mae'r golwg misol yn defnyddio lliwiau categorïau"
+msgid "Colors used in month view"
+msgstr ""
 
-#. i18n: file korganizer.kcfg line 279
-#: rc.cpp:711 rc.cpp:1298
-#, fuzzy, no-c-format
-msgid ""
-"Check this box to make the month view use the resource colors of an item."
-msgstr "Dangos eiliadau ar linell Marcus Bain"
+#. i18n: file korganizer.kcfg line 304
+#: rc.cpp:753 rc.cpp:1383
+#, no-c-format
+msgid "Choose the colors of the month view items."
+msgstr ""
 
-#. i18n: file korganizer.kcfg line 284
-#: rc.cpp:714 rc.cpp:1301
+#. i18n: file korganizer.kcfg line 323
+#: rc.cpp:768 rc.cpp:1398
 #, no-c-format
 msgid "Month view uses full window"
 msgstr "Mae'r golwg misol yn defnyddio ffenestr llawn"
 
-#. i18n: file korganizer.kcfg line 285
-#: rc.cpp:717 rc.cpp:1304
+#. i18n: file korganizer.kcfg line 324
+#: rc.cpp:771 rc.cpp:1401
 #, no-c-format
 msgid ""
 "Check this box to use the full KOrganizer window when displaying the month "
@@ -4142,14 +5925,14 @@ msgid ""
 "resources list, will not be displayed."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 289
-#: rc.cpp:720 rc.cpp:1307
+#. i18n: file korganizer.kcfg line 328
+#: rc.cpp:774 rc.cpp:1404
 #, fuzzy, no-c-format
 msgid "To-do list view uses full window"
 msgstr "Mae golwg I'w-Wneud yn defnyddio ffenestr llawn"
 
-#. i18n: file korganizer.kcfg line 290
-#: rc.cpp:723 rc.cpp:1310
+#. i18n: file korganizer.kcfg line 329
+#: rc.cpp:777 rc.cpp:1407
 #, no-c-format
 msgid ""
 "Check this box to use the full KOrganizer window when displaying the to-do list "
@@ -4158,28 +5941,28 @@ msgid ""
 "resources list, will not be displayed."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 295
-#: rc.cpp:726 rc.cpp:1313
+#. i18n: file korganizer.kcfg line 334
+#: rc.cpp:780 rc.cpp:1410
 #, fuzzy, no-c-format
 msgid "Record completed to-dos in journal entries"
 msgstr "Cuddio i'w-wneudau a gwblhawyd"
 
-#. i18n: file korganizer.kcfg line 296
-#: rc.cpp:729 rc.cpp:1316
+#. i18n: file korganizer.kcfg line 335
+#: rc.cpp:783 rc.cpp:1413
 #, no-c-format
 msgid ""
 "Check this box to record the completion of a to-do in a new entry of your "
 "journal automatically."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 305
-#: rc.cpp:732 rc.cpp:1319
+#. i18n: file korganizer.kcfg line 344
+#: rc.cpp:786 rc.cpp:1416
 #, fuzzy, no-c-format
 msgid "Next x days"
 msgstr "Dyddiad &Nesaf"
 
-#. i18n: file korganizer.kcfg line 306
-#: rc.cpp:735 rc.cpp:1322
+#. i18n: file korganizer.kcfg line 345
+#: rc.cpp:789 rc.cpp:1419
 #, no-c-format
 msgid ""
 "Select on this spin box the number of &quot;x&quot; days to be displayed in the "
@@ -4187,14 +5970,14 @@ msgid ""
 "&quot;Next X Days&quot; menu item from the &quot;View&quot; menu."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 348
-#: rc.cpp:738 rc.cpp:1325
+#. i18n: file korganizer.kcfg line 387
+#: rc.cpp:792 rc.cpp:1422
 #, no-c-format
 msgid "Use Groupware communication"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 349
-#: rc.cpp:741 rc.cpp:1328
+#. i18n: file korganizer.kcfg line 388
+#: rc.cpp:795 rc.cpp:1425
 #, no-c-format
 msgid ""
 "Check this box to enable automatic generation of mails when creating, updating "
@@ -4203,111 +5986,111 @@ msgid ""
 "a TDE Kolab client)."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 357
-#: rc.cpp:744 rc.cpp:1331
+#. i18n: file korganizer.kcfg line 396
+#: rc.cpp:798 rc.cpp:1428
 #, no-c-format
 msgid "Send Outlook-like pseudo counter proposals"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 365
-#: rc.cpp:747 rc.cpp:1334
+#. i18n: file korganizer.kcfg line 404
+#: rc.cpp:801 rc.cpp:1431
 #, fuzzy, no-c-format
 msgid "Holiday color"
 msgstr "Lliw Gwyliau:"
 
-#. i18n: file korganizer.kcfg line 366
-#: rc.cpp:750 rc.cpp:1337
+#. i18n: file korganizer.kcfg line 405
+#: rc.cpp:804 rc.cpp:1434
 #, no-c-format
 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 korganizer.kcfg line 370
-#: rc.cpp:753 rc.cpp:1340
+#. i18n: file korganizer.kcfg line 409
+#: rc.cpp:807 rc.cpp:1437
 #, no-c-format
 msgid "Highlight color"
 msgstr "Lliw amlygu"
 
-#. i18n: file korganizer.kcfg line 371
-#: rc.cpp:756 rc.cpp:1343
+#. i18n: file korganizer.kcfg line 410
+#: rc.cpp:810 rc.cpp:1440
 #, no-c-format
 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."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 375
-#: rc.cpp:759 rc.cpp:1346
+#. i18n: file korganizer.kcfg line 414
+#: rc.cpp:813 rc.cpp:1443
 #, fuzzy, no-c-format
 msgid "Agenda view background color"
 msgstr "Lliw cefndir y golwg agenda:"
 
-#. i18n: file korganizer.kcfg line 376
-#: rc.cpp:762 rc.cpp:1349
+#. i18n: file korganizer.kcfg line 415
+#: rc.cpp:816 rc.cpp:1446
 #, fuzzy, no-c-format
 msgid "Select the agenda view background color here."
 msgstr "Lliw cefndir y golwg agenda:"
 
-#. i18n: file korganizer.kcfg line 380
-#: rc.cpp:765 rc.cpp:1352
+#. i18n: file korganizer.kcfg line 419
+#: rc.cpp:819 rc.cpp:1449
 #, fuzzy, no-c-format
 msgid "Working hours color"
 msgstr "Lliw oriau gwaith:"
 
-#. i18n: file korganizer.kcfg line 381
-#: rc.cpp:768 rc.cpp:1355
+#. i18n: file korganizer.kcfg line 420
+#: rc.cpp:822 rc.cpp:1452
 #, no-c-format
 msgid "Select the working hours color for the agenda view here."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 385
-#: rc.cpp:771 rc.cpp:1358
+#. i18n: file korganizer.kcfg line 424
+#: rc.cpp:825 rc.cpp:1455
 #, fuzzy, no-c-format
 msgid "To-do due today color"
 msgstr "Lliw i-wneud sy'n ddisgwyliedig heddiw:"
 
-#. i18n: file korganizer.kcfg line 386
-#: rc.cpp:774 rc.cpp:1361
+#. i18n: file korganizer.kcfg line 425
+#: rc.cpp:828 rc.cpp:1458
 #, fuzzy, no-c-format
 msgid "Select the to-do due today color here."
 msgstr "Lliw i-wneud sy'n ddisgwyliedig heddiw:"
 
-#. i18n: file korganizer.kcfg line 390
-#: rc.cpp:777 rc.cpp:1364
+#. i18n: file korganizer.kcfg line 429
+#: rc.cpp:831 rc.cpp:1461
 #, fuzzy, no-c-format
 msgid "To-do overdue color"
 msgstr "Lliw i-wneud sy'n hwyr:"
 
-#. i18n: file korganizer.kcfg line 391
-#: rc.cpp:780 rc.cpp:1367
+#. i18n: file korganizer.kcfg line 430
+#: rc.cpp:834 rc.cpp:1464
 #, fuzzy, no-c-format
 msgid "Select the to-do overdue color here."
 msgstr "Lliw i-wneud sy'n hwyr:"
 
-#. i18n: file korganizer.kcfg line 395
-#: rc.cpp:783 rc.cpp:1370
-#, fuzzy, no-c-format
-msgid "Default event color"
-msgstr "Lliw digwyddiad rhagosodedig:"
+#. i18n: file korganizer.kcfg line 434
+#: rc.cpp:837 rc.cpp:1467
+#, no-c-format
+msgid "\"No category\" color (for \"Only category\" drawing schemes)"
+msgstr ""
 
-#. i18n: file korganizer.kcfg line 396
-#: rc.cpp:786 rc.cpp:1373
+#. i18n: file korganizer.kcfg line 435
+#: rc.cpp:840 rc.cpp:1470
 #, no-c-format
 msgid ""
-"Select the default event color here. The default event color will be used for "
-"events categories in your agenda. Note that you can specify a separate color "
-"for each event category below."
+"Select a color to use for the \"no category\" or \"unset category\" situation, "
+"when an item does not belong to any category. This color is used when drawing "
+"items in the agenda or month views using the \"Only category\" scheme."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 414
-#: rc.cpp:789 rc.cpp:1376
+#. i18n: file korganizer.kcfg line 453
+#: rc.cpp:843 rc.cpp:1473
 #, no-c-format
 msgid "Time bar"
 msgstr "Bar amser:"
 
-#. i18n: file korganizer.kcfg line 415
-#: rc.cpp:792 rc.cpp:1379
+#. i18n: file korganizer.kcfg line 454
+#: rc.cpp:846 rc.cpp:1476
 #, no-c-format
 msgid ""
 "Press this button to configure the time bar font. The time bar is the widget "
@@ -4315,14 +6098,14 @@ msgid ""
 "Font&quot; dialog, allowing you to choose the hour font for the time bar."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 418
-#: rc.cpp:795 rc.cpp:1382
+#. i18n: file korganizer.kcfg line 457
+#: rc.cpp:849 rc.cpp:1479
 #, no-c-format
 msgid "Agenda view"
 msgstr "Golwg agenda:"
 
-#. i18n: file korganizer.kcfg line 419
-#: rc.cpp:798 rc.cpp:1385
+#. i18n: file korganizer.kcfg line 458
+#: rc.cpp:852 rc.cpp:1482
 #, no-c-format
 msgid ""
 "Press this button to configure the agenda view font. This button will open the "
@@ -4330,14 +6113,14 @@ msgid ""
 "in the agenda view."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 422
-#: rc.cpp:801 rc.cpp:1388
+#. i18n: file korganizer.kcfg line 461
+#: rc.cpp:855 rc.cpp:1485
 #, fuzzy, no-c-format
 msgid "Current-time line"
 msgstr "Cynhaliwr Cyfredol"
 
-#. i18n: file korganizer.kcfg line 423
-#: rc.cpp:804 rc.cpp:1391
+#. i18n: file korganizer.kcfg line 462
+#: rc.cpp:858 rc.cpp:1488
 #, no-c-format
 msgid ""
 "Press this button to configure the current-time line font. This button will "
@@ -4345,14 +6128,14 @@ msgid ""
 "the current-time line in the agenda view."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 426
-#: rc.cpp:807 rc.cpp:1394
+#. i18n: file korganizer.kcfg line 465
+#: rc.cpp:861 rc.cpp:1491
 #, no-c-format
 msgid "Month view"
 msgstr "Golwg mis"
 
-#. i18n: file korganizer.kcfg line 427
-#: rc.cpp:810 rc.cpp:1397
+#. i18n: file korganizer.kcfg line 466
+#: rc.cpp:864 rc.cpp:1494
 #, no-c-format
 msgid ""
 "Press this button to configure the month view font. This button will open the "
@@ -4360,56 +6143,56 @@ msgid ""
 "in the month view."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 445
-#: rc.cpp:813 rc.cpp:1400
+#. i18n: file korganizer.kcfg line 484
+#: rc.cpp:867 rc.cpp:1497
 #, no-c-format
 msgid "Free/Busy Publish URL"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 446
-#: rc.cpp:816 rc.cpp:1403
+#. i18n: file korganizer.kcfg line 485
+#: rc.cpp:870 rc.cpp:1500
 #, fuzzy, no-c-format
 msgid "URL for publishing free/busy information"
 msgstr "Nôl gwybo&daeth rydd/brysur pobl eraill"
 
-#. i18n: file korganizer.kcfg line 449
-#: rc.cpp:819 rc.cpp:1406
+#. i18n: file korganizer.kcfg line 488
+#: rc.cpp:873 rc.cpp:1503
 #, no-c-format
 msgid "Free/Busy Publish Username"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 450
-#: rc.cpp:822 rc.cpp:1409
+#. i18n: file korganizer.kcfg line 489
+#: rc.cpp:876 rc.cpp:1506
 #, fuzzy, no-c-format
 msgid "Username for publishing free/busy information"
 msgstr "Nôl gwybo&daeth rydd/brysur pobl eraill"
 
-#. i18n: file korganizer.kcfg line 453
-#: rc.cpp:825 rc.cpp:1412
+#. i18n: file korganizer.kcfg line 492
+#: rc.cpp:879 rc.cpp:1509
 #, no-c-format
 msgid "Free/Busy Publish Password"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 454
-#: rc.cpp:828 rc.cpp:1415
+#. i18n: file korganizer.kcfg line 493
+#: rc.cpp:882 rc.cpp:1512
 #, fuzzy, no-c-format
 msgid "Password for publishing free/busy information"
 msgstr "dyddiadau o wybodaeth rhydd/prysur"
 
-#. i18n: file korganizer.kcfg line 461
-#: rc.cpp:831 rc.cpp:1418
+#. i18n: file korganizer.kcfg line 500
+#: rc.cpp:885 rc.cpp:1515
 #, fuzzy, no-c-format
 msgid "Enable Automatic Free/Busy Retrieval"
 msgstr "Cadw Gwybodaeth RhyddBrysur yn Ymysgogol"
 
-#. i18n: file korganizer.kcfg line 466
-#: rc.cpp:834 rc.cpp:1421
+#. i18n: file korganizer.kcfg line 505
+#: rc.cpp:888 rc.cpp:1518
 #, no-c-format
 msgid "Check whether hostname and retrieval email address match"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 467
-#: rc.cpp:837 rc.cpp:1424
+#. i18n: file korganizer.kcfg line 506
+#: rc.cpp:891 rc.cpp:1521
 #, no-c-format
 msgid ""
 "With this setting you can configure whether the domain part of the free/busy "
@@ -4418,14 +6201,14 @@ msgid ""
 "joe@mydomain.com on the server www.yourdomain.com won't work."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 472
-#: rc.cpp:840 rc.cpp:1427
+#. i18n: file korganizer.kcfg line 511
+#: rc.cpp:894 rc.cpp:1524
 #, no-c-format
 msgid "Use full email address for retrieval"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 473
-#: rc.cpp:843 rc.cpp:1430
+#. i18n: file korganizer.kcfg line 512
+#: rc.cpp:897 rc.cpp:1527
 #, no-c-format
 msgid ""
 "With this setting, you can change the filename that will be fetched from the "
@@ -4434,352 +6217,370 @@ msgid ""
 "user.ifb, for example nn.ifb."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 478
-#: rc.cpp:846 rc.cpp:1433
+#. i18n: file korganizer.kcfg line 517
+#: rc.cpp:900 rc.cpp:1530
 #, no-c-format
 msgid "Free/Busy Retrieval URL"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 481
-#: rc.cpp:849 rc.cpp:1436
+#. i18n: file korganizer.kcfg line 520
+#: rc.cpp:903 rc.cpp:1533
 #, no-c-format
 msgid "Free/Busy Retrieval Username"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 484
-#: rc.cpp:852 rc.cpp:1439
+#. i18n: file korganizer.kcfg line 523
+#: rc.cpp:906 rc.cpp:1536
 #, no-c-format
 msgid "Free/Busy Retrieval Password"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 485
-#: rc.cpp:855 rc.cpp:1442
+#. i18n: file korganizer.kcfg line 524
+#: rc.cpp:909 rc.cpp:1539
 #, fuzzy, no-c-format
 msgid "Password for retrieving free/busy information"
 msgstr "dyddiadau o wybodaeth rhydd/prysur"
 
-#. i18n: file korganizer.kcfg line 495
-#: rc.cpp:858 rc.cpp:1445
+#. i18n: file korganizer.kcfg line 534
+#: rc.cpp:912 rc.cpp:1542
 #, fuzzy, no-c-format
 msgid "Default email attachment method"
 msgstr "Amser cyfarfod rhagosodedig:"
 
-#. i18n: file korganizer.kcfg line 496
-#: rc.cpp:861 rc.cpp:1448
+#. i18n: file korganizer.kcfg line 535
+#: rc.cpp:915 rc.cpp:1545
 #, no-c-format
 msgid "The default way of attaching dropped emails to an event"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 499
-#: rc.cpp:864 rc.cpp:882 rc.cpp:1451 rc.cpp:1469
+#. i18n: file korganizer.kcfg line 538
+#: rc.cpp:918 rc.cpp:936 rc.cpp:1548 rc.cpp:1566
 #, no-c-format
 msgid "Always ask"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 502
-#: rc.cpp:867 rc.cpp:885 rc.cpp:1454 rc.cpp:1472
+#. i18n: file korganizer.kcfg line 541
+#: rc.cpp:921 rc.cpp:939 rc.cpp:1551 rc.cpp:1569
 #, no-c-format
 msgid "Only attach link to message"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 505
-#: rc.cpp:870 rc.cpp:888 rc.cpp:1457 rc.cpp:1475
+#. i18n: file korganizer.kcfg line 544
+#: rc.cpp:924 rc.cpp:942 rc.cpp:1554 rc.cpp:1572
 #, no-c-format
 msgid "Attach complete message"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 508
-#: rc.cpp:873 rc.cpp:1460
+#. i18n: file korganizer.kcfg line 547
+#: rc.cpp:927 rc.cpp:1557
 #, no-c-format
 msgid "Attach message without attachments"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 514
-#: rc.cpp:876 rc.cpp:1463
+#. i18n: file korganizer.kcfg line 553
+#: rc.cpp:930 rc.cpp:1560
 #, fuzzy, no-c-format
 msgid "Default todo attachment method"
 msgstr "Amser cyfarfod rhagosodedig:"
 
-#. i18n: file korganizer.kcfg line 515
-#: rc.cpp:879 rc.cpp:1466
+#. i18n: file korganizer.kcfg line 554
+#: rc.cpp:933 rc.cpp:1563
 #, no-c-format
 msgid "The default way of attaching dropped emails to a task"
 msgstr ""
 
-#. i18n: file ./printing/calprintdayconfig_base.ui line 32
-#: rc.cpp:1589 rc.cpp:1802 rc.cpp:1835
-#, fuzzy, no-c-format
-msgid "Include to-&dos that are due on the printed day(s)"
-msgstr "Cynnwys i-&wneudau a ddisgwylir ar y dyddiad(au) argraffedig"
-
-#. i18n: file ./printing/calprintdayconfig_base.ui line 35
-#: rc.cpp:1592
+#. i18n: file ./plugins/printing/journal/calprintjournalconfig_base.ui line 18
+#: rc.cpp:945
 #, no-c-format
-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."
+msgid "CalPrintJournal_Base"
 msgstr ""
 
-#. i18n: file ./printing/calprintdayconfig_base.ui line 43
-#: rc.cpp:1595 rc.cpp:1736 rc.cpp:1808 rc.cpp:1988 rc.cpp:2045 rc.cpp:2063
+#. i18n: file ./plugins/printing/journal/calprintjournalconfig_base.ui line 32
+#: rc.cpp:948 rc.cpp:966 rc.cpp:978 rc.cpp:1665 rc.cpp:1737 rc.cpp:1794
 #, no-c-format
 msgid "Date && Time Range"
 msgstr "Amrediad Dyddiad ac Amser"
 
-#. i18n: file ./printing/calprintdayconfig_base.ui line 88
-#: rc.cpp:1598 rc.cpp:1664 rc.cpp:1739 rc.cpp:1991 rc.cpp:2054 rc.cpp:2066
+#. i18n: file ./plugins/printing/journal/calprintjournalconfig_base.ui line 46
+#: rc.cpp:951
+#, fuzzy, no-c-format
+msgid "&All journal entries"
+msgstr "C&ofnodion dyddlyfr"
+
+#. i18n: file ./plugins/printing/journal/calprintjournalconfig_base.ui line 60
+#: rc.cpp:954
+#, fuzzy, no-c-format
+msgid "Date &range:"
+msgstr "Amrediad Dyddiadau"
+
+#. i18n: file ./plugins/printing/journal/calprintjournalconfig_base.ui line 96
+#: rc.cpp:957 rc.cpp:969 rc.cpp:981 rc.cpp:1593 rc.cpp:1668 rc.cpp:1797
 #, no-c-format
 msgid "&Start date:"
 msgstr "Dyddiad &dechrau:"
 
-#. i18n: file ./printing/calprintdayconfig_base.ui line 94
-#: rc.cpp:1601 rc.cpp:1619 rc.cpp:1667
-#, no-c-format
-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."
-msgstr ""
-
-#. i18n: file ./printing/calprintdayconfig_base.ui line 102
-#: rc.cpp:1604 rc.cpp:1748
+#. i18n: file ./plugins/printing/journal/calprintjournalconfig_base.ui line 115
+#: rc.cpp:960 rc.cpp:972 rc.cpp:984 rc.cpp:1599 rc.cpp:1698 rc.cpp:1833
 #, no-c-format
-msgid "End ti&me:"
-msgstr "A&mser gorffen:"
+msgid "&End date:"
+msgstr "Dyddiad &gorffen:"
 
-#. i18n: file ./printing/calprintdayconfig_base.ui line 108
-#: rc.cpp:1607
+#. i18n: file ./plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui line 18
+#: rc.cpp:963
 #, no-c-format
-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>."
+msgid "CalPrintWhatsNext_Base"
 msgstr ""
 
-#. i18n: file ./printing/calprintdayconfig_base.ui line 126
-#: rc.cpp:1610
+#. i18n: file ./plugins/printing/list/calprintlistconfig_base.ui line 18
+#: rc.cpp:975
 #, no-c-format
-msgid ""
-"It's 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>."
+msgid "CalPrintList_Base"
 msgstr ""
 
-#. i18n: file ./printing/calprintdayconfig_base.ui line 134
-#: rc.cpp:1613
-#, no-c-format
-msgid "E&xtend time range to include all events"
-msgstr "&Estyn yr amrediad amser i gynnwys pob ddigwyddiad"
+#. i18n: file ./plugins/printing/list/calprintlistconfig_base.ui line 130
+#: rc.cpp:987
+#, fuzzy, no-c-format
+msgid "Print Incidences of Type"
+msgstr "Golygu Amlder"
 
-#. i18n: file ./printing/calprintdayconfig_base.ui line 137
-#: rc.cpp:1616
-#, no-c-format
-msgid ""
-"Check this option to automatically determine the required time range, so all "
-"events will be shown."
-msgstr ""
+#. i18n: file ./plugins/printing/list/calprintlistconfig_base.ui line 149
+#: rc.cpp:993
+#, fuzzy, no-c-format
+msgid "&To-dos"
+msgstr "I-&Wneudau"
 
-#. i18n: file ./printing/calprintdayconfig_base.ui line 166
-#: rc.cpp:1622
+#. i18n: file ./plugins/printing/list/calprintlistconfig_base.ui line 157
+#: rc.cpp:996
+#, fuzzy, no-c-format
+msgid "&Journals"
+msgstr "&Dyddlyfr"
+
+#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 18
+#: rc.cpp:999
+#, fuzzy, no-c-format
+msgid "CalPrintYear_Base"
+msgstr "Argraffu mis"
+
+#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 32
+#: rc.cpp:1002
 #, no-c-format
-msgid ""
-"It's 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>."
+msgid "Yearly print options"
 msgstr ""
 
-#. i18n: file ./printing/calprintdayconfig_base.ui line 174
-#: rc.cpp:1625 rc.cpp:1757
-#, no-c-format
-msgid "Start &time:"
-msgstr "&Amser dechrau:"
+#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 46
+#: rc.cpp:1005
+#, fuzzy, no-c-format
+msgid "Print &Year:"
+msgstr "Argraf&fu wythnos"
 
-#. i18n: file ./printing/calprintdayconfig_base.ui line 180
-#: rc.cpp:1628
+#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 57
+#: rc.cpp:1008
 #, no-c-format
-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>."
+msgid "Number of &pages:"
 msgstr ""
 
-#. i18n: file ./printing/calprintdayconfig_base.ui line 191
-#: rc.cpp:1631 rc.cpp:1637 rc.cpp:1673
+#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 123
+#: rc.cpp:1011
+#, fuzzy, no-c-format
+msgid "Display Options"
+msgstr "Dangos"
+
+#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 134
+#: rc.cpp:1014
 #, no-c-format
-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."
+msgid "Show sub-day events as:"
 msgstr ""
 
-#. i18n: file ./printing/calprintdayconfig_base.ui line 199
-#: rc.cpp:1634 rc.cpp:1670 rc.cpp:1769 rc.cpp:1994 rc.cpp:2057 rc.cpp:2069
-#, no-c-format
-msgid "&End date:"
-msgstr "Dyddiad &gorffen:"
+#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 142
+#: rc.cpp:1017
+#, fuzzy, no-c-format
+msgid "Show holidays as:"
+msgstr "&Dangos amser fel:"
 
-#. i18n: file ./printing/calprintdayconfig_base.ui line 215
-#: rc.cpp:1640 rc.cpp:1727 rc.cpp:1775
-#, no-c-format
-msgid "&Use colors"
-msgstr "&Defnyddio lliwiau"
+#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 148
+#: rc.cpp:1020 rc.cpp:1026
+#, fuzzy, no-c-format
+msgid "Text"
+msgstr "Tefet"
 
-#. i18n: file ./printing/calprintdayconfig_base.ui line 218
-#: rc.cpp:1643 rc.cpp:1730
-#, no-c-format
-msgid ""
-"If you want to use colors to distinguish certain categories on the print, check "
-"this option."
-msgstr ""
+#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 153
+#: rc.cpp:1023 rc.cpp:1029
+#, fuzzy, no-c-format
+msgid "Time Boxes"
+msgstr "Cylchfa amser:"
+
+#. i18n: file ./plugins/exchange/exchangeui.rc line 5
+#: rc.cpp:1032
+#, fuzzy, no-c-format
+msgid "Exchange"
+msgstr "Ategyn Exchange"
 
 #. i18n: file ./printing/calprinttodoconfig_base.ui line 29
-#: rc.cpp:1646
+#: rc.cpp:1575
 #, no-c-format
 msgid "&Title:"
 msgstr "&Teitl:"
 
 #. i18n: file ./printing/calprinttodoconfig_base.ui line 40
-#: rc.cpp:1649
+#: rc.cpp:1578
 #, no-c-format
 msgid "To-do List"
 msgstr "Rhestr I'w-Wneud"
 
 #. i18n: file ./printing/calprinttodoconfig_base.ui line 48
-#: rc.cpp:1652
+#: rc.cpp:1581
 #, fuzzy, no-c-format
 msgid "To-dos to Print"
 msgstr "Eitemau i Argraffu"
 
 #. i18n: file ./printing/calprinttodoconfig_base.ui line 59
-#: rc.cpp:1655
+#: rc.cpp:1584
 #, fuzzy, no-c-format
 msgid "Print &all to-dos"
 msgstr "Argraffu po&b eitem i-wneud"
 
 #. i18n: file ./printing/calprinttodoconfig_base.ui line 73
-#: rc.cpp:1658
+#: rc.cpp:1587
 #, fuzzy, no-c-format
 msgid "Print &unfinished to-dos only"
 msgstr "Argraffu ei&temau heb eu gorffen yn unig"
 
 #. i18n: file ./printing/calprinttodoconfig_base.ui line 84
-#: rc.cpp:1661
+#: rc.cpp:1590
 #, fuzzy, no-c-format
 msgid "Print only to-dos due in the &range:"
 msgstr "Eitemau dis&gwyliedig yn yr amrediad:"
 
+#. i18n: file ./printing/calprinttodoconfig_base.ui line 145
+#: rc.cpp:1596 rc.cpp:1800 rc.cpp:1818
+#, no-c-format
+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."
+msgstr ""
+
+#. i18n: file ./printing/calprinttodoconfig_base.ui line 181
+#: rc.cpp:1602 rc.cpp:1830 rc.cpp:1836
+#, no-c-format
+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."
+msgstr ""
+
 #. i18n: file ./printing/calprinttodoconfig_base.ui line 210
-#: rc.cpp:1676 rc.cpp:1712
+#: rc.cpp:1605 rc.cpp:1641
 #, fuzzy, no-c-format
 msgid "Include Information"
 msgstr "Gwybodaeth Gweinydd"
 
 #. i18n: file ./printing/calprinttodoconfig_base.ui line 224
-#: rc.cpp:1679
+#: rc.cpp:1608
 #, no-c-format
 msgid "&Priority"
 msgstr "&Blaenoriaeth"
 
 #. i18n: file ./printing/calprinttodoconfig_base.ui line 235
-#: rc.cpp:1682
+#: rc.cpp:1611
 #, no-c-format
 msgid "&Description"
 msgstr "&Disgrifiad"
 
 #. i18n: file ./printing/calprinttodoconfig_base.ui line 246
-#: rc.cpp:1685
+#: rc.cpp:1614
 #, no-c-format
 msgid "Due date"
 msgstr "Dyddiad Disgwyliedig"
 
 #. i18n: file ./printing/calprinttodoconfig_base.ui line 260
-#: rc.cpp:1688
+#: rc.cpp:1617
 #, fuzzy, no-c-format
 msgid "Per&centage completed"
 msgstr "Cyflawn"
 
 #. i18n: file ./printing/calprinttodoconfig_base.ui line 290
-#: rc.cpp:1691
+#: rc.cpp:1620
 #, fuzzy, no-c-format
 msgid "Sorting Options"
 msgstr "Lleoliad:"
 
 #. i18n: file ./printing/calprinttodoconfig_base.ui line 304
-#: rc.cpp:1694
+#: rc.cpp:1623
 #, fuzzy, no-c-format
 msgid "Sort field:"
 msgstr "Trefnu ID"
 
 #. i18n: file ./printing/calprinttodoconfig_base.ui line 323
-#: rc.cpp:1697
+#: rc.cpp:1626
 #, fuzzy, no-c-format
 msgid "Sort direction:"
 msgstr "Lleoliad:"
 
 #. i18n: file ./printing/calprinttodoconfig_base.ui line 375
-#: rc.cpp:1700
+#: rc.cpp:1629
 #, fuzzy, no-c-format
 msgid "Other Options"
 msgstr "Dis&grifiadau"
 
 #. i18n: file ./printing/calprinttodoconfig_base.ui line 386
-#: rc.cpp:1703
+#: rc.cpp:1632
 #, fuzzy, no-c-format
 msgid "Co&nnect sub-to-dos with its parent"
 msgstr "Cysylltu is-i-w&neudau efo eu rhiant"
 
 #. i18n: file ./printing/calprinttodoconfig_base.ui line 397
-#: rc.cpp:1706
+#: rc.cpp:1635
 #, fuzzy, no-c-format
 msgid "Strike &out completed to-do summaries"
 msgstr "Cuddio i'w-wneudau a gwblhawyd"
 
 #. i18n: file ./printing/calprintincidenceconfig_base.ui line 18
-#: rc.cpp:1709
+#: rc.cpp:1638
 #, fuzzy, no-c-format
 msgid "CalPrintIncidence_Base"
 msgstr "Argraffu mis"
 
 #. i18n: file ./printing/calprintincidenceconfig_base.ui line 43
-#: rc.cpp:1715
+#: rc.cpp:1644
 #, no-c-format
 msgid "Detai&ls (visiblility, secrecy, etc.)"
 msgstr ""
 
 #. i18n: file ./printing/calprintincidenceconfig_base.ui line 51
-#: rc.cpp:1718
+#: rc.cpp:1647
 #, no-c-format
 msgid "&Notes, Subitems"
 msgstr ""
 
-#. i18n: file ./printing/calprintincidenceconfig_base.ui line 59
-#: koeventeditor.cpp:197 rc.cpp:1721
-#, fuzzy, no-c-format
-msgid "&Attendees"
-msgstr "Cyfarfotwyr"
-
 #. i18n: file ./printing/calprintincidenceconfig_base.ui line 67
-#: rc.cpp:1724
+#: rc.cpp:1653
 #, no-c-format
 msgid "Attach&ments"
 msgstr "Atodia&dau"
 
-#. i18n: file ./printing/calprintweekconfig_base.ui line 18
-#: rc.cpp:1733
+#. i18n: file ./printing/calprintincidenceconfig_base.ui line 77
+#: rc.cpp:1656 rc.cpp:1704 rc.cpp:1839
+#, no-c-format
+msgid "&Use colors"
+msgstr "&Defnyddio lliwiau"
+
+#. i18n: file ./printing/calprintincidenceconfig_base.ui line 80
+#: rc.cpp:1659 rc.cpp:1842
+#, no-c-format
+msgid ""
+"If you want to use colors to distinguish certain categories on the print, check "
+"this option."
+msgstr ""
+
+#. i18n: file ./printing/calprintweetdeconfig_base.ui line 18
+#: rc.cpp:1662
 #, fuzzy, no-c-format
 msgid "CalPrintWeek_Base"
 msgstr "Argraffu mis"
 
-#. i18n: file ./printing/calprintweekconfig_base.ui line 83
-#: rc.cpp:1742 rc.cpp:1745
+#. i18n: file ./printing/calprintweetdeconfig_base.ui line 83
+#: rc.cpp:1671 rc.cpp:1674
 #, no-c-format
 msgid ""
 "Here you can choose which events should be printed based on their date. This "
@@ -4787,20 +6588,32 @@ msgid ""
 "End date</i> to enter the end date of the daterange."
 msgstr ""
 
-#. i18n: file ./printing/calprintweekconfig_base.ui line 108
-#: rc.cpp:1751 rc.cpp:1754
+#. i18n: file ./printing/calprintweetdeconfig_base.ui line 102
+#: rc.cpp:1677 rc.cpp:1803
+#, no-c-format
+msgid "End ti&me:"
+msgstr "A&mser gorffen:"
+
+#. i18n: file ./printing/calprintweetdeconfig_base.ui line 108
+#: rc.cpp:1680 rc.cpp:1683
 #, no-c-format
 msgid "All events which start later than the given time will not be printed."
 msgstr ""
 
-#. i18n: file ./printing/calprintweekconfig_base.ui line 157
-#: rc.cpp:1760 rc.cpp:1763
+#. i18n: file ./printing/calprintweetdeconfig_base.ui line 151
+#: rc.cpp:1686 rc.cpp:1824
+#, no-c-format
+msgid "Start &time:"
+msgstr "&Amser dechrau:"
+
+#. i18n: file ./printing/calprintweetdeconfig_base.ui line 157
+#: rc.cpp:1689 rc.cpp:1692
 #, no-c-format
 msgid "All events which start earlier than the given time will not be printed."
 msgstr ""
 
-#. i18n: file ./printing/calprintweekconfig_base.ui line 186
-#: rc.cpp:1766 rc.cpp:1772
+#. i18n: file ./printing/calprintweetdeconfig_base.ui line 186
+#: rc.cpp:1695 rc.cpp:1701
 #, no-c-format
 msgid ""
 "Here you can choose which events should be printed based on their date. This "
@@ -4808,41 +6621,41 @@ msgid ""
 "Start date</i> to enter the start date of the daterange."
 msgstr ""
 
-#. i18n: file ./printing/calprintweekconfig_base.ui line 213
-#: rc.cpp:1778
+#. i18n: file ./printing/calprintweetdeconfig_base.ui line 213
+#: rc.cpp:1707
 #, no-c-format
 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."
 msgstr ""
 
-#. i18n: file ./printing/calprintweekconfig_base.ui line 221
-#: rc.cpp:1781
+#. i18n: file ./printing/calprintweetdeconfig_base.ui line 221
+#: rc.cpp:1710
 #, fuzzy, no-c-format
 msgid "Print Layout"
 msgstr "Argraffu& diwrnod"
 
-#. i18n: file ./printing/calprintweekconfig_base.ui line 232
-#: rc.cpp:1784
+#. i18n: file ./printing/calprintweetdeconfig_base.ui line 232
+#: rc.cpp:1713
 #, no-c-format
 msgid "Print as &Filofax page"
 msgstr "Argraffu fel tudalen &Filofax"
 
-#. i18n: file ./printing/calprintweekconfig_base.ui line 238
-#: rc.cpp:1787
+#. i18n: file ./printing/calprintweetdeconfig_base.ui line 238
+#: rc.cpp:1716
 #, no-c-format
 msgid ""
 "The Filofax view prints one week per page, so all days have a large surface."
 msgstr ""
 
-#. i18n: file ./printing/calprintweekconfig_base.ui line 246
-#: rc.cpp:1790
+#. i18n: file ./printing/calprintweetdeconfig_base.ui line 246
+#: rc.cpp:1719
 #, fuzzy, no-c-format
 msgid "Print as &timetable view"
 msgstr "Argraffu fel golwg am&serlen:"
 
-#. i18n: file ./printing/calprintweekconfig_base.ui line 249
-#: rc.cpp:1793
+#. i18n: file ./printing/calprintweetdeconfig_base.ui line 249
+#: rc.cpp:1722
 #, no-c-format
 msgid ""
 "This view is similar to the weekview in KOrganizer. The week is printed in "
@@ -4850,14 +6663,14 @@ msgid ""
 "<i>Use Colors</i>."
 msgstr ""
 
-#. i18n: file ./printing/calprintweekconfig_base.ui line 257
-#: rc.cpp:1796
+#. i18n: file ./printing/calprintweetdeconfig_base.ui line 257
+#: rc.cpp:1725
 #, fuzzy, no-c-format
 msgid "Print as split week view"
 msgstr "Argraffu fel golwg am&serlen:"
 
-#. i18n: file ./printing/calprintweekconfig_base.ui line 260
-#: rc.cpp:1799
+#. i18n: file ./printing/calprintweetdeconfig_base.ui line 260
+#: rc.cpp:1728
 #, no-c-format
 msgid ""
 "This view is similar to the week view in KOrganizer. The only difference with "
@@ -4865,8 +6678,14 @@ msgid ""
 "split week view in portrait."
 msgstr ""
 
-#. i18n: file ./printing/calprintweekconfig_base.ui line 276
-#: rc.cpp:1805 rc.cpp:1838
+#. i18n: file ./printing/calprintweetdeconfig_base.ui line 273
+#: rc.cpp:1731 rc.cpp:1764 rc.cpp:1788
+#, fuzzy, no-c-format
+msgid "Include to-&dos that are due on the printed day(s)"
+msgstr "Cynnwys i-&wneudau a ddisgwylir ar y dyddiad(au) argraffedig"
+
+#. i18n: file ./printing/calprintweetdeconfig_base.ui line 276
+#: rc.cpp:1734 rc.cpp:1767
 #, fuzzy, no-c-format
 msgid ""
 "Check this option if you want to have to-dos on the print, placed by their due "
@@ -4874,13 +6693,13 @@ msgid ""
 msgstr "Dangos eiliadau ar linell Marcus Bain"
 
 #. i18n: file ./printing/calprintmonthconfig_base.ui line 57
-#: rc.cpp:1811
+#: rc.cpp:1740
 #, no-c-format
 msgid "&Start month:"
 msgstr "Mis dec&hrau:"
 
 #. i18n: file ./printing/calprintmonthconfig_base.ui line 63
-#: rc.cpp:1814
+#: rc.cpp:1743
 #, no-c-format
 msgid ""
 "When you want to print more months at once, you can define a month range. This "
@@ -4889,7 +6708,7 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./printing/calprintmonthconfig_base.ui line 71
-#: rc.cpp:1817 rc.cpp:1820
+#: rc.cpp:1746 rc.cpp:1749
 #, no-c-format
 msgid ""
 "When you want to print more months at once, you can define a month range. This "
@@ -4898,13 +6717,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./printing/calprintmonthconfig_base.ui line 93
-#: rc.cpp:1823
+#: rc.cpp:1752
 #, no-c-format
 msgid "&End month:"
 msgstr "&Mis gorffen:"
 
 #. i18n: file ./printing/calprintmonthconfig_base.ui line 99
-#: rc.cpp:1826 rc.cpp:1829 rc.cpp:1832
+#: rc.cpp:1755 rc.cpp:1758 rc.cpp:1761
 #, no-c-format
 msgid ""
 "When you want to print more months at once, you can define a month range. This "
@@ -4913,25 +6732,25 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./printing/calprintmonthconfig_base.ui line 162
-#: rc.cpp:1841
+#: rc.cpp:1770
 #, no-c-format
 msgid "Print week &numbers"
 msgstr "Argra&ffu rhifau wythnos"
 
 #. i18n: file ./printing/calprintmonthconfig_base.ui line 165
-#: rc.cpp:1844
+#: rc.cpp:1773
 #, no-c-format
 msgid "Enable this to print week numbers at the left of each row."
 msgstr ""
 
 #. i18n: file ./printing/calprintmonthconfig_base.ui line 173
-#: rc.cpp:1847
+#: rc.cpp:1776
 #, fuzzy, no-c-format
 msgid "Print daily re&curring to-dos and events"
 msgstr "Cuddio Digwyddiadau sy'n Ail-ddigwydd"
 
 #. i18n: file ./printing/calprintmonthconfig_base.ui line 176
-#: rc.cpp:1850
+#: rc.cpp:1779
 #, no-c-format
 msgid ""
 "With this option it is possible to leave out the daily recurring to-dos and "
@@ -4940,1206 +6759,579 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./printing/calprintmonthconfig_base.ui line 184
-#: rc.cpp:1853
+#: rc.cpp:1782
 #, fuzzy, no-c-format
 msgid "Print weekl&y recurring to-dos and events"
 msgstr "Cuddio Digwyddiadau sy'n Ail-ddigwydd"
 
 #. i18n: file ./printing/calprintmonthconfig_base.ui line 187
-#: rc.cpp:1856
+#: rc.cpp:1785
 #, no-c-format
 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."
 msgstr ""
 
-#. i18n: file ./plugins/printing/list/calprintlistconfig_base.ui line 18
-#: rc.cpp:1985
+#. i18n: file ./printing/calprintdayconfig_base.ui line 35
+#: rc.cpp:1791
 #, no-c-format
-msgid "CalPrintList_Base"
+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 ./plugins/printing/list/calprintlistconfig_base.ui line 130
-#: rc.cpp:1997
-#, fuzzy, no-c-format
-msgid "Print Incidences of Type"
-msgstr "Golygu Amlder"
-
-#. i18n: file ./plugins/printing/list/calprintlistconfig_base.ui line 141
-#: archivedialog.cpp:136 rc.cpp:2000 searchdialog.cpp:72
-#, no-c-format
-msgid "&Events"
-msgstr "&Digwyddiadau:"
-
-#. i18n: file ./plugins/printing/list/calprintlistconfig_base.ui line 149
-#: archivedialog.cpp:137 rc.cpp:2003
-#, fuzzy, no-c-format
-msgid "&To-dos"
-msgstr "I-&Wneudau"
-
-#. i18n: file ./plugins/printing/list/calprintlistconfig_base.ui line 157
-#: rc.cpp:2006
-#, fuzzy, no-c-format
-msgid "&Journals"
-msgstr "&Dyddlyfr"
-
-#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 18
-#: rc.cpp:2009
-#, fuzzy, no-c-format
-msgid "CalPrintYear_Base"
-msgstr "Argraffu mis"
-
-#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 32
-#: rc.cpp:2012
+#. i18n: file ./printing/calprintdayconfig_base.ui line 108
+#: rc.cpp:1806
 #, no-c-format
-msgid "Yearly print options"
+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>."
 msgstr ""
 
-#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 46
-#: rc.cpp:2015
-#, fuzzy, no-c-format
-msgid "Print &Year:"
-msgstr "Argraf&fu wythnos"
-
-#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 57
-#: rc.cpp:2018
+#. i18n: file ./printing/calprintdayconfig_base.ui line 126
+#: rc.cpp:1809
 #, no-c-format
-msgid "Number of &pages:"
+msgid ""
+"It's 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 ./plugins/printing/year/calprintyearconfig_base.ui line 123
-#: rc.cpp:2021
-#, fuzzy, no-c-format
-msgid "Display Options"
-msgstr "Dangos"
+#. i18n: file ./printing/calprintdayconfig_base.ui line 134
+#: rc.cpp:1812
+#, no-c-format
+msgid "E&xtend time range to include all events"
+msgstr "&Estyn yr amrediad amser i gynnwys pob ddigwyddiad"
 
-#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 134
-#: rc.cpp:2024
+#. i18n: file ./printing/calprintdayconfig_base.ui line 137
+#: rc.cpp:1815
 #, no-c-format
-msgid "Show sub-day events as:"
+msgid ""
+"Check this option to automatically determine the required time range, so all "
+"events will be shown."
 msgstr ""
 
-#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 142
-#: rc.cpp:2027
-#, fuzzy, no-c-format
-msgid "Show holidays as:"
-msgstr "&Dangos amser fel:"
-
-#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 148
-#: rc.cpp:2030 rc.cpp:2036
-#, fuzzy, no-c-format
-msgid "Text"
-msgstr "Tefet"
-
-#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 153
-#: rc.cpp:2033 rc.cpp:2039
-#, fuzzy, no-c-format
-msgid "Time Boxes"
-msgstr "Cylchfa amser:"
-
-#. i18n: file ./plugins/printing/journal/calprintjournalconfig_base.ui line 18
-#: rc.cpp:2042
+#. i18n: file ./printing/calprintdayconfig_base.ui line 166
+#: rc.cpp:1821
 #, no-c-format
-msgid "CalPrintJournal_Base"
+msgid ""
+"It's 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 ./plugins/printing/journal/calprintjournalconfig_base.ui line 46
-#: rc.cpp:2048
-#, fuzzy, no-c-format
-msgid "&All journal entries"
-msgstr "C&ofnodion dyddlyfr"
-
-#. i18n: file ./plugins/printing/journal/calprintjournalconfig_base.ui line 60
-#: rc.cpp:2051
-#, fuzzy, no-c-format
-msgid "Date &range:"
-msgstr "Amrediad Dyddiadau"
-
-#. i18n: file ./plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui line 18
-#: rc.cpp:2060
+#. i18n: file ./printing/calprintdayconfig_base.ui line 180
+#: rc.cpp:1827
 #, no-c-format
-msgid "CalPrintWhatsNext_Base"
+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>."
 msgstr ""
 
-#. i18n: file ./plugins/exchange/exchangeui.rc line 5
-#: rc.cpp:2072
-#, fuzzy, no-c-format
-msgid "Exchange"
-msgstr "Ategyn Exchange"
-
-#: konewstuff.cpp:48
-#, fuzzy
-msgid "Could not load calendar."
-msgstr "Wedi methu llwytho calendr."
-
-#: konewstuff.cpp:63
-msgid "The downloaded events will be merged into your current calendar."
+#: koeditorgeneral.cpp:107
+msgid "Sets the Title of this event or to-do."
 msgstr ""
-"Mi fydd y disgwyddiadau â lawrlwythwyd yn cael eu cyfuno i'ch calendr cyfredol."
 
-#: koeditorattachments.cpp:107
-msgid "[Binary data]"
-msgstr "[Data deuol]"
+#: koeditorgeneral.cpp:126
+msgid "Sets where the event or to-do will take place."
+msgstr ""
 
-#: koeditorattachments.cpp:194 printing/calprintdefaultplugins.cpp:417
-#, fuzzy
-msgid "Attachments:"
-msgstr "Atodia&dau"
+#: koeditorgeneral.cpp:127
+msgid "&Location:"
+msgstr "&Lleoliad:"
 
-#: koeditorattachments.cpp:199
+#: koeditorgeneral.cpp:143
 msgid ""
-"Displays a list of current items (files, mail, etc.) that have been associated "
-"with this event or to-do. "
+"Allows you to select the categories that this event or to-do belongs to."
 msgstr ""
 
-#: koeditorattachments.cpp:225
+#: koeditorgeneral.cpp:144
 #, fuzzy
-msgid "&Attach File..."
-msgstr "Ychwanegu Hidlen..."
+msgid "Categories:"
+msgstr "Categorïau"
 
-#: koeditorattachments.cpp:226
-msgid ""
-"Shows a dialog used to select an attachment to add to this event or to-do as "
-"link as inline data."
-msgstr ""
+#: koeditorgeneral.cpp:153
+#, fuzzy
+msgid "Select..."
+msgstr "Golygu'r Dewisiad..."
 
-#: koeditorattachments.cpp:229
-msgid "Attach &Link..."
-msgstr ""
+#: koeditorgeneral.cpp:163
+msgid "Acc&ess:"
+msgstr "Cyrc&hiad:"
 
-#: koeditorattachments.cpp:230
+#: koeditorgeneral.cpp:164
 msgid ""
-"Shows a dialog used to select an attachment to add to this event or to-do as "
-"link."
+"Sets whether the access to this event or to-do is restricted. Please note that "
+"KOrganizer currently does not use this setting, so the implementation of the "
+"restrictions will depend on the groupware server. This means that events or "
+"to-dos marked as private or confidential may be visible to others."
 msgstr ""
 
-#: koeditorattachments.cpp:243
+#: koeditorgeneral.cpp:185
 msgid ""
-"Removes the attachment selected in the list above from this event or to-do."
-msgstr ""
-
-#: koeditorattachments.cpp:272
-msgid "Do you want to link to the attachments, or include them in the event?"
-msgstr ""
-
-#: koeditorattachments.cpp:273
-msgid "Attach as link?"
+"Sets the description for this event or to-do. This will be displayed in a "
+"reminder if one is set, as well as in a tooltip when you hover over the event."
 msgstr ""
 
-#: koeditorattachments.cpp:273
-msgid "As Link"
+#: koeditorgeneral.cpp:202
+msgid "Enable reminders for this event or to-do."
 msgstr ""
 
-#: koeditorattachments.cpp:273
+#: koeditorgeneral.cpp:203
 #, fuzzy
-msgid "As File"
-msgstr "Ychwanegu Hidlen"
+msgid "Enable reminders"
+msgstr "Atgof"
 
-#: koeditorattachments.cpp:315 koeditorattachments.cpp:340
+#: koeditorgeneral.cpp:209
 msgid ""
-"URL (e.g. a web page) or file to be attached (only the link will be attached, "
-"not the file itself):"
+"Push this button to create an advanced set of reminders for this event or "
+"to-do."
 msgstr ""
 
-#: koeditorattachments.cpp:317 koeditorattachments.cpp:325
-#: koeditorattachments.cpp:348
-msgid "Add Attachment"
-msgstr "Ychwanegu Atodiad"
-
-#: koeditorattachments.cpp:342
-msgid "Edit Attachment"
-msgstr "Golygu Atodiad"
-
-#: koeditorattachments.cpp:348
-msgid "File to be attached:"
+#: koeditorgeneral.cpp:211
+msgid "Set an advanced reminder"
 msgstr ""
 
-#: koeditorattachments.cpp:378
-#, fuzzy
-msgid "The selected items will be permanently deleted."
-msgstr "My fydd yr eitem hyn yn cael ei ddileu am byth."
-
-#: searchdialog.cpp:49
-msgid "Find Events"
-msgstr "Darganfod Digwyddiadau"
-
-#: searchdialog.cpp:50
-msgid "&Find"
-msgstr "&Darganfod"
-
-#: searchdialog.cpp:62
-msgid "&Search for:"
-msgstr "&Chwilio am:"
-
-#: searchdialog.cpp:70
-msgid "Search For"
-msgstr "Chwilio am:"
-
-#: searchdialog.cpp:73
-#, fuzzy
-msgid "To-&dos"
-msgstr "I-&Wneudau"
-
-#: searchdialog.cpp:74
-msgid "&Journal entries"
-msgstr "C&ofnodion dyddlyfr"
-
-#: exportwebdialog.cpp:142 searchdialog.cpp:79
-msgid "Date Range"
-msgstr "Amrediad Dyddiadau"
-
-#: searchdialog.cpp:87
-msgid "Fr&om:"
-msgstr "Od&diwrth:"
-
-#: searchdialog.cpp:91
-msgid "&To:"
-msgstr "&I:"
-
-#: searchdialog.cpp:95
-#, fuzzy
-msgid "E&vents have to be completely included"
-msgstr "R&haid i ddigwyddiadau gael eu cynnwys yn gyfangwbl"
-
-#: searchdialog.cpp:98
-#, fuzzy
-msgid "Include to-dos &without due date"
-msgstr "Cynnwys i-wneudau &heb ddyddiad disgwyliedig"
-
-#: searchdialog.cpp:102
-msgid "Search In"
-msgstr "Chwilio Mewn"
-
-#: searchdialog.cpp:105
-msgid "Su&mmaries"
-msgstr "Cr&ynodebau"
-
-#: searchdialog.cpp:107
-msgid "Desc&riptions"
-msgstr "Dis&grifiadau"
-
-#: searchdialog.cpp:108
-msgid "Cate&gories"
-msgstr "Ca&tegorïau"
-
-#: searchdialog.cpp:149
+#: koeditorgeneral.cpp:220
 msgid ""
-"Invalid search expression, cannot perform the search. Please enter a search "
-"expression using the wildcard characters '*' and '?' where needed."
+"Set the time before the event starts when the reminder will be triggered."
 msgstr ""
-"Mynegiad chilio annilys, methu gwneud y chwiliad.  Mewnosodwch fynegiad chwilio "
-"gan ddefnyddio'r nodau-chwilio '*' a '?' lle bo angen."
 
-#: searchdialog.cpp:162
-msgid "No events were found matching your search expression."
-msgstr "Ni chanfuwyd digwyddiadau sy'n cydweddu eich mynediad chwilio."
-
-#: exportwebdialog.cpp:73
-msgid "Export Calendar as Web Page"
-msgstr "Allforio Calendr fel Tudalen Wê"
+#: koeditorgeneral.cpp:221
+msgid "Set the start time trigger offset"
+msgstr ""
 
-#: exportwebdialog.cpp:130
+#: koeditorgeneral.cpp:223
 msgid ""
-"You are about to set all preferences to default values. All custom "
-"modifications will be lost."
+"Set the time before the to-do is due when the reminder will be triggered."
 msgstr ""
-"Rydych ar fin gosod yr holl werthoedd i'r gwerthoedd rhagosod. Collir pob "
-"addasiad."
 
-#: exportwebdialog.cpp:131
-msgid "Setting Default Preferences"
-msgstr "Gosod Hoffiannau Rhagosod"
-
-#: exportwebdialog.cpp:132
-msgid "Reset to Defaults"
+#: koeditorgeneral.cpp:224
+msgid "Set the due time trigger offset"
 msgstr ""
 
-#: exportwebdialog.cpp:147
-msgid "View Type"
-msgstr "Gweld Math"
-
-#: exportwebdialog.cpp:158
-msgid "Destination"
-msgstr "Cyrchfan"
-
-#: exportwebdialog.cpp:175
+#: koeditorgeneral.cpp:242 koeditorgeneral.cpp:447
 #, fuzzy
-msgid "To-dos"
-msgstr "I-&Wneudau"
-
-#: exportwebdialog.cpp:196
-msgid "Events"
-msgstr "Digwyddiadau"
-
-#: aboutdata.cpp:32
-msgid "KOrganizer"
-msgstr "KTrefnydd"
-
-#: aboutdata.cpp:33
-msgid "A Personal Organizer for TDE"
-msgstr "Trefnydd Personol ar gyfer TDE"
-
-#: aboutdata.cpp:40
-msgid "Current Maintainer"
-msgstr "Cynhaliwr Cyfredol"
+msgid "before the due time"
+msgstr "Canoli wrth Gychwyn"
 
-#: aboutdata.cpp:42
-#, fuzzy
-msgid "Co-Maintainer"
-msgstr "Cynhaliwr"
+#: koeditorgeneral.cpp:429 koeditorgeneral.cpp:468
+#, c-format
+msgid "Triggers %1"
+msgstr ""
 
-#: aboutdata.cpp:44
-msgid "Original Author"
-msgstr "Awdur Gwreiddiol"
+#: koeditorgeneral.cpp:500
+#, fuzzy, c-format
+msgid "Calendar: %1"
+msgstr "Calendr"
 
-#: resourceview.cpp:234
+#: koeditorgeneral.cpp:582
 #, fuzzy
-msgid "Add calendar"
-msgstr "Calendr Newydd"
+msgid "No attendees"
+msgstr "Cy&farfotwyr"
 
-#: resourceview.cpp:236
+#: koeditorgeneral.cpp:584
+#, fuzzy, c-format
 msgid ""
-"<qt>"
-"<p>Press this button to add a resource to KOrganizer.</p>"
-"<p>Events, journal entries and to-dos are retrieved and stored on resources. "
-"Available resources include groupware servers, local files, journal entries as "
-"blogs on a server, etc... </p>"
-"<p>If you have more than one active resource, when creating incidents you will "
-"either automatically use the default resource or be prompted to select the "
-"resource to use.</p></qt>"
+"_n: One attendee\n"
+"%n attendees"
 msgstr ""
+"1 munud\n"
+"%n o funudau"
 
-#: resourceview.cpp:249
-#, fuzzy
-msgid "Edit calendar settings"
-msgstr "Golygu Hidlennau Calendr"
-
-#: resourceview.cpp:251
+#: eventarchiver.cpp:101
 msgid ""
-"Press this button to edit the resource currently selected on the KOrganizer "
-"resources list above."
+"Unable to archive to-do \"%1\" because at least one of its sub-to-dos does not "
+"meet the archival requirements."
 msgstr ""
 
-#: resourceview.cpp:256
+#: eventarchiver.cpp:103
 #, fuzzy
-msgid "Remove calendar"
-msgstr "Cy&mryd drosodd y Calendr"
+msgid "Archive To-do"
+msgstr "Argraffu po&b eitem i-wneud"
 
-#: resourceview.cpp:258
+#: eventarchiver.cpp:120
 msgid ""
-"Press this button to delete the resource currently selected on the KOrganizer "
-"resources list above."
+"There are no incidences available to archive before the specified cut-off date "
+"%1. Archiving will not be performed."
 msgstr ""
 
-#: resourceview.cpp:266
+#: eventarchiver.cpp:148
+#, fuzzy
 msgid ""
-"<qt>"
-"<p>Select on this list the active KOrganizer resources. Check the resource box "
-"to make it active. Press the \"Add...\" button below to add new resources to "
-"the list.</p>"
-"<p>Events, journal entries and to-dos are retrieved and stored on resources. "
-"Available resources include groupware servers, local files, journal entries as "
-"blogs on a server, etc...</p>"
-"<p>If you have more than one active resource, when creating incidents you will "
-"either automatically use the default resource or be prompted to select the "
-"resource to use.</p></qt>"
+"Delete all items before %1 without saving?\n"
+"The following items will be deleted:"
 msgstr ""
+"Dileu pob digwyddiad cyn %1 heb gadw?\n"
+" Mi fydd y digwyddiadau hyn yn cael eu dileu:"
 
-#: resourceview.cpp:326
-#, fuzzy
-msgid "Add Subresource"
-msgstr "%1 adnodd"
-
-#: resourceview.cpp:327
-#, fuzzy
-msgid "Please enter a name for the new subresource"
-msgstr "Rhowch enw ar gyfer y patrymlun:"
-
-#: resourceview.cpp:333
+#: eventarchiver.cpp:151
 #, fuzzy
-msgid "<qt>Unable to create subresource <b>%1</b>.</qt>"
-msgstr "<qt>Wedi methu creu adnodd o'r dath <b>%1</b>.</qt>"
-
-#: resourceview.cpp:341
-msgid "Resource Configuration"
-msgstr "Ffurfweddu Adnoddau"
-
-#: resourceview.cpp:342
-msgid "Please select type of the new resource:"
-msgstr "Dewiswch fath yr adnodd newydd:"
+msgid "Delete Old Items"
+msgstr "Dileu Hen Ddigwyddiadau"
 
-#: resourceview.cpp:352
-msgid "<qt>Unable to create resource of type <b>%1</b>.</qt>"
-msgstr "<qt>Wedi methu creu adnodd o'r dath <b>%1</b>.</qt>"
+#: eventarchiver.cpp:219
+#, fuzzy, c-format
+msgid "Cannot write archive file %1."
+msgstr "Methu ysgrifennu'r ffeil archif."
 
-#: resourceview.cpp:357
-msgid "%1 resource"
-msgstr "%1 adnodd"
+#: eventarchiver.cpp:228
+msgid "Cannot write archive to final destination."
+msgstr "Methu ysgrifennu'r ffeil archif i'r gyrchfan olaf. "
 
-#: resourceview.cpp:371
+#: korganizer_options.h:35
 #, fuzzy
-msgid "Unable to create the resource."
-msgstr "Methu cadw'r eitem i-wneud"
+msgid "Import the given calendars as new resources into the default calendar"
+msgstr "Mewnforio'r calendr wrth <url> i mewn i'r calendr rhagosod"
 
-#: resourceview.cpp:484
+#: korganizer_options.h:37
 msgid ""
-"<qt>Do you really want to remove the subresource <b>%1</b>"
-"? Note that its contents will be completely deleted. This operation cannot be "
-"undone. </qt>"
+"Merge the given calendars into the standard calendar (i.e. copy the events)"
 msgstr ""
 
-#: resourceview.cpp:487
-#, fuzzy
-msgid "<qt>Do you really want to remove the resource <b>%1</b>?</qt>"
-msgstr "<qt>A ydych yn wir eisiau dileu'r adnodd? <b>%1</b>?</qt>"
-
-#: resourceview.cpp:497
-#, fuzzy
-msgid "You cannot delete your standard resource."
-msgstr "Nid ydych chi'n gallu dileu eich adnodd safonol!"
+#: korganizer_options.h:39
+msgid "Open the given calendars in a new window"
+msgstr ""
 
-#: resourceview.cpp:504
+#: korganizer_options.h:40
 msgid ""
-"<qt>Failed to remove the subresource <b>%1</b>. The reason could be that it is "
-"a built-in one which cannot be removed, or that the removal of the underlying "
-"storage folder failed.</qt>"
+"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 ""
 
-#: resourceview.cpp:581
-msgid "Re&load"
-msgstr "Ai&l-lwytho"
-
-#: resourceview.cpp:589
-msgid "Show &Info"
-msgstr "&Dangos Gwybodaeth"
-
-#: resourceview.cpp:593
-msgid "&Assign Color"
-msgstr ""
+#: kolistview.cpp:212 kotodoview.cpp:387
+msgid "Recurs"
+msgstr "Yn Ail-ddigwydd"
 
-#: resourceview.cpp:595
+#: kolistview.cpp:215
 #, fuzzy
-msgid "&Disable Color"
-msgstr "defnyddio &lliwiau"
+msgid "Start Date/Time"
+msgstr "Dyddiad Dechrau"
 
-#: resourceview.cpp:596
+#: kolistview.cpp:218
 #, fuzzy
-msgid "Resources Colors"
-msgstr "%1 adnodd"
+msgid "End Date/Time"
+msgstr "Amser Disgwyledig"
 
-#: resourceview.cpp:603
-#, fuzzy
-msgid "Use as &Default Calendar"
-msgstr "Fformat Calendr Rhagosodedig"
+#: korgplugins.cpp:37
+msgid "KOrgPlugins"
+msgstr "KOrgPlugins"
 
-#: resourceview.cpp:609
-msgid "&Add..."
-msgstr "Ychw&anegu..."
+#: koeditorattachments.cpp:143
+msgid "[Binary data]"
+msgstr "[Data deuol]"
 
-#: printing/calprinter.cpp:133
-msgid "Unable to print, no valid print style was returned."
-msgstr ""
+#: koeditorattachments.cpp:168 koeditorattachments.cpp:672
+msgid "Add Attachment"
+msgstr "Ychwanegu Atodiad"
 
-#: printing/calprinter.cpp:134
+#: koeditorattachments.cpp:186
 #, fuzzy
-msgid "Printing error"
-msgstr "Argraffu:"
-
-#: printing/calprinter.cpp:155
-msgid "Print Calendar"
-msgstr "Argraffu Calendr"
-
-#: printing/calprinter.cpp:179
-msgid "Print Style"
-msgstr "Arddull Argraffu"
-
-#: printing/calprinter.cpp:193
-msgid "Page &orientation:"
-msgstr "Cyf&eiriadaeth y dudalen:"
+msgid "Attachment name"
+msgstr "Atodia&dau"
 
-#: printing/calprinter.cpp:198
+#: koeditorattachments.cpp:187
 #, fuzzy
-msgid "Use Default Orientation of Selected Style"
-msgstr "Defnyddio Rhagosodyn yr Ardull Dewisiedig"
+msgid "Give the attachment a name"
+msgstr "Amser cyfarfod rhagosodedig:"
 
-#: printing/calprinter.cpp:199
-msgid "Use Printer Default"
+#: koeditorattachments.cpp:189
+msgid "Type any string you desire here for the name of the attachment"
 msgstr ""
 
-#: printing/calprinter.cpp:237 printing/calprinter.cpp:239
-msgid "&Preview"
-msgstr "&Rhagolwg"
-
-#: printing/calprintdefaultplugins.cpp:134
-#: printing/calprintdefaultplugins.cpp:163
-#: printing/calprintdefaultplugins.cpp:182
+#: koeditorattachments.cpp:195
 #, fuzzy
-msgid "Start date: "
-msgstr "Dyddiad dechrau:"
-
-#: printing/calprintdefaultplugins.cpp:139
-#: printing/calprintdefaultplugins.cpp:168
-#, fuzzy
-msgid "No start date"
-msgstr "Dyddiad dechrau:"
+msgid "Type:"
+msgstr "Math"
 
-#: printing/calprintdefaultplugins.cpp:144
+#: koeditorattachments.cpp:204
 #, fuzzy
-msgid "End date: "
-msgstr "Dyddiad gorffen:"
-
-#: koeditorgeneralevent.cpp:416 koeditorgeneralevent.cpp:430
-#: printing/calprintdefaultplugins.cpp:147
-msgid "Duration: "
-msgstr "Hyd:"
+msgid "Store attachment inline"
+msgstr "Atodia&dau"
 
-#: printing/calprintdefaultplugins.cpp:150
-#, fuzzy, c-format
-msgid ""
-"_n: 1 hour \n"
-"%n hours "
+#: koeditorattachments.cpp:207
+msgid "Store the attachment file inside the calendar"
 msgstr ""
-"1 awr\n"
-"%n o awriau"
 
-#: printing/calprintdefaultplugins.cpp:153
-#, fuzzy, c-format
+#: koeditorattachments.cpp:210
 msgid ""
-"_n: 1 minute \n"
-"%n minutes "
+"Checking this option will cause the attachment to be stored inside your "
+"calendar, which can take a lot of space depending on the size of the "
+"attachment. If this option is not checked, then only a link pointing to the "
+"attachment will be stored.  Do not use a link for attachments that change often "
+"or may be moved (or removed) from their current location."
 msgstr ""
-"1 munud\n"
-"%n o funudau"
 
-#: printing/calprintdefaultplugins.cpp:156
-#, fuzzy
-msgid "No end date"
-msgstr "&Heb ddyddiad gorffen"
-
-#: printing/calprintdefaultplugins.cpp:173
-#, fuzzy
-msgid "Due date: "
-msgstr "Dyddiad Disgwyliedig"
-
-#: printing/calprintdefaultplugins.cpp:176
-#, fuzzy
-msgid "No due date"
-msgstr "Dyddiad Disgwyliedig"
-
-#: printing/calprintdefaultplugins.cpp:288
-#, fuzzy
-msgid "Repeats: "
-msgstr "Ail-adrodd"
-
-#: printing/calprintdefaultplugins.cpp:294
-#, fuzzy
-msgid "No reminders"
-msgstr "Atgof"
+#: koeditorattachments.cpp:221
+msgid "Provide a location for the attachment file"
+msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:297
-#, fuzzy, c-format
+#: koeditorattachments.cpp:224
 msgid ""
-"_n: Reminder: \n"
-"%n reminders: "
+"Enter the path to the attachment file or use the file browser by pressing the "
+"adjacent button"
 msgstr ""
-"1 munud\n"
-"%n o funudau"
 
-#: printing/calprintdefaultplugins.cpp:340
-#: printing/calprintdefaultplugins.cpp:475
-msgid ""
-"_: Spacer for the joined list of categories\n"
-", "
+#: koeditorattachments.cpp:234
+msgid "Size:"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:347
+#: koeditorattachments.cpp:258
 #, fuzzy
-msgid "Organizer: "
-msgstr "Trefnydd: %1"
-
-#: printing/calprintdefaultplugins.cpp:357
-msgid "Location: "
-msgstr "Lleoliad:"
+msgid "New attachment"
+msgstr "Ychwanegu Atodiad"
 
-#: printing/calprintdefaultplugins.cpp:392
+#: koeditorattachments.cpp:457
 #, fuzzy
-msgid "Description:"
-msgstr "&Disgrifiad"
-
-#: printing/calprintdefaultplugins.cpp:398
-msgid "Notes:"
-msgstr ""
+msgid "Attachments:"
+msgstr "Atodia&dau"
 
-#: printing/calprintdefaultplugins.cpp:408
-msgid "Subitems:"
+#: koeditorattachments.cpp:462
+msgid ""
+"Displays a list of current items (files, mail, etc.) that have been associated "
+"with this event or to-do. "
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:426
+#: koeditorattachments.cpp:474
 #, fuzzy
-msgid "No Attendees"
-msgstr "Cy&farfotwyr"
+msgid "Add an attachment"
+msgstr "Ychwanegu Atodiad"
 
-#: printing/calprintdefaultplugins.cpp:428
-#, fuzzy, c-format
+#: koeditorattachments.cpp:476
 msgid ""
-"_n: 1 Attendee:\n"
-"%n Attendees:"
+"Shows a dialog used to select an attachment to add to this event or to-do as "
+"link or as inline data."
 msgstr ""
-"1 munud\n"
-"%n o funudau"
 
-#: printing/calprintdefaultplugins.cpp:435
+#: koeditorattachments.cpp:486
 msgid ""
-"_: Formatting of an attendee: 'Name (Role): Status', e.g. 'Reinhold Kainhofer "
-"<reinhold@kainhofer.com> (Participant): Awaiting Response'\n"
-"%1 (%2): %3"
-msgstr ""
-
-#: printing/calprintdefaultplugins.cpp:439
-#, fuzzy
-msgid "Attendees:"
-msgstr "Cyfarfotwyr"
-
-#: printing/calprintdefaultplugins.cpp:446
-#, fuzzy, c-format
-msgid "Status: %1"
-msgstr "Cychwyn: %1"
-
-#: printing/calprintdefaultplugins.cpp:450
-#, fuzzy, c-format
-msgid "Secrecy: %1"
-msgstr "Crynodeb: %1"
-
-#: printing/calprintdefaultplugins.cpp:456
-msgid "Show as: Busy"
-msgstr ""
-
-#: printing/calprintdefaultplugins.cpp:458
-msgid "Show as: Free"
-msgstr ""
-
-#: printing/calprintdefaultplugins.cpp:464
-msgid "This task is overdue!"
+"Removes the attachment selected in the list above from this event or to-do."
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:470
-msgid "Settings: "
+#: koeditorattachments.cpp:585
+msgid "&Link here"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:474
-#, fuzzy
-msgid "Categories: "
-msgstr "Categorïau"
-
-#: printing/calprintdefaultplugins.cpp:741
-#, fuzzy
-msgid ""
-"_: date from-to\n"
-"%1 - %2"
-msgstr "%1 - %2"
-
-#: printing/calprintdefaultplugins.cpp:743
+#: koeditorattachments.cpp:593 koeditorattachments.cpp:596
 #, fuzzy
-msgid ""
-"_: date from-\n"
-"to\n"
-"%1 -\n"
-"%2"
-msgstr "%1 - %2"
+msgid "&Copy Here"
+msgstr "&Copïo I"
 
-#: printing/calprintdefaultplugins.cpp:760
+#: koeditorattachments.cpp:721
 #, fuzzy
-msgid ""
-"_: date from - to (week number)\n"
-"%1 - %2 (Week %3)"
-msgstr "%1 - %2"
+msgid "<qt>Do you really want to remove these attachments?<p>%1</qt>"
+msgstr "<qt>A ydych yn wir eisiau dileu'r adnodd? <b>%1</b>?</qt>"
 
-#: printing/calprintdefaultplugins.cpp:762
+#: koeditorattachments.cpp:722
 #, fuzzy
-msgid ""
-"_: date from -\n"
-"to (week number)\n"
-"%1 -\n"
-"%2 (Week %3)"
-msgstr "%1 - %2"
+msgid "Remove Attachment?"
+msgstr "Atodia&dau"
 
-#: printing/calprintdefaultplugins.cpp:1005
-msgid "Due Date"
-msgstr "Dyddiad Disgwyliedig"
+#: koagendaitem.cpp:565
+msgid "Attendee \"%1\" added to the calendar item \"%2\""
+msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:1007
+#: koagendaitem.cpp:565
 #, fuzzy
-msgid "Percent Complete"
-msgstr "Cyflawn"
-
-#: printing/calprintdefaultplugins.cpp:1013
-msgid "Ascending"
-msgstr "Esgynnol"
-
-#: printing/calprintdefaultplugins.cpp:1014
-msgid "Descending"
-msgstr "Disgynnol"
-
-#: printing/calprintdefaultplugins.cpp:1023
-msgid "To-do list"
-msgstr "Rhestr I'w-Wneud"
-
-#: printing/calprintpluginbase.cpp:135
-msgid "This printing style does not have any configuration options."
-msgstr "Nid oes dewisiadau ffurfweddu gan yr arddull argraffu yma."
+msgid "Attendee added"
+msgstr "Cyfarfotwyr"
 
-#: printing/calprintpluginbase.cpp:887
-msgid ""
-"_: weekday month date\n"
-"%1 %2 %3"
-msgstr "%1 %2 %3"
+#: koagendaitem.cpp:841 koagendaitem.cpp:939
+msgid "%1 - %2"
+msgstr "%1 - %2"
 
-#: printing/calprintpluginbase.cpp:949
+#: koagendaitem.cpp:850
 #, c-format
-msgid "To-do: %1"
-msgstr "I'w-Wneud: %1"
+msgid "- %1"
+msgstr "- %1"
 
-#: printing/calprintpluginbase.cpp:1495
-msgid "%1%"
-msgstr "%1%"
+#: kowhatsnextview.cpp:101
+msgid "What's Next?"
+msgstr "Beth sydd nesaf?"
 
-#: printing/calprintpluginbase.cpp:1599
+#: kowhatsnextview.cpp:108
 msgid ""
-"_: Description - date\n"
+"_: Date from - to\n"
 "%1 - %2"
 msgstr "%1 - %2"
 
-#: printing/calprintpluginbase.cpp:1620
-#, fuzzy, c-format
-msgid "Person: %1"
-msgstr "Yn Ail-ddigwydd: %1"
-
-#: printing/calprintpluginbase.cpp:1621
-#, c-format
-msgid "%1"
-msgstr "%1"
-
-#: printing/calprintpluginbase.cpp:1639
-msgid ""
-"_: Date range: Month dayStart - dayEnd\n"
-"%1 %2 - %3"
-msgstr ""
-
-#: printing/calprintpluginbase.cpp:1644
-msgid ""
-"_: Date range: monthStart dayStart - monthEnd dayEnd\n"
-"%1 %2 - %3 %4"
-msgstr ""
-
-#: printing/cellitem.cpp:36
-msgid "<undefined>"
-msgstr "<anniffinir>"
-
-#: printing/calprintdefaultplugins.h:45
-#, fuzzy
-msgid "Print &incidence"
-msgstr "Golygu Amlder"
-
-#: printing/calprintdefaultplugins.h:46
-#, fuzzy
-msgid "Prints an incidence on one page"
-msgstr "Argraffu pob digwyddiad wythnos sengl ar un dudalen"
-
-#: printing/calprintdefaultplugins.h:85
-msgid "Print da&y"
-msgstr "Argraffu& diwrnod"
-
-#: printing/calprintdefaultplugins.h:86
-msgid "Prints all events of a single day on one page"
-msgstr "Argraffu pob digwyddiad diwrnod sengl ar un dudalen"
-
-#: printing/calprintdefaultplugins.h:110
-msgid "Print &week"
-msgstr "Argraf&fu wythnos"
-
-#: printing/calprintdefaultplugins.h:111
-msgid "Prints all events of one week on one page"
-msgstr "Argraffu pob digwyddiad wythnos sengl ar un dudalen"
-
-#: printing/calprintdefaultplugins.h:139
-msgid "Print mont&h"
-msgstr "Argraffu m&is"
+#: kowhatsnextview.cpp:124
+msgid "Events:"
+msgstr "Digwyddiadau:"
 
-#: printing/calprintdefaultplugins.h:140
-msgid "Prints all events of one month on one page"
-msgstr "Argraffu pob digwyddiad mis sengl ar un dudalen"
+#: kowhatsnextview.cpp:160
+msgid "To-do:"
+msgstr "I'w-Wneud:"
 
-#: printing/calprintdefaultplugins.h:166
-#, fuzzy
-msgid "Print to-&dos"
-msgstr "Argraffu i-wneudau"
+#: kowhatsnextview.cpp:199 kowhatsnextview.cpp:220
+msgid "Events and to-dos that need a reply:"
+msgstr "Digwyddiadau ac I'w-Gwneud sydd angen ateb:"
 
-#: printing/calprintdefaultplugins.h:167
+#: kowhatsnextview.cpp:288
 #, fuzzy
-msgid "Prints all to-dos in a (tree-like) list"
-msgstr "Argraffu i-wneudau mewn rhestr (tebyg i goeden)"
-
-#: koeventeditor.cpp:124 koeventeditor.cpp:149
 msgid ""
-"The General tab allows you to set the most common options for the event."
-msgstr ""
-
-#: koeventeditor.cpp:138 kotodoeditor.cpp:109
-msgid "Details"
-msgstr "Manylion"
-
-#: koeventeditor.cpp:179 kotodoeditor.cpp:148
-msgid "Rec&urrence"
-msgstr "Ail-dd&igwydd"
-
-#: koeventeditor.cpp:182
-msgid ""
-"The Recurrence tab allows you to set options on how often this event recurs."
-msgstr ""
-
-#: koeventeditor.cpp:199
-msgid ""
-"The Free/Busy tab allows you to see whether other attendees are free or busy "
-"during your event."
-msgstr ""
-
-#: koeventeditor.cpp:219
-msgid "Edit Event"
-msgstr "Golygu Digwyddiad"
-
-#: koeventeditor.cpp:227
-msgid "New Event"
-msgstr "Digwyddiad Newydd"
-
-#: koeventeditor.cpp:285
-msgid ""
-"You didn't change the event, thus no counter proposal has been sent to the "
-"organizer."
-msgstr ""
-
-#: koeventeditor.cpp:285
-#, fuzzy
-msgid "No changes"
-msgstr "Ategyn Exchange"
-
-#: koeventeditor.cpp:295
-#, c-format
-msgid "My counter proposal for: %1"
-msgstr ""
-
-#: koeventeditor.cpp:390
-msgid "Template does not contain a valid event."
-msgstr "Nid yw'r patrymlun yn cynnwys digwyddiad dilys."
-
-#: timezone.cpp:39
-msgid "KOrganizer Timezone Test"
-msgstr "Prawf Amserfa KTrefnydd"
-
-#: kotodoeditor.cpp:173
-msgid "Edit To-do"
-msgstr "Golygu I'w-Wneud"
-
-#: kotodoeditor.cpp:182
-msgid "New To-do"
-msgstr "I'w-Wneud newydd..."
+"_: date, from - to\n"
+"%1, %2 - %3"
+msgstr "%1 - %2"
 
-#: kotodoeditor.cpp:343
+#: kowhatsnextview.cpp:316
 #, fuzzy
-msgid "Template does not contain a valid to-do."
-msgstr "Nid yw'r patrymlun '%1' yn cynnwys i-wneud dilys."
-
-#: stdcalendar.cpp:74
-msgid "Active Calendar"
-msgstr "Calendr Weithredol"
+msgid "  (Due: %1)"
+msgstr "Disgwyliedig:"
 
-#: stdcalendar.cpp:83
-#, fuzzy
-msgid "Default Calendar"
-msgstr "Fformat Calendr Rhagosodedig"
+#: navigatorbar.cpp:75
+msgid "Previous year"
+msgstr "Blwyddyn Cynt"
 
-#: stdcalendar.cpp:98
-#, fuzzy
-msgid "Birthdays"
-msgstr "Penblwydd"
+#: navigatorbar.cpp:81
+msgid "Previous month"
+msgstr "Mis Cynt"
 
-#: statusdialog.cpp:41
-msgid "Set Your Status"
-msgstr "Gosod Eich Cyflwr"
+#: navigatorbar.cpp:88
+msgid "Next month"
+msgstr "Mis Nesaf"
 
-#: statusdialog.cpp:49
-msgid "Set your status"
-msgstr "Gosod eich cyflwr"
+#: navigatorbar.cpp:94
+msgid "Next year"
+msgstr "Blwyddyn Nesaf"
 
-#: kotodoviewitem.cpp:125
-msgid "--"
-msgstr ""
+#: navigatorbar.cpp:101
+msgid "Select a month"
+msgstr "Dewiswch mis"
 
-#: korganizer_options.h:35
+#: navigatorbar.cpp:108
 #, fuzzy
-msgid "Import the given calendars as new resources into the default calendar"
-msgstr "Mewnforio'r calendr wrth <url> i mewn i'r calendr rhagosod"
-
-#: korganizer_options.h:37
-msgid ""
-"Merge the given calendars into the standard calendar (i.e. copy the events)"
-msgstr ""
-
-#: korganizer_options.h:39
-msgid "Open the given calendars in a new window"
-msgstr ""
+msgid "Select a year"
+msgstr "Dewiswch mis"
 
-#: korganizer_options.h:40
+#: navigatorbar.cpp:177
+#, fuzzy, c-format
 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 ""
-
-#: koeditorgeneralevent.cpp:104
-msgid "Sets options related to the date and time of the event or to-do."
-msgstr ""
-
-#: koeditorgeneralevent.cpp:114
-msgid "&Start:"
-msgstr "&Dechrau:"
-
-#: koeditorgeneralevent.cpp:125
-msgid "&End:"
-msgstr "&Gorffen:"
-
-#: koeditorgeneralevent.cpp:135
-#, fuzzy
-msgid "All-&day"
-msgstr "Dydd"
-
-#: koeditorgeneralevent.cpp:163
-#, fuzzy
-msgid "Reminder:"
-msgstr "&Atgof:"
-
-#: koeditorgeneralevent.cpp:183
-msgid "S&how time as:"
-msgstr "&Dangos amser fel:"
-
-#: koeditorgeneralevent.cpp:184
-msgid "Sets how this time will appear on your Free/Busy information."
-msgstr ""
-
-#: koeditorgeneralevent.cpp:191
-msgid "Busy"
-msgstr "Prysur"
-
-#: koeditorgeneralevent.cpp:192
-msgid "Free"
-msgstr "Rhydd"
-
-#: koeditorgeneralevent.cpp:206
-msgid "You have not yet definitely responded to this invitation."
-msgstr ""
+"_: monthname\n"
+"%1"
+msgstr "%1 %2"
 
-#: koeditorgeneralevent.cpp:417
+#: navigatorbar.cpp:178
 #, c-format
 msgid ""
-"_n: 1 Day\n"
-"%n Days"
-msgstr ""
-"1 Diwrnod\n"
-"%n o Ddiwrnodau"
-
-#: koeditorgeneralevent.cpp:436
-msgid ", "
-msgstr ","
-
-#: koeditorgeneralevent.cpp:447
-msgid ""
-"Shows the duration of the event or to-do with the current start and end dates "
-"and times."
+"_: 4 digit year\n"
+"%1"
 msgstr ""
 
-#: koeditorgeneralevent.cpp:464
-msgid "From: %1   To: %2   %3"
-msgstr "O: %1 I: %2 %3"
-
-#: koeditorgeneralevent.cpp:477
-msgid "Please specify a valid start time, for example '%1'."
-msgstr "Rhowch amser dechrau dilys, er engrhaifft '%1'."
+#: publishdialog.cpp:43
+msgid "Select Addresses"
+msgstr "Dewis Cyfeiriad"
 
-#: koeditorgeneralevent.cpp:484
-msgid "Please specify a valid end time, for example '%1'."
-msgstr "Rhowch amser diwedd dilys, er engrhaifft '%1'."
+#: publishdialog.cpp:101
+msgid "(EmptyName)"
+msgstr "(EnwGwag)"
 
-#: koeditorgeneralevent.cpp:492
-msgid "Please specify a valid start date, for example '%1'."
-msgstr "Rhowch ddyddiad dechrau dilys, er engrhaifft '%1'."
+#: kotodoview.cpp:216
+#, fuzzy
+msgid "Cannot move to-do to itself or a child of itself."
+msgstr "Methu symyd I'w-Wneud i'w hun, neu i un o'i blant"
 
-#: koeditorgeneralevent.cpp:499
-msgid "Please specify a valid end date, for example '%1'."
-msgstr "Rhowch ddyddiad diwedd cywir, er engrhaifft '%1'."
+#: kotodoview.cpp:217
+msgid "Drop To-do"
+msgstr "Gwaredu I'w-Wneud"
 
-#: koeditorgeneralevent.cpp:513
-msgid ""
-"The event ends before it starts.\n"
-"Please correct dates and times."
+#: kotodoview.cpp:230
+msgid "Unable to change to-do's parent, because the to-do cannot be locked."
 msgstr ""
-"Mae'r digwyddiad yn gorffen cyn iddo ddechrau.\n"
-" Cywirwch y dyddiadau ac amserau."
-
-#: koeventviewerdialog.cpp:33
-msgid "Event Viewer"
-msgstr "Gwelydd Digwyddiadau"
-
-#: archivedialog.cpp:55
-#, fuzzy
-msgid "Archive/Delete Past Events and To-dos"
-msgstr "Archifio/Dileu Hen Gyfarfodydd"
 
-#: archivedialog.cpp:57
-msgid "&Archive"
-msgstr "&Archifio"
-
-#: archivedialog.cpp:66
-#, fuzzy
+#: kotodoview.cpp:278
 msgid ""
-"Archiving saves old items into the given file and then deletes them in the "
-"current calendar. If the archive file already exists they will be added. (<a "
-"href=\"whatsthis:In order to add an archive to your calendar, use the "
-"&quot;Merge Calendar&quot; function. You can view an archive by opening it in "
-"KOrganizer like any other calendar. It is not saved in a special format, but as "
-"vCalendar.\">How to restore</a>)"
+"Unable to add attendees to the to-do, because the to-do cannot be locked."
 msgstr ""
-"Mae archifio yn cadw hen apwyntiadau i mewn i'r ffeil penodol ac wedyn eu dileu "
-"yn y calendr cyfredol.  Os mae'r ffeil archifio mewn bod yn barod, ychwanegir.  "
-"(<a href=\"whatsthis: Er mwyn ychwnaegu archif i'ch calendr, defnyddiwch y "
-"swyddogaeth &quot;Cyfuno calendr&quot;.  Gallwch weld archif drwy ei agor yn "
-"KTrefnydd fel pob un calendr arall.  Ni chedwir mewn fformat arbennig, ond fel "
-"vCalendar.\">Sut i adfer</a>)"
 
-#: archivedialog.cpp:82
+#: kotodoview.cpp:368
 #, fuzzy
-msgid "Archive now items older than:"
-msgstr "&Cyfarfodydd hyn na:"
+msgid "To-dos:"
+msgstr "I'w-Wneud:"
 
-#: archivedialog.cpp:87
+#: kotodoview.cpp:372
 #, fuzzy
-msgid ""
-"The date before which items should be archived. All older events and to-dos "
-"will be saved and deleted, the newer (and events exactly on that date) will be "
-"kept."
-msgstr ""
-"Oed yr apwyntiadau i'w archifo.  Cedwir a dileuir pob apwyntiad hyn, gadewir y "
-"rhai newyddach."
+msgid "Click to add a new to-do"
+msgstr "Cliciwch i ychwanegu I-Wneud newydd"
 
-#: archivedialog.cpp:96
+#: kotodoview.cpp:392
 #, fuzzy
-msgid "Automaticall&y archive items older than:"
-msgstr "&Cyfarfodydd hyn na:"
+msgid "Due Date/Time"
+msgstr "Amser Disgwyledig"
 
-#: archivedialog.cpp:99
-msgid ""
-"If this feature is enabled, KOrganizer will regularly check if events and "
-"to-dos have to be archived; this means you will not need to use this dialog box "
-"again, except to change the settings."
-msgstr ""
+#: kotodoview.cpp:397
+msgid "Sort Id"
+msgstr "Trefnu ID"
 
-#: archivedialog.cpp:107
-#, fuzzy
+#: kotodoview.cpp:417
 msgid ""
-"The age of the events and to-dos to archive. All older items will be saved and "
-"deleted, the newer will be kept."
+"_: Unspecified priority\n"
+"unspecified"
 msgstr ""
-"Oed yr apwyntiadau i'w archifo.  Cedwir a dileuir pob apwyntiad hyn, gadewir y "
-"rhai newyddach."
-
-#: archivedialog.cpp:112
-msgid "Day(s)"
-msgstr "Diwrnod(au)"
 
-#: archivedialog.cpp:113
-msgid "Week(s)"
-msgstr "Wythnos(au)"
-
-#: archivedialog.cpp:114
-msgid "Month(s)"
-msgstr "Mis(oedd)"
-
-#: archivedialog.cpp:119
-msgid "Archive &file:"
-msgstr "Ffeil A&rchif:"
-
-#: archivedialog.cpp:123
+#: kotodoview.cpp:468
 #, fuzzy
-msgid "*.ics|iCalendar Files"
-msgstr "*.vcs|Ffeiliau vCalendr"
+msgid "&Make this To-do Independent"
+msgstr "&Gwneud Is-I'w-Wneud yn Annibynnol"
 
-#: archivedialog.cpp:125
+#: kotodoview.cpp:470
 #, fuzzy
-msgid ""
-"The path of the archive. The events and to-dos will be added to the archive "
-"file, so any events that are already in the file will not be modified or "
-"deleted. You can later load or merge the file like any other calendar. It is "
-"not saved in a special format, it uses the iCalendar format. "
-msgstr ""
-"Llwybr yr archif.  Ychwanegir yr apwyntiadau i'r ffeil archif, er mwyn peidio "
-"ac addasu neu dileu unrhyw apwyntiad sydd yn y ffeil yn barod.  Yn nes ymlaen, "
-"gallwch lwytho neu gyfuno'r ffeil fel unrhyw calendr arall.   Ni chedwir mewn "
-"fformat arbennig, mae'n defnyddio'r fformat vCalendar."
-
-#: archivedialog.cpp:134
-msgid "Type of Items to Archive"
-msgstr ""
+msgid "Make all Sub-to-dos &Independent"
+msgstr "Gwneud Is-I'w-Wneud yn Annibynnol"
 
-#: archivedialog.cpp:139
-msgid ""
-"Here you can select which items should be archived. Events are archived if they "
-"ended before the date given above; to-dos are archived if they were finished "
-"before the date."
-msgstr ""
+#: kotodoview.cpp:473
+msgid "&Copy To"
+msgstr "&Copïo I"
 
-#: archivedialog.cpp:144
-msgid "&Delete only, do not save"
-msgstr "&Dileu yn unig, heb gadw"
+#: kotodoview.cpp:474
+msgid "&Move To"
+msgstr "&Symud I"
 
-#: archivedialog.cpp:147
-#, fuzzy
+#: kotodoview.cpp:476
 msgid ""
-"Select this option to delete old events and to-dos without saving them. It is "
-"not possible to recover the events later."
-msgstr ""
-"Dewis y dewisiad yma i ddileu hen apwyntiadau heb eu cadw.  Ni ellir adfer yr "
-"apwyntiadau wedyn."
+"_: delete completed to-dos\n"
+"Pur&ge Completed"
+msgstr "&Carthiad wedi'i Gwblhau"
 
-#: archivedialog.cpp:211
-msgid ""
-"The archive file name is not valid.\n"
-msgstr ""
-"Nid yw enw'r ffeil archif yn ddilys.\n"
+#: kotodoview.cpp:485
+msgid "&New To-do..."
+msgstr "&I'w-Wneud newydd..."
 
-#: komonthview.cpp:349
+#: kotodoview.cpp:487
 msgid ""
-"_: 'Month day' for month view cells\n"
-"%1 %2"
-msgstr "%1 %2"
+"_: delete completed to-dos\n"
+"&Purge Completed"
+msgstr "&Carthiad wedi'i Gwblhau"
 
-#: koeditorgeneraljournal.cpp:62
+#: previewdialog.cpp:54
 #, fuzzy
-msgid "Sets the title of this journal."
-msgstr "Dileu Hen Ddigwyddiadau"
-
-#: koeditorgeneraljournal.cpp:82
-msgid "&Date:"
-msgstr "&Dyddiad:"
+msgid "&Merge into existing calendar"
+msgstr "Calendr '%1' wedi ei gyfuno."
 
-#: koeditorgeneraljournal.cpp:91
-msgid "&Time: "
-msgstr "&Amser: "
+#: previewdialog.cpp:73
+#, fuzzy
+msgid "&Add as new calendar..."
+msgstr "Calendr Newydd"
 
-#: koeditorgeneraljournal.cpp:197
+#: previewdialog.cpp:75
 #, fuzzy
-msgid "Please specify a valid date, for example '%1'."
-msgstr "Rhowch ddyddiad diwedd cywir, er engrhaifft '%1'."
+msgid "&Add as new calendar"
+msgstr "Calendr Newydd"
 
-#: korgplugins.cpp:37
-msgid "KOrgPlugins"
-msgstr "KOrgPlugins"
+#: previewdialog.cpp:141
+#, fuzzy
+msgid "Select path for new calendar"
+msgstr "Calendr Newydd"
 
 #: templatemanagementdialog.cpp:50
 #, fuzzy
@@ -6174,876 +7366,488 @@ msgstr "Dewisiwch Enw Patrymlun"
 msgid "Overwrite"
 msgstr "Dros-ysgrifennu"
 
-#: tips.cpp:3
-#, fuzzy
+#: incidencechanger.cpp:74
 msgid ""
-"<p>...that you can synchronize your calendar data with the data on a Palm Pilot "
-"by using <a href=\"http://www.slac.com/pilone/kpilot_home\">KPilot</a>?\n"
-"</p>\n"
+"Some attendees were removed from the incidence. Shall cancel messages be sent "
+"to these attendees?"
 msgstr ""
-"<p>...y gallwch gydamseru eich data calendr efo'r data ar Palm Pilot\n"
-" gan ddefnyddio <a href=\"http://www.slac.com/pilone/kpilot_home\">KPilot</a>?\n"
 
-#: tips.cpp:9
-msgid ""
-"<p>...that it is possible to show the current time in the calendar? Enable the "
-"current time line in the dialog which appears after selecting <b>Settings</b>"
-", <b>Configure KOrganizer...</b> from the menu bar.\n"
-"</p>\n"
-msgstr ""
+#: incidencechanger.cpp:76
+#, fuzzy
+msgid "Attendees Removed"
+msgstr "Cyfarfotwyr"
 
-#: tips.cpp:15
-msgid ""
-"<p>...that KOrganizer supports Microsoft Exchange? Add the <b>"
-"Microsoft&reg; Exchange 2000 resource</b> using the <b>Resource View</b> "
-"from the KOrganizer sidebar.\n"
-"</p>\n"
-msgstr ""
+#: incidencechanger.cpp:76
+msgid "Send Messages"
+msgstr "Anfon Negeseuon"
 
-#: tips.cpp:21
+#: incidencechanger.cpp:388
 #, fuzzy
-msgid ""
-"<p>...that you can select whether the week starts on Monday or on Sunday in the "
-"Trinity Control Center? KOrganizer uses this setting. Look at Regional & "
-"Accessibility->Country/Region & Languages in the Trinity Control Center, or select "
-"<b>Settings</b>,\n"
-"<b>Configure Date & Time...</b> from the menu bar. Select the Time & Dates "
-"tab.\n"
-"</p>\n"
-msgstr ""
-"<p>...y gallwch ddewis a ddylai'r wythnos ddechrau ar ddydd Llun neu ddydd Sul "
-"yn y Ganolfan Reoli TDE?\n"
-" Mae kTrefnydd yn defnyddio'r gosodiad yma.  Ewch i Personoleiddio -> Gwlad &\n"
-" Ieithoedd, ar y Tab Amser & Dyddiadau.\n"
+msgid "No calendars found, unable to save %1 \"%2\"."
+msgstr "Methu cadw'r digwyddiad."
 
-#: tips.cpp:28
-msgid ""
-"<p>...that you can edit to-dos quickly by right clicking on the property you "
-"wish to change; like the priority, the category or the date?\n"
-"</p>\n"
-msgstr ""
+#: incidencechanger.cpp:439 kodialogmanager.cpp:113
+#, fuzzy
+msgid "Unable to save %1 \"%2\"."
+msgstr "Methu cadw'r digwyddiad."
 
-#: tips.cpp:34
-msgid ""
-"<p>...that you can view and edit a calendar from the shell with "
-"konsolekalendar? Run <b>konsolekalendar --help</b> for the available options.\n"
-"</p>\n"
-msgstr ""
+#: incidencechanger.cpp:443
+#, fuzzy
+msgid "Unable to save %1 \"%2\" to calendar %3."
+msgstr "Methu cadw'r digwyddiad."
 
-#: tips.cpp:40
+#: incidencechanger.cpp:461
 msgid ""
-"<p>...that you can import birthdays from your address book? There is a resource "
-"available which connects the birthdays to your calendar; it is even possible to "
-"set a reminder for each event.\n"
-"</p>\n"
+"Attempt to send the scheduling message failed. Please check your Group "
+"Scheduling settings. Contact your system administrator for more help."
 msgstr ""
 
-#: tips.cpp:46
+#: kojournaleditor.cpp:47
 #, fuzzy
-msgid ""
-"<p>...that you can store your calendar on an FTP server? Use the standard file "
-"dialog to save the calendar to a URL like "
-"<b>ftp://username@ftpserver/filename</b>. You can make your calendar active and "
-"load and save it as if it were local, or add it permanently to your resources "
-"list, using the remote file resource. Just make sure that no two KOrganizer "
-"applications are working on the same file, at the same time.\n"
-"</p>\n"
-msgstr ""
-"<p>...y gallwch storio eich calendr ar weinydd FTP? Defnyddiwch yr ymgom\n"
-" ffeil safonol i gadw'r calendr i  URL fel  "
-"<b>ftp://enw-defnyddiwr@gweinydd-ftp/enw-ffeil</b>.\n"
-" Gallwch wneud eich calendr yn weithredol, a'i llwytho a'i gadw, fel petae yn "
-"leol.\n"
-" Ond sicrhewch nad ydy dau gymhwysiant KTrefnydd yn gweithio ar yr un ffeil\n"
-" wrth yr un amser.\n"
+msgid "Edit Journal Entry"
+msgstr "&Dyddlyfr"
 
-#: tips.cpp:52
+#: kojournaleditor.cpp:201
 #, fuzzy
-msgid ""
-"<p>...that you can create hierarchical to-dos by clicking with the right mouse "
-"button on an existing to-do and selecting <b>New Sub-to-do</b> "
-"from the context menu?\n"
-"</p>\n"
-msgstr ""
-"<p>...y gallwch greu I'w-Wneudau hierarchaidd gan glicio efo\n"
-" botwm dde'r lygoden ar I'w-Wneud sy'n bodoli a dewis <b>Is-I'w-Wneud Newydd</b> "
-"oddiar y ddewislen cyd-destun?\n"
+msgid "This journal entry will be permanently deleted."
+msgstr "My fydd yr eitem hyn yn cael ei ddileu am byth."
 
-#: tips.cpp:58
-msgid ""
-"<p>...that a color can be assigned to each category? Events with a certain "
-"category will be shown in that color. You can assign these in the section <b>"
-"Colors</b> within the dialog which appears after selecting <b>Settings</b>, <b>"
-"Configure KOrganizer...</b> from the menu bar.\n"
-"</p>\n"
-msgstr ""
+#: kojournaleditor.cpp:217
+#, fuzzy
+msgid "Template does not contain a valid journal."
+msgstr "Nid yw'r patrymlun '%1' yn cynnwys i-wneud dilys."
 
-#: tips.cpp:64
-msgid ""
-"<p>...that you can view and edit a calendar with Konqueror? Just click on the "
-"calendar file to make Konqueror open it.\n"
-"</p>\n"
+#: koagenda.cpp:946
+msgid "Unable to lock item for modification. You cannot make any changes."
 msgstr ""
 
-#: tips.cpp:70
+#: koagenda.cpp:948
+#, fuzzy
+msgid "Locking Failed"
+msgstr "Methodd y gosod."
+
+#: freebusymanager.cpp:236
 msgid ""
-"<p>...that it is possible to add an attachment to an event or to-do? To do so, "
-"add a link to the <b>Attachments</b> tab within the <b>Edit Event</b> or <b>"
-"Edit To-do</b> dialog.\n"
-"</p>\n"
+"<qt>No URL configured for uploading your free/busy list. Please set it in "
+"KOrganizer's configuration dialog, on the \"Free/Busy\" page. "
+"<br>Contact your system administrator for the exact URL and the account "
+"details.</qt>"
 msgstr ""
 
-#: tips.cpp:76
-msgid ""
-"<p>...that you can export your calendar to HTML? Select <b>File</b>, <b>"
-"Export</b>, <b>Export Web Page...</b> from the menu bar to open the <b>"
-"Export calendar as web page</b> dialog.\n"
-"</p>\n"
+#: freebusymanager.cpp:240
+msgid "No Free/Busy Upload URL"
 msgstr ""
 
-#: tips.cpp:82
-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"
+#: freebusymanager.cpp:247
+msgid "<qt>The target URL '%1' provided is invalid.</qt>"
 msgstr ""
 
-#: tips.cpp:87
-msgid ""
-"<p>...that you can create a new sub-to-do by pasting a to-do while another one "
-"is selected?\n"
-"</p>\n"
+#: freebusymanager.cpp:248
+msgid "Invalid URL"
 msgstr ""
 
-#: plugins/datenums/datenums.cpp:59
+#: freebusymanager.cpp:352
+#, fuzzy
 msgid ""
-"_: dayOfYear / daysTillEndOfYear\n"
-"%1 / %2"
-msgstr "%1 / %2"
-
-#: plugins/datenums/datenums.cpp:71
-msgid "This plugin provides numbers of days and weeks."
-msgstr "Mae'r ategyn yma yn darparu niferau o ddyddiau ac wythnosau."
+"<qt>The software could not upload your free/busy list to the URL '%1'. There "
+"might be a problem with the access rights, or you specified an incorrect URL. "
+"The system said: <em>%2</em>."
+"<br>Please check the URL or contact your system administrator.</qt>"
+msgstr ""
+"<qt>Ni allodd y feddalwedd lanlwytho eich rhestr rhydd/prysur i'r URL %1.  "
+"Efallai mae problem efo'r hawliau cyrchiad, neu rycych wedi penodi URL "
+"anghywir.  Dywedodd y cysawd: <em>%2</em>."
+"<br>Gwiriwch yr URL neu gysylltwch â'ch gweinyddwr cysawd.</qt>"
 
-#: plugins/datenums/configdialog.cpp:38
-#, fuzzy
-msgid "Configure Day Numbers"
-msgstr "Ffurfweddu Gwyliau"
+#: komailclient.cpp:247
+msgid "No running instance of KMail found."
+msgstr "Nid oes enghraifft o KMail eisioes yn rhedeg."
 
-#: plugins/datenums/configdialog.cpp:45
-#, fuzzy
-msgid "Show Date Number"
-msgstr "Dangos diwrnod Omer"
+#: kotodoeditor.cpp:160
+msgid "Edit To-do"
+msgstr "Golygu I'w-Wneud"
 
-#: plugins/datenums/configdialog.cpp:48
-#, fuzzy
-msgid "Show day number"
-msgstr "Dangos diwrnod Omer"
+#: kotodoeditor.cpp:169
+msgid "New To-do"
+msgstr "I'w-Wneud newydd..."
 
-#: plugins/datenums/configdialog.cpp:49
+#: kotodoeditor.cpp:344
 #, fuzzy
-msgid "Show days to end of year"
-msgstr "Dangos diwrnod Omer"
+msgid "Template does not contain a valid to-do."
+msgstr "Nid yw'r patrymlun '%1' yn cynnwys i-wneud dilys."
 
-#: plugins/datenums/configdialog.cpp:50
+#: kocounterdialog.cpp:36
 #, fuzzy
-msgid "Show both"
-msgstr "Dangos"
-
-#: plugins/projectview/koprojectview.cpp:76
-msgid "Project View"
-msgstr "Golwg Cywaith"
-
-#: plugins/projectview/koprojectview.cpp:80
-#: plugins/timespanview/timespanwidget.cpp:65
-msgid "Zoom In"
-msgstr "Chwyddo"
-
-#: plugins/projectview/koprojectview.cpp:84
-#: plugins/timespanview/timespanwidget.cpp:69
-msgid "Zoom Out"
-msgstr "Pellhau"
+msgid "Counter-Event Viewer"
+msgstr "Gwelydd Gwrth-ddigwyddiadau"
 
-#: plugins/projectview/koprojectview.cpp:88
-msgid "Select Mode"
-msgstr "Sewid Modd"
+#: korganizer.cpp:298
+msgid "New Calendar"
+msgstr "Calendr Newydd"
 
-#: plugins/projectview/koprojectview.cpp:109
-msgid "main task"
-msgstr "prif dasg"
+#: korganizer.cpp:302
+msgid "read-only"
+msgstr "darllen-yn-unig"
 
-#: plugins/projectview/projectview.cpp:55
-msgid "&Project"
-msgstr "&Cywaith"
+#: resourceview.cpp:73
+msgid "My %1 (%2)"
+msgstr ""
 
-#: plugins/projectview/projectview.cpp:65
-msgid "This plugin provides a Gantt diagram as project view."
-msgstr "Mae'r ategyn yma yn darparu diagram Gantt fel golwg cywaith."
+#: resourceview.cpp:75 resourceview.cpp:78
+#, c-format
+msgid "My %1"
+msgstr ""
 
-#: plugins/projectview/projectview.cpp:70
+#: resourceview.cpp:277
 #, fuzzy
-msgid "Project View Plugin"
-msgstr "Golwg Cywaith"
+msgid "Add calendar"
+msgstr "Calendr Newydd"
 
-#: plugins/hebrew/parsha.cpp:33
-#, fuzzy
+#: resourceview.cpp:279
 msgid ""
-"_: 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\n"
-"Bereshit"
-msgstr "Bereshit"
-
-#: plugins/hebrew/parsha.cpp:33
-msgid "Noach"
-msgstr "Noach"
-
-#: plugins/hebrew/parsha.cpp:33
-msgid "Lech L'cha"
-msgstr "Lech L'cha"
-
-#: plugins/hebrew/parsha.cpp:34
-msgid "Vayera"
-msgstr "Vayera"
-
-#: plugins/hebrew/parsha.cpp:34
-msgid "Chaye Sarah"
-msgstr "Chaye Sarah"
-
-#: plugins/hebrew/parsha.cpp:34
-msgid "Toldot"
-msgstr "Toldot"
-
-#: plugins/hebrew/parsha.cpp:35
-msgid "Vayetze"
-msgstr "Vayetze"
-
-#: plugins/hebrew/parsha.cpp:35
-msgid "Vayishlach"
-msgstr "Vayishlach"
-
-#: plugins/hebrew/parsha.cpp:35
-msgid "Vayeshev"
-msgstr "Vayeshev"
-
-#: plugins/hebrew/parsha.cpp:36
-msgid "Miketz"
-msgstr "Miketz"
-
-#: plugins/hebrew/parsha.cpp:36
-msgid "Vayigash"
-msgstr "Vayigash"
-
-#: plugins/hebrew/parsha.cpp:36
-msgid "Vayechi"
-msgstr "Vayechi"
-
-#: plugins/hebrew/parsha.cpp:37
-msgid "Shemot"
-msgstr "Shemot"
-
-#: plugins/hebrew/parsha.cpp:37
-msgid "Vaera"
-msgstr "Vaera"
-
-#: plugins/hebrew/parsha.cpp:37
-msgid "Bo"
-msgstr "Bo"
-
-#: plugins/hebrew/parsha.cpp:37
-msgid "Beshalach"
-msgstr "Beshalach"
-
-#: plugins/hebrew/parsha.cpp:38
-msgid "Yitro"
-msgstr "Yitro"
-
-#: plugins/hebrew/parsha.cpp:38
-msgid "Mishpatim"
-msgstr "Mishpatim"
-
-#: plugins/hebrew/parsha.cpp:38
-msgid "Terumah"
-msgstr "Terumah"
-
-#: plugins/hebrew/parsha.cpp:39
-msgid "Tetzaveh"
-msgstr "Tetzaveh"
-
-#: plugins/hebrew/parsha.cpp:39
-msgid "Ki Tisa"
-msgstr "Ki Tisa"
-
-#: plugins/hebrew/parsha.cpp:39
-msgid "Vayakhel"
-msgstr "Vayakhel"
-
-#: plugins/hebrew/parsha.cpp:40
-msgid "Pekudei"
-msgstr "Pekudei"
-
-#: plugins/hebrew/parsha.cpp:40
-msgid "Vayikra"
-msgstr "Vayikra"
-
-#: plugins/hebrew/parsha.cpp:40
-msgid "Tzav"
-msgstr "Tzav"
-
-#: plugins/hebrew/parsha.cpp:41
-msgid "Shemini"
-msgstr "Shemini"
-
-#: plugins/hebrew/parsha.cpp:41
-msgid "Tazria"
-msgstr "Tazria"
-
-#: plugins/hebrew/parsha.cpp:41
-msgid "Metzora"
-msgstr "Metzora"
-
-#: plugins/hebrew/parsha.cpp:42
-msgid "Acharei Mot"
-msgstr "Acharei Mot"
-
-#: plugins/hebrew/parsha.cpp:42
-msgid "Kedoshim"
-msgstr "Kedoshim"
-
-#: plugins/hebrew/parsha.cpp:42
-msgid "Emor"
-msgstr "Emor"
-
-#: plugins/hebrew/parsha.cpp:43
-msgid "Behar"
-msgstr "Behar"
-
-#: plugins/hebrew/parsha.cpp:43
-msgid "Bechukotai"
-msgstr "Bechukotai"
-
-#: plugins/hebrew/parsha.cpp:43
-msgid "Bemidbar"
-msgstr "Bemidbar"
-
-#: plugins/hebrew/parsha.cpp:44
-msgid "Naso"
-msgstr "Naso"
-
-#: plugins/hebrew/parsha.cpp:44
-msgid "Behaalotcha"
-msgstr "Behaalotcha"
-
-#: plugins/hebrew/parsha.cpp:44
-msgid "Shelach"
-msgstr "Shelach"
-
-#: plugins/hebrew/parsha.cpp:45
-msgid "Korach"
-msgstr "Korach"
-
-#: plugins/hebrew/parsha.cpp:45
-msgid "Chukat"
-msgstr "Chukat"
-
-#: plugins/hebrew/parsha.cpp:45
-msgid "Balak"
-msgstr "Balak"
-
-#: plugins/hebrew/parsha.cpp:46
-msgid "Pinchas"
-msgstr "Pinchas"
-
-#: plugins/hebrew/parsha.cpp:46
-msgid "Matot"
-msgstr "Matot"
-
-#: plugins/hebrew/parsha.cpp:46
-msgid "Masei"
-msgstr "Masei"
-
-#: plugins/hebrew/parsha.cpp:47
-msgid "Devarim"
-msgstr "Devarim"
-
-#: plugins/hebrew/parsha.cpp:47
-msgid "Vaetchanan"
-msgstr "Vaetchanan"
-
-#: plugins/hebrew/parsha.cpp:47
-msgid "Ekev"
-msgstr "Ekev"
-
-#: plugins/hebrew/parsha.cpp:48
-msgid "Reeh"
-msgstr "Reeh"
-
-#: plugins/hebrew/parsha.cpp:48
-msgid "Shoftim"
-msgstr "Shoftim"
-
-#: plugins/hebrew/parsha.cpp:48
-msgid "Ki Tetze"
-msgstr "Ki Tetze"
-
-#: plugins/hebrew/parsha.cpp:49
-msgid "Ki Tavo"
-msgstr "Ki Tavo"
-
-#: plugins/hebrew/parsha.cpp:49
-msgid "Nitzavim"
-msgstr "Nitzavim"
-
-#: plugins/hebrew/parsha.cpp:49
-msgid "Vayelech"
-msgstr "Vayelech"
+"<qt>"
+"<p>Press this button to add a resource to KOrganizer.</p>"
+"<p>Events, journal entries and to-dos are retrieved and stored on resources. "
+"Available resources include groupware servers, local files, journal entries as "
+"blogs on a server, etc... </p>"
+"<p>If you have more than one active resource, when creating incidents you will "
+"either automatically use the default resource or be prompted to select the "
+"resource to use.</p></qt>"
+msgstr ""
 
-#: plugins/hebrew/parsha.cpp:50
-msgid "Haazinu"
-msgstr "Haazinu"
+#: resourceview.cpp:292
+#, fuzzy
+msgid "Edit calendar settings"
+msgstr "Golygu Hidlennau Calendr"
 
-#: plugins/hebrew/holiday.cpp:63
+#: resourceview.cpp:294
 msgid ""
-"_: 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\n"
-"Sh. HaHodesh"
-msgstr "Sh. HaHodesh"
-
-#: plugins/hebrew/holiday.cpp:69
-msgid "Erev Pesach"
-msgstr "Erev Pesach"
-
-#: plugins/hebrew/holiday.cpp:79
-msgid "Sh. HaGadol"
-msgstr "Sh. HaGadol"
-
-#: plugins/hebrew/holiday.cpp:87
-msgid "Pesach"
-msgstr "Pesach"
-
-#: plugins/hebrew/holiday.cpp:98 plugins/hebrew/holiday.cpp:262
-msgid "Chol Hamoed"
-msgstr "Chol Hamoed"
-
-#: plugins/hebrew/holiday.cpp:103
-msgid "Yom HaShoah"
-msgstr "Yom HaShoah"
-
-#: plugins/hebrew/holiday.cpp:127 plugins/hebrew/holiday.cpp:133
-#: plugins/hebrew/holiday.cpp:144
-msgid "Yom HaAtzmaut"
-msgstr "Yom HaAtzmaut"
-
-#: plugins/hebrew/holiday.cpp:129 plugins/hebrew/holiday.cpp:142
-msgid "Yom HaZikaron"
-msgstr "Yom HaZikaron"
-
-#: plugins/hebrew/holiday.cpp:151
-msgid "Yom Yerushalayim"
-msgstr "Yom Yerushalayim"
-
-#: plugins/hebrew/holiday.cpp:154
-msgid "Lag BaOmer"
-msgstr "Lag BaOmer"
-
-#: plugins/hebrew/holiday.cpp:179
-msgid "Erev Shavuot"
-msgstr "Erev Shavuot"
-
-#: plugins/hebrew/holiday.cpp:184
-msgid "Shavuot"
-msgstr "Shavuot"
-
-#: plugins/hebrew/holiday.cpp:193
-msgid "Tzom Tammuz"
-msgstr "Tzom Tammuz"
-
-#: plugins/hebrew/holiday.cpp:200
-msgid "Sh. Hazon"
-msgstr "Sh. Hazon"
-
-#: plugins/hebrew/holiday.cpp:202
-msgid "Sh. Nahamu"
-msgstr "Sh. Nahamu"
-
-#: plugins/hebrew/holiday.cpp:206
-msgid "Tisha B'Av"
-msgstr "Tisha B'Av"
-
-#: plugins/hebrew/holiday.cpp:211
-msgid "S'lichot"
-msgstr "S'lichot"
-
-#: plugins/hebrew/holiday.cpp:213
-msgid "Erev R.H."
-msgstr "Erev R.H."
-
-#: plugins/hebrew/holiday.cpp:221
-msgid "Rosh Hashana"
-msgstr "Rosh Hashana"
-
-#: plugins/hebrew/holiday.cpp:225 plugins/hebrew/holiday.cpp:238
-msgid "Sh. Shuvah"
-msgstr "Sh. Shuvah"
-
-#: plugins/hebrew/holiday.cpp:227 plugins/hebrew/holiday.cpp:231
-msgid "Tzom Gedalia"
-msgstr "Tzom Gedalia"
-
-#: plugins/hebrew/holiday.cpp:241
-msgid "Erev Y.K."
-msgstr "Erev Y.K."
-
-#: plugins/hebrew/holiday.cpp:244
-msgid "Yom Kippur"
-msgstr "Yom Kippur"
-
-#: plugins/hebrew/holiday.cpp:247
-msgid "Erev Sukkot"
-msgstr "Erev Sukkot"
-
-#: plugins/hebrew/holiday.cpp:253
-msgid "Sukkot"
-msgstr "Sukkot"
+"Press this button to edit the resource currently selected on the KOrganizer "
+"resources list above."
+msgstr ""
 
-#: plugins/hebrew/holiday.cpp:265
-msgid "Hoshana Rabah"
-msgstr "Hoshana Rabah"
+#: resourceview.cpp:299
+#, fuzzy
+msgid "Remove calendar"
+msgstr "Cy&mryd drosodd y Calendr"
 
-#: plugins/hebrew/holiday.cpp:268
-msgid "Shmini Atzeret"
-msgstr "Shmini Atzeret"
+#: resourceview.cpp:301
+msgid ""
+"Press this button to delete the resource currently selected on the KOrganizer "
+"resources list above."
+msgstr ""
 
-#: plugins/hebrew/holiday.cpp:272
-msgid "Simchat Torah"
-msgstr "Simchat Torah"
+#: resourceview.cpp:309
+msgid ""
+"<qt>"
+"<p>Select on this list the active KOrganizer resources. Check the resource box "
+"to make it active. Press the \"Add...\" button below to add new resources to "
+"the list.</p>"
+"<p>Events, journal entries and to-dos are retrieved and stored on resources. "
+"Available resources include groupware servers, local files, journal entries as "
+"blogs on a server, etc...</p>"
+"<p>If you have more than one active resource, when creating incidents you will "
+"either automatically use the default resource or be prompted to select the "
+"resource to use.</p></qt>"
+msgstr ""
 
-#: plugins/hebrew/holiday.cpp:281
-msgid "Erev Hanukah"
-msgstr "Erev Hanukah"
+#: resourceview.cpp:370
+#, fuzzy
+msgid "Add Subresource"
+msgstr "%1 adnodd"
 
-#: plugins/hebrew/holiday.cpp:283 plugins/hebrew/holiday.cpp:289
-msgid "Hanukah"
-msgstr "Hanukah"
+#: resourceview.cpp:371
+#, fuzzy
+msgid "Please enter a name for the new subresource"
+msgstr "Rhowch enw ar gyfer y patrymlun:"
 
-#: plugins/hebrew/holiday.cpp:293
-msgid "Tzom Tevet"
-msgstr "Tzom Tevet"
+#: resourceview.cpp:379
+#, fuzzy
+msgid "<qt>Unable to create subresource <b>%1</b>.</qt>"
+msgstr "<qt>Wedi methu creu adnodd o'r dath <b>%1</b>.</qt>"
 
-#: plugins/hebrew/holiday.cpp:304 plugins/hebrew/holiday.cpp:312
-#: plugins/hebrew/holiday.cpp:316 plugins/hebrew/holiday.cpp:320
-msgid "Sh. Shirah"
-msgstr "Sh. Shirah"
+#: resourceview.cpp:387
+msgid "Resource Configuration"
+msgstr "Ffurfweddu Adnoddau"
 
-#: plugins/hebrew/holiday.cpp:317
-msgid "Tu B'Shvat"
-msgstr "Tu B'Shvat"
+#: resourceview.cpp:388
+msgid "Please select type of the new resource:"
+msgstr "Dewiswch fath yr adnodd newydd:"
 
-#: plugins/hebrew/holiday.cpp:330 plugins/hebrew/holiday.cpp:341
-#: plugins/hebrew/holiday.cpp:349
-msgid "Sh. Shekalim"
-msgstr "Sh. Shekalim"
+#: resourceview.cpp:401
+msgid "<qt>Unable to create resource of type <b>%1</b>.</qt>"
+msgstr "<qt>Wedi methu creu adnodd o'r dath <b>%1</b>.</qt>"
 
-#: plugins/hebrew/holiday.cpp:338
-msgid "Purim Katan"
-msgstr "Purim Katan"
+#: resourceview.cpp:417
+#, fuzzy
+msgid "Unable to create the resource."
+msgstr "Methu cadw'r eitem i-wneud"
 
-#: plugins/hebrew/holiday.cpp:356 plugins/hebrew/holiday.cpp:373
-msgid "Ta'anit Ester"
-msgstr "Ta'anit Ester"
+#: resourceview.cpp:542
+msgid ""
+"<qt>You may not delete your standard calendar resource."
+"<p>You can change the standard calendar resource in the Trinity Control Center "
+"using the TDE Resource settings under the TDE Components area.</qt>"
+msgstr ""
 
-#: plugins/hebrew/holiday.cpp:364 plugins/hebrew/holiday.cpp:368
-msgid "Sh. Zachor"
-msgstr "Sh. Zachor"
+#: resourceview.cpp:552
+msgid ""
+"This is a groupware folder so you can always re-subscribe to the folder later "
+"as you desire."
+msgstr ""
 
-#: plugins/hebrew/holiday.cpp:370
-msgid "Erev Purim"
-msgstr "Erev Purim"
+#: resourceview.cpp:555
+msgid ""
+"The contents will not be removed so you can always re-add this calendar later "
+"as you desire."
+msgstr ""
 
-#: plugins/hebrew/holiday.cpp:376
-msgid "Purim"
-msgstr "Purim"
+#: resourceview.cpp:562
+#, fuzzy
+msgid ""
+"<qt>Do you really want to remove the calendar <b>%1</b>?"
+"<p><b>Note:</b> %2</qt>"
+msgstr "<qt>A ydych yn wir eisiau dileu'r adnodd? <b>%1</b>?</qt>"
 
-#: plugins/hebrew/holiday.cpp:380 plugins/hebrew/holiday.cpp:384
-msgid "Shushan Purim"
-msgstr "Shushan Purim"
+#: resourceview.cpp:573
+msgid ""
+"<qt>Failed to remove the subresource <b>%1</b>. The reason could be that it is "
+"a built-in one which cannot be removed, or that the removal of the underlying "
+"storage folder failed.</qt>"
+msgstr ""
 
-#: plugins/hebrew/holiday.cpp:394
-msgid "Sh. Parah"
-msgstr "Sh. Parah"
+#: resourceview.cpp:601
+msgid "Cannot rename someone else's calendar folder."
+msgstr ""
 
-#: plugins/hebrew/holiday.cpp:403
-msgid "Sh. HaHodesh"
-msgstr "Sh. HaHodesh"
+#: resourceview.cpp:609
+#, fuzzy
+msgid "Rename Subresource"
+msgstr "%1 adnodd"
 
-#: plugins/hebrew/holiday.cpp:428
-msgid " Omer"
-msgstr " Omer"
+#: resourceview.cpp:610
+msgid ""
+"<qt>Enter a new name for the subresource"
+"<p><b>Note:</b> the new name will take affect after the next sync.</qt>"
+msgstr ""
 
-#: plugins/hebrew/configdialog.cpp:29
-msgid "Configure Holidays"
-msgstr "Ffurfweddu Gwyliau"
+#: resourceview.cpp:622
+msgid ""
+"Communication with KMail failed when attempting to change the folder name."
+msgstr ""
 
-#: plugins/hebrew/configdialog.cpp:37
-msgid "Use Israeli holidays"
-msgstr "Defnyddiwch gwyliau Israeli"
+#: resourceview.cpp:635
+#, fuzzy
+msgid "<qt>Cannot edit the subresource <b>%1</b>.</qt>"
+msgstr "<qt>Wedi methu creu adnodd o'r dath <b>%1</b>.</qt>"
 
-#: plugins/hebrew/configdialog.cpp:41
-msgid "Show weekly parsha"
-msgstr "Dangos parsha wythnosol"
+#: resourceview.cpp:691
+msgid "Re&load"
+msgstr "Ai&l-lwytho"
 
-#: plugins/hebrew/configdialog.cpp:45
-msgid "Show day of Omer"
-msgstr "Dangos diwrnod Omer"
+#: resourceview.cpp:699
+msgid "Show &Info"
+msgstr "&Dangos Gwybodaeth"
 
-#: plugins/hebrew/configdialog.cpp:49
-msgid "Show Chol HaMoed"
-msgstr "Dangos Chol HaMoed"
+#: resourceview.cpp:703
+msgid "&Assign Color"
+msgstr ""
 
-#: plugins/hebrew/hebrew.cpp:103
-msgid "This plugin provides the date in the Jewish calendar."
-msgstr "Mae'r ategyn yma yn darparu'r dyddiad yn y calendr Iddewig."
+#: resourceview.cpp:705
+#, fuzzy
+msgid "&Disable Color"
+msgstr "defnyddio &lliwiau"
 
-#: plugins/timespanview/timespanview.cpp:54
+#: resourceview.cpp:706
 #, fuzzy
-msgid "&Timespan"
-msgstr "&Amrediad Amser"
+msgid "Resources Colors"
+msgstr "%1 adnodd"
 
-#: plugins/timespanview/timespanview.cpp:64
+#: resourceview.cpp:712
 #, fuzzy
-msgid "This plugin provides a Gantt-like Timespan view."
-msgstr "Mae'r ategyn yma yn darparu diagram Gantt fel golwg cywaith."
+msgid "&Rename..."
+msgstr "&Gwaredu..."
 
-#: plugins/timespanview/timespanview.cpp:69
+#: resourceview.cpp:720
 #, fuzzy
-msgid "Timespan View Plugin"
-msgstr "Golwg Cywaith"
+msgid "Use as &Default Calendar"
+msgstr "Fformat Calendr Rhagosodedig"
 
-#: plugins/timespanview/timespanwidget.cpp:73
-msgid "Center View"
-msgstr "Canoli'r Golwg"
+#: resourceview.cpp:726
+msgid "&Add..."
+msgstr "Ychw&anegu..."
 
-#: plugins/printing/list/listprint.h:42
-#, fuzzy
-msgid "Print list"
-msgstr "Rhestr digwyddiadau"
+#: koincidenceeditor.cpp:75
+msgid "&Templates..."
+msgstr "&Patrymluniau ..."
 
-#: plugins/printing/list/listprint.h:43
-msgid "Prints a list of events and to-dos"
-msgstr ""
+#: koincidenceeditor.cpp:88
+msgid "Atte&ndees"
+msgstr "Cy&farfotwyr"
 
-#: plugins/printing/year/yearprint.cpp:176
-#, fuzzy
+#: koincidenceeditor.cpp:90
 msgid ""
-"_: date from -\n"
-"to\n"
-"%1 -\n"
-"%2"
-msgstr "%1 - %2"
+"The Attendees tab allows you to Add or Remove Attendees to/from this event or "
+"to-do."
+msgstr ""
 
-#: plugins/printing/year/yearprint.h:42
-#, fuzzy
-msgid "Print &Year"
-msgstr "Argraf&fu wythnos"
+#: koincidenceeditor.cpp:174
+msgid "Unable to find template '%1'."
+msgstr "Wedi methu darganfod patrymlun '%1'."
 
-#: plugins/printing/year/yearprint.h:43
-#, fuzzy
-msgid "Prints a calendar for an entire year"
-msgstr "Argraffu pob digwyddiad diwrnod sengl ar un dudalen"
+#: koincidenceeditor.cpp:179
+msgid "Error loading template file '%1'."
+msgstr "Gwall wrth lwytho'r ffeil batrymlun '%1'"
 
-#: plugins/printing/journal/journalprint.h:43
+#: koincidenceeditor.cpp:394 koincidenceeditor.cpp:395
 #, fuzzy
-msgid "Print &journal"
-msgstr "&Dyddlyfr"
+msgid "Create to-do"
+msgstr "Dileu I'w-Wneud"
 
-#: plugins/printing/journal/journalprint.h:44
-#, fuzzy
-msgid "Prints all journals for a given date range"
-msgstr "Argraffu pob digwyddiad diwrnod sengl ar un dudalen"
+#: koincidenceeditor.cpp:404 koincidenceeditor.cpp:405
+msgid "Counter proposal"
+msgstr ""
 
-#: plugins/printing/journal/journalprint.cpp:126
-msgid "Journal entries"
-msgstr "Cofnodion dyddlyfr"
+#: stdcalendar.cpp:74
+msgid "Active Calendar"
+msgstr "Calendr Weithredol"
 
-#: plugins/printing/whatsnext/whatsnextprint.h:42
+#: stdcalendar.cpp:83
 #, fuzzy
-msgid "Print What's Next"
-msgstr "Beth sy'n &Nesaf"
+msgid "Default Calendar"
+msgstr "Fformat Calendr Rhagosodedig"
 
-#: plugins/printing/whatsnext/whatsnextprint.h:43
-msgid "Prints a list of all upcoming events and todos."
-msgstr ""
+#: stdcalendar.cpp:98
+#, fuzzy
+msgid "Birthdays"
+msgstr "Penblwydd"
 
-#: plugins/exchange/exchange.cpp:109 plugins/exchange/exchange.cpp:145
-#: plugins/exchange/exchange.cpp:148 plugins/exchange/exchange.cpp:164
-#: plugins/exchange/exchange.cpp:168 plugins/exchange/exchange.cpp:222
-#: plugins/exchange/exchange.cpp:224 plugins/exchange/exchangeconfig.cpp:35
-#: plugins/exchange/exchangedialog.cpp:34
-msgid "Exchange Plugin"
-msgstr "Ategyn Exchange"
+#~ msgid "Location: %1"
+#~ msgstr "Lleoliad: %1"
 
-#: plugins/exchange/exchangeconfig.cpp:46
-msgid "Exchange server:"
-msgstr "Gweinydd Exchange:"
+#~ msgid ""
+#~ "The meeting has been moved to\n"
+#~ "Start: %1\n"
+#~ "End: %2."
+#~ msgstr ""
+#~ "Symudwyd y cyfarfod i\n"
+#~ "Dechrau: %1\n"
+#~ "Gorffen: %2."
 
-#: plugins/exchange/exchangeconfig.cpp:50
-msgid "Port:"
-msgstr "Porth:"
+#~ msgid "&Add"
+#~ msgstr "&Ychwanegu..."
 
-#: plugins/exchange/exchangeconfig.cpp:54
-msgid "User:"
-msgstr "Defnyddiwr:"
+#~ msgid "1 minute"
+#~ msgstr "1 funud"
 
-#: plugins/exchange/exchangeconfig.cpp:63
-msgid "Determine mailbox automatically"
-msgstr "Penodi blwch ebost yn ymysgogol"
+#~ msgid "5 minutes"
+#~ msgstr "5 munud"
 
-#: plugins/exchange/exchangeconfig.cpp:68
-msgid "Mailbox URL:"
-msgstr "URL y blwch ebost:"
+#~ msgid "10 minutes"
+#~ msgstr "10 munud "
 
-#: plugins/exchange/exchangedialog.cpp:39
-msgid "Start date:"
-msgstr "Dyddiad dechrau:"
+#~ msgid "15 minutes"
+#~ msgstr "15 munud"
 
-#: plugins/exchange/exchangedialog.cpp:46
-msgid "End date:"
-msgstr "Dyddiad gorffen:"
+#~ msgid "30 minutes"
+#~ msgstr "30 munud"
 
-#: plugins/exchange/exchange.cpp:72
-msgid "&Download..."
-msgstr "&Lawrlwytho ..."
+#, fuzzy
+#~ msgid "Enter the default reminder time here."
+#~ msgstr "Amser larwm rhagosodedig:"
 
-#: plugins/exchange/exchange.cpp:75
-msgid "&Upload Event..."
-msgstr "&Lanlwytho Digwyddiad..."
+#~ msgid "Owner:"
+#~ msgstr "Perchennog:"
 
-#: plugins/exchange/exchange.cpp:83
-msgid "De&lete Event"
-msgstr "Di&leu Digwyddiad"
+#, fuzzy
+#~ msgid "No reminders configured"
+#~ msgstr "Atgof"
 
-#: plugins/exchange/exchange.cpp:89
-msgid "&Configure..."
-msgstr "&Ffurfweddu..."
+#~ msgid "&Reminder:"
+#~ msgstr "&Atgof:"
 
-#: plugins/exchange/exchange.cpp:104
-msgid ""
-"This plugin imports and export calendar events from/to a Microsoft Exchange "
-"2000 Server."
-msgstr ""
-"Mae'r ategyn yma yn mewnforio ac allforio digwyddiadau o/i weinydd Microsoft "
-"Exchange 2000."
+#~ msgid "Advanced"
+#~ msgstr "Uwch"
 
-#: plugins/exchange/exchange.cpp:145 plugins/exchange/exchange.cpp:164
-#, fuzzy
-msgid "Please select an appointment."
-msgstr "Dewiswch apwyntiad os gwelwch yn dda"
+#~ msgid "Owner: "
+#~ msgstr "Perchennog:"
 
-#: plugins/exchange/exchange.cpp:148
-msgid "Exchange Upload is EXPERIMENTAL, you may lose data on this appointment!"
-msgstr ""
-"Mae lanlywthiad i Exchange yn ARBROFOL, gallwch golli data am yr apwyntiad hyn!"
+#~ msgid "co&mpleted"
+#~ msgstr "cy&flawn"
 
-#: plugins/exchange/exchange.cpp:148
-msgid "&Upload"
-msgstr "&Lanlwytho"
+#~ msgid "event"
+#~ msgstr "digwyddiad"
 
-#: plugins/exchange/exchange.cpp:168
-msgid ""
-"Exchange Delete is EXPERIMENTAL, if this is a recurring event it will delete "
-"all instances!"
-msgstr ""
-"Mae Dileu o Exchange yn ARBROFOL; os mae hwn yn ddigwyddiad ail-digwyddiadol, "
-"bydd pob enghraifft yn cael ei ddileu!"
+#~ msgid "task"
+#~ msgstr "tasg"
 
-#: plugins/exchange/exchange.cpp:195
-msgid "No Error"
-msgstr "Dim Gwall"
+#~ msgid "journal entry"
+#~ msgstr "cofnod dyddlyfr"
 
-#: plugins/exchange/exchange.cpp:198
-msgid "The Exchange server could not be reached or returned an error."
-msgstr "Ni ellid cyrchu'r gweinydd Exchange, neu dychwelodd gwall."
+#~ msgid "You are not the organizer of this event. Deleting it will bring your calendar out of sync with the organizers calendar. Do you really want to delete it?"
+#~ msgstr "Nid chi yw trefnydd y digwyddiad hwn. Mi fydd dileu hwn yn achosi i'ch calendr golli cydweddiad â chalendr y trefnydd. A ydych wir eisiau ei ddileu?"
 
-#: plugins/exchange/exchange.cpp:201
-msgid "Server response could not be interpreted."
-msgstr "Ni ellid dehongli ymateb y gweinydd."
+#~ msgid "Start Time"
+#~ msgstr "Amser Dechrau"
 
-#: plugins/exchange/exchange.cpp:204
-msgid "Appointment data could not be interpreted."
-msgstr "Ni ellid dehongli data apwyntiadau."
+#~ msgid "End Date"
+#~ msgstr "Dyddiad Gorffen"
 
-#: plugins/exchange/exchange.cpp:207
-msgid "This should not happen: trying to upload wrong type of event."
-msgstr "Ni ddylir hwn ddigwydd: ceisio lanlwytho y math angywir o ddigwyddiad."
+#~ msgid "End Time"
+#~ msgstr "Amser Gorffen"
 
-#: plugins/exchange/exchange.cpp:210
-msgid "An error occurred trying to write an appointment to the server."
-msgstr "Digwyddodd gwall wrth geisio ysgrifennu apwyntiad i'r gweinydd."
+#, fuzzy
+#~ msgid "There are no items before %1"
+#~ msgstr "Nid oes digwyddiadau cyn %1"
 
-#: plugins/exchange/exchange.cpp:213
-msgid "Trying to delete an event that is not present on the server."
-msgstr "Ceisio dileu digwyddiad sy ddim yn bresennol ar y gweinydd."
+#, fuzzy
+#~ msgid "Default Reminder Time"
+#~ msgstr "Amser cyfarfod rhagosodedig:"
 
-#: plugins/exchange/exchange.cpp:217
-msgid "Unknown Error"
-msgstr "Gwall Anhysbys"
+#, fuzzy
+#~ msgid "Enter the reminder time here."
+#~ msgstr "Amser larwm rhagosodedig:"
 
-#: koagenda.cpp:906
-msgid "Unable to lock item for modification. You cannot make any changes."
-msgstr ""
+#~ msgid "Month view uses category colors"
+#~ msgstr "Mae'r golwg misol yn defnyddio lliwiau categorïau"
 
-#: koagenda.cpp:908
 #, fuzzy
-msgid "Locking Failed"
-msgstr "Methodd y gosod."
-
-#: koagenda.cpp:1054
-msgid ""
-"The item you try to change is a recurring item. Shall the changes be applied "
-"only to this single occurrence, only to the future items, or to all items in "
-"the recurrence?"
-msgstr ""
+#~ msgid "Check this box to make the month view use the category colors of an item."
+#~ msgstr "Dangos eiliadau ar linell Marcus Bain"
 
-#: koagenda.cpp:1057
 #, fuzzy
-msgid "Changing Recurring Item"
-msgstr "Mae hwn yn ddigwyddiad ail-ddigwyddiadol."
+#~ msgid "Month view uses resource colors"
+#~ msgstr "Mae'r golwg misol yn defnyddio lliwiau categorïau"
 
-#: koagenda.cpp:1058
-msgid "Only &This Item"
-msgstr ""
+#, fuzzy
+#~ msgid "Check this box to make the month view use the resource colors of an item."
+#~ msgstr "Dangos eiliadau ar linell Marcus Bain"
 
-#: koagenda.cpp:1058
-msgid "Only &Future Items"
-msgstr ""
+#, fuzzy
+#~ msgid "Default event color"
+#~ msgstr "Lliw digwyddiad rhagosodedig:"
 
-#: koagenda.cpp:1058
 #, fuzzy
-msgid "&All Occurrences"
-msgstr "di&gwyddiad(au)"
+#~ msgid "&Attach File..."
+#~ msgstr "Ychwanegu Hidlen..."
 
-#: koagenda.cpp:1073
 #, fuzzy
-msgid "Dissociate event from recurrence"
-msgstr "Rhestri digwyddiadau'r diwrnod cyfredol"
+#~ msgid "As File"
+#~ msgstr "Ychwanegu Hidlen"
 
-#: koagenda.cpp:1087
-msgid ""
-"Unable to add the exception item to the calendar. No change will be done."
-msgstr ""
+#, fuzzy
+#~ msgid "The selected items will be permanently deleted."
+#~ msgstr "My fydd yr eitem hyn yn cael ei ddileu am byth."
 
-#: koagenda.cpp:1088 koagenda.cpp:1115
-msgid "Error Occurred"
-msgstr ""
+#~ msgid "%1 resource"
+#~ msgstr "%1 adnodd"
 
-#: koagenda.cpp:1101
 #, fuzzy
-msgid "Split future recurrences"
-msgstr "Gall&uogi ail-ddigwydd"
+#~ msgid "You cannot delete your standard resource."
+#~ msgstr "Nid ydych chi'n gallu dileu eich adnodd safonol!"
 
-#: koagenda.cpp:1114
-msgid "Unable to add the future items to the calendar. No change will be done."
-msgstr ""
+#~ msgid "Rec&urrence"
+#~ msgstr "Ail-dd&igwydd"
 
 #~ msgid "Zoom to Fit"
 #~ msgstr "Chwyddo i Ffitio"
@@ -7261,9 +8065,6 @@ msgstr ""
 #~ msgid "Setup P&rinter..."
 #~ msgstr "Gosod A&rgraffydd..."
 
-#~ msgid "Use Default Setting of Printer"
-#~ msgstr "Defnyddio Gosodiad Rhagosod yr Argraffydd"
-
 #~ msgid "Setup printer"
 #~ msgstr "Gosod argraffydd"
 
@@ -7439,9 +8240,6 @@ msgstr ""
 #~ msgid "If requested from an email in addressbook"
 #~ msgstr "Os wedi'i ofyn o ebost yn y llyfr cyfeiriadau"
 
-#~ msgid " Incoming messages: %1 "
-#~ msgstr "Negeseuon i mewn: %1"
-
 #~ msgid " Outgoing messages: %2 "
 #~ msgstr "Negeseuon allan: %2"
 
@@ -7657,9 +8455,6 @@ msgstr ""
 #~ msgid "Preview URL:"
 #~ msgstr "URL Rhagolwg:"
 
-#~ msgid "Summary:"
-#~ msgstr "Crynodeb:"
-
 #~ msgid "Please put in a name."
 #~ msgstr "Rhowch enw, os gwelwch yn dda."
 
@@ -7678,9 +8473,6 @@ msgstr ""
 #~ msgid "From:"
 #~ msgstr "Oddiwrth:"
 
-#~ msgid "Location:"
-#~ msgstr "Lleoliad:"
-
 #~ msgid "Accept C&onditionally"
 #~ msgstr "&Derbyn yn Amodol"
 
@@ -7770,9 +8562,6 @@ msgstr ""
 #~ msgid "Include d&ue date of the item"
 #~ msgstr "Cynn&wys dyddiad disgwyliedig yr eitem"
 
-#~ msgid "Include &priority of the item"
-#~ msgstr "Cynnwys &blaenoriaeth yr eitem"
-
 #~ msgid "&From:"
 #~ msgstr "&Oddiwrth:"
 
@@ -7916,12 +8705,6 @@ msgstr ""
 #~ msgid "Monthly Same Position"
 #~ msgstr "Misol Yn Yr Un Lle"
 
-#~ msgid "Start Date: %1"
-#~ msgstr "Dyddiad Dechrau: %1"
-
-#~ msgid "Start Time: %1"
-#~ msgstr "Amser Dechrau: %1"
-
 #~ msgid "End Date: %1"
 #~ msgstr "Dyddiad Gorffen: %1"
 
@@ -7937,9 +8720,6 @@ msgstr ""
 #~ msgid "Details:"
 #~ msgstr "Manylion:"
 
-#~ msgid "Due Date: %1"
-#~ msgstr "Dyddiad Disgwyliedig: %1"
-
 #~ msgid "This is a Free Busy Object"
 #~ msgstr "Gwrthrych Rhydd Brysur yw Hwn"
 
diff --git a/tde-i18n-cy/messages/tdepim/korn.po b/tde-i18n-cy/messages/tdepim/korn.po
index 1ce16ec272c..3f406cad558 100644
--- a/tde-i18n-cy/messages/tdepim/korn.po
+++ b/tde-i18n-cy/messages/tdepim/korn.po
@@ -8,15 +8,28 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: korn\n"
-"POT-Creation-Date: 2008-07-08 01:22+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2004-02-25 13:58+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.2\n"
 
+#: maildir_proto.h:47 qmail_proto.cpp:38 qmail_proto.h:50
+msgid "Path:"
+msgstr "Llwybr:"
+
+#: mbox_proto.cpp:37 mbox_proto.h:44
+msgid "File:"
+msgstr "Ffeil:"
+
+#: process_proto.h:40
+msgid "Program: "
+msgstr "Rhaglen: "
+
 #: tdeio_proto.h:97
 msgid "Server:"
 msgstr "Gweinydd:"
@@ -37,7 +50,7 @@ msgstr "Blwch ebost:"
 msgid "Password:"
 msgstr "Cyfinair:"
 
-#: imap_proto.cpp:59 tdeio_proto.h:102 nntp_proto.cpp:43 pop3_proto.cpp:58
+#: imap_proto.cpp:59 nntp_proto.cpp:43 pop3_proto.cpp:58 tdeio_proto.h:102
 msgid "Save password"
 msgstr "Cadw cyfrinair"
 
@@ -45,18 +58,6 @@ msgstr "Cadw cyfrinair"
 msgid "Authentication:"
 msgstr "Dilysiant :"
 
-#: maildir_proto.h:47 qmail_proto.cpp:38 qmail_proto.h:50
-msgid "Path:"
-msgstr "Llwybr:"
-
-#: mbox_proto.cpp:37 mbox_proto.h:44
-msgid "File:"
-msgstr "Ffeil:"
-
-#: process_proto.h:40
-msgid "Program: "
-msgstr "Rhaglen: "
-
 #: _translatorinfo.cpp:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
@@ -166,59 +167,6 @@ msgstr "Cyfrinair"
 msgid "Authentication"
 msgstr "Dilysiant"
 
-#: tdeio.cpp:211
-msgid "url is not valid"
-msgstr ""
-
-#: tdeio_count.cpp:89 tdeio_count.cpp:90
-#, c-format
-msgid "Not able to open a tdeio slave for %1."
-msgstr ""
-
-#: tdeio_count.cpp:204 tdeio_count.cpp:254
-msgid "Got unknown job; something must be wrong..."
-msgstr ""
-
-#: tdeio_count.cpp:210 tdeio_count.cpp:211
-#, c-format
-msgid "The next TDEIO-error occurred by counting: %1"
-msgstr ""
-
-#: tdeio_delete.cpp:110
-msgid "Could not get a connected slave; I cannot delete this way..."
-msgstr ""
-
-#: tdeio_delete.cpp:185
-#, c-format
-msgid "An error occurred when deleting email: %1."
-msgstr ""
-
-#: tdeio_read.cpp:77 tdeio_read.cpp:91
-msgid "Unknown job returned; I will try if this one will do... "
-msgstr ""
-
-#: tdeio_read.cpp:80
-#, c-format
-msgid "An error occurred when fetching the requested email: %1."
-msgstr ""
-
-#: tdeio_single_subject.cpp:128 tdeio_single_subject.cpp:137
-msgid "Got invalid job; something strange happened?"
-msgstr ""
-
-#: tdeio_single_subject.cpp:141
-msgid "Error when fetching %1: %2"
-msgstr ""
-
-#: tdeio_subjects.cpp:66
-msgid "Already a slave pending."
-msgstr ""
-
-#: tdeio_subjects.cpp:104 tdeio_subjects.cpp:105
-#, c-format
-msgid "Not able to open a tdeio-slave for %1."
-msgstr ""
-
 #: kmail_proto.cpp:199
 msgid "KMail name"
 msgstr ""
@@ -613,6 +561,59 @@ msgstr "Cadarnhad"
 msgid "Deleting mail; please wait...."
 msgstr "Dileu ebostiau.  Arhoswch..."
 
+#: tdeio.cpp:211
+msgid "url is not valid"
+msgstr ""
+
+#: tdeio_count.cpp:89 tdeio_count.cpp:90
+#, c-format
+msgid "Not able to open a tdeio slave for %1."
+msgstr ""
+
+#: tdeio_count.cpp:204 tdeio_count.cpp:254
+msgid "Got unknown job; something must be wrong..."
+msgstr ""
+
+#: tdeio_count.cpp:210 tdeio_count.cpp:211
+#, c-format
+msgid "The next TDEIO-error occurred by counting: %1"
+msgstr ""
+
+#: tdeio_delete.cpp:110
+msgid "Could not get a connected slave; I cannot delete this way..."
+msgstr ""
+
+#: tdeio_delete.cpp:185
+#, c-format
+msgid "An error occurred when deleting email: %1."
+msgstr ""
+
+#: tdeio_read.cpp:77 tdeio_read.cpp:91
+msgid "Unknown job returned; I will try if this one will do... "
+msgstr ""
+
+#: tdeio_read.cpp:80
+#, c-format
+msgid "An error occurred when fetching the requested email: %1."
+msgstr ""
+
+#: tdeio_single_subject.cpp:128 tdeio_single_subject.cpp:137
+msgid "Got invalid job; something strange happened?"
+msgstr ""
+
+#: tdeio_single_subject.cpp:141
+msgid "Error when fetching %1: %2"
+msgstr ""
+
+#: tdeio_subjects.cpp:66
+msgid "Already a slave pending."
+msgstr ""
+
+#: tdeio_subjects.cpp:104 tdeio_subjects.cpp:105
+#, c-format
+msgid "Not able to open a tdeio-slave for %1."
+msgstr ""
+
 #, fuzzy
 #~ msgid "KornAccountCfg"
 #~ msgstr "&Cyfrif"
diff --git a/tde-i18n-cy/messages/tdepim/kres_birthday.po b/tde-i18n-cy/messages/tdepim/kres_birthday.po
index 842defa251a..3a2c0730db4 100644
--- a/tde-i18n-cy/messages/tdepim/kres_birthday.po
+++ b/tde-i18n-cy/messages/tdepim/kres_birthday.po
@@ -1,48 +1,54 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2005-12-15 03:11+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: resourcekabc.cpp:168
+#: resourcetdeabc.cpp:76
+#, fuzzy
+msgid "Birthdays"
+msgstr "Penblwydd"
+
+#: resourcetdeabc.cpp:172
 msgid "%1's birthday"
 msgstr "Penblwydd %1"
 
-#: resourcekabc.cpp:209
+#: resourcetdeabc.cpp:213
 msgid "Birthday"
 msgstr "Penblwydd"
 
-#: resourcekabc.cpp:267
+#: resourcetdeabc.cpp:279
 msgid ""
 "_: insert names of both spouses\n"
 "%1's & %2's anniversary"
 msgstr ""
 
-#: resourcekabc.cpp:269
+#: resourcetdeabc.cpp:282
 msgid ""
 "_: only one spouse in addressbook, insert the name\n"
 "%1's anniversary"
 msgstr "Pen blwydd %1"
 
-#: resourcekabc.cpp:314
+#: resourcetdeabc.cpp:327
 msgid "Anniversary"
 msgstr "Dathliad"
 
-#: resourcekabcconfig.cpp:41
+#: resourcetdeabcconfig.cpp:41
 msgid "Set reminder"
 msgstr ""
 
-#: resourcekabcconfig.cpp:45
+#: resourcetdeabcconfig.cpp:45
 #, fuzzy
 msgid "Reminder before (in days):"
 msgstr "Larwm cyn (mewn dyddiau):"
 
-#: resourcekabcconfig.cpp:55
+#: resourcetdeabcconfig.cpp:55
 msgid "Filter by categories"
 msgstr ""
 
diff --git a/tde-i18n-cy/messages/tdepim/kres_blogging.po b/tde-i18n-cy/messages/tdepim/kres_blogging.po
index f59e42873c2..b6062ea946c 100644
--- a/tde-i18n-cy/messages/tdepim/kres_blogging.po
+++ b/tde-i18n-cy/messages/tdepim/kres_blogging.po
@@ -1,14 +1,19 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: all2.po\n"
-"POT-Creation-Date: 2005-02-02 01:26+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: kcal_resourceblogging.cpp:44
+msgid "Blogs"
+msgstr ""
+
 #: kcal_resourcebloggingconfig.cpp:35
 msgid ""
 "Currently, the blogging resource is only read-only. You will not be able to add "
diff --git a/tde-i18n-cy/messages/tdepim/kres_exchange.po b/tde-i18n-cy/messages/tdepim/kres_exchange.po
index 17bd1a7543c..0993c2d7f85 100644
--- a/tde-i18n-cy/messages/tdepim/kres_exchange.po
+++ b/tde-i18n-cy/messages/tdepim/kres_exchange.po
@@ -1,14 +1,19 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdepim/kres_exchange.po\n"
-"POT-Creation-Date: 2006-03-25 04:00+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: resourceexchange.cpp:94
+msgid "Exchange Server"
+msgstr ""
+
 #: resourceexchangeconfig.cpp:42
 msgid "Host:"
 msgstr "Gwesteiwr:"
diff --git a/tde-i18n-cy/messages/tdepim/kres_featureplan.po b/tde-i18n-cy/messages/tdepim/kres_featureplan.po
index 128170c706d..d2873a70f96 100644
--- a/tde-i18n-cy/messages/tdepim/kres_featureplan.po
+++ b/tde-i18n-cy/messages/tdepim/kres_featureplan.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: all2.po\n"
-"POT-Creation-Date: 2005-01-16 01:25+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdepim/kres_groupware.po b/tde-i18n-cy/messages/tdepim/kres_groupware.po
index 50b736175ac..2f623754442 100644
--- a/tde-i18n-cy/messages/tdepim/kres_groupware.po
+++ b/tde-i18n-cy/messages/tdepim/kres_groupware.po
@@ -1,90 +1,95 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2005-08-18 04:31+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: tdeabc_resourcegroupware.cpp:253
-msgid "Downloading addressbook"
-msgstr ""
-
-#: tdeabc_resourcegroupwareconfig.cpp:66 kcal_resourcegroupwareconfig.cpp:47
-msgid "URL:"
-msgstr "URL:"
-
-#: tdeabc_resourcegroupwareconfig.cpp:72 kcal_resourcegroupwareconfig.cpp:52
-msgid "User:"
-msgstr "Defnyddiwr:"
-
-#: tdeabc_resourcegroupwareconfig.cpp:78 kcal_resourcegroupwareconfig.cpp:57
-msgid "Password:"
-msgstr "Cyfrinair:"
-
-#: tdeabc_resourcegroupwareconfig.cpp:90
-msgid "Retrieve Address Book List From Server"
+#: kcal_resourcegroupware.cpp:68 tdeabc_resourcegroupware.cpp:47
+msgid "Groupware Server"
 msgstr ""
 
-#: tdeabc_resourcegroupwareconfig.cpp:94
-msgid "Address Book"
-msgstr "Llyfr Cyfeiriadau"
-
-#: tdeabc_resourcegroupwareconfig.cpp:96
-msgid "Personal"
-msgstr "Personol"
-
-#: tdeabc_resourcegroupwareconfig.cpp:97
-msgid "Frequent Contacts"
-msgstr ""
-
-#: tdeabc_resourcegroupwareconfig.cpp:103
-msgid "Address book for new contacts:"
-msgstr ""
-
-#: kcal_resourcegroupware.cpp:164
+#: kcal_resourcegroupware.cpp:168
 msgid "Downloading calendar"
 msgstr ""
 
-#: kcal_resourcegroupware.cpp:189
+#: kcal_resourcegroupware.cpp:193
 msgid "Error parsing calendar data."
 msgstr ""
 
-#: kcal_resourcegroupware.cpp:279
+#: kcal_resourcegroupware.cpp:283
 msgid "Added"
 msgstr "Ychwanegu"
 
-#: kcal_resourcegroupware.cpp:280
+#: kcal_resourcegroupware.cpp:284
 msgid "Changed"
 msgstr ""
 
-#: kcal_resourcegroupware.cpp:281
+#: kcal_resourcegroupware.cpp:285
 msgid "Deleted"
 msgstr "Wedi'u dileu"
 
-#. i18n: file tderesources_tdeabc_groupware.kcfg line 9
-#: rc.cpp:3 rc.cpp:12
+#: kcal_resourcegroupwareconfig.cpp:47 tdeabc_resourcegroupwareconfig.cpp:66
+msgid "URL:"
+msgstr "URL:"
+
+#: kcal_resourcegroupwareconfig.cpp:52 tdeabc_resourcegroupwareconfig.cpp:72
+msgid "User:"
+msgstr "Defnyddiwr:"
+
+#: kcal_resourcegroupwareconfig.cpp:57 tdeabc_resourcegroupwareconfig.cpp:78
+msgid "Password:"
+msgstr "Cyfrinair:"
+
+#. i18n: file tderesources_kcal_groupware.kcfg line 9
+#: rc.cpp:3 rc.cpp:15
 #, no-c-format
 msgid "Server URL"
 msgstr "URL y gweinydd: %1"
 
-#. i18n: file tderesources_tdeabc_groupware.kcfg line 12
-#: rc.cpp:6 rc.cpp:15
+#. i18n: file tderesources_kcal_groupware.kcfg line 12
+#: rc.cpp:6 rc.cpp:18
 #, no-c-format
 msgid "User Name"
 msgstr "Enw'r defnyddiwr"
 
-#. i18n: file tderesources_tdeabc_groupware.kcfg line 15
-#: rc.cpp:9 rc.cpp:18
+#. i18n: file tderesources_kcal_groupware.kcfg line 15
+#: rc.cpp:9 rc.cpp:21
 #, no-c-format
 msgid "Password"
 msgstr "Cyfrinair"
 
 #. i18n: file tderesources_kcal_groupware.kcfg line 18
-#: rc.cpp:21
+#: rc.cpp:12
 #, no-c-format
 msgid "TCP Port"
 msgstr ""
+
+#: tdeabc_resourcegroupware.cpp:255
+msgid "Downloading addressbook"
+msgstr ""
+
+#: tdeabc_resourcegroupwareconfig.cpp:90
+msgid "Retrieve Address Book List From Server"
+msgstr ""
+
+#: tdeabc_resourcegroupwareconfig.cpp:94
+msgid "Address Book"
+msgstr "Llyfr Cyfeiriadau"
+
+#: tdeabc_resourcegroupwareconfig.cpp:96
+msgid "Personal"
+msgstr "Personol"
+
+#: tdeabc_resourcegroupwareconfig.cpp:97
+msgid "Frequent Contacts"
+msgstr ""
+
+#: tdeabc_resourcegroupwareconfig.cpp:103
+msgid "Address book for new contacts:"
+msgstr ""
diff --git a/tde-i18n-cy/messages/tdepim/kres_groupwise.po b/tde-i18n-cy/messages/tdepim/kres_groupwise.po
index 196270e0826..5c843d69f55 100644
--- a/tde-i18n-cy/messages/tdepim/kres_groupwise.po
+++ b/tde-i18n-cy/messages/tdepim/kres_groupwise.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: all2.po\n"
-"POT-Creation-Date: 2007-08-02 01:15+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,58 +22,6 @@ msgid ""
 "Your emails"
 msgstr "kyfieithu@dotmon.com"
 
-#: tdeabc_resourcegroupwise.cpp:290
-#, c-format
-msgid "Loading GroupWise resource %1"
-msgstr ""
-
-#: tdeabc_resourcegroupwise.cpp:363
-#, fuzzy
-msgid "Fetching System Address Book"
-msgstr "Llyfr Cyfeiriadau"
-
-#: tdeabc_resourcegroupwise.cpp:373
-#, fuzzy
-msgid "Fetching User Address Books"
-msgstr "Llyfr Cyfeiriadau"
-
-#: tdeabc_resourcegroupwise.cpp:443
-#, fuzzy
-msgid "Updating System Address Book"
-msgstr "Llyfr Cyfeiriadau"
-
-#: tdeabc_resourcegroupwiseconfig.cpp:64 kcal_resourcegroupwiseconfig.cpp:50
-msgid "URL:"
-msgstr "URL:"
-
-#: tdeabc_resourcegroupwiseconfig.cpp:70 kcal_resourcegroupwiseconfig.cpp:55
-msgid "User:"
-msgstr "Defnyddiwr:"
-
-#: tdeabc_resourcegroupwiseconfig.cpp:76 kcal_resourcegroupwiseconfig.cpp:60
-msgid "Password:"
-msgstr "Cyfrinair:"
-
-#: tdeabc_resourcegroupwiseconfig.cpp:88
-msgid "Retrieve Address Book List From Server"
-msgstr ""
-
-#: tdeabc_resourcegroupwiseconfig.cpp:92
-msgid "Address Book"
-msgstr "Llyfr Cyfeiriadau"
-
-#: tdeabc_resourcegroupwiseconfig.cpp:93
-msgid "Personal"
-msgstr "Personol"
-
-#: tdeabc_resourcegroupwiseconfig.cpp:94
-msgid "Frequent Contacts"
-msgstr ""
-
-#: tdeabc_resourcegroupwiseconfig.cpp:99
-msgid "Address book for new contacts:"
-msgstr ""
-
 #: kcal_resourcegroupwise.cpp:167
 msgid "Downloading calendar"
 msgstr ""
@@ -97,6 +46,18 @@ msgstr ""
 msgid "Deleted"
 msgstr "Wedi'u dileu"
 
+#: kcal_resourcegroupwiseconfig.cpp:50 tdeabc_resourcegroupwiseconfig.cpp:64
+msgid "URL:"
+msgstr "URL:"
+
+#: kcal_resourcegroupwiseconfig.cpp:55 tdeabc_resourcegroupwiseconfig.cpp:70
+msgid "User:"
+msgstr "Defnyddiwr:"
+
+#: kcal_resourcegroupwiseconfig.cpp:60 tdeabc_resourcegroupwiseconfig.cpp:76
+msgid "Password:"
+msgstr "Cyfrinair:"
+
 #: kcal_resourcegroupwiseconfig.cpp:66
 msgid "View User Settings"
 msgstr ""
@@ -129,100 +90,140 @@ msgstr "Gwerth"
 msgid "Locked"
 msgstr ""
 
-#. i18n: file tderesources_tdeabc_groupwise.kcfg line 9
-#: rc.cpp:15 rc.cpp:60
+#. i18n: file tderesources_kcal_groupwise.kcfg line 9
+#: rc.cpp:15 rc.cpp:30
 #, no-c-format
 msgid "Server URL"
 msgstr "URL y gweinydd: %1"
 
-#. i18n: file tderesources_tdeabc_groupwise.kcfg line 10
-#: rc.cpp:18 rc.cpp:63
+#. i18n: file tderesources_kcal_groupwise.kcfg line 10
+#: rc.cpp:18 rc.cpp:33
 #, no-c-format
 msgid "URL of SOAP interface of GroupWise server"
 msgstr ""
 
-#. i18n: file tderesources_tdeabc_groupwise.kcfg line 13
-#: rc.cpp:21 rc.cpp:66
+#. i18n: file tderesources_kcal_groupwise.kcfg line 13
+#: rc.cpp:21 rc.cpp:36
 #, no-c-format
 msgid "User Name"
 msgstr "Enw'r defnyddiwr"
 
-#. i18n: file tderesources_tdeabc_groupwise.kcfg line 16
-#: rc.cpp:24 rc.cpp:69 soap/soapdebug.cpp:40
+#. i18n: file tderesources_kcal_groupwise.kcfg line 16
+#: rc.cpp:24 rc.cpp:39 soap/soapdebug.cpp:40
 #, no-c-format
 msgid "Password"
 msgstr "Cyfrinair"
 
-#. i18n: file tderesources_tdeabc_groupwise.kcfg line 21
+#. i18n: file tderesources_kcal_groupwise.kcfg line 19
 #: rc.cpp:27
 #, no-c-format
+msgid "TCP Port"
+msgstr ""
+
+#. i18n: file tderesources_tdeabc_groupwise.kcfg line 21
+#: rc.cpp:42
+#, no-c-format
 msgid "Ids of Address Books"
 msgstr ""
 
 #. i18n: file tderesources_tdeabc_groupwise.kcfg line 24
-#: rc.cpp:30
+#: rc.cpp:45
 #, no-c-format
 msgid "Names of Address Books"
 msgstr ""
 
 #. i18n: file tderesources_tdeabc_groupwise.kcfg line 27
-#: rc.cpp:33
+#: rc.cpp:48
 #, no-c-format
 msgid "Personal State of Address Books"
 msgstr ""
 
 #. i18n: file tderesources_tdeabc_groupwise.kcfg line 30
-#: rc.cpp:36
+#: rc.cpp:51
 #, no-c-format
 msgid "Frequent Contacts state of Address Books"
 msgstr ""
 
 #. i18n: file tderesources_tdeabc_groupwise.kcfg line 33
-#: rc.cpp:39
+#: rc.cpp:54
 #, no-c-format
 msgid "Readable Address Books"
 msgstr ""
 
 #. i18n: file tderesources_tdeabc_groupwise.kcfg line 36
-#: rc.cpp:42
+#: rc.cpp:57
 #, no-c-format
 msgid "Address Book for new Contacts"
 msgstr ""
 
 #. i18n: file tderesources_tdeabc_groupwise.kcfg line 39
-#: rc.cpp:45
+#: rc.cpp:60
 #, fuzzy, no-c-format
 msgid "ID of System Address Book"
 msgstr "Llyfr Cyfeiriadau"
 
 #. i18n: file tderesources_tdeabc_groupwise.kcfg line 42
-#: rc.cpp:48
+#: rc.cpp:63
 #, no-c-format
 msgid "Last time the Post Office was rebuilt"
 msgstr ""
 
 #. i18n: file tderesources_tdeabc_groupwise.kcfg line 45
-#: rc.cpp:51
+#: rc.cpp:66
 #, no-c-format
 msgid "The first sequence number of the GW System Address Book held locally"
 msgstr ""
 
 #. i18n: file tderesources_tdeabc_groupwise.kcfg line 48
-#: rc.cpp:54
+#: rc.cpp:69
 #, no-c-format
 msgid "The last sequence number of the GW System Address Book held locally"
 msgstr ""
 
 #. i18n: file tderesources_tdeabc_groupwise.kcfg line 51
-#: rc.cpp:57
+#: rc.cpp:72
 #, fuzzy, no-c-format
 msgid "Applications which should load the System Address Book"
 msgstr "Llyfr Cyfeiriadau"
 
-#. i18n: file tderesources_kcal_groupwise.kcfg line 19
-#: rc.cpp:72
-#, no-c-format
-msgid "TCP Port"
+#: tdeabc_resourcegroupwise.cpp:290
+#, c-format
+msgid "Loading GroupWise resource %1"
+msgstr ""
+
+#: tdeabc_resourcegroupwise.cpp:363
+#, fuzzy
+msgid "Fetching System Address Book"
+msgstr "Llyfr Cyfeiriadau"
+
+#: tdeabc_resourcegroupwise.cpp:373
+#, fuzzy
+msgid "Fetching User Address Books"
+msgstr "Llyfr Cyfeiriadau"
+
+#: tdeabc_resourcegroupwise.cpp:443
+#, fuzzy
+msgid "Updating System Address Book"
+msgstr "Llyfr Cyfeiriadau"
+
+#: tdeabc_resourcegroupwiseconfig.cpp:88
+msgid "Retrieve Address Book List From Server"
+msgstr ""
+
+#: tdeabc_resourcegroupwiseconfig.cpp:92
+msgid "Address Book"
+msgstr "Llyfr Cyfeiriadau"
+
+#: tdeabc_resourcegroupwiseconfig.cpp:93
+msgid "Personal"
+msgstr "Personol"
+
+#: tdeabc_resourcegroupwiseconfig.cpp:94
+msgid "Frequent Contacts"
+msgstr ""
+
+#: tdeabc_resourcegroupwiseconfig.cpp:99
+msgid "Address book for new contacts:"
 msgstr ""
 
 #: soap/contactconverter.cpp:251
diff --git a/tde-i18n-cy/messages/tdepim/kres_kolab.po b/tde-i18n-cy/messages/tdepim/kres_kolab.po
index 7b347d499b4..06b6efee220 100644
--- a/tde-i18n-cy/messages/tdepim/kres_kolab.po
+++ b/tde-i18n-cy/messages/tdepim/kres_kolab.po
@@ -6,88 +6,90 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: all.po\n"
-"POT-Creation-Date: 2008-02-29 01:41+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: tdeabc/resourcekolab.cpp:205
-msgid "Loading contacts..."
+#: kcal/resourcekolab.cpp:77 knotes/resourcekolab.cpp:58
+#: tdeabc/resourcekolab.cpp:86
+msgid "Kolab Server"
 msgstr ""
 
-#: kcal/resourcekolab.cpp:171
+#: kcal/resourcekolab.cpp:170
 msgid "Loading tasks..."
 msgstr ""
 
-#: kcal/resourcekolab.cpp:172
+#: kcal/resourcekolab.cpp:171
 msgid "Loading journals..."
 msgstr ""
 
-#: kcal/resourcekolab.cpp:173
+#: kcal/resourcekolab.cpp:172
 msgid "Loading events..."
 msgstr ""
 
-#: kcal/resourcekolab.cpp:376
+#: kcal/resourcekolab.cpp:426
 #, c-format
 msgid "Copy of: %1"
 msgstr ""
 
-#: kcal/resourcekolab.cpp:525
+#: kcal/resourcekolab.cpp:598
 msgid "Choose the folder where you want to store this event"
 msgstr ""
 
-#: kcal/resourcekolab.cpp:527
+#: kcal/resourcekolab.cpp:601
 msgid "Choose the folder where you want to store this task"
 msgstr ""
 
-#: kcal/resourcekolab.cpp:529
+#: kcal/resourcekolab.cpp:603
 msgid "Choose the folder where you want to store this incidence"
 msgstr ""
 
-#: kcal/resourcekolab.cpp:532
+#: kcal/resourcekolab.cpp:607
 #, c-format
 msgid "<b>Summary:</b> %1"
 msgstr ""
 
-#: kcal/resourcekolab.cpp:534
+#: kcal/resourcekolab.cpp:609
 #, c-format
 msgid "<b>Location:</b> %1"
 msgstr ""
 
-#: kcal/resourcekolab.cpp:537
+#: kcal/resourcekolab.cpp:612
 msgid "<b>Start:</b> %1, %2"
 msgstr ""
 
-#: kcal/resourcekolab.cpp:540
+#: kcal/resourcekolab.cpp:615
 #, c-format
 msgid "<b>Start:</b> %1"
 msgstr ""
 
-#: kcal/resourcekolab.cpp:546
+#: kcal/resourcekolab.cpp:621
 msgid "<b>End:</b> %1, %2"
 msgstr ""
 
-#: kcal/resourcekolab.cpp:549
+#: kcal/resourcekolab.cpp:624
 #, c-format
 msgid "<b>End:</b> %1"
 msgstr ""
 
-#: kcal/resourcekolab.cpp:1085
+#: kcal/resourcekolab.cpp:1247
 msgid "Calendar"
 msgstr ""
 
-#: kcal/resourcekolab.cpp:1085
+#: kcal/resourcekolab.cpp:1247
 msgid "Tasks"
 msgstr ""
 
-#: kcal/resourcekolab.cpp:1085
+#: kcal/resourcekolab.cpp:1247
 msgid "Journals"
 msgstr ""
 
-#: kcal/resourcekolab.cpp:1086
+#: kcal/resourcekolab.cpp:1248
 msgid "Which kind of subresource should this be?"
 msgstr ""
 
@@ -105,18 +107,47 @@ msgstr ""
 msgid "Internal kolab data: Do not delete this mail."
 msgstr ""
 
-#: shared/resourcekolabbase.cpp:230
+#: shared/resourcekolabbase.cpp:237
+msgid ""
+"You have no writable event folders so saving will not be possible.\n"
+"Please create or activate at least one writable event folder and try again."
+msgstr ""
+
+#: shared/resourcekolabbase.cpp:241
+msgid ""
+"You have no writable task folders so saving will not be possible.\n"
+"Please create or activate at least one writable task folder and try again."
+msgstr ""
+
+#: shared/resourcekolabbase.cpp:245
+msgid ""
+"You have no writable calendar folder so saving will not be possible.\n"
+"Please create or activate at least one writable calendar folder and try again."
+msgstr ""
+
+#: shared/resourcekolabbase.cpp:249
+msgid ""
+"You have no writable notes folders so saving will not be possible.\n"
+"Please create or activate at least one writable notes folder and try again."
+msgstr ""
+
+#: shared/resourcekolabbase.cpp:253
 msgid ""
-"No writable resource was found, saving will not be possible. Reconfigure KMail "
-"first."
+"You have no writable addressbook folder so saving will not be possible.\n"
+"Please create or activate at least one writable addressbook folder and try "
+"again."
 msgstr ""
 
-#: shared/resourcekolabbase.cpp:239
+#: shared/resourcekolabbase.cpp:268
 msgid ""
 "You have more than one writable resource folder. Please select the one you want "
 "to write to."
 msgstr ""
 
-#: shared/resourcekolabbase.cpp:243
+#: shared/resourcekolabbase.cpp:272
 msgid "Select Resource Folder"
 msgstr ""
+
+#: tdeabc/resourcekolab.cpp:206
+msgid "Loading contacts..."
+msgstr ""
diff --git a/tde-i18n-cy/messages/tdepim/kres_remote.po b/tde-i18n-cy/messages/tdepim/kres_remote.po
index 291567115ab..ad5b1b8d803 100644
--- a/tde-i18n-cy/messages/tdepim/kres_remote.po
+++ b/tde-i18n-cy/messages/tdepim/kres_remote.po
@@ -1,19 +1,44 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdepim/kres_remote.po\n"
-"POT-Creation-Date: 2007-01-26 02:44+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: resourceremote.cpp:203
+#: resourceremote.cpp:60
+msgid "Remote Calendar"
+msgstr ""
+
+#: resourceremote.cpp:206
 msgid "Downloading Calendar"
 msgstr ""
 
-#: resourceremote.cpp:317
+#: resourceremote.cpp:227
+msgid "Remote data access failure"
+msgstr ""
+
+#: resourceremote.cpp:227
+msgid "Detailed information"
+msgstr ""
+
+#: resourceremote.cpp:228
+msgid "What would you like to do?"
+msgstr ""
+
+#: resourceremote.cpp:230
+msgid "Remote Data Access Failure"
+msgstr ""
+
+#: resourceremote.cpp:230
+msgid "&Continue with cached resource"
+msgstr ""
+
+#: resourceremote.cpp:333
 #, c-format
 msgid "URL: %1"
 msgstr "URL: %1"
diff --git a/tde-i18n-cy/messages/tdepim/kres_tvanytime.po b/tde-i18n-cy/messages/tdepim/kres_tvanytime.po
index 1290c3150f3..cb3b2aa2b4a 100644
--- a/tde-i18n-cy/messages/tdepim/kres_tvanytime.po
+++ b/tde-i18n-cy/messages/tdepim/kres_tvanytime.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2005-12-30 03:18+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdepim/kres_xmlrpc.po b/tde-i18n-cy/messages/tdepim/kres_xmlrpc.po
index 0fe090071a8..32453c834de 100644
--- a/tde-i18n-cy/messages/tdepim/kres_xmlrpc.po
+++ b/tde-i18n-cy/messages/tdepim/kres_xmlrpc.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdepim/kres_xmlrpc.po\n"
-"POT-Creation-Date: 2006-06-16 04:05+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -13,74 +14,79 @@ msgstr ""
 msgid "Debug Dialog"
 msgstr ""
 
-#: tdeabc_resourcexmlrpc.cpp:297
-msgid "Login failed, please check your username and password."
+#: kcal_resourcexmlrpc.cpp:116 knotes_resourcexmlrpc.cpp:63
+#: tdeabc_resourcexmlrpc.cpp:70
+msgid "eGroupware Server"
 msgstr ""
 
-#: tdeabc_resourcexmlrpc.cpp:316
-msgid "Logout failed, please check your username and password."
-msgstr ""
-
-#: tdeabc_resourcexmlrpc.cpp:393
-msgid "<qt>Server sent error %1: <b>%2</b></qt>"
-msgstr ""
-
-#: tdeabc_resourcexmlrpc.cpp:407
-msgid "Unable to add contact %1 to server. (%2)"
-msgstr ""
-
-#: tdeabc_resourcexmlrpc.cpp:416
-msgid "Unable to update contact %1 on server. (%2)"
-msgstr ""
-
-#: tdeabc_resourcexmlrpc.cpp:436
-msgid "Unable to delete contact %1 from server. (%2)"
-msgstr ""
-
-#: tdeabc_resourcexmlrpcconfig.cpp:41 kcal_resourcexmlrpcconfig.cpp:42
-#: knotes_resourcexmlrpcconfig.cpp:42
+#: kcal_resourcexmlrpcconfig.cpp:42 knotes_resourcexmlrpcconfig.cpp:42
+#: tdeabc_resourcexmlrpcconfig.cpp:41
 msgid "URL:"
 msgstr "URL:"
 
-#: tdeabc_resourcexmlrpcconfig.cpp:47 kcal_resourcexmlrpcconfig.cpp:48
-#: knotes_resourcexmlrpcconfig.cpp:48
+#: kcal_resourcexmlrpcconfig.cpp:48 knotes_resourcexmlrpcconfig.cpp:48
+#: tdeabc_resourcexmlrpcconfig.cpp:47
 msgid "Domain:"
 msgstr "Parth:"
 
-#: tdeabc_resourcexmlrpcconfig.cpp:53 kcal_resourcexmlrpcconfig.cpp:54
-#: knotes_resourcexmlrpcconfig.cpp:54
+#: kcal_resourcexmlrpcconfig.cpp:54 knotes_resourcexmlrpcconfig.cpp:54
+#: tdeabc_resourcexmlrpcconfig.cpp:53
 msgid "User:"
 msgstr "Defnyddiwr:"
 
-#: tdeabc_resourcexmlrpcconfig.cpp:59 kcal_resourcexmlrpcconfig.cpp:60
-#: knotes_resourcexmlrpcconfig.cpp:60
+#: kcal_resourcexmlrpcconfig.cpp:60 knotes_resourcexmlrpcconfig.cpp:60
+#: tdeabc_resourcexmlrpcconfig.cpp:59
 msgid "Password:"
 msgstr "Cyfrinair:"
 
-#. i18n: file tderesources_tdeabc_egroupware.kcfg line 10
+#. i18n: file tderesources_kcal_egroupware.kcfg line 10
 #: rc.cpp:3 rc.cpp:15 rc.cpp:27
 #, no-c-format
 msgid "URL"
 msgstr "URL"
 
-#. i18n: file tderesources_tdeabc_egroupware.kcfg line 13
+#. i18n: file tderesources_kcal_egroupware.kcfg line 13
 #: rc.cpp:6 rc.cpp:18 rc.cpp:30
 #, no-c-format
 msgid "Domain"
 msgstr "Parth"
 
-#. i18n: file tderesources_tdeabc_egroupware.kcfg line 17
+#. i18n: file tderesources_kcal_egroupware.kcfg line 17
 #: rc.cpp:9 rc.cpp:21 rc.cpp:33
 #, no-c-format
 msgid "User Name"
 msgstr "Enw'r defnyddiwr"
 
-#. i18n: file tderesources_tdeabc_egroupware.kcfg line 20
+#. i18n: file tderesources_kcal_egroupware.kcfg line 20
 #: rc.cpp:12 rc.cpp:24 rc.cpp:36
 #, no-c-format
 msgid "Password"
 msgstr "Cyfrinair"
 
+#: tdeabc_resourcexmlrpc.cpp:300
+msgid "Login failed, please check your username and password."
+msgstr ""
+
+#: tdeabc_resourcexmlrpc.cpp:319
+msgid "Logout failed, please check your username and password."
+msgstr ""
+
+#: tdeabc_resourcexmlrpc.cpp:396
+msgid "<qt>Server sent error %1: <b>%2</b></qt>"
+msgstr ""
+
+#: tdeabc_resourcexmlrpc.cpp:410
+msgid "Unable to add contact %1 to server. (%2)"
+msgstr ""
+
+#: tdeabc_resourcexmlrpc.cpp:419
+msgid "Unable to update contact %1 on server. (%2)"
+msgstr ""
+
+#: tdeabc_resourcexmlrpc.cpp:439
+msgid "Unable to delete contact %1 from server. (%2)"
+msgstr ""
+
 #: xmlrpciface.cpp:115
 msgid "Received invalid XML markup: %1 at %2:%3"
 msgstr ""
diff --git a/tde-i18n-cy/messages/tdepim/ktnef.po b/tde-i18n-cy/messages/tdepim/ktnef.po
index 5274321af5e..95ef653299e 100644
--- a/tde-i18n-cy/messages/tdepim/ktnef.po
+++ b/tde-i18n-cy/messages/tdepim/ktnef.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ktnef\n"
-"POT-Creation-Date: 2007-02-16 02:44+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2004-01-09 16:47+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdepim/kwatchgnupg.po b/tde-i18n-cy/messages/tdepim/kwatchgnupg.po
index bd891f5b8f1..0f5d3feebcf 100644
--- a/tde-i18n-cy/messages/tdepim/kwatchgnupg.po
+++ b/tde-i18n-cy/messages/tdepim/kwatchgnupg.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdepim/kwatchgnupg.po\n"
-"POT-Creation-Date: 2005-07-25 01:39+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdepim/libkcal.po b/tde-i18n-cy/messages/tdepim/libkcal.po
index 7df6d8e067e..670bcfd6b4d 100644
--- a/tde-i18n-cy/messages/tdepim/libkcal.po
+++ b/tde-i18n-cy/messages/tdepim/libkcal.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkcal\n"
-"POT-Creation-Date: 2008-08-19 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2004-02-25 14:00+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,6 +27,39 @@ msgid ""
 "Your emails"
 msgstr "kyfieithu@dotmon.com"
 
+#: attachmenthandler.cpp:73
+msgid "No attachment named \"%1\" found in the incidence."
+msgstr ""
+
+#: attachmenthandler.cpp:81
+msgid ""
+"The attachment \"%1\" is a web link that is inaccessible from this computer. "
+msgstr ""
+
+#: attachmenthandler.cpp:103
+msgid ""
+"The incidence that owns the attachment named \"%1\" could not be found. Perhaps "
+"it was removed from your calendar?"
+msgstr ""
+
+#: attachmenthandler.cpp:122
+msgid ""
+"The calendar invitation stored in this email message is broken in some way. "
+"Unable to continue."
+msgstr ""
+
+#: attachmenthandler.cpp:178 attachmenthandler.cpp:232
+msgid "Unable to create a temporary file for the attachment."
+msgstr ""
+
+#: attachmenthandler.cpp:206
+msgid "Save Attachment"
+msgstr ""
+
+#: attachmenthandler.cpp:211
+msgid "%1 already exists. Do you want to overwrite it?"
+msgstr ""
+
 #: attendee.cpp:76
 msgid "Needs Action"
 msgstr "Angen Gweithred"
@@ -48,8 +82,7 @@ msgstr "Petrus"
 msgid "Delegated"
 msgstr "Dirprwyedig"
 
-#: attendee.cpp:91 htmlexport.cpp:358 incidence.cpp:718
-#: incidenceformatter.cpp:435
+#: attendee.cpp:91 htmlexport.cpp:366 incidence.cpp:774
 msgid "Completed"
 msgstr "Cyflawn"
 
@@ -57,42 +90,49 @@ msgstr "Cyflawn"
 msgid "In Process"
 msgstr "Ar Fynd"
 
-#: attendee.cpp:143
+#: attendee.cpp:97
+#, fuzzy
+msgid ""
+"_: attendee status unknown\n"
+"Unknown"
+msgstr "Petrus"
+
+#: attendee.cpp:146
 msgid "Chair"
 msgstr "Cadeirydd"
 
-#: attendee.cpp:147
+#: attendee.cpp:150
 msgid "Participant"
 msgstr "Cyfranogwr"
 
-#: attendee.cpp:150
+#: attendee.cpp:153
 msgid "Optional Participant"
 msgstr "Cyfranogwr Dewisol"
 
-#: attendee.cpp:153
+#: attendee.cpp:156
 msgid "Observer"
 msgstr "Gwyliwr"
 
-#: calendar.cpp:64
+#: calendar.cpp:65
 msgid "Unknown Name"
 msgstr "Enw Anhysbys"
 
-#: calendar.cpp:64
+#: calendar.cpp:65
 msgid "unknown@nowhere"
 msgstr "anhysbys@lembyd"
 
-#: calendarlocal.cpp:581
+#: calendarlocal.cpp:746
 msgid ""
 "The timezone setting was changed. In order to display the calendar you are "
 "looking at in the new timezone, it needs to be saved. Do you want to save the "
 "pending changes or rather wait and apply the new timezone on the next reload?"
 msgstr ""
 
-#: calendarlocal.cpp:587
+#: calendarlocal.cpp:752
 msgid "Save before applying timezones?"
 msgstr ""
 
-#: calendarlocal.cpp:589
+#: calendarlocal.cpp:754
 msgid "Apply Timezone Change on Next Reload"
 msgstr ""
 
@@ -121,7 +161,8 @@ msgid "UID"
 msgstr "UID"
 
 #: convertqtopia.cpp:42
-msgid "Convert Qtopia calendar file to iCalendar"
+#, fuzzy
+msgid "Convert TQtopia calendar file to iCalendar"
 msgstr "Trosi ffeil calendr Qtopia i iCalendar"
 
 #: convertqtopia.cpp:44
@@ -137,7 +178,8 @@ msgid "Input file"
 msgstr "Ffeil mewnbwn"
 
 #: convertqtopia.cpp:53
-msgid "Qtopia calendar file converter"
+#, fuzzy
+msgid "TQtopia calendar file converter"
 msgstr "Trosiadydd ffeil calendr Qtopia"
 
 #: convertqtopia.cpp:76
@@ -156,119 +198,126 @@ msgstr "Gwall: Dim ffeil mewnbwn."
 msgid "Error saving to '%1'."
 msgstr "Gwall wrth gadw i '%1'."
 
-#: exceptions.cpp:40
+#: exceptions.cpp:41
 msgid "%1 Error"
 msgstr "Gwall %1"
 
-#: exceptions.cpp:57
+#: exceptions.cpp:60
 msgid "Load Error"
 msgstr "Gwall Llwytho"
 
-#: exceptions.cpp:60
+#: exceptions.cpp:63
 msgid "Save Error"
 msgstr "Gwall Cadw"
 
-#: exceptions.cpp:63
+#: exceptions.cpp:66
 msgid "Parse Error in libical"
 msgstr "Gwall Dosrannu yn libical"
 
-#: exceptions.cpp:66
+#: exceptions.cpp:69
 msgid "Parse Error in libkcal"
 msgstr "Gwall Dosrannu yn libkcal"
 
-#: exceptions.cpp:69
+#: exceptions.cpp:72
 msgid "No calendar component found."
 msgstr "Ni chanfuwyd cydran calendr."
 
-#: exceptions.cpp:72
+#: exceptions.cpp:75
 msgid "vCalendar Version 1.0 detected."
 msgstr "Darganfuwyd vCalendar Fersiwn 1.0"
 
-#: exceptions.cpp:75
+#: exceptions.cpp:78
 msgid "iCalendar Version 2.0 detected."
 msgstr "Darganfuwyd vCalendar Fersiwn 2.0"
 
-#: exceptions.cpp:78
+#: exceptions.cpp:81
+msgid "Unknown calendar format detected."
+msgstr ""
+
+#: exceptions.cpp:84
 msgid "Restriction violation"
 msgstr "Trosiad Cyfryngiad"
 
-#: htmlexport.cpp:149
+#: exceptions.cpp:87
+msgid "No writable resource found"
+msgstr ""
+
+#: htmlexport.cpp:150
 msgid ""
 "_: month_year\n"
 "%1 %2"
 msgstr "%1 %2"
 
-#: htmlexport.cpp:224
+#: htmlexport.cpp:228
 msgid "Start Time"
 msgstr "Amser Dechrau"
 
-#: htmlexport.cpp:225
+#: htmlexport.cpp:229
 msgid "End Time"
 msgstr "Amser Gorffen"
 
-#: htmlexport.cpp:226
+#: htmlexport.cpp:230
 msgid "Event"
 msgstr "Digwyddiad"
 
-#: htmlexport.cpp:228 htmlexport.cpp:364 incidenceformatter.cpp:334
-#: incidenceformatter.cpp:413
+#: htmlexport.cpp:232 htmlexport.cpp:372
 msgid "Location"
 msgstr "Lleoliad"
 
-#: htmlexport.cpp:232 htmlexport.cpp:368
+#: htmlexport.cpp:236 htmlexport.cpp:376
 msgid "Categories"
 msgstr "Categoriau"
 
-#: htmlexport.cpp:236 htmlexport.cpp:372 incidenceformatter.cpp:158
+#: htmlexport.cpp:240 htmlexport.cpp:380 incidenceformatter.cpp:1950
 msgid "Attendees"
 msgstr "Cyfarfotwyr"
 
-#: htmlexport.cpp:356
+#: htmlexport.cpp:364
 msgid "Task"
 msgstr "Tasg"
 
-#: htmlexport.cpp:357 incidenceformatter.cpp:426
+#: htmlexport.cpp:365
 msgid "Priority"
 msgstr "Blaenoriaeth"
 
-#: htmlexport.cpp:360
+#: htmlexport.cpp:368
 msgid "Due Date"
 msgstr "Dyddiad Disgwyliedig"
 
-#: htmlexport.cpp:391
+#: htmlexport.cpp:399
 msgid "Sub-Tasks of: "
 msgstr "Is-Dasgau o:"
 
-#: htmlexport.cpp:441
+#: htmlexport.cpp:449
 msgid "Sub-Tasks"
 msgstr "Is-dasgau"
 
-#: htmlexport.cpp:454 incidenceformatter.cpp:436
+#: htmlexport.cpp:462
 msgid "%1 %"
 msgstr "%1 %"
 
-#: htmlexport.cpp:605
+#: htmlexport.cpp:613
 msgid "This page was created "
 msgstr "Creuwyd y dudalen yma"
 
-#: htmlexport.cpp:613 htmlexport.cpp:615
+#: htmlexport.cpp:621 htmlexport.cpp:623
 msgid "by <a href=\"mailto:%1\">%2</a> "
 msgstr "gan <a href=\"mailto:%1\">%2</a> "
 
-#: htmlexport.cpp:618
+#: htmlexport.cpp:626
 msgid "by %1 "
 msgstr "gan %1"
 
-#: htmlexport.cpp:622
+#: htmlexport.cpp:630
 msgid "with <a href=\"%1\">%2</a>"
 msgstr "gyda <a href=\"%1\">%2</a>"
 
-#: htmlexport.cpp:626
+#: htmlexport.cpp:634
 #, c-format
 msgid "with %1"
 msgstr "gyda %1"
 
-#: htmlexport.cpp:701
+#: htmlexport.cpp:709
 msgid ""
 "_: list of holidays\n"
 "%1, %2"
@@ -282,285 +331,446 @@ msgstr "Methu cadw '%1'"
 msgid "libical error"
 msgstr "gwall libical"
 
-#: icalformatimpl.cpp:1990
+#: icalformatimpl.cpp:2127
+msgid "No VERSION property found"
+msgstr ""
+
+#: icalformatimpl.cpp:2136
 msgid "Expected iCalendar format"
 msgstr "Fformat iCalendar a ddisgwyliwyd"
 
-#: incidence.cpp:716
+#: incidence.cpp:772
 msgid ""
 "_: incidence status\n"
 "Tentative"
 msgstr "Petrus"
 
-#: incidence.cpp:717
+#: incidence.cpp:773
 msgid "Confirmed"
 msgstr ""
 
-#: incidence.cpp:719
+#: incidence.cpp:775
 #, fuzzy
 msgid "Needs-Action"
 msgstr "Angen Gweithred"
 
-#: incidence.cpp:720
+#: incidence.cpp:776
 msgid "Canceled"
 msgstr "Gwrthwnaed"
 
-#: incidence.cpp:721
+#: incidence.cpp:777
 #, fuzzy
 msgid "In-Process"
 msgstr "Ar Fynd"
 
-#: incidence.cpp:722
+#: incidence.cpp:778
 msgid "Draft"
 msgstr "Drafft"
 
-#: incidence.cpp:723
+#: incidence.cpp:779
 msgid "Final"
 msgstr "Terfynol"
 
-#: incidence.cpp:751
+#: incidence.cpp:807
 msgid "Public"
 msgstr "Cyffredin"
 
-#: incidence.cpp:753
+#: incidence.cpp:809
 msgid "Private"
 msgstr "Preifat"
 
-#: incidence.cpp:755
+#: incidence.cpp:811
 msgid "Confidential"
 msgstr "Cyfrinachol"
 
-#: incidence.cpp:757
+#: incidence.cpp:813
 msgid "Undefined"
 msgstr "Annifinir"
 
-#: incidenceformatter.cpp:151
-msgid "Organizer"
-msgstr "Trefnydd"
-
-#: incidenceformatter.cpp:165
+#: incidenceformatter.cpp:251 incidenceformatter.cpp:1970
+#: incidenceformatter.cpp:3408
 msgid " (delegated by %1)"
 msgstr ""
 
-#: incidenceformatter.cpp:168
+#: incidenceformatter.cpp:254 incidenceformatter.cpp:1973
+#: incidenceformatter.cpp:3411
 msgid " (delegated to %1)"
 msgstr ""
 
-#: incidenceformatter.cpp:186
+#: incidenceformatter.cpp:274 incidenceformatter.cpp:3431
+#, fuzzy
+msgid "Organizer:"
+msgstr "Trefnydd"
+
+#: incidenceformatter.cpp:287 incidenceformatter.cpp:3439
+#, fuzzy
+msgid "Chair:"
+msgstr "Cadeirydd"
+
+#: incidenceformatter.cpp:296 incidenceformatter.cpp:3446
+#, fuzzy
+msgid "Required Participants:"
+msgstr "Cyfranogwr"
+
+#: incidenceformatter.cpp:305 incidenceformatter.cpp:3453
+#, fuzzy
+msgid "Optional Participants:"
+msgstr "Cyfranogwr Dewisol"
+
+#: incidenceformatter.cpp:314 incidenceformatter.cpp:3460
+#, fuzzy
+msgid "Observers:"
+msgstr "Gwyliwr"
+
+#: incidenceformatter.cpp:333
 msgid "Show mail"
 msgstr ""
 
-#: incidenceformatter.cpp:285 incidenceformatter.cpp:295
-#: incidenceformatter.cpp:300
-msgid "Time"
-msgstr "Amser"
+#: incidenceformatter.cpp:361
+#, fuzzy, c-format
+msgid "Creation date: %1"
+msgstr "Dyddiad Disgwyliedig"
+
+#: incidenceformatter.cpp:468 incidenceformatter.cpp:641
+#: incidenceformatter.cpp:791 incidenceformatter.cpp:3485
+#, fuzzy
+msgid "Calendar:"
+msgstr "vCalendr"
+
+#: incidenceformatter.cpp:476 incidenceformatter.cpp:649
+#: incidenceformatter.cpp:3494 resourcelocalconfig.cpp:49
+#: resourcelocaldirconfig.cpp:48
+msgid "Location:"
+msgstr "Lleoliad:"
 
-#: incidenceformatter.cpp:286 incidenceformatter.cpp:296
-#: incidenceformatter.cpp:302
+#: incidenceformatter.cpp:502 incidenceformatter.cpp:509
+#: incidenceformatter.cpp:517 incidenceformatter.cpp:524
+#: incidenceformatter.cpp:798 incidenceformatter.cpp:1320
+#: incidenceformatter.cpp:1471
+msgid "Date:"
+msgstr "Dyddiad:"
+
+#: incidenceformatter.cpp:504 incidenceformatter.cpp:519
+#, fuzzy
 msgid ""
-"_: <beginTime> - <endTime>\n"
+"_: <beginDate> - <endDate>\n"
 "%1 - %2"
 msgstr "%1 - %2"
 
-#: incidenceformatter.cpp:290 incidenceformatter.cpp:309
-msgid "Date"
-msgstr "Dyddiad"
-
-#: incidenceformatter.cpp:291 incidenceformatter.cpp:310
+#: incidenceformatter.cpp:511 incidenceformatter.cpp:526
 #, c-format
 msgid ""
 "_: date as string\n"
 "%1"
 msgstr "%1"
 
-#: incidenceformatter.cpp:318
-msgid "Birthday"
-msgstr "Penblwydd"
+#: incidenceformatter.cpp:531 incidenceformatter.cpp:1323
+#, fuzzy
+msgid "Time:"
+msgstr "Amser"
+
+#: incidenceformatter.cpp:534
+msgid ""
+"_: <beginTime> - <endTime>\n"
+"%1 - %2"
+msgstr "%1 - %2"
+
+#: incidenceformatter.cpp:550 incidenceformatter.cpp:691
+#: incidenceformatter.cpp:1352 incidenceformatter.cpp:3501
+msgid "Duration:"
+msgstr "Hyd:"
+
+#: incidenceformatter.cpp:557 incidenceformatter.cpp:698
+#: incidenceformatter.cpp:1358 incidenceformatter.cpp:3507
+#, fuzzy
+msgid "Recurrence:"
+msgstr "Dim"
 
-#: incidenceformatter.cpp:327 incidenceformatter.cpp:406
+#: incidenceformatter.cpp:567
 #, fuzzy
-msgid "Description"
+msgid "Anniversary:"
+msgstr "Pen blwydd"
+
+#: incidenceformatter.cpp:569
+#, fuzzy
+msgid "Birthday:"
+msgstr "Penblwydd"
+
+#: incidenceformatter.cpp:579 incidenceformatter.cpp:707
+#: incidenceformatter.cpp:806 incidenceformatter.cpp:1245
+#: incidenceformatter.cpp:1473 incidenceformatter.cpp:3517
+msgid "Description:"
 msgstr "Disgrifiad:"
 
-#: incidenceformatter.cpp:341 incidenceformatter.cpp:420
+#: incidenceformatter.cpp:590 incidenceformatter.cpp:718
+#: incidenceformatter.cpp:3525
 #, fuzzy, c-format
 msgid ""
-"_n: 1 Category\n"
-"%n Categories"
-msgstr "Categoriau"
-
-#: incidenceformatter.cpp:350 incidenceformatter.cpp:443
-msgid "Next on"
+"_n: Reminder:\n"
+"%n Reminders:"
 msgstr ""
+"1 munud\n"
+"%n o funudau "
+
+#: incidenceformatter.cpp:602 incidenceformatter.cpp:730
+#: incidenceformatter.cpp:815 incidenceformatter.cpp:3535
+#, fuzzy, c-format
+msgid ""
+"_n: Category:\n"
+"%n Categories:"
+msgstr "Categoriau"
 
-#: incidenceformatter.cpp:371 incidenceformatter.cpp:464
+#: incidenceformatter.cpp:612
 #, fuzzy, c-format
 msgid ""
-"_n: 1 attachment\n"
-"%n attachments"
+"_n: Attachment:\n"
+"%n Attachments:"
 msgstr ""
 "1 munud\n"
 "%n o funudau "
 
-#: incidenceformatter.cpp:377 incidenceformatter.cpp:470
-#, c-format
-msgid "Creation date: %1."
+#: incidenceformatter.cpp:662
+#, fuzzy
+msgid "Start:"
+msgstr "Amser Dechrau :"
+
+#: incidenceformatter.cpp:680
+msgid "Due:"
 msgstr ""
 
-#: incidenceformatter.cpp:391
-msgid "Due on"
+#: incidenceformatter.cpp:738 incidenceformatter.cpp:3293
+#, fuzzy
+msgid "Priority:"
+msgstr "Blaenoriaeth"
+
+#: incidenceformatter.cpp:747 incidenceformatter.cpp:3299
+#, fuzzy
+msgid "Completed:"
+msgstr "Cyflawn"
+
+#: incidenceformatter.cpp:751 incidenceformatter.cpp:3302
+msgid "Percent Done:"
 msgstr ""
 
-#: incidenceformatter.cpp:430 incidenceformatter.cpp:623
+#: incidenceformatter.cpp:753 incidenceformatter.cpp:2178
+#: incidenceformatter.cpp:2179 incidenceformatter.cpp:3303
 #, fuzzy
-msgid "Unspecified"
-msgstr "Annifinir"
+msgid "%1%"
+msgstr "%1 %"
 
-#: incidenceformatter.cpp:484
-#, c-format
-msgid "Journal for %1"
+#: incidenceformatter.cpp:762
+#, fuzzy
+msgid ""
+"_n: Attachment:\n"
+"Attachments:"
 msgstr ""
+"1 munud\n"
+"%n o funudau "
 
-#: incidenceformatter.cpp:496 incidenceformatter.cpp:1976
+#: incidenceformatter.cpp:835 incidenceformatter.cpp:3351
 #, c-format
 msgid "Free/Busy information for %1"
 msgstr ""
 
-#: incidenceformatter.cpp:498
+#: incidenceformatter.cpp:838
 msgid "Busy times in date range %1 - %2:"
 msgstr ""
 
-#: incidenceformatter.cpp:504
+#: incidenceformatter.cpp:844
 msgid "Busy:"
 msgstr "Prysur :"
 
-#: incidenceformatter.cpp:512 incidenceformatter.cpp:694
-#: incidenceformatter.cpp:778
+#: incidenceformatter.cpp:852 incidenceformatter.cpp:1503
 #, c-format
 msgid ""
 "_n: 1 hour \n"
 "%n hours "
 msgstr ""
 
-#: incidenceformatter.cpp:516 incidenceformatter.cpp:697
+#: incidenceformatter.cpp:856
 #, c-format
 msgid ""
 "_n: 1 minute \n"
 "%n minutes "
 msgstr ""
 
-#: incidenceformatter.cpp:520 incidenceformatter.cpp:786
+#: incidenceformatter.cpp:860 incidenceformatter.cpp:1511
 #, c-format
 msgid ""
 "_n: 1 second\n"
 "%n seconds"
 msgstr ""
 
-#: incidenceformatter.cpp:522 incidenceformatter.cpp:788
+#: incidenceformatter.cpp:862 incidenceformatter.cpp:1513
 msgid ""
 "_: startDate for duration\n"
 "%1 for %2"
 msgstr ""
 
-#: incidenceformatter.cpp:528 incidenceformatter.cpp:794
+#: incidenceformatter.cpp:868 incidenceformatter.cpp:1519
 msgid ""
 "_: date, fromTime - toTime \n"
 "%1, %2 - %3"
 msgstr ""
 
-#: incidenceformatter.cpp:533 incidenceformatter.cpp:799
+#: incidenceformatter.cpp:873 incidenceformatter.cpp:1524
 msgid ""
 "_: fromDateTime - toDateTime\n"
 "%1 - %2"
 msgstr "%1 - %2"
 
-#: incidenceformatter.cpp:602
+#: incidenceformatter.cpp:971
 msgid ""
 "_: %1: Start Date, %2: Start Time\n"
 "%1 %2"
 msgstr "%1 %2"
 
-#: incidenceformatter.cpp:605
+#: incidenceformatter.cpp:975
+#, fuzzy
 msgid ""
 "_: %1: Start Date\n"
-"%1 (time unspecified)"
-msgstr ""
+"%1 (all day)"
+msgstr "%1 %2"
 
-#: incidenceformatter.cpp:616
+#: incidenceformatter.cpp:986
 msgid ""
 "_: %1: End Date, %2: End Time\n"
 "%1 %2"
 msgstr "%1 %2"
 
-#: incidenceformatter.cpp:619
+#: incidenceformatter.cpp:990
+#, fuzzy
 msgid ""
 "_: %1: End Date\n"
-"%1 (time unspecified)"
+"%1 (all day)"
+msgstr "%1 %2"
+
+#: incidenceformatter.cpp:1107
+msgid "Your response is requested"
 msgstr ""
 
-#: incidenceformatter.cpp:638 incidenceformatter.cpp:726
-#: incidenceformatter.cpp:749
-msgid "Description:"
-msgstr "Disgrifiad:"
+#: incidenceformatter.cpp:1109
+msgid "Your response as <b>%1</b> is requested"
+msgstr ""
+
+#: incidenceformatter.cpp:1113
+msgid "No response is necessary"
+msgstr ""
 
-#: incidenceformatter.cpp:644
+#: incidenceformatter.cpp:1115
+msgid "No response as <b>%1</b> is necessary"
+msgstr ""
+
+#: incidenceformatter.cpp:1126
+msgid "(<b>Note</b>: the Organizer preset your response to <b>%1</b>)"
+msgstr ""
+
+#: incidenceformatter.cpp:1255
 msgid "Comments:"
 msgstr ""
 
-#: incidenceformatter.cpp:662 incidenceformatter.cpp:716
-#: incidenceformatter.cpp:738
+#: incidenceformatter.cpp:1280 incidenceformatter.cpp:1391
+#: incidenceformatter.cpp:1455
 msgid "Summary unspecified"
 msgstr ""
 
-#: incidenceformatter.cpp:667
+#: incidenceformatter.cpp:1292 incidenceformatter.cpp:1403
 msgid "Location unspecified"
 msgstr ""
 
-#: incidenceformatter.cpp:678
+#: incidenceformatter.cpp:1310 incidenceformatter.cpp:1420
 msgid "What:"
 msgstr "Beth :"
 
-#: incidenceformatter.cpp:679
+#: incidenceformatter.cpp:1311 incidenceformatter.cpp:1421
 msgid "Where:"
 msgstr "Lle :"
 
-#: incidenceformatter.cpp:682
+#: incidenceformatter.cpp:1314
+#, fuzzy
+msgid "First Start Time:"
+msgstr "Amser Dechrau :"
+
+#: incidenceformatter.cpp:1315
+#, fuzzy
+msgid "First End Time:"
+msgstr "Amser Gorffen :"
+
+#: incidenceformatter.cpp:1329
+msgid ""
+"_: Starting date of an event\n"
+"From:"
+msgstr ""
+
+#: incidenceformatter.cpp:1332 incidenceformatter.cpp:1339
+msgid ""
+"_: Starting time of an event\n"
+"At:"
+msgstr ""
+
+#: incidenceformatter.cpp:1336 incidenceformatter.cpp:1343
+msgid ""
+"_: Ending date of an event\n"
+"To:"
+msgstr ""
+
+#: incidenceformatter.cpp:1344
+#, fuzzy
+msgid "no end date specified"
+msgstr "Annifinir"
+
+#: incidenceformatter.cpp:1368
+#, fuzzy
+msgid "Cancelled on:"
+msgstr "Gwrthwnaed"
+
+#: incidenceformatter.cpp:1424
+#, fuzzy
+msgid "Start Date:"
+msgstr "Dyddiad dechrau:"
+
+#: incidenceformatter.cpp:1427
 msgid "Start Time:"
 msgstr "Amser Dechrau :"
 
-#: incidenceformatter.cpp:685
-msgid "End Time:"
+#: incidenceformatter.cpp:1432 incidenceformatter.cpp:1440
+#, fuzzy
+msgid "Due Date:"
+msgstr "Dyddiad Disgwyliedig"
+
+#: incidenceformatter.cpp:1435
+#, fuzzy
+msgid "Due Time:"
 msgstr "Amser Gorffen :"
 
-#: incidenceformatter.cpp:700
-msgid "Duration:"
-msgstr "Hyd:"
+#: incidenceformatter.cpp:1440
+#, fuzzy
+msgid ""
+"_: Due Date: None\n"
+"None"
+msgstr "Dyddiad Disgwyliedig"
 
-#: incidenceformatter.cpp:717 incidenceformatter.cpp:739
+#: incidenceformatter.cpp:1456
 msgid "Description unspecified"
 msgstr ""
 
-#: incidenceformatter.cpp:725 incidenceformatter.cpp:747
+#: incidenceformatter.cpp:1470
 msgid "Summary:"
 msgstr "Crynodeb:"
 
-#: incidenceformatter.cpp:748
-msgid "Date:"
-msgstr "Dyddiad:"
-
-#: incidenceformatter.cpp:762
+#: incidenceformatter.cpp:1486
 msgid "Person:"
 msgstr ""
 
-#: incidenceformatter.cpp:763
+#: incidenceformatter.cpp:1487
 msgid "Start date:"
 msgstr "Dyddiad dechrau:"
 
-#: incidenceformatter.cpp:764
+#: incidenceformatter.cpp:1489
 msgid "End date:"
 msgstr "Dyddiad gorffen:"
 
-#: incidenceformatter.cpp:782
+#: incidenceformatter.cpp:1507
 #, c-format
 msgid ""
 "_n: 1 minute\n"
@@ -569,543 +779,1003 @@ msgstr ""
 "1 munud\n"
 "%n o funudau "
 
-#: incidenceformatter.cpp:818
-msgid "This event has been published"
+#: incidenceformatter.cpp:1564
+#, fuzzy
+msgid "This invitation has been published"
+msgstr "Creuwyd y dudalen yma"
+
+#: incidenceformatter.cpp:1567
+#, fuzzy, c-format
+msgid "This invitation has been updated by the organizer %1"
+msgstr "Creuwyd y dudalen yma"
+
+#: incidenceformatter.cpp:1571
+msgid "I created this invitation"
 msgstr ""
 
-#: incidenceformatter.cpp:821
-msgid "This meeting has been updated"
+#: incidenceformatter.cpp:1581
+#, c-format
+msgid "You received an invitation from %1"
 msgstr ""
 
-#: incidenceformatter.cpp:822
-msgid "You have been invited to this meeting"
+#: incidenceformatter.cpp:1583
+msgid "You received an invitation"
 msgstr ""
 
-#: incidenceformatter.cpp:824
-msgid "This invitation was refreshed"
+#: incidenceformatter.cpp:1587
+msgid "You received an invitation from %1 as a representative of %2"
 msgstr ""
 
-#: incidenceformatter.cpp:826
-msgid "This meeting has been canceled"
+#: incidenceformatter.cpp:1590
+msgid "You received an invitation from %1 as the organizer's representative"
+msgstr ""
+
+#: incidenceformatter.cpp:1596
+msgid "This invitation was refreshed"
 msgstr ""
 
-#: incidenceformatter.cpp:828
-msgid "Addition to the meeting invitation"
+#: incidenceformatter.cpp:1598
+#, fuzzy
+msgid "This invitation has been canceled"
+msgstr "Creuwyd y dudalen yma"
+
+#: incidenceformatter.cpp:1600
+msgid "Addition to the invitation"
 msgstr ""
 
-#: incidenceformatter.cpp:843
+#: incidenceformatter.cpp:1604 incidenceformatter.cpp:1684
+#: incidenceformatter.cpp:1748 incidenceformatter.cpp:1837
+#, fuzzy
+msgid "%1 makes this counter proposal"
+msgstr "Gwrthod Gwrthgynnig"
+
+#: incidenceformatter.cpp:1605 incidenceformatter.cpp:1617
+#: incidenceformatter.cpp:1685 incidenceformatter.cpp:1689
+#: incidenceformatter.cpp:1749 incidenceformatter.cpp:1761
+#: incidenceformatter.cpp:1838 incidenceformatter.cpp:1842
 #, fuzzy
 msgid "Sender"
 msgstr "Atgof"
 
-#: incidenceformatter.cpp:852
+#: incidenceformatter.cpp:1628
 msgid "%1 indicates this invitation still needs some action"
 msgstr ""
 
-#: incidenceformatter.cpp:855
-msgid "%1 accepts this meeting invitation"
-msgstr ""
+#: incidenceformatter.cpp:1632
+#, fuzzy, c-format
+msgid "This invitation has been updated by attendee %1"
+msgstr "Creuwyd y dudalen yma"
 
-#: incidenceformatter.cpp:856
-msgid "%1 accepts this meeting invitation on behalf of %2"
-msgstr ""
+#: incidenceformatter.cpp:1634
+#, fuzzy
+msgid "This invitation has been updated by an attendee"
+msgstr "Creuwyd y dudalen yma"
 
-#: incidenceformatter.cpp:860
-msgid "%1 tentatively accepts this meeting invitation"
-msgstr ""
+#: incidenceformatter.cpp:1638
+#, fuzzy
+msgid "%1 accepts this invitation"
+msgstr "Gwrthod Gwrthgynnig"
 
-#: incidenceformatter.cpp:861
-msgid "%1 tentatively accepts this meeting invitation on behalf of %2"
+#: incidenceformatter.cpp:1640
+msgid "%1 accepts this invitation on behalf of %2"
 msgstr ""
 
-#: incidenceformatter.cpp:865
-msgid "%1 declines this meeting invitation"
+#: incidenceformatter.cpp:1646
+msgid "%1 tentatively accepts this invitation"
 msgstr ""
 
-#: incidenceformatter.cpp:866
-msgid "%1 declines this meeting invitation on behalf of %2"
+#: incidenceformatter.cpp:1649
+msgid "%1 tentatively accepts this invitation on behalf of %2"
 msgstr ""
 
-#: incidenceformatter.cpp:874
-msgid "%1 has delegated this meeting invitation to %2"
+#: incidenceformatter.cpp:1654
+#, fuzzy
+msgid "%1 declines this invitation"
+msgstr "Gwrthod Gwrthgynnig"
+
+#: incidenceformatter.cpp:1656
+msgid "%1 declines this invitation on behalf of %2"
 msgstr ""
 
-#: incidenceformatter.cpp:876
-msgid "%1 has delegated this meeting invitation"
+#: incidenceformatter.cpp:1666
+msgid "%1 has delegated this invitation to %2"
 msgstr ""
 
-#: incidenceformatter.cpp:879
-msgid "This meeting invitation is now completed"
+#: incidenceformatter.cpp:1669
+msgid "%1 has delegated this invitation"
 msgstr ""
 
-#: incidenceformatter.cpp:881
-msgid "%1 is still processing the invitation"
+#: incidenceformatter.cpp:1673
+msgid "This invitation is now completed"
 msgstr ""
 
-#: incidenceformatter.cpp:883
-msgid "Unknown response to this meeting invitation"
+#: incidenceformatter.cpp:1675
+msgid "%1 is still processing the invitation"
 msgstr ""
 
-#: incidenceformatter.cpp:887 incidenceformatter.cpp:952
-#: incidenceformatter.cpp:1009
-msgid "Sender makes this counter proposal"
+#: incidenceformatter.cpp:1678
+msgid "Unknown response to this invitation"
 msgstr ""
 
-#: incidenceformatter.cpp:889 incidenceformatter.cpp:954
-#: incidenceformatter.cpp:1011
+#: incidenceformatter.cpp:1688 incidenceformatter.cpp:1841
 #, fuzzy
-msgid "Sender declines the counter proposal"
+msgid "%1 declines the counter proposal"
 msgstr "Gwrthod Gwrthgynnig"
 
-#: incidenceformatter.cpp:891 incidenceformatter.cpp:956
-#: incidenceformatter.cpp:1013
+#: incidenceformatter.cpp:1692 incidenceformatter.cpp:1845
+#: incidenceformatter.cpp:1910
 msgid "Error: iMIP message with unknown method: '%1'"
 msgstr ""
 
-#: incidenceformatter.cpp:903
+#: incidenceformatter.cpp:1707
 msgid "This task has been published"
 msgstr ""
 
-#: incidenceformatter.cpp:906
-#, fuzzy
-msgid "This task has been updated"
+#: incidenceformatter.cpp:1710
+#, fuzzy, c-format
+msgid "This task has been updated by the organizer %1"
 msgstr "Creuwyd y dudalen yma"
 
-#: incidenceformatter.cpp:907
+#: incidenceformatter.cpp:1714
+msgid "I created this task"
+msgstr ""
+
+#: incidenceformatter.cpp:1724
+#, c-format
+msgid "You have been assigned this task by %1"
+msgstr ""
+
+#: incidenceformatter.cpp:1726
 msgid "You have been assigned this task"
 msgstr ""
 
-#: incidenceformatter.cpp:909
+#: incidenceformatter.cpp:1730
+msgid "You have been assigned this task by %1 as a representative of %2"
+msgstr ""
+
+#: incidenceformatter.cpp:1733
+msgid ""
+"You have been assigned this task by %1 as the organizer's representative"
+msgstr ""
+
+#: incidenceformatter.cpp:1740
 #, fuzzy
 msgid "This task was refreshed"
 msgstr "Creuwyd y dudalen yma"
 
-#: incidenceformatter.cpp:911
+#: incidenceformatter.cpp:1742
 #, fuzzy
 msgid "This task was canceled"
 msgstr "Creuwyd y dudalen yma"
 
-#: incidenceformatter.cpp:913
+#: incidenceformatter.cpp:1744
 msgid "Addition to the task"
 msgstr ""
 
-#: incidenceformatter.cpp:927
-msgid "Sender indicates this task assignment still needs some action"
+#: incidenceformatter.cpp:1772
+msgid "%1 indicates this task assignment still needs some action"
 msgstr ""
 
-#: incidenceformatter.cpp:929
-msgid "Sender accepts this task"
+#: incidenceformatter.cpp:1777
+#, fuzzy, c-format
+msgid "This task has been completed by assignee %1"
+msgstr "Creuwyd y dudalen yma"
+
+#: incidenceformatter.cpp:1779
+#, fuzzy, c-format
+msgid "This task has been updated by assignee %1"
+msgstr "Creuwyd y dudalen yma"
+
+#: incidenceformatter.cpp:1783
+#, fuzzy
+msgid "This task has been completed by an assignee"
+msgstr "Creuwyd y dudalen yma"
+
+#: incidenceformatter.cpp:1785
+#, fuzzy
+msgid "This task has been updated by an assignee"
+msgstr "Creuwyd y dudalen yma"
+
+#: incidenceformatter.cpp:1790
+#, fuzzy
+msgid "%1 accepts this task"
+msgstr "Gwrthod Gwrthgynnig"
+
+#: incidenceformatter.cpp:1792
+msgid "%1 accepts this task on behalf of %2"
 msgstr ""
 
-#: incidenceformatter.cpp:931
-msgid "Sender tentatively accepts this task"
+#: incidenceformatter.cpp:1798
+#, fuzzy
+msgid "%1 tentatively accepts this task"
+msgstr "Gwrthod Gwrthgynnig"
+
+#: incidenceformatter.cpp:1801
+msgid "%1 tentatively accepts this task on behalf of %2"
 msgstr ""
 
-#: incidenceformatter.cpp:933
-msgid "Sender declines this task"
+#: incidenceformatter.cpp:1806
+#, fuzzy
+msgid "%1 declines this task"
+msgstr "Gwrthod Gwrthgynnig"
+
+#: incidenceformatter.cpp:1808
+msgid "%1 declines this task on behalf of %2"
 msgstr ""
 
-#: incidenceformatter.cpp:940
-#, c-format
-msgid "Sender has delegated this request for the task to %1"
+#: incidenceformatter.cpp:1818
+msgid "%1 has delegated this request for the task to %2"
 msgstr ""
 
-#: incidenceformatter.cpp:941
-msgid "Sender has delegated this request for the task "
+#: incidenceformatter.cpp:1821
+msgid "%1 has delegated this request for the task"
 msgstr ""
 
-#: incidenceformatter.cpp:944
+#: incidenceformatter.cpp:1826
 msgid "The request for this task is now completed"
 msgstr ""
 
-#: incidenceformatter.cpp:946 incidenceformatter.cpp:1003
-msgid "Sender is still processing the invitation"
+#: incidenceformatter.cpp:1828
+msgid "%1 is still processing the task"
 msgstr ""
 
-#: incidenceformatter.cpp:948
+#: incidenceformatter.cpp:1831
 msgid "Unknown response to this task"
 msgstr ""
 
-#: incidenceformatter.cpp:969
+#: incidenceformatter.cpp:1859
 msgid "This journal has been published"
 msgstr ""
 
-#: incidenceformatter.cpp:971
+#: incidenceformatter.cpp:1861
 msgid "You have been assigned this journal"
 msgstr ""
 
-#: incidenceformatter.cpp:973
+#: incidenceformatter.cpp:1863
 #, fuzzy
 msgid "This journal was refreshed"
 msgstr "Creuwyd y dudalen yma"
 
-#: incidenceformatter.cpp:975
+#: incidenceformatter.cpp:1865
 #, fuzzy
 msgid "This journal was canceled"
 msgstr "Creuwyd y dudalen yma"
 
-#: incidenceformatter.cpp:977
+#: incidenceformatter.cpp:1867
 msgid "Addition to the journal"
 msgstr ""
 
-#: incidenceformatter.cpp:991
+#: incidenceformatter.cpp:1871 incidenceformatter.cpp:1906
+msgid "Sender makes this counter proposal"
+msgstr ""
+
+#: incidenceformatter.cpp:1887
 msgid "Sender indicates this journal assignment still needs some action"
 msgstr ""
 
-#: incidenceformatter.cpp:993
+#: incidenceformatter.cpp:1889
 #, fuzzy
 msgid "Sender accepts this journal"
 msgstr "Gwrthod Gwrthgynnig"
 
-#: incidenceformatter.cpp:995
+#: incidenceformatter.cpp:1891
 msgid "Sender tentatively accepts this journal"
 msgstr ""
 
-#: incidenceformatter.cpp:997
+#: incidenceformatter.cpp:1893
 #, fuzzy
 msgid "Sender declines this journal"
 msgstr "Gwrthod Gwrthgynnig"
 
-#: incidenceformatter.cpp:999
+#: incidenceformatter.cpp:1895
 msgid "Sender has delegated this request for the journal"
 msgstr ""
 
-#: incidenceformatter.cpp:1001
+#: incidenceformatter.cpp:1897
 msgid "The request for this journal is now completed"
 msgstr ""
 
-#: incidenceformatter.cpp:1005
+#: incidenceformatter.cpp:1899
+msgid "Sender is still processing the invitation"
+msgstr ""
+
+#: incidenceformatter.cpp:1901
 msgid "Unknown response to this journal"
 msgstr ""
 
-#: incidenceformatter.cpp:1025
+#: incidenceformatter.cpp:1908
+#, fuzzy
+msgid "Sender declines the counter proposal"
+msgstr "Gwrthod Gwrthgynnig"
+
+#: incidenceformatter.cpp:1924
 msgid "This free/busy list has been published"
 msgstr ""
 
-#: incidenceformatter.cpp:1027
+#: incidenceformatter.cpp:1926
 msgid "The free/busy list has been requested"
 msgstr ""
 
-#: incidenceformatter.cpp:1029
+#: incidenceformatter.cpp:1928
 msgid "This free/busy list was refreshed"
 msgstr ""
 
-#: incidenceformatter.cpp:1031
+#: incidenceformatter.cpp:1930
 msgid "This free/busy list was canceled"
 msgstr ""
 
-#: incidenceformatter.cpp:1033
+#: incidenceformatter.cpp:1932
 msgid "Addition to the free/busy list"
 msgstr ""
 
-#: incidenceformatter.cpp:1036
+#: incidenceformatter.cpp:1935
 msgid "Error: Free/Busy iMIP message with unknown method: '%1'"
 msgstr ""
 
-#: incidenceformatter.cpp:1155
-msgid "The begin of the meeting has been changed from %1 to %2"
+#: incidenceformatter.cpp:1948
+msgid "Assignees"
+msgstr ""
+
+#: incidenceformatter.cpp:1984
+#, fuzzy
+msgid ""
+"_: No attendee\n"
+"None"
+msgstr "Dim"
+
+#: incidenceformatter.cpp:1999
+msgid "Attached Documents:"
+msgstr ""
+
+#: incidenceformatter.cpp:2158
+msgid "The invitation starting time has been changed from %1 to %2"
 msgstr ""
 
-#: incidenceformatter.cpp:1158
-msgid "The end of the meeting has been changed from %1 to %2"
+#: incidenceformatter.cpp:2161
+msgid "The invitation ending time has been changed from %1 to %2"
 msgstr ""
 
-#: incidenceformatter.cpp:1167
+#: incidenceformatter.cpp:2172
+#, fuzzy
+msgid "The task has been completed"
+msgstr "Creuwyd y dudalen yma"
+
+#: incidenceformatter.cpp:2175
+msgid "The task is no longer completed"
+msgstr ""
+
+#: incidenceformatter.cpp:2180
+msgid "The task completed percentage has changed from %1 to %2"
+msgstr ""
+
+#: incidenceformatter.cpp:2185
+msgid "A task starting time has been added"
+msgstr ""
+
+#: incidenceformatter.cpp:2188
+msgid "The task starting time has been removed"
+msgstr ""
+
+#: incidenceformatter.cpp:2192
+msgid "The task starting time has been changed from %1 to %2"
+msgstr ""
+
+#: incidenceformatter.cpp:2198
+#, fuzzy
+msgid "A task due time has been added"
+msgstr "Creuwyd y dudalen yma"
+
+#: incidenceformatter.cpp:2201
+#, fuzzy
+msgid "The task due time has been removed"
+msgstr "Creuwyd y dudalen yma"
+
+#: incidenceformatter.cpp:2205
+msgid "The task due time has been changed from %1 to %2"
+msgstr ""
+
+#: incidenceformatter.cpp:2216
 msgid "The summary has been changed to: \"%1\""
 msgstr ""
 
-#: incidenceformatter.cpp:1169
+#: incidenceformatter.cpp:2218
 msgid "The location has been changed to: \"%1\""
 msgstr ""
 
-#: incidenceformatter.cpp:1171
+#: incidenceformatter.cpp:2220
 msgid "The description has been changed to: \"%1\""
 msgstr ""
 
-#: incidenceformatter.cpp:1177
+#: incidenceformatter.cpp:2227
 msgid "Attendee %1 has been added"
 msgstr ""
 
-#: incidenceformatter.cpp:1180
+#: incidenceformatter.cpp:2230
 msgid "The status of attendee %1 has been changed to: %2"
 msgstr ""
 
-#: incidenceformatter.cpp:1187
+#: incidenceformatter.cpp:2240
 msgid "Attendee %1 has been removed"
 msgstr ""
 
-#: incidenceformatter.cpp:1279
-msgid ""
-"<p align=\"left\">The following changes have been made by the organizer:</p>"
-msgstr ""
-
-#: incidenceformatter.cpp:1288 incidenceformatter.cpp:1307
-#: incidenceformatter.cpp:1352
-msgid "[Enter this into my calendar]"
+#: incidenceformatter.cpp:2304
+msgid "[Record]"
 msgstr ""
 
-#: incidenceformatter.cpp:1304 incidenceformatter.cpp:1350
-msgid "[Enter this into my task list]"
+#: incidenceformatter.cpp:2309
+msgid "[Move to Trash]"
 msgstr ""
 
-#: incidenceformatter.cpp:1315 incidenceformatter.cpp:1357
+#: incidenceformatter.cpp:2316 incidenceformatter.cpp:2367
 #, fuzzy
 msgid "[Accept]"
 msgstr "Derbynnwyd"
 
-#: incidenceformatter.cpp:1318
+#: incidenceformatter.cpp:2322
 msgid ""
 "_: Accept conditionally\n"
 "[Accept cond.]"
 msgstr ""
 
-#: incidenceformatter.cpp:1321
+#: incidenceformatter.cpp:2327
 #, fuzzy
 msgid "[Counter proposal]"
 msgstr "Gwrthgynnig"
 
-#: incidenceformatter.cpp:1324 incidenceformatter.cpp:1359
+#: incidenceformatter.cpp:2332 incidenceformatter.cpp:2372
 #, fuzzy
 msgid "[Decline]"
 msgstr "Gwrthodwyd"
 
-#: incidenceformatter.cpp:1328
+#: incidenceformatter.cpp:2339
 #, fuzzy
 msgid "[Delegate]"
 msgstr "Dirprwyedig"
 
-#: incidenceformatter.cpp:1332
+#: incidenceformatter.cpp:2344
 msgid "[Forward]"
 msgstr ""
 
-#: incidenceformatter.cpp:1336 incidenceformatter.cpp:1361
+#: incidenceformatter.cpp:2350 incidenceformatter.cpp:2378
 msgid "[Check my calendar]"
 msgstr ""
 
-#: incidenceformatter.cpp:1344
-msgid "[Remove this from my calendar]"
+#: incidenceformatter.cpp:2452
+msgid "The following changes have been made by the organizer:"
 msgstr ""
 
-#: incidenceformatter.cpp:1707
+#: incidenceformatter.cpp:2462
+msgid "The following changes have been made by %1:"
+msgstr ""
+
+#: incidenceformatter.cpp:2464
+msgid "The following changes have been made by an attendee:"
+msgstr ""
+
+#: incidenceformatter.cpp:2516
+msgid "Your <b>%1</b> response has already been recorded"
+msgstr ""
+
+#: incidenceformatter.cpp:2519
+msgid "Your status for this invitation is <b>%1</b>"
+msgstr ""
+
+#: incidenceformatter.cpp:2524
+#, fuzzy
+msgid "This invitation was declined"
+msgstr "Creuwyd y dudalen yma"
+
+#: incidenceformatter.cpp:2526
+#, fuzzy
+msgid "This invitation was accepted"
+msgstr "Creuwyd y dudalen yma"
+
+#: incidenceformatter.cpp:2531
+msgid "Awaiting delegation response"
+msgstr ""
+
+#: incidenceformatter.cpp:2564
+msgid "[Record invitation in my task list]"
+msgstr ""
+
+#: incidenceformatter.cpp:2567
+msgid "[Record invitation in my calendar]"
+msgstr ""
+
+#: incidenceformatter.cpp:2584
+msgid "[Remove invitation from my task list]"
+msgstr ""
+
+#: incidenceformatter.cpp:2587
+msgid "[Remove invitation from my calendar]"
+msgstr ""
+
+#: incidenceformatter.cpp:2630
+msgid "The response has been recorded [%1]"
+msgstr ""
+
+#: incidenceformatter.cpp:2637
+msgid "[Record response in my task list]"
+msgstr ""
+
+#: incidenceformatter.cpp:2639
+msgid "[Record response in my calendar]"
+msgstr ""
+
+#: incidenceformatter.cpp:3026
 msgid "Reminder"
 msgstr "Atgof"
 
-#: incidenceformatter.cpp:1876
+#: incidenceformatter.cpp:3219
 #, c-format
 msgid ""
 "_: Event start\n"
 "<i>From:</i>&nbsp;%1"
 msgstr "<i>O:</i>&nbsp;%1"
 
-#: incidenceformatter.cpp:1882
+#: incidenceformatter.cpp:3225
 #, c-format
 msgid ""
 "_: Event end\n"
 "<i>To:</i>&nbsp;%1"
 msgstr "<i>I:</i>&nbsp;%1"
 
-#: incidenceformatter.cpp:1890 incidenceformatter.cpp:1940
+#: incidenceformatter.cpp:3233 incidenceformatter.cpp:3314
 #, c-format
 msgid "<i>Date:</i>&nbsp;%1"
 msgstr "<i>Dyddiad:</i>&nbsp;%1"
 
-#: incidenceformatter.cpp:1897
+#: incidenceformatter.cpp:3242
 #, c-format
 msgid ""
 "_: time for event, &nbsp; to prevent ugly line breaks\n"
 "<i>Time:</i>&nbsp;%1"
 msgstr ""
 
-#: incidenceformatter.cpp:1901
+#: incidenceformatter.cpp:3246
 msgid ""
 "_: time range for event, &nbsp; to prevent ugly line breaks\n"
 "<i>Time:</i>&nbsp;%1&nbsp;-&nbsp;%2"
 msgstr "<i>Amser:</i>&nbsp;%1&nbsp;-&nbsp;%2"
 
-#: incidenceformatter.cpp:1919
+#: incidenceformatter.cpp:3269
 #, c-format
 msgid "<i>Start:</i>&nbsp;%1"
 msgstr "<i>Dechrau:</i>&nbsp;%1"
 
-#: incidenceformatter.cpp:1924
+#: incidenceformatter.cpp:3284
 #, c-format
 msgid "<i>Due:</i>&nbsp;%1"
 msgstr "<i>Disgwyliedig:</i>&nbsp;%1"
 
-#: incidenceformatter.cpp:1929
-#, c-format
-msgid "<i>Completed:</i>&nbsp;%1"
-msgstr "<i>Cyflawn:</i>&nbsp;%1"
-
-#: incidenceformatter.cpp:1931
-msgid "%1 % completed"
-msgstr "%1 % cyflawn"
-
-#: incidenceformatter.cpp:1947 incidenceformatter.cpp:1949
+#: incidenceformatter.cpp:3322 incidenceformatter.cpp:3324
 #, c-format
 msgid "<i>Period start:</i>&nbsp;%1"
 msgstr ""
 
-#: incidenceformatter.cpp:1994
-#, c-format
-msgid "<i>Location:</i>&nbsp;%1"
-msgstr "<i>Lleoliad:</i>&nbsp;%1"
+#: incidenceformatter.cpp:3380
+msgid ""
+"_: elipsis\n"
+"..."
+msgstr ""
 
-#: incidenceformatter.cpp:2002
-msgid "<i>Description:</i><br>"
-msgstr "<i>Disgrifiad:</i><br>"
+#: incidenceformatter.cpp:3384
+msgid ""
+"_: separator for lists of people names\n"
+", "
+msgstr ""
 
-#: incidenceformatter.cpp:2040
+#: incidenceformatter.cpp:3581
 msgid "This is a Free Busy Object"
 msgstr "Gwrthrych Rhydd Brysur yw Hwn"
 
-#: incidenceformatter.cpp:2050
+#: incidenceformatter.cpp:3591
 msgid ""
 "Summary: %1\n"
 msgstr ""
 
-#: incidenceformatter.cpp:2053
+#: incidenceformatter.cpp:3594
 #, fuzzy
 msgid ""
 "Organizer: %1\n"
 msgstr "Calendr KTrefnydd"
 
-#: incidenceformatter.cpp:2056
+#: incidenceformatter.cpp:3597
 #, fuzzy
 msgid ""
 "Location: %1\n"
 msgstr "Lleoliad:"
 
-#: incidenceformatter.cpp:2063
+#: incidenceformatter.cpp:3604
 msgid ""
 "_: no recurrence\n"
 "None"
 msgstr "Dim"
 
-#: incidenceformatter.cpp:2064
+#: incidenceformatter.cpp:3605
 msgid "Minutely"
 msgstr "Bob Munud"
 
-#: incidenceformatter.cpp:2064
+#: incidenceformatter.cpp:3605
 msgid "Hourly"
 msgstr "Bob Awr"
 
-#: incidenceformatter.cpp:2064
+#: incidenceformatter.cpp:3605
 msgid "Daily"
 msgstr "Pob Dydd"
 
-#: incidenceformatter.cpp:2065
+#: incidenceformatter.cpp:3606
 msgid "Weekly"
 msgstr "Wythnosol"
 
-#: incidenceformatter.cpp:2065
+#: incidenceformatter.cpp:3606
 msgid "Monthly Same Day"
 msgstr "Misol Ar Yr Un Dydd"
 
-#: incidenceformatter.cpp:2065
+#: incidenceformatter.cpp:3606
 msgid "Monthly Same Position"
 msgstr "Misol Yn Yr Un Lle"
 
-#: incidenceformatter.cpp:2066
+#: incidenceformatter.cpp:3607
 msgid "Yearly"
 msgstr "Blynyddol"
 
-#: incidenceformatter.cpp:2069 incidenceformatter.cpp:2117
+#: incidenceformatter.cpp:3610 incidenceformatter.cpp:3671
 msgid ""
 "Start Date: %1\n"
 msgstr ""
 
-#: incidenceformatter.cpp:2071 incidenceformatter.cpp:2119
+#: incidenceformatter.cpp:3613 incidenceformatter.cpp:3674
 #, fuzzy
 msgid ""
 "Start Time: %1\n"
 msgstr "Amser Dechrau"
 
-#: incidenceformatter.cpp:2074
+#: incidenceformatter.cpp:3617
 msgid ""
 "End Date: %1\n"
 msgstr ""
 
-#: incidenceformatter.cpp:2077
+#: incidenceformatter.cpp:3621
 #, fuzzy
 msgid ""
 "End Time: %1\n"
 msgstr "Amser Gorffen"
 
-#: incidenceformatter.cpp:2082
+#: incidenceformatter.cpp:3627
 msgid ""
 "Recurs: %1\n"
 msgstr ""
 
-#: incidenceformatter.cpp:2084
+#: incidenceformatter.cpp:3629
 msgid ""
 "Frequency: %1\n"
 msgstr ""
 
-#: incidenceformatter.cpp:2088
+#: incidenceformatter.cpp:3633
 #, c-format
 msgid ""
 "_n: Repeats once\n"
 "Repeats %n times"
 msgstr ""
 
-#: incidenceformatter.cpp:2099
+#: incidenceformatter.cpp:3644
 msgid ""
 "Repeat until: %1\n"
 msgstr ""
 
-#: incidenceformatter.cpp:2101
+#: incidenceformatter.cpp:3646
 msgid ""
 "Repeats forever\n"
 msgstr ""
 
-#: incidenceformatter.cpp:2107 incidenceformatter.cpp:2130
+#: incidenceformatter.cpp:3652
+msgid ""
+"This recurring meeting has been cancelled on the following days:\n"
+msgstr ""
+
+#: incidenceformatter.cpp:3655
+msgid ""
+"  %1\n"
+msgstr ""
+
+#: incidenceformatter.cpp:3661 incidenceformatter.cpp:3688
 msgid ""
 "Details:\n"
 "%1\n"
 msgstr ""
 
-#: incidenceformatter.cpp:2123
+#: incidenceformatter.cpp:3679
 #, fuzzy
 msgid ""
 "Due Date: %1\n"
 msgstr "Dyddiad Disgwyliedig"
 
-#: incidenceformatter.cpp:2125
+#: incidenceformatter.cpp:3682
 msgid ""
 "Due Time: %1\n"
 msgstr ""
 
-#: incidenceformatter.cpp:2138
+#: incidenceformatter.cpp:3696
 #, fuzzy
 msgid ""
 "Date: %1\n"
 msgstr "Dyddiad Disgwyliedig"
 
-#: incidenceformatter.cpp:2140
+#: incidenceformatter.cpp:3699
 #, fuzzy
 msgid ""
 "Time: %1\n"
 msgstr "Amser Gorffen"
 
-#: incidenceformatter.cpp:2143
+#: incidenceformatter.cpp:3703
 msgid ""
 "Text of the journal:\n"
 "%1\n"
 msgstr ""
 
-#: incidenceformatter.cpp:2175 incidenceformatter.cpp:2180
+#: incidenceformatter.cpp:3738 incidenceformatter.cpp:3811
 #, fuzzy
 msgid "No recurrence"
 msgstr "Dim"
 
-#: incidenceformatter.cpp:2183
+#: incidenceformatter.cpp:3741
+msgid "31st Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3742
+msgid "30th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3743
+msgid "29th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3744
+msgid "28th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3745
+msgid "27th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3746
+msgid "26th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3747
+msgid "25th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3748
+msgid "24th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3749
+msgid "23rd Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3750
+msgid "22nd Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3751
+msgid "21st Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3752
+msgid "20th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3753
+msgid "19th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3754
+msgid "18th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3755
+msgid "17th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3756
+msgid "16th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3757
+msgid "15th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3758
+msgid "14th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3759
+msgid "13th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3760
+msgid "12th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3761
+msgid "11th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3762
+msgid "10th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3763
+msgid "9th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3764
+msgid "8th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3765
+msgid "7th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3766
+msgid "6th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3767
+msgid "5th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3768
+msgid "4th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3769
+msgid "3rd Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3770
+msgid "2nd Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3771
 msgid ""
-"_n: Recurs every minute until %1\n"
-"Recurs every %n minutes until %1"
+"_: last day of the month\n"
+"Last"
 msgstr ""
 
-#: incidenceformatter.cpp:2185
+#: incidenceformatter.cpp:3772
+msgid ""
+"_: unknown day of the month\n"
+"unknown"
+msgstr ""
+
+#: incidenceformatter.cpp:3773
+msgid "1st"
+msgstr ""
+
+#: incidenceformatter.cpp:3774
+msgid "2nd"
+msgstr ""
+
+#: incidenceformatter.cpp:3775
+msgid "3rd"
+msgstr ""
+
+#: incidenceformatter.cpp:3776
+msgid "4th"
+msgstr ""
+
+#: incidenceformatter.cpp:3777
+msgid "5th"
+msgstr ""
+
+#: incidenceformatter.cpp:3778
+msgid "6th"
+msgstr ""
+
+#: incidenceformatter.cpp:3779
+msgid "7th"
+msgstr ""
+
+#: incidenceformatter.cpp:3780
+msgid "8th"
+msgstr ""
+
+#: incidenceformatter.cpp:3781
+msgid "9th"
+msgstr ""
+
+#: incidenceformatter.cpp:3782
+msgid "10th"
+msgstr ""
+
+#: incidenceformatter.cpp:3783
+msgid "11th"
+msgstr ""
+
+#: incidenceformatter.cpp:3784
+msgid "12th"
+msgstr ""
+
+#: incidenceformatter.cpp:3785
+msgid "13th"
+msgstr ""
+
+#: incidenceformatter.cpp:3786
+msgid "14th"
+msgstr ""
+
+#: incidenceformatter.cpp:3787
+msgid "15th"
+msgstr ""
+
+#: incidenceformatter.cpp:3788
+msgid "16th"
+msgstr ""
+
+#: incidenceformatter.cpp:3789
+msgid "17th"
+msgstr ""
+
+#: incidenceformatter.cpp:3790
+msgid "18th"
+msgstr ""
+
+#: incidenceformatter.cpp:3791
+msgid "19th"
+msgstr ""
+
+#: incidenceformatter.cpp:3792
+msgid "20th"
+msgstr ""
+
+#: incidenceformatter.cpp:3793
+msgid "21st"
+msgstr ""
+
+#: incidenceformatter.cpp:3794
+msgid "22nd"
+msgstr ""
+
+#: incidenceformatter.cpp:3795
+msgid "23rd"
+msgstr ""
+
+#: incidenceformatter.cpp:3796
+msgid "24th"
+msgstr ""
+
+#: incidenceformatter.cpp:3797
+msgid "25th"
+msgstr ""
+
+#: incidenceformatter.cpp:3798
+msgid "26th"
+msgstr ""
+
+#: incidenceformatter.cpp:3799
+msgid "27th"
+msgstr ""
+
+#: incidenceformatter.cpp:3800
+msgid "28th"
+msgstr ""
+
+#: incidenceformatter.cpp:3801
+msgid "29th"
+msgstr ""
+
+#: incidenceformatter.cpp:3802
+msgid "30th"
+msgstr ""
+
+#: incidenceformatter.cpp:3803
+msgid "31st"
+msgstr ""
+
+#: incidenceformatter.cpp:3814
 #, fuzzy, c-format
 msgid ""
 "_n: Recurs every minute\n"
@@ -1114,67 +1784,226 @@ msgstr ""
 "1 munud\n"
 "%n o funudau "
 
-#: incidenceformatter.cpp:2188
-msgid ""
-"_n: Recurs hourly until %1\n"
-"Recurs every %n hours until %1"
+#: incidenceformatter.cpp:3816 incidenceformatter.cpp:3827
+#: incidenceformatter.cpp:3839
+msgid "%1 until %2"
 msgstr ""
 
-#: incidenceformatter.cpp:2190
+#: incidenceformatter.cpp:3818 incidenceformatter.cpp:3829
+#: incidenceformatter.cpp:3841 incidenceformatter.cpp:3868
+#: incidenceformatter.cpp:3888 incidenceformatter.cpp:3914
+#: incidenceformatter.cpp:3937 incidenceformatter.cpp:3974
+#: incidenceformatter.cpp:3998
+#, fuzzy
+msgid " (%1 occurrences)"
+msgstr "Dim"
+
+#: incidenceformatter.cpp:3825
 #, c-format
 msgid ""
 "_n: Recurs hourly\n"
 "Recurs every %n hours"
 msgstr ""
 
-#: incidenceformatter.cpp:2193
+#: incidenceformatter.cpp:3836
+#, c-format
 msgid ""
-"_n: Recurs daily until %1\n"
-"Recurs every %n days until %1"
+"_n: Recurs daily\n"
+"Recurs every %n days"
 msgstr ""
 
-#: incidenceformatter.cpp:2195
+#: incidenceformatter.cpp:3849
 #, c-format
 msgid ""
-"_n: Recurs daily\n"
-"Recurs every %n days"
+"_n: Recurs weekly\n"
+"Recurs every %n weeks"
 msgstr ""
 
-#: incidenceformatter.cpp:2198
+#: incidenceformatter.cpp:3855
 msgid ""
-"_n: Recurs weekly until %1\n"
-"Recurs every %n weeks until %1"
+"_: separator for list of days\n"
+", "
 msgstr ""
 
-#: incidenceformatter.cpp:2200
-#, c-format
+#: incidenceformatter.cpp:3862
 msgid ""
-"_n: Recurs weekly\n"
-"Recurs every %n weeks"
+"_: Recurs weekly on no days\n"
+"no days"
 msgstr ""
 
-#: incidenceformatter.cpp:2204
-#, c-format
-msgid "Recurs monthly until %1"
+#: incidenceformatter.cpp:3865
+msgid "%1 on %2 until %3"
 msgstr ""
 
-#: incidenceformatter.cpp:2205
-msgid "Recurs monthly"
+#: incidenceformatter.cpp:3872
+msgid "%1 on %2"
+msgstr ""
+
+#: incidenceformatter.cpp:3877 incidenceformatter.cpp:3904
+#, fuzzy, c-format
+msgid ""
+"_n: Recurs monthly\n"
+"Recurs every %n months"
+msgstr ""
+"1 munud\n"
+"%n o funudau "
+
+#: incidenceformatter.cpp:3882
+msgid "%1 on the %2 %3 until %4"
+msgstr ""
+
+#: incidenceformatter.cpp:3892
+msgid "%1 on the %2 %3"
+msgstr ""
+
+#: incidenceformatter.cpp:3909
+msgid "%1 on the %2 day until %3"
+msgstr ""
+
+#: incidenceformatter.cpp:3918
+msgid "%1 on the %2 day"
+msgstr ""
+
+#: incidenceformatter.cpp:3927 incidenceformatter.cpp:3966
+#, fuzzy, c-format
+msgid ""
+"_n: Recurs yearly\n"
+"Recurs every %n years"
+msgstr ""
+"1 munud\n"
+"%n o funudau "
+
+#: incidenceformatter.cpp:3931
+msgid "%1 on %2 %3 until %4"
+msgstr ""
+
+#: incidenceformatter.cpp:3943
+msgid "%1 on %2 %3"
+msgstr ""
+
+#: incidenceformatter.cpp:3950 incidenceformatter.cpp:3955
+msgid "Recurs yearly on %1 %2"
+msgstr ""
+
+#: incidenceformatter.cpp:3969
+msgid "%1 on day %2 until %3"
+msgstr ""
+
+#: incidenceformatter.cpp:3978
+msgid "%1 on day %2"
 msgstr ""
 
-#: incidenceformatter.cpp:2210
+#: incidenceformatter.cpp:3987
 #, c-format
-msgid "Recurs yearly until %1"
+msgid ""
+"_n: Every year\n"
+"Every %n years"
 msgstr ""
 
-#: incidenceformatter.cpp:2211
-msgid "Recurs yearly"
+#: incidenceformatter.cpp:3991
+msgid "%1 on the %2 %3 of %4 until %5"
 msgstr ""
 
-#: incidenceformatter.cpp:2213
+#: incidenceformatter.cpp:4002
+msgid "%1 on the %2 %3 of %4"
+msgstr ""
+
+#: incidenceformatter.cpp:4015
 msgid "Incidence recurs"
 msgstr ""
 
+#: incidenceformatter.cpp:4071 incidenceformatter.cpp:4097
+#: incidenceformatter.cpp:4110
+#, fuzzy, c-format
+msgid ""
+"_n: 1 day\n"
+"%n days"
+msgstr "Categoriau"
+
+#: incidenceformatter.cpp:4077
+#, fuzzy, c-format
+msgid ""
+"_n: 1 hour\n"
+"%n hours"
+msgstr "Categoriau"
+
+#: incidenceformatter.cpp:4083
+#, fuzzy, c-format
+msgid ""
+"_n: 1 minute\n"
+"%n minutes"
+msgstr ""
+"1 munud\n"
+"%n o funudau "
+
+#: incidenceformatter.cpp:4101
+#, fuzzy
+msgid "forever"
+msgstr "Byth"
+
+#: incidenceformatter.cpp:4143
+msgid ""
+"_: N days/hours/minutes before the start datetime\n"
+"%1 before the start"
+msgstr ""
+
+#: incidenceformatter.cpp:4146
+msgid ""
+"_: N days/hours/minutes after the start datetime\n"
+"%1 after the start"
+msgstr ""
+
+#: incidenceformatter.cpp:4158
+msgid ""
+"_: N days/hours/minutes before the due datetime\n"
+"%1 before the to-do is due"
+msgstr ""
+
+#: incidenceformatter.cpp:4161
+msgid ""
+"_: N days/hours/minutes before the end datetime\n"
+"%1 before the end"
+msgstr ""
+
+#: incidenceformatter.cpp:4166
+msgid ""
+"_: N days/hours/minutes after the due datetime\n"
+"%1 after the to-do is due"
+msgstr ""
+
+#: incidenceformatter.cpp:4169
+msgid ""
+"_: N days/hours/minutes after the end datetime\n"
+"%1 after the end"
+msgstr ""
+
+#: incidenceformatter.cpp:4187
+#, c-format
+msgid ""
+"_: reminder occurs at datetime\n"
+"at %1"
+msgstr ""
+
+#: incidenceformatter.cpp:4194
+#, c-format
+msgid ""
+"_n: repeats once\n"
+"repeats %n times"
+msgstr ""
+
+#: incidenceformatter.cpp:4195
+#, c-format
+msgid ""
+"_: interval is N days/hours/minutes\n"
+"interval is %1"
+msgstr ""
+
+#: incidenceformatter.cpp:4197
+msgid ""
+"_: (repeat string, interval string)\n"
+"(%1, %2)"
+msgstr ""
+
 #: qtopiaformat.cpp:297
 msgid "Could not open file '%1'"
 msgstr "Methu agor ffeil '%1'"
@@ -1391,12 +2220,12 @@ msgstr ""
 msgid "Title of the free/busy list"
 msgstr ""
 
-#: resourcecached.cpp:630
+#: resourcecached.cpp:691
 #, c-format
 msgid "Last loaded: %1"
 msgstr ""
 
-#: resourcecached.cpp:635
+#: resourcecached.cpp:696
 #, c-format
 msgid "Last saved: %1"
 msgstr ""
@@ -1437,27 +2266,23 @@ msgstr ""
 msgid "On every change"
 msgstr ""
 
-#: resourcecalendar.cpp:57
+#: resourcecalendar.cpp:77
 #, c-format
 msgid "Type: %1"
 msgstr "Math: %1"
 
-#: resourcecalendar.cpp:149
+#: resourcecalendar.cpp:175
 #, fuzzy
 msgid ""
 "Error while loading %1.\n"
 msgstr "Gwall wrth gadw i '%1'."
 
-#: resourcecalendar.cpp:186
+#: resourcecalendar.cpp:212
 #, fuzzy
 msgid ""
 "Error while saving %1.\n"
 msgstr "Gwall wrth gadw i '%1'."
 
-#: resourcelocalconfig.cpp:49 resourcelocaldirconfig.cpp:47
-msgid "Location:"
-msgstr "Lleoliad:"
-
 #: resourcelocalconfig.cpp:54
 msgid "Calendar Format"
 msgstr "Fformat y Calendr"
@@ -1477,85 +2302,189 @@ msgid ""
 "resource properties."
 msgstr ""
 
-#: scheduler.cpp:50
+#: resourcelocaldirconfig.cpp:72
+msgid "No location specified.  The calendar will be read-only."
+msgstr ""
+
+#: scheduler.cpp:53
 #, fuzzy
 msgid "Updated Publish"
 msgstr "Cais wedi'i Ddiweddaru"
 
-#: scheduler.cpp:52 scheduler.cpp:154
+#: scheduler.cpp:55 scheduler.cpp:160
 msgid "Publish"
 msgstr "Cyhoeddi"
 
-#: scheduler.cpp:54
+#: scheduler.cpp:57
 msgid "Obsolete"
 msgstr "Anarferedig"
 
-#: scheduler.cpp:56
+#: scheduler.cpp:59
 msgid "New Request"
 msgstr "Cais Newydd"
 
-#: scheduler.cpp:58
+#: scheduler.cpp:61
 msgid "Updated Request"
 msgstr "Cais wedi'i Ddiweddaru"
 
-#: scheduler.cpp:60
+#: scheduler.cpp:63
 #, c-format
 msgid "Unknown Status: %1"
 msgstr "Cyflwr Anhysbys: %1"
 
-#: scheduler.cpp:156
+#: scheduler.cpp:162
 msgid "Request"
 msgstr "Cais"
 
-#: scheduler.cpp:158
+#: scheduler.cpp:164
 msgid "Refresh"
 msgstr "Ailfywio"
 
-#: scheduler.cpp:164
+#: scheduler.cpp:170
 msgid "Reply"
 msgstr "Ateb"
 
-#: scheduler.cpp:166
+#: scheduler.cpp:172
 msgid ""
 "_: counter proposal\n"
 "Counter"
 msgstr "Gwrthgynnig"
 
-#: scheduler.cpp:168
+#: scheduler.cpp:174
 msgid ""
 "_: decline counter proposal\n"
 "Decline Counter"
 msgstr "Gwrthod Gwrthgynnig"
 
-#: scheduler.cpp:170
+#: scheduler.cpp:176
 msgid "Unknown"
 msgstr "Anhysbys"
 
-#: scheduler.cpp:341
+#: scheduler.cpp:310
+msgid ""
+"<qt>You accepted an invitation update, but an earlier version of the item could "
+"not be found in your calendar."
+"<p>This may have occurred because:"
+"<ul>"
+"<li>the organizer did not include you in the original invitation</li>"
+"<li>you did not accept the original invitation yet</li>"
+"<li>you deleted the original invitation from your calendar</li>"
+"<li>you no longer have access to the calendar containing the invitation</li>"
+"</ul>This is not a problem, but we thought you should know.</qt>"
+msgstr ""
+
+#: scheduler.cpp:320
+msgid "Cannot find invitation to be updated"
+msgstr ""
+
+#: scheduler.cpp:329
+msgid "No calendars found, unable to save the invitation."
+msgstr ""
+
+#: scheduler.cpp:357
+msgid ""
+"You canceled the save operation. Therefore, the appointment will not be stored "
+"in your calendar even though you accepted the invitation. Are you certain you "
+"want to discard this invitation? "
+msgstr ""
+
+#: scheduler.cpp:360
+msgid "Discard this invitation?"
+msgstr ""
+
+#: scheduler.cpp:361
+msgid "Go Back to Folder Selection"
+msgstr ""
+
+#: scheduler.cpp:364
+msgid ""
+"The invitation \"%1\" was not saved to your calendar but you are still listed "
+"as an attendee for that appointment.\n"
+"If you mistakenly accepted the invitation or do not plan to attend, please "
+"notify the organizer %2 and ask them to remove you from the attendee list."
+msgstr ""
+
+#: scheduler.cpp:380
+msgid "Unable to save %1 \"%2\"."
+msgstr ""
+
+#: scheduler.cpp:487
+msgid ""
+"The event or task could not be removed from your calendar. Maybe it has already "
+"been deleted or is not owned by you. Or it might belong to a read-only or "
+"disabled calendar."
+msgstr ""
+
+#: scheduler.cpp:520
+msgid ""
+"The event or task to be canceled could not be removed from your calendar. Maybe "
+"it has already been deleted or is not owned by you. Or it might belong to a "
+"read-only or disabled calendar."
+msgstr ""
+
+#: scheduler.cpp:593
 msgid "%1 wants to attend %2 but was not invited."
 msgstr ""
 
-#: scheduler.cpp:344
+#: scheduler.cpp:596
 msgid "%1 wants to attend %2 on behalf of %3."
 msgstr ""
 
-#: scheduler.cpp:347
+#: scheduler.cpp:599
 msgid "Uninvited attendee"
 msgstr ""
 
-#: scheduler.cpp:348
+#: scheduler.cpp:600
 #, fuzzy
 msgid "Accept Attendance"
 msgstr "Derbynnwyd"
 
-#: scheduler.cpp:348
+#: scheduler.cpp:600
 msgid "Reject Attendance"
 msgstr ""
 
-#: scheduler.cpp:353
+#: scheduler.cpp:605
 msgid "The organizer rejected your attendance at this meeting."
 msgstr ""
 
+#: scheduler.cpp:627
+msgid ""
+"An attendee was added to the incidence. Do you want to email the attendees an "
+"update message?"
+msgstr ""
+
+#: scheduler.cpp:629
+#, fuzzy
+msgid "Attendee Added"
+msgstr "Cyfarfotwyr"
+
+#: scheduler.cpp:629
+msgid "Send Messages"
+msgstr ""
+
+#: scheduler.cpp:630
+msgid "Do Not Send"
+msgstr ""
+
+#~ msgid "Date"
+#~ msgstr "Dyddiad"
+
+#, fuzzy
+#~ msgid "Description"
+#~ msgstr "Disgrifiad:"
+
+#~ msgid "<i>Completed:</i>&nbsp;%1"
+#~ msgstr "<i>Cyflawn:</i>&nbsp;%1"
+
+#~ msgid "%1 % completed"
+#~ msgstr "%1 % cyflawn"
+
+#~ msgid "<i>Location:</i>&nbsp;%1"
+#~ msgstr "<i>Lleoliad:</i>&nbsp;%1"
+
+#~ msgid "<i>Description:</i><br>"
+#~ msgstr "<i>Disgrifiad:</i><br>"
+
 #~ msgid "Category"
 #~ msgstr "Categori"
 
@@ -1583,9 +2512,6 @@ msgstr ""
 #~ msgid "%1's anniversary"
 #~ msgstr "Pen blwydd %1"
 
-#~ msgid "Anniversary"
-#~ msgstr "Pen blwydd"
-
 #~ msgid "Set alarm"
 #~ msgstr "Gosod larwm"
 
@@ -1627,10 +2553,6 @@ msgstr ""
 #~ msgstr "<b>Ar:</b> %1 <b>O:</b> %2 <b>I:</b> %3"
 
 #, fuzzy
-#~ msgid "Calendar"
-#~ msgstr "vCalendr"
-
-#, fuzzy
 #~ msgid "To-do List"
 #~ msgstr "Rhestr I-Wneud KTrefnydd"
 
diff --git a/tde-i18n-cy/messages/tdepim/libkholidays.po b/tde-i18n-cy/messages/tdepim/libkholidays.po
index 7f7f2da4d3f..5531fd3a9a8 100644
--- a/tde-i18n-cy/messages/tdepim/libkholidays.po
+++ b/tde-i18n-cy/messages/tdepim/libkholidays.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: all2.po\n"
-"POT-Creation-Date: 2005-02-19 01:28+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdepim/libkleopatra.po b/tde-i18n-cy/messages/tdepim/libkleopatra.po
index 5939ae6193c..c2dca894f9c 100644
--- a/tde-i18n-cy/messages/tdepim/libkleopatra.po
+++ b/tde-i18n-cy/messages/tdepim/libkleopatra.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdepim/libkleopatra.po\n"
-"POT-Creation-Date: 2008-08-19 01:19+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -369,19 +370,26 @@ msgstr ""
 msgid "&Reset"
 msgstr "&Ailosod"
 
-#: ui/cryptoconfigmodule.cpp:577
+#: ui/cryptoconfigmodule.cpp:132
+msgid ""
+"The gpgconf tool used to provide the information for this dialog does not seem "
+"to be installed properly. It did not return any components. Try running \"%1\" "
+"on the command line for more information."
+msgstr ""
+
+#: ui/cryptoconfigmodule.cpp:605
 msgid "Edit..."
 msgstr "Golygu..."
 
-#: ui/cryptoconfigmodule.cpp:609
+#: ui/cryptoconfigmodule.cpp:637
 msgid "Configure LDAP Servers"
 msgstr ""
 
-#: ui/cryptoconfigmodule.cpp:628
+#: ui/cryptoconfigmodule.cpp:656
 msgid "No server configured yet"
 msgstr ""
 
-#: ui/cryptoconfigmodule.cpp:630
+#: ui/cryptoconfigmodule.cpp:658
 #, c-format
 msgid ""
 "_n: 1 server configured\n"
@@ -480,12 +488,12 @@ msgstr "Hoffter cêl-ysgrifo:"
 msgid "Change..."
 msgstr "Newid..."
 
-#: ui/keyrequester.cpp:218 ui/keyselectiondialog.cpp:216
+#: ui/keyrequester.cpp:218 ui/keyselectiondialog.cpp:224
 msgid "<unknown>"
 msgstr "<anhysbys>"
 
-#: backends/qgpgme/qgpgmekeylistjob.cpp:180 ui/keyrequester.cpp:231
-#: ui/keyselectiondialog.cpp:520
+#: backends/qgpgme/qgpgmekeylistjob.cpp:196 ui/keyrequester.cpp:231
+#: ui/keyselectiondialog.cpp:572
 msgid ""
 "<qt>"
 "<p>An error occurred while fetching the keys from the backend:</p>"
@@ -493,7 +501,7 @@ msgid ""
 msgstr ""
 
 #: ui/keyrequester.cpp:236 ui/keyrequester.cpp:265 ui/keyrequester.cpp:289
-#: ui/keyselectiondialog.cpp:493 ui/keyselectiondialog.cpp:525
+#: ui/keyselectiondialog.cpp:543 ui/keyselectiondialog.cpp:577
 msgid "Key Listing Failed"
 msgstr ""
 
@@ -531,19 +539,19 @@ msgstr ""
 msgid "Please select an (OpenPGP or S/MIME) key to use."
 msgstr ""
 
-#: ui/keyselectiondialog.cpp:192
+#: ui/keyselectiondialog.cpp:200
 msgid "Key ID"
 msgstr "ID Allwedd"
 
-#: ui/keyselectiondialog.cpp:193
+#: ui/keyselectiondialog.cpp:201
 msgid "User ID"
 msgstr "Dynodiad Defnyddiwr"
 
-#: ui/keyselectiondialog.cpp:237
+#: ui/keyselectiondialog.cpp:245
 msgid "never"
 msgstr "byth"
 
-#: ui/keyselectiondialog.cpp:240
+#: ui/keyselectiondialog.cpp:248
 msgid ""
 "OpenPGP key for %1\n"
 "Created: %2\n"
@@ -551,13 +559,13 @@ msgid ""
 "Fingerprint: %4"
 msgstr ""
 
-#: ui/keyselectiondialog.cpp:244 ui/keyselectiondialog.cpp:246
-#: ui/keyselectiondialog.cpp:253 ui/keyselectiondialog.cpp:255
-#: ui/keyselectiondialog.cpp:256
+#: ui/keyselectiondialog.cpp:252 ui/keyselectiondialog.cpp:254
+#: ui/keyselectiondialog.cpp:261 ui/keyselectiondialog.cpp:263
+#: ui/keyselectiondialog.cpp:264
 msgid "unknown"
 msgstr "anhysbys"
 
-#: ui/keyselectiondialog.cpp:248
+#: ui/keyselectiondialog.cpp:256
 msgid ""
 "S/MIME key for %1\n"
 "Created: %2\n"
@@ -566,15 +574,19 @@ msgid ""
 "Issuer: %5"
 msgstr ""
 
-#: ui/keyselectiondialog.cpp:355
+#: ui/keyselectiondialog.cpp:392
+msgid "Search for &External Certificates"
+msgstr ""
+
+#: ui/keyselectiondialog.cpp:405
 msgid "&Search for:"
 msgstr "&Chwilio am:"
 
-#: ui/keyselectiondialog.cpp:375
+#: ui/keyselectiondialog.cpp:425
 msgid "&Remember choice"
 msgstr "&Cofio'r dewis"
 
-#: ui/keyselectiondialog.cpp:378
+#: ui/keyselectiondialog.cpp:428
 msgid ""
 "<qt>"
 "<p>If you check this box your choice will be stored and you will not be asked "
@@ -583,35 +595,35 @@ msgstr ""
 "<qt>"
 "<p>Os brithwch y blwch yma, cedwir eich dewis a ni ofynnir i chi eto.</p></qt>"
 
-#: ui/keyselectiondialog.cpp:394
+#: ui/keyselectiondialog.cpp:444
 msgid "&Reread Keys"
 msgstr "Ail-dda&rllen Allweddau"
 
-#: ui/keyselectiondialog.cpp:395
+#: ui/keyselectiondialog.cpp:445
 msgid "&Start Certificate Manager"
 msgstr ""
 
-#: ui/keyselectiondialog.cpp:491
+#: ui/keyselectiondialog.cpp:541
 msgid "No backends found for listing keys. Check your installation."
 msgstr ""
 
-#: ui/keyselectiondialog.cpp:509
+#: ui/keyselectiondialog.cpp:561
 msgid "Could not start certificate manager; please check your installation."
 msgstr ""
 
-#: ui/keyselectiondialog.cpp:511
+#: ui/keyselectiondialog.cpp:563
 msgid "Certificate Manager Error"
 msgstr ""
 
-#: ui/keyselectiondialog.cpp:558
+#: ui/keyselectiondialog.cpp:612
 msgid "Checking selected keys..."
 msgstr ""
 
-#: ui/keyselectiondialog.cpp:558
+#: ui/keyselectiondialog.cpp:612
 msgid "Fetching keys..."
 msgstr ""
 
-#: ui/keyselectiondialog.cpp:584
+#: ui/keyselectiondialog.cpp:641
 #, c-format
 msgid ""
 "_n: <qt>One backend returned truncated output."
@@ -620,100 +632,111 @@ msgid ""
 "<br>Not all available keys are shown</qt>"
 msgstr ""
 
-#: ui/keyselectiondialog.cpp:587
+#: ui/keyselectiondialog.cpp:644
 msgid "Key List Result"
 msgstr ""
 
-#: ui/keyselectiondialog.cpp:694
+#: ui/keyselectiondialog.cpp:759
 msgid "Recheck Key"
 msgstr "Ail-wirio Allwedd"
 
-#: ui/messagebox.cpp:60
+#: ui/messagebox.cpp:65
 msgid "&Save to Disk..."
 msgstr ""
 
-#: ui/messagebox.cpp:64
+#: ui/messagebox.cpp:69
 msgid "&Copy to Clipboard"
 msgstr ""
 
-#: ui/messagebox.cpp:64
+#: ui/messagebox.cpp:69
 msgid "Copy Audit Log to Clipboard"
 msgstr ""
 
-#: ui/messagebox.cpp:68
+#: ui/messagebox.cpp:73
 msgid "&Show Audit Log"
 msgstr ""
 
-#: ui/messagebox.cpp:75
+#: ui/messagebox.cpp:81
 msgid "View GnuPG Audit Log"
 msgstr ""
 
-#: ui/messagebox.cpp:94
+#: ui/messagebox.cpp:112
 msgid "Choose File to Save GnuPG Audit Log to"
 msgstr ""
 
-#: ui/messagebox.cpp:106
+#: ui/messagebox.cpp:129
 msgid "Couldn't save to file \"%1\": %2"
 msgstr ""
 
-#: ui/messagebox.cpp:108
+#: ui/messagebox.cpp:131
 #, fuzzy
 msgid "File Save Error"
 msgstr "Gwall Ffeil."
 
-#: ui/messagebox.cpp:129
+#: ui/messagebox.cpp:153
 msgid "Your system does not have support for GnuPG Audit Logs"
 msgstr ""
 
-#: ui/messagebox.cpp:130
+#: ui/messagebox.cpp:154
 msgid "System Error"
 msgstr ""
 
-#: ui/messagebox.cpp:136
+#: ui/messagebox.cpp:161
+#, c-format
+msgid ""
+"An error occurred while trying to retrieve the GnuPG Audit Log:\n"
+"%1"
+msgstr ""
+
+#: ui/messagebox.cpp:163
+msgid "GnuPG Audit Log Error"
+msgstr ""
+
+#: ui/messagebox.cpp:170
 msgid "No GnuPG Audit Log available for this operation."
 msgstr ""
 
-#: ui/messagebox.cpp:137
+#: ui/messagebox.cpp:171
 msgid "No GnuPG Audit Log"
 msgstr ""
 
-#: ui/messagebox.cpp:153 ui/messagebox.cpp:158
+#: ui/messagebox.cpp:187 ui/messagebox.cpp:192
 msgid "GnuPG Audit Log Viewer"
 msgstr ""
 
-#: ui/messagebox.cpp:163
+#: ui/messagebox.cpp:197
 #, c-format
 msgid "Signing failed: %1"
 msgstr ""
 
-#: ui/messagebox.cpp:164
+#: ui/messagebox.cpp:198
 msgid "Signing successful"
 msgstr ""
 
-#: backends/chiasmus/chiasmusjob.cpp:209 ui/messagebox.cpp:173
+#: backends/chiasmus/chiasmusjob.cpp:209 ui/messagebox.cpp:207
 #, c-format
 msgid "Encryption failed: %1"
 msgstr ""
 
-#: ui/messagebox.cpp:174
+#: ui/messagebox.cpp:208
 #, fuzzy
 msgid "Encryption successful"
 msgstr "Allweddau cêl-ysgrifo:"
 
-#: ui/messagebox.cpp:191
+#: ui/messagebox.cpp:225
 msgid "Signing Result"
 msgstr ""
 
-#: ui/messagebox.cpp:201
+#: ui/messagebox.cpp:235
 msgid "Signing Error"
 msgstr ""
 
-#: ui/messagebox.cpp:211 ui/messagebox.cpp:231
+#: ui/messagebox.cpp:245 ui/messagebox.cpp:265
 #, fuzzy
 msgid "Encryption Result"
 msgstr "Allweddau cêl-ysgrifo:"
 
-#: ui/messagebox.cpp:221 ui/messagebox.cpp:241
+#: ui/messagebox.cpp:255 ui/messagebox.cpp:275
 #, fuzzy
 msgid "Encryption Error"
 msgstr "Allweddau cêl-ysgrifo:"
diff --git a/tde-i18n-cy/messages/tdepim/libkmime.po b/tde-i18n-cy/messages/tdepim/libkmime.po
index 3bcff283878..01b2bf10bc2 100644
--- a/tde-i18n-cy/messages/tdepim/libkmime.po
+++ b/tde-i18n-cy/messages/tdepim/libkmime.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: all.po\n"
-"POT-Creation-Date: 2008-04-25 05:30+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -65,21 +66,21 @@ msgstr ""
 "Methwyd creu Hysbysiad Lleoliad Neges ar gyfer y neges a anfonwyd ar ${date} i "
 "${to} efo pwnc \"${subject}\".  Rhoir y rheswm yn y maes penawd Methiant: isod."
 
-#: kmime_util.cpp:665
+#: kmime_util.cpp:642
 msgid "unknown"
 msgstr "anhysbys"
 
-#: kmime_util.cpp:682
+#: kmime_util.cpp:659
 #, c-format
 msgid "Today %1"
 msgstr "Heddiw %1"
 
-#: kmime_util.cpp:689
+#: kmime_util.cpp:666
 #, c-format
 msgid "Yesterday %1"
 msgstr "Ddoe %1"
 
-#: kmime_util.cpp:697
+#: kmime_util.cpp:674
 msgid ""
 "_: 1. weekday, 2. time\n"
 "%1 %2"
diff --git a/tde-i18n-cy/messages/tdepim/libkpgp.po b/tde-i18n-cy/messages/tdepim/libkpgp.po
index b5f9919cc7e..8d5db616519 100644
--- a/tde-i18n-cy/messages/tdepim/libkpgp.po
+++ b/tde-i18n-cy/messages/tdepim/libkpgp.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: all.po\n"
-"POT-Creation-Date: 2006-05-29 04:02+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdepim/libkpimexchange.po b/tde-i18n-cy/messages/tdepim/libkpimexchange.po
index 432a4a98b8c..db20eb0c5b5 100644
--- a/tde-i18n-cy/messages/tdepim/libkpimexchange.po
+++ b/tde-i18n-cy/messages/tdepim/libkpimexchange.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkpimexchange\n"
-"POT-Creation-Date: 2004-10-12 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2004-01-09 10:29+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdepim/libksieve.po b/tde-i18n-cy/messages/tdepim/libksieve.po
index 14144aa071b..5a2e410c0dc 100644
--- a/tde-i18n-cy/messages/tdepim/libksieve.po
+++ b/tde-i18n-cy/messages/tdepim/libksieve.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libksieve\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2004-01-09 13:52+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdepim/libtdepim.po b/tde-i18n-cy/messages/tdepim/libtdepim.po
index aed583fac65..fe62d050ba5 100644
--- a/tde-i18n-cy/messages/tdepim/libtdepim.po
+++ b/tde-i18n-cy/messages/tdepim/libtdepim.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libtdepim\n"
-"POT-Creation-Date: 2008-07-14 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2004-01-09 14:01+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,98 +26,98 @@ msgstr ""
 msgid "%1 (Default)"
 msgstr "%1 (rhagosod)"
 
-#: ../libkpimidentities/identitymanager.cpp:342
+#: ../libkpimidentities/identitymanager.cpp:340
 msgid "Unnamed"
 msgstr "Di-enw"
 
-#: ../libemailfunctions/email.cpp:457
+#: ../libemailfunctions/email.cpp:465
 msgid ""
 "The email address you entered is not valid because it contains more than one @. "
 "You will not create valid messages if you do not change your address."
 msgstr ""
 
-#: ../libemailfunctions/email.cpp:462
+#: ../libemailfunctions/email.cpp:470
 msgid ""
 "The email address you entered is not valid because it does not contain a @.You "
 "will not create valid messages if you do not change your address."
 msgstr ""
 
-#: ../libemailfunctions/email.cpp:467
+#: ../libemailfunctions/email.cpp:475
 msgid "You have to enter something in the email address field."
 msgstr ""
 
-#: ../libemailfunctions/email.cpp:469
+#: ../libemailfunctions/email.cpp:477
 msgid ""
 "The email address you entered is not valid because it does not contain a local "
 "part."
 msgstr ""
 
-#: ../libemailfunctions/email.cpp:472
+#: ../libemailfunctions/email.cpp:480
 msgid ""
 "The email address you entered is not valid because it does not contain a domain "
 "part."
 msgstr ""
 
-#: ../libemailfunctions/email.cpp:475
+#: ../libemailfunctions/email.cpp:483
 msgid ""
 "The email address you entered is not valid because it contains unclosed "
 "comments/brackets."
 msgstr ""
 
-#: ../libemailfunctions/email.cpp:478
+#: ../libemailfunctions/email.cpp:486
 msgid "The email address you entered is valid."
 msgstr ""
 
-#: ../libemailfunctions/email.cpp:480
+#: ../libemailfunctions/email.cpp:488
 msgid ""
 "The email address you entered is not valid because it contains an unclosed "
 "anglebracket."
 msgstr ""
 
-#: ../libemailfunctions/email.cpp:483
+#: ../libemailfunctions/email.cpp:491
 msgid ""
 "The email address you entered is not valid because it contains an unopened "
 "anglebracket."
 msgstr ""
 
-#: ../libemailfunctions/email.cpp:486
+#: ../libemailfunctions/email.cpp:494
 msgid ""
 "The email address you have entered is not valid because it contains an "
 "unexpected comma."
 msgstr ""
 
-#: ../libemailfunctions/email.cpp:489
+#: ../libemailfunctions/email.cpp:497
 msgid ""
 "The email address you entered is not valid because it ended unexpectedly, this "
 "probably means you have used an escaping type character like an \\  as the last "
 "character in your email address."
 msgstr ""
 
-#: ../libemailfunctions/email.cpp:494
+#: ../libemailfunctions/email.cpp:502
 msgid ""
 "The email address you entered is not valid because it contains quoted text "
 "which does not end."
 msgstr ""
 
-#: ../libemailfunctions/email.cpp:497 ../libemailfunctions/email.cpp:558
+#: ../libemailfunctions/email.cpp:505 ../libemailfunctions/email.cpp:566
 msgid ""
 "The email address you entered is not valid because it does not seem to contain "
 "an actual email address, i.e. something of the form joe@kde.org."
 msgstr ""
 
-#: ../libemailfunctions/email.cpp:501
+#: ../libemailfunctions/email.cpp:509
 msgid ""
 "The email address you entered is not valid because it contains an illegal "
 "character."
 msgstr ""
 
-#: ../libemailfunctions/email.cpp:504
+#: ../libemailfunctions/email.cpp:512
 msgid ""
 "The email address you have entered is not valid because it contains an invalid "
 "displayname."
 msgstr ""
 
-#: ../libemailfunctions/email.cpp:507
+#: ../libemailfunctions/email.cpp:515
 msgid "Unknown problem with email address"
 msgstr ""
 
@@ -132,8 +133,8 @@ msgid ""
 "Your emails"
 msgstr "kyfieithu@dotmon.com"
 
-#: addresseeemailselection.cpp:47 addressesdialog.cpp:238
-#: addressesdialog.cpp:719
+#: addresseeemailselection.cpp:47 addressesdialog.cpp:243
+#: addressesdialog.cpp:727
 msgid "To"
 msgstr "I"
 
@@ -145,17 +146,17 @@ msgstr "Cc"
 msgid "Bcc"
 msgstr "Ccd (Bcc)"
 
-#: addresseeemailselection.cpp:196 addressesdialog.cpp:319
-#: recentaddresses.cpp:167
+#: addresseeemailselection.cpp:196 addressesdialog.cpp:324
+#: completionordereditor.cpp:208 recentaddresses.cpp:167
 msgid "Recent Addresses"
 msgstr "Cyfeiriadau Diweddar"
 
-#: addresseelineedit.cpp:553 addressesdialog.cpp:1088
-#: completionordereditor.cpp:204
+#: addresseelineedit.cpp:594 addressesdialog.cpp:1152
+#: completionordereditor.cpp:205
 msgid "Distribution Lists"
 msgstr "Rhestri Dosbarthu"
 
-#: addresseelineedit.cpp:873
+#: addresseelineedit.cpp:927
 #, fuzzy
 msgid "Configure Completion Order..."
 msgstr "&Golygu Categorïau..."
@@ -240,8 +241,8 @@ msgstr ""
 msgid "SMS"
 msgstr "SMS"
 
-#: addresseeview.cpp:254 ldapsearchdialog.cpp:76 ldapsearchdialog.cpp:144
-#: ldapsearchdialog.cpp:275 ldapsearchdialog.cpp:346
+#: addresseeview.cpp:254 ldapsearchdialog.cpp:78 ldapsearchdialog.cpp:156
+#: ldapsearchdialog.cpp:287 ldapsearchdialog.cpp:358
 msgid "Email"
 msgstr "Ebost"
 
@@ -257,7 +258,7 @@ msgstr ""
 msgid "Notes"
 msgstr "Nodiadau"
 
-#: addresseeview.cpp:343 ldapsearchdialog.cpp:88 ldapsearchdialog.cpp:288
+#: addresseeview.cpp:343 ldapsearchdialog.cpp:90 ldapsearchdialog.cpp:300
 msgid "Department"
 msgstr "Adran"
 
@@ -342,29 +343,29 @@ msgstr "Agor URL %1"
 msgid "Chat with %1"
 msgstr ""
 
-#: addressesdialog.cpp:123 addressesdialog.cpp:131
+#: addressesdialog.cpp:125 addressesdialog.cpp:133
 msgid "<group>"
 msgstr "<grŵp>"
 
 #. i18n: file addresspicker.ui line 16
-#: addressesdialog.cpp:214 rc.cpp:3
+#: addressesdialog.cpp:216 rc.cpp:3
 #, no-c-format
 msgid "Address Selection"
 msgstr "Dewis Cyfeiriad"
 
-#: addressesdialog.cpp:249 addressesdialog.cpp:741
+#: addressesdialog.cpp:254 addressesdialog.cpp:748
 msgid "CC"
 msgstr "CC"
 
-#: addressesdialog.cpp:260 addressesdialog.cpp:763
+#: addressesdialog.cpp:265 addressesdialog.cpp:769
 msgid "BCC"
 msgstr "CCD (BCC)"
 
-#: addressesdialog.cpp:458
+#: addressesdialog.cpp:464
 msgid "Other Addresses"
 msgstr "Cyfeiriadau Eraill"
 
-#: addressesdialog.cpp:883
+#: addressesdialog.cpp:888
 msgid ""
 "There are no addresses in your list. First add some addresses from your address "
 "book, then try again."
@@ -372,15 +373,15 @@ msgstr ""
 "Does dim cyfeiriadau yn eich rhestr.  Yn gyntaf, ychwanegwch rhai cyfeiriadau "
 "o'ch llyfr cyfeiriadau, a ceisiwch eto."
 
-#: addressesdialog.cpp:890
+#: addressesdialog.cpp:895
 msgid "New Distribution List"
 msgstr "Rhestr Ddosbarthu Newydd"
 
-#: addressesdialog.cpp:891
+#: addressesdialog.cpp:896
 msgid "Please enter name:"
 msgstr "Rhowch enw:"
 
-#: addressesdialog.cpp:908
+#: addressesdialog.cpp:913
 msgid ""
 "<qt>Distribution list with the given name <b>%1</b> already exists. Please "
 "select a different name.</qt>"
@@ -487,8 +488,8 @@ msgstr ""
 msgid "Duration"
 msgstr "Hyd"
 
-#: calendardiffalgo.cpp:135 ksubscription.cpp:270 ldapsearchdialog.cpp:91
-#: ldapsearchdialog.cpp:289
+#: calendardiffalgo.cpp:135 ksubscription.cpp:270 ldapsearchdialog.cpp:93
+#: ldapsearchdialog.cpp:301
 msgid "Description"
 msgstr "Disgrifiad"
 
@@ -597,12 +598,12 @@ msgstr "Categori"
 msgid "Select Categories"
 msgstr "Dewis Categorïau"
 
-#: completionordereditor.cpp:90
+#: completionordereditor.cpp:91
 #, c-format
 msgid "LDAP server %1"
 msgstr ""
 
-#: completionordereditor.cpp:176
+#: completionordereditor.cpp:177
 msgid "Edit Completion Order"
 msgstr ""
 
@@ -672,52 +673,52 @@ msgid "KCMDesignerfields"
 msgstr ""
 
 #: kcmdesignerfields.cpp:135
-msgid "Qt Designer Fields Dialog"
+msgid "TQt Designer Fields Dialog"
 msgstr ""
 
 #: kcmdesignerfields.cpp:137
 msgid "(c), 2004 Tobias Koenig"
 msgstr ""
 
-#: kcmdesignerfields.cpp:178
+#: kcmdesignerfields.cpp:179
 msgid "<qt>Do you really want to delete '<b>%1</b>'?</qt>"
 msgstr ""
 
-#: kcmdesignerfields.cpp:187
+#: kcmdesignerfields.cpp:188
 msgid "*.ui|Designer Files"
 msgstr ""
 
-#: kcmdesignerfields.cpp:188
+#: kcmdesignerfields.cpp:189
 #, fuzzy
 msgid "Import Page"
 msgstr "Cynnydd Mewnforio"
 
-#: kcmdesignerfields.cpp:271
+#: kcmdesignerfields.cpp:272
 msgid ""
-"<qt><b>Warning:</b> Qt Designer could not be found. It is probably not "
+"<qt><b>Warning:</b> TQt Designer could not be found. It is probably not "
 "installed. You will only be able to import existing designer files.</qt>"
 msgstr ""
 
-#: kcmdesignerfields.cpp:280
+#: kcmdesignerfields.cpp:281
 #, fuzzy
 msgid "Available Pages"
 msgstr "Cyfeiriadau Ar Gael"
 
-#: kcmdesignerfields.cpp:286
+#: kcmdesignerfields.cpp:287
 msgid "Preview of Selected Page"
 msgstr ""
 
-#: kcmdesignerfields.cpp:299
+#: kcmdesignerfields.cpp:300
 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>Click on '<i>Edit with TQt Designer</i>'"
 "<li>In the dialog, select '<i>Widget</i>', then click <i>OK</i>"
 "<li>Add your widgets to the form"
-"<li>Save the file in the directory proposed by Qt Designer"
-"<li>Close Qt Designer</ol>"
+"<li>Save the file in the directory proposed by TQt Designer"
+"<li>Close TQt Designer</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 "
@@ -726,93 +727,42 @@ msgid ""
 "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>"
+"in TQt Designer.</p></qt>"
 msgstr ""
 
-#: kcmdesignerfields.cpp:321
+#: kcmdesignerfields.cpp:322
 msgid "<a href=\"whatsthis:%1\">How does this work?</a>"
 msgstr ""
 
-#: kcmdesignerfields.cpp:329
+#: kcmdesignerfields.cpp:330
 msgid "Delete Page"
 msgstr "Dileu Tudalen"
 
-#: kcmdesignerfields.cpp:332
+#: kcmdesignerfields.cpp:333
 #, fuzzy
 msgid "Import Page..."
 msgstr "Cynnydd Mewnforio"
 
-#: kcmdesignerfields.cpp:334
-msgid "Edit with Qt Designer..."
+#: kcmdesignerfields.cpp:335
+msgid "Edit with TQt Designer..."
 msgstr ""
 
-#: kcmdesignerfields.cpp:362
+#: kcmdesignerfields.cpp:363
 msgid "Key:"
 msgstr "Allwedd:"
 
-#: kcmdesignerfields.cpp:364
+#: kcmdesignerfields.cpp:365
 msgid "Type:"
 msgstr "Math:"
 
-#: kcmdesignerfields.cpp:366
+#: kcmdesignerfields.cpp:367
 msgid "Classname:"
 msgstr ""
 
-#: kcmdesignerfields.cpp:368
+#: kcmdesignerfields.cpp:369
 msgid "Description:"
 msgstr "Disgrifiad:"
 
-#: tdeconfigpropagator.cpp:39
-msgid "Change Config Value"
-msgstr ""
-
-#: tdeconfigwizard.cpp:36 tdeconfigwizard.cpp:45
-msgid "Configuration Wizard"
-msgstr "Dewin Ffurfweddu"
-
-#: tdeconfigwizard.cpp:84
-msgid "Rules"
-msgstr "Rheolau"
-
-#: tdeconfigwizard.cpp:90
-msgid "Source"
-msgstr "Tarddiad"
-
-#: tdeconfigwizard.cpp:91
-msgid "Target"
-msgstr "Targed"
-
-#: tdeconfigwizard.cpp:92
-msgid "Condition"
-msgstr "Cyflwr"
-
-#: tdeconfigwizard.cpp:125
-msgid "Changes"
-msgstr ""
-
-#: tdeconfigwizard.cpp:131
-msgid "Action"
-msgstr "Gweithred"
-
-#: tdeconfigwizard.cpp:132
-msgid "Option"
-msgstr "Dewisiad"
-
-#: tdeconfigwizard.cpp:133
-msgid "Value"
-msgstr "Gwerth"
-
-#: tdeconfigwizard.cpp:166
-msgid ""
-"Please make sure that the programs which are configured by the wizard do not "
-"run in parallel to the wizard; otherwise, changes done by the wizard could be "
-"lost."
-msgstr ""
-
-#: tdeconfigwizard.cpp:169
-msgid "Run Wizard Now"
-msgstr ""
-
 #: kdateedit.cpp:332
 msgid "tomorrow"
 msgstr "yfory"
@@ -846,151 +796,6 @@ msgstr "M&is Nesaf"
 msgid "No Date"
 msgstr "Nodiadau"
 
-#: tdefileio.cpp:31
-msgid "File I/O Error"
-msgstr ""
-
-#: tdefileio.cpp:51 tdefileio.cpp:122
-#, c-format
-msgid ""
-"The specified file does not exist:\n"
-"%1"
-msgstr ""
-"Nid yw'r ffeil benodedig yn bodoli:\n"
-" %1"
-
-#: tdefileio.cpp:57 tdefileio.cpp:129
-#, c-format
-msgid ""
-"This is a folder and not a file:\n"
-"%1"
-msgstr ""
-"Cyfeiriadur ac nid ffeil yw hwn:\n"
-" %1"
-
-#: tdefileio.cpp:63 tdefileio.cpp:136
-#, c-format
-msgid ""
-"You do not have read permissions to the file:\n"
-"%1"
-msgstr ""
-
-#: tdefileio.cpp:74 tdefileio.cpp:147
-#, c-format
-msgid ""
-"Could not read file:\n"
-"%1"
-msgstr ""
-"Methwyd darllen y ffeil:\n"
-" %1"
-
-#: tdefileio.cpp:77 tdefileio.cpp:150
-#, c-format
-msgid ""
-"Could not open file:\n"
-"%1"
-msgstr ""
-"Methwyd agor y ffeil:\n"
-" %1"
-
-#: tdefileio.cpp:80 tdefileio.cpp:153
-#, c-format
-msgid ""
-"Error while reading file:\n"
-"%1"
-msgstr ""
-"Gwall tra'n darllen y ffeil:\n"
-" %1"
-
-#: tdefileio.cpp:96 tdefileio.cpp:165
-msgid "Could only read %1 bytes of %2."
-msgstr "Gellid darllen %1 beit allan o %2 yn unig."
-
-#: tdefileio.cpp:193
-msgid ""
-"File %1 exists.\n"
-"Do you want to replace it?"
-msgstr ""
-"Mae'r ffeil %1 yn bodoli.\n"
-" A ydych am ei amnewid?"
-
-#: tdefileio.cpp:196 tdefileio.cpp:213
-msgid "Save to File"
-msgstr "Cadw i Ffeil"
-
-#: tdefileio.cpp:196
-msgid "&Replace"
-msgstr "A&mnewid"
-
-#: tdefileio.cpp:211
-msgid ""
-"Failed to make a backup copy of %1.\n"
-"Continue anyway?"
-msgstr ""
-"Methwyd creu copi wrth gefn o %1.\n"
-" Parhau serch hynny?"
-
-#: tdefileio.cpp:224 tdefileio.cpp:241
-#, c-format
-msgid ""
-"Could not write to file:\n"
-"%1"
-msgstr ""
-"Methwyd ysgrifennu i'r ffeil:\n"
-" %1"
-
-#: tdefileio.cpp:227
-#, c-format
-msgid ""
-"Could not open file for writing:\n"
-"%1"
-msgstr ""
-"Methwyd agor y ffeil ar gyfer ysgrifennu:\n"
-" %1"
-
-#: tdefileio.cpp:231
-#, c-format
-msgid ""
-"Error while writing file:\n"
-"%1"
-msgstr ""
-"Gwall tra'n ysgrifennu i'r ffeil:\n"
-" %1"
-
-#: tdefileio.cpp:246
-msgid "Could only write %1 bytes of %2."
-msgstr "Gellid ysgrifennu %1 beit allan o %2 yn unig."
-
-#: tdefileio.cpp:285
-msgid "%1 does not exist"
-msgstr "Nid yw %1 yn bodoli"
-
-#: tdefileio.cpp:297
-msgid "%1 is not accessible and that is unchangeable."
-msgstr ""
-
-#: tdefileio.cpp:318
-msgid "%1 is not readable and that is unchangeable."
-msgstr ""
-
-#: tdefileio.cpp:334
-msgid "%1 is not writable and that is unchangeable."
-msgstr ""
-
-#: tdefileio.cpp:349
-msgid "Folder %1 is inaccessible."
-msgstr ""
-
-#: tdefileio.cpp:380
-msgid ""
-"Some files or folders do not have the right permissions, please correct them "
-"manually."
-msgstr ""
-
-#: tdefileio.cpp:383
-msgid "Permissions Check"
-msgstr ""
-
 #: kimportdialog.cpp:78
 msgid "Plain"
 msgstr "Plaen"
@@ -1474,7 +1279,7 @@ msgid "Current changes:"
 msgstr "Newidiadau cyfredol:"
 
 #. i18n: file addresspicker.ui line 25
-#: ksubscription.cpp:267 ldapsearchdialog.cpp:143 ldapsearchdialog.cpp:341
+#: ksubscription.cpp:267 ldapsearchdialog.cpp:155 ldapsearchdialog.cpp:353
 #: rc.cpp:6 rc.cpp:33
 #, no-c-format
 msgid "Name"
@@ -1519,120 +1324,120 @@ msgid ""
 "Clear"
 msgstr "Gwagu"
 
-#: ldapsearchdialog.cpp:74 ldapsearchdialog.cpp:291
+#: ldapsearchdialog.cpp:76 ldapsearchdialog.cpp:303
 msgid "Title"
 msgstr ""
 
-#: ldapsearchdialog.cpp:75 ldapsearchdialog.cpp:274
+#: ldapsearchdialog.cpp:77 ldapsearchdialog.cpp:286
 #, fuzzy
 msgid "Full Name"
 msgstr "Enw"
 
-#: ldapsearchdialog.cpp:77 ldapsearchdialog.cpp:145 ldapsearchdialog.cpp:276
-#: ldapsearchdialog.cpp:348
+#: ldapsearchdialog.cpp:79 ldapsearchdialog.cpp:157 ldapsearchdialog.cpp:288
+#: ldapsearchdialog.cpp:360
 #, fuzzy
 msgid "Home Number"
 msgstr "Dangos Rhifau Teleffôn"
 
-#: ldapsearchdialog.cpp:78 ldapsearchdialog.cpp:146 ldapsearchdialog.cpp:277
-#: ldapsearchdialog.cpp:350
+#: ldapsearchdialog.cpp:80 ldapsearchdialog.cpp:158 ldapsearchdialog.cpp:289
+#: ldapsearchdialog.cpp:362
 msgid "Work Number"
 msgstr ""
 
-#: ldapsearchdialog.cpp:79 ldapsearchdialog.cpp:278
+#: ldapsearchdialog.cpp:81 ldapsearchdialog.cpp:290
 msgid "Mobile Number"
 msgstr ""
 
-#: ldapsearchdialog.cpp:80 ldapsearchdialog.cpp:279
+#: ldapsearchdialog.cpp:82 ldapsearchdialog.cpp:291
 msgid "Fax Number"
 msgstr ""
 
-#: ldapsearchdialog.cpp:81
+#: ldapsearchdialog.cpp:83
 msgid "Pager"
 msgstr ""
 
-#: ldapsearchdialog.cpp:82 ldapsearchdialog.cpp:282
+#: ldapsearchdialog.cpp:84 ldapsearchdialog.cpp:294
 msgid "Street"
 msgstr ""
 
-#: ldapsearchdialog.cpp:83 ldapsearchdialog.cpp:283
+#: ldapsearchdialog.cpp:85 ldapsearchdialog.cpp:295
 #, fuzzy
 msgid "State"
 msgstr "Cyflwr"
 
-#: ldapsearchdialog.cpp:84 ldapsearchdialog.cpp:284
+#: ldapsearchdialog.cpp:86 ldapsearchdialog.cpp:296
 msgid "Country"
 msgstr ""
 
-#: ldapsearchdialog.cpp:85 ldapsearchdialog.cpp:287
+#: ldapsearchdialog.cpp:87 ldapsearchdialog.cpp:299
 msgid "City"
 msgstr ""
 
-#: ldapsearchdialog.cpp:86 ldapsearchdialog.cpp:281
+#: ldapsearchdialog.cpp:88 ldapsearchdialog.cpp:293
 #, fuzzy
 msgid "Organization"
 msgstr "Trefnydd"
 
-#: ldapsearchdialog.cpp:87 ldapsearchdialog.cpp:280
+#: ldapsearchdialog.cpp:89 ldapsearchdialog.cpp:292
 msgid "Company"
 msgstr ""
 
-#: ldapsearchdialog.cpp:89 ldapsearchdialog.cpp:285
+#: ldapsearchdialog.cpp:91 ldapsearchdialog.cpp:297
 msgid "Zip Code"
 msgstr ""
 
-#: ldapsearchdialog.cpp:90 ldapsearchdialog.cpp:286
+#: ldapsearchdialog.cpp:92 ldapsearchdialog.cpp:298
 #, fuzzy
 msgid "Postal Address"
 msgstr "Dangos Cyfeiriad Post"
 
-#: ldapsearchdialog.cpp:92 ldapsearchdialog.cpp:290
+#: ldapsearchdialog.cpp:94 ldapsearchdialog.cpp:302
 #, fuzzy
 msgid "User ID"
 msgstr "UID"
 
-#: ldapsearchdialog.cpp:116 ldapsearchdialog.cpp:123
+#: ldapsearchdialog.cpp:128 ldapsearchdialog.cpp:135
 msgid "Search for Addresses in Directory"
 msgstr ""
 
-#: ldapsearchdialog.cpp:132
+#: ldapsearchdialog.cpp:144
 #, fuzzy
 msgid "Search for:"
 msgstr "Chwiliad:"
 
-#: ldapsearchdialog.cpp:139
+#: ldapsearchdialog.cpp:151
 msgid "in"
 msgstr ""
 
-#: ldapsearchdialog.cpp:152 ldapsearchdialog.cpp:406
+#: ldapsearchdialog.cpp:164 ldapsearchdialog.cpp:418
 #, fuzzy
 msgid "Search"
 msgstr "Chwiliad:"
 
-#: ldapsearchdialog.cpp:160
+#: ldapsearchdialog.cpp:172
 msgid "Recursive search"
 msgstr ""
 
-#: ldapsearchdialog.cpp:165
+#: ldapsearchdialog.cpp:177
 #, fuzzy
 msgid "Contains"
 msgstr "Amodau"
 
-#: ldapsearchdialog.cpp:166
+#: ldapsearchdialog.cpp:178
 #, fuzzy
 msgid "Starts With"
 msgstr "Amser Dechrau"
 
-#: ldapsearchdialog.cpp:179
+#: ldapsearchdialog.cpp:191
 msgid "Unselect All"
 msgstr ""
 
-#: ldapsearchdialog.cpp:181
+#: ldapsearchdialog.cpp:193
 #, fuzzy
 msgid "Add Selected"
 msgstr "Dewis Cyfeiriad"
 
-#: ldapsearchdialog.cpp:222
+#: ldapsearchdialog.cpp:234
 msgid ""
 "You must select a LDAP server before searching.\n"
 "You can do this from the menu Settings/Configure KAddressBook."
@@ -1793,14 +1598,210 @@ msgstr ""
 msgid "Open detailed progress dialog"
 msgstr ""
 
-#: statusbarprogresswidget.cpp:278
+#: statusbarprogresswidget.cpp:287
 msgid "Hide detailed progress window"
 msgstr ""
 
-#: statusbarprogresswidget.cpp:283
+#: statusbarprogresswidget.cpp:292
 msgid "Show detailed progress window"
 msgstr ""
 
+#: tdeconfigpropagator.cpp:39
+msgid "Change Config Value"
+msgstr ""
+
+#: tdeconfigwizard.cpp:36 tdeconfigwizard.cpp:45
+msgid "Configuration Wizard"
+msgstr "Dewin Ffurfweddu"
+
+#: tdeconfigwizard.cpp:84
+msgid "Rules"
+msgstr "Rheolau"
+
+#: tdeconfigwizard.cpp:90
+msgid "Source"
+msgstr "Tarddiad"
+
+#: tdeconfigwizard.cpp:91
+msgid "Target"
+msgstr "Targed"
+
+#: tdeconfigwizard.cpp:92
+msgid "Condition"
+msgstr "Cyflwr"
+
+#: tdeconfigwizard.cpp:125
+msgid "Changes"
+msgstr ""
+
+#: tdeconfigwizard.cpp:131
+msgid "Action"
+msgstr "Gweithred"
+
+#: tdeconfigwizard.cpp:132
+msgid "Option"
+msgstr "Dewisiad"
+
+#: tdeconfigwizard.cpp:133
+msgid "Value"
+msgstr "Gwerth"
+
+#: tdeconfigwizard.cpp:166
+msgid ""
+"Please make sure that the programs which are configured by the wizard do not "
+"run in parallel to the wizard; otherwise, changes done by the wizard could be "
+"lost."
+msgstr ""
+
+#: tdeconfigwizard.cpp:169
+msgid "Run Wizard Now"
+msgstr ""
+
+#: tdefileio.cpp:31
+msgid "File I/O Error"
+msgstr ""
+
+#: tdefileio.cpp:51 tdefileio.cpp:122
+#, c-format
+msgid ""
+"The specified file does not exist:\n"
+"%1"
+msgstr ""
+"Nid yw'r ffeil benodedig yn bodoli:\n"
+" %1"
+
+#: tdefileio.cpp:57 tdefileio.cpp:129
+#, c-format
+msgid ""
+"This is a folder and not a file:\n"
+"%1"
+msgstr ""
+"Cyfeiriadur ac nid ffeil yw hwn:\n"
+" %1"
+
+#: tdefileio.cpp:63 tdefileio.cpp:136
+#, c-format
+msgid ""
+"You do not have read permissions to the file:\n"
+"%1"
+msgstr ""
+
+#: tdefileio.cpp:74 tdefileio.cpp:147
+#, c-format
+msgid ""
+"Could not read file:\n"
+"%1"
+msgstr ""
+"Methwyd darllen y ffeil:\n"
+" %1"
+
+#: tdefileio.cpp:77 tdefileio.cpp:150
+#, c-format
+msgid ""
+"Could not open file:\n"
+"%1"
+msgstr ""
+"Methwyd agor y ffeil:\n"
+" %1"
+
+#: tdefileio.cpp:80 tdefileio.cpp:153
+#, c-format
+msgid ""
+"Error while reading file:\n"
+"%1"
+msgstr ""
+"Gwall tra'n darllen y ffeil:\n"
+" %1"
+
+#: tdefileio.cpp:96 tdefileio.cpp:165
+msgid "Could only read %1 bytes of %2."
+msgstr "Gellid darllen %1 beit allan o %2 yn unig."
+
+#: tdefileio.cpp:193
+msgid ""
+"File %1 exists.\n"
+"Do you want to replace it?"
+msgstr ""
+"Mae'r ffeil %1 yn bodoli.\n"
+" A ydych am ei amnewid?"
+
+#: tdefileio.cpp:196 tdefileio.cpp:213
+msgid "Save to File"
+msgstr "Cadw i Ffeil"
+
+#: tdefileio.cpp:196
+msgid "&Replace"
+msgstr "A&mnewid"
+
+#: tdefileio.cpp:211
+msgid ""
+"Failed to make a backup copy of %1.\n"
+"Continue anyway?"
+msgstr ""
+"Methwyd creu copi wrth gefn o %1.\n"
+" Parhau serch hynny?"
+
+#: tdefileio.cpp:224 tdefileio.cpp:241
+#, c-format
+msgid ""
+"Could not write to file:\n"
+"%1"
+msgstr ""
+"Methwyd ysgrifennu i'r ffeil:\n"
+" %1"
+
+#: tdefileio.cpp:227
+#, c-format
+msgid ""
+"Could not open file for writing:\n"
+"%1"
+msgstr ""
+"Methwyd agor y ffeil ar gyfer ysgrifennu:\n"
+" %1"
+
+#: tdefileio.cpp:231
+#, c-format
+msgid ""
+"Error while writing file:\n"
+"%1"
+msgstr ""
+"Gwall tra'n ysgrifennu i'r ffeil:\n"
+" %1"
+
+#: tdefileio.cpp:246
+msgid "Could only write %1 bytes of %2."
+msgstr "Gellid ysgrifennu %1 beit allan o %2 yn unig."
+
+#: tdefileio.cpp:285
+msgid "%1 does not exist"
+msgstr "Nid yw %1 yn bodoli"
+
+#: tdefileio.cpp:297
+msgid "%1 is not accessible and that is unchangeable."
+msgstr ""
+
+#: tdefileio.cpp:318
+msgid "%1 is not readable and that is unchangeable."
+msgstr ""
+
+#: tdefileio.cpp:334
+msgid "%1 is not writable and that is unchangeable."
+msgstr ""
+
+#: tdefileio.cpp:349
+msgid "Folder %1 is inaccessible."
+msgstr ""
+
+#: tdefileio.cpp:380
+msgid ""
+"Some files or folders do not have the right permissions, please correct them "
+"manually."
+msgstr ""
+
+#: tdefileio.cpp:383
+msgid "Permissions Check"
+msgstr ""
+
 #~ msgid "&Friday"
 #~ msgstr "&Dydd Gwener"
 
diff --git a/tde-i18n-cy/messages/tdepim/tdeabc2mutt.po b/tde-i18n-cy/messages/tdepim/tdeabc2mutt.po
index dfd5840d09f..4ef64c42d8f 100644
--- a/tde-i18n-cy/messages/tdepim/tdeabc2mutt.po
+++ b/tde-i18n-cy/messages/tdepim/tdeabc2mutt.po
@@ -5,19 +5,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeabc2mutt\n"
-"POT-Creation-Date: 2005-04-12 18:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2004-01-07 14:13+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.2\n"
 
-#: tdeabc2mutt.cpp:115
-msgid "preferred"
-msgstr ""
-
 #: main.cpp:30
 msgid "tdeabc2mutt"
 msgstr "tdeabc2mutt"
@@ -52,5 +49,10 @@ msgid "Return all mail addresses, not just the preferred one"
 msgstr ""
 
 #: main.cpp:70
-msgid "Searching TDE addressbook"
+#, fuzzy
+msgid "Searching KDE addressbook"
 msgstr "Chwilio yn y llyfr cyfeiriadau mutt..."
+
+#: tdeabc2mutt.cpp:115
+msgid "preferred"
+msgstr ""
diff --git a/tde-i18n-cy/messages/tdepim/tdeabc_slox.po b/tde-i18n-cy/messages/tdepim/tdeabc_slox.po
index f88e08f7aa5..aa07182b8a9 100644
--- a/tde-i18n-cy/messages/tdepim/tdeabc_slox.po
+++ b/tde-i18n-cy/messages/tdepim/tdeabc_slox.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdepim/tdeabc_slox.po\n"
-"POT-Creation-Date: 2006-05-17 04:02+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,62 +22,35 @@ msgid ""
 "Your emails"
 msgstr "kyfieithu@dotmon.com"
 
-#: tdeabcresourceslox.cpp:214
-msgid "Downloading contacts"
-msgstr ""
-
-#: tdeabcresourceslox.cpp:523
-msgid "Uploading contacts"
-msgstr ""
-
-#: tdeabcresourcesloxconfig.cpp:47
-msgid "URL:"
-msgstr "URL:"
-
-#: tdeabcresourcesloxconfig.cpp:53 kcalresourcesloxconfig.cpp:56
-msgid "User:"
-msgstr "Defnyddiwr:"
-
-#: tdeabcresourcesloxconfig.cpp:59 kcalresourcesloxconfig.cpp:62
-msgid "Password:"
-msgstr "Cyfrinair:"
-
-#. i18n: file tderesources_tdeabc_slox.kcfg line 19
-#: tdeabcresourcesloxconfig.cpp:66 kcalresourcesloxconfig.cpp:69 rc.cpp:12
-#: rc.cpp:36
-#, no-c-format
-msgid "Only load data since last sync"
+#: kcalresourceslox.cpp:74 tdeabcresourceslox.cpp:53
+msgid "OpenXchange Server"
 msgstr ""
 
-#: tdeabcresourcesloxconfig.cpp:70
-msgid "Select Folder..."
-msgstr "Dewis Plygell ..."
-
-#: kcalresourceslox.cpp:178
+#: kcalresourceslox.cpp:180
 msgid "Non-http protocol: '%1'"
 msgstr ""
 
-#: kcalresourceslox.cpp:233
+#: kcalresourceslox.cpp:235
 msgid "Downloading events"
 msgstr ""
 
-#: kcalresourceslox.cpp:278
+#: kcalresourceslox.cpp:280
 msgid "Downloading to-dos"
 msgstr ""
 
-#: kcalresourceslox.cpp:387
+#: kcalresourceslox.cpp:389
 msgid "Uploading incidence"
 msgstr ""
 
-#: kcalresourceslox.cpp:1226
+#: kcalresourceslox.cpp:1228
 msgid "Added"
 msgstr "Ychwanegu"
 
-#: kcalresourceslox.cpp:1227
+#: kcalresourceslox.cpp:1229
 msgid "Changed"
 msgstr ""
 
-#: kcalresourceslox.cpp:1228
+#: kcalresourceslox.cpp:1230
 msgid "Deleted"
 msgstr "Wedi'u dileu"
 
@@ -84,6 +58,21 @@ msgstr "Wedi'u dileu"
 msgid "Download from:"
 msgstr ""
 
+#: kcalresourcesloxconfig.cpp:56 tdeabcresourcesloxconfig.cpp:53
+msgid "User:"
+msgstr "Defnyddiwr:"
+
+#: kcalresourcesloxconfig.cpp:62 tdeabcresourcesloxconfig.cpp:59
+msgid "Password:"
+msgstr "Cyfrinair:"
+
+#. i18n: file tderesources_kcal_slox.kcfg line 25
+#: kcalresourcesloxconfig.cpp:69 rc.cpp:18 rc.cpp:36
+#: tdeabcresourcesloxconfig.cpp:66
+#, no-c-format
+msgid "Only load data since last sync"
+msgstr ""
+
 #: kcalresourcesloxconfig.cpp:73
 msgid "Calendar Folder..."
 msgstr ""
@@ -92,60 +81,60 @@ msgstr ""
 msgid "Task Folder..."
 msgstr ""
 
-#. i18n: file tderesources_tdeabc_slox.kcfg line 10
-#: rc.cpp:3 rc.cpp:21
+#. i18n: file tderesources_kcal_slox.kcfg line 10
+#: rc.cpp:3 rc.cpp:27
 #, no-c-format
 msgid "Base Url"
 msgstr "URL Sylfaenol"
 
-#. i18n: file tderesources_tdeabc_slox.kcfg line 13
-#: rc.cpp:6 rc.cpp:24
+#. i18n: file tderesources_kcal_slox.kcfg line 13
+#: rc.cpp:6 rc.cpp:30
 #, no-c-format
 msgid "User Name"
 msgstr "Enw'r defnyddiwr"
 
-#. i18n: file tderesources_tdeabc_slox.kcfg line 16
-#: rc.cpp:9 rc.cpp:27
+#. i18n: file tderesources_kcal_slox.kcfg line 16
+#: rc.cpp:9 rc.cpp:33
 #, no-c-format
 msgid "Password"
 msgstr "Cyfrinair"
 
-#. i18n: file tderesources_tdeabc_slox.kcfg line 23
-#: rc.cpp:15 sloxfolderdialog.cpp:37
-#, no-c-format
-msgid "Folder ID"
-msgstr ""
-
-#. i18n: file tderesources_tdeabc_slox.kcfg line 27
-#: rc.cpp:18
-#, no-c-format
-msgid "Last Sync"
-msgstr ""
-
 #. i18n: file tderesources_kcal_slox.kcfg line 19
-#: rc.cpp:30
+#: rc.cpp:12
 #, no-c-format
 msgid "Last Event Sync"
 msgstr ""
 
 #. i18n: file tderesources_kcal_slox.kcfg line 22
-#: rc.cpp:33
+#: rc.cpp:15
 #, no-c-format
 msgid "Last To-do Sync"
 msgstr ""
 
 #. i18n: file tderesources_kcal_slox.kcfg line 29
-#: rc.cpp:39
+#: rc.cpp:21
 #, no-c-format
 msgid "Calendar Folder"
 msgstr ""
 
 #. i18n: file tderesources_kcal_slox.kcfg line 33
-#: rc.cpp:42
+#: rc.cpp:24
 #, no-c-format
 msgid "Task Folder"
 msgstr ""
 
+#. i18n: file tderesources_tdeabc_slox.kcfg line 23
+#: rc.cpp:39 sloxfolderdialog.cpp:37
+#, no-c-format
+msgid "Folder ID"
+msgstr ""
+
+#. i18n: file tderesources_tdeabc_slox.kcfg line 27
+#: rc.cpp:42
+#, no-c-format
+msgid "Last Sync"
+msgstr ""
+
 #: sloxfolder.cpp:45
 msgid "Global Addressbook"
 msgstr ""
@@ -178,6 +167,22 @@ msgstr ""
 msgid "System Folder"
 msgstr ""
 
+#: tdeabcresourceslox.cpp:216
+msgid "Downloading contacts"
+msgstr ""
+
+#: tdeabcresourceslox.cpp:529
+msgid "Uploading contacts"
+msgstr ""
+
+#: tdeabcresourcesloxconfig.cpp:47
+msgid "URL:"
+msgstr "URL:"
+
+#: tdeabcresourcesloxconfig.cpp:70
+msgid "Select Folder..."
+msgstr "Dewis Plygell ..."
+
 #~ msgid "Confirm Save"
 #~ msgstr "Cadarnhau Cadw"
 
diff --git a/tde-i18n-cy/messages/tdepim/tdefile_ics.po b/tde-i18n-cy/messages/tdepim/tdefile_ics.po
index ad832632c3e..1c9e10951c5 100644
--- a/tde-i18n-cy/messages/tdepim/tdefile_ics.po
+++ b/tde-i18n-cy/messages/tdepim/tdefile_ics.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdepim/tdefile_ics.po\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdepim/tdefile_palm.po b/tde-i18n-cy/messages/tdepim/tdefile_palm.po
index 09f084ba940..dc4268c529f 100644
--- a/tde-i18n-cy/messages/tdepim/tdefile_palm.po
+++ b/tde-i18n-cy/messages/tdepim/tdefile_palm.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdepim/tdefile_palm.po\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdepim/tdefile_rfc822.po b/tde-i18n-cy/messages/tdepim/tdefile_rfc822.po
index 8558a4b63df..6fc8f15dd04 100644
--- a/tde-i18n-cy/messages/tdepim/tdefile_rfc822.po
+++ b/tde-i18n-cy/messages/tdepim/tdefile_rfc822.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_rfc822\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2004-01-08 21:10+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdepim/tdefile_vcf.po b/tde-i18n-cy/messages/tdepim/tdefile_vcf.po
index f95024cb6d2..6ef36c4bb72 100644
--- a/tde-i18n-cy/messages/tdepim/tdefile_vcf.po
+++ b/tde-i18n-cy/messages/tdepim/tdefile_vcf.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_vcf\n"
-"POT-Creation-Date: 2008-01-07 01:17+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2004-01-08 21:11+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdepim/tdeio_groupwise.po b/tde-i18n-cy/messages/tdepim/tdeio_groupwise.po
index 842182a3cc9..bd486a9b71c 100644
--- a/tde-i18n-cy/messages/tdepim/tdeio_groupwise.po
+++ b/tde-i18n-cy/messages/tdepim/tdeio_groupwise.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: all2.po\n"
-"POT-Creation-Date: 2006-12-12 02:40+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdepim/tdeio_imap4.po b/tde-i18n-cy/messages/tdepim/tdeio_imap4.po
index db8ce453d14..62d149f53d2 100644
--- a/tde-i18n-cy/messages/tdepim/tdeio_imap4.po
+++ b/tde-i18n-cy/messages/tdepim/tdeio_imap4.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdepim/tdeio_imap4.po\n"
-"POT-Creation-Date: 2008-01-26 01:19+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -89,11 +90,7 @@ msgid ""
 "%2"
 msgstr "Methu cael gwybodaeth am blygell %1. Ymatebodd y gweinydd: %2"
 
-#: imap4.cc:1783
-msgid "Unable to close mailbox."
-msgstr "Methu cau'r blwch post."
-
-#: imap4.cc:2051
+#: imap4.cc:2052
 msgid ""
 "The server %1 supports neither IMAP4 nor IMAP4rev1.\n"
 "It identified itself with: %2"
@@ -101,7 +98,7 @@ msgstr ""
 "Nid yw'r gweinydd %1 yn cynnal na IMAP4 na IMAP4rev1.\n"
 "Dynododd ei hun â %2"
 
-#: imap4.cc:2062
+#: imap4.cc:2063
 msgid ""
 "The server does not support TLS.\n"
 "Disable this security feature to connect unencrypted."
@@ -109,23 +106,23 @@ msgstr ""
 "Nid yw'r gweinydd yn cynnal TLS.\n"
 "Analluogwch y nodwedd diogelwch yma i gysylltu heb gêl-ysgrifaeth."
 
-#: imap4.cc:2087
+#: imap4.cc:2088
 msgid "Starting TLS failed."
 msgstr "Methodd cychwyn TLS."
 
-#: imap4.cc:2096
+#: imap4.cc:2097
 msgid "LOGIN is disabled by the server."
 msgstr ""
 
-#: imap4.cc:2103
+#: imap4.cc:2104
 msgid "The authentication method %1 is not supported by the server."
 msgstr "Ni chynhelir y dull awdurdodi %1 gan y gweinydd."
 
-#: imap4.cc:2119
+#: imap4.cc:2132
 msgid "Username and password for your IMAP account:"
 msgstr ""
 
-#: imap4.cc:2133
+#: imap4.cc:2146
 #, fuzzy
 msgid ""
 "Unable to login. Probably the password is wrong.\n"
@@ -136,7 +133,7 @@ msgstr ""
 "Atebodd y gweinydd:\n"
 "%1"
 
-#: imap4.cc:2140
+#: imap4.cc:2153
 #, fuzzy
 msgid ""
 "Unable to authenticate via %1.\n"
@@ -147,13 +144,16 @@ msgstr ""
 "Atebodd y gweinydd:\n"
 "%2"
 
-#: imap4.cc:2147
+#: imap4.cc:2160
 msgid "SASL authentication is not compiled into tdeio_imap4."
 msgstr ""
 
-#: imap4.cc:2691
+#: imap4.cc:2704
 msgid "Unable to open folder %1. The server replied: %2"
 msgstr "Methu agor y blygell %1. Atebodd y gweinydd: %2"
 
+#~ msgid "Unable to close mailbox."
+#~ msgstr "Methu cau'r blwch post."
+
 #~ msgid "What do you want to store in this folder?"
 #~ msgstr "Beth ydych am ei gadw yn y blygell hon?"
diff --git a/tde-i18n-cy/messages/tdepim/tdeio_mobile.po b/tde-i18n-cy/messages/tdepim/tdeio_mobile.po
index bbaf4c8d50e..b0f0543b41f 100644
--- a/tde-i18n-cy/messages/tdepim/tdeio_mobile.po
+++ b/tde-i18n-cy/messages/tdepim/tdeio_mobile.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_mobile\n"
-"POT-Creation-Date: 2004-12-11 01:22+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2004-01-08 21:19+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdepim/tdeio_sieve.po b/tde-i18n-cy/messages/tdepim/tdeio_sieve.po
index 37067ccd3a4..28ab66c2834 100644
--- a/tde-i18n-cy/messages/tdepim/tdeio_sieve.po
+++ b/tde-i18n-cy/messages/tdepim/tdeio_sieve.po
@@ -8,73 +8,114 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_sieve\n"
-"POT-Creation-Date: 2008-03-07 02:10+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2004-01-08 21:20+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.2\n"
 "\n"
 
-#: sieve.cpp:332
+#: sieve.cpp:343
 msgid "Connecting to %1..."
 msgstr "Yn cysylltu â %1..."
 
-#: sieve.cpp:335
+#: sieve.cpp:346
 msgid "The connection to the server was lost."
 msgstr "Collwyd y cysylltiad â'r gweinydd.f"
 
-#: sieve.cpp:347
+#: sieve.cpp:358
 msgid "Server identification failed."
 msgstr "Methodd dynodi'r gweinydd."
 
-#: sieve.cpp:374
+#: sieve.cpp:364
+msgid "Can not use TLS. Please enable TLS in the TDE cryptography setting."
+msgstr ""
+
+#: sieve.cpp:371
+msgid ""
+"TLS encryption was requested, but your Sieve server does not advertise TLS in "
+"its capabilities.\n"
+"You can choose to try to initiate TLS negotiations nonetheless, or cancel the "
+"operation."
+msgstr ""
+
+#: sieve.cpp:373
+msgid "Server Does Not Advertise TLS"
+msgstr ""
+
+#: sieve.cpp:373
+msgid "&Start TLS nonetheless"
+msgstr ""
+
+#: sieve.cpp:375
+msgid "TLS encryption requested, but not supported by server."
+msgstr ""
+
+#: sieve.cpp:399
+msgid ""
+"Your Sieve server claims to support TLS, but negotiation was unsuccessful."
+msgstr ""
+
+#: sieve.cpp:401
+#, fuzzy
+msgid "Connection Failed"
+msgstr "Methodd y dilysu."
+
+#: sieve.cpp:408
+msgid ""
+"The server does not seem to support TLS. Disable TLS if you want to connect "
+"without encryption."
+msgstr ""
+
+#: sieve.cpp:418
 msgid "Authenticating user..."
 msgstr "Yn dilysu'r defnyddiwr..."
 
-#: sieve.cpp:377
+#: sieve.cpp:421
 msgid "Authentication failed."
 msgstr "Methodd y dilysu."
 
-#: sieve.cpp:441 sieve.cpp:653 sieve.cpp:743 sieve.cpp:777
+#: sieve.cpp:485 sieve.cpp:697 sieve.cpp:787 sieve.cpp:821
 msgid "Done."
 msgstr "Wedi'i wneud."
 
-#: sieve.cpp:453
+#: sieve.cpp:497
 msgid "Activating script..."
 msgstr "Yn gweithredoli sgript..."
 
-#: sieve.cpp:469
+#: sieve.cpp:513
 msgid "There was an error activating the script."
 msgstr "Bu gwall tra'n gweithredoli'r sgript."
 
-#: sieve.cpp:487
+#: sieve.cpp:531
 msgid "There was an error deactivating the script."
 msgstr "Bu gwall tra'n gweithredoli'r sgript."
 
-#: sieve.cpp:515
+#: sieve.cpp:559
 msgid "Sending data..."
 msgstr "Yn anfon data..."
 
-#: sieve.cpp:532
+#: sieve.cpp:576
 msgid "TDEIO data supply error."
 msgstr "Gwall darparu data TDEIO."
 
-#: sieve.cpp:559
+#: sieve.cpp:603
 msgid "Quota exceeded"
 msgstr "Aethpwyd dros y ddogn"
 
-#: sieve.cpp:592 sieve.cpp:1156
+#: sieve.cpp:636 sieve.cpp:1200
 msgid "Network error."
 msgstr "Gwall rhwydwaith."
 
-#: sieve.cpp:603
+#: sieve.cpp:647
 msgid "Verifying upload completion..."
 msgstr "Yn gwirio cyflawniad lanlwytho..."
 
-#: sieve.cpp:629 sieve.cpp:637
+#: sieve.cpp:673 sieve.cpp:681
 #, c-format
 msgid ""
 "The script did not upload successfully.\n"
@@ -87,7 +128,7 @@ msgstr ""
 " Ymatebodd y gweinydd:\n"
 " %1"
 
-#: sieve.cpp:642 sieve.cpp:646
+#: sieve.cpp:686 sieve.cpp:690
 msgid ""
 "The script did not upload successfully.\n"
 "The script may contain errors."
@@ -95,45 +136,45 @@ msgstr ""
 "Ni lanlwythodd y sgript yn llwyddiannus.\n"
 " Gall fod gwallau yn y sgript."
 
-#: sieve.cpp:681
+#: sieve.cpp:725
 msgid "Retrieving data..."
 msgstr "Yn nôl data..."
 
-#: sieve.cpp:730
+#: sieve.cpp:774
 msgid "Finishing up..."
 msgstr "Yn gorffen i fyny..."
 
-#: sieve.cpp:738
+#: sieve.cpp:782
 msgid "A protocol error occurred while trying to negotiate script downloading."
 msgstr "Digwyddodd gwall protocol tra'n ceisio trafod lawrlwytho sgript."
 
-#: sieve.cpp:750
+#: sieve.cpp:794
 msgid "Folders are not supported."
 msgstr "Ni chynhelir plygyll."
 
-#: sieve.cpp:758
+#: sieve.cpp:802
 msgid "Deleting file..."
 msgstr "Yn dileu'r ffeil..."
 
-#: sieve.cpp:773
+#: sieve.cpp:817
 msgid "The server would not delete the file."
 msgstr "Gwrthododd y gweinydd ddileu'r ffeil."
 
-#: sieve.cpp:792
+#: sieve.cpp:836
 msgid "Cannot chmod to anything but 0700 (active) or 0600 (inactive script)."
 msgstr ""
 "Methu chmod i unrhywbeth heblaw am 0700 (gweithredol) neu 0600 (sgript "
 "anweithredol)"
 
-#: sieve.cpp:941
+#: sieve.cpp:985
 msgid "No authentication details supplied."
 msgstr "Ni ddarperwyd manylion dilysu."
 
-#: sieve.cpp:999
+#: sieve.cpp:1043
 msgid "Sieve Authentication Details"
 msgstr "Manylion Dilysu Rhidyll"
 
-#: sieve.cpp:1000
+#: sieve.cpp:1044
 msgid ""
 "Please enter your authentication details for your sieve account (usually the "
 "same as your email password):"
@@ -141,7 +182,7 @@ msgstr ""
 "Rhowch eich manylion dilysu ar gyfer eich cyfrif ridyll (fel arfer yr un fath "
 "a'ch cyfrinair ebost):"
 
-#: sieve.cpp:1067 sieve.cpp:1079
+#: sieve.cpp:1111 sieve.cpp:1123
 #, c-format
 msgid ""
 "A protocol error occurred during authentication.\n"
@@ -150,7 +191,7 @@ msgstr ""
 "Digwyddodd gwall protocol yn ystod y dilysu.\n"
 " Dewiswch dull dilysu sy'n wahanol i %1."
 
-#: sieve.cpp:1127
+#: sieve.cpp:1171
 #, c-format
 msgid ""
 "Authentication failed.\n"
@@ -163,7 +204,7 @@ msgstr ""
 " Dywedodd y gweinydd:\n"
 " %1"
 
-#: sieve.cpp:1205
+#: sieve.cpp:1249
 msgid "A protocol error occurred."
 msgstr "Digwyddodd gwall protocol."
 
diff --git a/tde-i18n-cy/messages/tdepim/tdepimresources.po b/tde-i18n-cy/messages/tdepim/tdepimresources.po
index 85cc501baf6..905eb1a3021 100644
--- a/tde-i18n-cy/messages/tdepim/tdepimresources.po
+++ b/tde-i18n-cy/messages/tdepim/tdepimresources.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: all2.po\n"
-"POT-Creation-Date: 2005-03-13 01:24+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -96,29 +97,6 @@ msgid ""
 "%n items could not be uploaded."
 msgstr ""
 
-#: tdeabc_resourcegroupwarebase.cpp:92
-msgid "Downloading addressbook"
-msgstr ""
-
-#: tdeabc_resourcegroupwarebase.cpp:93
-msgid "Uploading addressbook"
-msgstr ""
-
-#: tdeabc_resourcegroupwarebaseconfig.cpp:45
-#: kcal_resourcegroupwarebaseconfig.cpp:54
-msgid "URL:"
-msgstr "URL:"
-
-#: tdeabc_resourcegroupwarebaseconfig.cpp:51
-#: kcal_resourcegroupwarebaseconfig.cpp:59
-msgid "User:"
-msgstr "Defnyddiwr:"
-
-#: tdeabc_resourcegroupwarebaseconfig.cpp:57
-#: kcal_resourcegroupwarebaseconfig.cpp:64
-msgid "Password:"
-msgstr "Cyfrinair:"
-
 #: kcal_cachesettingsdlg.cpp:42
 msgid "Resource Cache Settings"
 msgstr ""
@@ -135,6 +113,21 @@ msgstr ""
 msgid "Deleted"
 msgstr "Wedi'u dileu"
 
+#: kcal_resourcegroupwarebaseconfig.cpp:54
+#: tdeabc_resourcegroupwarebaseconfig.cpp:45
+msgid "URL:"
+msgstr "URL:"
+
+#: kcal_resourcegroupwarebaseconfig.cpp:59
+#: tdeabc_resourcegroupwarebaseconfig.cpp:51
+msgid "User:"
+msgstr "Defnyddiwr:"
+
+#: kcal_resourcegroupwarebaseconfig.cpp:64
+#: tdeabc_resourcegroupwarebaseconfig.cpp:57
+msgid "Password:"
+msgstr "Cyfrinair:"
+
 #: kcal_resourcegroupwarebaseconfig.cpp:76
 msgid "Configure Cache Settings..."
 msgstr ""
@@ -195,3 +188,11 @@ msgid ""
 "types in the following order:\n"
 "Event, Todo, Journal, Contact, All, Unknown"
 msgstr ""
+
+#: tdeabc_resourcegroupwarebase.cpp:92
+msgid "Downloading addressbook"
+msgstr ""
+
+#: tdeabc_resourcegroupwarebase.cpp:93
+msgid "Uploading addressbook"
+msgstr ""
diff --git a/tde-i18n-cy/messages/tdepim/tdepimwizards.po b/tde-i18n-cy/messages/tdepim/tdepimwizards.po
index 28c8a80720d..151b002160c 100644
--- a/tde-i18n-cy/messages/tdepim/tdepimwizards.po
+++ b/tde-i18n-cy/messages/tdepim/tdepimwizards.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdepim/tdepimwizards.po\n"
-"POT-Creation-Date: 2008-01-26 01:19+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,7 +27,7 @@ msgid "Create eGroupware Addressbook Resource"
 msgstr ""
 
 #: egroupwarewizard.cpp:78 egroupwarewizard.cpp:139 egroupwarewizard.cpp:205
-#: overviewpage.cpp:64
+#: overviewpage.cpp:67
 msgid "eGroupware"
 msgstr ""
 
@@ -173,7 +174,7 @@ msgstr ""
 msgid "Update GroupWise Addressbook Resource"
 msgstr ""
 
-#: groupwisewizard.cpp:271 overviewpage.cpp:78
+#: groupwisewizard.cpp:271
 msgid "Novell GroupWise"
 msgstr ""
 
@@ -225,7 +226,7 @@ msgstr ""
 msgid "Create Disconnected IMAP Account for KMail"
 msgstr ""
 
-#: kmailchanges.cpp:309
+#: kmailchanges.cpp:310
 msgid "Create Online IMAP Account for KMail"
 msgstr ""
 
@@ -294,18 +295,18 @@ msgid "TDE-PIM Groupware Configuration Wizard"
 msgstr ""
 
 #: overviewpage.cpp:61
-msgid "Select the type of server you want connect your TDE to:"
+msgid "Select the type of server you want TDE to connect:"
 msgstr ""
 
-#: overviewpage.cpp:70
+#: overviewpage.cpp:75
 msgid "Kolab"
 msgstr "Kolab"
 
-#: overviewpage.cpp:74
+#: overviewpage.cpp:81
 msgid "SUSE Linux Openexchange (SLOX)"
 msgstr ""
 
-#: overviewpage.cpp:82
+#: overviewpage.cpp:87
 msgid "Microsoft Exchange"
 msgstr ""
 
@@ -402,7 +403,7 @@ msgstr ""
 #. i18n: file groupwise.kcfg line 56
 #: rc.cpp:60 rc.cpp:111
 #, no-c-format
-msgid "Id of KABC resource"
+msgid "Id of TDEABC resource"
 msgstr ""
 
 #. i18n: file groupwise.kcfg line 59
diff --git a/tde-i18n-cy/messages/tdesdk/cervisia.po b/tde-i18n-cy/messages/tdesdk/cervisia.po
index f9bd8b2f137..d54586a3bb8 100644
--- a/tde-i18n-cy/messages/tdesdk/cervisia.po
+++ b/tde-i18n-cy/messages/tdesdk/cervisia.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdesdk/cervisia.po\n"
-"POT-Creation-Date: 2007-09-24 01:15+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -548,7 +549,7 @@ msgstr ""
 #: cervisiapart.cpp:713
 msgid ""
 "Cervisia %1\n"
-"(Using TDE %2)\n"
+"(Using KDE %2)\n"
 "\n"
 "Copyright (c) 1999-2002\n"
 "Bernd Gehrmann <bernd@mail.berlios.de>\n"
diff --git a/tde-i18n-cy/messages/tdesdk/cvsservice.po b/tde-i18n-cy/messages/tdesdk/cvsservice.po
index b79bd311262..7f1ac172865 100644
--- a/tde-i18n-cy/messages/tdesdk/cvsservice.po
+++ b/tde-i18n-cy/messages/tdesdk/cvsservice.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdesdk/cvsservice.po\n"
-"POT-Creation-Date: 2005-05-18 21:25+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -45,7 +46,7 @@ msgstr ""
 msgid "Repository:"
 msgstr ""
 
-#: cvsloginjob.cpp:116
+#: cvsloginjob.cpp:117
 msgid "Please type in your password for the repository below."
 msgstr ""
 
diff --git a/tde-i18n-cy/messages/tdesdk/kbabel.po b/tde-i18n-cy/messages/tdesdk/kbabel.po
index 840034066d4..97f215ebe16 100644
--- a/tde-i18n-cy/messages/tdesdk/kbabel.po
+++ b/tde-i18n-cy/messages/tdesdk/kbabel.po
@@ -1,1474 +1,23 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdesdk/kbabel.po\n"
-"POT-Creation-Date: 2008-07-08 01:21+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: catalogmanager/catalogmanagerview.cpp:89
-msgid "Name"
-msgstr "Enw"
-
-#: catalogmanager/catalogmanagerview.cpp:90
-msgid "M"
-msgstr "M"
-
-#: catalogmanager/catalogmanagerview.cpp:91
-msgid "Fuzzy"
-msgstr "Niwlaidd"
-
-#: catalogmanager/catalogmanagerview.cpp:92
-msgid "Untranslated"
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:93
-msgid "Total"
-msgstr "Cyfanswm"
-
-#: catalogmanager/catalogmanagerview.cpp:94 catalogmanager/future.cpp:5
-#, fuzzy
-msgid "CVS/SVN Status"
-msgstr "Cyflwr"
-
-#: catalogmanager/catalogmanagerview.cpp:95
-msgid "Last Revision"
-msgstr ""
-
-#: addons/tdefile-plugins/tdefile_po.cpp:56
-#: catalogmanager/catalogmanagerview.cpp:96
-msgid "Last Translator"
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:178
-#: catalogmanager/catalogmanagerview.cpp:2447
-#: catalogmanager/catalogmanagerview.cpp:2458
-msgid "Log Window"
-msgstr "Ffenestr Gofnodion"
-
-#: catalogmanager/catalogmanagerview.cpp:180
-msgid "C&lear"
-msgstr "&Gwaredu"
-
-#: catalogmanager/catalogmanagerview.cpp:183
-msgid ""
-"<qt>"
-"<p><b>Log window</b></p>\n"
-"<p>In this window the output of the executed commands are shown.</p></qt>"
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:194
-msgid ""
-"<qt>"
-"<p><b>Catalog Manager</b></p>\n"
-"<p>The Catalog Manager merges two folders into one tree and displays all\n"
-"PO and POT files in these folders. This way you can easily see if a\n"
-"template has been added or removed. Also some information about the files\n"
-"is displayed.</p>"
-"<p>For more information see section <b>The Catalog Manager</b> "
-"in the online help.</p></qt>"
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:448
-#: catalogmanager/catalogmanagerview.cpp:483 kbabel/kbabelview.cpp:1233
-#: kbabel/kbabelview.cpp:1349 kbabel/kbabelview2.cpp:757
-#, c-format
-msgid ""
-"Error while trying to open file:\n"
-" %1"
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:473
-msgid ""
-"Error while trying to read file:\n"
-" %1\n"
-"Maybe it is not a valid file with list of markings."
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:519 kbabel/kbabelview.cpp:1451
-msgid "The file %1 already exists. Do you want to overwrite it?"
-msgstr "Mae'r ffeil %1 mewn bod yn barod.  Ydych am ysgrifennu drosto?"
-
-#: catalogmanager/catalogmanagerview.cpp:520 kbabel/kbabelview.cpp:1452
-#: kbabel/kbabelview.cpp:1521
-msgid "&Overwrite"
-msgstr "&Trosysgrifo"
-
-#: catalogmanager/catalogmanagerview.cpp:571
-msgid ""
-"An error occurred while trying to write to file:\n"
-"%1\n"
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:580
-msgid ""
-"An error occurred while trying to upload the file:\n"
-"%1\n"
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:664
-#: catalogmanager/catalogmanagerview.cpp:691
-msgid ""
-"The Catalog Manager is still updating information about the files.\n"
-"If you continue, it will try to update all necessary files, however this can "
-"take a long time and may lead to wrong results. Please wait until all files are "
-"updated."
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:769
-#, fuzzy
-msgid ""
-"Statistics for all:\n"
-msgstr "Ystadegau"
-
-#: catalogmanager/catalogmanagerview.cpp:771
-msgid ""
-"Statistics for %1:\n"
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:773
-msgid ""
-"Number of packages: %1\n"
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:776
-msgid ""
-"Complete translated: %1 % (%2)\n"
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:779
-msgid ""
-"Only template available: %1 % (%2)\n"
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:781
-msgid ""
-"Only PO file available: %1 % (%2)\n"
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:783
-msgid ""
-"Number of messages: %1\n"
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:787
-msgid ""
-"Translated: %1 % (%2)\n"
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:790
-msgid ""
-"Fuzzy: %1 % (%2)\n"
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:793
-msgid ""
-"Untranslated: %1 % (%2)\n"
-msgstr ""
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 790
-#: catalogmanager/catalogmanagerview.cpp:795 rc.cpp:1001 rc.cpp:1206
-#, no-c-format
-msgid "Statistics"
-msgstr "Ystadegau"
-
-#: catalogmanager/catalogmanagerview.cpp:820
-msgid ""
-"The file is syntactically correct.\n"
-"Output of \"msgfmt --statistics\":"
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:825
-msgid ""
-"The file has syntax errors.\n"
-"Output of \"msgfmt --statistics\":"
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:830
-msgid ""
-"The file has header syntax error.\n"
-"Output of \"msgfmt --statistics\":"
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:835
-msgid "An error occurred while processing \"msgfmt --statistics\""
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:840
-#: catalogmanager/catalogmanagerview.cpp:929
-msgid ""
-"Cannot execute msgfmt. Please make sure that you have msgfmt in your PATH."
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:845
-#: catalogmanager/catalogmanagerview.cpp:934 kbabel/kbabelview.cpp:1649
-msgid "You can use gettext tools only for checking PO files."
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:868
-msgid ""
-"All files in folder %1 are syntactically correct.\n"
-"Output of \"msgfmt --statistics\":\n"
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:873
-msgid ""
-"All files in the base folder are syntactically correct.\n"
-"Output of \"msgfmt --statistics\":\n"
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:884
-msgid ""
-"At least one file in folder %1 has syntax errors.\n"
-"Output of \"msgfmt --statistics\":\n"
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:889
-msgid ""
-"At least one file in the base folder has syntax errors.\n"
-"Output of \"msgfmt --statistics\":\n"
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:900
-msgid ""
-"At least one file in folder %1 has header syntax errors.\n"
-"Output of \"msgfmt --statistics\":\n"
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:905
-msgid ""
-"At least one file in the base folder has header syntax errors.\n"
-"Output of \"msgfmt --statistics\":\n"
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:916
-#, c-format
-msgid ""
-"An error occurred while processing \"msgfmt --statistics *.po\" in folder %1"
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:921
-msgid ""
-"An error occurred while processing \"msgfmt --statistics *.po\" in the base "
-"folder"
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:1502
-msgid "Do you really want to delete the file %1?"
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:1507
-msgid "Was not able to delete the file %1!"
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:1766
-msgid ""
-"You have not specified a valid folder for the base folder of the PO files:\n"
-"%1\n"
-"Please check your settings in the project settings dialog."
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:1783
-msgid ""
-"You have not specified a valid folder for the base folder of the PO template "
-"files:\n"
-"%1\n"
-"Please check your settings in the project settings dialog."
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:1824
-msgid "Reading file information"
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:2999
-#: catalogmanager/validateprogress.cpp:98
-msgid ""
-"Cannot instantiate a validation tool.\n"
-"Please check your installation."
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:3000
-#: catalogmanager/validateprogress.cpp:99
-msgid "Validation Tool Error"
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:3008
-msgid "Validation Options"
-msgstr "Dewisiadau Gwiriant"
-
-#: catalogmanager/markpatterndialog.cpp:113
-msgid "Ma&rk files which match the following pattern:"
-msgstr ""
-
-#: catalogmanager/markpatterndialog.cpp:114
-msgid "&Mark Files"
-msgstr ""
-
-#: catalogmanager/markpatterndialog.cpp:116
-msgid "Unma&rk files which match the following pattern:"
-msgstr ""
-
-#: catalogmanager/markpatterndialog.cpp:117
-msgid "Un&mark Files"
-msgstr ""
-
-#: catalogmanager/validateprogress.cpp:56
-msgid ""
-"_: Caption of dialog\n"
-"Validation"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:222
-#: catalogmanager/validateprogress.cpp:72
-msgid "&Open"
-msgstr "A&gor"
-
-#: catalogmanager/validateprogress.cpp:73
-msgid "&Ignore"
-msgstr "&Anwybyddu"
-
-#: catalogmanager/validateprogress.cpp:186
-msgid ""
-"Validation done.\n"
-"\n"
-"Checked files: %1\n"
-"Number of errors: %2\n"
-"Number of ignored errors: %3"
-msgstr ""
-
-#: catalogmanager/validateprogress.cpp:190
-msgid "Validation Done"
-msgstr ""
-
-#: catalogmanager/main.cpp:178 kbabel/main.cpp:539
-msgid "File to load configuration from"
-msgstr ""
-
-#: catalogmanager/main.cpp:186
-msgid "KBabel - Catalog Manager"
-msgstr "KBabel - Rheolwr Catalog"
-
-#: catalogmanager/main.cpp:187
-msgid "An advanced catalog manager for KBabel"
-msgstr ""
-
-#: catalogmanager/main.cpp:188 kbabel/main.cpp:549
-msgid "(c) 1999,2000,2001,2002,2003,2004,2005,2006 The KBabel developers"
-msgstr ""
-
-#: catalogmanager/main.cpp:190 kbabel/main.cpp:551 kbabeldict/main.cpp:118
-msgid "Original author"
-msgstr "Awdur gwreiddiol"
-
-#: catalogmanager/main.cpp:191 kbabel/main.cpp:558
-msgid "Current maintainer, porting to TDE3/Qt3."
-msgstr ""
-
-#: catalogmanager/main.cpp:193 kbabel/main.cpp:564 kbabeldict/main.cpp:119
-msgid "Current maintainer"
-msgstr "Cynhaliwr cyfredol"
-
-#: catalogmanager/main.cpp:195 kbabel/main.cpp:566
-msgid ""
-"Wrote documentation and sent many bug reports and suggestions for improvements."
-msgstr ""
-
-#: catalogmanager/main.cpp:198 kbabel/main.cpp:569
-msgid ""
-"Gave many suggestions for the GUI and the behavior of KBabel. He also "
-"contributed the beautiful splash screen."
-msgstr ""
-
-#: catalogmanager/main.cpp:202 kbabel/main.cpp:553
-msgid "Wrote diff algorithm, fixed KSpell and gave a lot of useful hints."
-msgstr ""
-
-#: catalogmanager/main.cpp:204 kbabel/main.cpp:572
-msgid ""
-"Helped keep KBabel up to date with the TDE API and gave a lot of other help."
-msgstr ""
-
-#: catalogmanager/main.cpp:206 kbabel/main.cpp:576
-msgid "Various validation plugins."
-msgstr ""
-
-#: catalogmanager/main.cpp:209 kbabel/main.cpp:579
-msgid "Sponsored development of KBabel for a while."
-msgstr ""
-
-#: catalogmanager/main.cpp:211
-msgid "Support for making diffs and some minor improvements."
-msgstr ""
-
-#: catalogmanager/main.cpp:214 kbabel/main.cpp:581
-msgid "KBabel contains code from Qt"
-msgstr ""
-
-#: catalogmanager/main.cpp:216
-msgid "KBabel contains code from GNU gettext"
-msgstr ""
-
-#: catalogmanager/multiroughtransdlg.cpp:56
-msgid "Files:"
-msgstr "Ffeiliau:"
-
-#: catalogmanager/multiroughtransdlg.cpp:84
-#: catalogmanager/multiroughtransdlg.cpp:96 kbabel/kbabelview.cpp:1182
-#: kbabel/kbabelview.cpp:1304 kbabel/kbabelview2.cpp:724
-msgid ""
-"Error while trying to read file:\n"
-" %1\n"
-"Maybe it is not a valid PO file."
-msgstr ""
-
-#: catalogmanager/multiroughtransdlg.cpp:129 commonui/roughtransdlg.cpp:671
-msgid ""
-"Result of the translation:\n"
-"Edited entries: %1\n"
-"Exact translations: %2 (%3%)\n"
-"Approximate translations: %4 (%5%)\n"
-"Nothing found: %6 (%7%)"
-msgstr ""
-
-#: catalogmanager/multiroughtransdlg.cpp:143 commonui/roughtransdlg.cpp:685
-msgid "Rough Translation Statistics"
-msgstr ""
-
-#: catalogmanager/libcvs/cvshandler.cpp:88
-msgid "No CVS repository"
-msgstr ""
-
-#: catalogmanager/libcvs/cvshandler.cpp:91
-msgid "Not in CVS"
-msgstr ""
-
-#: catalogmanager/libcvs/cvshandler.cpp:94
-#: catalogmanager/libsvn/svnhandler.cpp:96
-msgid "Locally added"
-msgstr ""
-
-#: catalogmanager/libcvs/cvshandler.cpp:97
-#: catalogmanager/libsvn/svnhandler.cpp:99
-msgid "Locally removed"
-msgstr ""
-
-#: catalogmanager/libcvs/cvshandler.cpp:100
-#: catalogmanager/libsvn/svnhandler.cpp:102
-msgid "Locally modified"
-msgstr ""
-
-#: catalogmanager/libcvs/cvshandler.cpp:103
-#: catalogmanager/libsvn/svnhandler.cpp:105
-msgid "Up-to-date"
-msgstr ""
-
-#: catalogmanager/libcvs/cvshandler.cpp:106
-#: catalogmanager/libsvn/svnhandler.cpp:108
-msgid "Conflict"
-msgstr ""
-
-#: catalogmanager/libcvs/cvshandler.cpp:109
-#: catalogmanager/libsvn/svnhandler.cpp:113
-msgid "Unknown"
-msgstr "Anhysbys"
-
-#: catalogmanager/libcvs/cvshandler.cpp:189
-#: catalogmanager/libcvs/cvshandler.cpp:228
-msgid ""
-"This is not a valid CVS repository. The CVS commands cannot be executed."
-msgstr ""
-
-#: catalogmanager/libcvs/cvsdialog.cpp:311
-#: catalogmanager/libcvs/cvshandler.cpp:375
-#: catalogmanager/libsvn/svndialog.cpp:290
-#: catalogmanager/libsvn/svnhandler.cpp:483
-msgid "[ Starting command ]"
-msgstr ""
-
-#: catalogmanager/libcvs/cvsdialog.cpp:68
-msgid "CVS Dialog"
-msgstr ""
-
-#: catalogmanager/libcvs/cvsdialog.cpp:77
-#: catalogmanager/libsvn/svndialog.cpp:74
-msgid "Update the following files:"
-msgstr ""
-
-#: catalogmanager/libcvs/cvsdialog.cpp:80
-#: catalogmanager/libsvn/svndialog.cpp:77
-msgid "Commit the following files:"
-msgstr ""
-
-#: catalogmanager/libcvs/cvsdialog.cpp:83
-msgid "Get status for the following files:"
-msgstr ""
-
-#: catalogmanager/libcvs/cvsdialog.cpp:86
-#: catalogmanager/libsvn/svndialog.cpp:86
-msgid "Get diff for the following files:"
-msgstr ""
-
-#: catalogmanager/libcvs/cvsdialog.cpp:100
-#: catalogmanager/libsvn/svndialog.cpp:103
-msgid "&Old messages:"
-msgstr ""
-
-#: catalogmanager/libcvs/cvsdialog.cpp:108
-#: catalogmanager/libsvn/svndialog.cpp:111
-msgid "&Log message:"
-msgstr ""
-
-#: catalogmanager/libcvs/cvsdialog.cpp:114
-msgid "E&ncoding:"
-msgstr "A&mgodiad:"
-
-#: catalogmanager/libcvs/cvsdialog.cpp:121
-msgid ""
-"_: Descriptive encoding name\n"
-"Recommended ( %1 )"
-msgstr ""
-
-#: catalogmanager/libcvs/cvsdialog.cpp:122
-msgid ""
-"_: Descriptive encoding name\n"
-"Locale ( %1 )"
-msgstr ""
-
-#: catalogmanager/libcvs/cvsdialog.cpp:133
-#: catalogmanager/libsvn/svndialog.cpp:124
-msgid "Auto&matically add files if necessary"
-msgstr ""
-
-#: catalogmanager/libcvs/cvsdialog.cpp:144
-#: catalogmanager/libsvn/svndialog.cpp:135
-msgid "&Commit"
-msgstr "&Cyflwyno"
-
-#: catalogmanager/libcvs/cvsdialog.cpp:147
-#: catalogmanager/libsvn/svndialog.cpp:139
-msgid "&Get Status"
-msgstr ""
-
-#: catalogmanager/libcvs/cvsdialog.cpp:150
-#: catalogmanager/libsvn/svndialog.cpp:142
-msgid "&Get Diff"
-msgstr ""
-
-#: catalogmanager/libcvs/cvsdialog.cpp:157
-#: catalogmanager/libsvn/svndialog.cpp:152 commonui/roughtransdlg.cpp:83
-msgid "C&ancel"
-msgstr "&Diddymu"
-
-#: catalogmanager/libcvs/cvsdialog.cpp:165
-#: catalogmanager/libsvn/svndialog.cpp:160
-msgid "Command output:"
-msgstr ""
-
-#: catalogmanager/libcvs/cvsdialog.cpp:237
-#: catalogmanager/libsvn/svndialog.cpp:233
-#, fuzzy
-msgid "The commit log message is empty. Do you want to continue?"
-msgstr "Mae'r ffeil %1 mewn bod yn barod.  Ydych am ysgrifennu drosto?"
-
-#: catalogmanager/libcvs/cvsdialog.cpp:247
-#, c-format
-msgid "Cannot find encoding: %1"
-msgstr ""
-
-#: catalogmanager/libcvs/cvsdialog.cpp:253
-msgid ""
-"The commit log message cannot be encoded in the selected encoding: %1.\n"
-"Do you want to continue?"
-msgstr ""
-
-#: catalogmanager/libcvs/cvsdialog.cpp:268
-#: catalogmanager/libsvn/svndialog.cpp:247
-msgid "Cannot open temporary file for writing. Aborting."
-msgstr ""
-
-#: catalogmanager/libcvs/cvsdialog.cpp:280
-#: catalogmanager/libsvn/svndialog.cpp:259
-msgid "Cannot write to temporary file. Aborting."
-msgstr ""
-
-#: catalogmanager/libcvs/cvsdialog.cpp:322
-#: catalogmanager/libsvn/svndialog.cpp:301
-msgid "The process could not be started."
-msgstr ""
-
-#: catalogmanager/libcvs/cvsdialog.cpp:351
-#: catalogmanager/libsvn/svndialog.cpp:330
-msgid "[ Exited with status %1 ]"
-msgstr ""
-
-#: catalogmanager/libcvs/cvsdialog.cpp:353
-#: catalogmanager/libsvn/svndialog.cpp:332
-msgid "[ Finished ]"
-msgstr ""
-
-#: catalogmanager/libcvs/cvsdialog.cpp:358
-#: catalogmanager/libsvn/svndialog.cpp:337 kbabel/kbabel.cpp:642
-msgid "&Show Diff"
-msgstr ""
-
-#: catalogmanager/libcvs/cvsdialog.cpp:401
-#, fuzzy
-msgid ""
-"_: Descriptive encoding name\n"
-"Last choice ( %1 )"
-msgstr "Arall (%1)"
-
-#: catalogmanager/libsvn/svndialog.cpp:65
-msgid "SVN Dialog"
-msgstr ""
-
-#: catalogmanager/libsvn/svndialog.cpp:80
-msgid "Get remote status for the following files:"
-msgstr ""
-
-#: catalogmanager/libsvn/svndialog.cpp:83
-msgid "Get local status for the following files:"
-msgstr ""
-
-#: catalogmanager/libsvn/svndialog.cpp:89
-msgid "Get information for the following files:"
-msgstr ""
-
-#: catalogmanager/libsvn/svndialog.cpp:145
-#, fuzzy
-msgid "&Get Information"
-msgstr "Gwybodaeth Catalog"
-
-#: catalogmanager/libsvn/svnhandler.cpp:90
-msgid "No SVN repository"
-msgstr ""
-
-#: catalogmanager/libsvn/svnhandler.cpp:93
-msgid "Not in SVN"
-msgstr ""
-
-#: catalogmanager/libsvn/svnhandler.cpp:111
-msgid "Error in Working Copy"
-msgstr ""
-
-#: catalogmanager/libsvn/svnhandler.cpp:288
-msgid ""
-"This is not a valid SVN repository. The SVN commands cannot be executed."
-msgstr ""
-
-#: catalogmanager/findinfilesdialog.cpp:50
-msgid "File Options"
-msgstr ""
-
-#: catalogmanager/findinfilesdialog.cpp:53
-msgid "&In all files"
-msgstr ""
-
-#: catalogmanager/findinfilesdialog.cpp:54
-msgid "&Marked files"
-msgstr ""
-
-#: catalogmanager/findinfilesdialog.cpp:55
-msgid "In &templates"
-msgstr ""
-
-#: catalogmanager/findinfilesdialog.cpp:56
-msgid "Ask before ne&xt file"
-msgstr ""
-
-#: catalogmanager/findinfilesdialog.cpp:57
-msgid "Save &without asking"
-msgstr ""
-
-#: catalogmanager/findinfilesdialog.cpp:59
-msgid ""
-"<qt>"
-"<p><b>File Options</b></p>"
-"<p>Here you can finetune where to find:"
-"<ul>"
-"<li><b>In all files</b>: search in all files, otherwise searched is the "
-"selected file or files in the selected folder</li>"
-"<li><b>Ask before next file</b>: show a dialog asking to proceed to the next "
-"file</li></ul></qt>"
-msgstr ""
-
-#. i18n: file ./catalogmanager/catalogmanagerui.rc line 78
-#: catalogmanager/future.cpp:4 rc.cpp:21 rc.cpp:39 rc.cpp:45
-#, no-c-format
-msgid "SVN"
-msgstr ""
-
-#: catalogmanager/future.cpp:8
-msgid "Resolved"
-msgstr ""
-
-#: catalogmanager/future.cpp:9
-msgid "Resolved for Marked"
-msgstr ""
-
-#: catalogmanager/future.cpp:10
-msgid "Revert"
-msgstr "Dychwelyd"
-
-#: catalogmanager/future.cpp:11
-msgid "Revert for Marked"
-msgstr ""
-
-#: catalogmanager/future.cpp:12
-#, fuzzy
-msgid "Cleanup"
-msgstr "&Gwaredu"
-
-#: catalogmanager/future.cpp:13
-msgid "Cleanup for Marked"
-msgstr ""
-
-#: catalogmanager/future.cpp:16
-msgid "No repository"
-msgstr ""
-
-#: catalogmanager/catmanlistitem.cpp:80
-msgid "Message Catalogs"
-msgstr "Catalogau Negesau"
-
-#: catalogmanager/catmanlistitem.cpp:450 catalogmanager/catmanlistitem.cpp:637
-msgid "No version control"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:129 kbabel/kbabel.cpp:132
-#: kbabel/kbabel.cpp:150 kbabel/kbabel.cpp:1754
-#, c-format
-msgid ""
-"Cannot open project file\n"
-"%1"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:130 kbabel/kbabel.cpp:133
-#: kbabel/kbabel.cpp:151 kbabel/kbabel.cpp:1755
-#, fuzzy
-msgid "Project File Error"
-msgstr "Gwall &Blaenorol"
-
-#: catalogmanager/catalogmanager.cpp:225
-msgid "&Open Template"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:228
-msgid "Open in &New Window"
-msgstr "Agor mew&n Ffenestr Newydd"
-
-#: catalogmanager/catalogmanager.cpp:237
-msgid "Fi&nd in Files..."
-msgstr "Ca&nfod mewn Ffeiliau ..."
-
-#: catalogmanager/catalogmanager.cpp:240
-msgid "Re&place in Files..."
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:243 kbabel/kbabel.cpp:674
-msgid "&Stop Searching"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:251
-msgid "&Toggle Marking"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:254
-msgid "Remove Marking"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:257
-msgid "Toggle All Markings"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:260
-msgid "Remove All Markings"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:263
-msgid "Mark Modified Files"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:267
-msgid "&Load Markings..."
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:270
-msgid "&Save Markings..."
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:273
-msgid "&Mark Files..."
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:275
-msgid "&Unmark Files..."
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:284 kbabel/kbabel.cpp:543
-msgid "Nex&t Untranslated"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:287 kbabel/kbabel.cpp:540
-msgid "Prev&ious Untranslated"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:290 kbabel/kbabel.cpp:537
-msgid "Ne&xt Fuzzy"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:293 kbabel/kbabel.cpp:534
-msgid "Pre&vious Fuzzy"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:296 kbabel/kbabel.cpp:531
-msgid "N&ext Fuzzy or Untranslated"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:299 kbabel/kbabel.cpp:528
-msgid "P&revious Fuzzy or Untranslated"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:303 kbabel/kbabel.cpp:549
-msgid "Next Err&or"
-msgstr "Gwall Ne&saf"
-
-#: catalogmanager/catalogmanager.cpp:306 kbabel/kbabel.cpp:546
-msgid "Previo&us Error"
-msgstr "Gwall &Blaenorol"
-
-#: catalogmanager/catalogmanager.cpp:309
-msgid "Next Te&mplate Only"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:312
-msgid "Previous Temp&late Only"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:315
-msgid "Next Tran&slation Exists"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:318
-msgid "Previous Transl&ation Exists"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:322
-msgid "Previous Marke&d"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:325
-msgid "Next &Marked"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:331 kbabel/kbabel.cpp:594
-msgid "&New..."
-msgstr "&Newydd..."
-
-#: catalogmanager/catalogmanager.cpp:339 kbabel/kbabel.cpp:602
-msgid "C&lose"
-msgstr "C&au"
-
-#: catalogmanager/catalogmanager.cpp:345 kbabel/kbabel.cpp:607
-msgid "&Configure..."
-msgstr "&Ffurfweddu..."
-
-#: catalogmanager/catalogmanager.cpp:350
-msgid "&Statistics"
-msgstr "&Ystadegaeth"
-
-#: catalogmanager/catalogmanager.cpp:353
-msgid "S&tatistics in Marked"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:356
-msgid "Check S&yntax"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:359
-msgid "S&pell Check"
-msgstr "G&wirio Sillafu"
-
-#: catalogmanager/catalogmanager.cpp:362
-msgid "Spell Check in &Marked"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:365
-msgid "&Rough Translation"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:368
-msgid "Rough Translation in M&arked"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:371
-msgid "Mai&l"
-msgstr "Pos&t"
-
-#: catalogmanager/catalogmanager.cpp:374
-msgid "Mail Mar&ked"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:378
-msgid "&Pack"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:380
-msgid "Pack &Marked"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:399 kbabel/kbabel.cpp:765
-msgid "&Validation"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:412
-msgid "V&alidation Marked"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:425 catalogmanager/catalogmanager.cpp:451
-msgid "Update"
-msgstr "Diweddaru"
-
-#: catalogmanager/catalogmanager.cpp:427 catalogmanager/catalogmanager.cpp:453
-msgid "Update Marked"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:429 catalogmanager/catalogmanager.cpp:455
-msgid "Commit"
-msgstr "Cyflwyno"
-
-#: catalogmanager/catalogmanager.cpp:431 catalogmanager/catalogmanager.cpp:457
-msgid "Commit Marked"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:433
-msgid "Status"
-msgstr "Cyflwr"
-
-#: catalogmanager/catalogmanager.cpp:435
-msgid "Status for Marked"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:437 catalogmanager/catalogmanager.cpp:467
-msgid "Show Diff"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:459
-#, fuzzy
-msgid "Status (Local)"
-msgstr "Cyflwr:"
-
-#: catalogmanager/catalogmanager.cpp:461
-msgid "Status (Local) for Marked"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:463
-#, fuzzy
-msgid "Status (Remote)"
-msgstr "Cyflwr:"
-
-#: catalogmanager/catalogmanager.cpp:465
-msgid "Status (Remote) for Marked"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:469
-#, fuzzy
-msgid "Show Information"
-msgstr "Gwybodaeth Catalog"
-
-#: catalogmanager/catalogmanager.cpp:471
-msgid "Show Information for Marked"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:488 catalogmanager/catalogmanager.cpp:503
-msgid "Update Templates"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:490 catalogmanager/catalogmanager.cpp:505
-msgid "Update Marked Templates"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:492 catalogmanager/catalogmanager.cpp:507
-msgid "Commit Templates"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:494 catalogmanager/catalogmanager.cpp:509
-msgid "Commit Marked Templates"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:525 catalogmanager/catalogmanager.cpp:529
-msgid "Commands"
-msgstr "Gorchmynion:"
-
-#: catalogmanager/catalogmanager.cpp:558
-msgid ""
-"<qt>"
-"<p><b>Statusbar</b></p>\n"
-"<p>The statusbar displays information about progress of the current find or "
-"replace operation. The first number in <b>Found:</b> "
-"displays the number of files with an occurrence of the searched text not yet "
-"shown in the KBabel window. The second shows the total number of files "
-"containing the searched text found so far.</p></qt>"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:663 catalogmanager/catalogmanager.cpp:696
-#: catalogmanager/catalogmanager.cpp:727 catalogmanager/catalogmanager.cpp:757
-#: catalogmanager/catalogmanager.cpp:787 catalogmanager/catalogmanager.cpp:807
-#: catalogmanager/catalogmanager.cpp:827
-msgid ""
-"Cannot send a message to KBabel.\n"
-"Please check your installation of TDE."
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:858
-msgid ""
-"Unable to use TDELauncher to start KBabel.\n"
-"You should check the installation of TDE.\n"
-"Please start KBabel manually."
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:893
-msgid "Found: 0/0"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:915
-msgid "Found: %1/%2"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:940
-#: catalogmanager/catalogmanager.cpp:1024 kbabel/kbabelview.cpp:4433
-#: kbabeldict/kbabeldictview.cpp:239
-msgid "Searching"
-msgstr "Yn chwilio"
-
-#: catalogmanager/catalogmanager.cpp:986
-#: catalogmanager/catalogmanager.cpp:1073
-msgid "DCOP communication with KBabel failed."
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:986
-#: catalogmanager/catalogmanager.cpp:1073
-msgid "DCOP Communication Error"
-msgstr "Gwall Cyfathrebu DCOP"
-
-#: catalogmanager/catalogmanager.cpp:1001
-#: catalogmanager/catalogmanager.cpp:1087
-msgid "KBabel cannot be started."
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:1001
-#: catalogmanager/catalogmanager.cpp:1087
-msgid "Cannot Start KBabel"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:1008
-#: catalogmanager/catalogmanager.cpp:1094
-msgid "Search string not found!"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:1235
-#, c-format
-msgid "Cannot open project file %1"
-msgstr ""
-
-#: datatools/xml/main.cc:60
-msgid ""
-"_: what check found errors\n"
-"XML tags"
-msgstr ""
-
-#: datatools/context/main.cc:58
-msgid ""
-"_: what check found errors\n"
-"context info"
-msgstr ""
-
-#: datatools/arguments/main.cc:57
-msgid ""
-"_: what check found errors\n"
-"arguments"
-msgstr ""
-
-#: datatools/accelerators/main.cc:58
-msgid ""
-"_: what check found errors\n"
-"accelerator"
-msgstr ""
-
-#: datatools/whitespace/main.cc:60
-msgid ""
-"_: which check found errors\n"
-"whitespace only translation"
-msgstr ""
-
-#: datatools/length/main.cc:61 datatools/regexp/main.cc:55
-msgid ""
-"_: which check found errors\n"
-"translation has inconsistent length"
-msgstr ""
-
-#: datatools/pluralforms/main.cc:59
-msgid ""
-"_: what check found errors\n"
-"plural forms"
-msgstr ""
-
-#: datatools/equations/main.cc:58
-msgid ""
-"_: what check found errors\n"
-"equations"
-msgstr ""
-
-#: datatools/regexp/main.cc:58
-msgid "Error loading data (%1)"
-msgstr ""
-
-#: datatools/regexp/main.cc:118
-msgid "File not found"
-msgstr "Ni chanfuwyd y ffeil"
-
-#: datatools/regexp/main.cc:123
-msgid "The file is not a XML"
-msgstr ""
-
-#: datatools/regexp/main.cc:147
-msgid "Expected tag 'item'"
-msgstr ""
-
-#: datatools/regexp/main.cc:153
-msgid "First child of 'item' is not a node"
-msgstr ""
-
-#: datatools/regexp/main.cc:159
-msgid "Expected tag 'name'"
-msgstr ""
-
-#: datatools/regexp/main.cc:167
-msgid "Expected tag 'exp'"
-msgstr ""
-
-#: datatools/not-translated/main.cc:60
-msgid ""
-"_: which check found errors\n"
-"English text in translation"
-msgstr ""
-
-#: datatools/punctuation/main.cc:58
-msgid ""
-"_: what check found errors\n"
-"punctuation"
-msgstr ""
-
-#: _translatorinfo.cpp:1 kbabeldict/main.cpp:121
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "KD wrth KGyfieithu"
-
-#: _translatorinfo.cpp:3 kbabeldict/main.cpp:122
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "kyfieithu@dotmon.com"
-
-#: filters/gettext/gettextexport.cpp:74
-msgid "saving file"
-msgstr ""
-
-#: filters/gettext/gettextimport.cpp:83
-msgid "loading file"
-msgstr "llwytho ffeil..."
-
-#: addons/tdefile-plugins/tdefile_po.cpp:50
-msgid "Catalog Information"
-msgstr "Gwybodaeth Catalog"
-
-#: addons/tdefile-plugins/tdefile_po.cpp:53
-msgid "Total Messages"
-msgstr ""
-
-#: addons/tdefile-plugins/tdefile_po.cpp:54
-msgid "Fuzzy Messages"
-msgstr ""
-
-#: addons/tdefile-plugins/tdefile_po.cpp:55
-msgid "Untranslated Messages"
-msgstr ""
-
-#: addons/tdefile-plugins/tdefile_po.cpp:57
-msgid "Language Team"
-msgstr ""
-
-#: addons/tdefile-plugins/tdefile_po.cpp:58
-msgid "Revision"
-msgstr ""
-
-#: common/kbmailer.cpp:106
-#, c-format
-msgid "Error while trying to download file %1."
-msgstr ""
-
-#: common/kbmailer.cpp:145
-msgid "Enter the name of the archive without file extension"
-msgstr ""
-
-#: common/kbmailer.cpp:178
-msgid "Error while trying to create archive file."
-msgstr ""
-
-#: common/kbmailer.cpp:193
-#, c-format
-msgid "Error while trying to read file %1."
-msgstr ""
-
-#: common/kbmailer.cpp:208
-msgid "Error while trying to copy file %1 into archive."
-msgstr ""
-
-#: common/kbproject.cpp:53
-msgid "unnamed"
-msgstr "di-enw"
-
-#: common/catalog.cpp:592
-msgid ""
-"Free Software Foundation Copyright does not contain any year. It will not be "
-"updated."
-msgstr ""
-
-#: common/catalog.cpp:1237
-msgid "validating file"
-msgstr ""
-
-#: common/catalog.cpp:1276
-msgid "applying tool"
-msgstr ""
-
-#: common/catalog.cpp:3128
-msgid "searching matching message"
-msgstr ""
-
-#: common/catalog.cpp:3217
-msgid "preparing messages for diff"
-msgstr ""
-
-#: commonui/roughtransdlg.cpp:69
-msgid ""
-"_: Caption of dialog\n"
-"Rough Translation"
-msgstr ""
-
-#: commonui/roughtransdlg.cpp:82 kbabeldict/kbabeldictview.cpp:111
-msgid "S&top"
-msgstr "S&topio"
-
-#: commonui/roughtransdlg.cpp:96
-msgid "What to Translate"
-msgstr ""
-
-#: commonui/roughtransdlg.cpp:102
-msgid "U&ntranslated entries"
-msgstr ""
-
-#: commonui/roughtransdlg.cpp:103
-msgid "&Fuzzy entries"
-msgstr ""
-
-#: commonui/roughtransdlg.cpp:104
-msgid "T&ranslated entries"
-msgstr ""
-
-#: commonui/roughtransdlg.cpp:108
-msgid ""
-"<qt>"
-"<p><b>What entries to translate</b></p>"
-"<p>Choose here, for which entries of the file KBabel tries to find a "
-"translation. Changed entries are always marked as fuzzy, no matter which option "
-"you choose.</p></qt>"
-msgstr ""
-
-#: commonui/roughtransdlg.cpp:113
-msgid "How to Translate"
-msgstr ""
-
-#: commonui/roughtransdlg.cpp:118
-msgid "&Use dictionary settings"
-msgstr ""
-
-#: commonui/roughtransdlg.cpp:121
-msgid "Fu&zzy translation (slow)"
-msgstr ""
-
-#: commonui/roughtransdlg.cpp:123
-msgid "&Single word translation"
-msgstr ""
-
-#: commonui/roughtransdlg.cpp:126
-msgid ""
-"<qt>"
-"<p><b>How messages get translated</b></p>"
-"<p>Here you can define if a message can only get translated completely, if "
-"similar messages are acceptable or if KBabel is supposed to try translating the "
-"single words of a message if no translation of the complete message or similar "
-"message was found.</p></qt>"
-msgstr ""
-
-#: commonui/roughtransdlg.cpp:136
-msgid "&Mark changed entries as fuzzy"
-msgstr ""
-
-#: commonui/roughtransdlg.cpp:139
-msgid ""
-"<qt>"
-"<p><b>Mark changed entries as fuzzy</b></p>"
-"<p>When a translation for a message is found, the entry will be marked <b>"
-"fuzzy</b> by default. This is because the translation is just guessed by KBabel "
-"and you should always check the results carefully. Deactivate this option only "
-"if you know what you are doing.</p></qt>"
-msgstr ""
-
-#: commonui/roughtransdlg.cpp:150
-msgid "Initialize &TDE-specific entries"
-msgstr ""
-
-#: commonui/roughtransdlg.cpp:153
-msgid ""
-"<qt>"
-"<p><b>Initialize TDE-specific entries</b></p>"
-"<p>Initialize \"Comment=\" and \"Name=\" entries if a translation is not found. "
-"Also, \"NAME OF TRANSLATORS\" and \"EMAIL OF TRANSLATORS\" is filled with "
-"identity settings.</p></qt>"
-msgstr ""
-
-#: commonui/roughtransdlg.cpp:158
-msgid "Dictionaries"
-msgstr ""
-
-#: commonui/roughtransdlg.cpp:177
-msgid ""
-"<qt>"
-"<p><b>Dictionaries</b></p>"
-"<p>Choose here, which dictionaries have to be used for finding a translation. "
-"If you select more than one dictionary, they are used in the same order as they "
-"are displayed in the list.</p>"
-"<p>The <b>Configure</b> button allows you to temporarily configure selected "
-"dictionary. The original settings will be restored after closing the dialog.</p>"
-"</qt>"
-msgstr ""
-
-#: commonui/roughtransdlg.cpp:186
-msgid "Messages:"
-msgstr "Negeseuon :"
-
-#: commonui/roughtransdlg.cpp:744
-msgid ""
-"<qt>"
-"<p>When a translation for a message is found, the entry will be marked <b>"
-"fuzzy</b> by default. This is because the translation is just guessed by KBabel "
-"and you should always check the results carefully. Deactivate this option only "
-"if you know what you are doing.</p></qt>"
-msgstr ""
-
-#: commonui/projectpref.cpp:70
-msgid ""
-"_: title of page in preferences dialog\n"
-"Identity"
-msgstr "Dynodiad"
-
-#: commonui/projectpref.cpp:72
-msgid "Information About You and Translation Team"
-msgstr ""
-
-#: commonui/projectpref.cpp:76 kbabel/kbabelview.cpp:1595
-msgid ""
-"_: title of page in preferences dialog\n"
-"Save"
-msgstr "Cadw"
-
-#: commonui/projectpref.cpp:78 kbabel/kbabelview.cpp:1597
-msgid "Options for File Saving"
-msgstr ""
-
-#: commonui/projectpref.cpp:82
-msgid ""
-"_: title of page in preferences dialog\n"
-"Spelling"
-msgstr "Sillafu"
-
-#: commonui/projectpref.cpp:84
-msgid "Options for Spell Checking"
-msgstr ""
-
-#: commonui/projectpref.cpp:89
-msgid ""
-"_: title of page in preferences dialog\n"
-"Source"
-msgstr "Tarddiad"
-
-#: commonui/projectpref.cpp:91
-msgid "Options for Showing Source Context"
-msgstr ""
-
-#: commonui/projectpref.cpp:96
-msgid ""
-"_: title of page in preferences dialog\n"
-"Miscellaneous"
-msgstr "Amrywiol"
-
-#: commonui/projectpref.cpp:98
-msgid "Miscellaneous Settings"
-msgstr "Gosodiadau Amrywiol"
-
-#: commonui/projectpref.cpp:101
-msgid ""
-"_: title of page in preferences dialog\n"
-"Folders"
-msgstr "Plygyll"
-
-#: commonui/projectpref.cpp:103
-msgid "Paths to Message Catalogs & Catalog Templates"
-msgstr ""
-
-#: commonui/projectpref.cpp:106
-msgid ""
-"_: title of page in preferences dialog\n"
-"Folder Commands"
-msgstr ""
-
-#: commonui/projectpref.cpp:108
-msgid "User-Defined Commands for Folder Items"
-msgstr ""
-
-#: commonui/projectpref.cpp:113
-msgid ""
-"_: title of page in preferences dialog\n"
-"File Commands"
-msgstr ""
-
-#: commonui/projectpref.cpp:115
-msgid "User-Defined Commands for File Items"
-msgstr ""
-
-#: commonui/projectpref.cpp:120
-msgid ""
-"_: title of page in preferences dialog\n"
-"Catalog Manager"
-msgstr ""
-
-#: commonui/projectpref.cpp:122
-msgid "Catalog Manager View Settings"
+#: commonui/context.cpp:97
+msgid "Corresponding source file not found"
 msgstr ""
 
-#: commonui/projectpref.cpp:125 kbabel/kbabelpref.cpp:85
+#: commonui/context.cpp:265 commonui/context.cpp:275 commonui/context.cpp:285
 msgid ""
-"_: title of page in preferences dialog\n"
-"Diff"
-msgstr "Diff"
-
-#: commonui/projectpref.cpp:127
-msgid "Searching for Differences"
+"KBabel cannot start a text editor component.\n"
+"Please check your TDE installation."
 msgstr ""
 
 #: commonui/cmdedit.cpp:51
@@ -1484,32 +33,6 @@ msgstr "Gorchy&myn:"
 msgid "&Add"
 msgstr "&Ychwanegu"
 
-#: commonui/tdeactionselector.cpp:81
-msgid "&Available:"
-msgstr "&Ar gael:"
-
-#: commonui/tdeactionselector.cpp:96
-msgid "&Selected:"
-msgstr "&Wedi'u dewis:"
-
-#: commonui/projectwizard.cpp:78
-msgid "Basic Project Information"
-msgstr ""
-
-#: commonui/projectwizard.cpp:83
-msgid "Translation Files"
-msgstr ""
-
-#: commonui/projectwizard.cpp:140
-msgid ""
-"The file '%1' already exists.\n"
-"Do you want to replace it?"
-msgstr ""
-
-#: commonui/projectwizard.cpp:141
-msgid "File Exists"
-msgstr "Ffeil yn Bodoli"
-
 #: commonui/finddialog.cpp:62
 msgid "&Find:"
 msgstr "&Canfod:"
@@ -1571,7 +94,7 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./catalogmanager/markpatternwidget.ui line 54
-#: commonui/finddialog.cpp:124 rc.cpp:69
+#: commonui/finddialog.cpp:124 rc.cpp:1219
 #, no-c-format
 msgid "C&ase sensitive"
 msgstr "Mae llythrennau bach/mawr o &bwys"
@@ -1597,7 +120,7 @@ msgid "F&ind backwards"
 msgstr "C&anfod yn ôl"
 
 #. i18n: file ./catalogmanager/markpatternwidget.ui line 86
-#: commonui/finddialog.cpp:133 rc.cpp:81
+#: commonui/finddialog.cpp:133 rc.cpp:1231
 #, no-c-format
 msgid "Use regu&lar expression"
 msgstr ""
@@ -1709,7 +232,7 @@ msgid "No autosave"
 msgstr "Dim hunan-gadw"
 
 #. i18n: file ./kbabel/editorpreferences.ui line 29
-#: commonui/projectprefwidgets.cpp:188 rc.cpp:420
+#: commonui/projectprefwidgets.cpp:188 rc.cpp:271
 #, no-c-format
 msgid "&General"
 msgstr "&Cyffredinol"
@@ -2017,7 +540,7 @@ msgid ""
 "<qt>"
 "<p><b>Marker for keyboard accelerator</b></p>"
 "<p>Define here, what character marks the following character as keyboard "
-"accelerator. For example in Qt it is '&amp;' and in Gtk it is '_'.</p></qt>"
+"accelerator. For example in TQt it is '&amp;' and in Gtk it is '_'.</p></qt>"
 msgstr ""
 
 #: commonui/projectprefwidgets.cpp:693
@@ -2077,13 +600,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./commonui/projectwizardwidget2.ui line 68
-#: commonui/projectprefwidgets.cpp:890 rc.cpp:313
+#: commonui/projectprefwidgets.cpp:890 rc.cpp:199
 #, no-c-format
 msgid "&Base folder of PO files:"
 msgstr ""
 
 #. i18n: file ./commonui/projectwizardwidget2.ui line 110
-#: commonui/projectprefwidgets.cpp:903 rc.cpp:316
+#: commonui/projectprefwidgets.cpp:903 rc.cpp:202
 #, no-c-format
 msgid "Ba&se folder of POT files:"
 msgstr ""
@@ -2263,217 +786,394 @@ msgstr ""
 msgid "Path Patterns"
 msgstr ""
 
-#: commonui/context.cpp:97
-msgid "Corresponding source file not found"
+#: commonui/tdeactionselector.cpp:81
+msgid "&Available:"
+msgstr "&Ar gael:"
+
+#: commonui/tdeactionselector.cpp:96
+msgid "&Selected:"
+msgstr "&Wedi'u dewis:"
+
+#: commonui/projectpref.cpp:70
+msgid ""
+"_: title of page in preferences dialog\n"
+"Identity"
+msgstr "Dynodiad"
+
+#: commonui/projectpref.cpp:72
+msgid "Information About You and Translation Team"
 msgstr ""
 
-#: commonui/context.cpp:265 commonui/context.cpp:275 commonui/context.cpp:285
+#: commonui/projectpref.cpp:76 kbabel/kbabelview.cpp:1595
 msgid ""
-"KBabel cannot start a text editor component.\n"
-"Please check your TDE installation."
+"_: title of page in preferences dialog\n"
+"Save"
+msgstr "Cadw"
+
+#: commonui/projectpref.cpp:78 kbabel/kbabelview.cpp:1597
+msgid "Options for File Saving"
 msgstr ""
 
-#. i18n: file ./kbabel/headerwidget.ui line 24
-#: kbabel/commentview.cpp:78 rc.cpp:414
-#, no-c-format
-msgid "&Comment:"
-msgstr "&Sylwad:"
+#: commonui/projectpref.cpp:82
+msgid ""
+"_: title of page in preferences dialog\n"
+"Spelling"
+msgstr "Sillafu"
 
-#: kbabel/commentview.cpp:88
+#: commonui/projectpref.cpp:84
+msgid "Options for Spell Checking"
+msgstr ""
+
+#: commonui/projectpref.cpp:89
 msgid ""
-"<qt>"
-"<p><b>Comment Editor</b></p>\n"
-"This edit window shows you the comments of the currently displayed message."
-"<p>\n"
-"<p>The comments normally contain information about where the message is found "
-"in the source\n"
-"code and status information about this message (fuzzy, c-format).\n"
-"Hints from other translators are also sometimes contained in comments.</p>\n"
-"<p>You can hide the comment editor by deactivating\n"
-"<b>Options->Show Comments</b>.</p></qt>"
+"_: title of page in preferences dialog\n"
+"Source"
+msgstr "Tarddiad"
+
+#: commonui/projectpref.cpp:91
+msgid "Options for Showing Source Context"
 msgstr ""
 
-#: kbabel/contextview.cpp:63
+#: commonui/projectpref.cpp:96
 msgid ""
-"<qt>"
-"<p><b>PO Context</b></p>"
-"<p>This window shows the context of the current message in the PO file. "
-"Normally it shows four messages in front of the current message and four after "
-"it.</p>"
-"<p>You can hide the tools window by deactivating <b>Options->Show Tools</b>.</p>"
-"</qt></qt>"
+"_: title of page in preferences dialog\n"
+"Miscellaneous"
+msgstr "Amrywiol"
+
+#: commonui/projectpref.cpp:98
+msgid "Miscellaneous Settings"
+msgstr "Gosodiadau Amrywiol"
+
+#: commonui/projectpref.cpp:101
+msgid ""
+"_: title of page in preferences dialog\n"
+"Folders"
+msgstr "Plygyll"
+
+#: commonui/projectpref.cpp:103
+msgid "Paths to Message Catalogs & Catalog Templates"
 msgstr ""
 
-#: kbabel/contextview.cpp:99
-msgid "current entry"
+#: commonui/projectpref.cpp:106
+msgid ""
+"_: title of page in preferences dialog\n"
+"Folder Commands"
 msgstr ""
 
-#: kbabel/contextview.cpp:125 kbabel/kbabel.cpp:721 kbabel/kbabelview.cpp:419
-msgid "untranslated"
+#: commonui/projectpref.cpp:108
+msgid "User-Defined Commands for Folder Items"
 msgstr ""
 
-#: kbabel/contextview.cpp:140
+#: commonui/projectpref.cpp:113
 msgid ""
-"Plural %1: %2\n"
+"_: title of page in preferences dialog\n"
+"File Commands"
 msgstr ""
 
-#: kbabel/errorlistview.cpp:62
-msgid ""
-"<qt>"
-"<p><b>Error List</b></p>"
-"<p>This window shows the list of errors found by validator tools so you can "
-"know why the current message has been marked with an error.</p></qt>"
+#: commonui/projectpref.cpp:115
+msgid "User-Defined Commands for File Items"
 msgstr ""
 
-#: kbabel/kbabelpref.cpp:57
+#: commonui/projectpref.cpp:120
 msgid ""
 "_: title of page in preferences dialog\n"
-"Edit"
-msgstr "Golygu"
+"Catalog Manager"
+msgstr ""
 
-#: kbabel/kbabelpref.cpp:59
-msgid "Options for Editing"
+#: commonui/projectpref.cpp:122
+msgid "Catalog Manager View Settings"
 msgstr ""
 
-#: kbabel/kbabelpref.cpp:70
+#: commonui/projectpref.cpp:125 kbabel/kbabelpref.cpp:85
 msgid ""
 "_: title of page in preferences dialog\n"
-"Search"
-msgstr "Chwilio"
+"Diff"
+msgstr "Diff"
 
-#: kbabel/kbabelpref.cpp:72
-msgid "Options for Searching Similar Translations"
+#: commonui/projectpref.cpp:127
+msgid "Searching for Differences"
 msgstr ""
 
-#: kbabel/kbabelpref.cpp:87
-msgid "Options for Showing Differences"
+#: commonui/roughtransdlg.cpp:69
+msgid ""
+"_: Caption of dialog\n"
+"Rough Translation"
 msgstr ""
 
-#: kbabel/kbabelpref.cpp:90
+#: commonui/roughtransdlg.cpp:82 kbabeldict/kbabeldictview.cpp:111
+msgid "S&top"
+msgstr "S&topio"
+
+#: catalogmanager/libcvs/cvsdialog.cpp:157
+#: catalogmanager/libsvn/svndialog.cpp:152 commonui/roughtransdlg.cpp:83
+msgid "C&ancel"
+msgstr "&Diddymu"
+
+#: commonui/roughtransdlg.cpp:96
+msgid "What to Translate"
+msgstr ""
+
+#: commonui/roughtransdlg.cpp:102
+msgid "U&ntranslated entries"
+msgstr ""
+
+#: commonui/roughtransdlg.cpp:103
+msgid "&Fuzzy entries"
+msgstr ""
+
+#: commonui/roughtransdlg.cpp:104
+msgid "T&ranslated entries"
+msgstr ""
+
+#: commonui/roughtransdlg.cpp:108
 msgid ""
-"_: name of page in preferences dialog icon list\n"
-"Fonts"
-msgstr "Wynebfathau"
+"<qt>"
+"<p><b>What entries to translate</b></p>"
+"<p>Choose here, for which entries of the file KBabel tries to find a "
+"translation. Changed entries are always marked as fuzzy, no matter which option "
+"you choose.</p></qt>"
+msgstr ""
 
-#: kbabel/kbabelpref.cpp:92
+#: commonui/roughtransdlg.cpp:113
+msgid "How to Translate"
+msgstr ""
+
+#: commonui/roughtransdlg.cpp:118
+msgid "&Use dictionary settings"
+msgstr ""
+
+#: commonui/roughtransdlg.cpp:121
+msgid "Fu&zzy translation (slow)"
+msgstr ""
+
+#: commonui/roughtransdlg.cpp:123
+msgid "&Single word translation"
+msgstr ""
+
+#: commonui/roughtransdlg.cpp:126
 msgid ""
-"_: title of page in preferences dialog\n"
-"Font Settings"
-msgstr "Gosodiadau Ffont"
+"<qt>"
+"<p><b>How messages get translated</b></p>"
+"<p>Here you can define if a message can only get translated completely, if "
+"similar messages are acceptable or if KBabel is supposed to try translating the "
+"single words of a message if no translation of the complete message or similar "
+"message was found.</p></qt>"
+msgstr ""
 
-#: kbabel/kbabelpref.cpp:95
+#: commonui/roughtransdlg.cpp:136
+msgid "&Mark changed entries as fuzzy"
+msgstr ""
+
+#: commonui/roughtransdlg.cpp:139
 msgid ""
-"_: name of page in preferences dialog icon list\n"
-"Colors"
-msgstr "Lliwiau"
+"<qt>"
+"<p><b>Mark changed entries as fuzzy</b></p>"
+"<p>When a translation for a message is found, the entry will be marked <b>"
+"fuzzy</b> by default. This is because the translation is just guessed by KBabel "
+"and you should always check the results carefully. Deactivate this option only "
+"if you know what you are doing.</p></qt>"
+msgstr ""
 
-#: kbabel/kbabelpref.cpp:97
+#: commonui/roughtransdlg.cpp:150
+msgid "Initialize &TDE-specific entries"
+msgstr ""
+
+#: commonui/roughtransdlg.cpp:153
 msgid ""
-"_: title of page in preferences dialog\n"
-"Color Settings"
-msgstr "Gosodiadau Lliw"
+"<qt>"
+"<p><b>Initialize TDE-specific entries</b></p>"
+"<p>Initialize \"Comment=\" and \"Name=\" entries if a translation is not found. "
+"Also, \"NAME OF TRANSLATORS\" and \"EMAIL OF TRANSLATORS\" is filled with "
+"identity settings.</p></qt>"
+msgstr ""
 
-#: kbabel/kbcataloglistview.cpp:44
-msgid "Id"
-msgstr "Dynodiad (Id)"
+#: commonui/roughtransdlg.cpp:158
+msgid "Dictionaries"
+msgstr ""
 
-#: kbabel/kbcataloglistview.cpp:45
-#, fuzzy
-msgid "Original String"
-msgstr "Awdur gwreiddiol"
+#: commonui/roughtransdlg.cpp:177
+msgid ""
+"<qt>"
+"<p><b>Dictionaries</b></p>"
+"<p>Choose here, which dictionaries have to be used for finding a translation. "
+"If you select more than one dictionary, they are used in the same order as they "
+"are displayed in the list.</p>"
+"<p>The <b>Configure</b> button allows you to temporarily configure selected "
+"dictionary. The original settings will be restored after closing the dialog.</p>"
+"</qt>"
+msgstr ""
 
-#. i18n: translators: Dock window caption
-#: kbabel/kbabelview.cpp:456 kbabel/kbcataloglistview.cpp:46
-#, fuzzy
-msgid "Translated String"
-msgstr "Cyfieithiad"
+#: commonui/roughtransdlg.cpp:186
+msgid "Messages:"
+msgstr "Negeseuon :"
 
-#: kbabel/main.cpp:537
-msgid "Go to entry with msgid <msgid>"
+#: catalogmanager/multiroughtransdlg.cpp:129 commonui/roughtransdlg.cpp:671
+msgid ""
+"Result of the translation:\n"
+"Edited entries: %1\n"
+"Exact translations: %2 (%3%)\n"
+"Approximate translations: %4 (%5%)\n"
+"Nothing found: %6 (%7%)"
 msgstr ""
 
-#: kbabel/main.cpp:538 kbabeldict/main.cpp:105
-msgid "Disable splashscreen at startup"
+#: catalogmanager/multiroughtransdlg.cpp:143 commonui/roughtransdlg.cpp:685
+msgid "Rough Translation Statistics"
 msgstr ""
 
-#: kbabel/main.cpp:540
-msgid "Files to open"
+#: commonui/roughtransdlg.cpp:744
+msgid ""
+"<qt>"
+"<p>When a translation for a message is found, the entry will be marked <b>"
+"fuzzy</b> by default. This is because the translation is just guessed by KBabel "
+"and you should always check the results carefully. Deactivate this option only "
+"if you know what you are doing.</p></qt>"
 msgstr ""
 
-#: kbabel/main.cpp:547
-msgid "KBabel"
-msgstr "KBabel"
+#: commonui/projectwizard.cpp:78
+msgid "Basic Project Information"
+msgstr ""
 
-#: kbabel/main.cpp:548
-msgid "An advanced PO file editor"
+#: commonui/projectwizard.cpp:83
+msgid "Translation Files"
 msgstr ""
 
-#: kbabel/main.cpp:555
+#: commonui/projectwizard.cpp:140
 msgid ""
-"Wrote the dictionary plugin for searching in a database and some other code."
+"The file '%1' already exists.\n"
+"Do you want to replace it?"
 msgstr ""
 
-#: kbabel/main.cpp:560
-msgid "Bug fixes, KFilePlugin for PO files, CVS support, mailing files"
+#: commonui/projectwizard.cpp:141
+msgid "File Exists"
+msgstr "Ffeil yn Bodoli"
+
+#: addons/tdefile-plugins/tdefile_po.cpp:50
+msgid "Catalog Information"
+msgstr "Gwybodaeth Catalog"
+
+#: addons/tdefile-plugins/tdefile_po.cpp:53
+msgid "Total Messages"
 msgstr ""
 
-#: kbabel/main.cpp:562
-#, fuzzy
-msgid "Translation List View"
-msgstr "Cyfieithiad"
+#: addons/tdefile-plugins/tdefile_po.cpp:54
+msgid "Fuzzy Messages"
+msgstr ""
 
-#: kbabel/main.cpp:574
-msgid "Implemented XML validation/highlighting plus other small fixes."
+#: addons/tdefile-plugins/tdefile_po.cpp:55
+msgid "Untranslated Messages"
 msgstr ""
 
-#: kbabel/main.cpp:583
-msgid "String distance algorithm implementation"
+#: addons/tdefile-plugins/tdefile_po.cpp:56
+#: catalogmanager/catalogmanagerview.cpp:96
+msgid "Last Translator"
 msgstr ""
 
-#: kbabel/main.cpp:585
-msgid "Error list for current entry, regexp data tool"
+#: addons/tdefile-plugins/tdefile_po.cpp:57
+msgid "Language Team"
 msgstr ""
 
-#: kbabel/main.cpp:587
-msgid "Word-by-word string difference algorithm implementation"
+#: addons/tdefile-plugins/tdefile_po.cpp:58
+msgid "Revision"
 msgstr ""
 
-#: kbabel/headereditor.cpp:60
-msgid "&Apply Settings"
+#: _translatorinfo.cpp:1 kbabeldict/main.cpp:121
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "KD wrth KGyfieithu"
+
+#: _translatorinfo.cpp:3 kbabeldict/main.cpp:122
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "kyfieithu@dotmon.com"
+
+#: datatools/punctuation/main.cc:58
+msgid ""
+"_: what check found errors\n"
+"punctuation"
 msgstr ""
 
-#: kbabel/headereditor.cpp:61
+#: datatools/whitespace/main.cc:60
 msgid ""
-"<qt>"
-"<p>This button updates the header using the current settings. The resulting "
-"header is the one that would be written into the PO file on saving.</p></qt>"
+"_: which check found errors\n"
+"whitespace only translation"
 msgstr ""
 
-#: kbabel/headereditor.cpp:65
-msgid "&Reset"
-msgstr "&Ailosod"
+#: datatools/equations/main.cc:58
+msgid ""
+"_: what check found errors\n"
+"equations"
+msgstr ""
 
-#: kbabel/headereditor.cpp:66
-msgid "<qt><p>This button will revert all changes made so far.</p></qt>"
+#: datatools/not-translated/main.cc:60
+msgid ""
+"_: which check found errors\n"
+"English text in translation"
 msgstr ""
 
-#: kbabel/headereditor.cpp:111
-#, c-format
-msgid "Header Editor for %1"
+#: datatools/xml/main.cc:60
+msgid ""
+"_: what check found errors\n"
+"XML tags"
 msgstr ""
 
-#: kbabel/headereditor.cpp:136
+#: datatools/accelerators/main.cc:58
 msgid ""
-"<qt>"
-"<p>This is not a valid header.</p>\n"
-"<p>Please edit the header before updating!</p></qt>"
+"_: what check found errors\n"
+"accelerator"
 msgstr ""
 
-#: kbabel/headereditor.cpp:172
+#: datatools/length/main.cc:61 datatools/regexp/main.cc:55
 msgid ""
-"<qt>"
-"<p>This is not a valid header.</p>\n"
-"<p>Please edit the header before updating.</p></qt>"
+"_: which check found errors\n"
+"translation has inconsistent length"
+msgstr ""
+
+#: datatools/regexp/main.cc:58
+msgid "Error loading data (%1)"
+msgstr ""
+
+#: datatools/regexp/main.cc:118
+msgid "File not found"
+msgstr "Ni chanfuwyd y ffeil"
+
+#: datatools/regexp/main.cc:123
+msgid "The file is not a XML"
+msgstr ""
+
+#: datatools/regexp/main.cc:147
+msgid "Expected tag 'item'"
+msgstr ""
+
+#: datatools/regexp/main.cc:153
+msgid "First child of 'item' is not a node"
+msgstr ""
+
+#: datatools/regexp/main.cc:159
+msgid "Expected tag 'name'"
+msgstr ""
+
+#: datatools/regexp/main.cc:167
+msgid "Expected tag 'exp'"
+msgstr ""
+
+#: datatools/pluralforms/main.cc:59
+msgid ""
+"_: what check found errors\n"
+"plural forms"
+msgstr ""
+
+#: datatools/context/main.cc:58
+msgid ""
+"_: what check found errors\n"
+"context info"
+msgstr ""
+
+#: datatools/arguments/main.cc:57
+msgid ""
+"_: what check found errors\n"
+"arguments"
 msgstr ""
 
 #: kbabel/kbabelview.cpp:185
@@ -2559,6 +1259,10 @@ msgstr ""
 msgid "fuzzy"
 msgstr "niwlaidd"
 
+#: kbabel/contextview.cpp:125 kbabel/kbabel.cpp:721 kbabel/kbabelview.cpp:419
+msgid "untranslated"
+msgstr ""
+
 #: kbabel/kbabel.cpp:725 kbabel/kbabelview.cpp:428
 msgid "faulty"
 msgstr ""
@@ -2582,6 +1286,12 @@ msgid ""
 msgstr ""
 
 #. i18n: translators: Dock window caption
+#: kbabel/kbabelview.cpp:456 kbabel/kbcataloglistview.cpp:46
+#, fuzzy
+msgid "Translated String"
+msgstr "Cyfieithiad"
+
+#. i18n: translators: Dock window caption
 #: kbabel/kbabelview.cpp:466
 msgid ""
 "_: the search (noun)\n"
@@ -2659,6 +1369,15 @@ msgid ""
 "There was an error while reading the file header. Please check the header."
 msgstr ""
 
+#: catalogmanager/multiroughtransdlg.cpp:84
+#: catalogmanager/multiroughtransdlg.cpp:96 kbabel/kbabelview.cpp:1182
+#: kbabel/kbabelview.cpp:1304 kbabel/kbabelview2.cpp:724
+msgid ""
+"Error while trying to read file:\n"
+" %1\n"
+"Maybe it is not a valid PO file."
+msgstr ""
+
 #: kbabel/kbabelview.cpp:1189 kbabel/kbabelview.cpp:1311
 msgid ""
 "Error while reading the file:\n"
@@ -2704,6 +1423,15 @@ msgid ""
 " %1"
 msgstr ""
 
+#: catalogmanager/catalogmanagerview.cpp:448
+#: catalogmanager/catalogmanagerview.cpp:483 kbabel/kbabelview.cpp:1233
+#: kbabel/kbabelview.cpp:1349 kbabel/kbabelview2.cpp:757
+#, c-format
+msgid ""
+"Error while trying to open file:\n"
+" %1"
+msgstr ""
+
 #: kbabel/kbabelview.cpp:1262
 msgid ""
 "All changes will be lost if the file is reverted to its last saved state."
@@ -2761,6 +1489,15 @@ msgid ""
 "Do you want to save to another file or cancel?"
 msgstr ""
 
+#: catalogmanager/catalogmanagerview.cpp:519 kbabel/kbabelview.cpp:1451
+msgid "The file %1 already exists. Do you want to overwrite it?"
+msgstr "Mae'r ffeil %1 mewn bod yn barod.  Ydych am ysgrifennu drosto?"
+
+#: catalogmanager/catalogmanagerview.cpp:520 kbabel/kbabelview.cpp:1452
+#: kbabel/kbabelview.cpp:1521
+msgid "&Overwrite"
+msgstr "&Trosysgrifo"
+
 #: kbabel/kbabelview.cpp:1482
 msgid ""
 "You have specified a folder:\n"
@@ -2792,6 +1529,11 @@ msgid ""
 "Output of \"msgfmt --statistics\":\n"
 msgstr ""
 
+#: catalogmanager/catalogmanagerview.cpp:845
+#: catalogmanager/catalogmanagerview.cpp:934 kbabel/kbabelview.cpp:1649
+msgid "You can use gettext tools only for checking PO files."
+msgstr ""
+
 #: kbabel/kbabelview.cpp:1658
 msgid ""
 "msgfmt detected a syntax error.\n"
@@ -2926,7 +1668,7 @@ msgid "Spellcheck"
 msgstr "Gwirio Sillafu"
 
 #: kbabel/kbabelview.cpp:3949
-msgid "KBabel cannot start spell checker. Please verify your TDE installation."
+msgid "KBabel cannot start spell checker. Please check your TDE installation."
 msgstr ""
 
 #: kbabel/kbabelview.cpp:3974
@@ -2992,15 +1734,42 @@ msgstr ""
 msgid "The spell checker program seems to have crashed."
 msgstr "Ymddengys bod ISpell wedi chwalu."
 
-#: kbabel/spelldlg.cpp:44
+#: catalogmanager/catalogmanager.cpp:940
+#: catalogmanager/catalogmanager.cpp:1024 kbabel/kbabelview.cpp:4433
+#: kbabeldict/kbabeldictview.cpp:239
+msgid "Searching"
+msgstr "Yn chwilio"
+
+#: kbabel/charselectview.cpp:64 kbabel/kbcharselect.cpp:52
+msgid "Table:"
+msgstr "Tabl:"
+
+#: kbabel/charselectview.cpp:84
 msgid ""
-"_: Caption of dialog\n"
-"Spelling"
-msgstr "Sillafu"
+"<qt>"
+"<p><b>Character Selector</b></p>"
+"<p>This tool allows to insert special characters using double click.</p></qt>"
+msgstr ""
 
-#: kbabel/spelldlg.cpp:47
-msgid "&Spell Check"
-msgstr "&Gwirio Sillafu"
+#: kbabel/contextview.cpp:63
+msgid ""
+"<qt>"
+"<p><b>PO Context</b></p>"
+"<p>This window shows the context of the current message in the PO file. "
+"Normally it shows four messages in front of the current message and four after "
+"it.</p>"
+"<p>You can hide the tools window by deactivating <b>Options->Show Tools</b>.</p>"
+"</qt></qt>"
+msgstr ""
+
+#: kbabel/contextview.cpp:99
+msgid "current entry"
+msgstr ""
+
+#: kbabel/contextview.cpp:140
+msgid ""
+"Plural %1: %2\n"
+msgstr ""
 
 #: kbabel/hidingmsgedit.cpp:76
 msgid "Context inserted by KBabel, do not translate:"
@@ -3011,6 +1780,157 @@ msgstr ""
 msgid "Plural %1"
 msgstr ""
 
+#: kbabel/kbabelpref.cpp:57
+msgid ""
+"_: title of page in preferences dialog\n"
+"Edit"
+msgstr "Golygu"
+
+#: kbabel/kbabelpref.cpp:59
+msgid "Options for Editing"
+msgstr ""
+
+#: kbabel/kbabelpref.cpp:70
+msgid ""
+"_: title of page in preferences dialog\n"
+"Search"
+msgstr "Chwilio"
+
+#: kbabel/kbabelpref.cpp:72
+msgid "Options for Searching Similar Translations"
+msgstr ""
+
+#: kbabel/kbabelpref.cpp:87
+msgid "Options for Showing Differences"
+msgstr ""
+
+#: kbabel/kbabelpref.cpp:90
+msgid ""
+"_: name of page in preferences dialog icon list\n"
+"Fonts"
+msgstr "Wynebfathau"
+
+#: kbabel/kbabelpref.cpp:92
+msgid ""
+"_: title of page in preferences dialog\n"
+"Font Settings"
+msgstr "Gosodiadau Ffont"
+
+#: kbabel/kbabelpref.cpp:95
+msgid ""
+"_: name of page in preferences dialog icon list\n"
+"Colors"
+msgstr "Lliwiau"
+
+#: kbabel/kbabelpref.cpp:97
+msgid ""
+"_: title of page in preferences dialog\n"
+"Color Settings"
+msgstr "Gosodiadau Lliw"
+
+#: kbabel/kbcataloglistview.cpp:44
+msgid "Id"
+msgstr "Dynodiad (Id)"
+
+#: kbabel/kbcataloglistview.cpp:45
+#, fuzzy
+msgid "Original String"
+msgstr "Awdur gwreiddiol"
+
+#: kbabel/kbabelview2.cpp:538
+#, c-format
+msgid ""
+"An error occurred while trying to get the list of messages for this file from "
+"the database:\n"
+"%1"
+msgstr ""
+
+#: kbabel/kbabelview2.cpp:624
+msgid "No difference found"
+msgstr ""
+
+#: kbabel/kbabelview2.cpp:628
+msgid "Difference found"
+msgstr ""
+
+#: kbabel/kbabelview2.cpp:636
+msgid "No corresponding message found."
+msgstr ""
+
+#: kbabel/kbabelview2.cpp:641
+msgid "No corresponding message found"
+msgstr ""
+
+#: kbabel/kbabelview2.cpp:696
+msgid "Select File to Diff With"
+msgstr ""
+
+#: kbabel/kbabelview2.cpp:710
+msgid "loading file for diff"
+msgstr ""
+
+#: kbabel/kbabelview2.cpp:801
+msgid ""
+"The search string has not been found yet.\n"
+"However, the string might be found in the files being searched at the moment.\n"
+"Please try later."
+msgstr ""
+
+#: kbabel/kbabelview2.cpp:810
+msgid "Do not show in this find/replace session again"
+msgstr ""
+
+#: kbabel/kbabelview2.cpp:825
+msgid "Enter new package for the current file:"
+msgstr ""
+
+#: kbabel/kbabelview2.cpp:1021
+msgid ""
+"Total words: %1\n"
+"\n"
+"Words in untranslated messages: %2\n"
+"\n"
+"Words in fuzzy messages: %3"
+msgstr ""
+
+#: kbabel/kbabelview2.cpp:1024
+msgid "Word Count"
+msgstr ""
+
+#. i18n: file ./kbabel/headerwidget.ui line 24
+#: kbabel/commentview.cpp:78 rc.cpp:265
+#, no-c-format
+msgid "&Comment:"
+msgstr "&Sylwad:"
+
+#: kbabel/commentview.cpp:88
+msgid ""
+"<qt>"
+"<p><b>Comment Editor</b></p>\n"
+"This edit window shows you the comments of the currently displayed message."
+"<p>\n"
+"<p>The comments normally contain information about where the message is found "
+"in the source\n"
+"code and status information about this message (fuzzy, c-format).\n"
+"Hints from other translators are also sometimes contained in comments.</p>\n"
+"<p>You can hide the comment editor by deactivating\n"
+"<b>Options->Show Comments</b>.</p></qt>"
+msgstr ""
+
+#: catalogmanager/catalogmanager.cpp:129 kbabel/kbabel.cpp:132
+#: kbabel/kbabel.cpp:150 kbabel/kbabel.cpp:1754
+#, c-format
+msgid ""
+"Cannot open project file\n"
+"%1"
+msgstr ""
+
+#: catalogmanager/catalogmanager.cpp:130 kbabel/kbabel.cpp:133
+#: kbabel/kbabel.cpp:151 kbabel/kbabel.cpp:1755
+#, fuzzy
+msgid "Project File Error"
+msgstr "Gwall &Blaenorol"
+
 #: kbabel/kbabel.cpp:330
 msgid ""
 "You have not run KBabel before. To allow KBabel to work correctly you must "
@@ -3104,6 +2024,38 @@ msgstr ""
 msgid "&Last Entry"
 msgstr ""
 
+#: catalogmanager/catalogmanager.cpp:299 kbabel/kbabel.cpp:528
+msgid "P&revious Fuzzy or Untranslated"
+msgstr ""
+
+#: catalogmanager/catalogmanager.cpp:296 kbabel/kbabel.cpp:531
+msgid "N&ext Fuzzy or Untranslated"
+msgstr ""
+
+#: catalogmanager/catalogmanager.cpp:293 kbabel/kbabel.cpp:534
+msgid "Pre&vious Fuzzy"
+msgstr ""
+
+#: catalogmanager/catalogmanager.cpp:290 kbabel/kbabel.cpp:537
+msgid "Ne&xt Fuzzy"
+msgstr ""
+
+#: catalogmanager/catalogmanager.cpp:287 kbabel/kbabel.cpp:540
+msgid "Prev&ious Untranslated"
+msgstr ""
+
+#: catalogmanager/catalogmanager.cpp:284 kbabel/kbabel.cpp:543
+msgid "Nex&t Untranslated"
+msgstr ""
+
+#: catalogmanager/catalogmanager.cpp:306 kbabel/kbabel.cpp:546
+msgid "Previo&us Error"
+msgstr "Gwall &Blaenorol"
+
+#: catalogmanager/catalogmanager.cpp:303 kbabel/kbabel.cpp:549
+msgid "Next Err&or"
+msgstr "Gwall Ne&saf"
+
 #: kbabel/kbabel.cpp:552
 msgid "&Back in History"
 msgstr ""
@@ -3132,6 +2084,18 @@ msgstr ""
 msgid "About Dictionary"
 msgstr ""
 
+#: catalogmanager/catalogmanager.cpp:331 kbabel/kbabel.cpp:594
+msgid "&New..."
+msgstr "&Newydd..."
+
+#: catalogmanager/catalogmanager.cpp:339 kbabel/kbabel.cpp:602
+msgid "C&lose"
+msgstr "C&au"
+
+#: catalogmanager/catalogmanager.cpp:345 kbabel/kbabel.cpp:607
+msgid "&Configure..."
+msgstr "&Ffurfweddu..."
+
 #: kbabel/kbabel.cpp:614
 msgid "&Spell Check..."
 msgstr "&Gwirio Sillafu ..."
@@ -3160,6 +2124,11 @@ msgstr ""
 msgid "&Diffmode"
 msgstr ""
 
+#: catalogmanager/libcvs/cvsdialog.cpp:358
+#: catalogmanager/libsvn/svndialog.cpp:337 kbabel/kbabel.cpp:642
+msgid "&Show Diff"
+msgstr ""
+
 #: kbabel/kbabel.cpp:645
 msgid "S&how Original Text"
 msgstr ""
@@ -3184,6 +2153,10 @@ msgstr ""
 msgid "&Word Count"
 msgstr ""
 
+#: catalogmanager/catalogmanager.cpp:243 kbabel/kbabel.cpp:674
+msgid "&Stop Searching"
+msgstr ""
+
 #: kbabel/kbabel.cpp:678
 msgid "&Gettext Info"
 msgstr ""
@@ -3213,7 +2186,7 @@ msgid "Untranslated: 0"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 75
-#: kbabel/kbabel.cpp:713 rc.cpp:803
+#: kbabel/kbabel.cpp:713 rc.cpp:924
 #, no-c-format
 msgid "Status: "
 msgstr "Cyflwr:"
@@ -3240,6 +2213,10 @@ msgid ""
 "shown.</p></qt>"
 msgstr ""
 
+#: catalogmanager/catalogmanager.cpp:399 kbabel/kbabel.cpp:765
+msgid "&Validation"
+msgstr ""
+
 #: kbabel/kbabel.cpp:767
 msgid "Perform &All Checks"
 msgstr ""
@@ -3306,209 +2283,177 @@ msgid ""
 "Spellcheck Done"
 msgstr ""
 
-#: kbabel/kbabelview2.cpp:538
-#, c-format
+#: kbabel/errorlistview.cpp:62
 msgid ""
-"An error occurred while trying to get the list of messages for this file from "
-"the database:\n"
-"%1"
+"<qt>"
+"<p><b>Error List</b></p>"
+"<p>This window shows the list of errors found by validator tools so you can "
+"know why the current message has been marked with an error.</p></qt>"
 msgstr ""
 
-#: kbabel/kbabelview2.cpp:624
-msgid "No difference found"
+#: kbabel/gotodialog.cpp:41 kbabel/gotodialog.cpp:43
+msgid "Go to Entry"
 msgstr ""
 
-#: kbabel/kbabelview2.cpp:628
-msgid "Difference found"
+#: kbabel/headereditor.cpp:60
+msgid "&Apply Settings"
 msgstr ""
 
-#: kbabel/kbabelview2.cpp:636
-msgid "No corresponding message found."
+#: kbabel/headereditor.cpp:61
+msgid ""
+"<qt>"
+"<p>This button updates the header using the current settings. The resulting "
+"header is the one that would be written into the PO file on saving.</p></qt>"
 msgstr ""
 
-#: kbabel/kbabelview2.cpp:641
-msgid "No corresponding message found"
+#: kbabel/headereditor.cpp:65
+msgid "&Reset"
+msgstr "&Ailosod"
+
+#: kbabel/headereditor.cpp:66
+msgid "<qt><p>This button will revert all changes made so far.</p></qt>"
 msgstr ""
 
-#: kbabel/kbabelview2.cpp:696
-msgid "Select File to Diff With"
+#: kbabel/headereditor.cpp:111
+#, c-format
+msgid "Header Editor for %1"
 msgstr ""
 
-#: kbabel/kbabelview2.cpp:710
-msgid "loading file for diff"
+#: kbabel/headereditor.cpp:136
+msgid ""
+"<qt>"
+"<p>This is not a valid header.</p>\n"
+"<p>Please edit the header before updating!</p></qt>"
 msgstr ""
 
-#: kbabel/kbabelview2.cpp:801
+#: kbabel/headereditor.cpp:172
 msgid ""
-"The search string has not been found yet.\n"
-"However, the string might be found in the files being searched at the moment.\n"
-"Please try later."
+"<qt>"
+"<p>This is not a valid header.</p>\n"
+"<p>Please edit the header before updating.</p></qt>"
 msgstr ""
 
-#: kbabel/kbabelview2.cpp:810
-msgid "Do not show in this find/replace session again"
+#: kbabel/spelldlg.cpp:44
+msgid ""
+"_: Caption of dialog\n"
+"Spelling"
+msgstr "Sillafu"
+
+#: kbabel/spelldlg.cpp:47
+msgid "&Spell Check"
+msgstr "&Gwirio Sillafu"
+
+#: kbabel/main.cpp:537
+msgid "Go to entry with msgid <msgid>"
 msgstr ""
 
-#: kbabel/kbabelview2.cpp:825
-msgid "Enter new package for the current file:"
+#: kbabel/main.cpp:538 kbabeldict/main.cpp:105
+msgid "Disable splashscreen at startup"
 msgstr ""
 
-#: kbabel/kbabelview2.cpp:1021
-msgid ""
-"Total words: %1\n"
-"\n"
-"Words in untranslated messages: %2\n"
-"\n"
-"Words in fuzzy messages: %3"
+#: catalogmanager/main.cpp:178 kbabel/main.cpp:539
+msgid "File to load configuration from"
 msgstr ""
 
-#: kbabel/kbabelview2.cpp:1024
-msgid "Word Count"
+#: kbabel/main.cpp:540
+msgid "Files to open"
 msgstr ""
 
-#: kbabel/charselectview.cpp:64 kbabel/kbcharselect.cpp:52
-msgid "Table:"
-msgstr "Tabl:"
+#: kbabel/main.cpp:547
+msgid "KBabel"
+msgstr "KBabel"
 
-#: kbabel/charselectview.cpp:84
-msgid ""
-"<qt>"
-"<p><b>Character Selector</b></p>"
-"<p>This tool allows to insert special characters using double click.</p></qt>"
+#: kbabel/main.cpp:548
+msgid "An advanced PO file editor"
 msgstr ""
 
-#: kbabel/gotodialog.cpp:41 kbabel/gotodialog.cpp:43
-msgid "Go to Entry"
+#: catalogmanager/main.cpp:188 kbabel/main.cpp:549
+msgid "(c) 1999,2000,2001,2002,2003,2004,2005,2006 The KBabel developers"
 msgstr ""
 
-#. i18n: file ./catalogmanager/catalogmanagerui.rc line 11
-#: rc.cpp:6 rc.cpp:331
-#, no-c-format
-msgid "&Go"
-msgstr "&Ewch"
+#: catalogmanager/main.cpp:190 kbabel/main.cpp:551 kbabeldict/main.cpp:118
+msgid "Original author"
+msgstr "Awdur gwreiddiol"
 
-#. i18n: file ./catalogmanager/catalogmanagerui.rc line 30
-#: rc.cpp:9
-#, no-c-format
-msgid "&Markings"
+#: catalogmanager/main.cpp:202 kbabel/main.cpp:553
+msgid "Wrote diff algorithm, fixed KSpell and gave a lot of useful hints."
 msgstr ""
 
-#. i18n: file ./catalogmanager/catalogmanagerui.rc line 43
-#: rc.cpp:12 rc.cpp:334
-#, no-c-format
-msgid "&Project"
-msgstr "&Cywaith"
-
-#. i18n: file ./catalogmanager/catalogmanagerui.rc line 60
-#: rc.cpp:18 rc.cpp:36 rc.cpp:42
-#, no-c-format
-msgid "CVS"
+#: kbabel/main.cpp:555
+msgid ""
+"Wrote the dictionary plugin for searching in a database and some other code."
 msgstr ""
 
-#. i18n: file ./catalogmanager/catalogmanagerui.rc line 122
-#: rc.cpp:30 rc.cpp:358
-#, no-c-format
-msgid "Main"
-msgstr "Prif"
+#: catalogmanager/main.cpp:191 kbabel/main.cpp:558
+#, fuzzy
+msgid "Current maintainer, porting to KDE3/Qt3."
+msgstr "Cynhaliwr cyfredol"
 
-#. i18n: file ./catalogmanager/catalogmanagerui.rc line 128
-#: rc.cpp:33 rc.cpp:361
-#, no-c-format
-msgid "Navigationbar"
+#: kbabel/main.cpp:560
+msgid "Bug fixes, KFilePlugin for PO files, CVS support, mailing files"
 msgstr ""
 
-#. i18n: file ./catalogmanager/validateprogresswidget.ui line 38
-#: kbabeldict/kbabeldictbox.cpp:208 rc.cpp:48
-#, no-c-format
-msgid "Current:"
-msgstr "Cyfredol:"
+#: kbabel/main.cpp:562
+#, fuzzy
+msgid "Translation List View"
+msgstr "Cyfieithiad"
 
-#. i18n: file ./catalogmanager/validateprogresswidget.ui line 59
-#: rc.cpp:51
-#, no-c-format
-msgid "Overall:"
-msgstr ""
+#: catalogmanager/main.cpp:193 kbabel/main.cpp:564 kbabeldict/main.cpp:119
+msgid "Current maintainer"
+msgstr "Cynhaliwr cyfredol"
 
-#. i18n: file ./catalogmanager/validateprogresswidget.ui line 80
-#: rc.cpp:54
-#, no-c-format
-msgid "Current file:"
+#: catalogmanager/main.cpp:195 kbabel/main.cpp:566
+msgid ""
+"Wrote documentation and sent many bug reports and suggestions for improvements."
 msgstr ""
 
-#. i18n: file ./catalogmanager/validateprogresswidget.ui line 88
-#: rc.cpp:57
-#, no-c-format
-msgid "Validation:"
+#: catalogmanager/main.cpp:198 kbabel/main.cpp:569
+msgid ""
+"Gave many suggestions for the GUI and the behavior of KBabel. He also "
+"contributed the beautiful splash screen."
 msgstr ""
 
-#. i18n: file ./catalogmanager/validateprogresswidget.ui line 96
-#: rc.cpp:60 rc.cpp:143 rc.cpp:740
-#, no-c-format
-msgid "New Item"
-msgstr "Eitem Newydd"
+#: catalogmanager/main.cpp:204 kbabel/main.cpp:572
+msgid ""
+"Helped keep KBabel up to date with the KDE API and gave a lot of other help."
+msgstr ""
 
-#. i18n: file ./catalogmanager/markpatternwidget.ui line 24
-#: rc.cpp:63
-#, no-c-format
-msgid "To be set dynamically:"
+#: kbabel/main.cpp:574
+msgid "Implemented XML validation/highlighting plus other small fixes."
 msgstr ""
 
-#. i18n: file ./catalogmanager/markpatternwidget.ui line 62
-#: rc.cpp:72
-#, no-c-format
-msgid "&Include templates"
+#: catalogmanager/main.cpp:206 kbabel/main.cpp:576
+msgid "Various validation plugins."
 msgstr ""
 
-#. i18n: file ./catalogmanager/markpatternwidget.ui line 70
-#: rc.cpp:75
-#, no-c-format
-msgid "Use &wildcards"
+#: catalogmanager/main.cpp:209 kbabel/main.cpp:579
+msgid "Sponsored development of KBabel for a while."
 msgstr ""
 
-#. i18n: file ./catalogmanager/validationoptions.ui line 32
-#: rc.cpp:84
-#, no-c-format
-msgid "Mark invalid as &fuzzy"
+#: catalogmanager/main.cpp:214 kbabel/main.cpp:581
+msgid "KBabel contains code from TQt"
 msgstr ""
 
-#. i18n: file ./catalogmanager/validationoptions.ui line 39
-#: rc.cpp:87
-#, no-c-format
-msgid ""
-"<qt>"
-"<p><b>Mark invalid as fuzzy</b>"
-"<p>\n"
-"<p>If you select this option, all items,\n"
-"which identifies the tool as invalid, will be\n"
-"marked as fuzzy and the resulting file\n"
-"will be saved.</p></qt>"
+#: kbabel/main.cpp:583
+msgid "String distance algorithm implementation"
 msgstr ""
 
-#. i18n: file ./catalogmanager/validationoptions.ui line 47
-#: rc.cpp:94
-#, no-c-format
-msgid "&Do not validate fuzzy"
+#: kbabel/main.cpp:585
+msgid "Error list for current entry, regexp data tool"
 msgstr ""
 
-#. i18n: file ./catalogmanager/validationoptions.ui line 52
-#: rc.cpp:97
-#, no-c-format
-msgid ""
-"<qt>"
-"<p><b>Do not validate fuzzy</b>"
-"<p>\n"
-"<p>If you select this option, all items\n"
-"marked as fuzzy will not be validated at all.</p></qt>"
+#: kbabel/main.cpp:587
+msgid "Word-by-word string difference algorithm implementation"
 msgstr ""
 
 #. i18n: file ./commonui/diffpreferences.ui line 25
-#: rc.cpp:102
+#: rc.cpp:3
 #, no-c-format
 msgid "Diff Source"
 msgstr ""
 
 #. i18n: file ./commonui/diffpreferences.ui line 41
-#: rc.cpp:105
+#: rc.cpp:6
 #, no-c-format
 msgid ""
 "<qt>"
@@ -3529,31 +2474,31 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./commonui/diffpreferences.ui line 52
-#: rc.cpp:121
+#: rc.cpp:22
 #, no-c-format
 msgid "Use &file"
 msgstr ""
 
 #. i18n: file ./commonui/diffpreferences.ui line 60
-#: rc.cpp:124
+#: rc.cpp:25
 #, no-c-format
 msgid "Use messages from &translation database"
 msgstr ""
 
 #. i18n: file ./commonui/diffpreferences.ui line 68
-#: rc.cpp:127
+#: rc.cpp:28
 #, no-c-format
 msgid "Use &msgstr from the same file"
 msgstr ""
 
 #. i18n: file ./commonui/diffpreferences.ui line 86
-#: rc.cpp:130
+#: rc.cpp:31
 #, no-c-format
 msgid "Base folder for diff files:"
 msgstr ""
 
 #. i18n: file ./commonui/diffpreferences.ui line 104
-#: rc.cpp:133
+#: rc.cpp:34
 #, no-c-format
 msgid ""
 "<qt><q><b>Base folder for diff files</b></q>\n"
@@ -3566,20 +2511,8 @@ msgid ""
 "the database are used for diffing.</p></qt>"
 msgstr ""
 
-#. i18n: file ./commonui/tdelisteditor.ui line 151
-#: rc.cpp:152
-#, no-c-format
-msgid "Up"
-msgstr "I fyny"
-
-#. i18n: file ./commonui/tdelisteditor.ui line 162
-#: rc.cpp:155
-#, no-c-format
-msgid "Down"
-msgstr "I Lawr"
-
 #. i18n: file ./commonui/projectwizardwidget.ui line 38
-#: rc.cpp:158
+#: rc.cpp:44
 #, no-c-format
 msgid ""
 "<font size=\"+1\">Welcome to Project Wizard!</font>\n"
@@ -3599,7 +2532,7 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./commonui/projectwizardwidget.ui line 66
-#: rc.cpp:174 rc.cpp:251
+#: rc.cpp:60 rc.cpp:137
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -3611,13 +2544,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./commonui/projectwizardwidget.ui line 74
-#: rc.cpp:181
+#: rc.cpp:67
 #, no-c-format
 msgid "&Language:"
 msgstr "&Iaith:"
 
 #. i18n: file ./commonui/projectwizardwidget.ui line 86
-#: rc.cpp:184 rc.cpp:206
+#: rc.cpp:70 rc.cpp:92
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -3631,13 +2564,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./commonui/projectwizardwidget.ui line 97
-#: rc.cpp:193
+#: rc.cpp:79
 #, no-c-format
 msgid "Project &name:"
 msgstr "Enw'r cy&waith:"
 
 #. i18n: file ./commonui/projectwizardwidget.ui line 110
-#: rc.cpp:196 rc.cpp:238
+#: rc.cpp:82 rc.cpp:124
 #, no-c-format
 msgid ""
 "<qt>"
@@ -3653,13 +2586,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./commonui/projectwizardwidget.ui line 135
-#: rc.cpp:215
+#: rc.cpp:101
 #, no-c-format
 msgid "Project &type:"
 msgstr "Math y c&ywaith:"
 
 #. i18n: file ./commonui/projectwizardwidget.ui line 158
-#: rc.cpp:218 rc.cpp:270
+#: rc.cpp:104 rc.cpp:156
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -3672,7 +2605,7 @@ msgid ""
 "</p>\n"
 "<p>Currently known types:\n"
 "<ul>\n"
-"<li><b>TDE</b>: K Desktop Environment Internalization project</li>\n"
+"<li><b>TDE</b>: Trinity Desktop Environment Internalization project</li>\n"
 "<li><b>GNOME</b>: GNOME Translation project</li>\n"
 "<li><b>Translation Robot</b>: Translation Project Robot</li>\n"
 "<li><b>Other</b>: Other kind of project. No tuning will be\n"
@@ -3683,37 +2616,37 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./commonui/projectwizardwidget.ui line 184
-#: rc.cpp:248
+#: rc.cpp:134
 #, no-c-format
 msgid "Configuration &file name:"
 msgstr ""
 
 #. i18n: file ./commonui/projectwizardwidget.ui line 200
-#: rc.cpp:258
+#: rc.cpp:144
 #, no-c-format
 msgid "TDE"
 msgstr "TDE"
 
 #. i18n: file ./commonui/projectwizardwidget.ui line 205
-#: rc.cpp:261
+#: rc.cpp:147
 #, no-c-format
 msgid "GNOME"
 msgstr "GNOME"
 
 #. i18n: file ./commonui/projectwizardwidget.ui line 210
-#: rc.cpp:264
+#: rc.cpp:150
 #, no-c-format
 msgid "Translation Project Robot"
 msgstr ""
 
 #. i18n: file ./commonui/projectwizardwidget.ui line 215
-#: rc.cpp:267
+#: rc.cpp:153
 #, no-c-format
 msgid "Other"
 msgstr "Arall"
 
 #. i18n: file ./commonui/projectwizardwidget2.ui line 18
-#: rc.cpp:290
+#: rc.cpp:176
 #, no-c-format
 msgid ""
 "<qt>"
@@ -3724,7 +2657,7 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./commonui/projectwizardwidget2.ui line 44
-#: rc.cpp:295
+#: rc.cpp:181
 #, no-c-format
 msgid ""
 "<font size=\"+1\">The Translation Files</font>\n"
@@ -3746,143 +2679,125 @@ msgid ""
 "will not work."
 msgstr ""
 
-#. i18n: file ./kbabel/fontpreferences.ui line 25
-#: rc.cpp:319
+#. i18n: file ./commonui/tdelisteditor.ui line 94
+#: rc.cpp:205 rc.cpp:861 rc.cpp:1246
 #, no-c-format
-msgid "Font for Messages"
-msgstr ""
+msgid "New Item"
+msgstr "Eitem Newydd"
 
-#. i18n: file ./kbabel/fontpreferences.ui line 36
-#: rc.cpp:322
+#. i18n: file ./commonui/tdelisteditor.ui line 151
+#: rc.cpp:214
 #, no-c-format
-msgid "&Show only fixed font"
-msgstr ""
+msgid "Up"
+msgstr "I fyny"
 
-#. i18n: file ./kbabel/kbabelui.rc line 58
-#: rc.cpp:340
+#. i18n: file ./commonui/tdelisteditor.ui line 162
+#: rc.cpp:217
 #, no-c-format
-msgid "&Spelling"
-msgstr "&Sillafu"
+msgid "Down"
+msgstr "I Lawr"
 
-#. i18n: file ./kbabel/kbabelui.rc line 68
-#: rc.cpp:343
+#. i18n: file ./kbabel/spelldlgwidget.ui line 24
+#: rc.cpp:220
 #, no-c-format
-msgid "D&iff"
-msgstr "D&iff"
+msgid "Choose What You Want to Spell Check"
+msgstr ""
 
-#. i18n: file ./kbabel/kbabelui.rc line 82
-#: rc.cpp:346
+#. i18n: file ./kbabel/spelldlgwidget.ui line 30
+#: rc.cpp:223 rc.cpp:235
 #, no-c-format
-msgid "&Dictionaries"
+msgid "Spell check only the current message."
 msgstr ""
 
-#. i18n: file ./kbabel/colorpreferences.ui line 41
-#: rc.cpp:364
+#. i18n: file ./kbabel/spelldlgwidget.ui line 41
+#: rc.cpp:226
 #, no-c-format
-msgid "&Background color:"
-msgstr "Lliw'r &cefndir:"
+msgid "A&ll messages"
+msgstr ""
 
-#. i18n: file ./kbabel/colorpreferences.ui line 52
-#: rc.cpp:367
+#. i18n: file ./kbabel/spelldlgwidget.ui line 44
+#: rc.cpp:229
 #, no-c-format
-msgid "Color for &quoted characters:"
+msgid "Spell check all translated messages of this file."
 msgstr ""
 
-#. i18n: file ./kbabel/colorpreferences.ui line 63
-#: rc.cpp:370
+#. i18n: file ./kbabel/spelldlgwidget.ui line 52
+#: rc.cpp:232
 #, no-c-format
-msgid "Color for &syntax errors:"
+msgid "C&urrent message only"
 msgstr ""
 
-#. i18n: file ./kbabel/colorpreferences.ui line 82
-#: rc.cpp:373
+#. i18n: file ./kbabel/spelldlgwidget.ui line 66
+#: rc.cpp:238
 #, no-c-format
-msgid "Color for s&pellcheck errors:"
+msgid "Fro&m beginning of current message to end of file"
 msgstr ""
 
-#. i18n: file ./kbabel/colorpreferences.ui line 97
-#: rc.cpp:376
+#. i18n: file ./kbabel/spelldlgwidget.ui line 74
+#: rc.cpp:241
 #, no-c-format
-msgid ""
-"<qt>Here you can setup a color to display identified <b>mispelled</b> "
-"words and\n"
-"phrases.</qt>"
+msgid "&From beginning of file to cursor position"
 msgstr ""
 
-#. i18n: file ./kbabel/colorpreferences.ui line 105
-#: rc.cpp:380
+#. i18n: file ./kbabel/spelldlgwidget.ui line 77
+#: rc.cpp:244
 #, no-c-format
-msgid "Color for &keyboard accelerators:"
+msgid ""
+"Spell check all text from the beginning of the file to the current cursor "
+"position."
 msgstr ""
 
-#. i18n: file ./kbabel/colorpreferences.ui line 132
-#: rc.cpp:383
+#. i18n: file ./kbabel/spelldlgwidget.ui line 85
+#: rc.cpp:247
 #, no-c-format
-msgid "Color for c-for&mat characters:"
+msgid "F&rom cursor position to end of file"
 msgstr ""
 
-#. i18n: file ./kbabel/colorpreferences.ui line 151
-#: rc.cpp:386
+#. i18n: file ./kbabel/spelldlgwidget.ui line 88
+#: rc.cpp:250
 #, no-c-format
-msgid "Color for &tags:"
+msgid ""
+"Spell check all text from the current cursor position to the end of the file."
 msgstr ""
 
-#. i18n: file ./kbabel/searchpreferences.ui line 39
-#: rc.cpp:389
+#. i18n: file ./kbabel/spelldlgwidget.ui line 96
+#: rc.cpp:253
 #, no-c-format
-msgid "Au&tomatically start search"
+msgid "S&elected text only"
 msgstr ""
 
-#. i18n: file ./kbabel/searchpreferences.ui line 49
-#: rc.cpp:392
+#. i18n: file ./kbabel/spelldlgwidget.ui line 99
+#: rc.cpp:256
 #, no-c-format
-msgid ""
-"<qt>"
-"<p><b>Automatically start search</b></p>\n"
-"<p>If this is activated, the search is automatically started \n"
-"whenever you switch to another entry in the editor. You can \n"
-"choose where to search with the combo box <b>Default Dictionary</b>.\n"
-"</p>"
-"<p>You can also start searching manually by choosing an entry in \n"
-"the popup menu that appears either when clicking \n"
-"<b>Dictionaries->Find...</b> or keeping the dictionary button \n"
-"in the toolbar pressed for a while.</p></qt>"
+msgid "Spell check only the selected text."
 msgstr ""
 
-#. i18n: file ./kbabel/searchpreferences.ui line 65
-#: rc.cpp:402
+#. i18n: file ./kbabel/spelldlgwidget.ui line 109
+#: rc.cpp:259
 #, no-c-format
-msgid "D&efault dictionary:"
+msgid "U&se this selection as default"
 msgstr ""
 
-#. i18n: file ./kbabel/searchpreferences.ui line 82
-#: rc.cpp:405
+#. i18n: file ./kbabel/spelldlgwidget.ui line 112
+#: rc.cpp:262
 #, no-c-format
-msgid ""
-"<qt>"
-"<p><b>Default Dictionary</b></p>\n"
-"<p>Choose here where to search as default. \n"
-"This setting is used when searching is started automatically \n"
-"or when pressing the dictionary button in the toolbar.</p>\n"
-"<p>You can configure the different dictionaries by selecting \n"
-"the desired dictionary from <b>Settings->Configure Dictionary</b>.\n"
-"</p></qt>"
+msgid "Check this, to store the current selection as default selection."
 msgstr ""
 
 #. i18n: file ./kbabel/headerwidget.ui line 43
-#: rc.cpp:417
+#: rc.cpp:268
 #, no-c-format
 msgid "&Header:"
 msgstr "P&ennawd :"
 
 #. i18n: file ./kbabel/editorpreferences.ui line 54
-#: rc.cpp:423
+#: rc.cpp:274
 #, no-c-format
 msgid "A&utomatically unset fuzzy status"
 msgstr ""
 
 #. i18n: file ./kbabel/editorpreferences.ui line 60
-#: rc.cpp:426
+#: rc.cpp:277
 #, no-c-format
 msgid ""
 "<qt>"
@@ -3894,13 +2809,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./kbabel/editorpreferences.ui line 68
-#: rc.cpp:432
+#: rc.cpp:283
 #, no-c-format
 msgid "Use cle&ver editing"
 msgstr ""
 
 #. i18n: file ./kbabel/editorpreferences.ui line 79
-#: rc.cpp:435
+#: rc.cpp:286
 #, no-c-format
 msgid ""
 "<qt>"
@@ -3916,13 +2831,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./kbabel/editorpreferences.ui line 89
-#: rc.cpp:446
+#: rc.cpp:297
 #, no-c-format
 msgid "Automatic Checks"
 msgstr ""
 
 #. i18n: file ./kbabel/editorpreferences.ui line 97
-#: rc.cpp:449
+#: rc.cpp:300
 #, no-c-format
 msgid ""
 "<qt>"
@@ -3935,55 +2850,55 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./kbabel/editorpreferences.ui line 113
-#: rc.cpp:457
+#: rc.cpp:308
 #, no-c-format
 msgid "&Beep on error"
 msgstr "&Canu ar gwall"
 
 #. i18n: file ./kbabel/editorpreferences.ui line 121
-#: rc.cpp:460
+#: rc.cpp:311
 #, no-c-format
 msgid "Change te&xt color on error"
 msgstr ""
 
 #. i18n: file ./kbabel/editorpreferences.ui line 150
-#: rc.cpp:463
+#: rc.cpp:314
 #, no-c-format
 msgid "A&ppearance"
 msgstr "&Golwg"
 
 #. i18n: file ./kbabel/editorpreferences.ui line 175
-#: rc.cpp:466
+#: rc.cpp:317
 #, no-c-format
 msgid "H&ighlight syntax"
 msgstr ""
 
 #. i18n: file ./kbabel/editorpreferences.ui line 183
-#: rc.cpp:469
+#: rc.cpp:320
 #, no-c-format
 msgid "Highlight backgrou&nd"
 msgstr ""
 
 #. i18n: file ./kbabel/editorpreferences.ui line 191
-#: rc.cpp:472
+#: rc.cpp:323
 #, no-c-format
 msgid "Mark &whitespaces with points"
 msgstr ""
 
 #. i18n: file ./kbabel/editorpreferences.ui line 199
-#: rc.cpp:475
+#: rc.cpp:326
 #, no-c-format
 msgid "&Show surrounding quotes"
 msgstr ""
 
 #. i18n: file ./kbabel/editorpreferences.ui line 209
-#: rc.cpp:478
+#: rc.cpp:329
 #, no-c-format
 msgid "Status LEDs"
 msgstr ""
 
 #. i18n: file ./kbabel/editorpreferences.ui line 213
-#: rc.cpp:481
+#: rc.cpp:332
 #, no-c-format
 msgid ""
 "<qt>"
@@ -3993,978 +2908,1520 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./kbabel/editorpreferences.ui line 224
-#: rc.cpp:485
+#: rc.cpp:336
 #, no-c-format
 msgid "Display in stat&usbar"
 msgstr ""
 
 #. i18n: file ./kbabel/editorpreferences.ui line 232
-#: rc.cpp:488
+#: rc.cpp:339
 #, no-c-format
 msgid "Display in edi&tor"
 msgstr ""
 
 #. i18n: file ./kbabel/editorpreferences.ui line 260
-#: rc.cpp:491 rc.cpp:512
+#: rc.cpp:342 rc.cpp:363
 #, no-c-format
 msgid "Colo&r:"
 msgstr "Lliw&:"
 
 #. i18n: file ./kbabel/editordiffpreferences.ui line 36
-#: rc.cpp:497
+#: rc.cpp:348
 #, no-c-format
 msgid "Added Characters"
 msgstr ""
 
 #. i18n: file ./kbabel/editordiffpreferences.ui line 44
-#: rc.cpp:500
+#: rc.cpp:351
 #, no-c-format
 msgid "Ho&w to display:"
 msgstr ""
 
 #. i18n: file ./kbabel/editordiffpreferences.ui line 55
-#: rc.cpp:503
+#: rc.cpp:354
 #, no-c-format
 msgid "Co&lor:"
 msgstr "&Lliw:"
 
 #. i18n: file ./kbabel/editordiffpreferences.ui line 66
-#: rc.cpp:506
+#: rc.cpp:357
 #, no-c-format
 msgid "Removed Characters"
 msgstr ""
 
 #. i18n: file ./kbabel/editordiffpreferences.ui line 74
-#: rc.cpp:509
+#: rc.cpp:360
 #, no-c-format
 msgid "How &to display:"
 msgstr ""
 
 #. i18n: file ./kbabel/editordiffpreferences.ui line 94
-#: rc.cpp:515 rc.cpp:521
+#: rc.cpp:366 rc.cpp:372
 #, no-c-format
 msgid "Highlighted"
 msgstr ""
 
 #. i18n: file ./kbabel/editordiffpreferences.ui line 99
-#: rc.cpp:518
+#: rc.cpp:369
 #, no-c-format
 msgid "Underlined"
 msgstr "Wedi'i Danllinellu"
 
 #. i18n: file ./kbabel/editordiffpreferences.ui line 129
-#: rc.cpp:524
+#: rc.cpp:375
 #, no-c-format
 msgid "Stroked Out"
 msgstr ""
 
-#. i18n: file ./kbabel/spelldlgwidget.ui line 24
-#: rc.cpp:527
+#. i18n: file ./kbabel/colorpreferences.ui line 41
+#: rc.cpp:378
 #, no-c-format
-msgid "Choose What You Want to Spell Check"
+msgid "&Background color:"
+msgstr "Lliw'r &cefndir:"
+
+#. i18n: file ./kbabel/colorpreferences.ui line 52
+#: rc.cpp:381
+#, no-c-format
+msgid "Color for &quoted characters:"
 msgstr ""
 
-#. i18n: file ./kbabel/spelldlgwidget.ui line 30
-#: rc.cpp:530 rc.cpp:542
+#. i18n: file ./kbabel/colorpreferences.ui line 63
+#: rc.cpp:384
 #, no-c-format
-msgid "Spell check only the current message."
+msgid "Color for &syntax errors:"
 msgstr ""
 
-#. i18n: file ./kbabel/spelldlgwidget.ui line 41
-#: rc.cpp:533
+#. i18n: file ./kbabel/colorpreferences.ui line 82
+#: rc.cpp:387
 #, no-c-format
-msgid "A&ll messages"
+msgid "Color for s&pellcheck errors:"
 msgstr ""
 
-#. i18n: file ./kbabel/spelldlgwidget.ui line 44
-#: rc.cpp:536
+#. i18n: file ./kbabel/colorpreferences.ui line 97
+#: rc.cpp:390
 #, no-c-format
-msgid "Spell check all translated messages of this file."
+msgid ""
+"<qt>Here you can setup a color to display identified <b>mispelled</b> "
+"words and\n"
+"phrases.</qt>"
 msgstr ""
 
-#. i18n: file ./kbabel/spelldlgwidget.ui line 52
-#: rc.cpp:539
+#. i18n: file ./kbabel/colorpreferences.ui line 105
+#: rc.cpp:394
 #, no-c-format
-msgid "C&urrent message only"
+msgid "Color for &keyboard accelerators:"
 msgstr ""
 
-#. i18n: file ./kbabel/spelldlgwidget.ui line 66
-#: rc.cpp:545
+#. i18n: file ./kbabel/colorpreferences.ui line 132
+#: rc.cpp:397
 #, no-c-format
-msgid "Fro&m beginning of current message to end of file"
+msgid "Color for c-for&mat characters:"
 msgstr ""
 
-#. i18n: file ./kbabel/spelldlgwidget.ui line 74
-#: rc.cpp:548
+#. i18n: file ./kbabel/colorpreferences.ui line 151
+#: rc.cpp:400
 #, no-c-format
-msgid "&From beginning of file to cursor position"
+msgid "Color for &tags:"
 msgstr ""
 
-#. i18n: file ./kbabel/spelldlgwidget.ui line 77
-#: rc.cpp:551
+#. i18n: file ./kbabel/kbabelui.rc line 29
+#: rc.cpp:409 rc.cpp:1171
 #, no-c-format
-msgid ""
-"Spell check all text from the beginning of the file to the current cursor "
-"position."
+msgid "&Go"
+msgstr "&Ewch"
+
+#. i18n: file ./kbabel/kbabelui.rc line 50
+#: rc.cpp:412 rc.cpp:1177
+#, no-c-format
+msgid "&Project"
+msgstr "&Cywaith"
+
+#. i18n: file ./kbabel/kbabelui.rc line 58
+#: rc.cpp:418
+#, no-c-format
+msgid "&Spelling"
+msgstr "&Sillafu"
+
+#. i18n: file ./kbabel/kbabelui.rc line 68
+#: rc.cpp:421
+#, no-c-format
+msgid "D&iff"
+msgstr "D&iff"
+
+#. i18n: file ./kbabel/kbabelui.rc line 82
+#: rc.cpp:424
+#, no-c-format
+msgid "&Dictionaries"
 msgstr ""
 
-#. i18n: file ./kbabel/spelldlgwidget.ui line 85
-#: rc.cpp:554
+#. i18n: file ./kbabel/kbabelui.rc line 100
+#: rc.cpp:436 rc.cpp:1195
 #, no-c-format
-msgid "F&rom cursor position to end of file"
+msgid "Main"
+msgstr "Prif"
+
+#. i18n: file ./kbabel/kbabelui.rc line 113
+#: rc.cpp:439 rc.cpp:1198
+#, no-c-format
+msgid "Navigationbar"
 msgstr ""
 
-#. i18n: file ./kbabel/spelldlgwidget.ui line 88
-#: rc.cpp:557
+#. i18n: file ./kbabel/searchpreferences.ui line 39
+#: rc.cpp:442
+#, no-c-format
+msgid "Au&tomatically start search"
+msgstr ""
+
+#. i18n: file ./kbabel/searchpreferences.ui line 49
+#: rc.cpp:445
 #, no-c-format
 msgid ""
-"Spell check all text from the current cursor position to the end of the file."
+"<qt>"
+"<p><b>Automatically start search</b></p>\n"
+"<p>If this is activated, the search is automatically started \n"
+"whenever you switch to another entry in the editor. You can \n"
+"choose where to search with the combo box <b>Default Dictionary</b>.\n"
+"</p>"
+"<p>You can also start searching manually by choosing an entry in \n"
+"the popup menu that appears either when clicking \n"
+"<b>Dictionaries->Find...</b> or keeping the dictionary button \n"
+"in the toolbar pressed for a while.</p></qt>"
 msgstr ""
 
-#. i18n: file ./kbabel/spelldlgwidget.ui line 96
-#: rc.cpp:560
+#. i18n: file ./kbabel/searchpreferences.ui line 65
+#: rc.cpp:455
 #, no-c-format
-msgid "S&elected text only"
+msgid "D&efault dictionary:"
 msgstr ""
 
-#. i18n: file ./kbabel/spelldlgwidget.ui line 99
-#: rc.cpp:563
+#. i18n: file ./kbabel/searchpreferences.ui line 82
+#: rc.cpp:458
 #, no-c-format
-msgid "Spell check only the selected text."
+msgid ""
+"<qt>"
+"<p><b>Default Dictionary</b></p>\n"
+"<p>Choose here where to search as default. \n"
+"This setting is used when searching is started automatically \n"
+"or when pressing the dictionary button in the toolbar.</p>\n"
+"<p>You can configure the different dictionaries by selecting \n"
+"the desired dictionary from <b>Settings->Configure Dictionary</b>.\n"
+"</p></qt>"
 msgstr ""
 
-#. i18n: file ./kbabel/spelldlgwidget.ui line 109
-#: rc.cpp:566
+#. i18n: file ./kbabel/fontpreferences.ui line 25
+#: rc.cpp:467
 #, no-c-format
-msgid "U&se this selection as default"
+msgid "Font for Messages"
 msgstr ""
 
-#. i18n: file ./kbabel/spelldlgwidget.ui line 112
-#: rc.cpp:569
+#. i18n: file ./kbabel/fontpreferences.ui line 36
+#: rc.cpp:470
 #, no-c-format
-msgid "Check this, to store the current selection as default selection."
+msgid "&Show only fixed font"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/tmx/pwidget.ui line 30
-#: rc.cpp:572 rc.cpp:602
+#: rc.cpp:473 rc.cpp:503
 #, no-c-format
 msgid "&Path to Compendium File"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/tmx/pwidget.ui line 85
-#: rc.cpp:578 rc.cpp:611
+#: rc.cpp:479 rc.cpp:512
 #, no-c-format
 msgid "Onl&y whole words"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/tmx/pwidget.ui line 93
-#: rc.cpp:581 rc.cpp:614
+#: rc.cpp:482 rc.cpp:515
 #, no-c-format
 msgid "Case sensiti&ve"
 msgstr "Llythrennau &mawr/bach o bwys"
 
 #. i18n: file ./kbabeldict/modules/tmx/pwidget.ui line 103
-#: rc.cpp:584 rc.cpp:617
+#: rc.cpp:485 rc.cpp:518
 #, no-c-format
 msgid "A text matches if:"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/tmx/pwidget.ui line 125
-#: rc.cpp:587 rc.cpp:620
+#: rc.cpp:488 rc.cpp:521
 #, no-c-format
 msgid "E&qual to searched text"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/tmx/pwidget.ui line 133
-#: rc.cpp:590 rc.cpp:623
+#: rc.cpp:491 rc.cpp:524
 #, no-c-format
 msgid "Contains a &word of searched text"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/tmx/pwidget.ui line 141
-#: rc.cpp:593 rc.cpp:626
+#: rc.cpp:494 rc.cpp:527
 #, no-c-format
 msgid "Co&ntained in searched text"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/tmx/pwidget.ui line 149
-#: rc.cpp:596 rc.cpp:629
+#: rc.cpp:497 rc.cpp:530
 #, no-c-format
 msgid "&Similar to searched text"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/tmx/pwidget.ui line 157
-#: rc.cpp:599 rc.cpp:632
+#: rc.cpp:500 rc.cpp:533
 #, no-c-format
 msgid "Contains searched te&xt"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/pocompendium/pwidget.ui line 102
-#: rc.cpp:608
+#: rc.cpp:509
 #, no-c-format
 msgid "Ignore &fuzzy strings"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 28
-#: rc.cpp:635
+#. i18n: file ./kbabeldict/modules/poauxiliary/pwidget.ui line 39
+#: rc.cpp:536
 #, no-c-format
-msgid "General"
-msgstr "Cyffredinol"
+msgid "&Path to auxiliary file:"
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/poauxiliary/pwidget.ui line 61
+#: rc.cpp:539
+#, no-c-format
+msgid "&Ignore fuzzy entries"
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/poauxiliary/pwidget.ui line 78
+#: rc.cpp:542
+#, no-c-format
+msgid ""
+"<qt>"
+"<p>\n"
+"The following variables will be replaced in the path if available:\n"
+"<ul>\n"
+"<li><b>@PACKAGE@</b>: the name of the currently translated application or "
+"package</li>\n"
+"<li><b>@LANG@</b>: the language code</li>\n"
+"<li><b>@DIR<em>n</em>@</b>: where n is a positive integer. This expands to the "
+"nth folder counted from the filename</li>\n"
+"</ul></p></qt>"
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 38
+#: rc.cpp:551 rc.cpp:719 rc.cpp:963 rc.cpp:1131
+#, no-c-format
+msgid "Generic"
+msgstr "Generig"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 55
+#: rc.cpp:554 rc.cpp:966
+#, no-c-format
+msgid "Search Mode"
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 72
+#: rc.cpp:557 rc.cpp:969
+#, no-c-format
+msgid "Search in whole database (slow)"
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 77
+#: rc.cpp:560 rc.cpp:972
+#, no-c-format
+msgid ""
+"<qml>Scroll the whole database and return everything that matches \n"
+"according to the rules defined in tabs <strong> Generic </strong>\n"
+"and <strong>Match</strong>"
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 85
+#: rc.cpp:565 rc.cpp:977
+#, no-c-format
+msgid "Search in list of \"good keys\" (best)"
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 92
+#: rc.cpp:568 rc.cpp:980
+#, no-c-format
+msgid ""
+"<qml>Search in a list of <em>good keys</em> (see <strong>Good keys</strong> "
+"tab) with rules defined in <strong>Search</strong> tab.\n"
+"This is the best way to search because the <em>good keys</em> "
+"list probably contains all the keys that match with your query. However, it is "
+"smaller than the whole database."
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 100
+#: rc.cpp:572 rc.cpp:984
+#, no-c-format
+msgid "Return the list of \"good keys\" (fast)"
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 103
+#: rc.cpp:575 rc.cpp:987
+#, no-c-format
+msgid ""
+"<qml>Returns the whole <em>good keys</em> list. Rules defined in <strong>"
+"Search</strong> tab are ignored."
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 113
+#: rc.cpp:578 rc.cpp:990
+#, no-c-format
+msgid "Case sensitive"
+msgstr "Llythrennau mawr/bach o bwys"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 116
+#: rc.cpp:581 rc.cpp:993
+#, no-c-format
+msgid ""
+"<qml>If it is checked the search will be case sensitive. It is ignored if you "
+"use <em>Return the list of \"good keys\"</em> search mode."
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 124
+#: rc.cpp:584 rc.cpp:996
+#, no-c-format
+msgid "Normalize white space"
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 131
+#: rc.cpp:587 rc.cpp:999
+#, no-c-format
+msgid ""
+"Remove white spaces at the beginning and at the end of the phrase.\n"
+"It also substitutes groups of more than one space character with only one space "
+"character."
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 139
+#: rc.cpp:591 rc.cpp:1003
+#, no-c-format
+msgid "Remove context comment"
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 145
+#: rc.cpp:594 rc.cpp:1006
+#, no-c-format
+msgid "Remove, if exists, the _:comment"
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 167
+#: rc.cpp:597 rc.cpp:1009
+#, no-c-format
+msgid "Character to be ignored:"
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 209
+#: rc.cpp:600 rc.cpp:1012
+#, no-c-format
+msgid "Search"
+msgstr "Chwilio"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 226
+#: rc.cpp:603 rc.cpp:1015
+#, no-c-format
+msgid "Matching Method"
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 277
+#: rc.cpp:606 rc.cpp:1018
+#, no-c-format
+msgid "Query is contained"
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 280
+#: rc.cpp:609 rc.cpp:1021
+#, no-c-format
+msgid "Match if query is contained in database string"
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 288
+#: rc.cpp:612 rc.cpp:1024
+#, no-c-format
+msgid "Query contains"
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 291
+#: rc.cpp:615 rc.cpp:1027
+#, no-c-format
+msgid "Match if query contains the database string"
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 299
+#: rc.cpp:618 rc.cpp:1030
+#, no-c-format
+msgid "Normal text"
+msgstr "Testun arferol"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 305
+#: rc.cpp:621 rc.cpp:1033
+#, no-c-format
+msgid "Consider the search string as normal text."
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 313
+#: rc.cpp:624 rc.cpp:1036
+#, no-c-format
+msgid "Equal"
+msgstr "Yn gyfartal i"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 322
+#: rc.cpp:627 rc.cpp:1039
+#, no-c-format
+msgid "Match if query and database string are equal"
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 347
+#: rc.cpp:630 rc.cpp:1042
+#, no-c-format
+msgid "Regular expression"
+msgstr "Mynegiad rheolaidd"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 350
+#: rc.cpp:633 rc.cpp:1045
+#, no-c-format
+msgid "Consider the search string as a regular expression"
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 360
+#: rc.cpp:636 rc.cpp:1048
+#, no-c-format
+msgid "Word Substitution"
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 365
+#: rc.cpp:639 rc.cpp:1051
+#, no-c-format
+msgid ""
+"<qml>If you use one or two <em>word substitution</em> "
+"each time you search a phrase with less than the specified number of words, the "
+"search engine will also search for all phrases that differ from the original "
+"one in one or two words."
+"<p>\n"
+"<strong>Example:</strong>"
+"<br>\n"
+"If you search for <em>My name is Andrea</em> and you have activated <em>"
+"one word substitution</em> you may also find phrases like <em>"
+"My name is Joe</em> or <em>Your name is Andrea</em>."
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 399
+#: rc.cpp:644 rc.cpp:1056
+#, no-c-format
+msgid "Use one word substitution"
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 430
+#: rc.cpp:647 rc.cpp:653 rc.cpp:1059 rc.cpp:1065
+#, no-c-format
+msgid "Max number of words in the query:"
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 455
+#: rc.cpp:650 rc.cpp:1062
+#, no-c-format
+msgid "Use two word substitution"
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 488
+#: rc.cpp:656 rc.cpp:1068
+#, no-c-format
+msgid "[A-Za-z0-9_%"
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 506
+#: rc.cpp:659 rc.cpp:1071
+#, no-c-format
+msgid "]"
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 516
+#: rc.cpp:662 rc.cpp:1074
+#, no-c-format
+msgid "Local characters for regular expressions:"
+msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 39
-#: rc.cpp:638 rc.cpp:956 rc.cpp:1161
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 553
+#: rc.cpp:665 rc.cpp:759 rc.cpp:1077
 #, no-c-format
 msgid "Database"
 msgstr "Cronfa ddata"
 
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 570
+#: rc.cpp:668 rc.cpp:1080
+#, no-c-format
+msgid "Database folder:"
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 586
+#: rc.cpp:671 rc.cpp:1083
+#, no-c-format
+msgid "Auto add entry to database"
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 592
+#: rc.cpp:674 rc.cpp:1086
+#, no-c-format
+msgid ""
+"Automatically add an entry to the database if a new translation is notified by "
+"someone (may be kbabel)"
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 614
+#: rc.cpp:677 rc.cpp:1089
+#, no-c-format
+msgid "Auto added entry author:"
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 622
+#: rc.cpp:680 rc.cpp:1092
+#, no-c-format
+msgid ""
+"<qml>Put here the name and email address that you want to use as <em>"
+"last translator</em> filed when you auto-add entry to the database (e.g. when "
+"you modify a translation with kbabel)."
+"<p>"
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 632
+#: rc.cpp:683
+#, no-c-format
+msgid "Scan Single PO File..."
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 640
+#: rc.cpp:686
+#, no-c-format
+msgid "Scan Folder..."
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 648
+#: rc.cpp:689
+#, no-c-format
+msgid "Scan Folder && Subfolders..."
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 670
+#: rc.cpp:692 rc.cpp:1104
+#, no-c-format
+msgid "Scanning file:"
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 678
+#: rc.cpp:695 rc.cpp:1107
+#, no-c-format
+msgid "Entries added:"
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 719
+#: rc.cpp:698 rc.cpp:1110
+#, no-c-format
+msgid "Total progress:"
+msgstr "Cyfanswm cynnydd :"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 727
+#: rc.cpp:701 rc.cpp:1113
+#, no-c-format
+msgid "Processing file:"
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 763
+#: rc.cpp:704 rc.cpp:1116
+#, no-c-format
+msgid "Loading file:"
+msgstr "Llwytho ffeil:"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 776
+#: rc.cpp:707 rc.cpp:1119
+#, no-c-format
+msgid "Export..."
+msgstr "Allforio..."
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 787
+#: catalogmanager/catalogmanagerview.cpp:795 rc.cpp:710 rc.cpp:1122
+#, no-c-format
+msgid "Statistics"
+msgstr "Ystadegau"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 795
+#: rc.cpp:713 rc.cpp:1125
+#, no-c-format
+msgid "Repeated Strings"
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 805
+#: rc.cpp:716 rc.cpp:1128
+#, no-c-format
+msgid "Good Keys"
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 829
+#: rc.cpp:722 rc.cpp:1134
+#, no-c-format
+msgid ""
+"<qml>Here you can define how to fill the <em>good keys list</em>."
+"<p>\n"
+"You can set the minimum number of words of the query that a key must have to be "
+"inserted in the <em>good keys list</em>."
+"<p>\n"
+"You can also set the minimum number of words of the key that the query must "
+"have to insert the key in the list."
+"<p>\n"
+"These two numbers are the percentage of the total number of words. If the "
+"result of this percentage is less than one, the engine will set it to one."
+"<p>\n"
+"Finally you can set the maximum number of entries in the list."
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 846
+#: rc.cpp:729 rc.cpp:1141
+#, no-c-format
+msgid "Minimum number of words of the key also in the query (%):"
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 871
+#: rc.cpp:732 rc.cpp:738 rc.cpp:1144 rc.cpp:1150
+#, no-c-format
+msgid "%"
+msgstr "%"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 885
+#: rc.cpp:735 rc.cpp:1147
+#, no-c-format
+msgid "Minimum number of query words in the key (%):"
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 918
+#: rc.cpp:741 rc.cpp:1153
+#, no-c-format
+msgid "Max list length:"
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 942
+#: rc.cpp:744 rc.cpp:1156
+#, no-c-format
+msgid "Frequent Words"
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 959
+#: rc.cpp:747 rc.cpp:1159
+#, no-c-format
+msgid "Discard words more frequent than:"
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 967
+#: rc.cpp:750 rc.cpp:1162
+#, no-c-format
+msgid "/10000"
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 984
+#: rc.cpp:753 rc.cpp:1165
+#, no-c-format
+msgid "Frequent words are considered as in every key"
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 28
+#: rc.cpp:756
+#, no-c-format
+msgid "General"
+msgstr "Cyffredinol"
+
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 50
-#: rc.cpp:641
+#: rc.cpp:762
 #, no-c-format
 msgid "DB folder:"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 63
-#: rc.cpp:644
+#: rc.cpp:765
 #, no-c-format
 msgid "Automatic update in kbabel"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 73
-#: rc.cpp:647
+#: rc.cpp:768
 #, no-c-format
 msgid "New Entries"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 84
-#: kbabeldict/kbabeldictbox.cpp:1268 rc.cpp:650
+#: kbabeldict/kbabeldictbox.cpp:1268 rc.cpp:771
 #, no-c-format
 msgid "Author:"
 msgstr "Awdur:"
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 92
-#: rc.cpp:653
+#: rc.cpp:774
 #, no-c-format
 msgid "From kbabel"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 126
-#: rc.cpp:656
+#: rc.cpp:777
 #, no-c-format
 msgid "Algorithm"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 137
-#: rc.cpp:659
+#: rc.cpp:780
 #, no-c-format
 msgid "Minimum score:"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 176
-#: rc.cpp:662
+#: rc.cpp:783
 #, no-c-format
 msgid "Algorithms to Use"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 187
-#: rc.cpp:665 rc.cpp:668 rc.cpp:686 rc.cpp:689 rc.cpp:692 rc.cpp:695
-#: rc.cpp:698
+#: rc.cpp:786 rc.cpp:789 rc.cpp:807 rc.cpp:810 rc.cpp:813 rc.cpp:816
+#: rc.cpp:819
 #, no-c-format
 msgid "Score:"
 msgstr "Sgôr :"
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 213
-#: rc.cpp:671
+#: rc.cpp:792
 #, no-c-format
 msgid "Fuzzy sentence archive"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 221
-#: rc.cpp:674
+#: rc.cpp:795
 #, no-c-format
 msgid "Glossary"
 msgstr "Geirfa"
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 229
-#: rc.cpp:677
+#: rc.cpp:798
 #, no-c-format
 msgid "Exact "
 msgstr "Union "
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 252
-#: rc.cpp:680
+#: rc.cpp:801
 #, no-c-format
 msgid "Sentence by sentence"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 260
-#: rc.cpp:683
+#: rc.cpp:804
 #, no-c-format
 msgid "Alphanumeric"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 313
-#: rc.cpp:701
+#: rc.cpp:822
 #, no-c-format
 msgid "Word by word"
 msgstr "Fesul gair"
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 321
-#: rc.cpp:704
+#: rc.cpp:825
 #, no-c-format
 msgid "Dynamic dictionary"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 336
-#: rc.cpp:707
+#: rc.cpp:828
 #, no-c-format
 msgid "Preferred number of results:"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 356
-#: rc.cpp:710
+#: rc.cpp:831
 #, no-c-format
 msgid "Output"
 msgstr "Allbwn"
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 367
-#: rc.cpp:713
+#: rc.cpp:834
 #, no-c-format
 msgid "Output Processing"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 395
-#: rc.cpp:716
+#: rc.cpp:837
 #, no-c-format
 msgid "First capital letter match"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 403
-#: rc.cpp:719
+#: rc.cpp:840
 #, no-c-format
 msgid "All capital letter match"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 411
-#: rc.cpp:722
+#: rc.cpp:843
 #, no-c-format
 msgid "Accelerator symbol (&&)"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 419
-#: rc.cpp:725
+#: rc.cpp:846
 #, no-c-format
 msgid "Try to use same letter"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 429
-#: rc.cpp:728
+#: rc.cpp:849
 #, no-c-format
 msgid "Custom Rules"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 440
-#: rc.cpp:731
+#: rc.cpp:852
 #, no-c-format
 msgid "Original string regexp:"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 451
-#: rc.cpp:734
+#: rc.cpp:855
 #, no-c-format
 msgid "Enabled"
 msgstr "Alluogir"
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 462
-#: rc.cpp:737
+#: rc.cpp:858
 #, no-c-format
 msgid "Description"
 msgstr "Disgrifiad"
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 527
-#: rc.cpp:749
+#: rc.cpp:870
 #, no-c-format
 msgid "Replace string:"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 545
-#: rc.cpp:752
+#: rc.cpp:873
 #, no-c-format
 msgid "Translated regexp(search):"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 583
-#: rc.cpp:761
+#: rc.cpp:882
 #, no-c-format
 msgid "Check language"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 599
-#: rc.cpp:764
+#: rc.cpp:885
 #, no-c-format
 msgid "Use current filters"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 615
-#: rc.cpp:767
+#: rc.cpp:888
 #, no-c-format
 msgid "Set date to today"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 624
-#: rc.cpp:770
+#: rc.cpp:891
 #, no-c-format
 msgid "Sources"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 651
-#: rc.cpp:779
+#: rc.cpp:900
 #, no-c-format
 msgid "Scan Now"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 684
-#: rc.cpp:785
+#: rc.cpp:906
 #, no-c-format
 msgid "Scan All"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 701
-#: rc.cpp:788
+#: rc.cpp:909
 #, no-c-format
 msgid "Filters"
 msgstr "Hidlenni"
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 16
-#: rc.cpp:791
+#: rc.cpp:912
 #, no-c-format
 msgid "Edit Source"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 60
-#: rc.cpp:800
+#: rc.cpp:921
 #, no-c-format
 msgid "Additional Informations"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 133
-#: rc.cpp:806
+#: rc.cpp:927
 #, no-c-format
 msgid "Project name:"
 msgstr "Enw'r cywaith:"
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 149
-#: rc.cpp:809
+#: rc.cpp:930
 #, no-c-format
 msgid "Project keywords:"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 158
-#: rc.cpp:812
+#: rc.cpp:933
 #, no-c-format
 msgid "General Info"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 172
-#: rc.cpp:815
+#: rc.cpp:936
 #, no-c-format
 msgid "Single File"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 177
-#: rc.cpp:818
+#: rc.cpp:939
 #, no-c-format
 msgid "Single Folder"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 182
-#: rc.cpp:821
+#: rc.cpp:942
 #, no-c-format
 msgid "Recursive Folder"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 194
-#: rc.cpp:824
+#: rc.cpp:945
 #, no-c-format
 msgid "Source name:"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 207
-#: rc.cpp:827
+#: rc.cpp:948
 #, no-c-format
 msgid "Type:"
 msgstr "Math:"
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 215
-#: rc.cpp:830
+#: rc.cpp:951
 #, no-c-format
 msgid "Setup Filter..."
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 223
-#: rc.cpp:833
+#: rc.cpp:954
 #, no-c-format
 msgid "Location:"
 msgstr "Lleoliad:"
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 231
-#: rc.cpp:836
+#: rc.cpp:957
 #, no-c-format
 msgid "Use filter"
 msgstr "Defnyddiwch hidlen"
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 17
-#: rc.cpp:839
+#: rc.cpp:960
 #, no-c-format
 msgid "DBSEPrefWidget"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 41
-#: rc.cpp:842 rc.cpp:1010 rc.cpp:1047 rc.cpp:1215
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 635
+#: rc.cpp:1095
 #, no-c-format
-msgid "Generic"
-msgstr "Generig"
+msgid "Scan Single PO File"
+msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 58
-#: rc.cpp:845 rc.cpp:1050
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 643
+#: rc.cpp:1098
 #, no-c-format
-msgid "Search Mode"
+msgid "Scan Folder"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 75
-#: rc.cpp:848 rc.cpp:1053
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 651
+#: rc.cpp:1101
 #, no-c-format
-msgid "Search in whole database (slow)"
+msgid "Scan Folder && Subfolders"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 80
-#: rc.cpp:851 rc.cpp:1056
+#. i18n: file ./catalogmanager/catalogmanagerui.rc line 30
+#: rc.cpp:1174
 #, no-c-format
-msgid ""
-"<qml>Scroll the whole database and return everything that matches \n"
-"according to the rules defined in tabs <strong> Generic </strong>\n"
-"and <strong>Match</strong>"
+msgid "&Markings"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 88
-#: rc.cpp:856 rc.cpp:1061
+#. i18n: file ./catalogmanager/catalogmanagerui.rc line 60
+#: rc.cpp:1183 rc.cpp:1201 rc.cpp:1207
 #, no-c-format
-msgid "Search in list of \"good keys\" (best)"
+msgid "CVS"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 95
-#: rc.cpp:859 rc.cpp:1064
+#. i18n: file ./catalogmanager/catalogmanagerui.rc line 78
+#: catalogmanager/future.cpp:4 rc.cpp:1186 rc.cpp:1204 rc.cpp:1210
 #, no-c-format
-msgid ""
-"<qml>Search in a list of <em>good keys</em> (see <strong>Good keys</strong> "
-"tab) with rules defined in <strong>Search</strong> tab.\n"
-"This is the best way to search because the <em>good keys</em> "
-"list probably contains all the keys that match with your query. However, it is "
-"smaller than the whole database."
+msgid "SVN"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 103
-#: rc.cpp:863 rc.cpp:1068
+#. i18n: file ./catalogmanager/markpatternwidget.ui line 24
+#: rc.cpp:1213
 #, no-c-format
-msgid "Return the list of \"good keys\" (fast)"
+msgid "To be set dynamically:"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 106
-#: rc.cpp:866 rc.cpp:1071
+#. i18n: file ./catalogmanager/markpatternwidget.ui line 62
+#: rc.cpp:1222
 #, no-c-format
-msgid ""
-"<qml>Returns the whole <em>good keys</em> list. Rules defined in <strong>"
-"Search</strong> tab are ignored."
+msgid "&Include templates"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 116
-#: rc.cpp:869 rc.cpp:1074
+#. i18n: file ./catalogmanager/markpatternwidget.ui line 70
+#: rc.cpp:1225
 #, no-c-format
-msgid "Case sensitive"
-msgstr "Llythrennau mawr/bach o bwys"
+msgid "Use &wildcards"
+msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 119
-#: rc.cpp:872 rc.cpp:1077
+#. i18n: file ./catalogmanager/validateprogresswidget.ui line 38
+#: kbabeldict/kbabeldictbox.cpp:208 rc.cpp:1234
 #, no-c-format
-msgid ""
-"<qml>If it is checked the search will be case sensitive. It is ignored if you "
-"use <em>Return the list of \"good keys\"</em> search mode."
-msgstr ""
+msgid "Current:"
+msgstr "Cyfredol:"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 127
-#: rc.cpp:875 rc.cpp:1080
+#. i18n: file ./catalogmanager/validateprogresswidget.ui line 59
+#: rc.cpp:1237
 #, no-c-format
-msgid "Normalize white space"
+msgid "Overall:"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 134
-#: rc.cpp:878 rc.cpp:1083
+#. i18n: file ./catalogmanager/validateprogresswidget.ui line 80
+#: rc.cpp:1240
 #, no-c-format
-msgid ""
-"Remove white spaces at the beginning and at the end of the phrase.\n"
-"It also substitutes groups of more than one space character with only one space "
-"character."
+msgid "Current file:"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 142
-#: rc.cpp:882 rc.cpp:1087
+#. i18n: file ./catalogmanager/validateprogresswidget.ui line 88
+#: rc.cpp:1243
 #, no-c-format
-msgid "Remove context comment"
+msgid "Validation:"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 148
-#: rc.cpp:885 rc.cpp:1090
+#. i18n: file ./catalogmanager/validationoptions.ui line 32
+#: rc.cpp:1249
 #, no-c-format
-msgid "Remove, if exists, the _:comment"
+msgid "Mark invalid as &fuzzy"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 170
-#: rc.cpp:888 rc.cpp:1093
+#. i18n: file ./catalogmanager/validationoptions.ui line 39
+#: rc.cpp:1252
 #, no-c-format
-msgid "Character to be ignored:"
+msgid ""
+"<qt>"
+"<p><b>Mark invalid as fuzzy</b>"
+"<p>\n"
+"<p>If you select this option, all items,\n"
+"which identifies the tool as invalid, will be\n"
+"marked as fuzzy and the resulting file\n"
+"will be saved.</p></qt>"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 212
-#: rc.cpp:891 rc.cpp:1096
+#. i18n: file ./catalogmanager/validationoptions.ui line 47
+#: rc.cpp:1259
 #, no-c-format
-msgid "Search"
-msgstr "Chwilio"
+msgid "&Do not validate fuzzy"
+msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 229
-#: rc.cpp:894 rc.cpp:1099
+#. i18n: file ./catalogmanager/validationoptions.ui line 52
+#: rc.cpp:1262
 #, no-c-format
-msgid "Matching Method"
+msgid ""
+"<qt>"
+"<p><b>Do not validate fuzzy</b>"
+"<p>\n"
+"<p>If you select this option, all items\n"
+"marked as fuzzy will not be validated at all.</p></qt>"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 280
-#: rc.cpp:897 rc.cpp:1102
-#, no-c-format
-msgid "Query is contained"
+#: kbabeldict/aboutmoduledlg.cpp:42
+msgid "Report Bug..."
+msgstr "Anfon adroddiad nam..."
+
+#: kbabeldict/kbabeldictview.cpp:83
+msgid "Search in module:"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 283
-#: rc.cpp:900 rc.cpp:1105
-#, no-c-format
-msgid "Match if query is contained in database string"
+#: kbabeldict/kbabeldictview.cpp:106
+msgid "&Start Search"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 291
-#: rc.cpp:903 rc.cpp:1108
-#, no-c-format
-msgid "Query contains"
+#: kbabeldict/kbabeldictview.cpp:108
+msgid "Sea&rch in translations"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 294
-#: rc.cpp:906 rc.cpp:1111
-#, no-c-format
-msgid "Match if query contains the database string"
+#: kbabeldict/kbabeldictview.cpp:125
+msgid "Settings:"
+msgstr "Gosodiadau :"
+
+#: kbabeldict/modules/tmx/pc_factory.cpp:95
+#: kbabeldict/modules/tmx/tmxcompendium.cpp:175
+msgid "TMX Compendium"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 302
-#: rc.cpp:909 rc.cpp:1114
-#, no-c-format
-msgid "Normal text"
-msgstr "Testun arferol"
+#: kbabeldict/modules/pocompendium/compendiumdata.cpp:79
+#: kbabeldict/modules/pocompendium/pocompendium.cpp:1195
+#: kbabeldict/modules/tmx/tmxcompendium.cpp:957
+msgid "Loading PO compendium"
+msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 308
-#: rc.cpp:912 rc.cpp:1117
-#, no-c-format
-msgid "Consider the search string as normal text."
+#: kbabeldict/modules/tmx/preferenceswidget.cpp:88
+msgid ""
+"<qt>"
+"<p><b>Parameters</b></p>"
+"<p>Here you can fine-tune searching within the PO file. For example, if you "
+"want to perform a case sensitive search.</p></qt>"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 316
-#: rc.cpp:915 rc.cpp:1120
-#, no-c-format
-msgid "Equal"
-msgstr "Yn gyfartal i"
+#: kbabeldict/modules/pocompendium/preferenceswidget.cpp:96
+#: kbabeldict/modules/tmx/preferenceswidget.cpp:94
+msgid ""
+"<qt>"
+"<p><b>Comparison Options</b></p>"
+"<p>Choose here which messages you want to have treated as a matching "
+"message.</p></qt>"
+msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 325
-#: rc.cpp:918 rc.cpp:1123
-#, no-c-format
-msgid "Match if query and database string are equal"
+#: kbabeldict/modules/pocompendium/preferenceswidget.cpp:104
+#: kbabeldict/modules/tmx/preferenceswidget.cpp:102
+msgid ""
+"<qt>"
+"<p><b>3-Gram-matching</b></p>"
+"<p>A message matches another if most of its 3-letter groups are contained in "
+"the other message. e.g. 'abc123' matches 'abcx123c12'.</p></qt>"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 350
-#: rc.cpp:921 rc.cpp:1126
-#, no-c-format
-msgid "Regular expression"
-msgstr "Mynegiad rheolaidd"
+#: kbabeldict/modules/pocompendium/preferenceswidget.cpp:109
+#: kbabeldict/modules/tmx/preferenceswidget.cpp:107
+msgid ""
+"<qt>"
+"<p><b>Location</b></p>"
+"<p>Configure here which file is to be used for searching.</p></qt>"
+msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 353
-#: rc.cpp:924 rc.cpp:1129
-#, no-c-format
-msgid "Consider the search string as a regular expression"
+#: kbabeldict/modules/tmx/tmxcompendiumdata.cpp:80
+msgid "Loading TMX compendium"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 363
-#: rc.cpp:927 rc.cpp:1132
-#, no-c-format
-msgid "Word Substitution"
+#: kbabeldict/modules/tmx/tmxcompendiumdata.cpp:92
+#: kbabeldict/modules/tmx/tmxcompendiumdata.cpp:102
+msgid "Cannot open the file."
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 368
-#: rc.cpp:930 rc.cpp:1135
-#, no-c-format
+#: kbabeldict/modules/tmx/tmxcompendiumdata.cpp:96
+msgid "Cannot parse XML data."
+msgstr ""
+
+#: kbabeldict/modules/tmx/tmxcompendiumdata.cpp:111
+msgid "Unsupported format."
+msgstr ""
+
+#: kbabeldict/modules/tmx/tmxcompendiumdata.cpp:117
 msgid ""
-"<qml>If you use one or two <em>word substitution</em> "
-"each time you search a phrase with less than the specified number of words, the "
-"search engine will also search for all phrases that differ from the original "
-"one in one or two words."
-"<p>\n"
-"<strong>Example:</strong>"
-"<br>\n"
-"If you search for <em>My name is Andrea</em> and you have activated <em>"
-"one word substitution</em> you may also find phrases like <em>"
-"My name is Joe</em> or <em>Your name is Andrea</em>."
+"Error while trying to read file for TMX Compendium module:\n"
+"%1\n"
+"Reason: %2"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 402
-#: rc.cpp:935 rc.cpp:1140
-#, no-c-format
-msgid "Use one word substitution"
+#: kbabeldict/modules/pocompendium/compendiumdata.cpp:104
+#: kbabeldict/modules/tmx/tmxcompendiumdata.cpp:132
+msgid "Building indices"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 433
-#: rc.cpp:938 rc.cpp:944 rc.cpp:1143 rc.cpp:1149
-#, no-c-format
-msgid "Max number of words in the query:"
+#: kbabeldict/modules/tmx/tmxcompendiumdata.cpp:229
+msgid "Empty database."
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 458
-#: rc.cpp:941 rc.cpp:1146
-#, no-c-format
-msgid "Use two word substitution"
+#: kbabeldict/modules/tmx/pc_factory.cpp:97
+msgid "A module for searching in a TMX file"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 491
-#: rc.cpp:947 rc.cpp:1152
-#, no-c-format
-msgid "[A-Za-z0-9_%"
+#: kbabeldict/modules/pocompendium/pc_factory.cpp:95
+#: kbabeldict/modules/pocompendium/pocompendium.cpp:184
+msgid "PO Compendium"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 509
-#: rc.cpp:950 rc.cpp:1155
-#, no-c-format
-msgid "]"
+#: kbabeldict/modules/pocompendium/compendiumdata.cpp:93
+#, c-format
+msgid ""
+"Error while trying to read file for PO Compendium module:\n"
+"%1"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 519
-#: rc.cpp:953 rc.cpp:1158
-#, no-c-format
-msgid "Local characters for regular expressions:"
+#: kbabeldict/modules/pocompendium/preferenceswidget.cpp:88
+msgid ""
+"<qt>"
+"<p><b>Parameters</b></p>"
+"<p>Here you can fine-tune searching within the PO file. For example if you want "
+"to perform a case sensitive search, or if you want fuzzy messages to be "
+"ignored.</p></qt>"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 573
-#: rc.cpp:959 rc.cpp:1164
-#, no-c-format
-msgid "Database folder:"
+#: kbabeldict/modules/pocompendium/pc_factory.cpp:97
+msgid "A module for searching in a PO file"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 589
-#: rc.cpp:962 rc.cpp:1167
-#, no-c-format
-msgid "Auto add entry to database"
+#: kbabeldict/modules/poauxiliary/pa_factory.cpp:95
+#: kbabeldict/modules/poauxiliary/poauxiliary.cpp:147
+msgid "PO Auxiliary"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 595
-#: rc.cpp:965 rc.cpp:1170
-#, no-c-format
-msgid ""
-"Automatically add an entry to the database if a new translation is notified by "
-"someone (may be kbabel)"
+#: kbabeldict/modules/poauxiliary/pa_factory.cpp:97
+msgid "A simple module for exact searching in a PO file"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 617
-#: rc.cpp:968 rc.cpp:1173
-#, no-c-format
-msgid "Auto added entry author:"
+#: kbabeldict/modules/poauxiliary/poauxiliary.cpp:426
+msgid "Loading PO auxiliary"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 625
-#: rc.cpp:971 rc.cpp:1176
-#, no-c-format
+#: kbabeldict/modules/poauxiliary/poauxiliary.cpp:438
+#, c-format
 msgid ""
-"<qml>Put here the name and email address that you want to use as <em>"
-"last translator</em> filed when you auto-add entry to the database (e.g. when "
-"you modify a translation with kbabel)."
-"<p>"
+"Error while trying to open file for PO Auxiliary module:\n"
+"%1"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 635
-#: rc.cpp:974
-#, no-c-format
-msgid "Scan Single PO File"
+#: kbabeldict/modules/poauxiliary/poauxiliary.cpp:450
+msgid "Building index"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 643
-#: rc.cpp:977
-#, no-c-format
-msgid "Scan Folder"
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:1412
+#: kbabeldict/modules/dbsearchengine/dbse_factory.cpp:67
+#: kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp:68
+msgid "Translation Database"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 651
-#: rc.cpp:980
-#, no-c-format
-msgid "Scan Folder && Subfolders"
+#: kbabeldict/modules/dbsearchengine/dbse_factory.cpp:69
+#: kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp:70
+msgid "A fast translation search engine based on databases"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 673
-#: rc.cpp:983 rc.cpp:1188
-#, no-c-format
-msgid "Scanning file:"
+#: kbabeldict/modules/dbsearchengine/dbse_factory.cpp:71
+msgid "Copyright 2000-2001 by Andrea Rizzi"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 681
-#: rc.cpp:986 rc.cpp:1191
-#, no-c-format
-msgid "Entries added:"
+#: kbabeldict/modules/dbsearchengine/preferenceswidget.cpp:102
+#, c-format
+msgid "Scanning file: %1"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 722
-#: rc.cpp:989 rc.cpp:1194
-#, no-c-format
-msgid "Total progress:"
-msgstr "Cyfanswm cynnydd :"
+#: kbabeldict/modules/dbsearchengine/preferenceswidget.cpp:107
+#, c-format
+msgid "Entries added: %1"
+msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 730
-#: rc.cpp:992 rc.cpp:1197
-#, no-c-format
-msgid "Processing file:"
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:84
+msgid "No error"
+msgstr "Dim gwall"
+
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:125
+msgid ""
+"Database folder does not exist:\n"
+"%1\n"
+"Do you want to create it now?"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 766
-#: rc.cpp:995 rc.cpp:1200
-#, no-c-format
-msgid "Loading file:"
-msgstr "Llwytho ffeil:"
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:127
+msgid "Create Folder"
+msgstr "Creu Plygell"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 779
-#: rc.cpp:998 rc.cpp:1203
-#, no-c-format
-msgid "Export..."
-msgstr "Allforio..."
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:127
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:258
+#: kbabeldict/modules/dbsearchengine2/database.cpp:142
+msgid "Do Not Create"
+msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 798
-#: rc.cpp:1004 rc.cpp:1209
-#, no-c-format
-msgid "Repeated Strings"
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:146
+#, c-format
+msgid "It was not possible to create folder %1"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 808
-#: rc.cpp:1007 rc.cpp:1212
-#, no-c-format
-msgid "Good Keys"
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:176
+msgid ""
+"<p>There are backup database files from previous versions of KBabel. However, "
+"another version of KBabel (probably from KDE 3.1.1 or 3.1.2) created a new "
+"database. As a result, your KBabel installation contains two versions of "
+"database files. Unfortunatelly, the old and new version can not be merged. You "
+"need to choose one of them."
+"<br/>"
+"<br/>If you choose the old version, the new one will be removed. If you choose "
+"the new version, the old database files will be left alone and you need to "
+"remove them manually. Otherwise this message will be displayed again (the old "
+"files are at $TDEHOME/share/apps/kbabeldict/dbsearchengine/*,old).</p>"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 832
-#: rc.cpp:1013 rc.cpp:1218
-#, no-c-format
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:185
+msgid "Old Database Found"
+msgstr ""
+
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:186
+msgid "Use &Old Database"
+msgstr ""
+
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:187
+msgid "Use &New Database"
+msgstr ""
+
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:258
 msgid ""
-"<qml>Here you can define how to fill the <em>good keys list</em>."
-"<p>\n"
-"You can set the minimum number of words of the query that a key must have to be "
-"inserted in the <em>good keys list</em>."
-"<p>\n"
-"You can also set the minimum number of words of the key that the query must "
-"have to insert the key in the list."
-"<p>\n"
-"These two numbers are the percentage of the total number of words. If the "
-"result of this percentage is less than one, the engine will set it to one."
-"<p>\n"
-"Finally you can set the maximum number of entries in the list."
+"Database files not found.\n"
+"Do you want to create them now?"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 849
-#: rc.cpp:1020 rc.cpp:1225
-#, no-c-format
-msgid "Minimum number of words of the key also in the query (%):"
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:258
+#: kbabeldict/modules/dbsearchengine2/database.cpp:142
+msgid "Create"
+msgstr "Creu"
+
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:408
+msgid "Cannot open the database"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 874
-#: rc.cpp:1023 rc.cpp:1029 rc.cpp:1228 rc.cpp:1234
-#, no-c-format
-msgid "%"
-msgstr "%"
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:431
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:640
+msgid "Another search has already been started"
+msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 888
-#: rc.cpp:1026 rc.cpp:1231
-#, no-c-format
-msgid "Minimum number of query words in the key (%):"
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:438
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:647
+msgid "Unable to search now: a PO file scan is in progress"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 921
-#: rc.cpp:1032 rc.cpp:1237
-#, no-c-format
-msgid "Max list length:"
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:445
+msgid "Unable to open the database"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 945
-#: rc.cpp:1035 rc.cpp:1240
-#, no-c-format
-msgid "Frequent Words"
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:451
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:658
+msgid "Database empty"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 962
-#: rc.cpp:1038 rc.cpp:1243
-#, no-c-format
-msgid "Discard words more frequent than:"
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:462
+msgid "No entry for this package in the database."
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 970
-#: rc.cpp:1041 rc.cpp:1246
-#, no-c-format
-msgid "/10000"
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:469
+msgid "Searching for %1 in database"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 987
-#: rc.cpp:1044 rc.cpp:1249
-#, no-c-format
-msgid "Frequent words are considered as in every key"
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:548
+msgid "Looking for repetitions"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 632
-#: rc.cpp:1179
-#, no-c-format
-msgid "Scan Single PO File..."
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:562
+msgid "Minimum Repetition"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 640
-#: rc.cpp:1182
-#, no-c-format
-msgid "Scan Folder..."
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:564
+msgid "Insert the minimum number of repetitions for a string:"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 648
-#: rc.cpp:1185
-#, no-c-format
-msgid "Scan Folder && Subfolders..."
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:572
+msgid "Searching repeated string"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/poauxiliary/pwidget.ui line 39
-#: rc.cpp:1252
-#, no-c-format
-msgid "&Path to auxiliary file:"
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:1240
+msgid "Select Folder to Scan Recursively"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/poauxiliary/pwidget.ui line 61
-#: rc.cpp:1255
-#, no-c-format
-msgid "&Ignore fuzzy entries"
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:1263
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:1315
+#, c-format
+msgid "Scanning folder %1"
+msgstr "Yn sganio plygell %1"
+
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:1299
+msgid "Select Folder to Scan"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/poauxiliary/pwidget.ui line 78
-#: rc.cpp:1258
-#, no-c-format
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:1358
+msgid "Select PO File to Scan"
+msgstr ""
+
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:1372
+#, c-format
+msgid "Scanning file %1"
+msgstr ""
+
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:1608
+msgid "Searching words"
+msgstr ""
+
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:1850
+msgid "Process output"
+msgstr ""
+
+#: kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp:72
+msgid "Copyright 2000-2003 by Andrea Rizzi"
+msgstr ""
+
+#: kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp:562
+#: kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp:614
 msgid ""
-"<qt>"
-"<p>\n"
-"The following variables will be replaced in the path if available:\n"
-"<ul>\n"
-"<li><b>@PACKAGE@</b>: the name of the currently translated application or "
-"package</li>\n"
-"<li><b>@LANG@</b>: the language code</li>\n"
-"<li><b>@DIR<em>n</em>@</b>: where n is a positive integer. This expands to the "
-"nth folder counted from the filename</li>\n"
-"</ul></p></qt>"
+"The name you chose is already used.\n"
+"Please change the source name."
+msgstr ""
+
+#: kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp:563
+#: kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp:615
+msgid "Name is Not Unique"
+msgstr ""
+
+#: kbabeldict/modules/dbsearchengine2/database.cpp:142
+#, fuzzy
+msgid "Create Database"
+msgstr "Cronfa ddata"
+
+#: kbabeldict/modules/dbsearchengine2/algorithms.cpp:182
+msgid "CHUNK BY CHUNK"
+msgstr ""
+
+#: kbabeldict/modules/dbsearchengine2/algorithms.cpp:183
+msgid ""
+"<h3>Chunk by chunk</h3>CHANGE THIS TEXT!!!!This translation isobtained "
+"translating the  sentences and using afuzzy sentence translation database."
+"<br> <b>Do not rely on it</b>. Translations may be fuzzy."
+"<br>"
+msgstr ""
+
+#: kbabeldict/modules/dbsearchengine2/algorithms.cpp:374
+#: kbabeldict/modules/dbsearchengine2/algorithms.cpp:386
+msgid "DYNAMIC DICT:"
+msgstr ""
+
+#: kbabeldict/modules/dbsearchengine2/algorithms.cpp:375
+#: kbabeldict/modules/dbsearchengine2/algorithms.cpp:387
+msgid ""
+"<h3>Dynamic Dictionary</h3>This is a dynamic dictionary created looking for "
+"correlation of original and translated words."
+"<br> <b>Do not rely on it</b>. Translations may be fuzzy."
+"<br>"
+msgstr ""
+
+#: kbabeldict/kbabeldict.cpp:45
+msgid "KBabelDict"
+msgstr ""
+
+#: kbabeldict/kbabeldict.cpp:47
+msgid "About Module"
+msgstr ""
+
+#: kbabeldict/kbabeldict.cpp:48 kbabeldict/kbabeldict.cpp:104
+msgid "Hide Sett&ings"
+msgstr ""
+
+#: kbabeldict/kbabeldict.cpp:108
+msgid "Show Sett&ings"
 msgstr ""
 
 #: kbabeldict/kbabeldictbox.cpp:201
@@ -5061,6 +4518,30 @@ msgid ""
 "appears not to be installed on your system."
 msgstr ""
 
+#: kbabeldict/dictchooser.cpp:59
+msgid ""
+"_: dictionary to not use\n"
+"Do not use:"
+msgstr ""
+
+#: kbabeldict/dictchooser.cpp:62
+msgid ""
+"_: dictionary to use\n"
+"Use:"
+msgstr "Defnydd :"
+
+#: kbabeldict/dictchooser.cpp:84
+msgid "Move &Up"
+msgstr "Symud i &Fyny"
+
+#: kbabeldict/dictchooser.cpp:87
+msgid "Move &Down"
+msgstr "Symud i &Lawr"
+
+#: kbabeldict/dictchooser.cpp:90
+msgid "Con&figure..."
+msgstr "Ffurf&weddu..."
+
 #: kbabeldict/main.cpp:114
 msgid "KBabel - Dictionary"
 msgstr "KBabel - Geiriadur"
@@ -5073,409 +4554,930 @@ msgstr ""
 msgid "(c) 2000,2001,2002,2003 The KBabeldict developers"
 msgstr ""
 
-#: kbabeldict/modules/tmx/pc_factory.cpp:95
-#: kbabeldict/modules/tmx/tmxcompendium.cpp:175
-msgid "TMX Compendium"
+#: common/catalog.cpp:592
+msgid ""
+"Free Software Foundation Copyright does not contain any year. It will not be "
+"updated."
 msgstr ""
 
-#: kbabeldict/modules/tmx/pc_factory.cpp:97
-msgid "A module for searching in a TMX file"
+#: common/catalog.cpp:1237
+msgid "validating file"
 msgstr ""
 
-#: kbabeldict/modules/tmx/preferenceswidget.cpp:88
-msgid ""
-"<qt>"
-"<p><b>Parameters</b></p>"
-"<p>Here you can fine-tune searching within the PO file. For example, if you "
-"want to perform a case sensitive search.</p></qt>"
+#: common/catalog.cpp:1276
+msgid "applying tool"
 msgstr ""
 
-#: kbabeldict/modules/pocompendium/preferenceswidget.cpp:96
-#: kbabeldict/modules/tmx/preferenceswidget.cpp:94
+#: common/catalog.cpp:3128
+msgid "searching matching message"
+msgstr ""
+
+#: common/catalog.cpp:3217
+msgid "preparing messages for diff"
+msgstr ""
+
+#: common/kbproject.cpp:53
+msgid "unnamed"
+msgstr "di-enw"
+
+#: common/kbmailer.cpp:106
+#, c-format
+msgid "Error while trying to download file %1."
+msgstr ""
+
+#: common/kbmailer.cpp:145
+msgid "Enter the name of the archive without file extension"
+msgstr ""
+
+#: common/kbmailer.cpp:178
+msgid "Error while trying to create archive file."
+msgstr ""
+
+#: common/kbmailer.cpp:193
+#, c-format
+msgid "Error while trying to read file %1."
+msgstr ""
+
+#: common/kbmailer.cpp:208
+msgid "Error while trying to copy file %1 into archive."
+msgstr ""
+
+#: filters/gettext/gettextexport.cpp:74
+msgid "saving file"
+msgstr ""
+
+#: filters/gettext/gettextimport.cpp:83
+msgid "loading file"
+msgstr "llwytho ffeil..."
+
+#: catalogmanager/validateprogress.cpp:56
 msgid ""
-"<qt>"
-"<p><b>Comparison Options</b></p>"
-"<p>Choose here which messages you want to have treated as a matching "
-"message.</p></qt>"
+"_: Caption of dialog\n"
+"Validation"
 msgstr ""
 
-#: kbabeldict/modules/pocompendium/preferenceswidget.cpp:104
-#: kbabeldict/modules/tmx/preferenceswidget.cpp:102
+#: catalogmanager/catalogmanager.cpp:222
+#: catalogmanager/validateprogress.cpp:72
+msgid "&Open"
+msgstr "A&gor"
+
+#: catalogmanager/validateprogress.cpp:73
+msgid "&Ignore"
+msgstr "&Anwybyddu"
+
+#: catalogmanager/catalogmanagerview.cpp:2999
+#: catalogmanager/validateprogress.cpp:98
 msgid ""
-"<qt>"
-"<p><b>3-Gram-matching</b></p>"
-"<p>A message matches another if most of its 3-letter groups are contained in "
-"the other message. e.g. 'abc123' matches 'abcx123c12'.</p></qt>"
+"Cannot instantiate a validation tool.\n"
+"Please check your installation."
 msgstr ""
 
-#: kbabeldict/modules/pocompendium/preferenceswidget.cpp:109
-#: kbabeldict/modules/tmx/preferenceswidget.cpp:107
+#: catalogmanager/catalogmanagerview.cpp:3000
+#: catalogmanager/validateprogress.cpp:99
+msgid "Validation Tool Error"
+msgstr ""
+
+#: catalogmanager/validateprogress.cpp:186
 msgid ""
-"<qt>"
-"<p><b>Location</b></p>"
-"<p>Configure here which file is to be used for searching.</p></qt>"
+"Validation done.\n"
+"\n"
+"Checked files: %1\n"
+"Number of errors: %2\n"
+"Number of ignored errors: %3"
 msgstr ""
 
-#: kbabeldict/modules/pocompendium/compendiumdata.cpp:79
-#: kbabeldict/modules/pocompendium/pocompendium.cpp:1195
-#: kbabeldict/modules/tmx/tmxcompendium.cpp:957
-msgid "Loading PO compendium"
+#: catalogmanager/validateprogress.cpp:190
+msgid "Validation Done"
 msgstr ""
 
-#: kbabeldict/modules/tmx/tmxcompendiumdata.cpp:80
-msgid "Loading TMX compendium"
+#: catalogmanager/multiroughtransdlg.cpp:56
+msgid "Files:"
+msgstr "Ffeiliau:"
+
+#: catalogmanager/catalogmanagerview.cpp:94 catalogmanager/future.cpp:5
+#, fuzzy
+msgid "CVS/SVN Status"
+msgstr "Cyflwr"
+
+#: catalogmanager/future.cpp:8
+msgid "Resolved"
 msgstr ""
 
-#: kbabeldict/modules/tmx/tmxcompendiumdata.cpp:92
-#: kbabeldict/modules/tmx/tmxcompendiumdata.cpp:102
-msgid "Cannot open the file."
+#: catalogmanager/future.cpp:9
+msgid "Resolved for Marked"
 msgstr ""
 
-#: kbabeldict/modules/tmx/tmxcompendiumdata.cpp:96
-msgid "Cannot parse XML data."
+#: catalogmanager/future.cpp:10
+msgid "Revert"
+msgstr "Dychwelyd"
+
+#: catalogmanager/future.cpp:11
+msgid "Revert for Marked"
 msgstr ""
 
-#: kbabeldict/modules/tmx/tmxcompendiumdata.cpp:111
-msgid "Unsupported format."
+#: catalogmanager/future.cpp:12
+#, fuzzy
+msgid "Cleanup"
+msgstr "&Gwaredu"
+
+#: catalogmanager/future.cpp:13
+msgid "Cleanup for Marked"
 msgstr ""
 
-#: kbabeldict/modules/tmx/tmxcompendiumdata.cpp:117
+#: catalogmanager/future.cpp:16
+msgid "No repository"
+msgstr ""
+
+#: catalogmanager/catmanlistitem.cpp:80
+msgid "Message Catalogs"
+msgstr "Catalogau Negesau"
+
+#: catalogmanager/catmanlistitem.cpp:450 catalogmanager/catmanlistitem.cpp:637
+msgid "No version control"
+msgstr ""
+
+#: catalogmanager/libcvs/cvshandler.cpp:88
+msgid "No CVS repository"
+msgstr ""
+
+#: catalogmanager/libcvs/cvshandler.cpp:91
+msgid "Not in CVS"
+msgstr ""
+
+#: catalogmanager/libcvs/cvshandler.cpp:94
+#: catalogmanager/libsvn/svnhandler.cpp:96
+msgid "Locally added"
+msgstr ""
+
+#: catalogmanager/libcvs/cvshandler.cpp:97
+#: catalogmanager/libsvn/svnhandler.cpp:99
+msgid "Locally removed"
+msgstr ""
+
+#: catalogmanager/libcvs/cvshandler.cpp:100
+#: catalogmanager/libsvn/svnhandler.cpp:102
+msgid "Locally modified"
+msgstr ""
+
+#: catalogmanager/libcvs/cvshandler.cpp:103
+#: catalogmanager/libsvn/svnhandler.cpp:105
+msgid "Up-to-date"
+msgstr ""
+
+#: catalogmanager/libcvs/cvshandler.cpp:106
+#: catalogmanager/libsvn/svnhandler.cpp:108
+msgid "Conflict"
+msgstr ""
+
+#: catalogmanager/libcvs/cvshandler.cpp:109
+#: catalogmanager/libsvn/svnhandler.cpp:113
+msgid "Unknown"
+msgstr "Anhysbys"
+
+#: catalogmanager/libcvs/cvshandler.cpp:189
+#: catalogmanager/libcvs/cvshandler.cpp:228
 msgid ""
-"Error while trying to read file for TMX Compendium module:\n"
-"%1\n"
-"Reason: %2"
+"This is not a valid CVS repository. The CVS commands cannot be executed."
 msgstr ""
 
-#: kbabeldict/modules/pocompendium/compendiumdata.cpp:104
-#: kbabeldict/modules/tmx/tmxcompendiumdata.cpp:132
-msgid "Building indices"
+#: catalogmanager/libcvs/cvsdialog.cpp:311
+#: catalogmanager/libcvs/cvshandler.cpp:375
+#: catalogmanager/libsvn/svndialog.cpp:290
+#: catalogmanager/libsvn/svnhandler.cpp:483
+msgid "[ Starting command ]"
 msgstr ""
 
-#: kbabeldict/modules/tmx/tmxcompendiumdata.cpp:229
-msgid "Empty database."
+#: catalogmanager/libcvs/cvsdialog.cpp:68
+msgid "CVS Dialog"
 msgstr ""
 
-#: kbabeldict/modules/pocompendium/pc_factory.cpp:95
-#: kbabeldict/modules/pocompendium/pocompendium.cpp:184
-msgid "PO Compendium"
+#: catalogmanager/libcvs/cvsdialog.cpp:77
+#: catalogmanager/libsvn/svndialog.cpp:74
+msgid "Update the following files:"
 msgstr ""
 
-#: kbabeldict/modules/pocompendium/pc_factory.cpp:97
-msgid "A module for searching in a PO file"
+#: catalogmanager/libcvs/cvsdialog.cpp:80
+#: catalogmanager/libsvn/svndialog.cpp:77
+msgid "Commit the following files:"
 msgstr ""
 
-#: kbabeldict/modules/pocompendium/preferenceswidget.cpp:88
+#: catalogmanager/libcvs/cvsdialog.cpp:83
+msgid "Get status for the following files:"
+msgstr ""
+
+#: catalogmanager/libcvs/cvsdialog.cpp:86
+#: catalogmanager/libsvn/svndialog.cpp:86
+msgid "Get diff for the following files:"
+msgstr ""
+
+#: catalogmanager/libcvs/cvsdialog.cpp:100
+#: catalogmanager/libsvn/svndialog.cpp:103
+msgid "&Old messages:"
+msgstr ""
+
+#: catalogmanager/libcvs/cvsdialog.cpp:108
+#: catalogmanager/libsvn/svndialog.cpp:111
+msgid "&Log message:"
+msgstr ""
+
+#: catalogmanager/libcvs/cvsdialog.cpp:114
+msgid "E&ncoding:"
+msgstr "A&mgodiad:"
+
+#: catalogmanager/libcvs/cvsdialog.cpp:121
 msgid ""
-"<qt>"
-"<p><b>Parameters</b></p>"
-"<p>Here you can fine-tune searching within the PO file. For example if you want "
-"to perform a case sensitive search, or if you want fuzzy messages to be "
-"ignored.</p></qt>"
+"_: Descriptive encoding name\n"
+"Recommended ( %1 )"
 msgstr ""
 
-#: kbabeldict/modules/pocompendium/compendiumdata.cpp:93
+#: catalogmanager/libcvs/cvsdialog.cpp:122
+msgid ""
+"_: Descriptive encoding name\n"
+"Locale ( %1 )"
+msgstr ""
+
+#: catalogmanager/libcvs/cvsdialog.cpp:133
+#: catalogmanager/libsvn/svndialog.cpp:124
+msgid "Auto&matically add files if necessary"
+msgstr ""
+
+#: catalogmanager/libcvs/cvsdialog.cpp:144
+#: catalogmanager/libsvn/svndialog.cpp:135
+msgid "&Commit"
+msgstr "&Cyflwyno"
+
+#: catalogmanager/libcvs/cvsdialog.cpp:147
+#: catalogmanager/libsvn/svndialog.cpp:139
+msgid "&Get Status"
+msgstr ""
+
+#: catalogmanager/libcvs/cvsdialog.cpp:150
+#: catalogmanager/libsvn/svndialog.cpp:142
+msgid "&Get Diff"
+msgstr ""
+
+#: catalogmanager/libcvs/cvsdialog.cpp:165
+#: catalogmanager/libsvn/svndialog.cpp:160
+msgid "Command output:"
+msgstr ""
+
+#: catalogmanager/libcvs/cvsdialog.cpp:237
+#: catalogmanager/libsvn/svndialog.cpp:233
+#, fuzzy
+msgid "The commit log message is empty. Do you want to continue?"
+msgstr "Mae'r ffeil %1 mewn bod yn barod.  Ydych am ysgrifennu drosto?"
+
+#: catalogmanager/libcvs/cvsdialog.cpp:247
 #, c-format
+msgid "Cannot find encoding: %1"
+msgstr ""
+
+#: catalogmanager/libcvs/cvsdialog.cpp:253
 msgid ""
-"Error while trying to read file for PO Compendium module:\n"
-"%1"
+"The commit log message cannot be encoded in the selected encoding: %1.\n"
+"Do you want to continue?"
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:1412
-#: kbabeldict/modules/dbsearchengine/dbse_factory.cpp:67
-#: kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp:68
-msgid "Translation Database"
+#: catalogmanager/libcvs/cvsdialog.cpp:268
+#: catalogmanager/libsvn/svndialog.cpp:247
+msgid "Cannot open temporary file for writing. Aborting."
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine/dbse_factory.cpp:69
-#: kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp:70
-msgid "A fast translation search engine based on databases"
+#: catalogmanager/libcvs/cvsdialog.cpp:280
+#: catalogmanager/libsvn/svndialog.cpp:259
+msgid "Cannot write to temporary file. Aborting."
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp:72
-msgid "Copyright 2000-2003 by Andrea Rizzi"
+#: catalogmanager/libcvs/cvsdialog.cpp:322
+#: catalogmanager/libsvn/svndialog.cpp:301
+msgid "The process could not be started."
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine2/algorithms.cpp:182
-msgid "CHUNK BY CHUNK"
+#: catalogmanager/libcvs/cvsdialog.cpp:351
+#: catalogmanager/libsvn/svndialog.cpp:330
+msgid "[ Exited with status %1 ]"
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine2/algorithms.cpp:183
+#: catalogmanager/libcvs/cvsdialog.cpp:353
+#: catalogmanager/libsvn/svndialog.cpp:332
+msgid "[ Finished ]"
+msgstr ""
+
+#: catalogmanager/libcvs/cvsdialog.cpp:401
+#, fuzzy
 msgid ""
-"<h3>Chunk by chunk</h3>CHANGE THIS TEXT!!!!This translation isobtained "
-"translating the  sentences and using afuzzy sentence translation database."
-"<br> <b>Do not rely on it</b>. Translations may be fuzzy."
-"<br>"
+"_: Descriptive encoding name\n"
+"Last choice ( %1 )"
+msgstr "Arall (%1)"
+
+#: catalogmanager/catalogmanagerview.cpp:89
+msgid "Name"
+msgstr "Enw"
+
+#: catalogmanager/catalogmanagerview.cpp:90
+msgid "M"
+msgstr "M"
+
+#: catalogmanager/catalogmanagerview.cpp:91
+msgid "Fuzzy"
+msgstr "Niwlaidd"
+
+#: catalogmanager/catalogmanagerview.cpp:92
+msgid "Untranslated"
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine2/algorithms.cpp:374
-#: kbabeldict/modules/dbsearchengine2/algorithms.cpp:386
-msgid "DYNAMIC DICT:"
+#: catalogmanager/catalogmanagerview.cpp:93
+msgid "Total"
+msgstr "Cyfanswm"
+
+#: catalogmanager/catalogmanagerview.cpp:95
+msgid "Last Revision"
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine2/algorithms.cpp:375
-#: kbabeldict/modules/dbsearchengine2/algorithms.cpp:387
+#: catalogmanager/catalogmanagerview.cpp:178
+#: catalogmanager/catalogmanagerview.cpp:2447
+#: catalogmanager/catalogmanagerview.cpp:2458
+msgid "Log Window"
+msgstr "Ffenestr Gofnodion"
+
+#: catalogmanager/catalogmanagerview.cpp:180
+msgid "C&lear"
+msgstr "&Gwaredu"
+
+#: catalogmanager/catalogmanagerview.cpp:183
 msgid ""
-"<h3>Dynamic Dictionary</h3>This is a dynamic dictionary created looking for "
-"correlation of original and translated words."
-"<br> <b>Do not rely on it</b>. Translations may be fuzzy."
-"<br>"
+"<qt>"
+"<p><b>Log window</b></p>\n"
+"<p>In this window the output of the executed commands are shown.</p></qt>"
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine2/database.cpp:142
+#: catalogmanager/catalogmanagerview.cpp:194
+msgid ""
+"<qt>"
+"<p><b>Catalog Manager</b></p>\n"
+"<p>The Catalog Manager merges two folders into one tree and displays all\n"
+"PO and POT files in these folders. This way you can easily see if a\n"
+"template has been added or removed. Also some information about the files\n"
+"is displayed.</p>"
+"<p>For more information see section <b>The Catalog Manager</b> "
+"in the online help.</p></qt>"
+msgstr ""
+
+#: catalogmanager/catalogmanagerview.cpp:473
+msgid ""
+"Error while trying to read file:\n"
+" %1\n"
+"Maybe it is not a valid file with list of markings."
+msgstr ""
+
+#: catalogmanager/catalogmanagerview.cpp:571
+msgid ""
+"An error occurred while trying to write to file:\n"
+"%1\n"
+msgstr ""
+
+#: catalogmanager/catalogmanagerview.cpp:580
+msgid ""
+"An error occurred while trying to upload the file:\n"
+"%1\n"
+msgstr ""
+
+#: catalogmanager/catalogmanagerview.cpp:664
+#: catalogmanager/catalogmanagerview.cpp:691
+msgid ""
+"The Catalog Manager is still updating information about the files.\n"
+"If you continue, it will try to update all necessary files, however this can "
+"take a long time and may lead to wrong results. Please wait until all files are "
+"updated."
+msgstr ""
+
+#: catalogmanager/catalogmanagerview.cpp:769
 #, fuzzy
-msgid "Create Database"
-msgstr "Cronfa ddata"
+msgid ""
+"Statistics for all:\n"
+msgstr "Ystadegau"
 
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:258
-#: kbabeldict/modules/dbsearchengine2/database.cpp:142
-msgid "Create"
-msgstr "Creu"
+#: catalogmanager/catalogmanagerview.cpp:771
+msgid ""
+"Statistics for %1:\n"
+msgstr ""
 
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:127
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:258
-#: kbabeldict/modules/dbsearchengine2/database.cpp:142
-msgid "Do Not Create"
+#: catalogmanager/catalogmanagerview.cpp:773
+msgid ""
+"Number of packages: %1\n"
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp:562
-#: kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp:614
+#: catalogmanager/catalogmanagerview.cpp:776
 msgid ""
-"The name you chose is already used.\n"
-"Please change the source name."
+"Complete translated: %1 % (%2)\n"
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp:563
-#: kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp:615
-msgid "Name is Not Unique"
+#: catalogmanager/catalogmanagerview.cpp:779
+msgid ""
+"Only template available: %1 % (%2)\n"
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine/preferenceswidget.cpp:102
-#, c-format
-msgid "Scanning file: %1"
+#: catalogmanager/catalogmanagerview.cpp:781
+msgid ""
+"Only PO file available: %1 % (%2)\n"
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine/preferenceswidget.cpp:107
+#: catalogmanager/catalogmanagerview.cpp:783
+msgid ""
+"Number of messages: %1\n"
+msgstr ""
+
+#: catalogmanager/catalogmanagerview.cpp:787
+msgid ""
+"Translated: %1 % (%2)\n"
+msgstr ""
+
+#: catalogmanager/catalogmanagerview.cpp:790
+msgid ""
+"Fuzzy: %1 % (%2)\n"
+msgstr ""
+
+#: catalogmanager/catalogmanagerview.cpp:793
+msgid ""
+"Untranslated: %1 % (%2)\n"
+msgstr ""
+
+#: catalogmanager/catalogmanagerview.cpp:820
+msgid ""
+"The file is syntactically correct.\n"
+"Output of \"msgfmt --statistics\":"
+msgstr ""
+
+#: catalogmanager/catalogmanagerview.cpp:825
+msgid ""
+"The file has syntax errors.\n"
+"Output of \"msgfmt --statistics\":"
+msgstr ""
+
+#: catalogmanager/catalogmanagerview.cpp:830
+msgid ""
+"The file has header syntax error.\n"
+"Output of \"msgfmt --statistics\":"
+msgstr ""
+
+#: catalogmanager/catalogmanagerview.cpp:835
+msgid "An error occurred while processing \"msgfmt --statistics\""
+msgstr ""
+
+#: catalogmanager/catalogmanagerview.cpp:840
+#: catalogmanager/catalogmanagerview.cpp:929
+msgid ""
+"Cannot execute msgfmt. Please make sure that you have msgfmt in your PATH."
+msgstr ""
+
+#: catalogmanager/catalogmanagerview.cpp:868
+msgid ""
+"All files in folder %1 are syntactically correct.\n"
+"Output of \"msgfmt --statistics\":\n"
+msgstr ""
+
+#: catalogmanager/catalogmanagerview.cpp:873
+msgid ""
+"All files in the base folder are syntactically correct.\n"
+"Output of \"msgfmt --statistics\":\n"
+msgstr ""
+
+#: catalogmanager/catalogmanagerview.cpp:884
+msgid ""
+"At least one file in folder %1 has syntax errors.\n"
+"Output of \"msgfmt --statistics\":\n"
+msgstr ""
+
+#: catalogmanager/catalogmanagerview.cpp:889
+msgid ""
+"At least one file in the base folder has syntax errors.\n"
+"Output of \"msgfmt --statistics\":\n"
+msgstr ""
+
+#: catalogmanager/catalogmanagerview.cpp:900
+msgid ""
+"At least one file in folder %1 has header syntax errors.\n"
+"Output of \"msgfmt --statistics\":\n"
+msgstr ""
+
+#: catalogmanager/catalogmanagerview.cpp:905
+msgid ""
+"At least one file in the base folder has header syntax errors.\n"
+"Output of \"msgfmt --statistics\":\n"
+msgstr ""
+
+#: catalogmanager/catalogmanagerview.cpp:916
 #, c-format
-msgid "Entries added: %1"
+msgid ""
+"An error occurred while processing \"msgfmt --statistics *.po\" in folder %1"
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine/dbse_factory.cpp:71
-msgid "Copyright 2000-2001 by Andrea Rizzi"
+#: catalogmanager/catalogmanagerview.cpp:921
+msgid ""
+"An error occurred while processing \"msgfmt --statistics *.po\" in the base "
+"folder"
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:84
-msgid "No error"
-msgstr "Dim gwall"
+#: catalogmanager/catalogmanagerview.cpp:1502
+msgid "Do you really want to delete the file %1?"
+msgstr ""
 
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:125
+#: catalogmanager/catalogmanagerview.cpp:1507
+msgid "Was not able to delete the file %1!"
+msgstr ""
+
+#: catalogmanager/catalogmanagerview.cpp:1766
 msgid ""
-"Database folder does not exist:\n"
+"You have not specified a valid folder for the base folder of the PO files:\n"
 "%1\n"
-"Do you want to create it now?"
+"Please check your settings in the project settings dialog."
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:127
-msgid "Create Folder"
-msgstr "Creu Plygell"
+#: catalogmanager/catalogmanagerview.cpp:1783
+msgid ""
+"You have not specified a valid folder for the base folder of the PO template "
+"files:\n"
+"%1\n"
+"Please check your settings in the project settings dialog."
+msgstr ""
 
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:146
-#, c-format
-msgid "It was not possible to create folder %1"
+#: catalogmanager/catalogmanagerview.cpp:1824
+msgid "Reading file information"
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:176
+#: catalogmanager/catalogmanagerview.cpp:3008
+msgid "Validation Options"
+msgstr "Dewisiadau Gwiriant"
+
+#: catalogmanager/markpatterndialog.cpp:113
+msgid "Ma&rk files which match the following pattern:"
+msgstr ""
+
+#: catalogmanager/markpatterndialog.cpp:114
+msgid "&Mark Files"
+msgstr ""
+
+#: catalogmanager/markpatterndialog.cpp:116
+msgid "Unma&rk files which match the following pattern:"
+msgstr ""
+
+#: catalogmanager/markpatterndialog.cpp:117
+msgid "Un&mark Files"
+msgstr ""
+
+#: catalogmanager/findinfilesdialog.cpp:50
+msgid "File Options"
+msgstr ""
+
+#: catalogmanager/findinfilesdialog.cpp:53
+msgid "&In all files"
+msgstr ""
+
+#: catalogmanager/findinfilesdialog.cpp:54
+msgid "&Marked files"
+msgstr ""
+
+#: catalogmanager/findinfilesdialog.cpp:55
+msgid "In &templates"
+msgstr ""
+
+#: catalogmanager/findinfilesdialog.cpp:56
+msgid "Ask before ne&xt file"
+msgstr ""
+
+#: catalogmanager/findinfilesdialog.cpp:57
+msgid "Save &without asking"
+msgstr ""
+
+#: catalogmanager/findinfilesdialog.cpp:59
 msgid ""
-"<p>There are backup database files from previous versions of KBabel. However, "
-"another version of KBabel (probably from TDE 3.1.1 or 3.1.2) created a new "
-"database. As a result, your KBabel installation contains two versions of "
-"database files. Unfortunatelly, the old and new version can not be merged. You "
-"need to choose one of them."
-"<br/>"
-"<br/>If you choose the old version, the new one will be removed. If you choose "
-"the new version, the old database files will be left alone and you need to "
-"remove them manually. Otherwise this message will be displayed again (the old "
-"files are at $TDEHOME/share/apps/kbabeldict/dbsearchengine/*,old).</p>"
+"<qt>"
+"<p><b>File Options</b></p>"
+"<p>Here you can finetune where to find:"
+"<ul>"
+"<li><b>In all files</b>: search in all files, otherwise searched is the "
+"selected file or files in the selected folder</li>"
+"<li><b>Ask before next file</b>: show a dialog asking to proceed to the next "
+"file</li></ul></qt>"
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:185
-msgid "Old Database Found"
+#: catalogmanager/libsvn/svnhandler.cpp:90
+msgid "No SVN repository"
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:186
-msgid "Use &Old Database"
+#: catalogmanager/libsvn/svnhandler.cpp:93
+msgid "Not in SVN"
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:187
-msgid "Use &New Database"
+#: catalogmanager/libsvn/svnhandler.cpp:111
+msgid "Error in Working Copy"
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:258
+#: catalogmanager/libsvn/svnhandler.cpp:288
 msgid ""
-"Database files not found.\n"
-"Do you want to create them now?"
+"This is not a valid SVN repository. The SVN commands cannot be executed."
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:408
-msgid "Cannot open the database"
+#: catalogmanager/libsvn/svndialog.cpp:65
+msgid "SVN Dialog"
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:431
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:640
-msgid "Another search has already been started"
+#: catalogmanager/libsvn/svndialog.cpp:80
+msgid "Get remote status for the following files:"
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:438
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:647
-msgid "Unable to search now: a PO file scan is in progress"
+#: catalogmanager/libsvn/svndialog.cpp:83
+msgid "Get local status for the following files:"
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:445
-msgid "Unable to open the database"
+#: catalogmanager/libsvn/svndialog.cpp:89
+msgid "Get information for the following files:"
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:451
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:658
-msgid "Database empty"
+#: catalogmanager/libsvn/svndialog.cpp:145
+#, fuzzy
+msgid "&Get Information"
+msgstr "Gwybodaeth Catalog"
+
+#: catalogmanager/catalogmanager.cpp:225
+msgid "&Open Template"
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:462
-msgid "No entry for this package in the database."
+#: catalogmanager/catalogmanager.cpp:228
+msgid "Open in &New Window"
+msgstr "Agor mew&n Ffenestr Newydd"
+
+#: catalogmanager/catalogmanager.cpp:237
+msgid "Fi&nd in Files..."
+msgstr "Ca&nfod mewn Ffeiliau ..."
+
+#: catalogmanager/catalogmanager.cpp:240
+msgid "Re&place in Files..."
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:469
-msgid "Searching for %1 in database"
+#: catalogmanager/catalogmanager.cpp:251
+msgid "&Toggle Marking"
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:548
-msgid "Looking for repetitions"
+#: catalogmanager/catalogmanager.cpp:254
+msgid "Remove Marking"
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:562
-msgid "Minimum Repetition"
+#: catalogmanager/catalogmanager.cpp:257
+msgid "Toggle All Markings"
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:564
-msgid "Insert the minimum number of repetitions for a string:"
+#: catalogmanager/catalogmanager.cpp:260
+msgid "Remove All Markings"
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:572
-msgid "Searching repeated string"
+#: catalogmanager/catalogmanager.cpp:263
+msgid "Mark Modified Files"
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:1240
-msgid "Select Folder to Scan Recursively"
+#: catalogmanager/catalogmanager.cpp:267
+msgid "&Load Markings..."
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:1263
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:1315
-#, c-format
-msgid "Scanning folder %1"
-msgstr "Yn sganio plygell %1"
+#: catalogmanager/catalogmanager.cpp:270
+msgid "&Save Markings..."
+msgstr ""
 
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:1299
-msgid "Select Folder to Scan"
+#: catalogmanager/catalogmanager.cpp:273
+msgid "&Mark Files..."
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:1358
-msgid "Select PO File to Scan"
+#: catalogmanager/catalogmanager.cpp:275
+msgid "&Unmark Files..."
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:1372
-#, c-format
-msgid "Scanning file %1"
+#: catalogmanager/catalogmanager.cpp:309
+msgid "Next Te&mplate Only"
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:1608
-msgid "Searching words"
+#: catalogmanager/catalogmanager.cpp:312
+msgid "Previous Temp&late Only"
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:1850
-msgid "Process output"
+#: catalogmanager/catalogmanager.cpp:315
+msgid "Next Tran&slation Exists"
 msgstr ""
 
-#: kbabeldict/modules/poauxiliary/pa_factory.cpp:95
-#: kbabeldict/modules/poauxiliary/poauxiliary.cpp:147
-msgid "PO Auxiliary"
+#: catalogmanager/catalogmanager.cpp:318
+msgid "Previous Transl&ation Exists"
 msgstr ""
 
-#: kbabeldict/modules/poauxiliary/poauxiliary.cpp:426
-msgid "Loading PO auxiliary"
+#: catalogmanager/catalogmanager.cpp:322
+msgid "Previous Marke&d"
 msgstr ""
 
-#: kbabeldict/modules/poauxiliary/poauxiliary.cpp:438
-#, c-format
-msgid ""
-"Error while trying to open file for PO Auxiliary module:\n"
-"%1"
+#: catalogmanager/catalogmanager.cpp:325
+msgid "Next &Marked"
 msgstr ""
 
-#: kbabeldict/modules/poauxiliary/poauxiliary.cpp:450
-msgid "Building index"
+#: catalogmanager/catalogmanager.cpp:350
+msgid "&Statistics"
+msgstr "&Ystadegaeth"
+
+#: catalogmanager/catalogmanager.cpp:353
+msgid "S&tatistics in Marked"
 msgstr ""
 
-#: kbabeldict/modules/poauxiliary/pa_factory.cpp:97
-msgid "A simple module for exact searching in a PO file"
+#: catalogmanager/catalogmanager.cpp:356
+msgid "Check S&yntax"
 msgstr ""
 
-#: kbabeldict/kbabeldictview.cpp:83
-msgid "Search in module:"
+#: catalogmanager/catalogmanager.cpp:359
+msgid "S&pell Check"
+msgstr "G&wirio Sillafu"
+
+#: catalogmanager/catalogmanager.cpp:362
+msgid "Spell Check in &Marked"
 msgstr ""
 
-#: kbabeldict/kbabeldictview.cpp:106
-msgid "&Start Search"
+#: catalogmanager/catalogmanager.cpp:365
+msgid "&Rough Translation"
 msgstr ""
 
-#: kbabeldict/kbabeldictview.cpp:108
-msgid "Sea&rch in translations"
+#: catalogmanager/catalogmanager.cpp:368
+msgid "Rough Translation in M&arked"
 msgstr ""
 
-#: kbabeldict/kbabeldictview.cpp:125
-msgid "Settings:"
-msgstr "Gosodiadau :"
+#: catalogmanager/catalogmanager.cpp:371
+msgid "Mai&l"
+msgstr "Pos&t"
 
-#: kbabeldict/aboutmoduledlg.cpp:42
-msgid "Report Bug..."
-msgstr "Anfon adroddiad nam..."
+#: catalogmanager/catalogmanager.cpp:374
+msgid "Mail Mar&ked"
+msgstr ""
 
-#: kbabeldict/kbabeldict.cpp:45
-msgid "KBabelDict"
+#: catalogmanager/catalogmanager.cpp:378
+msgid "&Pack"
 msgstr ""
 
-#: kbabeldict/kbabeldict.cpp:47
-msgid "About Module"
+#: catalogmanager/catalogmanager.cpp:380
+msgid "Pack &Marked"
 msgstr ""
 
-#: kbabeldict/kbabeldict.cpp:48 kbabeldict/kbabeldict.cpp:104
-msgid "Hide Sett&ings"
+#: catalogmanager/catalogmanager.cpp:412
+msgid "V&alidation Marked"
 msgstr ""
 
-#: kbabeldict/kbabeldict.cpp:108
-msgid "Show Sett&ings"
+#: catalogmanager/catalogmanager.cpp:425 catalogmanager/catalogmanager.cpp:451
+msgid "Update"
+msgstr "Diweddaru"
+
+#: catalogmanager/catalogmanager.cpp:427 catalogmanager/catalogmanager.cpp:453
+msgid "Update Marked"
 msgstr ""
 
-#: kbabeldict/dictchooser.cpp:59
+#: catalogmanager/catalogmanager.cpp:429 catalogmanager/catalogmanager.cpp:455
+msgid "Commit"
+msgstr "Cyflwyno"
+
+#: catalogmanager/catalogmanager.cpp:431 catalogmanager/catalogmanager.cpp:457
+msgid "Commit Marked"
+msgstr ""
+
+#: catalogmanager/catalogmanager.cpp:433
+msgid "Status"
+msgstr "Cyflwr"
+
+#: catalogmanager/catalogmanager.cpp:435
+msgid "Status for Marked"
+msgstr ""
+
+#: catalogmanager/catalogmanager.cpp:437 catalogmanager/catalogmanager.cpp:467
+msgid "Show Diff"
+msgstr ""
+
+#: catalogmanager/catalogmanager.cpp:459
+#, fuzzy
+msgid "Status (Local)"
+msgstr "Cyflwr:"
+
+#: catalogmanager/catalogmanager.cpp:461
+msgid "Status (Local) for Marked"
+msgstr ""
+
+#: catalogmanager/catalogmanager.cpp:463
+#, fuzzy
+msgid "Status (Remote)"
+msgstr "Cyflwr:"
+
+#: catalogmanager/catalogmanager.cpp:465
+msgid "Status (Remote) for Marked"
+msgstr ""
+
+#: catalogmanager/catalogmanager.cpp:469
+#, fuzzy
+msgid "Show Information"
+msgstr "Gwybodaeth Catalog"
+
+#: catalogmanager/catalogmanager.cpp:471
+msgid "Show Information for Marked"
+msgstr ""
+
+#: catalogmanager/catalogmanager.cpp:488 catalogmanager/catalogmanager.cpp:503
+msgid "Update Templates"
+msgstr ""
+
+#: catalogmanager/catalogmanager.cpp:490 catalogmanager/catalogmanager.cpp:505
+msgid "Update Marked Templates"
+msgstr ""
+
+#: catalogmanager/catalogmanager.cpp:492 catalogmanager/catalogmanager.cpp:507
+msgid "Commit Templates"
+msgstr ""
+
+#: catalogmanager/catalogmanager.cpp:494 catalogmanager/catalogmanager.cpp:509
+msgid "Commit Marked Templates"
+msgstr ""
+
+#: catalogmanager/catalogmanager.cpp:525 catalogmanager/catalogmanager.cpp:529
+msgid "Commands"
+msgstr "Gorchmynion:"
+
+#: catalogmanager/catalogmanager.cpp:558
 msgid ""
-"_: dictionary to not use\n"
-"Do not use:"
+"<qt>"
+"<p><b>Statusbar</b></p>\n"
+"<p>The statusbar displays information about progress of the current find or "
+"replace operation. The first number in <b>Found:</b> "
+"displays the number of files with an occurrence of the searched text not yet "
+"shown in the KBabel window. The second shows the total number of files "
+"containing the searched text found so far.</p></qt>"
 msgstr ""
 
-#: kbabeldict/dictchooser.cpp:62
+#: catalogmanager/catalogmanager.cpp:663 catalogmanager/catalogmanager.cpp:696
+#: catalogmanager/catalogmanager.cpp:727 catalogmanager/catalogmanager.cpp:757
+#: catalogmanager/catalogmanager.cpp:787 catalogmanager/catalogmanager.cpp:807
+#: catalogmanager/catalogmanager.cpp:827
 msgid ""
-"_: dictionary to use\n"
-"Use:"
-msgstr "Defnydd :"
+"Cannot send a message to KBabel.\n"
+"Please check your TDE installation."
+msgstr ""
 
-#: kbabeldict/dictchooser.cpp:84
-msgid "Move &Up"
-msgstr "Symud i &Fyny"
+#: catalogmanager/catalogmanager.cpp:858
+msgid ""
+"Unable to use TDELauncher to start KBabel.\n"
+"You should check the installation of TDE.\n"
+"Please start KBabel manually."
+msgstr ""
 
-#: kbabeldict/dictchooser.cpp:87
-msgid "Move &Down"
-msgstr "Symud i &Lawr"
+#: catalogmanager/catalogmanager.cpp:893
+msgid "Found: 0/0"
+msgstr ""
 
-#: kbabeldict/dictchooser.cpp:90
-msgid "Con&figure..."
-msgstr "Ffurf&weddu..."
+#: catalogmanager/catalogmanager.cpp:915
+msgid "Found: %1/%2"
+msgstr ""
+
+#: catalogmanager/catalogmanager.cpp:986
+#: catalogmanager/catalogmanager.cpp:1073
+msgid "DCOP communication with KBabel failed."
+msgstr ""
+
+#: catalogmanager/catalogmanager.cpp:986
+#: catalogmanager/catalogmanager.cpp:1073
+msgid "DCOP Communication Error"
+msgstr "Gwall Cyfathrebu DCOP"
+
+#: catalogmanager/catalogmanager.cpp:1001
+#: catalogmanager/catalogmanager.cpp:1087
+msgid "KBabel cannot be started."
+msgstr ""
+
+#: catalogmanager/catalogmanager.cpp:1001
+#: catalogmanager/catalogmanager.cpp:1087
+msgid "Cannot Start KBabel"
+msgstr ""
+
+#: catalogmanager/catalogmanager.cpp:1008
+#: catalogmanager/catalogmanager.cpp:1094
+msgid "Search string not found!"
+msgstr ""
+
+#: catalogmanager/catalogmanager.cpp:1235
+#, c-format
+msgid "Cannot open project file %1"
+msgstr ""
+
+#: catalogmanager/main.cpp:186
+msgid "KBabel - Catalog Manager"
+msgstr "KBabel - Rheolwr Catalog"
+
+#: catalogmanager/main.cpp:187
+msgid "An advanced catalog manager for KBabel"
+msgstr ""
+
+#: catalogmanager/main.cpp:211
+msgid "Support for making diffs and some minor improvements."
+msgstr ""
+
+#: catalogmanager/main.cpp:216
+msgid "KBabel contains code from GNU gettext"
+msgstr ""
 
 #, fuzzy
 #~ msgid ""
diff --git a/tde-i18n-cy/messages/tdesdk/kbugbuster.po b/tde-i18n-cy/messages/tdesdk/kbugbuster.po
index 3d8fa21f517..e055ca21ca3 100644
--- a/tde-i18n-cy/messages/tdesdk/kbugbuster.po
+++ b/tde-i18n-cy/messages/tdesdk/kbugbuster.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdesdk/kbugbuster.po\n"
-"POT-Creation-Date: 2008-07-08 01:21+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -311,16 +312,16 @@ msgstr ""
 msgid "My Bugs"
 msgstr ""
 
-#: backend/bugserver.cpp:289
+#: backend/bugserver.cpp:290
 msgid "Mail generated by KBugBuster"
 msgstr ""
 
-#: backend/bugserver.cpp:321
+#: backend/bugserver.cpp:322
 #, c-format
 msgid "Control command: %1"
 msgstr ""
 
-#: backend/bugserver.cpp:323
+#: backend/bugserver.cpp:324
 #, c-format
 msgid "Mail to %1"
 msgstr "Ebost i %1"
@@ -330,7 +331,7 @@ msgid "Retrieving My Bugs list..."
 msgstr ""
 
 #: backend/kbbprefs.cpp:137
-msgid "Bug Fixed in CVS"
+msgid "Bug Fixed in GIT"
 msgstr ""
 
 #: backend/kbbprefs.cpp:140
@@ -342,7 +343,7 @@ msgid "Packaging Bug"
 msgstr ""
 
 #: backend/kbbprefs.cpp:149
-msgid "Feature Implemented in CVS"
+msgid "Feature Implemented in GIT"
 msgstr ""
 
 #: backend/kbbprefs.cpp:152
@@ -788,15 +789,15 @@ msgid "&Recipient:"
 msgstr "&Derbyniwr:"
 
 #: gui/msginputdialog.cpp:63
-msgid "Normal (bugs.kde.org & Maintainer & kde-bugs-dist)"
+msgid "Normal (bugs.trinitydesktop.org & Maintainer & tde-bugs-dist)"
 msgstr ""
 
 #: gui/msginputdialog.cpp:64
-msgid "Maintonly (bugs.kde.org & Maintainer)"
+msgid "Maintonly (bugs.trinitydesktop.org & Maintainer)"
 msgstr ""
 
 #: gui/msginputdialog.cpp:65
-msgid "Quiet (bugs.kde.org only)"
+msgid "Quiet (bugs.trinitydesktop.org only)"
 msgstr ""
 
 #: gui/msginputdialog.cpp:77
diff --git a/tde-i18n-cy/messages/tdesdk/kompare.po b/tde-i18n-cy/messages/tdesdk/kompare.po
index fbe656dbe49..e20b5d58626 100644
--- a/tde-i18n-cy/messages/tdesdk/kompare.po
+++ b/tde-i18n-cy/messages/tdesdk/kompare.po
@@ -1,14 +1,460 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdesdk/kompare.po\n"
-"POT-Creation-Date: 2007-12-20 01:16+0100\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "KD wrth KGyfieithu"
+
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "kyfieithu@dotmon.com"
+
+#: komparenavtreepart/komparenavtreepart.cpp:61
+msgid "Source Folder"
+msgstr ""
+
+#: komparenavtreepart/komparenavtreepart.cpp:66
+msgid "Destination Folder"
+msgstr ""
+
+#: komparenavtreepart/komparenavtreepart.cpp:71
+msgid "Source File"
+msgstr "Ffeil Tarddiad"
+
+#: komparenavtreepart/komparenavtreepart.cpp:72
+msgid "Destination File"
+msgstr ""
+
+#: komparenavtreepart/komparenavtreepart.cpp:78
+msgid "Source Line"
+msgstr ""
+
+#: komparenavtreepart/komparenavtreepart.cpp:79
+msgid "Destination Line"
+msgstr ""
+
+#: komparenavtreepart/komparenavtreepart.cpp:80
+msgid "Difference"
+msgstr ""
+
+#: komparenavtreepart/komparenavtreepart.cpp:426
+#, c-format
+msgid ""
+"_n: Applied: Changes made to %n line undone\n"
+"Applied: Changes made to  %n lines undone"
+msgstr ""
+
+#: komparenavtreepart/komparenavtreepart.cpp:429
+#, c-format
+msgid ""
+"_n: Changed %n line\n"
+"Changed %n lines"
+msgstr ""
+
+#: komparenavtreepart/komparenavtreepart.cpp:434
+#, c-format
+msgid ""
+"_n: Applied: Insertion of %n line undone\n"
+"Applied: Insertion of %n lines undone"
+msgstr ""
+
+#: komparenavtreepart/komparenavtreepart.cpp:437
+#, c-format
+msgid ""
+"_n: Inserted %n line\n"
+"Inserted %n lines"
+msgstr ""
+
+#: komparenavtreepart/komparenavtreepart.cpp:442
+#, c-format
+msgid ""
+"_n: Applied: Deletion of %n line undone\n"
+"Applied: Deletion of %n lines undone"
+msgstr ""
+
+#: komparenavtreepart/komparenavtreepart.cpp:445
+#, c-format
+msgid ""
+"_n: Deleted %n line\n"
+"Deleted %n lines"
+msgstr ""
+
+#: komparenavtreepart/komparenavtreepart.cpp:531
+#: komparepart/kompare_part.cpp:651
+msgid "Unknown"
+msgstr "Anhysbys"
+
+#: komparenavtreepart/komparenavtreepart.cpp:694
+msgid "KompareNavTreePart"
+msgstr "KompareNavTreePart"
+
+#: libdiff2/komparemodellist.cpp:61
+msgid "&Apply Difference"
+msgstr ""
+
+#: libdiff2/komparemodellist.cpp:64
+msgid "Un&apply Difference"
+msgstr ""
+
+#: libdiff2/komparemodellist.cpp:67
+msgid "App&ly All"
+msgstr ""
+
+#: libdiff2/komparemodellist.cpp:70
+msgid "&Unapply All"
+msgstr ""
+
+#: libdiff2/komparemodellist.cpp:73
+msgid "P&revious File"
+msgstr ""
+
+#: libdiff2/komparemodellist.cpp:76
+msgid "N&ext File"
+msgstr ""
+
+#: libdiff2/komparemodellist.cpp:79
+msgid "&Previous Difference"
+msgstr ""
+
+#: libdiff2/komparemodellist.cpp:82
+msgid "&Next Difference"
+msgstr ""
+
+#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262
+msgid ""
+"<qt>No models or no differences, this file: <b>%1</b>"
+", is not a valid diff file.</qt>"
+msgstr ""
+
+#: libdiff2/komparemodellist.cpp:246
+msgid ""
+"<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</qt>"
+msgstr ""
+
+#: libdiff2/komparemodellist.cpp:271
+msgid ""
+"<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>"
+".</qt>"
+msgstr ""
+
+#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582
+msgid "Could not open a temporary file."
+msgstr ""
+
+#: libdiff2/komparemodellist.cpp:350
+msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>"
+msgstr ""
+
+#: libdiff2/komparemodellist.cpp:368
+msgid ""
+"<qt>Could not create destination directory <b>%1</b>.\n"
+"The file has not been saved.</qt>"
+msgstr ""
+
+#: libdiff2/komparemodellist.cpp:383
+msgid ""
+"<qt>Could not upload the temporary file to the destination location <b>%1</b>"
+". The temporary file is still available under: <b>%2</b>"
+". You can manually copy it to the right place.</qt>"
+msgstr ""
+
+#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548
+msgid "Could not parse diff output."
+msgstr ""
+
+#: libdiff2/komparemodellist.cpp:451
+msgid "The files are identical."
+msgstr ""
+
+#: libdiff2/komparemodellist.cpp:613
+msgid "Could not write to the temporary file."
+msgstr ""
+
+#: kompare_shell.cpp:77
+msgid "Could not find our KompareViewPart."
+msgstr ""
+
+#: kompare_shell.cpp:106
+msgid "Could not load our KompareViewPart."
+msgstr ""
+
+#: kompare_shell.cpp:114
+msgid "Could not find our KompareNavigationPart."
+msgstr ""
+
+#: kompare_shell.cpp:138
+msgid "Could not load our KompareNavigationPart."
+msgstr ""
+
+#: kompare_shell.cpp:233
+msgid "&Open Diff..."
+msgstr ""
+
+#: kompare_shell.cpp:234
+msgid "&Compare Files..."
+msgstr ""
+
+#: kompare_shell.cpp:237
+msgid "&Blend URL with Diff..."
+msgstr ""
+
+#: kompare_shell.cpp:246
+msgid "Show T&ext View"
+msgstr ""
+
+#: kompare_shell.cpp:248
+msgid "Hide T&ext View"
+msgstr ""
+
+#: kompare_shell.cpp:257
+msgid " 0 of 0 differences "
+msgstr ""
+
+#: kompare_shell.cpp:258
+msgid " 0 of 0 files "
+msgstr ""
+
+#: kompare_shell.cpp:273
+msgid ""
+"_n:  %1 of %n file \n"
+" %1 of %n files "
+msgstr ""
+
+#: kompare_shell.cpp:275
+#, c-format
+msgid ""
+"_n:  %n file \n"
+" %n files "
+msgstr ""
+
+#: kompare_shell.cpp:278
+msgid ""
+"_n:  %1 of %n difference, %2 applied \n"
+" %1 of %n differences, %2 applied "
+msgstr ""
+
+#: kompare_shell.cpp:281
+#, c-format
+msgid ""
+"_n:  %n difference \n"
+" %n differences "
+msgstr ""
+
+#: kompare_shell.cpp:369
+msgid "Blend File/Folder with diff Output"
+msgstr ""
+
+#: kompare_shell.cpp:370
+msgid "File/Folder"
+msgstr ""
+
+#: kompare_shell.cpp:371
+msgid "Diff Output"
+msgstr ""
+
+#: kompare_shell.cpp:373
+msgid "Blend"
+msgstr ""
+
+#: kompare_shell.cpp:373
+msgid "Blend this file or folder with the diff output"
+msgstr ""
+
+#: kompare_shell.cpp:373
+msgid ""
+"If you have entered a file or folder name and a file that contains diff output "
+"in the fields in this dialog then this button will be enabled and pressing it "
+"will open kompare's main view where the output of the entered file or files "
+"from the folder are mixed with the diff output so you can then apply the "
+"difference(s) to a file or to the files. "
+msgstr ""
+
+#: kompare_shell.cpp:398 main.cpp:185
+msgid "Compare Files or Folders"
+msgstr ""
+
+#: kompare_shell.cpp:399 main.cpp:186
+msgid "Source"
+msgstr "Tarddiad"
+
+#: kompare_shell.cpp:400 main.cpp:187
+msgid "Destination"
+msgstr "Cyrchfan"
+
+#: kompare_shell.cpp:402 main.cpp:189
+msgid "Compare"
+msgstr ""
+
+#: kompare_shell.cpp:402
+msgid "Compare these files or folders"
+msgstr ""
+
+#: kompare_shell.cpp:402 main.cpp:189
+msgid ""
+"If you have entered 2 filenames or 2 folders in the fields in this dialog then "
+"this button will be enabled and pressing it will start a comparison of the "
+"entered files or folders. "
+msgstr ""
+
+#: kompare_shell.cpp:439
+msgid "Text View"
+msgstr "Golwg Testun"
+
+#: kompareurldialog.cpp:41
+msgid "Here you can enter the files you want to compare."
+msgstr ""
+
+#: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47
+msgid "Diff"
+msgstr "Diff"
+
+#: kompareurldialog.cpp:47
+msgid "Here you can change the options for comparing the files."
+msgstr ""
+
+#: kompareurldialog.cpp:53
+msgid "Here you can change the options for the view."
+msgstr ""
+
+#. i18n: file komparepart/komparepartui.rc line 13
+#: rc.cpp:15
+#, no-c-format
+msgid "&Difference"
+msgstr ""
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 41
+#: rc.cpp:21
+#, no-c-format
+msgid "Run Diff In"
+msgstr ""
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 84
+#: rc.cpp:24
+#, no-c-format
+msgid "Command Line"
+msgstr "Llinell orchymyn"
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 108
+#: rc.cpp:27
+#, no-c-format
+msgid "cd dir && diff -udHprNa -- source destination"
+msgstr ""
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 135
+#: rc.cpp:33
+#, no-c-format
+msgid "Look for smaller changes"
+msgstr ""
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 146
+#: rc.cpp:36
+#, no-c-format
+msgid "Optimize for large files"
+msgstr ""
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 157
+#: rc.cpp:39
+#, no-c-format
+msgid "Ignore changes in case"
+msgstr ""
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 165
+#: rc.cpp:42
+#, no-c-format
+msgid "Expand tabs to spaces"
+msgstr ""
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 173
+#: rc.cpp:45
+#, no-c-format
+msgid "Ignore added or removed empty lines"
+msgstr ""
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 181
+#: rc.cpp:48
+#, no-c-format
+msgid "Ignore changes in whitespace"
+msgstr ""
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 189
+#: rc.cpp:51
+#, no-c-format
+msgid "Show function names"
+msgstr ""
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 200
+#: rc.cpp:54
+#, no-c-format
+msgid "Compare folders recursively"
+msgstr ""
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 211
+#: rc.cpp:57
+#, no-c-format
+msgid "Treat new files as empty"
+msgstr ""
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 227
+#: rc.cpp:60
+#, no-c-format
+msgid "Format"
+msgstr "Fformat"
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 244
+#: komparepart/kompare_part.cpp:638 libdialogpages/diffpage.cpp:238 rc.cpp:63
+#, no-c-format
+msgid "Context"
+msgstr ""
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 252
+#: komparepart/kompare_part.cpp:644 libdialogpages/diffpage.cpp:239 rc.cpp:66
+#, no-c-format
+msgid "Ed"
+msgstr ""
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 260
+#: komparepart/kompare_part.cpp:647 libdialogpages/diffpage.cpp:241 rc.cpp:69
+#, no-c-format
+msgid "Normal"
+msgstr "Arferol"
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 268
+#: komparepart/kompare_part.cpp:641 libdialogpages/diffpage.cpp:242 rc.cpp:72
+#, no-c-format
+msgid "RCS"
+msgstr ""
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 276
+#: komparepart/kompare_part.cpp:635 libdialogpages/diffpage.cpp:244 rc.cpp:75
+#, no-c-format
+msgid "Unified"
+msgstr ""
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 287
+#: rc.cpp:78
+#, no-c-format
+msgid "Side-by-side"
+msgstr ""
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 312
+#: libdialogpages/diffpage.cpp:251 rc.cpp:81
+#, no-c-format
+msgid "Number of context lines:"
+msgstr ""
+
 #: komparepart/kompareprefdlg.cpp:33
 msgid "Preferences"
 msgstr "Hoffterau"
@@ -17,10 +463,6 @@ msgstr "Hoffterau"
 msgid "View Settings"
 msgstr "Gweld Gosodiadau"
 
-#: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47
-msgid "Diff"
-msgstr "Diff"
-
 #: komparepart/kompareprefdlg.cpp:43
 msgid "Diff Settings"
 msgstr ""
@@ -120,41 +562,6 @@ msgstr ""
 msgid "Save Changes?"
 msgstr "Cadw Newidiadau?"
 
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 276
-#: komparepart/kompare_part.cpp:635 libdialogpages/diffpage.cpp:244 rc.cpp:75
-#, no-c-format
-msgid "Unified"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 244
-#: komparepart/kompare_part.cpp:638 libdialogpages/diffpage.cpp:238 rc.cpp:63
-#, no-c-format
-msgid "Context"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 268
-#: komparepart/kompare_part.cpp:641 libdialogpages/diffpage.cpp:242 rc.cpp:72
-#, no-c-format
-msgid "RCS"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 252
-#: komparepart/kompare_part.cpp:644 libdialogpages/diffpage.cpp:239 rc.cpp:66
-#, no-c-format
-msgid "Ed"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 260
-#: komparepart/kompare_part.cpp:647 libdialogpages/diffpage.cpp:241 rc.cpp:69
-#, no-c-format
-msgid "Normal"
-msgstr "Arferol"
-
-#: komparenavtreepart/komparenavtreepart.cpp:531
-#: komparepart/kompare_part.cpp:651
-msgid "Unknown"
-msgstr "Anhysbys"
-
 #: komparepart/kompare_part.cpp:667
 msgid ""
 "No diff file, or no 2 files have been diffed. Therefore no stats are available."
@@ -191,6 +598,14 @@ msgid ""
 "Number of differences: %6"
 msgstr ""
 
+#: libdialogpages/filespage.cpp:53
+msgid "Encoding"
+msgstr "Amgodiad"
+
+#: libdialogpages/filespage.cpp:64
+msgid "&Files"
+msgstr "&Ffeiliau"
+
 #: libdialogpages/viewpage.cpp:51
 msgid "Colors"
 msgstr "Lliwiau"
@@ -273,12 +688,6 @@ msgstr ""
 msgid "Lines of Context"
 msgstr ""
 
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 312
-#: libdialogpages/diffpage.cpp:251 rc.cpp:81
-#, no-c-format
-msgid "Number of context lines:"
-msgstr ""
-
 #: libdialogpages/diffpage.cpp:253
 msgid ""
 "The number of context lines is normally 2 or 3. This makes the diff readable "
@@ -431,26 +840,6 @@ msgstr ""
 msgid "&Exclude"
 msgstr ""
 
-#: libdialogpages/filespage.cpp:53
-msgid "Encoding"
-msgstr "Amgodiad"
-
-#: libdialogpages/filespage.cpp:64
-msgid "&Files"
-msgstr "&Ffeiliau"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "KD wrth KGyfieithu"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "kyfieithu@dotmon.com"
-
 #: main.cpp:33
 msgid ""
 "A program to view the differences between files and optionally generate a diff"
@@ -511,394 +900,6 @@ msgstr ""
 msgid "Cervisia diff viewer"
 msgstr ""
 
-#: kompare_shell.cpp:397 main.cpp:185
-msgid "Compare Files or Folders"
-msgstr ""
-
-#: kompare_shell.cpp:398 main.cpp:186
-msgid "Source"
-msgstr "Tarddiad"
-
-#: kompare_shell.cpp:399 main.cpp:187
-msgid "Destination"
-msgstr "Cyrchfan"
-
-#: kompare_shell.cpp:401 main.cpp:189
-msgid "Compare"
-msgstr ""
-
 #: main.cpp:189
 msgid "Compare these files or folder"
 msgstr ""
-
-#: kompare_shell.cpp:401 main.cpp:189
-msgid ""
-"If you have entered 2 filenames or 2 folders in the fields in this dialog then "
-"this button will be enabled and pressing it will start a comparison of the "
-"entered files or folders. "
-msgstr ""
-
-#: kompareurldialog.cpp:41
-msgid "Here you can enter the files you want to compare."
-msgstr ""
-
-#: kompareurldialog.cpp:47
-msgid "Here you can change the options for comparing the files."
-msgstr ""
-
-#: kompareurldialog.cpp:53
-msgid "Here you can change the options for the view."
-msgstr ""
-
-#: komparenavtreepart/komparenavtreepart.cpp:61
-msgid "Source Folder"
-msgstr ""
-
-#: komparenavtreepart/komparenavtreepart.cpp:66
-msgid "Destination Folder"
-msgstr ""
-
-#: komparenavtreepart/komparenavtreepart.cpp:71
-msgid "Source File"
-msgstr "Ffeil Tarddiad"
-
-#: komparenavtreepart/komparenavtreepart.cpp:72
-msgid "Destination File"
-msgstr ""
-
-#: komparenavtreepart/komparenavtreepart.cpp:78
-msgid "Source Line"
-msgstr ""
-
-#: komparenavtreepart/komparenavtreepart.cpp:79
-msgid "Destination Line"
-msgstr ""
-
-#: komparenavtreepart/komparenavtreepart.cpp:80
-msgid "Difference"
-msgstr ""
-
-#: komparenavtreepart/komparenavtreepart.cpp:426
-#, c-format
-msgid ""
-"_n: Applied: Changes made to %n line undone\n"
-"Applied: Changes made to  %n lines undone"
-msgstr ""
-
-#: komparenavtreepart/komparenavtreepart.cpp:429
-#, c-format
-msgid ""
-"_n: Changed %n line\n"
-"Changed %n lines"
-msgstr ""
-
-#: komparenavtreepart/komparenavtreepart.cpp:434
-#, c-format
-msgid ""
-"_n: Applied: Insertion of %n line undone\n"
-"Applied: Insertion of %n lines undone"
-msgstr ""
-
-#: komparenavtreepart/komparenavtreepart.cpp:437
-#, c-format
-msgid ""
-"_n: Inserted %n line\n"
-"Inserted %n lines"
-msgstr ""
-
-#: komparenavtreepart/komparenavtreepart.cpp:442
-#, c-format
-msgid ""
-"_n: Applied: Deletion of %n line undone\n"
-"Applied: Deletion of %n lines undone"
-msgstr ""
-
-#: komparenavtreepart/komparenavtreepart.cpp:445
-#, c-format
-msgid ""
-"_n: Deleted %n line\n"
-"Deleted %n lines"
-msgstr ""
-
-#: komparenavtreepart/komparenavtreepart.cpp:694
-msgid "KompareNavTreePart"
-msgstr "KompareNavTreePart"
-
-#. i18n: file komparepart/komparepartui.rc line 13
-#: rc.cpp:15
-#, no-c-format
-msgid "&Difference"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 41
-#: rc.cpp:21
-#, no-c-format
-msgid "Run Diff In"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 84
-#: rc.cpp:24
-#, no-c-format
-msgid "Command Line"
-msgstr "Llinell orchymyn"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 108
-#: rc.cpp:27
-#, no-c-format
-msgid "cd dir && diff -udHprNa -- source destination"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 135
-#: rc.cpp:33
-#, no-c-format
-msgid "Look for smaller changes"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 146
-#: rc.cpp:36
-#, no-c-format
-msgid "Optimize for large files"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 157
-#: rc.cpp:39
-#, no-c-format
-msgid "Ignore changes in case"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 165
-#: rc.cpp:42
-#, no-c-format
-msgid "Expand tabs to spaces"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 173
-#: rc.cpp:45
-#, no-c-format
-msgid "Ignore added or removed empty lines"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 181
-#: rc.cpp:48
-#, no-c-format
-msgid "Ignore changes in whitespace"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 189
-#: rc.cpp:51
-#, no-c-format
-msgid "Show function names"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 200
-#: rc.cpp:54
-#, no-c-format
-msgid "Compare folders recursively"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 211
-#: rc.cpp:57
-#, no-c-format
-msgid "Treat new files as empty"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 227
-#: rc.cpp:60
-#, no-c-format
-msgid "Format"
-msgstr "Fformat"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 287
-#: rc.cpp:78
-#, no-c-format
-msgid "Side-by-side"
-msgstr ""
-
-#: kompare_shell.cpp:77
-msgid "Could not find our KompareViewPart."
-msgstr ""
-
-#: kompare_shell.cpp:106
-msgid "Could not load our KompareViewPart."
-msgstr ""
-
-#: kompare_shell.cpp:114
-msgid "Could not find our KompareNavigationPart."
-msgstr ""
-
-#: kompare_shell.cpp:138
-msgid "Could not load our KompareNavigationPart."
-msgstr ""
-
-#: kompare_shell.cpp:232
-msgid "&Open Diff..."
-msgstr ""
-
-#: kompare_shell.cpp:233
-msgid "&Compare Files..."
-msgstr ""
-
-#: kompare_shell.cpp:236
-msgid "&Blend URL with Diff..."
-msgstr ""
-
-#: kompare_shell.cpp:245
-msgid "Show T&ext View"
-msgstr ""
-
-#: kompare_shell.cpp:247
-msgid "Hide T&ext View"
-msgstr ""
-
-#: kompare_shell.cpp:256
-msgid " 0 of 0 differences "
-msgstr ""
-
-#: kompare_shell.cpp:257
-msgid " 0 of 0 files "
-msgstr ""
-
-#: kompare_shell.cpp:272
-msgid ""
-"_n:  %1 of %n file \n"
-" %1 of %n files "
-msgstr ""
-
-#: kompare_shell.cpp:274
-#, c-format
-msgid ""
-"_n:  %n file \n"
-" %n files "
-msgstr ""
-
-#: kompare_shell.cpp:277
-msgid ""
-"_n:  %1 of %n difference, %2 applied \n"
-" %1 of %n differences, %2 applied "
-msgstr ""
-
-#: kompare_shell.cpp:280
-#, c-format
-msgid ""
-"_n:  %n difference \n"
-" %n differences "
-msgstr ""
-
-#: kompare_shell.cpp:368
-msgid "Blend File/Folder with diff Output"
-msgstr ""
-
-#: kompare_shell.cpp:369
-msgid "File/Folder"
-msgstr ""
-
-#: kompare_shell.cpp:370
-msgid "Diff Output"
-msgstr ""
-
-#: kompare_shell.cpp:372
-msgid "Blend"
-msgstr ""
-
-#: kompare_shell.cpp:372
-msgid "Blend this file or folder with the diff output"
-msgstr ""
-
-#: kompare_shell.cpp:372
-msgid ""
-"If you have entered a file or folder name and a file that contains diff output "
-"in the fields in this dialog then this button will be enabled and pressing it "
-"will open kompare's main view where the output of the entered file or files "
-"from the folder are mixed with the diff output so you can then apply the "
-"difference(s) to a file or to the files. "
-msgstr ""
-
-#: kompare_shell.cpp:401
-msgid "Compare these files or folders"
-msgstr ""
-
-#: kompare_shell.cpp:439
-msgid "Text View"
-msgstr "Golwg Testun"
-
-#: libdiff2/komparemodellist.cpp:61
-msgid "&Apply Difference"
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:64
-msgid "Un&apply Difference"
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:67
-msgid "App&ly All"
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:70
-msgid "&Unapply All"
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:73
-msgid "P&revious File"
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:76
-msgid "N&ext File"
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:79
-msgid "&Previous Difference"
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:82
-msgid "&Next Difference"
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262
-msgid ""
-"<qt>No models or no differences, this file: <b>%1</b>"
-", is not a valid diff file.</qt>"
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:246
-msgid ""
-"<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</qt>"
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:271
-msgid ""
-"<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>"
-".</qt>"
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582
-msgid "Could not open a temporary file."
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:350
-msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>"
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:368
-msgid ""
-"<qt>Could not create destination directory <b>%1</b>.\n"
-"The file has not been saved.</qt>"
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:383
-msgid ""
-"<qt>Could not upload the temporary file to the destination location <b>%1</b>"
-". The temporary file is still available under: <b>%2</b>"
-". You can manually copy it to the right place.</qt>"
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548
-msgid "Could not parse diff output."
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:451
-msgid "The files are identical."
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:613
-msgid "Could not write to the temporary file."
-msgstr ""
diff --git a/tde-i18n-cy/messages/tdesdk/kres_bugzilla.po b/tde-i18n-cy/messages/tdesdk/kres_bugzilla.po
index 0c8c3450a5a..b79fd2ab133 100644
--- a/tde-i18n-cy/messages/tdesdk/kres_bugzilla.po
+++ b/tde-i18n-cy/messages/tdesdk/kres_bugzilla.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: all2.po\n"
-"POT-Creation-Date: 2005-05-18 21:25+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdesdk/kstartperf.po b/tde-i18n-cy/messages/tdesdk/kstartperf.po
index 4fa061227ea..1f4b04c85d9 100644
--- a/tde-i18n-cy/messages/tdesdk/kstartperf.po
+++ b/tde-i18n-cy/messages/tdesdk/kstartperf.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdesdk/kstartperf.po\n"
-"POT-Creation-Date: 2005-05-18 21:25+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdesdk/kuiviewer.po b/tde-i18n-cy/messages/tdesdk/kuiviewer.po
index 4706899976b..de5bc8f77c5 100644
--- a/tde-i18n-cy/messages/tdesdk/kuiviewer.po
+++ b/tde-i18n-cy/messages/tdesdk/kuiviewer.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdesdk/kuiviewer.po\n"
-"POT-Creation-Date: 2005-05-18 21:25+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdesdk/spy.po b/tde-i18n-cy/messages/tdesdk/spy.po
index ebe28746262..77b071c5b25 100644
--- a/tde-i18n-cy/messages/tdesdk/spy.po
+++ b/tde-i18n-cy/messages/tdesdk/spy.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdesdk/spy.po\n"
-"POT-Creation-Date: 2005-05-18 21:25+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,14 +22,6 @@ msgstr "Math"
 msgid "Member Name"
 msgstr ""
 
-#: classinfoview.cpp:30 navview.cpp:28 propsview.cpp:53
-msgid "Name"
-msgstr "Enw"
-
-#: classinfoview.cpp:31 propsview.cpp:54
-msgid "Value"
-msgstr "Gwerth"
-
 #: _translatorinfo.cpp:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
@@ -41,10 +34,6 @@ msgid ""
 "Your emails"
 msgstr "kyfieithu@dotmon.com"
 
-#: main.cpp:25 main.cpp:38
-msgid "Spy"
-msgstr "Ysbio"
-
 #: spy.cpp:67
 msgid "Signals && Slots"
 msgstr ""
@@ -57,6 +46,14 @@ msgstr ""
 msgid "Class Info"
 msgstr ""
 
+#: classinfoview.cpp:30 navview.cpp:28 propsview.cpp:53
+msgid "Name"
+msgstr "Enw"
+
+#: classinfoview.cpp:31 propsview.cpp:54
+msgid "Value"
+msgstr "Gwerth"
+
 #: propsview.cpp:56
 msgid "Access"
 msgstr "Cyrchiad"
@@ -69,6 +66,10 @@ msgstr ""
 msgid "Type Flags"
 msgstr ""
 
+#: main.cpp:25 main.cpp:38
+msgid "Spy"
+msgstr "Ysbio"
+
 #: sigslotview.cpp:30
 msgid "Signals/Slots"
 msgstr ""
diff --git a/tde-i18n-cy/messages/tdesdk/tdecachegrind.po b/tde-i18n-cy/messages/tdesdk/tdecachegrind.po
index 440a42e4120..e07d23721a9 100644
--- a/tde-i18n-cy/messages/tdesdk/tdecachegrind.po
+++ b/tde-i18n-cy/messages/tdesdk/tdecachegrind.po
@@ -1,178 +1,306 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdesdk/tdecachegrind.po\n"
-"POT-Creation-Date: 2008-07-08 01:21+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: instritem.cpp:106 sourceitem.cpp:86
-msgid "Active call to '%1'"
-msgstr ""
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "KD wrth KGyfieithu"
 
-#: instritem.cpp:108 sourceitem.cpp:88
+#: _translatorinfo.cpp:3
 msgid ""
-"_n: %n call to '%1'\n"
-"%n calls to '%1'"
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "kyfieithu@dotmon.com"
+
+#: cachegrindloader.cpp:141
+msgid "Import filter for Cachegrind/Callgrind generated profile data files"
 msgstr ""
 
-#: instritem.cpp:137
-msgid "Jump %1 of %2 times to 0x%3"
+#: cachegrindloader.cpp:738
+#, c-format
+msgid "Loading %1"
+msgstr "llwytho %1"
+
+#: tabview.cpp:64
+msgid "Move to Top"
 msgstr ""
 
-#: instritem.cpp:142
-msgid "Jump %1 times to 0x%2"
+#: tabview.cpp:68
+msgid "Move to Right"
 msgstr ""
 
-#: instritem.cpp:185 sourceitem.cpp:169
-msgid "(cycle)"
+#: tabview.cpp:72
+msgid "Move to Bottom"
 msgstr ""
 
-#: tracedata.cpp:157
-msgid "Abstract Item"
+#: tabview.cpp:76
+msgid "Move to Bottom Left"
 msgstr ""
 
-#: tracedata.cpp:158
-msgid "Cost Item"
+#: tabview.cpp:77 tabview.cpp:94 treemap.cpp:2908
+msgid "Bottom Left"
+msgstr "Chwith Gwaelod"
+
+#: tabview.cpp:79
+msgid "Move Area To"
 msgstr ""
 
-#: tracedata.cpp:159
-msgid "Part Source Line"
+#: tabview.cpp:81
+msgid "Hide This Tab"
 msgstr ""
 
-#: tracedata.cpp:160
-msgid "Source Line"
+#: tabview.cpp:82
+msgid "Hide Area"
 msgstr ""
 
-#: tracedata.cpp:161
-msgid "Part Line Call"
+#: tabview.cpp:95
+msgid "Show Hidden On"
 msgstr ""
 
-#: tracedata.cpp:162
-msgid "Line Call"
+#: tabview.cpp:242
+msgid "(No profile data file loaded)"
 msgstr ""
 
-#: tracedata.cpp:163
-msgid "Part Jump"
+#: tabview.cpp:281
+msgid "Types"
+msgstr "Mathau"
+
+#: tabview.cpp:284
+msgid "Callers"
 msgstr ""
 
-#: tracedata.cpp:164
-msgid "Jump"
+#: tabview.cpp:287
+msgid "All Callers"
 msgstr ""
 
-#: tracedata.cpp:165
-msgid "Part Instruction"
+#: tabview.cpp:290
+msgid "Caller Map"
 msgstr ""
 
-#: tracedata.cpp:166
-msgid "Instruction"
+#: tabview.cpp:293
+msgid "Source"
+msgstr "Tarddiad"
+
+#: tabview.cpp:297
+msgid "Parts"
+msgstr "Rhannau"
+
+#: tabview.cpp:300
+msgid "Call Graph"
 msgstr ""
 
-#: tracedata.cpp:167
-msgid "Part Instruction Jump"
+#: tabview.cpp:303
+msgid "Callees"
 msgstr ""
 
-#: tracedata.cpp:168
-msgid "Instruction Jump"
+#: tabview.cpp:306
+msgid "All Callees"
 msgstr ""
 
-#: tracedata.cpp:169
-msgid "Part Instruction Call"
+#: tabview.cpp:310
+msgid "Callee Map"
 msgstr ""
 
-#: tracedata.cpp:170
-msgid "Instruction Call"
+#: instrview.cpp:131 tabview.cpp:313
+msgid "Assembler"
 msgstr ""
 
-#: tracedata.cpp:171
-msgid "Part Call"
+#: tabview.cpp:553
+msgid ""
+"<b>Information Tabs</b>"
+"<p>This widget shows information for the current selected function in different "
+"tabs: "
+"<ul>"
+"<li>The Costs tab shows a list of available event types and the inclusive and "
+"self costs regarding to these types.</li>"
+"<li>The Parts tab shows a list of trace parts if the trace consists of more "
+"than one part (otherwise, this tab is hided). The cost of the selected function "
+"spent in the different parts together with the calls happening is shown.</li>"
+"<li>The Call Lists tab shows direct callers and callees of the function in more "
+"detail.</li>"
+"<li>The Coverage tab shows the same is the Call Lists tab, but not only direct "
+"callers and callees but also indirect ones.</li>"
+"<li>The Call Graph tab shows a graphical visualization of the calls done by "
+"this function.</li>"
+"<li>The Source tab presents annotated source code if debugging information and "
+"the source file is available.</li>"
+"<li>The Assembler tab presents annotated assembler code if trace information on "
+"instruction level is available.</li></ul>For more information, see the <em>"
+"What's This?</em> help of the corresponding tab widget</p>"
 msgstr ""
 
-#: tracedata.cpp:172
-msgid "Call"
+#: tabview.cpp:630
+msgid "(No Data loaded)"
 msgstr ""
 
-#: tracedata.cpp:173
-msgid "Part Function"
+#: tabview.cpp:631
+msgid "(No function selected)"
 msgstr ""
 
-#: tracedata.cpp:174
-msgid "Function Source File"
+#: tips.txt:3
+msgid ""
+"<p>...that the <em>What's This?</em> help for every GUI widget\n"
+"in KCachegrind contains detailed usage information for this widget?\n"
+"It is highly recommended to read at least these help texts on first\n"
+"use. Request <em>What's This?</em> help by pressing\n"
+"Shift+F1 and clicking on the widget.</p>\n"
 msgstr ""
 
-#. i18n: file dumpselectionbase.ui line 300
-#: rc.cpp:144 rc.cpp:273 rc.cpp:318 rc.cpp:342 tracedata.cpp:175
-#, no-c-format
-msgid "Function"
-msgstr "Ffwythiant"
+#: tips.txt:12
+msgid ""
+"<p>...that you can get profile information at instruction level\n"
+"with Calltree when you provide the option <em>--dump-instr=yes</em>?\n"
+"Use the Assembler View for the instruction annotations.\n"
+"</p>\n"
+msgstr ""
 
-#: tracedata.cpp:176
-msgid "Function Cycle"
+#: tips.txt:20
+msgid ""
+"<p>...that you can use Alt-Left/Right keys of your keyboard to go\n"
+"back/forward in the active object history ?</p>\n"
 msgstr ""
 
-#: tracedata.cpp:177
-msgid "Part Class"
+#: tips.txt:26
+msgid ""
+"<p>...that you can navigate in the Callee/Caller Map View using\n"
+"arrow keys? Use Left/Right to change to siblings of the current\n"
+"item; use Up/Down to go one nesting level up/down. To select\n"
+"the current item, press Space, and to activate it, press Return.\n"
+"</p>\n"
 msgstr ""
 
-#: tracedata.cpp:178
-msgid "Class"
-msgstr "Dosbarth"
+#: tips.txt:35
+msgid ""
+"<p>...that you can navigate in the Call Graph View using\n"
+"arrow keys? Use Up/Down to go one calling level up/down, alternating\n"
+"between calls and functions. Use Left/Right to change to siblings of a current\n"
+"selected call. To activate the current item, press Return.\n"
+"</p>\n"
+msgstr ""
 
-#: tracedata.cpp:179
-msgid "Part Source File"
+#: tips.txt:44
+msgid ""
+"<p>...that you can rapidly locate a function by entering part of its\n"
+"name (case-insensitive) into the edit line of the toolbar\n"
+"and hit return?</p>\n"
 msgstr ""
 
-#: tracedata.cpp:180
-msgid "Source File"
-msgstr "Ffeil Tarddiad"
+#: tips.txt:51
+msgid ""
+"<p>...that you can assign custom colors to \n"
+"ELF objects/C++ Classes/Source Files for graph coloring\n"
+"in <em>Settings->Configure KCachegrind...</em>?</p>\n"
+msgstr ""
 
-#: tracedata.cpp:181
-msgid "Part ELF Object"
+#: tips.txt:58
+msgid ""
+"<p>...that you can see if debug info is available for a selected \n"
+"function by looking at the location label in the Info tab or\n"
+"the source listing header in the source tab?</p>\n"
+"<p>There must be the name of the source file (with extension).\n"
+"If KCachegrind still doesn't show the source, make sure that you\n"
+"have added the directory of the source file to the\n"
+"<em>Source Directories</em> list in the configuration.\n"
 msgstr ""
 
-#: tracedata.cpp:182
-msgid "ELF Object"
+#: tips.txt:69
+msgid ""
+"<p>...that you can configure whether KCachgrind should\n"
+"show absolute event counts or relative ones (percentage display)?</p>\n"
 msgstr ""
 
-#: partview.cpp:46 tracedata.cpp:183
-msgid "Profile Part"
+#: tips.txt:75
+msgid ""
+"<p>...that you can configure the maximum number of items\n"
+"for all function lists in KCachegrind? Limiting the number\n"
+"of items is done to get a fast reacting GUI. The last item in\n"
+"the list will show you the number of skipped functions, together\n"
+"with a cost condition for these skipped functions.</p>\n"
+"<p>To activate a function with small costs, search for it and select\n"
+"it in the flat profile. Selecting functions with small cost will\n"
+"temporarily add them to the flat profile list.</p>\n"
 msgstr ""
 
-#: tracedata.cpp:184
-msgid "Program Trace"
+#: tips.txt:87
+msgid ""
+"<p>...that the Coverage tab - in contrast to the Call Lists tab -\n"
+"shows <em>all</em> functions that are calling the selected function\n"
+"(upper part) / are called by the selected function (bottom part),\n"
+"no matter how many function are between them on the stack?</p>\n"
+"<p>Examples:</p>\n"
+"<p>An entry in the upper list for function foo1() with a value of 50%\n"
+"with function bar() selected means that 50% of all the cost of function\n"
+"bar() happened while called from function foo1().</p>\n"
+"<p>An entry in the bottom list for function foo2() with a value of 50%\n"
+"with function bar() selected means that 50% of all the cost of function\n"
+"bar() happened while calling foo2() from bar().</p>\n"
 msgstr ""
 
-#: tracedata.cpp:245
-msgid "%1 from %2"
+#: tips.txt:102
+msgid ""
+"<p>...that waiting for the tool tip inside of a tree map\n"
+"shows the list of names of the nested rectangles the mouse\n"
+"pointer is over?</p>\n"
+"<p>Items from this list can be selected by pressing the right\n"
+"mouse button.</p>\n"
 msgstr ""
 
-#: partgraph.cpp:423 tracedata.cpp:253 tracedata.cpp:258 tracedata.cpp:2828
-#: tracedata.cpp:3245 tracedata.cpp:3331 tracedata.cpp:4169 tracedata.cpp:4177
-#: tracedata.cpp:4242
-msgid "(unknown)"
-msgstr "(anhysbys)"
+#: tips.txt:111
+msgid ""
+"<p>...that you can constrain the cost counts shown to only a\n"
+"few parts of the whole trace by selecting these parts in the\n"
+"\"Trace Selection\" Dockable?</p>\n"
+"<p>To generate multiple parts in a profiling run with\n"
+"cachegrind, use e.g. option --cachedumps=xxx for parts\n"
+"of a length of xxx basic blocks (A basic block is a run\n"
+"of not-branching assembler statements inside of your program\n"
+"code).</p>\n"
+msgstr ""
 
-#: tracedata.cpp:2587
-msgid "(no caller)"
+#. i18n: file dumpselectionbase.ui line 824
+#: configdlg.cpp:58 rc.cpp:249
+#, no-c-format
+msgid "ELF Objects"
 msgstr ""
 
-#: tracedata.cpp:2594 tracedata.cpp:2613
-msgid "%1 via %2"
+#: configdlg.cpp:60
+msgid "Source Files"
 msgstr ""
 
-#: tracedata.cpp:2603
-msgid "(no callee)"
+#: configdlg.cpp:61
+msgid "C++ Classes"
 msgstr ""
 
-#: tracedata.cpp:4471
-msgid "(not found)"
-msgstr "(heb ei ganfod)"
+#: configdlg.cpp:62
+msgid "Function (no Grouping)"
+msgstr ""
 
-#: tracedata.cpp:5021
-msgid "Recalculating Function Cycles..."
+#: configdlg.cpp:157 configdlg.cpp:350 configdlg.cpp:371
+msgid "(always)"
+msgstr ""
+
+#: configdlg.cpp:210
+msgid "KCachegrind Configuration"
+msgstr ""
+
+#: configdlg.cpp:211
+msgid ""
+"The Maximum Number of List Items should be below 500.The previous set value "
+"(%1) will still be used."
+msgstr ""
+
+#: configdlg.cpp:384
+msgid "Choose Source Folder"
 msgstr ""
 
 #. i18n: file dumpselectionbase.ui line 550
@@ -216,11 +344,11 @@ msgstr ""
 msgid "Unhide Hidden Parts"
 msgstr ""
 
-#: partselection.cpp:302 toplevel.cpp:1692
+#: partselection.cpp:302 toplevel.cpp:1687
 msgid "Go Back"
 msgstr "Ewch yn ?l"
 
-#: callgraphview.cpp:2571 partselection.cpp:320
+#: callgraphview.cpp:2570 partselection.cpp:320
 msgid "Visualization"
 msgstr "Delweddu"
 
@@ -276,8 +404,192 @@ msgstr "Dangos Gwybodaeth"
 msgid "(no trace loaded)"
 msgstr ""
 
-#: costtypeview.cpp:42
-msgid "Event Type"
+#. i18n: file dumpselectionbase.ui line 950
+#: callmapview.cpp:61 rc.cpp:276 rc.cpp:321
+#, no-c-format
+msgid "Location"
+msgstr "Lleoliad"
+
+#. i18n: file dumpselectionbase.ui line 754
+#: callmapview.cpp:63 rc.cpp:234 rc.cpp:339
+#, no-c-format
+msgid "Calls"
+msgstr ""
+
+#: callmapview.cpp:98
+msgid ""
+"<b>Caller Map</b>"
+"<p>This graph shows the nested hierarchy of all callers of the current "
+"activated function. Each colored rectangle represents a function; its size "
+"tries to be proportional to the cost spent therein while the active function is "
+"running (however, there are drawing constrains).</p>"
+msgstr ""
+
+#: callmapview.cpp:105
+msgid ""
+"<b>Call Map</b>"
+"<p>This graph shows the nested hierarchy of all callees of the current "
+"activated function. Each colored rectangle represents a function; its size "
+"tries to be proportional to the cost spent therein while the active function is "
+"running (however, there are drawing constrains).</p>"
+msgstr ""
+
+#: callmapview.cpp:113
+msgid ""
+"<p>Appearance options can be found in the in the context menu. To get exact "
+"size proportions, choose 'Hide incorrect borders'. As this mode can be <em>"
+"very</em> time consuming, you may want to limit the maximum drawn nesting level "
+"before. 'Best' determinates the split direction for children from the aspect "
+"ratio of the parent. 'Always Best' decides on remaining space for each sibling. "
+"'Ignore Proportions' takes space for function name drawing <em>before</em> "
+"drawing children. Note that size proportions can get <em>heavily</em> wrong.</p>"
+"<p>This is a <em>TreeMap</em> widget. Keyboard navigation is available with the "
+"left/right arrow keys for traversing siblings, and up/down arrow keys to go a "
+"nesting level up/down. <em>Return</em> activates the current item.</p>"
+msgstr ""
+
+#: callmapview.cpp:167
+msgid "Go To"
+msgstr "Ewch I"
+
+#: callmapview.cpp:184
+msgid "Stop at Depth"
+msgstr "Aros wrth Ddyfnder"
+
+#: callmapview.cpp:187 treemap.cpp:3101
+msgid "No Depth Limit"
+msgstr "Dim Cyfyngiad Dyfnder"
+
+#: callmapview.cpp:190
+msgid "Depth 10"
+msgstr ""
+
+#: callmapview.cpp:192
+msgid "Depth 15"
+msgstr ""
+
+#: callmapview.cpp:194
+msgid "Depth 20"
+msgstr ""
+
+#: callmapview.cpp:198 treemap.cpp:3107
+msgid "Depth of '%1' (%2)"
+msgstr "Dyfnder o '%1' (%2)"
+
+#: callmapview.cpp:204
+msgid "Decrement Depth (to %1)"
+msgstr ""
+
+#: callmapview.cpp:205
+msgid "Increment Depth (to %1)"
+msgstr ""
+
+#: callmapview.cpp:209
+msgid "Stop at Function"
+msgstr ""
+
+#: callmapview.cpp:210
+msgid "No Function Limit"
+msgstr ""
+
+#: callmapview.cpp:240
+msgid "Stop at Area"
+msgstr "Aros wrth Ardal"
+
+#: callmapview.cpp:243 treemap.cpp:3039
+msgid "No Area Limit"
+msgstr "Dim Cyfyngiad Ardal"
+
+#: callmapview.cpp:246
+msgid "50 Pixels"
+msgstr ""
+
+#: callmapview.cpp:248
+msgid "100 Pixels"
+msgstr ""
+
+#: callmapview.cpp:250
+msgid "200 Pixels"
+msgstr ""
+
+#: callmapview.cpp:252
+msgid "500 Pixels"
+msgstr ""
+
+#: callmapview.cpp:258 treemap.cpp:3045
+msgid "Area of '%1' (%2)"
+msgstr "Ardal '%1' (%2)"
+
+#: callmapview.cpp:264 treemap.cpp:3071
+msgid "Double Area Limit (to %1)"
+msgstr "Cyfyngiad Ardal Dwbl (i %1)"
+
+#: callmapview.cpp:266
+msgid "Half Area Limit (to %1)"
+msgstr ""
+
+#: callmapview.cpp:273
+msgid "Visualisation"
+msgstr ""
+
+#: callmapview.cpp:277
+msgid "Split Direction"
+msgstr ""
+
+#: callmapview.cpp:279
+msgid "Skip Incorrect Borders"
+msgstr ""
+
+#: callmapview.cpp:284
+msgid "Border Width"
+msgstr "Lled Border"
+
+#: callmapview.cpp:285
+msgid "Border 0"
+msgstr ""
+
+#: callmapview.cpp:288
+msgid "Border 1"
+msgstr ""
+
+#: callmapview.cpp:290
+msgid "Border 2"
+msgstr ""
+
+#: callmapview.cpp:292
+msgid "Border 3"
+msgstr ""
+
+#: callmapview.cpp:297
+msgid "Draw Symbol Names"
+msgstr ""
+
+#: callmapview.cpp:298
+msgid "Draw Cost"
+msgstr ""
+
+#: callmapview.cpp:299
+msgid "Draw Location"
+msgstr ""
+
+#: callmapview.cpp:300
+msgid "Draw Calls"
+msgstr ""
+
+#: callmapview.cpp:321 treemap.cpp:2889
+msgid "Shading"
+msgstr "Arliwio"
+
+#: callmapview.cpp:431
+msgid "Call Map: Current is '%1'"
+msgstr ""
+
+#: callmapview.cpp:599
+msgid "(no function)"
+msgstr ""
+
+#: callmapview.cpp:741 callmapview.cpp:858
+msgid "(no call)"
 msgstr ""
 
 #. i18n: file dumpselectionbase.ui line 917
@@ -287,6 +599,20 @@ msgstr ""
 msgid "Incl."
 msgstr ""
 
+#: coverageview.cpp:48 coverageview.cpp:54
+msgid "Distance"
+msgstr "Pellder"
+
+#. i18n: file dumpselectionbase.ui line 928
+#: coverageview.cpp:49 partview.cpp:49 rc.cpp:270 rc.cpp:315
+#, no-c-format
+msgid "Called"
+msgstr ""
+
+#: callview.cpp:48 coverageview.cpp:50
+msgid "Caller"
+msgstr ""
+
 #. i18n: file functionselectionbase.ui line 62
 #: costtypeview.cpp:44 coverageview.cpp:53 partview.cpp:48 rc.cpp:303
 #: rc.cpp:312
@@ -294,83 +620,267 @@ msgstr ""
 msgid "Self"
 msgstr ""
 
-#: costtypeview.cpp:45
-msgid "Short"
-msgstr "Byr"
+#: coverageview.cpp:55
+msgid "Calling"
+msgstr ""
 
-#: costtypeview.cpp:47
-msgid "Formula"
-msgstr "Fformiwla"
+#: callview.cpp:52 coverageview.cpp:56
+msgid "Callee"
+msgstr ""
 
-#: costtypeview.cpp:81
+#: coverageview.cpp:90
 msgid ""
-"<b>Cost Types List</b>"
-"<p>This list shows all cost types available and what the self/inclusive cost of "
-"the current selected function is for that cost type.</p>"
-"<p>By choosing a cost type from the list, you change the cost type of costs "
-"shown all over KCachegrind to be the selected one.</p>"
+"<b>List of all Callers</b>"
+"<p>This list shows all functions calling the current selected one, either "
+"directly or with several functions in-between on the stack; the number of "
+"functions in-between plus one is called the <em>Distance</em> "
+"(e.g. for function A,B,C there exists a call from A to C when A calls B and B "
+"calls C, i.e. A => B => C. The distance here is 2).</p>"
+"<p>Absolute cost shown is the cost spent in the selected function while a "
+"listed function is active; relative cost is the percentage of all cost spent in "
+"the selected function while the listed one is active. The cost graphic shows "
+"logarithmic percentage with a different color for each distance.</p>"
+"<p>As there can be many calls from the same function, the distance column "
+"sometimes shows the range of distances for all calls happening; then, in "
+"parentheses, there is the medium distance, i.e. the distance where most of the "
+"call costs happened.</p>"
+"<p>Selecting a function makes it the current selected one of this information "
+"panel. If there are two panels (Split mode), the function of the other panel is "
+"changed instead.</p>"
 msgstr ""
 
-#: costtypeview.cpp:98
-msgid "Set Secondary Event Type"
+#: coverageview.cpp:120
+msgid ""
+"<b>List of all Callees</b>"
+"<p>This list shows all functions called by the current selected one, either "
+"directly or with several function in-between on the stack; the number of "
+"function in-between plus one is called the <em>Distance</em> "
+"(e.g. for function A,B,C there exists a call from A to C when A calls B and B "
+"calls C, i.e. A => B => C. The distance here is 2).</p>"
+"<p>Absolute cost shown is the cost spent in the listed function while the "
+"selected is active; relative cost is the percentage of all cost spent in the "
+"listed function while the selected one is active. The cost graphic always shows "
+"logarithmic percentage with a different color for each distance.</p>"
+"<p>As there can be many calls to the same function, the distance column "
+"sometimes shows the range of distances for all calls happening; then, in "
+"parentheses, there is the medium distance, i.e. the distance where most of the "
+"call costs happened.</p>"
+"<p>Selecting a function makes it the current selected one of this information "
+"panel. If there are two panels (Split mode), the function of the other panel is "
+"changed instead.</p>"
 msgstr ""
 
-#: costtypeview.cpp:100
-msgid "Remove Secondary Event Type"
+#: callgraphview.cpp:2396 callgraphview.cpp:2400 callgraphview.cpp:2418
+#: callview.cpp:123 callview.cpp:128 coverageview.cpp:166 instrview.cpp:191
+#: sourceview.cpp:116
+msgid "Go to '%1'"
+msgstr "Ewch I '%1'"
+
+#: callview.cpp:45 instrview.cpp:127 sourceview.cpp:52
+msgid "Cost 2"
 msgstr ""
 
-#: costtypeview.cpp:105
-msgid "Edit Long Name"
+#: callview.cpp:47 callview.cpp:51
+msgid "Count"
+msgstr "Cyfrif"
+
+#: callview.cpp:85
+msgid ""
+"<b>List of direct Callers</b>"
+"<p>This list shows all functions calling the current selected one directly, "
+"together with a call count and the cost spent in the current selected function "
+"while being called from the function from the list.</p>"
+"<p>An icon instead of an inclusive cost specifies that this is a call inside of "
+"a recursive cycle. An inclusive cost makes no sense here.</p>"
+"<p>Selecting a function makes it the current selected one of this information "
+"panel. If there are two panels (Split mode), the function of the other panel is "
+"changed instead.</p>"
 msgstr ""
 
-#: costtypeview.cpp:106
-msgid "Edit Short Name"
+#: callview.cpp:98
+msgid ""
+"<b>List of direct Callees</b>"
+"<p>This list shows all functions called by the current selected one directly, "
+"together with a call count and the cost spent in this function while being "
+"called from the selected function.</p>"
+"<p>Selecting a function makes it the current selected one of this information "
+"panel. If there are two panels (Split mode), the function of the other panel is "
+"changed instead.</p>"
 msgstr ""
 
-#: costtypeview.cpp:107
-msgid "Edit Formula"
+#: instritem.cpp:106 sourceitem.cpp:86
+msgid "Active call to '%1'"
 msgstr ""
 
-#: costtypeview.cpp:115
-msgid "New Cost Type ..."
+#: instritem.cpp:108 sourceitem.cpp:88
+msgid ""
+"_n: %n call to '%1'\n"
+"%n calls to '%1'"
 msgstr ""
 
-#: costtypeview.cpp:149 costtypeview.cpp:154
-#, c-format
-msgid "New%1"
+#: instritem.cpp:137
+msgid "Jump %1 of %2 times to 0x%3"
 msgstr ""
 
-#: costtypeview.cpp:155
-#, c-format
-msgid "New Cost Type %1"
+#: instritem.cpp:142
+msgid "Jump %1 times to 0x%2"
 msgstr ""
 
-#: sourceitem.cpp:125
-msgid "Jump %1 of %2 times to %3"
+#: instritem.cpp:185 sourceitem.cpp:169
+msgid "(cycle)"
 msgstr ""
 
-#: sourceitem.cpp:130
-msgid "Jump %1 times to %2"
+#: tracedata.cpp:153
+msgid "Abstract Item"
 msgstr ""
 
-#: costlistitem.cpp:60
-#, c-format
-msgid ""
-"_n: (%n item skipped)\n"
-"(%n items skipped)"
+#: tracedata.cpp:154
+msgid "Cost Item"
 msgstr ""
 
-#: traceitemview.cpp:53
-msgid "No description available"
-msgstr "Dim disgrifiad ar gael"
+#: tracedata.cpp:155
+msgid "Part Source Line"
+msgstr ""
+
+#: tracedata.cpp:156
+msgid "Source Line"
+msgstr ""
+
+#: tracedata.cpp:157
+msgid "Part Line Call"
+msgstr ""
+
+#: tracedata.cpp:158
+msgid "Line Call"
+msgstr ""
+
+#: tracedata.cpp:159
+msgid "Part Jump"
+msgstr ""
+
+#: tracedata.cpp:160
+msgid "Jump"
+msgstr ""
+
+#: tracedata.cpp:161
+msgid "Part Instruction"
+msgstr ""
+
+#: tracedata.cpp:162
+msgid "Instruction"
+msgstr ""
+
+#: tracedata.cpp:163
+msgid "Part Instruction Jump"
+msgstr ""
+
+#: tracedata.cpp:164
+msgid "Instruction Jump"
+msgstr ""
+
+#: tracedata.cpp:165
+msgid "Part Instruction Call"
+msgstr ""
+
+#: tracedata.cpp:166
+msgid "Instruction Call"
+msgstr ""
+
+#: tracedata.cpp:167
+msgid "Part Call"
+msgstr ""
+
+#: tracedata.cpp:168
+msgid "Call"
+msgstr ""
+
+#: tracedata.cpp:169
+msgid "Part Function"
+msgstr ""
+
+#: tracedata.cpp:170
+msgid "Function Source File"
+msgstr ""
+
+#. i18n: file dumpselectionbase.ui line 300
+#: rc.cpp:144 rc.cpp:273 rc.cpp:318 rc.cpp:342 tracedata.cpp:171
+#, no-c-format
+msgid "Function"
+msgstr "Ffwythiant"
+
+#: tracedata.cpp:172
+msgid "Function Cycle"
+msgstr ""
+
+#: tracedata.cpp:173
+msgid "Part Class"
+msgstr ""
+
+#: tracedata.cpp:174
+msgid "Class"
+msgstr "Dosbarth"
+
+#: tracedata.cpp:175
+msgid "Part Source File"
+msgstr ""
+
+#: tracedata.cpp:176
+msgid "Source File"
+msgstr "Ffeil Tarddiad"
+
+#: tracedata.cpp:177
+msgid "Part ELF Object"
+msgstr ""
+
+#: tracedata.cpp:178
+msgid "ELF Object"
+msgstr ""
+
+#: partview.cpp:46 tracedata.cpp:179
+msgid "Profile Part"
+msgstr ""
+
+#: tracedata.cpp:180
+msgid "Program Trace"
+msgstr ""
+
+#: tracedata.cpp:241
+msgid "%1 from %2"
+msgstr ""
+
+#: partgraph.cpp:423 tracedata.cpp:249 tracedata.cpp:254 tracedata.cpp:2824
+#: tracedata.cpp:3241 tracedata.cpp:3327 tracedata.cpp:4165 tracedata.cpp:4173
+#: tracedata.cpp:4238
+msgid "(unknown)"
+msgstr "(anhysbys)"
+
+#: tracedata.cpp:2583
+msgid "(no caller)"
+msgstr ""
+
+#: tracedata.cpp:2590 tracedata.cpp:2609
+msgid "%1 via %2"
+msgstr ""
+
+#: tracedata.cpp:2599
+msgid "(no callee)"
+msgstr ""
+
+#: tracedata.cpp:4467
+msgid "(not found)"
+msgstr "(heb ei ganfod)"
+
+#: tracedata.cpp:5017
+msgid "Recalculating Function Cycles..."
+msgstr ""
 
 #. i18n: file partselectionbase.ui line 16
-#: rc.cpp:324 toplevel.cpp:281 toplevel.cpp:581
+#: rc.cpp:324 toplevel.cpp:276 toplevel.cpp:576
 #, no-c-format
 msgid "Parts Overview"
 msgstr ""
 
-#: toplevel.cpp:288
+#: toplevel.cpp:283
 msgid ""
 "<b>The Parts Overview</b>"
 "<p>A trace consists of multiple trace parts when there are several profile data "
@@ -390,11 +900,11 @@ msgid ""
 "to show the costs of its callees.</li></ul></p>"
 msgstr ""
 
-#: toplevel.cpp:318
+#: toplevel.cpp:313
 msgid "Top Cost Call Stack"
 msgstr ""
 
-#: toplevel.cpp:320
+#: toplevel.cpp:315
 msgid ""
 "<b>The Top Cost Call Stack</b>"
 "<p>This is a purely fictional 'most probable' call stack. It is built up by "
@@ -404,11 +914,11 @@ msgid ""
 "from the function in the line above.</p>"
 msgstr ""
 
-#: toplevel.cpp:333
+#: toplevel.cpp:328
 msgid "Flat Profile"
 msgstr ""
 
-#: toplevel.cpp:343
+#: toplevel.cpp:338
 msgid ""
 "<b>The Flat Profile</b>"
 "<p>The flat profile contains a group and a function selection list. The group "
@@ -421,12 +931,12 @@ msgid ""
 msgstr ""
 
 #. i18n: file dumpselectionbase.ui line 16
-#: rc.cpp:84 toplevel.cpp:357 toplevel.cpp:609
+#: rc.cpp:84 toplevel.cpp:352 toplevel.cpp:604
 #, no-c-format
 msgid "Profile Dumps"
 msgstr ""
 
-#: toplevel.cpp:367
+#: toplevel.cpp:362
 msgid ""
 "<b>Profile Dumps</b>"
 "<p>This dockable shows in the top part the list of loadable profile dumps in "
@@ -454,88 +964,88 @@ msgid ""
 "dump.</ul></p>"
 msgstr ""
 
-#: toplevel.cpp:455
+#: toplevel.cpp:450
 msgid "&Duplicate"
 msgstr "&Dyblyg"
 
-#: toplevel.cpp:459
+#: toplevel.cpp:454
 msgid ""
 "<b>Duplicate Current Layout</b>"
 "<p>Make a copy of the current layout.</p>"
 msgstr ""
 
-#: toplevel.cpp:466
+#: toplevel.cpp:461
 msgid ""
 "<b>Remove Current Layout</b>"
 "<p>Delete current layout and make the previous active.</p>"
 msgstr ""
 
-#: toplevel.cpp:470
+#: toplevel.cpp:465
 msgid "&Go to Next"
 msgstr ""
 
-#: toplevel.cpp:474
+#: toplevel.cpp:469
 msgid "Go to Next Layout"
 msgstr ""
 
-#: toplevel.cpp:477
+#: toplevel.cpp:472
 msgid "&Go to Previous"
 msgstr ""
 
-#: toplevel.cpp:481
+#: toplevel.cpp:476
 msgid "Go to Previous Layout"
 msgstr ""
 
-#: toplevel.cpp:484
+#: toplevel.cpp:479
 msgid "&Restore to Default"
 msgstr ""
 
-#: toplevel.cpp:487
+#: toplevel.cpp:482
 msgid "Restore Layouts to Default"
 msgstr ""
 
-#: toplevel.cpp:490
+#: toplevel.cpp:485
 msgid "&Save as Default"
 msgstr "&Cadw fel Rhagosodyn"
 
-#: toplevel.cpp:493
+#: toplevel.cpp:488
 msgid "Save Layouts as Default"
 msgstr ""
 
-#: toplevel.cpp:504
+#: toplevel.cpp:499
 msgid "<b>New</b><p>Open new empty KCachegrind window.</p>"
 msgstr ""
 
-#: toplevel.cpp:507
+#: toplevel.cpp:502
 msgid "&Add..."
 msgstr "Ychw&anegu..."
 
-#: toplevel.cpp:510
+#: toplevel.cpp:505
 msgid ""
 "<b>Add Profile Data</b>"
 "<p>This opens an additional profile data file in the current window.</p>"
 msgstr ""
 
-#: toplevel.cpp:522
+#: toplevel.cpp:517
 msgid "<b>Reload Profile Data</b><p>This loads any new created parts, too.</p>"
 msgstr ""
 
-#: toplevel.cpp:526
+#: toplevel.cpp:521
 msgid "&Export Graph"
 msgstr ""
 
-#: toplevel.cpp:530
+#: toplevel.cpp:525
 msgid ""
 "<b>Export Call Graph</b>"
 "<p>Generates a file with extension .dot for the tools of the GraphViz "
 "package.</p>"
 msgstr ""
 
-#: toplevel.cpp:536
+#: toplevel.cpp:531
 msgid "&Force Dump"
 msgstr ""
 
-#: toplevel.cpp:545
+#: toplevel.cpp:540
 msgid ""
 "<b>Force Dump</b>"
 "<p>This forces a dump for a Callgrind profile run in the current directory. "
@@ -554,59 +1064,59 @@ msgid ""
 "resizing a window of the program.</p>"
 msgstr ""
 
-#: toplevel.cpp:570
+#: toplevel.cpp:565
 msgid ""
 "<b>Open Profile Data</b>"
 "<p>This opens a profile data file, with possible multiple parts</p>"
 msgstr ""
 
-#: toplevel.cpp:586
+#: toplevel.cpp:581
 msgid "Show/Hide the Parts Overview Dockable"
 msgstr ""
 
-#: toplevel.cpp:590
+#: toplevel.cpp:585
 msgid "Call Stack"
 msgstr "Pentwr galwadau"
 
-#: toplevel.cpp:595
+#: toplevel.cpp:590
 msgid "Show/Hide the Call Stack Dockable"
 msgstr ""
 
 #. i18n: file functionselectionbase.ui line 16
-#: rc.cpp:297 toplevel.cpp:599
+#: rc.cpp:297 toplevel.cpp:594
 #, no-c-format
 msgid "Function Profile"
 msgstr ""
 
-#: toplevel.cpp:604
+#: toplevel.cpp:599
 msgid "Show/Hide the Function Profile Dockable"
 msgstr ""
 
-#: toplevel.cpp:614
+#: toplevel.cpp:609
 msgid "Show/Hide the Profile Dumps Dockable"
 msgstr ""
 
-#: toplevel.cpp:619
+#: toplevel.cpp:614
 msgid "Show Relative Costs"
 msgstr ""
 
-#: toplevel.cpp:626
+#: toplevel.cpp:621
 msgid "Show Absolute Costs"
 msgstr ""
 
-#: toplevel.cpp:629
+#: toplevel.cpp:624
 msgid "Show relative instead of absolute costs"
 msgstr ""
 
-#: toplevel.cpp:633
+#: toplevel.cpp:628
 msgid "Percentage Relative to Parent"
 msgstr ""
 
-#: toplevel.cpp:639
+#: toplevel.cpp:634
 msgid "Show percentage costs relative to parent"
 msgstr ""
 
-#: toplevel.cpp:643
+#: toplevel.cpp:638
 msgid ""
 "<b>Show percentage costs relative to parent</b>"
 "<p>If this is switched off, percentage costs are always shown relative to the "
@@ -633,15 +1143,15 @@ msgid ""
 "<p>(*) Only if function grouping is switched on (e.g. ELF object grouping)."
 msgstr ""
 
-#: toplevel.cpp:658
+#: toplevel.cpp:653
 msgid "Do Cycle Detection"
 msgstr ""
 
-#: toplevel.cpp:664
+#: toplevel.cpp:659
 msgid "Skip Cycle Detection"
 msgstr ""
 
-#: toplevel.cpp:667
+#: toplevel.cpp:662
 msgid ""
 "<b>Detect recursive cycles</b>"
 "<p>If this is switched off, the treemap drawing will show black areas when a "
@@ -656,688 +1166,228 @@ msgid ""
 "switch this off."
 msgstr ""
 
-#: toplevel.cpp:689 toplevel.cpp:729
+#: toplevel.cpp:684 toplevel.cpp:724
 msgid "Go back in function selection history"
 msgstr ""
 
-#: toplevel.cpp:695 toplevel.cpp:741
+#: toplevel.cpp:690 toplevel.cpp:736
 msgid "Go forward in function selection history"
 msgstr ""
 
-#: toplevel.cpp:701 toplevel.cpp:715
+#: toplevel.cpp:696 toplevel.cpp:710
 msgid ""
 "<b>Go Up</b>"
 "<p>Go to last selected caller of current function. If no caller was visited, "
 "use that with highest cost.</p>"
 msgstr ""
 
-#: toplevel.cpp:707
+#: toplevel.cpp:702
 msgid "&Up"
 msgstr "I &Fyny"
 
-#: toplevel.cpp:746 toplevel.cpp:1651
+#: toplevel.cpp:741 toplevel.cpp:1646
 msgid "Primary Event Type"
 msgstr ""
 
-#: toplevel.cpp:748
+#: toplevel.cpp:743
 msgid "Select primary event type of costs"
 msgstr ""
 
-#: toplevel.cpp:758 toplevel.cpp:1654
+#: toplevel.cpp:753 toplevel.cpp:1649
 msgid "Secondary Event Type"
 msgstr ""
 
-#: toplevel.cpp:760
+#: toplevel.cpp:755
 msgid "Select secondary event type for cost e.g. shown in annotations"
 msgstr ""
 
-#: functionselection.cpp:243 toplevel.cpp:768
+#: functionselection.cpp:243 toplevel.cpp:763
 msgid "Grouping"
 msgstr ""
 
-#: toplevel.cpp:771
+#: toplevel.cpp:766
 msgid "Select how functions are grouped into higher level cost items"
 msgstr ""
 
-#: functionselection.cpp:52 toplevel.cpp:777
+#: functionselection.cpp:52 toplevel.cpp:772
 msgid "(No Grouping)"
 msgstr ""
 
-#: toplevel.cpp:787
+#: toplevel.cpp:782
 msgid "Split"
 msgstr ""
 
-#: toplevel.cpp:791
+#: toplevel.cpp:786
 msgid "Show two information panels"
 msgstr ""
 
-#: toplevel.cpp:795
-msgid "Split Horizontal"
+#: toplevel.cpp:790
+#, fuzzy
+msgid "SplitQt::Horizontal"
 msgstr "Hollti'n Lorweddol"
 
-#: toplevel.cpp:800
-msgid "Change Split Orientation when main window is split."
+#: toplevel.cpp:795
+msgid "Change Split Qt::Orientation when main window is split."
 msgstr ""
 
-#: toplevel.cpp:808
+#: toplevel.cpp:803
 msgid "Tip of the &Day..."
 msgstr "Awgrymiad y &Dydd ..."
 
-#: toplevel.cpp:809
+#: toplevel.cpp:804
 msgid "Show \"Tip of the Day\""
 msgstr ""
 
-#: toplevel.cpp:1012 toplevel.cpp:1061
+#: toplevel.cpp:1007 toplevel.cpp:1056
 msgid ""
 "cachegrind.out* callgrind.out*|Callgrind Profile Data\n"
 "*|All Files"
 msgstr ""
 
-#: toplevel.cpp:1014
+#: toplevel.cpp:1009
 msgid "Select Callgrind Profile Data"
 msgstr ""
 
-#: toplevel.cpp:1063
+#: toplevel.cpp:1058
 msgid "Add Callgrind Profile Data"
 msgstr ""
 
-#: toplevel.cpp:1221 toplevel.cpp:1574
+#: toplevel.cpp:1216 toplevel.cpp:1569
 msgid "(Hidden)"
 msgstr ""
 
-#: toplevel.cpp:1626
+#: toplevel.cpp:1621
 msgid "Hide"
 msgstr "Cuddio"
 
-#: toplevel.cpp:1659
+#: toplevel.cpp:1654
 msgid "Show Absolute Cost"
 msgstr ""
 
-#: toplevel.cpp:1662
+#: toplevel.cpp:1657
 msgid "Show Relative Cost"
 msgstr ""
 
-#: toplevel.cpp:1693
+#: toplevel.cpp:1688
 msgid "Go Forward"
 msgstr "Mynd Ymlaen"
 
-#: toplevel.cpp:1694
+#: toplevel.cpp:1689
 msgid "Go Up"
 msgstr "Ewch i Fyny"
 
-#: toplevel.cpp:1926
+#: toplevel.cpp:1921
 #, c-format
 msgid "Layout Count: %1"
 msgstr ""
 
-#: toplevel.cpp:1933
+#: toplevel.cpp:1928
 msgid "No profile data file loaded."
 msgstr ""
 
-#: toplevel.cpp:1942
+#: toplevel.cpp:1937
 msgid "Total %1 Cost: %2"
 msgstr ""
 
-#: toplevel.cpp:1954
+#: toplevel.cpp:1949
 msgid "No event type selected"
 msgstr ""
 
-#: toplevel.cpp:2199 toplevel.cpp:2235 toplevel.cpp:2271
+#: toplevel.cpp:2194 toplevel.cpp:2230 toplevel.cpp:2266
 msgid "(No Stack)"
 msgstr ""
 
-#: toplevel.cpp:2205
+#: toplevel.cpp:2200
 msgid "(No next function)"
 msgstr ""
 
-#: toplevel.cpp:2241
+#: toplevel.cpp:2236
 msgid "(No previous function)"
 msgstr ""
 
-#: toplevel.cpp:2276
+#: toplevel.cpp:2271
 msgid "(No Function Up)"
 msgstr ""
 
-#. i18n: file dumpselectionbase.ui line 906
-#: instrview.cpp:125 rc.cpp:264 sourceview.cpp:50
-#, no-c-format
-msgid "#"
-msgstr "#"
-
-#: callview.cpp:45 instrview.cpp:127 sourceview.cpp:52
-msgid "Cost 2"
-msgstr ""
-
-#: instrview.cpp:129
-msgid "Hex"
-msgstr "Hecs"
-
-#: instrview.cpp:131 tabview.cpp:313
-msgid "Assembler"
-msgstr ""
-
-#: instrview.cpp:132
-msgid "Source Position"
-msgstr ""
-
-#: instrview.cpp:163
-msgid ""
-"<b>Annotated Assembler</b>"
-"<p>The annotated assembler list shows the machine code instructions of the "
-"current selected function together with (self) cost spent while executing an "
-"instruction. If this is a call instruction, lines with details on the call "
-"happening are inserted into the source: the cost spent inside of the call, the "
-"number of calls happening, and the call destination.</p>"
-"<p>The disassembler output shown is generated with the 'objdump' utility from "
-"the 'binutils' package.</p>"
-"<p>Select a line with call information to make the destination function of this "
-"call current.</p>"
-msgstr ""
-
-#: callgraphview.cpp:2397 callgraphview.cpp:2401 callgraphview.cpp:2419
-#: callview.cpp:123 callview.cpp:128 coverageview.cpp:166 instrview.cpp:191
-#: sourceview.cpp:116
-msgid "Go to '%1'"
-msgstr "Ewch I '%1'"
-
-#: instrview.cpp:195
-#, c-format
-msgid "Go to Address %1"
-msgstr ""
-
-#: instrview.cpp:207
-msgid "Hex Code"
-msgstr ""
-
-#: instrview.cpp:426
-msgid "There is no instruction info in the profile data file."
-msgstr ""
-
-#: instrview.cpp:428
-msgid "For the Valgrind Calltree Skin, rerun with option"
-msgstr ""
-
-#: instrview.cpp:429
-msgid "      --dump-instr=yes"
-msgstr ""
-
-#: instrview.cpp:430
-msgid "To see (conditional) jumps, additionally specify"
-msgstr ""
-
-#: instrview.cpp:431
-msgid "      --trace-jump=yes"
-msgstr ""
-
-#: instrview.cpp:629
-msgid "There is an error trying to execute the command"
-msgstr ""
-
-#: instrview.cpp:634 instrview.cpp:900
-msgid "Check that you have installed 'objdump'."
-msgstr ""
-
-#: instrview.cpp:636 instrview.cpp:902
-msgid "This utility can be found in the 'binutils' package."
-msgstr ""
-
-#: instrview.cpp:739
-msgid "(No Assembler)"
-msgstr ""
-
-#: instrview.cpp:875
-#, c-format
-msgid ""
-"_n: There is %n cost line without assembler code.\n"
-"There are %n cost lines without assembler code."
-msgstr ""
-
-#: instrview.cpp:877
-msgid "This happens because the code of"
-msgstr ""
-
-#: instrview.cpp:880
-msgid "does not seem to match the profile data file."
-msgstr ""
-
-#: instrview.cpp:883
-msgid "Are you using an old profile data file or is the above mentioned"
-msgstr ""
-
-#: instrview.cpp:885
-msgid "ELF object from an updated installation/another machine?"
-msgstr ""
-
-#: instrview.cpp:893
-msgid "There seems to be an error trying to execute the command"
-msgstr ""
-
-#: instrview.cpp:898
-msgid "Check that the ELF object used in the command exists."
-msgstr ""
-
-#: callgraphview.cpp:306
-#, c-format
-msgid "Call(s) from %1"
-msgstr ""
-
-#: callgraphview.cpp:307
+#: costlistitem.cpp:60
 #, c-format
-msgid "Call(s) to %1"
-msgstr ""
-
-#: callgraphview.cpp:308
-msgid "(unknown call)"
-msgstr ""
-
-#: callgraphview.cpp:1425
-msgid ""
-"<b>Call Graph around active Function</b>"
-"<p>Depending on configuration, this view shows the call graph environment of "
-"the active function. Note: the shown cost is <b>only</b> "
-"the cost which is spent while the active function was actually running; i.e. "
-"the cost shown for main() - if it's visible - should be the same as the cost of "
-"the active function, as that's the part of inclusive cost of main() spent while "
-"the active function was running.</p>"
-"<p>For cycles, blue call arrows indicate that this is an artificial call added "
-"for correct drawing which actually never happened.</p>"
-"<p>If the graph is larger than the widget area, an overview panner is shown in "
-"one edge. There are similar visualization options to the Call Treemap; the "
-"selected function is highlighted."
-"<p>"
-msgstr ""
-
-#: callgraphview.cpp:1789
-msgid ""
-"Warning: a long lasting graph layouting is in progress.\n"
-"Reduce node/edge limits for speedup.\n"
-msgstr ""
-
-#: callgraphview.cpp:1792
-msgid ""
-"Layouting stopped.\n"
-msgstr ""
-
-#: callgraphview.cpp:1794
 msgid ""
-"The call graph has %1 nodes and %2 edges.\n"
+"_n: (%n item skipped)\n"
+"(%n items skipped)"
 msgstr ""
 
-#: callgraphview.cpp:1827
-msgid "No item activated for which to draw the call graph."
+#: sourceitem.cpp:125
+msgid "Jump %1 of %2 times to %3"
 msgstr ""
 
-#: callgraphview.cpp:1838
-msgid "No call graph can be drawn for the active item."
+#: sourceitem.cpp:130
+msgid "Jump %1 times to %2"
 msgstr ""
 
-#: callgraphview.cpp:1867
-msgid ""
-"No call graph is available because the following\n"
-"command cannot be run:\n"
-"'%1'\n"
+#: costtypeview.cpp:42
+msgid "Event Type"
 msgstr ""
 
-#: callgraphview.cpp:1870 callgraphview.cpp:2200
-msgid "Please check that 'dot' is installed (package GraphViz)."
-msgstr ""
+#: costtypeview.cpp:45
+msgid "Short"
+msgstr "Byr"
 
-#: callgraphview.cpp:2199
-msgid ""
-"Error running the graph layouting tool.\n"
-msgstr ""
+#: costtypeview.cpp:47
+msgid "Formula"
+msgstr "Fformiwla"
 
-#: callgraphview.cpp:2207
+#: costtypeview.cpp:81
 msgid ""
-"There is no call graph available for function\n"
-"\t'%1'\n"
-"because it has no cost of the selected event type."
-msgstr ""
-
-#: callgraphview.cpp:2428
-msgid "Stop Layouting"
-msgstr ""
-
-#: callgraphview.cpp:2436
-msgid "As PostScript"
-msgstr ""
-
-#: callgraphview.cpp:2437
-msgid "As Image ..."
-msgstr ""
-
-#: callgraphview.cpp:2439
-msgid "Export Graph"
-msgstr ""
-
-#: callgraphview.cpp:2444 callgraphview.cpp:2467
-msgid "Unlimited"
-msgstr "Heb derfyn"
-
-#: callgraphview.cpp:2447 callgraphview.cpp:2470
-msgid "None"
-msgstr "Dim"
-
-#: callgraphview.cpp:2448 callgraphview.cpp:2471
-msgid "max. 2"
-msgstr ""
-
-#: callgraphview.cpp:2449 callgraphview.cpp:2472
-msgid "max. 5"
-msgstr ""
-
-#: callgraphview.cpp:2450 callgraphview.cpp:2473
-msgid "max. 10"
-msgstr ""
-
-#: callgraphview.cpp:2451 callgraphview.cpp:2474
-msgid "max. 15"
-msgstr ""
-
-#: callgraphview.cpp:2461 callgraphview.cpp:2484
-#, c-format
-msgid "< %1"
-msgstr "< %1"
-
-#: callgraphview.cpp:2490
-msgid "No Minimum"
-msgstr ""
-
-#: callgraphview.cpp:2494
-#, c-format
-msgid "50 %"
-msgstr "50 %"
-
-#: callgraphview.cpp:2495
-#, c-format
-msgid "20 %"
-msgstr ""
-
-#: callgraphview.cpp:2496
-#, c-format
-msgid "10 %"
-msgstr ""
-
-#: callgraphview.cpp:2497
-#, c-format
-msgid "5 %"
+"<b>Cost Types List</b>"
+"<p>This list shows all cost types available and what the self/inclusive cost of "
+"the current selected function is for that cost type.</p>"
+"<p>By choosing a cost type from the list, you change the cost type of costs "
+"shown all over KCachegrind to be the selected one.</p>"
 msgstr ""
 
-#: callgraphview.cpp:2498
-#, c-format
-msgid "3 %"
+#: costtypeview.cpp:98
+msgid "Set Secondary Event Type"
 msgstr ""
 
-#: callgraphview.cpp:2499
-#, c-format
-msgid "2 %"
+#: costtypeview.cpp:100
+msgid "Remove Secondary Event Type"
 msgstr ""
 
-#: callgraphview.cpp:2500
-#, c-format
-msgid "1.5 %"
+#: costtypeview.cpp:105
+msgid "Edit Long Name"
 msgstr ""
 
-#: callgraphview.cpp:2501
-#, c-format
-msgid "1 %"
+#: costtypeview.cpp:106
+msgid "Edit Short Name"
 msgstr ""
 
-#: callgraphview.cpp:2517
-msgid "Same as Node"
+#: costtypeview.cpp:107
+msgid "Edit Formula"
 msgstr ""
 
-#: callgraphview.cpp:2518
-#, c-format
-msgid "50 % of Node"
+#: costtypeview.cpp:115
+msgid "New Cost Type ..."
 msgstr ""
 
-#: callgraphview.cpp:2519
+#: costtypeview.cpp:149 costtypeview.cpp:154
 #, c-format
-msgid "20 % of Node"
+msgid "New%1"
 msgstr ""
 
-#: callgraphview.cpp:2520
+#: costtypeview.cpp:155
 #, c-format
-msgid "10 % of Node"
-msgstr ""
-
-#: callgraphview.cpp:2530
-msgid "Caller Depth"
-msgstr ""
-
-#: callgraphview.cpp:2531
-msgid "Callee Depth"
-msgstr ""
-
-#: callgraphview.cpp:2532
-msgid "Min. Node Cost"
-msgstr ""
-
-#: callgraphview.cpp:2533
-msgid "Min. Call Cost"
-msgstr ""
-
-#: callgraphview.cpp:2535
-msgid "Arrows for Skipped Calls"
-msgstr ""
-
-#: callgraphview.cpp:2537
-msgid "Inner-cycle Calls"
-msgstr ""
-
-#: callgraphview.cpp:2539
-msgid "Cluster Groups"
-msgstr ""
-
-#: callgraphview.cpp:2544
-msgid "Compact"
-msgstr "Cywasgu"
-
-#: callgraphview.cpp:2545
-msgid "Normal"
-msgstr "Arferol"
-
-#: callgraphview.cpp:2546
-msgid "Tall"
-msgstr ""
-
-#: callgraphview.cpp:2551
-msgid "Top to Down"
-msgstr ""
-
-#: callgraphview.cpp:2552
-msgid "Left to Right"
-msgstr ""
-
-#: callgraphview.cpp:2553
-msgid "Circular"
-msgstr "Crwn"
-
-#: callgraphview.cpp:2559
-msgid "TopLeft"
-msgstr ""
-
-#: callgraphview.cpp:2560
-msgid "TopRight"
-msgstr ""
-
-#: callgraphview.cpp:2561
-msgid "BottomLeft"
+msgid "New Cost Type %1"
 msgstr ""
 
-#: callgraphview.cpp:2562
-msgid "BottomRight"
-msgstr ""
+#: costtypeitem.cpp:56
+msgid "Unknown Type"
+msgstr "Math anhysbys"
 
-#. i18n: file configdlgbase.ui line 246
-#: callgraphview.cpp:2563 rc.cpp:42 rc.cpp:51 rc.cpp:54
+#. i18n: file dumpselectionbase.ui line 906
+#: instrview.cpp:125 rc.cpp:264 sourceview.cpp:50
 #, no-c-format
-msgid "Automatic"
-msgstr "Awtomatig"
-
-#: callgraphview.cpp:2570
-msgid "Graph"
-msgstr "Graff"
-
-#: callgraphview.cpp:2572
-msgid "Birds-eye View"
-msgstr ""
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "KD wrth KGyfieithu"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "kyfieithu@dotmon.com"
-
-#: coverageitem.cpp:65 coverageitem.cpp:205 functionitem.cpp:72
-#, c-format
-msgid ""
-"_n: (%n function skipped)\n"
-"(%n functions skipped)"
-msgstr ""
-
-#: main.cpp:38
-msgid "Run <exec> under cachegrind"
-msgstr ""
-
-#: main.cpp:39
-msgid "Show information of this trace"
-msgstr ""
-
-#: main.cpp:46
-msgid "KCachegrind"
-msgstr "KCachegrind"
-
-#: main.cpp:48
-msgid "TDE Frontend for Cachegrind"
-msgstr ""
-
-#: main.cpp:50
-msgid "(C) 2002, 2003, 2004"
-msgstr ""
-
-#: main.cpp:53
-msgid "Author/Maintainer"
-msgstr ""
-
-#: tabview.cpp:64
-msgid "Move to Top"
-msgstr ""
-
-#: tabview.cpp:68
-msgid "Move to Right"
-msgstr ""
-
-#: tabview.cpp:72
-msgid "Move to Bottom"
-msgstr ""
-
-#: tabview.cpp:76
-msgid "Move to Bottom Left"
-msgstr ""
-
-#: tabview.cpp:77 tabview.cpp:94 treemap.cpp:2908
-msgid "Bottom Left"
-msgstr "Chwith Gwaelod"
-
-#: tabview.cpp:79
-msgid "Move Area To"
-msgstr ""
-
-#: tabview.cpp:81
-msgid "Hide This Tab"
-msgstr ""
-
-#: tabview.cpp:82
-msgid "Hide Area"
-msgstr ""
-
-#: tabview.cpp:95
-msgid "Show Hidden On"
-msgstr ""
-
-#: tabview.cpp:242
-msgid "(No profile data file loaded)"
-msgstr ""
-
-#: tabview.cpp:281
-msgid "Types"
-msgstr "Mathau"
-
-#: tabview.cpp:284
-msgid "Callers"
-msgstr ""
-
-#: tabview.cpp:287
-msgid "All Callers"
-msgstr ""
-
-#: tabview.cpp:290
-msgid "Caller Map"
-msgstr ""
-
-#: tabview.cpp:293
-msgid "Source"
-msgstr "Tarddiad"
-
-#: tabview.cpp:297
-msgid "Parts"
-msgstr "Rhannau"
-
-#: tabview.cpp:300
-msgid "Call Graph"
-msgstr ""
-
-#: tabview.cpp:303
-msgid "Callees"
-msgstr ""
-
-#: tabview.cpp:306
-msgid "All Callees"
-msgstr ""
-
-#: tabview.cpp:310
-msgid "Callee Map"
-msgstr ""
-
-#: tabview.cpp:553
-msgid ""
-"<b>Information Tabs</b>"
-"<p>This widget shows information for the current selected function in different "
-"tabs: "
-"<ul>"
-"<li>The Costs tab shows a list of available event types and the inclusive and "
-"self costs regarding to these types.</li>"
-"<li>The Parts tab shows a list of trace parts if the trace consists of more "
-"than one part (otherwise, this tab is hided). The cost of the selected function "
-"spent in the different parts together with the calls happening is shown.</li>"
-"<li>The Call Lists tab shows direct callers and callees of the function in more "
-"detail.</li>"
-"<li>The Coverage tab shows the same is the Call Lists tab, but not only direct "
-"callers and callees but also indirect ones.</li>"
-"<li>The Call Graph tab shows a graphical visualization of the calls done by "
-"this function.</li>"
-"<li>The Source tab presents annotated source code if debugging information and "
-"the source file is available.</li>"
-"<li>The Assembler tab presents annotated assembler code if trace information on "
-"instruction level is available.</li></ul>For more information, see the <em>"
-"What's This?</em> help of the corresponding tab widget</p>"
-msgstr ""
-
-#: tabview.cpp:630
-msgid "(No Data loaded)"
-msgstr ""
-
-#: tabview.cpp:631
-msgid "(No function selected)"
-msgstr ""
+msgid "#"
+msgstr "#"
 
 #: sourceview.cpp:54 sourceview.cpp:554
 msgid "Source (unknown)"
@@ -1416,18 +1466,6 @@ msgstr ""
 msgid "The list can be found in the configuration dialog."
 msgstr ""
 
-#: partlistitem.cpp:49
-msgid " (Thread %1)"
-msgstr ""
-
-#: partlistitem.cpp:56
-msgid "(none)"
-msgstr "(dim)"
-
-#: callitem.cpp:82 partlistitem.cpp:152
-msgid "(active)"
-msgstr "(gweithredol)"
-
 #: functionselection.cpp:176
 #, c-format
 msgid "Go to %1"
@@ -1441,130 +1479,6 @@ msgstr ""
 msgid "No Grouping"
 msgstr ""
 
-#: coverageview.cpp:48 coverageview.cpp:54
-msgid "Distance"
-msgstr "Pellder"
-
-#. i18n: file dumpselectionbase.ui line 928
-#: coverageview.cpp:49 partview.cpp:49 rc.cpp:270 rc.cpp:315
-#, no-c-format
-msgid "Called"
-msgstr ""
-
-#: callview.cpp:48 coverageview.cpp:50
-msgid "Caller"
-msgstr ""
-
-#: coverageview.cpp:55
-msgid "Calling"
-msgstr ""
-
-#: callview.cpp:52 coverageview.cpp:56
-msgid "Callee"
-msgstr ""
-
-#: coverageview.cpp:90
-msgid ""
-"<b>List of all Callers</b>"
-"<p>This list shows all functions calling the current selected one, either "
-"directly or with several functions in-between on the stack; the number of "
-"functions in-between plus one is called the <em>Distance</em> "
-"(e.g. for function A,B,C there exists a call from A to C when A calls B and B "
-"calls C, i.e. A => B => C. The distance here is 2).</p>"
-"<p>Absolute cost shown is the cost spent in the selected function while a "
-"listed function is active; relative cost is the percentage of all cost spent in "
-"the selected function while the listed one is active. The cost graphic shows "
-"logarithmic percentage with a different color for each distance.</p>"
-"<p>As there can be many calls from the same function, the distance column "
-"sometimes shows the range of distances for all calls happening; then, in "
-"parentheses, there is the medium distance, i.e. the distance where most of the "
-"call costs happened.</p>"
-"<p>Selecting a function makes it the current selected one of this information "
-"panel. If there are two panels (Split mode), the function of the other panel is "
-"changed instead.</p>"
-msgstr ""
-
-#: coverageview.cpp:120
-msgid ""
-"<b>List of all Callees</b>"
-"<p>This list shows all functions called by the current selected one, either "
-"directly or with several function in-between on the stack; the number of "
-"function in-between plus one is called the <em>Distance</em> "
-"(e.g. for function A,B,C there exists a call from A to C when A calls B and B "
-"calls C, i.e. A => B => C. The distance here is 2).</p>"
-"<p>Absolute cost shown is the cost spent in the listed function while the "
-"selected is active; relative cost is the percentage of all cost spent in the "
-"listed function while the selected one is active. The cost graphic always shows "
-"logarithmic percentage with a different color for each distance.</p>"
-"<p>As there can be many calls to the same function, the distance column "
-"sometimes shows the range of distances for all calls happening; then, in "
-"parentheses, there is the medium distance, i.e. the distance where most of the "
-"call costs happened.</p>"
-"<p>Selecting a function makes it the current selected one of this information "
-"panel. If there are two panels (Split mode), the function of the other panel is "
-"changed instead.</p>"
-msgstr ""
-
-#: configuration.cpp:63
-msgid "Instruction Fetch"
-msgstr ""
-
-#: configuration.cpp:64
-msgid "Data Read Access"
-msgstr ""
-
-#: configuration.cpp:65
-msgid "Data Write Access"
-msgstr ""
-
-#: configuration.cpp:66
-msgid "L1 Instr. Fetch Miss"
-msgstr ""
-
-#: configuration.cpp:67
-msgid "L1 Data Read Miss"
-msgstr ""
-
-#: configuration.cpp:68
-msgid "L1 Data Write Miss"
-msgstr ""
-
-#: configuration.cpp:69
-msgid "L2 Instr. Fetch Miss"
-msgstr ""
-
-#: configuration.cpp:70
-msgid "L2 Data Read Miss"
-msgstr ""
-
-#: configuration.cpp:71
-msgid "L2 Data Write Miss"
-msgstr ""
-
-#: configuration.cpp:72
-msgid "Samples"
-msgstr ""
-
-#: configuration.cpp:73
-msgid "System Time"
-msgstr ""
-
-#: configuration.cpp:74
-msgid "User Time"
-msgstr ""
-
-#: configuration.cpp:75
-msgid "L1 Miss Sum"
-msgstr ""
-
-#: configuration.cpp:76
-msgid "L2 Miss Sum"
-msgstr ""
-
-#: configuration.cpp:77
-msgid "Cycle Estimation"
-msgstr ""
-
 #. i18n: file tdecachegrindui.rc line 15
 #: rc.cpp:9
 #, no-c-format
@@ -1619,6 +1533,12 @@ msgstr ""
 msgid "Cost Item Colors"
 msgstr ""
 
+#. i18n: file configdlgbase.ui line 246
+#: callgraphview.cpp:2562 rc.cpp:42 rc.cpp:51 rc.cpp:54
+#, no-c-format
+msgid "Automatic"
+msgstr "Awtomatig"
+
 #. i18n: file configdlgbase.ui line 254
 #: rc.cpp:45
 #, no-c-format
@@ -1931,12 +1851,6 @@ msgstr ""
 msgid "Basic Blocks"
 msgstr ""
 
-#. i18n: file dumpselectionbase.ui line 754
-#: callmapview.cpp:63 rc.cpp:234 rc.cpp:339
-#, no-c-format
-msgid "Calls"
-msgstr ""
-
 #. i18n: file dumpselectionbase.ui line 796
 #: rc.cpp:243
 #, no-c-format
@@ -1949,12 +1863,6 @@ msgstr ""
 msgid "Distinct"
 msgstr "Gwahanadwy"
 
-#. i18n: file dumpselectionbase.ui line 824
-#: configdlg.cpp:58 rc.cpp:249
-#, no-c-format
-msgid "ELF Objects"
-msgstr ""
-
 #. i18n: file dumpselectionbase.ui line 838
 #: rc.cpp:252
 #, no-c-format
@@ -1979,12 +1887,6 @@ msgstr ""
 msgid "Sync."
 msgstr "Cydweddu."
 
-#. i18n: file dumpselectionbase.ui line 950
-#: callmapview.cpp:61 rc.cpp:276 rc.cpp:321
-#, no-c-format
-msgid "Location"
-msgstr "Lleoliad"
-
 #. i18n: file dumpselectionbase.ui line 976
 #: rc.cpp:279
 #, no-c-format
@@ -2045,528 +1947,644 @@ msgstr ""
 msgid "Cost2"
 msgstr ""
 
-#: treemap.cpp:1281
+#: partgraph.cpp:167
 #, c-format
-msgid "Text %1"
-msgstr "Testun %1"
+msgid "Profile Part %1"
+msgstr ""
 
-#: treemap.cpp:2809
-msgid "Recursive Bisection"
-msgstr "Hanneru Ymgylchol"
+#: partgraph.cpp:226
+msgid "(no trace)"
+msgstr ""
 
-#: treemap.cpp:2810
-msgid "Columns"
-msgstr "Colofnau"
+#: partgraph.cpp:229
+msgid "(no part)"
+msgstr ""
 
-#: treemap.cpp:2811
-msgid "Rows"
-msgstr "Rhesi"
+#: configuration.cpp:67
+msgid "Instruction Fetch"
+msgstr ""
 
-#: treemap.cpp:2812
-msgid "Always Best"
-msgstr "Y Gorau Bob Tro"
+#: configuration.cpp:68
+msgid "Data Read Access"
+msgstr ""
 
-#: treemap.cpp:2813
-msgid "Best"
-msgstr "Y Gorau"
+#: configuration.cpp:69
+msgid "Data Write Access"
+msgstr ""
 
-#: treemap.cpp:2814
-msgid "Alternate (V)"
-msgstr "Bob yn Ail (Fertigol)"
+#: configuration.cpp:70
+msgid "L1 Instr. Fetch Miss"
+msgstr ""
 
-#: treemap.cpp:2815
-msgid "Alternate (H)"
-msgstr "Bob yn Ail (Llorweddol)"
+#: configuration.cpp:71
+msgid "L1 Data Read Miss"
+msgstr ""
 
-#: treemap.cpp:2872
-msgid "Nesting"
-msgstr "Ymnythu"
+#: configuration.cpp:72
+msgid "L1 Data Write Miss"
+msgstr ""
 
-#: treemap.cpp:2875
-msgid "Correct Borders Only"
-msgstr "Cywiro Ffiniau'n Unig"
+#: configuration.cpp:73
+msgid "L2 Instr. Fetch Miss"
+msgstr ""
 
-#: treemap.cpp:2877 treemap.cpp:2878 treemap.cpp:2879 treemap.cpp:2880
-#, c-format
-msgid "Width %1"
-msgstr "Lled %1"
+#: configuration.cpp:74
+msgid "L2 Data Read Miss"
+msgstr ""
 
-#: callmapview.cpp:321 treemap.cpp:2889
-msgid "Shading"
-msgstr "Arliwio"
+#: configuration.cpp:75
+msgid "L2 Data Write Miss"
+msgstr ""
 
-#: treemap.cpp:2902
-msgid "Visible"
-msgstr "Gweledol"
+#: configuration.cpp:76
+msgid "LL Instr. Fetch Miss"
+msgstr ""
 
-#: treemap.cpp:2903
-msgid "Take Space From Children"
-msgstr "Tynnu Lle o'i Blant"
+#: configuration.cpp:77
+msgid "LL Data Read Miss"
+msgstr ""
 
-#: treemap.cpp:2905
-msgid "Top Left"
-msgstr "Chwith Uchaf"
+#: configuration.cpp:78
+msgid "LL Data Write Miss"
+msgstr ""
 
-#: treemap.cpp:2906
-msgid "Top Center"
-msgstr "Canol Uchaf"
+#: configuration.cpp:79
+msgid "Samples"
+msgstr ""
 
-#: treemap.cpp:2907
-msgid "Top Right"
-msgstr "De Uchaf"
+#: configuration.cpp:80
+msgid "System Time"
+msgstr ""
 
-#: treemap.cpp:2909
-msgid "Bottom Center"
-msgstr "Canol Gwaelod"
+#: configuration.cpp:81
+msgid "User Time"
+msgstr ""
 
-#: treemap.cpp:2910
-msgid "Bottom Right"
-msgstr "De Gwaelod"
+#: configuration.cpp:82
+msgid "L1 Miss Sum"
+msgstr ""
 
-#: treemap.cpp:2987
-msgid "No %1 Limit"
-msgstr "Dim Cyfyngiad %1 "
+#: configuration.cpp:83
+msgid "L2 Miss Sum"
+msgstr ""
 
-#: callmapview.cpp:243 treemap.cpp:3039
-msgid "No Area Limit"
-msgstr "Dim Cyfyngiad Ardal"
+#: configuration.cpp:84
+msgid "LL Miss Sum"
+msgstr ""
 
-#: callmapview.cpp:258 treemap.cpp:3045
-msgid "Area of '%1' (%2)"
-msgstr "Ardal '%1' (%2)"
+#: configuration.cpp:85
+msgid "Cycle Estimation"
+msgstr ""
 
-#: treemap.cpp:3056 treemap.cpp:3067
-#, c-format
+#: partview.cpp:51
+msgid "Comment"
+msgstr "Sylwad"
+
+#: partview.cpp:73
 msgid ""
-"_n: 1 Pixel\n"
-"%n Pixels"
+"<b>Trace Part List</b>"
+"<p>This list shows all trace parts of the loaded trace. For each part, the "
+"self/inclusive cost of the current selected function, spent in the part, is "
+"shown; percentage costs are always relative to the total cost <em>"
+"of the part</em> (not to the whole trace as in the Trace Part Overview). Also "
+"shown are the calls happening to/from the current function inside of the trace "
+"part.</p>"
+"<p>By choosing one or more trace parts from the list, the costs shown all over "
+"KCachegrind will only be the ones spent in the selected part(s). If no list "
+"selection is shown, in fact all trace parts are selected implicitly.</p>"
+"<p>This is a multi-selection list. You can select ranges by dragging the mouse "
+"or use SHIFT/CTRL modifiers. Selection/Deselection of trace parts can also be "
+"done by using the Trace Part Overview Dockable. This one also supports multiple "
+"selection.</p>"
+"<p>Note that the list is hidden if only one trace part is loaded.</p>"
 msgstr ""
-"1 Picsel\n"
-" %n Picsel"
 
-#: callmapview.cpp:264 treemap.cpp:3071
-msgid "Double Area Limit (to %1)"
-msgstr "Cyfyngiad Ardal Dwbl (i %1)"
+#: partview.cpp:106
+msgid "Select '%1'"
+msgstr "Dewis '%1'"
 
-#: treemap.cpp:3073
-msgid "Halve Area Limit (to %1)"
-msgstr "Haneru Cyfyngiad Ardal (i %1)"
+#: partview.cpp:107
+msgid "Hide '%1'"
+msgstr "Cuddio '%1'"
 
-#: callmapview.cpp:187 treemap.cpp:3101
-msgid "No Depth Limit"
-msgstr "Dim Cyfyngiad Dyfnder"
+#: partview.cpp:111
+msgid "Hide Selected"
+msgstr ""
 
-#: callmapview.cpp:198 treemap.cpp:3107
-msgid "Depth of '%1' (%2)"
-msgstr "Dyfnder o '%1' (%2)"
+#: partview.cpp:112
+msgid "Show All"
+msgstr "Dangos Pob Un"
 
-#: treemap.cpp:3118
+#: traceitemview.cpp:53
+msgid "No description available"
+msgstr "Dim disgrifiad ar gael"
+
+#: coverageitem.cpp:65 coverageitem.cpp:205 functionitem.cpp:72
 #, c-format
-msgid "Depth %1"
-msgstr "Dyfnder %1"
+msgid ""
+"_n: (%n function skipped)\n"
+"(%n functions skipped)"
+msgstr ""
 
-#: treemap.cpp:3122
-msgid "Decrement (to %1)"
-msgstr "Iselhau fesul un (hyd at %1)"
+#: callgraphview.cpp:306
+#, c-format
+msgid "Call(s) from %1"
+msgstr ""
 
-#: treemap.cpp:3124
-msgid "Increment (to %1)"
-msgstr "Cynyddu fesul un (hyd at %1)"
+#: callgraphview.cpp:307
+#, c-format
+msgid "Call(s) to %1"
+msgstr ""
 
-#: callmapview.cpp:98
+#: callgraphview.cpp:308
+msgid "(unknown call)"
+msgstr ""
+
+#: callgraphview.cpp:1425
 msgid ""
-"<b>Caller Map</b>"
-"<p>This graph shows the nested hierarchy of all callers of the current "
-"activated function. Each colored rectangle represents a function; its size "
-"tries to be proportional to the cost spent therein while the active function is "
-"running (however, there are drawing constrains).</p>"
+"<b>Call Graph around active Function</b>"
+"<p>Depending on configuration, this view shows the call graph environment of "
+"the active function. Note: the shown cost is <b>only</b> "
+"the cost which is spent while the active function was actually running; i.e. "
+"the cost shown for main() - if it's visible - should be the same as the cost of "
+"the active function, as that's the part of inclusive cost of main() spent while "
+"the active function was running.</p>"
+"<p>For cycles, blue call arrows indicate that this is an artificial call added "
+"for correct drawing which actually never happened.</p>"
+"<p>If the graph is larger than the widget area, an overview panner is shown in "
+"one edge. There are similar visualization options to the Call Treemap; the "
+"selected function is highlighted."
+"<p>"
 msgstr ""
 
-#: callmapview.cpp:105
+#: callgraphview.cpp:1789
 msgid ""
-"<b>Call Map</b>"
-"<p>This graph shows the nested hierarchy of all callees of the current "
-"activated function. Each colored rectangle represents a function; its size "
-"tries to be proportional to the cost spent therein while the active function is "
-"running (however, there are drawing constrains).</p>"
+"Warning: a long lasting graph layouting is in progress.\n"
+"Reduce node/edge limits for speedup.\n"
 msgstr ""
 
-#: callmapview.cpp:113
+#: callgraphview.cpp:1792
 msgid ""
-"<p>Appearance options can be found in the in the context menu. To get exact "
-"size proportions, choose 'Hide incorrect borders'. As this mode can be <em>"
-"very</em> time consuming, you may want to limit the maximum drawn nesting level "
-"before. 'Best' determinates the split direction for children from the aspect "
-"ratio of the parent. 'Always Best' decides on remaining space for each sibling. "
-"'Ignore Proportions' takes space for function name drawing <em>before</em> "
-"drawing children. Note that size proportions can get <em>heavily</em> wrong.</p>"
-"<p>This is a <em>TreeMap</em> widget. Keyboard navigation is available with the "
-"left/right arrow keys for traversing siblings, and up/down arrow keys to go a "
-"nesting level up/down. <em>Return</em> activates the current item.</p>"
+"Layouting stopped.\n"
 msgstr ""
 
-#: callmapview.cpp:167
-msgid "Go To"
-msgstr "Ewch I"
+#: callgraphview.cpp:1794
+msgid ""
+"The call graph has %1 nodes and %2 edges.\n"
+msgstr ""
 
-#: callmapview.cpp:184
-msgid "Stop at Depth"
-msgstr "Aros wrth Ddyfnder"
+#: callgraphview.cpp:1827
+msgid "No item activated for which to draw the call graph."
+msgstr ""
 
-#: callmapview.cpp:190
-msgid "Depth 10"
+#: callgraphview.cpp:1838
+msgid "No call graph can be drawn for the active item."
 msgstr ""
 
-#: callmapview.cpp:192
-msgid "Depth 15"
+#: callgraphview.cpp:1867
+msgid ""
+"No call graph is available because the following\n"
+"command cannot be run:\n"
+"'%1'\n"
 msgstr ""
 
-#: callmapview.cpp:194
-msgid "Depth 20"
+#: callgraphview.cpp:1870 callgraphview.cpp:2199
+msgid "Please check that 'dot' is installed (package GraphViz)."
 msgstr ""
 
-#: callmapview.cpp:204
-msgid "Decrement Depth (to %1)"
+#: callgraphview.cpp:2198
+msgid ""
+"Error running the graph layouting tool.\n"
 msgstr ""
 
-#: callmapview.cpp:205
-msgid "Increment Depth (to %1)"
+#: callgraphview.cpp:2206
+msgid ""
+"There is no call graph available for function\n"
+"\t'%1'\n"
+"because it has no cost of the selected event type."
 msgstr ""
 
-#: callmapview.cpp:209
-msgid "Stop at Function"
+#: callgraphview.cpp:2427
+msgid "Stop Layouting"
 msgstr ""
 
-#: callmapview.cpp:210
-msgid "No Function Limit"
+#: callgraphview.cpp:2435
+msgid "As PostScript"
 msgstr ""
 
-#: callmapview.cpp:240
-msgid "Stop at Area"
-msgstr "Aros wrth Ardal"
+#: callgraphview.cpp:2436
+msgid "As Image ..."
+msgstr ""
 
-#: callmapview.cpp:246
-msgid "50 Pixels"
+#: callgraphview.cpp:2438
+msgid "Export Graph"
 msgstr ""
 
-#: callmapview.cpp:248
-msgid "100 Pixels"
+#: callgraphview.cpp:2443 callgraphview.cpp:2466
+msgid "Unlimited"
+msgstr "Heb derfyn"
+
+#: callgraphview.cpp:2446 callgraphview.cpp:2469
+msgid "None"
+msgstr "Dim"
+
+#: callgraphview.cpp:2447 callgraphview.cpp:2470
+msgid "max. 2"
 msgstr ""
 
-#: callmapview.cpp:250
-msgid "200 Pixels"
+#: callgraphview.cpp:2448 callgraphview.cpp:2471
+msgid "max. 5"
 msgstr ""
 
-#: callmapview.cpp:252
-msgid "500 Pixels"
+#: callgraphview.cpp:2449 callgraphview.cpp:2472
+msgid "max. 10"
 msgstr ""
 
-#: callmapview.cpp:266
-msgid "Half Area Limit (to %1)"
+#: callgraphview.cpp:2450 callgraphview.cpp:2473
+msgid "max. 15"
 msgstr ""
 
-#: callmapview.cpp:273
-msgid "Visualisation"
+#: callgraphview.cpp:2460 callgraphview.cpp:2483
+#, c-format
+msgid "< %1"
+msgstr "< %1"
+
+#: callgraphview.cpp:2489
+msgid "No Minimum"
 msgstr ""
 
-#: callmapview.cpp:277
-msgid "Split Direction"
+#: callgraphview.cpp:2493
+#, c-format
+msgid "50 %"
+msgstr "50 %"
+
+#: callgraphview.cpp:2494
+#, c-format
+msgid "20 %"
 msgstr ""
 
-#: callmapview.cpp:279
-msgid "Skip Incorrect Borders"
+#: callgraphview.cpp:2495
+#, c-format
+msgid "10 %"
 msgstr ""
 
-#: callmapview.cpp:284
-msgid "Border Width"
-msgstr "Lled Border"
+#: callgraphview.cpp:2496
+#, c-format
+msgid "5 %"
+msgstr ""
 
-#: callmapview.cpp:285
-msgid "Border 0"
+#: callgraphview.cpp:2497
+#, c-format
+msgid "3 %"
 msgstr ""
 
-#: callmapview.cpp:288
-msgid "Border 1"
+#: callgraphview.cpp:2498
+#, c-format
+msgid "2 %"
 msgstr ""
 
-#: callmapview.cpp:290
-msgid "Border 2"
+#: callgraphview.cpp:2499
+#, c-format
+msgid "1.5 %"
 msgstr ""
 
-#: callmapview.cpp:292
-msgid "Border 3"
+#: callgraphview.cpp:2500
+#, c-format
+msgid "1 %"
 msgstr ""
 
-#: callmapview.cpp:297
-msgid "Draw Symbol Names"
+#: callgraphview.cpp:2516
+msgid "Same as Node"
 msgstr ""
 
-#: callmapview.cpp:298
-msgid "Draw Cost"
+#: callgraphview.cpp:2517
+#, c-format
+msgid "50 % of Node"
 msgstr ""
 
-#: callmapview.cpp:299
-msgid "Draw Location"
+#: callgraphview.cpp:2518
+#, c-format
+msgid "20 % of Node"
 msgstr ""
 
-#: callmapview.cpp:300
-msgid "Draw Calls"
+#: callgraphview.cpp:2519
+#, c-format
+msgid "10 % of Node"
 msgstr ""
 
-#: callmapview.cpp:431
-msgid "Call Map: Current is '%1'"
+#: callgraphview.cpp:2529
+msgid "Caller Depth"
 msgstr ""
 
-#: callmapview.cpp:599
-msgid "(no function)"
+#: callgraphview.cpp:2530
+msgid "Callee Depth"
 msgstr ""
 
-#: callmapview.cpp:741 callmapview.cpp:858
-msgid "(no call)"
+#: callgraphview.cpp:2531
+msgid "Min. Node Cost"
 msgstr ""
 
-#: cachegrindloader.cpp:141
-msgid "Import filter for Cachegrind/Callgrind generated profile data files"
+#: callgraphview.cpp:2532
+msgid "Min. Call Cost"
 msgstr ""
 
-#: cachegrindloader.cpp:738
-#, c-format
-msgid "Loading %1"
-msgstr "llwytho %1"
+#: callgraphview.cpp:2534
+msgid "Arrows for Skipped Calls"
+msgstr ""
 
-#: callview.cpp:47 callview.cpp:51
-msgid "Count"
-msgstr "Cyfrif"
+#: callgraphview.cpp:2536
+msgid "Inner-cycle Calls"
+msgstr ""
 
-#: callview.cpp:85
-msgid ""
-"<b>List of direct Callers</b>"
-"<p>This list shows all functions calling the current selected one directly, "
-"together with a call count and the cost spent in the current selected function "
-"while being called from the function from the list.</p>"
-"<p>An icon instead of an inclusive cost specifies that this is a call inside of "
-"a recursive cycle. An inclusive cost makes no sense here.</p>"
-"<p>Selecting a function makes it the current selected one of this information "
-"panel. If there are two panels (Split mode), the function of the other panel is "
-"changed instead.</p>"
+#: callgraphview.cpp:2538
+msgid "Cluster Groups"
 msgstr ""
 
-#: callview.cpp:98
-msgid ""
-"<b>List of direct Callees</b>"
-"<p>This list shows all functions called by the current selected one directly, "
-"together with a call count and the cost spent in this function while being "
-"called from the selected function.</p>"
-"<p>Selecting a function makes it the current selected one of this information "
-"panel. If there are two panels (Split mode), the function of the other panel is "
-"changed instead.</p>"
+#: callgraphview.cpp:2543
+msgid "Compact"
+msgstr "Cywasgu"
+
+#: callgraphview.cpp:2544
+msgid "Normal"
+msgstr "Arferol"
+
+#: callgraphview.cpp:2545
+msgid "Tall"
 msgstr ""
 
-#: costtypeitem.cpp:56
-msgid "Unknown Type"
-msgstr "Math anhysbys"
+#: callgraphview.cpp:2550
+msgid "Top to Down"
+msgstr ""
 
-#: tips.cpp:3
-msgid ""
-"<p>...that the <em>What's This?</em> help for every GUI widget\n"
-"in KCachegrind contains detailed usage information for this widget?\n"
-"It is highly recommended to read at least these help texts on first\n"
-"use. Request <em>What's This?</em> help by pressing\n"
-"Shift+F1 and clicking on the widget.</p>\n"
+#: callgraphview.cpp:2551
+msgid "Left to Right"
 msgstr ""
 
-#: tips.cpp:12
-msgid ""
-"<p>...that you can get profile information at instruction level\n"
-"with Calltree when you provide the option <em>--dump-instr=yes</em>?\n"
-"Use the Assembler View for the instruction annotations.\n"
-"</p>\n"
+#: callgraphview.cpp:2552
+msgid "Circular"
+msgstr "Crwn"
+
+#: callgraphview.cpp:2558
+msgid "TopLeft"
 msgstr ""
 
-#: tips.cpp:20
-msgid ""
-"<p>...that you can use Alt-Left/Right keys of your keyboard to go\n"
-"back/forward in the active object history ?</p>\n"
+#: callgraphview.cpp:2559
+msgid "TopRight"
 msgstr ""
 
-#: tips.cpp:26
-msgid ""
-"<p>...that you can navigate in the Callee/Caller Map View using\n"
-"arrow keys? Use Left/Right to change to siblings of the current\n"
-"item; use Up/Down to go one nesting level up/down. To select\n"
-"the current item, press Space, and to activate it, press Return.\n"
-"</p>\n"
+#: callgraphview.cpp:2560
+msgid "BottomLeft"
 msgstr ""
 
-#: tips.cpp:35
-msgid ""
-"<p>...that you can navigate in the Call Graph View using\n"
-"arrow keys? Use Up/Down to go one calling level up/down, alternating\n"
-"between calls and functions. Use Left/Right to change to siblings of a current\n"
-"selected call. To activate the current item, press Return.\n"
-"</p>\n"
+#: callgraphview.cpp:2561
+msgid "BottomRight"
 msgstr ""
 
-#: tips.cpp:44
-msgid ""
-"<p>...that you can rapidly locate a function by entering part of its\n"
-"name (case-insensitive) into the edit line of the toolbar\n"
-"and hit return?</p>\n"
+#: callgraphview.cpp:2569
+msgid "Graph"
+msgstr "Graff"
+
+#: callgraphview.cpp:2571
+msgid "Birds-eye View"
 msgstr ""
 
-#: tips.cpp:51
+#: treemap.cpp:1281
+#, c-format
+msgid "Text %1"
+msgstr "Testun %1"
+
+#: treemap.cpp:2809
+msgid "Recursive Bisection"
+msgstr "Hanneru Ymgylchol"
+
+#: treemap.cpp:2810
+msgid "Columns"
+msgstr "Colofnau"
+
+#: treemap.cpp:2811
+msgid "Rows"
+msgstr "Rhesi"
+
+#: treemap.cpp:2812
+msgid "Always Best"
+msgstr "Y Gorau Bob Tro"
+
+#: treemap.cpp:2813
+msgid "Best"
+msgstr "Y Gorau"
+
+#: treemap.cpp:2814
+msgid "Alternate (V)"
+msgstr "Bob yn Ail (Fertigol)"
+
+#: treemap.cpp:2815
+msgid "Alternate (H)"
+msgstr "Bob yn Ail (Llorweddol)"
+
+#: treemap.cpp:2872
+msgid "Nesting"
+msgstr "Ymnythu"
+
+#: treemap.cpp:2875
+msgid "Correct Borders Only"
+msgstr "Cywiro Ffiniau'n Unig"
+
+#: treemap.cpp:2877 treemap.cpp:2878 treemap.cpp:2879 treemap.cpp:2880
+#, c-format
+msgid "Width %1"
+msgstr "Lled %1"
+
+#: treemap.cpp:2902
+msgid "Visible"
+msgstr "Gweledol"
+
+#: treemap.cpp:2903
+msgid "Take Space From Children"
+msgstr "Tynnu Lle o'i Blant"
+
+#: treemap.cpp:2905
+msgid "Top Left"
+msgstr "Chwith Uchaf"
+
+#: treemap.cpp:2906
+msgid "Top Center"
+msgstr "Canol Uchaf"
+
+#: treemap.cpp:2907
+msgid "Top Right"
+msgstr "De Uchaf"
+
+#: treemap.cpp:2909
+msgid "Bottom Center"
+msgstr "Canol Gwaelod"
+
+#: treemap.cpp:2910
+msgid "Bottom Right"
+msgstr "De Gwaelod"
+
+#: treemap.cpp:2987
+msgid "No %1 Limit"
+msgstr "Dim Cyfyngiad %1 "
+
+#: treemap.cpp:3056 treemap.cpp:3067
+#, c-format
 msgid ""
-"<p>...that you can assign custom colors to \n"
-"ELF objects/C++ Classes/Source Files for graph coloring\n"
-"in <em>Settings->Configure KCachegrind...</em>?</p>\n"
+"_n: 1 Pixel\n"
+"%n Pixels"
 msgstr ""
+"1 Picsel\n"
+" %n Picsel"
 
-#: tips.cpp:58
-msgid ""
-"<p>...that you can see if debug info is available for a selected \n"
-"function by looking at the location label in the Info tab or\n"
-"the source listing header in the source tab?</p>\n"
-"<p>There must be the name of the source file (with extension).\n"
-"If KCachegrind still doesn't show the source, make sure that you\n"
-"have added the directory of the source file to the\n"
-"<em>Source Directories</em> list in the configuration.\n"
+#: treemap.cpp:3073
+msgid "Halve Area Limit (to %1)"
+msgstr "Haneru Cyfyngiad Ardal (i %1)"
+
+#: treemap.cpp:3118
+#, c-format
+msgid "Depth %1"
+msgstr "Dyfnder %1"
+
+#: treemap.cpp:3122
+msgid "Decrement (to %1)"
+msgstr "Iselhau fesul un (hyd at %1)"
+
+#: treemap.cpp:3124
+msgid "Increment (to %1)"
+msgstr "Cynyddu fesul un (hyd at %1)"
+
+#: callitem.cpp:82 partlistitem.cpp:152
+msgid "(active)"
+msgstr "(gweithredol)"
+
+#: instrview.cpp:129
+msgid "Hex"
+msgstr "Hecs"
+
+#: instrview.cpp:132
+msgid "Source Position"
 msgstr ""
 
-#: tips.cpp:69
+#: instrview.cpp:163
 msgid ""
-"<p>...that you can configure whether KCachgrind should\n"
-"show absolute event counts or relative ones (percentage display)?</p>\n"
+"<b>Annotated Assembler</b>"
+"<p>The annotated assembler list shows the machine code instructions of the "
+"current selected function together with (self) cost spent while executing an "
+"instruction. If this is a call instruction, lines with details on the call "
+"happening are inserted into the source: the cost spent inside of the call, the "
+"number of calls happening, and the call destination.</p>"
+"<p>The disassembler output shown is generated with the 'objdump' utility from "
+"the 'binutils' package.</p>"
+"<p>Select a line with call information to make the destination function of this "
+"call current.</p>"
 msgstr ""
 
-#: tips.cpp:75
-msgid ""
-"<p>...that you can configure the maximum number of items\n"
-"for all function lists in KCachegrind? Limiting the number\n"
-"of items is done to get a fast reacting GUI. The last item in\n"
-"the list will show you the number of skipped functions, together\n"
-"with a cost condition for these skipped functions.</p>\n"
-"<p>To activate a function with small costs, search for it and select\n"
-"it in the flat profile. Selecting functions with small cost will\n"
-"temporarily add them to the flat profile list.</p>\n"
+#: instrview.cpp:195
+#, c-format
+msgid "Go to Address %1"
 msgstr ""
 
-#: tips.cpp:87
-msgid ""
-"<p>...that the Coverage tab - in contrast to the Call Lists tab -\n"
-"shows <em>all</em> functions that are calling the selected function\n"
-"(upper part) / are called by the selected function (bottom part),\n"
-"no matter how many function are between them on the stack?</p>\n"
-"<p>Examples:</p>\n"
-"<p>An entry in the upper list for function foo1() with a value of 50%\n"
-"with function bar() selected means that 50% of all the cost of function\n"
-"bar() happened while called from function foo1().</p>\n"
-"<p>An entry in the bottom list for function foo2() with a value of 50%\n"
-"with function bar() selected means that 50% of all the cost of function\n"
-"bar() happened while calling foo2() from bar().</p>\n"
+#: instrview.cpp:207
+msgid "Hex Code"
 msgstr ""
 
-#: tips.cpp:102
-msgid ""
-"<p>...that waiting for the tool tip inside of a tree map\n"
-"shows the list of names of the nested rectangles the mouse\n"
-"pointer is over?</p>\n"
-"<p>Items from this list can be selected by pressing the right\n"
-"mouse button.</p>\n"
+#: instrview.cpp:426
+msgid "There is no instruction info in the profile data file."
 msgstr ""
 
-#: tips.cpp:111
-msgid ""
-"<p>...that you can constrain the cost counts shown to only a\n"
-"few parts of the whole trace by selecting these parts in the\n"
-"\"Trace Selection\" Dockable?</p>\n"
-"<p>To generate multiple parts in a profiling run with\n"
-"cachegrind, use e.g. option --cachedumps=xxx for parts\n"
-"of a length of xxx basic blocks (A basic block is a run\n"
-"of not-branching assembler statements inside of your program\n"
-"code).</p>\n"
+#: instrview.cpp:428
+msgid "For the Valgrind Calltree Skin, rerun with option"
 msgstr ""
 
-#: configdlg.cpp:60
-msgid "Source Files"
+#: instrview.cpp:429
+msgid "      --dump-instr=yes"
 msgstr ""
 
-#: configdlg.cpp:61
-msgid "C++ Classes"
+#: instrview.cpp:430
+msgid "To see (conditional) jumps, additionally specify"
 msgstr ""
 
-#: configdlg.cpp:62
-msgid "Function (no Grouping)"
+#: instrview.cpp:431
+msgid "      --trace-jump=yes"
 msgstr ""
 
-#: configdlg.cpp:157 configdlg.cpp:350 configdlg.cpp:371
-msgid "(always)"
+#: instrview.cpp:629
+msgid "There is an error trying to execute the command"
 msgstr ""
 
-#: configdlg.cpp:210
-msgid "KCachegrind Configuration"
+#: instrview.cpp:634 instrview.cpp:900
+msgid "Check that you have installed 'objdump'."
 msgstr ""
 
-#: configdlg.cpp:211
-msgid ""
-"The Maximum Number of List Items should be below 500.The previous set value "
-"(%1) will still be used."
+#: instrview.cpp:636 instrview.cpp:902
+msgid "This utility can be found in the 'binutils' package."
 msgstr ""
 
-#: configdlg.cpp:384
-msgid "Choose Source Folder"
+#: instrview.cpp:739
+msgid "(No Assembler)"
 msgstr ""
 
-#: partgraph.cpp:167
+#: instrview.cpp:875
 #, c-format
-msgid "Profile Part %1"
+msgid ""
+"_n: There is %n cost line without assembler code.\n"
+"There are %n cost lines without assembler code."
 msgstr ""
 
-#: partgraph.cpp:226
-msgid "(no trace)"
+#: instrview.cpp:877
+msgid "This happens because the code of"
 msgstr ""
 
-#: partgraph.cpp:229
-msgid "(no part)"
+#: instrview.cpp:880
+msgid "does not seem to match the profile data file."
 msgstr ""
 
-#: partview.cpp:51
-msgid "Comment"
-msgstr "Sylwad"
+#: instrview.cpp:883
+msgid "Are you using an old profile data file or is the above mentioned"
+msgstr ""
 
-#: partview.cpp:73
-msgid ""
-"<b>Trace Part List</b>"
-"<p>This list shows all trace parts of the loaded trace. For each part, the "
-"self/inclusive cost of the current selected function, spent in the part, is "
-"shown; percentage costs are always relative to the total cost <em>"
-"of the part</em> (not to the whole trace as in the Trace Part Overview). Also "
-"shown are the calls happening to/from the current function inside of the trace "
-"part.</p>"
-"<p>By choosing one or more trace parts from the list, the costs shown all over "
-"KCachegrind will only be the ones spent in the selected part(s). If no list "
-"selection is shown, in fact all trace parts are selected implicitly.</p>"
-"<p>This is a multi-selection list. You can select ranges by dragging the mouse "
-"or use SHIFT/CTRL modifiers. Selection/Deselection of trace parts can also be "
-"done by using the Trace Part Overview Dockable. This one also supports multiple "
-"selection.</p>"
-"<p>Note that the list is hidden if only one trace part is loaded.</p>"
+#: instrview.cpp:885
+msgid "ELF object from an updated installation/another machine?"
 msgstr ""
 
-#: partview.cpp:106
-msgid "Select '%1'"
-msgstr "Dewis '%1'"
+#: instrview.cpp:893
+msgid "There seems to be an error trying to execute the command"
+msgstr ""
 
-#: partview.cpp:107
-msgid "Hide '%1'"
-msgstr "Cuddio '%1'"
+#: instrview.cpp:898
+msgid "Check that the ELF object used in the command exists."
+msgstr ""
 
-#: partview.cpp:111
-msgid "Hide Selected"
+#: partlistitem.cpp:49
+msgid " (Thread %1)"
 msgstr ""
 
-#: partview.cpp:112
-msgid "Show All"
-msgstr "Dangos Pob Un"
+#: partlistitem.cpp:56
+msgid "(none)"
+msgstr "(dim)"
+
+#: main.cpp:38
+msgid "Run <exec> under cachegrind"
+msgstr ""
+
+#: main.cpp:39
+msgid "Show information of this trace"
+msgstr ""
+
+#: main.cpp:46
+msgid "KCachegrind"
+msgstr "KCachegrind"
+
+#: main.cpp:48
+msgid "TDE Frontend for Cachegrind"
+msgstr ""
+
+#: main.cpp:50
+msgid "(C) 2002, 2003, 2004"
+msgstr ""
+
+#: main.cpp:53
+msgid "Author/Maintainer"
+msgstr ""
 
 #~ msgid "Query Toolbar"
 #~ msgstr "Bar Offer Ymholiadau"
diff --git a/tde-i18n-cy/messages/tdesdk/tdefile_cpp.po b/tde-i18n-cy/messages/tdesdk/tdefile_cpp.po
index 04b88fb0f5f..3ad92400708 100644
--- a/tde-i18n-cy/messages/tdesdk/tdefile_cpp.po
+++ b/tde-i18n-cy/messages/tdesdk/tdefile_cpp.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdesdk/tdefile_cpp.po\n"
-"POT-Creation-Date: 2005-05-18 21:25+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdesdk/tdefile_diff.po b/tde-i18n-cy/messages/tdesdk/tdefile_diff.po
index 3ce28323c05..951d0d8f3c0 100644
--- a/tde-i18n-cy/messages/tdesdk/tdefile_diff.po
+++ b/tde-i18n-cy/messages/tdesdk/tdefile_diff.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdesdk/tdefile_diff.po\n"
-"POT-Creation-Date: 2005-05-18 21:25+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdesdk/tdefile_po.po b/tde-i18n-cy/messages/tdesdk/tdefile_po.po
index 7e6ef4cc9cb..84b0893fe0f 100644
--- a/tde-i18n-cy/messages/tdesdk/tdefile_po.po
+++ b/tde-i18n-cy/messages/tdesdk/tdefile_po.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdesdk/tdefile_po.po\n"
-"POT-Creation-Date: 2005-05-18 21:25+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdesdk/tdefile_ts.po b/tde-i18n-cy/messages/tdesdk/tdefile_ts.po
index a965d1c3fb4..230b7091c1a 100644
--- a/tde-i18n-cy/messages/tdesdk/tdefile_ts.po
+++ b/tde-i18n-cy/messages/tdesdk/tdefile_ts.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdesdk/tdefile_ts.po\n"
-"POT-Creation-Date: 2005-05-18 21:25+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdesdk/tdeio_svn.po b/tde-i18n-cy/messages/tdesdk/tdeio_svn.po
index a2f60d0d4af..49f3fe9a5e7 100644
--- a/tde-i18n-cy/messages/tdesdk/tdeio_svn.po
+++ b/tde-i18n-cy/messages/tdesdk/tdeio_svn.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: all2.po\n"
-"POT-Creation-Date: 2006-02-18 03:52+0100\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdesdk/umbrello.po b/tde-i18n-cy/messages/tdesdk/umbrello.po
index aed14a5d369..ded4d86e4ee 100644
--- a/tde-i18n-cy/messages/tdesdk/umbrello.po
+++ b/tde-i18n-cy/messages/tdesdk/umbrello.po
@@ -1,14 +1,974 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdesdk/umbrello.po\n"
-"POT-Creation-Date: 2008-07-08 01:21+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. i18n: file codegenerators/cppcodegenerationformbase.ui line 36
+#: dialogs/activitydialog.cpp:90 dialogs/assocgenpage.cpp:56
+#: dialogs/assocrolepage.cpp:76 dialogs/assocrolepage.cpp:77
+#: dialogs/classgenpage.cpp:193 dialogs/classgenpage.cpp:293
+#: dialogs/classgenpage.cpp:356 dialogs/classifierlistpage.cpp:106
+#: dialogs/notedialog.cpp:29 dialogs/parmpropdlg.cpp:100
+#: dialogs/statedialog.cpp:104 docwindow.cpp:33 rc.cpp:30 rc.cpp:150
+#: rc.cpp:207 rc.cpp:445 rc.cpp:492
+#, no-c-format
+msgid "Documentation"
+msgstr "Dogfenniaeth"
+
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "KD wrth KGyfieithu"
+
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "kyfieithu@dotmon.com"
+
+#: aligntoolbar.cpp:40
+msgid "Align Left"
+msgstr "Alinio Chwith"
+
+#: aligntoolbar.cpp:41
+msgid "Align Right"
+msgstr "Alinio Dde"
+
+#: aligntoolbar.cpp:42
+msgid "Align Top"
+msgstr "Alinio Brig"
+
+#: aligntoolbar.cpp:43
+msgid "Align Bottom"
+msgstr "Alinio Gwaelod"
+
+#: aligntoolbar.cpp:44
+msgid "AlignQt::Vertical Middle"
+msgstr ""
+
+#: aligntoolbar.cpp:45
+msgid "AlignQt::Horizontal Middle"
+msgstr ""
+
+#: aligntoolbar.cpp:46
+msgid "AlignQt::Vertical Distribute"
+msgstr ""
+
+#: aligntoolbar.cpp:47
+msgid "AlignQt::Horizontal Distribute"
+msgstr ""
+
+#: aligntoolbar.cpp:383
+msgid ""
+"For alignment you have to select at least 2 objects like classes or actors. You "
+"can not align associations."
+msgstr ""
+
+#: tips.txt:3
+msgid ""
+"<p>Welcome to Umbrello.</p>\n"
+"<p>UML diagrams let you design and document object oriented software.  <a "
+"href=\"help:/umbrello\">The Umbrello Handbook</a> is a good introduction to "
+"using UML.</p>\n"
+msgstr ""
+
+#: tips.txt:9
+msgid ""
+"<p>Welcome to Umbrello 1.5.  New in this version are association classes, Ruby "
+"code generation, externalizable folders, ability to change interfaces into "
+"classes, and more.</p>\n"
+msgstr ""
+
+#: tips.txt:14
+msgid ""
+"<p>Tabbed Diagrams and Externalized Folders are mutually exclusive. If you need "
+"External Folders then deselect &quot;Use tabbed diagrams&quot; in the General "
+"Settings.</p>\n"
+msgstr ""
+
+#: tips.txt:19
+msgid ""
+"<p>Most diagram items can not be resized, they will resize themselves to fit to "
+"their contents.\n"
+"Boxes, notes and sequence diagram messages can be resized, just click and drag "
+"on the red square.</p>\n"
+msgstr ""
+
+#: tips.txt:25
+msgid ""
+"<p>If you want to add an already existing class to a diagram just drag its "
+"entry from the tree view.</p>\n"
+msgstr ""
+
+#: tips.txt:30
+msgid ""
+"<p>Umbrello's refactoring agent lets you move operations between a class and "
+"its derived and base \n"
+"classes.\n"
+"Right click a class to open the refactoring agent.</p>\n"
+msgstr ""
+
+#: tips.txt:37
+msgid ""
+"<p>Sequence diagram objects can have a destructor box and be drawn as actors.  "
+"Double click one for\n"
+"the Properties dialogue.</p>\n"
+msgstr ""
+
+#: tips.txt:43
+msgid ""
+"<p>Sequence diagram messages can act as constructors.  Click on the object box "
+"(rather than the vertical line) to make it a constructor.</p>\n"
+msgstr ""
+
+#: tips.txt:48
+msgid ""
+"<p>Sequence diagrams support messages to self.  Click on the same vertical line "
+"again to create an automessage.</p>\n"
+msgstr ""
+
+#: tips.txt:53
+msgid ""
+"<p>If on loading a foreign file nothing is displayed in the list view, try "
+"saving the model under a different name,\n"
+"closing, and reloading the saved file.  Usually the list view is then properly "
+"populated.\n"
+"</p>\n"
+msgstr ""
+
+#: tips.txt:60
+msgid ""
+"<p>Cut and Copy will also export the image to a PNG clipboard which can be "
+"pasted into KWord\n"
+"and other applications.</p>\n"
+msgstr ""
+
+#: tips.txt:66
+msgid ""
+"<p>Associations do not have to be in straight lines, double clicking on one "
+"will create a movable point.</p>\n"
+msgstr ""
+
+#: tips.txt:71
+msgid ""
+"<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
+msgstr ""
+
+#: tips.txt:76
+msgid ""
+"<p>Is a feature missing that you need in Umbrello? Please let us know. \n"
+"Either add it to the bugs database with Report Bug from the Help menu\n"
+"or send it to the uml-devel mailing list.</p>\n"
+"<ul>\n"
+"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
+".</li>\n"
+"</ul>\n"
+msgstr ""
+
+#: tips.txt:86
+msgid ""
+"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+msgstr ""
+
+#: tips.txt:91
+msgid ""
+"<p>If you've found a bug in Umbrello, please let us know. \n"
+"You can submit bugs with the Report Bug tool in the Help menu.</p>\n"
+msgstr ""
+
+#: tips.txt:97
+msgid ""
+"<p>Pressing the Escape key sets the current tool to the select tool.\n"
+"Backspace jumps to the previously used tool.</p>\n"
+msgstr ""
+
+#: tips.txt:103
+msgid ""
+"<p>You can select all objects by pressing Ctrl-A.</p>\n"
+msgstr ""
+
+#: tips.txt:108
+msgid ""
+"<p>You can create and setup a new class using the New Class Wizard in the Code "
+"menu.</p>\n"
+msgstr ""
+
+#: umllistview.cpp:348
+msgid "Externalize Folder"
+msgstr ""
+
+#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
+#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umllistview.cpp:384
+#: umlviewimageexportermodel.cpp:158
+#, c-format
+msgid "There was a problem saving file: %1"
+msgstr ""
+
+#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
+#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umldoc.cpp:641
+#: umllistview.cpp:385
+msgid "Save Error"
+msgstr "Gwall Cadw"
+
+#: umllistview.cpp:416
+#, fuzzy
+msgid "Enter Model Name"
+msgstr "Rhowch enw:"
+
+#: umllistview.cpp:417
+msgid "Enter the new name of the model:"
+msgstr ""
+
+#: umllistview.cpp:1007
+msgid "Views"
+msgstr "Golygon"
+
+#: umllistview.cpp:1906
+msgid ""
+"The name you entered was invalid.\n"
+"Creation process has been canceled."
+msgstr ""
+
+#: umllistview.cpp:1907 umllistviewitem.cpp:479
+msgid "Name Not Valid"
+msgstr ""
+
+#: umldoc.cpp:1067 umllistview.cpp:1916
+msgid ""
+"The name you entered was not unique.\n"
+"Is this what you wanted?"
+msgstr ""
+
+#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
+#: umllistview.cpp:1924 umllistview.cpp:2161
+msgid "Name Not Unique"
+msgstr ""
+
+#: umldoc.cpp:1068 umllistview.cpp:1917
+#, fuzzy
+msgid "Use Name"
+msgstr "Enw"
+
+#: umldoc.cpp:1068 umllistview.cpp:1917
+#, fuzzy
+msgid "Enter New Name"
+msgstr "Rhowch enw:"
+
+#: umllistview.cpp:1923 umllistview.cpp:2160
+msgid ""
+"The name you entered was not unique!\n"
+"Creation process has been canceled."
+msgstr ""
+
+#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
+msgid "Creation canceled"
+msgstr ""
+
+#: umllistview.cpp:2338
+#, fuzzy
+msgid "Loading listview..."
+msgstr "Yn cadw ffeil..."
+
+#: umllistview.cpp:2670
+msgid "The folder must be emptied before it can be deleted."
+msgstr ""
+
+#: umllistview.cpp:2671
+msgid "Folder Not Empty"
+msgstr ""
+
+#: codegenerator.cpp:473
+msgid ""
+"Cannot open file %1 for writing. Please make sure the folder exists and you "
+"have permissions to write to it."
+msgstr ""
+
+#: codegenerator.cpp:473
+msgid "Cannot Open File"
+msgstr "Methu Agor y Ffeil"
+
+#: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
+msgid ""
+"Cannot create the folder:\n"
+msgstr ""
+
+#: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
+msgid ""
+"\n"
+"Please check the access rights"
+msgstr ""
+
+#: codegenerator.cpp:533 codegenerators/simplecodegenerator.cpp:130
+msgid "Cannot Create Folder"
+msgstr ""
+
+#: umlview.cpp:297 umlview.cpp:357
+msgid "Diagram: %2 Page %1"
+msgstr ""
+
+#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
+msgid "Enter State Name"
+msgstr ""
+
+#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
+msgid "Enter the name of the new state:"
+msgstr ""
+
+#: toolbarstateother.cpp:148 umlview.cpp:2511
+msgid "new state"
+msgstr ""
+
+#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
+msgid "Enter Activity Name"
+msgstr ""
+
+#: activitywidget.cpp:163 dialogs/activitypage.cpp:134 statewidget.cpp:176
+#: toolbarstateother.cpp:144 umlview.cpp:2546
+msgid "Enter the name of the new activity:"
+msgstr ""
+
+#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
+#: umlview.cpp:2547
+msgid "new activity"
+msgstr ""
+
+#: umlview.cpp:2578
+#, fuzzy
+msgid "Enter Diagram Name"
+msgstr "Rhowch enw:"
+
+#: umlview.cpp:2579
+msgid "Enter the new name of the diagram:"
+msgstr ""
+
+#: umlview.cpp:2736
+msgid ""
+"You are about to delete the entire diagram.\n"
+"Are you sure?"
+msgstr ""
+
+#: umlview.cpp:2738
+msgid "Delete Diagram?"
+msgstr ""
+
+#: operation.cpp:185
+msgid "new_parameter"
+msgstr ""
+
+#: listpopupmenu.cpp:695 stereotype.cpp:76
+msgid "Stereotype"
+msgstr ""
+
+#: enumliteral.cpp:65 object_factory.cpp:153 stereotype.cpp:76 umldoc.cpp:976
+#: umldoc.cpp:1012 umldoc.cpp:1033 umldoc.cpp:1059
+msgid "Enter name:"
+msgstr "Rhowch enw:"
+
+#: codeimport/classimport.cpp:34
+msgid "Importing file: %1 Progress: %2/%3"
+msgstr ""
+
+#: codeimport/classimport.cpp:39 uml.cpp:376 uml.cpp:483 uml.cpp:660
+#: uml.cpp:688 uml.cpp:712 uml.cpp:722 uml.cpp:753 uml.cpp:758 uml.cpp:783
+#: uml.cpp:793 uml.cpp:814 uml.cpp:819 uml.cpp:832 uml.cpp:839 uml.cpp:853
+#: uml.cpp:874 uml.cpp:887 umlviewimageexporter.cpp:52
+#: umlviewimageexporterall.cpp:73
+msgid "Ready."
+msgstr "Parod."
+
+#: codeimport/import_utils.cpp:181
+msgid "Is the scope %1 a namespace or a class?"
+msgstr ""
+
+#: codeimport/import_utils.cpp:182
+msgid "C++ Import Requests Your Help"
+msgstr ""
+
+#: codeimport/import_utils.cpp:183
+#, fuzzy
+msgid "Namespace"
+msgstr "Enw"
+
+#. i18n: file dialogs/codegenerationwizardbase.ui line 249
+#: codeimport/import_utils.cpp:183 dialogs/diagramprintpage.cpp:91
+#: dialogs/diagramprintpage.cpp:198 dialogs/settingsdlg.cpp:210
+#: listpopupmenu.cpp:609 rc.cpp:360 worktoolbar.cpp:262
+#, no-c-format
+msgid "Class"
+msgstr "Dosbarth"
+
+#: codeimport/kdevcppparser/errors.cpp:23
+msgid "Internal Error"
+msgstr "Gwall Mewnol"
+
+#: codeimport/kdevcppparser/errors.cpp:24
+msgid "Syntax Error before '%1'"
+msgstr ""
+
+#: codeimport/kdevcppparser/errors.cpp:25
+msgid "Parse Error before '%1'"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:138
+msgid "<eof>"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:323
+#: codeimport/kdevcppparser/parser.cpp:2679
+#: codeimport/kdevcppparser/parser.cpp:2878
+#: codeimport/kdevcppparser/parser.cpp:2884
+msgid "expression expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:598
+msgid "Declaration syntax error"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:643
+#: codeimport/kdevcppparser/parser.cpp:2770
+#: codeimport/kdevcppparser/parser.cpp:3224
+msgid "} expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:684
+msgid "namespace expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:688
+msgid "{ expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:761
+#: codeimport/kdevcppparser/parser.cpp:2965
+msgid "Namespace name expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:869
+msgid "Need a type specifier to declare"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:938
+msgid "expected a declaration"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:1212
+#: codeimport/kdevcppparser/parser.cpp:2178
+msgid "Constant expression expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:1281
+#: codeimport/kdevcppparser/parser.cpp:1378
+msgid "')' expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:1451
+#: codeimport/kdevcppparser/parser.cpp:1914
+#: codeimport/kdevcppparser/parser.cpp:2392
+msgid "} missing"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:2074
+msgid "Member initializers expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:2235
+msgid "Base class specifier expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:2260
+msgid "Initializer clause expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:2303
+msgid "Identifier expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:2337
+msgid "Type id expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:2374
+msgid "Class name expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:2641
+#: codeimport/kdevcppparser/parser.cpp:2795
+#: codeimport/kdevcppparser/parser.cpp:2835
+#: codeimport/kdevcppparser/parser.cpp:3282
+msgid "condition expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:2648
+#: codeimport/kdevcppparser/parser.cpp:2670
+#: codeimport/kdevcppparser/parser.cpp:2802
+#: codeimport/kdevcppparser/parser.cpp:2813
+msgid "statement expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:2705
+msgid "for initialization expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:3273
+msgid "catch expected"
+msgstr ""
+
+#: uml.cpp:179
+msgid "&Export model to DocBook"
+msgstr ""
+
+#: uml.cpp:182
+msgid "&Export model to XHTML"
+msgstr ""
+
+#: uml.cpp:186
+msgid "&New Class Wizard..."
+msgstr ""
+
+#: uml.cpp:188
+msgid "&Add Default Datatypes for Active Language"
+msgstr ""
+
+#: uml.cpp:193
+msgid "&Code Generation Wizard..."
+msgstr ""
+
+#: uml.cpp:195
+msgid "&Generate All Code"
+msgstr ""
+
+#: uml.cpp:198
+#, fuzzy
+msgid "&Import Classes..."
+msgstr "Dosbarth ..."
+
+#: uml.cpp:201
+msgid "Creates a new document"
+msgstr "Creu dogfen newydd"
+
+#: uml.cpp:202
+msgid "Opens an existing document"
+msgstr "Agor dogfen gyfredol"
+
+#: uml.cpp:203
+msgid "Opens a recently used file"
+msgstr "Agor ffeil a ddefnyddiwyd yn ddiweddar"
+
+#: uml.cpp:204
+msgid "Saves the document"
+msgstr ""
+
+#: uml.cpp:205
+msgid "Saves the document as..."
+msgstr ""
+
+#: uml.cpp:206
+msgid "Closes the document"
+msgstr ""
+
+#: uml.cpp:207
+msgid "Prints out the document"
+msgstr ""
+
+#: uml.cpp:208
+msgid "Quits the application"
+msgstr "Terfynu'r cymhwysiad"
+
+#: uml.cpp:209
+msgid "Exports the model to the docbook format"
+msgstr ""
+
+#: uml.cpp:210
+msgid "Exports the model to the XHTML format"
+msgstr ""
+
+#: uml.cpp:211
+msgid "Cuts the selected section and puts it to the clipboard"
+msgstr "Torri'r adran dewisiedig a'i roi ar y gludfwrdd"
+
+#: uml.cpp:212
+msgid "Copies the selected section to the clipboard"
+msgstr "Copïo'r adran dewisiedig i'r gludfwrdd"
+
+#: uml.cpp:213
+msgid "Pastes the contents of the clipboard"
+msgstr ""
+
+#: uml.cpp:214
+msgid "Set the default program preferences"
+msgstr ""
+
+#: uml.cpp:216
+msgid "Delete &Selected"
+msgstr ""
+
+#: uml.cpp:224
+msgid "&Class Diagram..."
+msgstr ""
+
+#: uml.cpp:228
+msgid "&Autolayout..."
+msgstr ""
+
+#: uml.cpp:231
+msgid "&Sequence Diagram..."
+msgstr ""
+
+#: uml.cpp:234
+msgid "C&ollaboration Diagram..."
+msgstr ""
+
+#: uml.cpp:237
+msgid "&Use Case Diagram..."
+msgstr ""
+
+#: uml.cpp:240
+msgid "S&tate Diagram..."
+msgstr ""
+
+#: uml.cpp:243
+msgid "&Activity Diagram..."
+msgstr ""
+
+#: uml.cpp:246
+msgid "Co&mponent Diagram..."
+msgstr ""
+
+#: uml.cpp:250
+msgid "&Deployment Diagram..."
+msgstr ""
+
+#: uml.cpp:254
+msgid "&Entity Relationship Diagram..."
+msgstr ""
+
+#: uml.cpp:258
+msgid "&Clear Diagram"
+msgstr ""
+
+#: uml.cpp:260
+msgid "&Snap to Grid"
+msgstr "&Snapio i'r Grid"
+
+#: uml.cpp:262
+msgid "S&how Grid"
+msgstr "D&angos Grid"
+
+#: uml.cpp:265
+msgid "&Hide Grid"
+msgstr "&Cuddio Grid"
+
+#: uml.cpp:269
+msgid "&Export as Picture..."
+msgstr ""
+
+#: uml.cpp:271
+msgid "Export &All Diagrams as Pictures..."
+msgstr ""
+
+#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
+#: uml.cpp:273
+msgid "&Properties"
+msgstr "&Priodweddau"
+
+#: uml.cpp:286
+msgid "&Zoom Slider"
+msgstr ""
+
+#: uml.cpp:289
+#, c-format
+msgid "Z&oom to 100%"
+msgstr "C&hwyddo i 100%"
+
+#: uml.cpp:295
+msgid "&Move Tab Left"
+msgstr "&Symud Tab i'r Chwith"
+
+#: uml.cpp:296
+msgid "&Move Tab Right"
+msgstr "&Symud Tab i'r Dde"
+
+#: uml.cpp:308
+msgid "Select Diagram on Left"
+msgstr ""
+
+#: uml.cpp:309
+msgid "Select Diagram on Right"
+msgstr ""
+
+#: uml.cpp:327
+msgid "&Windows"
+msgstr "&Ffenestri"
+
+#: uml.cpp:347
+#, c-format
+msgid " &33%"
+msgstr ""
+
+#: uml.cpp:348
+#, c-format
+msgid " &50%"
+msgstr ""
+
+#: uml.cpp:349
+#, c-format
+msgid " &75%"
+msgstr ""
+
+#: uml.cpp:350
+#, c-format
+msgid "&100%"
+msgstr "&100%"
+
+#: uml.cpp:351
+#, c-format
+msgid "1&50%"
+msgstr ""
+
+#: uml.cpp:352
+#, c-format
+msgid "&200%"
+msgstr "200%"
+
+#: uml.cpp:353
+#, c-format
+msgid "3&00%"
+msgstr "3&00%"
+
+#: uml.cpp:394
+msgid "Diagram Toolbar"
+msgstr ""
+
+#: uml.cpp:398
+msgid "Alignment Toolbar"
+msgstr ""
+
+#: listpopupmenu.cpp:615 uml.cpp:420
+msgid "Class Diagram..."
+msgstr ""
+
+#: listpopupmenu.cpp:618 uml.cpp:421
+msgid "Sequence Diagram..."
+msgstr ""
+
+#: listpopupmenu.cpp:619 uml.cpp:422
+msgid "Collaboration Diagram..."
+msgstr ""
+
+#: listpopupmenu.cpp:551 uml.cpp:423
+msgid "Use Case Diagram..."
+msgstr ""
+
+#: listpopupmenu.cpp:616 uml.cpp:424
+msgid "State Diagram..."
+msgstr ""
+
+#: listpopupmenu.cpp:617 uml.cpp:425
+msgid "Activity Diagram..."
+msgstr ""
+
+#: listpopupmenu.cpp:521 uml.cpp:426
+msgid "Component Diagram..."
+msgstr ""
+
+#: listpopupmenu.cpp:528 uml.cpp:427
+msgid "Deployment Diagram..."
+msgstr ""
+
+#: listpopupmenu.cpp:541 uml.cpp:428
+msgid "Entity Relationship Diagram..."
+msgstr ""
+
+#: uml.cpp:458
+msgid "&Tree View"
+msgstr "Golwg &Coeden"
+
+#: uml.cpp:467
+msgid "&Documentation"
+msgstr "&Dogfenniaeth"
+
+#: uml.cpp:479 uml.cpp:664 uml.cpp:692
+msgid "Opening file..."
+msgstr "Agor ffeil..."
+
+#: uml.cpp:650
+msgid "Creating new document..."
+msgstr "Yn creu dogfen newydd..."
+
+#: uml.cpp:673
+msgid ""
+"*.xmi *.xmi.tgz *.xmi.tar.bz2 *.mdl|All Supported Files (*.xmi, *.xmi.tgz, "
+"*.xmi.tar.bz2, *.mdl)\n"
+"*.xmi|Uncompressed XMI Files (*.xmi)\n"
+"*.xmi.tgz|Gzip Compressed XMI Files (*.xmi.tgz)\n"
+"*.xmi.tar.bz2|Bzip2 Compressed XMI Files (*.xmi.tar.bz2)\n"
+"*.mdl|Rose model files"
+msgstr ""
+
+#: uml.cpp:677
+msgid "Open File"
+msgstr "Agor Ffeil"
+
+#: uml.cpp:716
+msgid "Saving file..."
+msgstr "Yn cadw ffeil..."
+
+#: uml.cpp:727
+msgid "Saving file with a new filename..."
+msgstr ""
+
+#: uml.cpp:732
+msgid ""
+"*.xmi|XMI File\n"
+"*.xmi.tgz|Gzip Compressed XMI File\n"
+"*.xmi.tar.bz2|Bzip2 Compressed XMI File\n"
+"*|All Files"
+msgstr ""
+
+#: uml.cpp:740
+msgid ""
+"The file %1 exists.\n"
+"Do you wish to overwrite it?"
+msgstr ""
+
+#: uml.cpp:740
+msgid "Overwrite"
+msgstr "Trosysgrifo"
+
+#: uml.cpp:764
+msgid "Closing file..."
+msgstr "Yn cau ffeil..."
+
+#: uml.cpp:772
+msgid "Printing..."
+msgstr "Argraffu..."
+
+#: uml.cpp:779
+#, c-format
+msgid "Print %1"
+msgstr "Argraffu %1"
+
+#: uml.cpp:787
+msgid "Exiting..."
+msgstr "Terfynu..."
+
+#: uml.cpp:823
+msgid "Cutting selection..."
+msgstr "Yn torri'r dewisiad..."
+
+#: uml.cpp:836
+msgid "Copying selection to clipboard..."
+msgstr "Yn copïo'r dewisiad i'r clipfwrdd..."
+
+#: uml.cpp:844
+msgid "Inserting clipboard contents..."
+msgstr "Yn mewnosod cynnwys y clipfwrdd..."
+
+#: uml.cpp:849
+msgid ""
+"Umbrello could not paste the clipboard contents.  The objects in the clipboard "
+"may be of the wrong type to be pasted here."
+msgstr ""
+
+#: clipboard/umlclipboard.cpp:691 uml.cpp:851
+msgid "Paste Error"
+msgstr ""
+
+#: uml.cpp:863
+msgid "Toggling toolbar..."
+msgstr "Dangos/cuddio'r bar offer..."
+
+#: uml.cpp:878
+msgid "Toggle the statusbar..."
+msgstr "Dangos/cuddio'r bar cyflwr..."
+
+#: uml.cpp:1186
+msgid "Cannot view code until you generate some first."
+msgstr ""
+
+#: uml.cpp:1186 uml.cpp:1189
+msgid "Cannot View Code"
+msgstr ""
+
+#: uml.cpp:1189
+msgid "Cannot view code from simple code writer."
+msgstr ""
+
+#: uml.cpp:1387
+msgid "*.idl|IDL Files (*.idl)"
+msgstr ""
+
+#: uml.cpp:1389
+msgid "*.py|Python Files (*.py)"
+msgstr ""
+
+#: uml.cpp:1391
+msgid "*.java|Java Files (*.java)"
+msgstr ""
+
+#: uml.cpp:1393
+msgid "*.pas|Pascal Files (*.pas)"
+msgstr ""
+
+#: uml.cpp:1395
+msgid "*.ads *.ada|Ada Files (*.ads *.ada)"
+msgstr ""
+
+#: uml.cpp:1397
+msgid "*.h *.hh *.hpp *.hxx *.H|Header Files (*.h *.hh *.hpp *.hxx *.H)"
+msgstr ""
+
+#: uml.cpp:1399
+msgid "All Files"
+msgstr "Pob Ffeil"
+
+#: uml.cpp:1401
+msgid "Select Code to Import"
+msgstr ""
+
+#: enumliteral.cpp:65 floatingtextwidget.cpp:111 object_factory.cpp:153
+#: umldoc.cpp:976 umldoc.cpp:1012 umldoc.cpp:1033 umldoc.cpp:1059
+msgid "Name"
+msgstr "Enw"
+
+#: classifier.cpp:294 classifier.cpp:522 entity.cpp:78 enum.cpp:76
+#: object_factory.cpp:158 umldoc.cpp:1037 umldoc.cpp:1063
+msgid "That is an invalid name."
+msgstr ""
+
+#: classifier.cpp:294 classifier.cpp:522 dialogs/umlviewdialog.cpp:165
+#: entity.cpp:78 enum.cpp:76 object_factory.cpp:159 umldoc.cpp:984
+#: umldoc.cpp:1017 umldoc.cpp:1037 umldoc.cpp:1063
+msgid "Invalid Name"
+msgstr ""
+
+#: object_factory.cpp:164
+msgid ""
+"This is a reserved keyword for the language of the configured code generator."
+msgstr ""
+
+#: object_factory.cpp:165
+msgid "Reserved Keyword"
+msgstr ""
+
+#: classifier.cpp:296 classifier.cpp:524 entity.cpp:80 object_factory.cpp:169
+#: umldoc.cpp:1043 umldoc.cpp:1073
+msgid "That name is already being used."
+msgstr ""
+
+#: classifier.cpp:296 classifier.cpp:524 entity.cpp:80 object_factory.cpp:170
+#: umldoc.cpp:998 umldoc.cpp:1025 umldoc.cpp:1043 umldoc.cpp:1073
+msgid "Not a Unique Name"
+msgstr ""
+
 #: worktoolbar.cpp:245
 msgid "Object"
 msgstr "Gwrthrych"
@@ -78,14 +1038,6 @@ msgstr ""
 msgid "Use Case"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 249
-#: codeimport/import_utils.cpp:183 dialogs/diagramprintpage.cpp:91
-#: dialogs/diagramprintpage.cpp:198 dialogs/settingsdlg.cpp:210
-#: listpopupmenu.cpp:609 rc.cpp:360 worktoolbar.cpp:262
-#, no-c-format
-msgid "Class"
-msgstr "Dosbarth"
-
 #: listpopupmenu.cpp:1030 worktoolbar.cpp:263
 msgid "Initial State"
 msgstr ""
@@ -199,279 +1151,280 @@ msgstr "ANIFFINIEDIG"
 msgid "Select"
 msgstr "Dewis"
 
-#: umlwidgetcontroller.cpp:128
-msgid ""
-"Hold shift or ctrl to move in X axis. Hold shift and control to move in Y axis. "
-"Right button click to cancel move."
+#: model_utils.cpp:266 umlcanvasobject.cpp:147
+msgid "new_association"
 msgstr ""
 
-#: umlwidgetcontroller.cpp:379
-msgid ""
-"Hold shift or ctrl to move in X axis. Hold shift and control to move in Y axis. "
-"Right button click to cancel resize."
+#: umlcanvasobject.cpp:150
+msgid "new_attribute"
 msgstr ""
 
-#: dialogs/activitydialog.cpp:70
-msgid "Initial activity"
+#: umlcanvasobject.cpp:153
+msgid "new_template"
 msgstr ""
 
-#: dialogs/activitydialog.cpp:70
-msgid "End activity"
+#: umlcanvasobject.cpp:156
+msgid "new_operation"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 118
-#: dialogs/activitydialog.cpp:73 dialogs/assocpropdlg.cpp:87
-#: dialogs/classpropdlg.cpp:69 dialogs/classpropdlg.cpp:170
-#: dialogs/classpropdlg.cpp:232 dialogs/settingsdlg.cpp:99
-#: dialogs/statedialog.cpp:88 dialogs/umlviewdialog.cpp:70 rc.cpp:45
-#: rc.cpp:225
-#, no-c-format
-msgid "General"
-msgstr "Cyffredinol"
-
-#: dialogs/activitydialog.cpp:73 dialogs/statedialog.cpp:88
-#: dialogs/umlattributedialog.cpp:55 dialogs/umlentityattributedialog.cpp:56
-#: dialogs/umloperationdialog.cpp:64 dialogs/umltemplatedialog.cpp:48
-msgid "General Properties"
-msgstr "Priodweddau Cyffredinol"
+#: umlcanvasobject.cpp:159
+msgid "new_literal"
+msgstr ""
 
-#: dialogs/activitydialog.cpp:82
-msgid "Activity type:"
+#: umlcanvasobject.cpp:162
+msgid "new_field"
 msgstr ""
 
-#: dialogs/activitydialog.cpp:87
-msgid "Activity name:"
+#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
+#, fuzzy
+msgid "Exporting all views..."
+msgstr "Yn cadw ffeil..."
+
+#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
+#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
+msgid "Some errors happened when exporting the images:"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 36
-#: dialogs/activitydialog.cpp:90 dialogs/assocgenpage.cpp:56
-#: dialogs/assocrolepage.cpp:76 dialogs/assocrolepage.cpp:77
-#: dialogs/classgenpage.cpp:193 dialogs/classgenpage.cpp:293
-#: dialogs/classgenpage.cpp:356 dialogs/classifierlistpage.cpp:106
-#: dialogs/notedialog.cpp:29 dialogs/parmpropdlg.cpp:100
-#: dialogs/statedialog.cpp:104 docwindow.cpp:33 rc.cpp:30 rc.cpp:150
-#: rc.cpp:207 rc.cpp:445 rc.cpp:492
-#, no-c-format
-msgid "Documentation"
-msgstr "Dogfenniaeth"
+#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
+msgid "Umbrello UML Modeller autonomous code generator"
+msgstr ""
 
-#: dialogs/activitydialog.cpp:108 dialogs/assocpropdlg.cpp:109
-#: dialogs/classpropdlg.cpp:243 dialogs/settingsdlg.cpp:306
-#: dialogs/statedialog.cpp:124 dialogs/umlviewdialog.cpp:107
-msgid "Font Settings"
-msgstr "Gosodiadau Ffont"
+#: docgenerators/main.cpp:47
+#, fuzzy
+msgid "File to transform"
+msgstr "Ffeil i agor"
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125 dialogs/settingsdlg.cpp:49
-#: dialogs/statedialog.cpp:130 dialogs/umlviewdialog.cpp:100
-#: dialogs/umlwidgetcolorpage.cpp:53 listpopupmenu.cpp:739
-#: listpopupmenu.cpp:750
-msgid "Color"
-msgstr "Lliw"
+#: docgenerators/main.cpp:48
+msgid "The XSLT file to use"
+msgstr ""
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125
-msgid "Widget Colors"
+#: docgenerators/main.cpp:64
+msgid ""
+"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
+"Authors"
 msgstr ""
 
-#: dialogs/overwritedialogue.cpp:27
-msgid "Destination File Already Exists"
+#: docgenerators/main.cpp:67 main.cpp:98
+msgid "Umbrello UML Modeller Authors"
 msgstr ""
 
-#: dialogs/overwritedialogue.cpp:31
+#: umlviewimageexporter.cpp:46
+#, fuzzy
+msgid "Exporting view..."
+msgstr "Terfynu..."
+
+#: umlviewimageexporter.cpp:50
 msgid ""
-"The file %1 already exists in %2.\n"
-"\n"
-"Umbrello can overwrite the file, generate a similar\n"
-"file name or not generate this file."
+"An error happened when exporting the image:\n"
 msgstr ""
 
-#: dialogs/overwritedialogue.cpp:34
-msgid "&Apply to all remaining files"
+#: umlviewimageexporter.cpp:66
+msgid ""
+"The selected file %1 exists.\n"
+"Do you want to overwrite it?"
 msgstr ""
 
+#: umlviewimageexporter.cpp:67
+msgid "File Already Exists"
+msgstr "Ffeil yn Bodoli'n Barod"
+
 #: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
 msgid "&Overwrite"
 msgstr "&Trosysgrifo"
 
-#: dialogs/overwritedialogue.cpp:39
-msgid "&Generate Similar File Name"
+#: clipboard/umlclipboard.cpp:687
+msgid ""
+"At least one of the items in the clipboard could not be pasted because an item "
+"of the same name already exists.  Any other items have been pasted."
 msgstr ""
 
-#: dialogs/overwritedialogue.cpp:40
-msgid "&Do Not Generate File"
+#: umldoc.cpp:82 umldoc.cpp:1518
+msgid "UML Model"
 msgstr ""
 
-#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
-msgid "Activities"
+#: umldoc.cpp:106
+msgid "Logical View"
 msgstr ""
 
-#: dialogs/activitypage.cpp:72
-msgid "New Activity..."
+#: umldoc.cpp:107
+msgid "Use Case View"
 msgstr ""
 
-#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
-msgid "Rename"
-msgstr "Ail-enwi"
+#: umldoc.cpp:108
+msgid "Component View"
+msgstr ""
 
-#: dialogs/activitypage.cpp:134
-msgid "New Activity"
+#: umldoc.cpp:109
+msgid "Deployment View"
 msgstr ""
 
-#: activitywidget.cpp:163 dialogs/activitypage.cpp:134 statewidget.cpp:176
-#: toolbarstateother.cpp:144 umlview.cpp:2546
-msgid "Enter the name of the new activity:"
+#: umldoc.cpp:110
+msgid "Entity Relationship Model"
 msgstr ""
 
-#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
-#: umlview.cpp:2547
-msgid "new activity"
+#: umldoc.cpp:117 umldoc.cpp:293
+msgid "Datatypes"
 msgstr ""
 
-#: dialogs/activitypage.cpp:153
-msgid "Rename Activity"
+#: umldoc.cpp:229
+msgid ""
+"The current file has been modified.\n"
+"Do you want to save it?"
 msgstr ""
+"Addaswyd y ffeil gyfredol.\n"
+"Hoffech ei chadw?"
 
-#: dialogs/activitypage.cpp:153
-msgid "Enter the new name of the activity:"
+#: umldoc.cpp:355
+msgid "The file %1 does not exist."
+msgstr "Nid yw'r ffeil %1 yn bodoli!."
+
+#: folder.cpp:289 folder.cpp:293 umldoc.cpp:355 umldoc.cpp:380 umldoc.cpp:422
+#: umldoc.cpp:434 umldoc.cpp:448 umldoc.cpp:461 umldoc.cpp:472 umldoc.cpp:488
+msgid "Load Error"
+msgstr "Gwall Llwytho"
+
+#: umldoc.cpp:380
+msgid "The file %1 seems to be corrupted."
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
-#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
-#, no-c-format
-msgid "Code Generation Options"
+#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
+#, c-format
+msgid "There was no XMI file found in the compressed file %1."
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:70
-msgid "&Generate"
-msgstr "&Creu"
+#: umldoc.cpp:448
+#, c-format
+msgid "There was a problem loading the extracted file: %1"
+msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:120
-msgid "Finish"
-msgstr "Gorffen"
+#: umldoc.cpp:472 umldoc.cpp:488
+#, c-format
+msgid "There was a problem loading file: %1"
+msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:132
-msgid "Code Generated"
+#: umldoc.cpp:641
+#, c-format
+msgid "There was a problem uploading file: %1"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:134
-msgid "Not Generated"
+#: umldoc.cpp:934
+msgid "use case diagram"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:141
-msgid "Not Yet Generated"
+#: umldoc.cpp:936
+msgid "class diagram"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:162
-msgid "The folder %1 does not exist. Do you want to create it now?"
+#: umldoc.cpp:938
+msgid "sequence diagram"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
-msgid "Output Folder Does Not Exist"
+#: umldoc.cpp:940
+msgid "collaboration diagram"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Create Folder"
-msgstr "Creu Plygell"
+#: umldoc.cpp:942
+msgid "state diagram"
+msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Do Not Create"
+#: umldoc.cpp:944
+msgid "activity diagram"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:168
-msgid ""
-"The folder could not be created.\n"
-"Please make sure you have write access to its parent folder or select another, "
-"valid, folder."
+#: umldoc.cpp:946
+msgid "component diagram"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:169
-msgid "Error Creating Folder"
+#: umldoc.cpp:948
+msgid "deployment diagram"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:176
-msgid "Please select a valid folder."
+#: umldoc.cpp:950
+msgid "entity relationship diagram"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:184
-msgid ""
-"The output folder exists, but it is not writable.\n"
-"Please set the appropriate permissions or choose another folder."
+#: umldoc.cpp:984 umldoc.cpp:1017
+msgid "That is an invalid name for a diagram."
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:185
-msgid "Error Writing to Output Folder"
+#: umldoc.cpp:998 umldoc.cpp:1025
+msgid "A diagram is already using that name."
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:191
-msgid "%1 does not seem to be a folder. Please choose a valid folder."
+#: umldoc.cpp:1099
+msgid "Are you sure you want to delete diagram %1?"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:192
-msgid "Please Choose Valid Folder"
+#: umldoc.cpp:1099
+msgid "Delete Diagram"
 msgstr ""
 
-#: dialogs/statedialog.cpp:85
-msgid "Initial state"
+#: umldoc.cpp:1573
+msgid "Setting up the document..."
 msgstr ""
 
-#: dialogs/statedialog.cpp:85
-msgid "End state"
+#: umldoc.cpp:1600
+msgid "Resolving object references..."
 msgstr ""
 
-#: dialogs/statedialog.cpp:96
-msgid "State type:"
+#: umldoc.cpp:1638
+msgid "Loading UML elements..."
 msgstr ""
 
-#: dialogs/statedialog.cpp:101
-msgid "State name:"
+#: umldoc.cpp:1811
+msgid "Loading diagrams..."
 msgstr ""
 
-#: dialogs/statedialog.cpp:130
-msgid "Widget Color"
-msgstr "Lliw Celfigyn"
+#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
+msgid "kde-uml-Diagram"
+msgstr ""
 
-#: dialogs/assocpropdlg.cpp:87 dialogs/classpropdlg.cpp:69
-#: dialogs/classpropdlg.cpp:170 dialogs/classpropdlg.cpp:232
-#: dialogs/settingsdlg.cpp:99 dialogs/umlviewdialog.cpp:70
-msgid "General Settings"
-msgstr "Gosodiadau Cyffredinol"
+#: umldoc.cpp:2104
+#, c-format
+msgid "/autosave%1"
+msgstr ""
 
-#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
-msgid "Display"
-msgstr "Dangos"
+#: classifier.cpp:201
+msgid ""
+"An operation with the same name and signature already exists. You can not add "
+"it again."
+msgstr ""
 
-#: dialogs/umlviewdialog.cpp:93
-msgid "Classes Display Options"
+#: refactoring/refactoringassistant.cpp:289
+msgid "Add Base Class"
 msgstr ""
 
-#: dialogs/umlviewdialog.cpp:100
-msgid "Diagram Colors"
+#: refactoring/refactoringassistant.cpp:290
+msgid "Add Derived Class"
 msgstr ""
 
-#: dialogs/umlviewdialog.cpp:164
-msgid "The name you have entered is invalid."
+#: refactoring/refactoringassistant.cpp:292
+#: refactoring/refactoringassistant.cpp:299
+#: refactoring/refactoringassistant.cpp:313
+msgid "Add Operation"
 msgstr ""
 
-#: classifier.cpp:294 classifier.cpp:522 dialogs/umlviewdialog.cpp:165
-#: entity.cpp:78 enum.cpp:76 object_factory.cpp:159 umldoc.cpp:984
-#: umldoc.cpp:1017 umldoc.cpp:1037 umldoc.cpp:1063
-msgid "Invalid Name"
+#: refactoring/refactoringassistant.cpp:293
+#: refactoring/refactoringassistant.cpp:317
+msgid "Add Attribute"
 msgstr ""
 
-#: dialogs/umlviewdialog.cpp:170
-msgid "The name you have entered is not unique."
+#: refactoring/refactoringassistant.cpp:297
+msgid "Add Base Interface"
 msgstr ""
 
-#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1918
-#: umllistview.cpp:1925 umllistview.cpp:2162
-msgid "Name Not Unique"
+#: refactoring/refactoringassistant.cpp:298
+msgid "Add Derived Interface"
 msgstr ""
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 21
-#: dialogs/codeviewerdialog.cpp:119 dialogs/settingsdlg.cpp:301 rc.cpp:366
-#, no-c-format
-msgid "Code Viewer"
+#: refactoring/refactoringassistant.cpp:355
+#: refactoring/refactoringassistant.cpp:511
+msgid "Base Classifiers"
+msgstr ""
+
+#: refactoring/refactoringassistant.cpp:397
+#: refactoring/refactoringassistant.cpp:530
+msgid "Derived Classifiers"
 msgstr ""
 
 #: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
@@ -479,96 +1432,91 @@ msgstr ""
 msgid "Attributes"
 msgstr "Priodweddion"
 
-#: dialogs/classifierlistpage.cpp:39
-msgid "N&ew Attribute..."
-msgstr ""
-
 #: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
 #: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
 msgid "Operations"
 msgstr "Gweithrediadau"
 
-#: dialogs/classifierlistpage.cpp:42
-msgid "N&ew Operation..."
+#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
+msgid ""
+"An operation with that signature already exists in %1.\n"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
-msgid "Templates"
-msgstr "Patrymluniau"
-
-#: dialogs/classifierlistpage.cpp:45
-msgid "N&ew Template..."
+#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
+msgid "Choose a different name or parameter list."
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
-msgid "Enum Literals"
+#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
+#: refactoring/refactoringassistant.cpp:656
+msgid "Operation Name Invalid"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:48
-msgid "N&ew Enum Literal..."
+#: folder.cpp:289
+msgid "The folderfile %1 does not exist."
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
-#, fuzzy
-msgid "Entity Attributes"
-msgstr "Priodweddion"
-
-#: dialogs/classifierlistpage.cpp:51
-#, fuzzy
-msgid "N&ew Entity Attribute..."
-msgstr "Priodoleddau ..."
-
-#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
-#: uml.cpp:273
-msgid "&Properties"
-msgstr "&Priodweddau"
-
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 36
-#: dialogs/umlroledialog.cpp:25 rc.cpp:483
-#, no-c-format
-msgid "Role Properties"
+#: folder.cpp:293
+msgid "The folderfile %1 cannot be opened."
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:118
-msgid "Display Options"
-msgstr "Dewisiadau masg"
-
-#: dialogs/classpropdlg.cpp:179
-msgid "Attribute Settings"
+#: dialogs/assocpropdlg.cpp:39
+msgid "Association Properties"
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:187
-msgid "Operation Settings"
-msgstr ""
+#. i18n: file codegenerators/cppcodegenerationformbase.ui line 118
+#: dialogs/activitydialog.cpp:73 dialogs/assocpropdlg.cpp:87
+#: dialogs/classpropdlg.cpp:69 dialogs/classpropdlg.cpp:170
+#: dialogs/classpropdlg.cpp:232 dialogs/settingsdlg.cpp:99
+#: dialogs/statedialog.cpp:88 dialogs/umlviewdialog.cpp:70 rc.cpp:45
+#: rc.cpp:225
+#, no-c-format
+msgid "General"
+msgstr "Cyffredinol"
 
-#: dialogs/classpropdlg.cpp:195
-msgid "Templates Settings"
-msgstr ""
+#: dialogs/assocpropdlg.cpp:87 dialogs/classpropdlg.cpp:69
+#: dialogs/classpropdlg.cpp:170 dialogs/classpropdlg.cpp:232
+#: dialogs/settingsdlg.cpp:99 dialogs/umlviewdialog.cpp:70
+msgid "General Settings"
+msgstr "Gosodiadau Cyffredinol"
 
-#: dialogs/classpropdlg.cpp:202
-msgid "Enum Literals Settings"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Roles"
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes Settings"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Role Settings"
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:216
-msgid "Contents Settings"
+#: dialogs/activitydialog.cpp:108 dialogs/assocpropdlg.cpp:109
+#: dialogs/classpropdlg.cpp:243 dialogs/settingsdlg.cpp:306
+#: dialogs/statedialog.cpp:124 dialogs/umlviewdialog.cpp:107
+msgid "Font Settings"
+msgstr "Gosodiadau Ffont"
+
+#: dialogs/assocpropdlg.cpp:112
+msgid "Association font"
 msgstr ""
 
-#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
-msgid "Associations"
+#: dialogs/defaultcodegenpolicypage.cpp:36
+msgid "<p align=\"center\">No Options Available.</p>"
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:222
-msgid "Class Associations"
+#. i18n: file dialogs/codeviewerdialogbase.ui line 21
+#: dialogs/codeviewerdialog.cpp:119 dialogs/settingsdlg.cpp:301 rc.cpp:366
+#, no-c-format
+msgid "Code Viewer"
 msgstr ""
 
 #: dialogs/umloperationdialog.cpp:50
 msgid "Operation Properties"
 msgstr ""
 
+#: dialogs/activitydialog.cpp:73 dialogs/statedialog.cpp:88
+#: dialogs/umlattributedialog.cpp:55 dialogs/umlentityattributedialog.cpp:56
+#: dialogs/umloperationdialog.cpp:64 dialogs/umltemplatedialog.cpp:48
+msgid "General Properties"
+msgstr "Priodweddau Cyffredinol"
+
 #: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
 #: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
 #: dialogs/umltemplatedialog.cpp:61
@@ -658,35 +1606,15 @@ msgstr ""
 msgid "You have entered an invalid operation name."
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
-#: refactoring/refactoringassistant.cpp:656
-msgid "Operation Name Invalid"
-msgstr ""
-
-#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
-msgid ""
-"An operation with that signature already exists in %1.\n"
-msgstr ""
-
-#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
-msgid "Choose a different name or parameter list."
-msgstr ""
-
-#: dialogs/classwizard.cpp:33 model_utils.cpp:242
-msgid "new_class"
-msgstr ""
-
-#: dialogs/classwizard.cpp:54
-msgid "New Class"
-msgstr ""
-
-#: dialogs/classwizard.cpp:59
-msgid "Class Attributes"
-msgstr ""
+#. i18n: file dialogs/diagrampropertiespage.ui line 61
+#: dialogs/assocgenpage.cpp:67 rc.cpp:408
+#, no-c-format
+msgid "Name:"
+msgstr "Enw:"
 
-#: dialogs/classwizard.cpp:63
-msgid "Class Operations"
-msgstr ""
+#: dialogs/assocgenpage.cpp:80
+msgid "Type:"
+msgstr "Math:"
 
 #: dialogs/parmpropdlg.cpp:35
 msgid "Parameter Properties"
@@ -706,31 +1634,6 @@ msgid ""
 "is a parameter for reading and writing."
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:42
-msgid "Attribute Properties"
-msgstr ""
-
-#: dialogs/umlattributedialog.cpp:91
-msgid "&Public"
-msgstr "&Cyhoeddus"
-
-#: dialogs/umlattributedialog.cpp:155
-msgid "You have entered an invalid attribute name."
-msgstr ""
-
-#: dialogs/umlattributedialog.cpp:156
-msgid "Attribute Name Invalid"
-msgstr ""
-
-#: dialogs/umlattributedialog.cpp:163
-msgid ""
-"The attribute name you have chosen is already being used in this operation."
-msgstr ""
-
-#: dialogs/umlattributedialog.cpp:164
-msgid "Attribute Name Not Unique"
-msgstr ""
-
 #: dialogs/classgenpage.cpp:50
 msgid "Class &name:"
 msgstr ""
@@ -858,284 +1761,6 @@ msgstr ""
 msgid "Name is Not Unique"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:43
-msgid "Entity Attribute Properties"
-msgstr ""
-
-#: dialogs/umlentityattributedialog.cpp:73
-msgid "&Default value:"
-msgstr "&Gwerth ragosod :"
-
-#: dialogs/umlentityattributedialog.cpp:81
-msgid "Length/Values:"
-msgstr ""
-
-#: dialogs/umlentityattributedialog.cpp:84
-msgid "&Auto increment"
-msgstr ""
-
-#: dialogs/umlentityattributedialog.cpp:88
-msgid "Allow &null"
-msgstr ""
-
-#: dialogs/umlentityattributedialog.cpp:92
-msgid "Attributes:"
-msgstr "Priodweddion :"
-
-#: dialogs/umlentityattributedialog.cpp:108
-msgid "Indexing"
-msgstr ""
-
-#: dialogs/umlentityattributedialog.cpp:112
-msgid "&None"
-msgstr "&Dim"
-
-#: dialogs/umlentityattributedialog.cpp:115
-msgid "&Primary"
-msgstr "&Cynradd"
-
-#: dialogs/umlentityattributedialog.cpp:118
-msgid "&Index"
-msgstr "Mynega&i"
-
-#: dialogs/umlentityattributedialog.cpp:121
-msgid "&Unique"
-msgstr "&Unigryw"
-
-#: dialogs/umlentityattributedialog.cpp:184
-msgid "You have entered an invalid entity attribute name."
-msgstr ""
-
-#: dialogs/umlentityattributedialog.cpp:185
-msgid "Entity Attribute Name Invalid"
-msgstr ""
-
-#: dialogs/umlentityattributedialog.cpp:192
-msgid ""
-"The entity attribute name you have chosen is already being used in this "
-"operation."
-msgstr ""
-
-#: dialogs/umlentityattributedialog.cpp:193
-msgid "Entity Attribute Name Not Unique"
-msgstr ""
-
-#: dialogs/diagramprintpage.cpp:35
-msgid "&Diagrams"
-msgstr ""
-
-#: dialogs/diagramprintpage.cpp:40
-msgid "Filter"
-msgstr "Hidlo"
-
-#: dialogs/diagramprintpage.cpp:48
-msgid "&Current diagram"
-msgstr ""
-
-#: dialogs/diagramprintpage.cpp:53
-msgid "&All diagrams"
-msgstr ""
-
-#: dialogs/diagramprintpage.cpp:57
-msgid "&Select diagrams"
-msgstr ""
-
-#: dialogs/diagramprintpage.cpp:61
-msgid "&Type of diagram"
-msgstr ""
-
-#: dialogs/diagramprintpage.cpp:65
-msgid "Selection"
-msgstr "Dewisiad"
-
-#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
-msgid "Collaboration"
-msgstr ""
-
-#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
-msgid "Sequence"
-msgstr ""
-
-#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
-msgid "Deployment"
-msgstr ""
-
-#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
-msgid "kde-uml-Diagram"
-msgstr ""
-
-#: dialogs/diagramprintpage.cpp:135
-msgid "No diagrams selected."
-msgstr ""
-
-#: dialogs/assocrolepage.cpp:50
-msgid "Role A Properties"
-msgstr ""
-
-#: dialogs/assocrolepage.cpp:51
-msgid "Role B Properties"
-msgstr ""
-
-#: dialogs/assocrolepage.cpp:68
-msgid "Role A Visibility"
-msgstr ""
-
-#: dialogs/assocrolepage.cpp:69
-msgid "Role B Visibility"
-msgstr ""
-
-#: dialogs/assocrolepage.cpp:70
-msgid "Role A Changeability"
-msgstr ""
-
-#: dialogs/assocrolepage.cpp:71
-msgid "Role B Changeability"
-msgstr ""
-
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 59
-#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152 rc.cpp:486
-#, no-c-format
-msgid "Rolename:"
-msgstr ""
-
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 77
-#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158 rc.cpp:489
-#, no-c-format
-msgid "Multiplicity:"
-msgstr ""
-
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 129
-#: dialogs/assocrolepage.cpp:106 dialogs/assocrolepage.cpp:166
-#: dialogs/settingsdlg.cpp:259 dialogs/settingsdlg.cpp:267 rc.cpp:120
-#: rc.cpp:138 rc.cpp:177 rc.cpp:195 rc.cpp:510
-#, no-c-format
-msgid "Public"
-msgstr "Cyhoeddus"
-
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 134
-#: dialogs/assocrolepage.cpp:109 dialogs/assocrolepage.cpp:169
-#: dialogs/settingsdlg.cpp:260 dialogs/settingsdlg.cpp:268 rc.cpp:123
-#: rc.cpp:141 rc.cpp:180 rc.cpp:198 rc.cpp:513
-#, no-c-format
-msgid "Private"
-msgstr "Preivat"
-
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 139
-#: dialogs/assocrolepage.cpp:112 dialogs/assocrolepage.cpp:172
-#: dialogs/settingsdlg.cpp:261 dialogs/settingsdlg.cpp:269 rc.cpp:126
-#: rc.cpp:144 rc.cpp:183 rc.cpp:201 rc.cpp:516
-#, no-c-format
-msgid "Protected"
-msgstr "Gwarchodir"
-
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 194
-#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175 rc.cpp:519
-#, fuzzy, no-c-format
-msgid "Implementation"
-msgstr "Dogfenniaeth"
-
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 141
-#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192 rc.cpp:504
-#, no-c-format
-msgid "Changeable"
-msgstr ""
-
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 133
-#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195 rc.cpp:501
-#, no-c-format
-msgid "Frozen"
-msgstr ""
-
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 125
-#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198 rc.cpp:498
-#, no-c-format
-msgid "Add only"
-msgstr ""
-
-#: dialogs/umlwidgetcolorpage.cpp:58
-msgid "&Line:"
-msgstr "&Llinell :"
-
-#: dialogs/umlwidgetcolorpage.cpp:68
-msgid "&Fill:"
-msgstr "&Llenwi :"
-
-#: dialogs/umlwidgetcolorpage.cpp:75
-msgid "D&efault"
-msgstr "R&hagosodedig"
-
-#: dialogs/umlwidgetcolorpage.cpp:78
-msgid "&Use fill"
-msgstr ""
-
-#: dialogs/umltemplatedialog.cpp:36
-msgid "Template Properties"
-msgstr ""
-
-#: dialogs/umltemplatedialog.cpp:128
-msgid "You have entered an invalid template name."
-msgstr ""
-
-#: dialogs/umltemplatedialog.cpp:129
-msgid "Template Name Invalid"
-msgstr ""
-
-#: dialogs/umltemplatedialog.cpp:138
-msgid ""
-"The template parameter name you have chosen is already being used in this "
-"operation."
-msgstr ""
-
-#: dialogs/umltemplatedialog.cpp:139
-msgid "Template Name Not Unique"
-msgstr ""
-
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 90
-#: dialogs/exportallviewsdialog.cpp:51 rc.cpp:463
-#, no-c-format
-msgid "The format that the images will be exported to"
-msgstr ""
-
-#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
-msgid "Select Operation"
-msgstr ""
-
-#: dialogs/selectopdlg.cpp:43
-msgid "Sequence number:"
-msgstr ""
-
-#: dialogs/selectopdlg.cpp:46
-msgid "Class operation:"
-msgstr ""
-
-#: dialogs/selectopdlg.cpp:54
-msgid "Custom operation:"
-msgstr ""
-
-#: dialogs/notedialog.cpp:25
-msgid "Note Documentation"
-msgstr ""
-
-#: dialogs/pkgcontentspage.cpp:29
-msgid "Contained Items"
-msgstr ""
-
-#: dialogs/assocpropdlg.cpp:39
-msgid "Association Properties"
-msgstr ""
-
-#: dialogs/assocpropdlg.cpp:94
-msgid "Roles"
-msgstr ""
-
-#: dialogs/assocpropdlg.cpp:94
-msgid "Role Settings"
-msgstr ""
-
-#: dialogs/assocpropdlg.cpp:112
-msgid "Association font"
-msgstr ""
-
 #: dialogs/settingsdlg.cpp:30
 msgid "Umbrello Setup"
 msgstr ""
@@ -1148,6 +1773,14 @@ msgstr ""
 msgid "User Interface Settings"
 msgstr ""
 
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125 dialogs/settingsdlg.cpp:49
+#: dialogs/statedialog.cpp:130 dialogs/umlviewdialog.cpp:100
+#: dialogs/umlwidgetcolorpage.cpp:53 listpopupmenu.cpp:739
+#: listpopupmenu.cpp:750
+msgid "Color"
+msgstr "Lliw"
+
 #: dialogs/settingsdlg.cpp:54
 msgid "Line color:"
 msgstr "Lliw y llinell:"
@@ -1322,6 +1955,30 @@ msgstr ""
 msgid "Default operation scope:"
 msgstr ""
 
+#. i18n: file codegenerators/javacodegenerationformbase.ui line 129
+#: dialogs/assocrolepage.cpp:106 dialogs/assocrolepage.cpp:166
+#: dialogs/settingsdlg.cpp:259 dialogs/settingsdlg.cpp:267 rc.cpp:120
+#: rc.cpp:138 rc.cpp:177 rc.cpp:195 rc.cpp:510
+#, no-c-format
+msgid "Public"
+msgstr "Cyhoeddus"
+
+#. i18n: file codegenerators/javacodegenerationformbase.ui line 134
+#: dialogs/assocrolepage.cpp:109 dialogs/assocrolepage.cpp:169
+#: dialogs/settingsdlg.cpp:260 dialogs/settingsdlg.cpp:268 rc.cpp:123
+#: rc.cpp:141 rc.cpp:180 rc.cpp:198 rc.cpp:513
+#, no-c-format
+msgid "Private"
+msgstr "Preivat"
+
+#. i18n: file codegenerators/javacodegenerationformbase.ui line 139
+#: dialogs/assocrolepage.cpp:112 dialogs/assocrolepage.cpp:172
+#: dialogs/settingsdlg.cpp:261 dialogs/settingsdlg.cpp:269 rc.cpp:126
+#: rc.cpp:144 rc.cpp:183 rc.cpp:201 rc.cpp:516
+#, no-c-format
+msgid "Protected"
+msgstr "Gwarchodir"
+
 #: dialogs/settingsdlg.cpp:294
 msgid "Code Generation"
 msgstr ""
@@ -1334,1238 +1991,610 @@ msgstr ""
 msgid "Code Viewer Settings"
 msgstr ""
 
-#: dialogs/defaultcodegenpolicypage.cpp:36
-msgid "<p align=\"center\">No Options Available.</p>"
-msgstr ""
-
-#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
-#: listpopupmenu.cpp:699
-msgid "Show"
-msgstr "Dangos"
-
-#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
-msgid "Operatio&ns"
-msgstr "Gweithre&diadau"
-
-#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
-msgid "&Visibility"
-msgstr ""
-
-#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
-msgid "O&peration signature"
-msgstr ""
-
-#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
-msgid "Pac&kage"
-msgstr "Pec&yn"
-
-#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
-msgid "Att&ributes"
-msgstr "Pri&odweddion"
-
-#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
-msgid "Stereot&ype"
+#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
+msgid "Associations"
 msgstr ""
 
-#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
-msgid "Attr&ibute signature"
+#: dialogs/pkgcontentspage.cpp:29
+msgid "Contained Items"
 msgstr ""
 
-#: dialogs/classoptionspage.cpp:108
-msgid "Draw as circle"
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125
+msgid "Widget Colors"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 61
-#: dialogs/assocgenpage.cpp:67 rc.cpp:408
-#, no-c-format
-msgid "Name:"
-msgstr "Enw:"
-
-#: dialogs/assocgenpage.cpp:80
-msgid "Type:"
-msgstr "Math:"
+#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
+msgid "Display"
+msgstr "Dangos"
 
-#: umllistview.cpp:348
-msgid "Externalize Folder"
-msgstr ""
+#: dialogs/classpropdlg.cpp:118
+msgid "Display Options"
+msgstr "Dewisiadau masg"
 
-#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
-#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umllistview.cpp:384
-#: umlviewimageexportermodel.cpp:158
-#, c-format
-msgid "There was a problem saving file: %1"
+#: dialogs/classpropdlg.cpp:179
+msgid "Attribute Settings"
 msgstr ""
 
-#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
-#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umldoc.cpp:641
-#: umllistview.cpp:385
-msgid "Save Error"
-msgstr "Gwall Cadw"
-
-#: umllistview.cpp:416
-#, fuzzy
-msgid "Enter Model Name"
-msgstr "Rhowch enw:"
-
-#: umllistview.cpp:417
-msgid "Enter the new name of the model:"
+#: dialogs/classpropdlg.cpp:187
+msgid "Operation Settings"
 msgstr ""
 
-#: umllistview.cpp:1007
-msgid "Views"
-msgstr "Golygon"
+#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
+msgid "Templates"
+msgstr "Patrymluniau"
 
-#: umllistview.cpp:1907
-msgid ""
-"The name you entered was invalid.\n"
-"Creation process has been canceled."
+#: dialogs/classpropdlg.cpp:195
+msgid "Templates Settings"
 msgstr ""
 
-#: umllistview.cpp:1908 umllistviewitem.cpp:479
-msgid "Name Not Valid"
+#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
+msgid "Enum Literals"
 msgstr ""
 
-#: umldoc.cpp:1067 umllistview.cpp:1917
-msgid ""
-"The name you entered was not unique.\n"
-"Is this what you wanted?"
+#: dialogs/classpropdlg.cpp:202
+msgid "Enum Literals Settings"
 msgstr ""
 
-#: umldoc.cpp:1068 umllistview.cpp:1918
-#, fuzzy
-msgid "Use Name"
-msgstr "Enw"
-
-#: umldoc.cpp:1068 umllistview.cpp:1918
+#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
 #, fuzzy
-msgid "Enter New Name"
-msgstr "Rhowch enw:"
+msgid "Entity Attributes"
+msgstr "Priodweddion"
 
-#: umllistview.cpp:1924 umllistview.cpp:2161
-msgid ""
-"The name you entered was not unique!\n"
-"Creation process has been canceled."
+#: dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes Settings"
 msgstr ""
 
-#: umllistview.cpp:2119 umllistview.cpp:2136 umllistview.cpp:2151
-msgid "Creation canceled"
+#: dialogs/classpropdlg.cpp:216
+msgid "Contents Settings"
 msgstr ""
 
-#: umllistview.cpp:2339
-#, fuzzy
-msgid "Loading listview..."
-msgstr "Yn cadw ffeil..."
-
-#: umllistview.cpp:2671
-msgid "The folder must be emptied before it can be deleted."
+#: dialogs/classpropdlg.cpp:222
+msgid "Class Associations"
 msgstr ""
 
-#: umllistview.cpp:2672
-msgid "Folder Not Empty"
+#. i18n: file dialogs/umlrolepropertiesbase.ui line 36
+#: dialogs/umlroledialog.cpp:25 rc.cpp:483
+#, no-c-format
+msgid "Role Properties"
 msgstr ""
 
-#: enumliteral.cpp:65 floatingtextwidget.cpp:111 object_factory.cpp:153
-#: umldoc.cpp:976 umldoc.cpp:1012 umldoc.cpp:1033 umldoc.cpp:1059
-msgid "Name"
-msgstr "Enw"
-
-#: floatingtextwidget.cpp:112
-msgid "Enter operation name:"
+#: dialogs/umlentityattributedialog.cpp:43
+msgid "Entity Attribute Properties"
 msgstr ""
 
-#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
-msgid "Enter role name:"
-msgstr ""
+#: dialogs/umlentityattributedialog.cpp:73
+msgid "&Default value:"
+msgstr "&Gwerth ragosod :"
 
-#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
-msgid "Enter multiplicity:"
+#: dialogs/umlentityattributedialog.cpp:81
+msgid "Length/Values:"
 msgstr ""
 
-#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
-msgid "Enter association name:"
+#: dialogs/umlentityattributedialog.cpp:84
+msgid "&Auto increment"
 msgstr ""
 
-#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
-msgid "Enter new text:"
+#: dialogs/umlentityattributedialog.cpp:88
+msgid "Allow &null"
 msgstr ""
 
-#: floatingtextwidget.cpp:175
-msgid "ERROR"
-msgstr "GWALL"
-
-#: floatingtextwidget.cpp:264
-msgid "Change Text"
-msgstr "Newid y Testun"
+#: dialogs/umlentityattributedialog.cpp:92
+msgid "Attributes:"
+msgstr "Priodweddion :"
 
-#: codegenerator.cpp:473
-msgid ""
-"Cannot open file %1 for writing. Please make sure the folder exists and you "
-"have permissions to write to it."
+#: dialogs/umlentityattributedialog.cpp:108
+msgid "Indexing"
 msgstr ""
 
-#: codegenerator.cpp:473
-msgid "Cannot Open File"
-msgstr "Methu Agor y Ffeil"
-
-#: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
-msgid ""
-"Cannot create the folder:\n"
-msgstr ""
+#: dialogs/umlentityattributedialog.cpp:112
+msgid "&None"
+msgstr "&Dim"
 
-#: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
-msgid ""
-"\n"
-"Please check the access rights"
-msgstr ""
+#: dialogs/umlentityattributedialog.cpp:115
+msgid "&Primary"
+msgstr "&Cynradd"
 
-#: codegenerator.cpp:533 codegenerators/simplecodegenerator.cpp:130
-msgid "Cannot Create Folder"
-msgstr ""
+#: dialogs/umlentityattributedialog.cpp:118
+msgid "&Index"
+msgstr "Mynega&i"
 
-#: umlviewimageexporter.cpp:46
-#, fuzzy
-msgid "Exporting view..."
-msgstr "Terfynu..."
+#: dialogs/umlentityattributedialog.cpp:121
+msgid "&Unique"
+msgstr "&Unigryw"
 
-#: umlviewimageexporter.cpp:50
-msgid ""
-"An error happened when exporting the image:\n"
+#: dialogs/umlentityattributedialog.cpp:184
+msgid "You have entered an invalid entity attribute name."
 msgstr ""
 
-#: codeimport/classimport.cpp:39 uml.cpp:376 uml.cpp:483 uml.cpp:660
-#: uml.cpp:688 uml.cpp:712 uml.cpp:722 uml.cpp:753 uml.cpp:758 uml.cpp:783
-#: uml.cpp:793 uml.cpp:814 uml.cpp:819 uml.cpp:832 uml.cpp:839 uml.cpp:853
-#: uml.cpp:874 uml.cpp:887 umlviewimageexporter.cpp:52
-#: umlviewimageexporterall.cpp:73
-msgid "Ready."
-msgstr "Parod."
+#: dialogs/umlentityattributedialog.cpp:185
+msgid "Entity Attribute Name Invalid"
+msgstr ""
 
-#: umlviewimageexporter.cpp:66
+#: dialogs/umlentityattributedialog.cpp:192
 msgid ""
-"The selected file %1 exists.\n"
-"Do you want to overwrite it?"
+"The entity attribute name you have chosen is already being used in this "
+"operation."
 msgstr ""
 
-#: umlviewimageexporter.cpp:67
-msgid "File Already Exists"
-msgstr "Ffeil yn Bodoli'n Barod"
-
-#: aligntoolbar.cpp:40
-msgid "Align Left"
-msgstr "Alinio Chwith"
-
-#: aligntoolbar.cpp:41
-msgid "Align Right"
-msgstr "Alinio Dde"
-
-#: aligntoolbar.cpp:42
-msgid "Align Top"
-msgstr "Alinio Brig"
-
-#: aligntoolbar.cpp:43
-msgid "Align Bottom"
-msgstr "Alinio Gwaelod"
-
-#: aligntoolbar.cpp:44
-msgid "Align Vertical Middle"
+#: dialogs/umlentityattributedialog.cpp:193
+msgid "Entity Attribute Name Not Unique"
 msgstr ""
 
-#: aligntoolbar.cpp:45
-msgid "Align Horizontal Middle"
-msgstr ""
+#: dialogs/umlwidgetcolorpage.cpp:58
+msgid "&Line:"
+msgstr "&Llinell :"
 
-#: aligntoolbar.cpp:46
-msgid "Align Vertical Distribute"
-msgstr ""
+#: dialogs/umlwidgetcolorpage.cpp:68
+msgid "&Fill:"
+msgstr "&Llenwi :"
 
-#: aligntoolbar.cpp:47
-msgid "Align Horizontal Distribute"
-msgstr ""
+#: dialogs/umlwidgetcolorpage.cpp:75
+msgid "D&efault"
+msgstr "R&hagosodedig"
 
-#: aligntoolbar.cpp:383
-msgid ""
-"For alignment you have to select at least 2 objects like classes or actors. You "
-"can not align associations."
+#: dialogs/umlwidgetcolorpage.cpp:78
+msgid "&Use fill"
 msgstr ""
 
-#: enumliteral.cpp:65 object_factory.cpp:153 stereotype.cpp:76 umldoc.cpp:976
-#: umldoc.cpp:1012 umldoc.cpp:1033 umldoc.cpp:1059
-msgid "Enter name:"
-msgstr "Rhowch enw:"
-
-#: classifier.cpp:294 classifier.cpp:522 entity.cpp:78 enum.cpp:76
-#: object_factory.cpp:158 umldoc.cpp:1037 umldoc.cpp:1063
-msgid "That is an invalid name."
+#: dialogs/overwritedialogue.cpp:27
+msgid "Destination File Already Exists"
 msgstr ""
 
-#: object_factory.cpp:164
+#: dialogs/overwritedialogue.cpp:31
 msgid ""
-"This is a reserved keyword for the language of the configured code generator."
-msgstr ""
-
-#: object_factory.cpp:165
-msgid "Reserved Keyword"
-msgstr ""
-
-#: classifier.cpp:296 classifier.cpp:524 entity.cpp:80 object_factory.cpp:169
-#: umldoc.cpp:1043 umldoc.cpp:1073
-msgid "That name is already being used."
-msgstr ""
-
-#: classifier.cpp:296 classifier.cpp:524 entity.cpp:80 object_factory.cpp:170
-#: umldoc.cpp:998 umldoc.cpp:1025 umldoc.cpp:1043 umldoc.cpp:1073
-msgid "Not a Unique Name"
+"The file %1 already exists in %2.\n"
+"\n"
+"Umbrello can overwrite the file, generate a similar\n"
+"file name or not generate this file."
 msgstr ""
 
-#: umlviewimageexportermodel.cpp:126
-#, c-format
-msgid "Can not create directory: %1"
+#: dialogs/overwritedialogue.cpp:34
+msgid "&Apply to all remaining files"
 msgstr ""
 
-#: umlviewimageexportermodel.cpp:145
-msgid "Can not save an empty diagram"
+#: dialogs/overwritedialogue.cpp:39
+msgid "&Generate Similar File Name"
 msgstr ""
 
-#: umlviewimageexportermodel.cpp:151
-#, c-format
-msgid "A problem occured while saving diagram in %1"
+#: dialogs/overwritedialogue.cpp:40
+msgid "&Do Not Generate File"
 msgstr ""
 
-#: model_utils.cpp:244
-msgid "new_actor"
+#: dialogs/statedialog.cpp:85
+msgid "Initial state"
 msgstr ""
 
-#: model_utils.cpp:246
-msgid "new_usecase"
+#: dialogs/statedialog.cpp:85
+msgid "End state"
 msgstr ""
 
-#: model_utils.cpp:248
-msgid "new_package"
+#: dialogs/statedialog.cpp:96
+msgid "State type:"
 msgstr ""
 
-#: model_utils.cpp:250
-msgid "new_component"
+#: dialogs/statedialog.cpp:101
+msgid "State name:"
 msgstr ""
 
-#: model_utils.cpp:252
-msgid "new_node"
-msgstr ""
+#: dialogs/statedialog.cpp:130
+msgid "Widget Color"
+msgstr "Lliw Celfigyn"
 
-#: model_utils.cpp:254
-msgid "new_artifact"
+#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
+msgid "Activities"
 msgstr ""
 
-#: model_utils.cpp:256
-msgid "new_interface"
+#: dialogs/classifierlistpage.cpp:39
+msgid "N&ew Attribute..."
 msgstr ""
 
-#: model_utils.cpp:258
-msgid "new_datatype"
+#: dialogs/classifierlistpage.cpp:42
+msgid "N&ew Operation..."
 msgstr ""
 
-#: model_utils.cpp:260
-msgid "new_enum"
+#: dialogs/classifierlistpage.cpp:45
+msgid "N&ew Template..."
 msgstr ""
 
-#: model_utils.cpp:262
-msgid "new_entity"
+#: dialogs/classifierlistpage.cpp:48
+msgid "N&ew Enum Literal..."
 msgstr ""
 
-#: model_utils.cpp:264
+#: dialogs/classifierlistpage.cpp:51
 #, fuzzy
-msgid "new_folder"
-msgstr "plygell"
+msgid "N&ew Entity Attribute..."
+msgstr "Priodoleddau ..."
 
-#: model_utils.cpp:266 umlcanvasobject.cpp:147
-msgid "new_association"
+#: dialogs/classwizard.cpp:33 model_utils.cpp:242
+msgid "new_class"
 msgstr ""
 
-#: model_utils.cpp:268
-msgid "new_object"
+#: dialogs/classwizard.cpp:54
+msgid "New Class"
 msgstr ""
 
-#: model_utils.cpp:559
-msgid "Empty"
-msgstr "Gwag"
-
-#: model_utils.cpp:559
-msgid "Malformed argument"
+#: dialogs/classwizard.cpp:59
+msgid "Class Attributes"
 msgstr ""
 
-#: model_utils.cpp:560
-msgid "Unknown argument type"
+#: dialogs/classwizard.cpp:63
+msgid "Class Operations"
 msgstr ""
 
-#: model_utils.cpp:560
-msgid "Illegal method name"
+#: dialogs/activitypage.cpp:72
+msgid "New Activity..."
 msgstr ""
 
-#: model_utils.cpp:561
-msgid "Unknown return type"
-msgstr ""
+#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
+msgid "Rename"
+msgstr "Ail-enwi"
 
-#: model_utils.cpp:561
-msgid "Unspecified error"
+#: dialogs/activitypage.cpp:134
+msgid "New Activity"
 msgstr ""
 
-#: codeimport/classimport.cpp:34
-msgid "Importing file: %1 Progress: %2/%3"
+#: dialogs/activitypage.cpp:153
+msgid "Rename Activity"
 msgstr ""
 
-#: codeimport/import_utils.cpp:181
-msgid "Is the scope %1 a namespace or a class?"
+#: dialogs/activitypage.cpp:153
+msgid "Enter the new name of the activity:"
 msgstr ""
 
-#: codeimport/import_utils.cpp:182
-msgid "C++ Import Requests Your Help"
+#: dialogs/diagramprintpage.cpp:35
+msgid "&Diagrams"
 msgstr ""
 
-#: codeimport/import_utils.cpp:183
-#, fuzzy
-msgid "Namespace"
-msgstr "Enw"
+#: dialogs/diagramprintpage.cpp:40
+msgid "Filter"
+msgstr "Hidlo"
 
-#: codeimport/kdevcppparser/parser.cpp:138
-msgid "<eof>"
+#: dialogs/diagramprintpage.cpp:48
+msgid "&Current diagram"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:323
-#: codeimport/kdevcppparser/parser.cpp:2679
-#: codeimport/kdevcppparser/parser.cpp:2878
-#: codeimport/kdevcppparser/parser.cpp:2884
-msgid "expression expected"
+#: dialogs/diagramprintpage.cpp:53
+msgid "&All diagrams"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:598
-msgid "Declaration syntax error"
+#: dialogs/diagramprintpage.cpp:57
+msgid "&Select diagrams"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:643
-#: codeimport/kdevcppparser/parser.cpp:2770
-#: codeimport/kdevcppparser/parser.cpp:3224
-msgid "} expected"
+#: dialogs/diagramprintpage.cpp:61
+msgid "&Type of diagram"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:684
-msgid "namespace expected"
-msgstr ""
+#: dialogs/diagramprintpage.cpp:65
+msgid "Selection"
+msgstr "Dewisiad"
 
-#: codeimport/kdevcppparser/parser.cpp:688
-msgid "{ expected"
+#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
+msgid "Collaboration"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:761
-#: codeimport/kdevcppparser/parser.cpp:2965
-msgid "Namespace name expected"
+#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
+msgid "Sequence"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:869
-msgid "Need a type specifier to declare"
+#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
+msgid "Deployment"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:938
-msgid "expected a declaration"
+#: dialogs/diagramprintpage.cpp:135
+msgid "No diagrams selected."
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:1212
-#: codeimport/kdevcppparser/parser.cpp:2178
-msgid "Constant expression expected"
+#: dialogs/assocrolepage.cpp:50
+msgid "Role A Properties"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:1281
-#: codeimport/kdevcppparser/parser.cpp:1378
-msgid "')' expected"
+#: dialogs/assocrolepage.cpp:51
+msgid "Role B Properties"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:1451
-#: codeimport/kdevcppparser/parser.cpp:1914
-#: codeimport/kdevcppparser/parser.cpp:2392
-msgid "} missing"
+#: dialogs/assocrolepage.cpp:68
+msgid "Role A Visibility"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2074
-msgid "Member initializers expected"
+#: dialogs/assocrolepage.cpp:69
+msgid "Role B Visibility"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2235
-msgid "Base class specifier expected"
+#: dialogs/assocrolepage.cpp:70
+msgid "Role A Changeability"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2260
-msgid "Initializer clause expected"
+#: dialogs/assocrolepage.cpp:71
+msgid "Role B Changeability"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2303
-msgid "Identifier expected"
+#. i18n: file dialogs/umlrolepropertiesbase.ui line 59
+#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152 rc.cpp:486
+#, no-c-format
+msgid "Rolename:"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2337
-msgid "Type id expected"
+#. i18n: file dialogs/umlrolepropertiesbase.ui line 77
+#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158 rc.cpp:489
+#, no-c-format
+msgid "Multiplicity:"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2374
-msgid "Class name expected"
-msgstr ""
+#. i18n: file dialogs/umlrolepropertiesbase.ui line 194
+#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175 rc.cpp:519
+#, fuzzy, no-c-format
+msgid "Implementation"
+msgstr "Dogfenniaeth"
 
-#: codeimport/kdevcppparser/parser.cpp:2641
-#: codeimport/kdevcppparser/parser.cpp:2795
-#: codeimport/kdevcppparser/parser.cpp:2835
-#: codeimport/kdevcppparser/parser.cpp:3282
-msgid "condition expected"
+#. i18n: file dialogs/umlrolepropertiesbase.ui line 141
+#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192 rc.cpp:504
+#, no-c-format
+msgid "Changeable"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2648
-#: codeimport/kdevcppparser/parser.cpp:2670
-#: codeimport/kdevcppparser/parser.cpp:2802
-#: codeimport/kdevcppparser/parser.cpp:2813
-msgid "statement expected"
+#. i18n: file dialogs/umlrolepropertiesbase.ui line 133
+#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195 rc.cpp:501
+#, no-c-format
+msgid "Frozen"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2705
-msgid "for initialization expected"
+#. i18n: file dialogs/umlrolepropertiesbase.ui line 125
+#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198 rc.cpp:498
+#, no-c-format
+msgid "Add only"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:3273
-msgid "catch expected"
+#: dialogs/umlattributedialog.cpp:42
+msgid "Attribute Properties"
 msgstr ""
 
-#: codeimport/kdevcppparser/errors.cpp:23
-msgid "Internal Error"
-msgstr "Gwall Mewnol"
+#: dialogs/umlattributedialog.cpp:91
+msgid "&Public"
+msgstr "&Cyhoeddus"
 
-#: codeimport/kdevcppparser/errors.cpp:24
-msgid "Syntax Error before '%1'"
+#: dialogs/umlattributedialog.cpp:155
+msgid "You have entered an invalid attribute name."
 msgstr ""
 
-#: codeimport/kdevcppparser/errors.cpp:25
-msgid "Parse Error before '%1'"
+#: dialogs/umlattributedialog.cpp:156
+msgid "Attribute Name Invalid"
 msgstr ""
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "KD wrth KGyfieithu"
-
-#: _translatorinfo.cpp:3
+#: dialogs/umlattributedialog.cpp:163
 msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "kyfieithu@dotmon.com"
-
-#: main.cpp:32 main.cpp:93
-msgid "Umbrello UML Modeller"
-msgstr ""
-
-#: main.cpp:40
-msgid "File to open"
-msgstr "Ffeil i agor"
-
-#: main.cpp:41
-msgid "export diagrams to extension and exit"
-msgstr ""
-
-#: main.cpp:42
-msgid "the local directory to save the exported diagrams in"
+"The attribute name you have chosen is already being used in this operation."
 msgstr ""
 
-#: main.cpp:42
-msgid "the directory of the file"
+#: dialogs/umlattributedialog.cpp:164
+msgid "Attribute Name Not Unique"
 msgstr ""
 
-#: main.cpp:43
-msgid ""
-"keep the tree structure used to store the views in the document in the target "
-"directory"
-msgstr ""
+#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
+#: listpopupmenu.cpp:699
+msgid "Show"
+msgstr "Dangos"
 
-#: main.cpp:95
-msgid "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"
-msgstr ""
+#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
+msgid "Operatio&ns"
+msgstr "Gweithre&diadau"
 
-#: docgenerators/main.cpp:67 main.cpp:98
-msgid "Umbrello UML Modeller Authors"
+#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
+msgid "&Visibility"
 msgstr ""
 
-#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
-msgid "Umbrello UML Modeller autonomous code generator"
+#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
+msgid "O&peration signature"
 msgstr ""
 
-#: docgenerators/main.cpp:47
-#, fuzzy
-msgid "File to transform"
-msgstr "Ffeil i agor"
+#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
+msgid "Pac&kage"
+msgstr "Pec&yn"
 
-#: docgenerators/main.cpp:48
-msgid "The XSLT file to use"
-msgstr ""
+#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
+msgid "Att&ributes"
+msgstr "Pri&odweddion"
 
-#: docgenerators/main.cpp:64
-msgid ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
-"Authors"
+#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
+msgid "Stereot&ype"
 msgstr ""
 
-#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
-#, fuzzy
-msgid "Exporting all views..."
-msgstr "Yn cadw ffeil..."
-
-#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
-#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
-msgid "Some errors happened when exporting the images:"
+#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
+msgid "Attr&ibute signature"
 msgstr ""
 
-#: association.cpp:84
-msgid "Generalization"
+#: dialogs/classoptionspage.cpp:108
+msgid "Draw as circle"
 msgstr ""
 
-#: association.cpp:88
-msgid "Self Association"
+#: dialogs/umlviewdialog.cpp:93
+msgid "Classes Display Options"
 msgstr ""
 
-#: association.cpp:89
-msgid "Collaboration Message"
+#: dialogs/umlviewdialog.cpp:100
+msgid "Diagram Colors"
 msgstr ""
 
-#: association.cpp:90
-msgid "Sequence Message"
+#: dialogs/umlviewdialog.cpp:164
+msgid "The name you have entered is invalid."
 msgstr ""
 
-#: association.cpp:91
-msgid "Collaboration Self Message"
+#: dialogs/umlviewdialog.cpp:170
+msgid "The name you have entered is not unique."
 msgstr ""
 
-#: association.cpp:92
-msgid "Sequence Self Message"
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
+#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
+#, no-c-format
+msgid "Code Generation Options"
 msgstr ""
 
-#: association.cpp:95
-msgid "Realization"
-msgstr ""
+#: dialogs/codegenerationwizard.cpp:70
+msgid "&Generate"
+msgstr "&Creu"
 
-#: association.cpp:96
-msgid "Uni Association"
-msgstr ""
+#: dialogs/codegenerationwizard.cpp:120
+msgid "Finish"
+msgstr "Gorffen"
 
-#: umldoc.cpp:82 umldoc.cpp:1518
-msgid "UML Model"
+#: dialogs/codegenerationwizard.cpp:132
+msgid "Code Generated"
 msgstr ""
 
-#: umldoc.cpp:106
-msgid "Logical View"
+#: dialogs/codegenerationwizard.cpp:134
+msgid "Not Generated"
 msgstr ""
 
-#: umldoc.cpp:107
-msgid "Use Case View"
+#: dialogs/codegenerationwizard.cpp:141
+msgid "Not Yet Generated"
 msgstr ""
 
-#: umldoc.cpp:108
-msgid "Component View"
+#: dialogs/codegenerationwizard.cpp:162
+msgid "The folder %1 does not exist. Do you want to create it now?"
 msgstr ""
 
-#: umldoc.cpp:109
-msgid "Deployment View"
+#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
+msgid "Output Folder Does Not Exist"
 msgstr ""
 
-#: umldoc.cpp:110
-msgid "Entity Relationship Model"
-msgstr ""
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Create Folder"
+msgstr "Creu Plygell"
 
-#: umldoc.cpp:117 umldoc.cpp:293
-msgid "Datatypes"
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Do Not Create"
 msgstr ""
 
-#: umldoc.cpp:229
+#: dialogs/codegenerationwizard.cpp:168
 msgid ""
-"The current file has been modified.\n"
-"Do you want to save it?"
-msgstr ""
-"Addaswyd y ffeil gyfredol.\n"
-"Hoffech ei chadw?"
-
-#: umldoc.cpp:355
-msgid "The file %1 does not exist."
-msgstr "Nid yw'r ffeil %1 yn bodoli!."
-
-#: folder.cpp:289 folder.cpp:293 umldoc.cpp:355 umldoc.cpp:380 umldoc.cpp:422
-#: umldoc.cpp:434 umldoc.cpp:448 umldoc.cpp:461 umldoc.cpp:472 umldoc.cpp:488
-msgid "Load Error"
-msgstr "Gwall Llwytho"
-
-#: umldoc.cpp:380
-msgid "The file %1 seems to be corrupted."
-msgstr ""
-
-#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
-#, c-format
-msgid "There was no XMI file found in the compressed file %1."
-msgstr ""
-
-#: umldoc.cpp:448
-#, c-format
-msgid "There was a problem loading the extracted file: %1"
-msgstr ""
-
-#: umldoc.cpp:472 umldoc.cpp:488
-#, c-format
-msgid "There was a problem loading file: %1"
-msgstr ""
-
-#: umldoc.cpp:641
-#, c-format
-msgid "There was a problem uploading file: %1"
-msgstr ""
-
-#: umldoc.cpp:934
-msgid "use case diagram"
-msgstr ""
-
-#: umldoc.cpp:936
-msgid "class diagram"
-msgstr ""
-
-#: umldoc.cpp:938
-msgid "sequence diagram"
-msgstr ""
-
-#: umldoc.cpp:940
-msgid "collaboration diagram"
-msgstr ""
-
-#: umldoc.cpp:942
-msgid "state diagram"
-msgstr ""
-
-#: umldoc.cpp:944
-msgid "activity diagram"
-msgstr ""
-
-#: umldoc.cpp:946
-msgid "component diagram"
-msgstr ""
-
-#: umldoc.cpp:948
-msgid "deployment diagram"
-msgstr ""
-
-#: umldoc.cpp:950
-msgid "entity relationship diagram"
-msgstr ""
-
-#: umldoc.cpp:984 umldoc.cpp:1017
-msgid "That is an invalid name for a diagram."
-msgstr ""
-
-#: umldoc.cpp:998 umldoc.cpp:1025
-msgid "A diagram is already using that name."
-msgstr ""
-
-#: umldoc.cpp:1099
-msgid "Are you sure you want to delete diagram %1?"
-msgstr ""
-
-#: umldoc.cpp:1099
-msgid "Delete Diagram"
-msgstr ""
-
-#: umldoc.cpp:1573
-msgid "Setting up the document..."
-msgstr ""
-
-#: umldoc.cpp:1600
-msgid "Resolving object references..."
-msgstr ""
-
-#: umldoc.cpp:1638
-msgid "Loading UML elements..."
-msgstr ""
-
-#: umldoc.cpp:1811
-msgid "Loading diagrams..."
-msgstr ""
-
-#: umldoc.cpp:2104
-#, c-format
-msgid "/autosave%1"
-msgstr ""
-
-#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
-msgid "Rename canceled"
+"The folder could not be created.\n"
+"Please make sure you have write access to its parent folder or select another, "
+"valid, folder."
 msgstr ""
 
-#: umllistviewitem.cpp:468
-msgid "Renaming an item of listview type %1 is not yet implemented."
+#: dialogs/codegenerationwizard.cpp:169
+msgid "Error Creating Folder"
 msgstr ""
 
-#: umllistviewitem.cpp:469
-msgid "Function Not Implemented"
+#: dialogs/codegenerationwizard.cpp:176
+msgid "Please select a valid folder."
 msgstr ""
 
-#: umllistviewitem.cpp:478
+#: dialogs/codegenerationwizard.cpp:184
 msgid ""
-"The name you entered was invalid.\n"
-"Renaming process has been canceled."
-msgstr ""
-
-#: codegenerators/cppcodegenerationform.cpp:36
-msgid "General Options"
-msgstr "Dewisiadau Cyffredinol"
-
-#: codegenerators/cppcodegenerationform.cpp:38
-msgid "Package is a namespace"
-msgstr ""
-
-#: codegenerators/cppcodegenerationform.cpp:41
-msgid "Virtual destructors"
-msgstr ""
-
-#: codegenerators/cppcodegenerationform.cpp:44
-msgid "Generate empty constructors"
-msgstr ""
-
-#: codegenerators/cppcodegenerationform.cpp:47
-msgid "Generate accessor methods"
-msgstr ""
-
-#: codegenerators/cppcodegenerationform.cpp:50
-msgid "Operations are inline"
-msgstr ""
-
-#: codegenerators/cppcodegenerationform.cpp:53
-msgid "Accessors are inline"
-msgstr ""
-
-#: codegenerators/cppcodegenerationform.cpp:57
-msgid "Accessors are public"
-msgstr ""
-
-#: umlcanvasobject.cpp:150
-msgid "new_attribute"
-msgstr ""
-
-#: umlcanvasobject.cpp:153
-msgid "new_template"
-msgstr ""
-
-#: umlcanvasobject.cpp:156
-msgid "new_operation"
-msgstr ""
-
-#: umlcanvasobject.cpp:159
-msgid "new_literal"
-msgstr ""
-
-#: umlcanvasobject.cpp:162
-msgid "new_field"
-msgstr ""
-
-#: uml.cpp:179
-msgid "&Export model to DocBook"
-msgstr ""
-
-#: uml.cpp:182
-msgid "&Export model to XHTML"
-msgstr ""
-
-#: uml.cpp:186
-msgid "&New Class Wizard..."
-msgstr ""
-
-#: uml.cpp:188
-msgid "&Add Default Datatypes for Active Language"
-msgstr ""
-
-#: uml.cpp:193
-msgid "&Code Generation Wizard..."
-msgstr ""
-
-#: uml.cpp:195
-msgid "&Generate All Code"
-msgstr ""
-
-#: uml.cpp:198
-#, fuzzy
-msgid "&Import Classes..."
-msgstr "Dosbarth ..."
-
-#: uml.cpp:201
-msgid "Creates a new document"
-msgstr "Creu dogfen newydd"
-
-#: uml.cpp:202
-msgid "Opens an existing document"
-msgstr "Agor dogfen gyfredol"
-
-#: uml.cpp:203
-msgid "Opens a recently used file"
-msgstr "Agor ffeil a ddefnyddiwyd yn ddiweddar"
-
-#: uml.cpp:204
-msgid "Saves the document"
-msgstr ""
-
-#: uml.cpp:205
-msgid "Saves the document as..."
-msgstr ""
-
-#: uml.cpp:206
-msgid "Closes the document"
-msgstr ""
-
-#: uml.cpp:207
-msgid "Prints out the document"
-msgstr ""
-
-#: uml.cpp:208
-msgid "Quits the application"
-msgstr "Terfynu'r cymhwysiad"
-
-#: uml.cpp:209
-msgid "Exports the model to the docbook format"
-msgstr ""
-
-#: uml.cpp:210
-msgid "Exports the model to the XHTML format"
-msgstr ""
-
-#: uml.cpp:211
-msgid "Cuts the selected section and puts it to the clipboard"
-msgstr "Torri'r adran dewisiedig a'i roi ar y gludfwrdd"
-
-#: uml.cpp:212
-msgid "Copies the selected section to the clipboard"
-msgstr "Copïo'r adran dewisiedig i'r gludfwrdd"
-
-#: uml.cpp:213
-msgid "Pastes the contents of the clipboard"
-msgstr ""
-
-#: uml.cpp:214
-msgid "Set the default program preferences"
-msgstr ""
-
-#: uml.cpp:216
-msgid "Delete &Selected"
-msgstr ""
-
-#: uml.cpp:224
-msgid "&Class Diagram..."
-msgstr ""
-
-#: uml.cpp:228
-msgid "&Autolayout..."
-msgstr ""
-
-#: uml.cpp:231
-msgid "&Sequence Diagram..."
-msgstr ""
-
-#: uml.cpp:234
-msgid "C&ollaboration Diagram..."
-msgstr ""
-
-#: uml.cpp:237
-msgid "&Use Case Diagram..."
-msgstr ""
-
-#: uml.cpp:240
-msgid "S&tate Diagram..."
-msgstr ""
-
-#: uml.cpp:243
-msgid "&Activity Diagram..."
-msgstr ""
-
-#: uml.cpp:246
-msgid "Co&mponent Diagram..."
-msgstr ""
-
-#: uml.cpp:250
-msgid "&Deployment Diagram..."
-msgstr ""
-
-#: uml.cpp:254
-msgid "&Entity Relationship Diagram..."
-msgstr ""
-
-#: uml.cpp:258
-msgid "&Clear Diagram"
-msgstr ""
-
-#: uml.cpp:260
-msgid "&Snap to Grid"
-msgstr "&Snapio i'r Grid"
-
-#: uml.cpp:262
-msgid "S&how Grid"
-msgstr "D&angos Grid"
-
-#: uml.cpp:265
-msgid "&Hide Grid"
-msgstr "&Cuddio Grid"
-
-#: uml.cpp:269
-msgid "&Export as Picture..."
-msgstr ""
-
-#: uml.cpp:271
-msgid "Export &All Diagrams as Pictures..."
+"The output folder exists, but it is not writable.\n"
+"Please set the appropriate permissions or choose another folder."
 msgstr ""
 
-#: uml.cpp:286
-msgid "&Zoom Slider"
+#: dialogs/codegenerationwizard.cpp:185
+msgid "Error Writing to Output Folder"
 msgstr ""
 
-#: uml.cpp:289
-#, c-format
-msgid "Z&oom to 100%"
-msgstr "C&hwyddo i 100%"
-
-#: uml.cpp:295
-msgid "&Move Tab Left"
-msgstr "&Symud Tab i'r Chwith"
-
-#: uml.cpp:296
-msgid "&Move Tab Right"
-msgstr "&Symud Tab i'r Dde"
-
-#: uml.cpp:308
-msgid "Select Diagram on Left"
+#: dialogs/codegenerationwizard.cpp:191
+msgid "%1 does not seem to be a folder. Please choose a valid folder."
 msgstr ""
 
-#: uml.cpp:309
-msgid "Select Diagram on Right"
+#: dialogs/codegenerationwizard.cpp:192
+msgid "Please Choose Valid Folder"
 msgstr ""
 
-#: uml.cpp:327
-msgid "&Windows"
-msgstr "&Ffenestri"
-
-#: uml.cpp:347
-#, c-format
-msgid " &33%"
+#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
+msgid "Select Operation"
 msgstr ""
 
-#: uml.cpp:348
-#, c-format
-msgid " &50%"
+#: dialogs/selectopdlg.cpp:43
+msgid "Sequence number:"
 msgstr ""
 
-#: uml.cpp:349
-#, c-format
-msgid " &75%"
+#: dialogs/selectopdlg.cpp:46
+msgid "Class operation:"
 msgstr ""
 
-#: uml.cpp:350
-#, c-format
-msgid "&100%"
-msgstr "&100%"
-
-#: uml.cpp:351
-#, c-format
-msgid "1&50%"
+#: dialogs/selectopdlg.cpp:54
+msgid "Custom operation:"
 msgstr ""
 
-#: uml.cpp:352
-#, c-format
-msgid "&200%"
-msgstr "200%"
-
-#: uml.cpp:353
-#, c-format
-msgid "3&00%"
-msgstr "3&00%"
-
-#: uml.cpp:394
-msgid "Diagram Toolbar"
+#: dialogs/umltemplatedialog.cpp:36
+msgid "Template Properties"
 msgstr ""
 
-#: uml.cpp:398
-msgid "Alignment Toolbar"
+#: dialogs/umltemplatedialog.cpp:128
+msgid "You have entered an invalid template name."
 msgstr ""
 
-#: listpopupmenu.cpp:615 uml.cpp:420
-msgid "Class Diagram..."
+#: dialogs/umltemplatedialog.cpp:129
+msgid "Template Name Invalid"
 msgstr ""
 
-#: listpopupmenu.cpp:618 uml.cpp:421
-msgid "Sequence Diagram..."
+#: dialogs/umltemplatedialog.cpp:138
+msgid ""
+"The template parameter name you have chosen is already being used in this "
+"operation."
 msgstr ""
 
-#: listpopupmenu.cpp:619 uml.cpp:422
-msgid "Collaboration Diagram..."
+#: dialogs/umltemplatedialog.cpp:139
+msgid "Template Name Not Unique"
 msgstr ""
 
-#: listpopupmenu.cpp:551 uml.cpp:423
-msgid "Use Case Diagram..."
+#: dialogs/notedialog.cpp:25
+msgid "Note Documentation"
 msgstr ""
 
-#: listpopupmenu.cpp:616 uml.cpp:424
-msgid "State Diagram..."
+#: dialogs/activitydialog.cpp:70
+msgid "Initial activity"
 msgstr ""
 
-#: listpopupmenu.cpp:617 uml.cpp:425
-msgid "Activity Diagram..."
+#: dialogs/activitydialog.cpp:70
+msgid "End activity"
 msgstr ""
 
-#: listpopupmenu.cpp:521 uml.cpp:426
-msgid "Component Diagram..."
+#: dialogs/activitydialog.cpp:82
+msgid "Activity type:"
 msgstr ""
 
-#: listpopupmenu.cpp:528 uml.cpp:427
-msgid "Deployment Diagram..."
+#: dialogs/activitydialog.cpp:87
+msgid "Activity name:"
 msgstr ""
 
-#: listpopupmenu.cpp:541 uml.cpp:428
-msgid "Entity Relationship Diagram..."
+#. i18n: file dialogs/exportallviewsdialogbase.ui line 90
+#: dialogs/exportallviewsdialog.cpp:51 rc.cpp:463
+#, no-c-format
+msgid "The format that the images will be exported to"
 msgstr ""
 
-#: uml.cpp:458
-msgid "&Tree View"
-msgstr "Golwg &Coeden"
-
-#: uml.cpp:467
-msgid "&Documentation"
-msgstr "&Dogfenniaeth"
-
-#: uml.cpp:479 uml.cpp:664 uml.cpp:692
-msgid "Opening file..."
-msgstr "Agor ffeil..."
-
-#: uml.cpp:650
-msgid "Creating new document..."
-msgstr "Yn creu dogfen newydd..."
-
-#: uml.cpp:673
-msgid ""
-"*.xmi *.xmi.tgz *.xmi.tar.bz2 *.mdl|All Supported Files (*.xmi, *.xmi.tgz, "
-"*.xmi.tar.bz2, *.mdl)\n"
-"*.xmi|Uncompressed XMI Files (*.xmi)\n"
-"*.xmi.tgz|Gzip Compressed XMI Files (*.xmi.tgz)\n"
-"*.xmi.tar.bz2|Bzip2 Compressed XMI Files (*.xmi.tar.bz2)\n"
-"*.mdl|Rose model files"
+#: objectwidget.cpp:90
+msgid "Rename Object"
 msgstr ""
 
-#: uml.cpp:677
-msgid "Open File"
-msgstr "Agor Ffeil"
-
-#: uml.cpp:716
-msgid "Saving file..."
-msgstr "Yn cadw ffeil..."
-
-#: uml.cpp:727
-msgid "Saving file with a new filename..."
+#: objectwidget.cpp:91
+msgid "Enter object name:"
 msgstr ""
 
-#: uml.cpp:732
+#: umlwidgetcontroller.cpp:128
 msgid ""
-"*.xmi|XMI File\n"
-"*.xmi.tgz|Gzip Compressed XMI File\n"
-"*.xmi.tar.bz2|Bzip2 Compressed XMI File\n"
-"*|All Files"
+"Hold shift or ctrl to move in X axis. Hold shift and control to move in Y axis. "
+"Right button click to cancel move."
 msgstr ""
 
-#: uml.cpp:740
+#: umlwidgetcontroller.cpp:379
 msgid ""
-"The file %1 exists.\n"
-"Do you wish to overwrite it?"
+"Hold shift or ctrl to move in X axis. Hold shift and control to move in Y axis. "
+"Right button click to cancel resize."
 msgstr ""
 
-#: uml.cpp:740
-msgid "Overwrite"
-msgstr "Trosysgrifo"
-
-#: uml.cpp:764
-msgid "Closing file..."
-msgstr "Yn cau ffeil..."
-
-#: uml.cpp:772
-msgid "Printing..."
-msgstr "Argraffu..."
-
-#: uml.cpp:779
+#: umlviewimageexportermodel.cpp:126
 #, c-format
-msgid "Print %1"
-msgstr "Argraffu %1"
-
-#: uml.cpp:787
-msgid "Exiting..."
-msgstr "Terfynu..."
-
-#: uml.cpp:823
-msgid "Cutting selection..."
-msgstr "Yn torri'r dewisiad..."
-
-#: uml.cpp:836
-msgid "Copying selection to clipboard..."
-msgstr "Yn copïo'r dewisiad i'r clipfwrdd..."
-
-#: uml.cpp:844
-msgid "Inserting clipboard contents..."
-msgstr "Yn mewnosod cynnwys y clipfwrdd..."
-
-#: uml.cpp:849
-msgid ""
-"Umbrello could not paste the clipboard contents.  The objects in the clipboard "
-"may be of the wrong type to be pasted here."
-msgstr ""
-
-#: clipboard/umlclipboard.cpp:691 uml.cpp:851
-msgid "Paste Error"
-msgstr ""
-
-#: uml.cpp:863
-msgid "Toggling toolbar..."
-msgstr "Dangos/cuddio'r bar offer..."
-
-#: uml.cpp:878
-msgid "Toggle the statusbar..."
-msgstr "Dangos/cuddio'r bar cyflwr..."
-
-#: uml.cpp:1186
-msgid "Cannot view code until you generate some first."
-msgstr ""
-
-#: uml.cpp:1186 uml.cpp:1189
-msgid "Cannot View Code"
-msgstr ""
-
-#: uml.cpp:1189
-msgid "Cannot view code from simple code writer."
-msgstr ""
-
-#: uml.cpp:1387
-msgid "*.idl|IDL Files (*.idl)"
-msgstr ""
-
-#: uml.cpp:1389
-msgid "*.py|Python Files (*.py)"
-msgstr ""
-
-#: uml.cpp:1391
-msgid "*.java|Java Files (*.java)"
-msgstr ""
-
-#: uml.cpp:1393
-msgid "*.pas|Pascal Files (*.pas)"
-msgstr ""
-
-#: uml.cpp:1395
-msgid "*.ads *.ada|Ada Files (*.ads *.ada)"
+msgid "Can not create directory: %1"
 msgstr ""
 
-#: uml.cpp:1397
-msgid "*.h *.hh *.hpp *.hxx *.H|Header Files (*.h *.hh *.hpp *.hxx *.H)"
+#: umlviewimageexportermodel.cpp:145
+msgid "Can not save an empty diagram"
 msgstr ""
 
-#: uml.cpp:1399
-msgid "All Files"
-msgstr "Pob Ffeil"
-
-#: uml.cpp:1401
-msgid "Select Code to Import"
+#: umlviewimageexportermodel.cpp:151
+#, c-format
+msgid "A problem occured while saving diagram in %1"
 msgstr ""
 
 #. i18n: file umbrelloui.rc line 5
@@ -3269,269 +3298,72 @@ msgstr ""
 msgid "Role Visibility"
 msgstr ""
 
-#: folder.cpp:289
-msgid "The folderfile %1 does not exist."
-msgstr ""
-
-#: folder.cpp:293
-msgid "The folderfile %1 cannot be opened."
-msgstr ""
-
-#: classifier.cpp:201
-msgid ""
-"An operation with the same name and signature already exists. You can not add "
-"it again."
-msgstr ""
-
-#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
-msgid "Enter Activity Name"
-msgstr ""
-
-#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
-msgid "Enter State Name"
-msgstr ""
-
-#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
-msgid "Enter the name of the new state:"
-msgstr ""
-
-#: toolbarstateother.cpp:148 umlview.cpp:2511
-msgid "new state"
-msgstr ""
-
-#: listpopupmenu.cpp:695 stereotype.cpp:76
-msgid "Stereotype"
-msgstr ""
-
-#: associationwidget.cpp:2328
-msgid "Multiplicity"
-msgstr ""
-
-#: associationwidget.cpp:2346
-msgid "Association Name"
-msgstr ""
-
-#: associationwidget.cpp:2366
-msgid "Role Name"
-msgstr ""
-
-#: umlview.cpp:297 umlview.cpp:357
-msgid "Diagram: %2 Page %1"
-msgstr ""
-
-#: umlview.cpp:2578
-#, fuzzy
-msgid "Enter Diagram Name"
-msgstr "Rhowch enw:"
-
-#: umlview.cpp:2579
-msgid "Enter the new name of the diagram:"
-msgstr ""
-
-#: umlview.cpp:2736
-msgid ""
-"You are about to delete the entire diagram.\n"
-"Are you sure?"
-msgstr ""
-
-#: umlview.cpp:2738
-msgid "Delete Diagram?"
-msgstr ""
-
-#: objectwidget.cpp:90
-msgid "Rename Object"
-msgstr ""
-
-#: objectwidget.cpp:91
-msgid "Enter object name:"
-msgstr ""
-
-#: clipboard/umlclipboard.cpp:687
-msgid ""
-"At least one of the items in the clipboard could not be pasted because an item "
-"of the same name already exists.  Any other items have been pasted."
-msgstr ""
-
-#: refactoring/refactoringassistant.cpp:289
-msgid "Add Base Class"
-msgstr ""
-
-#: refactoring/refactoringassistant.cpp:290
-msgid "Add Derived Class"
-msgstr ""
-
-#: refactoring/refactoringassistant.cpp:292
-#: refactoring/refactoringassistant.cpp:299
-#: refactoring/refactoringassistant.cpp:313
-msgid "Add Operation"
-msgstr ""
-
-#: refactoring/refactoringassistant.cpp:293
-#: refactoring/refactoringassistant.cpp:317
-msgid "Add Attribute"
-msgstr ""
-
-#: refactoring/refactoringassistant.cpp:297
-msgid "Add Base Interface"
-msgstr ""
-
-#: refactoring/refactoringassistant.cpp:298
-msgid "Add Derived Interface"
-msgstr ""
-
-#: refactoring/refactoringassistant.cpp:355
-#: refactoring/refactoringassistant.cpp:511
-msgid "Base Classifiers"
-msgstr ""
-
-#: refactoring/refactoringassistant.cpp:397
-#: refactoring/refactoringassistant.cpp:530
-msgid "Derived Classifiers"
-msgstr ""
-
-#: tips.cpp:3
-msgid ""
-"<p>Welcome to Umbrello.</p>\n"
-"<p>UML diagrams let you design and document object oriented software.  <a "
-"href=\"help:/umbrello\">The Umbrello Handbook</a> is a good introduction to "
-"using UML.</p>\n"
-msgstr ""
-
-#: tips.cpp:9
-msgid ""
-"<p>Welcome to Umbrello 1.5.  New in this version are association classes, Ruby "
-"code generation, externalizable folders, ability to change interfaces into "
-"classes, and more.</p>\n"
-msgstr ""
-
-#: tips.cpp:14
-msgid ""
-"<p>Tabbed Diagrams and Externalized Folders are mutually exclusive. If you need "
-"External Folders then deselect &quot;Use tabbed diagrams&quot; in the General "
-"Settings.</p>\n"
-msgstr ""
-
-#: tips.cpp:19
-msgid ""
-"<p>Most diagram items can not be resized, they will resize themselves to fit to "
-"their contents.\n"
-"Boxes, notes and sequence diagram messages can be resized, just click and drag "
-"on the red square.</p>\n"
-msgstr ""
-
-#: tips.cpp:25
-msgid ""
-"<p>If you want to add an already existing class to a diagram just drag its "
-"entry from the tree view.</p>\n"
-msgstr ""
-
-#: tips.cpp:30
-msgid ""
-"<p>Umbrello's refactoring agent lets you move operations between a class and "
-"its derived and base \n"
-"classes.\n"
-"Right click a class to open the refactoring agent.</p>\n"
-msgstr ""
-
-#: tips.cpp:37
-msgid ""
-"<p>Sequence diagram objects can have a destructor box and be drawn as actors.  "
-"Double click one for\n"
-"the Properties dialogue.</p>\n"
+#: association.cpp:84
+msgid "Generalization"
 msgstr ""
 
-#: tips.cpp:43
-msgid ""
-"<p>Sequence diagram messages can act as constructors.  Click on the object box "
-"(rather than the vertical line) to make it a constructor.</p>\n"
+#: association.cpp:88
+msgid "Self Association"
 msgstr ""
 
-#: tips.cpp:48
-msgid ""
-"<p>Sequence diagrams support messages to self.  Click on the same vertical line "
-"again to create an automessage.</p>\n"
+#: association.cpp:89
+msgid "Collaboration Message"
 msgstr ""
 
-#: tips.cpp:53
-msgid ""
-"<p>If on loading a foreign file nothing is displayed in the list view, try "
-"saving the model under a different name,\n"
-"closing, and reloading the saved file.  Usually the list view is then properly "
-"populated.\n"
-"</p>\n"
+#: association.cpp:90
+msgid "Sequence Message"
 msgstr ""
 
-#: tips.cpp:60
-msgid ""
-"<p>Cut and Copy will also export the image to a PNG clipboard which can be "
-"pasted into KWord\n"
-"and other applications.</p>\n"
+#: association.cpp:91
+msgid "Collaboration Self Message"
 msgstr ""
 
-#: tips.cpp:66
-msgid ""
-"<p>Associations do not have to be in straight lines, double clicking on one "
-"will create a movable point.</p>\n"
+#: association.cpp:92
+msgid "Sequence Self Message"
 msgstr ""
 
-#: tips.cpp:71
-msgid ""
-"<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
+#: association.cpp:95
+msgid "Realization"
 msgstr ""
 
-#: tips.cpp:76
-msgid ""
-"<p>Is a feature missing that you need in Umbrello? Please let us know. \n"
-"Either add it to the bugs database with Report Bug from the Help menu\n"
-"or send it to the uml-devel mailing list.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
+#: association.cpp:96
+msgid "Uni Association"
 msgstr ""
 
-#: tips.cpp:86
-msgid ""
-"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+#: statewidget.cpp:176
+msgid "Enter Activity"
 msgstr ""
 
-#: tips.cpp:91
-msgid ""
-"<p>If you've found a bug in Umbrello, please let us know. \n"
-"You can submit bugs with the Report Bug tool in the Help menu.</p>\n"
-msgstr ""
+#: codegenerators/cppcodegenerationform.cpp:36
+msgid "General Options"
+msgstr "Dewisiadau Cyffredinol"
 
-#: tips.cpp:97
-msgid ""
-"<p>Pressing the Escape key sets the current tool to the select tool.\n"
-"Backspace jumps to the previously used tool.</p>\n"
+#: codegenerators/cppcodegenerationform.cpp:38
+msgid "Package is a namespace"
 msgstr ""
 
-#: tips.cpp:103
-msgid ""
-"<p>You can select all objects by pressing Ctrl-A.</p>\n"
+#: codegenerators/cppcodegenerationform.cpp:41
+msgid "Virtual destructors"
 msgstr ""
 
-#: tips.cpp:108
-msgid ""
-"<p>You can create and setup a new class using the New Class Wizard in the Code "
-"menu.</p>\n"
+#: codegenerators/cppcodegenerationform.cpp:44
+msgid "Generate empty constructors"
 msgstr ""
 
-#: statewidget.cpp:176
-msgid "Enter Activity"
+#: codegenerators/cppcodegenerationform.cpp:47
+msgid "Generate accessor methods"
 msgstr ""
 
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-msgid "Incorrect use of associations."
+#: codegenerators/cppcodegenerationform.cpp:50
+msgid "Operations are inline"
 msgstr ""
 
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-msgid "Association Error"
+#: codegenerators/cppcodegenerationform.cpp:53
+msgid "Accessors are inline"
 msgstr ""
 
-#: operation.cpp:185
-msgid "new_parameter"
+#: codegenerators/cppcodegenerationform.cpp:57
+msgid "Accessors are public"
 msgstr ""
 
 #: listpopupmenu.cpp:231 listpopupmenu.cpp:486
@@ -3602,11 +3434,11 @@ msgid "Change State Name..."
 msgstr ""
 
 #: listpopupmenu.cpp:376
-msgid "Flip Horizontal"
+msgid "FlipQt::Horizontal"
 msgstr ""
 
 #: listpopupmenu.cpp:378
-msgid "Flip Vertical"
+msgid "FlipQt::Vertical"
 msgstr ""
 
 #: listpopupmenu.cpp:388
@@ -3835,6 +3667,175 @@ msgstr "Snapio i'r Grid"
 msgid "Show Grid"
 msgstr "Dangos Grid"
 
+#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
+msgid "Rename canceled"
+msgstr ""
+
+#: umllistviewitem.cpp:468
+msgid "Renaming an item of listview type %1 is not yet implemented."
+msgstr ""
+
+#: umllistviewitem.cpp:469
+msgid "Function Not Implemented"
+msgstr ""
+
+#: umllistviewitem.cpp:478
+msgid ""
+"The name you entered was invalid.\n"
+"Renaming process has been canceled."
+msgstr ""
+
+#: floatingtextwidget.cpp:112
+msgid "Enter operation name:"
+msgstr ""
+
+#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
+msgid "Enter role name:"
+msgstr ""
+
+#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
+msgid "Enter multiplicity:"
+msgstr ""
+
+#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
+msgid "Enter association name:"
+msgstr ""
+
+#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
+msgid "Enter new text:"
+msgstr ""
+
+#: floatingtextwidget.cpp:175
+msgid "ERROR"
+msgstr "GWALL"
+
+#: floatingtextwidget.cpp:264
+msgid "Change Text"
+msgstr "Newid y Testun"
+
+#: associationwidget.cpp:2328
+msgid "Multiplicity"
+msgstr ""
+
+#: associationwidget.cpp:2346
+msgid "Association Name"
+msgstr ""
+
+#: associationwidget.cpp:2366
+msgid "Role Name"
+msgstr ""
+
+#: main.cpp:32 main.cpp:93
+msgid "Umbrello UML Modeller"
+msgstr ""
+
+#: main.cpp:40
+msgid "File to open"
+msgstr "Ffeil i agor"
+
+#: main.cpp:41
+msgid "export diagrams to extension and exit"
+msgstr ""
+
+#: main.cpp:42
+msgid "the local directory to save the exported diagrams in"
+msgstr ""
+
+#: main.cpp:42
+msgid "the directory of the file"
+msgstr ""
+
+#: main.cpp:43
+msgid ""
+"keep the tree structure used to store the views in the document in the target "
+"directory"
+msgstr ""
+
+#: main.cpp:95
+msgid "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"
+msgstr ""
+
+#: model_utils.cpp:244
+msgid "new_actor"
+msgstr ""
+
+#: model_utils.cpp:246
+msgid "new_usecase"
+msgstr ""
+
+#: model_utils.cpp:248
+msgid "new_package"
+msgstr ""
+
+#: model_utils.cpp:250
+msgid "new_component"
+msgstr ""
+
+#: model_utils.cpp:252
+msgid "new_node"
+msgstr ""
+
+#: model_utils.cpp:254
+msgid "new_artifact"
+msgstr ""
+
+#: model_utils.cpp:256
+msgid "new_interface"
+msgstr ""
+
+#: model_utils.cpp:258
+msgid "new_datatype"
+msgstr ""
+
+#: model_utils.cpp:260
+msgid "new_enum"
+msgstr ""
+
+#: model_utils.cpp:262
+msgid "new_entity"
+msgstr ""
+
+#: model_utils.cpp:264
+#, fuzzy
+msgid "new_folder"
+msgstr "plygell"
+
+#: model_utils.cpp:268
+msgid "new_object"
+msgstr ""
+
+#: model_utils.cpp:559
+msgid "Empty"
+msgstr "Gwag"
+
+#: model_utils.cpp:559
+msgid "Malformed argument"
+msgstr ""
+
+#: model_utils.cpp:560
+msgid "Unknown argument type"
+msgstr ""
+
+#: model_utils.cpp:560
+msgid "Illegal method name"
+msgstr ""
+
+#: model_utils.cpp:561
+msgid "Unknown return type"
+msgstr ""
+
+#: model_utils.cpp:561
+msgid "Unspecified error"
+msgstr ""
+
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Incorrect use of associations."
+msgstr ""
+
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Association Error"
+msgstr ""
+
 #~ msgid "Enables/disables the toolbar"
 #~ msgstr "Galluogi/analluogi'r bar offer"
 
diff --git a/tde-i18n-cy/messages/tdetoys/amor.po b/tde-i18n-cy/messages/tdetoys/amor.po
index 035f0eb393f..2471db4bab2 100644
--- a/tde-i18n-cy/messages/tdetoys/amor.po
+++ b/tde-i18n-cy/messages/tdetoys/amor.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: amor\n"
-"POT-Creation-Date: 2005-11-30 03:24+0100\n"
+"POT-Creation-Date: 2014-09-29 00:51-0500\n"
 "PO-Revision-Date: 2005-01-28 13:57+0000\n"
 "Last-Translator: Kevin Donnelly <kevin@dotmon.com>\n"
 "Language-Team: Cymraeg\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -103,7 +104,8 @@ msgstr ""
 "ymysgogol wrth i chi fewngofnodi eto."
 
 #: tips.cpp:53
-msgid "The TDE file manager is also a web browser and an FTP client."
+#, fuzzy
+msgid "The KDE file manager is also a web browser and an FTP client."
 msgstr "Mae'r trefnydd ffeiliau TDE hefyd yn borydd gwê a dibynnydd FTP."
 
 #: tips.cpp:56
diff --git a/tde-i18n-cy/messages/tdetoys/kfifteenapplet.po b/tde-i18n-cy/messages/tdetoys/kfifteenapplet.po
index 5ba9887ad48..245979fb4e1 100644
--- a/tde-i18n-cy/messages/tdetoys/kfifteenapplet.po
+++ b/tde-i18n-cy/messages/tdetoys/kfifteenapplet.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kfifteenapplet\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:51-0500\n"
 "PO-Revision-Date: 2004-01-05 11:08+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,11 +27,11 @@ msgid ""
 "Your emails"
 msgstr "kyfieithu@dotmon.com"
 
-#: fifteenapplet.cpp:77
+#: fifteenapplet.cpp:78
 msgid "KFifteenApplet"
 msgstr "Rhaglennig KPymtheg"
 
-#: fifteenapplet.cpp:78
+#: fifteenapplet.cpp:79
 msgid ""
 "Fifteen pieces applet.\n"
 "\n"
@@ -44,15 +45,15 @@ msgstr ""
 "Dewis \"Hapio'r Darnau\" o ddewislen botwm dde y llygoden\n"
 "i gychwyn gêm."
 
-#: fifteenapplet.cpp:94
+#: fifteenapplet.cpp:96
 msgid "R&andomize Pieces"
 msgstr "&Hapio'r Darnau"
 
-#: fifteenapplet.cpp:95
+#: fifteenapplet.cpp:97
 msgid "&Reset Pieces"
 msgstr "&Ailosod y Darnau"
 
-#: fifteenapplet.cpp:221
+#: fifteenapplet.cpp:223
 msgid ""
 "Congratulations!\n"
 "You win the game!"
@@ -60,6 +61,6 @@ msgstr ""
 "Llongyfarchiadau!\n"
 "Rydych wedi ennill y gêm!"
 
-#: fifteenapplet.cpp:221
+#: fifteenapplet.cpp:223
 msgid "Fifteen Pieces"
 msgstr "Pymtheg Darn"
diff --git a/tde-i18n-cy/messages/tdetoys/kmoon.po b/tde-i18n-cy/messages/tdetoys/kmoon.po
index 45fa8b6ecf6..8230be3e79e 100644
--- a/tde-i18n-cy/messages/tdetoys/kmoon.po
+++ b/tde-i18n-cy/messages/tdetoys/kmoon.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmoon\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:51-0500\n"
 "PO-Revision-Date: 2004-07-06 17:37+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdetoys/kodo.po b/tde-i18n-cy/messages/tdetoys/kodo.po
index 735065aa9c5..9a5075933fc 100644
--- a/tde-i18n-cy/messages/tdetoys/kodo.po
+++ b/tde-i18n-cy/messages/tdetoys/kodo.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kodo\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:51-0500\n"
 "PO-Revision-Date: 2004-01-05 11:47+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,7 +28,8 @@ msgid "A mouse odometer"
 msgstr "Odomedr llygoden"
 
 #: main.cpp:77
-msgid "TDE 2 porting and some code cleanups"
+#, fuzzy
+msgid "KDE 2 porting and some code cleanups"
 msgstr "Cludiaeth i TDE2 a thipyn o lanhau'r côd"
 
 #: kodometer.cpp:33
diff --git a/tde-i18n-cy/messages/tdetoys/kteatime.po b/tde-i18n-cy/messages/tdetoys/kteatime.po
index d4f5765fccb..b0d3cd46b5a 100644
--- a/tde-i18n-cy/messages/tdetoys/kteatime.po
+++ b/tde-i18n-cy/messages/tdetoys/kteatime.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kteatime\n"
-"POT-Creation-Date: 2006-04-20 04:01+0200\n"
+"POT-Creation-Date: 2014-09-29 00:51-0500\n"
 "PO-Revision-Date: 2005-10-19 16:15+0100\n"
 "Last-Translator: Kevin Donnelly <kevin@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -55,99 +56,99 @@ msgstr "&Ffurfweddu..."
 msgid "&Anonymous..."
 msgstr "&Di-enw..."
 
-#: toplevel.cpp:297
+#: toplevel.cpp:317
 msgid "The %1 is now ready!"
 msgstr "Mae %1 yn barod nawr!"
 
-#: toplevel.cpp:308 toplevel.cpp:345 toplevel.cpp:461
+#: toplevel.cpp:328 toplevel.cpp:365 toplevel.cpp:481
 msgid "The Tea Cooker"
 msgstr "Y Tegell Te"
 
-#: toplevel.cpp:325
+#: toplevel.cpp:345
 msgid "%1 left for %2"
 msgstr "%1 wedi ei adael ar gyfer %2"
 
-#: toplevel.cpp:425
+#: toplevel.cpp:445
 msgid "There is no tea to begin steeping."
 msgstr "Nid oes te i'w drwytho."
 
-#: toplevel.cpp:425
+#: toplevel.cpp:445
 msgid "No Tea"
 msgstr "Dim Te"
 
-#: toplevel.cpp:470
+#: toplevel.cpp:490
 msgid "Anonymous Tea"
 msgstr "Te Di-enw"
 
-#: toplevel.cpp:484 toplevel.cpp:729
+#: toplevel.cpp:504 toplevel.cpp:749
 msgid "Tea time:"
 msgstr "Amser te:"
 
-#: toplevel.cpp:500
+#: toplevel.cpp:520
 msgid "tea"
 msgstr "te"
 
-#: toplevel.cpp:575
+#: toplevel.cpp:595
 msgid "New Tea"
 msgstr "Te Newydd"
 
-#: toplevel.cpp:653
+#: toplevel.cpp:673
 msgid "Configure Tea Cooker"
 msgstr "Ffurfweddu y Tegell Te"
 
-#: toplevel.cpp:665
+#: toplevel.cpp:685
 msgid "Tea List"
 msgstr "Rhestr Te"
 
-#: toplevel.cpp:669
+#: toplevel.cpp:689
 msgid "Name"
 msgstr "Enw"
 
-#: toplevel.cpp:671
+#: toplevel.cpp:691
 msgid "Time"
 msgstr "Amser"
 
-#: toplevel.cpp:681
+#: toplevel.cpp:701
 msgid "New"
 msgstr "Newydd"
 
-#: toplevel.cpp:695
+#: toplevel.cpp:715
 msgid "Up"
 msgstr "I Fyny"
 
-#: toplevel.cpp:702
+#: toplevel.cpp:722
 msgid "Down"
 msgstr "I Lawr"
 
-#: toplevel.cpp:712
+#: toplevel.cpp:732
 msgid "Tea Properties"
 msgstr "Priodweddau'r Te"
 
-#: toplevel.cpp:723
+#: toplevel.cpp:743
 msgid "Name:"
 msgstr "Enw:"
 
-#: toplevel.cpp:734
+#: toplevel.cpp:754
 msgid "Action"
 msgstr "Gweithrediad"
 
-#: toplevel.cpp:739
+#: toplevel.cpp:759
 msgid "Configure Events..."
 msgstr "Ffurfweddu Digwyddiadau..."
 
-#: toplevel.cpp:744
+#: toplevel.cpp:764
 msgid "Event"
 msgstr "Digwyddiad"
 
-#: toplevel.cpp:745
+#: toplevel.cpp:765
 msgid "Popup"
 msgstr "Naidlen"
 
-#: toplevel.cpp:755
+#: toplevel.cpp:775
 msgid "Enter command here; '%t' will be replaced with name of steeping tea"
 msgstr "Mewnosodwch y gorchymyn yma; amnewidir '%t' gan enw'r te sy'n trwytho"
 
-#: toplevel.cpp:760
+#: toplevel.cpp:780
 msgid "Visualize progress in icon tray"
 msgstr "Gweld cynnydd yng nghafn eiconau"
 
diff --git a/tde-i18n-cy/messages/tdetoys/ktux.po b/tde-i18n-cy/messages/tdetoys/ktux.po
index 3b7844b4f1e..0cd21d831aa 100644
--- a/tde-i18n-cy/messages/tdetoys/ktux.po
+++ b/tde-i18n-cy/messages/tdetoys/ktux.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ktux\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:51-0500\n"
 "PO-Revision-Date: 2004-01-05 12:57+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdetoys/kweather.po b/tde-i18n-cy/messages/tdetoys/kweather.po
index f2c7785284a..81192e9e84d 100644
--- a/tde-i18n-cy/messages/tdetoys/kweather.po
+++ b/tde-i18n-cy/messages/tdetoys/kweather.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kweather\n"
-"POT-Creation-Date: 2008-07-29 01:19+0200\n"
+"POT-Creation-Date: 2014-09-29 00:51-0500\n"
 "PO-Revision-Date: 2005-01-28 14:06+0000\n"
 "Last-Translator: Kevin Donnelly <kevin@dotmon.com>\n"
 "Language-Team: Cymraeg\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -183,7 +184,7 @@ msgid ""
 "Your emails"
 msgstr "kyfieithu@dotmon.com"
 
-#: dockwidget.cpp:105 weatherlib.cpp:177
+#: dockwidget.cpp:105 weatherlib.cpp:180
 msgid "The network is currently offline..."
 msgstr "Mae'r rhywdwaith all-lein ar hyn o bryd..."
 
@@ -348,7 +349,7 @@ msgstr "Gwasanaeth DCOP KTywydd"
 msgid "Developer"
 msgstr "Datblygiwr"
 
-#: metar_parser.cpp:163
+#: metar_parser.cpp:165
 #, c-format
 msgid ""
 "_n: 1 meter\n"
@@ -357,7 +358,7 @@ msgstr ""
 "1 medr\n"
 "%n o fedrau"
 
-#: metar_parser.cpp:168
+#: metar_parser.cpp:170
 #, c-format
 msgid ""
 "_n: 1 foot\n"
@@ -366,257 +367,257 @@ msgstr ""
 "1 droedfedd\n"
 "%n o droedfeddi"
 
-#: metar_parser.cpp:173
+#: metar_parser.cpp:175
 #, c-format
 msgid "Few clouds at %1"
 msgstr "Ambell gwmwl wrth %1"
 
-#: metar_parser.cpp:178
+#: metar_parser.cpp:180
 #, c-format
 msgid "Scattered clouds at %1"
 msgstr "Cymylau ar wasgar wrth %1"
 
-#: metar_parser.cpp:183
+#: metar_parser.cpp:185
 #, c-format
 msgid "Broken clouds at %1"
 msgstr "Cymylau toredig wrth %1"
 
-#: metar_parser.cpp:188
+#: metar_parser.cpp:190
 #, c-format
 msgid "Overcast clouds at %1"
 msgstr "Cymylau llwyd wrth %1"
 
-#: metar_parser.cpp:193
+#: metar_parser.cpp:195
 msgid "Clear skies"
 msgstr "Awyr las"
 
-#: metar_parser.cpp:219
+#: metar_parser.cpp:221
 msgid "Heavy"
 msgstr "Trwm"
 
-#: metar_parser.cpp:224
+#: metar_parser.cpp:226
 msgid "Light"
 msgstr "Ysgafn"
 
-#: metar_parser.cpp:230
+#: metar_parser.cpp:232
 msgid "Shallow"
 msgstr "Bas"
 
-#: metar_parser.cpp:232
+#: metar_parser.cpp:234
 msgid "Partial"
 msgstr "Rhannol"
 
-#: metar_parser.cpp:234
+#: metar_parser.cpp:236
 msgid "Patches"
 msgstr "Ysbeidiau"
 
-#: metar_parser.cpp:236
+#: metar_parser.cpp:238
 msgid "Low Drifting"
 msgstr "Crwydrol Isel"
 
-#: metar_parser.cpp:238
+#: metar_parser.cpp:240
 msgid "Blowing"
 msgstr "Chwythu"
 
-#: metar_parser.cpp:241
+#: metar_parser.cpp:243
 msgid "Showers"
 msgstr "Cawodau"
 
-#: metar_parser.cpp:246
+#: metar_parser.cpp:248
 msgid "Thunder Storm"
 msgstr "Storm o Daranau"
 
-#: metar_parser.cpp:251
+#: metar_parser.cpp:253
 msgid "Freezing"
 msgstr "Rhewi"
 
-#: metar_parser.cpp:257
+#: metar_parser.cpp:259
 msgid "Drizzle"
 msgstr "Glaw Man"
 
-#: metar_parser.cpp:262
+#: metar_parser.cpp:264
 msgid "Rain"
 msgstr "Glaw"
 
-#: metar_parser.cpp:267
+#: metar_parser.cpp:269
 msgid "Snow"
 msgstr "Eira"
 
-#: metar_parser.cpp:272
+#: metar_parser.cpp:274
 msgid "Snow Grains"
 msgstr "Grawn Eira"
 
-#: metar_parser.cpp:277
+#: metar_parser.cpp:279
 msgid "Ice Crystals"
 msgstr "Crisialau Iâ"
 
-#: metar_parser.cpp:282
+#: metar_parser.cpp:284
 msgid "Ice Pellets"
 msgstr "Pelenni Iâ"
 
-#: metar_parser.cpp:287
+#: metar_parser.cpp:289
 msgid "Hail"
 msgstr "Cenllysg"
 
-#: metar_parser.cpp:292
+#: metar_parser.cpp:294
 msgid "Small Hail Pellets"
 msgstr "Pelenni Bach Cenllysg"
 
-#: metar_parser.cpp:297
+#: metar_parser.cpp:299
 msgid "Unknown Precipitation"
 msgstr "Gwlybaniaeth Anhysbys"
 
-#: metar_parser.cpp:302
+#: metar_parser.cpp:304
 msgid "Mist"
 msgstr "Niwlen"
 
-#: metar_parser.cpp:311
+#: metar_parser.cpp:313
 msgid "Fog"
 msgstr "Niwl"
 
-#: metar_parser.cpp:319
+#: metar_parser.cpp:321
 msgid "Smoke"
 msgstr "Mwg"
 
-#: metar_parser.cpp:321
+#: metar_parser.cpp:323
 msgid "Volcanic Ash"
 msgstr "Lludw Folcanig"
 
-#: metar_parser.cpp:323
+#: metar_parser.cpp:325
 msgid "Widespread Dust"
 msgstr "Llwch Eang"
 
-#: metar_parser.cpp:325
+#: metar_parser.cpp:327
 msgid "Sand"
 msgstr "Tywod"
 
-#: metar_parser.cpp:327
+#: metar_parser.cpp:329
 msgid "Haze"
 msgstr "Tawch"
 
-#: metar_parser.cpp:329
+#: metar_parser.cpp:331
 msgid "Spray"
 msgstr "Chwistrell"
 
-#: metar_parser.cpp:331
+#: metar_parser.cpp:333
 msgid "Dust/Sand Swirls"
 msgstr "Chwyrliadau Llwch/Tywod"
 
-#: metar_parser.cpp:333
+#: metar_parser.cpp:335
 msgid "Sudden Winds"
 msgstr "Gwyntoedd Sydyn"
 
-#: metar_parser.cpp:337
+#: metar_parser.cpp:339
 msgid "Tornado"
 msgstr "Corwynt"
 
-#: metar_parser.cpp:339
+#: metar_parser.cpp:341
 msgid "Funnel Cloud"
 msgstr "Cwmwl Tynffedol"
 
-#: metar_parser.cpp:342
+#: metar_parser.cpp:344
 msgid "Sand Storm"
 msgstr "Storm Dywod"
 
-#: metar_parser.cpp:344
+#: metar_parser.cpp:346
 msgid "Dust Storm"
 msgstr "Sotrm Lwch"
 
-#: metar_parser.cpp:346
+#: metar_parser.cpp:348
 msgid ""
 "_: %1 is the intensity, %2 is the descriptor and %3 is the phenomena\n"
 "%1 %2 %3"
 msgstr "%3 - %2 - %1"
 
-#: metar_parser.cpp:438 metar_parser.cpp:807
+#: metar_parser.cpp:440 metar_parser.cpp:809
 msgid "°C"
 msgstr "°C"
 
-#: metar_parser.cpp:446 metar_parser.cpp:813
+#: metar_parser.cpp:448 metar_parser.cpp:815
 msgid "°F"
 msgstr "°F"
 
-#: metar_parser.cpp:544
+#: metar_parser.cpp:546
 msgid "km"
 msgstr "km"
 
-#: metar_parser.cpp:549
+#: metar_parser.cpp:551
 msgid "m"
 msgstr "m"
 
-#: metar_parser.cpp:575
+#: metar_parser.cpp:577
 msgid " hPa"
 msgstr " hPa"
 
-#: metar_parser.cpp:584
+#: metar_parser.cpp:586
 msgid "\" Hg"
 msgstr "\" Hg"
 
-#: metar_parser.cpp:599 metar_parser.cpp:615 metar_parser.cpp:616
+#: metar_parser.cpp:601 metar_parser.cpp:617 metar_parser.cpp:618
 msgid "N"
 msgstr "Gogledd"
 
-#: metar_parser.cpp:600
+#: metar_parser.cpp:602
 msgid "NNE"
 msgstr "Gogledd - Gogledd Ddwyrain"
 
-#: metar_parser.cpp:601
+#: metar_parser.cpp:603
 msgid "NE"
 msgstr "Gogledd Ddwyrain"
 
-#: metar_parser.cpp:602
+#: metar_parser.cpp:604
 msgid "ENE"
 msgstr "Dwyrain - Gogledd Ddwyrain"
 
-#: metar_parser.cpp:603
+#: metar_parser.cpp:605
 msgid "E"
 msgstr "Dwyrain"
 
-#: metar_parser.cpp:604
+#: metar_parser.cpp:606
 msgid "ESE"
 msgstr "Dwyrain - De Ddwyrain"
 
-#: metar_parser.cpp:605
+#: metar_parser.cpp:607
 msgid "SE"
 msgstr "De Ddwyrain"
 
-#: metar_parser.cpp:606
+#: metar_parser.cpp:608
 msgid "SSE"
 msgstr "De - De Ddwyrain"
 
-#: metar_parser.cpp:607
+#: metar_parser.cpp:609
 msgid "S"
 msgstr "De"
 
-#: metar_parser.cpp:608
+#: metar_parser.cpp:610
 msgid "SSW"
 msgstr "De - De Orllewin"
 
-#: metar_parser.cpp:609
+#: metar_parser.cpp:611
 msgid "SW"
 msgstr "De Orllewin"
 
-#: metar_parser.cpp:610
+#: metar_parser.cpp:612
 msgid "WSW"
 msgstr "Gorllewin - De Orllewin"
 
-#: metar_parser.cpp:611
+#: metar_parser.cpp:613
 msgid "W"
 msgstr "Gorllewin"
 
-#: metar_parser.cpp:612
+#: metar_parser.cpp:614
 msgid "WNW"
 msgstr "Gorllewin - Gogledd Orllewin"
 
-#: metar_parser.cpp:613
+#: metar_parser.cpp:615
 msgid "NW"
 msgstr "Gogledd Orllewin"
 
-#: metar_parser.cpp:614
+#: metar_parser.cpp:616
 msgid "NNW"
 msgstr "Gogledd - Gogledd Orllewin"
 
-#: metar_parser.cpp:662
+#: metar_parser.cpp:664
 #, c-format
 msgid ""
 "_n: 1 km/h\n"
@@ -625,7 +626,7 @@ msgstr ""
 "1 km/awr\n"
 "%n km/awr"
 
-#: metar_parser.cpp:682
+#: metar_parser.cpp:684
 #, c-format
 msgid ""
 "_n: 1 MPH\n"
@@ -634,7 +635,7 @@ msgstr ""
 "1 MPH\n"
 "%n MPH"
 
-#: metar_parser.cpp:690
+#: metar_parser.cpp:692
 #, c-format
 msgid ""
 "_n: Wind gusts up to 1 km/h\n"
@@ -643,7 +644,7 @@ msgstr ""
 "Chwythymau o wynt i fyny at 1 km/awr\n"
 "Chwythymau o wynt i fyny at %n km/awr"
 
-#: metar_parser.cpp:695
+#: metar_parser.cpp:697
 #, c-format
 msgid ""
 "_n: Wind gusts up to 1 MPH\n"
@@ -652,7 +653,7 @@ msgstr ""
 "Chwythymau o wynt i fyny at 1 MPH\n"
 "Chwythymau o wynt i fyny at %n MPH"
 
-#: metar_parser.cpp:824 metar_parser.cpp:825 stationdatabase.cpp:84
+#: metar_parser.cpp:826 metar_parser.cpp:827 stationdatabase.cpp:84
 #: stationdatabase.cpp:106 stationdatabase.cpp:128 stationdatabase.cpp:150
 #: weatherservice.cpp:288 weatherservice.cpp:289 weatherservice.cpp:291
 msgid "Unknown Station"
@@ -689,28 +690,28 @@ msgstr "Wedi'i ddiweddaru ar %1"
 msgid "Sidebar Weather Report"
 msgstr "Adroddiad Tywydd mewn Bar Ochr"
 
-#: weatherlib.cpp:146 weatherlib.cpp:155 weatherlib.cpp:168
+#: weatherlib.cpp:149 weatherlib.cpp:158 weatherlib.cpp:171
 msgid "KWeather Error!"
 msgstr "Gwall KTywydd!"
 
-#: weatherlib.cpp:147
+#: weatherlib.cpp:150
 msgid "The temp file %1 was empty."
 msgstr "Roedd y ffeil dros-dro %1 yn wag."
 
-#: weatherlib.cpp:156
+#: weatherlib.cpp:159
 #, c-format
 msgid "Could not read the temp file %1."
 msgstr "Methu darllen y ffeil dros-dro %1."
 
-#: weatherlib.cpp:169
+#: weatherlib.cpp:172
 msgid "The requested station does not exist."
 msgstr "Nid yw'r orsaf benodol mewn bod."
 
-#: weatherlib.cpp:178
+#: weatherlib.cpp:181
 msgid "Please update later."
 msgstr "Diweddarwch yn hwyrach ymlaen."
 
-#: weatherlib.cpp:225
+#: weatherlib.cpp:228
 msgid "Retrieving weather data..."
 msgstr "Nôl data tywydd..."
 
diff --git a/tde-i18n-cy/messages/tdetoys/kworldclock.po b/tde-i18n-cy/messages/tdetoys/kworldclock.po
index 640f5f4f210..ccfce01adf2 100644
--- a/tde-i18n-cy/messages/tdetoys/kworldclock.po
+++ b/tde-i18n-cy/messages/tdetoys/kworldclock.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kworldclock\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:51-0500\n"
 "PO-Revision-Date: 2005-01-28 14:07+0000\n"
 "Last-Translator: Kevin Donnelly <kevin@dotmon.com>\n"
 "Language-Team: Cymraeg\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -88,67 +89,67 @@ msgstr "Enw'r ffeil i ysgrifennu ato"
 msgid "The size of the map to dump"
 msgstr "Maint y map i'w domenu"
 
-#: mapwidget.cpp:88
+#: mapwidget.cpp:91
 msgid "Add &Red"
 msgstr "Ychwanegu &Coch"
 
-#: mapwidget.cpp:91
+#: mapwidget.cpp:94
 msgid "Add &Green"
 msgstr "Ychwanegu &Gwyrdd"
 
-#: mapwidget.cpp:94
+#: mapwidget.cpp:97
 msgid "Add &Blue"
 msgstr "Ychwanegu G&las"
 
-#: mapwidget.cpp:96
+#: mapwidget.cpp:99
 msgid "Add &Custom..."
 msgstr "Ychwanegu &Addasiedig..."
 
-#: mapwidget.cpp:99
+#: mapwidget.cpp:102
 msgid "&Remove Flag"
 msgstr "Gwaredu &Baner"
 
-#: mapwidget.cpp:100
+#: mapwidget.cpp:103
 msgid "&Remove All Flags"
 msgstr "Gwaredu &Pob Baner"
 
-#: mapwidget.cpp:114 zoneclock.cpp:70
+#: mapwidget.cpp:117 zoneclock.cpp:73
 msgid "&Add..."
 msgstr "&Ychwanegu..."
 
-#: mapwidget.cpp:117
+#: mapwidget.cpp:120
 msgid "&Flags"
 msgstr "&Baneri"
 
-#: mapwidget.cpp:120
+#: mapwidget.cpp:123
 msgid "&Clocks"
 msgstr "&Clociau"
 
-#: mapwidget.cpp:123
+#: mapwidget.cpp:126
 msgid "&Map Theme"
 msgstr "Tema'r &Map"
 
-#: mapwidget.cpp:124
+#: mapwidget.cpp:127
 msgid "Show &Daylight"
 msgstr "Dangos &Golau Dydd"
 
-#: mapwidget.cpp:125
+#: mapwidget.cpp:128
 msgid "Show &Cities"
 msgstr "Dangos &Dinasoedd"
 
-#: mapwidget.cpp:126
+#: mapwidget.cpp:129
 msgid "Show F&lags"
 msgstr "Dangos B&aneri"
 
-#: mapwidget.cpp:131
+#: mapwidget.cpp:134
 msgid "&Save Settings"
 msgstr "&Cadw Gosodiadau"
 
-#: mapwidget.cpp:265
+#: mapwidget.cpp:268
 msgid "Do you really want to remove all flags?"
 msgstr "Ydych wir eisiau gwaredu pob baner?"
 
-#: zoneclock.cpp:69
+#: zoneclock.cpp:72
 msgid "&Edit..."
 msgstr "&Golygu..."
 
diff --git a/tde-i18n-cy/messages/tdeutils/ark.po b/tde-i18n-cy/messages/tdeutils/ark.po
index 6a1e52cc4d9..df42446c84b 100644
--- a/tde-i18n-cy/messages/tdeutils/ark.po
+++ b/tde-i18n-cy/messages/tdeutils/ark.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdeutils/ark.po\n"
-"POT-Creation-Date: 2007-11-07 01:15+0100\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -22,35 +23,48 @@ msgid ""
 msgstr "kyfieithu@dotmon.com"
 
 #: ace.cpp:104 ace.cpp:170 ar.cpp:102 ar.cpp:121 ar.cpp:165 ar.cpp:222
-#: ar.cpp:255 compressedfile.cpp:202 compressedfile.cpp:313 lha.cpp:156
-#: lha.cpp:226 lha.cpp:267 lha.cpp:297 rar.cpp:133 rar.cpp:208 rar.cpp:265
-#: rar.cpp:301 sevenzip.cpp:112 sevenzip.cpp:151 sevenzip.cpp:191
-#: sevenzip.cpp:239 tar.cpp:272 tar.cpp:560 tar.cpp:639 tar.cpp:683
-#: zip.cpp:105 zip.cpp:177 zip.cpp:236 zip.cpp:272 zoo.cpp:122 zoo.cpp:189
-#: zoo.cpp:248 zoo.cpp:279
+#: ar.cpp:255 arj.cpp:134 arj.cpp:202 arj.cpp:258 arj.cpp:294 arj.cpp:322
+#: compressedfile.cpp:214 compressedfile.cpp:325 lha.cpp:158 lha.cpp:228
+#: lha.cpp:269 lha.cpp:299 rar.cpp:162 rar.cpp:246 rar.cpp:303 rar.cpp:339
+#: rar.cpp:367 sevenzip.cpp:114 sevenzip.cpp:162 sevenzip.cpp:207
+#: sevenzip.cpp:261 sevenzip.cpp:417 tar.cpp:284 tar.cpp:575 tar.cpp:654
+#: tar.cpp:698 tar.cpp:820 zip.cpp:106 zip.cpp:184 zip.cpp:243 zip.cpp:280
+#: zip.cpp:308 zoo.cpp:122 zoo.cpp:189 zoo.cpp:248 zoo.cpp:279
 msgid "Could not start a subprocess."
 msgstr ""
 
-#: arch.cpp:132
-msgid "The deletion operation failed."
+#: arch.cpp:113 arch.cpp:188 arch.cpp:413
+msgid "The password was incorrect. "
 msgstr ""
 
-#: arch.cpp:161
-msgid "The password was incorrect. "
+#: arch.cpp:114
+msgid "You must enter a password to open the file:"
+msgstr ""
+
+#: arch.cpp:159
+msgid "The deletion operation failed."
 msgstr ""
 
-#: arch.cpp:162
+#: arch.cpp:189 arch.cpp:414
 msgid "You must enter a password to extract the file:"
 msgstr ""
 
-#: arch.cpp:180
+#: arch.cpp:207
 msgid "The extraction operation failed."
 msgstr ""
 
-#: arch.cpp:218
+#: arch.cpp:245
 msgid "The addition operation failed."
 msgstr ""
 
+#: arch.cpp:400
+msgid "Not implemented."
+msgstr ""
+
+#: arch.cpp:432
+msgid "The test operation failed."
+msgstr ""
+
 #: archiveformatdlg.cpp:33
 msgid "Choose Archive Format"
 msgstr ""
@@ -70,19 +84,26 @@ msgid ""
 "If this is not correct, please choose the appropriate format."
 msgstr ""
 
-#: archiveformatinfo.cpp:70
+#: archiveformatinfo.cpp:75
 msgid "Compressed File"
 msgstr ""
 
-#: archiveformatinfo.cpp:114
+#: archiveformatinfo.cpp:121
 msgid ""
 "All Valid Archives\n"
 msgstr ""
 
-#: archiveformatinfo.cpp:115
+#: archiveformatinfo.cpp:122
 msgid "All Files"
 msgstr "Pob Ffeil"
 
+#: arj.cpp:82 rar.cpp:192 sevenzip.cpp:128 zip.cpp:121
+msgid ""
+"Warning!\n"
+"Using KGpg for encryption is more secure.\n"
+"Cancel this dialog or enter password for %1 archiver:"
+msgstr ""
+
 #: ark_part.cpp:47
 msgid "ark"
 msgstr "ark"
@@ -125,45 +146,49 @@ msgstr "&Agor Gyda..."
 msgid "Edit &With..."
 msgstr ""
 
-#: ark_part.cpp:144
+#: ark_part.cpp:142
+msgid "&Test integrity"
+msgstr ""
+
+#: ark_part.cpp:147
 msgid "&Unselect All"
 msgstr "&Dad-ddewis Popeth"
 
-#: ark_part.cpp:146
+#: ark_part.cpp:149
 msgid "&Invert Selection"
 msgstr "&Gwrthdroi Dewisiad"
 
-#: ark_part.cpp:152
+#: ark_part.cpp:155
 msgid "Configure &Ark..."
 msgstr ""
 
-#: ark_part.cpp:156
+#: ark_part.cpp:159
 msgid "Show Search Bar"
 msgstr ""
 
-#: ark_part.cpp:157
+#: ark_part.cpp:160
 msgid "Hide Search Bar"
 msgstr ""
 
-#: ark_part.cpp:296
+#: ark_part.cpp:302
 msgid ""
 "The archive \"%1\" has been modified.\n"
 "Do you want to save it?"
 msgstr ""
 
-#: ark_part.cpp:298
+#: ark_part.cpp:304
 msgid "Save Archive?"
 msgstr ""
 
-#: ark_part.cpp:323
+#: ark_part.cpp:329
 msgid "Downloading %1..."
 msgstr "Lawrlwytho %1 ..."
 
-#: ark_part.cpp:415
+#: ark_part.cpp:421
 msgid "Total: 0 files"
 msgstr ""
 
-#: ark_part.cpp:420 arkwidget.cpp:1808
+#: ark_part.cpp:426 arkwidget.cpp:1839
 msgid "0 files selected"
 msgstr ""
 
@@ -190,92 +215,92 @@ msgstr ""
 msgid "Run Nevertheless"
 msgstr ""
 
-#: arkwidget.cpp:132
+#: arkwidget.cpp:133
 msgid "&Search:"
 msgstr "&Chwilio:"
 
-#: arkwidget.cpp:198
+#: arkwidget.cpp:201
 msgid ""
 "_n: %n file  %1\n"
 "%n files  %1"
 msgstr ""
 
-#: arkwidget.cpp:273
+#: arkwidget.cpp:276
 msgid "Save Archive As"
 msgstr ""
 
-#: arkwidget.cpp:278
+#: arkwidget.cpp:281
 msgid ""
 "Please save your archive in the same format as the original.\n"
 "Hint: Use one of the suggested extensions."
 msgstr ""
 
-#: arkwidget.cpp:296
+#: arkwidget.cpp:299
 msgid "Saving..."
 msgstr "Cadw..."
 
-#: arkwidget.cpp:431
+#: arkwidget.cpp:434
 #, c-format
 msgid "Could not create the folder %1"
 msgstr ""
 
-#: arkwidget.cpp:467
+#: arkwidget.cpp:470
 #, c-format
 msgid "An error occurred while opening the archive %1."
 msgstr ""
 
-#: arkwidget.cpp:498 arkwidget.cpp:1378
+#: arkwidget.cpp:501 arkwidget.cpp:1390
 msgid ""
 "The following files will not be extracted\n"
 "because they already exist:"
 msgstr ""
 
-#: arkwidget.cpp:513
+#: arkwidget.cpp:516
 msgid "Not enough free disc space to extract the archive."
 msgstr ""
 
-#: arkwidget.cpp:529
+#: arkwidget.cpp:532
 msgid "An error occurred while extracting the archive."
 msgstr ""
 
-#: arkwidget.cpp:669
+#: arkwidget.cpp:676
 msgid "An error occurred while adding the files to the archive."
 msgstr ""
 
-#: arkwidget.cpp:708
+#: arkwidget.cpp:715
 msgid "The archive %1 does not exist."
 msgstr ""
 
-#: arkwidget.cpp:714
+#: arkwidget.cpp:721
 msgid "You do not have permission to access that archive."
 msgstr ""
 
-#: arkwidget.cpp:795
+#: arkwidget.cpp:805
 msgid "Archive already exists. Do you wish to overwrite it?"
 msgstr ""
 
-#: arkwidget.cpp:796
+#: arkwidget.cpp:806
 msgid "Archive Already Exists"
 msgstr ""
 
-#: arkwidget.cpp:796
+#: arkwidget.cpp:806
 msgid "Overwrite"
 msgstr "Trosysgrifo"
 
-#: arkwidget.cpp:796
+#: arkwidget.cpp:806
 msgid "Do Not Overwrite"
 msgstr "Peidio â Throsysgrifo"
 
-#: arkwidget.cpp:816
+#: arkwidget.cpp:826
 #, c-format
 msgid "You do not have permission to write to the directory %1"
 msgstr ""
 
-#: arkwidget.cpp:829 arkwidget.cpp:979
+#: arkwidget.cpp:839 arkwidget.cpp:989
 msgid "Create New Archive"
 msgstr ""
 
-#: arkwidget.cpp:976
+#: arkwidget.cpp:986
 msgid ""
 "You are currently working with a simple compressed file.\n"
 "Would you like to make it into an archive so that it can contain multiple "
@@ -283,178 +308,187 @@ msgid ""
 "If so, you must choose a name for your new archive."
 msgstr ""
 
-#: arkwidget.cpp:976
+#: arkwidget.cpp:986
 msgid "Make Into Archive"
 msgstr ""
 
-#: arkwidget.cpp:976
+#: arkwidget.cpp:986
 msgid "Do Not Make"
 msgstr ""
 
-#: arkwidget.cpp:991 arkwidget.cpp:2064
+#: arkwidget.cpp:1001 arkwidget.cpp:2095
 msgid "Creating archive..."
 msgstr ""
 
-#: arkwidget.cpp:1094
+#: arkwidget.cpp:1104
 msgid "Select Files to Add"
 msgstr ""
 
-#: arkwidget.cpp:1133
+#: arkwidget.cpp:1143
 msgid "Adding files..."
 msgstr ""
 
-#: arkwidget.cpp:1152
+#: arkwidget.cpp:1162
 msgid "Select Folder to Add"
 msgstr ""
 
-#: arkwidget.cpp:1157
+#: arkwidget.cpp:1167
 msgid "Adding folder..."
 msgstr ""
 
-#: arkwidget.cpp:1249
+#: arkwidget.cpp:1261
 msgid "Do you really want to delete the selected items?"
 msgstr ""
 
-#: arkwidget.cpp:1270
+#: arkwidget.cpp:1282
 msgid "Removing..."
 msgstr ""
 
-#: arkwidget.cpp:1317
+#: arkwidget.cpp:1329
 msgid "Open with:"
 msgstr "Agor Efo:"
 
-#: arkwidget.cpp:1432
+#: arkwidget.cpp:1444
 msgid "The archive to extract from no longer exists."
 msgstr ""
 
-#: arkwidget.cpp:1514 arkwidget.cpp:1541 arkwidget.cpp:1575 mainwindow.cpp:399
+#: arkwidget.cpp:1526 arkwidget.cpp:1553 arkwidget.cpp:1587 mainwindow.cpp:399
 msgid "Extracting..."
 msgstr ""
 
-#: arkwidget.cpp:1603
+#: arkwidget.cpp:1615
 msgid "Edit with:"
 msgstr ""
 
-#: arkwidget.cpp:1614
+#: arkwidget.cpp:1626
 msgid "Trouble editing the file..."
 msgstr ""
 
-#: arkwidget.cpp:1654
+#: arkwidget.cpp:1666
 msgid "Readding edited file..."
 msgstr ""
 
-#: arkwidget.cpp:1673
+#: arkwidget.cpp:1685
 msgid "Extracting file to view"
 msgstr ""
 
-#: arkwidget.cpp:1691
+#: arkwidget.cpp:1694
+#, fuzzy
+msgid "Testing..."
+msgstr "Cadw..."
+
+#: arkwidget.cpp:1705
+msgid "Test successful."
+msgstr ""
+
+#: arkwidget.cpp:1722
 msgid ""
 "The internal viewer is not able to display this file. Would you like to view it "
 "using an external program?"
 msgstr ""
 
-#: arkwidget.cpp:1692
+#: arkwidget.cpp:1723
 msgid "View Externally"
 msgstr ""
 
-#: arkwidget.cpp:1692
+#: arkwidget.cpp:1723
 msgid "Do Not View"
 msgstr ""
 
-#: arkwidget.cpp:1812
+#: arkwidget.cpp:1843
 msgid "%1 files selected  %2"
 msgstr ""
 
-#: arkwidget.cpp:1818
+#: arkwidget.cpp:1849
 #, c-format
 msgid "1 file selected  %2"
 msgstr ""
 
-#: arkwidget.cpp:1891
+#: arkwidget.cpp:1922
 msgid ""
 "Do you wish to add this to the current archive or open it as a new archive?"
 msgstr ""
 
-#: arkwidget.cpp:1893
+#: arkwidget.cpp:1924
 msgid "&Add"
 msgstr "&Ychwanegu"
 
-#: arkwidget.cpp:1893
+#: arkwidget.cpp:1924
 msgid "&Open"
 msgstr "A&gor"
 
-#: arkwidget.cpp:1948
+#: arkwidget.cpp:1979
 msgid ""
 "There is no archive currently open. Do you wish to create one now for these "
 "files?"
 msgstr ""
 
-#: arkwidget.cpp:1949
+#: arkwidget.cpp:1980
 msgid ""
 "There is no archive currently open. Do you wish to create one now for this "
 "file?"
 msgstr ""
 
-#: arkwidget.cpp:1950
+#: arkwidget.cpp:1981
 msgid "Create Archive"
 msgstr ""
 
-#: arkwidget.cpp:1950 extractiondialog.cpp:149
+#: arkwidget.cpp:1981 extractiondialog.cpp:149
 msgid "Do Not Create"
 msgstr ""
 
-#: arkwidget.cpp:2033 arkwidget.cpp:2146
+#: arkwidget.cpp:2064 arkwidget.cpp:2178
 msgid "Unknown archive format or corrupted archive"
 msgstr ""
 
-#: arkwidget.cpp:2040 arkwidget.cpp:2152
+#: arkwidget.cpp:2071 arkwidget.cpp:2184
 msgid ""
 "The utility %1 is not in your PATH.\n"
 "Please install it or contact your system administrator."
 msgstr ""
 
-#: arkwidget.cpp:2101
+#: arkwidget.cpp:2133
 msgid "An error occurred while trying to create the archive."
 msgstr ""
 
-#: arkwidget.cpp:2165
+#: arkwidget.cpp:2197
 msgid "Opening the archive..."
 msgstr ""
 
-#: arkwidget.cpp:2189
+#: arkwidget.cpp:2222
 msgid ""
 "This archive is read-only. If you want to save it under a new name, go to the "
 "File menu and select Save As."
 msgstr ""
 
-#: arkwidget.cpp:2207
+#: arkwidget.cpp:2240
 #, c-format
 msgid "An error occurred while trying to open the archive %1"
 msgstr ""
 
 #. i18n: file general.ui line 16
-#: arkwidget.cpp:2242 rc.cpp:60
+#: arkwidget.cpp:2275 rc.cpp:63
 #, no-c-format
 msgid "General"
 msgstr "Cyffredinol"
 
-#: arkwidget.cpp:2242
+#: arkwidget.cpp:2275
 msgid "General Settings"
 msgstr "Gosodiadau Cyffredinol"
 
-#: arkwidget.cpp:2243
+#: arkwidget.cpp:2276
 msgid "Addition"
 msgstr "Adio"
 
-#: arkwidget.cpp:2243
+#: arkwidget.cpp:2276
 msgid "File Addition Settings"
 msgstr ""
 
-#: arkwidget.cpp:2244
+#: arkwidget.cpp:2277
 msgid "Extraction"
 msgstr ""
 
-#: arkwidget.cpp:2244
+#: arkwidget.cpp:2277
 msgid "Extraction Settings"
 msgstr ""
 
@@ -568,8 +602,8 @@ msgstr ""
 msgid "Keep entries &generic (Lha)"
 msgstr ""
 
-#. i18n: file addition.ui line 32
-#: common_texts.cpp:27 rc.cpp:33
+#. i18n: file addition.ui line 41
+#: common_texts.cpp:27 rc.cpp:36
 #, no-c-format
 msgid "Force &MS-DOS short filenames (Zip)"
 msgstr ""
@@ -578,32 +612,32 @@ msgstr ""
 msgid "Translate LF to DOS &CRLF (Zip)"
 msgstr ""
 
-#. i18n: file addition.ui line 56
-#: common_texts.cpp:29 rc.cpp:42
+#. i18n: file addition.ui line 65
+#: common_texts.cpp:29 rc.cpp:45
 #, no-c-format
 msgid "&Recursively add subfolders (Zip, Rar)"
 msgstr ""
 
-#. i18n: file addition.ui line 48
-#: common_texts.cpp:30 rc.cpp:39
+#. i18n: file addition.ui line 57
+#: common_texts.cpp:30 rc.cpp:42
 #, no-c-format
 msgid "&Store symlinks as links (Zip, Rar)"
 msgstr ""
 
 #. i18n: file extraction.ui line 24
-#: common_texts.cpp:31 rc.cpp:45
+#: common_texts.cpp:31 rc.cpp:48
 #, no-c-format
 msgid "O&verwrite files (Zip, Tar, Zoo, Rar)"
 msgstr ""
 
 #. i18n: file extraction.ui line 32
-#: common_texts.cpp:32 rc.cpp:48
+#: common_texts.cpp:32 rc.cpp:51
 #, no-c-format
 msgid "&Preserve permissions (Tar)"
 msgstr ""
 
 #. i18n: file extraction.ui line 40
-#: common_texts.cpp:33 rc.cpp:51
+#: common_texts.cpp:33 rc.cpp:54
 #, no-c-format
 msgid "&Ignore folder names (Zip)"
 msgstr ""
@@ -629,7 +663,7 @@ msgstr ""
 msgid "Simple Compressed Archive"
 msgstr ""
 
-#: compressedfile.cpp:328 tar.cpp:176 tar.cpp:192
+#: compressedfile.cpp:340 tar.cpp:176 tar.cpp:192
 msgid "Trouble writing to the archive..."
 msgstr ""
 
@@ -663,8 +697,8 @@ msgstr ""
 msgid "Destination folder: "
 msgstr "Plygell cyrchfan: "
 
-#. i18n: file ark.kcfg line 82
-#: extractiondialog.cpp:122 rc.cpp:135
+#. i18n: file ark.kcfg line 87
+#: extractiondialog.cpp:122 rc.cpp:144
 #, no-c-format
 msgid "Open destination folder after extraction"
 msgstr ""
@@ -804,50 +838,56 @@ msgstr ""
 msgid "Please Wait"
 msgstr "Disgwyliwch"
 
-#. i18n: file ark_part.rc line 16
+#. i18n: file ark_part.rc line 18
 #: rc.cpp:9 rc.cpp:21
 #, no-c-format
 msgid "&Action"
 msgstr "&Gweithred"
 
-#. i18n: file addition.ui line 24
+#. i18n: file addition.ui line 25
 #: rc.cpp:30
 #, no-c-format
+msgid "Ask for &password when create archive if possible"
+msgstr ""
+
+#. i18n: file addition.ui line 33
+#: rc.cpp:33
+#, no-c-format
 msgid "Replace old files only &with newer files"
 msgstr ""
 
-#. i18n: file addition.ui line 40
-#: rc.cpp:36
+#. i18n: file addition.ui line 49
+#: rc.cpp:39
 #, no-c-format
 msgid "Translate &LF to DOS CRLF (Zip)"
 msgstr ""
 
 #. i18n: file extraction.ui line 48
-#: rc.cpp:54
+#: rc.cpp:57
 #, no-c-format
 msgid "Convert file names to &lowercase (Zip, Rar)"
 msgstr ""
 
 #. i18n: file extraction.ui line 56
-#: rc.cpp:57
+#: rc.cpp:60
 #, no-c-format
 msgid "Convert file names to &uppercase (Rar)"
 msgstr ""
 
 #. i18n: file general.ui line 27
-#: rc.cpp:63
+#: rc.cpp:66
 #, no-c-format
 msgid "&Use integrated viewer"
 msgstr ""
 
 #. i18n: file general.ui line 35
-#: rc.cpp:66
+#: rc.cpp:69
 #, no-c-format
 msgid "&Enable Konqueror integration"
 msgstr ""
 
 #. i18n: file general.ui line 68
-#: rc.cpp:69
+#: rc.cpp:72
 #, no-c-format
 msgid ""
 "<font size=\"-1\"><i>Konqueror integration is only available if you install the "
@@ -855,19 +895,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ark.kcfg line 9
-#: rc.cpp:72
+#: rc.cpp:75
 #, no-c-format
 msgid "Last folders used for extraction"
 msgstr ""
 
 #. i18n: file ark.kcfg line 12
-#: rc.cpp:75
+#: rc.cpp:78
 #, no-c-format
 msgid "Replace old files only with newer files"
 msgstr ""
 
 #. i18n: file ark.kcfg line 13
-#: rc.cpp:78
+#: rc.cpp:81
 #, no-c-format
 msgid ""
 "If this option is enabled and you add filenames that already exist in an "
@@ -875,27 +915,33 @@ msgid ""
 msgstr ""
 
 #. i18n: file ark.kcfg line 17
-#: rc.cpp:81
+#: rc.cpp:84
 #, no-c-format
 msgid "Overwrite files (Zip, Tar, Zoo, Rar)"
 msgstr ""
 
 #. i18n: file ark.kcfg line 18
-#: rc.cpp:84
+#: rc.cpp:87
 #, no-c-format
 msgid ""
 "Overwrite any files that have matching names on disk with the one from the "
 "archive"
 msgstr ""
 
-#. i18n: file ark.kcfg line 24
-#: rc.cpp:87
+#. i18n: file ark.kcfg line 22
+#: rc.cpp:90 rc.cpp:93
+#, no-c-format
+msgid "Ask for password when create archive if possible"
+msgstr ""
+
+#. i18n: file ark.kcfg line 29
+#: rc.cpp:96
 #, no-c-format
 msgid "Preserve permissions"
 msgstr ""
 
-#. i18n: file ark.kcfg line 25
-#: rc.cpp:90
+#. i18n: file ark.kcfg line 30
+#: rc.cpp:99
 #, no-c-format
 msgid ""
 "Save the user, group, and permission settings on files. Use with care, as this "
@@ -903,76 +949,76 @@ msgid ""
 "your computer"
 msgstr ""
 
-#. i18n: file ark.kcfg line 31
-#: rc.cpp:93
+#. i18n: file ark.kcfg line 36
+#: rc.cpp:102
 #, no-c-format
 msgid "Force MS-DOS short filenames (Zip)"
 msgstr ""
 
-#. i18n: file ark.kcfg line 32
-#: rc.cpp:96
+#. i18n: file ark.kcfg line 37
+#: rc.cpp:105
 #, no-c-format
 msgid "Force names of files in Zip archives to the DOS 8.3 format"
 msgstr ""
 
-#. i18n: file ark.kcfg line 36
-#: rc.cpp:99
+#. i18n: file ark.kcfg line 41
+#: rc.cpp:108
 #, no-c-format
 msgid "Translate LF to DOS CRLF"
 msgstr ""
 
-#. i18n: file ark.kcfg line 40
-#: rc.cpp:102
+#. i18n: file ark.kcfg line 45
+#: rc.cpp:111
 #, no-c-format
 msgid "Ignore folder names (Zip)"
 msgstr ""
 
-#. i18n: file ark.kcfg line 41
-#: rc.cpp:105
+#. i18n: file ark.kcfg line 46
+#: rc.cpp:114
 #, no-c-format
 msgid ""
 "Extract all the files into the extraction folder, ignoring any folder structure "
 "in the archive."
 msgstr ""
 
-#. i18n: file ark.kcfg line 47
-#: rc.cpp:108
+#. i18n: file ark.kcfg line 52
+#: rc.cpp:117
 #, no-c-format
 msgid "Store symlinks as links (Zip, Rar)"
 msgstr ""
 
-#. i18n: file ark.kcfg line 51
-#: rc.cpp:111
+#. i18n: file ark.kcfg line 56
+#: rc.cpp:120
 #, no-c-format
 msgid "Recursively add subfolders (Zip, Rar)"
 msgstr ""
 
-#. i18n: file ark.kcfg line 55
-#: rc.cpp:114
+#. i18n: file ark.kcfg line 60
+#: rc.cpp:123
 #, no-c-format
 msgid "Convert filenames to lowercase (Zip, Rar)"
 msgstr ""
 
-#. i18n: file ark.kcfg line 59
-#: rc.cpp:117
+#. i18n: file ark.kcfg line 64
+#: rc.cpp:126
 #, no-c-format
 msgid "Convert filenames to uppercase"
 msgstr ""
 
-#. i18n: file ark.kcfg line 65
-#: rc.cpp:120
+#. i18n: file ark.kcfg line 70
+#: rc.cpp:129
 #, no-c-format
 msgid "Show search bar"
 msgstr ""
 
-#. i18n: file ark.kcfg line 69
-#: rc.cpp:123
+#. i18n: file ark.kcfg line 74
+#: rc.cpp:132
 #, no-c-format
 msgid "Enable Konqueror integration"
 msgstr ""
 
-#. i18n: file ark.kcfg line 70
-#: rc.cpp:126
+#. i18n: file ark.kcfg line 75
+#: rc.cpp:135
 #, no-c-format
 msgid ""
 "Enables integration with Konqueror's context menus, letting you easily archive "
@@ -980,20 +1026,20 @@ msgid ""
 "package installed."
 msgstr ""
 
-#. i18n: file ark.kcfg line 74
-#: rc.cpp:129
+#. i18n: file ark.kcfg line 79
+#: rc.cpp:138
 #, no-c-format
 msgid "Use integrated viewer"
 msgstr ""
 
-#. i18n: file ark.kcfg line 78
-#: rc.cpp:132
+#. i18n: file ark.kcfg line 83
+#: rc.cpp:141
 #, no-c-format
 msgid "Tar Command"
 msgstr ""
 
-#. i18n: file ark.kcfg line 86
-#: rc.cpp:138
+#. i18n: file ark.kcfg line 91
+#: rc.cpp:147
 #, no-c-format
 msgid "Enable experimental support for loading ACE files"
 msgstr ""
@@ -1008,11 +1054,11 @@ msgid ""
 "Resets the search bar, so that all archive entries are shown again."
 msgstr ""
 
-#: tar.cpp:405
+#: tar.cpp:420
 msgid "Unable to fork a decompressor"
 msgstr ""
 
-#: tar.cpp:432
+#: tar.cpp:447
 msgid "Trouble writing to the tempfile..."
 msgstr ""
 
diff --git a/tde-i18n-cy/messages/tdeutils/irkick.po b/tde-i18n-cy/messages/tdeutils/irkick.po
index 8e5ce960b4b..ba07f927ed9 100644
--- a/tde-i18n-cy/messages/tdeutils/irkick.po
+++ b/tde-i18n-cy/messages/tdeutils/irkick.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdeutils/irkick.po\n"
-"POT-Creation-Date: 2005-07-24 01:36+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeutils/kcalc.po b/tde-i18n-cy/messages/tdeutils/kcalc.po
index a0119c7952c..bd2aeb9aba8 100644
--- a/tde-i18n-cy/messages/tdeutils/kcalc.po
+++ b/tde-i18n-cy/messages/tdeutils/kcalc.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdeutils/kcalc.po\n"
-"POT-Creation-Date: 2008-07-08 01:19+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -364,51 +365,51 @@ msgstr ""
 msgid "&Constants"
 msgstr ""
 
-#: kcalc.cpp:1768
+#: kcalc.cpp:1767
 msgid "Last stat item erased"
 msgstr ""
 
-#: kcalc.cpp:1779
+#: kcalc.cpp:1778
 msgid "Stat mem cleared"
 msgstr "Gwacawyd cof sefydlog"
 
 #. i18n: file general.ui line 16
-#: kcalc.cpp:1825 rc.cpp:78
+#: kcalc.cpp:1824 rc.cpp:78
 #, no-c-format
 msgid "General"
 msgstr "Cyffredinol"
 
-#: kcalc.cpp:1825
+#: kcalc.cpp:1824
 msgid "General Settings"
 msgstr "Gosodiadau Cyffredinol"
 
-#: kcalc.cpp:1833
+#: kcalc.cpp:1832
 msgid "Select Display Font"
 msgstr ""
 
-#: kcalc.cpp:1839
+#: kcalc.cpp:1838
 msgid "Colors"
 msgstr "Lliwiau"
 
-#: kcalc.cpp:1839
+#: kcalc.cpp:1838
 msgid "Button & Display Colors"
 msgstr ""
 
 #. i18n: file constants.ui line 16
-#: kcalc.cpp:1876 rc.cpp:36
+#: kcalc.cpp:1875 rc.cpp:36
 #, no-c-format
 msgid "Constants"
 msgstr ""
 
-#: kcalc.cpp:2273
+#: kcalc.cpp:2272
 msgid "KCalc"
 msgstr "KCalc"
 
-#: kcalc.cpp:2275
+#: kcalc.cpp:2274
 msgid ""
 "(c) 2003-2005, Klaus Niederkrüger\n"
 "(c) 1996-2000, Bernd Johannes Wuebben\n"
-"(c) 2000-2005, The TDE Team"
+"(c) 2000-2005, The KDE Team"
 msgstr ""
 
 #: kcalc_const_button.cpp:37 kcalc_const_button.cpp:47
diff --git a/tde-i18n-cy/messages/tdeutils/kcharselect.po b/tde-i18n-cy/messages/tdeutils/kcharselect.po
index a53b8e8d0c1..0d53e05d681 100644
--- a/tde-i18n-cy/messages/tdeutils/kcharselect.po
+++ b/tde-i18n-cy/messages/tdeutils/kcharselect.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdeutils/kcharselect.po\n"
-"POT-Creation-Date: 2004-12-21 01:21+0100\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeutils/kcharselectapplet.po b/tde-i18n-cy/messages/tdeutils/kcharselectapplet.po
index 286b6b12f59..cd3024dfc1d 100644
--- a/tde-i18n-cy/messages/tdeutils/kcharselectapplet.po
+++ b/tde-i18n-cy/messages/tdeutils/kcharselectapplet.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdeutils/kcharselectapplet.po\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeutils/kcmkvaio.po b/tde-i18n-cy/messages/tdeutils/kcmkvaio.po
index df06c938868..53b11bd905f 100644
--- a/tde-i18n-cy/messages/tdeutils/kcmkvaio.po
+++ b/tde-i18n-cy/messages/tdeutils/kcmkvaio.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdeutils/kcmkvaio.po\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeutils/kcmlaptop.po b/tde-i18n-cy/messages/tdeutils/kcmlaptop.po
index 32f93dc9a76..059e6a2aee7 100644
--- a/tde-i18n-cy/messages/tdeutils/kcmlaptop.po
+++ b/tde-i18n-cy/messages/tdeutils/kcmlaptop.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdeutils/kcmlaptop.po\n"
-"POT-Creation-Date: 2006-10-14 02:36+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -577,35 +578,24 @@ msgstr ""
 msgid "This button can be used to enable the ACPI helper application"
 msgstr ""
 
-#: acpi.cpp:169 apm.cpp:191
-msgid ""
-"The %1 application does not seem to have the same size or checksum as when it "
-"was compiled we do NOT recommend you proceed with making it setuid-root without "
-"further investigation"
-msgstr ""
-
-#: acpi.cpp:172 acpi.cpp:182 acpi.cpp:194 apm.cpp:174 apm.cpp:194 apm.cpp:204
-#: apm.cpp:216 sony.cpp:115 sony.cpp:127
-msgid "KLaptopDaemon"
-msgstr ""
-
 #: acpi.cpp:172 apm.cpp:194
-msgid "Run Nevertheless"
-msgstr ""
-
-#: acpi.cpp:180 apm.cpp:202
 msgid ""
 "You will need to supply a root password to allow the privileges of the "
 "klaptop_acpi_helper to change."
 msgstr ""
 
-#: acpi.cpp:193
+#: acpi.cpp:174 acpi.cpp:186 apm.cpp:174 apm.cpp:196 apm.cpp:208 sony.cpp:115
+#: sony.cpp:127
+msgid "KLaptopDaemon"
+msgstr ""
+
+#: acpi.cpp:185
 msgid ""
 "The ACPI helper cannot be enabled because tdesu cannot be found.  Please make "
 "sure that it is installed correctly."
 msgstr ""
 
-#: acpi.cpp:276
+#: acpi.cpp:268
 msgid ""
 "<h1>ACPI Setup</h1>This module allows you to configure ACPI for your system"
 msgstr ""
@@ -884,13 +874,13 @@ msgid ""
 "is installed correctly."
 msgstr ""
 
-#: apm.cpp:215
+#: apm.cpp:207
 msgid ""
 "The Software Suspend helper cannot be enabled because tdesu cannot be found.  "
 "Please make sure that it is installed correctly."
 msgstr ""
 
-#: apm.cpp:279
+#: apm.cpp:271
 msgid ""
 "<h1>APM Setup</h1>This module allows you to configure APM for your system"
 msgstr ""
diff --git a/tde-i18n-cy/messages/tdeutils/kcmlirc.po b/tde-i18n-cy/messages/tdeutils/kcmlirc.po
index 9db712148e8..28f3226f09e 100644
--- a/tde-i18n-cy/messages/tdeutils/kcmlirc.po
+++ b/tde-i18n-cy/messages/tdeutils/kcmlirc.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdeutils/kcmlirc.po\n"
-"POT-Creation-Date: 2008-07-08 01:19+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -102,76 +103,76 @@ msgstr ""
 msgid "Start Automatically"
 msgstr ""
 
-#: kcmlirc.cpp:335
+#: kcmlirc.cpp:336
 msgid "Are you sure you want to remove %1 and all its actions?"
 msgstr ""
 
-#: kcmlirc.cpp:335
+#: kcmlirc.cpp:336
 msgid "Erase Actions?"
 msgstr ""
 
-#: kcmlirc.cpp:357
+#: kcmlirc.cpp:358
 msgid ""
 "You may only drag the selected items onto a mode of the same remote control"
 msgstr ""
 
-#: kcmlirc.cpp:357
+#: kcmlirc.cpp:358
 msgid "You May Not Drag Here"
 msgstr ""
 
-#: kcmlirc.cpp:379
+#: kcmlirc.cpp:380
 msgid "Actions <i>always</i> available"
 msgstr ""
 
-#: kcmlirc.cpp:379
+#: kcmlirc.cpp:380
 msgid "Actions available only in mode <b>%1</b>"
 msgstr ""
 
 #. i18n: file addactionbase.ui line 94
-#: kcmlirc.cpp:440 kcmlirc.cpp:470 kcmlirc.cpp:475 rc.cpp:12
+#: kcmlirc.cpp:441 kcmlirc.cpp:471 kcmlirc.cpp:476 rc.cpp:12
 #, no-c-format
 msgid "Applications"
 msgstr "Cymhwysiadau"
 
 #. i18n: file newmode.ui line 25
-#: kcmlirc.cpp:449 kcmlirc.cpp:472 kcmlirc.cpp:485 rc.cpp:336
+#: kcmlirc.cpp:450 kcmlirc.cpp:473 kcmlirc.cpp:486 rc.cpp:336
 #, no-c-format
 msgid "Remote Controls"
 msgstr "Rheolyddion Pell"
 
-#: kcmlirc.cpp:469 kcmlirc.cpp:483 kcmlirc.cpp:493
+#: kcmlirc.cpp:470 kcmlirc.cpp:484 kcmlirc.cpp:494
 msgid "Information on <b>%1</b>:"
 msgstr ""
 
-#: kcmlirc.cpp:471
+#: kcmlirc.cpp:472
 msgid "Number of Applications"
 msgstr ""
 
-#: kcmlirc.cpp:473
+#: kcmlirc.cpp:474
 msgid "Number of Remote Controls"
 msgstr ""
 
-#: kcmlirc.cpp:479 kcmlirc.cpp:489
+#: kcmlirc.cpp:480 kcmlirc.cpp:490
 msgid "Extension Name"
 msgstr ""
 
-#: kcmlirc.cpp:480 kcmlirc.cpp:490
+#: kcmlirc.cpp:481 kcmlirc.cpp:491
 msgid "Extension Author"
 msgstr ""
 
-#: kcmlirc.cpp:481
+#: kcmlirc.cpp:482
 msgid "Application Identifier"
 msgstr ""
 
-#: kcmlirc.cpp:482
+#: kcmlirc.cpp:483
 msgid "Number of Actions"
 msgstr ""
 
-#: kcmlirc.cpp:491
+#: kcmlirc.cpp:492
 msgid "Remote Control Identifier"
 msgstr ""
 
-#: kcmlirc.cpp:492
+#: kcmlirc.cpp:493
 msgid "Number of Buttons"
 msgstr "Nifer o fotymau"
 
diff --git a/tde-i18n-cy/messages/tdeutils/kcmtdewallet.po b/tde-i18n-cy/messages/tdeutils/kcmtdewallet.po
index 44d5c3e5509..2d6bd3ea8a5 100644
--- a/tde-i18n-cy/messages/tdeutils/kcmtdewallet.po
+++ b/tde-i18n-cy/messages/tdeutils/kcmtdewallet.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdeutils/kcmtdewallet.po\n"
-"POT-Creation-Date: 2006-08-23 02:35+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -51,7 +52,7 @@ msgstr ""
 
 #: konfigurator.cpp:299
 msgid ""
-"This configuration module allows you to configure the TDE wallet system."
+"This configuration module allows you to configure the KDE wallet system."
 msgstr ""
 
 #. i18n: file walletconfigwidget.ui line 31
diff --git a/tde-i18n-cy/messages/tdeutils/kcmthinkpad.po b/tde-i18n-cy/messages/tdeutils/kcmthinkpad.po
index 3c9c681bc7e..8d747a54bb7 100644
--- a/tde-i18n-cy/messages/tdeutils/kcmthinkpad.po
+++ b/tde-i18n-cy/messages/tdeutils/kcmthinkpad.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdeutils/kcmthinkpad.po\n"
-"POT-Creation-Date: 2005-09-30 02:48+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeutils/kdf.po b/tde-i18n-cy/messages/tdeutils/kdf.po
index 03b37126a3d..6554f942b30 100644
--- a/tde-i18n-cy/messages/tdeutils/kdf.po
+++ b/tde-i18n-cy/messages/tdeutils/kdf.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdeutils/kdf.po\n"
-"POT-Creation-Date: 2004-12-29 14:54+0100\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,7 +22,7 @@ msgid ""
 "Your emails"
 msgstr "kyfieithu@dotmon.com"
 
-#: disklist.cpp:267
+#: disklist.cpp:268
 #, c-format
 msgid "could not execute [%s]"
 msgstr ""
@@ -45,10 +46,6 @@ msgid ""
 "on all hardware architectures and/or operating systems."
 msgstr ""
 
-#: tdeconftest.cpp:44
-msgid "A test application"
-msgstr ""
-
 #: kdf.cpp:33
 msgid "TDE free disk space utility"
 msgstr ""
@@ -225,3 +222,7 @@ msgstr "Gosodiadau Cyffredinol"
 #: optiondialog.cpp:38
 msgid "Mount Commands"
 msgstr ""
+
+#: tdeconftest.cpp:44
+msgid "A test application"
+msgstr ""
diff --git a/tde-i18n-cy/messages/tdeutils/kedit.po b/tde-i18n-cy/messages/tdeutils/kedit.po
index 7756075d4b4..38a4138abad 100644
--- a/tde-i18n-cy/messages/tdeutils/kedit.po
+++ b/tde-i18n-cy/messages/tdeutils/kedit.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdeutils/kedit.po\n"
-"POT-Creation-Date: 2008-07-08 01:19+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeutils/kfloppy.po b/tde-i18n-cy/messages/tdeutils/kfloppy.po
index 865f2ac7c14..6e2d67cd068 100644
--- a/tde-i18n-cy/messages/tdeutils/kfloppy.po
+++ b/tde-i18n-cy/messages/tdeutils/kfloppy.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdeutils/kfloppy.po\n"
-"POT-Creation-Date: 2007-06-02 02:16+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -38,7 +39,7 @@ msgid "Add BSD support"
 msgstr ""
 
 #: main.cpp:57
-msgid "Make KFloppy work again for TDE 3.4"
+msgid "Make KFloppy work again for KDE 3.4"
 msgstr ""
 
 #: format.cpp:269
diff --git a/tde-i18n-cy/messages/tdeutils/kgpg.po b/tde-i18n-cy/messages/tdeutils/kgpg.po
index 6bea554f051..b6fed68d989 100644
--- a/tde-i18n-cy/messages/tdeutils/kgpg.po
+++ b/tde-i18n-cy/messages/tdeutils/kgpg.po
@@ -1,14 +1,167 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdeutils/kgpg.po\n"
-"POT-Creation-Date: 2008-07-11 01:32+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: kgpgeditor.cpp:143
+msgid "&Encrypt File..."
+msgstr ""
+
+#: kgpgeditor.cpp:144
+msgid "&Decrypt File..."
+msgstr ""
+
+#: kgpg.cpp:787 kgpgeditor.cpp:145
+msgid "&Open Key Manager"
+msgstr ""
+
+#: kgpgeditor.cpp:149
+msgid "&Generate Signature..."
+msgstr ""
+
+#: kgpgeditor.cpp:150
+msgid "&Verify Signature..."
+msgstr ""
+
+#: kgpgeditor.cpp:151
+msgid "&Check MD5 Sum..."
+msgstr ""
+
+#: kgpgeditor.cpp:220 kgpgeditor.cpp:230 kgpgeditor.cpp:467 kgpgeditor.cpp:481
+#: kgpgeditor.cpp:513
+msgid "*|All Files"
+msgstr "*|Pob Ffeil"
+
+#: kgpgeditor.cpp:220
+msgid "Open File to Encode"
+msgstr ""
+
+#: kgpgeditor.cpp:230
+msgid "Open File to Decode"
+msgstr ""
+
+#: kgpgeditor.cpp:244
+msgid "Decrypt File To"
+msgstr ""
+
+#: kgpgeditor.cpp:250 listkeys.cpp:1519
+msgid "Save File"
+msgstr ""
+
+#. i18n: file conf_misc.ui line 198
+#: kgpgeditor.cpp:252 rc.cpp:203
+#, no-c-format
+msgid "Editor"
+msgstr "Golygydd"
+
+#: kgpg.cpp:197 kgpg.cpp:409 kgpgeditor.cpp:268 kgpglibrary.cpp:95
+msgid "File Already Exists"
+msgstr "Ffeil yn Bodoli'n Barod"
+
+#: kgpgeditor.cpp:317
+msgid ""
+"The document could not been saved, as the selected encoding cannot encode every "
+"unicode character in it."
+msgstr ""
+
+#: kgpgeditor.cpp:325 kgpgeditor.cpp:352
+msgid ""
+"The document could not be saved, please check your permissions and disk space."
+msgstr ""
+
+#: kgpgeditor.cpp:379 kgpgeditor.cpp:388
+msgid "Overwrite existing file %1?"
+msgstr ""
+
+#: kgpgeditor.cpp:380 kgpgeditor.cpp:389
+msgid "Overwrite"
+msgstr "Trosysgrifo"
+
+#: kgpgeditor.cpp:467 kgpgeditor.cpp:513
+msgid "Open File to Verify"
+msgstr ""
+
+#: kgpgeditor.cpp:481
+msgid "Open File to Sign"
+msgstr ""
+
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "KD wrth KGyfieithu"
+
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "kyfieithu@dotmon.com"
+
+#: tips.txt:3
+msgid ""
+"<p>If you want to decrypt a text file, simply drag and drop it into the editor "
+"window. Kgpg will do the rest. Even remote files can be dropped.</p>\n"
+"<p>Drag a public key into the editor window and kgpg will automatically import "
+"it if you want.</p>\n"
+msgstr ""
+
+#: tips.txt:9
+msgid ""
+"<p>The easiest way to encrypt a file: simply right click on the file, and you "
+"have an encrypt option in the contextual menu.\n"
+"This works in <strong>konqueror</strong> or on your Desktop!</p>\n"
+msgstr ""
+
+#: tips.txt:15
+msgid ""
+"<p>If you want to encrypt a message for several persons, just select several "
+"encryption keys by pressing the \"Ctrl\" key.</p>\n"
+msgstr ""
+
+#: tips.txt:20
+msgid ""
+"<p><strong>You don't know anything about encryption?</strong>"
+"<br>\n"
+"No problem, simply create yourself a key pair in the key management window. "
+"Then, export your public key & mail it to your friends."
+"<br>\n"
+"Ask them to do the same & import their public keys. Finally, to send an "
+"encrypted message, type it in the Kgpg editor, then click \"encrypt\". Choose \n"
+"your friend key and click \"encrypt\" again. The message will be encrypted, "
+"ready to be sent by email.</p>\n"
+msgstr ""
+
+#: tips.txt:28
+msgid ""
+"<p>To perform an operation on a key, open the key management window & right "
+"click on the key. A popup menu with all available options will appear.</p>\n"
+msgstr ""
+
+#: tips.txt:33
+msgid ""
+"<p>Decrypt a file with a single mouse click on it. You will then be prompted "
+"for password & that's all!</p>\n"
+msgstr ""
+
+#: tips.txt:38
+msgid ""
+"<p>If you only want to open the key manager, type \"kgpg -k\" in the command "
+"line prompt.</p>\n"
+msgstr ""
+
+#: tips.txt:43
+msgid ""
+"<p>Typing \"kgpg -s filename\" will decrypt the file filename and open it in "
+"Kgpg's editor.</p>\n"
+msgstr ""
+
 #: kgpg.cpp:83
 msgid "&Decrypt && Save File"
 msgstr ""
@@ -60,10 +213,6 @@ msgstr ""
 msgid "Bzip2"
 msgstr ""
 
-#: kgpg.cpp:197 kgpg.cpp:409 kgpgeditor.cpp:268 kgpglibrary.cpp:95
-msgid "File Already Exists"
-msgstr "Ffeil yn Bodoli'n Barod"
-
 #: kgpg.cpp:209
 msgid "Processing folder compression and encryption"
 msgstr ""
@@ -180,10 +329,6 @@ msgstr ""
 msgid "&Open Editor"
 msgstr ""
 
-#: kgpg.cpp:787 kgpgeditor.cpp:145
-msgid "&Open Key Manager"
-msgstr ""
-
 #: kgpg.cpp:789 listkeys.cpp:575
 msgid "&Key Server Dialog"
 msgstr ""
@@ -224,6 +369,240 @@ msgstr ""
 msgid "Encrypted following text:"
 msgstr ""
 
+#: kgpgoptions.cpp:69 kgpgoptions.cpp:76 kgpgoptions.cpp:428
+#: kgpgoptions.cpp:584 kgpgoptions.cpp:590
+msgid "(Default)"
+msgstr "(Rhagosodiad)"
+
+#. i18n: file conf_encryption.ui line 17
+#: kgpgoptions.cpp:101 rc.cpp:41
+#, no-c-format
+msgid "Encryption"
+msgstr "Cêl-ysgrifaeth"
+
+#: kgpgoptions.cpp:102
+msgid "Decryption"
+msgstr ""
+
+#: kgpgoptions.cpp:104
+msgid "GnuPG Settings"
+msgstr ""
+
+#: kgpgoptions.cpp:105
+msgid "Key Servers"
+msgstr ""
+
+#: kgpgoptions.cpp:106
+msgid "Misc"
+msgstr "Amrywiol"
+
+#: kgpgoptions.cpp:188
+msgid "New GnuPG Home Location"
+msgstr ""
+
+#: kgpgoptions.cpp:196
+msgid ""
+"No configuration file was found in the selected location.\n"
+"Do you want to create it now ?\n"
+"\n"
+"Without configuration file, neither KGpg nor Gnupg will work properly."
+msgstr ""
+
+#: kgpgoptions.cpp:196
+msgid "No Configuration File Found"
+msgstr ""
+
+#: kgpgoptions.cpp:196
+msgid "Create"
+msgstr "Creu"
+
+#: kgpgoptions.cpp:196
+msgid "Ignore"
+msgstr "Anwybyddu"
+
+#: kgpgoptions.cpp:204
+msgid ""
+"Cannot create configuration file. Please check if destination media is mounted "
+"and if you have write access"
+msgstr ""
+
+#: kgpgoptions.cpp:456
+msgid "Sign File"
+msgstr ""
+
+#: kgpgoptions.cpp:473
+msgid "Decrypt File"
+msgstr ""
+
+#: kgpgoptions.cpp:572
+msgid "Add New Key Server"
+msgstr ""
+
+#: kgpgoptions.cpp:572
+msgid "Server URL:"
+msgstr "URL y gweinydd:"
+
+#: keyservers.cpp:55
+msgid "Key Server"
+msgstr ""
+
+#: keyservers.cpp:163 keyservers.cpp:409
+msgid "You must enter a search string."
+msgstr ""
+
+#: keyservers.cpp:169 listkeys.cpp:544
+msgid "Import Key From Keyserver"
+msgstr ""
+
+#. i18n: file keyserver.ui line 97
+#: keyservers.cpp:171 rc.cpp:446
+#, no-c-format
+msgid "&Import"
+msgstr "&Mewnforio"
+
+#: keyservers.cpp:178
+msgid "Connecting to the server..."
+msgstr ""
+
+#: keyservers.cpp:233
+msgid "You must choose a key."
+msgstr ""
+
+#: keyservers.cpp:265
+msgid "Found %1 matching keys"
+msgstr ""
+
+#: keyservers.cpp:374 keyservers.cpp:442
+msgid "<b>Connecting to the server...</b>"
+msgstr ""
+
+#: keyservers.cpp:375 keyservers.cpp:443
+msgid "&Abort"
+msgstr "&Erthylu"
+
+#: keyservers.cpp:496 kgpginterface.cpp:1408
+#, c-format
+msgid ""
+"_n: <qt>%n key processed."
+"<br></qt>\n"
+"<qt>%n keys processed."
+"<br></qt>"
+msgstr ""
+
+#: keyservers.cpp:498 kgpginterface.cpp:1410
+#, c-format
+msgid ""
+"_n: <qt>One key unchanged."
+"<br></qt>\n"
+"<qt>%n keys unchanged."
+"<br></qt>"
+msgstr ""
+
+#: keyservers.cpp:500 kgpginterface.cpp:1412
+#, c-format
+msgid ""
+"_n: <qt>One signature imported."
+"<br></qt>\n"
+"<qt>%n signatures imported."
+"<br></qt>"
+msgstr ""
+
+#: keyservers.cpp:502 kgpginterface.cpp:1414
+#, c-format
+msgid ""
+"_n: <qt>One key without ID."
+"<br></qt>\n"
+"<qt>%n keys without ID."
+"<br></qt>"
+msgstr ""
+
+#: keyservers.cpp:504 kgpginterface.cpp:1416
+#, c-format
+msgid ""
+"_n: <qt>One RSA key imported."
+"<br></qt>\n"
+"<qt>%n RSA keys imported."
+"<br></qt>"
+msgstr ""
+
+#: keyservers.cpp:506 kgpginterface.cpp:1418
+#, c-format
+msgid ""
+"_n: <qt>One user ID imported."
+"<br></qt>\n"
+"<qt>%n user IDs imported."
+"<br></qt>"
+msgstr ""
+
+#: keyservers.cpp:508 kgpginterface.cpp:1420
+#, c-format
+msgid ""
+"_n: <qt>One subkey imported."
+"<br></qt>\n"
+"<qt>%n subkeys imported."
+"<br></qt>"
+msgstr ""
+
+#: keyservers.cpp:510 kgpginterface.cpp:1422
+#, c-format
+msgid ""
+"_n: <qt>One revocation certificate imported."
+"<br></qt>\n"
+"<qt>%n revocation certificates imported."
+"<br></qt>"
+msgstr ""
+
+#: keyservers.cpp:512 kgpginterface.cpp:1425
+#, c-format
+msgid ""
+"_n: <qt>One secret key processed."
+"<br></qt>\n"
+"<qt>%n secret keys processed."
+"<br></qt>"
+msgstr ""
+
+#: keyservers.cpp:514 kgpginterface.cpp:1429
+#, c-format
+msgid ""
+"_n: <qt><b>One secret key imported.</b>"
+"<br></qt>\n"
+"<qt><b>%n secret keys imported.</b>"
+"<br></qt>"
+msgstr ""
+
+#: keyservers.cpp:516 kgpginterface.cpp:1431
+#, c-format
+msgid ""
+"_n: <qt>One secret key unchanged."
+"<br></qt>\n"
+"<qt>%n secret keys unchanged."
+"<br></qt>"
+msgstr ""
+
+#: keyservers.cpp:518 kgpginterface.cpp:1433
+#, c-format
+msgid ""
+"_n: <qt>One secret key not imported."
+"<br></qt>\n"
+"<qt>%n secret keys not imported."
+"<br></qt>"
+msgstr ""
+
+#: keyservers.cpp:520 kgpginterface.cpp:1435
+#, c-format
+msgid ""
+"_n: <qt><b>One key imported:</b>"
+"<br></qt>\n"
+"<qt><b>%n keys imported:</b>"
+"<br></qt>"
+msgstr ""
+
+#: keyservers.cpp:522 kgpginterface.cpp:1441
+msgid ""
+"No key imported... \n"
+"Check detailed log for more infos"
+msgstr ""
+
 #: listkeys.cpp:217
 msgid "Private Key List"
 msgstr ""
@@ -312,10 +691,6 @@ msgstr ""
 msgid "Set as De&fault Key"
 msgstr ""
 
-#: keyservers.cpp:169 listkeys.cpp:544
-msgid "Import Key From Keyserver"
-msgstr ""
-
 #: listkeys.cpp:545
 msgid "Import &Missing Signatures From Keyserver"
 msgstr ""
@@ -601,10 +976,6 @@ msgstr ""
 msgid "Public Key Export"
 msgstr ""
 
-#: kgpgeditor.cpp:250 listkeys.cpp:1519
-msgid "Save File"
-msgstr ""
-
 #: listkeys.cpp:1556
 msgid ""
 "Your public key \"%1\" was successfully exported\n"
@@ -916,124 +1287,110 @@ msgstr "Eithaf"
 msgid "?"
 msgstr "?"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "KD wrth KGyfieithu"
+#: detailedconsole.cpp:43
+msgid "Details"
+msgstr "Manylion"
 
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "kyfieithu@dotmon.com"
+#: detailedconsole.cpp:55
+msgid "Info"
+msgstr "Gwybo"
 
-#: main.cpp:30
-msgid ""
-"Kgpg - simple gui for gpg\n"
-"\n"
-"Kgpg was designed to make gpg very easy to use.\n"
-"I tried to make it as secure as possible.\n"
-"Hope you enjoy it."
+#: keygener.cpp:37
+msgid "Key Generation"
 msgstr ""
 
-#: main.cpp:36
-msgid "Encrypt file"
-msgstr ""
+#: keygener.cpp:40
+msgid "Expert Mode"
+msgstr "Modd Arbenigwr"
 
-#: main.cpp:37
-msgid "Open key manager"
+#: keygener.cpp:45
+msgid "Generate Key Pair"
 msgstr ""
 
-#: main.cpp:38
-msgid "Show encrypted file"
-msgstr ""
+#. i18n: file keyproperties.ui line 297
+#: keygener.cpp:47 rc.cpp:401 rc.cpp:582
+#, no-c-format
+msgid "Name:"
+msgstr "Enw:"
 
-#: main.cpp:39
-msgid "Sign file"
-msgstr ""
+#. i18n: file adduid.ui line 50
+#: keygener.cpp:50 rc.cpp:27 rc.cpp:386 rc.cpp:585
+#, no-c-format
+msgid "Email:"
+msgstr "Ebost:"
 
-#: main.cpp:40
-msgid "Verify signature"
+#. i18n: file adduid.ui line 58
+#: keygener.cpp:53 rc.cpp:30
+#, no-c-format
+msgid "Comment (optional):"
 msgstr ""
 
-#: main.cpp:41
-msgid "Shred file"
-msgstr ""
+#: keygener.cpp:62
+msgid "Never"
+msgstr "Byth"
 
-#: main.cpp:42
-msgid "File to open"
-msgstr "Ffeil i agor"
+#: keygener.cpp:63
+msgid "Days"
+msgstr "Dydd"
 
-#: main.cpp:50
-msgid "KGpg"
-msgstr "KGpg"
+#: keygener.cpp:64
+msgid "Weeks"
+msgstr "Wythnosau"
 
-#: kgpgview.cpp:97
-msgid ""
-"<qt><b>Remote file dropped</b>."
-"<br>The remote file will now be copied to a temporary file to process requested "
-"operation. This temporary file will be deleted after operation.</qt>"
-msgstr ""
+#: keygener.cpp:65
+msgid "Months"
+msgstr "Misoedd"
 
-#: kgpgview.cpp:100
-msgid "Could not download file."
-msgstr ""
+#: keygener.cpp:66
+msgid "Years"
+msgstr "Blynyddoedd"
 
-#: kgpglibrary.cpp:225 kgpgview.cpp:130
-msgid ""
-"<p>The file <b>%1</b> is a public key."
-"<br>Do you want to import it ?</p>"
+#: keygener.cpp:70
+msgid "Key size:"
 msgstr ""
 
-#: kgpgview.cpp:143
-msgid ""
-"This file is a private key.\n"
-"Please use kgpg key management to import it."
+#. i18n: file keyproperties.ui line 245
+#: keygener.cpp:79 rc.cpp:389
+#, no-c-format
+msgid "Algorithm:"
 msgstr ""
 
-#: kgpglibrary.cpp:240 kgpgview.cpp:165 kgpgview.cpp:361
-msgid "Decryption failed."
+#: keygener.cpp:94
+msgid "You must give a name."
 msgstr ""
 
-#: kgpgview.cpp:179
-msgid "Unable to read file."
+#: keygener.cpp:100
+msgid "You are about to create a key with no email address"
 msgstr ""
 
-#: kgpgview.cpp:211
-msgid "S&ign/Verify"
+#: keygener.cpp:103
+msgid "Email address not valid"
 msgstr ""
 
-#: kgpgview.cpp:212
-msgid "En&crypt"
-msgstr "Cêl-ysgrifo"
-
-#: kgpgview.cpp:213
-msgid "&Decrypt"
+#. i18n: file keyproperties.ui line 24
+#: keyinfowidget.cpp:46 rc.cpp:351
+#, no-c-format
+msgid "Key Properties"
 msgstr ""
 
-#: kgpgview.cpp:231
-msgid "untitled"
-msgstr "heb deitl"
+#: keyinfowidget.cpp:257 keyinfowidget.cpp:266
+msgid "none"
+msgstr "dim"
 
-#: kgpginterface.cpp:829 kgpgview.cpp:241
-msgid ""
-"<qt><b>Missing signature:</b>"
-"<br>Key id: %1"
-"<br>"
-"<br>Do you want to import this key from a keyserver?</qt>"
+#: keyinfowidget.cpp:355
+msgid "Choose New Expiration"
 msgstr ""
 
-#: kgpgview.cpp:242
-msgid "Missing Key"
+#: keyinfowidget.cpp:433
+msgid "Passphrase for the key was changed"
 msgstr ""
 
-#: kgpgview.cpp:295
-msgid "Signing not possible: bad passphrase or missing key"
+#: keyinfowidget.cpp:453
+msgid "Could not change expiration"
 msgstr ""
 
-#: kgpgview.cpp:388
-msgid "Encryption failed."
+#: keyinfowidget.cpp:453
+msgid "Bad passphrase"
 msgstr ""
 
 #: popuppublic.cpp:91
@@ -1138,436 +1495,6 @@ msgid ""
 "command line option, like: '--armor'"
 msgstr ""
 
-#: kgpgoptions.cpp:69 kgpgoptions.cpp:76 kgpgoptions.cpp:428
-#: kgpgoptions.cpp:584 kgpgoptions.cpp:590
-msgid "(Default)"
-msgstr "(Rhagosodiad)"
-
-#. i18n: file conf_encryption.ui line 17
-#: kgpgoptions.cpp:101 rc.cpp:41
-#, no-c-format
-msgid "Encryption"
-msgstr "Cêl-ysgrifaeth"
-
-#: kgpgoptions.cpp:102
-msgid "Decryption"
-msgstr ""
-
-#: kgpgoptions.cpp:104
-msgid "GnuPG Settings"
-msgstr ""
-
-#: kgpgoptions.cpp:105
-msgid "Key Servers"
-msgstr ""
-
-#: kgpgoptions.cpp:106
-msgid "Misc"
-msgstr "Amrywiol"
-
-#: kgpgoptions.cpp:188
-msgid "New GnuPG Home Location"
-msgstr ""
-
-#: kgpgoptions.cpp:196
-msgid ""
-"No configuration file was found in the selected location.\n"
-"Do you want to create it now ?\n"
-"\n"
-"Without configuration file, neither KGpg nor Gnupg will work properly."
-msgstr ""
-
-#: kgpgoptions.cpp:196
-msgid "No Configuration File Found"
-msgstr ""
-
-#: kgpgoptions.cpp:196
-msgid "Create"
-msgstr "Creu"
-
-#: kgpgoptions.cpp:196
-msgid "Ignore"
-msgstr "Anwybyddu"
-
-#: kgpgoptions.cpp:204
-msgid ""
-"Cannot create configuration file. Please check if destination media is mounted "
-"and if you have write access"
-msgstr ""
-
-#: kgpgoptions.cpp:456
-msgid "Sign File"
-msgstr ""
-
-#: kgpgoptions.cpp:473
-msgid "Decrypt File"
-msgstr ""
-
-#: kgpgoptions.cpp:572
-msgid "Add New Key Server"
-msgstr ""
-
-#: kgpgoptions.cpp:572
-msgid "Server URL:"
-msgstr "URL y gweinydd:"
-
-#: kgpglibrary.cpp:82
-msgid "You have not chosen an encryption key."
-msgstr ""
-
-#: kgpglibrary.cpp:107
-msgid ""
-"<b>%1 Files left.</b>\n"
-"Encrypting </b>%2"
-msgstr ""
-
-#: kgpglibrary.cpp:108
-#, c-format
-msgid "<b>Encrypting </b>%2"
-msgstr ""
-
-#: kgpglibrary.cpp:125
-msgid "Processing encryption (%1)"
-msgstr ""
-
-#: kgpglibrary.cpp:143
-#, c-format
-msgid ""
-"_n: Shredding %n file\n"
-"Shredding %n files"
-msgstr ""
-
-#: kgpglibrary.cpp:157
-msgid "KGpg Error"
-msgstr ""
-
-#: kgpglibrary.cpp:157
-msgid "Process halted, not all files were shredded."
-msgstr ""
-
-#: kgpglibrary.cpp:175
-msgid "<b>Process halted</b>.<br>Not all files were encrypted."
-msgstr ""
-
-#: kgpglibrary.cpp:195
-#, c-format
-msgid "Decrypting %1"
-msgstr ""
-
-#: kgpglibrary.cpp:197
-msgid "Processing decryption"
-msgstr ""
-
-#: kgpglibrary.cpp:236
-msgid ""
-"<p>The file <b>%1</b> is a private key block. Please use KGpg key manager to "
-"import it.</p>"
-msgstr ""
-
-#: kgpginterface.cpp:87
-msgid " or "
-msgstr ""
-
-#: kgpginterface.cpp:144
-msgid "Enter passphrase for your file (symmetrical encryption):"
-msgstr ""
-
-#: kgpginterface.cpp:215 kgpginterface.cpp:392 kgpginterface.cpp:500
-#: kgpginterface.cpp:739 kgpginterface.cpp:1273
-msgid "[No user id found]"
-msgstr ""
-
-#: kgpginterface.cpp:220 kgpginterface.cpp:396
-msgid "<b>No user id found</b>. Trying all secret keys.<br>"
-msgstr ""
-
-#: kgpginterface.cpp:222 kgpginterface.cpp:398 kgpginterface.cpp:504
-msgid "<b>Bad passphrase</b>. You have %1 tries left.<br>"
-msgstr ""
-
-#: kgpginterface.cpp:224 kgpginterface.cpp:399 kgpginterface.cpp:505
-#: kgpginterface.cpp:744
-msgid "Enter passphrase for <b>%1</b>"
-msgstr ""
-
-#: kgpginterface.cpp:302
-msgid "Enter passphrase (symmetrical encryption)"
-msgstr ""
-
-#: kgpginterface.cpp:353
-msgid "Bad MDC detected. The encrypted text has been manipulated."
-msgstr ""
-
-#: kgpginterface.cpp:574 kgpginterface.cpp:603 kgpginterface.cpp:799
-#: kgpginterface.cpp:825
-msgid "No signature found."
-msgstr "Ni chanfuwyd llofnod."
-
-#: kgpginterface.cpp:591 kgpginterface.cpp:802
-msgid "<qt>Good signature from:<br><b>%1</b><br>Key ID: %2</qt>"
-msgstr ""
-
-#: kgpginterface.cpp:595
-msgid ""
-"<qt><b>Bad signature</b> from:"
-"<br>%1"
-"<br>Key ID: %2"
-"<br>"
-"<br><b>Text is corrupted.</b></qt>"
-msgstr ""
-
-#: kgpginterface.cpp:605 kgpginterface.cpp:815
-msgid "The signature is valid, but the key is untrusted"
-msgstr "Mae'r llofnod yn ddilys, ond ni ymddiriedir yr allwedd"
-
-#: kgpginterface.cpp:607 kgpginterface.cpp:817
-msgid "The signature is valid, and the key is ultimately trusted"
-msgstr ""
-
-#: kgpginterface.cpp:614
-msgid "MD5 Checksum"
-msgstr ""
-
-#: kgpginterface.cpp:616
-msgid "Compare MD5 with Clipboard"
-msgstr ""
-
-#: kgpginterface.cpp:631
-msgid "MD5 sum for <b>%1</b> is:"
-msgstr ""
-
-#: kgpginterface.cpp:648
-msgid "<b>Unknown status</b>"
-msgstr ""
-
-#: kgpginterface.cpp:676
-msgid "<b>Correct checksum</b>, file is ok."
-msgstr ""
-
-#: kgpginterface.cpp:681
-msgid "Clipboard content is not a MD5 sum."
-msgstr ""
-
-#: kgpginterface.cpp:683
-msgid "<b>Wrong checksum, FILE CORRUPTED</b>"
-msgstr ""
-
-#: kgpginterface.cpp:718
-msgid "The signature file %1 was successfully created."
-msgstr ""
-
-#: kgpginterface.cpp:720
-msgid "Bad passphrase, signature was not created."
-msgstr ""
-
-#: kgpginterface.cpp:743
-msgid "<b>Bad passphrase</b>. you have %1 tries left.<br>"
-msgstr ""
-
-#: kgpginterface.cpp:806
-msgid ""
-"<qt><b>BAD signature</b> from:"
-"<br> %1"
-"<br>Key id: %2"
-"<br>"
-"<br><b>The file is corrupted!</b></qt>"
-msgstr ""
-
-#: kgpginterface.cpp:910
-msgid "<qt>%1 Enter passphrase for <b>%2</b>:</qt>"
-msgstr ""
-
-#: kgpginterface.cpp:928
-msgid "<b>Bad passphrase</b>. Try again.</br>"
-msgstr ""
-
-#: kgpginterface.cpp:949
-msgid ""
-"<qt>Signing key <b>%1</b> with key <b>%2</b> failed."
-"<br>Do you want to try signing the key in console mode?</qt>"
-msgstr ""
-
-#: kgpginterface.cpp:981
-msgid ""
-"This key has more than one user ID.\n"
-"Edit the key manually to delete signature."
-msgstr ""
-
-#: kgpginterface.cpp:1115 kgpginterface.cpp:1519 kgpginterface.cpp:1642
-#: kgpginterface.cpp:1717 kgpginterface.cpp:1803
-msgid "<qt>Enter passphrase for <b>%1</b>:</qt>"
-msgstr ""
-
-#: kgpginterface.cpp:1158
-msgid ""
-"<qt><b>Changing expiration failed.</b>"
-"<br>Do you want to try changing the key expiration in console mode?</qt>"
-msgstr ""
-
-#: kgpginterface.cpp:1268
-msgid "<b>Bad passphrase</b>. Try again<br>"
-msgstr ""
-
-#: kgpginterface.cpp:1278
-msgid "<qt>%1 Enter passphrase for <b>%2</b></qt>"
-msgstr ""
-
-#: kgpginterface.cpp:1293
-msgid ""
-"<qt>Enter new passphrase for <b>%1</b>"
-"<br>If you forget this passphrase, all your encrypted files and messages will "
-"be lost !"
-"<br></qt>"
-msgstr ""
-
-#: keyservers.cpp:496 kgpginterface.cpp:1408
-#, c-format
-msgid ""
-"_n: <qt>%n key processed."
-"<br></qt>\n"
-"<qt>%n keys processed."
-"<br></qt>"
-msgstr ""
-
-#: keyservers.cpp:498 kgpginterface.cpp:1410
-#, c-format
-msgid ""
-"_n: <qt>One key unchanged."
-"<br></qt>\n"
-"<qt>%n keys unchanged."
-"<br></qt>"
-msgstr ""
-
-#: keyservers.cpp:500 kgpginterface.cpp:1412
-#, c-format
-msgid ""
-"_n: <qt>One signature imported."
-"<br></qt>\n"
-"<qt>%n signatures imported."
-"<br></qt>"
-msgstr ""
-
-#: keyservers.cpp:502 kgpginterface.cpp:1414
-#, c-format
-msgid ""
-"_n: <qt>One key without ID."
-"<br></qt>\n"
-"<qt>%n keys without ID."
-"<br></qt>"
-msgstr ""
-
-#: keyservers.cpp:504 kgpginterface.cpp:1416
-#, c-format
-msgid ""
-"_n: <qt>One RSA key imported."
-"<br></qt>\n"
-"<qt>%n RSA keys imported."
-"<br></qt>"
-msgstr ""
-
-#: keyservers.cpp:506 kgpginterface.cpp:1418
-#, c-format
-msgid ""
-"_n: <qt>One user ID imported."
-"<br></qt>\n"
-"<qt>%n user IDs imported."
-"<br></qt>"
-msgstr ""
-
-#: keyservers.cpp:508 kgpginterface.cpp:1420
-#, c-format
-msgid ""
-"_n: <qt>One subkey imported."
-"<br></qt>\n"
-"<qt>%n subkeys imported."
-"<br></qt>"
-msgstr ""
-
-#: keyservers.cpp:510 kgpginterface.cpp:1422
-#, c-format
-msgid ""
-"_n: <qt>One revocation certificate imported."
-"<br></qt>\n"
-"<qt>%n revocation certificates imported."
-"<br></qt>"
-msgstr ""
-
-#: keyservers.cpp:512 kgpginterface.cpp:1425
-#, c-format
-msgid ""
-"_n: <qt>One secret key processed."
-"<br></qt>\n"
-"<qt>%n secret keys processed."
-"<br></qt>"
-msgstr ""
-
-#: keyservers.cpp:514 kgpginterface.cpp:1429
-#, c-format
-msgid ""
-"_n: <qt><b>One secret key imported.</b>"
-"<br></qt>\n"
-"<qt><b>%n secret keys imported.</b>"
-"<br></qt>"
-msgstr ""
-
-#: keyservers.cpp:516 kgpginterface.cpp:1431
-#, c-format
-msgid ""
-"_n: <qt>One secret key unchanged."
-"<br></qt>\n"
-"<qt>%n secret keys unchanged."
-"<br></qt>"
-msgstr ""
-
-#: keyservers.cpp:518 kgpginterface.cpp:1433
-#, c-format
-msgid ""
-"_n: <qt>One secret key not imported."
-"<br></qt>\n"
-"<qt>%n secret keys not imported."
-"<br></qt>"
-msgstr ""
-
-#: keyservers.cpp:520 kgpginterface.cpp:1435
-#, c-format
-msgid ""
-"_n: <qt><b>One key imported:</b>"
-"<br></qt>\n"
-"<qt><b>%n keys imported:</b>"
-"<br></qt>"
-msgstr ""
-
-#: kgpginterface.cpp:1437
-msgid ""
-"<qt>"
-"<br><b>You have imported a secret key.</b> "
-"<br>Please note that imported secret keys are not trusted by default."
-"<br>To fully use this secret key for signing and encryption, you must edit the "
-"key (double click on it) and set its trust to Full or Ultimate.</qt>"
-msgstr ""
-
-#: keyservers.cpp:522 kgpginterface.cpp:1441
-msgid ""
-"No key imported... \n"
-"Check detailed log for more infos"
-msgstr ""
-
-#: kgpginterface.cpp:1704
-msgid "This image is very large. Use it anyway?"
-msgstr ""
-
-#: kgpginterface.cpp:1704
-msgid "Use Anyway"
-msgstr ""
-
-#: kgpginterface.cpp:1704
-msgid "Do Not Use"
-msgstr ""
-
-#: kgpginterface.cpp:1768
-msgid "Creation of the revocation certificate failed..."
-msgstr ""
-
 #. i18n: file kgpg.rc line 16
 #: rc.cpp:6
 #, no-c-format
@@ -1598,18 +1525,6 @@ msgstr "&Grwpiau"
 msgid "Name (minimum 5 characters):"
 msgstr ""
 
-#. i18n: file adduid.ui line 50
-#: keygener.cpp:50 rc.cpp:27 rc.cpp:386 rc.cpp:585
-#, no-c-format
-msgid "Email:"
-msgstr "Ebost:"
-
-#. i18n: file adduid.ui line 58
-#: keygener.cpp:53 rc.cpp:30
-#, no-c-format
-msgid "Comment (optional):"
-msgstr ""
-
 #. i18n: file conf_decryption.ui line 55
 #: rc.cpp:33
 #, no-c-format
@@ -1933,12 +1848,6 @@ msgstr ""
 msgid "Key Manager"
 msgstr ""
 
-#. i18n: file conf_misc.ui line 198
-#: kgpgeditor.cpp:252 rc.cpp:203
-#, no-c-format
-msgid "Editor"
-msgstr "Golygydd"
-
 #. i18n: file conf_misc.ui line 235
 #: rc.cpp:206
 #, no-c-format
@@ -2156,12 +2065,6 @@ msgstr "Gludfwrdd"
 msgid "File:"
 msgstr "Ffeil:"
 
-#. i18n: file keyproperties.ui line 24
-#: keyinfowidget.cpp:46 rc.cpp:351
-#, no-c-format
-msgid "Key Properties"
-msgstr ""
-
 #. i18n: file keyproperties.ui line 79
 #: rc.cpp:354
 #, no-c-format
@@ -2228,12 +2131,6 @@ msgstr "ID Allwedd :"
 msgid "Owner trust:"
 msgstr ""
 
-#. i18n: file keyproperties.ui line 245
-#: keygener.cpp:79 rc.cpp:389
-#, no-c-format
-msgid "Algorithm:"
-msgstr ""
-
 #. i18n: file keyproperties.ui line 275
 #: rc.cpp:395
 #, no-c-format
@@ -2246,12 +2143,6 @@ msgstr ""
 msgid "Comment:"
 msgstr "Sylwad:"
 
-#. i18n: file keyproperties.ui line 297
-#: keygener.cpp:47 rc.cpp:401 rc.cpp:582
-#, no-c-format
-msgid "Name:"
-msgstr "Enw:"
-
 #. i18n: file keyproperties.ui line 316
 #: rc.cpp:404 rc.cpp:579
 #, no-c-format
@@ -2343,12 +2234,6 @@ msgstr ""
 msgid "&Search"
 msgstr " &Chwilio"
 
-#. i18n: file keyserver.ui line 97
-#: keyservers.cpp:171 rc.cpp:446
-#, no-c-format
-msgid "&Import"
-msgstr "&Mewnforio"
-
 #. i18n: file keyserver.ui line 159
 #: rc.cpp:449 rc.cpp:474
 #, no-c-format
@@ -2543,7 +2428,7 @@ msgid "Step Three: Ready to Create your Key Pair"
 msgstr ""
 
 #. i18n: file kgpgwizard.ui line 291
-#: rc.cpp:553 rc.cpp:705
+#: rc.cpp:553
 #, no-c-format
 msgid "Start KGpg automatically at TDE startup."
 msgstr ""
@@ -2779,6 +2664,12 @@ msgstr ""
 msgid "Use the mouse selection instead of the clipboard."
 msgstr ""
 
+#. i18n: file kgpg.kcfg line 118
+#: rc.cpp:705
+#, no-c-format
+msgid "Start KGpg automatically at KDE startup."
+msgstr ""
+
 #. i18n: file kgpg.kcfg line 122
 #: rc.cpp:708
 #, no-c-format
@@ -2853,231 +2744,347 @@ msgstr ""
 msgid "Use HTTP proxy when available."
 msgstr ""
 
-#: keygener.cpp:37
-msgid "Key Generation"
+#: kgpginterface.cpp:87
+msgid " or "
 msgstr ""
 
-#: keygener.cpp:40
-msgid "Expert Mode"
-msgstr "Modd Arbenigwr"
+#: kgpginterface.cpp:144
+msgid "Enter passphrase for your file (symmetrical encryption):"
+msgstr ""
 
-#: keygener.cpp:45
-msgid "Generate Key Pair"
+#: kgpginterface.cpp:215 kgpginterface.cpp:392 kgpginterface.cpp:500
+#: kgpginterface.cpp:739 kgpginterface.cpp:1273
+msgid "[No user id found]"
 msgstr ""
 
-#: keygener.cpp:62
-msgid "Never"
-msgstr "Byth"
+#: kgpginterface.cpp:220 kgpginterface.cpp:396
+msgid "<b>No user id found</b>. Trying all secret keys.<br>"
+msgstr ""
 
-#: keygener.cpp:63
-msgid "Days"
-msgstr "Dydd"
+#: kgpginterface.cpp:222 kgpginterface.cpp:398 kgpginterface.cpp:504
+msgid "<b>Bad passphrase</b>. You have %1 tries left.<br>"
+msgstr ""
 
-#: keygener.cpp:64
-msgid "Weeks"
-msgstr "Wythnosau"
+#: kgpginterface.cpp:224 kgpginterface.cpp:399 kgpginterface.cpp:505
+#: kgpginterface.cpp:744
+msgid "Enter passphrase for <b>%1</b>"
+msgstr ""
 
-#: keygener.cpp:65
-msgid "Months"
-msgstr "Misoedd"
+#: kgpginterface.cpp:302
+msgid "Enter passphrase (symmetrical encryption)"
+msgstr ""
 
-#: keygener.cpp:66
-msgid "Years"
-msgstr "Blynyddoedd"
+#: kgpginterface.cpp:353
+msgid "Bad MDC detected. The encrypted text has been manipulated."
+msgstr ""
 
-#: keygener.cpp:70
-msgid "Key size:"
+#: kgpginterface.cpp:574 kgpginterface.cpp:603 kgpginterface.cpp:799
+#: kgpginterface.cpp:825
+msgid "No signature found."
+msgstr "Ni chanfuwyd llofnod."
+
+#: kgpginterface.cpp:591 kgpginterface.cpp:802
+msgid "<qt>Good signature from:<br><b>%1</b><br>Key ID: %2</qt>"
 msgstr ""
 
-#: keygener.cpp:94
-msgid "You must give a name."
+#: kgpginterface.cpp:595
+msgid ""
+"<qt><b>Bad signature</b> from:"
+"<br>%1"
+"<br>Key ID: %2"
+"<br>"
+"<br><b>Text is corrupted.</b></qt>"
 msgstr ""
 
-#: keygener.cpp:100
-msgid "You are about to create a key with no email address"
+#: kgpginterface.cpp:605 kgpginterface.cpp:815
+msgid "The signature is valid, but the key is untrusted"
+msgstr "Mae'r llofnod yn ddilys, ond ni ymddiriedir yr allwedd"
+
+#: kgpginterface.cpp:607 kgpginterface.cpp:817
+msgid "The signature is valid, and the key is ultimately trusted"
 msgstr ""
 
-#: keygener.cpp:103
-msgid "Email address not valid"
+#: kgpginterface.cpp:614
+msgid "MD5 Checksum"
 msgstr ""
 
-#: detailedconsole.cpp:43
-msgid "Details"
-msgstr "Manylion"
+#: kgpginterface.cpp:616
+msgid "Compare MD5 with Clipboard"
+msgstr ""
 
-#: detailedconsole.cpp:55
-msgid "Info"
-msgstr "Gwybo"
+#: kgpginterface.cpp:631
+msgid "MD5 sum for <b>%1</b> is:"
+msgstr ""
 
-#: keyinfowidget.cpp:257 keyinfowidget.cpp:266
-msgid "none"
-msgstr "dim"
+#: kgpginterface.cpp:648
+msgid "<b>Unknown status</b>"
+msgstr ""
 
-#: keyinfowidget.cpp:355
-msgid "Choose New Expiration"
+#: kgpginterface.cpp:676
+msgid "<b>Correct checksum</b>, file is ok."
 msgstr ""
 
-#: keyinfowidget.cpp:433
-msgid "Passphrase for the key was changed"
+#: kgpginterface.cpp:681
+msgid "Clipboard content is not a MD5 sum."
 msgstr ""
 
-#: keyinfowidget.cpp:453
-msgid "Could not change expiration"
+#: kgpginterface.cpp:683
+msgid "<b>Wrong checksum, FILE CORRUPTED</b>"
 msgstr ""
 
-#: keyinfowidget.cpp:453
-msgid "Bad passphrase"
+#: kgpginterface.cpp:718
+msgid "The signature file %1 was successfully created."
+msgstr ""
+
+#: kgpginterface.cpp:720
+msgid "Bad passphrase, signature was not created."
 msgstr ""
 
-#: tips.cpp:3
+#: kgpginterface.cpp:743
+msgid "<b>Bad passphrase</b>. you have %1 tries left.<br>"
+msgstr ""
+
+#: kgpginterface.cpp:806
 msgid ""
-"<p>If you want to decrypt a text file, simply drag and drop it into the editor "
-"window. Kgpg will do the rest. Even remote files can be dropped.</p>\n"
-"<p>Drag a public key into the editor window and kgpg will automatically import "
-"it if you want.</p>\n"
+"<qt><b>BAD signature</b> from:"
+"<br> %1"
+"<br>Key id: %2"
+"<br>"
+"<br><b>The file is corrupted!</b></qt>"
 msgstr ""
 
-#: tips.cpp:9
+#: kgpginterface.cpp:829 kgpgview.cpp:241
 msgid ""
-"<p>The easiest way to encrypt a file: simply right click on the file, and you "
-"have an encrypt option in the contextual menu.\n"
-"This works in <strong>konqueror</strong> or on your Desktop!</p>\n"
+"<qt><b>Missing signature:</b>"
+"<br>Key id: %1"
+"<br>"
+"<br>Do you want to import this key from a keyserver?</qt>"
+msgstr ""
+
+#: kgpginterface.cpp:910
+msgid "<qt>%1 Enter passphrase for <b>%2</b>:</qt>"
+msgstr ""
+
+#: kgpginterface.cpp:928
+msgid "<b>Bad passphrase</b>. Try again.</br>"
 msgstr ""
 
-#: tips.cpp:15
+#: kgpginterface.cpp:949
 msgid ""
-"<p>If you want to encrypt a message for several persons, just select several "
-"encryption keys by pressing the \"Ctrl\" key.</p>\n"
+"<qt>Signing key <b>%1</b> with key <b>%2</b> failed."
+"<br>Do you want to try signing the key in console mode?</qt>"
 msgstr ""
 
-#: tips.cpp:20
+#: kgpginterface.cpp:981
 msgid ""
-"<p><strong>You don't know anything about encryption?</strong>"
-"<br>\n"
-"No problem, simply create yourself a key pair in the key management window. "
-"Then, export your public key & mail it to your friends."
-"<br>\n"
-"Ask them to do the same & import their public keys. Finally, to send an "
-"encrypted message, type it in the Kgpg editor, then click \"encrypt\". Choose \n"
-"your friend key and click \"encrypt\" again. The message will be encrypted, "
-"ready to be sent by email.</p>\n"
+"This key has more than one user ID.\n"
+"Edit the key manually to delete signature."
+msgstr ""
+
+#: kgpginterface.cpp:1115 kgpginterface.cpp:1519 kgpginterface.cpp:1642
+#: kgpginterface.cpp:1717 kgpginterface.cpp:1803
+msgid "<qt>Enter passphrase for <b>%1</b>:</qt>"
 msgstr ""
 
-#: tips.cpp:28
+#: kgpginterface.cpp:1158
 msgid ""
-"<p>To perform an operation on a key, open the key management window & right "
-"click on the key. A popup menu with all available options will appear.</p>\n"
+"<qt><b>Changing expiration failed.</b>"
+"<br>Do you want to try changing the key expiration in console mode?</qt>"
 msgstr ""
 
-#: tips.cpp:33
+#: kgpginterface.cpp:1268
+msgid "<b>Bad passphrase</b>. Try again<br>"
+msgstr ""
+
+#: kgpginterface.cpp:1278
+msgid "<qt>%1 Enter passphrase for <b>%2</b></qt>"
+msgstr ""
+
+#: kgpginterface.cpp:1293
 msgid ""
-"<p>Decrypt a file with a single mouse click on it. You will then be prompted "
-"for password & that's all!</p>\n"
+"<qt>Enter new passphrase for <b>%1</b>"
+"<br>If you forget this passphrase, all your encrypted files and messages will "
+"be lost !"
+"<br></qt>"
 msgstr ""
 
-#: tips.cpp:38
+#: kgpginterface.cpp:1437
 msgid ""
-"<p>If you only want to open the key manager, type \"kgpg -k\" in the command "
-"line prompt.</p>\n"
+"<qt>"
+"<br><b>You have imported a secret key.</b> "
+"<br>Please note that imported secret keys are not trusted by default."
+"<br>To fully use this secret key for signing and encryption, you must edit the "
+"key (double click on it) and set its trust to Full or Ultimate.</qt>"
 msgstr ""
 
-#: tips.cpp:43
+#: kgpginterface.cpp:1704
+msgid "This image is very large. Use it anyway?"
+msgstr ""
+
+#: kgpginterface.cpp:1704
+msgid "Use Anyway"
+msgstr ""
+
+#: kgpginterface.cpp:1704
+msgid "Do Not Use"
+msgstr ""
+
+#: kgpginterface.cpp:1768
+msgid "Creation of the revocation certificate failed..."
+msgstr ""
+
+#: main.cpp:30
 msgid ""
-"<p>Typing \"kgpg -s filename\" will decrypt the file filename and open it in "
-"Kgpg's editor.</p>\n"
+"Kgpg - simple gui for gpg\n"
+"\n"
+"Kgpg was designed to make gpg very easy to use.\n"
+"I tried to make it as secure as possible.\n"
+"Hope you enjoy it."
 msgstr ""
 
-#: kgpgeditor.cpp:143
-msgid "&Encrypt File..."
+#: main.cpp:36
+msgid "Encrypt file"
 msgstr ""
 
-#: kgpgeditor.cpp:144
-msgid "&Decrypt File..."
+#: main.cpp:37
+msgid "Open key manager"
 msgstr ""
 
-#: kgpgeditor.cpp:149
-msgid "&Generate Signature..."
+#: main.cpp:38
+msgid "Show encrypted file"
 msgstr ""
 
-#: kgpgeditor.cpp:150
-msgid "&Verify Signature..."
+#: main.cpp:39
+msgid "Sign file"
 msgstr ""
 
-#: kgpgeditor.cpp:151
-msgid "&Check MD5 Sum..."
+#: main.cpp:40
+msgid "Verify signature"
 msgstr ""
 
-#: kgpgeditor.cpp:220 kgpgeditor.cpp:230 kgpgeditor.cpp:467 kgpgeditor.cpp:481
-#: kgpgeditor.cpp:513
-msgid "*|All Files"
-msgstr "*|Pob Ffeil"
+#: main.cpp:41
+msgid "Shred file"
+msgstr ""
 
-#: kgpgeditor.cpp:220
-msgid "Open File to Encode"
+#: main.cpp:42
+msgid "File to open"
+msgstr "Ffeil i agor"
+
+#: main.cpp:50
+msgid "KGpg"
+msgstr "KGpg"
+
+#: kgpglibrary.cpp:82
+msgid "You have not chosen an encryption key."
 msgstr ""
 
-#: kgpgeditor.cpp:230
-msgid "Open File to Decode"
+#: kgpglibrary.cpp:107
+msgid ""
+"<b>%1 Files left.</b>\n"
+"Encrypting </b>%2"
 msgstr ""
 
-#: kgpgeditor.cpp:244
-msgid "Decrypt File To"
+#: kgpglibrary.cpp:108
+#, c-format
+msgid "<b>Encrypting </b>%2"
 msgstr ""
 
-#: kgpgeditor.cpp:317
+#: kgpglibrary.cpp:125
+msgid "Processing encryption (%1)"
+msgstr ""
+
+#: kgpglibrary.cpp:143
+#, c-format
 msgid ""
-"The document could not been saved, as the selected encoding cannot encode every "
-"unicode character in it."
+"_n: Shredding %n file\n"
+"Shredding %n files"
 msgstr ""
 
-#: kgpgeditor.cpp:325 kgpgeditor.cpp:352
+#: kgpglibrary.cpp:157
+msgid "KGpg Error"
+msgstr ""
+
+#: kgpglibrary.cpp:157
+msgid "Process halted, not all files were shredded."
+msgstr ""
+
+#: kgpglibrary.cpp:175
+msgid "<b>Process halted</b>.<br>Not all files were encrypted."
+msgstr ""
+
+#: kgpglibrary.cpp:195
+#, c-format
+msgid "Decrypting %1"
+msgstr ""
+
+#: kgpglibrary.cpp:197
+msgid "Processing decryption"
+msgstr ""
+
+#: kgpglibrary.cpp:225 kgpgview.cpp:130
 msgid ""
-"The document could not be saved, please check your permissions and disk space."
+"<p>The file <b>%1</b> is a public key."
+"<br>Do you want to import it ?</p>"
 msgstr ""
 
-#: kgpgeditor.cpp:379 kgpgeditor.cpp:388
-msgid "Overwrite existing file %1?"
+#: kgpglibrary.cpp:236
+msgid ""
+"<p>The file <b>%1</b> is a private key block. Please use KGpg key manager to "
+"import it.</p>"
 msgstr ""
 
-#: kgpgeditor.cpp:380 kgpgeditor.cpp:389
-msgid "Overwrite"
-msgstr "Trosysgrifo"
+#: kgpglibrary.cpp:240 kgpgview.cpp:165 kgpgview.cpp:361
+msgid "Decryption failed."
+msgstr ""
 
-#: kgpgeditor.cpp:467 kgpgeditor.cpp:513
-msgid "Open File to Verify"
+#: kgpgview.cpp:97
+msgid ""
+"<qt><b>Remote file dropped</b>."
+"<br>The remote file will now be copied to a temporary file to process requested "
+"operation. This temporary file will be deleted after operation.</qt>"
 msgstr ""
 
-#: kgpgeditor.cpp:481
-msgid "Open File to Sign"
+#: kgpgview.cpp:100
+msgid "Could not download file."
 msgstr ""
 
-#: keyservers.cpp:55
-msgid "Key Server"
+#: kgpgview.cpp:143
+msgid ""
+"This file is a private key.\n"
+"Please use kgpg key management to import it."
 msgstr ""
 
-#: keyservers.cpp:163 keyservers.cpp:409
-msgid "You must enter a search string."
+#: kgpgview.cpp:179
+msgid "Unable to read file."
 msgstr ""
 
-#: keyservers.cpp:178
-msgid "Connecting to the server..."
+#: kgpgview.cpp:211
+msgid "S&ign/Verify"
 msgstr ""
 
-#: keyservers.cpp:233
-msgid "You must choose a key."
+#: kgpgview.cpp:212
+msgid "En&crypt"
+msgstr "Cêl-ysgrifo"
+
+#: kgpgview.cpp:213
+msgid "&Decrypt"
 msgstr ""
 
-#: keyservers.cpp:265
-msgid "Found %1 matching keys"
+#: kgpgview.cpp:231
+msgid "untitled"
+msgstr "heb deitl"
+
+#: kgpgview.cpp:242
+msgid "Missing Key"
 msgstr ""
 
-#: keyservers.cpp:374 keyservers.cpp:442
-msgid "<b>Connecting to the server...</b>"
+#: kgpgview.cpp:295
+msgid "Signing not possible: bad passphrase or missing key"
 msgstr ""
 
-#: keyservers.cpp:375 keyservers.cpp:443
-msgid "&Abort"
-msgstr "&Erthylu"
+#: kgpgview.cpp:388
+msgid "Encryption failed."
+msgstr ""
 
 #~ msgid "Keys"
 #~ msgstr "Allweddi"
diff --git a/tde-i18n-cy/messages/tdeutils/khexedit.po b/tde-i18n-cy/messages/tdeutils/khexedit.po
index 12bc8ac47be..11ae3099961 100644
--- a/tde-i18n-cy/messages/tdeutils/khexedit.po
+++ b/tde-i18n-cy/messages/tdeutils/khexedit.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdeutils/khexedit.po\n"
-"POT-Creation-Date: 2006-04-17 03:54+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -51,18 +52,109 @@ msgstr ""
 msgid "Searc&hbar"
 msgstr ""
 
-#: chartabledialog.cc:37
-msgid "Character Table"
-msgstr "Tabl Nodau"
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "KD wrth KGyfieithu"
 
-#: chartabledialog.cc:49 dialog.cc:1402 fileinfodialog.cc:106
-msgid "Decimal"
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "kyfieithu@dotmon.com"
+
+#: hexbuffer.cc:1925 hexbuffer.cc:4832
+msgid "Page %1 of %2"
+msgstr ""
+
+#: hexbuffer.cc:2852
+msgid "to"
+msgstr "i"
+
+#: hexbuffer.cc:4853 hexbuffer.cc:4858
+msgid "Next"
+msgstr "Nesaf"
+
+#: hexbuffer.cc:4863 hexbuffer.cc:4868
+msgid "Previous"
+msgstr "Cynt"
+
+#: hexbuffer.cc:4886
+msgid "Generated by khexedit"
+msgstr ""
+
+#: stringdialog.cc:38 stringdialog.cc:201
+msgid "Extract Strings"
+msgstr ""
+
+#: stringdialog.cc:57
+msgid "&Minimum length:"
+msgstr ""
+
+#: stringdialog.cc:66
+msgid "&Filter:"
+msgstr "&Hidl:"
+
+#: stringdialog.cc:71
+msgid "&Use"
+msgstr "&Defnydd"
+
+#: stringdialog.cc:80
+msgid "&Ignore case"
+msgstr ""
+
+#: stringdialog.cc:84
+msgid "Show offset as &decimal"
+msgstr ""
+
+#: hexviewwidget.cc:1102 stringdialog.cc:95
+msgid "Offset"
+msgstr "Atred"
+
+#: stringdialog.cc:96
+msgid "String"
+msgstr "Llinell"
+
+#: stringdialog.cc:106
+msgid "Number of strings:"
+msgstr ""
+
+#: stringdialog.cc:114
+msgid "Displayed:"
+msgstr ""
+
+#: stringdialog.cc:197
+msgid ""
+"The filter expression you have specified is illegal. You must specify a valid "
+"regular expression.\n"
+"Continue without filter?"
+msgstr ""
+
+#: fileinfodialog.cc:160 stringdialog.cc:254
+msgid "Warning: Document has been modified since last update"
+msgstr ""
+
+#: fileinfodialog.cc:73
+msgid "Statistics"
+msgstr "Ystadegau"
+
+#: fileinfodialog.cc:89
+msgid "File name: "
+msgstr "Enw'r ffeil: "
+
+#: fileinfodialog.cc:93
+msgid "Size [bytes]: "
 msgstr ""
 
 #: chartabledialog.cc:50 dialog.cc:1401 fileinfodialog.cc:105
 msgid "Hexadecimal"
 msgstr ""
 
+#: chartabledialog.cc:49 dialog.cc:1402 fileinfodialog.cc:106
+msgid "Decimal"
+msgstr ""
+
 #: chartabledialog.cc:51 dialog.cc:1403 fileinfodialog.cc:107
 msgid "Octal"
 msgstr ""
@@ -75,10 +167,14 @@ msgstr "Deuaidd"
 msgid "Text"
 msgstr "Testun"
 
-#: chartabledialog.cc:70
-msgid "Insert this number of characters:"
+#: fileinfodialog.cc:110
+msgid "Occurrence"
 msgstr ""
 
+#: fileinfodialog.cc:111
+msgid "Percent"
+msgstr "Canran"
+
 #: parts/kpart/khepartfactory.cpp:30
 msgid "KHexEdit2Part"
 msgstr ""
@@ -159,463 +255,883 @@ msgstr ""
 msgid "&Both Columns"
 msgstr ""
 
-#: searchbar.cc:63 toplevel.cc:862
-msgid "Hex"
-msgstr "Hecs"
+#: hextoolwidget.cc:44
+msgid "Signed 8 bit:"
+msgstr ""
 
-#: searchbar.cc:63 toplevel.cc:866
-msgid "Dec"
-msgstr "Rhag"
+#: hextoolwidget.cc:44
+msgid "Unsigned 8 bit:"
+msgstr ""
 
-#: searchbar.cc:63 toplevel.cc:870
-msgid "Oct"
-msgstr "Hyd"
+#: hextoolwidget.cc:45
+msgid "Signed 16 bit:"
+msgstr ""
 
-#: searchbar.cc:63 toplevel.cc:874
-msgid "Bin"
+#: hextoolwidget.cc:45
+msgid "Unsigned 16 bit:"
 msgstr ""
 
-#: searchbar.cc:64 toplevel.cc:878
-msgid "Txt"
+#: hextoolwidget.cc:50
+msgid "Signed 32 bit:"
 msgstr ""
 
-#: dialog.cc:178 hexeditorwidget.cc:1515 hexeditorwidget.cc:1529
-#: hexeditorwidget.cc:1597 searchbar.cc:73
-msgid "Find"
-msgstr "Canfod:"
+#: hextoolwidget.cc:50
+msgid "Unsigned 32 bit:"
+msgstr ""
 
-#: searchbar.cc:79
-msgid "Backwards"
+#: hextoolwidget.cc:51
+msgid "32 bit float:"
 msgstr ""
 
-#: searchbar.cc:80
-msgid "Ignore case"
+#: hextoolwidget.cc:51
+msgid "64 bit float:"
 msgstr ""
 
-#: hexmanagerwidget.cc:136
-msgid "Conversion"
-msgstr "Trosiad"
+#: converterdialog.cc:81 hextoolwidget.cc:56
+msgid "Hexadecimal:"
+msgstr ""
 
-#: main.cc:34
-msgid "TDE hex editor"
+#: converterdialog.cc:85 hextoolwidget.cc:56
+msgid "Octal:"
 msgstr ""
 
-#: main.cc:40
-msgid "Jump to 'offset'"
+#: converterdialog.cc:87 hextoolwidget.cc:57
+msgid "Binary:"
+msgstr "Deuaidd :"
+
+#: converterdialog.cc:89 hextoolwidget.cc:57
+msgid "Text:"
+msgstr "Testun:"
+
+#: hextoolwidget.cc:96
+msgid "Show little endian decoding"
 msgstr ""
 
-#: main.cc:41
-msgid "File(s) to open"
+#: hextoolwidget.cc:110
+msgid "Show unsigned as hexadecimal"
 msgstr ""
 
-#: main.cc:49
-msgid "KHexEdit"
-msgstr "KHexEdit"
+#: hextoolwidget.cc:122
+msgid "Stream length:"
+msgstr ""
 
-#: main.cc:54
-msgid ""
-"\n"
-"This program uses modified code and techniques from other TDE programs,\n"
-"specifically kwrite, tdeiconedit and ksysv. Credit goes to authors\n"
-"and maintainers.\n"
-"\n"
-"Leon Lessing, leon@lrlabs.com, has made parts of the bit swapping\n"
-"functionality.\n"
-"\n"
-"Craig Graham, c_graham@hinge.mistral.co.uk, has made parts of\n"
-"the bit stream functionality of the conversion field.\n"
-"\n"
-"Dima Rogozin, dima@mercury.co.il, has extended the string dialog\n"
-"list capabilities.\n"
-"\n"
-"Edward Livingston-Blade, sbcs@bigfoot.com, has given me very good\n"
-"reports which removed some nasty bugs.\n"
+#: hextoolwidget.cc:127
+msgid "Fixed 8 Bit"
 msgstr ""
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "KD wrth KGyfieithu"
+#: hextoolwidget.cc:132
+msgid "Bit Window"
+msgstr ""
 
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "kyfieithu@dotmon.com"
+#: hextoolwidget.cc:132
+msgid "Bits Window"
+msgstr ""
 
-#: stringdialog.cc:38 stringdialog.cc:201
-msgid "Extract Strings"
+#: optiondialog.cc:105
+msgid "Layout"
+msgstr "Cynllun"
+
+#: optiondialog.cc:105
+msgid "Data Layout in Editor"
 msgstr ""
 
-#: stringdialog.cc:57
-msgid "&Minimum length:"
+#: optiondialog.cc:113
+msgid "Hexadecimal Mode"
 msgstr ""
 
-#: stringdialog.cc:66
-msgid "&Filter:"
-msgstr "&Hidl:"
+#: optiondialog.cc:114
+msgid "Decimal Mode"
+msgstr ""
 
-#: stringdialog.cc:71
-msgid "&Use"
-msgstr "&Defnydd"
+#: optiondialog.cc:115
+msgid "Octal Mode"
+msgstr ""
 
-#: stringdialog.cc:80
-msgid "&Ignore case"
+#: optiondialog.cc:116
+msgid "Binary Mode"
 msgstr ""
 
-#: stringdialog.cc:84
-msgid "Show offset as &decimal"
+#: optiondialog.cc:117
+msgid "Text Only Mode"
 msgstr ""
 
-#: hexviewwidget.cc:1102 stringdialog.cc:95
-msgid "Offset"
-msgstr "Atred"
+#: optiondialog.cc:146
+msgid "Default l&ine size [bytes]:"
+msgstr ""
 
-#: stringdialog.cc:96
-msgid "String"
-msgstr "Llinell"
+#: optiondialog.cc:150
+msgid "Colu&mn size [bytes]:"
+msgstr ""
 
-#: stringdialog.cc:106
-msgid "Number of strings:"
+#: optiondialog.cc:158
+msgid "Line size is &fixed (use scrollbar when required)"
 msgstr ""
 
-#: stringdialog.cc:114
-msgid "Displayed:"
+#: optiondialog.cc:164
+msgid "Loc&k column at end of line (when column size>1)"
 msgstr ""
 
-#: stringdialog.cc:197
+#: exportdialog.cc:330 optiondialog.cc:175 optiondialog.cc:438
+#: printdialogpage.cc:124 printdialogpage.cc:130
+msgid "None"
+msgstr "Dim"
+
+#: optiondialog.cc:176
+msgid "Vertical Only"
+msgstr ""
+
+#: optiondialog.cc:177
+msgid "Horizontal Only"
+msgstr ""
+
+#: optiondialog.cc:178
+msgid "Both Directions"
+msgstr ""
+
+#: optiondialog.cc:185
+msgid "&Gridlines between text:"
+msgstr ""
+
+#: optiondialog.cc:203
+msgid "&Left separator width [pixels]:"
+msgstr ""
+
+#: optiondialog.cc:207
+msgid "&Right separator width [pixels]:"
+msgstr ""
+
+#: optiondialog.cc:223
+msgid "&Separator margin width [pixels]:"
+msgstr ""
+
+#: optiondialog.cc:227
+msgid "&Edge margin width [pixels]:"
+msgstr ""
+
+#: optiondialog.cc:231
+msgid "Column separation is e&qual to one character"
+msgstr ""
+
+#: optiondialog.cc:244
+msgid "Column separa&tion [pixels]:"
+msgstr ""
+
+#: optiondialog.cc:257
+msgid "Cursor"
+msgstr "Cyrchydd"
+
+#: optiondialog.cc:258
+msgid "Cursor Behavior (only valid for editor)"
+msgstr ""
+
+#: optiondialog.cc:262
+msgid "Blinking"
+msgstr ""
+
+#: optiondialog.cc:266 optiondialog.cc:267
+msgid "Do not b&link"
+msgstr ""
+
+#: optiondialog.cc:274
+msgid "&Blink interval [ms]:"
+msgstr ""
+
+#: optiondialog.cc:284
+msgid "Shape"
+msgstr "Siâp"
+
+#: optiondialog.cc:288
+msgid "Always &use block (rectangular) cursor"
+msgstr ""
+
+#: optiondialog.cc:294
+msgid "Use &thick cursor in insert mode"
+msgstr ""
+
+#: optiondialog.cc:299
+msgid "Cursor Behavior When Editor Loses Focus"
+msgstr ""
+
+#: optiondialog.cc:304
+msgid "&Stop blinking (if blinking is enabled)"
+msgstr ""
+
+#: optiondialog.cc:306
+msgid "H&ide"
+msgstr "C&uddio"
+
+#: optiondialog.cc:307
+msgid "Do &nothing"
+msgstr ""
+
+#: optiondialog.cc:323
+msgid "Colors"
+msgstr "Lliwiau"
+
+#: optiondialog.cc:324
+msgid "Editor Colors (system selection color is always used)"
+msgstr ""
+
+#: optiondialog.cc:329
+msgid "&Use system colors (as chosen in Control Center)"
+msgstr ""
+
+#: optiondialog.cc:342
+msgid "First, Third ... Line Background"
+msgstr ""
+
+#: optiondialog.cc:343
+msgid "Second, Fourth ... Line Background"
+msgstr ""
+
+#: optiondialog.cc:344
+msgid "Offset Background"
+msgstr ""
+
+#: optiondialog.cc:345
+msgid "Inactive Background"
+msgstr ""
+
+#: optiondialog.cc:346
+msgid "Even Column Text"
+msgstr ""
+
+#: optiondialog.cc:347
+msgid "Odd Column Text"
+msgstr ""
+
+#: optiondialog.cc:348
+msgid "Non Printable Text"
+msgstr ""
+
+#: optiondialog.cc:349
+msgid "Offset Text"
+msgstr ""
+
+#: optiondialog.cc:350
+msgid "Secondary Text"
+msgstr ""
+
+#: optiondialog.cc:351
+msgid "Marked Background"
+msgstr ""
+
+#: optiondialog.cc:352
+msgid "Marked Text"
+msgstr ""
+
+#: optiondialog.cc:353
+msgid "Cursor Background"
+msgstr ""
+
+#: optiondialog.cc:354
+msgid "Cursor Text (block shape)"
+msgstr ""
+
+#: optiondialog.cc:355
+msgid "Bookmark Background"
+msgstr ""
+
+#: optiondialog.cc:356
+msgid "Bookmark Text"
+msgstr ""
+
+#: optiondialog.cc:357
+msgid "Separator"
+msgstr "Gwahanydd"
+
+#: optiondialog.cc:358
+msgid "Grid Lines"
+msgstr ""
+
+#: optiondialog.cc:376
+msgid "Font Selection (editor can only use a fixed font)"
+msgstr ""
+
+#: optiondialog.cc:381
+msgid "&Use system font (as chosen in Control Center)"
+msgstr ""
+
+#: optiondialog.cc:398
+msgid "KHexEdit editor font"
+msgstr ""
+
+#: optiondialog.cc:414
+msgid "&Map non printable characters to:"
+msgstr ""
+
+#: optiondialog.cc:428
+msgid "File Management"
+msgstr "Rheolaeth Ffeiliau"
+
+#: optiondialog.cc:439
+msgid "Most Recent Document"
+msgstr ""
+
+#: optiondialog.cc:440
+msgid "All Recent Documents"
+msgstr ""
+
+#: optiondialog.cc:446
+msgid "Open doc&uments on startup:"
+msgstr ""
+
+#: optiondialog.cc:452
+msgid "&Jump to previous cursor position on startup"
+msgstr ""
+
+#: optiondialog.cc:466
+msgid "Open document with &write protection enabled"
+msgstr ""
+
+#: optiondialog.cc:472
+msgid "&Keep cursor position after reloading document"
+msgstr ""
+
+#: optiondialog.cc:478
+msgid "&Make a backup when saving document"
+msgstr ""
+
+#: optiondialog.cc:488
+msgid "Don't &save \"Recent\" document list on exit"
+msgstr ""
+
+#: optiondialog.cc:492
 msgid ""
-"The filter expression you have specified is illegal. You must specify a valid "
-"regular expression.\n"
-"Continue without filter?"
+"Clicking this check box makes KHexEdit forget his recent document list when the "
+"program is closed.\n"
+"Note: it will not erase any document of the recent document list created by "
+"TDE."
 msgstr ""
 
-#: fileinfodialog.cc:160 stringdialog.cc:254
-msgid "Warning: Document has been modified since last update"
+#: optiondialog.cc:499
+msgid "Cl&ear \"Recent\" Document List"
 msgstr ""
 
-#: statusbarprogress.cc:268
-msgid "%1... %2 of %3"
+#: optiondialog.cc:503
+msgid ""
+"Clicking this button makes KHexEdit forget his recent document list.\n"
+"Note: it will not erase any document of the recent document list created by "
+"TDE."
 msgstr ""
 
-#: statusbarprogress.cc:272
-msgid "%1... %2%"
+#: optiondialog.cc:520
+msgid "Various Properties"
 msgstr ""
 
-#: dialog.cc:44
-msgid "Goto Offset"
+#: optiondialog.cc:526
+msgid "Auto&matic copy to clipboard when selection is ready"
 msgstr ""
 
-#: dialog.cc:60
-msgid "O&ffset:"
-msgstr "A&tred:"
+#: optiondialog.cc:532
+msgid "&Editor starts in \"insert\" mode"
+msgstr ""
 
-#: dialog.cc:73 dialog.cc:223 dialog.cc:564 dialog.cc:810
-msgid "&From cursor"
-msgstr "&O'r cyrchyd"
+#: optiondialog.cc:538
+msgid "Confirm &wrapping (to beginning or end) during search"
+msgstr ""
 
-#: dialog.cc:75 dialog.cc:225 dialog.cc:566 dialog.cc:812
-msgid "&Backwards"
+#: optiondialog.cc:544
+msgid "Cursor jumps to &nearest byte when moved"
 msgstr ""
 
-#: dialog.cc:77 dialog.cc:816
-msgid "&Stay visible"
+#: optiondialog.cc:550
+msgid "Sounds"
+msgstr "Syniau"
+
+#: optiondialog.cc:553
+msgid "Make sound on data &input (eg. typing) failure"
 msgstr ""
 
-#: dialog.cc:194
-msgid "Fo&rmat:"
-msgstr "Ff&ormat:"
+#: optiondialog.cc:557
+msgid "Make sound on &fatal failure"
+msgstr ""
 
-#: dialog.cc:209 dialog.cc:520
-msgid "F&ind:"
-msgstr "C&anfod:"
+#: optiondialog.cc:562
+msgid "Bookmark Visibility"
+msgstr ""
 
-#: dialog.cc:227 dialog.cc:568 dialog.cc:814
-msgid "&In selection"
+#: optiondialog.cc:565
+msgid "Use visible bookmarks in the offset column"
 msgstr ""
 
-#: dialog.cc:229
-msgid "&Use navigator"
+#: optiondialog.cc:569
+msgid "Use visible bookmarks in the editor fields"
 msgstr ""
 
-#: dialog.cc:231 dialog.cc:572
-msgid "Ignore c&ase"
+#: optiondialog.cc:574
+msgid "Confirm when number of printed pages will e&xceed limit"
 msgstr ""
 
-#: dialog.cc:348
-msgid "Find (Navigator)"
+#: optiondialog.cc:594
+msgid "&Threshold [pages]:"
 msgstr ""
 
-#: dialog.cc:349
-msgid "New &Key"
+#: optiondialog.cc:611
+msgid "&Undo limit:"
 msgstr ""
 
-#: dialog.cc:350
-msgid "&Next"
-msgstr "&Nesaf"
+#: hexerror.cc:32
+msgid "No data"
+msgstr ""
 
-#: dialog.cc:362
-msgid "Searching for:"
+#: hexerror.cc:33
+msgid "Insufficient memory"
 msgstr ""
 
-#: dialog.cc:485 dialog.cc:681 hexeditorwidget.cc:1768 hexeditorwidget.cc:1775
-msgid "Find & Replace"
+#: hexerror.cc:34
+msgid "List is full"
 msgstr ""
 
-#: dialog.cc:504
-msgid "Fo&rmat (find):"
+#: hexerror.cc:35
+msgid "Read operation failed"
 msgstr ""
 
-#: dialog.cc:533
-msgid "For&mat (replace):"
+#: hexerror.cc:36
+msgid "Write operation failed"
 msgstr ""
 
-#: dialog.cc:550
-msgid "Rep&lace:"
-msgstr "Amn&ewid:"
+#: hexerror.cc:37
+msgid "Empty argument"
+msgstr ""
 
-#: dialog.cc:570
-msgid "&Prompt"
-msgstr "Anno&g"
+#: hexerror.cc:38
+msgid "Illegal argument"
+msgstr ""
 
-#: dialog.cc:657
-msgid "Source and target values can not be equal."
+#: hexerror.cc:39
+msgid "Null pointer argument"
 msgstr ""
 
-#: dialog.cc:682
-msgid "Replace &All"
-msgstr "Amnewid y &Cwbl"
+#: hexerror.cc:40
+msgid "Wrap buffer"
+msgstr ""
 
-#: dialog.cc:683
-#, fuzzy
-msgid "Do Not Replace"
-msgstr "Amn&ewid:"
+#: hexerror.cc:41
+msgid "No match"
+msgstr ""
 
-#: dialog.cc:691
-msgid "Replace marked data at cursor position?"
+#: hexerror.cc:42
+msgid "No data is selected"
 msgstr ""
 
-#: dialog.cc:761
-msgid "Binary Filter"
+#: hexerror.cc:43
+msgid "Empty document"
+msgstr "Dogfen Wag"
+
+#: hexerror.cc:44
+msgid "No active document"
 msgstr ""
 
-#: dialog.cc:780
-msgid "O&peration:"
+#: hexerror.cc:45
+msgid "No data is marked"
 msgstr ""
 
-#: dialog.cc:855
-msgid "Fo&rmat (operand):"
+#: hexerror.cc:46
+msgid "Document is write protected"
 msgstr ""
 
-#: dialog.cc:871
-msgid "O&perand:"
+#: hexerror.cc:47
+msgid "Document is resize protected"
 msgstr ""
 
-#: dialog.cc:891
-msgid "Swap rule"
+#: hexerror.cc:48
+msgid "Operation was stopped"
 msgstr ""
 
-#: dialog.cc:903
-msgid "&Reset"
-msgstr "&Ailosod"
+#: hexerror.cc:49
+msgid "Illegal mode"
+msgstr ""
 
-#: dialog.cc:929
-msgid "&Group size [bytes]"
+#: hexerror.cc:50
+msgid "Program is busy, try again later"
 msgstr ""
 
-#: dialog.cc:941
-msgid "S&hift size [bits]"
+#: hexerror.cc:51
+msgid "Value is not within valid range"
 msgstr ""
 
-#: dialog.cc:985
-msgid "Shift size is zero."
+#: hexerror.cc:52
+msgid "Operation was aborted"
 msgstr ""
 
-#: dialog.cc:994
-msgid "Swap rule does not define any swapping."
+#: hexerror.cc:53
+msgid "File could not be opened for writing"
 msgstr ""
 
-#: dialog.cc:1070
-msgid "Insert Pattern"
+#: hexerror.cc:54
+msgid "File could not be opened for reading"
 msgstr ""
 
-#: dialog.cc:1089
-msgid "&Size:"
-msgstr "&Maint:"
+#: hexerror.cc:60
+msgid "Unknown error"
+msgstr "Gwall anhysbys"
 
-#: dialog.cc:1102
-msgid "Fo&rmat (pattern):"
+#: chartabledialog.cc:37
+msgid "Character Table"
+msgstr "Tabl Nodau"
+
+#: chartabledialog.cc:70
+msgid "Insert this number of characters:"
 msgstr ""
 
-#: dialog.cc:1118
-msgid "&Pattern:"
-msgstr "&Patrwm:"
+#: main.cc:34
+msgid "TDE hex editor"
+msgstr ""
 
-#: dialog.cc:1127
-msgid "&Offset:"
-msgstr "A&tred:"
+#: main.cc:40
+msgid "Jump to 'offset'"
+msgstr ""
 
-#: dialog.cc:1142
-msgid "R&epeat pattern"
+#: main.cc:41
+msgid "File(s) to open"
 msgstr ""
 
-#: dialog.cc:1144
-msgid "&Insert on cursor position"
+#: main.cc:49
+msgid "KHexEdit"
+msgstr "KHexEdit"
+
+#: main.cc:54
+msgid ""
+"\n"
+"This program uses modified code and techniques from other TDE programs,\n"
+"specifically kwrite, tdeiconedit and ksysv. Credit goes to authors\n"
+"and maintainers.\n"
+"\n"
+"Leon Lessing, leon@lrlabs.com, has made parts of the bit swapping\n"
+"functionality.\n"
+"\n"
+"Craig Graham, c_graham@hinge.mistral.co.uk, has made parts of\n"
+"the bit stream functionality of the conversion field.\n"
+"\n"
+"Dima Rogozin, dima@mercury.co.il, has extended the string dialog\n"
+"list capabilities.\n"
+"\n"
+"Edward Livingston-Blade, sbcs@bigfoot.com, has given me very good\n"
+"reports which removed some nasty bugs.\n"
 msgstr ""
 
-#: dialog.cc:1284
-msgid "Your request can not be processed."
+#: printdialogpage.cc:38
+msgid "Page Layout"
+msgstr "Haenlun y Dudalen"
+
+#: printdialogpage.cc:59
+msgid "Margins [millimeter]"
 msgstr ""
 
-#: dialog.cc:1288
-msgid "Examine argument(s) and try again."
+#: printdialogpage.cc:72
+msgid "&Top:"
+msgstr "&Pen:"
+
+#: printdialogpage.cc:73
+msgid "&Bottom:"
+msgstr "&Gwaelod:"
+
+#: printdialogpage.cc:74
+msgid "&Left:"
+msgstr "&Chwith:"
+
+#: printdialogpage.cc:75
+msgid "&Right:"
+msgstr "&De:"
+
+#: printdialogpage.cc:102
+msgid "Draw h&eader above text"
 msgstr ""
 
-#: dialog.cc:1294
-msgid "Invalid argument(s)"
-msgstr "Ymresymiad(au) annilys"
+#: printdialogpage.cc:118
+msgid "Left:"
+msgstr "Chwith:"
 
-#: dialog.cc:1303
-msgid "You must specify a destination file."
+#: printdialogpage.cc:119
+msgid "Center:"
+msgstr "Canol :"
+
+#: printdialogpage.cc:120
+msgid "Right:"
+msgstr "De:"
+
+#: printdialogpage.cc:121
+msgid "Border:"
+msgstr "Ymyl:"
+
+#: printdialogpage.cc:125
+msgid "Date & Time"
+msgstr "Dyddiad ac Amser"
+
+#: exportdialog.cc:333 printdialogpage.cc:126
+msgid "Page Number"
+msgstr "Rhif y Dudalen"
+
+#: exportdialog.cc:332 printdialogpage.cc:127
+msgid "Filename"
+msgstr "Enw Ffeil"
+
+#: printdialogpage.cc:131
+msgid "Single Line"
+msgstr "Llinell unigol"
+
+#: printdialogpage.cc:132
+msgid "Rectangle"
+msgstr "Hirsgwâr"
+
+#: printdialogpage.cc:164
+msgid "Draw &footer below text"
 msgstr ""
 
-#: dialog.cc:1313
-msgid "You have specified an existing folder."
+#: searchbar.cc:63 toplevel.cc:862
+msgid "Hex"
+msgstr "Hecs"
+
+#: searchbar.cc:63 toplevel.cc:866
+msgid "Dec"
+msgstr "Rhag"
+
+#: searchbar.cc:63 toplevel.cc:870
+msgid "Oct"
+msgstr "Hyd"
+
+#: searchbar.cc:63 toplevel.cc:874
+msgid "Bin"
 msgstr ""
 
-#: dialog.cc:1320
-msgid "You do not have write permission to this file."
+#: searchbar.cc:64 toplevel.cc:878
+msgid "Txt"
 msgstr ""
 
-#: dialog.cc:1325
+#: dialog.cc:178 hexeditorwidget.cc:1515 hexeditorwidget.cc:1529
+#: hexeditorwidget.cc:1597 searchbar.cc:73
+msgid "Find"
+msgstr "Canfod:"
+
+#: searchbar.cc:79
+msgid "Backwards"
+msgstr ""
+
+#: searchbar.cc:80
+msgid "Ignore case"
+msgstr ""
+
+#: conversion.cc:48
 msgid ""
-"You have specified an existing file.\n"
-"Overwrite current file?"
+"_: Default encoding\n"
+"Default"
+msgstr "Rhagosodol"
+
+#: conversion.cc:49
+msgid "EBCDIC"
 msgstr ""
 
-#: dialog.cc:1328 hexeditorwidget.cc:990
-msgid "Overwrite"
-msgstr "Trosysgrifo"
+#: conversion.cc:50
+msgid "US-ASCII (7 bit)"
+msgstr ""
 
-#: dialog.cc:1405
-msgid "Regular Text"
+#: conversion.cc:51
+msgid "Unknown"
+msgstr "Anhysbys"
+
+#: exportdialog.cc:35 exportdialog.cc:493 exportdialog.cc:537
+#: exportdialog.cc:566 exportdialog.cc:634
+msgid "Export Document"
 msgstr ""
 
-#: dialog.cc:1416
-msgid "operand AND data"
+#: exportdialog.cc:40
+msgid "Destination"
+msgstr "Cyrchfan"
+
+#: exportdialog.cc:158
+msgid "Plain Text"
+msgstr "Testun Plaen"
+
+#: exportdialog.cc:159
+msgid "HTML Tables"
 msgstr ""
 
-#: dialog.cc:1417
-msgid "operand OR data"
+#: exportdialog.cc:160
+msgid "Rich Text (RTF)"
 msgstr ""
 
-#: dialog.cc:1418
-msgid "operand XOR data"
+#: exportdialog.cc:161
+msgid "C Array"
 msgstr ""
 
-#: dialog.cc:1419
-msgid "INVERT data"
+#: exportdialog.cc:169
+msgid "&Format:"
+msgstr "&Fformat:"
+
+#: exportdialog.cc:177
+msgid "&Destination:"
+msgstr "&Cyrchfan:"
+
+#: exportdialog.cc:181
+msgid "(Package folder)"
 msgstr ""
 
-#: dialog.cc:1420
-msgid "REVERSE data"
+#: exportdialog.cc:191
+msgid "Choose..."
+msgstr "Dewis..."
+
+#: exportdialog.cc:202
+msgid "Export Range"
 msgstr ""
 
-#: dialog.cc:1421
-msgid "ROTATE data"
+#: exportdialog.cc:210
+msgid "&Everything"
+msgstr "&Popeth"
+
+#: exportdialog.cc:215
+msgid "&Selection"
+msgstr "&Dewisiad"
+
+#: exportdialog.cc:220
+msgid "&Range"
+msgstr "&Amrediad"
+
+#: exportdialog.cc:229
+msgid "&From offset:"
 msgstr ""
 
-#: dialog.cc:1422
-msgid "SHIFT data"
+#: exportdialog.cc:235
+msgid "&To offset:"
 msgstr ""
 
-#: dialog.cc:1423
-msgid "Swap Individual Bits"
+#: exportdialog.cc:280 exportdialog.cc:374
+msgid "No options for this format."
 msgstr ""
 
-#: hextoolwidget.cc:44
-msgid "Signed 8 bit:"
+#: exportdialog.cc:296
+msgid "HTML Options (one table per page)"
 msgstr ""
 
-#: hextoolwidget.cc:44
-msgid "Unsigned 8 bit:"
+#: exportdialog.cc:317
+msgid "&Lines per table:"
 msgstr ""
 
-#: hextoolwidget.cc:45
-msgid "Signed 16 bit:"
+#: exportdialog.cc:325
+msgid "Filename &prefix (in package):"
 msgstr ""
 
-#: hextoolwidget.cc:45
-msgid "Unsigned 16 bit:"
+#: exportdialog.cc:331
+msgid "Filename with Path"
 msgstr ""
 
-#: hextoolwidget.cc:50
-msgid "Signed 32 bit:"
+#: exportdialog.cc:339
+msgid "Header &above text:"
 msgstr ""
 
-#: hextoolwidget.cc:50
-msgid "Unsigned 32 bit:"
+#: exportdialog.cc:347
+msgid "&Footer below text:"
 msgstr ""
 
-#: hextoolwidget.cc:51
-msgid "32 bit float:"
+#: exportdialog.cc:351
+msgid "Link \"index.html\" to &table of contents file"
 msgstr ""
 
-#: hextoolwidget.cc:51
-msgid "64 bit float:"
+#: exportdialog.cc:355
+msgid "&Include navigator bar"
 msgstr ""
 
-#: converterdialog.cc:81 hextoolwidget.cc:56
-msgid "Hexadecimal:"
+#: exportdialog.cc:359
+msgid "&Use black and white only"
 msgstr ""
 
-#: converterdialog.cc:85 hextoolwidget.cc:56
-msgid "Octal:"
+#: exportdialog.cc:388
+msgid "C Array Options"
 msgstr ""
 
-#: converterdialog.cc:87 hextoolwidget.cc:57
-msgid "Binary:"
-msgstr "Deuaidd :"
+#: exportdialog.cc:402
+msgid "Array name:"
+msgstr ""
 
-#: converterdialog.cc:89 hextoolwidget.cc:57
-msgid "Text:"
-msgstr "Testun:"
+#: exportdialog.cc:407
+msgid "char"
+msgstr ""
 
-#: hextoolwidget.cc:96
-msgid "Show little endian decoding"
+#: exportdialog.cc:408
+msgid "unsigned char"
 msgstr ""
 
-#: hextoolwidget.cc:110
-msgid "Show unsigned as hexadecimal"
+#: exportdialog.cc:409
+msgid "short"
+msgstr "byr"
+
+#: exportdialog.cc:410
+msgid "unsigned short"
 msgstr ""
 
-#: hextoolwidget.cc:122
-msgid "Stream length:"
+#: exportdialog.cc:411
+msgid "int"
+msgstr "int"
+
+#: exportdialog.cc:412
+msgid "unsigned int"
 msgstr ""
 
-#: hextoolwidget.cc:127
-msgid "Fixed 8 Bit"
+#: exportdialog.cc:413
+msgid "float"
+msgstr "rhif arnawf"
+
+#: exportdialog.cc:414
+msgid "double"
+msgstr "dwbl"
+
+#: exportdialog.cc:419
+msgid "Element type:"
 msgstr ""
 
-#: hextoolwidget.cc:132
-msgid "Bit Window"
+#: exportdialog.cc:427
+msgid "Elements per line:"
 msgstr ""
 
-#: hextoolwidget.cc:132
-msgid "Bits Window"
+#: exportdialog.cc:431
+msgid "Print unsigned values as hexadecimal"
 msgstr ""
 
-#: converterdialog.cc:71
-msgid "Converter"
+#: exportdialog.cc:535
+msgid "The filename prefix can not contain empty letters or punctuation marks."
 msgstr ""
 
-#: converterdialog.cc:72
-msgid "&On Cursor"
+#: exportdialog.cc:561
+msgid "This format is not yet supported."
 msgstr ""
 
-#: converterdialog.cc:83
-msgid "Decimal:"
+#: exportdialog.cc:638
+msgid "You must specify a destination."
+msgstr ""
+
+#: exportdialog.cc:650
+msgid "Unable to create a new folder"
+msgstr ""
+
+#: exportdialog.cc:661
+msgid "You have specified an existing file"
+msgstr ""
+
+#: exportdialog.cc:669
+msgid "You do not have write permission to this folder."
+msgstr ""
+
+#: exportdialog.cc:679
+msgid ""
+"You have specified an existing folder.\n"
+"If you continue, any existing file in the range \"%1\" to \"%2\" can be lost.\n"
+"Continue?"
+msgstr ""
+
+#: hexviewwidget.cc:1128
+msgid "Remove Bookmark"
+msgstr ""
+
+#: hexviewwidget.cc:1158
+msgid "Replace Bookmark"
+msgstr ""
+
+#: statusbarprogress.cc:268
+msgid "%1... %2 of %3"
+msgstr ""
+
+#: statusbarprogress.cc:272
+msgid "%1... %2%"
 msgstr ""
 
 #: toplevel.cc:133
@@ -859,119 +1375,248 @@ msgstr "Amgodiad: %1"
 msgid "Selection:"
 msgstr "Dewisiad :"
 
-#: hexerror.cc:32
-msgid "No data"
+#: converterdialog.cc:71
+msgid "Converter"
 msgstr ""
 
-#: hexerror.cc:33
-msgid "Insufficient memory"
+#: converterdialog.cc:72
+msgid "&On Cursor"
 msgstr ""
 
-#: hexerror.cc:34
-msgid "List is full"
+#: converterdialog.cc:83
+msgid "Decimal:"
 msgstr ""
 
-#: hexerror.cc:35
-msgid "Read operation failed"
+#: dialog.cc:44
+msgid "Goto Offset"
 msgstr ""
 
-#: hexerror.cc:36
-msgid "Write operation failed"
+#: dialog.cc:60
+msgid "O&ffset:"
+msgstr "A&tred:"
+
+#: dialog.cc:73 dialog.cc:223 dialog.cc:564 dialog.cc:810
+msgid "&From cursor"
+msgstr "&O'r cyrchyd"
+
+#: dialog.cc:75 dialog.cc:225 dialog.cc:566 dialog.cc:812
+msgid "&Backwards"
 msgstr ""
 
-#: hexerror.cc:37
-msgid "Empty argument"
+#: dialog.cc:77 dialog.cc:816
+msgid "&Stay visible"
 msgstr ""
 
-#: hexerror.cc:38
-msgid "Illegal argument"
+#: dialog.cc:194
+msgid "Fo&rmat:"
+msgstr "Ff&ormat:"
+
+#: dialog.cc:209 dialog.cc:520
+msgid "F&ind:"
+msgstr "C&anfod:"
+
+#: dialog.cc:227 dialog.cc:568 dialog.cc:814
+msgid "&In selection"
 msgstr ""
 
-#: hexerror.cc:39
-msgid "Null pointer argument"
+#: dialog.cc:229
+msgid "&Use navigator"
 msgstr ""
 
-#: hexerror.cc:40
-msgid "Wrap buffer"
+#: dialog.cc:231 dialog.cc:572
+msgid "Ignore c&ase"
 msgstr ""
 
-#: hexerror.cc:41
-msgid "No match"
+#: dialog.cc:348
+msgid "Find (Navigator)"
 msgstr ""
 
-#: hexerror.cc:42
-msgid "No data is selected"
+#: dialog.cc:349
+msgid "New &Key"
 msgstr ""
 
-#: hexerror.cc:43
-msgid "Empty document"
-msgstr "Dogfen Wag"
+#: dialog.cc:350
+msgid "&Next"
+msgstr "&Nesaf"
 
-#: hexerror.cc:44
-msgid "No active document"
+#: dialog.cc:362
+msgid "Searching for:"
 msgstr ""
 
-#: hexerror.cc:45
-msgid "No data is marked"
+#: dialog.cc:485 dialog.cc:681 hexeditorwidget.cc:1768 hexeditorwidget.cc:1775
+msgid "Find & Replace"
 msgstr ""
 
-#: hexerror.cc:46
-msgid "Document is write protected"
+#: dialog.cc:504
+msgid "Fo&rmat (find):"
 msgstr ""
 
-#: hexerror.cc:47
-msgid "Document is resize protected"
+#: dialog.cc:533
+msgid "For&mat (replace):"
 msgstr ""
 
-#: hexerror.cc:48
-msgid "Operation was stopped"
+#: dialog.cc:550
+msgid "Rep&lace:"
+msgstr "Amn&ewid:"
+
+#: dialog.cc:570
+msgid "&Prompt"
+msgstr "Anno&g"
+
+#: dialog.cc:657
+msgid "Source and target values can not be equal."
 msgstr ""
 
-#: hexerror.cc:49
-msgid "Illegal mode"
+#: dialog.cc:682
+msgid "Replace &All"
+msgstr "Amnewid y &Cwbl"
+
+#: dialog.cc:683
+#, fuzzy
+msgid "Do Not Replace"
+msgstr "Amn&ewid:"
+
+#: dialog.cc:691
+msgid "Replace marked data at cursor position?"
 msgstr ""
 
-#: hexerror.cc:50
-msgid "Program is busy, try again later"
+#: dialog.cc:761
+msgid "Binary Filter"
 msgstr ""
 
-#: hexerror.cc:51
-msgid "Value is not within valid range"
+#: dialog.cc:780
+msgid "O&peration:"
 msgstr ""
 
-#: hexerror.cc:52
-msgid "Operation was aborted"
+#: dialog.cc:855
+msgid "Fo&rmat (operand):"
 msgstr ""
 
-#: hexerror.cc:53
-msgid "File could not be opened for writing"
+#: dialog.cc:871
+msgid "O&perand:"
 msgstr ""
 
-#: hexerror.cc:54
-msgid "File could not be opened for reading"
+#: dialog.cc:891
+msgid "Swap rule"
 msgstr ""
 
-#: hexerror.cc:60
-msgid "Unknown error"
-msgstr "Gwall anhysbys"
+#: dialog.cc:903
+msgid "&Reset"
+msgstr "&Ailosod"
 
-#: conversion.cc:48
+#: dialog.cc:929
+msgid "&Group size [bytes]"
+msgstr ""
+
+#: dialog.cc:941
+msgid "S&hift size [bits]"
+msgstr ""
+
+#: dialog.cc:985
+msgid "Shift size is zero."
+msgstr ""
+
+#: dialog.cc:994
+msgid "Swap rule does not define any swapping."
+msgstr ""
+
+#: dialog.cc:1070
+msgid "Insert Pattern"
+msgstr ""
+
+#: dialog.cc:1089
+msgid "&Size:"
+msgstr "&Maint:"
+
+#: dialog.cc:1102
+msgid "Fo&rmat (pattern):"
+msgstr ""
+
+#: dialog.cc:1118
+msgid "&Pattern:"
+msgstr "&Patrwm:"
+
+#: dialog.cc:1127
+msgid "&Offset:"
+msgstr "A&tred:"
+
+#: dialog.cc:1142
+msgid "R&epeat pattern"
+msgstr ""
+
+#: dialog.cc:1144
+msgid "&Insert on cursor position"
+msgstr ""
+
+#: dialog.cc:1284
+msgid "Your request can not be processed."
+msgstr ""
+
+#: dialog.cc:1288
+msgid "Examine argument(s) and try again."
+msgstr ""
+
+#: dialog.cc:1294
+msgid "Invalid argument(s)"
+msgstr "Ymresymiad(au) annilys"
+
+#: dialog.cc:1303
+msgid "You must specify a destination file."
+msgstr ""
+
+#: dialog.cc:1313
+msgid "You have specified an existing folder."
+msgstr ""
+
+#: dialog.cc:1320
+msgid "You do not have write permission to this file."
+msgstr ""
+
+#: dialog.cc:1325
 msgid ""
-"_: Default encoding\n"
-"Default"
-msgstr "Rhagosodol"
+"You have specified an existing file.\n"
+"Overwrite current file?"
+msgstr ""
 
-#: conversion.cc:49
-msgid "EBCDIC"
+#: dialog.cc:1328 hexeditorwidget.cc:990
+msgid "Overwrite"
+msgstr "Trosysgrifo"
+
+#: dialog.cc:1405
+msgid "Regular Text"
 msgstr ""
 
-#: conversion.cc:50
-msgid "US-ASCII (7 bit)"
+#: dialog.cc:1416
+msgid "operand AND data"
 msgstr ""
 
-#: conversion.cc:51
-msgid "Unknown"
-msgstr "Anhysbys"
+#: dialog.cc:1417
+msgid "operand OR data"
+msgstr ""
+
+#: dialog.cc:1418
+msgid "operand XOR data"
+msgstr ""
+
+#: dialog.cc:1419
+msgid "INVERT data"
+msgstr ""
+
+#: dialog.cc:1420
+msgid "REVERSE data"
+msgstr ""
+
+#: dialog.cc:1421
+msgid "ROTATE data"
+msgstr ""
+
+#: dialog.cc:1422
+msgid "SHIFT data"
+msgstr ""
+
+#: dialog.cc:1423
+msgid "Swap Individual Bits"
+msgstr ""
 
 #: hexeditorwidget.cc:583
 #, c-format
@@ -1337,653 +1982,9 @@ msgid ""
 "Could not finish operation.\n"
 msgstr ""
 
-#: exportdialog.cc:35 exportdialog.cc:493 exportdialog.cc:537
-#: exportdialog.cc:566 exportdialog.cc:634
-msgid "Export Document"
-msgstr ""
-
-#: exportdialog.cc:40
-msgid "Destination"
-msgstr "Cyrchfan"
-
-#: exportdialog.cc:158
-msgid "Plain Text"
-msgstr "Testun Plaen"
-
-#: exportdialog.cc:159
-msgid "HTML Tables"
-msgstr ""
-
-#: exportdialog.cc:160
-msgid "Rich Text (RTF)"
-msgstr ""
-
-#: exportdialog.cc:161
-msgid "C Array"
-msgstr ""
-
-#: exportdialog.cc:169
-msgid "&Format:"
-msgstr "&Fformat:"
-
-#: exportdialog.cc:177
-msgid "&Destination:"
-msgstr "&Cyrchfan:"
-
-#: exportdialog.cc:181
-msgid "(Package folder)"
-msgstr ""
-
-#: exportdialog.cc:191
-msgid "Choose..."
-msgstr "Dewis..."
-
-#: exportdialog.cc:202
-msgid "Export Range"
-msgstr ""
-
-#: exportdialog.cc:210
-msgid "&Everything"
-msgstr "&Popeth"
-
-#: exportdialog.cc:215
-msgid "&Selection"
-msgstr "&Dewisiad"
-
-#: exportdialog.cc:220
-msgid "&Range"
-msgstr "&Amrediad"
-
-#: exportdialog.cc:229
-msgid "&From offset:"
-msgstr ""
-
-#: exportdialog.cc:235
-msgid "&To offset:"
-msgstr ""
-
-#: exportdialog.cc:280 exportdialog.cc:374
-msgid "No options for this format."
-msgstr ""
-
-#: exportdialog.cc:296
-msgid "HTML Options (one table per page)"
-msgstr ""
-
-#: exportdialog.cc:317
-msgid "&Lines per table:"
-msgstr ""
-
-#: exportdialog.cc:325
-msgid "Filename &prefix (in package):"
-msgstr ""
-
-#: exportdialog.cc:330 optiondialog.cc:175 optiondialog.cc:438
-#: printdialogpage.cc:124 printdialogpage.cc:130
-msgid "None"
-msgstr "Dim"
-
-#: exportdialog.cc:331
-msgid "Filename with Path"
-msgstr ""
-
-#: exportdialog.cc:332 printdialogpage.cc:127
-msgid "Filename"
-msgstr "Enw Ffeil"
-
-#: exportdialog.cc:333 printdialogpage.cc:126
-msgid "Page Number"
-msgstr "Rhif y Dudalen"
-
-#: exportdialog.cc:339
-msgid "Header &above text:"
-msgstr ""
-
-#: exportdialog.cc:347
-msgid "&Footer below text:"
-msgstr ""
-
-#: exportdialog.cc:351
-msgid "Link \"index.html\" to &table of contents file"
-msgstr ""
-
-#: exportdialog.cc:355
-msgid "&Include navigator bar"
-msgstr ""
-
-#: exportdialog.cc:359
-msgid "&Use black and white only"
-msgstr ""
-
-#: exportdialog.cc:388
-msgid "C Array Options"
-msgstr ""
-
-#: exportdialog.cc:402
-msgid "Array name:"
-msgstr ""
-
-#: exportdialog.cc:407
-msgid "char"
-msgstr ""
-
-#: exportdialog.cc:408
-msgid "unsigned char"
-msgstr ""
-
-#: exportdialog.cc:409
-msgid "short"
-msgstr "byr"
-
-#: exportdialog.cc:410
-msgid "unsigned short"
-msgstr ""
-
-#: exportdialog.cc:411
-msgid "int"
-msgstr "int"
-
-#: exportdialog.cc:412
-msgid "unsigned int"
-msgstr ""
-
-#: exportdialog.cc:413
-msgid "float"
-msgstr "rhif arnawf"
-
-#: exportdialog.cc:414
-msgid "double"
-msgstr "dwbl"
-
-#: exportdialog.cc:419
-msgid "Element type:"
-msgstr ""
-
-#: exportdialog.cc:427
-msgid "Elements per line:"
-msgstr ""
-
-#: exportdialog.cc:431
-msgid "Print unsigned values as hexadecimal"
-msgstr ""
-
-#: exportdialog.cc:535
-msgid "The filename prefix can not contain empty letters or punctuation marks."
-msgstr ""
-
-#: exportdialog.cc:561
-msgid "This format is not yet supported."
-msgstr ""
-
-#: exportdialog.cc:638
-msgid "You must specify a destination."
-msgstr ""
-
-#: exportdialog.cc:650
-msgid "Unable to create a new folder"
-msgstr ""
-
-#: exportdialog.cc:661
-msgid "You have specified an existing file"
-msgstr ""
-
-#: exportdialog.cc:669
-msgid "You do not have write permission to this folder."
-msgstr ""
-
-#: exportdialog.cc:679
-msgid ""
-"You have specified an existing folder.\n"
-"If you continue, any existing file in the range \"%1\" to \"%2\" can be lost.\n"
-"Continue?"
-msgstr ""
-
-#: hexviewwidget.cc:1128
-msgid "Remove Bookmark"
-msgstr ""
-
-#: hexviewwidget.cc:1158
-msgid "Replace Bookmark"
-msgstr ""
-
-#: hexbuffer.cc:1925 hexbuffer.cc:4832
-msgid "Page %1 of %2"
-msgstr ""
-
-#: hexbuffer.cc:2852
-msgid "to"
-msgstr "i"
-
-#: hexbuffer.cc:4853 hexbuffer.cc:4858
-msgid "Next"
-msgstr "Nesaf"
-
-#: hexbuffer.cc:4863 hexbuffer.cc:4868
-msgid "Previous"
-msgstr "Cynt"
-
-#: hexbuffer.cc:4886
-msgid "Generated by khexedit"
-msgstr ""
-
-#: printdialogpage.cc:38
-msgid "Page Layout"
-msgstr "Haenlun y Dudalen"
-
-#: printdialogpage.cc:59
-msgid "Margins [millimeter]"
-msgstr ""
-
-#: printdialogpage.cc:72
-msgid "&Top:"
-msgstr "&Pen:"
-
-#: printdialogpage.cc:73
-msgid "&Bottom:"
-msgstr "&Gwaelod:"
-
-#: printdialogpage.cc:74
-msgid "&Left:"
-msgstr "&Chwith:"
-
-#: printdialogpage.cc:75
-msgid "&Right:"
-msgstr "&De:"
-
-#: printdialogpage.cc:102
-msgid "Draw h&eader above text"
-msgstr ""
-
-#: printdialogpage.cc:118
-msgid "Left:"
-msgstr "Chwith:"
-
-#: printdialogpage.cc:119
-msgid "Center:"
-msgstr "Canol :"
-
-#: printdialogpage.cc:120
-msgid "Right:"
-msgstr "De:"
-
-#: printdialogpage.cc:121
-msgid "Border:"
-msgstr "Ymyl:"
-
-#: printdialogpage.cc:125
-msgid "Date & Time"
-msgstr "Dyddiad ac Amser"
-
-#: printdialogpage.cc:131
-msgid "Single Line"
-msgstr "Llinell unigol"
-
-#: printdialogpage.cc:132
-msgid "Rectangle"
-msgstr "Hirsgwâr"
-
-#: printdialogpage.cc:164
-msgid "Draw &footer below text"
-msgstr ""
-
-#: fileinfodialog.cc:73
-msgid "Statistics"
-msgstr "Ystadegau"
-
-#: fileinfodialog.cc:89
-msgid "File name: "
-msgstr "Enw'r ffeil: "
-
-#: fileinfodialog.cc:93
-msgid "Size [bytes]: "
-msgstr ""
-
-#: fileinfodialog.cc:110
-msgid "Occurrence"
-msgstr ""
-
-#: fileinfodialog.cc:111
-msgid "Percent"
-msgstr "Canran"
-
-#: optiondialog.cc:105
-msgid "Layout"
-msgstr "Cynllun"
-
-#: optiondialog.cc:105
-msgid "Data Layout in Editor"
-msgstr ""
-
-#: optiondialog.cc:113
-msgid "Hexadecimal Mode"
-msgstr ""
-
-#: optiondialog.cc:114
-msgid "Decimal Mode"
-msgstr ""
-
-#: optiondialog.cc:115
-msgid "Octal Mode"
-msgstr ""
-
-#: optiondialog.cc:116
-msgid "Binary Mode"
-msgstr ""
-
-#: optiondialog.cc:117
-msgid "Text Only Mode"
-msgstr ""
-
-#: optiondialog.cc:146
-msgid "Default l&ine size [bytes]:"
-msgstr ""
-
-#: optiondialog.cc:150
-msgid "Colu&mn size [bytes]:"
-msgstr ""
-
-#: optiondialog.cc:158
-msgid "Line size is &fixed (use scrollbar when required)"
-msgstr ""
-
-#: optiondialog.cc:164
-msgid "Loc&k column at end of line (when column size>1)"
-msgstr ""
-
-#: optiondialog.cc:176
-msgid "Vertical Only"
-msgstr ""
-
-#: optiondialog.cc:177
-msgid "Horizontal Only"
-msgstr ""
-
-#: optiondialog.cc:178
-msgid "Both Directions"
-msgstr ""
-
-#: optiondialog.cc:185
-msgid "&Gridlines between text:"
-msgstr ""
-
-#: optiondialog.cc:203
-msgid "&Left separator width [pixels]:"
-msgstr ""
-
-#: optiondialog.cc:207
-msgid "&Right separator width [pixels]:"
-msgstr ""
-
-#: optiondialog.cc:223
-msgid "&Separator margin width [pixels]:"
-msgstr ""
-
-#: optiondialog.cc:227
-msgid "&Edge margin width [pixels]:"
-msgstr ""
-
-#: optiondialog.cc:231
-msgid "Column separation is e&qual to one character"
-msgstr ""
-
-#: optiondialog.cc:244
-msgid "Column separa&tion [pixels]:"
-msgstr ""
-
-#: optiondialog.cc:257
-msgid "Cursor"
-msgstr "Cyrchydd"
-
-#: optiondialog.cc:258
-msgid "Cursor Behavior (only valid for editor)"
-msgstr ""
-
-#: optiondialog.cc:262
-msgid "Blinking"
-msgstr ""
-
-#: optiondialog.cc:266 optiondialog.cc:267
-msgid "Do not b&link"
-msgstr ""
-
-#: optiondialog.cc:274
-msgid "&Blink interval [ms]:"
-msgstr ""
-
-#: optiondialog.cc:284
-msgid "Shape"
-msgstr "Siâp"
-
-#: optiondialog.cc:288
-msgid "Always &use block (rectangular) cursor"
-msgstr ""
-
-#: optiondialog.cc:294
-msgid "Use &thick cursor in insert mode"
-msgstr ""
-
-#: optiondialog.cc:299
-msgid "Cursor Behavior When Editor Loses Focus"
-msgstr ""
-
-#: optiondialog.cc:304
-msgid "&Stop blinking (if blinking is enabled)"
-msgstr ""
-
-#: optiondialog.cc:306
-msgid "H&ide"
-msgstr "C&uddio"
-
-#: optiondialog.cc:307
-msgid "Do &nothing"
-msgstr ""
-
-#: optiondialog.cc:323
-msgid "Colors"
-msgstr "Lliwiau"
-
-#: optiondialog.cc:324
-msgid "Editor Colors (system selection color is always used)"
-msgstr ""
-
-#: optiondialog.cc:329
-msgid "&Use system colors (as chosen in Control Center)"
-msgstr ""
-
-#: optiondialog.cc:342
-msgid "First, Third ... Line Background"
-msgstr ""
-
-#: optiondialog.cc:343
-msgid "Second, Fourth ... Line Background"
-msgstr ""
-
-#: optiondialog.cc:344
-msgid "Offset Background"
-msgstr ""
-
-#: optiondialog.cc:345
-msgid "Inactive Background"
-msgstr ""
-
-#: optiondialog.cc:346
-msgid "Even Column Text"
-msgstr ""
-
-#: optiondialog.cc:347
-msgid "Odd Column Text"
-msgstr ""
-
-#: optiondialog.cc:348
-msgid "Non Printable Text"
-msgstr ""
-
-#: optiondialog.cc:349
-msgid "Offset Text"
-msgstr ""
-
-#: optiondialog.cc:350
-msgid "Secondary Text"
-msgstr ""
-
-#: optiondialog.cc:351
-msgid "Marked Background"
-msgstr ""
-
-#: optiondialog.cc:352
-msgid "Marked Text"
-msgstr ""
-
-#: optiondialog.cc:353
-msgid "Cursor Background"
-msgstr ""
-
-#: optiondialog.cc:354
-msgid "Cursor Text (block shape)"
-msgstr ""
-
-#: optiondialog.cc:355
-msgid "Bookmark Background"
-msgstr ""
-
-#: optiondialog.cc:356
-msgid "Bookmark Text"
-msgstr ""
-
-#: optiondialog.cc:357
-msgid "Separator"
-msgstr "Gwahanydd"
-
-#: optiondialog.cc:358
-msgid "Grid Lines"
-msgstr ""
-
-#: optiondialog.cc:376
-msgid "Font Selection (editor can only use a fixed font)"
-msgstr ""
-
-#: optiondialog.cc:381
-msgid "&Use system font (as chosen in Control Center)"
-msgstr ""
-
-#: optiondialog.cc:398
-msgid "KHexEdit editor font"
-msgstr ""
-
-#: optiondialog.cc:414
-msgid "&Map non printable characters to:"
-msgstr ""
-
-#: optiondialog.cc:428
-msgid "File Management"
-msgstr "Rheolaeth Ffeiliau"
-
-#: optiondialog.cc:439
-msgid "Most Recent Document"
-msgstr ""
-
-#: optiondialog.cc:440
-msgid "All Recent Documents"
-msgstr ""
-
-#: optiondialog.cc:446
-msgid "Open doc&uments on startup:"
-msgstr ""
-
-#: optiondialog.cc:452
-msgid "&Jump to previous cursor position on startup"
-msgstr ""
-
-#: optiondialog.cc:466
-msgid "Open document with &write protection enabled"
-msgstr ""
-
-#: optiondialog.cc:472
-msgid "&Keep cursor position after reloading document"
-msgstr ""
-
-#: optiondialog.cc:478
-msgid "&Make a backup when saving document"
-msgstr ""
-
-#: optiondialog.cc:488
-msgid "Don't &save \"Recent\" document list on exit"
-msgstr ""
-
-#: optiondialog.cc:492
-msgid ""
-"Clicking this check box makes KHexEdit forget his recent document list when the "
-"program is closed.\n"
-"Note: it will not erase any document of the recent document list created by "
-"TDE."
-msgstr ""
-
-#: optiondialog.cc:499
-msgid "Cl&ear \"Recent\" Document List"
-msgstr ""
-
-#: optiondialog.cc:503
-msgid ""
-"Clicking this button makes KHexEdit forget his recent document list.\n"
-"Note: it will not erase any document of the recent document list created by "
-"TDE."
-msgstr ""
-
-#: optiondialog.cc:520
-msgid "Various Properties"
-msgstr ""
-
-#: optiondialog.cc:526
-msgid "Auto&matic copy to clipboard when selection is ready"
-msgstr ""
-
-#: optiondialog.cc:532
-msgid "&Editor starts in \"insert\" mode"
-msgstr ""
-
-#: optiondialog.cc:538
-msgid "Confirm &wrapping (to beginning or end) during search"
-msgstr ""
-
-#: optiondialog.cc:544
-msgid "Cursor jumps to &nearest byte when moved"
-msgstr ""
-
-#: optiondialog.cc:550
-msgid "Sounds"
-msgstr "Syniau"
-
-#: optiondialog.cc:553
-msgid "Make sound on data &input (eg. typing) failure"
-msgstr ""
-
-#: optiondialog.cc:557
-msgid "Make sound on &fatal failure"
-msgstr ""
-
-#: optiondialog.cc:562
-msgid "Bookmark Visibility"
-msgstr ""
-
-#: optiondialog.cc:565
-msgid "Use visible bookmarks in the offset column"
-msgstr ""
-
-#: optiondialog.cc:569
-msgid "Use visible bookmarks in the editor fields"
-msgstr ""
-
-#: optiondialog.cc:574
-msgid "Confirm when number of printed pages will e&xceed limit"
-msgstr ""
-
-#: optiondialog.cc:594
-msgid "&Threshold [pages]:"
-msgstr ""
-
-#: optiondialog.cc:611
-msgid "&Undo limit:"
-msgstr ""
+#: hexmanagerwidget.cc:136
+msgid "Conversion"
+msgstr "Trosiad"
 
 #~ msgid "&All"
 #~ msgstr "&Popeth"
diff --git a/tde-i18n-cy/messages/tdeutils/khexedit2part.po b/tde-i18n-cy/messages/tdeutils/khexedit2part.po
index 7b4c34d082e..5c10615be52 100644
--- a/tde-i18n-cy/messages/tdeutils/khexedit2part.po
+++ b/tde-i18n-cy/messages/tdeutils/khexedit2part.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: all2.po\n"
-"POT-Creation-Date: 2005-01-17 01:37+0100\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeutils/kjots.po b/tde-i18n-cy/messages/tdeutils/kjots.po
index dc83578deb4..46443e2f7be 100644
--- a/tde-i18n-cy/messages/tdeutils/kjots.po
+++ b/tde-i18n-cy/messages/tdeutils/kjots.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdeutils/kjots.po\n"
-"POT-Creation-Date: 2007-05-02 02:16+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeutils/klaptopdaemon.po b/tde-i18n-cy/messages/tdeutils/klaptopdaemon.po
index 582c4ffbfc7..33432968d7b 100644
--- a/tde-i18n-cy/messages/tdeutils/klaptopdaemon.po
+++ b/tde-i18n-cy/messages/tdeutils/klaptopdaemon.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdeutils/klaptopdaemon.po\n"
-"POT-Creation-Date: 2008-02-03 01:21+0100\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -322,18 +323,10 @@ msgstr ""
 msgid "Standby..."
 msgstr ""
 
-#: daemondock.cpp:109
-msgid "&Lock && Suspend..."
-msgstr ""
-
 #: daemondock.cpp:110
 msgid "&Suspend..."
 msgstr "&Seibio ..."
 
-#: daemondock.cpp:111
-msgid "&Lock && Hibernate..."
-msgstr ""
-
 #: daemondock.cpp:112
 msgid "&Hibernate..."
 msgstr ""
diff --git a/tde-i18n-cy/messages/tdeutils/kmilo_delli8k.po b/tde-i18n-cy/messages/tdeutils/kmilo_delli8k.po
index 462ae78af78..b022e7aa2ec 100644
--- a/tde-i18n-cy/messages/tdeutils/kmilo_delli8k.po
+++ b/tde-i18n-cy/messages/tdeutils/kmilo_delli8k.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: all2.po\n"
-"POT-Creation-Date: 2004-11-24 01:19+0100\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeutils/kmilo_generic.po b/tde-i18n-cy/messages/tdeutils/kmilo_generic.po
index 56000e53f8d..d4a4351881e 100644
--- a/tde-i18n-cy/messages/tdeutils/kmilo_generic.po
+++ b/tde-i18n-cy/messages/tdeutils/kmilo_generic.po
@@ -6,30 +6,31 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: all.po\n"
-"POT-Creation-Date: 2008-02-07 01:30+0100\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: generic_monitor.cpp:126 generic_monitor.cpp:166 generic_monitor.cpp:260
+#: generic_monitor.cpp:143 generic_monitor.cpp:183 generic_monitor.cpp:277
 msgid "Starting KMix..."
 msgstr ""
 
-#: generic_monitor.cpp:139 generic_monitor.cpp:184 generic_monitor.cpp:282
+#: generic_monitor.cpp:156 generic_monitor.cpp:201 generic_monitor.cpp:299
 msgid "It seems that KMix is not running."
 msgstr ""
 
-#: generic_monitor.cpp:226
+#: generic_monitor.cpp:243
 msgid "Volume"
 msgstr "Lefel Sain"
 
-#: generic_monitor.cpp:299
+#: generic_monitor.cpp:316
 msgid "Mute on"
 msgstr ""
 
-#: generic_monitor.cpp:301
+#: generic_monitor.cpp:318
 msgid "Mute off"
 msgstr ""
diff --git a/tde-i18n-cy/messages/tdeutils/kmilo_kvaio.po b/tde-i18n-cy/messages/tdeutils/kmilo_kvaio.po
index dd1d434a817..d198c14b495 100644
--- a/tde-i18n-cy/messages/tdeutils/kmilo_kvaio.po
+++ b/tde-i18n-cy/messages/tdeutils/kmilo_kvaio.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdeutils/kmilo_kvaio.po\n"
-"POT-Creation-Date: 2005-07-08 01:34+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeutils/kmilo_powerbook.po b/tde-i18n-cy/messages/tdeutils/kmilo_powerbook.po
index 951b1fe960d..59bfd0cc63f 100644
--- a/tde-i18n-cy/messages/tdeutils/kmilo_powerbook.po
+++ b/tde-i18n-cy/messages/tdeutils/kmilo_powerbook.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdeutils/kmilo_powerbook.po\n"
-"POT-Creation-Date: 2005-11-30 03:22+0100\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeutils/kmilo_thinkpad.po b/tde-i18n-cy/messages/tdeutils/kmilo_thinkpad.po
index 7982468a0dd..c3c6183d43f 100644
--- a/tde-i18n-cy/messages/tdeutils/kmilo_thinkpad.po
+++ b/tde-i18n-cy/messages/tdeutils/kmilo_thinkpad.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdeutils/kmilo_thinkpad.po\n"
-"POT-Creation-Date: 2005-06-14 01:28+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeutils/kmilod.po b/tde-i18n-cy/messages/tdeutils/kmilod.po
index e603d54789d..b4e28a40681 100644
--- a/tde-i18n-cy/messages/tdeutils/kmilod.po
+++ b/tde-i18n-cy/messages/tdeutils/kmilod.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: all.po\n"
-"POT-Creation-Date: 2005-09-29 02:39+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeutils/kregexpeditor.po b/tde-i18n-cy/messages/tdeutils/kregexpeditor.po
index 092548a1c08..071f86e41a8 100644
--- a/tde-i18n-cy/messages/tdeutils/kregexpeditor.po
+++ b/tde-i18n-cy/messages/tdeutils/kregexpeditor.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdeutils/kregexpeditor.po\n"
-"POT-Creation-Date: 2005-08-18 04:29+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -167,11 +168,11 @@ msgid "The Carriage Return Character (\\r)"
 msgstr ""
 
 #: charselector.cpp:68
-msgid "The Horizontal Tab Character (\\t)"
+msgid "TheQt::Horizontal Tab Character (\\t)"
 msgstr ""
 
 #: charselector.cpp:69
-msgid "The Vertical Tab Character (\\v)"
+msgid "TheQt::Vertical Tab Character (\\v)"
 msgstr ""
 
 #: compoundwidget.cpp:46
@@ -340,7 +341,7 @@ msgstr ""
 msgid ""
 "This is the regular expression in ASCII syntax. You are likely only to be "
 "interested in this if you are a programmer, and need to develop a regular "
-"expression using QRegExp."
+"expression using TQRegExp."
 "<p>You may develop your regular expression both by using the graphical editor, "
 "and by typing the regular expression in this line edit."
 msgstr ""
@@ -366,19 +367,19 @@ msgid "Editor for Regular Expressions"
 msgstr ""
 
 #: predefined-regexps.cpp:1
-msgid "anything"
+msgid "spaces"
 msgstr ""
 
 #: predefined-regexps.cpp:2
-msgid "This regular expression matches anything."
+msgid "Matches an arbitrary amount of whitespace."
 msgstr ""
 
 #: predefined-regexps.cpp:3
-msgid "spaces"
+msgid "anything"
 msgstr ""
 
 #: predefined-regexps.cpp:4
-msgid "Matches an arbitrary amount of whitespace."
+msgid "This regular expression matches anything."
 msgstr ""
 
 #: regexpbuttons.cpp:66
diff --git a/tde-i18n-cy/messages/tdeutils/ksim.po b/tde-i18n-cy/messages/tdeutils/ksim.po
index d7dddbf0cae..f80ffb21fb5 100644
--- a/tde-i18n-cy/messages/tdeutils/ksim.po
+++ b/tde-i18n-cy/messages/tdeutils/ksim.po
@@ -1,59 +1,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdeutils/ksim.po\n"
-"POT-Creation-Date: 2007-05-28 02:15+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: monitorprefs.cpp:35
-msgid "Monitor"
-msgstr "Monitor"
-
-#: monitorprefs.cpp:36
-msgid "Description"
-msgstr "Disgrifiad"
-
-#: monitorprefs.cpp:37
-msgid "LMB Command"
-msgstr ""
-
-#: library/chart.cpp:120 themeprefs.cpp:96
-msgid "None"
-msgstr "Dim"
-
-#: library/pluginloader.cpp:93
-msgid ""
-"KSim was unable to load the plugin %1 due to the X-KSIM-LIBRARY property being "
-"empty in the plugins desktop file"
-msgstr ""
-
-#: library/pluginloader.cpp:99
-msgid ""
-"KSim was unable to load the plugin %1 due to not being able to find the plugin, "
-"check that the plugin is installed and is in your $TDEDIR/lib path"
-msgstr ""
-
-#: library/pluginloader.cpp:105
-msgid ""
-"<qt>An error occurred while trying \n"
-"to load the plugin '%1'. \n"
-"This could be caused by the following:"
-"<ul>\n"
-"<li>The plugin doesn't have the %2 macro</li>\n"
-"<li>The plugin has been damaged or has some unresolved symbols</li>\n"
-"</ul> \n"
-"Last error message that occurred: \n"
-"%3</qt>"
-msgstr ""
-
-#: library/pluginloader.cpp:315
-msgid "Unable to get last error message"
-msgstr ""
-
 #: _translatorinfo.cpp:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
@@ -66,112 +22,12 @@ msgid ""
 "Your emails"
 msgstr "kyfieithu@dotmon.com"
 
-#: ksimsysinfo.cpp:197
-msgid "Current system time"
-msgstr ""
-
-#: ksimsysinfo.cpp:211
-msgid "Current system date"
-msgstr ""
-
-#: ksimsysinfo.cpp:227
-msgid "System uptime"
-msgstr ""
-
-#: ksimsysinfo.cpp:308
-msgid "Uptime display disabled"
-msgstr ""
-
-#: ksimsysinfo.cpp:316
-msgid "Memory display disabled"
-msgstr ""
-
-#: ksimsysinfo.cpp:324
-msgid "Swap display disabled"
-msgstr ""
-
-#: ksimpref.cpp:50 ksimpref.cpp:158
-msgid "Plugins"
-msgstr "Ategion"
-
-#: ksimpref.cpp:55
-msgid "Monitors"
-msgstr ""
-
-#: ksimpref.cpp:56
-msgid "Monitors Installed"
-msgstr ""
-
-#: ksimpref.cpp:60 monitors/net/netdialog.cpp:123
-msgid "General"
-msgstr "Cyffredinol"
-
-#: ksimpref.cpp:61
-msgid "General Options"
-msgstr "Dewisiadau Cyffredinol"
-
-#: ksimpref.cpp:66
-msgid "Clock"
-msgstr "Cloc"
-
-#: ksimpref.cpp:67
-msgid "Clock Options"
-msgstr ""
-
-#: ksimpref.cpp:72
-msgid "Uptime"
-msgstr ""
-
-#: ksimpref.cpp:73
-msgid "Uptime Options"
-msgstr ""
-
-#: ksimpref.cpp:78
-msgid "Memory"
-msgstr "Cof"
-
-#: ksimpref.cpp:79
-msgid "Memory Options"
-msgstr ""
-
-#: ksimpref.cpp:84
-msgid "Swap"
-msgstr "Cyfnewid"
-
-#: ksimpref.cpp:85
-msgid "Swap Options"
-msgstr ""
-
-#: ksimpref.cpp:89
-msgid "Themes"
-msgstr "Themâu"
-
-#: ksimpref.cpp:90
-msgid "Theme Selector"
-msgstr ""
-
-#: ksimpref.cpp:124
-msgid ""
-"Failed to remove %1's config page due to the plugin not being loaded or the "
-"config page has not been created"
-msgstr ""
-
-#: ksimpref.cpp:149
-msgid ""
-"Failed to add %1's config page due to the plugin not being loaded or the config "
-"page has not been created"
-msgstr ""
-
-#: ksimpref.cpp:159
-msgid "%1 Options"
-msgstr "%1 o ddewisiadau"
-
-#: monitors/cpu/ksimcpu.cpp:100
-msgid "KSim CPU Plugin"
+#: monitors/disk/ksimdisk.cpp:96
+msgid "KSim Disk Plugin"
 msgstr ""
 
-#: monitors/cpu/ksimcpu.cpp:101
-msgid "A cpu monitor plugin for KSim"
+#: monitors/disk/ksimdisk.cpp:97
+msgid "A disk monitor plugin for KSim"
 msgstr ""
 
 #: monitors/cpu/ksimcpu.cpp:104 monitors/disk/ksimdisk.cpp:100
@@ -181,103 +37,99 @@ msgstr ""
 msgid "Author"
 msgstr "Awdur"
 
-#: monitors/cpu/ksimcpu.cpp:204
-msgid "%1%"
-msgstr "%1%"
-
-#: monitors/cpu/ksimcpu.cpp:371
-msgid "Available CPUs"
+#: monitors/disk/ksimdisk.cpp:171 monitors/disk/ksimdisk.cpp:194
+#: monitors/disk/ksimdisk.cpp:529 monitors/disk/ksimdisk.cpp:539
+msgid "All Disks"
 msgstr ""
 
-#: monitors/cpu/ksimcpu.cpp:372
-msgid "Chart Format"
+#: monitors/disk/ksimdisk.cpp:218 monitors/net/ksimnet.cpp:397
+#: monitors/net/ksimnet.cpp:405
+msgid "in: %1k"
 msgstr ""
 
-#: monitors/cpu/ksimcpu.cpp:388 monitors/lm_sensors/sensorsconfig.cpp:80
-#: monitors/net/netconfig.cpp:72
-msgid "Modify..."
-msgstr "Addasu..."
-
-#: monitors/cpu/ksimcpu.cpp:395
-msgid "Chart Legend"
+#: monitors/disk/ksimdisk.cpp:220 monitors/net/ksimnet.cpp:398
+#: monitors/net/ksimnet.cpp:406
+msgid "out: %1k"
 msgstr ""
 
-#: monitors/cpu/ksimcpu.cpp:404
-msgid "%T - Total CPU time (sys + user + nice)"
+#: monitors/disk/ksimdisk.cpp:224
+msgid "%1k"
 msgstr ""
 
-#: monitors/cpu/ksimcpu.cpp:407
-msgid "%t - Total CPU time (sys + user)"
+#: monitors/disk/ksimdisk.cpp:482
+msgid "Disks"
 msgstr ""
 
-#: monitors/cpu/ksimcpu.cpp:410
-#, c-format
-msgid "%s - Total sys time"
-msgstr ""
+#: monitors/disk/ksimdisk.cpp:493 monitors/net/netconfig.cpp:67
+msgid "Add..."
+msgstr "Ychwanegu..."
 
-#: monitors/cpu/ksimcpu.cpp:413
-#, c-format
-msgid "%u - Total user time"
+#: monitors/disk/ksimdisk.cpp:503
+msgid "Disk Styles"
 msgstr ""
 
-#: monitors/cpu/ksimcpu.cpp:416
-#, c-format
-msgid "%n - Total nice time"
+#: monitors/disk/ksimdisk.cpp:507
+msgid "Display the read and write data as one"
 msgstr ""
 
-#: monitors/cpu/ksimcpu.cpp:423
-#, c-format
-msgid "cpu %1"
-msgstr "cPU %1"
+#: monitors/disk/ksimdisk.cpp:509
+msgid ""
+"Display the read and write data\n"
+"separately as in/out data"
+msgstr ""
 
-#: monitors/cpu/ksimcpu.cpp:504
-msgid "Modify CPU Format"
+#: monitors/disk/ksimdisk.cpp:553
+msgid "Add Disk Device"
 msgstr ""
 
-#: monitors/cpu/ksimcpu.cpp:504
-msgid "Chart format:"
+#: monitors/disk/ksimdisk.cpp:553
+msgid "Disk name:"
 msgstr ""
 
-#: monitors/i8k/ksimi8k.cpp:65
-msgid "KSim I8K Plugin"
+#: monitors/mail/ksimmail.cpp:61
+msgid "KSim Mail Plugin"
 msgstr ""
 
-#: monitors/i8k/ksimi8k.cpp:66
-msgid "Dell I8K Hardware Monitor plugin"
+#: monitors/mail/ksimmail.cpp:62
+msgid "A mail monitor plugin for KSim"
 msgstr ""
 
-#: monitors/i8k/ksimi8k.cpp:198
-msgid "Right fan: %1 RPM"
+#: monitors/snmp/proberesultdialog.cpp:33
+msgid "Results of scanning host %1:"
 msgstr ""
 
-#: monitors/i8k/ksimi8k.cpp:200
-msgid "Right fan: Off"
+#: monitors/snmp/configpage.cpp:159
+#, c-format
+msgid ""
+"_n: This host has the following monitor associated. Do you really want to "
+"delete this host entry?\n"
+"This host has the following %n monitors associated. Do you really want to "
+"delete this host entry?"
 msgstr ""
 
-#: monitors/i8k/ksimi8k.cpp:203
-msgid "Left fan: %1 RPM"
+#: monitors/snmp/configpage.cpp:162
+msgid "Delete Host Entry"
 msgstr ""
 
-#: monitors/i8k/ksimi8k.cpp:205
-msgid "Left fan: Off"
+#: monitors/snmp/monitordialog.cpp:92
+msgid "Please enter a name for this monitor"
 msgstr ""
 
-#: monitors/i8k/ksimi8k.cpp:207
-msgid "CPU temp: %1°%2"
+#: monitors/snmp/monitordialog.cpp:95
+msgid "Please enter a valid name for the object identifier"
 msgstr ""
 
-#: monitors/i8k/ksimi8k.cpp:214
-msgid "Show temperature in Fahrenheit"
+#: monitors/snmp/probedialog.cpp:42
+msgid "SNMP Host Probe"
 msgstr ""
 
-#: monitors/filesystem/fsystemconfig.cpp:73 monitors/i8k/ksimi8k.cpp:216
-#: monitors/lm_sensors/sensorsconfig.cpp:88
-msgid "Update interval:"
-msgstr "Cyfnod diweddaru:"
+#: monitors/snmp/probedialog.cpp:45
+msgid "Probing for common object identifiers..."
+msgstr ""
 
-#: monitors/i8k/ksimi8k.cpp:219
-msgid " sec"
-msgstr "eil"
+#: monitors/snmp/browsedialog.cpp:35
+msgid "&Stop"
+msgstr "&Aros"
 
 #: monitors/net/ksimnet.cpp:90
 msgid "KSim Net Plugin"
@@ -291,16 +143,6 @@ msgstr ""
 msgid "FreeBSD ports"
 msgstr ""
 
-#: monitors/disk/ksimdisk.cpp:218 monitors/net/ksimnet.cpp:397
-#: monitors/net/ksimnet.cpp:405
-msgid "in: %1k"
-msgstr ""
-
-#: monitors/disk/ksimdisk.cpp:220 monitors/net/ksimnet.cpp:398
-#: monitors/net/ksimnet.cpp:406
-msgid "out: %1k"
-msgstr ""
-
 #: monitors/net/ksimnet.cpp:409
 msgid "offline"
 msgstr "all-lein"
@@ -333,9 +175,10 @@ msgstr "Amserydd"
 msgid "Commands"
 msgstr "Gorchmynion:"
 
-#: monitors/disk/ksimdisk.cpp:493 monitors/net/netconfig.cpp:67
-msgid "Add..."
-msgstr "Ychwanegu..."
+#: monitors/cpu/ksimcpu.cpp:388 monitors/lm_sensors/sensorsconfig.cpp:80
+#: monitors/net/netconfig.cpp:72
+msgid "Modify..."
+msgstr "Addasu..."
 
 #: monitors/net/netconfig.cpp:146 monitors/net/netconfig.cpp:151
 msgid "&Add Net Device"
@@ -391,6 +234,10 @@ msgstr ""
 msgid "ss - Total seconds online"
 msgstr ""
 
+#: ksimpref.cpp:61 monitors/net/netdialog.cpp:123
+msgid "General"
+msgstr "Cyffredinol"
+
 #: monitors/net/netdialog.cpp:131
 msgid "Enable connect/disconnect"
 msgstr ""
@@ -403,94 +250,6 @@ msgstr ""
 msgid "Disconnect command:"
 msgstr "Gorchymyn Datgysylltu:"
 
-#: monitors/disk/ksimdisk.cpp:96
-msgid "KSim Disk Plugin"
-msgstr ""
-
-#: monitors/disk/ksimdisk.cpp:97
-msgid "A disk monitor plugin for KSim"
-msgstr ""
-
-#: monitors/disk/ksimdisk.cpp:171 monitors/disk/ksimdisk.cpp:194
-#: monitors/disk/ksimdisk.cpp:529 monitors/disk/ksimdisk.cpp:539
-msgid "All Disks"
-msgstr ""
-
-#: monitors/disk/ksimdisk.cpp:224
-msgid "%1k"
-msgstr ""
-
-#: monitors/disk/ksimdisk.cpp:482
-msgid "Disks"
-msgstr ""
-
-#: monitors/disk/ksimdisk.cpp:503
-msgid "Disk Styles"
-msgstr ""
-
-#: monitors/disk/ksimdisk.cpp:507
-msgid "Display the read and write data as one"
-msgstr ""
-
-#: monitors/disk/ksimdisk.cpp:509
-msgid ""
-"Display the read and write data\n"
-"separately as in/out data"
-msgstr ""
-
-#: monitors/disk/ksimdisk.cpp:553
-msgid "Add Disk Device"
-msgstr ""
-
-#: monitors/disk/ksimdisk.cpp:553
-msgid "Disk name:"
-msgstr ""
-
-#: monitors/mail/ksimmail.cpp:61
-msgid "KSim Mail Plugin"
-msgstr ""
-
-#: monitors/mail/ksimmail.cpp:62
-msgid "A mail monitor plugin for KSim"
-msgstr ""
-
-#: monitors/snmp/proberesultdialog.cpp:33
-msgid "Results of scanning host %1:"
-msgstr ""
-
-#: monitors/snmp/probedialog.cpp:42
-msgid "SNMP Host Probe"
-msgstr ""
-
-#: monitors/snmp/probedialog.cpp:45
-msgid "Probing for common object identifiers..."
-msgstr ""
-
-#: monitors/snmp/monitordialog.cpp:92
-msgid "Please enter a name for this monitor"
-msgstr ""
-
-#: monitors/snmp/monitordialog.cpp:95
-msgid "Please enter a valid name for the object identifier"
-msgstr ""
-
-#: monitors/snmp/configpage.cpp:159
-#, c-format
-msgid ""
-"_n: This host has the following monitor associated. Do you really want to "
-"delete this host entry?\n"
-"This host has the following %n monitors associated. Do you really want to "
-"delete this host entry?"
-msgstr ""
-
-#: monitors/snmp/configpage.cpp:162
-msgid "Delete Host Entry"
-msgstr ""
-
-#: monitors/snmp/browsedialog.cpp:35
-msgid "&Stop"
-msgstr "&Aros"
-
 #: monitors/lm_sensors/sensorsconfig.cpp:62
 msgid "No."
 msgstr "Rhif"
@@ -511,6 +270,11 @@ msgstr "Gwerth"
 msgid "Display Fahrenheit"
 msgstr ""
 
+#: monitors/filesystem/fsystemconfig.cpp:73 monitors/i8k/ksimi8k.cpp:216
+#: monitors/lm_sensors/sensorsconfig.cpp:88
+msgid "Update interval:"
+msgstr "Cyfnod diweddaru:"
+
 #: monitors/filesystem/fsystemconfig.cpp:84
 #: monitors/lm_sensors/sensorsconfig.cpp:97
 msgid "seconds"
@@ -557,6 +321,126 @@ msgid ""
 "V"
 msgstr "V"
 
+#: monitors/cpu/ksimcpu.cpp:100
+msgid "KSim CPU Plugin"
+msgstr ""
+
+#: monitors/cpu/ksimcpu.cpp:101
+msgid "A cpu monitor plugin for KSim"
+msgstr ""
+
+#: monitors/cpu/ksimcpu.cpp:204
+msgid "%1%"
+msgstr "%1%"
+
+#: monitors/cpu/ksimcpu.cpp:371
+msgid "Available CPUs"
+msgstr ""
+
+#: monitors/cpu/ksimcpu.cpp:372
+msgid "Chart Format"
+msgstr ""
+
+#: monitors/cpu/ksimcpu.cpp:395
+msgid "Chart Legend"
+msgstr ""
+
+#: monitors/cpu/ksimcpu.cpp:404
+msgid "%T - Total CPU time (sys + user + nice)"
+msgstr ""
+
+#: monitors/cpu/ksimcpu.cpp:407
+msgid "%t - Total CPU time (sys + user)"
+msgstr ""
+
+#: monitors/cpu/ksimcpu.cpp:410
+#, c-format
+msgid "%s - Total sys time"
+msgstr ""
+
+#: monitors/cpu/ksimcpu.cpp:413
+#, c-format
+msgid "%u - Total user time"
+msgstr ""
+
+#: monitors/cpu/ksimcpu.cpp:416
+#, c-format
+msgid "%n - Total nice time"
+msgstr ""
+
+#: monitors/cpu/ksimcpu.cpp:423
+#, c-format
+msgid "cpu %1"
+msgstr "cPU %1"
+
+#: monitors/cpu/ksimcpu.cpp:504
+msgid "Modify CPU Format"
+msgstr ""
+
+#: monitors/cpu/ksimcpu.cpp:504
+msgid "Chart format:"
+msgstr ""
+
+#: monitors/i8k/ksimi8k.cpp:65
+msgid "KSim I8K Plugin"
+msgstr ""
+
+#: monitors/i8k/ksimi8k.cpp:66
+msgid "Dell I8K Hardware Monitor plugin"
+msgstr ""
+
+#: monitors/i8k/ksimi8k.cpp:198
+msgid "Right fan: %1 RPM"
+msgstr ""
+
+#: monitors/i8k/ksimi8k.cpp:200
+msgid "Right fan: Off"
+msgstr ""
+
+#: monitors/i8k/ksimi8k.cpp:203
+msgid "Left fan: %1 RPM"
+msgstr ""
+
+#: monitors/i8k/ksimi8k.cpp:205
+msgid "Left fan: Off"
+msgstr ""
+
+#: monitors/i8k/ksimi8k.cpp:207
+msgid "CPU temp: %1°%2"
+msgstr ""
+
+#: monitors/i8k/ksimi8k.cpp:214
+msgid "Show temperature in Fahrenheit"
+msgstr ""
+
+#: monitors/i8k/ksimi8k.cpp:219
+msgid " sec"
+msgstr "eil"
+
+#: monitors/filesystem/filesystemwidget.cpp:187
+msgid "<qt>The following errors occurred:<ul>"
+msgstr ""
+
+#: monitors/filesystem/filesystemwidget.cpp:219
+msgid "&Mount Device"
+msgstr ""
+
+#: monitors/filesystem/filesystemwidget.cpp:220
+msgid "&Unmount Device"
+msgstr ""
+
+#: monitors/filesystem/ksimfsystem.cpp:70
+msgid "KSim FileSystem Plugin"
+msgstr ""
+
+#: monitors/filesystem/ksimfsystem.cpp:71
+msgid "A filesystem plugin for KSim"
+msgstr ""
+
+#: monitors/filesystem/ksimfsystem.cpp:76
+msgid "Some Fixes"
+msgstr ""
+
 #: monitors/filesystem/fsystemconfig.cpp:56
 msgid "Mounted Partition"
 msgstr ""
@@ -587,30 +471,112 @@ msgstr ""
 msgid "0 means no update"
 msgstr ""
 
-#: monitors/filesystem/ksimfsystem.cpp:70
-msgid "KSim FileSystem Plugin"
+#: ksim.cpp:59
+msgid "KSim"
+msgstr "kSim"
+
+#: ksim.cpp:60
+msgid "A plugin based system monitor for TDE"
 msgstr ""
 
-#: monitors/filesystem/ksimfsystem.cpp:71
-msgid "A filesystem plugin for KSim"
+#: ksim.cpp:61
+msgid ""
+"(C) 2001-2003 Robbie Ward\n"
+"(C) 2005 Reuben Sutton"
 msgstr ""
 
-#: monitors/filesystem/ksimfsystem.cpp:76
-msgid "Some Fixes"
+#: ksim.cpp:62
+msgid "Maintainer"
+msgstr "Cynhaliwr"
+
+#: ksim.cpp:63
+msgid "Original Author"
+msgstr "Awdur Gwreiddiol"
+
+#: ksim.cpp:65
+msgid "Developer"
+msgstr "Datblygwr"
+
+#: ksim.cpp:67
+msgid "Some FreeBSD ports"
 msgstr ""
 
-#: monitors/filesystem/filesystemwidget.cpp:187
-msgid "<qt>The following errors occurred:<ul>"
+#: ksim.cpp:69
+msgid "Testing, Bug fixing and some help"
 msgstr ""
 
-#: monitors/filesystem/filesystemwidget.cpp:219
-msgid "&Mount Device"
+#: ksimpref.cpp:51 ksimpref.cpp:159
+msgid "Plugins"
+msgstr "Ategion"
+
+#: ksimpref.cpp:56
+msgid "Monitors"
 msgstr ""
 
-#: monitors/filesystem/filesystemwidget.cpp:220
-msgid "&Unmount Device"
+#: ksimpref.cpp:57
+msgid "Monitors Installed"
+msgstr ""
+
+#: ksimpref.cpp:62
+msgid "General Options"
+msgstr "Dewisiadau Cyffredinol"
+
+#: ksimpref.cpp:67
+msgid "Clock"
+msgstr "Cloc"
+
+#: ksimpref.cpp:68
+msgid "Clock Options"
+msgstr ""
+
+#: ksimpref.cpp:73
+msgid "Uptime"
+msgstr ""
+
+#: ksimpref.cpp:74
+msgid "Uptime Options"
+msgstr ""
+
+#: ksimpref.cpp:79
+msgid "Memory"
+msgstr "Cof"
+
+#: ksimpref.cpp:80
+msgid "Memory Options"
+msgstr ""
+
+#: ksimpref.cpp:85
+msgid "Swap"
+msgstr "Cyfnewid"
+
+#: ksimpref.cpp:86
+msgid "Swap Options"
+msgstr ""
+
+#: ksimpref.cpp:90
+msgid "Themes"
+msgstr "Themâu"
+
+#: ksimpref.cpp:91
+msgid "Theme Selector"
 msgstr ""
 
+#: ksimpref.cpp:125
+msgid ""
+"Failed to remove %1's config page due to the plugin not being loaded or the "
+"config page has not been created"
+msgstr ""
+
+#: ksimpref.cpp:150
+msgid ""
+"Failed to add %1's config page due to the plugin not being loaded or the config "
+"page has not been created"
+msgstr ""
+
+#: ksimpref.cpp:160
+msgid "%1 Options"
+msgstr "%1 o ddewisiadau"
+
 #: themeprefs.cpp:68
 msgid ""
 "GKrellm theme support. To use gkrellm themes just untar the themes into the "
@@ -625,6 +591,10 @@ msgstr ""
 msgid "Author:"
 msgstr "Awdur:"
 
+#: library/chart.cpp:120 themeprefs.cpp:96
+msgid "None"
+msgstr "Dim"
+
 #: themeprefs.cpp:100
 msgid "Theme"
 msgstr "Thema"
@@ -661,48 +631,69 @@ msgstr ""
 msgid "None specified"
 msgstr ""
 
-#: ksimview.cpp:119
-msgid "Unknown"
-msgstr "Anhysbys"
+#: monitorprefs.cpp:35
+msgid "Monitor"
+msgstr "Monitor"
 
-#: ksimview.cpp:198
-msgid ""
-"There was an error while trying to create the local folders. This could be "
-"caused by permission problems."
+#: monitorprefs.cpp:36
+msgid "Description"
+msgstr "Disgrifiad"
+
+#: monitorprefs.cpp:37
+msgid "LMB Command"
 msgstr ""
 
-#: ksim.cpp:58
-msgid "KSim"
-msgstr "kSim"
+#: ksimsysinfo.cpp:197
+msgid "Current system time"
+msgstr ""
 
-#: ksim.cpp:59
-msgid "A plugin based system monitor for TDE"
+#: ksimsysinfo.cpp:211
+msgid "Current system date"
 msgstr ""
 
-#: ksim.cpp:60
-msgid ""
-"(C) 2001-2003 Robbie Ward\n"
-"(C) 2005 Reuben Sutton"
+#: ksimsysinfo.cpp:227
+msgid "System uptime"
 msgstr ""
 
-#: ksim.cpp:61
-msgid "Maintainer"
-msgstr "Cynhaliwr"
+#: ksimsysinfo.cpp:308
+msgid "Uptime display disabled"
+msgstr ""
 
-#: ksim.cpp:62
-msgid "Original Author"
-msgstr "Awdur Gwreiddiol"
+#: ksimsysinfo.cpp:316
+msgid "Memory display disabled"
+msgstr ""
 
-#: ksim.cpp:64
-msgid "Developer"
-msgstr "Datblygwr"
+#: ksimsysinfo.cpp:324
+msgid "Swap display disabled"
+msgstr ""
 
-#: ksim.cpp:66
-msgid "Some FreeBSD ports"
+#: library/pluginloader.cpp:93
+msgid ""
+"KSim was unable to load the plugin %1 due to the X-KSIM-LIBRARY property being "
+"empty in the plugins desktop file"
 msgstr ""
 
-#: ksim.cpp:68
-msgid "Testing, Bug fixing and some help"
+#: library/pluginloader.cpp:99
+msgid ""
+"KSim was unable to load the plugin %1 due to not being able to find the plugin, "
+"check that the plugin is installed and is in your $TDEDIR/lib path"
+msgstr ""
+
+#: library/pluginloader.cpp:105
+msgid ""
+"<qt>An error occurred while trying \n"
+"to load the plugin '%1'. \n"
+"This could be caused by the following:"
+"<ul>\n"
+"<li>The plugin doesn't have the %2 macro</li>\n"
+"<li>The plugin has been damaged or has some unresolved symbols</li>\n"
+"</ul> \n"
+"Last error message that occurred: \n"
+"%3</qt>"
+msgstr ""
+
+#: library/pluginloader.cpp:315
+msgid "Unable to get last error message"
 msgstr ""
 
 #: generalprefs.cpp:50
@@ -881,3 +872,13 @@ msgstr ""
 #, c-format
 msgid "%u - Total used swap"
 msgstr ""
+
+#: ksimview.cpp:119
+msgid "Unknown"
+msgstr "Anhysbys"
+
+#: ksimview.cpp:198
+msgid ""
+"There was an error while trying to create the local folders. This could be "
+"caused by permission problems."
+msgstr ""
diff --git a/tde-i18n-cy/messages/tdeutils/ktimer.po b/tde-i18n-cy/messages/tdeutils/ktimer.po
index 355356f891a..71b0fb4a0af 100644
--- a/tde-i18n-cy/messages/tdeutils/ktimer.po
+++ b/tde-i18n-cy/messages/tdeutils/ktimer.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdeutils/ktimer.po\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -48,7 +49,7 @@ msgid "Delay [s]"
 msgstr ""
 
 #. i18n: file prefwidget.ui line 53
-#: rc.cpp:12 rc.cpp:42
+#: rc.cpp:12 rc.cpp:45
 #, no-c-format
 msgid "State"
 msgstr "Cyflwr"
@@ -65,56 +66,56 @@ msgstr "Gorchymyn"
 msgid "&New"
 msgstr "&Newydd"
 
-#. i18n: file prefwidget.ui line 124
-#: rc.cpp:24
+#. i18n: file prefwidget.ui line 132
+#: rc.cpp:27
 #, no-c-format
 msgid "Settings"
 msgstr "Gosodiadau"
 
-#. i18n: file prefwidget.ui line 141
-#: rc.cpp:27
+#. i18n: file prefwidget.ui line 149
+#: rc.cpp:30
 #, no-c-format
 msgid "&Loop"
 msgstr "&Cylchu"
 
-#. i18n: file prefwidget.ui line 149
-#: rc.cpp:30
+#. i18n: file prefwidget.ui line 157
+#: rc.cpp:33
 #, no-c-format
 msgid "Delay:"
 msgstr "Oedi:"
 
-#. i18n: file prefwidget.ui line 165
-#: rc.cpp:33
+#. i18n: file prefwidget.ui line 173
+#: rc.cpp:36
 #, no-c-format
 msgid "Start only &one instance"
 msgstr ""
 
-#. i18n: file prefwidget.ui line 173
-#: rc.cpp:36
+#. i18n: file prefwidget.ui line 181
+#: rc.cpp:39
 #, no-c-format
 msgid "seconds"
 msgstr "eiliad"
 
-#. i18n: file prefwidget.ui line 203
-#: rc.cpp:39
+#. i18n: file prefwidget.ui line 211
+#: rc.cpp:42
 #, no-c-format
 msgid "Command line:"
 msgstr "Llinell orchymyn :"
 
-#. i18n: file prefwidget.ui line 246
-#: rc.cpp:45
+#. i18n: file prefwidget.ui line 254
+#: rc.cpp:48
 #, no-c-format
 msgid "||"
 msgstr ""
 
-#. i18n: file prefwidget.ui line 254
-#: rc.cpp:48
+#. i18n: file prefwidget.ui line 262
+#: rc.cpp:51
 #, no-c-format
 msgid ">"
 msgstr ">"
 
-#. i18n: file prefwidget.ui line 262
-#: rc.cpp:51
+#. i18n: file prefwidget.ui line 270
+#: rc.cpp:54
 #, no-c-format
 msgid "="
 msgstr ""
diff --git a/tde-i18n-cy/messages/tdeutils/superkaramba.po b/tde-i18n-cy/messages/tdeutils/superkaramba.po
index 06bc4615b30..82e1f3163aa 100644
--- a/tde-i18n-cy/messages/tdeutils/superkaramba.po
+++ b/tde-i18n-cy/messages/tdeutils/superkaramba.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2008-07-08 01:20+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeutils/tdelirc.po b/tde-i18n-cy/messages/tdeutils/tdelirc.po
index 98a65b34425..6ad6bd16812 100644
--- a/tde-i18n-cy/messages/tdeutils/tdelirc.po
+++ b/tde-i18n-cy/messages/tdeutils/tdelirc.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdeutils/tdelirc.po\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeutils/tdessh.po b/tde-i18n-cy/messages/tdeutils/tdessh.po
index a31f653fd70..7ec2b59e863 100644
--- a/tde-i18n-cy/messages/tdeutils/tdessh.po
+++ b/tde-i18n-cy/messages/tdeutils/tdessh.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdeutils/tdessh.po\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdeutils/tdewalletmanager.po b/tde-i18n-cy/messages/tdeutils/tdewalletmanager.po
index c8f432341bb..b02ef9b4797 100644
--- a/tde-i18n-cy/messages/tdeutils/tdewalletmanager.po
+++ b/tde-i18n-cy/messages/tdeutils/tdewalletmanager.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdeutils/tdewalletmanager.po\n"
-"POT-Creation-Date: 2008-07-08 01:20+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -51,6 +52,94 @@ msgstr ""
 msgid "That wallet file already exists.  You cannot overwrite wallets."
 msgstr ""
 
+#: kwmapeditor.cpp:43
+msgid "Key"
+msgstr "Allwedd"
+
+#: kwmapeditor.cpp:44
+msgid "Value"
+msgstr "Gwerth"
+
+#: kwmapeditor.cpp:121
+msgid "&New Entry"
+msgstr ""
+
+#: main.cpp:45
+msgid "Show window on startup"
+msgstr ""
+
+#: main.cpp:46
+msgid "For use by tdewalletd only"
+msgstr ""
+
+#: main.cpp:47
+msgid "A wallet name"
+msgstr ""
+
+#: main.cpp:51 main.cpp:70
+msgid "TDE Wallet Manager"
+msgstr ""
+
+#: main.cpp:52
+msgid "TDE Wallet Management Tool"
+msgstr ""
+
+#: main.cpp:54
+msgid "(c) 2003,2004 George Staikos"
+msgstr ""
+
+#: main.cpp:57
+msgid "Primary author and maintainer"
+msgstr ""
+
+#: main.cpp:58
+msgid "Developer"
+msgstr "Datblygwr"
+
+#. i18n: file kbetterthankdialogbase.ui line 60
+#: rc.cpp:18
+#, no-c-format
+msgid "&Replace"
+msgstr "A&mnewid"
+
+#. i18n: file kbetterthankdialogbase.ui line 71
+#: rc.cpp:21
+#, no-c-format
+msgid "Replace &All"
+msgstr "Amnewid y &Cwbl"
+
+#. i18n: file kbetterthankdialogbase.ui line 79
+#: rc.cpp:24
+#, no-c-format
+msgid "&Skip"
+msgstr "&Hepgor"
+
+#. i18n: file kbetterthankdialogbase.ui line 87
+#: rc.cpp:27
+#, no-c-format
+msgid "Skip A&ll"
+msgstr ""
+
+#. i18n: file walletwidget.ui line 237
+#: rc.cpp:36
+#, no-c-format
+msgid "Hide &Contents"
+msgstr ""
+
+#. i18n: file walletwidget.ui line 269
+#: rc.cpp:39
+#, no-c-format
+msgid ""
+"This is a binary data entry.  It cannot be editted as its format is unknown and "
+"application specific."
+msgstr ""
+
+#. i18n: file walletwidget.ui line 398
+#: rc.cpp:42
+#, no-c-format
+msgid "Show &Contents"
+msgstr ""
+
 #: tdewalleteditor.cpp:81
 msgid "&Show values"
 msgstr ""
@@ -301,93 +390,5 @@ msgstr ""
 msgid "Disconnec&t"
 msgstr "Datgysyll&tu"
 
-#: kwmapeditor.cpp:43
-msgid "Key"
-msgstr "Allwedd"
-
-#: kwmapeditor.cpp:44
-msgid "Value"
-msgstr "Gwerth"
-
-#: kwmapeditor.cpp:121
-msgid "&New Entry"
-msgstr ""
-
-#: main.cpp:45
-msgid "Show window on startup"
-msgstr ""
-
-#: main.cpp:46
-msgid "For use by tdewalletd only"
-msgstr ""
-
-#: main.cpp:47
-msgid "A wallet name"
-msgstr ""
-
-#: main.cpp:51 main.cpp:70
-msgid "TDE Wallet Manager"
-msgstr ""
-
-#: main.cpp:52
-msgid "TDE Wallet Management Tool"
-msgstr ""
-
-#: main.cpp:54
-msgid "(c) 2003,2004 George Staikos"
-msgstr ""
-
-#: main.cpp:57
-msgid "Primary author and maintainer"
-msgstr ""
-
-#: main.cpp:58
-msgid "Developer"
-msgstr "Datblygwr"
-
-#. i18n: file kbetterthankdialogbase.ui line 60
-#: rc.cpp:18
-#, no-c-format
-msgid "&Replace"
-msgstr "A&mnewid"
-
-#. i18n: file kbetterthankdialogbase.ui line 71
-#: rc.cpp:21
-#, no-c-format
-msgid "Replace &All"
-msgstr "Amnewid y &Cwbl"
-
-#. i18n: file kbetterthankdialogbase.ui line 79
-#: rc.cpp:24
-#, no-c-format
-msgid "&Skip"
-msgstr "&Hepgor"
-
-#. i18n: file kbetterthankdialogbase.ui line 87
-#: rc.cpp:27
-#, no-c-format
-msgid "Skip A&ll"
-msgstr ""
-
-#. i18n: file walletwidget.ui line 237
-#: rc.cpp:36
-#, no-c-format
-msgid "Hide &Contents"
-msgstr ""
-
-#. i18n: file walletwidget.ui line 269
-#: rc.cpp:39
-#, no-c-format
-msgid ""
-"This is a binary data entry.  It cannot be editted as its format is unknown and "
-"application specific."
-msgstr ""
-
-#. i18n: file walletwidget.ui line 398
-#: rc.cpp:42
-#, no-c-format
-msgid "Show &Contents"
-msgstr ""
-
 #~ msgid "Alt+C"
 #~ msgstr "Alt+C"
diff --git a/tde-i18n-cy/messages/tdevelop/tdevelop.po b/tde-i18n-cy/messages/tdevelop/tdevelop.po
index 08453eeef7a..41985d5bef2 100644
--- a/tde-i18n-cy/messages/tdevelop/tdevelop.po
+++ b/tde-i18n-cy/messages/tdevelop/tdevelop.po
@@ -6,850 +6,328 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: all.po\n"
-"POT-Creation-Date: 2008-08-01 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:51-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. i18n: file ./languages/cpp/app_templates/kxt/appui.rc line 4
-#: rc.cpp:6 rc.cpp:12 rc.cpp:45 rc.cpp:60 rc.cpp:78
-#, no-c-format
-msgid "&Move"
-msgstr "Sy&mud"
-
-#. i18n: file ./languages/cpp/app_templates/kapp/appui.rc line 4
-#: rc.cpp:9 rc.cpp:21 rc.cpp:39 rc.cpp:75 rc.cpp:81
+#. i18n: file ./languages/cpp/app_templates/khello2/appui.rc line 4
+#: rc.cpp:6 rc.cpp:51 rc.cpp:57 rc.cpp:75 rc.cpp:84
 #, no-c-format
 msgid "C&ustom"
 msgstr "&Addasiedig"
 
+#. i18n: file ./languages/cpp/app_templates/kde4app/kde4appui.rc line 4
+#: rc.cpp:33 rc.cpp:45 rc.cpp:48 rc.cpp:54 rc.cpp:72
+#, no-c-format
+msgid "&Move"
+msgstr "Sy&mud"
+
 #. i18n: file ./languages/cpp/debugger/kdevdebugger.rc line 5
-#: rc.cpp:69 rc.cpp:84 rc.cpp:147 rc.cpp:234
+#: rc.cpp:66 rc.cpp:78 rc.cpp:90 rc.cpp:144
 #, no-c-format
 msgid "&Debug"
 msgstr ""
 
 #. i18n: file ./languages/cpp/debugger/kdevdebugger.rc line 29
-#: rc.cpp:72 rc.cpp:87 rc.cpp:174
+#: rc.cpp:69 rc.cpp:81 rc.cpp:171
 #, no-c-format
 msgid "Debugger Toolbar"
 msgstr ""
 
-#. i18n: file ./src/kdevassistantui.rc line 55
-#: rc.cpp:102 rc.cpp:141 rc.cpp:207 rc.cpp:246 rc.cpp:279
-#, no-c-format
-msgid "&Project"
-msgstr "&Cywaith"
-
-#. i18n: file ./src/kdevassistantui.rc line 68
-#: rc.cpp:105 rc.cpp:144
-#, no-c-format
-msgid "Bu&ild"
-msgstr ""
-
-#. i18n: file ./src/kdevassistantui.rc line 106
-#: kdevdesigner/designer/mainwindowactions.cpp:937
-#: src/simplemainwindow.cpp:703 rc.cpp:114 rc.cpp:156 rc.cpp:258 rc.cpp:291
-#, no-c-format
-msgid "&Window"
-msgstr "&Ffenestr"
-
-#. i18n: file ./src/kdevassistantui.rc line 143
-#: rc.cpp:123 rc.cpp:165
-#, no-c-format
-msgid "Build Toolbar"
-msgstr ""
-
-#. i18n: file ./src/kdevassistantui.rc line 150
-#: rc.cpp:126 rc.cpp:168 rc.cpp:228
-#, no-c-format
-msgid "Browser Toolbar"
-msgstr ""
-
-#. i18n: file ./src/kdevassistantui.rc line 159
-#: rc.cpp:129 rc.cpp:171
-#, no-c-format
-msgid "Extra Toolbar"
-msgstr "Bar Offer Ychwanegol"
+#. i18n: file ./parts/filelist/kdevfilelist.rc line 8
+#: rc.cpp:102
+#, fuzzy, no-c-format
+msgid "View Sessions"
+msgstr "Sesiwn"
 
-#. i18n: file ./src/tdevelopui.rc line 187
-#: rc.cpp:177 rc.cpp:216
+#. i18n: file ./parts/filelist/kdevfilelist.rc line 18
+#: rc.cpp:105 rc.cpp:174
 #, no-c-format
 msgid "View Sessions Toolbar"
 msgstr ""
 
-#. i18n: file ./vcs/subversion/kdevpart_subversion.rc line 5
-#: rc.cpp:183 rc.cpp:189 rc.cpp:195
-#, no-c-format
-msgid "&Version Control"
-msgstr ""
-
-#. i18n: file ./vcs/subversion/kdevpart_subversion.rc line 8
-#: rc.cpp:186
-#, no-c-format
-msgid "&Subversion"
-msgstr ""
-
-#. i18n: file ./vcs/cvsservice/kdevcvsservicepart.rc line 9
-#: rc.cpp:192
-#, no-c-format
-msgid "&CVS Service"
-msgstr ""
-
-#. i18n: file ./vcs/perforce/kdevperforcepart.rc line 9
-#: rc.cpp:198
-#, no-c-format
-msgid "&Perforce"
-msgstr ""
-
 #. i18n: file ./parts/tools/kdevpart_tools.rc line 11
-#: rc.cpp:204 rc.cpp:270 rc.cpp:306
+#: rc.cpp:111 rc.cpp:249 rc.cpp:282
 #, no-c-format
 msgid "Tools Toolbar"
 msgstr ""
 
-#. i18n: file ./parts/filelist/kdevfilelist.rc line 8
-#: rc.cpp:213
-#, fuzzy, no-c-format
-msgid "View Sessions"
-msgstr "Sesiwn"
+#. i18n: file ./parts/classview/kdevclassview.rc line 14
+#: rc.cpp:117 rc.cpp:165 rc.cpp:210
+#, no-c-format
+msgid "Browser Toolbar"
+msgstr ""
 
 #. i18n: file ./parts/astyle/kdevpart_astyle.rc line 12
-#: rc.cpp:219
+#: rc.cpp:120
 #, fuzzy, no-c-format
 msgid "Astyle Toolbar"
 msgstr "Bar offer"
 
 #. i18n: file ./parts/scripting/kdevscripting.rc line 4
-#: rc.cpp:237
+#: rc.cpp:123
 #, no-c-format
 msgid "S&cripts"
 msgstr "S&griptiau"
 
-#. i18n: file ./kdevdesigner/designer/kdevdesigner_part_sh.rc line 55
-#: kdevdesigner/designer/mainwindow.cpp:3734
-#: kdevdesigner/designer/mainwindowactions.cpp:409
-#: kdevdesigner/designer/multilineeditorimpl.cpp:130 rc.cpp:252 rc.cpp:285
-#, no-c-format
-msgid "&Layout"
-msgstr "&Cynllun"
-
-#. i18n: file ./kdevdesigner/designer/kdevdesigner_part_sh.rc line 81
-#: rc.cpp:261 rc.cpp:294
-#, no-c-format
-msgid "File Toolbar"
-msgstr ""
-
-#. i18n: file ./kdevdesigner/designer/kdevdesigner_part_sh.rc line 87
-#: rc.cpp:264 rc.cpp:297
-#, no-c-format
-msgid "Edit Toolbar"
-msgstr ""
-
-#. i18n: file ./kdevdesigner/designer/kdevdesigner_part_sh.rc line 96
-#: rc.cpp:267 rc.cpp:303
-#, no-c-format
-msgid "Layout Toolbar"
-msgstr ""
-
-#. i18n: file ./languages/ada/configproblemreporter.ui line 24
-#: rc.cpp:309 rc.cpp:1875 rc.cpp:2083
-#, no-c-format
-msgid "&Enable background parsing"
-msgstr ""
-
-#. i18n: file ./languages/ada/addclassdlg.ui line 16
-#: rc.cpp:312
-#, no-c-format
-msgid "Add Class"
-msgstr ""
-
-#. i18n: file ./languages/ada/addclassdlg.ui line 30
-#: rc.cpp:315
-#, no-c-format
-msgid "&Implements"
-msgstr ""
-
-#. i18n: file ./languages/ada/addclassdlg.ui line 38
-#: rc.cpp:318
-#, no-c-format
-msgid "&Class"
-msgstr "&Dosbarth"
-
-#. i18n: file ./languages/ada/addclassdlg.ui line 72
-#: rc.cpp:321
-#, no-c-format
-msgid "&Abstract"
-msgstr "&Crynodeb"
-
-#. i18n: file ./languages/ada/addclassdlg.ui line 80
-#: rc.cpp:324
-#, no-c-format
-msgid "&Interface"
-msgstr "&Rhyngwyneb"
-
-#. i18n: file ./languages/ada/addclassdlg.ui line 88
-#: buildtools/autotools/addprefixdlg.cpp:29
-#: buildtools/lib/widgets/addenvvardlg.cpp:36 rc.cpp:327 rc.cpp:426
-#: rc.cpp:2465 rc.cpp:3767 rc.cpp:4555 rc.cpp:6179 rc.cpp:6242 rc.cpp:6554
-#: rc.cpp:8269
-#, no-c-format
-msgid "&Name:"
-msgstr "&Enw:"
-
-#. i18n: file ./languages/ada/addclassdlg.ui line 117
-#: rc.cpp:330
-#, no-c-format
-msgid "&Public"
-msgstr "&Cyhoeddus"
-
-#. i18n: file ./languages/ada/addclassdlg.ui line 128
-#: rc.cpp:333
-#, no-c-format
-msgid "P&rotected"
-msgstr "G&warchodir"
-
-#. i18n: file ./languages/ada/addclassdlg.ui line 136
-#: rc.cpp:336
-#, no-c-format
-msgid "Pri&vate"
-msgstr "Pre&ivat"
-
-#. i18n: file ./languages/ada/addclassdlg.ui line 146
-#: rc.cpp:339
-#, no-c-format
-msgid "&Final"
-msgstr "&Terfynol"
-
-#. i18n: file ./languages/ada/addclassdlg.ui line 170
-#: rc.cpp:342
-#, no-c-format
-msgid "&Extends:"
-msgstr ""
-
-#. i18n: file ./languages/ada/addclassdlg.ui line 189
-#: lib/widgets/propeditor/pfontbutton.cpp:43
-#: lib/widgets/propeditor/ppixmapedit.cpp:54 rc.cpp:345 rc.cpp:1175
-#: rc.cpp:1733 rc.cpp:1827 rc.cpp:1836 rc.cpp:1842 rc.cpp:4992 rc.cpp:5028
-#: rc.cpp:5920 rc.cpp:6413 rc.cpp:6416 rc.cpp:6476 rc.cpp:6494 rc.cpp:6509
-#: rc.cpp:6617 rc.cpp:6623 rc.cpp:6629 rc.cpp:7195 rc.cpp:7447 rc.cpp:7519
-#: rc.cpp:7721 rc.cpp:7736 rc.cpp:8106 rc.cpp:8112 rc.cpp:8326 rc.cpp:8470
-#: rc.cpp:8527
+#. i18n: file ./parts/distpart/kdevpart_distpart.rc line 4
+#: rc.cpp:126 rc.cpp:138 rc.cpp:186 rc.cpp:222 rc.cpp:258
 #, no-c-format
-msgid "..."
-msgstr "..."
-
-#. i18n: file ./languages/ada/addclassdlg.ui line 202
-#: rc.cpp:348
-#, no-c-format
-msgid "&Source path:"
-msgstr ""
-
-#. i18n: file ./languages/ada/addclassdlg.ui line 227
-#: rc.cpp:354
-#, no-c-format
-msgid "&Create default constructor"
-msgstr ""
-
-#. i18n: file ./languages/ada/addclassdlg.ui line 238
-#: rc.cpp:357
-#, no-c-format
-msgid "Create &main method"
-msgstr ""
-
-#. i18n: file ./languages/ada/addclassdlg.ui line 248
-#: rc.cpp:360
-#, no-c-format
-msgid "&Documentation"
-msgstr "&Dogfenniaeth"
-
-#. i18n: file ./languages/ada/addclassdlg.ui line 260
-#: rc.cpp:363 rc.cpp:3381
-#, no-c-format
-msgid "&License:"
-msgstr "&Trwydded:"
-
-#. i18n: file ./languages/ada/addclassdlg.ui line 269
-#: rc.cpp:366
-#, no-c-format
-msgid "LGPL"
-msgstr "LGPL"
-
-#. i18n: file ./languages/ada/addclassdlg.ui line 274
-#: rc.cpp:369
-#, no-c-format
-msgid "GPL"
-msgstr "GPL"
-
-#. i18n: file ./languages/ada/addclassdlg.ui line 279
-#: rc.cpp:372
-#, no-c-format
-msgid "QPL"
-msgstr ""
-
-#. i18n: file ./languages/ada/addclassdlg.ui line 345
-#: languages/ruby/debugger/variablewidget.cpp:62
-#: lib/widgets/propeditor/qeditlistbox.cpp:121 rc.cpp:378 rc.cpp:445
-#: rc.cpp:1637 rc.cpp:1663 rc.cpp:1670 rc.cpp:1890 rc.cpp:3761 rc.cpp:5914
-#: rc.cpp:5989 rc.cpp:6044 rc.cpp:6362 rc.cpp:6527 rc.cpp:8034 rc.cpp:8545
-#: rc.cpp:8858
-#, no-c-format
-msgid "&Add"
-msgstr "&Ychwanegu"
-
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 16
-#: rc.cpp:384 rc.cpp:1709
-#, no-c-format
-msgid "New Class"
-msgstr ""
+msgid "&Project"
+msgstr "&Cywaith"
 
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 34
-#: rc.cpp:387
+#. i18n: file ./src/tdevelopui.rc line 73
+#: rc.cpp:141 rc.cpp:189
 #, no-c-format
-msgid "Class &Information"
+msgid "Bu&ild"
 msgstr ""
 
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 73
-#: rc.cpp:390
+#. i18n: file ./src/tdevelopui.rc line 118
+#: kdevdesigner/designer/mainwindowactions.cpp:937
+#: src/simplemainwindow.cpp:714 rc.cpp:153 rc.cpp:198 rc.cpp:234 rc.cpp:270
 #, no-c-format
-msgid "Docu&mentation:"
-msgstr "Dogf&enniaeth :"
+msgid "&Window"
+msgstr "&Ffenestr"
 
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 87
-#: rc.cpp:393
+#. i18n: file ./src/tdevelopui.rc line 157
+#: rc.cpp:162 rc.cpp:207
 #, no-c-format
-msgid ""
-"Insert a short description for your new class\n"
-"here for documentation purposes. This can be used\n"
-"to create API documentation in HTML format with\n"
-"doxygen or similar tools."
-msgstr ""
-
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 97
-#: rc.cpp:399
-#, no-c-format
-msgid "File Names"
+msgid "Build Toolbar"
 msgstr ""
 
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 108
-#: rc.cpp:402
-#, no-c-format
-msgid "&Header:"
-msgstr "P&ennawd :"
-
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 122
-#: rc.cpp:405
+#. i18n: file ./src/tdevelopui.rc line 172
+#: rc.cpp:168 rc.cpp:213
 #, no-c-format
-msgid ""
-"Insert your header file name here.\n"
-"It is automatically inserted while\n"
-"you select the classname, but you can\n"
-"still edit it afterwards."
-msgstr ""
+msgid "Extra Toolbar"
+msgstr "Bar Offer Ychwanegol"
 
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 130
-#: rc.cpp:411
+#. i18n: file ./kdevdesigner/designer/kdevdesigner_part.rc line 47
+#: kdevdesigner/designer/mainwindow.cpp:3734
+#: kdevdesigner/designer/mainwindowactions.cpp:409
+#: kdevdesigner/designer/multilineeditorimpl.cpp:130 rc.cpp:228 rc.cpp:264
 #, no-c-format
-msgid "Im&plementation:"
-msgstr ""
+msgid "&Layout"
+msgstr "&Cynllun"
 
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 144
-#: rc.cpp:414
+#. i18n: file ./kdevdesigner/designer/kdevdesigner_part.rc line 73
+#: rc.cpp:237 rc.cpp:273
 #, no-c-format
-msgid ""
-"Insert your implementation filename here.\n"
-"It is automatically inserted while\n"
-"you select the classname, but you can\n"
-"still edit it afterwards."
+msgid "File Toolbar"
 msgstr ""
 
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 152
-#: rc.cpp:420
-#, fuzzy, no-c-format
-msgid "Create only header"
-msgstr "Creu Patrymlun"
-
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 162
-#: kdevdesigner/designer/hierarchyview.cpp:191
-#: parts/classview/classtreebase.cpp:51 rc.cpp:423
+#. i18n: file ./kdevdesigner/designer/kdevdesigner_part.rc line 79
+#: rc.cpp:240 rc.cpp:276
 #, no-c-format
-msgid "Class"
-msgstr "Dosbarth"
-
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 194
-#: rc.cpp:429
-#, no-c-format
-msgid ""
-"Insert your new classname here.\n"
-"You can also define template classes by specifying\n"
-"template <params> classname"
+msgid "Edit Toolbar"
 msgstr ""
 
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 210
-#: rc.cpp:434
+#. i18n: file ./kdevdesigner/designer/kdevdesigner_part.rc line 101
+#: rc.cpp:246 rc.cpp:279
 #, no-c-format
-msgid "Name&space:"
+msgid "Layout Toolbar"
 msgstr ""
 
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 223
-#: rc.cpp:437
+#. i18n: file ./vcs/subversion/kdevpart_subversion.rc line 5
+#: rc.cpp:288 rc.cpp:294 rc.cpp:300
 #, no-c-format
-msgid ""
-"Insert a name of the namespace here.\n"
-"You can define nested namespaces by specifying\n"
-"Namespace1::Namespace2::...::NamespaceN"
+msgid "&Version Control"
 msgstr ""
 
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 233
-#: rc.cpp:442
+#. i18n: file ./vcs/subversion/kdevpart_subversion.rc line 8
+#: rc.cpp:291
 #, no-c-format
-msgid "Inheritance"
+msgid "&Subversion"
 msgstr ""
 
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 302
-#: lib/widgets/propeditor/qeditlistbox.cpp:137 rc.cpp:451 rc.cpp:1887
-#: rc.cpp:3677 rc.cpp:3920 rc.cpp:4744 rc.cpp:6308 rc.cpp:6638 rc.cpp:6689
-#, no-c-format
-msgid "Move &Up"
-msgstr "Symud i &Fyny"
-
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 330
-#: lib/widgets/propeditor/qeditlistbox.cpp:141 rc.cpp:454 rc.cpp:1884
-#: rc.cpp:3680 rc.cpp:3923 rc.cpp:4747 rc.cpp:6311 rc.cpp:6641 rc.cpp:6692
-#, no-c-format
-msgid "Move &Down"
-msgstr "Symud i &Lawr"
-
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 349
-#: rc.cpp:457 rc.cpp:1721
+#. i18n: file ./vcs/perforce/kdevperforcepart.rc line 9
+#: rc.cpp:297
 #, no-c-format
-msgid "&Base class:"
+msgid "&Perforce"
 msgstr ""
 
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 358
-#: rc.cpp:460
+#. i18n: file ./vcs/cvsservice/kdevcvsservicepart.rc line 9
+#: rc.cpp:303
 #, no-c-format
-msgid "Baseclass Name"
+msgid "&CVS Service"
 msgstr ""
 
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 369
-#: rc.cpp:463
+#. i18n: file ./editors/editor-chooser/editchooser.ui line 24
+#: rc.cpp:309
 #, no-c-format
-msgid "Inheritance Type"
+msgid "&Embedded Editor"
 msgstr ""
 
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 416
-#: rc.cpp:466
+#. i18n: file ./editors/editor-chooser/editchooser.ui line 41
+#: rc.cpp:312
 #, no-c-format
 msgid ""
-"Insert the base class which your new class will be derived from. If you have "
-"checked 'Generate QWidget child class' the new class will be derived from "
-"QWidget. If no base class is named, the new class will not have a parent class. "
-"You can also use template classes here (like BaseClass<int, int>)"
-msgstr ""
-
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 458
-#: languages/ruby/debugger/variablewidget.cpp:834
-#: parts/classview/classtreebase.cpp:154
-#: src/profileengine/editor/profileeditor.cpp:139 rc.cpp:469 rc.cpp:7745
-#, no-c-format
-msgid "Global"
-msgstr "Eang"
-
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 463
-#: rc.cpp:472 rc.cpp:7748
-#, no-c-format
-msgid "Local"
-msgstr "Lleol"
-
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 489
-#: rc.cpp:475
-#, no-c-format
-msgid "Virtual"
-msgstr ""
-
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 500
-#: rc.cpp:478
-#, no-c-format
-msgid "Public"
-msgstr "Cyhoeddus"
-
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 514
-#: rc.cpp:481
-#, no-c-format
-msgid "Protected"
-msgstr "Gwarchodir"
-
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 525
-#: rc.cpp:484
-#, no-c-format
-msgid "Private"
-msgstr "Preivat"
-
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 548
-#: rc.cpp:490
-#, no-c-format
-msgid "Use file t&emplates"
-msgstr ""
-
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 559
-#: rc.cpp:493
-#, no-c-format
-msgid "Generate QOb&ject child class"
-msgstr ""
-
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 567
-#: rc.cpp:496
-#, no-c-format
-msgid "Generate Q&Widget child class"
-msgstr ""
-
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 575
-#: rc.cpp:499
-#, no-c-format
-msgid "Generate G&TK+ class"
-msgstr ""
-
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 583
-#: rc.cpp:502
-#, no-c-format
-msgid "Use Objective-C"
-msgstr ""
-
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 595
-#: rc.cpp:505
-#, no-c-format
-msgid "Ad&vanced Information"
-msgstr ""
-
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 610
-#: rc.cpp:508
-#, no-c-format
-msgid "Constr&uctors"
-msgstr ""
-
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 619
-#: rc.cpp:511
-#, no-c-format
-msgid "Base Class Constructors"
-msgstr ""
-
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 668
-#: rc.cpp:514
-#, no-c-format
-msgid "C&reate Constructor >>"
-msgstr ""
-
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 690
-#: rc.cpp:517
-#, no-c-format
-msgid "C&lear Selection"
-msgstr "G&wagu Dewisiad"
-
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 721
-#: rc.cpp:520
-#, no-c-format
-msgid "&Header"
-msgstr "P&ennawd"
-
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 756
-#: rc.cpp:523
-#, no-c-format
-msgid "&Source"
-msgstr "&Tarddiad"
-
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 794
-#: rc.cpp:526
-#, no-c-format
-msgid "Methods Ov&erriding"
-msgstr ""
-
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 803
-#: languages/cpp/cppnewclassdlg.cpp:872 languages/cpp/cppnewclassdlg.cpp:875
-#: languages/cpp/cppnewclassdlg.cpp:1031 languages/cpp/cppnewclassdlg.cpp:1034
-#: rc.cpp:529
-#, no-c-format
-msgid "Methods"
-msgstr ""
-
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 814
-#: rc.cpp:532
-#, no-c-format
-msgid "Extend Functionality"
-msgstr ""
-
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 849
-#: rc.cpp:535
-#, no-c-format
-msgid "&Access Control"
-msgstr ""
-
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 858
-#: rc.cpp:538
-#, no-c-format
-msgid "Methods & Attributes"
-msgstr ""
-
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 869
-#: rc.cpp:541
-#, no-c-format
-msgid "Implied Modifier"
-msgstr ""
-
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 880
-#: rc.cpp:544
-#, no-c-format
-msgid "New Modifier"
-msgstr ""
-
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 923
-#: rc.cpp:547
-#, no-c-format
-msgid "&Generation Options"
+"<i>Note:</i> Changing the preferred editor will not affect\n"
+"already open files."
 msgstr ""
 
-#. i18n: file ./languages/cpp/creategettersetter.ui line 44
-#: rc.cpp:556
-#, no-c-format
-msgid "&inline"
-msgstr "&mewnlin"
-
-#. i18n: file ./languages/cpp/creategettersetter.ui line 50
-#: rc.cpp:559
+#. i18n: file ./editors/editor-chooser/editchooser.ui line 51
+#: rc.cpp:316
 #, no-c-format
-msgid "create an inline get method"
+msgid "On External Changes"
 msgstr ""
 
-#. i18n: file ./languages/cpp/creategettersetter.ui line 53
-#: rc.cpp:562
+#. i18n: file ./editors/editor-chooser/editchooser.ui line 57
+#: rc.cpp:319
 #, no-c-format
 msgid ""
-"If this is checked the get method will be created inline; otherwise, it will "
-"not."
-msgstr ""
-
-#. i18n: file ./languages/cpp/creategettersetter.ui line 61
-#: rc.cpp:565
-#, fuzzy, no-c-format
-msgid "&get method"
-msgstr "&Dull:"
-
-#. i18n: file ./languages/cpp/creategettersetter.ui line 67
-#: rc.cpp:568
-#, no-c-format
-msgid "create get method"
-msgstr ""
-
-#. i18n: file ./languages/cpp/creategettersetter.ui line 70
-#: rc.cpp:571
-#, no-c-format
-msgid "If this is checked a getter method will be created."
+"<p><b>Action to take when an open file is changed on disk</b></p>\n"
+"<p><b>Do nothing</b> - The file will be marked as externally changed and the "
+"user will be asked to verify any attempt to overwrite it </p>\n"
+"<p><b>Alert the user</b> - A dialog will alert the user that a file has changed "
+"and offer the user to reload the file</p>\n"
+"<p><b>Automatically reload</b> - Any files that are not modified in memory are "
+"reloaded, and an alert is shown for any conflicts</p>"
 msgstr ""
 
-#. i18n: file ./languages/cpp/creategettersetter.ui line 78
-#: rc.cpp:574
+#. i18n: file ./editors/editor-chooser/editchooser.ui line 68
+#: rc.cpp:325
 #, fuzzy, no-c-format
-msgid "&set method"
-msgstr "&Dull:"
-
-#. i18n: file ./languages/cpp/creategettersetter.ui line 84
-#: rc.cpp:577
-#, no-c-format
-msgid "create set method"
-msgstr ""
-
-#. i18n: file ./languages/cpp/creategettersetter.ui line 87
-#: rc.cpp:580
-#, no-c-format
-msgid "If this is checked a set method will be created"
-msgstr ""
-
-#. i18n: file ./languages/cpp/creategettersetter.ui line 95
-#: rc.cpp:583
-#, no-c-format
-msgid "name of the get method"
-msgstr ""
-
-#. i18n: file ./languages/cpp/creategettersetter.ui line 98
-#: rc.cpp:586
-#, no-c-format
-msgid "The name of the created get method"
-msgstr ""
-
-#. i18n: file ./languages/cpp/creategettersetter.ui line 106
-#: rc.cpp:589
-#, no-c-format
-msgid "name of the set method"
-msgstr ""
+msgid "&Do nothing"
+msgstr "Ychwanegwch rywbeth yma"
 
-#. i18n: file ./languages/cpp/creategettersetter.ui line 109
-#: rc.cpp:592
+#. i18n: file ./editors/editor-chooser/editchooser.ui line 82
+#: rc.cpp:328
 #, no-c-format
-msgid "The name of the created set method"
+msgid "&Alert the user"
 msgstr ""
 
-#. i18n: file ./languages/cpp/creategettersetter.ui line 117
-#: rc.cpp:595
-#, no-c-format
-msgid "i&nline"
-msgstr "m&ewnlin"
-
-#. i18n: file ./languages/cpp/creategettersetter.ui line 123
-#: rc.cpp:598
+#. i18n: file ./editors/editor-chooser/editchooser.ui line 90
+#: rc.cpp:331
 #, no-c-format
-msgid "create an inline set method"
+msgid "Automatically reload the file &if safe, alert the user if not"
 msgstr ""
 
-#. i18n: file ./languages/cpp/creategettersetter.ui line 126
-#: rc.cpp:601
+#. i18n: file ./languages/kjssupport/subclassingdlgbase.ui line 16
+#: languages/kjssupport/kjssupport_part.cpp:429 rc.cpp:334
 #, no-c-format
-msgid ""
-"If this is checked the set method will be created inline; otherwise, it will "
-"not."
+msgid "Implement Slots"
 msgstr ""
 
-#. i18n: file ./languages/cpp/createpcsdialogbase.ui line 16
-#: rc.cpp:610
+#. i18n: file ./languages/kjssupport/subclassingdlgbase.ui line 38
+#: rc.cpp:340 rc.cpp:896
 #, no-c-format
-msgid "New Persistant Class Store"
+msgid "Re&format source"
 msgstr ""
 
-#. i18n: file ./languages/cpp/createpcsdialogbase.ui line 23
-#: rc.cpp:613
-#, fuzzy, no-c-format
-msgid "Select importer"
-msgstr " Dileu eitem"
-
-#. i18n: file ./languages/cpp/createpcsdialogbase.ui line 55
-#: rc.cpp:616
-#, fuzzy, no-c-format
-msgid "Select directory"
-msgstr "Cyfeiriadur"
-
-#. i18n: file ./languages/cpp/createpcsdialogbase.ui line 63
-#: rc.cpp:619
+#. i18n: file ./languages/kjssupport/subclassingdlgbase.ui line 54
+#: rc.cpp:343 rc.cpp:899
 #, no-c-format
-msgid "Describe database contents"
+msgid "Reformat source by &default"
 msgstr ""
 
-#. i18n: file ./languages/cpp/createpcsdialogbase.ui line 74
-#: rc.cpp:622
-#, fuzzy, no-c-format
-msgid "Filename:"
-msgstr "Enw'r ffeil:"
-
-#. i18n: file ./languages/cpp/createpcsdialogbase.ui line 106
-#: rc.cpp:625
+#. i18n: file ./languages/kjssupport/subclassingdlgbase.ui line 60
+#: parts/classview/classtreebase.cpp:81 rc.cpp:346 rc.cpp:881
 #, no-c-format
-msgid "Creating..."
-msgstr "Creu ..."
+msgid "Method"
+msgstr "Dull"
 
-#. i18n: file ./languages/cpp/configproblemreporter.ui line 24
-#: languages/cpp/cppsupportpart.cpp:585 rc.cpp:628
+#. i18n: file ./languages/kjssupport/subclassingdlgbase.ui line 71
+#: rc.cpp:349 rc.cpp:884 rc.cpp:914 rc.cpp:1296 rc.cpp:4316 rc.cpp:4822
+#: rc.cpp:5472
 #, no-c-format
-msgid "Problem Reporter"
-msgstr ""
+msgid "Access"
+msgstr "Cyrchiad"
 
-#. i18n: file ./languages/cpp/configproblemreporter.ui line 28
-#: rc.cpp:631
+#. i18n: file ./languages/kjssupport/subclassingdlgbase.ui line 82
+#: rc.cpp:352 rc.cpp:887 rc.cpp:5469
 #, no-c-format
-msgid ""
-"If enabled, the C++ parser will report any syntax errors it detects. \n"
-"They will be displayed in the 'Problems' output view and as markers in the "
-"editor."
+msgid "Specifier"
 msgstr ""
 
-#. i18n: file ./languages/cpp/configproblemreporter.ui line 39
-#: rc.cpp:635
+#. i18n: file ./languages/kjssupport/subclassingdlgbase.ui line 93
+#: rc.cpp:355 rc.cpp:890 rc.cpp:920 rc.cpp:5466
 #, no-c-format
-msgid "&Use Problem Reporter"
+msgid "Return Type"
 msgstr ""
 
-#. i18n: file ./languages/cpp/configproblemreporter.ui line 52
-#: rc.cpp:638
+#. i18n: file ./languages/kjssupport/subclassingdlgbase.ui line 104
+#: kdevdesigner/designer/outputwindow.cpp:83
+#: languages/cpp/debugger/gdbbreakpointwidget.cpp:218
+#: languages/ruby/debugger/rdbbreakpointwidget.cpp:230
+#: parts/partexplorer/partexplorerform.cpp:117 rc.cpp:358 rc.cpp:893
+#: rc.cpp:1302 rc.cpp:2556 rc.cpp:4945 rc.cpp:5475
 #, no-c-format
-msgid "Parsing"
-msgstr ""
+msgid "Type"
+msgstr "Math"
 
-#. i18n: file ./languages/cpp/configproblemreporter.ui line 57
-#: rc.cpp:641
+#. i18n: file ./languages/kjssupport/subclassingdlgbase.ui line 122
+#: rc.cpp:361 rc.cpp:872
 #, no-c-format
-msgid ""
-"If enabled, the C++ parser will run on the active file after the stated "
-"timeout, after there has been any changes to the text.\n"
-"\n"
-"If disabled, the parser will typically only run when the file is saved."
+msgid "&Specialize following slots:"
 msgstr ""
 
-#. i18n: file ./languages/cpp/configproblemreporter.ui line 76
-#: rc.cpp:646
-#, fuzzy, no-c-format
-msgid "Enable &background parsing"
-msgstr "Galluogi"
-
-#. i18n: file ./languages/cpp/configproblemreporter.ui line 92
-#: rc.cpp:649 rc.cpp:676 rc.cpp:737 rc.cpp:1878
+#. i18n: file ./languages/kjssupport/subclassingdlgbase.ui line 146
+#: rc.cpp:364 rc.cpp:878
 #, no-c-format
-msgid "msec"
-msgstr "msec"
+msgid "F&ile name:"
+msgstr "E&nw'r ffeil:"
 
-#. i18n: file ./languages/cpp/configproblemreporter.ui line 133
-#: rc.cpp:652
+#. i18n: file ./languages/kjssupport/subclassingdlgbase.ui line 165
+#: rc.cpp:367 rc.cpp:875 rc.cpp:1819
 #, no-c-format
-msgid "Special &Headers"
+msgid "C&lass name:"
 msgstr ""
 
-#. i18n: file ./languages/cpp/configproblemreporter.ui line 136
-#: rc.cpp:655
+#. i18n: file ./languages/kjssupport/subclassingdlgbase.ui line 183
+#: rc.cpp:370 rc.cpp:902 rc.cpp:5776
 #, no-c-format
-msgid ""
-"Often a macro that the C++ parser must understand in order to correctly parse a "
-"piece of code is defined somewhere in some far off header file that the parser "
-"doesn't look at. This textbox can be used to define those macros locally so "
-"that the C++ parser to understand them."
-msgstr ""
+msgid "C&reate"
+msgstr "C&reu"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 16
-#: rc.cpp:658
+#: rc.cpp:376
 #, no-c-format
 msgid "C++ Options"
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 31
-#: rc.cpp:661
+#: rc.cpp:379
 #, fuzzy, no-c-format
 msgid "&Code Completion"
 msgstr "Crynhoydd"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 50
-#: rc.cpp:664
+#: rc.cpp:382
 #, no-c-format
 msgid "Code Completion Options"
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 69
-#: rc.cpp:667
+#: rc.cpp:385
 #, no-c-format
 msgid "A&utomatic code completion:"
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 75
-#: rc.cpp:670
+#: rc.cpp:388
 #, no-c-format
 msgid "Offer options to complete what you are typing."
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 116
-#: rc.cpp:673
+#: rc.cpp:391
 #, no-c-format
 msgid "How long after a key press to offer suggestions"
 msgstr ""
 
+#. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 132
+#: rc.cpp:394 rc.cpp:455 rc.cpp:1230 rc.cpp:1870
+#, no-c-format
+msgid "msec"
+msgstr "msec"
+
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 143
-#: rc.cpp:679
+#: rc.cpp:397
 #, no-c-format
 msgid ""
 "List &global items when\n"
@@ -857,7 +335,7 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 152
-#: rc.cpp:683 rc.cpp:692
+#: rc.cpp:401 rc.cpp:410
 #, no-c-format
 msgid ""
 "When this is checked, members of all \n"
@@ -870,13 +348,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 169
-#: rc.cpp:701
+#: rc.cpp:419
 #, no-c-format
 msgid "&Do complete member-type-evaluation"
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 176
-#: rc.cpp:704 rc.cpp:711
+#: rc.cpp:422 rc.cpp:429
 #, no-c-format
 msgid ""
 "Completely evaluate member-types of \n"
@@ -887,13 +365,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 191
-#: rc.cpp:718
+#: rc.cpp:436
 #, no-c-format
 msgid "Do complete argument-type-e&valuation"
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 196
-#: rc.cpp:721 rc.cpp:726
+#: rc.cpp:439 rc.cpp:444
 #, no-c-format
 msgid ""
 "Completely evaluate the function-argument-types \n"
@@ -902,19 +380,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 211
-#: rc.cpp:731
+#: rc.cpp:449
 #, fuzzy, no-c-format
 msgid "Argument Hint Options"
 msgstr "Dewisiadau'r Dudalen Gyntaf"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 222
-#: rc.cpp:734
+#: rc.cpp:452
 #, no-c-format
 msgid "Auto&matic arguments hint:"
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 290
-#: rc.cpp:740
+#: rc.cpp:458
 #, no-c-format
 msgid ""
 "Show comment with\n"
@@ -922,19 +400,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 313
-#: rc.cpp:744
+#: rc.cpp:462
 #, no-c-format
 msgid "Incremental Parsing"
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 324
-#: rc.cpp:747
+#: rc.cpp:465
 #, no-c-format
 msgid "Do not process included headers"
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 336
-#: rc.cpp:750
+#: rc.cpp:468
 #, no-c-format
 msgid ""
 "Preprocess and parse included \n"
@@ -942,7 +420,7 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 341
-#: rc.cpp:754
+#: rc.cpp:472
 #, no-c-format
 msgid ""
 "Parse preprocessed headers that are not part of this project \n"
@@ -951,7 +429,7 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 350
-#: rc.cpp:759
+#: rc.cpp:477
 #, no-c-format
 msgid ""
 "Preprocess included headers\n"
@@ -959,24 +437,24 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 357
-#: rc.cpp:763
+#: rc.cpp:481
 #, no-c-format
 msgid ""
 "Try to locate all included files and preprocess them. \n"
-"This makes macros and imported namespaces work correctly, and allows KDevelop\n"
+"This makes macros and imported namespaces work correctly, and allows TDevelop\n"
 "to know what code-items are visible from within which file.\n"
 "Note: Parsing may become very slow when this is enabled\n"
 "(It will become faster after some time)."
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 367
-#: rc.cpp:770
+#: rc.cpp:488
 #, no-c-format
 msgid "Code Completion Databases"
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 370
-#: rc.cpp:773
+#: rc.cpp:491
 #, no-c-format
 msgid ""
 "<b>Code Completion Databases</b> are used to store the parsed headers for "
@@ -985,39 +463,39 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 379
-#: kdevdesigner/designer/widgetfactory.cpp:775 rc.cpp:776 rc.cpp:2688
-#: rc.cpp:8031
+#: kdevdesigner/designer/widgetfactory.cpp:775 rc.cpp:494 rc.cpp:5194
+#: rc.cpp:6546
 #, no-c-format
 msgid "Column 1"
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 428
-#: rc.cpp:779 rc.cpp:3273 rc.cpp:3282 rc.cpp:3291 rc.cpp:3947 rc.cpp:4480
-#: rc.cpp:4615 rc.cpp:6314 rc.cpp:6647 rc.cpp:6677 rc.cpp:8584
+#: rc.cpp:497 rc.cpp:2445 rc.cpp:2685 rc.cpp:2844 rc.cpp:2853 rc.cpp:2862
+#: rc.cpp:2889 rc.cpp:5794 rc.cpp:8432 rc.cpp:8642 rc.cpp:8672
 #, no-c-format
 msgid "&Add..."
 msgstr "Ychw&anegu..."
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 431
-#: rc.cpp:782
+#: rc.cpp:500
 #, no-c-format
 msgid "Click to start the Code Completion database creation wizard."
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 470
-#: rc.cpp:788
+#: rc.cpp:506
 #, no-c-format
 msgid "Misc"
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 489
-#: rc.cpp:791
+#: rc.cpp:509
 #, no-c-format
 msgid "Advanced include-path resolution using make(e&xperimental)"
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 496
-#: rc.cpp:794
+#: rc.cpp:512
 #, no-c-format
 msgid ""
 "Try to resolve the include-path by getting the command that would be used \n"
@@ -1032,38 +510,38 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 504
-#: rc.cpp:801
+#: rc.cpp:519
 #, no-c-format
 msgid "Show t&ype evaluation in status bar"
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 512
-#: rc.cpp:804
+#: rc.cpp:522
 #, no-c-format
 msgid "src;"
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 516
-#: rc.cpp:807
+#: rc.cpp:525
 #, no-c-format
 msgid ""
-"A semicolon-seperated list of include-paths to be used while searching for "
+"A semicolon-separated list of include-paths to be used while searching for "
 "headers. \n"
 "Paths not starting with '/' will be interpreted as relative to the "
 "project-folder."
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 524
-#: rc.cpp:811
+#: rc.cpp:529
 #, no-c-format
 msgid "std=_GLIBCXX_STD"
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 530
-#: rc.cpp:814
+#: rc.cpp:532
 #, no-c-format
 msgid ""
-"This line may contain a semicolon-seperated list of namespace-aliases and "
+"This line may contain a semicolon-separated list of namespace-aliases and "
 "namespace-imports. \n"
 "example: \"std<<_GLIBCXX_STD;NewNamespaceName=OldNamespaceName; << "
 "SomeGloballyImportedNamespace\" (without paratheses). \n"
@@ -1073,99 +551,105 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 538
-#: rc.cpp:820
+#: rc.cpp:538
 #, fuzzy, no-c-format
 msgid "Custom include paths:"
 msgstr "Addasu"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 546
-#: rc.cpp:823
+#: rc.cpp:541
 #, no-c-format
 msgid "Namespace alias list:"
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 575
-#: rc.cpp:826
+#: rc.cpp:544
 #, fuzzy, no-c-format
 msgid "&Navigation"
 msgstr "&Lleoliad:"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 586
-#: rc.cpp:829
+#: rc.cpp:547
 #, no-c-format
 msgid "Header/Source split (Highly Experimental)"
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 597
-#: rc.cpp:832
+#: rc.cpp:550
 #, no-c-format
 msgid "Enable split of Header/So&urce files"
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 600
-#: rc.cpp:835 rc.cpp:838
+#: rc.cpp:553 rc.cpp:556
 #, no-c-format
 msgid "Check to have header and source appear in the same page."
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 622
-#: rc.cpp:841
+#: rc.cpp:559
 #, fuzzy, no-c-format
 msgid "Automatic S&ynchronize"
 msgstr "Cydweddu Ymysgogol"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 626
-#: rc.cpp:844 rc.cpp:848
+#: rc.cpp:562 rc.cpp:566
 #, no-c-format
 msgid ""
 "Check to have the source file scroll as you \n"
 "navigate the header and vice versa"
 msgstr ""
 
+#. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 643
+#: rc.cpp:570
+#, fuzzy, no-c-format
+msgid "Qt::Orientation"
+msgstr "Disgrifiad"
+
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 649
-#: rc.cpp:855
+#: rc.cpp:573
 #, no-c-format
 msgid "Select which Qt version your project is using."
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 660
-#: kdevdesigner/designer/formwindow.cpp:361 rc.cpp:858
+#: kdevdesigner/designer/formwindow.cpp:361 rc.cpp:576
 #, no-c-format
 msgid "&Vertical"
 msgstr "&Fertigol"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 666
-#: rc.cpp:861
+#: rc.cpp:579
 #, no-c-format
 msgid "Select this if your project is using Qt version 3.x."
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 674
-#: rc.cpp:864
+#: rc.cpp:582
 #, fuzzy, no-c-format
 msgid "Hori&zontal"
 msgstr "&Llorweddol"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 677
-#: rc.cpp:867
+#: rc.cpp:585
 #, no-c-format
 msgid "Select this if your project is using Qt version 4.x."
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 706
-#: rc.cpp:870
+#: rc.cpp:588
 #, fuzzy, no-c-format
 msgid "Context Menu"
 msgstr " Dileu eitem"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 717
-#: rc.cpp:873
+#: rc.cpp:591
 #, no-c-format
 msgid "Switch Header/Implementation &matches current function"
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 726
-#: rc.cpp:876 rc.cpp:882
+#: rc.cpp:594 rc.cpp:600
 #, no-c-format
 msgid ""
 "Check to have the <b>Switch Header/Implementation</b> \n"
@@ -1174,13 +658,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 740
-#: rc.cpp:888
+#: rc.cpp:606
 #, no-c-format
 msgid "Show Go To &Declaration/Definition submenus"
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 747
-#: rc.cpp:891 rc.cpp:898
+#: rc.cpp:609 rc.cpp:616
 #, no-c-format
 msgid ""
 "Check to show two additional submenus \n"
@@ -1191,13 +675,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 762
-#: rc.cpp:905
+#: rc.cpp:623
 #, no-c-format
 msgid "Show type evaluation &based navigation menus"
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 767
-#: rc.cpp:908 rc.cpp:913
+#: rc.cpp:626 rc.cpp:631
 #, no-c-format
 msgid ""
 "Menus appear on the right mouse click context menu, \n"
@@ -1206,19 +690,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 784
-#: rc.cpp:918
+#: rc.cpp:636
 #, fuzzy, no-c-format
 msgid "Class Wi&zard"
 msgstr "Dewin"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 803
-#: rc.cpp:921
+#: rc.cpp:639
 #, fuzzy, no-c-format
 msgid "Filename options"
 msgstr "Dewisiadau Cyffredinol"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 806
-#: rc.cpp:924
+#: rc.cpp:642
 #, no-c-format
 msgid ""
 "These are the suffixes used by the Class Wizard when creating new classes."
@@ -1226,37 +710,37 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 827
-#: rc.cpp:927
+#: rc.cpp:645
 #, no-c-format
 msgid "&Interface suffix:"
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 838
-#: rc.cpp:930
+#: rc.cpp:648
 #, no-c-format
 msgid "I&mplementation suffix:"
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 870
-#: rc.cpp:933
+#: rc.cpp:651
 #, fuzzy, no-c-format
 msgid "&Qt Options"
 msgstr "&Dewisiadau :"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 881
-#: rc.cpp:936
+#: rc.cpp:654
 #, fuzzy, no-c-format
 msgid "Enable Qt opt&ions"
 msgstr "Galluogi"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 892
-#: rc.cpp:939
+#: rc.cpp:657
 #, no-c-format
 msgid "Qt Version, Directory and QMake Binary"
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 900
-#: rc.cpp:942
+#: rc.cpp:660
 #, no-c-format
 msgid ""
 "Select which Qt version your project is using and where that Qt version is "
@@ -1266,13 +750,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 919
-#: rc.cpp:947
+#: rc.cpp:665
 #, no-c-format
 msgid "Qt 3"
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 925
-#: rc.cpp:950
+#: rc.cpp:668
 #, no-c-format
 msgid ""
 "Use Qt version 3 (When this is changed the project needs to be closed and "
@@ -1280,7 +764,7 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 928
-#: rc.cpp:953
+#: rc.cpp:671
 #, no-c-format
 msgid ""
 "Select this if your project is using Qt version 3.x."
@@ -1288,13 +772,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 936
-#: rc.cpp:956
+#: rc.cpp:674
 #, no-c-format
 msgid "Qt 4"
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 939
-#: rc.cpp:959
+#: rc.cpp:677
 #, no-c-format
 msgid ""
 "Use Qt version 4 (When this is changed the project needs to be closed and "
@@ -1302,7 +786,7 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 942
-#: rc.cpp:962
+#: rc.cpp:680
 #, no-c-format
 msgid ""
 "Select this if your project is using Qt version 4.x."
@@ -1310,19 +794,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 950
-#: rc.cpp:965
+#: rc.cpp:683
 #, no-c-format
 msgid "(After changing the project needs to be re-opened)"
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 988
-#: rc.cpp:968
+#: rc.cpp:686
 #, fuzzy, no-c-format
 msgid "Qt3 Directory:"
 msgstr "Cyfeiriadur:"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 991
-#: rc.cpp:971
+#: rc.cpp:689
 #, no-c-format
 msgid ""
 "This setting is only needed for Qt3 programs, for Qt4 just make sure the QMake "
@@ -1330,7 +814,7 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 999
-#: rc.cpp:974
+#: rc.cpp:692
 #, no-c-format
 msgid ""
 "The Qt directory, will be red if it is not a valid Qt directory. This setting "
@@ -1338,7 +822,7 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1002
-#: rc.cpp:977
+#: rc.cpp:695
 #, no-c-format
 msgid ""
 "Choose the directory that Qt was installed to. If this is shown in red the "
@@ -1346,43 +830,43 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1020
-#: rc.cpp:980
+#: rc.cpp:698
 #, no-c-format
 msgid "QMake Binary:"
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1028
-#: rc.cpp:983
+#: rc.cpp:701
 #, no-c-format
 msgid "The full path to the QMake executable to be used"
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1043
-#: rc.cpp:986
+#: rc.cpp:704
 #, no-c-format
 msgid "Qt include syntax"
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1049
-#: rc.cpp:989
+#: rc.cpp:707
 #, no-c-format
 msgid "Select which include style your project is using."
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1060
-#: rc.cpp:992
+#: rc.cpp:710
 #, no-c-format
 msgid "Qt &3 style (#include <qwidget.h>)"
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1063
-#: rc.cpp:995
+#: rc.cpp:713
 #, fuzzy, no-c-format
 msgid "Alt+3"
 msgstr "Alt+1"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1069
-#: rc.cpp:998
+#: rc.cpp:716
 #, no-c-format
 msgid ""
 "Select this if your project is using include style as known from Qt version "
@@ -1390,19 +874,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1077
-#: rc.cpp:1001
+#: rc.cpp:719
 #, no-c-format
 msgid "Qt &4 style (#include <QWidget>)"
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1080
-#: rc.cpp:1004
+#: rc.cpp:722
 #, fuzzy, no-c-format
 msgid "Alt+4"
 msgstr "Alt+1"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1083
-#: rc.cpp:1007
+#: rc.cpp:725
 #, no-c-format
 msgid ""
 "Select this if your project is using include style as known from Qt version "
@@ -1410,153 +894,153 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1096
-#: rc.cpp:1010
+#: rc.cpp:728
 #, no-c-format
 msgid "UI Designer Integration"
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1113
-#: rc.cpp:1013 rc.cpp:2339
+#: rc.cpp:731 rc.cpp:4102
 #, no-c-format
-msgid "&Use KDevelop's embedded designer"
+msgid "&Use TDevelop's embedded designer"
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1116
-#: rc.cpp:1016 rc.cpp:2342
+#: rc.cpp:734
 #, no-c-format
-msgid "Start KDevelop own designer embedded within KDevelop"
+msgid "Start TDevelop's own designer embedded within TDevelop"
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1119
-#: rc.cpp:1019 rc.cpp:2345
+#: rc.cpp:737 rc.cpp:4108
 #, no-c-format
 msgid ""
-"KDevelop comes with its own UI designer that can either be embedded or be run "
+"TDevelop comes with its own UI designer that can either be embedded or be run "
 "as a separate program. Check this button if you wish to integrate the UI "
-"designer into KDevelop."
+"designer into TDevelop."
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1127
-#: rc.cpp:1022
+#: rc.cpp:740
 #, no-c-format
-msgid "Run &KDevelop's designer as a separate application"
+msgid "Run &TDevelop's designer as a separate application"
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1130
-#: rc.cpp:1025 rc.cpp:2351
+#: rc.cpp:743
 #, no-c-format
-msgid "Start KDevelop own designer externally"
+msgid "Start TDevelop's own designer externally"
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1133
-#: rc.cpp:1028 rc.cpp:2354
+#: rc.cpp:746 rc.cpp:4117
 #, no-c-format
 msgid ""
-"KDevelop comes with its own UI designer that can either be embedded or be run "
-"as a separate program. Check this button if you wish to run KDevelop's UI "
+"TDevelop comes with its own UI designer that can either be embedded or be run "
+"as a separate program. Check this button if you wish to run TDevelop's UI "
 "designer as a separate program."
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1141
-#: rc.cpp:1031
+#: rc.cpp:749
 #, fuzzy, no-c-format
 msgid "Run Qt &Designer"
 msgstr "Dylunydd Qt"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1144
-#: rc.cpp:1034 rc.cpp:2360
+#: rc.cpp:752 rc.cpp:4123
 #, no-c-format
 msgid "Use Qt Designer externally"
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1147
-#: rc.cpp:1037 rc.cpp:2363
+#: rc.cpp:755 rc.cpp:4126
 #, no-c-format
 msgid ""
-"Check this button if you wish to use Qt Designer rather than KDevelop's "
+"Check this button if you wish to use Qt Designer rather than TDevelop's "
 "integrated designer."
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1163
-#: rc.cpp:1040
+#: rc.cpp:758
 #, no-c-format
 msgid "Designer Binary:"
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1174
-#: rc.cpp:1043
+#: rc.cpp:761
 #, no-c-format
 msgid "The full path to the Designer executable to be used"
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1192
-#: rc.cpp:1046
+#: rc.cpp:764
 #, no-c-format
 msgid "Extra Plugin Paths for Qt4 Designer:"
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1203
-#: rc.cpp:1049
+#: rc.cpp:767
 #, fuzzy, no-c-format
 msgid "Change Plugin Paths"
 msgstr "Gosodiadau Cywaith"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1234
-#: rc.cpp:1052
+#: rc.cpp:770
 #, fuzzy, no-c-format
 msgid "&Accessors"
 msgstr "Cyrchiad"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1245
-#: rc.cpp:1055
+#: rc.cpp:773
 #, no-c-format
 msgid "E&xample for Member Variable of Type String"
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1264
-#: rc.cpp:1058
+#: rc.cpp:776
 #, fuzzy, no-c-format
 msgid "Variable name:"
 msgstr "Enw'r ffeil:"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1272
-#: rc.cpp:1061
+#: rc.cpp:779
 #, no-c-format
 msgid "m_x"
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1299
-#: rc.cpp:1064
+#: rc.cpp:782
 #, no-c-format
 msgid "int x() const;"
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1310
-#: rc.cpp:1067
+#: rc.cpp:785
 #, no-c-format
 msgid "void setX(const string& theValue);"
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1321
-#: rc.cpp:1070
+#: rc.cpp:788
 #, fuzzy, no-c-format
 msgid "Get method:"
 msgstr "&Dull:"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1329
-#: rc.cpp:1073
+#: rc.cpp:791
 #, fuzzy, no-c-format
 msgid "Set method:"
 msgstr "&Dull:"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1339
-#: rc.cpp:1076 rc.cpp:6152 rc.cpp:8173
+#: rc.cpp:794 rc.cpp:6284 rc.cpp:8555
 #, no-c-format
 msgid "Settings"
 msgstr "Gosodiadau"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1344
-#: rc.cpp:1079 rc.cpp:1084 rc.cpp:1089 rc.cpp:1094 rc.cpp:1105 rc.cpp:1110
+#: rc.cpp:797 rc.cpp:802 rc.cpp:807 rc.cpp:812 rc.cpp:823 rc.cpp:828
 #, no-c-format
 msgid ""
 "Will show as \"Create Accessor Methods\" in the\n"
@@ -1565,392 +1049,821 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1375
-#: rc.cpp:1099
+#: rc.cpp:817
 #, no-c-format
 msgid "Prefix for <b>get</b> methods:"
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1383
-#: parts/ctags2/ctagskinds.cpp:175 rc.cpp:1102
+#: parts/ctags2/ctagskinds.cpp:175 rc.cpp:820
 #, no-c-format
 msgid "set"
 msgstr "set"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1401
-#: rc.cpp:1115
+#: rc.cpp:833
 #, no-c-format
 msgid "Prefix for <b>set</b> methods:"
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1409
-#: rc.cpp:1118
+#: rc.cpp:836
 #, no-c-format
 msgid "m_"
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1417
-#: rc.cpp:1121
+#: rc.cpp:839
 #, no-c-format
 msgid "Member <b>variable</b> prefix to remove:"
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1425
-#: rc.cpp:1124
+#: rc.cpp:842
 #, fuzzy, no-c-format
 msgid "theValue"
 msgstr "Gwerth"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1450
-#: rc.cpp:1127
+#: rc.cpp:845
 #, no-c-format
 msgid "<b>Parametername</b> in set method:"
 msgstr ""
 
+#. i18n: file ./languages/cpp/createpcsdialogbase.ui line 16
+#: rc.cpp:848
+#, no-c-format
+msgid "New Persistant Class Store"
+msgstr ""
+
+#. i18n: file ./languages/cpp/createpcsdialogbase.ui line 23
+#: rc.cpp:851
+#, fuzzy, no-c-format
+msgid "Select importer"
+msgstr " Dileu eitem"
+
+#. i18n: file ./languages/cpp/createpcsdialogbase.ui line 55
+#: rc.cpp:854
+#, fuzzy, no-c-format
+msgid "Select directory"
+msgstr "Cyfeiriadur"
+
+#. i18n: file ./languages/cpp/createpcsdialogbase.ui line 63
+#: rc.cpp:857
+#, no-c-format
+msgid "Describe database contents"
+msgstr ""
+
+#. i18n: file ./languages/cpp/createpcsdialogbase.ui line 74
+#: rc.cpp:860
+#, fuzzy, no-c-format
+msgid "Filename:"
+msgstr "Enw'r ffeil:"
+
+#. i18n: file ./languages/cpp/createpcsdialogbase.ui line 106
+#: rc.cpp:863
+#, no-c-format
+msgid "Creating..."
+msgstr "Creu ..."
+
+#. i18n: file ./languages/cpp/subclassingdlgbase.ui line 16
+#: rc.cpp:866
+#, no-c-format
+msgid "Create Subclass"
+msgstr ""
+
+#. i18n: file ./languages/cpp/subclassingdlgbase.ui line 27
+#: rc.cpp:869
+#, no-c-format
+msgid "Subclass Properties"
+msgstr ""
+
 #. i18n: file ./languages/cpp/addmethoddialogbase.ui line 16
-#: rc.cpp:1130
+#: rc.cpp:908
 #, no-c-format
 msgid "Add Method"
 msgstr ""
 
 #. i18n: file ./languages/cpp/addmethoddialogbase.ui line 28
-#: rc.cpp:1133
+#: rc.cpp:911
 #, no-c-format
 msgid "Inline"
 msgstr "Mewnlin"
 
-#. i18n: file ./languages/cpp/addmethoddialogbase.ui line 39
-#: rc.cpp:1136 rc.cpp:1187 rc.cpp:1244 rc.cpp:2125 rc.cpp:7887 rc.cpp:8698
-#: rc.cpp:8834
-#, no-c-format
-msgid "Access"
-msgstr "Cyrchiad"
-
 #. i18n: file ./languages/cpp/addmethoddialogbase.ui line 50
-#: rc.cpp:1139 rc.cpp:1190
+#: rc.cpp:917 rc.cpp:1299
 #, no-c-format
 msgid "Storage"
 msgstr "Storfa"
 
-#. i18n: file ./languages/cpp/addmethoddialogbase.ui line 61
-#: rc.cpp:1142 rc.cpp:1250 rc.cpp:2131 rc.cpp:8692
-#, no-c-format
-msgid "Return Type"
-msgstr ""
-
 #. i18n: file ./languages/cpp/addmethoddialogbase.ui line 72
-#: rc.cpp:1145 rc.cpp:1196
+#: rc.cpp:923 rc.cpp:1305
 #, no-c-format
 msgid "Declarator"
 msgstr ""
 
 #. i18n: file ./languages/cpp/addmethoddialogbase.ui line 121
-#: rc.cpp:1148
+#: rc.cpp:926
 #, no-c-format
 msgid "&Add Method"
 msgstr ""
 
 #. i18n: file ./languages/cpp/addmethoddialogbase.ui line 129
-#: rc.cpp:1151
+#: rc.cpp:929
 #, no-c-format
 msgid "&Delete Method"
 msgstr ""
 
 #. i18n: file ./languages/cpp/addmethoddialogbase.ui line 139
-#: rc.cpp:1154
+#: rc.cpp:932
 #, no-c-format
 msgid "Method Properties"
 msgstr ""
 
 #. i18n: file ./languages/cpp/addmethoddialogbase.ui line 158
-#: rc.cpp:1157
+#: rc.cpp:935
 #, no-c-format
 msgid "Return t&ype:"
 msgstr ""
 
 #. i18n: file ./languages/cpp/addmethoddialogbase.ui line 182
-#: rc.cpp:1160 rc.cpp:1211
+#: rc.cpp:938 rc.cpp:1320
 #, no-c-format
 msgid "D&eclarator:"
 msgstr ""
 
 #. i18n: file ./languages/cpp/addmethoddialogbase.ui line 208
-#: rc.cpp:1163 rc.cpp:1214
+#: rc.cpp:941 rc.cpp:1323
 #, no-c-format
 msgid "S&torage:"
 msgstr ""
 
 #. i18n: file ./languages/cpp/addmethoddialogbase.ui line 219
-#: rc.cpp:1166
+#: rc.cpp:944
 #, no-c-format
 msgid "&Inline"
 msgstr "&Mewnlin"
 
 #. i18n: file ./languages/cpp/addmethoddialogbase.ui line 227
-#: rc.cpp:1169 rc.cpp:1217
+#: rc.cpp:947 rc.cpp:1326
 #, no-c-format
 msgid "Acce&ss:"
 msgstr "Cyr&chiad:"
 
 #. i18n: file ./languages/cpp/addmethoddialogbase.ui line 247
-#: rc.cpp:1172
+#: rc.cpp:950
 #, no-c-format
 msgid "I&mplementation File"
 msgstr ""
 
-#. i18n: file ./languages/cpp/addattributedialogbase.ui line 16
-#: rc.cpp:1184
-#, no-c-format
-msgid "Add Attribute"
-msgstr ""
-
-#. i18n: file ./languages/cpp/addattributedialogbase.ui line 50
-#: kdevdesigner/designer/outputwindow.cpp:83
-#: languages/cpp/debugger/gdbbreakpointwidget.cpp:218
-#: languages/ruby/debugger/rdbbreakpointwidget.cpp:230
-#: parts/partexplorer/partexplorerform.cpp:117 rc.cpp:1193 rc.cpp:1253
-#: rc.cpp:2134 rc.cpp:4513 rc.cpp:8010 rc.cpp:8701
-#, no-c-format
-msgid "Type"
-msgstr "Math"
-
-#. i18n: file ./languages/cpp/addattributedialogbase.ui line 110
-#: rc.cpp:1199
-#, no-c-format
-msgid "&Add Attribute"
-msgstr ""
-
-#. i18n: file ./languages/cpp/addattributedialogbase.ui line 118
-#: rc.cpp:1202
-#, no-c-format
-msgid "&Delete Attribute"
-msgstr ""
-
-#. i18n: file ./languages/cpp/addattributedialogbase.ui line 128
-#: rc.cpp:1205
-#, no-c-format
-msgid "Attribute Properties"
-msgstr ""
-
-#. i18n: file ./languages/cpp/addattributedialogbase.ui line 147
-#: rc.cpp:1208 rc.cpp:8025
-#, no-c-format
-msgid "T&ype:"
-msgstr "M&ath:"
-
-#. i18n: file ./languages/cpp/subclassingdlgbase.ui line 16
-#: rc.cpp:1226
-#, no-c-format
-msgid "Create Subclass"
-msgstr ""
-
-#. i18n: file ./languages/cpp/subclassingdlgbase.ui line 27
-#: rc.cpp:1229
-#, no-c-format
-msgid "Subclass Properties"
-msgstr ""
-
-#. i18n: file ./languages/cpp/subclassingdlgbase.ui line 38
-#: rc.cpp:1232 rc.cpp:2137
-#, no-c-format
-msgid "&Specialize following slots:"
-msgstr ""
-
-#. i18n: file ./languages/cpp/subclassingdlgbase.ui line 62
-#: rc.cpp:1235 rc.cpp:1700 rc.cpp:2143
-#, no-c-format
-msgid "C&lass name:"
-msgstr ""
-
-#. i18n: file ./languages/cpp/subclassingdlgbase.ui line 81
-#: rc.cpp:1238 rc.cpp:2140
-#, no-c-format
-msgid "F&ile name:"
-msgstr "E&nw'r ffeil:"
-
-#. i18n: file ./languages/cpp/subclassingdlgbase.ui line 95
-#: parts/classview/classtreebase.cpp:81 rc.cpp:1241 rc.cpp:2122
-#, no-c-format
-msgid "Method"
-msgstr "Dull"
-
-#. i18n: file ./languages/cpp/subclassingdlgbase.ui line 117
-#: rc.cpp:1247 rc.cpp:2128 rc.cpp:8695
-#, no-c-format
-msgid "Specifier"
-msgstr ""
-
-#. i18n: file ./languages/cpp/subclassingdlgbase.ui line 157
-#: rc.cpp:1256 rc.cpp:2116
-#, no-c-format
-msgid "Re&format source"
-msgstr ""
-
-#. i18n: file ./languages/cpp/subclassingdlgbase.ui line 173
-#: rc.cpp:1259 rc.cpp:2119
-#, no-c-format
-msgid "Reformat source by &default"
-msgstr ""
-
-#. i18n: file ./languages/cpp/subclassingdlgbase.ui line 183
-#: rc.cpp:1262 rc.cpp:2146 rc.cpp:7243
+#. i18n: file ./languages/cpp/addmethoddialogbase.ui line 277
+#: lib/widgets/propeditor/pfontbutton.cpp:43
+#: lib/widgets/propeditor/ppixmapedit.cpp:54 rc.cpp:953 rc.cpp:1990
+#: rc.cpp:2078 rc.cpp:2087 rc.cpp:2093 rc.cpp:2138 rc.cpp:4397 rc.cpp:4517
+#: rc.cpp:4656 rc.cpp:4671 rc.cpp:5065 rc.cpp:5071 rc.cpp:5266 rc.cpp:5323
+#: rc.cpp:6085 rc.cpp:6157 rc.cpp:6389 rc.cpp:7444 rc.cpp:8249 rc.cpp:8252
+#: rc.cpp:8312 rc.cpp:8330 rc.cpp:8345 rc.cpp:8612 rc.cpp:8618 rc.cpp:8624
+#: rc.cpp:8849
 #, no-c-format
-msgid "C&reate"
-msgstr "C&reu"
+msgid "..."
+msgstr "..."
 
 #. i18n: file ./languages/cpp/classgeneratorconfigbase.ui line 27
-#: rc.cpp:1268
+#: rc.cpp:962
 #, no-c-format
 msgid "Class &Templates"
 msgstr ""
 
 #. i18n: file ./languages/cpp/classgeneratorconfigbase.ui line 36
-#: rc.cpp:1271
+#: rc.cpp:965
 #, no-c-format
 msgid "Cpp Header"
 msgstr ""
 
 #. i18n: file ./languages/cpp/classgeneratorconfigbase.ui line 41
-#: rc.cpp:1274
+#: rc.cpp:968
 #, no-c-format
 msgid "Cpp Source"
 msgstr ""
 
 #. i18n: file ./languages/cpp/classgeneratorconfigbase.ui line 46
-#: rc.cpp:1277
+#: rc.cpp:971
 #, no-c-format
 msgid "Objective-C Header"
 msgstr ""
 
 #. i18n: file ./languages/cpp/classgeneratorconfigbase.ui line 51
-#: rc.cpp:1280
+#: rc.cpp:974
 #, no-c-format
 msgid "Objective-C Source"
 msgstr ""
 
 #. i18n: file ./languages/cpp/classgeneratorconfigbase.ui line 56
-#: rc.cpp:1283
+#: rc.cpp:977
 #, no-c-format
 msgid "GTK C Header"
 msgstr ""
 
 #. i18n: file ./languages/cpp/classgeneratorconfigbase.ui line 61
-#: rc.cpp:1286
+#: rc.cpp:980
 #, no-c-format
 msgid "GTK C Source"
 msgstr ""
 
 #. i18n: file ./languages/cpp/classgeneratorconfigbase.ui line 88
-#: rc.cpp:1289
+#: rc.cpp:983
 #, no-c-format
 msgid "Names"
 msgstr "Sylwadau"
 
 #. i18n: file ./languages/cpp/classgeneratorconfigbase.ui line 99
-#: rc.cpp:1292
+#: rc.cpp:986
 #, no-c-format
 msgid "#ifndef - #&define names:"
 msgstr ""
 
 #. i18n: file ./languages/cpp/classgeneratorconfigbase.ui line 110
-#: rc.cpp:1295
+#: rc.cpp:989
 #, no-c-format
 msgid "&File names:"
 msgstr ""
 
 #. i18n: file ./languages/cpp/classgeneratorconfigbase.ui line 119
-#: rc.cpp:1298 rc.cpp:1307 rc.cpp:1319
+#: rc.cpp:992 rc.cpp:1001 rc.cpp:1013
 #, no-c-format
 msgid "Lowercase"
 msgstr "Llythrennau Bach"
 
 #. i18n: file ./languages/cpp/classgeneratorconfigbase.ui line 124
-#: rc.cpp:1301 rc.cpp:1310 rc.cpp:1322
+#: rc.cpp:995 rc.cpp:1004 rc.cpp:1016
 #, no-c-format
 msgid "Uppercase"
 msgstr "Priflythrennau"
 
 #. i18n: file ./languages/cpp/classgeneratorconfigbase.ui line 129
-#: rc.cpp:1304 rc.cpp:1313 rc.cpp:1325
+#: rc.cpp:998 rc.cpp:1007 rc.cpp:1019
 #, no-c-format
 msgid "Same as Class Names"
 msgstr ""
 
 #. i18n: file ./languages/cpp/classgeneratorconfigbase.ui line 154
-#: rc.cpp:1316
+#: rc.cpp:1010
 #, no-c-format
 msgid "Same as File Names"
 msgstr ""
 
 #. i18n: file ./languages/cpp/classgeneratorconfigbase.ui line 189
-#: rc.cpp:1328
+#: rc.cpp:1022
 #, no-c-format
 msgid "&Superclass file names:"
 msgstr ""
 
 #. i18n: file ./languages/cpp/classgeneratorconfigbase.ui line 202
-#: rc.cpp:1331
+#: rc.cpp:1025
 #, no-c-format
 msgid "Class Documentation"
 msgstr ""
 
 #. i18n: file ./languages/cpp/classgeneratorconfigbase.ui line 213
-#: rc.cpp:1334
+#: rc.cpp:1028
 #, no-c-format
 msgid "Include &author name in class documentation"
 msgstr ""
 
 #. i18n: file ./languages/cpp/classgeneratorconfigbase.ui line 221
-#: rc.cpp:1337
+#: rc.cpp:1031
 #, no-c-format
 msgid "Generate &empty documentation strings"
 msgstr ""
 
 #. i18n: file ./languages/cpp/classgeneratorconfigbase.ui line 231
-#: rc.cpp:1340
+#: rc.cpp:1034
 #, no-c-format
 msgid "&Reformat source before creating files"
 msgstr ""
 
-#. i18n: file ./languages/cpp/app_templates/kxt/prefs-base.ui line 24
-#: rc.cpp:1343 rc.cpp:1391 rc.cpp:1427 rc.cpp:1981
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 16
+#: rc.cpp:1037 rc.cpp:1966
 #, no-c-format
-msgid "Background color:"
-msgstr "Lliw'r cefndir:"
+msgid "New Class"
+msgstr ""
 
-#. i18n: file ./languages/cpp/app_templates/kxt/prefs-base.ui line 40
-#: rc.cpp:1346 rc.cpp:1394 rc.cpp:1430 rc.cpp:1984
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 34
+#: rc.cpp:1040
 #, no-c-format
-msgid "Project age:"
+msgid "Class &Information"
 msgstr ""
 
-#. i18n: file ./languages/cpp/app_templates/kxt/prefs-base.ui line 48
-#: rc.cpp:1349 rc.cpp:1397 rc.cpp:1433 rc.cpp:1987
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 73
+#: rc.cpp:1043
 #, no-c-format
-msgid "Foreground color:"
-msgstr "Lliw blaendir:"
+msgid "Docu&mentation:"
+msgstr "Dogf&enniaeth :"
 
-#. i18n: file ./languages/cpp/app_templates/kxt/appview_base.ui line 16
-#: rc.cpp:1352 rc.cpp:1436
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 87
+#: rc.cpp:1046
 #, no-c-format
-msgid "%{APPNAMELC}_base"
+msgid ""
+"Insert a short description for your new class\n"
+"here for documentation purposes. This can be used\n"
+"to create API documentation in HTML format with\n"
+"doxygen or similar tools."
 msgstr ""
 
-#. i18n: file ./languages/cpp/app_templates/kxt/appview_base.ui line 27
-#: rc.cpp:1355 rc.cpp:1403 rc.cpp:1439 rc.cpp:1993
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 97
+#: rc.cpp:1052
 #, no-c-format
-msgid "hello, world"
+msgid "File Names"
 msgstr ""
 
-#. i18n: file ./languages/cpp/app_templates/khello2/widgetbase.ui line 27
-#: rc.cpp:1358
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 108
+#: rc.cpp:1055
 #, no-c-format
-msgid "Click Me!"
+msgid "&Header:"
+msgstr "P&ennawd :"
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 122
+#: rc.cpp:1058
+#, no-c-format
+msgid ""
+"Insert your header file name here.\n"
+"It is automatically inserted while\n"
+"you select the classname, but you can\n"
+"still edit it afterwards."
+msgstr ""
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 130
+#: rc.cpp:1064
+#, no-c-format
+msgid "Im&plementation:"
+msgstr ""
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 144
+#: rc.cpp:1067
+#, no-c-format
+msgid ""
+"Insert your implementation filename here.\n"
+"It is automatically inserted while\n"
+"you select the classname, but you can\n"
+"still edit it afterwards."
+msgstr ""
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 152
+#: rc.cpp:1073
+#, fuzzy, no-c-format
+msgid "Create only header"
+msgstr "Creu Patrymlun"
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 162
+#: kdevdesigner/designer/hierarchyview.cpp:191
+#: parts/classview/classtreebase.cpp:51 rc.cpp:1076
+#, no-c-format
+msgid "Class"
+msgstr "Dosbarth"
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 181
+#: buildtools/autotools/addprefixdlg.cpp:29
+#: buildtools/lib/widgets/addenvvardlg.cpp:36 rc.cpp:1079 rc.cpp:2120
+#: rc.cpp:2427 rc.cpp:3128 rc.cpp:4223 rc.cpp:5182 rc.cpp:8582 rc.cpp:8768
+#: rc.cpp:8810
+#, no-c-format
+msgid "&Name:"
+msgstr "&Enw:"
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 194
+#: rc.cpp:1082
+#, no-c-format
+msgid ""
+"Insert your new classname here.\n"
+"You can also define template classes by specifying\n"
+"template <params> classname"
+msgstr ""
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 210
+#: rc.cpp:1087
+#, no-c-format
+msgid "Name&space:"
+msgstr ""
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 223
+#: rc.cpp:1090
+#, no-c-format
+msgid ""
+"Insert a name of the namespace here.\n"
+"You can define nested namespaces by specifying\n"
+"Namespace1::Namespace2::...::NamespaceN"
+msgstr ""
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 233
+#: rc.cpp:1095
+#, no-c-format
+msgid "Inheritance"
+msgstr ""
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 252
+#: languages/ruby/debugger/variablewidget.cpp:62
+#: lib/widgets/propeditor/qeditlistbox.cpp:121 rc.cpp:1098 rc.cpp:1638
+#: rc.cpp:1649 rc.cpp:1671 rc.cpp:1882 rc.cpp:2171 rc.cpp:3122 rc.cpp:4340
+#: rc.cpp:5197 rc.cpp:5392 rc.cpp:7120 rc.cpp:7150 rc.cpp:7438 rc.cpp:8198
+#: rc.cpp:8822
+#, no-c-format
+msgid "&Add"
+msgstr "&Ychwanegu"
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 302
+#: lib/widgets/propeditor/qeditlistbox.cpp:137 rc.cpp:1104 rc.cpp:1879
+#: rc.cpp:2348 rc.cpp:2757 rc.cpp:3631 rc.cpp:8426 rc.cpp:8633 rc.cpp:8684
+#, no-c-format
+msgid "Move &Up"
+msgstr "Symud i &Fyny"
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 330
+#: lib/widgets/propeditor/qeditlistbox.cpp:141 rc.cpp:1107 rc.cpp:1876
+#: rc.cpp:2351 rc.cpp:2760 rc.cpp:3634 rc.cpp:8429 rc.cpp:8636 rc.cpp:8687
+#, no-c-format
+msgid "Move &Down"
+msgstr "Symud i &Lawr"
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 349
+#: rc.cpp:1110 rc.cpp:1978
+#, no-c-format
+msgid "&Base class:"
+msgstr ""
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 358
+#: rc.cpp:1113
+#, no-c-format
+msgid "Baseclass Name"
+msgstr ""
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 369
+#: rc.cpp:1116
+#, no-c-format
+msgid "Inheritance Type"
+msgstr ""
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 416
+#: rc.cpp:1119
+#, no-c-format
+msgid ""
+"Insert the base class which your new class will be derived from. If you have "
+"checked 'Generate QWidget child class' the new class will be derived from "
+"QWidget. If no base class is named, the new class will not have a parent class. "
+"You can also use template classes here (like BaseClass<int, int>)"
+msgstr ""
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 458
+#: languages/ruby/debugger/variablewidget.cpp:834
+#: parts/classview/classtreebase.cpp:154
+#: src/profileengine/editor/profileeditor.cpp:139 rc.cpp:1122 rc.cpp:4680
+#, no-c-format
+msgid "Global"
+msgstr "Eang"
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 463
+#: rc.cpp:1125 rc.cpp:4683
+#, no-c-format
+msgid "Local"
+msgstr "Lleol"
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 489
+#: rc.cpp:1128
+#, no-c-format
+msgid "Virtual"
+msgstr ""
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 500
+#: rc.cpp:1131
+#, no-c-format
+msgid "Public"
+msgstr "Cyhoeddus"
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 514
+#: rc.cpp:1134
+#, no-c-format
+msgid "Protected"
+msgstr "Gwarchodir"
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 525
+#: rc.cpp:1137
+#, no-c-format
+msgid "Private"
+msgstr "Preivat"
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 548
+#: rc.cpp:1143
+#, no-c-format
+msgid "Use file t&emplates"
+msgstr ""
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 559
+#: rc.cpp:1146
+#, no-c-format
+msgid "Generate QOb&ject child class"
+msgstr ""
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 567
+#: rc.cpp:1149
+#, no-c-format
+msgid "Generate Q&Widget child class"
+msgstr ""
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 575
+#: rc.cpp:1152
+#, no-c-format
+msgid "Generate G&TK+ class"
+msgstr ""
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 583
+#: rc.cpp:1155
+#, no-c-format
+msgid "Use Objective-C"
 msgstr ""
 
-#. i18n: file ./languages/cpp/app_templates/kdevpart2/globalconfigbase.ui line 16
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 595
+#: rc.cpp:1158
+#, no-c-format
+msgid "Ad&vanced Information"
+msgstr ""
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 610
+#: rc.cpp:1161
+#, no-c-format
+msgid "Constr&uctors"
+msgstr ""
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 619
+#: rc.cpp:1164
+#, no-c-format
+msgid "Base Class Constructors"
+msgstr ""
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 668
+#: rc.cpp:1167
+#, no-c-format
+msgid "C&reate Constructor >>"
+msgstr ""
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 690
+#: rc.cpp:1170
+#, no-c-format
+msgid "C&lear Selection"
+msgstr "G&wagu Dewisiad"
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 721
+#: rc.cpp:1173
+#, no-c-format
+msgid "&Header"
+msgstr "P&ennawd"
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 756
+#: rc.cpp:1176
+#, no-c-format
+msgid "&Source"
+msgstr "&Tarddiad"
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 794
+#: rc.cpp:1179
+#, no-c-format
+msgid "Methods Ov&erriding"
+msgstr ""
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 803
+#: languages/cpp/cppnewclassdlg.cpp:851 languages/cpp/cppnewclassdlg.cpp:854
+#: languages/cpp/cppnewclassdlg.cpp:1010 languages/cpp/cppnewclassdlg.cpp:1013
+#: rc.cpp:1182
+#, no-c-format
+msgid "Methods"
+msgstr ""
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 814
+#: rc.cpp:1185
+#, no-c-format
+msgid "Extend Functionality"
+msgstr ""
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 849
+#: rc.cpp:1188
+#, no-c-format
+msgid "&Access Control"
+msgstr ""
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 858
+#: rc.cpp:1191
+#, no-c-format
+msgid "Methods & Attributes"
+msgstr ""
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 869
+#: rc.cpp:1194
+#, no-c-format
+msgid "Implied Modifier"
+msgstr ""
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 880
+#: rc.cpp:1197
+#, no-c-format
+msgid "New Modifier"
+msgstr ""
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 923
+#: rc.cpp:1200
+#, no-c-format
+msgid "&Generation Options"
+msgstr ""
+
+#. i18n: file ./languages/cpp/configproblemreporter.ui line 24
+#: languages/cpp/cppsupportpart.cpp:585 rc.cpp:1209
+#, no-c-format
+msgid "Problem Reporter"
+msgstr ""
+
+#. i18n: file ./languages/cpp/configproblemreporter.ui line 28
+#: rc.cpp:1212
+#, no-c-format
+msgid ""
+"If enabled, the C++ parser will report any syntax errors it detects. \n"
+"They will be displayed in the 'Problems' output view and as markers in the "
+"editor."
+msgstr ""
+
+#. i18n: file ./languages/cpp/configproblemreporter.ui line 39
+#: rc.cpp:1216
+#, no-c-format
+msgid "&Use Problem Reporter"
+msgstr ""
+
+#. i18n: file ./languages/cpp/configproblemreporter.ui line 52
+#: rc.cpp:1219
+#, no-c-format
+msgid "Parsing"
+msgstr ""
+
+#. i18n: file ./languages/cpp/configproblemreporter.ui line 57
+#: rc.cpp:1222
+#, no-c-format
+msgid ""
+"If enabled, the C++ parser will run on the active file after the stated "
+"timeout, after there has been any changes to the text.\n"
+"\n"
+"If disabled, the parser will typically only run when the file is saved."
+msgstr ""
+
+#. i18n: file ./languages/cpp/configproblemreporter.ui line 76
+#: rc.cpp:1227
+#, fuzzy, no-c-format
+msgid "Enable &background parsing"
+msgstr "Galluogi"
+
+#. i18n: file ./languages/cpp/configproblemreporter.ui line 133
+#: rc.cpp:1233
+#, no-c-format
+msgid "Special &Headers"
+msgstr ""
+
+#. i18n: file ./languages/cpp/configproblemreporter.ui line 136
+#: rc.cpp:1236
+#, no-c-format
+msgid ""
+"Often a macro that the C++ parser must understand in order to correctly parse a "
+"piece of code is defined somewhere in a non-standard header file that the "
+"parser does not look at. This textbox can be used to define those macros "
+"locally so that the C++ parser can understand them."
+msgstr ""
+
+#. i18n: file ./languages/cpp/creategettersetter.ui line 44
+#: rc.cpp:1239
+#, no-c-format
+msgid "&inline"
+msgstr "&mewnlin"
+
+#. i18n: file ./languages/cpp/creategettersetter.ui line 50
+#: rc.cpp:1242
+#, no-c-format
+msgid "create an inline get method"
+msgstr ""
+
+#. i18n: file ./languages/cpp/creategettersetter.ui line 53
+#: rc.cpp:1245
+#, no-c-format
+msgid ""
+"If this is checked the get method will be created inline; otherwise, it will "
+"not."
+msgstr ""
+
+#. i18n: file ./languages/cpp/creategettersetter.ui line 61
+#: rc.cpp:1248
+#, fuzzy, no-c-format
+msgid "&get method"
+msgstr "&Dull:"
+
+#. i18n: file ./languages/cpp/creategettersetter.ui line 67
+#: rc.cpp:1251
+#, no-c-format
+msgid "create get method"
+msgstr ""
+
+#. i18n: file ./languages/cpp/creategettersetter.ui line 70
+#: rc.cpp:1254
+#, no-c-format
+msgid "If this is checked a getter method will be created."
+msgstr ""
+
+#. i18n: file ./languages/cpp/creategettersetter.ui line 78
+#: rc.cpp:1257
+#, fuzzy, no-c-format
+msgid "&set method"
+msgstr "&Dull:"
+
+#. i18n: file ./languages/cpp/creategettersetter.ui line 84
+#: rc.cpp:1260
+#, no-c-format
+msgid "create set method"
+msgstr ""
+
+#. i18n: file ./languages/cpp/creategettersetter.ui line 87
+#: rc.cpp:1263
+#, no-c-format
+msgid "If this is checked a set method will be created"
+msgstr ""
+
+#. i18n: file ./languages/cpp/creategettersetter.ui line 95
+#: rc.cpp:1266
+#, no-c-format
+msgid "name of the get method"
+msgstr ""
+
+#. i18n: file ./languages/cpp/creategettersetter.ui line 98
+#: rc.cpp:1269
+#, no-c-format
+msgid "The name of the created get method"
+msgstr ""
+
+#. i18n: file ./languages/cpp/creategettersetter.ui line 106
+#: rc.cpp:1272
+#, no-c-format
+msgid "name of the set method"
+msgstr ""
+
+#. i18n: file ./languages/cpp/creategettersetter.ui line 109
+#: rc.cpp:1275
+#, no-c-format
+msgid "The name of the created set method"
+msgstr ""
+
+#. i18n: file ./languages/cpp/creategettersetter.ui line 117
+#: rc.cpp:1278
+#, no-c-format
+msgid "i&nline"
+msgstr "m&ewnlin"
+
+#. i18n: file ./languages/cpp/creategettersetter.ui line 123
+#: rc.cpp:1281
+#, no-c-format
+msgid "create an inline set method"
+msgstr ""
+
+#. i18n: file ./languages/cpp/creategettersetter.ui line 126
+#: rc.cpp:1284
+#, no-c-format
+msgid ""
+"If this is checked the set method will be created inline; otherwise, it will "
+"not."
+msgstr ""
+
+#. i18n: file ./languages/cpp/addattributedialogbase.ui line 16
+#: rc.cpp:1293
+#, no-c-format
+msgid "Add Attribute"
+msgstr ""
+
+#. i18n: file ./languages/cpp/addattributedialogbase.ui line 110
+#: rc.cpp:1308
+#, no-c-format
+msgid "&Add Attribute"
+msgstr ""
+
+#. i18n: file ./languages/cpp/addattributedialogbase.ui line 118
+#: rc.cpp:1311
+#, no-c-format
+msgid "&Delete Attribute"
+msgstr ""
+
+#. i18n: file ./languages/cpp/addattributedialogbase.ui line 128
+#: rc.cpp:1314
+#, no-c-format
+msgid "Attribute Properties"
+msgstr ""
+
+#. i18n: file ./languages/cpp/addattributedialogbase.ui line 147
+#: rc.cpp:1317 rc.cpp:4960
+#, no-c-format
+msgid "T&ype:"
+msgstr "M&ath:"
+
+#. i18n: file ./languages/cpp/app_templates/kdevpart2/projectconfigbase.ui line 16
 #: languages/cpp/app_templates/kapp/main.cpp:23
-#: languages/cpp/app_templates/kateplugin2/plugin_app.h:49
-#: languages/cpp/app_templates/tdeconfig35/main.cpp:22
+#: languages/cpp/app_templates/kateplugin2/plugin_app.h:51
 #: languages/cpp/app_templates/kdedcop/main.cpp:22
 #: languages/cpp/app_templates/kdevpart/kdevpart_part.cpp:61
 #: languages/cpp/app_templates/kdevpart/kdevpart_part.cpp:62
@@ -1961,74 +1874,111 @@ msgstr ""
 #: languages/cpp/app_templates/kmake/app.cpp:21
 #: languages/cpp/app_templates/kofficepart/kopart_aboutdata.h:17
 #: languages/cpp/app_templates/kpartapp/main.cpp:21
-#: languages/cpp/app_templates/kscons_tdemdi/main.cpp:24
 #: languages/cpp/app_templates/kscons_kxt/main.cpp:22
+#: languages/cpp/app_templates/kscons_tdemdi/main.cpp:24
+#: languages/cpp/app_templates/kxt/main.cpp:22
+#: languages/cpp/app_templates/tdeconfig35/main.cpp:22
 #: languages/cpp/app_templates/tdescreensaver/tdescreensaver.cpp:18
-#: languages/cpp/app_templates/kxt/main.cpp:22 rc.cpp:1361 rc.cpp:1364
-#: rc.cpp:1385 rc.cpp:1388 rc.cpp:1409 rc.cpp:1418
+#: rc.cpp:1335 rc.cpp:1338 rc.cpp:1341 rc.cpp:1359 rc.cpp:1368 rc.cpp:1371
 #, no-c-format
 msgid "%{APPNAME}"
 msgstr ""
 
+#. i18n: file ./languages/cpp/app_templates/opieapp/examplebase.ui line 32
+#: rc.cpp:1344 rc.cpp:1362
+#, no-c-format
+msgid ""
+"<p>This is just an <i>%{APPNAMELC}</i>; it does not do anything interesting at "
+"all."
+msgstr ""
+
+#. i18n: file ./languages/cpp/app_templates/khello2/widgetbase.ui line 27
+#: rc.cpp:1350
+#, no-c-format
+msgid "Click Me!"
+msgstr ""
+
 #. i18n: file ./languages/cpp/app_templates/kmake/mainview.ui line 32
 #: languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp:108
-#: languages/pascal/compiler/fpcoptions/optiontabs.cpp:32 rc.cpp:1367
+#: languages/pascal/compiler/fpcoptions/optiontabs.cpp:32 rc.cpp:1353
 #, no-c-format
 msgid "Output"
 msgstr "Allbwn"
 
 #. i18n: file ./languages/cpp/app_templates/kmake/mainview.ui line 59
-#: rc.cpp:1370
+#: rc.cpp:1356
 #, no-c-format
 msgid "Hello"
 msgstr "Helo"
 
+#. i18n: file ./languages/cpp/app_templates/kscons_tdemdi/prefs.ui line 24
+#: rc.cpp:1374
+#, no-c-format
+msgid "Show close buttons on the right of tabs"
+msgstr ""
+
 #. i18n: file ./languages/cpp/app_templates/tdescreensaver/tdescreensaverui.ui line 18
-#: rc.cpp:1373
+#: rc.cpp:1377
 #, no-c-format
 msgid "Screen Saver Config"
 msgstr ""
 
 #. i18n: file ./languages/cpp/app_templates/tdescreensaver/tdescreensaverui.ui line 41
-#: rc.cpp:1376
+#: rc.cpp:1380
 #, no-c-format
 msgid "Set some setting"
 msgstr ""
 
-#. i18n: file ./languages/cpp/app_templates/kscons_kxt/appview_base.ui line 18
-#: rc.cpp:1400
+#. i18n: file ./languages/cpp/app_templates/kxt/appview_base.ui line 16
+#: rc.cpp:1389 rc.cpp:1404
 #, no-c-format
-msgid "%{APPNAME}_base"
+msgid "%{APPNAMELC}_base"
 msgstr ""
 
-#. i18n: file ./languages/cpp/app_templates/kscons_tdemdi/prefs.ui line 24
-#: rc.cpp:1406
+#. i18n: file ./languages/cpp/app_templates/kxt/appview_base.ui line 27
+#: rc.cpp:1392 rc.cpp:1407 rc.cpp:1422 rc.cpp:1789
 #, no-c-format
-msgid "Show close buttons on the right of tabs"
+msgid "hello, world"
 msgstr ""
 
-#. i18n: file ./languages/cpp/app_templates/qtopiaapp/examplebase.ui line 32
-#: rc.cpp:1412 rc.cpp:1421
+#. i18n: file ./languages/cpp/app_templates/kxt/prefs-base.ui line 24
+#: rc.cpp:1395 rc.cpp:1410 rc.cpp:1425 rc.cpp:1792
 #, no-c-format
-msgid ""
-"<p>This is just an <i>%{APPNAMELC}</i>; it does not do anything interesting at "
-"all."
+msgid "Background color:"
+msgstr "Lliw'r cefndir:"
+
+#. i18n: file ./languages/cpp/app_templates/kxt/prefs-base.ui line 40
+#: rc.cpp:1398 rc.cpp:1413 rc.cpp:1428 rc.cpp:1795
+#, no-c-format
+msgid "Project age:"
+msgstr ""
+
+#. i18n: file ./languages/cpp/app_templates/kxt/prefs-base.ui line 48
+#: rc.cpp:1401 rc.cpp:1416 rc.cpp:1431 rc.cpp:1798
+#, no-c-format
+msgid "Foreground color:"
+msgstr "Lliw blaendir:"
+
+#. i18n: file ./languages/cpp/app_templates/kscons_kxt/appview_base.ui line 18
+#: rc.cpp:1419
+#, no-c-format
+msgid "%{APPNAME}_base"
 msgstr ""
 
 #. i18n: file ./languages/cpp/debugger/debuggertracingdialogbase.ui line 16
-#: rc.cpp:1442
+#: rc.cpp:1434
 #, fuzzy, no-c-format
 msgid "Tracing Configuration"
 msgstr "Ffurfwedd :"
 
 #. i18n: file ./languages/cpp/debugger/debuggertracingdialogbase.ui line 27
-#: rc.cpp:1445
+#: rc.cpp:1437
 #, fuzzy, no-c-format
 msgid "Enable tracing"
 msgstr "Galluogi"
 
 #. i18n: file ./languages/cpp/debugger/debuggertracingdialogbase.ui line 31
-#: rc.cpp:1448
+#: rc.cpp:1440
 #, no-c-format
 msgid ""
 "<b>Enable tracing</b>\n"
@@ -2038,13 +1988,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/debugger/debuggertracingdialogbase.ui line 50
-#: rc.cpp:1455
+#: rc.cpp:1447
 #, no-c-format
 msgid "Custom format string"
 msgstr ""
 
 #. i18n: file ./languages/cpp/debugger/debuggertracingdialogbase.ui line 92
-#: rc.cpp:1461
+#: rc.cpp:1453
 #, no-c-format
 msgid ""
 "<b>Custom format string</b>\n"
@@ -2056,19 +2006,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/debugger/debuggertracingdialogbase.ui line 114
-#: rc.cpp:1467
+#: rc.cpp:1459
 #, fuzzy, no-c-format
 msgid "Expressions to print:"
 msgstr "M&ynegiad:"
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 16
-#: rc.cpp:1470
+#: rc.cpp:1462
 #, no-c-format
 msgid "Debugger Configuration"
 msgstr ""
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 34
-#: rc.cpp:1473
+#: rc.cpp:1465
 #, no-c-format
 msgid ""
 "Debug arguments can be set on the Run Options page\n"
@@ -2076,19 +2026,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 50
-#: rc.cpp:1477
+#: rc.cpp:1469
 #, fuzzy, no-c-format
 msgid "Debugger executable:"
 msgstr "Gweithredadwyn:"
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 61
-#: rc.cpp:1480
+#: rc.cpp:1472
 #, fuzzy, no-c-format
 msgid "Gdb executable"
 msgstr "Gweithredadwyn:"
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 64
-#: rc.cpp:1483
+#: rc.cpp:1475
 #, no-c-format
 msgid ""
 "To run \"gdb\" binary from $PATH, leave this field empty. To run custom gdb, "
@@ -2098,19 +2048,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 80
-#: rc.cpp:1486
+#: rc.cpp:1478
 #, no-c-format
 msgid "Debugging &shell:"
 msgstr ""
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 86
-#: rc.cpp:1489 rc.cpp:1495
+#: rc.cpp:1481 rc.cpp:1487
 #, no-c-format
 msgid "Run gdb in a special shell (mainly for automake projects)"
 msgstr ""
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 89
-#: rc.cpp:1492
+#: rc.cpp:1484
 #, no-c-format
 msgid ""
 "If you want gdb to be executed by a special shell or tool insert it here. The "
@@ -2119,7 +2069,7 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 100
-#: rc.cpp:1498
+#: rc.cpp:1490
 #, no-c-format
 msgid ""
 "If you want gdb to be executed by a special shell or tool insert it here. The "
@@ -2128,13 +2078,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 127
-#: rc.cpp:1504
+#: rc.cpp:1496
 #, no-c-format
 msgid "Display &demangled names"
 msgstr ""
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 132
-#: rc.cpp:1507
+#: rc.cpp:1499
 #, no-c-format
 msgid ""
 "When displaying the disassembled code you\n"
@@ -2143,13 +2093,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 140
-#: rc.cpp:1512
+#: rc.cpp:1504
 #, no-c-format
 msgid "Try settings &breakpoints on library loading"
 msgstr ""
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 149
-#: rc.cpp:1515
+#: rc.cpp:1507
 #, no-c-format
 msgid ""
 "If GDB has not seen a library that will be loaded via\n"
@@ -2162,19 +2112,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 157
-#: rc.cpp:1524
+#: rc.cpp:1516
 #, no-c-format
 msgid "Enable separate terminal for application &IO"
 msgstr ""
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 160
-#: rc.cpp:1527
+#: rc.cpp:1519
 #, fuzzy, no-c-format
 msgid "Alt+I"
 msgstr "Alt+1"
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 166
-#: rc.cpp:1530
+#: rc.cpp:1522
 #, no-c-format
 msgid ""
 "This allows you to enter terminal input when your\n"
@@ -2184,103 +2134,103 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 174
-#: rc.cpp:1536
+#: rc.cpp:1528
 #, no-c-format
 msgid "E&nable floating toolbar"
 msgstr ""
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 177
-#: rc.cpp:1539 rc.cpp:2369
+#: rc.cpp:1531 rc.cpp:4132
 #, fuzzy, no-c-format
 msgid "Alt+N"
 msgstr "Alt+1"
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 185
-#: rc.cpp:1542
+#: rc.cpp:1534
 #, no-c-format
 msgid ""
 "Use the floating toolbar. This toolbar always stays\n"
-"on top of all windows so that if the app covers KDevelop\n"
+"on top of all windows so that if the app covers TDevelop\n"
 "you have control of the app through the small toolbar. It\n"
 "can also be docked into the panel.\n"
 "\n"
-"This toolbar is in addition to the toolbar in KDevelop."
+"This toolbar is in addition to the toolbar in TDevelop."
 msgstr ""
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 193
-#: rc.cpp:1550
+#: rc.cpp:1542
 #, no-c-format
 msgid "Display static &members"
 msgstr ""
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 196
-#: rc.cpp:1553
+#: rc.cpp:1545
 #, fuzzy, no-c-format
 msgid "Alt+M"
 msgstr "Alt+A"
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 204
-#: rc.cpp:1556
+#: rc.cpp:1548
 #, no-c-format
 msgid ""
 "Displaying static members makes GDB slower in\n"
-"producing data within TDE and Qt.\n"
+"producing data within TDE and TQt.\n"
 "It may change the \"signature\" of the data\n"
-"which QString and friends rely on,\n"
+"which TQString and friends rely on,\n"
 "but if you need to debug into these values then\n"
 "check this option."
 msgstr ""
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 222
-#: rc.cpp:1564
+#: rc.cpp:1556
 #, no-c-format
 msgid "Global Output Radix"
 msgstr ""
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 233
-#: rc.cpp:1567
+#: rc.cpp:1559
 #, no-c-format
 msgid "Oct&al"
 msgstr ""
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 241
-#: rc.cpp:1570
+#: rc.cpp:1562
 #, no-c-format
 msgid "He&xadecimal"
 msgstr ""
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 249
-#: languages/cpp/debugger/variablewidget.cpp:278 rc.cpp:1573
+#: languages/cpp/debugger/variablewidget.cpp:278 rc.cpp:1565
 #, no-c-format
 msgid "Decimal"
 msgstr ""
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 259
-#: rc.cpp:1576
+#: rc.cpp:1568
 #, no-c-format
 msgid "Start Debugger With"
 msgstr ""
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 270
-#: rc.cpp:1579
+#: rc.cpp:1571
 #, no-c-format
 msgid "Framestack"
 msgstr ""
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 278
-#: languages/cpp/debugger/debuggerpart.cpp:159 rc.cpp:1582
+#: languages/cpp/debugger/debuggerpart.cpp:159 rc.cpp:1574
 #, no-c-format
 msgid "GDB Output"
 msgstr ""
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 292
-#: rc.cpp:1585
+#: rc.cpp:1577
 #, no-c-format
 msgid "Remote Debugging"
 msgstr ""
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 298
-#: rc.cpp:1588
+#: rc.cpp:1580
 #, no-c-format
 msgid ""
 "This script is intended for the actual commands needed to connect to a remotely "
@@ -2291,19 +2241,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 317
-#: rc.cpp:1594
+#: rc.cpp:1586
 #, no-c-format
 msgid "R&un shell script:"
 msgstr ""
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 332
-#: rc.cpp:1597
+#: rc.cpp:1589
 #, no-c-format
 msgid "Script to connect with remote application"
 msgstr ""
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 339
-#: rc.cpp:1600
+#: rc.cpp:1592
 #, no-c-format
 msgid ""
 "This script is sourced by gdb after the two preceding scripts have been "
@@ -2316,13 +2266,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 347
-#: rc.cpp:1607
+#: rc.cpp:1599
 #, no-c-format
 msgid "Script to start remote application"
 msgstr ""
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 356
-#: rc.cpp:1610
+#: rc.cpp:1602
 #, no-c-format
 msgid ""
 "This shell script is run after the Config gdb script has been sourced by gdb.\n"
@@ -2337,53 +2287,79 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 364
-#: rc.cpp:1619
+#: rc.cpp:1611
 #, no-c-format
 msgid "Run &gdb script:"
 msgstr ""
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 376
-#: rc.cpp:1622
+#: rc.cpp:1614
 #, no-c-format
 msgid "&Config gdb script:"
 msgstr ""
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 387
-#: rc.cpp:1625
+#: rc.cpp:1617
 #, no-c-format
 msgid "Gdb configure script"
 msgstr ""
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 390
-#: rc.cpp:1628
+#: rc.cpp:1620
 #, no-c-format
 msgid "This script is sourced by gdb when the debugging starts."
 msgstr ""
 
+#. i18n: file ./languages/cpp/pcsimporter/customimporter/settingsdialogbase.ui line 32
+#: rc.cpp:1623
+#, no-c-format
+msgid "*.h;*.H;*.hh;*.hxx;*.hpp;*.tlh"
+msgstr ""
+
+#. i18n: file ./languages/cpp/pcsimporter/customimporter/settingsdialogbase.ui line 40
+#: rc.cpp:1626
+#, fuzzy, no-c-format
+msgid "Filename pattern:"
+msgstr "Enw'r ffeil:"
+
+#. i18n: file ./languages/cpp/pcsimporter/customimporter/settingsdialogbase.ui line 48
+#: rc.cpp:1629
+#, no-c-format
+msgid "&Recursive"
+msgstr "&Ymgylchol"
+
 #. i18n: file ./languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui line 57
-#: rc.cpp:1631 rc.cpp:1657
+#: rc.cpp:1632 rc.cpp:1665
 #, fuzzy, no-c-format
 msgid "Scope:"
 msgstr "Sgôr"
 
 #. i18n: file ./languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui line 73
-#: rc.cpp:1634
+#: rc.cpp:1635
 #, no-c-format
 msgid ""
-"Select the Qt configuration to create a Code Completion database for. If you "
-"don't know what this option does, just go with the default."
+"Select the Qt configuration for which to create a Code Completion database. If "
+"you do not know what this option does, accept the default."
 msgstr ""
 
 #. i18n: file ./languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui line 105
-#: rc.cpp:1640
+#: rc.cpp:1641
 #, no-c-format
 msgid ""
 "Qt3 include directories:\n"
 "Only the selected entry will be used"
 msgstr ""
 
+#. i18n: file ./languages/cpp/pcsimporter/qt4importer/settingsdialogbase.ui line 25
+#: rc.cpp:1645
+#, no-c-format
+msgid ""
+"Qt4 include directories:\n"
+"Only the selected entry will be used"
+msgstr ""
+
 #. i18n: file ./languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui line 25
-#: rc.cpp:1644
+#: rc.cpp:1652
 #, no-c-format
 msgid ""
 "TDE include directories:\n"
@@ -2391,19 +2367,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui line 31
-#: rc.cpp:1648
+#: rc.cpp:1656
 #, no-c-format
 msgid "TDE Libs Headers"
 msgstr ""
 
 #. i18n: file ./languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui line 36
-#: rc.cpp:1651
+#: rc.cpp:1659
 #, no-c-format
 msgid "All TDE Headers"
 msgstr ""
 
 #. i18n: file ./languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui line 46
-#: rc.cpp:1654
+#: rc.cpp:1662
 #, no-c-format
 msgid ""
 "Decide if you want to restrict the Code Completion database to only the base "
@@ -2411,353 +2387,87 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui line 65
-#: rc.cpp:1660
+#: rc.cpp:1668
 #, no-c-format
 msgid ""
-"If none of the directories KDevelop found is what you want,you can enter a "
+"If none of the directories TDevelop found is what you want,you can enter a "
 "directory of your choice here"
 msgstr ""
 
-#. i18n: file ./languages/cpp/pcsimporter/qt4importer/settingsdialogbase.ui line 25
-#: rc.cpp:1666
-#, no-c-format
-msgid ""
-"Qt4 include directories:\n"
-"Only the selected entry will be used"
-msgstr ""
-
-#. i18n: file ./languages/cpp/pcsimporter/customimporter/settingsdialogbase.ui line 32
-#: rc.cpp:1673
-#, no-c-format
-msgid "*.h;*.H;*.hh;*.hxx;*.hpp;*.tlh"
-msgstr ""
-
-#. i18n: file ./languages/cpp/pcsimporter/customimporter/settingsdialogbase.ui line 40
-#: rc.cpp:1676
-#, fuzzy, no-c-format
-msgid "Filename pattern:"
-msgstr "Enw'r ffeil:"
-
-#. i18n: file ./languages/cpp/pcsimporter/customimporter/settingsdialogbase.ui line 48
-#: rc.cpp:1679
-#, no-c-format
-msgid "&Recursive"
-msgstr "&Ymgylchol"
-
-#. i18n: file ./languages/lib/designer_integration/implementationwidgetbase.ui line 16
-#: rc.cpp:1682
-#, no-c-format
-msgid "Create or Select Implementation Class"
-msgstr ""
-
-#. i18n: file ./languages/lib/designer_integration/implementationwidgetbase.ui line 100
-#: rc.cpp:1691
-#, no-c-format
-msgid "Create &new class"
-msgstr ""
-
-#. i18n: file ./languages/lib/designer_integration/implementationwidgetbase.ui line 109
-#: rc.cpp:1694
-#, no-c-format
-msgid "Class Name"
-msgstr ""
-
-#. i18n: file ./languages/lib/designer_integration/implementationwidgetbase.ui line 167
-#: rc.cpp:1703
-#, no-c-format
-msgid "Use &existing class"
-msgstr ""
-
-#. i18n: file ./languages/lib/designer_integration/implementationwidgetbase.ui line 183
-#: buildtools/script/scriptnewfiledlg.cpp:38
-#: parts/filecreate/filecreate_newfile.cpp:46 rc.cpp:1706 rc.cpp:1730
-#: rc.cpp:6176 rc.cpp:6239
-#, no-c-format
-msgid "&File name:"
-msgstr "&Enw'r ffeil:"
-
-#. i18n: file ./languages/php/phpnewclassdlgbase.ui line 27
-#: parts/quickopen/quickopenclassdialog.cpp:41 rc.cpp:1712 rc.cpp:8191
-#, no-c-format
-msgid "Class &name:"
-msgstr ""
-
-#. i18n: file ./languages/php/phpnewclassdlgbase.ui line 95
-#: rc.cpp:1724
-#, no-c-format
-msgid "Class &template:"
-msgstr ""
-
-#. i18n: file ./languages/php/phpnewclassdlgbase.ui line 106
-#: parts/filecreate/filecreate_newfile.cpp:41 parts/grepview/grepdlg.cpp:132
-#: rc.cpp:1727 rc.cpp:3519
-#, no-c-format
-msgid "&Directory:"
-msgstr "&Cyfeiriadur:"
-
-#. i18n: file ./languages/php/phpnewclassdlgbase.ui line 163
-#: rc.cpp:1736
-#, no-c-format
-msgid ""
-"<?php\n"
-"if (!defined(\"FILENAME\")){\n"
-"define(\"FILENAME\",0);\n"
-"/*\n"
-"* @author AUTHOR\n"
-"*/\n"
-"\n"
-"class CLASSNAME extends BASECLASS {\n"
-"  //constructor\n"
-"  function CLASSNAME(){\n"
-"   BASECLASS::BASECLASS();\n"
-"  }\n"
-" }\n"
-"}\n"
-"?>"
-msgstr ""
-
-#. i18n: file ./languages/php/phpinfodlg.ui line 16
-#: rc.cpp:1753
-#, no-c-format
-msgid "PHP Information"
-msgstr ""
-
-#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 16
-#: rc.cpp:1759
-#, fuzzy, no-c-format
-msgid "PHP Options"
-msgstr "De&wisiadau"
-
-#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 31
-#: rc.cpp:1762
-#, no-c-format
-msgid "Genera&l"
-msgstr "Cyffre&dinol"
-
-#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 42
-#: rc.cpp:1765
-#, no-c-format
-msgid "&Startup"
-msgstr "&Ymgychwyn"
-
-#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 53
-#: rc.cpp:1768
-#, no-c-format
-msgid "Use current file in editor"
-msgstr ""
-
-#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 67
-#: rc.cpp:1771
-#, fuzzy, no-c-format
-msgid "Use &this file as default:"
-msgstr "Gosod fel Rhagosodiad"
-
-#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 85
-#: rc.cpp:1774
-#, no-c-format
-msgid "Code Help"
-msgstr ""
-
-#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 96
-#: rc.cpp:1777
-#, no-c-format
-msgid "&Enable code completion"
-msgstr ""
-
-#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 104
-#: rc.cpp:1780
-#, no-c-format
-msgid "Enable code &hinting"
-msgstr ""
-
-#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 114
-#: rc.cpp:1783
-#, no-c-format
-msgid "Parser"
-msgstr ""
-
-#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 125
-#: rc.cpp:1786
-#, no-c-format
-msgid "PHP &include path:"
-msgstr ""
-
-#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 141
-#: rc.cpp:1789
-#, no-c-format
-msgid "Ena&ble realtime parser"
-msgstr ""
-
-#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 189
-#: rc.cpp:1792
-#, fuzzy, no-c-format
-msgid "In&vocation"
-msgstr "&Lleoliad:"
-
-#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 200
-#: rc.cpp:1795
-#, no-c-format
-msgid "Please select how KDevelop should execute your scripts."
-msgstr ""
-
-#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 208
-#: rc.cpp:1798
-#, no-c-format
-msgid "Invocation Mode"
-msgstr ""
-
-#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 222
-#: rc.cpp:1801
-#, no-c-format
-msgid "Ca&lling the PHP interpreter directly"
-msgstr ""
-
-#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 231
-#: rc.cpp:1804
-#, no-c-format
-msgid ""
-"<font size=\"+1\">The php executable is called directly. Ideal for developers "
-"who want to develop terminal or graphical applications in PHP. \n"
-"You need a correctly installed php cgi version.</font>"
-msgstr ""
-
-#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 246
-#: rc.cpp:1808
-#, no-c-format
-msgid "Using an &existing webserver (local or remote)"
-msgstr ""
-
-#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 255
-#: rc.cpp:1811
-#, no-c-format
-msgid ""
-"<font size=\"+1\">Uses an existing webserver. The pages are previewed in \n"
-"the internal web browser. Please make sure that the webserver was compiled with "
-"PHP support.</font>"
-msgstr ""
-
-#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 289
-#: rc.cpp:1815
-#, no-c-format
-msgid "&Webserver"
-msgstr ""
-
-#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 300
-#: rc.cpp:1818
-#, no-c-format
-msgid "Pro&ject root URL on webserver:"
-msgstr ""
-
-#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 335
-#: rc.cpp:1821
-#, no-c-format
-msgid "&Shell"
-msgstr "&Plisgyn"
-
-#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 346
-#: rc.cpp:1824
+#. i18n: file ./languages/perl/perlconfigwidgetbase.ui line 16
+#: parts/doxygen/messages.cpp:218 rc.cpp:1674
 #, no-c-format
-msgid "PHP &executable:"
+msgid "Perl"
 msgstr ""
 
-#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 400
-#: rc.cpp:1833
+#. i18n: file ./languages/perl/perlconfigwidgetbase.ui line 28
+#: rc.cpp:1677
 #, no-c-format
-msgid "PHP &Ini File:"
+msgid "Perl &interpreter:"
 msgstr ""
 
-#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 449
-#: rc.cpp:1839
+#. i18n: file ./languages/perl/perlconfigwidgetbase.ui line 80
+#: rc.cpp:1680 rc.cpp:1834 rc.cpp:1858
 #, no-c-format
-msgid "Load &Zend extension:"
+msgid "&Execute programs in a terminal"
 msgstr ""
 
 #. i18n: file ./languages/sql/sqlconfigwidget.ui line 22
-#: rc.cpp:1845 rc.cpp:5662
+#: rc.cpp:1683 rc.cpp:7798
 #, no-c-format
 msgid "Plugin"
 msgstr "Ategyn"
 
 #. i18n: file ./languages/sql/sqlconfigwidget.ui line 30
-#: rc.cpp:1848
+#: rc.cpp:1686
 #, no-c-format
 msgid "Database Name"
 msgstr "Enw'r gronfa ddata:"
 
 #. i18n: file ./languages/sql/sqlconfigwidget.ui line 38
-#: rc.cpp:1851
+#: rc.cpp:1689
 #, no-c-format
 msgid "Host"
 msgstr "Gwesteiwr"
 
 #. i18n: file ./languages/sql/sqlconfigwidget.ui line 46
-#: rc.cpp:1854
+#: rc.cpp:1692
 #, no-c-format
 msgid "Port"
 msgstr "Porth"
 
 #. i18n: file ./languages/sql/sqlconfigwidget.ui line 54
-#: rc.cpp:1857
+#: rc.cpp:1695
 #, no-c-format
 msgid "Username"
 msgstr "Enw defnyddiwr"
 
 #. i18n: file ./languages/sql/sqlconfigwidget.ui line 62
-#: rc.cpp:1860
+#: rc.cpp:1698
 #, no-c-format
 msgid "Password"
 msgstr "Cyfrinair"
 
 #. i18n: file ./languages/sql/sqlconfigwidget.ui line 86
-#: rc.cpp:1863
+#: rc.cpp:1701
 #, no-c-format
 msgid "<i>Warning:</i> password will be saved with weak encryption."
 msgstr ""
 
 #. i18n: file ./languages/sql/sqlconfigwidget.ui line 127
-#: rc.cpp:1869
+#: rc.cpp:1707
 #, no-c-format
 msgid "&Test"
 msgstr "&Profi"
 
-#. i18n: file ./languages/java/configproblemreporter.ui line 27
-#: rc.cpp:1872
-#, no-c-format
-msgid "&Parsing"
-msgstr ""
-
-#. i18n: file ./languages/java/configproblemreporter.ui line 100
-#: rc.cpp:1881
-#, no-c-format
-msgid "&Special Headers"
-msgstr ""
-
-#. i18n: file ./languages/perl/perlconfigwidgetbase.ui line 16
-#: parts/doxygen/messages.cpp:218 rc.cpp:1896
-#, no-c-format
-msgid "Perl"
-msgstr ""
-
-#. i18n: file ./languages/perl/perlconfigwidgetbase.ui line 28
-#: rc.cpp:1899
-#, no-c-format
-msgid "Perl &interpreter:"
-msgstr ""
-
-#. i18n: file ./languages/perl/perlconfigwidgetbase.ui line 80
-#: rc.cpp:1902 rc.cpp:2002 rc.cpp:2092
-#, no-c-format
-msgid "&Execute programs in a terminal"
-msgstr ""
-
 #. i18n: file ./languages/ruby/rubyconfigwidgetbase.ui line 50
-#: rc.cpp:1905
+#: rc.cpp:1710
 #, no-c-format
 msgid "Ru&by shell:"
 msgstr ""
 
 #. i18n: file ./languages/ruby/rubyconfigwidgetbase.ui line 57
-#: rc.cpp:1908
+#: rc.cpp:1713
 #, no-c-format
 msgid ""
 "This is the path (or just name, if in $PATH) to the Ruby shell. Defaults to "
@@ -2766,25 +2476,25 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/ruby/rubyconfigwidgetbase.ui line 78
-#: rc.cpp:1912
+#: rc.cpp:1717
 #, no-c-format
 msgid "Program &arguments:"
 msgstr ""
 
 #. i18n: file ./languages/ruby/rubyconfigwidgetbase.ui line 84
-#: rc.cpp:1915
+#: rc.cpp:1720
 #, no-c-format
 msgid "These are the arguments passed to the Ruby interpreter"
 msgstr ""
 
 #. i18n: file ./languages/ruby/rubyconfigwidgetbase.ui line 100
-#: rc.cpp:1918
+#: rc.cpp:1723
 #, no-c-format
 msgid "&Ruby interpreter:"
 msgstr ""
 
 #. i18n: file ./languages/ruby/rubyconfigwidgetbase.ui line 106
-#: rc.cpp:1921
+#: rc.cpp:1726
 #, no-c-format
 msgid ""
 "This is the path (or just name, if in $PATH) to the Ruby interpreter. Defaults "
@@ -2792,19 +2502,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/ruby/rubyconfigwidgetbase.ui line 122
-#: rc.cpp:1924
+#: rc.cpp:1729
 #, no-c-format
 msgid "&Main program:"
 msgstr ""
 
 #. i18n: file ./languages/ruby/rubyconfigwidgetbase.ui line 128
-#: rc.cpp:1927
+#: rc.cpp:1732
 #, no-c-format
 msgid "This is the name of the main program source file"
 msgstr ""
 
 #. i18n: file ./languages/ruby/rubyconfigwidgetbase.ui line 141
-#: rc.cpp:1930 rc.cpp:5509 rc.cpp:6338
+#: rc.cpp:1735 rc.cpp:7645 rc.cpp:8456
 #, fuzzy, no-c-format
 msgid "Working Directory:"
 msgstr "Cyfeiriadur:"
@@ -2815,56 +2525,56 @@ msgstr "Cyfeiriadur:"
 #: languages/php/phpsupportpart.cpp:94
 #: languages/ruby/debugger/dbgtoolbar.cpp:300
 #: languages/ruby/rubysupport_part.cpp:54 languages/sql/sqlsupport_part.cpp:44
-#: rc.cpp:1933
+#: rc.cpp:1738
 #, no-c-format
 msgid "Run"
 msgstr "Rhedeg"
 
 #. i18n: file ./languages/ruby/rubyconfigwidgetbase.ui line 192
-#: rc.cpp:1936
+#: rc.cpp:1741
 #, fuzzy, no-c-format
 msgid "Main pr&ogram"
 msgstr "Rhaglen"
 
 #. i18n: file ./languages/ruby/rubyconfigwidgetbase.ui line 200
-#: rc.cpp:1939
+#: rc.cpp:1744
 #, fuzzy, no-c-format
 msgid "Selected wi&ndow"
 msgstr "Gweithredoedd d&ewisiedig:"
 
 #. i18n: file ./languages/ruby/rubyconfigwidgetbase.ui line 210
-#: rc.cpp:1942
+#: rc.cpp:1747
 #, no-c-format
 msgid "R&un applications in terminal"
 msgstr ""
 
 #. i18n: file ./languages/ruby/rubyconfigwidgetbase.ui line 213
-#: rc.cpp:1945
+#: rc.cpp:1750
 #, no-c-format
 msgid ""
 "Check this if you want your applications to be opened in terminal window."
 msgstr ""
 
 #. i18n: file ./languages/ruby/rubyconfigwidgetbase.ui line 221
-#: rc.cpp:1948
+#: rc.cpp:1753
 #, no-c-format
 msgid "Enable &debugger floating toolbar"
 msgstr ""
 
 #. i18n: file ./languages/ruby/rubyconfigwidgetbase.ui line 224
-#: rc.cpp:1951
+#: rc.cpp:1756
 #, no-c-format
 msgid "Check this if you want to control the debugger via a floating toolbar."
 msgstr ""
 
 #. i18n: file ./languages/ruby/rubyconfigwidgetbase.ui line 232
-#: rc.cpp:1954
+#: rc.cpp:1759
 #, no-c-format
 msgid "Show &constants in the debugger"
 msgstr ""
 
 #. i18n: file ./languages/ruby/rubyconfigwidgetbase.ui line 235
-#: rc.cpp:1957
+#: rc.cpp:1762
 #, no-c-format
 msgid ""
 "Check this if you want the debugger to show constants (with many constants this "
@@ -2872,103 +2582,196 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/ruby/rubyconfigwidgetbase.ui line 243
-#: rc.cpp:1960
+#: rc.cpp:1765
 #, no-c-format
 msgid "Trace &into Ruby libraries"
 msgstr ""
 
 #. i18n: file ./languages/ruby/rubyconfigwidgetbase.ui line 246
-#: rc.cpp:1963
+#: rc.cpp:1768
 #, no-c-format
 msgid "Trace through the Ruby code installed under sitedir in the debugger"
 msgstr ""
 
 #. i18n: file ./languages/ruby/rubyconfigwidgetbase.ui line 262
-#: rc.cpp:1966
+#: rc.cpp:1771
 #, no-c-format
 msgid "Character Coding"
 msgstr ""
 
 #. i18n: file ./languages/ruby/rubyconfigwidgetbase.ui line 273
-#: rc.cpp:1969
+#: rc.cpp:1774
 #, no-c-format
 msgid "ASCII"
 msgstr ""
 
 #. i18n: file ./languages/ruby/rubyconfigwidgetbase.ui line 284
-#: rc.cpp:1972
+#: rc.cpp:1777
 #, no-c-format
 msgid "EUC"
 msgstr ""
 
 #. i18n: file ./languages/ruby/rubyconfigwidgetbase.ui line 295
-#: rc.cpp:1975
+#: rc.cpp:1780
 #, no-c-format
 msgid "S&JIS"
 msgstr ""
 
 #. i18n: file ./languages/ruby/rubyconfigwidgetbase.ui line 306
-#: rc.cpp:1978
+#: rc.cpp:1783
 #, no-c-format
 msgid "UTF-&8"
 msgstr "UTF-&8"
 
 #. i18n: file ./languages/ruby/app_templates/kxt/appview_base.ui line 16
-#: rc.cpp:1990
+#: rc.cpp:1786
 #, no-c-format
 msgid "%{APPNAMESC}_base"
 msgstr ""
 
+#. i18n: file ./languages/lib/designer_integration/implementationwidgetbase.ui line 16
+#: rc.cpp:1801
+#, no-c-format
+msgid "Create or Select Implementation Class"
+msgstr ""
+
+#. i18n: file ./languages/lib/designer_integration/implementationwidgetbase.ui line 100
+#: rc.cpp:1810
+#, no-c-format
+msgid "Create &new class"
+msgstr ""
+
+#. i18n: file ./languages/lib/designer_integration/implementationwidgetbase.ui line 109
+#: rc.cpp:1813
+#, no-c-format
+msgid "Class Name"
+msgstr ""
+
+#. i18n: file ./languages/lib/designer_integration/implementationwidgetbase.ui line 167
+#: rc.cpp:1822
+#, no-c-format
+msgid "Use &existing class"
+msgstr ""
+
+#. i18n: file ./languages/lib/designer_integration/implementationwidgetbase.ui line 183
+#: buildtools/script/scriptnewfiledlg.cpp:38
+#: parts/filecreate/filecreate_newfile.cpp:46 rc.cpp:1825 rc.cpp:1987
+#: rc.cpp:8579 rc.cpp:8765
+#, no-c-format
+msgid "&File name:"
+msgstr "&Enw'r ffeil:"
+
+#. i18n: file ./languages/python/pythonconfigwidgetbase.ui line 16
+#: languages/python/pythonsupportpart.cpp:111 rc.cpp:1828
+#, no-c-format
+msgid "Python"
+msgstr "Python"
+
+#. i18n: file ./languages/python/pythonconfigwidgetbase.ui line 27
+#: rc.cpp:1831
+#, no-c-format
+msgid "Python &interpreter:"
+msgstr ""
+
+#. i18n: file ./languages/python/app_templates/pyqt/documentdetails.ui line 16
+#: rc.cpp:1837
+#, no-c-format
+msgid "Document Details"
+msgstr ""
+
+#. i18n: file ./languages/python/app_templates/pyqt/documentdetails.ui line 35
+#: rc.cpp:1840
+#, no-c-format
+msgid "Enter details about this document below."
+msgstr ""
+
+#. i18n: file ./languages/python/app_templates/pyqt/documentdetails.ui line 46
+#: parts/snippet/snippet_part.cpp:88 vcs/subversion/svn_blamewidget.cpp:38
+#: vcs/subversion/svn_logviewwidget.cpp:53 rc.cpp:1843
+#, no-c-format
+msgid "Author"
+msgstr "Awdur"
+
+#. i18n: file ./languages/python/app_templates/pyqt/documentdetails.ui line 57
+#: rc.cpp:1846 rc.cpp:2586 rc.cpp:2604 rc.cpp:7996
+#, no-c-format
+msgid "Name:"
+msgstr "Enw:"
+
+#. i18n: file ./languages/python/app_templates/pyqt/documentdetails.ui line 72
+#: rc.cpp:1849
+#, no-c-format
+msgid "Company"
+msgstr "Cwmni"
+
 #. i18n: file ./languages/csharp/csharpconfigwidgetbase.ui line 16
-#: rc.cpp:1996
+#: rc.cpp:1852
 #, no-c-format
 msgid "CSharp"
 msgstr ""
 
 #. i18n: file ./languages/csharp/csharpconfigwidgetbase.ui line 28
-#: rc.cpp:1999
+#: rc.cpp:1855
 #, no-c-format
 msgid "CSharp &interpreter:"
 msgstr ""
 
+#. i18n: file ./languages/pascal/configproblemreporter.ui line 24
+#: rc.cpp:1861 rc.cpp:1867 rc.cpp:2102
+#, no-c-format
+msgid "&Enable background parsing"
+msgstr ""
+
+#. i18n: file ./languages/java/configproblemreporter.ui line 27
+#: rc.cpp:1864
+#, no-c-format
+msgid "&Parsing"
+msgstr ""
+
+#. i18n: file ./languages/java/configproblemreporter.ui line 100
+#: rc.cpp:1873
+#, no-c-format
+msgid "&Special Headers"
+msgstr ""
+
 #. i18n: file ./languages/fortran/ftnchekconfigwidgetbase.ui line 16
-#: rc.cpp:2005
+#: rc.cpp:1888
 #, no-c-format
 msgid "Ftnchek Options"
 msgstr ""
 
 #. i18n: file ./languages/fortran/ftnchekconfigwidgetbase.ui line 37
-#: rc.cpp:2008
+#: rc.cpp:1891
 #, no-c-format
 msgid "&1"
 msgstr "&1"
 
 #. i18n: file ./languages/fortran/ftnchekconfigwidgetbase.ui line 48
-#: rc.cpp:2011
+#: rc.cpp:1894
 #, no-c-format
 msgid "&External subprograms without definition"
 msgstr ""
 
 #. i18n: file ./languages/fortran/ftnchekconfigwidgetbase.ui line 56
-#: rc.cpp:2014
+#: rc.cpp:1897
 #, no-c-format
 msgid "&Divisions"
 msgstr ""
 
 #. i18n: file ./languages/fortran/ftnchekconfigwidgetbase.ui line 64
-#: rc.cpp:2017
+#: rc.cpp:1900
 #, no-c-format
 msgid "&Identifiers without explicit type"
 msgstr ""
 
 #. i18n: file ./languages/fortran/ftnchekconfigwidgetbase.ui line 72
-#: rc.cpp:2020
+#: rc.cpp:1903
 #, no-c-format
 msgid "&Assume functions have no side effects"
 msgstr ""
 
 #. i18n: file ./languages/fortran/ftnchekconfigwidgetbase.ui line 97
-#: rc.cpp:2023
+#: rc.cpp:1906
 #, no-c-format
 msgid "Ar&guments:"
 msgstr "Ym&resymiadau:"
@@ -2977,1863 +2780,1450 @@ msgstr "Ym&resymiadau:"
 #: parts/snippet/snippet_widget.cpp:142 parts/snippet/snippet_widget.cpp:144
 #: parts/snippet/snippet_widget.cpp:253 parts/snippet/snippet_widget.cpp:447
 #: parts/snippet/snippet_widget.cpp:454 parts/snippet/snippet_widget.cpp:961
-#: parts/snippet/snippetitem.h:54 rc.cpp:2026 rc.cpp:2032 rc.cpp:2050
-#: rc.cpp:2056 rc.cpp:2065 rc.cpp:2077
+#: parts/snippet/snippetitem.h:54 rc.cpp:1909 rc.cpp:1915 rc.cpp:1933
+#: rc.cpp:1939 rc.cpp:1948 rc.cpp:1960
 #, no-c-format
 msgid "All"
 msgstr "Popeth"
 
 #. i18n: file ./languages/fortran/ftnchekconfigwidgetbase.ui line 119
-#: rc.cpp:2029 rc.cpp:2035 rc.cpp:2044 rc.cpp:2059 rc.cpp:2068 rc.cpp:2080
+#: rc.cpp:1912 rc.cpp:1918 rc.cpp:1927 rc.cpp:1942 rc.cpp:1951 rc.cpp:1963
 #, no-c-format
 msgid "Only the following:"
 msgstr ""
 
 #. i18n: file ./languages/fortran/ftnchekconfigwidgetbase.ui line 243
-#: rc.cpp:2038
+#: rc.cpp:1921
 #, no-c-format
 msgid "Common &blocks:"
 msgstr ""
 
 #. i18n: file ./languages/fortran/ftnchekconfigwidgetbase.ui line 256
-#: rc.cpp:2041
+#: rc.cpp:1924
 #, no-c-format
 msgid "&2"
 msgstr "&2"
 
 #. i18n: file ./languages/fortran/ftnchekconfigwidgetbase.ui line 278
-#: rc.cpp:2047
+#: rc.cpp:1930
 #, no-c-format
 msgid "&Truncation and roundoff errors:"
 msgstr ""
 
 #. i18n: file ./languages/fortran/ftnchekconfigwidgetbase.ui line 297
-#: rc.cpp:2053
+#: rc.cpp:1936
 #, no-c-format
 msgid "&Use of variables:"
 msgstr ""
 
 #. i18n: file ./languages/fortran/ftnchekconfigwidgetbase.ui line 406
-#: rc.cpp:2062
+#: rc.cpp:1945
 #, no-c-format
 msgid "&3"
 msgstr "&3"
 
 #. i18n: file ./languages/fortran/ftnchekconfigwidgetbase.ui line 513
-#: rc.cpp:2071
+#: rc.cpp:1954
 #, no-c-format
 msgid "Fortran 77 language &extensions:"
 msgstr ""
 
 #. i18n: file ./languages/fortran/ftnchekconfigwidgetbase.ui line 524
-#: rc.cpp:2074
+#: rc.cpp:1957
 #, no-c-format
 msgid "Other &portability warnings:"
 msgstr ""
 
-#. i18n: file ./languages/python/pythonconfigwidgetbase.ui line 16
-#: languages/python/pythonsupportpart.cpp:111 rc.cpp:2086
+#. i18n: file ./languages/php/phpnewclassdlgbase.ui line 27
+#: parts/quickopen/quickopenclassdialog.cpp:41 rc.cpp:1969 rc.cpp:6302
 #, no-c-format
-msgid "Python"
-msgstr "Python"
+msgid "Class &name:"
+msgstr ""
 
-#. i18n: file ./languages/python/pythonconfigwidgetbase.ui line 27
-#: rc.cpp:2089
+#. i18n: file ./languages/php/phpnewclassdlgbase.ui line 95
+#: rc.cpp:1981
 #, no-c-format
-msgid "Python &interpreter:"
+msgid "Class &template:"
 msgstr ""
 
-#. i18n: file ./languages/python/app_templates/pyqt/documentdetails.ui line 16
-#: rc.cpp:2095
+#. i18n: file ./languages/php/phpnewclassdlgbase.ui line 106
+#: parts/filecreate/filecreate_newfile.cpp:41 parts/grepview/grepdlg.cpp:132
+#: rc.cpp:1984 rc.cpp:3021
 #, no-c-format
-msgid "Document Details"
-msgstr ""
+msgid "&Directory:"
+msgstr "&Cyfeiriadur:"
 
-#. i18n: file ./languages/python/app_templates/pyqt/documentdetails.ui line 35
-#: rc.cpp:2098
+#. i18n: file ./languages/php/phpnewclassdlgbase.ui line 163
+#: rc.cpp:1993
 #, no-c-format
-msgid "Enter details about this document below."
+msgid ""
+"<?php\n"
+"if (!defined(\"FILENAME\")){\n"
+"define(\"FILENAME\",0);\n"
+"/*\n"
+"* @author AUTHOR\n"
+"*/\n"
+"\n"
+"class CLASSNAME extends BASECLASS {\n"
+"  //constructor\n"
+"  function CLASSNAME(){\n"
+"   BASECLASS::BASECLASS();\n"
+"  }\n"
+" }\n"
+"}\n"
+"?>"
 msgstr ""
 
-#. i18n: file ./languages/python/app_templates/pyqt/documentdetails.ui line 46
-#: parts/snippet/snippet_part.cpp:88 vcs/subversion/svn_blamewidget.cpp:38
-#: vcs/subversion/svn_logviewwidget.cpp:53 rc.cpp:2101
-#, no-c-format
-msgid "Author"
-msgstr "Awdur"
+#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 16
+#: rc.cpp:2010
+#, fuzzy, no-c-format
+msgid "PHP Options"
+msgstr "De&wisiadau"
 
-#. i18n: file ./languages/python/app_templates/pyqt/documentdetails.ui line 57
-#: rc.cpp:2104 rc.cpp:4495 rc.cpp:4543 rc.cpp:5860
+#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 31
+#: rc.cpp:2013
 #, no-c-format
-msgid "Name:"
-msgstr "Enw:"
+msgid "Genera&l"
+msgstr "Cyffre&dinol"
 
-#. i18n: file ./languages/python/app_templates/pyqt/documentdetails.ui line 72
-#: rc.cpp:2107
+#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 42
+#: rc.cpp:2016
 #, no-c-format
-msgid "Company"
-msgstr "Cwmni"
+msgid "&Startup"
+msgstr "&Ymgychwyn"
 
-#. i18n: file ./languages/kjssupport/subclassingdlgbase.ui line 16
-#: languages/kjssupport/kjssupport_part.cpp:429 rc.cpp:2110
+#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 53
+#: rc.cpp:2019
 #, no-c-format
-msgid "Implement Slots"
+msgid "Use current file in editor"
 msgstr ""
 
-#. i18n: file ./src/mimewarningdialog.ui line 24
-#: rc.cpp:2152
-#, no-c-format
-msgid "Could Not Open File"
-msgstr "Methwyd agor y ffeil"
+#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 67
+#: rc.cpp:2022
+#, fuzzy, no-c-format
+msgid "Use &this file as default:"
+msgstr "Gosod fel Rhagosodiad"
 
-#. i18n: file ./src/mimewarningdialog.ui line 43
-#: rc.cpp:2155
+#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 85
+#: rc.cpp:2025
 #, no-c-format
-msgid "KDevelop could not open"
+msgid "Code Help"
 msgstr ""
 
-#. i18n: file ./src/mimewarningdialog.ui line 59
-#: rc.cpp:2158
+#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 96
+#: rc.cpp:2028
 #, no-c-format
-msgid "Some URL"
+msgid "&Enable code completion"
 msgstr ""
 
-#. i18n: file ./src/mimewarningdialog.ui line 75
-#: rc.cpp:2161
+#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 104
+#: rc.cpp:2031
 #, no-c-format
-msgid "<qt>No suitable viewer was found for the <b>%1</b> mimetype.</qt>"
+msgid "Enable code &hinting"
 msgstr ""
 
-#. i18n: file ./src/mimewarningdialog.ui line 100
-#: rc.cpp:2164
-#, no-c-format
-msgid "What Do You Want to Do?"
-msgstr "Beth hoffech chi ei wneud?"
-
-#. i18n: file ./src/mimewarningdialog.ui line 111
-#: rc.cpp:2167
+#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 114
+#: rc.cpp:2034
 #, no-c-format
-msgid "Let TDE find a suitable program"
+msgid "Parser"
 msgstr ""
 
-#. i18n: file ./src/mimewarningdialog.ui line 122
-#: rc.cpp:2170
+#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 125
+#: rc.cpp:2037
 #, no-c-format
-msgid "Open it in KDevelop as plain text"
+msgid "PHP &include path:"
 msgstr ""
 
-#. i18n: file ./src/mimewarningdialog.ui line 158
-#: rc.cpp:2173
+#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 141
+#: rc.cpp:2040
 #, no-c-format
-msgid "Always open this mimetype as text"
+msgid "Ena&ble realtime parser"
 msgstr ""
 
-#. i18n: file ./src/generalinfowidgetbase.ui line 16
-#: rc.cpp:2182
-#, no-c-format
-msgid "General Settings"
-msgstr "Gosodiadau Cyffredinol"
+#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 189
+#: rc.cpp:2043
+#, fuzzy, no-c-format
+msgid "In&vocation"
+msgstr "&Lleoliad:"
 
-#. i18n: file ./src/generalinfowidgetbase.ui line 25
-#: rc.cpp:2185
+#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 200
+#: rc.cpp:2046
 #, no-c-format
-msgid "Absolute Path"
+msgid "Please select how TDevelop should execute your scripts."
 msgstr ""
 
-#. i18n: file ./src/generalinfowidgetbase.ui line 30
-#: rc.cpp:2188
+#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 208
+#: rc.cpp:2049
 #, no-c-format
-msgid "Relative to Project File"
+msgid "Invocation Mode"
 msgstr ""
 
-#. i18n: file ./src/generalinfowidgetbase.ui line 59
-#: parts/filecreate/addglobaldlg.cpp:103 rc.cpp:2191 rc.cpp:2246 rc.cpp:3644
-#, no-c-format
-msgid "Description:"
-msgstr "Disgrifiad:"
-
-#. i18n: file ./src/generalinfowidgetbase.ui line 67
-#: rc.cpp:2194
+#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 222
+#: rc.cpp:2052
 #, no-c-format
-msgid "Project directory:"
+msgid "Ca&lling the PHP interpreter directly"
 msgstr ""
 
-#. i18n: file ./src/generalinfowidgetbase.ui line 75
-#: rc.cpp:2197 rc.cpp:3605
-#, no-c-format
-msgid "Author:"
-msgstr "Awdur:"
-
-#. i18n: file ./src/generalinfowidgetbase.ui line 83
-#: rc.cpp:2200 rc.cpp:3608
-#, no-c-format
-msgid "Email:"
-msgstr "Ebost:"
-
-#. i18n: file ./src/generalinfowidgetbase.ui line 91
-#: rc.cpp:2203 rc.cpp:3611
-#, no-c-format
-msgid "Version:"
-msgstr "Fersiwn :"
-
-#. i18n: file ./src/generalinfowidgetbase.ui line 115
-#: rc.cpp:2206
+#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 231
+#: rc.cpp:2055
 #, no-c-format
 msgid ""
-"Project Version\n"
-"You may need to run automake & friends to update\n"
-"the version in all files after changing this."
+"<font size=\"+1\">The php executable is called directly. Ideal for developers "
+"who want to develop terminal or graphical applications in PHP. \n"
+"You need a correctly installed php cgi version.</font>"
 msgstr ""
 
-#. i18n: file ./src/generalinfowidgetbase.ui line 124
-#: rc.cpp:2211
+#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 246
+#: rc.cpp:2059
 #, no-c-format
-msgid ""
-"Used in templates as $EMAIL$\n"
-"Placed in the AUTHORS file"
+msgid "Using an &existing webserver (local or remote)"
 msgstr ""
 
-#. i18n: file ./src/generalinfowidgetbase.ui line 133
-#: rc.cpp:2215
+#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 255
+#: rc.cpp:2062
 #, no-c-format
 msgid ""
-"Used in templates as $AUTHOR$\n"
-"Placed in the AUTHORS file"
+"<font size=\"+1\">Uses an existing webserver. The pages are previewed in \n"
+"the internal web browser. Please make sure that the webserver was compiled with "
+"PHP support.</font>"
 msgstr ""
 
-#. i18n: file ./src/generalinfowidgetbase.ui line 177
-#: rc.cpp:2219
+#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 289
+#: rc.cpp:2066
 #, no-c-format
-msgid "Where the project starts."
+msgid "&Webserver"
 msgstr ""
 
-#. i18n: file ./src/generalinfowidgetbase.ui line 189
-#: rc.cpp:2222
+#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 300
+#: rc.cpp:2069
 #, no-c-format
-msgid "Please select a project directory"
+msgid "Pro&ject root URL on webserver:"
 msgstr ""
 
-#. i18n: file ./src/generalinfowidgetbase.ui line 197
-#: rc.cpp:2225
-#, fuzzy, no-c-format
-msgid "Default encoding:"
-msgstr "&Rhagosod :"
-
-#. i18n: file ./src/generalinfowidgetbase.ui line 205
-#: rc.cpp:2228
+#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 335
+#: rc.cpp:2072
 #, no-c-format
-msgid "Default encoding used when opening text files"
-msgstr ""
-
-#. i18n: file ./src/generalinfowidgetbase.ui line 213
-#: rc.cpp:2231
-#, fuzzy, no-c-format
-msgid "Text that stays in the project file."
-msgstr "Methu Cyfieithu'r Testun Tarddiad"
-
-#. i18n: file ./src/pluginselectdialogbase.ui line 16
-#: rc.cpp:2234
-#, fuzzy, no-c-format
-msgid "Plugin Selection"
-msgstr "G&wagu Dewisiad"
-
-#. i18n: file ./src/pluginselectdialogbase.ui line 27
-#: rc.cpp:2237
-#, fuzzy, no-c-format
-msgid "Plugins:"
-msgstr "Ategion"
+msgid "&Shell"
+msgstr "&Plisgyn"
 
-#. i18n: file ./src/pluginselectdialogbase.ui line 51
-#: rc.cpp:2240
+#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 346
+#: rc.cpp:2075
 #, no-c-format
-msgid "Make this the default for this profile:"
+msgid "PHP &executable:"
 msgstr ""
 
-#. i18n: file ./src/pluginselectdialogbase.ui line 59
-#: rc.cpp:2243
-#, fuzzy, no-c-format
-msgid "Save &as Default"
-msgstr "Gosod fel Rhagosodiad"
-
-#. i18n: file ./src/pluginselectdialogbase.ui line 137
-#: rc.cpp:2249 rc.cpp:2697 rc.cpp:4549 rc.cpp:5431 rc.cpp:5902
+#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 400
+#: rc.cpp:2084
 #, no-c-format
-msgid "O&K"
+msgid "PHP &Ini File:"
 msgstr ""
 
-#. i18n: file ./src/settingswidget.ui line 16
-#: rc.cpp:2255
-#, no-c-format
-msgid "Form2"
-msgstr "Ffurflen2"
-
-#. i18n: file ./src/settingswidget.ui line 30
-#: rc.cpp:2258
+#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 449
+#: rc.cpp:2090
 #, no-c-format
-msgid "Lo&ad last project on startup"
+msgid "Load &Zend extension:"
 msgstr ""
 
-#. i18n: file ./src/settingswidget.ui line 33
-#: rc.cpp:2261
+#. i18n: file ./languages/php/phpinfodlg.ui line 16
+#: rc.cpp:2096
 #, no-c-format
-msgid ""
-"Check this if you want KDevelop to load the last opened project on startup"
+msgid "PHP Information"
 msgstr ""
 
-#. i18n: file ./src/settingswidget.ui line 36
-#: rc.cpp:2264
+#. i18n: file ./languages/ada/addclassdlg.ui line 16
+#: rc.cpp:2105
 #, no-c-format
-msgid ""
-"Mark this checkbox if you want to continue to work with the last project you "
-"worked on. This will cause KDevelop to automatically load this project on "
-"start-up. It will usually be shown in the state you left work so you can "
-"readily proceed."
+msgid "Add Class"
 msgstr ""
 
-#. i18n: file ./src/settingswidget.ui line 44
-#: rc.cpp:2267
-#, fuzzy, no-c-format
-msgid "<qt><h3>Project Settings</h3></qt>"
-msgstr "Gosodiadau Cywaith"
-
-#. i18n: file ./src/settingswidget.ui line 55
-#: rc.cpp:2270
+#. i18n: file ./languages/ada/addclassdlg.ui line 30
+#: rc.cpp:2108
 #, no-c-format
-msgid "Line wrappin&g"
+msgid "&Implements"
 msgstr ""
 
-#. i18n: file ./src/settingswidget.ui line 58
-#: rc.cpp:2273
+#. i18n: file ./languages/ada/addclassdlg.ui line 38
+#: rc.cpp:2111
 #, no-c-format
-msgid ""
-"By default, KDevelop will wrap long lines around in the Messages Output View "
-"window"
-msgstr ""
+msgid "&Class"
+msgstr "&Dosbarth"
 
-#. i18n: file ./src/settingswidget.ui line 61
-#: rc.cpp:2276
+#. i18n: file ./languages/ada/addclassdlg.ui line 72
+#: rc.cpp:2114
 #, no-c-format
-msgid ""
-"By default, KDevelop will wrap long lines around in the Messages Output View "
-"window so that valuable information will not be easily overlooked. In some "
-"cases this will clutter long message lists. Remove the checkbox mark if you do "
-"not want the lines wrap around."
-msgstr ""
-
-#. i18n: file ./src/settingswidget.ui line 77
-#: rc.cpp:2279
-#, fuzzy, no-c-format
-msgid "&Compiler output:"
-msgstr "Crynhoydd"
-
-#. i18n: file ./src/settingswidget.ui line 86
-#: rc.cpp:2282
-#, fuzzy, no-c-format
-msgid "Very Short"
-msgstr "&Byr"
+msgid "&Abstract"
+msgstr "&Crynodeb"
 
-#. i18n: file ./src/settingswidget.ui line 91
-#: rc.cpp:2285
+#. i18n: file ./languages/ada/addclassdlg.ui line 80
+#: rc.cpp:2117
 #, no-c-format
-msgid "Short"
-msgstr "Byr"
+msgid "&Interface"
+msgstr "&Rhyngwyneb"
 
-#. i18n: file ./src/settingswidget.ui line 96
-#: rc.cpp:2288
+#. i18n: file ./languages/ada/addclassdlg.ui line 117
+#: rc.cpp:2123
 #, no-c-format
-msgid "Long"
-msgstr "Hir"
+msgid "&Public"
+msgstr "&Cyhoeddus"
 
-#. i18n: file ./src/settingswidget.ui line 111
-#: rc.cpp:2291
+#. i18n: file ./languages/ada/addclassdlg.ui line 128
+#: rc.cpp:2126
 #, no-c-format
-msgid "Choose what sort of output you want from the build process"
-msgstr ""
+msgid "P&rotected"
+msgstr "G&warchodir"
 
-#. i18n: file ./src/settingswidget.ui line 117
-#: rc.cpp:2294
+#. i18n: file ./languages/ada/addclassdlg.ui line 136
+#: rc.cpp:2129
 #, no-c-format
-msgid ""
-"KDevelop preprocesses the messages the Messages Output View window receives "
-"during the build processes in order to filter superfluous information. You can "
-"control the level of detail KDevelop will display using the dropdown box in "
-"this field. \n"
-"<b>Very Short</b>  Displays only warnings, errors, and the filenames which are "
-"compiled. \n"
-"<b>Short</b>  Suppresses all compiler flags and formats the output to be more "
-"readable. \n"
-"<b>Full</b>  Displays all output messages unmodified."
-msgstr ""
+msgid "Pri&vate"
+msgstr "Pre&ivat"
 
-#. i18n: file ./src/settingswidget.ui line 127
-#: rc.cpp:2300
+#. i18n: file ./languages/ada/addclassdlg.ui line 146
+#: rc.cpp:2132
 #, no-c-format
-msgid "<qt><h3>Output View Settings</h3></qt>"
-msgstr ""
+msgid "&Final"
+msgstr "&Terfynol"
 
-#. i18n: file ./src/settingswidget.ui line 149
-#: rc.cpp:2303
+#. i18n: file ./languages/ada/addclassdlg.ui line 170
+#: rc.cpp:2135
 #, no-c-format
-msgid "Default pro&jects directory:"
+msgid "&Extends:"
 msgstr ""
 
-#. i18n: file ./src/settingswidget.ui line 163
-#: rc.cpp:2306
+#. i18n: file ./languages/ada/addclassdlg.ui line 202
+#: rc.cpp:2141
 #, no-c-format
-msgid "Set the directory where you want your projects in."
+msgid "&Source path:"
 msgstr ""
 
-#. i18n: file ./src/settingswidget.ui line 166
-#: rc.cpp:2309
+#. i18n: file ./languages/ada/addclassdlg.ui line 227
+#: rc.cpp:2147
 #, no-c-format
-msgid ""
-"By default, KDevelop uses a common parent directory for all new projects. Enter "
-"the absolute path of this common directory in the box or select it from your "
-"directory structure. KDevelop will place the any new project here as a "
-"subdirectory."
+msgid "&Create default constructor"
 msgstr ""
 
-#. i18n: file ./src/settingswidget.ui line 209
-#: rc.cpp:2312
+#. i18n: file ./languages/ada/addclassdlg.ui line 238
+#: rc.cpp:2150
 #, no-c-format
-msgid "Window &font:"
+msgid "Create &main method"
 msgstr ""
 
-#. i18n: file ./src/settingswidget.ui line 261
-#: rc.cpp:2315
-#, fuzzy, no-c-format
-msgid "Use &TDE setting"
-msgstr "Ffeil yn Bodoli"
-
-#. i18n: file ./src/settingswidget.ui line 267
-#: rc.cpp:2318
+#. i18n: file ./languages/ada/addclassdlg.ui line 248
+#: rc.cpp:2153
 #, no-c-format
-msgid "Use the terminal as set in KControl"
-msgstr ""
+msgid "&Documentation"
+msgstr "&Dogfenniaeth"
 
-#. i18n: file ./src/settingswidget.ui line 270
-#: rc.cpp:2321
+#. i18n: file ./languages/ada/addclassdlg.ui line 260
+#: rc.cpp:2156 rc.cpp:3778
 #, no-c-format
-msgid ""
-"If checked, KDevelop will use the default terminal as set in KControl in TDE "
-"components, Component Chooser."
-msgstr ""
+msgid "&License:"
+msgstr "&Trwydded:"
 
-#. i18n: file ./src/settingswidget.ui line 294
-#: rc.cpp:2324
+#. i18n: file ./languages/ada/addclassdlg.ui line 269
+#: rc.cpp:2159
 #, no-c-format
-msgid "&Other:"
-msgstr "&Arall :"
+msgid "LGPL"
+msgstr "LGPL"
 
-#. i18n: file ./src/settingswidget.ui line 297
-#: rc.cpp:2327
+#. i18n: file ./languages/ada/addclassdlg.ui line 274
+#: rc.cpp:2162
 #, no-c-format
-msgid "Set a different terminal than the TDE default one"
-msgstr ""
+msgid "GPL"
+msgstr "GPL"
 
-#. i18n: file ./src/settingswidget.ui line 300
-#: rc.cpp:2330
+#. i18n: file ./languages/ada/addclassdlg.ui line 279
+#: rc.cpp:2165
 #, no-c-format
-msgid "Choose some other terminal different from the default one."
+msgid "QPL"
 msgstr ""
 
-#. i18n: file ./src/settingswidget.ui line 320
-#: rc.cpp:2333
+#. i18n: file ./parts/valgrind/dialog_widget.ui line 24
+#: buildtools/autotools/addicondlg.cpp:45
+#: parts/outputviews/appoutputviewpart.cpp:51 rc.cpp:2177 rc.cpp:8531
 #, no-c-format
-msgid "<qt><h3>Terminal Emulation</h3></qt>"
-msgstr ""
+msgid "Application"
+msgstr "Cymhwysiad"
 
-#. i18n: file ./src/settingswidget.ui line 365
-#: rc.cpp:2336
+#. i18n: file ./parts/valgrind/dialog_widget.ui line 40
+#: rc.cpp:2180 rc.cpp:2799
 #, no-c-format
-msgid ""
-"<qt>"
-"<h3>UI Designer Integration</h3>This will only be used when no project is "
-"opened. For the project specific setting see Project Options/C++ Specific and "
-"open the Qt tab.</qt>"
-msgstr ""
+msgid "&Parameters:"
+msgstr "&Paramedrau:"
 
-#. i18n: file ./src/settingswidget.ui line 410
-#: rc.cpp:2348
+#. i18n: file ./parts/valgrind/dialog_widget.ui line 51
+#: rc.cpp:2183 rc.cpp:2808
 #, no-c-format
-msgid "Run KDevelop's &designer as a separate application"
-msgstr ""
-
-#. i18n: file ./src/settingswidget.ui line 424
-#: rc.cpp:2357
-#, fuzzy, no-c-format
-msgid "Run &Qt Designer"
-msgstr "Dylunydd Qt"
+msgid "&Executable:"
+msgstr "&Gweithredadwyn:"
 
-#. i18n: file ./src/settingswidget.ui line 440
-#: rc.cpp:2366
+#. i18n: file ./parts/valgrind/dialog_widget.ui line 87
+#: rc.cpp:2186 rc.cpp:2204
 #, no-c-format
-msgid "Directory &navigation messages"
+msgid "Valgrind"
 msgstr ""
 
-#. i18n: file ./src/settingswidget.ui line 446
-#: rc.cpp:2372
+#. i18n: file ./parts/valgrind/dialog_widget.ui line 98
+#: rc.cpp:2189
 #, no-c-format
-msgid "Check this if you want to know what directory make is in"
+msgid "Memory &leak check"
 msgstr ""
 
-#. i18n: file ./src/settingswidget.ui line 449
-#: rc.cpp:2375
+#. i18n: file ./parts/valgrind/dialog_widget.ui line 137
+#: rc.cpp:2192
 #, no-c-format
-msgid ""
-"The make tool usually will display messages like “Entering directory”, or "
-"“Leaving directory” when it switches the directories it currently works in. As "
-"this clutters the messages list in the Messages Output View window, KDevelop "
-"suppresses those messages by default. Mark the checkbox if you want to protocol "
-"which directories make worked in."
+msgid "&Show still reachable blocks"
 msgstr ""
 
-#. i18n: file ./src/settingswidget.ui line 497
-#: rc.cpp:2378
-#, fuzzy, no-c-format
-msgid "Force english compiler output"
-msgstr "Crynhoydd"
-
-#. i18n: file ./src/settingswidget.ui line 505
-#: rc.cpp:2381
+#. i18n: file ./parts/valgrind/dialog_widget.ui line 147
+#: rc.cpp:2195 rc.cpp:2213
 #, no-c-format
-msgid "Use kde language and disable \"jump-to-source\" functionality"
+msgid "&Trace children"
 msgstr ""
 
-#. i18n: file ./src/profileengine/editor/profileeditorbase.ui line 16
-#: rc.cpp:2384
+#. i18n: file ./parts/valgrind/dialog_widget.ui line 166
+#: rc.cpp:2198 rc.cpp:2207
 #, no-c-format
-msgid "Profile Editor for The KDevelop Platform"
+msgid "Additional p&arameters:"
 msgstr ""
 
-#. i18n: file ./src/profileengine/editor/profileeditorbase.ui line 63
-#: src/profileengine/editor/profileeditor.cpp:237 rc.cpp:2387 rc.cpp:2462
-#, fuzzy, no-c-format
-msgid "Add Profile"
-msgstr "&Ychwanegu Ffeil..."
-
-#. i18n: file ./src/profileengine/editor/profileeditorbase.ui line 86
-#: buildtools/qmake/projectconfigurationdlg.cpp:1794
-#: kdevdesigner/designer/hierarchyview.cpp:190
-#: lib/widgets/propeditor/propertyeditor.cpp:172
-#: parts/fileview/filegroupswidget.cpp:169 rc.cpp:2390 rc.cpp:2438 rc.cpp:2453
-#: rc.cpp:4486 rc.cpp:5085 rc.cpp:5106 rc.cpp:5241 rc.cpp:5839 rc.cpp:6668
+#. i18n: file ./parts/valgrind/dialog_widget.ui line 187
+#: rc.cpp:2201 rc.cpp:2210 rc.cpp:8570
 #, no-c-format
-msgid "Name"
-msgstr "Enw"
+msgid "E&xecutable:"
+msgstr "G&weithredadwyn:"
 
-#. i18n: file ./src/profileengine/editor/profileeditorbase.ui line 97
-#: parts/filecreate/addglobaldlg.cpp:63 src/languageselectwidget.cpp:83
-#: rc.cpp:2393 rc.cpp:3674 rc.cpp:3698 rc.cpp:3941
+#. i18n: file ./parts/valgrind/dialog_widget.ui line 284
+#: rc.cpp:2216
 #, no-c-format
-msgid "Description"
-msgstr "Disgrifiad"
-
-#. i18n: file ./src/profileengine/editor/profileeditorbase.ui line 132
-#: src/profileengine/editor/profileeditor.cpp:255
-#: src/profileengine/editor/profileeditor.cpp:267 rc.cpp:2396
-#, fuzzy, no-c-format
-msgid "Remove Profile"
-msgstr "Gwaredu ffeil"
-
-#. i18n: file ./src/profileengine/editor/profileeditorbase.ui line 212
-#: rc.cpp:2408
-#, fuzzy, no-c-format
-msgid "Derived properties:"
-msgstr "&Priodweddau :"
+msgid "KCachegrind"
+msgstr "KCachegrind"
 
-#. i18n: file ./src/profileengine/editor/profileeditorbase.ui line 241
-#: rc.cpp:2411
+#. i18n: file ./parts/valgrind/dialog_widget.ui line 300
+#: rc.cpp:2219
 #, fuzzy, no-c-format
-msgid "Own properties:"
-msgstr "&Priodweddau :"
+msgid "Exe&cutable:"
+msgstr "Gweithredadwyn:"
 
-#. i18n: file ./src/profileengine/editor/profileeditorbase.ui line 258
-#: rc.cpp:2414
+#. i18n: file ./parts/replace/replacedlg.ui line 30
+#: rc.cpp:2222
 #, no-c-format
-msgid "Lists of Explicitly Enabled && Disabled Plugins"
+msgid "Project Wide String Replacement"
 msgstr ""
 
-#. i18n: file ./src/profileengine/editor/profileeditorbase.ui line 283
-#: rc.cpp:2417
-#, no-c-format
-msgid "Enabled:"
-msgstr "Alluogir :"
-
-#. i18n: file ./src/profileengine/editor/profileeditorbase.ui line 289
-#: rc.cpp:2420 rc.cpp:2426
-#, fuzzy, no-c-format
-msgid "Plugin Name"
-msgstr "Ategyn"
-
-#. i18n: file ./src/profileengine/editor/profileeditorbase.ui line 323
-#: rc.cpp:2423
+#. i18n: file ./parts/replace/replacedlg.ui line 52
+#: parts/grepview/grepdlg.cpp:127 rc.cpp:2228 rc.cpp:3155
 #, no-c-format
-msgid "Disabled:"
-msgstr "Analluogir :"
+msgid "C&ase sensitive"
+msgstr "Mae llythrennau bach/mawr o &bwys"
 
-#. i18n: file ./src/profileengine/editor/profileeditorbase.ui line 349
-#: rc.cpp:2429 rc.cpp:2432 rc.cpp:6188 rc.cpp:6251
+#. i18n: file ./parts/replace/replacedlg.ui line 80
+#: rc.cpp:2231
 #, no-c-format
-msgid "<-"
+msgid "All s&ubstrings"
 msgstr ""
 
-#. i18n: file ./src/profileengine/editor/profileeditorbase.ui line 430
-#: rc.cpp:2435
-#, fuzzy, no-c-format
-msgid "Available plugins:"
-msgstr "&Gweithredoedd ar gael:"
-
-#. i18n: file ./src/profileengine/editor/profileeditorbase.ui line 447
-#: rc.cpp:2441 rc.cpp:2456
+#. i18n: file ./parts/replace/replacedlg.ui line 91
+#: rc.cpp:2234
 #, fuzzy, no-c-format
-msgid "Generic Name"
-msgstr "&Creu"
+msgid "Whole words onl&y"
+msgstr "D&im ond geiriau cyfan"
 
-#. i18n: file ./src/profileengine/editor/profileeditorbase.ui line 489
-#: rc.cpp:2444 rc.cpp:2447 rc.cpp:6191 rc.cpp:6254
+#. i18n: file ./parts/replace/replacedlg.ui line 107
+#: rc.cpp:2237
 #, no-c-format
-msgid "->"
-msgstr ""
+msgid "Regular e&xpression:"
+msgstr "Mynegiad &rheolaidd :"
 
-#. i18n: file ./src/profileengine/editor/profileeditorbase.ui line 507
-#: rc.cpp:2450
+#. i18n: file ./parts/replace/replacedlg.ui line 110
+#: rc.cpp:2240
 #, no-c-format
-msgid "List of Plugins to Be Loaded"
+msgid "Use regexp to specify target"
 msgstr ""
 
-#. i18n: file ./src/profileengine/editor/addprofilewidget.ui line 73
-#: rc.cpp:2468
+#. i18n: file ./parts/replace/replacedlg.ui line 121
+#: rc.cpp:2243
 #, fuzzy, no-c-format
-msgid "&Generic name:"
-msgstr "&Creu"
-
-#. i18n: file ./src/profileengine/editor/addprofilewidget.ui line 105
-#: rc.cpp:2471 rc.cpp:3462 rc.cpp:3965
-#, no-c-format
-msgid "&Description:"
-msgstr "&Disgrifiad:"
+msgid "E&dit"
+msgstr "Golygydd"
 
-#. i18n: file ./vcs/clearcase/integrator/ccintegratordlgbase.ui line 24
-#: rc.cpp:2474 rc.cpp:3126
+#. i18n: file ./parts/replace/replacedlg.ui line 124
+#: rc.cpp:2246
 #, no-c-format
-msgid "No options available for this VCS."
+msgid "Opens the regexp editor. Only enabled if installed."
 msgstr ""
 
-#. i18n: file ./vcs/subversion/subversionprojectwidget.ui line 16
-#: rc.cpp:2477
+#. i18n: file ./parts/replace/replacedlg.ui line 139
+#: rc.cpp:2249
 #, no-c-format
-msgid "New Subversion Project"
+msgid "Enter the regexp here"
 msgstr ""
 
-#. i18n: file ./vcs/subversion/subversionprojectwidget.ui line 35
-#: rc.cpp:2480
+#. i18n: file ./parts/replace/replacedlg.ui line 149
+#: rc.cpp:2252
 #, no-c-format
-msgid "&Import address:"
+msgid "Target Files in Project"
 msgstr ""
 
-#. i18n: file ./vcs/subversion/subversionprojectwidget.ui line 53
-#: rc.cpp:2483
+#. i18n: file ./parts/replace/replacedlg.ui line 160
+#: rc.cpp:2255
 #, no-c-format
-msgid "Create &Standard Directories (tags/trunk/branches/)?"
-msgstr ""
+msgid "A&ll files"
+msgstr "P&ob Ffeil"
 
-#. i18n: file ./vcs/subversion/svn_logviewoptiondlgbase.ui line 16
-#: vcs/subversion/subversion_core.cpp:300 rc.cpp:2492
+#. i18n: file ./parts/replace/replacedlg.ui line 166
+#: rc.cpp:2258
 #, no-c-format
-msgid "Subversion Log View"
+msgid "All files in the project will be considered."
 msgstr ""
 
-#. i18n: file ./vcs/subversion/svn_logviewoptiondlgbase.ui line 35
-#: rc.cpp:2498
+#. i18n: file ./parts/replace/replacedlg.ui line 174
+#: rc.cpp:2261
 #, no-c-format
-msgid "Do not show logs before branching point"
+msgid "&Open files only"
 msgstr ""
 
-#. i18n: file ./vcs/subversion/svn_logviewoptiondlgbase.ui line 46
-#: rc.cpp:2501
+#. i18n: file ./parts/replace/replacedlg.ui line 177
+#: rc.cpp:2264
 #, no-c-format
-msgid "End Revision"
+msgid "Only open project files will be considered."
 msgstr ""
 
-#. i18n: file ./vcs/subversion/svn_logviewoptiondlgbase.ui line 57
-#: rc.cpp:2504 rc.cpp:2516
+#. i18n: file ./parts/replace/replacedlg.ui line 185
+#: rc.cpp:2267
 #, no-c-format
-msgid "&By Revision Number"
+msgid "Files under &path:"
 msgstr ""
 
-#. i18n: file ./vcs/subversion/svn_logviewoptiondlgbase.ui line 65
-#: rc.cpp:2507 rc.cpp:2519
+#. i18n: file ./parts/replace/replacedlg.ui line 188
+#: rc.cpp:2270
 #, no-c-format
-msgid "B&y Revision Specifier"
+msgid "Only project files in this dir and its subdirs will be considered."
 msgstr ""
 
-#. i18n: file ./vcs/subversion/svn_logviewoptiondlgbase.ui line 88
-#: rc.cpp:2510 rc.cpp:2700 rc.cpp:4507
+#. i18n: file ./parts/replace/replacedlg.ui line 219
+#: rc.cpp:2273
 #, no-c-format
-msgid "C&ancel"
+msgid "Expression is invalid."
 msgstr ""
 
-#. i18n: file ./vcs/subversion/svn_logviewoptiondlgbase.ui line 96
-#: rc.cpp:2513
-#, fuzzy, no-c-format
-msgid "Start Revision"
-msgstr "Dechrau chwilio"
-
-#. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 16
-#: rc.cpp:2522
-#, fuzzy, no-c-format
-msgid "Subversion Merge"
-msgstr "Fersiwn %1"
-
-#. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 27
-#: rc.cpp:2525 rc.cpp:2718
-#, fuzzy, no-c-format
-msgid "Destination"
-msgstr "Disgrifiad"
-
-#. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 38
-#: rc.cpp:2528
-#, fuzzy, no-c-format
-msgid "Destination working path"
-msgstr "Disgrifiad"
-
-#. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 53
-#: rc.cpp:2531
-#, fuzzy, no-c-format
-msgid "Source 1"
-msgstr "Tarddiad"
-
-#. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 80
-#: rc.cpp:2534 rc.cpp:2561
+#. i18n: file ./parts/replace/replacedlg.ui line 244
+#: rc.cpp:2276
 #, fuzzy, no-c-format
-msgid "Number:"
-msgstr "Enw:"
-
-#. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 91
-#: rc.cpp:2537 rc.cpp:2564
-#, no-c-format
-msgid "Keyword:"
-msgstr ""
+msgid "Fi&nd"
+msgstr "Canfod:"
 
-#. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 97
-#: rc.cpp:2540 rc.cpp:2570 rc.cpp:2652 rc.cpp:2736
+#. i18n: file ./parts/replace/replacedlg.ui line 250
+#: rc.cpp:2279
 #, no-c-format
-msgid "HEAD"
+msgid "Start looking for possible replacement targets."
 msgstr ""
 
-#. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 102
-#: rc.cpp:2543 rc.cpp:2573 rc.cpp:2739
+#. i18n: file ./parts/replace/replacedlg.ui line 268
+#: rc.cpp:2285
 #, no-c-format
-msgid "BASE"
+msgid "Strings"
 msgstr ""
 
-#. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 107
-#: rc.cpp:2546 rc.cpp:2576
+#. i18n: file ./parts/replace/replacedlg.ui line 279
+#: rc.cpp:2288
 #, no-c-format
-msgid "COMMITTED"
-msgstr ""
+msgid "&Text to find:"
+msgstr "&Testun i ganfod:"
 
-#. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 112
-#: rc.cpp:2549 rc.cpp:2579
+#. i18n: file ./parts/replace/replacedlg.ui line 290
+#: rc.cpp:2291
 #, no-c-format
-msgid "PREV"
+msgid "Target string"
 msgstr ""
 
-#. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 143
-#: rc.cpp:2552 rc.cpp:2582
+#. i18n: file ./parts/replace/replacedlg.ui line 298
+#: rc.cpp:2294
 #, no-c-format
-msgid "Source URL or working path:"
-msgstr ""
+msgid "&Replacement text:"
+msgstr "&Testun amnewid:"
 
-#. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 151
-#: rc.cpp:2555 rc.cpp:2567
+#. i18n: file ./parts/replace/replacedlg.ui line 309
+#: rc.cpp:2297
 #, no-c-format
-msgid "Specify revision as"
+msgid "The replacement string"
 msgstr ""
 
-#. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 161
-#: rc.cpp:2558
-#, fuzzy, no-c-format
-msgid "Source 2"
-msgstr "Tarddiad"
-
-#. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 302
-#: rc.cpp:2591
+#. i18n: file ./parts/vcsmanager/vcsmanagerprojectconfigbase.ui line 27
+#: rc.cpp:2300
 #, no-c-format
-msgid "--force (Force to delete locally modified or unversioned items.)"
+msgid "Version control system to use for this project:"
 msgstr ""
 
-#. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 310
-#: rc.cpp:2594
-#, fuzzy, no-c-format
-msgid "--non-recursive"
-msgstr "&Ymgylchol"
-
-#. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 318
-#: rc.cpp:2597
+#. i18n: file ./parts/bookmarks/bookmarks_settings_base.ui line 24
+#: rc.cpp:2303
 #, no-c-format
-msgid "--ignore-ancestry"
+msgid "Code Tooltip"
 msgstr ""
 
-#. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 335
-#: rc.cpp:2600
+#. i18n: file ./parts/bookmarks/bookmarks_settings_base.ui line 27
+#: rc.cpp:2306
 #, no-c-format
 msgid ""
-"--dry-run (Only receive full result notification\n"
-"                without actually modifying working copy)"
-msgstr ""
-
-#. i18n: file ./vcs/subversion/svn_switchdlgbase.ui line 16
-#: rc.cpp:2604
-#, no-c-format
-msgid "Subversion Switch"
-msgstr ""
-
-#. i18n: file ./vcs/subversion/svn_switchdlgbase.ui line 27
-#: rc.cpp:2607
-#, no-c-format
-msgid "Non-recursive. (Switch its immediate children only)"
+"If checked, a tooltip will be shown when the mouse is over the bookmark, "
+"containing the text in the area surrounding it. "
+"<p> How many surrounding lines to include is decided by the value in the "
+"context box."
 msgstr ""
 
-#. i18n: file ./vcs/subversion/svn_switchdlgbase.ui line 108
-#: rc.cpp:2616
-#, fuzzy, no-c-format
-msgid "Current Repository URL"
-msgstr "Adfer lleolia&dau:"
-
-#. i18n: file ./vcs/subversion/svn_switchdlgbase.ui line 124
-#: rc.cpp:2619
-#, fuzzy, no-c-format
-msgid "Working copy to switch"
-msgstr "Cyfeiriadur:"
-
-#. i18n: file ./vcs/subversion/svn_switchdlgbase.ui line 140
-#: rc.cpp:2622
-#, fuzzy, no-c-format
-msgid "Working Mode"
-msgstr "Cyfeiriadur:"
-
-#. i18n: file ./vcs/subversion/svn_switchdlgbase.ui line 151
-#: rc.cpp:2625
+#. i18n: file ./parts/bookmarks/bookmarks_settings_base.ui line 38
+#: rc.cpp:2309
 #, no-c-format
-msgid "svn switch"
+msgid "Show code &tooltip"
 msgstr ""
 
-#. i18n: file ./vcs/subversion/svn_switchdlgbase.ui line 159
-#: rc.cpp:2628
-#, fuzzy, no-c-format
-msgid "svn switch --relocation"
-msgstr "Adfer lleolia&dau:"
-
-#. i18n: file ./vcs/subversion/svn_switchdlgbase.ui line 169
-#: rc.cpp:2631
-#, fuzzy, no-c-format
-msgid "New destination URL"
-msgstr "Cyrchfan:"
-
-#. i18n: file ./vcs/subversion/subversiondiff.ui line 16
-#: rc.cpp:2634
+#. i18n: file ./parts/bookmarks/bookmarks_settings_base.ui line 63
+#: rc.cpp:2312
 #, no-c-format
-msgid "Subversion Diff"
+msgid "&Lines of context:"
 msgstr ""
 
-#. i18n: file ./vcs/subversion/svn_co.ui line 24
-#: rc.cpp:2640
+#. i18n: file ./parts/bookmarks/bookmarks_settings_base.ui line 115
+#: rc.cpp:2315
 #, no-c-format
-msgid "Subversion Module Checkout"
+msgid "Show Bookmarked Codeline in Bookmark Panel"
 msgstr ""
 
-#. i18n: file ./vcs/subversion/svn_co.ui line 43
-#: rc.cpp:2643
-#, no-c-format
-msgid "Server Settings"
-msgstr "Gosodiadau Gweinydd"
-
-#. i18n: file ./vcs/subversion/svn_co.ui line 62
-#: rc.cpp:2646
+#. i18n: file ./parts/bookmarks/bookmarks_settings_base.ui line 118
+#: rc.cpp:2318
 #, no-c-format
-msgid "Checkout &from:"
+msgid ""
+"This decides if the bookmark panel should show the content of the bookmarked "
+"line in addition to the line number."
+"<p>This can be made optional depending on the start of the line, typically used "
+"for only showing lines containing a comment."
 msgstr ""
 
-#. i18n: file ./vcs/subversion/svn_co.ui line 96
-#: rc.cpp:2649
+#. i18n: file ./parts/bookmarks/bookmarks_settings_base.ui line 129
+#: rc.cpp:2321
 #, no-c-format
-msgid "&Revision:"
-msgstr ""
+msgid "&Never"
+msgstr "&Byth"
 
-#. i18n: file ./vcs/subversion/svn_co.ui line 131
-#: rc.cpp:2655
+#. i18n: file ./parts/bookmarks/bookmarks_settings_base.ui line 151
+#: rc.cpp:2324
 #, no-c-format
-msgid "This Project has Standard &Trunk/Branches/Tags/Directories"
+msgid "&Only lines beginning with the following string:"
 msgstr ""
 
-#. i18n: file ./vcs/subversion/svn_co.ui line 186
-#: rc.cpp:2664
+#. i18n: file ./parts/bookmarks/bookmarks_settings_base.ui line 189
+#: rc.cpp:2327
 #, no-c-format
-msgid "Local Directory"
-msgstr ""
+msgid "&Always"
+msgstr "&Bob tro"
 
-#. i18n: file ./vcs/subversion/svn_co.ui line 205
-#: rc.cpp:2667
+#. i18n: file ./parts/bookmarks/bookmarks_settings_base.ui line 192
+#: rc.cpp:2330
 #, no-c-format
-msgid "C&heckout in:"
+msgid "Always show the bookmarked line in addition to the line number"
 msgstr ""
 
-#. i18n: file ./vcs/subversion/svn_co.ui line 239
-#: rc.cpp:2670
+#. i18n: file ./parts/documentation/find_documentationbase.ui line 25
+#: parts/documentation/documentation_part.cpp:247 rc.cpp:2333
 #, no-c-format
-msgid "&Name of the newly created directory:"
+msgid "Find Documentation"
 msgstr ""
 
-#. i18n: file ./vcs/subversion/commitdlgbase.ui line 16
-#: rc.cpp:2679
-#, fuzzy, no-c-format
-msgid "Log Message"
-msgstr "Neges"
-
-#. i18n: file ./vcs/subversion/commitdlgbase.ui line 81
-#: rc.cpp:2685 rc.cpp:5434
+#. i18n: file ./parts/documentation/find_documentationbase.ui line 36
+#: rc.cpp:2336
 #, no-c-format
-msgid "Ca&ncel"
+msgid "Search term:"
 msgstr ""
 
-#. i18n: file ./vcs/subversion/svn_commitdlgbase.ui line 36
-#: kdevdesigner/designer/iconvieweditorimpl.cpp:63
-#: kdevdesigner/designer/listboxeditorimpl.cpp:89
-#: kdevdesigner/designer/widgetfactory.cpp:740
-#: kdevdesigner/designer/widgetfactory.cpp:767
-#: kdevdesigner/designer/widgetfactory.cpp:776 rc.cpp:2691 rc.cpp:5304
-#, no-c-format
-msgid "New Item"
-msgstr "Eitem Newydd"
-
-#. i18n: file ./vcs/subversion/svn_commitdlgbase.ui line 71
-#: rc.cpp:2694
+#. i18n: file ./parts/documentation/find_documentationbase.ui line 44
+#: parts/documentation/docconfiglistview.cpp:32
+#: parts/documentation/documentation_widget.cpp:62
+#: parts/documentation/docutils.cpp:90 parts/doxygen/messages.cpp:276
+#: rc.cpp:2339
 #, no-c-format
-msgid "Keep Locks"
-msgstr ""
-
-#. i18n: file ./vcs/subversion/svn_commitdlgbase.ui line 108
-#: rc.cpp:2703
-#, fuzzy, no-c-format
-msgid "Recursive"
-msgstr "&Ymgylchol"
+msgid "Search"
+msgstr "Chwilio"
 
-#. i18n: file ./vcs/subversion/svnssltrustpromptbase.ui line 16
-#: rc.cpp:2706
+#. i18n: file ./parts/documentation/find_documentation_optionsbase.ui line 16
+#: rc.cpp:2345
 #, no-c-format
-msgid "SSL Certificate Trust"
+msgid "Find Documentation Options"
 msgstr ""
 
-#. i18n: file ./vcs/subversion/svn_copydlgwidget.ui line 16
-#: rc.cpp:2709
-#, fuzzy, no-c-format
-msgid "Subversion Copy"
-msgstr "Fersiwn %1"
-
-#. i18n: file ./vcs/subversion/svn_copydlgwidget.ui line 84
-#: rc.cpp:2721
+#. i18n: file ./parts/documentation/find_documentation_optionsbase.ui line 109
+#: rc.cpp:2354
 #, no-c-format
-msgid "Specify either the full repository URL or local working path"
+msgid "Go to first match"
 msgstr ""
 
-#. i18n: file ./vcs/subversion/svn_copydlgwidget.ui line 94
-#: rc.cpp:2724
+#. i18n: file ./parts/documentation/find_documentation_optionsbase.ui line 182
+#: rc.cpp:2363
 #, no-c-format
-msgid "Requested Local Path"
+msgid ""
+"You can enable and disable search\n"
+"sources and change their priority here."
 msgstr ""
 
-#. i18n: file ./vcs/subversion/svn_copydlgwidget.ui line 102
-#: rc.cpp:2727
-#, fuzzy, no-c-format
-msgid "Source Revision"
-msgstr "Dechrau chwilio"
-
-#. i18n: file ./vcs/subversion/svn_copydlgwidget.ui line 129
-#: rc.cpp:2730
+#. i18n: file ./parts/documentation/docprojectconfigwidgetbase.ui line 41
+#: parts/documentation/interfaces/kdevdocumentationplugin.cpp:688 rc.cpp:2367
 #, no-c-format
-msgid "Specify by number:"
+msgid "Project API Documentation"
 msgstr ""
 
-#. i18n: file ./vcs/subversion/svn_copydlgwidget.ui line 137
-#: rc.cpp:2733
+#. i18n: file ./parts/documentation/docprojectconfigwidgetbase.ui line 60
+#: rc.cpp:2370
 #, no-c-format
-msgid "Specify by keyword:"
+msgid "Ca&talog location:"
 msgstr ""
 
-#. i18n: file ./vcs/subversion/svn_copydlgwidget.ui line 153
-#: rc.cpp:2742
+#. i18n: file ./parts/documentation/docprojectconfigwidgetbase.ui line 85
+#: rc.cpp:2373
 #, no-c-format
-msgid "WORKING"
+msgid "C&ollection type:"
 msgstr ""
 
-#. i18n: file ./vcs/subversion/svn_copydlgwidget.ui line 178
-#: kdevdesigner/designer/mainwindowactions.cpp:206 rc.cpp:2745
-#, no-c-format
-msgid "Source"
-msgstr "Tarddiad"
-
-#. i18n: file ./vcs/subversion/svn_copydlgwidget.ui line 197
-#: rc.cpp:2748
+#. i18n: file ./parts/documentation/docprojectconfigwidgetbase.ui line 103
+#: parts/documentation/interfaces/kdevdocumentationplugin.cpp:689 rc.cpp:2376
 #, no-c-format
-msgid "Specify by the repository URL of this item"
+msgid "Project User Manual"
 msgstr ""
 
-#. i18n: file ./vcs/subversion/svn_copydlgwidget.ui line 205
-#: rc.cpp:2751
+#. i18n: file ./parts/documentation/docprojectconfigwidgetbase.ui line 114
+#: rc.cpp:2379 rc.cpp:2391 rc.cpp:2430 rc.cpp:2982
 #, no-c-format
-msgid "Specify by local path of this item"
-msgstr ""
-
-#. i18n: file ./vcs/subversion/integrator/svnintegratordlgbase.ui line 55
-#: rc.cpp:2754
-#, fuzzy, no-c-format
-msgid "&Do not do anything"
-msgstr "Ychwanegwch rywbeth yma"
+msgid "&Location:"
+msgstr "&Lleoliad:"
 
-#. i18n: file ./vcs/subversion/integrator/svnintegratordlgbase.ui line 65
-#: rc.cpp:2757 rc.cpp:2764
+#. i18n: file ./parts/documentation/editcatalogdlgbase.ui line 19
+#: rc.cpp:2382 rc.cpp:2409
 #, no-c-format
-msgid ""
-"Adds subversion menus to project.\n"
-"\n"
-"NOTE: Unless you import the project\n"
-"out of tdevelop, you will not be able\n"
-"to perform any subversion operations."
+msgid "Documentation Catalog Properties"
 msgstr ""
 
-#. i18n: file ./vcs/subversion/integrator/svnintegratordlgbase.ui line 80
-#: rc.cpp:2771
+#. i18n: file ./parts/documentation/editcatalogdlgbase.ui line 141
+#: parts/fileview/addfilegroupdlg.cpp:26 rc.cpp:2394 rc.cpp:2418
 #, no-c-format
-msgid ""
-"&Create a project tree and import new project into trunk, then checkout from "
-"the repository"
-msgstr ""
+msgid "&Title:"
+msgstr "&Teitl:"
 
-#. i18n: file ./vcs/subversion/integrator/svnintegratordlgbase.ui line 87
-#: rc.cpp:2774 rc.cpp:2781
+#. i18n: file ./parts/documentation/selecttopicbase.ui line 16
+#: rc.cpp:2397
 #, no-c-format
-msgid ""
-"Creates project, imports it into the subversion\n"
-"repository and checks it out as a working copy.\n"
-"\n"
-"NOTE: The repository has to exist.\n"
-"eg. been created with 'svnadmin'"
+msgid "Choose Topic"
 msgstr ""
 
-#. i18n: file ./vcs/subversion/integrator/svnintegratordlgbase.ui line 103
-#: rc.cpp:2788
+#. i18n: file ./parts/documentation/selecttopicbase.ui line 94
+#: rc.cpp:2406
 #, no-c-format
-msgid ""
-"Example for the url (if /home/user/subversion is the subversion repository):\n"
-"file:///home/user/subversion/mynewproject"
+msgid "Choose a topic for <b>%1</b>:"
 msgstr ""
 
-#. i18n: file ./vcs/subversion/integrator/svnintegratordlgbase.ui line 122
-#: rc.cpp:2792
-#, fuzzy, no-c-format
-msgid "Repository:"
-msgstr "&Adfer"
-
-#. i18n: file ./vcs/subversion/integrator/svnintegratordlgbase.ui line 135
-#: rc.cpp:2795
+#. i18n: file ./parts/documentation/addcatalogdlgbase.ui line 43
+#: rc.cpp:2412
 #, no-c-format
-msgid ""
-"Subversion repository location.\n"
-"The repository has to exist -\n"
-"eg. been created with 'svnadmin'"
-msgstr ""
+msgid "Type:"
+msgstr "Math:"
 
-#. i18n: file ./vcs/subversion/integrator/svnintegratordlgbase.ui line 144
-#: rc.cpp:2800
+#. i18n: file ./parts/documentation/addcatalogdlgbase.ui line 73
+#: rc.cpp:2415
 #, no-c-format
-msgid ""
-"Subversion repository location. This should include the subdirectory for the "
-"project in the repository. The project subdirectory and further subdirectories "
-"will be created. \n"
-"\n"
-"So for example if you give http://localhost/svn/projectname the following "
-"directories will be created and the project imported into the trunk "
-"subdirectory:\n"
-"http://localhost/svn/projectname\n"
-"http://localhost/svn/projectname/tags\n"
-"http://localhost/svn/projectname/branches\n"
-"http://localhost/svn/projectname/trunk"
-msgstr ""
+msgid "Locatio&n:"
+msgstr "Lleolia&d:"
 
-#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 17
-#: rc.cpp:2809
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 16
+#: parts/documentation/bookmarkview.cpp:49
+#: parts/documentation/documentation_part.cpp:87
+#: parts/documentation/documentation_part.cpp:97
+#: parts/documentation/documentation_part.cpp:105
+#: parts/documentation/docutils.cpp:79 rc.cpp:2439
 #, no-c-format
-msgid "This form allows you to create a CVS repository for your new project"
-msgstr ""
+msgid "Documentation"
+msgstr "Dogfenniaeth"
 
-#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 34
-#: rc.cpp:2812
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 34
+#: rc.cpp:2442
 #, no-c-format
-msgid "Release &tag:"
+msgid "&Documentation Collections"
 msgstr ""
 
-#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 45
-#: rc.cpp:2815
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 82
+#: rc.cpp:2448 rc.cpp:3973 rc.cpp:8435 rc.cpp:8645 rc.cpp:8675
 #, no-c-format
-msgid "Enter the name of the repository"
-msgstr ""
+msgid "&Edit..."
+msgstr "&Golygu..."
 
-#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 49
-#: rc.cpp:2818
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 119
+#: rc.cpp:2454
 #, no-c-format
-msgid ""
-"CVS Repository name goes here.\n"
-"Most of the thime you'll just reuse the project name"
+msgid "Full Text &Search"
 msgstr ""
 
-#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 57
-#: rc.cpp:2822 rc.cpp:3078
-#, no-c-format
-msgid "vendor"
-msgstr "gwerthwr"
-
-#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 60
-#: rc.cpp:2825
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 155
+#: rc.cpp:2457
 #, no-c-format
-msgid "Enter the vendor name"
+msgid "htse&arch executable:"
 msgstr ""
 
-#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 68
-#: rc.cpp:2828
-#, no-c-format
-msgid "&Message:"
-msgstr "&Neges:"
-
-#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 79
-#: rc.cpp:2831 rc.cpp:2943 rc.cpp:3123
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 207
+#: rc.cpp:2460
 #, no-c-format
-msgid "&Module:"
+msgid "htdi&g executable:"
 msgstr ""
 
-#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 90
-#: rc.cpp:2834 rc.cpp:3090
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 226
+#: rc.cpp:2463
 #, no-c-format
-msgid "&Vendor tag:"
+msgid "Database di&rectory:"
 msgstr ""
 
-#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 101
-#: rc.cpp:2837
-#, no-c-format
-msgid "new project"
-msgstr "cywaith Newydd"
-
-#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 104
-#: rc.cpp:2840
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 237
+#: rc.cpp:2466
 #, no-c-format
-msgid "Repository creation message"
+msgid "ht&merge executable:"
 msgstr ""
 
-#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 112
-#: rc.cpp:2843 rc.cpp:3105
-#, no-c-format
-msgid "start"
-msgstr "dechrau"
-
-#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 115
-#: rc.cpp:2846
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 252
+#: rc.cpp:2469
 #, no-c-format
-msgid "Tag that will be associated with initial state"
-msgstr ""
+msgid "O&ther"
+msgstr "A&rall"
 
-#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 129
-#: rc.cpp:2849
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 280
+#: rc.cpp:2472
 #, no-c-format
-msgid "&Server path:"
+msgid "Editor Context Menu Items"
 msgstr ""
 
-#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 140
-#: rc.cpp:2852
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 291
+#: rc.cpp:2475
 #, no-c-format
-msgid "Enter your CVS Root location"
+msgid "&Find in documentation"
 msgstr ""
 
-#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 144
-#: rc.cpp:2855
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 299
+#: rc.cpp:2478
 #, no-c-format
-msgid ""
-"CVS Root location goes here, for example:"
-"<ul>\n"
-"<li>/home/cvsroot or</li>"
-"<li>:pserver:me@localhost:/home/cvs</li></ul>"
+msgid "&Look in documentation index"
 msgstr ""
 
-#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 158
-#: rc.cpp:2859
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 307
+#: rc.cpp:2481
 #, no-c-format
-msgid "CVS_&RSH:"
+msgid "S&earch in documentation"
 msgstr ""
 
-#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 172
-#: rc.cpp:2862
-#, no-c-format
-msgid "ssh"
-msgstr "ssh"
-
-#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 184
-#: rc.cpp:2865
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 315
+#: rc.cpp:2484
 #, no-c-format
-msgid "Init &root"
+msgid "Goto &infopage"
 msgstr ""
 
-#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 187
-#: rc.cpp:2868
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 323
+#: rc.cpp:2487
 #, no-c-format
-msgid "Check if you defined a new CVS Root"
+msgid "Goto &manpage"
 msgstr ""
 
-#. i18n: file ./vcs/cvsservice/commitdialogbase.ui line 16
-#: rc.cpp:2871
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 333
+#: rc.cpp:2490
 #, no-c-format
-msgid "Commit to Repository"
+msgid "Use TDevelop &Assistant to browse documentation"
 msgstr ""
 
-#. i18n: file ./vcs/cvsservice/commitdialogbase.ui line 30
-#: rc.cpp:2874
-#, no-c-format
-msgid "&Message"
-msgstr "&Neges"
-
-#. i18n: file ./vcs/cvsservice/commitdialogbase.ui line 56
-#: rc.cpp:2877
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 341
+#: rc.cpp:2493
 #, no-c-format
-msgid "&Add to changelog:"
+msgid "Fonts && Sizes"
 msgstr ""
 
-#. i18n: file ./vcs/cvsservice/commitdialogbase.ui line 67
-#: rc.cpp:2880
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 360
+#: rc.cpp:2496
 #, no-c-format
-msgid "Change log filename path (relative to project directory)"
-msgstr ""
+msgid "Sta&ndard font:"
+msgstr "Wyn&ebfath safonol: "
 
-#. i18n: file ./vcs/cvsservice/commitdialogbase.ui line 70
-#: rc.cpp:2883
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 389
+#: rc.cpp:2499
 #, no-c-format
-msgid ""
-"<b>Changelog filename path</b>"
-"<br/>Insert here the Changelog filename you wish to use so that the message is "
-"appended"
-msgstr ""
+msgid "Fi&xed font:"
+msgstr "Wy&nebfath gosodedig:"
 
-#. i18n: file ./vcs/cvsservice/releaseinputdialogbase.ui line 16
-#: rc.cpp:2892
-#, no-c-format
-msgid "Update/Revert to Release/Branch/Date"
-msgstr ""
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 408
+#: rc.cpp:2502
+#, fuzzy, no-c-format
+msgid "&Zoom factor:"
+msgstr "&Edrych am:"
 
-#. i18n: file ./vcs/cvsservice/releaseinputdialogbase.ui line 38
-#: rc.cpp:2895
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 417
+#: rc.cpp:2505
 #, no-c-format
-msgid "Revision"
-msgstr ""
+msgid "20"
+msgstr "20"
 
-#. i18n: file ./vcs/cvsservice/releaseinputdialogbase.ui line 52
-#: rc.cpp:2898
-#, no-c-format
-msgid "&Most recent from current branch"
-msgstr ""
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 422
+#: rc.cpp:2508
+#, fuzzy, no-c-format
+msgid "40"
+msgstr "4"
 
-#. i18n: file ./vcs/cvsservice/releaseinputdialogbase.ui line 71
-#: rc.cpp:2901
-#, no-c-format
-msgid "An arbitrary &revision/tag/branch:"
-msgstr ""
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 427
+#: rc.cpp:2511
+#, fuzzy, no-c-format
+msgid "60"
+msgstr "0"
 
-#. i18n: file ./vcs/cvsservice/releaseinputdialogbase.ui line 85
-#: rc.cpp:2904
-#, no-c-format
-msgid "Type your release name here (leave empty for HEAD)"
-msgstr ""
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 432
+#: rc.cpp:2514
+#, fuzzy, no-c-format
+msgid "80"
+msgstr "0"
 
-#. i18n: file ./vcs/cvsservice/releaseinputdialogbase.ui line 88
-#: rc.cpp:2907
-#, no-c-format
-msgid ""
-"Fill the field with the release or branch name (e.g. <i>"
-"make_it_cool, tdevelop_alpha5, ...</i>)"
-msgstr ""
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 437
+#: rc.cpp:2517
+#, fuzzy, no-c-format
+msgid "90"
+msgstr "0"
 
-#. i18n: file ./vcs/cvsservice/releaseinputdialogbase.ui line 106
-#: rc.cpp:2910
-#, no-c-format
-msgid "An arbitrary &date:"
-msgstr ""
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 442
+#: rc.cpp:2520
+#, fuzzy, no-c-format
+msgid "95"
+msgstr "5"
 
-#. i18n: file ./vcs/cvsservice/releaseinputdialogbase.ui line 117
-#: rc.cpp:2913
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 447
+#: rc.cpp:2523
 #, no-c-format
-msgid "FIll the field with a date (e.g. <i>20030204</i>)"
-msgstr ""
+msgid "100"
+msgstr "100"
 
-#. i18n: file ./vcs/cvsservice/releaseinputdialogbase.ui line 129
-#: rc.cpp:2916
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 452
+#: rc.cpp:2526
 #, no-c-format
-msgid "Additional Options"
+msgid "105"
 msgstr ""
 
-#. i18n: file ./vcs/cvsservice/releaseinputdialogbase.ui line 140
-#: rc.cpp:2919
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 457
+#: rc.cpp:2529
 #, no-c-format
-msgid "&Enforce even if the file has been locally modified (revert)"
+msgid "110"
 msgstr ""
 
-#. i18n: file ./vcs/cvsservice/checkoutdialogbase.ui line 24
-#: rc.cpp:2928
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 462
+#: rc.cpp:2532
 #, no-c-format
-msgid "CVS Server Configuration"
+msgid "120"
 msgstr ""
 
-#. i18n: file ./vcs/cvsservice/checkoutdialogbase.ui line 46
-#: rc.cpp:2934
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 467
+#: rc.cpp:2535
 #, no-c-format
-msgid "&Local destination directory:"
+msgid "140"
 msgstr ""
 
-#. i18n: file ./vcs/cvsservice/checkoutdialogbase.ui line 86
-#: rc.cpp:2937
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 472
+#: rc.cpp:2538
 #, no-c-format
-msgid "&Server path (e.g. :pserver:marios@cvs.kde.org:/home/kde):"
+msgid "160"
 msgstr ""
 
-#. i18n: file ./vcs/cvsservice/checkoutdialogbase.ui line 101
-#: rc.cpp:2940
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 477
+#: rc.cpp:2541
 #, no-c-format
-msgid "Select Module"
+msgid "180"
 msgstr ""
 
-#. i18n: file ./vcs/cvsservice/checkoutdialogbase.ui line 156
-#: rc.cpp:2946
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 482
+#: rc.cpp:2544
 #, no-c-format
-msgid "&Tag/branch:"
+msgid "200"
 msgstr ""
 
-#. i18n: file ./vcs/cvsservice/checkoutdialogbase.ui line 195
-#: rc.cpp:2949
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 487
+#: rc.cpp:2547
 #, no-c-format
-msgid "&Prune directories"
+msgid "250"
 msgstr ""
 
-#. i18n: file ./vcs/cvsservice/checkoutdialogbase.ui line 201
-#: rc.cpp:2952
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 492
+#: rc.cpp:2550
 #, no-c-format
-msgid "Creates subdirs if needed"
+msgid "300"
 msgstr ""
 
-#. i18n: file ./vcs/cvsservice/checkoutdialogbase.ui line 207
-#: rc.cpp:2955
-#, no-c-format
-msgid "Module"
-msgstr "Modiwl"
-
-#. i18n: file ./vcs/cvsservice/checkoutdialogbase.ui line 218
-#: rc.cpp:2958
+#. i18n: file ./parts/ctags2/ctags2_widgetbase.ui line 28
+#: rc.cpp:2553
 #, no-c-format
-msgid "Real Path"
+msgid "Tag"
 msgstr ""
 
-#. i18n: file ./vcs/cvsservice/checkoutdialogbase.ui line 277
-#: rc.cpp:2961
+#. i18n: file ./parts/ctags2/ctags2_widgetbase.ui line 69
+#: rc.cpp:2562
 #, no-c-format
-msgid "&Fetch Modules List"
+msgid ""
+"Result view for a tag lookup. Click a line to go to the corresponding place in "
+"the code."
 msgstr ""
 
-#. i18n: file ./vcs/cvsservice/checkoutdialogbase.ui line 283
-#: rc.cpp:2964
+#. i18n: file ./parts/ctags2/ctags2_widgetbase.ui line 85
+#: languages/cpp/problemreporter.cpp:141 languages/php/phperrorview.cpp:132
+#: rc.cpp:2565
 #, no-c-format
-msgid "Fetch modules list from server"
+msgid "Lookup:"
 msgstr ""
 
-#. i18n: file ./vcs/cvsservice/checkoutdialogbase.ui line 286
-#: rc.cpp:2967
+#. i18n: file ./parts/ctags2/ctags2_widgetbase.ui line 93
+#: rc.cpp:2568
 #, no-c-format
-msgid "Click to fetch modules list from server you specified"
+msgid ""
+"Type the identifier you want to lookup. "
+"<p> The identifier will populate and display a reducing list as you type."
 msgstr ""
 
-#. i18n: file ./vcs/cvsservice/editorsdialogbase.ui line 16
-#: rc.cpp:2970 rc.cpp:6137
-#, no-c-format
-msgid "Editors"
-msgstr "Golygyddion"
-
-#. i18n: file ./vcs/cvsservice/tagdialogbase.ui line 16
-#: rc.cpp:2976
+#. i18n: file ./parts/ctags2/ctags2_widgetbase.ui line 101
+#: rc.cpp:2571
 #, no-c-format
-msgid "Tag Files on CVS Repository"
-msgstr ""
+msgid "Hits:"
+msgstr "Trawiadau :"
 
-#. i18n: file ./vcs/cvsservice/tagdialogbase.ui line 38
-#: rc.cpp:2979
+#. i18n: file ./parts/ctags2/ctags2_widgetbase.ui line 126
+#: rc.cpp:2574
 #, no-c-format
-msgid "Tag/Branch &name:"
-msgstr ""
+msgid "Date:"
+msgstr "Dyddiad:"
 
-#. i18n: file ./vcs/cvsservice/tagdialogbase.ui line 56
-#: rc.cpp:2982
+#. i18n: file ./parts/ctags2/ctags2_widgetbase.ui line 137
+#: rc.cpp:2577
 #, no-c-format
-msgid "Tag as &branch"
+msgid "Regenerate"
 msgstr ""
 
-#. i18n: file ./vcs/cvsservice/tagdialogbase.ui line 64
-#: rc.cpp:2985
-#, no-c-format
-msgid "&Force"
-msgstr "&Gorfodi"
-
-#. i18n: file ./vcs/cvsservice/diffdialogbase.ui line 16
-#: rc.cpp:2994
+#. i18n: file ./parts/ctags2/ctags2_widgetbase.ui line 140
+#: rc.cpp:2580
 #, no-c-format
-msgid "Choose Revisions to Diff"
+msgid ""
+"Press to regenerate CTags database."
+"<p>This will take some time on a large project."
 msgstr ""
 
-#. i18n: file ./vcs/cvsservice/diffdialogbase.ui line 30
-#: rc.cpp:2997
-#, no-c-format
-msgid "Build Difference Between"
-msgstr ""
+#. i18n: file ./parts/ctags2/ctags2_createtagfilebase.ui line 16
+#: rc.cpp:2583
+#, fuzzy, no-c-format
+msgid "Create new tags file"
+msgstr "Methu creu'r ffeil newydd."
 
-#. i18n: file ./vcs/cvsservice/diffdialogbase.ui line 49
-#: rc.cpp:3000
+#. i18n: file ./parts/ctags2/ctags2_createtagfilebase.ui line 40
+#: rc.cpp:2589
 #, no-c-format
-msgid "Local copy and an arbitrary &revision:"
+msgid "Target tags file path:"
 msgstr ""
 
-#. i18n: file ./vcs/cvsservice/diffdialogbase.ui line 67
-#: rc.cpp:3003
-#, no-c-format
-msgid "&Two arbitrary revisions/tags:"
-msgstr ""
+#. i18n: file ./parts/ctags2/ctags2_createtagfilebase.ui line 53
+#: rc.cpp:2592
+#, fuzzy, no-c-format
+msgid "Directory to tag:"
+msgstr "Cyfeiriadur:"
 
-#. i18n: file ./vcs/cvsservice/diffdialogbase.ui line 91
-#: rc.cpp:3006
-#, no-c-format
-msgid "Revision A:"
-msgstr ""
+#. i18n: file ./parts/ctags2/ctags2_createtagfilebase.ui line 91
+#: rc.cpp:2595
+#, fuzzy, no-c-format
+msgid "&Create"
+msgstr "C&reu"
 
-#. i18n: file ./vcs/cvsservice/diffdialogbase.ui line 105
-#: rc.cpp:3009
+#. i18n: file ./parts/ctags2/ctags2_createtagfilebase.ui line 99
+#: rc.cpp:2598 rc.cpp:6452 rc.cpp:6558
 #, no-c-format
-msgid "Second revision to compare (leave empty to diff against HEAD)"
+msgid "C&ancel"
 msgstr ""
 
-#. i18n: file ./vcs/cvsservice/diffdialogbase.ui line 116
-#: rc.cpp:3012
-#, no-c-format
-msgid "First revision to compare"
-msgstr ""
+#. i18n: file ./parts/ctags2/ctags2_selecttagfilebase.ui line 16
+#: rc.cpp:2601
+#, fuzzy, no-c-format
+msgid "Add tags file"
+msgstr "Ychwanegu Ffeil"
 
-#. i18n: file ./vcs/cvsservice/diffdialogbase.ui line 132
-#: rc.cpp:3015
-#, no-c-format
-msgid "Revision B:"
-msgstr ""
+#. i18n: file ./parts/ctags2/ctags2_selecttagfilebase.ui line 40
+#: rc.cpp:2607
+#, fuzzy, no-c-format
+msgid "Tags file:"
+msgstr "Tabl:"
 
-#. i18n: file ./vcs/cvsservice/diffdialogbase.ui line 142
-#: rc.cpp:3018
+#. i18n: file ./parts/ctags2/ctags2_selecttagfilebase.ui line 78
+#: rc.cpp:2610 rc.cpp:4214 rc.cpp:6555 rc.cpp:7543 rc.cpp:7567
 #, no-c-format
-msgid "Local cop&y and HEAD"
+msgid "O&K"
 msgstr ""
 
-#. i18n: file ./vcs/cvsservice/diffdialogbase.ui line 150
-#: rc.cpp:3021
+#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 28
+#: rc.cpp:2616 rc.cpp:5626
 #, no-c-format
-msgid "Local copy a&nd BASE"
-msgstr ""
+msgid "Ge&neral"
+msgstr "Cy&ffredinol"
 
-#. i18n: file ./vcs/cvsservice/cvsoptionswidgetbase.ui line 16
-#: rc.cpp:3030
+#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 47
+#: rc.cpp:2619
 #, no-c-format
-msgid "CVS Options"
+msgid "Editor Context Menu"
 msgstr ""
 
-#. i18n: file ./vcs/cvsservice/cvsoptionswidgetbase.ui line 27
-#: rc.cpp:3033
+#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 58
+#: rc.cpp:2622
 #, no-c-format
-msgid "Common Settings"
+msgid "Show \"&Go To Declaration\""
 msgstr ""
 
-#. i18n: file ./vcs/cvsservice/cvsoptionswidgetbase.ui line 46
-#: rc.cpp:3036
+#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 61
+#: rc.cpp:2625
 #, no-c-format
-msgid "&Remote shell (CVS_RSH environment variable):"
+msgid ""
+"If checked, an option to go directly to the matching tag declaration will be "
+"shown. If more than one match, all matches will be shown in the main ctags "
+"result view."
 msgstr ""
 
-#. i18n: file ./vcs/cvsservice/cvsoptionswidgetbase.ui line 57
-#: rc.cpp:3039
+#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 69
+#: rc.cpp:2628
 #, no-c-format
-msgid "sets the CVS_RSH variable"
+msgid "Show \"Go To &Definition\""
 msgstr ""
 
-#. i18n: file ./vcs/cvsservice/cvsoptionswidgetbase.ui line 60
-#: rc.cpp:3042
+#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 72
+#: rc.cpp:2631
 #, no-c-format
 msgid ""
-"Set this option to \"ssh\" to use ssh as remote shell for CVS. Note that you "
-"need password-less login (see the ssh documentation for how to generate a "
-"public/private key pair) otherwise CVS will just hang forever."
+"If checked, an option to go directly to the matching tag definition will be "
+"shown. If more than one match, all matches will be shown in the main ctags "
+"result view."
 msgstr ""
 
-#. i18n: file ./vcs/cvsservice/cvsoptionswidgetbase.ui line 68
-#: rc.cpp:3045
+#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 80
+#: rc.cpp:2634
 #, no-c-format
-msgid "CVS server &location:"
+msgid "Show \"CT&ags Lookup\""
 msgstr ""
 
-#. i18n: file ./vcs/cvsservice/cvsoptionswidgetbase.ui line 86
-#: rc.cpp:3048
+#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 83
+#: rc.cpp:2637
 #, no-c-format
-msgid "When Updating"
+msgid ""
+"If checked, an option to do a full lookup of all macthing tags is shown in the "
+"context menu. The results will be shown in the main ctags results view."
 msgstr ""
 
-#. i18n: file ./vcs/cvsservice/cvsoptionswidgetbase.ui line 97
-#: rc.cpp:3051
+#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 112
+#: rc.cpp:2643
 #, no-c-format
-msgid "Create &new directories (if any)"
+msgid "When more than one hit, go directl&y to the first"
 msgstr ""
 
-#. i18n: file ./vcs/cvsservice/cvsoptionswidgetbase.ui line 105
-#: rc.cpp:3054
+#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 115
+#: rc.cpp:2646
 #, no-c-format
-msgid "&Prune empty directories"
+msgid ""
+"If more than one hit was produced from an attempt to find an exact match, go to "
+"the first match in the list. Note: the <i>Go To Next Match</i> "
+"shortcut can be used to step between the matches."
 msgstr ""
 
-#. i18n: file ./vcs/cvsservice/cvsoptionswidgetbase.ui line 113
-#: rc.cpp:3057
+#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 123
+#: rc.cpp:2649
 #, no-c-format
-msgid "&Update subdirectories too"
+msgid "&Use custom tagfile generation arguments"
 msgstr ""
 
-#. i18n: file ./vcs/cvsservice/cvsoptionswidgetbase.ui line 123
-#: rc.cpp:3060
+#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 126
+#: rc.cpp:2652
 #, no-c-format
-msgid "When Committing/Removing"
+msgid ""
+"The default arguments should be fine, but if needed a custom generation "
+"arguments string can be used."
 msgstr ""
 
-#. i18n: file ./vcs/cvsservice/cvsoptionswidgetbase.ui line 134
-#: rc.cpp:3063
+#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 140
+#: rc.cpp:2655
 #, no-c-format
-msgid "&Be recursive"
+msgid ""
+"Enter custom arguments to ctags database creation here. Note: do not set a "
+"custom tags file filename here, do that below instead."
 msgstr ""
 
-#. i18n: file ./vcs/cvsservice/cvsoptionswidgetbase.ui line 144
-#: rc.cpp:3066
+#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 158
+#: rc.cpp:2658
 #, no-c-format
-msgid "When Creating Diffs"
-msgstr ""
+msgid "Paths"
+msgstr "Llwybrau"
 
-#. i18n: file ./vcs/cvsservice/cvsoptionswidgetbase.ui line 176
-#: rc.cpp:3069
+#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 161
+#: rc.cpp:2661 rc.cpp:2667
 #, no-c-format
-msgid "Use these e&xtra options:"
+msgid ""
+"Enter the path to the exuberant ctags binary. If empty, <i>ctags</i> "
+"will be executed via $PATH. Note that it is sometimes installed as <i>"
+"exuberant-ctags</i>."
 msgstr ""
 
-#. i18n: file ./vcs/cvsservice/cvsoptionswidgetbase.ui line 209
-#: rc.cpp:3072
+#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 172
+#: rc.cpp:2664
 #, no-c-format
-msgid "Con&text lines:"
+msgid "Path to ctags binary:"
 msgstr ""
 
-#. i18n: file ./vcs/cvsservice/integrator/integratordlgbase.ui line 27
-#: rc.cpp:3075
+#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 209
+#: rc.cpp:2670
 #, no-c-format
-msgid "Create module in the repository"
+msgid "Mana&ge tag files"
 msgstr ""
 
-#. i18n: file ./vcs/cvsservice/integrator/integratordlgbase.ui line 57
-#: rc.cpp:3081
-#, no-c-format
-msgid "&Init Local Repository..."
-msgstr ""
+#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 228
+#: rc.cpp:2673
+#, fuzzy, no-c-format
+msgid "Path to project tag file:"
+msgstr "&Ffeil y cywaith:"
 
-#. i18n: file ./vcs/cvsservice/integrator/integratordlgbase.ui line 90
-#: rc.cpp:3084
+#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 236
+#: rc.cpp:2676
 #, no-c-format
-msgid "Login to &Repository..."
+msgid ""
+"Enter the full path of the project tagfile. If empty, the file will be called "
+"<i>tags</i> and reside in the root of the project."
 msgstr ""
 
-#. i18n: file ./vcs/cvsservice/integrator/integratordlgbase.ui line 154
-#: rc.cpp:3087
+#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 246
+#: rc.cpp:2679
 #, fuzzy, no-c-format
-msgid "Mo&dule:"
-msgstr "Modiwl"
+msgid "Other tag files:"
+msgstr "Eraill"
 
-#. i18n: file ./vcs/cvsservice/integrator/integratordlgbase.ui line 198
-#: rc.cpp:3093
+#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 262
+#: rc.cpp:2682
 #, fuzzy, no-c-format
-msgid "Re&lease tag:"
-msgstr "R&hyddhâd:"
-
-#. i18n: file ./vcs/cvsservice/integrator/integratordlgbase.ui line 220
-#: rc.cpp:3096 rc.cpp:6182 rc.cpp:6245 rc.cpp:8194
-#, no-c-format
-msgid "Co&mment:"
-msgstr "S&ylwad:"
+msgid "&Create..."
+msgstr "Creu ..."
 
-#. i18n: file ./vcs/cvsservice/integrator/integratordlgbase.ui line 242
-#: rc.cpp:3099 rc.cpp:3117
+#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 278
+#: rc.cpp:2688
 #, fuzzy, no-c-format
-msgid "&Repository:"
-msgstr "&Adfer"
+msgid "Remo&ve"
+msgstr "G&waredu"
 
-#. i18n: file ./vcs/cvsservice/integrator/integratordlgbase.ui line 256
-#: rc.cpp:3102
+#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 303
+#: buildtools/qmake/projectconfigurationdlg.cpp:1794
+#: kdevdesigner/designer/hierarchyview.cpp:190
+#: lib/widgets/propeditor/propertyeditor.cpp:172
+#: parts/fileview/filegroupswidget.cpp:169 rc.cpp:2691 rc.cpp:4238 rc.cpp:4286
+#: rc.cpp:4301 rc.cpp:7207 rc.cpp:7228 rc.cpp:7294 rc.cpp:7975 rc.cpp:8663
 #, no-c-format
-msgid "First Import"
-msgstr ""
-
-#. i18n: file ./vcs/cvsservice/integrator/initdlg.ui line 16
-#: rc.cpp:3108
-#, fuzzy, no-c-format
-msgid "Choose Repository Location"
-msgstr "Adfer lleolia&dau:"
+msgid "Name"
+msgstr "Enw"
 
-#. i18n: file ./vcs/cvsservice/integrator/initdlg.ui line 35
-#: rc.cpp:3111
+#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 314
+#: rc.cpp:2694
 #, fuzzy, no-c-format
-msgid "&Repository location:"
-msgstr "Adfer lleolia&dau:"
+msgid "Tags file"
+msgstr "Teitl"
 
-#. i18n: file ./vcs/cvsservice/integrator/fetcherdlgbase.ui line 51
-#: rc.cpp:3114
+#. i18n: file ./parts/filelist/projectviewconfigbase.ui line 16
+#: parts/filelist/filelist_widget.cpp:228
+#: parts/filelist/projectviewpart.cpp:79 parts/filelist/projectviewpart.cpp:80
+#: parts/filelist/projectviewpart.cpp:251
+#: parts/filelist/projectviewpart.cpp:265
+#: parts/filelist/projectviewpart.cpp:270 rc.cpp:2697
 #, no-c-format
-msgid "&Branch tag:"
-msgstr ""
-
-#. i18n: file ./vcs/cvsservice/integrator/fetcherdlgbase.ui line 97
-#: rc.cpp:3120
-#, fuzzy, no-c-format
-msgid "Fetch &List"
+msgid "File List"
 msgstr "Rhestr Ffeiliau"
 
-#. i18n: file ./parts/partexplorer/partexplorerformbase.ui line 24
-#: rc.cpp:3129
+#. i18n: file ./parts/filelist/projectviewconfigbase.ui line 27
+#: rc.cpp:2700
 #, no-c-format
-msgid "PartExplorer"
+msgid "Display toolbar in toolview (note: change needs a restart)"
 msgstr ""
 
-#. i18n: file ./parts/partexplorer/partexplorerformbase.ui line 27
-#: rc.cpp:3132
+#. i18n: file ./parts/filelist/projectviewconfigbase.ui line 33
+#: rc.cpp:2703 rc.cpp:2706
 #, no-c-format
 msgid ""
-"This is a front-end to TDE's TDETrader: search your TDE documentation for more "
-"information about TDE services and TDETrader"
-msgstr ""
-
-#. i18n: file ./parts/partexplorer/partexplorerformbase.ui line 46
-#: rc.cpp:3135
-#, no-c-format
-msgid "TDE service &type:"
+"Uncheck this if you want the toolbar together with all other toolbars. You can "
+"disable it then"
 msgstr ""
 
-#. i18n: file ./parts/partexplorer/partexplorerformbase.ui line 79
-#: rc.cpp:3138
+#. i18n: file ./parts/filelist/projectviewconfigbase.ui line 44
+#: rc.cpp:2709
 #, no-c-format
-msgid "&Additional constraints:"
+msgid "Only save project files in a session"
 msgstr ""
 
-#. i18n: file ./parts/partexplorer/partexplorerformbase.ui line 104
-#: rc.cpp:3141
+#. i18n: file ./parts/filelist/projectviewconfigbase.ui line 50
+#: rc.cpp:2712 rc.cpp:2715
 #, no-c-format
-msgid ""
-"<b>Constraints</b>Refine your query by writing additional constraints such as "
-"<i>([X-KDevelop-Scope]='Global')</i>)."
+msgid "Check this if you want to ignore files that are not part of the project"
 msgstr ""
 
-#. i18n: file ./parts/partexplorer/partexplorerformbase.ui line 120
-#: rc.cpp:3144
-#, no-c-format
-msgid "&Results"
-msgstr "&Canlyniadau"
-
-#. i18n: file ./parts/replace/replacedlg.ui line 30
-#: rc.cpp:3147
+#. i18n: file ./parts/filelist/projectviewconfigbase.ui line 61
+#: rc.cpp:2718
 #, no-c-format
-msgid "Project Wide String Replacement"
+msgid "Close all open files before opening a session"
 msgstr ""
 
-#. i18n: file ./parts/replace/replacedlg.ui line 52
-#: parts/grepview/grepdlg.cpp:127 rc.cpp:3153 rc.cpp:4790
-#, no-c-format
-msgid "C&ase sensitive"
-msgstr "Mae llythrennau bach/mawr o &bwys"
-
-#. i18n: file ./parts/replace/replacedlg.ui line 80
-#: rc.cpp:3156
+#. i18n: file ./parts/filelist/projectviewconfigbase.ui line 67
+#: rc.cpp:2721 rc.cpp:2724
 #, no-c-format
-msgid "All s&ubstrings"
+msgid ""
+"Check this if you want the currently open files closed before opening a session"
 msgstr ""
 
-#. i18n: file ./parts/replace/replacedlg.ui line 91
-#: rc.cpp:3159
+#. i18n: file ./parts/filelist/projectviewprojectconfigbase.ui line 16
+#: rc.cpp:2727
 #, fuzzy, no-c-format
-msgid "Whole words onl&y"
-msgstr "D&im ond geiriau cyfan"
+msgid "Projectviews"
+msgstr "&Ffeil y cywaith:"
 
-#. i18n: file ./parts/replace/replacedlg.ui line 107
-#: rc.cpp:3162
+#. i18n: file ./parts/filelist/projectviewprojectconfigbase.ui line 35
+#: rc.cpp:2730
 #, no-c-format
-msgid "Regular e&xpression:"
-msgstr "Mynegiad &rheolaidd :"
+msgid "Open this session after project load:"
+msgstr ""
 
-#. i18n: file ./parts/replace/replacedlg.ui line 110
-#: rc.cpp:3165
+#. i18n: file ./parts/filelist/projectviewprojectconfigbase.ui line 51
+#: rc.cpp:2733
 #, no-c-format
-msgid "Use regexp to specify target"
+msgid "select a session"
 msgstr ""
 
-#. i18n: file ./parts/replace/replacedlg.ui line 121
-#: rc.cpp:3168
-#, fuzzy, no-c-format
-msgid "E&dit"
-msgstr "Golygydd"
-
-#. i18n: file ./parts/replace/replacedlg.ui line 124
-#: rc.cpp:3171
+#. i18n: file ./parts/fileview/filegroupsconfigwidgetbase.ui line 16
+#: parts/fileview/filegroupspart.cpp:46 rc.cpp:2736
 #, no-c-format
-msgid "Opens the regexp editor. Only enabled if installed."
+msgid "File Group View"
 msgstr ""
 
-#. i18n: file ./parts/replace/replacedlg.ui line 139
-#: rc.cpp:3174
+#. i18n: file ./parts/fileview/filegroupsconfigwidgetbase.ui line 38
+#: rc.cpp:2739
 #, no-c-format
-msgid "Enter the regexp here"
+msgid "&Groups in the file view and their corresponding patterns:"
 msgstr ""
 
-#. i18n: file ./parts/replace/replacedlg.ui line 149
-#: rc.cpp:3177
+#. i18n: file ./parts/fileview/filegroupsconfigwidgetbase.ui line 47
+#: rc.cpp:2742 rc.cpp:3979
 #, no-c-format
-msgid "Target Files in Project"
-msgstr ""
+msgid "Group"
+msgstr "Gr?p"
 
-#. i18n: file ./parts/replace/replacedlg.ui line 160
-#: rc.cpp:3180
+#. i18n: file ./parts/fileview/filegroupsconfigwidgetbase.ui line 58
+#: rc.cpp:2745
 #, no-c-format
-msgid "A&ll files"
-msgstr "P&ob Ffeil"
+msgid "Pattern"
+msgstr "Patrwm"
 
-#. i18n: file ./parts/replace/replacedlg.ui line 166
-#: rc.cpp:3183
+#. i18n: file ./parts/fileview/filegroupsconfigwidgetbase.ui line 112
+#: rc.cpp:2748
 #, no-c-format
-msgid "All files in the project will be considered."
-msgstr ""
+msgid "&Add Group..."
+msgstr "&Ychwanegu Grŵp"
 
-#. i18n: file ./parts/replace/replacedlg.ui line 174
-#: rc.cpp:3186
+#. i18n: file ./parts/fileview/filegroupsconfigwidgetbase.ui line 120
+#: rc.cpp:2751
 #, no-c-format
-msgid "&Open files only"
+msgid "&Edit Group..."
 msgstr ""
 
-#. i18n: file ./parts/replace/replacedlg.ui line 177
-#: rc.cpp:3189
+#. i18n: file ./parts/fileview/filegroupsconfigwidgetbase.ui line 128
+#: rc.cpp:2754
 #, no-c-format
-msgid "Only open project files will be considered."
+msgid "De&lete Group"
 msgstr ""
 
-#. i18n: file ./parts/replace/replacedlg.ui line 185
-#: rc.cpp:3192
+#. i18n: file ./parts/fileview/vcscolorsconfigwidgetbase.ui line 16
+#: rc.cpp:2763
 #, no-c-format
-msgid "Files under &path:"
+msgid "Colors for VCS Visual Feedback"
 msgstr ""
 
-#. i18n: file ./parts/replace/replacedlg.ui line 188
-#: rc.cpp:3195
+#. i18n: file ./parts/fileview/vcscolorsconfigwidgetbase.ui line 27
+#: rc.cpp:2766
 #, no-c-format
-msgid "Only project files in this dir and its subdirs will be considered."
+msgid "Colors to Use for Version Control Feedback"
 msgstr ""
 
-#. i18n: file ./parts/replace/replacedlg.ui line 219
-#: rc.cpp:3198
+#. i18n: file ./parts/fileview/vcscolorsconfigwidgetbase.ui line 46
+#: rc.cpp:2769
 #, no-c-format
-msgid "Expression is invalid."
+msgid "&Updated:"
 msgstr ""
 
-#. i18n: file ./parts/replace/replacedlg.ui line 244
-#: rc.cpp:3201
-#, fuzzy, no-c-format
-msgid "Fi&nd"
-msgstr "Canfod:"
+#. i18n: file ./parts/fileview/vcscolorsconfigwidgetbase.ui line 65
+#: rc.cpp:2772
+#, no-c-format
+msgid "&Modified:"
+msgstr "&Newidwyd:"
 
-#. i18n: file ./parts/replace/replacedlg.ui line 250
-#: rc.cpp:3204
+#. i18n: file ./parts/fileview/vcscolorsconfigwidgetbase.ui line 84
+#: rc.cpp:2775
 #, no-c-format
-msgid "Start looking for possible replacement targets."
+msgid "Co&nflict:"
 msgstr ""
 
-#. i18n: file ./parts/replace/replacedlg.ui line 268
-#: rc.cpp:3210
+#. i18n: file ./parts/fileview/vcscolorsconfigwidgetbase.ui line 103
+#: rc.cpp:2778
 #, no-c-format
-msgid "Strings"
+msgid "&Added:"
 msgstr ""
 
-#. i18n: file ./parts/replace/replacedlg.ui line 279
-#: rc.cpp:3213
+#. i18n: file ./parts/fileview/vcscolorsconfigwidgetbase.ui line 122
+#: rc.cpp:2781
 #, no-c-format
-msgid "&Text to find:"
-msgstr "&Testun i ganfod:"
+msgid "&Sticky:"
+msgstr "&Gludiog :"
 
-#. i18n: file ./parts/replace/replacedlg.ui line 290
-#: rc.cpp:3216
+#. i18n: file ./parts/fileview/vcscolorsconfigwidgetbase.ui line 141
+#: rc.cpp:2784
 #, no-c-format
-msgid "Target string"
+msgid "&Needs checkout:"
 msgstr ""
 
-#. i18n: file ./parts/replace/replacedlg.ui line 298
-#: rc.cpp:3219
+#. i18n: file ./parts/fileview/vcscolorsconfigwidgetbase.ui line 160
+#: rc.cpp:2787
 #, no-c-format
-msgid "&Replacement text:"
-msgstr "&Testun amnewid:"
+msgid "&Needs patch:"
+msgstr ""
 
-#. i18n: file ./parts/replace/replacedlg.ui line 309
-#: rc.cpp:3222
+#. i18n: file ./parts/fileview/vcscolorsconfigwidgetbase.ui line 179
+#: rc.cpp:2790
 #, no-c-format
-msgid "The replacement string"
+msgid "Un&known:"
 msgstr ""
 
+#. i18n: file ./parts/fileview/vcscolorsconfigwidgetbase.ui line 198
+#: rc.cpp:2793
+#, no-c-format
+msgid "&Default:"
+msgstr "&Rhagosod :"
+
 #. i18n: file ./parts/tools/addtooldlg.ui line 16
-#: rc.cpp:3225
+#: rc.cpp:2796
 #, no-c-format
 msgid "Add Tool"
 msgstr ""
 
-#. i18n: file ./parts/tools/addtooldlg.ui line 27
-#: rc.cpp:3228 rc.cpp:4859
-#, no-c-format
-msgid "&Parameters:"
-msgstr "&Paramedrau:"
-
 #. i18n: file ./parts/tools/addtooldlg.ui line 38
-#: rc.cpp:3231
+#: rc.cpp:2802
 #, no-c-format
 msgid "C&apture output"
 msgstr ""
 
 #. i18n: file ./parts/tools/addtooldlg.ui line 41
-#: rc.cpp:3234
+#: rc.cpp:2805
 #, no-c-format
 msgid ""
 "If this is checked, the output of the application will be shown in the "
 "application output view; otherwise, all output will be ignored."
 msgstr ""
 
-#. i18n: file ./parts/tools/addtooldlg.ui line 49
-#: rc.cpp:3237 rc.cpp:4862
-#, no-c-format
-msgid "&Executable:"
-msgstr "&Gweithredadwyn:"
-
 #. i18n: file ./parts/tools/addtooldlg.ui line 74
-#: rc.cpp:3240
+#: rc.cpp:2811
 #, no-c-format
 msgid "&Menu text:"
 msgstr ""
 
 #. i18n: file ./parts/tools/addtooldlg.ui line 94
-#: rc.cpp:3243
+#: rc.cpp:2814
 #, no-c-format
 msgid ""
 "<p>The following placeholders can be used:</p>\n"
@@ -4853,843 +4243,382 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./parts/tools/addtooldlg.ui line 102
-#: rc.cpp:3255
+#: rc.cpp:2826
 #, no-c-format
 msgid "The text that appears in the Tools-Menu"
 msgstr ""
 
 #. i18n: file ./parts/tools/addtooldlg.ui line 159
-#: rc.cpp:3264
+#: rc.cpp:2835
 #, no-c-format
 msgid "The path and name of the application to execute"
 msgstr ""
 
 #. i18n: file ./parts/tools/toolsconfigwidgetbase.ui line 16
-#: parts/tools/tools_part.cpp:49 rc.cpp:3267
+#: parts/tools/tools_part.cpp:51 rc.cpp:2838
 #, no-c-format
 msgid "External Tools"
 msgstr "Offer Allanol"
 
 #. i18n: file ./parts/tools/toolsconfigwidgetbase.ui line 37
-#: rc.cpp:3270
+#: rc.cpp:2841
 #, no-c-format
 msgid "&Tools Menu"
 msgstr ""
 
 #. i18n: file ./parts/tools/toolsconfigwidgetbase.ui line 141
-#: rc.cpp:3279
+#: rc.cpp:2850
 #, no-c-format
 msgid "&File Context Menu"
 msgstr ""
 
 #. i18n: file ./parts/tools/toolsconfigwidgetbase.ui line 245
-#: rc.cpp:3288
+#: rc.cpp:2859
 #, no-c-format
 msgid "&Directory Context Menu"
 msgstr ""
 
-#. i18n: file ./parts/quickopen/quickopenfunctionchooseformbase.ui line 86
-#: rc.cpp:3303 rc.cpp:6551
-#, no-c-format
-msgid "File name:"
-msgstr "Enw'r ffeil:"
-
-#. i18n: file ./parts/quickopen/quickopenfunctionchooseformbase.ui line 142
-#: rc.cpp:3306
-#, no-c-format
-msgid "Function arguments list:"
-msgstr ""
-
-#. i18n: file ./parts/quickopen/quickopenbase.ui line 16
-#: rc.cpp:3309
-#, no-c-format
-msgid "Quick Open"
-msgstr ""
-
-#. i18n: file ./parts/quickopen/quickopenbase.ui line 30
-#: rc.cpp:3312
-#, no-c-format
-msgid "[NAME]"
-msgstr ""
-
-#. i18n: file ./parts/quickopen/quickopenbase.ui line 41
-#: rc.cpp:3315
-#, no-c-format
-msgid "[ITEM LIST]"
-msgstr ""
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 37
-#: rc.cpp:3324
-#, no-c-format
-msgid "Prepare for Release"
-msgstr ""
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 79
-#: rc.cpp:3327
-#, no-c-format
-msgid "<H2>Project Packaging & Publishing</H2>"
-msgstr ""
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 135
-#: rc.cpp:3330
-#, no-c-format
-msgid "Source &Distribution"
-msgstr ""
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 151
-#: rc.cpp:3333
-#, no-c-format
-msgid "&Use custom options"
-msgstr ""
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 154
-#: rc.cpp:3336
-#, no-c-format
-msgid "Default is: %n-%v.tar.gz"
-msgstr ""
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 173
-#: rc.cpp:3339
-#, no-c-format
-msgid "Source Options"
-msgstr ""
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 184
-#: rc.cpp:3342
-#, no-c-format
-msgid "Use &bzip2 instead of gzip"
-msgstr ""
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 203
-#: rc.cpp:3345
-#, no-c-format
-msgid ""
-"<b>Archive name format: </b>"
-"<br> %n - File name "
-"<br> %v - File version "
-"<br> %d - Date of archive"
-msgstr ""
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 214
-#: rc.cpp:3348
-#, no-c-format
-msgid "%n-%v"
-msgstr ""
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 217
-#: rc.cpp:3351
-#, no-c-format
-msgid "Enter the filename using the format options. "
-msgstr ""
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 254
-#: rc.cpp:3354
-#, fuzzy, no-c-format
-msgid "&Add Files"
-msgstr "Ychwanegu Ffeil"
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 270
-#: rc.cpp:3357
-#, fuzzy, no-c-format
-msgid "&Create Source Archive"
-msgstr "Agor ffeil"
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 286
-#: rc.cpp:3360 rc.cpp:3483
-#, no-c-format
-msgid "R&eset"
-msgstr "A&ilosod"
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 296
-#: parts/quickopen/quickopenfiledialog.cpp:42
-#: parts/quickopen/quickopenfiledialog.cpp:57 rc.cpp:3363
-#, no-c-format
-msgid "File &list:"
-msgstr ""
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 309
-#: rc.cpp:3366
-#, fuzzy, no-c-format
-msgid "Package &Information"
-msgstr "G&wybodaeth"
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 349
-#: rc.cpp:3369
-#, no-c-format
-msgid "Ve&ndor:"
-msgstr "Gw&erthwr :"
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 381
-#: rc.cpp:3372
-#, fuzzy, no-c-format
-msgid "Application name"
-msgstr "Cymhwysiad"
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 402
-#: rc.cpp:3375
-#, no-c-format
-msgid "&Application name:"
-msgstr ""
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 413
-#: rc.cpp:3378
-#, no-c-format
-msgid "S&ummary:"
-msgstr "C&rynodeb:"
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 435
-#: rc.cpp:3384
-#, no-c-format
-msgid "R&elease:"
-msgstr "R&hyddhâd:"
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 446
-#: rc.cpp:3387
-#, no-c-format
-msgid "&Version:"
-msgstr "Fe&rsiwn:"
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 493
-#: rc.cpp:3390
-#, no-c-format
-msgid ""
-"Version of the file package.\n"
-"Menu item: Project/Project Options/General/Version\n"
-"changes project compiled version number"
-msgstr ""
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 501
-#: rc.cpp:3395
-#, no-c-format
-msgid "&Group:"
-msgstr "&Grŵp:"
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 512
-#: rc.cpp:3398
-#, no-c-format
-msgid "Pac&kager:"
-msgstr ""
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 538
-#: rc.cpp:3401
-#, no-c-format
-msgid "Advanced Package Op&tions"
-msgstr ""
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 549
-#: rc.cpp:3404
-#, no-c-format
-msgid "&Create development package"
-msgstr ""
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 557
-#: rc.cpp:3407
-#, no-c-format
-msgid "Create documentation package"
-msgstr ""
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 565
-#: rc.cpp:3410
-#, no-c-format
-msgid "Include application icon"
-msgstr ""
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 573
-#: rc.cpp:3413
-#, no-c-format
-msgid ""
-"Architecture target:<BR><b>(Note: You must have a compiler that supports this "
-"target)</b>"
-msgstr ""
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 579
-#: rc.cpp:3416
-#, no-c-format
-msgid "i386"
-msgstr ""
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 584
-#: rc.cpp:3419
-#, no-c-format
-msgid "i586"
-msgstr ""
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 589
-#: rc.cpp:3422
-#, no-c-format
-msgid "i686"
-msgstr ""
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 594
-#: rc.cpp:3425
-#, no-c-format
-msgid "AMD K6"
-msgstr ""
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 599
-#: rc.cpp:3428
-#, no-c-format
-msgid "AMD K7"
-msgstr ""
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 604
-#: rc.cpp:3431
-#, no-c-format
-msgid "PPC"
-msgstr ""
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 609
-#: rc.cpp:3434
-#, no-c-format
-msgid "PPC G3"
-msgstr ""
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 614
-#: rc.cpp:3437
-#, no-c-format
-msgid "PPC Altevec"
-msgstr ""
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 619
-#: rc.cpp:3440
-#, no-c-format
-msgid "Dec Alpha (AXP)"
-msgstr ""
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 624
-#: rc.cpp:3443
+#. i18n: file ./parts/abbrev/abbrevconfigwidgetbase.ui line 16
+#: rc.cpp:2868
 #, no-c-format
-msgid "Sparc"
+msgid "Code Templates"
 msgstr ""
 
-#. i18n: file ./parts/distpart/distpart_ui.ui line 669
-#: rc.cpp:3446
+#. i18n: file ./parts/abbrev/abbrevconfigwidgetbase.ui line 27
+#: rc.cpp:2871
 #, no-c-format
-msgid ""
-"&Build Source \n"
-"Package"
+msgid "Co&de:"
 msgstr ""
 
-#. i18n: file ./parts/distpart/distpart_ui.ui line 678
-#: rc.cpp:3450
+#. i18n: file ./parts/abbrev/abbrevconfigwidgetbase.ui line 43
+#: rc.cpp:2874
 #, no-c-format
-msgid ""
-"Build Binar&y \n"
-"Package"
+msgid "&Enable automatic word completion"
 msgstr ""
 
-#. i18n: file ./parts/distpart/distpart_ui.ui line 687
-#: rc.cpp:3454
+#. i18n: file ./parts/abbrev/abbrevconfigwidgetbase.ui line 65
+#: rc.cpp:2880 rc.cpp:7588
 #, no-c-format
-msgid ""
-"E&xport \n"
-"Build Files"
-msgstr ""
+msgid "Template"
+msgstr "Patrymlun"
 
-#. i18n: file ./parts/distpart/distpart_ui.ui line 696
-#: rc.cpp:3458
+#. i18n: file ./parts/abbrev/abbrevconfigwidgetbase.ui line 76
+#: parts/filecreate/addglobaldlg.cpp:63 src/languageselectwidget.cpp:83
+#: rc.cpp:2883 rc.cpp:3628 rc.cpp:3652 rc.cpp:4241
 #, no-c-format
-msgid ""
-"I&mport \n"
-"Build Files"
-msgstr ""
+msgid "Description"
+msgstr "Disgrifiad"
 
-#. i18n: file ./parts/distpart/distpart_ui.ui line 777
-#: rc.cpp:3465
+#. i18n: file ./parts/abbrev/abbrevconfigwidgetbase.ui line 87
+#: rc.cpp:2886
 #, no-c-format
-msgid "C&hangelog:"
-msgstr ""
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 807
-#: rc.cpp:3468
-#, fuzzy, no-c-format
-msgid "Pr&oject Publishing"
-msgstr "Gosodiadau Cywaith"
+msgid "Suffixes"
+msgstr "Ôl-ddodiadau"
 
-#. i18n: file ./parts/distpart/distpart_ui.ui line 826
-#: rc.cpp:3471
+#. i18n: file ./parts/abbrev/abbrevconfigwidgetbase.ui line 119
+#: rc.cpp:2892
 #, no-c-format
-msgid "Local Options"
-msgstr ""
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 848
-#: rc.cpp:3474
-#, fuzzy, no-c-format
-msgid "Ge&nerate HTML information page"
-msgstr "Dewisiadau Cyffredinol"
+msgid "&Templates:"
+msgstr "&Patrymluniau :"
 
-#. i18n: file ./parts/distpart/distpart_ui.ui line 856
-#: rc.cpp:3477
+#. i18n: file ./parts/abbrev/addtemplatedlgbase.ui line 16
+#: rc.cpp:2895
 #, no-c-format
-msgid "&User information generated by RPM"
+msgid "Add Code Template"
 msgstr ""
 
-#. i18n: file ./parts/distpart/distpart_ui.ui line 911
-#: rc.cpp:3480
+#. i18n: file ./parts/abbrev/addtemplatedlgbase.ui line 85
+#: parts/grepview/grepdlg.cpp:105 rc.cpp:2904
 #, no-c-format
-msgid "&Generate"
-msgstr "&Creu"
+msgid "&Template:"
+msgstr "&Patrymlun:"
 
-#. i18n: file ./parts/distpart/distpart_ui.ui line 939
-#: rc.cpp:3486
+#. i18n: file ./parts/abbrev/addtemplatedlgbase.ui line 96
+#: rc.cpp:2907 rc.cpp:3859 rc.cpp:4229
 #, no-c-format
-msgid "Re&mote Options"
-msgstr ""
+msgid "&Description:"
+msgstr "&Disgrifiad:"
 
-#. i18n: file ./parts/distpart/distpart_ui.ui line 980
-#: rc.cpp:3489
+#. i18n: file ./parts/abbrev/addtemplatedlgbase.ui line 139
+#: rc.cpp:2910
 #, no-c-format
-msgid "File su&bmission list:"
+msgid "&Suffixes:"
 msgstr ""
 
-#. i18n: file ./parts/distpart/distpart_ui.ui line 1016
-#: rc.cpp:3492
-#, no-c-format
-msgid "+"
-msgstr "+"
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 1032
-#: rc.cpp:3495
+#. i18n: file ./parts/quickopen/quickopenfunctionchooseformbase.ui line 86
+#: rc.cpp:2919 rc.cpp:8807
 #, no-c-format
-msgid "-"
-msgstr "-"
+msgid "File name:"
+msgstr "Enw'r ffeil:"
 
-#. i18n: file ./parts/distpart/distpart_ui.ui line 1053
-#: rc.cpp:3498
+#. i18n: file ./parts/quickopen/quickopenfunctionchooseformbase.ui line 142
+#: rc.cpp:2922
 #, no-c-format
-msgid "Upload to &custom FTP site"
+msgid "Function arguments list:"
 msgstr ""
 
-#. i18n: file ./parts/distpart/distpart_ui.ui line 1061
-#: rc.cpp:3501
+#. i18n: file ./parts/quickopen/quickopenbase.ui line 16
+#: rc.cpp:2925
 #, no-c-format
-msgid "Upload files to ftp.&kde.org"
+msgid "Quick Open"
 msgstr ""
 
-#. i18n: file ./parts/distpart/distpart_ui.ui line 1086
-#: rc.cpp:3504
-#, fuzzy, no-c-format
-msgid "Sub&mit"
-msgstr "Cyflwyno"
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 1094
-#: rc.cpp:3507
+#. i18n: file ./parts/quickopen/quickopenbase.ui line 30
+#: rc.cpp:2928
 #, no-c-format
-msgid "ftp://username:password@ftp.server.com/path/"
+msgid "[NAME]"
 msgstr ""
 
-#. i18n: file ./parts/distpart/distpart_ui.ui line 1102
-#: rc.cpp:3510
-#, no-c-format
-msgid "Reset"
-msgstr "Ailosod"
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 1110
-#: rc.cpp:3513
+#. i18n: file ./parts/quickopen/quickopenbase.ui line 41
+#: rc.cpp:2931
 #, no-c-format
-msgid "Upload to &apps.kde.com"
+msgid "[ITEM LIST]"
 msgstr ""
 
-#. i18n: file ./parts/appwizard/importdlgbase.ui line 16
-#: rc.cpp:3516
+#. i18n: file ./parts/appwizard/filepropspagebase.ui line 24
+#: rc.cpp:2940
 #, no-c-format
-msgid "Import Existing Project"
-msgstr ""
+msgid "Customize"
+msgstr "Addasu"
 
-#. i18n: file ./parts/appwizard/importdlgbase.ui line 65
-#: rc.cpp:3522
+#. i18n: file ./parts/appwizard/filepropspagebase.ui line 35
+#: parts/quickopen/quickopenclassdialog.cpp:82 rc.cpp:2943 rc.cpp:7480
 #, no-c-format
-msgid "Fetch &Module"
+msgid "Class name:"
 msgstr ""
 
-#. i18n: file ./parts/appwizard/importdlgbase.ui line 79
-#: rc.cpp:3525
+#. i18n: file ./parts/appwizard/filepropspagebase.ui line 48
+#: rc.cpp:2946
 #, no-c-format
-msgid "&Fetch from:"
+msgid "Base class:"
 msgstr ""
 
-#. i18n: file ./parts/appwizard/importdlgbase.ui line 90
-#: rc.cpp:3528
-#, no-c-format
-msgid "Project &name:"
-msgstr "Enw'r cy&waith:"
-
-#. i18n: file ./parts/appwizard/importdlgbase.ui line 176
-#: rc.cpp:3537
-#, no-c-format
-msgid "&Project type:"
-msgstr "&Math y cywaith:"
-
-#. i18n: file ./parts/appwizard/importdlgbase.ui line 223
-#: rc.cpp:3540
-#, no-c-format
-msgid "&Email:"
-msgstr "E&bost:"
-
-#. i18n: file ./parts/appwizard/importdlgbase.ui line 246
-#: rc.cpp:3543 rc.cpp:3550
+#. i18n: file ./parts/appwizard/filepropspagebase.ui line 66
+#: rc.cpp:2949
 #, no-c-format
-msgid ""
-"If there exists a file AUTHOR in the\n"
-"directory, and it has email addresses\n"
-"formated as XXXX <.....> the XXXX\n"
-"will be the author, everything between \n"
-"<....> is the email address."
+msgid "Implementation file:"
 msgstr ""
 
-#. i18n: file ./parts/appwizard/importdlgbase.ui line 291
-#: rc.cpp:3557
-#, no-c-format
-msgid "&Author:"
-msgstr "Aw&dur:"
-
-#. i18n: file ./parts/appwizard/importdlgbase.ui line 305
-#: rc.cpp:3560
+#. i18n: file ./parts/appwizard/filepropspagebase.ui line 74
+#: rc.cpp:2952
 #, no-c-format
-msgid "Generate build system infrastructure"
+msgid "Header file:"
 msgstr ""
 
-#. i18n: file ./parts/appwizard/vcs_form.ui line 16
-#: rc.cpp:3563
+#. i18n: file ./parts/appwizard/filepropspagebase.ui line 89
+#: rc.cpp:2955
 #, no-c-format
-msgid "Vcs Form"
-msgstr ""
+msgid "Classes:"
+msgstr "Dosbarthiadau :"
 
-#. i18n: file ./parts/appwizard/vcs_form.ui line 40
-#: rc.cpp:3566
+#. i18n: file ./parts/appwizard/filepropspagebase.ui line 97
+#: parts/filecreate/addglobaldlg.cpp:103 rc.cpp:2958 rc.cpp:4156 rc.cpp:4211
 #, no-c-format
-msgid "&Version control system:"
-msgstr ""
+msgid "Description:"
+msgstr "Disgrifiad:"
 
 #. i18n: file ./parts/appwizard/appwizarddlgbase.ui line 16
-#: rc.cpp:3569
+#: rc.cpp:2961
 #, no-c-format
 msgid "Create New Project"
 msgstr ""
 
 #. i18n: file ./parts/appwizard/appwizarddlgbase.ui line 23
-#: languages/cpp/app_templates/tdeconfig35/app.cpp:77
 #: languages/cpp/app_templates/kde4app/kapp4.cpp:84
-#: languages/cpp/app_templates/kscons_tdemdi/appkmdi.cpp:322
 #: languages/cpp/app_templates/kscons_kxt/app.cpp:142
+#: languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp:322
 #: languages/cpp/app_templates/kxt/app.cpp:137
+#: languages/cpp/app_templates/tdeconfig35/app.cpp:77
 #: languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp:580
 #: languages/pascal/compiler/dccoptions/dccoptionsplugin.cpp:50
-#: src/kdevideextension.cpp:57 src/projectmanager.cpp:152 rc.cpp:3572
-#: rc.cpp:7264
+#: src/kdevideextension.cpp:57 src/projectmanager.cpp:152 rc.cpp:2964
+#: rc.cpp:5608
 #, no-c-format
 msgid "General"
 msgstr "Cyffredinol"
 
 #. i18n: file ./parts/appwizard/appwizarddlgbase.ui line 38
-#: rc.cpp:3575
+#: rc.cpp:2967
 #, no-c-format
 msgid "&All Projects"
 msgstr ""
 
 #. i18n: file ./parts/appwizard/appwizarddlgbase.ui line 94
-#: rc.cpp:3578
+#: rc.cpp:2970
 #, no-c-format
 msgid "&Show all project templates"
 msgstr ""
 
 #. i18n: file ./parts/appwizard/appwizarddlgbase.ui line 107
-#: rc.cpp:3581
+#: rc.cpp:2973
 #, no-c-format
 msgid "&Favorites"
 msgstr ""
 
 #. i18n: file ./parts/appwizard/appwizarddlgbase.ui line 193
-#: rc.cpp:3587
+#: rc.cpp:2979
 #, no-c-format
 msgid "Application &name:"
 msgstr ""
 
-#. i18n: file ./parts/appwizard/appwizarddlgbase.ui line 204
-#: rc.cpp:3590 rc.cpp:4558 rc.cpp:4579 rc.cpp:4603
-#, no-c-format
-msgid "&Location:"
-msgstr "&Lleoliad:"
-
 #. i18n: file ./parts/appwizard/appwizarddlgbase.ui line 215
-#: rc.cpp:3593
+#: rc.cpp:2985
 #, no-c-format
 msgid "Final location:"
 msgstr ""
 
 #. i18n: file ./parts/appwizard/appwizarddlgbase.ui line 267
-#: rc.cpp:3596
+#: rc.cpp:2988
 #, no-c-format
 msgid "TextLabel4"
 msgstr ""
 
 #. i18n: file ./parts/appwizard/appwizarddlgbase.ui line 321
-#: src/projectmanager.cpp:148 rc.cpp:3599
+#: src/projectmanager.cpp:148 rc.cpp:2991
 #, no-c-format
 msgid "Project Options"
 msgstr ""
 
 #. i18n: file ./parts/appwizard/appwizarddlgbase.ui line 340
-#: rc.cpp:3602
+#: rc.cpp:2994
 #, no-c-format
 msgid "General Options"
 msgstr "Dewisiadau Cyffredinol"
 
+#. i18n: file ./parts/appwizard/appwizarddlgbase.ui line 359
+#: rc.cpp:2997 rc.cpp:4162
+#, no-c-format
+msgid "Author:"
+msgstr "Awdur:"
+
+#. i18n: file ./parts/appwizard/appwizarddlgbase.ui line 370
+#: rc.cpp:3000 rc.cpp:4165
+#, no-c-format
+msgid "Email:"
+msgstr "Ebost:"
+
+#. i18n: file ./parts/appwizard/appwizarddlgbase.ui line 381
+#: rc.cpp:3003 rc.cpp:4168
+#, no-c-format
+msgid "Version:"
+msgstr "Fersiwn :"
+
 #. i18n: file ./parts/appwizard/appwizarddlgbase.ui line 444
-#: rc.cpp:3614
+#: rc.cpp:3006
 #, no-c-format
 msgid "0.1"
 msgstr "0.1"
 
 #. i18n: file ./parts/appwizard/appwizarddlgbase.ui line 452
-#: rc.cpp:3617
+#: rc.cpp:3009
 #, no-c-format
 msgid "License:"
 msgstr "Trwydded:"
 
 #. i18n: file ./parts/appwizard/appwizarddlgbase.ui line 461
 #: kdevdesigner/designer/mainwindowactions.cpp:586
-#: parts/appwizard/appwizarddlg.cpp:575 rc.cpp:3620
+#: parts/appwizard/appwizarddlg.cpp:575 rc.cpp:3012
 #, no-c-format
 msgid "Custom"
 msgstr "Addasiedig"
 
 #. i18n: file ./parts/appwizard/appwizarddlgbase.ui line 501
-#: rc.cpp:3623
+#: rc.cpp:3015
 #, no-c-format
 msgid "Custom Options"
 msgstr "Dewisiadau Addasu"
 
-#. i18n: file ./parts/appwizard/filepropspagebase.ui line 24
-#: rc.cpp:3626
-#, no-c-format
-msgid "Customize"
-msgstr "Addasu"
-
-#. i18n: file ./parts/appwizard/filepropspagebase.ui line 35
-#: parts/quickopen/quickopenclassdialog.cpp:82 rc.cpp:3629 rc.cpp:5301
-#, no-c-format
-msgid "Class name:"
-msgstr ""
-
-#. i18n: file ./parts/appwizard/filepropspagebase.ui line 48
-#: rc.cpp:3632
+#. i18n: file ./parts/appwizard/importdlgbase.ui line 16
+#: rc.cpp:3018
 #, no-c-format
-msgid "Base class:"
+msgid "Import Existing Project"
 msgstr ""
 
-#. i18n: file ./parts/appwizard/filepropspagebase.ui line 66
-#: rc.cpp:3635
+#. i18n: file ./parts/appwizard/importdlgbase.ui line 65
+#: rc.cpp:3024
 #, no-c-format
-msgid "Implementation file:"
+msgid "Fetch &Module"
 msgstr ""
 
-#. i18n: file ./parts/appwizard/filepropspagebase.ui line 74
-#: rc.cpp:3638
+#. i18n: file ./parts/appwizard/importdlgbase.ui line 79
+#: rc.cpp:3027
 #, no-c-format
-msgid "Header file:"
+msgid "&Fetch from:"
 msgstr ""
 
-#. i18n: file ./parts/appwizard/filepropspagebase.ui line 89
-#: rc.cpp:3641
+#. i18n: file ./parts/appwizard/importdlgbase.ui line 90
+#: rc.cpp:3030
 #, no-c-format
-msgid "Classes:"
-msgstr "Dosbarthiadau :"
+msgid "Project &name:"
+msgstr "Enw'r cy&waith:"
 
-#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 16
-#: rc.cpp:3647
+#. i18n: file ./parts/appwizard/importdlgbase.ui line 176
+#: rc.cpp:3039
 #, no-c-format
-msgid "New File Wizard Options"
-msgstr ""
-
-#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 34
-#: rc.cpp:3650
-#, fuzzy, no-c-format
-msgid "Pro&ject Types"
+msgid "&Project type:"
 msgstr "&Math y cywaith:"
 
-#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 45
-#: rc.cpp:3653
-#, no-c-format
-msgid "Re&move Type"
-msgstr ""
-
-#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 53
-#: rc.cpp:3656
-#, fuzzy, no-c-format
-msgid "Edit T&ype..."
-msgstr "Golygu..."
-
-#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 61
-#: rc.cpp:3659
-#, no-c-format
-msgid "New &Subtype..."
-msgstr ""
-
-#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 69
-#: rc.cpp:3662
-#, no-c-format
-msgid "&New Type..."
-msgstr ""
-
-#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 75
-#: parts/filecreate/addglobaldlg.cpp:59 rc.cpp:3665 rc.cpp:3689
-#, no-c-format
-msgid "Type Extension"
-msgstr ""
-
-#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 86
-#: parts/filecreate/addglobaldlg.cpp:60 rc.cpp:3668 rc.cpp:3692
-#, no-c-format
-msgid "Type Name"
-msgstr ""
-
-#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 97
-#: parts/filecreate/addglobaldlg.cpp:62 rc.cpp:3671 rc.cpp:3695
-#, no-c-format
-msgid "Icon"
-msgstr "Eicon"
-
-#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 205
-#: rc.cpp:3683
-#, fuzzy, no-c-format
-msgid "Ed&it Template"
-msgstr "&Patrymlun:"
-
-#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 215
-#: rc.cpp:3686
-#, no-c-format
-msgid "Used &Global Types"
-msgstr ""
-
-#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 301
-#: rc.cpp:3701
-#, no-c-format
-msgid "Copy to Pro&ject Types"
-msgstr ""
-
-#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 311
-#: rc.cpp:3704
-#, fuzzy, no-c-format
-msgid "Proje&ct Templates"
-msgstr "Creu Patrymlun"
-
-#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 320
-#: rc.cpp:3707
-#, no-c-format
-msgid "Template Name"
-msgstr "Enw Patrymlun"
-
-#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 347
-#: rc.cpp:3710
-#, no-c-format
-msgid "C&hange Content..."
-msgstr ""
-
-#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 355
-#: rc.cpp:3713
-#, no-c-format
-msgid "&New Template..."
-msgstr ""
-
-#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 371
-#: rc.cpp:3716
-#, no-c-format
-msgid "Re&move Template"
-msgstr "Gw&aredu Patrymlun"
-
-#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 396
-#: rc.cpp:3719
-#, no-c-format
-msgid "&Edit Template"
-msgstr ""
-
-#. i18n: file ./parts/filecreate/fctemplateeditbase.ui line 16
-#: rc.cpp:3722
-#, no-c-format
-msgid "File Template"
-msgstr ""
-
-#. i18n: file ./parts/filecreate/fctemplateeditbase.ui line 41
-#: rc.cpp:3725 rc.cpp:7228
-#, no-c-format
-msgid "Template &name:"
-msgstr ""
-
-#. i18n: file ./parts/filecreate/fctemplateeditbase.ui line 78
-#: rc.cpp:3728 rc.cpp:3749
-#, no-c-format
-msgid "Set template content from &file:"
-msgstr ""
-
-#. i18n: file ./parts/filecreate/fctypeeditbase.ui line 16
-#: rc.cpp:3737
+#. i18n: file ./parts/appwizard/importdlgbase.ui line 223
+#: rc.cpp:3042
 #, no-c-format
-msgid "File Type"
-msgstr "Math Ffeil"
+msgid "&Email:"
+msgstr "E&bost:"
 
-#. i18n: file ./parts/filecreate/fctypeeditbase.ui line 44
-#: rc.cpp:3740
+#. i18n: file ./parts/appwizard/importdlgbase.ui line 246
+#: rc.cpp:3045 rc.cpp:3052
 #, no-c-format
-msgid "Type &extension:"
+msgid ""
+"If there exists a file AUTHOR in the\n"
+"directory, and it has email addresses\n"
+"formated as XXXX <.....> the XXXX\n"
+"will be the author, everything between \n"
+"<....> is the email address."
 msgstr ""
 
-#. i18n: file ./parts/filecreate/fctypeeditbase.ui line 76
-#: rc.cpp:3743
-#, no-c-format
-msgid "Type &name:"
-msgstr "Enw'r& math:"
-
-#. i18n: file ./parts/filecreate/fctypeeditbase.ui line 108
-#: rc.cpp:3746
+#. i18n: file ./parts/appwizard/importdlgbase.ui line 291
+#: rc.cpp:3059
 #, no-c-format
-msgid "Type &description:"
-msgstr ""
+msgid "&Author:"
+msgstr "Aw&dur:"
 
-#. i18n: file ./parts/snippet/snippetdlg.ui line 16
-#: rc.cpp:3758
+#. i18n: file ./parts/appwizard/importdlgbase.ui line 305
+#: rc.cpp:3062
 #, no-c-format
-msgid "Add Snippet"
+msgid "Generate build system infrastructure"
 msgstr ""
 
-#. i18n: file ./parts/snippet/snippetdlg.ui line 117
-#: rc.cpp:3770
+#. i18n: file ./parts/appwizard/vcs_form.ui line 16
+#: rc.cpp:3065
 #, no-c-format
-msgid "&Snippet:"
+msgid "Vcs Form"
 msgstr ""
 
-#. i18n: file ./parts/snippet/snippetdlg.ui line 131
-#: rc.cpp:3773
-#, no-c-format
-msgid "Group:"
-msgstr "Gr?p:"
-
-#. i18n: file ./parts/snippet/snippetdlg.ui line 145
-#: rc.cpp:3776
+#. i18n: file ./parts/appwizard/vcs_form.ui line 40
+#: rc.cpp:3068
 #, no-c-format
-msgid "Click here to get to know how to use variables in a snippet"
+msgid "&Version control system:"
 msgstr ""
 
 #. i18n: file ./parts/snippet/snippetsettingsbase.ui line 16
-#: rc.cpp:3779
+#: rc.cpp:3071
 #, no-c-format
 msgid "Snippet Settings"
 msgstr ""
 
 #. i18n: file ./parts/snippet/snippetsettingsbase.ui line 27
-#: rc.cpp:3782
+#: rc.cpp:3074
 #, no-c-format
 msgid "Tooltips"
 msgstr ""
 
 #. i18n: file ./parts/snippet/snippetsettingsbase.ui line 38
-#: rc.cpp:3785
+#: rc.cpp:3077
 #, no-c-format
 msgid "Show snippet's text in &tooltip"
 msgstr ""
 
 #. i18n: file ./parts/snippet/snippetsettingsbase.ui line 44
-#: rc.cpp:3788
+#: rc.cpp:3080
 #, no-c-format
 msgid ""
 "Decides if a tooltip should be shown containing text from the bookmarked line"
@@ -5697,37 +4626,37 @@ msgstr ""
 
 #. i18n: file ./parts/snippet/snippetsettingsbase.ui line 71
 #: languages/cpp/debugger/debuggerpart.cpp:120
-#: languages/ruby/debugger/debuggerpart.cpp:105 rc.cpp:3791
+#: languages/ruby/debugger/debuggerpart.cpp:105 rc.cpp:3083
 #, no-c-format
 msgid "Variables"
 msgstr "Newidynnau"
 
 #. i18n: file ./parts/snippet/snippetsettingsbase.ui line 82
-#: rc.cpp:3794
+#: rc.cpp:3086
 #, no-c-format
 msgid "Input Method for Variables"
 msgstr ""
 
 #. i18n: file ./parts/snippet/snippetsettingsbase.ui line 93
-#: rc.cpp:3797
+#: rc.cpp:3089
 #, no-c-format
 msgid "Single dialog for each variable within a snippet"
 msgstr ""
 
 #. i18n: file ./parts/snippet/snippetsettingsbase.ui line 102
-#: rc.cpp:3800
+#: rc.cpp:3092
 #, no-c-format
 msgid "An input dialog will be displayed for every variable within a snippet"
 msgstr ""
 
 #. i18n: file ./parts/snippet/snippetsettingsbase.ui line 110
-#: rc.cpp:3803
+#: rc.cpp:3095
 #, no-c-format
 msgid "One dialog for all variables within a snippet"
 msgstr ""
 
 #. i18n: file ./parts/snippet/snippetsettingsbase.ui line 119
-#: rc.cpp:3806
+#: rc.cpp:3098
 #, no-c-format
 msgid ""
 "A single dialog will be displayed where you can enter the values for all "
@@ -5735,25 +4664,25 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./parts/snippet/snippetsettingsbase.ui line 137
-#: rc.cpp:3809
+#: rc.cpp:3101
 #, no-c-format
 msgid "Delimiter:"
 msgstr "Amffinydd :"
 
 #. i18n: file ./parts/snippet/snippetsettingsbase.ui line 183
-#: rc.cpp:3812
+#: rc.cpp:3104
 #, no-c-format
 msgid "Automatically Open Groups"
 msgstr ""
 
 #. i18n: file ./parts/snippet/snippetsettingsbase.ui line 194
-#: rc.cpp:3815
+#: rc.cpp:3107
 #, no-c-format
 msgid "The group's language is the project's primary language"
 msgstr ""
 
 #. i18n: file ./parts/snippet/snippetsettingsbase.ui line 200
-#: rc.cpp:3818
+#: rc.cpp:3110
 #, no-c-format
 msgid ""
 "<qt>If the group's language is the same as the project's primary language, the "
@@ -5761,13 +4690,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./parts/snippet/snippetsettingsbase.ui line 208
-#: rc.cpp:3821
+#: rc.cpp:3113
 #, no-c-format
 msgid "The group's language is supported by the project"
 msgstr ""
 
 #. i18n: file ./parts/snippet/snippetsettingsbase.ui line 217
-#: rc.cpp:3824
+#: rc.cpp:3116
 #, no-c-format
 msgid ""
 "<qt>Groups having a language which is supported by the current project will be "
@@ -5776,279 +4705,132 @@ msgid ""
 "language.</qt>"
 msgstr ""
 
-#. i18n: file ./parts/filelist/projectviewconfigbase.ui line 16
-#: parts/filelist/filelist_widget.cpp:228
-#: parts/filelist/projectviewpart.cpp:79 parts/filelist/projectviewpart.cpp:80
-#: parts/filelist/projectviewpart.cpp:251
-#: parts/filelist/projectviewpart.cpp:265
-#: parts/filelist/projectviewpart.cpp:270 rc.cpp:3827
-#, no-c-format
-msgid "File List"
-msgstr "Rhestr Ffeiliau"
-
-#. i18n: file ./parts/filelist/projectviewconfigbase.ui line 27
-#: rc.cpp:3830
-#, no-c-format
-msgid "Display toolbar in toolview (note: change needs a restart)"
-msgstr ""
-
-#. i18n: file ./parts/filelist/projectviewconfigbase.ui line 33
-#: rc.cpp:3833 rc.cpp:3836
+#. i18n: file ./parts/snippet/snippetdlg.ui line 16
+#: rc.cpp:3119
 #, no-c-format
-msgid ""
-"Uncheck this if you want the toolbar together with all other toolbars. You can "
-"disable it then"
+msgid "Add Snippet"
 msgstr ""
 
-#. i18n: file ./parts/filelist/projectviewconfigbase.ui line 44
-#: rc.cpp:3839
+#. i18n: file ./parts/snippet/snippetdlg.ui line 117
+#: rc.cpp:3131
 #, no-c-format
-msgid "Only save project files in a session"
+msgid "&Snippet:"
 msgstr ""
 
-#. i18n: file ./parts/filelist/projectviewconfigbase.ui line 50
-#: rc.cpp:3842 rc.cpp:3845
+#. i18n: file ./parts/snippet/snippetdlg.ui line 131
+#: rc.cpp:3134
 #, no-c-format
-msgid "Check this if you want to ignore files that are not part of the project"
-msgstr ""
+msgid "Group:"
+msgstr "Gr?p:"
 
-#. i18n: file ./parts/filelist/projectviewconfigbase.ui line 61
-#: rc.cpp:3848
+#. i18n: file ./parts/snippet/snippetdlg.ui line 145
+#: rc.cpp:3137
 #, no-c-format
-msgid "Close all open files before opening a session"
+msgid "Click here to get to know how to use variables in a snippet"
 msgstr ""
 
-#. i18n: file ./parts/filelist/projectviewconfigbase.ui line 67
-#: rc.cpp:3851 rc.cpp:3854
+#. i18n: file ./parts/outputviews/filterdlg.ui line 16
+#: rc.cpp:3140
 #, no-c-format
-msgid ""
-"Check this if you want the currently open files closed before opening a session"
+msgid "Output Filter Settings"
 msgstr ""
 
-#. i18n: file ./parts/filelist/projectviewprojectconfigbase.ui line 16
-#: rc.cpp:3857
+#. i18n: file ./parts/outputviews/filterdlg.ui line 94
+#: rc.cpp:3149
 #, fuzzy, no-c-format
-msgid "Projectviews"
-msgstr "&Ffeil y cywaith:"
-
-#. i18n: file ./parts/filelist/projectviewprojectconfigbase.ui line 35
-#: rc.cpp:3860
-#, no-c-format
-msgid "Open this session after project load:"
-msgstr ""
-
-#. i18n: file ./parts/filelist/projectviewprojectconfigbase.ui line 51
-#: rc.cpp:3863
-#, no-c-format
-msgid "select a session"
-msgstr ""
-
-#. i18n: file ./parts/fileview/vcscolorsconfigwidgetbase.ui line 16
-#: rc.cpp:3866
-#, no-c-format
-msgid "Colors for VCS Visual Feedback"
-msgstr ""
-
-#. i18n: file ./parts/fileview/vcscolorsconfigwidgetbase.ui line 27
-#: rc.cpp:3869
-#, no-c-format
-msgid "Colors to Use for Version Control Feedback"
-msgstr ""
-
-#. i18n: file ./parts/fileview/vcscolorsconfigwidgetbase.ui line 46
-#: rc.cpp:3872
-#, no-c-format
-msgid "&Updated:"
-msgstr ""
-
-#. i18n: file ./parts/fileview/vcscolorsconfigwidgetbase.ui line 65
-#: rc.cpp:3875
-#, no-c-format
-msgid "&Modified:"
-msgstr "&Newidwyd:"
-
-#. i18n: file ./parts/fileview/vcscolorsconfigwidgetbase.ui line 84
-#: rc.cpp:3878
-#, no-c-format
-msgid "Co&nflict:"
-msgstr ""
-
-#. i18n: file ./parts/fileview/vcscolorsconfigwidgetbase.ui line 103
-#: rc.cpp:3881
-#, no-c-format
-msgid "&Added:"
-msgstr ""
-
-#. i18n: file ./parts/fileview/vcscolorsconfigwidgetbase.ui line 122
-#: rc.cpp:3884
-#, no-c-format
-msgid "&Sticky:"
-msgstr "&Gludiog :"
-
-#. i18n: file ./parts/fileview/vcscolorsconfigwidgetbase.ui line 141
-#: rc.cpp:3887
-#, no-c-format
-msgid "&Needs checkout:"
-msgstr ""
-
-#. i18n: file ./parts/fileview/vcscolorsconfigwidgetbase.ui line 160
-#: rc.cpp:3890
-#, no-c-format
-msgid "&Needs patch:"
-msgstr ""
-
-#. i18n: file ./parts/fileview/vcscolorsconfigwidgetbase.ui line 179
-#: rc.cpp:3893
-#, no-c-format
-msgid "Un&known:"
-msgstr ""
-
-#. i18n: file ./parts/fileview/vcscolorsconfigwidgetbase.ui line 198
-#: rc.cpp:3896
-#, no-c-format
-msgid "&Default:"
-msgstr "&Rhagosod :"
-
-#. i18n: file ./parts/fileview/filegroupsconfigwidgetbase.ui line 16
-#: parts/fileview/filegroupspart.cpp:46 rc.cpp:3899
-#, no-c-format
-msgid "File Group View"
-msgstr ""
-
-#. i18n: file ./parts/fileview/filegroupsconfigwidgetbase.ui line 38
-#: rc.cpp:3902
-#, no-c-format
-msgid "&Groups in the file view and their corresponding patterns:"
-msgstr ""
-
-#. i18n: file ./parts/fileview/filegroupsconfigwidgetbase.ui line 47
-#: rc.cpp:3905 rc.cpp:4402
-#, no-c-format
-msgid "Group"
-msgstr "Gr?p"
-
-#. i18n: file ./parts/fileview/filegroupsconfigwidgetbase.ui line 58
-#: rc.cpp:3908
-#, no-c-format
-msgid "Pattern"
-msgstr "Patrwm"
-
-#. i18n: file ./parts/fileview/filegroupsconfigwidgetbase.ui line 112
-#: rc.cpp:3911
-#, no-c-format
-msgid "&Add Group..."
-msgstr "&Ychwanegu Grŵp"
+msgid "Filter"
+msgstr "Ffeil: %1"
 
-#. i18n: file ./parts/fileview/filegroupsconfigwidgetbase.ui line 120
-#: rc.cpp:3914
+#. i18n: file ./parts/outputviews/filterdlg.ui line 111
+#: rc.cpp:3152
 #, no-c-format
-msgid "&Edit Group..."
+msgid "Only show lines matching:"
 msgstr ""
 
-#. i18n: file ./parts/fileview/filegroupsconfigwidgetbase.ui line 128
-#: rc.cpp:3917
-#, no-c-format
-msgid "De&lete Group"
-msgstr ""
+#. i18n: file ./parts/outputviews/filterdlg.ui line 135
+#: rc.cpp:3158
+#, fuzzy, no-c-format
+msgid "Re&gular expression"
+msgstr "Mynegiad &rheolaidd :"
 
-#. i18n: file ./parts/abbrev/abbrevconfigwidgetbase.ui line 16
-#: rc.cpp:3926
+#. i18n: file ./parts/partexplorer/partexplorerformbase.ui line 24
+#: rc.cpp:3161
 #, no-c-format
-msgid "Code Templates"
+msgid "PartExplorer"
 msgstr ""
 
-#. i18n: file ./parts/abbrev/abbrevconfigwidgetbase.ui line 27
-#: rc.cpp:3929
+#. i18n: file ./parts/partexplorer/partexplorerformbase.ui line 27
+#: rc.cpp:3164
 #, no-c-format
-msgid "Co&de:"
+msgid ""
+"This is a front-end to TDE's TDETrader: search your TDE documentation for more "
+"information about TDE services and TDETrader"
 msgstr ""
 
-#. i18n: file ./parts/abbrev/abbrevconfigwidgetbase.ui line 43
-#: rc.cpp:3932
+#. i18n: file ./parts/partexplorer/partexplorerformbase.ui line 46
+#: rc.cpp:3167
 #, no-c-format
-msgid "&Enable automatic word completion"
+msgid "TDE service &type:"
 msgstr ""
 
-#. i18n: file ./parts/abbrev/abbrevconfigwidgetbase.ui line 65
-#: rc.cpp:3938 rc.cpp:5452
-#, no-c-format
-msgid "Template"
-msgstr "Patrymlun"
-
-#. i18n: file ./parts/abbrev/abbrevconfigwidgetbase.ui line 87
-#: rc.cpp:3944
-#, no-c-format
-msgid "Suffixes"
-msgstr "Ôl-ddodiadau"
-
-#. i18n: file ./parts/abbrev/abbrevconfigwidgetbase.ui line 119
-#: rc.cpp:3950
-#, no-c-format
-msgid "&Templates:"
-msgstr "&Patrymluniau :"
-
-#. i18n: file ./parts/abbrev/addtemplatedlgbase.ui line 16
-#: rc.cpp:3953
+#. i18n: file ./parts/partexplorer/partexplorerformbase.ui line 79
+#: rc.cpp:3170
 #, no-c-format
-msgid "Add Code Template"
+msgid "&Additional constraints:"
 msgstr ""
 
-#. i18n: file ./parts/abbrev/addtemplatedlgbase.ui line 85
-#: parts/grepview/grepdlg.cpp:105 rc.cpp:3962
-#, no-c-format
-msgid "&Template:"
-msgstr "&Patrymlun:"
-
-#. i18n: file ./parts/abbrev/addtemplatedlgbase.ui line 139
-#: rc.cpp:3968
+#. i18n: file ./parts/partexplorer/partexplorerformbase.ui line 104
+#: rc.cpp:3173
 #, no-c-format
-msgid "&Suffixes:"
+msgid ""
+"<b>Constraints</b>Refine your query by writing additional constraints such as "
+"<i>([X-TDevelop-Scope]='Global')</i>)."
 msgstr ""
 
-#. i18n: file ./parts/vcsmanager/vcsmanagerprojectconfigbase.ui line 27
-#: rc.cpp:3971
+#. i18n: file ./parts/partexplorer/partexplorerformbase.ui line 120
+#: rc.cpp:3176
 #, no-c-format
-msgid "Version control system to use for this project:"
-msgstr ""
+msgid "&Results"
+msgstr "&Canlyniadau"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 24
-#: rc.cpp:3974
+#: rc.cpp:3179
 #, no-c-format
 msgid "Artistic Style Configuration"
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 47
-#: rc.cpp:3977 rc.cpp:6368
+#: rc.cpp:3182 rc.cpp:8204
 #, no-c-format
 msgid "&General"
 msgstr "&Cyffredinol"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 78
-#: rc.cpp:3980
+#: rc.cpp:3185
 #, no-c-format
 msgid "&Style"
 msgstr "A&rddull"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 89
-#: rc.cpp:3983
+#: rc.cpp:3188
 #, no-c-format
 msgid "&User defined"
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 98
-#: rc.cpp:3986
+#: rc.cpp:3191
 #, no-c-format
 msgid "Select options from other tabs."
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 106
-#: rc.cpp:3989
+#: rc.cpp:3194
 #, no-c-format
 msgid "&ANSI"
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 118
-#: rc.cpp:3992
+#: rc.cpp:3197
 #, no-c-format
 msgid ""
 "ANSI style formatting/indenting.\n"
@@ -6061,13 +4843,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 126
-#: rc.cpp:4001
+#: rc.cpp:3206
 #, no-c-format
 msgid "&Kernighan && Ritchie"
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 138
-#: rc.cpp:4004
+#: rc.cpp:3209
 #, no-c-format
 msgid ""
 "Kernighan & Ritchie style formatting/indenting.\n"
@@ -6079,13 +4861,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 146
-#: rc.cpp:4013
+#: rc.cpp:3218
 #, fuzzy, no-c-format
 msgid "Linu&x"
 msgstr "Linux"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 158
-#: rc.cpp:4016
+#: rc.cpp:3221
 #, no-c-format
 msgid ""
 "Linux mode (8 spaces per indent, break definition-block brackets but attach "
@@ -6099,13 +4881,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 166
-#: rc.cpp:4025
+#: rc.cpp:3230
 #, no-c-format
 msgid "G&NU"
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 179
-#: rc.cpp:4028
+#: rc.cpp:3233
 #, no-c-format
 msgid ""
 "GNU style formatting/indenting.\n"
@@ -6119,13 +4901,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 187
-#: rc.cpp:4038
+#: rc.cpp:3243
 #, no-c-format
 msgid "&JAVA"
 msgstr "&JAVA"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 198
-#: rc.cpp:4041
+#: rc.cpp:3246
 #, no-c-format
 msgid ""
 "Java mode, with standard java style formatting/indenting.\n"
@@ -6137,27 +4919,27 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 206
-#: rc.cpp:4049
+#: rc.cpp:3254
 #, fuzzy, no-c-format
 msgid "Use Global &Options"
 msgstr "Dewisiadau Cyffredinol"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 213
-#: rc.cpp:4052
+#: rc.cpp:3257
 #, no-c-format
 msgid ""
 "Use the global defaults. See the menu:\n"
-"Settings/Configure Kdevelop/Formatting."
+"Settings/Configure TDevelop/Formatting."
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 231
-#: rc.cpp:4056
+#: rc.cpp:3261
 #, fuzzy, no-c-format
 msgid "Files to format"
 msgstr "Ffeiliau i'w llwytho"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 259
-#: rc.cpp:4059
+#: rc.cpp:3264
 #, no-c-format
 msgid ""
 "*.c *.h\n"
@@ -6173,71 +4955,71 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 268
-#: rc.cpp:4071 rc.cpp:4077
+#: rc.cpp:3276 rc.cpp:3282
 #, no-c-format
 msgid ""
-"Set the file extensions for what the\n"
+"Set the extensions of files that the\n"
 "formatter will try to reformat. Use a\n"
-"space seperated list. eg. *.cpp *.hpp\n"
+"space separated list, e.g. *.cpp *.hpp.\n"
 "Can use * on its own for any file."
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 286
-#: rc.cpp:4083
+#: rc.cpp:3288
 #, no-c-format
 msgid "Tab && Bra&ckets"
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 303
-#: rc.cpp:4086
+#: rc.cpp:3291
 #, no-c-format
 msgid "&Filling"
 msgstr "Ll&enwad"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 317
-#: rc.cpp:4089
+#: rc.cpp:3294
 #, no-c-format
 msgid "Fill empt&y lines"
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 320
-#: rc.cpp:4092
+#: rc.cpp:3297
 #, no-c-format
 msgid "Fill empty lines with the white space of their previous lines."
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 336
-#: rc.cpp:4095
+#: rc.cpp:3300
 #, no-c-format
 msgid "U&se tabs"
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 356
-#: rc.cpp:4098
+#: rc.cpp:3303
 #, no-c-format
 msgid "Number of spaces to use per indent."
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 367
-#: rc.cpp:4101
+#: rc.cpp:3306
 #, no-c-format
 msgid "Con&vert tabs"
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 370
-#: rc.cpp:4104
+#: rc.cpp:3309
 #, no-c-format
 msgid "Convert tabs to spaces."
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 398
-#: rc.cpp:4107
+#: rc.cpp:3312
 #, fuzzy, no-c-format
 msgid "&Use spaces:"
 msgstr "A&mnewid:"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 416
-#: rc.cpp:4110
+#: rc.cpp:3315
 #, no-c-format
 msgid ""
 "Number of spaces that will be converted to a tab.\n"
@@ -6245,55 +5027,55 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 427
-#: rc.cpp:4114
+#: rc.cpp:3319
 #, no-c-format
 msgid "F&orce tabs"
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 430
-#: rc.cpp:4117
+#: rc.cpp:3322
 #, no-c-format
 msgid "Force tabs to be used in areas Astyle would prefer to use spaces."
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 465
-#: rc.cpp:4120
+#: rc.cpp:3325
 #, no-c-format
 msgid "Brackets"
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 487
-#: rc.cpp:4123
+#: rc.cpp:3328
 #, fuzzy, no-c-format
 msgid "&No Change"
 msgstr "Ffeil wedi Newid"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 493
-#: rc.cpp:4126
+#: rc.cpp:3331
 #, no-c-format
 msgid "The brackets will not be changed."
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 501
-#: rc.cpp:4129
+#: rc.cpp:3334
 #, no-c-format
 msgid "&Break"
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 507
-#: rc.cpp:4132
+#: rc.cpp:3337
 #, no-c-format
 msgid "Break brackets from pre-block code (i.e. ANSI C/C++ style)."
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 515
-#: rc.cpp:4135
+#: rc.cpp:3340
 #, no-c-format
 msgid "&Attach"
 msgstr "&Atodi"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 519
-#: rc.cpp:4138
+#: rc.cpp:3343
 #, no-c-format
 msgid ""
 "Attach brackets to pre-block code (i.e. Java/K&R style).\n"
@@ -6301,13 +5083,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 527
-#: rc.cpp:4142
+#: rc.cpp:3347
 #, no-c-format
 msgid "Linu&x style"
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 531
-#: rc.cpp:4145
+#: rc.cpp:3350
 #, no-c-format
 msgid ""
 "Break brackets from class/function declarations, \n"
@@ -6315,13 +5097,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 544
-#: rc.cpp:4149
+#: rc.cpp:3354
 #, no-c-format
 msgid "Brea&k closing headers"
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 548
-#: rc.cpp:4152
+#: rc.cpp:3357
 #, no-c-format
 msgid ""
 "Break brackets before closing headers (e.g. 'else', 'catch', ...)\n"
@@ -6329,19 +5111,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 560
-#: rc.cpp:4156
+#: rc.cpp:3361
 #, no-c-format
 msgid "&Indentation"
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 577
-#: rc.cpp:4159
+#: rc.cpp:3364
 #, no-c-format
 msgid "Contin&uation"
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 592
-#: rc.cpp:4162 rc.cpp:4169
+#: rc.cpp:3367 rc.cpp:3374
 #, no-c-format
 msgid ""
 "Indent a maximal # spaces in a continuous statement,\n"
@@ -6349,19 +5131,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 600
-#: rc.cpp:4166
+#: rc.cpp:3371
 #, no-c-format
 msgid "Maximum in statement:"
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 612
-#: rc.cpp:4173
+#: rc.cpp:3378
 #, no-c-format
 msgid "Minimum in conditional:"
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 616
-#: rc.cpp:4176 rc.cpp:4183
+#: rc.cpp:3381 rc.cpp:3388
 #, no-c-format
 msgid ""
 "Indent a minimal # spaces in a continuous conditional\n"
@@ -6369,25 +5151,25 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 624
-#: rc.cpp:4180
+#: rc.cpp:3385
 #, no-c-format
 msgid "Twice current"
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 650
-#: rc.cpp:4187
+#: rc.cpp:3392
 #, no-c-format
 msgid "Indented &Entities"
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 661
-#: rc.cpp:4190
+#: rc.cpp:3395
 #, fuzzy, no-c-format
 msgid "&Switches"
 msgstr "Ysbeidiau"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 665
-#: rc.cpp:4193
+#: rc.cpp:3398
 #, no-c-format
 msgid ""
 "Indent 'switch' blocks, so that the inner 'case XXX:'\n"
@@ -6395,13 +5177,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 673
-#: rc.cpp:4197
+#: rc.cpp:3402
 #, no-c-format
 msgid "&Case statements"
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 677
-#: rc.cpp:4200
+#: rc.cpp:3405
 #, no-c-format
 msgid ""
 "Indent case blocks from the 'case XXX:' headers.\n"
@@ -6409,13 +5191,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 685
-#: rc.cpp:4204
+#: rc.cpp:3409
 #, fuzzy, no-c-format
 msgid "Cla&sses"
 msgstr "Dosbarthiadau"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 690
-#: rc.cpp:4207
+#: rc.cpp:3412
 #, no-c-format
 msgid ""
 "Indent 'class' blocks, so that the inner 'public:',\n"
@@ -6424,37 +5206,37 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 698
-#: rc.cpp:4212
+#: rc.cpp:3417
 #, fuzzy, no-c-format
 msgid "&Brackets"
 msgstr "&Dosbarth"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 701
-#: rc.cpp:4215
+#: rc.cpp:3420
 #, no-c-format
 msgid "Add extra indentation to '{' and '}' block brackets."
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 709
-#: rc.cpp:4218
+#: rc.cpp:3423
 #, fuzzy, no-c-format
 msgid "&Namespaces"
 msgstr "A&mnewid"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 712
-#: rc.cpp:4221
+#: rc.cpp:3426
 #, no-c-format
 msgid "Indent the contents of namespace blocks."
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 720
-#: rc.cpp:4224
+#: rc.cpp:3429
 #, fuzzy, no-c-format
 msgid "L&abels"
 msgstr "&Label:"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 728
-#: rc.cpp:4227
+#: rc.cpp:3432
 #, no-c-format
 msgid ""
 "Indent labels so that they appear one indent less than\n"
@@ -6463,49 +5245,49 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 736
-#: rc.cpp:4232
+#: rc.cpp:3437
 #, no-c-format
 msgid "Bloc&ks"
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 739
-#: rc.cpp:4235
+#: rc.cpp:3440
 #, no-c-format
 msgid "Add extra indentation entire blocks (including brackets)."
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 750
-#: rc.cpp:4238
+#: rc.cpp:3443
 #, fuzzy, no-c-format
 msgid "#Prepr&ocessors"
 msgstr "Cyrchiad"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 753
-#: rc.cpp:4241
+#: rc.cpp:3446
 #, no-c-format
 msgid "Indent multi-line #define statements."
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 765
-#: rc.cpp:4244
+#: rc.cpp:3449
 #, fuzzy, no-c-format
 msgid "For&matting"
 msgstr "creu"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 782
-#: rc.cpp:4247
+#: rc.cpp:3452
 #, fuzzy, no-c-format
 msgid "Blocks"
 msgstr "Doc"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 793
-#: rc.cpp:4250
+#: rc.cpp:3455
 #, fuzzy, no-c-format
 msgid "&Break blocks"
 msgstr "&Torri'r Haenlun"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 805
-#: rc.cpp:4253
+#: rc.cpp:3458
 #, no-c-format
 msgid ""
 "Insert empty lines around unrelated blocks, labels, classes,...\n"
@@ -6520,13 +5302,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 813
-#: rc.cpp:4265
+#: rc.cpp:3470
 #, no-c-format
 msgid "Break bl&ocks all"
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 827
-#: rc.cpp:4268
+#: rc.cpp:3473
 #, no-c-format
 msgid ""
 "Like --break-blocks, except also insert empty lines \n"
@@ -6543,67 +5325,67 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 835
-#: rc.cpp:4282
+#: rc.cpp:3487
 #, no-c-format
 msgid "Break i&f-else"
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 838
-#: rc.cpp:4285
+#: rc.cpp:3490
 #, no-c-format
 msgid "Break 'else if()' statements into two different lines."
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 854
-#: rc.cpp:4288
+#: rc.cpp:3493
 #, no-c-format
 msgid "Padding"
 msgstr "Padio"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 865
-#: rc.cpp:4291
+#: rc.cpp:3496
 #, no-c-format
 msgid "Add spa&ces inside parentheses"
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 868
-#: rc.cpp:4294
+#: rc.cpp:3499
 #, no-c-format
 msgid "Insert space padding around parenthesis on the inside only."
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 876
-#: rc.cpp:4297
+#: rc.cpp:3502
 #, no-c-format
 msgid "A&dd spaces outside parentheses"
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 879
-#: rc.cpp:4300
+#: rc.cpp:3505
 #, no-c-format
 msgid "Insert space padding around parenthesis on the outside only."
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 887
-#: rc.cpp:4303
+#: rc.cpp:3508
 #, no-c-format
 msgid "Remove &unnecessary spaces around parentheses"
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 890
-#: rc.cpp:4306
+#: rc.cpp:3511
 #, no-c-format
 msgid "Remove unnecessary space padding around parenthesis."
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 898
-#: rc.cpp:4309
+#: rc.cpp:3514
 #, no-c-format
 msgid "&Add spaces around operators"
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 903
-#: rc.cpp:4312
+#: rc.cpp:3517
 #, no-c-format
 msgid ""
 "Insert space padding around operators.\n"
@@ -6612,3760 +5394,3586 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 919
-#: rc.cpp:4317
+#: rc.cpp:3522
 #, no-c-format
 msgid "One Liners"
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 930
-#: rc.cpp:4320
+#: rc.cpp:3525
 #, no-c-format
 msgid "&Keep one-line statements"
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 934
-#: rc.cpp:4323
+#: rc.cpp:3528
 #, no-c-format
 msgid ""
-"Don't break lines containing multiple statements into\n"
+"Do not break lines containing multiple statements into\n"
 "multiple single-statement lines."
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 942
-#: rc.cpp:4327
+#: rc.cpp:3532
 #, no-c-format
 msgid "Keep o&ne-line blocks"
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 945
-#: rc.cpp:4330
+#: rc.cpp:3535
 #, no-c-format
-msgid "Don't break blocks residing completely on one line."
+msgid "Do not break blocks residing completely on one line."
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 966
-#: rc.cpp:4333
+#: rc.cpp:3538
 #, no-c-format
 msgid "Example"
 msgstr "Enghraifft"
 
-#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 16
-#: rc.cpp:4336
-#, no-c-format
-msgid "Test Regular Expression"
-msgstr ""
-
-#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 30
-#: rc.cpp:4339
-#, no-c-format
-msgid "&Regular expression:"
-msgstr "&Mynegiad rheolaidd :"
+#. i18n: file ./parts/uimode/uichooser.ui line 16
+#: rc.cpp:3541
+#, fuzzy, no-c-format
+msgid "UIChooser"
+msgstr "Defnyddiwr"
 
-#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 41
-#: rc.cpp:4342
+#. i18n: file ./parts/uimode/uichooser.ui line 38
+#: rc.cpp:3544
 #, no-c-format
-msgid "&Test string:"
+msgid "Use Tabs"
 msgstr ""
 
-#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 52
-#: rc.cpp:4345
+#. i18n: file ./parts/uimode/uichooser.ui line 41
+#: rc.cpp:3547
 #, no-c-format
-msgid "Enter a string which will be matched against the regular expression"
+msgid ""
+"Some prefer not to have a tab bar and switch between documents using other "
+"means. Kate is one example of this."
 msgstr ""
 
-#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 87
-#: rc.cpp:4348
+#. i18n: file ./parts/uimode/uichooser.ui line 52
+#: rc.cpp:3550
+#, fuzzy, no-c-format
+msgid "Al&ways"
+msgstr "Bob tro"
+
+#. i18n: file ./parts/uimode/uichooser.ui line 63
+#: rc.cpp:3553
+#, fuzzy, no-c-format
+msgid "Ne&ver"
+msgstr "Byth"
+
+#. i18n: file ./parts/uimode/uichooser.ui line 76
+#: rc.cpp:3556
 #, no-c-format
-msgid "&Insert Quoted"
+msgid "Use Close on Hover"
 msgstr ""
 
-#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 93
-#: rc.cpp:4351
+#. i18n: file ./parts/uimode/uichooser.ui line 79
+#: rc.cpp:3559
 #, no-c-format
 msgid ""
-"Inserts the regular expression into the currently opened source code file. "
-"Escapes any special characters like backslash."
+"The document tab can optionally be used to close the document, by clicking on "
+"the tab icon."
 msgstr ""
 
-#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 124
-#: rc.cpp:4357
+#. i18n: file ./parts/uimode/uichooser.ui line 101
+#: kdevdesigner/designer/editfunctionsimpl.cpp:218
+#: kdevdesigner/designer/formfile.cpp:330
+#: kdevdesigner/designer/formfile.cpp:657
+#: kdevdesigner/designer/mainwindow.cpp:2517
+#: kdevdesigner/designer/mainwindow.cpp:2847
+#: kdevdesigner/designer/mainwindowactions.cpp:1129
+#: kdevdesigner/designer/sourcefile.cpp:224
+#: kdevdesigner/designer/sourcefile.cpp:269
+#: kdevdesigner/designer/variabledialogimpl.cpp:105 rc.cpp:3565
 #, no-c-format
-msgid "Closes the dialog"
-msgstr ""
+msgid "&Yes"
+msgstr "&Ie"
 
-#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 134
-#: rc.cpp:4360
+#. i18n: file ./parts/uimode/uichooser.ui line 121
+#: rc.cpp:3568
 #, no-c-format
-msgid ""
-"enter a regular expression, for example <tt>KD.*</tt>"
-", which matches all strings beginning with \"KD\""
+msgid "Toolview Tab Layout"
 msgstr ""
 
-#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 150
-#: rc.cpp:4363
+#. i18n: file ./parts/uimode/uichooser.ui line 124
+#: rc.cpp:3571
 #, no-c-format
-msgid "Regular Expression T&ype"
+msgid ""
+"Three different modes for the IDEAl toolview tabs. \"Text and icons\" is the "
+"most informative, but takes a lot of space. Those with a smaller screen will "
+"typically want \"Icons\"."
 msgstr ""
 
-#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 161
-#: rc.cpp:4366
+#. i18n: file ./parts/uimode/uichooser.ui line 135
+#: rc.cpp:3574
 #, no-c-format
-msgid "&Basic POSIX syntax (used by grep)"
-msgstr ""
+msgid "Icons"
+msgstr "Eiconau"
 
-#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 167
-#: rc.cpp:4369 rc.cpp:4375
+#. i18n: file ./parts/uimode/uichooser.ui line 143
+#: rc.cpp:3577
+#, fuzzy, no-c-format
+msgid "Te&xt"
+msgstr "Testun"
+
+#. i18n: file ./parts/uimode/uichooser.ui line 154
+#: rc.cpp:3580
 #, no-c-format
-msgid "A description of this syntax can be found in the grep manpage"
+msgid "Text and icons"
 msgstr ""
 
-#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 175
-#: rc.cpp:4372
+#. i18n: file ./parts/uimode/uichooser.ui line 164
+#: rc.cpp:3583
 #, no-c-format
-msgid "E&xtended POSIX syntax (used by egrep)"
-msgstr ""
+msgid "Tabbed Browsing"
+msgstr "Pori â Thabiau"
 
-#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 186
-#: rc.cpp:4378
+#. i18n: file ./parts/uimode/uichooser.ui line 167
+#: rc.cpp:3586
 #, no-c-format
-msgid "&QRegExp syntax"
+msgid "Some extra options for the document tabbar."
 msgstr ""
 
-#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 189
-#: rc.cpp:4381
+#. i18n: file ./parts/uimode/uichooser.ui line 178
+#: rc.cpp:3589
 #, no-c-format
-msgid ""
-"A description of this syntax can be found in the documentation of the QRegExp "
-"class"
-msgstr ""
+msgid "Open &new tab after current tab"
+msgstr "Agor tab ne&wydd ar ôl y tab cyfredol"
 
-#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 197
-#: rc.cpp:4384
+#. i18n: file ./parts/uimode/uichooser.ui line 186
+#: rc.cpp:3592
 #, no-c-format
-msgid "QRegExp syntax (&minimal)"
+msgid "&Show icons on document tabs"
 msgstr ""
 
-#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 200
-#: rc.cpp:4387
+#. i18n: file ./parts/uimode/uichooser.ui line 194
+#: rc.cpp:3595
 #, no-c-format
-msgid ""
-"Matches a QRegExp non-greedy. Please read the QRegExp::setMinimal documentation "
-"for more details."
+msgid "Show close &button in tab bar"
 msgstr ""
 
-#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 208
-#: rc.cpp:4390
+#. i18n: file ./parts/uimode/uichooser.ui line 214
+#: rc.cpp:3598
 #, no-c-format
-msgid "&KRegExp syntax"
+msgid "Note: Changes will take effect after TDevelop is restarted"
 msgstr ""
 
-#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 211
-#: rc.cpp:4393
+#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 16
+#: rc.cpp:3601
 #, no-c-format
-msgid "A description of this syntax can be found in the TDE API documentation."
+msgid "New File Wizard Options"
 msgstr ""
 
-#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 221
-#: rc.cpp:4396 rc.cpp:4618 rc.cpp:6317 rc.cpp:6650 rc.cpp:6680
-#, no-c-format
-msgid "&Edit..."
-msgstr "&Golygu..."
+#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 34
+#: rc.cpp:3604
+#, fuzzy, no-c-format
+msgid "Pro&ject Types"
+msgstr "&Math y cywaith:"
 
-#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 240
-#: rc.cpp:4399
+#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 45
+#: rc.cpp:3607
 #, no-c-format
-msgid "Matched subgroups:"
+msgid "Re&move Type"
 msgstr ""
 
-#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 257
-#: buildtools/qmake/projectconfigurationdlg.cpp:1796
-#: kdevdesigner/designer/propertyeditor.cpp:2923
-#: languages/cpp/debugger/variablewidget.cpp:223
-#: languages/ruby/debugger/variablewidget.cpp:146
-#: lib/widgets/propeditor/propertyeditor.cpp:173
-#: parts/partexplorer/partexplorerform.cpp:118 rc.cpp:4405 rc.cpp:5067
-#: rc.cpp:5133 rc.cpp:5244 rc.cpp:5845 rc.cpp:6260
-#, no-c-format
-msgid "Value"
-msgstr "Gwerth"
+#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 53
+#: rc.cpp:3610
+#, fuzzy, no-c-format
+msgid "Edit T&ype..."
+msgstr "Golygu..."
 
-#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 284
-#: rc.cpp:4408
+#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 61
+#: rc.cpp:3613
 #, no-c-format
-msgid ""
-"Shows which groups were matched. See the corresponding documentation for how "
-"groups are matched."
+msgid "New &Subtype..."
 msgstr ""
 
-#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 28
-#: rc.cpp:4411 rc.cpp:7282
+#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 69
+#: rc.cpp:3616
 #, no-c-format
-msgid "Ge&neral"
-msgstr "Cy&ffredinol"
+msgid "&New Type..."
+msgstr ""
 
-#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 47
-#: rc.cpp:4414
+#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 75
+#: parts/filecreate/addglobaldlg.cpp:59 rc.cpp:3619 rc.cpp:3643
 #, no-c-format
-msgid "Editor Context Menu"
+msgid "Type Extension"
 msgstr ""
 
-#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 58
-#: rc.cpp:4417
+#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 86
+#: parts/filecreate/addglobaldlg.cpp:60 rc.cpp:3622 rc.cpp:3646
 #, no-c-format
-msgid "Show \"&Go To Declaration\""
+msgid "Type Name"
 msgstr ""
 
-#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 61
-#: rc.cpp:4420
+#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 97
+#: parts/filecreate/addglobaldlg.cpp:62 rc.cpp:3625 rc.cpp:3649
 #, no-c-format
-msgid ""
-"If checked, an option to go directly to the matching tag declaration will be "
-"shown. If more than one match, all matches will be shown in the main ctags "
-"result view."
-msgstr ""
+msgid "Icon"
+msgstr "Eicon"
 
-#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 69
-#: rc.cpp:4423
+#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 205
+#: rc.cpp:3637
+#, fuzzy, no-c-format
+msgid "Ed&it Template"
+msgstr "&Patrymlun:"
+
+#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 215
+#: rc.cpp:3640
 #, no-c-format
-msgid "Show \"Go To &Definition\""
+msgid "Used &Global Types"
 msgstr ""
 
-#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 72
-#: rc.cpp:4426
+#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 301
+#: rc.cpp:3655
 #, no-c-format
-msgid ""
-"If checked, an option to go directly to the matching tag definition will be "
-"shown. If more than one match, all matches will be shown in the main ctags "
-"result view."
+msgid "Copy to Pro&ject Types"
 msgstr ""
 
-#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 80
-#: rc.cpp:4429
+#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 311
+#: rc.cpp:3658
+#, fuzzy, no-c-format
+msgid "Proje&ct Templates"
+msgstr "Creu Patrymlun"
+
+#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 320
+#: rc.cpp:3661
 #, no-c-format
-msgid "Show \"CT&ags Lookup\""
-msgstr ""
+msgid "Template Name"
+msgstr "Enw Patrymlun"
 
-#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 83
-#: rc.cpp:4432
+#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 347
+#: rc.cpp:3664
 #, no-c-format
-msgid ""
-"If checked, an option to do a full lookup of all macthing tags is shown in the "
-"context menu. The results will be shown in the main ctags results view."
+msgid "C&hange Content..."
 msgstr ""
 
-#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 112
-#: rc.cpp:4438
+#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 355
+#: rc.cpp:3667
 #, no-c-format
-msgid "When more than one hit, go directl&y to the first"
+msgid "&New Template..."
 msgstr ""
 
-#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 115
-#: rc.cpp:4441
+#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 371
+#: rc.cpp:3670
 #, no-c-format
-msgid ""
-"If more than one hit was produced from an attempt to find an exact match, go to "
-"the first match in the list. Note: the <i>Go To Next Match</i> "
-"shortcut can be used to step between the matches."
-msgstr ""
+msgid "Re&move Template"
+msgstr "Gw&aredu Patrymlun"
 
-#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 123
-#: rc.cpp:4444
+#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 396
+#: rc.cpp:3673
 #, no-c-format
-msgid "&Use custom tagfile generation arguments"
+msgid "&Edit Template"
 msgstr ""
 
-#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 126
-#: rc.cpp:4447
+#. i18n: file ./parts/filecreate/fctypeeditbase.ui line 16
+#: rc.cpp:3676
 #, no-c-format
-msgid ""
-"The default arguments should be fine, but if needed a custom generation "
-"arguments string can be used."
-msgstr ""
+msgid "File Type"
+msgstr "Math Ffeil"
 
-#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 140
-#: rc.cpp:4450
+#. i18n: file ./parts/filecreate/fctypeeditbase.ui line 44
+#: rc.cpp:3679
 #, no-c-format
-msgid ""
-"Enter custom arguments to ctags database creation here. Note: do not set a "
-"custom tags file filename here, do that below instead."
+msgid "Type &extension:"
 msgstr ""
 
-#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 158
-#: rc.cpp:4453
+#. i18n: file ./parts/filecreate/fctypeeditbase.ui line 76
+#: rc.cpp:3682
 #, no-c-format
-msgid "Paths"
-msgstr "Llwybrau"
+msgid "Type &name:"
+msgstr "Enw'r& math:"
 
-#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 161
-#: rc.cpp:4456 rc.cpp:4462
+#. i18n: file ./parts/filecreate/fctypeeditbase.ui line 108
+#: rc.cpp:3685
 #, no-c-format
-msgid ""
-"Enter the path to the exuberant ctags binary. If empty, <i>ctags</i> "
-"will be executed via $PATH. Note that it is sometimes installed as <i>"
-"exuberant-ctags</i>."
+msgid "Type &description:"
 msgstr ""
 
-#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 172
-#: rc.cpp:4459
+#. i18n: file ./parts/filecreate/fctypeeditbase.ui line 162
+#: rc.cpp:3688 rc.cpp:3703
 #, no-c-format
-msgid "Path to ctags binary:"
+msgid "Set template content from &file:"
 msgstr ""
 
-#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 209
-#: rc.cpp:4465
+#. i18n: file ./parts/filecreate/fctemplateeditbase.ui line 16
+#: rc.cpp:3697
 #, no-c-format
-msgid "Mana&ge tag files"
+msgid "File Template"
 msgstr ""
 
-#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 228
-#: rc.cpp:4468
-#, fuzzy, no-c-format
-msgid "Path to project tag file:"
-msgstr "&Ffeil y cywaith:"
-
-#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 236
-#: rc.cpp:4471
+#. i18n: file ./parts/filecreate/fctemplateeditbase.ui line 41
+#: rc.cpp:3700 rc.cpp:5761
 #, no-c-format
-msgid ""
-"Enter the full path of the project tagfile. If empty, the file will be called "
-"<i>tags</i> and reside in the root of the project."
+msgid "Template &name:"
 msgstr ""
 
-#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 246
-#: rc.cpp:4474
-#, fuzzy, no-c-format
-msgid "Other tag files:"
-msgstr "Eraill"
-
-#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 262
-#: rc.cpp:4477
-#, fuzzy, no-c-format
-msgid "&Create..."
-msgstr "Creu ..."
-
-#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 278
-#: rc.cpp:4483
-#, fuzzy, no-c-format
-msgid "Remo&ve"
-msgstr "G&waredu"
-
-#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 314
-#: rc.cpp:4489
+#. i18n: file ./parts/scripting/scriptingglobalconfigbase.ui line 16
+#: parts/scripting/scriptingpart.cpp:57 rc.cpp:3712
 #, fuzzy, no-c-format
-msgid "Tags file"
-msgstr "Teitl"
+msgid "Scripting"
+msgstr "Disgrifiad"
 
-#. i18n: file ./parts/ctags2/ctags2_createtagfilebase.ui line 16
-#: rc.cpp:4492
-#, fuzzy, no-c-format
-msgid "Create new tags file"
-msgstr "Methu creu'r ffeil newydd."
+#. i18n: file ./parts/scripting/scriptingglobalconfigbase.ui line 27
+#: rc.cpp:3715
+#, no-c-format
+msgid "Search Custom Directories for Scripts"
+msgstr ""
 
-#. i18n: file ./parts/ctags2/ctags2_createtagfilebase.ui line 40
-#: rc.cpp:4498
+#. i18n: file ./parts/scripting/scriptingglobalconfigbase.ui line 41
+#: rc.cpp:3718
 #, no-c-format
-msgid "Target tags file path:"
+msgid ""
+"<b>NOTE</b> These are directories to search in that are found in your TDE "
+"resource directories.  So if you add the string \"kate/scripts\" to the list "
+"then KScript will look in \"$TDEDIRS/data/kate/scripts\" for scripts.  This "
+"will allow you to get scripts in your home directory as well as system wide "
+"ones."
 msgstr ""
 
-#. i18n: file ./parts/ctags2/ctags2_createtagfilebase.ui line 53
-#: rc.cpp:4501
-#, fuzzy, no-c-format
-msgid "Directory to tag:"
-msgstr "Cyfeiriadur:"
+#. i18n: file ./parts/distpart/distpart_ui.ui line 37
+#: rc.cpp:3721
+#, no-c-format
+msgid "Prepare for Release"
+msgstr ""
 
-#. i18n: file ./parts/ctags2/ctags2_createtagfilebase.ui line 91
-#: rc.cpp:4504
-#, fuzzy, no-c-format
-msgid "&Create"
-msgstr "C&reu"
+#. i18n: file ./parts/distpart/distpart_ui.ui line 79
+#: rc.cpp:3724
+#, no-c-format
+msgid "<H2>Project Packaging & Publishing</H2>"
+msgstr ""
 
-#. i18n: file ./parts/ctags2/ctags2_widgetbase.ui line 28
-#: rc.cpp:4510
+#. i18n: file ./parts/distpart/distpart_ui.ui line 135
+#: rc.cpp:3727
 #, no-c-format
-msgid "Tag"
+msgid "Source &Distribution"
 msgstr ""
 
-#. i18n: file ./parts/ctags2/ctags2_widgetbase.ui line 69
-#: rc.cpp:4519
+#. i18n: file ./parts/distpart/distpart_ui.ui line 151
+#: rc.cpp:3730
 #, no-c-format
-msgid ""
-"Result view for a tag lookup. Click a line to go to the corresponding place in "
-"the code."
+msgid "&Use custom options"
 msgstr ""
 
-#. i18n: file ./parts/ctags2/ctags2_widgetbase.ui line 85
-#: languages/cpp/problemreporter.cpp:141 languages/php/phperrorview.cpp:132
-#: rc.cpp:4522
+#. i18n: file ./parts/distpart/distpart_ui.ui line 154
+#: rc.cpp:3733
 #, no-c-format
-msgid "Lookup:"
+msgid "Default is: %n-%v.tar.gz"
 msgstr ""
 
-#. i18n: file ./parts/ctags2/ctags2_widgetbase.ui line 93
-#: rc.cpp:4525
+#. i18n: file ./parts/distpart/distpart_ui.ui line 173
+#: rc.cpp:3736
 #, no-c-format
-msgid ""
-"Type the identifier you want to lookup. "
-"<p> The identifier will populate and display a reducing list as you type."
+msgid "Source Options"
 msgstr ""
 
-#. i18n: file ./parts/ctags2/ctags2_widgetbase.ui line 101
-#: rc.cpp:4528
+#. i18n: file ./parts/distpart/distpart_ui.ui line 184
+#: rc.cpp:3739
 #, no-c-format
-msgid "Hits:"
-msgstr "Trawiadau :"
+msgid "Use &bzip2 instead of gzip"
+msgstr ""
 
-#. i18n: file ./parts/ctags2/ctags2_widgetbase.ui line 126
-#: rc.cpp:4531
+#. i18n: file ./parts/distpart/distpart_ui.ui line 203
+#: rc.cpp:3742
 #, no-c-format
-msgid "Date:"
-msgstr "Dyddiad:"
+msgid ""
+"<b>Archive name format: </b>"
+"<br> %n - File name "
+"<br> %v - File version "
+"<br> %d - Date of archive"
+msgstr ""
 
-#. i18n: file ./parts/ctags2/ctags2_widgetbase.ui line 137
-#: rc.cpp:4534
+#. i18n: file ./parts/distpart/distpart_ui.ui line 214
+#: rc.cpp:3745
 #, no-c-format
-msgid "Regenerate"
+msgid "%n-%v"
 msgstr ""
 
-#. i18n: file ./parts/ctags2/ctags2_widgetbase.ui line 140
-#: rc.cpp:4537
+#. i18n: file ./parts/distpart/distpart_ui.ui line 217
+#: rc.cpp:3748
 #, no-c-format
-msgid ""
-"Press to regenerate CTags database."
-"<p>This will take some time on a large project."
+msgid "Enter the filename using the format options. "
 msgstr ""
 
-#. i18n: file ./parts/ctags2/ctags2_selecttagfilebase.ui line 16
-#: rc.cpp:4540
+#. i18n: file ./parts/distpart/distpart_ui.ui line 254
+#: rc.cpp:3751
 #, fuzzy, no-c-format
-msgid "Add tags file"
+msgid "&Add Files"
 msgstr "Ychwanegu Ffeil"
 
-#. i18n: file ./parts/ctags2/ctags2_selecttagfilebase.ui line 40
-#: rc.cpp:4546
+#. i18n: file ./parts/distpart/distpart_ui.ui line 270
+#: rc.cpp:3754
 #, fuzzy, no-c-format
-msgid "Tags file:"
-msgstr "Tabl:"
+msgid "&Create Source Archive"
+msgstr "Agor ffeil"
 
-#. i18n: file ./parts/documentation/docprojectconfigwidgetbase.ui line 41
-#: parts/documentation/interfaces/kdevdocumentationplugin.cpp:688 rc.cpp:4567
+#. i18n: file ./parts/distpart/distpart_ui.ui line 286
+#: rc.cpp:3757 rc.cpp:3880
 #, no-c-format
-msgid "Project API Documentation"
-msgstr ""
+msgid "R&eset"
+msgstr "A&ilosod"
 
-#. i18n: file ./parts/documentation/docprojectconfigwidgetbase.ui line 60
-#: rc.cpp:4570
+#. i18n: file ./parts/distpart/distpart_ui.ui line 296
+#: parts/quickopen/quickopenfiledialog.cpp:42
+#: parts/quickopen/quickopenfiledialog.cpp:57 rc.cpp:3760
 #, no-c-format
-msgid "Ca&talog location:"
+msgid "File &list:"
 msgstr ""
 
-#. i18n: file ./parts/documentation/docprojectconfigwidgetbase.ui line 85
-#: rc.cpp:4573
-#, no-c-format
-msgid "C&ollection type:"
-msgstr ""
+#. i18n: file ./parts/distpart/distpart_ui.ui line 309
+#: rc.cpp:3763
+#, fuzzy, no-c-format
+msgid "Package &Information"
+msgstr "G&wybodaeth"
 
-#. i18n: file ./parts/documentation/docprojectconfigwidgetbase.ui line 103
-#: parts/documentation/interfaces/kdevdocumentationplugin.cpp:689 rc.cpp:4576
+#. i18n: file ./parts/distpart/distpart_ui.ui line 349
+#: rc.cpp:3766
 #, no-c-format
-msgid "Project User Manual"
-msgstr ""
+msgid "Ve&ndor:"
+msgstr "Gw&erthwr :"
 
-#. i18n: file ./parts/documentation/selecttopicbase.ui line 16
-#: rc.cpp:4582
-#, no-c-format
-msgid "Choose Topic"
-msgstr ""
+#. i18n: file ./parts/distpart/distpart_ui.ui line 381
+#: rc.cpp:3769
+#, fuzzy, no-c-format
+msgid "Application name"
+msgstr "Cymhwysiad"
 
-#. i18n: file ./parts/documentation/selecttopicbase.ui line 94
-#: rc.cpp:4591
+#. i18n: file ./parts/distpart/distpart_ui.ui line 402
+#: rc.cpp:3772
 #, no-c-format
-msgid "Choose a topic for <b>%1</b>:"
+msgid "&Application name:"
 msgstr ""
 
-#. i18n: file ./parts/documentation/editcatalogdlgbase.ui line 19
-#: rc.cpp:4594 rc.cpp:4723
+#. i18n: file ./parts/distpart/distpart_ui.ui line 413
+#: rc.cpp:3775
 #, no-c-format
-msgid "Documentation Catalog Properties"
-msgstr ""
+msgid "S&ummary:"
+msgstr "C&rynodeb:"
 
-#. i18n: file ./parts/documentation/editcatalogdlgbase.ui line 141
-#: parts/fileview/addfilegroupdlg.cpp:26 rc.cpp:4606 rc.cpp:4732
+#. i18n: file ./parts/distpart/distpart_ui.ui line 435
+#: rc.cpp:3781
 #, no-c-format
-msgid "&Title:"
-msgstr "&Teitl:"
+msgid "R&elease:"
+msgstr "R&hyddhâd:"
 
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 16
-#: parts/documentation/bookmarkview.cpp:49
-#: parts/documentation/documentation_part.cpp:87
-#: parts/documentation/documentation_part.cpp:97
-#: parts/documentation/documentation_part.cpp:105
-#: parts/documentation/docutils.cpp:79 rc.cpp:4609
+#. i18n: file ./parts/distpart/distpart_ui.ui line 446
+#: rc.cpp:3784
 #, no-c-format
-msgid "Documentation"
-msgstr "Dogfenniaeth"
+msgid "&Version:"
+msgstr "Fe&rsiwn:"
 
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 34
-#: rc.cpp:4612
+#. i18n: file ./parts/distpart/distpart_ui.ui line 493
+#: rc.cpp:3787
 #, no-c-format
-msgid "&Documentation Collections"
+msgid ""
+"Version of the file package.\n"
+"Menu item: Project/Project Options/General/Version\n"
+"changes project compiled version number"
 msgstr ""
 
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 119
-#: rc.cpp:4624
+#. i18n: file ./parts/distpart/distpart_ui.ui line 501
+#: rc.cpp:3792
 #, no-c-format
-msgid "Full Text &Search"
-msgstr ""
+msgid "&Group:"
+msgstr "&Grŵp:"
 
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 155
-#: rc.cpp:4627
+#. i18n: file ./parts/distpart/distpart_ui.ui line 512
+#: rc.cpp:3795
 #, no-c-format
-msgid "htse&arch executable:"
+msgid "Pac&kager:"
 msgstr ""
 
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 207
-#: rc.cpp:4630
+#. i18n: file ./parts/distpart/distpart_ui.ui line 538
+#: rc.cpp:3798
 #, no-c-format
-msgid "htdi&g executable:"
+msgid "Advanced Package Op&tions"
 msgstr ""
 
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 226
-#: rc.cpp:4633
+#. i18n: file ./parts/distpart/distpart_ui.ui line 549
+#: rc.cpp:3801
 #, no-c-format
-msgid "Database di&rectory:"
+msgid "&Create development package"
 msgstr ""
 
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 237
-#: rc.cpp:4636
+#. i18n: file ./parts/distpart/distpart_ui.ui line 557
+#: rc.cpp:3804
 #, no-c-format
-msgid "ht&merge executable:"
+msgid "Create documentation package"
 msgstr ""
 
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 252
-#: rc.cpp:4639
+#. i18n: file ./parts/distpart/distpart_ui.ui line 565
+#: rc.cpp:3807
 #, no-c-format
-msgid "O&ther"
-msgstr "A&rall"
+msgid "Include application icon"
+msgstr ""
 
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 280
-#: rc.cpp:4642
+#. i18n: file ./parts/distpart/distpart_ui.ui line 573
+#: rc.cpp:3810
 #, no-c-format
-msgid "Editor Context Menu Items"
+msgid ""
+"Architecture target:<BR><b>(Note: You must have a compiler that supports this "
+"target)</b>"
 msgstr ""
 
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 291
-#: rc.cpp:4645
+#. i18n: file ./parts/distpart/distpart_ui.ui line 579
+#: rc.cpp:3813
 #, no-c-format
-msgid "&Find in documentation"
+msgid "i386"
 msgstr ""
 
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 299
-#: rc.cpp:4648
+#. i18n: file ./parts/distpart/distpart_ui.ui line 584
+#: rc.cpp:3816
 #, no-c-format
-msgid "&Look in documentation index"
+msgid "i586"
 msgstr ""
 
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 307
-#: rc.cpp:4651
+#. i18n: file ./parts/distpart/distpart_ui.ui line 589
+#: rc.cpp:3819
 #, no-c-format
-msgid "S&earch in documentation"
+msgid "i686"
 msgstr ""
 
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 315
-#: rc.cpp:4654
+#. i18n: file ./parts/distpart/distpart_ui.ui line 594
+#: rc.cpp:3822
 #, no-c-format
-msgid "Goto &infopage"
+msgid "AMD K6"
 msgstr ""
 
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 323
-#: rc.cpp:4657
+#. i18n: file ./parts/distpart/distpart_ui.ui line 599
+#: rc.cpp:3825
 #, no-c-format
-msgid "Goto &manpage"
+msgid "AMD K7"
 msgstr ""
 
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 333
-#: rc.cpp:4660
+#. i18n: file ./parts/distpart/distpart_ui.ui line 604
+#: rc.cpp:3828
 #, no-c-format
-msgid "Use KDevelop &Assistant to browse documentation"
+msgid "PPC"
 msgstr ""
 
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 341
-#: rc.cpp:4663
+#. i18n: file ./parts/distpart/distpart_ui.ui line 609
+#: rc.cpp:3831
 #, no-c-format
-msgid "Fonts && Sizes"
+msgid "PPC G3"
 msgstr ""
 
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 360
-#: rc.cpp:4666
+#. i18n: file ./parts/distpart/distpart_ui.ui line 614
+#: rc.cpp:3834
 #, no-c-format
-msgid "Sta&ndard font:"
-msgstr "Wyn&ebfath safonol: "
+msgid "PPC Altevec"
+msgstr ""
 
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 389
-#: rc.cpp:4669
+#. i18n: file ./parts/distpart/distpart_ui.ui line 619
+#: rc.cpp:3837
 #, no-c-format
-msgid "Fi&xed font:"
-msgstr "Wy&nebfath gosodedig:"
-
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 408
-#: rc.cpp:4672
-#, fuzzy, no-c-format
-msgid "&Zoom factor:"
-msgstr "&Edrych am:"
+msgid "Dec Alpha (AXP)"
+msgstr ""
 
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 417
-#: rc.cpp:4675
+#. i18n: file ./parts/distpart/distpart_ui.ui line 624
+#: rc.cpp:3840
 #, no-c-format
-msgid "20"
-msgstr "20"
-
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 422
-#: rc.cpp:4678
-#, fuzzy, no-c-format
-msgid "40"
-msgstr "4"
-
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 427
-#: rc.cpp:4681
-#, fuzzy, no-c-format
-msgid "60"
-msgstr "0"
-
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 432
-#: rc.cpp:4684
-#, fuzzy, no-c-format
-msgid "80"
-msgstr "0"
-
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 437
-#: rc.cpp:4687
-#, fuzzy, no-c-format
-msgid "90"
-msgstr "0"
-
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 442
-#: rc.cpp:4690
-#, fuzzy, no-c-format
-msgid "95"
-msgstr "5"
+msgid "Sparc"
+msgstr ""
 
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 447
-#: rc.cpp:4693
+#. i18n: file ./parts/distpart/distpart_ui.ui line 669
+#: rc.cpp:3843
 #, no-c-format
-msgid "100"
-msgstr "100"
+msgid ""
+"&Build Source \n"
+"Package"
+msgstr ""
 
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 452
-#: rc.cpp:4696
+#. i18n: file ./parts/distpart/distpart_ui.ui line 678
+#: rc.cpp:3847
 #, no-c-format
-msgid "105"
+msgid ""
+"Build Binar&y \n"
+"Package"
 msgstr ""
 
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 457
-#: rc.cpp:4699
+#. i18n: file ./parts/distpart/distpart_ui.ui line 687
+#: rc.cpp:3851
 #, no-c-format
-msgid "110"
+msgid ""
+"E&xport \n"
+"Build Files"
 msgstr ""
 
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 462
-#: rc.cpp:4702
+#. i18n: file ./parts/distpart/distpart_ui.ui line 696
+#: rc.cpp:3855
 #, no-c-format
-msgid "120"
+msgid ""
+"I&mport \n"
+"Build Files"
 msgstr ""
 
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 467
-#: rc.cpp:4705
+#. i18n: file ./parts/distpart/distpart_ui.ui line 777
+#: rc.cpp:3862
 #, no-c-format
-msgid "140"
+msgid "C&hangelog:"
 msgstr ""
 
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 472
-#: rc.cpp:4708
+#. i18n: file ./parts/distpart/distpart_ui.ui line 807
+#: rc.cpp:3865
+#, fuzzy, no-c-format
+msgid "Pr&oject Publishing"
+msgstr "Gosodiadau Cywaith"
+
+#. i18n: file ./parts/distpart/distpart_ui.ui line 826
+#: rc.cpp:3868
 #, no-c-format
-msgid "160"
+msgid "Local Options"
 msgstr ""
 
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 477
-#: rc.cpp:4711
+#. i18n: file ./parts/distpart/distpart_ui.ui line 848
+#: rc.cpp:3871
+#, fuzzy, no-c-format
+msgid "Ge&nerate HTML information page"
+msgstr "Dewisiadau Cyffredinol"
+
+#. i18n: file ./parts/distpart/distpart_ui.ui line 856
+#: rc.cpp:3874
 #, no-c-format
-msgid "180"
+msgid "&User information generated by RPM"
 msgstr ""
 
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 482
-#: rc.cpp:4714
+#. i18n: file ./parts/distpart/distpart_ui.ui line 911
+#: rc.cpp:3877
 #, no-c-format
-msgid "200"
-msgstr ""
+msgid "&Generate"
+msgstr "&Creu"
 
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 487
-#: rc.cpp:4717
+#. i18n: file ./parts/distpart/distpart_ui.ui line 939
+#: rc.cpp:3883
 #, no-c-format
-msgid "250"
+msgid "Re&mote Options"
 msgstr ""
 
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 492
-#: rc.cpp:4720
+#. i18n: file ./parts/distpart/distpart_ui.ui line 980
+#: rc.cpp:3886
 #, no-c-format
-msgid "300"
+msgid "File su&bmission list:"
 msgstr ""
 
-#. i18n: file ./parts/documentation/addcatalogdlgbase.ui line 43
-#: rc.cpp:4726
+#. i18n: file ./parts/distpart/distpart_ui.ui line 1016
+#: rc.cpp:3889
 #, no-c-format
-msgid "Type:"
-msgstr "Math:"
+msgid "+"
+msgstr "+"
 
-#. i18n: file ./parts/documentation/addcatalogdlgbase.ui line 73
-#: rc.cpp:4729
+#. i18n: file ./parts/distpart/distpart_ui.ui line 1032
+#: rc.cpp:3892
 #, no-c-format
-msgid "Locatio&n:"
-msgstr "Lleolia&d:"
+msgid "-"
+msgstr "-"
 
-#. i18n: file ./parts/documentation/find_documentation_optionsbase.ui line 16
-#: rc.cpp:4741
+#. i18n: file ./parts/distpart/distpart_ui.ui line 1053
+#: rc.cpp:3895
 #, no-c-format
-msgid "Find Documentation Options"
+msgid "Upload to &custom FTP site"
 msgstr ""
 
-#. i18n: file ./parts/documentation/find_documentation_optionsbase.ui line 109
-#: rc.cpp:4750
+#. i18n: file ./parts/distpart/distpart_ui.ui line 1061
+#: rc.cpp:3898
 #, no-c-format
-msgid "Go to first match"
+msgid "Upload files to ftp.&kde.org"
 msgstr ""
 
-#. i18n: file ./parts/documentation/find_documentation_optionsbase.ui line 182
-#: rc.cpp:4759
+#. i18n: file ./parts/distpart/distpart_ui.ui line 1086
+#: rc.cpp:3901
+#, fuzzy, no-c-format
+msgid "Sub&mit"
+msgstr "Cyflwyno"
+
+#. i18n: file ./parts/distpart/distpart_ui.ui line 1094
+#: rc.cpp:3904
 #, no-c-format
-msgid ""
-"You can enable and disable search\n"
-"sources and change their priority here."
+msgid "ftp://username:password@ftp.server.com/path/"
 msgstr ""
 
-#. i18n: file ./parts/documentation/find_documentationbase.ui line 25
-#: parts/documentation/documentation_part.cpp:247 rc.cpp:4763
+#. i18n: file ./parts/distpart/distpart_ui.ui line 1102
+#: rc.cpp:3907
 #, no-c-format
-msgid "Find Documentation"
+msgid "Reset"
+msgstr "Ailosod"
+
+#. i18n: file ./parts/distpart/distpart_ui.ui line 1110
+#: rc.cpp:3910
+#, no-c-format
+msgid "Upload to &apps.kde.com"
 msgstr ""
 
-#. i18n: file ./parts/documentation/find_documentationbase.ui line 36
-#: rc.cpp:4766
+#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 16
+#: rc.cpp:3913
 #, no-c-format
-msgid "Search term:"
+msgid "Test Regular Expression"
 msgstr ""
 
-#. i18n: file ./parts/documentation/find_documentationbase.ui line 44
-#: parts/documentation/docconfiglistview.cpp:32
-#: parts/documentation/documentation_widget.cpp:62
-#: parts/documentation/docutils.cpp:90 parts/doxygen/messages.cpp:276
-#: rc.cpp:4769
+#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 30
+#: rc.cpp:3916
 #, no-c-format
-msgid "Search"
-msgstr "Chwilio"
+msgid "&Regular expression:"
+msgstr "&Mynegiad rheolaidd :"
 
-#. i18n: file ./parts/outputviews/filterdlg.ui line 16
-#: rc.cpp:4775
+#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 41
+#: rc.cpp:3919
 #, no-c-format
-msgid "Output Filter Settings"
+msgid "&Test string:"
 msgstr ""
 
-#. i18n: file ./parts/outputviews/filterdlg.ui line 94
-#: rc.cpp:4784
-#, fuzzy, no-c-format
-msgid "Filter"
-msgstr "Ffeil: %1"
-
-#. i18n: file ./parts/outputviews/filterdlg.ui line 111
-#: rc.cpp:4787
+#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 52
+#: rc.cpp:3922
 #, no-c-format
-msgid "Only show lines matching:"
+msgid "Enter a string which will be matched against the regular expression"
 msgstr ""
 
-#. i18n: file ./parts/outputviews/filterdlg.ui line 135
-#: rc.cpp:4793
-#, fuzzy, no-c-format
-msgid "Re&gular expression"
-msgstr "Mynegiad &rheolaidd :"
-
-#. i18n: file ./parts/uimode/uichooser.ui line 16
-#: rc.cpp:4796
-#, fuzzy, no-c-format
-msgid "UIChooser"
-msgstr "Defnyddiwr"
-
-#. i18n: file ./parts/uimode/uichooser.ui line 38
-#: rc.cpp:4799
+#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 87
+#: rc.cpp:3925
 #, no-c-format
-msgid "Use Tabs"
+msgid "&Insert Quoted"
 msgstr ""
 
-#. i18n: file ./parts/uimode/uichooser.ui line 41
-#: rc.cpp:4802
+#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 93
+#: rc.cpp:3928
 #, no-c-format
 msgid ""
-"Some prefer not to have a tab bar and switch between documents using other "
-"means. Kate is one example of this."
+"Inserts the regular expression into the currently opened source code file. "
+"Escapes any special characters like backslash."
 msgstr ""
 
-#. i18n: file ./parts/uimode/uichooser.ui line 52
-#: rc.cpp:4805
-#, fuzzy, no-c-format
-msgid "Al&ways"
-msgstr "Bob tro"
-
-#. i18n: file ./parts/uimode/uichooser.ui line 63
-#: rc.cpp:4808
-#, fuzzy, no-c-format
-msgid "Ne&ver"
-msgstr "Byth"
-
-#. i18n: file ./parts/uimode/uichooser.ui line 76
-#: rc.cpp:4811
+#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 124
+#: rc.cpp:3934
 #, no-c-format
-msgid "Use Close on Hover"
+msgid "Closes the dialog"
 msgstr ""
 
-#. i18n: file ./parts/uimode/uichooser.ui line 79
-#: rc.cpp:4814
+#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 134
+#: rc.cpp:3937
 #, no-c-format
 msgid ""
-"The document tab can optionally be used to close the document, by clicking on "
-"the tab icon."
+"enter a regular expression, for example <tt>KD.*</tt>"
+", which matches all strings beginning with \"KD\""
 msgstr ""
 
-#. i18n: file ./parts/uimode/uichooser.ui line 101
-#: kdevdesigner/designer/editfunctionsimpl.cpp:218
-#: kdevdesigner/designer/formfile.cpp:330
-#: kdevdesigner/designer/formfile.cpp:657
-#: kdevdesigner/designer/mainwindow.cpp:2517
-#: kdevdesigner/designer/mainwindow.cpp:2847
-#: kdevdesigner/designer/mainwindowactions.cpp:1129
-#: kdevdesigner/designer/sourcefile.cpp:224
-#: kdevdesigner/designer/sourcefile.cpp:269
-#: kdevdesigner/designer/variabledialogimpl.cpp:105 rc.cpp:4820
+#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 150
+#: rc.cpp:3940
 #, no-c-format
-msgid "&Yes"
-msgstr "&Ie"
+msgid "Regular Expression T&ype"
+msgstr ""
 
-#. i18n: file ./parts/uimode/uichooser.ui line 121
-#: rc.cpp:4823
+#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 161
+#: rc.cpp:3943
 #, no-c-format
-msgid "Toolview Tab Layout"
+msgid "&Basic POSIX syntax (used by grep)"
 msgstr ""
 
-#. i18n: file ./parts/uimode/uichooser.ui line 124
-#: rc.cpp:4826
+#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 167
+#: rc.cpp:3946 rc.cpp:3952
 #, no-c-format
-msgid ""
-"Three different modes for the IDEAl toolview tabs. \"Text and icons\" is the "
-"most informative, but takes a lot of space. Those with a smaller screen will "
-"typically want \"Icons\"."
+msgid "A description of this syntax can be found in the grep manpage"
 msgstr ""
 
-#. i18n: file ./parts/uimode/uichooser.ui line 135
-#: rc.cpp:4829
+#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 175
+#: rc.cpp:3949
 #, no-c-format
-msgid "Icons"
-msgstr "Eiconau"
-
-#. i18n: file ./parts/uimode/uichooser.ui line 143
-#: rc.cpp:4832
-#, fuzzy, no-c-format
-msgid "Te&xt"
-msgstr "Testun"
+msgid "E&xtended POSIX syntax (used by egrep)"
+msgstr ""
 
-#. i18n: file ./parts/uimode/uichooser.ui line 154
-#: rc.cpp:4835
+#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 186
+#: rc.cpp:3955
 #, no-c-format
-msgid "Text and icons"
+msgid "&QRegExp syntax"
 msgstr ""
 
-#. i18n: file ./parts/uimode/uichooser.ui line 164
-#: rc.cpp:4838
+#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 189
+#: rc.cpp:3958
 #, no-c-format
-msgid "Tabbed Browsing"
-msgstr "Pori â Thabiau"
+msgid ""
+"A description of this syntax can be found in the documentation of the QRegExp "
+"class"
+msgstr ""
 
-#. i18n: file ./parts/uimode/uichooser.ui line 167
-#: rc.cpp:4841
+#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 197
+#: rc.cpp:3961
 #, no-c-format
-msgid "Some extra options for the document tabbar."
+msgid "QRegExp syntax (&minimal)"
 msgstr ""
 
-#. i18n: file ./parts/uimode/uichooser.ui line 178
-#: rc.cpp:4844
+#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 200
+#: rc.cpp:3964
 #, no-c-format
-msgid "Open &new tab after current tab"
-msgstr "Agor tab ne&wydd ar ôl y tab cyfredol"
+msgid ""
+"Matches a QRegExp non-greedy. Please read the QRegExp::setMinimal documentation "
+"for more details."
+msgstr ""
 
-#. i18n: file ./parts/uimode/uichooser.ui line 186
-#: rc.cpp:4847
+#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 208
+#: rc.cpp:3967
 #, no-c-format
-msgid "&Show icons on document tabs"
+msgid "&KRegExp syntax"
 msgstr ""
 
-#. i18n: file ./parts/uimode/uichooser.ui line 194
-#: rc.cpp:4850
+#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 211
+#: rc.cpp:3970
 #, no-c-format
-msgid "Show close &button in tab bar"
+msgid "A description of this syntax can be found in the TDE API documentation."
 msgstr ""
 
-#. i18n: file ./parts/uimode/uichooser.ui line 214
-#: rc.cpp:4853
+#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 240
+#: rc.cpp:3976
 #, no-c-format
-msgid "Note: Changes will take effect after KDevelop is restarted"
+msgid "Matched subgroups:"
 msgstr ""
 
-#. i18n: file ./parts/valgrind/dialog_widget.ui line 24
-#: buildtools/autotools/addicondlg.cpp:45
-#: parts/outputviews/appoutputviewpart.cpp:51 rc.cpp:4856 rc.cpp:6128
+#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 257
+#: buildtools/qmake/projectconfigurationdlg.cpp:1796
+#: kdevdesigner/designer/propertyeditor.cpp:2923
+#: languages/cpp/debugger/variablewidget.cpp:223
+#: languages/ruby/debugger/variablewidget.cpp:146
+#: lib/widgets/propeditor/propertyeditor.cpp:173
+#: parts/partexplorer/partexplorerform.cpp:118 rc.cpp:3982 rc.cpp:7297
+#: rc.cpp:7321 rc.cpp:7429 rc.cpp:7981 rc.cpp:8786
 #, no-c-format
-msgid "Application"
-msgstr "Cymhwysiad"
+msgid "Value"
+msgstr "Gwerth"
 
-#. i18n: file ./parts/valgrind/dialog_widget.ui line 87
-#: rc.cpp:4865 rc.cpp:4883
+#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 284
+#: rc.cpp:3985
 #, no-c-format
-msgid "Valgrind"
+msgid ""
+"Shows which groups were matched. See the corresponding documentation for how "
+"groups are matched."
 msgstr ""
 
-#. i18n: file ./parts/valgrind/dialog_widget.ui line 98
-#: rc.cpp:4868
+#. i18n: file ./src/mimewarningdialog.ui line 24
+#: rc.cpp:3988
 #, no-c-format
-msgid "Memory &leak check"
-msgstr ""
+msgid "Could Not Open File"
+msgstr "Methwyd agor y ffeil"
 
-#. i18n: file ./parts/valgrind/dialog_widget.ui line 137
-#: rc.cpp:4871
+#. i18n: file ./src/mimewarningdialog.ui line 43
+#: rc.cpp:3991
 #, no-c-format
-msgid "&Show still reachable blocks"
+msgid "TDevelop could not open"
 msgstr ""
 
-#. i18n: file ./parts/valgrind/dialog_widget.ui line 147
-#: rc.cpp:4874 rc.cpp:4892
+#. i18n: file ./src/mimewarningdialog.ui line 59
+#: rc.cpp:3994
 #, no-c-format
-msgid "&Trace children"
+msgid "Some URL"
 msgstr ""
 
-#. i18n: file ./parts/valgrind/dialog_widget.ui line 166
-#: rc.cpp:4877 rc.cpp:4886
+#. i18n: file ./src/mimewarningdialog.ui line 75
+#: rc.cpp:3997
 #, no-c-format
-msgid "Additional p&arameters:"
+msgid "<qt>No suitable viewer was found for the <b>%1</b> mimetype.</qt>"
 msgstr ""
 
-#. i18n: file ./parts/valgrind/dialog_widget.ui line 187
-#: rc.cpp:4880 rc.cpp:4889 rc.cpp:6167
+#. i18n: file ./src/mimewarningdialog.ui line 100
+#: rc.cpp:4000
 #, no-c-format
-msgid "E&xecutable:"
-msgstr "G&weithredadwyn:"
+msgid "What Do You Want to Do?"
+msgstr "Beth hoffech chi ei wneud?"
 
-#. i18n: file ./parts/valgrind/dialog_widget.ui line 284
-#: rc.cpp:4895
+#. i18n: file ./src/mimewarningdialog.ui line 111
+#: rc.cpp:4003
 #, no-c-format
-msgid "KCachegrind"
-msgstr "KCachegrind"
-
-#. i18n: file ./parts/valgrind/dialog_widget.ui line 300
-#: rc.cpp:4898
-#, fuzzy, no-c-format
-msgid "Exe&cutable:"
-msgstr "Gweithredadwyn:"
+msgid "Let TDE find a suitable program"
+msgstr ""
 
-#. i18n: file ./parts/bookmarks/bookmarks_settings_base.ui line 24
-#: rc.cpp:4901
+#. i18n: file ./src/mimewarningdialog.ui line 122
+#: rc.cpp:4006
 #, no-c-format
-msgid "Code Tooltip"
+msgid "Open it in TDevelop as plain text"
 msgstr ""
 
-#. i18n: file ./parts/bookmarks/bookmarks_settings_base.ui line 27
-#: rc.cpp:4904
+#. i18n: file ./src/mimewarningdialog.ui line 158
+#: rc.cpp:4009
 #, no-c-format
-msgid ""
-"If checked, a tooltip will be shown when the mouse is over the bookmark, "
-"containing the text in the area surrounding it. "
-"<p> How many surrounding lines to include is decided by the value in the "
-"context box."
+msgid "Always open this mimetype as text"
 msgstr ""
 
-#. i18n: file ./parts/bookmarks/bookmarks_settings_base.ui line 38
-#: rc.cpp:4907
+#. i18n: file ./src/settingswidget.ui line 16
+#: rc.cpp:4018
 #, no-c-format
-msgid "Show code &tooltip"
-msgstr ""
+msgid "Form2"
+msgstr "Ffurflen2"
 
-#. i18n: file ./parts/bookmarks/bookmarks_settings_base.ui line 63
-#: rc.cpp:4910
+#. i18n: file ./src/settingswidget.ui line 30
+#: rc.cpp:4021
 #, no-c-format
-msgid "&Lines of context:"
+msgid "Lo&ad last project on startup"
 msgstr ""
 
-#. i18n: file ./parts/bookmarks/bookmarks_settings_base.ui line 115
-#: rc.cpp:4913
+#. i18n: file ./src/settingswidget.ui line 33
+#: rc.cpp:4024
 #, no-c-format
-msgid "Show Bookmarked Codeline in Bookmark Panel"
+msgid ""
+"Check this if you want TDevelop to load the last opened project on startup"
 msgstr ""
 
-#. i18n: file ./parts/bookmarks/bookmarks_settings_base.ui line 118
-#: rc.cpp:4916
+#. i18n: file ./src/settingswidget.ui line 36
+#: rc.cpp:4027
 #, no-c-format
 msgid ""
-"This decides if the bookmark panel should show the content of the bookmarked "
-"line in addition to the line number."
-"<p>This can be made optional depending on the start of the line, typically used "
-"for only showing lines containing a comment."
+"Mark this checkbox if you want to continue to work with the last project you "
+"worked on. This will cause TDevelop to automatically load this project on "
+"start-up. It will usually be shown in the state you left work so you can "
+"readily proceed."
 msgstr ""
 
-#. i18n: file ./parts/bookmarks/bookmarks_settings_base.ui line 129
-#: rc.cpp:4919
-#, no-c-format
-msgid "&Never"
-msgstr "&Byth"
+#. i18n: file ./src/settingswidget.ui line 44
+#: rc.cpp:4030
+#, fuzzy, no-c-format
+msgid "<qt><h3>Project Settings</h3></qt>"
+msgstr "Gosodiadau Cywaith"
 
-#. i18n: file ./parts/bookmarks/bookmarks_settings_base.ui line 151
-#: rc.cpp:4922
+#. i18n: file ./src/settingswidget.ui line 55
+#: rc.cpp:4033
 #, no-c-format
-msgid "&Only lines beginning with the following string:"
+msgid "Line wrappin&g"
 msgstr ""
 
-#. i18n: file ./parts/bookmarks/bookmarks_settings_base.ui line 189
-#: rc.cpp:4925
+#. i18n: file ./src/settingswidget.ui line 58
+#: rc.cpp:4036
 #, no-c-format
-msgid "&Always"
-msgstr "&Bob tro"
+msgid ""
+"By default, TDevelop will wrap long lines around in the Messages Output View "
+"window"
+msgstr ""
 
-#. i18n: file ./parts/bookmarks/bookmarks_settings_base.ui line 192
-#: rc.cpp:4928
+#. i18n: file ./src/settingswidget.ui line 61
+#: rc.cpp:4039
 #, no-c-format
-msgid "Always show the bookmarked line in addition to the line number"
+msgid ""
+"By default, TDevelop will wrap long lines around in the Messages Output View "
+"window so that valuable information will not be easily overlooked. In some "
+"cases this will clutter long message lists. Remove the checkbox mark if you do "
+"not want the lines wrap around."
 msgstr ""
 
-#. i18n: file ./parts/scripting/scriptingglobalconfigbase.ui line 16
-#: parts/scripting/scriptingpart.cpp:57 rc.cpp:4931
+#. i18n: file ./src/settingswidget.ui line 77
+#: rc.cpp:4042
 #, fuzzy, no-c-format
-msgid "Scripting"
-msgstr "Disgrifiad"
+msgid "&Compiler output:"
+msgstr "Crynhoydd"
 
-#. i18n: file ./parts/scripting/scriptingglobalconfigbase.ui line 27
-#: rc.cpp:4934
+#. i18n: file ./src/settingswidget.ui line 86
+#: rc.cpp:4045
+#, fuzzy, no-c-format
+msgid "Very Short"
+msgstr "&Byr"
+
+#. i18n: file ./src/settingswidget.ui line 91
+#: rc.cpp:4048
 #, no-c-format
-msgid "Search Custom Directories for Scripts"
+msgid "Short"
+msgstr "Byr"
+
+#. i18n: file ./src/settingswidget.ui line 96
+#: rc.cpp:4051
+#, no-c-format
+msgid "Long"
+msgstr "Hir"
+
+#. i18n: file ./src/settingswidget.ui line 111
+#: rc.cpp:4054
+#, no-c-format
+msgid "Choose what sort of output you want from the build process"
 msgstr ""
 
-#. i18n: file ./parts/scripting/scriptingglobalconfigbase.ui line 41
-#: rc.cpp:4937
+#. i18n: file ./src/settingswidget.ui line 117
+#: rc.cpp:4057
 #, no-c-format
 msgid ""
-"<b>NOTE</b> These are directories to search in that are found in your TDE "
-"resource directories.  So if you add the string \"kate/scripts\" to the list "
-"then KScript will look in \"$TDEDIRS/data/kate/scripts\" for scripts.  This "
-"will allow you to get scripts in your home directory as well as system wide "
-"ones."
+"TDevelop preprocesses the messages the Messages Output View window receives "
+"during the build processes in order to filter superfluous information. You can "
+"control the level of detail TDevelop will display using the dropdown box in "
+"this field. \n"
+"<b>Very Short</b>  Displays only warnings, errors, and the filenames which are "
+"compiled. \n"
+"<b>Short</b>  Suppresses all compiler flags and formats the output to be more "
+"readable. \n"
+"<b>Full</b>  Displays all output messages unmodified."
 msgstr ""
 
-#. i18n: file ./editors/editor-chooser/editchooser.ui line 24
-#: rc.cpp:4940
+#. i18n: file ./src/settingswidget.ui line 127
+#: rc.cpp:4063
 #, no-c-format
-msgid "&Embedded Editor"
+msgid "<qt><h3>Output View Settings</h3></qt>"
 msgstr ""
 
-#. i18n: file ./editors/editor-chooser/editchooser.ui line 41
-#: rc.cpp:4943
+#. i18n: file ./src/settingswidget.ui line 149
+#: rc.cpp:4066
 #, no-c-format
-msgid ""
-"<i>Note:</i> Changing the preferred editor will not affect\n"
-"already open files."
+msgid "Default pro&jects directory:"
 msgstr ""
 
-#. i18n: file ./editors/editor-chooser/editchooser.ui line 51
-#: rc.cpp:4947
+#. i18n: file ./src/settingswidget.ui line 163
+#: rc.cpp:4069
 #, no-c-format
-msgid "On External Changes"
+msgid "Set the directory where you want your projects in."
 msgstr ""
 
-#. i18n: file ./editors/editor-chooser/editchooser.ui line 57
-#: rc.cpp:4950
+#. i18n: file ./src/settingswidget.ui line 166
+#: rc.cpp:4072
 #, no-c-format
 msgid ""
-"<p><b>Action to take when an open file is changed on disk</b></p>\n"
-"<p><b>Do nothing</b> - The file will be marked as externally changed and the "
-"user will be asked to verify any attempt to overwrite it </p>\n"
-"<p><b>Alert the user</b> - A dialog will alert the user that a file has changed "
-"and offer the user to reload the file</p>\n"
-"<p><b>Automatically reload</b> - Any files that are not modified in memory are "
-"reloaded, and an alert is shown for any conflicts</p>"
+"By default, TDevelop uses a common parent directory for all new projects. Enter "
+"the absolute path of this common directory in the box or select it from your "
+"directory structure. TDevelop will place the any new project here as a "
+"subdirectory."
 msgstr ""
 
-#. i18n: file ./editors/editor-chooser/editchooser.ui line 68
-#: rc.cpp:4956
-#, fuzzy, no-c-format
-msgid "&Do nothing"
-msgstr "Ychwanegwch rywbeth yma"
-
-#. i18n: file ./editors/editor-chooser/editchooser.ui line 82
-#: rc.cpp:4959
+#. i18n: file ./src/settingswidget.ui line 209
+#: rc.cpp:4075
 #, no-c-format
-msgid "&Alert the user"
+msgid "Window &font:"
 msgstr ""
 
-#. i18n: file ./editors/editor-chooser/editchooser.ui line 90
-#: rc.cpp:4962
+#. i18n: file ./src/settingswidget.ui line 261
+#: rc.cpp:4078
+#, fuzzy, no-c-format
+msgid "Use &TDE setting"
+msgstr "Ffeil yn Bodoli"
+
+#. i18n: file ./src/settingswidget.ui line 267
+#: rc.cpp:4081
 #, no-c-format
-msgid "Automatically reload the file &if safe, alert the user if not"
+msgid "Use the terminal as set in KControl"
 msgstr ""
 
-#. i18n: file ./embedded/visualboyadvance/vbaconfigwidgetbase.ui line 38
-#: rc.cpp:4965
+#. i18n: file ./src/settingswidget.ui line 270
+#: rc.cpp:4084
 #, no-c-format
-msgid "Graphic Filter"
+msgid ""
+"If checked, TDevelop will use the default terminal as set in KControl in TDE "
+"components, Component Chooser."
 msgstr ""
 
-#. i18n: file ./embedded/visualboyadvance/vbaconfigwidgetbase.ui line 50
-#: rc.cpp:4968
+#. i18n: file ./src/settingswidget.ui line 294
+#: rc.cpp:4087
 #, no-c-format
-msgid "Normal mode"
-msgstr "Modd Arferol"
+msgid "&Other:"
+msgstr "&Arall :"
 
-#. i18n: file ./embedded/visualboyadvance/vbaconfigwidgetbase.ui line 58
-#: rc.cpp:4971
+#. i18n: file ./src/settingswidget.ui line 297
+#: rc.cpp:4090
 #, no-c-format
-msgid "TV mode"
+msgid "Set a different terminal than the TDE default one"
 msgstr ""
 
-#. i18n: file ./embedded/visualboyadvance/vbaconfigwidgetbase.ui line 66
-#: rc.cpp:4974
+#. i18n: file ./src/settingswidget.ui line 300
+#: rc.cpp:4093
 #, no-c-format
-msgid "2xSaI"
+msgid "Choose some other terminal different from the default one."
 msgstr ""
 
-#. i18n: file ./embedded/visualboyadvance/vbaconfigwidgetbase.ui line 74
-#: rc.cpp:4977
+#. i18n: file ./src/settingswidget.ui line 320
+#: rc.cpp:4096
 #, no-c-format
-msgid "Super 2xSal"
+msgid "<qt><h3>Terminal Emulation</h3></qt>"
 msgstr ""
 
-#. i18n: file ./embedded/visualboyadvance/vbaconfigwidgetbase.ui line 82
-#: rc.cpp:4980
+#. i18n: file ./src/settingswidget.ui line 365
+#: rc.cpp:4099
 #, no-c-format
-msgid "Super Eagle"
+msgid ""
+"<qt>"
+"<h3>UI Designer Integration</h3>This will only be used when no project is "
+"opened. For the project specific setting see Project Options/C++ Specific and "
+"open the Qt tab.</qt>"
 msgstr ""
 
-#. i18n: file ./embedded/visualboyadvance/vbaconfigwidgetbase.ui line 92
-#: rc.cpp:4983
+#. i18n: file ./src/settingswidget.ui line 399
+#: rc.cpp:4105
 #, no-c-format
-msgid "GBA binary:"
+msgid "Start TDevelop own designer embedded within TDevelop"
 msgstr ""
 
-#. i18n: file ./embedded/visualboyadvance/vbaconfigwidgetbase.ui line 105
-#: rc.cpp:4986
+#. i18n: file ./src/settingswidget.ui line 410
+#: rc.cpp:4111
 #, no-c-format
-msgid "Additional parameters:"
+msgid "Run TDevelop's &designer as a separate application"
 msgstr ""
 
-#. i18n: file ./embedded/visualboyadvance/vbaconfigwidgetbase.ui line 113
-#: rc.cpp:4989
+#. i18n: file ./src/settingswidget.ui line 413
+#: rc.cpp:4114
 #, no-c-format
-msgid "VisualBoy Advance (emulator):"
+msgid "Start TDevelop own designer externally"
 msgstr ""
 
-#. i18n: file ./embedded/visualboyadvance/vbaconfigwidgetbase.ui line 157
-#: rc.cpp:4995
-#, no-c-format
-msgid "Scaling"
-msgstr "Graddio"
+#. i18n: file ./src/settingswidget.ui line 424
+#: rc.cpp:4120
+#, fuzzy, no-c-format
+msgid "Run &Qt Designer"
+msgstr "Dylunydd Qt"
 
-#. i18n: file ./embedded/visualboyadvance/vbaconfigwidgetbase.ui line 169
-#: rc.cpp:4998
+#. i18n: file ./src/settingswidget.ui line 440
+#: rc.cpp:4129
 #, no-c-format
-msgid "1x"
+msgid "Directory &navigation messages"
 msgstr ""
 
-#. i18n: file ./embedded/visualboyadvance/vbaconfigwidgetbase.ui line 177
-#: rc.cpp:5001
+#. i18n: file ./src/settingswidget.ui line 446
+#: rc.cpp:4135
 #, no-c-format
-msgid "2x"
+msgid "Check this if you want to know what directory make is in"
 msgstr ""
 
-#. i18n: file ./embedded/visualboyadvance/vbaconfigwidgetbase.ui line 185
-#: rc.cpp:5004
+#. i18n: file ./src/settingswidget.ui line 449
+#: rc.cpp:4138
 #, no-c-format
-msgid "3x"
+msgid ""
+"The make tool usually will display messages like “Entering directory”, or "
+"“Leaving directory” when it switches the directories it currently works in. As "
+"this clutters the messages list in the Messages Output View window, TDevelop "
+"suppresses those messages by default. Mark the checkbox if you want to protocol "
+"which directories make worked in."
 msgstr ""
 
-#. i18n: file ./embedded/visualboyadvance/vbaconfigwidgetbase.ui line 193
-#: rc.cpp:5007
+#. i18n: file ./src/settingswidget.ui line 497
+#: rc.cpp:4141
+#, fuzzy, no-c-format
+msgid "Force English compiler output"
+msgstr "Crynhoydd"
+
+#. i18n: file ./src/settingswidget.ui line 505
+#: rc.cpp:4144
 #, no-c-format
-msgid "4x"
+msgid "Use kde language and disable \"jump-to-source\" functionality"
 msgstr ""
 
-#. i18n: file ./embedded/visualboyadvance/vbaconfigwidgetbase.ui line 203
-#: rc.cpp:5010
+#. i18n: file ./src/generalinfowidgetbase.ui line 16
+#: rc.cpp:4147
 #, no-c-format
-msgid "Full screen"
-msgstr "Sgrîn Lawn"
+msgid "General Settings"
+msgstr "Gosodiadau Cyffredinol"
 
-#. i18n: file ./embedded/visualboyadvance/vbaconfigwidgetbase.ui line 211
-#: rc.cpp:5013
+#. i18n: file ./src/generalinfowidgetbase.ui line 25
+#: rc.cpp:4150
 #, no-c-format
-msgid "Start in external terminal"
+msgid "Absolute Path"
 msgstr ""
 
-#. i18n: file ./buildtools/ada/adaproject_optionsdlgbase.ui line 19
-#: buildtools/ada/adaproject_part.cpp:375
-#: buildtools/ada/adaproject_part.cpp:406 rc.cpp:5016
+#. i18n: file ./src/generalinfowidgetbase.ui line 30
+#: rc.cpp:4153
 #, no-c-format
-msgid "Ada Compiler"
+msgid "Relative to Project File"
 msgstr ""
 
-#. i18n: file ./buildtools/ada/adaproject_optionsdlgbase.ui line 64
-#: rc.cpp:5019
-#, no-c-format
-msgid "Configuration:"
-msgstr "Ffurfwedd :"
-
-#. i18n: file ./buildtools/ada/adaproject_optionsdlgbase.ui line 170
-#: rc.cpp:5031
+#. i18n: file ./src/generalinfowidgetbase.ui line 67
+#: rc.cpp:4159
 #, no-c-format
-msgid "Compiler &options:"
+msgid "Project directory:"
 msgstr ""
 
-#. i18n: file ./buildtools/ada/adaproject_optionsdlgbase.ui line 189
-#: rc.cpp:5034
+#. i18n: file ./src/generalinfowidgetbase.ui line 115
+#: rc.cpp:4171
 #, no-c-format
-msgid "Ada &compiler:"
+msgid ""
+"Project Version\n"
+"You may need to run automake & friends to update\n"
+"the version in all files after changing this."
 msgstr ""
 
-#. i18n: file ./buildtools/ada/adaproject_optionsdlgbase.ui line 223
-#: rc.cpp:5037 rc.cpp:5929
+#. i18n: file ./src/generalinfowidgetbase.ui line 124
+#: rc.cpp:4176
 #, no-c-format
-msgid "Compiler co&mmand:"
+msgid ""
+"Used in templates as $EMAIL$\n"
+"Placed in the AUTHORS file"
 msgstr ""
 
-#. i18n: file ./buildtools/ada/adaproject_optionsdlgbase.ui line 304
-#: rc.cpp:5040 rc.cpp:5935
+#. i18n: file ./src/generalinfowidgetbase.ui line 133
+#: rc.cpp:4180
 #, no-c-format
-msgid "Main &source file:"
+msgid ""
+"Used in templates as $AUTHOR$\n"
+"Placed in the AUTHORS file"
 msgstr ""
 
-#. i18n: file ./buildtools/ada/adaproject_optionsdlgbase.ui line 349
-#: rc.cpp:5043
+#. i18n: file ./src/generalinfowidgetbase.ui line 177
+#: rc.cpp:4184
 #, no-c-format
-msgid "Load Default Compiler Options"
+msgid "Where the project starts."
 msgstr ""
 
-#. i18n: file ./buildtools/ant/antoptionswidget.ui line 22
-#: rc.cpp:5046
+#. i18n: file ./src/generalinfowidgetbase.ui line 189
+#: rc.cpp:4187
 #, no-c-format
-msgid "Quiet"
+msgid "Please select a project directory"
 msgstr ""
 
-#. i18n: file ./buildtools/ant/antoptionswidget.ui line 27
-#: languages/pascal/compiler/fpcoptions/optiontabs.cpp:38 rc.cpp:5049
-#, no-c-format
-msgid "Verbose"
-msgstr "Amleiriog"
+#. i18n: file ./src/generalinfowidgetbase.ui line 197
+#: rc.cpp:4190
+#, fuzzy, no-c-format
+msgid "Default encoding:"
+msgstr "&Rhagosod :"
 
-#. i18n: file ./buildtools/ant/antoptionswidget.ui line 32
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:356
-#: languages/pascal/compiler/fpcoptions/optiontabs.cpp:410 rc.cpp:5052
-#: rc.cpp:5521
+#. i18n: file ./src/generalinfowidgetbase.ui line 205
+#: rc.cpp:4193
 #, no-c-format
-msgid "Debug"
+msgid "Default encoding used when opening text files"
 msgstr ""
 
-#. i18n: file ./buildtools/ant/antoptionswidget.ui line 78
-#: rc.cpp:5055
+#. i18n: file ./src/generalinfowidgetbase.ui line 213
+#: rc.cpp:4196
+#, fuzzy, no-c-format
+msgid "Text that stays in the project file."
+msgstr "Methu Cyfieithu'r Testun Tarddiad"
+
+#. i18n: file ./src/pluginselectdialogbase.ui line 16
+#: rc.cpp:4199
+#, fuzzy, no-c-format
+msgid "Plugin Selection"
+msgstr "G&wagu Dewisiad"
+
+#. i18n: file ./src/pluginselectdialogbase.ui line 27
+#: rc.cpp:4202
+#, fuzzy, no-c-format
+msgid "Plugins:"
+msgstr "Ategion"
+
+#. i18n: file ./src/pluginselectdialogbase.ui line 51
+#: rc.cpp:4205
 #, no-c-format
-msgid "&Build file:"
+msgid "Make this the default for this profile:"
 msgstr ""
 
-#. i18n: file ./buildtools/ant/antoptionswidget.ui line 89
-#: rc.cpp:5058
+#. i18n: file ./src/pluginselectdialogbase.ui line 59
+#: rc.cpp:4208
+#, fuzzy, no-c-format
+msgid "Save &as Default"
+msgstr "Gosod fel Rhagosodiad"
+
+#. i18n: file ./src/profileengine/editor/addprofilewidget.ui line 16
+#: src/profileengine/editor/profileeditor.cpp:237 rc.cpp:4220 rc.cpp:4235
+#, fuzzy, no-c-format
+msgid "Add Profile"
+msgstr "&Ychwanegu Ffeil..."
+
+#. i18n: file ./src/profileengine/editor/addprofilewidget.ui line 73
+#: rc.cpp:4226
+#, fuzzy, no-c-format
+msgid "&Generic name:"
+msgstr "&Creu"
+
+#. i18n: file ./src/profileengine/editor/profileeditorbase.ui line 16
+#: rc.cpp:4232
 #, no-c-format
-msgid "&Verbosity:"
+msgid "Profile Editor for The TDevelop Platform"
 msgstr ""
 
-#. i18n: file ./buildtools/ant/antoptionswidget.ui line 100
-#: rc.cpp:5061 rc.cpp:6263
-#, no-c-format
-msgid "&Properties:"
+#. i18n: file ./src/profileengine/editor/profileeditorbase.ui line 132
+#: src/profileengine/editor/profileeditor.cpp:255
+#: src/profileengine/editor/profileeditor.cpp:267 rc.cpp:4244
+#, fuzzy, no-c-format
+msgid "Remove Profile"
+msgstr "Gwaredu ffeil"
+
+#. i18n: file ./src/profileengine/editor/profileeditorbase.ui line 212
+#: rc.cpp:4256
+#, fuzzy, no-c-format
+msgid "Derived properties:"
 msgstr "&Priodweddau :"
 
-#. i18n: file ./buildtools/ant/antoptionswidget.ui line 112
-#: kdevdesigner/designer/propertyeditor.cpp:2922
-#: parts/partexplorer/partexplorerform.cpp:116 rc.cpp:5064 rc.cpp:6257
-#: rc.cpp:8007
-#, no-c-format
-msgid "Property"
-msgstr "Priodwedd"
+#. i18n: file ./src/profileengine/editor/profileeditorbase.ui line 241
+#: rc.cpp:4259
+#, fuzzy, no-c-format
+msgid "Own properties:"
+msgstr "&Priodweddau :"
 
-#. i18n: file ./buildtools/ant/classpathwidget.ui line 24
-#: rc.cpp:5070
+#. i18n: file ./src/profileengine/editor/profileeditorbase.ui line 258
+#: rc.cpp:4262
 #, no-c-format
-msgid "Class&path"
+msgid "Lists of Explicitly Enabled && Disabled Plugins"
 msgstr ""
 
-#. i18n: file ./buildtools/lib/parsers/qmake/tests/viewerbase.ui line 16
-#: rc.cpp:5073 rc.cpp:5100
+#. i18n: file ./src/profileengine/editor/profileeditorbase.ui line 283
+#: rc.cpp:4265
 #, no-c-format
-msgid "Viewer"
-msgstr "Gwelydd"
+msgid "Enabled:"
+msgstr "Alluogir :"
 
-#. i18n: file ./buildtools/lib/parsers/qmake/tests/viewerbase.ui line 59
-#: rc.cpp:5076 rc.cpp:5118
+#. i18n: file ./src/profileengine/editor/profileeditorbase.ui line 289
+#: rc.cpp:4268 rc.cpp:4274
+#, fuzzy, no-c-format
+msgid "Plugin Name"
+msgstr "Ategyn"
+
+#. i18n: file ./src/profileengine/editor/profileeditorbase.ui line 323
+#: rc.cpp:4271
 #, no-c-format
-msgid "Add All From Directory"
-msgstr ""
+msgid "Disabled:"
+msgstr "Analluogir :"
 
-#. i18n: file ./buildtools/lib/parsers/qmake/tests/viewerbase.ui line 73
-#: rc.cpp:5079 rc.cpp:5121
+#. i18n: file ./src/profileengine/editor/profileeditorbase.ui line 349
+#: rc.cpp:4277 rc.cpp:4280 rc.cpp:8591 rc.cpp:8777
 #, no-c-format
-msgid "Choose File to Add..."
+msgid "<-"
 msgstr ""
 
-#. i18n: file ./buildtools/lib/parsers/qmake/tests/viewerbase.ui line 137
-#: rc.cpp:5082 rc.cpp:5103
-#, fuzzy, no-c-format
-msgid "Parse Tree"
-msgstr "Dosrannu :"
-
-#. i18n: file ./buildtools/lib/parsers/qmake/tests/viewerbase.ui line 157
-#: rc.cpp:5088 rc.cpp:5109
-#, fuzzy, no-c-format
-msgid "Value 1"
-msgstr "Gwerth"
-
-#. i18n: file ./buildtools/lib/parsers/qmake/tests/viewerbase.ui line 168
-#: rc.cpp:5091 rc.cpp:5112
+#. i18n: file ./src/profileengine/editor/profileeditorbase.ui line 430
+#: rc.cpp:4283
 #, fuzzy, no-c-format
-msgid "Value 2"
-msgstr "Gwerth"
+msgid "Available plugins:"
+msgstr "&Gweithredoedd ar gael:"
 
-#. i18n: file ./buildtools/lib/parsers/qmake/tests/viewerbase.ui line 179
-#: rc.cpp:5094
+#. i18n: file ./src/profileengine/editor/profileeditorbase.ui line 447
+#: rc.cpp:4289 rc.cpp:4304
 #, fuzzy, no-c-format
-msgid "Value 3"
-msgstr "Gwerth"
+msgid "Generic Name"
+msgstr "&Creu"
 
-#. i18n: file ./buildtools/lib/parsers/qmake/tests/viewerbase.ui line 199
-#: rc.cpp:5097 rc.cpp:5115
+#. i18n: file ./src/profileengine/editor/profileeditorbase.ui line 489
+#: rc.cpp:4292 rc.cpp:4295 rc.cpp:8594 rc.cpp:8780
 #, no-c-format
-msgid "Source to Be Written Back"
+msgid "->"
 msgstr ""
 
-#. i18n: file ./buildtools/lib/widgets/environmentdisplaydialogbase.ui line 16
-#: rc.cpp:5124
+#. i18n: file ./src/profileengine/editor/profileeditorbase.ui line 507
+#: rc.cpp:4298
 #, no-c-format
-msgid "Environment"
+msgid "List of Plugins to Be Loaded"
 msgstr ""
 
-#. i18n: file ./buildtools/lib/widgets/environmentdisplaydialogbase.ui line 27
-#: rc.cpp:5127
+#. i18n: file ./kdevdesigner/designer/variabledialog.ui line 41
+#: kdevdesigner/designer/hierarchyview.cpp:1201
+#: kdevdesigner/designer/variabledialogimpl.cpp:103
+#: kdevdesigner/designer/variabledialogimpl.cpp:122 rc.cpp:4310
 #, no-c-format
-msgid "Current Environment"
+msgid "Edit Variables"
 msgstr ""
 
-#. i18n: file ./buildtools/lib/widgets/environmentdisplaydialogbase.ui line 36
+#. i18n: file ./kdevdesigner/designer/variabledialog.ui line 56
 #: languages/bash/bashsupport_part.cpp:283
 #: languages/cpp/debugger/variablewidget.cpp:222
 #: languages/kjssupport/kjssupport_part.cpp:384
 #: languages/kjssupport/kjssupport_part.cpp:411
 #: languages/ruby/debugger/variablewidget.cpp:145
-#: parts/classview/classtreebase.cpp:69 rc.cpp:5130 rc.cpp:8831
+#: parts/classview/classtreebase.cpp:69 rc.cpp:4313 rc.cpp:7318
 #, no-c-format
 msgid "Variable"
 msgstr "Newidyn"
 
-#. i18n: file ./buildtools/lib/widgets/subclassesdlgbase.ui line 16
-#: rc.cpp:5139
+#. i18n: file ./kdevdesigner/designer/variabledialog.ui line 105
+#: rc.cpp:4322
 #, no-c-format
-msgid "Related Subclasses"
+msgid "Variable Properties"
 msgstr ""
 
-#. i18n: file ./buildtools/lib/widgets/subclassesdlgbase.ui line 30
-#: rc.cpp:5142
+#. i18n: file ./kdevdesigner/designer/variabledialog.ui line 122
+#: rc.cpp:4325
 #, no-c-format
-msgid "&Add Relation"
-msgstr ""
+msgid "Acc&ess:"
+msgstr "Cyrc&hiad:"
 
-#. i18n: file ./buildtools/lib/widgets/subclassesdlgbase.ui line 41
-#: rc.cpp:5145
+#. i18n: file ./kdevdesigner/designer/variabledialog.ui line 133
+#: rc.cpp:4328
 #, no-c-format
-msgid "&Remove Relation"
-msgstr ""
+msgid "&Variable:"
+msgstr "&Newidyn:"
 
-#. i18n: file ./buildtools/lib/widgets/subclassesdlgbase.ui line 96
-#: rc.cpp:5148
+#. i18n: file ./kdevdesigner/designer/variabledialog.ui line 147
+#: kdevdesigner/designer/hierarchyview.cpp:762
+#: kdevdesigner/designer/hierarchyview.cpp:843
+#: kdevdesigner/designer/hierarchyview.cpp:852 rc.cpp:4331 rc.cpp:4840
+#: rc.cpp:5557
 #, no-c-format
-msgid "Related subclass &location:"
-msgstr ""
+msgid "public"
+msgstr "cyhoeddus"
 
-#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 16
-#: buildtools/autotools/autoprojectpart.cpp:225
-#: buildtools/custommakefiles/customprojectpart.cpp:200
-#: buildtools/pascal/pascalproject_part.cpp:403
-#: buildtools/qmake/trollprojectpart.cpp:273
-#: embedded/visualboyadvance/visualboyadvance_part.cpp:71 rc.cpp:5157
+#. i18n: file ./kdevdesigner/designer/variabledialog.ui line 152
+#: kdevdesigner/designer/customwidgeteditorimpl.cpp:560
+#: kdevdesigner/designer/hierarchyview.cpp:760
+#: kdevdesigner/designer/hierarchyview.cpp:841
+#: kdevdesigner/designer/hierarchyview.cpp:850 rc.cpp:4334 rc.cpp:4843
+#: rc.cpp:5560
 #, no-c-format
-msgid "Run Options"
-msgstr ""
+msgid "protected"
+msgstr "gwarchodir"
 
-#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 35
-#: rc.cpp:5160
-#, fuzzy, no-c-format
-msgid "Main Program"
-msgstr "Rhaglen"
+#. i18n: file ./kdevdesigner/designer/variabledialog.ui line 157
+#: kdevdesigner/designer/hierarchyview.cpp:758
+#: kdevdesigner/designer/hierarchyview.cpp:839
+#: kdevdesigner/designer/hierarchyview.cpp:848 rc.cpp:4337 rc.cpp:5563
+#, no-c-format
+msgid "private"
+msgstr "preivat"
 
-#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 52
-#: rc.cpp:5163
+#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 41
+#: rc.cpp:4349
 #, no-c-format
-msgid "Note: These options override target specific settings."
+msgid "Edit Listbox"
 msgstr ""
 
-#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 58
-#: rc.cpp:5166
+#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 47
+#: rc.cpp:4352
 #, no-c-format
 msgid ""
-"For Automake and QMake type projects, the proper way to set these options are "
-"per target in the <b>Automake Manager</b> and <b>QMake Manager</b>"
-", respectively."
+"<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 ./buildtools/lib/widgets/runoptionswidgetbase.ui line 66
-#: rc.cpp:5169
+#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 115
+#: rc.cpp:4361 rc.cpp:4532 rc.cpp:4981 rc.cpp:5044 rc.cpp:5080 rc.cpp:5218
+#: rc.cpp:5593 rc.cpp:5731 rc.cpp:6025 rc.cpp:6226 rc.cpp:6353
 #, no-c-format
-msgid "The command line arguments passed to the main program when run"
+msgid "Close the dialog and apply all the changes."
 msgstr ""
 
-#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 74
-#: rc.cpp:5172
-#, fuzzy, no-c-format
-msgid "Run Arg&uments:"
-msgstr "Ym&resymiadau:"
-
-#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 85
-#: rc.cpp:5175
-#, fuzzy, no-c-format
-msgid "Executa&ble:"
-msgstr "Gweithredadwyn:"
-
-#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 96
-#: rc.cpp:5178
+#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 129
+#: rc.cpp:4367 rc.cpp:4538 rc.cpp:4987 rc.cpp:5224 rc.cpp:6232
 #, no-c-format
-msgid "Full path to the executable"
+msgid "Apply all changes."
 msgstr ""
 
-#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 104
-#: rc.cpp:5181
-#, fuzzy, no-c-format
-msgid "Debug Ar&guments:"
-msgstr "Ym&resymiadau:"
-
-#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 115
-#: rc.cpp:5184
+#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 143
+#: rc.cpp:4373 rc.cpp:4544 rc.cpp:4993 rc.cpp:5050 rc.cpp:5086 rc.cpp:5230
+#: rc.cpp:5374 rc.cpp:5599 rc.cpp:5737 rc.cpp:6031 rc.cpp:6238 rc.cpp:6359
 #, no-c-format
-msgid "The command line arguments passed to the main program when debugged"
+msgid "Close the dialog and discard any changes."
 msgstr ""
 
-#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 123
-#: rc.cpp:5187
-#, fuzzy, no-c-format
-msgid "Working &Directory:"
-msgstr "&Cyfeiriadur:"
+#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 153
+#: kdevdesigner/designer/actiondnd.cpp:399 rc.cpp:4376 rc.cpp:4427
+#, no-c-format
+msgid "Delete Item"
+msgstr "Dileu Eitem"
 
-#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 134
-#: rc.cpp:5190
+#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 156
+#: rc.cpp:4379 rc.cpp:6103
 #, no-c-format
-msgid "Sets the current working directory for the launched process"
+msgid "The list of items."
 msgstr ""
 
-#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 163
-#: rc.cpp:5196
+#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 164
+#: rc.cpp:4382 rc.cpp:4493
 #, no-c-format
-msgid "Automaticall&y compile before execution"
+msgid "&Item Properties"
 msgstr ""
 
-#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 166
-#: rc.cpp:5199
+#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 181
+#: rc.cpp:4385 rc.cpp:4505 rc.cpp:6145
 #, no-c-format
-msgid ""
-"If the program is not up-to-date with the source code, compile it before "
-"starting its execution"
-msgstr ""
+msgid "&Pixmap:"
+msgstr "&Picsfap :"
 
-#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 174
-#: rc.cpp:5202
+#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 192
+#: rc.cpp:4388 rc.cpp:4508 rc.cpp:5257 rc.cpp:5314 rc.cpp:6076 rc.cpp:6148
 #, no-c-format
-msgid "&Automatically install before execution"
+msgid "Label4"
 msgstr ""
 
-#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 185
-#: rc.cpp:5205
+#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 212
+#: rc.cpp:4391 rc.cpp:4511 rc.cpp:5260 rc.cpp:5317 rc.cpp:6079 rc.cpp:6151
 #, no-c-format
-msgid "Use &tdesu when installing"
+msgid "Delete Pixmap"
 msgstr ""
 
-#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 196
-#: rc.cpp:5208
+#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 215
+#: rc.cpp:4394 rc.cpp:4514
 #, no-c-format
-msgid "Start in e&xternal terminal"
+msgid "Delete the selected item's pixmap."
 msgstr ""
 
-#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 199
-#: rc.cpp:5211
+#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 232
+#: rc.cpp:4400 rc.cpp:4520 rc.cpp:4659 rc.cpp:5269 rc.cpp:5326 rc.cpp:6088
+#: rc.cpp:6160
 #, no-c-format
-msgid "Start the main program in an external terminal"
+msgid "Select a Pixmap"
 msgstr ""
 
-#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 209
-#: rc.cpp:5214 rc.cpp:5268 rc.cpp:5998 rc.cpp:6053 rc.cpp:6464
+#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 235
+#: rc.cpp:4403
 #, no-c-format
-msgid "Environment &Variables"
+msgid "Choose a pixmap file for the selected item."
 msgstr ""
 
-#. i18n: file ./buildtools/lib/widgets/removesubprojectdlgbase.ui line 16
-#: rc.cpp:5217
+#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 243
+#: rc.cpp:4406 rc.cpp:4496 rc.cpp:6058 rc.cpp:6166
 #, no-c-format
-msgid "[REMOVE SUBPROJECT]"
-msgstr ""
+msgid "&Text:"
+msgstr "&Testun:"
 
-#. i18n: file ./buildtools/lib/widgets/removesubprojectdlgbase.ui line 42
-#: rc.cpp:5220
+#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 260
+#: rc.cpp:4409 rc.cpp:4499 rc.cpp:6061
 #, no-c-format
-msgid "&Information"
-msgstr "G&wybodaeth"
+msgid "Change text"
+msgstr "Newid y Testun"
 
-#. i18n: file ./buildtools/lib/widgets/removesubprojectdlgbase.ui line 53
-#: rc.cpp:5223 rc.cpp:6587 rc.cpp:6791
+#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 263
+#: rc.cpp:4412
 #, no-c-format
-msgid "[REMOVE QUESTION]"
+msgid "Change the selected item's text."
 msgstr ""
 
-#. i18n: file ./buildtools/lib/widgets/removesubprojectdlgbase.ui line 61
-#: rc.cpp:5226 rc.cpp:6590 rc.cpp:6794
+#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 273
+#: rc.cpp:4415 rc.cpp:4475 rc.cpp:6094
 #, no-c-format
-msgid "Also &remove it from disk"
-msgstr ""
+msgid "&New Item"
+msgstr "&Eitem Newydd"
 
-#. i18n: file ./buildtools/lib/widgets/removesubprojectdlgbase.ui line 75
-#: rc.cpp:5229
+#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 276
+#: rc.cpp:4418 rc.cpp:4478 rc.cpp:6097
 #, no-c-format
-msgid "<b>Note:</b> You will not be able to undo this operation."
-msgstr ""
+msgid "Add an item"
+msgstr "Ychwanegu eitem"
 
-#. i18n: file ./buildtools/lib/widgets/environmentvariableswidgetbase.ui line 16
-#: rc.cpp:5238
+#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 279
+#: rc.cpp:4421
 #, no-c-format
-msgid "Environment Variables"
+msgid "<b>Add a new item.</b><p>New items are appended to the list.</p>"
 msgstr ""
 
-#. i18n: file ./buildtools/lib/widgets/environmentvariableswidgetbase.ui line 111
-#: rc.cpp:5253
+#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 287
+#: rc.cpp:4424 rc.cpp:4484 rc.cpp:6043
 #, no-c-format
-msgid "A&dd / Copy"
-msgstr ""
+msgid "&Delete Item"
+msgstr "&Dileu Eitem"
 
-#. i18n: file ./buildtools/lib/widgets/environmentvariableswidgetbase.ui line 136
-#: rc.cpp:5256
+#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 293
+#: rc.cpp:4430
 #, no-c-format
-msgid "E&nvironment"
+msgid "Delete the selected item"
 msgstr ""
 
-#. i18n: file ./buildtools/lib/widgets/makeoptionswidgetbase.ui line 16
-#: buildtools/autotools/autoprojectpart.cpp:226
-#: buildtools/qmake/trollprojectpart.cpp:276 rc.cpp:5259 rc.cpp:5971
-#: rc.cpp:6014
+#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 324
+#: rc.cpp:4433 rc.cpp:5236 rc.cpp:5290 rc.cpp:6115 rc.cpp:6211
 #, no-c-format
-msgid "Make Options"
-msgstr ""
+msgid "Move up"
+msgstr "Symud i fyny"
 
-#. i18n: file ./buildtools/lib/widgets/makeoptionswidgetbase.ui line 27
-#: rc.cpp:5262
+#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 327
+#: rc.cpp:4436
 #, no-c-format
-msgid "&Abort on first error"
+msgid "Moves the selected item up."
 msgstr ""
 
-#. i18n: file ./buildtools/lib/widgets/makeoptionswidgetbase.ui line 35
-#: rc.cpp:5265
+#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 341
+#: rc.cpp:4439 rc.cpp:5242 rc.cpp:5296 rc.cpp:6121 rc.cpp:6196
 #, no-c-format
-msgid "Onl&y display commands without actually executing them"
-msgstr ""
+msgid "Move down"
+msgstr "Symud i lawr"
 
-#. i18n: file ./buildtools/lib/widgets/makeoptionswidgetbase.ui line 51
-#: rc.cpp:5271
+#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 344
+#: rc.cpp:4442
 #, no-c-format
-msgid "&Name of make executable:"
+msgid "Move the selected item down."
 msgstr ""
 
-#. i18n: file ./buildtools/lib/widgets/makeoptionswidgetbase.ui line 92
-#: rc.cpp:5274
+#. i18n: file ./kdevdesigner/designer/connectiondialog.ui line 41
+#: rc.cpp:4445
 #, no-c-format
-msgid "Num&ber of jobs to run simultaneously:"
+msgid "View & Edit Connections"
 msgstr ""
 
-#. i18n: file ./buildtools/lib/widgets/makeoptionswidgetbase.ui line 137
-#: rc.cpp:5277
+#. i18n: file ./kdevdesigner/designer/connectiondialog.ui line 58
+#: parts/filecreate/filecreate_part.cpp:81 rc.cpp:4448
 #, no-c-format
-msgid "Run more than one &job at a time"
-msgstr ""
+msgid "&New"
+msgstr "&Newydd"
 
-#. i18n: file ./buildtools/lib/widgets/makeoptionswidgetbase.ui line 145
-#: rc.cpp:5280
+#. i18n: file ./kdevdesigner/designer/connectiondialog.ui line 74
+#: rc.cpp:4451
 #, no-c-format
-msgid "Make priority:"
-msgstr ""
+msgid "&Connections:"
+msgstr "C&ysylltiadau :"
 
-#. i18n: file ./buildtools/qmake/newwidgetdlgbase.ui line 24
-#: rc.cpp:5283
+#. i18n: file ./kdevdesigner/designer/connectiondialog.ui line 129
+#: rc.cpp:4463
 #, no-c-format
-msgid "New Widget"
+msgid "&Edit Slots..."
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/newwidgetdlgbase.ui line 43
-#: rc.cpp:5289
+#. i18n: file ./kdevdesigner/designer/iconvieweditor.ui line 41
+#: rc.cpp:4466
 #, no-c-format
-msgid "Widget Properties"
+msgid "Edit Iconview"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/newwidgetdlgbase.ui line 54
-#: rc.cpp:5292
+#. i18n: file ./kdevdesigner/designer/iconvieweditor.ui line 47
+#: rc.cpp:4469
 #, no-c-format
-msgid "Subclassing"
+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>"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/newwidgetdlgbase.ui line 73
-#: rc.cpp:5295
+#. i18n: file ./kdevdesigner/designer/iconvieweditor.ui line 78
+#: rc.cpp:4472
 #, no-c-format
-msgid "Caption:"
-msgstr "Pennawd:"
+msgid "All items in the iconview."
+msgstr ""
 
-#. i18n: file ./buildtools/qmake/newwidgetdlgbase.ui line 86
-#: rc.cpp:5298
+#. i18n: file ./kdevdesigner/designer/iconvieweditor.ui line 106
+#: rc.cpp:4481
 #, no-c-format
-msgid "Subclass name:"
+msgid "Create a new item for the iconview."
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 16
-#: rc.cpp:5310
-#, fuzzy, no-c-format
-msgid "QMake Manager Options"
-msgstr "Dewisiadau'r Dudalen Gyntaf"
+#. i18n: file ./kdevdesigner/designer/iconvieweditor.ui line 117
+#: rc.cpp:4487 rc.cpp:6046
+#, no-c-format
+msgid "Delete item"
+msgstr " Dileu eitem"
 
-#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 29
-#: rc.cpp:5313
+#. i18n: file ./kdevdesigner/designer/iconvieweditor.ui line 120
+#: rc.cpp:4490
 #, no-c-format
-msgid ""
-"- Also look into C++/Qt to define the QMake, Qt and Designer paths.\n"
-"- Environment variables that should be resolved during parsing can be set on "
-"the Make Options page.\n"
-"- For changes on this page to take effect the project needs to be reloaded."
+msgid "Delete the selected item."
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 45
-#: rc.cpp:5318
-#, fuzzy, no-c-format
-msgid "QMake Project File:"
-msgstr "&Ffeil y cywaith:"
-
-#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 57
-#: rc.cpp:5321
+#. i18n: file ./kdevdesigner/designer/iconvieweditor.ui line 192
+#: rc.cpp:4502
 #, no-c-format
-msgid ""
-"This is the top level qmake project file, from which the project manager will "
-"be populated.\n"
-"Leave this empty to automatically search for a .pro file in the project "
-"directory."
+msgid "Change the text for the selected item."
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 70
-#: rc.cpp:5325
+#. i18n: file ./kdevdesigner/designer/iconvieweditor.ui line 268
+#: rc.cpp:4523
 #, no-c-format
-msgid "Behaviour on Subproject Change"
+msgid "Select a pixmap file for the current item."
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 81
-#: rc.cpp:5328
+#. i18n: file ./kdevdesigner/designer/richtextfontdialog.ui line 41
+#: rc.cpp:4547
 #, no-c-format
-msgid ""
-"The following settings determine what the project configuration dialog should "
-"do when another subproject is selected while the dialog is still open."
+msgid "Font Properties"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 92
-#: rc.cpp:5331
-#, fuzzy, no-c-format
-msgid "&Always Save"
-msgstr "&Bob tro"
+#. i18n: file ./kdevdesigner/designer/richtextfontdialog.ui line 73
+#: kdevdesigner/designer/propertyeditor.cpp:1278 rc.cpp:4550
+#, no-c-format
+msgid "default"
+msgstr "rhagosodiad"
 
-#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 95
-#: rc.cpp:5334
+#. i18n: file ./kdevdesigner/designer/richtextfontdialog.ui line 85
+#: rc.cpp:4553
 #, no-c-format
-msgid "Always save the configuration when changing the project."
-msgstr ""
+msgid "&Font:"
+msgstr "&Wynebfath:"
 
-#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 98
-#: rc.cpp:5337
+#. i18n: file ./kdevdesigner/designer/richtextfontdialog.ui line 96
+#: rc.cpp:4556
 #, no-c-format
-msgid ""
-"Always save the project configuration when selecting a another sub project."
+msgid "Rel. &size:"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 106
-#: rc.cpp:5340
+#. i18n: file ./kdevdesigner/designer/richtextfontdialog.ui line 124
+#: rc.cpp:4559
 #, no-c-format
-msgid "&Never Save (!Warning: This can lead to loss of setting changes)"
-msgstr ""
+msgid "C&olor:"
+msgstr "L&liw:"
 
-#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 109
-#: rc.cpp:5343
+#. i18n: file ./kdevdesigner/designer/richtextfontdialog.ui line 133
+#: rc.cpp:4562
 #, no-c-format
-msgid "Never save the configuration when changing the project."
+msgid "0"
+msgstr "0"
+
+#. i18n: file ./kdevdesigner/designer/richtextfontdialog.ui line 138
+#: rc.cpp:4565
+#, no-c-format
+msgid "-4"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 112
-#: rc.cpp:5346
+#. i18n: file ./kdevdesigner/designer/richtextfontdialog.ui line 143
+#: rc.cpp:4568
 #, no-c-format
-msgid ""
-"Never save the project configuration when selecting a another sub project."
+msgid "-3"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 120
-#: rc.cpp:5349
+#. i18n: file ./kdevdesigner/designer/richtextfontdialog.ui line 148
+#: rc.cpp:4571
 #, no-c-format
-msgid "As&k"
+msgid "-2"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 126
-#: rc.cpp:5352
+#. i18n: file ./kdevdesigner/designer/richtextfontdialog.ui line 153
+#: rc.cpp:4574
 #, no-c-format
-msgid ""
-"Ask wether the configuration should be saved when switching the project."
+msgid "-1"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 129
-#: rc.cpp:5355
+#. i18n: file ./kdevdesigner/designer/richtextfontdialog.ui line 158
+#: rc.cpp:4577
 #, no-c-format
-msgid ""
-"Always ask wether the configuration should be saved when selecting another "
-"subproject.."
+msgid "+1"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 147
-#: rc.cpp:5358
+#. i18n: file ./kdevdesigner/designer/richtextfontdialog.ui line 163
+#: rc.cpp:4580
 #, no-c-format
-msgid "Repla&ce File Paths with matching Variables when adding files"
+msgid "+2"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 153
-#: rc.cpp:5361
+#. i18n: file ./kdevdesigner/designer/richtextfontdialog.ui line 168
+#: rc.cpp:4583
 #, no-c-format
-msgid ""
-"This replaces the relative paths of added files with existing custom variables "
-"if the value assigned to it is the same as the path."
+msgid "+3"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 161
-#: rc.cpp:5364
+#. i18n: file ./kdevdesigner/designer/richtextfontdialog.ui line 173
+#: rc.cpp:4586
 #, no-c-format
-msgid "Show variables in filenames in the QMake projectmanager view."
+msgid "+4"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 169
-#: rc.cpp:5367
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 41
+#: rc.cpp:4595
 #, no-c-format
-msgid ""
-"Display only filenames in the QMake Manager (Project reload is needed after "
-"changing this setting)"
+msgid "Edit Custom Widgets"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 178
-#: rc.cpp:5370
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 47
+#: rc.cpp:4598
 #, no-c-format
 msgid ""
-"Do not use the QMake Default Options\n"
-"This disables the reading of any .qmake.cache files or mkspecs."
+"<b>Edit Custom Widgets</b>"
+"<p>Add or delete custom widgets from <i>Qt Designer</i>"
+"'s database, and edit the properties of existing widgets.</p>"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 186
-#: rc.cpp:5374
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 64
+#: rc.cpp:4601
 #, no-c-format
-msgid "Show parse error in message box"
+msgid "The list of all custom widgets known to Qt Designer."
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 16
-#: rc.cpp:5377
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 72
+#: rc.cpp:4604
 #, no-c-format
-msgid "Create Scope"
+msgid "&New Widget"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 35
-#: rc.cpp:5380
-#, fuzzy, no-c-format
-msgid "Scopetype:"
-msgstr "Math papur"
-
-#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 41
-#: rc.cpp:5383
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 75
+#: rc.cpp:4607
 #, no-c-format
-msgid "Simple Scope"
+msgid "Add new custom widget."
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 46
-#: rc.cpp:5386
-#, fuzzy, no-c-format
-msgid "Function Scope"
-msgstr "Ffwythiant"
-
-#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 51
-#: rc.cpp:5389
-#, fuzzy, no-c-format
-msgid "Include File"
-msgstr "Enw Ffeil"
-
-#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 58
-#: rc.cpp:5392
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 78
+#: rc.cpp:4610
 #, no-c-format
-msgid "Choose between the different types of new scopes"
+msgid ""
+"<b>Create an empty custom widget and add it to the list.</b>"
+"<p>New custom widgets have a default name and header file, which must both be "
+"changed to appropriate values.</p>"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 85
-#: buildtools/qmake/trollprojectwidget.cpp:1061 rc.cpp:5395
-#, fuzzy, no-c-format
-msgid "Scope Settings"
-msgstr "Gosodiadau Gweinydd"
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 86
+#: rc.cpp:4613
+#, no-c-format
+msgid "&Delete Widget"
+msgstr "&Dileu celfigyn"
 
-#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 111
-#: rc.cpp:5398
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 89
+#: rc.cpp:4616
 #, no-c-format
-msgid "Specify the new scope name"
+msgid "Delete custom widget"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 119
-#: rc.cpp:5401
-#, fuzzy, no-c-format
-msgid "Scopename:"
-msgstr "Enw'r math:"
-
-#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 148
-#: rc.cpp:5404
-#, fuzzy, no-c-format
-msgid "Function:"
-msgstr "F&fwythiant:"
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 92
+#: rc.cpp:4619
+#, no-c-format
+msgid ""
+"<b>Delete the selected custom widget.</b>"
+"<p>You can only delete widgets that are not used in any open form.</p>"
+msgstr ""
 
-#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 154
-#: rc.cpp:5407
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 148
+#: rc.cpp:4628
 #, no-c-format
-msgid "Specify the function name"
+msgid "Closes the Dialog."
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 162
-#: rc.cpp:5410
-#, fuzzy, no-c-format
-msgid "Arguments:"
-msgstr "Ym&resymiadau:"
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 175
+#: rc.cpp:4631
+#, no-c-format
+msgid "&Load Descriptions..."
+msgstr ""
 
-#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 168
-#: rc.cpp:5413
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 178
+#: rc.cpp:4634
 #, no-c-format
-msgid "Specify the list of function arguments, delimited by a comma"
+msgid "Loads widget description file"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 197
-#: rc.cpp:5416
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 182
+#: rc.cpp:4637
 #, no-c-format
-msgid "*.pri"
+msgid ""
+"<b>Load Descriptions</b>"
+"<p>Loads a file which contains descriptions of custom widgets, so that these "
+"custom widgets can be used in the Qt Designer.</p>\n"
+"<p>Since it is a lot of work to type in all the information for custom widgets, "
+"you should consider using the tqtcreatecw tool which is in "
+"$QTDIR/tools/designer/tools/tqtcreatecw. Using tqtcreatecw you can create "
+"custom widget description files for your custom widgets without the need to "
+"type in all the information manually. For more information about the README "
+"file in the tqtcreatecw directory</p>"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 203
-#: rc.cpp:5419
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 190
+#: rc.cpp:4641
 #, no-c-format
-msgid "Choose the .pri file to include"
+msgid "&Save Descriptions..."
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 211
-#: rc.cpp:5422
-#, fuzzy, no-c-format
-msgid "Include File:"
-msgstr "Enw Ffeil"
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 193
+#: rc.cpp:4644
+#, no-c-format
+msgid "Saves widget description file"
+msgstr ""
 
-#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 222
-#: rc.cpp:5425
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 196
+#: rc.cpp:4647
 #, no-c-format
-msgid "&use !include instead of include"
+msgid ""
+"<b>Save Descriptions</b>"
+"<p>Saves all the descriptions of the shown custom widgets to a file which can "
+"then be used to import the custom widgets elsewhere."
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 225
-#: rc.cpp:5428
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 204
+#: rc.cpp:4650
 #, no-c-format
-msgid "Use !include instead of include for the function scope"
+msgid "Change the properties of the selected custom widget."
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 25
-#: rc.cpp:5437
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 211
+#: rc.cpp:4653
 #, no-c-format
-msgid "QMake Subproject Configuration"
+msgid "De&finition"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 90
-#: kdevdesigner/designer/multilineeditorimpl.cpp:101 rc.cpp:5449
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 262
+#: rc.cpp:4662
 #, no-c-format
-msgid "Basics"
+msgid ""
+"<b>Select a pixmap file.</b>"
+"<p>The pixmap will be used to represent the widget in forms.</p>"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 112
-#: rc.cpp:5455
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 286
+#: rc.cpp:4665
 #, no-c-format
-msgid "Librar&y"
+msgid "Enter filename"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 115
-#: rc.cpp:5458
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 289
+#: rc.cpp:4668
 #, no-c-format
-msgid "Create a library"
+msgid ""
+"<b>Change the header file's name for the selected custom widget.</b>"
+"<p>The header file will be included by forms using the widget.</p>"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 123
-#: rc.cpp:5461
-#, fuzzy, no-c-format
-msgid "&Subdirectories"
-msgstr "&Cyfeiriadur:"
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 306
+#: rc.cpp:4674
+#, no-c-format
+msgid "Choose headerfile"
+msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 126
-#: rc.cpp:5464
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 309
+#: rc.cpp:4677
 #, no-c-format
-msgid "This project holds subdirectories"
+msgid "Look for the header file using a file dialog."
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 137
-#: rc.cpp:5467
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 327
+#: rc.cpp:4686
 #, no-c-format
-msgid "Ordered"
+msgid "Select access"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 140
-#: rc.cpp:5470
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 330
+#: rc.cpp:4689
 #, no-c-format
-msgid "Build the subprojects in the order they are listed in the .pro file"
+msgid ""
+"<b>Change how the include file will be included.</b>"
+"<p>Global include files will be included using &lt;&gt;-brackets, while local "
+"files will included using quotation marks.</p>"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 168
-#: rc.cpp:5473
-#, fuzzy, no-c-format
-msgid "A&pplication"
-msgstr "Cymhwysiad"
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 340
+#: rc.cpp:4692
+#, no-c-format
+msgid "Change classname"
+msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 171
-#: rc.cpp:5476
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 343
+#: rc.cpp:4695
 #, no-c-format
-msgid "Create an application"
+msgid ""
+"<b>Enter the classname for the selected custom widget.</b>"
+"<p>A class of that name must be defined in the header file.</p>"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 181
-#: rc.cpp:5479
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 351
+#: rc.cpp:4698
 #, no-c-format
-msgid "Target"
-msgstr "Targed"
+msgid "Heade&rfile:"
+msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 192
-#: rc.cpp:5482
-#, fuzzy, no-c-format
-msgid "Path:"
-msgstr "&Llwybr:"
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 362
+#: rc.cpp:4701
+#, no-c-format
+msgid "Cl&ass:"
+msgstr "Do&sbarth:"
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 203
-#: rc.cpp:5485
-#, fuzzy, no-c-format
-msgid "Output file:"
-msgstr "Ffeil a&llbwn :"
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 373
+#: rc.cpp:4704 rc.cpp:5278 rc.cpp:5311
+#, no-c-format
+msgid "Pixmap:"
+msgstr "Picsfap :"
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 226
-#: rc.cpp:5488
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 381
+#: rc.cpp:4707
 #, no-c-format
-msgid "Target Installation"
+msgid "Si&ze hint:"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 242
-#: rc.cpp:5491
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 392
+#: rc.cpp:4710
 #, no-c-format
-msgid "I&nstall"
-msgstr "G&osod"
-
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 250
-#: rc.cpp:5494
-#, fuzzy, no-c-format
-msgid "Installation path:"
-msgstr "Arsefydlu"
-
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 263
-#: rc.cpp:5497
-#, fuzzy, no-c-format
-msgid "Makefile"
-msgstr "&Make"
+msgid "Size p&olicy:"
+msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 284
-#: rc.cpp:5500
-#, fuzzy, no-c-format
-msgid "Arguments"
-msgstr "Ym&resymiadau"
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 401
+#: lib/widgets/propeditor/propertymachinefactory.cpp:147 rc.cpp:4713
+#: rc.cpp:4749
+#, no-c-format
+msgid "Fixed"
+msgstr "Sefydlog"
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 295
-#: rc.cpp:5503
-#, fuzzy, no-c-format
-msgid "Run arguments:"
-msgstr "Ym&resymiadau:"
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 406
+#: lib/widgets/propeditor/propertymachinefactory.cpp:148 rc.cpp:4716
+#: rc.cpp:4752
+#, no-c-format
+msgid "Minimum"
+msgstr "Lleiafswm"
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 313
-#: rc.cpp:5506
-#, fuzzy, no-c-format
-msgid "Debug Arguments:"
-msgstr "Ym&resymiadau:"
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 411
+#: lib/widgets/propeditor/propertymachinefactory.cpp:149 rc.cpp:4719
+#: rc.cpp:4755
+#, no-c-format
+msgid "Maximum"
+msgstr "Uchafswm"
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 366
-#: rc.cpp:5515
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 416
+#: lib/widgets/propeditor/propertymachinefactory.cpp:150 rc.cpp:4722
+#: rc.cpp:4758
 #, no-c-format
-msgid "Build Mode"
+msgid "Preferred"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 372
-#: rc.cpp:5518 rc.cpp:5530
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 421
+#: rc.cpp:4725 rc.cpp:4761
 #, no-c-format
-msgid "Set project to be built in release mode"
+msgid "MinimumExpanding"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 394
-#: rc.cpp:5524
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 426
+#: lib/widgets/propeditor/propertymachinefactory.cpp:151 rc.cpp:4728
+#: rc.cpp:4764
 #, no-c-format
-msgid "Set project to be built in debug mode"
+msgid "Expanding"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 402
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:355
-#: languages/pascal/compiler/fpcoptions/optiontabs.cpp:409 rc.cpp:5527
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 433
+#: rc.cpp:4731
 #, no-c-format
-msgid "Release"
-msgstr "Rhyddhad"
-
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 416
-#: rc.cpp:5533
-#, fuzzy, no-c-format
-msgid "Debug && Release"
-msgstr "&Rhyddhad"
+msgid "Vertical Sizepolicy"
+msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 422
-#: rc.cpp:5536
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 436
+#: rc.cpp:4734
 #, no-c-format
-msgid "Set project to be built in debug_and_release mode"
+msgid "Choose theQt::Vertical size policy"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 440
-#: rc.cpp:5539
-#, fuzzy, no-c-format
-msgid "Enable warnings"
-msgstr "Galluogi"
-
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 443
-#: rc.cpp:5542
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 453
+#: rc.cpp:4737
 #, no-c-format
-msgid "Show compiler warnings"
+msgid "Size hint width"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 454
-#: rc.cpp:5545
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 456
+#: rc.cpp:4740 rc.cpp:4746
 #, no-c-format
-msgid "Build All"
+msgid ""
+"<b>Set the size hint for the selected widget.</b>"
+"<p>The size hint provides the recommended size for the widget. Enter a sizehint "
+"of -1/-1 if no size is recommended.</p>"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 457
-#: rc.cpp:5548
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 473
+#: rc.cpp:4743
 #, no-c-format
-msgid "Builds Debug and Release version if Debug&Release is configured"
+msgid "Size hint height"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 469
-#: rc.cpp:5551
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 514
+#: rc.cpp:4767
 #, no-c-format
-msgid "Requirements"
-msgstr "Anghenion"
-
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 480
-#: rc.cpp:5554 rc.cpp:5617
-#, fuzzy, no-c-format
-msgid "OpenGL"
-msgstr "Open&GL"
+msgid "Horizontal Sizepolicy"
+msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 483
-#: rc.cpp:5557
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 517
+#: rc.cpp:4770
 #, no-c-format
-msgid "Requires the OpenGL (or Mesa) headers/libraries"
+msgid "Choose the horizontal size policy for the widget"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 491
-#: rc.cpp:5560
-#, fuzzy, no-c-format
-msgid "STL"
-msgstr "SQL"
-
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 499
-#: parts/valgrind/valgrind_widget.cpp:96 rc.cpp:5563
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 542
+#: rc.cpp:4773
 #, no-c-format
-msgid "Thread"
+msgid "Con&tainer widget"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 502
-#: rc.cpp:5566
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 545
+#: rc.cpp:4776
 #, no-c-format
-msgid "Requires support for multi-threaded application or library."
+msgid "Container Widget"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 510
-#: rc.cpp:5569
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 549
+#: rc.cpp:4779
 #, no-c-format
-msgid "Qt"
+msgid ""
+"<p><b>Container Widget</b></p>\n"
+"<p>If this custom widget is able to contain other widgets (children), check "
+"this checkbox.</p>"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 513
-#: rc.cpp:5572
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 559
+#: rc.cpp:4783
 #, no-c-format
-msgid "Requires the Qt header files/library"
+msgid "Si&gnals"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 521
-#: rc.cpp:5575
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 576
+#: rc.cpp:4786
 #, no-c-format
-msgid "X11"
+msgid "The list of all the Q_SIGNALS that the selected widget can emit."
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 524
-#: rc.cpp:5578 rc.cpp:5668
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 615
+#: rc.cpp:4789
 #, no-c-format
-msgid "Support required for X11 application or library"
+msgid "N&ew Signal"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 532
-#: rc.cpp:5581
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 621
+#: rc.cpp:4792
 #, no-c-format
-msgid "Precompiled headers"
+msgid "Add new signal"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 540
-#: rc.cpp:5584
-#, fuzzy, no-c-format
-msgid "RTTI"
-msgstr "RTT&I"
-
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 548
-#: rc.cpp:5587
-#, fuzzy, no-c-format
-msgid "Windows"
-msgstr "Ffenestr"
-
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 556
-#: rc.cpp:5590
-#, fuzzy, no-c-format
-msgid "Custom Configuration"
-msgstr "Ffurf&wedd"
-
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 564
-#: rc.cpp:5593
-#, fuzzy, no-c-format
-msgid "Exceptions "
-msgstr "Eit&hriadau "
-
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 580
-#: rc.cpp:5596
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 624
+#: rc.cpp:4795
 #, no-c-format
-msgid "Console"
-msgstr "Terfynell"
+msgid ""
+"<b>Add a new signal for the current custom widget.</b>"
+"<p>An argument list should be provided in the signal's name, and the name must "
+"be unique.</p>"
+msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 586
-#: rc.cpp:5599
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 632
+#: rc.cpp:4798
 #, no-c-format
-msgid "Check to build a win32 console app"
+msgid "Dele&te Signal"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 599
-#: rc.cpp:5602
-#, fuzzy, no-c-format
-msgid "Qt4 Libraries"
-msgstr "Offer Allanol"
-
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 610
-#: rc.cpp:5605
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 638
+#: rc.cpp:4801
 #, no-c-format
-msgid "Gui"
+msgid "Delete signal"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 621
-#: parts/doxygen/messages.cpp:202 rc.cpp:5608
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 641
+#: rc.cpp:4804
 #, no-c-format
-msgid "XML"
-msgstr "XML"
-
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 629
-#: rc.cpp:5611
-#, fuzzy, no-c-format
-msgid "Network"
-msgstr "Newydd"
-
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 637
-#: src/profileengine/editor/profileeditor.cpp:137 rc.cpp:5614
-#, fuzzy, no-c-format
-msgid "Core"
-msgstr "Sgôr"
-
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 656
-#: rc.cpp:5620
-#, fuzzy, no-c-format
-msgid "QtUiTools"
-msgstr "Offer"
+msgid ""
+"<b>Delete the signal.</b>"
+"<p>All connections using this signal will also be deleted.</p>"
+msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 664
-#: languages/sql/sqlsupport_part.cpp:59 rc.cpp:5623
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 665
+#: rc.cpp:4807
 #, no-c-format
-msgid "SQL"
-msgstr "SQL"
+msgid "S&ignal:"
+msgstr "A&rwydd:"
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 672
-#: rc.cpp:5626
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 676
+#: rc.cpp:4810
 #, no-c-format
-msgid "SVG"
+msgid "Change signal name"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 680
-#: rc.cpp:5629
-#, fuzzy, no-c-format
-msgid "QtTest"
-msgstr "&Profi"
-
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 688
-#: rc.cpp:5632
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 679
+#: rc.cpp:4813 rc.cpp:4834
 #, no-c-format
-msgid "Qt3 Support"
+msgid ""
+"<b>Change the name of the selected slot.</b>"
+"<p>An argument list should be provided in the signal's name, and the name must "
+"be unique.</p>"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 696
-#: rc.cpp:5635
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 691
+#: rc.cpp:4816
 #, no-c-format
-msgid "QDBus (Qt4.2)"
+msgid "S&lots"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 704
-#: rc.cpp:5638
-#, fuzzy, no-c-format
-msgid "QtAssistant"
-msgstr "Cymhorthwr KDevelop"
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 706
+#: kdevdesigner/designer/connectiontable.cpp:41
+#: parts/classview/classtreebase.cpp:75 rc.cpp:4819
+#, no-c-format
+msgid "Slot"
+msgstr "Agen"
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 712
-#: rc.cpp:5641
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 736
+#: rc.cpp:4825
 #, no-c-format
-msgid "QtScript (Qt4.3)"
+msgid "The list of all the custom widget's slots."
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 720
-#: rc.cpp:5644
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 744
+#: rc.cpp:4828
 #, no-c-format
-msgid "QtWebKit (Qt4.4)"
-msgstr ""
+msgid "Sl&ot:"
+msgstr "Ag&en :"
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 728
-#: rc.cpp:5647
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 755
+#: rc.cpp:4831
 #, no-c-format
-msgid "QtXmlPatterns (Qt4.4)"
+msgid "Change slot name"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 736
-#: rc.cpp:5650
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 766
+#: rc.cpp:4837 rc.cpp:5554
 #, no-c-format
-msgid "Phonon (Qt4.4)"
-msgstr ""
+msgid "&Access:"
+msgstr "&Cyrchiad:"
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 744
-#: rc.cpp:5653
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 787
+#: rc.cpp:4846
 #, no-c-format
-msgid "QtHelp (Qt4.4)"
+msgid "Change slot access"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 754
-#: rc.cpp:5656
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 790
+#: rc.cpp:4849
 #, no-c-format
-msgid "Library Options"
+msgid ""
+"<b>Change the slot's access policy.</b>"
+"<p>You can only connect to the widget's public Q_SLOTS.</p>"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 776
-#: rc.cpp:5659
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 829
+#: rc.cpp:4852
 #, no-c-format
-msgid "Build as static library"
+msgid "N&ew Slot"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 801
-#: rc.cpp:5665
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 835
+#: rc.cpp:4855
 #, no-c-format
-msgid "Make libtool archive"
+msgid "Add new slot"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 839
-#: rc.cpp:5671
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 838
+#: rc.cpp:4858
 #, no-c-format
-msgid "Build as shared library"
+msgid ""
+"<b>Add a new slot to the current custom widget.</b>"
+"<p>An argument list should be provided in the signal's name, and the name must "
+"be unique.</p>"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 850
-#: rc.cpp:5674
-#, fuzzy, no-c-format
-msgid "Designer Plugin"
-msgstr "Analluogi"
-
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 869
-#: rc.cpp:5677
-#, fuzzy, no-c-format
-msgid "Library version:"
-msgstr "Fe&rsiwn:"
-
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 910
-#: rc.cpp:5680
-#, fuzzy, no-c-format
-msgid "Includes"
-msgstr "Mynegai"
-
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 932
-#: rc.cpp:5683 rc.cpp:5704 rc.cpp:5725 rc.cpp:5743 rc.cpp:5752 rc.cpp:5764
-#: rc.cpp:5782 rc.cpp:5791 rc.cpp:5854
-#, fuzzy, no-c-format
-msgid "Move Up"
-msgstr "Symud i &Fyny"
-
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 940
-#: rc.cpp:5686 rc.cpp:5707 rc.cpp:5728 rc.cpp:5746 rc.cpp:5755 rc.cpp:5767
-#: rc.cpp:5785 rc.cpp:5794 rc.cpp:5857
-#, fuzzy, no-c-format
-msgid "Move Down"
-msgstr "Symud i &Lawr"
-
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 965
-#: rc.cpp:5689
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 846
+#: rc.cpp:4861
 #, no-c-format
-msgid "Directories Outside Project"
+msgid "Dele&te Slot"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 984
-#: rc.cpp:5692
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 852
+#: rc.cpp:4864
 #, no-c-format
-msgid "Directories Inside Project"
+msgid "Delete slot"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1013
-#: rc.cpp:5695 rc.cpp:5716 rc.cpp:5734 rc.cpp:5773
-#, fuzzy, no-c-format
-msgid "Add..."
-msgstr "Ychw&anegu..."
-
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1074
-#: rc.cpp:5710
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 855
+#: rc.cpp:4867
 #, no-c-format
-msgid "Libraries"
+msgid ""
+"<b>Delete the slot.</b>"
+"<p>All connections using this slot will also be deleted.</p>"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1091
-#: rc.cpp:5713
-#, fuzzy, no-c-format
-msgid "External Library Dirs"
-msgstr "Offer Allanol"
-
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1187
-#: rc.cpp:5731
-#, fuzzy, no-c-format
-msgid "External Libraries"
-msgstr "Offer Allanol"
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 867
+#: rc.cpp:4870
+#, no-c-format
+msgid "&Properties"
+msgstr "&Priodweddau"
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1283
-#: rc.cpp:5749
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 915
+#: rc.cpp:4873
 #, no-c-format
-msgid "Link Convenience Libraries Inside Project"
+msgid "N&ew Property"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1351
-#: rc.cpp:5758
-#, fuzzy, no-c-format
-msgid "Dependencies"
-msgstr "&Dibyniaethau"
-
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1368
-#: rc.cpp:5761
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 921
+#: rc.cpp:4876
 #, no-c-format
-msgid "Targets in Project"
+msgid "Add new property"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1443
-#: rc.cpp:5770
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 924
+#: rc.cpp:4879
 #, no-c-format
-msgid "Miscellaneous Targets"
+msgid ""
+"<b>Add a new property to the current custom widget.</b>"
+"<p>The properties must be implemented in the class using Qt's property "
+"system.</p>"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1539
-#: rc.cpp:5788
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 932
+#: rc.cpp:4882
 #, no-c-format
-msgid "Order in Which Sub Projects Are Built"
+msgid "Dele&te Property"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1610
-#: buildtools/custommakefiles/customprojectpart.cpp:203 rc.cpp:5797
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 938
+#: rc.cpp:4885
 #, no-c-format
-msgid "Build Options"
+msgid "Delete property"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1629
-#: rc.cpp:5800
-#, fuzzy, no-c-format
-msgid "Compiler Options"
-msgstr "Crynhoydd"
-
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1656
-#: rc.cpp:5803
-#, fuzzy, no-c-format
-msgid "Debug flags:"
-msgstr "Dadnamydd"
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 941
+#: rc.cpp:4888
+#, no-c-format
+msgid "Deletes the selected property."
+msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1667
-#: rc.cpp:5806
-#, fuzzy, no-c-format
-msgid "Release flags:"
-msgstr "R&hyddhâd:"
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 949
+#: rc.cpp:4891
+#, no-c-format
+msgid "String"
+msgstr "Llinell"
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1678
-#: rc.cpp:5809
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 954
+#: rc.cpp:4894
 #, no-c-format
-msgid "Defines:"
+msgid "CString"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1717
-#: rc.cpp:5812
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 959
+#: rc.cpp:4897
 #, no-c-format
-msgid "Intermediate File Directories"
+msgid "StringList"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1736
-#: rc.cpp:5815
-#, fuzzy, no-c-format
-msgid "MOC files:"
-msgstr "Agor Ffeiliau"
-
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1747
-#: rc.cpp:5818
-#, fuzzy, no-c-format
-msgid "UI files:"
-msgstr "Agor Ffeiliau"
-
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1758
-#: rc.cpp:5821
-#, fuzzy, no-c-format
-msgid "Object files:"
-msgstr "Agor Ffeil"
-
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1772
-#: rc.cpp:5824
-#, fuzzy, no-c-format
-msgid "RCC files:"
-msgstr "Agor Ffeiliau"
-
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1817
-#: rc.cpp:5827
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 964
+#: rc.cpp:4900
 #, no-c-format
-msgid "Corba"
+msgid "Bool"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1831
-#: rc.cpp:5830
-#, fuzzy, no-c-format
-msgid "Compiler options:"
-msgstr "Crynhoydd"
-
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1852
-#: rc.cpp:5833
-#, fuzzy, no-c-format
-msgid "IDL compiler:"
-msgstr "Cr&ynhoydd"
-
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1884
-#: rc.cpp:5836
-#, fuzzy, no-c-format
-msgid "Custom Variables"
-msgstr "Newidynnau &Addasiedig..."
-
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1912
-#: rc.cpp:5842 rc.cpp:5863
-#, fuzzy, no-c-format
-msgid "Operator"
-msgstr "Gweithrediadau"
-
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1974
-#: kdevdesigner/designer/mainwindowactions.cpp:629
-#: kdevdesigner/designer/mainwindowactions.cpp:644 rc.cpp:5848
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 969
+#: rc.cpp:4903
 #, no-c-format
-msgid "New"
-msgstr "Newydd"
+msgid "Int"
+msgstr "Int"
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 2082
-#: rc.cpp:5866
-#, fuzzy, no-c-format
-msgid "+="
-msgstr "+"
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 974
+#: rc.cpp:4906
+#, no-c-format
+msgid "UInt"
+msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 2087
-#: rc.cpp:5869
-#, fuzzy, no-c-format
-msgid "-="
-msgstr "-"
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 984
+#: rc.cpp:4912
+#, no-c-format
+msgid "Color"
+msgstr "Lliw"
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 2092
-#: rc.cpp:5872
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 989
+#: rc.cpp:4915
 #, no-c-format
-msgid "="
+msgid "Rect"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 2097
-#: rc.cpp:5875
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 994
+#: rc.cpp:4918
 #, no-c-format
-msgid "*="
+msgid "Point"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 2102
-#: rc.cpp:5878
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 999
+#: languages/cpp/app_templates/tdefileplugin/tdefile_plugin.cpp:32 rc.cpp:4921
 #, no-c-format
-msgid "~="
-msgstr ""
+msgid "Size"
+msgstr "Maint"
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 2163
-#: rc.cpp:5881
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 1004
+#: rc.cpp:4924
 #, no-c-format
-msgid "Value:"
-msgstr "Gwerth:"
+msgid "Pixmap"
+msgstr "Picsfap"
 
-#. i18n: file ./buildtools/qmake/choosesubprojectdlgbase.ui line 16
-#: rc.cpp:5884
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 1009
+#: rc.cpp:4927
 #, no-c-format
-msgid "Select Subproject"
+msgid "Palette"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/choosesubprojectdlgbase.ui line 92
-#: rc.cpp:5893 rc.cpp:5899
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 1014
+#: rc.cpp:4930
 #, no-c-format
-msgid "Subprojects"
+msgid "Cursor"
+msgstr "Cyrchydd"
+
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 1019
+#: rc.cpp:4933
+#, no-c-format
+msgid "SizePolicy"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/disablesubprojectdlgbase.ui line 16
-#: rc.cpp:5896
-#, fuzzy, no-c-format
-msgid "Select Subprojects to disable"
-msgstr "Agor Cywaith Diweddar"
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 1026
+#: rc.cpp:4936
+#, no-c-format
+msgid "Select property type"
+msgstr ""
 
-#. i18n: file ./buildtools/pascal/pascalproject_optionsdlgbase.ui line 19
-#: buildtools/pascal/pascalproject_part.cpp:398
-#: buildtools/pascal/pascalproject_part.cpp:434 rc.cpp:5908
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 1029
+#: rc.cpp:4939
 #, no-c-format
-msgid "Pascal Compiler"
+msgid ""
+"<b>Select the type of the property.</b>"
+"<p>The property must be implemented in the class using Qt's property system.</p>"
+"<p>You can use integer types to support enumeration properties in the property "
+"editor.</p>"
 msgstr ""
 
-#. i18n: file ./buildtools/pascal/pascalproject_optionsdlgbase.ui line 46
-#: rc.cpp:5911
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 1035
+#: kdevdesigner/designer/propertyeditor.cpp:2922
+#: parts/partexplorer/partexplorerform.cpp:116 rc.cpp:4942 rc.cpp:7426
+#: rc.cpp:8783
 #, no-c-format
-msgid "Con&figuration:"
-msgstr "Ffu&rfwedd :"
+msgid "Property"
+msgstr "Priodwedd"
 
-#. i18n: file ./buildtools/pascal/pascalproject_optionsdlgbase.ui line 155
-#: rc.cpp:5923
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 1065
+#: rc.cpp:4948
 #, no-c-format
-msgid "Compiler op&tions:"
+msgid ""
+"<b>The list of the current widget's properties.</b>"
+"<p>The properties of the custom widget can be changed in the property "
+"editor.</p>"
 msgstr ""
 
-#. i18n: file ./buildtools/pascal/pascalproject_optionsdlgbase.ui line 174
-#: rc.cpp:5926
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 1073
+#: rc.cpp:4951
 #, no-c-format
-msgid "&Pascal compiler:"
+msgid "Change property name"
 msgstr ""
 
-#. i18n: file ./buildtools/pascal/pascalproject_optionsdlgbase.ui line 301
-#: rc.cpp:5932
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 1076
+#: rc.cpp:4954
 #, no-c-format
-msgid "Load &Default Compiler Options"
+msgid ""
+"<b>Enter a name for the property.</b>"
+"<p>The properties must be implemented in the class using Qt's property "
+"system.</p>"
 msgstr ""
 
-#. i18n: file ./buildtools/custommakefiles/custombuildoptionswidgetbase.ui line 16
-#: rc.cpp:5938
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 1084
+#: rc.cpp:4957
 #, no-c-format
-msgid "Custom Build Options"
+msgid "P&roperty name:"
 msgstr ""
 
-#. i18n: file ./buildtools/custommakefiles/custombuildoptionswidgetbase.ui line 27
-#: rc.cpp:5941
+#. i18n: file ./kdevdesigner/designer/wizardeditor.ui line 41
+#: rc.cpp:4963
 #, no-c-format
-msgid "Build Tool"
+msgid "Wizard Page Editor"
 msgstr ""
 
-#. i18n: file ./buildtools/custommakefiles/custombuildoptionswidgetbase.ui line 38
-#: rc.cpp:5944
+#. i18n: file ./kdevdesigner/designer/wizardeditor.ui line 86
+#: rc.cpp:4966
 #, no-c-format
-msgid "&Make"
-msgstr "&Make"
-
-#. i18n: file ./buildtools/custommakefiles/custombuildoptionswidgetbase.ui line 49
-#: rc.cpp:5947
-#, fuzzy, no-c-format
-msgid "A&nt"
-msgstr "&Morgrugyn"
+msgid "Wizard pages:"
+msgstr ""
 
-#. i18n: file ./buildtools/custommakefiles/custombuildoptionswidgetbase.ui line 57
-#: rc.cpp:5950
-#, fuzzy, no-c-format
-msgid "Other"
-msgstr "Eraill"
+#. i18n: file ./kdevdesigner/designer/wizardeditor.ui line 115
+#: rc.cpp:4969
+#, no-c-format
+msgid "A&dd"
+msgstr "&Ychwcanegu"
 
-#. i18n: file ./buildtools/custommakefiles/custombuildoptionswidgetbase.ui line 63
-#: rc.cpp:5953
+#. i18n: file ./kdevdesigner/designer/paletteeditor.ui line 47
+#: rc.cpp:4996
 #, no-c-format
-msgid "other custom build tool, e.g. script"
+msgid "Edit Palette"
 msgstr ""
 
-#. i18n: file ./buildtools/custommakefiles/custombuildoptionswidgetbase.ui line 66
-#: rc.cpp:5956
+#. i18n: file ./kdevdesigner/designer/paletteeditor.ui line 70
+#: rc.cpp:4999
 #, no-c-format
-msgid ""
-"There are myriads of buildtools out there that are not ant or make. If you use "
-"one of them (or have your own scripts), select this option."
+msgid "Build Palette"
 msgstr ""
 
-#. i18n: file ./buildtools/custommakefiles/custombuildoptionswidgetbase.ui line 93
-#: rc.cpp:5959
+#. i18n: file ./kdevdesigner/designer/paletteeditor.ui line 111
+#: rc.cpp:5002
 #, no-c-format
-msgid "Run &the build tool in the following directory:"
+msgid "&3-D effects:"
 msgstr ""
 
-#. i18n: file ./buildtools/custommakefiles/selectnewfilesdialogbase.ui line 24
-#: rc.cpp:5962
+#. i18n: file ./kdevdesigner/designer/paletteeditor.ui line 137
+#: rc.cpp:5005 rc.cpp:5014 rc.cpp:5695 rc.cpp:5971 rc.cpp:6013
 #, no-c-format
-msgid "Files to add to the Project:"
+msgid "Choose a color"
 msgstr ""
 
-#. i18n: file ./buildtools/custommakefiles/selectnewfilesdialogbase.ui line 38
-#: rc.cpp:5965
+#. i18n: file ./kdevdesigner/designer/paletteeditor.ui line 140
+#: rc.cpp:5008
 #, no-c-format
-msgid "Select the files to add to the project"
+msgid "Choose the effect-color for the generated palette."
 msgstr ""
 
-#. i18n: file ./buildtools/custommakefiles/selectnewfilesdialogbase.ui line 41
-#: rc.cpp:5968
+#. i18n: file ./kdevdesigner/designer/paletteeditor.ui line 169
+#: rc.cpp:5011
 #, no-c-format
-msgid ""
-"Select the files and directories that should be added to the list of project "
-"files. All other files and directories will be put into the blacklist."
+msgid "Back&ground:"
+msgstr "Cefn&dir:"
+
+#. i18n: file ./kdevdesigner/designer/paletteeditor.ui line 198
+#: rc.cpp:5017
+#, no-c-format
+msgid "Choose the background color for the generated palette."
 msgstr ""
 
-#. i18n: file ./buildtools/custommakefiles/customotherconfigwidgetbase.ui line 45
-#: rc.cpp:5974
-#, fuzzy, no-c-format
-msgid "Add&itional options:"
-msgstr "&Gweithredoedd ar gael:"
+#. i18n: file ./kdevdesigner/designer/paletteeditor.ui line 223
+#: rc.cpp:5020
+#, no-c-format
+msgid "&Tune Palette..."
+msgstr ""
 
-#. i18n: file ./buildtools/custommakefiles/customotherconfigwidgetbase.ui line 61
-#: rc.cpp:5977
-#, fuzzy, no-c-format
-msgid "Name of build &script"
-msgstr "Gwaredu ffeil"
+#. i18n: file ./kdevdesigner/designer/paletteeditor.ui line 239
+#: rc.cpp:5023
+#, no-c-format
+msgid "Preview"
+msgstr "Rhagolwg"
 
-#. i18n: file ./buildtools/custommakefiles/customotherconfigwidgetbase.ui line 72
-#: rc.cpp:5980
-#, fuzzy, no-c-format
-msgid "Default &target:"
-msgstr "&Rhagosod :"
+#. i18n: file ./kdevdesigner/designer/paletteeditor.ui line 270
+#: rc.cpp:5026 rc.cpp:5896
+#, no-c-format
+msgid "Select &palette:"
+msgstr ""
 
-#. i18n: file ./buildtools/custommakefiles/customotherconfigwidgetbase.ui line 93
-#: rc.cpp:5983
+#. i18n: file ./kdevdesigner/designer/paletteeditor.ui line 279
+#: rc.cpp:5029 rc.cpp:5899
 #, no-c-format
-msgid "Run with priority:"
+msgid "Active Palette"
 msgstr ""
 
-#. i18n: file ./buildtools/custommakefiles/customotherconfigwidgetbase.ui line 161
-#: rc.cpp:5986 rc.cpp:6041
+#. i18n: file ./kdevdesigner/designer/paletteeditor.ui line 284
+#: rc.cpp:5032 rc.cpp:5902
 #, no-c-format
-msgid "E&nvironment:"
+msgid "Inactive Palette"
 msgstr ""
 
-#. i18n: file ./buildtools/custommakefiles/customotherconfigwidgetbase.ui line 210
-#: rc.cpp:5995 rc.cpp:6050
+#. i18n: file ./kdevdesigner/designer/paletteeditor.ui line 289
+#: rc.cpp:5035 rc.cpp:5905
 #, no-c-format
-msgid "Re&move"
-msgstr "G&waredu"
+msgid "Disabled Palette"
+msgstr ""
 
-#. i18n: file ./buildtools/custommakefiles/custommanagerwidgetbase.ui line 16
-#: rc.cpp:6001
-#, fuzzy, no-c-format
-msgid "Custom Manager Options"
-msgstr "Dewisiadau Addasu"
+#. i18n: file ./kdevdesigner/designer/projectsettings.ui line 41
+#: rc.cpp:5053
+#, no-c-format
+msgid "Project Settings"
+msgstr "Gosodiadau Cywaith"
 
-#. i18n: file ./buildtools/custommakefiles/custommanagerwidgetbase.ui line 35
-#: rc.cpp:6004
-#, fuzzy, no-c-format
-msgid "Filetypes used in Project"
-msgstr "Agor Cywaith"
+#. i18n: file ./kdevdesigner/designer/projectsettings.ui line 76
+#: rc.cpp:5059
+#, no-c-format
+msgid "&Project file:"
+msgstr "&Ffeil y cywaith:"
 
-#. i18n: file ./buildtools/custommakefiles/custommanagerwidgetbase.ui line 41
-#: rc.cpp:6007
+#. i18n: file ./kdevdesigner/designer/projectsettings.ui line 87
+#: rc.cpp:5062
 #, no-c-format
-msgid ""
-"Add filetypes to be used in Projects, can be full filenames or shell wildcards"
-msgstr ""
+msgid "&Language:"
+msgstr "&Iaith:"
 
-#. i18n: file ./buildtools/custommakefiles/custommanagerwidgetbase.ui line 45
-#: rc.cpp:6010
+#. i18n: file ./kdevdesigner/designer/projectsettings.ui line 111
+#: rc.cpp:5068
 #, no-c-format
-msgid ""
-"Each entry contains a filetype used in the project in the form of a filename or "
-"a filename wildcard (using shell wildcards). \n"
-"This will be used when adding/removing files in directories and re-populating "
-"the project"
+msgid "&Database file:"
 msgstr ""
 
-#. i18n: file ./buildtools/custommakefiles/custommakeconfigwidgetbase.ui line 27
-#: rc.cpp:6017
+#. i18n: file ./kdevdesigner/designer/gotolinedialog.ui line 46
+#: kdevdesigner/designer/mainwindowactions.cpp:289 rc.cpp:5089
 #, no-c-format
-msgid "A&bort on first error"
+msgid "Goto Line"
 msgstr ""
 
-#. i18n: file ./buildtools/custommakefiles/custommakeconfigwidgetbase.ui line 35
-#: rc.cpp:6020
+#. i18n: file ./kdevdesigner/designer/gotolinedialog.ui line 63
+#: rc.cpp:5092
 #, no-c-format
-msgid "Only di&splay commands without actually executing them"
-msgstr ""
+msgid "&Line:"
+msgstr "&Llinell :"
 
-#. i18n: file ./buildtools/custommakefiles/custommakeconfigwidgetbase.ui line 61
-#: rc.cpp:6023
+#. i18n: file ./kdevdesigner/designer/gotolinedialog.ui line 116
+#: rc.cpp:5095
 #, no-c-format
-msgid "A&dditional make options:"
+msgid "&Goto"
 msgstr ""
 
-#. i18n: file ./buildtools/custommakefiles/custommakeconfigwidgetbase.ui line 77
-#: rc.cpp:6026
+#. i18n: file ./kdevdesigner/designer/startdialog.ui line 49
+#: rc.cpp:5101
 #, no-c-format
-msgid "Name of make e&xecutable:"
+msgid "Qt Designer - New/Open"
 msgstr ""
 
-#. i18n: file ./buildtools/custommakefiles/custommakeconfigwidgetbase.ui line 88
-#: rc.cpp:6029
+#. i18n: file ./kdevdesigner/designer/startdialog.ui line 73
+#: rc.cpp:5104
 #, no-c-format
-msgid "Default make &target:"
+msgid "&New File/Project"
 msgstr ""
 
-#. i18n: file ./buildtools/custommakefiles/custommakeconfigwidgetbase.ui line 109
-#: rc.cpp:6032
+#. i18n: file ./kdevdesigner/designer/startdialog.ui line 106
+#: rc.cpp:5107
 #, no-c-format
-msgid "Run multiple jobs"
+msgid "&Open File/Project"
 msgstr ""
 
-#. i18n: file ./buildtools/custommakefiles/custommakeconfigwidgetbase.ui line 120
-#: rc.cpp:6035
+#. i18n: file ./kdevdesigner/designer/startdialog.ui line 125
+#: rc.cpp:5110
 #, no-c-format
-msgid "Number of simultaneous &jobs:"
+msgid "&Recently Opened"
 msgstr ""
 
-#. i18n: file ./buildtools/custommakefiles/custommakeconfigwidgetbase.ui line 180
-#: rc.cpp:6038
+#. i18n: file ./kdevdesigner/designer/startdialog.ui line 178
+#: rc.cpp:5113
 #, no-c-format
-msgid "Make &priority:"
+msgid "&Do not show this dialog in the future"
 msgstr ""
 
-#. i18n: file ./buildtools/custommakefiles/custommakeconfigwidgetbase.ui line 286
-#: rc.cpp:6047
+#. i18n: file ./kdevdesigner/designer/replacedialog.ui line 41
+#: rc.cpp:5125
 #, no-c-format
-msgid "Co&py"
-msgstr "Co&pïo"
+msgid "Replace Text"
+msgstr "Amnewid Testun"
 
-#. i18n: file ./buildtools/script/scriptoptionswidgetbase.ui line 16
-#: buildtools/script/scriptprojectpart.cpp:75 rc.cpp:6056
+#. i18n: file ./kdevdesigner/designer/replacedialog.ui line 72
+#: rc.cpp:5128
 #, no-c-format
-msgid "Script Project Options"
-msgstr ""
+msgid "R&eplace:"
+msgstr "A&mnewid:"
 
-#. i18n: file ./buildtools/script/scriptoptionswidgetbase.ui line 27
-#: rc.cpp:6059
+#. i18n: file ./kdevdesigner/designer/replacedialog.ui line 83
+#: rc.cpp:5131
 #, no-c-format
-msgid "&Include files into the project with the following patterns:"
-msgstr ""
+msgid "&Find:"
+msgstr "&Canfod:"
 
-#. i18n: file ./buildtools/script/scriptoptionswidgetbase.ui line 90
-#: rc.cpp:6062
+#. i18n: file ./kdevdesigner/designer/replacedialog.ui line 159
+#: rc.cpp:5134
 #, no-c-format
-msgid "&Exclude the following patterns:"
-msgstr ""
+msgid "&Replace"
+msgstr "A&mnewid"
 
-#. i18n: file ./buildtools/autotools/addexistingdlgbase.ui line 24
-#: rc.cpp:6065
+#. i18n: file ./kdevdesigner/designer/replacedialog.ui line 170
+#: rc.cpp:5137
 #, no-c-format
-msgid "ImportExistingDlgBase"
-msgstr ""
+msgid "Replace &All"
+msgstr "Amnewid y &Cwbl"
 
-#. i18n: file ./buildtools/autotools/addexistingdlgbase.ui line 109
-#: rc.cpp:6074 rc.cpp:6569 rc.cpp:6749 rc.cpp:6800
+#. i18n: file ./kdevdesigner/designer/replacedialog.ui line 205
+#: rc.cpp:5146 rc.cpp:5833
 #, no-c-format
-msgid "Subproject Information"
-msgstr ""
+msgid "&Whole words only"
+msgstr "D&im ond geiriau cyfan"
 
-#. i18n: file ./buildtools/autotools/addexistingdlgbase.ui line 143
-#: rc.cpp:6077 rc.cpp:6578 rc.cpp:6758 rc.cpp:6806
+#. i18n: file ./kdevdesigner/designer/replacedialog.ui line 213
+#: rc.cpp:5149 rc.cpp:5836
 #, no-c-format
-msgid "Directory:"
-msgstr "Cyfeiriadur:"
+msgid "Case &sensitive"
+msgstr "Mae llythrennau bras o &bwys"
 
-#. i18n: file ./buildtools/autotools/addexistingdlgbase.ui line 163
-#: rc.cpp:6080 rc.cpp:6212 rc.cpp:6581 rc.cpp:6761 rc.cpp:6809
+#. i18n: file ./kdevdesigner/designer/replacedialog.ui line 221
+#: rc.cpp:5152 rc.cpp:5839
 #, no-c-format
-msgid "Target:"
-msgstr "Targed:"
+msgid "Start at &beginning"
+msgstr ""
 
-#. i18n: file ./buildtools/autotools/addexistingdlgbase.ui line 192
-#: rc.cpp:6083
+#. i18n: file ./kdevdesigner/designer/replacedialog.ui line 231
+#: rc.cpp:5155 rc.cpp:5821
 #, no-c-format
-msgid "[DIRECTORY]"
-msgstr ""
+msgid "Direction"
+msgstr "Cyfeiriad:"
 
-#. i18n: file ./buildtools/autotools/addexistingdlgbase.ui line 200
-#: rc.cpp:6086 rc.cpp:6215
+#. i18n: file ./kdevdesigner/designer/replacedialog.ui line 248
+#: rc.cpp:5158 rc.cpp:5824
 #, no-c-format
-msgid "[TARGET]"
-msgstr ""
+msgid "Forwar&d"
+msgstr "Ymlaen"
 
-#. i18n: file ./buildtools/autotools/addexistingdlgbase.ui line 260
-#: rc.cpp:6089
+#. i18n: file ./kdevdesigner/designer/replacedialog.ui line 259
+#: rc.cpp:5161 rc.cpp:5827
 #, no-c-format
-msgid "A&dd All"
+msgid "Bac&kward"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/addexistingdlgbase.ui line 263
-#: rc.cpp:6092
+#. i18n: file ./kdevdesigner/designer/dbconnection.ui line 41
+#: rc.cpp:5164
 #, no-c-format
-msgid "Import by creating symbolic links (recommended)"
+msgid "Edit Database Connection"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/addexistingdlgbase.ui line 271
-#: rc.cpp:6095
+#. i18n: file ./kdevdesigner/designer/dbconnection.ui line 58
+#: rc.cpp:5167
 #, no-c-format
-msgid "&Add Selected"
-msgstr "&Ychwanegu'r Dewisiedig"
+msgid "&Database name:"
+msgstr "&Enw'r gronfa ddata: :"
 
-#. i18n: file ./buildtools/autotools/addexistingdlgbase.ui line 274
-#: rc.cpp:6098
+#. i18n: file ./kdevdesigner/designer/dbconnection.ui line 69
+#: rc.cpp:5170
 #, no-c-format
-msgid "Import by copying (not recommended)"
-msgstr ""
+msgid "&Username:"
+msgstr "&Enw Defnyddiwr:"
 
-#. i18n: file ./buildtools/autotools/addexistingdlgbase.ui line 313
-#: rc.cpp:6101
+#. i18n: file ./kdevdesigner/designer/dbconnection.ui line 80
+#: rc.cpp:5173
 #, no-c-format
-msgid "&Source Directory"
-msgstr ""
+msgid "&Password:"
+msgstr "&Cyfrinair:"
 
-#. i18n: file ./buildtools/autotools/addexistingdlgbase.ui line 364
-#: rc.cpp:6104
+#. i18n: file ./kdevdesigner/designer/dbconnection.ui line 91
+#: rc.cpp:5176
 #, no-c-format
-msgid "R&emove All"
-msgstr "G&waredu Popeth"
+msgid "D&river:"
+msgstr "G&yrrydd:"
 
-#. i18n: file ./buildtools/autotools/addexistingdlgbase.ui line 367
-#: rc.cpp:6107
+#. i18n: file ./kdevdesigner/designer/dbconnection.ui line 110
+#: rc.cpp:5179
 #, no-c-format
-msgid "Removes all added files."
-msgstr ""
+msgid "&Hostname:"
+msgstr "&Enw Gwesteiwr:"
 
-#. i18n: file ./buildtools/autotools/addexistingdlgbase.ui line 375
-#: rc.cpp:6110
+#. i18n: file ./kdevdesigner/designer/dbconnection.ui line 151
+#: rc.cpp:5185
 #, no-c-format
-msgid "&Remove Selected"
-msgstr "&Tynnu'r Dewis"
+msgid "P&ort:"
+msgstr "&Porth:"
 
-#. i18n: file ./buildtools/autotools/addexistingdlgbase.ui line 378
-#: rc.cpp:6113
+#. i18n: file ./kdevdesigner/designer/listeditor.ui line 96
+#: rc.cpp:5203
 #, no-c-format
-msgid "Removes the selected files."
-msgstr ""
+msgid "Re&name"
+msgstr "Ai&l-enwi"
 
-#. i18n: file ./buildtools/autotools/addexistingdlgbase.ui line 417
-#: rc.cpp:6116
+#. i18n: file ./kdevdesigner/designer/tableeditor.ui line 41
+#: rc.cpp:5209
 #, no-c-format
-msgid "Add &Following"
+msgid "Edit Table"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/addapplicationdlgbase.ui line 16
-#: rc.cpp:6119
+#. i18n: file ./kdevdesigner/designer/tableeditor.ui line 168
+#: rc.cpp:5233 rc.cpp:6139
 #, no-c-format
-msgid "Add New Application .desktop File"
-msgstr ""
+msgid "Co&lumns"
+msgstr "Co&lofnau"
 
-#. i18n: file ./buildtools/autotools/addapplicationdlgbase.ui line 30
-#: rc.cpp:6122
+#. i18n: file ./kdevdesigner/designer/tableeditor.ui line 233
+#: rc.cpp:5239 rc.cpp:5293
 #, no-c-format
-msgid "&Application File"
+msgid ""
+"<b>Move the selected item up.</b>"
+"<p>The top-most column will be the first column of the list.</p>"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/addapplicationdlgbase.ui line 41
-#: rc.cpp:6125
+#. i18n: file ./kdevdesigner/designer/tableeditor.ui line 250
+#: rc.cpp:5245 rc.cpp:5299
 #, no-c-format
-msgid "Start in t&erminal"
+msgid ""
+"<b>Move the selected item down.</b>"
+"<p>The top-most column will be the first column of the list.</p>"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/addapplicationdlgbase.ui line 122
-#: rc.cpp:6131
+#. i18n: file ./kdevdesigner/designer/tableeditor.ui line 258
+#: rc.cpp:5248 rc.cpp:6187
 #, no-c-format
-msgid "Games"
-msgstr "Gemau"
+msgid "&Delete Column"
+msgstr "&Dileu Colofn"
 
-#. i18n: file ./buildtools/autotools/addapplicationdlgbase.ui line 127
-#: rc.cpp:6134
+#. i18n: file ./kdevdesigner/designer/tableeditor.ui line 266
+#: rc.cpp:5251 rc.cpp:6202
 #, no-c-format
-msgid "Development"
-msgstr "Datblygiad"
+msgid "&New Column"
+msgstr "&Colofn Newydd"
 
-#. i18n: file ./buildtools/autotools/addapplicationdlgbase.ui line 137
-#: rc.cpp:6140
+#. i18n: file ./kdevdesigner/designer/tableeditor.ui line 288
+#: rc.cpp:5254
 #, no-c-format
-msgid "Graphics"
-msgstr "Graffeg"
+msgid "Table:"
+msgstr "Tabl:"
 
-#. i18n: file ./buildtools/autotools/addapplicationdlgbase.ui line 142
-#: rc.cpp:6143
+#. i18n: file ./kdevdesigner/designer/tableeditor.ui line 333
+#: rc.cpp:5263 rc.cpp:5320 rc.cpp:6082
 #, no-c-format
-msgid "Internet"
-msgstr "Rhyngrwyd"
+msgid ""
+"<b>Delete the selected item's pixmap.</b>"
+"<p>The pixmap in the current column of the selected item will be deleted.</p>"
+msgstr ""
 
-#. i18n: file ./buildtools/autotools/addapplicationdlgbase.ui line 147
-#: rc.cpp:6146
+#. i18n: file ./kdevdesigner/designer/tableeditor.ui line 353
+#: rc.cpp:5272 rc.cpp:5329 rc.cpp:6091
 #, no-c-format
-msgid "Multimedia"
-msgstr "Amlgyfrwng"
+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>"
+msgstr ""
 
-#. i18n: file ./buildtools/autotools/addapplicationdlgbase.ui line 152
-#: rc.cpp:6149
+#. i18n: file ./kdevdesigner/designer/tableeditor.ui line 363
+#: rc.cpp:5275 rc.cpp:5308
 #, no-c-format
-msgid "Office"
-msgstr "Swyddfa"
+msgid "&Label:"
+msgstr "&Label:"
 
-#. i18n: file ./buildtools/autotools/addapplicationdlgbase.ui line 162
-#: rc.cpp:6155
+#. i18n: file ./kdevdesigner/designer/tableeditor.ui line 385
+#: rc.cpp:5281
 #, no-c-format
-msgid "System"
-msgstr "Cysawd"
+msgid "&Field:"
+msgstr "&Maes :"
 
-#. i18n: file ./buildtools/autotools/addapplicationdlgbase.ui line 167
-#: rc.cpp:6158
+#. i18n: file ./kdevdesigner/designer/tableeditor.ui line 409
+#: rc.cpp:5284
 #, no-c-format
-msgid "Toys"
-msgstr "Teganau"
+msgid "<no table>"
+msgstr ""
 
-#. i18n: file ./buildtools/autotools/addapplicationdlgbase.ui line 172
-#: rc.cpp:6161
+#. i18n: file ./kdevdesigner/designer/tableeditor.ui line 421
+#: rc.cpp:5287
 #, no-c-format
-msgid "Utilities"
-msgstr "Gwasanaethau"
+msgid "&Rows"
+msgstr "&Rhesi"
 
-#. i18n: file ./buildtools/autotools/addapplicationdlgbase.ui line 177
-#: rc.cpp:6164
+#. i18n: file ./kdevdesigner/designer/tableeditor.ui line 511
+#: rc.cpp:5302
 #, no-c-format
-msgid "WordProcessing"
+msgid "&New Row"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/addapplicationdlgbase.ui line 211
-#: rc.cpp:6170 rc.cpp:6233
+#. i18n: file ./kdevdesigner/designer/tableeditor.ui line 519
+#: rc.cpp:5305
 #, no-c-format
-msgid "&Icon:"
-msgstr "&Eicon:"
+msgid "&Delete Row"
+msgstr "&Dileu Rhes"
 
-#. i18n: file ./buildtools/autotools/addapplicationdlgbase.ui line 229
-#: rc.cpp:6173
+#. i18n: file ./kdevdesigner/designer/about.ui line 41
+#: rc.cpp:5332
 #, no-c-format
-msgid "&Section:"
-msgstr "R&han:"
+msgid "Qt Designer"
+msgstr "Dylunydd Qt"
 
-#. i18n: file ./buildtools/autotools/addapplicationdlgbase.ui line 316
-#: rc.cpp:6185
+#. i18n: file ./kdevdesigner/designer/about.ui line 80
+#: rc.cpp:5335
 #, no-c-format
-msgid "Mime &Types"
+msgid "Version 3.2"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/choosetargetdlgbase.ui line 22
-#: buildtools/autotools/choosetargetdialog.cpp:62 rc.cpp:6200
+#. i18n: file ./kdevdesigner/designer/about.ui line 93
+#: rc.cpp:5338
 #, no-c-format
-msgid "Automake Manager - Choose Target"
+msgid "Copyright (C) 2000-2003 Trolltech AS. All Rights Reserved."
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/choosetargetdlgbase.ui line 59
-#: rc.cpp:6203
+#. i18n: file ./kdevdesigner/designer/about.ui line 114
+#: rc.cpp:5341
 #, no-c-format
-msgid "Add new files to m&y active target"
+msgid ""
+"<p>Qt Commercial Edition license holders: This program is licensed to you under "
+"the terms of the Qt Commercial License Agreement. For details, see the file "
+"LICENSE that came with this software distribution.</p>"
+"<p></p>"
+"<p>Qt Free Edition users: This program is licensed to you under the terms of "
+"the GNU General Public License Version 2. For details, see the file LICENSE.GPL "
+"that came with this software distribution.</p>"
+"<p>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE "
+"WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.</p>"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/choosetargetdlgbase.ui line 70
-#: rc.cpp:6206
+#. i18n: file ./kdevdesigner/designer/dbconnectioneditor.ui line 41
+#: rc.cpp:5347
 #, no-c-format
-msgid "Choose &another target"
-msgstr ""
+msgid "Connect"
+msgstr "Cysylltu"
 
-#. i18n: file ./buildtools/autotools/choosetargetdlgbase.ui line 83
-#: rc.cpp:6209
+#. i18n: file ./kdevdesigner/designer/dbconnectioneditor.ui line 94
+#: rc.cpp:5356
 #, no-c-format
-msgid "Choose &Target"
+msgid "Connection Details"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/choosetargetdlgbase.ui line 140
-#: rc.cpp:6218
+#. i18n: file ./kdevdesigner/designer/dbconnections.ui line 41
+#: rc.cpp:5359
 #, no-c-format
-msgid "&New Files"
+msgid "Edit Database Connections"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/choosetargetdlgbase.ui line 159
-#: rc.cpp:6221
+#. i18n: file ./kdevdesigner/designer/dbconnections.ui line 61
+#: rc.cpp:5362
 #, no-c-format
-msgid ""
-"<qt><b>Note:</b> If you cancel, your files will be created but will <b>not</b> "
-"be added to the project.</qt>"
+msgid "&New Connection"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/choosetargetdlgbase.ui line 172
-#: rc.cpp:6224
+#. i18n: file ./kdevdesigner/designer/dbconnections.ui line 74
+#: rc.cpp:5365
 #, no-c-format
-msgid "Do &not ask me again and use always my active target"
+msgid "&Delete Connection"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/addservicedlgbase.ui line 16
-#: rc.cpp:6227
+#. i18n: file ./kdevdesigner/designer/dbconnections.ui line 157
+#: kdevdesigner/designer/dbconnectionsimpl.cpp:128
+#: kdevdesigner/designer/project.cpp:148
+#: kdevdesigner/designer/propertyeditor.cpp:2004
+#: kdevdesigner/designer/propertyeditor.cpp:2022 rc.cpp:5377
 #, no-c-format
-msgid "Add New Service"
-msgstr ""
+msgid "Connection"
+msgstr "Cysylltiad"
 
-#. i18n: file ./buildtools/autotools/addservicedlgbase.ui line 31
-#: rc.cpp:6230
+#. i18n: file ./kdevdesigner/designer/dbconnections.ui line 227
+#: rc.cpp:5380
 #, no-c-format
-msgid "&Service File"
-msgstr ""
+msgid "Connec&t"
+msgstr "Cysyll&tu"
 
-#. i18n: file ./buildtools/autotools/addservicedlgbase.ui line 139
-#: rc.cpp:6236
+#. i18n: file ./kdevdesigner/designer/configtoolboxdialog.ui line 41
+#: kdevdesigner/designer/mainwindowactions.cpp:605 rc.cpp:5383
 #, no-c-format
-msgid "&Library:"
+msgid "Configure Toolbox"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/addservicedlgbase.ui line 209
-#: rc.cpp:6248
+#. i18n: file ./kdevdesigner/designer/configtoolboxdialog.ui line 132
+#: rc.cpp:5395
 #, no-c-format
-msgid "Service &Types"
+msgid "Available Tools"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 16
-#: rc.cpp:6272
+#. i18n: file ./kdevdesigner/designer/configtoolboxdialog.ui line 175
+#: rc.cpp:5401
 #, no-c-format
-msgid "Target Options"
+msgid "Common Widgets Page"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 34
-#: rc.cpp:6275
-#, fuzzy, no-c-format
-msgid "Fl&ags"
-msgstr "Baneri"
-
-#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 49
-#: rc.cpp:6278 rc.cpp:6431
+#. i18n: file ./kdevdesigner/designer/previewwidget.ui line 47
+#: rc.cpp:5404
 #, no-c-format
-msgid "Li&nker flags (LDFLAGS):"
+msgid "Preview Window"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 71
-#: rc.cpp:6281
+#. i18n: file ./kdevdesigner/designer/previewwidget.ui line 92
+#: rc.cpp:5407
 #, no-c-format
-msgid "&Do not link against shared libraries (-all-static)"
+msgid "ButtonGroup"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 79
-#: rc.cpp:6284
+#. i18n: file ./kdevdesigner/designer/previewwidget.ui line 109
+#: rc.cpp:5410
 #, no-c-format
-msgid "Do not &assign version numbers to libraries (-avoid-version)"
+msgid "RadioButton1"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 87
-#: rc.cpp:6287
+#. i18n: file ./kdevdesigner/designer/previewwidget.ui line 120
+#: rc.cpp:5413
 #, no-c-format
-msgid "Create a library that can &be dynamically loaded (-module)"
+msgid "RadioButton2"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 95
-#: rc.cpp:6290
+#. i18n: file ./kdevdesigner/designer/previewwidget.ui line 128
+#: rc.cpp:5416
 #, no-c-format
-msgid "Library does not depend on external symbols (-no-&undefined)"
+msgid "RadioButton3"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 118
-#: rc.cpp:6293
+#. i18n: file ./kdevdesigner/designer/previewwidget.ui line 138
+#: rc.cpp:5419
 #, no-c-format
-msgid "O&ther:"
-msgstr "A&rall:"
+msgid "ButtonGroup2"
+msgstr ""
 
-#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 181
-#: rc.cpp:6296
+#. i18n: file ./kdevdesigner/designer/previewwidget.ui line 155
+#: rc.cpp:5422
 #, no-c-format
-msgid "E&xplicit dependencies (DEPENDENCIES):"
+msgid "CheckBox1"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 228
-#: rc.cpp:6299
-#, fuzzy, no-c-format
-msgid "Li&braries"
-msgstr "Offer Allanol"
-
-#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 243
-#: rc.cpp:6302
+#. i18n: file ./kdevdesigner/designer/previewwidget.ui line 166
+#: rc.cpp:5425
 #, no-c-format
-msgid "Lin&k convenience libraries inside project (LIBADD):"
+msgid "CheckBox2"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 294
-#: rc.cpp:6305
+#. i18n: file ./kdevdesigner/designer/previewwidget.ui line 200
+#: rc.cpp:5428
 #, no-c-format
-msgid "Link libraries ou&tside project (LIBADD):"
+msgid "LineEdit"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 439
-#: rc.cpp:6323
-#, fuzzy, no-c-format
-msgid "Mo&ve Up"
-msgstr "Symud i &Fyny"
-
-#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 447
-#: rc.cpp:6326 rc.cpp:6659
+#. i18n: file ./kdevdesigner/designer/previewwidget.ui line 206
+#: rc.cpp:5431
 #, no-c-format
-msgid "Move Dow&n"
-msgstr "Symud i &Lawr"
+msgid "ComboBox"
+msgstr "Blwch Cyfuno"
 
-#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 476
-#: rc.cpp:6329
+#. i18n: file ./kdevdesigner/designer/previewwidget.ui line 237
+#: rc.cpp:5434
 #, no-c-format
-msgid "Ar&guments"
-msgstr "Ym&resymiadau"
+msgid "PushButton"
+msgstr ""
 
-#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 487
-#: rc.cpp:6332
+#. i18n: file ./kdevdesigner/designer/previewwidget.ui line 274
+#: rc.cpp:5437
 #, no-c-format
-msgid "Program Arguments (only valid for executable targets)"
+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>"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 507
-#: rc.cpp:6335
-#, fuzzy, no-c-format
-msgid "&Run arguments:"
-msgstr "Ym&resymiadau:"
-
-#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 535
-#: rc.cpp:6341
-#, fuzzy, no-c-format
-msgid "&Debug arguments:"
-msgstr "Ym&resymiadau:"
-
-#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 16
-#: buildtools/autotools/autoprojectpart.cpp:224 rc.cpp:6350
+#. i18n: file ./kdevdesigner/designer/actioneditor.ui line 41
+#: rc.cpp:5445
 #, no-c-format
-msgid "Configure Options"
+msgid "Edit Actions"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 46
-#: rc.cpp:6353
-#, fuzzy, no-c-format
-msgid "&Configuration:"
-msgstr "Ffurfwedd :"
-
-#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 68
-#: rc.cpp:6356
+#. i18n: file ./kdevdesigner/designer/actioneditor.ui line 83
+#: rc.cpp:5448
 #, no-c-format
-msgid "Different build profiles"
+msgid "Create new Action"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 71
-#: rc.cpp:6359
-#, fuzzy, no-c-format
-msgid "profiles"
-msgstr "Agor Ffeiliau"
-
-#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 152
-#: rc.cpp:6371 rc.cpp:6374
+#. i18n: file ./kdevdesigner/designer/actioneditor.ui line 100
+#: rc.cpp:5451
 #, no-c-format
-msgid "Options to pass to configure. eg. --prefix=<install dir>"
+msgid "Delete current Action"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 163
-#: rc.cpp:6377
+#. i18n: file ./kdevdesigner/designer/actioneditor.ui line 117
+#: rc.cpp:5454
 #, no-c-format
-msgid "&Build directory (must be different for every different configuration):"
+msgid "Connect current Action"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 191
-#: rc.cpp:6380
-#, fuzzy, no-c-format
-msgid "Top source &directory:"
-msgstr "&Cyfeiriadur:"
-
-#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 214
-#: rc.cpp:6383 rc.cpp:6398
+#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 41
+#: kdevdesigner/designer/editfunctionsimpl.cpp:216 rc.cpp:5457
 #, no-c-format
-msgid ""
-"The build process will place the object\n"
-"files and binary in this directory. \n"
-"\n"
-"If the name does not have a leading /\n"
-"then it is relative to the project directory.\n"
-"(in the General page)\n"
-"\n"
-"The build process also checks here for \n"
-"a Makefile and a configure script.\n"
-"\n"
-"If you have imported a project and you were \n"
-"building in the project directory, you \n"
-"probably want this to be blank."
+msgid "Edit Functions"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 297
-#: rc.cpp:6419 rc.cpp:6425
+#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 47
+#: rc.cpp:5460
 #, no-c-format
 msgid ""
-"Where to start looking for the src files.\n"
-"If the name does not have a leading /\n"
-"then it is relative to the project directory.\n"
-"(in the General page)"
+"<b>Edit Functions</b>"
+"<p>Add, edit or delete the current form's slots or functions.</p>"
+"<p>Click the <b>Add Function</b>-button to create a new function; enter a name, "
+"choose an access mode and specify if it should be a slot or normal function.</p>"
+"<p>Select an entry from the list and click the <b>Delete Function</b>"
+"-button to remove a function; in case of a slot all connections using this slot "
+"will also be removed.</p>"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 335
-#: rc.cpp:6434 rc.cpp:6438 rc.cpp:6442
+#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 62
+#: parts/classview/classtreebase.cpp:79 rc.cpp:5463
 #, no-c-format
-msgid ""
-"Linker flags, e.g. -L<lib dir> if you have libraries in a\n"
-"nonstandard directory <lib dir>"
-msgstr ""
+msgid "Function"
+msgstr "Ffwythiant"
 
-#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 374
-#: rc.cpp:6446 rc.cpp:6450 rc.cpp:6457
+#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 117
+#: rc.cpp:5478
+#, no-c-format
+msgid "In Use"
+msgstr "Ar waith"
+
+#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 150
+#: rc.cpp:5481
 #, no-c-format
 msgid ""
-"C/C++ preprocessor flags, e.g. -I<include dir> if you have\n"
-"headers in a nonstandard directory <include dir>"
+"<b>This form's functions.</b>"
+"<p>Select the function you want to change or delete.</p>"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 403
-#: rc.cpp:6454
+#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 172
+#: rc.cpp:5484
 #, no-c-format
-msgid "C/C++ &preprocessor flags (CPPFLAGS):"
+msgid "Only d&isplay slots"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 418
-#: rc.cpp:6461
+#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 175
+#: rc.cpp:5487
 #, no-c-format
-msgid "Configure argu&ments:"
+msgid "Change displaying mode for functions"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 452
-#: rc.cpp:6467
+#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 179
+#: rc.cpp:5490
 #, no-c-format
-msgid "C"
-msgstr "C"
+msgid ""
+"<b>Check this button if only the slots should be displayed</b>"
+"<p>Otherwise all functions, i.e. normal C++ functions and slots are "
+"displayed.</p>\n"
+msgstr ""
 
-#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 463
-#: rc.cpp:6470
+#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 204
+#: rc.cpp:5494
 #, no-c-format
-msgid "C com&piler:"
+msgid "&New Function"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 496
-#: rc.cpp:6473
+#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 207
+#: rc.cpp:5497
 #, no-c-format
-msgid "Compiler f&lags (CFLAGS):"
+msgid "Add new function"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 551
-#: rc.cpp:6479
+#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 210
+#: rc.cpp:5500
 #, no-c-format
-msgid "Compiler co&mmand (CC):"
+msgid ""
+"<b>Add a new function.</b>"
+"<p>New functions have a default name and public access.</p>"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 586
-#: rc.cpp:6482
+#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 218
+#: rc.cpp:5503
 #, no-c-format
-msgid "C++"
+msgid "&Delete Function"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 597
-#: rc.cpp:6485
+#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 221
+#: rc.cpp:5506
 #, no-c-format
-msgid "C++ com&piler:"
+msgid "Delete function"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 630
-#: rc.cpp:6488
+#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 224
+#: rc.cpp:5509
 #, no-c-format
-msgid "Compiler co&mmand (CXX):"
+msgid ""
+"<b>Delete the selected function.</b>"
+"<p>All connections using this function are also removed.</p>"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 663
-#: rc.cpp:6491
+#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 242
+#: rc.cpp:5512
 #, no-c-format
-msgid "Compiler flags (C&XXFLAGS):"
+msgid "Function Properties"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 720
-#: rc.cpp:6497
-#, fuzzy, no-c-format
-msgid "F&ortran"
-msgstr "&Trefnu"
-
-#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 731
-#: rc.cpp:6500
+#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 284
+#: rc.cpp:5515
 #, fuzzy, no-c-format
-msgid "Fortra&n compiler:"
-msgstr "Lliw blaendir:"
+msgid "&Function:"
+msgstr "F&fwythiant:"
 
-#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 764
-#: rc.cpp:6503
+#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 306
+#: rc.cpp:5518
 #, no-c-format
-msgid "Compiler co&mmand (F77):"
+msgid "Change function name"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 797
-#: rc.cpp:6506
+#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 309
+#: rc.cpp:5521
 #, no-c-format
-msgid "Compiler f&lags (FFLAGS):"
+msgid ""
+"<b>Change the name of the selected function.</b>"
+"<p>The name should include the argument list and must be syntactically "
+"correct.</p>"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/addsubprojectdlgbase.ui line 36
-#: rc.cpp:6512
+#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 317
+#: rc.cpp:5524
 #, no-c-format
-msgid "Add New Subproject"
+msgid "&Return type:"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/addsubprojectdlgbase.ui line 47
-#: rc.cpp:6515
+#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 339
+#: rc.cpp:5527
 #, no-c-format
-msgid "Subproject"
+msgid "Change the return type of the function"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/addsubprojectdlgbase.ui line 87
-#: rc.cpp:6518
+#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 342
+#: rc.cpp:5530
 #, no-c-format
-msgid "Subproject &name:"
+msgid ""
+"<b>Change the return type of the selected function.</b>"
+"<p>Specifiy here the datatype which should be returned by the function.</p>"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/managecustomcommandsbase.ui line 44
-#: rc.cpp:6533
-#, fuzzy, no-c-format
-msgid "Menu Text"
-msgstr "Canfod Testun"
-
-#. i18n: file ./buildtools/autotools/managecustomcommandsbase.ui line 52
-#: rc.cpp:6536
+#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 380
+#: rc.cpp:5533
 #, no-c-format
-msgid "Command"
-msgstr "Gorchymyn"
-
-#. i18n: file ./buildtools/autotools/managecustomcommandsbase.ui line 60
-#: rc.cpp:6539
-#, fuzzy, no-c-format
-msgid "Command Type"
-msgstr "Gorchy&myn:"
+msgid "S&pecifier:"
+msgstr ""
 
-#. i18n: file ./buildtools/autotools/addicondlgbase.ui line 16
-#: rc.cpp:6542
+#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 392
+#: rc.cpp:5536
 #, no-c-format
-msgid "Add New Icon"
+msgid "non virtual"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/addicondlgbase.ui line 35
-#: rc.cpp:6545 rc.cpp:8798
+#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 397
+#: rc.cpp:5539
 #, no-c-format
-msgid "&Type:"
-msgstr "&Math:"
+msgid "virtual"
+msgstr ""
 
-#. i18n: file ./buildtools/autotools/addicondlgbase.ui line 53
-#: rc.cpp:6548
+#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 402
+#: rc.cpp:5542
 #, no-c-format
-msgid "&Size:"
-msgstr "&Maint:"
+msgid "pure virtual"
+msgstr ""
 
-#. i18n: file ./buildtools/autotools/addicondlgbase.ui line 178
-#: rc.cpp:6563
+#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 407
+#: rc.cpp:5545
 #, no-c-format
-msgid "unknown"
-msgstr "anhysbys"
+msgid "static"
+msgstr "statig"
 
-#. i18n: file ./buildtools/autotools/removetargetdlgbase.ui line 16
-#: rc.cpp:6566
+#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 422
+#: rc.cpp:5548 rc.cpp:5566
 #, no-c-format
-msgid "Remove Target From [SUBPROJECT]"
+msgid "Change function access"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/removetargetdlgbase.ui line 46
-#: rc.cpp:6572 rc.cpp:6752
+#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 425
+#: rc.cpp:5551 rc.cpp:5569
 #, no-c-format
-msgid "[TARGET DIRECTORY]"
+msgid ""
+"<b>Change the access policy of the function</b>"
+"<p>All functions are created virtual and should be reimplemented in "
+"subclasses.</p>"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/removetargetdlgbase.ui line 54
-#: rc.cpp:6575 rc.cpp:6755 rc.cpp:6803
+#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 481
+#: rc.cpp:5572 rc.cpp:8801
 #, no-c-format
-msgid "[TARGET NAME]"
-msgstr ""
+msgid "&Type:"
+msgstr "&Math:"
 
-#. i18n: file ./buildtools/autotools/removetargetdlgbase.ui line 116
-#: rc.cpp:6584
+#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 493
+#: parts/ctags2/ctagskinds.cpp:52 rc.cpp:5575
 #, no-c-format
-msgid "&Target Information"
-msgstr ""
+msgid "slot"
+msgstr "agen"
 
-#. i18n: file ./buildtools/autotools/removetargetdlgbase.ui line 149
-#: rc.cpp:6593
+#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 498
+#: parts/ctags2/ctagskinds.cpp:37 parts/ctags2/ctagskinds.cpp:44
+#: parts/ctags2/ctagskinds.cpp:62 parts/ctags2/ctagskinds.cpp:95
+#: parts/ctags2/ctagskinds.cpp:121 parts/ctags2/ctagskinds.cpp:133
+#: parts/ctags2/ctagskinds.cpp:147 parts/ctags2/ctagskinds.cpp:154
+#: parts/ctags2/ctagskinds.cpp:167 parts/ctags2/ctagskinds.cpp:174
+#: parts/ctags2/ctagskinds.cpp:181 parts/ctags2/ctagskinds.cpp:187
+#: parts/ctags2/ctagskinds.cpp:200 rc.cpp:5578
 #, no-c-format
-msgid ""
-"<b>Note:</b> You will not be able to undo this operation. Please check your "
-"Makefile.am afterwards."
-msgstr ""
+msgid "function"
+msgstr "ffwythiant"
 
-#. i18n: file ./buildtools/autotools/removetargetdlgbase.ui line 159
-#: rc.cpp:6596
+#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 505
+#: rc.cpp:5581
 #, no-c-format
-msgid "&Dependencies to Other Subprojects"
+msgid "Change function type"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/subprojectoptionsdlgbase.ui line 16
-#: rc.cpp:6608
+#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 508
+#: rc.cpp:5584
 #, no-c-format
-msgid "Subproject Options"
+msgid ""
+"<b>Change the type of the function.</b>"
+"<p>The type specifies if the function is either a slot or a normal C++ "
+"function.</p>"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/subprojectoptionsdlgbase.ui line 31
-#: rc.cpp:6611
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 41
+#: kdevdesigner/designer/mainwindowactions.cpp:220 rc.cpp:5602
 #, no-c-format
-msgid "Co&mpiler"
-msgstr "Cr&ynhoydd"
+msgid "Preferences"
+msgstr "Hoffterau"
 
-#. i18n: file ./buildtools/autotools/subprojectoptionsdlgbase.ui line 46
-#: rc.cpp:6614
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 47
+#: rc.cpp:5605
 #, no-c-format
-msgid "Compiler flags for C compiler (CFLA&GS):"
+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>"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/subprojectoptionsdlgbase.ui line 129
-#: rc.cpp:6620
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 79
+#: rc.cpp:5611
 #, no-c-format
-msgid "Compiler flags for C++ compiler (C&XXFLAGS):"
+msgid "File Saving"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/subprojectoptionsdlgbase.ui line 204
-#: rc.cpp:6626
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 90
+#: rc.cpp:5614
 #, no-c-format
-msgid "Compiler flags for Fortran compiler (&FFLAGS):"
+msgid "Enable auto sa&ve"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/subprojectoptionsdlgbase.ui line 277
-#: rc.cpp:6632
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 109
+#: rc.cpp:5617
 #, no-c-format
-msgid "&Includes"
+msgid "Auto save &interval:"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/subprojectoptionsdlgbase.ui line 296
-#: rc.cpp:6635
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 136
+#: rc.cpp:5620
 #, no-c-format
-msgid "Automatically &generate metasources"
+msgid "Plu&gin Paths"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/subprojectoptionsdlgbase.ui line 379
-#: rc.cpp:6644
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 166
+#: rc.cpp:5623 rc.cpp:5644
 #, no-c-format
-msgid "Directories in&side project:"
+msgid ""
+"A splash screen is displayed when starting Qt Designer if this option is "
+"checked."
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/subprojectoptionsdlgbase.ui line 471
-#: rc.cpp:6656
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 191
+#: rc.cpp:5629
 #, no-c-format
-msgid "Move U&p"
-msgstr "Symud &i Fyny"
+msgid "Restore last &workspace on startup"
+msgstr ""
 
-#. i18n: file ./buildtools/autotools/subprojectoptionsdlgbase.ui line 510
-#: rc.cpp:6662
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 197
+#: rc.cpp:5632
 #, no-c-format
-msgid "Directories ou&tside project:"
+msgid "Restore last workspace"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/subprojectoptionsdlgbase.ui line 546
-#: rc.cpp:6665
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 200
+#: rc.cpp:5635
 #, no-c-format
-msgid "&Prefixes"
-msgstr "&Rhagddodiadau"
+msgid ""
+"The current workspace settings will be restored the next time you start Qt "
+"Designer if this option is checked."
+msgstr ""
 
-#. i18n: file ./buildtools/autotools/subprojectoptionsdlgbase.ui line 566
-#: buildtools/custommakefiles/selectnewfilesdialog.cpp:28 rc.cpp:6671
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 208
+#: rc.cpp:5638
 #, no-c-format
-msgid "Path"
-msgstr "Llwybr"
+msgid "Show &splash screen on startup"
+msgstr ""
 
-#. i18n: file ./buildtools/autotools/subprojectoptionsdlgbase.ui line 594
-#: rc.cpp:6674
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 214
+#: rc.cpp:5641
 #, no-c-format
-msgid "C&ustom prefixes:"
+msgid "Show Splashscreen"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/subprojectoptionsdlgbase.ui line 678
-#: rc.cpp:6686
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 225
+#: rc.cpp:5647
 #, no-c-format
-msgid "&Build Order"
+msgid "Show start &dialog"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/subprojectoptionsdlgbase.ui line 775
-#: rc.cpp:6695
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 236
+#: rc.cpp:5650
 #, no-c-format
-msgid "O&rder in which sub projects are built:"
+msgid "Disable data&base auto-edit in preview"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/addtargetdlgbase.ui line 16
-#: rc.cpp:6704
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 247
+#: rc.cpp:5653
 #, no-c-format
-msgid "Add New Target"
+msgid "Show toolbutton lab&els"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/addtargetdlgbase.ui line 30
-#: rc.cpp:6707
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 250
+#: rc.cpp:5656
 #, no-c-format
-msgid "&Target"
-msgstr "&Targed"
+msgid "Text Labels"
+msgstr ""
 
-#. i18n: file ./buildtools/autotools/addtargetdlgbase.ui line 45
-#: rc.cpp:6710
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 253
+#: rc.cpp:5659
 #, no-c-format
-msgid "&Primary:"
-msgstr "&Cynradd :"
+msgid "Text labels will be used in the toolbars if this is checked."
+msgstr ""
 
-#. i18n: file ./buildtools/autotools/addtargetdlgbase.ui line 68
-#: rc.cpp:6713
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 263
+#: rc.cpp:5662
 #, no-c-format
-msgid "Pre&fix:"
-msgstr "Rha&gddodiad:"
+msgid "G&rid"
+msgstr "G&rid"
 
-#. i18n: file ./buildtools/autotools/addtargetdlgbase.ui line 91
-#: parts/quickopen/quickopenfiledialog.cpp:41
-#: parts/quickopen/quickopenfiledialog.cpp:56 rc.cpp:6716
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 286
+#: rc.cpp:5665
 #, no-c-format
-msgid "File &name:"
-msgstr "Enw'r& ffeil:"
+msgid "Sn&ap to grid"
+msgstr "Sn&apio i'r grid"
 
-#. i18n: file ./buildtools/autotools/addtargetdlgbase.ui line 127
-#: rc.cpp:6719
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 292
+#: rc.cpp:5668
 #, no-c-format
-msgid "[CANONICALIZED NAME]"
+msgid "Snap to the grid"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/addtargetdlgbase.ui line 170
-#: rc.cpp:6722
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 295
+#: rc.cpp:5671
 #, no-c-format
-msgid "Linker Flags (&LDFLAGS)"
+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 "
+"the X/Y resolution.</p>"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/addtargetdlgbase.ui line 181
-#: rc.cpp:6725
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 326
+#: rc.cpp:5674 rc.cpp:5680
 #, no-c-format
-msgid "Do not link against shared libraries (-all-static)"
+msgid "Grid resolution"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/addtargetdlgbase.ui line 189
-#: rc.cpp:6728
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 329
+#: rc.cpp:5677 rc.cpp:5683
 #, no-c-format
-msgid "Do not assign version numbers to libraries (-avoid-version)"
+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>"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/addtargetdlgbase.ui line 197
-#: rc.cpp:6731
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 357
+#: rc.cpp:5686
 #, no-c-format
-msgid "Create a library that can be dynamically loaded (-module)"
+msgid "Grid-&X:"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/addtargetdlgbase.ui line 205
-#: rc.cpp:6734
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 368
+#: rc.cpp:5689
 #, no-c-format
-msgid "Library does not depend on external symbols (-no-undefined)"
+msgid "Grid-&Y:"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/addtargetdlgbase.ui line 228
-#: rc.cpp:6737
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 383
+#: rc.cpp:5692
 #, no-c-format
-msgid "Ot&her:"
-msgstr "Ar&all:"
+msgid "Backgro&und"
+msgstr "Cefndir"
 
-#. i18n: file ./buildtools/autotools/addfiledlgbase.ui line 36
-#: rc.cpp:6746
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 420
+#: rc.cpp:5698
 #, no-c-format
-msgid "Add New Created File to Target"
+msgid "Select a color in the color dialog."
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/addfiledlgbase.ui line 135
-#: rc.cpp:6764
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 431
+#: rc.cpp:5701
 #, no-c-format
-msgid "File Information"
-msgstr ""
+msgid "Co&lor"
+msgstr "Ll&iw"
 
-#. i18n: file ./buildtools/autotools/addfiledlgbase.ui line 173
-#: buildtools/script/scriptnewfiledlg.cpp:46 rc.cpp:6767
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 434
+#: rc.cpp:5704
 #, no-c-format
-msgid "&Use file template"
+msgid "Use a background color"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/addfiledlgbase.ui line 202
-#: rc.cpp:6770
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 437
+#: rc.cpp:5707
 #, no-c-format
-msgid "New file &name (with extension):"
+msgid "Use a background color."
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/removefiledlgbase.ui line 16
-#: rc.cpp:6779
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 445
+#: rc.cpp:5710
 #, no-c-format
-msgid "Remove File From This Target"
+msgid "&Pixmap"
+msgstr "&Picsfap"
+
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 451
+#: rc.cpp:5713
+#, no-c-format
+msgid "Use a background pixmap"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/removefiledlgbase.ui line 79
-#: rc.cpp:6788
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 454
+#: rc.cpp:5716
 #, no-c-format
-msgid "&File Information"
+msgid "Use a background pixmap."
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/removefiledlgbase.ui line 120
-#: rc.cpp:6797
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 476
+#: rc.cpp:5719 rc.cpp:5962
 #, no-c-format
-msgid "<b>Note:</b> You will not be able to undelete the file."
+msgid "Select a pixmap"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/removefiledlgbase.ui line 215
-#: rc.cpp:6812
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 479
+#: rc.cpp:5722
 #, no-c-format
-msgid "[DIRECTORY NAME]"
+msgid "Choose a pixmap file."
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/wizardeditor.ui line 41
-#: rc.cpp:6815
+#. i18n: file ./kdevdesigner/designer/multilineeditor.ui line 41
+#: rc.cpp:5740
 #, no-c-format
-msgid "Wizard Page Editor"
+msgid "Edit Text"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/wizardeditor.ui line 86
-#: rc.cpp:6818
+#. i18n: file ./kdevdesigner/designer/multilineeditor.ui line 44
+#: rc.cpp:5743
 #, no-c-format
-msgid "Wizard pages:"
+msgid ""
+"<b>Multiline Edit</b>"
+"<p>This is a simple richtext editor. To improve its usability it provides "
+"toolbar items for the most common html tags: by clicking on a toolbar item, the "
+"corresponding tag will be written to the editor, where you can insert your "
+"text. If you have already written some text and want to format it, hilight it "
+"and click on the desired button.  To improve visualization this editor also "
+"supports a simple html-syntax-highlighting scheme."
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/wizardeditor.ui line 115
-#: rc.cpp:6821
+#. i18n: file ./kdevdesigner/designer/createtemplate.ui line 41
+#: kdevdesigner/designer/mainwindowactions.cpp:739
+#: kdevdesigner/designer/mainwindowactions.cpp:1451
+#: kdevdesigner/designer/mainwindowactions.cpp:1472 rc.cpp:5758
 #, no-c-format
-msgid "A&dd"
-msgstr "&Ychwcanegu"
+msgid "Create Template"
+msgstr "Creu Patrymlun"
 
-#. i18n: file ./kdevdesigner/designer/wizardeditor.ui line 225
-#: rc.cpp:6833 rc.cpp:7072 rc.cpp:7210 rc.cpp:7387 rc.cpp:7588 rc.cpp:7651
-#: rc.cpp:8121 rc.cpp:8242 rc.cpp:8290 rc.cpp:8422 rc.cpp:8819
+#. i18n: file ./kdevdesigner/designer/createtemplate.ui line 72
+#: rc.cpp:5764
 #, no-c-format
-msgid "Close the dialog and apply all the changes."
+msgid "Name of the new template"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/wizardeditor.ui line 239
-#: rc.cpp:6839 rc.cpp:7216 rc.cpp:7594 rc.cpp:8296 rc.cpp:8428
+#. i18n: file ./kdevdesigner/designer/createtemplate.ui line 75
+#: rc.cpp:5767
 #, no-c-format
-msgid "Apply all changes."
+msgid "Enter the name of the new template"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/wizardeditor.ui line 253
-#: rc.cpp:6845 rc.cpp:7078 rc.cpp:7222 rc.cpp:7393 rc.cpp:7600 rc.cpp:7657
-#: rc.cpp:8127 rc.cpp:8248 rc.cpp:8302 rc.cpp:8434 rc.cpp:8674 rc.cpp:8825
+#. i18n: file ./kdevdesigner/designer/createtemplate.ui line 83
+#: rc.cpp:5770
 #, no-c-format
-msgid "Close the dialog and discard any changes."
+msgid "Class of the new template"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/previewwidget.ui line 47
-#: rc.cpp:6848
+#. i18n: file ./kdevdesigner/designer/createtemplate.ui line 86
+#: rc.cpp:5773
 #, no-c-format
-msgid "Preview Window"
+msgid ""
+"Enter the name of the class which should be used as the template's base class"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/previewwidget.ui line 92
-#: rc.cpp:6851
+#. i18n: file ./kdevdesigner/designer/createtemplate.ui line 131
+#: rc.cpp:5779
 #, no-c-format
-msgid "ButtonGroup"
+msgid "Creates the new template"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/previewwidget.ui line 109
-#: rc.cpp:6854
+#. i18n: file ./kdevdesigner/designer/createtemplate.ui line 142
+#: rc.cpp:5785
 #, no-c-format
-msgid "RadioButton1"
+msgid "Closes the Dialog"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/previewwidget.ui line 120
-#: rc.cpp:6857
+#. i18n: file ./kdevdesigner/designer/createtemplate.ui line 152
+#: rc.cpp:5788
 #, no-c-format
-msgid "RadioButton2"
+msgid "&Baseclass for template:"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/previewwidget.ui line 128
-#: rc.cpp:6860
+#. i18n: file ./kdevdesigner/designer/pixmapcollectioneditor.ui line 41
+#: rc.cpp:5791
 #, no-c-format
-msgid "RadioButton3"
+msgid "Manage Image Collection"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/previewwidget.ui line 138
-#: rc.cpp:6863
+#. i18n: file ./kdevdesigner/designer/pixmapcollectioneditor.ui line 135
+#: rc.cpp:5806
 #, no-c-format
-msgid "ButtonGroup2"
-msgstr ""
+msgid "C&lose"
+msgstr "C&au"
 
-#. i18n: file ./kdevdesigner/designer/previewwidget.ui line 155
-#: rc.cpp:6866
+#. i18n: file ./kdevdesigner/designer/finddialog.ui line 41
+#: rc.cpp:5809
 #, no-c-format
-msgid "CheckBox1"
-msgstr ""
+msgid "Find Text"
+msgstr "Canfod Testun"
 
-#. i18n: file ./kdevdesigner/designer/previewwidget.ui line 166
-#: rc.cpp:6869
+#. i18n: file ./kdevdesigner/designer/finddialog.ui line 72
+#: rc.cpp:5812
 #, no-c-format
-msgid "CheckBox2"
-msgstr ""
+msgid "F&ind:"
+msgstr "C&anfod:"
 
-#. i18n: file ./kdevdesigner/designer/previewwidget.ui line 200
-#: rc.cpp:6872
+#. i18n: file ./kdevdesigner/designer/finddialog.ui line 132
+#: rc.cpp:5815
 #, no-c-format
-msgid "LineEdit"
-msgstr ""
+msgid "&Find"
+msgstr "&Canfod"
 
-#. i18n: file ./kdevdesigner/designer/previewwidget.ui line 206
-#: rc.cpp:6875
+#. i18n: file ./kdevdesigner/designer/pixmapfunction.ui line 41
+#: rc.cpp:5842
 #, no-c-format
-msgid "ComboBox"
-msgstr "Blwch Cyfuno"
+msgid "Choose Pixmap"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/previewwidget.ui line 237
-#: rc.cpp:6878
+#. i18n: file ./kdevdesigner/designer/pixmapfunction.ui line 61
+#: rc.cpp:5845
 #, no-c-format
-msgid "PushButton"
+msgid "&Enter arguments for loading the pixmap:"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/previewwidget.ui line 274
-#: rc.cpp:6881
+#. i18n: file ./kdevdesigner/designer/pixmapfunction.ui line 349
+#: rc.cpp:5848
 #, no-c-format
-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>"
+msgid "QPixmap("
 msgstr ""
 
+#. i18n: file ./kdevdesigner/designer/pixmapfunction.ui line 865
+#: rc.cpp:5851
+#, no-c-format
+msgid ")"
+msgstr ")"
+
 #. i18n: file ./kdevdesigner/designer/newform.ui line 41
 #: buildtools/script/scriptnewfiledlg.cpp:36
-#: kdevdesigner/designer/mainwindowactions.cpp:659 rc.cpp:6889
+#: kdevdesigner/designer/mainwindowactions.cpp:659 rc.cpp:5863
 #, no-c-format
 msgid "New File"
 msgstr "Ffeil newydd"
 
 #. i18n: file ./kdevdesigner/designer/newform.ui line 47
-#: rc.cpp:6892
+#: rc.cpp:5866
 #, no-c-format
 msgid ""
 "<b>New Form</b>"
@@ -10374,61 +8982,37 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./kdevdesigner/designer/newform.ui line 115
-#: rc.cpp:6901
+#: rc.cpp:5875
 #, no-c-format
 msgid "Create a new form using the selected template."
 msgstr ""
 
 #. i18n: file ./kdevdesigner/designer/newform.ui line 129
-#: rc.cpp:6907
+#: rc.cpp:5881
 #, no-c-format
 msgid "Close the dialog without creating a new form."
 msgstr ""
 
 #. i18n: file ./kdevdesigner/designer/newform.ui line 151
-#: rc.cpp:6910
+#: rc.cpp:5884
 #, no-c-format
 msgid "Displays a list of the available templates."
 msgstr ""
 
 #. i18n: file ./kdevdesigner/designer/newform.ui line 159
-#: rc.cpp:6913
+#: rc.cpp:5887
 #, no-c-format
 msgid "&Insert into:"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/connectiondialog.ui line 41
-#: rc.cpp:6916
-#, no-c-format
-msgid "View & Edit Connections"
-msgstr ""
-
-#. i18n: file ./kdevdesigner/designer/connectiondialog.ui line 58
-#: parts/filecreate/filecreate_part.cpp:81 rc.cpp:6919
-#, no-c-format
-msgid "&New"
-msgstr "&Newydd"
-
-#. i18n: file ./kdevdesigner/designer/connectiondialog.ui line 74
-#: rc.cpp:6922
-#, no-c-format
-msgid "&Connections:"
-msgstr "C&ysylltiadau :"
-
-#. i18n: file ./kdevdesigner/designer/connectiondialog.ui line 129
-#: rc.cpp:6934
-#, no-c-format
-msgid "&Edit Slots..."
-msgstr ""
-
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 44
-#: rc.cpp:6937
+#: rc.cpp:5890
 #, no-c-format
 msgid "Tune Palette"
 msgstr ""
 
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 50
-#: rc.cpp:6940
+#: rc.cpp:5893
 #, no-c-format
 msgid ""
 "<b>Edit Palette</b>"
@@ -10439,129 +9023,105 @@ msgid ""
 "section.</p>"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 87
-#: rc.cpp:6943 rc.cpp:7633
-#, no-c-format
-msgid "Select &palette:"
-msgstr ""
-
-#. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 96
-#: rc.cpp:6946 rc.cpp:7636
-#, no-c-format
-msgid "Active Palette"
-msgstr ""
-
-#. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 101
-#: rc.cpp:6949 rc.cpp:7639
-#, no-c-format
-msgid "Inactive Palette"
-msgstr ""
-
-#. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 106
-#: rc.cpp:6952 rc.cpp:7642
-#, no-c-format
-msgid "Disabled Palette"
-msgstr ""
-
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 126
-#: rc.cpp:6955
+#: rc.cpp:5908
 #, no-c-format
 msgid "Auto"
 msgstr "Ymysgogol"
 
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 143
-#: rc.cpp:6958
+#: rc.cpp:5911
 #, no-c-format
 msgid "Build the &inactive palette from the active palette"
 msgstr ""
 
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 154
-#: rc.cpp:6961
+#: rc.cpp:5914
 #, no-c-format
 msgid "Build the &disabled palette from the active palette"
 msgstr ""
 
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 167
-#: rc.cpp:6964
+#: rc.cpp:5917
 #, no-c-format
 msgid "Central Color Roles"
 msgstr ""
 
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 182
-#: rc.cpp:6967
+#: rc.cpp:5920
 #, no-c-format
 msgid "Background"
 msgstr "Cefndir"
 
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 187
-#: rc.cpp:6970
+#: rc.cpp:5923
 #, no-c-format
 msgid "Foreground"
 msgstr "Blaendir"
 
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 192
-#: rc.cpp:6973
+#: rc.cpp:5926
 #, no-c-format
 msgid "Button"
 msgstr "Botwm"
 
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 197
-#: rc.cpp:6976
+#: rc.cpp:5929
 #, no-c-format
 msgid "Base"
 msgstr "Bôn"
 
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 202
 #: kdevdesigner/designer/mainwindow.cpp:1735
-#: kdevdesigner/designer/mainwindow.cpp:2638 rc.cpp:6979
+#: kdevdesigner/designer/mainwindow.cpp:2638 rc.cpp:5932
 #, no-c-format
 msgid "Text"
 msgstr "Testun"
 
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 207
-#: rc.cpp:6982
+#: rc.cpp:5935
 #, no-c-format
 msgid "BrightText"
 msgstr ""
 
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 212
-#: rc.cpp:6985
+#: rc.cpp:5938
 #, no-c-format
 msgid "ButtonText"
 msgstr ""
 
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 217
-#: rc.cpp:6988
+#: rc.cpp:5941
 #, no-c-format
 msgid "Highlight"
 msgstr "Amlygu"
 
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 222
-#: rc.cpp:6991
+#: rc.cpp:5944
 #, no-c-format
 msgid "HighlightText"
 msgstr ""
 
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 227
-#: rc.cpp:6994
+#: rc.cpp:5947
 #, no-c-format
 msgid "Link"
 msgstr "Cyswllt"
 
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 232
-#: rc.cpp:6997
+#: rc.cpp:5950
 #, no-c-format
 msgid "LinkVisited"
 msgstr ""
 
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 239
-#: rc.cpp:7000
+#: rc.cpp:5953
 #, no-c-format
 msgid "Choose the central color role"
 msgstr ""
 
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 242
-#: rc.cpp:7003
+#: rc.cpp:5956
 #, no-c-format
 msgid ""
 "<b>Select a color role.</b>"
@@ -10584,103 +9144,91 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 287
-#: rc.cpp:7006
+#: rc.cpp:5959
 #, no-c-format
 msgid "Choose pi&xmap:"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 310
-#: rc.cpp:7009 rc.cpp:7375
-#, no-c-format
-msgid "Select a pixmap"
-msgstr ""
-
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 313
-#: rc.cpp:7012
+#: rc.cpp:5965
 #, no-c-format
 msgid "Choose a pixmap file for the selected central color role."
 msgstr ""
 
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 333
-#: rc.cpp:7015
+#: rc.cpp:5968
 #, no-c-format
 msgid "&Select color:"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 356
-#: rc.cpp:7018 rc.cpp:7060 rc.cpp:7351 rc.cpp:7612 rc.cpp:7621
-#, no-c-format
-msgid "Choose a color"
-msgstr ""
-
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 359
-#: rc.cpp:7021
+#: rc.cpp:5974
 #, no-c-format
 msgid "Choose a color for the selected central color role."
 msgstr ""
 
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 371
-#: rc.cpp:7024
+#: rc.cpp:5977
 #, no-c-format
 msgid "3-D Shadow Effects"
 msgstr ""
 
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 402
-#: rc.cpp:7027
+#: rc.cpp:5980
 #, no-c-format
 msgid "Build &from button color:"
 msgstr ""
 
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 408
-#: rc.cpp:7030
+#: rc.cpp:5983
 #, no-c-format
 msgid "Generate shadings"
 msgstr ""
 
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 411
-#: rc.cpp:7033
+#: rc.cpp:5986
 #, no-c-format
 msgid "Check to let 3D-effect colors be calculated from the button-color."
 msgstr ""
 
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 417
-#: rc.cpp:7036
+#: rc.cpp:5989
 #, no-c-format
 msgid "Light"
 msgstr "Golau"
 
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 422
-#: rc.cpp:7039
+#: rc.cpp:5992
 #, no-c-format
 msgid "Midlight"
 msgstr ""
 
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 427
-#: rc.cpp:7042
+#: rc.cpp:5995
 #, no-c-format
 msgid "Mid"
 msgstr "Canol"
 
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 432
-#: rc.cpp:7045
+#: rc.cpp:5998
 #, no-c-format
 msgid "Dark"
 msgstr "Tywyll"
 
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 437
-#: rc.cpp:7048
+#: rc.cpp:6001
 #, no-c-format
 msgid "Shadow"
 msgstr "Cysgod"
 
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 444
-#: rc.cpp:7051
+#: rc.cpp:6004
 #, no-c-format
 msgid "Choose 3D-effect color role"
 msgstr ""
 
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 447
-#: rc.cpp:7054
+#: rc.cpp:6007
 #, no-c-format
 msgid ""
 "<b>Select a color effect role.</b>"
@@ -10694,3006 +9242,4218 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 500
-#: rc.cpp:7057
+#: rc.cpp:6010
 #, no-c-format
 msgid "Select co&lor:"
 msgstr ""
 
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 526
-#: rc.cpp:7063
+#: rc.cpp:6016
 #, no-c-format
 msgid "Choose a color for the selected effect color role."
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/replacedialog.ui line 41
-#: rc.cpp:7081
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 41
+#: rc.cpp:6034
 #, no-c-format
-msgid "Replace Text"
-msgstr "Amnewid Testun"
+msgid "Edit Listview"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/replacedialog.ui line 72
-#: rc.cpp:7084
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 47
+#: rc.cpp:6037
 #, no-c-format
-msgid "R&eplace:"
-msgstr "A&mnewid:"
+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>"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/replacedialog.ui line 83
-#: rc.cpp:7087
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 68
+#: kdevdesigner/designer/listvieweditorimpl.cpp:631 rc.cpp:6040
 #, no-c-format
-msgid "&Find:"
-msgstr "&Canfod:"
+msgid "&Items"
+msgstr "&Eitemau"
 
-#. i18n: file ./kdevdesigner/designer/replacedialog.ui line 159
-#: rc.cpp:7090
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 91
+#: rc.cpp:6049
 #, no-c-format
-msgid "&Replace"
-msgstr "A&mnewid"
+msgid "<b>Deletes the selected item.</b><p>Any sub-items are also deleted.</p>"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/replacedialog.ui line 170
-#: rc.cpp:7093
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 107
+#: rc.cpp:6052
 #, no-c-format
-msgid "Replace &All"
-msgstr "Amnewid y &Cwbl"
+msgid "Item Properties"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/replacedialog.ui line 205
-#: rc.cpp:7102 rc.cpp:8070
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 124
+#: rc.cpp:6055
 #, no-c-format
-msgid "&Whole words only"
-msgstr "D&im ond geiriau cyfan"
+msgid "Pi&xmap:"
+msgstr "Pi&csfap :"
 
-#. i18n: file ./kdevdesigner/designer/replacedialog.ui line 213
-#: rc.cpp:7105 rc.cpp:8073
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 155
+#: rc.cpp:6064
 #, no-c-format
-msgid "Case &sensitive"
-msgstr "Mae llythrennau bras o &bwys"
+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 ""
 
-#. i18n: file ./kdevdesigner/designer/replacedialog.ui line 221
-#: rc.cpp:7108 rc.cpp:8076
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 163
+#: rc.cpp:6067
 #, no-c-format
-msgid "Start at &beginning"
+msgid "Change column"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/replacedialog.ui line 231
-#: rc.cpp:7111 rc.cpp:8058
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 166
+#: rc.cpp:6070
 #, no-c-format
-msgid "Direction"
-msgstr "Cyfeiriad:"
+msgid ""
+"<b>Select the current column.</b>"
+"<p>The item's text and pixmap will be changed for the current column</p>"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/replacedialog.ui line 248
-#: rc.cpp:7114 rc.cpp:8061
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 174
+#: rc.cpp:6073
 #, no-c-format
-msgid "Forwar&d"
-msgstr "Ymlaen"
+msgid "Colu&mn:"
+msgstr "Colo&fn:"
 
-#. i18n: file ./kdevdesigner/designer/replacedialog.ui line 259
-#: rc.cpp:7117 rc.cpp:8064
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 260
+#: rc.cpp:6100
 #, no-c-format
-msgid "Bac&kward"
+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>"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/actioneditor.ui line 41
-#: rc.cpp:7120
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 276
+#: rc.cpp:6106
 #, no-c-format
-msgid "Edit Actions"
+msgid "New &Subitem"
+msgstr "&Is-eitem Newydd"
+
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 279
+#: rc.cpp:6109
+#, no-c-format
+msgid "Add a subitem"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/actioneditor.ui line 83
-#: rc.cpp:7123
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 282
+#: rc.cpp:6112
 #, no-c-format
-msgid "Create new Action"
+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>"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/actioneditor.ui line 100
-#: rc.cpp:7126
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 316
+#: rc.cpp:6118
 #, no-c-format
-msgid "Delete current Action"
+msgid ""
+"<b>Move the selected item up.</b>"
+"<p>The item will be moved within its level in the hierarchy.</p>"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/actioneditor.ui line 117
-#: rc.cpp:7129
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 333
+#: rc.cpp:6124
 #, no-c-format
-msgid "Connect current Action"
+msgid ""
+"<b>Move the selected item down.</b>"
+"<p>The item will be moved within its level in the hierarchy.</p>"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/dbconnectioneditor.ui line 41
-#: rc.cpp:7132
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 347
+#: rc.cpp:6127
 #, no-c-format
-msgid "Connect"
-msgstr "Cysylltu"
+msgid "Move left"
+msgstr "Symud i'r Chwith"
 
-#. i18n: file ./kdevdesigner/designer/dbconnectioneditor.ui line 94
-#: rc.cpp:7141
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 350
+#: rc.cpp:6130
 #, no-c-format
-msgid "Connection Details"
+msgid ""
+"<b>Move the selected item one level up.</b>"
+"<p>This will also change the level of the item's sub-items.</p>"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/iconvieweditor.ui line 41
-#: rc.cpp:7144
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 364
+#: rc.cpp:6133
 #, no-c-format
-msgid "Edit Iconview"
-msgstr ""
+msgid "Move right"
+msgstr "Symud i'r Dde"
 
-#. i18n: file ./kdevdesigner/designer/iconvieweditor.ui line 47
-#: rc.cpp:7147
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 367
+#: rc.cpp:6136
 #, no-c-format
 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>"
+"<b>Move the selected item one level down.</b>"
+"<p>This will also change the level of the item's sub-items.</p>"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/iconvieweditor.ui line 78
-#: rc.cpp:7150
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 394
+#: rc.cpp:6142
 #, no-c-format
-msgid "All items in the iconview."
+msgid "Column Properties"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/iconvieweditor.ui line 100
-#: rc.cpp:7153 rc.cpp:7456 rc.cpp:8344
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 445
+#: rc.cpp:6154
 #, no-c-format
-msgid "&New Item"
-msgstr "&Eitem Newydd"
+msgid "Delete the pixmap of the selected column."
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/iconvieweditor.ui line 103
-#: rc.cpp:7156 rc.cpp:7459 rc.cpp:8347
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 465
+#: rc.cpp:6163
 #, no-c-format
-msgid "Add an item"
-msgstr "Ychwanegu eitem"
+msgid ""
+"<b>Select a pixmap file for the selected column.</b>"
+"<p>The pixmap will be displayed in the header of the listview.</p>"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/iconvieweditor.ui line 106
-#: rc.cpp:7159
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 490
+#: rc.cpp:6169
 #, no-c-format
-msgid "Create a new item for the iconview."
+msgid "Enter column text"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/iconvieweditor.ui line 114
-#: rc.cpp:7162 rc.cpp:7405 rc.cpp:8353
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 493
+#: rc.cpp:6172
 #, no-c-format
-msgid "&Delete Item"
-msgstr "&Dileu Eitem"
+msgid ""
+"<b>Enter the text for the selected column.</b>"
+"<p>The text will be displayed in the header of the listview.</p>"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/iconvieweditor.ui line 117
-#: rc.cpp:7165 rc.cpp:7408
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 501
+#: rc.cpp:6175
 #, no-c-format
-msgid "Delete item"
-msgstr " Dileu eitem"
+msgid "Clicka&ble"
+msgstr "Clicad&wy"
 
-#. i18n: file ./kdevdesigner/designer/iconvieweditor.ui line 120
-#: rc.cpp:7168
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 504
+#: rc.cpp:6178
 #, no-c-format
-msgid "Delete the selected item."
+msgid ""
+"If this option is checked, the selected column will react to mouse clicks on "
+"the header."
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/iconvieweditor.ui line 155
-#: rc.cpp:7171 rc.cpp:8311
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 512
+#: rc.cpp:6181
 #, no-c-format
-msgid "&Item Properties"
+msgid "Re&sizable"
+msgstr "Ge&llir newid ei faint"
+
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 515
+#: rc.cpp:6184
+#, no-c-format
+msgid "The column's width will be resizable if this option is checked."
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/iconvieweditor.ui line 172
-#: rc.cpp:7174 rc.cpp:7420 rc.cpp:7528 rc.cpp:8335
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 528
+#: rc.cpp:6190
 #, no-c-format
-msgid "&Text:"
-msgstr "&Testun:"
+msgid "Delete column"
+msgstr "Dileu Colofn"
 
-#. i18n: file ./kdevdesigner/designer/iconvieweditor.ui line 189
-#: rc.cpp:7177 rc.cpp:7423 rc.cpp:8338
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 531
+#: rc.cpp:6193
 #, no-c-format
-msgid "Change text"
-msgstr "Newid y Testun"
+msgid "Deletes the selected Column."
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/iconvieweditor.ui line 192
-#: rc.cpp:7180
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 548
+#: rc.cpp:6199
 #, no-c-format
-msgid "Change the text for the selected item."
+msgid ""
+"<b>Move the selected item down.</b>"
+"<p>The top-most column will be the first column in the list.</p>"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/iconvieweditor.ui line 200
-#: rc.cpp:7183 rc.cpp:7507 rc.cpp:8314
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 559
+#: rc.cpp:6205
 #, no-c-format
-msgid "&Pixmap:"
-msgstr "&Picsfap :"
+msgid "Add a Column"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/iconvieweditor.ui line 225
-#: rc.cpp:7186 rc.cpp:7438 rc.cpp:7510 rc.cpp:8317 rc.cpp:8461 rc.cpp:8518
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 562
+#: rc.cpp:6208
 #, no-c-format
-msgid "Label4"
+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>"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/iconvieweditor.ui line 245
-#: rc.cpp:7189 rc.cpp:7441 rc.cpp:7513 rc.cpp:8320 rc.cpp:8464 rc.cpp:8521
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 579
+#: rc.cpp:6214
 #, no-c-format
-msgid "Delete Pixmap"
+msgid ""
+"<b>Move the selected item up.</b>"
+"<p>The top-most column will be the first column in the list.</p>"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/iconvieweditor.ui line 248
-#: rc.cpp:7192 rc.cpp:8323
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 587
+#: rc.cpp:6217
 #, no-c-format
-msgid "Delete the selected item's pixmap."
+msgid "The list of columns."
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/iconvieweditor.ui line 265
-#: rc.cpp:7198 rc.cpp:7450 rc.cpp:7522 rc.cpp:7724 rc.cpp:8329 rc.cpp:8473
-#: rc.cpp:8530
+#. i18n: file ./kdevdesigner/designer/formsettings.ui line 41
+#: kdevdesigner/designer/mainwindowactions.cpp:213 rc.cpp:6241
 #, no-c-format
-msgid "Select a Pixmap"
+msgid "Form Settings"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/iconvieweditor.ui line 268
-#: rc.cpp:7201
+#. i18n: file ./kdevdesigner/designer/formsettings.ui line 47
+#: rc.cpp:6244
 #, no-c-format
-msgid "Select a pixmap file for the current item."
+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>"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/createtemplate.ui line 41
-#: kdevdesigner/designer/mainwindowactions.cpp:739
-#: kdevdesigner/designer/mainwindowactions.cpp:1451
-#: kdevdesigner/designer/mainwindowactions.cpp:1472 rc.cpp:7225
+#. i18n: file ./kdevdesigner/designer/formsettings.ui line 64
+#: rc.cpp:6247
 #, no-c-format
-msgid "Create Template"
-msgstr "Creu Patrymlun"
+msgid "Pixmaps"
+msgstr "Picsfapiau"
 
-#. i18n: file ./kdevdesigner/designer/createtemplate.ui line 72
-#: rc.cpp:7231
+#. i18n: file ./kdevdesigner/designer/formsettings.ui line 81
+#: rc.cpp:6250
+#, fuzzy, no-c-format
+msgid "Save in&line"
+msgstr "&Parhau"
+
+#. i18n: file ./kdevdesigner/designer/formsettings.ui line 87
+#: rc.cpp:6253
 #, no-c-format
-msgid "Name of the new template"
+msgid "Save pixmaps in the .ui files"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/createtemplate.ui line 75
-#: rc.cpp:7234
+#. i18n: file ./kdevdesigner/designer/formsettings.ui line 90
+#: rc.cpp:6256
 #, no-c-format
-msgid "Enter the name of the new template"
+msgid ""
+"<b>Save Inline</b>"
+"<p>Saves the pixmaps as binary data in the .ui files. Pixmaps saved like this "
+"are not shared between forms. We recommend using Project image files instead."
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/createtemplate.ui line 83
-#: rc.cpp:7237
+#. i18n: file ./kdevdesigner/designer/formsettings.ui line 98
+#: rc.cpp:6259
 #, no-c-format
-msgid "Class of the new template"
+msgid "Project &image file"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/createtemplate.ui line 86
-#: rc.cpp:7240
+#. i18n: file ./kdevdesigner/designer/formsettings.ui line 101
+#: rc.cpp:6262
 #, no-c-format
-msgid ""
-"Enter the name of the class which should be used as the template's base class"
+msgid "Use the Project's Image file for pixmaps"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/createtemplate.ui line 131
-#: rc.cpp:7246
+#. i18n: file ./kdevdesigner/designer/formsettings.ui line 105
+#: rc.cpp:6265
 #, no-c-format
-msgid "Creates the new template"
+msgid ""
+"<b>Use the Project's Image file for pixmaps</b>\n"
+"<p>Each project may have a collection of pixmaps. If you use a project, we "
+"recommend that you use this option since it shares the images and is the "
+"fastest and most efficient way to use pixmaps in your forms.</p>"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/createtemplate.ui line 142
-#: rc.cpp:7252
+#. i18n: file ./kdevdesigner/designer/formsettings.ui line 116
+#: rc.cpp:6269
 #, no-c-format
-msgid "Closes the Dialog"
+msgid ""
+"Specify Pixmap-Loader function (only the function's name, no parentheses.)"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/createtemplate.ui line 152
-#: rc.cpp:7255
+#. i18n: file ./kdevdesigner/designer/formsettings.ui line 119
+#: rc.cpp:6272
 #, no-c-format
-msgid "&Baseclass for template:"
+msgid ""
+"<b>Specify Pixmap-Loader function</b>"
+"<p>Specify the function which should be used for loading a pixmap in the "
+"generated code. <em>Only enter the function's name, without parentheses.</em>"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/preferences.ui line 41
-#: kdevdesigner/designer/mainwindowactions.cpp:220 rc.cpp:7258
+#. i18n: file ./kdevdesigner/designer/formsettings.ui line 127
+#: rc.cpp:6275
 #, no-c-format
-msgid "Preferences"
-msgstr "Hoffterau"
+msgid "Use &function:"
+msgstr "Defn&yddio ffwythiant:"
 
-#. i18n: file ./kdevdesigner/designer/preferences.ui line 47
-#: rc.cpp:7261
+#. i18n: file ./kdevdesigner/designer/formsettings.ui line 130
+#: rc.cpp:6278
+#, no-c-format
+msgid "Use the given function for pixmaps"
+msgstr ""
+
+#. i18n: file ./kdevdesigner/designer/formsettings.ui line 133
+#: rc.cpp:6281
 #, no-c-format
 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>Use a given function for pixmaps</b>"
+"<p>If you choose this option you must define a function in the line edit at the "
+"right which will be used in the generated code for loading pixmaps. When "
+"choosing a pixmap in <i>Qt Designer</i> you will be asked to specify the "
+"arguments which will be passed to the function in the generated code."
+"<p> This approach makes it possible to use your own icon-loader function for "
+"loading pixmaps.  <i>Qt Designer</i> cannot preview the correct image if you "
+"use your own function."
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/preferences.ui line 79
-#: rc.cpp:7267
+#. i18n: file ./kdevdesigner/designer/formsettings.ui line 166
+#: rc.cpp:6287
 #, no-c-format
-msgid "File Saving"
+msgid "Change class name"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/preferences.ui line 90
-#: rc.cpp:7270
+#. i18n: file ./kdevdesigner/designer/formsettings.ui line 169
+#: rc.cpp:6290
 #, no-c-format
-msgid "Enable auto sa&ve"
+msgid ""
+"<b>Enter the name of the class that will be created.</b>"
+"<p><em>classname.h</em> and <em>classname.cpp</em> will be generated as C++ "
+"output when it is compiled by uic.</p>"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/preferences.ui line 109
-#: rc.cpp:7273
+#. i18n: file ./kdevdesigner/designer/formsettings.ui line 177
+#: rc.cpp:6293
 #, no-c-format
-msgid "Auto save &interval:"
+msgid "A&uthor:"
+msgstr "A&wdur:"
+
+#. i18n: file ./kdevdesigner/designer/formsettings.ui line 188
+#: rc.cpp:6296
+#, no-c-format
+msgid "Enter your name"
+msgstr "Rhowch eich Enw"
+
+#. i18n: file ./kdevdesigner/designer/formsettings.ui line 191
+#: rc.cpp:6299
+#, no-c-format
+msgid "Enter your name."
+msgstr "Rhowch eich Enw."
+
+#. i18n: file ./kdevdesigner/designer/formsettings.ui line 210
+#: rc.cpp:6305 rc.cpp:7038 rc.cpp:8585 rc.cpp:8771
+#, no-c-format
+msgid "Co&mment:"
+msgstr "S&ylwad:"
+
+#. i18n: file ./kdevdesigner/designer/formsettings.ui line 221
+#: rc.cpp:6308
+#, no-c-format
+msgid "Enter a comment about the form."
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/preferences.ui line 136
-#: rc.cpp:7276
+#. i18n: file ./kdevdesigner/designer/formsettings.ui line 242
+#: rc.cpp:6311
 #, no-c-format
-msgid "Plu&gin Paths"
+msgid "La&youts"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/preferences.ui line 166
-#: rc.cpp:7279 rc.cpp:7300
+#. i18n: file ./kdevdesigner/designer/formsettings.ui line 278
+#: rc.cpp:6314
 #, no-c-format
-msgid ""
-"A splash screen is displayed when starting Qt Designer if this option is "
-"checked."
+msgid "D&efault spacing:"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/preferences.ui line 191
-#: rc.cpp:7285
+#. i18n: file ./kdevdesigner/designer/formsettings.ui line 289
+#: rc.cpp:6317
 #, no-c-format
-msgid "Restore last &workspace on startup"
+msgid "Use func&tions:"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/preferences.ui line 197
-#: rc.cpp:7288
+#. i18n: file ./kdevdesigner/designer/formsettings.ui line 292
+#: rc.cpp:6320
 #, no-c-format
-msgid "Restore last workspace"
+msgid "Use functions to get the margin and spacing"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/preferences.ui line 200
-#: rc.cpp:7291
+#. i18n: file ./kdevdesigner/designer/formsettings.ui line 295
+#: rc.cpp:6323
 #, no-c-format
 msgid ""
-"The current workspace settings will be restored the next time you start Qt "
-"Designer if this option is checked."
+"<b>Use a given function for margin and/or spacing</b>"
+"<p>If you choose this option you must define functions in the line edit below "
+"which will be used in the generated code for getting the margin and spacing "
+"value. <i>Qt Designer</i> cannot preview the correct margin or spacing if you "
+"use your own function. Instead, the default values will be used for preview."
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/preferences.ui line 208
-#: rc.cpp:7294
+#. i18n: file ./kdevdesigner/designer/formsettings.ui line 322
+#: rc.cpp:6326
 #, no-c-format
-msgid "Show &splash screen on startup"
+msgid "Default mar&gin:"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/preferences.ui line 214
-#: rc.cpp:7297
+#. i18n: file ./kdevdesigner/designer/formsettings.ui line 336
+#: rc.cpp:6329
 #, no-c-format
-msgid "Show Splashscreen"
-msgstr ""
+msgid "S&pacing:"
+msgstr "By&lchiad :"
 
-#. i18n: file ./kdevdesigner/designer/preferences.ui line 225
-#: rc.cpp:7303
+#. i18n: file ./kdevdesigner/designer/formsettings.ui line 358
+#: rc.cpp:6332
 #, no-c-format
-msgid "Show start &dialog"
+msgid "Ma&rgin:"
+msgstr "Y&myl:"
+
+#. i18n: file ./kdevdesigner/designer/formsettings.ui line 383
+#: rc.cpp:6335
+#, no-c-format
+msgid "Specify spacing function (only the function's name, no parentheses.)"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/preferences.ui line 236
-#: rc.cpp:7306
+#. i18n: file ./kdevdesigner/designer/formsettings.ui line 386
+#: rc.cpp:6338
 #, no-c-format
-msgid "Disable data&base auto-edit in preview"
+msgid ""
+"<b>Specify spacing function</b>"
+"<p>Specify the function which should be used for getting the spacing in the "
+"generated code. <em>Only enter the function's name, without parentheses.</em>"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/preferences.ui line 247
-#: rc.cpp:7309
+#. i18n: file ./kdevdesigner/designer/formsettings.ui line 405
+#: rc.cpp:6341
 #, no-c-format
-msgid "Show toolbutton lab&els"
+msgid "Specify margin function (only the function's name, no parentheses.)"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/preferences.ui line 250
-#: rc.cpp:7312
+#. i18n: file ./kdevdesigner/designer/formsettings.ui line 408
+#: rc.cpp:6344
 #, no-c-format
-msgid "Text Labels"
+msgid ""
+"<b>Specify margin function</b>"
+"<p>Specify the function which should be used for getting the margin in the "
+"generated code. <em>Only enter the function's name, without parentheses.</em>"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/preferences.ui line 253
-#: rc.cpp:7315
+#. i18n: file ./embedded/visualboyadvance/vbaconfigwidgetbase.ui line 38
+#: rc.cpp:6362
 #, no-c-format
-msgid "Text labels will be used in the toolbars if this is checked."
+msgid "Graphic Filter"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/preferences.ui line 263
-#: rc.cpp:7318
+#. i18n: file ./embedded/visualboyadvance/vbaconfigwidgetbase.ui line 50
+#: rc.cpp:6365
 #, no-c-format
-msgid "G&rid"
-msgstr "G&rid"
+msgid "Normal mode"
+msgstr "Modd Arferol"
 
-#. i18n: file ./kdevdesigner/designer/preferences.ui line 286
-#: rc.cpp:7321
+#. i18n: file ./embedded/visualboyadvance/vbaconfigwidgetbase.ui line 58
+#: rc.cpp:6368
 #, no-c-format
-msgid "Sn&ap to grid"
-msgstr "Sn&apio i'r grid"
+msgid "TV mode"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/preferences.ui line 292
-#: rc.cpp:7324
+#. i18n: file ./embedded/visualboyadvance/vbaconfigwidgetbase.ui line 66
+#: rc.cpp:6371
 #, no-c-format
-msgid "Snap to the grid"
+msgid "2xSaI"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/preferences.ui line 295
-#: rc.cpp:7327
+#. i18n: file ./embedded/visualboyadvance/vbaconfigwidgetbase.ui line 74
+#: rc.cpp:6374
 #, no-c-format
-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 "
-"the X/Y resolution.</p>"
+msgid "Super 2xSal"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/preferences.ui line 326
-#: rc.cpp:7330 rc.cpp:7336
+#. i18n: file ./embedded/visualboyadvance/vbaconfigwidgetbase.ui line 82
+#: rc.cpp:6377
 #, no-c-format
-msgid "Grid resolution"
+msgid "Super Eagle"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/preferences.ui line 329
-#: rc.cpp:7333 rc.cpp:7339
+#. i18n: file ./embedded/visualboyadvance/vbaconfigwidgetbase.ui line 92
+#: rc.cpp:6380
 #, no-c-format
-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>"
+msgid "GBA binary:"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/preferences.ui line 357
-#: rc.cpp:7342
+#. i18n: file ./embedded/visualboyadvance/vbaconfigwidgetbase.ui line 105
+#: rc.cpp:6383
 #, no-c-format
-msgid "Grid-&X:"
+msgid "Additional parameters:"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/preferences.ui line 368
-#: rc.cpp:7345
+#. i18n: file ./embedded/visualboyadvance/vbaconfigwidgetbase.ui line 113
+#: rc.cpp:6386
 #, no-c-format
-msgid "Grid-&Y:"
+msgid "VisualBoy Advance (emulator):"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/preferences.ui line 383
-#: rc.cpp:7348
+#. i18n: file ./embedded/visualboyadvance/vbaconfigwidgetbase.ui line 157
+#: rc.cpp:6392
 #, no-c-format
-msgid "Backgro&und"
-msgstr "Cefndir"
+msgid "Scaling"
+msgstr "Graddio"
 
-#. i18n: file ./kdevdesigner/designer/preferences.ui line 420
-#: rc.cpp:7354
+#. i18n: file ./embedded/visualboyadvance/vbaconfigwidgetbase.ui line 169
+#: rc.cpp:6395
 #, no-c-format
-msgid "Select a color in the color dialog."
+msgid "1x"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/preferences.ui line 431
-#: rc.cpp:7357
+#. i18n: file ./embedded/visualboyadvance/vbaconfigwidgetbase.ui line 177
+#: rc.cpp:6398
 #, no-c-format
-msgid "Co&lor"
-msgstr "Ll&iw"
+msgid "2x"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/preferences.ui line 434
-#: rc.cpp:7360
+#. i18n: file ./embedded/visualboyadvance/vbaconfigwidgetbase.ui line 185
+#: rc.cpp:6401
 #, no-c-format
-msgid "Use a background color"
+msgid "3x"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/preferences.ui line 437
-#: rc.cpp:7363
+#. i18n: file ./embedded/visualboyadvance/vbaconfigwidgetbase.ui line 193
+#: rc.cpp:6404
 #, no-c-format
-msgid "Use a background color."
+msgid "4x"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/preferences.ui line 445
-#: rc.cpp:7366
+#. i18n: file ./embedded/visualboyadvance/vbaconfigwidgetbase.ui line 203
+#: rc.cpp:6407
 #, no-c-format
-msgid "&Pixmap"
-msgstr "&Picsfap"
+msgid "Full screen"
+msgstr "Sgrîn Lawn"
 
-#. i18n: file ./kdevdesigner/designer/preferences.ui line 451
-#: rc.cpp:7369
+#. i18n: file ./embedded/visualboyadvance/vbaconfigwidgetbase.ui line 211
+#: rc.cpp:6410
 #, no-c-format
-msgid "Use a background pixmap"
+msgid "Start in external terminal"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/preferences.ui line 454
-#: rc.cpp:7372
+#. i18n: file ./vcs/clearcase/integrator/ccintegratordlgbase.ui line 24
+#: rc.cpp:6413 rc.cpp:6748
 #, no-c-format
-msgid "Use a background pixmap."
+msgid "No options available for this VCS."
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/preferences.ui line 479
-#: rc.cpp:7378
+#. i18n: file ./vcs/subversion/svnssltrustpromptbase.ui line 16
+#: rc.cpp:6416
 #, no-c-format
-msgid "Choose a pixmap file."
+msgid "SSL Certificate Trust"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 41
-#: rc.cpp:7396
+#. i18n: file ./vcs/subversion/subversiondiff.ui line 16
+#: rc.cpp:6419
 #, no-c-format
-msgid "Edit Listview"
+msgid "Subversion Diff"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 47
-#: rc.cpp:7399
+#. i18n: file ./vcs/subversion/commitdlgbase.ui line 16
+#: rc.cpp:6425
+#, fuzzy, no-c-format
+msgid "Log Message"
+msgstr "Neges"
+
+#. i18n: file ./vcs/subversion/commitdlgbase.ui line 81
+#: rc.cpp:6431 rc.cpp:7546
 #, no-c-format
-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>"
+msgid "Ca&ncel"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 68
-#: kdevdesigner/designer/listvieweditorimpl.cpp:631 rc.cpp:7402
+#. i18n: file ./vcs/subversion/svn_logviewoptiondlgbase.ui line 16
+#: vcs/subversion/subversion_core.cpp:300 rc.cpp:6434
 #, no-c-format
-msgid "&Items"
-msgstr "&Eitemau"
+msgid "Subversion Log View"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 91
-#: rc.cpp:7411
+#. i18n: file ./vcs/subversion/svn_logviewoptiondlgbase.ui line 35
+#: rc.cpp:6440
 #, no-c-format
-msgid "<b>Deletes the selected item.</b><p>Any sub-items are also deleted.</p>"
+msgid "Do not show logs before branching point"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 107
-#: rc.cpp:7414
+#. i18n: file ./vcs/subversion/svn_logviewoptiondlgbase.ui line 46
+#: rc.cpp:6443
 #, no-c-format
-msgid "Item Properties"
+msgid "End Revision"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 124
-#: rc.cpp:7417
+#. i18n: file ./vcs/subversion/svn_logviewoptiondlgbase.ui line 57
+#: rc.cpp:6446 rc.cpp:6458
 #, no-c-format
-msgid "Pi&xmap:"
-msgstr "Pi&csfap :"
+msgid "&By Revision Number"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 155
-#: rc.cpp:7426
+#. i18n: file ./vcs/subversion/svn_logviewoptiondlgbase.ui line 65
+#: rc.cpp:6449 rc.cpp:6461
 #, no-c-format
-msgid ""
-"<b>Change the text of the item.</b>"
-"<p>The text will be changed in the current column of the selected item.</p>"
+msgid "B&y Revision Specifier"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 163
-#: rc.cpp:7429
+#. i18n: file ./vcs/subversion/svn_logviewoptiondlgbase.ui line 96
+#: rc.cpp:6455
+#, fuzzy, no-c-format
+msgid "Start Revision"
+msgstr "Dechrau chwilio"
+
+#. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 16
+#: rc.cpp:6464
+#, fuzzy, no-c-format
+msgid "Subversion Merge"
+msgstr "Fersiwn %1"
+
+#. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 27
+#: rc.cpp:6467 rc.cpp:6573
+#, fuzzy, no-c-format
+msgid "Destination"
+msgstr "Disgrifiad"
+
+#. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 38
+#: rc.cpp:6470
+#, fuzzy, no-c-format
+msgid "Destination working path"
+msgstr "Disgrifiad"
+
+#. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 53
+#: rc.cpp:6473
+#, fuzzy, no-c-format
+msgid "Source 1"
+msgstr "Tarddiad"
+
+#. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 80
+#: rc.cpp:6476 rc.cpp:6503
+#, fuzzy, no-c-format
+msgid "Number:"
+msgstr "Enw:"
+
+#. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 91
+#: rc.cpp:6479 rc.cpp:6506
 #, no-c-format
-msgid "Change column"
+msgid "Keyword:"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 166
-#: rc.cpp:7432
+#. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 97
+#: rc.cpp:6482 rc.cpp:6512 rc.cpp:6591 rc.cpp:6621
 #, no-c-format
-msgid ""
-"<b>Select the current column.</b>"
-"<p>The item's text and pixmap will be changed for the current column</p>"
+msgid "HEAD"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 174
-#: rc.cpp:7435
+#. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 102
+#: rc.cpp:6485 rc.cpp:6515 rc.cpp:6594
 #, no-c-format
-msgid "Colu&mn:"
-msgstr "Colo&fn:"
+msgid "BASE"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 222
-#: rc.cpp:7444 rc.cpp:8467 rc.cpp:8524
+#. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 107
+#: rc.cpp:6488 rc.cpp:6518
 #, no-c-format
-msgid ""
-"<b>Delete the selected item's pixmap.</b>"
-"<p>The pixmap in the current column of the selected item will be deleted.</p>"
+msgid "COMMITTED"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 242
-#: rc.cpp:7453 rc.cpp:8476 rc.cpp:8533
+#. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 112
+#: rc.cpp:6491 rc.cpp:6521
 #, no-c-format
-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>"
+msgid "PREV"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 260
-#: rc.cpp:7462
+#. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 143
+#: rc.cpp:6494 rc.cpp:6524
 #, no-c-format
-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>"
+msgid "Source URL or working path:"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 268
-#: rc.cpp:7465 rc.cpp:8308
+#. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 151
+#: rc.cpp:6497 rc.cpp:6509
 #, no-c-format
-msgid "The list of items."
+msgid "Specify revision as"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 276
-#: rc.cpp:7468
+#. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 161
+#: rc.cpp:6500
+#, fuzzy, no-c-format
+msgid "Source 2"
+msgstr "Tarddiad"
+
+#. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 302
+#: rc.cpp:6533
 #, no-c-format
-msgid "New &Subitem"
-msgstr "&Is-eitem Newydd"
+msgid "--force (Force to delete locally modified or unversioned items.)"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 279
-#: rc.cpp:7471
+#. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 310
+#: rc.cpp:6536
+#, fuzzy, no-c-format
+msgid "--non-recursive"
+msgstr "&Ymgylchol"
+
+#. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 318
+#: rc.cpp:6539
 #, no-c-format
-msgid "Add a subitem"
+msgid "--ignore-ancestry"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 282
-#: rc.cpp:7474
+#. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 335
+#: rc.cpp:6542
 #, no-c-format
 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>"
+"--dry-run (Only receive full result notification\n"
+"                without actually modifying working copy)"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 313
-#: rc.cpp:7477 rc.cpp:7573 rc.cpp:8362 rc.cpp:8440 rc.cpp:8494
+#. i18n: file ./vcs/subversion/svn_commitdlgbase.ui line 36
+#: kdevdesigner/designer/iconvieweditorimpl.cpp:63
+#: kdevdesigner/designer/listboxeditorimpl.cpp:89
+#: kdevdesigner/designer/widgetfactory.cpp:740
+#: kdevdesigner/designer/widgetfactory.cpp:767
+#: kdevdesigner/designer/widgetfactory.cpp:776 rc.cpp:6549 rc.cpp:7483
 #, no-c-format
-msgid "Move up"
-msgstr "Symud i fyny"
+msgid "New Item"
+msgstr "Eitem Newydd"
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 316
-#: rc.cpp:7480
+#. i18n: file ./vcs/subversion/svn_commitdlgbase.ui line 71
+#: rc.cpp:6552
 #, no-c-format
-msgid ""
-"<b>Move the selected item up.</b>"
-"<p>The item will be moved within its level in the hierarchy.</p>"
+msgid "Keep Locks"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 330
-#: rc.cpp:7483 rc.cpp:7558 rc.cpp:8368 rc.cpp:8446 rc.cpp:8500
+#. i18n: file ./vcs/subversion/svn_commitdlgbase.ui line 108
+#: rc.cpp:6561
+#, fuzzy, no-c-format
+msgid "Recursive"
+msgstr "&Ymgylchol"
+
+#. i18n: file ./vcs/subversion/svn_copydlgwidget.ui line 16
+#: rc.cpp:6564
+#, fuzzy, no-c-format
+msgid "Subversion Copy"
+msgstr "Fersiwn %1"
+
+#. i18n: file ./vcs/subversion/svn_copydlgwidget.ui line 84
+#: rc.cpp:6576
 #, no-c-format
-msgid "Move down"
-msgstr "Symud i lawr"
+msgid "Specify either the full repository URL or local working path"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 333
-#: rc.cpp:7486
+#. i18n: file ./vcs/subversion/svn_copydlgwidget.ui line 94
+#: rc.cpp:6579
 #, no-c-format
-msgid ""
-"<b>Move the selected item down.</b>"
-"<p>The item will be moved within its level in the hierarchy.</p>"
+msgid "Requested Local Path"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 347
-#: rc.cpp:7489
+#. i18n: file ./vcs/subversion/svn_copydlgwidget.ui line 102
+#: rc.cpp:6582
+#, fuzzy, no-c-format
+msgid "Source Revision"
+msgstr "Dechrau chwilio"
+
+#. i18n: file ./vcs/subversion/svn_copydlgwidget.ui line 129
+#: rc.cpp:6585
 #, no-c-format
-msgid "Move left"
-msgstr "Symud i'r Chwith"
+msgid "Specify by number:"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 350
-#: rc.cpp:7492
+#. i18n: file ./vcs/subversion/svn_copydlgwidget.ui line 137
+#: rc.cpp:6588
 #, no-c-format
-msgid ""
-"<b>Move the selected item one level up.</b>"
-"<p>This will also change the level of the item's sub-items.</p>"
+msgid "Specify by keyword:"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 364
-#: rc.cpp:7495
+#. i18n: file ./vcs/subversion/svn_copydlgwidget.ui line 153
+#: rc.cpp:6597
 #, no-c-format
-msgid "Move right"
-msgstr "Symud i'r Dde"
+msgid "WORKING"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 367
-#: rc.cpp:7498
+#. i18n: file ./vcs/subversion/svn_copydlgwidget.ui line 178
+#: kdevdesigner/designer/mainwindowactions.cpp:206 rc.cpp:6600
 #, no-c-format
-msgid ""
-"<b>Move the selected item one level down.</b>"
-"<p>This will also change the level of the item's sub-items.</p>"
+msgid "Source"
+msgstr "Tarddiad"
+
+#. i18n: file ./vcs/subversion/svn_copydlgwidget.ui line 197
+#: rc.cpp:6603
+#, no-c-format
+msgid "Specify by the repository URL of this item"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 377
-#: rc.cpp:7501 rc.cpp:8437
+#. i18n: file ./vcs/subversion/svn_copydlgwidget.ui line 205
+#: rc.cpp:6606
 #, no-c-format
-msgid "Co&lumns"
-msgstr "Co&lofnau"
+msgid "Specify by local path of this item"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 394
-#: rc.cpp:7504
+#. i18n: file ./vcs/subversion/svn_co.ui line 24
+#: rc.cpp:6609
 #, no-c-format
-msgid "Column Properties"
+msgid "Subversion Module Checkout"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 445
-#: rc.cpp:7516
+#. i18n: file ./vcs/subversion/svn_co.ui line 43
+#: rc.cpp:6612
 #, no-c-format
-msgid "Delete the pixmap of the selected column."
+msgid "Server Settings"
+msgstr "Gosodiadau Gweinydd"
+
+#. i18n: file ./vcs/subversion/svn_co.ui line 62
+#: rc.cpp:6615
+#, no-c-format
+msgid "Checkout &from:"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 465
-#: rc.cpp:7525
+#. i18n: file ./vcs/subversion/svn_co.ui line 96
+#: rc.cpp:6618
 #, no-c-format
-msgid ""
-"<b>Select a pixmap file for the selected column.</b>"
-"<p>The pixmap will be displayed in the header of the listview.</p>"
+msgid "&Revision:"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 490
-#: rc.cpp:7531
+#. i18n: file ./vcs/subversion/svn_co.ui line 131
+#: rc.cpp:6624
 #, no-c-format
-msgid "Enter column text"
+msgid "This Project has Standard &Trunk/Branches/Tags/Directories"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 493
-#: rc.cpp:7534
+#. i18n: file ./vcs/subversion/svn_co.ui line 186
+#: rc.cpp:6633
 #, no-c-format
-msgid ""
-"<b>Enter the text for the selected column.</b>"
-"<p>The text will be displayed in the header of the listview.</p>"
+msgid "Local Directory"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 501
-#: rc.cpp:7537
+#. i18n: file ./vcs/subversion/svn_co.ui line 205
+#: rc.cpp:6636
 #, no-c-format
-msgid "Clicka&ble"
-msgstr "Clicad&wy"
+msgid "C&heckout in:"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 504
-#: rc.cpp:7540
+#. i18n: file ./vcs/subversion/svn_co.ui line 239
+#: rc.cpp:6639
 #, no-c-format
-msgid ""
-"If this option is checked, the selected column will react to mouse clicks on "
-"the header."
+msgid "&Name of the newly created directory:"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 512
-#: rc.cpp:7543
+#. i18n: file ./vcs/subversion/subversionprojectwidget.ui line 16
+#: rc.cpp:6648
 #, no-c-format
-msgid "Re&sizable"
-msgstr "Ge&llir newid ei faint"
+msgid "New Subversion Project"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 515
-#: rc.cpp:7546
+#. i18n: file ./vcs/subversion/subversionprojectwidget.ui line 35
+#: rc.cpp:6651
 #, no-c-format
-msgid "The column's width will be resizable if this option is checked."
+msgid "&Import address:"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 525
-#: rc.cpp:7549 rc.cpp:8452
+#. i18n: file ./vcs/subversion/subversionprojectwidget.ui line 53
+#: rc.cpp:6654
 #, no-c-format
-msgid "&Delete Column"
-msgstr "&Dileu Colofn"
+msgid "Create &Standard Directories (tags/trunk/branches/)?"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 528
-#: rc.cpp:7552
+#. i18n: file ./vcs/subversion/svn_switchdlgbase.ui line 16
+#: rc.cpp:6663
 #, no-c-format
-msgid "Delete column"
-msgstr "Dileu Colofn"
+msgid "Subversion Switch"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 531
-#: rc.cpp:7555
+#. i18n: file ./vcs/subversion/svn_switchdlgbase.ui line 27
+#: rc.cpp:6666
 #, no-c-format
-msgid "Deletes the selected Column."
+msgid "Non-recursive. (Switch its immediate children only)"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 548
-#: rc.cpp:7561
+#. i18n: file ./vcs/subversion/svn_switchdlgbase.ui line 108
+#: rc.cpp:6675
+#, fuzzy, no-c-format
+msgid "Current Repository URL"
+msgstr "Adfer lleolia&dau:"
+
+#. i18n: file ./vcs/subversion/svn_switchdlgbase.ui line 124
+#: rc.cpp:6678
+#, fuzzy, no-c-format
+msgid "Working copy to switch"
+msgstr "Cyfeiriadur:"
+
+#. i18n: file ./vcs/subversion/svn_switchdlgbase.ui line 140
+#: rc.cpp:6681
+#, fuzzy, no-c-format
+msgid "Working Mode"
+msgstr "Cyfeiriadur:"
+
+#. i18n: file ./vcs/subversion/svn_switchdlgbase.ui line 151
+#: rc.cpp:6684
+#, no-c-format
+msgid "svn switch"
+msgstr ""
+
+#. i18n: file ./vcs/subversion/svn_switchdlgbase.ui line 159
+#: rc.cpp:6687
+#, fuzzy, no-c-format
+msgid "svn switch --relocation"
+msgstr "Adfer lleolia&dau:"
+
+#. i18n: file ./vcs/subversion/svn_switchdlgbase.ui line 169
+#: rc.cpp:6690
+#, fuzzy, no-c-format
+msgid "New destination URL"
+msgstr "Cyrchfan:"
+
+#. i18n: file ./vcs/subversion/integrator/svnintegratordlgbase.ui line 55
+#: rc.cpp:6693
+#, fuzzy, no-c-format
+msgid "&Do not do anything"
+msgstr "Ychwanegwch rywbeth yma"
+
+#. i18n: file ./vcs/subversion/integrator/svnintegratordlgbase.ui line 65
+#: rc.cpp:6696 rc.cpp:6703
 #, no-c-format
 msgid ""
-"<b>Move the selected item down.</b>"
-"<p>The top-most column will be the first column in the list.</p>"
+"Adds subversion menus to project.\n"
+"\n"
+"NOTE: Unless you import the project\n"
+"out of tdevelop, you will not be able\n"
+"to perform any subversion operations."
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 556
-#: rc.cpp:7564 rc.cpp:8455
+#. i18n: file ./vcs/subversion/integrator/svnintegratordlgbase.ui line 80
+#: rc.cpp:6710
 #, no-c-format
-msgid "&New Column"
-msgstr "&Colofn Newydd"
+msgid ""
+"&Create a project tree and import new project into trunk, then checkout from "
+"the repository"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 559
-#: rc.cpp:7567
+#. i18n: file ./vcs/subversion/integrator/svnintegratordlgbase.ui line 87
+#: rc.cpp:6713 rc.cpp:6720
 #, no-c-format
-msgid "Add a Column"
+msgid ""
+"Creates project, imports it into the subversion\n"
+"repository and checks it out as a working copy.\n"
+"\n"
+"NOTE: The repository has to exist.\n"
+"e.g. has been created with 'svnadmin'"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 562
-#: rc.cpp:7570
+#. i18n: file ./vcs/subversion/integrator/svnintegratordlgbase.ui line 103
+#: rc.cpp:6727
 #, no-c-format
 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>"
+"Example for the url (if /home/user/subversion is the subversion repository):\n"
+"file:///home/user/subversion/mynewproject"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 579
-#: rc.cpp:7576
+#. i18n: file ./vcs/subversion/integrator/svnintegratordlgbase.ui line 122
+#: rc.cpp:6731
+#, fuzzy, no-c-format
+msgid "Repository:"
+msgstr "&Adfer"
+
+#. i18n: file ./vcs/subversion/integrator/svnintegratordlgbase.ui line 135
+#: rc.cpp:6734
 #, no-c-format
 msgid ""
-"<b>Move the selected item up.</b>"
-"<p>The top-most column will be the first column in the list.</p>"
+"Subversion repository location.\n"
+"The repository has to exist -\n"
+"e.g. has been created with 'svnadmin'"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 587
-#: rc.cpp:7579
+#. i18n: file ./vcs/subversion/integrator/svnintegratordlgbase.ui line 144
+#: rc.cpp:6739
 #, no-c-format
-msgid "The list of columns."
+msgid ""
+"Subversion repository location. This should include the subdirectory for the "
+"project in the repository. The project subdirectory and further subdirectories "
+"will be created. \n"
+"\n"
+"So for example if you give http://localhost/svn/projectname the following "
+"directories will be created and the project imported into the trunk "
+"subdirectory:\n"
+"http://localhost/svn/projectname\n"
+"http://localhost/svn/projectname/tags\n"
+"http://localhost/svn/projectname/branches\n"
+"http://localhost/svn/projectname/trunk"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/paletteeditor.ui line 47
-#: rc.cpp:7603
+#. i18n: file ./vcs/cvsservice/editorsdialogbase.ui line 16
+#: rc.cpp:6751 rc.cpp:8540
 #, no-c-format
-msgid "Edit Palette"
+msgid "Editors"
+msgstr "Golygyddion"
+
+#. i18n: file ./vcs/cvsservice/diffdialogbase.ui line 16
+#: rc.cpp:6757
+#, no-c-format
+msgid "Choose Revisions to Diff"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/paletteeditor.ui line 70
-#: rc.cpp:7606
+#. i18n: file ./vcs/cvsservice/diffdialogbase.ui line 30
+#: rc.cpp:6760
 #, no-c-format
-msgid "Build Palette"
+msgid "Build Difference Between"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/paletteeditor.ui line 111
-#: rc.cpp:7609
+#. i18n: file ./vcs/cvsservice/diffdialogbase.ui line 49
+#: rc.cpp:6763
 #, no-c-format
-msgid "&3-D effects:"
+msgid "Local copy and an arbitrary &revision:"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/paletteeditor.ui line 140
-#: rc.cpp:7615
+#. i18n: file ./vcs/cvsservice/diffdialogbase.ui line 67
+#: rc.cpp:6766
 #, no-c-format
-msgid "Choose the effect-color for the generated palette."
+msgid "&Two arbitrary revisions/tags:"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/paletteeditor.ui line 169
-#: rc.cpp:7618
+#. i18n: file ./vcs/cvsservice/diffdialogbase.ui line 91
+#: rc.cpp:6769
 #, no-c-format
-msgid "Back&ground:"
-msgstr "Cefn&dir:"
+msgid "Revision A:"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/paletteeditor.ui line 198
-#: rc.cpp:7624
+#. i18n: file ./vcs/cvsservice/diffdialogbase.ui line 105
+#: rc.cpp:6772
 #, no-c-format
-msgid "Choose the background color for the generated palette."
+msgid "Second revision to compare (leave empty to diff against HEAD)"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/paletteeditor.ui line 223
-#: rc.cpp:7627
+#. i18n: file ./vcs/cvsservice/diffdialogbase.ui line 116
+#: rc.cpp:6775
 #, no-c-format
-msgid "&Tune Palette..."
+msgid "First revision to compare"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/paletteeditor.ui line 239
-#: rc.cpp:7630
+#. i18n: file ./vcs/cvsservice/diffdialogbase.ui line 132
+#: rc.cpp:6778
 #, no-c-format
-msgid "Preview"
-msgstr "Rhagolwg"
+msgid "Revision B:"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 41
-#: rc.cpp:7660
+#. i18n: file ./vcs/cvsservice/diffdialogbase.ui line 142
+#: rc.cpp:6781
 #, no-c-format
-msgid "Edit Custom Widgets"
+msgid "Local cop&y and HEAD"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 47
-#: rc.cpp:7663
+#. i18n: file ./vcs/cvsservice/diffdialogbase.ui line 150
+#: rc.cpp:6784
 #, no-c-format
-msgid ""
-"<b>Edit Custom Widgets</b>"
-"<p>Add or delete custom widgets from <i>Qt Designer</i>"
-"'s database, and edit the properties of existing widgets.</p>"
+msgid "Local copy a&nd BASE"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 64
-#: rc.cpp:7666
+#. i18n: file ./vcs/cvsservice/cvsoptionswidgetbase.ui line 16
+#: rc.cpp:6793
 #, no-c-format
-msgid "The list of all custom widgets known to Qt Designer."
+msgid "CVS Options"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 72
-#: rc.cpp:7669
+#. i18n: file ./vcs/cvsservice/cvsoptionswidgetbase.ui line 27
+#: rc.cpp:6796
 #, no-c-format
-msgid "&New Widget"
+msgid "Common Settings"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 75
-#: rc.cpp:7672
+#. i18n: file ./vcs/cvsservice/cvsoptionswidgetbase.ui line 46
+#: rc.cpp:6799
 #, no-c-format
-msgid "Add new custom widget."
+msgid "&Remote shell (CVS_RSH environment variable):"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 78
-#: rc.cpp:7675
+#. i18n: file ./vcs/cvsservice/cvsoptionswidgetbase.ui line 57
+#: rc.cpp:6802
+#, no-c-format
+msgid "sets the CVS_RSH variable"
+msgstr ""
+
+#. i18n: file ./vcs/cvsservice/cvsoptionswidgetbase.ui line 60
+#: rc.cpp:6805
 #, no-c-format
 msgid ""
-"<b>Create an empty custom widget and add it to the list.</b>"
-"<p>New custom widgets have a default name and header file, which must both be "
-"changed to appropriate values.</p>"
+"Set this option to \"ssh\" to use ssh as remote shell for CVS. Note that you "
+"need password-less login (see the ssh documentation for how to generate a "
+"public/private key pair) otherwise CVS will just hang forever."
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 86
-#: rc.cpp:7678
+#. i18n: file ./vcs/cvsservice/cvsoptionswidgetbase.ui line 68
+#: rc.cpp:6808
 #, no-c-format
-msgid "&Delete Widget"
-msgstr "&Dileu celfigyn"
+msgid "CVS server &location:"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 89
-#: rc.cpp:7681
+#. i18n: file ./vcs/cvsservice/cvsoptionswidgetbase.ui line 86
+#: rc.cpp:6811
 #, no-c-format
-msgid "Delete custom widget"
+msgid "When Updating"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 92
-#: rc.cpp:7684
+#. i18n: file ./vcs/cvsservice/cvsoptionswidgetbase.ui line 97
+#: rc.cpp:6814
 #, no-c-format
-msgid ""
-"<b>Delete the selected custom widget.</b>"
-"<p>You can only delete widgets that are not used in any open form.</p>"
+msgid "Create &new directories (if any)"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 148
-#: rc.cpp:7693
+#. i18n: file ./vcs/cvsservice/cvsoptionswidgetbase.ui line 105
+#: rc.cpp:6817
 #, no-c-format
-msgid "Closes the Dialog."
+msgid "&Prune empty directories"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 175
-#: rc.cpp:7696
+#. i18n: file ./vcs/cvsservice/cvsoptionswidgetbase.ui line 113
+#: rc.cpp:6820
 #, no-c-format
-msgid "&Load Descriptions..."
+msgid "&Update subdirectories too"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 178
-#: rc.cpp:7699
+#. i18n: file ./vcs/cvsservice/cvsoptionswidgetbase.ui line 123
+#: rc.cpp:6823
 #, no-c-format
-msgid "Loads widget description file"
+msgid "When Committing/Removing"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 182
-#: rc.cpp:7702
+#. i18n: file ./vcs/cvsservice/cvsoptionswidgetbase.ui line 134
+#: rc.cpp:6826
 #, no-c-format
-msgid ""
-"<b>Load Descriptions</b>"
-"<p>Loads a file which contains descriptions of custom widgets, so that these "
-"custom widgets can be used in the Qt Designer.</p>\n"
-"<p>Since it is a lot of work to type in all the information for custom widgets, "
-"you should consider using the tqtcreatecw tool which is in "
-"$QTDIR/tools/designer/tools/tqtcreatecw. Using tqtcreatecw you can create custom "
-"widget description files for your custom widgets without the need to type in "
-"all the information manually. For more information about the README file in the "
-"tqtcreatecw directory</p>"
+msgid "&Be recursive"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 190
-#: rc.cpp:7706
+#. i18n: file ./vcs/cvsservice/cvsoptionswidgetbase.ui line 144
+#: rc.cpp:6829
 #, no-c-format
-msgid "&Save Descriptions..."
+msgid "When Creating Diffs"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 193
-#: rc.cpp:7709
+#. i18n: file ./vcs/cvsservice/cvsoptionswidgetbase.ui line 176
+#: rc.cpp:6832
 #, no-c-format
-msgid "Saves widget description file"
+msgid "Use these e&xtra options:"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 196
-#: rc.cpp:7712
+#. i18n: file ./vcs/cvsservice/cvsoptionswidgetbase.ui line 209
+#: rc.cpp:6835
 #, no-c-format
-msgid ""
-"<b>Save Descriptions</b>"
-"<p>Saves all the descriptions of the shown custom widgets to a file which can "
-"then be used to import the custom widgets elsewhere."
+msgid "Con&text lines:"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 204
-#: rc.cpp:7715
+#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 17
+#: rc.cpp:6838
 #, no-c-format
-msgid "Change the properties of the selected custom widget."
+msgid "This form allows you to create a CVS repository for your new project"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 211
-#: rc.cpp:7718
+#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 34
+#: rc.cpp:6841
 #, no-c-format
-msgid "De&finition"
+msgid "Release &tag:"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 262
-#: rc.cpp:7727
+#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 45
+#: rc.cpp:6844
+#, no-c-format
+msgid "Enter the name of the repository"
+msgstr ""
+
+#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 49
+#: rc.cpp:6847
 #, no-c-format
 msgid ""
-"<b>Select a pixmap file.</b>"
-"<p>The pixmap will be used to represent the widget in forms.</p>"
+"CVS Repository name goes here.\n"
+"Most of the thime you'll just reuse the project name"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 286
-#: rc.cpp:7730
+#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 57
+#: rc.cpp:6851 rc.cpp:7020
 #, no-c-format
-msgid "Enter filename"
+msgid "vendor"
+msgstr "gwerthwr"
+
+#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 60
+#: rc.cpp:6854
+#, no-c-format
+msgid "Enter the vendor name"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 289
-#: rc.cpp:7733
+#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 68
+#: rc.cpp:6857
 #, no-c-format
-msgid ""
-"<b>Change the header file's name for the selected custom widget.</b>"
-"<p>The header file will be included by forms using the widget.</p>"
+msgid "&Message:"
+msgstr "&Neges:"
+
+#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 79
+#: rc.cpp:6860 rc.cpp:6954 rc.cpp:7059
+#, no-c-format
+msgid "&Module:"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 306
-#: rc.cpp:7739
+#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 90
+#: rc.cpp:6863 rc.cpp:7032
 #, no-c-format
-msgid "Choose headerfile"
+msgid "&Vendor tag:"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 309
-#: rc.cpp:7742
+#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 101
+#: rc.cpp:6866
 #, no-c-format
-msgid "Look for the header file using a file dialog."
+msgid "new project"
+msgstr "cywaith Newydd"
+
+#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 104
+#: rc.cpp:6869
+#, no-c-format
+msgid "Repository creation message"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 327
-#: rc.cpp:7751
+#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 112
+#: rc.cpp:6872 rc.cpp:7047
 #, no-c-format
-msgid "Select access"
+msgid "start"
+msgstr "dechrau"
+
+#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 115
+#: rc.cpp:6875
+#, no-c-format
+msgid "Tag that will be associated with initial state"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 330
-#: rc.cpp:7754
+#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 129
+#: rc.cpp:6878
 #, no-c-format
-msgid ""
-"<b>Change how the include file will be included.</b>"
-"<p>Global include files will be included using &lt;&gt;-brackets, while local "
-"files will included using quotation marks.</p>"
+msgid "&Server path:"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 340
-#: rc.cpp:7757
+#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 140
+#: rc.cpp:6881
 #, no-c-format
-msgid "Change classname"
+msgid "Enter your CVS Root location"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 343
-#: rc.cpp:7760
+#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 144
+#: rc.cpp:6884
 #, no-c-format
 msgid ""
-"<b>Enter the classname for the selected custom widget.</b>"
-"<p>A class of that name must be defined in the header file.</p>"
+"CVS Root location goes here, for example:"
+"<ul>\n"
+"<li>/home/cvsroot or</li>"
+"<li>:pserver:me@localhost:/home/cvs</li></ul>"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 351
-#: rc.cpp:7763
+#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 158
+#: rc.cpp:6888
 #, no-c-format
-msgid "Heade&rfile:"
+msgid "CVS_&RSH:"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 362
-#: rc.cpp:7766
+#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 172
+#: rc.cpp:6891
 #, no-c-format
-msgid "Cl&ass:"
-msgstr "Do&sbarth:"
+msgid "ssh"
+msgstr "ssh"
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 373
-#: rc.cpp:7769 rc.cpp:8482 rc.cpp:8515
+#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 184
+#: rc.cpp:6894
 #, no-c-format
-msgid "Pixmap:"
-msgstr "Picsfap :"
+msgid "Init &root"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 381
-#: rc.cpp:7772
+#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 187
+#: rc.cpp:6897
 #, no-c-format
-msgid "Si&ze hint:"
+msgid "Check if you defined a new CVS Root"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 392
-#: rc.cpp:7775
+#. i18n: file ./vcs/cvsservice/tagdialogbase.ui line 16
+#: rc.cpp:6900
 #, no-c-format
-msgid "Size p&olicy:"
+msgid "Tag Files on CVS Repository"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 401
-#: lib/widgets/propeditor/propertymachinefactory.cpp:147 rc.cpp:7778
-#: rc.cpp:7814
+#. i18n: file ./vcs/cvsservice/tagdialogbase.ui line 38
+#: rc.cpp:6903
 #, no-c-format
-msgid "Fixed"
-msgstr "Sefydlog"
+msgid "Tag/Branch &name:"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 406
-#: lib/widgets/propeditor/propertymachinefactory.cpp:148 rc.cpp:7781
-#: rc.cpp:7817
+#. i18n: file ./vcs/cvsservice/tagdialogbase.ui line 56
+#: rc.cpp:6906
 #, no-c-format
-msgid "Minimum"
-msgstr "Lleiafswm"
+msgid "Tag as &branch"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 411
-#: lib/widgets/propeditor/propertymachinefactory.cpp:149 rc.cpp:7784
-#: rc.cpp:7820
+#. i18n: file ./vcs/cvsservice/tagdialogbase.ui line 64
+#: rc.cpp:6909
 #, no-c-format
-msgid "Maximum"
-msgstr "Uchafswm"
+msgid "&Force"
+msgstr "&Gorfodi"
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 416
-#: lib/widgets/propeditor/propertymachinefactory.cpp:150 rc.cpp:7787
-#: rc.cpp:7823
+#. i18n: file ./vcs/cvsservice/commitdialogbase.ui line 16
+#: rc.cpp:6918
 #, no-c-format
-msgid "Preferred"
+msgid "Commit to Repository"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 421
-#: rc.cpp:7790 rc.cpp:7826
+#. i18n: file ./vcs/cvsservice/commitdialogbase.ui line 30
+#: rc.cpp:6921
 #, no-c-format
-msgid "MinimumExpanding"
+msgid "&Message"
+msgstr "&Neges"
+
+#. i18n: file ./vcs/cvsservice/commitdialogbase.ui line 56
+#: rc.cpp:6924
+#, no-c-format
+msgid "&Add to changelog:"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 426
-#: lib/widgets/propeditor/propertymachinefactory.cpp:151 rc.cpp:7793
-#: rc.cpp:7829
+#. i18n: file ./vcs/cvsservice/commitdialogbase.ui line 67
+#: rc.cpp:6927
 #, no-c-format
-msgid "Expanding"
+msgid "Change log filename path (relative to project directory)"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 433
-#: rc.cpp:7796
+#. i18n: file ./vcs/cvsservice/commitdialogbase.ui line 70
+#: rc.cpp:6930
 #, no-c-format
-msgid "Vertical Sizepolicy"
+msgid ""
+"<b>Changelog filename path</b>"
+"<br/>Insert here the Changelog filename you wish to use so that the message is "
+"appended"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 436
-#: rc.cpp:7799
+#. i18n: file ./vcs/cvsservice/checkoutdialogbase.ui line 24
+#: rc.cpp:6939
 #, no-c-format
-msgid "Choose the Vertical size policy"
+msgid "CVS Server Configuration"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 453
-#: rc.cpp:7802
+#. i18n: file ./vcs/cvsservice/checkoutdialogbase.ui line 46
+#: rc.cpp:6945
 #, no-c-format
-msgid "Size hint width"
+msgid "&Local destination directory:"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 456
-#: rc.cpp:7805 rc.cpp:7811
+#. i18n: file ./vcs/cvsservice/checkoutdialogbase.ui line 86
+#: rc.cpp:6948
 #, no-c-format
-msgid ""
-"<b>Set the size hint for the selected widget.</b>"
-"<p>The size hint provides the recommended size for the widget. Enter a sizehint "
-"of -1/-1 if no size is recommended.</p>"
+msgid "&Server path (e.g. :pserver:marios@cvs.kde.org:/home/kde):"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 473
-#: rc.cpp:7808
+#. i18n: file ./vcs/cvsservice/checkoutdialogbase.ui line 101
+#: rc.cpp:6951
 #, no-c-format
-msgid "Size hint height"
+msgid "Select Module"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 514
-#: rc.cpp:7832
+#. i18n: file ./vcs/cvsservice/checkoutdialogbase.ui line 156
+#: rc.cpp:6957
 #, no-c-format
-msgid "Horizontal Sizepolicy"
+msgid "&Tag/branch:"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 517
-#: rc.cpp:7835
+#. i18n: file ./vcs/cvsservice/checkoutdialogbase.ui line 195
+#: rc.cpp:6960
 #, no-c-format
-msgid "Choose the horizontal size policy for the widget"
+msgid "&Prune directories"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 542
-#: rc.cpp:7838
+#. i18n: file ./vcs/cvsservice/checkoutdialogbase.ui line 201
+#: rc.cpp:6963
 #, no-c-format
-msgid "Con&tainer widget"
+msgid "Creates subdirs if needed"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 545
-#: rc.cpp:7841
+#. i18n: file ./vcs/cvsservice/checkoutdialogbase.ui line 207
+#: rc.cpp:6966
 #, no-c-format
-msgid "Container Widget"
+msgid "Module"
+msgstr "Modiwl"
+
+#. i18n: file ./vcs/cvsservice/checkoutdialogbase.ui line 218
+#: rc.cpp:6969
+#, no-c-format
+msgid "Real Path"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 549
-#: rc.cpp:7844
+#. i18n: file ./vcs/cvsservice/checkoutdialogbase.ui line 277
+#: rc.cpp:6972
 #, no-c-format
-msgid ""
-"<p><b>Container Widget</b></p>\n"
-"<p>If this custom widget is able to contain other widgets (children), check "
-"this checkbox.</p>"
+msgid "&Fetch Modules List"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 559
-#: rc.cpp:7848
+#. i18n: file ./vcs/cvsservice/checkoutdialogbase.ui line 283
+#: rc.cpp:6975
 #, no-c-format
-msgid "Si&gnals"
+msgid "Fetch modules list from server"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 576
-#: rc.cpp:7851
+#. i18n: file ./vcs/cvsservice/checkoutdialogbase.ui line 286
+#: rc.cpp:6978
 #, no-c-format
-msgid "The list of all the signals that the selected widget can emit."
+msgid "Click to fetch modules list from server you specified"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 615
-#: rc.cpp:7854
+#. i18n: file ./vcs/cvsservice/releaseinputdialogbase.ui line 16
+#: rc.cpp:6981
 #, no-c-format
-msgid "N&ew Signal"
+msgid "Update/Revert to Release/Branch/Date"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 621
-#: rc.cpp:7857
+#. i18n: file ./vcs/cvsservice/releaseinputdialogbase.ui line 38
+#: rc.cpp:6984
 #, no-c-format
-msgid "Add new signal"
+msgid "Revision"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 624
-#: rc.cpp:7860
+#. i18n: file ./vcs/cvsservice/releaseinputdialogbase.ui line 52
+#: rc.cpp:6987
 #, no-c-format
-msgid ""
-"<b>Add a new signal for the current custom widget.</b>"
-"<p>An argument list should be provided in the signal's name, and the name must "
-"be unique.</p>"
+msgid "&Most recent from current branch"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 632
-#: rc.cpp:7863
+#. i18n: file ./vcs/cvsservice/releaseinputdialogbase.ui line 71
+#: rc.cpp:6990
 #, no-c-format
-msgid "Dele&te Signal"
+msgid "An arbitrary &revision/tag/branch:"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 638
-#: rc.cpp:7866
+#. i18n: file ./vcs/cvsservice/releaseinputdialogbase.ui line 85
+#: rc.cpp:6993
 #, no-c-format
-msgid "Delete signal"
+msgid "Type your release name here (leave empty for HEAD)"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 641
-#: rc.cpp:7869
+#. i18n: file ./vcs/cvsservice/releaseinputdialogbase.ui line 88
+#: rc.cpp:6996
 #, no-c-format
 msgid ""
-"<b>Delete the signal.</b>"
-"<p>All connections using this signal will also be deleted.</p>"
+"Fill the field with the release or branch name (e.g. <i>"
+"make_it_cool, tdevelop_alpha5, ...</i>)"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 665
-#: rc.cpp:7872
+#. i18n: file ./vcs/cvsservice/releaseinputdialogbase.ui line 106
+#: rc.cpp:6999
 #, no-c-format
-msgid "S&ignal:"
-msgstr "A&rwydd:"
+msgid "An arbitrary &date:"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 676
-#: rc.cpp:7875
+#. i18n: file ./vcs/cvsservice/releaseinputdialogbase.ui line 117
+#: rc.cpp:7002
 #, no-c-format
-msgid "Change signal name"
+msgid "FIll the field with a date (e.g. <i>20030204</i>)"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 679
-#: rc.cpp:7878 rc.cpp:7899
+#. i18n: file ./vcs/cvsservice/releaseinputdialogbase.ui line 129
+#: rc.cpp:7005
 #, no-c-format
-msgid ""
-"<b>Change the name of the selected slot.</b>"
-"<p>An argument list should be provided in the signal's name, and the name must "
-"be unique.</p>"
+msgid "Additional Options"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 691
-#: rc.cpp:7881
+#. i18n: file ./vcs/cvsservice/releaseinputdialogbase.ui line 140
+#: rc.cpp:7008
 #, no-c-format
-msgid "S&lots"
+msgid "&Enforce even if the file has been locally modified (revert)"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 706
-#: kdevdesigner/designer/connectiontable.cpp:41
-#: parts/classview/classtreebase.cpp:75 rc.cpp:7884
+#. i18n: file ./vcs/cvsservice/integrator/integratordlgbase.ui line 27
+#: rc.cpp:7017
 #, no-c-format
-msgid "Slot"
-msgstr "Agen"
+msgid "Create module in the repository"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 736
-#: rc.cpp:7890
+#. i18n: file ./vcs/cvsservice/integrator/integratordlgbase.ui line 57
+#: rc.cpp:7023
 #, no-c-format
-msgid "The list of all the custom widget's slots."
+msgid "&Init Local Repository..."
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 744
-#: rc.cpp:7893
+#. i18n: file ./vcs/cvsservice/integrator/integratordlgbase.ui line 90
+#: rc.cpp:7026
 #, no-c-format
-msgid "Sl&ot:"
-msgstr "Ag&en :"
+msgid "Login to &Repository..."
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 755
-#: rc.cpp:7896
+#. i18n: file ./vcs/cvsservice/integrator/integratordlgbase.ui line 154
+#: rc.cpp:7029
+#, fuzzy, no-c-format
+msgid "Mo&dule:"
+msgstr "Modiwl"
+
+#. i18n: file ./vcs/cvsservice/integrator/integratordlgbase.ui line 198
+#: rc.cpp:7035
+#, fuzzy, no-c-format
+msgid "Re&lease tag:"
+msgstr "R&hyddhâd:"
+
+#. i18n: file ./vcs/cvsservice/integrator/integratordlgbase.ui line 242
+#: rc.cpp:7041 rc.cpp:7053
+#, fuzzy, no-c-format
+msgid "&Repository:"
+msgstr "&Adfer"
+
+#. i18n: file ./vcs/cvsservice/integrator/integratordlgbase.ui line 256
+#: rc.cpp:7044
 #, no-c-format
-msgid "Change slot name"
+msgid "First Import"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 766
-#: rc.cpp:7902 rc.cpp:8780
+#. i18n: file ./vcs/cvsservice/integrator/fetcherdlgbase.ui line 51
+#: rc.cpp:7050
 #, no-c-format
-msgid "&Access:"
-msgstr "&Cyrchiad:"
+msgid "&Branch tag:"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 775
-#: kdevdesigner/designer/hierarchyview.cpp:762
-#: kdevdesigner/designer/hierarchyview.cpp:843
-#: kdevdesigner/designer/hierarchyview.cpp:852 rc.cpp:7905 rc.cpp:8783
-#: rc.cpp:8849
+#. i18n: file ./vcs/cvsservice/integrator/fetcherdlgbase.ui line 97
+#: rc.cpp:7056
+#, fuzzy, no-c-format
+msgid "Fetch &List"
+msgstr "Rhestr Ffeiliau"
+
+#. i18n: file ./vcs/cvsservice/integrator/initdlg.ui line 16
+#: rc.cpp:7062
+#, fuzzy, no-c-format
+msgid "Choose Repository Location"
+msgstr "Adfer lleolia&dau:"
+
+#. i18n: file ./vcs/cvsservice/integrator/initdlg.ui line 35
+#: rc.cpp:7065
+#, fuzzy, no-c-format
+msgid "&Repository location:"
+msgstr "Adfer lleolia&dau:"
+
+#. i18n: file ./buildtools/script/scriptoptionswidgetbase.ui line 16
+#: buildtools/script/scriptprojectpart.cpp:75 rc.cpp:7068
 #, no-c-format
-msgid "public"
-msgstr "cyhoeddus"
+msgid "Script Project Options"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 780
-#: kdevdesigner/designer/customwidgeteditorimpl.cpp:560
-#: kdevdesigner/designer/hierarchyview.cpp:760
-#: kdevdesigner/designer/hierarchyview.cpp:841
-#: kdevdesigner/designer/hierarchyview.cpp:850 rc.cpp:7908 rc.cpp:8786
-#: rc.cpp:8852
+#. i18n: file ./buildtools/script/scriptoptionswidgetbase.ui line 27
+#: rc.cpp:7071
 #, no-c-format
-msgid "protected"
-msgstr "gwarchodir"
+msgid "&Include files into the project with the following patterns:"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 787
-#: rc.cpp:7911
+#. i18n: file ./buildtools/script/scriptoptionswidgetbase.ui line 90
+#: rc.cpp:7074
 #, no-c-format
-msgid "Change slot access"
+msgid "&Exclude the following patterns:"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 790
-#: rc.cpp:7914
+#. i18n: file ./buildtools/custommakefiles/custommanagerwidgetbase.ui line 16
+#: rc.cpp:7077
+#, fuzzy, no-c-format
+msgid "Custom Manager Options"
+msgstr "Dewisiadau Addasu"
+
+#. i18n: file ./buildtools/custommakefiles/custommanagerwidgetbase.ui line 35
+#: rc.cpp:7080
+#, fuzzy, no-c-format
+msgid "Filetypes used in Project"
+msgstr "Agor Cywaith"
+
+#. i18n: file ./buildtools/custommakefiles/custommanagerwidgetbase.ui line 41
+#: rc.cpp:7083
 #, no-c-format
 msgid ""
-"<b>Change the slot's access policy.</b>"
-"<p>You can only connect to the widget's public slots.</p>"
+"Add filetypes to be used in Projects, can be full filenames or shell wildcards"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 829
-#: rc.cpp:7917
+#. i18n: file ./buildtools/custommakefiles/custommanagerwidgetbase.ui line 45
+#: rc.cpp:7086
 #, no-c-format
-msgid "N&ew Slot"
+msgid ""
+"Each entry contains a filetype used in the project in the form of a filename or "
+"a filename wildcard (using shell wildcards). \n"
+"This will be used when adding/removing files in directories and re-populating "
+"the project"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 835
-#: rc.cpp:7920
+#. i18n: file ./buildtools/custommakefiles/custommakeconfigwidgetbase.ui line 16
+#: buildtools/autotools/autoprojectpart.cpp:234
+#: buildtools/qmake/trollprojectpart.cpp:276 rc.cpp:7090 rc.cpp:7132
+#: rc.cpp:7246
 #, no-c-format
-msgid "Add new slot"
+msgid "Make Options"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 838
-#: rc.cpp:7923
+#. i18n: file ./buildtools/custommakefiles/custommakeconfigwidgetbase.ui line 27
+#: rc.cpp:7093
 #, no-c-format
-msgid ""
-"<b>Add a new slot to the current custom widget.</b>"
-"<p>An argument list should be provided in the signal's name, and the name must "
-"be unique.</p>"
+msgid "A&bort on first error"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 846
-#: rc.cpp:7926
+#. i18n: file ./buildtools/custommakefiles/custommakeconfigwidgetbase.ui line 35
+#: rc.cpp:7096
 #, no-c-format
-msgid "Dele&te Slot"
+msgid "Only di&splay commands without actually executing them"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 852
-#: rc.cpp:7929
+#. i18n: file ./buildtools/custommakefiles/custommakeconfigwidgetbase.ui line 61
+#: rc.cpp:7099
 #, no-c-format
-msgid "Delete slot"
+msgid "A&dditional make options:"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 855
-#: rc.cpp:7932
+#. i18n: file ./buildtools/custommakefiles/custommakeconfigwidgetbase.ui line 77
+#: rc.cpp:7102
 #, no-c-format
-msgid ""
-"<b>Delete the slot.</b>"
-"<p>All connections using this slot will also be deleted.</p>"
+msgid "Name of make e&xecutable:"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 867
-#: rc.cpp:7935
+#. i18n: file ./buildtools/custommakefiles/custommakeconfigwidgetbase.ui line 88
+#: rc.cpp:7105
 #, no-c-format
-msgid "&Properties"
-msgstr "&Priodweddau"
+msgid "Default make &target:"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 915
-#: rc.cpp:7938
+#. i18n: file ./buildtools/custommakefiles/custommakeconfigwidgetbase.ui line 109
+#: rc.cpp:7108
 #, no-c-format
-msgid "N&ew Property"
+msgid "Run multiple jobs"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 921
-#: rc.cpp:7941
+#. i18n: file ./buildtools/custommakefiles/custommakeconfigwidgetbase.ui line 120
+#: rc.cpp:7111
 #, no-c-format
-msgid "Add new property"
+msgid "Number of simultaneous &jobs:"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 924
-#: rc.cpp:7944
+#. i18n: file ./buildtools/custommakefiles/custommakeconfigwidgetbase.ui line 180
+#: rc.cpp:7114
 #, no-c-format
-msgid ""
-"<b>Add a new property to the current custom widget.</b>"
-"<p>The properties must be implemented in the class using Qt's property "
-"system.</p>"
+msgid "Make &priority:"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 932
-#: rc.cpp:7947
+#. i18n: file ./buildtools/custommakefiles/custommakeconfigwidgetbase.ui line 248
+#: rc.cpp:7117 rc.cpp:7147
 #, no-c-format
-msgid "Dele&te Property"
+msgid "E&nvironment:"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 938
-#: rc.cpp:7950
+#. i18n: file ./buildtools/custommakefiles/custommakeconfigwidgetbase.ui line 286
+#: rc.cpp:7123
 #, no-c-format
-msgid "Delete property"
-msgstr ""
+msgid "Co&py"
+msgstr "Co&pïo"
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 941
-#: rc.cpp:7953
+#. i18n: file ./buildtools/custommakefiles/custommakeconfigwidgetbase.ui line 297
+#: rc.cpp:7126 rc.cpp:7156
 #, no-c-format
-msgid "Deletes the selected property."
+msgid "Re&move"
+msgstr "G&waredu"
+
+#. i18n: file ./buildtools/custommakefiles/custommakeconfigwidgetbase.ui line 318
+#: rc.cpp:7129 rc.cpp:7159 rc.cpp:7255 rc.cpp:7402 rc.cpp:8300
+#, no-c-format
+msgid "Environment &Variables"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 949
-#: rc.cpp:7956
+#. i18n: file ./buildtools/custommakefiles/customotherconfigwidgetbase.ui line 45
+#: rc.cpp:7135
+#, fuzzy, no-c-format
+msgid "Add&itional options:"
+msgstr "&Gweithredoedd ar gael:"
+
+#. i18n: file ./buildtools/custommakefiles/customotherconfigwidgetbase.ui line 61
+#: rc.cpp:7138
+#, fuzzy, no-c-format
+msgid "Name of build &script"
+msgstr "Gwaredu ffeil"
+
+#. i18n: file ./buildtools/custommakefiles/customotherconfigwidgetbase.ui line 72
+#: rc.cpp:7141
+#, fuzzy, no-c-format
+msgid "Default &target:"
+msgstr "&Rhagosod :"
+
+#. i18n: file ./buildtools/custommakefiles/customotherconfigwidgetbase.ui line 93
+#: rc.cpp:7144
 #, no-c-format
-msgid "String"
-msgstr "Llinell"
+msgid "Run with priority:"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 954
-#: rc.cpp:7959
+#. i18n: file ./buildtools/custommakefiles/custombuildoptionswidgetbase.ui line 16
+#: rc.cpp:7162
 #, no-c-format
-msgid "CString"
+msgid "Custom Build Options"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 959
-#: rc.cpp:7962
+#. i18n: file ./buildtools/custommakefiles/custombuildoptionswidgetbase.ui line 27
+#: rc.cpp:7165
 #, no-c-format
-msgid "StringList"
+msgid "Build Tool"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 964
-#: rc.cpp:7965
+#. i18n: file ./buildtools/custommakefiles/custombuildoptionswidgetbase.ui line 38
+#: rc.cpp:7168
 #, no-c-format
-msgid "Bool"
+msgid "&Make"
+msgstr "&Make"
+
+#. i18n: file ./buildtools/custommakefiles/custombuildoptionswidgetbase.ui line 49
+#: rc.cpp:7171
+#, fuzzy, no-c-format
+msgid "A&nt"
+msgstr "&Morgrugyn"
+
+#. i18n: file ./buildtools/custommakefiles/custombuildoptionswidgetbase.ui line 57
+#: rc.cpp:7174
+#, fuzzy, no-c-format
+msgid "Other"
+msgstr "Eraill"
+
+#. i18n: file ./buildtools/custommakefiles/custombuildoptionswidgetbase.ui line 63
+#: rc.cpp:7177
+#, no-c-format
+msgid "other custom build tool, e.g. script"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 969
-#: rc.cpp:7968
+#. i18n: file ./buildtools/custommakefiles/custombuildoptionswidgetbase.ui line 66
+#: rc.cpp:7180
 #, no-c-format
-msgid "Int"
-msgstr "Int"
+msgid ""
+"There are myriads of buildtools out there that are not ant or make. If you use "
+"one of them (or have your own scripts), select this option."
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 974
-#: rc.cpp:7971
+#. i18n: file ./buildtools/custommakefiles/custombuildoptionswidgetbase.ui line 93
+#: rc.cpp:7183
 #, no-c-format
-msgid "UInt"
+msgid "Run &the build tool in the following directory:"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 984
-#: rc.cpp:7977
+#. i18n: file ./buildtools/custommakefiles/selectnewfilesdialogbase.ui line 24
+#: rc.cpp:7186
 #, no-c-format
-msgid "Color"
-msgstr "Lliw"
+msgid "Files to add to the Project:"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 989
-#: rc.cpp:7980
+#. i18n: file ./buildtools/custommakefiles/selectnewfilesdialogbase.ui line 38
+#: rc.cpp:7189
 #, no-c-format
-msgid "Rect"
+msgid "Select the files to add to the project"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 994
-#: rc.cpp:7983
+#. i18n: file ./buildtools/custommakefiles/selectnewfilesdialogbase.ui line 41
+#: rc.cpp:7192
 #, no-c-format
-msgid "Point"
+msgid ""
+"Select the files and directories that should be added to the list of project "
+"files. All other files and directories will be put into the blacklist."
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 999
-#: languages/cpp/app_templates/tdefileplugin/tdefile_plugin.cpp:32 rc.cpp:7986
+#. i18n: file ./buildtools/lib/parsers/qmake/tests/viewerbase.ui line 16
+#: rc.cpp:7195 rc.cpp:7222
 #, no-c-format
-msgid "Size"
-msgstr "Maint"
+msgid "Viewer"
+msgstr "Gwelydd"
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 1004
-#: rc.cpp:7989
+#. i18n: file ./buildtools/lib/parsers/qmake/tests/viewerbase.ui line 59
+#: rc.cpp:7198 rc.cpp:7240
 #, no-c-format
-msgid "Pixmap"
-msgstr "Picsfap"
+msgid "Add All From Directory"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 1009
-#: rc.cpp:7992
+#. i18n: file ./buildtools/lib/parsers/qmake/tests/viewerbase.ui line 73
+#: rc.cpp:7201 rc.cpp:7243
 #, no-c-format
-msgid "Palette"
+msgid "Choose File to Add..."
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 1014
-#: rc.cpp:7995
+#. i18n: file ./buildtools/lib/parsers/qmake/tests/viewerbase.ui line 137
+#: rc.cpp:7204 rc.cpp:7225
+#, fuzzy, no-c-format
+msgid "Parse Tree"
+msgstr "Dosrannu :"
+
+#. i18n: file ./buildtools/lib/parsers/qmake/tests/viewerbase.ui line 157
+#: rc.cpp:7210 rc.cpp:7231
+#, fuzzy, no-c-format
+msgid "Value 1"
+msgstr "Gwerth"
+
+#. i18n: file ./buildtools/lib/parsers/qmake/tests/viewerbase.ui line 168
+#: rc.cpp:7213 rc.cpp:7234
+#, fuzzy, no-c-format
+msgid "Value 2"
+msgstr "Gwerth"
+
+#. i18n: file ./buildtools/lib/parsers/qmake/tests/viewerbase.ui line 179
+#: rc.cpp:7216
+#, fuzzy, no-c-format
+msgid "Value 3"
+msgstr "Gwerth"
+
+#. i18n: file ./buildtools/lib/parsers/qmake/tests/viewerbase.ui line 199
+#: rc.cpp:7219 rc.cpp:7237
 #, no-c-format
-msgid "Cursor"
-msgstr "Cyrchydd"
+msgid "Source to Be Written Back"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 1019
-#: rc.cpp:7998
+#. i18n: file ./buildtools/lib/widgets/makeoptionswidgetbase.ui line 27
+#: rc.cpp:7249
 #, no-c-format
-msgid "SizePolicy"
+msgid "&Abort on first error"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 1026
-#: rc.cpp:8001
+#. i18n: file ./buildtools/lib/widgets/makeoptionswidgetbase.ui line 35
+#: rc.cpp:7252
 #, no-c-format
-msgid "Select property type"
+msgid "Onl&y display commands without actually executing them"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 1029
-#: rc.cpp:8004
+#. i18n: file ./buildtools/lib/widgets/makeoptionswidgetbase.ui line 51
+#: rc.cpp:7258
 #, no-c-format
-msgid ""
-"<b>Select the type of the property.</b>"
-"<p>The property must be implemented in the class using Qt's property system.</p>"
-"<p>You can use integer types to support enumeration properties in the property "
-"editor.</p>"
+msgid "&Name of make executable:"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 1065
-#: rc.cpp:8013
+#. i18n: file ./buildtools/lib/widgets/makeoptionswidgetbase.ui line 92
+#: rc.cpp:7261
 #, no-c-format
-msgid ""
-"<b>The list of the current widget's properties.</b>"
-"<p>The properties of the custom widget can be changed in the property "
-"editor.</p>"
+msgid "Num&ber of jobs to run simultaneously:"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 1073
-#: rc.cpp:8016
+#. i18n: file ./buildtools/lib/widgets/makeoptionswidgetbase.ui line 137
+#: rc.cpp:7264
 #, no-c-format
-msgid "Change property name"
+msgid "Run more than one &job at a time"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 1076
-#: rc.cpp:8019
+#. i18n: file ./buildtools/lib/widgets/makeoptionswidgetbase.ui line 145
+#: rc.cpp:7267
 #, no-c-format
-msgid ""
-"<b>Enter a name for the property.</b>"
-"<p>The properties must be implemented in the class using Qt's property "
-"system.</p>"
+msgid "Make priority:"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 1084
-#: rc.cpp:8022
+#. i18n: file ./buildtools/lib/widgets/removesubprojectdlgbase.ui line 16
+#: rc.cpp:7270
 #, no-c-format
-msgid "P&roperty name:"
+msgid "[REMOVE SUBPROJECT]"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listeditor.ui line 96
-#: rc.cpp:8040
+#. i18n: file ./buildtools/lib/widgets/removesubprojectdlgbase.ui line 42
+#: rc.cpp:7273
 #, no-c-format
-msgid "Re&name"
-msgstr "Ai&l-enwi"
+msgid "&Information"
+msgstr "G&wybodaeth"
 
-#. i18n: file ./kdevdesigner/designer/finddialog.ui line 41
-#: rc.cpp:8046
+#. i18n: file ./buildtools/lib/widgets/removesubprojectdlgbase.ui line 53
+#: rc.cpp:7276 rc.cpp:8108 rc.cpp:8483
 #, no-c-format
-msgid "Find Text"
-msgstr "Canfod Testun"
+msgid "[REMOVE QUESTION]"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/finddialog.ui line 72
-#: rc.cpp:8049
+#. i18n: file ./buildtools/lib/widgets/removesubprojectdlgbase.ui line 61
+#: rc.cpp:7279 rc.cpp:8111 rc.cpp:8486
 #, no-c-format
-msgid "F&ind:"
-msgstr "C&anfod:"
+msgid "Also &remove it from disk"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/finddialog.ui line 132
-#: rc.cpp:8052
+#. i18n: file ./buildtools/lib/widgets/removesubprojectdlgbase.ui line 75
+#: rc.cpp:7282
 #, no-c-format
-msgid "&Find"
-msgstr "&Canfod"
+msgid "<b>Note:</b> You will not be able to undo this operation."
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/about.ui line 41
-#: kdevdesigner/designer/formfile.cpp:654
-#: kdevdesigner/designer/sourcefile.cpp:266 rc.cpp:8079
+#. i18n: file ./buildtools/lib/widgets/environmentvariableswidgetbase.ui line 16
+#: rc.cpp:7291
 #, no-c-format
-msgid "Qt Designer"
-msgstr "Dylunydd Qt"
+msgid "Environment Variables"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/about.ui line 80
-#: rc.cpp:8082
+#. i18n: file ./buildtools/lib/widgets/environmentvariableswidgetbase.ui line 111
+#: rc.cpp:7306
 #, no-c-format
-msgid "Version 3.2"
+msgid "A&dd / Copy"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/about.ui line 93
-#: rc.cpp:8085
+#. i18n: file ./buildtools/lib/widgets/environmentvariableswidgetbase.ui line 136
+#: rc.cpp:7309
 #, no-c-format
-msgid "Copyright (C) 2000-2003 Trolltech AS. All Rights Reserved."
+msgid "E&nvironment"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/about.ui line 114
-#: rc.cpp:8088
+#. i18n: file ./buildtools/lib/widgets/environmentdisplaydialogbase.ui line 16
+#: rc.cpp:7312
 #, no-c-format
-msgid ""
-"<p>Qt Commercial Edition license holders: This program is licensed to you under "
-"the terms of the Qt Commercial License Agreement. For details, see the file "
-"LICENSE that came with this software distribution.</p>"
-"<p></p>"
-"<p>Qt Free Edition users: This program is licensed to you under the terms of "
-"the GNU General Public License Version 2. For details, see the file LICENSE.GPL "
-"that came with this software distribution.</p>"
-"<p>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE "
-"WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.</p>"
+msgid "Environment"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/projectsettings.ui line 41
-#: rc.cpp:8094
+#. i18n: file ./buildtools/lib/widgets/environmentdisplaydialogbase.ui line 27
+#: rc.cpp:7315
 #, no-c-format
-msgid "Project Settings"
-msgstr "Gosodiadau Cywaith"
+msgid "Current Environment"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/projectsettings.ui line 76
-#: rc.cpp:8100
+#. i18n: file ./buildtools/lib/widgets/subclassesdlgbase.ui line 16
+#: rc.cpp:7327
 #, no-c-format
-msgid "&Project file:"
-msgstr "&Ffeil y cywaith:"
+msgid "Related Subclasses"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/projectsettings.ui line 87
-#: rc.cpp:8103
+#. i18n: file ./buildtools/lib/widgets/subclassesdlgbase.ui line 30
+#: rc.cpp:7330
 #, no-c-format
-msgid "&Language:"
-msgstr "&Iaith:"
+msgid "&Add Relation"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/projectsettings.ui line 111
-#: rc.cpp:8109
+#. i18n: file ./buildtools/lib/widgets/subclassesdlgbase.ui line 41
+#: rc.cpp:7333
 #, no-c-format
-msgid "&Database file:"
+msgid "&Remove Relation"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/formsettings.ui line 41
-#: kdevdesigner/designer/mainwindowactions.cpp:213 rc.cpp:8130
+#. i18n: file ./buildtools/lib/widgets/subclassesdlgbase.ui line 96
+#: rc.cpp:7336
 #, no-c-format
-msgid "Form Settings"
+msgid "Related subclass &location:"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/formsettings.ui line 47
-#: rc.cpp:8133
+#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 16
+#: buildtools/autotools/autoprojectpart.cpp:233
+#: buildtools/custommakefiles/customprojectpart.cpp:200
+#: buildtools/pascal/pascalproject_part.cpp:403
+#: buildtools/qmake/trollprojectpart.cpp:273
+#: embedded/visualboyadvance/visualboyadvance_part.cpp:71 rc.cpp:7345
+#, no-c-format
+msgid "Run Options"
+msgstr ""
+
+#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 35
+#: rc.cpp:7348
+#, fuzzy, no-c-format
+msgid "Main Program"
+msgstr "Rhaglen"
+
+#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 52
+#: rc.cpp:7351
+#, no-c-format
+msgid "Note: These options override target specific settings."
+msgstr ""
+
+#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 58
+#: rc.cpp:7354
 #, no-c-format
 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>"
+"For Automake and QMake type projects, the proper way to set these options are "
+"per target in the <b>Automake Manager</b> and <b>QMake Manager</b>"
+", respectively."
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/formsettings.ui line 64
-#: rc.cpp:8136
+#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 66
+#: rc.cpp:7357
 #, no-c-format
-msgid "Pixmaps"
-msgstr "Picsfapiau"
+msgid "The command line arguments passed to the main program when run"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/formsettings.ui line 81
-#: rc.cpp:8139
+#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 74
+#: rc.cpp:7360
 #, fuzzy, no-c-format
-msgid "Save in&line"
-msgstr "&Parhau"
+msgid "Run Arg&uments:"
+msgstr "Ym&resymiadau:"
 
-#. i18n: file ./kdevdesigner/designer/formsettings.ui line 87
-#: rc.cpp:8142
+#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 85
+#: rc.cpp:7363
+#, fuzzy, no-c-format
+msgid "Executa&ble:"
+msgstr "Gweithredadwyn:"
+
+#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 96
+#: rc.cpp:7366
 #, no-c-format
-msgid "Save pixmaps in the .ui files"
+msgid "Full path to the executable"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/formsettings.ui line 90
-#: rc.cpp:8145
+#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 104
+#: rc.cpp:7369
+#, fuzzy, no-c-format
+msgid "Debug Ar&guments:"
+msgstr "Ym&resymiadau:"
+
+#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 115
+#: rc.cpp:7372
 #, no-c-format
-msgid ""
-"<b>Save Inline</b>"
-"<p>Saves the pixmaps as binary data in the .ui files. Pixmaps saved like this "
-"are not shared between forms. We recommend using Project image files instead."
+msgid "The command line arguments passed to the main program when debugged"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/formsettings.ui line 98
-#: rc.cpp:8148
+#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 123
+#: rc.cpp:7375
+#, fuzzy, no-c-format
+msgid "Working &Directory:"
+msgstr "&Cyfeiriadur:"
+
+#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 134
+#: rc.cpp:7378
 #, no-c-format
-msgid "Project &image file"
+msgid "Sets the current working directory for the launched process"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/formsettings.ui line 101
-#: rc.cpp:8151
+#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 163
+#: rc.cpp:7384
 #, no-c-format
-msgid "Use the Project's Image file for pixmaps"
+msgid "Automaticall&y compile before execution"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/formsettings.ui line 105
-#: rc.cpp:8154
+#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 166
+#: rc.cpp:7387
 #, no-c-format
 msgid ""
-"<b>Use the Project's Image file for pixmaps</b>\n"
-"<p>Each project may have a collection of pixmaps. If you use a project, we "
-"recommend that you use this option since it shares the images and is the "
-"fastest and most efficient way to use pixmaps in your forms.</p>"
+"If the program is not up-to-date with the source code, compile it before "
+"starting its execution"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/formsettings.ui line 116
-#: rc.cpp:8158
+#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 174
+#: rc.cpp:7390
 #, no-c-format
-msgid ""
-"Specify Pixmap-Loader function (only the function's name, no parentheses.)"
+msgid "&Automatically install before execution"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/formsettings.ui line 119
-#: rc.cpp:8161
+#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 185
+#: rc.cpp:7393
 #, no-c-format
-msgid ""
-"<b>Specify Pixmap-Loader function</b>"
-"<p>Specify the function which should be used for loading a pixmap in the "
-"generated code. <em>Only enter the function's name, without parentheses.</em>"
+msgid "Use &tdesu when installing"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/formsettings.ui line 127
-#: rc.cpp:8164
+#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 196
+#: rc.cpp:7396
 #, no-c-format
-msgid "Use &function:"
-msgstr "Defn&yddio ffwythiant:"
+msgid "Start in e&xternal terminal"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/formsettings.ui line 130
-#: rc.cpp:8167
+#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 199
+#: rc.cpp:7399
 #, no-c-format
-msgid "Use the given function for pixmaps"
+msgid "Start the main program in an external terminal"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/formsettings.ui line 133
-#: rc.cpp:8170
+#. i18n: file ./buildtools/ant/classpathwidget.ui line 24
+#: rc.cpp:7405
 #, no-c-format
-msgid ""
-"<b>Use a given function for pixmaps</b>"
-"<p>If you choose this option you must define a function in the line edit at the "
-"right which will be used in the generated code for loading pixmaps. When "
-"choosing a pixmap in <i>Qt Designer</i> you will be asked to specify the "
-"arguments which will be passed to the function in the generated code."
-"<p> This approach makes it possible to use your own icon-loader function for "
-"loading pixmaps.  <i>Qt Designer</i> cannot preview the correct image if you "
-"use your own function."
+msgid "Class&path"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/formsettings.ui line 166
-#: rc.cpp:8176
+#. i18n: file ./buildtools/ant/antoptionswidget.ui line 22
+#: rc.cpp:7408
 #, no-c-format
-msgid "Change class name"
+msgid "Quiet"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/formsettings.ui line 169
-#: rc.cpp:8179
+#. i18n: file ./buildtools/ant/antoptionswidget.ui line 27
+#: languages/pascal/compiler/fpcoptions/optiontabs.cpp:38 rc.cpp:7411
 #, no-c-format
-msgid ""
-"<b>Enter the name of the class that will be created.</b>"
-"<p><em>classname.h</em> and <em>classname.cpp</em> will be generated as C++ "
-"output when it is compiled by uic.</p>"
+msgid "Verbose"
+msgstr "Amleiriog"
+
+#. i18n: file ./buildtools/ant/antoptionswidget.ui line 32
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:356
+#: languages/pascal/compiler/fpcoptions/optiontabs.cpp:410 rc.cpp:7414
+#: rc.cpp:7657
+#, no-c-format
+msgid "Debug"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/formsettings.ui line 177
-#: rc.cpp:8182
+#. i18n: file ./buildtools/ant/antoptionswidget.ui line 78
+#: rc.cpp:7417
 #, no-c-format
-msgid "A&uthor:"
-msgstr "A&wdur:"
+msgid "&Build file:"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/formsettings.ui line 188
-#: rc.cpp:8185
+#. i18n: file ./buildtools/ant/antoptionswidget.ui line 89
+#: rc.cpp:7420
 #, no-c-format
-msgid "Enter your name"
-msgstr "Rhowch eich Enw"
+msgid "&Verbosity:"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/formsettings.ui line 191
-#: rc.cpp:8188
+#. i18n: file ./buildtools/ant/antoptionswidget.ui line 100
+#: rc.cpp:7423 rc.cpp:8789
 #, no-c-format
-msgid "Enter your name."
-msgstr "Rhowch eich Enw."
+msgid "&Properties:"
+msgstr "&Priodweddau :"
 
-#. i18n: file ./kdevdesigner/designer/formsettings.ui line 221
-#: rc.cpp:8197
+#. i18n: file ./buildtools/pascal/pascalproject_optionsdlgbase.ui line 19
+#: buildtools/pascal/pascalproject_part.cpp:398
+#: buildtools/pascal/pascalproject_part.cpp:434 rc.cpp:7432
 #, no-c-format
-msgid "Enter a comment about the form."
+msgid "Pascal Compiler"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/formsettings.ui line 242
-#: rc.cpp:8200
+#. i18n: file ./buildtools/pascal/pascalproject_optionsdlgbase.ui line 46
+#: rc.cpp:7435
 #, no-c-format
-msgid "La&youts"
+msgid "Con&figuration:"
+msgstr "Ffu&rfwedd :"
+
+#. i18n: file ./buildtools/pascal/pascalproject_optionsdlgbase.ui line 155
+#: rc.cpp:7447
+#, no-c-format
+msgid "Compiler op&tions:"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/formsettings.ui line 278
-#: rc.cpp:8203
+#. i18n: file ./buildtools/pascal/pascalproject_optionsdlgbase.ui line 174
+#: rc.cpp:7450
 #, no-c-format
-msgid "D&efault spacing:"
+msgid "&Pascal compiler:"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/formsettings.ui line 289
-#: rc.cpp:8206
+#. i18n: file ./buildtools/pascal/pascalproject_optionsdlgbase.ui line 208
+#: rc.cpp:7453 rc.cpp:8858
 #, no-c-format
-msgid "Use func&tions:"
+msgid "Compiler co&mmand:"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/formsettings.ui line 292
-#: rc.cpp:8209
+#. i18n: file ./buildtools/pascal/pascalproject_optionsdlgbase.ui line 301
+#: rc.cpp:7456
 #, no-c-format
-msgid "Use functions to get the margin and spacing"
+msgid "Load &Default Compiler Options"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/formsettings.ui line 295
-#: rc.cpp:8212
+#. i18n: file ./buildtools/pascal/pascalproject_optionsdlgbase.ui line 331
+#: rc.cpp:7459 rc.cpp:8861
 #, no-c-format
-msgid ""
-"<b>Use a given function for margin and/or spacing</b>"
-"<p>If you choose this option you must define functions in the line edit below "
-"which will be used in the generated code for getting the margin and spacing "
-"value. <i>Qt Designer</i> cannot preview the correct margin or spacing if you "
-"use your own function. Instead, the default values will be used for preview."
+msgid "Main &source file:"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/formsettings.ui line 322
-#: rc.cpp:8215
+#. i18n: file ./buildtools/qmake/newwidgetdlgbase.ui line 24
+#: rc.cpp:7462
 #, no-c-format
-msgid "Default mar&gin:"
+msgid "New Widget"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/formsettings.ui line 336
-#: rc.cpp:8218
+#. i18n: file ./buildtools/qmake/newwidgetdlgbase.ui line 43
+#: rc.cpp:7468
 #, no-c-format
-msgid "S&pacing:"
-msgstr "By&lchiad :"
+msgid "Widget Properties"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/formsettings.ui line 358
-#: rc.cpp:8221
+#. i18n: file ./buildtools/qmake/newwidgetdlgbase.ui line 54
+#: rc.cpp:7471
 #, no-c-format
-msgid "Ma&rgin:"
-msgstr "Y&myl:"
+msgid "Subclassing"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/formsettings.ui line 383
-#: rc.cpp:8224
+#. i18n: file ./buildtools/qmake/newwidgetdlgbase.ui line 73
+#: rc.cpp:7474
 #, no-c-format
-msgid "Specify spacing function (only the function's name, no parentheses.)"
+msgid "Caption:"
+msgstr "Pennawd:"
+
+#. i18n: file ./buildtools/qmake/newwidgetdlgbase.ui line 86
+#: rc.cpp:7477
+#, no-c-format
+msgid "Subclass name:"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/formsettings.ui line 386
-#: rc.cpp:8227
+#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 16
+#: rc.cpp:7489
 #, no-c-format
-msgid ""
-"<b>Specify spacing function</b>"
-"<p>Specify the function which should be used for getting the spacing in the "
-"generated code. <em>Only enter the function's name, without parentheses.</em>"
+msgid "Create Scope"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/formsettings.ui line 405
-#: rc.cpp:8230
+#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 35
+#: rc.cpp:7492
+#, fuzzy, no-c-format
+msgid "Scopetype:"
+msgstr "Math papur"
+
+#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 41
+#: rc.cpp:7495
 #, no-c-format
-msgid "Specify margin function (only the function's name, no parentheses.)"
+msgid "Simple Scope"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/formsettings.ui line 408
-#: rc.cpp:8233
+#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 46
+#: rc.cpp:7498
+#, fuzzy, no-c-format
+msgid "Function Scope"
+msgstr "Ffwythiant"
+
+#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 51
+#: rc.cpp:7501
+#, fuzzy, no-c-format
+msgid "Include File"
+msgstr "Enw Ffeil"
+
+#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 58
+#: rc.cpp:7504
 #, no-c-format
-msgid ""
-"<b>Specify margin function</b>"
-"<p>Specify the function which should be used for getting the margin in the "
-"generated code. <em>Only enter the function's name, without parentheses.</em>"
+msgid "Choose between the different types of new scopes"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/dbconnection.ui line 41
-#: rc.cpp:8251
+#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 85
+#: buildtools/qmake/trollprojectwidget.cpp:1061 rc.cpp:7507
+#, fuzzy, no-c-format
+msgid "Scope Settings"
+msgstr "Gosodiadau Gweinydd"
+
+#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 111
+#: rc.cpp:7510
 #, no-c-format
-msgid "Edit Database Connection"
+msgid "Specify the new scope name"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/dbconnection.ui line 58
-#: rc.cpp:8254
+#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 119
+#: rc.cpp:7513
+#, fuzzy, no-c-format
+msgid "Scopename:"
+msgstr "Enw'r math:"
+
+#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 148
+#: rc.cpp:7516
+#, fuzzy, no-c-format
+msgid "Function:"
+msgstr "F&fwythiant:"
+
+#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 154
+#: rc.cpp:7519
 #, no-c-format
-msgid "&Database name:"
-msgstr "&Enw'r gronfa ddata: :"
+msgid "Specify the function name"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/dbconnection.ui line 69
-#: rc.cpp:8257
+#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 162
+#: rc.cpp:7522
+#, fuzzy, no-c-format
+msgid "Arguments:"
+msgstr "Ym&resymiadau:"
+
+#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 168
+#: rc.cpp:7525
 #, no-c-format
-msgid "&Username:"
-msgstr "&Enw Defnyddiwr:"
+msgid "Specify the list of function arguments, delimited by a comma"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/dbconnection.ui line 80
-#: rc.cpp:8260
+#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 197
+#: rc.cpp:7528
 #, no-c-format
-msgid "&Password:"
-msgstr "&Cyfrinair:"
+msgid "*.pri"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/dbconnection.ui line 91
-#: rc.cpp:8263
+#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 203
+#: rc.cpp:7531
 #, no-c-format
-msgid "D&river:"
-msgstr "G&yrrydd:"
+msgid "Choose the .pri file to include"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/dbconnection.ui line 110
-#: rc.cpp:8266
+#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 211
+#: rc.cpp:7534
+#, fuzzy, no-c-format
+msgid "Include File:"
+msgstr "Enw Ffeil"
+
+#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 222
+#: rc.cpp:7537
 #, no-c-format
-msgid "&Hostname:"
-msgstr "&Enw Gwesteiwr:"
+msgid "&use !include instead of include"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/dbconnection.ui line 151
-#: rc.cpp:8272
+#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 225
+#: rc.cpp:7540
 #, no-c-format
-msgid "P&ort:"
-msgstr "&Porth:"
+msgid "Use !include instead of include for the function scope"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 41
-#: rc.cpp:8278
+#. i18n: file ./buildtools/qmake/choosesubprojectdlgbase.ui line 16
+#: rc.cpp:7549
 #, no-c-format
-msgid "Edit Listbox"
+msgid "Select Subproject"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 47
-#: rc.cpp:8281
+#. i18n: file ./buildtools/qmake/choosesubprojectdlgbase.ui line 92
+#: rc.cpp:7558 rc.cpp:7564
 #, no-c-format
-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>"
+msgid "Subprojects"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 153
-#: kdevdesigner/designer/actiondnd.cpp:399 rc.cpp:8305 rc.cpp:8356
+#. i18n: file ./buildtools/qmake/disablesubprojectdlgbase.ui line 16
+#: rc.cpp:7561
+#, fuzzy, no-c-format
+msgid "Select Subprojects to disable"
+msgstr "Agor Cywaith Diweddar"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 25
+#: rc.cpp:7573
 #, no-c-format
-msgid "Delete Item"
-msgstr "Dileu Eitem"
+msgid "QMake Subproject Configuration"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 235
-#: rc.cpp:8332
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 90
+#: kdevdesigner/designer/multilineeditorimpl.cpp:101 rc.cpp:7585
 #, no-c-format
-msgid "Choose a pixmap file for the selected item."
+msgid "Basics"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 263
-#: rc.cpp:8341
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 112
+#: rc.cpp:7591
 #, no-c-format
-msgid "Change the selected item's text."
+msgid "Librar&y"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 279
-#: rc.cpp:8350
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 115
+#: rc.cpp:7594
 #, no-c-format
-msgid "<b>Add a new item.</b><p>New items are appended to the list.</p>"
+msgid "Create a library"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 293
-#: rc.cpp:8359
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 123
+#: rc.cpp:7597
+#, fuzzy, no-c-format
+msgid "&Subdirectories"
+msgstr "&Cyfeiriadur:"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 126
+#: rc.cpp:7600
 #, no-c-format
-msgid "Delete the selected item"
+msgid "This project holds subdirectories"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 327
-#: rc.cpp:8365
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 137
+#: rc.cpp:7603
 #, no-c-format
-msgid "Moves the selected item up."
+msgid "Ordered"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 344
-#: rc.cpp:8371
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 140
+#: rc.cpp:7606
 #, no-c-format
-msgid "Move the selected item down."
+msgid "Build the subprojects in the order they are listed in the .pro file"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/multilineeditor.ui line 41
-#: rc.cpp:8374
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 168
+#: rc.cpp:7609
+#, fuzzy, no-c-format
+msgid "A&pplication"
+msgstr "Cymhwysiad"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 171
+#: rc.cpp:7612
 #, no-c-format
-msgid "Edit Text"
+msgid "Create an application"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/multilineeditor.ui line 44
-#: rc.cpp:8377
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 181
+#: rc.cpp:7615
 #, no-c-format
-msgid ""
-"<b>Multiline Edit</b>"
-"<p>This is a simple richtext editor. To improve its usability it provides "
-"toolbar items for the most common html tags: by clicking on a toolbar item, the "
-"corresponding tag will be written to the editor, where you can insert your "
-"text. If you have already written some text and want to format it, hilight it "
-"and click on the desired button.  To improve visualization this editor also "
-"supports a simple html-syntax-highlighting scheme."
+msgid "Target"
+msgstr "Targed"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 192
+#: rc.cpp:7618
+#, fuzzy, no-c-format
+msgid "Path:"
+msgstr "&Llwybr:"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 203
+#: rc.cpp:7621
+#, fuzzy, no-c-format
+msgid "Output file:"
+msgstr "Ffeil a&llbwn :"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 226
+#: rc.cpp:7624
+#, no-c-format
+msgid "Target Installation"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/pixmapfunction.ui line 41
-#: rc.cpp:8392
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 242
+#: rc.cpp:7627
 #, no-c-format
-msgid "Choose Pixmap"
+msgid "I&nstall"
+msgstr "G&osod"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 250
+#: rc.cpp:7630
+#, fuzzy, no-c-format
+msgid "Installation path:"
+msgstr "Arsefydlu"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 263
+#: rc.cpp:7633
+#, fuzzy, no-c-format
+msgid "Makefile"
+msgstr "&Make"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 284
+#: rc.cpp:7636
+#, fuzzy, no-c-format
+msgid "Arguments"
+msgstr "Ym&resymiadau"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 295
+#: rc.cpp:7639
+#, fuzzy, no-c-format
+msgid "Run arguments:"
+msgstr "Ym&resymiadau:"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 313
+#: rc.cpp:7642
+#, fuzzy, no-c-format
+msgid "Debug Arguments:"
+msgstr "Ym&resymiadau:"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 366
+#: rc.cpp:7651
+#, no-c-format
+msgid "Build Mode"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/pixmapfunction.ui line 61
-#: rc.cpp:8395
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 372
+#: rc.cpp:7654 rc.cpp:7666
 #, no-c-format
-msgid "&Enter arguments for loading the pixmap:"
+msgid "Set project to be built in release mode"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/pixmapfunction.ui line 349
-#: rc.cpp:8398
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 394
+#: rc.cpp:7660
 #, no-c-format
-msgid "QPixmap("
+msgid "Set project to be built in debug mode"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/pixmapfunction.ui line 865
-#: rc.cpp:8401
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 402
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:355
+#: languages/pascal/compiler/fpcoptions/optiontabs.cpp:409 rc.cpp:7663
 #, no-c-format
-msgid ")"
-msgstr ")"
+msgid "Release"
+msgstr "Rhyddhad"
 
-#. i18n: file ./kdevdesigner/designer/tableeditor.ui line 41
-#: rc.cpp:8413
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 416
+#: rc.cpp:7669
+#, fuzzy, no-c-format
+msgid "Debug && Release"
+msgstr "&Rhyddhad"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 422
+#: rc.cpp:7672
 #, no-c-format
-msgid "Edit Table"
+msgid "Set project to be built in debug_and_release mode"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/tableeditor.ui line 233
-#: rc.cpp:8443 rc.cpp:8497
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 440
+#: rc.cpp:7675
+#, fuzzy, no-c-format
+msgid "Enable warnings"
+msgstr "Galluogi"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 443
+#: rc.cpp:7678
 #, no-c-format
-msgid ""
-"<b>Move the selected item up.</b>"
-"<p>The top-most column will be the first column of the list.</p>"
+msgid "Show compiler warnings"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/tableeditor.ui line 250
-#: rc.cpp:8449 rc.cpp:8503
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 454
+#: rc.cpp:7681
 #, no-c-format
-msgid ""
-"<b>Move the selected item down.</b>"
-"<p>The top-most column will be the first column of the list.</p>"
+msgid "Build All"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/tableeditor.ui line 288
-#: rc.cpp:8458
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 457
+#: rc.cpp:7684
 #, no-c-format
-msgid "Table:"
-msgstr "Tabl:"
+msgid "Builds Debug and Release version if Debug&Release is configured"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/tableeditor.ui line 363
-#: rc.cpp:8479 rc.cpp:8512
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 469
+#: rc.cpp:7687
 #, no-c-format
-msgid "&Label:"
-msgstr "&Label:"
+msgid "Requirements"
+msgstr "Anghenion"
 
-#. i18n: file ./kdevdesigner/designer/tableeditor.ui line 385
-#: rc.cpp:8485
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 480
+#: rc.cpp:7690 rc.cpp:7753
+#, fuzzy, no-c-format
+msgid "OpenGL"
+msgstr "Open&GL"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 483
+#: rc.cpp:7693
 #, no-c-format
-msgid "&Field:"
-msgstr "&Maes :"
+msgid "Requires the OpenGL (or Mesa) headers/libraries"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/tableeditor.ui line 409
-#: rc.cpp:8488
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 491
+#: rc.cpp:7696
+#, fuzzy, no-c-format
+msgid "STL"
+msgstr "SQL"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 499
+#: parts/valgrind/valgrind_widget.cpp:96 rc.cpp:7699
 #, no-c-format
-msgid "<no table>"
+msgid "Thread"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/tableeditor.ui line 421
-#: rc.cpp:8491
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 502
+#: rc.cpp:7702
 #, no-c-format
-msgid "&Rows"
-msgstr "&Rhesi"
+msgid "Requires support for multi-threaded application or library."
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/tableeditor.ui line 511
-#: rc.cpp:8506
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 510
+#: rc.cpp:7705
 #, no-c-format
-msgid "&New Row"
+msgid "Qt"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/tableeditor.ui line 519
-#: rc.cpp:8509
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 513
+#: rc.cpp:7708
 #, no-c-format
-msgid "&Delete Row"
-msgstr "&Dileu Rhes"
+msgid "Requires the Qt header files/library"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/configtoolboxdialog.ui line 41
-#: kdevdesigner/designer/mainwindowactions.cpp:605 rc.cpp:8536
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 521
+#: rc.cpp:7711
 #, no-c-format
-msgid "Configure Toolbox"
+msgid "X11"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/configtoolboxdialog.ui line 132
-#: rc.cpp:8548
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 524
+#: rc.cpp:7714 rc.cpp:7804
 #, no-c-format
-msgid "Available Tools"
+msgid "Support required for X11 application or library"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/configtoolboxdialog.ui line 175
-#: rc.cpp:8554
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 532
+#: rc.cpp:7717
 #, no-c-format
-msgid "Common Widgets Page"
+msgid "Precompiled headers"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/startdialog.ui line 49
-#: rc.cpp:8557
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 540
+#: rc.cpp:7720
+#, fuzzy, no-c-format
+msgid "RTTI"
+msgstr "RTT&I"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 548
+#: rc.cpp:7723
+#, fuzzy, no-c-format
+msgid "Windows"
+msgstr "Ffenestr"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 556
+#: rc.cpp:7726
+#, fuzzy, no-c-format
+msgid "Custom Configuration"
+msgstr "Ffurf&wedd"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 564
+#: rc.cpp:7729
+#, fuzzy, no-c-format
+msgid "Exceptions "
+msgstr "Eit&hriadau "
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 580
+#: rc.cpp:7732
 #, no-c-format
-msgid "Qt Designer - New/Open"
+msgid "Console"
+msgstr "Terfynell"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 586
+#: rc.cpp:7735
+#, no-c-format
+msgid "Check to build a win32 console app"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/startdialog.ui line 73
-#: rc.cpp:8560
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 599
+#: rc.cpp:7738
+#, fuzzy, no-c-format
+msgid "Qt4 Libraries"
+msgstr "Offer Allanol"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 610
+#: rc.cpp:7741
 #, no-c-format
-msgid "&New File/Project"
+msgid "Gui"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/startdialog.ui line 106
-#: rc.cpp:8563
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 621
+#: parts/doxygen/messages.cpp:202 rc.cpp:7744
 #, no-c-format
-msgid "&Open File/Project"
+msgid "XML"
+msgstr "XML"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 629
+#: rc.cpp:7747
+#, fuzzy, no-c-format
+msgid "Network"
+msgstr "Newydd"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 637
+#: src/profileengine/editor/profileeditor.cpp:137 rc.cpp:7750
+#, fuzzy, no-c-format
+msgid "Core"
+msgstr "Sgôr"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 656
+#: rc.cpp:7756
+#, fuzzy, no-c-format
+msgid "QtUiTools"
+msgstr "Offer"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 664
+#: languages/sql/sqlsupport_part.cpp:59 rc.cpp:7759
+#, no-c-format
+msgid "SQL"
+msgstr "SQL"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 672
+#: rc.cpp:7762
+#, no-c-format
+msgid "SVG"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/startdialog.ui line 125
-#: rc.cpp:8566
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 680
+#: rc.cpp:7765
+#, fuzzy, no-c-format
+msgid "QtTest"
+msgstr "&Profi"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 688
+#: rc.cpp:7768
 #, no-c-format
-msgid "&Recently Opened"
+msgid "Qt3 Support"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/startdialog.ui line 178
-#: rc.cpp:8569
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 696
+#: rc.cpp:7771
 #, no-c-format
-msgid "&Do not show this dialog in the future"
+msgid "QDBus (Qt4.2)"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/pixmapcollectioneditor.ui line 41
-#: rc.cpp:8581
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 704
+#: rc.cpp:7774
+#, fuzzy, no-c-format
+msgid "QtAssistant"
+msgstr "Cymhorthwr KDevelop"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 712
+#: rc.cpp:7777
 #, no-c-format
-msgid "Manage Image Collection"
+msgid "QtScript (Qt4.3)"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/pixmapcollectioneditor.ui line 135
-#: rc.cpp:8596
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 720
+#: rc.cpp:7780
 #, no-c-format
-msgid "C&lose"
-msgstr "C&au"
+msgid "QtWebKit (Qt4.4)"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/gotolinedialog.ui line 46
-#: kdevdesigner/designer/mainwindowactions.cpp:289 rc.cpp:8599
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 728
+#: rc.cpp:7783
 #, no-c-format
-msgid "Goto Line"
+msgid "QtXmlPatterns (Qt4.4)"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/gotolinedialog.ui line 63
-#: rc.cpp:8602
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 736
+#: rc.cpp:7786
 #, no-c-format
-msgid "&Line:"
-msgstr "&Llinell :"
+msgid "Phonon (Qt4.4)"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/gotolinedialog.ui line 116
-#: rc.cpp:8605
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 744
+#: rc.cpp:7789
 #, no-c-format
-msgid "&Goto"
+msgid "QtHelp (Qt4.4)"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/richtextfontdialog.ui line 41
-#: rc.cpp:8611
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 754
+#: rc.cpp:7792
 #, no-c-format
-msgid "Font Properties"
+msgid "Library Options"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/richtextfontdialog.ui line 73
-#: kdevdesigner/designer/propertyeditor.cpp:1278 rc.cpp:8614
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 776
+#: rc.cpp:7795
 #, no-c-format
-msgid "default"
-msgstr "rhagosodiad"
+msgid "Build as static library"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/richtextfontdialog.ui line 85
-#: rc.cpp:8617
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 801
+#: rc.cpp:7801
 #, no-c-format
-msgid "&Font:"
-msgstr "&Wynebfath:"
+msgid "Make libtool archive"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/richtextfontdialog.ui line 96
-#: rc.cpp:8620
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 839
+#: rc.cpp:7807
 #, no-c-format
-msgid "Rel. &size:"
+msgid "Build as shared library"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/richtextfontdialog.ui line 124
-#: rc.cpp:8623
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 850
+#: rc.cpp:7810
+#, fuzzy, no-c-format
+msgid "Designer Plugin"
+msgstr "Analluogi"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 869
+#: rc.cpp:7813
+#, fuzzy, no-c-format
+msgid "Library version:"
+msgstr "Fe&rsiwn:"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 910
+#: rc.cpp:7816
+#, fuzzy, no-c-format
+msgid "Includes"
+msgstr "Mynegai"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 932
+#: rc.cpp:7819 rc.cpp:7840 rc.cpp:7861 rc.cpp:7879 rc.cpp:7888 rc.cpp:7900
+#: rc.cpp:7918 rc.cpp:7927 rc.cpp:7990
+#, fuzzy, no-c-format
+msgid "Move Up"
+msgstr "Symud i &Fyny"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 940
+#: rc.cpp:7822 rc.cpp:7843 rc.cpp:7864 rc.cpp:7882 rc.cpp:7891 rc.cpp:7903
+#: rc.cpp:7921 rc.cpp:7930 rc.cpp:7993
+#, fuzzy, no-c-format
+msgid "Move Down"
+msgstr "Symud i &Lawr"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 965
+#: rc.cpp:7825
 #, no-c-format
-msgid "C&olor:"
-msgstr "L&liw:"
+msgid "Directories Outside Project"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/richtextfontdialog.ui line 133
-#: rc.cpp:8626
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 984
+#: rc.cpp:7828
 #, no-c-format
-msgid "0"
-msgstr "0"
+msgid "Directories Inside Project"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/richtextfontdialog.ui line 138
-#: rc.cpp:8629
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1013
+#: rc.cpp:7831 rc.cpp:7852 rc.cpp:7870 rc.cpp:7909
+#, fuzzy, no-c-format
+msgid "Add..."
+msgstr "Ychw&anegu..."
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1074
+#: rc.cpp:7846
 #, no-c-format
-msgid "-4"
+msgid "Libraries"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/richtextfontdialog.ui line 143
-#: rc.cpp:8632
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1091
+#: rc.cpp:7849
+#, fuzzy, no-c-format
+msgid "External Library Dirs"
+msgstr "Offer Allanol"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1187
+#: rc.cpp:7867
+#, fuzzy, no-c-format
+msgid "External Libraries"
+msgstr "Offer Allanol"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1283
+#: rc.cpp:7885
 #, no-c-format
-msgid "-3"
+msgid "Link Convenience Libraries Inside Project"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/richtextfontdialog.ui line 148
-#: rc.cpp:8635
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1351
+#: rc.cpp:7894
+#, fuzzy, no-c-format
+msgid "Dependencies"
+msgstr "&Dibyniaethau"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1368
+#: rc.cpp:7897
 #, no-c-format
-msgid "-2"
+msgid "Targets in Project"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/richtextfontdialog.ui line 153
-#: rc.cpp:8638
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1443
+#: rc.cpp:7906
 #, no-c-format
-msgid "-1"
+msgid "Miscellaneous Targets"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/richtextfontdialog.ui line 158
-#: rc.cpp:8641
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1539
+#: rc.cpp:7924
 #, no-c-format
-msgid "+1"
+msgid "Order in Which Sub Projects Are Built"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/richtextfontdialog.ui line 163
-#: rc.cpp:8644
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1610
+#: buildtools/custommakefiles/customprojectpart.cpp:203 rc.cpp:7933
 #, no-c-format
-msgid "+2"
+msgid "Build Options"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/richtextfontdialog.ui line 168
-#: rc.cpp:8647
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1629
+#: rc.cpp:7936
+#, fuzzy, no-c-format
+msgid "Compiler Options"
+msgstr "Crynhoydd"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1656
+#: rc.cpp:7939
+#, fuzzy, no-c-format
+msgid "Debug flags:"
+msgstr "Dadnamydd"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1667
+#: rc.cpp:7942
+#, fuzzy, no-c-format
+msgid "Release flags:"
+msgstr "R&hyddhâd:"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1678
+#: rc.cpp:7945
 #, no-c-format
-msgid "+3"
+msgid "Defines:"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/richtextfontdialog.ui line 173
-#: rc.cpp:8650
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1717
+#: rc.cpp:7948
 #, no-c-format
-msgid "+4"
+msgid "Intermediate File Directories"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/dbconnections.ui line 41
-#: rc.cpp:8659
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1736
+#: rc.cpp:7951
+#, fuzzy, no-c-format
+msgid "MOC files:"
+msgstr "Agor Ffeiliau"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1747
+#: rc.cpp:7954
+#, fuzzy, no-c-format
+msgid "UI files:"
+msgstr "Agor Ffeiliau"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1758
+#: rc.cpp:7957
+#, fuzzy, no-c-format
+msgid "Object files:"
+msgstr "Agor Ffeil"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1772
+#: rc.cpp:7960
+#, fuzzy, no-c-format
+msgid "RCC files:"
+msgstr "Agor Ffeiliau"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1817
+#: rc.cpp:7963
 #, no-c-format
-msgid "Edit Database Connections"
+msgid "Corba"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/dbconnections.ui line 61
-#: rc.cpp:8662
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1831
+#: rc.cpp:7966
+#, fuzzy, no-c-format
+msgid "Compiler options:"
+msgstr "Crynhoydd"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1852
+#: rc.cpp:7969
+#, fuzzy, no-c-format
+msgid "IDL compiler:"
+msgstr "Cr&ynhoydd"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1884
+#: rc.cpp:7972
+#, fuzzy, no-c-format
+msgid "Custom Variables"
+msgstr "Newidynnau &Addasiedig..."
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1912
+#: rc.cpp:7978 rc.cpp:7999
+#, fuzzy, no-c-format
+msgid "Operator"
+msgstr "Gweithrediadau"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1974
+#: kdevdesigner/designer/mainwindowactions.cpp:629
+#: kdevdesigner/designer/mainwindowactions.cpp:644 rc.cpp:7984
 #, no-c-format
-msgid "&New Connection"
+msgid "New"
+msgstr "Newydd"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 2082
+#: rc.cpp:8002
+#, fuzzy, no-c-format
+msgid "+="
+msgstr "+"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 2087
+#: rc.cpp:8005
+#, fuzzy, no-c-format
+msgid "-="
+msgstr "-"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 2092
+#: rc.cpp:8008
+#, no-c-format
+msgid "="
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/dbconnections.ui line 74
-#: rc.cpp:8665
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 2097
+#: rc.cpp:8011
 #, no-c-format
-msgid "&Delete Connection"
+msgid "*="
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/dbconnections.ui line 157
-#: kdevdesigner/designer/dbconnectionsimpl.cpp:128
-#: kdevdesigner/designer/project.cpp:148
-#: kdevdesigner/designer/propertyeditor.cpp:2004
-#: kdevdesigner/designer/propertyeditor.cpp:2022 rc.cpp:8677
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 2102
+#: rc.cpp:8014
 #, no-c-format
-msgid "Connection"
-msgstr "Cysylltiad"
+msgid "~="
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/dbconnections.ui line 227
-#: rc.cpp:8680
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 2163
+#: rc.cpp:8017
 #, no-c-format
-msgid "Connec&t"
-msgstr "Cysyll&tu"
+msgid "Value:"
+msgstr "Gwerth:"
 
-#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 41
-#: kdevdesigner/designer/editfunctionsimpl.cpp:216 rc.cpp:8683
+#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 16
+#: rc.cpp:8020
+#, fuzzy, no-c-format
+msgid "QMake Manager Options"
+msgstr "Dewisiadau'r Dudalen Gyntaf"
+
+#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 29
+#: rc.cpp:8023
 #, no-c-format
-msgid "Edit Functions"
+msgid ""
+"- Also look into C++/Qt to define the QMake, Qt and Designer paths.\n"
+"- Environment variables that should be resolved during parsing can be set on "
+"the Make Options page.\n"
+"- For changes on this page to take effect the project needs to be reloaded."
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 47
-#: rc.cpp:8686
+#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 45
+#: rc.cpp:8028
+#, fuzzy, no-c-format
+msgid "QMake Project File:"
+msgstr "&Ffeil y cywaith:"
+
+#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 57
+#: rc.cpp:8031
 #, no-c-format
 msgid ""
-"<b>Edit Functions</b>"
-"<p>Add, edit or delete the current form's slots or functions.</p>"
-"<p>Click the <b>Add Function</b>-button to create a new function; enter a name, "
-"choose an access mode and specify if it should be a slot or normal function.</p>"
-"<p>Select an entry from the list and click the <b>Delete Function</b>"
-"-button to remove a function; in case of a slot all connections using this slot "
-"will also be removed.</p>"
+"This is the top level qmake project file, from which the project manager will "
+"be populated.\n"
+"Leave this empty to automatically search for a .pro file in the project "
+"directory."
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 62
-#: parts/classview/classtreebase.cpp:79 rc.cpp:8689
+#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 70
+#: rc.cpp:8035
 #, no-c-format
-msgid "Function"
-msgstr "Ffwythiant"
+msgid "Behaviour on Subproject Change"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 117
-#: rc.cpp:8704
+#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 81
+#: rc.cpp:8038
 #, no-c-format
-msgid "In Use"
-msgstr "Ar waith"
+msgid ""
+"The following settings determine what the project configuration dialog should "
+"do when another subproject is selected while the dialog is still open."
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 150
-#: rc.cpp:8707
+#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 92
+#: rc.cpp:8041
+#, fuzzy, no-c-format
+msgid "&Always Save"
+msgstr "&Bob tro"
+
+#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 95
+#: rc.cpp:8044
+#, no-c-format
+msgid "Always save the configuration when changing the project."
+msgstr ""
+
+#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 98
+#: rc.cpp:8047
 #, no-c-format
 msgid ""
-"<b>This form's functions.</b>"
-"<p>Select the function you want to change or delete.</p>"
+"Always save the project configuration when selecting a another sub project."
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 172
-#: rc.cpp:8710
+#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 106
+#: rc.cpp:8050
 #, no-c-format
-msgid "Only d&isplay slots"
+msgid "&Never Save (Warning: This can lead to loss of setting changes)"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 175
-#: rc.cpp:8713
+#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 109
+#: rc.cpp:8053
 #, no-c-format
-msgid "Change displaying mode for functions"
+msgid "Never save the configuration when changing the project."
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 179
-#: rc.cpp:8716
+#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 112
+#: rc.cpp:8056
 #, no-c-format
 msgid ""
-"<b>Check this button if only the slots should be displayed</b>"
-"<p>Otherwise all functions, i.e. normal C++ functions and slots are "
-"displayed.</p>\n"
+"Never save the project configuration when selecting a another sub project."
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 204
-#: rc.cpp:8720
+#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 120
+#: rc.cpp:8059
 #, no-c-format
-msgid "&New Function"
+msgid "As&k"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 207
-#: rc.cpp:8723
+#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 126
+#: rc.cpp:8062
 #, no-c-format
-msgid "Add new function"
+msgid ""
+"Ask whether the configuration should be saved when switching the project."
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 210
-#: rc.cpp:8726
+#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 129
+#: rc.cpp:8065
 #, no-c-format
 msgid ""
-"<b>Add a new function.</b>"
-"<p>New functions have a default name and public access.</p>"
+"Always ask whether the configuration should be saved when selecting another "
+"subproject."
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 218
-#: rc.cpp:8729
+#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 147
+#: rc.cpp:8068
 #, no-c-format
-msgid "&Delete Function"
+msgid "Repla&ce File Paths with matching Variables when adding files"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 221
-#: rc.cpp:8732
+#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 153
+#: rc.cpp:8071
 #, no-c-format
-msgid "Delete function"
+msgid ""
+"This replaces the relative paths of added files with existing custom variables "
+"if the value assigned to it is the same as the path."
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 224
-#: rc.cpp:8735
+#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 161
+#: rc.cpp:8074
+#, no-c-format
+msgid "Show variables in filenames in the QMake projectmanager view."
+msgstr ""
+
+#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 169
+#: rc.cpp:8077
 #, no-c-format
 msgid ""
-"<b>Delete the selected function.</b>"
-"<p>All connections using this function are also removed.</p>"
+"Display only filenames in the QMake Manager (Project reload is needed after "
+"changing this setting)"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 242
-#: rc.cpp:8738
+#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 178
+#: rc.cpp:8080
 #, no-c-format
-msgid "Function Properties"
+msgid ""
+"Do not use the QMake Default Options\n"
+"This disables the reading of any .qmake.cache files or mkspecs."
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 284
-#: rc.cpp:8741
-#, fuzzy, no-c-format
-msgid "&Function:"
-msgstr "F&fwythiant:"
+#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 186
+#: rc.cpp:8084
+#, no-c-format
+msgid "Show parse error in message box"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 306
-#: rc.cpp:8744
+#. i18n: file ./buildtools/autotools/removetargetdlgbase.ui line 16
+#: rc.cpp:8087
 #, no-c-format
-msgid "Change function name"
+msgid "Remove Target From [SUBPROJECT]"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 309
-#: rc.cpp:8747
+#. i18n: file ./buildtools/autotools/removetargetdlgbase.ui line 27
+#: rc.cpp:8090 rc.cpp:8156 rc.cpp:8492 rc.cpp:8708
 #, no-c-format
-msgid ""
-"<b>Change the name of the selected function.</b>"
-"<p>The name should include the argument list and must be syntactically "
-"correct.</p>"
+msgid "Subproject Information"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 317
-#: rc.cpp:8750
+#. i18n: file ./buildtools/autotools/removetargetdlgbase.ui line 46
+#: rc.cpp:8093 rc.cpp:8159
 #, no-c-format
-msgid "&Return type:"
+msgid "[TARGET DIRECTORY]"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 339
-#: rc.cpp:8753
+#. i18n: file ./buildtools/autotools/removetargetdlgbase.ui line 54
+#: rc.cpp:8096 rc.cpp:8162 rc.cpp:8495
 #, no-c-format
-msgid "Change the return type of the function"
+msgid "[TARGET NAME]"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 342
-#: rc.cpp:8756
+#. i18n: file ./buildtools/autotools/removetargetdlgbase.ui line 74
+#: rc.cpp:8099 rc.cpp:8165 rc.cpp:8498 rc.cpp:8711
+#, no-c-format
+msgid "Directory:"
+msgstr "Cyfeiriadur:"
+
+#. i18n: file ./buildtools/autotools/removetargetdlgbase.ui line 94
+#: rc.cpp:8102 rc.cpp:8138 rc.cpp:8168 rc.cpp:8501 rc.cpp:8714
+#, no-c-format
+msgid "Target:"
+msgstr "Targed:"
+
+#. i18n: file ./buildtools/autotools/removetargetdlgbase.ui line 116
+#: rc.cpp:8105
+#, no-c-format
+msgid "&Target Information"
+msgstr ""
+
+#. i18n: file ./buildtools/autotools/removetargetdlgbase.ui line 149
+#: rc.cpp:8114
 #, no-c-format
 msgid ""
-"<b>Change the return type of the selected function.</b>"
-"<p>Specifiy here the datatype which should be returned by the function.</p>"
+"<b>Note:</b> You will not be able to undo this operation. Please check your "
+"Makefile.am afterwards."
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 380
-#: rc.cpp:8759
+#. i18n: file ./buildtools/autotools/removetargetdlgbase.ui line 159
+#: rc.cpp:8117
 #, no-c-format
-msgid "S&pecifier:"
+msgid "&Dependencies to Other Subprojects"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 392
-#: rc.cpp:8762
+#. i18n: file ./buildtools/autotools/choosetargetdlgbase.ui line 22
+#: buildtools/autotools/choosetargetdialog.cpp:62 rc.cpp:8126
 #, no-c-format
-msgid "non virtual"
+msgid "Automake Manager - Choose Target"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 397
-#: rc.cpp:8765
+#. i18n: file ./buildtools/autotools/choosetargetdlgbase.ui line 59
+#: rc.cpp:8129
 #, no-c-format
-msgid "virtual"
+msgid "Add new files to m&y active target"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 402
-#: rc.cpp:8768
+#. i18n: file ./buildtools/autotools/choosetargetdlgbase.ui line 70
+#: rc.cpp:8132
 #, no-c-format
-msgid "pure virtual"
+msgid "Choose &another target"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 407
-#: rc.cpp:8771
+#. i18n: file ./buildtools/autotools/choosetargetdlgbase.ui line 83
+#: rc.cpp:8135
 #, no-c-format
-msgid "static"
-msgstr "statig"
+msgid "Choose &Target"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 422
-#: rc.cpp:8774 rc.cpp:8792
+#. i18n: file ./buildtools/autotools/choosetargetdlgbase.ui line 130
+#: rc.cpp:8141 rc.cpp:8720
 #, no-c-format
-msgid "Change function access"
+msgid "[TARGET]"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 425
-#: rc.cpp:8777 rc.cpp:8795
+#. i18n: file ./buildtools/autotools/choosetargetdlgbase.ui line 140
+#: rc.cpp:8144
+#, no-c-format
+msgid "&New Files"
+msgstr ""
+
+#. i18n: file ./buildtools/autotools/choosetargetdlgbase.ui line 159
+#: rc.cpp:8147
 #, no-c-format
 msgid ""
-"<b>Change the access policy of the function</b>"
-"<p>All functions are created virtual and should be reimplemented in "
-"subclasses.</p>"
+"<qt><b>Note:</b> If you cancel, your files will be created but will <b>not</b> "
+"be added to the project.</qt>"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 455
-#: kdevdesigner/designer/hierarchyview.cpp:758
-#: kdevdesigner/designer/hierarchyview.cpp:839
-#: kdevdesigner/designer/hierarchyview.cpp:848 rc.cpp:8789 rc.cpp:8855
+#. i18n: file ./buildtools/autotools/choosetargetdlgbase.ui line 172
+#: rc.cpp:8150
 #, no-c-format
-msgid "private"
-msgstr "preivat"
+msgid "Do &not ask me again and use always my active target"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 493
-#: parts/ctags2/ctagskinds.cpp:52 rc.cpp:8801
+#. i18n: file ./buildtools/autotools/addfiledlgbase.ui line 36
+#: rc.cpp:8153
 #, no-c-format
-msgid "slot"
-msgstr "agen"
+msgid "Add New Created File to Target"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 498
-#: parts/ctags2/ctagskinds.cpp:37 parts/ctags2/ctagskinds.cpp:44
-#: parts/ctags2/ctagskinds.cpp:62 parts/ctags2/ctagskinds.cpp:95
-#: parts/ctags2/ctagskinds.cpp:121 parts/ctags2/ctagskinds.cpp:133
-#: parts/ctags2/ctagskinds.cpp:147 parts/ctags2/ctagskinds.cpp:154
-#: parts/ctags2/ctagskinds.cpp:167 parts/ctags2/ctagskinds.cpp:174
-#: parts/ctags2/ctagskinds.cpp:181 parts/ctags2/ctagskinds.cpp:187
-#: parts/ctags2/ctagskinds.cpp:200 rc.cpp:8804
+#. i18n: file ./buildtools/autotools/addfiledlgbase.ui line 135
+#: rc.cpp:8171
 #, no-c-format
-msgid "function"
-msgstr "ffwythiant"
+msgid "File Information"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 505
-#: rc.cpp:8807
+#. i18n: file ./buildtools/autotools/addfiledlgbase.ui line 173
+#: buildtools/script/scriptnewfiledlg.cpp:46 rc.cpp:8174
 #, no-c-format
-msgid "Change function type"
+msgid "&Use file template"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 508
-#: rc.cpp:8810
+#. i18n: file ./buildtools/autotools/addfiledlgbase.ui line 202
+#: rc.cpp:8177
 #, no-c-format
-msgid ""
-"<b>Change the type of the function.</b>"
-"<p>The type specifies if the function is either a slot or a normal C++ "
-"function.</p>"
+msgid "New file &name (with extension):"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/variabledialog.ui line 41
-#: kdevdesigner/designer/hierarchyview.cpp:1201
-#: kdevdesigner/designer/variabledialogimpl.cpp:103
-#: kdevdesigner/designer/variabledialogimpl.cpp:122 rc.cpp:8828
+#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 16
+#: buildtools/autotools/autoprojectpart.cpp:232 rc.cpp:8186
 #, no-c-format
-msgid "Edit Variables"
+msgid "Configure Options"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/variabledialog.ui line 105
-#: rc.cpp:8840
+#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 46
+#: rc.cpp:8189
+#, fuzzy, no-c-format
+msgid "&Configuration:"
+msgstr "Ffurfwedd :"
+
+#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 68
+#: rc.cpp:8192
 #, no-c-format
-msgid "Variable Properties"
+msgid "Different build profiles"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/variabledialog.ui line 122
-#: rc.cpp:8843
+#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 71
+#: rc.cpp:8195
+#, fuzzy, no-c-format
+msgid "profiles"
+msgstr "Agor Ffeiliau"
+
+#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 152
+#: rc.cpp:8207 rc.cpp:8210
 #, no-c-format
-msgid "Acc&ess:"
-msgstr "Cyrc&hiad:"
+msgid "Options to pass to configure, e.g. --prefix=<install dir>"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/variabledialog.ui line 133
-#: rc.cpp:8846
+#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 163
+#: rc.cpp:8213
 #, no-c-format
-msgid "&Variable:"
-msgstr "&Newidyn:"
+msgid "&Build directory (must be different for every different configuration):"
+msgstr ""
 
-#: _translatorinfo.cpp:1
+#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 191
+#: rc.cpp:8216
+#, fuzzy, no-c-format
+msgid "Top source &directory:"
+msgstr "&Cyfeiriadur:"
+
+#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 214
+#: rc.cpp:8219 rc.cpp:8234
+#, no-c-format
 msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "KD wrth KGyfieithu"
+"The build process will place the object\n"
+"files and binary in this directory. \n"
+"\n"
+"If the name does not have a leading /\n"
+"then it is relative to the project directory.\n"
+"(in the General page)\n"
+"\n"
+"The build process also checks here for \n"
+"a Makefile and a configure script.\n"
+"\n"
+"If you have imported a project and you were \n"
+"building in the project directory, you \n"
+"probably want this to be blank."
+msgstr ""
 
-#: _translatorinfo.cpp:3
+#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 297
+#: rc.cpp:8255 rc.cpp:8261
+#, no-c-format
 msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "kyfieithu@dotmon.com"
+"Where to start looking for the src files.\n"
+"If the name does not have a leading /\n"
+"then it is relative to the project directory.\n"
+"(in the General page)"
+msgstr ""
 
-#: languages/ada/adasupportpart.cpp:62 languages/cpp/cppsupportpart.cpp:586
-#: languages/java/javasupportpart.cpp:151
-#: languages/kjssupport/kjssupport_part.cpp:94
-#: languages/pascal/pascalsupport_part.cpp:72
-#: languages/php/phpsupportpart.cpp:107
-msgid "Problems"
+#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 328
+#: rc.cpp:8267 rc.cpp:8396
+#, no-c-format
+msgid "Li&nker flags (LDFLAGS):"
 msgstr ""
 
-#: languages/ada/adasupportpart.cpp:62 languages/cpp/cppsupportpart.cpp:586
-#: languages/java/javasupportpart.cpp:151
-#: languages/kjssupport/kjssupport_part.cpp:94
-msgid "Problem reporter"
+#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 335
+#: rc.cpp:8270 rc.cpp:8274 rc.cpp:8278
+#, no-c-format
+msgid ""
+"Linker flags, e.g. -L<lib dir> if you have libraries in a\n"
+"nonstandard directory <lib dir>"
 msgstr ""
 
-#: languages/ada/adasupportpart.cpp:63
-#: languages/pascal/pascalsupport_part.cpp:73
+#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 374
+#: rc.cpp:8282 rc.cpp:8286 rc.cpp:8293
+#, no-c-format
 msgid ""
-"<b>Problem reporter</b>"
-"<p>This window shows various \"problems\" in your project. It displays errors "
-"reported by a language parser."
+"C/C++ preprocessor flags, e.g. -I<include dir> if you have\n"
+"headers in a nonstandard directory <include dir>"
 msgstr ""
 
-#: languages/ada/adasupportpart.cpp:128 languages/cpp/cppsupportpart.cpp:1465
-#: languages/csharp/csharpsupportpart.cpp:264
-#: languages/java/javasupportpart.cpp:511
-#: languages/perl/perlsupportpart.cpp:264 languages/php/phpsupportpart.cpp:427
-msgid "Updating..."
+#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 403
+#: rc.cpp:8290
+#, no-c-format
+msgid "C/C++ &preprocessor flags (CPPFLAGS):"
 msgstr ""
 
-#: languages/ada/adasupportpart.cpp:155 languages/cpp/cppsupportpart.cpp:1620
-#: languages/csharp/csharpsupportpart.cpp:293
-#: languages/java/javasupportpart.cpp:614
-#: languages/perl/perlsupportpart.cpp:293 languages/php/phpsupportpart.cpp:479
-msgid "Done"
-msgstr "Wedi gorffen"
+#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 418
+#: rc.cpp:8297
+#, no-c-format
+msgid "Configure argu&ments:"
+msgstr ""
 
-#: languages/ada/problemreporter.cpp:84
-msgid ""
-"<b>Problem reporter</b>"
-"<p>This window shows errors reported by a language parser."
+#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 452
+#: rc.cpp:8303
+#, no-c-format
+msgid "C"
+msgstr "C"
+
+#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 463
+#: rc.cpp:8306
+#, no-c-format
+msgid "C com&piler:"
 msgstr ""
 
-#: languages/ada/problemreporter.cpp:86 languages/cpp/problemreporter.cpp:109
-#: languages/cpp/problemreporter.cpp:110 languages/java/problemreporter.cpp:91
-#: languages/pascal/problemreporter.cpp:80 languages/php/phperrorview.cpp:101
-#: languages/php/phperrorview.cpp:102
-msgid "Level"
-msgstr "Lefel"
+#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 496
+#: rc.cpp:8309
+#, no-c-format
+msgid "Compiler f&lags (CFLAGS):"
+msgstr ""
 
-#: languages/ada/problemreporter.cpp:87 languages/cpp/problemreporter.cpp:221
-#: languages/java/problemreporter.cpp:95
-#: languages/pascal/problemreporter.cpp:81 languages/php/phperrorview.cpp:186
-msgid "Problem"
+#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 551
+#: rc.cpp:8315
+#, no-c-format
+msgid "Compiler co&mmand (CC):"
 msgstr ""
 
-#: kdevdesigner/designer/outputwindow.cpp:85
-#: languages/ada/problemreporter.cpp:89 languages/cpp/problemreporter.cpp:219
-#: languages/java/problemreporter.cpp:93
-#: languages/pascal/problemreporter.cpp:83 languages/php/phperrorview.cpp:184
-#: vcs/subversion/svn_blamewidget.cpp:35
-msgid "Line"
-msgstr "Llinell"
+#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 586
+#: rc.cpp:8318
+#, no-c-format
+msgid "C++"
+msgstr ""
 
-#: languages/ada/problemreporter.cpp:256
-msgid "Ada Parsing"
+#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 597
+#: rc.cpp:8321
+#, no-c-format
+msgid "C++ com&piler:"
 msgstr ""
 
-#: languages/cpp/ccconfigwidget.cpp:233
-msgid "Are you sure you want to delete the \"%1\" database?"
+#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 630
+#: rc.cpp:8324
+#, no-c-format
+msgid "Compiler co&mmand (CXX):"
 msgstr ""
 
-#: languages/cpp/ccconfigwidget.cpp:238
-#, fuzzy
-msgid "Delete Database"
-msgstr "Gwaredu ffeil"
+#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 663
+#: rc.cpp:8327
+#, no-c-format
+msgid "Compiler flags (C&XXFLAGS):"
+msgstr ""
 
-#: languages/cpp/ccconfigwidget.cpp:574
-msgid "Edit Qt4 Designer Plugin Paths"
+#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 720
+#: rc.cpp:8333
+#, fuzzy, no-c-format
+msgid "F&ortran"
+msgstr "&Trefnu"
+
+#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 731
+#: rc.cpp:8336
+#, fuzzy, no-c-format
+msgid "Fortra&n compiler:"
+msgstr "Lliw blaendir:"
+
+#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 764
+#: rc.cpp:8339
+#, no-c-format
+msgid "Compiler co&mmand (F77):"
 msgstr ""
 
-#: languages/cpp/ccconfigwidget.cpp:577
-#, fuzzy
-msgid "Plugin Paths"
-msgstr "Ategion"
+#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 797
+#: rc.cpp:8342
+#, no-c-format
+msgid "Compiler f&lags (FFLAGS):"
+msgstr ""
 
-#: languages/cpp/includepathresolver.cpp:251
-msgid ""
-"tried include-path-resolution while another resolution-process was still "
-"running"
+#. i18n: file ./buildtools/autotools/addtargetdlgbase.ui line 16
+#: rc.cpp:8348
+#, no-c-format
+msgid "Add New Target"
 msgstr ""
 
-#: languages/cpp/includepathresolver.cpp:260
-msgid "Makefile is missing in folder \"%1\""
+#. i18n: file ./buildtools/autotools/addtargetdlgbase.ui line 30
+#: rc.cpp:8351
+#, no-c-format
+msgid "&Target"
+msgstr "&Targed"
+
+#. i18n: file ./buildtools/autotools/addtargetdlgbase.ui line 45
+#: rc.cpp:8354
+#, no-c-format
+msgid "&Primary:"
+msgstr "&Cynradd :"
+
+#. i18n: file ./buildtools/autotools/addtargetdlgbase.ui line 68
+#: rc.cpp:8357
+#, no-c-format
+msgid "Pre&fix:"
+msgstr "Rha&gddodiad:"
+
+#. i18n: file ./buildtools/autotools/addtargetdlgbase.ui line 91
+#: parts/quickopen/quickopenfiledialog.cpp:41
+#: parts/quickopen/quickopenfiledialog.cpp:56 rc.cpp:8360
+#, no-c-format
+msgid "File &name:"
+msgstr "Enw'r& ffeil:"
+
+#. i18n: file ./buildtools/autotools/addtargetdlgbase.ui line 127
+#: rc.cpp:8363
+#, no-c-format
+msgid "[CANONICALIZED NAME]"
 msgstr ""
 
-#: languages/cpp/includepathresolver.cpp:260
-#, c-format
-msgid "problem while trying to resolve include-paths for %1"
+#. i18n: file ./buildtools/autotools/addtargetdlgbase.ui line 170
+#: rc.cpp:8366
+#, no-c-format
+msgid "Linker Flags (&LDFLAGS)"
 msgstr ""
 
-#: languages/cpp/includepathresolver.cpp:277
-#, fuzzy
-msgid "Cached: "
-msgstr "KCachegrind"
+#. i18n: file ./buildtools/autotools/addtargetdlgbase.ui line 181
+#: rc.cpp:8369
+#, no-c-format
+msgid "Do not link against shared libraries (-all-static)"
+msgstr ""
 
-#: languages/cpp/includepathresolver.cpp:301
-msgid "Filename %1 seems to be malformed"
+#. i18n: file ./buildtools/autotools/addtargetdlgbase.ui line 189
+#: rc.cpp:8372
+#, no-c-format
+msgid "Do not assign version numbers to libraries (-avoid-version)"
 msgstr ""
 
-#: languages/cpp/includepathresolver.cpp:385
-#, fuzzy
-msgid "Couldn't start the make-process"
-msgstr "Methu Cyfieithu'r Testun Tarddiad"
+#. i18n: file ./buildtools/autotools/addtargetdlgbase.ui line 197
+#: rc.cpp:8375
+#, no-c-format
+msgid "Create a library that can be dynamically loaded (-module)"
+msgstr ""
 
-#: languages/cpp/includepathresolver.cpp:390
-msgid "make-process finished with nonzero exit-status"
+#. i18n: file ./buildtools/autotools/addtargetdlgbase.ui line 205
+#: rc.cpp:8378
+#, no-c-format
+msgid "Library does not depend on external symbols (-no-undefined)"
 msgstr ""
 
-#: languages/cpp/includepathresolver.cpp:390
-#: languages/cpp/includepathresolver.cpp:395
-#, fuzzy, c-format
-msgid "output: %1"
-msgstr "Gr?p: %1"
+#. i18n: file ./buildtools/autotools/addtargetdlgbase.ui line 228
+#: rc.cpp:8381
+#, no-c-format
+msgid "Ot&her:"
+msgstr "Ar&all:"
 
-#: languages/cpp/includepathresolver.cpp:395
-msgid "make-process failed"
+#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 16
+#: rc.cpp:8390
+#, no-c-format
+msgid "Target Options"
 msgstr ""
 
-#: languages/cpp/includepathresolver.cpp:474
-#: languages/cpp/includepathresolver.cpp:477
-msgid "Recursive make-call failed"
+#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 34
+#: rc.cpp:8393
+#, fuzzy, no-c-format
+msgid "Fl&ags"
+msgstr "Baneri"
+
+#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 71
+#: rc.cpp:8399
+#, no-c-format
+msgid "&Do not link against shared libraries (-all-static)"
 msgstr ""
 
-#: languages/cpp/includepathresolver.cpp:474
-msgid "The parameter-string \"%1\" does not seem to be valid. Output was: %2"
+#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 79
+#: rc.cpp:8402
+#, no-c-format
+msgid "Do not &assign version numbers to libraries (-avoid-version)"
 msgstr ""
 
-#: languages/cpp/includepathresolver.cpp:477
-msgid "The directory \"%1\" does not exist. Output was: %2"
+#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 87
+#: rc.cpp:8405
+#, no-c-format
+msgid "Create a library that can &be dynamically loaded (-module)"
 msgstr ""
 
-#: languages/cpp/includepathresolver.cpp:481
-msgid "Recursive make-call malformed"
+#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 95
+#: rc.cpp:8408
+#, no-c-format
+msgid "Library does not depend on external symbols (-no-&undefined)"
 msgstr ""
 
-#: languages/cpp/includepathresolver.cpp:481
-#, fuzzy, c-format
-msgid "Output was: %2"
-msgstr "Ffeil a&llbwn :"
+#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 118
+#: rc.cpp:8411
+#, no-c-format
+msgid "O&ther:"
+msgstr "A&rall:"
 
-#: languages/cpp/includepathresolver.cpp:491
-msgid "Output seems not to be a valid gcc or g++ call"
+#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 181
+#: rc.cpp:8414
+#, no-c-format
+msgid "E&xplicit dependencies (DEPENDENCIES):"
 msgstr ""
 
-#: languages/cpp/includepathresolver.cpp:491
-msgid "Folder: \"%1\"  Command: \"%2\" Output: \"%3\""
+#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 228
+#: rc.cpp:8417
+#, fuzzy, no-c-format
+msgid "Li&braries"
+msgstr "Offer Allanol"
+
+#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 243
+#: rc.cpp:8420
+#, no-c-format
+msgid "Lin&k convenience libraries inside project (LIBADD):"
 msgstr ""
 
-#: languages/cpp/cppimplementationwidget.cpp:76
-#: languages/cpp/cppnewclassdlg.cpp:1861
-msgid "Cannot write to implementation file"
+#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 294
+#: rc.cpp:8423
+#, no-c-format
+msgid "Link libraries ou&tside project (LIBADD):"
 msgstr ""
 
-#: languages/cpp/cppimplementationwidget.cpp:86
-#: languages/cpp/cppnewclassdlg.cpp:2085
-msgid "Cannot write to header file"
+#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 439
+#: rc.cpp:8441
+#, fuzzy, no-c-format
+msgid "Mo&ve Up"
+msgstr "Symud i &Fyny"
+
+#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 447
+#: rc.cpp:8444 rc.cpp:8654
+#, no-c-format
+msgid "Move Dow&n"
+msgstr "Symud i &Lawr"
+
+#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 476
+#: rc.cpp:8447
+#, no-c-format
+msgid "Ar&guments"
+msgstr "Ym&resymiadau"
+
+#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 487
+#: rc.cpp:8450
+#, no-c-format
+msgid "Program Arguments (only valid for executable targets)"
 msgstr ""
 
-#: languages/cpp/subclassingdlg.cpp:190
-#: languages/kjssupport/subclassingdlg.cpp:187
-msgid "Create Subclass of "
+#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 507
+#: rc.cpp:8453
+#, fuzzy, no-c-format
+msgid "&Run arguments:"
+msgstr "Ym&resymiadau:"
+
+#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 535
+#: rc.cpp:8459
+#, fuzzy, no-c-format
+msgid "&Debug arguments:"
+msgstr "Ym&resymiadau:"
+
+#. i18n: file ./buildtools/autotools/removefiledlgbase.ui line 16
+#: rc.cpp:8471
+#, no-c-format
+msgid "Remove File From This Target"
 msgstr ""
 
-#: languages/cpp/kdevdriver.cpp:178
-#, fuzzy
-msgid "%1. Message: %2"
-msgstr "&Neges:"
+#. i18n: file ./buildtools/autotools/removefiledlgbase.ui line 79
+#: rc.cpp:8480
+#, no-c-format
+msgid "&File Information"
+msgstr ""
 
-#: languages/cpp/cppnewclassdlg.cpp:96
-msgid "Use as Private"
+#. i18n: file ./buildtools/autotools/removefiledlgbase.ui line 120
+#: rc.cpp:8489
+#, no-c-format
+msgid "<b>Note:</b> You will not be able to undelete the file."
 msgstr ""
 
-#: languages/cpp/cppnewclassdlg.cpp:98
-msgid "Use as Protected"
+#. i18n: file ./buildtools/autotools/removefiledlgbase.ui line 215
+#: rc.cpp:8504
+#, no-c-format
+msgid "[DIRECTORY NAME]"
 msgstr ""
 
-#: languages/cpp/cppnewclassdlg.cpp:100
-msgid "Use as Public"
+#. i18n: file ./buildtools/autotools/addsubprojectdlgbase.ui line 36
+#: rc.cpp:8507
+#, no-c-format
+msgid "Add New Subproject"
 msgstr ""
 
-#: languages/cpp/cppnewclassdlg.cpp:103
-msgid "Unset"
-msgstr "Datosod"
+#. i18n: file ./buildtools/autotools/addsubprojectdlgbase.ui line 47
+#: rc.cpp:8510
+#, no-c-format
+msgid "Subproject"
+msgstr ""
 
-#: languages/cpp/cppnewclassdlg.cpp:107
-msgid "Extend Base Class Functionality"
+#. i18n: file ./buildtools/autotools/addsubprojectdlgbase.ui line 87
+#: rc.cpp:8513
+#, no-c-format
+msgid "Subproject &name:"
 msgstr ""
 
-#: languages/cpp/cppnewclassdlg.cpp:109
-msgid "Replace Base Class Method"
+#. i18n: file ./buildtools/autotools/addapplicationdlgbase.ui line 16
+#: rc.cpp:8522
+#, no-c-format
+msgid "Add New Application .desktop File"
 msgstr ""
 
-#: languages/cpp/cppnewclassdlg.cpp:367
-msgid ""
-"Objective C does not support multiple inheritance.\n"
-"Only the first base class in the list will be taken into account."
+#. i18n: file ./buildtools/autotools/addapplicationdlgbase.ui line 30
+#: rc.cpp:8525
+#, no-c-format
+msgid "&Application File"
 msgstr ""
 
-#: languages/cpp/cppnewclassdlg.cpp:407
-msgid ""
-"Multiple inheritance requires QObject derivative to be first and unique in base "
-"class list."
+#. i18n: file ./buildtools/autotools/addapplicationdlgbase.ui line 41
+#: rc.cpp:8528
+#, no-c-format
+msgid "Start in t&erminal"
 msgstr ""
 
-#: languages/cpp/cppnewclassdlg.cpp:873 languages/cpp/cppnewclassdlg.cpp:876
-#: languages/cpp/cppnewclassdlg.cpp:1032 languages/cpp/cppnewclassdlg.cpp:1035
-msgid "Slots (Qt-specific)"
+#. i18n: file ./buildtools/autotools/addapplicationdlgbase.ui line 122
+#: rc.cpp:8534
+#, no-c-format
+msgid "Games"
+msgstr "Gemau"
+
+#. i18n: file ./buildtools/autotools/addapplicationdlgbase.ui line 127
+#: rc.cpp:8537
+#, no-c-format
+msgid "Development"
+msgstr "Datblygiad"
+
+#. i18n: file ./buildtools/autotools/addapplicationdlgbase.ui line 137
+#: rc.cpp:8543
+#, no-c-format
+msgid "Graphics"
+msgstr "Graffeg"
+
+#. i18n: file ./buildtools/autotools/addapplicationdlgbase.ui line 142
+#: rc.cpp:8546
+#, no-c-format
+msgid "Internet"
+msgstr "Rhyngrwyd"
+
+#. i18n: file ./buildtools/autotools/addapplicationdlgbase.ui line 147
+#: rc.cpp:8549
+#, no-c-format
+msgid "Multimedia"
+msgstr "Amlgyfrwng"
+
+#. i18n: file ./buildtools/autotools/addapplicationdlgbase.ui line 152
+#: rc.cpp:8552
+#, no-c-format
+msgid "Office"
+msgstr "Swyddfa"
+
+#. i18n: file ./buildtools/autotools/addapplicationdlgbase.ui line 162
+#: rc.cpp:8558
+#, no-c-format
+msgid "System"
+msgstr "Cysawd"
+
+#. i18n: file ./buildtools/autotools/addapplicationdlgbase.ui line 167
+#: rc.cpp:8561
+#, no-c-format
+msgid "Toys"
+msgstr "Teganau"
+
+#. i18n: file ./buildtools/autotools/addapplicationdlgbase.ui line 172
+#: rc.cpp:8564
+#, no-c-format
+msgid "Utilities"
+msgstr "Gwasanaethau"
+
+#. i18n: file ./buildtools/autotools/addapplicationdlgbase.ui line 177
+#: rc.cpp:8567
+#, no-c-format
+msgid "WordProcessing"
 msgstr ""
 
-#: languages/cpp/cppnewclassdlg.cpp:877 languages/cpp/cppnewclassdlg.cpp:1036
-msgid "Attributes"
-msgstr "Priodweddion"
+#. i18n: file ./buildtools/autotools/addapplicationdlgbase.ui line 211
+#: rc.cpp:8573 rc.cpp:8759
+#, no-c-format
+msgid "&Icon:"
+msgstr "&Eicon:"
 
-#: languages/cpp/cppnewclassdlg.cpp:979 languages/cpp/cppnewclassdlg.cpp:1235
-msgid "replace"
-msgstr "amnewid"
+#. i18n: file ./buildtools/autotools/addapplicationdlgbase.ui line 229
+#: rc.cpp:8576
+#, no-c-format
+msgid "&Section:"
+msgstr "R&han:"
 
-#: languages/cpp/cppnewclassdlg.cpp:979 languages/cpp/cppnewclassdlg.cpp:1229
-#: languages/cpp/cppnewclassdlg.cpp:1550
-msgid "extend"
+#. i18n: file ./buildtools/autotools/addapplicationdlgbase.ui line 316
+#: rc.cpp:8588
+#, no-c-format
+msgid "Mime &Types"
 msgstr ""
 
-#: languages/cpp/cppnewclassdlg.cpp:1348
-msgid "You must enter a classname."
+#. i18n: file ./buildtools/autotools/subprojectoptionsdlgbase.ui line 16
+#: rc.cpp:8603
+#, no-c-format
+msgid "Subproject Options"
 msgstr ""
 
-#: languages/cpp/cppnewclassdlg.cpp:1355
-msgid "You must enter a name for the header file."
+#. i18n: file ./buildtools/autotools/subprojectoptionsdlgbase.ui line 31
+#: rc.cpp:8606
+#, no-c-format
+msgid "Co&mpiler"
+msgstr "Cr&ynhoydd"
+
+#. i18n: file ./buildtools/autotools/subprojectoptionsdlgbase.ui line 46
+#: rc.cpp:8609
+#, no-c-format
+msgid "Compiler flags for C compiler (CFLA&GS):"
 msgstr ""
 
-#: languages/cpp/cppnewclassdlg.cpp:1361
-msgid "You must enter a name for the implementation file."
+#. i18n: file ./buildtools/autotools/subprojectoptionsdlgbase.ui line 129
+#: rc.cpp:8615
+#, no-c-format
+msgid "Compiler flags for C++ compiler (C&XXFLAGS):"
 msgstr ""
 
-#: languages/cpp/cppnewclassdlg.cpp:1368
-msgid ""
-"Generated files will always be added to the active directory, so you must not "
-"give an explicit subdirectory."
+#. i18n: file ./buildtools/autotools/subprojectoptionsdlgbase.ui line 204
+#: rc.cpp:8621
+#, no-c-format
+msgid "Compiler flags for Fortran compiler (&FFLAGS):"
 msgstr ""
 
-#: languages/cpp/cppnewclassdlg.cpp:1395
-msgid ""
-"KDevelop is not able to add classes to existing header or implementation files."
+#. i18n: file ./buildtools/autotools/subprojectoptionsdlgbase.ui line 277
+#: rc.cpp:8627
+#, no-c-format
+msgid "&Includes"
 msgstr ""
 
-#: languages/cpp/simpletype.cpp:24
-#, fuzzy
-msgid "typeless"
-msgstr "&Arddulliau"
+#. i18n: file ./buildtools/autotools/subprojectoptionsdlgbase.ui line 296
+#: rc.cpp:8630
+#, no-c-format
+msgid "Automatically &generate metasources"
+msgstr ""
 
-#: languages/cpp/simpletype.cpp:25
-msgid "boolean value, 1 byte, ( \"true\" or \"false\" )"
+#. i18n: file ./buildtools/autotools/subprojectoptionsdlgbase.ui line 379
+#: rc.cpp:8639
+#, no-c-format
+msgid "Directories in&side project:"
 msgstr ""
 
-#: languages/cpp/simpletype.cpp:26
-msgid "signed/unsigned character, 1 byte"
+#. i18n: file ./buildtools/autotools/subprojectoptionsdlgbase.ui line 471
+#: rc.cpp:8651
+#, no-c-format
+msgid "Move U&p"
+msgstr "Symud &i Fyny"
+
+#. i18n: file ./buildtools/autotools/subprojectoptionsdlgbase.ui line 510
+#: rc.cpp:8657
+#, no-c-format
+msgid "Directories ou&tside project:"
 msgstr ""
 
-#: languages/cpp/simpletype.cpp:27
-msgid "signed character, 1 byte, ranged -128 to 127"
+#. i18n: file ./buildtools/autotools/subprojectoptionsdlgbase.ui line 546
+#: rc.cpp:8660
+#, no-c-format
+msgid "&Prefixes"
+msgstr "&Rhagddodiadau"
+
+#. i18n: file ./buildtools/autotools/subprojectoptionsdlgbase.ui line 566
+#: buildtools/custommakefiles/selectnewfilesdialog.cpp:28 rc.cpp:8666
+#, no-c-format
+msgid "Path"
+msgstr "Llwybr"
+
+#. i18n: file ./buildtools/autotools/subprojectoptionsdlgbase.ui line 594
+#: rc.cpp:8669
+#, no-c-format
+msgid "C&ustom prefixes:"
 msgstr ""
 
-#: languages/cpp/simpletype.cpp:28
-msgid "unsigned character, 1 byte, ranged 0 to 255"
+#. i18n: file ./buildtools/autotools/subprojectoptionsdlgbase.ui line 678
+#: rc.cpp:8681
+#, no-c-format
+msgid "&Build Order"
 msgstr ""
 
-#: languages/cpp/simpletype.cpp:29
-msgid "wide character, 2 bytes, ranged 0 to 65.535"
+#. i18n: file ./buildtools/autotools/subprojectoptionsdlgbase.ui line 775
+#: rc.cpp:8690
+#, no-c-format
+msgid "O&rder in which sub projects are built:"
 msgstr ""
 
-#: languages/cpp/simpletype.cpp:30
-msgid "signed interger, 4 bytes, ranged -2.147.483.648 to 2.147.483.647"
+#. i18n: file ./buildtools/autotools/addexistingdlgbase.ui line 24
+#: rc.cpp:8699
+#, no-c-format
+msgid "ImportExistingDlgBase"
 msgstr ""
 
-#: languages/cpp/simpletype.cpp:31
-msgid "unsigned integer, 4 bytes, ranged 0 to 4.294.967.295"
+#. i18n: file ./buildtools/autotools/addexistingdlgbase.ui line 192
+#: rc.cpp:8717
+#, no-c-format
+msgid "[DIRECTORY]"
 msgstr ""
 
-#: languages/cpp/simpletype.cpp:32
-msgid "short integer, 2 bytes, ranged -32.768 to 32.768"
+#. i18n: file ./buildtools/autotools/addexistingdlgbase.ui line 260
+#: rc.cpp:8723
+#, no-c-format
+msgid "A&dd All"
 msgstr ""
 
-#: languages/cpp/simpletype.cpp:33
-msgid "unsigned short integer, 2 bytes, ranged 0 to 65.535"
+#. i18n: file ./buildtools/autotools/addexistingdlgbase.ui line 263
+#: rc.cpp:8726
+#, no-c-format
+msgid "Import by creating symbolic links (recommended)"
 msgstr ""
 
-#: languages/cpp/simpletype.cpp:34
-msgid "floating point value, 4 bytes, ranged ca. -3,4E+38 to 3.4E+38"
+#. i18n: file ./buildtools/autotools/addexistingdlgbase.ui line 271
+#: rc.cpp:8729
+#, no-c-format
+msgid "&Add Selected"
+msgstr "&Ychwanegu'r Dewisiedig"
+
+#. i18n: file ./buildtools/autotools/addexistingdlgbase.ui line 274
+#: rc.cpp:8732
+#, no-c-format
+msgid "Import by copying (not recommended)"
 msgstr ""
 
-#: languages/cpp/simpletype.cpp:35
-msgid "double floating point value, 8 bytes, ranged ca. -1.8E+308 to 1.8E+308"
+#. i18n: file ./buildtools/autotools/addexistingdlgbase.ui line 313
+#: rc.cpp:8735
+#, no-c-format
+msgid "&Source Directory"
 msgstr ""
 
-#: languages/cpp/simpletype.cpp:36
-msgid ""
-"double long floating point value, 10 bytes, ranged ca. -3.4E+4932 to 3.4E+4932"
+#. i18n: file ./buildtools/autotools/addexistingdlgbase.ui line 364
+#: rc.cpp:8738
+#, no-c-format
+msgid "R&emove All"
+msgstr "G&waredu Popeth"
+
+#. i18n: file ./buildtools/autotools/addexistingdlgbase.ui line 367
+#: rc.cpp:8741
+#, no-c-format
+msgid "Removes all added files."
 msgstr ""
 
-#: languages/cpp/simpletype.cpp:37
-msgid "unsigned integer, byte-count depending on operating-system"
+#. i18n: file ./buildtools/autotools/addexistingdlgbase.ui line 375
+#: rc.cpp:8744
+#, no-c-format
+msgid "&Remove Selected"
+msgstr "&Tynnu'r Dewis"
+
+#. i18n: file ./buildtools/autotools/addexistingdlgbase.ui line 378
+#: rc.cpp:8747
+#, no-c-format
+msgid "Removes the selected files."
 msgstr ""
 
-#: languages/cpp/cppsupportpart.cpp:254
-msgid "Switch Header/Implementation"
+#. i18n: file ./buildtools/autotools/addexistingdlgbase.ui line 417
+#: rc.cpp:8750
+#, no-c-format
+msgid "Add &Following"
 msgstr ""
 
-#: languages/cpp/cppsupportpart.cpp:257
-msgid "Switch between header and implementation files"
+#. i18n: file ./buildtools/autotools/addservicedlgbase.ui line 16
+#: rc.cpp:8753
+#, no-c-format
+msgid "Add New Service"
 msgstr ""
 
-#: languages/cpp/cppsupportpart.cpp:258
-msgid ""
-"<b>Switch Header/Implementation</b>"
-"<p>If you are currently looking at a header file, this brings you to the "
-"corresponding implementation file. If you are looking at an implementation file "
-"(.cpp etc.), this brings you to the corresponding header file."
+#. i18n: file ./buildtools/autotools/addservicedlgbase.ui line 31
+#: rc.cpp:8756
+#, no-c-format
+msgid "&Service File"
 msgstr ""
 
-#: languages/cpp/cppsupportpart.cpp:267 languages/php/phpsupportpart.cpp:128
-msgid "Complete Text"
+#. i18n: file ./buildtools/autotools/addservicedlgbase.ui line 139
+#: rc.cpp:8762
+#, no-c-format
+msgid "&Library:"
 msgstr ""
 
-#: languages/cpp/cppsupportpart.cpp:270
-msgid "Complete current expression"
+#. i18n: file ./buildtools/autotools/addservicedlgbase.ui line 209
+#: rc.cpp:8774
+#, no-c-format
+msgid "Service &Types"
 msgstr ""
 
-#: languages/cpp/cppsupportpart.cpp:271
-msgid ""
-"<b>Complete Text</p>"
-"<p>Completes current expression using memory class store for the current "
-"project and persistent class stores for external libraries."
+#. i18n: file ./buildtools/autotools/addicondlgbase.ui line 16
+#: rc.cpp:8798
+#, no-c-format
+msgid "Add New Icon"
 msgstr ""
 
-#: languages/cpp/cppsupportpart.cpp:276
-msgid "Create Accessor Methods"
+#. i18n: file ./buildtools/autotools/addicondlgbase.ui line 53
+#: rc.cpp:8804
+#, no-c-format
+msgid "&Size:"
+msgstr "&Maint:"
+
+#. i18n: file ./buildtools/autotools/addicondlgbase.ui line 178
+#: rc.cpp:8819
+#, no-c-format
+msgid "unknown"
+msgstr "anhysbys"
+
+#. i18n: file ./buildtools/autotools/managecustomcommandsbase.ui line 44
+#: rc.cpp:8828
+#, fuzzy, no-c-format
+msgid "Menu Text"
+msgstr "Canfod Testun"
+
+#. i18n: file ./buildtools/autotools/managecustomcommandsbase.ui line 52
+#: rc.cpp:8831
+#, no-c-format
+msgid "Command"
+msgstr "Gorchymyn"
+
+#. i18n: file ./buildtools/autotools/managecustomcommandsbase.ui line 60
+#: rc.cpp:8834
+#, fuzzy, no-c-format
+msgid "Command Type"
+msgstr "Gorchy&myn:"
+
+#. i18n: file ./buildtools/ada/adaproject_optionsdlgbase.ui line 19
+#: buildtools/ada/adaproject_part.cpp:375
+#: buildtools/ada/adaproject_part.cpp:406 rc.cpp:8837
+#, no-c-format
+msgid "Ada Compiler"
 msgstr ""
 
-#: languages/cpp/cppsupportpart.cpp:280 languages/cpp/cppsupportpart.cpp:690
-msgid "Make Member"
+#. i18n: file ./buildtools/ada/adaproject_optionsdlgbase.ui line 64
+#: rc.cpp:8840
+#, no-c-format
+msgid "Configuration:"
+msgstr "Ffurfwedd :"
+
+#. i18n: file ./buildtools/ada/adaproject_optionsdlgbase.ui line 170
+#: rc.cpp:8852
+#, no-c-format
+msgid "Compiler &options:"
 msgstr ""
 
-#: languages/cpp/cppsupportpart.cpp:283
-msgid "Make member"
+#. i18n: file ./buildtools/ada/adaproject_optionsdlgbase.ui line 189
+#: rc.cpp:8855
+#, no-c-format
+msgid "Ada &compiler:"
 msgstr ""
 
-#: languages/cpp/cppsupportpart.cpp:284 languages/cpp/cppsupportpart.cpp:691
+#. i18n: file ./buildtools/ada/adaproject_optionsdlgbase.ui line 349
+#: rc.cpp:8864
+#, no-c-format
+msgid "Load Default Compiler Options"
+msgstr ""
+
+#: _translatorinfo.cpp:1
 msgid ""
-"<b>Make member</b>"
-"<p>Creates a class member function in implementation file based on the member "
-"declaration at the current line."
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "KD wrth KGyfieithu"
+
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "kyfieithu@dotmon.com"
+
+#: editors/editor-chooser/editorchooser_part.cpp:35
+msgid "Editor"
+msgstr "Golygydd"
+
+#: languages/cpp/subclassingdlg.cpp:190
+#: languages/kjssupport/subclassingdlg.cpp:187
+msgid "Create Subclass of "
 msgstr ""
 
-#: languages/cpp/cppsupportpart.cpp:288
-msgid "Navigation Menu"
+#: languages/bash/bashsupport_part.cpp:46
+#: languages/cpp/app_templates/kdevlang/kdevlang_part.cpp:31
+#: languages/kjssupport/kjssupport_part.cpp:72
+#: languages/php/phpsupportpart.cpp:91 languages/ruby/rubysupport_part.cpp:51
+#: languages/sql/sqlsupport_part.cpp:43
+msgid "&Run"
+msgstr "R&hedeg"
+
+#: languages/kjssupport/kjssupport_part.cpp:73
+msgid "Test the active script."
 msgstr ""
 
-#: languages/cpp/cppsupportpart.cpp:291
-msgid "Show the navigation-menu"
+#: languages/kjssupport/kjssupport_part.cpp:90
+msgid "KJS Console"
 msgstr ""
 
-#: languages/cpp/cppsupportpart.cpp:292
-msgid ""
-"<b>Navigate</b>"
-"<p>Shows a navigation-menu based on the type-evaluation of the item under the "
-"cursor."
+#: languages/kjssupport/kjssupport_part.cpp:90
+msgid "KJS Embed Console"
 msgstr ""
 
-#: languages/cpp/cppsupportpart.cpp:296 languages/java/javasupportpart.cpp:160
-#: parts/classview/classviewwidget.cpp:74
-msgid "New Class..."
+#: languages/ada/adasupportpart.cpp:62 languages/cpp/cppsupportpart.cpp:586
+#: languages/java/javasupportpart.cpp:151
+#: languages/kjssupport/kjssupport_part.cpp:94
+#: languages/pascal/pascalsupport_part.cpp:72
+#: languages/php/phpsupportpart.cpp:107
+msgid "Problems"
 msgstr ""
 
-#: languages/cpp/cppsupportpart.cpp:299 languages/java/javasupportpart.cpp:163
-msgid "Generate a new class"
+#: languages/ada/adasupportpart.cpp:62 languages/cpp/cppsupportpart.cpp:586
+#: languages/java/javasupportpart.cpp:151
+#: languages/kjssupport/kjssupport_part.cpp:94
+msgid "Problem reporter"
 msgstr ""
 
-#: languages/cpp/cppsupportpart.cpp:300
-msgid "<b>New Class</b><p>Calls the <b>New Class</b> wizard."
+#: languages/bash/bashsupport_part.cpp:48
+#: languages/ruby/rubysupport_part.cpp:55
+msgid "<b>Run</b><p>Starts an application."
 msgstr ""
 
-#: languages/cpp/cppsupportpart.cpp:438 languages/cpp/cppsupportpart.cpp:1961
-#: languages/cpp/cppsupportpart.cpp:2263
-msgid "C++ Support"
+#: languages/cpp/ccconfigwidget.cpp:233
+msgid "Are you sure you want to delete the \"%1\" database?"
 msgstr ""
 
-#: languages/cpp/cppsupportpart.cpp:446
-msgid "C++ Class Generator"
+#: languages/cpp/ccconfigwidget.cpp:238
+#, fuzzy
+msgid "Delete Database"
+msgstr "Gwaredu ffeil"
+
+#: languages/cpp/ccconfigwidget.cpp:574
+#, fuzzy
+msgid "Edit TQt4 Designer Plugin Paths"
+msgstr "Analluogi"
+
+#: languages/cpp/ccconfigwidget.cpp:577
+#, fuzzy
+msgid "Plugin Paths"
+msgstr "Ategion"
+
+#: languages/cpp/kdevdriver.cpp:178
+#, fuzzy
+msgid "%1. Message: %2"
+msgstr "&Neges:"
+
+#: languages/cpp/simpletype.cpp:24
+#, fuzzy
+msgid "typeless"
+msgstr "&Arddulliau"
+
+#: languages/cpp/simpletype.cpp:25
+msgid "boolean value, 1 byte, ( \"true\" or \"false\" )"
 msgstr ""
 
-#: languages/cpp/cppsupportpart.cpp:451
-msgid "C++ Parsing"
+#: languages/cpp/simpletype.cpp:26
+msgid "signed/unsigned character, 1 byte"
 msgstr ""
 
-#: languages/cpp/cppsupportpart.cpp:739 parts/classview/classtreebase.cpp:43
-msgid "Go to Declaration"
+#: languages/cpp/simpletype.cpp:27
+msgid "signed character, 1 byte, ranged -128 to 127"
 msgstr ""
 
-#: languages/cpp/cppsupportpart.cpp:740
-msgid ""
-"<b>Go to declaration</b>"
-"<p>Provides a menu to select available function declarations in the current "
-"file and in the corresponding header (if the current file is an implementation) "
-"or source (if the current file is a header) file."
+#: languages/cpp/simpletype.cpp:28
+msgid "unsigned character, 1 byte, ranged 0 to 255"
 msgstr ""
 
-#: languages/cpp/cppsupportpart.cpp:783 parts/classview/classtreebase.cpp:45
-msgid "Go to Definition"
+#: languages/cpp/simpletype.cpp:29
+msgid "wide character, 2 bytes, ranged 0 to 65.535"
 msgstr ""
 
-#: languages/cpp/cppsupportpart.cpp:784
-msgid ""
-"<b>Go to definition</b>"
-"<p>Provides a menu to select available function definitions in the current file "
-"and in the corresponding header (if the current file is an implementation) or "
-"source (if the current file is a header) file."
+#: languages/cpp/simpletype.cpp:30
+msgid "signed integer, 4 bytes, ranged -2.147.483.648 to 2.147.483.647"
 msgstr ""
 
-#: languages/cpp/cppsupportpart.cpp:824
-msgid "Extract Interface..."
+#: languages/cpp/simpletype.cpp:31
+msgid "unsigned integer, 4 bytes, ranged 0 to 4.294.967.295"
 msgstr ""
 
-#: languages/cpp/cppsupportpart.cpp:825
-msgid ""
-"<b>Extract interface</b>"
-"<p>Extracts interface from the selected class and creates a new class with this "
-"interface. No implementation code is extracted and no implementation code is "
-"created."
+#: languages/cpp/simpletype.cpp:32
+msgid "short integer, 2 bytes, ranged -32.768 to 32.768"
 msgstr ""
 
-#: languages/cpp/cppsupportpart.cpp:842
-#: languages/python/pythonsupportpart.cpp:102
-#: languages/ruby/rubysupport_part.cpp:671
-msgid "Create or Select Implementation..."
+#: languages/cpp/simpletype.cpp:33
+msgid "unsigned short integer, 2 bytes, ranged 0 to 65.535"
 msgstr ""
 
-#: languages/cpp/cppsupportpart.cpp:843
-#: languages/python/pythonsupportpart.cpp:103
-#: languages/ruby/rubysupport_part.cpp:672
+#: languages/cpp/simpletype.cpp:34
+msgid "floating point value, 4 bytes, ranged ca. -3,4E+38 to 3,4E+38"
+msgstr ""
+
+#: languages/cpp/simpletype.cpp:35
+msgid "double floating point value, 8 bytes, ranged ca. -1,8E+308 to 1,8E+308"
+msgstr ""
+
+#: languages/cpp/simpletype.cpp:36
 msgid ""
-"<b>Create or select implementation</b>"
-"<p>Creates or selects a subclass of selected form for use with integrated "
-"KDevDesigner."
+"double long floating point value, 10 bytes, ranged ca. -3,4E+4932 to 3,4E+4932"
 msgstr ""
 
-#: languages/cpp/cppsupportpart.cpp:1415 languages/cpp/cppsupportpart.cpp:1427
-msgid "Please select a class."
+#: languages/cpp/simpletype.cpp:37
+msgid "unsigned integer, byte-count dependent on operating-system"
 msgstr ""
 
-#: languages/cpp/cppsupportpart.cpp:1961
-#: languages/java/javasupportpart.cpp:736
+#: languages/cpp/cppimplementationwidget.cpp:76
+#: languages/cpp/cppnewclassdlg.cpp:1840
+msgid "Cannot write to implementation file"
+msgstr ""
+
+#: languages/cpp/cppimplementationwidget.cpp:86
+#: languages/cpp/cppnewclassdlg.cpp:2064
+msgid "Cannot write to header file"
+msgstr ""
+
+#: languages/cpp/includepathresolver.cpp:251
 msgid ""
-"Persistent class store will be disabled: you have a wrong version of pcs "
-"installed.\n"
-"Remove old pcs files?"
+"tried include-path-resolution while another resolution-process was still "
+"running"
 msgstr ""
 
-#: languages/cpp/cppsupportpart.cpp:2262
-msgid "File %1 already exists"
-msgstr "Ffeil yn Bodoli'n Barod %1"
+#: languages/cpp/includepathresolver.cpp:260
+msgid "Makefile is missing in folder \"%1\""
+msgstr ""
+
+#: languages/cpp/includepathresolver.cpp:260
+#, c-format
+msgid "problem while trying to resolve include-paths for %1"
+msgstr ""
+
+#: languages/cpp/includepathresolver.cpp:277
+#, fuzzy
+msgid "Cached: "
+msgstr "KCachegrind"
+
+#: languages/cpp/includepathresolver.cpp:301
+msgid "Filename %1 seems to be malformed"
+msgstr ""
+
+#: languages/cpp/includepathresolver.cpp:385
+#, fuzzy
+msgid "Could not start the make-process"
+msgstr "Methu Cyfieithu'r Testun Tarddiad"
+
+#: languages/cpp/includepathresolver.cpp:390
+msgid "make-process finished with nonzero exit-status"
+msgstr ""
+
+#: languages/cpp/includepathresolver.cpp:390
+#: languages/cpp/includepathresolver.cpp:395
+#, fuzzy, c-format
+msgid "output: %1"
+msgstr "Gr?p: %1"
+
+#: languages/cpp/includepathresolver.cpp:395
+msgid "make-process failed"
+msgstr ""
+
+#: languages/cpp/includepathresolver.cpp:474
+#: languages/cpp/includepathresolver.cpp:477
+msgid "Recursive make-call failed"
+msgstr ""
+
+#: languages/cpp/includepathresolver.cpp:474
+msgid "The parameter-string \"%1\" does not seem to be valid. Output was: %2"
+msgstr ""
+
+#: languages/cpp/includepathresolver.cpp:477
+msgid "The directory \"%1\" does not exist. Output was: %2"
+msgstr ""
+
+#: languages/cpp/includepathresolver.cpp:481
+msgid "Recursive make-call malformed"
+msgstr ""
+
+#: languages/cpp/includepathresolver.cpp:481
+#, fuzzy, c-format
+msgid "Output was: %2"
+msgstr "Ffeil a&llbwn :"
+
+#: languages/cpp/includepathresolver.cpp:491
+msgid "Output seems not to be a valid gcc or g++ call"
+msgstr ""
+
+#: languages/cpp/includepathresolver.cpp:491
+msgid "Folder: \"%1\"  Command: \"%2\" Output: \"%3\""
+msgstr ""
 
 #: languages/cpp/cppcodecompletion.cpp:359
 msgid "Jump to %1 %2"
@@ -13876,7 +13636,7 @@ msgstr ""
 
 #: languages/cpp/cppcodecompletion.cpp:1726
 msgid ""
-"Type of \"%1\" could not be evaluated! Tried to evaluate expression as \"%2\""
+"Type of \"%1\" could not be evaluated: tried to evaluate expression as \"%2\""
 msgstr ""
 
 #: languages/cpp/cppcodecompletion.cpp:4264
@@ -13896,317 +13656,328 @@ msgstr ""
 msgid " (builtin type) "
 msgstr ""
 
-#: languages/cpp/problemreporter.cpp:91 languages/java/problemreporter.cpp:84
-#: languages/php/phperrorview.cpp:86
-msgid ""
-"<b>Problem reporter</b>"
-"<p>This window shows various \"problems\" in your project. It displays TODO "
-"entries, FIXME's and errors reported by a language parser. To add a TODO or "
-"FIXME entry, just type"
-"<br><tt>//@todo my todo</tt>"
-"<br><tt>//TODO: my todo</tt>"
-"<br><tt>//FIXME fix this</tt>"
+#: languages/cpp/cppsupportpart.cpp:254
+msgid "Switch Header/Implementation"
 msgstr ""
 
-#: languages/cpp/problemreporter.cpp:130 languages/php/phperrorview.cpp:120
-msgid "Current"
-msgstr "Cyfredol"
-
-#: languages/cpp/problemreporter.cpp:131 languages/php/phperrorview.cpp:121
-msgid "Errors"
-msgstr "Gwallau"
-
-#: languages/cpp/problemreporter.cpp:132
-#, fuzzy
-msgid "Warnings"
-msgstr "Aros"
-
-#: languages/cpp/problemreporter.cpp:133 languages/cpp/problemreporter.cpp:191
-#: languages/cpp/problemreporter.cpp:319 languages/cpp/problemreporter.cpp:417
-#: languages/php/phperrorview.cpp:122 languages/php/phperrorview.cpp:160
-#: languages/php/phperrorview.cpp:274 languages/php/phperrorview.cpp:390
-msgid "Fixme"
+#: languages/cpp/cppsupportpart.cpp:257
+msgid "Switch between header and implementation files"
 msgstr ""
 
-#: languages/cpp/problemreporter.cpp:134 languages/cpp/problemreporter.cpp:192
-#: languages/cpp/problemreporter.cpp:320 languages/cpp/problemreporter.cpp:415
-#: languages/php/phperrorview.cpp:123 languages/php/phperrorview.cpp:161
-#: languages/php/phperrorview.cpp:275 languages/php/phperrorview.cpp:387
-msgid "Todo"
+#: languages/cpp/cppsupportpart.cpp:258
+msgid ""
+"<b>Switch Header/Implementation</b>"
+"<p>If you are currently looking at a header file, this brings you to the "
+"corresponding implementation file. If you are looking at an implementation file "
+"(.cpp etc.), this brings you to the corresponding header file."
 msgstr ""
 
-#: languages/cpp/problemreporter.cpp:135 languages/php/phperrorview.cpp:124
-msgid "Filtered"
+#: languages/cpp/cppsupportpart.cpp:267 languages/php/phpsupportpart.cpp:128
+msgid "Complete Text"
 msgstr ""
 
-#: languages/cpp/problemreporter.cpp:178 languages/php/phperrorview.cpp:154
-#, fuzzy, c-format
-msgid "Filtered: %1"
-msgstr "Ffeil: %1"
-
-#: languages/cpp/problemreporter.cpp:220 languages/java/problemreporter.cpp:94
-#: languages/php/phperrorview.cpp:185
-msgid "Column"
-msgstr "Colofn"
+#: languages/cpp/cppsupportpart.cpp:270
+msgid "Complete current expression"
+msgstr ""
 
-#: languages/cpp/app_templates/kapp/main.cpp:11
-#: languages/cpp/app_templates/tdeconfig35/main.cpp:10
-#: languages/cpp/app_templates/kmake/app.cpp:8
-#: languages/cpp/app_templates/kscons_kxt/main.cpp:10
-#: languages/cpp/app_templates/kxt/main.cpp:10
-msgid "A TDE Application"
-msgstr "Cymhwysiad TDE"
+#: languages/cpp/cppsupportpart.cpp:271
+msgid ""
+"<b>Complete Text</p>"
+"<p>Completes current expression using memory class store for the current "
+"project and persistent class stores for external libraries."
+msgstr ""
 
-#: languages/cpp/app_templates/kapp/main.cpp:17
-#: languages/cpp/app_templates/tdeconfig35/main.cpp:16
-#: languages/cpp/app_templates/kmake/app.cpp:14
-#: languages/cpp/app_templates/kpartapp/main.cpp:15
-#: languages/cpp/app_templates/kscons_tdemdi/main.cpp:18
-#: languages/cpp/app_templates/kscons_kxt/main.cpp:16
-#: languages/cpp/app_templates/kxt/main.cpp:16
-msgid "Document to open"
-msgstr "Dogfen i'w hagor"
+#: languages/cpp/cppsupportpart.cpp:276
+msgid "Create Accessor Methods"
+msgstr ""
 
-#: languages/cpp/app_templates/tdeconfig35/appview.cpp:36
-#: languages/cpp/app_templates/kscons_kxt/appview.cpp:36
-#: languages/cpp/app_templates/kxt/appview.cpp:36
-msgid "This project is %1 days old"
+#: languages/cpp/cppsupportpart.cpp:280 languages/cpp/cppsupportpart.cpp:690
+msgid "Make Member"
 msgstr ""
 
-#: languages/cpp/app_templates/tdeconfig35/appview.cpp:37
-#: languages/cpp/app_templates/kde4app/kapp4view.cpp:39
-#: languages/cpp/app_templates/kscons_kxt/appview.cpp:37
-#: languages/cpp/app_templates/kxt/appview.cpp:37
-msgid "Settings changed"
+#: languages/cpp/cppsupportpart.cpp:283
+msgid "Make member"
 msgstr ""
 
-#: languages/cpp/app_templates/tdeconfig35/app.cpp:56
-#: languages/cpp/app_templates/kde4app/kapp4.cpp:56
-#: languages/cpp/app_templates/kscons_kxt/app.cpp:79
-#: languages/cpp/app_templates/kxt/app.cpp:74
-msgid "Swi&tch Colors"
+#: languages/cpp/cppsupportpart.cpp:284 languages/cpp/cppsupportpart.cpp:691
+msgid ""
+"<b>Make member</b>"
+"<p>Creates a class member function in implementation file based on the member "
+"declaration at the current line."
 msgstr ""
 
-#: languages/cpp/app_templates/kapp/appview.cpp:62
-msgid "Could not find a suitable HTML component"
+#: languages/cpp/cppsupportpart.cpp:288
+msgid "Navigation Menu"
 msgstr ""
 
-#: languages/cpp/app_templates/kapp/pref.cpp:11
-msgid "%{APPNAME} Preferences"
+#: languages/cpp/cppsupportpart.cpp:291
+msgid "Show the navigation-menu"
 msgstr ""
 
-#: languages/cpp/app_templates/kapp/pref.cpp:18
-msgid "First Page"
-msgstr "Tudalen Gyntaf"
+#: languages/cpp/cppsupportpart.cpp:292
+msgid ""
+"<b>Navigate</b>"
+"<p>Shows a navigation-menu based on the type-evaluation of the item under the "
+"cursor."
+msgstr ""
 
-#: languages/cpp/app_templates/kapp/pref.cpp:18
-msgid "Page One Options"
-msgstr "Dewisiadau'r Dudalen Gyntaf"
+#: languages/cpp/cppsupportpart.cpp:296 languages/java/javasupportpart.cpp:160
+#: parts/classview/classviewwidget.cpp:74
+msgid "New Class..."
+msgstr ""
 
-#: languages/cpp/app_templates/kapp/pref.cpp:21
-msgid "Second Page"
-msgstr "Ail Dudalen"
+#: languages/cpp/cppsupportpart.cpp:299 languages/java/javasupportpart.cpp:163
+msgid "Generate a new class"
+msgstr ""
 
-#: languages/cpp/app_templates/kapp/pref.cpp:21
-msgid "Page Two Options"
-msgstr "Dewisiadau'r Ail Dudalen"
+#: languages/cpp/cppsupportpart.cpp:300
+msgid "<b>New Class</b><p>Calls the <b>New Class</b> wizard."
+msgstr ""
 
-#: languages/cpp/app_templates/kapp/pref.cpp:31
-#: languages/cpp/app_templates/kapp/pref.cpp:40
-msgid "Add something here"
-msgstr "Ychwanegwch rywbeth yma"
+#: languages/cpp/cppsupportpart.cpp:438 languages/cpp/cppsupportpart.cpp:1961
+#: languages/cpp/cppsupportpart.cpp:2263
+msgid "C++ Support"
+msgstr ""
 
-#: languages/cpp/app_templates/kapp/app.cpp:102
-msgid "Cus&tom Menuitem"
+#: languages/cpp/cppsupportpart.cpp:446
+msgid "C++ Class Generator"
 msgstr ""
 
-#: languages/cpp/app_templates/kapp/app.cpp:179
-msgid "Open Location"
-msgstr "Agor Lleoliad"
+#: languages/cpp/cppsupportpart.cpp:451
+msgid "C++ Parsing"
+msgstr ""
 
-#: languages/cpp/app_templates/kde4app/main.cpp:10
-#, fuzzy
-msgid "A TDE 4 Application"
-msgstr "Cymhwysiad TDE"
+#: languages/cpp/cppsupportpart.cpp:739 parts/classview/classtreebase.cpp:43
+msgid "Go to Declaration"
+msgstr ""
 
-#: languages/cpp/app_templates/dcopservice/main.cpp:12
-#: languages/cpp/app_templates/kdedcop/main.cpp:10
-#: languages/cpp/app_templates/khello/main.cpp:10
-#: languages/cpp/app_templates/khello2/main.cpp:10
-#: languages/cpp/app_templates/kpartapp/main.cpp:9
-msgid "A TDE KPart Application"
-msgstr "Cymhwysiad KPart TDE"
+#: languages/cpp/cppsupportpart.cpp:740
+msgid ""
+"<b>Go to declaration</b>"
+"<p>Provides a menu to select available function declarations in the current "
+"file and in the corresponding header (if the current file is an implementation) "
+"or source (if the current file is a header) file."
+msgstr ""
 
-#: languages/cpp/app_templates/kateplugin/plugin_app.cpp:57
-#: languages/cpp/app_templates/kateplugin2/plugin_app.cpp:61
-msgid "Insert Hello World"
-msgstr "Mewnosod Bore Da, Byd!"
+#: languages/cpp/cppsupportpart.cpp:783 parts/classview/classtreebase.cpp:45
+msgid "Go to Definition"
+msgstr ""
 
-#: languages/cpp/app_templates/kdevpart/kdevpart_part.cpp:41
-#: languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp:41
-msgid "WHAT DOES THIS PART DO?"
+#: languages/cpp/cppsupportpart.cpp:784
+msgid ""
+"<b>Go to definition</b>"
+"<p>Provides a menu to select available function definitions in the current file "
+"and in the corresponding header (if the current file is an implementation) or "
+"source (if the current file is a header) file."
 msgstr ""
 
-#: languages/cpp/app_templates/kdevpart/kdevpart_part.cpp:94
-#: languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp:94
-msgid "&Do Something..."
+#: languages/cpp/cppsupportpart.cpp:824
+msgid "Extract Interface..."
 msgstr ""
 
-#: languages/cpp/app_templates/kdevpart/kdevpart_part.cpp:96
-#: languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp:96
-#, fuzzy
-msgid "Do something"
-msgstr "Ychwanegwch rywbeth yma"
+#: languages/cpp/cppsupportpart.cpp:825
+msgid ""
+"<b>Extract interface</b>"
+"<p>Extracts interface from the selected class and creates a new class with this "
+"interface. No implementation code is extracted and no implementation code is "
+"created."
+msgstr ""
 
-#: languages/cpp/app_templates/kdevpart/kdevpart_part.cpp:97
-#: languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp:97
-msgid "<b>Do something</b><p>Describe here what does this action do."
+#: languages/cpp/cppsupportpart.cpp:842
+#: languages/python/pythonsupportpart.cpp:102
+#: languages/ruby/rubysupport_part.cpp:671
+msgid "Create or Select Implementation..."
 msgstr ""
 
-#: languages/cpp/app_templates/kdevpart/kdevpart_part.cpp:180
-#: languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp:180
-msgid "This action does nothing."
+#: languages/cpp/cppsupportpart.cpp:843
+#: languages/python/pythonsupportpart.cpp:103
+#: languages/ruby/rubysupport_part.cpp:672
+msgid ""
+"<b>Create or select implementation</b>"
+"<p>Creates or selects a subclass of selected form for use with integrated "
+"KDevDesigner."
 msgstr ""
 
-#: languages/cpp/app_templates/kdevpart/kdevpart_part.cpp:180
-#: languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp:180
-msgid "%{APPNAME} Plugin"
+#: languages/cpp/cppsupportpart.cpp:1415 languages/cpp/cppsupportpart.cpp:1427
+msgid "Please select a class."
 msgstr ""
 
-#: languages/cpp/app_templates/kmake/mainviewimp.cpp:17
-msgid "Hello there."
+#: languages/ada/adasupportpart.cpp:128 languages/cpp/cppsupportpart.cpp:1465
+#: languages/csharp/csharpsupportpart.cpp:264
+#: languages/java/javasupportpart.cpp:492
+#: languages/perl/perlsupportpart.cpp:264 languages/php/phpsupportpart.cpp:427
+msgid "Updating..."
 msgstr ""
 
-#: languages/cpp/app_templates/kpartapp/app_part.cpp:185
-msgid "%{APPNAME}Part"
+#: languages/ada/adasupportpart.cpp:155 languages/cpp/cppsupportpart.cpp:1620
+#: languages/csharp/csharpsupportpart.cpp:293
+#: languages/java/javasupportpart.cpp:591
+#: languages/perl/perlsupportpart.cpp:293 languages/php/phpsupportpart.cpp:479
+msgid "Done"
+msgstr "Wedi gorffen"
+
+#: languages/cpp/cppsupportpart.cpp:1961
+#: languages/java/javasupportpart.cpp:713
+msgid ""
+"Persistent class store will be disabled: you have a wrong version of pcs "
+"installed.\n"
+"Remove old pcs files?"
 msgstr ""
 
-#: languages/cpp/app_templates/kpartapp/app.cpp:55
-#: languages/cpp/app_templates/kscons_tdemdi/appkmdiView.cpp:46
-#: languages/cpp/app_templates/kscons_tdemdi/appkmdiView.cpp:53
-msgid "Could not find our part."
-msgstr "Methu canfod ein rhan."
+#: languages/cpp/cppsupportpart.cpp:2262
+msgid "File %1 already exists"
+msgstr "Ffeil yn Bodoli'n Barod %1"
 
-#: languages/cpp/app_templates/tdeioslave/slave.cpp:51
-#: vcs/subversion/svn_tdeio.cpp:249
-msgid "Looking for %1..."
+#: languages/cpp/problemreporter.cpp:91 languages/java/problemreporter.cpp:84
+#: languages/php/phperrorview.cpp:86
+msgid ""
+"<b>Problem reporter</b>"
+"<p>This window shows various \"problems\" in your project. It displays TODO "
+"entries, FIXME's and errors reported by a language parser. To add a TODO or "
+"FIXME entry, just type"
+"<br><tt>//@todo my todo</tt>"
+"<br><tt>//TODO: my todo</tt>"
+"<br><tt>//FIXME fix this</tt>"
 msgstr ""
 
-#: languages/cpp/app_templates/dcopservice/main.cpp:24
-msgid "TDE"
-msgstr "TDE"
+#: languages/ada/problemreporter.cpp:86 languages/cpp/problemreporter.cpp:109
+#: languages/cpp/problemreporter.cpp:110 languages/java/problemreporter.cpp:91
+#: languages/pascal/problemreporter.cpp:80 languages/php/phperrorview.cpp:101
+#: languages/php/phperrorview.cpp:102
+msgid "Level"
+msgstr "Lefel"
 
-#: languages/cpp/app_templates/dcopservice/main.cpp:27
-msgid "Developer"
-msgstr "Datblygwr"
+#: languages/cpp/problemreporter.cpp:130 languages/php/phperrorview.cpp:120
+msgid "Current"
+msgstr "Cyfredol"
 
-#: languages/cpp/app_templates/kpartplugin/plugin_app.cpp:16
-msgid "&Plugin Action"
-msgstr ""
+#: languages/cpp/problemreporter.cpp:131 languages/php/phperrorview.cpp:121
+msgid "Errors"
+msgstr "Gwallau"
 
-#: languages/cpp/app_templates/kpartplugin/plugin_app.cpp:32
-msgid "Cannot Translate Source"
-msgstr "Methu Cyfieithu'r Testun Tarddiad"
+#: languages/cpp/problemreporter.cpp:132
+#, fuzzy
+msgid "Warnings"
+msgstr "Aros"
 
-#: languages/cpp/app_templates/kpartplugin/plugin_app.cpp:33
-msgid "You cannot translate anything except web pages with this plugin."
+#: languages/cpp/problemreporter.cpp:133 languages/cpp/problemreporter.cpp:191
+#: languages/cpp/problemreporter.cpp:323 languages/cpp/problemreporter.cpp:421
+#: languages/php/phperrorview.cpp:122 languages/php/phperrorview.cpp:160
+#: languages/php/phperrorview.cpp:274 languages/php/phperrorview.cpp:390
+msgid "Fixme"
 msgstr ""
 
-#: languages/cpp/app_templates/kpartplugin/plugin_app.cpp:53
-msgid "The URL you entered is not valid, please correct it and try again"
-msgstr "Nid yw'r URL a fewnosodwyd yn ddilys; cywirwch fo a ceisiwch eto"
+#: languages/cpp/problemreporter.cpp:134 languages/cpp/problemreporter.cpp:192
+#: languages/cpp/problemreporter.cpp:324 languages/cpp/problemreporter.cpp:419
+#: languages/php/phperrorview.cpp:123 languages/php/phperrorview.cpp:161
+#: languages/php/phperrorview.cpp:275 languages/php/phperrorview.cpp:387
+msgid "Todo"
+msgstr ""
 
-#: languages/cpp/app_templates/tdecmodule/module.cpp:62
-msgid "Helpful information about the %{APPNAMELC} module."
+#: languages/cpp/problemreporter.cpp:135 languages/php/phperrorview.cpp:124
+msgid "Filtered"
 msgstr ""
 
-#: languages/bash/bashsupport_part.cpp:46
-#: languages/cpp/app_templates/kdevlang/kdevlang_part.cpp:31
-#: languages/kjssupport/kjssupport_part.cpp:72
-#: languages/php/phpsupportpart.cpp:91 languages/ruby/rubysupport_part.cpp:51
-#: languages/sql/sqlsupport_part.cpp:43
-msgid "&Run"
-msgstr "R&hedeg"
+#: languages/cpp/problemreporter.cpp:178 languages/php/phperrorview.cpp:154
+#, fuzzy, c-format
+msgid "Filtered: %1"
+msgstr "Ffeil: %1"
 
-#: languages/cpp/app_templates/kicker/applet.cpp:33
-msgid "This is an about box"
+#: kdevdesigner/designer/outputwindow.cpp:85
+#: languages/ada/problemreporter.cpp:89 languages/cpp/problemreporter.cpp:223
+#: languages/java/problemreporter.cpp:93
+#: languages/pascal/problemreporter.cpp:83 languages/php/phperrorview.cpp:184
+#: vcs/subversion/svn_blamewidget.cpp:35
+msgid "Line"
+msgstr "Llinell"
+
+#: languages/cpp/problemreporter.cpp:224 languages/java/problemreporter.cpp:94
+#: languages/php/phperrorview.cpp:185
+msgid "Column"
+msgstr "Colofn"
+
+#: languages/ada/problemreporter.cpp:87 languages/cpp/problemreporter.cpp:225
+#: languages/java/problemreporter.cpp:95
+#: languages/pascal/problemreporter.cpp:81 languages/php/phperrorview.cpp:186
+msgid "Problem"
 msgstr ""
 
-#: languages/cpp/app_templates/kicker/applet.cpp:39
-msgid "This is a help box"
+#: languages/cpp/cppnewclassdlg.cpp:81
+msgid "Use as Private"
 msgstr ""
 
-#: languages/cpp/app_templates/kicker/applet.cpp:45
-msgid "This is a preferences box"
+#: languages/cpp/cppnewclassdlg.cpp:83
+msgid "Use as Protected"
 msgstr ""
 
-#: languages/cpp/app_templates/tdefileplugin/tdefile_plugin.cpp:26
-msgid "%{APPNAME} Information"
+#: languages/cpp/cppnewclassdlg.cpp:85
+msgid "Use as Public"
 msgstr ""
 
-#: languages/cpp/app_templates/tdefileplugin/tdefile_plugin.cpp:31
-msgid "Items"
-msgstr "Eitemau"
+#: languages/cpp/cppnewclassdlg.cpp:88
+msgid "Unset"
+msgstr "Datosod"
 
-#: languages/cpp/app_templates/kscons_tdemdi/appkmdi.cpp:130
-#: languages/cpp/app_templates/kscons_kxt/app.cpp:72
-msgid "This shows useful tips on the use of this application."
-msgstr "Dengys hwn gynghorion defnyddiol ar ddefnydd y cymhwysiad yma."
+#: languages/cpp/cppnewclassdlg.cpp:92
+msgid "Extend Base Class Functionality"
+msgstr ""
 
-#: languages/cpp/app_templates/kscons_tdemdi/appkmdi.cpp:84
-msgid "Terminal"
-msgstr "Terfynell"
+#: languages/cpp/cppnewclassdlg.cpp:94
+msgid "Replace Base Class Method"
+msgstr ""
 
-#: languages/cpp/app_templates/kscons_tdemdi/main.cpp:12
-msgid "A simple tdemdi app"
+#: languages/cpp/cppnewclassdlg.cpp:346
+msgid ""
+"Objective C does not support multiple inheritance.\n"
+"Only the first base class in the list will be taken into account."
 msgstr ""
 
-#: languages/cpp/app_templates/kscons_tdemdi/app_part.cpp:56
-msgid "%{APPNAMELC}Part"
+#: languages/cpp/cppnewclassdlg.cpp:386
+msgid ""
+"Multiple inheritance requires TQObject derivative to be first and unique in "
+"base class list."
 msgstr ""
 
-#: languages/cpp/app_templates/noatunui/plugin_impl.cpp:50
-msgid "Play"
-msgstr "Chwarae"
+#: languages/cpp/cppnewclassdlg.cpp:852 languages/cpp/cppnewclassdlg.cpp:855
+#: languages/cpp/cppnewclassdlg.cpp:1011 languages/cpp/cppnewclassdlg.cpp:1014
+msgid "Slots (TQt-specific)"
+msgstr ""
 
-#: languages/cpp/app_templates/noatunui/plugin_impl.cpp:56
-#: lib/widgets/kdevhtmlpart.cpp:64 lib/widgets/kdevhtmlpart.cpp:68
-#: src/partcontroller.cpp:171 src/partcontroller.cpp:173
-msgid "Forward"
-msgstr "Ymlaen"
+#: languages/cpp/cppnewclassdlg.cpp:856 languages/cpp/cppnewclassdlg.cpp:1015
+msgid "Attributes"
+msgstr "Priodweddion"
 
-#: languages/cpp/app_templates/noatunui/plugin_impl.cpp:63
-msgid "Playlist"
-msgstr "Rhestr chwarae:"
+#: languages/cpp/cppnewclassdlg.cpp:958 languages/cpp/cppnewclassdlg.cpp:1214
+msgid "replace"
+msgstr "amnewid"
 
-#: languages/cpp/app_templates/noatunui/plugin_impl.cpp:69
-msgid "Change loop style"
+#: languages/cpp/cppnewclassdlg.cpp:958 languages/cpp/cppnewclassdlg.cpp:1208
+#: languages/cpp/cppnewclassdlg.cpp:1529
+msgid "extend"
 msgstr ""
 
-#: languages/cpp/app_templates/noatunui/plugin_impl.cpp:98
-#: languages/cpp/app_templates/noatunui/plugin_impl.cpp:206
-msgid "No File Loaded"
-msgstr "Heb Lwytho Ffeil"
-
-#: languages/cpp/app_templates/noatunui/plugin_impl.cpp:251
-msgid "No looping"
+#: languages/cpp/cppnewclassdlg.cpp:1327
+msgid "You must enter a classname."
 msgstr ""
 
-#: languages/cpp/app_templates/noatunui/plugin_impl.cpp:255
-msgid "Song looping"
+#: languages/cpp/cppnewclassdlg.cpp:1334
+msgid "You must enter a name for the header file."
 msgstr ""
 
-#: languages/cpp/app_templates/noatunui/plugin_impl.cpp:259
-msgid "Playlist looping"
+#: languages/cpp/cppnewclassdlg.cpp:1340
+msgid "You must enter a name for the implementation file."
 msgstr ""
 
-#: languages/cpp/app_templates/noatunui/plugin_impl.cpp:263
-msgid "Random play"
+#: languages/cpp/cppnewclassdlg.cpp:1347
+msgid ""
+"Generated files will always be added to the active directory, so you must not "
+"give an explicit subdirectory."
 msgstr ""
 
-#: languages/cpp/app_templates/kofficepart/main.cpp:17
-msgid "File to open"
-msgstr "Ffeil i agor"
+#: languages/cpp/cppnewclassdlg.cpp:1374
+msgid ""
+"TDevelop is not able to add classes to existing header or implementation files."
+msgstr ""
 
 #: languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp:110
 msgid "Only check the code for syntax errors, do not produce object code"
@@ -14578,7 +14349,7 @@ msgid "<qt>Warn if a requested optimization pass is disabled</qt>"
 msgstr ""
 
 #: languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp:481
-msgid "<qt>Don't warn if there is a division by zero</qt>"
+msgid "<qt>Do not warn if there is a division by zero</qt>"
 msgstr ""
 
 #: languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp:486
@@ -14719,38 +14490,266 @@ msgstr ""
 msgid "GNU Fortran 77 Compiler Options"
 msgstr ""
 
-#: languages/cpp/debugger/breakpoint.cpp:265
-#: languages/ruby/debugger/breakpoint.cpp:122
-msgid "Disabled"
-msgstr "Analluogir"
+#: languages/cpp/app_templates/kdevpart/kdevpart_part.cpp:41
+#: languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp:41
+msgid "WHAT DOES THIS PART DO?"
+msgstr ""
 
-#: languages/cpp/debugger/breakpoint.cpp:270
-#: languages/ruby/debugger/breakpoint.cpp:127
-msgid "Pending (add)"
+#: languages/cpp/app_templates/kdevpart/kdevpart_part.cpp:94
+#: languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp:94
+msgid "&Do Something..."
 msgstr ""
 
-#: languages/cpp/debugger/breakpoint.cpp:272
-#: languages/ruby/debugger/breakpoint.cpp:129
-msgid "Pending (clear)"
+#: languages/cpp/app_templates/kdevpart/kdevpart_part.cpp:96
+#: languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp:96
+#, fuzzy
+msgid "Do something"
+msgstr "Ychwanegwch rywbeth yma"
+
+#: languages/cpp/app_templates/kdevpart/kdevpart_part.cpp:97
+#: languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp:97
+msgid "<b>Do something</b><p>Describe here what does this action do."
 msgstr ""
 
-#: languages/cpp/debugger/breakpoint.cpp:274
-#: languages/ruby/debugger/breakpoint.cpp:131
-msgid "Pending (modify)"
+#: languages/cpp/app_templates/kdevpart/kdevpart_part.cpp:180
+#: languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp:180
+msgid "This action does nothing."
 msgstr ""
 
-#: languages/cpp/debugger/breakpoint.cpp:278
-#: languages/ruby/debugger/breakpoint.cpp:135
-msgid "Active"
-msgstr "Gweithredol"
+#: languages/cpp/app_templates/kdevpart/kdevpart_part.cpp:180
+#: languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp:180
+msgid "%{APPNAME} Plugin"
+msgstr ""
 
-#: languages/cpp/debugger/breakpoint.cpp:421
-#: languages/cpp/debugger/gdbbreakpointwidget.cpp:227
-msgid ""
-"_: Code breakpoint\n"
-"Code"
+#: languages/cpp/app_templates/dcopservice/main.cpp:12
+#: languages/cpp/app_templates/kdedcop/main.cpp:10
+#: languages/cpp/app_templates/khello/main.cpp:10
+#: languages/cpp/app_templates/khello2/main.cpp:10
+#: languages/cpp/app_templates/kpartapp/main.cpp:9
+msgid "A TDE KPart Application"
+msgstr "Cymhwysiad KPart TDE"
+
+#: languages/cpp/app_templates/kmake/mainviewimp.cpp:17
+msgid "Hello there."
+msgstr ""
+
+#: languages/cpp/app_templates/kapp/main.cpp:11
+#: languages/cpp/app_templates/kmake/app.cpp:8
+#: languages/cpp/app_templates/kscons_kxt/main.cpp:10
+#: languages/cpp/app_templates/kxt/main.cpp:10
+#: languages/cpp/app_templates/tdeconfig35/main.cpp:10
+msgid "A TDE Application"
+msgstr "Cymhwysiad TDE"
+
+#: languages/cpp/app_templates/kapp/main.cpp:17
+#: languages/cpp/app_templates/kmake/app.cpp:14
+#: languages/cpp/app_templates/kpartapp/main.cpp:15
+#: languages/cpp/app_templates/kscons_kxt/main.cpp:16
+#: languages/cpp/app_templates/kscons_tdemdi/main.cpp:18
+#: languages/cpp/app_templates/kxt/main.cpp:16
+#: languages/cpp/app_templates/tdeconfig35/main.cpp:16
+msgid "Document to open"
+msgstr "Dogfen i'w hagor"
+
+#: languages/cpp/app_templates/kpartapp/app.cpp:55
+#: languages/cpp/app_templates/kscons_tdemdi/apptdemdiView.cpp:46
+#: languages/cpp/app_templates/kscons_tdemdi/apptdemdiView.cpp:53
+msgid "Could not find our part."
+msgstr "Methu canfod ein rhan."
+
+#: languages/cpp/app_templates/kpartapp/app_part.cpp:185
+msgid "%{APPNAME}Part"
+msgstr ""
+
+#: languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp:84
+msgid "Terminal"
+msgstr "Terfynell"
+
+#: languages/cpp/app_templates/kscons_kxt/app.cpp:72
+#: languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp:130
+msgid "This shows useful tips on the use of this application."
+msgstr "Dengys hwn gynghorion defnyddiol ar ddefnydd y cymhwysiad yma."
+
+#: languages/cpp/app_templates/kscons_tdemdi/app_part.cpp:56
+msgid "%{APPNAMELC}Part"
+msgstr ""
+
+#: languages/cpp/app_templates/kscons_tdemdi/main.cpp:12
+msgid "A simple tdemdi app"
+msgstr ""
+
+#: languages/cpp/app_templates/kde4app/kapp4view.cpp:39
+#: languages/cpp/app_templates/kscons_kxt/appview.cpp:37
+#: languages/cpp/app_templates/kxt/appview.cpp:37
+#: languages/cpp/app_templates/tdeconfig35/appview.cpp:37
+msgid "Settings changed"
+msgstr ""
+
+#: languages/cpp/app_templates/kde4app/kapp4.cpp:56
+#: languages/cpp/app_templates/kscons_kxt/app.cpp:79
+#: languages/cpp/app_templates/kxt/app.cpp:74
+#: languages/cpp/app_templates/tdeconfig35/app.cpp:56
+msgid "Swi&tch Colors"
+msgstr ""
+
+#: languages/cpp/app_templates/kde4app/main.cpp:10
+#, fuzzy
+msgid "A KDE 4 Application"
+msgstr "Cymhwysiad TDE"
+
+#: languages/cpp/app_templates/kicker/applet.cpp:33
+msgid "This is an about box"
+msgstr ""
+
+#: languages/cpp/app_templates/kicker/applet.cpp:39
+msgid "This is a help box"
 msgstr ""
 
+#: languages/cpp/app_templates/kicker/applet.cpp:45
+msgid "This is a preferences box"
+msgstr ""
+
+#: languages/cpp/app_templates/noatunui/plugin_impl.cpp:50
+msgid "Play"
+msgstr "Chwarae"
+
+#: languages/cpp/app_templates/noatunui/plugin_impl.cpp:56
+#: lib/widgets/kdevhtmlpart.cpp:64 lib/widgets/kdevhtmlpart.cpp:68
+#: src/partcontroller.cpp:171 src/partcontroller.cpp:173
+msgid "Forward"
+msgstr "Ymlaen"
+
+#: languages/cpp/app_templates/noatunui/plugin_impl.cpp:63
+msgid "Playlist"
+msgstr "Rhestr chwarae:"
+
+#: languages/cpp/app_templates/noatunui/plugin_impl.cpp:69
+msgid "Change loop style"
+msgstr ""
+
+#: languages/cpp/app_templates/noatunui/plugin_impl.cpp:98
+#: languages/cpp/app_templates/noatunui/plugin_impl.cpp:206
+msgid "No File Loaded"
+msgstr "Heb Lwytho Ffeil"
+
+#: languages/cpp/app_templates/noatunui/plugin_impl.cpp:251
+msgid "No looping"
+msgstr ""
+
+#: languages/cpp/app_templates/noatunui/plugin_impl.cpp:255
+msgid "Song looping"
+msgstr ""
+
+#: languages/cpp/app_templates/noatunui/plugin_impl.cpp:259
+msgid "Playlist looping"
+msgstr ""
+
+#: languages/cpp/app_templates/noatunui/plugin_impl.cpp:263
+msgid "Random play"
+msgstr ""
+
+#: languages/cpp/app_templates/kpartplugin/plugin_app.cpp:16
+msgid "&Plugin Action"
+msgstr ""
+
+#: languages/cpp/app_templates/kpartplugin/plugin_app.cpp:32
+msgid "Cannot Translate Source"
+msgstr "Methu Cyfieithu'r Testun Tarddiad"
+
+#: languages/cpp/app_templates/kpartplugin/plugin_app.cpp:33
+msgid "You cannot translate anything except web pages with this plugin."
+msgstr ""
+
+#: languages/cpp/app_templates/kpartplugin/plugin_app.cpp:53
+msgid "The URL you entered is not valid, please correct it and try again"
+msgstr "Nid yw'r URL a fewnosodwyd yn ddilys; cywirwch fo a ceisiwch eto"
+
+#: languages/cpp/app_templates/kateplugin/plugin_app.cpp:57
+#: languages/cpp/app_templates/kateplugin2/plugin_app.cpp:61
+msgid "Insert Hello World"
+msgstr "Mewnosod Bore Da, Byd!"
+
+#: languages/cpp/app_templates/tdefileplugin/tdefile_plugin.cpp:26
+msgid "%{APPNAME} Information"
+msgstr ""
+
+#: languages/cpp/app_templates/tdefileplugin/tdefile_plugin.cpp:31
+msgid "Items"
+msgstr "Eitemau"
+
+#: languages/cpp/app_templates/dcopservice/main.cpp:24
+msgid "TDE"
+msgstr "TDE"
+
+#: languages/cpp/app_templates/dcopservice/main.cpp:27
+msgid "Developer"
+msgstr "Datblygwr"
+
+#: languages/cpp/app_templates/kscons_kxt/appview.cpp:36
+#: languages/cpp/app_templates/kxt/appview.cpp:36
+#: languages/cpp/app_templates/tdeconfig35/appview.cpp:36
+msgid "This project is %1 days old"
+msgstr ""
+
+#: languages/cpp/app_templates/kapp/pref.cpp:11
+msgid "%{APPNAME} Preferences"
+msgstr ""
+
+#: languages/cpp/app_templates/kapp/pref.cpp:18
+msgid "First Page"
+msgstr "Tudalen Gyntaf"
+
+#: languages/cpp/app_templates/kapp/pref.cpp:18
+msgid "Page One Options"
+msgstr "Dewisiadau'r Dudalen Gyntaf"
+
+#: languages/cpp/app_templates/kapp/pref.cpp:21
+msgid "Second Page"
+msgstr "Ail Dudalen"
+
+#: languages/cpp/app_templates/kapp/pref.cpp:21
+msgid "Page Two Options"
+msgstr "Dewisiadau'r Ail Dudalen"
+
+#: languages/cpp/app_templates/kapp/pref.cpp:31
+#: languages/cpp/app_templates/kapp/pref.cpp:40
+msgid "Add something here"
+msgstr "Ychwanegwch rywbeth yma"
+
+#: languages/cpp/app_templates/kapp/appview.cpp:62
+msgid "Could not find a suitable HTML component"
+msgstr ""
+
+#: languages/cpp/app_templates/kapp/app.cpp:102
+msgid "Cus&tom Menuitem"
+msgstr ""
+
+#: languages/cpp/app_templates/kapp/app.cpp:179
+msgid "Open Location"
+msgstr "Agor Lleoliad"
+
+#: languages/cpp/app_templates/tdeioslave/slave.cpp:51
+#: vcs/subversion/svn_tdeio.cpp:249
+msgid "Looking for %1..."
+msgstr ""
+
+#: languages/cpp/app_templates/tdecmodule/module.cpp:62
+msgid "Helpful information about the %{APPNAMELC} module."
+msgstr ""
+
+#: languages/cpp/app_templates/kofficepart/main.cpp:17
+msgid "File to open"
+msgstr "Ffeil i agor"
+
+#: languages/cpp/debugger/stty.cpp:332 languages/ruby/debugger/stty.cpp:316
+msgid "tdevelop: Debug application console"
+msgstr ""
+
+#: languages/cpp/debugger/framestackwidget.cpp:561
+#, fuzzy, c-format
+msgid "Thread %1"
+msgstr "Targed: %1"
+
 #: languages/cpp/debugger/debuggerpart.cpp:106
 #: languages/ruby/debugger/debuggerpart.cpp:110
 msgid "Breakpoint List"
@@ -15089,7 +15088,7 @@ msgid ""
 msgstr ""
 
 #: languages/cpp/debugger/debuggerpart.cpp:399
-msgid "Debug in &KDevelop"
+msgid "Debug in &TDevelop"
 msgstr ""
 
 #: languages/cpp/debugger/debuggerpart.cpp:513
@@ -15248,309 +15247,6 @@ msgid ""
 "Restarts the program in the debugger"
 msgstr ""
 
-#: languages/cpp/debugger/dbgtoolbar.cpp:112
-#: languages/cpp/debugger/dbgtoolbar.cpp:245
-#: languages/ruby/debugger/dbgtoolbar.cpp:118
-#: languages/ruby/debugger/dbgtoolbar.cpp:244
-msgid "Debug Toolbar"
-msgstr ""
-
-#: languages/cpp/debugger/dbgtoolbar.cpp:113
-#: languages/ruby/debugger/dbgtoolbar.cpp:119
-msgid "Dock to Panel"
-msgstr ""
-
-#: languages/cpp/debugger/dbgtoolbar.cpp:115
-#: languages/ruby/debugger/dbgtoolbar.cpp:121
-msgid "Dock to Panel && Iconify KDevelop"
-msgstr ""
-
-#: languages/cpp/debugger/dbgtoolbar.cpp:225
-msgid "KDevelop debugger: Click to execute one line of code (\"step\")"
-msgstr ""
-
-#: languages/cpp/debugger/dbgtoolbar.cpp:246
-#: languages/ruby/debugger/dbgtoolbar.cpp:245
-msgid "Activate"
-msgstr "Gweithredoli"
-
-#: languages/cpp/debugger/dbgtoolbar.cpp:247
-#: languages/ruby/debugger/dbgtoolbar.cpp:246
-msgid "Activate (KDevelop gets focus)"
-msgstr ""
-
-#: languages/cpp/debugger/dbgtoolbar.cpp:307
-#: languages/ruby/debugger/dbgtoolbar.cpp:304
-msgid "Step Out"
-msgstr ""
-
-#: languages/cpp/debugger/dbgtoolbar.cpp:308
-#: languages/ruby/debugger/dbgtoolbar.cpp:305
-msgid "Run to Cursor"
-msgstr ""
-
-#: languages/cpp/debugger/dbgtoolbar.cpp:325
-#: languages/ruby/debugger/dbgtoolbar.cpp:318
-msgid "Continue with application execution, may start the application"
-msgstr ""
-
-#: languages/cpp/debugger/dbgtoolbar.cpp:326
-#: languages/ruby/debugger/dbgtoolbar.cpp:319
-msgid "Interrupt the application execution"
-msgstr ""
-
-#: languages/cpp/debugger/dbgtoolbar.cpp:327
-msgid "Execute one line of code, but run through functions"
-msgstr ""
-
-#: languages/cpp/debugger/dbgtoolbar.cpp:328
-msgid "Execute one assembler instruction, but run through functions"
-msgstr ""
-
-#: languages/cpp/debugger/dbgtoolbar.cpp:329
-msgid "Execute one line of code, stepping into functions if appropriate"
-msgstr ""
-
-#: languages/cpp/debugger/dbgtoolbar.cpp:330
-msgid ""
-"Execute one assembler instruction, stepping into functions if appropriate"
-msgstr ""
-
-#: languages/cpp/debugger/dbgtoolbar.cpp:331
-#: languages/ruby/debugger/dbgtoolbar.cpp:322
-msgid "Execute to end of current stack frame"
-msgstr ""
-
-#: languages/cpp/debugger/dbgtoolbar.cpp:332
-#: languages/cpp/debugger/dbgtoolbar.cpp:344
-#: languages/ruby/debugger/dbgtoolbar.cpp:323
-#: languages/ruby/debugger/dbgtoolbar.cpp:334
-msgid "Continues execution until the cursor position is reached."
-msgstr ""
-
-#: languages/cpp/debugger/dbgtoolbar.cpp:333
-msgid "Memory, dissemble, registers, library viewers"
-msgstr ""
-
-#: languages/cpp/debugger/dbgtoolbar.cpp:334
-#: languages/ruby/debugger/dbgtoolbar.cpp:324
-msgid "Set focus on KDevelop"
-msgstr ""
-
-#: languages/cpp/debugger/dbgtoolbar.cpp:335
-#: languages/ruby/debugger/dbgtoolbar.cpp:325
-msgid "Set focus on window that had focus when KDevelop got focus"
-msgstr ""
-
-#: languages/cpp/debugger/dbgtoolbar.cpp:337
-#: languages/ruby/debugger/dbgtoolbar.cpp:327
-msgid "Continue with application execution. May start the application."
-msgstr ""
-
-#: languages/cpp/debugger/dbgtoolbar.cpp:338
-#: languages/ruby/debugger/dbgtoolbar.cpp:328
-msgid "Interrupt the application execution."
-msgstr ""
-
-#: languages/cpp/debugger/dbgtoolbar.cpp:339
-msgid "Execute one line of code, but run through functions."
-msgstr ""
-
-#: languages/cpp/debugger/dbgtoolbar.cpp:340
-msgid "Execute one assembler instruction, but run through functions."
-msgstr ""
-
-#: languages/cpp/debugger/dbgtoolbar.cpp:341
-msgid "Execute one line of code, stepping into functions if appropriate."
-msgstr ""
-
-#: languages/cpp/debugger/dbgtoolbar.cpp:342
-msgid ""
-"Execute one assembler instruction, stepping into functions if appropriate."
-msgstr ""
-
-#: languages/cpp/debugger/dbgtoolbar.cpp:343
-#: languages/ruby/debugger/dbgtoolbar.cpp:333
-msgid "Execute to end of current stack frame."
-msgstr ""
-
-#: languages/cpp/debugger/dbgtoolbar.cpp:345
-msgid "Memory, dissemble, registers, library viewers."
-msgstr ""
-
-#: languages/cpp/debugger/dbgtoolbar.cpp:346
-#: languages/ruby/debugger/dbgtoolbar.cpp:335
-msgid "Set focus on KDevelop."
-msgstr ""
-
-#: languages/cpp/debugger/dbgtoolbar.cpp:347
-#: languages/ruby/debugger/dbgtoolbar.cpp:336
-msgid "Set focus on window that had focus when KDevelop got focus."
-msgstr ""
-
-#: languages/cpp/debugger/gdbcontroller.cpp:296
-#, c-format
-msgid ""
-"<b>Gdb command sent when debugger is not running</b>"
-"<br>The command was:"
-"<br> %1"
-msgstr ""
-
-#: languages/cpp/debugger/dbgpsdlg.cpp:176
-#: languages/cpp/debugger/gdbcontroller.cpp:298
-#: languages/cpp/debugger/variablewidget.cpp:766
-#, fuzzy
-msgid "Internal error"
-msgstr "Gwall Mewnol"
-
-#: languages/cpp/debugger/gdbcontroller.cpp:391
-msgid "<b>Invalid debugger command</b><br>"
-msgstr ""
-
-#: languages/cpp/debugger/gdbcontroller.cpp:393
-msgid "Invalid debugger command"
-msgstr ""
-
-#: languages/cpp/debugger/gdbcontroller.cpp:484
-msgid ""
-"<b>Invalid gdb reply</b>"
-"<p>The 'stopped' packet does not include the 'reason' field'."
-msgstr ""
-
-#: languages/cpp/debugger/gdbcontroller.cpp:486
-msgid "The gdb reply is: bla-bla-bla"
-msgstr ""
-
-#: languages/cpp/debugger/gdbcontroller.cpp:487
-#: languages/cpp/debugger/gdbcontroller.cpp:722
-msgid "Invalid gdb reply"
-msgstr ""
-
-#: languages/cpp/debugger/gdbcontroller.cpp:502
-#, c-format
-msgid "Exited on signal %1"
-msgstr ""
-
-#: languages/cpp/debugger/gdbcontroller.cpp:556
-msgid "Program received signal %1 (%2)"
-msgstr ""
-
-#: languages/cpp/debugger/gdbcontroller.cpp:558
-#, fuzzy
-msgid "Received signal"
-msgstr "Derbynnydd"
-
-#: languages/cpp/debugger/gdbcontroller.cpp:649
-msgid ""
-"gdb message:\n"
-msgstr ""
-
-#: languages/cpp/debugger/gdbcontroller.cpp:691
-msgid "No such file or directory."
-msgstr ""
-
-#: languages/cpp/debugger/gdbcontroller.cpp:715
-msgid ""
-"Invalid gdb reply\n"
-"Command was: %1\n"
-"Response is: %2\n"
-"Invalid response kind: \"%3\""
-msgstr ""
-
-#: languages/cpp/debugger/gdbcontroller.cpp:846
-msgid ""
-"<b>Could not start debugger.</b>"
-"<p>Could not run '%1'. Make sure that the path name is specified correctly."
-msgstr ""
-
-#: languages/cpp/debugger/gdbcontroller.cpp:850
-msgid "Could not start debugger"
-msgstr ""
-
-#: languages/cpp/debugger/gdbcontroller.cpp:1046
-#: languages/ruby/debugger/rdbcontroller.cpp:836
-msgid "Debugger stopped"
-msgstr ""
-
-#: languages/cpp/debugger/gdbcontroller.cpp:1111
-msgid ""
-"GDB cannot use the tty* or pty* devices.\n"
-"Check the settings on /dev/tty* and /dev/pty*\n"
-"As root you may need to \"chmod ug+rw\" tty* and pty* devices and/or add the "
-"user to the tty group using \"usermod -G tty username\"."
-msgstr ""
-
-#: languages/cpp/debugger/gdbcontroller.cpp:1157
-msgid ""
-"<b>Application does not exist</b>"
-"<p>The application you're trying to debug,"
-"<br>    %1\n"
-"<br>does not exist. Check that you've specified the right application in the "
-"debugger configuration."
-msgstr ""
-
-#: languages/cpp/debugger/gdbcontroller.cpp:1163
-#, fuzzy
-msgid "Application does not exist"
-msgstr "&Cymhwysiadau:"
-
-#: languages/cpp/debugger/gdbcontroller.cpp:1175
-msgid ""
-"<b>Could not run application '%1'.</b>"
-"<p>The application does not have the executable bit set. Try rebuilding the "
-"project, or change permissions manually."
-msgstr ""
-
-#: languages/cpp/debugger/gdbcontroller.cpp:1180
-#, fuzzy
-msgid "Could not run application"
-msgstr "Cymhwysiannau Hysbys"
-
-#: languages/cpp/debugger/gdbcontroller.cpp:1355
-#: languages/cpp/debugger/gdbcontroller.cpp:1725
-#: languages/ruby/debugger/rdbcontroller.cpp:1286
-msgid "Process exited"
-msgstr ""
-
-#: languages/cpp/debugger/gdbcontroller.cpp:1362
-msgid "<b>Debugger error</b><p>Debugger reported the following error:<p><tt>"
-msgstr ""
-
-#: languages/cpp/debugger/gdbcontroller.cpp:1365
-#: languages/cpp/debugger/variablewidget.cpp:901
-#, fuzzy
-msgid "Debugger error"
-msgstr "Dadnamydd"
-
-#: languages/cpp/debugger/gdbcontroller.cpp:1590
-msgid ""
-"_: <b>Internal debugger error</b>\n"
-"<p>The debugger component encountered internal error while processing reply "
-"from gdb. Please submit a bug report."
-msgstr ""
-
-#: languages/cpp/debugger/gdbcontroller.cpp:1592
-msgid ""
-"The exception is: %1\n"
-"The MI response is: %2"
-msgstr ""
-
-#: languages/cpp/debugger/gdbcontroller.cpp:1594
-#, fuzzy
-msgid "Internal debugger error"
-msgstr "Gwall Mewnol"
-
-#: languages/cpp/debugger/dbgpsdlg.cpp:173
-msgid ""
-"<b>Could not parse output from the <tt>ps</tt> command!</b>"
-"<p>The following line could not be parsed:<b><tt>%1</tt>"
-msgstr ""
-
-#: languages/cpp/debugger/framestackwidget.cpp:539
-#, fuzzy, c-format
-msgid "Thread %1"
-msgstr "Targed: %1"
-
 #: languages/cpp/debugger/gdbbreakpointwidget.cpp:180
 #: languages/ruby/debugger/rdbbreakpointwidget.cpp:158
 msgid " temporary"
@@ -15568,7 +15264,7 @@ msgstr "Cyflwr"
 #: kdevdesigner/designer/outputwindow.cpp:86
 #: languages/cpp/debugger/gdbbreakpointwidget.cpp:220
 #: languages/ruby/debugger/rdbbreakpointwidget.cpp:232
-#: parts/fileview/filegroupswidget.cpp:311
+#: parts/fileview/filegroupswidget.cpp:312
 msgid "Location"
 msgstr "Lleoliad"
 
@@ -15589,6 +15285,13 @@ msgstr "Trawiadau"
 msgid "Tracing"
 msgstr "creu"
 
+#: languages/cpp/debugger/breakpoint.cpp:421
+#: languages/cpp/debugger/gdbbreakpointwidget.cpp:227
+msgid ""
+"_: Code breakpoint\n"
+"Code"
+msgstr ""
+
 #: languages/cpp/debugger/gdbbreakpointwidget.cpp:229
 msgid ""
 "_: Data breakpoint\n"
@@ -15648,29 +15351,54 @@ msgstr ""
 msgid "Enable"
 msgstr "Galluogi"
 
-#: languages/cpp/debugger/gdboutputwidget.cpp:57
-msgid "&GDB cmd:"
+#: languages/cpp/debugger/memviewdlg.cpp:94
+#, fuzzy
+msgid "Start"
+msgstr "&Dechrau:"
+
+#: languages/cpp/debugger/memviewdlg.cpp:100
+#, fuzzy
+msgid "Amount"
+msgstr "Ymysgogol"
+
+#: languages/cpp/debugger/memviewdlg.cpp:139
+#, fuzzy
+msgid "Memory view"
+msgstr "Cof"
+
+#: languages/cpp/debugger/memviewdlg.cpp:346
+msgid "Change memory range"
 msgstr ""
 
-#: languages/cpp/debugger/gdboutputwidget.cpp:73
-msgid "Pause execution of the app to enter gdb commands"
+#: languages/cpp/debugger/memviewdlg.cpp:355
+#, fuzzy
+msgid "Close this view"
+msgstr "Gweithredoedd d&ewisiedig:"
+
+#: languages/cpp/debugger/breakpoint.cpp:265
+#: languages/ruby/debugger/breakpoint.cpp:122
+msgid "Disabled"
+msgstr "Analluogir"
+
+#: languages/cpp/debugger/breakpoint.cpp:270
+#: languages/ruby/debugger/breakpoint.cpp:127
+msgid "Pending (add)"
 msgstr ""
 
-#: languages/cpp/debugger/gdboutputwidget.cpp:326
-msgid "Show Internal Commands"
+#: languages/cpp/debugger/breakpoint.cpp:272
+#: languages/ruby/debugger/breakpoint.cpp:129
+msgid "Pending (clear)"
 msgstr ""
 
-#: languages/cpp/debugger/gdboutputwidget.cpp:334
-msgid ""
-"Controls if commands issued internally by KDevelop will be shown or not."
-"<br>This option will affect only future commands, it won't add or remove "
-"already issued commands from the view."
+#: languages/cpp/debugger/breakpoint.cpp:274
+#: languages/ruby/debugger/breakpoint.cpp:131
+msgid "Pending (modify)"
 msgstr ""
 
-#: languages/cpp/debugger/gdboutputwidget.cpp:339
-#, fuzzy
-msgid "Copy All"
-msgstr "Cau Popeth"
+#: languages/cpp/debugger/breakpoint.cpp:278
+#: languages/ruby/debugger/breakpoint.cpp:135
+msgid "Active"
+msgstr "Gweithredol"
 
 #: languages/cpp/debugger/variablewidget.cpp:84
 #: languages/ruby/debugger/debuggerpart.cpp:95
@@ -15787,229 +15515,364 @@ msgstr "&Mynegiad rheolaidd :"
 msgid "Locals"
 msgstr "Lleol"
 
+#: languages/cpp/debugger/dbgpsdlg.cpp:176
+#: languages/cpp/debugger/gdbcontroller.cpp:298
+#: languages/cpp/debugger/variablewidget.cpp:766
+#, fuzzy
+msgid "Internal error"
+msgstr "Gwall Mewnol"
+
 #: languages/cpp/debugger/variablewidget.cpp:900
 msgid "<b>Debugger error</b><br>"
 msgstr ""
 
+#: languages/cpp/debugger/gdbcontroller.cpp:1365
+#: languages/cpp/debugger/variablewidget.cpp:901
+#, fuzzy
+msgid "Debugger error"
+msgstr "Dadnamydd"
+
 #: languages/cpp/debugger/variablewidget.cpp:1984
 #: languages/ruby/debugger/variablewidget.cpp:909
 msgid "Watch"
 msgstr "Gwylio"
 
-#: languages/cpp/debugger/memviewdlg.cpp:94
-#, fuzzy
-msgid "Start"
-msgstr "&Dechrau:"
+#: languages/cpp/debugger/dbgpsdlg.cpp:173
+msgid ""
+"<b>Could not parse output from the <tt>ps</tt> command.</b>"
+"<p>The following line could not be parsed:<b><tt>%1</tt>"
+msgstr ""
 
-#: languages/cpp/debugger/memviewdlg.cpp:100
-#, fuzzy
-msgid "Amount"
-msgstr "Ymysgogol"
+#: languages/cpp/debugger/gdbcontroller.cpp:296
+#, c-format
+msgid ""
+"<b>Gdb command sent when debugger is not running</b>"
+"<br>The command was:"
+"<br> %1"
+msgstr ""
 
-#: languages/cpp/debugger/memviewdlg.cpp:139
-#, fuzzy
-msgid "Memory view"
-msgstr "Cof"
+#: languages/cpp/debugger/gdbcontroller.cpp:391
+msgid "<b>Invalid debugger command</b><br>"
+msgstr ""
 
-#: languages/cpp/debugger/memviewdlg.cpp:346
-msgid "Change memory range"
+#: languages/cpp/debugger/gdbcontroller.cpp:393
+msgid "Invalid debugger command"
 msgstr ""
 
-#: languages/cpp/debugger/memviewdlg.cpp:355
-#, fuzzy
-msgid "Close this view"
-msgstr "Gweithredoedd d&ewisiedig:"
+#: languages/cpp/debugger/gdbcontroller.cpp:484
+msgid ""
+"<b>Invalid gdb reply</b>"
+"<p>The 'stopped' packet does not include the 'reason' field'."
+msgstr ""
 
-#: languages/cpp/debugger/stty.cpp:333 languages/ruby/debugger/stty.cpp:317
-msgid "tdevelop: Debug application console"
+#: languages/cpp/debugger/gdbcontroller.cpp:486
+msgid "The gdb reply is: bla-bla-bla"
 msgstr ""
 
-#: languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp:115
-msgid ""
-"This doesn't appear to be a valid Qt3 include directory.\n"
-"Please select a different directory."
+#: languages/cpp/debugger/gdbcontroller.cpp:487
+#: languages/cpp/debugger/gdbcontroller.cpp:722
+msgid "Invalid gdb reply"
 msgstr ""
 
-#: languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp:92
-#: languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp:107
-#: languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp:115
+#: languages/cpp/debugger/gdbcontroller.cpp:502
+#, c-format
+msgid "Exited on signal %1"
+msgstr ""
+
+#: languages/cpp/debugger/gdbcontroller.cpp:556
+msgid "Program received signal %1 (%2)"
+msgstr ""
+
+#: languages/cpp/debugger/gdbcontroller.cpp:558
 #, fuzzy
-msgid "Invalid Directory"
-msgstr "Cyfeiriadur"
+msgid "Received signal"
+msgstr "Derbynnydd"
 
-#: languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp:92
+#: languages/cpp/debugger/gdbcontroller.cpp:649
 msgid ""
-"This doesn't appear to be a valid TDE include directory.\n"
-"Please select a different directory."
+"gdb message:\n"
 msgstr ""
 
-#: languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp:107
+#: languages/cpp/debugger/gdbcontroller.cpp:691
+msgid "No such file or directory."
+msgstr ""
+
+#: languages/cpp/debugger/gdbcontroller.cpp:715
 msgid ""
-"This doesn't appear to be a valid Qt4 include directory.\n"
-"Please select a different directory."
+"Invalid gdb reply\n"
+"Command was: %1\n"
+"Response is: %2\n"
+"Invalid response kind: \"%3\""
 msgstr ""
 
-#: languages/cpp/pcsimporter/customimporter/settingsdialog.cpp:44
-msgid "Directories to Parse"
+#: languages/cpp/debugger/gdbcontroller.cpp:846
+msgid ""
+"<b>Could not start debugger.</b>"
+"<p>Could not run '%1'. Make sure that the path name is specified correctly."
 msgstr ""
 
-#: languages/lib/designer_integration/implementationwidget.cpp:80
-#, c-format
-msgid "Create or Select Implementation Class for: %1"
+#: languages/cpp/debugger/gdbcontroller.cpp:850
+msgid "Could not start debugger"
 msgstr ""
 
-#: languages/lib/designer_integration/implementationwidget.cpp:82
-msgid "Namespaces &amp;&amp; Classes"
+#: languages/cpp/debugger/gdbcontroller.cpp:1046
+#: languages/ruby/debugger/rdbcontroller.cpp:836
+msgid "Debugger stopped"
 msgstr ""
 
-#: languages/lib/designer_integration/implementationwidget.cpp:126
-msgid "Class was created but not found in class store."
+#: languages/cpp/debugger/gdbcontroller.cpp:1111
+msgid ""
+"GDB cannot use the tty* or pty* devices.\n"
+"Check the settings on /dev/tty* and /dev/pty*\n"
+"As root you may need to \"chmod ug+rw\" tty* and pty* devices and/or add the "
+"user to the tty group using \"usermod -G tty username\"."
 msgstr ""
 
-#: languages/lib/designer_integration/qtdesignerintegration.cpp:63
-#, c-format
-msgid "Cannot find implementation class for form: %1"
+#: languages/cpp/debugger/gdbcontroller.cpp:1157
+msgid ""
+"<b>Application does not exist</b>"
+"<p>The application you are trying to debug,"
+"<br>    %1\n"
+"<br>does not exist. Check that you have specified the right application in the "
+"debugger configuration."
 msgstr ""
 
-#: languages/lib/debugger/debugger.cpp:198
-msgid "Breakpoint"
+#: languages/cpp/debugger/gdbcontroller.cpp:1163
+#, fuzzy
+msgid "Application does not exist"
+msgstr "&Cymhwysiadau:"
+
+#: languages/cpp/debugger/gdbcontroller.cpp:1175
+msgid ""
+"<b>Could not run application '%1'.</b>"
+"<p>The application does not have the executable bit set. Try rebuilding the "
+"project, or change permissions manually."
 msgstr ""
 
-#: languages/php/phperrorview.cpp:375
+#: languages/cpp/debugger/gdbcontroller.cpp:1180
 #, fuzzy
-msgid "Undefined function"
-msgstr "Defn&yddio ffwythiant:"
+msgid "Could not run application"
+msgstr "Cymhwysiannau Hysbys"
 
-#: languages/php/phperrorview.cpp:378
+#: languages/cpp/debugger/gdbcontroller.cpp:1355
+#: languages/cpp/debugger/gdbcontroller.cpp:1725
+#: languages/ruby/debugger/rdbcontroller.cpp:1286
+msgid "Process exited"
+msgstr ""
+
+#: languages/cpp/debugger/gdbcontroller.cpp:1362
+msgid "<b>Debugger error</b><p>Debugger reported the following error:<p><tt>"
+msgstr ""
+
+#: languages/cpp/debugger/gdbcontroller.cpp:1590
+msgid ""
+"_: <b>Internal debugger error</b>\n"
+"<p>The debugger component encountered an internal error while processing a "
+"reply from gdb. Please submit a bug report."
+msgstr ""
+
+#: languages/cpp/debugger/gdbcontroller.cpp:1592
+msgid ""
+"The exception is: %1\n"
+"The MI response is: %2"
+msgstr ""
+
+#: languages/cpp/debugger/gdbcontroller.cpp:1594
 #, fuzzy
-msgid "Parse Error"
+msgid "Internal debugger error"
 msgstr "Gwall Mewnol"
 
-#: languages/php/phpsupportpart.cpp:95
-msgid "<b>Run</b><p>Executes script on a terminal or a webserver."
+#: languages/cpp/debugger/dbgtoolbar.cpp:112
+#: languages/cpp/debugger/dbgtoolbar.cpp:245
+#: languages/ruby/debugger/dbgtoolbar.cpp:118
+#: languages/ruby/debugger/dbgtoolbar.cpp:244
+msgid "Debug Toolbar"
 msgstr ""
 
-#: languages/php/phpsupportpart.cpp:97
-msgid "&New Class..."
+#: languages/cpp/debugger/dbgtoolbar.cpp:113
+#: languages/ruby/debugger/dbgtoolbar.cpp:119
+msgid "Dock to Panel"
 msgstr ""
 
-#: languages/php/phpsupportpart.cpp:100
-msgid "New class"
+#: languages/cpp/debugger/dbgtoolbar.cpp:115
+#: languages/ruby/debugger/dbgtoolbar.cpp:121
+msgid "Dock to Panel && Iconify TDevelop"
 msgstr ""
 
-#: languages/php/phpsupportpart.cpp:101
-msgid "<b>New class</b><p>Runs New Class wizard."
+#: languages/cpp/debugger/dbgtoolbar.cpp:225
+msgid "TDevelop debugger: Click to execute one line of code (\"step\")"
 msgstr ""
 
-#: languages/php/phpsupportpart.cpp:106
-msgid ""
-"<b>PHP problems</b>"
-"<p>This view shows PHP parser warnings, errors, and fatal errors."
+#: languages/cpp/debugger/dbgtoolbar.cpp:246
+#: languages/ruby/debugger/dbgtoolbar.cpp:245
+msgid "Activate"
+msgstr "Gweithredoli"
+
+#: languages/cpp/debugger/dbgtoolbar.cpp:247
+#: languages/ruby/debugger/dbgtoolbar.cpp:246
+msgid "Activate (TDevelop gets focus)"
 msgstr ""
 
-#: languages/php/phpsupportpart.cpp:118 languages/php/phpsupportpart.cpp:333
-msgid "PHP"
-msgstr "PHP"
+#: languages/cpp/debugger/dbgtoolbar.cpp:307
+#: languages/ruby/debugger/dbgtoolbar.cpp:304
+msgid "Step Out"
+msgstr ""
 
-#: languages/php/phpsupportpart.cpp:211
-msgid "PHP Specific"
+#: languages/cpp/debugger/dbgtoolbar.cpp:308
+#: languages/ruby/debugger/dbgtoolbar.cpp:305
+msgid "Run to Cursor"
 msgstr ""
 
-#: languages/php/phpsupportpart.cpp:211 languages/php/phpsupportpart.cpp:243
-msgid "PHP Settings"
+#: languages/cpp/debugger/dbgtoolbar.cpp:325
+#: languages/ruby/debugger/dbgtoolbar.cpp:318
+msgid "Continue with application execution, may start the application"
 msgstr ""
 
-#: languages/php/phpsupportpart.cpp:238
+#: languages/cpp/debugger/dbgtoolbar.cpp:326
+#: languages/ruby/debugger/dbgtoolbar.cpp:319
+msgid "Interrupt the application execution"
+msgstr ""
+
+#: languages/cpp/debugger/dbgtoolbar.cpp:327
+msgid "Execute one line of code, but run through functions"
+msgstr ""
+
+#: languages/cpp/debugger/dbgtoolbar.cpp:328
+msgid "Execute one assembler instruction, but run through functions"
+msgstr ""
+
+#: languages/cpp/debugger/dbgtoolbar.cpp:329
+msgid "Execute one line of code, stepping into functions if appropriate"
+msgstr ""
+
+#: languages/cpp/debugger/dbgtoolbar.cpp:330
 msgid ""
-"There is no configuration for executing a PHP file.\n"
-"Please set the correct values in the next dialog."
+"Execute one assembler instruction, stepping into functions if appropriate"
 msgstr ""
 
-#: languages/php/phpsupportpart.cpp:239
-msgid "Customize PHP Mode"
+#: languages/cpp/debugger/dbgtoolbar.cpp:331
+#: languages/ruby/debugger/dbgtoolbar.cpp:322
+msgid "Execute to end of current stack frame"
 msgstr ""
 
-#: languages/php/phpcodecompletion.cpp:709
-msgid "Type of %1 is %2"
+#: languages/cpp/debugger/dbgtoolbar.cpp:332
+#: languages/cpp/debugger/dbgtoolbar.cpp:344
+#: languages/ruby/debugger/dbgtoolbar.cpp:323
+#: languages/ruby/debugger/dbgtoolbar.cpp:334
+msgid "Continues execution until the cursor position is reached."
 msgstr ""
 
-#: languages/sql/sqlactions.cpp:83
-msgid "<no database server>"
+#: languages/cpp/debugger/dbgtoolbar.cpp:333
+msgid "Memory, dissemble, registers, library viewers"
 msgstr ""
 
-#: languages/sql/sqlactions.cpp:91
-msgid "<error - no connection %1>"
+#: languages/cpp/debugger/dbgtoolbar.cpp:334
+#: languages/ruby/debugger/dbgtoolbar.cpp:324
+msgid "Set focus on TDevelop"
 msgstr ""
 
-#: languages/sql/sqlsupport_part.cpp:45
-msgid "<b>Run</b><p>Executes a SQL script."
+#: languages/cpp/debugger/dbgtoolbar.cpp:335
+#: languages/ruby/debugger/dbgtoolbar.cpp:325
+msgid "Set focus on window that had focus when TDevelop got focus"
 msgstr ""
 
-#: languages/sql/sqlsupport_part.cpp:47
-msgid "&Database Connections"
+#: languages/cpp/debugger/dbgtoolbar.cpp:337
+#: languages/ruby/debugger/dbgtoolbar.cpp:327
+msgid "Continue with application execution. May start the application."
 msgstr ""
 
-#: languages/sql/sqlsupport_part.cpp:59
-msgid "Output of SQL commands"
+#: languages/cpp/debugger/dbgtoolbar.cpp:338
+#: languages/ruby/debugger/dbgtoolbar.cpp:328
+msgid "Interrupt the application execution."
 msgstr ""
 
-#: languages/sql/sqlsupport_part.cpp:60
+#: languages/cpp/debugger/dbgtoolbar.cpp:339
+msgid "Execute one line of code, but run through functions."
+msgstr ""
+
+#: languages/cpp/debugger/dbgtoolbar.cpp:340
+msgid "Execute one assembler instruction, but run through functions."
+msgstr ""
+
+#: languages/cpp/debugger/dbgtoolbar.cpp:341
+msgid "Execute one line of code, stepping into functions if appropriate."
+msgstr ""
+
+#: languages/cpp/debugger/dbgtoolbar.cpp:342
 msgid ""
-"<b>Output of SQL commands</b>"
-"<p>This window shows the output of SQL commands being executed. It can display "
-"results of SQL \"select\" commands in a table."
+"Execute one assembler instruction, stepping into functions if appropriate."
 msgstr ""
 
-#: languages/sql/sqlsupport_part.cpp:135
-msgid "Specify Your Database Connections"
+#: languages/cpp/debugger/dbgtoolbar.cpp:343
+#: languages/ruby/debugger/dbgtoolbar.cpp:333
+msgid "Execute to end of current stack frame."
 msgstr ""
 
-#: languages/sql/sqlsupport_part.cpp:167
-msgid "Please select a valid database connection."
+#: languages/cpp/debugger/dbgtoolbar.cpp:345
+msgid "Memory, dissemble, registers, library viewers."
 msgstr ""
 
-#: languages/sql/sqloutputwidget.cpp:81
-#, c-format
-msgid "No such connection: %1"
+#: languages/cpp/debugger/dbgtoolbar.cpp:346
+#: languages/ruby/debugger/dbgtoolbar.cpp:335
+msgid "Set focus on TDevelop."
 msgstr ""
 
-#: languages/sql/sqloutputwidget.cpp:104
-#, c-format
-msgid "Query successful, number of rows affected: %1"
+#: languages/cpp/debugger/dbgtoolbar.cpp:347
+#: languages/ruby/debugger/dbgtoolbar.cpp:336
+msgid "Set focus on window that had focus when TDevelop got focus."
 msgstr ""
 
-#: languages/sql/sqloutputwidget.cpp:111 languages/sql/sqloutputwidget.cpp:118
-msgid "An error occurred:"
-msgstr "Digwyddodd gwall :"
+#: languages/cpp/debugger/gdboutputwidget.cpp:57
+msgid "&GDB cmd:"
+msgstr ""
 
-#: languages/sql/sqloutputwidget.cpp:119
-msgid "Driver"
-msgstr "Gyrrydd"
+#: languages/cpp/debugger/gdboutputwidget.cpp:73
+msgid "Pause execution of the app to enter gdb commands"
+msgstr ""
 
-#: kdevdesigner/designer/hierarchyview.cpp:376
-#: languages/sql/sqloutputwidget.cpp:121
-msgid "Database"
-msgstr "Cronfa ddata"
+#: languages/cpp/debugger/gdboutputwidget.cpp:326
+msgid "Show Internal Commands"
+msgstr ""
 
-#: languages/bash/bashsupport_part.cpp:48
-#: languages/ruby/rubysupport_part.cpp:55
-msgid "<b>Run</b><p>Starts an application."
+#: languages/cpp/debugger/gdboutputwidget.cpp:334
+msgid ""
+"Controls if commands issued internally by KDevelop will be shown or not."
+"<br>This option will affect only future commands, it will not add or remove "
+"already issued commands from the view."
 msgstr ""
 
-#: languages/java/javasupportpart.cpp:164
-msgid "<b>New Class</b>Generates a new class.<p>"
+#: languages/cpp/debugger/gdboutputwidget.cpp:339
+#, fuzzy
+msgid "Copy All"
+msgstr "Cau Popeth"
+
+#: languages/cpp/pcsimporter/customimporter/settingsdialog.cpp:44
+msgid "Directories to Parse"
 msgstr ""
 
-#: languages/java/javasupportpart.cpp:736
-msgid "Java Support"
+#: languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp:115
+msgid ""
+"This does not appear to be a valid TQt3 include directory.\n"
+"Please select a different directory."
 msgstr ""
 
-#: languages/java/javasupportpart.cpp:736
-msgid "Keep Them"
+#: languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp:107
+#: languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp:115
+#: languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp:92
+#, fuzzy
+msgid "Invalid Directory"
+msgstr "Cyfeiriadur"
+
+#: languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp:107
+msgid ""
+"This does not appear to be a valid TQt4 include directory.\n"
+"Please select a different directory."
 msgstr ""
 
-#: languages/java/problemreporter.cpp:238
-msgid "Java Parsing"
+#: languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp:92
+msgid ""
+"This does not appear to be a valid TDE include directory.\n"
+"Please select a different directory."
 msgstr ""
 
 #: buildtools/qmake/trollprojectpart.cpp:143
@@ -16095,6 +15958,64 @@ msgstr ""
 msgid "Error in perldoc"
 msgstr ""
 
+#: languages/sql/sqlsupport_part.cpp:45
+msgid "<b>Run</b><p>Executes a SQL script."
+msgstr ""
+
+#: languages/sql/sqlsupport_part.cpp:47
+msgid "&Database Connections"
+msgstr ""
+
+#: languages/sql/sqlsupport_part.cpp:59
+msgid "Output of SQL commands"
+msgstr ""
+
+#: languages/sql/sqlsupport_part.cpp:60
+msgid ""
+"<b>Output of SQL commands</b>"
+"<p>This window shows the output of SQL commands being executed. It can display "
+"results of SQL \"select\" commands in a table."
+msgstr ""
+
+#: languages/sql/sqlsupport_part.cpp:135
+msgid "Specify Your Database Connections"
+msgstr ""
+
+#: languages/sql/sqlsupport_part.cpp:167
+msgid "Please select a valid database connection."
+msgstr ""
+
+#: languages/sql/sqlactions.cpp:81
+msgid "<no database server>"
+msgstr ""
+
+#: languages/sql/sqlactions.cpp:89
+msgid "<error - no connection %1>"
+msgstr ""
+
+#: languages/sql/sqloutputwidget.cpp:81
+#, c-format
+msgid "No such connection: %1"
+msgstr ""
+
+#: languages/sql/sqloutputwidget.cpp:104
+#, c-format
+msgid "Query successful, number of rows affected: %1"
+msgstr ""
+
+#: languages/sql/sqloutputwidget.cpp:111 languages/sql/sqloutputwidget.cpp:118
+msgid "An error occurred:"
+msgstr "Digwyddodd gwall :"
+
+#: languages/sql/sqloutputwidget.cpp:119
+msgid "Driver"
+msgstr "Gyrrydd"
+
+#: kdevdesigner/designer/hierarchyview.cpp:376
+#: languages/sql/sqloutputwidget.cpp:121
+msgid "Database"
+msgstr "Cronfa ddata"
+
 #: languages/ruby/rubysupport_part.cpp:58
 #: languages/ruby/rubysupport_part.cpp:61
 msgid "Run Test Under Cursor"
@@ -16154,6 +16075,91 @@ msgstr ""
 msgid "Cannot write to file"
 msgstr "Methu Cyfieithu'r Testun Tarddiad"
 
+#: languages/ruby/debugger/rdboutputwidget.cpp:60
+msgid "&RDB cmd:"
+msgstr ""
+
+#: languages/ruby/debugger/rdboutputwidget.cpp:76
+msgid "Pause execution of the app to enter rdb commands"
+msgstr ""
+
+#: languages/ruby/debugger/rdbbreakpointwidget.cpp:182
+msgid "Add empty breakpoint"
+msgstr ""
+
+#: languages/ruby/debugger/rdbbreakpointwidget.cpp:182
+msgid " <Alt+A>"
+msgstr ""
+
+#: languages/ruby/debugger/rdbbreakpointwidget.cpp:183
+msgid ""
+"<b>Add empty breakpoint</b>"
+"<p>Shows a popup menu that allows you to choose the type of breakpoint, then "
+"adds a breakpoint of the selected type to the breakpoints list."
+msgstr ""
+
+#: languages/ruby/debugger/rdbbreakpointwidget.cpp:188
+msgid "Delete selected breakpoint"
+msgstr ""
+
+#: languages/ruby/debugger/rdbbreakpointwidget.cpp:188
+msgid " <Delete>"
+msgstr ""
+
+#: languages/ruby/debugger/rdbbreakpointwidget.cpp:189
+msgid ""
+"<b>Delete selected breakpoint</b>"
+"<p>Deletes the selected breakpoint in the breakpoints list."
+msgstr ""
+
+#: languages/ruby/debugger/rdbbreakpointwidget.cpp:193
+msgid "Edit selected breakpoint"
+msgstr ""
+
+#: languages/ruby/debugger/rdbbreakpointwidget.cpp:193
+msgid " <Return>"
+msgstr ""
+
+#: languages/ruby/debugger/rdbbreakpointwidget.cpp:194
+msgid ""
+"<b>Edit selected breakpoint</b>"
+"<p>Allows to edit location, condition and ignore count properties of the "
+"selected breakpoint in the breakpoints list."
+msgstr ""
+
+#: languages/ruby/debugger/rdbbreakpointwidget.cpp:198
+msgid "Remove all breakpoints"
+msgstr ""
+
+#: languages/ruby/debugger/rdbbreakpointwidget.cpp:199
+msgid "<b>Remove all breakpoints</b><p>Removes all breakpoints in the project."
+msgstr ""
+
+#: languages/ruby/debugger/breakpoint.h:129
+#: languages/ruby/debugger/rdbbreakpointwidget.cpp:209
+msgid "File:line"
+msgstr ""
+
+#: languages/cpp/debugger/breakpoint.h:285
+#: languages/ruby/debugger/breakpoint.h:155
+#: languages/ruby/debugger/rdbbreakpointwidget.cpp:210
+msgid "Watchpoint"
+msgstr ""
+
+#: languages/ruby/debugger/breakpoint.h:178
+#: languages/ruby/debugger/rdbbreakpointwidget.cpp:211
+msgid "Catchpoint"
+msgstr ""
+
+#: languages/ruby/debugger/breakpoint.h:201
+#: languages/ruby/debugger/rdbbreakpointwidget.cpp:212
+msgid "Method()"
+msgstr "Dull()"
+
+#: languages/ruby/debugger/rdbbreakpointwidget.cpp:237
+msgid "Show"
+msgstr "Dangos"
+
 #: languages/ruby/debugger/debuggerpart.cpp:97
 msgid ""
 "<b>Variable tree</b>"
@@ -16250,8 +16256,43 @@ msgstr ""
 msgid "Restart"
 msgstr "Ail-gychwyn"
 
+#: languages/ruby/debugger/variablewidget.cpp:56
+msgid "E&xpression to watch:"
+msgstr ""
+
+#: languages/ruby/debugger/variablewidget.cpp:195
+#, fuzzy
+msgid "Remove Watch Expression"
+msgstr "&Mynegiad rheolaidd :"
+
+#: languages/ruby/debugger/variablewidget.cpp:198
+msgid "Copy to Clipboard"
+msgstr "Copïo i'r Gludfwrdd"
+
+#: languages/ruby/debugger/rdbcontroller.cpp:349
+#, fuzzy
+msgid ""
+"rdb message:\n"
+msgstr "&Neges:"
+
+#: languages/ruby/debugger/rdbcontroller.cpp:397
+#: languages/ruby/debugger/rdbcontroller.cpp:399
+#: languages/ruby/debugger/rdbcontroller.cpp:461
+#: languages/ruby/debugger/rdbcontroller.cpp:508
+#, c-format
+msgid "No source: %1"
+msgstr ""
+
+#: languages/ruby/debugger/rdbcontroller.cpp:706
+msgid ""
+"The ruby debugger cannot use the tty* or pty* devices.\n"
+"Check the settings on /dev/tty* and /dev/pty*\n"
+"As root you may need to \"chmod ug+rw\" tty* and pty* devices and/or add the "
+"user to the tty group using \"usermod -G tty username\"."
+msgstr ""
+
 #: languages/ruby/debugger/dbgtoolbar.cpp:224
-msgid "KDevelop ruby debugger: Click to execute one line of code (\"step\")"
+msgid "TDevelop ruby debugger: Click to execute one line of code (\"step\")"
 msgstr ""
 
 #: languages/ruby/debugger/dbgtoolbar.cpp:302
@@ -16278,124 +16319,96 @@ msgstr ""
 msgid "Execute one line of code, stepping into methods if appropriate."
 msgstr ""
 
-#: languages/ruby/debugger/rdbbreakpointwidget.cpp:182
-msgid "Add empty breakpoint"
+#: languages/lib/designer_integration/qtdesignerintegration.cpp:63
+#, c-format
+msgid "Cannot find implementation class for form: %1"
 msgstr ""
 
-#: languages/ruby/debugger/rdbbreakpointwidget.cpp:182
-msgid " <Alt+A>"
+#: languages/lib/designer_integration/implementationwidget.cpp:80
+#, c-format
+msgid "Create or Select Implementation Class for: %1"
 msgstr ""
 
-#: languages/ruby/debugger/rdbbreakpointwidget.cpp:183
-msgid ""
-"<b>Add empty breakpoint</b>"
-"<p>Shows a popup menu that allows you to choose the type of breakpoint, then "
-"adds a breakpoint of the selected type to the breakpoints list."
+#: languages/lib/designer_integration/implementationwidget.cpp:82
+msgid "Namespaces &amp;&amp; Classes"
 msgstr ""
 
-#: languages/ruby/debugger/rdbbreakpointwidget.cpp:188
-msgid "Delete selected breakpoint"
+#: languages/lib/designer_integration/implementationwidget.cpp:126
+msgid "Class was created but not found in class store."
 msgstr ""
 
-#: languages/ruby/debugger/rdbbreakpointwidget.cpp:188
-msgid " <Delete>"
+#: languages/lib/debugger/debugger.cpp:198
+msgid "Breakpoint"
 msgstr ""
 
-#: languages/ruby/debugger/rdbbreakpointwidget.cpp:189
-msgid ""
-"<b>Delete selected breakpoint</b>"
-"<p>Deletes the selected breakpoint in the breakpoints list."
+#: buildtools/ada/adaproject_part.cpp:59
+#: buildtools/autotools/autoprojectpart.cpp:216
+#: buildtools/custommakefiles/customprojectpart.cpp:140
+#: buildtools/pascal/pascalproject_part.cpp:68
+#: embedded/visualboyadvance/visualboyadvance_part.cpp:33
+#: languages/python/pythonsupportpart.cpp:63
+msgid "Execute Program"
 msgstr ""
 
-#: languages/ruby/debugger/rdbbreakpointwidget.cpp:193
-msgid "Edit selected breakpoint"
+#: buildtools/autotools/autoprojectpart.cpp:219
+#: buildtools/custommakefiles/customprojectpart.cpp:143
+#: buildtools/pascal/pascalproject_part.cpp:71
+#: languages/python/pythonsupportpart.cpp:66
+msgid "Execute program"
 msgstr ""
 
-#: languages/ruby/debugger/rdbbreakpointwidget.cpp:193
-msgid " <Return>"
+#: languages/python/pythonsupportpart.cpp:67
+msgid "<b>Execute program</b><p>Runs the Python program."
 msgstr ""
 
-#: languages/ruby/debugger/rdbbreakpointwidget.cpp:194
-msgid ""
-"<b>Edit selected breakpoint</b>"
-"<p>Allows to edit location, condition and ignore count properties of the "
-"selected breakpoint in the breakpoints list."
+#: languages/python/pythonsupportpart.cpp:72
+msgid "Execute string"
 msgstr ""
 
-#: languages/ruby/debugger/rdbbreakpointwidget.cpp:198
-msgid "Remove all breakpoints"
+#: languages/python/pythonsupportpart.cpp:73
+msgid "<b>Execute String</b><p>Executes a string as Python code."
 msgstr ""
 
-#: languages/ruby/debugger/rdbbreakpointwidget.cpp:199
-msgid "<b>Remove all breakpoints</b><p>Removes all breakpoints in the project."
+#: languages/python/pythonsupportpart.cpp:75
+msgid "Start Python Interpreter"
 msgstr ""
 
-#: languages/ruby/debugger/breakpoint.h:129
-#: languages/ruby/debugger/rdbbreakpointwidget.cpp:209
-msgid "File:line"
+#: languages/python/pythonsupportpart.cpp:78
+msgid "Start Python interpreter"
 msgstr ""
 
-#: languages/cpp/debugger/breakpoint.h:284
-#: languages/ruby/debugger/breakpoint.h:155
-#: languages/ruby/debugger/rdbbreakpointwidget.cpp:210
-msgid "Watchpoint"
+#: languages/python/pythonsupportpart.cpp:79
+msgid ""
+"<b>Start python interpreter</b>"
+"<p>Starts the Python interpreter without a program"
 msgstr ""
 
-#: languages/ruby/debugger/breakpoint.h:178
-#: languages/ruby/debugger/rdbbreakpointwidget.cpp:211
-msgid "Catchpoint"
+#: languages/python/pythonsupportpart.cpp:81
+msgid "Python Documentation..."
 msgstr ""
 
-#: languages/ruby/debugger/breakpoint.h:201
-#: languages/ruby/debugger/rdbbreakpointwidget.cpp:212
-msgid "Method()"
-msgstr "Dull()"
-
-#: languages/ruby/debugger/rdbbreakpointwidget.cpp:237
-msgid "Show"
-msgstr "Dangos"
-
-#: languages/ruby/debugger/rdboutputwidget.cpp:60
-msgid "&RDB cmd:"
+#: languages/python/pythonsupportpart.cpp:84
+msgid "Python documentation"
 msgstr ""
 
-#: languages/ruby/debugger/rdboutputwidget.cpp:76
-msgid "Pause execution of the app to enter rdb commands"
+#: languages/python/pythonsupportpart.cpp:85
+msgid "<b>Python documentation</b><p>Shows a Python documentation page."
 msgstr ""
 
-#: languages/ruby/debugger/variablewidget.cpp:56
-msgid "E&xpression to watch:"
+#: languages/python/pythonsupportpart.cpp:364
+msgid "Show Python Documentation"
 msgstr ""
 
-#: languages/ruby/debugger/variablewidget.cpp:195
-#, fuzzy
-msgid "Remove Watch Expression"
-msgstr "&Mynegiad rheolaidd :"
-
-#: languages/ruby/debugger/variablewidget.cpp:198
-msgid "Copy to Clipboard"
-msgstr "Copïo i'r Gludfwrdd"
-
-#: languages/ruby/debugger/rdbcontroller.cpp:349
-#, fuzzy
-msgid ""
-"rdb message:\n"
-msgstr "&Neges:"
+#: languages/python/pythonsupportpart.cpp:364
+msgid "Show Python documentation on keyword:"
+msgstr ""
 
-#: languages/ruby/debugger/rdbcontroller.cpp:397
-#: languages/ruby/debugger/rdbcontroller.cpp:399
-#: languages/ruby/debugger/rdbcontroller.cpp:461
-#: languages/ruby/debugger/rdbcontroller.cpp:508
-#, c-format
-msgid "No source: %1"
+#: languages/python/pydoc.cpp:71
+msgid "Error in pydoc"
 msgstr ""
 
-#: languages/ruby/debugger/rdbcontroller.cpp:706
-msgid ""
-"The ruby debugger cannot use the tty* or pty* devices.\n"
-"Check the settings on /dev/tty* and /dev/pty*\n"
-"As root you may need to \"chmod ug+rw\" tty* and pty* devices and/or add the "
-"user to the tty group using \"usermod -G tty username\"."
+#: languages/csharp/csharpdoc.cpp:91
+msgid "Error in csharpdoc"
 msgstr ""
 
 #: languages/csharp/csharpsupportpart.cpp:68
@@ -16436,165 +16449,305 @@ msgstr "Dogfenniaeth"
 msgid "Show CSharp documentation for function:"
 msgstr ""
 
-#: languages/csharp/csharpdoc.cpp:91
-msgid "Error in csharpdoc"
+#: languages/pascal/pascalsupport_part.cpp:72
+msgid "problem reporter"
 msgstr ""
 
-#: languages/fortran/fortransupportpart.cpp:67
-msgid "&Ftnchek"
+#: languages/ada/adasupportpart.cpp:63
+#: languages/pascal/pascalsupport_part.cpp:73
+msgid ""
+"<b>Problem reporter</b>"
+"<p>This window shows various \"problems\" in your project. It displays errors "
+"reported by a language parser."
 msgstr ""
 
-#: languages/fortran/fortransupportpart.cpp:70
-msgid "Run ftnchek"
+#: languages/pascal/pascalsupport_part.cpp:182
+#, c-format
+msgid ""
+"_n: Found 1 problem\n"
+"Found %n problems"
 msgstr ""
 
-#: languages/fortran/fortransupportpart.cpp:71
-msgid ""
-"<b>Run ftnchek</b>"
-"<p>Runs <b>ftnchek</b> to check fortran programs for semantic errors. Configure "
-"ftnchek options in project settings dialog, <b>Ftnchek</b> tab."
+#: languages/pascal/pascalsupport_part.cpp:194
+#, c-format
+msgid "Parsing file: %1"
 msgstr ""
 
-#: languages/fortran/fortransupportpart.cpp:85
-msgid "There is currently a job running."
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:32
+msgid "Map File"
 msgstr ""
 
-#: languages/fortran/fortransupportpart.cpp:160
-msgid "Ftnchek"
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:36
+msgid "Segments"
+msgstr "Cylchrannau"
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:38
+msgid "Publics"
 msgstr ""
 
-#: languages/fortran/ftnchekconfigwidget.cpp:93
-msgid "Warn about inconsistent use of arguments that use arrays"
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:40
+msgid "Detailed"
 msgstr ""
 
-#: languages/fortran/ftnchekconfigwidget.cpp:94
-msgid ""
-"Warn about dummy arguments of a data type different from the actual arguments"
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:45
+msgid "Default dynamic loader:"
 msgstr ""
 
-#: languages/fortran/ftnchekconfigwidget.cpp:96
-msgid ""
-"Warn if the invocation assumes a different data type for the return type, "
-"different from the actual return type"
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:50
+msgid "Reserved address space:"
 msgstr ""
 
-#: languages/fortran/ftnchekconfigwidget.cpp:98
-msgid "Warn about invoking a subprogram with an incorrect number of arguments"
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:87
+msgid "Include search path (delimited by \":\"):"
 msgstr ""
 
-#: languages/fortran/ftnchekconfigwidget.cpp:104
-msgid ""
-"Corresponding arrays in each declaration of a block must agree in size and "
-"number of dimensions"
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:89
+msgid "Resource search path (delimited by \":\"):"
 msgstr ""
 
-#: languages/fortran/ftnchekconfigwidget.cpp:106
-msgid "The comparison of two blocks is done variable-by-variable"
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:91
+#: languages/pascal/compiler/fpcoptions/optiontabs.cpp:105
+msgid "Unit search path (delimited by \":\"):"
 msgstr ""
 
-#: languages/fortran/ftnchekconfigwidget.cpp:107
-msgid ""
-"Warn if different declarations of the same block are not equal in total length"
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:93
+msgid "Object search path (delimited by \":\"):"
 msgstr ""
 
-#: languages/fortran/ftnchekconfigwidget.cpp:108
-msgid ""
-"In each declaration of a block, corresponding memory locations must agree in "
-"data type"
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:122
+msgid "Executable output directory:"
 msgstr ""
 
-#: languages/fortran/ftnchekconfigwidget.cpp:115
-msgid "Use of the result of integer division as an exponent"
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:124
+msgid "Unit output directory:"
 msgstr ""
 
-#: languages/fortran/ftnchekconfigwidget.cpp:116
-msgid "Conversion of an expression involving an integer division to real"
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:126
+msgid "Package directory:"
 msgstr ""
 
-#: languages/fortran/ftnchekconfigwidget.cpp:117
-msgid "Division in an integer constant expression that yields a result of zero"
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:128
+msgid "Package source code directory:"
 msgstr ""
 
-#: languages/fortran/ftnchekconfigwidget.cpp:123
-msgid ""
-"A scalar dummy argument is actually the same as another and is (or may be) "
-"modified"
+#: buildtools/autotools/autosubprojectview.cpp:220
+#: buildtools/autotools/autosubprojectview.cpp:221
+#: buildtools/qmake/trollprojectwidget.cpp:996
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:157
+#: parts/doxygen/messages.cpp:61
+msgid "Build"
 msgstr ""
 
-#: languages/fortran/ftnchekconfigwidget.cpp:125
-msgid ""
-"A dummy argument which is an array or array element is the same array as "
-"another and is modified"
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:159
+msgid "Build all units"
 msgstr ""
 
-#: languages/fortran/ftnchekconfigwidget.cpp:127
-msgid ""
-"A scalar dummy argument is the same as a common variable in the subprogram, and "
-"either is modified"
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:161
+msgid "Make modified units"
 msgstr ""
 
-#: languages/fortran/ftnchekconfigwidget.cpp:134
-msgid "ACCEPT and TYPE I/O statements"
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:163
+msgid "Quiet compile"
 msgstr ""
 
-#: languages/fortran/ftnchekconfigwidget.cpp:135
-msgid ""
-"Expressions defining array bounds that contain array elements or function "
-"references"
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:165
+msgid "Disable implicit package compilation"
 msgstr ""
 
-#: languages/fortran/ftnchekconfigwidget.cpp:137
-msgid "Assignment statements involving arrays"
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:170
+#: languages/pascal/compiler/fpcoptions/optiontabs.cpp:484
+msgid "Conditional defines (delimited by \":\"):"
 msgstr ""
 
-#: languages/fortran/ftnchekconfigwidget.cpp:143
-msgid "Backslash characters in strings"
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:173
+msgid "Unit aliases in form unit=alias (delimited by \":\"):"
 msgstr ""
 
-#: languages/fortran/ftnchekconfigwidget.cpp:144
-msgid "COMMON block variables not in descending order of storage sizes"
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:178
+#: parts/doxygen/messages.cpp:92 parts/outputviews/makeviewpart.cpp:52
+msgid "Messages"
+msgstr "Negeseuon"
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:180
+msgid "Output hint messages"
 msgstr ""
 
-#: languages/fortran/ftnchekconfigwidget.cpp:145
-msgid "Hollerith constants"
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:182
+msgid "Output warning messages"
 msgstr ""
 
-#: languages/fortran/compiler/pgioptions/pgioptionsplugin.cpp:243
-msgid "PGHPF Compiler Options"
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:186
+msgid "Packages"
+msgstr "Pecynnau"
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:187
+msgid "Build with packages (delimited by \":\"):"
 msgstr ""
 
-#: languages/fortran/compiler/pgioptions/pgioptionsplugin.cpp:243
-msgid "PGF77 Compiler Options"
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:223
+msgid "Code Alignment && Stack Frames"
 msgstr ""
 
-#: languages/fortran/compiler/pgioptions/pgioptionsplugin.cpp:255
-msgid "HPF"
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:224
+msgid "Default (-$A8)"
 msgstr ""
 
-#: languages/pascal/pascalsupport_part.cpp:72
-msgid "problem reporter"
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:227
+msgid "Never align"
 msgstr ""
 
-#: languages/pascal/pascalsupport_part.cpp:182
-#, c-format
-msgid ""
-"_n: Found 1 problem\n"
-"Found %n problems"
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:229
+msgid "On word boundaries"
 msgstr ""
 
-#: languages/pascal/pascalsupport_part.cpp:194
-#, c-format
-msgid "Parsing file: %1"
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:231
+msgid "On double word boundaries"
 msgstr ""
 
-#: languages/pascal/compiler/fpcoptions/fpcoptionsplugin.cpp:44
-msgid "Free Pascal Compiler Options"
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:233
+msgid "On quad word boundaries"
 msgstr ""
 
-#: languages/pascal/compiler/fpcoptions/fpcoptionsplugin.cpp:48
-#: languages/pascal/compiler/fpcoptions/optiontabs.cpp:213
-msgid "Language"
-msgstr "Iaith"
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:235
+msgid "Generate stack frames"
+msgstr ""
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:239
+msgid "Enumeration Size"
+msgstr ""
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:240
+msgid "Default (-$Z1)"
+msgstr ""
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:243
+msgid "Unsigned byte (256 values)"
+msgstr ""
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:245
+msgid "Unsigned word (64K values)"
+msgstr ""
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:247
+msgid "Unsigned double word (4096M values)"
+msgstr ""
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:251
+#: languages/pascal/compiler/fpcoptions/optiontabs.cpp:464
+msgid "Compile Time Checks"
+msgstr ""
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:253
+msgid "Assertions"
+msgstr ""
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:255
+msgid "Complete boolean evaluation"
+msgstr ""
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:257
+msgid "Extended syntax"
+msgstr ""
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:259
+msgid "Long strings"
+msgstr ""
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:261
+msgid "Open string parameters"
+msgstr ""
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:263
+msgid "Type-checked pointers"
+msgstr ""
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:265
+msgid "Var-string checking"
+msgstr ""
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:267
+msgid "Writable typed constants"
+msgstr ""
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:271
+#: languages/pascal/compiler/fpcoptions/optiontabs.cpp:472
+msgid "Run Time Checks"
+msgstr ""
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:273
+msgid "Runtime type information"
+msgstr ""
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:275
+msgid "Imported data references"
+msgstr ""
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:277
+#: languages/pascal/compiler/fpcoptions/optiontabs.cpp:478
+msgid "Input/Output checking"
+msgstr ""
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:279
+msgid "Overflow checking"
+msgstr ""
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:281
+#: languages/pascal/compiler/fpcoptions/optiontabs.cpp:474
+msgid "Range checking"
+msgstr ""
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:320
+msgid "Enable optimizations"
+msgstr ""
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:327
+#: languages/pascal/compiler/fpcoptions/optiontabs.cpp:338
+msgid "Debugging"
+msgstr ""
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:329
+msgid "Debug information"
+msgstr ""
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:331
+msgid "Local symbol information"
+msgstr ""
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:333
+msgid "Debug information for GDB"
+msgstr ""
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:335
+msgid "Namespace debug info"
+msgstr ""
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:337
+msgid "Write symbol info in an .rsm file"
+msgstr ""
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:341
+msgid "Symbol Reference Information"
+msgstr ""
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:342
+msgid "Default (-$YD)"
+msgstr ""
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:345
+msgid "No information"
+msgstr ""
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:347
+msgid "Definition information"
+msgstr ""
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:349
+msgid "Full reference information"
+msgstr ""
+
+#: languages/pascal/compiler/dccoptions/dccoptionsplugin.cpp:46
+msgid "Delphi Compiler Options"
+msgstr ""
 
 #: languages/pascal/compiler/dccoptions/dccoptionsplugin.cpp:53
 #: languages/pascal/compiler/fpcoptions/fpcoptionsplugin.cpp:51
@@ -16611,19 +16764,11 @@ msgstr ""
 msgid "Debug && Optimization"
 msgstr ""
 
-#: languages/pascal/compiler/fpcoptions/fpcoptionsplugin.cpp:63
-msgid "Assembler"
-msgstr ""
-
 #: languages/pascal/compiler/dccoptions/dccoptionsplugin.cpp:65
 #: languages/pascal/compiler/fpcoptions/fpcoptionsplugin.cpp:66
 msgid "Linker"
 msgstr ""
 
-#: languages/pascal/compiler/fpcoptions/fpcoptionsplugin.cpp:69
-msgid "Feedback"
-msgstr ""
-
 #: languages/pascal/compiler/fpcoptions/optiontabs.cpp:34
 msgid "Format errors like GCC does"
 msgstr ""
@@ -16692,11 +16837,6 @@ msgstr ""
 msgid "Show all procedure declarations if an overloaded function error occurs"
 msgstr ""
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:91
-#: languages/pascal/compiler/fpcoptions/optiontabs.cpp:105
-msgid "Unit search path (delimited by \":\"):"
-msgstr ""
-
 #: languages/pascal/compiler/fpcoptions/optiontabs.cpp:107
 msgid "Include file search path (delimited by \":\"):"
 msgstr ""
@@ -16773,6 +16913,11 @@ msgstr ""
 msgid "Support C style macros"
 msgstr ""
 
+#: languages/pascal/compiler/fpcoptions/fpcoptionsplugin.cpp:48
+#: languages/pascal/compiler/fpcoptions/optiontabs.cpp:213
+msgid "Language"
+msgstr "Iaith"
+
 #: languages/pascal/compiler/fpcoptions/optiontabs.cpp:215
 msgid "Support the label and goto commands"
 msgstr ""
@@ -16879,11 +17024,6 @@ msgstr ""
 msgid "Use pecoff"
 msgstr ""
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:327
-#: languages/pascal/compiler/fpcoptions/optiontabs.cpp:338
-msgid "Debugging"
-msgstr ""
-
 #: languages/pascal/compiler/fpcoptions/optiontabs.cpp:340
 msgid "Generate information for GDB"
 msgstr ""
@@ -16960,11 +17100,6 @@ msgstr ""
 msgid "Uncertain optimizations"
 msgstr ""
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:251
-#: languages/pascal/compiler/fpcoptions/optiontabs.cpp:464
-msgid "Compile Time Checks"
-msgstr ""
-
 #: languages/pascal/compiler/fpcoptions/optiontabs.cpp:466
 msgid "Include assert statements in compiled code"
 msgstr ""
@@ -16973,34 +17108,14 @@ msgstr ""
 msgid "Do not check the unit name for being the same as the file name"
 msgstr ""
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:271
-#: languages/pascal/compiler/fpcoptions/optiontabs.cpp:472
-msgid "Run Time Checks"
-msgstr ""
-
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:281
-#: languages/pascal/compiler/fpcoptions/optiontabs.cpp:474
-msgid "Range checking"
-msgstr ""
-
 #: languages/pascal/compiler/fpcoptions/optiontabs.cpp:476
 msgid "Stack checking"
 msgstr ""
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:277
-#: languages/pascal/compiler/fpcoptions/optiontabs.cpp:478
-msgid "Input/Output checking"
-msgstr ""
-
 #: languages/pascal/compiler/fpcoptions/optiontabs.cpp:480
 msgid "Integer overflow checking"
 msgstr ""
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:170
-#: languages/pascal/compiler/fpcoptions/optiontabs.cpp:484
-msgid "Conditional defines (delimited by \":\"):"
-msgstr ""
-
 #: languages/pascal/compiler/fpcoptions/optiontabs.cpp:487
 msgid "Undefine conditional defines (delimited by \":\"):"
 msgstr ""
@@ -17129,2957 +17244,3746 @@ msgstr ""
 msgid "BeOS"
 msgstr "BeOS"
 
-#: languages/pascal/compiler/dccoptions/dccoptionsplugin.cpp:46
-msgid "Delphi Compiler Options"
+#: languages/pascal/compiler/fpcoptions/fpcoptionsplugin.cpp:44
+msgid "Free Pascal Compiler Options"
 msgstr ""
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:32
-msgid "Map File"
+#: languages/pascal/compiler/fpcoptions/fpcoptionsplugin.cpp:63
+msgid "Assembler"
 msgstr ""
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:36
-msgid "Segments"
-msgstr "Cylchrannau"
+#: languages/pascal/compiler/fpcoptions/fpcoptionsplugin.cpp:69
+msgid "Feedback"
+msgstr ""
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:38
-msgid "Publics"
+#: languages/java/javasupportpart.cpp:164
+msgid "<b>New Class</b>Generates a new class.<p>"
 msgstr ""
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:40
-msgid "Detailed"
+#: languages/java/javasupportpart.cpp:713
+msgid "Java Support"
 msgstr ""
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:45
-msgid "Default dynamic loader:"
+#: languages/java/javasupportpart.cpp:713
+msgid "Keep Them"
 msgstr ""
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:50
-msgid "Reserved address space:"
+#: languages/java/problemreporter.cpp:238
+msgid "Java Parsing"
 msgstr ""
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:87
-msgid "Include search path (delimited by \":\"):"
+#: languages/fortran/ftnchekconfigwidget.cpp:93
+msgid "Warn about inconsistent use of arguments that use arrays"
 msgstr ""
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:89
-msgid "Resource search path (delimited by \":\"):"
+#: languages/fortran/ftnchekconfigwidget.cpp:94
+msgid ""
+"Warn about dummy arguments of a data type different from the actual arguments"
 msgstr ""
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:93
-msgid "Object search path (delimited by \":\"):"
+#: languages/fortran/ftnchekconfigwidget.cpp:96
+msgid ""
+"Warn if the invocation assumes a different data type for the return type, "
+"different from the actual return type"
 msgstr ""
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:122
-msgid "Executable output directory:"
+#: languages/fortran/ftnchekconfigwidget.cpp:98
+msgid "Warn about invoking a subprogram with an incorrect number of arguments"
 msgstr ""
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:124
-msgid "Unit output directory:"
+#: languages/fortran/ftnchekconfigwidget.cpp:104
+msgid ""
+"Corresponding arrays in each declaration of a block must agree in size and "
+"number of dimensions"
 msgstr ""
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:126
-msgid "Package directory:"
+#: languages/fortran/ftnchekconfigwidget.cpp:106
+msgid "The comparison of two blocks is done variable-by-variable"
 msgstr ""
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:128
-msgid "Package source code directory:"
+#: languages/fortran/ftnchekconfigwidget.cpp:107
+msgid ""
+"Warn if different declarations of the same block are not equal in total length"
 msgstr ""
 
-#: buildtools/autotools/autosubprojectview.cpp:220
-#: buildtools/autotools/autosubprojectview.cpp:221
-#: buildtools/qmake/trollprojectwidget.cpp:996
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:157
-#: parts/doxygen/messages.cpp:61
-msgid "Build"
+#: languages/fortran/ftnchekconfigwidget.cpp:108
+msgid ""
+"In each declaration of a block, corresponding memory locations must agree in "
+"data type"
 msgstr ""
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:159
-msgid "Build all units"
+#: languages/fortran/ftnchekconfigwidget.cpp:115
+msgid "Use of the result of integer division as an exponent"
 msgstr ""
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:161
-msgid "Make modified units"
+#: languages/fortran/ftnchekconfigwidget.cpp:116
+msgid "Conversion of an expression involving an integer division to real"
 msgstr ""
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:163
-msgid "Quiet compile"
+#: languages/fortran/ftnchekconfigwidget.cpp:117
+msgid "Division in an integer constant expression that yields a result of zero"
 msgstr ""
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:165
-msgid "Disable implicit package compilation"
+#: languages/fortran/ftnchekconfigwidget.cpp:123
+msgid ""
+"A scalar dummy argument is actually the same as another and is (or may be) "
+"modified"
 msgstr ""
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:173
-msgid "Unit aliases in form unit=alias (delimited by \":\"):"
+#: languages/fortran/ftnchekconfigwidget.cpp:125
+msgid ""
+"A dummy argument which is an array or array element is the same array as "
+"another and is modified"
 msgstr ""
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:178
-#: parts/doxygen/messages.cpp:92 parts/outputviews/makeviewpart.cpp:52
-msgid "Messages"
-msgstr "Negeseuon"
+#: languages/fortran/ftnchekconfigwidget.cpp:127
+msgid ""
+"A scalar dummy argument is the same as a common variable in the subprogram, and "
+"either is modified"
+msgstr ""
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:180
-msgid "Output hint messages"
+#: languages/fortran/ftnchekconfigwidget.cpp:134
+msgid "ACCEPT and TYPE I/O statements"
 msgstr ""
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:182
-msgid "Output warning messages"
+#: languages/fortran/ftnchekconfigwidget.cpp:135
+msgid ""
+"Expressions defining array bounds that contain array elements or function "
+"references"
 msgstr ""
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:186
-msgid "Packages"
-msgstr "Pecynnau"
+#: languages/fortran/ftnchekconfigwidget.cpp:137
+msgid "Assignment statements involving arrays"
+msgstr ""
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:187
-msgid "Build with packages (delimited by \":\"):"
+#: languages/fortran/ftnchekconfigwidget.cpp:143
+msgid "Backslash characters in strings"
 msgstr ""
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:223
-msgid "Code Alignment && Stack Frames"
+#: languages/fortran/ftnchekconfigwidget.cpp:144
+msgid "COMMON block variables not in descending order of storage sizes"
 msgstr ""
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:224
-msgid "Default (-$A8)"
+#: languages/fortran/ftnchekconfigwidget.cpp:145
+msgid "Hollerith constants"
 msgstr ""
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:227
-msgid "Never align"
+#: languages/fortran/fortransupportpart.cpp:67
+msgid "&Ftnchek"
 msgstr ""
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:229
-msgid "On word boundaries"
+#: languages/fortran/fortransupportpart.cpp:70
+msgid "Run ftnchek"
 msgstr ""
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:231
-msgid "On double word boundaries"
+#: languages/fortran/fortransupportpart.cpp:71
+msgid ""
+"<b>Run ftnchek</b>"
+"<p>Runs <b>ftnchek</b> to check fortran programs for semantic errors. Configure "
+"ftnchek options in project settings dialog, <b>Ftnchek</b> tab."
 msgstr ""
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:233
-msgid "On quad word boundaries"
+#: languages/fortran/fortransupportpart.cpp:85
+msgid "There is currently a job running."
 msgstr ""
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:235
-msgid "Generate stack frames"
+#: languages/fortran/fortransupportpart.cpp:160
+msgid "Ftnchek"
 msgstr ""
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:239
-msgid "Enumeration Size"
+#: languages/fortran/compiler/pgioptions/pgioptionsplugin.cpp:243
+msgid "PGHPF Compiler Options"
 msgstr ""
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:240
-msgid "Default (-$Z1)"
+#: languages/fortran/compiler/pgioptions/pgioptionsplugin.cpp:243
+msgid "PGF77 Compiler Options"
 msgstr ""
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:243
-msgid "Unsigned byte (256 values)"
+#: languages/fortran/compiler/pgioptions/pgioptionsplugin.cpp:255
+msgid "HPF"
 msgstr ""
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:245
-msgid "Unsigned word (64K values)"
+#: languages/php/phperrorview.cpp:375
+#, fuzzy
+msgid "Undefined function"
+msgstr "Defn&yddio ffwythiant:"
+
+#: languages/php/phperrorview.cpp:378
+#, fuzzy
+msgid "Parse Error"
+msgstr "Gwall Mewnol"
+
+#: languages/php/phpcodecompletion.cpp:709
+msgid "Type of %1 is %2"
 msgstr ""
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:247
-msgid "Unsigned double word (4096M values)"
+#: languages/php/phpsupportpart.cpp:95
+msgid "<b>Run</b><p>Executes script on a terminal or a webserver."
 msgstr ""
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:253
-msgid "Assertions"
+#: languages/php/phpsupportpart.cpp:97
+msgid "&New Class..."
 msgstr ""
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:255
-msgid "Complete boolean evaluation"
+#: languages/php/phpsupportpart.cpp:100
+msgid "New class"
 msgstr ""
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:257
-msgid "Extended syntax"
+#: languages/php/phpsupportpart.cpp:101
+msgid "<b>New class</b><p>Runs New Class wizard."
 msgstr ""
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:259
-msgid "Long strings"
+#: languages/php/phpsupportpart.cpp:106
+msgid ""
+"<b>PHP problems</b>"
+"<p>This view shows PHP parser warnings, errors, and fatal errors."
 msgstr ""
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:261
-msgid "Open string parameters"
+#: languages/php/phpsupportpart.cpp:118 languages/php/phpsupportpart.cpp:333
+msgid "PHP"
+msgstr "PHP"
+
+#: languages/php/phpsupportpart.cpp:211
+msgid "PHP Specific"
 msgstr ""
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:263
-msgid "Type-checked pointers"
+#: languages/php/phpsupportpart.cpp:211 languages/php/phpsupportpart.cpp:243
+msgid "PHP Settings"
 msgstr ""
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:265
-msgid "Var-string checking"
+#: languages/php/phpsupportpart.cpp:238
+msgid ""
+"There is no configuration for executing a PHP file.\n"
+"Please set the correct values in the next dialog."
 msgstr ""
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:267
-msgid "Writable typed constants"
+#: languages/php/phpsupportpart.cpp:239
+msgid "Customize PHP Mode"
 msgstr ""
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:273
-msgid "Runtime type information"
+#: languages/ada/problemreporter.cpp:84
+msgid ""
+"<b>Problem reporter</b>"
+"<p>This window shows errors reported by a language parser."
 msgstr ""
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:275
-msgid "Imported data references"
+#: languages/ada/problemreporter.cpp:256
+msgid "Ada Parsing"
 msgstr ""
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:279
-msgid "Overflow checking"
+#: parts/openwith/openwithpart.cpp:48
+msgid "Open as UTF-8"
 msgstr ""
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:320
-msgid "Enable optimizations"
+#: parts/openwith/openwithpart.cpp:52
+#, fuzzy
+msgid "Open As"
+msgstr "Agor Ffeiliau"
+
+#: parts/openwith/openwithpart.cpp:53
+msgid ""
+"<b>Open As</b>"
+"<p>Lists all encodings that can be used to open the selected file."
 msgstr ""
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:329
-msgid "Debug information"
+#: parts/openwith/openwithpart.cpp:82
+msgid "Open With"
+msgstr "Agor Efo"
+
+#: parts/openwith/openwithpart.cpp:83
+msgid ""
+"<b>Open With</b>"
+"<p>Lists all applications that can be used to open the selected file."
 msgstr ""
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:331
-msgid "Local symbol information"
+#: parts/openwith/openwithpart.cpp:88
+msgid "Open With..."
+msgstr "Agor Gyda..."
+
+#: parts/openwith/openwithpart.cpp:89
+msgid ""
+"<b>Open With...</b>"
+"<p>Provides a dialog to choose the application to open the selected file."
 msgstr ""
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:333
-msgid "Debug information for GDB"
+#: parts/grepview/grepviewwidget.cpp:137 parts/grepview/grepviewwidget.cpp:460
+msgid "Search Results"
+msgstr "Canlyniadau Chwilio"
+
+#: parts/grepview/grepviewwidget.cpp:302
+msgid "Unable to create a temporary file for search."
 msgstr ""
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:335
-msgid "Namespace debug info"
+#: parts/grepview/grepdlg.cpp:86 parts/grepview/grepviewpart.cpp:61
+#: parts/grepview/grepviewwidget.cpp:447
+msgid "Find in Files"
+msgstr "Canfod mewn Ffeiliau"
+
+#: parts/grepview/grepviewwidget.cpp:523
+#, c-format
+msgid ""
+"_n: *** %n match found. ***\n"
+"*** %n matches found. ***"
 msgstr ""
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:337
-msgid "Write symbol info in an .rsm file"
+#: parts/grepview/grepviewpart.cpp:53
+msgid "Grep Output"
 msgstr ""
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:341
-msgid "Symbol Reference Information"
+#: parts/grepview/grepviewpart.cpp:54
+msgid ""
+"<b>Find in files</b>"
+"<p>This window contains the output of a grep command. Clicking on an item in "
+"the list will automatically open the corresponding source file and set the "
+"cursor to the line with the match."
 msgstr ""
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:342
-msgid "Default (-$YD)"
+#: parts/grepview/grepviewpart.cpp:61
+msgid "Output of the grep command"
 msgstr ""
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:345
-msgid "No information"
+#: parts/grepview/grepviewpart.cpp:65
+msgid "Find in Fi&les..."
+msgstr "Canfod mew&n Ffeiliau ..."
+
+#: parts/grepview/grepviewpart.cpp:68
+msgid "Search for expressions over several files"
 msgstr ""
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:347
-msgid "Definition information"
+#: parts/grepview/grepviewpart.cpp:69
+msgid ""
+"<b>Find in files</b>"
+"<p>Opens the 'Find in files' dialog. There you can enter a regular expression "
+"which is then searched for within all files in the directories you specify. "
+"Matches will be displayed, you can switch to a match directly."
 msgstr ""
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:349
-msgid "Full reference information"
+#: parts/grepview/grepviewpart.cpp:119
+#, c-format
+msgid "Grep: %1"
 msgstr ""
 
-#: buildtools/ada/adaproject_part.cpp:59
-#: buildtools/autotools/autoprojectpart.cpp:208
-#: buildtools/custommakefiles/customprojectpart.cpp:140
-#: buildtools/pascal/pascalproject_part.cpp:68
-#: embedded/visualboyadvance/visualboyadvance_part.cpp:33
-#: languages/python/pythonsupportpart.cpp:63
-msgid "Execute Program"
+#: parts/grepview/grepviewpart.cpp:121
+msgid ""
+"<b>Grep</b>"
+"<p>Opens the find in files dialog and sets the pattern to the text under the "
+"cursor."
 msgstr ""
 
-#: buildtools/autotools/autoprojectpart.cpp:211
-#: buildtools/custommakefiles/customprojectpart.cpp:143
-#: buildtools/pascal/pascalproject_part.cpp:71
-#: languages/python/pythonsupportpart.cpp:66
-msgid "Execute program"
+#: parts/fileview/addfilegroupdlg.cpp:32 parts/grepview/grepdlg.cpp:95
+msgid "&Pattern:"
+msgstr "&Patrwm:"
+
+#: parts/grepview/grepdlg.cpp:123
+#, fuzzy
+msgid "&Regular Expression"
+msgstr "&Mynegiad rheolaidd :"
+
+#: parts/grepview/grepdlg.cpp:157
+msgid "Set directory to that of the current file (Alt+Y)"
 msgstr ""
 
-#: languages/python/pythonsupportpart.cpp:67
-msgid "<b>Execute program</b><p>Runs the Python program."
+#: parts/grepview/grepdlg.cpp:163
+#, fuzzy
+msgid "Rec&ursive"
+msgstr "&Ymgylchol"
+
+#: parts/grepview/grepdlg.cpp:167
+#, fuzzy
+msgid "Limit search to &project files"
+msgstr "&Ffeil y cywaith:"
+
+#: parts/grepview/grepdlg.cpp:172
+msgid "&Files:"
+msgstr "&Ffeiliau:"
+
+#: parts/grepview/grepdlg.cpp:180
+#, fuzzy
+msgid "&Exclude:"
+msgstr "&Gweithredadwyn:"
+
+#: parts/grepview/grepdlg.cpp:199
+#, fuzzy
+msgid "New view"
+msgstr "Eitem Newydd"
+
+#: parts/grepview/grepdlg.cpp:203
+msgid "&Suppress find errors"
 msgstr ""
 
-#: languages/python/pythonsupportpart.cpp:72
-msgid "Execute string"
+#: parts/grepview/grepdlg.cpp:210
+#, fuzzy
+msgid "Sea&rch"
+msgstr "Chwilio"
+
+#: parts/grepview/grepdlg.cpp:220
+msgid ""
+"<qt>Enter the regular expression you want to search for here."
+"<p>Possible meta characters are:"
+"<ul>"
+"<li><b>.</b> - Matches any character"
+"<li><b>^</b> - Matches the beginning of a line"
+"<li><b>$</b> - Matches the end of a line"
+"<li><b>\\&lt;</b> - Matches the beginning of a word"
+"<li><b>\\&gt;</b> - Matches the end of a word</ul>The following repetition "
+"operators exist:"
+"<ul>"
+"<li><b>?</b> - The preceding item is matched at most once"
+"<li><b>*</b> - The preceding item is matched zero or more times"
+"<li><b>+</b> - The preceding item is matched one or more times"
+"<li><b>{<i>n</i>}</b> - The preceding item is matched exactly <i>n</i> times"
+"<li><b>{<i>n</i>,}</b> - The preceding item is matched <i>n</i> or more times"
+"<li><b>{,<i>n</i>}</b> - The preceding item is matched at most <i>n</i> times"
+"<li><b>{<i>n</i>,<i>m</i>}</b> - The preceding item is matched at least <i>n</i>"
+", but at most <i>m</i> times.</ul>Furthermore, backreferences to bracketed "
+"subexpressions are available via the notation \\<i>n</i>.</qt>"
 msgstr ""
 
-#: languages/python/pythonsupportpart.cpp:73
-msgid "<b>Execute String</b><p>Executes a string as Python code."
+#: parts/grepview/grepdlg.cpp:244
+msgid ""
+"Enter the file name pattern of the files to search here. You may give several "
+"patterns separated by commas"
 msgstr ""
 
-#: languages/python/pythonsupportpart.cpp:75
-msgid "Start Python Interpreter"
+#: parts/grepview/grepdlg.cpp:247
+#, c-format
+msgid ""
+"You can choose a template for the pattern from the combo box and edit it here. "
+"The string %s in the template is replaced by the pattern input field, resulting "
+"in the regular expression to search for."
 msgstr ""
 
-#: languages/python/pythonsupportpart.cpp:78
-msgid "Start Python interpreter"
+#: parts/grepview/grepdlg.cpp:317
+msgid "Please enter a search pattern"
 msgstr ""
 
-#: languages/python/pythonsupportpart.cpp:79
+#: parts/valgrind/valgrind_part.cpp:49
+msgid "Valgrind Output"
+msgstr ""
+
+#: parts/valgrind/valgrind_part.cpp:51
 msgid ""
-"<b>Start python interpreter</b>"
-"<p>Starts the Python interpreter without a program"
+"<b>Valgrind</b>"
+"<p>Shows the output of the valgrind. Valgrind detects"
+"<br>use of uninitialized memory"
+"<br>reading/writing memory after it has been free'd"
+"<br>reading/writing off the end of malloc'd blocks"
+"<br>reading/writing inappropriate areas on the stack"
+"<br>memory leaks -- where pointers to malloc'd blocks are lost forever"
+"<br>passing of uninitialised and/or unaddressable memory to system calls"
+"<br>mismatched use of malloc/new/new [] vs free/delete/delete []"
+"<br>some abuses of the POSIX pthread API."
 msgstr ""
 
-#: languages/python/pythonsupportpart.cpp:81
-msgid "Python Documentation..."
+#: parts/valgrind/valgrind_part.cpp:61
+msgid "&Valgrind Memory Leak Check"
 msgstr ""
 
-#: languages/python/pythonsupportpart.cpp:84
-msgid "Python documentation"
+#: parts/valgrind/valgrind_part.cpp:63 parts/valgrind/valgrind_part.cpp:71
+msgid "Valgrind memory leak check"
 msgstr ""
 
-#: languages/python/pythonsupportpart.cpp:85
-msgid "<b>Python documentation</b><p>Shows a Python documentation page."
+#: parts/valgrind/valgrind_part.cpp:64
+msgid ""
+"<b>Valgrind memory leak check</b>"
+"<p>Runs Valgrind - a tool to help you find memory-management problems in your "
+"programs."
 msgstr ""
 
-#: languages/python/pythonsupportpart.cpp:364
-msgid "Show Python Documentation"
+#: parts/valgrind/valgrind_part.cpp:66
+msgid "P&rofile with KCachegrind"
 msgstr ""
 
-#: languages/python/pythonsupportpart.cpp:364
-msgid "Show Python documentation on keyword:"
+#: parts/valgrind/valgrind_part.cpp:68
+msgid "Profile with KCachegrind"
 msgstr ""
 
-#: languages/python/pydoc.cpp:71
-msgid "Error in pydoc"
+#: parts/valgrind/valgrind_part.cpp:69
+msgid ""
+"<b>Profile with KCachegrind</b>"
+"<p>Runs your program in calltree and then displays profiler information in "
+"KCachegrind."
 msgstr ""
 
-#: languages/kjssupport/kjssupport_part.cpp:73
-msgid "Test the active script."
+#: parts/valgrind/valgrind_part.cpp:90
+msgid "Open Valgrind Output"
 msgstr ""
 
-#: languages/kjssupport/kjssupport_part.cpp:90
-msgid "KJS Console"
+#: parts/valgrind/valgrind_part.cpp:96
+#, c-format
+msgid "Could not open valgrind output: %1"
 msgstr ""
 
-#: languages/kjssupport/kjssupport_part.cpp:90
-msgid "KJS Embed Console"
+#: parts/valgrind/valgrind_part.cpp:217
+msgid "There is already an instance of valgrind running."
 msgstr ""
 
-#: lib/util/tdescriptactionmanager.cpp:98
-msgid "Unable to get KScript Runner for type \"%1\"."
-msgstr "Methu cael Rhedydd KScript am fath \"%1\"."
+#: parts/valgrind/valgrind_dialog.cpp:20
+msgid "Valgrind Memory Check"
+msgstr ""
 
-#: lib/util/tdescriptactionmanager.cpp:98
-msgid "KScript Error"
-msgstr "Gwall KScript"
+#: parts/valgrind/valgrind_dialog.cpp:80
+#: parts/valgrind/valgrind_dialog.cpp:140
+msgid ""
+"Could not find valgrind in your $PATH. Please make sure it is installed "
+"properly."
+msgstr ""
 
-#: lib/util/execcommand.cpp:52
-msgid "Could not invoke \"%1\". Please make sure it is installed correctly"
+#: parts/valgrind/valgrind_dialog.cpp:82
+#: parts/valgrind/valgrind_dialog.cpp:142
+msgid "Valgrind Not Found"
 msgstr ""
 
-#: lib/util/execcommand.cpp:53
-msgid "Error Invoking Command"
+#: parts/valgrind/valgrind_dialog.cpp:185
+msgid ""
+"Could not find tdecachegrind in your $PATH. Please make sure it is installed "
+"properly."
 msgstr ""
 
-#: lib/util/execcommand.cpp:59
-msgid "Command running..."
+#: parts/valgrind/valgrind_dialog.cpp:187
+msgid "KCachegrind Not Found"
 msgstr ""
 
-#: lib/util/execcommand.cpp:60
-msgid "Please wait until the \"%1\" command finishes."
+#: parts/valgrind/valgrind_widget.cpp:95
+msgid "No."
+msgstr "Rhif"
+
+#: kdevdesigner/designer/outputwindow.cpp:84
+#: parts/valgrind/valgrind_widget.cpp:97
+msgid "Message"
+msgstr "Neges"
+
+#: parts/valgrind/valgrind_widget.cpp:104
+msgid "&Open Valgrind Output..."
 msgstr ""
 
-#: lib/cppparser/parser.cpp:140
-msgid "<eof>"
+#: parts/valgrind/valgrind_widget.cpp:106
+msgid "Expand All Items"
 msgstr ""
 
-#: lib/cppparser/parser.cpp:321 lib/cppparser/parser.cpp:2699
-#: lib/cppparser/parser.cpp:2923 lib/cppparser/parser.cpp:2929
-msgid "expression expected"
+#: parts/valgrind/valgrind_widget.cpp:107
+msgid "Collapse All Items"
 msgstr ""
 
-#: lib/cppparser/parser.cpp:583
-msgid "Declaration syntax error"
+#: parts/konsole/konsoleviewpart.cpp:38
+msgid ""
+"<b>Konsole</b>"
+"<p>This window contains an embedded konsole window. It will try to follow you "
+"when you navigate in the source directories"
 msgstr ""
 
-#: lib/cppparser/parser.cpp:630 lib/cppparser/parser.cpp:2817
-#: lib/cppparser/parser.cpp:3290
-msgid "} expected"
+#: parts/konsole/konsoleviewpart.cpp:44 parts/konsole/konsoleviewpart.cpp:49
+msgid "Konsole"
+msgstr "Konsole"
+
+#: parts/konsole/konsoleviewpart.cpp:49
+msgid "Embedded console window"
 msgstr ""
 
-#: lib/cppparser/parser.cpp:671
-msgid "namespace expected"
+#: parts/replace/replace_part.cpp:43
+msgid ""
+"<b>Replace</b>"
+"<p>This window shows a preview of a string replace operation. Uncheck a line to "
+"exclude that replacement. Uncheck a file to exclude the whole file from the "
+"operation. Clicking on a line in the list will automatically open the "
+"corresponding source file and set the cursor to the line with the match."
 msgstr ""
 
-#: lib/cppparser/parser.cpp:675
-msgid "{ expected"
+#: parts/replace/replace_part.cpp:52 parts/replace/replace_part.cpp:57
+msgid "Project wide string replacement"
 msgstr ""
 
-#: lib/cppparser/parser.cpp:748 lib/cppparser/parser.cpp:3010
-msgid "Namespace name expected"
+#: parts/replace/replace_part.cpp:55
+msgid "Find-Select-Replace..."
 msgstr ""
 
-#: lib/cppparser/parser.cpp:852
-msgid "Need a type specifier to declare"
+#: parts/replace/replace_part.cpp:58
+msgid ""
+"<b>Find-Select-Replace</b>"
+"<p>Opens the project wide string replacement dialog. There you can enter a "
+"string or a regular expression which is then searched for within all files in "
+"the locations you specify. Matches will be displayed in the <b>Replace</b> "
+"window, you can replace them with the specified string, exclude them from "
+"replace operation or cancel the whole replace."
 msgstr ""
 
-#: lib/cppparser/parser.cpp:934
-msgid "expected a declaration"
+#: parts/replace/replace_part.cpp:102
+#, fuzzy, c-format
+msgid "Replace Project Wide: %1"
+msgstr "&Ffeil y cywaith:"
+
+#: parts/replace/replace_part.cpp:104
+msgid ""
+"<b>Replace Project Wide</b>"
+"<p>Opens the find in files dialog and sets the pattern to the text under the "
+"cursor."
 msgstr ""
 
-#: lib/cppparser/parser.cpp:1208 lib/cppparser/parser.cpp:2190
-msgid "Constant expression expected"
+#: parts/fileselector/fileselector_widget.cpp:188
+msgid "Current Document Directory"
 msgstr ""
 
-#: lib/cppparser/parser.cpp:1277 lib/cppparser/parser.cpp:1374
-msgid "')' expected"
+#: parts/fileselector/fileselector_widget.cpp:217
+msgid ""
+"<p>Here you can enter a path for a directory to display."
+"<p>To go to a directory previously entered, press the arrow on the right and "
+"choose one. "
+"<p>The entry has directory completion. Right-click to choose how completion "
+"should behave."
 msgstr ""
 
-#: lib/cppparser/parser.cpp:1436 lib/cppparser/parser.cpp:1966
-#: lib/cppparser/parser.cpp:2398
-msgid "} missing"
+#: parts/fileselector/fileselector_widget.cpp:223
+msgid ""
+"<p>Here you can enter a name filter to limit which files are displayed."
+"<p>To clear the filter, toggle off the filter button to the left."
+"<p>To reapply the last filter used, toggle on the filter button."
 msgstr ""
+"<p>Yma gallwch roi hidlen enwau i gyfyngu pa ffeiliau a ddengys."
+"<p>I wagio'r hidlen, diffoddwch y botwm hidlen ar y chwith."
+"<p>I ailweithredu'r hidlen ddefnyddiwyd ddiwethaf, cynnwch y botwm hidlen."
 
-#: lib/cppparser/parser.cpp:2088
-msgid "Member initializers expected"
+#: parts/fileselector/fileselector_widget.cpp:228
+#: parts/fileview/partwidget.cpp:75
+msgid ""
+"<p>This button clears the name filter when toggled off, or reapplies the last "
+"filter used when toggled on."
 msgstr ""
+"<p>Gwagia'r botwm yma'r hidlen enwau pan yn ddiffodd, neu ailweithreda'r hidlen "
+"ddefnyddiwyd ddiwethaf pan ynghyn."
 
-#: lib/cppparser/parser.cpp:2249
-msgid "Base class specifier expected"
+#: parts/fileselector/fileselector_widget.cpp:355
+#: parts/fileview/partwidget.cpp:104
+msgid "Apply last filter (\"%1\")"
+msgstr "Gweithredu'r hidlen ddiwethaf (\"%1\")"
+
+#: parts/fileselector/fileselector_widget.cpp:366
+#: parts/fileview/partwidget.cpp:109 parts/outputviews/appoutputwidget.cpp:265
+msgid "Clear filter"
+msgstr "Gwagio hidlen"
+
+#: parts/fileselector/fileselector_widget.cpp:588
+msgid "Toolbar"
+msgstr "Bar offer"
+
+#: parts/fileselector/fileselector_widget.cpp:590
+msgid "A&vailable actions:"
+msgstr "&Gweithredoedd ar gael:"
+
+#: parts/fileselector/fileselector_widget.cpp:591
+msgid "S&elected actions:"
+msgstr "Gweithredoedd d&ewisiedig:"
+
+#: parts/fileselector/fileselector_widget.cpp:599
+msgid "Auto Synchronization"
+msgstr "Cydweddu Ymysgogol"
+
+#: parts/fileselector/fileselector_widget.cpp:600
+msgid "When a docu&ment becomes active"
+msgstr "Pan ddaw dog&fen yn weithredol"
+
+#: parts/fileselector/fileselector_widget.cpp:601
+msgid "When a document is o&pened"
 msgstr ""
 
-#: lib/cppparser/parser.cpp:2272
-msgid "Initializer clause expected"
+#: parts/fileselector/fileselector_widget.cpp:602
+msgid "When the file selector becomes visible"
+msgstr "Pan ymddengys y dewisydd ffeiliau"
+
+#: parts/fileselector/fileselector_widget.cpp:610
+msgid "Remember &locations:"
+msgstr "Cofio &lleoliadau:"
+
+#: parts/fileselector/fileselector_widget.cpp:617
+msgid "Remember &filters:"
+msgstr "Cofio &hidlenni:"
+
+#: parts/fileselector/fileselector_widget.cpp:624
+msgid "Session"
+msgstr "Sesiwn"
+
+#: parts/fileselector/fileselector_widget.cpp:625
+msgid "Restore loca&tion"
+msgstr "Adfer lleolia&dau:"
+
+#: parts/fileselector/fileselector_widget.cpp:626
+msgid "Restore last f&ilter"
+msgstr "Adfer h&idlen ddiwethaf:"
+
+#: parts/fileselector/fileselector_widget.cpp:646
+msgid ""
+"<p>Decides how many locations to keep in the history of the location combo box"
+msgstr "p>Penderfynna sawl lleoliad i gadw yn hanes y blwch cyfuno lleoliadau."
+
+#: parts/fileselector/fileselector_widget.cpp:653
+msgid ""
+"<p>Decides how many filters to keep in the history of the filter combo box"
+msgstr "p>Penderfynna sawl hidlen i gadw yn hanes y blwch cyfuno hidlenni."
+
+#: parts/fileselector/fileselector_widget.cpp:660
+msgid ""
+"<p>These options allow you to have the File Selector automatically change "
+"location to the directory of the active document on certain events."
+"<p>Auto synchronization is <em>lazy</em>, meaning it will not take effect until "
+"the file selector is visible."
+"<p>None of these are enabled by default, but you can always sync the location "
+"by pressing the sync button in the toolbar."
 msgstr ""
 
-#: lib/cppparser/parser.cpp:2313
-msgid "Identifier expected"
+#: parts/fileselector/fileselector_widget.cpp:671
+msgid ""
+"<p>If this option is enabled (default), the location will be restored when you "
+"start KDev."
+"<p><strong>Note</strong> that if the session is handled by the TDE session "
+"manager, the location is always restored."
 msgstr ""
 
-#: lib/cppparser/parser.cpp:2343
-msgid "Type id expected"
+#: parts/fileselector/fileselector_widget.cpp:676
+msgid ""
+"<p>If this option is enabled (default), the current filter will be restored "
+"when you start KDev."
+"<p><strong>Note</strong> that if the session is handled by the TDE session "
+"manager, the filter is always restored."
+"<p><strong>Note</strong> that some of the autosync settings may override the "
+"restored location if on."
 msgstr ""
 
-#: lib/cppparser/parser.cpp:2380
-msgid "Class name expected"
+#: parts/fileselector/fileselector_part.cpp:50
+#: parts/fileselector/fileselector_part.cpp:52
+#: parts/fileselector/fileselector_part.cpp:85
+msgid "File Selector"
+msgstr "Dewisydd Ffeiliau"
+
+#: parts/fileselector/fileselector_part.cpp:52
+msgid "File selector"
+msgstr "Dewisydd Ffeiliau"
+
+#: parts/fileselector/fileselector_part.cpp:53
+msgid ""
+"<b>File selector</b>"
+"<p>This file selector lists directory contents and provides some file "
+"management functions."
 msgstr ""
 
-#: lib/cppparser/parser.cpp:2662 lib/cppparser/parser.cpp:2842
-#: lib/cppparser/parser.cpp:2880 lib/cppparser/parser.cpp:3352
-msgid "condition expected"
+#: buildtools/script/scriptprojectpart.cpp:53
+#: parts/fileselector/fileselector_part.cpp:57
+msgid "New File..."
+msgstr "Ffeil newydd ..."
+
+#: parts/filecreate/filecreate_part.cpp:184
+#: parts/fileselector/fileselector_part.cpp:99
+msgid "Cannot create file. Check whether the directory and filename are valid."
 msgstr ""
 
-#: lib/cppparser/parser.cpp:2669 lib/cppparser/parser.cpp:2690
-#: lib/cppparser/parser.cpp:2849 lib/cppparser/parser.cpp:2859
-msgid "statement expected"
+#: parts/fileselector/tdeactionselector.cpp:70
+msgid "&Available:"
+msgstr "&Ar gael:"
+
+#: parts/fileselector/tdeactionselector.cpp:85
+msgid "&Selected:"
+msgstr "&Wedi'u dewis:"
+
+#: parts/vcsmanager/vcsmanagerpart.cpp:60
+#, fuzzy
+msgid "Version Control"
+msgstr "Fersiwn %1"
+
+#: parts/vcsmanager/vcsmanagerprojectconfig.cpp:49
+msgid ""
+"_: No Version Control System\n"
+"None"
+msgstr "Dim"
+
+#: parts/bookmarks/bookmarks_widget.cpp:270
+msgid ", line "
 msgstr ""
 
-#: lib/cppparser/parser.cpp:2725
-msgid "for initialization expected"
+#: parts/bookmarks/bookmarks_widget.cpp:273
+msgid "Remove This Bookmark"
 msgstr ""
 
-#: lib/cppparser/parser.cpp:3341
-msgid "catch expected"
+#: parts/bookmarks/bookmarks_widget.cpp:277
+msgid ", All"
 msgstr ""
 
-#: lib/cppparser/errors.cpp:23
-msgid "Internal Error"
-msgstr "Gwall Mewnol"
+#: parts/bookmarks/bookmarks_widget.cpp:278
+msgid "Remove These Bookmarks"
+msgstr ""
 
-#: lib/cppparser/errors.cpp:24
-msgid "Syntax Error before '%1'"
+#: parts/bookmarks/bookmarks_widget.cpp:283
+msgid "Collapse All"
 msgstr ""
 
-#: lib/cppparser/errors.cpp:25
-msgid "Parse Error before '%1'"
+#: parts/bookmarks/bookmarks_widget.cpp:284
+msgid "Expand All"
 msgstr ""
 
-#: lib/cppparser/driver.cpp:386
-#, fuzzy, c-format
-msgid "Could not find include file %1"
-msgstr "Ffeiliau i'w llwytho"
+#: parts/bookmarks/bookmarks_part.cpp:59
+msgid ""
+"<b>Bookmarks</b>"
+"<p>The bookmark viewer shows all the source bookmarks in the project."
+msgstr ""
 
-#: lib/widgets/processwidget.cpp:230 parts/outputviews/makeitem.cpp:131
-msgid "*** Exited with status: %1 ***"
+#: parts/bookmarks/bookmarks_part.cpp:62
+msgid "Source bookmarks"
 msgstr ""
 
-#: lib/widgets/processwidget.cpp:233
-msgid "*** Exited normally ***"
+#: parts/bookmarks/bookmarks_part.cpp:558
+msgid "Could not find file"
 msgstr ""
 
-#: lib/widgets/processwidget.cpp:239
-msgid "*** Process aborted. Segmentation fault ***"
+#: parts/doxygen/messages.cpp:29
+#: src/profileengine/editor/profileeditor.cpp:141
+msgid "Project"
+msgstr "Cywaith"
+
+#: parts/doxygen/messages.cpp:30
+msgid "Project name"
+msgstr "Enw'r cywaith"
+
+#: parts/doxygen/messages.cpp:31
+msgid "Project version"
 msgstr ""
 
-#: lib/widgets/processwidget.cpp:243
-msgid "*** Process aborted ***"
+#: parts/doxygen/messages.cpp:32
+msgid "Output path"
 msgstr ""
 
-#: lib/widgets/resizablecombo.cpp:63
-msgid "Drag this to resize the combobox."
+#: parts/doxygen/messages.cpp:33
+msgid "Distribute the generated docs in 10 subdirectories"
 msgstr ""
 
-#: lib/widgets/flagboxes.cpp:98
-msgid "Flags"
-msgstr "Baneri"
+#: parts/doxygen/messages.cpp:34
+msgid "Output language"
+msgstr ""
 
-#: lib/widgets/kdevhtmlpart.cpp:37
-msgid "<b>Reload</b><p>Reloads the current document."
+#: parts/doxygen/messages.cpp:35
+msgid "Use MS Windows(tm) font encoding"
 msgstr ""
 
-#: lib/widgets/kdevhtmlpart.cpp:40
-msgid "<b>Stop</b><p>Stops the loading of current document."
+#: parts/doxygen/messages.cpp:36
+msgid "Include brief member descriptions"
 msgstr ""
 
-#: lib/widgets/kdevhtmlpart.cpp:41
-msgid "Duplicate Tab"
-msgstr "Dyblygu Tab"
+#: parts/doxygen/messages.cpp:37
+msgid "Repeat brief member descriptions"
+msgstr ""
 
-#: lib/widgets/kdevhtmlpart.cpp:43
-msgid "<b>Duplicate window</b><p>Opens current document in a new window."
+#: parts/doxygen/messages.cpp:38
+msgid "Strip words in brief description"
 msgstr ""
 
-#: lib/widgets/kdevhtmlpart.cpp:57
-msgid ""
-"<b>Back</b>"
-"<p>Moves backwards one step in the <b>documentation</b> browsing history."
+#: parts/doxygen/messages.cpp:39
+msgid "Always include detailed section"
 msgstr ""
 
-#: lib/widgets/kdevhtmlpart.cpp:69
-msgid ""
-"<b>Forward</b>"
-"<p>Moves forward one step in the <b>documentation</b> browsing history."
+#: parts/doxygen/messages.cpp:40
+msgid "Inline inherited members"
 msgstr ""
 
-#: lib/widgets/kdevhtmlpart.cpp:99 parts/documentation/docutils.cpp:81
-msgid "Open in New Tab"
-msgstr "Agor mewn Tab Newydd"
+#: parts/doxygen/messages.cpp:41
+msgid "Always use full path names"
+msgstr ""
 
-#: lib/widgets/kdevhtmlpart.cpp:100
-msgid "<b>Open in new window</b><p>Opens current link in a new window."
+#: parts/doxygen/messages.cpp:42
+msgid "Prefix to strip from path names"
 msgstr ""
 
-#: lib/widgets/kdevtabwidget.cpp:38
-msgid "Close &Others"
+#: parts/doxygen/messages.cpp:43
+msgid "Strip from include path"
 msgstr ""
 
-#: lib/widgets/ksavealldialog.cpp:53 lib/widgets/ksavealldialog.cpp:144
-msgid "Save Modified Files?"
+#: parts/doxygen/messages.cpp:44
+msgid "Generate short file names"
 msgstr ""
 
-#: lib/widgets/ksavealldialog.cpp:58 lib/widgets/ksavealldialog.cpp:151
-msgid "The following files have been modified. Save them?"
+#: parts/doxygen/messages.cpp:45
+msgid "Use JavaDoc-style brief descriptions"
 msgstr ""
 
-#: lib/widgets/ksavealldialog.cpp:65
-msgid "Save &Selected"
+#: parts/doxygen/messages.cpp:46
+msgid "Multiline cpp is brief"
 msgstr ""
 
-#: lib/widgets/ksavealldialog.cpp:65
-msgid "Saves all selected files"
+#: parts/doxygen/messages.cpp:47
+msgid "Details at top"
 msgstr ""
 
-#: lib/widgets/ksavealldialog.cpp:66 lib/widgets/ksavealldialog.cpp:157
-msgid "Save &None"
+#: parts/doxygen/messages.cpp:48
+msgid "Inherit documentation"
 msgstr ""
 
-#: lib/widgets/ksavealldialog.cpp:68 lib/widgets/ksavealldialog.cpp:159
-msgid "Lose all modifications"
+#: parts/doxygen/messages.cpp:49
+msgid "Produce a new page for each member"
 msgstr ""
 
-#: lib/widgets/ksavealldialog.cpp:69 lib/widgets/ksavealldialog.cpp:160
-msgid "Cancels the action"
+#: parts/doxygen/messages.cpp:50
+msgid "Tab size"
+msgstr "Maint tab"
+
+#: parts/doxygen/messages.cpp:51
+msgid "Aliases"
+msgstr "Arallenwau"
+
+#: parts/doxygen/messages.cpp:52
+msgid "Optimize output for C"
 msgstr ""
 
-#: lib/widgets/ksavealldialog.cpp:156
-msgid "Save &All"
-msgstr "Cadw &Popeth"
+#: parts/doxygen/messages.cpp:53
+msgid "Optimize output for Java"
+msgstr ""
 
-#: lib/widgets/ksavealldialog.cpp:156
-msgid "Saves all modified files"
+#: parts/doxygen/messages.cpp:54
+msgid "Use built-in STL classes support"
 msgstr ""
 
-#: lib/widgets/propeditor/pstringlistedit.cpp:85
-msgid "Ok"
-msgstr "Iawn"
+#: parts/doxygen/messages.cpp:55
+msgid "Use group documentation on undocumented members"
+msgstr ""
 
-#: kdevdesigner/designer/propertyeditor.cpp:1505
-#: kdevdesigner/designer/propertyeditor.cpp:1523
-#: kdevdesigner/designer/propertyeditor.cpp:1602
-#: kdevdesigner/designer/propertyeditor.cpp:1613
-#: lib/widgets/propeditor/propertymachinefactory.cpp:131
-#: lib/widgets/propeditor/propertymachinefactory.cpp:138
-msgid "x"
-msgstr "x"
+#: parts/doxygen/messages.cpp:56
+msgid "Class members type subgrouping"
+msgstr ""
 
-#: kdevdesigner/designer/propertyeditor.cpp:1507
-#: kdevdesigner/designer/propertyeditor.cpp:1528
-#: kdevdesigner/designer/propertyeditor.cpp:1604
-#: kdevdesigner/designer/propertyeditor.cpp:1615
-#: lib/widgets/propeditor/propertymachinefactory.cpp:132
-#: lib/widgets/propeditor/propertymachinefactory.cpp:139
-msgid "y"
-msgstr "y"
+#: parts/doxygen/messages.cpp:62
+msgid "Extract undocumented entities"
+msgstr ""
 
-#: lib/widgets/propeditor/propertymachinefactory.cpp:152
-msgid "Minimum Expanding"
+#: parts/doxygen/messages.cpp:63
+msgid "Extract private entities"
 msgstr ""
 
-#: lib/widgets/propeditor/propertymachinefactory.cpp:153
-msgid "Ignored"
-msgstr "Anwybyddwyd"
+#: parts/doxygen/messages.cpp:64
+msgid "Extract static entities"
+msgstr ""
 
-#: kdevdesigner/designer/propertyeditor.cpp:2171
-#: kdevdesigner/designer/propertyeditor.cpp:2189
-#: kdevdesigner/designer/propertyeditor.cpp:2239
-#: lib/widgets/propeditor/propertymachinefactory.cpp:156
-msgid "hSizeType"
+#: parts/doxygen/messages.cpp:65
+msgid "Extract local classes"
 msgstr ""
 
-#: lib/widgets/propeditor/propertymachinefactory.cpp:156
-msgid "Horizontal Size Type"
+#: parts/doxygen/messages.cpp:66
+msgid "Extract local methods"
 msgstr ""
 
-#: kdevdesigner/designer/propertyeditor.cpp:2174
-#: kdevdesigner/designer/propertyeditor.cpp:2191
-#: kdevdesigner/designer/propertyeditor.cpp:2241
-#: lib/widgets/propeditor/propertymachinefactory.cpp:157
-msgid "vSizeType"
+#: parts/doxygen/messages.cpp:67
+msgid "Hide undocumented members"
 msgstr ""
 
-#: lib/widgets/propeditor/propertymachinefactory.cpp:157
-msgid "Vertical Size Type"
+#: parts/doxygen/messages.cpp:68
+msgid "Hide undocumented classes"
 msgstr ""
 
-#: lib/widgets/propeditor/propertymachinefactory.cpp:158
-msgid "hStretch"
-msgstr "hStretch"
+#: parts/doxygen/messages.cpp:69
+msgid "Hide friend compounds"
+msgstr ""
 
-#: lib/widgets/propeditor/propertymachinefactory.cpp:158
-msgid "Horizontal Stretch"
+#: parts/doxygen/messages.cpp:70
+msgid "Hide in body docs"
 msgstr ""
 
-#: lib/widgets/propeditor/propertymachinefactory.cpp:159
-msgid "vStretch"
-msgstr "vStretch"
+#: parts/doxygen/messages.cpp:71
+msgid "Document internal entities"
+msgstr ""
 
-#: lib/widgets/propeditor/propertymachinefactory.cpp:159
-msgid "Vertical Stretch"
+#: parts/doxygen/messages.cpp:72
+msgid "Use case-sensitive file names"
 msgstr ""
 
-#: kdevdesigner/designer/propertyeditor.cpp:2380
-#: lib/widgets/propeditor/propertymachinefactory.cpp:165
-msgid "Arrow"
-msgstr "Saeth"
+#: parts/doxygen/messages.cpp:73
+msgid "Hide name scopes"
+msgstr ""
 
-#: lib/widgets/propeditor/propertymachinefactory.cpp:166
-msgid "Up Arrow"
-msgstr "Saeth i Fyny"
+#: parts/doxygen/messages.cpp:74
+msgid "Show included files"
+msgstr ""
 
-#: kdevdesigner/designer/propertyeditor.cpp:2382
-#: lib/widgets/propeditor/propertymachinefactory.cpp:167
-msgid "Cross"
-msgstr "Croes"
+#: parts/doxygen/messages.cpp:75
+msgid "Make inline functions"
+msgstr ""
 
-#: kdevdesigner/designer/propertyeditor.cpp:2383
-#: lib/widgets/propeditor/propertymachinefactory.cpp:168
-msgid "Waiting"
-msgstr "Aros"
+#: parts/doxygen/messages.cpp:76
+msgid "Sort member documentation alphabetically"
+msgstr ""
 
-#: kdevdesigner/designer/propertyeditor.cpp:2384
-#: lib/widgets/propeditor/propertymachinefactory.cpp:169
-msgid "iBeam"
-msgstr "iTrawst"
+#: parts/doxygen/messages.cpp:77
+msgid "Sort the class list by fully-qualified names"
+msgstr ""
 
-#: kdevdesigner/designer/propertyeditor.cpp:2385
-#: lib/widgets/propeditor/propertymachinefactory.cpp:170
-msgid "Size Vertical"
-msgstr "Maint Fertigol"
+#: parts/doxygen/messages.cpp:78
+msgid "Sort brief documentation alphabetically"
+msgstr ""
 
-#: kdevdesigner/designer/propertyeditor.cpp:2386
-#: lib/widgets/propeditor/propertymachinefactory.cpp:171
-msgid "Size Horizontal"
-msgstr "Maint Llorweddol"
+#: parts/doxygen/messages.cpp:79
+msgid "Enable conditional sections"
+msgstr ""
 
-#: kdevdesigner/designer/propertyeditor.cpp:2387
-#: lib/widgets/propeditor/propertymachinefactory.cpp:172
-msgid "Size Slash"
-msgstr "Maint Slaes"
+#: parts/doxygen/messages.cpp:80
+msgid "Generate TODO-list"
+msgstr ""
 
-#: kdevdesigner/designer/propertyeditor.cpp:2388
-#: lib/widgets/propeditor/propertymachinefactory.cpp:173
-msgid "Size Backslash"
-msgstr "Maint Slaes Ôl"
+#: parts/doxygen/messages.cpp:81
+msgid "Generate Test-list"
+msgstr ""
 
-#: kdevdesigner/designer/propertyeditor.cpp:2389
-#: lib/widgets/propeditor/propertymachinefactory.cpp:174
-msgid "Size All"
-msgstr "Maint Popeth"
+#: parts/doxygen/messages.cpp:82
+msgid "Generate Bug-list"
+msgstr ""
 
-#: kdevdesigner/designer/propertyeditor.cpp:2392
-#: lib/widgets/propeditor/propertymachinefactory.cpp:175
-msgid "Blank"
-msgstr "Gwag"
+#: parts/doxygen/messages.cpp:83
+msgid "Generate Deprecated-list"
+msgstr ""
 
-#: kdevdesigner/designer/propertyeditor.cpp:2393
-#: lib/widgets/propeditor/propertymachinefactory.cpp:176
-msgid "Split Vertical"
-msgstr "Hollti'n Fertigol"
+#: parts/doxygen/messages.cpp:84
+msgid "Maximum lines shown for initializers"
+msgstr ""
 
-#: kdevdesigner/designer/propertyeditor.cpp:2394
-#: lib/widgets/propeditor/propertymachinefactory.cpp:177
-msgid "Split Horizontal"
-msgstr "Hollti'n Lorweddol"
+#: parts/doxygen/messages.cpp:85
+msgid "Show used files"
+msgstr ""
 
-#: kdevdesigner/designer/propertyeditor.cpp:2395
-#: lib/widgets/propeditor/propertymachinefactory.cpp:178
-msgid "Pointing Hand"
-msgstr "Llaw sy'n Pwyntio"
+#: parts/doxygen/messages.cpp:86
+msgid "Show the directory hierarchy"
+msgstr ""
 
-#: kdevdesigner/designer/propertyeditor.cpp:2396
-#: lib/widgets/propeditor/propertymachinefactory.cpp:179
-msgid "Forbidden"
-msgstr "Gwaharddir"
+#: parts/doxygen/messages.cpp:87
+msgid "Script to invoke to get the current version for each file"
+msgstr ""
 
-#: lib/widgets/propeditor/propertymachinefactory.cpp:180
-msgid "What's this"
-msgstr "Beth yw hwn"
+#: parts/doxygen/messages.cpp:93
+msgid "Suppress output"
+msgstr ""
 
-#: lib/widgets/propeditor/pcheckbox.cpp:69
-msgid "true"
-msgstr "gwir"
+#: parts/doxygen/messages.cpp:94
+msgid "Show warnings"
+msgstr ""
 
-#: lib/widgets/propeditor/pcheckbox.cpp:69
-msgid "false"
-msgstr "ffug"
+#: parts/doxygen/messages.cpp:95
+msgid "Warn about undocumented entities"
+msgstr ""
 
-#: lib/widgets/propeditor/pfontbutton.cpp:62
-msgid " Bold"
+#: parts/doxygen/messages.cpp:96
+msgid "Warn if error in documents"
 msgstr ""
 
-#: lib/widgets/propeditor/pfontbutton.cpp:63
-msgid " Italic"
+#: parts/doxygen/messages.cpp:97
+msgid "Warn if function parameters are not documented"
 msgstr ""
 
-#: src/mainwindowshare.cpp:112
-msgid "&Stop"
-msgstr "&Aros"
+#: parts/doxygen/messages.cpp:98
+msgid "Warnings format"
+msgstr ""
 
-#: src/mainwindowshare.cpp:116
-msgid ""
-"<b>Stop</b>"
-"<p>Stops all running processes (like building process, grep command, etc.). "
-"When placed onto a toolbar provides a popup menu to choose a process to stop."
+#: parts/doxygen/messages.cpp:99
+msgid "Write warnings to"
 msgstr ""
 
-#: src/mainwindowshare.cpp:130
-msgid "Lets you switch the menubar on/off."
+#: parts/doxygen/messages.cpp:104
+msgid "Input"
+msgstr "Mewnbwn"
+
+#: parts/doxygen/messages.cpp:105
+msgid "Input files and directories"
 msgstr ""
 
-#: src/mainwindowshare.cpp:136
-msgid "Lets you configure shortcut keys."
-msgstr "Gadael i chi ffurfweddu bysellau byrlwybr."
+#: parts/doxygen/messages.cpp:106
+msgid "Input patterns"
+msgstr ""
 
-#: src/mainwindowshare.cpp:142
-msgid "Lets you configure toolbars."
-msgstr "Gadael i chi ffurfweddu bariau offer."
+#: parts/doxygen/messages.cpp:107
+msgid "Recurse into subdirectories"
+msgstr ""
 
-#: src/mainwindowshare.cpp:148
-msgid "Lets you configure system notifications."
+#: parts/doxygen/messages.cpp:108
+msgid "Exclude from input"
 msgstr ""
 
-#: src/mainwindowshare.cpp:152 src/mainwindowshare.cpp:153
-#: src/mainwindowshare.cpp:298
-msgid "Configure KDevelop"
+#: parts/doxygen/messages.cpp:109
+msgid "Exclude symlinks"
 msgstr ""
 
-#: src/mainwindowshare.cpp:153
-msgid "Lets you customize KDevelop."
+#: parts/doxygen/messages.cpp:110
+msgid "Exclude patterns"
 msgstr ""
 
-#: src/mainwindowshare.cpp:157
-msgid "Show statusbar"
-msgstr "Dangos bar cyflwr"
+#: parts/doxygen/messages.cpp:111
+msgid "Path to examples"
+msgstr ""
 
-#: src/mainwindowshare.cpp:158
-msgid "<b>Show statusbar</b><p>Hides or shows the statusbar."
+#: parts/doxygen/messages.cpp:112
+msgid "Example patterns"
 msgstr ""
 
-#: src/mainwindowshare.cpp:160
-msgid "&Next Window"
+#: parts/doxygen/messages.cpp:113
+msgid "Example recursive"
 msgstr ""
 
-#: src/mainwindowshare.cpp:161
-msgid "Next window"
+#: parts/doxygen/messages.cpp:114
+msgid "Path to images"
 msgstr ""
 
-#: src/mainwindowshare.cpp:162
-msgid "<b>Next window</b><p>Switches to the next window."
+#: parts/doxygen/messages.cpp:115
+msgid "Input filter"
 msgstr ""
 
-#: src/mainwindowshare.cpp:164
-msgid "&Previous Window"
+#: parts/doxygen/messages.cpp:116
+msgid "Filter input files"
 msgstr ""
 
-#: src/mainwindowshare.cpp:165
-msgid "Previous window"
+#: parts/doxygen/messages.cpp:117
+msgid "Apply filters on file patterns"
 msgstr ""
 
-#: src/mainwindowshare.cpp:166
-msgid "<b>Previous window</b><p>Switches to the previous window."
+#: parts/doxygen/messages.cpp:122
+msgid "Source Browser"
 msgstr ""
 
-#: src/mainwindowshare.cpp:168
-msgid "&Last Accessed Window"
+#: parts/doxygen/messages.cpp:123
+msgid "Cross-reference with source files"
 msgstr ""
 
-#: src/mainwindowshare.cpp:169
-msgid "Last accessed window"
+#: parts/doxygen/messages.cpp:124
+msgid "References will link to source code"
 msgstr ""
 
-#: src/mainwindowshare.cpp:170
-msgid ""
-"<b>Last accessed window</b>"
-"<p>Switches to the last viewed window (Hold the Alt key pressed and walk on by "
-"repeating the Up key)."
+#: parts/doxygen/messages.cpp:125
+msgid "Use links to HTAGS"
 msgstr ""
 
-#: src/mainwindowshare.cpp:172
-msgid "&First Accessed Window"
+#: parts/doxygen/messages.cpp:126
+msgid "Inline sources"
 msgstr ""
 
-#: src/mainwindowshare.cpp:173
-msgid "First accessed window"
+#: parts/doxygen/messages.cpp:127
+msgid "Hide special comment blocks"
 msgstr ""
 
-#: src/mainwindowshare.cpp:174
-msgid ""
-"<b>First accessed window</b>"
-"<p>Switches to the first accessed window (Hold the Alt key pressed and walk on "
-"by repeating the Down key)."
+#: parts/doxygen/messages.cpp:128
+msgid "Referenced by relation"
 msgstr ""
 
-#: src/mainwindowshare.cpp:176
-#, fuzzy
-msgid "Configure Plugins..."
-msgstr "Gosodiadau Cywaith"
+#: parts/doxygen/messages.cpp:129
+msgid "References relation"
+msgstr ""
 
-#: src/mainwindowshare.cpp:178
-msgid "Configure &Editor..."
+#: parts/doxygen/messages.cpp:130
+msgid "Include headers verbatim"
 msgstr ""
 
-#: src/mainwindowshare.cpp:179
-msgid "Configure editor settings"
+#: parts/documentation/docconfiglistview.cpp:31
+#: parts/documentation/documentation_widget.cpp:56
+#: parts/documentation/find_documentation_options.cpp:173
+#: parts/doxygen/messages.cpp:135
+msgid "Index"
+msgstr "Mynegai"
+
+#: parts/doxygen/messages.cpp:136
+msgid "Generate alphabetical index"
 msgstr ""
 
-#: src/mainwindowshare.cpp:180
-msgid "<b>Configure editor</b><p>Opens editor configuration dialog."
+#: parts/doxygen/messages.cpp:137
+msgid "Columns in index"
 msgstr ""
 
-#: src/mainwindowshare.cpp:442
-msgid "<b>Show menubar</b><p>Lets you switch the menubar on/off."
+#: parts/doxygen/messages.cpp:138
+msgid "Prefix to ignore"
 msgstr ""
 
-#: src/main.cpp:25 src/main_assistant.cpp:25
-msgid "Profile to load"
+#: parts/doxygen/messages.cpp:143
+msgid "HTML"
+msgstr "HTML"
+
+#: parts/doxygen/messages.cpp:144
+msgid "Generate HTML"
 msgstr ""
 
-#: src/main_assistant.cpp:32
-msgid ""
-"The KDevelop Integrated Development Environment:\n"
-"assistant and documentation viewer"
+#: parts/doxygen/messages.cpp:145
+msgid "HTML output directory"
 msgstr ""
 
-#: src/main_assistant.cpp:33
-msgid "KDevelop Assistant"
-msgstr "Cymhorthwr KDevelop"
+#: parts/doxygen/messages.cpp:146
+msgid "HTML file extension"
+msgstr ""
 
-#: src/main.cpp:35 src/main_assistant.cpp:35
-msgid "(c) 1999-2007, The KDevelop developers"
+#: parts/doxygen/messages.cpp:147
+msgid "Header file"
 msgstr ""
 
-#: src/main.cpp:36 src/main_assistant.cpp:36
-msgid ""
-"Release coordinator, Overall improvements, Pascal support, C++ support, New "
-"File and Documentation parts"
+#: parts/doxygen/messages.cpp:148
+msgid "Footer file"
 msgstr ""
 
-#: src/main.cpp:37 src/main_assistant.cpp:37
-msgid "Release coordinator, API documentation, Doxygen and autoproject patches"
+#: parts/doxygen/messages.cpp:149 parts/doxygen/messages.cpp:187
+msgid "Stylesheet"
 msgstr ""
 
-#: src/main.cpp:39 src/main_assistant.cpp:38
-msgid "Initial idea, basic architecture, much initial source code"
+#: parts/doxygen/messages.cpp:150
+msgid "Align members"
 msgstr ""
 
-#: src/main.cpp:40 src/main_assistant.cpp:39
-msgid "KTabBar, bugfixes"
+#: parts/doxygen/messages.cpp:151
+msgid "Generate HTML-help"
 msgstr ""
 
-#: src/main.cpp:41 src/main_assistant.cpp:40
-msgid "Java & Objective C support"
+#: parts/doxygen/messages.cpp:152
+msgid "CHM file"
 msgstr ""
 
-#: src/main.cpp:42 src/main.cpp:43 src/main_assistant.cpp:41
-msgid "Debugger frontend"
+#: parts/doxygen/messages.cpp:153
+msgid "HHC location"
 msgstr ""
 
-#: src/main.cpp:44 src/main_assistant.cpp:42
-msgid "PHP support, context menu stuff"
+#: parts/doxygen/messages.cpp:154
+msgid "Generate .chi file"
 msgstr ""
 
-#: src/main.cpp:45 src/main_assistant.cpp:43
-msgid "TDE application templates"
+#: parts/doxygen/messages.cpp:155
+msgid "Generate binary TOC"
 msgstr ""
 
-#: src/main.cpp:46 src/main_assistant.cpp:44
-msgid "Dist part, bash support, application templates"
+#: parts/doxygen/messages.cpp:156
+msgid "Expand TOC"
 msgstr ""
 
-#: src/main.cpp:47 src/main_assistant.cpp:45
-msgid "Several components, htdig indexing"
+#: parts/doxygen/messages.cpp:157
+msgid "Disable index"
 msgstr ""
 
-#: src/main.cpp:48 src/main_assistant.cpp:46
-msgid "Help with Automake manager and persistent class store"
+#: parts/doxygen/messages.cpp:158
+msgid "Number of enum values per line"
 msgstr ""
 
-#: src/main.cpp:50 src/main_assistant.cpp:47
-msgid "Ported to Qt 3, patches, valgrind, diff and perforce support"
+#: parts/doxygen/messages.cpp:159
+msgid "Generate treeview"
 msgstr ""
 
-#: src/main.cpp:51 src/main_assistant.cpp:48
-msgid ""
-"QEditor component, code completion, Abbrev component, C++ support, Java support"
+#: parts/doxygen/messages.cpp:160
+msgid "Treeview width"
 msgstr ""
 
-#: src/main.cpp:52 src/main_assistant.cpp:49
-msgid "Help with KParts infrastructure"
+#: parts/doxygen/messages.cpp:165
+msgid "LaTeX"
 msgstr ""
 
-#: src/main.cpp:53 src/main_assistant.cpp:50
-msgid "Ada support"
+#: parts/doxygen/messages.cpp:166
+msgid "Generate LaTeX"
 msgstr ""
 
-#: src/main.cpp:55 src/main_assistant.cpp:51
-msgid "QMake projectmanager"
+#: parts/doxygen/messages.cpp:167
+msgid "LaTeX output directory"
 msgstr ""
 
-#: src/main.cpp:56 src/main_assistant.cpp:52
-msgid "MDI modes, QEditor, bugfixes"
+#: parts/doxygen/messages.cpp:168
+msgid "LaTeX command name"
 msgstr ""
 
-#: src/main.cpp:57 src/main_assistant.cpp:53
-msgid "PartExplorer, redesign of CvsPart, patches, bugs(fixes)"
+#: parts/doxygen/messages.cpp:169
+msgid "MakeIndex command name"
 msgstr ""
 
-#: src/main.cpp:58 src/main_assistant.cpp:54
-msgid ""
-"Replace, Bookmarks, FileList and CTags2 plugins. Overall improvements and "
-"patches"
+#: parts/doxygen/messages.cpp:170 parts/doxygen/messages.cpp:185
+msgid "Generate compact output"
 msgstr ""
 
-#: src/main.cpp:59 src/main_assistant.cpp:55
-msgid "Filecreate part and other bits and patches"
+#: parts/doxygen/messages.cpp:171
+msgid "Paper type"
+msgstr "Math papur"
+
+#: parts/doxygen/messages.cpp:172
+msgid "Include extra packages"
 msgstr ""
 
-#: src/main.cpp:60 src/main_assistant.cpp:56
-msgid "ClearCase support"
+#: parts/doxygen/messages.cpp:173
+msgid "LaTeX Header file"
 msgstr ""
 
-#: src/main.cpp:61 src/main_assistant.cpp:57
-msgid "Ruby support"
+#: parts/doxygen/messages.cpp:174
+msgid "Generate PDF hyperlinks"
 msgstr ""
 
-#: src/main.cpp:63 src/main_assistant.cpp:59
-msgid "Kate editor component"
+#: parts/doxygen/messages.cpp:175
+msgid "Use pdflatex"
 msgstr ""
 
-#: src/main.cpp:64 src/main_assistant.cpp:60
-msgid "HTML documentation component"
+#: parts/doxygen/messages.cpp:176
+msgid "Use batch mode"
 msgstr ""
 
-#: src/main.cpp:65 src/main_assistant.cpp:61
-msgid "Fortran documentation"
+#: parts/doxygen/messages.cpp:177
+msgid "Do not include index chapters"
 msgstr ""
 
-#: src/main.cpp:66 src/main_assistant.cpp:62
-msgid "Python documentation utility"
+#: parts/doxygen/messages.cpp:182
+msgid "RTF"
 msgstr ""
 
-#: src/main.cpp:67 src/main_assistant.cpp:63
-msgid "Doxygen wizard"
+#: parts/doxygen/messages.cpp:183
+msgid "Generate RTF"
 msgstr ""
 
-#: src/main.cpp:68 src/main.cpp:69 src/main_assistant.cpp:64
-#: src/main_assistant.cpp:65
-msgid "Fileselector component"
+#: parts/doxygen/messages.cpp:184
+msgid "RTF output directory"
 msgstr ""
 
-#: src/main.cpp:70 src/main_assistant.cpp:66
-msgid "Designer code"
+#: parts/doxygen/messages.cpp:186
+msgid "Generate hyperlinks"
 msgstr ""
 
-#: src/main.cpp:71 src/main_assistant.cpp:67
-msgid "C++ code completion, persistent class store"
+#: parts/doxygen/messages.cpp:188
+msgid "Extensions file"
 msgstr ""
 
-#: src/main.cpp:72 src/main.cpp:73 src/main.cpp:76 src/main_assistant.cpp:68
-#: src/main_assistant.cpp:69 src/main_assistant.cpp:72
-msgid "Patches"
-msgstr "Ysbeidiau"
+#: parts/doxygen/messages.cpp:193
+msgid "Man"
+msgstr ""
 
-#: src/main.cpp:74 src/main_assistant.cpp:70
-msgid "Help with Perl support"
+#: parts/doxygen/messages.cpp:194
+msgid "Generate man pages"
 msgstr ""
 
-#: src/main.cpp:75 src/main_assistant.cpp:71
-msgid "Documentation index view"
+#: parts/doxygen/messages.cpp:195
+msgid "Man output directory"
 msgstr ""
 
-#: src/main.cpp:77 src/main_assistant.cpp:73
-msgid ""
-"Documentation Finder,  qmake projectmanager patches, usability improvements, "
-"bugfixes ... "
+#: parts/doxygen/messages.cpp:196
+msgid "Man extension"
 msgstr ""
 
-#: src/main.cpp:78 src/main_assistant.cpp:74
-msgid "QMake project manager patches"
+#: parts/doxygen/messages.cpp:197
+msgid "Generate links"
 msgstr ""
 
-#: src/main.cpp:79 src/main_assistant.cpp:75
-msgid "Cleanup and bugfixes for qEditor, AutoMake and much other stuff"
+#: parts/doxygen/messages.cpp:203
+msgid "Generate XML"
 msgstr ""
 
-#: src/main.cpp:102 src/main_assistant.cpp:100
-msgid "Loading Settings"
+#: parts/doxygen/messages.cpp:204
+msgid "XML output directory"
 msgstr ""
 
-#: src/main.cpp:113 src/main_assistant.cpp:105
-msgid "Starting GUI"
+#: parts/doxygen/messages.cpp:205
+msgid "XML schema"
 msgstr ""
 
-#: src/partcontroller.cpp:130
-msgid "Open file"
-msgstr "Agor ffeil"
+#: parts/doxygen/messages.cpp:206
+msgid "XML DTD file"
+msgstr ""
 
-#: src/partcontroller.cpp:131
-msgid ""
-"<b>Open file</b>"
-"<p>Opens an existing file without adding it to the project.</p>"
+#: parts/doxygen/messages.cpp:207
+msgid "Dump program listings to the XML output"
 msgstr ""
 
-#: src/partcontroller.cpp:134
-msgid "Opens recently opened file."
+#: parts/doxygen/messages.cpp:212
+msgid "DEF"
 msgstr ""
 
-#: kdevdesigner/designer/kdevdesigner_part.cpp:98 src/partcontroller.cpp:137
-msgid "Save Al&l"
-msgstr "Cadw Po&peth"
+#: parts/doxygen/messages.cpp:213
+msgid "Generate Autogen DEF"
+msgstr ""
 
-#: src/partcontroller.cpp:138
-msgid "Save all modified files"
+#: parts/doxygen/messages.cpp:219
+msgid "Generate Perl module"
 msgstr ""
 
-#: src/partcontroller.cpp:139
-msgid "<b>Save all</b><p>Saves all modified files."
+#: parts/doxygen/messages.cpp:220
+msgid "Generate PDF and DVI using LaTeX"
 msgstr ""
 
-#: src/partcontroller.cpp:142
-msgid "Rever&t All"
+#: parts/doxygen/messages.cpp:221
+msgid "Make the Perl module output human readable"
 msgstr ""
 
-#: src/partcontroller.cpp:143
-msgid "Revert all changes"
+#: parts/doxygen/messages.cpp:222
+msgid "Perl module variable prefix in the makefiles"
 msgstr ""
 
-#: src/partcontroller.cpp:144
-msgid ""
-"<b>Revert all</b>"
-"<p>Reverts all changes in opened files. Prompts to save changes so the "
-"reversion can be canceled for each modified file."
+#: parts/doxygen/messages.cpp:227
+msgid "Preprocessor"
 msgstr ""
 
-#: src/partcontroller.cpp:148
-msgid "Close current file"
+#: parts/doxygen/messages.cpp:228
+msgid "Enable preprocessing"
 msgstr ""
 
-#: src/partcontroller.cpp:149
-msgid "Closes current file."
+#: parts/doxygen/messages.cpp:229
+msgid "Expand macros"
 msgstr ""
 
-#: kdevdesigner/designer/mainwindowactions.cpp:919 src/partcontroller.cpp:152
-msgid "Close All"
-msgstr "Cau Popeth"
+#: parts/doxygen/messages.cpp:230
+msgid "Expand only predefined macros"
+msgstr ""
 
-#: src/partcontroller.cpp:153
-msgid "Close all files"
+#: parts/doxygen/messages.cpp:231
+msgid "Search for includes"
 msgstr ""
 
-#: src/partcontroller.cpp:154
-msgid "<b>Close all</b><p>Close all opened files."
+#: parts/doxygen/messages.cpp:232
+msgid "Include path"
 msgstr ""
 
-#: src/partcontroller.cpp:157 src/simplemainwindow.cpp:611
-msgid "Close All Others"
+#: parts/doxygen/messages.cpp:233
+msgid "Include file patterns"
 msgstr ""
 
-#: src/partcontroller.cpp:158
-msgid "Close other files"
+#: parts/doxygen/messages.cpp:234
+msgid "Predefined macros"
 msgstr ""
 
-#: src/partcontroller.cpp:159
-msgid "<b>Close all others</b><p>Close all opened files except current."
+#: parts/doxygen/messages.cpp:235
+msgid "Expand as defined"
 msgstr ""
 
-#: src/partcontroller.cpp:167
-msgid "<b>Back</b><p>Moves backwards one step in the navigation history."
+#: parts/doxygen/messages.cpp:236
+msgid "Skip function macros"
 msgstr ""
 
-#: src/partcontroller.cpp:174
-msgid "<b>Forward</b><p>Moves forward one step in the navigation history."
+#: parts/doxygen/messages.cpp:241
+msgid "External"
+msgstr "Allanol"
+
+#: parts/doxygen/messages.cpp:242
+msgid "Tagfiles"
 msgstr ""
 
-#: src/partcontroller.cpp:178 src/partcontroller.cpp:180
-msgid "Goto Last Edit Position"
+#: parts/doxygen/messages.cpp:243
+msgid "Generate tagfile"
 msgstr ""
 
-#: src/partcontroller.cpp:181
-msgid ""
-"<b>Goto Last Edit Position</b>"
-"<p>Open the last edited file and position cursor at the point of edit"
+#: parts/doxygen/messages.cpp:244
+msgid "List all externals"
 msgstr ""
 
-#: src/partcontroller.cpp:1008
-msgid ""
-"The file \"%1\" is modified in memory. Are you sure you want to reload it? "
-"(Local changes will be lost.)"
+#: parts/doxygen/messages.cpp:245
+msgid "External groups"
 msgstr ""
 
-#: src/partcontroller.cpp:1009
-msgid "File is Modified"
+#: parts/doxygen/messages.cpp:246
+msgid "Path to Perl"
 msgstr ""
 
-#: buildtools/qmake/trollprojectwidget.cpp:2462 src/partcontroller.cpp:1009
-#: src/partcontroller.cpp:1502
-msgid "Do Not Reload"
+#: parts/doxygen/messages.cpp:251
+msgid "Dot"
 msgstr ""
 
-#: src/partcontroller.cpp:1123
-msgid ""
-"The file \"%1\" is modified on disk.\n"
-"\n"
-"Are you sure you want to overwrite it? (External changes will be lost.)"
+#: parts/doxygen/messages.cpp:252
+msgid "Generate class diagrams"
 msgstr ""
 
-#: src/partcontroller.cpp:1124
-msgid "File Externally Modified"
+#: parts/doxygen/messages.cpp:253
+msgid "Hide undocumented relations"
 msgstr ""
 
-#: parts/filelist/projectviewpart.cpp:494 src/partcontroller.cpp:1124
-msgid "Overwrite"
-msgstr "Trosysgrifo"
+#: parts/doxygen/messages.cpp:254
+msgid "Use dot"
+msgstr ""
 
-#: src/partcontroller.cpp:1124
-msgid "Do Not Overwrite"
-msgstr "Peidio â Throsysgrifo"
+#: parts/doxygen/messages.cpp:255
+msgid "Generate a caller dependency graph"
+msgstr ""
 
-#: src/partcontroller.cpp:1483
-msgid ""
-"Conflict: The file \"%1\" has changed on disk while being modified in memory.\n"
-"\n"
-"You should investigate before saving to make sure you are not losing data."
+#: parts/doxygen/messages.cpp:256
+msgid "Generate class graphs"
 msgstr ""
 
-#: src/partcontroller.cpp:1485
-msgid "Conflict"
+#: parts/doxygen/messages.cpp:257
+msgid "Generate collaboration graphs"
 msgstr ""
 
-#: src/partcontroller.cpp:1492
-msgid ""
-"Warning: The file \"%1\" has been deleted on disk.\n"
-"\n"
-"If this was not your intention, make sure to save this file now."
+#: parts/doxygen/messages.cpp:258
+msgid "Generate a graph showing the direct groups dependencies"
 msgstr ""
 
-#: src/partcontroller.cpp:1494
-#, fuzzy
-msgid "File Deleted"
-msgstr "Dewisydd Ffeiliau"
+#: parts/doxygen/messages.cpp:259
+msgid "Generate UML looking inheritance and colloboration diagrams"
+msgstr ""
 
-#: src/partcontroller.cpp:1501
-msgid ""
-"The file \"%1\" has changed on disk.\n"
-"\n"
-"Do you want to reload it?"
+#: parts/doxygen/messages.cpp:260
+msgid "Show relations between templates and their instances"
 msgstr ""
 
-#: src/partcontroller.cpp:1502
-msgid "File Changed"
-msgstr "Ffeil wedi Newid"
+#: parts/doxygen/messages.cpp:261
+msgid "Generate include graphs"
+msgstr ""
 
-#: src/partcontroller.cpp:1801 src/partcontroller.cpp:1822
-msgid "unnamed"
-msgstr "di-enw"
+#: parts/doxygen/messages.cpp:262
+msgid "Generate included-by graphs"
+msgstr ""
 
-#: src/main.cpp:26
-msgid "Files to load"
-msgstr "Ffeiliau i'w llwytho"
+#: parts/doxygen/messages.cpp:263
+msgid ""
+"Generate a call dependency graph for every global function or class method"
+msgstr ""
 
-#: src/main.cpp:32
-msgid "The KDevelop Integrated Development Environment"
+#: parts/doxygen/messages.cpp:264
+msgid "Generate graphical hierarchy"
 msgstr ""
 
-#: src/main.cpp:33
-msgid "KDevelop"
+#: parts/doxygen/messages.cpp:265
+msgid "Show the dependencies a directory has on other directories"
 msgstr ""
 
-#: src/main.cpp:38
-msgid "Advanced C++ code completion, C++ support, overall improvements"
+#: parts/doxygen/messages.cpp:266
+msgid "Dot image format"
 msgstr ""
 
-#: src/main.cpp:49
-msgid ""
-"Automake manager patches, Astyle plugin update, plugin patches and improvements"
+#: parts/doxygen/messages.cpp:267
+msgid "Path to dot"
 msgstr ""
 
-#: src/main.cpp:54
-msgid "QMake projectmanager, Qt4 Support"
+#: parts/doxygen/messages.cpp:268
+msgid "Directories with extra dot files"
 msgstr ""
 
-#: src/main.cpp:80
-msgid "SnippetPart, debugger and usability patches"
+#: parts/doxygen/messages.cpp:269
+msgid "Maximum graph width"
 msgstr ""
 
-#: src/main.cpp:81
-msgid "Artwork for the Ruby language"
+#: parts/doxygen/messages.cpp:270
+msgid "Maximum graph height"
 msgstr ""
 
-#: src/simplemainwindow.cpp:98
-msgid ""
-"Unable to find plugins, KDevelop will not work properly.\n"
-"Please make sure that KDevelop is installed in your TDE directory; otherwise, "
-"you have to add KDevelop's installation path to the environment variable "
-"TDEDIRS and run tdebuildsycoca. Restart KDevelop afterwards.\n"
-"Example for BASH users:\n"
-"export TDEDIRS=/path/to/tdevelop:$TDEDIRS && tdebuildsycoca"
+#: parts/doxygen/messages.cpp:271
+msgid "Maximum graph depth"
 msgstr ""
 
-#: src/simplemainwindow.cpp:105
-msgid "Could Not Find Plugins"
+#: parts/doxygen/messages.cpp:272
+msgid "Generate images with a transparent background"
 msgstr ""
 
-#: src/simplemainwindow.cpp:411
-msgid "Raise &Editor"
+#: parts/doxygen/messages.cpp:273
+msgid "Generate multiple output files in one run"
 msgstr ""
 
-#: src/simplemainwindow.cpp:413
-msgid "Raise editor"
+#: parts/doxygen/messages.cpp:274
+msgid "Generate legend"
 msgstr ""
 
-#: src/simplemainwindow.cpp:414
-msgid "<b>Raise editor</b><p>Focuses the editor."
+#: parts/doxygen/messages.cpp:275
+msgid "Remove intermediate files"
 msgstr ""
 
-#: src/simplemainwindow.cpp:416
-#, fuzzy
-msgid "Lower All Docks"
-msgstr "Dociau &Offer"
+#: parts/doxygen/messages.cpp:281
+msgid "Search engine"
+msgstr "Peiriant Chwilio"
 
-#: src/simplemainwindow.cpp:419
-msgid "Switch to next TabWidget"
+#: parts/doxygen/messages.cpp:282
+msgid "CGI name"
 msgstr ""
 
-#: src/simplemainwindow.cpp:422 src/simplemainwindow.cpp:430
-msgid "Split &Horizontal"
-msgstr "Rhannu'n &Llorweddol"
+#: parts/doxygen/messages.cpp:283
+msgid "CGI URL"
+msgstr ""
 
-#: src/simplemainwindow.cpp:426 src/simplemainwindow.cpp:434
-msgid "Split &Vertical"
-msgstr "Rhannu'n &Fertigol"
+#: parts/doxygen/messages.cpp:284
+msgid "Documentation URL"
+msgstr ""
 
-#: src/simplemainwindow.cpp:438
-#, fuzzy
-msgid "Split &Horizontal and Open"
-msgstr "Rhannu'n &Llorweddol"
+#: parts/doxygen/messages.cpp:285
+msgid "Absolute path to documentation"
+msgstr ""
 
-#: src/simplemainwindow.cpp:442
-#, fuzzy
-msgid "Split &Vertical and Open"
-msgstr "Rhannu'n &Fertigol"
+#: parts/doxygen/messages.cpp:286
+msgid "Absolute path to doxysearch binary"
+msgstr ""
 
-#: src/simplemainwindow.cpp:446
-msgid "Switch Left Dock"
-msgstr "Newid y Doc ar y Chwith"
+#: parts/doxygen/messages.cpp:287
+msgid "Paths to external documentation"
+msgstr ""
 
-#: src/simplemainwindow.cpp:449
-msgid "Switch Right Dock"
-msgstr "Newid y Doc ar y Dde"
+#: parts/doxygen/input.cpp:223 parts/doxygen/input.cpp:366
+msgid "Browse to a file"
+msgstr ""
 
-#: src/simplemainwindow.cpp:452
-msgid "Switch Bottom Dock"
-msgstr "Newid y Doc wrth y Gwaelod"
+#: parts/doxygen/input.cpp:223 parts/doxygen/input.cpp:372
+msgid "Browse to a folder"
+msgstr ""
 
-#: src/simplemainwindow.cpp:621
-msgid "Duplicate"
-msgstr "Dyblyg"
+#: parts/doxygen/input.cpp:341
+msgid "Add item"
+msgstr "Ychwanegu Eitem"
 
-#: src/editorproxy.cpp:48
-msgid "Show Context Menu"
+#: parts/doxygen/input.cpp:346
+msgid "Delete selected item"
 msgstr ""
 
-#: src/projectsession.cpp:81
+#: parts/doxygen/input.cpp:351
+msgid "Update selected item"
+msgstr ""
+
+#: parts/doxygen/doxygenpart.cpp:61
+msgid "Build API Documentation"
+msgstr ""
+
+#: parts/doxygen/doxygenpart.cpp:64
+msgid "Build API documentation"
+msgstr ""
+
+#: parts/doxygen/doxygenpart.cpp:65
 msgid ""
-"The file %1 does not contain valid XML.\n"
-"The loading of the session failed."
+"<b>Build API documentation</b>"
+"<p>Runs doxygen on a project Doxyfile to generate API documentation. If the "
+"search engine is enabled in Doxyfile, this also runs doxytag to create it."
 msgstr ""
 
-#: src/projectsession.cpp:94
+#: parts/doxygen/doxygenpart.cpp:68
+msgid "Clean API Documentation"
+msgstr ""
+
+#: parts/doxygen/doxygenpart.cpp:71
+msgid "Clean API documentation"
+msgstr ""
+
+#: parts/doxygen/doxygenpart.cpp:72
 msgid ""
-"The file %1 does not contain a valid KDevelop project session "
-"('KDevPrjSession').\n"
+"<b>Clean API documentation</b>"
+"<p>Removes all generated by doxygen files."
 msgstr ""
 
-#: src/projectsession.cpp:95
-msgid "The document type seems to be: '%1'."
+#: parts/doxygen/doxygenpart.cpp:77
+msgid "Doxygen"
 msgstr ""
 
-#: src/generalinfowidget.cpp:58
-msgid "Use global editor settings"
+#: parts/doxygen/doxygenpart.cpp:81
+msgid "Document Current Function"
 msgstr ""
 
-#: src/generalinfowidget.cpp:95
-#, fuzzy
-msgid "Could not open %1 for reading."
-msgstr "Methu canfod ein rhan."
+#: parts/doxygen/doxygenpart.cpp:82
+msgid "Create a documentation template above a function"
+msgstr ""
 
-#: src/generalinfowidget.cpp:155
-#, fuzzy
-msgid "Could not open %1 for writing."
-msgstr "Methu canfod ein rhan."
+#: parts/doxygen/doxygenpart.cpp:83
+msgid ""
+"<b>Document Current Function</b>"
+"<p>Creates a documentation template according to a function's signature above a "
+"function definition/declaration."
+msgstr ""
 
-#: src/generalinfowidget.cpp:186
+#: parts/doxygen/doxygenpart.cpp:87
+msgid "Preview Doxygen Output"
+msgstr ""
+
+#: parts/doxygen/doxygenpart.cpp:88
+msgid "Show a preview of the Doxygen output of this file"
+msgstr ""
+
+#: parts/doxygen/doxygenpart.cpp:89
 msgid ""
-"Could not find configure.in.in, configure.in or configure.ac to update the "
-"project version."
+"<b>Preview Doxygen output</b>"
+"<p>Runs Doxygen over the current file and shows the created index.html."
 msgstr ""
 
-#: src/generalinfowidget.cpp:215
-msgid "Please enter a path."
+#: parts/doxygen/doxygenconfigwidget.cpp:258 parts/doxygen/doxygenpart.cpp:205
+msgid "Cannot write Doxyfile."
 msgstr ""
 
-#: src/generalinfowidget.cpp:220
-msgid "'%1' is not an absolute path."
+#: parts/doxygen/doxygenpart.cpp:370
+msgid "Another process is still running. Please wait until it's finished."
 msgstr ""
 
-#: src/generalinfowidget.cpp:226
-msgid "'%1' is not a relative path."
+#: parts/doxygen/doxygenpart.cpp:451
+msgid "Cannot create temporary file '%1'"
 msgstr ""
 
-#: src/generalinfowidget.cpp:234
-msgid "'%1' does not exist."
+#: kdevdesigner/designer/mainwindowactions.cpp:987
+#: parts/documentation/find_documentation.cpp:178
+#: parts/documentation/find_documentation_options.cpp:163
+msgid "Manual"
+msgstr "Â llaw"
+
+#: parts/documentation/find_documentation_options.cpp:168
+msgid "Info"
+msgstr "Gwybo"
+
+#: parts/documentation/find_documentation_options.cpp:178
+msgid "Google"
+msgstr "Google"
+
+#: parts/documentation/docconfiglistview.cpp:30
+msgid "TOC"
 msgstr ""
 
-#: src/generalinfowidget.cpp:238
-msgid "'%1' is not a directory."
+#: kdevdesigner/designer/mainwindow.cpp:1759
+#: kdevdesigner/designer/mainwindow.cpp:2665
+#: parts/documentation/bookmarkview.cpp:118
+#: parts/documentation/docconfiglistview.cpp:33
+#: parts/documentation/searchview.cpp:74 parts/documentation/searchview.cpp:99
+msgid "Title"
+msgstr "Teitl"
+
+#: kdevdesigner/designer/hierarchyview.cpp:1050
+#: kdevdesigner/designer/hierarchyview.cpp:1055
+#: kdevdesigner/designer/mainwindow.cpp:1680
+#: parts/documentation/bookmarkview.cpp:126
+#: parts/snippet/snippet_widget.cpp:557 parts/snippet/snippet_widget.cpp:559
+msgid "Edit..."
+msgstr "Golygu..."
+
+#: parts/documentation/bookmarkview.cpp:198
+msgid "Edit Bookmark"
 msgstr ""
 
-#: src/generalinfowidget.cpp:264 src/generalinfowidget.cpp:267
-msgid "'%1' is a valid project directory."
+#: parts/documentation/bookmarkview.cpp:222
+msgid "Current Document"
 msgstr ""
 
-#: src/plugincontroller.cpp:150
-#, c-format
-msgid "Loading: %1"
-msgstr "llwytho : %1"
+#: parts/documentation/bookmarkview.cpp:223
+msgid "Custom..."
+msgstr "Addasu ..."
 
-#: src/plugincontroller.cpp:219
-msgid ""
-"<b>Could not load plugin</b>"
-"<br>Plugin %1 could not be loaded"
-"<br>Library loader error: %2"
+#: parts/documentation/bookmarkview.cpp:241
+msgid "Add Bookmark"
+msgstr "Ychwanegu Tudnod"
+
+#: parts/documentation/documentation_widget.cpp:59
+msgid "Finder"
 msgstr ""
 
-#: src/plugincontroller.cpp:223
-#, fuzzy
-msgid "Could not load plugin"
-msgstr "Methu llwytho ffeil. '%1'"
+#: parts/documentation/searchview.cpp:58
+msgid "Wor&ds to search:"
+msgstr ""
 
-#: src/statusbar.cpp:101
-msgid " Line: %1 Col: %2 "
-msgstr "Llinell: %1 Col: %2"
+#: parts/documentation/searchview.cpp:63
+msgid "Se&arch"
+msgstr "Ch&wilio"
 
-#: src/languageselectwidget.cpp:65
-msgid "Additional Language Support"
+#: parts/documentation/searchview.cpp:69
+msgid "and"
+msgstr "a"
+
+#: parts/documentation/searchview.cpp:70
+msgid "or"
+msgstr "neu"
+
+#: parts/documentation/searchview.cpp:71
+msgid "&Method:"
+msgstr "&Dull:"
+
+#: parts/documentation/searchview.cpp:73
+msgid "Score"
+msgstr "Sgôr"
+
+#: parts/documentation/searchview.cpp:75 vcs/cvsservice/editorsdialog.cpp:88
+#: vcs/cvsservice/editorsdialog.cpp:101 vcs/subversion/svn_blamewidget.cpp:37
+#: vcs/subversion/svn_logviewwidget.cpp:52
+msgid "Date"
+msgstr "Dyddiad"
+
+#: parts/documentation/searchview.cpp:76
+msgid "S&ort by:"
 msgstr ""
 
-#: src/languageselectwidget.cpp:115
-msgid ""
-"Primary language is '%1'. Please select additional languages the project might "
-"contain."
+#: parts/documentation/searchview.cpp:84
+msgid "Search &results:"
 msgstr ""
 
-#: src/projectmanager.cpp:96
-msgid "&Open Project..."
-msgstr "&Agor Cywaith..."
+#: parts/documentation/searchview.cpp:89
+msgid "Update Config"
+msgstr ""
 
-#: src/projectmanager.cpp:99
-msgid "Open project"
-msgstr "Agor Cywaith"
+#: parts/documentation/searchview.cpp:90
+msgid "Update Index"
+msgstr ""
 
-#: src/projectmanager.cpp:100
-msgid "<b>Open project</b><p>Opens a KDevelop3 or KDevelop2 project."
+#: parts/documentation/searchview.cpp:98
+msgid "Relevance"
 msgstr ""
 
-#: src/projectmanager.cpp:103
-msgid "Open &Recent Project"
-msgstr "Agor &Cywaith Diweddar"
+#: parts/documentation/searchview.cpp:148
+msgid "Full text search has to be set up before usage."
+msgstr ""
 
-#: src/projectmanager.cpp:106
-msgid "Open recent project"
-msgstr "Agor Cywaith Diweddar"
+#: parts/documentation/searchview.cpp:151
+msgid ""
+"Now the full text search database will be created.\n"
+"Wait for database creation to finish and then repeat search."
+msgstr ""
 
-#: src/projectmanager.cpp:107
-msgid "<b>Open recent project</b><p>Opens recently opened project."
+#: parts/documentation/searchview.cpp:158
+msgid ""
+"Cannot find the htsearch executable.\n"
+"It is part of the ht://Dig package that is used by TDevelop to perform full "
+"text search. Please install ht://Dig and use Documentation page in Configure "
+"TDevelop dialog to set the htsearch location."
 msgstr ""
 
-#: src/projectmanager.cpp:111
-msgid "C&lose Project"
-msgstr "C&au Cywaith"
+#: parts/documentation/searchview.cpp:174
+msgid "Cannot find the htdig configuration file."
+msgstr ""
 
-#: src/projectmanager.cpp:115
-msgid "Close project"
-msgstr "Cau Cywaith"
+#: parts/documentation/searchview.cpp:207
+msgid "Cannot start the htsearch executable."
+msgstr ""
 
-#: src/projectmanager.cpp:116
-msgid "<b>Close project</b><p>Closes the current project."
+#: parts/documentation/documentation_part.cpp:88
+msgid "Project Documentation"
 msgstr ""
 
-#: src/projectmanager.cpp:118
-#, fuzzy
-msgid "Project &Options"
-msgstr "Gosodiadau Cywaith"
+#: parts/documentation/documentation_part.cpp:99
+msgid ""
+"<b>Documentation browser</b>"
+"<p>The documentation browser gives access to various documentation sources (TQt "
+"DCF, Doxygen, KDoc, KDevelopTOC and DevHelp documentation) and the TDevelop "
+"manuals. It also provides documentation index and full text search "
+"capabilities."
+msgstr ""
 
-#: src/projectmanager.cpp:121
-msgid "Project options"
+#: parts/documentation/documentation_part.cpp:106
+msgid "Documentation browser"
 msgstr ""
 
-#: src/projectmanager.cpp:122
-msgid "<b>Project options</b><p>Lets you customize project options."
+#: parts/documentation/documentation_part.cpp:193
+msgid "Documentation Settings"
 msgstr ""
 
-#: src/projectmanager.cpp:133
+#: parts/documentation/documentation_part.cpp:212
+msgid "&Search in Documentation..."
+msgstr ""
+
+#: parts/documentation/documentation_part.cpp:215
+msgid "Full text search in the documentation"
+msgstr ""
+
+#: parts/documentation/documentation_part.cpp:216
 msgid ""
-"*.tdevelop|KDevelop 3 Project Files\n"
-"*.kdevprj|KDevelop 2 Project Files"
+"<b>Search in documentation</b>"
+"<p>Opens the Search in documentation tab. It allows a search term to be entered "
+"which will be searched for in the documentation. For this to work, a full text "
+"index must be created first, which can be done in the configuration dialog of "
+"the documentation plugin."
 msgstr ""
 
-#: kdevdesigner/designer/mainwindow.cpp:3085 src/projectmanager.cpp:135
-msgid "Open Project"
-msgstr "Agor Cywaith"
+#: parts/documentation/documentation_part.cpp:223
+msgid "&Look in Documentation Index..."
+msgstr ""
 
-#: src/projectmanager.cpp:224
-msgid "Are you sure you want to reopen the current project?"
+#: parts/documentation/documentation_part.cpp:226
+msgid "Look in the documentation index"
 msgstr ""
 
-#: src/projectmanager.cpp:224
-#, fuzzy
-msgid "Reopen"
-msgstr "G&waredu"
+#: parts/documentation/documentation_part.cpp:227
+#: parts/documentation/documentation_part.cpp:479
+msgid ""
+"<b>Look in documentation index</b>"
+"<p>Opens the documentation index tab. It allows a term to be entered which will "
+"be looked for in the documentation index."
+msgstr ""
 
-#: src/projectmanager.cpp:224
-#, fuzzy
-msgid "Do Not Reopen"
-msgstr "Dogfen i'w hagor"
+#: parts/documentation/documentation_part.cpp:232
+msgid "Man Page..."
+msgstr ""
 
-#: src/projectmanager.cpp:278
-msgid "Changing plugin profile..."
+#: parts/documentation/documentation_part.cpp:235
+msgid "Show a manpage"
 msgstr ""
 
-#: src/projectmanager.cpp:281
-msgid "Loading project plugins..."
+#: parts/documentation/documentation_part.cpp:236
+msgid "<b>Show a manpage</b><p>Opens a man page using embedded viewer."
 msgstr ""
 
-#: src/projectmanager.cpp:290
-msgid "error during restoring of the KDevelop session !"
+#: parts/documentation/documentation_part.cpp:238
+msgid "Info Page..."
 msgstr ""
 
-#: src/projectmanager.cpp:306
-msgid "Project loaded."
+#: parts/documentation/documentation_part.cpp:241
+msgid "Show an infopage"
 msgstr ""
 
-#: src/projectmanager.cpp:358 src/projectmanager.cpp:366
-#, c-format
-msgid "Could not read project file: %1"
+#: parts/documentation/documentation_part.cpp:242
+msgid "<b>Show an infopage</b><p>Opens an info page using embedded viewer."
 msgstr ""
 
-#: parts/appwizard/appwizarddlg.cpp:1016 parts/appwizard/importdlg.cpp:152
-#: src/projectmanager.cpp:375
+#: parts/documentation/documentation_part.cpp:244
+#, fuzzy
+msgid "Find Documentation..."
+msgstr "Dogfenniaeth"
+
+#: parts/documentation/documentation_part.cpp:248
+#: parts/documentation/documentation_part.cpp:470
 msgid ""
-"This is not a valid project file.\n"
-"XML error in line %1, column %2:\n"
-"%3"
+"<b>Find documentation</b>"
+"<p>Opens the documentation finder tab and searches all possible sources of "
+"documentation like table of contents, index, man and info databases, Google, "
+"etc."
 msgstr ""
 
-#: src/projectmanager.cpp:385
-msgid "This is not a valid project file."
+#: parts/documentation/documentation_part.cpp:318
+msgid "Show Manual Page"
 msgstr ""
 
-#: src/projectmanager.cpp:406 src/projectmanager.cpp:417
-msgid "Could not write the project file."
+#: parts/documentation/documentation_part.cpp:318
+msgid "Show manpage on:"
 msgstr ""
 
-#: src/projectmanager.cpp:488
-msgid "No project management plugin %1 found."
+#: parts/documentation/documentation_part.cpp:342
+msgid "Show Info Page"
 msgstr ""
 
-#: src/projectmanager.cpp:498
-#, c-format
-msgid "Could not create project management plugin %1."
+#: parts/documentation/documentation_part.cpp:342
+msgid "Show infopage on:"
 msgstr ""
 
-#: src/projectmanager.cpp:544
-msgid "No language plugin for %1 found."
+#: parts/documentation/documentation_part.cpp:468
+#, c-format
+msgid "Find Documentation: %1"
 msgstr ""
 
-#: src/projectmanager.cpp:558
+#: parts/documentation/documentation_part.cpp:477
 #, c-format
-msgid "Could not create language plugin for %1."
+msgid "Look in Documentation Index: %1"
 msgstr ""
 
-#: src/projectmanager.cpp:617
-msgid "Invalid URL."
-msgstr "URL annilys."
+#: parts/documentation/documentation_part.cpp:485
+#, c-format
+msgid "Search in Documentation: %1"
+msgstr ""
 
-#: src/projectmanager.cpp:623
-msgid "You do not have 'kdevprj2tdevelop' installed."
+#: parts/documentation/documentation_part.cpp:487
+msgid ""
+"<b>Search in documentation</b>"
+"<p>Searches for a term under the cursor in the documentation. For this to work, "
+"a full text index must be created first, which can be done in the configuration "
+"dialog of the documentation plugin."
 msgstr ""
 
-#: src/splashscreen.cpp:77
+#: parts/documentation/documentation_part.cpp:494
 #, c-format
-msgid "Version %1"
-msgstr "Fersiwn %1"
+msgid "Goto Manpage: %1"
+msgstr ""
 
-#: src/newui/ddockwindow.cpp:88
-#, fuzzy
-msgid "Move to left dock"
-msgstr "Symud i'r Chwith"
+#: parts/documentation/documentation_part.cpp:496
+msgid ""
+"<b>Goto manpage</b>"
+"<p>Tries to open a man page for the term under the cursor."
+msgstr ""
 
-#: src/newui/ddockwindow.cpp:89
-#, fuzzy
-msgid "Move to right dock"
-msgstr "Symud i'r Dde"
+#: parts/documentation/documentation_part.cpp:499
+#, c-format
+msgid "Goto Infopage: %1"
+msgstr ""
 
-#: src/newui/ddockwindow.cpp:90
-msgid "Move to bottom dock"
+#: parts/documentation/documentation_part.cpp:501
+msgid ""
+"<b>Goto infopage</b>"
+"<p>Tries to open an info page for the term under the cursor."
 msgstr ""
 
-#: src/newui/button.cpp:58
-#, fuzzy
-msgid "Assign Accelerator..."
-msgstr "Gwirio Cyflymyddion"
+#: parts/documentation/docutils.cpp:80
+msgid "Open in Current Tab"
+msgstr ""
 
-#: src/newui/button.cpp:60
-#, fuzzy
-msgid "Clear Accelerator"
-msgstr "Gwirio Cyflymyddion"
+#: lib/widgets/kdevhtmlpart.cpp:99 parts/documentation/docutils.cpp:81
+msgid "Open in New Tab"
+msgstr "Agor mewn Tab Newydd"
 
-#: src/newui/button.cpp:318
-msgid "Change Button Number"
+#: parts/documentation/docutils.cpp:85
+msgid "Bookmark This Location"
+msgstr "Tudnodi'r Lleoliad Yma"
+
+#: parts/documentation/indexview.cpp:48
+msgid "&Look for:"
+msgstr "&Edrych am:"
+
+#: parts/documentation/plugins/chm/docchmplugin.cpp:75
+msgid "CHM Documentation Collection"
 msgstr ""
 
-#: src/newui/button.cpp:318
-msgid "New accelerator number:"
+#: parts/documentation/plugins/custom/doccustomplugin.cpp:55
+msgid "Custom Documentation Collection"
 msgstr ""
 
-#: src/profileengine/editor/main.cpp:33
-msgid "KDevelop Profile Editor"
+#: parts/documentation/plugins/doxygen/docdoxygenplugin.cpp:126
+msgid "Doxygen Documentation Collection"
 msgstr ""
 
-#: src/profileengine/editor/main.cpp:34
-msgid "(c) 2004, The KDevelop Developers"
+#: parts/documentation/plugins/doxygen/docdoxygenplugin.cpp:453
+msgid "%1 Class Reference"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:29
-#: src/profileengine/editor/profileeditor.cpp:141
-msgid "Project"
-msgstr "Cywaith"
+#: parts/documentation/plugins/doxygen/docdoxygenplugin.cpp:470
+msgid "%1::%2%3 Member Reference"
+msgstr ""
 
-#: src/profileengine/editor/profileeditor.cpp:201
-#, fuzzy
-msgid "Core Plugins"
-msgstr "Gosodiadau Cywaith"
+#: parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp:80
+msgid "TDevelopTOC Documentation Collection"
+msgstr ""
 
-#: src/profileengine/editor/profileeditor.cpp:203
+#: parts/documentation/plugins/qt/docqtplugin.cpp:195
 #, fuzzy
-msgid "Global Plugins"
-msgstr "Ategion"
+msgid "TQt Documentation Collection"
+msgstr "Dogfen i'w hagor"
 
-#: src/profileengine/editor/profileeditor.cpp:205
-#, fuzzy
-msgid "Project Plugins"
-msgstr "Gosodiadau Cywaith"
+#: parts/documentation/plugins/devhelp/docdevhelpplugin.cpp:120
+msgid "Devhelp Documentation Collection"
+msgstr ""
 
-#: src/profileengine/editor/profileeditor.cpp:254
-msgid "Remove selected profile and all its subprofiles?"
+#: parts/documentation/plugins/djvu/docdjvuplugin.cpp:30
+msgid "Djvu documentation plugin"
 msgstr ""
 
-#: src/profileengine/editor/profileeditor.cpp:267
-msgid ""
-"Cannot remove this profile because it is not a local (user-created) profile."
+#: parts/documentation/plugins/djvu/docdjvuplugin.cpp:52
+msgid "Djvu Documentation Collection"
 msgstr ""
 
-#: src/profileengine/editor/profileeditor.cpp:329
-msgid "This plugin is already contained in the list of disabled plugins."
+#: parts/documentation/plugins/pdb/docpdbplugin.cpp:30
+msgid "PalmDoc documentation plugin"
 msgstr ""
 
-#: src/profileengine/editor/profileeditor.cpp:330
-#, fuzzy
-msgid "Enable Plugin"
-msgstr "Galluogi"
+#: parts/documentation/plugins/pdb/docpdbplugin.cpp:52
+msgid "PalmDoc Documentation Collection"
+msgstr ""
 
-#: src/profileengine/editor/profileeditor.cpp:375
-msgid "This plugin is already contained in the list of enabled plugins."
+#: parts/documentation/plugins/pdf/docpdfplugin.cpp:30
+msgid "PDF documentation plugin"
 msgstr ""
 
-#: src/profileengine/editor/profileeditor.cpp:376
-#, fuzzy
-msgid "Disable Plugin"
-msgstr "Analluogi"
+#: parts/documentation/plugins/pdf/docpdfplugin.cpp:52
+msgid "PDF Documentation Collection"
+msgstr ""
 
-#: vcs/clearcase/clearcasepart.cpp:89 vcs/perforce/perforcepart.cpp:97
+#: parts/documentation/tools/htdig/htdigindex.cpp:43
+msgid "Generating Search Index"
+msgstr ""
+
+#: parts/documentation/tools/htdig/htdigindex.cpp:63
+msgid "Scanning for files"
+msgstr "Syllu am Ffeiliau"
+
+#: parts/documentation/tools/htdig/htdigindex.cpp:73
+msgid "Extracting search terms"
+msgstr "All-dynnu termau'r chwiliad"
+
+#: parts/documentation/tools/htdig/htdigindex.cpp:82
+msgid "Generating index..."
+msgstr "Creu mynegai..."
+
+#: parts/documentation/tools/htdig/htdigindex.cpp:125
 #, c-format
-msgid "Actions for %1"
+msgid "Files processed: %1"
+msgstr "Ffeiliau a gafodd eu prosesu: %1"
+
+#: parts/documentation/tools/htdig/htdigindex.cpp:350
+msgid "Running htdig failed"
 msgstr ""
 
-#: vcs/clearcase/clearcasepart.cpp:90
-msgid "Checkin"
+#: parts/documentation/tools/htdig/htdigindex.cpp:411
+msgid "Running htmerge failed"
 msgstr ""
 
-#: vcs/clearcase/clearcasepart.cpp:92
-msgid "Checkout"
+#: parts/documentation/tools/htdig/htdigindex.cpp:448
+msgid "Update user's htdig configuration file only"
 msgstr ""
 
-#: vcs/clearcase/clearcasepart.cpp:94
-msgid "Uncheckout"
+#: parts/documentation/tools/htdig/htdigindex.cpp:449
+msgid "-c and generate index"
 msgstr ""
 
-#: vcs/clearcase/clearcasepart.cpp:97
-msgid "Create Element"
+#: parts/documentation/tools/htdig/htdigindex.cpp:453
+msgid "TDevelop ht://Dig Indexer"
 msgstr ""
 
-#: vcs/clearcase/clearcasepart.cpp:99
-msgid "Remove Element"
+#: parts/documentation/tools/htdig/htdigindex.cpp:454
+msgid "TDE Index generator for documentation files."
 msgstr ""
 
-#: vcs/clearcase/clearcasepart.cpp:102
-msgid "History"
-msgstr "Hanes"
+#: parts/documentation/tools/htdig/htdigindex.cpp:470
+#, fuzzy
+msgid "Configuration file updated."
+msgstr "Ffurfwedd :"
 
-#: parts/diff/diffpart.cpp:52 vcs/clearcase/clearcasepart.cpp:105
-msgid "Diff"
-msgstr "Diff"
+#: parts/documentation/tools/htdig/htdigindex.cpp:472
+msgid "Configuration file update failed."
+msgstr ""
 
-#: vcs/clearcase/clearcasepart.cpp:109
-msgid "List Checkouts"
+#: parts/documentation/protocols/chm/kchmpart.cpp:62
+msgid "KChm"
 msgstr ""
 
-#: vcs/clearcase/clearcasepart.cpp:112
-msgid "Clearcase"
+#: parts/ctags2/ctags2_widget.cpp:107
+#, c-format
+msgid "Hits: %1"
+msgstr "Trawiadau : %1"
+
+#: parts/ctags2/ctags2_widget.cpp:155
+msgid "No CTags database found"
 msgstr ""
 
-#: vcs/clearcase/clearcasepart.cpp:320
-msgid "Clearcase output errors during diff."
+#: parts/ctags2/ctags2_part.cpp:80
+msgid ""
+"<b>CTags</b>"
+"<p>Result view for a tag lookup. Click a line to go to the corresponding place "
+"in the code."
 msgstr ""
 
-#: vcs/clearcase/clearcasepart.cpp:320 vcs/clearcase/clearcasepart.cpp:326
-#: vcs/cvsservice/cvspartimpl.cpp:941 vcs/cvsservice/cvspartimpl.cpp:949
-#: vcs/perforce/perforcepart.cpp:258 vcs/perforce/perforcepart.cpp:264
-msgid "Errors During Diff"
+#: parts/ctags2/ctags2_part.cpp:81
+msgid "CTags Lookup"
 msgstr ""
 
-#: vcs/clearcase/clearcasepart.cpp:325
-msgid "Clearcase outputted errors during diff. Do you still want to continue?"
+#: parts/ctags2/ctags2_part.cpp:82 parts/ctags2/ctags2_part.cpp:87
+#, fuzzy
+msgid "CTags"
+msgstr "Baneri"
+
+#: parts/ctags2/ctags2_part.cpp:82
+msgid "CTags lookup results"
 msgstr ""
 
-#: vcs/clearcase/clearcasepart.cpp:332 vcs/cvsservice/cvspartimpl.cpp:957
-#: vcs/perforce/perforcepart.cpp:270
-msgid "There is no difference to the repository."
+#: parts/ctags2/ctags2_part.cpp:91
+msgid "Lookup Current Text"
 msgstr ""
 
-#: vcs/clearcase/clearcasepart.cpp:332 vcs/cvsservice/cvspartimpl.cpp:958
-msgid "No Difference Found"
+#: parts/ctags2/ctags2_part.cpp:92
+msgid "Lookup Current Text as Declaration"
 msgstr ""
 
-#: vcs/clearcase/commentdlg.cpp:26
-msgid "Clearcase Comment"
+#: parts/ctags2/ctags2_part.cpp:93
+msgid "Lookup Current Text as Definition"
 msgstr ""
 
-#: vcs/clearcase/commentdlg.cpp:30
-msgid "Enter log message:"
+#: parts/ctags2/ctags2_part.cpp:94
+msgid "Jump to Next Match"
 msgstr ""
 
-#: vcs/clearcase/commentdlg.cpp:41
-#, fuzzy
-msgid "Reserve"
-msgstr "&Adfer"
+#: parts/ctags2/ctags2_part.cpp:95
+msgid "Open Lookup Dialog"
+msgstr ""
 
-#: vcs/subversion/subversion_part.cpp:86
-msgid "Subversion Output"
+#: parts/ctags2/ctags2_part.cpp:197
+#, c-format
+msgid "CTags - Go to Declaration: %1"
 msgstr ""
 
-#: vcs/subversion/subversion_part.cpp:87
-#: vcs/subversion/subversion_part.cpp:261
-msgid "Subversion"
+#: parts/ctags2/ctags2_part.cpp:200
+#, c-format
+msgid "CTags - Go to Definition: %1"
 msgstr ""
 
-#: vcs/subversion/subversion_part.cpp:87
-msgid "Subversion messages"
+#: parts/ctags2/ctags2_part.cpp:203
+#, c-format
+msgid "CTags - Lookup: %1"
 msgstr ""
 
-#: vcs/subversion/subversion_part.cpp:88
-msgid "<b>Subversion</b><p>Subversion operations window."
+#: parts/ctags2/ctagskinds.cpp:29
+msgid "define"
 msgstr ""
 
-#: vcs/subversion/subversion_part.cpp:101
-#, fuzzy
-msgid "&Commit to Repository..."
-msgstr "&Adfer"
+#: parts/ctags2/ctagskinds.cpp:30 parts/ctags2/ctagskinds.cpp:98
+msgid "label"
+msgstr "label"
 
-#: vcs/cvsservice/cvspart.cpp:148 vcs/subversion/subversion_part.cpp:102
-msgid "Commit file(s)"
+#: parts/ctags2/ctagskinds.cpp:31 parts/ctags2/ctagskinds.cpp:60
+#: parts/ctags2/ctagskinds.cpp:127
+msgid "macro"
 msgstr ""
 
-#: vcs/cvsservice/cvspart.cpp:149 vcs/cvsservice/cvspart.cpp:324
-#: vcs/subversion/subversion_part.cpp:103
-#: vcs/subversion/subversion_part.cpp:223
-msgid "<b>Commit file(s)</b><p>Commits file to repository if modified."
+#: parts/ctags2/ctagskinds.cpp:38 parts/ctags2/ctagskinds.cpp:103
+#: parts/ctags2/ctagskinds.cpp:140 parts/ctags2/ctagskinds.cpp:160
+msgid "subroutine"
 msgstr ""
 
-#: vcs/cvsservice/cvspart.cpp:166 vcs/subversion/subversion_part.cpp:110
-msgid "&Add to Repository"
+#: parts/ctags2/ctagskinds.cpp:50
+msgid "fragment definition"
 msgstr ""
 
-#: vcs/cvsservice/cvspart.cpp:168 vcs/subversion/subversion_part.cpp:111
-msgid "Add file to repository"
+#: parts/ctags2/ctagskinds.cpp:51
+msgid "any pattern"
 msgstr ""
 
-#: vcs/subversion/subversion_part.cpp:112
-#: vcs/subversion/subversion_part.cpp:225
-msgid "<b>Add file to repository</b><p>Adds file to repository."
+#: parts/ctags2/ctagskinds.cpp:53
+msgid "pattern"
+msgstr "patrwm"
+
+#: parts/ctags2/ctagskinds.cpp:59 parts/ctags2/ctagskinds.cpp:84
+#: parts/ctags2/ctagskinds.cpp:111 parts/ctags2/ctagskinds.cpp:146
+#: parts/ctags2/ctagskinds.cpp:153 parts/ctags2/ctagskinds.cpp:166
+msgid "class"
+msgstr "dosbarth"
+
+#: parts/ctags2/ctagskinds.cpp:61
+msgid "enumerator"
 msgstr ""
 
-#: vcs/subversion/subversion_part.cpp:114
-msgid "Show logs..."
+#: parts/ctags2/ctagskinds.cpp:63
+msgid "enumeration"
 msgstr ""
 
-#: vcs/subversion/subversion_part.cpp:115
+#: parts/ctags2/ctagskinds.cpp:64
 #, fuzzy
-msgid "Blame..."
-msgstr "&Ffeil..."
+msgid "local variable"
+msgstr "newidyn"
 
-#: vcs/cvsservice/cvspart.cpp:191 vcs/subversion/subversion_part.cpp:117
-msgid "&Remove From Repository"
+#: parts/ctags2/ctagskinds.cpp:65
+msgid "member"
 msgstr ""
 
-#: vcs/cvsservice/cvspart.cpp:193 vcs/perforce/perforcepart.cpp:83
-#: vcs/subversion/subversion_part.cpp:118
-msgid "Remove from repository"
+#: parts/ctags2/ctagskinds.cpp:66 parts/ctags2/ctagskinds.cpp:188
+msgid "namespace"
 msgstr ""
 
-#: vcs/cvsservice/cvspart.cpp:194 vcs/cvsservice/cvspart.cpp:346
-#: vcs/subversion/subversion_part.cpp:119
-#: vcs/subversion/subversion_part.cpp:227
-msgid "<b>Remove from repository</b><p>Removes file(s) from repository."
+#: parts/ctags2/ctagskinds.cpp:67
+msgid "prototype"
 msgstr ""
 
-#: vcs/subversion/subversion_part.cpp:122
-msgid "Update"
-msgstr "Diweddaru"
-
-#: vcs/subversion/subversion_part.cpp:123
-#: vcs/subversion/subversion_part.cpp:241
-msgid "<b>Update</b><p>Updates file(s) from repository."
+#: parts/ctags2/ctagskinds.cpp:68
+msgid "struct"
 msgstr ""
 
-#: vcs/subversion/subversion_part.cpp:125
-msgid "&Diff to BASE"
+#: parts/ctags2/ctagskinds.cpp:69
+msgid "typedef"
 msgstr ""
 
-#: vcs/subversion/subversion_part.cpp:126
-msgid "Diff to BASE"
+#: parts/ctags2/ctagskinds.cpp:70
+msgid "union"
 msgstr ""
 
-#: vcs/subversion/subversion_part.cpp:127
-msgid "<b>Diff to disk</b><p>Diff current file to the BASE checked out copy."
+#: parts/ctags2/ctagskinds.cpp:71 parts/ctags2/ctagskinds.cpp:105
+msgid "variable"
+msgstr "newidyn"
+
+#: parts/ctags2/ctagskinds.cpp:72
+msgid "external variable"
 msgstr ""
 
-#: vcs/subversion/subversion_part.cpp:129
-msgid "&Diff to HEAD"
+#: parts/ctags2/ctagskinds.cpp:78
+msgid "paragraph"
+msgstr "paragraff"
+
+#: parts/ctags2/ctagskinds.cpp:85
+msgid "feature"
+msgstr "nodwedd"
+
+#: parts/ctags2/ctagskinds.cpp:86
+msgid "local entity"
 msgstr ""
 
-#: vcs/subversion/subversion_part.cpp:130
-msgid "Diff to HEAD"
+#: parts/ctags2/ctagskinds.cpp:92
+msgid "block"
 msgstr ""
 
-#: vcs/subversion/subversion_part.cpp:131
-msgid "<b>Diff HEAD</b><p>Diff the current file to HEAD in svn."
+#: parts/ctags2/ctagskinds.cpp:93
+msgid "common"
+msgstr "cyffredin"
+
+#: parts/ctags2/ctagskinds.cpp:94
+msgid "entry"
+msgstr "cofnod"
+
+#: parts/ctags2/ctagskinds.cpp:96 parts/ctags2/ctagskinds.cpp:113
+msgid "interface"
+msgstr "rhyngwyneb"
+
+#: parts/ctags2/ctagskinds.cpp:97
+msgid "type component"
 msgstr ""
 
-#: vcs/subversion/subversion_part.cpp:134
-msgid "&Revert"
-msgstr "&Dychwelyd"
+#: parts/ctags2/ctagskinds.cpp:99
+msgid "local"
+msgstr "lleol"
 
-#: vcs/perforce/perforcepart.cpp:61 vcs/perforce/perforcepart.cpp:63
-#: vcs/perforce/perforcepart.cpp:102 vcs/perforce/perforcepart.cpp:156
-#: vcs/subversion/subversion_part.cpp:135
-msgid "Revert"
-msgstr "Dychwelyd"
+#: parts/ctags2/ctagskinds.cpp:100
+msgid "module"
+msgstr "modiwl"
 
-#: vcs/subversion/subversion_part.cpp:136
-#: vcs/subversion/subversion_part.cpp:243
-msgid "<b>Revert</b><p>Undo local changes."
+#: parts/ctags2/ctagskinds.cpp:101
+msgid "namelist"
 msgstr ""
 
-#: vcs/subversion/subversion_part.cpp:149
-#, fuzzy
-msgid "Re&solve Conflicting State"
-msgstr "Gwaredu Cysylltiad"
+#: parts/ctags2/ctagskinds.cpp:102
+msgid "program"
+msgstr "rhaglen"
 
-#: vcs/subversion/subversion_part.cpp:151
-msgid "Resolve the conflicting state of a file after a merge"
+#: parts/ctags2/ctagskinds.cpp:104
+msgid "type"
+msgstr "math"
+
+#: parts/ctags2/ctagskinds.cpp:112
+msgid "field"
+msgstr "maes"
+
+#: parts/ctags2/ctagskinds.cpp:114
+msgid "method"
+msgstr "dull"
+
+#: parts/ctags2/ctagskinds.cpp:115
+msgid "package"
+msgstr "pecyn"
+
+#: parts/ctags2/ctagskinds.cpp:134 parts/ctags2/ctagskinds.cpp:194
+msgid "procedure"
 msgstr ""
 
-#: vcs/subversion/subversion_part.cpp:152
+#: parts/ctags2/ctagskinds.cpp:168
+msgid "mixin"
+msgstr ""
+
+#: parts/filelist/projectviewpart.cpp:260
 msgid ""
-"<b>Resolve the conflicting state</b>"
-"<p>Remove the conflict state that can be set on a file after a merge failed."
+"<b>View Session Toolbar</b>"
+"<p>This allows to create and work with view sessions. A view session is a set "
+"of open documents.</p>"
 msgstr ""
 
-#: vcs/subversion/subversion_part.cpp:153
-msgid "Switch this working copy to URL.."
+#: parts/filelist/projectviewpart.cpp:266
+msgid "<b>File List</b><p>This is the list of opened files.</p>"
 msgstr ""
 
-#: vcs/subversion/subversion_part.cpp:156
-msgid "Copy this working copy to URL.."
+#: parts/filelist/projectviewpart.cpp:270
+msgid "Open files"
+msgstr "Agor Ffeiliau"
+
+#: parts/filelist/projectviewpart.cpp:278
+#, fuzzy
+msgid "Open Session..."
+msgstr "Agor Gyda..."
+
+#: parts/filelist/projectviewpart.cpp:282
+#, fuzzy
+msgid "Open Session"
+msgstr "Sesiwn"
+
+#: parts/filelist/projectviewpart.cpp:284
+#, fuzzy
+msgid "Save Session"
+msgstr "Sesiwn"
+
+#: parts/filelist/projectviewpart.cpp:286
+#, fuzzy
+msgid "New Session..."
+msgstr "Sesiwn"
+
+#: parts/filelist/projectviewpart.cpp:288
+#: parts/filelist/projectviewpart.cpp:292
+#: parts/filelist/projectviewpart.cpp:294
+#: parts/filelist/projectviewpart.cpp:296
+#, fuzzy
+msgid "Delete Session"
+msgstr "Dileu Gweithred"
+
+#: parts/filelist/projectviewpart.cpp:487
+#, fuzzy
+msgid "Save View Session As"
+msgstr "Gosodiadau Cywaith"
+
+#: parts/filelist/projectviewpart.cpp:487
+msgid "Enter the name of the session:"
 msgstr ""
 
-#: vcs/subversion/subversion_part.cpp:158
-msgid "Merge difference to working copy"
+#: parts/filelist/projectviewpart.cpp:494
+msgid ""
+"<qt>A view session named <b>%1</b> already exists."
+"<br>Do you want to overwrite it?</qt>"
 msgstr ""
 
-#: vcs/subversion/subversion_part.cpp:229
-msgid "<b>Show logs..</b><p>View Logs"
+#: parts/filelist/projectviewpart.cpp:494 src/partcontroller.cpp:1124
+msgid "Overwrite"
+msgstr "Trosysgrifo"
+
+#: parts/filelist/filelist_widget.cpp:95
+msgid "This file has unsaved changes."
 msgstr ""
 
-#: vcs/subversion/subversion_part.cpp:231
-msgid "<b>Blame 0:HEAD </b><p>Show Annotate"
+#: parts/filelist/filelist_widget.cpp:98
+msgid "This file has changed on disk since it was last saved."
 msgstr ""
 
-#: vcs/subversion/subversion_part.cpp:235
-msgid "<b>Diff</b><p>Diff file to local disk."
+#: parts/filelist/filelist_widget.cpp:101
+msgid "Conflict: this file has changed on disk and has unsaved changes."
 msgstr ""
 
-#: vcs/subversion/subversion_part.cpp:238
-msgid "<b>Diff</b><p>Diff file to repository."
+#: parts/filelist/filelist_widget.cpp:229
+msgid "Close Selected"
 msgstr ""
 
-#: vcs/subversion/subversion_part.cpp:245
-msgid "<b>Resolve</b><p>Resolve conflicting state."
+#: parts/filelist/filelist_widget.cpp:230
+msgid "Save Selected"
 msgstr ""
 
-#: vcs/subversion/subversion_part.cpp:247
-msgid "<b>Switch</b><p>Switch working tree."
+#: parts/filelist/filelist_widget.cpp:231
+msgid "Reload Selected"
 msgstr ""
 
-#: vcs/subversion/subversion_part.cpp:249
-msgid "<b>Copy</b><p>Copy from/between path/URLs"
+#: parts/fileview/filetreewidget.cpp:207 parts/fileview/fileviewpart.cpp:68
+#: parts/fileview/fileviewpart.cpp:81 parts/fileview/partwidget.cpp:48
+#: parts/fileview/partwidget.cpp:49
+msgid "File Tree"
 msgstr ""
 
-#: vcs/subversion/subversion_part.cpp:251
-msgid "<b>Merge</b><p>Merge difference to working copy"
+#: parts/fileview/partwidget.cpp:51
+msgid ""
+"<b>File tree</b>"
+"<p>The file viewer shows all files of the project in a tree layout."
 msgstr ""
 
-#: vcs/subversion/subversion_part.cpp:304
-#: vcs/subversion/subversion_part.cpp:345
-msgid "Please select only one item for subversion switch"
+#: parts/fileview/partwidget.cpp:70
+msgid ""
+"<p>Here you can enter a name filter to limit which files are <b>"
+"not displayed</b>."
+"<p>To clear the filter, toggle off the filter button to the left."
+"<p>To reapply the last filter used, toggle on the filter button."
 msgstr ""
 
-#: vcs/subversion/subversion_part.cpp:327
-msgid "The destination URL is invalid"
+#: parts/fileview/fileviewpart.cpp:81
+msgid "File tree view in the project directory"
 msgstr ""
 
-#: vcs/subversion/subversion_part.cpp:337
-msgid "Fail to conduct subversion switch. No action was selected"
+#: parts/fileview/filegroupsconfigwidget.cpp:75
+msgid "Add File Group"
 msgstr ""
 
-#: vcs/subversion/subversion_part.cpp:380
-msgid "Please select only one item for subversion merge"
+#: parts/fileview/filegroupsconfigwidget.cpp:88
+msgid "Edit File Group"
 msgstr ""
 
-#: vcs/subversion/subversion_part.cpp:462
-msgid "Please select only one item for subversion log"
+#: parts/fileview/filegroupspart.cpp:48
+msgid ""
+"<b>File group view</b>"
+"<p>The file group viewer shows all files of the project, in groups which can be "
+"configured in project settings dialog, <b>File Groups</b> tab."
 msgstr ""
 
-#: vcs/subversion/subversion_part.cpp:481
-msgid "Please select only one item to see annotate"
+#: parts/fileview/filegroupspart.cpp:51 parts/fileview/filegroupspart.cpp:54
+#: parts/fileview/filegroupswidget.cpp:228
+#: parts/fileview/filegroupswidget.cpp:262
+msgid "File Groups"
 msgstr ""
 
-#: vcs/subversion/subversion_part.cpp:486
-#, fuzzy
-msgid "Select file to see blame"
-msgstr "Agor Cywaith Diweddar"
+#: parts/fileview/filegroupspart.cpp:51
+msgid "File groups in the project directory"
+msgstr ""
 
-#: vcs/subversion/subversion_part.cpp:504
-#: vcs/subversion/subversion_part.cpp:514
-#, fuzzy
-msgid "Select file or directory to see diff"
-msgstr "Agor Cywaith Diweddar"
+#: buildtools/qmake/qmakescopeitem.cpp:85
+#: parts/fileview/filegroupswidget.cpp:42
+msgid "Sources"
+msgstr ""
 
-#: vcs/subversion/subversion_fileinfo.cpp:160
-msgid "Subversion File/Directory Status"
+#: buildtools/qmake/qmakescopeitem.cpp:121
+#: parts/fileview/filegroupswidget.cpp:43
+msgid "Translations"
 msgstr ""
 
-#: vcs/subversion/svn_fileselectdlg_commit.cpp:41
-#, fuzzy
-msgid "Select Files to Commit"
-msgstr "Ffeiliau i'w llwytho"
+#: parts/fileview/filegroupswidget.cpp:44 parts/uimode/uichooser_part.cpp:27
+msgid "User Interface"
+msgstr ""
 
-#: vcs/subversion/svn_fileselectdlg_commit.cpp:43
-#, fuzzy
-msgid "select"
-msgstr "&Detholi"
+#: parts/fileview/filegroupswidget.cpp:45
+msgid "Others"
+msgstr "Eraill"
 
-#: vcs/subversion/svn_fileselectdlg_commit.cpp:44
-#, fuzzy
-msgid "status"
-msgstr "Cyflwr"
+#: parts/fileview/filegroupswidget.cpp:181
+#: parts/fileview/filetreeviewwidgetimpl.cpp:40
+msgid "Show Non Project Files"
+msgstr ""
 
-#: vcs/subversion/svn_fileselectdlg_commit.cpp:45
-msgid "URL to commit"
+#: parts/fileview/filegroupswidget.cpp:183
+#: parts/fileview/filetreeviewwidgetimpl.cpp:42
+msgid "Hide Non Project Files"
 msgstr ""
 
-#: vcs/subversion/svn_fileselectdlg_commit.cpp:119
-msgid "No added/modified/deleted file(s) to commit"
+#: parts/fileview/filegroupswidget.cpp:184
+#: parts/fileview/filetreeviewwidgetimpl.cpp:43
+msgid ""
+"<b>Show non project files</b>"
+"<p>Shows files that do not belong to a project in a file tree."
 msgstr ""
 
-#: vcs/subversion/kdevsvnd_widgets.cpp:27
-msgid "Accept Permanently"
+#: parts/fileview/filegroupswidget.cpp:186
+msgid "Display Location Column"
 msgstr ""
 
-#: vcs/subversion/kdevsvnd_widgets.cpp:28
-msgid "Accept Temporarily"
+#: parts/fileview/filegroupswidget.cpp:188
+msgid ""
+"<b>Display the Location Column</b>"
+"<p>Displays a column with the location of the files."
 msgstr ""
 
-#: vcs/subversion/kdevsvnd_widgets.cpp:29
-#, fuzzy
-msgid "Reject"
-msgstr "Ailosod"
+#: parts/fileview/filegroupswidget.cpp:230
+msgid "Customize..."
+msgstr "Addasu..."
 
-#: vcs/subversion/kdevsvnd_widgets.cpp:40
-#, fuzzy
-msgid "Hostname"
-msgstr "&Enw Gwesteiwr:"
+#: parts/fileview/filegroupswidget.cpp:231
+msgid ""
+"<b>Customize</b>"
+"<p>Opens <b>Customize File Groups</b> dialog where the groups can be managed."
+msgstr ""
 
-#: vcs/subversion/kdevsvnd_widgets.cpp:41
-msgid "FingerPrint"
+#: parts/fileview/filegroupswidget.cpp:259
+msgid "Customize File Groups"
 msgstr ""
 
-#: vcs/subversion/kdevsvnd_widgets.cpp:42
-msgid "Valid From"
+#: parts/fileview/vcsfiletreewidgetimpl.cpp:206
+msgid "Show VCS Fields"
 msgstr ""
 
-#: vcs/subversion/kdevsvnd_widgets.cpp:43
-msgid "Valid Until"
+#: parts/fileview/vcsfiletreewidgetimpl.cpp:208
+msgid "Hide VCS Fields"
 msgstr ""
 
-#: vcs/subversion/kdevsvnd_widgets.cpp:44
-#, fuzzy
-msgid "Issuer"
-msgstr "Defnyddiwr"
+#: parts/fileview/vcsfiletreewidgetimpl.cpp:209
+msgid ""
+"<b>Show VCS fields</b>"
+"<p>Shows <b>Revision</b> and <b>Timestamp</b> for each file contained in VCS "
+"repository."
+msgstr ""
 
-#: vcs/subversion/kdevsvnd_widgets.cpp:45
-#, fuzzy
-msgid "Cert"
-msgstr "Dychwelyd"
+#: parts/fileview/vcsfiletreewidgetimpl.cpp:213
+msgid "Sync with Repository"
+msgstr ""
 
-#: vcs/subversion/svn_tdeio.cpp:226
-#, c-format
-msgid "Username and Password for %1."
+#: parts/fileview/vcsfiletreewidgetimpl.cpp:215
+msgid ""
+"<b>Sync with repository</b>"
+"<p>Synchronize file status with remote repository."
 msgstr ""
 
-#: vcs/subversion/svn_tdeio.cpp:1385
-msgid "Nothing to commit."
+#: parts/fileview/filetreeviewwidgetimpl.cpp:99
+msgid "Reload Tree"
 msgstr ""
 
-#: vcs/subversion/svn_tdeio.cpp:1387
-#, fuzzy, c-format
-msgid "Committed revision %1."
-msgstr "S&ylwad:"
+#: parts/fileview/filetreeviewwidgetimpl.cpp:100
+msgid "<b>Reload tree</b><p>Reloads the project files tree."
+msgstr ""
 
-#: vcs/subversion/svn_tdeio.cpp:1587
-#, fuzzy, c-format
-msgid "Copied Revision %1"
-msgstr "S&ylwad:"
+#: parts/tools/toolsconfigwidget.cpp:130
+msgid "An entry with this title exists already."
+msgstr ""
 
-#: vcs/subversion/svn_tdeio.cpp:1590
-#, fuzzy
-msgid "Copied"
-msgstr "Gorffenwyd"
+#: parts/tools/toolsconfigwidget.cpp:170
+msgid "Add to Tools Menu"
+msgstr ""
 
-#: vcs/subversion/svn_tdeio.cpp:1698
-msgid ""
-"This certificate from server could not be trusted automatically. Will you trust "
-"this certificate? "
+#: parts/tools/toolsconfigwidget.cpp:197
+msgid "Add to File Context Menus"
 msgstr ""
 
-#: vcs/subversion/svn_tdeio.cpp:1903
-#, c-format
-msgid "A (bin) %1"
+#: parts/tools/toolsconfigwidget.cpp:225
+msgid "Add to Directory Context Menus"
 msgstr ""
 
-#: vcs/subversion/svn_tdeio.cpp:1905 vcs/subversion/svn_tdeio.cpp:1938
-#, fuzzy, c-format
-msgid "A %1"
-msgstr "Ychwanegu %1"
+#: parts/tools/kapplicationtree.cpp:137
+msgid "Known Applications"
+msgstr "Cymhwysiannau Hysbys"
 
-#: vcs/subversion/svn_tdeio.cpp:1908
-msgid "Copied %1 "
+#: parts/tools/toolsconfig.cpp:40
+msgid "&Applications:"
+msgstr "&Cymhwysiadau:"
+
+#: parts/tools/toolsconfig.cpp:63
+msgid "&Tools menu:"
 msgstr ""
 
-#: vcs/subversion/svn_tdeio.cpp:1912 vcs/subversion/svn_tdeio.cpp:1934
-#, fuzzy, c-format
-msgid "D %1"
-msgstr "Ychwanegu %1"
+#: parts/tools/tools_part.cpp:50
+msgid "Tools Menu"
+msgstr ""
 
-#: vcs/subversion/svn_tdeio.cpp:1915
-#, fuzzy, c-format
-msgid "Restored %1."
-msgstr "G&waredu"
+#: parts/abbrev/abbrevpart.cpp:80
+msgid "Expand Text"
+msgstr ""
 
-#: vcs/subversion/svn_tdeio.cpp:1918
-#, fuzzy, c-format
-msgid "Reverted %1."
-msgstr "G&waredu"
+#: parts/abbrev/abbrevpart.cpp:83
+msgid "Expand current word"
+msgstr ""
 
-#: vcs/subversion/svn_tdeio.cpp:1921
+#: parts/abbrev/abbrevpart.cpp:84
 msgid ""
-"Failed to revert %1.\n"
-"Try updating instead."
+"<b>Expand current word</b>"
+"<p>Current word can be completed using the list of similar words in source "
+"files."
 msgstr ""
 
-#: vcs/subversion/svn_tdeio.cpp:1924
-#, fuzzy, c-format
-msgid "Resolved conflicted state of %1."
-msgstr "Gwaredu Cysylltiad"
+#: parts/abbrev/abbrevpart.cpp:86
+msgid "Expand Abbreviation"
+msgstr ""
 
-#: vcs/subversion/svn_tdeio.cpp:1928
-#, c-format
-msgid "Skipped missing target %1."
+#: parts/abbrev/abbrevpart.cpp:89
+msgid "Expand abbreviation"
 msgstr ""
 
-#: vcs/subversion/svn_tdeio.cpp:1930
-#, c-format
-msgid "Skipped  %1."
+#: parts/abbrev/abbrevpart.cpp:90
+msgid ""
+"<b>Expand abbreviation</b>"
+"<p>Enable and configure abbreviations in <b>TDevelop Settings</b>, <b>"
+"Abbreviations</b> tab."
 msgstr ""
 
-#: vcs/subversion/svn_tdeio.cpp:1983
-#, c-format
-msgid "Exported external at revision %1."
+#: parts/abbrev/abbrevpart.cpp:244
+msgid "Abbreviations"
 msgstr ""
 
-#: vcs/subversion/svn_tdeio.cpp:1985
-#, c-format
-msgid "Exported revision %1."
+#: parts/quickopen/quickopenfunctiondialog.cpp:45
+msgid "Function &name:"
 msgstr ""
 
-#: vcs/subversion/svn_tdeio.cpp:1988
-#, c-format
-msgid "Checked out external at revision %1."
+#: parts/quickopen/quickopenfunctiondialog.cpp:46
+msgid "Function &list:"
 msgstr ""
 
-#: vcs/subversion/svn_tdeio.cpp:1990
-#, c-format
-msgid "Checked out revision %1."
+#: parts/quickopen/quickopenfunctiondialog.cpp:136
+msgid "Error: cannot find matching name function."
 msgstr ""
 
-#: vcs/subversion/svn_tdeio.cpp:1994
-#, c-format
-msgid "Updated external to revision %1."
+#: parts/quickopen/quickopen_part.cpp:58
+msgid "Quick Open File..."
 msgstr ""
 
-#: vcs/subversion/svn_tdeio.cpp:1996
-#, c-format
-msgid "Updated to revision %1."
+#: parts/quickopen/quickopen_part.cpp:61
+msgid "Quick open file in project"
 msgstr ""
 
-#: vcs/subversion/svn_tdeio.cpp:1999
-#, fuzzy, c-format
-msgid "External at revision %1."
-msgstr "Offer Allanol"
+#: parts/quickopen/quickopen_part.cpp:62
+msgid ""
+"<b>Quick open</b>"
+"<p>Provides a file name input form with completion listbox to quickly open file "
+"in a project."
+msgstr ""
 
-#: vcs/subversion/svn_tdeio.cpp:2001
-#, fuzzy, c-format
-msgid "At revision %1."
-msgstr "Fersiwn %1"
+#: parts/quickopen/quickopen_part.cpp:64
+msgid "Quick Open Class..."
+msgstr ""
 
-#: vcs/subversion/svn_tdeio.cpp:2007
-#, fuzzy
-msgid "External export complete."
-msgstr "Offer Allanol"
+#: parts/quickopen/quickopen_part.cpp:67
+msgid "Find class in project"
+msgstr ""
 
-#: vcs/subversion/svn_tdeio.cpp:2009
-msgid "Export complete."
+#: parts/quickopen/quickopen_part.cpp:68
+msgid ""
+"<b>Find class</b>"
+"<p>Provides a class name input form with completion listbox to quickly open a "
+"file where the class is defined."
 msgstr ""
 
-#: vcs/subversion/svn_tdeio.cpp:2012
-msgid "External checkout complete."
+#: parts/quickopen/quickopen_part.cpp:70
+msgid "Quick Open Method..."
 msgstr ""
 
-#: vcs/subversion/svn_tdeio.cpp:2014
-msgid "Checkout complete."
+#: parts/quickopen/quickopen_part.cpp:71
+msgid "Quick open function in project"
 msgstr ""
 
-#: vcs/subversion/svn_tdeio.cpp:2017
-msgid "External update complete."
+#: parts/quickopen/quickopen_part.cpp:73
+msgid "Switch To..."
 msgstr ""
 
-#: vcs/subversion/svn_tdeio.cpp:2019
-msgid "Update complete."
+#: parts/quickopen/quickopen_part.cpp:74
+msgid "Switch to"
 msgstr ""
 
-#: vcs/subversion/svn_tdeio.cpp:2029
-#, c-format
-msgid "Fetching external item into %1."
+#: parts/quickopen/quickopen_part.cpp:75
+msgid ""
+"<b>Switch to</b>"
+"<p>Prompts to enter the name of previously opened file to switch to."
 msgstr ""
 
-#: vcs/subversion/svn_tdeio.cpp:2033
+#: parts/quickopen/quickopenfunctionchooseform.cpp:34
 #, c-format
-msgid "Status against revision: %1."
+msgid "Select One Argument or File of Function %1"
 msgstr ""
 
-#: vcs/subversion/svn_tdeio.cpp:2036
+#: parts/quickopen/quickopenclassdialog.cpp:42
+msgid "Class &list:"
+msgstr ""
+
+#: parts/quickopen/quickopenclassdialog.cpp:81
 #, c-format
-msgid "Performing status on external item at %1."
+msgid "Select The Location of Class %1"
 msgstr ""
 
-#: vcs/subversion/svn_tdeio.cpp:2039
-#, fuzzy, c-format
-msgid "Sending %1"
-msgstr "llwytho : %1"
+#: parts/texttools/texttoolspart.cpp:61 parts/texttools/texttoolspart.cpp:64
+#: parts/texttools/texttoolswidget.cpp:157
+msgid "Text Structure"
+msgstr ""
 
-#: vcs/subversion/svn_tdeio.cpp:2043
-#, fuzzy, c-format
-msgid "Adding (bin) %1."
-msgstr "&Ychwanegu Ffeil..."
+#: parts/texttools/texttoolspart.cpp:62
+msgid "<b>Text Structure</b><p>This browser shows the structure of the text."
+msgstr ""
 
-#: vcs/subversion/svn_tdeio.cpp:2045
-#, fuzzy, c-format
-msgid "Adding %1."
-msgstr "Ychwanegu %1"
+#: parts/texttools/texttoolspart.cpp:64
+msgid "Text structure"
+msgstr ""
 
-#: vcs/subversion/svn_tdeio.cpp:2049
-#, c-format
-msgid "Deleting %1."
+#: parts/appwizard/importdlg.cpp:61
+msgid "Choose directory to import"
 msgstr ""
 
-#: vcs/subversion/svn_tdeio.cpp:2052
-#, c-format
-msgid "Replacing %1."
+#: parts/appwizard/importdlg.cpp:111
+msgid "You have to choose a directory."
 msgstr ""
 
-#: vcs/subversion/svn_tdeio.cpp:2057
-msgid "Transmitting file data "
+#: parts/appwizard/importdlg.cpp:117
+msgid "You have to choose a project name."
 msgstr ""
 
-#: vcs/subversion/svn_tdeio.cpp:2065
-#, c-format
-msgid "Blame %1."
+#: parts/appwizard/importdlg.cpp:123
+msgid "Your application name should only contain letters and numbers."
 msgstr ""
 
-#: vcs/subversion/kdevsvnd.cpp:52
+#: parts/appwizard/importdlg.cpp:139
 #, fuzzy
-msgid "Enter Commit Log Message:"
-msgstr "Neges"
+msgid "Cannot open project template."
+msgstr "&Ffeil y cywaith:"
 
-#: vcs/subversion/kdevsvnd.cpp:74
-#, fuzzy
-msgid "Open SSL certificate file"
-msgstr "Agor ffeil"
+#: parts/appwizard/appwizarddlg.cpp:1016 parts/appwizard/importdlg.cpp:152
+#: src/projectmanager.cpp:375
+msgid ""
+"This is not a valid project file.\n"
+"XML error in line %1, column %2:\n"
+"%3"
+msgstr ""
 
-#: vcs/subversion/subversion_core.cpp:146
+#: parts/appwizard/importdlg.cpp:193
 #, fuzzy
-msgid "Subversion Update"
-msgstr "Fersiwn %1"
+msgid "Cannot write the project file."
+msgstr "Methu Cyfieithu'r Testun Tarddiad"
 
-#: vcs/subversion/subversion_core.cpp:222
-msgid "the local disk checked out copy."
+#: parts/appwizard/importdlg.cpp:553
+msgid "Generate build system infrastrucure"
 msgstr ""
 
-#: vcs/subversion/subversion_core.cpp:224
-msgid "the current svn HEAD version."
+#: parts/appwizard/importdlg.cpp:567
+msgid ""
+"Project infrastrucure already exists in target directory.\n"
+"Generate new project infrastructure and overwrite old?"
 msgstr ""
 
-#: vcs/subversion/subversion_core.cpp:226
-#, c-format
-msgid "No differences between the file and %1"
+#: parts/appwizard/importdlg.cpp:567
+msgid "Generate"
+msgstr "Creu"
+
+#: parts/appwizard/importdlg.cpp:567
+#, fuzzy
+msgid "Do Not Generate"
+msgstr "&Creu"
+
+#: parts/appwizard/appwizarddlg.cpp:108
+msgid "&Add to Favorites"
 msgstr ""
 
-#: vcs/subversion/subversion_core.cpp:226
-msgid "No difference"
+#: parts/appwizard/appwizarddlg.cpp:111
+msgid "&Remove Favorite"
 msgstr ""
 
-#: vcs/subversion/subversion_core.cpp:266
-#: vcs/subversion/subversion_core.cpp:268
-#, fuzzy
-msgid "Commit to remote repository"
-msgstr "&Adfer"
+#: parts/appwizard/appwizarddlg.cpp:288
+msgid "Choose projects directory"
+msgstr ""
 
-#: vcs/subversion/subversion_core.cpp:268
-msgid "From working copy"
+#: parts/appwizard/appwizarddlg.cpp:338
+msgid ""
+"_: no version control system\n"
+"None"
+msgstr "Dim"
+
+#: parts/appwizard/appwizarddlg.cpp:387
+msgid "Version Control System"
 msgstr ""
 
-#: vcs/subversion/subversion_core.cpp:320
-msgid "Subversion Blame"
+#: parts/appwizard/appwizarddlg.cpp:458
+msgid ""
+"The directory you have chosen as the location for the project already exists."
 msgstr ""
 
-#: vcs/subversion/subversion_core.cpp:509
-#: vcs/subversion/subversion_core.cpp:538
-#: vcs/subversion/subversion_core.cpp:598
-#: vcs/subversion/subversion_core.cpp:668
+#: parts/appwizard/appwizarddlg.cpp:467
 msgid ""
-"If you just have installed new version of KDevelop, and if the error message "
-"was unknown protocol kdevsvn+*, try to restart TDE"
+"The directory you have chosen as the location for the project is not writeable."
 msgstr ""
 
-#: vcs/subversion/subversion_core.cpp:703
+#: parts/appwizard/appwizarddlg.cpp:489
+msgid "The template %1 cannot be opened."
+msgstr ""
+
+#: parts/appwizard/appwizarddlg.cpp:648
+msgid "The directory %1 cannot be created."
+msgstr ""
+
+#: parts/appwizard/appwizarddlg.cpp:667
+msgid "The archive %1 cannot be opened."
+msgstr ""
+
+#: parts/appwizard/appwizarddlg.cpp:685 parts/appwizard/appwizarddlg.cpp:827
+msgid "The file %1 cannot be created."
+msgstr ""
+
+#: parts/appwizard/appwizarddlg.cpp:693
 msgid ""
-"You don't have kompare installed. We recommend you to install kompare to view "
-"difference graphically"
+"The directory above the chosen location does not exist and cannot be created."
 msgstr ""
 
-#: vcs/subversion/subversion_core.cpp:715
-msgid "No subversion differences"
+#: parts/appwizard/appwizarddlg.cpp:896
+msgid "Template for .%1 Files"
 msgstr ""
 
-#: vcs/subversion/svn_blamewidget.cpp:36
-#: vcs/subversion/svn_logviewwidget.cpp:51
-#, fuzzy
-msgid "Rev"
-msgstr "Coch"
+#: parts/appwizard/appwizarddlg.cpp:922
+msgid "Set default project location to: %1?"
+msgstr ""
 
-#: parts/documentation/searchview.cpp:75 vcs/cvsservice/editorsdialog.cpp:88
-#: vcs/cvsservice/editorsdialog.cpp:101 vcs/subversion/svn_blamewidget.cpp:37
-#: vcs/subversion/svn_logviewwidget.cpp:52
-msgid "Date"
-msgstr "Dyddiad"
+#: kdevdesigner/designer/mainwindow.cpp:1336
+#: parts/appwizard/appwizarddlg.cpp:923
+msgid "New Project"
+msgstr "Cywaith Newydd"
 
-#: vcs/subversion/svn_logviewwidget.cpp:131
-#, fuzzy
-msgid "Blame this revision"
-msgstr "Dechrau chwilio"
+#: parts/appwizard/appwizarddlg.cpp:923
+msgid "Set"
+msgstr "Set"
 
-#: vcs/subversion/svn_logviewwidget.cpp:132
-msgid "Difference to previous revision"
+#: parts/appwizard/appwizarddlg.cpp:923
+msgid "Do Not Set"
 msgstr ""
 
-#: vcs/subversion/svn_logviewwidget.cpp:138
-#: vcs/subversion/svn_logviewwidget.cpp:181
-msgid "No revision was clicked"
+#: parts/appwizard/appwizarddlg.cpp:949
+msgid ""
+"_: invalid location\n"
+" (invalid)"
 msgstr ""
 
-#: vcs/subversion/svn_logviewwidget.cpp:138
-#: vcs/subversion/svn_logviewwidget.cpp:181
+#: parts/appwizard/appwizarddlg.cpp:951
 #, fuzzy
-msgid "error"
-msgstr "Gwallau"
+msgid " (dir/file already exists)"
+msgstr "Ffeil yn Bodoli'n Barod %1"
 
-#: vcs/subversion/svn_blamewidget.cpp:39
-#, fuzzy
-msgid "Content"
-msgstr "Cy&nnwys"
+#: parts/appwizard/filepropspage.cpp:69
+msgid "Header/Implementation file:"
+msgstr ""
 
-#: vcs/subversion/svn_blamewidget.cpp:91
-#, fuzzy
-msgid "Select one file to view annotation"
-msgstr "Agor Cywaith Diweddar"
+#: parts/appwizard/appwizardpart.cpp:45
+msgid "&New Project..."
+msgstr "Cywaith &Newydd..."
 
-#: vcs/subversion/svn_blamewidget.cpp:95
-#, fuzzy
-msgid "files"
-msgstr "Agor Ffeiliau"
+#: parts/appwizard/appwizardpart.cpp:48
+msgid "Generate a new project from a template"
+msgstr ""
 
-#: vcs/subversion/svn_blamewidget.cpp:129
-msgid "Select file from list to view annotation"
+#: parts/appwizard/appwizardpart.cpp:49
+msgid ""
+"<b>New project</b>"
+"<p>This starts KDevelop's application wizard. It helps you to generate a "
+"skeleton for your application from a set of templates."
 msgstr ""
 
-#: vcs/subversion/subversion_widget.cpp:38
-#, fuzzy
-msgid "Notification"
-msgstr "Lleoliad"
+#: parts/appwizard/appwizardpart.cpp:54
+msgid "&Import Existing Project..."
+msgstr ""
 
-#: vcs/subversion/subversion_widget.cpp:63
-#, fuzzy
-msgid "Log History"
-msgstr "Hanes"
+#: parts/appwizard/appwizardpart.cpp:57
+msgid "Import existing project"
+msgstr ""
 
-#: vcs/subversion/subversion_widget.cpp:72
-#, fuzzy
-msgid "Blame"
-msgstr "&Ffeil..."
+#: parts/appwizard/appwizardpart.cpp:58
+msgid ""
+"<b>Import existing project</b>"
+"<p>Creates a project file for a given directory."
+msgstr ""
 
-#: vcs/subversion/subversion_widget.cpp:121
-msgid "Subversion Job Progress"
+#: parts/snippet/snippet_part.cpp:47 parts/snippet/snippet_part.cpp:52
+#: parts/snippet/snippet_part.cpp:100 parts/snippet/snippet_widget.cpp:564
+msgid "Code Snippets"
 msgstr ""
 
-#: vcs/subversion/integrator/svnintegratordlg.cpp:73
-msgid "Fail to create project directories on repository"
+#: parts/snippet/snippet_part.cpp:50
+msgid "<b>Code Snippet</b><p>This is a list of available snippets."
 msgstr ""
 
-#: vcs/subversion/integrator/svnintegratordlg.cpp:84
-#, fuzzy
-msgid "Fail to import into repository."
-msgstr "&Adfer"
+#: parts/snippet/snippet_part.cpp:52
+msgid "Insert a code snippet"
+msgstr ""
 
-#: vcs/subversion/integrator/svnintegratordlg.cpp:106
-#, fuzzy
-msgid "Fail to checkout from repository."
-msgstr "&Adfer"
+#: parts/snippet/snippet_part.cpp:76
+msgid "Show Snippet Tree"
+msgstr ""
 
-#: vcs/cvsservice/cvslogpage.cpp:116 vcs/cvsservice/editorsdialog.cpp:64
-#, c-format
-msgid "Log failed with exitStatus == %1"
+#: parts/snippet/snippet_part.cpp:84
+msgid "SnippetPart"
 msgstr ""
 
-#: vcs/cvsservice/cvslogpage.cpp:116 vcs/cvsservice/editorsdialog.cpp:64
-msgid "Log Failed"
+#: parts/snippet/snippet_part.cpp:85
+msgid "SnippetPart for TDevelop"
 msgstr ""
 
-#: vcs/cvsservice/editorsdialog.cpp:87 vcs/cvsservice/editorsdialog.cpp:100
-msgid "User"
-msgstr "Defnyddiwr"
+#: parts/snippet/snippet_part.cpp:87
+msgid "(c) 2003"
+msgstr ""
 
-#: vcs/cvsservice/editorsdialog.cpp:109
-msgid "No files from your query are marked as being edited."
+#: parts/snippet/snippet_widget.cpp:141
+msgid "Add Group"
+msgstr "Ychwanegu Gr?p"
+
+#: buildtools/autotools/addtranslationdlg.cpp:42
+#: parts/snippet/snippet_widget.cpp:145 parts/snippet/snippet_widget.cpp:256
+#: parts/snippet/snippet_widget.cpp:535
+msgid "Language:"
+msgstr "Iaith:"
+
+#: parts/snippet/snippet_widget.cpp:168
+msgid "Do you really want to remove this group and all its snippets?"
 msgstr ""
 
-#: vcs/cvsservice/cvslogdialog.cpp:36
-msgid "CVS Log & Diff Dialog"
+#: parts/snippet/snippet_widget.cpp:206
+msgid "Edit Snippet"
 msgstr ""
 
-#: vcs/cvsservice/cvslogdialog.cpp:42
-msgid "Log From CVS"
+#: parts/snippet/snippet_widget.cpp:252
+#, fuzzy
+msgid "Edit Group"
+msgstr "Gr?p"
+
+#: parts/snippet/snippet_widget.cpp:554
+msgid "Add Item..."
+msgstr "Ychwanegu Eitem ..."
+
+#: parts/snippet/snippet_widget.cpp:555 parts/snippet/snippet_widget.cpp:566
+msgid "Add Group..."
+msgstr "Ychwanegu Grŵp"
+
+#: parts/snippet/snippet_widget.cpp:600
+msgid "Please enter the value for <b>%1</b>:"
 msgstr ""
 
-#: vcs/cvsservice/cvslogdialog.cpp:82
-msgid "Diff between %1 and %2"
+#: parts/snippet/snippet_widget.cpp:672 parts/snippet/snippet_widget.cpp:801
+msgid "Enter Values for Variables"
 msgstr ""
 
-#: vcs/cvsservice/cvsoptions.cpp:286
-msgid "Error while guessing repository location."
+#: parts/snippet/snippet_widget.cpp:686
+msgid "Enter the replacement values for these variables:"
 msgstr ""
 
-#: vcs/cvsservice/cvspartimpl.cpp:127
+#: parts/snippet/snippet_widget.cpp:712 parts/snippet/snippet_widget.cpp:830
 msgid ""
-"Open a project first.\n"
-"Operation will be aborted."
+"Enable this to save the value entered to the right as the default value for "
+"this variable"
 msgstr ""
 
-#: vcs/cvsservice/cvspartimpl.cpp:134
+#: parts/snippet/snippet_widget.cpp:713 parts/snippet/snippet_widget.cpp:831
 msgid ""
-"Another CVS operation is executing: do you want to cancel it \n"
-"and start this new one?"
+"If you enable this option, the value entered to the right will be saved. If you "
+"use the same variable later, even in another snippet, the value entered to the "
+"right will be the default value for that variable."
 msgstr ""
 
-#: vcs/cvsservice/cvspartimpl.cpp:136
-msgid "CVS: Operation Already Pending "
+#: parts/snippet/snippet_widget.cpp:814
+msgid "Enter the replacement values for %1:"
 msgstr ""
 
-#: vcs/cvsservice/cvspartimpl.cpp:151
-msgid "None of the file(s) you selected seem to be valid for repository."
+#: parts/snippet/snippet_widget.cpp:820
+msgid "Make value &default"
 msgstr ""
 
-#: vcs/cvsservice/cvspartimpl.cpp:370
-msgid "Unable to checkout"
+#: parts/outputviews/makeviewpart.cpp:44
+#: parts/outputviews/outputviewsfactory.cpp:14
+msgid "Messages Output"
 msgstr ""
 
-#: vcs/cvsservice/cvspartimpl.cpp:519
-msgid "Do you really want to unedit the selected files?"
+#: parts/outputviews/makeviewpart.cpp:45
+msgid ""
+"<b>Messages output</b>"
+"<p>The messages window shows the output of the compiler and used build tools "
+"like make, ant, uic, dcopidl etc. For compiler error messages, click on the "
+"error message. This will automatically open the source file and set the cursor "
+"to the line that caused the compiler error/warning."
 msgstr ""
 
-#: vcs/cvsservice/cvspartimpl.cpp:520
-#, fuzzy
-msgid "CVS - Unedit Files"
-msgstr "Canfod mewn Ffeiliau"
+#: parts/outputviews/makeviewpart.cpp:52
+msgid "Compiler output messages"
+msgstr ""
 
-#: vcs/cvsservice/cvspartimpl.cpp:521
-#, fuzzy
-msgid "Unedit"
-msgstr "Datosod"
+#: parts/outputviews/makeviewpart.cpp:55
+msgid "&Next Error"
+msgstr "&Gwall Nesaf"
 
-#: vcs/cvsservice/cvspartimpl.cpp:522
-msgid "Do Not Unedit"
+#: parts/outputviews/makeviewpart.cpp:57
+msgid "Go to the next error"
 msgstr ""
 
-#: vcs/cvsservice/cvspartimpl.cpp:653
-msgid "Sorry, cannot diff."
+#: parts/outputviews/makeviewpart.cpp:58
+msgid ""
+"<b>Next error</b>"
+"<p>Switches to the file and line where the next error was reported from."
 msgstr ""
 
-#: vcs/cvsservice/cvsdiffpage.cpp:68 vcs/cvsservice/cvsdiffpage.cpp:101
-#: vcs/cvsservice/cvspartimpl.cpp:654
-msgid "Error During Diff"
+#: parts/outputviews/makeviewpart.cpp:59
+msgid "&Previous Error"
+msgstr "&Gwall Blaenorol"
+
+#: parts/outputviews/makeviewpart.cpp:61
+msgid "Go to the previous error"
 msgstr ""
 
-#: vcs/cvsservice/cvspartimpl.cpp:674
-msgid "Creating Tag/Branch for files ..."
+#: parts/outputviews/makeviewpart.cpp:62
+msgid ""
+"<b>Previous error</b>"
+"<p>Switches to the file and line where the previous error was reported from."
 msgstr ""
 
-#: vcs/cvsservice/cvspartimpl.cpp:698
-msgid "Removing Tag from files ..."
+#: parts/outputviews/appoutputwidget.cpp:82
+#, c-format
+msgid "Assertion failed: %1"
 msgstr ""
 
-#: vcs/cvsservice/cvspartimpl.cpp:791
-#: vcs/cvsservice/integrator/integratordlg.cpp:101
-msgid ""
-"Unable to find the Cervisia KPart. \n"
-"Cervisia Integration will not be available. Please check your\n"
-"Cervisia installation and re-try. Reason was:\n"
+#: parts/outputviews/appoutputwidget.cpp:254
+#, fuzzy
+msgid "Clear output"
+msgstr "Crynhoydd"
+
+#: parts/outputviews/appoutputwidget.cpp:257
+msgid "Copy selected lines"
 msgstr ""
 
-#: vcs/cvsservice/cvspartimpl.cpp:839
-msgid "Do you want the files to be added to CVS repository too?"
+#: parts/outputviews/appoutputwidget.cpp:260
+msgid "Save unfiltered"
 msgstr ""
 
-#: vcs/cvsservice/cvspartimpl.cpp:840
-msgid "CVS - New Files Added to Project"
+#: parts/outputviews/appoutputwidget.cpp:261
+msgid "Save filtered output"
 msgstr ""
 
-#: vcs/cvsservice/cvspartimpl.cpp:842
-msgid "Do Not Add"
-msgstr "Na Ychwaneger"
+#: parts/outputviews/appoutputwidget.cpp:268
+#, fuzzy
+msgid "Edit filter"
+msgstr "newidyn"
 
-#: vcs/cvsservice/cvspartimpl.cpp:843
-msgid "askWhenAddingNewFiles"
+#: parts/diff/diffwidget.cpp:93 parts/diff/diffwidget.cpp:326
+#: parts/outputviews/appoutputwidget.cpp:271
+#, fuzzy
+msgid "Hide view"
+msgstr "Eitem Newydd"
+
+#: parts/outputviews/makeactionfilter.cpp:75
+#: parts/outputviews/makeactionfilter.cpp:76
+#: parts/outputviews/makeactionfilter.cpp:77
+#: parts/outputviews/makeactionfilter.cpp:96
+#: parts/outputviews/makeactionfilter.cpp:211
+msgid "compiling"
 msgstr ""
 
-#: vcs/cvsservice/cvspartimpl.cpp:865
-msgid ""
-"Do you want them to be removed from CVS repository too?\n"
-"Warning: They will be removed from disk too."
+#: parts/outputviews/makeactionfilter.cpp:79
+msgid "built"
 msgstr ""
 
-#: vcs/cvsservice/cvspartimpl.cpp:866
-msgid "CVS - Files Removed From Project"
+#: parts/outputviews/makeactionfilter.cpp:80
+#: parts/outputviews/makeactionfilter.cpp:83
+#: parts/outputviews/makeactionfilter.cpp:84
+#: parts/outputviews/makeactionfilter.cpp:95
+msgid "generating"
 msgstr ""
 
-#: vcs/cvsservice/cvspartimpl.cpp:868
-msgid "askWhenRemovingFiles"
+#: parts/outputviews/makeactionfilter.cpp:86
+#: parts/outputviews/makeactionfilter.cpp:88
+#: parts/outputviews/makeactionfilter.cpp:89
+#: parts/outputviews/makeactionfilter.cpp:90
+#: parts/outputviews/makeactionfilter.cpp:91
+msgid "linking"
 msgstr ""
 
-#: vcs/cvsservice/cvspartimpl.cpp:934
-msgid "Operation aborted (process killed)."
-msgstr "Terfynnwyd y gwithrediad (lladdwyd y proses). "
+#: parts/outputviews/makeactionfilter.cpp:93
+msgid "creating"
+msgstr "creu"
 
-#: vcs/cvsservice/cvspartimpl.cpp:935
-msgid "CVS Diff"
+#: parts/outputviews/makeactionfilter.cpp:94
+#: parts/outputviews/makeactionfilter.cpp:97
+msgid "installing"
+msgstr "gosod"
+
+#: parts/outputviews/makeitem.cpp:124
+msgid "*** Compilation aborted ***"
 msgstr ""
 
-#: vcs/cvsservice/cvspartimpl.cpp:940
-msgid "CVS outputted errors during diff."
+#: lib/widgets/processwidget.cpp:230 parts/outputviews/makeitem.cpp:127
+msgid "*** Exited with status: %1 ***"
 msgstr ""
 
-#: vcs/cvsservice/cvspartimpl.cpp:948
-msgid "CVS output errors during diff. Do you still want to continue?"
+#: parts/outputviews/makeitem.cpp:129
+msgid "*** Success ***"
 msgstr ""
 
-#: vcs/cvsservice/cvslogpage.cpp:180
-msgid "invalid link clicked"
+#: parts/outputviews/makeitem.cpp:142
+#, c-format
+msgid "Entering directory %1"
 msgstr ""
 
-#: parts/diff/diffwidget.cpp:76 vcs/cvsservice/diffwidget.cpp:73
+#: parts/outputviews/makeitem.cpp:149
 #, c-format
-msgid "Show in %1"
+msgid "Leaving directory %1"
 msgstr ""
 
-#: parts/diff/diffwidget.cpp:83 vcs/cvsservice/diffwidget.cpp:80
-msgid "&Save As..."
-msgstr "&Cadw Fel..."
+#: parts/outputviews/appoutputviewpart.cpp:45
+msgid "Application Output"
+msgstr ""
 
-#: parts/diff/diffwidget.cpp:88 vcs/cvsservice/diffwidget.cpp:85
-msgid "Highlight Syntax"
+#: parts/outputviews/appoutputviewpart.cpp:46
+msgid ""
+"<b>Application output</b>"
+"<p>The stdout/stderr output window is a replacement for terminal-based "
+"application communication. Running terminal applications use this instead of a "
+"terminal window."
 msgstr ""
 
-#: parts/diff/diffwidget.cpp:112 vcs/cvsservice/diffwidget.cpp:106
-msgid "Unable to open file."
+#: parts/outputviews/appoutputviewpart.cpp:51
+msgid "Output of the executed user program"
 msgstr ""
 
-#: parts/diff/diffwidget.cpp:112 vcs/cvsservice/diffwidget.cpp:106
-msgid "Diff Frontend"
+#: parts/outputviews/appoutputviewpart.cpp:108
+msgid "Press Enter to continue!"
 msgstr ""
 
-#: parts/diff/diffwidget.cpp:324 vcs/cvsservice/diffwidget.cpp:315
-msgid "Display &Raw Output"
+#: parts/outputviews/makewidget.cpp:569
+msgid "The process has finished with errors"
 msgstr ""
 
-#: vcs/cvsservice/annotatedialog.cpp:27
-#, fuzzy
-msgid "CVS Annotate Dialog"
-msgstr "Cysylltiad"
+#: parts/outputviews/makewidget.cpp:574
+msgid "The process has finished successfully"
+msgstr ""
 
-#: vcs/cvsservice/annotatedialog.cpp:33 vcs/cvsservice/annotatedialog.cpp:60
-#, fuzzy
-msgid "Annotate"
-msgstr "Lleoliad"
+#: parts/outputviews/makewidget.cpp:701
+msgid "Line Wrapping"
+msgstr ""
 
-#: vcs/cvsservice/cvspart.cpp:133
+#: parts/outputviews/makewidget.cpp:703
 msgid ""
-"<b>CVS</b>"
-"<p>Concurrent Versions System operations window. Shows output of Cervisia CVS "
-"Service."
+"<b>Line wrapping</b>"
+"<p>Enables or disables wrapping of command lines displayed."
 msgstr ""
 
-#: vcs/cvsservice/cvspart.cpp:134
-msgid "CvsService Output"
+#: parts/outputviews/makewidget.cpp:706
+msgid "Very Short Compiler Output"
 msgstr ""
 
-#: vcs/cvsservice/cvspart.cpp:135 vcs/cvsservice/cvspart.cpp:279
-#: vcs/cvsservice/cvspart.cpp:365
-msgid "CvsService"
-msgstr "GwasanaethCVS"
-
-#: vcs/cvsservice/cvspart.cpp:135
-msgid "cvs output"
+#: parts/outputviews/makewidget.cpp:707
+msgid ""
+"<b>Very short compiler output</b>"
+"<p>Displays only warnings, errors and the file names which are compiled."
 msgstr ""
 
-#: vcs/cvsservice/cvspart.cpp:146
-msgid "&Commit to Repository"
+#: parts/outputviews/makewidget.cpp:709
+msgid "Short Compiler Output"
 msgstr ""
 
-#: vcs/cvsservice/cvspart.cpp:151
-msgid "&Difference Between Revisions"
+#: parts/outputviews/makewidget.cpp:710
+msgid ""
+"<b>Short compiler output</b>"
+"<p>Suppresses all the compiler flags and formats to something readable."
 msgstr ""
 
-#: vcs/cvsservice/cvspart.cpp:153
-msgid "Build difference"
+#: parts/outputviews/makewidget.cpp:712
+msgid "Full Compiler Output"
 msgstr ""
 
-#: vcs/cvsservice/cvspart.cpp:154 vcs/cvsservice/cvspart.cpp:329
-msgid "<b>Build difference</b><p>Builds difference between releases."
+#: parts/outputviews/makewidget.cpp:713
+msgid "<b>Full compiler output</b><p>Displays unmodified compiler output."
 msgstr ""
 
-#: vcs/cvsservice/cvspart.cpp:156
-msgid "Generate &Log"
+#: parts/outputviews/makewidget.cpp:717
+msgid "Show Directory Navigation Messages"
 msgstr ""
 
-#: vcs/cvsservice/cvspart.cpp:158
-msgid "Generate log"
+#: parts/outputviews/makewidget.cpp:718
+msgid ""
+"<b>Show directory navigation messages</b>"
+"<p>Shows <b>cd</b> commands that are executed while building."
 msgstr ""
 
-#: vcs/cvsservice/cvspart.cpp:159 vcs/cvsservice/cvspart.cpp:331
-msgid "<b>Generate log</b><p>Produces log for this file."
+#: parts/classview/viewcombos.cpp:121
+msgid "(Global Namespace)"
 msgstr ""
 
-#: vcs/cvsservice/cvspart.cpp:161
-#, fuzzy
-msgid "&Annotate"
-msgstr "Lleoliad"
+#: parts/classview/classtoolwidget.cpp:37
+msgid "Class Tool"
+msgstr ""
 
-#: vcs/cvsservice/cvspart.cpp:163
-#, fuzzy
-msgid "Generate annotations"
-msgstr "Dewisiadau Cyffredinol"
+#: parts/classview/classviewwidget.cpp:69
+msgid "Group by Directories"
+msgstr ""
 
-#: vcs/cvsservice/cvspart.cpp:164
-msgid "<b>Annotate</b><p>Produces annotations for this file."
+#: parts/classview/classviewwidget.cpp:69
+msgid "Plain List"
 msgstr ""
 
-#: vcs/cvsservice/cvspart.cpp:169 vcs/cvsservice/cvspart.cpp:342
-msgid "<b>Add to repository</b><p>Adds file to repository."
+#: parts/classview/classviewwidget.cpp:69
+msgid "Java Like Mode"
 msgstr ""
 
-#: vcs/cvsservice/cvspart.cpp:171
-#, fuzzy
-msgid "&Edit Files"
-msgstr "newidyn"
+#: parts/classview/classviewwidget.cpp:70
+msgid "View Mode"
+msgstr "Modd Golwg"
 
-#: vcs/cvsservice/cvspart.cpp:173
-msgid "Mark as being edited"
+#: parts/classview/classviewwidget.cpp:72
+msgid ""
+"<b>View mode</b>"
+"<p>Class browser items can be grouped by directories, listed in a plain or java "
+"like view."
 msgstr ""
 
-#: vcs/cvsservice/cvspart.cpp:174
-msgid "<b>Mark as being edited</b><p>Mark the files as being edited."
+#: parts/classview/classviewwidget.cpp:76
+msgid "<b>New class</b><p>Calls the <b>New Class</b> wizard."
 msgstr ""
 
-#: vcs/cvsservice/cvspart.cpp:176
-#, fuzzy
-msgid "&Unedit Files"
-msgstr "Canfod mewn Ffeiliau"
+#: parts/classview/classviewwidget.cpp:78
+msgid "Create get/set Methods"
+msgstr ""
 
-#: vcs/cvsservice/cvspart.cpp:178
-msgid "Remove editing mark from files"
+#: parts/classview/classtreebase.cpp:55 parts/classview/classviewwidget.cpp:81
+msgid "Add Method..."
 msgstr ""
 
-#: vcs/cvsservice/cvspart.cpp:179 vcs/cvsservice/cvspart.cpp:340
-msgid "<b>Remove editing mark</b><p>Remove the editing mark from the files."
+#: parts/classview/classviewwidget.cpp:83
+msgid "<b>Add method</b><p>Calls the <b>New Method</b> wizard."
 msgstr ""
 
-#: vcs/cvsservice/cvspart.cpp:181
-#, fuzzy
-msgid "&Show Editors"
-msgstr "Golygydd"
+#: parts/classview/classtreebase.cpp:57 parts/classview/classviewwidget.cpp:84
+msgid "Add Attribute..."
+msgstr ""
 
-#: vcs/cvsservice/cvspart.cpp:183
-msgid "Show editors"
+#: parts/classview/classviewwidget.cpp:86
+msgid "<b>Add attribute</b><p>Calls the <b>New Attribute</b> wizard."
 msgstr ""
 
-#: vcs/cvsservice/cvspart.cpp:184 vcs/cvsservice/cvspart.cpp:336
-msgid "<b>Show editors</b><p>Shows the list of users who are editing files."
+#: parts/classview/classviewwidget.cpp:88
+msgid "Open Declaration"
 msgstr ""
 
-#: vcs/cvsservice/cvspart.cpp:186
-msgid "Add to Repository as &Binary"
+#: parts/classview/classviewwidget.cpp:90
+msgid ""
+"<b>Open declaration</b>"
+"<p>Opens a file where the selected item is declared and jumps to the "
+"declaration line."
 msgstr ""
 
-#: vcs/cvsservice/cvspart.cpp:188
-msgid "Add file to repository as binary"
+#: parts/classview/classviewwidget.cpp:91
+msgid "Open Implementation"
 msgstr ""
 
-#: vcs/cvsservice/cvspart.cpp:189 vcs/cvsservice/cvspart.cpp:344
+#: parts/classview/classviewwidget.cpp:93
 msgid ""
-"<b>Add to repository as binary</b>"
-"<p>Adds file to repository as binary (-kb option)."
+"<b>Open implementation</b>"
+"<p>Opens a file where the selected item is defined (implemented) and jumps to "
+"the definition line."
 msgstr ""
 
-#: vcs/cvsservice/cvspart.cpp:196
-msgid "&Update/Revert to Another Release"
+#: parts/classview/classviewwidget.cpp:95
+#, fuzzy
+msgid "Follow Editor"
+msgstr "Golygydd"
+
+#: parts/classview/navigator.cpp:113
+msgid "Sync ClassView"
 msgstr ""
 
-#: vcs/cvsservice/cvspart.cpp:198
-msgid "Update/revert"
+#: parts/classview/navigator.cpp:116
+#, fuzzy
+msgid "Jump to next function"
+msgstr "Gwaredu ffeil"
+
+#: parts/classview/navigator.cpp:120
+msgid "Jump to previous function"
 msgstr ""
 
-#: vcs/cvsservice/cvspart.cpp:199 vcs/cvsservice/cvspart.cpp:354
+#: parts/classview/digraphview.cpp:228
 msgid ""
-"<b>Update/revert to another release</b>"
-"<p>Updates/reverts file(s) to another release."
+"You do not have 'dot' installed.\n"
+"It can be downloaded from www.graphviz.org."
 msgstr ""
 
-#: vcs/cvsservice/cvspart.cpp:201
-msgid "R&emove Sticky Flag"
+#: parts/classview/classtooldlg.cpp:45
+msgid "Show parents"
 msgstr ""
 
-#: vcs/cvsservice/cvspart.cpp:203
-msgid "Remove sticky flag"
+#: parts/classview/classtooldlg.cpp:51
+msgid "Show children"
 msgstr ""
 
-#: vcs/cvsservice/cvspart.cpp:204 vcs/cvsservice/cvspart.cpp:356
-msgid "<b>Remove sticky flag</b><p>Removes sticky flag from file(s)."
+#: parts/classview/classtooldlg.cpp:57
+msgid "Show clients"
 msgstr ""
 
-#: vcs/cvsservice/cvspart.cpp:206
-msgid "Make &Tag/Branch"
+#: parts/classview/classtooldlg.cpp:63
+msgid "Show suppliers"
 msgstr ""
 
-#: vcs/cvsservice/cvspart.cpp:208
-msgid "Make tag/branch"
+#: parts/classview/classtooldlg.cpp:69
+msgid "Show methods"
 msgstr ""
 
-#: vcs/cvsservice/cvspart.cpp:209 vcs/cvsservice/cvspart.cpp:350
-msgid "<b>Make tag/branch</b><p>Tags/branches selected file(s)."
+#: parts/classview/classtooldlg.cpp:75
+msgid "Show attributes"
+msgstr "Dangos nodweddion"
+
+#: parts/classview/classtooldlg.cpp:80 parts/classview/classtooldlg.cpp:223
+msgid ""
+"_: member access\n"
+"All"
+msgstr "Popeth"
+
+#: parts/classview/classtooldlg.cpp:81 parts/classview/classtooldlg.cpp:225
+msgid ""
+"_: member access\n"
+"Public"
+msgstr "Cyhoeddus"
+
+#: parts/classview/classtooldlg.cpp:82 parts/classview/classtooldlg.cpp:227
+msgid ""
+"_: member access\n"
+"Protected"
+msgstr "Gwarchodir"
+
+#: parts/classview/classtooldlg.cpp:83 parts/classview/classtooldlg.cpp:229
+msgid ""
+"_: member access\n"
+"Private"
+msgstr "Preivat"
+
+#: parts/classview/classtooldlg.cpp:84 parts/classview/classtooldlg.cpp:231
+msgid ""
+"_: member access\n"
+"Package"
+msgstr "Pecyn"
+
+#: parts/classview/classtooldlg.cpp:287
+msgid "Parents"
 msgstr ""
 
-#: vcs/cvsservice/cvspart.cpp:211
-#, fuzzy
-msgid "&Delete Tag"
-msgstr "Dileu Tudalen"
+#: parts/classview/classtooldlg.cpp:291
+msgid "Children"
+msgstr ""
 
-#: vcs/cvsservice/cvspart.cpp:213
-#, fuzzy
-msgid "Delete tag"
-msgstr "Dileu Tudalen"
+#: parts/classview/classtooldlg.cpp:295
+msgid "Clients"
+msgstr ""
 
-#: vcs/cvsservice/cvspart.cpp:214 vcs/cvsservice/cvspart.cpp:352
-msgid "<b>Delete tag</b><p>Delete tag from selected file(s)."
+#: parts/classview/classtooldlg.cpp:299
+msgid "Suppliers"
 msgstr ""
 
-#: vcs/cvsservice/cvspart.cpp:216
-msgid "&Ignore in CVS Operations"
+#: parts/classview/classtooldlg.cpp:303
+msgid "%1 Methods"
 msgstr ""
 
-#: vcs/cvsservice/cvspart.cpp:218
-msgid "Ignore in CVS operations"
+#: parts/classview/classtooldlg.cpp:307
+msgid "%1 Attributes"
 msgstr ""
 
-#: vcs/cvsservice/cvspart.cpp:219 vcs/cvsservice/cvspart.cpp:360
-msgid ""
-"<b>Ignore in CVS operations</b>"
-"<p>Ignore file(s) by adding it to .cvsignore file."
+#: parts/classview/classtooldlg.cpp:311
+msgid "Class Tool Dialog"
 msgstr ""
 
-#: vcs/cvsservice/cvspart.cpp:221
-msgid "Do &Not Ignore in CVS Operations"
+#: parts/classview/classtooldlg.cpp:324
+msgid "%1 of Class %2"
 msgstr ""
 
-#: vcs/cvsservice/cvspart.cpp:223
-msgid "Do not ignore in CVS operations"
+#: parts/classview/classviewpart.cpp:159
+msgid "Class Browser"
 msgstr ""
 
-#: vcs/cvsservice/cvspart.cpp:224 vcs/cvsservice/cvspart.cpp:362
+#: parts/classview/classviewpart.cpp:160
+msgid "Classes"
+msgstr "Dosbarthiadau"
+
+#: parts/classview/classviewpart.cpp:160
+msgid "Class browser"
+msgstr ""
+
+#: parts/classview/classviewpart.cpp:161
 msgid ""
-"<b>Do not ignore in CVS operations</b>"
-"<p>Do not ignore file(s) by removing\n"
-"it from .cvsignore file."
+"<b>Class browser</b>"
+"<p>The class browser shows all namespaces, classes and namespace and class "
+"members in a project."
 msgstr ""
 
-#: vcs/cvsservice/cvspart.cpp:226
-msgid "&Log to Server"
+#: parts/classview/classviewpart.cpp:198
+msgid "Functions Navigation"
 msgstr ""
 
-#: vcs/cvsservice/cvspart.cpp:228
-msgid "Login to server"
+#: parts/classview/classviewpart.cpp:203
+msgid "Functions in file"
 msgstr ""
 
-#: vcs/cvsservice/cvspart.cpp:229
-msgid "<b>Login to server</b><p>Logs in to the CVS server."
+#: parts/classview/classviewpart.cpp:204
+msgid ""
+"<b>Function navigator</b>"
+"<p>Navigates over functions contained in the file."
 msgstr ""
 
-#: vcs/cvsservice/cvspart.cpp:231
-msgid "L&ogout From Server"
+#: parts/classview/classviewpart.cpp:208
+msgid "Focus Navigator"
 msgstr ""
 
-#: vcs/cvsservice/cvspart.cpp:233
-msgid "Logout from server"
+#: parts/classview/classviewpart.cpp:212
+msgid "Class Inheritance Diagram"
 msgstr ""
 
-#: vcs/cvsservice/cvspart.cpp:234
-msgid "<b>Logout from server</b><p>Logs out from the CVS server."
+#: parts/classview/classviewpart.cpp:213
+msgid "Class inheritance diagram"
 msgstr ""
 
-#: vcs/cvsservice/cvspart.cpp:333
-msgid "<b>Generate Annotate</b><p>Produces annotation output for this file."
+#: parts/classview/classviewpart.cpp:214
+msgid ""
+"<b>Class inheritance diagram</b>"
+"<p>Displays inheritance relationship between classes in project. Note, it does "
+"not display classes outside inheritance hierarchy."
 msgstr ""
 
-#: vcs/cvsservice/cvspart.cpp:338
-msgid "<b>Mark as beeing edited</b><p>Mark the files as beeing edited."
+#: parts/classview/classtreebase.cpp:59
+msgid "Parent Classes..."
 msgstr ""
 
-#: vcs/cvsservice/annotatepage.cpp:109
-#, c-format
-msgid "Annotate failed with exitStatus == %1"
+#: parts/classview/classtreebase.cpp:60
+msgid "Child Classes..."
 msgstr ""
 
-#: vcs/cvsservice/annotatepage.cpp:109
+#: parts/classview/classtreebase.cpp:61
+msgid "Class Tool..."
+msgstr ""
+
+#: parts/classview/classtreebase.cpp:65
+msgid "Struct"
+msgstr ""
+
+#: parts/classview/classtreebase.cpp:71
+msgid "Attribute"
+msgstr "Priodoleddau"
+
+#: kdevdesigner/designer/connectiontable.cpp:39
+#: parts/classview/classtreebase.cpp:77
+msgid "Signal"
+msgstr "Arwydd"
+
+#: parts/classview/hierarchydlg.cpp:52
 #, fuzzy
-msgid "Annotate Failed"
-msgstr "Lleoliad"
+msgid "Refresh"
+msgstr "&Adfer"
 
-#: vcs/cvsservice/annotatepage.cpp:211
-msgid "The selected revision does not exist."
+#: parts/partexplorer/partexplorerform.cpp:49
+msgid "Name: %1 | Type: %2 | Value: %3"
 msgstr ""
 
-#: vcs/cvsservice/cvsdiffpage.cpp:68
-msgid "Error: passed revisions are empty!"
+#: parts/partexplorer/partexplorerform.cpp:112
+msgid "Part Explorer - A Services Lister"
 msgstr ""
 
-#: vcs/cvsservice/cvsdiffpage.cpp:101
-msgid "An error occurred during diffing."
+#: parts/partexplorer/partexplorerform.cpp:122
+msgid ""
+"<b>Matching services</b>"
+"<p>Results (if any) are shown grouped by matching service name."
 msgstr ""
 
-#: vcs/cvsservice/checkoutdialog.cpp:73
-msgid "CVS Checkout"
+#: kdevdesigner/designer/mainwindowactions.cpp:310
+#: parts/partexplorer/partexplorerform.cpp:129
+msgid "&Search"
+msgstr " &Chwilio"
+
+#: parts/partexplorer/partexplorerform.cpp:181
+msgid "Unknown error."
+msgstr "Gwall anhysbys."
+
+#: parts/partexplorer/partexplorerform.cpp:194
+msgid "No service found matching the criteria."
 msgstr ""
 
-#: vcs/cvsservice/checkoutdialog.cpp:263
-msgid "Please, choose a valid working directory"
+#: parts/partexplorer/partexplorer_plugin.cpp:43
+msgid "&Part Explorer"
 msgstr ""
 
-#: vcs/cvsservice/checkoutdialog.cpp:265
-msgid "Please, choose a CVS server."
+#: parts/partexplorer/partexplorer_plugin.cpp:45
+msgid "TDETrader query execution"
 msgstr ""
 
-#: vcs/cvsservice/checkoutdialog.cpp:267
-msgid "Please, fill the CVS module field."
+#: parts/partexplorer/partexplorer_plugin.cpp:46
+msgid ""
+"<b>Part explorer</b>"
+"<p>Shows a dialog for TDETrader query execution. Search your TDE documentation "
+"for more information about TDE services and TDETrader."
 msgstr ""
 
-#: vcs/cvsservice/commitdlg.cpp:67
+#: parts/astyle/astyle_part.cpp:53
+msgid "&Reformat Source"
+msgstr ""
+
+#: parts/astyle/astyle_part.cpp:55
+msgid "Reformat source"
+msgstr ""
+
+#: parts/astyle/astyle_part.cpp:56
 msgid ""
-"You are committing your changes without any comment. This is not a good "
-"practice. Continue anyway?"
+"<b>Reformat source</b>"
+"<p>Source reformatting functionality using <b>astyle</b> "
+"library. Also available in <b>New Class</b> and <b>Subclassing</b> wizards."
 msgstr ""
 
-#: vcs/cvsservice/commitdlg.cpp:68
-msgid "CVS Commit Warning"
+#: parts/astyle/astyle_part.cpp:59 parts/astyle/astyle_part.cpp:61
+#: parts/astyle/astyle_part.cpp:410
+msgid "Format files"
 msgstr ""
 
-#: vcs/cvsservice/commitdlg.cpp:70
-msgid "askWhenCommittingEmptyLogs"
+#: parts/astyle/astyle_part.cpp:62
+msgid ""
+"<b>Fomat files</b>"
+"<p>Formatting functionality using <b>astyle</b> library. Also available in <b>"
+"New Class</b> and <b>Subclassing</b> wizards."
 msgstr ""
 
-#: vcs/cvsservice/cvsprocesswidget.cpp:145
-#, c-format
-msgid "Started job: %1"
+#: parts/astyle/astyle_part.cpp:67 parts/astyle/astyle_part.cpp:68
+msgid "Formatting"
 msgstr ""
 
-#: vcs/cvsservice/cvsprocesswidget.cpp:167
-msgid "*** Job canceled by user request ***"
+#: parts/astyle/astyle_part.cpp:402
+#, fuzzy
+msgid "Format selection"
+msgstr "G&wagu Dewisiad"
+
+#: parts/astyle/astyle_part.cpp:403
+msgid "<b>Format</b><p>Formats the current selection, if possible"
 msgstr ""
 
-#: vcs/cvsservice/cvsprocesswidget.cpp:189
+#: parts/astyle/astyle_part.cpp:411
+msgid "<b>Format files</b><p>Formats selected files if possible"
+msgstr ""
+
+#: parts/astyle/astyle_part.cpp:523
 #, c-format
-msgid "Job finished with exitCode == %1"
+msgid "Not able to write %1"
 msgstr ""
 
-#: vcs/cvsservice/cvsprocesswidget.cpp:193
-msgid "Done CVS command ..."
+#: parts/astyle/astyle_part.cpp:528
+#, c-format
+msgid "Not able to read %1"
 msgstr ""
 
-#: vcs/cvsservice/integrator/integratordlg.cpp:62
-#: vcs/cvsservice/integrator/integratordlg.cpp:82
-#: vcs/cvsservice/integrator/integratordlg.cpp:84
-#: vcs/cvsservice/integrator/integratordlg.cpp:129
-#: vcs/cvsservice/integrator/integratordlg.cpp:131
-msgid "Init CVS Repository"
+#: parts/astyle/astyle_part.cpp:534
+msgid "Processed %1 files ending with extensions %2"
 msgstr ""
 
-#: vcs/cvsservice/integrator/integratordlg.cpp:82
-msgid ""
-"cvs init did not exit normally. Please check if cvs is installed and works "
-"correctly."
+#: parts/filter/filterpart.cpp:40
+msgid "Execute Command..."
 msgstr ""
 
-#: vcs/cvsservice/integrator/integratordlg.cpp:84
+#: parts/filter/filterpart.cpp:43
+msgid "Execute shell command"
+msgstr "Gweithredu Gorchymyn Plisgyn"
+
+#: parts/filter/filterpart.cpp:44
 msgid ""
-"cvs init exited with status %1. Please check if the cvs location is correct."
+"<b>Execute shell command</b>"
+"<p>Executes a shell command and outputs its result into the current document."
 msgstr ""
 
-#: vcs/cvsservice/integrator/integratordlg.cpp:129
-msgid ""
-"cvs import did not exit normally. Please check if cvs is installed and works "
-"correctly."
+#: parts/filter/filterpart.cpp:46
+msgid "Filter Selection Through Command..."
 msgstr ""
 
-#: vcs/cvsservice/integrator/integratordlg.cpp:131
+#: parts/filter/filterpart.cpp:49
+msgid "Filter selection through a shell command"
+msgstr ""
+
+#: parts/filter/filterpart.cpp:50
 msgid ""
-"cvs import exited with status %1. Please check if the cvs location is correct."
+"<b>Filter selection through shell command</b>"
+"<p>Filters selection through a shell command and outputs its result into the "
+"current document."
 msgstr ""
 
-#: vcs/perforce/perforcepart.cpp:60 vcs/perforce/perforcepart.cpp:101
-msgid "<b>Edit</b><p>Opens file(s) in a client workspace for edit."
+#: parts/filter/filterpart.cpp:96
+msgid "Execute Command"
 msgstr ""
 
-#: vcs/perforce/perforcepart.cpp:64 vcs/perforce/perforcepart.cpp:104
-msgid "<b>Revert</b><p>Discards changes made to open files."
+#: parts/filter/filterpart.cpp:142
+msgid "Filter Selection Through Command"
 msgstr ""
 
-#: vcs/perforce/perforcepart.cpp:65 vcs/perforce/perforcepart.cpp:67
-#: vcs/perforce/perforcepart.cpp:105
-msgid "Submit"
-msgstr "Cyflwyno"
+#: parts/filter/shellfilterdlg.cpp:122 parts/filter/shellinsertdlg.cpp:119
+#, c-format
+msgid "Process exited with status %1"
+msgstr ""
 
-#: vcs/perforce/perforcepart.cpp:68 vcs/perforce/perforcepart.cpp:107
-msgid "<b>Submit</b><p>Sends changes made to open files to the depot."
+#: parts/filecreate/filecreate_widget2.cpp:48
+msgid "Use this to create new files within your project."
 msgstr ""
 
-#: vcs/perforce/perforcepart.cpp:69 vcs/perforce/perforcepart.cpp:71
-#: vcs/perforce/perforcepart.cpp:108
-msgid "Sync"
-msgstr "Cydweddu"
+#: parts/filecreate/addglobaldlg.cpp:61
+msgid "Template Location"
+msgstr ""
 
-#: vcs/perforce/perforcepart.cpp:72 vcs/perforce/perforcepart.cpp:110
-msgid "<b>Sync</b><p>Copies files from the depot into the workspace."
+#: parts/filecreate/addglobaldlg.cpp:92
+msgid "Select Global File Types"
 msgstr ""
 
-#: vcs/perforce/perforcepart.cpp:73 vcs/perforce/perforcepart.cpp:112
-msgid "Diff Against Repository"
+#: parts/filecreate/addglobaldlg.cpp:94
+msgid "F1"
+msgstr "F1"
+
+#: parts/filecreate/addglobaldlg.cpp:99
+msgid "Type extension:"
 msgstr ""
 
-#: vcs/perforce/perforcepart.cpp:75
-msgid "Diff against repository"
+#: parts/filecreate/addglobaldlg.cpp:100
+msgid "Type name:"
+msgstr "Enw'r math:"
+
+#: parts/filecreate/addglobaldlg.cpp:101
+msgid "Template location:"
 msgstr ""
 
-#: vcs/perforce/perforcepart.cpp:76 vcs/perforce/perforcepart.cpp:114
+#: parts/filecreate/addglobaldlg.cpp:102
+msgid "Icon:"
+msgstr "Eicon:"
+
+#: parts/filecreate/filecreate_part.cpp:75
+#: parts/filecreate/filecreate_part.cpp:76
+msgid "File Templates"
+msgstr ""
+
+#: parts/filecreate/filecreate_part.cpp:82
 msgid ""
-"<b>Diff against repository</b>"
-"<p>Compares a client workspace file to a revision in the depot."
+"<b>New file</b>"
+"<p>Creates a new file. Also adds it the project if the <b>Add to project</b> "
+"checkbox is turned on."
 msgstr ""
 
-#: vcs/perforce/perforcepart.cpp:77 vcs/perforce/perforcepart.cpp:115
-msgid "Add to Repository"
+#: buildtools/script/scriptprojectpart.cpp:57
+#: parts/filecreate/filecreate_part.cpp:83
+msgid "Create a new file"
 msgstr ""
 
-#: vcs/perforce/perforcepart.cpp:79
-msgid "Add to repository"
+#: parts/filecreate/fcconfigwidget.cpp:51
+msgid "Global Types"
 msgstr ""
 
-#: vcs/perforce/perforcepart.cpp:80 vcs/perforce/perforcepart.cpp:117
-msgid ""
-"<b>Add to repository</b>"
-"<p>Open file(s) in a client workspace for addition to the depot."
+#: parts/filecreate/fcconfigwidget.cpp:62
+msgid "Project templates in "
 msgstr ""
 
-#: vcs/perforce/perforcepart.cpp:81 vcs/perforce/perforcepart.cpp:118
-msgid "Remove From Repository"
+#: parts/filecreate/fcconfigwidget.cpp:652
+msgid ""
+"Requested template does not exist yet.\n"
+"It will be opened immediately after accepting the configuration dialog."
 msgstr ""
 
-#: vcs/perforce/perforcepart.cpp:84 vcs/perforce/perforcepart.cpp:120
+#: parts/filecreate/fcconfigwidget.cpp:677
+#: parts/filecreate/fcconfigwidget.cpp:700
 msgid ""
-"<b>Remove from repository</b>"
-"<p>Open file(s) in a client workspace for deletion from the depot."
+"Template for the selected file type does not exist yet.\n"
+"It will be opened immediately after accepting the configuration dialog."
 msgstr ""
 
-#: vcs/perforce/perforcepart.cpp:121
-msgid "Perforce"
+#: parts/filecreate/fcconfigwidget.cpp:679
+#: parts/filecreate/fcconfigwidget.cpp:702
+msgid ""
+"Template for the selected file type has been changed.\n"
+"It will be opened immediately after accepting the configuration dialog."
 msgstr ""
 
-#: vcs/perforce/perforcepart.cpp:132
-msgid "Cannot handle directories, please select single files"
+#: parts/filecreate/filecreate_newfile.cpp:33
+msgid ""
+"_: New file dialog (title)\n"
+"New File"
+msgstr "Ffeil newydd"
+
+#: parts/filecreate/filecreate_newfile.cpp:38
+msgid "<b>New File Creation</b>"
 msgstr ""
 
-#: vcs/perforce/perforcepart.cpp:155
-msgid "Do you really want to revert the file %1 and lose all your changes?"
+#: parts/filecreate/filecreate_newfile.cpp:56
+msgid ""
+"_: Add to project (on checkbox)\n"
+"&Add to project"
 msgstr ""
 
-#: vcs/perforce/perforcepart.cpp:156
+#: parts/filecreate/filecreate_newfile.cpp:155
 #, fuzzy
-msgid "Do Not Revert"
-msgstr "Dychwelyd"
+msgid "A file with this name already exists"
+msgstr "Mae ffeil o'r enw %1 mewn bod yn barod."
 
-#: vcs/perforce/perforcepart.cpp:168
-msgid "Submitting of subdirectories is not supported"
+#: parts/filecreate/filecreate_newfile.cpp:155
+msgid "File Exists"
+msgstr "Ffeil yn Bodoli"
+
+#: parts/filecreate/filecreate_widget3.cpp:36
+msgid "File Create"
 msgstr ""
 
-#: vcs/perforce/perforcepart.cpp:258
-msgid "P4 output errors during diff."
+#: parts/filecreate/filecreate_widget3.cpp:44
+msgid ""
+"<b>New file</b>"
+"<p>This part makes the creation of new files easier. Select a type in the list "
+"to create a file. The list of project file types can be configured in project "
+"settings dialog, <b>New File Wizard</b> tab. Globally available file types are "
+"listed and can be configured in TDevelop settings dialog, <b>New File Wizard</b> "
+"tab."
 msgstr ""
 
-#: vcs/perforce/perforcepart.cpp:263
-msgid "P4 output errors during diff. Do you still want to continue?"
+#: parts/distpart/distpart_part.cpp:48
+msgid "Distribution && Publishing"
 msgstr ""
 
-#: vcs/perforce/perforcepart.cpp:270
-msgid "No Differences Found"
+#: parts/distpart/distpart_part.cpp:52
+msgid "Make source and binary distribution"
 msgstr ""
 
-#: vcs/perforce/commitdlg.cpp:32
-msgid "Perforce Submit"
+#: parts/distpart/distpart_part.cpp:53
+msgid ""
+"<b>Project distribution & publishing</b>"
+"<p>Helps users package and publish their software."
 msgstr ""
 
-#: vcs/perforce/commitdlg.cpp:42
-msgid "&Enter description:"
+#: parts/distpart/distpart_part.cpp:56
+msgid "Distribution & Publishing"
 msgstr ""
 
-#: vcs/perforce/commitdlg.cpp:54
-msgid "C&lient:"
-msgstr "D&ibynnydd:"
+#: parts/distpart/specsupport.cpp:78 parts/distpart/specsupport.cpp:177
+msgid "You need to create a source archive first."
+msgstr ""
 
-#: vcs/perforce/commitdlg.cpp:58
-msgid "&User:"
-msgstr "&Defnyddiwr:"
+#: parts/distpart/distpart_widget.cpp:134
+msgid "Building Package"
+msgstr ""
 
-#: vcs/perforce/commitdlg.cpp:62
-msgid "&File(s):"
+#: parts/distpart/distpart_widget.cpp:145
+#, fuzzy, c-format
+msgid "Adding file: %1"
+msgstr "&Ychwanegu Ffeil..."
+
+#: parts/distpart/distpart_widget.cpp:152
+#, c-format
+msgid "Archive made at: %1"
 msgstr ""
 
-#: vcs/perforce/commitdlg.cpp:147
-msgid "Please enter the P4 client name."
+#: parts/distpart/distpart_widget.cpp:152
+msgid "Archive Done"
 msgstr ""
 
-#: vcs/perforce/commitdlg.cpp:151
-msgid "Please enter the P4 user."
+#: parts/distpart/distpart_widget.cpp:595
+#, fuzzy, c-format
+msgid "Remove %1"
+msgstr "G&waredu"
+
+#: buildtools/qmake/trollprojectwidget.cpp:1796
+#: buildtools/qmake/trollprojectwidget.cpp:1937
+#: parts/distpart/distpart_widget.cpp:595
+msgid "Remove File"
+msgstr "Gwaredu Ffeil"
+
+#: parts/diff/diffdlg.cpp:20
+msgid "Difference Viewer"
 msgstr ""
 
-#: vcs/perforce/commitdlg.cpp:155
-msgid "The changelist does not contain any files."
+#: parts/diff/diffwidget.cpp:76 vcs/cvsservice/diffwidget.cpp:73
+#, c-format
+msgid "Show in %1"
 msgstr ""
 
-#: parts/diff/diffwidget.cpp:93 parts/diff/diffwidget.cpp:326
-#: parts/outputviews/appoutputwidget.cpp:271
-#, fuzzy
-msgid "Hide view"
-msgstr "Eitem Newydd"
+#: parts/diff/diffwidget.cpp:83 vcs/cvsservice/diffwidget.cpp:80
+msgid "&Save As..."
+msgstr "&Cadw Fel..."
+
+#: parts/diff/diffwidget.cpp:88 vcs/cvsservice/diffwidget.cpp:85
+msgid "Highlight Syntax"
+msgstr ""
+
+#: parts/diff/diffwidget.cpp:112 vcs/cvsservice/diffwidget.cpp:106
+msgid "Unable to open file."
+msgstr ""
+
+#: parts/diff/diffwidget.cpp:112 vcs/cvsservice/diffwidget.cpp:106
+msgid "Diff Frontend"
+msgstr ""
+
+#: parts/diff/diffwidget.cpp:324 vcs/cvsservice/diffwidget.cpp:315
+msgid "Display &Raw Output"
+msgstr ""
+
+#: parts/diff/diffpart.cpp:52 vcs/clearcase/clearcasepart.cpp:105
+msgid "Diff"
+msgstr "Diff"
 
 #: parts/diff/diffpart.cpp:53
 msgid "Diff Output"
@@ -20137,4084 +21041,5517 @@ msgstr ""
 msgid "Please Select Patch File"
 msgstr ""
 
-#: parts/diff/diffdlg.cpp:20
-msgid "Difference Viewer"
+#: parts/regexptest/regexptestdlg.cpp:85
+#: parts/regexptest/regexptestdlg.cpp:103
+#: parts/regexptest/regexptestdlg.cpp:179
+msgid "No match"
 msgstr ""
 
-#: parts/partexplorer/partexplorerform.cpp:49
-msgid "Name: %1 | Type: %2 | Value: %3"
+#: parts/regexptest/regexptestdlg.cpp:88
+#: parts/regexptest/regexptestdlg.cpp:106
+#: parts/regexptest/regexptestdlg.cpp:183
+msgid "Successfully matched"
 msgstr ""
 
-#: parts/partexplorer/partexplorerform.cpp:112
-msgid "Part Explorer - A Services Lister"
+#: parts/regexptest/regexptestdlg.cpp:99
+msgid "Compile error, your regexp is invalid"
 msgstr ""
 
-#: parts/partexplorer/partexplorerform.cpp:122
-msgid ""
-"<b>Matching services</b>"
-"<p>Results (if any) are shown grouped by matching service name."
+#: parts/regexptest/regexptestdlg.cpp:126
+msgid "Repetition operators must not appear as first character"
 msgstr ""
 
-#: kdevdesigner/designer/mainwindowactions.cpp:310
-#: parts/partexplorer/partexplorerform.cpp:129
-msgid "&Search"
-msgstr " &Chwilio"
-
-#: parts/partexplorer/partexplorerform.cpp:181
-msgid "Unknown error."
-msgstr "Gwall anhysbys."
-
-#: parts/partexplorer/partexplorerform.cpp:194
-msgid "No service found matching the criteria."
+#: parts/regexptest/regexptestdlg.cpp:129
+msgid "Invalid use of back reference operator"
 msgstr ""
 
-#: parts/partexplorer/partexplorer_plugin.cpp:43
-msgid "&Part Explorer"
+#: parts/regexptest/regexptestdlg.cpp:132
+msgid "Unmatched brace interval operators"
 msgstr ""
 
-#: parts/partexplorer/partexplorer_plugin.cpp:45
-msgid "TDETrader query execution"
+#: parts/regexptest/regexptestdlg.cpp:135
+msgid "Unmatched bracket list operators"
 msgstr ""
 
-#: parts/partexplorer/partexplorer_plugin.cpp:46
-msgid ""
-"<b>Part explorer</b>"
-"<p>Shows a dialog for TDETrader query execution. Search your TDE documentation "
-"for more information about TDE services and TDETrader."
+#: parts/regexptest/regexptestdlg.cpp:138
+msgid "Invalid use of range operator"
 msgstr ""
 
-#: parts/replace/replace_part.cpp:43
-msgid ""
-"<b>Replace</b>"
-"<p>This window shows a preview of a string replace operation. Uncheck a line to "
-"exclude that replacement. Uncheck a file to exclude the whole file from the "
-"operation. Clicking on a line in the list will automatically open the "
-"corresponding source file and set the cursor to the line with the match."
+#: parts/regexptest/regexptestdlg.cpp:141
+msgid "Unknown character class"
 msgstr ""
 
-#: parts/replace/replace_part.cpp:52 parts/replace/replace_part.cpp:57
-msgid "Project wide string replacement"
+#: parts/regexptest/regexptestdlg.cpp:144
+msgid "Invalid collating element"
 msgstr ""
 
-#: parts/replace/replace_part.cpp:55
-msgid "Find-Select-Replace..."
+#: parts/regexptest/regexptestdlg.cpp:147
+msgid "Unmatched parenthesis group operators"
 msgstr ""
 
-#: parts/replace/replace_part.cpp:58
-msgid ""
-"<b>Find-Select-Replace</b>"
-"<p>Opens the project wide string replacement dialog. There you can enter a "
-"string or a regular expression which is then searched for within all files in "
-"the locations you specify. Matches will be displayed in the <b>Replace</b> "
-"window, you can replace them with the specified string, exclude them from "
-"replace operation or cancel the whole replace."
+#: parts/regexptest/regexptestdlg.cpp:150
+msgid "Invalid back reference to subexpression"
 msgstr ""
 
-#: parts/replace/replace_part.cpp:102
-#, fuzzy, c-format
-msgid "Replace Project Wide: %1"
-msgstr "&Ffeil y cywaith:"
+#: parts/regexptest/regexptestdlg.cpp:153
+msgid "Trailing backslash"
+msgstr ""
 
-#: parts/replace/replace_part.cpp:104
-msgid ""
-"<b>Replace Project Wide</b>"
-"<p>Opens the find in files dialog and sets the pattern to the text under the "
-"cursor."
+#: parts/regexptest/regexptestdlg.cpp:156
+msgid "Invalid use of pattern operators"
 msgstr ""
 
-#: parts/tools/toolsconfigwidget.cpp:130
-msgid "An entry with this title exists already."
+#: parts/regexptest/regexptestdlg.cpp:160
+msgid "Regular expression too large"
 msgstr ""
 
-#: parts/tools/toolsconfigwidget.cpp:170
-msgid "Add to Tools Menu"
+#: parts/regexptest/regexptestdlg.cpp:164
+msgid "Unknown error"
+msgstr "Gwall anhysbys"
+
+#: parts/regexptest/regexptestpart.cpp:35
+msgid "Debug Regular Expression..."
 msgstr ""
 
-#: parts/tools/toolsconfigwidget.cpp:197
-msgid "Add to File Context Menus"
+#: parts/regexptest/regexptestpart.cpp:38
+msgid "Debug regular expression"
 msgstr ""
 
-#: parts/tools/toolsconfigwidget.cpp:225
-msgid "Add to Directory Context Menus"
+#: parts/regexptest/regexptestpart.cpp:39
+msgid ""
+"<b>Debug regular expression</b>"
+"<p>Allows to enter a regular expression and validate it. It is possible to "
+"check syntax of basic POSIX, extended POSIX regular expressions and also syntax "
+"allowed by TQRegExp and KRegExp classes."
 msgstr ""
 
-#: parts/tools/toolsconfig.cpp:40
-msgid "&Applications:"
-msgstr "&Cymhwysiadau:"
+#: src/projectmanager.cpp:96
+msgid "&Open Project..."
+msgstr "&Agor Cywaith..."
 
-#: parts/tools/toolsconfig.cpp:63
-msgid "&Tools menu:"
+#: src/projectmanager.cpp:99
+msgid "Open project"
+msgstr "Agor Cywaith"
+
+#: src/projectmanager.cpp:100
+msgid "<b>Open project</b><p>Opens a KDevelop3 or KDevelop2 project."
 msgstr ""
 
-#: parts/tools/kapplicationtree.cpp:137
-msgid "Known Applications"
-msgstr "Cymhwysiannau Hysbys"
+#: src/projectmanager.cpp:103
+msgid "Open &Recent Project"
+msgstr "Agor &Cywaith Diweddar"
 
-#: parts/tools/tools_part.cpp:48
-msgid "Tools Menu"
-msgstr ""
+#: src/projectmanager.cpp:106
+msgid "Open recent project"
+msgstr "Agor Cywaith Diweddar"
 
-#: parts/quickopen/quickopenclassdialog.cpp:42
-msgid "Class &list:"
+#: src/projectmanager.cpp:107
+msgid "<b>Open recent project</b><p>Opens recently opened project."
 msgstr ""
 
-#: parts/quickopen/quickopenclassdialog.cpp:81
-#, c-format
-msgid "Select The Location of Class %1"
+#: src/projectmanager.cpp:111
+msgid "C&lose Project"
+msgstr "C&au Cywaith"
+
+#: src/projectmanager.cpp:115
+msgid "Close project"
+msgstr "Cau Cywaith"
+
+#: src/projectmanager.cpp:116
+msgid "<b>Close project</b><p>Closes the current project."
 msgstr ""
 
-#: parts/quickopen/quickopen_part.cpp:58
-msgid "Quick Open File..."
+#: src/projectmanager.cpp:118
+#, fuzzy
+msgid "Project &Options"
+msgstr "Gosodiadau Cywaith"
+
+#: src/projectmanager.cpp:121
+msgid "Project options"
 msgstr ""
 
-#: parts/quickopen/quickopen_part.cpp:61
-msgid "Quick open file in project"
+#: src/projectmanager.cpp:122
+msgid "<b>Project options</b><p>Lets you customize project options."
 msgstr ""
 
-#: parts/quickopen/quickopen_part.cpp:62
+#: src/projectmanager.cpp:133
 msgid ""
-"<b>Quick open</b>"
-"<p>Provides a file name input form with completion listbox to quickly open file "
-"in a project."
+"*.tdevelop|KDevelop 3 Project Files\n"
+"*.kdevprj|KDevelop 2 Project Files"
 msgstr ""
 
-#: parts/quickopen/quickopen_part.cpp:64
-msgid "Quick Open Class..."
+#: kdevdesigner/designer/mainwindow.cpp:3085 src/projectmanager.cpp:135
+msgid "Open Project"
+msgstr "Agor Cywaith"
+
+#: src/projectmanager.cpp:224
+msgid "Are you sure you want to reopen the current project?"
 msgstr ""
 
-#: parts/quickopen/quickopen_part.cpp:67
-msgid "Find class in project"
+#: src/projectmanager.cpp:224
+#, fuzzy
+msgid "Reopen"
+msgstr "G&waredu"
+
+#: src/projectmanager.cpp:224
+#, fuzzy
+msgid "Do Not Reopen"
+msgstr "Dogfen i'w hagor"
+
+#: src/projectmanager.cpp:278
+msgid "Changing plugin profile..."
 msgstr ""
 
-#: parts/quickopen/quickopen_part.cpp:68
-msgid ""
-"<b>Find class</b>"
-"<p>Provides a class name input form with completion listbox to quickly open a "
-"file where the class is defined."
+#: src/projectmanager.cpp:281
+msgid "Loading project plugins..."
 msgstr ""
 
-#: parts/quickopen/quickopen_part.cpp:70
-msgid "Quick Open Method..."
+#: src/projectmanager.cpp:290
+msgid "error during restoring of the TDevelop session !"
 msgstr ""
 
-#: parts/quickopen/quickopen_part.cpp:71
-msgid "Quick open function in project"
+#: src/projectmanager.cpp:306
+msgid "Project loaded."
 msgstr ""
 
-#: parts/quickopen/quickopen_part.cpp:73
-msgid "Switch To..."
+#: src/projectmanager.cpp:358 src/projectmanager.cpp:366
+#, c-format
+msgid "Could not read project file: %1"
 msgstr ""
 
-#: parts/quickopen/quickopen_part.cpp:74
-msgid "Switch to"
+#: src/projectmanager.cpp:385
+msgid "This is not a valid project file."
 msgstr ""
 
-#: parts/quickopen/quickopen_part.cpp:75
-msgid ""
-"<b>Switch to</b>"
-"<p>Prompts to enter the name of previously opened file to switch to."
+#: src/projectmanager.cpp:406 src/projectmanager.cpp:417
+msgid "Could not write the project file."
 msgstr ""
 
-#: parts/quickopen/quickopenfunctionchooseform.cpp:34
-#, c-format
-msgid "Select One Argument or File of Function %1"
+#: src/projectmanager.cpp:488
+msgid "No project management plugin %1 found."
 msgstr ""
 
-#: parts/quickopen/quickopenfunctiondialog.cpp:45
-msgid "Function &name:"
+#: src/projectmanager.cpp:498
+#, c-format
+msgid "Could not create project management plugin %1."
 msgstr ""
 
-#: parts/quickopen/quickopenfunctiondialog.cpp:46
-msgid "Function &list:"
+#: src/projectmanager.cpp:544
+msgid "No language plugin for %1 found."
 msgstr ""
 
-#: parts/quickopen/quickopenfunctiondialog.cpp:136
-msgid "Error: cannot find matching name function."
+#: src/projectmanager.cpp:558
+#, c-format
+msgid "Could not create language plugin for %1."
 msgstr ""
 
-#: parts/grepview/grepviewwidget.cpp:137 parts/grepview/grepviewwidget.cpp:460
-msgid "Search Results"
-msgstr "Canlyniadau Chwilio"
+#: src/projectmanager.cpp:617
+msgid "Invalid URL."
+msgstr "URL annilys."
 
-#: parts/grepview/grepviewwidget.cpp:302
-msgid "Unable to create a temporary file for search."
+#: src/projectmanager.cpp:623
+msgid "You do not have 'kdevprj2tdevelop' installed."
 msgstr ""
 
-#: parts/grepview/grepdlg.cpp:86 parts/grepview/grepviewpart.cpp:61
-#: parts/grepview/grepviewwidget.cpp:447
-msgid "Find in Files"
-msgstr "Canfod mewn Ffeiliau"
+#: src/statusbar.cpp:101
+msgid " Line: %1 Col: %2 "
+msgstr "Llinell: %1 Col: %2"
 
-#: parts/grepview/grepviewwidget.cpp:523
-#, c-format
+#: src/projectsession.cpp:81
 msgid ""
-"_n: *** %n match found. ***\n"
-"*** %n matches found. ***"
+"The file %1 does not contain valid XML.\n"
+"The loading of the session failed."
 msgstr ""
 
-#: parts/grepview/grepviewpart.cpp:53
-msgid "Grep Output"
+#: src/projectsession.cpp:94
+msgid ""
+"The file %1 does not contain a valid TDevelop project session "
+"('KDevPrjSession').\n"
 msgstr ""
 
-#: parts/grepview/grepviewpart.cpp:54
-msgid ""
-"<b>Find in files</b>"
-"<p>This window contains the output of a grep command. Clicking on an item in "
-"the list will automatically open the corresponding source file and set the "
-"cursor to the line with the match."
+#: src/projectsession.cpp:95
+msgid "The document type seems to be: '%1'."
 msgstr ""
 
-#: parts/grepview/grepviewpart.cpp:61
-msgid "Output of the grep command"
+#: src/plugincontroller.cpp:150
+#, c-format
+msgid "Loading: %1"
+msgstr "llwytho : %1"
+
+#: src/plugincontroller.cpp:219
+msgid ""
+"<b>Could not load plugin</b>"
+"<br>Plugin %1 could not be loaded"
+"<br>Library loader error: %2"
 msgstr ""
 
-#: parts/grepview/grepviewpart.cpp:65
-msgid "Find in Fi&les..."
-msgstr "Canfod mew&n Ffeiliau ..."
+#: src/plugincontroller.cpp:223
+#, fuzzy
+msgid "Could not load plugin"
+msgstr "Methu llwytho ffeil. '%1'"
 
-#: parts/grepview/grepviewpart.cpp:68
-msgid "Search for expressions over several files"
+#: src/main.cpp:25 src/main_assistant.cpp:25
+msgid "Profile to load"
 msgstr ""
 
-#: parts/grepview/grepviewpart.cpp:69
+#: src/main_assistant.cpp:32
 msgid ""
-"<b>Find in files</b>"
-"<p>Opens the 'Find in files' dialog. There you can enter a regular expression "
-"which is then searched for within all files in the directories you specify. "
-"Matches will be displayed, you can switch to a match directly."
+"The TDevelop Integrated Development Environment:\n"
+"assistant and documentation viewer"
 msgstr ""
 
-#: parts/grepview/grepviewpart.cpp:119
-#, c-format
-msgid "Grep: %1"
+#: src/main_assistant.cpp:33
+#, fuzzy
+msgid "TDevelop Assistant"
+msgstr "Cymhorthwr KDevelop"
+
+#: src/main.cpp:35 src/main_assistant.cpp:35
+msgid "(c) 1999-2007, The KDevelop developers"
 msgstr ""
 
-#: parts/grepview/grepviewpart.cpp:121
+#: src/main.cpp:36 src/main_assistant.cpp:36
 msgid ""
-"<b>Grep</b>"
-"<p>Opens the find in files dialog and sets the pattern to the text under the "
-"cursor."
+"Release coordinator, Overall improvements, Pascal support, C++ support, New "
+"File and Documentation parts"
 msgstr ""
 
-#: parts/fileview/addfilegroupdlg.cpp:32 parts/grepview/grepdlg.cpp:95
-msgid "&Pattern:"
-msgstr "&Patrwm:"
+#: src/main.cpp:37 src/main_assistant.cpp:37
+msgid "Release coordinator, API documentation, Doxygen and autoproject patches"
+msgstr ""
 
-#: parts/grepview/grepdlg.cpp:123
-#, fuzzy
-msgid "&Regular Expression"
-msgstr "&Mynegiad rheolaidd :"
+#: src/main.cpp:39 src/main_assistant.cpp:38
+msgid "Initial idea, basic architecture, much initial source code"
+msgstr ""
 
-#: parts/grepview/grepdlg.cpp:157
-msgid "Set directory to that of the current file (Alt+Y)"
+#: src/main.cpp:40 src/main_assistant.cpp:39
+msgid "KTabBar, bugfixes"
 msgstr ""
 
-#: parts/grepview/grepdlg.cpp:163
-#, fuzzy
-msgid "Rec&ursive"
-msgstr "&Ymgylchol"
+#: src/main.cpp:41 src/main_assistant.cpp:40
+msgid "Java & Objective C support"
+msgstr ""
 
-#: parts/grepview/grepdlg.cpp:167
-#, fuzzy
-msgid "Limit search to &project files"
-msgstr "&Ffeil y cywaith:"
+#: src/main.cpp:42 src/main.cpp:43 src/main_assistant.cpp:41
+msgid "Debugger frontend"
+msgstr ""
 
-#: parts/grepview/grepdlg.cpp:172
-msgid "&Files:"
-msgstr "&Ffeiliau:"
+#: src/main.cpp:44 src/main_assistant.cpp:42
+msgid "PHP support, context menu stuff"
+msgstr ""
 
-#: parts/grepview/grepdlg.cpp:180
-#, fuzzy
-msgid "&Exclude:"
-msgstr "&Gweithredadwyn:"
+#: src/main.cpp:45 src/main_assistant.cpp:43
+msgid "TDE application templates"
+msgstr ""
 
-#: parts/grepview/grepdlg.cpp:199
-#, fuzzy
-msgid "New view"
-msgstr "Eitem Newydd"
+#: src/main.cpp:46 src/main_assistant.cpp:44
+msgid "Dist part, bash support, application templates"
+msgstr ""
 
-#: parts/grepview/grepdlg.cpp:203
-msgid "&Suppress find errors"
+#: src/main.cpp:47 src/main_assistant.cpp:45
+msgid "Several components, htdig indexing"
 msgstr ""
 
-#: parts/grepview/grepdlg.cpp:210
-#, fuzzy
-msgid "Sea&rch"
-msgstr "Chwilio"
+#: src/main.cpp:48 src/main_assistant.cpp:46
+msgid "Help with Automake manager and persistent class store"
+msgstr ""
 
-#: parts/grepview/grepdlg.cpp:220
-msgid ""
-"<qt>Enter the regular expression you want to search for here."
-"<p>Possible meta characters are:"
-"<ul>"
-"<li><b>.</b> - Matches any character"
-"<li><b>^</b> - Matches the beginning of a line"
-"<li><b>$</b> - Matches the end of a line"
-"<li><b>\\&lt;</b> - Matches the beginning of a word"
-"<li><b>\\&gt;</b> - Matches the end of a word</ul>The following repetition "
-"operators exist:"
-"<ul>"
-"<li><b>?</b> - The preceding item is matched at most once"
-"<li><b>*</b> - The preceding item is matched zero or more times"
-"<li><b>+</b> - The preceding item is matched one or more times"
-"<li><b>{<i>n</i>}</b> - The preceding item is matched exactly <i>n</i> times"
-"<li><b>{<i>n</i>,}</b> - The preceding item is matched <i>n</i> or more times"
-"<li><b>{,<i>n</i>}</b> - The preceding item is matched at most <i>n</i> times"
-"<li><b>{<i>n</i>,<i>m</i>}</b> - The preceding item is matched at least <i>n</i>"
-", but at most <i>m</i> times.</ul>Furthermore, backreferences to bracketed "
-"subexpressions are available via the notation \\<i>n</i>.</qt>"
+#: src/main.cpp:50 src/main_assistant.cpp:47
+msgid "Ported to TQt 3, patches, valgrind, diff and perforce support"
 msgstr ""
 
-#: parts/grepview/grepdlg.cpp:244
+#: src/main.cpp:51 src/main_assistant.cpp:48
 msgid ""
-"Enter the file name pattern of the files to search here. You may give several "
-"patterns separated by commas"
+"TQEditor component, code completion, Abbrev component, C++ support, Java "
+"support"
 msgstr ""
 
-#: parts/grepview/grepdlg.cpp:247
-#, c-format
-msgid ""
-"You can choose a template for the pattern from the combo box and edit it here. "
-"The string %s in the template is replaced by the pattern input field, resulting "
-"in the regular expression to search for."
+#: src/main.cpp:52 src/main_assistant.cpp:49
+msgid "Help with KParts infrastructure"
 msgstr ""
 
-#: parts/grepview/grepdlg.cpp:317
-msgid "Please enter a search pattern"
+#: src/main.cpp:53 src/main_assistant.cpp:50
+msgid "Ada support"
 msgstr ""
 
-#: parts/doxygen/input.cpp:223 parts/doxygen/input.cpp:366
-msgid "Browse to a file"
+#: src/main.cpp:55 src/main_assistant.cpp:51
+#, fuzzy
+msgid "TQMake projectmanager"
+msgstr "Rheolydd Prosiect"
+
+#: src/main.cpp:56 src/main_assistant.cpp:52
+msgid "MDI modes, TQEditor, bugfixes"
 msgstr ""
 
-#: parts/doxygen/input.cpp:223 parts/doxygen/input.cpp:372
-msgid "Browse to a folder"
+#: src/main.cpp:57 src/main_assistant.cpp:53
+msgid "PartExplorer, redesign of CvsPart, patches, bugs(fixes)"
 msgstr ""
 
-#: parts/doxygen/input.cpp:341
-msgid "Add item"
-msgstr "Ychwanegu Eitem"
+#: src/main.cpp:58 src/main_assistant.cpp:54
+msgid ""
+"Replace, Bookmarks, FileList and CTags2 plugins. Overall improvements and "
+"patches"
+msgstr ""
 
-#: parts/doxygen/input.cpp:346
-msgid "Delete selected item"
+#: src/main.cpp:59 src/main_assistant.cpp:55
+msgid "Filecreate part and other bits and patches"
 msgstr ""
 
-#: parts/doxygen/input.cpp:351
-msgid "Update selected item"
+#: src/main.cpp:60 src/main_assistant.cpp:56
+msgid "ClearCase support"
 msgstr ""
 
-#: parts/doxygen/doxygenconfigwidget.cpp:258 parts/doxygen/doxygenpart.cpp:205
-msgid "Cannot write Doxyfile."
+#: src/main.cpp:61 src/main_assistant.cpp:57
+msgid "Ruby support"
 msgstr ""
 
-#: parts/doxygen/doxygenpart.cpp:61
-msgid "Build API Documentation"
+#: src/main.cpp:63 src/main_assistant.cpp:59
+msgid "Kate editor component"
 msgstr ""
 
-#: parts/doxygen/doxygenpart.cpp:64
-msgid "Build API documentation"
+#: src/main.cpp:64 src/main_assistant.cpp:60
+msgid "HTML documentation component"
 msgstr ""
 
-#: parts/doxygen/doxygenpart.cpp:65
-msgid ""
-"<b>Build API documentation</b>"
-"<p>Runs doxygen on a project Doxyfile to generate API documentation. If the "
-"search engine is enabled in Doxyfile, this also runs doxytag to create it."
+#: src/main.cpp:65 src/main_assistant.cpp:61
+msgid "Fortran documentation"
 msgstr ""
 
-#: parts/doxygen/doxygenpart.cpp:68
-msgid "Clean API Documentation"
+#: src/main.cpp:66 src/main_assistant.cpp:62
+msgid "Python documentation utility"
 msgstr ""
 
-#: parts/doxygen/doxygenpart.cpp:71
-msgid "Clean API documentation"
+#: src/main.cpp:67 src/main_assistant.cpp:63
+msgid "Doxygen wizard"
 msgstr ""
 
-#: parts/doxygen/doxygenpart.cpp:72
-msgid ""
-"<b>Clean API documentation</b>"
-"<p>Removes all generated by doxygen files."
+#: src/main.cpp:68 src/main.cpp:69 src/main_assistant.cpp:64
+#: src/main_assistant.cpp:65
+msgid "Fileselector component"
 msgstr ""
 
-#: parts/doxygen/doxygenpart.cpp:77
-msgid "Doxygen"
+#: src/main.cpp:70 src/main_assistant.cpp:66
+msgid "Designer code"
 msgstr ""
 
-#: parts/doxygen/doxygenpart.cpp:81
-msgid "Document Current Function"
+#: src/main.cpp:71 src/main_assistant.cpp:67
+msgid "C++ code completion, persistent class store"
 msgstr ""
 
-#: parts/doxygen/doxygenpart.cpp:82
-msgid "Create a documentation template above a function"
+#: src/main.cpp:72 src/main.cpp:73 src/main.cpp:76 src/main_assistant.cpp:68
+#: src/main_assistant.cpp:69 src/main_assistant.cpp:72
+msgid "Patches"
+msgstr "Ysbeidiau"
+
+#: src/main.cpp:74 src/main_assistant.cpp:70
+msgid "Help with Perl support"
 msgstr ""
 
-#: parts/doxygen/doxygenpart.cpp:83
+#: src/main.cpp:75 src/main_assistant.cpp:71
+msgid "Documentation index view"
+msgstr ""
+
+#: src/main.cpp:77 src/main_assistant.cpp:73
 msgid ""
-"<b>Document Current Function</b>"
-"<p>Creates a documentation template according to a function's signature above a "
-"function definition/declaration."
+"Documentation Finder,  qmake projectmanager patches, usability improvements, "
+"bugfixes ... "
 msgstr ""
 
-#: parts/doxygen/doxygenpart.cpp:87
-msgid "Preview Doxygen Output"
+#: src/main.cpp:78 src/main_assistant.cpp:74
+#, fuzzy
+msgid "TQMake project manager patches"
+msgstr "Dewisiadau'r Dudalen Gyntaf"
+
+#: src/main.cpp:79 src/main_assistant.cpp:75
+msgid "Cleanup and bugfixes for qEditor, AutoMake and much other stuff"
 msgstr ""
 
-#: parts/doxygen/doxygenpart.cpp:88
-msgid "Show a preview of the Doxygen output of this file"
+#: src/main.cpp:102 src/main_assistant.cpp:100
+msgid "Loading Settings"
 msgstr ""
 
-#: parts/doxygen/doxygenpart.cpp:89
+#: src/main.cpp:113 src/main_assistant.cpp:105
+msgid "Starting GUI"
+msgstr ""
+
+#: src/splashscreen.cpp:77
+#, c-format
+msgid "Version %1"
+msgstr "Fersiwn %1"
+
+#: src/generalinfowidget.cpp:58
+msgid "Use global editor settings"
+msgstr ""
+
+#: src/generalinfowidget.cpp:95
+#, fuzzy
+msgid "Could not open %1 for reading."
+msgstr "Methu canfod ein rhan."
+
+#: src/generalinfowidget.cpp:155
+#, fuzzy
+msgid "Could not open %1 for writing."
+msgstr "Methu canfod ein rhan."
+
+#: src/generalinfowidget.cpp:186
 msgid ""
-"<b>Preview Doxygen output</b>"
-"<p>Runs Doxygen over the current file and shows the created index.html."
+"Could not find configure.in.in, configure.in or configure.ac to update the "
+"project version."
 msgstr ""
 
-#: parts/doxygen/doxygenpart.cpp:370
-msgid "Another process is still running. Please wait until it's finished."
+#: src/generalinfowidget.cpp:215
+msgid "Please enter a path."
 msgstr ""
 
-#: parts/doxygen/doxygenpart.cpp:451
-msgid "Cannot create temporary file '%1'"
+#: src/generalinfowidget.cpp:220
+msgid "'%1' is not an absolute path."
 msgstr ""
 
-#: parts/doxygen/messages.cpp:30
-msgid "Project name"
-msgstr "Enw'r cywaith"
+#: src/generalinfowidget.cpp:226
+msgid "'%1' is not a relative path."
+msgstr ""
 
-#: parts/doxygen/messages.cpp:31
-msgid "Project version"
+#: src/generalinfowidget.cpp:234
+msgid "'%1' does not exist."
 msgstr ""
 
-#: parts/doxygen/messages.cpp:32
-msgid "Output path"
+#: src/generalinfowidget.cpp:238
+msgid "'%1' is not a directory."
 msgstr ""
 
-#: parts/doxygen/messages.cpp:33
-msgid "Distribute the generated docs in 10 subdirectories"
+#: src/generalinfowidget.cpp:264 src/generalinfowidget.cpp:267
+msgid "'%1' is a valid project directory."
 msgstr ""
 
-#: parts/doxygen/messages.cpp:34
-msgid "Output language"
+#: src/editorproxy.cpp:48
+msgid "Show Context Menu"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:35
-msgid "Use MS Windows(tm) font encoding"
+#: src/simplemainwindow.cpp:99
+msgid "TDevelop &Programming Handbook"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:36
-msgid "Include brief member descriptions"
+#: src/simplemainwindow.cpp:109
+msgid ""
+"Unable to find plugins, TDevelop will not work properly.\n"
+"Please make sure that TDevelop is installed in your TDE directory; otherwise, "
+"you have to add TDevelop's installation path to the environment variable "
+"TDEDIRS and run tdebuildsycoca. Restart TDevelop afterwards.\n"
+"Example for BASH users:\n"
+"export TDEDIRS=/path/to/tdevelop:$TDEDIRS && tdebuildsycoca"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:37
-msgid "Repeat brief member descriptions"
+#: src/simplemainwindow.cpp:116
+msgid "Could Not Find Plugins"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:38
-msgid "Strip words in brief description"
+#: src/simplemainwindow.cpp:422
+msgid "Raise &Editor"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:39
-msgid "Always include detailed section"
+#: src/simplemainwindow.cpp:424
+msgid "Raise editor"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:40
-msgid "Inline inherited members"
+#: src/simplemainwindow.cpp:425
+msgid "<b>Raise editor</b><p>Focuses the editor."
 msgstr ""
 
-#: parts/doxygen/messages.cpp:41
-msgid "Always use full path names"
+#: src/simplemainwindow.cpp:427
+#, fuzzy
+msgid "Lower All Docks"
+msgstr "Dociau &Offer"
+
+#: src/simplemainwindow.cpp:430
+msgid "Switch to next TabWidget"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:42
-msgid "Prefix to strip from path names"
+#: src/simplemainwindow.cpp:433 src/simplemainwindow.cpp:441
+msgid "Split &Horizontal"
+msgstr "Rhannu'n &Llorweddol"
+
+#: src/simplemainwindow.cpp:437 src/simplemainwindow.cpp:445
+msgid "Split &Vertical"
+msgstr "Rhannu'n &Fertigol"
+
+#: src/simplemainwindow.cpp:449
+#, fuzzy
+msgid "Split &Horizontal and Open"
+msgstr "Rhannu'n &Llorweddol"
+
+#: src/simplemainwindow.cpp:453
+#, fuzzy
+msgid "Split &Vertical and Open"
+msgstr "Rhannu'n &Fertigol"
+
+#: src/simplemainwindow.cpp:457
+msgid "Switch Left Dock"
+msgstr "Newid y Doc ar y Chwith"
+
+#: src/simplemainwindow.cpp:460
+msgid "Switch Right Dock"
+msgstr "Newid y Doc ar y Dde"
+
+#: src/simplemainwindow.cpp:463
+msgid "Switch Bottom Dock"
+msgstr "Newid y Doc wrth y Gwaelod"
+
+#: src/partcontroller.cpp:157 src/simplemainwindow.cpp:622
+msgid "Close All Others"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:43
-msgid "Strip from include path"
+#: src/simplemainwindow.cpp:632
+msgid "Duplicate"
+msgstr "Dyblyg"
+
+#: src/mainwindowshare.cpp:112
+msgid "&Stop"
+msgstr "&Aros"
+
+#: src/mainwindowshare.cpp:116
+msgid ""
+"<b>Stop</b>"
+"<p>Stops all running processes (like building process, grep command, etc.). "
+"When placed onto a toolbar provides a popup menu to choose a process to stop."
 msgstr ""
 
-#: parts/doxygen/messages.cpp:44
-msgid "Generate short file names"
+#: src/mainwindowshare.cpp:130
+msgid "Lets you switch the menubar on/off."
 msgstr ""
 
-#: parts/doxygen/messages.cpp:45
-msgid "Use JavaDoc-style brief descriptions"
+#: src/mainwindowshare.cpp:136
+msgid "Lets you configure shortcut keys."
+msgstr "Gadael i chi ffurfweddu bysellau byrlwybr."
+
+#: src/mainwindowshare.cpp:142
+msgid "Lets you configure toolbars."
+msgstr "Gadael i chi ffurfweddu bariau offer."
+
+#: src/mainwindowshare.cpp:148
+msgid "Lets you configure system notifications."
 msgstr ""
 
-#: parts/doxygen/messages.cpp:46
-msgid "Multiline cpp is brief"
+#: src/mainwindowshare.cpp:152 src/mainwindowshare.cpp:153
+#: src/mainwindowshare.cpp:298
+msgid "Configure TDevelop"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:47
-msgid "Details at top"
+#: src/mainwindowshare.cpp:153
+msgid "Lets you customize TDevelop."
 msgstr ""
 
-#: parts/doxygen/messages.cpp:48
-msgid "Inherit documentation"
+#: src/mainwindowshare.cpp:157
+msgid "Show statusbar"
+msgstr "Dangos bar cyflwr"
+
+#: src/mainwindowshare.cpp:158
+msgid "<b>Show statusbar</b><p>Hides or shows the statusbar."
 msgstr ""
 
-#: parts/doxygen/messages.cpp:49
-msgid "Produce a new page for each member"
+#: src/mainwindowshare.cpp:160
+msgid "&Next Window"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:50
-msgid "Tab size"
-msgstr "Maint tab"
+#: src/mainwindowshare.cpp:161
+msgid "Next window"
+msgstr ""
 
-#: parts/doxygen/messages.cpp:51
-msgid "Aliases"
-msgstr "Arallenwau"
+#: src/mainwindowshare.cpp:162
+msgid "<b>Next window</b><p>Switches to the next window."
+msgstr ""
 
-#: parts/doxygen/messages.cpp:52
-msgid "Optimize output for C"
+#: src/mainwindowshare.cpp:164
+msgid "&Previous Window"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:53
-msgid "Optimize output for Java"
+#: src/mainwindowshare.cpp:165
+msgid "Previous window"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:54
-msgid "Use built-in STL classes support"
+#: src/mainwindowshare.cpp:166
+msgid "<b>Previous window</b><p>Switches to the previous window."
 msgstr ""
 
-#: parts/doxygen/messages.cpp:55
-msgid "Use group documentation on undocumented members"
+#: src/mainwindowshare.cpp:168
+msgid "&Last Accessed Window"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:56
-msgid "Class members type subgrouping"
+#: src/mainwindowshare.cpp:169
+msgid "Last accessed window"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:62
-msgid "Extract undocumented entities"
+#: src/mainwindowshare.cpp:170
+msgid ""
+"<b>Last accessed window</b>"
+"<p>Switches to the last viewed window (Hold the Alt key pressed and walk on by "
+"repeating the Up key)."
 msgstr ""
 
-#: parts/doxygen/messages.cpp:63
-msgid "Extract private entities"
+#: src/mainwindowshare.cpp:172
+msgid "&First Accessed Window"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:64
-msgid "Extract static entities"
+#: src/mainwindowshare.cpp:173
+msgid "First accessed window"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:65
-msgid "Extract local classes"
+#: src/mainwindowshare.cpp:174
+msgid ""
+"<b>First accessed window</b>"
+"<p>Switches to the first accessed window (Hold the Alt key pressed and walk on "
+"by repeating the Down key)."
 msgstr ""
 
-#: parts/doxygen/messages.cpp:66
-msgid "Extract local methods"
+#: src/mainwindowshare.cpp:176
+#, fuzzy
+msgid "Configure Plugins..."
+msgstr "Gosodiadau Cywaith"
+
+#: src/mainwindowshare.cpp:178
+msgid "Configure &Editor..."
 msgstr ""
 
-#: parts/doxygen/messages.cpp:67
-msgid "Hide undocumented members"
+#: src/mainwindowshare.cpp:179
+msgid "Configure editor settings"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:68
-msgid "Hide undocumented classes"
+#: src/mainwindowshare.cpp:180
+msgid "<b>Configure editor</b><p>Opens editor configuration dialog."
 msgstr ""
 
-#: parts/doxygen/messages.cpp:69
-msgid "Hide friend compounds"
+#: src/mainwindowshare.cpp:442
+msgid "<b>Show menubar</b><p>Lets you switch the menubar on/off."
 msgstr ""
 
-#: parts/doxygen/messages.cpp:70
-msgid "Hide in body docs"
+#: src/partcontroller.cpp:130
+msgid "Open file"
+msgstr "Agor ffeil"
+
+#: src/partcontroller.cpp:131
+msgid ""
+"<b>Open file</b>"
+"<p>Opens an existing file without adding it to the project.</p>"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:71
-msgid "Document internal entities"
+#: src/partcontroller.cpp:134
+msgid "Opens recently opened file."
 msgstr ""
 
-#: parts/doxygen/messages.cpp:72
-msgid "Use case-sensitive file names"
+#: kdevdesigner/designer/kdevdesigner_part.cpp:98 src/partcontroller.cpp:137
+msgid "Save Al&l"
+msgstr "Cadw Po&peth"
+
+#: src/partcontroller.cpp:138
+msgid "Save all modified files"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:73
-msgid "Hide name scopes"
+#: src/partcontroller.cpp:139
+msgid "<b>Save all</b><p>Saves all modified files."
 msgstr ""
 
-#: parts/doxygen/messages.cpp:74
-msgid "Show included files"
+#: src/partcontroller.cpp:142
+msgid "Rever&t All"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:75
-msgid "Make inline functions"
+#: src/partcontroller.cpp:143
+msgid "Revert all changes"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:76
-msgid "Sort member documentation alphabetically"
+#: src/partcontroller.cpp:144
+msgid ""
+"<b>Revert all</b>"
+"<p>Reverts all changes in opened files. Prompts to save changes so the "
+"reversion can be canceled for each modified file."
 msgstr ""
 
-#: parts/doxygen/messages.cpp:77
-msgid "Sort the class list by fully-qualified names"
+#: src/partcontroller.cpp:148
+msgid "Close current file"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:78
-msgid "Sort brief documentation alphabetically"
+#: src/partcontroller.cpp:149
+msgid "Closes current file."
 msgstr ""
 
-#: parts/doxygen/messages.cpp:79
-msgid "Enable conditional sections"
+#: kdevdesigner/designer/mainwindowactions.cpp:919 src/partcontroller.cpp:152
+msgid "Close All"
+msgstr "Cau Popeth"
+
+#: src/partcontroller.cpp:153
+msgid "Close all files"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:80
-msgid "Generate TODO-list"
+#: src/partcontroller.cpp:154
+msgid "<b>Close all</b><p>Close all opened files."
 msgstr ""
 
-#: parts/doxygen/messages.cpp:81
-msgid "Generate Test-list"
+#: src/partcontroller.cpp:158
+msgid "Close other files"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:82
-msgid "Generate Bug-list"
+#: src/partcontroller.cpp:159
+msgid "<b>Close all others</b><p>Close all opened files except current."
 msgstr ""
 
-#: parts/doxygen/messages.cpp:83
-msgid "Generate Deprecated-list"
+#: src/partcontroller.cpp:167
+msgid "<b>Back</b><p>Moves backwards one step in the navigation history."
 msgstr ""
 
-#: parts/doxygen/messages.cpp:84
-msgid "Maximum lines shown for initializers"
+#: src/partcontroller.cpp:174
+msgid "<b>Forward</b><p>Moves forward one step in the navigation history."
 msgstr ""
 
-#: parts/doxygen/messages.cpp:85
-msgid "Show used files"
+#: src/partcontroller.cpp:178 src/partcontroller.cpp:180
+msgid "Goto Last Edit Position"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:86
-msgid "Show the directory hierarchy"
+#: src/partcontroller.cpp:181
+msgid ""
+"<b>Goto Last Edit Position</b>"
+"<p>Open the last edited file and position cursor at the point of edit"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:87
-msgid "Script to invoke to get the current version for each file"
+#: src/partcontroller.cpp:1008
+msgid ""
+"The file \"%1\" is modified in memory. Are you sure you want to reload it? "
+"(Local changes will be lost.)"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:93
-msgid "Suppress output"
+#: src/partcontroller.cpp:1009
+msgid "File is Modified"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:94
-msgid "Show warnings"
+#: buildtools/qmake/trollprojectwidget.cpp:2462 src/partcontroller.cpp:1009
+#: src/partcontroller.cpp:1502
+msgid "Do Not Reload"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:95
-msgid "Warn about undocumented entities"
+#: src/partcontroller.cpp:1123
+msgid ""
+"The file \"%1\" is modified on disk.\n"
+"\n"
+"Are you sure you want to overwrite it? (External changes will be lost.)"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:96
-msgid "Warn if error in documents"
+#: src/partcontroller.cpp:1124
+msgid "File Externally Modified"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:97
-msgid "Warn if function parameters are not documented"
+#: src/partcontroller.cpp:1124
+msgid "Do Not Overwrite"
+msgstr "Peidio â Throsysgrifo"
+
+#: src/partcontroller.cpp:1483
+msgid ""
+"Conflict: The file \"%1\" has changed on disk while being modified in memory.\n"
+"\n"
+"You should investigate before saving to make sure you are not losing data."
 msgstr ""
 
-#: parts/doxygen/messages.cpp:98
-msgid "Warnings format"
+#: src/partcontroller.cpp:1485
+msgid "Conflict"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:99
-msgid "Write warnings to"
+#: src/partcontroller.cpp:1492
+msgid ""
+"Warning: The file \"%1\" has been deleted on disk.\n"
+"\n"
+"If this was not your intention, make sure to save this file now."
 msgstr ""
 
-#: parts/doxygen/messages.cpp:104
-msgid "Input"
-msgstr "Mewnbwn"
+#: src/partcontroller.cpp:1494
+#, fuzzy
+msgid "File Deleted"
+msgstr "Dewisydd Ffeiliau"
 
-#: parts/doxygen/messages.cpp:105
-msgid "Input files and directories"
+#: src/partcontroller.cpp:1501
+msgid ""
+"The file \"%1\" has changed on disk.\n"
+"\n"
+"Do you want to reload it?"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:106
-msgid "Input patterns"
+#: src/partcontroller.cpp:1502
+msgid "File Changed"
+msgstr "Ffeil wedi Newid"
+
+#: src/partcontroller.cpp:1801 src/partcontroller.cpp:1822
+msgid "unnamed"
+msgstr "di-enw"
+
+#: src/languageselectwidget.cpp:65
+msgid "Additional Language Support"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:107
-msgid "Recurse into subdirectories"
+#: src/languageselectwidget.cpp:115
+msgid ""
+"Primary language is '%1'. Please select additional languages the project might "
+"contain."
 msgstr ""
 
-#: parts/doxygen/messages.cpp:108
-msgid "Exclude from input"
+#: src/main.cpp:26
+msgid "Files to load"
+msgstr "Ffeiliau i'w llwytho"
+
+#: src/main.cpp:32
+msgid "The TDevelop Integrated Development Environment"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:109
-msgid "Exclude symlinks"
+#: src/main.cpp:33
+#, fuzzy
+msgid "TDevelop"
+msgstr "Datblygwr"
+
+#: src/main.cpp:38
+msgid "Advanced C++ code completion, C++ support, overall improvements"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:110
-msgid "Exclude patterns"
+#: src/main.cpp:49
+msgid ""
+"Automake manager patches, Astyle plugin update, plugin patches and improvements"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:111
-msgid "Path to examples"
+#: src/main.cpp:54
+msgid "TQMake projectmanager, TQt4 Support"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:112
-msgid "Example patterns"
+#: src/main.cpp:80
+msgid "SnippetPart, debugger and usability patches"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:113
-msgid "Example recursive"
+#: src/main.cpp:81
+msgid "Artwork for the Ruby language"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:114
-msgid "Path to images"
+#: src/profileengine/editor/profileeditor.cpp:201
+#, fuzzy
+msgid "Core Plugins"
+msgstr "Gosodiadau Cywaith"
+
+#: src/profileengine/editor/profileeditor.cpp:203
+#, fuzzy
+msgid "Global Plugins"
+msgstr "Ategion"
+
+#: src/profileengine/editor/profileeditor.cpp:205
+#, fuzzy
+msgid "Project Plugins"
+msgstr "Gosodiadau Cywaith"
+
+#: src/profileengine/editor/profileeditor.cpp:254
+msgid "Remove selected profile and all its subprofiles?"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:115
-msgid "Input filter"
+#: src/profileengine/editor/profileeditor.cpp:267
+msgid ""
+"Cannot remove this profile because it is not a local (user-created) profile."
 msgstr ""
 
-#: parts/doxygen/messages.cpp:116
-msgid "Filter input files"
+#: src/profileengine/editor/profileeditor.cpp:329
+msgid "This plugin is already contained in the list of disabled plugins."
 msgstr ""
 
-#: parts/doxygen/messages.cpp:117
-msgid "Apply filters on file patterns"
+#: src/profileengine/editor/profileeditor.cpp:330
+#, fuzzy
+msgid "Enable Plugin"
+msgstr "Galluogi"
+
+#: src/profileengine/editor/profileeditor.cpp:375
+msgid "This plugin is already contained in the list of enabled plugins."
 msgstr ""
 
-#: parts/doxygen/messages.cpp:122
-msgid "Source Browser"
+#: src/profileengine/editor/profileeditor.cpp:376
+#, fuzzy
+msgid "Disable Plugin"
+msgstr "Analluogi"
+
+#: src/profileengine/editor/main.cpp:33
+msgid "TDevelop Profile Editor"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:123
-msgid "Cross-reference with source files"
+#: src/profileengine/editor/main.cpp:34
+msgid "(c) 2004, The KDevelop Developers"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:124
-msgid "References will link to source code"
+#: src/newui/ddockwindow.cpp:88
+#, fuzzy
+msgid "Move to left dock"
+msgstr "Symud i'r Chwith"
+
+#: src/newui/ddockwindow.cpp:89
+#, fuzzy
+msgid "Move to right dock"
+msgstr "Symud i'r Dde"
+
+#: src/newui/ddockwindow.cpp:90
+msgid "Move to bottom dock"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:125
-msgid "Use links to HTAGS"
+#: src/newui/button.cpp:58
+#, fuzzy
+msgid "Assign Accelerator..."
+msgstr "Gwirio Cyflymyddion"
+
+#: src/newui/button.cpp:60
+#, fuzzy
+msgid "Clear Accelerator"
+msgstr "Gwirio Cyflymyddion"
+
+#: src/newui/button.cpp:318
+msgid "Change Button Number"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:126
-msgid "Inline sources"
+#: src/newui/button.cpp:318
+msgid "New accelerator number:"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:127
-msgid "Hide special comment blocks"
+#: kdevdesigner/designer/mainwindowactions.cpp:797
+#: kdevdesigner/designer/mainwindowactions.cpp:798
+#: kdevdesigner/designer/newformimpl.cpp:364
+#: kdevdesigner/designer/startdialogimpl.cpp:67
+#: kdevdesigner/designer/workspace.cpp:159
+#, fuzzy
+msgid "<No Project>"
+msgstr "Cywaith Newydd"
+
+#: kdevdesigner/designer/workspace.cpp:598
+#, fuzzy
+msgid "&Open Source File"
+msgstr "Agor ffeil"
+
+#: kdevdesigner/designer/workspace.cpp:601
+msgid "&Remove Source File From Project"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:128
-msgid "Referenced by relation"
+#: kdevdesigner/designer/workspace.cpp:604
+#, fuzzy
+msgid "&Open Form"
+msgstr "Agor ffeil"
+
+#: kdevdesigner/designer/workspace.cpp:607
+#: kdevdesigner/designer/workspace.cpp:617
+msgid "&Remove Form From Project"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:129
-msgid "References relation"
+#: kdevdesigner/designer/workspace.cpp:610
+#, fuzzy
+msgid "&Open Form Source"
+msgstr "&Tarddiad"
+
+#: kdevdesigner/designer/workspace.cpp:614
+msgid "&Remove Source File From Form"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:130
-msgid "Include headers verbatim"
+#: kdevdesigner/designer/workspace.cpp:623
+#, fuzzy
+msgid "&Open Source"
+msgstr "&Tarddiad"
+
+#: kdevdesigner/designer/resource.cpp:1787
+msgid "Loading File"
+msgstr "Llwytho ffeil..."
+
+#: kdevdesigner/designer/resource.cpp:1788
+msgid ""
+"Error loading %1.\n"
+"The widget %2 could not be created."
 msgstr ""
 
-#: parts/documentation/docconfiglistview.cpp:31
-#: parts/documentation/documentation_widget.cpp:56
-#: parts/documentation/find_documentation_options.cpp:173
-#: parts/doxygen/messages.cpp:135
-msgid "Index"
-msgstr "Mynegai"
+#: kdevdesigner/designer/formfile.cpp:297
+#: kdevdesigner/designer/hierarchyview.cpp:1105
+#: kdevdesigner/designer/hierarchyview.cpp:1109
+#: kdevdesigner/designer/hierarchyview.cpp:1221
+#: kdevdesigner/designer/sourcefile.cpp:141
+#, c-format
+msgid "Edit %1"
+msgstr "Golygu %1"
 
-#: parts/doxygen/messages.cpp:136
-msgid "Generate alphabetical index"
+#: kdevdesigner/designer/sourcefile.cpp:222
+msgid "Save Code"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:137
-msgid "Columns in index"
+#: kdevdesigner/designer/mainwindow.cpp:2516
+#: kdevdesigner/designer/mainwindowactions.cpp:1128
+#: kdevdesigner/designer/sourcefile.cpp:223
+msgid "Save changes to '%1'?"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:138
-msgid "Prefix to ignore"
+#: kdevdesigner/designer/editfunctionsimpl.cpp:218
+#: kdevdesigner/designer/formfile.cpp:330
+#: kdevdesigner/designer/formfile.cpp:657
+#: kdevdesigner/designer/mainwindow.cpp:2517
+#: kdevdesigner/designer/mainwindow.cpp:2847
+#: kdevdesigner/designer/mainwindowactions.cpp:1129
+#: kdevdesigner/designer/sourcefile.cpp:224
+#: kdevdesigner/designer/sourcefile.cpp:269
+#: kdevdesigner/designer/variabledialogimpl.cpp:105
+msgid "&No"
+msgstr "&Nage"
+
+#: kdevdesigner/designer/formfile.cpp:654
+#: kdevdesigner/designer/sourcefile.cpp:266
+#, fuzzy
+msgid "TQt Designer"
+msgstr "Dylunydd Qt"
+
+#: kdevdesigner/designer/formfile.cpp:655
+#: kdevdesigner/designer/sourcefile.cpp:267
+msgid ""
+"File '%1' has been changed outside TQt Designer.\n"
+"Do you want to reload it?"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:143
-msgid "HTML"
-msgstr "HTML"
+#: kdevdesigner/designer/formfile.cpp:855
+#: kdevdesigner/designer/sourcefile.cpp:280
+#, fuzzy
+msgid "Invalid Filename"
+msgstr "Enw Ffeil"
 
-#: parts/doxygen/messages.cpp:144
-msgid "Generate HTML"
+#: kdevdesigner/designer/sourcefile.cpp:281
+msgid ""
+"The project already contains a source file with \n"
+"filename '%1'. Please choose a new filename."
 msgstr ""
 
-#: parts/doxygen/messages.cpp:145
-msgid "HTML output directory"
+#: kdevdesigner/designer/kdevdesigner_part.cpp:100
+#: kdevdesigner/designer/mainwindowactions.cpp:740
+msgid "Create &Template..."
 msgstr ""
 
-#: parts/doxygen/messages.cpp:146
-msgid "HTML file extension"
+#: kdevdesigner/designer/kdevdesigner_part.cpp:116
+#: kdevdesigner/designer/mainwindowactions.cpp:186
+msgid "Chec&k Accelerators"
+msgstr "G&wirio Cyflymyddion"
+
+#: kdevdesigner/designer/kdevdesigner_part.cpp:118
+#: kdevdesigner/designer/mainwindowactions.cpp:193
+msgid "S&lots..."
 msgstr ""
 
-#: parts/doxygen/messages.cpp:147
-msgid "Header file"
+#: kdevdesigner/designer/kdevdesigner_part.cpp:120
+#: kdevdesigner/designer/mainwindowactions.cpp:200
+msgid "Co&nnections..."
 msgstr ""
 
-#: parts/doxygen/messages.cpp:148
-msgid "Footer file"
+#: kdevdesigner/designer/kdevdesigner_part.cpp:122
+#: kdevdesigner/designer/mainwindowactions.cpp:214
+msgid "&Form Settings..."
 msgstr ""
 
-#: parts/doxygen/messages.cpp:149 parts/doxygen/messages.cpp:187
-msgid "Stylesheet"
+#: kdevdesigner/designer/kdevdesigner_part.cpp:125
+#: kdevdesigner/designer/mainwindowactions.cpp:808
+msgid "&Add File..."
+msgstr "&Ychwanegu Ffeil..."
+
+#: kdevdesigner/designer/kdevdesigner_part.cpp:127
+#: kdevdesigner/designer/mainwindowactions.cpp:819
+msgid "&Image Collection..."
 msgstr ""
 
-#: parts/doxygen/messages.cpp:150
-msgid "Align members"
+#: kdevdesigner/designer/kdevdesigner_part.cpp:129
+#: kdevdesigner/designer/mainwindowactions.cpp:829
+msgid "&Database Connections..."
 msgstr ""
 
-#: parts/doxygen/messages.cpp:151
-msgid "Generate HTML-help"
+#: kdevdesigner/designer/kdevdesigner_part.cpp:131
+msgid "&Designer Project Settings..."
 msgstr ""
 
-#: parts/doxygen/messages.cpp:152
-msgid "CHM file"
+#: kdevdesigner/designer/kdevdesigner_part.cpp:135
+#: kdevdesigner/designer/mainwindowactions.cpp:432
+msgid "&Pointer"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:153
-msgid "HHC location"
+#: kdevdesigner/designer/kdevdesigner_part.cpp:138
+#: kdevdesigner/designer/mainwindowactions.cpp:440
+msgid "&Connect Signal/Slots"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:154
-msgid "Generate .chi file"
+#: kdevdesigner/designer/kdevdesigner_part.cpp:140
+#: kdevdesigner/designer/mainwindowactions.cpp:448
+msgid "Tab &Order"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:155
-msgid "Generate binary TOC"
+#: kdevdesigner/designer/kdevdesigner_part.cpp:142
+#: kdevdesigner/designer/mainwindowactions.cpp:455
+msgid "Set &Buddy"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:156
-msgid "Expand TOC"
+#: kdevdesigner/designer/kdevdesigner_part.cpp:144
+#: kdevdesigner/designer/mainwindowactions.cpp:605
+msgid "Configure Toolbox..."
 msgstr ""
 
-#: parts/doxygen/messages.cpp:157
-msgid "Disable index"
+#: kdevdesigner/designer/kdevdesigner_part.cpp:145
+#: kdevdesigner/designer/mainwindowactions.cpp:490
+#, fuzzy
+msgid "Edit &Custom Widgets..."
+msgstr "Addasu..."
+
+#: kdevdesigner/designer/kdevdesigner_part.cpp:147
+#: kdevdesigner/designer/mainwindowactions.cpp:327
+msgid "Adjust &Size"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:158
-msgid "Number of enum values per line"
+#: kdevdesigner/designer/kdevdesigner_part.cpp:149
+#: kdevdesigner/designer/mainwindowactions.cpp:334
+msgid "Lay Out &Horizontally"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:159
-msgid "Generate treeview"
+#: kdevdesigner/designer/kdevdesigner_part.cpp:151
+#: kdevdesigner/designer/mainwindowactions.cpp:341
+msgid "Lay Out &Vertically"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:160
-msgid "Treeview width"
+#: kdevdesigner/designer/kdevdesigner_part.cpp:153
+msgid "Lay Out in &Grid"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:165
-msgid "LaTeX"
+#: kdevdesigner/designer/kdevdesigner_part.cpp:155
+#: kdevdesigner/designer/mainwindowactions.cpp:355
+#, fuzzy
+msgid "Lay OutQt::Horizontally (in S&plitter)"
+msgstr "Ehangu'n &Llorweddol"
+
+#: kdevdesigner/designer/kdevdesigner_part.cpp:157
+#: kdevdesigner/designer/mainwindowactions.cpp:362
+#, fuzzy
+msgid "Lay OutQt::Vertically (in Sp&litter)"
+msgstr "Ehangu'n &Fertigol"
+
+#: kdevdesigner/designer/formwindow.cpp:971
+#: kdevdesigner/designer/formwindow.cpp:1076
+#: kdevdesigner/designer/kdevdesigner_part.cpp:159
+#: kdevdesigner/designer/mainwindowactions.cpp:369
+msgid "&Break Layout"
+msgstr "&Torri'r Haenlun"
+
+#: kdevdesigner/designer/kdevdesigner_part.cpp:161
+msgid "Add Spacer"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:166
-msgid "Generate LaTeX"
+#: kdevdesigner/designer/kdevdesigner_part.cpp:164
+#: kdevdesigner/designer/mainwindowactions.cpp:857
+msgid "Preview &Form"
+msgstr "Rhagolyg&u Ffurflen"
+
+#: kdevdesigner/designer/kdevdesigner_part.cpp:166
+msgid "Ne&xt Form"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:167
-msgid "LaTeX output directory"
+#: kdevdesigner/designer/kdevdesigner_part.cpp:168
+msgid "Pre&vious Form"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:168
-msgid "LaTeX command name"
+#: kdevdesigner/designer/kdevdesigner_part.cpp:172
+msgid "Configure &KDevDesigner..."
 msgstr ""
 
-#: parts/doxygen/messages.cpp:169
-msgid "MakeIndex command name"
+#: kdevdesigner/designer/kdevdesigner_part.cpp:277
+msgid "KDevDesignerPart"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:170 parts/doxygen/messages.cpp:185
-msgid "Generate compact output"
+#: kdevdesigner/designer/hierarchyview.cpp:630
+#: kdevdesigner/designer/hierarchyview.cpp:637
+#: kdevdesigner/designer/mainwindow.cpp:1805
+#: kdevdesigner/designer/mainwindow.cpp:1824
+#: kdevdesigner/designer/mainwindow.cpp:1844
+#: kdevdesigner/designer/mainwindow.cpp:1884
+#: kdevdesigner/designer/mainwindow.cpp:1945
+#: kdevdesigner/designer/wizardeditorimpl.cpp:133
+#, c-format
+msgid "Add Page to %1"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:171
-msgid "Paper type"
-msgstr "Math papur"
+#: kdevdesigner/designer/hierarchyview.cpp:656
+#: kdevdesigner/designer/hierarchyview.cpp:667
+#: kdevdesigner/designer/mainwindow.cpp:1813
+#: kdevdesigner/designer/mainwindow.cpp:1832
+#: kdevdesigner/designer/mainwindow.cpp:1851
+#: kdevdesigner/designer/mainwindow.cpp:1894
+#: kdevdesigner/designer/mainwindow.cpp:1953
+#: kdevdesigner/designer/wizardeditorimpl.cpp:151
+msgid "Delete Page %1 of %2"
+msgstr ""
 
-#: parts/doxygen/messages.cpp:172
-msgid "Include extra packages"
+#: kdevdesigner/designer/hierarchyview.cpp:753
+#, fuzzy
+msgid "Class Variables"
+msgstr "Newidynnau"
+
+#: kdevdesigner/designer/hierarchyview.cpp:835
+msgid "Functions"
+msgstr "Ffwythiannau"
+
+#: kdevdesigner/designer/hierarchyview.cpp:846
+#: kdevdesigner/designer/mainwindowactions.cpp:192
+#, fuzzy
+msgid "Slots"
+msgstr "Agen"
+
+#: kdevdesigner/designer/hierarchyview.cpp:1052
+msgid "New..."
+msgstr "Newydd ..."
+
+#: kdevdesigner/designer/hierarchyview.cpp:1061
+#, fuzzy
+msgid "Goto Implementation"
+msgstr "Heb ei weithredoli."
+
+#: kdevdesigner/designer/editfunctionsimpl.cpp:150
+#: kdevdesigner/designer/hierarchyview.cpp:1144
+#, fuzzy
+msgid "Remove Function"
+msgstr "Gwaredu ffeil"
+
+#: kdevdesigner/designer/hierarchyview.cpp:1151
+#, fuzzy
+msgid "Remove Variable"
+msgstr "Gwaredu ffeil"
+
+#: kdevdesigner/designer/hierarchyview.cpp:1202
+msgid "This variable has already been declared."
 msgstr ""
 
-#: parts/doxygen/messages.cpp:173
-msgid "LaTeX Header file"
+#: kdevdesigner/designer/hierarchyview.cpp:1230
+msgid "Add Variable"
+msgstr "Ychwanegu Newidyn"
+
+#: kdevdesigner/designer/hierarchyview.cpp:1247
+msgid "Objects"
+msgstr "Gwrthrychau"
+
+#: kdevdesigner/designer/hierarchyview.cpp:1248
+msgid ""
+"List of all widgets and objects of the current form in hierarchical order"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:174
-msgid "Generate PDF hyperlinks"
+#: kdevdesigner/designer/hierarchyview.cpp:1249
+msgid "Members"
+msgstr "Aelodau"
+
+#: kdevdesigner/designer/hierarchyview.cpp:1250
+msgid "List of all members of the current form"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:175
-msgid "Use pdflatex"
+#: kdevdesigner/designer/hierarchyview.cpp:1269
+msgid "Class Declarations"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:176
-msgid "Use batch mode"
+#: kdevdesigner/designer/hierarchyview.cpp:1270
+msgid "List of all classes and its declarations of the current source file"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:177
-msgid "Do not include index chapters"
+#: kdevdesigner/designer/iconvieweditorimpl.cpp:132
+#: kdevdesigner/designer/listboxeditorimpl.cpp:164
+msgid "Edit the Items of '%1'"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:182
-msgid "RTF"
+#: kdevdesigner/designer/popupmenueditor.cpp:303
+msgid "new item"
+msgstr "eitem Newydd"
+
+#: kdevdesigner/designer/menubareditor.cpp:158
+#: kdevdesigner/designer/popupmenueditor.cpp:304
+msgid "new separator"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:183
-msgid "Generate RTF"
+#: kdevdesigner/designer/popupmenueditor.cpp:438
+msgid "Cut Item"
+msgstr "Torri'r Eitem"
+
+#: kdevdesigner/designer/popupmenueditor.cpp:466
+#, fuzzy
+msgid "Paste Item"
+msgstr "Dileu Eitem"
+
+#: kdevdesigner/designer/popupmenueditor.cpp:508
+msgid "Set Icon"
+msgstr "Gosod Eicon"
+
+#: kdevdesigner/designer/popupmenueditor.cpp:631
+msgid "Add Item"
+msgstr "Ychwanegu Eitem"
+
+#: kdevdesigner/designer/popupmenueditor.cpp:641
+msgid "Remove Item"
+msgstr "Gwaredu Eitem"
+
+#: kdevdesigner/designer/popupmenueditor.cpp:769
+#: kdevdesigner/designer/popupmenueditor.cpp:1428
+msgid "Rename Item"
+msgstr "Ailenwi Eitem"
+
+#: kdevdesigner/designer/popupmenueditor.cpp:1233
+#, fuzzy
+msgid "Drop Item"
+msgstr "Dileu Eitem"
+
+#: kdevdesigner/designer/popupmenueditor.cpp:1287
+#, fuzzy
+msgid "Remove Icon"
+msgstr "Gwaredu ffeil"
+
+#: kdevdesigner/designer/popupmenueditor.cpp:1308
+msgid "Move Item Up"
+msgstr "Symud Eitem i Fyny"
+
+#: kdevdesigner/designer/popupmenueditor.cpp:1332
+msgid "Move Item Down"
+msgstr "Symud Eitem i Lawr"
+
+#: kdevdesigner/designer/command.cpp:528 kdevdesigner/designer/command.cpp:540
+msgid "Set 'name' Property"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:184
-msgid "RTF output directory"
+#: kdevdesigner/designer/command.cpp:529
+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'."
 msgstr ""
 
-#: parts/doxygen/messages.cpp:186
-msgid "Generate hyperlinks"
+#: kdevdesigner/designer/command.cpp:541
+msgid ""
+"The name of a widget must not be null.\n"
+"The name has been reverted to '%1'."
 msgstr ""
 
-#: parts/doxygen/messages.cpp:188
-msgid "Extensions file"
+#: kdevdesigner/designer/menubareditor.cpp:157
+msgid "new menu"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:193
-msgid "Man"
+#: kdevdesigner/designer/menubareditor.cpp:190
+#: kdevdesigner/designer/menubareditor.cpp:194
+#: kdevdesigner/designer/menubareditor.cpp:1012
+msgid "Add Menu"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:194
-msgid "Generate man pages"
+#: kdevdesigner/designer/menubareditor.cpp:242
+msgid "separator"
+msgstr "gwahanydd"
+
+#: kdevdesigner/designer/menubareditor.cpp:381
+msgid "Cut Menu"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:195
-msgid "Man output directory"
+#: kdevdesigner/designer/menubareditor.cpp:404
+msgid "Paste Menu"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:196
-msgid "Man extension"
+#: kdevdesigner/designer/menubareditor.cpp:496
+#, fuzzy
+msgid "Delete Menu"
+msgstr " Dileu eitem"
+
+#: kdevdesigner/designer/menubareditor.cpp:1009
+msgid "Item Dragged"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:197
-msgid "Generate links"
+#: kdevdesigner/designer/menubareditor.cpp:1048
+msgid "Move Menu Left"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:203
-msgid "Generate XML"
+#: kdevdesigner/designer/menubareditor.cpp:1070
+msgid "Move Menu Right"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:204
-msgid "XML output directory"
+#: kdevdesigner/designer/menubareditor.cpp:1101
+#: kdevdesigner/designer/menubareditor.cpp:1106
+#, fuzzy
+msgid "Rename Menu"
+msgstr "Ai&l-enwi"
+
+#: kdevdesigner/designer/formwindow.cpp:840
+#: kdevdesigner/designer/formwindow.cpp:1329
+#: kdevdesigner/designer/formwindow.cpp:1341
+#: kdevdesigner/designer/sizehandle.cpp:216
+msgid "%1/%2"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:205
-msgid "XML schema"
+#: kdevdesigner/designer/sizehandle.cpp:235
+msgid "Resize"
+msgstr "Newid maint"
+
+#: kdevdesigner/designer/widgetfactory.cpp:277
+msgid "Move Tab Page"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:206
-msgid "XML DTD file"
+#: kdevdesigner/designer/widgetfactory.cpp:814
+msgid "Tab 1"
+msgstr "Tab 1"
+
+#: kdevdesigner/designer/widgetfactory.cpp:817
+msgid "Tab 2"
+msgstr "Tab 2"
+
+#: kdevdesigner/designer/widgetfactory.cpp:960
+#, fuzzy
+msgid "Page 1"
+msgstr "Targed: %1"
+
+#: kdevdesigner/designer/widgetfactory.cpp:963
+#, fuzzy
+msgid "Page 2"
+msgstr "Pecyn"
+
+#: kdevdesigner/designer/outputwindow.cpp:80
+msgid "Warnings/Errors"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:207
-msgid "Dump program listings to the XML output"
+#: kdevdesigner/designer/tableeditorimpl.cpp:346
+msgid "Edit the Rows and Columns of '%1' "
 msgstr ""
 
-#: parts/doxygen/messages.cpp:212
-msgid "DEF"
+#: kdevdesigner/designer/wizardeditorimpl.cpp:83
+msgid "Edit Wizard Pages"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:213
-msgid "Generate Autogen DEF"
+#: kdevdesigner/designer/wizardeditorimpl.cpp:172
+#: kdevdesigner/designer/wizardeditorimpl.cpp:192
+msgid "Swap Pages %1 and %2 of %3"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:219
-msgid "Generate Perl module"
+#: kdevdesigner/designer/mainwindow.cpp:1971
+#: kdevdesigner/designer/wizardeditorimpl.cpp:220
+msgid "Rename page %1 of %2"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:220
-msgid "Generate PDF and DVI using LaTeX"
+#: kdevdesigner/designer/wizardeditorimpl.cpp:251
+msgid "Move Page %1 to %2 in %3"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:221
-msgid "Make the Perl module output human readable"
+#: kdevdesigner/designer/propertyeditor.cpp:422
+msgid "Reset the property to its default value"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:222
-msgid "Perl module variable prefix in the makefiles"
+#: kdevdesigner/designer/propertyeditor.cpp:423
+msgid "Click this button to reset the property to its default value"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:227
-msgid "Preprocessor"
+#: kdevdesigner/designer/propertyeditor.cpp:1090
+#: kdevdesigner/designer/propertyeditor.cpp:1151
+msgid "False"
+msgstr "Ffug"
+
+#: kdevdesigner/designer/propertyeditor.cpp:1091
+#: kdevdesigner/designer/propertyeditor.cpp:1149
+msgid "True"
+msgstr "Gwir"
+
+#: kdevdesigner/designer/propertyeditor.cpp:1505
+#: kdevdesigner/designer/propertyeditor.cpp:1523
+#: kdevdesigner/designer/propertyeditor.cpp:1602
+#: kdevdesigner/designer/propertyeditor.cpp:1613
+#: lib/widgets/propeditor/propertymachinefactory.cpp:131
+#: lib/widgets/propeditor/propertymachinefactory.cpp:138
+msgid "x"
+msgstr "x"
+
+#: kdevdesigner/designer/propertyeditor.cpp:1507
+#: kdevdesigner/designer/propertyeditor.cpp:1528
+#: kdevdesigner/designer/propertyeditor.cpp:1604
+#: kdevdesigner/designer/propertyeditor.cpp:1615
+#: lib/widgets/propeditor/propertymachinefactory.cpp:132
+#: lib/widgets/propeditor/propertymachinefactory.cpp:139
+msgid "y"
+msgstr "y"
+
+#: kdevdesigner/designer/propertyeditor.cpp:1511
+#: kdevdesigner/designer/propertyeditor.cpp:1533
+#: kdevdesigner/designer/propertyeditor.cpp:1606
+#: kdevdesigner/designer/propertyeditor.cpp:1620
+msgid "width"
+msgstr "lled"
+
+#: kdevdesigner/designer/propertyeditor.cpp:1513
+#: kdevdesigner/designer/propertyeditor.cpp:1538
+#: kdevdesigner/designer/propertyeditor.cpp:1608
+#: kdevdesigner/designer/propertyeditor.cpp:1622
+msgid "height"
+msgstr "taldra"
+
+#: kdevdesigner/designer/propertyeditor.cpp:1757
+#: kdevdesigner/designer/propertyeditor.cpp:1770
+#: kdevdesigner/designer/propertyeditor.cpp:1820
+msgid "Red"
+msgstr "Coch"
+
+#: kdevdesigner/designer/propertyeditor.cpp:1759
+#: kdevdesigner/designer/propertyeditor.cpp:1772
+#: kdevdesigner/designer/propertyeditor.cpp:1822
+msgid "Green"
+msgstr "Gwyrdd"
+
+#: kdevdesigner/designer/propertyeditor.cpp:1761
+#: kdevdesigner/designer/propertyeditor.cpp:1774
+#: kdevdesigner/designer/propertyeditor.cpp:1824
+msgid "Blue"
+msgstr "Glas"
+
+#: kdevdesigner/designer/propertyeditor.cpp:1879
+#: kdevdesigner/designer/propertyeditor.cpp:1898
+#: kdevdesigner/designer/propertyeditor.cpp:1963
+msgid "Family"
+msgstr "Teulu"
+
+#: kdevdesigner/designer/propertyeditor.cpp:1881
+#: kdevdesigner/designer/propertyeditor.cpp:1901
+#: kdevdesigner/designer/propertyeditor.cpp:1965
+msgid "Point Size"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:228
-msgid "Enable preprocessing"
+#: kdevdesigner/designer/multilineeditorimpl.cpp:109
+#: kdevdesigner/designer/propertyeditor.cpp:1883
+#: kdevdesigner/designer/propertyeditor.cpp:1903
+#: kdevdesigner/designer/propertyeditor.cpp:1967
+msgid "Bold"
+msgstr "Trwm"
+
+#: kdevdesigner/designer/multilineeditorimpl.cpp:115
+#: kdevdesigner/designer/propertyeditor.cpp:1887
+#: kdevdesigner/designer/propertyeditor.cpp:1907
+#: kdevdesigner/designer/propertyeditor.cpp:1971
+msgid "Underline"
+msgstr "Tanlinellu"
+
+#: kdevdesigner/designer/propertyeditor.cpp:1889
+#: kdevdesigner/designer/propertyeditor.cpp:1909
+#: kdevdesigner/designer/propertyeditor.cpp:1973
+msgid "Strikeout"
+msgstr "Trwylinellu"
+
+#: kdevdesigner/designer/propertyeditor.cpp:2006
+#: kdevdesigner/designer/propertyeditor.cpp:2040
+msgid "Table"
+msgstr "Tabl"
+
+#: kdevdesigner/designer/propertyeditor.cpp:2009
+#: kdevdesigner/designer/propertyeditor.cpp:2063
+msgid "Field"
+msgstr "Maes"
+
+#: kdevdesigner/designer/propertyeditor.cpp:2171
+#: kdevdesigner/designer/propertyeditor.cpp:2189
+#: kdevdesigner/designer/propertyeditor.cpp:2239
+#: lib/widgets/propeditor/propertymachinefactory.cpp:156
+msgid "hSizeType"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:229
-msgid "Expand macros"
+#: kdevdesigner/designer/propertyeditor.cpp:2174
+#: kdevdesigner/designer/propertyeditor.cpp:2191
+#: kdevdesigner/designer/propertyeditor.cpp:2241
+#: lib/widgets/propeditor/propertymachinefactory.cpp:157
+msgid "vSizeType"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:230
-msgid "Expand only predefined macros"
+#: kdevdesigner/designer/propertyeditor.cpp:2177
+#: kdevdesigner/designer/propertyeditor.cpp:2193
+#: kdevdesigner/designer/propertyeditor.cpp:2243
+#, fuzzy
+msgid "horizontalStretch"
+msgstr "hStretch"
+
+#: kdevdesigner/designer/propertyeditor.cpp:2179
+#: kdevdesigner/designer/propertyeditor.cpp:2195
+#: kdevdesigner/designer/propertyeditor.cpp:2245
+#, fuzzy
+msgid "verticalStretch"
+msgstr "vStretch"
+
+#: kdevdesigner/designer/propertyeditor.cpp:2226
+msgid "%1/%2/%3/%4"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:231
-msgid "Search for includes"
+#: kdevdesigner/designer/propertyeditor.cpp:2380
+#: lib/widgets/propeditor/propertymachinefactory.cpp:165
+msgid "Arrow"
+msgstr "Saeth"
+
+#: kdevdesigner/designer/propertyeditor.cpp:2381
+#, fuzzy
+msgid "Up-Arrow"
+msgstr "Saeth i Fyny"
+
+#: kdevdesigner/designer/propertyeditor.cpp:2382
+#: lib/widgets/propeditor/propertymachinefactory.cpp:167
+msgid "Cross"
+msgstr "Croes"
+
+#: kdevdesigner/designer/propertyeditor.cpp:2383
+#: lib/widgets/propeditor/propertymachinefactory.cpp:168
+msgid "Waiting"
+msgstr "Aros"
+
+#: kdevdesigner/designer/propertyeditor.cpp:2384
+#: lib/widgets/propeditor/propertymachinefactory.cpp:169
+msgid "iBeam"
+msgstr "iTrawst"
+
+#: kdevdesigner/designer/propertyeditor.cpp:2385
+#: lib/widgets/propeditor/propertymachinefactory.cpp:170
+#, fuzzy
+msgid "SizeQt::Vertical"
+msgstr "Maint Fertigol"
+
+#: kdevdesigner/designer/propertyeditor.cpp:2386
+#: lib/widgets/propeditor/propertymachinefactory.cpp:171
+#, fuzzy
+msgid "SizeQt::Horizontal"
+msgstr "Maint Llorweddol"
+
+#: kdevdesigner/designer/propertyeditor.cpp:2387
+#: lib/widgets/propeditor/propertymachinefactory.cpp:172
+msgid "Size Slash"
+msgstr "Maint Slaes"
+
+#: kdevdesigner/designer/propertyeditor.cpp:2388
+#: lib/widgets/propeditor/propertymachinefactory.cpp:173
+msgid "Size Backslash"
+msgstr "Maint Slaes Ôl"
+
+#: kdevdesigner/designer/propertyeditor.cpp:2389
+#: lib/widgets/propeditor/propertymachinefactory.cpp:174
+msgid "Size All"
+msgstr "Maint Popeth"
+
+#: kdevdesigner/designer/propertyeditor.cpp:2392
+#: lib/widgets/propeditor/propertymachinefactory.cpp:175
+msgid "Blank"
+msgstr "Gwag"
+
+#: kdevdesigner/designer/propertyeditor.cpp:2393
+#: lib/widgets/propeditor/propertymachinefactory.cpp:176
+#, fuzzy
+msgid "SplitQt::Vertical"
+msgstr "Hollti'n Fertigol"
+
+#: kdevdesigner/designer/propertyeditor.cpp:2394
+#: lib/widgets/propeditor/propertymachinefactory.cpp:177
+#, fuzzy
+msgid "SplitQt::Horizontal"
+msgstr "Hollti'n Lorweddol"
+
+#: kdevdesigner/designer/propertyeditor.cpp:2395
+#: lib/widgets/propeditor/propertymachinefactory.cpp:178
+msgid "Pointing Hand"
+msgstr "Llaw sy'n Pwyntio"
+
+#: kdevdesigner/designer/propertyeditor.cpp:2396
+#: lib/widgets/propeditor/propertymachinefactory.cpp:179
+msgid "Forbidden"
+msgstr "Gwaharddir"
+
+#: kdevdesigner/designer/propertyeditor.cpp:3489
+#: kdevdesigner/designer/propertyeditor.cpp:3503
+msgid "Set '%1' of '%2'"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:232
-msgid "Include path"
+#: kdevdesigner/designer/propertyeditor.cpp:3631
+msgid "Sort &Categorized"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:233
-msgid "Include file patterns"
+#: kdevdesigner/designer/propertyeditor.cpp:3632
+msgid "Sort &Alphabetically"
+msgstr "Trefn&u yn ôl yr wyddor"
+
+#: kdevdesigner/designer/propertyeditor.cpp:3772
+msgid "Reset '%1' of '%2'"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:234
-msgid "Predefined macros"
+#: kdevdesigner/designer/propertyeditor.cpp:3879
+msgid ""
+"<p><b>TQWidget::%1</b></p>"
+"<p>There is no documentation available for this property.</p>"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:235
-msgid "Expand as defined"
+#: kdevdesigner/designer/propertyeditor.cpp:4031
+msgid "New Signal Handler"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:236
-msgid "Skip function macros"
+#: kdevdesigner/designer/propertyeditor.cpp:4032
+msgid "Delete Signal Handler"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:241
-msgid "External"
-msgstr "Allanol"
+#: kdevdesigner/designer/propertyeditor.cpp:4053
+msgid "Remove Connection"
+msgstr "Gwaredu Cysylltiad"
 
-#: parts/doxygen/messages.cpp:242
-msgid "Tagfiles"
+#: kdevdesigner/designer/mainwindow.cpp:2600
+#: kdevdesigner/designer/propertyeditor.cpp:4086
+#, fuzzy
+msgid "Add Connection"
+msgstr "Cysylltiad"
+
+#: kdevdesigner/designer/editfunctionsimpl.cpp:195
+#: kdevdesigner/designer/propertyeditor.cpp:4104
+#, fuzzy
+msgid "Add Function"
+msgstr "Ffwythiant"
+
+#: kdevdesigner/designer/propertyeditor.cpp:4145
+#: kdevdesigner/designer/propertyeditor.cpp:4184
+#: kdevdesigner/designer/propertyeditor.cpp:4310
+#, fuzzy
+msgid "Property Editor"
+msgstr "Priodwedd"
+
+#: kdevdesigner/designer/propertyeditor.cpp:4149
+msgid "P&roperties"
+msgstr "P&riodweddau"
+
+#: kdevdesigner/designer/propertyeditor.cpp:4151
+msgid "Signa&l Handlers"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:243
-msgid "Generate tagfile"
+#: kdevdesigner/designer/propertyeditor.cpp:4193
+msgid "Property Editor (%1)"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:244
-msgid "List all externals"
+#: kdevdesigner/designer/mainwindow.cpp:3710
+#: kdevdesigner/designer/propertyeditor.cpp:4319
+msgid "Signal Handlers"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:245
-msgid "External groups"
+#: kdevdesigner/designer/actioneditorimpl.cpp:57
+#: kdevdesigner/designer/actionlistview.cpp:90
+msgid "New &Action"
+msgstr "Gwei&thred Newydd"
+
+#: kdevdesigner/designer/actioneditorimpl.cpp:58
+#: kdevdesigner/designer/actionlistview.cpp:91
+msgid "New Action &Group"
+msgstr "Grŵp Newydd o Weithredoedd"
+
+#: kdevdesigner/designer/actioneditorimpl.cpp:59
+#: kdevdesigner/designer/actionlistview.cpp:92
+msgid "New &Dropdown Action Group"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:246
-msgid "Path to Perl"
+#: kdevdesigner/designer/actionlistview.cpp:95
+#, fuzzy
+msgid "&Connect Action..."
+msgstr "Cysylltiad"
+
+#: kdevdesigner/designer/actionlistview.cpp:97
+msgid "Delete Action"
+msgstr "Dileu Gweithred"
+
+#: kdevdesigner/designer/multilineeditorimpl.cpp:99
+msgid "&Styles"
+msgstr "&Arddulliau"
+
+#: kdevdesigner/designer/multilineeditorimpl.cpp:121
+msgid "Typewriter"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:251
-msgid "Dot"
+#: kdevdesigner/designer/multilineeditorimpl.cpp:134
+#, fuzzy
+msgid "Break"
+msgstr "&Yn ôl"
+
+#: kdevdesigner/designer/multilineeditorimpl.cpp:139
+msgid "Paragraph"
+msgstr "Paragraff"
+
+#: kdevdesigner/designer/multilineeditorimpl.cpp:147
+msgid "Align left"
+msgstr "Alinio Chwith"
+
+#: kdevdesigner/designer/multilineeditorimpl.cpp:153
+msgid "Align center"
+msgstr "Alinio i'r Canol"
+
+#: kdevdesigner/designer/multilineeditorimpl.cpp:159
+msgid "Align right"
+msgstr "Alinio Dde"
+
+#: kdevdesigner/designer/multilineeditorimpl.cpp:165
+msgid "Blockquote"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:252
-msgid "Generate class diagrams"
+#: kdevdesigner/designer/multilineeditorimpl.cpp:173
+msgid "&Font"
+msgstr "&Wynebfath"
+
+#: kdevdesigner/designer/multilineeditorimpl.cpp:185
+msgid "Fontsize +1"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:253
-msgid "Hide undocumented relations"
+#: kdevdesigner/designer/multilineeditorimpl.cpp:190
+msgid "Fontsize -1"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:254
-msgid "Use dot"
+#: kdevdesigner/designer/multilineeditorimpl.cpp:195
+#, fuzzy
+msgid "Headline 1"
+msgstr "Pennawd"
+
+#: kdevdesigner/designer/multilineeditorimpl.cpp:200
+#, fuzzy
+msgid "Headline 2"
+msgstr "Pennawd"
+
+#: kdevdesigner/designer/multilineeditorimpl.cpp:205
+#, fuzzy
+msgid "Headline 3"
+msgstr "Pennawd"
+
+#: kdevdesigner/designer/multilineeditorimpl.cpp:211
+msgid "O&ptions"
+msgstr "De&wisiadau"
+
+#: kdevdesigner/designer/multilineeditorimpl.cpp:217
+msgid "Word Wrapping"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:255
-msgid "Generate a caller dependency graph"
+#: kdevdesigner/designer/multilineeditorimpl.cpp:279
+msgid "Set the Text of '%1'"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:256
-msgid "Generate class graphs"
+#: kdevdesigner/designer/multilineeditorimpl.cpp:285
+msgid "Set 'wordWrap' of '%2'"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:257
-msgid "Generate collaboration graphs"
+#: kdevdesigner/designer/mainwindow.cpp:155
+#: kdevdesigner/designer/startdialogimpl.cpp:170
+msgid "TQt User-Interface Files (*.ui)"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:258
-msgid "Generate a graph showing the direct groups dependencies"
+#: kdevdesigner/designer/mainwindow.cpp:205
+msgid ""
+"Ready - This is the non-commercial version of TQt - For commercial evaluations, "
+"use the help menu to register with Trolltech."
 msgstr ""
 
-#: parts/doxygen/messages.cpp:259
-msgid "Generate UML looking inheritance and colloboration diagrams"
+#: kdevdesigner/designer/mainwindow.cpp:224
+#: kdevdesigner/designer/mainwindowactions.cpp:376
+msgid "Layout"
+msgstr "Cynllun"
+
+#: kdevdesigner/designer/mainwindow.cpp:361
+#: kdevdesigner/designer/mainwindow.cpp:3747
+msgid "Property Editor/Signal Handlers"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:260
-msgid "Show relations between templates and their instances"
+#: kdevdesigner/designer/mainwindow.cpp:363
+msgid ""
+"<b>The Property Editor</b>"
+"<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 ""
 
-#: parts/doxygen/messages.cpp:261
-msgid "Generate include graphs"
+#: kdevdesigner/designer/mainwindow.cpp:390
+#, fuzzy
+msgid "Output Window"
+msgstr "Ffenestr"
+
+#: kdevdesigner/designer/mainwindow.cpp:404
+#, fuzzy
+msgid "Object Explorer"
+msgstr "Agor Ffeil"
+
+#: kdevdesigner/designer/mainwindow.cpp:407
+msgid ""
+"<b>The Object Explorer</b>"
+"<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 ""
 
-#: parts/doxygen/messages.cpp:262
-msgid "Generate included-by graphs"
+#: kdevdesigner/designer/mainwindow.cpp:424
+msgid "Start typing the buffer you want to switch to here (ALT+B)"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:263
+#: kdevdesigner/designer/mainwindow.cpp:433
+#, fuzzy
+msgid "Project Overview"
+msgstr "&Ffeil y cywaith:"
+
+#: kdevdesigner/designer/mainwindow.cpp:434
 msgid ""
-"Generate a call dependency graph for every global function or class method"
+"<b>The Project Overview Window</b>"
+"<p>The Project Overview Window displays all the current project, including "
+"forms and source files.</p>"
+"<p>Use the search field to rapidly switch between files.</p>"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:264
-msgid "Generate graphical hierarchy"
+#: kdevdesigner/designer/mainwindow.cpp:451
+#, fuzzy
+msgid "Action Editor"
+msgstr "Gweithred"
+
+#: kdevdesigner/designer/mainwindow.cpp:452
+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 besides their names in "
+"menus.</p>"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:265
-msgid "Show the dependencies a directory has on other directories"
+#: kdevdesigner/designer/mainwindow.cpp:472
+msgid "Toolbox"
+msgstr "Blwch offer"
+
+#: kdevdesigner/designer/mainwindow.cpp:1281
+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 in 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 ""
 
-#: parts/doxygen/messages.cpp:266
-msgid "Dot image format"
+#: kdevdesigner/designer/mainwindow.cpp:1336
+msgid "Cannot create an invalid project."
 msgstr ""
 
-#: parts/doxygen/messages.cpp:267
-msgid "Path to dot"
+#: kdevdesigner/designer/mainwindow.cpp:1487
+#, c-format
+msgid "&Undo: %1"
+msgstr "&Dadwneud: %1"
+
+#: kdevdesigner/designer/mainwindow.cpp:1489
+#: kdevdesigner/designer/mainwindowactions.cpp:127
+#, fuzzy
+msgid "&Undo: Not Available"
+msgstr "&Ar gael:"
+
+#: kdevdesigner/designer/mainwindow.cpp:1491
+#, c-format
+msgid "&Redo: %1"
+msgstr "&Ail-wneud: %1"
+
+#: kdevdesigner/designer/mainwindow.cpp:1493
+#: kdevdesigner/designer/mainwindowactions.cpp:133
+#, fuzzy
+msgid "&Redo: Not Available"
+msgstr "&Ar gael:"
+
+#: kdevdesigner/designer/mainwindow.cpp:1580
+msgid "Choose Pixmap..."
 msgstr ""
 
-#: parts/doxygen/messages.cpp:268
-msgid "Directories with extra dot files"
+#: kdevdesigner/designer/mainwindow.cpp:1584
+#, fuzzy
+msgid "Edit Text..."
+msgstr "Golygu..."
+
+#: kdevdesigner/designer/mainwindow.cpp:1588
+#, fuzzy
+msgid "Edit Title..."
+msgstr "Golygu..."
+
+#: kdevdesigner/designer/mainwindow.cpp:1592
+#: kdevdesigner/designer/mainwindow.cpp:1702
+msgid "Edit Page Title..."
 msgstr ""
 
-#: parts/doxygen/messages.cpp:269
-msgid "Maximum graph width"
+#: kdevdesigner/designer/mainwindow.cpp:1623
+#: kdevdesigner/designer/mainwindow.cpp:1637
+#: kdevdesigner/designer/mainwindow.cpp:1646
+#: kdevdesigner/designer/mainwindow.cpp:1661
+#: kdevdesigner/designer/mainwindow.cpp:1695
+#: kdevdesigner/designer/mainwindow.cpp:2469
+msgid "Delete Page"
+msgstr "Dileu Tudalen"
+
+#: kdevdesigner/designer/mainwindow.cpp:1626
+#: kdevdesigner/designer/mainwindow.cpp:1640
+#: kdevdesigner/designer/mainwindow.cpp:1649
+#: kdevdesigner/designer/mainwindow.cpp:1664
+#: kdevdesigner/designer/mainwindow.cpp:1699
+#: kdevdesigner/designer/mainwindow.cpp:2468
+#, fuzzy
+msgid "Add Page"
+msgstr "Ail Dudalen"
+
+#: kdevdesigner/designer/mainwindow.cpp:1632
+msgid "Previous Page"
+msgstr "Tudalen Flaenorol"
+
+#: kdevdesigner/designer/mainwindow.cpp:1634
+msgid "Next Page"
+msgstr "Tudalen Nesaf"
+
+#: kdevdesigner/designer/mainwindow.cpp:1667
+msgid "Rename Current Page..."
 msgstr ""
 
-#: parts/doxygen/messages.cpp:270
-msgid "Maximum graph height"
+#: kdevdesigner/designer/mainwindow.cpp:1705
+#, fuzzy
+msgid "Edit Pages..."
+msgstr "Golygu..."
+
+#: kdevdesigner/designer/mainwindow.cpp:1711
+#, fuzzy
+msgid "Add Menu Item"
+msgstr "Ychwanegu Eitem ..."
+
+#: kdevdesigner/designer/mainwindow.cpp:1713
+#, fuzzy
+msgid "Add Toolbar"
+msgstr "Bar offer"
+
+#: kdevdesigner/designer/mainwindow.cpp:1735
+#: kdevdesigner/designer/mainwindow.cpp:2638
+msgid "New text"
+msgstr "Testun Newydd"
+
+#: kdevdesigner/designer/mainwindow.cpp:1740
+#: kdevdesigner/designer/mainwindow.cpp:2643
+msgid "Set 'wordwrap' of '%1'"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:271
-msgid "Maximum graph depth"
+#: kdevdesigner/designer/mainwindow.cpp:1749
+#: kdevdesigner/designer/mainwindow.cpp:2652
+msgid "Set the 'text' of '%1'"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:272
-msgid "Generate images with a transparent background"
+#: kdevdesigner/designer/mainwindow.cpp:1759
+#: kdevdesigner/designer/mainwindow.cpp:2665
+msgid "New title"
+msgstr "Teitl newydd"
+
+#: kdevdesigner/designer/mainwindow.cpp:1762
+#: kdevdesigner/designer/mainwindow.cpp:2667
+msgid "Set the 'title' of '%2'"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:273
-msgid "Generate multiple output files in one run"
+#: kdevdesigner/designer/mainwindow.cpp:1772
+#: kdevdesigner/designer/mainwindow.cpp:1909
+#: kdevdesigner/designer/mainwindow.cpp:1968
+#, fuzzy
+msgid "Page Title"
+msgstr "Teitl"
+
+#: kdevdesigner/designer/mainwindow.cpp:1772
+#: kdevdesigner/designer/mainwindow.cpp:1909
+#: kdevdesigner/designer/mainwindow.cpp:1968
+msgid "New page title"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:274
-msgid "Generate legend"
+#: kdevdesigner/designer/mainwindow.cpp:1775
+msgid "Set the 'pageTitle' of '%2'"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:275
-msgid "Remove intermediate files"
+#: kdevdesigner/designer/mainwindow.cpp:1788
+msgid "Set the 'pixmap' of '%2'"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:281
-msgid "Search engine"
-msgstr "Peiriant Chwilio"
+#: kdevdesigner/designer/mainwindow.cpp:1859
+msgid "Raise next page of '%2'"
+msgstr ""
 
-#: parts/doxygen/messages.cpp:282
-msgid "CGI name"
+#: kdevdesigner/designer/mainwindow.cpp:1869
+msgid "Raise previous page of '%2'"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:283
-msgid "CGI URL"
+#: kdevdesigner/designer/mainwindow.cpp:1916
+msgid "Rename Page %1 to %2"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:284
-msgid "Documentation URL"
+#: kdevdesigner/designer/mainwindow.cpp:1983
+msgid "Add Toolbar to '%1'"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:285
-msgid "Absolute path to documentation"
+#: kdevdesigner/designer/mainwindow.cpp:1989
+msgid "Add Menu to '%1'"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:286
-msgid "Absolute path to doxysearch binary"
+#: kdevdesigner/designer/mainwindow.cpp:2515
+#: kdevdesigner/designer/mainwindowactions.cpp:1127
+#, fuzzy
+msgid "Save Project Settings"
+msgstr "Gosodiadau Cywaith"
+
+#: kdevdesigner/designer/mainwindow.cpp:2613
+msgid "Edit %1..."
+msgstr "Golygu %1 ..."
+
+#: kdevdesigner/designer/mainwindow.cpp:2709
+msgid "Insert a %1 (custom widget)"
 msgstr ""
 
-#: parts/doxygen/messages.cpp:287
-msgid "Paths to external documentation"
+#: kdevdesigner/designer/mainwindow.cpp:2710
+msgid ""
+"<b>%1 (custom widget)</b>"
+"<p>Click <b>Edit Custom Widgets...</b> in the <b>Tools|Custom</b> "
+"menu to add and change custom widgets. You can add properties as well as "
+"signals and slots to integrate them into TQt Designer, and provide a pixmap "
+"which will be used to represent the widget on the form.</p>"
 msgstr ""
 
-#: parts/konsole/konsoleviewpart.cpp:38
+#: kdevdesigner/designer/mainwindow.cpp:2844
+#, fuzzy
+msgid "Restoring Last Session"
+msgstr "Adfer lleolia&dau:"
+
+#: kdevdesigner/designer/mainwindow.cpp:2845
 msgid ""
-"<b>Konsole</b>"
-"<p>This window contains an embedded konsole window. It will try to follow you "
-"when you navigate in the source directories"
+"TQt Designer found some temporary saved files, which were\n"
+"written when TQt Designer crashed last time. Do you want to\n"
+"load these files?"
 msgstr ""
 
-#: parts/konsole/konsoleviewpart.cpp:44 parts/konsole/konsoleviewpart.cpp:49
-msgid "Konsole"
-msgstr "Konsole"
+#: kdevdesigner/designer/mainwindow.cpp:2909
+msgid "There is no help available for this dialog at the moment."
+msgstr ""
 
-#: parts/konsole/konsoleviewpart.cpp:49
-msgid "Embedded console window"
+#: kdevdesigner/designer/mainwindow.cpp:2968
+#: kdevdesigner/designer/mainwindowactions.cpp:1762
+#: kdevdesigner/designer/mainwindowactions.cpp:1785
+#, fuzzy
+msgid "Edit Source"
+msgstr "Golygydd"
+
+#: kdevdesigner/designer/mainwindow.cpp:2969
+#: kdevdesigner/designer/mainwindowactions.cpp:1763
+#: kdevdesigner/designer/mainwindowactions.cpp:1786
+msgid ""
+"There is no plugin for editing %1 code installed.\n"
+"Note: Plugins are not available in static TQt configurations."
 msgstr ""
 
-#: parts/distpart/distpart_widget.cpp:134
-msgid "Building Package"
+#: kdevdesigner/designer/mainwindow.cpp:3069
+msgid "Open File"
+msgstr "Agor Ffeil"
+
+#: kdevdesigner/designer/mainwindow.cpp:3070
+#: kdevdesigner/designer/mainwindow.cpp:3086
+msgid "Could not open '%1'. File does not exist."
 msgstr ""
 
-#: parts/distpart/distpart_widget.cpp:145
-#, fuzzy, c-format
-msgid "Adding file: %1"
-msgstr "&Ychwanegu Ffeil..."
+#: kdevdesigner/designer/mainwindow.cpp:3735
+#: kdevdesigner/designer/mainwindowactions.cpp:855
+msgid "&Preview"
+msgstr "&Rhagolwg"
 
-#: parts/distpart/distpart_widget.cpp:152
-#, c-format
-msgid "Archive made at: %1"
+#: kdevdesigner/designer/project.cpp:149
+msgid ""
+"Could not connect to the database.\n"
+"Press 'OK' to continue or 'Cancel' to specify different\n"
+"connection information.\n"
 msgstr ""
 
-#: parts/distpart/distpart_widget.cpp:152
-msgid "Archive Done"
+#: kdevdesigner/designer/connectiontable.cpp:38
+msgid "Sender"
+msgstr "Anfonwr"
+
+#: kdevdesigner/designer/connectiontable.cpp:40
+msgid "Receiver"
+msgstr "Derbynnydd"
+
+#: kdevdesigner/designer/newformimpl.cpp:160
+msgid "Load Template"
+msgstr "Llwytho Patrymlun"
+
+#: kdevdesigner/designer/newformimpl.cpp:161
+msgid "Could not load form description from template '%1'"
 msgstr ""
 
-#: parts/distpart/distpart_widget.cpp:595
-#, fuzzy, c-format
-msgid "Remove %1"
-msgstr "G&waredu"
+#: kdevdesigner/designer/newformimpl.cpp:252
+#, fuzzy
+msgid "%1 Project"
+msgstr "Cywaith"
 
-#: buildtools/qmake/trollprojectwidget.cpp:1796
-#: buildtools/qmake/trollprojectwidget.cpp:1937
-#: parts/distpart/distpart_widget.cpp:595
-msgid "Remove File"
-msgstr "Gwaredu Ffeil"
+#: kdevdesigner/designer/newformimpl.cpp:260
+msgid "Dialog"
+msgstr "Ymgom"
 
-#: parts/distpart/distpart_part.cpp:48
-msgid "Distribution && Publishing"
+#: kdevdesigner/designer/newformimpl.cpp:267
+msgid "Wizard"
+msgstr "Dewin"
+
+#: kdevdesigner/designer/newformimpl.cpp:272
+msgid "Widget"
 msgstr ""
 
-#: parts/distpart/distpart_part.cpp:52
-msgid "Make source and binary distribution"
+#: kdevdesigner/designer/newformimpl.cpp:277
+msgid "Main Window"
+msgstr "Prif Ffenestr"
+
+#: kdevdesigner/designer/projectsettingsimpl.cpp:96
+msgid ""
+"*.db|Database Files\n"
+"*|All Files"
 msgstr ""
 
-#: parts/distpart/distpart_part.cpp:53
+#: kdevdesigner/designer/projectsettingsimpl.cpp:104
 msgid ""
-"<b>Project distribution & publishing</b>"
-"<p>Helps users package and publish their software."
+"*.pro|Project Files\n"
+"*|All Files"
 msgstr ""
 
-#: parts/distpart/distpart_part.cpp:56
-msgid "Distribution & Publishing"
+#: kdevdesigner/designer/actioneditorimpl.cpp:52
+msgid "Actions"
+msgstr "Gweithredoedd"
+
+#: kdevdesigner/designer/formfile.cpp:195
+#: kdevdesigner/designer/formfile.cpp:218
+msgid "The file %1 could not be saved"
 msgstr ""
 
-#: parts/distpart/specsupport.cpp:92 parts/distpart/specsupport.cpp:191
-msgid "You need to create a source archive first."
+#: kdevdesigner/designer/formfile.cpp:230
+msgid "Failed to save file '%1'."
 msgstr ""
 
-#: parts/appwizard/filepropspage.cpp:69
-msgid "Header/Implementation file:"
+#: kdevdesigner/designer/formfile.cpp:236
+msgid "'%1' saved."
 msgstr ""
 
-#: parts/appwizard/appwizarddlg.cpp:108
-msgid "&Add to Favorites"
+#: kdevdesigner/designer/formfile.cpp:264
+#: kdevdesigner/designer/formfile.cpp:862
+#: kdevdesigner/designer/mainwindowactions.cpp:1212
+msgid "*.ui|TQt User-Interface Files"
 msgstr ""
 
-#: parts/appwizard/appwizarddlg.cpp:111
-msgid "&Remove Favorite"
+#: kdevdesigner/designer/formfile.cpp:265
+#: kdevdesigner/designer/formfile.cpp:863
+#: kdevdesigner/designer/mainwindowactions.cpp:1223
+msgid "*|All Files"
+msgstr "*|Pob Ffeil"
+
+#: kdevdesigner/designer/formfile.cpp:266
+#: kdevdesigner/designer/formfile.cpp:864
+#, fuzzy
+msgid "Save Form '%1' As"
+msgstr "&Cadw Fel..."
+
+#: kdevdesigner/designer/formfile.cpp:277
+msgid "File Already Exists"
+msgstr "Ffeil yn Bodoli'n Barod"
+
+#: kdevdesigner/designer/formfile.cpp:278
+msgid "The file already exists. Do you wish to overwrite it?"
 msgstr ""
 
-#: parts/appwizard/appwizarddlg.cpp:288
-msgid "Choose projects directory"
+#: kdevdesigner/designer/formfile.cpp:328
+#: kdevdesigner/designer/formwindow.cpp:1841
+#, fuzzy
+msgid "Save Form"
+msgstr "Rhagolyg&u Ffurflen"
+
+#: kdevdesigner/designer/formfile.cpp:329
+msgid "Save changes to form '%1'?"
 msgstr ""
 
-#: parts/appwizard/appwizarddlg.cpp:338
+#: kdevdesigner/designer/formfile.cpp:440
+#, fuzzy
+msgid "Using ui.h File"
+msgstr "Creu ..."
+
+#: kdevdesigner/designer/formfile.cpp:441
 msgid ""
-"_: no version control system\n"
-"None"
-msgstr "Dim"
+"An \"ui.h\" file for this form already exists.\n"
+"Do you want to use it or create a new one?"
+msgstr ""
 
-#: parts/appwizard/appwizarddlg.cpp:387
-msgid "Version Control System"
+#: kdevdesigner/designer/formfile.cpp:443
+#, fuzzy
+msgid "Use Existing"
+msgstr "Ffeil yn Bodoli"
+
+#: kdevdesigner/designer/formfile.cpp:443
+msgid "Create New"
+msgstr "Creu Newydd"
+
+#: kdevdesigner/designer/formfile.cpp:450
+#, fuzzy
+msgid "Creating ui.h file"
+msgstr "Creu ..."
+
+#: kdevdesigner/designer/formfile.cpp:451
+#, fuzzy
+msgid "Do you want to create an new \"ui.h\" file?"
+msgstr "Methu creu'r ffeil newydd."
+
+#: kdevdesigner/designer/formfile.cpp:856
+msgid ""
+"The project already contains a form with a\n"
+"filename of '%1'. Please choose a new filename."
 msgstr ""
 
-#: parts/appwizard/appwizarddlg.cpp:458
+#: kdevdesigner/designer/variabledialogimpl.cpp:104
 msgid ""
-"The directory you have chosen as the location for the project already exists."
+"One variable has been declared twice.\n"
+"Remove this variable?"
 msgstr ""
 
-#: parts/appwizard/appwizarddlg.cpp:467
+#: kdevdesigner/designer/customwidgeteditorimpl.cpp:222
+#, fuzzy
+msgid "Adding Custom Widget"
+msgstr "Addasu"
+
+#: kdevdesigner/designer/customwidgeteditorimpl.cpp:223
 msgid ""
-"The directory you have chosen as the location for the project is not writeable."
+"Custom widget names must be unique.\n"
+"A custom widget called '%1' already exists, so it is not possible to add "
+"another widget with this name."
 msgstr ""
 
-#: parts/appwizard/appwizarddlg.cpp:489
-msgid "The template %1 cannot be opened."
+#: kdevdesigner/designer/customwidgeteditorimpl.cpp:272
+msgid "Removing Custom Widget"
 msgstr ""
 
-#: parts/appwizard/appwizarddlg.cpp:648
-msgid "The directory %1 cannot be created."
+#: kdevdesigner/designer/customwidgeteditorimpl.cpp:273
+msgid "The custom widget '%1' is in use, so it cannot be removed."
 msgstr ""
 
-#: parts/appwizard/appwizarddlg.cpp:667
-msgid "The archive %1 cannot be opened."
+#: kdevdesigner/designer/customwidgeteditorimpl.cpp:379
+msgid "*.h *.h++ *.hxx *.hh|Header Files"
 msgstr ""
 
-#: parts/appwizard/appwizarddlg.cpp:685 parts/appwizard/appwizarddlg.cpp:827
-msgid "The file %1 cannot be created."
+#: kdevdesigner/designer/customwidgeteditorimpl.cpp:397
+#, fuzzy
+msgid "Renaming Custom Widget"
+msgstr "Addasu"
+
+#: kdevdesigner/designer/customwidgeteditorimpl.cpp:398
+msgid ""
+"Custom widget names must be unique.\n"
+"A custom widget called '%1' already exists, so it is not possible to rename "
+"this widget with this name."
 msgstr ""
 
-#: parts/appwizard/appwizarddlg.cpp:693
+#: kdevdesigner/designer/customwidgeteditorimpl.cpp:684
+#: kdevdesigner/designer/customwidgeteditorimpl.cpp:752
 msgid ""
-"The directory above the chosen location does not exist and cannot be created."
+"*.cw|Custom-Widget Description\n"
+"*|All Files"
 msgstr ""
 
-#: parts/appwizard/appwizarddlg.cpp:896
-msgid "Template for .%1 Files"
+#: kdevdesigner/designer/actiondnd.cpp:349
+#: kdevdesigner/designer/actiondnd.cpp:402
+#, fuzzy
+msgid "Delete Toolbar"
+msgstr "Bar offer"
+
+#: kdevdesigner/designer/actiondnd.cpp:352
+#: kdevdesigner/designer/actiondnd.cpp:432
+msgid "Delete Toolbar '%1'"
 msgstr ""
 
-#: parts/appwizard/appwizarddlg.cpp:922
-msgid "Set default project location to: %1?"
+#: kdevdesigner/designer/actiondnd.cpp:397
+msgid "Delete Separator"
 msgstr ""
 
-#: kdevdesigner/designer/mainwindow.cpp:1336
-#: parts/appwizard/appwizarddlg.cpp:923
-msgid "New Project"
-msgstr "Cywaith Newydd"
+#: kdevdesigner/designer/actiondnd.cpp:400
+msgid "Insert Separator"
+msgstr "Mewnosod Gwahanydd"
 
-#: parts/appwizard/appwizarddlg.cpp:923
-msgid "Set"
-msgstr "Set"
+#: kdevdesigner/designer/actiondnd.cpp:411
+#: kdevdesigner/designer/actiondnd.cpp:466
+#: kdevdesigner/designer/actiondnd.cpp:489
+msgid "Delete Action '%1' From Toolbar '%2'"
+msgstr ""
 
-#: parts/appwizard/appwizarddlg.cpp:923
-msgid "Do Not Set"
+#: kdevdesigner/designer/actiondnd.cpp:426
+msgid "Add Separator to Toolbar '%1'"
 msgstr ""
 
-#: parts/appwizard/appwizarddlg.cpp:949
-msgid ""
-"_: invalid location\n"
-" (invalid)"
+#: kdevdesigner/designer/actiondnd.cpp:506
+#: kdevdesigner/designer/actiondnd.cpp:573
+msgid "Add Action '%1' to Toolbar '%2'"
 msgstr ""
 
-#: parts/appwizard/appwizarddlg.cpp:951
-#, fuzzy
-msgid " (dir/file already exists)"
-msgstr "Ffeil yn Bodoli'n Barod %1"
+#: kdevdesigner/designer/actiondnd.cpp:566
+msgid "Insert/Move Action"
+msgstr ""
 
-#: parts/appwizard/appwizardpart.cpp:45
-msgid "&New Project..."
-msgstr "Cywaith &Newydd..."
+#: kdevdesigner/designer/actiondnd.cpp:567
+msgid ""
+"Action '%1' has already been added to this toolbar.\n"
+"An Action may only occur once in a given toolbar."
+msgstr ""
 
-#: parts/appwizard/appwizardpart.cpp:48
-msgid "Generate a new project from a template"
+#: kdevdesigner/designer/actiondnd.cpp:701
+msgid "Add Widget '%1' to Toolbar '%2'"
 msgstr ""
 
-#: parts/appwizard/appwizardpart.cpp:49
+#: kdevdesigner/designer/formwindow.cpp:360
+msgid "&Horizontal"
+msgstr "&Llorweddol"
+
+#: kdevdesigner/designer/formwindow.cpp:380
+#: kdevdesigner/designer/formwindow.cpp:507
 msgid ""
-"<b>New project</b>"
-"<p>This starts KDevelop's application wizard. It helps you to generate a "
-"skeleton for your application from a set of templates."
+"<b>A %1 (custom widget)</b> "
+"<p>Click <b>Edit Custom Widgets...</b> in the <b>Tools|Custom</b> "
+"menu to add and change custom widgets. You can add properties as well as "
+"signals and slots to integrate custom widgets into <i>TQt Designer</i>"
+", and provide a pixmap which will be used to represent the widget on the "
+"form.</p>"
 msgstr ""
 
-#: parts/appwizard/appwizardpart.cpp:54
-msgid "&Import Existing Project..."
+#: kdevdesigner/designer/formwindow.cpp:387
+#: kdevdesigner/designer/formwindow.cpp:514
+msgid "A %1 (custom widget)"
 msgstr ""
 
-#: parts/appwizard/appwizardpart.cpp:57
-msgid "Import existing project"
+#: kdevdesigner/designer/formwindow.cpp:458
+msgid "Reparent Widgets"
 msgstr ""
 
-#: parts/appwizard/appwizardpart.cpp:58
-msgid ""
-"<b>Import existing project</b>"
-"<p>Creates a project file for a given directory."
+#: kdevdesigner/designer/formwindow.cpp:466
+#: kdevdesigner/designer/formwindow.cpp:472
+#: kdevdesigner/designer/formwindow.cpp:482
+#, c-format
+msgid "Insert %1"
+msgstr "Mewnosod %1"
+
+#: kdevdesigner/designer/formwindow.cpp:663
+msgid "Set buddy for '%1' to..."
 msgstr ""
 
-#: parts/appwizard/importdlg.cpp:61
-msgid "Choose directory to import"
+#: kdevdesigner/designer/formwindow.cpp:665
+msgid "Connect '%1' with..."
 msgstr ""
 
-#: parts/appwizard/importdlg.cpp:111
-msgid "You have to choose a directory."
+#: kdevdesigner/designer/formwindow.cpp:687
+#: kdevdesigner/designer/formwindow.cpp:733
+msgid "Change Tab Order"
 msgstr ""
 
-#: parts/appwizard/importdlg.cpp:117
-msgid "You have to choose a project name."
+#: kdevdesigner/designer/formwindow.cpp:874
+msgid "Connect '%1' to '%2'"
 msgstr ""
 
-#: parts/appwizard/importdlg.cpp:123
-msgid "Your application name should only contain letters and numbers."
+#: kdevdesigner/designer/formwindow.cpp:902
+msgid "Set buddy '%1' to '%2'"
 msgstr ""
 
-#: parts/appwizard/importdlg.cpp:139
-#, fuzzy
-msgid "Cannot open project template."
-msgstr "&Ffeil y cywaith:"
+#: kdevdesigner/designer/formwindow.cpp:905
+msgid "Set buddy '%1' to ..."
+msgstr ""
 
-#: parts/appwizard/importdlg.cpp:193
+#: kdevdesigner/designer/formwindow.cpp:963
+#: kdevdesigner/designer/formwindow.cpp:1068
 #, fuzzy
-msgid "Cannot write the project file."
-msgstr "Methu Cyfieithu'r Testun Tarddiad"
+msgid "Inserting Widget"
+msgstr "Creu mynegai..."
 
-#: parts/appwizard/importdlg.cpp:553
-msgid "Generate build system infrastrucure"
+#: kdevdesigner/designer/formwindow.cpp:964
+#: kdevdesigner/designer/formwindow.cpp:1069
+msgid ""
+"You tried to insert a widget into the layout Container Widget '%1'.\n"
+"This is not possible. In order to insert the widget, the layout of '%1'\n"
+"must first be broken.\n"
+"Break the layout or cancel the operation?"
 msgstr ""
 
-#: parts/appwizard/importdlg.cpp:567
-msgid ""
-"Project infrastrucure already exists in target directory.\n"
-"Generate new project infrastructure and overwrite old?"
+#: kdevdesigner/designer/formwindow.cpp:1047
+#, c-format
+msgid "Set Buddy for %1"
 msgstr ""
 
-#: parts/appwizard/importdlg.cpp:567
-msgid "Generate"
-msgstr "Creu"
+#: kdevdesigner/designer/formwindow.cpp:1313
+#: kdevdesigner/designer/formwindow.cpp:1351
+#, fuzzy
+msgid "Use Size Hint"
+msgstr "Maint Llorweddol"
 
-#: parts/appwizard/importdlg.cpp:567
+#: kdevdesigner/designer/formwindow.cpp:1513
+#: kdevdesigner/designer/formwindow.cpp:1525
+#: kdevdesigner/designer/formwindow.cpp:1533
+#: kdevdesigner/designer/mainwindowactions.cpp:326
 #, fuzzy
-msgid "Do Not Generate"
-msgstr "&Creu"
+msgid "Adjust Size"
+msgstr "Addasu"
 
-#: parts/filecreate/fcconfigwidget.cpp:51
-msgid "Global Types"
+#: kdevdesigner/designer/formwindow.cpp:1743
+msgid "Click widgets to change the tab order..."
 msgstr ""
 
-#: parts/filecreate/fcconfigwidget.cpp:62
-msgid "Project templates in "
+#: kdevdesigner/designer/formwindow.cpp:1754
+msgid "Drag a line to create a connection..."
 msgstr ""
 
-#: parts/filecreate/fcconfigwidget.cpp:652
-msgid ""
-"Requested template does not exist yet.\n"
-"It will be opened immediately after accepting the configuration dialog."
+#: kdevdesigner/designer/formwindow.cpp:1756
+msgid "Drag a line to set a buddy..."
 msgstr ""
 
-#: parts/filecreate/fcconfigwidget.cpp:677
-#: parts/filecreate/fcconfigwidget.cpp:700
-msgid ""
-"Template for the selected file type does not exist yet.\n"
-"It will be opened immediately after accepting the configuration dialog."
+#: kdevdesigner/designer/formwindow.cpp:1762
+msgid "Click on the form to insert a %1..."
 msgstr ""
 
-#: parts/filecreate/fcconfigwidget.cpp:679
-#: parts/filecreate/fcconfigwidget.cpp:702
+#: kdevdesigner/designer/formwindow.cpp:1834
 msgid ""
-"Template for the selected file type has been changed.\n"
-"It will be opened immediately after accepting the configuration dialog."
+"The following custom widgets are used in '%1',\n"
+"but are not known to TQt Designer:\n"
 msgstr ""
 
-#: parts/filecreate/filecreate_widget2.cpp:48
-msgid "Use this to create new files within your project."
+#: kdevdesigner/designer/formwindow.cpp:1838
+msgid ""
+"If you save this form and generate code for it using uic, \n"
+"the generated code will not compile.\n"
+"Do you want to save this form now?"
 msgstr ""
 
-#: parts/filecreate/filecreate_widget3.cpp:36
-msgid "File Create"
-msgstr ""
+#: kdevdesigner/designer/formwindow.cpp:1877
+msgid "Lower"
+msgstr "Gostwng"
 
-#: parts/filecreate/filecreate_widget3.cpp:44
+#: kdevdesigner/designer/formwindow.cpp:1936
+#: kdevdesigner/designer/formwindow.cpp:1953
+#: kdevdesigner/designer/mainwindowactions.cpp:185
+msgid "Check Accelerators"
+msgstr "Gwirio Cyflymyddion"
+
+#: kdevdesigner/designer/formwindow.cpp:1937
 msgid ""
-"<b>New file</b>"
-"<p>This part makes the creation of new files easier. Select a type in the list "
-"to create a file. The list of project file types can be configured in project "
-"settings dialog, <b>New File Wizard</b> tab. Globally available file types are "
-"listed and can be configured in KDevelop settings dialog, <b>New File Wizard</b> "
-"tab."
+"_n: Accelerator '%1' is used once.\n"
+"Accelerator '%1' is used %n times."
 msgstr ""
 
-#: parts/filecreate/filecreate_part.cpp:75
-#: parts/filecreate/filecreate_part.cpp:76
-msgid "File Templates"
-msgstr ""
+#: kdevdesigner/designer/formwindow.cpp:1939
+msgid "&Select"
+msgstr "&Detholi"
 
-#: parts/filecreate/filecreate_part.cpp:82
-msgid ""
-"<b>New file</b>"
-"<p>Creates a new file. Also adds it the project if the <b>Add to project</b> "
-"checkbox is turned on."
+#: kdevdesigner/designer/formwindow.cpp:1954
+msgid "No accelerator is used more than once."
 msgstr ""
 
-#: buildtools/script/scriptprojectpart.cpp:57
-#: parts/filecreate/filecreate_part.cpp:83
-msgid "Create a new file"
-msgstr ""
+#: kdevdesigner/designer/formwindow.cpp:1964
+msgid "Raise"
+msgstr "Codi"
 
-#: parts/filecreate/filecreate_part.cpp:184
-#: parts/fileselector/fileselector_part.cpp:99
-msgid "Cannot create file. Check whether the directory and filename are valid."
-msgstr ""
+#: kdevdesigner/designer/formwindow.cpp:2002
+#: kdevdesigner/designer/mainwindowactions.cpp:333
+#, fuzzy
+msgid "Lay OutQt::Horizontally"
+msgstr "Ehangu'n &Llorweddol"
 
-#: parts/filecreate/addglobaldlg.cpp:61
-msgid "Template Location"
-msgstr ""
+#: kdevdesigner/designer/formwindow.cpp:2012
+#: kdevdesigner/designer/mainwindowactions.cpp:340
+#, fuzzy
+msgid "Lay OutQt::Vertically"
+msgstr "Ehangu'n &Fertigol"
 
-#: parts/filecreate/addglobaldlg.cpp:92
-msgid "Select Global File Types"
-msgstr ""
+#: kdevdesigner/designer/formwindow.cpp:2022
+#, fuzzy
+msgid "Lay OutQt::Horizontally (in splitter)"
+msgstr "Ehangu'n &Llorweddol"
 
-#: parts/filecreate/addglobaldlg.cpp:94
-msgid "F1"
-msgstr "F1"
+#: kdevdesigner/designer/formwindow.cpp:2032
+#, fuzzy
+msgid "Lay OutQt::Vertically (in splitter)"
+msgstr "Ehangu'n &Fertigol"
 
-#: parts/filecreate/addglobaldlg.cpp:99
-msgid "Type extension:"
+#: kdevdesigner/designer/formwindow.cpp:2045
+#: kdevdesigner/designer/mainwindowactions.cpp:347
+msgid "Lay Out in a Grid"
 msgstr ""
 
-#: parts/filecreate/addglobaldlg.cpp:100
-msgid "Type name:"
-msgstr "Enw'r math:"
+#: kdevdesigner/designer/formwindow.cpp:2066
+#, fuzzy
+msgid "Lay Out ChildrenQt::Horizontally"
+msgstr "Ehangu'n &Llorweddol"
 
-#: parts/filecreate/addglobaldlg.cpp:101
-msgid "Template location:"
-msgstr ""
+#: kdevdesigner/designer/formwindow.cpp:2087
+#, fuzzy
+msgid "Lay Out ChildrenQt::Vertically"
+msgstr "Teilio'n Fe&rtigol"
 
-#: parts/filecreate/addglobaldlg.cpp:102
-msgid "Icon:"
-msgstr "Eicon:"
+#: kdevdesigner/designer/formwindow.cpp:2111
+#, fuzzy
+msgid "Lay Out Children in a Grid"
+msgstr "Teilio'n Fe&rtigol"
 
-#: parts/filecreate/filecreate_newfile.cpp:33
-msgid ""
-"_: New file dialog (title)\n"
-"New File"
-msgstr "Ffeil newydd"
+#: kdevdesigner/designer/formwindow.cpp:2143
+#: kdevdesigner/designer/formwindow.cpp:2163
+#: kdevdesigner/designer/mainwindowactions.cpp:368
+msgid "Break Layout"
+msgstr "Torri'r Haenlun"
 
-#: parts/filecreate/filecreate_newfile.cpp:38
-msgid "<b>New File Creation</b>"
+#: kdevdesigner/designer/formwindow.cpp:2223
+#, fuzzy
+msgid "Edit connections..."
+msgstr "C&ysylltiadau :"
+
+#: kdevdesigner/designer/mainwindowactions.cpp:128
+msgid "Undoes the last action"
 msgstr ""
 
-#: parts/filecreate/filecreate_newfile.cpp:56
-msgid ""
-"_: Add to project (on checkbox)\n"
-"&Add to project"
+#: kdevdesigner/designer/mainwindowactions.cpp:134
+msgid "Redoes the last undone operation"
 msgstr ""
 
-#: parts/filecreate/filecreate_newfile.cpp:155
-#, fuzzy
-msgid "A file with this name already exists"
-msgstr "Mae ffeil o'r enw %1 mewn bod yn barod."
+#: kdevdesigner/designer/mainwindowactions.cpp:139
+msgid "Cu&t"
+msgstr "To&rri"
 
-#: parts/filecreate/filecreate_newfile.cpp:155
-msgid "File Exists"
-msgstr "Ffeil yn Bodoli"
+#: kdevdesigner/designer/mainwindowactions.cpp:140
+msgid "Cuts the selected widgets and puts them on the clipboard"
+msgstr ""
 
-#: parts/snippet/snippet_part.cpp:47 parts/snippet/snippet_part.cpp:52
-#: parts/snippet/snippet_part.cpp:100 parts/snippet/snippet_widget.cpp:564
-msgid "Code Snippets"
+#: kdevdesigner/designer/mainwindowactions.cpp:146
+msgid "Copies the selected widgets to the clipboard"
 msgstr ""
 
-#: parts/snippet/snippet_part.cpp:50
-msgid "<b>Code Snippet</b><p>This is a list of available snippets."
+#: kdevdesigner/designer/mainwindowactions.cpp:152
+msgid "Pastes the clipboard's contents"
 msgstr ""
 
-#: parts/snippet/snippet_part.cpp:52
-msgid "Insert a code snippet"
+#: kdevdesigner/designer/mainwindowactions.cpp:158
+msgid "Deletes the selected widgets"
 msgstr ""
 
-#: parts/snippet/snippet_part.cpp:76
-msgid "Show Snippet Tree"
+#: kdevdesigner/designer/mainwindowactions.cpp:167
+msgid "Select &All"
+msgstr "Dewis Pope&th"
+
+#: kdevdesigner/designer/mainwindowactions.cpp:168
+msgid "Selects all widgets"
 msgstr ""
 
-#: parts/snippet/snippet_part.cpp:84
-msgid "SnippetPart"
+#: kdevdesigner/designer/mainwindowactions.cpp:173
+msgid "Bring to Front"
+msgstr "Anfon i'r Blaen"
+
+#: kdevdesigner/designer/mainwindowactions.cpp:173
+msgid "Bring to &Front"
+msgstr "Anfon i'r &Blaen"
+
+#: kdevdesigner/designer/mainwindowactions.cpp:174
+#: kdevdesigner/designer/mainwindowactions.cpp:175
+msgid "Raises the selected widgets"
 msgstr ""
 
-#: parts/snippet/snippet_part.cpp:85
-msgid "SnippetPart for KDevelop"
+#: kdevdesigner/designer/mainwindowactions.cpp:179
+msgid "Send to Back"
+msgstr "Anfon i'r Cefn"
+
+#: kdevdesigner/designer/mainwindowactions.cpp:179
+msgid "Send to &Back"
+msgstr "Anfon i'r &Cefn"
+
+#: kdevdesigner/designer/mainwindowactions.cpp:180
+#: kdevdesigner/designer/mainwindowactions.cpp:181
+msgid "Lowers the selected widgets"
 msgstr ""
 
-#: parts/snippet/snippet_part.cpp:87
-msgid "(c) 2003"
+#: kdevdesigner/designer/mainwindowactions.cpp:187
+msgid "Checks if the accelerators used in the form are unique"
 msgstr ""
 
-#: parts/snippet/snippet_widget.cpp:141
-msgid "Add Group"
-msgstr "Ychwanegu Gr?p"
+#: kdevdesigner/designer/mainwindowactions.cpp:194
+msgid "Opens a dialog for editing slots"
+msgstr ""
 
-#: buildtools/autotools/addtranslationdlg.cpp:42
-#: parts/snippet/snippet_widget.cpp:145 parts/snippet/snippet_widget.cpp:256
-#: parts/snippet/snippet_widget.cpp:535
-msgid "Language:"
-msgstr "Iaith:"
+#: kdevdesigner/designer/mainwindowactions.cpp:199
+msgid "Connections"
+msgstr "Cysylltiadau"
 
-#: parts/snippet/snippet_widget.cpp:168
-msgid "Do you really want to remove this group and all its snippets?"
+#: kdevdesigner/designer/mainwindowactions.cpp:201
+msgid "Opens a dialog for editing connections"
 msgstr ""
 
-#: parts/snippet/snippet_widget.cpp:206
-msgid "Edit Snippet"
+#: kdevdesigner/designer/mainwindowactions.cpp:207
+msgid "&Source..."
+msgstr "&Tarddiad ..."
+
+#: kdevdesigner/designer/mainwindowactions.cpp:208
+msgid "Opens an editor to edit the form's source code"
 msgstr ""
 
-#: parts/snippet/snippet_widget.cpp:252
-#, fuzzy
-msgid "Edit Group"
-msgstr "Gr?p"
+#: kdevdesigner/designer/mainwindowactions.cpp:215
+msgid "Opens a dialog to change the form's settings"
+msgstr ""
 
-#: parts/snippet/snippet_widget.cpp:554
-msgid "Add Item..."
-msgstr "Ychwanegu Eitem ..."
+#: kdevdesigner/designer/mainwindowactions.cpp:221
+msgid "Preferences..."
+msgstr "Hoffterau..."
 
-#: parts/snippet/snippet_widget.cpp:555 parts/snippet/snippet_widget.cpp:566
-msgid "Add Group..."
-msgstr "Ychwanegu Grŵp"
+#: kdevdesigner/designer/mainwindowactions.cpp:222
+msgid "Opens a dialog to change preferences"
+msgstr ""
 
-#: kdevdesigner/designer/hierarchyview.cpp:1050
-#: kdevdesigner/designer/hierarchyview.cpp:1055
-#: kdevdesigner/designer/mainwindow.cpp:1680
-#: parts/documentation/bookmarkview.cpp:126
-#: parts/snippet/snippet_widget.cpp:557 parts/snippet/snippet_widget.cpp:559
-msgid "Edit..."
-msgstr "Golygu..."
+#: kdevdesigner/designer/mainwindowactions.cpp:271
+msgid "Find"
+msgstr "Canfod:"
 
-#: parts/snippet/snippet_widget.cpp:600
-msgid "Please enter the value for <b>%1</b>:"
+#: kdevdesigner/designer/mainwindowactions.cpp:277
+msgid "Find Incremental"
 msgstr ""
 
-#: parts/snippet/snippet_widget.cpp:672 parts/snippet/snippet_widget.cpp:801
-msgid "Enter Values for Variables"
+#: kdevdesigner/designer/mainwindowactions.cpp:278
+msgid "Find &Incremental"
 msgstr ""
 
-#: parts/snippet/snippet_widget.cpp:686
-msgid "Enter the replacement values for these variables:"
+#: kdevdesigner/designer/mainwindowactions.cpp:290
+msgid "&Goto Line..."
 msgstr ""
 
-#: parts/snippet/snippet_widget.cpp:712 parts/snippet/snippet_widget.cpp:830
-msgid ""
-"Enable this to save the value entered to the right as the default value for "
-"this variable"
+#: kdevdesigner/designer/mainwindowactions.cpp:302
+msgid "Incremental search (Alt+I)"
 msgstr ""
 
-#: parts/snippet/snippet_widget.cpp:713 parts/snippet/snippet_widget.cpp:831
-msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
+#: kdevdesigner/designer/mainwindowactions.cpp:328
+msgid "Adjusts the size of the selected widget"
 msgstr ""
 
-#: parts/snippet/snippet_widget.cpp:814
-msgid "Enter the replacement values for %1:"
+#: kdevdesigner/designer/mainwindowactions.cpp:335
+msgid "Lays out the selected widgets horizontally"
 msgstr ""
 
-#: parts/snippet/snippet_widget.cpp:820
-msgid "Make value &default"
+#: kdevdesigner/designer/mainwindowactions.cpp:342
+msgid "Lays out the selected widgets vertically"
 msgstr ""
 
-#: parts/filelist/projectviewpart.cpp:260
-msgid ""
-"<b>View Session Toolbar</b>"
-"<p>This allows to create and work with view sessions. A view session is a set "
-"of open documents.</p>"
+#: kdevdesigner/designer/mainwindowactions.cpp:348
+msgid "Lay Out in a &Grid"
 msgstr ""
 
-#: parts/filelist/projectviewpart.cpp:266
-msgid "<b>File List</b><p>This is the list of opened files.</p>"
+#: kdevdesigner/designer/mainwindowactions.cpp:349
+msgid "Lays out the selected widgets in a grid"
 msgstr ""
 
-#: parts/filelist/projectviewpart.cpp:270
-msgid "Open files"
-msgstr "Agor Ffeiliau"
-
-#: parts/filelist/projectviewpart.cpp:278
+#: kdevdesigner/designer/mainwindowactions.cpp:354
 #, fuzzy
-msgid "Open Session..."
-msgstr "Agor Gyda..."
+msgid "Lay OutQt::Horizontally (in Splitter)"
+msgstr "Ehangu'n &Llorweddol"
 
-#: parts/filelist/projectviewpart.cpp:282
-#, fuzzy
-msgid "Open Session"
-msgstr "Sesiwn"
+#: kdevdesigner/designer/mainwindowactions.cpp:356
+msgid "Lays out the selected widgets horizontally in a splitter"
+msgstr ""
 
-#: parts/filelist/projectviewpart.cpp:284
+#: kdevdesigner/designer/mainwindowactions.cpp:361
 #, fuzzy
-msgid "Save Session"
-msgstr "Sesiwn"
+msgid "Lay OutQt::Vertically (in Splitter)"
+msgstr "Ehangu'n &Fertigol"
 
-#: parts/filelist/projectviewpart.cpp:286
-#, fuzzy
-msgid "New Session..."
-msgstr "Sesiwn"
+#: kdevdesigner/designer/mainwindowactions.cpp:363
+msgid "Lays out the selected widgets vertically in a splitter"
+msgstr ""
 
-#: parts/filelist/projectviewpart.cpp:288
-#: parts/filelist/projectviewpart.cpp:292
-#: parts/filelist/projectviewpart.cpp:294
-#: parts/filelist/projectviewpart.cpp:296
-#, fuzzy
-msgid "Delete Session"
-msgstr "Dileu Gweithred"
+#: kdevdesigner/designer/mainwindowactions.cpp:370
+msgid "Breaks the selected layout"
+msgstr ""
 
-#: parts/filelist/projectviewpart.cpp:487
-#, fuzzy
-msgid "Save View Session As"
-msgstr "Gosodiadau Cywaith"
+#: kdevdesigner/designer/mainwindowactions.cpp:379
+#, c-format
+msgid "Add %1"
+msgstr "Ychwanegu %1"
 
-#: parts/filelist/projectviewpart.cpp:487
-msgid "Enter the name of the session:"
+#: kdevdesigner/designer/mainwindowactions.cpp:382
+#: kdevdesigner/designer/mainwindowactions.cpp:555
+#, c-format
+msgid "Insert a %1"
 msgstr ""
 
-#: parts/filelist/projectviewpart.cpp:494
+#: kdevdesigner/designer/mainwindowactions.cpp:383
 msgid ""
-"<qt>A view session named <b>%1</b> already exists."
-"<br>Do you want to overwrite it?</qt>"
+"<b>A %1</b>"
+"<p>%2</p>"
+"<p>Click to insert a single %3,or double click to keep the tool selected."
 msgstr ""
 
-#: parts/filelist/filelist_widget.cpp:95
-msgid "This file has unsaved changes."
+#: kdevdesigner/designer/mainwindowactions.cpp:395
+#, c-format
+msgid "<b>The Layout toolbar</b>%1"
 msgstr ""
 
-#: parts/filelist/filelist_widget.cpp:98
-msgid "This file has changed on disk since it was last saved."
-msgstr ""
+#: kdevdesigner/designer/mainwindowactions.cpp:431
+#, fuzzy
+msgid "Pointer"
+msgstr "Hidlo"
 
-#: parts/filelist/filelist_widget.cpp:101
-msgid "Conflict: this file has changed on disk and has unsaved changes."
+#: kdevdesigner/designer/mainwindowactions.cpp:435
+msgid "Selects the pointer tool"
 msgstr ""
 
-#: parts/filelist/filelist_widget.cpp:229
-msgid "Close Selected"
-msgstr ""
+#: kdevdesigner/designer/mainwindowactions.cpp:438
+#, fuzzy
+msgid "Connect Signal/Slots"
+msgstr "C&ysylltiadau :"
 
-#: parts/filelist/filelist_widget.cpp:230
-msgid "Save Selected"
+#: kdevdesigner/designer/mainwindowactions.cpp:444
+msgid "Selects the connection tool"
 msgstr ""
 
-#: parts/filelist/filelist_widget.cpp:231
-msgid "Reload Selected"
+#: kdevdesigner/designer/mainwindowactions.cpp:447
+msgid "Tab Order"
 msgstr ""
 
-#: parts/fileview/filetreewidget.cpp:206 parts/fileview/fileviewpart.cpp:68
-#: parts/fileview/fileviewpart.cpp:81 parts/fileview/partwidget.cpp:48
-#: parts/fileview/partwidget.cpp:49
-msgid "File Tree"
+#: kdevdesigner/designer/mainwindowactions.cpp:451
+msgid "Selects the tab order tool"
 msgstr ""
 
-#: parts/fileview/partwidget.cpp:51
-msgid ""
-"<b>File tree</b>"
-"<p>The file viewer shows all files of the project in a tree layout."
+#: kdevdesigner/designer/mainwindowactions.cpp:454
+msgid "Set Buddy"
 msgstr ""
 
-#: parts/fileview/partwidget.cpp:70
-msgid ""
-"<p>Here you can enter a name filter to limit which files are <b>"
-"not displayed</b>."
-"<p>To clear the filter, toggle off the filter button to the left."
-"<p>To reapply the last filter used, toggle on the filter button."
+#: kdevdesigner/designer/mainwindowactions.cpp:458
+msgid "Sets a buddy to a label"
 msgstr ""
 
-#: parts/fileselector/fileselector_widget.cpp:228
-#: parts/fileview/partwidget.cpp:75
-msgid ""
-"<p>This button clears the name filter when toggled off, or reapplies the last "
-"filter used when toggled on."
+#: kdevdesigner/designer/mainwindowactions.cpp:464
+#, c-format
+msgid "<b>The Tools toolbar</b>%1"
 msgstr ""
-"<p>Gwagia'r botwm yma'r hidlen enwau pan yn ddiffodd, neu ailweithreda'r hidlen "
-"ddefnyddiwyd ddiwethaf pan ynghyn."
 
-#: parts/fileselector/fileselector_widget.cpp:355
-#: parts/fileview/partwidget.cpp:104
-msgid "Apply last filter (\"%1\")"
-msgstr "Gweithredu'r hidlen ddiwethaf (\"%1\")"
+#: kdevdesigner/designer/mainwindowactions.cpp:466
+msgid "Tools"
+msgstr "Offer"
 
-#: parts/fileselector/fileselector_widget.cpp:366
-#: parts/fileview/partwidget.cpp:109 parts/outputviews/appoutputwidget.cpp:265
-msgid "Clear filter"
-msgstr "Gwagio hidlen"
+#: kdevdesigner/designer/mainwindowactions.cpp:488
+#, fuzzy
+msgid "Custom Widgets"
+msgstr "Addasu"
 
-#: parts/fileview/filegroupswidget.cpp:181
-#: parts/fileview/filetreeviewwidgetimpl.cpp:40
-msgid "Show Non Project Files"
+#: kdevdesigner/designer/mainwindowactions.cpp:491
+msgid "Opens a dialog to add and change custom widgets"
 msgstr ""
 
-#: parts/fileview/filegroupswidget.cpp:183
-#: parts/fileview/filetreeviewwidgetimpl.cpp:42
-msgid "Hide Non Project Files"
+#: kdevdesigner/designer/mainwindowactions.cpp:508
+msgid "<b>The %1</b>%2"
 msgstr ""
 
-#: parts/fileview/filegroupswidget.cpp:184
-#: parts/fileview/filetreeviewwidgetimpl.cpp:43
+#: kdevdesigner/designer/mainwindowactions.cpp:509
+#, c-format
 msgid ""
-"<b>Show non project files</b>"
-"<p>Shows files that do not belong to a project in a file tree."
+" Click on a button to insert a single widget, or double click to insert "
+"multiple %1."
 msgstr ""
 
-#: parts/fileview/filetreeviewwidgetimpl.cpp:99
-msgid "Reload Tree"
+#: kdevdesigner/designer/mainwindowactions.cpp:512
+msgid "<b>The %1 Widgets</b>%2"
 msgstr ""
 
-#: parts/fileview/filetreeviewwidgetimpl.cpp:100
-msgid "<b>Reload tree</b><p>Reloads the project files tree."
+#: kdevdesigner/designer/mainwindowactions.cpp:513
+msgid ""
+" Click on a button to insert a single %1 widget, or double click to insert "
+"multiple widgets."
 msgstr ""
 
-#: parts/fileview/vcsfiletreewidgetimpl.cpp:206
-msgid "Show VCS Fields"
-msgstr ""
+#: kdevdesigner/designer/mainwindowactions.cpp:557
+msgid "<b>A %1</b>"
+msgstr "<b>A %1</b>"
 
-#: parts/fileview/vcsfiletreewidgetimpl.cpp:208
-msgid "Hide VCS Fields"
+#: kdevdesigner/designer/mainwindowactions.cpp:560
+msgid "<p>Double click on this tool to keep it selected.</p>"
 msgstr ""
 
-#: parts/fileview/vcsfiletreewidgetimpl.cpp:209
+#: kdevdesigner/designer/mainwindowactions.cpp:579
 msgid ""
-"<b>Show VCS fields</b>"
-"<p>Shows <b>Revision</b> and <b>Timestamp</b> for each file contained in VCS "
-"repository."
+"<b>The Custom Widgets toolbar</b>%1"
+"<p>Click <b>Edit Custom Widgets...</b>in the <b>Tools|Custom</b> "
+"menu to add and change custom widgets</p>"
 msgstr ""
 
-#: parts/fileview/vcsfiletreewidgetimpl.cpp:213
-msgid "Sync with Repository"
+#: kdevdesigner/designer/mainwindowactions.cpp:584
+msgid ""
+" Click on the buttons to insert a single widget, or double click to insert "
+"multiple widgets."
 msgstr ""
 
-#: parts/fileview/vcsfiletreewidgetimpl.cpp:215
-msgid ""
-"<b>Sync with repository</b>"
-"<p>Synchronize file status with remote repository."
+#: kdevdesigner/designer/mainwindowactions.cpp:606
+msgid "Opens a dialog to configure the common widgets page of the toolbox"
 msgstr ""
 
-#: parts/fileview/fileviewpart.cpp:81
-msgid "File tree view in the project directory"
+#: kdevdesigner/designer/mainwindowactions.cpp:620
+#, c-format
+msgid "<b>The File toolbar</b>%1"
 msgstr ""
 
-#: parts/fileview/filegroupspart.cpp:48
-msgid ""
-"<b>File group view</b>"
-"<p>The file group viewer shows all files of the project, in groups which can be "
-"configured in project settings dialog, <b>File Groups</b> tab."
+#: kdevdesigner/designer/mainwindowactions.cpp:630
+msgid "New dialog or file"
 msgstr ""
 
-#: parts/fileview/filegroupspart.cpp:51 parts/fileview/filegroupspart.cpp:54
-#: parts/fileview/filegroupswidget.cpp:227
-#: parts/fileview/filegroupswidget.cpp:261
-msgid "File Groups"
+#: kdevdesigner/designer/mainwindowactions.cpp:631
+#: kdevdesigner/designer/mainwindowactions.cpp:645
+msgid "&New..."
+msgstr "&Newydd..."
+
+#: kdevdesigner/designer/mainwindowactions.cpp:634
+msgid "Creates a new project, form or source file."
 msgstr ""
 
-#: parts/fileview/filegroupspart.cpp:51
-msgid "File groups in the project directory"
+#: kdevdesigner/designer/mainwindowactions.cpp:647
+msgid "Creates a new dialog or file"
 msgstr ""
 
-#: parts/fileview/filegroupsconfigwidget.cpp:75
-msgid "Add File Group"
+#: kdevdesigner/designer/mainwindowactions.cpp:651
+msgid "New Dialog"
+msgstr "Ymgom Newydd"
+
+#: kdevdesigner/designer/mainwindowactions.cpp:652
+#, fuzzy
+msgid "&Dialog..."
+msgstr "&Teilio..."
+
+#: kdevdesigner/designer/mainwindowactions.cpp:655
+msgid "Creates a new dialog."
 msgstr ""
 
-#: parts/fileview/filegroupsconfigwidget.cpp:88
-msgid "Edit File Group"
+#: kdevdesigner/designer/mainwindowactions.cpp:660
+msgid "&File..."
+msgstr "&Ffeil..."
+
+#: kdevdesigner/designer/mainwindowactions.cpp:663
+#, fuzzy
+msgid "Creates a new file."
+msgstr "Methu creu'r ffeil newydd."
+
+#: kdevdesigner/designer/mainwindowactions.cpp:678
+msgid "Opens an existing project, form or source file "
 msgstr ""
 
-#: buildtools/qmake/qmakescopeitem.cpp:84
-#: parts/fileview/filegroupswidget.cpp:42
-msgid "Sources"
+#: kdevdesigner/designer/mainwindowactions.cpp:692
+msgid "Closes the current project or document"
 msgstr ""
 
-#: buildtools/qmake/qmakescopeitem.cpp:120
-#: parts/fileview/filegroupswidget.cpp:43
-msgid "Translations"
+#: kdevdesigner/designer/mainwindowactions.cpp:707
+msgid "Saves the current project or document"
 msgstr ""
 
-#: parts/fileview/filegroupswidget.cpp:44 parts/uimode/uichooser_part.cpp:27
-msgid "User Interface"
+#: kdevdesigner/designer/mainwindowactions.cpp:717
+msgid "Save &As..."
+msgstr "Cadw &Fel..."
+
+#: kdevdesigner/designer/mainwindowactions.cpp:718
+msgid "Saves the current form with a new filename"
 msgstr ""
 
-#: parts/fileview/filegroupswidget.cpp:45
-msgid "Others"
-msgstr "Eraill"
+#: kdevdesigner/designer/mainwindowactions.cpp:727
+msgid "Save All"
+msgstr "Cadw Popeth"
 
-#: parts/fileview/filegroupswidget.cpp:186
-msgid "Display Location Column"
+#: kdevdesigner/designer/mainwindowactions.cpp:728
+msgid "Sa&ve All"
+msgstr "Ca&dw Popeth"
+
+#: kdevdesigner/designer/mainwindowactions.cpp:729
+msgid "Saves all open documents"
 msgstr ""
 
-#: parts/fileview/filegroupswidget.cpp:188
-msgid ""
-"<b>Display the Location Column</b>"
-"<p>Displays a column with the location of the files."
+#: kdevdesigner/designer/mainwindowactions.cpp:741
+#, fuzzy
+msgid "Creates a new template"
+msgstr "Creu Patrymlun"
+
+#: kdevdesigner/designer/mainwindowactions.cpp:754
+msgid "Recently Opened Files "
 msgstr ""
 
-#: parts/fileview/filegroupswidget.cpp:229
-msgid "Customize..."
-msgstr "Addasu..."
+#: kdevdesigner/designer/mainwindowactions.cpp:755
+#, fuzzy
+msgid "Recently Opened Projects"
+msgstr "Agor Cywaith"
 
-#: parts/fileview/filegroupswidget.cpp:230
+#: kdevdesigner/designer/mainwindowactions.cpp:773
+msgid "Exit"
+msgstr "Terfynu"
+
+#: kdevdesigner/designer/mainwindowactions.cpp:775
 msgid ""
-"<b>Customize</b>"
-"<p>Opens <b>Customize File Groups</b> dialog where the groups can be managed."
+"Quits the application and prompts to save any changed forms, source files or "
+"project settings"
 msgstr ""
 
-#: parts/fileview/filegroupswidget.cpp:258
-msgid "Customize File Groups"
+#: kdevdesigner/designer/mainwindowactions.cpp:788
+msgid "Pr&oject"
+msgstr "Cy&waith"
+
+#: kdevdesigner/designer/mainwindowactions.cpp:791
+#: kdevdesigner/designer/mainwindowactions.cpp:792
+#, fuzzy
+msgid "Active Project"
+msgstr "Cywaith Newydd"
+
+#: kdevdesigner/designer/mainwindowactions.cpp:808
+msgid "Add File"
+msgstr "Ychwanegu Ffeil"
+
+#: kdevdesigner/designer/mainwindowactions.cpp:810
+msgid "Adds a file to the current project"
 msgstr ""
 
-#: parts/abbrev/abbrevpart.cpp:80
-msgid "Expand Text"
+#: kdevdesigner/designer/mainwindowactions.cpp:818
+msgid "Image Collection..."
 msgstr ""
 
-#: parts/abbrev/abbrevpart.cpp:83
-msgid "Expand current word"
+#: kdevdesigner/designer/mainwindowactions.cpp:820
+msgid "Opens a dialog for editing the current project's image collection"
 msgstr ""
 
-#: parts/abbrev/abbrevpart.cpp:84
-msgid ""
-"<b>Expand current word</b>"
-"<p>Current word can be completed using the list of similar words in source "
-"files."
+#: kdevdesigner/designer/mainwindowactions.cpp:828
+#, fuzzy
+msgid "Database Connections..."
+msgstr "C&ysylltiadau :"
+
+#: kdevdesigner/designer/mainwindowactions.cpp:830
+msgid "Opens a dialog for editing the current project's database connections"
 msgstr ""
 
-#: parts/abbrev/abbrevpart.cpp:86
-msgid "Expand Abbreviation"
+#: kdevdesigner/designer/mainwindowactions.cpp:839
+msgid "Project Settings..."
+msgstr "Gosodiadau Cywaith ..."
+
+#: kdevdesigner/designer/mainwindowactions.cpp:840
+msgid "&Project Settings..."
+msgstr "&Gosodiadau Cywaith ..."
+
+#: kdevdesigner/designer/mainwindowactions.cpp:841
+msgid "Opens a dialog to change the project's settings"
 msgstr ""
 
-#: parts/abbrev/abbrevpart.cpp:89
-msgid "Expand abbreviation"
+#: kdevdesigner/designer/mainwindowactions.cpp:857
+msgid "Preview Form"
+msgstr "Rhagolygu Ffurflen"
+
+#: kdevdesigner/designer/mainwindowactions.cpp:860
+msgid "Opens a preview"
 msgstr ""
 
-#: parts/abbrev/abbrevpart.cpp:90
+#: kdevdesigner/designer/mainwindowactions.cpp:874
 msgid ""
-"<b>Expand abbreviation</b>"
-"<p>Enable and configure abbreviations in <b>KDevelop Settings</b>, <b>"
-"Abbreviations</b> tab."
+"The preview will use the Motif look and feel which is used as the default style "
+"on most UNIX systems."
 msgstr ""
 
-#: parts/abbrev/abbrevpart.cpp:244
-msgid "Abbreviations"
+#: kdevdesigner/designer/mainwindowactions.cpp:876
+msgid "The preview will use the Windows look and feel."
 msgstr ""
 
-#: parts/vcsmanager/vcsmanagerpart.cpp:60
-#, fuzzy
-msgid "Version Control"
-msgstr "Fersiwn %1"
-
-#: parts/vcsmanager/vcsmanagerprojectconfig.cpp:49
+#: kdevdesigner/designer/mainwindowactions.cpp:878
 msgid ""
-"_: No Version Control System\n"
-"None"
-msgstr "Dim"
+"The preview will use the Platinum look and feel which is similar to the "
+"Macintosh GUI style."
+msgstr ""
 
-#: parts/astyle/astyle_part.cpp:53
-msgid "&Reformat Source"
+#: kdevdesigner/designer/mainwindowactions.cpp:880
+msgid ""
+"The preview will use the CDE look and feel which is similar to some versions of "
+"the Common Desktop Environment."
 msgstr ""
 
-#: parts/astyle/astyle_part.cpp:55
-msgid "Reformat source"
+#: kdevdesigner/designer/mainwindowactions.cpp:882
+msgid ""
+"The preview will use the Motif look and feel which is used as the default style "
+"on SGI systems."
 msgstr ""
 
-#: parts/astyle/astyle_part.cpp:56
+#: kdevdesigner/designer/mainwindowactions.cpp:884
 msgid ""
-"<b>Reformat source</b>"
-"<p>Source reformatting functionality using <b>astyle</b> "
-"library. Also available in <b>New Class</b> and <b>Subclassing</b> wizards."
+"The preview will use the advanced Motif look and feel used by the GIMP toolkit "
+"(GTK) on Linux."
 msgstr ""
 
-#: parts/astyle/astyle_part.cpp:59 parts/astyle/astyle_part.cpp:61
-#: parts/astyle/astyle_part.cpp:410
-msgid "Format files"
+#: kdevdesigner/designer/mainwindowactions.cpp:886
+#, fuzzy
+msgid "Preview Form in %1 Style"
+msgstr "Rhagolyg&u Ffurflen"
+
+#: kdevdesigner/designer/mainwindowactions.cpp:887
+msgid "... in %1 Style"
 msgstr ""
 
-#: parts/astyle/astyle_part.cpp:62
+#: kdevdesigner/designer/mainwindowactions.cpp:888
+msgid "Opens a preview in %1 style"
+msgstr ""
+
+#: kdevdesigner/designer/mainwindowactions.cpp:889
 msgid ""
-"<b>Fomat files</b>"
-"<p>Formatting functionality using <b>astyle</b> library. Also available in <b>"
-"New Class</b> and <b>Subclassing</b> wizards."
+"<b>Open a preview in %1 style.</b>"
+"<p>Use the preview to test the design and signal-slot connections of the "
+"current form. %2</p>"
 msgstr ""
 
-#: parts/astyle/astyle_part.cpp:67 parts/astyle/astyle_part.cpp:68
-msgid "Formatting"
+#: kdevdesigner/designer/mainwindowactions.cpp:905
+msgid "Tile"
+msgstr "Teilio"
+
+#: kdevdesigner/designer/mainwindowactions.cpp:905
+msgid "&Tile"
+msgstr "&Teilio"
+
+#: kdevdesigner/designer/mainwindowactions.cpp:906
+msgid "Tiles the windows so that they are all visible"
 msgstr ""
 
-#: parts/astyle/astyle_part.cpp:402
+#: kdevdesigner/designer/mainwindowactions.cpp:909
+msgid "Cascade"
+msgstr "Rhaeadr"
+
+#: kdevdesigner/designer/mainwindowactions.cpp:909
+msgid "&Cascade"
+msgstr "&Rhaeadr"
+
+#: kdevdesigner/designer/mainwindowactions.cpp:910
+msgid "Cascades the windows so that all their title bars are visible"
+msgstr ""
+
+#: kdevdesigner/designer/mainwindowactions.cpp:914
+msgid "Cl&ose"
+msgstr "Ca&u"
+
+#: kdevdesigner/designer/mainwindowactions.cpp:915
 #, fuzzy
-msgid "Format selection"
-msgstr "G&wagu Dewisiad"
+msgid "Closes the active window"
+msgstr "Gweithredoedd d&ewisiedig:"
 
-#: parts/astyle/astyle_part.cpp:403
-msgid "<b>Format</b><p>Formats the current selection, if possible"
+#: kdevdesigner/designer/mainwindowactions.cpp:919
+msgid "Close Al&l"
+msgstr "Cau Pope&th"
+
+#: kdevdesigner/designer/mainwindowactions.cpp:920
+msgid "Closes all form windows"
 msgstr ""
 
-#: parts/astyle/astyle_part.cpp:411
-msgid "<b>Format files</b><p>Formats selected files if possible"
+#: kdevdesigner/designer/mainwindowactions.cpp:924
+msgid "Next"
+msgstr "Nesaf"
+
+#: kdevdesigner/designer/mainwindowactions.cpp:924
+msgid "Ne&xt"
+msgstr "Ne&saf"
+
+#: kdevdesigner/designer/mainwindowactions.cpp:925
+msgid "Activates the next window"
 msgstr ""
 
-#: parts/astyle/astyle_part.cpp:523
-#, c-format
-msgid "Not able to write %1"
+#: kdevdesigner/designer/mainwindowactions.cpp:929
+msgid "Previous"
+msgstr "Cynt"
+
+#: kdevdesigner/designer/mainwindowactions.cpp:929
+msgid "Pre&vious"
+msgstr "Cyn&t"
+
+#: kdevdesigner/designer/mainwindowactions.cpp:930
+msgid "Activates the previous window"
 msgstr ""
 
-#: parts/astyle/astyle_part.cpp:528
-#, c-format
-msgid "Not able to read %1"
+#: kdevdesigner/designer/mainwindowactions.cpp:953
+msgid "Vie&ws"
+msgstr "Gol&ygon"
+
+#: kdevdesigner/designer/mainwindowactions.cpp:954
+msgid "Tool&bars"
+msgstr "Barr&au Offer:"
+
+#: kdevdesigner/designer/mainwindowactions.cpp:983
+msgid "Opens the online help"
 msgstr ""
 
-#: parts/astyle/astyle_part.cpp:534
-msgid "Processed %1 files ending with extensions %2"
+#: kdevdesigner/designer/mainwindowactions.cpp:987
+msgid "&Manual"
+msgstr "&Â Llaw"
+
+#: kdevdesigner/designer/mainwindowactions.cpp:988
+msgid "Opens the TQt Designer manual"
 msgstr ""
 
-#: parts/regexptest/regexptestdlg.cpp:84
-msgid "Error compiling the regular expression."
+#: kdevdesigner/designer/mainwindowactions.cpp:993
+msgid "Displays information about TQt Designer"
 msgstr ""
 
-#: parts/regexptest/regexptestdlg.cpp:89
-#: parts/regexptest/regexptestdlg.cpp:111
-#: parts/regexptest/regexptestdlg.cpp:187
-msgid "No match"
+#: kdevdesigner/designer/mainwindowactions.cpp:997
+msgid "About TQt"
 msgstr ""
 
-#: parts/regexptest/regexptestdlg.cpp:92
-#: parts/regexptest/regexptestdlg.cpp:114
-#: parts/regexptest/regexptestdlg.cpp:191
-msgid "Successfully matched"
+#: kdevdesigner/designer/mainwindowactions.cpp:997
+msgid "About &TQt"
 msgstr ""
 
-#: parts/regexptest/regexptestdlg.cpp:107
-msgid "Compile error, your regexp is invalid"
+#: kdevdesigner/designer/mainwindowactions.cpp:998
+msgid "Displays information about the TQt Toolkit"
 msgstr ""
 
-#: parts/regexptest/regexptestdlg.cpp:134
-msgid "Repetition operators must not appear as first character"
+#: kdevdesigner/designer/mainwindowactions.cpp:1004
+#, fuzzy
+msgid "Register TQt"
+msgstr "Ail-gychwyn"
+
+#: kdevdesigner/designer/mainwindowactions.cpp:1004
+#, fuzzy
+msgid "&Register TQt..."
+msgstr "Ail-gychwyn"
+
+#: kdevdesigner/designer/mainwindowactions.cpp:1005
+msgid "Opens a web browser at the evaluation form on www.trolltech.com"
 msgstr ""
 
-#: parts/regexptest/regexptestdlg.cpp:137
-msgid "Invalid use of back reference operator"
+#: kdevdesigner/designer/mainwindowactions.cpp:1006
+msgid "Register with Trolltech"
 msgstr ""
 
-#: parts/regexptest/regexptestdlg.cpp:140
-msgid "Unmatched brace interval operators"
+#: kdevdesigner/designer/mainwindowactions.cpp:1010
+#: kdevdesigner/designer/mainwindowactions.cpp:1011
+msgid "What's This?"
+msgstr "Beth Yw Hyn?"
+
+#: kdevdesigner/designer/mainwindowactions.cpp:1012
+msgid "\"What's This?\" context sensitive help"
 msgstr ""
 
-#: parts/regexptest/regexptestdlg.cpp:143
-msgid "Unmatched bracket list operators"
+#: kdevdesigner/designer/mainwindowactions.cpp:1041
+msgid "Create a new project, form or source file..."
 msgstr ""
 
-#: parts/regexptest/regexptestdlg.cpp:146
-msgid "Invalid use of range operator"
+#: kdevdesigner/designer/mainwindowactions.cpp:1075
+#, fuzzy
+msgid "Name of File"
+msgstr "Gwaredu ffeil"
+
+#: kdevdesigner/designer/mainwindowactions.cpp:1075
+msgid "Enter the name of the new source file:"
 msgstr ""
 
-#: parts/regexptest/regexptestdlg.cpp:149
-msgid "Unknown character class"
+#: kdevdesigner/designer/mainwindowactions.cpp:1169
+msgid "Selected project '%1'"
 msgstr ""
 
-#: parts/regexptest/regexptestdlg.cpp:152
-msgid "Invalid collating element"
+#: kdevdesigner/designer/mainwindowactions.cpp:1199
+msgid "Open a file..."
+msgstr "Agor Ffeil ..."
+
+#: kdevdesigner/designer/mainwindowactions.cpp:1211
+msgid "*.ui *.pro|Designer Files"
 msgstr ""
 
-#: parts/regexptest/regexptestdlg.cpp:155
-msgid "Unmatched parenthesis group operators"
+#: kdevdesigner/designer/mainwindowactions.cpp:1214
+#, fuzzy
+msgid "*.pro|TQMAKE Project Files"
+msgstr "&Ffeil y cywaith:"
+
+#: kdevdesigner/designer/mainwindowactions.cpp:1275
+msgid "No import filter is available to import '%1'"
 msgstr ""
 
-#: parts/regexptest/regexptestdlg.cpp:158
-msgid "Invalid back reference to subexpression"
+#: kdevdesigner/designer/mainwindowactions.cpp:1279
+msgid "Importing '%1' using import filter ..."
 msgstr ""
 
-#: parts/regexptest/regexptestdlg.cpp:161
-msgid "Trailing backslash"
+#: kdevdesigner/designer/mainwindowactions.cpp:1283
+msgid "Nothing to load in '%1'"
 msgstr ""
 
-#: parts/regexptest/regexptestdlg.cpp:164
-msgid "Invalid use of pattern operators"
+#: kdevdesigner/designer/mainwindowactions.cpp:1322
+msgid "Reading file '%1'..."
 msgstr ""
 
-#: parts/regexptest/regexptestdlg.cpp:168
-msgid "Regular expression too large"
+#: kdevdesigner/designer/mainwindowactions.cpp:1341
+msgid "Loaded file '%1'"
 msgstr ""
 
-#: parts/regexptest/regexptestdlg.cpp:172
-msgid "Unknown error"
-msgstr "Gwall anhysbys"
+#: kdevdesigner/designer/mainwindowactions.cpp:1343
+#, fuzzy
+msgid "Failed to load file '%1'"
+msgstr "Ffeiliau i'w llwytho"
 
-#: parts/regexptest/regexptestpart.cpp:35
-msgid "Debug Regular Expression..."
-msgstr ""
+#: kdevdesigner/designer/mainwindowactions.cpp:1344
+#, fuzzy
+msgid "Load File"
+msgstr "Gwaredu Ffeil"
 
-#: parts/regexptest/regexptestpart.cpp:38
-msgid "Debug regular expression"
-msgstr ""
+#: kdevdesigner/designer/mainwindowactions.cpp:1344
+msgid "Could not load file '%1'."
+msgstr "Methu llwytho ffeil. '%1'"
 
-#: parts/regexptest/regexptestpart.cpp:39
+#: kdevdesigner/designer/mainwindowactions.cpp:1392
+#, fuzzy
+msgid "Project '%1' saved."
+msgstr "Enw'r cywaith"
+
+#: kdevdesigner/designer/mainwindowactions.cpp:1398
+msgid "Enter a filename..."
+msgstr "Mewnosod enw ffeil ..."
+
+#: kdevdesigner/designer/mainwindowactions.cpp:1439
+#: kdevdesigner/designer/mainwindowactions.cpp:1494
+#, fuzzy
+msgid "NewTemplate"
+msgstr "Patrymlun"
+
+#: kdevdesigner/designer/mainwindowactions.cpp:1451
+#: kdevdesigner/designer/mainwindowactions.cpp:1472
+#, fuzzy
+msgid "Could not create the template."
+msgstr "Methu creu'r ffeil newydd."
+
+#: kdevdesigner/designer/mainwindowactions.cpp:1568
+#, fuzzy
+msgid "Paste Error"
+msgstr "Gwall Mewnol"
+
+#: kdevdesigner/designer/mainwindowactions.cpp:1569
 msgid ""
-"<b>Debug regular expression</b>"
-"<p>Allows to enter a regular expression and validate it. It is possible to "
-"check syntax of basic POSIX, extended POSIX regular expressions and also syntax "
-"allowed by QRegExp and KRegExp classes."
+"Cannot paste widgets. Designer could not find a container\n"
+"to paste into which does not contain a layout. Break the layout\n"
+"of the container you want to paste into and select this container\n"
+"and then paste again."
 msgstr ""
 
-#: parts/ctags2/ctags2_part.cpp:80
-msgid ""
-"<b>CTags</b>"
-"<p>Result view for a tag lookup. Click a line to go to the corresponding place "
-"in the code."
+#: kdevdesigner/designer/mainwindowactions.cpp:1730
+msgid "Edit the current form's slots..."
 msgstr ""
 
-#: parts/ctags2/ctags2_part.cpp:81
-msgid "CTags Lookup"
+#: kdevdesigner/designer/mainwindowactions.cpp:1741
+msgid "Edit the current form's connections..."
 msgstr ""
 
-#: parts/ctags2/ctags2_part.cpp:82 parts/ctags2/ctags2_part.cpp:87
+#: kdevdesigner/designer/mainwindowactions.cpp:1841
+msgid "Edit the current form's settings..."
+msgstr ""
+
+#: kdevdesigner/designer/mainwindowactions.cpp:1870
 #, fuzzy
-msgid "CTags"
-msgstr "Baneri"
+msgid "Edit preferences..."
+msgstr "Hoffterau"
 
-#: parts/ctags2/ctags2_part.cpp:82
-msgid "CTags lookup results"
+#: kdevdesigner/designer/mainwindowactions.cpp:2038
+msgid "Edit custom widgets..."
 msgstr ""
 
-#: parts/ctags2/ctags2_part.cpp:91
-msgid "Lookup Current Text"
+#: kdevdesigner/designer/startdialogimpl.cpp:169
+msgid "Designer Files (*.ui *.pro)"
 msgstr ""
 
-#: parts/ctags2/ctags2_part.cpp:92
-msgid "Lookup Current Text as Declaration"
+#: kdevdesigner/designer/startdialogimpl.cpp:171
+msgid "QMAKE Project Files (*.pro)"
 msgstr ""
 
-#: parts/ctags2/ctags2_part.cpp:93
-msgid "Lookup Current Text as Definition"
+#: kdevdesigner/designer/startdialogimpl.cpp:177
+#, fuzzy
+msgid "All Files (*)"
+msgstr "Pob Ffeil"
+
+#: kdevdesigner/designer/listvieweditorimpl.cpp:130
+msgid "Edit the Items and Columns of '%1'"
 msgstr ""
 
-#: parts/ctags2/ctags2_part.cpp:94
-msgid "Jump to Next Match"
+#: kdevdesigner/designer/listvieweditorimpl.cpp:287
+msgid "New Column"
+msgstr "Colofn Newydd"
+
+#: kdevdesigner/designer/listvieweditorimpl.cpp:399
+msgid "Item"
+msgstr "Eitem"
+
+#: kdevdesigner/designer/listvieweditorimpl.cpp:417
+#, fuzzy
+msgid "Subitem"
+msgstr "Cyflwyno"
+
+#: kdevdesigner/designer/editfunctionsimpl.cpp:135
+msgid "Add/Remove functions of '%1'"
 msgstr ""
 
-#: parts/ctags2/ctags2_part.cpp:95
-msgid "Open Lookup Dialog"
+#: kdevdesigner/designer/editfunctionsimpl.cpp:206
+msgid "Change Function Attributes"
 msgstr ""
 
-#: parts/ctags2/ctags2_part.cpp:197
-#, c-format
-msgid "CTags - Go to Declaration: %1"
+#: kdevdesigner/designer/editfunctionsimpl.cpp:217
+msgid ""
+"Some syntactically incorrect functions have been defined.\n"
+"Remove these functions?"
 msgstr ""
 
-#: parts/ctags2/ctags2_part.cpp:200
+#: vcs/clearcase/clearcasepart.cpp:89 vcs/perforce/perforcepart.cpp:97
 #, c-format
-msgid "CTags - Go to Definition: %1"
+msgid "Actions for %1"
 msgstr ""
 
-#: parts/ctags2/ctags2_part.cpp:203
-#, c-format
-msgid "CTags - Lookup: %1"
+#: vcs/clearcase/clearcasepart.cpp:90
+msgid "Checkin"
 msgstr ""
 
-#: parts/ctags2/ctags2_widget.cpp:107
-#, c-format
-msgid "Hits: %1"
-msgstr "Trawiadau : %1"
+#: vcs/clearcase/clearcasepart.cpp:92
+msgid "Checkout"
+msgstr ""
 
-#: parts/ctags2/ctags2_widget.cpp:155
-msgid "No CTags database found"
+#: vcs/clearcase/clearcasepart.cpp:94
+msgid "Uncheckout"
 msgstr ""
 
-#: parts/ctags2/ctagskinds.cpp:29
-msgid "define"
+#: vcs/clearcase/clearcasepart.cpp:97
+msgid "Create Element"
 msgstr ""
 
-#: parts/ctags2/ctagskinds.cpp:30 parts/ctags2/ctagskinds.cpp:98
-msgid "label"
-msgstr "label"
+#: vcs/clearcase/clearcasepart.cpp:99
+msgid "Remove Element"
+msgstr ""
 
-#: parts/ctags2/ctagskinds.cpp:31 parts/ctags2/ctagskinds.cpp:60
-#: parts/ctags2/ctagskinds.cpp:127
-msgid "macro"
+#: vcs/clearcase/clearcasepart.cpp:102
+msgid "History"
+msgstr "Hanes"
+
+#: vcs/clearcase/clearcasepart.cpp:109
+msgid "List Checkouts"
 msgstr ""
 
-#: parts/ctags2/ctagskinds.cpp:38 parts/ctags2/ctagskinds.cpp:103
-#: parts/ctags2/ctagskinds.cpp:140 parts/ctags2/ctagskinds.cpp:160
-msgid "subroutine"
+#: vcs/clearcase/clearcasepart.cpp:112
+msgid "Clearcase"
 msgstr ""
 
-#: parts/ctags2/ctagskinds.cpp:50
-msgid "fragment definition"
+#: vcs/clearcase/clearcasepart.cpp:320
+msgid "Clearcase output errors during diff."
 msgstr ""
 
-#: parts/ctags2/ctagskinds.cpp:51
-msgid "any pattern"
+#: vcs/clearcase/clearcasepart.cpp:320 vcs/clearcase/clearcasepart.cpp:326
+#: vcs/cvsservice/cvspartimpl.cpp:941 vcs/cvsservice/cvspartimpl.cpp:949
+#: vcs/perforce/perforcepart.cpp:258 vcs/perforce/perforcepart.cpp:264
+msgid "Errors During Diff"
 msgstr ""
 
-#: parts/ctags2/ctagskinds.cpp:53
-msgid "pattern"
-msgstr "patrwm"
+#: vcs/clearcase/clearcasepart.cpp:325
+msgid "Clearcase outputted errors during diff. Do you still want to continue?"
+msgstr ""
 
-#: parts/ctags2/ctagskinds.cpp:59 parts/ctags2/ctagskinds.cpp:84
-#: parts/ctags2/ctagskinds.cpp:111 parts/ctags2/ctagskinds.cpp:146
-#: parts/ctags2/ctagskinds.cpp:153 parts/ctags2/ctagskinds.cpp:166
-msgid "class"
-msgstr "dosbarth"
+#: vcs/clearcase/clearcasepart.cpp:332 vcs/cvsservice/cvspartimpl.cpp:957
+#: vcs/perforce/perforcepart.cpp:270
+msgid "There is no difference to the repository."
+msgstr ""
 
-#: parts/ctags2/ctagskinds.cpp:61
-msgid "enumerator"
+#: vcs/clearcase/clearcasepart.cpp:332 vcs/cvsservice/cvspartimpl.cpp:958
+msgid "No Difference Found"
 msgstr ""
 
-#: parts/ctags2/ctagskinds.cpp:63
-msgid "enumeration"
+#: vcs/clearcase/commentdlg.cpp:26
+msgid "Clearcase Comment"
 msgstr ""
 
-#: parts/ctags2/ctagskinds.cpp:64
+#: vcs/clearcase/commentdlg.cpp:30
+msgid "Enter log message:"
+msgstr ""
+
+#: vcs/clearcase/commentdlg.cpp:41
 #, fuzzy
-msgid "local variable"
-msgstr "newidyn"
+msgid "Reserve"
+msgstr "&Adfer"
 
-#: parts/ctags2/ctagskinds.cpp:65
-msgid "member"
-msgstr ""
+#: vcs/subversion/kdevsvnd.cpp:52
+#, fuzzy
+msgid "Enter Commit Log Message:"
+msgstr "Neges"
 
-#: parts/ctags2/ctagskinds.cpp:66 parts/ctags2/ctagskinds.cpp:188
-msgid "namespace"
-msgstr ""
+#: vcs/subversion/kdevsvnd.cpp:74
+#, fuzzy
+msgid "Open SSL certificate file"
+msgstr "Agor ffeil"
 
-#: parts/ctags2/ctagskinds.cpp:67
-msgid "prototype"
+#: vcs/subversion/subversion_part.cpp:86
+msgid "Subversion Output"
 msgstr ""
 
-#: parts/ctags2/ctagskinds.cpp:68
-msgid "struct"
+#: vcs/subversion/subversion_part.cpp:87
+#: vcs/subversion/subversion_part.cpp:261
+msgid "Subversion"
 msgstr ""
 
-#: parts/ctags2/ctagskinds.cpp:69
-msgid "typedef"
+#: vcs/subversion/subversion_part.cpp:87
+msgid "Subversion messages"
 msgstr ""
 
-#: parts/ctags2/ctagskinds.cpp:70
-msgid "union"
+#: vcs/subversion/subversion_part.cpp:88
+msgid "<b>Subversion</b><p>Subversion operations window."
 msgstr ""
 
-#: parts/ctags2/ctagskinds.cpp:71 parts/ctags2/ctagskinds.cpp:105
-msgid "variable"
-msgstr "newidyn"
+#: vcs/subversion/subversion_part.cpp:101
+#, fuzzy
+msgid "&Commit to Repository..."
+msgstr "&Adfer"
 
-#: parts/ctags2/ctagskinds.cpp:72
-msgid "external variable"
+#: vcs/cvsservice/cvspart.cpp:148 vcs/subversion/subversion_part.cpp:102
+msgid "Commit file(s)"
 msgstr ""
 
-#: parts/ctags2/ctagskinds.cpp:78
-msgid "paragraph"
-msgstr "paragraff"
+#: vcs/cvsservice/cvspart.cpp:149 vcs/cvsservice/cvspart.cpp:324
+#: vcs/subversion/subversion_part.cpp:103
+#: vcs/subversion/subversion_part.cpp:223
+msgid "<b>Commit file(s)</b><p>Commits file to repository if modified."
+msgstr ""
 
-#: parts/ctags2/ctagskinds.cpp:85
-msgid "feature"
-msgstr "nodwedd"
+#: vcs/cvsservice/cvspart.cpp:166 vcs/subversion/subversion_part.cpp:110
+msgid "&Add to Repository"
+msgstr ""
 
-#: parts/ctags2/ctagskinds.cpp:86
-msgid "local entity"
+#: vcs/cvsservice/cvspart.cpp:168 vcs/subversion/subversion_part.cpp:111
+msgid "Add file to repository"
 msgstr ""
 
-#: parts/ctags2/ctagskinds.cpp:92
-msgid "block"
+#: vcs/subversion/subversion_part.cpp:112
+#: vcs/subversion/subversion_part.cpp:225
+msgid "<b>Add file to repository</b><p>Adds file to repository."
 msgstr ""
 
-#: parts/ctags2/ctagskinds.cpp:93
-msgid "common"
-msgstr "cyffredin"
+#: vcs/subversion/subversion_part.cpp:114
+msgid "Show logs..."
+msgstr ""
 
-#: parts/ctags2/ctagskinds.cpp:94
-msgid "entry"
-msgstr "cofnod"
+#: vcs/subversion/subversion_part.cpp:115
+#, fuzzy
+msgid "Blame..."
+msgstr "&Ffeil..."
 
-#: parts/ctags2/ctagskinds.cpp:96 parts/ctags2/ctagskinds.cpp:113
-msgid "interface"
-msgstr "rhyngwyneb"
+#: vcs/cvsservice/cvspart.cpp:191 vcs/subversion/subversion_part.cpp:117
+msgid "&Remove From Repository"
+msgstr ""
 
-#: parts/ctags2/ctagskinds.cpp:97
-msgid "type component"
+#: vcs/cvsservice/cvspart.cpp:193 vcs/perforce/perforcepart.cpp:83
+#: vcs/subversion/subversion_part.cpp:118
+msgid "Remove from repository"
 msgstr ""
 
-#: parts/ctags2/ctagskinds.cpp:99
-msgid "local"
-msgstr "lleol"
+#: vcs/cvsservice/cvspart.cpp:194 vcs/cvsservice/cvspart.cpp:346
+#: vcs/subversion/subversion_part.cpp:119
+#: vcs/subversion/subversion_part.cpp:227
+msgid "<b>Remove from repository</b><p>Removes file(s) from repository."
+msgstr ""
 
-#: parts/ctags2/ctagskinds.cpp:100
-msgid "module"
-msgstr "modiwl"
+#: vcs/subversion/subversion_part.cpp:122
+msgid "Update"
+msgstr "Diweddaru"
 
-#: parts/ctags2/ctagskinds.cpp:101
-msgid "namelist"
+#: vcs/subversion/subversion_part.cpp:123
+#: vcs/subversion/subversion_part.cpp:241
+msgid "<b>Update</b><p>Updates file(s) from repository."
 msgstr ""
 
-#: parts/ctags2/ctagskinds.cpp:102
-msgid "program"
-msgstr "rhaglen"
+#: vcs/subversion/subversion_part.cpp:125
+msgid "&Diff to BASE"
+msgstr ""
 
-#: parts/ctags2/ctagskinds.cpp:104
-msgid "type"
-msgstr "math"
+#: vcs/subversion/subversion_part.cpp:126
+msgid "Diff to BASE"
+msgstr ""
 
-#: parts/ctags2/ctagskinds.cpp:112
-msgid "field"
-msgstr "maes"
+#: vcs/subversion/subversion_part.cpp:127
+msgid "<b>Diff to disk</b><p>Diff current file to the BASE checked out copy."
+msgstr ""
 
-#: parts/ctags2/ctagskinds.cpp:114
-msgid "method"
-msgstr "dull"
+#: vcs/subversion/subversion_part.cpp:129
+msgid "&Diff to HEAD"
+msgstr ""
 
-#: parts/ctags2/ctagskinds.cpp:115
-msgid "package"
-msgstr "pecyn"
+#: vcs/subversion/subversion_part.cpp:130
+msgid "Diff to HEAD"
+msgstr ""
 
-#: parts/ctags2/ctagskinds.cpp:134 parts/ctags2/ctagskinds.cpp:194
-msgid "procedure"
+#: vcs/subversion/subversion_part.cpp:131
+msgid "<b>Diff HEAD</b><p>Diff the current file to HEAD in svn."
 msgstr ""
 
-#: parts/ctags2/ctagskinds.cpp:168
-msgid "mixin"
+#: vcs/subversion/subversion_part.cpp:134
+msgid "&Revert"
+msgstr "&Dychwelyd"
+
+#: vcs/perforce/perforcepart.cpp:61 vcs/perforce/perforcepart.cpp:63
+#: vcs/perforce/perforcepart.cpp:102 vcs/perforce/perforcepart.cpp:156
+#: vcs/subversion/subversion_part.cpp:135
+msgid "Revert"
+msgstr "Dychwelyd"
+
+#: vcs/subversion/subversion_part.cpp:136
+#: vcs/subversion/subversion_part.cpp:243
+msgid "<b>Revert</b><p>Undo local changes."
 msgstr ""
 
-#: parts/documentation/documentation_part.cpp:88
-msgid "Project Documentation"
+#: vcs/subversion/subversion_part.cpp:149
+#, fuzzy
+msgid "Re&solve Conflicting State"
+msgstr "Gwaredu Cysylltiad"
+
+#: vcs/subversion/subversion_part.cpp:151
+msgid "Resolve the conflicting state of a file after a merge"
 msgstr ""
 
-#: parts/documentation/documentation_part.cpp:99
+#: vcs/subversion/subversion_part.cpp:152
 msgid ""
-"<b>Documentation browser</b>"
-"<p>The documentation browser gives access to various documentation sources (Qt "
-"DCF, Doxygen, KDoc, KDevelopTOC and DevHelp documentation) and the KDevelop "
-"manuals. It also provides documentation index and full text search "
-"capabilities."
+"<b>Resolve the conflicting state</b>"
+"<p>Remove the conflict state that can be set on a file after a merge failed."
 msgstr ""
 
-#: parts/documentation/documentation_part.cpp:106
-msgid "Documentation browser"
+#: vcs/subversion/subversion_part.cpp:153
+msgid "Switch this working copy to URL.."
 msgstr ""
 
-#: parts/documentation/documentation_part.cpp:193
-msgid "Documentation Settings"
+#: vcs/subversion/subversion_part.cpp:156
+msgid "Copy this working copy to URL.."
 msgstr ""
 
-#: parts/documentation/documentation_part.cpp:212
-msgid "&Search in Documentation..."
+#: vcs/subversion/subversion_part.cpp:158
+msgid "Merge difference to working copy"
 msgstr ""
 
-#: parts/documentation/documentation_part.cpp:215
-msgid "Full text search in the documentation"
+#: vcs/subversion/subversion_part.cpp:229
+msgid "<b>Show logs..</b><p>View Logs"
 msgstr ""
 
-#: parts/documentation/documentation_part.cpp:216
-msgid ""
-"<b>Search in documentation</b>"
-"<p>Opens the Search in documentation tab. It allows a search term to be entered "
-"which will be searched for in the documentation. For this to work, a full text "
-"index must be created first, which can be done in the configuration dialog of "
-"the documentation plugin."
+#: vcs/subversion/subversion_part.cpp:231
+msgid "<b>Blame 0:HEAD </b><p>Show Annotate"
 msgstr ""
 
-#: parts/documentation/documentation_part.cpp:223
-msgid "&Look in Documentation Index..."
+#: vcs/subversion/subversion_part.cpp:235
+msgid "<b>Diff</b><p>Diff file to local disk."
 msgstr ""
 
-#: parts/documentation/documentation_part.cpp:226
-msgid "Look in the documentation index"
+#: vcs/subversion/subversion_part.cpp:238
+msgid "<b>Diff</b><p>Diff file to repository."
 msgstr ""
 
-#: parts/documentation/documentation_part.cpp:227
-#: parts/documentation/documentation_part.cpp:479
-msgid ""
-"<b>Look in documentation index</b>"
-"<p>Opens the documentation index tab. It allows a term to be entered which will "
-"be looked for in the documentation index."
+#: vcs/subversion/subversion_part.cpp:245
+msgid "<b>Resolve</b><p>Resolve conflicting state."
 msgstr ""
 
-#: parts/documentation/documentation_part.cpp:232
-msgid "Man Page..."
+#: vcs/subversion/subversion_part.cpp:247
+msgid "<b>Switch</b><p>Switch working tree."
 msgstr ""
 
-#: parts/documentation/documentation_part.cpp:235
-msgid "Show a manpage"
+#: vcs/subversion/subversion_part.cpp:249
+msgid "<b>Copy</b><p>Copy from/between path/URLs"
 msgstr ""
 
-#: parts/documentation/documentation_part.cpp:236
-msgid "<b>Show a manpage</b><p>Opens a man page using embedded viewer."
+#: vcs/subversion/subversion_part.cpp:251
+msgid "<b>Merge</b><p>Merge difference to working copy"
 msgstr ""
 
-#: parts/documentation/documentation_part.cpp:238
-msgid "Info Page..."
+#: vcs/subversion/subversion_part.cpp:304
+#: vcs/subversion/subversion_part.cpp:345
+msgid "Please select only one item for subversion switch"
 msgstr ""
 
-#: parts/documentation/documentation_part.cpp:241
-msgid "Show an infopage"
+#: vcs/subversion/subversion_part.cpp:327
+msgid "The destination URL is invalid"
 msgstr ""
 
-#: parts/documentation/documentation_part.cpp:242
-msgid "<b>Show an infopage</b><p>Opens an info page using embedded viewer."
+#: vcs/subversion/subversion_part.cpp:337
+msgid "Fail to conduct subversion switch. No action was selected"
 msgstr ""
 
-#: parts/documentation/documentation_part.cpp:244
-#, fuzzy
-msgid "Find Documentation..."
-msgstr "Dogfenniaeth"
+#: vcs/subversion/subversion_part.cpp:380
+msgid "Please select only one item for subversion merge"
+msgstr ""
 
-#: parts/documentation/documentation_part.cpp:248
-#: parts/documentation/documentation_part.cpp:470
-msgid ""
-"<b>Find documentation</b>"
-"<p>Opens the documentation finder tab and searches all possible sources of "
-"documentation like table of contents, index, man and info databases, Google, "
-"etc."
+#: vcs/subversion/subversion_part.cpp:462
+msgid "Please select only one item for subversion log"
 msgstr ""
 
-#: parts/documentation/documentation_part.cpp:318
-msgid "Show Manual Page"
+#: vcs/subversion/subversion_part.cpp:481
+msgid "Please select only one item to see annotate"
 msgstr ""
 
-#: parts/documentation/documentation_part.cpp:318
-msgid "Show manpage on:"
+#: vcs/subversion/subversion_part.cpp:486
+#, fuzzy
+msgid "Select file to see blame"
+msgstr "Agor Cywaith Diweddar"
+
+#: vcs/subversion/subversion_part.cpp:504
+#: vcs/subversion/subversion_part.cpp:514
+#, fuzzy
+msgid "Select file or directory to see diff"
+msgstr "Agor Cywaith Diweddar"
+
+#: vcs/subversion/subversion_widget.cpp:38
+#, fuzzy
+msgid "Notification"
+msgstr "Lleoliad"
+
+#: vcs/subversion/subversion_widget.cpp:63
+#, fuzzy
+msgid "Log History"
+msgstr "Hanes"
+
+#: vcs/subversion/subversion_widget.cpp:72
+#, fuzzy
+msgid "Blame"
+msgstr "&Ffeil..."
+
+#: vcs/subversion/subversion_widget.cpp:121
+msgid "Subversion Job Progress"
 msgstr ""
 
-#: parts/documentation/documentation_part.cpp:342
-msgid "Show Info Page"
+#: vcs/subversion/svn_tdeio.cpp:226
+#, c-format
+msgid "Username and Password for %1."
 msgstr ""
 
-#: parts/documentation/documentation_part.cpp:342
-msgid "Show infopage on:"
+#: vcs/subversion/svn_tdeio.cpp:1385
+msgid "Nothing to commit."
 msgstr ""
 
-#: parts/documentation/documentation_part.cpp:468
-#, c-format
-msgid "Find Documentation: %1"
+#: vcs/subversion/svn_tdeio.cpp:1387
+#, fuzzy, c-format
+msgid "Committed revision %1."
+msgstr "S&ylwad:"
+
+#: vcs/subversion/svn_tdeio.cpp:1587
+#, fuzzy, c-format
+msgid "Copied Revision %1"
+msgstr "S&ylwad:"
+
+#: vcs/subversion/svn_tdeio.cpp:1590
+#, fuzzy
+msgid "Copied"
+msgstr "Gorffenwyd"
+
+#: vcs/subversion/svn_tdeio.cpp:1698
+msgid ""
+"The certificate from the server could not be trusted automatically.  Do you "
+"want to trust this certificate? "
 msgstr ""
 
-#: parts/documentation/documentation_part.cpp:477
+#: vcs/subversion/svn_tdeio.cpp:1903
 #, c-format
-msgid "Look in Documentation Index: %1"
+msgid "A (bin) %1"
 msgstr ""
 
-#: parts/documentation/documentation_part.cpp:485
-#, c-format
-msgid "Search in Documentation: %1"
+#: vcs/subversion/svn_tdeio.cpp:1905 vcs/subversion/svn_tdeio.cpp:1938
+#, fuzzy, c-format
+msgid "A %1"
+msgstr "Ychwanegu %1"
+
+#: vcs/subversion/svn_tdeio.cpp:1908
+msgid "Copied %1 "
 msgstr ""
 
-#: parts/documentation/documentation_part.cpp:487
+#: vcs/subversion/svn_tdeio.cpp:1912 vcs/subversion/svn_tdeio.cpp:1934
+#, fuzzy, c-format
+msgid "D %1"
+msgstr "Ychwanegu %1"
+
+#: vcs/subversion/svn_tdeio.cpp:1915
+#, fuzzy, c-format
+msgid "Restored %1."
+msgstr "G&waredu"
+
+#: vcs/subversion/svn_tdeio.cpp:1918
+#, fuzzy, c-format
+msgid "Reverted %1."
+msgstr "G&waredu"
+
+#: vcs/subversion/svn_tdeio.cpp:1921
 msgid ""
-"<b>Search in documentation</b>"
-"<p>Searches for a term under the cursor in the documentation. For this to work, "
-"a full text index must be created first, which can be done in the configuration "
-"dialog of the documentation plugin."
+"Failed to revert %1.\n"
+"Try updating instead."
 msgstr ""
 
-#: parts/documentation/documentation_part.cpp:494
+#: vcs/subversion/svn_tdeio.cpp:1924
+#, fuzzy, c-format
+msgid "Resolved conflicted state of %1."
+msgstr "Gwaredu Cysylltiad"
+
+#: vcs/subversion/svn_tdeio.cpp:1928
 #, c-format
-msgid "Goto Manpage: %1"
+msgid "Skipped missing target %1."
 msgstr ""
 
-#: parts/documentation/documentation_part.cpp:496
-msgid ""
-"<b>Goto manpage</b>"
-"<p>Tries to open a man page for the term under the cursor."
+#: vcs/subversion/svn_tdeio.cpp:1930
+#, c-format
+msgid "Skipped  %1."
 msgstr ""
 
-#: parts/documentation/documentation_part.cpp:499
+#: vcs/subversion/svn_tdeio.cpp:1983
 #, c-format
-msgid "Goto Infopage: %1"
+msgid "Exported external at revision %1."
 msgstr ""
 
-#: parts/documentation/documentation_part.cpp:501
-msgid ""
-"<b>Goto infopage</b>"
-"<p>Tries to open an info page for the term under the cursor."
+#: vcs/subversion/svn_tdeio.cpp:1985
+#, c-format
+msgid "Exported revision %1."
 msgstr ""
 
-#: parts/documentation/docutils.cpp:80
-msgid "Open in Current Tab"
+#: vcs/subversion/svn_tdeio.cpp:1988
+#, c-format
+msgid "Checked out external at revision %1."
 msgstr ""
 
-#: parts/documentation/docutils.cpp:85
-msgid "Bookmark This Location"
-msgstr "Tudnodi'r Lleoliad Yma"
+#: vcs/subversion/svn_tdeio.cpp:1990
+#, c-format
+msgid "Checked out revision %1."
+msgstr ""
 
-#: parts/documentation/docconfiglistview.cpp:30
-msgid "TOC"
+#: vcs/subversion/svn_tdeio.cpp:1994
+#, c-format
+msgid "Updated external to revision %1."
 msgstr ""
 
-#: kdevdesigner/designer/mainwindow.cpp:1759
-#: kdevdesigner/designer/mainwindow.cpp:2665
-#: parts/documentation/bookmarkview.cpp:118
-#: parts/documentation/docconfiglistview.cpp:33
-#: parts/documentation/searchview.cpp:74 parts/documentation/searchview.cpp:99
-msgid "Title"
-msgstr "Teitl"
+#: vcs/subversion/svn_tdeio.cpp:1996
+#, c-format
+msgid "Updated to revision %1."
+msgstr ""
 
-#: kdevdesigner/designer/mainwindowactions.cpp:987
-#: parts/documentation/find_documentation.cpp:178
-#: parts/documentation/find_documentation_options.cpp:163
-msgid "Manual"
-msgstr "Â llaw"
+#: vcs/subversion/svn_tdeio.cpp:1999
+#, fuzzy, c-format
+msgid "External at revision %1."
+msgstr "Offer Allanol"
 
-#: parts/documentation/bookmarkview.cpp:198
-msgid "Edit Bookmark"
-msgstr ""
+#: vcs/subversion/svn_tdeio.cpp:2001
+#, fuzzy, c-format
+msgid "At revision %1."
+msgstr "Fersiwn %1"
 
-#: parts/documentation/bookmarkview.cpp:222
-msgid "Current Document"
-msgstr ""
+#: vcs/subversion/svn_tdeio.cpp:2007
+#, fuzzy
+msgid "External export complete."
+msgstr "Offer Allanol"
 
-#: parts/documentation/bookmarkview.cpp:223
-msgid "Custom..."
-msgstr "Addasu ..."
+#: vcs/subversion/svn_tdeio.cpp:2009
+msgid "Export complete."
+msgstr ""
 
-#: parts/documentation/bookmarkview.cpp:241
-msgid "Add Bookmark"
-msgstr "Ychwanegu Tudnod"
+#: vcs/subversion/svn_tdeio.cpp:2012
+msgid "External checkout complete."
+msgstr ""
 
-#: parts/documentation/find_documentation_options.cpp:168
-msgid "Info"
-msgstr "Gwybo"
+#: vcs/subversion/svn_tdeio.cpp:2014
+msgid "Checkout complete."
+msgstr ""
 
-#: parts/documentation/find_documentation_options.cpp:178
-msgid "Google"
-msgstr "Google"
+#: vcs/subversion/svn_tdeio.cpp:2017
+msgid "External update complete."
+msgstr ""
 
-#: parts/documentation/documentation_widget.cpp:59
-msgid "Finder"
+#: vcs/subversion/svn_tdeio.cpp:2019
+msgid "Update complete."
 msgstr ""
 
-#: parts/documentation/searchview.cpp:58
-msgid "Wor&ds to search:"
+#: vcs/subversion/svn_tdeio.cpp:2029
+#, c-format
+msgid "Fetching external item into %1."
 msgstr ""
 
-#: parts/documentation/searchview.cpp:63
-msgid "Se&arch"
-msgstr "Ch&wilio"
+#: vcs/subversion/svn_tdeio.cpp:2033
+#, c-format
+msgid "Status against revision: %1."
+msgstr ""
 
-#: parts/documentation/searchview.cpp:69
-msgid "and"
-msgstr "a"
+#: vcs/subversion/svn_tdeio.cpp:2036
+#, c-format
+msgid "Performing status on external item at %1."
+msgstr ""
 
-#: parts/documentation/searchview.cpp:70
-msgid "or"
-msgstr "neu"
+#: vcs/subversion/svn_tdeio.cpp:2039
+#, fuzzy, c-format
+msgid "Sending %1"
+msgstr "llwytho : %1"
 
-#: parts/documentation/searchview.cpp:71
-msgid "&Method:"
-msgstr "&Dull:"
+#: vcs/subversion/svn_tdeio.cpp:2043
+#, fuzzy, c-format
+msgid "Adding (bin) %1."
+msgstr "&Ychwanegu Ffeil..."
 
-#: parts/documentation/searchview.cpp:73
-msgid "Score"
-msgstr "Sgôr"
+#: vcs/subversion/svn_tdeio.cpp:2045
+#, fuzzy, c-format
+msgid "Adding %1."
+msgstr "Ychwanegu %1"
 
-#: parts/documentation/searchview.cpp:76
-msgid "S&ort by:"
+#: vcs/subversion/svn_tdeio.cpp:2049
+#, c-format
+msgid "Deleting %1."
 msgstr ""
 
-#: parts/documentation/searchview.cpp:84
-msgid "Search &results:"
+#: vcs/subversion/svn_tdeio.cpp:2052
+#, c-format
+msgid "Replacing %1."
 msgstr ""
 
-#: parts/documentation/searchview.cpp:89
-msgid "Update Config"
+#: vcs/subversion/svn_tdeio.cpp:2057
+msgid "Transmitting file data "
 msgstr ""
 
-#: parts/documentation/searchview.cpp:90
-msgid "Update Index"
+#: vcs/subversion/svn_tdeio.cpp:2065
+#, c-format
+msgid "Blame %1."
 msgstr ""
 
-#: parts/documentation/searchview.cpp:98
-msgid "Relevance"
+#: vcs/subversion/kdevsvnd_widgets.cpp:27
+msgid "Accept Permanently"
 msgstr ""
 
-#: parts/documentation/searchview.cpp:148
-msgid "Full text search has to be set up before usage."
+#: vcs/subversion/kdevsvnd_widgets.cpp:28
+msgid "Accept Temporarily"
 msgstr ""
 
-#: parts/documentation/searchview.cpp:151
-msgid ""
-"Now the full text search database will be created.\n"
-"Wait for database creation to finish and then repeat search."
-msgstr ""
+#: vcs/subversion/kdevsvnd_widgets.cpp:29
+#, fuzzy
+msgid "Reject"
+msgstr "Ailosod"
 
-#: parts/documentation/searchview.cpp:158
-msgid ""
-"Cannot find the htsearch executable.\n"
-"It is part of the ht://Dig package that is used by KDevelop to perform full "
-"text search. Please install ht://Dig and use Documentation page in Configure "
-"KDevelop dialog to set the htsearch location."
+#: vcs/subversion/kdevsvnd_widgets.cpp:40
+#, fuzzy
+msgid "Hostname"
+msgstr "&Enw Gwesteiwr:"
+
+#: vcs/subversion/kdevsvnd_widgets.cpp:41
+msgid "FingerPrint"
 msgstr ""
 
-#: parts/documentation/searchview.cpp:174
-msgid "Cannot find the htdig configuration file."
+#: vcs/subversion/kdevsvnd_widgets.cpp:42
+msgid "Valid From"
 msgstr ""
 
-#: parts/documentation/searchview.cpp:207
-msgid "Cannot start the htsearch executable."
+#: vcs/subversion/kdevsvnd_widgets.cpp:43
+msgid "Valid Until"
 msgstr ""
 
-#: parts/documentation/indexview.cpp:48
-msgid "&Look for:"
-msgstr "&Edrych am:"
+#: vcs/subversion/kdevsvnd_widgets.cpp:44
+#, fuzzy
+msgid "Issuer"
+msgstr "Defnyddiwr"
 
-#: parts/documentation/tools/htdig/htdigindex.cpp:43
-msgid "Generating Search Index"
+#: vcs/subversion/kdevsvnd_widgets.cpp:45
+#, fuzzy
+msgid "Cert"
+msgstr "Dychwelyd"
+
+#: vcs/subversion/subversion_fileinfo.cpp:160
+msgid "Subversion File/Directory Status"
 msgstr ""
 
-#: parts/documentation/tools/htdig/htdigindex.cpp:63
-msgid "Scanning for files"
-msgstr "Syllu am Ffeiliau"
+#: vcs/subversion/svn_blamewidget.cpp:36
+#: vcs/subversion/svn_logviewwidget.cpp:51
+#, fuzzy
+msgid "Rev"
+msgstr "Coch"
 
-#: parts/documentation/tools/htdig/htdigindex.cpp:73
-msgid "Extracting search terms"
-msgstr "All-dynnu termau'r chwiliad"
+#: vcs/subversion/svn_blamewidget.cpp:39
+#, fuzzy
+msgid "Content"
+msgstr "Cy&nnwys"
 
-#: parts/documentation/tools/htdig/htdigindex.cpp:82
-msgid "Generating index..."
-msgstr "Creu mynegai..."
+#: vcs/subversion/svn_blamewidget.cpp:91
+#, fuzzy
+msgid "Select one file to view annotation"
+msgstr "Agor Cywaith Diweddar"
 
-#: parts/documentation/tools/htdig/htdigindex.cpp:125
-#, c-format
-msgid "Files processed: %1"
-msgstr "Ffeiliau a gafodd eu prosesu: %1"
+#: vcs/subversion/svn_blamewidget.cpp:95
+#, fuzzy
+msgid "files"
+msgstr "Agor Ffeiliau"
 
-#: parts/documentation/tools/htdig/htdigindex.cpp:350
-msgid "Running htdig failed"
+#: vcs/subversion/svn_blamewidget.cpp:129
+msgid "Select file from list to view annotation"
 msgstr ""
 
-#: parts/documentation/tools/htdig/htdigindex.cpp:411
-msgid "Running htmerge failed"
+#: vcs/subversion/svn_logviewwidget.cpp:131
+#, fuzzy
+msgid "Blame this revision"
+msgstr "Dechrau chwilio"
+
+#: vcs/subversion/svn_logviewwidget.cpp:132
+msgid "Difference to previous revision"
 msgstr ""
 
-#: parts/documentation/tools/htdig/htdigindex.cpp:448
-msgid "Update user's htdig configuration file only"
+#: vcs/subversion/svn_logviewwidget.cpp:138
+#: vcs/subversion/svn_logviewwidget.cpp:181
+msgid "No revision was clicked"
 msgstr ""
 
-#: parts/documentation/tools/htdig/htdigindex.cpp:449
-msgid "-c and generate index"
+#: vcs/subversion/svn_logviewwidget.cpp:138
+#: vcs/subversion/svn_logviewwidget.cpp:181
+#, fuzzy
+msgid "error"
+msgstr "Gwallau"
+
+#: vcs/subversion/subversion_core.cpp:146
+#, fuzzy
+msgid "Subversion Update"
+msgstr "Fersiwn %1"
+
+#: vcs/subversion/subversion_core.cpp:222
+msgid "the local disk checked out copy."
 msgstr ""
 
-#: parts/documentation/tools/htdig/htdigindex.cpp:453
-msgid "KDevelop ht://Dig Indexer"
+#: vcs/subversion/subversion_core.cpp:224
+msgid "the current svn HEAD version."
 msgstr ""
 
-#: parts/documentation/tools/htdig/htdigindex.cpp:454
-msgid "TDE Index generator for documentation files."
+#: vcs/subversion/subversion_core.cpp:226
+#, c-format
+msgid "No differences between the file and %1"
 msgstr ""
 
-#: parts/documentation/tools/htdig/htdigindex.cpp:470
+#: vcs/subversion/subversion_core.cpp:226
+msgid "No difference"
+msgstr ""
+
+#: vcs/subversion/subversion_core.cpp:266
+#: vcs/subversion/subversion_core.cpp:268
 #, fuzzy
-msgid "Configuration file updated."
-msgstr "Ffurfwedd :"
+msgid "Commit to remote repository"
+msgstr "&Adfer"
 
-#: parts/documentation/tools/htdig/htdigindex.cpp:472
-msgid "Configuration file update failed."
+#: vcs/subversion/subversion_core.cpp:268
+msgid "From working copy"
 msgstr ""
 
-#: parts/documentation/plugins/qt/docqtplugin.cpp:195
-msgid "Qt Documentation Collection"
+#: vcs/subversion/subversion_core.cpp:320
+msgid "Subversion Blame"
 msgstr ""
 
-#: parts/documentation/plugins/chm/docchmplugin.cpp:75
-msgid "CHM Documentation Collection"
+#: vcs/subversion/subversion_core.cpp:509
+#: vcs/subversion/subversion_core.cpp:538
+#: vcs/subversion/subversion_core.cpp:598
+#: vcs/subversion/subversion_core.cpp:668
+msgid ""
+"If you have just have installed a new version of TDevelop, and the error "
+"message was 'unknown protocol kdevsvn+*', try restarting TDE."
 msgstr ""
 
-#: parts/documentation/plugins/pdb/docpdbplugin.cpp:30
-msgid "PalmDoc documentation plugin"
+#: vcs/subversion/subversion_core.cpp:703
+msgid ""
+"You do not have kompare installed. We recommend you install kompare to view "
+"differences graphically."
 msgstr ""
 
-#: parts/documentation/plugins/pdb/docpdbplugin.cpp:52
-msgid "PalmDoc Documentation Collection"
+#: vcs/subversion/subversion_core.cpp:715
+msgid "No subversion differences"
 msgstr ""
 
-#: parts/documentation/plugins/pdf/docpdfplugin.cpp:30
-msgid "PDF documentation plugin"
-msgstr ""
+#: vcs/subversion/svn_fileselectdlg_commit.cpp:41
+#, fuzzy
+msgid "Select Files to Commit"
+msgstr "Ffeiliau i'w llwytho"
 
-#: parts/documentation/plugins/pdf/docpdfplugin.cpp:52
-msgid "PDF Documentation Collection"
+#: vcs/subversion/svn_fileselectdlg_commit.cpp:43
+#, fuzzy
+msgid "select"
+msgstr "&Detholi"
+
+#: vcs/subversion/svn_fileselectdlg_commit.cpp:44
+#, fuzzy
+msgid "status"
+msgstr "Cyflwr"
+
+#: vcs/subversion/svn_fileselectdlg_commit.cpp:45
+msgid "URL to commit"
 msgstr ""
 
-#: parts/documentation/plugins/djvu/docdjvuplugin.cpp:30
-msgid "Djvu documentation plugin"
+#: vcs/subversion/svn_fileselectdlg_commit.cpp:119
+msgid "No added/modified/deleted file(s) to commit"
 msgstr ""
 
-#: parts/documentation/plugins/djvu/docdjvuplugin.cpp:52
-msgid "Djvu Documentation Collection"
+#: vcs/subversion/integrator/svnintegratordlg.cpp:73
+msgid "Unable to create project directories on repository"
 msgstr ""
 
-#: parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp:80
-msgid "KDevelopTOC Documentation Collection"
+#: vcs/subversion/integrator/svnintegratordlg.cpp:84
+#, fuzzy
+msgid "Unable to import into repository."
+msgstr "&Adfer"
+
+#: vcs/subversion/integrator/svnintegratordlg.cpp:106
+#, fuzzy
+msgid "Unable to checkout from repository."
+msgstr "&Adfer"
+
+#: vcs/perforce/commitdlg.cpp:32
+msgid "Perforce Submit"
 msgstr ""
 
-#: parts/documentation/plugins/devhelp/docdevhelpplugin.cpp:120
-msgid "Devhelp Documentation Collection"
+#: vcs/perforce/commitdlg.cpp:42
+msgid "&Enter description:"
 msgstr ""
 
-#: parts/documentation/plugins/doxygen/docdoxygenplugin.cpp:126
-msgid "Doxygen Documentation Collection"
+#: vcs/perforce/commitdlg.cpp:54
+msgid "C&lient:"
+msgstr "D&ibynnydd:"
+
+#: vcs/perforce/commitdlg.cpp:58
+msgid "&User:"
+msgstr "&Defnyddiwr:"
+
+#: vcs/perforce/commitdlg.cpp:62
+msgid "&File(s):"
 msgstr ""
 
-#: parts/documentation/plugins/doxygen/docdoxygenplugin.cpp:453
-msgid "%1 Class Reference"
+#: vcs/perforce/commitdlg.cpp:147
+msgid "Please enter the P4 client name."
 msgstr ""
 
-#: parts/documentation/plugins/doxygen/docdoxygenplugin.cpp:470
-msgid "%1::%2%3 Member Reference"
+#: vcs/perforce/commitdlg.cpp:151
+msgid "Please enter the P4 user."
 msgstr ""
 
-#: parts/documentation/plugins/custom/doccustomplugin.cpp:55
-msgid "Custom Documentation Collection"
+#: vcs/perforce/commitdlg.cpp:155
+msgid "The changelist does not contain any files."
 msgstr ""
 
-#: parts/documentation/protocols/chm/kchmpart.cpp:62
-msgid "KChm"
+#: vcs/perforce/perforcepart.cpp:60 vcs/perforce/perforcepart.cpp:101
+msgid "<b>Edit</b><p>Opens file(s) in a client workspace for edit."
 msgstr ""
 
-#: parts/filter/shellfilterdlg.cpp:122 parts/filter/shellinsertdlg.cpp:119
-#, c-format
-msgid "Process exited with status %1"
+#: vcs/perforce/perforcepart.cpp:64 vcs/perforce/perforcepart.cpp:104
+msgid "<b>Revert</b><p>Discards changes made to open files."
 msgstr ""
 
-#: parts/filter/filterpart.cpp:40
-msgid "Execute Command..."
+#: vcs/perforce/perforcepart.cpp:65 vcs/perforce/perforcepart.cpp:67
+#: vcs/perforce/perforcepart.cpp:105
+msgid "Submit"
+msgstr "Cyflwyno"
+
+#: vcs/perforce/perforcepart.cpp:68 vcs/perforce/perforcepart.cpp:107
+msgid "<b>Submit</b><p>Sends changes made to open files to the depot."
 msgstr ""
 
-#: parts/filter/filterpart.cpp:43
-msgid "Execute shell command"
-msgstr "Gweithredu Gorchymyn Plisgyn"
+#: vcs/perforce/perforcepart.cpp:69 vcs/perforce/perforcepart.cpp:71
+#: vcs/perforce/perforcepart.cpp:108
+msgid "Sync"
+msgstr "Cydweddu"
 
-#: parts/filter/filterpart.cpp:44
-msgid ""
-"<b>Execute shell command</b>"
-"<p>Executes a shell command and outputs its result into the current document."
+#: vcs/perforce/perforcepart.cpp:72 vcs/perforce/perforcepart.cpp:110
+msgid "<b>Sync</b><p>Copies files from the depot into the workspace."
 msgstr ""
 
-#: parts/filter/filterpart.cpp:46
-msgid "Filter Selection Through Command..."
+#: vcs/perforce/perforcepart.cpp:73 vcs/perforce/perforcepart.cpp:112
+msgid "Diff Against Repository"
 msgstr ""
 
-#: parts/filter/filterpart.cpp:49
-msgid "Filter selection through a shell command"
+#: vcs/perforce/perforcepart.cpp:75
+msgid "Diff against repository"
 msgstr ""
 
-#: parts/filter/filterpart.cpp:50
+#: vcs/perforce/perforcepart.cpp:76 vcs/perforce/perforcepart.cpp:114
 msgid ""
-"<b>Filter selection through shell command</b>"
-"<p>Filters selection through a shell command and outputs its result into the "
-"current document."
+"<b>Diff against repository</b>"
+"<p>Compares a client workspace file to a revision in the depot."
 msgstr ""
 
-#: parts/filter/filterpart.cpp:96
-msgid "Execute Command"
+#: vcs/perforce/perforcepart.cpp:77 vcs/perforce/perforcepart.cpp:115
+msgid "Add to Repository"
 msgstr ""
 
-#: parts/filter/filterpart.cpp:142
-msgid "Filter Selection Through Command"
+#: vcs/perforce/perforcepart.cpp:79
+msgid "Add to repository"
 msgstr ""
 
-#: parts/outputviews/appoutputviewpart.cpp:45
-msgid "Application Output"
+#: vcs/perforce/perforcepart.cpp:80 vcs/perforce/perforcepart.cpp:117
+msgid ""
+"<b>Add to repository</b>"
+"<p>Open file(s) in a client workspace for addition to the depot."
 msgstr ""
 
-#: parts/outputviews/appoutputviewpart.cpp:46
-msgid ""
-"<b>Application output</b>"
-"<p>The stdout/stderr output window is a replacement for terminal-based "
-"application communication. Running terminal applications use this instead of a "
-"terminal window."
+#: vcs/perforce/perforcepart.cpp:81 vcs/perforce/perforcepart.cpp:118
+msgid "Remove From Repository"
 msgstr ""
 
-#: parts/outputviews/appoutputviewpart.cpp:51
-msgid "Output of the executed user program"
+#: vcs/perforce/perforcepart.cpp:84 vcs/perforce/perforcepart.cpp:120
+msgid ""
+"<b>Remove from repository</b>"
+"<p>Open file(s) in a client workspace for deletion from the depot."
 msgstr ""
 
-#: parts/outputviews/appoutputviewpart.cpp:108
-msgid "Press Enter to continue!"
+#: vcs/perforce/perforcepart.cpp:121
+msgid "Perforce"
 msgstr ""
 
-#: parts/outputviews/makeviewpart.cpp:44
-#: parts/outputviews/outputviewsfactory.cpp:14
-msgid "Messages Output"
+#: vcs/perforce/perforcepart.cpp:132
+msgid "Cannot handle directories, please select single files"
 msgstr ""
 
-#: parts/outputviews/appoutputwidget.cpp:82
-#, c-format
-msgid "Assertion failed: %1"
+#: vcs/perforce/perforcepart.cpp:155
+msgid "Do you really want to revert the file %1 and lose all your changes?"
 msgstr ""
 
-#: parts/outputviews/appoutputwidget.cpp:254
+#: vcs/perforce/perforcepart.cpp:156
 #, fuzzy
-msgid "Clear output"
-msgstr "Crynhoydd"
+msgid "Do Not Revert"
+msgstr "Dychwelyd"
 
-#: parts/outputviews/appoutputwidget.cpp:257
-msgid "Copy selected lines"
+#: vcs/perforce/perforcepart.cpp:168
+msgid "Submitting of subdirectories is not supported"
 msgstr ""
 
-#: parts/outputviews/appoutputwidget.cpp:260
-msgid "Save unfiltered"
+#: vcs/perforce/perforcepart.cpp:258
+msgid "P4 output errors during diff."
 msgstr ""
 
-#: parts/outputviews/appoutputwidget.cpp:261
-msgid "Save filtered output"
+#: vcs/perforce/perforcepart.cpp:263
+msgid "P4 output errors during diff. Do you still want to continue?"
 msgstr ""
 
-#: parts/outputviews/appoutputwidget.cpp:268
-#, fuzzy
-msgid "Edit filter"
-msgstr "newidyn"
+#: vcs/perforce/perforcepart.cpp:270
+msgid "No Differences Found"
+msgstr ""
 
-#: parts/outputviews/makeitem.cpp:128
-msgid "*** Compilation aborted ***"
+#: vcs/cvsservice/cvslogpage.cpp:116 vcs/cvsservice/editorsdialog.cpp:64
+#, c-format
+msgid "Log failed with exitStatus == %1"
 msgstr ""
 
-#: parts/outputviews/makeitem.cpp:133
-msgid "*** Success ***"
+#: vcs/cvsservice/cvslogpage.cpp:116 vcs/cvsservice/editorsdialog.cpp:64
+msgid "Log Failed"
 msgstr ""
 
-#: parts/outputviews/makeitem.cpp:146
-#, c-format
-msgid "Entering directory %1"
+#: vcs/cvsservice/editorsdialog.cpp:87 vcs/cvsservice/editorsdialog.cpp:100
+msgid "User"
+msgstr "Defnyddiwr"
+
+#: vcs/cvsservice/editorsdialog.cpp:109
+msgid "No files from your query are marked as being edited."
 msgstr ""
 
-#: parts/outputviews/makeitem.cpp:153
-#, c-format
-msgid "Leaving directory %1"
+#: vcs/cvsservice/cvslogpage.cpp:180
+msgid "invalid link clicked"
 msgstr ""
 
-#: parts/outputviews/makeviewpart.cpp:45
+#: vcs/cvsservice/commitdlg.cpp:67
 msgid ""
-"<b>Messages output</b>"
-"<p>The messages window shows the output of the compiler and used build tools "
-"like make, ant, uic, dcopidl etc. For compiler error messages, click on the "
-"error message. This will automatically open the source file and set the cursor "
-"to the line that caused the compiler error/warning."
+"You are committing your changes without any comment. This is not a good "
+"practice. Continue anyway?"
 msgstr ""
 
-#: parts/outputviews/makeviewpart.cpp:52
-msgid "Compiler output messages"
+#: vcs/cvsservice/commitdlg.cpp:68
+msgid "CVS Commit Warning"
 msgstr ""
 
-#: parts/outputviews/makeviewpart.cpp:55
-msgid "&Next Error"
-msgstr "&Gwall Nesaf"
+#: vcs/cvsservice/commitdlg.cpp:70
+msgid "askWhenCommittingEmptyLogs"
+msgstr ""
 
-#: parts/outputviews/makeviewpart.cpp:57
-msgid "Go to the next error"
+#: vcs/cvsservice/cvslogdialog.cpp:36
+msgid "CVS Log & Diff Dialog"
 msgstr ""
 
-#: parts/outputviews/makeviewpart.cpp:58
-msgid ""
-"<b>Next error</b>"
-"<p>Switches to the file and line where the next error was reported from."
+#: vcs/cvsservice/cvslogdialog.cpp:42
+msgid "Log From CVS"
 msgstr ""
 
-#: parts/outputviews/makeviewpart.cpp:59
-msgid "&Previous Error"
-msgstr "&Gwall Blaenorol"
+#: vcs/cvsservice/cvslogdialog.cpp:82
+msgid "Diff between %1 and %2"
+msgstr ""
 
-#: parts/outputviews/makeviewpart.cpp:61
-msgid "Go to the previous error"
+#: vcs/cvsservice/cvsdiffpage.cpp:68
+msgid "Error: passed revisions are empty!"
 msgstr ""
 
-#: parts/outputviews/makeviewpart.cpp:62
-msgid ""
-"<b>Previous error</b>"
-"<p>Switches to the file and line where the previous error was reported from."
+#: vcs/cvsservice/cvsdiffpage.cpp:68 vcs/cvsservice/cvsdiffpage.cpp:101
+#: vcs/cvsservice/cvspartimpl.cpp:654
+msgid "Error During Diff"
 msgstr ""
 
-#: parts/outputviews/makeactionfilter.cpp:75
-#: parts/outputviews/makeactionfilter.cpp:76
-#: parts/outputviews/makeactionfilter.cpp:77
-#: parts/outputviews/makeactionfilter.cpp:96
-#: parts/outputviews/makeactionfilter.cpp:211
-msgid "compiling"
+#: vcs/cvsservice/cvsdiffpage.cpp:101
+msgid "An error occurred during diffing."
 msgstr ""
 
-#: parts/outputviews/makeactionfilter.cpp:79
-msgid "built"
+#: vcs/cvsservice/cvsprocesswidget.cpp:145
+#, c-format
+msgid "Started job: %1"
 msgstr ""
 
-#: parts/outputviews/makeactionfilter.cpp:80
-#: parts/outputviews/makeactionfilter.cpp:83
-#: parts/outputviews/makeactionfilter.cpp:84
-#: parts/outputviews/makeactionfilter.cpp:95
-msgid "generating"
+#: vcs/cvsservice/cvsprocesswidget.cpp:167
+msgid "*** Job canceled by user request ***"
 msgstr ""
 
-#: parts/outputviews/makeactionfilter.cpp:86
-#: parts/outputviews/makeactionfilter.cpp:88
-#: parts/outputviews/makeactionfilter.cpp:89
-#: parts/outputviews/makeactionfilter.cpp:90
-#: parts/outputviews/makeactionfilter.cpp:91
-msgid "linking"
+#: vcs/cvsservice/cvsprocesswidget.cpp:189
+#, c-format
+msgid "Job finished with exitCode == %1"
 msgstr ""
 
-#: parts/outputviews/makeactionfilter.cpp:93
-msgid "creating"
-msgstr "creu"
+#: vcs/cvsservice/cvsprocesswidget.cpp:193
+msgid "Done CVS command ..."
+msgstr ""
 
-#: parts/outputviews/makeactionfilter.cpp:94
-#: parts/outputviews/makeactionfilter.cpp:97
-msgid "installing"
-msgstr "gosod"
+#: vcs/cvsservice/annotatedialog.cpp:27
+#, fuzzy
+msgid "CVS Annotate Dialog"
+msgstr "Cysylltiad"
 
-#: parts/outputviews/makewidget.cpp:573
-msgid "The process has finished with errors"
-msgstr ""
+#: vcs/cvsservice/annotatedialog.cpp:33 vcs/cvsservice/annotatedialog.cpp:60
+#, fuzzy
+msgid "Annotate"
+msgstr "Lleoliad"
 
-#: parts/outputviews/makewidget.cpp:578
-msgid "The process has finished successfully"
+#: vcs/cvsservice/annotatepage.cpp:109
+#, c-format
+msgid "Annotate failed with exitStatus == %1"
 msgstr ""
 
-#: parts/outputviews/makewidget.cpp:705
-msgid "Line Wrapping"
+#: vcs/cvsservice/annotatepage.cpp:109
+#, fuzzy
+msgid "Annotate Failed"
+msgstr "Lleoliad"
+
+#: vcs/cvsservice/annotatepage.cpp:211
+msgid "The selected revision does not exist."
 msgstr ""
 
-#: parts/outputviews/makewidget.cpp:707
+#: vcs/cvsservice/cvspartimpl.cpp:127
 msgid ""
-"<b>Line wrapping</b>"
-"<p>Enables or disables wrapping of command lines displayed."
+"Open a project first.\n"
+"Operation will be aborted."
 msgstr ""
 
-#: parts/outputviews/makewidget.cpp:710
-msgid "Very Short Compiler Output"
+#: vcs/cvsservice/cvspartimpl.cpp:134
+msgid ""
+"Another CVS operation is executing: do you want to cancel it \n"
+"and start this new one?"
 msgstr ""
 
-#: parts/outputviews/makewidget.cpp:711
-msgid ""
-"<b>Very short compiler output</b>"
-"<p>Displays only warnings, errors and the file names which are compiled."
+#: vcs/cvsservice/cvspartimpl.cpp:136
+msgid "CVS: Operation Already Pending "
 msgstr ""
 
-#: parts/outputviews/makewidget.cpp:713
-msgid "Short Compiler Output"
+#: vcs/cvsservice/cvspartimpl.cpp:151
+msgid "None of the file(s) you selected seem to be valid for repository."
 msgstr ""
 
-#: parts/outputviews/makewidget.cpp:714
-msgid ""
-"<b>Short compiler output</b>"
-"<p>Suppresses all the compiler flags and formats to something readable."
+#: vcs/cvsservice/cvspartimpl.cpp:370
+msgid "Unable to checkout"
 msgstr ""
 
-#: parts/outputviews/makewidget.cpp:716
-msgid "Full Compiler Output"
+#: vcs/cvsservice/cvspartimpl.cpp:519
+msgid "Do you really want to unedit the selected files?"
 msgstr ""
 
-#: parts/outputviews/makewidget.cpp:717
-msgid "<b>Full compiler output</b><p>Displays unmodified compiler output."
+#: vcs/cvsservice/cvspartimpl.cpp:520
+#, fuzzy
+msgid "CVS - Unedit Files"
+msgstr "Canfod mewn Ffeiliau"
+
+#: vcs/cvsservice/cvspartimpl.cpp:521
+#, fuzzy
+msgid "Unedit"
+msgstr "Datosod"
+
+#: vcs/cvsservice/cvspartimpl.cpp:522
+msgid "Do Not Unedit"
 msgstr ""
 
-#: parts/outputviews/makewidget.cpp:721
-msgid "Show Directory Navigation Messages"
+#: vcs/cvsservice/cvspartimpl.cpp:653
+msgid "Sorry, cannot diff."
 msgstr ""
 
-#: parts/outputviews/makewidget.cpp:722
-msgid ""
-"<b>Show directory navigation messages</b>"
-"<p>Shows <b>cd</b> commands that are executed while building."
+#: vcs/cvsservice/cvspartimpl.cpp:674
+msgid "Creating Tag/Branch for files ..."
 msgstr ""
 
-#: parts/texttools/texttoolspart.cpp:61 parts/texttools/texttoolspart.cpp:64
-#: parts/texttools/texttoolswidget.cpp:157
-msgid "Text Structure"
+#: vcs/cvsservice/cvspartimpl.cpp:698
+msgid "Removing Tag from files ..."
 msgstr ""
 
-#: parts/texttools/texttoolspart.cpp:62
-msgid "<b>Text Structure</b><p>This browser shows the structure of the text."
+#: vcs/cvsservice/cvspartimpl.cpp:791
+#: vcs/cvsservice/integrator/integratordlg.cpp:101
+msgid ""
+"Unable to find the Cervisia KPart. \n"
+"Cervisia Integration will not be available. Please check your\n"
+"Cervisia installation and re-try. Reason was:\n"
 msgstr ""
 
-#: parts/texttools/texttoolspart.cpp:64
-msgid "Text structure"
+#: vcs/cvsservice/cvspartimpl.cpp:839
+msgid "Do you want the files to be added to CVS repository too?"
 msgstr ""
 
-#: parts/openwith/openwithpart.cpp:48
-msgid "Open as UTF-8"
+#: vcs/cvsservice/cvspartimpl.cpp:840
+msgid "CVS - New Files Added to Project"
 msgstr ""
 
-#: parts/openwith/openwithpart.cpp:52
-#, fuzzy
-msgid "Open As"
-msgstr "Agor Ffeiliau"
+#: vcs/cvsservice/cvspartimpl.cpp:842
+msgid "Do Not Add"
+msgstr "Na Ychwaneger"
 
-#: parts/openwith/openwithpart.cpp:53
-msgid ""
-"<b>Open As</b>"
-"<p>Lists all encodings that can be used to open the selected file."
+#: vcs/cvsservice/cvspartimpl.cpp:843
+msgid "askWhenAddingNewFiles"
 msgstr ""
 
-#: parts/openwith/openwithpart.cpp:82
-msgid "Open With"
-msgstr "Agor Efo"
-
-#: parts/openwith/openwithpart.cpp:83
+#: vcs/cvsservice/cvspartimpl.cpp:865
 msgid ""
-"<b>Open With</b>"
-"<p>Lists all applications that can be used to open the selected file."
+"Do you want them to be removed from CVS repository too?\n"
+"Warning: They will be removed from disk too."
 msgstr ""
 
-#: parts/openwith/openwithpart.cpp:88
-msgid "Open With..."
-msgstr "Agor Gyda..."
+#: vcs/cvsservice/cvspartimpl.cpp:866
+msgid "CVS - Files Removed From Project"
+msgstr ""
 
-#: parts/openwith/openwithpart.cpp:89
-msgid ""
-"<b>Open With...</b>"
-"<p>Provides a dialog to choose the application to open the selected file."
+#: vcs/cvsservice/cvspartimpl.cpp:868
+msgid "askWhenRemovingFiles"
 msgstr ""
 
-#: parts/classview/hierarchydlg.cpp:52
-#, fuzzy
-msgid "Refresh"
-msgstr "&Adfer"
+#: vcs/cvsservice/cvspartimpl.cpp:934
+msgid "Operation aborted (process killed)."
+msgstr "Terfynnwyd y gwithrediad (lladdwyd y proses). "
 
-#: parts/classview/classtooldlg.cpp:45
-msgid "Show parents"
+#: vcs/cvsservice/cvspartimpl.cpp:935
+msgid "CVS Diff"
 msgstr ""
 
-#: parts/classview/classtooldlg.cpp:51
-msgid "Show children"
+#: vcs/cvsservice/cvspartimpl.cpp:940
+msgid "CVS outputted errors during diff."
 msgstr ""
 
-#: parts/classview/classtooldlg.cpp:57
-msgid "Show clients"
+#: vcs/cvsservice/cvspartimpl.cpp:948
+msgid "CVS output errors during diff. Do you still want to continue?"
 msgstr ""
 
-#: parts/classview/classtooldlg.cpp:63
-msgid "Show suppliers"
+#: vcs/cvsservice/cvsoptions.cpp:286
+msgid "Error while guessing repository location."
 msgstr ""
 
-#: parts/classview/classtooldlg.cpp:69
-msgid "Show methods"
+#: vcs/cvsservice/checkoutdialog.cpp:73
+msgid "CVS Checkout"
 msgstr ""
 
-#: parts/classview/classtooldlg.cpp:75
-msgid "Show attributes"
-msgstr "Dangos nodweddion"
+#: vcs/cvsservice/checkoutdialog.cpp:263
+msgid "Please, choose a valid working directory"
+msgstr ""
 
-#: parts/classview/classtooldlg.cpp:80 parts/classview/classtooldlg.cpp:223
-msgid ""
-"_: member access\n"
-"All"
-msgstr "Popeth"
+#: vcs/cvsservice/checkoutdialog.cpp:265
+msgid "Please, choose a CVS server."
+msgstr ""
 
-#: parts/classview/classtooldlg.cpp:81 parts/classview/classtooldlg.cpp:225
-msgid ""
-"_: member access\n"
-"Public"
-msgstr "Cyhoeddus"
+#: vcs/cvsservice/checkoutdialog.cpp:267
+msgid "Please, fill the CVS module field."
+msgstr ""
 
-#: parts/classview/classtooldlg.cpp:82 parts/classview/classtooldlg.cpp:227
+#: vcs/cvsservice/cvspart.cpp:133
 msgid ""
-"_: member access\n"
-"Protected"
-msgstr "Gwarchodir"
+"<b>CVS</b>"
+"<p>Concurrent Versions System operations window. Shows output of Cervisia CVS "
+"Service."
+msgstr ""
 
-#: parts/classview/classtooldlg.cpp:83 parts/classview/classtooldlg.cpp:229
-msgid ""
-"_: member access\n"
-"Private"
-msgstr "Preivat"
+#: vcs/cvsservice/cvspart.cpp:134
+msgid "CvsService Output"
+msgstr ""
 
-#: parts/classview/classtooldlg.cpp:84 parts/classview/classtooldlg.cpp:231
-msgid ""
-"_: member access\n"
-"Package"
-msgstr "Pecyn"
+#: vcs/cvsservice/cvspart.cpp:135 vcs/cvsservice/cvspart.cpp:279
+#: vcs/cvsservice/cvspart.cpp:365
+msgid "CvsService"
+msgstr "GwasanaethCVS"
 
-#: parts/classview/classtooldlg.cpp:287
-msgid "Parents"
+#: vcs/cvsservice/cvspart.cpp:135
+msgid "cvs output"
 msgstr ""
 
-#: parts/classview/classtooldlg.cpp:291
-msgid "Children"
+#: vcs/cvsservice/cvspart.cpp:146
+msgid "&Commit to Repository"
 msgstr ""
 
-#: parts/classview/classtooldlg.cpp:295
-msgid "Clients"
+#: vcs/cvsservice/cvspart.cpp:151
+msgid "&Difference Between Revisions"
 msgstr ""
 
-#: parts/classview/classtooldlg.cpp:299
-msgid "Suppliers"
+#: vcs/cvsservice/cvspart.cpp:153
+msgid "Build difference"
 msgstr ""
 
-#: parts/classview/classtooldlg.cpp:303
-msgid "%1 Methods"
+#: vcs/cvsservice/cvspart.cpp:154 vcs/cvsservice/cvspart.cpp:329
+msgid "<b>Build difference</b><p>Builds difference between releases."
 msgstr ""
 
-#: parts/classview/classtooldlg.cpp:307
-msgid "%1 Attributes"
+#: vcs/cvsservice/cvspart.cpp:156
+msgid "Generate &Log"
 msgstr ""
 
-#: parts/classview/classtooldlg.cpp:311
-msgid "Class Tool Dialog"
+#: vcs/cvsservice/cvspart.cpp:158
+msgid "Generate log"
 msgstr ""
 
-#: parts/classview/classtooldlg.cpp:324
-msgid "%1 of Class %2"
+#: vcs/cvsservice/cvspart.cpp:159 vcs/cvsservice/cvspart.cpp:331
+msgid "<b>Generate log</b><p>Produces log for this file."
 msgstr ""
 
-#: parts/classview/navigator.cpp:113
-msgid "Sync ClassView"
-msgstr ""
+#: vcs/cvsservice/cvspart.cpp:161
+#, fuzzy
+msgid "&Annotate"
+msgstr "Lleoliad"
 
-#: parts/classview/navigator.cpp:116
+#: vcs/cvsservice/cvspart.cpp:163
 #, fuzzy
-msgid "Jump to next function"
-msgstr "Gwaredu ffeil"
+msgid "Generate annotations"
+msgstr "Dewisiadau Cyffredinol"
 
-#: parts/classview/navigator.cpp:120
-msgid "Jump to previous function"
+#: vcs/cvsservice/cvspart.cpp:164
+msgid "<b>Annotate</b><p>Produces annotations for this file."
 msgstr ""
 
-#: parts/classview/classviewpart.cpp:159
-msgid "Class Browser"
+#: vcs/cvsservice/cvspart.cpp:169 vcs/cvsservice/cvspart.cpp:342
+msgid "<b>Add to repository</b><p>Adds file to repository."
 msgstr ""
 
-#: parts/classview/classviewpart.cpp:160
-msgid "Classes"
-msgstr "Dosbarthiadau"
+#: vcs/cvsservice/cvspart.cpp:171
+#, fuzzy
+msgid "&Edit Files"
+msgstr "newidyn"
 
-#: parts/classview/classviewpart.cpp:160
-msgid "Class browser"
+#: vcs/cvsservice/cvspart.cpp:173
+msgid "Mark as being edited"
 msgstr ""
 
-#: parts/classview/classviewpart.cpp:161
-msgid ""
-"<b>Class browser</b>"
-"<p>The class browser shows all namespaces, classes and namespace and class "
-"members in a project."
+#: vcs/cvsservice/cvspart.cpp:174
+msgid "<b>Mark as being edited</b><p>Mark the files as being edited."
 msgstr ""
 
-#: parts/classview/classviewpart.cpp:198
-msgid "Functions Navigation"
-msgstr ""
+#: vcs/cvsservice/cvspart.cpp:176
+#, fuzzy
+msgid "&Unedit Files"
+msgstr "Canfod mewn Ffeiliau"
 
-#: parts/classview/classviewpart.cpp:203
-msgid "Functions in file"
+#: vcs/cvsservice/cvspart.cpp:178
+msgid "Remove editing mark from files"
 msgstr ""
 
-#: parts/classview/classviewpart.cpp:204
-msgid ""
-"<b>Function navigator</b>"
-"<p>Navigates over functions contained in the file."
+#: vcs/cvsservice/cvspart.cpp:179 vcs/cvsservice/cvspart.cpp:340
+msgid "<b>Remove editing mark</b><p>Remove the editing mark from the files."
 msgstr ""
 
-#: parts/classview/classviewpart.cpp:208
-msgid "Focus Navigator"
-msgstr ""
+#: vcs/cvsservice/cvspart.cpp:181
+#, fuzzy
+msgid "&Show Editors"
+msgstr "Golygydd"
 
-#: parts/classview/classviewpart.cpp:212
-msgid "Class Inheritance Diagram"
+#: vcs/cvsservice/cvspart.cpp:183
+msgid "Show editors"
 msgstr ""
 
-#: parts/classview/classviewpart.cpp:213
-msgid "Class inheritance diagram"
+#: vcs/cvsservice/cvspart.cpp:184 vcs/cvsservice/cvspart.cpp:336
+msgid "<b>Show editors</b><p>Shows the list of users who are editing files."
 msgstr ""
 
-#: parts/classview/classviewpart.cpp:214
-msgid ""
-"<b>Class inheritance diagram</b>"
-"<p>Displays inheritance relationship between classes in project. Note, it does "
-"not display classes outside inheritance hierarchy."
+#: vcs/cvsservice/cvspart.cpp:186
+msgid "Add to Repository as &Binary"
 msgstr ""
 
-#: parts/classview/classviewwidget.cpp:69
-msgid "Group by Directories"
+#: vcs/cvsservice/cvspart.cpp:188
+msgid "Add file to repository as binary"
 msgstr ""
 
-#: parts/classview/classviewwidget.cpp:69
-msgid "Plain List"
+#: vcs/cvsservice/cvspart.cpp:189 vcs/cvsservice/cvspart.cpp:344
+msgid ""
+"<b>Add to repository as binary</b>"
+"<p>Adds file to repository as binary (-kb option)."
 msgstr ""
 
-#: parts/classview/classviewwidget.cpp:69
-msgid "Java Like Mode"
+#: vcs/cvsservice/cvspart.cpp:196
+msgid "&Update/Revert to Another Release"
 msgstr ""
 
-#: parts/classview/classviewwidget.cpp:70
-msgid "View Mode"
-msgstr "Modd Golwg"
+#: vcs/cvsservice/cvspart.cpp:198
+msgid "Update/revert"
+msgstr ""
 
-#: parts/classview/classviewwidget.cpp:72
+#: vcs/cvsservice/cvspart.cpp:199 vcs/cvsservice/cvspart.cpp:354
 msgid ""
-"<b>View mode</b>"
-"<p>Class browser items can be grouped by directories, listed in a plain or java "
-"like view."
+"<b>Update/revert to another release</b>"
+"<p>Updates/reverts file(s) to another release."
 msgstr ""
 
-#: parts/classview/classviewwidget.cpp:76
-msgid "<b>New class</b><p>Calls the <b>New Class</b> wizard."
+#: vcs/cvsservice/cvspart.cpp:201
+msgid "R&emove Sticky Flag"
 msgstr ""
 
-#: parts/classview/classviewwidget.cpp:78
-msgid "Create get/set Methods"
+#: vcs/cvsservice/cvspart.cpp:203
+msgid "Remove sticky flag"
 msgstr ""
 
-#: parts/classview/classtreebase.cpp:55 parts/classview/classviewwidget.cpp:81
-msgid "Add Method..."
+#: vcs/cvsservice/cvspart.cpp:204 vcs/cvsservice/cvspart.cpp:356
+msgid "<b>Remove sticky flag</b><p>Removes sticky flag from file(s)."
 msgstr ""
 
-#: parts/classview/classviewwidget.cpp:83
-msgid "<b>Add method</b><p>Calls the <b>New Method</b> wizard."
+#: vcs/cvsservice/cvspart.cpp:206
+msgid "Make &Tag/Branch"
 msgstr ""
 
-#: parts/classview/classtreebase.cpp:57 parts/classview/classviewwidget.cpp:84
-msgid "Add Attribute..."
+#: vcs/cvsservice/cvspart.cpp:208
+msgid "Make tag/branch"
 msgstr ""
 
-#: parts/classview/classviewwidget.cpp:86
-msgid "<b>Add attribute</b><p>Calls the <b>New Attribute</b> wizard."
+#: vcs/cvsservice/cvspart.cpp:209 vcs/cvsservice/cvspart.cpp:350
+msgid "<b>Make tag/branch</b><p>Tags/branches selected file(s)."
 msgstr ""
 
-#: parts/classview/classviewwidget.cpp:88
-msgid "Open Declaration"
+#: vcs/cvsservice/cvspart.cpp:211
+#, fuzzy
+msgid "&Delete Tag"
+msgstr "Dileu Tudalen"
+
+#: vcs/cvsservice/cvspart.cpp:213
+#, fuzzy
+msgid "Delete tag"
+msgstr "Dileu Tudalen"
+
+#: vcs/cvsservice/cvspart.cpp:214 vcs/cvsservice/cvspart.cpp:352
+msgid "<b>Delete tag</b><p>Delete tag from selected file(s)."
 msgstr ""
 
-#: parts/classview/classviewwidget.cpp:90
-msgid ""
-"<b>Open declaration</b>"
-"<p>Opens a file where the selected item is declared and jumps to the "
-"declaration line."
+#: vcs/cvsservice/cvspart.cpp:216
+msgid "&Ignore in CVS Operations"
 msgstr ""
 
-#: parts/classview/classviewwidget.cpp:91
-msgid "Open Implementation"
+#: vcs/cvsservice/cvspart.cpp:218
+msgid "Ignore in CVS operations"
 msgstr ""
 
-#: parts/classview/classviewwidget.cpp:93
+#: vcs/cvsservice/cvspart.cpp:219 vcs/cvsservice/cvspart.cpp:360
 msgid ""
-"<b>Open implementation</b>"
-"<p>Opens a file where the selected item is defined (implemented) and jumps to "
-"the definition line."
+"<b>Ignore in CVS operations</b>"
+"<p>Ignore file(s) by adding it to .cvsignore file."
 msgstr ""
 
-#: parts/classview/classviewwidget.cpp:95
-#, fuzzy
-msgid "Follow Editor"
-msgstr "Golygydd"
-
-#: parts/classview/classtoolwidget.cpp:37
-msgid "Class Tool"
+#: vcs/cvsservice/cvspart.cpp:221
+msgid "Do &Not Ignore in CVS Operations"
 msgstr ""
 
-#: parts/classview/classtreebase.cpp:59
-msgid "Parent Classes..."
+#: vcs/cvsservice/cvspart.cpp:223
+msgid "Do not ignore in CVS operations"
 msgstr ""
 
-#: parts/classview/classtreebase.cpp:60
-msgid "Child Classes..."
+#: vcs/cvsservice/cvspart.cpp:224 vcs/cvsservice/cvspart.cpp:362
+msgid ""
+"<b>Do not ignore in CVS operations</b>"
+"<p>Do not ignore file(s) by removing\n"
+"it from .cvsignore file."
 msgstr ""
 
-#: parts/classview/classtreebase.cpp:61
-msgid "Class Tool..."
+#: vcs/cvsservice/cvspart.cpp:226
+msgid "&Log to Server"
 msgstr ""
 
-#: parts/classview/classtreebase.cpp:65
-msgid "Struct"
+#: vcs/cvsservice/cvspart.cpp:228
+msgid "Login to server"
 msgstr ""
 
-#: parts/classview/classtreebase.cpp:71
-msgid "Attribute"
-msgstr "Priodoleddau"
-
-#: kdevdesigner/designer/connectiontable.cpp:39
-#: parts/classview/classtreebase.cpp:77
-msgid "Signal"
-msgstr "Arwydd"
+#: vcs/cvsservice/cvspart.cpp:229
+msgid "<b>Login to server</b><p>Logs in to the CVS server."
+msgstr ""
 
-#: parts/classview/viewcombos.cpp:121
-msgid "(Global Namespace)"
+#: vcs/cvsservice/cvspart.cpp:231
+msgid "L&ogout From Server"
 msgstr ""
 
-#: parts/classview/digraphview.cpp:228
-msgid ""
-"You do not have 'dot' installed.\n"
-"It can be downloaded from www.graphviz.org."
+#: vcs/cvsservice/cvspart.cpp:233
+msgid "Logout from server"
 msgstr ""
 
-#: parts/fileselector/tdeactionselector.cpp:70
-msgid "&Available:"
-msgstr "&Ar gael:"
+#: vcs/cvsservice/cvspart.cpp:234
+msgid "<b>Logout from server</b><p>Logs out from the CVS server."
+msgstr ""
 
-#: parts/fileselector/tdeactionselector.cpp:85
-msgid "&Selected:"
-msgstr "&Wedi'u dewis:"
+#: vcs/cvsservice/cvspart.cpp:333
+msgid "<b>Generate Annotate</b><p>Produces annotation output for this file."
+msgstr ""
 
-#: parts/fileselector/fileselector_part.cpp:50
-#: parts/fileselector/fileselector_part.cpp:52
-#: parts/fileselector/fileselector_part.cpp:85
-msgid "File Selector"
-msgstr "Dewisydd Ffeiliau"
+#: vcs/cvsservice/cvspart.cpp:338
+msgid "<b>Mark as beeing edited</b><p>Mark the files as beeing edited."
+msgstr ""
 
-#: parts/fileselector/fileselector_part.cpp:52
-msgid "File selector"
-msgstr "Dewisydd Ffeiliau"
+#: vcs/cvsservice/integrator/integratordlg.cpp:62
+#: vcs/cvsservice/integrator/integratordlg.cpp:82
+#: vcs/cvsservice/integrator/integratordlg.cpp:84
+#: vcs/cvsservice/integrator/integratordlg.cpp:129
+#: vcs/cvsservice/integrator/integratordlg.cpp:131
+msgid "Init CVS Repository"
+msgstr ""
 
-#: parts/fileselector/fileselector_part.cpp:53
+#: vcs/cvsservice/integrator/integratordlg.cpp:82
 msgid ""
-"<b>File selector</b>"
-"<p>This file selector lists directory contents and provides some file "
-"management functions."
+"cvs init did not exit normally. Please check if cvs is installed and works "
+"correctly."
 msgstr ""
 
-#: buildtools/script/scriptprojectpart.cpp:53
-#: parts/fileselector/fileselector_part.cpp:57
-msgid "New File..."
-msgstr "Ffeil newydd ..."
-
-#: parts/fileselector/fileselector_widget.cpp:188
-msgid "Current Document Directory"
+#: vcs/cvsservice/integrator/integratordlg.cpp:84
+msgid ""
+"cvs init exited with status %1. Please check if the cvs location is correct."
 msgstr ""
 
-#: parts/fileselector/fileselector_widget.cpp:217
+#: vcs/cvsservice/integrator/integratordlg.cpp:129
 msgid ""
-"<p>Here you can enter a path for a directory to display."
-"<p>To go to a directory previously entered, press the arrow on the right and "
-"choose one. "
-"<p>The entry has directory completion. Right-click to choose how completion "
-"should behave."
+"cvs import did not exit normally. Please check if cvs is installed and works "
+"correctly."
 msgstr ""
 
-#: parts/fileselector/fileselector_widget.cpp:223
+#: vcs/cvsservice/integrator/integratordlg.cpp:131
 msgid ""
-"<p>Here you can enter a name filter to limit which files are displayed."
-"<p>To clear the filter, toggle off the filter button to the left."
-"<p>To reapply the last filter used, toggle on the filter button."
+"cvs import exited with status %1. Please check if the cvs location is correct."
 msgstr ""
-"<p>Yma gallwch roi hidlen enwau i gyfyngu pa ffeiliau a ddengys."
-"<p>I wagio'r hidlen, diffoddwch y botwm hidlen ar y chwith."
-"<p>I ailweithredu'r hidlen ddefnyddiwyd ddiwethaf, cynnwch y botwm hidlen."
 
-#: parts/fileselector/fileselector_widget.cpp:588
-msgid "Toolbar"
-msgstr "Bar offer"
-
-#: parts/fileselector/fileselector_widget.cpp:590
-msgid "A&vailable actions:"
-msgstr "&Gweithredoedd ar gael:"
+#: lib/cppparser/errors.cpp:23
+msgid "Internal Error"
+msgstr "Gwall Mewnol"
 
-#: parts/fileselector/fileselector_widget.cpp:591
-msgid "S&elected actions:"
-msgstr "Gweithredoedd d&ewisiedig:"
+#: lib/cppparser/errors.cpp:24
+msgid "Syntax Error before '%1'"
+msgstr ""
 
-#: parts/fileselector/fileselector_widget.cpp:599
-msgid "Auto Synchronization"
-msgstr "Cydweddu Ymysgogol"
+#: lib/cppparser/errors.cpp:25
+msgid "Parse Error before '%1'"
+msgstr ""
 
-#: parts/fileselector/fileselector_widget.cpp:600
-msgid "When a docu&ment becomes active"
-msgstr "Pan ddaw dog&fen yn weithredol"
+#: lib/cppparser/driver.cpp:386
+#, fuzzy, c-format
+msgid "Could not find include file %1"
+msgstr "Ffeiliau i'w llwytho"
 
-#: parts/fileselector/fileselector_widget.cpp:601
-msgid "When a document is o&pened"
+#: lib/cppparser/parser.cpp:140
+msgid "<eof>"
 msgstr ""
 
-#: parts/fileselector/fileselector_widget.cpp:602
-msgid "When the file selector becomes visible"
-msgstr "Pan ymddengys y dewisydd ffeiliau"
+#: lib/cppparser/parser.cpp:321 lib/cppparser/parser.cpp:2699
+#: lib/cppparser/parser.cpp:2923 lib/cppparser/parser.cpp:2929
+msgid "expression expected"
+msgstr ""
 
-#: parts/fileselector/fileselector_widget.cpp:610
-msgid "Remember &locations:"
-msgstr "Cofio &lleoliadau:"
+#: lib/cppparser/parser.cpp:583
+msgid "Declaration syntax error"
+msgstr ""
 
-#: parts/fileselector/fileselector_widget.cpp:617
-msgid "Remember &filters:"
-msgstr "Cofio &hidlenni:"
+#: lib/cppparser/parser.cpp:630 lib/cppparser/parser.cpp:2817
+#: lib/cppparser/parser.cpp:3290
+msgid "} expected"
+msgstr ""
 
-#: parts/fileselector/fileselector_widget.cpp:624
-msgid "Session"
-msgstr "Sesiwn"
+#: lib/cppparser/parser.cpp:671
+msgid "namespace expected"
+msgstr ""
 
-#: parts/fileselector/fileselector_widget.cpp:625
-msgid "Restore loca&tion"
-msgstr "Adfer lleolia&dau:"
+#: lib/cppparser/parser.cpp:675
+msgid "{ expected"
+msgstr ""
 
-#: parts/fileselector/fileselector_widget.cpp:626
-msgid "Restore last f&ilter"
-msgstr "Adfer h&idlen ddiwethaf:"
+#: lib/cppparser/parser.cpp:748 lib/cppparser/parser.cpp:3010
+msgid "Namespace name expected"
+msgstr ""
 
-#: parts/fileselector/fileselector_widget.cpp:646
-msgid ""
-"<p>Decides how many locations to keep in the history of the location combo box"
-msgstr "p>Penderfynna sawl lleoliad i gadw yn hanes y blwch cyfuno lleoliadau."
+#: lib/cppparser/parser.cpp:852
+msgid "Need a type specifier to declare"
+msgstr ""
 
-#: parts/fileselector/fileselector_widget.cpp:653
-msgid ""
-"<p>Decides how many filters to keep in the history of the filter combo box"
-msgstr "p>Penderfynna sawl hidlen i gadw yn hanes y blwch cyfuno hidlenni."
+#: lib/cppparser/parser.cpp:934
+msgid "expected a declaration"
+msgstr ""
 
-#: parts/fileselector/fileselector_widget.cpp:660
-msgid ""
-"<p>These options allow you to have the File Selector automatically change "
-"location to the directory of the active document on certain events."
-"<p>Auto synchronization is <em>lazy</em>, meaning it will not take effect until "
-"the file selector is visible."
-"<p>None of these are enabled by default, but you can always sync the location "
-"by pressing the sync button in the toolbar."
+#: lib/cppparser/parser.cpp:1208 lib/cppparser/parser.cpp:2190
+msgid "Constant expression expected"
 msgstr ""
 
-#: parts/fileselector/fileselector_widget.cpp:671
-msgid ""
-"<p>If this option is enabled (default), the location will be restored when you "
-"start KDev."
-"<p><strong>Note</strong> that if the session is handled by the TDE session "
-"manager, the location is always restored."
+#: lib/cppparser/parser.cpp:1277 lib/cppparser/parser.cpp:1374
+msgid "')' expected"
 msgstr ""
 
-#: parts/fileselector/fileselector_widget.cpp:676
-msgid ""
-"<p>If this option is enabled (default), the current filter will be restored "
-"when you start KDev."
-"<p><strong>Note</strong> that if the session is handled by the TDE session "
-"manager, the filter is always restored."
-"<p><strong>Note</strong> that some of the autosync settings may override the "
-"restored location if on."
+#: lib/cppparser/parser.cpp:1436 lib/cppparser/parser.cpp:1966
+#: lib/cppparser/parser.cpp:2398
+msgid "} missing"
 msgstr ""
 
-#: parts/valgrind/valgrind_dialog.cpp:20
-msgid "Valgrind Memory Check"
+#: lib/cppparser/parser.cpp:2088
+msgid "Member initializers expected"
 msgstr ""
 
-#: parts/valgrind/valgrind_dialog.cpp:80
-#: parts/valgrind/valgrind_dialog.cpp:140
-msgid ""
-"Could not find valgrind in your $PATH. Please make sure it is installed "
-"properly."
+#: lib/cppparser/parser.cpp:2249
+msgid "Base class specifier expected"
 msgstr ""
 
-#: parts/valgrind/valgrind_dialog.cpp:82
-#: parts/valgrind/valgrind_dialog.cpp:142
-msgid "Valgrind Not Found"
+#: lib/cppparser/parser.cpp:2272
+msgid "Initializer clause expected"
 msgstr ""
 
-#: parts/valgrind/valgrind_dialog.cpp:185
-msgid ""
-"Could not find tdecachegrind in your $PATH. Please make sure it is installed "
-"properly."
+#: lib/cppparser/parser.cpp:2313
+msgid "Identifier expected"
 msgstr ""
 
-#: parts/valgrind/valgrind_dialog.cpp:187
-msgid "KCachegrind Not Found"
+#: lib/cppparser/parser.cpp:2343
+msgid "Type id expected"
 msgstr ""
 
-#: parts/valgrind/valgrind_part.cpp:49
-msgid "Valgrind Output"
+#: lib/cppparser/parser.cpp:2380
+msgid "Class name expected"
 msgstr ""
 
-#: parts/valgrind/valgrind_part.cpp:51
-msgid ""
-"<b>Valgrind</b>"
-"<p>Shows the output of the valgrind. Valgrind detects"
-"<br>use of uninitialized memory"
-"<br>reading/writing memory after it has been free'd"
-"<br>reading/writing off the end of malloc'd blocks"
-"<br>reading/writing inappropriate areas on the stack"
-"<br>memory leaks -- where pointers to malloc'd blocks are lost forever"
-"<br>passing of uninitialised and/or unaddressable memory to system calls"
-"<br>mismatched use of malloc/new/new [] vs free/delete/delete []"
-"<br>some abuses of the POSIX pthread API."
+#: lib/cppparser/parser.cpp:2662 lib/cppparser/parser.cpp:2842
+#: lib/cppparser/parser.cpp:2880 lib/cppparser/parser.cpp:3352
+msgid "condition expected"
 msgstr ""
 
-#: parts/valgrind/valgrind_part.cpp:61
-msgid "&Valgrind Memory Leak Check"
+#: lib/cppparser/parser.cpp:2669 lib/cppparser/parser.cpp:2690
+#: lib/cppparser/parser.cpp:2849 lib/cppparser/parser.cpp:2859
+msgid "statement expected"
 msgstr ""
 
-#: parts/valgrind/valgrind_part.cpp:63 parts/valgrind/valgrind_part.cpp:71
-msgid "Valgrind memory leak check"
+#: lib/cppparser/parser.cpp:2725
+msgid "for initialization expected"
 msgstr ""
 
-#: parts/valgrind/valgrind_part.cpp:64
-msgid ""
-"<b>Valgrind memory leak check</b>"
-"<p>Runs Valgrind - a tool to help you find memory-management problems in your "
-"programs."
+#: lib/cppparser/parser.cpp:3341
+msgid "catch expected"
 msgstr ""
 
-#: parts/valgrind/valgrind_part.cpp:66
-msgid "P&rofile with KCachegrind"
+#: lib/util/execcommand.cpp:52
+msgid "Could not invoke \"%1\". Please make sure it is installed correctly"
 msgstr ""
 
-#: parts/valgrind/valgrind_part.cpp:68
-msgid "Profile with KCachegrind"
+#: lib/util/execcommand.cpp:53
+msgid "Error Invoking Command"
 msgstr ""
 
-#: parts/valgrind/valgrind_part.cpp:69
-msgid ""
-"<b>Profile with KCachegrind</b>"
-"<p>Runs your program in calltree and then displays profiler information in "
-"KCachegrind."
+#: lib/util/execcommand.cpp:59
+msgid "Command running..."
 msgstr ""
 
-#: parts/valgrind/valgrind_part.cpp:90
-msgid "Open Valgrind Output"
+#: lib/util/execcommand.cpp:60
+msgid "Please wait until the \"%1\" command finishes."
 msgstr ""
 
-#: parts/valgrind/valgrind_part.cpp:96
-#, c-format
-msgid "Could not open valgrind output: %1"
+#: lib/util/tdescriptactionmanager.cpp:98
+msgid "Unable to get KScript Runner for type \"%1\"."
+msgstr "Methu cael Rhedydd KScript am fath \"%1\"."
+
+#: lib/util/tdescriptactionmanager.cpp:98
+msgid "KScript Error"
+msgstr "Gwall KScript"
+
+#: lib/widgets/kdevhtmlpart.cpp:37
+msgid "<b>Reload</b><p>Reloads the current document."
 msgstr ""
 
-#: parts/valgrind/valgrind_part.cpp:217
-msgid "There is already an instance of valgrind running."
+#: lib/widgets/kdevhtmlpart.cpp:40
+msgid "<b>Stop</b><p>Stops the loading of current document."
 msgstr ""
 
-#: parts/valgrind/valgrind_widget.cpp:95
-msgid "No."
-msgstr "Rhif"
+#: lib/widgets/kdevhtmlpart.cpp:41
+msgid "Duplicate Tab"
+msgstr "Dyblygu Tab"
 
-#: kdevdesigner/designer/outputwindow.cpp:84
-#: parts/valgrind/valgrind_widget.cpp:97
-msgid "Message"
-msgstr "Neges"
+#: lib/widgets/kdevhtmlpart.cpp:43
+msgid "<b>Duplicate window</b><p>Opens current document in a new window."
+msgstr ""
 
-#: parts/valgrind/valgrind_widget.cpp:104
-msgid "&Open Valgrind Output..."
+#: lib/widgets/kdevhtmlpart.cpp:57
+msgid ""
+"<b>Back</b>"
+"<p>Moves backwards one step in the <b>documentation</b> browsing history."
 msgstr ""
 
-#: parts/valgrind/valgrind_widget.cpp:106
-msgid "Expand All Items"
+#: lib/widgets/kdevhtmlpart.cpp:69
+msgid ""
+"<b>Forward</b>"
+"<p>Moves forward one step in the <b>documentation</b> browsing history."
 msgstr ""
 
-#: parts/valgrind/valgrind_widget.cpp:107
-msgid "Collapse All Items"
+#: lib/widgets/kdevhtmlpart.cpp:100
+msgid "<b>Open in new window</b><p>Opens current link in a new window."
 msgstr ""
 
-#: parts/bookmarks/bookmarks_widget.cpp:270
-msgid ", line "
+#: lib/widgets/flagboxes.cpp:98
+msgid "Flags"
+msgstr "Baneri"
+
+#: lib/widgets/kdevtabwidget.cpp:38
+msgid "Close &Others"
 msgstr ""
 
-#: parts/bookmarks/bookmarks_widget.cpp:273
-msgid "Remove This Bookmark"
+#: lib/widgets/processwidget.cpp:233
+msgid "*** Exited normally ***"
 msgstr ""
 
-#: parts/bookmarks/bookmarks_widget.cpp:277
-msgid ", All"
+#: lib/widgets/processwidget.cpp:239
+msgid "*** Process aborted. Segmentation fault ***"
 msgstr ""
 
-#: parts/bookmarks/bookmarks_widget.cpp:278
-msgid "Remove These Bookmarks"
+#: lib/widgets/processwidget.cpp:243
+msgid "*** Process aborted ***"
 msgstr ""
 
-#: parts/bookmarks/bookmarks_widget.cpp:283
-msgid "Collapse All"
+#: lib/widgets/resizablecombo.cpp:63
+msgid "Drag this to resize the combobox."
 msgstr ""
 
-#: parts/bookmarks/bookmarks_widget.cpp:284
-msgid "Expand All"
+#: lib/widgets/ksavealldialog.cpp:53 lib/widgets/ksavealldialog.cpp:144
+msgid "Save Modified Files?"
 msgstr ""
 
-#: parts/bookmarks/bookmarks_part.cpp:59
-msgid ""
-"<b>Bookmarks</b>"
-"<p>The bookmark viewer shows all the source bookmarks in the project."
+#: lib/widgets/ksavealldialog.cpp:58 lib/widgets/ksavealldialog.cpp:151
+msgid "The following files have been modified. Save them?"
 msgstr ""
 
-#: parts/bookmarks/bookmarks_part.cpp:62
-msgid "Source bookmarks"
+#: lib/widgets/ksavealldialog.cpp:65
+msgid "Save &Selected"
 msgstr ""
 
-#: parts/bookmarks/bookmarks_part.cpp:558
-msgid "Could not find file"
+#: lib/widgets/ksavealldialog.cpp:65
+msgid "Saves all selected files"
 msgstr ""
 
-#: editors/editor-chooser/editorchooser_part.cpp:35
-msgid "Editor"
-msgstr "Golygydd"
+#: lib/widgets/ksavealldialog.cpp:66 lib/widgets/ksavealldialog.cpp:157
+msgid "Save &None"
+msgstr ""
 
-#: buildtools/ada/adaproject_part.cpp:56 buildtools/ant/antprojectpart.cpp:55
-#: buildtools/autotools/autoprojectpart.cpp:103
-#: buildtools/custommakefiles/customprojectpart.cpp:83
-#: buildtools/pascal/pascalproject_part.cpp:62
-#: buildtools/qmake/trollprojectpart.cpp:103
-msgid "&Build Project"
+#: lib/widgets/ksavealldialog.cpp:68 lib/widgets/ksavealldialog.cpp:159
+msgid "Lose all modifications"
 msgstr ""
 
-#: buildtools/ada/adaproject_part.cpp:341
-msgid ""
-"Could not find ada compiler.\n"
-"Check if your compiler settings are correct."
+#: lib/widgets/ksavealldialog.cpp:69 lib/widgets/ksavealldialog.cpp:160
+msgid "Cancels the action"
 msgstr ""
 
-#: buildtools/ada/adaproject_part.cpp:422
-msgid ""
-"There was an error loading the module %1.\n"
-"The diagnostics are:\n"
-"%2"
+#: lib/widgets/ksavealldialog.cpp:156
+msgid "Save &All"
+msgstr "Cadw &Popeth"
+
+#: lib/widgets/ksavealldialog.cpp:156
+msgid "Saves all modified files"
 msgstr ""
 
-#: buildtools/ant/antprojectpart.cpp:58
-#: buildtools/autotools/autoprojectpart.cpp:106
-#: buildtools/custommakefiles/customprojectpart.cpp:86
-#: buildtools/pascal/pascalproject_part.cpp:65
-#: buildtools/qmake/trollprojectpart.cpp:106
-#: buildtools/qmake/trollprojectwidget.cpp:124
-msgid "Build project"
+#: lib/widgets/propeditor/pfontbutton.cpp:62
+msgid " Bold"
 msgstr ""
 
-#: buildtools/ant/antprojectpart.cpp:59
-msgid ""
-"<b>Build project</b>"
-"<p>Executes <b>ant dist</b> command to build the project."
+#: lib/widgets/propeditor/pfontbutton.cpp:63
+msgid " Italic"
 msgstr ""
 
-#: buildtools/ant/antprojectpart.cpp:61
-#: buildtools/custommakefiles/customprojectpart.cpp:147
-msgid "Build &Target"
+#: lib/widgets/propeditor/pstringlistedit.cpp:85
+msgid "Ok"
+msgstr "Iawn"
+
+#: lib/widgets/propeditor/propertymachinefactory.cpp:152
+msgid "Minimum Expanding"
 msgstr ""
 
-#: buildtools/ant/antprojectpart.cpp:63
-#: buildtools/custommakefiles/customprojectpart.cpp:150
-msgid "Build target"
+#: lib/widgets/propeditor/propertymachinefactory.cpp:153
+msgid "Ignored"
+msgstr "Anwybyddwyd"
+
+#: lib/widgets/propeditor/propertymachinefactory.cpp:156
+msgid "Horizontal Size Type"
 msgstr ""
 
-#: buildtools/ant/antprojectpart.cpp:64
-msgid ""
-"<b>Build target</b>"
-"<p>Executes <b>ant target_name</b> command to build the specified target."
+#: lib/widgets/propeditor/propertymachinefactory.cpp:157
+msgid "Vertical Size Type"
 msgstr ""
 
-#: buildtools/ant/antprojectpart.cpp:467
-msgid "Ant Options"
+#: lib/widgets/propeditor/propertymachinefactory.cpp:158
+msgid "hStretch"
+msgstr "hStretch"
+
+#: lib/widgets/propeditor/propertymachinefactory.cpp:158
+msgid "Horizontal Stretch"
 msgstr ""
 
-#: buildtools/ant/antprojectpart.cpp:502
-msgid "Classpath"
+#: lib/widgets/propeditor/propertymachinefactory.cpp:159
+msgid "vStretch"
+msgstr "vStretch"
+
+#: lib/widgets/propeditor/propertymachinefactory.cpp:159
+msgid "Vertical Stretch"
 msgstr ""
 
-#: buildtools/ant/antprojectpart.cpp:565
-msgid "Remove %1 From Project"
+#: lib/widgets/propeditor/propertymachinefactory.cpp:166
+msgid "Up Arrow"
+msgstr "Saeth i Fyny"
+
+#: lib/widgets/propeditor/propertymachinefactory.cpp:180
+msgid "What's this"
+msgstr "Beth yw hwn"
+
+#: lib/widgets/propeditor/pcheckbox.cpp:69
+msgid "true"
+msgstr "gwir"
+
+#: lib/widgets/propeditor/pcheckbox.cpp:69
+msgid "false"
+msgstr "ffug"
+
+#: buildtools/script/scriptprojectpart.cpp:56
+msgid "<b>New file</b><p>Creates a new file."
 msgstr ""
 
-#: buildtools/ant/antprojectpart.cpp:567
-msgid "<b>Remove from project</b><p>Removes current file from the project."
+#: buildtools/script/scriptprojectpart.cpp:59
+#, fuzzy
+msgid "Rescan Project"
+msgstr "Agor Cywaith"
+
+#: buildtools/autotools/addfiledlg.cpp:72
+#: buildtools/script/scriptnewfiledlg.cpp:80
+msgid "Please enter the file name without '/' and so on."
 msgstr ""
 
-#: buildtools/ant/antprojectpart.cpp:571
-msgid "Add %1 to Project"
+#: buildtools/script/scriptnewfiledlg.cpp:90
+msgid "A file with this name already exists."
 msgstr ""
 
-#: buildtools/ant/antprojectpart.cpp:573
-msgid "<b>Add to project</b><p>Adds current file from the project."
+#: buildtools/script/scriptnewfiledlg.cpp:99
+msgid "A file template for this extension does not exist."
 msgstr ""
 
-#: buildtools/lib/widgets/addfilesdialog.cpp:35
-#: buildtools/lib/widgets/addfilesdialog.cpp:54
-msgid "Copy File(s)"
+#: buildtools/script/scriptnewfiledlg.cpp:111
+msgid "Could not create the new file."
+msgstr "Methu creu'r ffeil newydd."
+
+#: buildtools/custommakefiles/selectnewfilesdialog.cpp:24
+msgid "Add newly created files to project"
 msgstr ""
 
-#: buildtools/lib/widgets/addfilesdialog.cpp:36
-#: buildtools/lib/widgets/addfilesdialog.cpp:55
-msgid "Create Symbolic Link(s)"
+#: buildtools/custommakefiles/customprojectpart.cpp:79
+#: buildtools/custommakefiles/customprojectpart.cpp:80
+#, fuzzy
+msgid "Re-Populate Project"
+msgstr "Agor Cywaith"
+
+#: buildtools/custommakefiles/customprojectpart.cpp:81
+msgid ""
+"<b>Re-Populate Project</b>"
+"<p>Re-Populates the project, searching through the project directory and adding "
+"all files that match one of the wildcards set in the custom manager options of "
+"the project filelist."
 msgstr ""
 
-#: buildtools/lib/widgets/addfilesdialog.cpp:37
-#: buildtools/lib/widgets/addfilesdialog.cpp:56
-msgid "Add Relative Path(s)"
+#: buildtools/ada/adaproject_part.cpp:56 buildtools/ant/antprojectpart.cpp:55
+#: buildtools/autotools/autoprojectpart.cpp:104
+#: buildtools/custommakefiles/customprojectpart.cpp:83
+#: buildtools/pascal/pascalproject_part.cpp:62
+#: buildtools/qmake/trollprojectpart.cpp:103
+msgid "&Build Project"
 msgstr ""
 
-#: buildtools/lib/widgets/addenvvardlg.cpp:34
-msgid "Add Environment Variable"
+#: buildtools/ant/antprojectpart.cpp:58
+#: buildtools/autotools/autoprojectpart.cpp:107
+#: buildtools/custommakefiles/customprojectpart.cpp:86
+#: buildtools/pascal/pascalproject_part.cpp:65
+#: buildtools/qmake/trollprojectpart.cpp:106
+#: buildtools/qmake/trollprojectwidget.cpp:124
+msgid "Build project"
 msgstr ""
 
-#: buildtools/lib/widgets/addenvvardlg.cpp:42
-msgid "&Value:"
-msgstr "&Gwerth:"
+#: buildtools/custommakefiles/customprojectpart.cpp:87
+msgid ""
+"<b>Build project</b>"
+"<p>Runs <b>make</b> from the project directory."
+"<br>Environment variables and make arguments can be specified in the project "
+"settings dialog, <b>Build Options</b> tab."
+msgstr ""
 
-#: buildtools/qmake/trollprojectpart.cpp:82
-#: buildtools/qmake/trollprojectpart.cpp:89
-#: buildtools/qmake/trollprojectpart.cpp:279
-msgid "QMake Manager"
+#: buildtools/custommakefiles/customprojectpart.cpp:91
+msgid "&Build Active Directory"
 msgstr ""
 
-#: buildtools/qmake/trollprojectpart.cpp:83
-msgid ""
-"<b>QMake manager</b>"
-"<p>The QMake manager project tree consists of two parts. The 'overview' in the "
-"upper half shows the subprojects, each one having a .pro file. The 'details' "
-"view in the lower half shows the list of files for the active subproject "
-"selected in the overview."
+#: buildtools/custommakefiles/customprojectpart.cpp:94
+msgid "Build active directory"
 msgstr ""
 
-#: buildtools/qmake/trollprojectpart.cpp:89
-msgid "QMake manager"
+#: buildtools/custommakefiles/customprojectpart.cpp:95
+msgid ""
+"<b>Build active directory</b>"
+"<p>Constructs a series of make commands to build the active directory. "
+"Environment variables and make arguments can be specified in the project "
+"settings dialog, <b>Make Options</b> tab."
 msgstr ""
 
-#: buildtools/autotools/autoprojectpart.cpp:122
+#: buildtools/autotools/autoprojectpart.cpp:123
 #: buildtools/custommakefiles/customprojectpart.cpp:99
 #: buildtools/qmake/trollprojectpart.cpp:94
 msgid "Compile &File"
 msgstr ""
 
-#: buildtools/autotools/autoprojectpart.cpp:125
+#: buildtools/autotools/autoprojectpart.cpp:126
 #: buildtools/custommakefiles/customprojectpart.cpp:102
 #: buildtools/qmake/trollprojectpart.cpp:97
 #: buildtools/qmake/trollprojectwidget.cpp:230
 msgid "Compile file"
 msgstr ""
 
-#: buildtools/autotools/autoprojectpart.cpp:126
-#: buildtools/qmake/trollprojectpart.cpp:98
-#: buildtools/qmake/trollprojectwidget.cpp:231
+#: buildtools/custommakefiles/customprojectpart.cpp:103
 msgid ""
 "<b>Compile file</b>"
 "<p>Runs <b>make filename.o</b> command from the directory where 'filename' is "
 "the name of currently opened file."
 "<br>Environment variables and make arguments can be specified in the project "
-"settings dialog, <b>Make Options</b> tab."
+"settings dialog, <b>Build Options</b> tab."
 msgstr ""
 
-#: buildtools/autotools/autoprojectpart.cpp:107
-#: buildtools/qmake/trollprojectpart.cpp:107
-#: buildtools/qmake/trollprojectwidget.cpp:125
+#: buildtools/autotools/autoprojectpart.cpp:155
+#: buildtools/autotools/autoprojectpart.cpp:158
+#: buildtools/autotools/autosubprojectview.cpp:248
+#: buildtools/custommakefiles/customprojectpart.cpp:107
+#: buildtools/custommakefiles/customprojectpart.cpp:110
+#: buildtools/qmake/trollprojectwidget.cpp:1000
+msgid "Install"
+msgstr "Gosod"
+
+#: buildtools/autotools/autoprojectpart.cpp:159
+#: buildtools/custommakefiles/customprojectpart.cpp:111
 msgid ""
-"<b>Build project</b>"
-"<p>Runs <b>make</b> from the project directory."
+"<b>Install</b>"
+"<p>Runs <b>make install</b> command from the project directory."
 "<br>Environment variables and make arguments can be specified in the project "
 "settings dialog, <b>Make Options</b> tab."
 msgstr ""
 
-#: buildtools/qmake/trollprojectpart.cpp:111
-msgid "&Rebuild Project"
+#: buildtools/custommakefiles/customprojectpart.cpp:115
+msgid "Install Active Directory"
 msgstr ""
 
-#: buildtools/qmake/trollprojectpart.cpp:114
-#: buildtools/qmake/trollprojectwidget.cpp:133
-msgid "Rebuild project"
-msgstr ""
+#: buildtools/custommakefiles/customprojectpart.cpp:118
+#, fuzzy
+msgid "Install active directory"
+msgstr "Arsefydlu"
 
-#: buildtools/qmake/trollprojectpart.cpp:115
-#: buildtools/qmake/trollprojectwidget.cpp:134
-#: buildtools/qmake/trollprojectwidget.cpp:1014
+#: buildtools/custommakefiles/customprojectpart.cpp:119
 msgid ""
-"<b>Rebuild project</b>"
-"<p>Runs <b>make clean</b> and then <b>make</b> from the project directory."
+"<b>Install active directory</b>"
+"<p>Runs <b>make install</b> command from the active directory."
 "<br>Environment variables and make arguments can be specified in the project "
 "settings dialog, <b>Make Options</b> tab."
 msgstr ""
 
-#: buildtools/qmake/trollprojectpart.cpp:119
-#, fuzzy
-msgid "&Install Project"
-msgstr "C&au Cywaith"
+#: buildtools/autotools/autoprojectpart.cpp:164
+#: buildtools/autotools/autosubprojectview.cpp:254
+#: buildtools/custommakefiles/customprojectpart.cpp:123
+msgid "Install (as root user)"
+msgstr ""
 
-#: buildtools/qmake/trollprojectpart.cpp:122
-#, fuzzy
-msgid "Install project"
-msgstr "cywaith Newydd"
+#: buildtools/autotools/autoprojectpart.cpp:167
+#: buildtools/custommakefiles/customprojectpart.cpp:126
+msgid "Install as root user"
+msgstr ""
 
-#: buildtools/qmake/trollprojectpart.cpp:123
+#: buildtools/autotools/autoprojectpart.cpp:168
+#: buildtools/custommakefiles/customprojectpart.cpp:127
 msgid ""
-"<b>Install project</b>"
-"<p>Runs <b>make install</b> from the project directory."
+"<b>Install</b>"
+"<p>Runs <b>make install</b> command from the project directory with root "
+"privileges."
+"<br>It is executed via tdesu command."
 "<br>Environment variables and make arguments can be specified in the project "
 "settings dialog, <b>Make Options</b> tab."
 msgstr ""
 
-#: buildtools/autotools/autoprojectpart.cpp:166
+#: buildtools/autotools/autoprojectpart.cpp:174
 #: buildtools/custommakefiles/customprojectpart.cpp:132
 #: buildtools/qmake/trollprojectpart.cpp:127
 msgid "&Clean Project"
 msgstr ""
 
-#: buildtools/autotools/autoprojectpart.cpp:169
+#: buildtools/autotools/autoprojectpart.cpp:177
 #: buildtools/custommakefiles/customprojectpart.cpp:135
 #: buildtools/qmake/trollprojectpart.cpp:130
 msgid "Clean project"
 msgstr ""
 
-#: buildtools/autotools/autoprojectpart.cpp:170
-#: buildtools/qmake/trollprojectpart.cpp:131
+#: buildtools/custommakefiles/customprojectpart.cpp:136
 msgid ""
 "<b>Clean project</b>"
 "<p>Runs <b>make clean</b> command from the project directory."
 "<br>Environment variables and make arguments can be specified in the project "
-"settings dialog, <b>Make Options</b> tab."
-msgstr ""
-
-#: buildtools/qmake/trollprojectpart.cpp:135
-#, fuzzy
-msgid "&Dist-Clean Project"
-msgstr "C&au Cywaith"
-
-#: buildtools/qmake/trollprojectpart.cpp:138
-#, fuzzy
-msgid "Dist-Clean project"
-msgstr "Cau Cywaith"
-
-#: buildtools/qmake/trollprojectpart.cpp:139
-msgid ""
-"<b>Dist-Clean project</b>"
-"<p>Runs <b>make distclean</b> command from the project directory."
-"<br>Environment variables and make arguments can be specified in the project "
-"settings dialog, <b>Make Options</b> tab."
-msgstr ""
-
-#: buildtools/qmake/trollprojectpart.cpp:146
-#: buildtools/qmake/trollprojectwidget.cpp:143
-msgid "Execute main program"
+"settings dialog, <b>Build Options</b> tab."
 msgstr ""
 
-#: buildtools/qmake/trollprojectpart.cpp:147
+#: buildtools/custommakefiles/customprojectpart.cpp:144
 msgid ""
 "<b>Execute program</b>"
-"<p>Executes the currently selected subproject if its an application or the "
-"program specified in project settings, <b>Run Options</b> tab."
+"<p>Executes the main program specified in project settings, <b>Run Options</b> "
+"tab. If it is not specified then the active target is used to determine the "
+"application to run."
 msgstr ""
 
-#: buildtools/qmake/trollprojectpart.cpp:149
-msgid "&Build Subproject"
+#: buildtools/ant/antprojectpart.cpp:61
+#: buildtools/custommakefiles/customprojectpart.cpp:147
+msgid "Build &Target"
 msgstr ""
 
-#: buildtools/qmake/trollprojectpart.cpp:152
-#: buildtools/qmake/trollprojectwidget.cpp:240
-msgid "Build subproject"
+#: buildtools/ant/antprojectpart.cpp:63
+#: buildtools/custommakefiles/customprojectpart.cpp:150
+msgid "Build target"
 msgstr ""
 
-#: buildtools/qmake/trollprojectpart.cpp:153
-#: buildtools/qmake/trollprojectwidget.cpp:241
+#: buildtools/custommakefiles/customprojectpart.cpp:151
 msgid ""
-"<b>Build subproject</b>"
-"<p>Runs <b>make</b> from the current subproject directory. Current subproject "
-"is a subproject selected in <b>QMake manager</b> 'overview' window."
+"<b>Build target</b>"
+"<p>Runs <b>make targetname</b> from the project directory (targetname is the "
+"name of the target selected)."
 "<br>Environment variables and make arguments can be specified in the project "
-"settings dialog, <b>Make Options</b> tab."
+"settings dialog, <b>Build Options</b> tab."
 msgstr ""
 
-#: buildtools/qmake/trollprojectpart.cpp:158
-msgid "&Rebuild Subproject"
+#: buildtools/custommakefiles/customprojectpart.cpp:158
+msgid "Make &Environment"
 msgstr ""
 
-#: buildtools/qmake/trollprojectpart.cpp:161
-#: buildtools/qmake/trollprojectwidget.cpp:250
-msgid "Rebuild subproject"
+#: buildtools/custommakefiles/customprojectpart.cpp:160
+msgid "Make environment"
 msgstr ""
 
-#: buildtools/qmake/trollprojectpart.cpp:162
-#: buildtools/qmake/trollprojectwidget.cpp:251
+#: buildtools/custommakefiles/customprojectpart.cpp:161
 msgid ""
-"<b>Rebuild subproject</b>"
-"<p>Runs <b>make clean</b> and then <b>make</b> from the current subproject "
-"directory. Current subproject is a subproject selected in <b>QMake manager</b> "
-"'overview' window."
-"<br>Environment variables and make arguments can be specified in the project "
-"settings dialog, <b>Make Options</b> tab."
+"<b>Make Environment</b>"
+"<p> Choose the set of environment variables to be passed on to make."
+"<br>Environment variables can be specified in the project settings dialog, <b>"
+"Build Options</b> tab."
 msgstr ""
 
-#: buildtools/qmake/trollprojectpart.cpp:167
-#, fuzzy
-msgid "&Install Subproject"
-msgstr "cywaith Newydd"
-
-#: buildtools/qmake/trollprojectpart.cpp:170
+#: buildtools/custommakefiles/customprojectpart.cpp:196
 #, fuzzy
-msgid "Install subproject"
-msgstr "cywaith Newydd"
+msgid "Custom Manager"
+msgstr "Newidynnau &Addasiedig..."
 
-#: buildtools/qmake/trollprojectpart.cpp:171
-msgid ""
-"<b>Install subproject</b>"
-"<p>Runs <b>make install</b> from the current subproject directory. Current "
-"subproject is a subproject selected in <b>QMake manager</b> 'overview' window."
-"<br>Environment variables and make arguments can be specified in the project "
-"settings dialog, <b>Make Options</b> tab."
+#: buildtools/custommakefiles/customprojectpart.cpp:208
+msgid "&Build"
 msgstr ""
 
-#: buildtools/qmake/trollprojectpart.cpp:176
-msgid "&Clean Subproject"
-msgstr ""
+#: buildtools/custommakefiles/customprojectpart.cpp:212
+msgid "&Other"
+msgstr "&Arall"
 
-#: buildtools/qmake/trollprojectpart.cpp:179
-msgid "Clean subproject"
+#: buildtools/custommakefiles/customprojectpart.cpp:215
+msgid "Ma&ke"
+msgstr "Ma&ke"
+
+#: buildtools/custommakefiles/customprojectpart.cpp:243
+msgid "Make Active Directory"
 msgstr ""
 
-#: buildtools/qmake/trollprojectpart.cpp:180
+#: buildtools/custommakefiles/customprojectpart.cpp:245
 msgid ""
-"<b>Clean subproject</b>"
-"<p>Runs <b>make clean</b> from the current subproject directory. Current "
-"subproject is a subproject selected in <b>QMake manager</b> 'overview' window."
-"<br>Environment variables and make arguments can be specified in the project "
-"settings dialog, <b>Make Options</b> tab."
+"<b>Make active directory</b>"
+"<p>Chooses this directory as the destination for new files created using "
+"wizards like the <i>New Class</i> wizard."
 msgstr ""
 
-#: buildtools/qmake/trollprojectpart.cpp:185
-#, fuzzy
-msgid "&Dist-Clean Subproject"
-msgstr "Cau Cywaith"
-
-#: buildtools/qmake/trollprojectpart.cpp:188
-#, fuzzy
-msgid "Dist-Clean subproject"
-msgstr "Cau Cywaith"
+#: buildtools/custommakefiles/customprojectpart.cpp:259
+msgid "Remove from blacklist"
+msgstr ""
 
-#: buildtools/qmake/trollprojectpart.cpp:189
+#: buildtools/custommakefiles/customprojectpart.cpp:261
 msgid ""
-"<b>Dist-Clean subproject</b>"
-"<p>Runs <b>make distclean</b> from the current subproject directory. Current "
-"subproject is a subproject selected in <b>QMake manager</b> 'overview' window."
-"<br>Environment variables and make arguments can be specified in the project "
-"settings dialog, <b>Make Options</b> tab."
+"<b>Remove from blacklist</b>"
+"<p>Removes the given file or directory from the blacklist if it is already in "
+"it."
+"<br>The blacklist contains files and directories that should be ignored even if "
+"they match a project filetype pattern"
 msgstr ""
 
-#: buildtools/qmake/trollprojectpart.cpp:194
-msgid "Execute Subproject"
+#: buildtools/custommakefiles/customprojectpart.cpp:269
+msgid "Add to blacklist"
 msgstr ""
 
-#: buildtools/qmake/trollprojectpart.cpp:197
-#: buildtools/qmake/trollprojectwidget.cpp:261
-msgid "Execute subproject"
+#: buildtools/custommakefiles/customprojectpart.cpp:271
+msgid ""
+"<b>Add to blacklist</b>"
+"<p>Adds the given file or directory to the blacklist."
+"<br>The blacklist contains files and directories that should be ignored even if "
+"they match a project filetype pattern"
 msgstr ""
 
-#: buildtools/qmake/trollprojectpart.cpp:198
-#: buildtools/qmake/trollprojectwidget.cpp:262
-msgid ""
-"<b>Execute subproject</b>"
-"<p>Executes the target program for the currently selected subproject. This "
-"action is allowed only if a type of the subproject is 'application'. The type "
-"of the subproject can be defined in <b>Subproject Settings</b> "
-"dialog (open it from the subproject context menu)."
+#: buildtools/custommakefiles/customprojectpart.cpp:319
+msgid "Add Selected File/Dir(s) to Project"
 msgstr ""
 
-#: buildtools/qmake/trollprojectpart.cpp:291
-#, fuzzy
-msgid "Loading Project..."
-msgstr "&Agor Cywaith..."
+#: buildtools/custommakefiles/customprojectpart.cpp:321
+msgid ""
+"<b>Add to project</b>"
+"<p>Adds selected file/dir(s) to the list of files in the project. Note that the "
+"files should be manually added to the corresponding makefile or build.xml."
+msgstr ""
 
-#: buildtools/qmake/trollprojectpart.cpp:299
-msgid "Choose Qt3 directory"
+#: buildtools/custommakefiles/customprojectpart.cpp:325
+msgid "Add Selected Dir(s) to Project (recursive)"
 msgstr ""
 
-#: buildtools/qmake/trollprojectpart.cpp:300
+#: buildtools/custommakefiles/customprojectpart.cpp:327
 msgid ""
-"Choose the Qt3 directory to use. This directory needs to have an include "
-"directory containing qt.h."
+"<b>Add to project</b>"
+"<p>Recursively adds selected dir(s) to the list of files in the project. Note "
+"that the files should be manually added to the corresponding makefile or "
+"build.xml."
 msgstr ""
 
-#: buildtools/qmake/trollprojectpart.cpp:312
+#: buildtools/custommakefiles/customprojectpart.cpp:334
+msgid "Remove Selected File/Dir(s) From Project"
+msgstr ""
+
+#: buildtools/custommakefiles/customprojectpart.cpp:336
 msgid ""
-"The directory you gave is not a proper Qt directory, the project might not work "
-"properly without one.\n"
-"Please make sure you give a directory that contains a bin with the qmake binary "
-"in it and for Qt3 project also contains an include directory with qt.h in it.\n"
-"Do you want to try setting a Qt directory again?"
+"<b>Remove from project</b>"
+"<p>Removes selected file/dir(s) from the list of files in the project. Note "
+"that the files should be manually excluded from the corresponding makefile or "
+"build.xml."
 msgstr ""
 
-#: buildtools/qmake/trollprojectpart.cpp:318
-msgid "Wrong Qt directory given"
+#: buildtools/custommakefiles/customprojectpart.cpp:341
+msgid "Remove Selected Dir(s) From Project (recursive)"
 msgstr ""
 
-#: buildtools/qmake/trollprojectpart.cpp:333
+#: buildtools/custommakefiles/customprojectpart.cpp:343
 msgid ""
-"You didn't specify a Qt directory, the project might not work properly without "
-"one.\n"
-"Do you want to try setting a Qt directory again?"
+"<b>Remove from project</b>"
+"<p>Recursively removes selected dir(s) from the list of files in the project. "
+"Note that the files should be manually excluded from the corresponding makefile "
+"or build.xml."
 msgstr ""
 
-#: buildtools/qmake/trollprojectpart.cpp:336
-msgid "No Qt directory given"
+#: buildtools/custommakefiles/customprojectpart.cpp:461
+msgid ""
+"This project does not contain any files yet.\n"
+"Populate it with all C/C++/Java files below the project directory?"
 msgstr ""
 
-#: buildtools/qmake/trollprojectpart.cpp:351
-msgid "Choose QMake executable"
+#: buildtools/custommakefiles/customprojectpart.cpp:463
+#, fuzzy
+msgid "Populate"
+msgstr "Patrymlun"
+
+#: buildtools/custommakefiles/customprojectpart.cpp:463
+msgid "Do Not Populate"
 msgstr ""
 
-#: buildtools/qmake/trollprojectpart.cpp:352
+#: buildtools/custommakefiles/customprojectpart.cpp:1161
+#, fuzzy
+msgid "Object Files"
+msgstr "Agor Ffeil"
+
+#: buildtools/custommakefiles/customprojectpart.cpp:1162
+#, fuzzy
+msgid "Other Files"
+msgstr "Eraill"
+
+#: buildtools/custommakefiles/custommanagerwidget.cpp:43
 msgid ""
-"Choose the QMake binary to use. QMake is used to generate Makefiles from the "
-"project files."
+"_: blacklisted files and directories are not considered part of the project, "
+"even if they fit one of the wildcard patterns in the project file list\n"
+"Blacklisted files/dirs"
 msgstr ""
 
-#: buildtools/qmake/trollprojectpart.cpp:363
-msgid ""
-"The binary you gave is not executable, the project might not work properly.\n"
-"Please make sure you give a qmake binary that is executable.\n"
-"Do you want to try setting the QMake binary again?"
+#: buildtools/lib/widgets/addenvvardlg.cpp:34
+msgid "Add Environment Variable"
 msgstr ""
 
-#: buildtools/qmake/trollprojectpart.cpp:367
-msgid "Wrong QMake binary given"
+#: buildtools/lib/widgets/addenvvardlg.cpp:42
+msgid "&Value:"
+msgstr "&Gwerth:"
+
+#: buildtools/lib/widgets/addfilesdialog.cpp:35
+#: buildtools/lib/widgets/addfilesdialog.cpp:54
+msgid "Copy File(s)"
 msgstr ""
 
-#: buildtools/qmake/trollprojectpart.cpp:382
-msgid ""
-"You didn't specify a QMake binary, the project might not work properly without "
-"one.\n"
-"Do you want to try setting a QMake binary again?"
+#: buildtools/lib/widgets/addfilesdialog.cpp:36
+#: buildtools/lib/widgets/addfilesdialog.cpp:55
+msgid "Create Symbolic Link(s)"
 msgstr ""
 
-#: buildtools/qmake/trollprojectpart.cpp:385
-msgid "No QMake binary given"
+#: buildtools/lib/widgets/addfilesdialog.cpp:37
+#: buildtools/lib/widgets/addfilesdialog.cpp:56
+msgid "Add Relative Path(s)"
 msgstr ""
 
-#: buildtools/qmake/projectconfigurationdlg.cpp:140
-msgid "Save the current subprojects configuration?"
+#: buildtools/ant/antprojectpart.cpp:59
+msgid ""
+"<b>Build project</b>"
+"<p>Executes <b>ant dist</b> command to build the project."
 msgstr ""
 
-#: buildtools/qmake/projectconfigurationdlg.cpp:141
-#, fuzzy
-msgid "Save Configuration?"
-msgstr "Ffurf&wedd"
+#: buildtools/ant/antprojectpart.cpp:64
+msgid ""
+"<b>Build target</b>"
+"<p>Executes <b>ant target_name</b> command to build the specified target."
+msgstr ""
 
-#: buildtools/qmake/projectconfigurationdlg.cpp:1380
-msgid "Add include directory:"
+#: buildtools/ant/antprojectpart.cpp:467
+msgid "Ant Options"
 msgstr ""
 
-#: buildtools/qmake/projectconfigurationdlg.cpp:1463
-msgid "Add Library: Either choose the .a/.so file or give -l<libname>"
+#: buildtools/ant/antprojectpart.cpp:502
+msgid "Classpath"
 msgstr ""
 
-#: buildtools/autotools/targetoptionsdlg.cpp:297
-#: buildtools/qmake/projectconfigurationdlg.cpp:1465
-msgid "Shared Library (*.so)"
+#: buildtools/ant/antprojectpart.cpp:565
+msgid "Remove %1 From Project"
 msgstr ""
 
-#: buildtools/autotools/targetoptionsdlg.cpp:297
-#: buildtools/qmake/projectconfigurationdlg.cpp:1465
-msgid "Static Library (*.a)"
+#: buildtools/ant/antprojectpart.cpp:567
+msgid "<b>Remove from project</b><p>Removes current file from the project."
 msgstr ""
 
-#: buildtools/qmake/projectconfigurationdlg.cpp:1547
-msgid "Add library directory:"
+#: buildtools/ant/antprojectpart.cpp:571
+msgid "Add %1 to Project"
 msgstr ""
 
-#: buildtools/qmake/projectconfigurationdlg.cpp:1575
-msgid "Change include directory:"
+#: buildtools/ant/antprojectpart.cpp:573
+msgid "<b>Add to project</b><p>Adds current file from the project."
 msgstr ""
 
-#: buildtools/qmake/projectconfigurationdlg.cpp:1604
-msgid "Change Library:"
+#: buildtools/pascal/pascalproject_part.cpp:66
+msgid ""
+"<b>Build project</b>"
+"<p>Runs the compiler on a main source file of the project. The compiler and the "
+"main source file can be set in project settings, <b>Pascal Compiler</b> tab."
 msgstr ""
 
-#: buildtools/qmake/projectconfigurationdlg.cpp:1660
-msgid "Change library directory:"
+#: buildtools/pascal/pascalproject_part.cpp:72
+msgid ""
+"<b>Execute program</b>"
+"<p>Executes the main program specified in project settings, <b>Run options</b> "
+"tab. If nothing is set, the binary file with the same name as the main source "
+"file name is executed."
 msgstr ""
 
-#: buildtools/qmake/projectconfigurationdlg.cpp:1687
-msgid "Add target:"
+#: buildtools/pascal/pascalproject_part.cpp:341
+msgid ""
+"Could not find pascal compiler.\n"
+"Check if your compiler settings are correct."
 msgstr ""
 
-#: buildtools/qmake/projectconfigurationdlg.cpp:1708
-msgid "Change target:"
+#: buildtools/autotools/configureoptionswidget.cpp:398
+#: buildtools/pascal/pascalproject_part.cpp:450
+msgid ""
+"There was an error loading the module %1.\n"
+"The diagnostics is:\n"
+"%2"
 msgstr ""
+"Bu gwall wrth lwytho'r modiwl %1.\n"
+"Dyma'r ddiagnosteg:\n"
+" %2"
 
 #: buildtools/qmake/scope.cpp:161
 #, fuzzy, c-format
-msgid "Couldn't parse project file: %1"
+msgid "Could not parse project file: %1"
 msgstr "Methu Cyfieithu'r Testun Tarddiad"
 
 #: buildtools/qmake/scope.cpp:162
 #, fuzzy
-msgid "Couldn't parse project file"
+msgid "Could not parse project file"
 msgstr "Methu Cyfieithu'r Testun Tarddiad"
 
 #: buildtools/qmake/scope.cpp:201
 #, fuzzy, c-format
-msgid "Couldn't write project file: %1"
+msgid "Could not write project file: %1"
 msgstr "Methu Cyfieithu'r Testun Tarddiad"
 
 #: buildtools/qmake/scope.cpp:202
 #, fuzzy
-msgid "Couldn't write project file"
+msgid "Could not write project file"
 msgstr "Methu Cyfieithu'r Testun Tarddiad"
 
-#: buildtools/qmake/qmakescopeitem.cpp:88
-msgid "Headers"
-msgstr "Penawdau"
-
-#: buildtools/qmake/qmakescopeitem.cpp:92
-msgid "Forms"
-msgstr "Ffurflenni"
-
-#: buildtools/qmake/qmakescopeitem.cpp:96
-msgid "Corba IDLs"
-msgstr ""
-
-#: buildtools/qmake/qmakescopeitem.cpp:100
-msgid "Lexsources"
+#: buildtools/qmake/createscopedlg.cpp:33
+msgid "Choose existing .pri file or give a new filename for creation"
 msgstr ""
 
-#: buildtools/qmake/qmakescopeitem.cpp:104
-msgid "Yaccsources"
+#: buildtools/qmake/createscopedlg.cpp:91
+msgid ""
+"You did not specify all needed information. The scope will not be created."
+"<br>Do you want to abort the scope creation?"
 msgstr ""
 
-#: buildtools/qmake/qmakescopeitem.cpp:108
-msgid "Images"
-msgstr "Delweddau"
-
-#: buildtools/qmake/qmakescopeitem.cpp:112
+#: buildtools/qmake/createscopedlg.cpp:93
 #, fuzzy
-msgid "Resources"
-msgstr "&Adfer"
-
-#: buildtools/qmake/qmakescopeitem.cpp:116
-msgid "Distfiles"
-msgstr ""
-
-#: buildtools/qmake/qmakescopeitem.cpp:124
-msgid "Installs"
-msgstr ""
-
-#: buildtools/qmake/qmakescopeitem.cpp:128
-msgid "Install object"
-msgstr ""
-
-#: buildtools/qmake/qmakescopeitem.cpp:133
-msgid "Source Files"
-msgstr ""
+msgid "Missing information"
+msgstr "G&wybodaeth"
 
 #: buildtools/qmake/trollprojectwidget.cpp:107
 msgid "Add subproject"
@@ -24237,10 +26574,40 @@ msgstr ""
 #: buildtools/qmake/trollprojectwidget.cpp:117
 msgid ""
 "<b>Create scope</b>"
-"<p>Creates QMake scope in the project file in case the subproject is selected "
+"<p>Creates TQMake scope in the project file in case the subproject is selected "
 "or creates nested scope in case the scope is selected."
 msgstr ""
 
+#: buildtools/autotools/autoprojectpart.cpp:108
+#: buildtools/qmake/trollprojectpart.cpp:107
+#: buildtools/qmake/trollprojectwidget.cpp:125
+msgid ""
+"<b>Build project</b>"
+"<p>Runs <b>make</b> from the project directory."
+"<br>Environment variables and make arguments can be specified in the project "
+"settings dialog, <b>Make Options</b> tab."
+msgstr ""
+
+#: buildtools/qmake/trollprojectpart.cpp:114
+#: buildtools/qmake/trollprojectwidget.cpp:133
+msgid "Rebuild project"
+msgstr ""
+
+#: buildtools/qmake/trollprojectpart.cpp:115
+#: buildtools/qmake/trollprojectwidget.cpp:134
+#: buildtools/qmake/trollprojectwidget.cpp:1014
+msgid ""
+"<b>Rebuild project</b>"
+"<p>Runs <b>make clean</b> and then <b>make</b> from the project directory."
+"<br>Environment variables and make arguments can be specified in the project "
+"settings dialog, <b>Make Options</b> tab."
+msgstr ""
+
+#: buildtools/qmake/trollprojectpart.cpp:146
+#: buildtools/qmake/trollprojectwidget.cpp:143
+msgid "Execute main program"
+msgstr ""
+
 #: buildtools/qmake/trollprojectwidget.cpp:144
 msgid ""
 "<b>Execute main program</b>"
@@ -24255,7 +26622,7 @@ msgstr ""
 #: buildtools/qmake/trollprojectwidget.cpp:154
 msgid ""
 "<b>Subproject settings</b>"
-"<p>Opens <b>QMake Subproject Configuration</b> dialog for the currently "
+"<p>Opens <b>TQMake Subproject Configuration</b> dialog for the currently "
 "selected subproject. It provides settings for:"
 "<br>subproject type and configuration,"
 "<br>include and library paths,"
@@ -24299,6 +26666,63 @@ msgid ""
 "<p>Removes file from a current group. Does not remove file from disk."
 msgstr ""
 
+#: buildtools/autotools/autoprojectpart.cpp:127
+#: buildtools/qmake/trollprojectpart.cpp:98
+#: buildtools/qmake/trollprojectwidget.cpp:231
+msgid ""
+"<b>Compile file</b>"
+"<p>Runs <b>make filename.o</b> command from the directory where 'filename' is "
+"the name of currently opened file."
+"<br>Environment variables and make arguments can be specified in the project "
+"settings dialog, <b>Make Options</b> tab."
+msgstr ""
+
+#: buildtools/qmake/trollprojectpart.cpp:152
+#: buildtools/qmake/trollprojectwidget.cpp:240
+msgid "Build subproject"
+msgstr ""
+
+#: buildtools/qmake/trollprojectpart.cpp:153
+#: buildtools/qmake/trollprojectwidget.cpp:241
+msgid ""
+"<b>Build subproject</b>"
+"<p>Runs <b>make</b> from the current subproject directory. Current subproject "
+"is a subproject selected in <b>TQMake manager</b> 'overview' window."
+"<br>Environment variables and make arguments can be specified in the project "
+"settings dialog, <b>Make Options</b> tab."
+msgstr ""
+
+#: buildtools/qmake/trollprojectpart.cpp:161
+#: buildtools/qmake/trollprojectwidget.cpp:250
+msgid "Rebuild subproject"
+msgstr ""
+
+#: buildtools/qmake/trollprojectpart.cpp:162
+#: buildtools/qmake/trollprojectwidget.cpp:251
+msgid ""
+"<b>Rebuild subproject</b>"
+"<p>Runs <b>make clean</b> and then <b>make</b> from the current subproject "
+"directory. Current subproject is a subproject selected in <b>TQMake manager</b> "
+"'overview' window."
+"<br>Environment variables and make arguments can be specified in the project "
+"settings dialog, <b>Make Options</b> tab."
+msgstr ""
+
+#: buildtools/qmake/trollprojectpart.cpp:197
+#: buildtools/qmake/trollprojectwidget.cpp:261
+msgid "Execute subproject"
+msgstr ""
+
+#: buildtools/qmake/trollprojectpart.cpp:198
+#: buildtools/qmake/trollprojectwidget.cpp:262
+msgid ""
+"<b>Execute subproject</b>"
+"<p>Executes the target program for the currently selected subproject. This "
+"action is allowed only if a type of the subproject is 'application'. The type "
+"of the subproject can be defined in <b>Subproject Settings</b> "
+"dialog (open it from the subproject context menu)."
+msgstr ""
+
 #: buildtools/qmake/trollprojectwidget.cpp:276
 msgid "Exclude file"
 msgstr ""
@@ -24307,26 +26731,26 @@ msgstr ""
 msgid "<b>Exclude file</b><p>Exclude the selected file from this scope."
 msgstr ""
 
-#: buildtools/autotools/autoprojectpart.cpp:1121
+#: buildtools/autotools/autoprojectpart.cpp:1198
 #: buildtools/qmake/trollprojectwidget.cpp:678
 #: buildtools/qmake/trollprojectwidget.cpp:2060
 msgid "Your application is currently running. Do you want to restart it?"
 msgstr ""
 
-#: buildtools/autotools/autoprojectpart.cpp:1121
+#: buildtools/autotools/autoprojectpart.cpp:1198
 #: buildtools/qmake/trollprojectwidget.cpp:678
 #: buildtools/qmake/trollprojectwidget.cpp:2060
 msgid "Application Already Running"
 msgstr ""
 
-#: buildtools/autotools/autoprojectpart.cpp:1121
+#: buildtools/autotools/autoprojectpart.cpp:1198
 #: buildtools/qmake/trollprojectwidget.cpp:678
 #: buildtools/qmake/trollprojectwidget.cpp:2060
 #, fuzzy
 msgid "&Restart Application"
 msgstr "&Cymhwysiad"
 
-#: buildtools/autotools/autoprojectpart.cpp:1121
+#: buildtools/autotools/autoprojectpart.cpp:1198
 #: buildtools/qmake/trollprojectwidget.cpp:678
 #: buildtools/qmake/trollprojectwidget.cpp:2060
 msgid "Do &Nothing"
@@ -24349,8 +26773,8 @@ msgstr ""
 
 #: buildtools/qmake/trollprojectwidget.cpp:933
 msgid ""
-"Couldn't create subproject. This means that either the project you wanted to "
-"add a subproject isn't parsed correctly or it's not a subdirs-project."
+"Could not create subproject. This means that either the project you wanted to "
+"add a subproject to is not parsed correctly, or it is not a subdirs-project."
 msgstr ""
 
 #: buildtools/qmake/trollprojectwidget.cpp:935
@@ -24368,9 +26792,9 @@ msgstr "Bar offer"
 
 #: buildtools/qmake/trollprojectwidget.cpp:956
 msgid ""
-"Couldn't delete subproject.\n"
-"This is an internal error, please write a bugreport to bugs.kde.org and include "
-"the output of tdevelop when runfrom a shell."
+"Could not delete subproject.\n"
+"This is an internal error, please write a bug report to bugs.kde.org and "
+"include the output of tdevelop when runfrom a shell."
 msgstr ""
 
 #: buildtools/qmake/trollprojectwidget.cpp:958
@@ -24390,15 +26814,6 @@ msgid ""
 "settings dialog, <b>Make Options</b> tab."
 msgstr ""
 
-#: buildtools/autotools/autoprojectpart.cpp:147
-#: buildtools/autotools/autoprojectpart.cpp:150
-#: buildtools/autotools/autosubprojectview.cpp:248
-#: buildtools/custommakefiles/customprojectpart.cpp:107
-#: buildtools/custommakefiles/customprojectpart.cpp:110
-#: buildtools/qmake/trollprojectwidget.cpp:1000
-msgid "Install"
-msgstr "Gosod"
-
 #: buildtools/qmake/trollprojectwidget.cpp:1001
 msgid ""
 "<b>Install</b>"
@@ -24457,7 +26872,7 @@ msgstr ""
 #: buildtools/qmake/trollprojectwidget.cpp:1020
 msgid ""
 "<b>Run qmake recursively</b>"
-"<p>Runs <b>qmake</b> from the selectedsubproject directory and recurses into "
+"<p>Runs <b>qmake</b> from the selected subproject directory and recurses into "
 "all subproject directories. This creates or regenerates Makefile."
 msgstr ""
 
@@ -24486,7 +26901,7 @@ msgstr ""
 #: buildtools/qmake/trollprojectwidget.cpp:1036
 msgid ""
 "<b>Create scope</b>"
-"<p>Creates QMake scope in the project file of the currently selected "
+"<p>Creates TQMake scope in the project file of the currently selected "
 "subproject."
 msgstr ""
 
@@ -24497,7 +26912,7 @@ msgstr ""
 #: buildtools/qmake/trollprojectwidget.cpp:1039
 msgid ""
 "<b>Subproject settings</b>"
-"<p>Opens <b>QMake Subproject Configuration</b> dialog. It provides settings "
+"<p>Opens <b>TQMake Subproject Configuration</b> dialog. It provides settings "
 "for:"
 "<br>subproject type and configuration,"
 "<br>include and library paths,"
@@ -24510,7 +26925,7 @@ msgstr ""
 #: buildtools/qmake/trollprojectwidget.cpp:1046
 msgid ""
 "<b>Create Scope</b>"
-"<p>Creates QMake scope in the currently selected scope."
+"<p>Creates TQMake scope in the currently selected scope."
 msgstr ""
 
 #: buildtools/qmake/trollprojectwidget.cpp:1047
@@ -24525,8 +26940,8 @@ msgstr ""
 msgid ""
 "<b>Add subproject</b>"
 "<p>Creates a <i>new</i> or adds an <i>existing</i> subproject to the currently "
-"selected scope. This action is allowed only if a type of the subproject is "
-"'subdirectories'. The type of the subproject can be defined in <b>"
+"selected scope. This action is allowed only if the type of the subproject is "
+"'subdirectories'. The type of the subproject can be defined in the <b>"
 "Subproject Settings</b> dialog (open it from the subproject context menu)."
 msgstr ""
 
@@ -24539,14 +26954,14 @@ msgstr "Cywaith &Newydd..."
 msgid ""
 "<b>Disable subproject</b>"
 "<p>Disables the currently selected subproject when this scope is active. Does "
-"not delete the directory from disk. Deleted subproject can be later added by "
-"calling 'Add Subproject' action."
+"not delete the directory from disk. The deleted subproject can be later added "
+"by using the 'Add Subproject' action."
 msgstr ""
 
 #: buildtools/qmake/trollprojectwidget.cpp:1062
 msgid ""
 "<b>Scope settings</b>"
-"<p>Opens <b>QMake Subproject Configuration</b> dialog. It provides settings "
+"<p>Opens <b>TQMake Subproject Configuration</b> dialog. It provides settings "
 "for:"
 "<br>subproject type and configuration,"
 "<br>include and library paths,"
@@ -24558,7 +26973,7 @@ msgstr ""
 
 #: buildtools/qmake/trollprojectwidget.cpp:1191
 msgid ""
-"You didn't select a subproject to add the file to or selected a subproject that "
+"You did not select a subproject to add the file to, or select a subproject that "
 "has subdirs."
 msgstr ""
 
@@ -24596,7 +27011,7 @@ msgstr ""
 #: buildtools/qmake/trollprojectwidget.cpp:1547
 msgid ""
 "<b>Add install object</b>"
-"<p>Creates QMake install object. It is possible to define a list of files to "
+"<p>Creates TQMake install object. It is possible to define a list of files to "
 "install and installation locations for each object. Warning! Install objects "
 "without path specified will not be saved to a project file."
 msgstr ""
@@ -24777,8 +27192,8 @@ msgstr ""
 #: buildtools/qmake/trollprojectwidget.cpp:1797
 msgid ""
 "<b>Remove file</b>"
-"<p>Removes file from a current group. For sources also removes the subclassing "
-"information."
+"<p>Removes file from a current group. For sources, this also removes the "
+"subclassing information."
 msgstr ""
 
 #: buildtools/qmake/trollprojectwidget.cpp:1798
@@ -24829,7 +27244,7 @@ msgstr ""
 #: buildtools/qmake/trollprojectwidget.cpp:2052
 msgid ""
 "Please specify the executable name in the project options dialog or select an "
-"application subproject in the QMake Manager."
+"application subproject in the TQMake Manager."
 msgstr ""
 
 #: buildtools/qmake/trollprojectwidget.cpp:2053
@@ -24841,8 +27256,8 @@ msgstr "Gweithredadwyn:"
 msgid "There is no Makefile in this directory. Run qmake first?"
 msgstr ""
 
-#: buildtools/autotools/autoprojectpart.cpp:646
-#: buildtools/autotools/autoprojectpart.cpp:657
+#: buildtools/autotools/autoprojectpart.cpp:654
+#: buildtools/autotools/autoprojectpart.cpp:665
 #: buildtools/autotools/configureoptionswidget.cpp:239
 #: buildtools/qmake/trollprojectwidget.cpp:2186
 msgid "Do Not Run"
@@ -24850,9 +27265,9 @@ msgstr ""
 
 #: buildtools/qmake/trollprojectwidget.cpp:2276
 msgid ""
-"Couldn't delete Function Scope.\n"
-"This is an internal error, please write a bugreport to bugs.kde.org and include "
-"the output of tdevelop when run from a shell."
+"Could not delete Function Scope.\n"
+"This is an internal error, please write a bug report to bugs.kde.org and "
+"include the output of tdevelop when run from a shell."
 msgstr ""
 
 #: buildtools/qmake/trollprojectwidget.cpp:2276
@@ -24861,9 +27276,9 @@ msgstr ""
 
 #: buildtools/qmake/trollprojectwidget.cpp:2284
 msgid ""
-"Couldn't delete Include Scope.\n"
-"This is an internal error, please write a bugreport to bugs.kde.org and include "
-"the output of tdevelop when run from a shell."
+"Could not delete Include Scope.\n"
+"This is an internal error, please write a bug report to bugs.kde.org and "
+"include the output of tdevelop when run from a shell."
 msgstr ""
 
 #: buildtools/qmake/trollprojectwidget.cpp:2284
@@ -24872,9 +27287,9 @@ msgstr ""
 
 #: buildtools/qmake/trollprojectwidget.cpp:2296
 msgid ""
-"Couldn't delete Scope.\n"
-"This is an internal error, please write a bugreport to bugs.kde.org and include "
-"the output of tdevelop when run from a shell."
+"Could not delete Scope.\n"
+"This is an internal error, please write a bug report to bugs.kde.org and "
+"include the output of tdevelop when run from a shell."
 msgstr ""
 
 #: buildtools/qmake/trollprojectwidget.cpp:2296
@@ -24885,9 +27300,9 @@ msgstr ""
 msgid ""
 "The project file \"%1\" has changed on disk\n"
 "(Or you have \"%2\" opened in the editor, which also triggers a reload when you "
-"change something in the QMake Manager).\n"
+"change something in the TQMake Manager).\n"
 "\n"
-"Do you want to reload the it?"
+"Do you want to reload it?"
 msgstr ""
 
 #: buildtools/qmake/trollprojectwidget.cpp:2462
@@ -24895,353 +27310,333 @@ msgstr ""
 msgid "Project File Changed"
 msgstr "Ffeil wedi Newid"
 
-#: buildtools/qmake/createscopedlg.cpp:33
-msgid "Choose existing .pri file or give a new filename for creation"
+#: buildtools/qmake/projectconfigurationdlg.cpp:140
+msgid "Save the current subproject's configuration?"
 msgstr ""
 
-#: buildtools/qmake/createscopedlg.cpp:91
-msgid ""
-"You did not specify all needed information. The scope will not be created."
-"<br>Do you want to abort the scope creation?"
+#: buildtools/qmake/projectconfigurationdlg.cpp:141
+#, fuzzy
+msgid "Save Configuration?"
+msgstr "Ffurf&wedd"
+
+#: buildtools/qmake/projectconfigurationdlg.cpp:1380
+msgid "Add include directory:"
 msgstr ""
 
-#: buildtools/qmake/createscopedlg.cpp:93
-#, fuzzy
-msgid "Missing information"
-msgstr "G&wybodaeth"
+#: buildtools/qmake/projectconfigurationdlg.cpp:1463
+msgid "Add Library: Either choose the .a/.so file or give -l<libname>"
+msgstr ""
 
-#: buildtools/pascal/pascalproject_part.cpp:66
-msgid ""
-"<b>Build project</b>"
-"<p>Runs the compiler on a main source file of the project. The compiler and the "
-"main source file can be set in project settings, <b>Pascal Compiler</b> tab."
+#: buildtools/autotools/targetoptionsdlg.cpp:297
+#: buildtools/qmake/projectconfigurationdlg.cpp:1465
+msgid "Shared Library (*.so)"
 msgstr ""
 
-#: buildtools/pascal/pascalproject_part.cpp:72
-msgid ""
-"<b>Execute program</b>"
-"<p>Executes the main program specified in project settings, <b>Run options</b> "
-"tab. If nothing is set, the binary file with the same name as the main source "
-"file name is executed."
+#: buildtools/autotools/targetoptionsdlg.cpp:297
+#: buildtools/qmake/projectconfigurationdlg.cpp:1465
+msgid "Static Library (*.a)"
 msgstr ""
 
-#: buildtools/pascal/pascalproject_part.cpp:341
-msgid ""
-"Could not find pascal compiler.\n"
-"Check if your compiler settings are correct."
+#: buildtools/qmake/projectconfigurationdlg.cpp:1547
+msgid "Add library directory:"
 msgstr ""
 
-#: buildtools/autotools/configureoptionswidget.cpp:398
-#: buildtools/pascal/pascalproject_part.cpp:450
-msgid ""
-"There was an error loading the module %1.\n"
-"The diagnostics is:\n"
-"%2"
+#: buildtools/qmake/projectconfigurationdlg.cpp:1575
+msgid "Change include directory:"
 msgstr ""
-"Bu gwall wrth lwytho'r modiwl %1.\n"
-"Dyma'r ddiagnosteg:\n"
-" %2"
 
-#: buildtools/custommakefiles/selectnewfilesdialog.cpp:24
-msgid "Add newly created files to project"
+#: buildtools/qmake/projectconfigurationdlg.cpp:1604
+msgid "Change Library:"
 msgstr ""
 
-#: buildtools/custommakefiles/customprojectpart.cpp:79
-#: buildtools/custommakefiles/customprojectpart.cpp:80
-#, fuzzy
-msgid "Re-Populate Project"
-msgstr "Agor Cywaith"
+#: buildtools/qmake/projectconfigurationdlg.cpp:1660
+msgid "Change library directory:"
+msgstr ""
 
-#: buildtools/custommakefiles/customprojectpart.cpp:81
-msgid ""
-"<b>Re-Populate Project</b>"
-"<p>Re-Populate's the project, searches through the project directory and adds "
-"all files that match one of the wildcards set in the custom manager options to "
-"the project filelist."
+#: buildtools/qmake/projectconfigurationdlg.cpp:1687
+msgid "Add target:"
 msgstr ""
 
-#: buildtools/custommakefiles/customprojectpart.cpp:87
-msgid ""
-"<b>Build project</b>"
-"<p>Runs <b>make</b> from the project directory."
-"<br>Environment variables and make arguments can be specified in the project "
-"settings dialog, <b>Build Options</b> tab."
+#: buildtools/qmake/projectconfigurationdlg.cpp:1708
+msgid "Change target:"
 msgstr ""
 
-#: buildtools/custommakefiles/customprojectpart.cpp:91
-msgid "&Build Active Directory"
+#: buildtools/qmake/qmakescopeitem.cpp:89
+msgid "Headers"
+msgstr "Penawdau"
+
+#: buildtools/qmake/qmakescopeitem.cpp:93
+msgid "Forms"
+msgstr "Ffurflenni"
+
+#: buildtools/qmake/qmakescopeitem.cpp:97
+msgid "Corba IDLs"
 msgstr ""
 
-#: buildtools/custommakefiles/customprojectpart.cpp:94
-msgid "Build active directory"
+#: buildtools/qmake/qmakescopeitem.cpp:101
+msgid "Lexsources"
 msgstr ""
 
-#: buildtools/custommakefiles/customprojectpart.cpp:95
-msgid ""
-"<b>Build active directory</b>"
-"<p>Constructs a series of make commands to build the active directory. "
-"Environment variables and make arguments can be specified in the project "
-"settings dialog, <b>Make Options</b> tab."
+#: buildtools/qmake/qmakescopeitem.cpp:105
+msgid "Yaccsources"
 msgstr ""
 
-#: buildtools/custommakefiles/customprojectpart.cpp:103
-msgid ""
-"<b>Compile file</b>"
-"<p>Runs <b>make filename.o</b> command from the directory where 'filename' is "
-"the name of currently opened file."
-"<br>Environment variables and make arguments can be specified in the project "
-"settings dialog, <b>Build Options</b> tab."
+#: buildtools/qmake/qmakescopeitem.cpp:109
+msgid "Images"
+msgstr "Delweddau"
+
+#: buildtools/qmake/qmakescopeitem.cpp:113
+#, fuzzy
+msgid "Resources"
+msgstr "&Adfer"
+
+#: buildtools/qmake/qmakescopeitem.cpp:117
+msgid "Distfiles"
 msgstr ""
 
-#: buildtools/autotools/autoprojectpart.cpp:151
-#: buildtools/custommakefiles/customprojectpart.cpp:111
-msgid ""
-"<b>Install</b>"
-"<p>Runs <b>make install</b> command from the project directory."
-"<br>Environment variables and make arguments can be specified in the project "
-"settings dialog, <b>Make Options</b> tab."
+#: buildtools/qmake/qmakescopeitem.cpp:125
+msgid "Installs"
 msgstr ""
 
-#: buildtools/custommakefiles/customprojectpart.cpp:115
-msgid "Install Active Directory"
+#: buildtools/qmake/qmakescopeitem.cpp:129
+msgid "Install object"
 msgstr ""
 
-#: buildtools/custommakefiles/customprojectpart.cpp:118
+#: buildtools/qmake/qmakescopeitem.cpp:134
+msgid "Source Files"
+msgstr ""
+
+#: buildtools/qmake/trollprojectpart.cpp:82
+#: buildtools/qmake/trollprojectpart.cpp:89
+#: buildtools/qmake/trollprojectpart.cpp:279
 #, fuzzy
-msgid "Install active directory"
-msgstr "Arsefydlu"
+msgid "TQMake Manager"
+msgstr "Dewisiadau'r Dudalen Gyntaf"
 
-#: buildtools/custommakefiles/customprojectpart.cpp:119
+#: buildtools/qmake/trollprojectpart.cpp:83
 msgid ""
-"<b>Install active directory</b>"
-"<p>Runs <b>make install</b> command from the active directory."
-"<br>Environment variables and make arguments can be specified in the project "
-"settings dialog, <b>Make Options</b> tab."
+"<b>TQMake manager</b>"
+"<p>The TQMake manager project tree consists of two parts. The 'overview' in the "
+"upper half shows the subprojects, each one having a .pro file. The 'details' "
+"view in the lower half shows the list of files for the active subproject "
+"selected in the overview."
 msgstr ""
 
-#: buildtools/autotools/autoprojectpart.cpp:156
-#: buildtools/autotools/autosubprojectview.cpp:254
-#: buildtools/custommakefiles/customprojectpart.cpp:123
-msgid "Install (as root user)"
-msgstr ""
+#: buildtools/qmake/trollprojectpart.cpp:89
+#, fuzzy
+msgid "TQMake manager"
+msgstr "Dewisiadau'r Dudalen Gyntaf"
 
-#: buildtools/autotools/autoprojectpart.cpp:159
-#: buildtools/custommakefiles/customprojectpart.cpp:126
-msgid "Install as root user"
+#: buildtools/qmake/trollprojectpart.cpp:111
+msgid "&Rebuild Project"
 msgstr ""
 
-#: buildtools/autotools/autoprojectpart.cpp:160
-#: buildtools/custommakefiles/customprojectpart.cpp:127
+#: buildtools/qmake/trollprojectpart.cpp:119
+#, fuzzy
+msgid "&Install Project"
+msgstr "C&au Cywaith"
+
+#: buildtools/qmake/trollprojectpart.cpp:122
+#, fuzzy
+msgid "Install project"
+msgstr "cywaith Newydd"
+
+#: buildtools/qmake/trollprojectpart.cpp:123
 msgid ""
-"<b>Install</b>"
-"<p>Runs <b>make install</b> command from the project directory with root "
-"privileges."
-"<br>It is executed via tdesu command."
+"<b>Install project</b>"
+"<p>Runs <b>make install</b> from the project directory."
 "<br>Environment variables and make arguments can be specified in the project "
 "settings dialog, <b>Make Options</b> tab."
 msgstr ""
 
-#: buildtools/custommakefiles/customprojectpart.cpp:136
+#: buildtools/autotools/autoprojectpart.cpp:178
+#: buildtools/qmake/trollprojectpart.cpp:131
 msgid ""
 "<b>Clean project</b>"
 "<p>Runs <b>make clean</b> command from the project directory."
 "<br>Environment variables and make arguments can be specified in the project "
-"settings dialog, <b>Build Options</b> tab."
+"settings dialog, <b>Make Options</b> tab."
 msgstr ""
 
-#: buildtools/custommakefiles/customprojectpart.cpp:144
-msgid ""
-"<b>Execute program</b>"
-"<p>Executes the main program specified in project settings, <b>Run Options</b> "
-"tab. If it is not specified then the active target is used to determine the "
-"application to run."
-msgstr ""
+#: buildtools/qmake/trollprojectpart.cpp:135
+#, fuzzy
+msgid "&Dist-Clean Project"
+msgstr "C&au Cywaith"
 
-#: buildtools/custommakefiles/customprojectpart.cpp:151
+#: buildtools/qmake/trollprojectpart.cpp:138
+#, fuzzy
+msgid "Dist-Clean project"
+msgstr "Cau Cywaith"
+
+#: buildtools/qmake/trollprojectpart.cpp:139
 msgid ""
-"<b>Build target</b>"
-"<p>Runs <b>make targetname</b> from the project directory (targetname is the "
-"name of the target selected)."
+"<b>Dist-Clean project</b>"
+"<p>Runs <b>make distclean</b> command from the project directory."
 "<br>Environment variables and make arguments can be specified in the project "
-"settings dialog, <b>Build Options</b> tab."
+"settings dialog, <b>Make Options</b> tab."
 msgstr ""
 
-#: buildtools/custommakefiles/customprojectpart.cpp:158
-msgid "Make &Environment"
+#: buildtools/qmake/trollprojectpart.cpp:147
+msgid ""
+"<b>Execute program</b>"
+"<p>Executes the currently selected subproject if it is an application or the "
+"program specified in project settings, <b>Run Options</b> tab."
 msgstr ""
 
-#: buildtools/custommakefiles/customprojectpart.cpp:160
-msgid "Make environment"
+#: buildtools/qmake/trollprojectpart.cpp:149
+msgid "&Build Subproject"
 msgstr ""
 
-#: buildtools/custommakefiles/customprojectpart.cpp:161
-msgid ""
-"<b>Make Environment</b>"
-"<p> Choose the set of environment variables to be passed on to make."
-"<br>Environment variables can be specified in the project settings dialog, <b>"
-"Build Options</b> tab."
+#: buildtools/qmake/trollprojectpart.cpp:158
+msgid "&Rebuild Subproject"
 msgstr ""
 
-#: buildtools/custommakefiles/customprojectpart.cpp:196
+#: buildtools/qmake/trollprojectpart.cpp:167
 #, fuzzy
-msgid "Custom Manager"
-msgstr "Newidynnau &Addasiedig..."
-
-#: buildtools/custommakefiles/customprojectpart.cpp:208
-msgid "&Build"
-msgstr ""
-
-#: buildtools/custommakefiles/customprojectpart.cpp:212
-msgid "&Other"
-msgstr "&Arall"
-
-#: buildtools/custommakefiles/customprojectpart.cpp:215
-msgid "Ma&ke"
-msgstr "Ma&ke"
+msgid "&Install Subproject"
+msgstr "cywaith Newydd"
 
-#: buildtools/custommakefiles/customprojectpart.cpp:243
-msgid "Make Active Directory"
-msgstr ""
+#: buildtools/qmake/trollprojectpart.cpp:170
+#, fuzzy
+msgid "Install subproject"
+msgstr "cywaith Newydd"
 
-#: buildtools/custommakefiles/customprojectpart.cpp:245
+#: buildtools/qmake/trollprojectpart.cpp:171
 msgid ""
-"<b>Make active directory</b>"
-"<p>Chooses this directory as the destination for new files created using "
-"wizards like the <i>New Class</i> wizard."
-msgstr ""
-
-#: buildtools/custommakefiles/customprojectpart.cpp:259
-msgid "Remove from blacklist"
+"<b>Install subproject</b>"
+"<p>Runs <b>make install</b> from the current subproject directory. The current "
+"subproject is the subproject selected in the <b>TQMake manager</b> "
+"'overview' window."
+"<br>Environment variables and make arguments can be specified in the project "
+"settings dialog, <b>Make Options</b> tab."
 msgstr ""
 
-#: buildtools/custommakefiles/customprojectpart.cpp:261
-msgid ""
-"<b>Remove from blacklist</b>"
-"<p>Removes the given file or directory from the blacklist if its already in it."
-"<br>The blacklist contains files and directories that should be ignored even if "
-"they match a project filetype pattern"
+#: buildtools/qmake/trollprojectpart.cpp:176
+msgid "&Clean Subproject"
 msgstr ""
 
-#: buildtools/custommakefiles/customprojectpart.cpp:269
-msgid "Add to blacklist"
+#: buildtools/qmake/trollprojectpart.cpp:179
+msgid "Clean subproject"
 msgstr ""
 
-#: buildtools/custommakefiles/customprojectpart.cpp:271
+#: buildtools/qmake/trollprojectpart.cpp:180
 msgid ""
-"<b>Add to blacklist</b>"
-"<p>Adds the given file or directory to the blacklist."
-"<br>The blacklist contains files and directories that should be ignored even if "
-"they match a project filetype pattern"
-msgstr ""
-
-#: buildtools/custommakefiles/customprojectpart.cpp:319
-msgid "Add Selected File/Dir(s) to Project"
+"<b>Clean subproject</b>"
+"<p>Runs <b>make clean</b> from the current subproject directory. The current "
+"subproject is the subproject selected in the <b>TQMake manager</b> "
+"'overview' window."
+"<br>Environment variables and make arguments can be specified in the project "
+"settings dialog, <b>Make Options</b> tab."
 msgstr ""
 
-#: buildtools/custommakefiles/customprojectpart.cpp:321
-msgid ""
-"<b>Add to project</b>"
-"<p>Adds selected file/dir(s) to the list of files in project. Note that the "
-"files should be manually added to corresponding makefile or build.xml."
-msgstr ""
+#: buildtools/qmake/trollprojectpart.cpp:185
+#, fuzzy
+msgid "&Dist-Clean Subproject"
+msgstr "Cau Cywaith"
 
-#: buildtools/custommakefiles/customprojectpart.cpp:325
-msgid "Add Selected Dir(s) to Project (recursive)"
-msgstr ""
+#: buildtools/qmake/trollprojectpart.cpp:188
+#, fuzzy
+msgid "Dist-Clean subproject"
+msgstr "Cau Cywaith"
 
-#: buildtools/custommakefiles/customprojectpart.cpp:327
+#: buildtools/qmake/trollprojectpart.cpp:189
 msgid ""
-"<b>Add to project</b>"
-"<p>Recursively adds selected dir(s) to the list of files in project. Note that "
-"the files should be manually added to corresponding makefile or build.xml."
+"<b>Dist-Clean subproject</b>"
+"<p>Runs <b>make distclean</b> from the current subproject directory. The "
+"current subproject is the subproject selected in the <b>TQMake manager</b> "
+"'overview' window."
+"<br>Environment variables and make arguments can be specified in the project "
+"settings dialog, <b>Make Options</b> tab."
 msgstr ""
 
-#: buildtools/custommakefiles/customprojectpart.cpp:334
-msgid "Remove Selected File/Dir(s) From Project"
+#: buildtools/qmake/trollprojectpart.cpp:194
+msgid "Execute Subproject"
 msgstr ""
 
-#: buildtools/custommakefiles/customprojectpart.cpp:336
-msgid ""
-"<b>Remove from project</b>"
-"<p>Removes selected file/dir(s) from the list of files in project. Note that "
-"the files should be manually excluded from corresponding makefile or build.xml."
-msgstr ""
+#: buildtools/qmake/trollprojectpart.cpp:291
+#, fuzzy
+msgid "Loading Project..."
+msgstr "&Agor Cywaith..."
 
-#: buildtools/custommakefiles/customprojectpart.cpp:341
-msgid "Remove Selected Dir(s) From Project (recursive)"
-msgstr ""
+#: buildtools/qmake/trollprojectpart.cpp:299
+#, fuzzy
+msgid "Choose TQt3 directory"
+msgstr "Cyfeiriadur:"
 
-#: buildtools/custommakefiles/customprojectpart.cpp:343
+#: buildtools/qmake/trollprojectpart.cpp:300
 msgid ""
-"<b>Remove from project</b>"
-"<p>Recursively removes selected dir(s) from the list of files in project. Note "
-"that the files should be manually excluded from corresponding makefile or "
-"build.xml."
+"Choose the TQt3 directory to use. This directory needs to have an include "
+"directory containing tqt.h."
 msgstr ""
 
-#: buildtools/custommakefiles/customprojectpart.cpp:461
+#: buildtools/qmake/trollprojectpart.cpp:312
 msgid ""
-"This project does not contain any files yet.\n"
-"Populate it with all C/C++/Java files below the project directory?"
+"The directory you gave is not a proper TQt directory, the project might not "
+"work properly without one.\n"
+"Please make sure you give a directory that contains a bin with the qmake binary "
+"in it and for TQt3 project also contains an include directory with tqt.h in "
+"it.\n"
+"Do you want to try setting a TQt directory again?"
 msgstr ""
 
-#: buildtools/custommakefiles/customprojectpart.cpp:463
+#: buildtools/qmake/trollprojectpart.cpp:318
 #, fuzzy
-msgid "Populate"
-msgstr "Patrymlun"
+msgid "Wrong TQt directory given"
+msgstr "Cyfeiriadur:"
 
-#: buildtools/custommakefiles/customprojectpart.cpp:463
-msgid "Do Not Populate"
+#: buildtools/qmake/trollprojectpart.cpp:333
+msgid ""
+"You did not specify a TQt directory, and the project might not work properly "
+"without one.\n"
+"Do you want to try setting a TQt directory again?"
 msgstr ""
 
-#: buildtools/custommakefiles/customprojectpart.cpp:1139
+#: buildtools/qmake/trollprojectpart.cpp:336
 #, fuzzy
-msgid "Object Files"
-msgstr "Agor Ffeil"
+msgid "No TQt directory given"
+msgstr "Cyfeiriadur:"
 
-#: buildtools/custommakefiles/customprojectpart.cpp:1140
-#, fuzzy
-msgid "Other Files"
-msgstr "Eraill"
+#: buildtools/qmake/trollprojectpart.cpp:351
+msgid "Choose TQMake executable"
+msgstr ""
 
-#: buildtools/custommakefiles/custommanagerwidget.cpp:43
+#: buildtools/qmake/trollprojectpart.cpp:352
 msgid ""
-"_: blacklisted files and directories are not considered part of the project, "
-"even if they fit one of the wildcard patterns in the project file list\n"
-"Blacklisted files/dirs"
+"Choose the TQMake binary to use. TQMake is used to generate Makefiles from the "
+"project files."
 msgstr ""
 
-#: buildtools/autotools/addfiledlg.cpp:72
-#: buildtools/script/scriptnewfiledlg.cpp:80
-msgid "Please enter the file name without '/' and so on."
+#: buildtools/qmake/trollprojectpart.cpp:363
+msgid ""
+"The binary you gave is not executable, the project might not work properly.\n"
+"Please make sure you give a qmake binary that is executable.\n"
+"Do you want to try setting the TQMake binary again?"
 msgstr ""
 
-#: buildtools/script/scriptnewfiledlg.cpp:90
-msgid "A file with this name already exists."
+#: buildtools/qmake/trollprojectpart.cpp:367
+msgid "Wrong TQMake binary given"
 msgstr ""
 
-#: buildtools/script/scriptnewfiledlg.cpp:99
-msgid "A file template for this extension does not exist."
+#: buildtools/qmake/trollprojectpart.cpp:382
+msgid ""
+"You did not specify a TQMake binary, and the project might not work properly "
+"without one.\n"
+"Do you want to try setting a TQMake binary again?"
 msgstr ""
 
-#: buildtools/script/scriptnewfiledlg.cpp:111
-msgid "Could not create the new file."
-msgstr "Methu creu'r ffeil newydd."
-
-#: buildtools/script/scriptprojectpart.cpp:56
-msgid "<b>New file</b><p>Creates a new file."
+#: buildtools/qmake/trollprojectpart.cpp:385
+msgid "No TQMake binary given"
 msgstr ""
 
-#: buildtools/script/scriptprojectpart.cpp:59
-#, fuzzy
-msgid "Rescan Project"
-msgstr "Agor Cywaith"
-
-#: buildtools/autotools/managecustomcommand.cpp:46
+#: buildtools/autotools/choosetargetdialog.cpp:265
 msgid ""
-"_: this is a list of items in the combobox\n"
-"Make target,Make target (as root),Make command,Make command (as "
-"root),Command,Command (as root)"
+"The file %1 already exists in the chosen target.\n"
+"The file will be created but will not be added to the target.\n"
+"Rename the file and select 'Add Existing Files' from the Automake Manager."
+msgstr ""
+
+#: buildtools/autotools/choosetargetdialog.cpp:267
+msgid "Error While Adding Files"
 msgstr ""
 
 #: buildtools/autotools/addexistingfilesdlg.cpp:75
@@ -25286,88 +27681,6 @@ msgstr ""
 msgid "Copy (not recommended)"
 msgstr ""
 
-#: buildtools/autotools/subprojectoptionsdlg.cpp:48
-msgid "Subproject Options for '%1'"
-msgstr ""
-
-#: buildtools/autotools/subprojectoptionsdlg.cpp:305
-msgid ""
-"Add Include directory: Choose directory, give -Idirectory or use a variable "
-"with -I$(FOOBAR)"
-msgstr ""
-
-#: buildtools/autotools/subprojectoptionsdlg.cpp:331
-msgid "Edit Include Directory"
-msgstr ""
-
-#: buildtools/autotools/subprojectoptionsdlg.cpp:331
-msgid "Edit include directory:"
-msgstr ""
-
-#: buildtools/autotools/subprojectoptionsdlg.cpp:360
-msgid "Edit Prefix"
-msgstr ""
-
-#: buildtools/autotools/autolistviewitems.cpp:134
-msgid "Edit Substitution"
-msgstr ""
-
-#: buildtools/autotools/autolistviewitems.cpp:134
-msgid "Substitution:"
-msgstr ""
-
-#: buildtools/autotools/addexistingdirectoriesdlg.cpp:60
-msgid ""
-"Drag one or more directories with an existing Makefile.am from the left view "
-"and drop it here."
-msgstr ""
-
-#: buildtools/autotools/removefiledlg.cpp:65
-msgid ""
-"The file %1 is still used by the following targets:\n"
-"%2\n"
-"Remove it from all of them?"
-msgstr ""
-
-#: buildtools/autotools/removefiledlg.cpp:70
-msgid "Do you really want to remove <b>%1</b>?"
-msgstr "<b>Ydych wir eisiau gwaredu %1?</b>"
-
-#: buildtools/autotools/removetargetdlg.cpp:48
-msgid ""
-"Do you really want to remove <b>%1</b>"
-"<br>with <b>all files</b> that are attached to it"
-"<br>and <b>all dependencies</b>?"
-msgstr ""
-
-#: buildtools/autotools/removetargetdlg.cpp:111
-msgid ""
-"_: no dependency\n"
-"<none>"
-msgstr "<dim>"
-
-#: buildtools/autotools/removetargetdlg.cpp:117
-#, c-format
-msgid "Removing Target... %p%"
-msgstr ""
-
-#: buildtools/autotools/configureoptionswidget.cpp:239
-msgid "Re-run configure for %1 now?"
-msgstr ""
-
-#: buildtools/autotools/configureoptionswidget.cpp:239
-#, fuzzy
-msgid "Rerun"
-msgstr "Rhedeg"
-
-#: buildtools/autotools/addprefixdlg.cpp:27
-msgid "Add Prefix"
-msgstr ""
-
-#: buildtools/autotools/addprefixdlg.cpp:35
-msgid "&Path:"
-msgstr "&Llwybr:"
-
 #: buildtools/autotools/autodetailsview.cpp:285
 #: buildtools/autotools/targetoptionsdlg.cpp:40
 msgid "Target Options for '%1'"
@@ -25395,325 +27708,100 @@ msgstr ""
 msgid "Edit external library:"
 msgstr ""
 
-#: buildtools/autotools/kimporticonview.cpp:66
-msgid "Or just use the buttons."
-msgstr ""
-
-#: buildtools/autotools/addsubprojectdlg.cpp:58
-msgid "You have to give the subproject a name."
-msgstr ""
-
-#: buildtools/autotools/addsubprojectdlg.cpp:65
-msgid "A subproject with this name already exists."
-msgstr ""
-
-#: buildtools/autotools/addsubprojectdlg.cpp:75
-msgid ""
-"There is no config.status in the project root directory. Run 'Configure' first"
-msgstr ""
-
-#: buildtools/autotools/addsubprojectdlg.cpp:85
-msgid "A file named %1 already exists."
-msgstr "Mae ffeil o'r enw %1 mewn bod yn barod."
-
-#: buildtools/autotools/addsubprojectdlg.cpp:90
-msgid ""
-"A subdirectory %1 already exists. Do you wish to add it as a subproject?"
-msgstr ""
-
-#: buildtools/autotools/addsubprojectdlg.cpp:97
-#, c-format
-msgid "Could not create subdirectory %1."
-msgstr ""
-
-#: buildtools/autotools/addsubprojectdlg.cpp:103
-#, c-format
-msgid "Could not access the subdirectory %1."
-msgstr ""
-
-#: buildtools/autotools/addsubprojectdlg.cpp:151
-#, c-format
-msgid "Could not create Makefile.am in subdirectory %1."
-msgstr ""
-
-#: buildtools/autotools/autoprojectpart.cpp:82
-#: buildtools/autotools/autoprojectpart.cpp:89
-#: buildtools/autotools/autosubprojectview.cpp:438
-msgid "Automake Manager"
-msgstr ""
-
-#: buildtools/autotools/autoprojectpart.cpp:83
-msgid ""
-"<b>Automake manager</b>"
-"<p>The project tree consists of two parts. The 'overview' in the upper half "
-"shows the subprojects, each one having a Makefile.am. The 'details' view in the "
-"lower half shows the targets and files for the subproject selected in the "
-"overview."
-msgstr ""
-
-#: buildtools/autotools/autoprojectpart.cpp:89
-msgid "Automake manager"
-msgstr ""
-
-#: buildtools/autotools/autoprojectpart.cpp:92
-msgid "Add Translation..."
-msgstr ""
-
-#: buildtools/autotools/autoprojectpart.cpp:95
-msgid "Add translation"
-msgstr ""
-
-#: buildtools/autotools/autoprojectpart.cpp:96
-msgid "<b>Add translation</b><p>Creates .po file for the selected language."
-msgstr ""
-
-#: buildtools/autotools/autoprojectpart.cpp:112
-msgid "Build &Active Target"
-msgstr ""
-
-#: buildtools/autotools/autoprojectpart.cpp:115
-msgid "Build active target"
-msgstr ""
-
-#: buildtools/autotools/autoprojectpart.cpp:116
-msgid ""
-"<b>Build active target</b>"
-"<p>Constructs a series of make commands to build an active target. Also builds "
-"dependent targets."
-"<br>Environment variables and make arguments can be specified in the project "
-"settings dialog, <b>Make Options</b> tab."
-msgstr ""
-
-#: buildtools/autotools/autoprojectpart.cpp:131
-msgid "Run Configure"
-msgstr ""
-
-#: buildtools/autotools/autoprojectpart.cpp:134
-#: buildtools/autotools/autoprojectpart.cpp:657
-msgid "Run configure"
-msgstr ""
-
-#: buildtools/autotools/autoprojectpart.cpp:135
-msgid ""
-"<b>Run configure</b>"
-"<p>Executes <b>configure</b> with flags, arguments and environment variables "
-"specified in the project settings dialog, <b>Configure Options</b> tab."
-msgstr ""
-
-#: buildtools/autotools/autoprojectpart.cpp:140
-#: buildtools/autotools/autoprojectpart.cpp:143
-msgid "Run automake && friends"
-msgstr ""
-
-#: buildtools/autotools/autoprojectpart.cpp:144
-msgid ""
-"<b>Run automake && friends</b>"
-"<p>Executes"
-"<br><b>make -f Makefile.cvs</b>"
-"<br><b>./configure</b>"
-"<br>commands from the project directory."
-msgstr ""
-
-#: buildtools/autotools/autoprojectpart.cpp:175
-msgid "&Distclean"
-msgstr ""
-
-#: buildtools/autotools/autoprojectpart.cpp:178
-msgid "Distclean"
-msgstr ""
-
-#: buildtools/autotools/autoprojectpart.cpp:179
-msgid ""
-"<b>Distclean</b>"
-"<p>Runs <b>make distclean</b> command from the project directory."
-"<br>Environment variables and make arguments can be specified in the project "
-"settings dialog, <b>Make Options</b> tab."
-msgstr ""
-
-#: buildtools/autotools/autoprojectpart.cpp:184
-msgid "Make Messages && Merge"
-msgstr ""
-
-#: buildtools/autotools/autoprojectpart.cpp:187
-msgid "Make messages && merge"
-msgstr ""
-
-#: buildtools/autotools/autoprojectpart.cpp:188
-msgid ""
-"<b>Make messages && merge</b>"
-"<p>Runs <b>make package-messages</b> command from the project directory."
-"<br>Environment variables and make arguments can be specified in the project "
-"settings dialog, <b>Make Options</b> tab."
-msgstr ""
-
-#: buildtools/autotools/autoprojectpart.cpp:196
-msgid "Build Configuration"
-msgstr ""
-
-#: buildtools/autotools/autoprojectpart.cpp:198
-msgid "Build configuration menu"
-msgstr ""
-
-#: buildtools/autotools/autoprojectpart.cpp:199
-msgid ""
-"<b>Build configuration menu</b>"
-"<p>Allows to switch between project build configurations."
-"<br>Build configuration is a set of build and top source directory settings, "
-"configure flags and arguments, compiler flags, etc."
-"<br>Modify build configurations in project settings dialog, <b>"
-"Configure Options</b> tab."
+#: buildtools/autotools/addprefixdlg.cpp:27
+msgid "Add Prefix"
 msgstr ""
 
-#: buildtools/autotools/autoprojectpart.cpp:212
-msgid ""
-"<b>Execute program</b>"
-"<p>Executes the currently active target or the main program specified in "
-"project settings, <b>Run Options</b> tab."
-msgstr ""
+#: buildtools/autotools/addprefixdlg.cpp:35
+msgid "&Path:"
+msgstr "&Llwybr:"
 
-#: buildtools/autotools/autoprojectpart.cpp:299
-msgid ""
-"No active target specified, running the application will\n"
-"not work until you make a target active in the Automake Manager\n"
-"on the right side or use the Main Program options under\n"
-"Project -> Project Options -> Run Options"
+#: buildtools/autotools/addservicedlg.cpp:139
+msgid "Enter Value"
 msgstr ""
 
-#: buildtools/autotools/autoprojectpart.cpp:302
-msgid "No active target specified"
+#: buildtools/autotools/addservicedlg.cpp:139
+msgid "Property %1:"
 msgstr ""
 
-#: buildtools/autotools/autoprojectpart.cpp:407
-#: buildtools/autotools/autoprojectpart.cpp:1166
-msgid ""
-"There's no active target!\n"
-"Unable to determine the main program"
+#: buildtools/autotools/addapplicationdlg.cpp:120
+#: buildtools/autotools/addservicedlg.cpp:160
+msgid "You have to enter a file name."
 msgstr ""
 
-#: buildtools/autotools/autoprojectpart.cpp:408
-#: buildtools/autotools/autoprojectpart.cpp:1167
-msgid "No active target found"
+#: buildtools/autotools/addservicedlg.cpp:167
+msgid "You have to enter a service name."
 msgstr ""
 
-#: buildtools/autotools/autoprojectpart.cpp:414
-#: buildtools/autotools/autoprojectpart.cpp:1171
-msgid ""
-"Active target \"%1\" isn't binary ( %2 ) !\n"
-"Unable to determine the main program. If you want this\n"
-"to be the active target, set a main program under\n"
-"Project -> Project Options -> Run Options"
+#: buildtools/autotools/addapplicationdlg.cpp:141
+#: buildtools/autotools/addservicedlg.cpp:174
+msgid "A file with this name exists already."
 msgstr ""
 
-#: buildtools/autotools/autoprojectpart.cpp:417
-#: buildtools/autotools/autoprojectpart.cpp:1174
-msgid "Active target is not a library"
+#: buildtools/autotools/addapplicationdlg.cpp:146
+#: buildtools/autotools/addservicedlg.cpp:179
+msgid "Could not open file for writing."
 msgstr ""
 
-#: buildtools/autotools/autoprojectpart.cpp:545
+#: buildtools/autotools/removefiledlg.cpp:65
 msgid ""
-"The directory you selected is not the active directory.\n"
-"You should 'activate' the target you're currently working on in Automake "
-"Manager.\n"
-"Just right-click a target and choose 'Make Target Active'."
+"The file %1 is still used by the following targets:\n"
+"%2\n"
+"Remove it from all of them?"
 msgstr ""
 
-#: buildtools/autotools/autoprojectpart.cpp:548
-msgid "No Active Target Found"
-msgstr ""
+#: buildtools/autotools/removefiledlg.cpp:70
+msgid "Do you really want to remove <b>%1</b>?"
+msgstr "<b>Ydych wir eisiau gwaredu %1?</b>"
 
-#: buildtools/autotools/autoprojectpart.cpp:644
-msgid ""
-"%1\n"
-"There is no Makefile in this directory\n"
-"and no configure script for this project.\n"
-"Run automake & friends and configure first?"
+#: buildtools/autotools/kimporticonview.cpp:66
+msgid "Or just use the buttons."
 msgstr ""
 
-#: buildtools/autotools/autoprojectpart.cpp:646
-msgid "Run Them"
+#: buildtools/autotools/subprojectoptionsdlg.cpp:48
+msgid "Subproject Options for '%1'"
 msgstr ""
 
-#: buildtools/autotools/autoprojectpart.cpp:657
+#: buildtools/autotools/subprojectoptionsdlg.cpp:305
 msgid ""
-"%1\n"
-"There is no Makefile in this directory. Run 'configure' first?"
+"Add Include directory: Choose directory, give -Idirectory or use a variable "
+"with -I$(FOOBAR)"
 msgstr ""
 
-#: buildtools/autotools/autoprojectpart.cpp:795
-msgid ""
-"Found a circular dependecy in the project, between this target and %1.\n"
-"Can't build this project until this is resolved"
+#: buildtools/autotools/subprojectoptionsdlg.cpp:331
+msgid "Edit Include Directory"
 msgstr ""
 
-#: buildtools/autotools/autoprojectpart.cpp:795
-msgid "Circular Dependecy found"
+#: buildtools/autotools/subprojectoptionsdlg.cpp:331
+msgid "Edit include directory:"
 msgstr ""
 
-#: buildtools/autotools/autoprojectpart.cpp:895
-msgid "Can only compile files in directories which belong to the project."
+#: buildtools/autotools/subprojectoptionsdlg.cpp:360
+msgid "Edit Prefix"
 msgstr ""
 
-#: buildtools/autotools/autoprojectpart.cpp:1010
-msgid ""
-"There is neither a Makefile.cvs file nor an autogen.sh script in the project "
-"directory."
+#: buildtools/autotools/addfiledlg.cpp:80
+msgid "This file is already in the target."
 msgstr ""
 
-#: buildtools/autotools/choosetargetdialog.cpp:265
+#: buildtools/autotools/addfiledlg.cpp:91
+#: buildtools/autotools/addfiledlg.cpp:103
 msgid ""
-"The file %1 already exists in the chosen target.\n"
-"The file will be created but will not be added to the target.\n"
-"Rename the file and select 'Add Existing Files' from the Automake Manager."
-msgstr ""
-
-#: buildtools/autotools/choosetargetdialog.cpp:267
-msgid "Error While Adding Files"
-msgstr ""
-
-#: buildtools/autotools/addtargetdlg.cpp:40
-#: buildtools/autotools/autoprojectwidget.cpp:61
-msgid "Program"
-msgstr "Rhaglen"
-
-#: buildtools/autotools/addtargetdlg.cpp:41
-#: buildtools/autotools/autoprojectwidget.cpp:63
-msgid "Library"
-msgstr ""
-
-#: buildtools/autotools/addtargetdlg.cpp:42
-#: buildtools/autotools/autoprojectwidget.cpp:65
-msgid "Libtool Library"
+"<b>A file with this name already exists.</b>"
+"<br>"
+"<br>Please use the \"Add existing file\" dialog."
 msgstr ""
 
-#: buildtools/autotools/addtargetdlg.cpp:43
-#: buildtools/autotools/autoprojectwidget.cpp:67
-msgid "Script"
-msgstr "Sgript"
-
-#: buildtools/autotools/addtargetdlg.cpp:44
-#: buildtools/autotools/autoprojectwidget.cpp:69
-msgid "Header"
-msgstr "Pennawd"
-
-#: buildtools/autotools/autoprojectwidget.cpp:71
-msgid "Data"
-msgstr "Data"
-
-#: buildtools/autotools/addtargetdlg.cpp:46
-#: buildtools/autotools/autoprojectwidget.cpp:73
-msgid "Java"
-msgstr "Java"
-
-#: buildtools/autotools/autoprojectwidget.cpp:633
-msgid "Documentation data"
+#: buildtools/autotools/addtranslationdlg.cpp:37
+msgid "Add Translation"
 msgstr ""
 
-#: buildtools/autotools/autoprojectwidget.cpp:635
-msgid "TDE Icon data"
+#: buildtools/autotools/addtranslationdlg.cpp:79
+msgid "Your sourcecode is already translated to all supported languages."
 msgstr ""
 
-#: buildtools/autotools/autoprojectwidget.cpp:637
-msgid "%1 (%2 in %3)"
+#: buildtools/autotools/addtranslationdlg.cpp:97
+msgid "A translation file for the language %1 exists already."
 msgstr ""
 
 #: buildtools/autotools/autodetailsview.cpp:179
@@ -25885,6 +27973,12 @@ msgstr ""
 msgid "This item cannot be removed"
 msgstr ""
 
+#: buildtools/autotools/autoprojectpart.cpp:83
+#: buildtools/autotools/autoprojectpart.cpp:90
+#: buildtools/autotools/autosubprojectview.cpp:438
+msgid "Automake Manager"
+msgstr ""
+
 #: buildtools/autotools/autosubprojectview.cpp:451
 msgid "There is no subproject %1 in SUBDIRS"
 msgstr ""
@@ -25902,112 +27996,74 @@ msgstr ""
 msgid "Manage Custom Commands"
 msgstr ""
 
-#: buildtools/autotools/autodetailsview.cpp:182
-msgid ""
-"<b>Options</b>"
-"<p>Target options dialog that provides settings for linker flags and lists of "
-"dependencies and external libraries that are used when compiling the target."
-msgstr ""
-
-#: buildtools/autotools/autodetailsview.cpp:193
-msgid ""
-"<b>Create new file</b>"
-"<p>Creates a new file and adds it to a currently selected target."
-msgstr ""
-
-#: buildtools/autotools/autodetailsview.cpp:202
-msgid ""
-"<b>Add existing files</b>"
-"<p>Adds existing file to a currently selected target. Header files will not be "
-"included in SOURCES list of a target. They will be added to noinst_HEADERS "
-"instead."
-msgstr ""
-
-#: buildtools/autotools/autodetailsview.cpp:210
-msgid "Add Icon..."
-msgstr ""
+#: buildtools/autotools/addtargetdlg.cpp:40
+#: buildtools/autotools/autoprojectwidget.cpp:61
+msgid "Program"
+msgstr "Rhaglen"
 
-#: buildtools/autotools/autodetailsview.cpp:212
-msgid "<b>Add icon</b><p>Adds an icon to a TDEICON target."
+#: buildtools/autotools/addtargetdlg.cpp:41
+#: buildtools/autotools/autoprojectwidget.cpp:63
+msgid "Library"
 msgstr ""
 
-#: buildtools/autotools/autodetailsview.cpp:214
-#, fuzzy
-msgid "Build Target"
-msgstr "Targed"
-
-#: buildtools/autotools/autodetailsview.cpp:215
-msgid "Build Target..."
+#: buildtools/autotools/addtargetdlg.cpp:42
+#: buildtools/autotools/autoprojectwidget.cpp:65
+msgid "Libtool Library"
 msgstr ""
 
-#: buildtools/autotools/autodetailsview.cpp:218
-msgid ""
-"<b>Build target</b>"
-"<p>Constructs a series of make commands to build the selected target. Also "
-"builds dependent targets."
-msgstr ""
+#: buildtools/autotools/addtargetdlg.cpp:43
+#: buildtools/autotools/autoprojectwidget.cpp:67
+msgid "Script"
+msgstr "Sgript"
 
-#: buildtools/autotools/autodetailsview.cpp:224
-#: buildtools/autotools/autodetailsview.cpp:225
-msgid "Execute Target..."
-msgstr ""
+#: buildtools/autotools/addtargetdlg.cpp:44
+#: buildtools/autotools/autoprojectwidget.cpp:69
+msgid "Header"
+msgstr "Pennawd"
 
-#: buildtools/autotools/autodetailsview.cpp:228
-msgid ""
-"<b>Execute target</b>"
-"<p>Executes the target and tries to build in case it is not built."
-msgstr ""
+#: buildtools/autotools/autoprojectwidget.cpp:71
+msgid "Data"
+msgstr "Data"
 
-#: buildtools/autotools/autodetailsview.cpp:233
-msgid "Make Target Active"
-msgstr ""
+#: buildtools/autotools/addtargetdlg.cpp:46
+#: buildtools/autotools/autoprojectwidget.cpp:73
+msgid "Java"
+msgstr "Java"
 
-#: buildtools/autotools/autodetailsview.cpp:236
-msgid ""
-"<b>Make target active</b>"
-"<p>Marks the currently selected target as 'active'. New files and classes by "
-"default go to an active target. Using the <b>Build Active Target</b> "
-"menu command builds it."
+#: buildtools/autotools/autoprojectwidget.cpp:633
+msgid "Documentation data"
 msgstr ""
 
-#: buildtools/autotools/autodetailsview.cpp:247
-msgid ""
-"<b>Remove</b>"
-"<p>Shows a list of targets dependent on the selected target or file and asks "
-"for removal. Also asks if the target or file should be removed from disk."
+#: buildtools/autotools/autoprojectwidget.cpp:635
+msgid "KDE Icon data"
 msgstr ""
 
-#: buildtools/autotools/autodetailsview.cpp:319
-msgid "Add New File to '%1'"
+#: buildtools/autotools/autoprojectwidget.cpp:637
+msgid "%1 (%2 in %3)"
 msgstr ""
 
-#: buildtools/autotools/autodetailsview.cpp:341
-msgid "Add Existing Files to '%1'"
+#: buildtools/autotools/addtargetdlg.cpp:45
+msgid "Data File"
 msgstr ""
 
-#: buildtools/autotools/autodetailsview.cpp:423
-msgid "Remove File From '%1'"
+#: buildtools/autotools/addtargetdlg.cpp:145
+msgid "You have to give the target a name"
 msgstr ""
 
-#: buildtools/autotools/autodetailsview.cpp:450
-msgid "Remove Target From '%1'"
+#: buildtools/autotools/addtargetdlg.cpp:151
+msgid "Libraries must have a lib prefix."
 msgstr ""
 
-#: buildtools/autotools/autodetailsview.cpp:502
-#, c-format
-msgid "Target: %1"
-msgstr "Targed: %1"
-
-#: buildtools/autotools/addtranslationdlg.cpp:37
-msgid "Add Translation"
+#: buildtools/autotools/addtargetdlg.cpp:156
+msgid "Libtool libraries must have a lib prefix."
 msgstr ""
 
-#: buildtools/autotools/addtranslationdlg.cpp:79
-msgid "Your sourcecode is already translated to all supported languages."
+#: buildtools/autotools/addtargetdlg.cpp:161
+msgid "Libtool libraries must have a .la suffix."
 msgstr ""
 
-#: buildtools/autotools/addtranslationdlg.cpp:97
-msgid "A translation file for the language %1 exists already."
+#: buildtools/autotools/addtargetdlg.cpp:179
+msgid "A target with this name already exists."
 msgstr ""
 
 #: buildtools/autotools/addicondlg.cpp:46
@@ -26026,29 +28082,6 @@ msgstr "Cysawd Ffeiliau"
 msgid "MIME Type"
 msgstr "Math MIME"
 
-#: buildtools/autotools/addapplicationdlg.cpp:120
-#: buildtools/autotools/addservicedlg.cpp:160
-msgid "You have to enter a file name."
-msgstr ""
-
-#: buildtools/autotools/addapplicationdlg.cpp:127
-msgid "You have to enter the file name of an executable program."
-msgstr ""
-
-#: buildtools/autotools/addapplicationdlg.cpp:134
-msgid "You have to enter an application name."
-msgstr ""
-
-#: buildtools/autotools/addapplicationdlg.cpp:141
-#: buildtools/autotools/addservicedlg.cpp:174
-msgid "A file with this name exists already."
-msgstr ""
-
-#: buildtools/autotools/addapplicationdlg.cpp:146
-#: buildtools/autotools/addservicedlg.cpp:179
-msgid "Could not open file for writing."
-msgstr ""
-
 #: buildtools/autotools/fileselectorwidget.cpp:65
 msgid "Short View"
 msgstr "Golwg Byr"
@@ -26069,2403 +28102,447 @@ msgstr ""
 msgid "Next directory"
 msgstr ""
 
-#: buildtools/autotools/addservicedlg.cpp:139
-msgid "Enter Value"
-msgstr ""
-
-#: buildtools/autotools/addservicedlg.cpp:139
-msgid "Property %1:"
-msgstr ""
-
-#: buildtools/autotools/addservicedlg.cpp:167
-msgid "You have to enter a service name."
-msgstr ""
-
-#: buildtools/autotools/addfiledlg.cpp:80
-msgid "This file is already in the target."
-msgstr ""
-
-#: buildtools/autotools/addfiledlg.cpp:91
-#: buildtools/autotools/addfiledlg.cpp:103
-msgid ""
-"<b>A file with this name already exists.</b>"
-"<br>"
-"<br>Please use the \"Add existing file\" dialog."
-msgstr ""
-
-#: buildtools/autotools/addtargetdlg.cpp:45
-msgid "Data File"
-msgstr ""
-
-#: buildtools/autotools/addtargetdlg.cpp:145
-msgid "You have to give the target a name"
-msgstr ""
-
-#: buildtools/autotools/addtargetdlg.cpp:151
-msgid "Libraries must have a lib prefix."
-msgstr ""
-
-#: buildtools/autotools/addtargetdlg.cpp:156
-msgid "Libtool libraries must have a lib prefix."
-msgstr ""
-
-#: buildtools/autotools/addtargetdlg.cpp:161
-msgid "Libtool libraries must have a .la suffix."
-msgstr ""
-
-#: buildtools/autotools/addtargetdlg.cpp:179
-msgid "A target with this name already exists."
-msgstr ""
-
-#: kdevdesigner/designer/iconvieweditorimpl.cpp:132
-#: kdevdesigner/designer/listboxeditorimpl.cpp:164
-msgid "Edit the Items of '%1'"
-msgstr ""
-
-#: kdevdesigner/designer/formfile.cpp:195
-#: kdevdesigner/designer/formfile.cpp:218
-msgid "The file %1 could not be saved"
-msgstr ""
-
-#: kdevdesigner/designer/formfile.cpp:230
-msgid "Failed to save file '%1'."
-msgstr ""
-
-#: kdevdesigner/designer/formfile.cpp:236
-msgid "'%1' saved."
-msgstr ""
-
-#: kdevdesigner/designer/formfile.cpp:264
-#: kdevdesigner/designer/formfile.cpp:862
-#: kdevdesigner/designer/mainwindowactions.cpp:1212
-msgid "*.ui|Qt User-Interface Files"
-msgstr ""
-
-#: kdevdesigner/designer/formfile.cpp:265
-#: kdevdesigner/designer/formfile.cpp:863
-#: kdevdesigner/designer/mainwindowactions.cpp:1223
-msgid "*|All Files"
-msgstr "*|Pob Ffeil"
-
-#: kdevdesigner/designer/formfile.cpp:266
-#: kdevdesigner/designer/formfile.cpp:864
-#, fuzzy
-msgid "Save Form '%1' As"
-msgstr "&Cadw Fel..."
-
-#: kdevdesigner/designer/formfile.cpp:277
-msgid "File Already Exists"
-msgstr "Ffeil yn Bodoli'n Barod"
-
-#: kdevdesigner/designer/formfile.cpp:278
-msgid "The file already exists. Do you wish to overwrite it?"
-msgstr ""
-
-#: kdevdesigner/designer/formfile.cpp:297
-#: kdevdesigner/designer/hierarchyview.cpp:1105
-#: kdevdesigner/designer/hierarchyview.cpp:1109
-#: kdevdesigner/designer/hierarchyview.cpp:1221
-#: kdevdesigner/designer/sourcefile.cpp:141
-#, c-format
-msgid "Edit %1"
-msgstr "Golygu %1"
-
-#: kdevdesigner/designer/formfile.cpp:328
-#: kdevdesigner/designer/formwindow.cpp:1841
-#, fuzzy
-msgid "Save Form"
-msgstr "Rhagolyg&u Ffurflen"
-
-#: kdevdesigner/designer/formfile.cpp:329
-msgid "Save changes to form '%1'?"
-msgstr ""
-
-#: kdevdesigner/designer/editfunctionsimpl.cpp:218
-#: kdevdesigner/designer/formfile.cpp:330
-#: kdevdesigner/designer/formfile.cpp:657
-#: kdevdesigner/designer/mainwindow.cpp:2517
-#: kdevdesigner/designer/mainwindow.cpp:2847
-#: kdevdesigner/designer/mainwindowactions.cpp:1129
-#: kdevdesigner/designer/sourcefile.cpp:224
-#: kdevdesigner/designer/sourcefile.cpp:269
-#: kdevdesigner/designer/variabledialogimpl.cpp:105
-msgid "&No"
-msgstr "&Nage"
-
-#: kdevdesigner/designer/formfile.cpp:440
-#, fuzzy
-msgid "Using ui.h File"
-msgstr "Creu ..."
-
-#: kdevdesigner/designer/formfile.cpp:441
-msgid ""
-"An \"ui.h\" file for this form already exists.\n"
-"Do you want to use it or create a new one?"
-msgstr ""
-
-#: kdevdesigner/designer/formfile.cpp:443
-#, fuzzy
-msgid "Use Existing"
-msgstr "Ffeil yn Bodoli"
-
-#: kdevdesigner/designer/formfile.cpp:443
-msgid "Create New"
-msgstr "Creu Newydd"
-
-#: kdevdesigner/designer/formfile.cpp:450
-#, fuzzy
-msgid "Creating ui.h file"
-msgstr "Creu ..."
-
-#: kdevdesigner/designer/formfile.cpp:451
-#, fuzzy
-msgid "Do you want to create an new \"ui.h\" file?"
-msgstr "Methu creu'r ffeil newydd."
-
-#: kdevdesigner/designer/formfile.cpp:655
-#: kdevdesigner/designer/sourcefile.cpp:267
-msgid ""
-"File '%1' has been changed outside Qt Designer.\n"
-"Do you want to reload it?"
-msgstr ""
-
-#: kdevdesigner/designer/formfile.cpp:855
-#: kdevdesigner/designer/sourcefile.cpp:280
-#, fuzzy
-msgid "Invalid Filename"
-msgstr "Enw Ffeil"
-
-#: kdevdesigner/designer/formfile.cpp:856
-msgid ""
-"The project already contains a form with a\n"
-"filename of '%1'. Please choose a new filename."
-msgstr ""
-
-#: kdevdesigner/designer/propertyeditor.cpp:422
-msgid "Reset the property to its default value"
-msgstr ""
-
-#: kdevdesigner/designer/propertyeditor.cpp:423
-msgid "Click this button to reset the property to its default value"
-msgstr ""
-
-#: kdevdesigner/designer/propertyeditor.cpp:1090
-#: kdevdesigner/designer/propertyeditor.cpp:1151
-msgid "False"
-msgstr "Ffug"
-
-#: kdevdesigner/designer/propertyeditor.cpp:1091
-#: kdevdesigner/designer/propertyeditor.cpp:1149
-msgid "True"
-msgstr "Gwir"
-
-#: kdevdesigner/designer/propertyeditor.cpp:1511
-#: kdevdesigner/designer/propertyeditor.cpp:1533
-#: kdevdesigner/designer/propertyeditor.cpp:1606
-#: kdevdesigner/designer/propertyeditor.cpp:1620
-msgid "width"
-msgstr "lled"
-
-#: kdevdesigner/designer/propertyeditor.cpp:1513
-#: kdevdesigner/designer/propertyeditor.cpp:1538
-#: kdevdesigner/designer/propertyeditor.cpp:1608
-#: kdevdesigner/designer/propertyeditor.cpp:1622
-msgid "height"
-msgstr "taldra"
-
-#: kdevdesigner/designer/propertyeditor.cpp:1757
-#: kdevdesigner/designer/propertyeditor.cpp:1770
-#: kdevdesigner/designer/propertyeditor.cpp:1820
-msgid "Red"
-msgstr "Coch"
-
-#: kdevdesigner/designer/propertyeditor.cpp:1759
-#: kdevdesigner/designer/propertyeditor.cpp:1772
-#: kdevdesigner/designer/propertyeditor.cpp:1822
-msgid "Green"
-msgstr "Gwyrdd"
-
-#: kdevdesigner/designer/propertyeditor.cpp:1761
-#: kdevdesigner/designer/propertyeditor.cpp:1774
-#: kdevdesigner/designer/propertyeditor.cpp:1824
-msgid "Blue"
-msgstr "Glas"
-
-#: kdevdesigner/designer/propertyeditor.cpp:1879
-#: kdevdesigner/designer/propertyeditor.cpp:1898
-#: kdevdesigner/designer/propertyeditor.cpp:1963
-msgid "Family"
-msgstr "Teulu"
-
-#: kdevdesigner/designer/propertyeditor.cpp:1881
-#: kdevdesigner/designer/propertyeditor.cpp:1901
-#: kdevdesigner/designer/propertyeditor.cpp:1965
-msgid "Point Size"
-msgstr ""
-
-#: kdevdesigner/designer/multilineeditorimpl.cpp:109
-#: kdevdesigner/designer/propertyeditor.cpp:1883
-#: kdevdesigner/designer/propertyeditor.cpp:1903
-#: kdevdesigner/designer/propertyeditor.cpp:1967
-msgid "Bold"
-msgstr "Trwm"
-
-#: kdevdesigner/designer/multilineeditorimpl.cpp:115
-#: kdevdesigner/designer/propertyeditor.cpp:1887
-#: kdevdesigner/designer/propertyeditor.cpp:1907
-#: kdevdesigner/designer/propertyeditor.cpp:1971
-msgid "Underline"
-msgstr "Tanlinellu"
-
-#: kdevdesigner/designer/propertyeditor.cpp:1889
-#: kdevdesigner/designer/propertyeditor.cpp:1909
-#: kdevdesigner/designer/propertyeditor.cpp:1973
-msgid "Strikeout"
-msgstr "Trwylinellu"
-
-#: kdevdesigner/designer/propertyeditor.cpp:2006
-#: kdevdesigner/designer/propertyeditor.cpp:2040
-msgid "Table"
-msgstr "Tabl"
-
-#: kdevdesigner/designer/propertyeditor.cpp:2009
-#: kdevdesigner/designer/propertyeditor.cpp:2063
-msgid "Field"
-msgstr "Maes"
-
-#: kdevdesigner/designer/propertyeditor.cpp:2177
-#: kdevdesigner/designer/propertyeditor.cpp:2193
-#: kdevdesigner/designer/propertyeditor.cpp:2243
-#, fuzzy
-msgid "horizontalStretch"
-msgstr "hStretch"
-
-#: kdevdesigner/designer/propertyeditor.cpp:2179
-#: kdevdesigner/designer/propertyeditor.cpp:2195
-#: kdevdesigner/designer/propertyeditor.cpp:2245
-#, fuzzy
-msgid "verticalStretch"
-msgstr "vStretch"
-
-#: kdevdesigner/designer/propertyeditor.cpp:2226
-msgid "%1/%2/%3/%4"
-msgstr ""
-
-#: kdevdesigner/designer/propertyeditor.cpp:2381
-#, fuzzy
-msgid "Up-Arrow"
-msgstr "Saeth i Fyny"
-
-#: kdevdesigner/designer/propertyeditor.cpp:3489
-#: kdevdesigner/designer/propertyeditor.cpp:3503
-msgid "Set '%1' of '%2'"
-msgstr ""
-
-#: kdevdesigner/designer/propertyeditor.cpp:3631
-msgid "Sort &Categorized"
+#: buildtools/autotools/autolistviewitems.cpp:134
+msgid "Edit Substitution"
 msgstr ""
 
-#: kdevdesigner/designer/propertyeditor.cpp:3632
-msgid "Sort &Alphabetically"
-msgstr "Trefn&u yn ôl yr wyddor"
-
-#: kdevdesigner/designer/propertyeditor.cpp:3772
-msgid "Reset '%1' of '%2'"
+#: buildtools/autotools/autolistviewitems.cpp:134
+msgid "Substitution:"
 msgstr ""
 
-#: kdevdesigner/designer/propertyeditor.cpp:3879
+#: buildtools/autotools/autoprojectpart.cpp:84
 msgid ""
-"<p><b>QWidget::%1</b></p>"
-"<p>There is no documentation available for this property.</p>"
-msgstr ""
-
-#: kdevdesigner/designer/propertyeditor.cpp:4031
-msgid "New Signal Handler"
-msgstr ""
-
-#: kdevdesigner/designer/propertyeditor.cpp:4032
-msgid "Delete Signal Handler"
-msgstr ""
-
-#: kdevdesigner/designer/propertyeditor.cpp:4053
-msgid "Remove Connection"
-msgstr "Gwaredu Cysylltiad"
-
-#: kdevdesigner/designer/mainwindow.cpp:2600
-#: kdevdesigner/designer/propertyeditor.cpp:4086
-#, fuzzy
-msgid "Add Connection"
-msgstr "Cysylltiad"
-
-#: kdevdesigner/designer/editfunctionsimpl.cpp:195
-#: kdevdesigner/designer/propertyeditor.cpp:4104
-#, fuzzy
-msgid "Add Function"
-msgstr "Ffwythiant"
-
-#: kdevdesigner/designer/propertyeditor.cpp:4145
-#: kdevdesigner/designer/propertyeditor.cpp:4184
-#: kdevdesigner/designer/propertyeditor.cpp:4310
-#, fuzzy
-msgid "Property Editor"
-msgstr "Priodwedd"
-
-#: kdevdesigner/designer/propertyeditor.cpp:4149
-msgid "P&roperties"
-msgstr "P&riodweddau"
-
-#: kdevdesigner/designer/propertyeditor.cpp:4151
-msgid "Signa&l Handlers"
-msgstr ""
-
-#: kdevdesigner/designer/propertyeditor.cpp:4193
-msgid "Property Editor (%1)"
+"<b>Automake manager</b>"
+"<p>The project tree consists of two parts. The 'overview' in the upper half "
+"shows the subprojects, each one having a Makefile.am. The 'details' view in the "
+"lower half shows the targets and files for the subproject selected in the "
+"overview."
 msgstr ""
 
-#: kdevdesigner/designer/mainwindow.cpp:3710
-#: kdevdesigner/designer/propertyeditor.cpp:4319
-msgid "Signal Handlers"
+#: buildtools/autotools/autoprojectpart.cpp:90
+msgid "Automake manager"
 msgstr ""
 
-#: kdevdesigner/designer/actioneditorimpl.cpp:52
-msgid "Actions"
-msgstr "Gweithredoedd"
-
-#: kdevdesigner/designer/actioneditorimpl.cpp:57
-#: kdevdesigner/designer/actionlistview.cpp:90
-msgid "New &Action"
-msgstr "Gwei&thred Newydd"
-
-#: kdevdesigner/designer/actioneditorimpl.cpp:58
-#: kdevdesigner/designer/actionlistview.cpp:91
-msgid "New Action &Group"
-msgstr "Grŵp Newydd o Weithredoedd"
-
-#: kdevdesigner/designer/actioneditorimpl.cpp:59
-#: kdevdesigner/designer/actionlistview.cpp:92
-msgid "New &Dropdown Action Group"
+#: buildtools/autotools/autoprojectpart.cpp:93
+msgid "Add Translation..."
 msgstr ""
 
-#: kdevdesigner/designer/tableeditorimpl.cpp:346
-msgid "Edit the Rows and Columns of '%1' "
+#: buildtools/autotools/autoprojectpart.cpp:96
+msgid "Add translation"
 msgstr ""
 
-#: kdevdesigner/designer/mainwindowactions.cpp:797
-#: kdevdesigner/designer/mainwindowactions.cpp:798
-#: kdevdesigner/designer/newformimpl.cpp:364
-#: kdevdesigner/designer/startdialogimpl.cpp:67
-#: kdevdesigner/designer/workspace.cpp:159
-#, fuzzy
-msgid "<No Project>"
-msgstr "Cywaith Newydd"
-
-#: kdevdesigner/designer/startdialogimpl.cpp:169
-msgid "Designer Files (*.ui *.pro)"
+#: buildtools/autotools/autoprojectpart.cpp:97
+msgid "<b>Add translation</b><p>Creates .po file for the selected language."
 msgstr ""
 
-#: kdevdesigner/designer/mainwindow.cpp:155
-#: kdevdesigner/designer/startdialogimpl.cpp:170
-msgid "Qt User-Interface Files (*.ui)"
+#: buildtools/autotools/autoprojectpart.cpp:113
+msgid "Build &Active Target"
 msgstr ""
 
-#: kdevdesigner/designer/startdialogimpl.cpp:171
-msgid "QMAKE Project Files (*.pro)"
+#: buildtools/autotools/autoprojectpart.cpp:116
+msgid "Build active target"
 msgstr ""
 
-#: kdevdesigner/designer/startdialogimpl.cpp:177
-#, fuzzy
-msgid "All Files (*)"
-msgstr "Pob Ffeil"
-
-#: kdevdesigner/designer/resource.cpp:1787
-msgid "Loading File"
-msgstr "Llwytho ffeil..."
-
-#: kdevdesigner/designer/resource.cpp:1788
+#: buildtools/autotools/autoprojectpart.cpp:117
 msgid ""
-"Error loading %1.\n"
-"The widget %2 could not be created."
-msgstr ""
-
-#: kdevdesigner/designer/widgetfactory.cpp:277
-msgid "Move Tab Page"
-msgstr ""
-
-#: kdevdesigner/designer/widgetfactory.cpp:814
-msgid "Tab 1"
-msgstr "Tab 1"
-
-#: kdevdesigner/designer/widgetfactory.cpp:817
-msgid "Tab 2"
-msgstr "Tab 2"
-
-#: kdevdesigner/designer/widgetfactory.cpp:960
-#, fuzzy
-msgid "Page 1"
-msgstr "Targed: %1"
-
-#: kdevdesigner/designer/widgetfactory.cpp:963
-#, fuzzy
-msgid "Page 2"
-msgstr "Pecyn"
-
-#: kdevdesigner/designer/mainwindow.cpp:1489
-#: kdevdesigner/designer/mainwindowactions.cpp:127
-#, fuzzy
-msgid "&Undo: Not Available"
-msgstr "&Ar gael:"
-
-#: kdevdesigner/designer/mainwindowactions.cpp:128
-msgid "Undoes the last action"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindow.cpp:1493
-#: kdevdesigner/designer/mainwindowactions.cpp:133
-#, fuzzy
-msgid "&Redo: Not Available"
-msgstr "&Ar gael:"
-
-#: kdevdesigner/designer/mainwindowactions.cpp:134
-msgid "Redoes the last undone operation"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:139
-msgid "Cu&t"
-msgstr "To&rri"
-
-#: kdevdesigner/designer/mainwindowactions.cpp:140
-msgid "Cuts the selected widgets and puts them on the clipboard"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:146
-msgid "Copies the selected widgets to the clipboard"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:152
-msgid "Pastes the clipboard's contents"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:158
-msgid "Deletes the selected widgets"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:167
-msgid "Select &All"
-msgstr "Dewis Pope&th"
-
-#: kdevdesigner/designer/mainwindowactions.cpp:168
-msgid "Selects all widgets"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:173
-msgid "Bring to Front"
-msgstr "Anfon i'r Blaen"
-
-#: kdevdesigner/designer/mainwindowactions.cpp:173
-msgid "Bring to &Front"
-msgstr "Anfon i'r &Blaen"
-
-#: kdevdesigner/designer/mainwindowactions.cpp:174
-#: kdevdesigner/designer/mainwindowactions.cpp:175
-msgid "Raises the selected widgets"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:179
-msgid "Send to Back"
-msgstr "Anfon i'r Cefn"
-
-#: kdevdesigner/designer/mainwindowactions.cpp:179
-msgid "Send to &Back"
-msgstr "Anfon i'r &Cefn"
-
-#: kdevdesigner/designer/mainwindowactions.cpp:180
-#: kdevdesigner/designer/mainwindowactions.cpp:181
-msgid "Lowers the selected widgets"
-msgstr ""
-
-#: kdevdesigner/designer/formwindow.cpp:1936
-#: kdevdesigner/designer/formwindow.cpp:1953
-#: kdevdesigner/designer/mainwindowactions.cpp:185
-msgid "Check Accelerators"
-msgstr "Gwirio Cyflymyddion"
-
-#: kdevdesigner/designer/kdevdesigner_part.cpp:116
-#: kdevdesigner/designer/mainwindowactions.cpp:186
-msgid "Chec&k Accelerators"
-msgstr "G&wirio Cyflymyddion"
-
-#: kdevdesigner/designer/mainwindowactions.cpp:187
-msgid "Checks if the accelerators used in the form are unique"
-msgstr ""
-
-#: kdevdesigner/designer/hierarchyview.cpp:846
-#: kdevdesigner/designer/mainwindowactions.cpp:192
-#, fuzzy
-msgid "Slots"
-msgstr "Agen"
-
-#: kdevdesigner/designer/kdevdesigner_part.cpp:118
-#: kdevdesigner/designer/mainwindowactions.cpp:193
-msgid "S&lots..."
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:194
-msgid "Opens a dialog for editing slots"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:199
-msgid "Connections"
-msgstr "Cysylltiadau"
-
-#: kdevdesigner/designer/kdevdesigner_part.cpp:120
-#: kdevdesigner/designer/mainwindowactions.cpp:200
-msgid "Co&nnections..."
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:201
-msgid "Opens a dialog for editing connections"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:207
-msgid "&Source..."
-msgstr "&Tarddiad ..."
-
-#: kdevdesigner/designer/mainwindowactions.cpp:208
-msgid "Opens an editor to edit the form's source code"
-msgstr ""
-
-#: kdevdesigner/designer/kdevdesigner_part.cpp:122
-#: kdevdesigner/designer/mainwindowactions.cpp:214
-msgid "&Form Settings..."
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:215
-msgid "Opens a dialog to change the form's settings"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:221
-msgid "Preferences..."
-msgstr "Hoffterau..."
-
-#: kdevdesigner/designer/mainwindowactions.cpp:222
-msgid "Opens a dialog to change preferences"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:271
-msgid "Find"
-msgstr "Canfod:"
-
-#: kdevdesigner/designer/mainwindowactions.cpp:277
-msgid "Find Incremental"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:278
-msgid "Find &Incremental"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:290
-msgid "&Goto Line..."
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:302
-msgid "Incremental search (Alt+I)"
-msgstr ""
-
-#: kdevdesigner/designer/formwindow.cpp:1513
-#: kdevdesigner/designer/formwindow.cpp:1525
-#: kdevdesigner/designer/formwindow.cpp:1533
-#: kdevdesigner/designer/mainwindowactions.cpp:326
-#, fuzzy
-msgid "Adjust Size"
-msgstr "Addasu"
-
-#: kdevdesigner/designer/kdevdesigner_part.cpp:147
-#: kdevdesigner/designer/mainwindowactions.cpp:327
-msgid "Adjust &Size"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:328
-msgid "Adjusts the size of the selected widget"
-msgstr ""
-
-#: kdevdesigner/designer/formwindow.cpp:2002
-#: kdevdesigner/designer/mainwindowactions.cpp:333
-#, fuzzy
-msgid "Lay Out Horizontally"
-msgstr "Ehangu'n &Llorweddol"
-
-#: kdevdesigner/designer/kdevdesigner_part.cpp:149
-#: kdevdesigner/designer/mainwindowactions.cpp:334
-msgid "Lay Out &Horizontally"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:335
-msgid "Lays out the selected widgets horizontally"
-msgstr ""
-
-#: kdevdesigner/designer/formwindow.cpp:2012
-#: kdevdesigner/designer/mainwindowactions.cpp:340
-#, fuzzy
-msgid "Lay Out Vertically"
-msgstr "Ehangu'n &Fertigol"
-
-#: kdevdesigner/designer/kdevdesigner_part.cpp:151
-#: kdevdesigner/designer/mainwindowactions.cpp:341
-msgid "Lay Out &Vertically"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:342
-msgid "Lays out the selected widgets vertically"
-msgstr ""
-
-#: kdevdesigner/designer/formwindow.cpp:2045
-#: kdevdesigner/designer/mainwindowactions.cpp:347
-msgid "Lay Out in a Grid"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:348
-msgid "Lay Out in a &Grid"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:349
-msgid "Lays out the selected widgets in a grid"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:354
-msgid "Lay Out Horizontally (in Splitter)"
-msgstr ""
-
-#: kdevdesigner/designer/kdevdesigner_part.cpp:155
-#: kdevdesigner/designer/mainwindowactions.cpp:355
-msgid "Lay Out Horizontally (in S&plitter)"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:356
-msgid "Lays out the selected widgets horizontally in a splitter"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:361
-msgid "Lay Out Vertically (in Splitter)"
-msgstr ""
-
-#: kdevdesigner/designer/kdevdesigner_part.cpp:157
-#: kdevdesigner/designer/mainwindowactions.cpp:362
-msgid "Lay Out Vertically (in Sp&litter)"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:363
-msgid "Lays out the selected widgets vertically in a splitter"
+"<b>Build active target</b>"
+"<p>Constructs a series of make commands to build an active target. Also builds "
+"dependent targets."
+"<br>Environment variables and make arguments can be specified in the project "
+"settings dialog, <b>Make Options</b> tab."
 msgstr ""
 
-#: kdevdesigner/designer/formwindow.cpp:2143
-#: kdevdesigner/designer/formwindow.cpp:2163
-#: kdevdesigner/designer/mainwindowactions.cpp:368
-msgid "Break Layout"
-msgstr "Torri'r Haenlun"
-
-#: kdevdesigner/designer/formwindow.cpp:971
-#: kdevdesigner/designer/formwindow.cpp:1076
-#: kdevdesigner/designer/kdevdesigner_part.cpp:159
-#: kdevdesigner/designer/mainwindowactions.cpp:369
-msgid "&Break Layout"
-msgstr "&Torri'r Haenlun"
-
-#: kdevdesigner/designer/mainwindowactions.cpp:370
-msgid "Breaks the selected layout"
+#: buildtools/autotools/autoprojectpart.cpp:132
+msgid "Run Configure"
 msgstr ""
 
-#: kdevdesigner/designer/mainwindow.cpp:224
-#: kdevdesigner/designer/mainwindowactions.cpp:376
-msgid "Layout"
-msgstr "Cynllun"
-
-#: kdevdesigner/designer/mainwindowactions.cpp:379
-#, c-format
-msgid "Add %1"
-msgstr "Ychwanegu %1"
-
-#: kdevdesigner/designer/mainwindowactions.cpp:382
-#: kdevdesigner/designer/mainwindowactions.cpp:555
-#, c-format
-msgid "Insert a %1"
+#: buildtools/autotools/autoprojectpart.cpp:135
+#: buildtools/autotools/autoprojectpart.cpp:665
+msgid "Run configure"
 msgstr ""
 
-#: kdevdesigner/designer/mainwindowactions.cpp:383
+#: buildtools/autotools/autoprojectpart.cpp:136
 msgid ""
-"<b>A %1</b>"
-"<p>%2</p>"
-"<p>Click to insert a single %3,or double click to keep the tool selected."
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:395
-#, c-format
-msgid "<b>The Layout toolbar</b>%1"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:431
-#, fuzzy
-msgid "Pointer"
-msgstr "Hidlo"
-
-#: kdevdesigner/designer/kdevdesigner_part.cpp:135
-#: kdevdesigner/designer/mainwindowactions.cpp:432
-msgid "&Pointer"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:435
-msgid "Selects the pointer tool"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:438
-#, fuzzy
-msgid "Connect Signal/Slots"
-msgstr "C&ysylltiadau :"
-
-#: kdevdesigner/designer/kdevdesigner_part.cpp:138
-#: kdevdesigner/designer/mainwindowactions.cpp:440
-msgid "&Connect Signal/Slots"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:444
-msgid "Selects the connection tool"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:447
-msgid "Tab Order"
-msgstr ""
-
-#: kdevdesigner/designer/kdevdesigner_part.cpp:140
-#: kdevdesigner/designer/mainwindowactions.cpp:448
-msgid "Tab &Order"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:451
-msgid "Selects the tab order tool"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:454
-msgid "Set Buddy"
-msgstr ""
-
-#: kdevdesigner/designer/kdevdesigner_part.cpp:142
-#: kdevdesigner/designer/mainwindowactions.cpp:455
-msgid "Set &Buddy"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:458
-msgid "Sets a buddy to a label"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:464
-#, c-format
-msgid "<b>The Tools toolbar</b>%1"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:466
-msgid "Tools"
-msgstr "Offer"
-
-#: kdevdesigner/designer/mainwindowactions.cpp:488
-#, fuzzy
-msgid "Custom Widgets"
-msgstr "Addasu"
-
-#: kdevdesigner/designer/kdevdesigner_part.cpp:145
-#: kdevdesigner/designer/mainwindowactions.cpp:490
-#, fuzzy
-msgid "Edit &Custom Widgets..."
-msgstr "Addasu..."
-
-#: kdevdesigner/designer/mainwindowactions.cpp:491
-msgid "Opens a dialog to add and change custom widgets"
+"<b>Run configure</b>"
+"<p>Executes <b>configure</b> with flags, arguments and environment variables "
+"specified in the project settings dialog, <b>Configure Options</b> tab."
 msgstr ""
 
-#: kdevdesigner/designer/mainwindowactions.cpp:508
-msgid "<b>The %1</b>%2"
+#: buildtools/autotools/autoprojectpart.cpp:141
+#: buildtools/autotools/autoprojectpart.cpp:144
+msgid "Run automake && friends"
 msgstr ""
 
-#: kdevdesigner/designer/mainwindowactions.cpp:509
-#, c-format
+#: buildtools/autotools/autoprojectpart.cpp:145
 msgid ""
-" Click on a button to insert a single widget, or double click to insert "
-"multiple %1."
+"<b>Run automake && friends</b>"
+"<p>Executes"
+"<br><b>make -f Makefile.cvs</b>"
+"<br><b>./configure</b>"
+"<br>commands from the project directory."
 msgstr ""
 
-#: kdevdesigner/designer/mainwindowactions.cpp:512
-msgid "<b>The %1 Widgets</b>%2"
+#: buildtools/autotools/autoprojectpart.cpp:148
+#: buildtools/autotools/autoprojectpart.cpp:151
+msgid "Update admin module"
 msgstr ""
 
-#: kdevdesigner/designer/mainwindowactions.cpp:513
+#: buildtools/autotools/autoprojectpart.cpp:152
 msgid ""
-" Click on a button to insert a single %1 widget, or double click to insert "
-"multiple widgets."
+"<b>Update admin module</b>"
+"<p>Recreates the project admin directory using the version present on the local "
+"system."
 msgstr ""
 
-#: kdevdesigner/designer/mainwindowactions.cpp:557
-msgid "<b>A %1</b>"
-msgstr "<b>A %1</b>"
-
-#: kdevdesigner/designer/mainwindowactions.cpp:560
-msgid "<p>Double click on this tool to keep it selected.</p>"
+#: buildtools/autotools/autoprojectpart.cpp:183
+msgid "&Distclean"
 msgstr ""
 
-#: kdevdesigner/designer/mainwindowactions.cpp:579
-msgid ""
-"<b>The Custom Widgets toolbar</b>%1"
-"<p>Click <b>Edit Custom Widgets...</b>in the <b>Tools|Custom</b> "
-"menu to add and change custom widgets</p>"
+#: buildtools/autotools/autoprojectpart.cpp:186
+msgid "Distclean"
 msgstr ""
 
-#: kdevdesigner/designer/mainwindowactions.cpp:584
+#: buildtools/autotools/autoprojectpart.cpp:187
 msgid ""
-" Click on the buttons to insert a single widget, or double click to insert "
-"multiple widgets."
-msgstr ""
-
-#: kdevdesigner/designer/kdevdesigner_part.cpp:144
-#: kdevdesigner/designer/mainwindowactions.cpp:605
-msgid "Configure Toolbox..."
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:606
-msgid "Opens a dialog to configure the common widgets page of the toolbox"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:620
-#, c-format
-msgid "<b>The File toolbar</b>%1"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:630
-msgid "New dialog or file"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:631
-#: kdevdesigner/designer/mainwindowactions.cpp:645
-msgid "&New..."
-msgstr "&Newydd..."
-
-#: kdevdesigner/designer/mainwindowactions.cpp:634
-msgid "Creates a new project, form or source file."
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:647
-msgid "Creates a new dialog or file"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:651
-msgid "New Dialog"
-msgstr "Ymgom Newydd"
-
-#: kdevdesigner/designer/mainwindowactions.cpp:652
-#, fuzzy
-msgid "&Dialog..."
-msgstr "&Teilio..."
-
-#: kdevdesigner/designer/mainwindowactions.cpp:655
-msgid "Creates a new dialog."
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:660
-msgid "&File..."
-msgstr "&Ffeil..."
-
-#: kdevdesigner/designer/mainwindowactions.cpp:663
-#, fuzzy
-msgid "Creates a new file."
-msgstr "Methu creu'r ffeil newydd."
-
-#: kdevdesigner/designer/mainwindowactions.cpp:678
-msgid "Opens an existing project, form or source file "
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:692
-msgid "Closes the current project or document"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:707
-msgid "Saves the current project or document"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:717
-msgid "Save &As..."
-msgstr "Cadw &Fel..."
-
-#: kdevdesigner/designer/mainwindowactions.cpp:718
-msgid "Saves the current form with a new filename"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:727
-msgid "Save All"
-msgstr "Cadw Popeth"
-
-#: kdevdesigner/designer/mainwindowactions.cpp:728
-msgid "Sa&ve All"
-msgstr "Ca&dw Popeth"
-
-#: kdevdesigner/designer/mainwindowactions.cpp:729
-msgid "Saves all open documents"
+"<b>Distclean</b>"
+"<p>Runs <b>make distclean</b> command from the project directory."
+"<br>Environment variables and make arguments can be specified in the project "
+"settings dialog, <b>Make Options</b> tab."
 msgstr ""
 
-#: kdevdesigner/designer/kdevdesigner_part.cpp:100
-#: kdevdesigner/designer/mainwindowactions.cpp:740
-msgid "Create &Template..."
+#: buildtools/autotools/autoprojectpart.cpp:192
+msgid "Make Messages && Merge"
 msgstr ""
 
-#: kdevdesigner/designer/mainwindowactions.cpp:741
-#, fuzzy
-msgid "Creates a new template"
-msgstr "Creu Patrymlun"
-
-#: kdevdesigner/designer/mainwindowactions.cpp:754
-msgid "Recently Opened Files "
+#: buildtools/autotools/autoprojectpart.cpp:195
+msgid "Make messages && merge"
 msgstr ""
 
-#: kdevdesigner/designer/mainwindowactions.cpp:755
-#, fuzzy
-msgid "Recently Opened Projects"
-msgstr "Agor Cywaith"
-
-#: kdevdesigner/designer/mainwindowactions.cpp:773
-msgid "Exit"
-msgstr "Terfynu"
-
-#: kdevdesigner/designer/mainwindowactions.cpp:775
+#: buildtools/autotools/autoprojectpart.cpp:196
 msgid ""
-"Quits the application and prompts to save any changed forms, source files or "
-"project settings"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:788
-msgid "Pr&oject"
-msgstr "Cy&waith"
-
-#: kdevdesigner/designer/mainwindowactions.cpp:791
-#: kdevdesigner/designer/mainwindowactions.cpp:792
-#, fuzzy
-msgid "Active Project"
-msgstr "Cywaith Newydd"
-
-#: kdevdesigner/designer/mainwindowactions.cpp:808
-msgid "Add File"
-msgstr "Ychwanegu Ffeil"
-
-#: kdevdesigner/designer/kdevdesigner_part.cpp:125
-#: kdevdesigner/designer/mainwindowactions.cpp:808
-msgid "&Add File..."
-msgstr "&Ychwanegu Ffeil..."
-
-#: kdevdesigner/designer/mainwindowactions.cpp:810
-msgid "Adds a file to the current project"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:818
-msgid "Image Collection..."
-msgstr ""
-
-#: kdevdesigner/designer/kdevdesigner_part.cpp:127
-#: kdevdesigner/designer/mainwindowactions.cpp:819
-msgid "&Image Collection..."
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:820
-msgid "Opens a dialog for editing the current project's image collection"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:828
-#, fuzzy
-msgid "Database Connections..."
-msgstr "C&ysylltiadau :"
-
-#: kdevdesigner/designer/kdevdesigner_part.cpp:129
-#: kdevdesigner/designer/mainwindowactions.cpp:829
-msgid "&Database Connections..."
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:830
-msgid "Opens a dialog for editing the current project's database connections"
+"<b>Make messages && merge</b>"
+"<p>Runs <b>make package-messages</b> command from the project directory."
+"<br>Environment variables and make arguments can be specified in the project "
+"settings dialog, <b>Make Options</b> tab."
 msgstr ""
 
-#: kdevdesigner/designer/mainwindowactions.cpp:839
-msgid "Project Settings..."
-msgstr "Gosodiadau Cywaith ..."
-
-#: kdevdesigner/designer/mainwindowactions.cpp:840
-msgid "&Project Settings..."
-msgstr "&Gosodiadau Cywaith ..."
-
-#: kdevdesigner/designer/mainwindowactions.cpp:841
-msgid "Opens a dialog to change the project's settings"
+#: buildtools/autotools/autoprojectpart.cpp:204
+msgid "Build Configuration"
 msgstr ""
 
-#: kdevdesigner/designer/mainwindow.cpp:3735
-#: kdevdesigner/designer/mainwindowactions.cpp:855
-msgid "&Preview"
-msgstr "&Rhagolwg"
-
-#: kdevdesigner/designer/mainwindowactions.cpp:857
-msgid "Preview Form"
-msgstr "Rhagolygu Ffurflen"
-
-#: kdevdesigner/designer/kdevdesigner_part.cpp:164
-#: kdevdesigner/designer/mainwindowactions.cpp:857
-msgid "Preview &Form"
-msgstr "Rhagolyg&u Ffurflen"
-
-#: kdevdesigner/designer/mainwindowactions.cpp:860
-msgid "Opens a preview"
+#: buildtools/autotools/autoprojectpart.cpp:206
+msgid "Build configuration menu"
 msgstr ""
 
-#: kdevdesigner/designer/mainwindowactions.cpp:874
+#: buildtools/autotools/autoprojectpart.cpp:207
 msgid ""
-"The preview will use the Motif look and feel which is used as the default style "
-"on most UNIX systems."
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:876
-msgid "The preview will use the Windows look and feel."
+"<b>Build configuration menu</b>"
+"<p>Allows to switch between project build configurations."
+"<br>Build configuration is a set of build and top source directory settings, "
+"configure flags and arguments, compiler flags, etc."
+"<br>Modify build configurations in project settings dialog, <b>"
+"Configure Options</b> tab."
 msgstr ""
 
-#: kdevdesigner/designer/mainwindowactions.cpp:878
+#: buildtools/autotools/autoprojectpart.cpp:220
 msgid ""
-"The preview will use the Platinum look and feel which is similar to the "
-"Macintosh GUI style."
+"<b>Execute program</b>"
+"<p>Executes the currently active target or the main program specified in "
+"project settings, <b>Run Options</b> tab."
 msgstr ""
 
-#: kdevdesigner/designer/mainwindowactions.cpp:880
+#: buildtools/autotools/autoprojectpart.cpp:307
 msgid ""
-"The preview will use the CDE look and feel which is similar to some versions of "
-"the Common Desktop Environment."
+"No active target specified, running the application will\n"
+"not work until you make a target active in the Automake Manager\n"
+"on the right side or use the Main Program options under\n"
+"Project -> Project Options -> Run Options"
 msgstr ""
 
-#: kdevdesigner/designer/mainwindowactions.cpp:882
-msgid ""
-"The preview will use the Motif look and feel which is used as the default style "
-"on SGI systems."
+#: buildtools/autotools/autoprojectpart.cpp:310
+msgid "No active target specified"
 msgstr ""
 
-#: kdevdesigner/designer/mainwindowactions.cpp:884
+#: buildtools/autotools/autoprojectpart.cpp:415
 msgid ""
-"The preview will use the advanced Motif look and feel used by the GIMP toolkit "
-"(GTK) on Linux."
+"There is no active target.\n"
+"Unable to determine the main program."
 msgstr ""
 
-#: kdevdesigner/designer/mainwindowactions.cpp:886
-#, fuzzy
-msgid "Preview Form in %1 Style"
-msgstr "Rhagolyg&u Ffurflen"
-
-#: kdevdesigner/designer/mainwindowactions.cpp:887
-msgid "... in %1 Style"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:888
-msgid "Opens a preview in %1 style"
+#: buildtools/autotools/autoprojectpart.cpp:416
+#: buildtools/autotools/autoprojectpart.cpp:1244
+msgid "No active target found"
 msgstr ""
 
-#: kdevdesigner/designer/mainwindowactions.cpp:889
+#: buildtools/autotools/autoprojectpart.cpp:422
 msgid ""
-"<b>Open a preview in %1 style.</b>"
-"<p>Use the preview to test the design and signal-slot connections of the "
-"current form. %2</p>"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:905
-msgid "Tile"
-msgstr "Teilio"
-
-#: kdevdesigner/designer/mainwindowactions.cpp:905
-msgid "&Tile"
-msgstr "&Teilio"
-
-#: kdevdesigner/designer/mainwindowactions.cpp:906
-msgid "Tiles the windows so that they are all visible"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:909
-msgid "Cascade"
-msgstr "Rhaeadr"
-
-#: kdevdesigner/designer/mainwindowactions.cpp:909
-msgid "&Cascade"
-msgstr "&Rhaeadr"
-
-#: kdevdesigner/designer/mainwindowactions.cpp:910
-msgid "Cascades the windows so that all their title bars are visible"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:914
-msgid "Cl&ose"
-msgstr "Ca&u"
-
-#: kdevdesigner/designer/mainwindowactions.cpp:915
-#, fuzzy
-msgid "Closes the active window"
-msgstr "Gweithredoedd d&ewisiedig:"
-
-#: kdevdesigner/designer/mainwindowactions.cpp:919
-msgid "Close Al&l"
-msgstr "Cau Pope&th"
-
-#: kdevdesigner/designer/mainwindowactions.cpp:920
-msgid "Closes all form windows"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:924
-msgid "Next"
-msgstr "Nesaf"
-
-#: kdevdesigner/designer/mainwindowactions.cpp:924
-msgid "Ne&xt"
-msgstr "Ne&saf"
-
-#: kdevdesigner/designer/mainwindowactions.cpp:925
-msgid "Activates the next window"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:929
-msgid "Previous"
-msgstr "Cynt"
-
-#: kdevdesigner/designer/mainwindowactions.cpp:929
-msgid "Pre&vious"
-msgstr "Cyn&t"
-
-#: kdevdesigner/designer/mainwindowactions.cpp:930
-msgid "Activates the previous window"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:953
-msgid "Vie&ws"
-msgstr "Gol&ygon"
-
-#: kdevdesigner/designer/mainwindowactions.cpp:954
-msgid "Tool&bars"
-msgstr "Barr&au Offer:"
-
-#: kdevdesigner/designer/mainwindowactions.cpp:983
-msgid "Opens the online help"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:987
-msgid "&Manual"
-msgstr "&Â Llaw"
-
-#: kdevdesigner/designer/mainwindowactions.cpp:988
-msgid "Opens the Qt Designer manual"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:993
-msgid "Displays information about Qt Designer"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:997
-msgid "About Qt"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:997
-msgid "About &Qt"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:998
-msgid "Displays information about the Qt Toolkit"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:1004
-#, fuzzy
-msgid "Register Qt"
-msgstr "Ail-gychwyn"
-
-#: kdevdesigner/designer/mainwindowactions.cpp:1004
-msgid "&Register Qt..."
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:1005
-msgid "Opens a web browser at the evaluation form on www.trolltech.com"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:1006
-msgid "Register with Trolltech"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:1010
-#: kdevdesigner/designer/mainwindowactions.cpp:1011
-msgid "What's This?"
-msgstr "Beth Yw Hyn?"
-
-#: kdevdesigner/designer/mainwindowactions.cpp:1012
-msgid "\"What's This?\" context sensitive help"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:1041
-msgid "Create a new project, form or source file..."
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:1075
-#, fuzzy
-msgid "Name of File"
-msgstr "Gwaredu ffeil"
-
-#: kdevdesigner/designer/mainwindowactions.cpp:1075
-msgid "Enter the name of the new source file:"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindow.cpp:2515
-#: kdevdesigner/designer/mainwindowactions.cpp:1127
-#, fuzzy
-msgid "Save Project Settings"
-msgstr "Gosodiadau Cywaith"
-
-#: kdevdesigner/designer/mainwindow.cpp:2516
-#: kdevdesigner/designer/mainwindowactions.cpp:1128
-#: kdevdesigner/designer/sourcefile.cpp:223
-msgid "Save changes to '%1'?"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:1169
-msgid "Selected project '%1'"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:1199
-msgid "Open a file..."
-msgstr "Agor Ffeil ..."
-
-#: kdevdesigner/designer/mainwindowactions.cpp:1211
-msgid "*.ui *.pro|Designer Files"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:1214
-msgid "*.pro|QMAKE Project Files"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:1275
-msgid "No import filter is available to import '%1'"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:1279
-msgid "Importing '%1' using import filter ..."
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:1283
-msgid "Nothing to load in '%1'"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:1322
-msgid "Reading file '%1'..."
+"Active target \"%1\" is not binary ( %2 ).\n"
+"Unable to determine the main program.  If you want this\n"
+"to be the active target, set a main program under\n"
+"Project -> Project Options -> Run Options"
 msgstr ""
 
-#: kdevdesigner/designer/mainwindowactions.cpp:1341
-msgid "Loaded file '%1'"
+#: buildtools/autotools/autoprojectpart.cpp:425
+#: buildtools/autotools/autoprojectpart.cpp:1251
+msgid "Active target is not a library"
 msgstr ""
 
-#: kdevdesigner/designer/mainwindowactions.cpp:1343
-#, fuzzy
-msgid "Failed to load file '%1'"
-msgstr "Ffeiliau i'w llwytho"
-
-#: kdevdesigner/designer/mainwindowactions.cpp:1344
-#, fuzzy
-msgid "Load File"
-msgstr "Gwaredu Ffeil"
-
-#: kdevdesigner/designer/mainwindowactions.cpp:1344
-msgid "Could not load file '%1'."
-msgstr "Methu llwytho ffeil. '%1'"
-
-#: kdevdesigner/designer/mainwindowactions.cpp:1392
-#, fuzzy
-msgid "Project '%1' saved."
-msgstr "Enw'r cywaith"
-
-#: kdevdesigner/designer/mainwindowactions.cpp:1398
-msgid "Enter a filename..."
-msgstr "Mewnosod enw ffeil ..."
-
-#: kdevdesigner/designer/mainwindowactions.cpp:1439
-#: kdevdesigner/designer/mainwindowactions.cpp:1494
-#, fuzzy
-msgid "NewTemplate"
-msgstr "Patrymlun"
-
-#: kdevdesigner/designer/mainwindowactions.cpp:1451
-#: kdevdesigner/designer/mainwindowactions.cpp:1472
-#, fuzzy
-msgid "Could not create the template."
-msgstr "Methu creu'r ffeil newydd."
-
-#: kdevdesigner/designer/mainwindowactions.cpp:1568
-#, fuzzy
-msgid "Paste Error"
-msgstr "Gwall Mewnol"
-
-#: kdevdesigner/designer/mainwindowactions.cpp:1569
+#: buildtools/autotools/autoprojectpart.cpp:553
 msgid ""
-"Cannot paste widgets. Designer could not find a container\n"
-"to paste into which does not contain a layout. Break the layout\n"
-"of the container you want to paste into and select this container\n"
-"and then paste again."
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:1730
-msgid "Edit the current form's slots..."
+"The directory you selected is not the active directory.\n"
+"You should 'activate' the target you're currently working on in Automake "
+"Manager.\n"
+"Just right-click a target and choose 'Make Target Active'."
 msgstr ""
 
-#: kdevdesigner/designer/mainwindowactions.cpp:1741
-msgid "Edit the current form's connections..."
+#: buildtools/autotools/autoprojectpart.cpp:556
+msgid "No Active Target Found"
 msgstr ""
 
-#: kdevdesigner/designer/mainwindow.cpp:2968
-#: kdevdesigner/designer/mainwindowactions.cpp:1762
-#: kdevdesigner/designer/mainwindowactions.cpp:1785
-#, fuzzy
-msgid "Edit Source"
-msgstr "Golygydd"
-
-#: kdevdesigner/designer/mainwindow.cpp:2969
-#: kdevdesigner/designer/mainwindowactions.cpp:1763
-#: kdevdesigner/designer/mainwindowactions.cpp:1786
+#: buildtools/autotools/autoprojectpart.cpp:652
 msgid ""
-"There is no plugin for editing %1 code installed.\n"
-"Note: Plugins are not available in static Qt configurations."
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:1841
-msgid "Edit the current form's settings..."
-msgstr ""
-
-#: kdevdesigner/designer/mainwindowactions.cpp:1870
-#, fuzzy
-msgid "Edit preferences..."
-msgstr "Hoffterau"
-
-#: kdevdesigner/designer/mainwindowactions.cpp:2038
-msgid "Edit custom widgets..."
+"%1\n"
+"There is no Makefile in this directory\n"
+"and no configure script for this project.\n"
+"Run automake & friends and configure first?"
 msgstr ""
 
-#: kdevdesigner/designer/command.cpp:528 kdevdesigner/designer/command.cpp:540
-msgid "Set 'name' Property"
+#: buildtools/autotools/autoprojectpart.cpp:654
+msgid "Run Them"
 msgstr ""
 
-#: kdevdesigner/designer/command.cpp:529
+#: buildtools/autotools/autoprojectpart.cpp:665
 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'."
+"%1\n"
+"There is no Makefile in this directory. Run 'configure' first?"
 msgstr ""
 
-#: kdevdesigner/designer/command.cpp:541
+#: buildtools/autotools/autoprojectpart.cpp:803
 msgid ""
-"The name of a widget must not be null.\n"
-"The name has been reverted to '%1'."
+"Found a circular dependency in the project, between this target and %1.\n"
+"Cannot build this project until this is resolved."
 msgstr ""
 
-#: kdevdesigner/designer/newformimpl.cpp:160
-msgid "Load Template"
-msgstr "Llwytho Patrymlun"
-
-#: kdevdesigner/designer/newformimpl.cpp:161
-msgid "Could not load form description from template '%1'"
+#: buildtools/autotools/autoprojectpart.cpp:803
+msgid "Circular Dependency found"
 msgstr ""
 
-#: kdevdesigner/designer/newformimpl.cpp:252
-#, fuzzy
-msgid "%1 Project"
-msgstr "Cywaith"
-
-#: kdevdesigner/designer/newformimpl.cpp:260
-msgid "Dialog"
-msgstr "Ymgom"
-
-#: kdevdesigner/designer/newformimpl.cpp:267
-msgid "Wizard"
-msgstr "Dewin"
-
-#: kdevdesigner/designer/newformimpl.cpp:272
-msgid "Widget"
+#: buildtools/autotools/autoprojectpart.cpp:903
+msgid "Can only compile files in directories which belong to the project."
 msgstr ""
 
-#: kdevdesigner/designer/newformimpl.cpp:277
-msgid "Main Window"
-msgstr "Prif Ffenestr"
-
-#: kdevdesigner/designer/project.cpp:149
+#: buildtools/autotools/autoprojectpart.cpp:1018
 msgid ""
-"Could not connect to the database.\n"
-"Press 'OK' to continue or 'Cancel' to specify different\n"
-"connection information.\n"
-msgstr ""
-
-#: kdevdesigner/designer/multilineeditorimpl.cpp:99
-msgid "&Styles"
-msgstr "&Arddulliau"
-
-#: kdevdesigner/designer/multilineeditorimpl.cpp:121
-msgid "Typewriter"
-msgstr ""
-
-#: kdevdesigner/designer/multilineeditorimpl.cpp:134
-#, fuzzy
-msgid "Break"
-msgstr "&Yn ôl"
-
-#: kdevdesigner/designer/multilineeditorimpl.cpp:139
-msgid "Paragraph"
-msgstr "Paragraff"
-
-#: kdevdesigner/designer/multilineeditorimpl.cpp:147
-msgid "Align left"
-msgstr "Alinio Chwith"
-
-#: kdevdesigner/designer/multilineeditorimpl.cpp:153
-msgid "Align center"
-msgstr "Alinio i'r Canol"
-
-#: kdevdesigner/designer/multilineeditorimpl.cpp:159
-msgid "Align right"
-msgstr "Alinio Dde"
-
-#: kdevdesigner/designer/multilineeditorimpl.cpp:165
-msgid "Blockquote"
-msgstr ""
-
-#: kdevdesigner/designer/multilineeditorimpl.cpp:173
-msgid "&Font"
-msgstr "&Wynebfath"
-
-#: kdevdesigner/designer/multilineeditorimpl.cpp:185
-msgid "Fontsize +1"
-msgstr ""
-
-#: kdevdesigner/designer/multilineeditorimpl.cpp:190
-msgid "Fontsize -1"
-msgstr ""
-
-#: kdevdesigner/designer/multilineeditorimpl.cpp:195
-#, fuzzy
-msgid "Headline 1"
-msgstr "Pennawd"
-
-#: kdevdesigner/designer/multilineeditorimpl.cpp:200
-#, fuzzy
-msgid "Headline 2"
-msgstr "Pennawd"
-
-#: kdevdesigner/designer/multilineeditorimpl.cpp:205
-#, fuzzy
-msgid "Headline 3"
-msgstr "Pennawd"
-
-#: kdevdesigner/designer/multilineeditorimpl.cpp:211
-msgid "O&ptions"
-msgstr "De&wisiadau"
-
-#: kdevdesigner/designer/multilineeditorimpl.cpp:217
-msgid "Word Wrapping"
-msgstr ""
-
-#: kdevdesigner/designer/multilineeditorimpl.cpp:279
-msgid "Set the Text of '%1'"
-msgstr ""
-
-#: kdevdesigner/designer/multilineeditorimpl.cpp:285
-msgid "Set 'wordWrap' of '%2'"
-msgstr ""
-
-#: kdevdesigner/designer/kdevdesigner_part.cpp:131
-msgid "&Designer Project Settings..."
-msgstr ""
-
-#: kdevdesigner/designer/kdevdesigner_part.cpp:153
-msgid "Lay Out in &Grid"
-msgstr ""
-
-#: kdevdesigner/designer/kdevdesigner_part.cpp:161
-msgid "Add Spacer"
-msgstr ""
-
-#: kdevdesigner/designer/kdevdesigner_part.cpp:166
-msgid "Ne&xt Form"
-msgstr ""
-
-#: kdevdesigner/designer/kdevdesigner_part.cpp:168
-msgid "Pre&vious Form"
-msgstr ""
-
-#: kdevdesigner/designer/kdevdesigner_part.cpp:172
-msgid "Configure &KDevDesigner..."
-msgstr ""
-
-#: kdevdesigner/designer/kdevdesigner_part.cpp:277
-msgid "KDevDesignerPart"
-msgstr ""
-
-#: kdevdesigner/designer/wizardeditorimpl.cpp:83
-msgid "Edit Wizard Pages"
-msgstr ""
-
-#: kdevdesigner/designer/hierarchyview.cpp:630
-#: kdevdesigner/designer/hierarchyview.cpp:637
-#: kdevdesigner/designer/mainwindow.cpp:1805
-#: kdevdesigner/designer/mainwindow.cpp:1824
-#: kdevdesigner/designer/mainwindow.cpp:1844
-#: kdevdesigner/designer/mainwindow.cpp:1884
-#: kdevdesigner/designer/mainwindow.cpp:1945
-#: kdevdesigner/designer/wizardeditorimpl.cpp:133
-#, c-format
-msgid "Add Page to %1"
-msgstr ""
-
-#: kdevdesigner/designer/hierarchyview.cpp:656
-#: kdevdesigner/designer/hierarchyview.cpp:667
-#: kdevdesigner/designer/mainwindow.cpp:1813
-#: kdevdesigner/designer/mainwindow.cpp:1832
-#: kdevdesigner/designer/mainwindow.cpp:1851
-#: kdevdesigner/designer/mainwindow.cpp:1894
-#: kdevdesigner/designer/mainwindow.cpp:1953
-#: kdevdesigner/designer/wizardeditorimpl.cpp:151
-msgid "Delete Page %1 of %2"
-msgstr ""
-
-#: kdevdesigner/designer/wizardeditorimpl.cpp:172
-#: kdevdesigner/designer/wizardeditorimpl.cpp:192
-msgid "Swap Pages %1 and %2 of %3"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindow.cpp:1971
-#: kdevdesigner/designer/wizardeditorimpl.cpp:220
-msgid "Rename page %1 of %2"
-msgstr ""
-
-#: kdevdesigner/designer/wizardeditorimpl.cpp:251
-msgid "Move Page %1 to %2 in %3"
-msgstr ""
-
-#: kdevdesigner/designer/editfunctionsimpl.cpp:135
-msgid "Add/Remove functions of '%1'"
-msgstr ""
-
-#: kdevdesigner/designer/editfunctionsimpl.cpp:150
-#: kdevdesigner/designer/hierarchyview.cpp:1144
-#, fuzzy
-msgid "Remove Function"
-msgstr "Gwaredu ffeil"
-
-#: kdevdesigner/designer/editfunctionsimpl.cpp:206
-msgid "Change Function Attributes"
+"There is neither a Makefile.cvs file nor an autogen.sh script in the project "
+"directory."
 msgstr ""
 
-#: kdevdesigner/designer/editfunctionsimpl.cpp:217
+#: buildtools/autotools/autoprojectpart.cpp:1243
 msgid ""
-"Some syntactically incorrect functions have been defined.\n"
-"Remove these functions?"
-msgstr ""
-
-#: kdevdesigner/designer/formwindow.cpp:840
-#: kdevdesigner/designer/formwindow.cpp:1329
-#: kdevdesigner/designer/formwindow.cpp:1341
-#: kdevdesigner/designer/sizehandle.cpp:216
-msgid "%1/%2"
-msgstr ""
-
-#: kdevdesigner/designer/sizehandle.cpp:235
-msgid "Resize"
-msgstr "Newid maint"
-
-#: kdevdesigner/designer/actionlistview.cpp:95
-#, fuzzy
-msgid "&Connect Action..."
-msgstr "Cysylltiad"
-
-#: kdevdesigner/designer/actionlistview.cpp:97
-msgid "Delete Action"
-msgstr "Dileu Gweithred"
-
-#: kdevdesigner/designer/workspace.cpp:598
-#, fuzzy
-msgid "&Open Source File"
-msgstr "Agor ffeil"
-
-#: kdevdesigner/designer/workspace.cpp:601
-msgid "&Remove Source File From Project"
-msgstr ""
-
-#: kdevdesigner/designer/workspace.cpp:604
-#, fuzzy
-msgid "&Open Form"
-msgstr "Agor ffeil"
-
-#: kdevdesigner/designer/workspace.cpp:607
-#: kdevdesigner/designer/workspace.cpp:617
-msgid "&Remove Form From Project"
-msgstr ""
-
-#: kdevdesigner/designer/workspace.cpp:610
-#, fuzzy
-msgid "&Open Form Source"
-msgstr "&Tarddiad"
-
-#: kdevdesigner/designer/workspace.cpp:614
-msgid "&Remove Source File From Form"
+"There is no active target.\n"
+"Unable to determine the main program"
 msgstr ""
 
-#: kdevdesigner/designer/workspace.cpp:623
-#, fuzzy
-msgid "&Open Source"
-msgstr "&Tarddiad"
-
-#: kdevdesigner/designer/variabledialogimpl.cpp:104
+#: buildtools/autotools/autoprojectpart.cpp:1248
 msgid ""
-"One variable has been declared twice.\n"
-"Remove this variable?"
-msgstr ""
-
-#: kdevdesigner/designer/outputwindow.cpp:80
-msgid "Warnings/Errors"
-msgstr ""
-
-#: kdevdesigner/designer/connectiontable.cpp:38
-msgid "Sender"
-msgstr "Anfonwr"
-
-#: kdevdesigner/designer/connectiontable.cpp:40
-msgid "Receiver"
-msgstr "Derbynnydd"
-
-#: kdevdesigner/designer/actiondnd.cpp:349
-#: kdevdesigner/designer/actiondnd.cpp:402
-#, fuzzy
-msgid "Delete Toolbar"
-msgstr "Bar offer"
-
-#: kdevdesigner/designer/actiondnd.cpp:352
-#: kdevdesigner/designer/actiondnd.cpp:432
-msgid "Delete Toolbar '%1'"
-msgstr ""
-
-#: kdevdesigner/designer/actiondnd.cpp:397
-msgid "Delete Separator"
-msgstr ""
-
-#: kdevdesigner/designer/actiondnd.cpp:400
-msgid "Insert Separator"
-msgstr "Mewnosod Gwahanydd"
-
-#: kdevdesigner/designer/actiondnd.cpp:411
-#: kdevdesigner/designer/actiondnd.cpp:466
-#: kdevdesigner/designer/actiondnd.cpp:489
-msgid "Delete Action '%1' From Toolbar '%2'"
-msgstr ""
-
-#: kdevdesigner/designer/actiondnd.cpp:426
-msgid "Add Separator to Toolbar '%1'"
+"Active target \"%1\" is not binary ( %2 ).\n"
+"Unable to determine the main program. If you want this\n"
+"to be the active target, set a main program under\n"
+"Project -> Project Options -> Run Options"
 msgstr ""
 
-#: kdevdesigner/designer/actiondnd.cpp:506
-#: kdevdesigner/designer/actiondnd.cpp:573
-msgid "Add Action '%1' to Toolbar '%2'"
+#: buildtools/autotools/addsubprojectdlg.cpp:58
+msgid "You have to give the subproject a name."
 msgstr ""
 
-#: kdevdesigner/designer/actiondnd.cpp:566
-msgid "Insert/Move Action"
+#: buildtools/autotools/addsubprojectdlg.cpp:65
+msgid "A subproject with this name already exists."
 msgstr ""
 
-#: kdevdesigner/designer/actiondnd.cpp:567
+#: buildtools/autotools/addsubprojectdlg.cpp:75
 msgid ""
-"Action '%1' has already been added to this toolbar.\n"
-"An Action may only occur once in a given toolbar."
-msgstr ""
-
-#: kdevdesigner/designer/actiondnd.cpp:699
-msgid "Add Widget '%1' to Toolbar '%2'"
-msgstr ""
-
-#: kdevdesigner/designer/hierarchyview.cpp:753
-#, fuzzy
-msgid "Class Variables"
-msgstr "Newidynnau"
-
-#: kdevdesigner/designer/hierarchyview.cpp:835
-msgid "Functions"
-msgstr "Ffwythiannau"
-
-#: kdevdesigner/designer/hierarchyview.cpp:1052
-msgid "New..."
-msgstr "Newydd ..."
-
-#: kdevdesigner/designer/hierarchyview.cpp:1061
-#, fuzzy
-msgid "Goto Implementation"
-msgstr "Heb ei weithredoli."
-
-#: kdevdesigner/designer/hierarchyview.cpp:1151
-#, fuzzy
-msgid "Remove Variable"
-msgstr "Gwaredu ffeil"
-
-#: kdevdesigner/designer/hierarchyview.cpp:1202
-msgid "This variable has already been declared."
+"There is no config.status in the project root directory. Run 'Configure' first"
 msgstr ""
 
-#: kdevdesigner/designer/hierarchyview.cpp:1230
-msgid "Add Variable"
-msgstr "Ychwanegu Newidyn"
-
-#: kdevdesigner/designer/hierarchyview.cpp:1247
-msgid "Objects"
-msgstr "Gwrthrychau"
+#: buildtools/autotools/addsubprojectdlg.cpp:85
+msgid "A file named %1 already exists."
+msgstr "Mae ffeil o'r enw %1 mewn bod yn barod."
 
-#: kdevdesigner/designer/hierarchyview.cpp:1248
+#: buildtools/autotools/addsubprojectdlg.cpp:90
 msgid ""
-"List of all widgets and objects of the current form in hierarchical order"
+"A subdirectory %1 already exists. Do you wish to add it as a subproject?"
 msgstr ""
 
-#: kdevdesigner/designer/hierarchyview.cpp:1249
-msgid "Members"
-msgstr "Aelodau"
-
-#: kdevdesigner/designer/hierarchyview.cpp:1250
-msgid "List of all members of the current form"
+#: buildtools/autotools/addsubprojectdlg.cpp:97
+#, c-format
+msgid "Could not create subdirectory %1."
 msgstr ""
 
-#: kdevdesigner/designer/hierarchyview.cpp:1269
-msgid "Class Declarations"
+#: buildtools/autotools/addsubprojectdlg.cpp:103
+#, c-format
+msgid "Could not access the subdirectory %1."
 msgstr ""
 
-#: kdevdesigner/designer/hierarchyview.cpp:1270
-msgid "List of all classes and its declarations of the current source file"
+#: buildtools/autotools/addsubprojectdlg.cpp:151
+#, c-format
+msgid "Could not create Makefile.am in subdirectory %1."
 msgstr ""
 
-#: kdevdesigner/designer/customwidgeteditorimpl.cpp:222
-#, fuzzy
-msgid "Adding Custom Widget"
-msgstr "Addasu"
-
-#: kdevdesigner/designer/customwidgeteditorimpl.cpp:223
+#: buildtools/autotools/autodetailsview.cpp:182
 msgid ""
-"Custom widget names must be unique.\n"
-"A custom widget called '%1' already exists, so it is not possible to add "
-"another widget with this name."
-msgstr ""
-
-#: kdevdesigner/designer/customwidgeteditorimpl.cpp:272
-msgid "Removing Custom Widget"
-msgstr ""
-
-#: kdevdesigner/designer/customwidgeteditorimpl.cpp:273
-msgid "The custom widget '%1' is in use, so it cannot be removed."
-msgstr ""
-
-#: kdevdesigner/designer/customwidgeteditorimpl.cpp:379
-msgid "*.h *.h++ *.hxx *.hh|Header Files"
+"<b>Options</b>"
+"<p>Target options dialog that provides settings for linker flags and lists of "
+"dependencies and external libraries that are used when compiling the target."
 msgstr ""
 
-#: kdevdesigner/designer/customwidgeteditorimpl.cpp:397
-#, fuzzy
-msgid "Renaming Custom Widget"
-msgstr "Addasu"
-
-#: kdevdesigner/designer/customwidgeteditorimpl.cpp:398
+#: buildtools/autotools/autodetailsview.cpp:193
 msgid ""
-"Custom widget names must be unique.\n"
-"A custom widget called '%1' already exists, so it is not possible to rename "
-"this widget with this name."
+"<b>Create new file</b>"
+"<p>Creates a new file and adds it to a currently selected target."
 msgstr ""
 
-#: kdevdesigner/designer/customwidgeteditorimpl.cpp:684
-#: kdevdesigner/designer/customwidgeteditorimpl.cpp:752
+#: buildtools/autotools/autodetailsview.cpp:202
 msgid ""
-"*.cw|Custom-Widget Description\n"
-"*|All Files"
-msgstr ""
-
-#: kdevdesigner/designer/menubareditor.cpp:157
-msgid "new menu"
-msgstr ""
-
-#: kdevdesigner/designer/menubareditor.cpp:158
-#: kdevdesigner/designer/popupmenueditor.cpp:304
-msgid "new separator"
-msgstr ""
-
-#: kdevdesigner/designer/menubareditor.cpp:190
-#: kdevdesigner/designer/menubareditor.cpp:194
-#: kdevdesigner/designer/menubareditor.cpp:1012
-msgid "Add Menu"
-msgstr ""
-
-#: kdevdesigner/designer/menubareditor.cpp:242
-msgid "separator"
-msgstr "gwahanydd"
-
-#: kdevdesigner/designer/menubareditor.cpp:381
-msgid "Cut Menu"
-msgstr ""
-
-#: kdevdesigner/designer/menubareditor.cpp:404
-msgid "Paste Menu"
-msgstr ""
-
-#: kdevdesigner/designer/menubareditor.cpp:496
-#, fuzzy
-msgid "Delete Menu"
-msgstr " Dileu eitem"
-
-#: kdevdesigner/designer/menubareditor.cpp:1009
-msgid "Item Dragged"
-msgstr ""
-
-#: kdevdesigner/designer/menubareditor.cpp:1048
-msgid "Move Menu Left"
+"<b>Add existing files</b>"
+"<p>Adds existing file to a currently selected target. Header files will not be "
+"included in SOURCES list of a target. They will be added to noinst_HEADERS "
+"instead."
 msgstr ""
 
-#: kdevdesigner/designer/menubareditor.cpp:1070
-msgid "Move Menu Right"
+#: buildtools/autotools/autodetailsview.cpp:210
+msgid "Add Icon..."
 msgstr ""
 
-#: kdevdesigner/designer/menubareditor.cpp:1101
-#: kdevdesigner/designer/menubareditor.cpp:1106
-#, fuzzy
-msgid "Rename Menu"
-msgstr "Ai&l-enwi"
-
-#: kdevdesigner/designer/listvieweditorimpl.cpp:130
-msgid "Edit the Items and Columns of '%1'"
+#: buildtools/autotools/autodetailsview.cpp:212
+msgid "<b>Add icon</b><p>Adds an icon to a KDEICON target."
 msgstr ""
 
-#: kdevdesigner/designer/listvieweditorimpl.cpp:287
-msgid "New Column"
-msgstr "Colofn Newydd"
-
-#: kdevdesigner/designer/listvieweditorimpl.cpp:399
-msgid "Item"
-msgstr "Eitem"
-
-#: kdevdesigner/designer/listvieweditorimpl.cpp:417
+#: buildtools/autotools/autodetailsview.cpp:214
 #, fuzzy
-msgid "Subitem"
-msgstr "Cyflwyno"
-
-#: kdevdesigner/designer/sourcefile.cpp:222
-msgid "Save Code"
-msgstr ""
+msgid "Build Target"
+msgstr "Targed"
 
-#: kdevdesigner/designer/sourcefile.cpp:281
-msgid ""
-"The project already contains a source file with \n"
-"filename '%1'. Please choose a new filename."
+#: buildtools/autotools/autodetailsview.cpp:215
+msgid "Build Target..."
 msgstr ""
 
-#: kdevdesigner/designer/popupmenueditor.cpp:303
-msgid "new item"
-msgstr "eitem Newydd"
-
-#: kdevdesigner/designer/popupmenueditor.cpp:438
-msgid "Cut Item"
-msgstr "Torri'r Eitem"
-
-#: kdevdesigner/designer/popupmenueditor.cpp:466
-#, fuzzy
-msgid "Paste Item"
-msgstr "Dileu Eitem"
-
-#: kdevdesigner/designer/popupmenueditor.cpp:508
-msgid "Set Icon"
-msgstr "Gosod Eicon"
-
-#: kdevdesigner/designer/popupmenueditor.cpp:631
-msgid "Add Item"
-msgstr "Ychwanegu Eitem"
-
-#: kdevdesigner/designer/popupmenueditor.cpp:641
-msgid "Remove Item"
-msgstr "Gwaredu Eitem"
-
-#: kdevdesigner/designer/popupmenueditor.cpp:769
-#: kdevdesigner/designer/popupmenueditor.cpp:1428
-msgid "Rename Item"
-msgstr "Ailenwi Eitem"
-
-#: kdevdesigner/designer/popupmenueditor.cpp:1233
-#, fuzzy
-msgid "Drop Item"
-msgstr "Dileu Eitem"
-
-#: kdevdesigner/designer/popupmenueditor.cpp:1287
-#, fuzzy
-msgid "Remove Icon"
-msgstr "Gwaredu ffeil"
-
-#: kdevdesigner/designer/popupmenueditor.cpp:1308
-msgid "Move Item Up"
-msgstr "Symud Eitem i Fyny"
-
-#: kdevdesigner/designer/popupmenueditor.cpp:1332
-msgid "Move Item Down"
-msgstr "Symud Eitem i Lawr"
-
-#: kdevdesigner/designer/mainwindow.cpp:205
+#: buildtools/autotools/autodetailsview.cpp:218
 msgid ""
-"Ready - This is the non-commercial version of Qt - For commercial evaluations, "
-"use the help menu to register with Trolltech."
-msgstr ""
-
-#: kdevdesigner/designer/mainwindow.cpp:361
-#: kdevdesigner/designer/mainwindow.cpp:3747
-msgid "Property Editor/Signal Handlers"
+"<b>Build target</b>"
+"<p>Constructs a series of make commands to build the selected target. Also "
+"builds dependent targets."
 msgstr ""
 
-#: kdevdesigner/designer/mainwindow.cpp:363
-msgid ""
-"<b>The Property Editor</b>"
-"<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.)"
+#: buildtools/autotools/autodetailsview.cpp:224
+#: buildtools/autotools/autodetailsview.cpp:225
+msgid "Execute Target..."
 msgstr ""
 
-#: kdevdesigner/designer/mainwindow.cpp:390
-#, fuzzy
-msgid "Output Window"
-msgstr "Ffenestr"
-
-#: kdevdesigner/designer/mainwindow.cpp:404
-#, fuzzy
-msgid "Object Explorer"
-msgstr "Agor Ffeil"
-
-#: kdevdesigner/designer/mainwindow.cpp:407
+#: buildtools/autotools/autodetailsview.cpp:228
 msgid ""
-"<b>The Object Explorer</b>"
-"<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 ""
-
-#: kdevdesigner/designer/mainwindow.cpp:424
-msgid "Start typing the buffer you want to switch to here (ALT+B)"
+"<b>Execute target</b>"
+"<p>Executes the target and tries to build in case it is not built."
 msgstr ""
 
-#: kdevdesigner/designer/mainwindow.cpp:433
-#, fuzzy
-msgid "Project Overview"
-msgstr "&Ffeil y cywaith:"
-
-#: kdevdesigner/designer/mainwindow.cpp:434
-msgid ""
-"<b>The Project Overview Window</b>"
-"<p>The Project Overview Window displays all the current project, including "
-"forms and source files.</p>"
-"<p>Use the search field to rapidly switch between files.</p>"
+#: buildtools/autotools/autodetailsview.cpp:233
+msgid "Make Target Active"
 msgstr ""
 
-#: kdevdesigner/designer/mainwindow.cpp:451
-#, fuzzy
-msgid "Action Editor"
-msgstr "Gweithred"
-
-#: kdevdesigner/designer/mainwindow.cpp:452
+#: buildtools/autotools/autodetailsview.cpp:236
 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 besides their names in "
-"menus.</p>"
+"<b>Make target active</b>"
+"<p>Marks the currently selected target as 'active'. New files and classes by "
+"default go to an active target. Using the <b>Build Active Target</b> "
+"menu command builds it."
 msgstr ""
 
-#: kdevdesigner/designer/mainwindow.cpp:472
-msgid "Toolbox"
-msgstr "Blwch offer"
-
-#: kdevdesigner/designer/mainwindow.cpp:1281
+#: buildtools/autotools/autodetailsview.cpp:247
 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 in 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 ""
-
-#: kdevdesigner/designer/mainwindow.cpp:1336
-msgid "Cannot create an invalid project."
-msgstr ""
-
-#: kdevdesigner/designer/mainwindow.cpp:1487
-#, c-format
-msgid "&Undo: %1"
-msgstr "&Dadwneud: %1"
-
-#: kdevdesigner/designer/mainwindow.cpp:1491
-#, c-format
-msgid "&Redo: %1"
-msgstr "&Ail-wneud: %1"
-
-#: kdevdesigner/designer/mainwindow.cpp:1580
-msgid "Choose Pixmap..."
-msgstr ""
-
-#: kdevdesigner/designer/mainwindow.cpp:1584
-#, fuzzy
-msgid "Edit Text..."
-msgstr "Golygu..."
-
-#: kdevdesigner/designer/mainwindow.cpp:1588
-#, fuzzy
-msgid "Edit Title..."
-msgstr "Golygu..."
-
-#: kdevdesigner/designer/mainwindow.cpp:1592
-#: kdevdesigner/designer/mainwindow.cpp:1702
-msgid "Edit Page Title..."
-msgstr ""
-
-#: kdevdesigner/designer/mainwindow.cpp:1623
-#: kdevdesigner/designer/mainwindow.cpp:1637
-#: kdevdesigner/designer/mainwindow.cpp:1646
-#: kdevdesigner/designer/mainwindow.cpp:1661
-#: kdevdesigner/designer/mainwindow.cpp:1695
-#: kdevdesigner/designer/mainwindow.cpp:2469
-msgid "Delete Page"
-msgstr "Dileu Tudalen"
-
-#: kdevdesigner/designer/mainwindow.cpp:1626
-#: kdevdesigner/designer/mainwindow.cpp:1640
-#: kdevdesigner/designer/mainwindow.cpp:1649
-#: kdevdesigner/designer/mainwindow.cpp:1664
-#: kdevdesigner/designer/mainwindow.cpp:1699
-#: kdevdesigner/designer/mainwindow.cpp:2468
-#, fuzzy
-msgid "Add Page"
-msgstr "Ail Dudalen"
-
-#: kdevdesigner/designer/mainwindow.cpp:1632
-msgid "Previous Page"
-msgstr "Tudalen Flaenorol"
-
-#: kdevdesigner/designer/mainwindow.cpp:1634
-msgid "Next Page"
-msgstr "Tudalen Nesaf"
-
-#: kdevdesigner/designer/mainwindow.cpp:1667
-msgid "Rename Current Page..."
-msgstr ""
-
-#: kdevdesigner/designer/mainwindow.cpp:1705
-#, fuzzy
-msgid "Edit Pages..."
-msgstr "Golygu..."
-
-#: kdevdesigner/designer/mainwindow.cpp:1711
-#, fuzzy
-msgid "Add Menu Item"
-msgstr "Ychwanegu Eitem ..."
-
-#: kdevdesigner/designer/mainwindow.cpp:1713
-#, fuzzy
-msgid "Add Toolbar"
-msgstr "Bar offer"
-
-#: kdevdesigner/designer/mainwindow.cpp:1735
-#: kdevdesigner/designer/mainwindow.cpp:2638
-msgid "New text"
-msgstr "Testun Newydd"
-
-#: kdevdesigner/designer/mainwindow.cpp:1740
-#: kdevdesigner/designer/mainwindow.cpp:2643
-msgid "Set 'wordwrap' of '%1'"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindow.cpp:1749
-#: kdevdesigner/designer/mainwindow.cpp:2652
-msgid "Set the 'text' of '%1'"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindow.cpp:1759
-#: kdevdesigner/designer/mainwindow.cpp:2665
-msgid "New title"
-msgstr "Teitl newydd"
-
-#: kdevdesigner/designer/mainwindow.cpp:1762
-#: kdevdesigner/designer/mainwindow.cpp:2667
-msgid "Set the 'title' of '%2'"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindow.cpp:1772
-#: kdevdesigner/designer/mainwindow.cpp:1909
-#: kdevdesigner/designer/mainwindow.cpp:1968
-#, fuzzy
-msgid "Page Title"
-msgstr "Teitl"
-
-#: kdevdesigner/designer/mainwindow.cpp:1772
-#: kdevdesigner/designer/mainwindow.cpp:1909
-#: kdevdesigner/designer/mainwindow.cpp:1968
-msgid "New page title"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindow.cpp:1775
-msgid "Set the 'pageTitle' of '%2'"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindow.cpp:1788
-msgid "Set the 'pixmap' of '%2'"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindow.cpp:1859
-msgid "Raise next page of '%2'"
+"<b>Remove</b>"
+"<p>Shows a list of targets dependent on the selected target or file and asks "
+"for removal. Also asks if the target or file should be removed from disk."
 msgstr ""
 
-#: kdevdesigner/designer/mainwindow.cpp:1869
-msgid "Raise previous page of '%2'"
+#: buildtools/autotools/autodetailsview.cpp:319
+msgid "Add New File to '%1'"
 msgstr ""
 
-#: kdevdesigner/designer/mainwindow.cpp:1916
-msgid "Rename Page %1 to %2"
+#: buildtools/autotools/autodetailsview.cpp:341
+msgid "Add Existing Files to '%1'"
 msgstr ""
 
-#: kdevdesigner/designer/mainwindow.cpp:1983
-msgid "Add Toolbar to '%1'"
+#: buildtools/autotools/autodetailsview.cpp:423
+msgid "Remove File From '%1'"
 msgstr ""
 
-#: kdevdesigner/designer/mainwindow.cpp:1989
-msgid "Add Menu to '%1'"
+#: buildtools/autotools/autodetailsview.cpp:450
+msgid "Remove Target From '%1'"
 msgstr ""
 
-#: kdevdesigner/designer/mainwindow.cpp:2613
-msgid "Edit %1..."
-msgstr "Golygu %1 ..."
-
-#: kdevdesigner/designer/mainwindow.cpp:2709
-msgid "Insert a %1 (custom widget)"
-msgstr ""
+#: buildtools/autotools/autodetailsview.cpp:502
+#, c-format
+msgid "Target: %1"
+msgstr "Targed: %1"
 
-#: kdevdesigner/designer/mainwindow.cpp:2710
-msgid ""
-"<b>%1 (custom widget)</b>"
-"<p>Click <b>Edit Custom Widgets...</b> in the <b>Tools|Custom</b> "
-"menu to add and change custom widgets. You can add properties as well as "
-"signals and slots to integrate them into Qt Designer, and provide a pixmap "
-"which will be used to represent the widget on the form.</p>"
+#: buildtools/autotools/configureoptionswidget.cpp:239
+msgid "Re-run configure for %1 now?"
 msgstr ""
 
-#: kdevdesigner/designer/mainwindow.cpp:2844
+#: buildtools/autotools/configureoptionswidget.cpp:239
 #, fuzzy
-msgid "Restoring Last Session"
-msgstr "Adfer lleolia&dau:"
+msgid "Rerun"
+msgstr "Rhedeg"
 
-#: kdevdesigner/designer/mainwindow.cpp:2845
+#: buildtools/autotools/addexistingdirectoriesdlg.cpp:60
 msgid ""
-"Qt Designer found some temporary saved files, which were\n"
-"written when Qt Designer crashed last time. Do you want to\n"
-"load these files?"
-msgstr ""
-
-#: kdevdesigner/designer/mainwindow.cpp:2909
-msgid "There is no help available for this dialog at the moment."
-msgstr ""
-
-#: kdevdesigner/designer/mainwindow.cpp:3069
-msgid "Open File"
-msgstr "Agor Ffeil"
-
-#: kdevdesigner/designer/mainwindow.cpp:3070
-#: kdevdesigner/designer/mainwindow.cpp:3086
-msgid "Could not open '%1'. File does not exist."
+"Drag one or more directories with an existing Makefile.am from the left view "
+"and drop it here."
 msgstr ""
 
-#: kdevdesigner/designer/formwindow.cpp:360
-msgid "&Horizontal"
-msgstr "&Llorweddol"
-
-#: kdevdesigner/designer/formwindow.cpp:380
-#: kdevdesigner/designer/formwindow.cpp:507
+#: buildtools/autotools/removetargetdlg.cpp:48
 msgid ""
-"<b>A %1 (custom widget)</b> "
-"<p>Click <b>Edit Custom Widgets...</b> in the <b>Tools|Custom</b> "
-"menu to add and change custom widgets. You can add properties as well as "
-"signals and slots to integrate custom widgets into <i>Qt Designer</i>"
-", and provide a pixmap which will be used to represent the widget on the "
-"form.</p>"
-msgstr ""
-
-#: kdevdesigner/designer/formwindow.cpp:387
-#: kdevdesigner/designer/formwindow.cpp:514
-msgid "A %1 (custom widget)"
-msgstr ""
-
-#: kdevdesigner/designer/formwindow.cpp:458
-msgid "Reparent Widgets"
-msgstr ""
-
-#: kdevdesigner/designer/formwindow.cpp:466
-#: kdevdesigner/designer/formwindow.cpp:472
-#: kdevdesigner/designer/formwindow.cpp:482
-#, c-format
-msgid "Insert %1"
-msgstr "Mewnosod %1"
-
-#: kdevdesigner/designer/formwindow.cpp:663
-msgid "Set buddy for '%1' to..."
-msgstr ""
-
-#: kdevdesigner/designer/formwindow.cpp:665
-msgid "Connect '%1' with..."
-msgstr ""
-
-#: kdevdesigner/designer/formwindow.cpp:687
-#: kdevdesigner/designer/formwindow.cpp:733
-msgid "Change Tab Order"
-msgstr ""
-
-#: kdevdesigner/designer/formwindow.cpp:874
-msgid "Connect '%1' to '%2'"
-msgstr ""
-
-#: kdevdesigner/designer/formwindow.cpp:902
-msgid "Set buddy '%1' to '%2'"
-msgstr ""
-
-#: kdevdesigner/designer/formwindow.cpp:905
-msgid "Set buddy '%1' to ..."
+"Do you really want to remove <b>%1</b>"
+"<br>with <b>all files</b> that are attached to it"
+"<br>and <b>all dependencies</b>?"
 msgstr ""
 
-#: kdevdesigner/designer/formwindow.cpp:963
-#: kdevdesigner/designer/formwindow.cpp:1068
-#, fuzzy
-msgid "Inserting Widget"
-msgstr "Creu mynegai..."
-
-#: kdevdesigner/designer/formwindow.cpp:964
-#: kdevdesigner/designer/formwindow.cpp:1069
+#: buildtools/autotools/removetargetdlg.cpp:111
 msgid ""
-"You tried to insert a widget into the layout Container Widget '%1'.\n"
-"This is not possible. In order to insert the widget, the layout of '%1'\n"
-"must first be broken.\n"
-"Break the layout or cancel the operation?"
-msgstr ""
+"_: no dependency\n"
+"<none>"
+msgstr "<dim>"
 
-#: kdevdesigner/designer/formwindow.cpp:1047
+#: buildtools/autotools/removetargetdlg.cpp:117
 #, c-format
-msgid "Set Buddy for %1"
-msgstr ""
-
-#: kdevdesigner/designer/formwindow.cpp:1313
-#: kdevdesigner/designer/formwindow.cpp:1351
-#, fuzzy
-msgid "Use Size Hint"
-msgstr "Maint Llorweddol"
-
-#: kdevdesigner/designer/formwindow.cpp:1743
-msgid "Click widgets to change the tab order..."
-msgstr ""
-
-#: kdevdesigner/designer/formwindow.cpp:1754
-msgid "Drag a line to create a connection..."
-msgstr ""
-
-#: kdevdesigner/designer/formwindow.cpp:1756
-msgid "Drag a line to set a buddy..."
-msgstr ""
-
-#: kdevdesigner/designer/formwindow.cpp:1762
-msgid "Click on the form to insert a %1..."
+msgid "Removing Target... %p%"
 msgstr ""
 
-#: kdevdesigner/designer/formwindow.cpp:1834
-msgid ""
-"The following custom widgets are used in '%1',\n"
-"but are not known to Qt Designer:\n"
+#: buildtools/autotools/addapplicationdlg.cpp:127
+msgid "You have to enter the file name of an executable program."
 msgstr ""
 
-#: kdevdesigner/designer/formwindow.cpp:1838
-msgid ""
-"If you save this form and generate code for it using uic, \n"
-"the generated code will not compile.\n"
-"Do you want to save this form now?"
+#: buildtools/autotools/addapplicationdlg.cpp:134
+msgid "You have to enter an application name."
 msgstr ""
 
-#: kdevdesigner/designer/formwindow.cpp:1877
-msgid "Lower"
-msgstr "Gostwng"
-
-#: kdevdesigner/designer/formwindow.cpp:1937
+#: buildtools/autotools/managecustomcommand.cpp:46
 msgid ""
-"_n: Accelerator '%1' is used once.\n"
-"Accelerator '%1' is used %n times."
-msgstr ""
-
-#: kdevdesigner/designer/formwindow.cpp:1939
-msgid "&Select"
-msgstr "&Detholi"
-
-#: kdevdesigner/designer/formwindow.cpp:1954
-msgid "No accelerator is used more than once."
+"_: this is a list of items in the combobox\n"
+"Make target,Make target (as root),Make command,Make command (as "
+"root),Command,Command (as root)"
 msgstr ""
 
-#: kdevdesigner/designer/formwindow.cpp:1964
-msgid "Raise"
-msgstr "Codi"
-
-#: kdevdesigner/designer/formwindow.cpp:2022
-#, fuzzy
-msgid "Lay Out Horizontally (in splitter)"
-msgstr "Ehangu'n &Llorweddol"
-
-#: kdevdesigner/designer/formwindow.cpp:2032
-#, fuzzy
-msgid "Lay Out Vertically (in splitter)"
-msgstr "Ehangu'n &Fertigol"
-
-#: kdevdesigner/designer/formwindow.cpp:2066
-#, fuzzy
-msgid "Lay Out Children Horizontally"
-msgstr "Ehangu'n &Llorweddol"
-
-#: kdevdesigner/designer/formwindow.cpp:2087
-#, fuzzy
-msgid "Lay Out Children Vertically"
-msgstr "Teilio'n Fe&rtigol"
-
-#: kdevdesigner/designer/formwindow.cpp:2111
-#, fuzzy
-msgid "Lay Out Children in a Grid"
-msgstr "Teilio'n Fe&rtigol"
-
-#: kdevdesigner/designer/formwindow.cpp:2223
-#, fuzzy
-msgid "Edit connections..."
-msgstr "C&ysylltiadau :"
-
-#: kdevdesigner/designer/projectsettingsimpl.cpp:96
+#: buildtools/ada/adaproject_part.cpp:341
 msgid ""
-"*.db|Database Files\n"
-"*|All Files"
+"Could not find ada compiler.\n"
+"Check if your compiler settings are correct."
 msgstr ""
 
-#: kdevdesigner/designer/projectsettingsimpl.cpp:104
+#: buildtools/ada/adaproject_part.cpp:422
 msgid ""
-"*.pro|Project Files\n"
-"*|All Files"
+"There was an error loading the module %1.\n"
+"The diagnostics are:\n"
+"%2"
 msgstr ""
 
 #: languages/cpp/configproblemreporter.ui.h:95
@@ -28473,7 +28550,7 @@ msgstr ""
 msgid "delay: %1 msec"
 msgstr ""
 
-#: languages/cpp/app_templates/kateplugin2/plugin_app.h:50
+#: languages/cpp/app_templates/kateplugin2/plugin_app.h:52
 msgid "Configure KatePlugin%{APPNAME}"
 msgstr ""
 
@@ -28481,13 +28558,13 @@ msgstr ""
 msgid "%{APPNAME} KOffice Program"
 msgstr ""
 
-#: languages/cpp/debugger/breakpoint.h:132
+#: languages/cpp/debugger/breakpoint.h:133
 #: languages/ruby/debugger/breakpoint.h:89
 #, fuzzy
 msgid "Invalid"
 msgstr "URL annilys."
 
-#: languages/cpp/debugger/breakpoint.h:308
+#: languages/cpp/debugger/breakpoint.h:309
 msgid "Read Watchpoint"
 msgstr ""
 
@@ -28500,11 +28577,6 @@ msgstr "Cysylltiadau"
 msgid "Unable to connect to database server"
 msgstr ""
 
-#: vcs/perforce/perforcepart.h:32
-#, fuzzy
-msgid "Perforce is a version control system"
-msgstr "Dim"
-
 #: parts/snippet/snippetdlg.ui.h:20
 msgid ""
 "To use variables in a snippet, you just have to enclose the variablename with "
@@ -28512,10 +28584,10 @@ msgid ""
 "this variable. \n"
 "Example snippet: This is a $VAR$\n"
 "When you use this snippet you will be prompted for a value for the variable "
-"$VAR$. Any occourences of $VAR$ will then be replaced with whatever you've "
+"$VAR$. Any occurrences of $VAR$ will then be replaced with whatever you have "
 "entered.\n"
 "If you need a single $-character in a snippet, which is not used to enclose a "
-"variable, type $$(two dollar characters) instead. They will automatically be "
+"variable, type $$ (two dollar characters) instead. They will automatically be "
 "replaced with a single $-character when you use the snippet.\n"
 "If you want to change the default delimiter to anything different, please use "
 "the settings dialog to do so."
@@ -28535,6 +28607,10 @@ msgstr "Dosbarthiadau"
 msgid "(Functions)"
 msgstr "Ffwythiannau"
 
+#: kdevdesigner/designer/pixmapcollectioneditor.ui.h:115
+msgid "Choose Image"
+msgstr ""
+
 #: kdevdesigner/designer/connectiondialog.ui.h:209
 #, fuzzy
 msgid "Add Signal/Slot Connection"
@@ -28560,9 +28636,10 @@ msgstr "Gwaredu Cysylltiad"
 msgid "Edit Signal/Slot Connections"
 msgstr "C&ysylltiadau :"
 
-#: kdevdesigner/designer/pixmapcollectioneditor.ui.h:115
-msgid "Choose Image"
-msgstr ""
+#: vcs/perforce/perforcepart.h:33
+#, fuzzy
+msgid "Perforce is a version control system"
+msgstr "Dim"
 
 #~ msgid "Alt+C"
 #~ msgstr "Alt+C"
@@ -28901,9 +28978,6 @@ msgstr ""
 #~ msgid "Folder: %1"
 #~ msgstr "Plygell: %1"
 
-#~ msgid "Project manager"
-#~ msgstr "Rheolydd Prosiect"
-
 #, fuzzy
 #~ msgid "Alt+T"
 #~ msgstr "Alt+1"
diff --git a/tde-i18n-cy/messages/tdewebdev/kimagemapeditor.po b/tde-i18n-cy/messages/tdewebdev/kimagemapeditor.po
index 19a397b9e11..cff4613a2b0 100644
--- a/tde-i18n-cy/messages/tdewebdev/kimagemapeditor.po
+++ b/tde-i18n-cy/messages/tdewebdev/kimagemapeditor.po
@@ -1,34 +1,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdewebdev/kimagemapeditor.po\n"
-"POT-Creation-Date: 2007-12-30 01:24+0100\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kimearea.h:180 kimedialogs.cpp:432
-msgid "Rectangle"
-msgstr "Hirsgwâr"
-
-#: kimearea.h:203 kimedialogs.cpp:433
-msgid "Circle"
-msgstr "Cylch"
-
-#: kimearea.h:229 kimedialogs.cpp:434
-msgid "Polygon"
-msgstr "Amlochryn"
-
-#: kimagemapeditor.cpp:106 kimagemapeditor.cpp:135 mapslistview.cpp:29
-msgid "Maps"
-msgstr ""
-
-#: kimagemapeditor.cpp:245 mapslistview.cpp:158
-msgid "unnamed"
-msgstr "di-enw"
-
 #: _translatorinfo.cpp:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
@@ -41,62 +22,6 @@ msgid ""
 "Your emails"
 msgstr "kyfieithu@dotmon.com"
 
-#: kimagemapeditor.cpp:259 main.cpp:28
-msgid "An HTML imagemap editor"
-msgstr ""
-
-#: main.cpp:34
-msgid "Write HTML-Code to stdout on exit"
-msgstr ""
-
-#: main.cpp:35
-msgid "File to open"
-msgstr "Ffeil i agor"
-
-#: kimagemapeditor.cpp:258 main.cpp:43
-msgid "KImageMapEditor"
-msgstr "KImageMapEditor"
-
-#: main.cpp:47
-msgid "For helping me with the Makefiles, and creating the Debian package"
-msgstr ""
-
-#: main.cpp:48
-msgid "For helping me fixing --enable-final mode"
-msgstr ""
-
-#: main.cpp:49
-msgid "For the Spanish translation"
-msgstr ""
-
-#: main.cpp:50
-msgid "For the Dutch translation"
-msgstr ""
-
-#: main.cpp:51
-msgid "For the French translation"
-msgstr ""
-
-#: arealistview.cpp:38 kimagemapeditor.cpp:105 kimagemapeditor.cpp:134
-msgid "Areas"
-msgstr "Ardaloedd"
-
-#: arealistview.cpp:39 kimedialogs.cpp:840
-msgid "Preview"
-msgstr "Rhagolwg"
-
-#: arealistview.cpp:47
-msgid ""
-"<h3>Area List</h3>The area list shows you all areas of the map."
-"<br>The left column shows the link associated with the area; the right column "
-"shows the part of the image that is covered by the area."
-"<br>The maximum size of the preview images can be configured."
-msgstr ""
-
-#: arealistview.cpp:51
-msgid "A list of all areas"
-msgstr ""
-
 #: kimecommands.cpp:33
 #, c-format
 msgid "Cut %1"
@@ -137,6 +62,202 @@ msgstr ""
 msgid "Create %1"
 msgstr "Creu %1"
 
+#: kimagemapeditor.cpp:106 kimagemapeditor.cpp:135 mapslistview.cpp:29
+msgid "Maps"
+msgstr ""
+
+#: kimagemapeditor.cpp:245 mapslistview.cpp:158
+msgid "unnamed"
+msgstr "di-enw"
+
+#: kimedialogs.cpp:81
+msgid "Top &X:"
+msgstr ""
+
+#: kimedialogs.cpp:92
+msgid "Top &Y:"
+msgstr ""
+
+#: kimedialogs.cpp:103
+msgid "&Width:"
+msgstr "&Lled:"
+
+#: kimedialogs.cpp:114
+msgid "Hei&ght:"
+msgstr "Tal&dra:"
+
+#: kimedialogs.cpp:142
+msgid "Center &X:"
+msgstr ""
+
+#: kimedialogs.cpp:154
+msgid "Center &Y:"
+msgstr ""
+
+#: kimedialogs.cpp:166
+msgid "&Radius:"
+msgstr "&Radiws:"
+
+#: kimedialogs.cpp:289
+msgid "Top &X"
+msgstr ""
+
+#: kimedialogs.cpp:300
+msgid "Top &Y"
+msgstr ""
+
+#: kimedialogs.cpp:336
+msgid "&HREF:"
+msgstr ""
+
+#: kimedialogs.cpp:340
+msgid "Alt. &Text:"
+msgstr ""
+
+#: kimedialogs.cpp:341
+msgid "Tar&get:"
+msgstr "Tar&ged:"
+
+#: kimedialogs.cpp:342
+msgid "Tit&le:"
+msgstr "Tei&tl:"
+
+#: kimedialogs.cpp:346
+msgid "Enable default map"
+msgstr ""
+
+#: kimedialogs.cpp:376
+msgid "OnClick:"
+msgstr ""
+
+#: kimedialogs.cpp:377
+msgid "OnDblClick:"
+msgstr ""
+
+#: kimedialogs.cpp:378
+msgid "OnMouseDown:"
+msgstr ""
+
+#: kimedialogs.cpp:379
+msgid "OnMouseUp:"
+msgstr ""
+
+#: kimedialogs.cpp:380
+msgid "OnMouseOver:"
+msgstr ""
+
+#: kimedialogs.cpp:381
+msgid "OnMouseMove:"
+msgstr ""
+
+#: kimedialogs.cpp:382
+msgid "OnMouseOut:"
+msgstr ""
+
+#: kimedialogs.cpp:423
+msgid "Area Tag Editor"
+msgstr ""
+
+#: kimearea.h:180 kimedialogs.cpp:432
+msgid "Rectangle"
+msgstr "Hirsgwâr"
+
+#: kimearea.h:203 kimedialogs.cpp:433
+msgid "Circle"
+msgstr "Cylch"
+
+#: kimearea.h:229 kimedialogs.cpp:434
+msgid "Polygon"
+msgstr "Amlochryn"
+
+#: kimedialogs.cpp:435
+msgid "Selection"
+msgstr "Dewisiad"
+
+#: kimedialogs.cpp:459
+msgid "&General"
+msgstr "&Cyffredinol"
+
+#: kimedialogs.cpp:466
+msgid "Coor&dinates"
+msgstr ""
+
+#: kimedialogs.cpp:468
+msgid "&JavaScript"
+msgstr "&JavaScript"
+
+#: kimagemapeditor.cpp:1614 kimedialogs.cpp:509 kimeshell.cpp:162
+msgid "All Files"
+msgstr "Pob Ffeil"
+
+#: kimedialogs.cpp:509
+msgid "Choose File"
+msgstr "Dewis ffeil"
+
+#: kimedialogs.cpp:574
+msgid "Choose Map & Image to Edit"
+msgstr ""
+
+#: kimedialogs.cpp:585
+msgid "Select an image and/or a map that you want to edit"
+msgstr ""
+
+#: kimedialogs.cpp:596
+msgid "&Maps"
+msgstr ""
+
+#: kimedialogs.cpp:608
+msgid "Image Preview"
+msgstr ""
+
+#: kimedialogs.cpp:631
+msgid "No maps found"
+msgstr ""
+
+#: kimedialogs.cpp:656
+msgid "No images found"
+msgstr ""
+
+#: kimedialogs.cpp:669
+msgid "&Images"
+msgstr "&Delweddau"
+
+#: kimedialogs.cpp:678
+msgid "Path"
+msgstr "Llwybr"
+
+#: kimedialogs.cpp:753
+msgid "Preferences"
+msgstr "Hoffterau"
+
+#: kimedialogs.cpp:762
+msgid "&Maximum image preview height:"
+msgstr ""
+
+#: kimedialogs.cpp:775
+msgid "&Undo limit:"
+msgstr ""
+
+#: kimedialogs.cpp:785
+msgid "&Redo limit:"
+msgstr ""
+
+#: kimedialogs.cpp:794
+msgid "&Start with last used document"
+msgstr ""
+
+#: arealistview.cpp:39 kimedialogs.cpp:840
+msgid "Preview"
+msgstr "Rhagolwg"
+
+#: kimearea.cpp:49
+msgid "noname"
+msgstr "dimEnw"
+
+#: kimearea.cpp:1451
+msgid "Number of Areas"
+msgstr ""
+
 #: imageslistview.cpp:57 kimagemapeditor.cpp:107 kimagemapeditor.cpp:136
 #: kimeshell.cpp:160
 msgid "Images"
@@ -146,36 +267,40 @@ msgstr "Delweddau"
 msgid "Usemap"
 msgstr ""
 
-#: kimearea.cpp:49
-msgid "noname"
-msgstr "dimEnw"
+#: kimeshell.cpp:159
+msgid "Web Files"
+msgstr ""
 
-#: kimearea.cpp:1451
-msgid "Number of Areas"
+#: kimeshell.cpp:161
+msgid "HTML Files"
+msgstr "Ffeiliau HTML"
+
+#: kimeshell.cpp:162
+msgid "PNG Images"
 msgstr ""
 
-#. i18n: file kimagemapeditorpartui.rc line 50
-#: rc.cpp:12
-#, no-c-format
-msgid "&Map"
+#: kimeshell.cpp:162
+msgid "JPEG Images"
 msgstr ""
 
-#. i18n: file kimagemapeditorpartui.rc line 61
-#: kimagemapeditor.cpp:549 rc.cpp:15
-#, no-c-format
-msgid "&Image"
-msgstr "&Delwedd"
+#: kimeshell.cpp:162
+msgid "GIF Images"
+msgstr ""
 
-#. i18n: file kimagemapeditorpartui.rc line 77
-#: rc.cpp:21 rc.cpp:30
-#, no-c-format
-msgid "KImageMapEditor Main Toolbar"
+#: kimeshell.cpp:163
+msgid "Choose Picture to Open"
 msgstr ""
 
-#. i18n: file kimagemapeditorpartui.rc line 96
-#: rc.cpp:24
-#, no-c-format
-msgid "KImageMapEditor Draw Toolbar"
+#: arealistview.cpp:38 kimagemapeditor.cpp:105 kimagemapeditor.cpp:134
+msgid "Areas"
+msgstr "Ardaloedd"
+
+#: kimagemapeditor.cpp:258 main.cpp:43
+msgid "KImageMapEditor"
+msgstr "KImageMapEditor"
+
+#: kimagemapeditor.cpp:259 main.cpp:28
+msgid "An HTML imagemap editor"
 msgstr ""
 
 #: kimagemapeditor.cpp:436
@@ -327,6 +452,12 @@ msgstr "&Rhagolwg"
 msgid "Show a preview"
 msgstr ""
 
+#. i18n: file kimagemapeditorpartui.rc line 61
+#: kimagemapeditor.cpp:549 rc.cpp:15
+#, no-c-format
+msgid "&Image"
+msgstr "&Delwedd"
+
 #: kimagemapeditor.cpp:551
 msgid "Add Image..."
 msgstr "Ychwanegu Delwedd ..."
@@ -550,10 +681,6 @@ msgstr ""
 msgid "Text File"
 msgstr ""
 
-#: kimagemapeditor.cpp:1614 kimedialogs.cpp:509 kimeshell.cpp:162
-msgid "All Files"
-msgstr "Pob Ffeil"
-
 #: kimagemapeditor.cpp:1625
 msgid ""
 "<qt>The file <em>%1</em> already exists."
@@ -610,186 +737,60 @@ msgstr ""
 msgid "Enter the usemap value:"
 msgstr ""
 
-#: kimeshell.cpp:159
-msgid "Web Files"
-msgstr ""
-
-#: kimeshell.cpp:161
-msgid "HTML Files"
-msgstr "Ffeiliau HTML"
-
-#: kimeshell.cpp:162
-msgid "PNG Images"
-msgstr ""
-
-#: kimeshell.cpp:162
-msgid "JPEG Images"
-msgstr ""
-
-#: kimeshell.cpp:162
-msgid "GIF Images"
-msgstr ""
-
-#: kimeshell.cpp:163
-msgid "Choose Picture to Open"
-msgstr ""
-
-#: kimedialogs.cpp:81
-msgid "Top &X:"
-msgstr ""
-
-#: kimedialogs.cpp:92
-msgid "Top &Y:"
-msgstr ""
-
-#: kimedialogs.cpp:103
-msgid "&Width:"
-msgstr "&Lled:"
-
-#: kimedialogs.cpp:114
-msgid "Hei&ght:"
-msgstr "Tal&dra:"
-
-#: kimedialogs.cpp:142
-msgid "Center &X:"
-msgstr ""
-
-#: kimedialogs.cpp:154
-msgid "Center &Y:"
-msgstr ""
-
-#: kimedialogs.cpp:166
-msgid "&Radius:"
-msgstr "&Radiws:"
-
-#: kimedialogs.cpp:289
-msgid "Top &X"
-msgstr ""
-
-#: kimedialogs.cpp:300
-msgid "Top &Y"
-msgstr ""
-
-#: kimedialogs.cpp:336
-msgid "&HREF:"
-msgstr ""
-
-#: kimedialogs.cpp:340
-msgid "Alt. &Text:"
-msgstr ""
-
-#: kimedialogs.cpp:341
-msgid "Tar&get:"
-msgstr "Tar&ged:"
-
-#: kimedialogs.cpp:342
-msgid "Tit&le:"
-msgstr "Tei&tl:"
-
-#: kimedialogs.cpp:346
-msgid "Enable default map"
-msgstr ""
-
-#: kimedialogs.cpp:376
-msgid "OnClick:"
-msgstr ""
-
-#: kimedialogs.cpp:377
-msgid "OnDblClick:"
-msgstr ""
-
-#: kimedialogs.cpp:378
-msgid "OnMouseDown:"
-msgstr ""
-
-#: kimedialogs.cpp:379
-msgid "OnMouseUp:"
-msgstr ""
-
-#: kimedialogs.cpp:380
-msgid "OnMouseOver:"
-msgstr ""
-
-#: kimedialogs.cpp:381
-msgid "OnMouseMove:"
-msgstr ""
-
-#: kimedialogs.cpp:382
-msgid "OnMouseOut:"
-msgstr ""
-
-#: kimedialogs.cpp:423
-msgid "Area Tag Editor"
+#. i18n: file kimagemapeditorpartui.rc line 50
+#: rc.cpp:12
+#, no-c-format
+msgid "&Map"
 msgstr ""
 
-#: kimedialogs.cpp:435
-msgid "Selection"
-msgstr "Dewisiad"
-
-#: kimedialogs.cpp:459
-msgid "&General"
-msgstr "&Cyffredinol"
-
-#: kimedialogs.cpp:466
-msgid "Coor&dinates"
+#. i18n: file kimagemapeditorpartui.rc line 77
+#: rc.cpp:21 rc.cpp:30
+#, no-c-format
+msgid "KImageMapEditor Main Toolbar"
 msgstr ""
 
-#: kimedialogs.cpp:468
-msgid "&JavaScript"
-msgstr "&JavaScript"
-
-#: kimedialogs.cpp:509
-msgid "Choose File"
-msgstr "Dewis ffeil"
-
-#: kimedialogs.cpp:574
-msgid "Choose Map & Image to Edit"
+#. i18n: file kimagemapeditorpartui.rc line 96
+#: rc.cpp:24
+#, no-c-format
+msgid "KImageMapEditor Draw Toolbar"
 msgstr ""
 
-#: kimedialogs.cpp:585
-msgid "Select an image and/or a map that you want to edit"
+#: arealistview.cpp:47
+msgid ""
+"<h3>Area List</h3>The area list shows you all areas of the map."
+"<br>The left column shows the link associated with the area; the right column "
+"shows the part of the image that is covered by the area."
+"<br>The maximum size of the preview images can be configured."
 msgstr ""
 
-#: kimedialogs.cpp:596
-msgid "&Maps"
+#: arealistview.cpp:51
+msgid "A list of all areas"
 msgstr ""
 
-#: kimedialogs.cpp:608
-msgid "Image Preview"
+#: main.cpp:34
+msgid "Write HTML-Code to stdout on exit"
 msgstr ""
 
-#: kimedialogs.cpp:631
-msgid "No maps found"
-msgstr ""
+#: main.cpp:35
+msgid "File to open"
+msgstr "Ffeil i agor"
 
-#: kimedialogs.cpp:656
-msgid "No images found"
+#: main.cpp:47
+msgid "For helping me with the Makefiles, and creating the Debian package"
 msgstr ""
 
-#: kimedialogs.cpp:669
-msgid "&Images"
-msgstr "&Delweddau"
-
-#: kimedialogs.cpp:678
-msgid "Path"
-msgstr "Llwybr"
-
-#: kimedialogs.cpp:753
-msgid "Preferences"
-msgstr "Hoffterau"
-
-#: kimedialogs.cpp:762
-msgid "&Maximum image preview height:"
+#: main.cpp:48
+msgid "For helping me fixing --enable-final mode"
 msgstr ""
 
-#: kimedialogs.cpp:775
-msgid "&Undo limit:"
+#: main.cpp:49
+msgid "For the Spanish translation"
 msgstr ""
 
-#: kimedialogs.cpp:785
-msgid "&Redo limit:"
+#: main.cpp:50
+msgid "For the Dutch translation"
 msgstr ""
 
-#: kimedialogs.cpp:794
-msgid "&Start with last used document"
+#: main.cpp:51
+msgid "For the French translation"
 msgstr ""
diff --git a/tde-i18n-cy/messages/tdewebdev/klinkstatus.po b/tde-i18n-cy/messages/tdewebdev/klinkstatus.po
index cfdba5d1198..3469dd24d24 100644
--- a/tde-i18n-cy/messages/tdewebdev/klinkstatus.po
+++ b/tde-i18n-cy/messages/tdewebdev/klinkstatus.po
@@ -1,201 +1,43 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdewebdev/klinkstatus.po\n"
-"POT-Creation-Date: 2008-08-14 01:19+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: engine/searchmanager.cpp:505 ui/resultview.cpp:137
-msgid "Javascript not supported"
-msgstr ""
-
-#: ui/tablelinkstatus.cpp:91
-msgid "Status"
-msgstr "Cyflwr"
-
-#: ui/tablelinkstatus.cpp:96
-msgid "Label"
-msgstr "Label"
-
-#: ui/tablelinkstatus.cpp:100
-msgid "URL"
-msgstr "URL"
-
-#: ui/tablelinkstatus.cpp:277 ui/treeview.cpp:348
-msgid "All"
-msgstr "Popeth"
-
-#: ui/tablelinkstatus.cpp:286 ui/tablelinkstatus.cpp:291 ui/treeview.cpp:357
-#: ui/treeview.cpp:363
-msgid "Edit Referrer with Quanta"
-msgstr ""
-
-#: ui/tablelinkstatus.cpp:295 ui/treeview.cpp:367
-msgid "Open URL"
-msgstr "URL Agored"
-
-#: ui/tablelinkstatus.cpp:298 ui/treeview.cpp:370
-msgid "Open Referrer URL"
-msgstr ""
-
-#: ui/tablelinkstatus.cpp:303 ui/treeview.cpp:375
-msgid "Copy URL"
-msgstr ""
-
-#: ui/tablelinkstatus.cpp:306 ui/treeview.cpp:378
-msgid "Copy Referrer URL"
-msgstr ""
-
-#: ui/tablelinkstatus.cpp:309 ui/treeview.cpp:381
-msgid "Copy Cell Text"
-msgstr ""
-
-#: ui/tablelinkstatus.cpp:389 ui/treeview.cpp:295
-msgid "<qt>File <b>%1</b> cannot be opened. Might be a DCOP problem.</qt>"
-msgstr ""
-
-#: ui/tablelinkstatus.cpp:410 ui/tablelinkstatus.cpp:431 ui/treeview.cpp:316
-#: ui/treeview.cpp:337
-msgid "Invalid URL."
-msgstr "URL annilys."
-
-#: ui/tablelinkstatus.cpp:419 ui/treeview.cpp:325
-msgid "ROOT URL."
-msgstr ""
-
-#: engine/linkchecker.cpp:128 ui/tablelinkstatus.cpp:590
-#: ui/tablelinkstatus.cpp:655
-msgid "Timeout"
-msgstr "Goramser"
-
-#: ui/tablelinkstatus.cpp:592
-msgid "not supported"
-msgstr ""
-
-#: engine/linkstatus.cpp:138 engine/linkstatus.cpp:163
-#: engine/linkstatus.cpp:169 ui/tablelinkstatus.cpp:659
-msgid "Malformed"
-msgstr ""
-
-#: ui/tablelinkstatus.cpp:682 ui/tablelinkstatus.cpp:685
-#, c-format
-msgid "%1"
-msgstr "%1"
-
-#: ui/documentrootdialog.cpp:40
-msgid ""
-"As you are using a protocol different 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:"
+#: klinkstatus_part.cpp:51
+msgid "A Link Checker"
 msgstr ""
 
-#: ui/sessionwidget.cpp:241 ui/sessionwidget.cpp:364 ui/sessionwidget.cpp:387
-#: ui/sessionwidget.cpp:545 ui/sessionwidget.cpp:629
-msgid "Checking..."
-msgstr "Gwirio..."
-
-#: ui/sessionwidget.cpp:351
-msgid "Cowardly refusing to check an empty URL."
+#: klinkstatus_part.cpp:151
+msgid "Check"
 msgstr ""
 
-#: ui/sessionwidget.cpp:365 ui/sessionwidget.cpp:388 ui/sessionwidget.cpp:463
-msgid "Stopped"
-msgstr "Wedi aros"
+#: klinkstatus_part.cpp:152
+msgid "Results"
+msgstr "Canlyniadau"
 
-#. i18n: file ./ui/sessionwidgetbase.ui line 367
-#: rc.cpp:54 ui/sessionwidget.cpp:435
+#. i18n: file ./ui/settings/configidentificationdialogui.ui line 34
+#: klinkstatus_part.cpp:153 rc.cpp:165
 #, no-c-format
-msgid "Ready"
-msgstr "Parod"
-
-#: ui/sessionwidget.cpp:531 ui/sessionwidget.cpp:539
-msgid "Adding level..."
-msgstr ""
-
-#: ui/sessionwidget.cpp:686
-msgid "Export Results as HTML"
-msgstr ""
-
-#: ui/tabwidgetsession.cpp:61
-msgid "Open new tab"
-msgstr ""
-
-#: ui/tabwidgetsession.cpp:69
-msgid "Close the current tab"
-msgstr "Cau'r tab cyfredol"
-
-#: ui/tabwidgetsession.cpp:123
-msgid "Session"
-msgstr "Sesiwn"
-
-#: ui/resultssearchbar.cpp:72
-msgid "S&earch:"
-msgstr "C&hwilio"
-
-#: ui/resultssearchbar.cpp:83
-msgid "Status:"
-msgstr "Cyflwr:"
-
-#: ui/resultssearchbar.cpp:93
-msgid "All Links"
-msgstr ""
-
-#: ui/resultssearchbar.cpp:94
-msgid "Good Links"
-msgstr ""
-
-#: ui/resultssearchbar.cpp:95
-msgid "Broken Links"
-msgstr ""
-
-#: ui/resultssearchbar.cpp:96
-msgid "Malformed Links"
-msgstr ""
-
-#: ui/resultssearchbar.cpp:97
-msgid "Undetermined Links"
-msgstr ""
-
-#: ui/resultssearchbar.cpp:100
-msgid "Clear filter"
-msgstr "Gwagio hidlen"
-
-#: ui/resultssearchbar.cpp:101
-msgid "Enter the terms to filter the result link list"
-msgstr ""
-
-#: ui/resultssearchbar.cpp:102
-msgid "Choose what kind of link status to show in result list"
-msgstr ""
-
-#: klinkstatus.cpp:75
-msgid ""
-"Could not find the KLinkStatus part; did you configure with '--prefix=/$TDEDIR' "
-"and perform 'make install'?"
-msgstr ""
-
-#: utils/xsl.cpp:165
-msgid "Message is null."
+msgid "Identification"
 msgstr ""
 
-#: utils/xsl.cpp:170
-msgid "The selected stylesheet is invalid."
+#: klinkstatus_part.cpp:154
+msgid "Configure the way KLinkstatus reports itself"
 msgstr ""
 
-#: utils/xsl.cpp:177
-msgid "Message could not be parsed. This is likely due to an encoding problem."
-msgstr ""
+#: klinkstatus_part.cpp:180 main.cpp:48
+msgid "KLinkStatus"
+msgstr "KLinkStatus"
 
-#: utils/xsl.cpp:182
-msgid ""
-"<div><b>KLinkStatus encountered the following error while parsing a message:</b>"
-"<br />%1</div>"
+#: klinkstatus_part.cpp:187
+msgid "KLinkStatus Part"
 msgstr ""
 
 #: _translatorinfo.cpp:1
@@ -210,53 +52,6 @@ msgid ""
 "Your emails"
 msgstr "kyfieithu@dotmon.com"
 
-#: main.cpp:34
-msgid ""
-"A Link Checker.\n"
-"\n"
-"KLinkStatus belongs to the tdewebdev module from TDE."
-msgstr ""
-
-#: main.cpp:40
-msgid "Document to open"
-msgstr "Dogfen i'w hagor"
-
-#: klinkstatus_part.cpp:180 main.cpp:48
-msgid "KLinkStatus"
-msgstr "KLinkStatus"
-
-#: engine/linkstatus_impl.h:122
-msgid "ROOT"
-msgstr "GWRAIDD"
-
-#: engine/linkchecker.cpp:382
-msgid "No Content"
-msgstr "Dim Cynnwys"
-
-#: engine/linkchecker.cpp:612 engine/linkchecker.cpp:647
-msgid "Link destination not found."
-msgstr ""
-
-#: engine/linkstatus.cpp:104
-#, c-format
-msgid "Parent: %1"
-msgstr ""
-
-#: engine/linkstatus.cpp:108
-#, c-format
-msgid "URL: %1"
-msgstr "URL: %1"
-
-#: engine/linkstatus.cpp:109
-#, c-format
-msgid "Original URL: %1"
-msgstr "URL Gwreiddiol : %1"
-
-#: engine/linkstatus.cpp:111
-#, c-format
-msgid "Node: %1"
-msgstr "Nôd : %1"
-
 #: actionmanager.cpp:90
 msgid "New Link Check"
 msgstr ""
@@ -315,140 +110,263 @@ msgstr "Chwilio"
 msgid "St&op Search"
 msgstr "S&topio Chwiliad"
 
+#: engine/linkstatus.cpp:104
+#, c-format
+msgid "Parent: %1"
+msgstr ""
+
+#: engine/linkstatus.cpp:108
+#, c-format
+msgid "URL: %1"
+msgstr "URL: %1"
+
+#: engine/linkstatus.cpp:109
+#, c-format
+msgid "Original URL: %1"
+msgstr "URL Gwreiddiol : %1"
+
+#: engine/linkstatus.cpp:111
+#, c-format
+msgid "Node: %1"
+msgstr "Nôd : %1"
+
+#: engine/linkstatus.cpp:138 engine/linkstatus.cpp:163
+#: engine/linkstatus.cpp:169 ui/tablelinkstatus.cpp:659
+msgid "Malformed"
+msgstr ""
+
+#: engine/linkchecker.cpp:130 ui/tablelinkstatus.cpp:590
+#: ui/tablelinkstatus.cpp:655
+msgid "Timeout"
+msgstr "Goramser"
+
+#: engine/linkchecker.cpp:384
+msgid "No Content"
+msgstr "Dim Cynnwys"
+
+#: engine/linkchecker.cpp:614 engine/linkchecker.cpp:649
+msgid "Link destination not found."
+msgstr ""
+
+#: engine/linkstatus_impl.h:122
+msgid "ROOT"
+msgstr "GWRAIDD"
+
+#: engine/searchmanager.cpp:505 ui/resultview.cpp:137
+msgid "Javascript not supported"
+msgstr ""
+
+#: klinkstatus.cpp:75
+msgid ""
+"Could not find the KLinkStatus part; did you configure with '--prefix=/$TDEDIR' "
+"and perform 'make install'?"
+msgstr ""
+
 #. i18n: file klinkstatus_part.rc line 32
-#: rc.cpp:12 rc.cpp:24 rc.cpp:192 rc.cpp:207
+#: rc.cpp:12 rc.cpp:24 rc.cpp:36 rc.cpp:102
 #, no-c-format
 msgid "S&earch"
 msgstr "C&hwilio"
 
-#. i18n: file ./ui/sessionwidgetbase.ui line 36
-#: rc.cpp:30
+#. i18n: file ./cfg/klinkstatus.kcfg line 8
+#: rc.cpp:42
 #, no-c-format
-msgid "Search"
-msgstr "Chwilio"
+msgid "Maximum number of entries in the combo url."
+msgstr ""
 
-#. i18n: file ./ui/sessionwidgetbase.ui line 110
-#: rc.cpp:33
+#. i18n: file ./cfg/klinkstatus.kcfg line 13
+#: rc.cpp:45
 #, no-c-format
-msgid "URL: "
-msgstr "URL: "
+msgid "Maximum number of simultaneous connections."
+msgstr ""
 
-#. i18n: file ./ui/sessionwidgetbase.ui line 175
-#: rc.cpp:36
-#, fuzzy, no-c-format
-msgid "Recursivel&y:"
-msgstr "Ymgylchol"
+#. i18n: file ./cfg/klinkstatus.kcfg line 18
+#: rc.cpp:48
+#, no-c-format
+msgid "Timeout on getting an URL."
+msgstr ""
 
-#. i18n: file ./ui/sessionwidgetbase.ui line 181
-#: rc.cpp:39
+#. i18n: file ./cfg/klinkstatus.kcfg line 23
+#: rc.cpp:51
 #, no-c-format
-msgid "Check pages recursively"
+msgid "History of combo url."
 msgstr ""
 
-#. i18n: file ./ui/sessionwidgetbase.ui line 192
-#: rc.cpp:42 rc.cpp:93
+#. i18n: file ./cfg/klinkstatus.kcfg line 27
+#: rc.cpp:54
 #, no-c-format
-msgid "Unlimited"
-msgstr "Heb derfyn"
+msgid "Whether to do a recursive check."
+msgstr ""
 
-#. i18n: file ./ui/sessionwidgetbase.ui line 215
-#: rc.cpp:45
+#. i18n: file ./cfg/klinkstatus.kcfg line 32
+#: rc.cpp:57
 #, no-c-format
-msgid "Do &not check parent folders"
+msgid "Maximum depth to check."
 msgstr ""
 
-#. i18n: file ./ui/sessionwidgetbase.ui line 253
-#: rc.cpp:48
+#. i18n: file ./cfg/klinkstatus.kcfg line 37
+#: rc.cpp:60
 #, no-c-format
-msgid "Chec&k external links"
+msgid "Whether to check parent folders."
 msgstr ""
 
-#. i18n: file ./ui/sessionwidgetbase.ui line 291
-#: rc.cpp:51
+#. i18n: file ./cfg/klinkstatus.kcfg line 42
+#: rc.cpp:63
 #, no-c-format
-msgid "Do not check regular expression:"
+msgid "Whether to check external links."
 msgstr ""
 
-#. i18n: file ./ui/sessionwidgetbase.ui line 457
-#: rc.cpp:57
+#. i18n: file ./cfg/klinkstatus.kcfg line 47
+#: rc.cpp:66
 #, no-c-format
-msgid "Elapsed time:"
-msgstr "Amser aeth heibio:"
+msgid "Whether to remeber the check settings like depth, and so on, on exit."
+msgstr ""
 
-#. i18n: file ./ui/sessionwidgetbase.ui line 460
-#: rc.cpp:60 rc.cpp:63
+#. i18n: file ./cfg/klinkstatus.kcfg line 52
+#: rc.cpp:69
 #, no-c-format
-msgid "hh:mm:ss.zzz"
+msgid ""
+"Whether preview prefix in Quanta project is used to set the URL to check."
+msgstr ""
+
+#. i18n: file ./cfg/klinkstatus.kcfg line 57
+#: rc.cpp:72 rc.cpp:75
+#, no-c-format
+msgid "Whether to display a tree view or a flat view in the results view."
+msgstr ""
+
+#. i18n: file ./cfg/klinkstatus.kcfg line 67
+#: rc.cpp:78
+#, no-c-format
+msgid ""
+"Whether to automatically adjust the width of the result columns (Not used)."
+msgstr ""
+
+#. i18n: file ./cfg/klinkstatus.kcfg line 72
+#: rc.cpp:81
+#, no-c-format
+msgid ""
+"Whether the viewport of the result view should follow the last link checked."
+msgstr ""
+
+#. i18n: file ./cfg/klinkstatus.kcfg line 77
+#: rc.cpp:84
+#, no-c-format
+msgid ""
+"Whether the user can see if the markup is valid by showing a column with an "
+"icon indicator."
+msgstr ""
+
+#. i18n: file ./cfg/klinkstatus.kcfg line 82
+#: rc.cpp:87
+#, no-c-format
+msgid "Whether to send an User-Agent in HTTP requests."
+msgstr ""
+
+#. i18n: file ./cfg/klinkstatus.kcfg line 87
+#: rc.cpp:90
+#, no-c-format
+msgid "Defines the HTTP User-Agent to send."
+msgstr ""
+
+#. i18n: file ./ui/settings/configresultsdialog.ui line 35
+#: rc.cpp:111
+#, no-c-format
+msgid "Tree"
+msgstr "Coeden"
+
+#. i18n: file ./ui/settings/configresultsdialog.ui line 43
+#: rc.cpp:114
+#, no-c-format
+msgid "Flat"
+msgstr "Gwastad"
+
+#. i18n: file ./ui/settings/configresultsdialog.ui line 53
+#: rc.cpp:117
+#, no-c-format
+msgid "Misc"
+msgstr "Amrywiol"
+
+#. i18n: file ./ui/settings/configresultsdialog.ui line 64
+#: rc.cpp:120
+#, no-c-format
+msgid "Follow Last Link Checked"
 msgstr ""
 
 #. i18n: file ./ui/settings/configsearchdialog.ui line 24
-#: rc.cpp:66
+#: rc.cpp:123
 #, no-c-format
 msgid "Network"
 msgstr "Rhwydwaith"
 
 #. i18n: file ./ui/settings/configsearchdialog.ui line 71
-#: rc.cpp:69
+#: rc.cpp:126
 #, no-c-format
 msgid "Timeout in seconds:"
 msgstr ""
 
 #. i18n: file ./ui/settings/configsearchdialog.ui line 109
-#: rc.cpp:72
+#: rc.cpp:129
 #, no-c-format
 msgid "Number of simultaneous connections:"
 msgstr ""
 
 #. i18n: file ./ui/settings/configsearchdialog.ui line 119
-#: rc.cpp:75
+#: rc.cpp:132
 #, no-c-format
 msgid "Input"
 msgstr "Mewnbwn"
 
 #. i18n: file ./ui/settings/configsearchdialog.ui line 152
-#: rc.cpp:78
+#: rc.cpp:135
 #, no-c-format
 msgid "Check parent folders"
 msgstr ""
 
 #. i18n: file ./ui/settings/configsearchdialog.ui line 171
-#: rc.cpp:81
+#: rc.cpp:138
 #, no-c-format
 msgid "Number of items in URL history:"
 msgstr ""
 
 #. i18n: file ./ui/settings/configsearchdialog.ui line 179
-#: rc.cpp:84
+#: rc.cpp:141
 #, no-c-format
 msgid "Check external links"
 msgstr ""
 
 #. i18n: file ./ui/settings/configsearchdialog.ui line 198
-#: rc.cpp:87
+#: rc.cpp:144
 #, no-c-format
 msgid "Recursive"
 msgstr "Ymgylchol"
 
 #. i18n: file ./ui/settings/configsearchdialog.ui line 234
-#: rc.cpp:90
+#: rc.cpp:147
 #, no-c-format
 msgid "Depth:"
 msgstr "Dyfnder:"
 
+#. i18n: file ./ui/settings/configsearchdialog.ui line 253
+#: rc.cpp:150 rc.cpp:189
+#, no-c-format
+msgid "Unlimited"
+msgstr "Heb derfyn"
+
 #. i18n: file ./ui/settings/configsearchdialog.ui line 276
-#: rc.cpp:96
+#: rc.cpp:153
 #, no-c-format
 msgid "Quanta"
 msgstr ""
 
 #. i18n: file ./ui/settings/configsearchdialog.ui line 287
-#: rc.cpp:99
+#: rc.cpp:156
 #, no-c-format
 msgid "Use preview prefix"
 msgstr ""
 
 #. i18n: file ./ui/settings/configsearchdialog.ui line 293
-#: rc.cpp:102
+#: rc.cpp:159
 #, no-c-format
 msgid ""
 "Check this one if you want to use Quanta's project preview prefix in the URL to "
@@ -456,174 +374,257 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./ui/settings/configsearchdialog.ui line 303
-#: rc.cpp:105
+#: rc.cpp:162
 #, no-c-format
 msgid "Remember settings when exit"
 msgstr ""
 
-#. i18n: file ./ui/settings/configidentificationdialogui.ui line 34
-#: klinkstatus_part.cpp:153 rc.cpp:108
-#, no-c-format
-msgid "Identification"
-msgstr ""
-
 #. i18n: file ./ui/settings/configidentificationdialogui.ui line 57
-#: rc.cpp:111
+#: rc.cpp:168
 #, no-c-format
 msgid "User-Agent"
 msgstr ""
 
 #. i18n: file ./ui/settings/configidentificationdialogui.ui line 92
-#: rc.cpp:117
+#: rc.cpp:174
 #, no-c-format
 msgid "Send Identification"
 msgstr ""
 
-#. i18n: file ./ui/settings/configresultsdialog.ui line 35
-#: rc.cpp:123
+#. i18n: file ./ui/sessionwidgetbase.ui line 36
+#: rc.cpp:177
 #, no-c-format
-msgid "Tree"
-msgstr "Coeden"
+msgid "Search"
+msgstr "Chwilio"
 
-#. i18n: file ./ui/settings/configresultsdialog.ui line 43
-#: rc.cpp:126
+#. i18n: file ./ui/sessionwidgetbase.ui line 110
+#: rc.cpp:180
 #, no-c-format
-msgid "Flat"
-msgstr "Gwastad"
+msgid "URL: "
+msgstr "URL: "
 
-#. i18n: file ./ui/settings/configresultsdialog.ui line 53
-#: rc.cpp:129
-#, no-c-format
-msgid "Misc"
-msgstr "Amrywiol"
+#. i18n: file ./ui/sessionwidgetbase.ui line 175
+#: rc.cpp:183
+#, fuzzy, no-c-format
+msgid "Recursivel&y:"
+msgstr "Ymgylchol"
 
-#. i18n: file ./ui/settings/configresultsdialog.ui line 64
-#: rc.cpp:132
+#. i18n: file ./ui/sessionwidgetbase.ui line 181
+#: rc.cpp:186
 #, no-c-format
-msgid "Follow Last Link Checked"
+msgid "Check pages recursively"
 msgstr ""
 
-#. i18n: file ./cfg/klinkstatus.kcfg line 8
-#: rc.cpp:135
+#. i18n: file ./ui/sessionwidgetbase.ui line 215
+#: rc.cpp:192
 #, no-c-format
-msgid "Maximum number of entries in the combo url."
+msgid "Do &not check parent folders"
 msgstr ""
 
-#. i18n: file ./cfg/klinkstatus.kcfg line 13
-#: rc.cpp:138
+#. i18n: file ./ui/sessionwidgetbase.ui line 253
+#: rc.cpp:195
 #, no-c-format
-msgid "Maximum number of simultaneous connections."
+msgid "Chec&k external links"
 msgstr ""
 
-#. i18n: file ./cfg/klinkstatus.kcfg line 18
-#: rc.cpp:141
+#. i18n: file ./ui/sessionwidgetbase.ui line 291
+#: rc.cpp:198
 #, no-c-format
-msgid "Timeout on getting an URL."
+msgid "Do not check regular expression:"
 msgstr ""
 
-#. i18n: file ./cfg/klinkstatus.kcfg line 23
-#: rc.cpp:144
+#. i18n: file ./ui/sessionwidgetbase.ui line 367
+#: rc.cpp:201 ui/sessionwidget.cpp:435
 #, no-c-format
-msgid "History of combo url."
-msgstr ""
+msgid "Ready"
+msgstr "Parod"
 
-#. i18n: file ./cfg/klinkstatus.kcfg line 27
-#: rc.cpp:147
+#. i18n: file ./ui/sessionwidgetbase.ui line 457
+#: rc.cpp:204
 #, no-c-format
-msgid "Whether to do a recursive check."
-msgstr ""
+msgid "Elapsed time:"
+msgstr "Amser aeth heibio:"
 
-#. i18n: file ./cfg/klinkstatus.kcfg line 32
-#: rc.cpp:150
+#. i18n: file ./ui/sessionwidgetbase.ui line 460
+#: rc.cpp:207 rc.cpp:210
 #, no-c-format
-msgid "Maximum depth to check."
+msgid "hh:mm:ss.zzz"
 msgstr ""
 
-#. i18n: file ./cfg/klinkstatus.kcfg line 37
-#: rc.cpp:153
-#, no-c-format
-msgid "Whether to check parent folders."
+#: utils/xsl.cpp:165
+msgid "Message is null."
 msgstr ""
 
-#. i18n: file ./cfg/klinkstatus.kcfg line 42
-#: rc.cpp:156
-#, no-c-format
-msgid "Whether to check external links."
+#: utils/xsl.cpp:170
+msgid "The selected stylesheet is invalid."
 msgstr ""
 
-#. i18n: file ./cfg/klinkstatus.kcfg line 47
-#: rc.cpp:159
-#, no-c-format
-msgid "Whether to remeber the check settings like depth, and so on, on exit."
+#: utils/xsl.cpp:177
+msgid "Message could not be parsed. This is likely due to an encoding problem."
 msgstr ""
 
-#. i18n: file ./cfg/klinkstatus.kcfg line 52
-#: rc.cpp:162
-#, no-c-format
+#: utils/xsl.cpp:182
 msgid ""
-"Whether preview prefix in Quanta project is used to set the URL to check."
+"<div><b>KLinkStatus encountered the following error while parsing a message:</b>"
+"<br />%1</div>"
 msgstr ""
 
-#. i18n: file ./cfg/klinkstatus.kcfg line 57
-#: rc.cpp:165 rc.cpp:168
-#, no-c-format
-msgid "Whether to display a tree view or a flat view in the results view."
+#: ui/tablelinkstatus.cpp:389 ui/treeview.cpp:295
+msgid "<qt>File <b>%1</b> cannot be opened. Might be a DCOP problem.</qt>"
 msgstr ""
 
-#. i18n: file ./cfg/klinkstatus.kcfg line 67
-#: rc.cpp:171
-#, no-c-format
-msgid ""
-"Whether to automatically adjust the width of the result columns (Not used)."
+#: ui/tablelinkstatus.cpp:410 ui/tablelinkstatus.cpp:431 ui/treeview.cpp:316
+#: ui/treeview.cpp:337
+msgid "Invalid URL."
+msgstr "URL annilys."
+
+#: ui/tablelinkstatus.cpp:419 ui/treeview.cpp:325
+msgid "ROOT URL."
 msgstr ""
 
-#. i18n: file ./cfg/klinkstatus.kcfg line 72
-#: rc.cpp:174
-#, no-c-format
-msgid ""
-"Whether the viewport of the result view should follow the last link checked."
+#: ui/tablelinkstatus.cpp:277 ui/treeview.cpp:348
+msgid "All"
+msgstr "Popeth"
+
+#: ui/tablelinkstatus.cpp:286 ui/tablelinkstatus.cpp:291 ui/treeview.cpp:357
+#: ui/treeview.cpp:363
+msgid "Edit Referrer with Quanta"
 msgstr ""
 
-#. i18n: file ./cfg/klinkstatus.kcfg line 77
-#: rc.cpp:177
-#, no-c-format
-msgid ""
-"Whether the user can see if the markup is valid by showing a column with an "
-"icon indicator."
+#: ui/tablelinkstatus.cpp:295 ui/treeview.cpp:367
+msgid "Open URL"
+msgstr "URL Agored"
+
+#: ui/tablelinkstatus.cpp:298 ui/treeview.cpp:370
+msgid "Open Referrer URL"
 msgstr ""
 
-#. i18n: file ./cfg/klinkstatus.kcfg line 82
-#: rc.cpp:180
-#, no-c-format
-msgid "Whether to send an User-Agent in HTTP requests."
+#: ui/tablelinkstatus.cpp:303 ui/treeview.cpp:375
+msgid "Copy URL"
 msgstr ""
 
-#. i18n: file ./cfg/klinkstatus.kcfg line 87
-#: rc.cpp:183
-#, no-c-format
-msgid "Defines the HTTP User-Agent to send."
+#: ui/tablelinkstatus.cpp:306 ui/treeview.cpp:378
+msgid "Copy Referrer URL"
 msgstr ""
 
-#: klinkstatus_part.cpp:51
-msgid "A Link Checker"
+#: ui/tablelinkstatus.cpp:309 ui/treeview.cpp:381
+msgid "Copy Cell Text"
 msgstr ""
 
-#: klinkstatus_part.cpp:151
-msgid "Check"
+#: ui/tabwidgetsession.cpp:61
+msgid "Open new tab"
 msgstr ""
 
-#: klinkstatus_part.cpp:152
-msgid "Results"
-msgstr "Canlyniadau"
+#: ui/tabwidgetsession.cpp:69
+msgid "Close the current tab"
+msgstr "Cau'r tab cyfredol"
 
-#: klinkstatus_part.cpp:154
-msgid "Configure the way KLinkstatus reports itself"
+#: ui/tabwidgetsession.cpp:123
+msgid "Session"
+msgstr "Sesiwn"
+
+#: ui/resultssearchbar.cpp:72
+msgid "S&earch:"
+msgstr "C&hwilio"
+
+#: ui/resultssearchbar.cpp:83
+msgid "Status:"
+msgstr "Cyflwr:"
+
+#: ui/resultssearchbar.cpp:93
+msgid "All Links"
 msgstr ""
 
-#: klinkstatus_part.cpp:187
-msgid "KLinkStatus Part"
+#: ui/resultssearchbar.cpp:94
+msgid "Good Links"
+msgstr ""
+
+#: ui/resultssearchbar.cpp:95
+msgid "Broken Links"
+msgstr ""
+
+#: ui/resultssearchbar.cpp:96
+msgid "Malformed Links"
+msgstr ""
+
+#: ui/resultssearchbar.cpp:97
+msgid "Undetermined Links"
+msgstr ""
+
+#: ui/resultssearchbar.cpp:100
+msgid "Clear filter"
+msgstr "Gwagio hidlen"
+
+#: ui/resultssearchbar.cpp:101
+msgid "Enter the terms to filter the result link list"
+msgstr ""
+
+#: ui/resultssearchbar.cpp:102
+msgid "Choose what kind of link status to show in result list"
+msgstr ""
+
+#: ui/sessionwidget.cpp:241 ui/sessionwidget.cpp:364 ui/sessionwidget.cpp:387
+#: ui/sessionwidget.cpp:545 ui/sessionwidget.cpp:629
+msgid "Checking..."
+msgstr "Gwirio..."
+
+#: ui/sessionwidget.cpp:351
+msgid "Cowardly refusing to check an empty URL."
 msgstr ""
 
+#: ui/sessionwidget.cpp:365 ui/sessionwidget.cpp:388 ui/sessionwidget.cpp:463
+msgid "Stopped"
+msgstr "Wedi aros"
+
+#: ui/sessionwidget.cpp:531 ui/sessionwidget.cpp:539
+msgid "Adding level..."
+msgstr ""
+
+#: ui/sessionwidget.cpp:686
+msgid "Export Results as HTML"
+msgstr ""
+
+#: ui/tablelinkstatus.cpp:91
+msgid "Status"
+msgstr "Cyflwr"
+
+#: ui/tablelinkstatus.cpp:96
+msgid "Label"
+msgstr "Label"
+
+#: ui/tablelinkstatus.cpp:100
+msgid "URL"
+msgstr "URL"
+
+#: ui/tablelinkstatus.cpp:592
+msgid "not supported"
+msgstr ""
+
+#: ui/tablelinkstatus.cpp:682 ui/tablelinkstatus.cpp:685
+#, c-format
+msgid "%1"
+msgstr "%1"
+
+#: ui/documentrootdialog.cpp:40
+msgid ""
+"As you are using a protocol different 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 ""
+
+#: main.cpp:34
+msgid ""
+"A Link Checker.\n"
+"\n"
+"KLinkStatus belongs to the tdewebdev module from TDE."
+msgstr ""
+
+#: main.cpp:40
+msgid "Document to open"
+msgstr "Dogfen i'w hagor"
+
 #~ msgid "&Pause"
 #~ msgstr "&Seibio"
 
diff --git a/tde-i18n-cy/messages/tdewebdev/kommander.po b/tde-i18n-cy/messages/tdewebdev/kommander.po
index d32c747fbe0..f29b3448221 100644
--- a/tde-i18n-cy/messages/tdewebdev/kommander.po
+++ b/tde-i18n-cy/messages/tdewebdev/kommander.po
@@ -1,1896 +1,2151 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdewebdev/kommander.po\n"
-"POT-Creation-Date: 2008-07-08 01:25+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: part/kommander_part.cpp:30
-msgid ""
-"Executor Part is a component of the Kommander dialog system that executes .kmdr "
-"files inside a TDE KPart"
+#: working/plugintemplate/widget.cpp:43
+msgid "Call function1 with two arguments, second is optional."
 msgstr ""
 
-#: part/kommander_part.cpp:54
-msgid "Kommander Executor Part"
+#: working/plugintemplate/widget.cpp:44
+msgid "Get a TQString as a result of function2."
 msgstr ""
 
-#: part/kommander_part.cpp:56
-msgid "Part of the TDEWebDev module."
+#: working/plugintemplate/plugin.cpp:19
+msgid "Kommander %{APPNAME} plugin."
 msgstr ""
 
-#: editor/main.cpp:47 executor/main.cpp:61 part/kommander_part.cpp:58
-msgid "Current maintainer"
-msgstr ""
+#: _translatorinfo.cpp:1 editor/main.cpp:50
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "KD wrth KGyfieithu"
 
-#: editor/main.cpp:48 executor/main.cpp:62 part/kommander_part.cpp:59
-msgid "Previous maintainer"
+#: _translatorinfo.cpp:3 editor/main.cpp:51
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "kyfieithu@dotmon.com"
+
+#: executor/instance.cpp:115
+msgid "<qt>Unable to create dialog.</qt>"
 msgstr ""
 
-#: editor/main.cpp:49 executor/main.cpp:63 part/kommander_part.cpp:60
-msgid "Original author"
+#: executor/instance.cpp:187
+msgid "<qt>Kommander file<br><b>%1</b><br>does not exist.</qt>"
 msgstr ""
 
-#: pluginmanager/main.cpp:39
+#: executor/instance.cpp:195
 msgid ""
-"kmdr-plugins is a component of the Kommander dialog system that manages "
-"installed plugins."
+"<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 ""
 
-#: pluginmanager/main.cpp:46
-msgid "Register given library"
+#: executor/instance.cpp:197
+msgid "Wrong Extension"
 msgstr ""
 
-#: pluginmanager/main.cpp:48
-msgid "Remove given library"
+#: executor/instance.cpp:214
+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 ""
 
-#: pluginmanager/main.cpp:50
-msgid "Check all installed plugins and remove those missing"
+#: executor/instance.cpp:218 executor/instance.cpp:223
+msgid "Run Nevertheless"
 msgstr ""
 
-#: pluginmanager/main.cpp:52
-msgid "List all installed plugins"
+#: executor/instance.cpp:223
+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 ""
 
-#: pluginmanager/main.cpp:59
-msgid "Kommander Plugin Manager"
+#: executor/register.cpp:66
+msgid "Return EOL-separated list of all values in the array."
 msgstr ""
 
-#: pluginmanager/main.cpp:80
-msgid "Error adding plugin '%1'"
+#: executor/register.cpp:67
+msgid "Return EOL-separated list of all keys in the array."
 msgstr ""
 
-#: pluginmanager/main.cpp:85
-msgid "Error removing plugin '%1'"
+#: executor/register.cpp:68
+msgid "Remove all elements from the array."
 msgstr ""
 
-#: pluginmanager/mainwindow.cpp:37
-msgid "Refresh"
-msgstr "Cyfredoli"
-
-#: pluginmanager/mainwindow.cpp:72
-msgid "Add Kommander Plugin"
+#: executor/register.cpp:69
+msgid "Return number of elements in the array."
 msgstr ""
 
-#: pluginmanager/mainwindow.cpp:80
-msgid "<qt>Unable to load Kommander plugin<br><b>%1</b></qt>"
+#: executor/register.cpp:70
+msgid "Return the value associated with given key."
 msgstr ""
 
-#: pluginmanager/mainwindow.cpp:81
-msgid "Cannot add plugin"
+#: executor/register.cpp:71
+msgid "Remove element with given key from the array."
 msgstr ""
 
-#: _translatorinfo.cpp:1 editor/main.cpp:50
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "KD wrth KGyfieithu"
+#: executor/register.cpp:72
+msgid "Add element with given key and value to the array"
+msgstr ""
 
-#: _translatorinfo.cpp:3 editor/main.cpp:51
+#: executor/register.cpp:73
 msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "kyfieithu@dotmon.com"
-
-#. i18n: file ./editor/templates/Configuration_Dialog.ui line 31
-#: editor/iconvieweditorimpl.cpp:57 editor/listboxeditorimpl.cpp:61
-#: editor/widgetfactory.cpp:891 editor/widgetfactory.cpp:924
-#: editor/widgetfactory.cpp:935 editor/widgetfactory.cpp:1126
-#: editor/widgetfactory.cpp:1236 rc.cpp:1379
-#, no-c-format
-msgid "New Item"
-msgstr "Eitem Newydd"
-
-#: editor/iconvieweditorimpl.cpp:124 editor/listboxeditorimpl.cpp:134
-msgid "Edit Items of '%1'"
+"Add all elements in the string to the array. String should have <i>key>"
+"\\tvalue\\n</i> format."
 msgstr ""
 
-#: editor/formfile.cpp:121
+#: executor/register.cpp:75
 msgid ""
-"Failed to save file '%1'.\n"
-"Do you want to use another file name?"
+"Return all elements in the array in <i>key>\\tvalue\\n</i> format."
 msgstr ""
 
-#: editor/formfile.cpp:122
-msgid "Try Another"
+#: executor/register.cpp:77
+msgid ""
+"Create an integer indexed array - starting from 0 - from a string. Use the "
+"separator character to split the string."
 msgstr ""
 
-#: editor/formfile.cpp:122
-msgid "Do Not Try"
+#: executor/register.cpp:78
+msgid ""
+"Create a string from an integer indexed array. Concatenate the elements with "
+"the separator character."
 msgstr ""
 
-#: editor/formfile.cpp:127
-msgid "'%1' saved."
+#: executor/register.cpp:79
+msgid ""
+"Remove the element specified by the key from an indexed array and reindex the "
+"array."
 msgstr ""
 
-#: editor/formfile.cpp:141 editor/mainwindowactions.cpp:626
-msgid "*.kmdr|Kommander Files"
+#: executor/register.cpp:82
+msgid "Return number of chars in the string."
 msgstr ""
 
-#: editor/formfile.cpp:142
-msgid "Save Form '%1' As"
+#: executor/register.cpp:83
+msgid "Check if the string contains given substring."
 msgstr ""
 
-#: editor/formfile.cpp:154
-msgid "The file already exists. Do you wish to overwrite it?"
+#: executor/register.cpp:84
+msgid "Return position of a substring in the string, or -1 if it isn't found."
 msgstr ""
 
-#: editor/formfile.cpp:155
-msgid "Overwrite File?"
-msgstr "Trosysgrifo'r Ffeil?"
-
-#: editor/formfile.cpp:155 editor/messagelog.cpp:128
-msgid "Overwrite"
-msgstr "Trosysgrifo"
-
-#: editor/formfile.cpp:184
-msgid "Dialog '%1' was modified.Do you want to save it?"
+#: executor/register.cpp:86
+msgid "Return first n chars of the string."
 msgstr ""
 
-#: editor/formfile.cpp:185
-msgid "Save File?"
+#: executor/register.cpp:87
+msgid "Return last n chars of the string."
 msgstr ""
 
-#: editor/formfile.cpp:244
-msgid "unnamed"
-msgstr "di-enw"
-
-#: editor/propertyeditor.cpp:406
-msgid "Reset the property to its default value"
+#: executor/register.cpp:88
+msgid "Return substring of the string, starting from given position."
 msgstr ""
 
-#: editor/propertyeditor.cpp:407
-msgid "Click this button to reset the property to its default value"
+#: executor/register.cpp:90
+msgid "Replace all occurencies of given substring."
 msgstr ""
 
-#. i18n: file ./editor/iconvieweditor.ui line 254
-#: editor/propertyeditor.cpp:595 rc.cpp:377 rc.cpp:446 rc.cpp:578 rc.cpp:674
-#: rc.cpp:746 rc.cpp:1016 rc.cpp:1181 rc.cpp:1238
-#, no-c-format
-msgid "..."
-msgstr "..."
-
-#: editor/propertyeditor.cpp:1071 editor/propertyeditor.cpp:1132
-msgid "False"
-msgstr "Ffug"
-
-#: editor/propertyeditor.cpp:1072 editor/propertyeditor.cpp:1130
-msgid "True"
-msgstr "Gwir"
-
-#: editor/propertyeditor.cpp:1410 editor/propertyeditor.cpp:1428
-#: editor/propertyeditor.cpp:1507 editor/propertyeditor.cpp:1518
-msgid "x"
-msgstr "x"
-
-#: editor/propertyeditor.cpp:1412 editor/propertyeditor.cpp:1433
-#: editor/propertyeditor.cpp:1509 editor/propertyeditor.cpp:1520
-msgid "y"
-msgstr "y"
-
-#: editor/propertyeditor.cpp:1416 editor/propertyeditor.cpp:1438
-#: editor/propertyeditor.cpp:1511 editor/propertyeditor.cpp:1525
-msgid "width"
-msgstr "lled"
-
-#: editor/propertyeditor.cpp:1418 editor/propertyeditor.cpp:1443
-#: editor/propertyeditor.cpp:1513 editor/propertyeditor.cpp:1527
-msgid "height"
-msgstr "taldra"
-
-#: editor/propertyeditor.cpp:1647 editor/propertyeditor.cpp:1660
-#: editor/propertyeditor.cpp:1710
-msgid "Red"
-msgstr "Coch"
-
-#: editor/propertyeditor.cpp:1649 editor/propertyeditor.cpp:1662
-#: editor/propertyeditor.cpp:1712
-msgid "Green"
-msgstr "Gwyrdd"
-
-#: editor/propertyeditor.cpp:1651 editor/propertyeditor.cpp:1664
-#: editor/propertyeditor.cpp:1714
-msgid "Blue"
-msgstr "Glas"
-
-#: editor/propertyeditor.cpp:1768 editor/propertyeditor.cpp:1787
-#: editor/propertyeditor.cpp:1852
-msgid "Family"
-msgstr "Teulu"
-
-#: editor/propertyeditor.cpp:1770 editor/propertyeditor.cpp:1790
-#: editor/propertyeditor.cpp:1854
-msgid "Point Size"
+#: executor/register.cpp:91
+msgid "Replace all occurencies of given substring with given replacement."
 msgstr ""
 
-#: editor/propertyeditor.cpp:1772 editor/propertyeditor.cpp:1792
-#: editor/propertyeditor.cpp:1856
-msgid "Bold"
-msgstr "Trwm"
-
-#: editor/propertyeditor.cpp:1776 editor/propertyeditor.cpp:1796
-#: editor/propertyeditor.cpp:1860
-msgid "Underline"
-msgstr "Tanlinellu"
-
-#: editor/propertyeditor.cpp:1778 editor/propertyeditor.cpp:1798
-#: editor/propertyeditor.cpp:1862
-msgid "Strikeout"
-msgstr "Trwylinellu"
-
-#: editor/propertyeditor.cpp:1892 editor/propertyeditor.cpp:1910
-msgid "Connection"
-msgstr "Cysylltiad"
-
-#: editor/propertyeditor.cpp:1894 editor/propertyeditor.cpp:1928
-#: editor/widgetdatabase.cpp:223
-msgid "Table"
-msgstr "Tabl"
-
-#: editor/propertyeditor.cpp:1897 editor/propertyeditor.cpp:1951
-msgid "Field"
-msgstr "Maes"
-
-#: editor/propertyeditor.cpp:2059 editor/propertyeditor.cpp:2077
-#: editor/propertyeditor.cpp:2127
-msgid "hSizeType"
+#: executor/register.cpp:93
+msgid "Convert the string to uppercase."
 msgstr ""
 
-#: editor/propertyeditor.cpp:2062 editor/propertyeditor.cpp:2079
-#: editor/propertyeditor.cpp:2129
-msgid "vSizeType"
+#: executor/register.cpp:94
+msgid "Convert the string to lowercase."
 msgstr ""
 
-#: editor/propertyeditor.cpp:2065 editor/propertyeditor.cpp:2081
-#: editor/propertyeditor.cpp:2131
-msgid "horizontalStretch"
+#: executor/register.cpp:95
+msgid ""
+"Compare two strings. Return 0 if they are equal, -1 if the first one is lower, "
+"1 if the first one is higher"
 msgstr ""
 
-#: editor/propertyeditor.cpp:2067 editor/propertyeditor.cpp:2083
-#: editor/propertyeditor.cpp:2133
-msgid "verticalStretch"
+#: executor/register.cpp:97
+msgid "Check if string is empty."
 msgstr ""
 
-#: editor/propertyeditor.cpp:2254
-msgid "Arrow"
-msgstr "Saeth"
-
-#: editor/propertyeditor.cpp:2258
-msgid "Up-Arrow"
+#: executor/register.cpp:98
+msgid "Check if string is a valid number."
 msgstr ""
 
-#: editor/propertyeditor.cpp:2262
-msgid "Cross"
-msgstr "Croes"
-
-#: editor/propertyeditor.cpp:2266
-msgid "Waiting"
-msgstr "Aros"
-
-#: editor/propertyeditor.cpp:2270
-msgid "iBeam"
-msgstr "iTrawst"
-
-#: editor/propertyeditor.cpp:2274
-msgid "Size Vertical"
-msgstr "Maint Fertigol"
-
-#: editor/propertyeditor.cpp:2278
-msgid "Size Horizontal"
-msgstr "Maint Llorweddol"
-
-#: editor/propertyeditor.cpp:2282
-msgid "Size Slash"
-msgstr "Maint Slaes"
-
-#: editor/propertyeditor.cpp:2286
-msgid "Size Backslash"
-msgstr "Maint Slaes Ôl"
-
-#: editor/propertyeditor.cpp:2290
-msgid "Size All"
-msgstr "Maint Popeth"
-
-#: editor/propertyeditor.cpp:2294
-msgid "Blank"
-msgstr "Gwag"
-
-#: editor/propertyeditor.cpp:2298
-msgid "Split Vertical"
-msgstr "Hollti'n Fertigol"
-
-#: editor/propertyeditor.cpp:2302
-msgid "Split Horizontal"
-msgstr "Hollti'n Lorweddol"
-
-#: editor/propertyeditor.cpp:2306
-msgid "Pointing Hand"
-msgstr "Llaw sy'n Pwyntio"
-
-#: editor/propertyeditor.cpp:2310
-msgid "Forbidden"
-msgstr "Gwaharddir"
-
-#: editor/propertyeditor.cpp:2402
-msgid "Property"
-msgstr "Priodwedd"
-
-#: editor/propertyeditor.cpp:2403
-msgid "Value"
-msgstr "Gwerth"
-
-#: editor/propertyeditor.cpp:2885
-msgid "Set '%1' of '%2'"
+#: executor/register.cpp:101
+msgid "Return content of given file."
 msgstr ""
 
-#: editor/propertyeditor.cpp:3006
-msgid "Sort &Categorized"
+#: executor/register.cpp:102
+msgid "Write given string to a file."
 msgstr ""
 
-#: editor/propertyeditor.cpp:3007
-msgid "Sort &Alphabetically"
-msgstr "Trefn&u yn ôl yr wyddor"
-
-#: editor/propertyeditor.cpp:3137
-msgid "Reset '%1' of '%2'"
+#: executor/register.cpp:103
+msgid "Append given string to the end of a file."
 msgstr ""
 
-#: editor/propertyeditor.cpp:3244
+#: executor/main.cpp:45
 msgid ""
-"<p><b>QWidget::%1</b></p>"
-"<p>There is no documentation available for this property.</p>"
-msgstr ""
-
-#: editor/propertyeditor.cpp:3395
-msgid "New Signal Handler"
-msgstr ""
-
-#: editor/propertyeditor.cpp:3396
-msgid "Delete Signal Handler"
+"Executor is a component of the Kommander dialog system that executes .kmdr "
+"files given as arguments or via stdin"
 msgstr ""
 
-#: editor/connectioneditorimpl.cpp:236 editor/propertyeditor.cpp:3430
-msgid "Remove Connection"
-msgstr "Gwaredu Cysylltiad"
-
-#: editor/connectioneditorimpl.cpp:246 editor/propertyeditor.cpp:3480
-msgid "Add Connection"
+#: executor/main.cpp:50
+msgid "Read dialog from standard input"
 msgstr ""
 
-#: editor/mainwindow.cpp:243 editor/propertyeditor.cpp:3542
-#: editor/propertyeditor.cpp:3582
-msgid "Property Editor"
+#: executor/main.cpp:51
+msgid "Use given catalog for translation"
 msgstr ""
 
-#: editor/propertyeditor.cpp:3547
-msgid "P&roperties"
-msgstr "P&riodweddau"
-
-#: editor/propertyeditor.cpp:3550
-msgid "S&ignal Handlers"
+#: editor/main.cpp:37 executor/main.cpp:52
+msgid "Dialog to open"
 msgstr ""
 
-#: editor/propertyeditor.cpp:3591
-msgid "Property Editor (%1)"
+#: executor/main.cpp:58
+msgid "Kommander Executor"
 msgstr ""
 
-#: editor/actioneditorimpl.cpp:43 editor/mainwindow.cpp:301
-msgid "Actions"
-msgstr "Gweithredoedd"
-
-#: editor/actioneditorimpl.cpp:48 editor/actionlistview.cpp:90
-msgid "New &Action"
-msgstr "Gwei&thred Newydd"
-
-#: editor/actioneditorimpl.cpp:49 editor/actionlistview.cpp:91
-msgid "New Action &Group"
-msgstr "Grŵp Newydd o Weithredoedd"
-
-#: editor/actioneditorimpl.cpp:50 editor/actionlistview.cpp:92
-msgid "New &Dropdown Action Group"
+#: editor/main.cpp:47 executor/main.cpp:61 part/kommander_part.cpp:58
+msgid "Current maintainer"
 msgstr ""
 
-#: editor/messagelog.cpp:34
-msgid "Copy Current &Line"
+#: editor/main.cpp:48 executor/main.cpp:62 part/kommander_part.cpp:59
+msgid "Previous maintainer"
 msgstr ""
 
-#: editor/messagelog.cpp:35
-msgid "&Copy Content"
+#: editor/main.cpp:49 executor/main.cpp:63 part/kommander_part.cpp:60
+msgid "Original author"
 msgstr ""
 
-#: editor/messagelog.cpp:36
-msgid "&Save As..."
-msgstr "&Cadw Fel..."
-
-#: editor/messagelog.cpp:122
+#: executor/main.cpp:87
 msgid ""
-"*.log|Log Files (*.log)\n"
-"*|All Files"
+"Error: no dialog given. Use --stdin option to read dialog from standard input.\n"
 msgstr ""
 
-#: editor/messagelog.cpp:122
-msgid "Save Log File"
+#: part/kommander_part.cpp:30
+msgid ""
+"Executor Part is a component of the Kommander dialog system that executes .kmdr "
+"files inside a TDE KPart"
 msgstr ""
 
-#: editor/messagelog.cpp:127
-msgid "<qt>File<br><b>%1</b><br>already exists. Overwrite it?</qt>"
+#: part/kommander_part.cpp:54
+msgid "Kommander Executor Part"
 msgstr ""
 
-#: editor/messagelog.cpp:132
-msgid "<qt>Cannot save log file<br><b>%1</b></qt>"
+#: part/kommander_part.cpp:56
+msgid "Part of the KDEWebDev module."
 msgstr ""
 
-#: editor/messagelog.cpp:146
-#, fuzzy
-msgid "Stdout"
-msgstr "Trwylinellu"
-
-#: editor/messagelog.cpp:146
-#, fuzzy
-msgid "Stderr"
-msgstr "Anfonwr"
-
-#: editor/tableeditorimpl.cpp:55
-msgid "<no field>"
-msgstr ""
+#: pluginmanager/mainwindow.cpp:37
+msgid "Refresh"
+msgstr "Cyfredoli"
 
-#: editor/tableeditorimpl.cpp:315
-msgid "Edit Rows and Columns of '%1' "
+#: pluginmanager/mainwindow.cpp:72
+msgid "Add Kommander Plugin"
 msgstr ""
 
-#: editor/widgetfactory.cpp:291 editor/widgetfactory.cpp:571
-msgid "Move Tab Page"
+#: pluginmanager/mainwindow.cpp:80
+msgid "<qt>Unable to load Kommander plugin<br><b>%1</b></qt>"
 msgstr ""
 
-#. i18n: file ./editor/listeditor.ui line 31
-#: editor/widgetfactory.cpp:934 editor/widgetfactory.cpp:1125
-#: editor/widgetfactory.cpp:1235 rc.cpp:890
-#, no-c-format
-msgid "Column 1"
+#: pluginmanager/mainwindow.cpp:81
+msgid "Cannot add plugin"
 msgstr ""
 
-#: editor/widgetfactory.cpp:967 editor/widgetfactory.cpp:1169
-msgid "Tab 1"
-msgstr "Tab 1"
-
-#: editor/widgetfactory.cpp:970 editor/widgetfactory.cpp:1172
-msgid "Tab 2"
-msgstr "Tab 2"
-
-#: editor/widgetfactory.cpp:1156 editor/widgetfactory.cpp:1184
-msgid "Page 1"
+#: pluginmanager/main.cpp:39
+msgid ""
+"kmdr-plugins is a component of the Kommander dialog system that manages "
+"installed plugins."
 msgstr ""
 
-#: editor/widgetfactory.cpp:1157 editor/widgetfactory.cpp:1187
-msgid "Page 2"
+#: pluginmanager/main.cpp:46
+msgid "Register given library"
 msgstr ""
 
-#: editor/mainwindow.cpp:893 editor/mainwindowactions.cpp:96
-msgid "&Undo: Not Available"
+#: pluginmanager/main.cpp:48
+msgid "Remove given library"
 msgstr ""
 
-#: editor/mainwindowactions.cpp:97
-msgid "Undoes the last action"
+#: pluginmanager/main.cpp:50
+msgid "Check all installed plugins and remove those missing"
 msgstr ""
 
-#: editor/mainwindow.cpp:897 editor/mainwindowactions.cpp:102
-msgid "&Redo: Not Available"
+#: pluginmanager/main.cpp:52
+msgid "List all installed plugins"
 msgstr ""
 
-#: editor/mainwindowactions.cpp:103
-msgid "Redoes the last undone operation"
+#: pluginmanager/main.cpp:59
+msgid "Kommander Plugin Manager"
 msgstr ""
 
-#: editor/mainwindowactions.cpp:108
-msgid "Cuts the selected widgets and puts them on the clipboard"
+#: pluginmanager/main.cpp:80
+msgid "Error adding plugin '%1'"
 msgstr ""
 
-#: editor/mainwindowactions.cpp:113
-msgid "Copies the selected widgets to the clipboard"
+#: pluginmanager/main.cpp:85
+msgid "Error removing plugin '%1'"
 msgstr ""
 
-#: editor/mainwindowactions.cpp:118
-msgid "Pastes the clipboard's contents"
+#. i18n: file ./editor/listboxeditor.ui line 35
+#: rc.cpp:3
+#, no-c-format
+msgid "Edit Listbox"
 msgstr ""
 
-#: editor/mainwindowactions.cpp:124
-msgid "Deletes the selected widgets"
+#. i18n: file ./editor/listboxeditor.ui line 41
+#: rc.cpp:6
+#, no-c-format
+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 ""
 
-#: editor/mainwindowactions.cpp:129
-msgid "Selects all widgets"
+#. i18n: file ./editor/listboxeditor.ui line 109
+#: rc.cpp:15 rc.cpp:165 rc.cpp:198 rc.cpp:261 rc.cpp:378 rc.cpp:695 rc.cpp:722
+#: rc.cpp:959 rc.cpp:1121 rc.cpp:1322 rc.cpp:1346
+#, no-c-format
+msgid "Close the dialog and apply all the changes."
 msgstr ""
 
-#: editor/mainwindowactions.cpp:132
-msgid "Bring to Front"
-msgstr "Anfon i'r Blaen"
-
-#: editor/mainwindowactions.cpp:134
-msgid "Raises the selected widgets"
+#. i18n: file ./editor/listboxeditor.ui line 123
+#: rc.cpp:21 rc.cpp:171 rc.cpp:204 rc.cpp:384 rc.cpp:728 rc.cpp:1328
+#, no-c-format
+msgid "Apply all changes."
 msgstr ""
 
-#: editor/mainwindowactions.cpp:137
-msgid "Send to Back"
-msgstr "Anfon i'r Cefn"
-
-#: editor/mainwindowactions.cpp:139 editor/mainwindowactions.cpp:140
-msgid "Lowers the selected widgets"
+#. i18n: file ./editor/listboxeditor.ui line 137
+#: rc.cpp:27 rc.cpp:177 rc.cpp:210 rc.cpp:267 rc.cpp:390 rc.cpp:701 rc.cpp:734
+#: rc.cpp:968 rc.cpp:1127 rc.cpp:1334 rc.cpp:1352
+#, no-c-format
+msgid "Close the dialog and discard any changes."
 msgstr ""
 
-#: editor/mainwindowactions.cpp:143
-msgid "Find in Form..."
-msgstr ""
+#. i18n: file ./editor/listboxeditor.ui line 147
+#: editor/actiondnd.cpp:350 editor/actiondnd.cpp:737 editor/actiondnd.cpp:1024
+#: rc.cpp:30 rc.cpp:81
+#, no-c-format
+msgid "Delete Item"
+msgstr "Dileu Eitem"
 
-#: editor/mainwindowactions.cpp:144
-msgid "Search for a text in the whole form."
+#. i18n: file ./editor/listboxeditor.ui line 150
+#: rc.cpp:33 rc.cpp:1199
+#, no-c-format
+msgid "The list of items."
 msgstr ""
 
-#: editor/formwindow.cpp:1848 editor/formwindow.cpp:1860
-#: editor/mainwindowactions.cpp:148
-msgid "Check Accelerators"
-msgstr "Gwirio Cyflymyddion"
-
-#: editor/mainwindowactions.cpp:150
-msgid "Checks if the accelerators used in the form are unique"
+#. i18n: file ./editor/listboxeditor.ui line 158
+#: rc.cpp:36 rc.cpp:126
+#, no-c-format
+msgid "&Item Properties"
 msgstr ""
 
-#: editor/mainwindowactions.cpp:154
-msgid "Connections"
-msgstr "Cysylltiadau"
+#. i18n: file ./editor/listboxeditor.ui line 175
+#: rc.cpp:39 rc.cpp:138 rc.cpp:1241
+#, no-c-format
+msgid "&Pixmap:"
+msgstr "&Picsfap :"
 
-#: editor/mainwindowactions.cpp:157
-msgid "Opens a dialog for editing connections"
+#. i18n: file ./editor/listboxeditor.ui line 186
+#: rc.cpp:42 rc.cpp:141 rc.cpp:417 rc.cpp:474 rc.cpp:1172 rc.cpp:1244
+#, no-c-format
+msgid "Label4"
 msgstr ""
 
-#: editor/mainwindowactions.cpp:161
-msgid "Form Settings..."
+#. i18n: file ./editor/listboxeditor.ui line 206
+#: rc.cpp:45 rc.cpp:144 rc.cpp:420 rc.cpp:477 rc.cpp:1175 rc.cpp:1247
+#, no-c-format
+msgid "Delete Pixmap"
 msgstr ""
 
-#: editor/mainwindowactions.cpp:163
-msgid "Opens a dialog to change the form's settings"
+#. i18n: file ./editor/listboxeditor.ui line 209
+#: rc.cpp:48 rc.cpp:147
+#, no-c-format
+msgid "Delete the selected item's pixmap."
 msgstr ""
 
-#: editor/mainwindowactions.cpp:169
-#, c-format
-msgid "<b>The Edit toolbar</b>%1"
-msgstr ""
+#. i18n: file ./editor/listboxeditor.ui line 223
+#: editor/propertyeditor.cpp:595 rc.cpp:51 rc.cpp:150 rc.cpp:426 rc.cpp:483
+#: rc.cpp:659 rc.cpp:845 rc.cpp:1181 rc.cpp:1253
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: editor/formwindow.cpp:1443 editor/formwindow.cpp:1457
-#: editor/formwindow.cpp:1465 editor/mainwindowactions.cpp:200
-msgid "Adjust Size"
+#. i18n: file ./editor/listboxeditor.ui line 226
+#: rc.cpp:54 rc.cpp:153 rc.cpp:429 rc.cpp:486 rc.cpp:1184 rc.cpp:1256
+#, no-c-format
+msgid "Select a Pixmap"
 msgstr ""
 
-#: editor/mainwindowactions.cpp:202
-msgid "Adjusts the size of the selected widget"
+#. i18n: file ./editor/listboxeditor.ui line 229
+#: rc.cpp:57
+#, no-c-format
+msgid "Choose a pixmap file for the selected item."
 msgstr ""
 
-#: editor/formwindow.cpp:1909 editor/mainwindowactions.cpp:206
-msgid "Lay Out Horizontally"
-msgstr ""
+#. i18n: file ./editor/listboxeditor.ui line 237
+#: rc.cpp:60 rc.cpp:129 rc.cpp:710 rc.cpp:1154 rc.cpp:1262
+#, no-c-format
+msgid "&Text:"
+msgstr "&Testun:"
 
-#: editor/mainwindowactions.cpp:208
-msgid "Lays out the selected widgets horizontally"
-msgstr ""
+#. i18n: file ./editor/listboxeditor.ui line 254
+#: rc.cpp:63 rc.cpp:132 rc.cpp:1157
+#, no-c-format
+msgid "Change text"
+msgstr "Newid y Testun"
 
-#: editor/formwindow.cpp:1919 editor/mainwindowactions.cpp:212
-msgid "Lay Out Vertically"
+#. i18n: file ./editor/listboxeditor.ui line 257
+#: rc.cpp:66
+#, no-c-format
+msgid "Change the selected item's text."
 msgstr ""
 
-#: editor/mainwindowactions.cpp:214
-msgid "Lays out the selected widgets vertically"
-msgstr ""
+#. i18n: file ./editor/listboxeditor.ui line 267
+#: rc.cpp:69 rc.cpp:108 rc.cpp:1190
+#, no-c-format
+msgid "&New Item"
+msgstr "&Eitem Newydd"
 
-#: editor/formwindow.cpp:1954 editor/mainwindowactions.cpp:218
-msgid "Lay Out in a Grid"
-msgstr ""
+#. i18n: file ./editor/listboxeditor.ui line 270
+#: rc.cpp:72 rc.cpp:111 rc.cpp:1193
+#, no-c-format
+msgid "Add an item"
+msgstr "Ychwanegu eitem"
 
-#: editor/mainwindowactions.cpp:220
-msgid "Lays out the selected widgets in a grid"
+#. i18n: file ./editor/listboxeditor.ui line 273
+#: rc.cpp:75
+#, no-c-format
+msgid "<b>Add a new item.</b><p>New items are appended to the list.</p>"
 msgstr ""
 
-#: editor/mainwindowactions.cpp:224
-msgid "Lay Out Horizontally in Splitter"
-msgstr ""
+#. i18n: file ./editor/listboxeditor.ui line 281
+#: rc.cpp:78 rc.cpp:117 rc.cpp:1139
+#, no-c-format
+msgid "&Delete Item"
+msgstr "&Dileu Eitem"
 
-#: editor/mainwindowactions.cpp:227
-msgid "Lays out the selected widgets horizontally in a splitter"
+#. i18n: file ./editor/listboxeditor.ui line 287
+#: rc.cpp:84
+#, no-c-format
+msgid "Delete the selected item"
 msgstr ""
 
-#: editor/mainwindowactions.cpp:231
-msgid "Lay Out Vertically in Splitter"
-msgstr ""
+#. i18n: file ./editor/listboxeditor.ui line 318
+#: rc.cpp:87 rc.cpp:396 rc.cpp:450 rc.cpp:1211 rc.cpp:1307
+#, no-c-format
+msgid "Move up"
+msgstr "Symud i fyny"
 
-#: editor/mainwindowactions.cpp:234
-msgid "Lays out the selected widgets vertically in a splitter"
+#. i18n: file ./editor/listboxeditor.ui line 321
+#: rc.cpp:90
+#, no-c-format
+msgid "Moves the selected item up."
 msgstr ""
 
-#: editor/formwindow.cpp:2054 editor/formwindow.cpp:2073
-#: editor/mainwindowactions.cpp:238
-msgid "Break Layout"
-msgstr "Torri'r Haenlun"
+#. i18n: file ./editor/listboxeditor.ui line 335
+#: rc.cpp:93 rc.cpp:402 rc.cpp:456 rc.cpp:1217 rc.cpp:1292
+#, no-c-format
+msgid "Move down"
+msgstr "Symud i lawr"
 
-#: editor/mainwindowactions.cpp:240
-msgid "Breaks the selected layout"
+#. i18n: file ./editor/listboxeditor.ui line 338
+#: rc.cpp:96
+#, no-c-format
+msgid "Move the selected item down."
 msgstr ""
 
-#: editor/mainwindowactions.cpp:244 editor/widgetdatabase.cpp:356
-msgid "Spacer"
-msgstr "Bylchwr"
-
-#: editor/mainwindowactions.cpp:247
-msgid "Add "
-msgstr "Ychwanegu "
-
-#: editor/mainwindowactions.cpp:248 editor/mainwindowactions.cpp:362
-#, c-format
-msgid "Insert a %1"
+#. i18n: file ./editor/iconvieweditor.ui line 35
+#: rc.cpp:99
+#, no-c-format
+msgid "Edit Iconview"
 msgstr ""
 
-#: editor/mainwindowactions.cpp:249
+#. i18n: file ./editor/iconvieweditor.ui line 41
+#: rc.cpp:102
+#, no-c-format
 msgid ""
-"<b>A %1</b>"
-"<p>%2</p>"
-"<p>Click to insert a single %3,or double click to keep the tool selected."
+"<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 ""
 
-#: editor/mainwindowactions.cpp:254
-#, c-format
-msgid "<b>The Layout toolbar</b>%1"
+#. i18n: file ./editor/iconvieweditor.ui line 72
+#: rc.cpp:105
+#, no-c-format
+msgid "All items in the iconview."
 msgstr ""
 
-#: editor/mainwindowactions.cpp:267
-msgid "&Layout"
-msgstr "&Cynllun"
-
-#: editor/mainwindowactions.cpp:282
-msgid "Pointer"
+#. i18n: file ./editor/iconvieweditor.ui line 100
+#: rc.cpp:114
+#, no-c-format
+msgid "Create a new item for the iconview."
 msgstr ""
 
-#: editor/mainwindowactions.cpp:285
-msgid "Selects the pointer tool"
-msgstr ""
+#. i18n: file ./editor/iconvieweditor.ui line 111
+#: rc.cpp:120 rc.cpp:1142
+#, no-c-format
+msgid "Delete item"
+msgstr " Dileu eitem"
 
-#: editor/mainwindowactions.cpp:289
-msgid "Connect Signal/Slots"
+#. i18n: file ./editor/iconvieweditor.ui line 114
+#: rc.cpp:123
+#, no-c-format
+msgid "Delete the selected item."
 msgstr ""
 
-#: editor/mainwindowactions.cpp:292
-msgid "Selects the connection tool"
+#. i18n: file ./editor/iconvieweditor.ui line 184
+#: rc.cpp:135
+#, no-c-format
+msgid "Change the text for the selected item."
 msgstr ""
 
-#: editor/mainwindowactions.cpp:296
-msgid "Tab Order"
+#. i18n: file ./editor/iconvieweditor.ui line 260
+#: rc.cpp:156
+#, no-c-format
+msgid "Select a pixmap file for the current item."
 msgstr ""
 
-#: editor/mainwindowactions.cpp:299
-msgid "Selects the tab order tool"
+#. i18n: file ./editor/wizardeditor.ui line 16
+#: rc.cpp:180
+#, no-c-format
+msgid "Wizard Page Editor"
 msgstr ""
 
-#: editor/mainwindowactions.cpp:305
-#, c-format
-msgid "<b>The Tools toolbar</b>%1"
+#. i18n: file ./editor/wizardeditor.ui line 61
+#: rc.cpp:183
+#, no-c-format
+msgid "Wizard pages:"
 msgstr ""
 
-#: editor/mainwindowactions.cpp:307
-msgid "Tools"
-msgstr "Offer"
+#. i18n: file ./editor/wizardeditor.ui line 90
+#: rc.cpp:186 rc.cpp:351
+#, no-c-format
+msgid "&Add"
+msgstr "&Ychwanegu"
 
-#: editor/mainwindowactions.cpp:329
-msgid "<b>The %1</b>%2"
+#. i18n: file ./editor/paletteeditor.ui line 43
+#: rc.cpp:213
+#, no-c-format
+msgid "Edit Palette"
 msgstr ""
 
-#: editor/mainwindowactions.cpp:330
-#, c-format
-msgid ""
-" Click on a button to insert a single widget, or double click to insert "
-"multiple %1."
+#. i18n: file ./editor/paletteeditor.ui line 68
+#: rc.cpp:216
+#, no-c-format
+msgid "Build Palette"
 msgstr ""
 
-#: editor/mainwindowactions.cpp:334
-msgid "<b>The %1 Widgets</b>%2"
+#. i18n: file ./editor/paletteeditor.ui line 111
+#: rc.cpp:219
+#, no-c-format
+msgid "&3D effects:"
 msgstr ""
 
-#: editor/mainwindowactions.cpp:335
-msgid ""
-" Click on a button to insert a single %1 widget, or double click to insert "
-"multiple widgets."
+#. i18n: file ./editor/paletteeditor.ui line 139
+#: rc.cpp:222 rc.cpp:231 rc.cpp:557 rc.cpp:1067 rc.cpp:1109
+#, no-c-format
+msgid "Choose a color"
 msgstr ""
 
-#: editor/mainwindowactions.cpp:364
-msgid "<b>A %1</b>"
-msgstr "<b>A %1</b>"
-
-#: editor/mainwindowactions.cpp:367
-msgid "<p>Double click on this tool to keep it selected.</p>"
+#. i18n: file ./editor/paletteeditor.ui line 142
+#: rc.cpp:225
+#, no-c-format
+msgid "Choose the effect-color for the generated palette."
 msgstr ""
 
-#: editor/mainwindowactions.cpp:398
-msgid "Editor"
-msgstr "Golygydd"
+#. i18n: file ./editor/paletteeditor.ui line 173
+#: rc.cpp:228
+#, no-c-format
+msgid "Back&ground:"
+msgstr "Cefn&dir:"
 
-#: editor/mainwindowactions.cpp:408
-#, c-format
-msgid "<b>The File toolbar</b>%1"
+#. i18n: file ./editor/paletteeditor.ui line 204
+#: rc.cpp:234
+#, no-c-format
+msgid "Choose the background color for the generated palette."
 msgstr ""
 
-#: editor/mainwindowactions.cpp:414
-msgid "Creates a new dialog"
+#. i18n: file ./editor/paletteeditor.ui line 229
+#: rc.cpp:237
+#, no-c-format
+msgid "&Tune Palette..."
 msgstr ""
 
-#: editor/mainwindowactions.cpp:420
-msgid "Opens an existing dialog"
-msgstr ""
+#. i18n: file ./editor/paletteeditor.ui line 247
+#: rc.cpp:240
+#, no-c-format
+msgid "Preview"
+msgstr "Rhagolwg"
 
-#: editor/mainwindowactions.cpp:426
-msgid "Opens recently open file"
+#. i18n: file ./editor/paletteeditor.ui line 278
+#: rc.cpp:243 rc.cpp:992
+#, no-c-format
+msgid "Select &palette:"
 msgstr ""
 
-#: editor/mainwindowactions.cpp:431
-msgid "Closes the current dialog"
+#. i18n: file ./editor/paletteeditor.ui line 287
+#: rc.cpp:246 rc.cpp:995
+#, no-c-format
+msgid "Active Palette"
 msgstr ""
 
-#: editor/mainwindowactions.cpp:439
-msgid "Saves the current dialog"
+#. i18n: file ./editor/paletteeditor.ui line 292
+#: rc.cpp:249 rc.cpp:998
+#, no-c-format
+msgid "Inactive Palette"
 msgstr ""
 
-#: editor/mainwindowactions.cpp:446
-msgid "Saves the current dialog with a new filename"
+#. i18n: file ./editor/paletteeditor.ui line 297
+#: rc.cpp:252 rc.cpp:1001
+#, no-c-format
+msgid "Disabled Palette"
 msgstr ""
 
-#: editor/mainwindowactions.cpp:451
-msgid "Save All"
-msgstr "Cadw Popeth"
-
-#: editor/mainwindowactions.cpp:453
-msgid "Saves all open dialogs"
+#. i18n: file ./editor/choosewidget.ui line 16
+#: rc.cpp:270
+#, no-c-format
+msgid "Choose Widget"
 msgstr ""
 
-#: editor/mainwindowactions.cpp:461
-msgid "Quits the application and prompts to save any changed dialogs"
-msgstr ""
+#. i18n: file ./editor/choosewidget.ui line 118
+#: rc.cpp:279
+#, no-c-format
+msgid "Find:"
+msgstr "Canfod:"
 
-#: editor/mainwindowactions.cpp:470
-msgid "&Run"
-msgstr "R&hedeg"
+#. i18n: file ./editor/templates/Tab_Dialog.ui line 37
+#: rc.cpp:282 rc.cpp:285 rc.cpp:327 rc.cpp:330
+#, no-c-format
+msgid "Tab"
+msgstr "Tab"
 
-#: editor/mainwindowactions.cpp:472
-msgid "Run Dialog"
-msgstr ""
+#. i18n: file ./editor/templates/Tab_Dialog.ui line 71
+#: rc.cpp:291 rc.cpp:303 rc.cpp:321 rc.cpp:336
+#, no-c-format
+msgid "F1"
+msgstr "F1"
 
-#: editor/mainwindowactions.cpp:474
-msgid "Executes dialog"
+#. i18n: file ./editor/templates/Configuration_Dialog.ui line 31
+#: editor/iconvieweditorimpl.cpp:57 editor/listboxeditorimpl.cpp:61
+#: editor/widgetfactory.cpp:891 editor/widgetfactory.cpp:924
+#: editor/widgetfactory.cpp:935 editor/widgetfactory.cpp:1126
+#: editor/widgetfactory.cpp:1236 rc.cpp:324
+#, no-c-format
+msgid "New Item"
+msgstr "Eitem Newydd"
+
+#. i18n: file ./editor/listeditor.ui line 31
+#: editor/widgetfactory.cpp:934 editor/widgetfactory.cpp:1125
+#: editor/widgetfactory.cpp:1235 rc.cpp:348
+#, no-c-format
+msgid "Column 1"
 msgstr ""
 
-#: editor/mainwindowactions.cpp:488
-msgid "Tile"
-msgstr "Teilio"
+#. i18n: file ./editor/listeditor.ui line 71
+#: rc.cpp:357
+#, no-c-format
+msgid "Re&name"
+msgstr "Ai&l-enwi"
 
-#: editor/mainwindowactions.cpp:490
-msgid "Tiles the windows so that they are all visible"
+#. i18n: file ./editor/tableeditor.ui line 16
+#: rc.cpp:363
+#, no-c-format
+msgid "Edit Table"
 msgstr ""
 
-#: editor/mainwindowactions.cpp:493 editor/mainwindowactions.cpp:498
-msgid "Cascade"
-msgstr "Rhaeadr"
+#. i18n: file ./editor/tableeditor.ui line 34
+#: rc.cpp:366 rc.cpp:369
+#, no-c-format
+msgid "1"
+msgstr "1"
 
-#: editor/mainwindowactions.cpp:495
-msgid "Cascades the windows so that all their title bars are visible"
+#. i18n: file ./editor/tableeditor.ui line 153
+#: rc.cpp:393 rc.cpp:1235
+#, no-c-format
+msgid "Co&lumns"
+msgstr "Co&lofnau"
+
+#. i18n: file ./editor/tableeditor.ui line 218
+#: rc.cpp:399 rc.cpp:453
+#, no-c-format
+msgid ""
+"<b>Move the selected item up.</b>"
+"<p>The top-most column will be the first column of the list.</p>"
 msgstr ""
 
-#: editor/mainwindowactions.cpp:500
-msgid "Closes the active window"
+#. i18n: file ./editor/tableeditor.ui line 235
+#: rc.cpp:405 rc.cpp:459
+#, no-c-format
+msgid ""
+"<b>Move the selected item down.</b>"
+"<p>The top-most column will be the first column of the list.</p>"
 msgstr ""
 
-#: editor/mainwindowactions.cpp:503
-msgid "Close All"
-msgstr "Cau Popeth"
+#. i18n: file ./editor/tableeditor.ui line 243
+#: rc.cpp:408 rc.cpp:1283
+#, no-c-format
+msgid "&Delete Column"
+msgstr "&Dileu Colofn"
 
-#: editor/mainwindowactions.cpp:505
-msgid "Closes all form windows"
-msgstr ""
+#. i18n: file ./editor/tableeditor.ui line 251
+#: rc.cpp:411 rc.cpp:1298
+#, no-c-format
+msgid "&New Column"
+msgstr "&Colofn Newydd"
 
-#: editor/mainwindowactions.cpp:508
-msgid "Next"
-msgstr "Nesaf"
+#. i18n: file ./editor/tableeditor.ui line 273
+#: rc.cpp:414
+#, no-c-format
+msgid "Table:"
+msgstr "Tabl:"
 
-#: editor/mainwindowactions.cpp:510
-msgid "Activates the next window"
+#. i18n: file ./editor/tableeditor.ui line 318
+#: rc.cpp:423 rc.cpp:480 rc.cpp:1178
+#, no-c-format
+msgid ""
+"<b>Delete the selected item's pixmap.</b>"
+"<p>The pixmap in the current column of the selected item will be deleted.</p>"
 msgstr ""
 
-#: editor/mainwindowactions.cpp:513
-msgid "Previous"
-msgstr "Cynt"
-
-#: editor/mainwindowactions.cpp:515
-msgid "Activates the previous window"
+#. i18n: file ./editor/tableeditor.ui line 338
+#: rc.cpp:432 rc.cpp:489 rc.cpp:1187
+#, no-c-format
+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>"
 msgstr ""
 
-#: editor/mainwindowactions.cpp:519
-msgid "&Window"
-msgstr "&Ffenestr"
+#. i18n: file ./editor/tableeditor.ui line 348
+#: rc.cpp:435 rc.cpp:468
+#, no-c-format
+msgid "&Label:"
+msgstr "&Label:"
 
-#: editor/mainwindowactions.cpp:531
-msgid "Vie&ws"
-msgstr "Gol&ygon"
+#. i18n: file ./editor/tableeditor.ui line 359
+#: rc.cpp:438 rc.cpp:471
+#, no-c-format
+msgid "Pixmap:"
+msgstr "Picsfap :"
 
-#: editor/mainwindowactions.cpp:532
-msgid "Tool&bars"
-msgstr "Barr&au Offer:"
+#. i18n: file ./editor/tableeditor.ui line 370
+#: rc.cpp:441
+#, no-c-format
+msgid "&Field:"
+msgstr "&Maes :"
 
-#: editor/mainwindowactions.cpp:568
-msgid "Opens a dialog to change shortcuts"
+#. i18n: file ./editor/tableeditor.ui line 394
+#: rc.cpp:444
+#, no-c-format
+msgid "<no table>"
 msgstr ""
 
-#: editor/mainwindowactions.cpp:571
-#, fuzzy
-msgid "Configure &Plugins..."
-msgstr "Ffurfweddu'r &ategion"
+#. i18n: file ./editor/tableeditor.ui line 406
+#: rc.cpp:447
+#, no-c-format
+msgid "&Rows"
+msgstr "&Rhesi"
 
-#: editor/mainwindowactions.cpp:573
-msgid "Opens a dialog to configure plugins"
+#. i18n: file ./editor/tableeditor.ui line 496
+#: rc.cpp:462
+#, no-c-format
+msgid "&New Row"
 msgstr ""
 
-#: editor/mainwindowactions.cpp:576
-#, fuzzy
-msgid "&Configure Editor..."
-msgstr "Ffurfweddu'r &ategion"
+#. i18n: file ./editor/tableeditor.ui line 504
+#: rc.cpp:465
+#, no-c-format
+msgid "&Delete Row"
+msgstr "&Dileu Rhes"
 
-#: editor/mainwindowactions.cpp:578
-msgid "Configure various aspects of this editor."
+#. i18n: file ./editor/previewwidget.ui line 22
+#: rc.cpp:492
+#, no-c-format
+msgid "Preview Window"
 msgstr ""
 
-#: editor/mainwindowactions.cpp:582
-msgid "Opens a dialog to change preferences"
+#. i18n: file ./editor/previewwidget.ui line 67
+#: rc.cpp:495
+#, no-c-format
+msgid "ButtonGroup"
 msgstr ""
 
-#: editor/mainwindowactions.cpp:598
-msgid "Create a new dialog..."
+#. i18n: file ./editor/previewwidget.ui line 84
+#: rc.cpp:498
+#, no-c-format
+msgid "RadioButton1"
 msgstr ""
 
-#: editor/mainwindowactions.cpp:621
-msgid "Open a file..."
-msgstr "Agor Ffeil ..."
-
-#: editor/mainwindowactions.cpp:626
-msgid "Open Files"
-msgstr "Agor Ffeiliau"
-
-#: editor/mainwindowactions.cpp:662
-msgid "Reading file '%1'..."
+#. i18n: file ./editor/previewwidget.ui line 95
+#: rc.cpp:501
+#, no-c-format
+msgid "RadioButton2"
 msgstr ""
 
-#: editor/mainwindowactions.cpp:675
-msgid "Loaded file '%1'"
+#. i18n: file ./editor/previewwidget.ui line 103
+#: rc.cpp:504
+#, no-c-format
+msgid "RadioButton3"
 msgstr ""
 
-#: editor/mainwindowactions.cpp:681 editor/mainwindowactions.cpp:682
-msgid "Could not load file '%1'"
-msgstr "Methu llwytho ffeil '%1'"
-
-#: editor/mainwindowactions.cpp:682
-msgid "Load File"
+#. i18n: file ./editor/previewwidget.ui line 113
+#: rc.cpp:507
+#, no-c-format
+msgid "ButtonGroup2"
 msgstr ""
 
-#: editor/mainwindowactions.cpp:717
-msgid "Enter a filename..."
-msgstr "Mewnosod enw ffeil ..."
-
-#: editor/mainwindowactions.cpp:745
-msgid "Qt Designer is crashing. Attempting to save files..."
+#. i18n: file ./editor/previewwidget.ui line 130
+#: rc.cpp:510
+#, no-c-format
+msgid "CheckBox1"
 msgstr ""
 
-#: editor/mainwindowactions.cpp:782 editor/mainwindowactions.cpp:845
-msgid "NewTemplate"
+#. i18n: file ./editor/previewwidget.ui line 141
+#: rc.cpp:513
+#, no-c-format
+msgid "CheckBox2"
 msgstr ""
 
-#: editor/mainwindowactions.cpp:794 editor/mainwindowactions.cpp:823
-msgid "Could not create the template"
+#. i18n: file ./editor/previewwidget.ui line 175
+#: rc.cpp:516
+#, no-c-format
+msgid "LineEdit"
 msgstr ""
 
-#. i18n: file ./editor/createtemplate.ui line 38
-#: editor/mainwindowactions.cpp:794 editor/mainwindowactions.cpp:823
-#: rc.cpp:407
+#. i18n: file ./editor/previewwidget.ui line 181
+#: rc.cpp:519
 #, no-c-format
-msgid "Create Template"
-msgstr "Creu Patrymlun"
+msgid "ComboBox"
+msgstr "Blwch Cyfuno"
 
-#: editor/mainwindowactions.cpp:897
-msgid ""
-"Cannot paste widgets. Designer could not find a container\n"
-"to paste into which does not contain a layout. Break the layout\n"
-"of the container you want to paste into and select this container\n"
-"and then paste again."
+#. i18n: file ./editor/previewwidget.ui line 212
+#: rc.cpp:522
+#, no-c-format
+msgid "PushButton"
 msgstr ""
 
-#: editor/mainwindowactions.cpp:900
-msgid "Paste Error"
+#. i18n: file ./editor/previewwidget.ui line 249
+#: rc.cpp:525
+#, no-c-format
+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>"
 msgstr ""
 
-#: editor/formwindow.cpp:2135 editor/mainwindowactions.cpp:1063
-msgid "Edit connections..."
+#. i18n: file ./editor/actioneditor.ui line 19
+#: rc.cpp:533
+#, no-c-format
+msgid "Edit Actions"
 msgstr ""
 
-#: editor/mainwindowactions.cpp:1082
-msgid "Edit the current form's settings..."
+#. i18n: file ./editor/actioneditor.ui line 61
+#: rc.cpp:536
+#, no-c-format
+msgid "Create new Action"
 msgstr ""
 
-#: editor/mainwindowactions.cpp:1090
-msgid "Edit preferences..."
+#. i18n: file ./editor/actioneditor.ui line 78
+#: rc.cpp:539
+#, no-c-format
+msgid "Delete current Action"
 msgstr ""
 
-#: editor/command.cpp:499 editor/command.cpp:511
-msgid "Set 'name' Property"
+#. i18n: file ./editor/actioneditor.ui line 95
+#: rc.cpp:542
+#, no-c-format
+msgid "Connect current Action"
 msgstr ""
 
-#: editor/command.cpp:500
-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'."
-msgstr ""
+#. i18n: file ./editor/preferences.ui line 35
+#: rc.cpp:545
+#, no-c-format
+msgid "Preferences"
+msgstr "Hoffterau"
 
-#: editor/command.cpp:512
+#. i18n: file ./editor/preferences.ui line 41
+#: rc.cpp:548
+#, no-c-format
 msgid ""
-"The name of a widget must not be null.\n"
-"The name has been reverted to '%1'."
+"<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 ""
 
-#: editor/newformimpl.cpp:123
-msgid "Load Template"
-msgstr "Llwytho Patrymlun"
+#. i18n: file ./editor/preferences.ui line 62
+#: rc.cpp:551
+#, no-c-format
+msgid "General"
+msgstr "Cyffredinol"
 
-#: editor/newformimpl.cpp:124
-msgid "Could not load form description from template '%1'"
+#. i18n: file ./editor/preferences.ui line 79
+#: rc.cpp:554
+#, no-c-format
+msgid "Backgro&und"
+msgstr "Cefndir"
+
+#. i18n: file ./editor/preferences.ui line 114
+#: rc.cpp:560
+#, no-c-format
+msgid "Select a color in the color dialog."
 msgstr ""
 
-#: editor/newformimpl.cpp:144
-msgid "Dialog"
-msgstr "Ymgom"
+#. i18n: file ./editor/preferences.ui line 125
+#: rc.cpp:563
+#, no-c-format
+msgid "Co&lor"
+msgstr "Ll&iw"
 
-#: editor/newformimpl.cpp:150
-msgid "Wizard"
-msgstr "Dewin"
+#. i18n: file ./editor/preferences.ui line 128
+#: rc.cpp:566
+#, no-c-format
+msgid "Use a background color"
+msgstr ""
 
-#: editor/multilineeditorimpl.cpp:56
-msgid "Set Text of '%1'"
+#. i18n: file ./editor/preferences.ui line 131
+#: rc.cpp:569
+#, no-c-format
+msgid "Use a background color."
 msgstr ""
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 198
-#: editor/mainwindow.cpp:1089 editor/mainwindow.cpp:1575
-#: editor/multilineeditorimpl.cpp:68 rc.cpp:143
+#. i18n: file ./editor/preferences.ui line 139
+#: rc.cpp:572
 #, no-c-format
-msgid "Text"
-msgstr "Testun"
+msgid "&Pixmap"
+msgstr "&Picsfap"
 
-#: editor/main.cpp:31
-msgid "Kommander is a graphical editor of scripted dialogs."
+#. i18n: file ./editor/preferences.ui line 145
+#: rc.cpp:575
+#, no-c-format
+msgid "Use a background pixmap"
 msgstr ""
 
-#: editor/main.cpp:33
-msgid "Based on Qt Designer, (C) 2000 Trolltech AS."
+#. i18n: file ./editor/preferences.ui line 148
+#: rc.cpp:578
+#, no-c-format
+msgid "Use a background pixmap."
 msgstr ""
 
-#: editor/main.cpp:37 executor/main.cpp:52
-msgid "Dialog to open"
+#. i18n: file ./editor/preferences.ui line 168
+#: rc.cpp:581 rc.cpp:1058
+#, no-c-format
+msgid "Select a pixmap"
 msgstr ""
 
-#: editor/main.cpp:43
-msgid "Kommander"
+#. i18n: file ./editor/preferences.ui line 171
+#: rc.cpp:584
+#, no-c-format
+msgid "Choose a pixmap file."
 msgstr ""
 
-#: editor/main.cpp:46
-#, fuzzy
-msgid "Project manager"
-msgstr "Cywaith"
+#. i18n: file ./editor/preferences.ui line 181
+#: rc.cpp:587
+#, no-c-format
+msgid "Show &grid"
+msgstr "Dangos &grid"
 
-#: editor/main.cpp:71
-msgid "Kommander Dialog Editor"
-msgstr ""
+#. i18n: file ./editor/preferences.ui line 187
+#: rc.cpp:590
+#, no-c-format
+msgid "Show Grid"
+msgstr "Dangos Grid"
 
-#: editor/wizardeditorimpl.cpp:62
-msgid "Edit Wizard Pages"
+#. i18n: file ./editor/preferences.ui line 190
+#: rc.cpp:593
+#, no-c-format
+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 ""
 
-#: editor/hierarchyview.cpp:519 editor/hierarchyview.cpp:525
-#: editor/mainwindow.cpp:1153 editor/mainwindow.cpp:1171
-#: editor/mainwindow.cpp:1206 editor/wizardeditorimpl.cpp:112
-#, c-format
-msgid "Add Page to %1"
-msgstr ""
+#. i18n: file ./editor/preferences.ui line 198
+#: rc.cpp:596
+#, no-c-format
+msgid "Gr&id"
+msgstr "Gr&id"
 
-#: editor/hierarchyview.cpp:541 editor/hierarchyview.cpp:551
-#: editor/mainwindow.cpp:1160 editor/mainwindow.cpp:1178
-#: editor/mainwindow.cpp:1213 editor/wizardeditorimpl.cpp:130
-msgid "Delete Page %1 of %2"
-msgstr ""
+#. i18n: file ./editor/preferences.ui line 218
+#: rc.cpp:599
+#, no-c-format
+msgid "Sn&ap to grid"
+msgstr "Sn&apio i'r grid"
 
-#: editor/wizardeditorimpl.cpp:151 editor/wizardeditorimpl.cpp:171
-msgid "Swap Pages %1 and %2 of %3"
+#. i18n: file ./editor/preferences.ui line 224
+#: rc.cpp:602
+#, no-c-format
+msgid "Snap to the grid"
 msgstr ""
 
-#: editor/mainwindow.cpp:1114 editor/mainwindow.cpp:1227
-#: editor/wizardeditorimpl.cpp:200
-msgid "Page Title"
+#. i18n: file ./editor/preferences.ui line 227
+#: rc.cpp:605
+#, no-c-format
+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 "
+"the X/Y resolution.</p>"
 msgstr ""
 
-#: editor/mainwindow.cpp:1114 editor/mainwindow.cpp:1227
-#: editor/wizardeditorimpl.cpp:200
-msgid "New page title:"
+#. i18n: file ./editor/preferences.ui line 258
+#: rc.cpp:608 rc.cpp:614
+#, no-c-format
+msgid "Grid resolution"
 msgstr ""
 
-#: editor/mainwindow.cpp:1229 editor/wizardeditorimpl.cpp:202
-msgid "Rename page %1 of %2"
+#. i18n: file ./editor/preferences.ui line 261
+#: rc.cpp:611 rc.cpp:617
+#, no-c-format
+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>"
 msgstr ""
 
-#: editor/sizehandle.cpp:230
-msgid "Resize"
-msgstr "Newid maint"
-
-#: editor/actionlistview.cpp:95
-msgid "&Connect Action..."
+#. i18n: file ./editor/preferences.ui line 289
+#: rc.cpp:620
+#, no-c-format
+msgid "Grid-&X:"
 msgstr ""
 
-#: editor/actionlistview.cpp:97
-msgid "Delete Action"
-msgstr "Dileu Gweithred"
-
-#: editor/workspace.cpp:226
-msgid "<No Project>"
+#. i18n: file ./editor/preferences.ui line 300
+#: rc.cpp:623
+#, no-c-format
+msgid "Grid-&Y:"
 msgstr ""
 
-#: editor/workspace.cpp:661
-msgid "&Open Source File..."
+#. i18n: file ./editor/preferences.ui line 327
+#: rc.cpp:626 rc.cpp:647
+#, no-c-format
+msgid ""
+"A splash screen is displayed when starting Qt Designer if this option is "
+"checked."
 msgstr ""
 
-#: editor/workspace.cpp:664
-msgid "&Remove Source File From Project"
-msgstr ""
+#. i18n: file ./editor/preferences.ui line 335
+#: rc.cpp:629
+#, no-c-format
+msgid "Ge&neral"
+msgstr "Cy&ffredinol"
 
-#: editor/workspace.cpp:668
-msgid "&Open Form..."
+#. i18n: file ./editor/preferences.ui line 352
+#: rc.cpp:632
+#, no-c-format
+msgid "Restore last &workspace on startup"
 msgstr ""
 
-#: editor/workspace.cpp:672 editor/workspace.cpp:682
-msgid "&Remove Form From Project"
+#. i18n: file ./editor/preferences.ui line 358
+#: rc.cpp:635
+#, no-c-format
+msgid "Restore last workspace"
 msgstr ""
 
-#: editor/workspace.cpp:674 editor/workspace.cpp:684
-msgid "&Remove Form"
+#. i18n: file ./editor/preferences.ui line 361
+#: rc.cpp:638
+#, no-c-format
+msgid ""
+"The current workspace settings will be restored the next time you start Qt "
+"Designer if this option is checked."
 msgstr ""
 
-#: editor/workspace.cpp:678
-msgid "&Open Form Source..."
+#. i18n: file ./editor/preferences.ui line 369
+#: rc.cpp:641
+#, no-c-format
+msgid "Show &splash screen on startup"
 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"
+#. i18n: file ./editor/preferences.ui line 375
+#: rc.cpp:644
+#, no-c-format
+msgid "Show Splashscreen"
 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"
+#. i18n: file ./editor/preferences.ui line 386
+#: rc.cpp:650
+#, no-c-format
+msgid "Disable data&base auto-edit in preview"
 msgstr ""
 
-#: editor/widgetdatabase.cpp:199 editor/widgetdatabase.cpp:531
-msgid "List Box"
+#. i18n: file ./editor/preferences.ui line 397
+#: rc.cpp:653
+#, no-c-format
+msgid "&Documentation path:"
 msgstr ""
 
-#: editor/widgetdatabase.cpp:206
-msgid "List View"
+#. i18n: file ./editor/preferences.ui line 422
+#: rc.cpp:656
+#, no-c-format
+msgid ""
+"<b>Enter the path to the documentation.</b>"
+"<p>You may provide an $environment variable as the first part of the "
+"pathname.</p>"
 msgstr ""
 
-#: editor/widgetdatabase.cpp:214
-msgid "Icon View"
-msgstr "Golwg Eicon"
+#. i18n: file ./editor/preferences.ui line 436
+#: rc.cpp:662
+#, no-c-format
+msgid "Select path"
+msgstr ""
 
-#: editor/widgetdatabase.cpp:233
-msgid "Data Table"
+#. i18n: file ./editor/preferences.ui line 439
+#: rc.cpp:665
+#, no-c-format
+msgid "Look for the documentation path."
 msgstr ""
 
-#: editor/widgetdatabase.cpp:241
-msgid "Line Edit"
-msgstr "Golygu Llinell"
+#. i18n: file ./editor/preferences.ui line 451
+#: rc.cpp:668
+#, no-c-format
+msgid "&Toolbars"
+msgstr "&Barrau Offer:"
 
-#: editor/widgetdatabase.cpp:248
-msgid "Spin Box"
+#. i18n: file ./editor/preferences.ui line 468
+#: rc.cpp:671
+#, no-c-format
+msgid "Show &big icons"
 msgstr ""
 
-#: editor/widgetdatabase.cpp:255
-msgid "Date Edit"
+#. i18n: file ./editor/preferences.ui line 471
+#: rc.cpp:674
+#, no-c-format
+msgid "Big Icons"
 msgstr ""
 
-#: editor/widgetdatabase.cpp:263
-msgid "Time Edit"
+#. i18n: file ./editor/preferences.ui line 474
+#: rc.cpp:677
+#, no-c-format
+msgid "Big icons will be used in the toolbars if this is checked."
 msgstr ""
 
-#: editor/widgetdatabase.cpp:271
-msgid "Date-Time Edit"
+#. i18n: file ./editor/preferences.ui line 482
+#: rc.cpp:680
+#, no-c-format
+msgid "Show text lab&els"
 msgstr ""
 
-#: editor/widgetdatabase.cpp:279
-msgid "Multi Line Edit"
+#. i18n: file ./editor/preferences.ui line 485
+#: rc.cpp:683
+#, no-c-format
+msgid "Text Labels"
 msgstr ""
 
-#: editor/widgetdatabase.cpp:286
-msgid "Rich Text Edit"
+#. i18n: file ./editor/preferences.ui line 488
+#: rc.cpp:686
+#, no-c-format
+msgid "Text labels will be usin in the toolbars if this is checked."
 msgstr ""
 
-#: editor/widgetdatabase.cpp:293
-msgid "Combo Box"
+#. i18n: file ./editor/multilineeditor.ui line 38
+#: rc.cpp:704
+#, no-c-format
+msgid "Edit Multiline Edit"
 msgstr ""
 
-#: editor/widgetdatabase.cpp:300 editor/widgetdatabase.cpp:641
-msgid "Slider"
+#. i18n: file ./editor/multilineeditor.ui line 46
+#: rc.cpp:707
+#, no-c-format
+msgid ""
+"<b>Edit Multiline Edit</b>"
+"<p>Enter the text and click the <b>OK</b>-Button to apply the changes.</p>"
 msgstr ""
 
-#: editor/widgetdatabase.cpp:307
-msgid "Scrollbar"
-msgstr "Bar Sgrolio"
-
-#: editor/widgetdatabase.cpp:314
-msgid "Dial"
-msgstr "Deialu"
-
-#: editor/widgetdatabase.cpp:321
-msgid "Label"
-msgstr "Label"
-
-#: editor/widgetdatabase.cpp:328
-msgid "LCD Number"
+#. i18n: file ./editor/multilineeditor.ui line 84
+#: rc.cpp:713
+#, no-c-format
+msgid "Enter your text here."
 msgstr ""
 
-#: editor/widgetdatabase.cpp:335
-msgid "Progress Bar"
+#. i18n: file ./editor/functions.ui line 16
+#: rc.cpp:737
+#, no-c-format
+msgid "Function Browser"
 msgstr ""
 
-#: editor/widgetdatabase.cpp:342
-msgid "Text View"
-msgstr "Golwg Testun"
+#. i18n: file ./editor/functions.ui line 38
+#: rc.cpp:740
+#, no-c-format
+msgid "Description:"
+msgstr "Disgrifiad:"
 
-#: editor/widgetdatabase.cpp:349 editor/widgetdatabase.cpp:524
-msgid "Text Browser"
-msgstr ""
+#. i18n: file ./editor/functions.ui line 67
+#: rc.cpp:743
+#, no-c-format
+msgid "&Group:"
+msgstr "&Grŵp:"
 
-#: editor/widgetdatabase.cpp:358
-msgid ""
-"The Spacer provides horizontal and vertical spacing to be able to manipulate "
-"the behaviour of layouts."
-msgstr ""
+#. i18n: file ./editor/functions.ui line 97
+#: rc.cpp:746
+#, no-c-format
+msgid "&Function:"
+msgstr "&Ffwythiant"
 
-#: editor/widgetdatabase.cpp:494
-msgid "Text Label"
-msgstr ""
+#. i18n: file ./editor/functions.ui line 129
+#: rc.cpp:749
+#, no-c-format
+msgid "&Parameters"
+msgstr "&Paramedrau"
 
-#: editor/widgetdatabase.cpp:495
-msgid "The Text Label provides a widget to display static text."
+#. i18n: file ./editor/functions.ui line 140
+#: rc.cpp:752
+#, no-c-format
+msgid "Arg3"
 msgstr ""
 
-#: editor/widgetdatabase.cpp:502
-msgid "Pixmap Label"
+#. i18n: file ./editor/functions.ui line 148
+#: rc.cpp:755
+#, no-c-format
+msgid "Arg5"
 msgstr ""
 
-#: editor/widgetdatabase.cpp:503
-msgid "The Pixmap Label provides a widget to display pixmaps."
-msgstr ""
+#. i18n: file ./editor/functions.ui line 190
+#: rc.cpp:758
+#, no-c-format
+msgid "Insert function"
+msgstr "Mewnosod Ffwythiant"
 
-#: editor/widgetdatabase.cpp:510
-msgid "A line edit"
+#. i18n: file ./editor/functions.ui line 198
+#: rc.cpp:761
+#, no-c-format
+msgid "Arg4"
 msgstr ""
 
-#: editor/widgetdatabase.cpp:517
-msgid "A rich text edit"
+#. i18n: file ./editor/functions.ui line 240
+#: rc.cpp:764 rc.cpp:770 rc.cpp:773 rc.cpp:779 rc.cpp:782 rc.cpp:785
+#, no-c-format
+msgid "Quote"
 msgstr ""
 
-#: editor/widgetdatabase.cpp:538
-msgid "A combo box"
+#. i18n: file ./editor/functions.ui line 263
+#: rc.cpp:767
+#, no-c-format
+msgid "Arg1"
 msgstr ""
 
-#: editor/widgetdatabase.cpp:545
-msgid "A tree widget"
+#. i18n: file ./editor/functions.ui line 362
+#: rc.cpp:776
+#, no-c-format
+msgid "Widget:"
 msgstr ""
 
-#: editor/widgetdatabase.cpp:552
-msgid "A table widget"
+#. i18n: file ./editor/functions.ui line 502
+#: rc.cpp:788
+#, no-c-format
+msgid "Arg6"
 msgstr ""
 
-#: editor/widgetdatabase.cpp:559
-msgid "A button that when clicked, execute a command"
+#. i18n: file ./editor/functions.ui line 510
+#: rc.cpp:791
+#, no-c-format
+msgid "Arg2"
 msgstr ""
 
-#: editor/widgetdatabase.cpp:566
-msgid "A button that closes the dialog it is in"
+#. i18n: file ./editor/functions.ui line 623
+#: rc.cpp:800
+#, no-c-format
+msgid "Clear edited text"
 msgstr ""
 
-#: editor/widgetdatabase.cpp:573
-msgid "A listbox showing output of a script"
+#. i18n: file ./editor/functions.ui line 631
+#: rc.cpp:803
+#, no-c-format
+msgid "Inserted &text:"
 msgstr ""
 
-#: editor/widgetdatabase.cpp:580
-msgid ""
-"A widget made up of a line edit and push button, for selecting files and "
-"folders"
-msgstr ""
+#. i18n: file ./editor/createtemplate.ui line 38
+#: editor/mainwindowactions.cpp:806 editor/mainwindowactions.cpp:835
+#: rc.cpp:806
+#, no-c-format
+msgid "Create Template"
+msgstr "Creu Patrymlun"
 
-#: editor/widgetdatabase.cpp:587
-msgid "A check box"
+#. i18n: file ./editor/createtemplate.ui line 61
+#: rc.cpp:809
+#, no-c-format
+msgid "Template &name:"
 msgstr ""
 
-#: editor/widgetdatabase.cpp:594
-msgid "A radio button"
+#. i18n: file ./editor/createtemplate.ui line 76
+#: rc.cpp:812
+#, no-c-format
+msgid "Name of the new template"
 msgstr ""
 
-#: editor/widgetdatabase.cpp:601
-msgid "A widget for grouping buttons together"
+#. i18n: file ./editor/createtemplate.ui line 80
+#: rc.cpp:815
+#, no-c-format
+msgid "Enter the name of the new template"
 msgstr ""
 
-#: editor/widgetdatabase.cpp:609
-msgid "A widget for grouping other widgets together"
+#. i18n: file ./editor/createtemplate.ui line 91
+#: rc.cpp:818
+#, no-c-format
+msgid "Class of the new template"
 msgstr ""
 
-#: editor/widgetdatabase.cpp:617
-msgid "A widget with tabs"
+#. i18n: file ./editor/createtemplate.ui line 95
+#: rc.cpp:821
+#, no-c-format
+msgid ""
+"Enter the name of the class which should be used as the template's base class"
 msgstr ""
 
-#: editor/widgetdatabase.cpp:634
-msgid "A spin box"
-msgstr ""
+#. i18n: file ./editor/createtemplate.ui line 142
+#: rc.cpp:824
+#, no-c-format
+msgid "C&reate"
+msgstr "C&reu"
 
-#: editor/widgetdatabase.cpp:648
-msgid "A small rich text editor"
+#. i18n: file ./editor/createtemplate.ui line 150
+#: rc.cpp:827
+#, no-c-format
+msgid "Creates the new template"
 msgstr ""
 
-#: editor/widgetdatabase.cpp:655
-msgid "A status bar"
+#. i18n: file ./editor/createtemplate.ui line 165
+#: rc.cpp:833
+#, no-c-format
+msgid "Closes the Dialog"
 msgstr ""
 
-#: editor/widgetdatabase.cpp:662
-msgid "A progress bar"
+#. i18n: file ./editor/createtemplate.ui line 178
+#: rc.cpp:836
+#, no-c-format
+msgid "&Baseclass for template:"
 msgstr ""
 
-#: editor/widgetdatabase.cpp:669
-msgid "A hidden script container"
+#. i18n: file ./editor/assoctexteditor.ui line 16
+#: rc.cpp:839
+#, no-c-format
+msgid "Edit Text"
 msgstr ""
 
-#: editor/widgetdatabase.cpp:676
-msgid "A timer for running scripts periodically"
+#. i18n: file ./editor/assoctexteditor.ui line 35
+#: rc.cpp:842
+#, no-c-format
+msgid "&Widget:"
 msgstr ""
 
-#: editor/widgetdatabase.cpp:683
-msgid "A date selection widget"
+#. i18n: file ./editor/assoctexteditor.ui line 67
+#: rc.cpp:848
+#, no-c-format
+msgid "&Text for:"
 msgstr ""
 
-#: editor/pixmapchooser.cpp:947
-msgid "All Pixmaps"
-msgstr ""
+#. i18n: file ./editor/assoctexteditor.ui line 104
+#: rc.cpp:854
+#, no-c-format
+msgid "&Function..."
+msgstr "&Ffwythiant..."
 
-#: editor/pixmapchooser.cpp:950
-msgid ""
-"%1-Pixmaps (%2)\n"
+#. i18n: file ./editor/assoctexteditor.ui line 137
+#: rc.cpp:857
+#, no-c-format
+msgid "Wi&dget:"
 msgstr ""
 
-#: editor/pixmapchooser.cpp:956
-msgid "All Files (*)"
-msgstr ""
+#. i18n: file ./editor/assoctexteditor.ui line 184
+#: rc.cpp:860
+#, no-c-format
+msgid "Fi&le..."
+msgstr "Ff&eil..."
 
 #. i18n: file ./editor/pixmapfunction.ui line 38
-#: editor/pixmapchooser.cpp:964 rc.cpp:1097
+#: editor/pixmapchooser.cpp:964 rc.cpp:863
 #, no-c-format
 msgid "Choose Pixmap"
 msgstr ""
 
-#: editor/actiondnd.cpp:294 editor/actiondnd.cpp:353
-msgid "Delete Toolbar"
-msgstr ""
-
-#: editor/actiondnd.cpp:297 editor/actiondnd.cpp:383
-msgid "Delete Toolbar '%1'"
+#. i18n: file ./editor/pixmapfunction.ui line 61
+#: rc.cpp:866
+#, no-c-format
+msgid "&Enter arguments for loading the pixmap:"
 msgstr ""
 
-#: editor/actiondnd.cpp:348 editor/actiondnd.cpp:1020
-msgid "Delete Separator"
-msgstr ""
+#. i18n: file ./editor/pixmapfunction.ui line 109
+#: rc.cpp:869
+#, fuzzy, no-c-format
+msgid "TQPixmap("
+msgstr "Picsfap"
 
-#. i18n: file ./editor/listboxeditor.ui line 147
-#: editor/actiondnd.cpp:350 editor/actiondnd.cpp:735 editor/actiondnd.cpp:1022
-#: rc.cpp:995 rc.cpp:1046
+#. i18n: file ./editor/pixmapfunction.ui line 573
+#: rc.cpp:872
 #, no-c-format
-msgid "Delete Item"
-msgstr "Dileu Eitem"
+msgid ")"
+msgstr ")"
 
-#: editor/actiondnd.cpp:351 editor/actiondnd.cpp:1023
-msgid "Insert Separator"
-msgstr "Mewnosod Gwahanydd"
+#. i18n: file ./editor/newform.ui line 35
+#: rc.cpp:884
+#, no-c-format
+msgid "New File"
+msgstr "Ffeil newydd"
 
-#: editor/actiondnd.cpp:362 editor/actiondnd.cpp:422 editor/actiondnd.cpp:445
-msgid "Delete Action '%1' From Toolbar '%2'"
+#. i18n: file ./editor/newform.ui line 41
+#: rc.cpp:887
+#, no-c-format
+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 ""
 
-#: editor/actiondnd.cpp:377
-msgid "Add Separator to Toolbar '%1'"
+#. i18n: file ./editor/newform.ui line 109
+#: rc.cpp:896
+#, no-c-format
+msgid "Create a new form using the selected template."
 msgstr ""
 
-#: editor/actiondnd.cpp:464 editor/actiondnd.cpp:545
-msgid "Add Action '%1' to Toolbar '%2'"
+#. i18n: file ./editor/newform.ui line 123
+#: rc.cpp:902
+#, no-c-format
+msgid "Close the dialog without creating a new form."
 msgstr ""
 
-#: editor/actiondnd.cpp:538 editor/actiondnd.cpp:1157
-msgid "Insert/Move Action"
+#. i18n: file ./editor/newform.ui line 145
+#: rc.cpp:905
+#, no-c-format
+msgid "Displays a list of the available templates."
 msgstr ""
 
-#: editor/actiondnd.cpp:539
-msgid ""
-"Action '%1' has already been added to this toolbar.\n"
-"An Action may only occur once in a given toolbar."
+#. i18n: file ./editor/connectioneditor.ui line 35
+#: rc.cpp:908
+#, no-c-format
+msgid "Edit Connections"
 msgstr ""
 
-#: editor/actiondnd.cpp:671
-msgid "Add Widget '%1' to Toolbar '%2'"
+#. i18n: file ./editor/connectioneditor.ui line 41
+#: rc.cpp:911
+#, no-c-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>"
 msgstr ""
 
-#: editor/actiondnd.cpp:736
-msgid "Rename Item..."
-msgstr "Ailenwi Eitem ..."
-
-#: editor/actiondnd.cpp:740
-msgid "Delete Menu '%1'"
-msgstr ""
+#. i18n: file ./editor/connectioneditor.ui line 56
+#: rc.cpp:914
+#, no-c-format
+msgid "Sender"
+msgstr "Anfonwr"
 
-#: editor/actiondnd.cpp:753
-msgid "Rename Menu Item"
-msgstr ""
+#. i18n: file ./editor/connectioneditor.ui line 67
+#: rc.cpp:917
+#, no-c-format
+msgid "Signal"
+msgstr "Arwydd"
 
-#: editor/actiondnd.cpp:753
-msgid "Menu text:"
-msgstr ""
+#. i18n: file ./editor/connectioneditor.ui line 78
+#: rc.cpp:920
+#, no-c-format
+msgid "Receiver"
+msgstr "Derbynnydd"
 
-#: editor/actiondnd.cpp:757
-msgid "Rename Menu '%1' to '%2'"
-msgstr ""
+#. i18n: file ./editor/connectioneditor.ui line 89
+#: rc.cpp:923
+#, no-c-format
+msgid "Slot"
+msgstr "Agen"
 
-#: editor/actiondnd.cpp:881
-msgid "Move Menu '%1'"
+#. i18n: file ./editor/connectioneditor.ui line 111
+#: rc.cpp:926
+#, no-c-format
+msgid "Displays the connections between the sender and the receiver."
 msgstr ""
 
-#: editor/actiondnd.cpp:1030 editor/actiondnd.cpp:1069
-msgid "Delete Action '%1' From Popup Menu '%2'"
+#. i18n: file ./editor/connectioneditor.ui line 119
+#: rc.cpp:929
+#, no-c-format
+msgid ""
+"<b>A list of Q_SLOTS for the receiver.</b>"
+"<p>The Q_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 ""
 
-#: editor/actiondnd.cpp:1040
-msgid "Add Separator to Popup Menu '%1'"
+#. i18n: file ./editor/connectioneditor.ui line 127
+#: rc.cpp:932
+#, no-c-format
+msgid "Displays the list of Q_SIGNALS that the widget emits."
 msgstr ""
 
-#: editor/actiondnd.cpp:1082 editor/actiondnd.cpp:1164
-msgid "Add Action '%1' to Popup Menu '%2'"
+#. i18n: file ./editor/connectioneditor.ui line 143
+#: rc.cpp:935
+#, no-c-format
+msgid "Si&gnals:"
 msgstr ""
 
-#: editor/actiondnd.cpp:1158
-msgid ""
-"Action '%1' has already been added to this menu.\n"
-"An Action may only occur once in a given menu."
+#. i18n: file ./editor/connectioneditor.ui line 183
+#: rc.cpp:938
+#, no-c-format
+msgid "&Slots:"
 msgstr ""
 
-#: editor/connectioneditorimpl.cpp:229
-msgid "Connect/Disconnect the signals and slots of '%1' and '%2'"
-msgstr ""
+#. i18n: file ./editor/connectioneditor.ui line 217
+#: rc.cpp:941
+#, no-c-format
+msgid "&Disconnect"
+msgstr "&Datgysylltu"
 
-#: editor/connectioneditorimpl.cpp:237
-msgid "Remove Connections"
-msgstr ""
+#. i18n: file ./editor/connectioneditor.ui line 220
+#: rc.cpp:944
+#, fuzzy, no-c-format
+msgid "Alt+D"
+msgstr "Alt+C"
 
-#: editor/connectioneditorimpl.cpp:248
-msgid "Add Connections"
+#. i18n: file ./editor/connectioneditor.ui line 226
+#: rc.cpp:947
+#, no-c-format
+msgid "Remove the selected connection"
 msgstr ""
 
-#: editor/hierarchyview.cpp:100
-msgid "(Constructor)"
+#. i18n: file ./editor/connectioneditor.ui line 229
+#: rc.cpp:950
+#, no-c-format
+msgid "Remove the selected connection."
 msgstr ""
 
-#: editor/hierarchyview.cpp:102
-msgid "(Destructor)"
-msgstr ""
+#. i18n: file ./editor/connectioneditor.ui line 257
+#: rc.cpp:956
+#, fuzzy, no-c-format
+msgid "Alt+O"
+msgstr "Alt+C"
 
-#: editor/hierarchyview.cpp:190
-msgid "Name"
-msgstr "Enw"
+#. i18n: file ./editor/connectioneditor.ui line 277
+#: rc.cpp:965
+#, no-c-format
+msgid "Alt+C"
+msgstr "Alt+C"
 
-#: editor/hierarchyview.cpp:191
-msgid "Class"
-msgstr "Dosbarth"
+#. i18n: file ./editor/connectioneditor.ui line 318
+#: rc.cpp:971
+#, no-c-format
+msgid "Connec&tions:"
+msgstr "Cysyll&tiadau :"
 
-#: editor/hierarchyview.cpp:335
-msgid "Database"
-msgstr "Cronfa ddata"
+#. i18n: file ./editor/connectioneditor.ui line 346
+#: rc.cpp:974
+#, no-c-format
+msgid "Co&nnect"
+msgstr "Cy&sylltu"
 
-#: editor/choosewidgetimpl.cpp:38 editor/hierarchyview.cpp:608
-#: editor/mainwindow.cpp:268
-msgid "Widgets"
-msgstr "Celfigion"
+#. i18n: file ./editor/connectioneditor.ui line 349
+#: rc.cpp:977
+#, fuzzy, no-c-format
+msgid "Alt+N"
+msgstr "Alt+C"
 
-#: editor/assoctexteditorimpl.cpp:143
-#, fuzzy
-msgid "&Highlighting"
-msgstr "Amlygu"
+#. i18n: file ./editor/connectioneditor.ui line 355
+#: rc.cpp:980
+#, no-c-format
+msgid "Create connection"
+msgstr ""
 
-#: editor/assoctexteditorimpl.cpp:187
-#, fuzzy
-msgid "Edit text"
-msgstr "Golygu %1"
+#. i18n: file ./editor/connectioneditor.ui line 358
+#: rc.cpp:983
+#, no-c-format
+msgid "Create a connection between a signal and a slot."
+msgstr ""
 
-#: editor/assoctexteditorimpl.cpp:253
-msgid "Edit text - read only mode"
+#. i18n: file ./editor/paletteeditoradvanced.ui line 38
+#: rc.cpp:986
+#, no-c-format
+msgid "Tune Palette"
 msgstr ""
 
-#: editor/assoctexteditorimpl.cpp:271
-msgid "Set the 'text association' of '%1'"
+#. i18n: file ./editor/paletteeditoradvanced.ui line 44
+#: rc.cpp:989
+#, no-c-format
+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 ""
 
-#: editor/assoctexteditorimpl.cpp:281
-msgid "Set the 'population text' of '%1'"
+#. i18n: file ./editor/paletteeditoradvanced.ui line 122
+#: rc.cpp:1004
+#, no-c-format
+msgid "Auto"
+msgstr "Ymysgogol"
+
+#. i18n: file ./editor/paletteeditoradvanced.ui line 139
+#: rc.cpp:1007
+#, no-c-format
+msgid "Build the inactive palette from the active palette."
 msgstr ""
 
-#: editor/assoctexteditorimpl.cpp:430
-msgid "<qt>Cannot open file<br><b>%1</b></qt"
+#. i18n: file ./editor/paletteeditoradvanced.ui line 150
+#: rc.cpp:1010
+#, no-c-format
+msgid "Build the disabled palette from the active palette."
 msgstr ""
 
-#: editor/listvieweditorimpl.cpp:66
-msgid "Edit Items and Columns of '%1'"
+#. i18n: file ./editor/paletteeditoradvanced.ui line 163
+#: rc.cpp:1013
+#, no-c-format
+msgid "Central Color &Roles"
 msgstr ""
 
-#: editor/listvieweditorimpl.cpp:225
-msgid "New Column"
-msgstr "Colofn Newydd"
+#. i18n: file ./editor/paletteeditoradvanced.ui line 178
+#: rc.cpp:1016
+#, no-c-format
+msgid "Background"
+msgstr "Cefndir"
 
-#. i18n: file ./editor/listvieweditor.ui line 62
-#: editor/listvieweditorimpl.cpp:570 rc.cpp:629
+#. i18n: file ./editor/paletteeditoradvanced.ui line 183
+#: rc.cpp:1019
 #, no-c-format
-msgid "&Items"
-msgstr "&Eitemau"
+msgid "Foreground"
+msgstr "Blaendir"
 
-#: editor/mainwindow.cpp:141
-msgid "Welcome to the Kommander Editor"
-msgstr ""
+#. i18n: file ./editor/paletteeditoradvanced.ui line 188
+#: rc.cpp:1022
+#, no-c-format
+msgid "Button"
+msgstr "Botwm"
 
-#: editor/mainwindow.cpp:148
-msgid "Layout"
-msgstr "Cynllun"
+#. i18n: file ./editor/paletteeditoradvanced.ui line 193
+#: rc.cpp:1025
+#, no-c-format
+msgid "Base"
+msgstr "Bôn"
 
-#: 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 ""
+#. i18n: file ./editor/paletteeditoradvanced.ui line 198
+#: editor/mainwindow.cpp:1153 editor/mainwindow.cpp:1639
+#: editor/multilineeditorimpl.cpp:68 rc.cpp:1028
+#, no-c-format
+msgid "Text"
+msgstr "Testun"
 
-#: editor/mainwindow.cpp:271
-msgid "Object Explorer"
+#. i18n: file ./editor/paletteeditoradvanced.ui line 203
+#: rc.cpp:1031
+#, no-c-format
+msgid "BrightText"
 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>"
+#. i18n: file ./editor/paletteeditoradvanced.ui line 208
+#: rc.cpp:1034
+#, no-c-format
+msgid "ButtonText"
 msgstr ""
 
-#: editor/mainwindow.cpp:284 editor/mainwindow.cpp:293
-#, fuzzy
-msgid "Dialogs"
-msgstr "Ymgom"
+#. i18n: file ./editor/paletteeditoradvanced.ui line 213
+#: rc.cpp:1037
+#, no-c-format
+msgid "Highlight"
+msgstr "Amlygu"
 
-#: editor/mainwindow.cpp:287
-msgid "Start typing the buffer you want to switch to here (ALT+B)"
+#. i18n: file ./editor/paletteeditoradvanced.ui line 218
+#: rc.cpp:1040
+#, no-c-format
+msgid "HighlightText"
 msgstr ""
 
-#: editor/mainwindow.cpp:294
-msgid ""
-"<h2>The File Overview Window</h2>"
-"<p>The File Overview Window displays all open dialogs.</p>"
+#. i18n: file ./editor/paletteeditoradvanced.ui line 223
+#: rc.cpp:1043
+#, no-c-format
+msgid "Link"
+msgstr "Cyswllt"
+
+#. i18n: file ./editor/paletteeditoradvanced.ui line 228
+#: rc.cpp:1046
+#, no-c-format
+msgid "LinkVisited"
 msgstr ""
 
-#: editor/mainwindow.cpp:305
-msgid "Action Editor"
+#. i18n: file ./editor/paletteeditoradvanced.ui line 235
+#: rc.cpp:1049
+#, no-c-format
+msgid "Choose the central color role"
 msgstr ""
 
-#: editor/mainwindow.cpp:306
+#. i18n: file ./editor/paletteeditoradvanced.ui line 238
+#: rc.cpp:1052
+#, no-c-format
 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>"
+"<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 forground 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 ""
 
-#: editor/mainwindow.cpp:316 editor/mainwindow.cpp:319
-msgid "Message Log"
+#. i18n: file ./editor/paletteeditoradvanced.ui line 285
+#: rc.cpp:1055
+#, no-c-format
+msgid "Choose pi&xmap:"
 msgstr ""
 
-#: editor/mainwindow.cpp:395 editor/mainwindow.cpp:449
-msgid "<qt>Cannot create backup file <i>%1</i>.</qt>"
+#. i18n: file ./editor/paletteeditoradvanced.ui line 313
+#: rc.cpp:1061
+#, no-c-format
+msgid "Choose a pixmap file for the selected central color role."
 msgstr ""
 
-#: editor/mainwindow.cpp:406
-msgid "There is a dialog already running."
+#. i18n: file ./editor/paletteeditoradvanced.ui line 335
+#: rc.cpp:1064
+#, no-c-format
+msgid "&Select color:"
 msgstr ""
 
-#: editor/mainwindow.cpp:406
-msgid "Run"
-msgstr "Rhedeg"
-
-#: editor/mainwindow.cpp:439
-msgid "<qt>Cannot create temporary file <i>%1</i>.</qt>"
+#. i18n: file ./editor/paletteeditoradvanced.ui line 363
+#: rc.cpp:1070
+#, no-c-format
+msgid "Choose a color for the selected central color role."
 msgstr ""
 
-#: editor/mainwindow.cpp:786
-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>."
+#. i18n: file ./editor/paletteeditoradvanced.ui line 375
+#: rc.cpp:1073
+#, no-c-format
+msgid "3D Shadow &Effects"
 msgstr ""
 
-#: editor/mainwindow.cpp:891
-#, c-format
-msgid "&Undo: %1"
-msgstr "&Dadwneud: %1"
-
-#: editor/mainwindow.cpp:895
-#, c-format
-msgid "&Redo: %1"
-msgstr "&Ail-wneud: %1"
-
-#: editor/mainwindow.cpp:974
-msgid "Choose Pixmap..."
+#. i18n: file ./editor/paletteeditoradvanced.ui line 406
+#: rc.cpp:1076
+#, no-c-format
+msgid "Build &from button color:"
 msgstr ""
 
-#: editor/mainwindow.cpp:978
-msgid "Edit Text..."
+#. i18n: file ./editor/paletteeditoradvanced.ui line 412
+#: rc.cpp:1079
+#, no-c-format
+msgid "Generate shadings"
 msgstr ""
 
-#: editor/mainwindow.cpp:982
-msgid "Edit Title..."
+#. i18n: file ./editor/paletteeditoradvanced.ui line 415
+#: rc.cpp:1082
+#, no-c-format
+msgid "Check to let 3D-effect colors be calculated from the button-color."
 msgstr ""
 
-#: editor/mainwindow.cpp:986 editor/mainwindow.cpp:1064
-msgid "Edit Page Title..."
-msgstr ""
+#. i18n: file ./editor/paletteeditoradvanced.ui line 421
+#: rc.cpp:1085
+#, no-c-format
+msgid "Light"
+msgstr "Golau"
 
-#: editor/mainwindow.cpp:1002 editor/mainwindow.cpp:1047
-msgid "Edit Kommander Text..."
+#. i18n: file ./editor/paletteeditoradvanced.ui line 426
+#: rc.cpp:1088
+#, no-c-format
+msgid "Midlight"
 msgstr ""
 
-#: editor/mainwindow.cpp:1011 editor/mainwindow.cpp:1021
-#: editor/mainwindow.cpp:1057 editor/mainwindow.cpp:1497
-msgid "Delete Page"
-msgstr "Dileu Tudalen"
+#. i18n: file ./editor/paletteeditoradvanced.ui line 431
+#: rc.cpp:1091
+#, no-c-format
+msgid "Mid"
+msgstr "Canol"
 
-#: editor/mainwindow.cpp:1014 editor/mainwindow.cpp:1024
-#: editor/mainwindow.cpp:1061 editor/mainwindow.cpp:1496
-msgid "Add Page"
-msgstr ""
+#. i18n: file ./editor/paletteeditoradvanced.ui line 436
+#: rc.cpp:1094
+#, no-c-format
+msgid "Dark"
+msgstr "Tywyll"
 
-#: editor/mainwindow.cpp:1031
-msgid "Edit..."
-msgstr "Golygu..."
+#. i18n: file ./editor/paletteeditoradvanced.ui line 441
+#: rc.cpp:1097
+#, no-c-format
+msgid "Shadow"
+msgstr "Cysgod"
 
-#: editor/mainwindow.cpp:1067
-msgid "Edit Pages..."
+#. i18n: file ./editor/paletteeditoradvanced.ui line 448
+#: rc.cpp:1100
+#, no-c-format
+msgid "Choose 3D-effect color role"
 msgstr ""
 
-#: editor/mainwindow.cpp:1073
-msgid "Add Menu Item"
+#. i18n: file ./editor/paletteeditoradvanced.ui line 451
+#: rc.cpp:1103
+#, no-c-format
+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>"
 msgstr ""
 
-#: editor/mainwindow.cpp:1075
-msgid "Add Toolbar"
+#. i18n: file ./editor/paletteeditoradvanced.ui line 506
+#: rc.cpp:1106
+#, no-c-format
+msgid "Select co&lor:"
 msgstr ""
 
-#: editor/mainwindow.cpp:1089 editor/mainwindow.cpp:1575
-msgid "New text:"
-msgstr "Testun Newydd :"
-
-#: editor/mainwindow.cpp:1092
-msgid "Set the 'text' of '%1'"
+#. i18n: file ./editor/paletteeditoradvanced.ui line 534
+#: rc.cpp:1112
+#, no-c-format
+msgid "Choose a color for the selected effect color role."
 msgstr ""
 
-#: editor/mainwindow.cpp:1102 editor/mainwindow.cpp:1591
-msgid "Title"
-msgstr "Teitl"
-
-#: editor/mainwindow.cpp:1102 editor/mainwindow.cpp:1591
-msgid "New title:"
-msgstr "Teitl newydd:"
-
-#: editor/mainwindow.cpp:1104
-msgid "Set the 'title' of '%1'"
+#. i18n: file ./editor/listvieweditor.ui line 35
+#: rc.cpp:1130
+#, no-c-format
+msgid "Edit Listview"
 msgstr ""
 
-#: editor/mainwindow.cpp:1116
-msgid "Set the 'pageTitle' of '%1'"
+#. i18n: file ./editor/listvieweditor.ui line 41
+#: rc.cpp:1133
+#, no-c-format
+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>"
 msgstr ""
 
-#: editor/mainwindow.cpp:1128
-msgid "Set the 'pixmap' of '%1'"
-msgstr ""
+#. i18n: file ./editor/listvieweditor.ui line 62
+#: editor/listvieweditorimpl.cpp:570 rc.cpp:1136
+#, no-c-format
+msgid "&Items"
+msgstr "&Eitemau"
 
-#: editor/mainwindow.cpp:1239
-msgid "Add Toolbar to '%1'"
+#. i18n: file ./editor/listvieweditor.ui line 85
+#: rc.cpp:1145
+#, no-c-format
+msgid "<b>Deletes the selected item.</b><p>Any sub-items are also deleted.</p>"
 msgstr ""
 
-#: editor/mainwindow.cpp:1243
-msgid "Add Menu to '%1'"
+#. i18n: file ./editor/listvieweditor.ui line 99
+#: rc.cpp:1148
+#, no-c-format
+msgid "Item &Properties"
 msgstr ""
 
-#: editor/mainwindow.cpp:1560
-msgid "Edit %1..."
-msgstr "Golygu %1 ..."
+#. i18n: file ./editor/listvieweditor.ui line 116
+#: rc.cpp:1151
+#, no-c-format
+msgid "Pi&xmap:"
+msgstr "Pi&csfap :"
 
-#: editor/mainwindow.cpp:1578
-msgid "Set the 'text' of '%2'"
+#. i18n: file ./editor/listvieweditor.ui line 147
+#: rc.cpp:1160
+#, no-c-format
+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 ""
 
-#: editor/mainwindow.cpp:1593
-msgid "Set the 'title' of '%2'"
+#. i18n: file ./editor/listvieweditor.ui line 155
+#: rc.cpp:1163
+#, no-c-format
+msgid "Change column"
 msgstr ""
 
-#: editor/mainwindow.cpp:1681
+#. i18n: file ./editor/listvieweditor.ui line 158
+#: rc.cpp:1166
+#, no-c-format
 msgid ""
-"Kommander found some temporary saved files, which were\n"
-"written when Kommander crashed last time. Do you want to\n"
-"load these files?"
+"<b>Select the current column.</b>"
+"<p>The item's text and pixmap will be changed for the current column</p>"
 msgstr ""
 
-#: editor/mainwindow.cpp:1683
-msgid "Restoring Last Session"
+#. i18n: file ./editor/listvieweditor.ui line 166
+#: rc.cpp:1169
+#, no-c-format
+msgid "Colu&mn:"
+msgstr "Colo&fn:"
+
+#. i18n: file ./editor/listvieweditor.ui line 252
+#: rc.cpp:1196
+#, no-c-format
+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>"
 msgstr ""
 
-#: editor/mainwindow.cpp:1683
-msgid "Load"
-msgstr "Llwytho"
+#. i18n: file ./editor/listvieweditor.ui line 268
+#: rc.cpp:1202
+#, no-c-format
+msgid "New &Subitem"
+msgstr "&Is-eitem Newydd"
 
-#: editor/mainwindow.cpp:1683
-msgid "Do Not Load"
+#. i18n: file ./editor/listvieweditor.ui line 271
+#: rc.cpp:1205
+#, no-c-format
+msgid "Add a subitem"
 msgstr ""
 
-#: editor/mainwindow.cpp:1736
-msgid "There is no help available for this dialog at the moment."
+#. i18n: file ./editor/listvieweditor.ui line 274
+#: rc.cpp:1208
+#, no-c-format
+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>"
 msgstr ""
 
-#: editor/mainwindow.cpp:1750
-msgid "<qt>Could not open file:<br><b>%1</b><br>File does not exist.</qt>"
+#. i18n: file ./editor/listvieweditor.ui line 308
+#: rc.cpp:1214
+#, no-c-format
+msgid ""
+"<b>Move the selected item up.</b>"
+"<p>The item will be moved within its level in the hierarchy.</p>"
 msgstr ""
 
-#: editor/mainwindow.cpp:1751
-msgid "Open File"
-msgstr "Agor Ffeil"
-
-#: editor/formwindow.cpp:302
-msgid "&Horizontal"
-msgstr "&Llorweddol"
+#. i18n: file ./editor/listvieweditor.ui line 325
+#: rc.cpp:1220
+#, no-c-format
+msgid ""
+"<b>Move the selected item down.</b>"
+"<p>The item will be moved within its level in the hierarchy.</p>"
+msgstr ""
 
-#: editor/formwindow.cpp:303
-msgid "&Vertical"
-msgstr "&Fertigol"
+#. i18n: file ./editor/listvieweditor.ui line 339
+#: rc.cpp:1223
+#, no-c-format
+msgid "Move left"
+msgstr "Symud i'r Chwith"
 
-#: editor/formwindow.cpp:317 editor/formwindow.cpp:425
+#. i18n: file ./editor/listvieweditor.ui line 342
+#: rc.cpp:1226
+#, no-c-format
 msgid ""
-"<b>A %1 (custom widget)</b> "
-"<p>Click <b>Edit Custom Widgets...</b> in the <b>Tools|Custom</b> "
-"menu to add and change custom widgets. You can add properties as well as "
-"signals and slots to integrate custom widgets into <i>Qt Designer</i>"
-", and provide a pixmap which will be used to represent the widget on the "
-"form.</p>"
+"<b>Move the selected item one level up.</b>"
+"<p>This will also change the level of the item's sub-items.</p>"
 msgstr ""
 
-#: editor/formwindow.cpp:324 editor/formwindow.cpp:432
-msgid "A %1 (custom widget)"
-msgstr ""
+#. i18n: file ./editor/listvieweditor.ui line 356
+#: rc.cpp:1229
+#, no-c-format
+msgid "Move right"
+msgstr "Symud i'r Dde"
 
-#: editor/formwindow.cpp:331 editor/formwindow.cpp:439
-msgid "<b>A %1</b><p>%2</p>"
+#. i18n: file ./editor/listvieweditor.ui line 359
+#: rc.cpp:1232
+#, no-c-format
+msgid ""
+"<b>Move the selected item one level down.</b>"
+"<p>This will also change the level of the item's sub-items.</p>"
 msgstr ""
 
-#: editor/formwindow.cpp:384
-msgid "Reparent Widgets"
+#. i18n: file ./editor/listvieweditor.ui line 386
+#: rc.cpp:1238
+#, no-c-format
+msgid "Column Properties"
 msgstr ""
 
-#: editor/formwindow.cpp:390 editor/formwindow.cpp:396
-#: editor/formwindow.cpp:407
-#, c-format
-msgid "Insert %1"
-msgstr "Mewnosod %1"
-
-#: editor/formwindow.cpp:597
-msgid "Connect '%1' with..."
+#. i18n: file ./editor/listvieweditor.ui line 437
+#: rc.cpp:1250
+#, no-c-format
+msgid "Delete the pixmap of the selected column."
 msgstr ""
 
-#: editor/formwindow.cpp:620 editor/formwindow.cpp:676
-msgid "Change Tab Order"
+#. i18n: file ./editor/listvieweditor.ui line 457
+#: rc.cpp:1259
+#, no-c-format
+msgid ""
+"<b>Select a pixmap file for the selected column.</b>"
+"<p>The pixmap will be displayed in the header of the listview.</p>"
 msgstr ""
 
-#: editor/formwindow.cpp:806
-msgid "Connect '%1' to '%2'"
+#. i18n: file ./editor/listvieweditor.ui line 482
+#: rc.cpp:1265
+#, no-c-format
+msgid "Enter column text"
 msgstr ""
 
-#: editor/formwindow.cpp:868 editor/formwindow.cpp:957
+#. i18n: file ./editor/listvieweditor.ui line 485
+#: rc.cpp:1268
+#, no-c-format
 msgid ""
-"You tried to insert a widget into the layout Container Widget '%1'.\n"
-"This is not possible. In order to insert the widget, the layout of '%1'\n"
-"must first be broken.\n"
-"Break the layout or cancel the operation?"
+"<b>Enter the text for the selected column.</b>"
+"<p>The text will be displayed in the header of the listview.</p>"
 msgstr ""
 
-#: editor/formwindow.cpp:874 editor/formwindow.cpp:964
-msgid "Inserting Widget"
+#. i18n: file ./editor/listvieweditor.ui line 493
+#: rc.cpp:1271
+#, no-c-format
+msgid "Clicka&ble"
+msgstr "Clicad&wy"
+
+#. i18n: file ./editor/listvieweditor.ui line 496
+#: rc.cpp:1274
+#, no-c-format
+msgid ""
+"If this option is checked, the selected column will react to mouse clicks on "
+"the header."
 msgstr ""
 
-#: editor/formwindow.cpp:875 editor/formwindow.cpp:965
-msgid "&Break Layout"
-msgstr "&Torri'r Haenlun"
+#. i18n: file ./editor/listvieweditor.ui line 504
+#: rc.cpp:1277
+#, no-c-format
+msgid "Re&sizable"
+msgstr "Ge&llir newid ei faint"
 
-#: editor/formwindow.cpp:1224 editor/formwindow.cpp:1267
-msgid "Use Size Hint"
+#. i18n: file ./editor/listvieweditor.ui line 507
+#: rc.cpp:1280
+#, no-c-format
+msgid "The column's width will be resizeable if this option is checked."
 msgstr ""
 
-#: editor/formwindow.cpp:1661
-msgid "Click widgets to change the tab order..."
-msgstr ""
+#. i18n: file ./editor/listvieweditor.ui line 520
+#: rc.cpp:1286
+#, no-c-format
+msgid "Delete column"
+msgstr "Dileu Colofn"
 
-#: editor/formwindow.cpp:1670
-msgid "Drag a line to create a connection..."
+#. i18n: file ./editor/listvieweditor.ui line 523
+#: rc.cpp:1289
+#, no-c-format
+msgid "Deletes the selected Column."
 msgstr ""
 
-#: editor/formwindow.cpp:1676
-msgid "Click on the form to insert a %1..."
+#. i18n: file ./editor/listvieweditor.ui line 540
+#: rc.cpp:1295
+#, no-c-format
+msgid ""
+"<b>Move the selected item down.</b>"
+"<p>The top-most column will be the first column in the list.</p>"
 msgstr ""
 
-#: editor/formwindow.cpp:1784
-msgid "Lower"
-msgstr "Gostwng"
+#. i18n: file ./editor/listvieweditor.ui line 551
+#: rc.cpp:1301
+#, no-c-format
+msgid "Add a Column"
+msgstr ""
 
-#: editor/formwindow.cpp:1847
-msgid "Accelerator '%1' is used %2 times."
+#. i18n: file ./editor/listvieweditor.ui line 554
+#: rc.cpp:1304
+#, no-c-format
+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>"
 msgstr ""
 
-#: editor/formwindow.cpp:1848
-msgid "&Select"
-msgstr "&Detholi"
+#. i18n: file ./editor/listvieweditor.ui line 571
+#: rc.cpp:1310
+#, no-c-format
+msgid ""
+"<b>Move the selected item up.</b>"
+"<p>The top-most column will be the first column in the list.</p>"
+msgstr ""
 
-#: editor/formwindow.cpp:1859
-msgid "No accelerator is used more than once."
+#. i18n: file ./editor/listvieweditor.ui line 579
+#: rc.cpp:1313
+#, no-c-format
+msgid "The list of columns."
 msgstr ""
 
-#: editor/formwindow.cpp:1870
-msgid "Raise"
-msgstr "Codi"
+#. i18n: file ./editor/formsettings.ui line 35
+#: rc.cpp:1337
+#, no-c-format
+msgid "Form Settings"
+msgstr ""
 
-#: editor/formwindow.cpp:1930
-msgid "Lay Out Horizontally (in splitter)"
+#. i18n: file ./editor/formsettings.ui line 41
+#: rc.cpp:1340
+#, no-c-format
+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>"
 msgstr ""
 
-#: editor/formwindow.cpp:1941
-msgid "Lay Out Vertically (in splitter)"
+#. i18n: file ./editor/formsettings.ui line 122
+#: rc.cpp:1355
+#, no-c-format
+msgid "La&youts"
 msgstr ""
 
-#: editor/formwindow.cpp:1975
-msgid "Lay Out Children Horizontally"
+#. i18n: file ./editor/formsettings.ui line 155
+#: rc.cpp:1358
+#, no-c-format
+msgid "Default mar&gin:"
 msgstr ""
 
-#: editor/formwindow.cpp:1996
-msgid "Lay Out Children Vertically"
+#. i18n: file ./editor/formsettings.ui line 166
+#: rc.cpp:1361
+#, no-c-format
+msgid "D&efault spacing:"
 msgstr ""
 
-#: editor/formwindow.cpp:2020
-msgid "Lay Out Children in a Grid"
+#. i18n: file ./editor/formsettings.ui line 202
+#: rc.cpp:1367
+#, no-c-format
+msgid "Enter a comment about the form."
 msgstr ""
 
-#: editor/functionsimpl.cpp:83 plugin/specialinformation.cpp:383
-#, fuzzy
-msgid "Slots"
-msgstr "Agen"
+#. i18n: file ./editor/formsettings.ui line 227
+#: rc.cpp:1370
+#, no-c-format
+msgid "Co&mment:"
+msgstr "S&ylwad:"
 
-#: editor/functionsimpl.cpp:102
-#, fuzzy
-msgid "Functions"
-msgstr "&Ffwythiant"
+#. i18n: file ./editor/formsettings.ui line 238
+#: rc.cpp:1373
+#, no-c-format
+msgid "&License:"
+msgstr "&Trwydded:"
 
-#: editor/functionsimpl.cpp:198
-msgid ""
-"To learn more about the slot, look at the documentation of the base Qt/TDE "
-"class, most probably <i>%1</i>."
-msgstr ""
+#. i18n: file ./editor/formsettings.ui line 249
+#: rc.cpp:1376 rc.cpp:1388 rc.cpp:1394
+#, no-c-format
+msgid "Enter your name"
+msgstr "Rhowch eich Enw"
 
-#: editor/functionsimpl.cpp:202 editor/functionsimpl.cpp:225
-msgid ""
-"<qt>"
-"<h3>%1</h3>"
-"<p><b>Description:</b> %2\n"
-"<p><b>Syntax:</b> <i>%3</i>%4</qt>"
-msgstr ""
+#. i18n: file ./editor/formsettings.ui line 252
+#: rc.cpp:1379 rc.cpp:1391 rc.cpp:1397
+#, no-c-format
+msgid "Enter your name."
+msgstr "Rhowch eich Enw."
 
-#: editor/functionsimpl.cpp:214
-msgid "<p>Parameters are not obligatory."
-msgstr ""
+#. i18n: file ./editor/formsettings.ui line 260
+#: rc.cpp:1382
+#, no-c-format
+msgid "&Version:"
+msgstr "Fe&rsiwn:"
 
-#: editor/functionsimpl.cpp:217
-#, c-format
-msgid ""
-"_n: "
-"<p>Only first argument is obligatory.\n"
-"<p>Only first %n arguments are obligatory."
-msgstr ""
+#. i18n: file ./editor/formsettings.ui line 271
+#: rc.cpp:1385
+#, no-c-format
+msgid "A&uthor:"
+msgstr "A&wdur:"
 
 #: plugin/specialinformation.cpp:286
 msgid "Inserts the item if it will not create a duplicate."
@@ -2101,49 +2356,68 @@ msgstr ""
 msgid "Returns true if the widget has focus."
 msgstr ""
 
+#: plugin/specialinformation.cpp:383
+msgid "Gets the widget's background color."
+msgstr ""
+
+#: plugin/specialinformation.cpp:385
+msgid ""
+"Sets the widget's background color. Colors can be by name, like blue, or in hex "
+"like #0000ff for blue. Use the color dialog or a color picker if unsure."
+msgstr ""
+
 #: plugin/specialinformation.cpp:387
+msgid "See if widget has been modified."
+msgstr ""
+
+#: editor/functionsimpl.cpp:83 plugin/specialinformation.cpp:389
+#, fuzzy
+msgid "Slots"
+msgstr "Agen"
+
+#: plugin/specialinformation.cpp:393
 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 ""
 
-#: plugin/specialinformation.cpp:389
+#: plugin/specialinformation.cpp:395
 msgid ""
 "Returns selected text or text of current item. This is deprecated for <i>"
 "@mywidget.selected</i>."
 msgstr ""
 
-#: plugin/specialinformation.cpp:391
+#: plugin/specialinformation.cpp:397
 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 ""
 
-#: plugin/specialinformation.cpp:393
+#: plugin/specialinformation.cpp:399
 msgid "Returns the pid (process ID) of the current process."
 msgstr ""
 
-#: plugin/specialinformation.cpp:395
+#: plugin/specialinformation.cpp:401
 msgid ""
 "Returns DCOP identifier of current process. This is shorthand for <i>"
 "kmdr-executor-@pid</i>."
 msgstr ""
 
-#: plugin/specialinformation.cpp:398
+#: plugin/specialinformation.cpp:404
 msgid "Returns the pid of the parent Kommander window."
 msgstr ""
 
-#: plugin/specialinformation.cpp:400
+#: plugin/specialinformation.cpp:406
 msgid "Writes <i>text</i> on stderr."
 msgstr ""
 
-#: plugin/specialinformation.cpp:402
+#: plugin/specialinformation.cpp:408
 msgid "Writes <i>text</i> on standard output."
 msgstr ""
 
-#: plugin/specialinformation.cpp:404
+#: plugin/specialinformation.cpp:410
 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 "
@@ -2152,21 +2426,21 @@ msgid ""
 "be used and will return a value to the main script, which may be unexpected.</i>"
 msgstr ""
 
-#: plugin/specialinformation.cpp:406
+#: plugin/specialinformation.cpp:412
 msgid ""
 "Returns value of an environment (shell) variable. Do not use <i>$</i> "
 "in the name. For example, <i>@env(PATH)</i>."
 msgstr ""
 
-#: plugin/specialinformation.cpp:408 plugin/specialinformation.cpp:410
+#: plugin/specialinformation.cpp:414 plugin/specialinformation.cpp:416
 msgid "Executes an external shell command."
 msgstr ""
 
-#: plugin/specialinformation.cpp:412
+#: plugin/specialinformation.cpp:418
 msgid "Parses an expression and returns computed value."
 msgstr ""
 
-#: plugin/specialinformation.cpp:414
+#: plugin/specialinformation.cpp:420
 msgid ""
 "Executes loop: values from <i>items</i> list (passed as EOL-separated string) "
 "are assigned to the variable. "
@@ -2180,7 +2454,7 @@ msgid ""
 "<br>end "
 msgstr ""
 
-#: plugin/specialinformation.cpp:416
+#: plugin/specialinformation.cpp:422
 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 then "
@@ -2195,17 +2469,17 @@ msgid ""
 "<br>end</i>."
 msgstr ""
 
-#: plugin/specialinformation.cpp:418
+#: plugin/specialinformation.cpp:424
 msgid "Returns the value of a global variable."
 msgstr ""
 
-#: plugin/specialinformation.cpp:420
+#: plugin/specialinformation.cpp:426
 msgid ""
 "Translates the string into the current language. Texts in GUI would be "
 "automatically extracted for translation."
 msgstr ""
 
-#: plugin/specialinformation.cpp:422
+#: plugin/specialinformation.cpp:428
 msgid ""
 "Executes block if expression is true (non-zero number or non-empty string.) "
 "<p><b>Old</b>Close with <b>@endif</b></p>"
@@ -2219,28 +2493,28 @@ msgid ""
 "<br>endif</p>"
 msgstr ""
 
-#: plugin/specialinformation.cpp:424
+#: plugin/specialinformation.cpp:430
 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>"
 msgstr ""
 
-#: plugin/specialinformation.cpp:426
+#: plugin/specialinformation.cpp:432
 msgid "Reads setting from configration file for this dialog."
 msgstr ""
 
-#: plugin/specialinformation.cpp:428
+#: plugin/specialinformation.cpp:434
 msgid ""
 "Sets the value of a global variable. Global variables exist for the life of the "
 "Kommander window."
 msgstr ""
 
-#: plugin/specialinformation.cpp:430
+#: plugin/specialinformation.cpp:436
 msgid "Stores setting in configuration file for this dialog."
 msgstr ""
 
-#: plugin/specialinformation.cpp:432
+#: plugin/specialinformation.cpp:438
 msgid ""
 "Begin of <b>switch</b> block. Following <b>case</b> values are compared to <i>"
 "expression</i>."
@@ -2249,2502 +2523,2385 @@ msgid ""
 "<br>@end"
 msgstr ""
 
-#: plugin/specialinformation.cpp:434
+#: plugin/specialinformation.cpp:440
 msgid "Executes an external DCOP call."
 msgstr ""
 
-#: plugin/specialinformation.cpp:436
+#: plugin/specialinformation.cpp:442
 msgid "Adds a comment to EOL that Kommander will not parse"
 msgstr ""
 
-#: plugin/specialinformation.cpp:438
+#: plugin/specialinformation.cpp:444
 msgid ""
 "Creates a new widget with the specified type and as the child of parent."
 msgstr ""
 
-#: plugin/specialinformation.cpp:440
+#: plugin/specialinformation.cpp:446
 msgid ""
 "Returns true if there is a widget with the passed name, false otherwise."
 msgstr ""
 
-#: plugin/specialinformation.cpp:442
+#: plugin/specialinformation.cpp:448
 msgid "Connects the signal of sender with the slot of the receiver"
 msgstr ""
 
-#: plugin/specialinformation.cpp:444
+#: plugin/specialinformation.cpp:450
 msgid "Disconnects the signal of sender from the slot of the receiver"
 msgstr ""
 
-#: plugin/specialinformation.cpp:447
+#: plugin/specialinformation.cpp:455
 msgid "Exits script execution and returns"
 msgstr ""
 
-#: plugin/specialinformation.cpp:449
+#: plugin/specialinformation.cpp:457
 msgid "Exits the current block of a while, for or foreach loop"
 msgstr ""
 
-#: plugin/specialinformation.cpp:451
+#: plugin/specialinformation.cpp:459
 msgid "Exit a step and return to the beginning of a loop"
 msgstr ""
 
-#: plugin/specialinformation.cpp:453
+#: plugin/specialinformation.cpp:461
 msgid ""
 "Return from a script, optionaly with a value from the script to the caller"
 msgstr ""
 
-#: plugin/specialinformation.cpp:457
+#: plugin/specialinformation.cpp:465
 msgid "Returns an EOL-separated list of all values in the array."
 msgstr ""
 
-#: plugin/specialinformation.cpp:459
+#: plugin/specialinformation.cpp:467
 msgid "Returns an EOL-separated list of all keys in the array."
 msgstr ""
 
-#: plugin/specialinformation.cpp:461
+#: plugin/specialinformation.cpp:469
 msgid "Removes all elements from the array."
 msgstr ""
 
-#: plugin/specialinformation.cpp:463
+#: plugin/specialinformation.cpp:471
 msgid "Returns the number of elements in the array."
 msgstr ""
 
-#: plugin/specialinformation.cpp:465
+#: plugin/specialinformation.cpp:473
 msgid "Returns the value associated with the given key."
 msgstr ""
 
-#: plugin/specialinformation.cpp:467
+#: plugin/specialinformation.cpp:475
 msgid "Removes element with the given key from the array."
 msgstr ""
 
-#: plugin/specialinformation.cpp:469
+#: plugin/specialinformation.cpp:477
 msgid "Adds element with the given key and value to the array"
 msgstr ""
 
-#: plugin/specialinformation.cpp:471
+#: plugin/specialinformation.cpp:479
 msgid ""
 "Adds all elements in the string to the array. String should have <i>"
 "key\\tvalue\\n</i> format."
 msgstr ""
 
-#: plugin/specialinformation.cpp:474
+#: plugin/specialinformation.cpp:482
 msgid ""
 "Returns all elements in the array in "
 "<pre>key\\tvalue\\n</pre> format."
 msgstr ""
 
-#: plugin/specialinformation.cpp:476
+#: plugin/specialinformation.cpp:484
 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 ""
 
-#: plugin/specialinformation.cpp:478
+#: plugin/specialinformation.cpp:486
 msgid ""
 "Create a string from an integer indexed array. Concatenate the elements with "
 "the separator character. The separator's default value is '\\t'."
 msgstr ""
 
-#: plugin/specialinformation.cpp:480
+#: plugin/specialinformation.cpp:488
 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 ""
 
-#: plugin/specialinformation.cpp:482
+#: plugin/specialinformation.cpp:490
 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 ""
 
-#: plugin/specialinformation.cpp:487
+#: plugin/specialinformation.cpp:492
+msgid ""
+"Create a flipped copy of the array where the keys and values switch places. "
+"NOTE: If the values are not unique they will be overwritten as keys! Set the "
+"name of the array to copy to and go. Useful with combos and lists were you have "
+"an index, a key and a value for data purposes."
+msgstr ""
+
+#: plugin/specialinformation.cpp:496
+msgid ""
+"Create a 2D array with zero based integer keys. Rows seperated with returns or "
+"\\n and columns with tabs or \\t. You can then read and alter values with "
+"\"name[0][1]\"."
+"<br><b>NOTE: Watch keys!</b> The row and column keys when set to true will read "
+"respectively the first row and first column as headings. If for instance you "
+"set one where there is no column or row heading to read it will read data, and "
+"if the data is not unique you will have missing columns or rows as well as "
+"addressing not working."
+msgstr ""
+
+#: plugin/specialinformation.cpp:498
+msgid ""
+"Convert 2D array to string, optionaly with row and column headings. If written "
+"without values set it will default to no headings."
+msgstr ""
+
+#: plugin/specialinformation.cpp:500
+msgid "Return the number of rows in the matrix"
+msgstr ""
+
+#: plugin/specialinformation.cpp:502
+msgid "Return the number of columns in the matrix"
+msgstr ""
+
+#: plugin/specialinformation.cpp:504
+msgid "Clear the entire matrix"
+msgstr ""
+
+#: plugin/specialinformation.cpp:506
+msgid ""
+"Convert row to array. Useful break out rows of data to work with. If you want "
+"to avoid spurious data Clear-First will wipe the array before filling it. If "
+"you choose indexed it will use a zero based index. Otherwise it will use the "
+"column keys."
+msgstr ""
+
+#: plugin/specialinformation.cpp:508
+msgid ""
+"Copy a column of a Matrix to an array and optionally clear array first to avoid "
+"spurious data in loops"
+msgstr ""
+
+#: plugin/specialinformation.cpp:510
+msgid "Copy a column of a Matrix to an indexed array"
+msgstr ""
+
+#: plugin/specialinformation.cpp:512
+msgid ""
+"Return the row keys from the matrix. Separator defaults to [tab] \"\\t\" if "
+"left empty"
+msgstr ""
+
+#: plugin/specialinformation.cpp:514
+msgid ""
+"Return the column keys from the matrix. Separator defaults to [tab] \"\\t\" if "
+"left empty"
+msgstr ""
+
+#: plugin/specialinformation.cpp:516
+msgid ""
+"Add a row to the matrix. Specifiy the row key and format the data as column key "
+"[tab] column value on each line using key\\tval\\nkey\\tval format"
+msgstr ""
+
+#: plugin/specialinformation.cpp:518
+msgid "Remove a row from the matrix by key name. Returns true if key is found."
+msgstr ""
+
+#: plugin/specialinformation.cpp:520
+msgid ""
+"Remove a column from the matrix by key name. Returns true if key is found."
+msgstr ""
+
+#: plugin/specialinformation.cpp:522
+msgid ""
+"Find the row key that matches a column value. Use this for unique key searches. "
+"Iteration may be omitted and the default is to return the first instance. In a "
+"loop it will return sequential finds until there are no more, in which case it "
+"returns null."
+msgstr ""
+
+#: plugin/specialinformation.cpp:526
 msgid "Returns number of chars in the string."
 msgstr ""
 
-#: plugin/specialinformation.cpp:489
+#: plugin/specialinformation.cpp:528
 msgid "Checks if the the string contains the given substring."
 msgstr ""
 
-#: plugin/specialinformation.cpp:491
+#: plugin/specialinformation.cpp:530
 msgid ""
 "Returns the position of a substring in the string, or -1 if it is not found."
 msgstr ""
 
-#: plugin/specialinformation.cpp:493
+#: plugin/specialinformation.cpp:532
 msgid ""
 "Returns the position of a substring in the string, or -1 if it is not found. "
 "String is searched backwards"
 msgstr ""
 
-#: plugin/specialinformation.cpp:495
+#: plugin/specialinformation.cpp:534
+msgid "Returns the count of a given substring in the given string."
+msgstr ""
+
+#: plugin/specialinformation.cpp:536
 msgid "Returns the first <i>n</i> chars of the string."
 msgstr ""
 
-#: plugin/specialinformation.cpp:497
+#: plugin/specialinformation.cpp:538
 msgid "Returns the last <i>n</i> chars of the string."
 msgstr ""
 
-#: plugin/specialinformation.cpp:499
+#: plugin/specialinformation.cpp:540
 msgid "Returns <i>n</i> chars of the string, starting from <i>start</i>."
 msgstr ""
 
-#: plugin/specialinformation.cpp:501
+#: plugin/specialinformation.cpp:542
 msgid "Removes all occurrences of given substring."
 msgstr ""
 
-#: plugin/specialinformation.cpp:503
+#: plugin/specialinformation.cpp:544
 msgid ""
 "Replaces all occurrences of the given substring with the given replacement."
 msgstr ""
 
-#: plugin/specialinformation.cpp:505
+#: plugin/specialinformation.cpp:546
 msgid "Converts the string to uppercase."
 msgstr ""
 
-#: plugin/specialinformation.cpp:507
+#: plugin/specialinformation.cpp:548
 msgid "Converts the string to lowercase."
 msgstr ""
 
-#: plugin/specialinformation.cpp:509
+#: plugin/specialinformation.cpp:550
 msgid ""
 "Compares two strings. Returns 0 if they are equal, -1 if the first one is "
 "lower, 1 if the first one is higher"
 msgstr ""
 
-#: plugin/specialinformation.cpp:512
+#: plugin/specialinformation.cpp:553
 msgid "Checks if the string is empty."
 msgstr ""
 
-#: plugin/specialinformation.cpp:514
+#: plugin/specialinformation.cpp:555
 msgid "Checks if the string is a valid number."
 msgstr ""
 
-#: plugin/specialinformation.cpp:516
+#: plugin/specialinformation.cpp:557
 msgid "Returns given section of a string."
 msgstr ""
 
-#: plugin/specialinformation.cpp:518
+#: plugin/specialinformation.cpp:559
 msgid ""
 "Returns the given string with %1, %2, %3 replaced with <i>arg1</i>, <i>arg2</i>"
 ", <i>arg3</i> accordingly."
 msgstr ""
 
-#: plugin/specialinformation.cpp:520
+#: plugin/specialinformation.cpp:561
 msgid "Round a floating point number by x digits."
 msgstr ""
 
-#: plugin/specialinformation.cpp:523
+#: plugin/specialinformation.cpp:563
+msgid ""
+"Sort a string list. Only first paramter is required. Default separator is a "
+"newline."
+msgstr ""
+
+#: plugin/specialinformation.cpp:565
+msgid "Strips white space from beginning and end of string."
+msgstr ""
+
+#: plugin/specialinformation.cpp:567
+msgid ""
+"Pads the string to the total length indicated. if no pad character is given "
+"spaces will be used. Try this with 0 on integer sequences and read them with "
+"str_toint."
+msgstr ""
+
+#: plugin/specialinformation.cpp:569
+msgid ""
+"Pads the string to the total length indicated. if no pad character is given "
+"spaces will be used."
+msgstr ""
+
+#: plugin/specialinformation.cpp:572
 msgid "Convert a string to an integer. If not possible use the default value"
 msgstr ""
 
-#: plugin/specialinformation.cpp:525
+#: plugin/specialinformation.cpp:574
 msgid ""
 "Convert a string to a double precision floating point value. If not possible "
 "use the default value"
 msgstr ""
 
-#: plugin/specialinformation.cpp:529
+#: plugin/specialinformation.cpp:578
 msgid "Returns content of given file."
 msgstr ""
 
-#: plugin/specialinformation.cpp:531
+#: plugin/specialinformation.cpp:580
 msgid "Writes given string to a file."
 msgstr ""
 
-#: plugin/specialinformation.cpp:533
+#: plugin/specialinformation.cpp:582
 msgid "Appends given string to the end of a file."
 msgstr ""
 
-#: plugin/specialinformation.cpp:535
+#: plugin/specialinformation.cpp:584
 msgid "Checks to see if file exists."
 msgstr ""
 
-#: plugin/specialinformation.cpp:538
+#: plugin/specialinformation.cpp:587
 msgid ""
 "Shows color dialog. Returns color in #RRGGBB format. Defaults to the parameter, "
 "if specified."
 msgstr ""
 
-#: plugin/specialinformation.cpp:540
+#: plugin/specialinformation.cpp:589
 msgid "Shows text selection dialog. Returns entered text."
 msgstr ""
 
-#: plugin/specialinformation.cpp:542
+#: plugin/specialinformation.cpp:591
 msgid "Shows a dialog asking user for password and returns it."
 msgstr ""
 
-#: plugin/specialinformation.cpp:544
+#: plugin/specialinformation.cpp:593
 msgid "Shows value selection dialog. Returns entered value."
 msgstr ""
 
-#: plugin/specialinformation.cpp:546
+#: plugin/specialinformation.cpp:595
 msgid "Shows float value selection dialog. Returns entered value."
 msgstr ""
 
-#: plugin/specialinformation.cpp:548
+#: plugin/specialinformation.cpp:597
 msgid "Shows existing file selection dialog. Returns selected file."
 msgstr ""
 
-#: plugin/specialinformation.cpp:550
+#: plugin/specialinformation.cpp:599
 msgid "Shows save file selection dialog. Returns selected file."
 msgstr ""
 
-#: plugin/specialinformation.cpp:552
+#: plugin/specialinformation.cpp:601
 msgid "Shows directory selection dialog. Returns selected directory."
 msgstr ""
 
-#: plugin/specialinformation.cpp:554
+#: plugin/specialinformation.cpp:603
 msgid ""
 "Shows multiple files selection dialog. Returns EOL-separated list of selected "
 "files."
 msgstr ""
 
-#: plugin/specialinformation.cpp:558
-msgid "Shows an information dialog."
+#: plugin/specialinformation.cpp:607
+msgid ""
+"Shows an information dialog. Returns true when clicked so you can check for "
+"user response."
 msgstr ""
 
-#: plugin/specialinformation.cpp:560
-msgid "Shows an error dialog."
+#: plugin/specialinformation.cpp:609
+msgid ""
+"Shows an error dialog. Returns true when clicked so you can check for user "
+"response."
 msgstr ""
 
-#: plugin/specialinformation.cpp:562
+#: plugin/specialinformation.cpp:611
 msgid ""
 "Shows a warning dialog with up to three buttons. Returns number of selected "
 "button."
 msgstr ""
 
-#: plugin/specialinformation.cpp:564
+#: plugin/specialinformation.cpp:613
 msgid ""
 "Shows a question dialog with up to three buttons. Returns number of selected "
 "button."
 msgstr ""
 
-#. i18n: file ./editor/wizardeditor.ui line 16
-#: rc.cpp:3
-#, no-c-format
-msgid "Wizard Page Editor"
+#: widget/kommanderwidget.cpp:119 widgets/scriptobject.cpp:99
+msgid "Invalid state for associated text."
 msgstr ""
 
-#. i18n: file ./editor/wizardeditor.ui line 61
-#: rc.cpp:6
-#, no-c-format
-msgid "Wizard pages:"
+#: widget/kommanderwidget.cpp:134
+msgid ""
+"Line %1: %2.\n"
 msgstr ""
 
-#. i18n: file ./editor/wizardeditor.ui line 90
-#: rc.cpp:9 rc.cpp:893
-#, no-c-format
-msgid "&Add"
-msgstr "&Ychwanegu"
-
-#. i18n: file ./editor/wizardeditor.ui line 200
-#: rc.cpp:21 rc.cpp:236 rc.cpp:392 rc.cpp:614 rc.cpp:815 rc.cpp:878 rc.cpp:914
-#: rc.cpp:980 rc.cpp:1082 rc.cpp:1133 rc.cpp:1310
-#, no-c-format
-msgid "Close the dialog and apply all the changes."
+#: widget/kommanderwidget.cpp:244
+msgid "Unknown special: '%1'."
 msgstr ""
 
-#. i18n: file ./editor/wizardeditor.ui line 214
-#: rc.cpp:27 rc.cpp:398 rc.cpp:821 rc.cpp:986 rc.cpp:1088 rc.cpp:1139
-#, no-c-format
-msgid "Apply all changes."
+#: widget/kommanderwidget.cpp:274
+msgid "Unmatched parenthesis in DCOP call '%1'."
 msgstr ""
 
-#. i18n: file ./editor/wizardeditor.ui line 228
-#: rc.cpp:33 rc.cpp:242 rc.cpp:404 rc.cpp:620 rc.cpp:827 rc.cpp:884 rc.cpp:920
-#: rc.cpp:992 rc.cpp:1094 rc.cpp:1145 rc.cpp:1319
-#, no-c-format
-msgid "Close the dialog and discard any changes."
+#: widget/kommanderwidget.cpp:280
+msgid "Incorrect arguments in DCOP call '%1'."
 msgstr ""
 
-#. i18n: file ./editor/previewwidget.ui line 22
-#: rc.cpp:36
-#, no-c-format
-msgid "Preview Window"
+#: widget/kommanderwidget.cpp:310
+msgid "Tried to perform DCOP query, but failed."
 msgstr ""
 
-#. i18n: file ./editor/previewwidget.ui line 67
-#: rc.cpp:39
-#, no-c-format
-msgid "ButtonGroup"
+#: widget/kommanderwidget.cpp:341
+msgid "DCOP return type %1 is not yet implemented."
 msgstr ""
 
-#. i18n: file ./editor/previewwidget.ui line 84
-#: rc.cpp:42
-#, no-c-format
-msgid "RadioButton1"
+#: widget/kommanderwidget.cpp:406
+msgid "Continue && Ignore Next Errors"
 msgstr ""
 
-#. i18n: file ./editor/previewwidget.ui line 95
-#: rc.cpp:45
-#, no-c-format
-msgid "RadioButton2"
+#: widget/kommanderwidget.cpp:408
+msgid "<qt>Error in widget <b>%1</b>:<p><i>%2</i></qt>"
 msgstr ""
 
-#. i18n: file ./editor/previewwidget.ui line 103
-#: rc.cpp:48
-#, no-c-format
-msgid "RadioButton3"
+#: widget/kommanderwidget.cpp:427
+msgid ""
+"Error in widget %1:\n"
+"  %2\n"
 msgstr ""
 
-#. i18n: file ./editor/previewwidget.ui line 113
-#: rc.cpp:51
-#, no-c-format
-msgid "ButtonGroup2"
+#: widget/kommanderwidget.cpp:582
+msgid "Unmatched parenthesis after '%1'."
 msgstr ""
 
-#. i18n: file ./editor/previewwidget.ui line 130
-#: rc.cpp:54
-#, no-c-format
-msgid "CheckBox1"
+#: widget/kommanderwidget.cpp:591
+msgid "Unmatched quotes in argument of '%1'."
 msgstr ""
 
-#. i18n: file ./editor/previewwidget.ui line 141
-#: rc.cpp:57
-#, no-c-format
-msgid "CheckBox2"
+#: widget/kommanderwidget.cpp:593
+msgid "Unknown function group: '%1'."
 msgstr ""
 
-#. i18n: file ./editor/previewwidget.ui line 175
-#: rc.cpp:60
-#, no-c-format
-msgid "LineEdit"
+#: widget/kommanderwidget.cpp:595
+msgid "Unknown function: '%1' in group '%2'."
 msgstr ""
 
-#. i18n: file ./editor/previewwidget.ui line 181
-#: rc.cpp:63
-#, no-c-format
-msgid "ComboBox"
-msgstr "Blwch Cyfuno"
-
-#. i18n: file ./editor/previewwidget.ui line 212
-#: rc.cpp:66
-#, no-c-format
-msgid "PushButton"
+#: widget/kommanderwidget.cpp:597
+msgid "Unknown widget function: '%1'."
 msgstr ""
 
-#. i18n: file ./editor/previewwidget.ui line 249
-#: rc.cpp:69
-#, no-c-format
+#: widget/kommanderwidget.cpp:599
 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>"
+"Not enough arguments for '%1' (%2 instead of %3)."
+"<p>Correct syntax is: %4"
 msgstr ""
 
-#. i18n: file ./editor/newform.ui line 35
-#: rc.cpp:77
-#, no-c-format
-msgid "New File"
-msgstr "Ffeil newydd"
-
-#. i18n: file ./editor/newform.ui line 41
-#: rc.cpp:80
-#, no-c-format
-msgid ""
-"<b>New Form</b>"
-"<p>Select a template for the new form and click the <b>OK</b>"
-"-button to create it.</p>"
+#: widget/kommanderwidget.cpp:604
+msgid "Too many arguments for '%1' (%2 instead of %3).<p>Correct syntax is: %4"
 msgstr ""
 
-#. i18n: file ./editor/newform.ui line 109
-#: rc.cpp:89
-#, no-c-format
-msgid "Create a new form using the selected template."
+#: widget/myprocess.cpp:94
+msgid "<qt>Failed to start shell process<br><b>%1</b></qt>"
 msgstr ""
 
-#. i18n: file ./editor/newform.ui line 123
-#: rc.cpp:95
-#, no-c-format
-msgid "Close the dialog without creating a new form."
+#: widget/expression.cpp:199 widget/expression.cpp:208
+#, fuzzy
+msgid "error"
+msgstr "Saeth"
+
+#: widget/kommanderfunctions.cpp:120
+msgid "Unterminated @execBegin ... @execEnd block."
 msgstr ""
 
-#. i18n: file ./editor/newform.ui line 145
-#: rc.cpp:98
-#, no-c-format
-msgid "Displays a list of the available templates."
+#: widget/kommanderfunctions.cpp:138 widget/kommanderfunctions.cpp:164
+msgid "Unterminated @forEach ... @end block."
 msgstr ""
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 38
-#: rc.cpp:101
-#, no-c-format
-msgid "Tune Palette"
+#: widget/kommanderfunctions.cpp:201
+msgid "Unterminated @if ... @endif block."
 msgstr ""
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 44
-#: rc.cpp:104
-#, no-c-format
-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>"
+#: widget/kommanderfunctions.cpp:221
+msgid "Unterminated @switch ... @end block."
 msgstr ""
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 81
-#: rc.cpp:107 rc.cpp:860
-#, no-c-format
-msgid "Select &palette:"
+#: widget/kommanderfunctions.cpp:320
+#, c-format
+msgid "Unknown widget: @%1."
 msgstr ""
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 90
-#: rc.cpp:110 rc.cpp:863
-#, no-c-format
-msgid "Active Palette"
+#: widget/kommanderfunctions.cpp:338
+msgid "Infinite loop: @%1 called inside @%2."
 msgstr ""
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 95
-#: rc.cpp:113 rc.cpp:866
-#, no-c-format
-msgid "Inactive Palette"
+#: widget/kommanderfunctions.cpp:344
+msgid "Script for @%1 is empty."
 msgstr ""
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 100
-#: rc.cpp:116 rc.cpp:869
-#, no-c-format
-msgid "Disabled Palette"
+#: widget/parser.cpp:116
+msgid "Invalid character: '%1'"
 msgstr ""
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 122
-#: rc.cpp:119
-#, no-c-format
-msgid "Auto"
-msgstr "Ymysgogol"
+#: widget/parser.cpp:192
+msgid "Constant value expected"
+msgstr ""
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 139
-#: rc.cpp:122
-#, no-c-format
-msgid "Build the inactive palette from the active palette."
+#: widget/parser.cpp:223
+msgid "'%1' (%2) is not a widget"
 msgstr ""
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 150
-#: rc.cpp:125
-#, no-c-format
-msgid "Build the disabled palette from the active palette."
+#: widget/parser.cpp:235 widget/parser.cpp:520
+msgid "'%1' is not a function"
 msgstr ""
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 163
-#: rc.cpp:128
-#, no-c-format
-msgid "Central Color &Roles"
+#: widget/parser.cpp:246
+msgid "Expected value"
 msgstr ""
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 178
-#: rc.cpp:131
-#, no-c-format
-msgid "Background"
-msgstr "Cefndir"
+#: widget/parser.cpp:271 widget/parser.cpp:281
+msgid "Divide by zero"
+msgstr ""
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 183
-#: rc.cpp:134
-#, no-c-format
-msgid "Foreground"
-msgstr "Blaendir"
+#: widget/parser.cpp:426 widget/parser.cpp:428 widget/parser.cpp:434
+msgid "in function '%1': %2"
+msgstr ""
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 188
-#: rc.cpp:137
-#, no-c-format
-msgid "Button"
-msgstr "Botwm"
+#: widget/parser.cpp:426
+#, fuzzy
+msgid "too few parameters"
+msgstr "Mewnosod Gwahanydd"
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 193
-#: rc.cpp:140
-#, no-c-format
-msgid "Base"
-msgstr "Bôn"
+#: widget/parser.cpp:428
+#, fuzzy
+msgid "too many parameters"
+msgstr "Mewnosod Gwahanydd"
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 203
-#: rc.cpp:146
-#, no-c-format
-msgid "BrightText"
+#: widget/parser.cpp:474
+msgid "in widget function '%1.%2': %3"
 msgstr ""
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 208
-#: rc.cpp:149
-#, no-c-format
-msgid "ButtonText"
+#: widget/parser.cpp:517
+msgid "'%1' is not a widget"
 msgstr ""
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 213
-#: rc.cpp:152
-#, no-c-format
-msgid "Highlight"
-msgstr "Amlygu"
-
-#. i18n: file ./editor/paletteeditoradvanced.ui line 218
-#: rc.cpp:155
-#, no-c-format
-msgid "HighlightText"
+#: widget/parser.cpp:522
+msgid "Unexpected symbol after variable '%1'"
 msgstr ""
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 223
-#: rc.cpp:158
-#, no-c-format
-msgid "Link"
-msgstr "Cyswllt"
+#: widget/parser.cpp:741
+msgid ""
+"Expected '%1'"
+"<br>"
+"<br>Possible cause of the error is having a variable with the same name as a "
+"widget"
+msgstr ""
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 228
-#: rc.cpp:161
-#, no-c-format
-msgid "LinkVisited"
+#: widget/parser.cpp:743
+msgid "Expected '%1'"
 msgstr ""
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 235
-#: rc.cpp:164
-#, no-c-format
-msgid "Choose the central color role"
+#: widget/parser.cpp:757 widget/parser.cpp:770
+msgid "Expected variable"
 msgstr ""
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 238
-#: rc.cpp:167
-#, no-c-format
-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 forground 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>"
+#: editor/workspace.cpp:226
+msgid "<No Project>"
 msgstr ""
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 285
-#: rc.cpp:170
-#, no-c-format
-msgid "Choose pi&xmap:"
+#: editor/workspace.cpp:661
+msgid "&Open Source File..."
 msgstr ""
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 310
-#: rc.cpp:173 rc.cpp:500
-#, no-c-format
-msgid "Select a pixmap"
+#: editor/workspace.cpp:664
+msgid "&Remove Source File From Project"
 msgstr ""
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 313
-#: rc.cpp:176
-#, no-c-format
-msgid "Choose a pixmap file for the selected central color role."
+#: editor/workspace.cpp:668
+msgid "&Open Form..."
 msgstr ""
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 335
-#: rc.cpp:179
-#, no-c-format
-msgid "&Select color:"
+#: editor/workspace.cpp:672 editor/workspace.cpp:682
+msgid "&Remove Form From Project"
 msgstr ""
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 360
-#: rc.cpp:182 rc.cpp:224 rc.cpp:476 rc.cpp:839 rc.cpp:848
-#, no-c-format
-msgid "Choose a color"
+#: editor/workspace.cpp:674 editor/workspace.cpp:684
+msgid "&Remove Form"
 msgstr ""
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 363
-#: rc.cpp:185
-#, no-c-format
-msgid "Choose a color for the selected central color role."
+#: editor/workspace.cpp:678
+msgid "&Open Form Source..."
 msgstr ""
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 375
-#: rc.cpp:188
-#, no-c-format
-msgid "3D Shadow &Effects"
+#: 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 ""
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 406
-#: rc.cpp:191
-#, no-c-format
-msgid "Build &from button color:"
+#: 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 ""
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 412
-#: rc.cpp:194
-#, no-c-format
-msgid "Generate shadings"
+#: editor/widgetdatabase.cpp:199 editor/widgetdatabase.cpp:531
+msgid "List Box"
 msgstr ""
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 415
-#: rc.cpp:197
-#, no-c-format
-msgid "Check to let 3D-effect colors be calculated from the button-color."
+#: editor/widgetdatabase.cpp:206
+msgid "List View"
 msgstr ""
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 421
-#: rc.cpp:200
-#, no-c-format
-msgid "Light"
-msgstr "Golau"
+#: editor/widgetdatabase.cpp:214
+msgid "Icon View"
+msgstr "Golwg Eicon"
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 426
-#: rc.cpp:203
-#, no-c-format
-msgid "Midlight"
+#: editor/propertyeditor.cpp:1894 editor/propertyeditor.cpp:1928
+#: editor/widgetdatabase.cpp:223
+msgid "Table"
+msgstr "Tabl"
+
+#: editor/widgetdatabase.cpp:233
+msgid "Data Table"
 msgstr ""
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 431
-#: rc.cpp:206
-#, no-c-format
-msgid "Mid"
-msgstr "Canol"
+#: editor/widgetdatabase.cpp:241
+msgid "Line Edit"
+msgstr "Golygu Llinell"
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 436
-#: rc.cpp:209
-#, no-c-format
-msgid "Dark"
-msgstr "Tywyll"
+#: editor/widgetdatabase.cpp:248
+msgid "Spin Box"
+msgstr ""
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 441
-#: rc.cpp:212
-#, no-c-format
-msgid "Shadow"
-msgstr "Cysgod"
+#: editor/widgetdatabase.cpp:255
+msgid "Date Edit"
+msgstr ""
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 448
-#: rc.cpp:215
-#, no-c-format
-msgid "Choose 3D-effect color role"
+#: editor/widgetdatabase.cpp:263
+msgid "Time Edit"
 msgstr ""
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 451
-#: rc.cpp:218
-#, no-c-format
-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>"
+#: editor/widgetdatabase.cpp:271
+msgid "Date-Time Edit"
 msgstr ""
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 506
-#: rc.cpp:221
-#, no-c-format
-msgid "Select co&lor:"
+#: editor/widgetdatabase.cpp:279
+msgid "Multi Line Edit"
 msgstr ""
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 534
-#: rc.cpp:227
-#, no-c-format
-msgid "Choose a color for the selected effect color role."
+#: editor/widgetdatabase.cpp:286
+msgid "Rich Text Edit"
 msgstr ""
 
-#. i18n: file ./editor/functions.ui line 16
-#: rc.cpp:245
-#, no-c-format
-msgid "Function Browser"
+#: editor/widgetdatabase.cpp:293
+msgid "Combo Box"
 msgstr ""
 
-#. i18n: file ./editor/functions.ui line 38
-#: rc.cpp:248
-#, no-c-format
-msgid "Description:"
-msgstr "Disgrifiad:"
+#: editor/widgetdatabase.cpp:300 editor/widgetdatabase.cpp:641
+msgid "Slider"
+msgstr ""
 
-#. i18n: file ./editor/functions.ui line 67
-#: rc.cpp:251
-#, no-c-format
-msgid "&Group:"
-msgstr "&Grŵp:"
+#: editor/widgetdatabase.cpp:307
+msgid "Scrollbar"
+msgstr "Bar Sgrolio"
 
-#. i18n: file ./editor/functions.ui line 97
-#: rc.cpp:254
-#, no-c-format
-msgid "&Function:"
-msgstr "&Ffwythiant"
+#: editor/widgetdatabase.cpp:314
+msgid "Dial"
+msgstr "Deialu"
 
-#. i18n: file ./editor/functions.ui line 129
-#: rc.cpp:257
-#, no-c-format
-msgid "&Parameters"
-msgstr "&Paramedrau"
+#: editor/widgetdatabase.cpp:321
+msgid "Label"
+msgstr "Label"
 
-#. i18n: file ./editor/functions.ui line 140
-#: rc.cpp:260
-#, no-c-format
-msgid "Arg3"
+#: editor/widgetdatabase.cpp:328
+msgid "LCD Number"
 msgstr ""
 
-#. i18n: file ./editor/functions.ui line 148
-#: rc.cpp:263
-#, no-c-format
-msgid "Arg5"
+#: editor/widgetdatabase.cpp:335
+msgid "Progress Bar"
 msgstr ""
 
-#. i18n: file ./editor/functions.ui line 190
-#: rc.cpp:266
-#, no-c-format
-msgid "Insert function"
-msgstr "Mewnosod Ffwythiant"
+#: editor/widgetdatabase.cpp:342
+msgid "Text View"
+msgstr "Golwg Testun"
 
-#. i18n: file ./editor/functions.ui line 198
-#: rc.cpp:269
-#, no-c-format
-msgid "Arg4"
+#: editor/widgetdatabase.cpp:349 editor/widgetdatabase.cpp:524
+msgid "Text Browser"
 msgstr ""
 
-#. i18n: file ./editor/functions.ui line 240
-#: rc.cpp:272 rc.cpp:278 rc.cpp:281 rc.cpp:287 rc.cpp:290 rc.cpp:293
-#, no-c-format
-msgid "Quote"
+#: editor/mainwindowactions.cpp:248 editor/widgetdatabase.cpp:356
+msgid "Spacer"
+msgstr "Bylchwr"
+
+#: editor/widgetdatabase.cpp:358
+msgid ""
+"The Spacer provides horizontal and vertical spacing to be able to manipulate "
+"the behaviour of layouts."
 msgstr ""
 
-#. i18n: file ./editor/functions.ui line 263
-#: rc.cpp:275
-#, no-c-format
-msgid "Arg1"
+#: editor/widgetdatabase.cpp:494
+msgid "Text Label"
 msgstr ""
 
-#. i18n: file ./editor/functions.ui line 362
-#: rc.cpp:284
-#, no-c-format
-msgid "Widget:"
+#: editor/widgetdatabase.cpp:495
+msgid "The Text Label provides a widget to display static text."
 msgstr ""
 
-#. i18n: file ./editor/functions.ui line 502
-#: rc.cpp:296
-#, no-c-format
-msgid "Arg6"
+#: editor/widgetdatabase.cpp:502
+msgid "Pixmap Label"
 msgstr ""
 
-#. i18n: file ./editor/functions.ui line 510
-#: rc.cpp:299
-#, no-c-format
-msgid "Arg2"
+#: editor/widgetdatabase.cpp:503
+msgid "The Pixmap Label provides a widget to display pixmaps."
 msgstr ""
 
-#. i18n: file ./editor/functions.ui line 623
-#: rc.cpp:308
-#, no-c-format
-msgid "Clear edited text"
+#: editor/widgetdatabase.cpp:510
+msgid "A line edit"
 msgstr ""
 
-#. i18n: file ./editor/functions.ui line 631
-#: rc.cpp:311
-#, no-c-format
-msgid "Inserted &text:"
+#: editor/widgetdatabase.cpp:517
+msgid "A rich text edit"
 msgstr ""
 
-#. i18n: file ./editor/actioneditor.ui line 19
-#: rc.cpp:314
-#, no-c-format
-msgid "Edit Actions"
+#: editor/widgetdatabase.cpp:538
+msgid "A combo box"
 msgstr ""
 
-#. i18n: file ./editor/actioneditor.ui line 61
-#: rc.cpp:317
-#, no-c-format
-msgid "Create new Action"
+#: editor/widgetdatabase.cpp:545
+msgid "A tree widget"
 msgstr ""
 
-#. i18n: file ./editor/actioneditor.ui line 78
-#: rc.cpp:320
-#, no-c-format
-msgid "Delete current Action"
+#: editor/widgetdatabase.cpp:552
+msgid "A table widget"
 msgstr ""
 
-#. i18n: file ./editor/actioneditor.ui line 95
-#: rc.cpp:323
-#, no-c-format
-msgid "Connect current Action"
+#: editor/widgetdatabase.cpp:559
+msgid "A button that when clicked, execute a command"
 msgstr ""
 
-#. i18n: file ./editor/iconvieweditor.ui line 35
-#: rc.cpp:326
-#, no-c-format
-msgid "Edit Iconview"
+#: editor/widgetdatabase.cpp:566
+msgid "A button that closes the dialog it is in"
 msgstr ""
 
-#. i18n: file ./editor/iconvieweditor.ui line 41
-#: rc.cpp:329
-#, no-c-format
+#: editor/widgetdatabase.cpp:573
+msgid "A listbox showing output of a script"
+msgstr ""
+
+#: editor/widgetdatabase.cpp:580
 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>"
+"A widget made up of a line edit and push button, for selecting files and "
+"folders"
 msgstr ""
 
-#. i18n: file ./editor/iconvieweditor.ui line 72
-#: rc.cpp:332
-#, no-c-format
-msgid "All items in the iconview."
+#: editor/widgetdatabase.cpp:587
+msgid "A check box"
 msgstr ""
 
-#. i18n: file ./editor/iconvieweditor.ui line 94
-#: rc.cpp:335 rc.cpp:683 rc.cpp:1034
-#, no-c-format
-msgid "&New Item"
-msgstr "&Eitem Newydd"
+#: editor/widgetdatabase.cpp:594
+msgid "A radio button"
+msgstr ""
 
-#. i18n: file ./editor/iconvieweditor.ui line 97
-#: rc.cpp:338 rc.cpp:686 rc.cpp:1037
-#, no-c-format
-msgid "Add an item"
-msgstr "Ychwanegu eitem"
+#: editor/widgetdatabase.cpp:601
+msgid "A widget for grouping buttons together"
+msgstr ""
 
-#. i18n: file ./editor/iconvieweditor.ui line 100
-#: rc.cpp:341
-#, no-c-format
-msgid "Create a new item for the iconview."
+#: editor/widgetdatabase.cpp:609
+msgid "A widget for grouping other widgets together"
 msgstr ""
 
-#. i18n: file ./editor/iconvieweditor.ui line 108
-#: rc.cpp:344 rc.cpp:632 rc.cpp:1043
-#, no-c-format
-msgid "&Delete Item"
-msgstr "&Dileu Eitem"
+#: editor/widgetdatabase.cpp:617
+msgid "A widget with tabs"
+msgstr ""
 
-#. i18n: file ./editor/iconvieweditor.ui line 111
-#: rc.cpp:347 rc.cpp:635
-#, no-c-format
-msgid "Delete item"
-msgstr " Dileu eitem"
+#: editor/widgetdatabase.cpp:634
+msgid "A spin box"
+msgstr ""
 
-#. i18n: file ./editor/iconvieweditor.ui line 114
-#: rc.cpp:350
-#, no-c-format
-msgid "Delete the selected item."
+#: editor/widgetdatabase.cpp:648
+msgid "A small rich text editor"
 msgstr ""
 
-#. i18n: file ./editor/iconvieweditor.ui line 147
-#: rc.cpp:353 rc.cpp:1001
-#, no-c-format
-msgid "&Item Properties"
+#: editor/widgetdatabase.cpp:655
+msgid "A status bar"
 msgstr ""
 
-#. i18n: file ./editor/iconvieweditor.ui line 164
-#: rc.cpp:356 rc.cpp:647 rc.cpp:755 rc.cpp:1025 rc.cpp:1070
-#, no-c-format
-msgid "&Text:"
-msgstr "&Testun:"
+#: editor/widgetdatabase.cpp:662
+msgid "A progress bar"
+msgstr ""
 
-#. i18n: file ./editor/iconvieweditor.ui line 181
-#: rc.cpp:359 rc.cpp:650 rc.cpp:1028
-#, no-c-format
-msgid "Change text"
-msgstr "Newid y Testun"
+#: editor/widgetdatabase.cpp:669
+msgid "A hidden script container"
+msgstr ""
 
-#. i18n: file ./editor/iconvieweditor.ui line 184
-#: rc.cpp:362
-#, no-c-format
-msgid "Change the text for the selected item."
+#: editor/widgetdatabase.cpp:676
+msgid "A timer for running scripts periodically"
 msgstr ""
 
-#. i18n: file ./editor/iconvieweditor.ui line 192
-#: rc.cpp:365 rc.cpp:734 rc.cpp:1004
-#, no-c-format
-msgid "&Pixmap:"
-msgstr "&Picsfap :"
+#: editor/widgetdatabase.cpp:683
+msgid "A date selection widget"
+msgstr ""
 
-#. i18n: file ./editor/iconvieweditor.ui line 217
-#: rc.cpp:368 rc.cpp:665 rc.cpp:737 rc.cpp:1007 rc.cpp:1172 rc.cpp:1229
-#, no-c-format
-msgid "Label4"
+#: editor/pixmapchooser.cpp:947
+msgid "All Pixmaps"
 msgstr ""
 
-#. i18n: file ./editor/iconvieweditor.ui line 237
-#: rc.cpp:371 rc.cpp:668 rc.cpp:740 rc.cpp:1010 rc.cpp:1175 rc.cpp:1232
-#, no-c-format
-msgid "Delete Pixmap"
+#: editor/pixmapchooser.cpp:950
+msgid ""
+"%1-Pixmaps (%2)\n"
 msgstr ""
 
-#. i18n: file ./editor/iconvieweditor.ui line 240
-#: rc.cpp:374 rc.cpp:1013
-#, no-c-format
-msgid "Delete the selected item's pixmap."
+#: editor/pixmapchooser.cpp:956
+msgid "All Files (*)"
 msgstr ""
 
-#. i18n: file ./editor/iconvieweditor.ui line 257
-#: rc.cpp:380 rc.cpp:677 rc.cpp:749 rc.cpp:1019 rc.cpp:1184 rc.cpp:1241
-#, no-c-format
-msgid "Select a Pixmap"
+#: editor/choosewidgetimpl.cpp:38 editor/hierarchyview.cpp:608
+#: editor/mainwindow.cpp:268
+msgid "Widgets"
+msgstr "Celfigion"
+
+#: editor/hierarchyview.cpp:100
+msgid "(Constructor)"
 msgstr ""
 
-#. i18n: file ./editor/iconvieweditor.ui line 260
-#: rc.cpp:383
-#, no-c-format
-msgid "Select a pixmap file for the current item."
+#: editor/hierarchyview.cpp:102
+msgid "(Destructor)"
 msgstr ""
 
-#. i18n: file ./editor/createtemplate.ui line 61
-#: rc.cpp:410
-#, no-c-format
-msgid "Template &name:"
+#: editor/hierarchyview.cpp:190
+msgid "Name"
+msgstr "Enw"
+
+#: editor/hierarchyview.cpp:191
+msgid "Class"
+msgstr "Dosbarth"
+
+#: editor/hierarchyview.cpp:335
+msgid "Database"
+msgstr "Cronfa ddata"
+
+#: editor/hierarchyview.cpp:519 editor/hierarchyview.cpp:525
+#: editor/mainwindow.cpp:1217 editor/mainwindow.cpp:1235
+#: editor/mainwindow.cpp:1270 editor/wizardeditorimpl.cpp:112
+#, c-format
+msgid "Add Page to %1"
 msgstr ""
 
-#. i18n: file ./editor/createtemplate.ui line 76
-#: rc.cpp:413
-#, no-c-format
-msgid "Name of the new template"
+#: editor/hierarchyview.cpp:541 editor/hierarchyview.cpp:551
+#: editor/mainwindow.cpp:1224 editor/mainwindow.cpp:1242
+#: editor/mainwindow.cpp:1277 editor/wizardeditorimpl.cpp:130
+msgid "Delete Page %1 of %2"
 msgstr ""
 
-#. i18n: file ./editor/createtemplate.ui line 80
-#: rc.cpp:416
-#, no-c-format
-msgid "Enter the name of the new template"
+#: editor/messagelog.cpp:34
+msgid "Copy Current &Line"
 msgstr ""
 
-#. i18n: file ./editor/createtemplate.ui line 91
-#: rc.cpp:419
-#, no-c-format
-msgid "Class of the new template"
+#: editor/messagelog.cpp:35
+msgid "&Copy Content"
 msgstr ""
 
-#. i18n: file ./editor/createtemplate.ui line 95
-#: rc.cpp:422
-#, no-c-format
+#: editor/messagelog.cpp:36
+msgid "&Save As..."
+msgstr "&Cadw Fel..."
+
+#: editor/messagelog.cpp:122
 msgid ""
-"Enter the name of the class which should be used as the template's base class"
+"*.log|Log Files (*.log)\n"
+"*|All Files"
 msgstr ""
 
-#. i18n: file ./editor/createtemplate.ui line 142
-#: rc.cpp:425
-#, no-c-format
-msgid "C&reate"
-msgstr "C&reu"
+#: editor/messagelog.cpp:122
+msgid "Save Log File"
+msgstr ""
 
-#. i18n: file ./editor/createtemplate.ui line 150
-#: rc.cpp:428
-#, no-c-format
-msgid "Creates the new template"
+#: editor/messagelog.cpp:127
+msgid "<qt>File<br><b>%1</b><br>already exists. Overwrite it?</qt>"
 msgstr ""
 
-#. i18n: file ./editor/createtemplate.ui line 165
-#: rc.cpp:434
-#, no-c-format
-msgid "Closes the Dialog"
+#: editor/formfile.cpp:155 editor/messagelog.cpp:128
+msgid "Overwrite"
+msgstr "Trosysgrifo"
+
+#: editor/messagelog.cpp:132
+msgid "<qt>Cannot save log file<br><b>%1</b></qt>"
 msgstr ""
 
-#. i18n: file ./editor/createtemplate.ui line 178
-#: rc.cpp:437
-#, no-c-format
-msgid "&Baseclass for template:"
+#: editor/messagelog.cpp:146
+#, fuzzy
+msgid "Stdout"
+msgstr "Trwylinellu"
+
+#: editor/messagelog.cpp:146
+#, fuzzy
+msgid "Stderr"
+msgstr "Anfonwr"
+
+#: editor/iconvieweditorimpl.cpp:124 editor/listboxeditorimpl.cpp:134
+msgid "Edit Items of '%1'"
 msgstr ""
 
-#. i18n: file ./editor/assoctexteditor.ui line 16
-#: rc.cpp:440
-#, no-c-format
-msgid "Edit Text"
+#: editor/command.cpp:499 editor/command.cpp:511
+msgid "Set 'name' Property"
 msgstr ""
 
-#. i18n: file ./editor/assoctexteditor.ui line 35
-#: rc.cpp:443
-#, no-c-format
-msgid "&Widget:"
+#: editor/command.cpp:500
+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'."
 msgstr ""
 
-#. i18n: file ./editor/assoctexteditor.ui line 67
-#: rc.cpp:449
-#, no-c-format
-msgid "&Text for:"
+#: editor/command.cpp:512
+msgid ""
+"The name of a widget must not be null.\n"
+"The name has been reverted to '%1'."
 msgstr ""
 
-#. i18n: file ./editor/assoctexteditor.ui line 104
-#: rc.cpp:455
-#, no-c-format
-msgid "&Function..."
-msgstr "&Ffwythiant..."
+#: editor/sizehandle.cpp:230
+msgid "Resize"
+msgstr "Newid maint"
 
-#. i18n: file ./editor/assoctexteditor.ui line 137
-#: rc.cpp:458
-#, no-c-format
-msgid "Wi&dget:"
+#: editor/widgetfactory.cpp:291 editor/widgetfactory.cpp:571
+msgid "Move Tab Page"
 msgstr ""
 
-#. i18n: file ./editor/assoctexteditor.ui line 184
-#: rc.cpp:461
-#, no-c-format
-msgid "Fi&le..."
-msgstr "Ff&eil..."
+#: editor/widgetfactory.cpp:967 editor/widgetfactory.cpp:1169
+msgid "Tab 1"
+msgstr "Tab 1"
 
-#. i18n: file ./editor/preferences.ui line 35
-#: rc.cpp:464
-#, no-c-format
-msgid "Preferences"
-msgstr "Hoffterau"
+#: editor/widgetfactory.cpp:970 editor/widgetfactory.cpp:1172
+msgid "Tab 2"
+msgstr "Tab 2"
 
-#. i18n: file ./editor/preferences.ui line 41
-#: rc.cpp:467
-#, no-c-format
-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>"
+#: editor/widgetfactory.cpp:1156 editor/widgetfactory.cpp:1184
+msgid "Page 1"
 msgstr ""
 
-#. i18n: file ./editor/preferences.ui line 62
-#: rc.cpp:470
-#, no-c-format
-msgid "General"
-msgstr "Cyffredinol"
+#: editor/widgetfactory.cpp:1157 editor/widgetfactory.cpp:1187
+msgid "Page 2"
+msgstr ""
 
-#. i18n: file ./editor/preferences.ui line 79
-#: rc.cpp:473
-#, no-c-format
-msgid "Backgro&und"
-msgstr "Cefndir"
+#: editor/tableeditorimpl.cpp:55
+msgid "<no field>"
+msgstr ""
 
-#. i18n: file ./editor/preferences.ui line 114
-#: rc.cpp:479
-#, no-c-format
-msgid "Select a color in the color dialog."
+#: editor/tableeditorimpl.cpp:315
+msgid "Edit Rows and Columns of '%1' "
 msgstr ""
 
-#. i18n: file ./editor/preferences.ui line 125
-#: rc.cpp:482
-#, no-c-format
-msgid "Co&lor"
-msgstr "Ll&iw"
+#: editor/wizardeditorimpl.cpp:62
+msgid "Edit Wizard Pages"
+msgstr ""
 
-#. i18n: file ./editor/preferences.ui line 128
-#: rc.cpp:485
-#, no-c-format
-msgid "Use a background color"
+#: editor/wizardeditorimpl.cpp:151 editor/wizardeditorimpl.cpp:171
+msgid "Swap Pages %1 and %2 of %3"
 msgstr ""
 
-#. i18n: file ./editor/preferences.ui line 131
-#: rc.cpp:488
-#, no-c-format
-msgid "Use a background color."
+#: editor/mainwindow.cpp:1178 editor/mainwindow.cpp:1291
+#: editor/wizardeditorimpl.cpp:200
+msgid "Page Title"
 msgstr ""
 
-#. i18n: file ./editor/preferences.ui line 139
-#: rc.cpp:491
-#, no-c-format
-msgid "&Pixmap"
-msgstr "&Picsfap"
+#: editor/mainwindow.cpp:1178 editor/mainwindow.cpp:1291
+#: editor/wizardeditorimpl.cpp:200
+msgid "New page title:"
+msgstr ""
 
-#. i18n: file ./editor/preferences.ui line 145
-#: rc.cpp:494
-#, no-c-format
-msgid "Use a background pixmap"
+#: editor/mainwindow.cpp:1293 editor/wizardeditorimpl.cpp:202
+msgid "Rename page %1 of %2"
 msgstr ""
 
-#. i18n: file ./editor/preferences.ui line 148
-#: rc.cpp:497
-#, no-c-format
-msgid "Use a background pixmap."
+#: editor/propertyeditor.cpp:406
+msgid "Reset the property to its default value"
 msgstr ""
 
-#. i18n: file ./editor/preferences.ui line 171
-#: rc.cpp:503
-#, no-c-format
-msgid "Choose a pixmap file."
+#: editor/propertyeditor.cpp:407
+msgid "Click this button to reset the property to its default value"
 msgstr ""
 
-#. i18n: file ./editor/preferences.ui line 181
-#: rc.cpp:506
-#, no-c-format
-msgid "Show &grid"
-msgstr "Dangos &grid"
+#: editor/propertyeditor.cpp:1071 editor/propertyeditor.cpp:1132
+msgid "False"
+msgstr "Ffug"
 
-#. i18n: file ./editor/preferences.ui line 187
-#: rc.cpp:509
-#, no-c-format
-msgid "Show Grid"
-msgstr "Dangos Grid"
+#: editor/propertyeditor.cpp:1072 editor/propertyeditor.cpp:1130
+msgid "True"
+msgstr "Gwir"
 
-#. i18n: file ./editor/preferences.ui line 190
-#: rc.cpp:512
-#, no-c-format
-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 ""
+#: editor/propertyeditor.cpp:1410 editor/propertyeditor.cpp:1428
+#: editor/propertyeditor.cpp:1507 editor/propertyeditor.cpp:1518
+msgid "x"
+msgstr "x"
 
-#. i18n: file ./editor/preferences.ui line 198
-#: rc.cpp:515
-#, no-c-format
-msgid "Gr&id"
-msgstr "Gr&id"
+#: editor/propertyeditor.cpp:1412 editor/propertyeditor.cpp:1433
+#: editor/propertyeditor.cpp:1509 editor/propertyeditor.cpp:1520
+msgid "y"
+msgstr "y"
 
-#. i18n: file ./editor/preferences.ui line 218
-#: rc.cpp:518
-#, no-c-format
-msgid "Sn&ap to grid"
-msgstr "Sn&apio i'r grid"
+#: editor/propertyeditor.cpp:1416 editor/propertyeditor.cpp:1438
+#: editor/propertyeditor.cpp:1511 editor/propertyeditor.cpp:1525
+msgid "width"
+msgstr "lled"
 
-#. i18n: file ./editor/preferences.ui line 224
-#: rc.cpp:521
-#, no-c-format
-msgid "Snap to the grid"
-msgstr ""
+#: editor/propertyeditor.cpp:1418 editor/propertyeditor.cpp:1443
+#: editor/propertyeditor.cpp:1513 editor/propertyeditor.cpp:1527
+msgid "height"
+msgstr "taldra"
 
-#. i18n: file ./editor/preferences.ui line 227
-#: rc.cpp:524
-#, no-c-format
-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 "
-"the X/Y resolution.</p>"
-msgstr ""
+#: editor/propertyeditor.cpp:1647 editor/propertyeditor.cpp:1660
+#: editor/propertyeditor.cpp:1710
+msgid "Red"
+msgstr "Coch"
 
-#. i18n: file ./editor/preferences.ui line 258
-#: rc.cpp:527 rc.cpp:533
-#, no-c-format
-msgid "Grid resolution"
+#: editor/propertyeditor.cpp:1649 editor/propertyeditor.cpp:1662
+#: editor/propertyeditor.cpp:1712
+msgid "Green"
+msgstr "Gwyrdd"
+
+#: editor/propertyeditor.cpp:1651 editor/propertyeditor.cpp:1664
+#: editor/propertyeditor.cpp:1714
+msgid "Blue"
+msgstr "Glas"
+
+#: editor/propertyeditor.cpp:1768 editor/propertyeditor.cpp:1787
+#: editor/propertyeditor.cpp:1852
+msgid "Family"
+msgstr "Teulu"
+
+#: editor/propertyeditor.cpp:1770 editor/propertyeditor.cpp:1790
+#: editor/propertyeditor.cpp:1854
+msgid "Point Size"
 msgstr ""
 
-#. i18n: file ./editor/preferences.ui line 261
-#: rc.cpp:530 rc.cpp:536
-#, no-c-format
-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>"
+#: editor/propertyeditor.cpp:1772 editor/propertyeditor.cpp:1792
+#: editor/propertyeditor.cpp:1856
+msgid "Bold"
+msgstr "Trwm"
+
+#: editor/propertyeditor.cpp:1776 editor/propertyeditor.cpp:1796
+#: editor/propertyeditor.cpp:1860
+msgid "Underline"
+msgstr "Tanlinellu"
+
+#: editor/propertyeditor.cpp:1778 editor/propertyeditor.cpp:1798
+#: editor/propertyeditor.cpp:1862
+msgid "Strikeout"
+msgstr "Trwylinellu"
+
+#: editor/propertyeditor.cpp:1892 editor/propertyeditor.cpp:1910
+msgid "Connection"
+msgstr "Cysylltiad"
+
+#: editor/propertyeditor.cpp:1897 editor/propertyeditor.cpp:1951
+msgid "Field"
+msgstr "Maes"
+
+#: editor/propertyeditor.cpp:2059 editor/propertyeditor.cpp:2077
+#: editor/propertyeditor.cpp:2127
+msgid "hSizeType"
 msgstr ""
 
-#. i18n: file ./editor/preferences.ui line 289
-#: rc.cpp:539
-#, no-c-format
-msgid "Grid-&X:"
+#: editor/propertyeditor.cpp:2062 editor/propertyeditor.cpp:2079
+#: editor/propertyeditor.cpp:2129
+msgid "vSizeType"
 msgstr ""
 
-#. i18n: file ./editor/preferences.ui line 300
-#: rc.cpp:542
-#, no-c-format
-msgid "Grid-&Y:"
+#: editor/propertyeditor.cpp:2065 editor/propertyeditor.cpp:2081
+#: editor/propertyeditor.cpp:2131
+msgid "horizontalStretch"
 msgstr ""
 
-#. i18n: file ./editor/preferences.ui line 327
-#: rc.cpp:545 rc.cpp:566
-#, no-c-format
-msgid ""
-"A splash screen is displayed when starting Qt Designer if this option is "
-"checked."
+#: editor/propertyeditor.cpp:2067 editor/propertyeditor.cpp:2083
+#: editor/propertyeditor.cpp:2133
+msgid "verticalStretch"
 msgstr ""
 
-#. i18n: file ./editor/preferences.ui line 335
-#: rc.cpp:548
-#, no-c-format
-msgid "Ge&neral"
-msgstr "Cy&ffredinol"
+#: editor/propertyeditor.cpp:2254
+msgid "Arrow"
+msgstr "Saeth"
 
-#. i18n: file ./editor/preferences.ui line 352
-#: rc.cpp:551
-#, no-c-format
-msgid "Restore last &workspace on startup"
+#: editor/propertyeditor.cpp:2258
+msgid "Up-Arrow"
 msgstr ""
 
-#. i18n: file ./editor/preferences.ui line 358
-#: rc.cpp:554
-#, no-c-format
-msgid "Restore last workspace"
-msgstr ""
+#: editor/propertyeditor.cpp:2262
+msgid "Cross"
+msgstr "Croes"
 
-#. i18n: file ./editor/preferences.ui line 361
-#: rc.cpp:557
-#, no-c-format
-msgid ""
-"The current workspace settings will be restored the next time you start Qt "
-"Designer if this option is checked."
-msgstr ""
+#: editor/propertyeditor.cpp:2266
+msgid "Waiting"
+msgstr "Aros"
 
-#. i18n: file ./editor/preferences.ui line 369
-#: rc.cpp:560
-#, no-c-format
-msgid "Show &splash screen on startup"
-msgstr ""
+#: editor/propertyeditor.cpp:2270
+msgid "iBeam"
+msgstr "iTrawst"
 
-#. i18n: file ./editor/preferences.ui line 375
-#: rc.cpp:563
-#, no-c-format
-msgid "Show Splashscreen"
+#: editor/propertyeditor.cpp:2274
+#, fuzzy
+msgid "SizeQt::Vertical"
+msgstr "Maint Fertigol"
+
+#: editor/propertyeditor.cpp:2278
+#, fuzzy
+msgid "SizeQt::Horizontal"
+msgstr "Maint Llorweddol"
+
+#: editor/propertyeditor.cpp:2282
+msgid "Size Slash"
+msgstr "Maint Slaes"
+
+#: editor/propertyeditor.cpp:2286
+msgid "Size Backslash"
+msgstr "Maint Slaes Ôl"
+
+#: editor/propertyeditor.cpp:2290
+msgid "Size All"
+msgstr "Maint Popeth"
+
+#: editor/propertyeditor.cpp:2294
+msgid "Blank"
+msgstr "Gwag"
+
+#: editor/propertyeditor.cpp:2298
+#, fuzzy
+msgid "SplitQt::Vertical"
+msgstr "Hollti'n Fertigol"
+
+#: editor/propertyeditor.cpp:2302
+#, fuzzy
+msgid "SplitQt::Horizontal"
+msgstr "Hollti'n Lorweddol"
+
+#: editor/propertyeditor.cpp:2306
+msgid "Pointing Hand"
+msgstr "Llaw sy'n Pwyntio"
+
+#: editor/propertyeditor.cpp:2310
+msgid "Forbidden"
+msgstr "Gwaharddir"
+
+#: editor/propertyeditor.cpp:2402
+msgid "Property"
+msgstr "Priodwedd"
+
+#: editor/propertyeditor.cpp:2403
+msgid "Value"
+msgstr "Gwerth"
+
+#: editor/propertyeditor.cpp:2885
+msgid "Set '%1' of '%2'"
 msgstr ""
 
-#. i18n: file ./editor/preferences.ui line 386
-#: rc.cpp:569
-#, no-c-format
-msgid "Disable data&base auto-edit in preview"
+#: editor/propertyeditor.cpp:3006
+msgid "Sort &Categorized"
 msgstr ""
 
-#. i18n: file ./editor/preferences.ui line 397
-#: rc.cpp:572
-#, no-c-format
-msgid "&Documentation path:"
+#: editor/propertyeditor.cpp:3007
+msgid "Sort &Alphabetically"
+msgstr "Trefn&u yn ôl yr wyddor"
+
+#: editor/propertyeditor.cpp:3137
+msgid "Reset '%1' of '%2'"
 msgstr ""
 
-#. i18n: file ./editor/preferences.ui line 422
-#: rc.cpp:575
-#, no-c-format
+#: editor/propertyeditor.cpp:3244
 msgid ""
-"<b>Enter the path to the documentation.</b>"
-"<p>You may provide an $environment variable as the first part of the "
-"pathname.</p>"
+"<p><b>TQWidget::%1</b></p>"
+"<p>There is no documentation available for this property.</p>"
 msgstr ""
 
-#. i18n: file ./editor/preferences.ui line 436
-#: rc.cpp:581
-#, no-c-format
-msgid "Select path"
+#: editor/propertyeditor.cpp:3395
+msgid "New Signal Handler"
 msgstr ""
 
-#. i18n: file ./editor/preferences.ui line 439
-#: rc.cpp:584
-#, no-c-format
-msgid "Look for the documentation path."
+#: editor/propertyeditor.cpp:3396
+msgid "Delete Signal Handler"
 msgstr ""
 
-#. i18n: file ./editor/preferences.ui line 451
-#: rc.cpp:587
-#, no-c-format
-msgid "&Toolbars"
-msgstr "&Barrau Offer:"
+#: editor/connectioneditorimpl.cpp:236 editor/propertyeditor.cpp:3430
+msgid "Remove Connection"
+msgstr "Gwaredu Cysylltiad"
 
-#. i18n: file ./editor/preferences.ui line 468
-#: rc.cpp:590
-#, no-c-format
-msgid "Show &big icons"
+#: editor/connectioneditorimpl.cpp:246 editor/propertyeditor.cpp:3480
+msgid "Add Connection"
 msgstr ""
 
-#. i18n: file ./editor/preferences.ui line 471
-#: rc.cpp:593
-#, no-c-format
-msgid "Big Icons"
+#: editor/mainwindow.cpp:243 editor/propertyeditor.cpp:3542
+#: editor/propertyeditor.cpp:3582
+msgid "Property Editor"
 msgstr ""
 
-#. i18n: file ./editor/preferences.ui line 474
-#: rc.cpp:596
-#, no-c-format
-msgid "Big icons will be used in the toolbars if this is checked."
-msgstr ""
+#: editor/propertyeditor.cpp:3547
+msgid "P&roperties"
+msgstr "P&riodweddau"
 
-#. i18n: file ./editor/preferences.ui line 482
-#: rc.cpp:599
-#, no-c-format
-msgid "Show text lab&els"
+#: editor/propertyeditor.cpp:3550
+msgid "S&ignal Handlers"
 msgstr ""
 
-#. i18n: file ./editor/preferences.ui line 485
-#: rc.cpp:602
-#, no-c-format
-msgid "Text Labels"
+#: editor/propertyeditor.cpp:3591
+msgid "Property Editor (%1)"
 msgstr ""
 
-#. i18n: file ./editor/preferences.ui line 488
-#: rc.cpp:605
-#, no-c-format
-msgid "Text labels will be usin in the toolbars if this is checked."
-msgstr ""
+#: editor/actioneditorimpl.cpp:47 editor/actionlistview.cpp:90
+msgid "New &Action"
+msgstr "Gwei&thred Newydd"
 
-#. i18n: file ./editor/listvieweditor.ui line 35
-#: rc.cpp:623
-#, no-c-format
-msgid "Edit Listview"
+#: editor/actioneditorimpl.cpp:48 editor/actionlistview.cpp:91
+msgid "New Action &Group"
+msgstr "Grŵp Newydd o Weithredoedd"
+
+#: editor/actioneditorimpl.cpp:49 editor/actionlistview.cpp:92
+msgid "New &Dropdown Action Group"
 msgstr ""
 
-#. i18n: file ./editor/listvieweditor.ui line 41
-#: rc.cpp:626
-#, no-c-format
-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>"
+#: editor/actionlistview.cpp:95
+msgid "&Connect Action..."
 msgstr ""
 
-#. i18n: file ./editor/listvieweditor.ui line 85
-#: rc.cpp:638
-#, no-c-format
-msgid "<b>Deletes the selected item.</b><p>Any sub-items are also deleted.</p>"
+#: editor/actionlistview.cpp:97
+msgid "Delete Action"
+msgstr "Dileu Gweithred"
+
+#: editor/multilineeditorimpl.cpp:56
+msgid "Set Text of '%1'"
 msgstr ""
 
-#. i18n: file ./editor/listvieweditor.ui line 99
-#: rc.cpp:641
-#, no-c-format
-msgid "Item &Properties"
+#: editor/mainwindow.cpp:141
+msgid "Welcome to the Kommander Editor"
 msgstr ""
 
-#. i18n: file ./editor/listvieweditor.ui line 116
-#: rc.cpp:644
-#, no-c-format
-msgid "Pi&xmap:"
-msgstr "Pi&csfap :"
+#: editor/mainwindow.cpp:148
+msgid "Layout"
+msgstr "Cynllun"
 
-#. i18n: file ./editor/listvieweditor.ui line 147
-#: rc.cpp:653
-#, no-c-format
+#: editor/mainwindow.cpp:245
 msgid ""
-"<b>Change the text of the item.</b>"
-"<p>The text will be changed in the current column of the selected item.</p>"
+"<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 ""
 
-#. i18n: file ./editor/listvieweditor.ui line 155
-#: rc.cpp:656
-#, no-c-format
-msgid "Change column"
+#: editor/mainwindow.cpp:271
+msgid "Object Explorer"
 msgstr ""
 
-#. i18n: file ./editor/listvieweditor.ui line 158
-#: rc.cpp:659
-#, no-c-format
+#: editor/mainwindow.cpp:273
 msgid ""
-"<b>Select the current column.</b>"
-"<p>The item's text and pixmap will be changed for the current column</p>"
+"<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 ""
 
-#. i18n: file ./editor/listvieweditor.ui line 166
-#: rc.cpp:662
-#, no-c-format
-msgid "Colu&mn:"
-msgstr "Colo&fn:"
+#: editor/mainwindow.cpp:284 editor/mainwindow.cpp:293
+#, fuzzy
+msgid "Dialogs"
+msgstr "Ymgom"
 
-#. i18n: file ./editor/listvieweditor.ui line 214
-#: rc.cpp:671 rc.cpp:1178 rc.cpp:1235
-#, no-c-format
-msgid ""
-"<b>Delete the selected item's pixmap.</b>"
-"<p>The pixmap in the current column of the selected item will be deleted.</p>"
+#: editor/mainwindow.cpp:287
+msgid "Start typing the buffer you want to switch to here (ALT+B)"
 msgstr ""
 
-#. i18n: file ./editor/listvieweditor.ui line 234
-#: rc.cpp:680 rc.cpp:1187 rc.cpp:1244
-#, no-c-format
+#: editor/mainwindow.cpp:294
 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>"
+"<h2>The File Overview Window</h2>"
+"<p>The File Overview Window displays all open dialogs.</p>"
 msgstr ""
 
-#. i18n: file ./editor/listvieweditor.ui line 252
-#: rc.cpp:689
-#, no-c-format
-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>"
+#: editor/actioneditorimpl.cpp:42 editor/mainwindow.cpp:301
+msgid "Actions"
+msgstr "Gweithredoedd"
+
+#: editor/mainwindow.cpp:305
+msgid "Action Editor"
 msgstr ""
 
-#. i18n: file ./editor/listvieweditor.ui line 260
-#: rc.cpp:692 rc.cpp:998
-#, no-c-format
-msgid "The list of items."
+#: 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 ""
 
-#. i18n: file ./editor/listvieweditor.ui line 268
-#: rc.cpp:695
-#, no-c-format
-msgid "New &Subitem"
-msgstr "&Is-eitem Newydd"
+#: editor/mainwindow.cpp:316 editor/mainwindow.cpp:319
+msgid "Message Log"
+msgstr ""
 
-#. i18n: file ./editor/listvieweditor.ui line 271
-#: rc.cpp:698
-#, no-c-format
-msgid "Add a subitem"
+#: editor/mainwindow.cpp:395 editor/mainwindow.cpp:449
+#: editor/mainwindow.cpp:513
+msgid "<qt>Cannot create backup file <i>%1</i>.</qt>"
 msgstr ""
 
-#. i18n: file ./editor/listvieweditor.ui line 274
-#: rc.cpp:701
-#, no-c-format
-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>"
+#: editor/mainwindow.cpp:406 editor/mainwindow.cpp:470
+msgid "There is a dialog already running."
 msgstr ""
 
-#. i18n: file ./editor/listvieweditor.ui line 305
-#: rc.cpp:704 rc.cpp:800 rc.cpp:1052 rc.cpp:1151 rc.cpp:1205
-#, no-c-format
-msgid "Move up"
-msgstr "Symud i fyny"
+#: editor/mainwindow.cpp:406 editor/mainwindow.cpp:470
+msgid "Run"
+msgstr "Rhedeg"
 
-#. i18n: file ./editor/listvieweditor.ui line 308
-#: rc.cpp:707
-#, no-c-format
+#: editor/mainwindow.cpp:439 editor/mainwindow.cpp:503
+msgid "<qt>Cannot create temporary file <i>%1</i>.</qt>"
+msgstr ""
+
+#: editor/mainwindow.cpp:850
 msgid ""
-"<b>Move the selected item up.</b>"
-"<p>The item will be moved within its level in the hierarchy.</p>"
+"<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 ""
 
-#. i18n: file ./editor/listvieweditor.ui line 322
-#: rc.cpp:710 rc.cpp:785 rc.cpp:1058 rc.cpp:1157 rc.cpp:1211
-#, no-c-format
-msgid "Move down"
-msgstr "Symud i lawr"
+#: editor/mainwindow.cpp:955
+#, c-format
+msgid "&Undo: %1"
+msgstr "&Dadwneud: %1"
 
-#. i18n: file ./editor/listvieweditor.ui line 325
-#: rc.cpp:713
-#, no-c-format
-msgid ""
-"<b>Move the selected item down.</b>"
-"<p>The item will be moved within its level in the hierarchy.</p>"
+#: editor/mainwindow.cpp:957 editor/mainwindowactions.cpp:100
+msgid "&Undo: Not Available"
 msgstr ""
 
-#. i18n: file ./editor/listvieweditor.ui line 339
-#: rc.cpp:716
-#, no-c-format
-msgid "Move left"
-msgstr "Symud i'r Chwith"
+#: editor/mainwindow.cpp:959
+#, c-format
+msgid "&Redo: %1"
+msgstr "&Ail-wneud: %1"
 
-#. i18n: file ./editor/listvieweditor.ui line 342
-#: rc.cpp:719
-#, no-c-format
-msgid ""
-"<b>Move the selected item one level up.</b>"
-"<p>This will also change the level of the item's sub-items.</p>"
+#: editor/mainwindow.cpp:961 editor/mainwindowactions.cpp:106
+msgid "&Redo: Not Available"
 msgstr ""
 
-#. i18n: file ./editor/listvieweditor.ui line 356
-#: rc.cpp:722
-#, no-c-format
-msgid "Move right"
-msgstr "Symud i'r Dde"
+#: editor/mainwindow.cpp:1038
+msgid "Choose Pixmap..."
+msgstr ""
 
-#. i18n: file ./editor/listvieweditor.ui line 359
-#: rc.cpp:725
-#, no-c-format
-msgid ""
-"<b>Move the selected item one level down.</b>"
-"<p>This will also change the level of the item's sub-items.</p>"
+#: editor/mainwindow.cpp:1042
+msgid "Edit Text..."
 msgstr ""
 
-#. i18n: file ./editor/listvieweditor.ui line 369
-#: rc.cpp:728 rc.cpp:1148
-#, no-c-format
-msgid "Co&lumns"
-msgstr "Co&lofnau"
+#: editor/mainwindow.cpp:1046
+msgid "Edit Title..."
+msgstr ""
 
-#. i18n: file ./editor/listvieweditor.ui line 386
-#: rc.cpp:731
-#, no-c-format
-msgid "Column Properties"
+#: editor/mainwindow.cpp:1050 editor/mainwindow.cpp:1128
+msgid "Edit Page Title..."
 msgstr ""
 
-#. i18n: file ./editor/listvieweditor.ui line 437
-#: rc.cpp:743
-#, no-c-format
-msgid "Delete the pixmap of the selected column."
+#: editor/mainwindow.cpp:1066 editor/mainwindow.cpp:1111
+msgid "Edit Kommander Text..."
 msgstr ""
 
-#. i18n: file ./editor/listvieweditor.ui line 457
-#: rc.cpp:752
-#, no-c-format
-msgid ""
-"<b>Select a pixmap file for the selected column.</b>"
-"<p>The pixmap will be displayed in the header of the listview.</p>"
+#: editor/mainwindow.cpp:1075 editor/mainwindow.cpp:1085
+#: editor/mainwindow.cpp:1121 editor/mainwindow.cpp:1561
+msgid "Delete Page"
+msgstr "Dileu Tudalen"
+
+#: editor/mainwindow.cpp:1078 editor/mainwindow.cpp:1088
+#: editor/mainwindow.cpp:1125 editor/mainwindow.cpp:1560
+msgid "Add Page"
 msgstr ""
 
-#. i18n: file ./editor/listvieweditor.ui line 482
-#: rc.cpp:758
-#, no-c-format
-msgid "Enter column text"
+#: editor/mainwindow.cpp:1095
+msgid "Edit..."
+msgstr "Golygu..."
+
+#: editor/mainwindow.cpp:1131
+msgid "Edit Pages..."
 msgstr ""
 
-#. i18n: file ./editor/listvieweditor.ui line 485
-#: rc.cpp:761
-#, no-c-format
-msgid ""
-"<b>Enter the text for the selected column.</b>"
-"<p>The text will be displayed in the header of the listview.</p>"
+#: editor/mainwindow.cpp:1137
+msgid "Add Menu Item"
 msgstr ""
 
-#. i18n: file ./editor/listvieweditor.ui line 493
-#: rc.cpp:764
-#, no-c-format
-msgid "Clicka&ble"
-msgstr "Clicad&wy"
+#: editor/mainwindow.cpp:1139
+msgid "Add Toolbar"
+msgstr ""
 
-#. i18n: file ./editor/listvieweditor.ui line 496
-#: rc.cpp:767
-#, no-c-format
-msgid ""
-"If this option is checked, the selected column will react to mouse clicks on "
-"the header."
+#: editor/mainwindow.cpp:1153 editor/mainwindow.cpp:1639
+msgid "New text:"
+msgstr "Testun Newydd :"
+
+#: editor/mainwindow.cpp:1156
+msgid "Set the 'text' of '%1'"
 msgstr ""
 
-#. i18n: file ./editor/listvieweditor.ui line 504
-#: rc.cpp:770
-#, no-c-format
-msgid "Re&sizable"
-msgstr "Ge&llir newid ei faint"
+#: editor/mainwindow.cpp:1166 editor/mainwindow.cpp:1655
+msgid "Title"
+msgstr "Teitl"
 
-#. i18n: file ./editor/listvieweditor.ui line 507
-#: rc.cpp:773
-#, no-c-format
-msgid "The column's width will be resizeable if this option is checked."
+#: editor/mainwindow.cpp:1166 editor/mainwindow.cpp:1655
+msgid "New title:"
+msgstr "Teitl newydd:"
+
+#: editor/mainwindow.cpp:1168
+msgid "Set the 'title' of '%1'"
 msgstr ""
 
-#. i18n: file ./editor/listvieweditor.ui line 517
-#: rc.cpp:776 rc.cpp:1163
-#, no-c-format
-msgid "&Delete Column"
-msgstr "&Dileu Colofn"
+#: editor/mainwindow.cpp:1180
+msgid "Set the 'pageTitle' of '%1'"
+msgstr ""
 
-#. i18n: file ./editor/listvieweditor.ui line 520
-#: rc.cpp:779
-#, no-c-format
-msgid "Delete column"
-msgstr "Dileu Colofn"
+#: editor/mainwindow.cpp:1192
+msgid "Set the 'pixmap' of '%1'"
+msgstr ""
 
-#. i18n: file ./editor/listvieweditor.ui line 523
-#: rc.cpp:782
-#, no-c-format
-msgid "Deletes the selected Column."
+#: editor/mainwindow.cpp:1303
+msgid "Add Toolbar to '%1'"
 msgstr ""
 
-#. i18n: file ./editor/listvieweditor.ui line 540
-#: rc.cpp:788
-#, no-c-format
-msgid ""
-"<b>Move the selected item down.</b>"
-"<p>The top-most column will be the first column in the list.</p>"
+#: editor/mainwindow.cpp:1307
+msgid "Add Menu to '%1'"
 msgstr ""
 
-#. i18n: file ./editor/listvieweditor.ui line 548
-#: rc.cpp:791 rc.cpp:1166
-#, no-c-format
-msgid "&New Column"
-msgstr "&Colofn Newydd"
+#: editor/mainwindow.cpp:1624
+msgid "Edit %1..."
+msgstr "Golygu %1 ..."
 
-#. i18n: file ./editor/listvieweditor.ui line 551
-#: rc.cpp:794
-#, no-c-format
-msgid "Add a Column"
+#: editor/mainwindow.cpp:1642
+msgid "Set the 'text' of '%2'"
 msgstr ""
 
-#. i18n: file ./editor/listvieweditor.ui line 554
-#: rc.cpp:797
-#, no-c-format
-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>"
+#: editor/mainwindow.cpp:1657
+msgid "Set the 'title' of '%2'"
 msgstr ""
 
-#. i18n: file ./editor/listvieweditor.ui line 571
-#: rc.cpp:803
-#, no-c-format
+#: editor/mainwindow.cpp:1745
 msgid ""
-"<b>Move the selected item up.</b>"
-"<p>The top-most column will be the first column in the list.</p>"
+"Kommander found some temporary saved files, which were\n"
+"written when Kommander crashed last time. Do you want to\n"
+"load these files?"
 msgstr ""
 
-#. i18n: file ./editor/listvieweditor.ui line 579
-#: rc.cpp:806
-#, no-c-format
-msgid "The list of columns."
+#: editor/mainwindow.cpp:1747
+msgid "Restoring Last Session"
 msgstr ""
 
-#. i18n: file ./editor/paletteeditor.ui line 43
-#: rc.cpp:830
-#, no-c-format
-msgid "Edit Palette"
-msgstr ""
+#: editor/mainwindow.cpp:1747
+msgid "Load"
+msgstr "Llwytho"
 
-#. i18n: file ./editor/paletteeditor.ui line 68
-#: rc.cpp:833
-#, no-c-format
-msgid "Build Palette"
+#: editor/mainwindow.cpp:1747
+msgid "Do Not Load"
 msgstr ""
 
-#. i18n: file ./editor/paletteeditor.ui line 111
-#: rc.cpp:836
-#, no-c-format
-msgid "&3D effects:"
+#: editor/mainwindow.cpp:1800
+msgid "There is no help available for this dialog at the moment."
 msgstr ""
 
-#. i18n: file ./editor/paletteeditor.ui line 142
-#: rc.cpp:842
-#, no-c-format
-msgid "Choose the effect-color for the generated palette."
+#: editor/mainwindow.cpp:1814
+msgid "<qt>Could not open file:<br><b>%1</b><br>File does not exist.</qt>"
 msgstr ""
 
-#. i18n: file ./editor/paletteeditor.ui line 173
-#: rc.cpp:845
-#, no-c-format
-msgid "Back&ground:"
-msgstr "Cefn&dir:"
+#: editor/mainwindow.cpp:1815
+msgid "Open File"
+msgstr "Agor Ffeil"
 
-#. i18n: file ./editor/paletteeditor.ui line 204
-#: rc.cpp:851
-#, no-c-format
-msgid "Choose the background color for the generated palette."
-msgstr ""
+#: editor/newformimpl.cpp:123
+msgid "Load Template"
+msgstr "Llwytho Patrymlun"
 
-#. i18n: file ./editor/paletteeditor.ui line 229
-#: rc.cpp:854
-#, no-c-format
-msgid "&Tune Palette..."
+#: editor/newformimpl.cpp:124
+msgid "Could not load form description from template '%1'"
 msgstr ""
 
-#. i18n: file ./editor/paletteeditor.ui line 247
-#: rc.cpp:857
-#, no-c-format
-msgid "Preview"
-msgstr "Rhagolwg"
+#: editor/newformimpl.cpp:144
+msgid "Dialog"
+msgstr "Ymgom"
 
-#. i18n: file ./editor/listeditor.ui line 71
-#: rc.cpp:899
-#, no-c-format
-msgid "Re&name"
-msgstr "Ai&l-enwi"
+#: editor/newformimpl.cpp:150
+msgid "Wizard"
+msgstr "Dewin"
 
-#. i18n: file ./editor/formsettings.ui line 35
-#: rc.cpp:905
-#, no-c-format
-msgid "Form Settings"
+#: editor/functionsimpl.cpp:102
+#, fuzzy
+msgid "Functions"
+msgstr "&Ffwythiant"
+
+#: editor/functionsimpl.cpp:198
+msgid ""
+"To learn more about the slot, look at the documentation of the base TQt/TDE "
+"class, most probably <i>%1</i>."
 msgstr ""
 
-#. i18n: file ./editor/formsettings.ui line 41
-#: rc.cpp:908
-#, no-c-format
+#: editor/functionsimpl.cpp:202 editor/functionsimpl.cpp:225
 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>"
+"<qt>"
+"<h3>%1</h3>"
+"<p><b>Description:</b> %2\n"
+"<p><b>Syntax:</b> <i>%3</i>%4</qt>"
 msgstr ""
 
-#. i18n: file ./editor/formsettings.ui line 122
-#: rc.cpp:923
-#, no-c-format
-msgid "La&youts"
+#: editor/functionsimpl.cpp:214
+msgid "<p>Parameters are not obligatory."
 msgstr ""
 
-#. i18n: file ./editor/formsettings.ui line 155
-#: rc.cpp:926
-#, no-c-format
-msgid "Default mar&gin:"
+#: editor/functionsimpl.cpp:217
+#, c-format
+msgid ""
+"_n: "
+"<p>Only first argument is obligatory.\n"
+"<p>Only first %n arguments are obligatory."
 msgstr ""
 
-#. i18n: file ./editor/formsettings.ui line 166
-#: rc.cpp:929
-#, no-c-format
-msgid "D&efault spacing:"
+#: editor/formfile.cpp:121
+msgid ""
+"Failed to save file '%1'.\n"
+"Do you want to use another file name?"
 msgstr ""
 
-#. i18n: file ./editor/formsettings.ui line 202
-#: rc.cpp:935
-#, no-c-format
-msgid "Enter a comment about the form."
+#: editor/formfile.cpp:122
+msgid "Try Another"
 msgstr ""
 
-#. i18n: file ./editor/formsettings.ui line 227
-#: rc.cpp:938
-#, no-c-format
-msgid "Co&mment:"
-msgstr "S&ylwad:"
+#: editor/formfile.cpp:122
+msgid "Do Not Try"
+msgstr ""
 
-#. i18n: file ./editor/formsettings.ui line 238
-#: rc.cpp:941
-#, no-c-format
-msgid "&License:"
-msgstr "&Trwydded:"
+#: editor/formfile.cpp:127
+msgid "'%1' saved."
+msgstr ""
 
-#. i18n: file ./editor/formsettings.ui line 249
-#: rc.cpp:944 rc.cpp:956 rc.cpp:962
-#, no-c-format
-msgid "Enter your name"
-msgstr "Rhowch eich Enw"
+#: editor/formfile.cpp:141 editor/mainwindowactions.cpp:638
+msgid "*.kmdr|Kommander Files"
+msgstr ""
 
-#. i18n: file ./editor/formsettings.ui line 252
-#: rc.cpp:947 rc.cpp:959 rc.cpp:965
-#, no-c-format
-msgid "Enter your name."
-msgstr "Rhowch eich Enw."
+#: editor/formfile.cpp:142
+msgid "Save Form '%1' As"
+msgstr ""
 
-#. i18n: file ./editor/formsettings.ui line 260
-#: rc.cpp:950
-#, no-c-format
-msgid "&Version:"
-msgstr "Fe&rsiwn:"
+#: editor/formfile.cpp:154
+msgid "The file already exists. Do you wish to overwrite it?"
+msgstr ""
 
-#. i18n: file ./editor/formsettings.ui line 271
-#: rc.cpp:953
-#, no-c-format
-msgid "A&uthor:"
-msgstr "A&wdur:"
+#: editor/formfile.cpp:155
+msgid "Overwrite File?"
+msgstr "Trosysgrifo'r Ffeil?"
 
-#. i18n: file ./editor/listboxeditor.ui line 35
-#: rc.cpp:968
-#, no-c-format
-msgid "Edit Listbox"
+#: editor/formfile.cpp:184
+msgid "Dialog '%1' was modified.Do you want to save it?"
 msgstr ""
 
-#. i18n: file ./editor/listboxeditor.ui line 41
-#: rc.cpp:971
-#, no-c-format
-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>"
+#: editor/formfile.cpp:185
+msgid "Save File?"
 msgstr ""
 
-#. i18n: file ./editor/listboxeditor.ui line 229
-#: rc.cpp:1022
-#, no-c-format
-msgid "Choose a pixmap file for the selected item."
+#: editor/formfile.cpp:244
+msgid "unnamed"
+msgstr "di-enw"
+
+#: editor/actiondnd.cpp:294 editor/actiondnd.cpp:353
+msgid "Delete Toolbar"
 msgstr ""
 
-#. i18n: file ./editor/listboxeditor.ui line 257
-#: rc.cpp:1031
-#, no-c-format
-msgid "Change the selected item's text."
+#: editor/actiondnd.cpp:297 editor/actiondnd.cpp:383
+msgid "Delete Toolbar '%1'"
 msgstr ""
 
-#. i18n: file ./editor/listboxeditor.ui line 273
-#: rc.cpp:1040
-#, no-c-format
-msgid "<b>Add a new item.</b><p>New items are appended to the list.</p>"
+#: editor/actiondnd.cpp:348 editor/actiondnd.cpp:1022
+msgid "Delete Separator"
 msgstr ""
 
-#. i18n: file ./editor/listboxeditor.ui line 287
-#: rc.cpp:1049
-#, no-c-format
-msgid "Delete the selected item"
+#: editor/actiondnd.cpp:351 editor/actiondnd.cpp:1025
+msgid "Insert Separator"
+msgstr "Mewnosod Gwahanydd"
+
+#: editor/actiondnd.cpp:362 editor/actiondnd.cpp:422 editor/actiondnd.cpp:445
+msgid "Delete Action '%1' From Toolbar '%2'"
 msgstr ""
 
-#. i18n: file ./editor/listboxeditor.ui line 321
-#: rc.cpp:1055
-#, no-c-format
-msgid "Moves the selected item up."
+#: editor/actiondnd.cpp:377
+msgid "Add Separator to Toolbar '%1'"
 msgstr ""
 
-#. i18n: file ./editor/listboxeditor.ui line 338
-#: rc.cpp:1061
-#, no-c-format
-msgid "Move the selected item down."
+#: editor/actiondnd.cpp:464 editor/actiondnd.cpp:545
+msgid "Add Action '%1' to Toolbar '%2'"
 msgstr ""
 
-#. i18n: file ./editor/multilineeditor.ui line 38
-#: rc.cpp:1064
-#, no-c-format
-msgid "Edit Multiline Edit"
+#: editor/actiondnd.cpp:538 editor/actiondnd.cpp:1159
+msgid "Insert/Move Action"
 msgstr ""
 
-#. i18n: file ./editor/multilineeditor.ui line 46
-#: rc.cpp:1067
-#, no-c-format
+#: editor/actiondnd.cpp:539
 msgid ""
-"<b>Edit Multiline Edit</b>"
-"<p>Enter the text and click the <b>OK</b>-Button to apply the changes.</p>"
+"Action '%1' has already been added to this toolbar.\n"
+"An Action may only occur once in a given toolbar."
 msgstr ""
 
-#. i18n: file ./editor/multilineeditor.ui line 84
-#: rc.cpp:1073
-#, no-c-format
-msgid "Enter your text here."
+#: editor/actiondnd.cpp:673
+msgid "Add Widget '%1' to Toolbar '%2'"
 msgstr ""
 
-#. i18n: file ./editor/pixmapfunction.ui line 61
-#: rc.cpp:1100
-#, no-c-format
-msgid "&Enter arguments for loading the pixmap:"
+#: editor/actiondnd.cpp:738
+msgid "Rename Item..."
+msgstr "Ailenwi Eitem ..."
+
+#: editor/actiondnd.cpp:742
+msgid "Delete Menu '%1'"
 msgstr ""
 
-#. i18n: file ./editor/pixmapfunction.ui line 109
-#: rc.cpp:1103
-#, no-c-format
-msgid "QPixmap("
+#: editor/actiondnd.cpp:755
+msgid "Rename Menu Item"
 msgstr ""
 
-#. i18n: file ./editor/pixmapfunction.ui line 573
-#: rc.cpp:1106
-#, no-c-format
-msgid ")"
-msgstr ")"
+#: editor/actiondnd.cpp:755
+msgid "Menu text:"
+msgstr ""
 
-#. i18n: file ./editor/tableeditor.ui line 16
-#: rc.cpp:1118
-#, no-c-format
-msgid "Edit Table"
+#: editor/actiondnd.cpp:759
+msgid "Rename Menu '%1' to '%2'"
 msgstr ""
 
-#. i18n: file ./editor/tableeditor.ui line 34
-#: rc.cpp:1121 rc.cpp:1124
-#, no-c-format
-msgid "1"
-msgstr "1"
+#: editor/actiondnd.cpp:883
+msgid "Move Menu '%1'"
+msgstr ""
 
-#. i18n: file ./editor/tableeditor.ui line 218
-#: rc.cpp:1154 rc.cpp:1208
-#, no-c-format
-msgid ""
-"<b>Move the selected item up.</b>"
-"<p>The top-most column will be the first column of the list.</p>"
+#: editor/actiondnd.cpp:1032 editor/actiondnd.cpp:1071
+msgid "Delete Action '%1' From Popup Menu '%2'"
 msgstr ""
 
-#. i18n: file ./editor/tableeditor.ui line 235
-#: rc.cpp:1160 rc.cpp:1214
-#, no-c-format
-msgid ""
-"<b>Move the selected item down.</b>"
-"<p>The top-most column will be the first column of the list.</p>"
+#: editor/actiondnd.cpp:1042
+msgid "Add Separator to Popup Menu '%1'"
 msgstr ""
 
-#. i18n: file ./editor/tableeditor.ui line 273
-#: rc.cpp:1169
-#, no-c-format
-msgid "Table:"
-msgstr "Tabl:"
+#: editor/actiondnd.cpp:1084 editor/actiondnd.cpp:1166
+msgid "Add Action '%1' to Popup Menu '%2'"
+msgstr ""
 
-#. i18n: file ./editor/tableeditor.ui line 348
-#: rc.cpp:1190 rc.cpp:1223
-#, no-c-format
-msgid "&Label:"
-msgstr "&Label:"
+#: editor/actiondnd.cpp:1160
+msgid ""
+"Action '%1' has already been added to this menu.\n"
+"An Action may only occur once in a given menu."
+msgstr ""
 
-#. i18n: file ./editor/tableeditor.ui line 359
-#: rc.cpp:1193 rc.cpp:1226
-#, no-c-format
-msgid "Pixmap:"
-msgstr "Picsfap :"
+#: editor/formwindow.cpp:302
+msgid "&Horizontal"
+msgstr "&Llorweddol"
 
-#. i18n: file ./editor/tableeditor.ui line 370
-#: rc.cpp:1196
-#, no-c-format
-msgid "&Field:"
-msgstr "&Maes :"
+#: editor/formwindow.cpp:303
+msgid "&Vertical"
+msgstr "&Fertigol"
 
-#. i18n: file ./editor/tableeditor.ui line 394
-#: rc.cpp:1199
-#, no-c-format
-msgid "<no table>"
+#: editor/formwindow.cpp:317 editor/formwindow.cpp:425
+msgid ""
+"<b>A %1 (custom widget)</b> "
+"<p>Click <b>Edit Custom Widgets...</b> in the <b>Tools|Custom</b> "
+"menu to add and change custom widgets. You can add properties as well as "
+"signals and slots to integrate custom widgets into <i>TQt Designer</i>"
+", and provide a pixmap which will be used to represent the widget on the "
+"form.</p>"
 msgstr ""
 
-#. i18n: file ./editor/tableeditor.ui line 406
-#: rc.cpp:1202
-#, no-c-format
-msgid "&Rows"
-msgstr "&Rhesi"
+#: editor/formwindow.cpp:324 editor/formwindow.cpp:432
+msgid "A %1 (custom widget)"
+msgstr ""
 
-#. i18n: file ./editor/tableeditor.ui line 496
-#: rc.cpp:1217
-#, no-c-format
-msgid "&New Row"
+#: editor/formwindow.cpp:331 editor/formwindow.cpp:439
+msgid "<b>A %1</b><p>%2</p>"
 msgstr ""
 
-#. i18n: file ./editor/tableeditor.ui line 504
-#: rc.cpp:1220
-#, no-c-format
-msgid "&Delete Row"
-msgstr "&Dileu Rhes"
+#: editor/formwindow.cpp:384
+msgid "Reparent Widgets"
+msgstr ""
 
-#. i18n: file ./editor/choosewidget.ui line 16
-#: rc.cpp:1247
-#, no-c-format
-msgid "Choose Widget"
+#: editor/formwindow.cpp:390 editor/formwindow.cpp:396
+#: editor/formwindow.cpp:407
+#, c-format
+msgid "Insert %1"
+msgstr "Mewnosod %1"
+
+#: editor/formwindow.cpp:597
+msgid "Connect '%1' with..."
 msgstr ""
 
-#. i18n: file ./editor/choosewidget.ui line 118
-#: rc.cpp:1256
-#, no-c-format
-msgid "Find:"
-msgstr "Canfod:"
+#: editor/formwindow.cpp:620 editor/formwindow.cpp:676
+msgid "Change Tab Order"
+msgstr ""
 
-#. i18n: file ./editor/connectioneditor.ui line 35
-#: rc.cpp:1259
-#, no-c-format
-msgid "Edit Connections"
+#: editor/formwindow.cpp:806
+msgid "Connect '%1' to '%2'"
 msgstr ""
 
-#. i18n: file ./editor/connectioneditor.ui line 41
-#: rc.cpp:1262
-#, no-c-format
+#: editor/formwindow.cpp:868 editor/formwindow.cpp:957
 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>"
+"You tried to insert a widget into the layout Container Widget '%1'.\n"
+"This is not possible. In order to insert the widget, the layout of '%1'\n"
+"must first be broken.\n"
+"Break the layout or cancel the operation?"
 msgstr ""
 
-#. i18n: file ./editor/connectioneditor.ui line 56
-#: rc.cpp:1265
-#, no-c-format
-msgid "Sender"
-msgstr "Anfonwr"
-
-#. i18n: file ./editor/connectioneditor.ui line 67
-#: rc.cpp:1268
-#, no-c-format
-msgid "Signal"
-msgstr "Arwydd"
+#: editor/formwindow.cpp:874 editor/formwindow.cpp:964
+msgid "Inserting Widget"
+msgstr ""
 
-#. i18n: file ./editor/connectioneditor.ui line 78
-#: rc.cpp:1271
-#, no-c-format
-msgid "Receiver"
-msgstr "Derbynnydd"
+#: editor/formwindow.cpp:875 editor/formwindow.cpp:965
+msgid "&Break Layout"
+msgstr "&Torri'r Haenlun"
 
-#. i18n: file ./editor/connectioneditor.ui line 89
-#: rc.cpp:1274
-#, no-c-format
-msgid "Slot"
-msgstr "Agen"
+#: editor/formwindow.cpp:1224 editor/formwindow.cpp:1267
+msgid "Use Size Hint"
+msgstr ""
 
-#. i18n: file ./editor/connectioneditor.ui line 111
-#: rc.cpp:1277
-#, no-c-format
-msgid "Displays the connections between the sender and the receiver."
+#: editor/formwindow.cpp:1443 editor/formwindow.cpp:1457
+#: editor/formwindow.cpp:1465 editor/mainwindowactions.cpp:204
+msgid "Adjust Size"
 msgstr ""
 
-#. i18n: file ./editor/connectioneditor.ui line 119
-#: rc.cpp:1280
-#, no-c-format
-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>"
+#: editor/formwindow.cpp:1661
+msgid "Click widgets to change the tab order..."
 msgstr ""
 
-#. i18n: file ./editor/connectioneditor.ui line 127
-#: rc.cpp:1283
-#, no-c-format
-msgid "Displays the list of signals that the widget emits."
+#: editor/formwindow.cpp:1670
+msgid "Drag a line to create a connection..."
 msgstr ""
 
-#. i18n: file ./editor/connectioneditor.ui line 143
-#: rc.cpp:1286
-#, no-c-format
-msgid "Si&gnals:"
+#: editor/formwindow.cpp:1676
+msgid "Click on the form to insert a %1..."
 msgstr ""
 
-#. i18n: file ./editor/connectioneditor.ui line 183
-#: rc.cpp:1289
-#, no-c-format
-msgid "&Slots:"
+#: editor/formwindow.cpp:1784
+msgid "Lower"
+msgstr "Gostwng"
+
+#: editor/formwindow.cpp:1847
+msgid "Accelerator '%1' is used %2 times."
 msgstr ""
 
-#. i18n: file ./editor/connectioneditor.ui line 217
-#: rc.cpp:1292
-#, no-c-format
-msgid "&Disconnect"
-msgstr "&Datgysylltu"
+#: editor/formwindow.cpp:1848 editor/formwindow.cpp:1860
+#: editor/mainwindowactions.cpp:152
+msgid "Check Accelerators"
+msgstr "Gwirio Cyflymyddion"
 
-#. i18n: file ./editor/connectioneditor.ui line 220
-#: rc.cpp:1295
-#, fuzzy, no-c-format
-msgid "Alt+D"
-msgstr "Alt+C"
+#: editor/formwindow.cpp:1848
+msgid "&Select"
+msgstr "&Detholi"
 
-#. i18n: file ./editor/connectioneditor.ui line 226
-#: rc.cpp:1298
-#, no-c-format
-msgid "Remove the selected connection"
+#: editor/formwindow.cpp:1859
+msgid "No accelerator is used more than once."
 msgstr ""
 
-#. i18n: file ./editor/connectioneditor.ui line 229
-#: rc.cpp:1301
-#, no-c-format
-msgid "Remove the selected connection."
+#: editor/formwindow.cpp:1870
+msgid "Raise"
+msgstr "Codi"
+
+#: editor/formwindow.cpp:1909 editor/mainwindowactions.cpp:210
+msgid "Lay OutQt::Horizontally"
 msgstr ""
 
-#. i18n: file ./editor/connectioneditor.ui line 257
-#: rc.cpp:1307
-#, fuzzy, no-c-format
-msgid "Alt+O"
-msgstr "Alt+C"
+#: editor/formwindow.cpp:1919 editor/mainwindowactions.cpp:216
+msgid "Lay OutQt::Vertically"
+msgstr ""
 
-#. i18n: file ./editor/connectioneditor.ui line 277
-#: rc.cpp:1316
-#, no-c-format
-msgid "Alt+C"
-msgstr "Alt+C"
+#: editor/formwindow.cpp:1930
+msgid "Lay OutQt::Horizontally (in splitter)"
+msgstr ""
 
-#. i18n: file ./editor/connectioneditor.ui line 318
-#: rc.cpp:1322
-#, no-c-format
-msgid "Connec&tions:"
-msgstr "Cysyll&tiadau :"
+#: editor/formwindow.cpp:1941
+msgid "Lay OutQt::Vertically (in splitter)"
+msgstr ""
 
-#. i18n: file ./editor/connectioneditor.ui line 346
-#: rc.cpp:1325
-#, no-c-format
-msgid "Co&nnect"
-msgstr "Cy&sylltu"
+#: editor/formwindow.cpp:1954 editor/mainwindowactions.cpp:222
+msgid "Lay Out in a Grid"
+msgstr ""
 
-#. i18n: file ./editor/connectioneditor.ui line 349
-#: rc.cpp:1328
-#, fuzzy, no-c-format
-msgid "Alt+N"
-msgstr "Alt+C"
+#: editor/formwindow.cpp:1975
+msgid "Lay Out ChildrenQt::Horizontally"
+msgstr ""
 
-#. i18n: file ./editor/connectioneditor.ui line 355
-#: rc.cpp:1331
-#, no-c-format
-msgid "Create connection"
+#: editor/formwindow.cpp:1996
+msgid "Lay Out ChildrenQt::Vertically"
 msgstr ""
 
-#. i18n: file ./editor/connectioneditor.ui line 358
-#: rc.cpp:1334
-#, no-c-format
-msgid "Create a connection between a signal and a slot."
+#: editor/formwindow.cpp:2020
+msgid "Lay Out Children in a Grid"
 msgstr ""
 
-#. i18n: file ./editor/templates/Tab_Dialog.ui line 37
-#: rc.cpp:1337 rc.cpp:1340 rc.cpp:1382 rc.cpp:1385
-#, no-c-format
-msgid "Tab"
-msgstr "Tab"
+#: editor/formwindow.cpp:2054 editor/formwindow.cpp:2073
+#: editor/mainwindowactions.cpp:242
+msgid "Break Layout"
+msgstr "Torri'r Haenlun"
 
-#. i18n: file ./editor/templates/Tab_Dialog.ui line 71
-#: rc.cpp:1346 rc.cpp:1364 rc.cpp:1370 rc.cpp:1391
-#, no-c-format
-msgid "F1"
-msgstr "F1"
+#: editor/formwindow.cpp:2135 editor/mainwindowactions.cpp:1075
+msgid "Edit connections..."
+msgstr ""
 
-#: widget/parser.cpp:116
-msgid "Invalid character: '%1'"
+#: editor/mainwindowactions.cpp:101
+msgid "Undoes the last action"
 msgstr ""
 
-#: widget/parser.cpp:192
-msgid "Constant value expected"
+#: editor/mainwindowactions.cpp:107
+msgid "Redoes the last undone operation"
 msgstr ""
 
-#: widget/parser.cpp:223
-msgid "'%1' (%2) is not a widget"
+#: editor/mainwindowactions.cpp:112
+msgid "Cuts the selected widgets and puts them on the clipboard"
 msgstr ""
 
-#: widget/parser.cpp:235 widget/parser.cpp:520
-msgid "'%1' is not a function"
+#: editor/mainwindowactions.cpp:117
+msgid "Copies the selected widgets to the clipboard"
 msgstr ""
 
-#: widget/parser.cpp:246
-msgid "Expected value"
+#: editor/mainwindowactions.cpp:122
+msgid "Pastes the clipboard's contents"
 msgstr ""
 
-#: widget/parser.cpp:271 widget/parser.cpp:281
-msgid "Divide by zero"
+#: editor/mainwindowactions.cpp:128
+msgid "Deletes the selected widgets"
 msgstr ""
 
-#: widget/parser.cpp:426 widget/parser.cpp:428 widget/parser.cpp:434
-msgid "in function '%1': %2"
+#: editor/mainwindowactions.cpp:133
+msgid "Selects all widgets"
 msgstr ""
 
-#: widget/parser.cpp:426
-#, fuzzy
-msgid "too few parameters"
-msgstr "Mewnosod Gwahanydd"
+#: editor/mainwindowactions.cpp:136
+msgid "Bring to Front"
+msgstr "Anfon i'r Blaen"
 
-#: widget/parser.cpp:428
-#, fuzzy
-msgid "too many parameters"
-msgstr "Mewnosod Gwahanydd"
+#: editor/mainwindowactions.cpp:138
+msgid "Raises the selected widgets"
+msgstr ""
 
-#: widget/parser.cpp:474
-msgid "in widget function '%1.%2': %3"
+#: editor/mainwindowactions.cpp:141
+msgid "Send to Back"
+msgstr "Anfon i'r Cefn"
+
+#: editor/mainwindowactions.cpp:143 editor/mainwindowactions.cpp:144
+msgid "Lowers the selected widgets"
 msgstr ""
 
-#: widget/parser.cpp:517
-msgid "'%1' is not a widget"
+#: editor/mainwindowactions.cpp:147
+msgid "Find in Form..."
 msgstr ""
 
-#: widget/parser.cpp:522
-msgid "Unexpected symbol after variable '%1'"
+#: editor/mainwindowactions.cpp:148
+msgid "Search for a text in the whole form."
 msgstr ""
 
-#: widget/parser.cpp:741
-msgid ""
-"Expected '%1'"
-"<br>"
-"<br>Possible cause of the error is having a variable with the same name as a "
-"widget"
+#: editor/mainwindowactions.cpp:154
+msgid "Checks if the accelerators used in the form are unique"
 msgstr ""
 
-#: widget/parser.cpp:743
-msgid "Expected '%1'"
+#: editor/mainwindowactions.cpp:158
+msgid "Connections"
+msgstr "Cysylltiadau"
+
+#: editor/mainwindowactions.cpp:161
+msgid "Opens a dialog for editing connections"
 msgstr ""
 
-#: widget/parser.cpp:757 widget/parser.cpp:770
-msgid "Expected variable"
+#: editor/mainwindowactions.cpp:165
+msgid "Form Settings..."
 msgstr ""
 
-#: widget/myprocess.cpp:94
-msgid "<qt>Failed to start shell process<br><b>%1</b></qt>"
+#: editor/mainwindowactions.cpp:167
+msgid "Opens a dialog to change the form's settings"
 msgstr ""
 
-#: widget/expression.cpp:199 widget/expression.cpp:208
-#, fuzzy
-msgid "error"
-msgstr "Saeth"
+#: editor/mainwindowactions.cpp:173
+#, c-format
+msgid "<b>The Edit toolbar</b>%1"
+msgstr ""
 
-#: widget/kommanderfunctions.cpp:120
-msgid "Unterminated @execBegin ... @execEnd block."
+#: editor/mainwindowactions.cpp:206
+msgid "Adjusts the size of the selected widget"
 msgstr ""
 
-#: widget/kommanderfunctions.cpp:138 widget/kommanderfunctions.cpp:164
-msgid "Unterminated @forEach ... @end block."
+#: editor/mainwindowactions.cpp:212
+msgid "Lays out the selected widgets horizontally"
 msgstr ""
 
-#: widget/kommanderfunctions.cpp:201
-msgid "Unterminated @if ... @endif block."
+#: editor/mainwindowactions.cpp:218
+msgid "Lays out the selected widgets vertically"
 msgstr ""
 
-#: widget/kommanderfunctions.cpp:221
-msgid "Unterminated @switch ... @end block."
+#: editor/mainwindowactions.cpp:224
+msgid "Lays out the selected widgets in a grid"
 msgstr ""
 
-#: widget/kommanderfunctions.cpp:320
-#, c-format
-msgid "Unknown widget: @%1."
+#: editor/mainwindowactions.cpp:228
+msgid "Lay OutQt::Horizontally in Splitter"
 msgstr ""
 
-#: widget/kommanderfunctions.cpp:338
-msgid "Infinite loop: @%1 called inside @%2."
+#: editor/mainwindowactions.cpp:231
+msgid "Lays out the selected widgets horizontally in a splitter"
 msgstr ""
 
-#: widget/kommanderfunctions.cpp:344
-msgid "Script for @%1 is empty."
+#: editor/mainwindowactions.cpp:235
+msgid "Lay OutQt::Vertically in Splitter"
 msgstr ""
 
-#: widget/kommanderwidget.cpp:119 widgets/scriptobject.cpp:99
-msgid "Invalid state for associated text."
+#: editor/mainwindowactions.cpp:238
+msgid "Lays out the selected widgets vertically in a splitter"
 msgstr ""
 
-#: widget/kommanderwidget.cpp:134
-msgid ""
-"Line %1: %2.\n"
+#: editor/mainwindowactions.cpp:244
+msgid "Breaks the selected layout"
 msgstr ""
 
-#: widget/kommanderwidget.cpp:244
-msgid "Unknown special: '%1'."
+#: editor/mainwindowactions.cpp:251
+msgid "Add "
+msgstr "Ychwanegu "
+
+#: editor/mainwindowactions.cpp:252 editor/mainwindowactions.cpp:366
+#, c-format
+msgid "Insert a %1"
 msgstr ""
 
-#: widget/kommanderwidget.cpp:274
-msgid "Unmatched parenthesis in DCOP call '%1'."
+#: editor/mainwindowactions.cpp:253
+msgid ""
+"<b>A %1</b>"
+"<p>%2</p>"
+"<p>Click to insert a single %3,or double click to keep the tool selected."
 msgstr ""
 
-#: widget/kommanderwidget.cpp:280
-msgid "Incorrect arguments in DCOP call '%1'."
+#: editor/mainwindowactions.cpp:258
+#, c-format
+msgid "<b>The Layout toolbar</b>%1"
 msgstr ""
 
-#: widget/kommanderwidget.cpp:310
-msgid "Tried to perform DCOP query, but failed."
+#: editor/mainwindowactions.cpp:271
+msgid "&Layout"
+msgstr "&Cynllun"
+
+#: editor/mainwindowactions.cpp:286
+msgid "Pointer"
 msgstr ""
 
-#: widget/kommanderwidget.cpp:341
-msgid "DCOP return type %1 is not yet implemented."
+#: editor/mainwindowactions.cpp:289
+msgid "Selects the pointer tool"
 msgstr ""
 
-#: widget/kommanderwidget.cpp:406
-msgid "Continue && Ignore Next Errors"
+#: editor/mainwindowactions.cpp:293
+msgid "Connect Signal/Slots"
 msgstr ""
 
-#: widget/kommanderwidget.cpp:408
-msgid "<qt>Error in widget <b>%1</b>:<p><i>%2</i></qt>"
+#: editor/mainwindowactions.cpp:296
+msgid "Selects the connection tool"
 msgstr ""
 
-#: widget/kommanderwidget.cpp:427
-msgid ""
-"Error in widget %1:\n"
-"  %2\n"
+#: editor/mainwindowactions.cpp:300
+msgid "Tab Order"
 msgstr ""
 
-#: widget/kommanderwidget.cpp:582
-msgid "Unmatched parenthesis after '%1'."
+#: editor/mainwindowactions.cpp:303
+msgid "Selects the tab order tool"
 msgstr ""
 
-#: widget/kommanderwidget.cpp:591
-msgid "Unmatched quotes in argument of '%1'."
+#: editor/mainwindowactions.cpp:309
+#, c-format
+msgid "<b>The Tools toolbar</b>%1"
 msgstr ""
 
-#: widget/kommanderwidget.cpp:593
-msgid "Unknown function group: '%1'."
+#: editor/mainwindowactions.cpp:311
+msgid "Tools"
+msgstr "Offer"
+
+#: editor/mainwindowactions.cpp:333
+msgid "<b>The %1</b>%2"
 msgstr ""
 
-#: widget/kommanderwidget.cpp:595
-msgid "Unknown function: '%1' in group '%2'."
+#: editor/mainwindowactions.cpp:334
+#, c-format
+msgid ""
+" Click on a button to insert a single widget, or double click to insert "
+"multiple %1."
 msgstr ""
 
-#: widget/kommanderwidget.cpp:597
-msgid "Unknown widget function: '%1'."
+#: editor/mainwindowactions.cpp:338
+msgid "<b>The %1 Widgets</b>%2"
 msgstr ""
 
-#: widget/kommanderwidget.cpp:599
+#: editor/mainwindowactions.cpp:339
 msgid ""
-"Not enough arguments for '%1' (%2 instead of %3)."
-"<p>Correct syntax is: %4"
+" Click on a button to insert a single %1 widget, or double click to insert "
+"multiple widgets."
 msgstr ""
 
-#: widget/kommanderwidget.cpp:604
-msgid "Too many arguments for '%1' (%2 instead of %3).<p>Correct syntax is: %4"
+#: editor/mainwindowactions.cpp:368
+msgid "<b>A %1</b>"
+msgstr "<b>A %1</b>"
+
+#: editor/mainwindowactions.cpp:371
+msgid "<p>Double click on this tool to keep it selected.</p>"
 msgstr ""
 
-#: executor/main.cpp:45
-msgid ""
-"Executor is a component of the Kommander dialog system that executes .kmdr "
-"files given as arguments or via stdin"
+#: editor/mainwindowactions.cpp:402
+msgid "Editor"
+msgstr "Golygydd"
+
+#: editor/mainwindowactions.cpp:412
+#, c-format
+msgid "<b>The File toolbar</b>%1"
 msgstr ""
 
-#: executor/main.cpp:50
-msgid "Read dialog from standard input"
+#: editor/mainwindowactions.cpp:418
+msgid "Creates a new dialog"
 msgstr ""
 
-#: executor/main.cpp:51
-msgid "Use given catalog for translation"
+#: editor/mainwindowactions.cpp:424
+msgid "Opens an existing dialog"
 msgstr ""
 
-#: executor/main.cpp:58
-msgid "Kommander Executor"
+#: editor/mainwindowactions.cpp:430
+msgid "Opens recently open file"
 msgstr ""
 
-#: executor/main.cpp:87
-msgid ""
-"Error: no dialog given. Use --stdin option to read dialog from standard input.\n"
+#: editor/mainwindowactions.cpp:435
+msgid "Closes the current dialog"
 msgstr ""
 
-#: executor/instance.cpp:115
-msgid "<qt>Unable to create dialog.</qt>"
+#: editor/mainwindowactions.cpp:443
+msgid "Saves the current dialog"
 msgstr ""
 
-#: executor/instance.cpp:187
-msgid "<qt>Kommander file<br><b>%1</b><br>does not exist.</qt>"
+#: editor/mainwindowactions.cpp:450
+msgid "Saves the current dialog with a new filename"
 msgstr ""
 
-#: executor/instance.cpp:195
-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>"
+#: editor/mainwindowactions.cpp:455
+msgid "Save All"
+msgstr "Cadw Popeth"
+
+#: editor/mainwindowactions.cpp:457
+msgid "Saves all open dialogs"
 msgstr ""
 
-#: executor/instance.cpp:197
-msgid "Wrong Extension"
+#: editor/mainwindowactions.cpp:465
+msgid "Quits the application and prompts to save any changed dialogs"
 msgstr ""
 
-#: executor/instance.cpp:214
-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>"
+#: editor/mainwindowactions.cpp:474
+msgid "&Run"
+msgstr "R&hedeg"
+
+#: editor/mainwindowactions.cpp:476
+msgid "Run Dialog"
 msgstr ""
 
-#: executor/instance.cpp:218 executor/instance.cpp:223
-msgid "Run Nevertheless"
+#: editor/mainwindowactions.cpp:478
+msgid "Executes dialog"
 msgstr ""
 
-#: executor/instance.cpp:223
-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>"
+#: editor/mainwindowactions.cpp:485
+#, fuzzy
+msgid "Run Dialog K4"
+msgstr "Ymgom"
+
+#: editor/mainwindowactions.cpp:487
+msgid "Executes dialog in KDE4"
 msgstr ""
 
-#: executor/register.cpp:66
-msgid "Return EOL-separated list of all values in the array."
+#: editor/mainwindowactions.cpp:500
+msgid "Tile"
+msgstr "Teilio"
+
+#: editor/mainwindowactions.cpp:502
+msgid "Tiles the windows so that they are all visible"
 msgstr ""
 
-#: executor/register.cpp:67
-msgid "Return EOL-separated list of all keys in the array."
+#: editor/mainwindowactions.cpp:505 editor/mainwindowactions.cpp:510
+msgid "Cascade"
+msgstr "Rhaeadr"
+
+#: editor/mainwindowactions.cpp:507
+msgid "Cascades the windows so that all their title bars are visible"
 msgstr ""
 
-#: executor/register.cpp:68
-msgid "Remove all elements from the array."
+#: editor/mainwindowactions.cpp:512
+msgid "Closes the active window"
 msgstr ""
 
-#: executor/register.cpp:69
-msgid "Return number of elements in the array."
+#: editor/mainwindowactions.cpp:515
+msgid "Close All"
+msgstr "Cau Popeth"
+
+#: editor/mainwindowactions.cpp:517
+msgid "Closes all form windows"
 msgstr ""
 
-#: executor/register.cpp:70
-msgid "Return the value associated with given key."
+#: editor/mainwindowactions.cpp:520
+msgid "Next"
+msgstr "Nesaf"
+
+#: editor/mainwindowactions.cpp:522
+msgid "Activates the next window"
 msgstr ""
 
-#: executor/register.cpp:71
-msgid "Remove element with given key from the array."
+#: editor/mainwindowactions.cpp:525
+msgid "Previous"
+msgstr "Cynt"
+
+#: editor/mainwindowactions.cpp:527
+msgid "Activates the previous window"
 msgstr ""
 
-#: executor/register.cpp:72
-msgid "Add element with given key and value to the array"
+#: editor/mainwindowactions.cpp:531
+msgid "&Window"
+msgstr "&Ffenestr"
+
+#: editor/mainwindowactions.cpp:543
+msgid "Vie&ws"
+msgstr "Gol&ygon"
+
+#: editor/mainwindowactions.cpp:544
+msgid "Tool&bars"
+msgstr "Barr&au Offer:"
+
+#: editor/mainwindowactions.cpp:580
+msgid "Opens a dialog to change shortcuts"
 msgstr ""
 
-#: executor/register.cpp:73
-msgid ""
-"Add all elements in the string to the array. String should have <i>key>"
-"\\tvalue\\n</i> format."
+#: editor/mainwindowactions.cpp:583
+#, fuzzy
+msgid "Configure &Plugins..."
+msgstr "Ffurfweddu'r &ategion"
+
+#: editor/mainwindowactions.cpp:585
+msgid "Opens a dialog to configure plugins"
 msgstr ""
 
-#: executor/register.cpp:75
-msgid ""
-"Return all elements in the array in <i>key>\\tvalue\\n</i> format."
+#: editor/mainwindowactions.cpp:588
+#, fuzzy
+msgid "&Configure Editor..."
+msgstr "Ffurfweddu'r &ategion"
+
+#: editor/mainwindowactions.cpp:590
+msgid "Configure various aspects of this editor."
 msgstr ""
 
-#: executor/register.cpp:77
-msgid ""
-"Create an integer indexed array - starting from 0 - from a string. Use the "
-"separator character to split the string."
+#: editor/mainwindowactions.cpp:594
+msgid "Opens a dialog to change preferences"
 msgstr ""
 
-#: executor/register.cpp:78
-msgid ""
-"Create a string from an integer indexed array. Concatenate the elements with "
-"the separator character."
+#: editor/mainwindowactions.cpp:610
+msgid "Create a new dialog..."
 msgstr ""
 
-#: executor/register.cpp:79
-msgid ""
-"Remove the element specified by the key from an indexed array and reindex the "
-"array."
+#: editor/mainwindowactions.cpp:633
+msgid "Open a file..."
+msgstr "Agor Ffeil ..."
+
+#: editor/mainwindowactions.cpp:638
+msgid "Open Files"
+msgstr "Agor Ffeiliau"
+
+#: editor/mainwindowactions.cpp:674
+msgid "Reading file '%1'..."
 msgstr ""
 
-#: executor/register.cpp:82
-msgid "Return number of chars in the string."
+#: editor/mainwindowactions.cpp:687
+msgid "Loaded file '%1'"
 msgstr ""
 
-#: executor/register.cpp:83
-msgid "Check if the string contains given substring."
+#: editor/mainwindowactions.cpp:693 editor/mainwindowactions.cpp:694
+msgid "Could not load file '%1'"
+msgstr "Methu llwytho ffeil '%1'"
+
+#: editor/mainwindowactions.cpp:694
+msgid "Load File"
 msgstr ""
 
-#: executor/register.cpp:84
-msgid "Return position of a substring in the string, or -1 if it isn't found."
+#: editor/mainwindowactions.cpp:729
+msgid "Enter a filename..."
+msgstr "Mewnosod enw ffeil ..."
+
+#: editor/mainwindowactions.cpp:757
+msgid "TQt Designer is crashing. Attempting to save files..."
 msgstr ""
 
-#: executor/register.cpp:86
-msgid "Return first n chars of the string."
+#: editor/mainwindowactions.cpp:794 editor/mainwindowactions.cpp:857
+msgid "NewTemplate"
 msgstr ""
 
-#: executor/register.cpp:87
-msgid "Return last n chars of the string."
+#: editor/mainwindowactions.cpp:806 editor/mainwindowactions.cpp:835
+msgid "Could not create the template"
 msgstr ""
 
-#: executor/register.cpp:88
-msgid "Return substring of the string, starting from given position."
+#: editor/mainwindowactions.cpp:909
+msgid ""
+"Cannot paste widgets. Designer could not find a container\n"
+"to paste into which does not contain a layout. Break the layout\n"
+"of the container you want to paste into and select this container\n"
+"and then paste again."
 msgstr ""
 
-#: executor/register.cpp:90
-msgid "Replace all occurencies of given substring."
+#: editor/mainwindowactions.cpp:912
+msgid "Paste Error"
 msgstr ""
 
-#: executor/register.cpp:91
-msgid "Replace all occurencies of given substring with given replacement."
+#: editor/mainwindowactions.cpp:1094
+msgid "Edit the current form's settings..."
 msgstr ""
 
-#: executor/register.cpp:93
-msgid "Convert the string to uppercase."
+#: editor/mainwindowactions.cpp:1102
+msgid "Edit preferences..."
 msgstr ""
 
-#: executor/register.cpp:94
-msgid "Convert the string to lowercase."
+#: editor/connectioneditorimpl.cpp:229
+msgid "Connect/Disconnect the signals and slots of '%1' and '%2'"
 msgstr ""
 
-#: executor/register.cpp:95
-msgid ""
-"Compare two strings. Return 0 if they are equal, -1 if the first one is lower, "
-"1 if the first one is higher"
+#: editor/connectioneditorimpl.cpp:237
+msgid "Remove Connections"
 msgstr ""
 
-#: executor/register.cpp:97
-msgid "Check if string is empty."
+#: editor/connectioneditorimpl.cpp:248
+msgid "Add Connections"
 msgstr ""
 
-#: executor/register.cpp:98
-msgid "Check if string is a valid number."
+#: editor/listvieweditorimpl.cpp:66
+msgid "Edit Items and Columns of '%1'"
 msgstr ""
 
-#: executor/register.cpp:101
-msgid "Return content of given file."
+#: editor/listvieweditorimpl.cpp:225
+msgid "New Column"
+msgstr "Colofn Newydd"
+
+#: editor/assoctexteditorimpl.cpp:143
+#, fuzzy
+msgid "&Highlighting"
+msgstr "Amlygu"
+
+#: editor/assoctexteditorimpl.cpp:187
+#, fuzzy
+msgid "Edit text"
+msgstr "Golygu %1"
+
+#: editor/assoctexteditorimpl.cpp:253
+msgid "Edit text - read only mode"
 msgstr ""
 
-#: executor/register.cpp:102
-msgid "Write given string to a file."
+#: editor/assoctexteditorimpl.cpp:271
+msgid "Set the 'text association' of '%1'"
 msgstr ""
 
-#: executor/register.cpp:103
-msgid "Append given string to the end of a file."
+#: editor/assoctexteditorimpl.cpp:281
+msgid "Set the 'population text' of '%1'"
 msgstr ""
 
-#: widgets/popupmenu.cpp:56
-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 for "
-"index to insert to the end. The icon is optional."
+#: editor/assoctexteditorimpl.cpp:430
+msgid "<qt>Cannot open file<br><b>%1</b></qt"
 msgstr ""
 
-#: widgets/popupmenu.cpp:57
-msgid ""
-"Insert a separator item into the popup menu. Use -1 for index to insert to the "
-"end."
+#: editor/main.cpp:31
+msgid "Kommander is a graphical editor of scripted dialogs."
 msgstr ""
 
-#: widgets/popupmenu.cpp:58
+#: editor/main.cpp:33
+msgid "Based on TQt Designer, (C) 2000 Trolltech AS."
+msgstr ""
+
+#: editor/main.cpp:43
+msgid "Kommander"
+msgstr ""
+
+#: editor/main.cpp:46
+#, fuzzy
+msgid "Project manager"
+msgstr "Cywaith"
+
+#: editor/main.cpp:71
+msgid "Kommander Dialog Editor"
+msgstr ""
+
+#: widgets/fontdialog.cpp:49
 msgid ""
-"Change an item specified by id in the popup menu. The executeWidget's execute "
-"method will be run when this item is selected."
+"Sets the default font for the dialog, by specifying the family, the size and "
+"other style options."
 msgstr ""
 
-#: widgets/popupmenu.cpp:59
-msgid "Enable the item specified by id in the popup menu."
+#: widgets/fontdialog.cpp:51
+msgid "Returns the font family."
 msgstr ""
 
-#: widgets/popupmenu.cpp:60
-msgid "Check if the item specified by id is enabled."
+#: widgets/fontdialog.cpp:53
+msgid "Returns the font size in point."
 msgstr ""
 
-#: widgets/popupmenu.cpp:61
-msgid "Make the item specified by id visible."
+#: widgets/fontdialog.cpp:55
+msgid "Returns true, if the font is bold."
 msgstr ""
 
-#: widgets/popupmenu.cpp:62
-msgid "Apply checked status for the item specified by id."
+#: widgets/fontdialog.cpp:57
+msgid "Returns true, if the font is italic."
 msgstr ""
 
-#: widgets/popupmenu.cpp:63
-msgid "Check if the item specified by id is visible."
+#: widgets/textedit.cpp:56
+msgid "Set widget modified status."
 msgstr ""
 
-#: widgets/popupmenu.cpp:64
-msgid "Verify if the item specified by id is checked."
+#: widgets/textedit.cpp:57
+msgid ""
+"Select a block of text using the paragraph number and character index of the "
+"line. You can use the cursorPositionChanged(int, int) signal to get this data "
+"in real time into a script."
 msgstr ""
 
-#: widgets/popupmenu.cpp:65
+#: widgets/textedit.cpp:58
 msgid ""
-"Insert submenu widget into the popup menu. Use -1 for index to insert to the "
-"end. The icon is optional."
+"Search for text from the cursor or a specified position. You can specifiy case "
+"sensitive search and forward or backward."
 msgstr ""
 
-#: widgets/timer.cpp:63
-msgid "Set the timer timeout interval in ms."
+#: widgets/textedit.cpp:60
+msgid "Get the number of paragraphs in the widget."
 msgstr ""
 
-#: widgets/treewidget.cpp:64
-msgid "Add column at end with column header"
+#: widgets/textedit.cpp:61
+msgid "Get the total length of all text."
 msgstr ""
 
-#: widgets/treewidget.cpp:65
-msgid "Set sorting for a column"
+#: widgets/textedit.cpp:63
+msgid "Get the length of the paragraph."
 msgstr ""
 
-#: widgets/treewidget.cpp:68
-msgid "Get the column caption for column index"
+#: widgets/textedit.cpp:64
+msgid "Get the number of lines in the paragraph."
 msgstr ""
 
-#: widgets/treewidget.cpp:69
-msgid "Set the pixel width for column index - use 0 to hide"
+#: widgets/textedit.cpp:65
+msgid "Use to set superscript."
 msgstr ""
 
-#: widgets/treewidget.cpp:70
-msgid "Set to <i>left</i>, <i>right</i> or <i>center</i>, case insensitive "
+#: widgets/textedit.cpp:66
+msgid "Use to revert from superscript to normal script."
+msgstr ""
+
+#: widgets/textbrowser.cpp:45 widgets/textbrowser.cpp:46
+msgid "Set notify click to intercept clicks and handle links"
 msgstr ""
 
 #: widgets/toolbox.cpp:39
@@ -4784,38 +4941,111 @@ msgid ""
 "Returns the index of the widget, -1 if the widget is not part of the toolbox."
 msgstr ""
 
-#: widgets/tabwidget.cpp:48
-msgid "Sets an icon on the specified tab. Index is zero based."
+#: widgets/execbutton.cpp:62
+msgid "For use only when button is togle type."
 msgstr ""
 
-#: widgets/closebutton.cpp:116
-msgid "Failed to start shell process."
+#: widgets/execbutton.cpp:63
+msgid "Associate a Kommander PopupMenu with this ExecButton."
 msgstr ""
 
-#: widgets/combobox.cpp:50
-msgid "Make the ComboBox expose it's list without mousing around."
+#: widgets/execbutton.cpp:64
+msgid "Set the text on the ExecButton."
 msgstr ""
 
-#: widgets/fontdialog.cpp:49
+#: widgets/treewidget.cpp:67
+msgid "Add column at end with column header"
+msgstr ""
+
+#: widgets/treewidget.cpp:68
+msgid "Set sorting for a column"
+msgstr ""
+
+#: widgets/treewidget.cpp:71
+msgid "Get the column caption for column index"
+msgstr ""
+
+#: widgets/treewidget.cpp:72
+msgid "Set the pixel width for column index - use 0 to hide"
+msgstr ""
+
+#: widgets/treewidget.cpp:73
+msgid "Set to <i>left</i>, <i>right</i> or <i>center</i>, case insensitive "
+msgstr ""
+
+#: widgets/treewidget.cpp:74
+msgid "Get the count of top level items."
+msgstr ""
+
+#: widgets/treewidget.cpp:75
+msgid "Expand or collapse a node."
+msgstr ""
+
+#: widgets/treewidget.cpp:76
+msgid "See if node is open or closed."
+msgstr ""
+
+#: widgets/dialog.cpp:56
+msgid "The name of the widget having focus"
+msgstr ""
+
+#: widgets/dialog.cpp:57
 msgid ""
-"Sets the default font for the dialog, by specifying the family, the size and "
-"other style options."
+"Set a wait cursor. CAUTION: if set more than once an equal number of calls to "
+"restore must be made to clear it."
 msgstr ""
 
-#: widgets/fontdialog.cpp:51
-msgid "Returns the font family."
+#: widgets/dialog.cpp:58
+msgid "Restore normal curser. NOTE: must be called as many times as wait was."
 msgstr ""
 
-#: widgets/fontdialog.cpp:53
-msgid "Returns the font size in point."
+#: widgets/buttongroup.cpp:51
+msgid "Returns the ID of the selected button."
 msgstr ""
 
-#: widgets/fontdialog.cpp:55
-msgid "Returns true, if the font is bold."
+#: widgets/tabwidget.cpp:55
+msgid "Sets an icon on the specified tab. Index is zero based."
 msgstr ""
 
-#: widgets/fontdialog.cpp:57
-msgid "Returns true, if the font is italic."
+#: widgets/tabwidget.cpp:56
+msgid "Returns the tab label at the given index. Index is zero based."
+msgstr ""
+
+#: widgets/tabwidget.cpp:57
+msgid ""
+"Returns true if tab at specified index is enabled, otherwise returns false."
+msgstr ""
+
+#: widgets/tabwidget.cpp:58
+msgid "Sets the tab at the given index to enabled or disabled."
+msgstr ""
+
+#: widgets/tabwidget.cpp:59
+msgid "Show or hide the tabs on the tab widget."
+msgstr ""
+
+#: widgets/tabwidget.cpp:60
+msgid "Set the current page by name."
+msgstr ""
+
+#: widgets/tabwidget.cpp:61
+msgid "Sets the tab tab label."
+msgstr ""
+
+#: widgets/closebutton.cpp:116
+msgid "Failed to start shell process."
+msgstr ""
+
+#: widgets/progressbar.cpp:46
+msgid "Sets the ProgresBar color"
+msgstr ""
+
+#: widgets/progressbar.cpp:47
+msgid "Sets the ProgresBar text color"
+msgstr ""
+
+#: widgets/timer.cpp:63
+msgid "Set the timer timeout interval in ms."
 msgstr ""
 
 #: widgets/aboutdialog.cpp:59
@@ -4854,62 +5084,111 @@ msgstr ""
 msgid "Returns the set version string."
 msgstr ""
 
-#: widgets/table.cpp:56
+#: widgets/table.cpp:58
 msgid ""
 "Sets a column to sort ascending or descending. Optionally can sort with rows "
 "intact for database use."
 msgstr ""
 
-#: widgets/table.cpp:57
+#: widgets/table.cpp:59
 msgid "Scrolls the table so the cell indicated is visible."
 msgstr ""
 
-#: widgets/table.cpp:58
+#: widgets/table.cpp:60
 msgid ""
 "Select cells using the upper left and lower right cell addresses<br /><b>"
-"Not guaranteed to have TDE4 compatiblility</b>"
+"Not guaranteed to have KDE4 compatiblility</b>"
 msgstr ""
 
-#: widgets/table.cpp:59
+#: widgets/table.cpp:61
 msgid "Select the row with the zero based index."
 msgstr ""
 
-#: widgets/table.cpp:60
+#: widgets/table.cpp:62
 msgid ""
 "Select the column with the zero based index.<br /><b>"
-"Not guaranteed to have TDE4 compatiblility</b>"
+"Not guaranteed to have KDE4 compatiblility</b>"
 msgstr ""
 
-#: widgets/table.cpp:61
+#: widgets/table.cpp:63
 msgid ""
 "Set the column read only using zero based index.<br /><b>"
-"Not guaranteed to have TDE4 compatiblility</b>"
+"Not guaranteed to have KDE4 compatiblility</b>"
 msgstr ""
 
-#: widgets/table.cpp:62
+#: widgets/table.cpp:64
 msgid ""
 "Set the row read only using zero based index.<br /><b>"
-"Not guaranteed to have TDE4 compatiblility</b>"
+"Not guaranteed to have KDE4 compatiblility</b>"
 msgstr ""
 
-#: widgets/table.cpp:63
+#: widgets/table.cpp:65
 msgid "Returns the number of rows of the table"
 msgstr ""
 
-#: widgets/textedit.cpp:47
-msgid "see if widget has been modified."
+#: widgets/table.cpp:66
+msgid "Returns the text of the header for the column index"
 msgstr ""
 
-#: working/plugintemplate/widget.cpp:43
-msgid "Call function1 with two arguments, second is optional."
+#: widgets/table.cpp:67
+msgid "Returns the text of the header for the row index"
 msgstr ""
 
-#: working/plugintemplate/widget.cpp:44
-msgid "Get a QString as a result of function2."
+#: widgets/lineedit.cpp:45
+msgid "Clear widget modified status."
 msgstr ""
 
-#: working/plugintemplate/plugin.cpp:19
-msgid "Kommander %{APPNAME} plugin."
+#: widgets/popupmenu.cpp:56
+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 for "
+"index to insert to the end. The icon is optional."
+msgstr ""
+
+#: widgets/popupmenu.cpp:57
+msgid ""
+"Insert a separator item into the popup menu. Use -1 for index to insert to the "
+"end."
+msgstr ""
+
+#: widgets/popupmenu.cpp:58
+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 ""
+
+#: widgets/popupmenu.cpp:59
+msgid "Enable the item specified by id in the popup menu."
+msgstr ""
+
+#: widgets/popupmenu.cpp:60
+msgid "Check if the item specified by id is enabled."
+msgstr ""
+
+#: widgets/popupmenu.cpp:61
+msgid "Make the item specified by id visible."
+msgstr ""
+
+#: widgets/popupmenu.cpp:62
+msgid "Apply checked status for the item specified by id."
+msgstr ""
+
+#: widgets/popupmenu.cpp:63
+msgid "Check if the item specified by id is visible."
+msgstr ""
+
+#: widgets/popupmenu.cpp:64
+msgid "Verify if the item specified by id is checked."
+msgstr ""
+
+#: widgets/popupmenu.cpp:65
+msgid ""
+"Insert submenu widget into the popup menu. Use -1 for index to insert to the "
+"end. The icon is optional."
+msgstr ""
+
+#: widgets/combobox.cpp:50
+msgid "Make the ComboBox expose it's list without mousing around."
 msgstr ""
 
 #~ msgid "Unknown error"
@@ -4966,9 +5245,6 @@ msgstr ""
 #~ msgid "Size"
 #~ msgstr "Maint"
 
-#~ msgid "Pixmap"
-#~ msgstr "Picsfap"
-
 #~ msgid "Cursor"
 #~ msgstr "Cyrchydd"
 
diff --git a/tde-i18n-cy/messages/tdewebdev/kxsldbg.po b/tde-i18n-cy/messages/tdewebdev/kxsldbg.po
index ff79674ee72..530f4a23a4c 100644
--- a/tde-i18n-cy/messages/tdewebdev/kxsldbg.po
+++ b/tde-i18n-cy/messages/tdewebdev/kxsldbg.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdewebdev/kxsldbg.po\n"
-"POT-Creation-Date: 2008-07-08 01:25+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,756 +22,892 @@ msgid ""
 "Your emails"
 msgstr "kyfieithu@dotmon.com"
 
-#: main.cpp:9
-msgid "A TDE KPart Application for xsldbg, an XSLT debugger"
+#: xsldbgmain.cpp:51
+msgid "A TDE console application for xsldbg, an XSLT debugger"
 msgstr ""
 
-#: main.cpp:14 xsldbgmain.cpp:97
-msgid "XSL script to run"
+#: xsldbgmain.cpp:57
+msgid "Start a shell"
 msgstr ""
 
-#: main.cpp:15 xsldbgmain.cpp:98
-msgid "XML data to be transformed"
+#: xsldbgmain.cpp:58
+msgid "Path to change into before loading files"
 msgstr ""
 
-#: main.cpp:16
-msgid "File to save results to"
+#: xsldbgmain.cpp:59
+msgid "Add a parameter named <name> and value <value> to XSL environment"
 msgstr ""
 
-#: main.cpp:22
-msgid "KXSLDbg"
-msgstr "KXSLDbg"
-
-#: kxsldbg.cpp:64
-msgid "Could not find our part."
-msgstr "Methu canfod ein rhan."
-
-#: kxsldbg.cpp:164
-msgid "File: %1  Line: %2  Col: %3"
+#: xsldbgmain.cpp:60
+msgid "Use ISO 639 language code specified; for example en_US"
 msgstr ""
 
-#: kxsldbgpart/xsldbglocallistitem.cpp:32
-#: kxsldbgpart/xsldbglocalvariablesimpl.cpp:71
-msgid "Local"
-msgstr "Lleol"
+#: xsldbgmain.cpp:60
+msgid "Save to a given file. See output command documentation"
+msgstr ""
 
-#: kxsldbgpart/xsldbglocallistitem.cpp:34
-#: kxsldbgpart/xsldbglocalvariablesimpl.cpp:73
-msgid "Global"
-msgstr "Eang"
+#: xsldbgmain.cpp:61
+msgid "Show the version of libxml and libxslt used"
+msgstr ""
 
-#: kxsldbgpart/xsldbgbreakpointsimpl.cpp:83
-#: kxsldbgpart/xsldbgbreakpointsimpl.cpp:92
-#: kxsldbgpart/xsldbgbreakpointsimpl.cpp:115
-#: kxsldbgpart/xsldbgbreakpointsimpl.cpp:120
-#: kxsldbgpart/xsldbgbreakpointsimpl.cpp:143
-#: kxsldbgpart/xsldbgbreakpointsimpl.cpp:148
-#: kxsldbgpart/xsldbgdebugger.cpp:297 kxsldbgpart/xsldbgdebugger.cpp:317
-#: kxsldbgpart/xsldbgdebugger.cpp:335 kxsldbgpart/xsldbgdebugger.cpp:355
-#: kxsldbgpart/xsldbgdebugger.cpp:375 kxsldbgpart/xsldbgdebugger.cpp:394
-msgid "Operation Failed"
+#: xsldbgmain.cpp:62
+msgid "Show logs of what is happening"
 msgstr ""
 
-#: kxsldbgpart/xsldbgbreakpointsimpl.cpp:84
-#: kxsldbgpart/xsldbgbreakpointsimpl.cpp:116
-#: kxsldbgpart/xsldbgbreakpointsimpl.cpp:144
-msgid "A line number was provided without a file name."
+#: xsldbgmain.cpp:63
+msgid "Display the time used"
 msgstr ""
 
-#: kxsldbgpart/xsldbgbreakpointsimpl.cpp:93
-msgid "No details provided or an invalid line number was supplied."
+#: xsldbgmain.cpp:64
+msgid "Run the transformation 20 times"
 msgstr ""
 
-#: kxsldbgpart/xsldbgbreakpointsimpl.cpp:121
-msgid "No details provided or an invalid line or ID was supplied."
+#: xsldbgmain.cpp:66
+msgid "Dump the tree of the result instead"
 msgstr ""
 
-#: kxsldbgpart/xsldbgbreakpointsimpl.cpp:149
-msgid "No details provided."
+#: xsldbgmain.cpp:68
+msgid "Disable the DTD loading phase"
 msgstr ""
 
-#: kxsldbgpart/xsldbginspector.cpp:68
-msgid "Xsldbg Inspector"
+#: xsldbgmain.cpp:69
+msgid "Disable the output of the result"
 msgstr ""
 
-#: kxsldbgpart/xsldbginspector.cpp:77
-msgid "Breakpoints"
+#: xsldbgmain.cpp:70
+msgid "Increase the maximum depth"
 msgstr ""
 
-#: kxsldbgpart/xsldbginspector.cpp:83
-msgid "Variables"
-msgstr "Newidynnau"
+#: xsldbgmain.cpp:73
+msgid "The input document is(are) an HTML file(s)"
+msgstr ""
 
-#: kxsldbgpart/xsldbginspector.cpp:89
-msgid "CallStack"
+#: xsldbgmain.cpp:77
+msgid "The input document is SGML docbook"
 msgstr ""
 
-#: kxsldbgpart/xsldbginspector.cpp:95
-msgid "Templates"
-msgstr "Patrymluniau"
+#: xsldbgmain.cpp:80
+msgid "Disable the fetching DTDs or entities over network"
+msgstr ""
 
-#: kxsldbgpart/xsldbginspector.cpp:101
-msgid "Sources"
+#: xsldbgmain.cpp:83
+msgid "Use the catalogs from $SGML_CATALOG_FILES"
 msgstr ""
 
-#: kxsldbgpart/xsldbginspector.cpp:107
-msgid "Entities"
+#: xsldbgmain.cpp:87
+msgid "Disable XInclude processing on document input"
 msgstr ""
 
-#: kxsldbgpart/xsldbginspector.cpp:126
-msgid "Apply changes to xsldbg after restarting execution"
+#: xsldbgmain.cpp:90
+msgid "Print profiling informations"
 msgstr ""
 
-#: kxsldbgpart/xsldbginspector.cpp:133
-msgid "&Refresh"
-msgstr "&Ailfywio"
+#: xsldbgmain.cpp:91
+msgid "Do not run gdb compatability mode and print less information"
+msgstr ""
 
-#: kxsldbgpart/xsldbginspector.cpp:134
-msgid "Refresh values in inspectors from xsldbg"
+#: xsldbgmain.cpp:92
+msgid "Detect and use encodings in the stylesheet"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/files.cpp:192 kxsldbgpart/libxsldbg/files.cpp:215
-msgid ""
-"Error: Unable to open terminal %1.\n"
+#: xsldbgmain.cpp:93
+msgid "Treat command line input as encoded in UTF-8"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/files.cpp:195
-msgid ""
-"Error: Did not previously open terminal.\n"
+#: xsldbgmain.cpp:94
+msgid "Use HTML output when generating search reports"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/files.cpp:497
+#: xsldbgmain.cpp:95
 msgid ""
-"Error: The file name \"%1\" is too long.\n"
+"Print all error messages to stdout, normally error messages go to stderr"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/files.cpp:521
+#: xsldbgmain.cpp:96
 msgid ""
-"Error: Unable to change to directory %1.\n"
+"Disable the automatic restarting of execution when current processing pass is "
+"complete"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/files.cpp:524
-msgid ""
-"Changed to directory %1.\n"
+#: main.cpp:14 xsldbgmain.cpp:97
+msgid "XSL script to run"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/files.cpp:552
-msgid ""
-"Setting XML Data file name to %1.\n"
+#: main.cpp:15 xsldbgmain.cpp:98
+msgid "XML data to be transformed"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/files.cpp:564
+#: xsldbgmain.cpp:124
 msgid ""
-"Setting stylesheet file name to %1.\n"
+"Using libxml %1, libxslt %2 and libexslt %3\n"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/files.cpp:581
+#: xsldbgmain.cpp:125
 msgid ""
-"Setting stylesheet base path to %1.\n"
+"xsldbg was compiled against libxml %1, libxslt %2 and libexslt %3\n"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/files.cpp:598
+#: xsldbgmain.cpp:126
 msgid ""
-"Missing file name.\n"
+"libxslt %1 was compiled against libxml %2\n"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/files.cpp:1108 kxsldbgpart/libxsldbg/files.cpp:1143
+#: xsldbgmain.cpp:127
 msgid ""
-"Encoding of text failed.\n"
+"libexslt %1 was compiled against libxml %2\n"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/files.cpp:1179
-#, c-format
-msgid "Unable to initialize encoding %1."
+#: xsldbgmain.cpp:130
+msgid "Xsldbg"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/files.cpp:1184
-msgid ""
-"Invalid encoding %1.\n"
+#. i18n: file kxsldbg_shell.rc line 9
+#: rc.cpp:6 rc.cpp:18 rc.cpp:231
+#, no-c-format
+msgid "Debug"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/files.cpp:1245
-msgid ""
-" ----- more ---- \n"
+#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 31
+#: rc.cpp:27
+#, no-c-format
+msgid "KXsldbg Configuration"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:223
-#: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:318
-#: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:1031
-#: kxsldbgpart/libxsldbg/debugXSL.cpp:679
-#: kxsldbgpart/libxsldbg/debugXSL.cpp:713
-#: kxsldbgpart/libxsldbg/debugXSL.cpp:1237
-#: kxsldbgpart/libxsldbg/debugXSL.cpp:1340
-#: kxsldbgpart/libxsldbg/files.cpp:1353
-#: kxsldbgpart/libxsldbg/files_unix.cpp:61
-#: kxsldbgpart/libxsldbg/files_unix.cpp:153
-#: kxsldbgpart/libxsldbg/search.cpp:106 kxsldbgpart/libxsldbg/search.cpp:1191
-#: kxsldbgpart/libxsldbg/search.cpp:1254 kxsldbgpart/libxsldbg/search.cpp:1315
-#: kxsldbgpart/libxsldbg/search.cpp:1367 kxsldbgpart/libxsldbg/search.cpp:1415
-#: kxsldbgpart/libxsldbg/search.cpp:1469 kxsldbgpart/libxsldbg/search.cpp:1515
-#: kxsldbgpart/libxsldbg/variable_cmds.cpp:105
-#: kxsldbgpart/libxsldbg/xsldbg.cpp:512 kxsldbgpart/libxsldbg/xsldbg.cpp:1061
-msgid ""
-"Error: Out of memory.\n"
+#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 75
+#: rc.cpp:30
+#, no-c-format
+msgid "LibXSLT Parameters"
 msgstr ""
-"Fazi : Allan o gof.\n"
 
-#: kxsldbgpart/libxsldbg/files.cpp:1363
-msgid ""
-"Error: Unable to convert %1 to local file name.\n"
+#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 108
+#: rc.cpp:33
+#, no-c-format
+msgid "Parameter value:"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/param_cmds.cpp:48
-msgid "Failed to add parameter"
+#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 148
+#: rc.cpp:36
+#, no-c-format
+msgid "Parameter name:"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/debugXSL.cpp:1888
-#: kxsldbgpart/libxsldbg/debugXSL.cpp:1901
-#: kxsldbgpart/libxsldbg/debugXSL.cpp:2061
-#: kxsldbgpart/libxsldbg/file_cmds.cpp:248
-#: kxsldbgpart/libxsldbg/file_cmds.cpp:265
-#: kxsldbgpart/libxsldbg/param_cmds.cpp:52
-#: kxsldbgpart/libxsldbg/param_cmds.cpp:71
-#: kxsldbgpart/libxsldbg/param_cmds.cpp:101
-#: kxsldbgpart/libxsldbg/param_cmds.cpp:115
-msgid ""
-"Error: Invalid arguments for the command %1.\n"
+#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 229
+#: rc.cpp:39
+#, no-c-format
+msgid "Prev"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/param_cmds.cpp:96
-msgid "Failed to delete parameter"
-msgstr ""
+#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 261
+#: kxsldbgpart/kxsldbg_part.cpp:140 rc.cpp:45
+#, no-c-format
+msgid "Next"
+msgstr "Nesaf"
 
-#: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:375
-#: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:695
-#: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:821
-#: kxsldbgpart/libxsldbg/param_cmds.cpp:107
-msgid ""
-"Error: Unable to parse %1 as a line number.\n"
-msgstr ""
+#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 464
+#: rc.cpp:57
+#, no-c-format
+msgid "Output file:"
+msgstr "Ffeil allbwn :"
 
-#: kxsldbgpart/libxsldbg/param_cmds.cpp:112
-msgid ""
-"Error: Unable to find parameter %1.\n"
-msgstr ""
+#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 488
+#: rc.cpp:60 rc.cpp:66 rc.cpp:72
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: kxsldbgpart/libxsldbg/param_cmds.cpp:146
-msgid "Unable to print parameters"
+#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 512
+#: rc.cpp:63
+#, no-c-format
+msgid "XML data:"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/option_cmds.cpp:73
-#: kxsldbgpart/libxsldbg/option_cmds.cpp:107
-msgid ""
-"Error: Unable to parse %1 as an option value.\n"
+#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 560
+#: rc.cpp:69
+#, no-c-format
+msgid "XSL source:"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/option_cmds.cpp:110
-msgid ""
-"Error: Unknown option name %1.\n"
+#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 621
+#: rc.cpp:78
+#, no-c-format
+msgid "catalogs"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/debugXSL.cpp:2012
-#: kxsldbgpart/libxsldbg/file_cmds.cpp:213
-#: kxsldbgpart/libxsldbg/file_cmds.cpp:269
-#: kxsldbgpart/libxsldbg/option_cmds.cpp:113
-#: kxsldbgpart/libxsldbg/option_cmds.cpp:116
-#: kxsldbgpart/libxsldbg/os_cmds.cpp:48
-msgid ""
-"Error: Missing arguments for the command %1.\n"
+#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 624
+#: rc.cpp:81
+#, no-c-format
+msgid "use catalogs from $SGML_CATALOGS_FILES"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/option_cmds.cpp:146
-msgid ""
-"Option %1 = %2\n"
+#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 632
+#: rc.cpp:84
+#, no-c-format
+msgid "novalid"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/option_cmds.cpp:157
-msgid ""
-"Option %1 = \"%2\"\n"
+#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 635
+#: rc.cpp:87
+#, no-c-format
+msgid "skip the DTD loading phase"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/option_cmds.cpp:159
-msgid ""
-"Option %1 = \"\"\n"
+#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 643
+#: rc.cpp:90
+#, no-c-format
+msgid "html"
+msgstr "html"
+
+#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 646
+#: rc.cpp:93
+#, no-c-format
+msgid "the input document is(are) an HTML file(s)"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/option_cmds.cpp:230
-msgid ""
-"\tNo expression watches set.\n"
+#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 654
+#: rc.cpp:96
+#, no-c-format
+msgid "docbook"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/option_cmds.cpp:237
-msgid " WatchExpression %1 "
+#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 657
+#: rc.cpp:99
+#, no-c-format
+msgid "the input document is SGML docbook"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/option_cmds.cpp:263
-msgid ""
-"Error: Unable to add watch expression \"%1\". It already has been added or it "
-"cannot be watched.\n"
+#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 665
+#: rc.cpp:102
+#, no-c-format
+msgid "debug"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/option_cmds.cpp:287
-msgid ""
-"Error: Unable to parse %1 as a watchID.\n"
+#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 668
+#: rc.cpp:105
+#, no-c-format
+msgid "dump the tree of the result instead"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/option_cmds.cpp:292
-msgid ""
-"Error: Watch expression %1 does not exist.\n"
+#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 676
+#: rc.cpp:108
+#, no-c-format
+msgid "noout"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/options.cpp:296 kxsldbgpart/libxsldbg/options.cpp:326
-msgid ""
-"Error: Option %1 is not a valid boolean/integer option.\n"
+#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 679
+#: rc.cpp:111
+#, no-c-format
+msgid "do not dump the result"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/options.cpp:368 kxsldbgpart/libxsldbg/options.cpp:399
-msgid ""
-"Error: Option %1 is not a valid string xsldbg option.\n"
+#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 687
+#: rc.cpp:114
+#, no-c-format
+msgid "profile"
+msgstr "proffiliau"
+
+#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 690
+#: rc.cpp:117
+#, no-c-format
+msgid "print profiling information"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/options.cpp:511
-msgid ""
-" Parameter %1 %2=\"%3\"\n"
+#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 698
+#: rc.cpp:120
+#, no-c-format
+msgid "timing"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/options.cpp:546
-msgid ""
-"\n"
-"No parameters present.\n"
+#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 701
+#: rc.cpp:123
+#, no-c-format
+msgid "display the time used"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/template_cmds.cpp:184
-#: kxsldbgpart/libxsldbg/variable_cmds.cpp:36
-msgid ""
-"Error: Stylesheet is not valid.\n"
+#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 709
+#: rc.cpp:126
+#, no-c-format
+msgid "nonet"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/variable_cmds.cpp:99
-msgid ""
-"Error: Cannot change a variable that does not use the select attribute.\n"
+#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 712
+#: rc.cpp:129
+#, no-c-format
+msgid "refuse to fetch DTDs or entities over network"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/variable_cmds.cpp:102
-msgid ""
-"Error: Variable %1 was not found.\n"
+#. i18n: file ./kxsldbgpart/xsldbgmsgdialog.ui line 26
+#: rc.cpp:132
+#, no-c-format
+msgid "qxsldbg Message"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:425
-#: kxsldbgpart/libxsldbg/search.cpp:484
-#: kxsldbgpart/libxsldbg/trace_cmds.cpp:68
-#: kxsldbgpart/libxsldbg/variable_cmds.cpp:111
-msgid ""
-"Error: Invalid arguments to command %1.\n"
+#. i18n: file ./kxsldbgpart/xsldbgmsgdialog.ui line 71
+#: rc.cpp:135
+#, no-c-format
+msgid "TextLabel1"
+msgstr "LabelTestun1"
+
+#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 17
+#: rc.cpp:141
+#, no-c-format
+msgid "Xsldbg Breakpoints"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/breakpoint.cpp:619
-msgid "disabled"
-msgstr "analluogwyd"
+#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 26
+#: rc.cpp:144
+#, no-c-format
+msgid "ID"
+msgstr "ID"
 
-#: kxsldbgpart/libxsldbg/breakpoint.cpp:620
-msgid "enabled"
-msgstr "galluogwyd"
+#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 37
+#: rc.cpp:147 rc.cpp:252 rc.cpp:303 rc.cpp:330
+#, no-c-format
+msgid "Name"
+msgstr "Enw"
 
-#: kxsldbgpart/libxsldbg/breakpoint.cpp:639
-msgid ""
-"Breakpoint %1 %2 for template: \"%3\" mode: \"%4\" in file \"%5\" at line %6"
+#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 48
+#: rc.cpp:150 rc.cpp:333
+#, no-c-format
+msgid "Mode"
+msgstr "Modd"
+
+#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 59
+#: rc.cpp:153
+#, no-c-format
+msgid "File Name"
+msgstr "Enw Ffeil"
+
+#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 70
+#: rc.cpp:156 rc.cpp:339 rc.cpp:351
+#, no-c-format
+msgid "Line Number"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/breakpoint.cpp:641
-msgid "Breakpoint %1 %2 for template: \"%3\" mode: \"%4\""
+#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 81
+#: kxsldbgpart/xsldbgbreakpointlistitem.cpp:38 rc.cpp:159
+#, no-c-format
+msgid "Enabled"
+msgstr "Alluogir"
+
+#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 102
+#: rc.cpp:162
+#, no-c-format
+msgid "Click breakpoint in list to modify or delete it"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/help_unix.cpp:51
-#: kxsldbgpart/libxsldbg/help_unix.cpp:56
-msgid "xsldbg version"
+#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 138
+#: rc.cpp:165
+#, no-c-format
+msgid "ID:"
+msgstr "ID :"
+
+#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 146
+#: rc.cpp:168
+#, no-c-format
+msgid "Line number:"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/help_unix.cpp:52
-#: kxsldbgpart/libxsldbg/help_unix.cpp:57
-msgid "Help document version"
+#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 154
+#: rc.cpp:171
+#, no-c-format
+msgid "You don't need to specify directory for file name"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/help_unix.cpp:53
-#: kxsldbgpart/libxsldbg/help_unix.cpp:58
-msgid "Help not found for command"
+#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 162
+#: rc.cpp:174
+#, no-c-format
+msgid "Template name or match name to look for"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/help_unix.cpp:90
-msgid ""
-"Error: Unable to display help. Help files not found in %1 or xsldbg not found "
-"in path.\n"
+#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 198
+#: rc.cpp:177 rc.cpp:180
+#, no-c-format
+msgid "Must be positive"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/help_unix.cpp:92
-msgid ""
-"Error: Unable to find xsldbg or help files.\n"
+#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 285
+#: rc.cpp:183
+#, no-c-format
+msgid "Mode:"
+msgstr "Modd:"
+
+#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 293
+#: rc.cpp:186
+#, no-c-format
+msgid "Name:"
+msgstr "Enw:"
+
+#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 301
+#: rc.cpp:189
+#, no-c-format
+msgid "File name:"
+msgstr "Enw'r ffeil:"
+
+#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 375
+#: rc.cpp:195
+#, no-c-format
+msgid "Delete breakpoint using ID"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/help_unix.cpp:97
-msgid ""
-"Error: Unable to print help file.\n"
+#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 386
+#: rc.cpp:201
+#, no-c-format
+msgid "Clear entered text"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/help_unix.cpp:102
-msgid ""
-"Error: No path to documentation; aborting help.\n"
+#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 394
+#: rc.cpp:204
+#, no-c-format
+msgid "Add All"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/trace_cmds.cpp:69
-msgid ""
-"Warning: Assuming normal speed.\n"
+#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 397
+#: rc.cpp:207
+#, no-c-format
+msgid "Add breakpoint on all templates found"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/debug.cpp:135
-msgid ""
-"Error: XSLT source and XML data are empty. Cannot enter the debugger.\n"
+#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 408
+#: rc.cpp:213
+#, no-c-format
+msgid "Delete all breakpoints"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/files_unix.cpp:67
-msgid ""
-"Error: USER environment variable is not set.\n"
+#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 416
+#: rc.cpp:216
+#, no-c-format
+msgid "Enable"
+msgstr "Galluogi"
+
+#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 419
+#: rc.cpp:219
+#, no-c-format
+msgid "Enable breakpoint using ID"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/files_unix.cpp:199
-msgid ""
-"Error: The value of the option docspath or searchresultspath is empty. See help "
-"on setoption or options command for more information.\n"
+#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 430
+#: rc.cpp:225
+#, no-c-format
+msgid "Add breakpoint using file name with line number or a template name"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/file_cmds.cpp:71
-msgid "Entity %1 "
+#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 488
+#: rc.cpp:228 rc.cpp:282 rc.cpp:297 rc.cpp:324 rc.cpp:357 rc.cpp:387
+#, no-c-format
+msgid "Refresh"
+msgstr "Cyfredoli"
+
+#. i18n: file ./kxsldbgpart/xsldbglocalvariables.ui line 25
+#: rc.cpp:237
+#, no-c-format
+msgid "Xsldbg Local Variables"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/file_cmds.cpp:78
-msgid ""
-"No external General Parsed entities present.\n"
+#. i18n: file ./kxsldbgpart/xsldbglocalvariables.ui line 87
+#: rc.cpp:240 rc.cpp:312
+#, no-c-format
+msgid "Expression:"
+msgstr "Mynegiad:"
+
+#. i18n: file ./kxsldbgpart/xsldbglocalvariables.ui line 95
+#: rc.cpp:243 rc.cpp:315
+#, no-c-format
+msgid "Enter a valid XPath expression"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/file_cmds.cpp:80
-#, c-format
-msgid ""
-"_n: \tTotal of %n entity found.\n"
-"\tTotal of %n entities found."
+#. i18n: file ./kxsldbgpart/xsldbglocalvariables.ui line 122
+#: kxsldbgpart/kxsldbg_part.cpp:95 rc.cpp:246 rc.cpp:318
+#, no-c-format
+msgid "Evaluate"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/file_cmds.cpp:121
-#: kxsldbgpart/libxsldbg/file_cmds.cpp:129
-msgid ""
-"SystemID \"%1\" was not found in current catalog.\n"
+#. i18n: file ./kxsldbgpart/xsldbglocalvariables.ui line 125
+#: rc.cpp:249 rc.cpp:321
+#, no-c-format
+msgid "Result of evaluation will appear in message window"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/file_cmds.cpp:125
-msgid ""
-"SystemID \"%1\" maps to: \"%2\"\n"
+#. i18n: file ./kxsldbgpart/xsldbglocalvariables.ui line 161
+#: rc.cpp:255
+#, no-c-format
+msgid "Template Context"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/file_cmds.cpp:168
-#: kxsldbgpart/libxsldbg/file_cmds.cpp:176
-msgid ""
-"PublicID \"%1\" was not found in current catalog.\n"
+#. i18n: file ./kxsldbgpart/xsldbglocalvariables.ui line 172
+#: rc.cpp:258
+#, no-c-format
+msgid "Type"
+msgstr "Math"
+
+#. i18n: file ./kxsldbgpart/xsldbglocalvariables.ui line 183
+#: rc.cpp:261 rc.cpp:288 rc.cpp:306
+#, no-c-format
+msgid "Source File"
+msgstr "Ffeil Tarddiad"
+
+#. i18n: file ./kxsldbgpart/xsldbglocalvariables.ui line 194
+#: rc.cpp:264 rc.cpp:309
+#, no-c-format
+msgid "Source Line Number"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/file_cmds.cpp:172
-msgid ""
-"PublicID \"%1\" maps to: \"%2\"\n"
+#. i18n: file ./kxsldbgpart/xsldbglocalvariables.ui line 228
+#: rc.cpp:267
+#, fuzzy, no-c-format
+msgid "Variable expression:"
+msgstr "Mynegiad:"
+
+#. i18n: file ./kxsldbgpart/xsldbglocalvariables.ui line 249
+#: rc.cpp:270
+#, fuzzy, no-c-format
+msgid "Variable type:"
+msgstr "Enw'r ffeil:"
+
+#. i18n: file ./kxsldbgpart/xsldbglocalvariables.ui line 270
+#: rc.cpp:273
+#, fuzzy, no-c-format
+msgid "Set Expression"
+msgstr "Mynegiad:"
+
+#. i18n: file ./kxsldbgpart/xsldbglocalvariables.ui line 273
+#: rc.cpp:276
+#, no-c-format
+msgid "Set the selection for variable "
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/template_cmds.cpp:135
-msgid ""
-" template: \"%1\" mode: \"%2\" in file \"%3\" at line %4\n"
+#. i18n: file ./kxsldbgpart/xsldbglocalvariables.ui line 283
+#: rc.cpp:279
+#, fuzzy, no-c-format
+msgid "Variable name:"
+msgstr "Enw'r ffeil:"
+
+#. i18n: file ./kxsldbgpart/xsldbgsources.ui line 17
+#: rc.cpp:285
+#, no-c-format
+msgid "Xsldbg Source Files"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/template_cmds.cpp:226
-msgid ""
-"\tNo XSLT templates found.\n"
+#. i18n: file ./kxsldbgpart/xsldbgsources.ui line 43
+#: rc.cpp:291
+#, no-c-format
+msgid "Parent File"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/template_cmds.cpp:228
-#, c-format
-msgid ""
-"_n: \tTotal of %n XSLT template found\n"
-"\tTotal of %n XSLT templates found"
+#. i18n: file ./kxsldbgpart/xsldbgsources.ui line 54
+#: rc.cpp:294
+#, no-c-format
+msgid "Parent Line Number"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/template_cmds.cpp:229
-#, c-format
-msgid ""
-"_n: \tTotal of %n XSLT template printed\n"
-"\tTotal of %n XSLT templates printed"
+#. i18n: file ./kxsldbgpart/xsldbgglobalvariables.ui line 25
+#: rc.cpp:300
+#, no-c-format
+msgid "Xsldbg Global Variables"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/template_cmds.cpp:261
-#: kxsldbgpart/libxsldbg/template_cmds.cpp:290
-msgid ""
-" Stylesheet %1\n"
+#. i18n: file ./kxsldbgpart/xsldbgtemplates.ui line 17
+#: rc.cpp:327
+#, no-c-format
+msgid "Xsldbg Templates"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/template_cmds.cpp:325
-#, c-format
-msgid ""
-"_n: \tTotal of %n XSLT stylesheet found.\n"
-"\tTotal of %n XSLT stylesheets found."
+#. i18n: file ./kxsldbgpart/xsldbgtemplates.ui line 54
+#: rc.cpp:336 rc.cpp:348
+#, no-c-format
+msgid "Source File Name"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/template_cmds.cpp:328
-msgid ""
-"\tNo XSLT stylesheets found.\n"
+#. i18n: file ./kxsldbgpart/xsldbgcallstack.ui line 17
+#: rc.cpp:342
+#, no-c-format
+msgid "Xsldbg Callstack"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/xsldbg.cpp:270 kxsldbgpart/libxsldbg/xsldbg.cpp:298
-#: kxsldbgpart/libxsldbg/xsldbg.cpp:320
-msgid ""
-"%1 took %2 ms to complete.\n"
+#. i18n: file ./kxsldbgpart/xsldbgcallstack.ui line 32
+#: rc.cpp:345
+#, no-c-format
+msgid "Frame# Template Name"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/xsldbg.cpp:361
-#, c-format
-msgid "XInclude processing %1."
+#. i18n: file ./kxsldbgpart/xsldbgcallstack.ui line 75
+#: rc.cpp:354
+#, no-c-format
+msgid "Oldest Frame # is 0, Frame # has been added to the first column"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/xsldbg.cpp:399 kxsldbgpart/libxsldbg/xsldbg.cpp:446
-msgid ""
-"Error: Unable to write temporary results to %1.\n"
+#. i18n: file ./kxsldbgpart/xsldbgwalkspeed.ui line 17
+#: rc.cpp:360
+#, no-c-format
+msgid "Configure xsldbg's Walk Speed"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/xsldbg.cpp:409
-#, c-format
+#. i18n: file ./kxsldbgpart/xsldbgwalkspeed.ui line 51
+#: rc.cpp:363
+#, no-c-format
 msgid ""
-"_n: Applying stylesheet %n time\n"
-"Applying stylesheet %n times"
+"Change the speed at which xsldbg walks through execution of the stylesheet."
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/xsldbg.cpp:412
-msgid "Applying stylesheet"
-msgstr "Gweithredu'r len arddull"
+#. i18n: file ./kxsldbgpart/xsldbgwalkspeed.ui line 95
+#: rc.cpp:366
+#, no-c-format
+msgid "Slow"
+msgstr "Araf"
 
-#: kxsldbgpart/libxsldbg/xsldbg.cpp:473 kxsldbgpart/libxsldbg/xsldbg.cpp:491
-msgid "Saving result"
+#. i18n: file ./kxsldbgpart/xsldbgwalkspeed.ui line 117
+#: rc.cpp:369
+#, no-c-format
+msgid "Fast"
+msgstr "Cyflym"
+
+#. i18n: file ./kxsldbgpart/xsldbgentities.ui line 25
+#: rc.cpp:378
+#, no-c-format
+msgid "Xsldbg Entities"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/xsldbg.cpp:476
-msgid ""
-"Warning: Generating non-standard output XHTML.\n"
+#. i18n: file ./kxsldbgpart/xsldbgentities.ui line 40
+#: rc.cpp:381
+#, no-c-format
+msgid "PublicID"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/xsldbg.cpp:493
-msgid ""
-"Warning: Unsupported, non-standard output method %1.\n"
+#. i18n: file ./kxsldbgpart/xsldbgentities.ui line 51
+#: rc.cpp:384
+#, no-c-format
+msgid "SystemID"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/xsldbg.cpp:509
-msgid "Running stylesheet and saving result"
+#: kxsldbg.cpp:67
+msgid "&XSLDbg Handbook"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/xsldbg.cpp:516
-msgid ""
-"Error: Unable to save results of transformation to file %1.\n"
+#: kxsldbg.cpp:76
+msgid "Could not find our part."
+msgstr "Methu canfod ein rhan."
+
+#: kxsldbg.cpp:176
+msgid "File: %1  Line: %2  Col: %3"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/xsldbg.cpp:558 kxsldbgpart/libxsldbg/xsldbg.cpp:887
-#: kxsldbgpart/libxsldbg/xsldbg.cpp:919 kxsldbgpart/libxsldbg/xsldbg.cpp:993
-msgid ""
-"Fatal error: Aborting debugger due to an unrecoverable error.\n"
+#: kxsldbgpart/xsldbgoutputview.cpp:61
+msgid "xsldbg Output"
 msgstr ""
 
-#: kxsldbgpart/kxsldbg_part.cpp:738 kxsldbgpart/libxsldbg/xsldbg.cpp:591
+#: kxsldbgpart/xsldbgoutputview.cpp:62
 msgid ""
-"Error: Too many file names supplied via command line.\n"
+"\t\txsldbg output capture ready\n"
+"\n"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/xsldbg.cpp:683
-msgid ""
-"Warning: Too many libxslt parameters provided via the command line option "
-"--param.\n"
+#: kxsldbgpart/xsldbgoutputview.cpp:76
+msgid "Result of evaluation"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/xsldbg.cpp:692
-msgid ""
-"Error: Argument \"%1\" to --param is not in the format <name>:<value>.\n"
+#: kxsldbgpart/xsldbgoutputview.cpp:93
+msgid "Request Failed "
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/xsldbg.cpp:744
-msgid ""
-"\n"
-"Starting stylesheet\n"
-"\n"
+#: kxsldbgpart/xsldbginspector.cpp:68
+msgid "Xsldbg Inspector"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/xsldbg.cpp:755
-msgid ""
-"Error: No XSLT source file supplied.\n"
+#: kxsldbgpart/xsldbginspector.cpp:77
+msgid "Breakpoints"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/xsldbg.cpp:758
-msgid ""
-"Error: No XML data file supplied.\n"
+#: kxsldbgpart/xsldbginspector.cpp:83
+msgid "Variables"
+msgstr "Newidynnau"
+
+#: kxsldbgpart/xsldbginspector.cpp:89
+msgid "CallStack"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/xsldbg.cpp:795
-msgid ""
-"\n"
-"Debugger never received control.\n"
+#: kxsldbgpart/xsldbginspector.cpp:95
+msgid "Templates"
+msgstr "Patrymluniau"
+
+#: kxsldbgpart/xsldbginspector.cpp:101
+msgid "Sources"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/xsldbg.cpp:800
-msgid ""
-"\n"
-"Finished stylesheet\n"
-"\n"
+#: kxsldbgpart/xsldbginspector.cpp:107
+msgid "Entities"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/xsldbg.cpp:857
-msgid ""
-"Going to the command shell; not all xsldbg commands will work as not all needed "
-"have been loaded.\n"
+#: kxsldbgpart/xsldbginspector.cpp:126
+msgid "Apply changes to xsldbg after restarting execution"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/xsldbg.cpp:914
-#, c-format
-msgid "Parsing stylesheet %1"
-msgstr "Dosrannu'r len arddull %1"
+#: kxsldbgpart/xsldbginspector.cpp:133
+msgid "&Refresh"
+msgstr "&Ailfywio"
 
-#: kxsldbgpart/libxsldbg/xsldbg.cpp:916
-msgid ""
-"Error: Cannot parse file %1.\n"
+#: kxsldbgpart/xsldbginspector.cpp:134
+msgid "Refresh values in inspectors from xsldbg"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/xsldbg.cpp:991 kxsldbgpart/libxsldbg/xsldbg.cpp:1035
-msgid ""
-"Error: Unable to parse file %1.\n"
+#: kxsldbgpart/xsldbgbreakpointsimpl.cpp:83
+#: kxsldbgpart/xsldbgbreakpointsimpl.cpp:92
+#: kxsldbgpart/xsldbgbreakpointsimpl.cpp:115
+#: kxsldbgpart/xsldbgbreakpointsimpl.cpp:120
+#: kxsldbgpart/xsldbgbreakpointsimpl.cpp:143
+#: kxsldbgpart/xsldbgbreakpointsimpl.cpp:148
+#: kxsldbgpart/xsldbgdebugger.cpp:297 kxsldbgpart/xsldbgdebugger.cpp:317
+#: kxsldbgpart/xsldbgdebugger.cpp:335 kxsldbgpart/xsldbgdebugger.cpp:355
+#: kxsldbgpart/xsldbgdebugger.cpp:375 kxsldbgpart/xsldbgdebugger.cpp:394
+msgid "Operation Failed"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:140
-#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:243
-#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:383
-msgid ""
-"Error: XPath %1 results in an empty Node Set.\n"
+#: kxsldbgpart/xsldbgbreakpointsimpl.cpp:84
+#: kxsldbgpart/xsldbgbreakpointsimpl.cpp:116
+#: kxsldbgpart/xsldbgbreakpointsimpl.cpp:144
+msgid "A line number was provided without a file name."
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:175
-msgid ""
-"Information: Temporarily setting document's encoding to UTF-8. Previously was "
-"%1.\n"
+#: kxsldbgpart/xsldbgbreakpointsimpl.cpp:93
+msgid "No details provided or an invalid line number was supplied."
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:229
-msgid ""
-"Error: Unable to save temporary results to %1.\n"
+#: kxsldbgpart/xsldbgbreakpointsimpl.cpp:121
+msgid "No details provided or an invalid line or ID was supplied."
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:251
-msgid "NULL string value supplied."
+#: kxsldbgpart/xsldbgbreakpointsimpl.cpp:149
+msgid "No details provided."
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:262
-msgid "Unable to convert XPath to string."
+#: kxsldbgpart/xsldbgconfigimpl.cpp:191
+msgid ""
+"\t\"XSL source\" \n"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:358
+#: kxsldbgpart/xsldbgconfigimpl.cpp:193
 msgid ""
-"Warning: Unable to print expression. No stylesheet was properly loaded.\n"
+"\t\"XML data\" \n"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:418
+#: kxsldbgpart/xsldbgconfigimpl.cpp:195
 msgid ""
-" Global %1\n"
+"\t\"Output file\" \n"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:421
-msgid " Global "
+#: kxsldbgpart/xsldbgconfigimpl.cpp:197
+msgid ""
+"Missing values for \n"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:424
+#: kxsldbgpart/xsldbgconfigimpl.cpp:201
 msgid ""
-" Global = %1\n"
+"Output file is the same as either XSL Source or XML Data file\n"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:427
-#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:430
+#: kxsldbgpart/xsldbgconfigimpl.cpp:220
 msgid ""
-" Global = %1\n"
-"%2"
+"The following libxslt parameters are empty\n"
+"\t"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:430
-#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:568
-msgid ""
-"Warning: No value assigned to variable.\n"
+#: kxsldbgpart/xsldbgconfigimpl.cpp:370
+msgid "Choose XSL Source to Debug"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:483
-msgid ""
-"Error: Debugger has no files loaded or libxslt has not reached a template.\n"
-"Try reloading files or taking more steps.\n"
+#: kxsldbgpart/xsldbgconfigimpl.cpp:382
+msgid "Choose XML Data to Debug"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:520
-msgid ""
-"Error: Libxslt has not initialized variables yet; try stepping to a template.\n"
+#: kxsldbgpart/xsldbgconfigimpl.cpp:393
+msgid "Choose Output File for XSL Transformation"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:556
-#, c-format
-msgid " Local %1"
+#: kxsldbgpart/xsldbgconfigimpl.cpp:484
+msgid "Suspect Configuration"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:559
-msgid " Local "
+#: kxsldbgpart/xsldbgconfigimpl.cpp:488
+msgid "Incomplete or Invalid Configuration"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:562
-msgid ""
-" Local = %1\n"
+#: kxsldbgpart/libxsldbg/help_unix.cpp:51
+#: kxsldbgpart/libxsldbg/help_unix.cpp:56
+msgid "xsldbg version"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:565
-#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:568
+#: kxsldbgpart/libxsldbg/help_unix.cpp:52
+#: kxsldbgpart/libxsldbg/help_unix.cpp:57
+msgid "Help document version"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/help_unix.cpp:53
+#: kxsldbgpart/libxsldbg/help_unix.cpp:58
+msgid "Help not found for command"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/help_unix.cpp:90
 msgid ""
-" Local = %1\n"
-"%2"
+"Error: Unable to display help. Help files not found in %1 or xsldbg not found "
+"in path.\n"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:583
+#: kxsldbgpart/libxsldbg/help_unix.cpp:92
 msgid ""
-"Error: Libxslt has not initialized variables yet; try stepping past the "
-"xsl:param elements in the template.\n"
+"Error: Unable to find xsldbg or help files.\n"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/search.cpp:407
+#: kxsldbgpart/libxsldbg/help_unix.cpp:97
 msgid ""
-"Error: Unable to write search Database to file %1. Try setting the "
-"\"searchresultspath\" option to a writable path.\n"
+"Error: Unable to print help file.\n"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/search.cpp:482
+#: kxsldbgpart/libxsldbg/help_unix.cpp:102
 msgid ""
-"Information: Transformed %1 using %2 and saved to %3.\n"
+"Error: No path to documentation; aborting help.\n"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/search.cpp:723
+#: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:223
+#: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:318
+#: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:1031
+#: kxsldbgpart/libxsldbg/debugXSL.cpp:679
+#: kxsldbgpart/libxsldbg/debugXSL.cpp:713
+#: kxsldbgpart/libxsldbg/debugXSL.cpp:1237
+#: kxsldbgpart/libxsldbg/debugXSL.cpp:1340
+#: kxsldbgpart/libxsldbg/files.cpp:1353
+#: kxsldbgpart/libxsldbg/files_unix.cpp:61
+#: kxsldbgpart/libxsldbg/files_unix.cpp:153
+#: kxsldbgpart/libxsldbg/search.cpp:106 kxsldbgpart/libxsldbg/search.cpp:1191
+#: kxsldbgpart/libxsldbg/search.cpp:1254 kxsldbgpart/libxsldbg/search.cpp:1315
+#: kxsldbgpart/libxsldbg/search.cpp:1367 kxsldbgpart/libxsldbg/search.cpp:1415
+#: kxsldbgpart/libxsldbg/search.cpp:1469 kxsldbgpart/libxsldbg/search.cpp:1515
+#: kxsldbgpart/libxsldbg/variable_cmds.cpp:105
+#: kxsldbgpart/libxsldbg/xsldbg.cpp:512 kxsldbgpart/libxsldbg/xsldbg.cpp:1069
 msgid ""
-"Error: XSLT template named \"%1\" was not found.\n"
+"Error: Out of memory.\n"
 msgstr ""
+"Fazi : Allan o gof.\n"
 
-#: kxsldbgpart/libxsldbg/os_cmds.cpp:72
+#: kxsldbgpart/libxsldbg/search.cpp:407
 msgid ""
-"Error: No command processor available for shell command \"%1\".\n"
+"Error: Unable to write search Database to file %1. Try setting the "
+"\"searchresultspath\" option to a writable path.\n"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/os_cmds.cpp:77
+#: kxsldbgpart/libxsldbg/search.cpp:482
 msgid ""
-"Information: Starting shell command \"%1\".\n"
+"Information: Transformed %1 using %2 and saved to %3.\n"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/os_cmds.cpp:92
+#: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:425
+#: kxsldbgpart/libxsldbg/search.cpp:484
+#: kxsldbgpart/libxsldbg/trace_cmds.cpp:68
+#: kxsldbgpart/libxsldbg/variable_cmds.cpp:111
 msgid ""
-"Information: Finished shell command.\n"
+"Error: Invalid arguments to command %1.\n"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/os_cmds.cpp:96
+#: kxsldbgpart/libxsldbg/search.cpp:723
 msgid ""
-"Error: Unable to run command. System error %1.\n"
+"Error: XSLT template named \"%1\" was not found.\n"
 msgstr ""
 
 #: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:97
@@ -966,6 +1103,19 @@ msgid ""
 "Load of data file deferred. Use the run command.\n"
 msgstr ""
 
+#: kxsldbgpart/libxsldbg/debugXSL.cpp:1888
+#: kxsldbgpart/libxsldbg/debugXSL.cpp:1901
+#: kxsldbgpart/libxsldbg/debugXSL.cpp:2061
+#: kxsldbgpart/libxsldbg/file_cmds.cpp:248
+#: kxsldbgpart/libxsldbg/file_cmds.cpp:265
+#: kxsldbgpart/libxsldbg/param_cmds.cpp:52
+#: kxsldbgpart/libxsldbg/param_cmds.cpp:71
+#: kxsldbgpart/libxsldbg/param_cmds.cpp:101
+#: kxsldbgpart/libxsldbg/param_cmds.cpp:115
+msgid ""
+"Error: Invalid arguments for the command %1.\n"
+msgstr ""
+
 #: kxsldbgpart/libxsldbg/debugXSL.cpp:1911
 #: kxsldbgpart/libxsldbg/debugXSL.cpp:1932
 #: kxsldbgpart/libxsldbg/debugXSL.cpp:1940
@@ -978,6 +1128,16 @@ msgid ""
 "Opening terminal %1.\n"
 msgstr ""
 
+#: kxsldbgpart/libxsldbg/debugXSL.cpp:2012
+#: kxsldbgpart/libxsldbg/file_cmds.cpp:213
+#: kxsldbgpart/libxsldbg/file_cmds.cpp:269
+#: kxsldbgpart/libxsldbg/option_cmds.cpp:113
+#: kxsldbgpart/libxsldbg/option_cmds.cpp:116
+#: kxsldbgpart/libxsldbg/os_cmds.cpp:48
+msgid ""
+"Error: Missing arguments for the command %1.\n"
+msgstr ""
+
 #: kxsldbgpart/libxsldbg/debugXSL.cpp:2016
 msgid ""
 "Warning: The %1 command is disabled\n"
@@ -988,6 +1148,137 @@ msgid ""
 "Error: Unknown command %1. Try help.\n"
 msgstr ""
 
+#: kxsldbgpart/libxsldbg/utils.cpp:111
+msgid ""
+"Error: Unmatched quotes in input.\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/option_cmds.cpp:73
+#: kxsldbgpart/libxsldbg/option_cmds.cpp:107
+msgid ""
+"Error: Unable to parse %1 as an option value.\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/option_cmds.cpp:110
+msgid ""
+"Error: Unknown option name %1.\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/option_cmds.cpp:146
+msgid ""
+"Option %1 = %2\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/option_cmds.cpp:157
+msgid ""
+"Option %1 = \"%2\"\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/option_cmds.cpp:159
+msgid ""
+"Option %1 = \"\"\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/option_cmds.cpp:230
+msgid ""
+"\tNo expression watches set.\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/option_cmds.cpp:237
+msgid " WatchExpression %1 "
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/option_cmds.cpp:263
+msgid ""
+"Error: Unable to add watch expression \"%1\". It already has been added or it "
+"cannot be watched.\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/option_cmds.cpp:287
+msgid ""
+"Error: Unable to parse %1 as a watchID.\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/option_cmds.cpp:292
+msgid ""
+"Error: Watch expression %1 does not exist.\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/trace_cmds.cpp:69
+msgid ""
+"Warning: Assuming normal speed.\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/files.cpp:192 kxsldbgpart/libxsldbg/files.cpp:215
+msgid ""
+"Error: Unable to open terminal %1.\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/files.cpp:195
+msgid ""
+"Error: Did not previously open terminal.\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/files.cpp:497
+msgid ""
+"Error: The file name \"%1\" is too long.\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/files.cpp:521
+msgid ""
+"Error: Unable to change to directory %1.\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/files.cpp:524
+msgid ""
+"Changed to directory %1.\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/files.cpp:552
+msgid ""
+"Setting XML Data file name to %1.\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/files.cpp:564
+msgid ""
+"Setting stylesheet file name to %1.\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/files.cpp:581
+msgid ""
+"Setting stylesheet base path to %1.\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/files.cpp:598
+msgid ""
+"Missing file name.\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/files.cpp:1108 kxsldbgpart/libxsldbg/files.cpp:1143
+msgid ""
+"Encoding of text failed.\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/files.cpp:1179
+#, c-format
+msgid "Unable to initialize encoding %1."
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/files.cpp:1184
+msgid ""
+"Invalid encoding %1.\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/files.cpp:1245
+msgid ""
+" ----- more ---- \n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/files.cpp:1363
+msgid ""
+"Error: Unable to convert %1 to local file name.\n"
+msgstr ""
+
 #: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:94
 #: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:345
 msgid "Failed to add breakpoint."
@@ -1025,6 +1316,14 @@ msgid ""
 "Error: Unable to find a data file whose name contains %1.\n"
 msgstr ""
 
+#: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:375
+#: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:695
+#: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:821
+#: kxsldbgpart/libxsldbg/param_cmds.cpp:107
+msgid ""
+"Error: Unable to parse %1 as a line number.\n"
+msgstr ""
+
 #: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:419
 msgid "Error: Unable to find the added breakpoint."
 msgstr ""
@@ -1122,892 +1421,598 @@ msgid ""
 "re-created.\n"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/utils.cpp:111
-msgid ""
-"Error: Unmatched quotes in input.\n"
-msgstr ""
-
-#: kxsldbgpart/libxsldbg/search_cmds.cpp:52
-msgid ""
-"Error: No path to documentation; aborting searching.\n"
+#: kxsldbgpart/libxsldbg/file_cmds.cpp:71
+msgid "Entity %1 "
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/search_cmds.cpp:54
+#: kxsldbgpart/libxsldbg/file_cmds.cpp:78
 msgid ""
-"Error: Error in value of USE_DOCS_MACRO; look at Makefile.am.\n"
+"No external General Parsed entities present.\n"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/search_cmds.cpp:56
+#: kxsldbgpart/libxsldbg/file_cmds.cpp:80
+#, c-format
 msgid ""
-"Error: Required environment variable %1 not set to the directory of xsldbg "
-"documentation.\n"
+"_n: \tTotal of %n entity found.\n"
+"\tTotal of %n entities found."
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/search_cmds.cpp:62
+#: kxsldbgpart/libxsldbg/file_cmds.cpp:121
+#: kxsldbgpart/libxsldbg/file_cmds.cpp:129
 msgid ""
-"Error: Stylesheet not valid, files not loaded yet?\n"
+"SystemID \"%1\" was not found in current catalog.\n"
 msgstr ""
 
-#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 81
-#: kxsldbgpart/xsldbgbreakpointlistitem.cpp:38 rc.cpp:213
-#, no-c-format
-msgid "Enabled"
-msgstr "Alluogir"
-
-#: kxsldbgpart/xsldbgbreakpointlistitem.cpp:40
-msgid "Disabled"
-msgstr "Analluogir"
-
-#: kxsldbgpart/xsldbgconfigimpl.cpp:191
+#: kxsldbgpart/libxsldbg/file_cmds.cpp:125
 msgid ""
-"\t\"XSL source\" \n"
+"SystemID \"%1\" maps to: \"%2\"\n"
 msgstr ""
 
-#: kxsldbgpart/xsldbgconfigimpl.cpp:193
+#: kxsldbgpart/libxsldbg/file_cmds.cpp:168
+#: kxsldbgpart/libxsldbg/file_cmds.cpp:176
 msgid ""
-"\t\"XML data\" \n"
+"PublicID \"%1\" was not found in current catalog.\n"
 msgstr ""
 
-#: kxsldbgpart/xsldbgconfigimpl.cpp:195
+#: kxsldbgpart/libxsldbg/file_cmds.cpp:172
 msgid ""
-"\t\"Output file\" \n"
+"PublicID \"%1\" maps to: \"%2\"\n"
 msgstr ""
 
-#: kxsldbgpart/xsldbgconfigimpl.cpp:197
-msgid ""
-"Missing values for \n"
+#: kxsldbgpart/libxsldbg/param_cmds.cpp:48
+msgid "Failed to add parameter"
 msgstr ""
 
-#: kxsldbgpart/xsldbgconfigimpl.cpp:201
-msgid ""
-"Output file is the same as either XSL Source or XML Data file\n"
+#: kxsldbgpart/libxsldbg/param_cmds.cpp:96
+msgid "Failed to delete parameter"
 msgstr ""
 
-#: kxsldbgpart/xsldbgconfigimpl.cpp:220
+#: kxsldbgpart/libxsldbg/param_cmds.cpp:112
 msgid ""
-"The following libxslt parameters are empty\n"
-"\t"
+"Error: Unable to find parameter %1.\n"
 msgstr ""
 
-#: kxsldbgpart/xsldbgconfigimpl.cpp:370
-msgid "Choose XSL Source to Debug"
+#: kxsldbgpart/libxsldbg/param_cmds.cpp:146
+msgid "Unable to print parameters"
 msgstr ""
 
-#: kxsldbgpart/xsldbgconfigimpl.cpp:382
-msgid "Choose XML Data to Debug"
+#: kxsldbgpart/libxsldbg/os_cmds.cpp:72
+msgid ""
+"Error: No command processor available for shell command \"%1\".\n"
 msgstr ""
 
-#: kxsldbgpart/xsldbgconfigimpl.cpp:393
-msgid "Choose Output File for XSL Transformation"
+#: kxsldbgpart/libxsldbg/os_cmds.cpp:77
+msgid ""
+"Information: Starting shell command \"%1\".\n"
 msgstr ""
 
-#: kxsldbgpart/xsldbgconfigimpl.cpp:484
-msgid "Suspect Configuration"
+#: kxsldbgpart/libxsldbg/os_cmds.cpp:92
+msgid ""
+"Information: Finished shell command.\n"
 msgstr ""
 
-#: kxsldbgpart/xsldbgconfigimpl.cpp:488
-msgid "Incomplete or Invalid Configuration"
+#: kxsldbgpart/libxsldbg/os_cmds.cpp:96
+msgid ""
+"Error: Unable to run command. System error %1.\n"
 msgstr ""
 
-#: kxsldbgpart/xsldbgdebugger.cpp:298 kxsldbgpart/xsldbgdebugger.cpp:318
-#: kxsldbgpart/xsldbgdebugger.cpp:336 kxsldbgpart/xsldbgdebugger.cpp:356
-#: kxsldbgpart/xsldbgdebugger.cpp:376 kxsldbgpart/xsldbgdebugger.cpp:395
-msgid "Cannot set/edit breakpoints on the output file."
-msgstr ""
+#: kxsldbgpart/libxsldbg/breakpoint.cpp:619
+msgid "disabled"
+msgstr "analluogwyd"
 
-#: kxsldbgpart/xsldbgoutputview.cpp:71 kxsldbgpart/xsldbgoutputview.cpp:88
-msgid "xsldbg Output"
-msgstr ""
+#: kxsldbgpart/libxsldbg/breakpoint.cpp:620
+msgid "enabled"
+msgstr "galluogwyd"
 
-#: kxsldbgpart/xsldbgoutputview.cpp:72 kxsldbgpart/xsldbgoutputview.cpp:89
+#: kxsldbgpart/libxsldbg/breakpoint.cpp:639
 msgid ""
-"\t\txsldbg output capture ready\n"
-"\n"
-msgstr ""
-
-#: kxsldbgpart/xsldbgoutputview.cpp:103
-msgid "Result of evaluation"
+"Breakpoint %1 %2 for template: \"%3\" mode: \"%4\" in file \"%5\" at line %6"
 msgstr ""
 
-#: kxsldbgpart/xsldbgoutputview.cpp:120
-msgid "Request Failed "
+#: kxsldbgpart/libxsldbg/breakpoint.cpp:641
+msgid "Breakpoint %1 %2 for template: \"%3\" mode: \"%4\""
 msgstr ""
 
-#: kxsldbgpart/kxsldbg_part.cpp:87 kxsldbgpart/kxsldbg_part.cpp:634
-#: kxsldbgpart/kxsldbg_part.cpp:636
-msgid "Goto XPath"
+#: kxsldbgpart/libxsldbg/options.cpp:296 kxsldbgpart/libxsldbg/options.cpp:326
+msgid ""
+"Error: Option %1 is not a valid boolean/integer option.\n"
 msgstr ""
 
-#. i18n: file ./kxsldbgpart/xsldbgglobalvariables.ui line 185
-#: kxsldbgpart/kxsldbg_part.cpp:95 rc.cpp:33 rc.cpp:339
-#, no-c-format
-msgid "Evaluate"
+#: kxsldbgpart/libxsldbg/options.cpp:368 kxsldbgpart/libxsldbg/options.cpp:399
+msgid ""
+"Error: Option %1 is not a valid string xsldbg option.\n"
 msgstr ""
 
-#: kxsldbgpart/kxsldbg_part.cpp:109
-msgid "Configure Editor..."
+#: kxsldbgpart/libxsldbg/options.cpp:511
+msgid ""
+" Parameter %1 %2=\"%3\"\n"
 msgstr ""
 
-#: kxsldbgpart/kxsldbg_part.cpp:113
-msgid "Configure..."
-msgstr "Ffurfweddu..."
-
-#: kxsldbgpart/kxsldbg_part.cpp:118
-msgid "Inspect..."
+#: kxsldbgpart/libxsldbg/options.cpp:546
+msgid ""
+"\n"
+"No parameters present.\n"
 msgstr ""
 
-#: kxsldbgpart/kxsldbg_part.cpp:125
-msgid "Run"
-msgstr "Rhedeg"
-
-#: kxsldbgpart/kxsldbg_part.cpp:135
-msgid "Step"
-msgstr "Cam"
-
-#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 261
-#: kxsldbgpart/kxsldbg_part.cpp:140 rc.cpp:108
-#, no-c-format
-msgid "Next"
-msgstr "Nesaf"
-
-#: kxsldbgpart/kxsldbg_part.cpp:145
-msgid "Step Up"
+#: kxsldbgpart/libxsldbg/files_unix.cpp:67
+msgid ""
+"Error: USER environment variable is not set.\n"
 msgstr ""
 
-#: kxsldbgpart/kxsldbg_part.cpp:150
-msgid "Step Down"
+#: kxsldbgpart/libxsldbg/files_unix.cpp:199
+msgid ""
+"Error: The value of the option docspath or searchresultspath is empty. See help "
+"on setoption or options command for more information.\n"
 msgstr ""
 
-#: kxsldbgpart/kxsldbg_part.cpp:156
-msgid "Break"
+#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:140
+#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:243
+#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:383
+msgid ""
+"Error: XPath %1 results in an empty Node Set.\n"
 msgstr ""
 
-#: kxsldbgpart/kxsldbg_part.cpp:161
-msgid "Enable/Disable"
+#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:175
+msgid ""
+"Information: Temporarily setting document's encoding to UTF-8. Previously was "
+"%1.\n"
 msgstr ""
 
-#: kxsldbgpart/kxsldbg_part.cpp:171
-msgid "&Source"
-msgstr "&Tarddiad"
-
-#: kxsldbgpart/kxsldbg_part.cpp:176
-msgid "&Data"
-msgstr "&Data"
-
-#: kxsldbgpart/kxsldbg_part.cpp:181
-msgid "&Output"
-msgstr "&Allbwn"
-
-#: kxsldbgpart/kxsldbg_part.cpp:186
-msgid "Reload Current File From Disk"
+#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:229
+msgid ""
+"Error: Unable to save temporary results to %1.\n"
 msgstr ""
 
-#: kxsldbgpart/kxsldbg_part.cpp:192
-msgid "Walk Through Stylesheet..."
+#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:251
+msgid "NULL string value supplied."
 msgstr ""
 
-#: kxsldbgpart/kxsldbg_part.cpp:196
-msgid "Stop Wal&king Through Stylesheet"
+#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:262
+msgid "Unable to convert XPath to string."
 msgstr ""
 
-#: kxsldbgpart/kxsldbg_part.cpp:200
-msgid "Tr&ace Execution of Stylesheet"
+#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:358
+msgid ""
+"Warning: Unable to print expression. No stylesheet was properly loaded.\n"
 msgstr ""
 
-#: kxsldbgpart/kxsldbg_part.cpp:204
-msgid "Stop Tracing of Stylesheet"
+#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:418
+msgid ""
+" Global %1\n"
 msgstr ""
 
-#: kxsldbgpart/kxsldbg_part.cpp:209
-msgid "&Evaluate Expression..."
+#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:421
+msgid " Global "
 msgstr ""
 
-#: kxsldbgpart/kxsldbg_part.cpp:214
-msgid "Goto &XPath..."
+#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:424
+msgid ""
+" Global = %1\n"
 msgstr ""
 
-#: kxsldbgpart/kxsldbg_part.cpp:219
-msgid "Lookup SystemID..."
+#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:427
+#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:430
+msgid ""
+" Global = %1\n"
+"%2"
 msgstr ""
 
-#: kxsldbgpart/kxsldbg_part.cpp:224
-msgid "Lookup PublicID..."
+#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:430
+#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:568
+msgid ""
+"Warning: No value assigned to variable.\n"
 msgstr ""
 
-#: kxsldbgpart/kxsldbg_part.cpp:277
-msgid "KXsldbgPart"
+#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:483
+msgid ""
+"Error: Debugger has no files loaded or libxslt has not reached a template.\n"
+"Try reloading files or taking more steps.\n"
 msgstr ""
 
-#: kxsldbgpart/kxsldbg_part.cpp:358
-msgid "Debugger Not Ready"
+#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:520
+msgid ""
+"Error: Libxslt has not initialized variables yet; try stepping to a template.\n"
 msgstr ""
 
-#: kxsldbgpart/kxsldbg_part.cpp:359
-msgid "Configure and start the debugger first."
+#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:556
+#, c-format
+msgid " Local %1"
 msgstr ""
 
-#: kxsldbgpart/kxsldbg_part.cpp:376 kxsldbgpart/kxsldbg_part.cpp:382
-msgid "Lookup SystemID"
+#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:559
+msgid " Local "
 msgstr ""
 
-#: kxsldbgpart/kxsldbg_part.cpp:377 kxsldbgpart/kxsldbg_part.cpp:383
-msgid "Please enter SystemID to find:"
+#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:562
+msgid ""
+" Local = %1\n"
 msgstr ""
 
-#: kxsldbgpart/kxsldbg_part.cpp:408 kxsldbgpart/kxsldbg_part.cpp:413
-msgid "Lookup PublicID"
+#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:565
+#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:568
+msgid ""
+" Local = %1\n"
+"%2"
 msgstr ""
 
-#: kxsldbgpart/kxsldbg_part.cpp:409 kxsldbgpart/kxsldbg_part.cpp:414
-msgid "Please enter PublicID to find:"
+#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:583
+msgid ""
+"Error: Libxslt has not initialized variables yet; try stepping past the "
+"xsl:param elements in the template.\n"
 msgstr ""
 
-#: kxsldbgpart/kxsldbg_part.cpp:622 kxsldbgpart/kxsldbg_part.cpp:624
-msgid "Evalute Expression"
+#: kxsldbgpart/libxsldbg/template_cmds.cpp:135
+msgid ""
+" template: \"%1\" mode: \"%2\" in file \"%3\" at line %4\n"
 msgstr ""
 
-#: kxsldbgpart/kxsldbg_part.cpp:622 kxsldbgpart/kxsldbg_part.cpp:624
-#: kxsldbgpart/kxsldbg_part.cpp:634 kxsldbgpart/kxsldbg_part.cpp:636
-msgid "XPath:"
+#: kxsldbgpart/libxsldbg/template_cmds.cpp:184
+#: kxsldbgpart/libxsldbg/variable_cmds.cpp:36
+msgid ""
+"Error: Stylesheet is not valid.\n"
 msgstr ""
 
-#: kxsldbgpart/kxsldbg_part.cpp:802
-msgid "SystemID or PublicID Resolution Result"
+#: kxsldbgpart/libxsldbg/template_cmds.cpp:226
+msgid ""
+"\tNo XSLT templates found.\n"
 msgstr ""
 
-#: kxsldbgpart/kxsldbg_part.cpp:803
+#: kxsldbgpart/libxsldbg/template_cmds.cpp:228
 #, c-format
 msgid ""
-"SystemID or PublicID has been resolved to\n"
-".%1"
-msgstr ""
-
-#. i18n: file kxsldbg_shell.rc line 9
-#: rc.cpp:6 rc.cpp:312 rc.cpp:381
-#, no-c-format
-msgid "Debug"
-msgstr ""
-
-#. i18n: file ./kxsldbgpart/xsldbgglobalvariables.ui line 25
-#: rc.cpp:15
-#, no-c-format
-msgid "Xsldbg Global Variables"
-msgstr ""
-
-#. i18n: file ./kxsldbgpart/xsldbgglobalvariables.ui line 40
-#: rc.cpp:18 rc.cpp:63 rc.cpp:201 rc.cpp:345
-#, no-c-format
-msgid "Name"
-msgstr "Enw"
-
-#. i18n: file ./kxsldbgpart/xsldbgglobalvariables.ui line 51
-#: rc.cpp:21 rc.cpp:78 rc.cpp:354
-#, no-c-format
-msgid "Source File"
-msgstr "Ffeil Tarddiad"
-
-#. i18n: file ./kxsldbgpart/xsldbgglobalvariables.ui line 62
-#: rc.cpp:24 rc.cpp:357
-#, no-c-format
-msgid "Source Line Number"
-msgstr ""
-
-#. i18n: file ./kxsldbgpart/xsldbgglobalvariables.ui line 150
-#: rc.cpp:27 rc.cpp:333
-#, no-c-format
-msgid "Expression:"
-msgstr "Mynegiad:"
-
-#. i18n: file ./kxsldbgpart/xsldbgglobalvariables.ui line 158
-#: rc.cpp:30 rc.cpp:336
-#, no-c-format
-msgid "Enter a valid XPath expression"
-msgstr ""
-
-#. i18n: file ./kxsldbgpart/xsldbgglobalvariables.ui line 188
-#: rc.cpp:36 rc.cpp:342
-#, no-c-format
-msgid "Result of evaluation will appear in message window"
-msgstr ""
-
-#. i18n: file ./kxsldbgpart/xsldbgglobalvariables.ui line 229
-#: rc.cpp:39 rc.cpp:57 rc.cpp:87 rc.cpp:282 rc.cpp:327 rc.cpp:375
-#, no-c-format
-msgid "Refresh"
-msgstr "Cyfredoli"
-
-#. i18n: file ./kxsldbgpart/xsldbgcallstack.ui line 17
-#: rc.cpp:42
-#, no-c-format
-msgid "Xsldbg Callstack"
-msgstr ""
-
-#. i18n: file ./kxsldbgpart/xsldbgcallstack.ui line 32
-#: rc.cpp:45
-#, no-c-format
-msgid "Frame# Template Name"
-msgstr ""
-
-#. i18n: file ./kxsldbgpart/xsldbgcallstack.ui line 43
-#: rc.cpp:48 rc.cpp:69
-#, no-c-format
-msgid "Source File Name"
-msgstr ""
-
-#. i18n: file ./kxsldbgpart/xsldbgcallstack.ui line 54
-#: rc.cpp:51 rc.cpp:72 rc.cpp:210
-#, no-c-format
-msgid "Line Number"
-msgstr ""
-
-#. i18n: file ./kxsldbgpart/xsldbgcallstack.ui line 75
-#: rc.cpp:54
-#, no-c-format
-msgid "Oldest Frame # is 0, Frame # has been added to the first column"
-msgstr ""
-
-#. i18n: file ./kxsldbgpart/xsldbgtemplates.ui line 17
-#: rc.cpp:60
-#, no-c-format
-msgid "Xsldbg Templates"
-msgstr ""
-
-#. i18n: file ./kxsldbgpart/xsldbgtemplates.ui line 43
-#: rc.cpp:66 rc.cpp:204
-#, no-c-format
-msgid "Mode"
-msgstr "Modd"
-
-#. i18n: file ./kxsldbgpart/xsldbgsources.ui line 17
-#: rc.cpp:75
-#, no-c-format
-msgid "Xsldbg Source Files"
-msgstr ""
-
-#. i18n: file ./kxsldbgpart/xsldbgsources.ui line 43
-#: rc.cpp:81
-#, no-c-format
-msgid "Parent File"
-msgstr ""
-
-#. i18n: file ./kxsldbgpart/xsldbgsources.ui line 54
-#: rc.cpp:84
-#, no-c-format
-msgid "Parent Line Number"
-msgstr ""
-
-#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 31
-#: rc.cpp:90
-#, no-c-format
-msgid "KXsldbg Configuration"
-msgstr ""
-
-#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 75
-#: rc.cpp:93
-#, no-c-format
-msgid "LibXSLT Parameters"
-msgstr ""
-
-#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 108
-#: rc.cpp:96
-#, no-c-format
-msgid "Parameter value:"
-msgstr ""
-
-#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 148
-#: rc.cpp:99
-#, no-c-format
-msgid "Parameter name:"
-msgstr ""
-
-#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 229
-#: rc.cpp:102
-#, no-c-format
-msgid "Prev"
+"_n: \tTotal of %n XSLT template found\n"
+"\tTotal of %n XSLT templates found"
 msgstr ""
 
-#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 464
-#: rc.cpp:120
-#, no-c-format
-msgid "Output file:"
-msgstr "Ffeil allbwn :"
-
-#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 488
-#: rc.cpp:123 rc.cpp:129 rc.cpp:135
-#, no-c-format
-msgid "..."
-msgstr "..."
-
-#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 512
-#: rc.cpp:126
-#, no-c-format
-msgid "XML data:"
+#: kxsldbgpart/libxsldbg/template_cmds.cpp:229
+#, c-format
+msgid ""
+"_n: \tTotal of %n XSLT template printed\n"
+"\tTotal of %n XSLT templates printed"
 msgstr ""
 
-#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 560
-#: rc.cpp:132
-#, no-c-format
-msgid "XSL source:"
+#: kxsldbgpart/libxsldbg/template_cmds.cpp:261
+#: kxsldbgpart/libxsldbg/template_cmds.cpp:290
+msgid ""
+" Stylesheet %1\n"
 msgstr ""
 
-#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 621
-#: rc.cpp:141
-#, no-c-format
-msgid "catalogs"
+#: kxsldbgpart/libxsldbg/template_cmds.cpp:325
+#, c-format
+msgid ""
+"_n: \tTotal of %n XSLT stylesheet found.\n"
+"\tTotal of %n XSLT stylesheets found."
 msgstr ""
 
-#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 624
-#: rc.cpp:144
-#, no-c-format
-msgid "use catalogs from $SGML_CATALOGS_FILES"
+#: kxsldbgpart/libxsldbg/template_cmds.cpp:328
+msgid ""
+"\tNo XSLT stylesheets found.\n"
 msgstr ""
 
-#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 632
-#: rc.cpp:147
-#, no-c-format
-msgid "novalid"
+#: kxsldbgpart/libxsldbg/xsldbg.cpp:270 kxsldbgpart/libxsldbg/xsldbg.cpp:298
+#: kxsldbgpart/libxsldbg/xsldbg.cpp:320
+msgid ""
+"%1 took %2 ms to complete.\n"
 msgstr ""
 
-#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 635
-#: rc.cpp:150
-#, no-c-format
-msgid "skip the DTD loading phase"
+#: kxsldbgpart/libxsldbg/xsldbg.cpp:361
+#, c-format
+msgid "XInclude processing %1."
 msgstr ""
 
-#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 643
-#: rc.cpp:153
-#, no-c-format
-msgid "html"
-msgstr "html"
-
-#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 646
-#: rc.cpp:156
-#, no-c-format
-msgid "the input document is(are) an HTML file(s)"
+#: kxsldbgpart/libxsldbg/xsldbg.cpp:399 kxsldbgpart/libxsldbg/xsldbg.cpp:446
+msgid ""
+"Error: Unable to write temporary results to %1.\n"
 msgstr ""
 
-#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 654
-#: rc.cpp:159
-#, no-c-format
-msgid "docbook"
+#: kxsldbgpart/libxsldbg/xsldbg.cpp:409
+#, c-format
+msgid ""
+"_n: Applying stylesheet %n time\n"
+"Applying stylesheet %n times"
 msgstr ""
 
-#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 657
-#: rc.cpp:162
-#, no-c-format
-msgid "the input document is SGML docbook"
-msgstr ""
+#: kxsldbgpart/libxsldbg/xsldbg.cpp:412
+msgid "Applying stylesheet"
+msgstr "Gweithredu'r len arddull"
 
-#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 665
-#: rc.cpp:165
-#, no-c-format
-msgid "debug"
+#: kxsldbgpart/libxsldbg/xsldbg.cpp:473 kxsldbgpart/libxsldbg/xsldbg.cpp:491
+msgid "Saving result"
 msgstr ""
 
-#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 668
-#: rc.cpp:168
-#, no-c-format
-msgid "dump the tree of the result instead"
+#: kxsldbgpart/libxsldbg/xsldbg.cpp:476
+msgid ""
+"Warning: Generating non-standard output XHTML.\n"
 msgstr ""
 
-#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 676
-#: rc.cpp:171
-#, no-c-format
-msgid "noout"
+#: kxsldbgpart/libxsldbg/xsldbg.cpp:493
+msgid ""
+"Warning: Unsupported, non-standard output method %1.\n"
 msgstr ""
 
-#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 679
-#: rc.cpp:174
-#, no-c-format
-msgid "do not dump the result"
+#: kxsldbgpart/libxsldbg/xsldbg.cpp:509
+msgid "Running stylesheet and saving result"
 msgstr ""
 
-#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 687
-#: rc.cpp:177
-#, no-c-format
-msgid "profile"
-msgstr "proffiliau"
-
-#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 690
-#: rc.cpp:180
-#, no-c-format
-msgid "print profiling information"
+#: kxsldbgpart/libxsldbg/xsldbg.cpp:516
+msgid ""
+"Error: Unable to save results of transformation to file %1.\n"
 msgstr ""
 
-#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 698
-#: rc.cpp:183
-#, no-c-format
-msgid "timing"
+#: kxsldbgpart/libxsldbg/xsldbg.cpp:558 kxsldbgpart/libxsldbg/xsldbg.cpp:887
+#: kxsldbgpart/libxsldbg/xsldbg.cpp:919 kxsldbgpart/libxsldbg/xsldbg.cpp:997
+msgid ""
+"Fatal error: Aborting debugger due to an unrecoverable error.\n"
 msgstr ""
 
-#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 701
-#: rc.cpp:186
-#, no-c-format
-msgid "display the time used"
+#: kxsldbgpart/kxsldbg_part.cpp:738 kxsldbgpart/libxsldbg/xsldbg.cpp:591
+msgid ""
+"Error: Too many file names supplied via command line.\n"
 msgstr ""
 
-#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 709
-#: rc.cpp:189
-#, no-c-format
-msgid "nonet"
+#: kxsldbgpart/libxsldbg/xsldbg.cpp:683
+msgid ""
+"Warning: Too many libxslt parameters provided via the command line option "
+"--param.\n"
 msgstr ""
 
-#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 712
-#: rc.cpp:192
-#, no-c-format
-msgid "refuse to fetch DTDs or entities over network"
+#: kxsldbgpart/libxsldbg/xsldbg.cpp:692
+msgid ""
+"Error: Argument \"%1\" to --param is not in the format <name>:<value>.\n"
 msgstr ""
 
-#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 17
-#: rc.cpp:195
-#, no-c-format
-msgid "Xsldbg Breakpoints"
+#: kxsldbgpart/libxsldbg/xsldbg.cpp:744
+msgid ""
+"\n"
+"Starting stylesheet\n"
+"\n"
 msgstr ""
 
-#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 26
-#: rc.cpp:198
-#, no-c-format
-msgid "ID"
-msgstr "ID"
-
-#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 59
-#: rc.cpp:207
-#, no-c-format
-msgid "File Name"
-msgstr "Enw Ffeil"
-
-#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 102
-#: rc.cpp:216
-#, no-c-format
-msgid "Click breakpoint in list to modify or delete it"
+#: kxsldbgpart/libxsldbg/xsldbg.cpp:755
+msgid ""
+"Error: No XSLT source file supplied.\n"
 msgstr ""
 
-#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 138
-#: rc.cpp:219
-#, no-c-format
-msgid "ID:"
-msgstr "ID :"
-
-#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 146
-#: rc.cpp:222
-#, no-c-format
-msgid "Line number:"
+#: kxsldbgpart/libxsldbg/xsldbg.cpp:758
+msgid ""
+"Error: No XML data file supplied.\n"
 msgstr ""
 
-#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 154
-#: rc.cpp:225
-#, no-c-format
-msgid "You don't need to specify directory for file name"
+#: kxsldbgpart/libxsldbg/xsldbg.cpp:795
+msgid ""
+"\n"
+"Debugger never received control.\n"
 msgstr ""
 
-#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 162
-#: rc.cpp:228
-#, no-c-format
-msgid "Template name or match name to look for"
+#: kxsldbgpart/libxsldbg/xsldbg.cpp:800
+msgid ""
+"\n"
+"Finished stylesheet\n"
+"\n"
 msgstr ""
 
-#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 198
-#: rc.cpp:231 rc.cpp:234
-#, no-c-format
-msgid "Must be positive"
+#: kxsldbgpart/libxsldbg/xsldbg.cpp:857
+msgid ""
+"Going to the command shell; not all xsldbg commands will work as not all needed "
+"have been loaded.\n"
 msgstr ""
 
-#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 285
-#: rc.cpp:237
-#, no-c-format
-msgid "Mode:"
-msgstr "Modd:"
-
-#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 293
-#: rc.cpp:240
-#, no-c-format
-msgid "Name:"
-msgstr "Enw:"
-
-#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 301
-#: rc.cpp:243
-#, no-c-format
-msgid "File name:"
-msgstr "Enw'r ffeil:"
+#: kxsldbgpart/libxsldbg/xsldbg.cpp:914
+#, c-format
+msgid "Parsing stylesheet %1"
+msgstr "Dosrannu'r len arddull %1"
 
-#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 375
-#: rc.cpp:249
-#, no-c-format
-msgid "Delete breakpoint using ID"
+#: kxsldbgpart/libxsldbg/xsldbg.cpp:916
+msgid ""
+"Error: Cannot parse file %1.\n"
 msgstr ""
 
-#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 386
-#: rc.cpp:255
-#, no-c-format
-msgid "Clear entered text"
+#: kxsldbgpart/libxsldbg/xsldbg.cpp:995 kxsldbgpart/libxsldbg/xsldbg.cpp:1043
+msgid ""
+"Error: Unable to parse file %1.\n"
 msgstr ""
 
-#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 394
-#: rc.cpp:258
-#, no-c-format
-msgid "Add All"
+#: kxsldbgpart/libxsldbg/search_cmds.cpp:52
+msgid ""
+"Error: No path to documentation; aborting searching.\n"
 msgstr ""
 
-#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 397
-#: rc.cpp:261
-#, no-c-format
-msgid "Add breakpoint on all templates found"
+#: kxsldbgpart/libxsldbg/search_cmds.cpp:54
+msgid ""
+"Error: Error in value of USE_DOCS_MACRO; look at Makefile.am.\n"
 msgstr ""
 
-#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 408
-#: rc.cpp:267
-#, no-c-format
-msgid "Delete all breakpoints"
+#: kxsldbgpart/libxsldbg/search_cmds.cpp:56
+msgid ""
+"Error: Required environment variable %1 not set to the directory of xsldbg "
+"documentation.\n"
 msgstr ""
 
-#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 416
-#: rc.cpp:270
-#, no-c-format
-msgid "Enable"
-msgstr "Galluogi"
-
-#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 419
-#: rc.cpp:273
-#, no-c-format
-msgid "Enable breakpoint using ID"
+#: kxsldbgpart/libxsldbg/search_cmds.cpp:62
+msgid ""
+"Error: Stylesheet not valid, files not loaded yet?\n"
 msgstr ""
 
-#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 430
-#: rc.cpp:279
-#, no-c-format
-msgid "Add breakpoint using file name with line number or a template name"
+#: kxsldbgpart/libxsldbg/variable_cmds.cpp:99
+msgid ""
+"Error: Cannot change a variable that does not use the select attribute.\n"
 msgstr ""
 
-#. i18n: file ./kxsldbgpart/xsldbgwalkspeed.ui line 17
-#: rc.cpp:285
-#, no-c-format
-msgid "Configure xsldbg's Walk Speed"
+#: kxsldbgpart/libxsldbg/variable_cmds.cpp:102
+msgid ""
+"Error: Variable %1 was not found.\n"
 msgstr ""
 
-#. i18n: file ./kxsldbgpart/xsldbgwalkspeed.ui line 51
-#: rc.cpp:288
-#, no-c-format
+#: kxsldbgpart/libxsldbg/debug.cpp:135
 msgid ""
-"Change the speed at which xsldbg walks through execution of the stylesheet."
+"Error: XSLT source and XML data are empty. Cannot enter the debugger.\n"
 msgstr ""
 
-#. i18n: file ./kxsldbgpart/xsldbgwalkspeed.ui line 95
-#: rc.cpp:291
-#, no-c-format
-msgid "Slow"
-msgstr "Araf"
-
-#. i18n: file ./kxsldbgpart/xsldbgwalkspeed.ui line 117
-#: rc.cpp:294
-#, no-c-format
-msgid "Fast"
-msgstr "Cyflym"
-
-#. i18n: file ./kxsldbgpart/xsldbgmsgdialog.ui line 26
-#: rc.cpp:303
-#, no-c-format
-msgid "qxsldbg Message"
-msgstr ""
+#: kxsldbgpart/xsldbglocallistitem.cpp:32
+#: kxsldbgpart/xsldbglocalvariablesimpl.cpp:71
+msgid "Local"
+msgstr "Lleol"
 
-#. i18n: file ./kxsldbgpart/xsldbgmsgdialog.ui line 71
-#: rc.cpp:306
-#, no-c-format
-msgid "TextLabel1"
-msgstr "LabelTestun1"
+#: kxsldbgpart/xsldbglocallistitem.cpp:34
+#: kxsldbgpart/xsldbglocalvariablesimpl.cpp:73
+msgid "Global"
+msgstr "Eang"
 
-#. i18n: file ./kxsldbgpart/xsldbgentities.ui line 25
-#: rc.cpp:318
-#, no-c-format
-msgid "Xsldbg Entities"
+#: kxsldbgpart/xsldbgdebugger.cpp:298 kxsldbgpart/xsldbgdebugger.cpp:318
+#: kxsldbgpart/xsldbgdebugger.cpp:336 kxsldbgpart/xsldbgdebugger.cpp:356
+#: kxsldbgpart/xsldbgdebugger.cpp:376 kxsldbgpart/xsldbgdebugger.cpp:395
+msgid "Cannot set/edit breakpoints on the output file."
 msgstr ""
 
-#. i18n: file ./kxsldbgpart/xsldbgentities.ui line 40
-#: rc.cpp:321
-#, no-c-format
-msgid "PublicID"
+#: kxsldbgpart/kxsldbg_part.cpp:87 kxsldbgpart/kxsldbg_part.cpp:634
+#: kxsldbgpart/kxsldbg_part.cpp:636
+msgid "Goto XPath"
 msgstr ""
 
-#. i18n: file ./kxsldbgpart/xsldbgentities.ui line 51
-#: rc.cpp:324
-#, no-c-format
-msgid "SystemID"
+#: kxsldbgpart/kxsldbg_part.cpp:109
+msgid "Configure Editor..."
 msgstr ""
 
-#. i18n: file ./kxsldbgpart/xsldbglocalvariables.ui line 25
-#: rc.cpp:330
-#, no-c-format
-msgid "Xsldbg Local Variables"
-msgstr ""
+#: kxsldbgpart/kxsldbg_part.cpp:113
+msgid "Configure..."
+msgstr "Ffurfweddu..."
 
-#. i18n: file ./kxsldbgpart/xsldbglocalvariables.ui line 161
-#: rc.cpp:348
-#, no-c-format
-msgid "Template Context"
+#: kxsldbgpart/kxsldbg_part.cpp:118
+msgid "Inspect..."
 msgstr ""
 
-#. i18n: file ./kxsldbgpart/xsldbglocalvariables.ui line 172
-#: rc.cpp:351
-#, no-c-format
-msgid "Type"
-msgstr "Math"
-
-#. i18n: file ./kxsldbgpart/xsldbglocalvariables.ui line 228
-#: rc.cpp:360
-#, fuzzy, no-c-format
-msgid "Variable expression:"
-msgstr "Mynegiad:"
-
-#. i18n: file ./kxsldbgpart/xsldbglocalvariables.ui line 249
-#: rc.cpp:363
-#, fuzzy, no-c-format
-msgid "Variable type:"
-msgstr "Enw'r ffeil:"
-
-#. i18n: file ./kxsldbgpart/xsldbglocalvariables.ui line 270
-#: rc.cpp:366
-#, fuzzy, no-c-format
-msgid "Set Expression"
-msgstr "Mynegiad:"
-
-#. i18n: file ./kxsldbgpart/xsldbglocalvariables.ui line 273
-#: rc.cpp:369
-#, no-c-format
-msgid "Set the selection for variable "
-msgstr ""
+#: kxsldbgpart/kxsldbg_part.cpp:125
+msgid "Run"
+msgstr "Rhedeg"
 
-#. i18n: file ./kxsldbgpart/xsldbglocalvariables.ui line 283
-#: rc.cpp:372
-#, fuzzy, no-c-format
-msgid "Variable name:"
-msgstr "Enw'r ffeil:"
+#: kxsldbgpart/kxsldbg_part.cpp:135
+msgid "Step"
+msgstr "Cam"
 
-#: xsldbgmain.cpp:51
-msgid "A TDE console application for xsldbg, an XSLT debugger"
+#: kxsldbgpart/kxsldbg_part.cpp:145
+msgid "Step Up"
 msgstr ""
 
-#: xsldbgmain.cpp:57
-msgid "Start a shell"
+#: kxsldbgpart/kxsldbg_part.cpp:150
+msgid "Step Down"
 msgstr ""
 
-#: xsldbgmain.cpp:58
-msgid "Path to change into before loading files"
+#: kxsldbgpart/kxsldbg_part.cpp:156
+msgid "Break"
 msgstr ""
 
-#: xsldbgmain.cpp:59
-msgid "Add a parameter named <name> and value <value> to XSL environment"
+#: kxsldbgpart/kxsldbg_part.cpp:161
+msgid "Enable/Disable"
 msgstr ""
 
-#: xsldbgmain.cpp:60
-msgid "Use ISO 639 language code specified; for example en_US"
-msgstr ""
+#: kxsldbgpart/kxsldbg_part.cpp:171
+msgid "&Source"
+msgstr "&Tarddiad"
 
-#: xsldbgmain.cpp:60
-msgid "Save to a given file. See output command documentation"
-msgstr ""
+#: kxsldbgpart/kxsldbg_part.cpp:176
+msgid "&Data"
+msgstr "&Data"
 
-#: xsldbgmain.cpp:61
-msgid "Show the version of libxml and libxslt used"
-msgstr ""
+#: kxsldbgpart/kxsldbg_part.cpp:181
+msgid "&Output"
+msgstr "&Allbwn"
 
-#: xsldbgmain.cpp:62
-msgid "Show logs of what is happening"
+#: kxsldbgpart/kxsldbg_part.cpp:186
+msgid "Reload Current File From Disk"
 msgstr ""
 
-#: xsldbgmain.cpp:63
-msgid "Display the time used"
+#: kxsldbgpart/kxsldbg_part.cpp:192
+msgid "Walk Through Stylesheet..."
 msgstr ""
 
-#: xsldbgmain.cpp:64
-msgid "Run the transformation 20 times"
+#: kxsldbgpart/kxsldbg_part.cpp:196
+msgid "Stop Wal&king Through Stylesheet"
 msgstr ""
 
-#: xsldbgmain.cpp:66
-msgid "Dump the tree of the result instead"
+#: kxsldbgpart/kxsldbg_part.cpp:200
+msgid "Tr&ace Execution of Stylesheet"
 msgstr ""
 
-#: xsldbgmain.cpp:68
-msgid "Disable the DTD loading phase"
+#: kxsldbgpart/kxsldbg_part.cpp:204
+msgid "Stop Tracing of Stylesheet"
 msgstr ""
 
-#: xsldbgmain.cpp:69
-msgid "Disable the output of the result"
+#: kxsldbgpart/kxsldbg_part.cpp:209
+msgid "&Evaluate Expression..."
 msgstr ""
 
-#: xsldbgmain.cpp:70
-msgid "Increase the maximum depth"
+#: kxsldbgpart/kxsldbg_part.cpp:214
+msgid "Goto &XPath..."
 msgstr ""
 
-#: xsldbgmain.cpp:73
-msgid "The input document is(are) an HTML file(s)"
+#: kxsldbgpart/kxsldbg_part.cpp:219
+msgid "Lookup SystemID..."
 msgstr ""
 
-#: xsldbgmain.cpp:77
-msgid "The input document is SGML docbook"
+#: kxsldbgpart/kxsldbg_part.cpp:224
+msgid "Lookup PublicID..."
 msgstr ""
 
-#: xsldbgmain.cpp:80
-msgid "Disable the fetching DTDs or entities over network"
+#: kxsldbgpart/kxsldbg_part.cpp:277
+msgid "KXsldbgPart"
 msgstr ""
 
-#: xsldbgmain.cpp:83
-msgid "Use the catalogs from $SGML_CATALOG_FILES"
+#: kxsldbgpart/kxsldbg_part.cpp:358
+msgid "Debugger Not Ready"
 msgstr ""
 
-#: xsldbgmain.cpp:87
-msgid "Disable XInclude processing on document input"
+#: kxsldbgpart/kxsldbg_part.cpp:359
+msgid "Configure and start the debugger first."
 msgstr ""
 
-#: xsldbgmain.cpp:90
-msgid "Print profiling informations"
+#: kxsldbgpart/kxsldbg_part.cpp:376 kxsldbgpart/kxsldbg_part.cpp:382
+msgid "Lookup SystemID"
 msgstr ""
 
-#: xsldbgmain.cpp:91
-msgid "Do not run gdb compatability mode and print less information"
+#: kxsldbgpart/kxsldbg_part.cpp:377 kxsldbgpart/kxsldbg_part.cpp:383
+msgid "Please enter SystemID to find:"
 msgstr ""
 
-#: xsldbgmain.cpp:92
-msgid "Detect and use encodings in the stylesheet"
+#: kxsldbgpart/kxsldbg_part.cpp:408 kxsldbgpart/kxsldbg_part.cpp:413
+msgid "Lookup PublicID"
 msgstr ""
 
-#: xsldbgmain.cpp:93
-msgid "Treat command line input as encoded in UTF-8"
+#: kxsldbgpart/kxsldbg_part.cpp:409 kxsldbgpart/kxsldbg_part.cpp:414
+msgid "Please enter PublicID to find:"
 msgstr ""
 
-#: xsldbgmain.cpp:94
-msgid "Use HTML output when generating search reports"
+#: kxsldbgpart/kxsldbg_part.cpp:622 kxsldbgpart/kxsldbg_part.cpp:624
+msgid "Evalute Expression"
 msgstr ""
 
-#: xsldbgmain.cpp:95
-msgid ""
-"Print all error messages to stdout, normally error messages go to stderr"
+#: kxsldbgpart/kxsldbg_part.cpp:622 kxsldbgpart/kxsldbg_part.cpp:624
+#: kxsldbgpart/kxsldbg_part.cpp:634 kxsldbgpart/kxsldbg_part.cpp:636
+msgid "XPath:"
 msgstr ""
 
-#: xsldbgmain.cpp:96
-msgid ""
-"Disable the automatic restarting of execution when current processing pass is "
-"complete"
+#: kxsldbgpart/kxsldbg_part.cpp:802
+msgid "SystemID or PublicID Resolution Result"
 msgstr ""
 
-#: xsldbgmain.cpp:124
+#: kxsldbgpart/kxsldbg_part.cpp:803
+#, c-format
 msgid ""
-"Using libxml %1, libxslt %2 and libexslt %3\n"
+"SystemID or PublicID has been resolved to\n"
+".%1"
 msgstr ""
 
-#: xsldbgmain.cpp:125
-msgid ""
-"xsldbg was compiled against libxml %1, libxslt %2 and libexslt %3\n"
-msgstr ""
+#: kxsldbgpart/xsldbgbreakpointlistitem.cpp:40
+msgid "Disabled"
+msgstr "Analluogir"
 
-#: xsldbgmain.cpp:126
-msgid ""
-"libxslt %1 was compiled against libxml %2\n"
+#: main.cpp:9
+msgid "A TDE KPart Application for xsldbg, an XSLT debugger"
 msgstr ""
 
-#: xsldbgmain.cpp:127
-msgid ""
-"libexslt %1 was compiled against libxml %2\n"
+#: main.cpp:16
+msgid "File to save results to"
 msgstr ""
 
-#: xsldbgmain.cpp:130
-msgid "Xsldbg"
-msgstr ""
+#: main.cpp:22
+msgid "KXSLDbg"
+msgstr "KXSLDbg"
diff --git a/tde-i18n-cy/messages/tdewebdev/quanta.po b/tde-i18n-cy/messages/tdewebdev/quanta.po
index b4fbddd4ff9..f939043a5a5 100644
--- a/tde-i18n-cy/messages/tdewebdev/quanta.po
+++ b/tde-i18n-cy/messages/tdewebdev/quanta.po
@@ -1,472 +1,1102 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdewebdev/quanta.po\n"
-"POT-Creation-Date: 2008-07-08 01:25+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. i18n: file ./dialogs/fourbuttonmessagebox.ui line 74
+#. i18n: file ./plugins/plugineditor.ui line 32
+#: plugins/quantaplugineditor.cpp:45 plugins/quantaplugininterface.cpp:260
+#: rc.cpp:3
+#, no-c-format
+msgid "Edit Plugins"
+msgstr ""
+
+#. i18n: file ./plugins/plugineditor.ui line 49
 #: rc.cpp:6
 #, no-c-format
-msgid "Save &As..."
-msgstr "Cadw &Fel..."
+msgid "Search paths:"
+msgstr ""
 
-#. i18n: file ./dialogs/fourbuttonmessagebox.ui line 90
-#: rc.cpp:9
+#. i18n: file ./plugins/plugineditor.ui line 57
+#: rc.cpp:9 treeviews/basetreeview.cpp:617
 #, no-c-format
-msgid "&Do Not Save"
-msgstr "&Peidiwch â Chadw"
+msgid "Plugins"
+msgstr "Ategion"
+
+#. i18n: file ./plugins/plugineditor.ui line 72
+#: ../lib/compatibility/knewstuff/downloaddialog.cpp:221
+#: ../lib/compatibility/knewstuff/downloaddialog.cpp:227
+#: ../lib/compatibility/knewstuff/downloaddialog.cpp:233
+#: ../lib/compatibility/knewstuff/providerdialog.cpp:65
+#: components/debugger/variableslistview.cpp:54 parts/kafka/domtreeview.cpp:34
+#: parts/kafka/htmldocumentproperties.cpp:88 parts/kafka/wkafkapart.cpp:75
+#: rc.cpp:12 rc.cpp:907 rc.cpp:2596 treeviews/doctreeview.cpp:50
+#: treeviews/structtreeview.cpp:84 treeviews/uploadtreeview.cpp:35
+#, no-c-format
+msgid "Name"
+msgstr "Enw"
+
+#. i18n: file ./plugins/plugineditor.ui line 83
+#: rc.cpp:15
+#, no-c-format
+msgid "Valid"
+msgstr "Dilys"
+
+#. i18n: file ./plugins/plugineditor.ui line 94
+#: rc.cpp:18
+#, no-c-format
+msgid "Location"
+msgstr "Lleoliad"
+
+#. i18n: file ./plugins/plugineditor.ui line 105
+#: rc.cpp:21 rc.cpp:5141
+#, no-c-format
+msgid "File Name"
+msgstr "Enw Ffeil"
+
+#. i18n: file ./plugins/plugineditor.ui line 116
+#: rc.cpp:24
+#, no-c-format
+msgid "Output Window"
+msgstr ""
+
+#. i18n: file ./plugins/plugineditor.ui line 134
+#: rc.cpp:27 rc.cpp:39 rc.cpp:384
+#, no-c-format
+msgid "Add..."
+msgstr "Ychwanegu..."
+
+#. i18n: file ./plugins/plugineditor.ui line 145
+#: rc.cpp:30
+#, no-c-format
+msgid "Configure..."
+msgstr "Ffurfweddu..."
+
+#. i18n: file ./plugins/plugineditor.ui line 178
+#: rc.cpp:36 rc.cpp:5363
+#, no-c-format
+msgid "Refresh"
+msgstr "Cyfredoli"
+
+#. i18n: file ./plugins/pluginconfig.ui line 33
+#: plugins/quantapluginconfig.cpp:40 rc.cpp:42
+#, no-c-format
+msgid "Configure Plugin"
+msgstr ""
+
+#. i18n: file ./plugins/pluginconfig.ui line 44
+#: rc.cpp:45
+#, no-c-format
+msgid "Validate plugin"
+msgstr ""
+
+#. i18n: file ./plugins/pluginconfig.ui line 86
+#: rc.cpp:48
+#, no-c-format
+msgid "Plugin Options"
+msgstr ""
+
+#. i18n: file ./plugins/pluginconfig.ui line 97
+#: ../lib/compatibility/knewstuff/uploaddialog.cpp:57 rc.cpp:51 rc.cpp:189
+#: rc.cpp:1086 rc.cpp:2780
+#, no-c-format
+msgid "Name:"
+msgstr "Enw:"
+
+#. i18n: file ./plugins/pluginconfig.ui line 105
+#: rc.cpp:54
+#, no-c-format
+msgid "The plugin name as it appears in the Plugins menu."
+msgstr ""
+
+#. i18n: file ./plugins/pluginconfig.ui line 141
+#: rc.cpp:57
+#, no-c-format
+msgid "Location:"
+msgstr "Lleoliad:"
+
+#. i18n: file ./plugins/pluginconfig.ui line 149
+#: rc.cpp:60
+#, no-c-format
+msgid ""
+"The exact location of the plugin. If not set the global search paths setting is "
+"used."
+msgstr ""
+
+#. i18n: file ./plugins/pluginconfig.ui line 157
+#: rc.cpp:63
+#, no-c-format
+msgid "The plugin executable or library name (with extension)."
+msgstr ""
+
+#. i18n: file ./plugins/pluginconfig.ui line 165
+#: rc.cpp:66 treeviews/basetreeview.cpp:1209 treeviews/projecttreeview.cpp:393
+#, no-c-format
+msgid "File name:"
+msgstr "Enw'r ffeil:"
+
+#. i18n: file ./plugins/pluginconfig.ui line 186
+#: rc.cpp:69
+#, no-c-format
+msgid "Output window:"
+msgstr ""
+
+#. i18n: file ./plugins/pluginconfig.ui line 200
+#: dialogs/filecombo.cpp:45 dialogs/filecombo.cpp:67
+#: dialogs/tagdialogs/tagimgdlgdata.cpp:34
+#: dialogs/tagdialogs/tagimgdlgdata.cpp:67 rc.cpp:72 rc.cpp:1758 rc.cpp:2680
+#: rc.cpp:2683 rc.cpp:2753 rc.cpp:2759 rc.cpp:2762 rc.cpp:2852
+#, no-c-format
+msgid "..."
+msgstr "..."
+
+#. i18n: file ./plugins/pluginconfig.ui line 208
+#: rc.cpp:75
+#, no-c-format
+msgid "&Read only part"
+msgstr ""
+
+#. i18n: file ./plugins/pluginconfig.ui line 216
+#: rc.cpp:78
+#, no-c-format
+msgid "Input:"
+msgstr "Mewnbwn:"
+
+#. i18n: file ./plugins/pluginconfig.ui line 222
+#: dialogs/actionconfigdialog.cpp:320 dialogs/tagdialogs/colorcombo.cpp:220
+#: rc.cpp:81 rc.cpp:943 rc.cpp:979 rc.cpp:991 rc.cpp:1009
+#, no-c-format
+msgid "None"
+msgstr "Dim"
+
+#. i18n: file ./plugins/pluginconfig.ui line 227
+#: messages/annotationoutput.cpp:42 rc.cpp:84
+#, no-c-format
+msgid "Current File"
+msgstr ""
+
+#. i18n: file ./plugins/pluginconfig.ui line 232
+#: rc.cpp:87
+#, no-c-format
+msgid "Current File Path"
+msgstr ""
+
+#. i18n: file ./plugins/pluginconfig.ui line 237
+#: rc.cpp:90
+#, no-c-format
+msgid "Project Folder"
+msgstr "Plygell Cywaith"
+
+#. i18n: file ./parts/kafka/htmldocumentpropertiesui.ui line 16
+#: rc.cpp:93
+#, no-c-format
+msgid "Document Properties"
+msgstr ""
+
+#. i18n: file ./parts/kafka/htmldocumentpropertiesui.ui line 25
+#: rc.cpp:96
+#, no-c-format
+msgid "Column 1"
+msgstr ""
+
+#. i18n: file ./parts/kafka/htmldocumentpropertiesui.ui line 36
+#: rc.cpp:99
+#, no-c-format
+msgid "New Item"
+msgstr "Eitem Newydd"
+
+#. i18n: file ./parts/kafka/htmldocumentpropertiesui.ui line 79
+#: rc.cpp:102
+#, no-c-format
+msgid "Current DTD: "
+msgstr ""
+
+#. i18n: file ./parts/kafka/htmldocumentpropertiesui.ui line 95
+#: rc.cpp:105
+#, no-c-format
+msgid "Title: "
+msgstr "Teitl: "
+
+#. i18n: file ./parts/kafka/htmldocumentpropertiesui.ui line 111
+#: rc.cpp:108
+#, no-c-format
+msgid "Link CSS stylesheet:"
+msgstr ""
+
+#. i18n: file ./parts/kafka/htmldocumentpropertiesui.ui line 127
+#: rc.cpp:111
+#, no-c-format
+msgid "Meta items:"
+msgstr ""
+
+#. i18n: file ./parts/kafka/htmldocumentpropertiesui.ui line 160
+#: rc.cpp:114
+#, no-c-format
+msgid "CSS rules:"
+msgstr ""
+
+#. i18n: file ./parts/kafka/kafkasyncoptionsui.ui line 24
+#: rc.cpp:138
+#, no-c-format
+msgid "Dual Views Mode Synchronization"
+msgstr ""
+
+#. i18n: file ./parts/kafka/kafkasyncoptionsui.ui line 66
+#: rc.cpp:141 rc.cpp:150
+#, no-c-format
+msgid "ms"
+msgstr "ms"
+
+#. i18n: file ./parts/kafka/kafkasyncoptionsui.ui line 85
+#: rc.cpp:144
+#, no-c-format
+msgid "Refresh the VPL editor on click"
+msgstr ""
+
+#. i18n: file ./parts/kafka/kafkasyncoptionsui.ui line 93
+#: rc.cpp:147
+#, no-c-format
+msgid "Refresh the VPL editor every:"
+msgstr ""
+
+#. i18n: file ./parts/kafka/kafkasyncoptionsui.ui line 153
+#: rc.cpp:153
+#, no-c-format
+msgid "Refresh the source editor on click"
+msgstr ""
+
+#. i18n: file ./parts/kafka/kafkasyncoptionsui.ui line 161
+#: rc.cpp:156
+#, no-c-format
+msgid "Refresh the source editor every:"
+msgstr ""
+
+#. i18n: file ./parts/kafka/kafkasyncoptionsui.ui line 190
+#: rc.cpp:159
+#, no-c-format
+msgid "Show an icon where scripts are located"
+msgstr ""
+
+#. i18n: file ./treeviews/quantapropertiespage.ui line 39
+#: rc.cpp:162
+#, no-c-format
+msgid "Quanta Properties"
+msgstr ""
+
+#. i18n: file ./treeviews/quantapropertiespage.ui line 65
+#: rc.cpp:165
+#, no-c-format
+msgid "&Inherit type from parent (nothing)"
+msgstr ""
+
+#. i18n: file ./treeviews/quantapropertiespage.ui line 73
+#: rc.cpp:168
+#, no-c-format
+msgid "&Type:"
+msgstr "&Math:"
+
+#. i18n: file ./treeviews/quantapropertiespage.ui line 117
+#: rc.cpp:171
+#, no-c-format
+msgid "Use &pre/post text"
+msgstr ""
+
+#. i18n: file ./treeviews/quantapropertiespage.ui line 125
+#: rc.cpp:174
+#, no-c-format
+msgid "Pre-text:"
+msgstr ""
+
+#. i18n: file ./treeviews/quantapropertiespage.ui line 141
+#: rc.cpp:177
+#, no-c-format
+msgid "Post-text:"
+msgstr ""
+
+#. i18n: file ./treeviews/quantapropertiespage.ui line 189
+#: rc.cpp:180
+#, no-c-format
+msgid "Filtering &action:"
+msgstr ""
+
+#. i18n: file ./treeviews/templatedirform.ui line 26
+#: rc.cpp:183
+#, no-c-format
+msgid "Create Template Folder"
+msgstr ""
+
+#. i18n: file ./treeviews/templatedirform.ui line 37
+#: rc.cpp:186 rc.cpp:1199
+#, no-c-format
+msgid "Type:"
+msgstr "Math:"
+
+#. i18n: file ./treeviews/templatedirform.ui line 63
+#: rc.cpp:192
+#, no-c-format
+msgid "&Inherit parent attribute"
+msgstr ""
+
+#. i18n: file ./treeviews/fileinfodlg.ui line 32
+#: rc.cpp:201
+#, no-c-format
+msgid "Number of lines:"
+msgstr "Nifel llinellau:"
+
+#. i18n: file ./treeviews/fileinfodlg.ui line 40
+#: rc.cpp:204
+#, no-c-format
+msgid "Number of images included:"
+msgstr ""
+
+#. i18n: file ./treeviews/fileinfodlg.ui line 48
+#: rc.cpp:207
+#, no-c-format
+msgid "Size of the included images:"
+msgstr ""
+
+#. i18n: file ./treeviews/fileinfodlg.ui line 56
+#: rc.cpp:210
+#, no-c-format
+msgid "Total file size:"
+msgstr ""
+
+#. i18n: file ./treeviews/fileinfodlg.ui line 72
+#: rc.cpp:213
+#, no-c-format
+msgid "Included images:"
+msgstr ""
+
+#. i18n: file ./treeviews/fileinfodlg.ui line 80
+#: rc.cpp:216 rc.cpp:3583 treeviews/basetreeview.cpp:512
+#, no-c-format
+msgid "Description:"
+msgstr "Disgrifiad:"
+
+#. i18n: file ./parsers/dtd/dtepcreationdlg.ui line 31
+#: parsers/dtd/dtdparser.cpp:110 rc.cpp:219
+#, no-c-format
+msgid "DTD - > DTEP Conversion"
+msgstr ""
+
+#. i18n: file ./parsers/dtd/dtepcreationdlg.ui line 55
+#: rc.cpp:222
+#, no-c-format
+msgid "Name: "
+msgstr "Enw: "
+
+#. i18n: file ./parsers/dtd/dtepcreationdlg.ui line 63
+#: rc.cpp:225 rc.cpp:2873
+#, no-c-format
+msgid "Nickname:"
+msgstr "Ffugenw:"
+
+#. i18n: file ./parsers/dtd/dtepcreationdlg.ui line 71
+#: rc.cpp:228
+#, no-c-format
+msgid "!DOCTYPE definition line:"
+msgstr ""
+
+#. i18n: file ./parsers/dtd/dtepcreationdlg.ui line 94
+#: rc.cpp:231
+#, no-c-format
+msgid "DTD URL:"
+msgstr ""
+
+#. i18n: file ./parsers/dtd/dtepcreationdlg.ui line 102
+#: rc.cpp:234
+#, no-c-format
+msgid "Target directory name:"
+msgstr ""
+
+#. i18n: file ./parsers/dtd/dtepcreationdlg.ui line 110
+#: rc.cpp:237
+#, no-c-format
+msgid "Default extension:"
+msgstr ""
+
+#. i18n: file ./parsers/dtd/dtepcreationdlg.ui line 123
+#: rc.cpp:240
+#, no-c-format
+msgid "Case-sensitive tags and attributes"
+msgstr ""
+
+#. i18n: file ./parsers/dtd/dtepcreationdlg.ui line 134
+#: rc.cpp:243
+#, no-c-format
+msgid "&Fine-tune the DTEP after conversion"
+msgstr ""
 
 #. i18n: file ./dialogs/dirtydialog.ui line 39
-#: dialogs/dirtydlg.cpp:37 rc.cpp:15
+#: dialogs/dirtydlg.cpp:37 rc.cpp:246
 #, no-c-format
 msgid "File Changed"
 msgstr "Ffeil wedi Newid"
 
 #. i18n: file ./dialogs/dirtydialog.ui line 58
-#: rc.cpp:18
+#: rc.cpp:249
 #, no-c-format
 msgid "The file was changed outside of the Quanta editor."
 msgstr ""
 
 #. i18n: file ./dialogs/dirtydialog.ui line 66
-#: rc.cpp:21
+#: rc.cpp:252
 #, no-c-format
 msgid " How Do You Want to Proceed?"
 msgstr ""
 
 #. i18n: file ./dialogs/dirtydialog.ui line 83
-#: rc.cpp:24
+#: rc.cpp:255
 #, no-c-format
 msgid "&Do not load the modified version from disk"
 msgstr ""
 
 #. i18n: file ./dialogs/dirtydialog.ui line 91
-#: rc.cpp:27
+#: rc.cpp:258
 #, no-c-format
 msgid "&Use the version from disk (will lose the current content)"
 msgstr ""
 
 #. i18n: file ./dialogs/dirtydialog.ui line 107
-#: rc.cpp:30
+#: rc.cpp:261
 #, no-c-format
 msgid "(If you later save the document, you will lose what was on the disk.)"
 msgstr ""
 
 #. i18n: file ./dialogs/dirtydialog.ui line 135
-#: rc.cpp:33
+#: rc.cpp:264
 #, no-c-format
 msgid "&Compare the two versions and load the result"
 msgstr ""
 
 #. i18n: file ./dialogs/dirtydialog.ui line 141
-#: rc.cpp:36
+#: rc.cpp:267
 #, no-c-format
 msgid "Use Kompare if available. Otherwise this checkbox is disabled."
 msgstr ""
 
-#. i18n: file ./dialogs/tagdialogs/tagmail.ui line 27
-#: rc.cpp:39
+#. i18n: file ./dialogs/settings/filemaskss.ui line 52
+#: rc.cpp:270 rc.cpp:2713
 #, no-c-format
-msgid "Email address:"
-msgstr "Cyfeiriad Ebost:"
+msgid ""
+"New files will have the extension and highlighting according to this setting"
+msgstr ""
 
-#. i18n: file ./dialogs/tagdialogs/tagmail.ui line 49
-#: dialogs/filecombo.cpp:45 dialogs/filecombo.cpp:67
-#: dialogs/tagdialogs/tagimgdlgdata.cpp:34
-#: dialogs/tagdialogs/tagimgdlgdata.cpp:67 rc.cpp:42 rc.cpp:2518 rc.cpp:2640
-#: rc.cpp:2901 rc.cpp:2907 rc.cpp:2910 rc.cpp:2988 rc.cpp:2991
+#. i18n: file ./dialogs/settings/filemaskss.ui line 66
+#: rc.cpp:273
 #, no-c-format
-msgid "..."
-msgstr "..."
+msgid "Mimetypes"
+msgstr "Mathau MIME"
 
-#. i18n: file ./dialogs/tagdialogs/tagmail.ui line 67
-#: rc.cpp:45
+#. i18n: file ./dialogs/settings/filemaskss.ui line 93
+#: rc.cpp:276
 #, no-c-format
-msgid "Subject:"
-msgstr "Pwnc:"
+msgid "&Reset to Default"
+msgstr ""
 
-#. i18n: file ./dialogs/tagdialogs/tagmail.ui line 83
-#: rc.cpp:48 rc.cpp:1029 rc.cpp:1105 rc.cpp:1111 rc.cpp:1123 rc.cpp:1138
-#: rc.cpp:1683 rc.cpp:4143
+#. i18n: file ./dialogs/settings/filemaskss.ui line 101
+#: rc.cpp:279
+#, fuzzy, no-c-format
+msgid "Te&xts:"
+msgstr "Te&stun:"
+
+#. i18n: file ./dialogs/settings/filemaskss.ui line 112
+#: rc.cpp:282
 #, no-c-format
-msgid "Title:"
-msgstr "Teitl:"
+msgid "&Markups:"
+msgstr ""
 
-#. i18n: file ./dialogs/tagdialogs/tagmisc.ui line 31
-#: dialogs/tagdialogs/tagmiscdlg.cpp:23 rc.cpp:57
+#. i18n: file ./dialogs/settings/filemaskss.ui line 123
+#: rc.cpp:285
 #, no-c-format
-msgid "Misc. Tag"
+msgid "&Images:"
+msgstr "&Delweddau :"
+
+#. i18n: file ./dialogs/settings/filemaskss.ui line 156
+#: rc.cpp:288
+#, no-c-format
+msgid "&Scripts:"
+msgstr "&Sgriptiau :"
+
+#. i18n: file ./dialogs/settings/filemaskss.ui line 197
+#: rc.cpp:291
+#, no-c-format
+msgid "Default character &encoding:"
 msgstr ""
 
-#. i18n: file ./dialogs/tagdialogs/tagmisc.ui line 47
-#: rc.cpp:60
+#. i18n: file ./dialogs/settings/filemaskss.ui line 211
+#: rc.cpp:294 rc.cpp:2704
 #, no-c-format
-msgid "Element name:"
+msgid "Default &DTD:"
 msgstr ""
 
-#. i18n: file ./dialogs/tagdialogs/tagmisc.ui line 55
-#: rc.cpp:63
+#. i18n: file ./dialogs/settings/filemaskss.ui line 239
+#: rc.cpp:297
+#, fuzzy, no-c-format
+msgid "Startup Options"
+msgstr "Sesiwn"
+
+#. i18n: file ./dialogs/settings/filemaskss.ui line 250
+#: rc.cpp:300
 #, no-c-format
-msgid "&Add closing tag"
+msgid "L&oad last-opened files"
 msgstr ""
 
-#. i18n: file ./dialogs/debuggeroptionss.ui line 44
-#: rc.cpp:66
+#. i18n: file ./dialogs/settings/filemaskss.ui line 258
+#: rc.cpp:303
 #, no-c-format
-msgid "Enable debugger"
-msgstr "Galluogi dadnamydd"
+msgid "S&how splashscreen"
+msgstr ""
 
-#. i18n: file ./dialogs/debuggeroptionss.ui line 80
-#: rc.cpp:69
+#. i18n: file ./dialogs/settings/filemaskss.ui line 266
+#: rc.cpp:306
 #, no-c-format
-msgid "PHP3 listener"
+msgid "&Load last-opened project"
 msgstr ""
 
-#. i18n: file ./dialogs/debuggeroptionss.ui line 88
-#: rc.cpp:72
+#. i18n: file ./dialogs/settings/filemaskss.ui line 284
+#: rc.cpp:309
 #, no-c-format
-msgid "PHP4 debugger"
+msgid "Create backups every"
 msgstr ""
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 27
-#: rc.cpp:75
+#. i18n: file ./dialogs/settings/filemaskss.ui line 306
+#: rc.cpp:312
 #, no-c-format
-msgid "Configure Actions"
+msgid "minutes"
+msgstr "munudau"
+
+#. i18n: file ./dialogs/settings/filemaskss.ui line 316
+#: rc.cpp:315
+#, no-c-format
+msgid "Show the DTD selection dialog when loading files with &unknown DTD"
 msgstr ""
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 56
-#: rc.cpp:78
+#. i18n: file ./dialogs/settings/previewoptionss.ui line 39
+#: rc.cpp:318
 #, no-c-format
-msgid "&Delete Action"
-msgstr "&Dileu Gweithred"
+msgid "Reset window layout to the default on the next startup"
+msgstr ""
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 64
-#: rc.cpp:81
+#. i18n: file ./dialogs/settings/previewoptionss.ui line 47
+#: rc.cpp:321
 #, no-c-format
-msgid "&New Action"
-msgstr "Gweithred &Newydd"
+msgid "Show hidden files in files tree"
+msgstr ""
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 117
-#: rc.cpp:84
+#. i18n: file ./dialogs/settings/previewoptionss.ui line 55
+#: rc.cpp:324
 #, no-c-format
-msgid "Toolbar & Action Tree"
+msgid "Save tree status for local trees"
 msgstr ""
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 123
-#: ../lib/compatibility/knewstuff/downloaddialog.cpp:221
-#: ../lib/compatibility/knewstuff/downloaddialog.cpp:227
-#: ../lib/compatibility/knewstuff/downloaddialog.cpp:233
-#: ../lib/compatibility/knewstuff/providerdialog.cpp:65
-#: components/debugger/variableslistview.cpp:54 parts/kafka/domtreeview.cpp:34
-#: parts/kafka/htmldocumentproperties.cpp:88 parts/kafka/wkafkapart.cpp:75
-#: rc.cpp:87 rc.cpp:2548 rc.cpp:2784 treeviews/doctreeview.cpp:50
-#: treeviews/structtreeview.cpp:84 treeviews/uploadtreeview.cpp:35
+#. i18n: file ./dialogs/settings/previewoptionss.ui line 63
+#: rc.cpp:327
 #, no-c-format
-msgid "Name"
-msgstr "Enw"
+msgid "Close Buttons on Tabs"
+msgstr ""
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 134
-#: rc.cpp:90 rc.cpp:117
+#. i18n: file ./dialogs/settings/previewoptionss.ui line 74
+#: rc.cpp:330
 #, no-c-format
-msgid "Shortcut"
-msgstr "Byrlwybr"
+msgid "&Always show"
+msgstr ""
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 236
-#: rc.cpp:102
+#. i18n: file ./dialogs/settings/previewoptionss.ui line 85
+#: rc.cpp:333
 #, no-c-format
-msgid "Action Properties"
+msgid "&Do not show"
+msgstr ""
+
+#. i18n: file ./dialogs/settings/previewoptionss.ui line 93
+#: rc.cpp:336
+#, no-c-format
+msgid "Show dela&yed"
+msgstr ""
+
+#. i18n: file ./dialogs/settings/previewoptionss.ui line 103
+#: rc.cpp:339 rc.cpp:4789 src/quanta.cpp:5278 src/quanta_init.cpp:184
+#: src/viewmanager.cpp:564
+#, no-c-format
+msgid "Documentation"
+msgstr "Dogfenniaeth"
+
+#. i18n: file ./dialogs/settings/previewoptionss.ui line 114
+#: rc.cpp:342
+#, no-c-format
+msgid "New tab"
+msgstr "Tab Newydd"
+
+#. i18n: file ./dialogs/settings/previewoptionss.ui line 125
+#: rc.cpp:345 rc.cpp:363
+#, no-c-format
+msgid "Separate toolview"
+msgstr ""
+
+#. i18n: file ./dialogs/settings/previewoptionss.ui line 135
+#: rc.cpp:348
+#, no-c-format
+msgid "Toolview Tabs"
+msgstr ""
+
+#. i18n: file ./dialogs/settings/previewoptionss.ui line 146
+#: rc.cpp:351
+#, no-c-format
+msgid "Icon and text"
+msgstr ""
+
+#. i18n: file ./dialogs/settings/previewoptionss.ui line 157
+#: rc.cpp:354 rc.cpp:811 rc.cpp:958
+#, no-c-format
+msgid "Text"
+msgstr "Testun"
+
+#. i18n: file ./dialogs/settings/previewoptionss.ui line 165
+#: rc.cpp:357 rc.cpp:5133
+#, no-c-format
+msgid "Icon"
+msgstr "Eicon"
+
+#. i18n: file ./dialogs/settings/previewoptionss.ui line 175
+#: rc.cpp:360 src/quanta.cpp:5264
+#, no-c-format
+msgid "Preview"
+msgstr "Rhagolwg"
+
+#. i18n: file ./dialogs/settings/previewoptionss.ui line 200
+#: rc.cpp:366
+#, no-c-format
+msgid "Editor area"
+msgstr ""
+
+#. i18n: file ./dialogs/settings/previewoptionss.ui line 230
+#: rc.cpp:369
+#, no-c-format
+msgid "&Warning Messages"
 msgstr ""
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 247
-#: rc.cpp:105 rc.cpp:611 rc.cpp:1502 rc.cpp:2778
+#. i18n: file ./dialogs/settings/previewoptionss.ui line 241
+#: rc.cpp:372
+#, no-c-format
+msgid "Warn about opening binar&y/unknown files"
+msgstr ""
+
+#. i18n: file ./dialogs/settings/previewoptionss.ui line 249
+#: rc.cpp:375
+#, no-c-format
+msgid "Warn when executing &actions associated with events"
+msgstr ""
+
+#. i18n: file ./dialogs/settings/previewoptionss.ui line 257
+#: rc.cpp:378
+#, no-c-format
+msgid "Show all warning messages"
+msgstr ""
+
+#. i18n: file ./dialogs/settings/abbreviations.ui line 25
+#: rc.cpp:381 src/quanta.cpp:1253
+#, no-c-format
+msgid "Abbreviations"
+msgstr ""
+
+#. i18n: file ./dialogs/settings/abbreviations.ui line 52
+#: rc.cpp:390
+#, no-c-format
+msgid "&New..."
+msgstr "&Newydd..."
+
+#. i18n: file ./dialogs/settings/abbreviations.ui line 68
+#: rc.cpp:393
+#, no-c-format
+msgid "&Group:"
+msgstr "&Grŵp:"
+
+#. i18n: file ./dialogs/settings/abbreviations.ui line 87
+#: rc.cpp:396
+#, no-c-format
+msgid "&Valid for:"
+msgstr ""
+
+#. i18n: file ./dialogs/settings/abbreviations.ui line 117
+#: rc.cpp:399
+#, no-c-format
+msgid "Template"
+msgstr "Patrymlun"
+
+#. i18n: file ./dialogs/settings/abbreviations.ui line 128
+#: rc.cpp:402 treeviews/projecttreeview.cpp:109
+#, no-c-format
+msgid "Description"
+msgstr "Disgrifiad"
+
+#. i18n: file ./dialogs/settings/abbreviations.ui line 160
+#: rc.cpp:405 rc.cpp:925 rc.cpp:1737 rc.cpp:2590
 #, no-c-format
 msgid "&Add..."
 msgstr "Ychw&anegu..."
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 280
-#: rc.cpp:111
+#. i18n: file ./dialogs/settings/abbreviations.ui line 193
+#: rc.cpp:411 rc.cpp:1740 rc.cpp:2593
 #, no-c-format
-msgid "Tool &tip:"
+msgid "&Edit..."
+msgstr "&Golygu..."
+
+#. i18n: file ./dialogs/settings/abbreviations.ui line 207
+#: rc.cpp:414
+#, no-c-format
+msgid "Expands to:"
 msgstr ""
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 296
-#: rc.cpp:114
+#. i18n: file ./dialogs/settings/abbreviations.ui line 226
+#: rc.cpp:417
 #, no-c-format
-msgid "Te&xt:"
-msgstr "Te&stun:"
+msgid "&Templates:"
+msgstr "&Patrymluniau :"
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 354
-#: rc.cpp:120
+#. i18n: file ./dialogs/settings/codetemplatedlgs.ui line 31
+#: dialogs/settings/abbreviation.cpp:167 rc.cpp:420
 #, no-c-format
-msgid "C&ustom"
-msgstr "&Addasiedig"
+msgid "Add Code Template"
+msgstr ""
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 365
-#: dialogs/actionconfigdialog.cpp:320 dialogs/tagdialogs/colorcombo.cpp:220
-#: rc.cpp:123 rc.cpp:159 rc.cpp:171 rc.cpp:189 rc.cpp:2527
+#. i18n: file ./dialogs/settings/codetemplatedlgs.ui line 42
+#: rc.cpp:423
 #, no-c-format
-msgid "None"
-msgstr "Dim"
+msgid "&Template:"
+msgstr "&Patrymlun:"
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 373
-#: rc.cpp:126 rc.cpp:2691 rc.cpp:2829
+#. i18n: file ./dialogs/settings/codetemplatedlgs.ui line 53
+#: rc.cpp:426
 #, no-c-format
-msgid "&None"
-msgstr "&Dim"
+msgid "&Description:"
+msgstr "&Disgrifiad:"
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 391
-#: rc.cpp:129
+#. i18n: file ./dialogs/settings/styleoptionss.ui line 47
+#: rc.cpp:429
 #, no-c-format
-msgid "Container toolbars:"
+msgid "Attribute quotation:"
 msgstr ""
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 397
-#: rc.cpp:132 src/quantadoc.cpp:84 src/quantadoc.cpp:369
+#. i18n: file ./dialogs/settings/styleoptionss.ui line 53
+#: rc.cpp:432
 #, no-c-format
-msgid "Tag"
+msgid "Double Quotes"
 msgstr ""
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 402
-#: rc.cpp:135 rc.cpp:3737
+#. i18n: file ./dialogs/settings/styleoptionss.ui line 58
+#: rc.cpp:435
 #, no-c-format
-msgid "Script"
-msgstr "Sgript"
+msgid "Single Quotes"
+msgstr ""
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 407
-#: rc.cpp:138 rc.cpp:427 rc.cpp:719
+#. i18n: file ./dialogs/settings/styleoptionss.ui line 70
+#: rc.cpp:438
 #, no-c-format
-msgid "Text"
-msgstr "Testun"
+msgid "Tag case:"
+msgstr ""
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 427
-#: rc.cpp:141
+#. i18n: file ./dialogs/settings/styleoptionss.ui line 78
+#: rc.cpp:441
 #, no-c-format
-msgid "T&ype:"
-msgstr "M&ath:"
+msgid "Attribute case:"
+msgstr ""
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 438
-#: rc.cpp:144
+#. i18n: file ./dialogs/settings/styleoptionss.ui line 84
+#: rc.cpp:444 rc.cpp:456
 #, no-c-format
-msgid "Detailed Settings"
+msgid "Default Case"
+msgstr "Maint rhagosodedig"
+
+#. i18n: file ./dialogs/settings/styleoptionss.ui line 89
+#: rc.cpp:447 rc.cpp:459
+#, no-c-format
+msgid "Lower Case"
+msgstr "Is-lythrennau"
+
+#. i18n: file ./dialogs/settings/styleoptionss.ui line 94
+#: rc.cpp:450 rc.cpp:462
+#, no-c-format
+msgid "Upper Case"
+msgstr "Priflythrennau"
+
+#. i18n: file ./dialogs/settings/styleoptionss.ui line 106
+#: rc.cpp:453
+#, no-c-format
+msgid "Auto-close o&ptional tags"
 msgstr ""
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 464
-#: rc.cpp:147
+#. i18n: file ./dialogs/settings/styleoptionss.ui line 134
+#: rc.cpp:465
 #, no-c-format
-msgid "<tag> :"
+msgid "Auto-close &non single and non optional tags"
 msgstr ""
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 482
-#: rc.cpp:150
+#. i18n: file ./dialogs/settings/styleoptionss.ui line 159
+#: rc.cpp:468
 #, no-c-format
-msgid "</tag> :"
+msgid "&Update opening/closing tag automatically"
 msgstr ""
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 493
-#: rc.cpp:153
+#. i18n: file ./dialogs/settings/styleoptionss.ui line 175
+#: rc.cpp:471
 #, no-c-format
-msgid "Run \"Edit tag\" dialog if available"
+msgid "Use &auto-completion"
 msgstr ""
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 544
-#: rc.cpp:156
+#. i18n: file ./dialogs/settings/styleoptionss.ui line 183
+#: rc.cpp:474
 #, no-c-format
-msgid "&Input:"
-msgstr "&Mewnbwn:"
+msgid "Automatic &replacement of the accented characters"
+msgstr ""
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 558
-#: rc.cpp:162
-#, fuzzy, no-c-format
-msgid "Current Document"
-msgstr "Creu dogfen newydd"
+#. i18n: file ./dialogs/settings/styleoptionss.ui line 187
+#: rc.cpp:477
+#, no-c-format
+msgid ""
+"If this option is turned on the accented characters, like <b>&#225;</b>"
+", will be automatically replaced  by their unicode style notation, for the "
+"above case with <b>&#038;#225;</b>."
+"<br>\n"
+"We suggest to leave this option off and use an unicode or locale encoding for "
+"your documents."
+msgstr ""
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 563
-#: rc.cpp:165
+#. i18n: file ./dialogs/settings/parseroptionsui.ui line 47
+#: rc.cpp:481
 #, no-c-format
-msgid "Selected Text"
-msgstr "Testun Dewisiedig"
+msgid "Structure Tree Look && Feel"
+msgstr ""
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 591
-#: rc.cpp:168
+#. i18n: file ./dialogs/settings/parseroptionsui.ui line 64
+#: rc.cpp:484
 #, no-c-format
-msgid "&Output:"
-msgstr "&Allbwn:"
+msgid "Use 0 to disable the automatic refresh of structure tree"
+msgstr ""
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 605
-#: rc.cpp:174
+#. i18n: file ./dialogs/settings/parseroptionsui.ui line 89
+#: rc.cpp:487
 #, no-c-format
-msgid "Insert in Cursor Position"
+msgid "Instant update"
 msgstr ""
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 610
-#: rc.cpp:177
-#, fuzzy, no-c-format
-msgid "Replace Selection"
-msgstr "Dewisiad :"
+#. i18n: file ./dialogs/settings/parseroptionsui.ui line 92
+#: rc.cpp:490 rc.cpp:511
+#, no-c-format
+msgid "Update the structure tree after every keystroke"
+msgstr ""
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 615
-#: rc.cpp:180
+#. i18n: file ./dialogs/settings/parseroptionsui.ui line 117
+#: rc.cpp:493
 #, no-c-format
-msgid "Replace Current Document"
+msgid "Show closing tags"
 msgstr ""
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 620
-#: rc.cpp:183
+#. i18n: file ./dialogs/settings/parseroptionsui.ui line 125
+#: rc.cpp:496
 #, no-c-format
-msgid "Create New Document"
-msgstr "Creu Dogfen Newydd"
+msgid "Show empt&y nodes and groups"
+msgstr ""
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 625
-#: rc.cpp:186
-#, fuzzy, no-c-format
-msgid "Message Window"
-msgstr "Rhae&adru Ffenestri"
+#. i18n: file ./dialogs/settings/parseroptionsui.ui line 136
+#: rc.cpp:499
+#, no-c-format
+msgid "Set to 0 in order to expand the whole tree"
+msgstr ""
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 651
-#: rc.cpp:192
+#. i18n: file ./dialogs/settings/parseroptionsui.ui line 144
+#: rc.cpp:502
 #, no-c-format
-msgid "Insert in cursor position"
+msgid "Refresh frequency (in seconds):"
 msgstr ""
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 656
-#: rc.cpp:195
+#. i18n: file ./dialogs/settings/parseroptionsui.ui line 152
+#: rc.cpp:505
 #, no-c-format
-msgid "Replace selection"
+msgid "Expand tree when reparse to level:"
 msgstr ""
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 661
-#: rc.cpp:198
+#. i18n: file ./dialogs/settings/parseroptionsui.ui line 162
+#: rc.cpp:508
 #, no-c-format
-msgid "Replace current document"
+msgid "Clicks on Structure Tree Items"
 msgstr ""
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 666
-#: rc.cpp:201
+#. i18n: file ./dialogs/settings/parseroptionsui.ui line 174
+#: dialogs/settings/parseroptions.cpp:37 dialogs/settings/parseroptions.cpp:55
+#: dialogs/settings/parseroptions.cpp:58 rc.cpp:514 rc.cpp:550
+#: treeviews/structtreeview.cpp:111 treeviews/structtreeview.cpp:486
+#: treeviews/structtreeview.cpp:488 treeviews/structtreeview.cpp:531
 #, no-c-format
-msgid "Create a new document"
-msgstr "Creu dogfen newydd"
+msgid "Select Tag Area"
+msgstr ""
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 671
-#: rc.cpp:204
+#. i18n: file ./dialogs/settings/parseroptionsui.ui line 179
+#: dialogs/settings/parseroptions.cpp:35 dialogs/settings/parseroptions.cpp:56
+#: rc.cpp:517 rc.cpp:553
 #, no-c-format
-msgid "Message window"
+msgid "Nothing"
+msgstr "Dim"
+
+#. i18n: file ./dialogs/settings/parseroptionsui.ui line 189
+#: dialogs/settings/parseroptions.cpp:53 rc.cpp:520 rc.cpp:544
+#, no-c-format
+msgid "Find Tag"
 msgstr ""
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 702
-#: rc.cpp:207
+#. i18n: file ./dialogs/settings/parseroptionsui.ui line 194
+#: dialogs/settings/parseroptions.cpp:34 dialogs/settings/parseroptions.cpp:43
+#: dialogs/settings/parseroptions.cpp:52 rc.cpp:523 rc.cpp:541
 #, no-c-format
-msgid "&Error:"
-msgstr "&Gwall :"
+msgid "Find Tag & Open Tree"
+msgstr ""
 
-#. i18n: file ./dialogs/donationdialog.ui line 33
-#: rc.cpp:210
+#. i18n: file ./dialogs/settings/parseroptionsui.ui line 206
+#: rc.cpp:526
 #, no-c-format
-msgid "Support Quanta with Financial Donation"
+msgid "Left button:"
+msgstr "Botwm chwith:"
+
+#. i18n: file ./dialogs/settings/parseroptionsui.ui line 212
+#: dialogs/settings/parseroptions.cpp:36 rc.cpp:529
+#, no-c-format
+msgid "Popup Menu"
 msgstr ""
 
-#. i18n: file ./dialogs/donationdialog.ui line 76
-#: rc.cpp:216
+#. i18n: file ./dialogs/settings/parseroptionsui.ui line 224
+#: rc.cpp:532
 #, no-c-format
-msgid ""
-"<div align=\"center\">"
-"<h2>Your Contribution Can Make a Difference</h2></div>"
-"&nbsp;&nbsp;&nbsp;Quanta Plus would not be what it is today without sponsored "
-"developers. Andras Mantia has been full time since mid 2002 and Michal Rudolf "
-"came on part time in spring of 2004. Over the life of the project development "
-"has been largely sponsored by the efforts of the Project Manager, Eric Laffoon. "
-"In addition to his minimum 10-20 hour a week time commitment, his company, <a "
-"href=\"http://kittyhooch.com\" target=\"_blank\">Kitty Hooch</a> "
-"LLP has an ongoing financial commitment to keep Quanta in continuous "
-"development. Our sponsored developers are also a catalyst to our volunteer "
-"developers.\n"
-"<br>&nbsp;&nbsp;&nbsp;&nbsp;Kitty Hooch is a small company with no employees, 2 "
-"active partners and several contract workers. After test marketing in the fall "
-"of 2001 they began wholesale and retail to national and international markets "
-"in early 2002. Kitty Hooch controls all aspects of their product production and "
-"marketing. Quanta sponsorship is no small expense for a small start up company. "
-"In 2003 cash flow and a bout with typhoid fever left Eric in debt and unable to "
-"keep up payments to Andras without help from the community. Thankfully a number "
-"of people stepped up. We now have several large sponsors along with a number of "
-"generous contributors. This has enabled us to bring Michal on part time. Now we "
-"are looking to be able to move him to full time. The challenge for this project "
-"to assume a leading role as a \"killer desktop application\" is great.\n"
-"<div align=\"center\">"
-"<h3>Balancing open source ideals and fiscal\n"
-"reality</h3></div>\n"
-"&nbsp;&nbsp;&nbsp;&nbsp;We believe that the open source model\n"
-"is the future of software, but it is no guarantee of success. How many open "
-"source projects that we had high hopes for are unmaintained today? In early "
-"2002 many people thought that Quanta Plus was dead. One person, Eric Laffoon, "
-"was not about to let the dream die. Quanta is more than surviving now, but "
-"developing a best-in-class tool is no easy task. We believe the key is "
-"consistent momentum. Nothing ensures this better than programmers who can work "
-"without financial or time distractions. Why do you think OSS projects die?"
-"<br>&nbsp;&nbsp;&nbsp;&nbsp;As Quanta grows the project management demands are "
-"increasing and ironically impacting the revenue stream it requires to continue. "
-"The impact of our sponsored developers has been huge! We are looking to make "
-"Quanta grow even faster. Eric needs to be able to free even more time to bring "
-"several new and exciting ideas through coding to release. We have other "
-"expenses too, with conferences and keeping our systems up to date so we don't "
-"lose time fighting old hardware. <i>We want to make Quanta the best web tool "
-"anywhere!</i>. This will require a nucleus of active core developers. We hope "
-"professional developers and companies using Quanta will help us to reach our "
-"goals with sponsorship donations that will relieve financial stresses.\n"
-"<div align=\"center\">"
-"<h3>Could Quanta die without your support?</h3></div>"
-"&nbsp;&nbsp;&nbsp;&nbsp;We'd like to think not! But from February 2001 to June "
-"2002 there was very little activity and many months with no work done at all. "
-"This came about because of cash flow problems which led to the original "
-"developers leaving to do a commercial project. The fact remains that our most "
-"productive volunteer developers, as much as we think they're wonderful, go long "
-"periods where they just can't make time to code on the project. We estimate our "
-"active users number well over a million, yet we have only a few dozen people a "
-"year supporting the project. In fact 3-4 people account for over half of our "
-"current support. Clearly the actions of a few people make a huge difference, "
-"and yours can make a difference too.\n"
-"<br><div align=\"center\">"
-"<h3>Will you help make a difference?</h3></div>\n"
-"&nbsp;&nbsp;&nbsp;&nbsp;If you wish to donate through PayPal\n"
-"(online money transfer or credit card), visit our <a "
-"href=\"http://kdewebdev.org/donate.php\">donation page</a>.\n"
-"<br>&nbsp;&nbsp;&nbsp;&nbsp;If you are outside the PayPal area or wish to "
-"discuss corporate sponsorship contact the project manager:"
-"<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Eric Laffoon, <a "
-"href=\"mailto:sequitur@kde.org?subject=Quanta%20sponsorship%20inquiry\">"
-"sequitur@kde.org</a>"
+msgid "Double click:"
 msgstr ""
 
-#. i18n: file ./dialogs/donationdialog.ui line 136
-#: rc.cpp:229
+#. i18n: file ./dialogs/settings/parseroptionsui.ui line 232
+#: rc.cpp:535
 #, no-c-format
-msgid ""
-"<a href=\"http://kdewebdev.org/donate.php\">Donate</a> through  PayPal now."
+msgid "Middle button:"
+msgstr "Botwm canol:"
+
+#. i18n: file ./dialogs/settings/parseroptionsui.ui line 240
+#: rc.cpp:538
+#, no-c-format
+msgid "Right button:"
+msgstr "Botwm de:"
+
+#. i18n: file ./dialogs/settings/parseroptionsui.ui line 256
+#: dialogs/settings/parseroptions.cpp:54 rc.cpp:547
+#: treeviews/structtreeview.cpp:112 treeviews/structtreeview.cpp:534
+#, no-c-format
+msgid "Go to End of Tag"
+msgstr ""
+
+#. i18n: file ./dialogs/debuggeroptionss.ui line 44
+#: rc.cpp:556
+#, no-c-format
+msgid "Enable debugger"
+msgstr "Galluogi dadnamydd"
+
+#. i18n: file ./dialogs/debuggeroptionss.ui line 80
+#: rc.cpp:559
+#, no-c-format
+msgid "PHP3 listener"
+msgstr ""
+
+#. i18n: file ./dialogs/debuggeroptionss.ui line 88
+#: rc.cpp:562
+#, no-c-format
+msgid "PHP4 debugger"
+msgstr ""
+
+#. i18n: file ./dialogs/fourbuttonmessagebox.ui line 74
+#: rc.cpp:568
+#, no-c-format
+msgid "Save &As..."
+msgstr "Cadw &Fel..."
+
+#. i18n: file ./dialogs/fourbuttonmessagebox.ui line 90
+#: rc.cpp:571
+#, no-c-format
+msgid "&Do Not Save"
+msgstr "&Peidiwch â Chadw"
+
+#. i18n: file ./dialogs/casewidget.ui line 30
+#: rc.cpp:577
+#, no-c-format
+msgid "Tag Case"
 msgstr ""
 
+#. i18n: file ./dialogs/casewidget.ui line 41
+#: rc.cpp:580 rc.cpp:592
+#, no-c-format
+msgid "Upper case"
+msgstr "Priflythrennau"
+
+#. i18n: file ./dialogs/casewidget.ui line 49
+#: rc.cpp:583 rc.cpp:595
+#, no-c-format
+msgid "Lower case"
+msgstr "Is-lythrennau"
+
+#. i18n: file ./dialogs/casewidget.ui line 57
+#: rc.cpp:586 rc.cpp:598
+#, no-c-format
+msgid "Unchanged"
+msgstr ""
+
+#. i18n: file ./dialogs/casewidget.ui line 70
+#: rc.cpp:589
+#, no-c-format
+msgid "Attribute Case"
+msgstr ""
+
+#. i18n: file ./dialogs/specialchardialogs.ui line 16
+#: rc.cpp:601 src/quanta_init.cpp:1067
+#, no-c-format
+msgid "Insert Special Character"
+msgstr ""
+
+#. i18n: file ./dialogs/specialchardialogs.ui line 44
+#: rc.cpp:604
+#, no-c-format
+msgid "&Insert Code"
+msgstr ""
+
+#. i18n: file ./dialogs/specialchardialogs.ui line 64
+#: rc.cpp:607
+#, no-c-format
+msgid "Insert C&har"
+msgstr "Mewnosod Nod"
+
+#. i18n: file ./dialogs/specialchardialogs.ui line 119
+#: rc.cpp:613
+#, no-c-format
+msgid "&Filter:"
+msgstr "&Hidl:"
+
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 25
-#: rc.cpp:232
+#: rc.cpp:616
 #, no-c-format
 msgid "Structure Group Editor"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 36
-#: rc.cpp:235 rc.cpp:2643 rc.cpp:2751
+#: rc.cpp:619 rc.cpp:2855 rc.cpp:2876
 #, no-c-format
 msgid "&Name:"
 msgstr "&Enw:"
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 47
-#: rc.cpp:238
+#: rc.cpp:622
 #, fuzzy, no-c-format
 msgid "The name of the group"
 msgstr "Aw&grymiad y Dydd"
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 50
-#: rc.cpp:241
+#: rc.cpp:625
 #, no-c-format
 msgid ""
 "The user visible name of the group. It will be shown in the structure tree as a "
@@ -474,25 +1104,25 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 58
-#: rc.cpp:244
+#: rc.cpp:628
 #, no-c-format
 msgid "&Icon:"
 msgstr "&Eicon:"
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 103
-#: rc.cpp:247
+#: rc.cpp:631
 #, no-c-format
 msgid "Filen&ame definition:"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 109
-#: rc.cpp:250 rc.cpp:262
+#: rc.cpp:634 rc.cpp:646
 #, no-c-format
 msgid "Regular expression to get the filename"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 112
-#: rc.cpp:253 rc.cpp:265
+#: rc.cpp:637 rc.cpp:649
 #, no-c-format
 msgid ""
 "Regular expression to get the filename. The expression is used to <b>remove</b> "
@@ -500,31 +1130,31 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 120
-#: rc.cpp:256
+#: rc.cpp:640
 #, no-c-format
 msgid "Contains a &filename"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 123
-#: rc.cpp:259
+#: rc.cpp:643
 #, no-c-format
 msgid "True if the element's text contains a filename"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 145
-#: rc.cpp:268
+#: rc.cpp:652
 #, fuzzy, no-c-format
 msgid "&Tag:"
 msgstr "&Tasg :"
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 151
-#: rc.cpp:271
+#: rc.cpp:655
 #, no-c-format
 msgid "Elements identified by this entry will belong to this group"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 154
-#: rc.cpp:274 rc.cpp:295
+#: rc.cpp:658 rc.cpp:679
 #, no-c-format
 msgid ""
 "Defines which tags belong to this group. The format is <i>"
@@ -535,19 +1165,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 162
-#: rc.cpp:277
+#: rc.cpp:661
 #, fuzzy, no-c-format
 msgid "\"No\" na&me:"
 msgstr "Enw'r grwp:"
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 168
-#: rc.cpp:280 rc.cpp:286
+#: rc.cpp:664 rc.cpp:670
 #, no-c-format
 msgid "The name that appears when no element were found"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 171
-#: rc.cpp:283 rc.cpp:289
+#: rc.cpp:667 rc.cpp:673
 #, no-c-format
 msgid ""
 "The user visible name of the group. It will be shown in the structure tree as a "
@@ -556,44 +1186,44 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 193
-#: rc.cpp:292
+#: rc.cpp:676
 #, no-c-format
 msgid "Elements ideintified by this entry will belong to this group"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 221
-#: rc.cpp:298
+#: rc.cpp:682
 #, no-c-format
 msgid "Use elements as tags"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 224
-#: rc.cpp:301
+#: rc.cpp:685
 #, no-c-format
 msgid "Treat elements as new tags"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 227
-#: rc.cpp:304
+#: rc.cpp:688
 #, no-c-format
 msgid ""
 "Treat elements as new tags, so they will show up during tag autocompletion."
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 235
-#: rc.cpp:307
+#: rc.cpp:691
 #, no-c-format
 msgid "&Pseudo DTEP Specific Settings"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 246
-#: rc.cpp:310 rc.cpp:342
+#: rc.cpp:694 rc.cpp:726
 #, no-c-format
 msgid "Regular expression to find the type of the element"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 254
-#: rc.cpp:313 rc.cpp:345
+#: rc.cpp:697 rc.cpp:729
 #, no-c-format
 msgid ""
 "Regular expression to find the type of the element. The pattern is searched on "
@@ -616,19 +1246,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 262
-#: rc.cpp:321
+#: rc.cpp:705
 #, fuzzy, no-c-format
 msgid "&Usage expression:"
 msgstr "Mynegiant"
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 268
-#: rc.cpp:324 rc.cpp:365
+#: rc.cpp:708 rc.cpp:749
 #, no-c-format
 msgid "Regular expression to find the usage of a group element"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 280
-#: rc.cpp:327 rc.cpp:368
+#: rc.cpp:711 rc.cpp:752
 #, no-c-format
 msgid ""
 "Regular expression to find the usage of a group element in the document."
@@ -656,25 +1286,25 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 288
-#: rc.cpp:339
+#: rc.cpp:723
 #, fuzzy, no-c-format
 msgid "Element t&ype expression:"
 msgstr "Mynegiant"
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 310
-#: rc.cpp:353
+#: rc.cpp:737
 #, fuzzy, no-c-format
 msgid "Definition e&xpression:"
 msgstr "Mynegiant"
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 316
-#: rc.cpp:356 rc.cpp:496
+#: rc.cpp:740 rc.cpp:880
 #, no-c-format
 msgid "Regular expression to find what belong to this group"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 322
-#: rc.cpp:359 rc.cpp:499
+#: rc.cpp:743 rc.cpp:883
 #, no-c-format
 msgid ""
 "Regular expression used to find text areas in the document, which will belong "
@@ -690,19 +1320,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 350
-#: rc.cpp:380
+#: rc.cpp:764
 #, no-c-format
 msgid "Parent group:"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 353
-#: rc.cpp:383 rc.cpp:389
+#: rc.cpp:767 rc.cpp:773
 #, no-c-format
 msgid "The name of the group that may be the parent of this"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 356
-#: rc.cpp:386 rc.cpp:392
+#: rc.cpp:770 rc.cpp:776
 #, no-c-format
 msgid ""
 "The name of the group that may be the parent of this. For example <b>classes</b> "
@@ -712,38 +1342,38 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 375
-#: rc.cpp:395
+#: rc.cpp:779
 #, no-c-format
 msgid "Searched tags:"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 378
-#: rc.cpp:398 rc.cpp:451
+#: rc.cpp:782 rc.cpp:835
 #, no-c-format
 msgid "Only tags of this type can be part of the group"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 386
-#: rc.cpp:401
+#: rc.cpp:785
 #, no-c-format
 msgid "Remove when autocompleting:"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 389
-#: rc.cpp:404 rc.cpp:424
+#: rc.cpp:788 rc.cpp:808
 #, no-c-format
 msgid ""
 "Regular expression used to remove unwanted strings from the completion text"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 397
-#: rc.cpp:407
+#: rc.cpp:791
 #, no-c-format
 msgid "Autocomplete after:"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 400
-#: rc.cpp:410 rc.cpp:417
+#: rc.cpp:794 rc.cpp:801
 #, no-c-format
 msgid ""
 "Regular expression to tell when to bring up the completion box with the "
@@ -751,7 +1381,7 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 404
-#: rc.cpp:413 rc.cpp:420
+#: rc.cpp:797 rc.cpp:804
 #, no-c-format
 msgid ""
 "Regular expression to tell when to bring up the completion box with the "
@@ -762,61 +1392,61 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 435
-#: rc.cpp:430
+#: rc.cpp:814
 #, no-c-format
 msgid "XmlTag"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 440
-#: rc.cpp:433
+#: rc.cpp:817
 #, no-c-format
 msgid "XmlTagEnd"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 445
-#: rc.cpp:436 rc.cpp:5086 rc.cpp:5142 rc.cpp:5158 rc.cpp:5179
+#: rc.cpp:820 rc.cpp:5113 rc.cpp:5201 rc.cpp:5227 rc.cpp:5328
 #, no-c-format
 msgid "Comment"
 msgstr "Sylwad"
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 450
-#: rc.cpp:439 rc.cpp:4418
+#: rc.cpp:823 rc.cpp:5028
 #, no-c-format
 msgid "CSS"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 455
-#: rc.cpp:442
+#: rc.cpp:826
 #, fuzzy, no-c-format
 msgid "ScriptTag"
 msgstr "Sgript"
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 460
-#: rc.cpp:445
+#: rc.cpp:829
 #, no-c-format
 msgid "ScriptStructureBegin"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 465
-#: rc.cpp:448
+#: rc.cpp:832
 #, fuzzy, no-c-format
 msgid "ScriptStructureEnd"
 msgstr "Strwythur Dogfen"
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 497
-#: rc.cpp:454
+#: rc.cpp:838
 #, fuzzy, no-c-format
 msgid "Parse file"
 msgstr "Cyfredol: %1"
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 500
-#: rc.cpp:457
+#: rc.cpp:841
 #, no-c-format
 msgid "Check if the filename that is in the elements text should be parsed"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 503
-#: rc.cpp:460
+#: rc.cpp:844
 #, no-c-format
 msgid ""
 "Check if the filename that is in the elements text should be parsed. This makes "
@@ -826,690 +1456,443 @@ msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 511
 #: components/debugger/backtracelistview.cpp:58
-#: components/debugger/variableslistview.cpp:57 rc.cpp:463
+#: components/debugger/variableslistview.cpp:57 rc.cpp:847
 #, no-c-format
 msgid "Type"
 msgstr "Math"
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 522
-#: rc.cpp:466
+#: rc.cpp:850
 #, no-c-format
 msgid "Simple"
 msgstr "Syml"
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 525
-#: rc.cpp:469
+#: rc.cpp:853
 #, no-c-format
 msgid "This is a simple group, nothing special"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 533
-#: rc.cpp:472
+#: rc.cpp:856
 #, fuzzy, no-c-format
 msgid "Variable group"
 msgstr "Newidynnau"
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 536
-#: rc.cpp:475
+#: rc.cpp:859
 #, no-c-format
 msgid "The group's elements are variables"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 544
-#: rc.cpp:478
+#: rc.cpp:862
 #, fuzzy, no-c-format
 msgid "Function group"
 msgstr "Gweithred"
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 547
-#: rc.cpp:481
+#: rc.cpp:865
 #, no-c-format
 msgid "The group's elements are functions"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 555
-#: rc.cpp:484
+#: rc.cpp:868
 #, fuzzy, no-c-format
 msgid "Class group"
 msgstr "Dosbarth"
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 558
-#: rc.cpp:487
+#: rc.cpp:871
 #, no-c-format
 msgid "The group's elements are classes"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 566
-#: rc.cpp:490
+#: rc.cpp:874
 #, fuzzy, no-c-format
 msgid "Ob&ject group"
 msgstr "Gwrthrych"
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 569
-#: rc.cpp:493
+#: rc.cpp:877
 #, no-c-format
 msgid "The group's elements are objects"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 593
-#: rc.cpp:505
+#: rc.cpp:889
 #, no-c-format
 msgid "Minimal search mode"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 596
-#: rc.cpp:508
+#: rc.cpp:892
 #, no-c-format
 msgid ""
 "Enable to use the minimal style search for definition instead of the standard "
 "(greedy) matching"
 msgstr ""
 
-#. i18n: file ./dialogs/specialchardialogs.ui line 16
-#: rc.cpp:511 src/quanta_init.cpp:1079
-#, no-c-format
-msgid "Insert Special Character"
-msgstr ""
-
-#. i18n: file ./dialogs/specialchardialogs.ui line 44
-#: rc.cpp:514
-#, no-c-format
-msgid "&Insert Code"
-msgstr ""
-
-#. i18n: file ./dialogs/specialchardialogs.ui line 64
-#: rc.cpp:517
-#, no-c-format
-msgid "Insert C&har"
-msgstr "Mewnosod Nod"
-
-#. i18n: file ./dialogs/specialchardialogs.ui line 119
-#: rc.cpp:523
-#, no-c-format
-msgid "&Filter:"
-msgstr "&Hidl:"
-
-#. i18n: file ./dialogs/loadentitydlgs.ui line 27
-#: rc.cpp:526
+#. i18n: file ./dialogs/actionconfigdialogs.ui line 27
+#: rc.cpp:895
 #, no-c-format
-msgid "Source DTD:"
+msgid "Configure Actions"
 msgstr ""
 
-#. i18n: file ./dialogs/loadentitydlgs.ui line 35
-#: rc.cpp:529
+#. i18n: file ./dialogs/actionconfigdialogs.ui line 56
+#: rc.cpp:898
 #, no-c-format
-msgid "Target DTEP:"
-msgstr ""
-
-#. i18n: file ./dialogs/loadentitydlgs.ui line 43
-#: rc.cpp:532 src/dtds.cpp:904
-#, fuzzy, no-c-format
-msgid "*.dtd|DTD Definitions"
-msgstr "Disgrifiad"
+msgid "&Delete Action"
+msgstr "&Dileu Gweithred"
 
-#. i18n: file ./dialogs/settings/styleoptionss.ui line 47
-#: rc.cpp:535
+#. i18n: file ./dialogs/actionconfigdialogs.ui line 64
+#: rc.cpp:901
 #, no-c-format
-msgid "Attribute quotation:"
-msgstr ""
+msgid "&New Action"
+msgstr "Gweithred &Newydd"
 
-#. i18n: file ./dialogs/settings/styleoptionss.ui line 53
-#: rc.cpp:538
+#. i18n: file ./dialogs/actionconfigdialogs.ui line 117
+#: rc.cpp:904
 #, no-c-format
-msgid "Double Quotes"
+msgid "Toolbar & Action Tree"
 msgstr ""
 
-#. i18n: file ./dialogs/settings/styleoptionss.ui line 58
-#: rc.cpp:541
+#. i18n: file ./dialogs/actionconfigdialogs.ui line 134
+#: rc.cpp:910 rc.cpp:937
 #, no-c-format
-msgid "Single Quotes"
-msgstr ""
+msgid "Shortcut"
+msgstr "Byrlwybr"
 
-#. i18n: file ./dialogs/settings/styleoptionss.ui line 70
-#: rc.cpp:544
+#. i18n: file ./dialogs/actionconfigdialogs.ui line 236
+#: rc.cpp:922
 #, no-c-format
-msgid "Tag case:"
+msgid "Action Properties"
 msgstr ""
 
-#. i18n: file ./dialogs/settings/styleoptionss.ui line 78
-#: rc.cpp:547
+#. i18n: file ./dialogs/actionconfigdialogs.ui line 280
+#: rc.cpp:931
 #, no-c-format
-msgid "Attribute case:"
+msgid "Tool &tip:"
 msgstr ""
 
-#. i18n: file ./dialogs/settings/styleoptionss.ui line 84
-#: rc.cpp:550 rc.cpp:562
-#, no-c-format
-msgid "Default Case"
-msgstr "Maint rhagosodedig"
-
-#. i18n: file ./dialogs/settings/styleoptionss.ui line 89
-#: rc.cpp:553 rc.cpp:565
-#, no-c-format
-msgid "Lower Case"
-msgstr "Is-lythrennau"
-
-#. i18n: file ./dialogs/settings/styleoptionss.ui line 94
-#: rc.cpp:556 rc.cpp:568
+#. i18n: file ./dialogs/actionconfigdialogs.ui line 296
+#: rc.cpp:934
 #, no-c-format
-msgid "Upper Case"
-msgstr "Priflythrennau"
+msgid "Te&xt:"
+msgstr "Te&stun:"
 
-#. i18n: file ./dialogs/settings/styleoptionss.ui line 106
-#: rc.cpp:559
+#. i18n: file ./dialogs/actionconfigdialogs.ui line 354
+#: rc.cpp:940
 #, no-c-format
-msgid "Auto-close o&ptional tags"
-msgstr ""
+msgid "C&ustom"
+msgstr "&Addasiedig"
 
-#. i18n: file ./dialogs/settings/styleoptionss.ui line 134
-#: rc.cpp:571
+#. i18n: file ./dialogs/actionconfigdialogs.ui line 373
+#: rc.cpp:946 rc.cpp:2665 rc.cpp:2918
 #, no-c-format
-msgid "Auto-close &non single and non optional tags"
-msgstr ""
+msgid "&None"
+msgstr "&Dim"
 
-#. i18n: file ./dialogs/settings/styleoptionss.ui line 159
-#: rc.cpp:574
+#. i18n: file ./dialogs/actionconfigdialogs.ui line 391
+#: rc.cpp:949
 #, no-c-format
-msgid "&Update opening/closing tag automatically"
+msgid "Container toolbars:"
 msgstr ""
 
-#. i18n: file ./dialogs/settings/styleoptionss.ui line 175
-#: rc.cpp:577
+#. i18n: file ./dialogs/actionconfigdialogs.ui line 397
+#: rc.cpp:952 src/quantadoc.cpp:84 src/quantadoc.cpp:369
 #, no-c-format
-msgid "Use &auto-completion"
+msgid "Tag"
 msgstr ""
 
-#. i18n: file ./dialogs/settings/styleoptionss.ui line 183
-#: rc.cpp:580
+#. i18n: file ./dialogs/actionconfigdialogs.ui line 402
+#: rc.cpp:955 rc.cpp:3935
 #, no-c-format
-msgid "Automatic &replacement of the accented characters"
-msgstr ""
+msgid "Script"
+msgstr "Sgript"
 
-#. i18n: file ./dialogs/settings/styleoptionss.ui line 187
-#: rc.cpp:583
+#. i18n: file ./dialogs/actionconfigdialogs.ui line 427
+#: rc.cpp:961
 #, no-c-format
-msgid ""
-"If this option is turned on the accented characters, like <b>&#225;</b>"
-", will be automatically replaced  by their unicode style notation, for the "
-"above case with <b>&#038;#225;</b>."
-"<br>\n"
-"We suggest to leave this option off and use an unicode or locale encoding for "
-"your documents."
-msgstr ""
+msgid "T&ype:"
+msgstr "M&ath:"
 
-#. i18n: file ./dialogs/settings/abbreviations.ui line 25
-#: rc.cpp:587 src/quanta.cpp:1253
+#. i18n: file ./dialogs/actionconfigdialogs.ui line 438
+#: rc.cpp:964
 #, no-c-format
-msgid "Abbreviations"
+msgid "Detailed Settings"
 msgstr ""
 
-#. i18n: file ./dialogs/settings/abbreviations.ui line 36
-#: rc.cpp:590 rc.cpp:2563 rc.cpp:2575
-#, no-c-format
-msgid "Add..."
-msgstr "Ychwanegu..."
-
-#. i18n: file ./dialogs/settings/abbreviations.ui line 52
-#: rc.cpp:596
-#, no-c-format
-msgid "&New..."
-msgstr "&Newydd..."
-
-#. i18n: file ./dialogs/settings/abbreviations.ui line 68
-#: rc.cpp:599
-#, no-c-format
-msgid "&Group:"
-msgstr "&Grŵp:"
-
-#. i18n: file ./dialogs/settings/abbreviations.ui line 87
-#: rc.cpp:602
+#. i18n: file ./dialogs/actionconfigdialogs.ui line 464
+#: rc.cpp:967
 #, no-c-format
-msgid "&Valid for:"
+msgid "<tag> :"
 msgstr ""
 
-#. i18n: file ./dialogs/settings/abbreviations.ui line 117
-#: rc.cpp:605
-#, no-c-format
-msgid "Template"
-msgstr "Patrymlun"
-
-#. i18n: file ./dialogs/settings/abbreviations.ui line 128
-#: rc.cpp:608 treeviews/projecttreeview.cpp:109
-#, no-c-format
-msgid "Description"
-msgstr "Disgrifiad"
-
-#. i18n: file ./dialogs/settings/abbreviations.ui line 193
-#: rc.cpp:617 rc.cpp:1505 rc.cpp:2781
-#, no-c-format
-msgid "&Edit..."
-msgstr "&Golygu..."
-
-#. i18n: file ./dialogs/settings/abbreviations.ui line 207
-#: rc.cpp:620
+#. i18n: file ./dialogs/actionconfigdialogs.ui line 482
+#: rc.cpp:970
 #, no-c-format
-msgid "Expands to:"
+msgid "</tag> :"
 msgstr ""
 
-#. i18n: file ./dialogs/settings/abbreviations.ui line 226
-#: rc.cpp:623
-#, no-c-format
-msgid "&Templates:"
-msgstr "&Patrymluniau :"
-
-#. i18n: file ./dialogs/settings/filemaskss.ui line 52
-#: rc.cpp:626 rc.cpp:3021
+#. i18n: file ./dialogs/actionconfigdialogs.ui line 493
+#: rc.cpp:973
 #, no-c-format
-msgid ""
-"New files will have the extension and highlighting according to this setting"
+msgid "Run \"Edit tag\" dialog if available"
 msgstr ""
 
-#. i18n: file ./dialogs/settings/filemaskss.ui line 66
-#: rc.cpp:629
-#, no-c-format
-msgid "Mimetypes"
-msgstr "Mathau MIME"
-
-#. i18n: file ./dialogs/settings/filemaskss.ui line 93
-#: rc.cpp:632
+#. i18n: file ./dialogs/actionconfigdialogs.ui line 544
+#: rc.cpp:976
 #, no-c-format
-msgid "&Reset to Default"
-msgstr ""
+msgid "&Input:"
+msgstr "&Mewnbwn:"
 
-#. i18n: file ./dialogs/settings/filemaskss.ui line 101
-#: rc.cpp:635
+#. i18n: file ./dialogs/actionconfigdialogs.ui line 558
+#: rc.cpp:982
 #, fuzzy, no-c-format
-msgid "Te&xts:"
-msgstr "Te&stun:"
-
-#. i18n: file ./dialogs/settings/filemaskss.ui line 112
-#: rc.cpp:638
-#, no-c-format
-msgid "&Markups:"
-msgstr ""
-
-#. i18n: file ./dialogs/settings/filemaskss.ui line 123
-#: rc.cpp:641
-#, no-c-format
-msgid "&Images:"
-msgstr "&Delweddau :"
+msgid "Current Document"
+msgstr "Creu dogfen newydd"
 
-#. i18n: file ./dialogs/settings/filemaskss.ui line 156
-#: rc.cpp:644
+#. i18n: file ./dialogs/actionconfigdialogs.ui line 563
+#: rc.cpp:985
 #, no-c-format
-msgid "&Scripts:"
-msgstr "&Sgriptiau :"
+msgid "Selected Text"
+msgstr "Testun Dewisiedig"
 
-#. i18n: file ./dialogs/settings/filemaskss.ui line 197
-#: rc.cpp:647
+#. i18n: file ./dialogs/actionconfigdialogs.ui line 591
+#: rc.cpp:988
 #, no-c-format
-msgid "Default character &encoding:"
-msgstr ""
+msgid "&Output:"
+msgstr "&Allbwn:"
 
-#. i18n: file ./dialogs/settings/filemaskss.ui line 211
-#: rc.cpp:650 rc.cpp:3012
+#. i18n: file ./dialogs/actionconfigdialogs.ui line 605
+#: rc.cpp:994
 #, no-c-format
-msgid "Default &DTD:"
+msgid "Insert in Cursor Position"
 msgstr ""
 
-#. i18n: file ./dialogs/settings/filemaskss.ui line 239
-#: rc.cpp:653
+#. i18n: file ./dialogs/actionconfigdialogs.ui line 610
+#: rc.cpp:997
 #, fuzzy, no-c-format
-msgid "Startup Options"
-msgstr "Sesiwn"
-
-#. i18n: file ./dialogs/settings/filemaskss.ui line 250
-#: rc.cpp:656
-#, no-c-format
-msgid "L&oad last-opened files"
-msgstr ""
-
-#. i18n: file ./dialogs/settings/filemaskss.ui line 258
-#: rc.cpp:659
-#, no-c-format
-msgid "S&how splashscreen"
-msgstr ""
-
-#. i18n: file ./dialogs/settings/filemaskss.ui line 266
-#: rc.cpp:662
-#, no-c-format
-msgid "&Load last-opened project"
-msgstr ""
-
-#. i18n: file ./dialogs/settings/filemaskss.ui line 284
-#: rc.cpp:665
-#, no-c-format
-msgid "Create backups every"
-msgstr ""
-
-#. i18n: file ./dialogs/settings/filemaskss.ui line 306
-#: rc.cpp:668
-#, no-c-format
-msgid "minutes"
-msgstr "munudau"
-
-#. i18n: file ./dialogs/settings/filemaskss.ui line 316
-#: rc.cpp:671
-#, no-c-format
-msgid "Show the DTD selection dialog when loading files with &unknown DTD"
-msgstr ""
-
-#. i18n: file ./dialogs/settings/codetemplatedlgs.ui line 31
-#: dialogs/settings/abbreviation.cpp:167 rc.cpp:674
-#, no-c-format
-msgid "Add Code Template"
-msgstr ""
-
-#. i18n: file ./dialogs/settings/codetemplatedlgs.ui line 42
-#: rc.cpp:677
-#, no-c-format
-msgid "&Template:"
-msgstr "&Patrymlun:"
-
-#. i18n: file ./dialogs/settings/codetemplatedlgs.ui line 53
-#: rc.cpp:680
-#, no-c-format
-msgid "&Description:"
-msgstr "&Disgrifiad:"
-
-#. i18n: file ./dialogs/settings/previewoptionss.ui line 39
-#: rc.cpp:683
-#, no-c-format
-msgid "Reset window layout to the default on the next startup"
-msgstr ""
-
-#. i18n: file ./dialogs/settings/previewoptionss.ui line 47
-#: rc.cpp:686
-#, no-c-format
-msgid "Show hidden files in files tree"
-msgstr ""
-
-#. i18n: file ./dialogs/settings/previewoptionss.ui line 55
-#: rc.cpp:689
-#, no-c-format
-msgid "Save tree status for local trees"
-msgstr ""
-
-#. i18n: file ./dialogs/settings/previewoptionss.ui line 63
-#: rc.cpp:692
-#, no-c-format
-msgid "Close Buttons on Tabs"
-msgstr ""
-
-#. i18n: file ./dialogs/settings/previewoptionss.ui line 74
-#: rc.cpp:695
-#, no-c-format
-msgid "&Always show"
-msgstr ""
-
-#. i18n: file ./dialogs/settings/previewoptionss.ui line 85
-#: rc.cpp:698
-#, no-c-format
-msgid "&Do not show"
-msgstr ""
-
-#. i18n: file ./dialogs/settings/previewoptionss.ui line 93
-#: rc.cpp:701
-#, no-c-format
-msgid "Show dela&yed"
-msgstr ""
-
-#. i18n: file ./dialogs/settings/previewoptionss.ui line 103
-#: rc.cpp:704 rc.cpp:4916 src/quanta.cpp:5297 src/quanta_init.cpp:184
-#: src/viewmanager.cpp:564
-#, no-c-format
-msgid "Documentation"
-msgstr "Dogfenniaeth"
-
-#. i18n: file ./dialogs/settings/previewoptionss.ui line 114
-#: rc.cpp:707
-#, no-c-format
-msgid "New tab"
-msgstr "Tab Newydd"
-
-#. i18n: file ./dialogs/settings/previewoptionss.ui line 125
-#: rc.cpp:710 rc.cpp:728
-#, no-c-format
-msgid "Separate toolview"
-msgstr ""
-
-#. i18n: file ./dialogs/settings/previewoptionss.ui line 135
-#: rc.cpp:713
-#, no-c-format
-msgid "Toolview Tabs"
-msgstr ""
-
-#. i18n: file ./dialogs/settings/previewoptionss.ui line 146
-#: rc.cpp:716
-#, no-c-format
-msgid "Icon and text"
-msgstr ""
-
-#. i18n: file ./dialogs/settings/previewoptionss.ui line 165
-#: rc.cpp:722 rc.cpp:5171
-#, no-c-format
-msgid "Icon"
-msgstr "Eicon"
-
-#. i18n: file ./dialogs/settings/previewoptionss.ui line 175
-#: rc.cpp:725 src/quanta.cpp:5283
-#, no-c-format
-msgid "Preview"
-msgstr "Rhagolwg"
-
-#. i18n: file ./dialogs/settings/previewoptionss.ui line 200
-#: rc.cpp:731
-#, no-c-format
-msgid "Editor area"
-msgstr ""
-
-#. i18n: file ./dialogs/settings/previewoptionss.ui line 230
-#: rc.cpp:734
-#, no-c-format
-msgid "&Warning Messages"
-msgstr ""
-
-#. i18n: file ./dialogs/settings/previewoptionss.ui line 241
-#: rc.cpp:737
-#, no-c-format
-msgid "Warn about opening binar&y/unknown files"
-msgstr ""
+msgid "Replace Selection"
+msgstr "Dewisiad :"
 
-#. i18n: file ./dialogs/settings/previewoptionss.ui line 249
-#: rc.cpp:740
+#. i18n: file ./dialogs/actionconfigdialogs.ui line 615
+#: rc.cpp:1000
 #, no-c-format
-msgid "Warn when executing &actions associated with events"
+msgid "Replace Current Document"
 msgstr ""
 
-#. i18n: file ./dialogs/settings/previewoptionss.ui line 257
-#: rc.cpp:743
+#. i18n: file ./dialogs/actionconfigdialogs.ui line 620
+#: rc.cpp:1003
 #, no-c-format
-msgid "Show all warning messages"
-msgstr ""
+msgid "Create New Document"
+msgstr "Creu Dogfen Newydd"
 
-#. i18n: file ./dialogs/settings/parseroptionsui.ui line 47
-#: rc.cpp:746
-#, no-c-format
-msgid "Structure Tree Look && Feel"
-msgstr ""
+#. i18n: file ./dialogs/actionconfigdialogs.ui line 625
+#: rc.cpp:1006
+#, fuzzy, no-c-format
+msgid "Message Window"
+msgstr "Rhae&adru Ffenestri"
 
-#. i18n: file ./dialogs/settings/parseroptionsui.ui line 64
-#: rc.cpp:749
+#. i18n: file ./dialogs/actionconfigdialogs.ui line 651
+#: rc.cpp:1012
 #, no-c-format
-msgid "Use 0 to disable the automatic refresh of structure tree"
+msgid "Insert in cursor position"
 msgstr ""
 
-#. i18n: file ./dialogs/settings/parseroptionsui.ui line 89
-#: rc.cpp:752
+#. i18n: file ./dialogs/actionconfigdialogs.ui line 656
+#: rc.cpp:1015
 #, no-c-format
-msgid "Instant update"
+msgid "Replace selection"
 msgstr ""
 
-#. i18n: file ./dialogs/settings/parseroptionsui.ui line 92
-#: rc.cpp:755 rc.cpp:776
+#. i18n: file ./dialogs/actionconfigdialogs.ui line 661
+#: rc.cpp:1018
 #, no-c-format
-msgid "Update the structure tree after every keystroke"
+msgid "Replace current document"
 msgstr ""
 
-#. i18n: file ./dialogs/settings/parseroptionsui.ui line 117
-#: rc.cpp:758
+#. i18n: file ./dialogs/actionconfigdialogs.ui line 666
+#: rc.cpp:1021
 #, no-c-format
-msgid "Show closing tags"
-msgstr ""
+msgid "Create a new document"
+msgstr "Creu dogfen newydd"
 
-#. i18n: file ./dialogs/settings/parseroptionsui.ui line 125
-#: rc.cpp:761
+#. i18n: file ./dialogs/actionconfigdialogs.ui line 671
+#: rc.cpp:1024
 #, no-c-format
-msgid "Show empt&y nodes and groups"
+msgid "Message window"
 msgstr ""
 
-#. i18n: file ./dialogs/settings/parseroptionsui.ui line 136
-#: rc.cpp:764
+#. i18n: file ./dialogs/actionconfigdialogs.ui line 702
+#: rc.cpp:1027
 #, no-c-format
-msgid "Set to 0 in order to expand the whole tree"
-msgstr ""
+msgid "&Error:"
+msgstr "&Gwall :"
 
-#. i18n: file ./dialogs/settings/parseroptionsui.ui line 144
-#: rc.cpp:767
+#. i18n: file ./dialogs/loadentitydlgs.ui line 27
+#: rc.cpp:1030
 #, no-c-format
-msgid "Refresh frequency (in seconds):"
+msgid "Source DTD:"
 msgstr ""
 
-#. i18n: file ./dialogs/settings/parseroptionsui.ui line 152
-#: rc.cpp:770
+#. i18n: file ./dialogs/loadentitydlgs.ui line 35
+#: rc.cpp:1033
 #, no-c-format
-msgid "Expand tree when reparse to level:"
+msgid "Target DTEP:"
 msgstr ""
 
-#. i18n: file ./dialogs/settings/parseroptionsui.ui line 162
-#: rc.cpp:773
-#, no-c-format
-msgid "Clicks on Structure Tree Items"
-msgstr ""
+#. i18n: file ./dialogs/loadentitydlgs.ui line 43
+#: rc.cpp:1036 src/dtds.cpp:904
+#, fuzzy, no-c-format
+msgid "*.dtd|DTD Definitions"
+msgstr "Disgrifiad"
 
-#. i18n: file ./dialogs/settings/parseroptionsui.ui line 174
-#: dialogs/settings/parseroptions.cpp:37 dialogs/settings/parseroptions.cpp:55
-#: dialogs/settings/parseroptions.cpp:58 rc.cpp:779 rc.cpp:815
-#: treeviews/structtreeview.cpp:111 treeviews/structtreeview.cpp:486
-#: treeviews/structtreeview.cpp:488 treeviews/structtreeview.cpp:531
+#. i18n: file ./dialogs/donationdialog.ui line 33
+#: rc.cpp:1039
 #, no-c-format
-msgid "Select Tag Area"
+msgid "Support Quanta with Financial Donation"
 msgstr ""
 
-#. i18n: file ./dialogs/settings/parseroptionsui.ui line 179
-#: dialogs/settings/parseroptions.cpp:35 dialogs/settings/parseroptions.cpp:56
-#: rc.cpp:782 rc.cpp:818
-#, no-c-format
-msgid "Nothing"
-msgstr "Dim"
-
-#. i18n: file ./dialogs/settings/parseroptionsui.ui line 189
-#: dialogs/settings/parseroptions.cpp:53 rc.cpp:785 rc.cpp:809
+#. i18n: file ./dialogs/donationdialog.ui line 76
+#: rc.cpp:1045
 #, no-c-format
-msgid "Find Tag"
+msgid ""
+"<div align=\"center\">"
+"<h2>Your Contribution Can Make a Difference</h2></div>"
+"&nbsp;&nbsp;&nbsp;Quanta Plus would not be what it is today without sponsored "
+"developers. Andras Mantia has been full time since mid 2002 and Michal Rudolf "
+"came on part time in spring of 2004. Over the life of the project development "
+"has been largely sponsored by the efforts of the Project Manager, Eric Laffoon. "
+"In addition to his minimum 10-20 hour a week time commitment, his company, <a "
+"href=\"http://kittyhooch.com\" target=\"_blank\">Kitty Hooch</a> "
+"LLP has an ongoing financial commitment to keep Quanta in continuous "
+"development. Our sponsored developers are also a catalyst to our volunteer "
+"developers.\n"
+"<br>&nbsp;&nbsp;&nbsp;&nbsp;Kitty Hooch is a small company with no employees, 2 "
+"active partners and several contract workers. After test marketing in the fall "
+"of 2001 they began wholesale and retail to national and international markets "
+"in early 2002. Kitty Hooch controls all aspects of their product production and "
+"marketing. Quanta sponsorship is no small expense for a small start up company. "
+"In 2003 cash flow and a bout with typhoid fever left Eric in debt and unable to "
+"keep up payments to Andras without help from the community. Thankfully a number "
+"of people stepped up. We now have several large sponsors along with a number of "
+"generous contributors. This has enabled us to bring Michal on part time. Now we "
+"are looking to be able to move him to full time. The challenge for this project "
+"to assume a leading role as a \"killer desktop application\" is great.\n"
+"<div align=\"center\">"
+"<h3>Balancing open source ideals and fiscal\n"
+"reality</h3></div>\n"
+"&nbsp;&nbsp;&nbsp;&nbsp;We believe that the open source model\n"
+"is the future of software, but it is no guarantee of success. How many open "
+"source projects that we had high hopes for are unmaintained today? In early "
+"2002 many people thought that Quanta Plus was dead. One person, Eric Laffoon, "
+"was not about to let the dream die. Quanta is more than surviving now, but "
+"developing a best-in-class tool is no easy task. We believe the key is "
+"consistent momentum. Nothing ensures this better than programmers who can work "
+"without financial or time distractions. Why do you think OSS projects die?"
+"<br>&nbsp;&nbsp;&nbsp;&nbsp;As Quanta grows the project management demands are "
+"increasing and ironically impacting the revenue stream it requires to continue. "
+"The impact of our sponsored developers has been huge! We are looking to make "
+"Quanta grow even faster. Eric needs to be able to free even more time to bring "
+"several new and exciting ideas through coding to release. We have other "
+"expenses too, with conferences and keeping our systems up to date so we don't "
+"lose time fighting old hardware. <i>We want to make Quanta the best web tool "
+"anywhere!</i>. This will require a nucleus of active core developers. We hope "
+"professional developers and companies using Quanta will help us to reach our "
+"goals with sponsorship donations that will relieve financial stresses.\n"
+"<div align=\"center\">"
+"<h3>Could Quanta die without your support?</h3></div>"
+"&nbsp;&nbsp;&nbsp;&nbsp;We'd like to think not! But from February 2001 to June "
+"2002 there was very little activity and many months with no work done at all. "
+"This came about because of cash flow problems which led to the original "
+"developers leaving to do a commercial project. The fact remains that our most "
+"productive volunteer developers, as much as we think they're wonderful, go long "
+"periods where they just can't make time to code on the project. We estimate our "
+"active users number well over a million, yet we have only a few dozen people a "
+"year supporting the project. In fact 3-4 people account for over half of our "
+"current support. Clearly the actions of a few people make a huge difference, "
+"and yours can make a difference too.\n"
+"<br><div align=\"center\">"
+"<h3>Will you help make a difference?</h3></div>\n"
+"&nbsp;&nbsp;&nbsp;&nbsp;If you wish to donate through PayPal\n"
+"(online money transfer or credit card), visit our <a "
+"href=\"http://kdewebdev.org/donate.php\">donation page</a>.\n"
+"<br>&nbsp;&nbsp;&nbsp;&nbsp;If you are outside the PayPal area or wish to "
+"discuss corporate sponsorship contact the project manager:"
+"<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Eric Laffoon, <a "
+"href=\"mailto:sequitur@kde.org?subject=Quanta%20sponsorship%20inquiry\">"
+"sequitur@kde.org</a>"
 msgstr ""
 
-#. i18n: file ./dialogs/settings/parseroptionsui.ui line 194
-#: dialogs/settings/parseroptions.cpp:34 dialogs/settings/parseroptions.cpp:43
-#: dialogs/settings/parseroptions.cpp:52 rc.cpp:788 rc.cpp:806
+#. i18n: file ./dialogs/donationdialog.ui line 136
+#: rc.cpp:1058
 #, no-c-format
-msgid "Find Tag & Open Tree"
+msgid ""
+"<a href=\"http://kdewebdev.org/donate.php\">Donate</a> through  PayPal now."
 msgstr ""
 
-#. i18n: file ./dialogs/settings/parseroptionsui.ui line 206
-#: rc.cpp:791
-#, no-c-format
-msgid "Left button:"
-msgstr "Botwm chwith:"
-
-#. i18n: file ./dialogs/settings/parseroptionsui.ui line 212
-#: dialogs/settings/parseroptions.cpp:36 rc.cpp:794
+#. i18n: file ./dialogs/dtdselectdialog.ui line 31
+#: rc.cpp:1061 src/document.cpp:2931 src/quanta.cpp:3053
 #, no-c-format
-msgid "Popup Menu"
+msgid "DTD Selector"
 msgstr ""
 
-#. i18n: file ./dialogs/settings/parseroptionsui.ui line 224
-#: rc.cpp:797
+#. i18n: file ./dialogs/dtdselectdialog.ui line 43
+#: rc.cpp:1064
 #, no-c-format
-msgid "Double click:"
+msgid ""
+"Dialog message:\n"
+"Dialog message2:"
 msgstr ""
 
-#. i18n: file ./dialogs/settings/parseroptionsui.ui line 232
-#: rc.cpp:800
-#, no-c-format
-msgid "Middle button:"
-msgstr "Botwm canol:"
-
-#. i18n: file ./dialogs/settings/parseroptionsui.ui line 240
-#: rc.cpp:803
-#, no-c-format
-msgid "Right button:"
-msgstr "Botwm de:"
-
-#. i18n: file ./dialogs/settings/parseroptionsui.ui line 256
-#: dialogs/settings/parseroptions.cpp:54 rc.cpp:812
-#: treeviews/structtreeview.cpp:112 treeviews/structtreeview.cpp:534
+#. i18n: file ./dialogs/dtdselectdialog.ui line 62
+#: rc.cpp:1068
 #, no-c-format
-msgid "Go to End of Tag"
+msgid "Current DTD:"
 msgstr ""
 
-#. i18n: file ./dialogs/casewidget.ui line 30
-#: rc.cpp:821
+#. i18n: file ./dialogs/dtdselectdialog.ui line 70
+#: rc.cpp:1071
 #, no-c-format
-msgid "Tag Case"
+msgid "Select DTD:"
 msgstr ""
 
-#. i18n: file ./dialogs/casewidget.ui line 41
-#: rc.cpp:824 rc.cpp:836
-#, no-c-format
-msgid "Upper case"
-msgstr "Priflythrennau"
-
-#. i18n: file ./dialogs/casewidget.ui line 49
-#: rc.cpp:827 rc.cpp:839
-#, no-c-format
-msgid "Lower case"
-msgstr "Is-lythrennau"
-
-#. i18n: file ./dialogs/casewidget.ui line 57
-#: rc.cpp:830 rc.cpp:842
+#. i18n: file ./dialogs/dtdselectdialog.ui line 86
+#: rc.cpp:1074
 #, no-c-format
-msgid "Unchanged"
+msgid "Conver&t the document to the selected DTD"
 msgstr ""
 
-#. i18n: file ./dialogs/casewidget.ui line 70
-#: rc.cpp:833
+#. i18n: file ./dialogs/dtdselectdialog.ui line 94
+#: rc.cpp:1077
 #, no-c-format
-msgid "Attribute Case"
+msgid "Do not show this dialog, use the closest matching DTD"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 25
-#: parsers/dtd/dtdparser.cpp:179 rc.cpp:845 src/quanta.cpp:3108
+#: parsers/dtd/dtdparser.cpp:179 rc.cpp:1080 src/quanta.cpp:3108
 #, fuzzy, no-c-format
 msgid "Configure DTEP"
 msgstr "Ffurfweddu..."
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 40
-#: rc.cpp:848 rc.cpp:1968 rc.cpp:2141
+#: rc.cpp:1083 rc.cpp:1979 rc.cpp:2105
 #, no-c-format
 msgid "&General"
 msgstr "&Cyffredinol"
 
-#. i18n: file ./dialogs/dtepeditdlgs.ui line 59
-#: ../lib/compatibility/knewstuff/uploaddialog.cpp:57 rc.cpp:851 rc.cpp:2449
-#: rc.cpp:2497 rc.cpp:2928
-#, no-c-format
-msgid "Name:"
-msgstr "Enw:"
-
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 65
-#: rc.cpp:854 rc.cpp:869
+#: rc.cpp:1089 rc.cpp:1104
 #, no-c-format
 msgid "DTD definition string"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 68
-#: rc.cpp:857 rc.cpp:872
+#: rc.cpp:1092 rc.cpp:1107
 #, no-c-format
 msgid ""
 "The real name of the DTEP. In case of XML DTEPs this should be the DTD "
@@ -1518,44 +1901,44 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 84
-#: rc.cpp:860
+#: rc.cpp:1095
 #, fuzzy, no-c-format
 msgid "Short name:"
 msgstr "Enw'r grwp:"
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 90
-#: rc.cpp:863 rc.cpp:875
+#: rc.cpp:1098 rc.cpp:1110
 #, no-c-format
 msgid "Beautified, user visible name"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 93
-#: rc.cpp:866 rc.cpp:878
+#: rc.cpp:1101 rc.cpp:1113
 #, no-c-format
 msgid ""
 "The user visible, beautified name. If not defined, the real name is used."
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 173
-#: rc.cpp:881
+#: rc.cpp:1116
 #, no-c-format
 msgid "Type Specific Settings"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 199
-#: rc.cpp:884
+#: rc.cpp:1119
 #, no-c-format
 msgid "URL:"
 msgstr "URL:"
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 205
-#: rc.cpp:887 rc.cpp:903
+#: rc.cpp:1122 rc.cpp:1138
 #, no-c-format
 msgid "URL pointing to the DTD definiton file"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 208
-#: rc.cpp:890 rc.cpp:906
+#: rc.cpp:1125 rc.cpp:1141
 #, no-c-format
 msgid ""
 "URL pointing to the DTD definiton file, like "
@@ -1563,19 +1946,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 216
-#: rc.cpp:893
+#: rc.cpp:1128
 #, no-c-format
 msgid "DOCT&YPE string:"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 222
-#: rc.cpp:896 rc.cpp:909
+#: rc.cpp:1131 rc.cpp:1144
 #, no-c-format
 msgid "The string that should appear in the !DOCTYPE tag"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 226
-#: rc.cpp:899 rc.cpp:912
+#: rc.cpp:1134 rc.cpp:1147
 #, no-c-format
 msgid ""
 "The string that should appear in the !DOCTYPE tag, like"
@@ -1586,19 +1969,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 274
-#: rc.cpp:916
+#: rc.cpp:1151
 #, no-c-format
 msgid "Top level"
 msgstr "Lefel Uchaf"
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 277
-#: rc.cpp:919
+#: rc.cpp:1154
 #, no-c-format
 msgid "Check if the DTEP can act as a top level DTEP."
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 280
-#: rc.cpp:922
+#: rc.cpp:1157
 #, no-c-format
 msgid ""
 "Check if the DTEP can act as a top level DTEP. This means that the document can "
@@ -1608,19 +1991,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 292
-#: rc.cpp:925
+#: rc.cpp:1160
 #, fuzzy, no-c-format
 msgid "Toolbar folder:"
 msgstr "Dewislen Bar Offer"
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 298
-#: rc.cpp:928 rc.cpp:934
+#: rc.cpp:1163 rc.cpp:1169
 #, no-c-format
 msgid "The name of the folder where the toolbars are stored"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 301
-#: rc.cpp:931 rc.cpp:937
+#: rc.cpp:1166 rc.cpp:1172
 #, no-c-format
 msgid ""
 "The name of the folder where the toolbars are stored. This is a relative name "
@@ -1629,19 +2012,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 320
-#: rc.cpp:940
+#: rc.cpp:1175
 #, fuzzy, no-c-format
 msgid "&Autoloaded toolbars:"
 msgstr "&Lanlwytho"
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 326
-#: rc.cpp:943 rc.cpp:949
+#: rc.cpp:1178 rc.cpp:1184
 #, no-c-format
 msgid "Comma separated list of toolbars"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 329
-#: rc.cpp:946 rc.cpp:952
+#: rc.cpp:1181 rc.cpp:1187
 #, no-c-format
 msgid ""
 "Comma separated list of toolbars from the toolbar folder that will be loaded "
@@ -1649,39 +2032,33 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 356
-#: rc.cpp:955
+#: rc.cpp:1190
 #, no-c-format
 msgid "Case sensitive"
 msgstr "Llythrennau mawr/bach o bwys"
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 362
-#: rc.cpp:958
+#: rc.cpp:1193
 #, no-c-format
 msgid "Check if the DTEP has case sensitive tags"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 365
-#: rc.cpp:961
+#: rc.cpp:1196
 #, no-c-format
 msgid ""
 "Indicates whether the DTEP has case sensitive tags. In case of XML this should "
 "be checked, but for example HTML variants are not case sensitive."
 msgstr ""
 
-#. i18n: file ./dialogs/dtepeditdlgs.ui line 381
-#: rc.cpp:964 rc.cpp:2446
-#, no-c-format
-msgid "Type:"
-msgstr "Math:"
-
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 384
-#: rc.cpp:967 rc.cpp:989
+#: rc.cpp:1202 rc.cpp:1224
 #, no-c-format
 msgid "The family to where this DTEP belongs."
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 388
-#: rc.cpp:970 rc.cpp:992
+#: rc.cpp:1205 rc.cpp:1227
 #, no-c-format
 msgid ""
 "The family to where this DTEP belong. There are two families:"
@@ -1692,19 +2069,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 396
-#: rc.cpp:974
+#: rc.cpp:1209
 #, fuzzy, no-c-format
 msgid "Inherits:"
 msgstr "&Gwrthdroi"
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 399
-#: rc.cpp:977 rc.cpp:999
+#: rc.cpp:1212 rc.cpp:1234
 #, no-c-format
 msgid "The DTEP name from where this DTEP inherits the tags."
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 402
-#: rc.cpp:980 rc.cpp:1002
+#: rc.cpp:1215 rc.cpp:1237
 #, no-c-format
 msgid ""
 "The real name of the DTEP (like "
@@ -1713,31 +2090,31 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 408
-#: rc.cpp:983
+#: rc.cpp:1218
 #, fuzzy, no-c-format
 msgid "XML Style"
 msgstr "Ffeil cofnod:"
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 413
-#: rc.cpp:986
+#: rc.cpp:1221
 #, fuzzy, no-c-format
 msgid "Pseudo Type"
 msgstr "Math"
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 440
-#: rc.cpp:996
+#: rc.cpp:1231
 #, fuzzy, no-c-format
 msgid "Mimet&ypes:"
 msgstr "Mathau MIME"
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 473
-#: rc.cpp:1005
+#: rc.cpp:1240
 #, no-c-format
 msgid "Comma separated list of mimetypes"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 476
-#: rc.cpp:1008
+#: rc.cpp:1243
 #, no-c-format
 msgid ""
 "Comma separated list of mimetypes. Files of these types are treated as "
@@ -1745,52 +2122,59 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 484
-#: rc.cpp:1011
+#: rc.cpp:1246
 #, no-c-format
 msgid "The default extension of files belonging to this DTEP"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 492
-#: rc.cpp:1014
+#: rc.cpp:1249
 #, no-c-format
 msgid "E&xtension:"
 msgstr "E&styniad:"
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 522
-#: rc.cpp:1017
+#: rc.cpp:1252
 #, no-c-format
 msgid "P&ages"
 msgstr "T&udalennau"
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 550
-#: rc.cpp:1020
+#: rc.cpp:1255
 #, no-c-format
 msgid "Enable the first extra page"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 553
-#: rc.cpp:1023
+#: rc.cpp:1258
 #, no-c-format
 msgid ""
 "Every tab edit dialog will have one more extra page aside of the main page"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 556
-#: rc.cpp:1026
+#: rc.cpp:1261
 #, no-c-format
 msgid ""
 "Every tab edit dialog will have one more extra page aside of the main page. You "
 "can configure what will be on this page in the below fields."
 msgstr ""
 
+#. i18n: file ./dialogs/dtepeditdlgs.ui line 567
+#: rc.cpp:1264 rc.cpp:1340 rc.cpp:1346 rc.cpp:1358 rc.cpp:1373 rc.cpp:1764
+#: rc.cpp:1890 rc.cpp:4118
+#, no-c-format
+msgid "Title:"
+msgstr "Teitl:"
+
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 570
-#: rc.cpp:1032 rc.cpp:1076
+#: rc.cpp:1267 rc.cpp:1311
 #, fuzzy, no-c-format
 msgid "The title of the page"
 msgstr "Aw&grymiad y Dydd"
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 573
-#: rc.cpp:1035 rc.cpp:1079
+#: rc.cpp:1270 rc.cpp:1314
 #, no-c-format
 msgid ""
 "The title of the page, like <b>Core && i18n</b>. As you see, the ampersand must "
@@ -1798,19 +2182,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 584
-#: rc.cpp:1038 rc.cpp:1096 rc.cpp:1117 rc.cpp:1129 rc.cpp:1147
+#: rc.cpp:1273 rc.cpp:1331 rc.cpp:1352 rc.cpp:1364 rc.cpp:1382
 #, no-c-format
 msgid "Groups:"
 msgstr "Grwpiau:"
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 587
-#: rc.cpp:1041 rc.cpp:1082
+#: rc.cpp:1276 rc.cpp:1317
 #, no-c-format
 msgid "Comma separated list of the common attribute groups"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 595
-#: rc.cpp:1044 rc.cpp:1085
+#: rc.cpp:1279 rc.cpp:1320
 #, no-c-format
 msgid ""
 "Comma separated list of the common attribute groups. The attributes from the "
@@ -1831,64 +2215,64 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 606
-#: rc.cpp:1052
+#: rc.cpp:1287
 #, no-c-format
 msgid "Enable the second extra page"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 609
-#: rc.cpp:1055 rc.cpp:1061 rc.cpp:1067 rc.cpp:1073
+#: rc.cpp:1290 rc.cpp:1296 rc.cpp:1302 rc.cpp:1308
 #, no-c-format
 msgid "See the tooltip and \"What's This?\" information for the first checkbox"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 620
-#: rc.cpp:1058
+#: rc.cpp:1293
 #, no-c-format
 msgid "Enable the third extra page"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 634
-#: rc.cpp:1064
+#: rc.cpp:1299
 #, no-c-format
 msgid "Enable the fourth extra page"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 648
-#: rc.cpp:1070
+#: rc.cpp:1305
 #, no-c-format
 msgid "Enable the fifth extra page"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 695
-#: rc.cpp:1093 rc.cpp:1099 rc.cpp:1102 rc.cpp:1108 rc.cpp:1114 rc.cpp:1120
-#: rc.cpp:1126 rc.cpp:1132 rc.cpp:1135 rc.cpp:1141 rc.cpp:1144 rc.cpp:1150
-#: rc.cpp:1153 rc.cpp:1156 rc.cpp:1159 rc.cpp:1162
+#: rc.cpp:1328 rc.cpp:1334 rc.cpp:1337 rc.cpp:1343 rc.cpp:1349 rc.cpp:1355
+#: rc.cpp:1361 rc.cpp:1367 rc.cpp:1370 rc.cpp:1376 rc.cpp:1379 rc.cpp:1385
+#: rc.cpp:1388 rc.cpp:1391 rc.cpp:1394 rc.cpp:1397
 #, no-c-format
 msgid ""
 "See the tooltip and \"What's This?\" information for the first page fields"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 894
-#: rc.cpp:1165
+#: rc.cpp:1400
 #, no-c-format
 msgid "Parsing &Rules"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 905
-#: rc.cpp:1168
+#: rc.cpp:1403
 #, no-c-format
 msgid "Enable minus in words"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 908
-#: rc.cpp:1171
+#: rc.cpp:1406
 #, no-c-format
 msgid "Treat the minus sign as part of a word"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 911
-#: rc.cpp:1174
+#: rc.cpp:1409
 #, no-c-format
 msgid ""
 "If enabled <b>this-is-a-word</b> is treated like a word. Otherwise it is "
@@ -1896,19 +2280,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 919
-#: rc.cpp:1177
+#: rc.cpp:1412
 #, no-c-format
 msgid "Comments:"
 msgstr "Sylwadau :"
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 925
-#: rc.cpp:1180 rc.cpp:1444
+#: rc.cpp:1415 rc.cpp:1679
 #, no-c-format
 msgid "Comma separated list of area borders for comments"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 929
-#: rc.cpp:1183 rc.cpp:1447
+#: rc.cpp:1418 rc.cpp:1682
 #, no-c-format
 msgid ""
 "Comma separated list of area borders for comments. <i>EOL</i> "
@@ -1918,25 +2302,25 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 945
-#: rc.cpp:1187
+#: rc.cpp:1422
 #, no-c-format
 msgid "Type Specific Rules"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 971
-#: rc.cpp:1190
+#: rc.cpp:1425
 #, no-c-format
 msgid "XML style single tags"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 977
-#: rc.cpp:1193
+#: rc.cpp:1428
 #, no-c-format
 msgid "Check to use XML style single tags"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 980
-#: rc.cpp:1196
+#: rc.cpp:1431
 #, no-c-format
 msgid ""
 "Check to use XML style single tags (<b>&lt;single_tag /&gt;</b>"
@@ -1944,19 +2328,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 988
-#: rc.cpp:1199
+#: rc.cpp:1434
 #, no-c-format
 msgid "Use common rules"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 994
-#: rc.cpp:1202
+#: rc.cpp:1437
 #, no-c-format
 msgid "Append common parsing rules"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1002
-#: rc.cpp:1205
+#: rc.cpp:1440
 #, no-c-format
 msgid ""
 "Check it to append common parsing rules. These are:\n"
@@ -1968,19 +2352,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1010
-#: rc.cpp:1213
+#: rc.cpp:1448
 #, no-c-format
 msgid "Extended booleans"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1013
-#: rc.cpp:1216
+#: rc.cpp:1451
 #, no-c-format
 msgid "Check if the booleans are stored in extended form"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1021
-#: rc.cpp:1219
+#: rc.cpp:1454
 #, no-c-format
 msgid ""
 "Check if you want extended booleans in the language."
@@ -1997,32 +2381,32 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1040
-#: rc.cpp:1227 rc.cpp:1230
+#: rc.cpp:1462 rc.cpp:1465
 #, no-c-format
 msgid "The value of \"true\" in case of extended booleans"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1070
-#: rc.cpp:1233
+#: rc.cpp:1468
 #, no-c-format
 msgid "False:"
 msgstr "Ffug :"
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1084
-#: rc.cpp:1236
+#: rc.cpp:1471
 #, no-c-format
 msgid "True:"
 msgstr "Gwir :"
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1112
-#: rc.cpp:1239 rc.cpp:1250
+#: rc.cpp:1474 rc.cpp:1485
 #, no-c-format
 msgid ""
 "Comma separated list of the beginning and closing string for special areas"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1117
-#: rc.cpp:1242 rc.cpp:1253
+#: rc.cpp:1477 rc.cpp:1488
 #, no-c-format
 msgid ""
 "The beginning and closing string of special areas, separated by a comma."
@@ -2035,37 +2419,37 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1125
-#: rc.cpp:1247
+#: rc.cpp:1482
 #, fuzzy, no-c-format
 msgid "Special areas:"
 msgstr "Pennawd"
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1144
-#: rc.cpp:1258 rc.cpp:1264
+#: rc.cpp:1493 rc.cpp:1499
 #, no-c-format
 msgid "Comma-separated list of the names for the above-defined special areas"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1152
-#: rc.cpp:1261
+#: rc.cpp:1496
 #, fuzzy, no-c-format
 msgid "Special area names:"
 msgstr "Enw'r ffeil:"
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1166
-#: rc.cpp:1267
+#: rc.cpp:1502
 #, no-c-format
 msgid "Special tags:"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1169
-#: rc.cpp:1270 rc.cpp:1277
+#: rc.cpp:1505 rc.cpp:1512
 #, no-c-format
 msgid "Specifies a tag that defines the start of a special area"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1173
-#: rc.cpp:1273 rc.cpp:1280
+#: rc.cpp:1508 rc.cpp:1515
 #, no-c-format
 msgid ""
 "Specifies a tag which defines the start of a special area in the form of <i>"
@@ -2076,19 +2460,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1206
-#: rc.cpp:1284
+#: rc.cpp:1519
 #, fuzzy, no-c-format
 msgid "Definition tags:"
 msgstr "Mynegiant"
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1212
-#: rc.cpp:1287 rc.cpp:1355
+#: rc.cpp:1522 rc.cpp:1590
 #, no-c-format
 msgid "Tags and attributes defining this DTEP"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1219
-#: rc.cpp:1290 rc.cpp:1358
+#: rc.cpp:1525 rc.cpp:1593
 #, no-c-format
 msgid ""
 "Comma separated list of tags that define this DTEP. The format used is <i>"
@@ -2107,19 +2491,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1227
-#: rc.cpp:1297
+#: rc.cpp:1532
 #, fuzzy, no-c-format
 msgid "Area borders:"
 msgstr "Ymyl:"
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1233
-#: rc.cpp:1300 rc.cpp:1365
+#: rc.cpp:1535 rc.cpp:1600
 #, no-c-format
 msgid "Comma separated list of the area borders"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1237
-#: rc.cpp:1303 rc.cpp:1368
+#: rc.cpp:1538 rc.cpp:1603
 #, no-c-format
 msgid ""
 "Comma separated list of the area borders encapsulating this pseudo DTEP. In the "
@@ -2129,19 +2513,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1245
-#: rc.cpp:1307
+#: rc.cpp:1542
 #, no-c-format
 msgid "Structure keywords:"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1251
-#: rc.cpp:1310 rc.cpp:1349
+#: rc.cpp:1545 rc.cpp:1584
 #, no-c-format
 msgid "Comma separated list of structure keywords"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1254
-#: rc.cpp:1313 rc.cpp:1352
+#: rc.cpp:1548 rc.cpp:1587
 #, no-c-format
 msgid ""
 "Comma separated list of structure keywords. The keywords used here are used to "
@@ -2150,19 +2534,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1262
-#: rc.cpp:1316
+#: rc.cpp:1551
 #, no-c-format
 msgid "Structure delimiting:"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1268
-#: rc.cpp:1319 rc.cpp:1429
+#: rc.cpp:1554 rc.cpp:1664
 #, no-c-format
 msgid "Regular expression that finds the beginning or end of a structure"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1271
-#: rc.cpp:1322 rc.cpp:1432
+#: rc.cpp:1557 rc.cpp:1667
 #, no-c-format
 msgid ""
 "Regular expression that finds the beginning or end of a structure. This is "
@@ -2171,38 +2555,38 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1279
-#: rc.cpp:1325
+#: rc.cpp:1560
 #, no-c-format
 msgid "Structure beginning:"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1285
-#: rc.cpp:1328 rc.cpp:1387
+#: rc.cpp:1563 rc.cpp:1622
 #, no-c-format
 msgid "A string specifying the beginning of a structure"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1288
-#: rc.cpp:1331 rc.cpp:1390
+#: rc.cpp:1566 rc.cpp:1625
 #, no-c-format
 msgid ""
 "A string specifying the beginning of a structure, like <b>{</b> in many cases."
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1296
-#: rc.cpp:1334
+#: rc.cpp:1569
 #, no-c-format
 msgid "Local scope keywords:"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1302
-#: rc.cpp:1337 rc.cpp:1343
+#: rc.cpp:1572 rc.cpp:1578
 #, no-c-format
 msgid "Comma separated list of the local scope defining keywords"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1305
-#: rc.cpp:1340 rc.cpp:1346
+#: rc.cpp:1575 rc.cpp:1581
 #, no-c-format
 msgid ""
 "Comma separated list of the local scope defining keywords. Other structure "
@@ -2213,38 +2597,38 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1362
-#: rc.cpp:1372 rc.cpp:1381
+#: rc.cpp:1607 rc.cpp:1616
 #, no-c-format
 msgid "A string specifying the end of a structure"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1365
-#: rc.cpp:1375 rc.cpp:1384
+#: rc.cpp:1610 rc.cpp:1619
 #, no-c-format
 msgid ""
 "A string specifying the end of a structure, like <b>}</b> in many cases."
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1373
-#: rc.cpp:1378
+#: rc.cpp:1613
 #, fuzzy, no-c-format
 msgid "Structure end:"
 msgstr "Strwythur Dogfen"
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1409
-#: rc.cpp:1393
+#: rc.cpp:1628
 #, no-c-format
 msgid "Complete class members after:"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1415
-#: rc.cpp:1396 rc.cpp:1417
+#: rc.cpp:1631 rc.cpp:1652
 #, no-c-format
 msgid "Regular expression to find out when to invoke member autocompletion"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1424
-#: rc.cpp:1399
+#: rc.cpp:1634
 #, no-c-format
 msgid ""
 "Regular expression to find out when to invoke member autocompletion. "
@@ -2264,13 +2648,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1440
-#: rc.cpp:1408
+#: rc.cpp:1643
 #, no-c-format
 msgid "Complete attributes after:"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1446
-#: rc.cpp:1411 rc.cpp:1414
+#: rc.cpp:1646 rc.cpp:1649
 #, no-c-format
 msgid ""
 "Autocomplete attributes after this character. See the information for the same "
@@ -2278,7 +2662,7 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1471
-#: rc.cpp:1420
+#: rc.cpp:1655
 #, no-c-format
 msgid ""
 "Regular expression to find out when to invoke member autocompletion. "
@@ -2298,19 +2682,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1495
-#: rc.cpp:1435
+#: rc.cpp:1670
 #, fuzzy, no-c-format
 msgid "Attribute separator:"
 msgstr "Priodweddion"
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1501
-#: rc.cpp:1438 rc.cpp:1484
+#: rc.cpp:1673 rc.cpp:1719
 #, no-c-format
 msgid "The character specifying the end of an attribute"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1504
-#: rc.cpp:1441 rc.cpp:1487
+#: rc.cpp:1676 rc.cpp:1722
 #, no-c-format
 msgid ""
 "The character specifying the end of an attribute. By default it is <b>\"</b> "
@@ -2318,19 +2702,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1524
-#: rc.cpp:1451
+#: rc.cpp:1686
 #, no-c-format
 msgid "Included DTEPs:"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1530
-#: rc.cpp:1454 rc.cpp:1490
+#: rc.cpp:1689 rc.cpp:1725
 #, no-c-format
 msgid "Comma-separated list of DTEPs that can be present inside this DTEP"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1533
-#: rc.cpp:1457 rc.cpp:1493
+#: rc.cpp:1692 rc.cpp:1728
 #, no-c-format
 msgid ""
 "Comma-separated list of DTEPs that can be present inside this DTEP. The list "
@@ -2338,19 +2722,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1541
-#: rc.cpp:1460
+#: rc.cpp:1695
 #, no-c-format
 msgid "Autocomplete tags after:"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1547
-#: rc.cpp:1463 rc.cpp:1469
+#: rc.cpp:1698 rc.cpp:1704
 #, no-c-format
 msgid "The character after which the list of tags should be shown"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1550
-#: rc.cpp:1466
+#: rc.cpp:1701
 #, no-c-format
 msgid ""
 "The autocompletion box is brought up automatically once this character is "
@@ -2362,7 +2746,7 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1561
-#: rc.cpp:1472
+#: rc.cpp:1707
 #, no-c-format
 msgid ""
 "The autocompletion box is brought up automatically once this character is "
@@ -2374,7 +2758,7 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1577
-#: rc.cpp:1475 rc.cpp:1481
+#: rc.cpp:1710 rc.cpp:1716
 #, no-c-format
 msgid ""
 "The character specifying the end of a tag. See the information for the "
@@ -2382,588 +2766,551 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1585
-#: rc.cpp:1478
+#: rc.cpp:1713
 #, no-c-format
 msgid "Tag separator:"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1623
-#: rc.cpp:1496
+#: rc.cpp:1731
 #, no-c-format
 msgid "Structures"
 msgstr "Adeileddau"
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1634
-#: rc.cpp:1499
+#: rc.cpp:1734
 #, no-c-format
 msgid "Available groups:"
 msgstr ""
 
-#. i18n: file ./dialogs/dtdselectdialog.ui line 31
-#: rc.cpp:1511 src/document.cpp:2931 src/quanta.cpp:3053
-#, no-c-format
-msgid "DTD Selector"
-msgstr ""
-
-#. i18n: file ./dialogs/dtdselectdialog.ui line 43
-#: rc.cpp:1514
-#, no-c-format
-msgid ""
-"Dialog message:\n"
-"Dialog message2:"
-msgstr ""
-
-#. i18n: file ./dialogs/dtdselectdialog.ui line 62
-#: rc.cpp:1518
-#, no-c-format
-msgid "Current DTD:"
-msgstr ""
-
-#. i18n: file ./dialogs/dtdselectdialog.ui line 70
-#: rc.cpp:1521
-#, no-c-format
-msgid "Select DTD:"
-msgstr ""
-
-#. i18n: file ./dialogs/dtdselectdialog.ui line 86
-#: rc.cpp:1524
-#, no-c-format
-msgid "Conver&t the document to the selected DTD"
-msgstr ""
-
-#. i18n: file ./dialogs/dtdselectdialog.ui line 94
-#: rc.cpp:1527
-#, no-c-format
-msgid "Do not show this dialog, use the closest matching DTD"
-msgstr ""
-
-#. i18n: file ./parts/kafka/kafkasyncoptionsui.ui line 24
-#: rc.cpp:1530
-#, no-c-format
-msgid "Dual Views Mode Synchronization"
-msgstr ""
-
-#. i18n: file ./parts/kafka/kafkasyncoptionsui.ui line 66
-#: rc.cpp:1533 rc.cpp:1542
-#, no-c-format
-msgid "ms"
-msgstr "ms"
-
-#. i18n: file ./parts/kafka/kafkasyncoptionsui.ui line 85
-#: rc.cpp:1536
-#, no-c-format
-msgid "Refresh the VPL editor on click"
-msgstr ""
-
-#. i18n: file ./parts/kafka/kafkasyncoptionsui.ui line 93
-#: rc.cpp:1539
+#. i18n: file ./dialogs/tagdialogs/tagmisc.ui line 31
+#: dialogs/tagdialogs/tagmiscdlg.cpp:23 rc.cpp:1746
 #, no-c-format
-msgid "Refresh the VPL editor every:"
+msgid "Misc. Tag"
 msgstr ""
 
-#. i18n: file ./parts/kafka/kafkasyncoptionsui.ui line 153
-#: rc.cpp:1545
+#. i18n: file ./dialogs/tagdialogs/tagmisc.ui line 47
+#: rc.cpp:1749
 #, no-c-format
-msgid "Refresh the source editor on click"
+msgid "Element name:"
 msgstr ""
 
-#. i18n: file ./parts/kafka/kafkasyncoptionsui.ui line 161
-#: rc.cpp:1548
+#. i18n: file ./dialogs/tagdialogs/tagmisc.ui line 55
+#: rc.cpp:1752
 #, no-c-format
-msgid "Refresh the source editor every:"
+msgid "&Add closing tag"
 msgstr ""
 
-#. i18n: file ./parts/kafka/kafkasyncoptionsui.ui line 190
-#: rc.cpp:1551
+#. i18n: file ./dialogs/tagdialogs/tagmail.ui line 27
+#: rc.cpp:1755
 #, no-c-format
-msgid "Show an icon where scripts are located"
-msgstr ""
+msgid "Email address:"
+msgstr "Cyfeiriad Ebost:"
 
-#. i18n: file ./parts/kafka/htmldocumentpropertiesui.ui line 16
-#: rc.cpp:1554
+#. i18n: file ./dialogs/tagdialogs/tagmail.ui line 67
+#: rc.cpp:1761
 #, no-c-format
-msgid "Document Properties"
-msgstr ""
+msgid "Subject:"
+msgstr "Pwnc:"
 
-#. i18n: file ./parts/kafka/htmldocumentpropertiesui.ui line 25
-#: rc.cpp:1557
+#. i18n: file ./components/framewizard/framewizards.ui line 36
+#: rc.cpp:1773
 #, no-c-format
-msgid "Column 1"
+msgid "Frame Wizard"
 msgstr ""
 
-#. i18n: file ./parts/kafka/htmldocumentpropertiesui.ui line 36
-#: rc.cpp:1560
-#, no-c-format
-msgid "New Item"
-msgstr "Eitem Newydd"
-
-#. i18n: file ./parts/kafka/htmldocumentpropertiesui.ui line 79
-#: rc.cpp:1563
+#. i18n: file ./components/framewizard/framewizards.ui line 184
+#: rc.cpp:1785
 #, no-c-format
-msgid "Current DTD: "
+msgid "Splitting"
 msgstr ""
 
-#. i18n: file ./parts/kafka/htmldocumentpropertiesui.ui line 95
-#: rc.cpp:1566
-#, no-c-format
-msgid "Title: "
-msgstr "Teitl: "
-
-#. i18n: file ./parts/kafka/htmldocumentpropertiesui.ui line 111
-#: rc.cpp:1569
+#. i18n: file ./components/framewizard/framewizards.ui line 244
+#: rc.cpp:1794
 #, no-c-format
-msgid "Link CSS stylesheet:"
+msgid "Editing"
 msgstr ""
 
-#. i18n: file ./parts/kafka/htmldocumentpropertiesui.ui line 127
-#: rc.cpp:1572
+#. i18n: file ./components/framewizard/framewizards.ui line 261
+#: rc.cpp:1797
 #, no-c-format
-msgid "Meta items:"
+msgid "Edit Frame"
 msgstr ""
 
-#. i18n: file ./parts/kafka/htmldocumentpropertiesui.ui line 160
-#: rc.cpp:1575
+#. i18n: file ./components/framewizard/framewizards.ui line 283
+#: rc.cpp:1803 rc.cpp:5180 rc.cpp:5294
 #, no-c-format
-msgid "CSS rules:"
-msgstr ""
+msgid "Reset"
+msgstr "Ailosod"
 
 #. i18n: file ./components/framewizard/fmrceditors.ui line 36
-#: rc.cpp:1599
+#: rc.cpp:1806
 #, no-c-format
 msgid "Rows Columns Editor"
 msgstr ""
 
 #. i18n: file ./components/framewizard/fmfpeditors.ui line 16
-#: rc.cpp:1608
+#: rc.cpp:1815
 #, no-c-format
 msgid "Frame Properties"
 msgstr "Priodweddau Fframiau"
 
 #. i18n: file ./components/framewizard/fmfpeditors.ui line 80
-#: rc.cpp:1617
+#: rc.cpp:1824
 #, no-c-format
 msgid "Common"
 msgstr "Cyffredin"
 
 #. i18n: file ./components/framewizard/fmfpeditors.ui line 132
-#: rc.cpp:1629
+#: rc.cpp:1836
 #, no-c-format
 msgid "Margins"
 msgstr "Ymylon"
 
 #. i18n: file ./components/framewizard/fmfpeditors.ui line 177
-#: rc.cpp:1632
+#: rc.cpp:1839
 #, no-c-format
 msgid "From left:"
 msgstr ""
 
 #. i18n: file ./components/framewizard/fmfpeditors.ui line 185
-#: rc.cpp:1635 rc.cpp:1641
+#: rc.cpp:1842 rc.cpp:1848
 #, no-c-format
 msgid "px"
 msgstr ""
 
 #. i18n: file ./components/framewizard/fmfpeditors.ui line 212
-#: rc.cpp:1638
+#: rc.cpp:1845
 #, no-c-format
 msgid "From top:"
 msgstr ""
 
 #. i18n: file ./components/framewizard/fmfpeditors.ui line 237
-#: rc.cpp:1644
+#: rc.cpp:1851
 #, no-c-format
 msgid "Scrolling"
 msgstr ""
 
 #. i18n: file ./components/framewizard/fmfpeditors.ui line 262
-#: rc.cpp:1650
+#: rc.cpp:1857
 #, no-c-format
 msgid "Auto"
 msgstr "Ymysgogol"
 
 #. i18n: file ./components/framewizard/fmfpeditors.ui line 283
-#: rc.cpp:1656
+#: rc.cpp:1863
 #, no-c-format
 msgid "Resize"
 msgstr "Newid maint"
 
 #. i18n: file ./components/framewizard/fmfpeditors.ui line 352
-#: rc.cpp:1665
+#: rc.cpp:1872
 #, no-c-format
 msgid "Frame source:"
 msgstr ""
 
 #. i18n: file ./components/framewizard/fmfpeditors.ui line 360
-#: rc.cpp:1668
+#: rc.cpp:1875
 #, no-c-format
 msgid "Frame name:"
 msgstr ""
 
 #. i18n: file ./components/framewizard/fmfpeditors.ui line 400
-#: rc.cpp:1671
+#: rc.cpp:1878
 #, no-c-format
 msgid "Others"
 msgstr "Eraill"
 
 #. i18n: file ./components/framewizard/fmfpeditors.ui line 425
-#: rc.cpp:1674
+#: rc.cpp:1881
 #, no-c-format
 msgid "Id:"
 msgstr "Dynodiad (Id) :"
 
 #. i18n: file ./components/framewizard/fmfpeditors.ui line 433
-#: rc.cpp:1677
+#: rc.cpp:1884
 #, no-c-format
 msgid "Class:"
 msgstr "Dosbarth:"
 
 #. i18n: file ./components/framewizard/fmfpeditors.ui line 441
-#: dialogs/tagdialogs/tagquicklistdlgdata.cpp:41 rc.cpp:1680
+#: dialogs/tagdialogs/tagquicklistdlgdata.cpp:41 rc.cpp:1887
 #, no-c-format
 msgid "Style:"
 msgstr "Arddull:"
 
 #. i18n: file ./components/framewizard/fmfpeditors.ui line 457
-#: rc.cpp:1686
+#: rc.cpp:1893
 #, no-c-format
 msgid "Long description:"
 msgstr ""
 
-#. i18n: file ./components/framewizard/framewizards.ui line 36
-#: rc.cpp:1689
+#. i18n: file ./components/debugger/debuggervariablesets.ui line 16
+#: components/debugger/debuggermanager.cpp:267
+#: components/debugger/debuggermanager.cpp:270 rc.cpp:1896
 #, no-c-format
-msgid "Frame Wizard"
+msgid "Set Value of Variable"
 msgstr ""
 
-#. i18n: file ./components/framewizard/framewizards.ui line 184
-#: rc.cpp:1701
+#. i18n: file ./components/debugger/debuggervariablesets.ui line 110
+#: rc.cpp:1905
 #, no-c-format
-msgid "Splitting"
-msgstr ""
+msgid "Variable:"
+msgstr "Newidyn:"
 
-#. i18n: file ./components/framewizard/framewizards.ui line 244
-#: rc.cpp:1710
+#. i18n: file ./components/debugger/debuggervariablesets.ui line 126
+#: components/debugger/variableslistview.cpp:262 rc.cpp:1908
 #, no-c-format
-msgid "Editing"
-msgstr ""
+msgid "New value:"
+msgstr "Gwerth newydd:"
 
-#. i18n: file ./components/framewizard/framewizards.ui line 261
-#: rc.cpp:1713
+#. i18n: file ./components/debugger/pathmapperdialogs.ui line 16
+#: rc.cpp:1911 rc.cpp:1914 rc.cpp:1982 rc.cpp:2134
 #, no-c-format
-msgid "Edit Frame"
+msgid "Directory Mapping"
 msgstr ""
 
-#. i18n: file ./components/framewizard/framewizards.ui line 283
-#: rc.cpp:1719 rc.cpp:5075 rc.cpp:5121
-#, no-c-format
-msgid "Reset"
-msgstr "Ailosod"
-
-#. i18n: file ./components/csseditor/encodingselectors.ui line 16
-#: rc.cpp:1722
+#. i18n: file ./components/debugger/pathmapperdialogs.ui line 49
+#: rc.cpp:1917 rc.cpp:1988 rc.cpp:2140
 #, no-c-format
-msgid "Encoding Selector"
+msgid "Local basedir:"
 msgstr ""
 
-#. i18n: file ./components/csseditor/encodingselectors.ui line 43
-#: rc.cpp:1725
+#. i18n: file ./components/debugger/pathmapperdialogs.ui line 65
+#: rc.cpp:1920 rc.cpp:1985 rc.cpp:2137
 #, no-c-format
-msgid "Select encoding:"
+msgid "Server basedir:"
 msgstr ""
 
-#. i18n: file ./components/csseditor/cssselectors.ui line 16
-#: rc.cpp:1734
+#. i18n: file ./components/debugger/pathmapperdialogs.ui line 74
+#: rc.cpp:1923
 #, no-c-format
-msgid "CSS Selector Dialog"
+msgid ""
+"This is where the local part of path is specified. If a file is located on the "
+"computer running Quanta at \"/home/user/htdocs/project/file.php\" and that file "
+"is located on the server as \"/var/www/project/file.php\", local basedir should "
+"be \"/home/user/htdocs/\" and server basedir should be \"/var/www/\".\n"
+"The quanta will know that files starting with \"/home/user/project/\" on the "
+"local computer, will start with \"/var/www/\" on the remote computer."
 msgstr ""
 
-#. i18n: file ./components/csseditor/cssselectors.ui line 41
-#: rc.cpp:1737
-#, fuzzy, no-c-format
-msgid "Apply to file:"
-msgstr "Ffeil cofnod:"
-
-#. i18n: file ./components/csseditor/cssselectors.ui line 106
-#: rc.cpp:1746
+#. i18n: file ./components/debugger/pathmapperdialogs.ui line 83
+#: rc.cpp:1927
 #, no-c-format
-msgid "Tags"
+msgid ""
+"This is where the server part of path is specified. If a file is located on the "
+"computer running Quanta at \"/home/user/htdocs/project/file.php\" and that file "
+"is located on the server as \"/var/www/project/file.php\", local basedir should "
+"be \"/home/user/htdocs/\" and server basedir should be \"/var/www/\".\n"
+"The quanta will know that files starting with \"/home/user/project/\" on the "
+"local computer, will start with \"/var/www/\" on the remote computer."
 msgstr ""
 
-#. i18n: file ./components/csseditor/cssselectors.ui line 150
-#: rc.cpp:1749 rc.cpp:1782 rc.cpp:1806 rc.cpp:1830
+#. i18n: file ./components/debugger/pathmapperdialogs.ui line 157
+#: rc.cpp:1937
 #, no-c-format
-msgid "Remove Selector"
+msgid "Previous Mappings"
 msgstr ""
 
-#. i18n: file ./components/csseditor/cssselectors.ui line 165
-#: rc.cpp:1752 rc.cpp:1785 rc.cpp:1809 rc.cpp:1836
-#, no-c-format
-msgid "Selected"
-msgstr "Dewisiedig"
-
-#. i18n: file ./components/csseditor/cssselectors.ui line 173
-#: dialogs/actionconfigdialog.cpp:80 dialogs/actionconfigdialog.cpp:191
-#: dialogs/actionconfigdialog.cpp:219 rc.cpp:1755 rc.cpp:1788 rc.cpp:1812
-#: rc.cpp:1833 rc.cpp:1917
-#, no-c-format
-msgid "All"
-msgstr "Popeth"
-
-#. i18n: file ./components/csseditor/cssselectors.ui line 200
-#: rc.cpp:1758
+#. i18n: file ./components/debugger/pathmapperdialogs.ui line 166
+#: rc.cpp:1940
 #, no-c-format
-msgid "DTD Selection"
+msgid "Local Directory"
 msgstr ""
 
-#. i18n: file ./components/csseditor/cssselectors.ui line 235
-#: rc.cpp:1761 rc.cpp:1791 rc.cpp:1815 rc.cpp:1839
+#. i18n: file ./components/debugger/pathmapperdialogs.ui line 177
+#: rc.cpp:1943
 #, no-c-format
-msgid "Add Selector"
+msgid "Server Directory"
 msgstr ""
 
-#. i18n: file ./components/csseditor/cssselectors.ui line 281
-#: parts/kafka/htmldocumentproperties.cpp:97 parts/kafka/wkafkapart.cpp:68
-#: rc.cpp:1767 rc.cpp:1776 rc.cpp:1800 rc.cpp:1824
-#, no-c-format
-msgid "Selector"
-msgstr "Dewisydd"
-
-#. i18n: file ./components/csseditor/cssselectors.ui line 346
-#: rc.cpp:1773
+#. i18n: file ./components/debugger/pathmapperdialogs.ui line 202
+#: rc.cpp:1946
 #, no-c-format
-msgid "IDs"
+msgid "This is a list of previously used mappings. Click on one to use it"
 msgstr ""
 
-#. i18n: file ./components/csseditor/cssselectors.ui line 540
-#: rc.cpp:1797
+#. i18n: file ./components/debugger/pathmapperdialogs.ui line 212
+#: rc.cpp:1949
 #, no-c-format
-msgid "Classes"
-msgstr "Dosbarthiadau"
+msgid "Sample"
+msgstr "Engraifft"
 
-#. i18n: file ./components/csseditor/cssselectors.ui line 734
-#: rc.cpp:1821
+#. i18n: file ./components/debugger/pathmapperdialogs.ui line 231
+#: rc.cpp:1952
+#, fuzzy, no-c-format
+msgid "Translates to:"
+msgstr "Trosi"
+
+#. i18n: file ./components/debugger/pathmapperdialogs.ui line 247
+#: rc.cpp:1955
 #, no-c-format
-msgid "Pseudo"
+msgid "Original path:"
 msgstr ""
 
-#. i18n: file ./components/csseditor/fontfamilychoosers.ui line 24
-#: rc.cpp:1848
+#. i18n: file ./components/debugger/pathmapperdialogs.ui line 276
+#: rc.cpp:1958
 #, no-c-format
-msgid "Font Family Chooser"
+msgid "Indicates whether the translated path exists on disk or not"
 msgstr ""
 
-#. i18n: file ./components/csseditor/fontfamilychoosers.ui line 78
-#: rc.cpp:1851
+#. i18n: file ./components/debugger/pathmapperdialogs.ui line 279
+#: rc.cpp:1961
 #, no-c-format
-msgid "Available system font families:"
+msgid ""
+"This indicator tells you whether the translated path exists on local disk or "
+"not."
 msgstr ""
 
-#. i18n: file ./components/csseditor/fontfamilychoosers.ui line 101
-#: rc.cpp:1854
+#. i18n: file ./components/debugger/pathmapperdialogs.ui line 297
+#: rc.cpp:1964
 #, no-c-format
-msgid "Generic family:"
+msgid ""
+"This field shows what the \"original path\" above will look like after "
+"translation."
 msgstr ""
 
-#. i18n: file ./components/csseditor/fontfamilychoosers.ui line 107
-#: rc.cpp:1857
+#. i18n: file ./components/debugger/pathmapperdialogs.ui line 315
+#: rc.cpp:1967
 #, no-c-format
-msgid "cursive"
+msgid "This field shows the path currently needing to be translated."
 msgstr ""
 
-#. i18n: file ./components/csseditor/fontfamilychoosers.ui line 112
-#: rc.cpp:1860
+#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 16
+#: rc.cpp:1970
 #, no-c-format
-msgid "fantasy"
+msgid "Gubed Settings"
 msgstr ""
 
-#. i18n: file ./components/csseditor/fontfamilychoosers.ui line 117
-#: rc.cpp:1863
+#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 78
+#: rc.cpp:1976 rc.cpp:2102 rc.cpp:2305
 #, no-c-format
-msgid "monospace"
-msgstr ""
+msgid "Ca&ncel"
+msgstr "Di&ddymu"
 
-#. i18n: file ./components/csseditor/fontfamilychoosers.ui line 122
-#: rc.cpp:1866
+#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 189
+#: rc.cpp:1991 rc.cpp:2108
 #, no-c-format
-msgid "sans-serif"
+msgid "Connection Settings"
 msgstr ""
 
-#. i18n: file ./components/csseditor/fontfamilychoosers.ui line 127
-#: rc.cpp:1869
+#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 253
+#: rc.cpp:1994
 #, no-c-format
-msgid "serif"
+msgid "Use proxy"
 msgstr ""
 
-#. i18n: file ./components/csseditor/fontfamilychoosers.ui line 332
-#: rc.cpp:1872
+#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 269
+#: rc.cpp:1997
 #, no-c-format
-msgid "Selected font families:"
+msgid "Proxy host:"
 msgstr ""
 
-#. i18n: file ./components/csseditor/csseditors.ui line 16
-#: rc.cpp:1881
+#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 285
+#: rc.cpp:2000
 #, no-c-format
-msgid "CSS Editor"
-msgstr ""
+msgid "Proxy port:"
+msgstr "Porth dirprwyol :"
 
-#. i18n: file ./components/csseditor/csseditors.ui line 89
-#: rc.cpp:1890
+#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 301
+#: rc.cpp:2003 rc.cpp:2111
 #, no-c-format
-msgid "Use shorthand form"
-msgstr ""
+msgid "Listen port:"
+msgstr "Porth gwrando:"
 
-#. i18n: file ./components/csseditor/csseditors.ui line 137
-#: rc.cpp:1893
+#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 311
+#: rc.cpp:2006
 #, no-c-format
-msgid "Visual"
-msgstr ""
+msgid "Mode"
+msgstr "Modd"
 
-#. i18n: file ./components/csseditor/csseditors.ui line 175
-#: rc.cpp:1899
+#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 322
+#: rc.cpp:2009 rc.cpp:2117 rc.cpp:2149
 #, no-c-format
-msgid "Paged"
+msgid "See \"What's This?\" for available variables"
 msgstr ""
 
-#. i18n: file ./components/csseditor/csseditors.ui line 210
-#: rc.cpp:1905
+#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 336
+#: rc.cpp:2012 rc.cpp:2120
 #, no-c-format
-msgid "Interactive"
+msgid ""
+"%afn - Filename of the current script\n"
+"%afd - Absolute directory of the current script\n"
+"%afp - Absolute path (directory + filename) of the current script\n"
+"\n"
+"%rfpd - Directory of the current script relative to project root\n"
+"%rfpp - Path of the current script relative to project root\n"
+"\n"
+"%rfdd - Directory of the current script relative to document root\n"
+"%rfdp - Path of the current script relative to document root\n"
+"\n"
+"%apd - Project root\n"
+"%add - Document root of current script"
 msgstr ""
 
-#. i18n: file ./components/csseditor/csseditors.ui line 245
-#: rc.cpp:1911
+#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 347
+#: rc.cpp:2026
+#, fuzzy, no-c-format
+msgid "&Add include"
+msgstr "yn cynnwys"
+
+#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 355
+#: rc.cpp:2029
+#, fuzzy, no-c-format
+msgid "Start session:"
+msgstr "Sesiwn"
+
+#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 370
+#: rc.cpp:2032 rc.cpp:2172
+#, fuzzy, no-c-format
+msgid "Deb&ug Behavior"
+msgstr "Ymddygiad :"
+
+#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 381
+#: rc.cpp:2035 rc.cpp:2175
 #, no-c-format
-msgid "Aural"
+msgid "Error Handling"
 msgstr ""
 
-#. i18n: file ./components/cvsservice/cvsupdatetodlgs.ui line 25
-#: rc.cpp:1926
+#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 400
+#: rc.cpp:2038 rc.cpp:2178
 #, no-c-format
-msgid "CVS Update"
+msgid "User errors"
 msgstr ""
 
-#. i18n: file ./components/cvsservice/cvsupdatetodlgs.ui line 53
-#: rc.cpp:1929
+#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 408
+#: rc.cpp:2041 rc.cpp:2181
 #, no-c-format
-msgid "Update to &date ('yyyy-mm-dd'):"
+msgid "Break on:"
 msgstr ""
 
-#. i18n: file ./components/cvsservice/cvsupdatetodlgs.ui line 61
-#: rc.cpp:1932
+#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 427
+#: rc.cpp:2044 rc.cpp:2184
 #, no-c-format
-msgid "Update to &tag/branch:"
+msgid "User warnings"
 msgstr ""
 
-#. i18n: file ./components/cvsservice/cvscommitdlgs.ui line 25
-#: rc.cpp:1941
+#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 443
+#: rc.cpp:2047 rc.cpp:2187
 #, no-c-format
-msgid "CVS Commit "
+msgid "User notices"
 msgstr ""
 
-#. i18n: file ./components/cvsservice/cvscommitdlgs.ui line 41
-#: rc.cpp:1944
+#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 459
+#: rc.cpp:2050 rc.cpp:2190
 #, no-c-format
-msgid "Commit the following files:"
+msgid "Notices"
 msgstr ""
 
-#. i18n: file ./components/cvsservice/cvscommitdlgs.ui line 57
-#: rc.cpp:1947
+#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 475
+#: rc.cpp:2053 rc.cpp:2193
 #, no-c-format
-msgid "Older &messages:"
-msgstr ""
+msgid "W&arnings"
+msgstr "R&hybuddion"
 
-#. i18n: file ./components/cvsservice/cvscommitdlgs.ui line 68
-#: rc.cpp:1950
+#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 502
+#: rc.cpp:2056 rc.cpp:2196
 #, no-c-format
-msgid "&Log message:"
+msgid "Execution"
 msgstr ""
 
-#. i18n: file ./components/debugger/dbgp/dbgpsettingss.ui line 16
-#: rc.cpp:1959
-#, fuzzy, no-c-format
-msgid "DBGp Settings"
-msgstr "Gosodiadau"
-
-#. i18n: file ./components/debugger/dbgp/dbgpsettingss.ui line 78
-#: rc.cpp:1965 rc.cpp:2138 rc.cpp:2335
+#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 526
+#: rc.cpp:2059
 #, no-c-format
-msgid "Ca&ncel"
-msgstr "Di&ddymu"
+msgid "Fast"
+msgstr "Cyflym"
 
-#. i18n: file ./components/debugger/dbgp/dbgpsettingss.ui line 117
-#: rc.cpp:1971 rc.cpp:2153
+#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 567
+#: rc.cpp:2062
 #, no-c-format
-msgid "Connection Settings"
-msgstr ""
+msgid "Slow"
+msgstr "Araf"
 
-#. i18n: file ./components/debugger/dbgp/dbgpsettingss.ui line 136
-#: rc.cpp:1974 rc.cpp:2165
+#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 576
+#: components/debugger/interfaces/debuggerclient.cpp:53 rc.cpp:2065
+#: rc.cpp:2199
 #, no-c-format
-msgid "Listen port:"
-msgstr "Porth gwrando:"
+msgid "Pause"
+msgstr "Seibio"
 
-#. i18n: file ./components/debugger/dbgp/dbgpsettingss.ui line 165
-#: rc.cpp:1977
+#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 584
+#: components/debugger/interfaces/debuggerclient.cpp:79 rc.cpp:2068
+#, fuzzy, no-c-format
+msgid "Trace"
+msgstr "Gwir"
+
+#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 592
+#: components/debugger/interfaces/debuggerclient.cpp:84 rc.cpp:2071
+#: rc.cpp:2202
 #, no-c-format
-msgid "Request URL:"
-msgstr ""
+msgid "Run"
+msgstr "Rhedeg"
 
-#. i18n: file ./components/debugger/dbgp/dbgpsettingss.ui line 181
-#: rc.cpp:1980 rc.cpp:2012 rc.cpp:2171
+#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 607
+#: rc.cpp:2074 rc.cpp:2205
 #, no-c-format
-msgid "See \"What's This?\" for available variables"
+msgid "Default mode:"
 msgstr ""
 
-#. i18n: file ./components/debugger/dbgp/dbgpsettingss.ui line 195
-#: rc.cpp:1983 rc.cpp:2174
+#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 618
+#: rc.cpp:2077
 #, no-c-format
-msgid ""
-"%afn - Filename of the current script\n"
-"%afd - Absolute directory of the current script\n"
-"%afp - Absolute path (directory + filename) of the current script\n"
-"\n"
-"%rfpd - Directory of the current script relative to project root\n"
-"%rfpp - Path of the current script relative to project root\n"
-"\n"
-"%rfdd - Directory of the current script relative to document root\n"
-"%rfdp - Path of the current script relative to document root\n"
-"\n"
-"%apd - Project root\n"
-"%add - Document root of current script"
+msgid "Run speed:"
 msgstr ""
 
-#. i18n: file ./components/debugger/dbgp/dbgpsettingss.ui line 222
-#: rc.cpp:1997 rc.cpp:2144 rc.cpp:2273 rc.cpp:2276
+#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 652
+#: rc.cpp:2083
 #, no-c-format
-msgid "Directory Mapping"
+msgid "<h4>Gubed PHP Debugger Plugin for Quanta +</h4>"
 msgstr ""
 
-#. i18n: file ./components/debugger/dbgp/dbgpsettingss.ui line 254
-#: rc.cpp:2000 rc.cpp:2147 rc.cpp:2282
+#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 692
+#: rc.cpp:2086
 #, no-c-format
-msgid "Server basedir:"
+msgid ""
+"<html><head><meta name=\"qrichtext\" content=\"1\" /></head>"
+"<body style=\"font-size:10pt;font-family:Bitstream Vera Sans\">\n"
+"<p><span style=\"font-weight:600\">About</span></p>\n"
+"<p>Gubed is a PHP debugger available for free through GPL. This plugin "
+"integrates Gubed with Quanta. </p>\n"
+"<p>In order to use this plugin for PHP debugging, you need to get the Quanta "
+"package from the Gubed project page, <a "
+"href=\"http://sourceforge.net/projects/gubed\">http://sourceforge.net/projects/g"
+"ubed</a>, at SourceForge </p>\n"
+"<p>For more info about Gubed, please visit the Gubed website at <a "
+"href=\"http://gubed.sf.net\">http://gubed.sf.net</a> </p>\n"
+"<p><span style=\"font-weight:600\">Technical Details</span></p>\n"
+"<p>This version of the debugger supports the %PROTOCOLVERSION% version of the "
+"Gubed protocol. </p>\n"
+"</body></html>"
 msgstr ""
 
-#. i18n: file ./components/debugger/dbgp/dbgpsettingss.ui line 305
-#: rc.cpp:2003 rc.cpp:2150 rc.cpp:2279
+#. i18n: file ./components/debugger/dbgp/dbgpsettingss.ui line 16
+#: rc.cpp:2096
+#, fuzzy, no-c-format
+msgid "DBGp Settings"
+msgstr "Gosodiadau"
+
+#. i18n: file ./components/debugger/dbgp/dbgpsettingss.ui line 165
+#: rc.cpp:2114
 #, no-c-format
-msgid "Local basedir:"
+msgid "Request URL:"
 msgstr ""
 
 #. i18n: file ./components/debugger/dbgp/dbgpsettingss.ui line 321
-#: rc.cpp:2006
+#: rc.cpp:2143
 #, no-c-format
 msgid "Local project:"
 msgstr ""
 
 #. i18n: file ./components/debugger/dbgp/dbgpsettingss.ui line 331
-#: rc.cpp:2009
+#: rc.cpp:2146
 #, fuzzy, no-c-format
 msgid "Profiling"
 msgstr "&Enw Proffil:"
 
 #. i18n: file ./components/debugger/dbgp/dbgpsettingss.ui line 355
-#: rc.cpp:2015
+#: rc.cpp:2152
 #, no-c-format
 msgid ""
 "Path to the profiler output\n"
@@ -2972,19 +3319,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./components/debugger/dbgp/dbgpsettingss.ui line 371
-#: rc.cpp:2020
+#: rc.cpp:2157
 #, fuzzy, no-c-format
 msgid "Profiler output:"
 msgstr "&Enw Proffil:"
 
 #. i18n: file ./components/debugger/dbgp/dbgpsettingss.ui line 387
-#: rc.cpp:2023
+#: rc.cpp:2160
 #, no-c-format
 msgid "Map profiler output:"
 msgstr ""
 
 #. i18n: file ./components/debugger/dbgp/dbgpsettingss.ui line 409
-#: rc.cpp:2026
+#: rc.cpp:2163
 #, no-c-format
 msgid ""
 "If this checkbox is checked, the profiler output filename will be mapped using "
@@ -2992,101 +3339,27 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./components/debugger/dbgp/dbgpsettingss.ui line 425
-#: rc.cpp:2029
+#: rc.cpp:2166
 #, no-c-format
 msgid "Open automatically:"
 msgstr ""
 
 #. i18n: file ./components/debugger/dbgp/dbgpsettingss.ui line 447
-#: rc.cpp:2032
+#: rc.cpp:2169
 #, no-c-format
 msgid ""
 "If this checkbox is checked, the profiler output will be opened automatically "
 "once the session ends."
 msgstr ""
 
-#. i18n: file ./components/debugger/dbgp/dbgpsettingss.ui line 459
-#: rc.cpp:2035 rc.cpp:2194
-#, fuzzy, no-c-format
-msgid "Deb&ug Behavior"
-msgstr "Ymddygiad :"
-
-#. i18n: file ./components/debugger/dbgp/dbgpsettingss.ui line 470
-#: rc.cpp:2038 rc.cpp:2197
-#, no-c-format
-msgid "Error Handling"
-msgstr ""
-
-#. i18n: file ./components/debugger/dbgp/dbgpsettingss.ui line 489
-#: rc.cpp:2041 rc.cpp:2200
-#, no-c-format
-msgid "User errors"
-msgstr ""
-
-#. i18n: file ./components/debugger/dbgp/dbgpsettingss.ui line 497
-#: rc.cpp:2044 rc.cpp:2203
-#, no-c-format
-msgid "Break on:"
-msgstr ""
-
-#. i18n: file ./components/debugger/dbgp/dbgpsettingss.ui line 516
-#: rc.cpp:2047 rc.cpp:2206
-#, no-c-format
-msgid "User warnings"
-msgstr ""
-
-#. i18n: file ./components/debugger/dbgp/dbgpsettingss.ui line 532
-#: rc.cpp:2050 rc.cpp:2209
-#, no-c-format
-msgid "User notices"
-msgstr ""
-
-#. i18n: file ./components/debugger/dbgp/dbgpsettingss.ui line 548
-#: rc.cpp:2053 rc.cpp:2212
-#, no-c-format
-msgid "Notices"
-msgstr ""
-
-#. i18n: file ./components/debugger/dbgp/dbgpsettingss.ui line 564
-#: rc.cpp:2056 rc.cpp:2215
-#, no-c-format
-msgid "W&arnings"
-msgstr "R&hybuddion"
-
-#. i18n: file ./components/debugger/dbgp/dbgpsettingss.ui line 574
-#: rc.cpp:2059 rc.cpp:2218
-#, no-c-format
-msgid "Execution"
-msgstr ""
-
-#. i18n: file ./components/debugger/dbgp/dbgpsettingss.ui line 583
-#: components/debugger/interfaces/debuggerclient.cpp:53 rc.cpp:2062
-#: rc.cpp:2227
-#, no-c-format
-msgid "Pause"
-msgstr "Seibio"
-
-#. i18n: file ./components/debugger/dbgp/dbgpsettingss.ui line 591
-#: components/debugger/interfaces/debuggerclient.cpp:84 rc.cpp:2065
-#: rc.cpp:2233
-#, no-c-format
-msgid "Run"
-msgstr "Rhedeg"
-
-#. i18n: file ./components/debugger/dbgp/dbgpsettingss.ui line 606
-#: rc.cpp:2068 rc.cpp:2236
-#, no-c-format
-msgid "Default mode:"
-msgstr ""
-
 #. i18n: file ./components/debugger/dbgp/dbgpsettingss.ui line 657
-#: rc.cpp:2074
+#: rc.cpp:2211
 #, no-c-format
 msgid "<h4>DBGp Plugin for Quanta +</h4>"
 msgstr ""
 
 #. i18n: file ./components/debugger/dbgp/dbgpsettingss.ui line 675
-#: rc.cpp:2077
+#: rc.cpp:2214
 #, no-c-format
 msgid ""
 "<html><head><meta name=\"qrichtext\" content=\"1\" /></head>"
@@ -3106,1453 +3379,1180 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./components/debugger/conditionalbreakpointdialogs.ui line 16
-#: rc.cpp:2087
+#: rc.cpp:2224
 #, no-c-format
 msgid "Add Conditional Breakpoint"
 msgstr ""
 
 #. i18n: file ./components/debugger/conditionalbreakpointdialogs.ui line 38
-#: rc.cpp:2090
+#: rc.cpp:2227
 #, no-c-format
 msgid "Expression:"
 msgstr "Mynegiad:"
 
 #. i18n: file ./components/debugger/conditionalbreakpointdialogs.ui line 110
-#: rc.cpp:2099
+#: rc.cpp:2236
 #, no-c-format
 msgid "Break When"
 msgstr ""
 
 #. i18n: file ./components/debugger/conditionalbreakpointdialogs.ui line 121
-#: rc.cpp:2102
+#: rc.cpp:2239
 #, no-c-format
 msgid "When expression is true"
 msgstr ""
 
 #. i18n: file ./components/debugger/conditionalbreakpointdialogs.ui line 129
-#: rc.cpp:2105
+#: rc.cpp:2242
 #, no-c-format
 msgid "When expression changes"
 msgstr ""
 
 #. i18n: file ./components/debugger/conditionalbreakpointdialogs.ui line 189
-#: rc.cpp:2108
+#: rc.cpp:2245
 #, no-c-format
 msgid "Lit when a finding a single equal sign in expression (common error)"
 msgstr ""
 
 #. i18n: file ./components/debugger/conditionalbreakpointdialogs.ui line 197
-#: rc.cpp:2111
+#: rc.cpp:2248
 #, no-c-format
 msgid "Only Break In"
 msgstr ""
 
 #. i18n: file ./components/debugger/conditionalbreakpointdialogs.ui line 216
-#: rc.cpp:2114 rc.cpp:2925
+#: rc.cpp:2251 rc.cpp:2777
 #, no-c-format
 msgid "File:"
 msgstr "Ffeil:"
 
 #. i18n: file ./components/debugger/conditionalbreakpointdialogs.ui line 235
-#: rc.cpp:2117
+#: rc.cpp:2254
 #, no-c-format
 msgid "Objects of class:"
 msgstr ""
 
 #. i18n: file ./components/debugger/conditionalbreakpointdialogs.ui line 254
-#: rc.cpp:2120
+#: rc.cpp:2257
 #, no-c-format
 msgid "Function:"
 msgstr "Ffwythiant"
 
 #. i18n: file ./components/debugger/conditionalbreakpointdialogs.ui line 275
-#: rc.cpp:2123 rc.cpp:2126 rc.cpp:2129 rc.cpp:2847
+#: rc.cpp:2260 rc.cpp:2263 rc.cpp:2266 rc.cpp:2810
 #, no-c-format
 msgid "x"
 msgstr "x"
 
-#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 16
-#: rc.cpp:2132
-#, no-c-format
-msgid "Gubed Settings"
-msgstr ""
-
-#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 253
-#: rc.cpp:2156
-#, no-c-format
-msgid "Use proxy"
-msgstr ""
-
-#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 269
-#: rc.cpp:2159
-#, no-c-format
-msgid "Proxy host:"
-msgstr ""
-
-#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 285
-#: rc.cpp:2162
-#, no-c-format
-msgid "Proxy port:"
-msgstr "Porth dirprwyol :"
-
-#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 311
-#: rc.cpp:2168
-#, no-c-format
-msgid "Mode"
-msgstr "Modd"
-
-#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 347
-#: rc.cpp:2188
-#, fuzzy, no-c-format
-msgid "&Add include"
-msgstr "yn cynnwys"
-
-#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 355
-#: rc.cpp:2191
-#, fuzzy, no-c-format
-msgid "Start session:"
-msgstr "Sesiwn"
-
-#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 526
-#: rc.cpp:2221
-#, no-c-format
-msgid "Fast"
-msgstr "Cyflym"
-
-#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 567
-#: rc.cpp:2224
-#, no-c-format
-msgid "Slow"
-msgstr "Araf"
-
-#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 584
-#: components/debugger/interfaces/debuggerclient.cpp:79 rc.cpp:2230
-#, fuzzy, no-c-format
-msgid "Trace"
-msgstr "Gwir"
-
-#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 618
-#: rc.cpp:2239
-#, no-c-format
-msgid "Run speed:"
-msgstr ""
-
-#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 652
-#: rc.cpp:2245
-#, no-c-format
-msgid "<h4>Gubed PHP Debugger Plugin for Quanta +</h4>"
-msgstr ""
-
-#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 692
-#: rc.cpp:2248
-#, no-c-format
-msgid ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /></head>"
-"<body style=\"font-size:10pt;font-family:Bitstream Vera Sans\">\n"
-"<p><span style=\"font-weight:600\">About</span></p>\n"
-"<p>Gubed is a PHP debugger available for free through GPL. This plugin "
-"integrates Gubed with Quanta. </p>\n"
-"<p>In order to use this plugin for PHP debugging, you need to get the Quanta "
-"package from the Gubed project page, <a "
-"href=\"http://sourceforge.net/projects/gubed\">http://sourceforge.net/projects/g"
-"ubed</a>, at SourceForge </p>\n"
-"<p>For more info about Gubed, please visit the Gubed website at <a "
-"href=\"http://gubed.sf.net\">http://gubed.sf.net</a> </p>\n"
-"<p><span style=\"font-weight:600\">Technical Details</span></p>\n"
-"<p>This version of the debugger supports the %PROTOCOLVERSION% version of the "
-"Gubed protocol. </p>\n"
-"</body></html>"
-msgstr ""
-
-#. i18n: file ./components/debugger/debuggervariablesets.ui line 16
-#: components/debugger/debuggermanager.cpp:267
-#: components/debugger/debuggermanager.cpp:270 rc.cpp:2258
-#, no-c-format
-msgid "Set Value of Variable"
-msgstr ""
-
-#. i18n: file ./components/debugger/debuggervariablesets.ui line 110
-#: rc.cpp:2267
-#, no-c-format
-msgid "Variable:"
-msgstr "Newidyn:"
-
-#. i18n: file ./components/debugger/debuggervariablesets.ui line 126
-#: components/debugger/variableslistview.cpp:262 rc.cpp:2270
-#, no-c-format
-msgid "New value:"
-msgstr "Gwerth newydd:"
-
-#. i18n: file ./components/debugger/pathmapperdialogs.ui line 74
-#: rc.cpp:2285
-#, no-c-format
-msgid ""
-"This is where the local part of path is specified. If a file is located on the "
-"computer running Quanta at \"/home/user/htdocs/project/file.php\" and that file "
-"is located on the server as \"/var/www/project/file.php\", local basedir should "
-"be \"/home/user/htdocs/\" and server basedir should be \"/var/www/\".\n"
-"The quanta will know that files starting with \"/home/user/project/\" on the "
-"local computer, will start with \"/var/www/\" on the remote computer."
-msgstr ""
-
-#. i18n: file ./components/debugger/pathmapperdialogs.ui line 83
-#: rc.cpp:2289
-#, no-c-format
-msgid ""
-"This is where the server part of path is specified. If a file is located on the "
-"computer running Quanta at \"/home/user/htdocs/project/file.php\" and that file "
-"is located on the server as \"/var/www/project/file.php\", local basedir should "
-"be \"/home/user/htdocs/\" and server basedir should be \"/var/www/\".\n"
-"The quanta will know that files starting with \"/home/user/project/\" on the "
-"local computer, will start with \"/var/www/\" on the remote computer."
-msgstr ""
-
-#. i18n: file ./components/debugger/pathmapperdialogs.ui line 157
-#: rc.cpp:2299
-#, no-c-format
-msgid "Previous Mappings"
-msgstr ""
-
-#. i18n: file ./components/debugger/pathmapperdialogs.ui line 166
-#: rc.cpp:2302
-#, no-c-format
-msgid "Local Directory"
-msgstr ""
-
-#. i18n: file ./components/debugger/pathmapperdialogs.ui line 177
-#: rc.cpp:2305
+#. i18n: file ./components/cvsservice/cvsupdatetodlgs.ui line 25
+#: rc.cpp:2269
 #, no-c-format
-msgid "Server Directory"
+msgid "CVS Update"
 msgstr ""
 
-#. i18n: file ./components/debugger/pathmapperdialogs.ui line 202
-#: rc.cpp:2308
+#. i18n: file ./components/cvsservice/cvsupdatetodlgs.ui line 53
+#: rc.cpp:2272
 #, no-c-format
-msgid "This is a list of previously used mappings. Click on one to use it"
+msgid "Update to &date ('yyyy-mm-dd'):"
 msgstr ""
 
-#. i18n: file ./components/debugger/pathmapperdialogs.ui line 212
-#: rc.cpp:2311
-#, no-c-format
-msgid "Sample"
-msgstr "Engraifft"
-
-#. i18n: file ./components/debugger/pathmapperdialogs.ui line 231
-#: rc.cpp:2314
-#, fuzzy, no-c-format
-msgid "Translates to:"
-msgstr "Trosi"
-
-#. i18n: file ./components/debugger/pathmapperdialogs.ui line 247
-#: rc.cpp:2317
+#. i18n: file ./components/cvsservice/cvsupdatetodlgs.ui line 61
+#: rc.cpp:2275
 #, no-c-format
-msgid "Original path:"
+msgid "Update to &tag/branch:"
 msgstr ""
 
-#. i18n: file ./components/debugger/pathmapperdialogs.ui line 276
-#: rc.cpp:2320
+#. i18n: file ./components/cvsservice/cvscommitdlgs.ui line 25
+#: rc.cpp:2284
 #, no-c-format
-msgid "Indicates whether the translated path exists on disk or not"
+msgid "CVS Commit "
 msgstr ""
 
-#. i18n: file ./components/debugger/pathmapperdialogs.ui line 279
-#: rc.cpp:2323
+#. i18n: file ./components/cvsservice/cvscommitdlgs.ui line 41
+#: rc.cpp:2287
 #, no-c-format
-msgid ""
-"This indicator tells you whether the translated path exists on local disk or "
-"not."
+msgid "Commit the following files:"
 msgstr ""
 
-#. i18n: file ./components/debugger/pathmapperdialogs.ui line 297
-#: rc.cpp:2326
+#. i18n: file ./components/cvsservice/cvscommitdlgs.ui line 57
+#: rc.cpp:2290
 #, no-c-format
-msgid ""
-"This field shows what the \"original path\" above will look like after "
-"translation."
+msgid "Older &messages:"
 msgstr ""
 
-#. i18n: file ./components/debugger/pathmapperdialogs.ui line 315
-#: rc.cpp:2329
+#. i18n: file ./components/cvsservice/cvscommitdlgs.ui line 68
+#: rc.cpp:2293
 #, no-c-format
-msgid "This field shows the path currently needing to be translated."
+msgid "&Log message:"
 msgstr ""
 
 #. i18n: file ./components/tableeditor/tableeditors.ui line 16
-#: rc.cpp:2332
+#: rc.cpp:2302
 #, no-c-format
 msgid "Table Editor"
 msgstr ""
 
 #. i18n: file ./components/tableeditor/tableeditors.ui line 75
-#: rc.cpp:2344
+#: rc.cpp:2314
 #, no-c-format
 msgid "F1"
 msgstr "F1"
 
 #. i18n: file ./components/tableeditor/tableeditors.ui line 90
-#: rc.cpp:2347
+#: rc.cpp:2317
 #, no-c-format
 msgid "&Main"
 msgstr "&Prif"
 
 #. i18n: file ./components/tableeditor/tableeditors.ui line 101
-#: rc.cpp:2350
+#: rc.cpp:2320
 #, fuzzy, no-c-format
 msgid "Ta&ble data:"
 msgstr "Tabl"
 
 #. i18n: file ./components/tableeditor/tableeditors.ui line 185
-#: rc.cpp:2353
+#: rc.cpp:2323
 #, no-c-format
 msgid "Co&lumns:"
 msgstr "Co&lofnau:"
 
 #. i18n: file ./components/tableeditor/tableeditors.ui line 201
-#: rc.cpp:2356
+#: rc.cpp:2326
 #, fuzzy, no-c-format
 msgid "Bod&y Properties"
 msgstr "&Priodweddau"
 
 #. i18n: file ./components/tableeditor/tableeditors.ui line 209
-#: rc.cpp:2359
+#: rc.cpp:2329
 #, no-c-format
 msgid "&Table Properties"
 msgstr "&Priodweddau Tabl"
 
 #. i18n: file ./components/tableeditor/tableeditors.ui line 225
-#: rc.cpp:2362
+#: rc.cpp:2332
 #, no-c-format
 msgid "C&aption:"
 msgstr "P&ennawd:"
 
 #. i18n: file ./components/tableeditor/tableeditors.ui line 236
-#: rc.cpp:2365
+#: rc.cpp:2335
 #, no-c-format
 msgid "&Rows:"
 msgstr "&Rhesi:"
 
 #. i18n: file ./components/tableeditor/tableeditors.ui line 260
-#: rc.cpp:2368
+#: rc.cpp:2338
 #, no-c-format
 msgid "Header"
 msgstr "Pennawd"
 
 #. i18n: file ./components/tableeditor/tableeditors.ui line 339
-#: rc.cpp:2371
+#: rc.cpp:2341
 #, no-c-format
 msgid "Header &rows:"
 msgstr ""
 
 #. i18n: file ./components/tableeditor/tableeditors.ui line 358
-#: rc.cpp:2374
+#: rc.cpp:2344
 #, no-c-format
 msgid "Header co&lumns:"
 msgstr ""
 
 #. i18n: file ./components/tableeditor/tableeditors.ui line 369
-#: rc.cpp:2377
+#: rc.cpp:2347
 #, no-c-format
 msgid "Header &data:"
 msgstr ""
 
 #. i18n: file ./components/tableeditor/tableeditors.ui line 382
-#: rc.cpp:2380
+#: rc.cpp:2350
 #, fuzzy, no-c-format
 msgid "Insert ta&ble header"
 msgstr "&Plygell Newydd"
 
 #. i18n: file ./components/tableeditor/tableeditors.ui line 410
-#: rc.cpp:2383
+#: rc.cpp:2353
 #, no-c-format
 msgid "&Header Properties"
 msgstr "&Nodweddion Penawdau"
 
 #. i18n: file ./components/tableeditor/tableeditors.ui line 420
-#: rc.cpp:2386
+#: rc.cpp:2356
 #, no-c-format
 msgid "Footer"
 msgstr "Troedyn"
 
 #. i18n: file ./components/tableeditor/tableeditors.ui line 485
-#: rc.cpp:2389
+#: rc.cpp:2359
 #, no-c-format
 msgid "Footer &rows:"
 msgstr ""
 
 #. i18n: file ./components/tableeditor/tableeditors.ui line 504
-#: rc.cpp:2392
+#: rc.cpp:2362
 #, no-c-format
 msgid "Footer co&lumns:"
 msgstr ""
 
 #. i18n: file ./components/tableeditor/tableeditors.ui line 515
-#: rc.cpp:2395
+#: rc.cpp:2365
 #, no-c-format
 msgid "Footer &data:"
 msgstr ""
 
 #. i18n: file ./components/tableeditor/tableeditors.ui line 545
-#: rc.cpp:2398
+#: rc.cpp:2368
 #, fuzzy, no-c-format
 msgid "Insert ta&ble footer"
 msgstr "&Plygell Newydd"
 
 #. i18n: file ./components/tableeditor/tableeditors.ui line 573
-#: rc.cpp:2401
+#: rc.cpp:2371
 #, no-c-format
 msgid "&Footer Properties"
 msgstr "&Priodweddau'r Troedynnau"
 
-#. i18n: file ./treeviews/fileinfodlg.ui line 32
-#: rc.cpp:2404
-#, no-c-format
-msgid "Number of lines:"
-msgstr "Nifel llinellau:"
-
-#. i18n: file ./treeviews/fileinfodlg.ui line 40
-#: rc.cpp:2407
-#, no-c-format
-msgid "Number of images included:"
-msgstr ""
-
-#. i18n: file ./treeviews/fileinfodlg.ui line 48
-#: rc.cpp:2410
-#, no-c-format
-msgid "Size of the included images:"
-msgstr ""
-
-#. i18n: file ./treeviews/fileinfodlg.ui line 56
-#: rc.cpp:2413
-#, no-c-format
-msgid "Total file size:"
-msgstr ""
-
-#. i18n: file ./treeviews/fileinfodlg.ui line 72
-#: rc.cpp:2416
-#, no-c-format
-msgid "Included images:"
-msgstr ""
-
-#. i18n: file ./treeviews/fileinfodlg.ui line 80
-#: rc.cpp:2419 rc.cpp:3900 treeviews/basetreeview.cpp:512
-#, no-c-format
-msgid "Description:"
-msgstr "Disgrifiad:"
-
-#. i18n: file ./treeviews/quantapropertiespage.ui line 39
-#: rc.cpp:2422
-#, no-c-format
-msgid "Quanta Properties"
-msgstr ""
-
-#. i18n: file ./treeviews/quantapropertiespage.ui line 65
-#: rc.cpp:2425
-#, no-c-format
-msgid "&Inherit type from parent (nothing)"
-msgstr ""
-
-#. i18n: file ./treeviews/quantapropertiespage.ui line 73
-#: rc.cpp:2428
-#, no-c-format
-msgid "&Type:"
-msgstr "&Math:"
-
-#. i18n: file ./treeviews/quantapropertiespage.ui line 117
-#: rc.cpp:2431
+#. i18n: file ./components/csseditor/encodingselectors.ui line 16
+#: rc.cpp:2374
 #, no-c-format
-msgid "Use &pre/post text"
+msgid "Encoding Selector"
 msgstr ""
 
-#. i18n: file ./treeviews/quantapropertiespage.ui line 125
-#: rc.cpp:2434
+#. i18n: file ./components/csseditor/encodingselectors.ui line 43
+#: rc.cpp:2377
 #, no-c-format
-msgid "Pre-text:"
+msgid "Select encoding:"
 msgstr ""
 
-#. i18n: file ./treeviews/quantapropertiespage.ui line 141
-#: rc.cpp:2437
+#. i18n: file ./components/csseditor/fontfamilychoosers.ui line 24
+#: rc.cpp:2386
 #, no-c-format
-msgid "Post-text:"
+msgid "Font Family Chooser"
 msgstr ""
 
-#. i18n: file ./treeviews/quantapropertiespage.ui line 189
-#: rc.cpp:2440
+#. i18n: file ./components/csseditor/fontfamilychoosers.ui line 78
+#: rc.cpp:2389
 #, no-c-format
-msgid "Filtering &action:"
+msgid "Available system font families:"
 msgstr ""
 
-#. i18n: file ./treeviews/templatedirform.ui line 26
-#: rc.cpp:2443
+#. i18n: file ./components/csseditor/fontfamilychoosers.ui line 101
+#: rc.cpp:2392
 #, no-c-format
-msgid "Create Template Folder"
+msgid "Generic family:"
 msgstr ""
 
-#. i18n: file ./treeviews/templatedirform.ui line 63
-#: rc.cpp:2452
+#. i18n: file ./components/csseditor/fontfamilychoosers.ui line 107
+#: rc.cpp:2395
 #, no-c-format
-msgid "&Inherit parent attribute"
+msgid "cursive"
 msgstr ""
 
-#. i18n: file ./parsers/dtd/dtepcreationdlg.ui line 31
-#: parsers/dtd/dtdparser.cpp:110 rc.cpp:2461
+#. i18n: file ./components/csseditor/fontfamilychoosers.ui line 112
+#: rc.cpp:2398
 #, no-c-format
-msgid "DTD - > DTEP Conversion"
+msgid "fantasy"
 msgstr ""
 
-#. i18n: file ./parsers/dtd/dtepcreationdlg.ui line 55
-#: rc.cpp:2464
-#, no-c-format
-msgid "Name: "
-msgstr "Enw: "
-
-#. i18n: file ./parsers/dtd/dtepcreationdlg.ui line 63
-#: rc.cpp:2467 rc.cpp:2661
-#, no-c-format
-msgid "Nickname:"
-msgstr "Ffugenw:"
-
-#. i18n: file ./parsers/dtd/dtepcreationdlg.ui line 71
-#: rc.cpp:2470
+#. i18n: file ./components/csseditor/fontfamilychoosers.ui line 117
+#: rc.cpp:2401
 #, no-c-format
-msgid "!DOCTYPE definition line:"
+msgid "monospace"
 msgstr ""
 
-#. i18n: file ./parsers/dtd/dtepcreationdlg.ui line 94
-#: rc.cpp:2473
+#. i18n: file ./components/csseditor/fontfamilychoosers.ui line 122
+#: rc.cpp:2404
 #, no-c-format
-msgid "DTD URL:"
+msgid "sans-serif"
 msgstr ""
 
-#. i18n: file ./parsers/dtd/dtepcreationdlg.ui line 102
-#: rc.cpp:2476
+#. i18n: file ./components/csseditor/fontfamilychoosers.ui line 127
+#: rc.cpp:2407
 #, no-c-format
-msgid "Target directory name:"
+msgid "serif"
 msgstr ""
 
-#. i18n: file ./parsers/dtd/dtepcreationdlg.ui line 110
-#: rc.cpp:2479
+#. i18n: file ./components/csseditor/fontfamilychoosers.ui line 332
+#: rc.cpp:2410
 #, no-c-format
-msgid "Default extension:"
+msgid "Selected font families:"
 msgstr ""
 
-#. i18n: file ./parsers/dtd/dtepcreationdlg.ui line 123
-#: rc.cpp:2482
+#. i18n: file ./components/csseditor/csseditors.ui line 16
+#: rc.cpp:2419
 #, no-c-format
-msgid "Case-sensitive tags and attributes"
+msgid "CSS Editor"
 msgstr ""
 
-#. i18n: file ./parsers/dtd/dtepcreationdlg.ui line 134
-#: rc.cpp:2485
+#. i18n: file ./components/csseditor/csseditors.ui line 89
+#: rc.cpp:2428
 #, no-c-format
-msgid "&Fine-tune the DTEP after conversion"
+msgid "Use shorthand form"
 msgstr ""
 
-#. i18n: file ./plugins/pluginconfig.ui line 33
-#: plugins/quantapluginconfig.cpp:40 rc.cpp:2488
+#. i18n: file ./components/csseditor/csseditors.ui line 137
+#: rc.cpp:2431
 #, no-c-format
-msgid "Configure Plugin"
+msgid "Visual"
 msgstr ""
 
-#. i18n: file ./plugins/pluginconfig.ui line 44
-#: rc.cpp:2491
+#. i18n: file ./components/csseditor/csseditors.ui line 175
+#: rc.cpp:2437
 #, no-c-format
-msgid "Validate plugin"
+msgid "Paged"
 msgstr ""
 
-#. i18n: file ./plugins/pluginconfig.ui line 86
-#: rc.cpp:2494
+#. i18n: file ./components/csseditor/csseditors.ui line 210
+#: rc.cpp:2443
 #, no-c-format
-msgid "Plugin Options"
+msgid "Interactive"
 msgstr ""
 
-#. i18n: file ./plugins/pluginconfig.ui line 105
-#: rc.cpp:2500
+#. i18n: file ./components/csseditor/csseditors.ui line 245
+#: rc.cpp:2449
 #, no-c-format
-msgid "The plugin name as it appears in the Plugins menu."
+msgid "Aural"
 msgstr ""
 
-#. i18n: file ./plugins/pluginconfig.ui line 141
-#: rc.cpp:2503
-#, no-c-format
-msgid "Location:"
-msgstr "Lleoliad:"
-
-#. i18n: file ./plugins/pluginconfig.ui line 149
-#: rc.cpp:2506
+#. i18n: file ./components/csseditor/csseditors.ui line 280
+#: dialogs/actionconfigdialog.cpp:80 dialogs/actionconfigdialog.cpp:191
+#: dialogs/actionconfigdialog.cpp:219 rc.cpp:2455 rc.cpp:2485 rc.cpp:2518
+#: rc.cpp:2542 rc.cpp:2563
 #, no-c-format
-msgid ""
-"The exact location of the plugin. If not set the global search paths setting is "
-"used."
-msgstr ""
+msgid "All"
+msgstr "Popeth"
 
-#. i18n: file ./plugins/pluginconfig.ui line 157
-#: rc.cpp:2509
+#. i18n: file ./components/csseditor/cssselectors.ui line 16
+#: rc.cpp:2464
 #, no-c-format
-msgid "The plugin executable or library name (with extension)."
+msgid "CSS Selector Dialog"
 msgstr ""
 
-#. i18n: file ./plugins/pluginconfig.ui line 165
-#: rc.cpp:2512 treeviews/basetreeview.cpp:1209
-#: treeviews/projecttreeview.cpp:393
-#, no-c-format
-msgid "File name:"
-msgstr "Enw'r ffeil:"
+#. i18n: file ./components/csseditor/cssselectors.ui line 41
+#: rc.cpp:2467
+#, fuzzy, no-c-format
+msgid "Apply to file:"
+msgstr "Ffeil cofnod:"
 
-#. i18n: file ./plugins/pluginconfig.ui line 186
-#: rc.cpp:2515
+#. i18n: file ./components/csseditor/cssselectors.ui line 106
+#: rc.cpp:2476
 #, no-c-format
-msgid "Output window:"
+msgid "Tags"
 msgstr ""
 
-#. i18n: file ./plugins/pluginconfig.ui line 208
-#: rc.cpp:2521
+#. i18n: file ./components/csseditor/cssselectors.ui line 150
+#: rc.cpp:2479 rc.cpp:2512 rc.cpp:2536 rc.cpp:2560
 #, no-c-format
-msgid "&Read only part"
+msgid "Remove Selector"
 msgstr ""
 
-#. i18n: file ./plugins/pluginconfig.ui line 216
-#: rc.cpp:2524
+#. i18n: file ./components/csseditor/cssselectors.ui line 165
+#: rc.cpp:2482 rc.cpp:2515 rc.cpp:2539 rc.cpp:2566
 #, no-c-format
-msgid "Input:"
-msgstr "Mewnbwn:"
+msgid "Selected"
+msgstr "Dewisiedig"
 
-#. i18n: file ./plugins/pluginconfig.ui line 227
-#: messages/annotationoutput.cpp:42 rc.cpp:2530
+#. i18n: file ./components/csseditor/cssselectors.ui line 200
+#: rc.cpp:2488
 #, no-c-format
-msgid "Current File"
+msgid "DTD Selection"
 msgstr ""
 
-#. i18n: file ./plugins/pluginconfig.ui line 232
-#: rc.cpp:2533
+#. i18n: file ./components/csseditor/cssselectors.ui line 235
+#: rc.cpp:2491 rc.cpp:2521 rc.cpp:2545 rc.cpp:2569
 #, no-c-format
-msgid "Current File Path"
+msgid "Add Selector"
 msgstr ""
 
-#. i18n: file ./plugins/pluginconfig.ui line 237
-#: rc.cpp:2536
-#, no-c-format
-msgid "Project Folder"
-msgstr "Plygell Cywaith"
-
-#. i18n: file ./plugins/plugineditor.ui line 32
-#: plugins/quantaplugineditor.cpp:45 plugins/quantaplugininterface.cpp:260
-#: rc.cpp:2539
+#. i18n: file ./components/csseditor/cssselectors.ui line 281
+#: parts/kafka/htmldocumentproperties.cpp:97 parts/kafka/wkafkapart.cpp:68
+#: rc.cpp:2497 rc.cpp:2506 rc.cpp:2530 rc.cpp:2554
 #, no-c-format
-msgid "Edit Plugins"
-msgstr ""
+msgid "Selector"
+msgstr "Dewisydd"
 
-#. i18n: file ./plugins/plugineditor.ui line 49
-#: rc.cpp:2542
+#. i18n: file ./components/csseditor/cssselectors.ui line 346
+#: rc.cpp:2503
 #, no-c-format
-msgid "Search paths:"
+msgid "IDs"
 msgstr ""
 
-#. i18n: file ./plugins/plugineditor.ui line 57
-#: rc.cpp:2545 treeviews/basetreeview.cpp:617
+#. i18n: file ./components/csseditor/cssselectors.ui line 540
+#: rc.cpp:2527
 #, no-c-format
-msgid "Plugins"
-msgstr "Ategion"
+msgid "Classes"
+msgstr "Dosbarthiadau"
 
-#. i18n: file ./plugins/plugineditor.ui line 83
+#. i18n: file ./components/csseditor/cssselectors.ui line 734
 #: rc.cpp:2551
 #, no-c-format
-msgid "Valid"
-msgstr "Dilys"
-
-#. i18n: file ./plugins/plugineditor.ui line 94
-#: rc.cpp:2554
-#, no-c-format
-msgid "Location"
-msgstr "Lleoliad"
-
-#. i18n: file ./plugins/plugineditor.ui line 105
-#: rc.cpp:2557 rc.cpp:5200
-#, no-c-format
-msgid "File Name"
-msgstr "Enw Ffeil"
-
-#. i18n: file ./plugins/plugineditor.ui line 116
-#: rc.cpp:2560
-#, no-c-format
-msgid "Output Window"
+msgid "Pseudo"
 msgstr ""
 
-#. i18n: file ./plugins/plugineditor.ui line 145
-#: rc.cpp:2566
-#, no-c-format
-msgid "Configure..."
-msgstr "Ffurfweddu..."
-
-#. i18n: file ./plugins/plugineditor.ui line 178
-#: rc.cpp:2572 rc.cpp:5363
-#, no-c-format
-msgid "Refresh"
-msgstr "Cyfredoli"
-
-#. i18n: file ./project/projectnewwebs.ui line 142
-#: project/projectnewweb.cpp:140 project/projectnewweb.cpp:147
-#: project/projectnewweb.cpp:157 project/projectnewweb.cpp:167 rc.cpp:2578
+#. i18n: file ./project/teammembersdlgs.ui line 24
+#: rc.cpp:2578
 #, no-c-format
-msgid "Start"
-msgstr "Dechrau"
+msgid "&Mailing list:"
+msgstr ""
 
-#. i18n: file ./project/projectnewwebs.ui line 192
+#. i18n: file ./project/teammembersdlgs.ui line 40
 #: rc.cpp:2581
-#, no-c-format
-msgid "wget's command line:"
-msgstr ""
+#, fuzzy, no-c-format
+msgid "You are:"
+msgstr "Enw'r grwp:"
 
-#. i18n: file ./project/projectnewwebs.ui line 215
-#: rc.cpp:2584
-#, no-c-format
-msgid "HTTP"
-msgstr "HTTP"
+#. i18n: file ./project/teammembersdlgs.ui line 53
+#: project/teammembersdlg.cpp:247 rc.cpp:2584
+#, fuzzy, no-c-format
+msgid "Please select your identity from the member list."
+msgstr "Dewiswch un o'r darparwyr o'r rhestr isod:"
 
-#. i18n: file ./project/projectnewwebs.ui line 220
+#. i18n: file ./project/teammembersdlgs.ui line 64
 #: rc.cpp:2587
 #, no-c-format
-msgid "FTP"
-msgstr "FTP"
-
-#. i18n: file ./project/projectnewwebs.ui line 237
-#: rc.cpp:2590
-#, no-c-format
-msgid "Protocol:"
-msgstr "Protocol :"
-
-#. i18n: file ./project/projectnewwebs.ui line 250
-#: rc.cpp:2593
-#, no-c-format
-msgid "Site source:"
-msgstr ""
-
-#. i18n: file ./project/uploadprofiledlgs.ui line 26
-#: project/uploadprofiles.cpp:90 rc.cpp:2596
-#, no-c-format
-msgid "Upload Profile"
+msgid "&Team Members"
 msgstr ""
 
-#. i18n: file ./project/uploadprofiledlgs.ui line 42
+#. i18n: file ./project/teammembersdlgs.ui line 100
 #: rc.cpp:2599
 #, no-c-format
-msgid "&Host:"
-msgstr "&Gwesteiwr:"
+msgid "Nickname"
+msgstr "Ffugenw"
 
-#. i18n: file ./project/uploadprofiledlgs.ui line 53
+#. i18n: file ./project/teammembersdlgs.ui line 111
 #: rc.cpp:2602
 #, no-c-format
-msgid "&User:"
-msgstr "&Defnyddiwr:"
+msgid "Email"
+msgstr "Ebost"
 
-#. i18n: file ./project/uploadprofiledlgs.ui line 64
+#. i18n: file ./project/teammembersdlgs.ui line 122
 #: rc.cpp:2605
 #, no-c-format
-msgid "Pa&th:"
-msgstr "Ll&wybr:"
+msgid "Role"
+msgstr "Rôl"
 
-#. i18n: file ./project/uploadprofiledlgs.ui line 75
-#: rc.cpp:2608 rc.cpp:2667
+#. i18n: file ./project/teammembersdlgs.ui line 133
+#: rc.cpp:2608
 #, no-c-format
-msgid "Profile &name:"
-msgstr "&Enw Proffil:"
+msgid "Task"
+msgstr "Tasg"
 
-#. i18n: file ./project/uploadprofiledlgs.ui line 86
+#. i18n: file ./project/teammembersdlgs.ui line 144
 #: rc.cpp:2611
 #, no-c-format
-msgid "Use as &default profile"
+msgid "Subproject"
 msgstr ""
 
-#. i18n: file ./project/uploadprofiledlgs.ui line 107
-#: rc.cpp:2614
+#. i18n: file ./project/teammembersdlgs.ui line 187
+#: rc.cpp:2617
 #, no-c-format
-msgid "Pass&word:"
-msgstr "Cyf&rinair"
+msgid "Set to &Yourself"
+msgstr ""
 
-#. i18n: file ./project/uploadprofiledlgs.ui line 213
+#. i18n: file ./project/projectnewlocals.ui line 107
+#: rc.cpp:2620
+#, no-c-format
+msgid "Insert files from"
+msgstr ""
+
+#. i18n: file ./project/projectnewlocals.ui line 123
 #: rc.cpp:2623
 #, no-c-format
-msgid "Po&rt:"
-msgstr "Po&rth:"
+msgid "Included files:"
+msgstr ""
 
-#. i18n: file ./project/uploadprofiledlgs.ui line 232
+#. i18n: file ./project/projectnewlocals.ui line 142
 #: rc.cpp:2626
 #, no-c-format
-msgid "&Store password on disc"
-msgstr ""
+msgid "Filters"
+msgstr "Hidlenni"
 
-#. i18n: file ./project/uploadprofiledlgs.ui line 238
+#. i18n: file ./project/projectnewlocals.ui line 159
 #: rc.cpp:2629
 #, no-c-format
-msgid "Keep the password in a file. DANGEROUS! Read the \"What's This?\" text."
+msgid "Insert files with the following &mask:"
 msgstr ""
 
-#. i18n: file ./project/uploadprofiledlgs.ui line 243
+#. i18n: file ./project/projectnewlocals.ui line 175
 #: rc.cpp:2632
 #, no-c-format
-msgid ""
-"<qt>If you check this box, the password will be saved in the local Quanta "
-"configuration file, so every time you start Quanta and load this project, the "
-"password will be loaded and you don't have to enter it. Altough the local "
-"configuration file is readable only by you and the password\n"
-"is obscured, saving the password in any file is a security risk. Use this "
-"option at your own risk."
-"<br>\n"
-"<i>Note:</i> due to the security concerns, the password is not present in the "
-"project file, and moving the project files to another computer or uploading the "
-"project to a server will not move/upload the password to the new place.</qt>"
+msgid "Insert onl&y markup, script and image files"
 msgstr ""
 
-#. i18n: file ./project/uploadprofiledlgs.ui line 264
-#: rc.cpp:2637
+#. i18n: file ./project/projectnewlocals.ui line 236
+#: rc.cpp:2635
 #, no-c-format
-msgid "&Protocol:"
-msgstr "&Protocol :"
+msgid "&Add Files..."
+msgstr ""
 
-#. i18n: file ./project/membereditdlgs.ui line 52
-#: rc.cpp:2646
+#. i18n: file ./project/projectnewlocals.ui line 244
+#: rc.cpp:2638
 #, no-c-format
-msgid "E&dit Subprojects"
+msgid "A&dd Folder..."
 msgstr ""
 
-#. i18n: file ./project/membereditdlgs.ui line 70
-#: rc.cpp:2649
+#. i18n: file ./project/projectnewlocals.ui line 252
+#: rc.cpp:2641
 #, no-c-format
-msgid "Tas&k:"
-msgstr "T&asg :"
-
-#. i18n: file ./project/membereditdlgs.ui line 81
-#: rc.cpp:2652
-#, fuzzy, no-c-format
-msgid "Subpro&ject:"
-msgstr "Pwnc:"
+msgid "&Clear List"
+msgstr "&Gwagu'r Rhestr"
 
-#. i18n: file ./project/membereditdlgs.ui line 92
-#: rc.cpp:2655
+#. i18n: file ./project/rescanprjdir.ui line 39
+#: rc.cpp:2644
 #, no-c-format
-msgid "&Role:"
-msgstr "&Swyddogaeth:"
+msgid "MyDialog"
+msgstr ""
 
-#. i18n: file ./project/membereditdlgs.ui line 103
-#: rc.cpp:2658
+#. i18n: file ./project/rescanprjdir.ui line 58
+#: project/rescanprj.cpp:244 rc.cpp:2647
 #, no-c-format
-msgid "&Email:"
-msgstr "E&bost:"
+msgid "Progress:"
+msgstr "Cynnydd :"
 
-#. i18n: file ./project/projectuploads.ui line 40
-#: rc.cpp:2664
+#. i18n: file ./project/rescanprjdir.ui line 79
+#: rc.cpp:2650
 #, no-c-format
-msgid "Upload Project Files"
+msgid "<b>Add New Files in Project</b>"
 msgstr ""
 
-#. i18n: file ./project/projectuploads.ui line 103
-#: rc.cpp:2670
-#, no-c-format
-msgid "New..."
-msgstr "Newydd ..."
-
-#. i18n: file ./project/projectuploads.ui line 111
-#: rc.cpp:2673
+#. i18n: file ./project/rescanprjdir.ui line 138
+#: rc.cpp:2659
 #, no-c-format
-msgid "Edit..."
-msgstr "Golygu..."
+msgid "Co&llapse All"
+msgstr ""
 
-#. i18n: file ./project/projectuploads.ui line 137
-#: rc.cpp:2679
+#. i18n: file ./project/rescanprjdir.ui line 163
+#: rc.cpp:2662 rc.cpp:2939
 #, no-c-format
-msgid "&Proceed"
-msgstr "&Mynd Ymlaen"
+msgid "&All"
+msgstr "&Popeth"
 
-#. i18n: file ./project/projectuploads.ui line 187
-#: rc.cpp:2685
+#. i18n: file ./project/rescanprjdir.ui line 179
+#: rc.cpp:2668 rc.cpp:2933
 #, no-c-format
-msgid "&Keep passwords in memory"
+msgid "E&xpand All"
 msgstr ""
 
-#. i18n: file ./project/projectuploads.ui line 217
-#: rc.cpp:2688 rc.cpp:2838
+#. i18n: file ./project/rescanprjdir.ui line 198
+#: rc.cpp:2674 rc.cpp:2915
 #, no-c-format
 msgid "&Invert"
 msgstr "&Gwrthdroi"
 
-#. i18n: file ./project/projectuploads.ui line 233
-#: rc.cpp:2694
+#. i18n: file ./project/projectoptions.ui line 33
+#: rc.cpp:2677
 #, no-c-format
-msgid "C&ollapse All"
+msgid "Project Options"
 msgstr ""
 
-#. i18n: file ./project/projectuploads.ui line 241
-#: rc.cpp:2697
+#. i18n: file ./project/projectoptions.ui line 188
+#: rc.cpp:2686
 #, no-c-format
-msgid "U&pdate All"
-msgstr "Di&weddaru Popeth"
+msgid "Project &name:"
+msgstr "Enw'r cy&waith:"
 
-#. i18n: file ./project/projectuploads.ui line 244
-#: rc.cpp:2700
+#. i18n: file ./project/projectoptions.ui line 199
+#: rc.cpp:2689
+#, fuzzy, no-c-format
+msgid "&Templates folder:"
+msgstr "&Patrymluniau :"
+
+#. i18n: file ./project/projectoptions.ui line 216
+#: rc.cpp:2692
+#, fuzzy, no-c-format
+msgid "T&oolbars folder:"
+msgstr "Dewislen Bar Offer"
+
+#. i18n: file ./project/projectoptions.ui line 235
+#: rc.cpp:2695
 #, no-c-format
-msgid "This will cause all files to appear already uploaded"
-msgstr ""
+msgid "&Author:"
+msgstr "Aw&dur:"
 
-#. i18n: file ./project/projectuploads.ui line 252
-#: rc.cpp:2703
+#. i18n: file ./project/projectoptions.ui line 254
+#: rc.cpp:2698
 #, no-c-format
-msgid "&Modified"
-msgstr "&Addaswyd"
+msgid "E&mail:"
+msgstr "E&bost:"
 
-#. i18n: file ./project/projectuploads.ui line 260
-#: rc.cpp:2706 rc.cpp:2832
+#. i18n: file ./project/projectoptions.ui line 273
+#: rc.cpp:2701 rc.cpp:2954
 #, no-c-format
-msgid "E&xpand All"
+msgid "Project Defaults"
 msgstr ""
 
-#. i18n: file ./project/projectuploads.ui line 289
-#: rc.cpp:2709
-#, no-c-format
-msgid "Selection:"
-msgstr "Dewisiad :"
+#. i18n: file ./project/projectoptions.ui line 295
+#: rc.cpp:2707
+#, fuzzy, no-c-format
+msgid "Default &view:"
+msgstr "Amgodiad rhagosodedig:"
 
-#. i18n: file ./project/projectuploads.ui line 305
-#: rc.cpp:2712 rc.cpp:2826
+#. i18n: file ./project/projectoptions.ui line 312
+#: rc.cpp:2710
 #, no-c-format
-msgid "&All"
-msgstr "&Popeth"
+msgid "Default &encoding:"
+msgstr "Amgodiad& rhagosodedig:"
 
-#. i18n: file ./project/projectuploads.ui line 313
-#: rc.cpp:2715
+#. i18n: file ./project/projectoptions.ui line 343
+#: rc.cpp:2716
 #, no-c-format
-msgid "Mark the selected files as uploaded instead of uploading them"
+msgid "E&xclude from project:"
 msgstr ""
 
-#. i18n: file ./project/projectuploads.ui line 339
-#: rc.cpp:2718
+#. i18n: file ./project/projectoptions.ui line 354
+#: rc.cpp:2719
 #, no-c-format
-msgid "Current: [none]"
+msgid "Exclude &files listed in .cvsignore"
 msgstr ""
 
-#. i18n: file ./project/projectuploads.ui line 358
-#: project/projectupload.cpp:235 rc.cpp:2721
+#. i18n: file ./project/projectoptions.ui line 358
+#: rc.cpp:2722
 #, no-c-format
-msgid "Total:"
-msgstr "Cyfanswm:"
+msgid ""
+"The files listed in <i>.cvsignore</i> files will not appear in the project "
+"tree, nor will be shown when you rescan the project folder or upload the "
+"project. Files matching the <i>.cvsignore</i> entries that were already present "
+"in the project will be removed from it, but they will not be removed from the "
+"disc."
+"<br>\n"
+"<b>NOTE:</b> This feature works only for local projects."
+msgstr ""
 
-#. i18n: file ./project/projectnewfinals.ui line 121
-#: rc.cpp:2724
+#. i18n: file ./project/projectoptions.ui line 374
+#: rc.cpp:2726
 #, no-c-format
-msgid "Prefix:"
-msgstr "Rhagddodiad:"
+msgid "Debugger"
+msgstr "Dadnamydd"
 
-#. i18n: file ./project/projectnewfinals.ui line 134
-#: rc.cpp:2727 rc.cpp:3009
+#. i18n: file ./project/projectoptions.ui line 385
+#: rc.cpp:2729
 #, no-c-format
-msgid "Project Defaults"
-msgstr ""
+msgid "Debu&gger:"
+msgstr "D&adnamydd :"
 
-#. i18n: file ./project/projectnewfinals.ui line 151
-#: rc.cpp:2730
+#. i18n: file ./project/projectoptions.ui line 420
+#: rc.cpp:2732
 #, no-c-format
-msgid "Default DTD:"
-msgstr ""
+msgid "Optio&ns"
+msgstr "De&wisiadau"
 
-#. i18n: file ./project/projectnewfinals.ui line 170
-#: rc.cpp:2733
+#. i18n: file ./project/projectoptions.ui line 428
+#: rc.cpp:2735
 #, no-c-format
-msgid "Default encoding:"
-msgstr "Amgodiad rhagosodedig:"
+msgid "Remember &breakpoints across sessions"
+msgstr ""
 
-#. i18n: file ./project/projectnewfinals.ui line 185
-#: rc.cpp:2736
+#. i18n: file ./project/projectoptions.ui line 436
+#: rc.cpp:2738
 #, no-c-format
-msgid "Insert &local templates"
+msgid "Remember watches across sessions"
 msgstr ""
 
-#. i18n: file ./project/projectnewfinals.ui line 193
-#: rc.cpp:2739
+#. i18n: file ./project/projectoptions.ui line 449
+#: rc.cpp:2741
 #, no-c-format
-msgid "Insert &global templates"
+msgid "Use persistent boo&kmarks"
 msgstr ""
 
-#. i18n: file ./project/projectnewfinals.ui line 201
-#: rc.cpp:2742
+#. i18n: file ./project/projectoptions.ui line 465
+#: rc.cpp:2744
 #, no-c-format
-msgid "Use preview prefi&x"
+msgid "&Use preview prefix:"
 msgstr ""
 
-#. i18n: file ./project/projectnewfinals.ui line 209
-#: ../lib/compatibility/knewstuff/uploaddialog.cpp:62 rc.cpp:2745
+#. i18n: file ./project/projectnewgenerals.ui line 121
+#: rc.cpp:2747
 #, no-c-format
-msgid "Author:"
-msgstr "Awdur:"
+msgid "Directory Settings"
+msgstr ""
 
-#. i18n: file ./project/projectnewfinals.ui line 264
-#: rc.cpp:2748
+#. i18n: file ./project/projectnewgenerals.ui line 137
+#: rc.cpp:2750
 #, no-c-format
-msgid "Email:"
-msgstr "Ebost:"
+msgid "Templates directory:"
+msgstr ""
 
-#. i18n: file ./project/subprojecteditdlgs.ui line 35
-#: rc.cpp:2754
+#. i18n: file ./project/projectnewgenerals.ui line 170
+#: rc.cpp:2756
 #, no-c-format
-msgid "The relative path of the subproject folder inside the project."
+msgid "Toolbars directory:"
 msgstr ""
 
-#. i18n: file ./project/subprojecteditdlgs.ui line 48
-#: rc.cpp:2757
+#. i18n: file ./project/projectnewgenerals.ui line 220
+#: rc.cpp:2765
 #, no-c-format
-msgid "&Location:"
-msgstr "&Lleoliad:"
+msgid "Main directory:"
+msgstr ""
 
-#. i18n: file ./project/subprojecteditdlgs.ui line 59
-#: rc.cpp:2760
+#. i18n: file ./project/projectnewgenerals.ui line 240
+#: rc.cpp:2768
 #, no-c-format
-msgid "&Create new subproject"
+msgid "Project Sources"
 msgstr ""
 
-#. i18n: file ./project/subprojecteditdlgs.ui line 62
-#: rc.cpp:2763
+#. i18n: file ./project/projectnewgenerals.ui line 257
+#: rc.cpp:2771
 #, no-c-format
-msgid ""
-"Check this if you want to create a new subproject with the above entered data."
+msgid "&Add local or remote files"
 msgstr ""
 
-#. i18n: file ./project/teammembersdlgs.ui line 24
-#: rc.cpp:2766
+#. i18n: file ./project/projectnewgenerals.ui line 268
+#: rc.cpp:2774
 #, no-c-format
-msgid "&Mailing list:"
+msgid "&Use wget to download files from a site"
 msgstr ""
 
-#. i18n: file ./project/teammembersdlgs.ui line 40
-#: rc.cpp:2769
-#, fuzzy, no-c-format
-msgid "You are:"
-msgstr "Enw'r grwp:"
+#. i18n: file ./project/projectnewgenerals.ui line 297
+#: rc.cpp:2783
+#, no-c-format
+msgid "Server Settings"
+msgstr "Gosodiadau Gweinydd"
 
-#. i18n: file ./project/teammembersdlgs.ui line 53
-#: project/teammembersdlg.cpp:247 rc.cpp:2772
-#, fuzzy, no-c-format
-msgid "Please select your identity from the member list."
-msgstr "Dewiswch un o'r darparwyr o'r rhestr isod:"
+#. i18n: file ./project/projectnewgenerals.ui line 308
+#: rc.cpp:2786
+#, no-c-format
+msgid "Protocol: "
+msgstr "Protocol : "
 
-#. i18n: file ./project/teammembersdlgs.ui line 64
-#: rc.cpp:2775
+#. i18n: file ./project/projectnewgenerals.ui line 321
+#: rc.cpp:2789
 #, no-c-format
-msgid "&Team Members"
-msgstr ""
+msgid "Password:"
+msgstr "Cyfrinair:"
 
-#. i18n: file ./project/teammembersdlgs.ui line 100
-#: rc.cpp:2787
+#. i18n: file ./project/projectnewgenerals.ui line 343
+#: project/projectnewgeneral.cpp:65 project/projectnewgeneral.cpp:129
+#: project/projectnewgeneral.cpp:203 project/projectprivate.cpp:739
+#: rc.cpp:2792
 #, no-c-format
-msgid "Nickname"
-msgstr "Ffugenw"
+msgid "Local"
+msgstr "Lleol"
 
-#. i18n: file ./project/teammembersdlgs.ui line 111
-#: rc.cpp:2790
+#. i18n: file ./project/projectnewgenerals.ui line 382
+#: rc.cpp:2795
 #, no-c-format
-msgid "Email"
-msgstr "Ebost"
+msgid "Port:"
+msgstr "Porth:"
 
-#. i18n: file ./project/teammembersdlgs.ui line 122
-#: rc.cpp:2793
+#. i18n: file ./project/projectnewgenerals.ui line 398
+#: rc.cpp:2798
 #, no-c-format
-msgid "Role"
-msgstr "Rôl"
+msgid "Host:"
+msgstr "Gwesteiwr:"
 
-#. i18n: file ./project/teammembersdlgs.ui line 133
-#: rc.cpp:2796
+#. i18n: file ./project/projectnewgenerals.ui line 409
+#: rc.cpp:2801
 #, no-c-format
-msgid "Task"
-msgstr "Tasg"
+msgid "User:"
+msgstr "Defnyddiwr:"
 
-#. i18n: file ./project/teammembersdlgs.ui line 144
-#: rc.cpp:2799
+#. i18n: file ./project/uploadprofilespage.ui line 46
+#: rc.cpp:2804
 #, no-c-format
-msgid "Subproject"
-msgstr ""
+msgid "Default profile:"
+msgstr "Proffeil Rhagosodedig :"
 
-#. i18n: file ./project/teammembersdlgs.ui line 187
-#: rc.cpp:2805
+#. i18n: file ./project/uploadprofilespage.ui line 62
+#: rc.cpp:2807
 #, no-c-format
-msgid "Set to &Yourself"
+msgid "Edit Profiles"
 msgstr ""
 
-#. i18n: file ./project/rescanprjdir.ui line 39
-#: rc.cpp:2808
+#. i18n: file ./project/uploadprofilespage.ui line 86
+#: rc.cpp:2813
 #, no-c-format
-msgid "MyDialog"
+msgid "Show a &treeview for each profile"
 msgstr ""
 
-#. i18n: file ./project/rescanprjdir.ui line 58
-#: project/rescanprj.cpp:244 rc.cpp:2811
+#. i18n: file ./project/projectnewwebs.ui line 142
+#: project/projectnewweb.cpp:140 project/projectnewweb.cpp:147
+#: project/projectnewweb.cpp:157 project/projectnewweb.cpp:167 rc.cpp:2816
 #, no-c-format
-msgid "Progress:"
-msgstr "Cynnydd :"
+msgid "Start"
+msgstr "Dechrau"
 
-#. i18n: file ./project/rescanprjdir.ui line 79
-#: rc.cpp:2814
+#. i18n: file ./project/projectnewwebs.ui line 192
+#: rc.cpp:2819
 #, no-c-format
-msgid "<b>Add New Files in Project</b>"
+msgid "wget's command line:"
 msgstr ""
 
-#. i18n: file ./project/rescanprjdir.ui line 138
-#: rc.cpp:2823
+#. i18n: file ./project/projectnewwebs.ui line 215
+#: rc.cpp:2822
 #, no-c-format
-msgid "Co&llapse All"
-msgstr ""
+msgid "HTTP"
+msgstr "HTTP"
 
-#. i18n: file ./project/uploadprofilespage.ui line 46
-#: rc.cpp:2841
+#. i18n: file ./project/projectnewwebs.ui line 220
+#: rc.cpp:2825
 #, no-c-format
-msgid "Default profile:"
-msgstr "Proffeil Rhagosodedig :"
+msgid "FTP"
+msgstr "FTP"
 
-#. i18n: file ./project/uploadprofilespage.ui line 62
-#: rc.cpp:2844
+#. i18n: file ./project/projectnewwebs.ui line 237
+#: rc.cpp:2828
 #, no-c-format
-msgid "Edit Profiles"
-msgstr ""
+msgid "Protocol:"
+msgstr "Protocol :"
 
-#. i18n: file ./project/uploadprofilespage.ui line 86
-#: rc.cpp:2850
+#. i18n: file ./project/projectnewwebs.ui line 250
+#: rc.cpp:2831
 #, no-c-format
-msgid "Show a &treeview for each profile"
+msgid "Site source:"
 msgstr ""
 
 #. i18n: file ./project/eventeditordlgs.ui line 49
-#: rc.cpp:2853
+#: rc.cpp:2834
 #, no-c-format
 msgid "Event:"
 msgstr "Digwyddiad :"
 
 #. i18n: file ./project/eventeditordlgs.ui line 78
-#: rc.cpp:2856
+#: rc.cpp:2837
 #, no-c-format
 msgid "Action:"
 msgstr "Gweithred:"
 
 #. i18n: file ./project/eventeditordlgs.ui line 107
-#: rc.cpp:2859
+#: rc.cpp:2840
 #, no-c-format
 msgid "Argument 1:"
 msgstr ""
 
 #. i18n: file ./project/eventeditordlgs.ui line 139
-#: rc.cpp:2862
+#: rc.cpp:2843
 #, no-c-format
 msgid "Argument 2:"
 msgstr ""
 
 #. i18n: file ./project/eventeditordlgs.ui line 171
-#: rc.cpp:2865
+#: rc.cpp:2846
 #, no-c-format
 msgid "Argument 3:"
 msgstr ""
 
 #. i18n: file ./project/eventeditordlgs.ui line 187
-#: rc.cpp:2868
+#: rc.cpp:2849
 #, no-c-format
 msgid "Argument 4:"
 msgstr ""
 
-#. i18n: file ./project/projectnewlocals.ui line 107
-#: rc.cpp:2871
+#. i18n: file ./project/membereditdlgs.ui line 52
+#: rc.cpp:2858
 #, no-c-format
-msgid "Insert files from"
+msgid "E&dit Subprojects"
 msgstr ""
 
-#. i18n: file ./project/projectnewlocals.ui line 123
-#: rc.cpp:2874
+#. i18n: file ./project/membereditdlgs.ui line 70
+#: rc.cpp:2861
 #, no-c-format
-msgid "Included files:"
-msgstr ""
+msgid "Tas&k:"
+msgstr "T&asg :"
 
-#. i18n: file ./project/projectnewlocals.ui line 142
-#: rc.cpp:2877
+#. i18n: file ./project/membereditdlgs.ui line 81
+#: rc.cpp:2864
+#, fuzzy, no-c-format
+msgid "Subpro&ject:"
+msgstr "Pwnc:"
+
+#. i18n: file ./project/membereditdlgs.ui line 92
+#: rc.cpp:2867
 #, no-c-format
-msgid "Filters"
-msgstr "Hidlenni"
+msgid "&Role:"
+msgstr "&Swyddogaeth:"
 
-#. i18n: file ./project/projectnewlocals.ui line 159
-#: rc.cpp:2880
+#. i18n: file ./project/membereditdlgs.ui line 103
+#: rc.cpp:2870
 #, no-c-format
-msgid "Insert files with the following &mask:"
+msgid "&Email:"
+msgstr "E&bost:"
+
+#. i18n: file ./project/subprojecteditdlgs.ui line 35
+#: rc.cpp:2879
+#, no-c-format
+msgid "The relative path of the subproject folder inside the project."
 msgstr ""
 
-#. i18n: file ./project/projectnewlocals.ui line 175
-#: rc.cpp:2883
+#. i18n: file ./project/subprojecteditdlgs.ui line 48
+#: rc.cpp:2882
 #, no-c-format
-msgid "Insert onl&y markup, script and image files"
+msgid "&Location:"
+msgstr "&Lleoliad:"
+
+#. i18n: file ./project/subprojecteditdlgs.ui line 59
+#: rc.cpp:2885
+#, no-c-format
+msgid "&Create new subproject"
 msgstr ""
 
-#. i18n: file ./project/projectnewlocals.ui line 236
-#: rc.cpp:2886
+#. i18n: file ./project/subprojecteditdlgs.ui line 62
+#: rc.cpp:2888
 #, no-c-format
-msgid "&Add Files..."
+msgid ""
+"Check this if you want to create a new subproject with the above entered data."
 msgstr ""
 
-#. i18n: file ./project/projectnewlocals.ui line 244
-#: rc.cpp:2889
+#. i18n: file ./project/projectuploads.ui line 40
+#: rc.cpp:2891
 #, no-c-format
-msgid "A&dd Folder..."
+msgid "Upload Project Files"
 msgstr ""
 
-#. i18n: file ./project/projectnewlocals.ui line 252
-#: rc.cpp:2892
+#. i18n: file ./project/projectuploads.ui line 62
+#: rc.cpp:2894 rc.cpp:3023
 #, no-c-format
-msgid "&Clear List"
-msgstr "&Gwagu'r Rhestr"
+msgid "Profile &name:"
+msgstr "&Enw Proffil:"
 
-#. i18n: file ./project/projectnewgenerals.ui line 121
-#: rc.cpp:2895
+#. i18n: file ./project/projectuploads.ui line 103
+#: rc.cpp:2897
 #, no-c-format
-msgid "Directory Settings"
-msgstr ""
+msgid "New..."
+msgstr "Newydd ..."
 
-#. i18n: file ./project/projectnewgenerals.ui line 137
-#: rc.cpp:2898
+#. i18n: file ./project/projectuploads.ui line 111
+#: rc.cpp:2900
 #, no-c-format
-msgid "Templates directory:"
-msgstr ""
+msgid "Edit..."
+msgstr "Golygu..."
 
-#. i18n: file ./project/projectnewgenerals.ui line 170
-#: rc.cpp:2904
+#. i18n: file ./project/projectuploads.ui line 137
+#: rc.cpp:2906
 #, no-c-format
-msgid "Toolbars directory:"
+msgid "&Proceed"
+msgstr "&Mynd Ymlaen"
+
+#. i18n: file ./project/projectuploads.ui line 187
+#: rc.cpp:2912
+#, no-c-format
+msgid "&Keep passwords in memory"
 msgstr ""
 
-#. i18n: file ./project/projectnewgenerals.ui line 220
-#: rc.cpp:2913
+#. i18n: file ./project/projectuploads.ui line 233
+#: rc.cpp:2921
 #, no-c-format
-msgid "Main directory:"
+msgid "C&ollapse All"
 msgstr ""
 
-#. i18n: file ./project/projectnewgenerals.ui line 240
-#: rc.cpp:2916
+#. i18n: file ./project/projectuploads.ui line 241
+#: rc.cpp:2924
 #, no-c-format
-msgid "Project Sources"
+msgid "U&pdate All"
+msgstr "Di&weddaru Popeth"
+
+#. i18n: file ./project/projectuploads.ui line 244
+#: rc.cpp:2927
+#, no-c-format
+msgid "This will cause all files to appear already uploaded"
 msgstr ""
 
-#. i18n: file ./project/projectnewgenerals.ui line 257
-#: rc.cpp:2919
+#. i18n: file ./project/projectuploads.ui line 252
+#: rc.cpp:2930
 #, no-c-format
-msgid "&Add local or remote files"
+msgid "&Modified"
+msgstr "&Addaswyd"
+
+#. i18n: file ./project/projectuploads.ui line 289
+#: rc.cpp:2936
+#, no-c-format
+msgid "Selection:"
+msgstr "Dewisiad :"
+
+#. i18n: file ./project/projectuploads.ui line 313
+#: rc.cpp:2942
+#, no-c-format
+msgid "Mark the selected files as uploaded instead of uploading them"
 msgstr ""
 
-#. i18n: file ./project/projectnewgenerals.ui line 268
-#: rc.cpp:2922
+#. i18n: file ./project/projectuploads.ui line 339
+#: rc.cpp:2945
 #, no-c-format
-msgid "&Use wget to download files from a site"
+msgid "Current: [none]"
 msgstr ""
 
-#. i18n: file ./project/projectnewgenerals.ui line 297
-#: rc.cpp:2931
+#. i18n: file ./project/projectuploads.ui line 358
+#: project/projectupload.cpp:235 rc.cpp:2948
 #, no-c-format
-msgid "Server Settings"
-msgstr "Gosodiadau Gweinydd"
+msgid "Total:"
+msgstr "Cyfanswm:"
 
-#. i18n: file ./project/projectnewgenerals.ui line 308
-#: rc.cpp:2934
+#. i18n: file ./project/projectnewfinals.ui line 121
+#: rc.cpp:2951
 #, no-c-format
-msgid "Protocol: "
-msgstr "Protocol : "
+msgid "Prefix:"
+msgstr "Rhagddodiad:"
 
-#. i18n: file ./project/projectnewgenerals.ui line 321
-#: rc.cpp:2937
+#. i18n: file ./project/projectnewfinals.ui line 151
+#: rc.cpp:2957
 #, no-c-format
-msgid "Password:"
-msgstr "Cyfrinair:"
+msgid "Default DTD:"
+msgstr ""
 
-#. i18n: file ./project/projectnewgenerals.ui line 343
-#: project/projectnewgeneral.cpp:65 project/projectnewgeneral.cpp:129
-#: project/projectnewgeneral.cpp:203 project/projectprivate.cpp:739
-#: rc.cpp:2940
+#. i18n: file ./project/projectnewfinals.ui line 170
+#: rc.cpp:2960
 #, no-c-format
-msgid "Local"
-msgstr "Lleol"
+msgid "Default encoding:"
+msgstr "Amgodiad rhagosodedig:"
 
-#. i18n: file ./project/projectnewgenerals.ui line 382
-#: rc.cpp:2943
+#. i18n: file ./project/projectnewfinals.ui line 185
+#: rc.cpp:2963
 #, no-c-format
-msgid "Port:"
-msgstr "Porth:"
+msgid "Insert &local templates"
+msgstr ""
 
-#. i18n: file ./project/projectnewgenerals.ui line 398
-#: rc.cpp:2946
+#. i18n: file ./project/projectnewfinals.ui line 193
+#: rc.cpp:2966
 #, no-c-format
-msgid "Host:"
-msgstr "Gwesteiwr:"
+msgid "Insert &global templates"
+msgstr ""
 
-#. i18n: file ./project/projectnewgenerals.ui line 409
-#: rc.cpp:2949
+#. i18n: file ./project/projectnewfinals.ui line 201
+#: rc.cpp:2969
 #, no-c-format
-msgid "User:"
-msgstr "Defnyddiwr:"
+msgid "Use preview prefi&x"
+msgstr ""
+
+#. i18n: file ./project/projectnewfinals.ui line 209
+#: ../lib/compatibility/knewstuff/uploaddialog.cpp:62 rc.cpp:2972
+#, no-c-format
+msgid "Author:"
+msgstr "Awdur:"
+
+#. i18n: file ./project/projectnewfinals.ui line 264
+#: rc.cpp:2975
+#, no-c-format
+msgid "Email:"
+msgstr "Ebost:"
 
 #. i18n: file ./project/eventconfigurationdlgs.ui line 24
-#: rc.cpp:2952
+#: rc.cpp:2978
 #, no-c-format
 msgid "Ena&ble the event actions"
 msgstr ""
 
 #. i18n: file ./project/eventconfigurationdlgs.ui line 35
-#: rc.cpp:2955
+#: rc.cpp:2981
 #, no-c-format
 msgid "Configure Events"
 msgstr "Ffurfweddu Digwyddiadau"
 
 #. i18n: file ./project/eventconfigurationdlgs.ui line 46
-#: rc.cpp:2958
+#: rc.cpp:2984
 #, no-c-format
 msgid "&Add"
 msgstr "&Ychwanegu"
 
 #. i18n: file ./project/eventconfigurationdlgs.ui line 77
-#: rc.cpp:2964
+#: rc.cpp:2990
 #, no-c-format
 msgid "Event"
 msgstr "Digwyddiad"
 
 #. i18n: file ./project/eventconfigurationdlgs.ui line 88
-#: rc.cpp:2967
+#: rc.cpp:2993
 #, no-c-format
 msgid "Action"
 msgstr "Gweithred"
 
 #. i18n: file ./project/eventconfigurationdlgs.ui line 99
-#: rc.cpp:2970
+#: rc.cpp:2996
 #, no-c-format
 msgid "Argument 1"
 msgstr ""
 
 #. i18n: file ./project/eventconfigurationdlgs.ui line 110
-#: rc.cpp:2973
+#: rc.cpp:2999
 #, no-c-format
 msgid "Argument 2"
 msgstr ""
 
 #. i18n: file ./project/eventconfigurationdlgs.ui line 121
-#: rc.cpp:2976
+#: rc.cpp:3002
 #, no-c-format
 msgid "Argument 3"
 msgstr ""
 
 #. i18n: file ./project/eventconfigurationdlgs.ui line 132
-#: rc.cpp:2979
+#: rc.cpp:3005
 #, no-c-format
 msgid "Argument 4"
 msgstr ""
 
-#. i18n: file ./project/projectoptions.ui line 33
-#: rc.cpp:2985
+#. i18n: file ./project/uploadprofiledlgs.ui line 26
+#: project/uploadprofiles.cpp:90 rc.cpp:3011
 #, no-c-format
-msgid "Project Options"
+msgid "Upload Profile"
 msgstr ""
 
-#. i18n: file ./project/projectoptions.ui line 188
-#: rc.cpp:2994
-#, no-c-format
-msgid "Project &name:"
-msgstr "Enw'r cy&waith:"
-
-#. i18n: file ./project/projectoptions.ui line 199
-#: rc.cpp:2997
-#, fuzzy, no-c-format
-msgid "&Templates folder:"
-msgstr "&Patrymluniau :"
-
-#. i18n: file ./project/projectoptions.ui line 216
-#: rc.cpp:3000
-#, fuzzy, no-c-format
-msgid "T&oolbars folder:"
-msgstr "Dewislen Bar Offer"
-
-#. i18n: file ./project/projectoptions.ui line 235
-#: rc.cpp:3003
-#, no-c-format
-msgid "&Author:"
-msgstr "Aw&dur:"
-
-#. i18n: file ./project/projectoptions.ui line 254
-#: rc.cpp:3006
-#, no-c-format
-msgid "E&mail:"
-msgstr "E&bost:"
-
-#. i18n: file ./project/projectoptions.ui line 295
-#: rc.cpp:3015
-#, fuzzy, no-c-format
-msgid "Default &view:"
-msgstr "Amgodiad rhagosodedig:"
-
-#. i18n: file ./project/projectoptions.ui line 312
-#: rc.cpp:3018
+#. i18n: file ./project/uploadprofiledlgs.ui line 42
+#: rc.cpp:3014
 #, no-c-format
-msgid "Default &encoding:"
-msgstr "Amgodiad& rhagosodedig:"
+msgid "&Host:"
+msgstr "&Gwesteiwr:"
 
-#. i18n: file ./project/projectoptions.ui line 343
-#: rc.cpp:3024
+#. i18n: file ./project/uploadprofiledlgs.ui line 53
+#: rc.cpp:3017
 #, no-c-format
-msgid "E&xclude from project:"
-msgstr ""
+msgid "&User:"
+msgstr "&Defnyddiwr:"
 
-#. i18n: file ./project/projectoptions.ui line 354
-#: rc.cpp:3027
+#. i18n: file ./project/uploadprofiledlgs.ui line 64
+#: rc.cpp:3020
 #, no-c-format
-msgid "Exclude &files listed in .cvsignore"
-msgstr ""
+msgid "Pa&th:"
+msgstr "Ll&wybr:"
 
-#. i18n: file ./project/projectoptions.ui line 358
-#: rc.cpp:3030
+#. i18n: file ./project/uploadprofiledlgs.ui line 86
+#: rc.cpp:3026
 #, no-c-format
-msgid ""
-"The files listed in <i>.cvsignore</i> files will not appear in the project "
-"tree, nor will be shown when you rescan the project folder or upload the "
-"project. Files matching the <i>.cvsignore</i> entries that were already present "
-"in the project will be removed from it, but they will not be removed from the "
-"disc."
-"<br>\n"
-"<b>NOTE:</b> This feature works only for local projects."
+msgid "Use as &default profile"
 msgstr ""
 
-#. i18n: file ./project/projectoptions.ui line 374
-#: rc.cpp:3034
-#, no-c-format
-msgid "Debugger"
-msgstr "Dadnamydd"
-
-#. i18n: file ./project/projectoptions.ui line 385
-#: rc.cpp:3037
+#. i18n: file ./project/uploadprofiledlgs.ui line 107
+#: rc.cpp:3029
 #, no-c-format
-msgid "Debu&gger:"
-msgstr "D&adnamydd :"
+msgid "Pass&word:"
+msgstr "Cyf&rinair"
 
-#. i18n: file ./project/projectoptions.ui line 420
-#: rc.cpp:3040
+#. i18n: file ./project/uploadprofiledlgs.ui line 213
+#: rc.cpp:3038
 #, no-c-format
-msgid "Optio&ns"
-msgstr "De&wisiadau"
+msgid "Po&rt:"
+msgstr "Po&rth:"
 
-#. i18n: file ./project/projectoptions.ui line 428
-#: rc.cpp:3043
+#. i18n: file ./project/uploadprofiledlgs.ui line 232
+#: rc.cpp:3041
 #, no-c-format
-msgid "Remember &breakpoints across sessions"
+msgid "&Store password on disc"
 msgstr ""
 
-#. i18n: file ./project/projectoptions.ui line 436
-#: rc.cpp:3046
+#. i18n: file ./project/uploadprofiledlgs.ui line 238
+#: rc.cpp:3044
 #, no-c-format
-msgid "Remember watches across sessions"
+msgid "Keep the password in a file. DANGEROUS! Read the \"What's This?\" text."
 msgstr ""
 
-#. i18n: file ./project/projectoptions.ui line 449
-#: rc.cpp:3049
+#. i18n: file ./project/uploadprofiledlgs.ui line 243
+#: rc.cpp:3047
 #, no-c-format
-msgid "Use persistent boo&kmarks"
+msgid ""
+"<qt>If you check this box, the password will be saved in the local Quanta "
+"configuration file, so every time you start Quanta and load this project, the "
+"password will be loaded and you don't have to enter it. Altough the local "
+"configuration file is readable only by you and the password\n"
+"is obscured, saving the password in any file is a security risk. Use this "
+"option at your own risk."
+"<br>\n"
+"<i>Note:</i> due to the security concerns, the password is not present in the "
+"project file, and moving the project files to another computer or uploading the "
+"project to a server will not move/upload the password to the new place.</qt>"
 msgstr ""
 
-#. i18n: file ./project/projectoptions.ui line 465
+#. i18n: file ./project/uploadprofiledlgs.ui line 264
 #: rc.cpp:3052
 #, no-c-format
-msgid "&Use preview prefix:"
-msgstr ""
+msgid "&Protocol:"
+msgstr "&Protocol :"
 
 #. i18n: file ./data/config/quantaui.rc line 13
 #: rc.cpp:3058
@@ -4620,327 +4620,403 @@ msgstr "Ate&gion"
 msgid "T&ools"
 msgstr "O&ffer"
 
-#. i18n: file ./data/config/quantaui.rc line 192
+#. i18n: file ./data/config/quantaui.rc line 189
 #: rc.cpp:3106
 #, no-c-format
 msgid "Editor Toolbar"
 msgstr ""
 
-#. i18n: file ./data/config/quantaui.rc line 200
+#. i18n: file ./data/config/quantaui.rc line 197
 #: rc.cpp:3109
 #, no-c-format
 msgid "Plugins Toolbar"
 msgstr ""
 
-#. i18n: file ./data/config/quantaui.rc line 207
+#. i18n: file ./data/config/quantaui.rc line 204
 #: rc.cpp:3112
 #, no-c-format
 msgid "Navigation Toolbar"
 msgstr ""
 
-#. i18n: file ./data/config/quantaui.rc line 230
+#. i18n: file ./data/config/quantaui.rc line 227
 #: rc.cpp:3115
 #, no-c-format
 msgid "&Debug"
 msgstr ""
 
-#. i18n: file ./data/config/quantaui.rc line 232
+#. i18n: file ./data/config/quantaui.rc line 229
 #: rc.cpp:3118
 #, no-c-format
 msgid "Session"
 msgstr "Sesiwn"
 
-#. i18n: file ./data/config/quantaui.rc line 237
+#. i18n: file ./data/config/quantaui.rc line 234
 #: rc.cpp:3121
 #, no-c-format
 msgid "&Execution"
 msgstr ""
 
-#. i18n: file ./data/config/quantaui.rc line 252
+#. i18n: file ./data/config/quantaui.rc line 249
 #: rc.cpp:3124
 #, no-c-format
 msgid "&Breakpoints"
 msgstr ""
 
-#. i18n: file ./data/config/quantaui.rc line 258
+#. i18n: file ./data/config/quantaui.rc line 255
 #: rc.cpp:3127
 #, no-c-format
 msgid "&Variables"
 msgstr "&Newidynnau"
 
-#. i18n: file ./data/config/quantaui.rc line 263
+#. i18n: file ./data/config/quantaui.rc line 260
 #: rc.cpp:3130
 #, fuzzy, no-c-format
 msgid "&Profiler"
 msgstr "Cyfredol: %1"
 
-#. i18n: file ./data/config/quantaui.rc line 268
+#. i18n: file ./data/config/quantaui.rc line 265
 #: rc.cpp:3133
 #, no-c-format
 msgid "Debugger Toolbar"
 msgstr ""
 
-#. i18n: file ./data/config/quantaui.rc line 287
+#. i18n: file ./data/config/quantaui.rc line 284
 #: rc.cpp:3136
 #, no-c-format
 msgid "Project Toolbar"
 msgstr ""
 
-#. i18n: file ./scripts/scriptinfo.kmdr line 16
+#. i18n: file ./scripts/meinproc.kmdr line 18
 #: rc.cpp:3139
 #, no-c-format
-msgid "Quanta Script Info Generator"
-msgstr ""
-
-#. i18n: file ./scripts/scriptinfo.kmdr line 37
-#: rc.cpp:3142
-#, no-c-format
-msgid "Enter Info"
+msgid "Quanta+: meinproc"
 msgstr ""
 
-#. i18n: file ./scripts/scriptinfo.kmdr line 61
-#: rc.cpp:3145
+#. i18n: file ./scripts/meinproc.kmdr line 54
+#: rc.cpp:3145 rc.cpp:3568
 #, no-c-format
-msgid "Please fill in all fields"
-msgstr ""
+msgid "&Process"
+msgstr "&Proses"
 
-#. i18n: file ./scripts/scriptinfo.kmdr line 69
+#. i18n: file ./scripts/meinproc.kmdr line 146
 #: rc.cpp:3148
 #, fuzzy, no-c-format
-msgid "Script name:"
-msgstr "Enw'r grwp:"
+msgid "Current working folder &in Quanta"
+msgstr "Creu Plygell Newydd"
 
-#. i18n: file ./scripts/scriptinfo.kmdr line 90
-#: rc.cpp:3151
+#. i18n: file ./scripts/meinproc.kmdr line 206
+#: rc.cpp:3151 rc.cpp:3328
 #, no-c-format
-msgid "Enter the script name with the extension"
+msgid "Other folder:"
 msgstr ""
 
-#. i18n: file ./scripts/scriptinfo.kmdr line 98
+#. i18n: file ./scripts/meinproc.kmdr line 249
 #: rc.cpp:3154
-#, fuzzy, no-c-format
-msgid "About script:"
-msgstr "Isysgrif"
+#, no-c-format
+msgid "View in &Konqueror"
+msgstr ""
 
-#. i18n: file ./scripts/scriptinfo.kmdr line 111
+#. i18n: file ./scripts/tablewizard.kmdr line 18
 #: rc.cpp:3157
 #, no-c-format
-msgid "Formatting may be done with XHTML tags"
+msgid "Docbook Table Wizard"
 msgstr ""
 
-#. i18n: file ./scripts/scriptinfo.kmdr line 119
-#: rc.cpp:3160
+#. i18n: file ./scripts/tablewizard.kmdr line 63
+#: rc.cpp:3163
 #, no-c-format
-msgid "http://"
+msgid ""
+"Click here to cancel the creation of the table. No action will be performed."
 msgstr ""
 
-#. i18n: file ./scripts/scriptinfo.kmdr line 127
-#: rc.cpp:3163
+#. i18n: file ./scripts/tablewizard.kmdr line 98
+#: rc.cpp:3169
 #, no-c-format
-msgid "The location of your up-to-date file on the web"
+msgid "Press this button to create the table or informaltable."
 msgstr ""
 
-#. i18n: file ./scripts/scriptinfo.kmdr line 135
-#: rc.cpp:3166
+#. i18n: file ./scripts/tablewizard.kmdr line 125
+#: rc.cpp:3172
 #, fuzzy, no-c-format
-msgid "Script author:"
-msgstr "&Sgriptiau :"
+msgid "Table Options"
+msgstr "Dewisiadau Cyffredinol"
 
-#. i18n: file ./scripts/scriptinfo.kmdr line 143
-#: rc.cpp:3169
+#. i18n: file ./scripts/tablewizard.kmdr line 133
+#: rc.cpp:3175 rc.cpp:3187 rc.cpp:3199
+#, no-c-format
+msgid ""
+"Enter here the id of the table or informaltable. You can use the id to link or "
+"reference to the table or informaltable elsewhere in the document."
+msgstr ""
+
+#. i18n: file ./scripts/tablewizard.kmdr line 164
+#: rc.cpp:3178
+#, no-c-format
+msgid "Number of columns:"
+msgstr "Nifer colofnau:"
+
+#. i18n: file ./scripts/tablewizard.kmdr line 167
+#: rc.cpp:3181 rc.cpp:3217
+#, no-c-format
+msgid ""
+"Select or enter in this spin box the number of columns that should be created "
+"by the wizard."
+msgstr ""
+
+#. i18n: file ./scripts/tablewizard.kmdr line 175
+#: rc.cpp:3184
 #, fuzzy, no-c-format
-msgid "Script license:"
-msgstr "&Sgriptiau :"
+msgid "Table id:"
+msgstr "Tabl"
 
-#. i18n: file ./scripts/scriptinfo.kmdr line 159
-#: rc.cpp:3172
+#. i18n: file ./scripts/tablewizard.kmdr line 189
+#: rc.cpp:3190
 #, no-c-format
-msgid "Select the directory to write the .info file to"
+msgid "&Add table header"
 msgstr ""
 
-#. i18n: file ./scripts/scriptinfo.kmdr line 165
-#: rc.cpp:3175
+#. i18n: file ./scripts/tablewizard.kmdr line 203
+#: rc.cpp:3193
 #, no-c-format
-msgid "GPL-2"
+msgid ""
+"Check this box to create a table header. The table header is the first row of "
+"the table, and has the same number of entries as the other rows."
 msgstr ""
 
-#. i18n: file ./scripts/scriptinfo.kmdr line 170
-#: ../lib/compatibility/knewstuff/uploaddialog.cpp:83 rc.cpp:3178
+#. i18n: file ./scripts/tablewizard.kmdr line 211
+#: rc.cpp:3196
+#, fuzzy, no-c-format
+msgid "table_id"
+msgstr "Dilys"
+
+#. i18n: file ./scripts/tablewizard.kmdr line 243
+#: rc.cpp:3202 rc.cpp:3208
 #, no-c-format
-msgid "LGPL"
-msgstr "LGPL"
+msgid ""
+"Select or enter in this spin box the number of rows that should be created by "
+"the wizard. After using the wizard, you can add (or remove) more rows. To add "
+"more rows,  add the same number of <entry> tags per <row> "
+"tag as in the rest of the table."
+msgstr ""
 
-#. i18n: file ./scripts/scriptinfo.kmdr line 175
-#: ../lib/compatibility/knewstuff/uploaddialog.cpp:84 rc.cpp:3181
+#. i18n: file ./scripts/tablewizard.kmdr line 251
+#: rc.cpp:3205
 #, no-c-format
-msgid "BSD"
-msgstr "BSD"
+msgid "Number of rows:"
+msgstr "Nifer rhesi:"
 
-#. i18n: file ./scripts/scriptinfo.kmdr line 180
-#: rc.cpp:3184
+#. i18n: file ./scripts/tablewizard.kmdr line 265
+#: rc.cpp:3211
+#, fuzzy, no-c-format
+msgid "Table title:"
+msgstr "Teitl:"
+
+#. i18n: file ./scripts/tablewizard.kmdr line 268
+#: rc.cpp:3214 rc.cpp:3223
 #, no-c-format
-msgid "Public Domain"
+msgid ""
+"Enter here the title of the table. The title of the table will appear in the "
+"table of contents as well, under the \"List of Tables\", if you are using the "
+"KDE DocBook tools."
 msgstr ""
 
-#. i18n: file ./scripts/scriptinfo.kmdr line 185
-#: rc.cpp:3187 rc.cpp:4838
+#. i18n: file ./scripts/tablewizard.kmdr line 300
+#: rc.cpp:3220
+#, fuzzy, no-c-format
+msgid "Table Title"
+msgstr "Tabl"
+
+#. i18n: file ./scripts/tablewizard.kmdr line 320
+#: rc.cpp:3226
+#, fuzzy, no-c-format
+msgid "Table Type"
+msgstr "Tabl"
+
+#. i18n: file ./scripts/tablewizard.kmdr line 337
+#: rc.cpp:3229
 #, no-c-format
-msgid "Other"
-msgstr "Arall"
+msgid "ta&ble"
+msgstr "ta&bl"
 
-#. i18n: file ./scripts/scriptinfo.kmdr line 200
-#: rc.cpp:3190
+#. i18n: file ./scripts/tablewizard.kmdr line 358
+#: rc.cpp:3232
 #, no-c-format
-msgid "If other include in about"
+msgid "Select this option to generate a formal table (table)."
 msgstr ""
 
-#. i18n: file ./scripts/scriptinfo.kmdr line 208
-#: rc.cpp:3193
+#. i18n: file ./scripts/tablewizard.kmdr line 369
+#: rc.cpp:3235
 #, no-c-format
-msgid "Editor/Executor:"
+msgid "&informaltable"
 msgstr ""
 
-#. i18n: file ./scripts/scriptinfo.kmdr line 216
-#: rc.cpp:3196
+#. i18n: file ./scripts/tablewizard.kmdr line 389
+#: rc.cpp:3238
+#, no-c-format
+msgid "Select this option to generate an informal table (informaltable)."
+msgstr ""
+
+#. i18n: file ./scripts/tablewizard.kmdr line 409
+#: rc.cpp:3241
+#, no-c-format
+msgid ""
+"<qt>\n"
+"Select the table type:\n"
+"<ul>\n"
+"<li><b>informaltable:</b> the most used table type in KDE docs. A informaltable "
+"does not contain title, table head or entry in the table of contents.</li>\n"
+"<li><b>table:</b> a complete and formal table type, including title, table head "
+"and entry in the table of contents.</li>\n"
+"</ul>\n"
+"</qt>"
+msgstr ""
+
+#. i18n: file ./scripts/xmlval.kmdr line 18
+#: rc.cpp:3250
+#, no-c-format
+msgid "Quanta+ XML Validator"
+msgstr ""
+
+#. i18n: file ./scripts/xmlval.kmdr line 92
+#: rc.cpp:3253
 #, fuzzy, no-c-format
-msgid "Author email:"
-msgstr "Awdur:"
+msgid "C&urrent file"
+msgstr "Cyfredol: %1"
 
-#. i18n: file ./scripts/scriptinfo.kmdr line 224
-#: rc.cpp:3199
+#. i18n: file ./scripts/xmlval.kmdr line 155
+#: rc.cpp:3256
 #, fuzzy, no-c-format
-msgid "Web address:"
-msgstr "Cyfeiriad Ebost:"
+msgid "Other file:"
+msgstr "Arall"
 
-#. i18n: file ./scripts/scriptinfo.kmdr line 232
-#: rc.cpp:3202
+#. i18n: file ./scripts/xmlval.kmdr line 209
+#: rc.cpp:3259
 #, no-c-format
-msgid "Version number:"
-msgstr "Rhif y Fersiwn :"
+msgid "Validate against:"
+msgstr ""
 
-#. i18n: file ./scripts/scriptinfo.kmdr line 273
-#: rc.cpp:3205
+#. i18n: file ./scripts/xmlval.kmdr line 232
+#: rc.cpp:3262
 #, no-c-format
-msgid "kmdr-editor"
+msgid "DTD (Internal)"
 msgstr ""
 
-#. i18n: file ./scripts/scriptinfo.kmdr line 278
-#: rc.cpp:3208
+#. i18n: file ./scripts/xmlval.kmdr line 237
+#: rc.cpp:3265
 #, no-c-format
-msgid "kwrite"
-msgstr "kwrite"
+msgid "DTD (External)"
+msgstr ""
 
-#. i18n: file ./scripts/scriptinfo.kmdr line 283
-#: rc.cpp:3211
+#. i18n: file ./scripts/xmlval.kmdr line 242
+#: rc.cpp:3268
 #, no-c-format
-msgid "kate"
-msgstr "kate"
+msgid "XML Schema"
+msgstr ""
 
-#. i18n: file ./scripts/scriptinfo.kmdr line 288
-#: rc.cpp:3214
+#. i18n: file ./scripts/xmlval.kmdr line 247
+#: rc.cpp:3271 rc.cpp:3277
 #, no-c-format
-msgid "tdevelop"
+msgid "RelaxNG Schema"
 msgstr ""
 
-#. i18n: file ./scripts/scriptinfo.kmdr line 303
-#: rc.cpp:3217
+#. i18n: file ./scripts/xmlval.kmdr line 291
+#: rc.cpp:3274
 #, no-c-format
-msgid "Optional: Editor other than Quanta to use for this script"
+msgid "DTD"
 msgstr ""
 
-#. i18n: file ./scripts/scriptinfo.kmdr line 314
-#: rc.cpp:3220
+#. i18n: file ./scripts/xmlval.kmdr line 293
+#: rc.cpp:3280
 #, no-c-format
-msgid "kmdr-executor -c quanta"
+msgid "W3C XML Schema"
 msgstr ""
 
-#. i18n: file ./scripts/scriptinfo.kmdr line 319
-#: rc.cpp:3223
+#. i18n: file ./scripts/xmlval.kmdr line 318
+#: rc.cpp:3283
 #, no-c-format
-msgid "kmdr-executor"
+msgid "Well-formed checking &only"
 msgstr ""
 
-#. i18n: file ./scripts/scriptinfo.kmdr line 324
-#: rc.cpp:3226
+#. i18n: file ./scripts/xmlval.kmdr line 374
+#: rc.cpp:3286
 #, no-c-format
-msgid "perl"
+msgid "Definition URI:"
 msgstr ""
 
-#. i18n: file ./scripts/scriptinfo.kmdr line 329
-#: rc.cpp:3229
-#, no-c-format
-msgid "php"
-msgstr "php"
+#. i18n: file ./scripts/xmlval.kmdr line 416
+#: rc.cpp:3289 rc.cpp:3319
+#, fuzzy, no-c-format
+msgid "&Validate"
+msgstr "Dilys"
 
-#. i18n: file ./scripts/scriptinfo.kmdr line 344
-#: rc.cpp:3232
+#. i18n: file ./scripts/xsltproc.kmdr line 18
+#: rc.cpp:3295
 #, no-c-format
-msgid "Optional: External program executor"
+msgid "Quanta+: xsltproc"
 msgstr ""
 
-#. i18n: file ./scripts/scriptinfo.kmdr line 352
-#: rc.cpp:3235 rc.cpp:3749
+#. i18n: file ./scripts/xsltproc.kmdr line 66
+#: rc.cpp:3298
+#, no-c-format
+msgid "&Translate"
+msgstr "&Trosi"
+
+#. i18n: file ./scripts/xsltproc.kmdr line 143
+#: rc.cpp:3304
 #, fuzzy, no-c-format
-msgid "Script location:"
-msgstr "Disgrifiad:"
+msgid "Current file"
+msgstr "Cyfredol: %1"
 
-#. i18n: file ./scripts/scriptinfo.kmdr line 360
-#: rc.cpp:3238
+#. i18n: file ./scripts/xsltproc.kmdr line 184
+#: rc.cpp:3307
 #, no-c-format
-msgid "Write File"
-msgstr ""
+msgid "File location:"
+msgstr "Lleoliad y ffeil:"
 
-#. i18n: file ./scripts/scriptinfo.kmdr line 431
-#: rc.cpp:3244
+#. i18n: file ./scripts/xsltproc.kmdr line 221
+#: rc.cpp:3310
+#, fuzzy, no-c-format
+msgid "Stylesheet location:"
+msgstr "Dewisiad :"
+
+#. i18n: file ./scripts/xsltproc.kmdr line 255
+#: rc.cpp:3313
+#, fuzzy, no-c-format
+msgid "Output file name:"
+msgstr "Enw'r ffeil:"
+
+#. i18n: file ./scripts/checkxml.kmdr line 18
+#: rc.cpp:3316
 #, no-c-format
-msgid ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /></head>"
-"<body style=\"font-size:11pt;font-family:sans-serif\">\n"
-"<p style=\"margin-top:16px\"><span style=\"font-weight:600\">"
-"Quanta Plus Submitter Info Files</span></p>\n"
-"<p>The purpose of these files is to provide developers with proper credit, "
-"expose licensing information and give users thumbnail information about scripts "
-"and templates at a glance. We ask that you try to do several things here.</p>\n"
-"<ul type=\"disc\">"
-"<li>Fill in all the fields. They are all there for a reason.</li>\n"
-"<li>Contact the appropriate Quanta script and template maintainer or a member "
-"of our team when you have new releases so we can include them. As we plan to "
-"build a huge repository we have to rely on you here.</li></ul>\n"
-"<p>The additional information serves as a backup. Any time a user wants they "
-"can click the link to go to your site and get updates, docs or whatever they "
-"require. Thank you for helping us to make this a great feature</p>\n"
-"<p align=\"center\" style=\"margin-top:14px\"><span style=\"font-weight:600\">"
-"Contact Information</span></p>\n"
-"<p align=\"center\">Quanta Resource Maintainer - (none at this time)<br />"
-"Lead Developer - Andras Mantia <a "
-"href=\"mailto:amantia@kde.org?subject=ScriptInfo\">amantia@kde.org</a><br />"
-"Kommander - Michal Rudolf <a "
-"href=\"mailto:mrudolf@kdewebdev.org?subject=ScriptInfo\">"
-"mrudolf@kdewebdev.org</a><br />Project Lead - Eric Laffoon <a "
-"href=\"mailto:sequitur@kde.org?subject=ScriptInfo\">sequitur@kde.org</a></p>\n"
-"</body></html>\n"
+msgid "Quanta+ KDE XML Validator"
 msgstr ""
 
+#. i18n: file ./scripts/checkxml.kmdr line 184
+#: rc.cpp:3325
+#, fuzzy, no-c-format
+msgid "C&urrent working folder"
+msgstr "Creu Plygell Newydd"
+
 #. i18n: file ./scripts/tidy.kmdr line 16
-#: rc.cpp:3256
+#: rc.cpp:3331
 #, no-c-format
 msgid "Tidy by Kommander"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 37
-#: rc.cpp:3259
+#: rc.cpp:3334
 #, no-c-format
 msgid "General Options"
 msgstr "Dewisiadau Cyffredinol"
 
 #. i18n: file ./scripts/tidy.kmdr line 54
-#: rc.cpp:3262
+#: rc.cpp:3337
 #, no-c-format
 msgid "Non Tidy Option"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 78
-#: rc.cpp:3265
+#: rc.cpp:3340
 #, no-c-format
 msgid ""
 "Note:  This will not work well if you have multiple\n"
@@ -4948,253 +5024,253 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 86
-#: rc.cpp:3269
+#: rc.cpp:3344
 #, no-c-format
 msgid "Use DCOP to send active page from Quanta+ to tidy"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 116
-#: rc.cpp:3272
+#: rc.cpp:3347
 #, no-c-format
 msgid "Path to tidy (required):"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 137
-#: rc.cpp:3275
+#: rc.cpp:3350
 #, no-c-format
 msgid "Input from file instead of stdin:"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 152
-#: rc.cpp:3278
+#: rc.cpp:3353
 #, no-c-format
 msgid "Write errors to file instead of stderr:"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 167
-#: rc.cpp:3281
+#: rc.cpp:3356
 #, no-c-format
 msgid "Use configuration from file:"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 182
-#: rc.cpp:3284
+#: rc.cpp:3359
 #, no-c-format
 msgid "Output to file instead of stdout:"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 226
-#: rc.cpp:3287
+#: rc.cpp:3362
 #, no-c-format
 msgid "Modify original input files"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 251
-#: rc.cpp:3290
+#: rc.cpp:3365
 #, no-c-format
 msgid "/usr/bin"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 266
-#: rc.cpp:3293
+#: rc.cpp:3368
 #, no-c-format
 msgid "Processing Directives"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 297
-#: rc.cpp:3296
+#: rc.cpp:3371
 #, no-c-format
 msgid "Force XHTML to well-formed HTML"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 312
-#: rc.cpp:3299
+#: rc.cpp:3374
 #, no-c-format
 msgid "Convert HTML to well-formed XHTML"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 327
-#: rc.cpp:3302
+#: rc.cpp:3377
 #, no-c-format
 msgid "Replace FONT, NOBR and CENTER tags by CSS"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 342
-#: rc.cpp:3305
+#: rc.cpp:3380
 #, no-c-format
 msgid "Force tags to upper case"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 357
-#: rc.cpp:3308
+#: rc.cpp:3383
 #, no-c-format
 msgid "Specify the input is well-formed XML"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 372
-#: rc.cpp:3311
+#: rc.cpp:3386
 #, no-c-format
 msgid "Omit optional end tags"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 387
-#: rc.cpp:3314
+#: rc.cpp:3389
 #, no-c-format
 msgid "Do extra accessibility checks <level>:"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 411
-#: rc.cpp:3317
+#: rc.cpp:3392
 #, no-c-format
 msgid "Output numeric rather than named entities"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 426
-#: rc.cpp:3320
+#: rc.cpp:3395
 #, no-c-format
 msgid "Only show errors"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 451
-#: rc.cpp:3323
+#: rc.cpp:3398
 #, no-c-format
 msgid "Wrap text at column:"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 459
-#: rc.cpp:3326
+#: rc.cpp:3401
 #, no-c-format
 msgid "Convert HTML to well-formed XML"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 474
-#: rc.cpp:3329
+#: rc.cpp:3404
 #, no-c-format
 msgid "Indent element content"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 489
-#: rc.cpp:3332
+#: rc.cpp:3407
 #, no-c-format
 msgid "Strip out smart quotes and em dashes, etc."
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 504
-#: rc.cpp:3335
+#: rc.cpp:3410
 #, no-c-format
 msgid "Suppress nonessential output"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 523
-#: rc.cpp:3338
+#: rc.cpp:3413
 #, no-c-format
 msgid "Character Encodings"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 557
-#: rc.cpp:3341
+#: rc.cpp:3416
 #, no-c-format
 msgid "(ibm858) use IBM-858 (CP850+Euro) for input, US-ASCII for output"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 571
-#: rc.cpp:3344
+#: rc.cpp:3419
 #, no-c-format
 msgid "(raw) output values above 127 without conversion to entities"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 588
-#: rc.cpp:3347
+#: rc.cpp:3422
 #, no-c-format
 msgid "(utf16le) use UTF-16LE for both input and output"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 602
-#: rc.cpp:3350
+#: rc.cpp:3425
 #, no-c-format
 msgid "(latin1) use ISO-8859-1 for both input and output"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 616
-#: rc.cpp:3353
+#: rc.cpp:3428
 #, no-c-format
 msgid "(win1252) use Windows-1252 for input, US-ASCII for output"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 638
-#: rc.cpp:3356
+#: rc.cpp:3431
 #, no-c-format
 msgid "(shiftjis) use Shift_JIS for both input and output"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 652
-#: rc.cpp:3359
+#: rc.cpp:3434
 #, no-c-format
 msgid "(utf16be) use UTF-16BE for both input and output"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 666
-#: rc.cpp:3362
+#: rc.cpp:3437
 #, no-c-format
 msgid "(ascii) use US-ASCII for output, ISO-8859-1 for input"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 680
-#: rc.cpp:3365
+#: rc.cpp:3440
 #, no-c-format
 msgid "set the two-letter language code <lang> (for future use)"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 694
-#: rc.cpp:3368
+#: rc.cpp:3443
 #, no-c-format
 msgid "(utf16) use UTF-16 for both input and output"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 708
-#: rc.cpp:3371
+#: rc.cpp:3446
 #, no-c-format
 msgid "(big5) use Big5 for both input and output"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 722
-#: rc.cpp:3374
+#: rc.cpp:3449
 #, no-c-format
 msgid "(utf8) use UTF-8 for both input and output"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 736
-#: rc.cpp:3377
+#: rc.cpp:3452
 #, no-c-format
 msgid "(latin0) use US-ASCII for output, ISO-8859-1 for input"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 750
-#: rc.cpp:3380
+#: rc.cpp:3455
 #, no-c-format
 msgid "(mac) use MacRoman for input, US-ASCII for output"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 764
-#: rc.cpp:3383
+#: rc.cpp:3458
 #, no-c-format
 msgid "(iso2022) use ISO-2022 for both input and output"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 778
-#: rc.cpp:3386
+#: rc.cpp:3461
 #, no-c-format
 msgid "Do not specify an encoding"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 799
-#: rc.cpp:3389
+#: rc.cpp:3464
 #, no-c-format
 msgid "About Tidy"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 924
-#: rc.cpp:3392
+#: rc.cpp:3467
 #, no-c-format
 msgid ""
 "HTML Tidy Configuration Settings\n"
@@ -5297,56 +5373,114 @@ msgid ""
 "accessibility-check\t\tInteger   \t0, 1, 2, ...\n"
 msgstr ""
 
-#. i18n: file ./scripts/tidy.kmdr line 938
-#: rc.cpp:3493 rc.cpp:3924
+#. i18n: file ./scripts/docbook_table.kmdr line 18
+#: rc.cpp:3574
 #, no-c-format
-msgid "&Process"
-msgstr "&Proses"
+msgid "Docbook Table"
+msgstr ""
 
-#. i18n: file ./scripts/xsltproc.kmdr line 18
-#: rc.cpp:3499
+#. i18n: file ./scripts/docbook_table.kmdr line 41
+#: rc.cpp:3577
 #, no-c-format
-msgid "Quanta+: xsltproc"
+msgid "DocBook Table"
 msgstr ""
 
-#. i18n: file ./scripts/xsltproc.kmdr line 66
-#: rc.cpp:3502
+#. i18n: file ./scripts/docbook_table.kmdr line 88
+#: rc.cpp:3580
 #, no-c-format
-msgid "&Translate"
-msgstr "&Trosi"
+msgid "id:"
+msgstr "id :"
 
-#. i18n: file ./scripts/xsltproc.kmdr line 143
-#: rc.cpp:3508
-#, fuzzy, no-c-format
-msgid "Current file"
-msgstr "Cyfredol: %1"
+#. i18n: file ./scripts/docbook_table.kmdr line 124
+#: rc.cpp:3586
+#, no-c-format
+msgid "Columns"
+msgstr "Colofnau"
 
-#. i18n: file ./scripts/xsltproc.kmdr line 184
-#: rc.cpp:3511
+#. i18n: file ./scripts/docbook_table.kmdr line 155
+#: rc.cpp:3589
 #, no-c-format
-msgid "File location:"
-msgstr "Lleoliad y ffeil:"
+msgid "Lines"
+msgstr "Llinellau"
 
-#. i18n: file ./scripts/xsltproc.kmdr line 221
-#: rc.cpp:3514
-#, fuzzy, no-c-format
-msgid "Stylesheet location:"
-msgstr "Dewisiad :"
+#. i18n: file ./scripts/docbook_table.kmdr line 182
+#: rc.cpp:3592
+#, no-c-format
+msgid "&Include title line"
+msgstr ""
 
-#. i18n: file ./scripts/xsltproc.kmdr line 255
-#: rc.cpp:3517
+#. i18n: file ./scripts/gubed_install.kmdr line 18
+#: rc.cpp:3601
+#, no-c-format
+msgid "Gubed Installation v0.1"
+msgstr ""
+
+#. i18n: file ./scripts/gubed_install.kmdr line 124
+#: rc.cpp:3607
+#, no-c-format
+msgid "Target directory:"
+msgstr ""
+
+#. i18n: file ./scripts/gubed_install.kmdr line 132
+#: rc.cpp:3610
+#, no-c-format
+msgid "Archive name:"
+msgstr "Enw'r archif:"
+
+#. i18n: file ./scripts/gubed_install.kmdr line 145
+#: rc.cpp:3613
+#, no-c-format
+msgid "Select the archive containing Gubed (tar.bz2 format)"
+msgstr ""
+
+#. i18n: file ./scripts/gubed_install.kmdr line 161
+#: rc.cpp:3616
+#, no-c-format
+msgid "The target directory (example /var/www)"
+msgstr ""
+
+#. i18n: file ./scripts/gubed_install.kmdr line 179
+#: rc.cpp:3619
+#, no-c-format
+msgid "Run the server after installation has finished"
+msgstr ""
+
+#. i18n: file ./scripts/gubed_install.kmdr line 189
+#: rc.cpp:3622
+#, no-c-format
+msgid ""
+"If checked the server will be run in the background after the installation has "
+"finished"
+msgstr ""
+
+#. i18n: file ./scripts/gubed_install.kmdr line 205
+#: rc.cpp:3625
+#, no-c-format
+msgid "View installation log"
+msgstr ""
+
+#. i18n: file ./scripts/gubed_install.kmdr line 218
+#: rc.cpp:3628
+#, no-c-format
+msgid ""
+"Uncheck this if you do not want to see the installation log. The log may "
+"provide important information in case of installation failure."
+msgstr ""
+
+#. i18n: file ./scripts/gubed_install.kmdr line 234
+#: rc.cpp:3631
 #, fuzzy, no-c-format
-msgid "Output file name:"
-msgstr "Enw'r ffeil:"
+msgid "&Start Installation"
+msgstr "Gosod"
 
 #. i18n: file ./scripts/picturewizard.kmdr line 18
-#: rc.cpp:3520
+#: rc.cpp:3634
 #, no-c-format
 msgid "Docbook Image Wizard"
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 87
-#: rc.cpp:3526
+#: rc.cpp:3640
 #, no-c-format
 msgid ""
 "Press this button to cancel the creation of the image markup. No action will be "
@@ -5354,19 +5488,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 103
-#: rc.cpp:3529
+#: rc.cpp:3643
 #, no-c-format
 msgid "O&K"
 msgstr "I&awn"
 
 #. i18n: file ./scripts/picturewizard.kmdr line 123
-#: rc.cpp:3532
+#: rc.cpp:3646
 #, no-c-format
 msgid "Press this button to create the image markup."
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 144
-#: rc.cpp:3535
+#: rc.cpp:3649
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -5383,19 +5517,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 155
-#: rc.cpp:3545
+#: rc.cpp:3659
 #, no-c-format
 msgid "Wrapper Type"
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 175
-#: rc.cpp:3548
+#: rc.cpp:3662
 #, no-c-format
 msgid "&screenshot"
 msgstr "&sgrinlun"
 
 #. i18n: file ./scripts/picturewizard.kmdr line 201
-#: rc.cpp:3551
+#: rc.cpp:3665
 #, no-c-format
 msgid ""
 "Select this option to create the necessary markup for a screenshot. The "
@@ -5405,13 +5539,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 209
-#: rc.cpp:3554
+#: rc.cpp:3668
 #, fuzzy, no-c-format
 msgid "&mediaobject"
 msgstr "&Cywaith"
 
 #. i18n: file ./scripts/picturewizard.kmdr line 226
-#: rc.cpp:3557
+#: rc.cpp:3671
 #, no-c-format
 msgid ""
 "Select this option to create the necessary markup for a image outside the "
@@ -5420,13 +5554,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 240
-#: rc.cpp:3560
+#: rc.cpp:3674
 #, no-c-format
 msgid "i&nlinemediaobject"
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 259
-#: rc.cpp:3563
+#: rc.cpp:3677
 #, no-c-format
 msgid ""
 "Select this option to create the necessary markup for a image inside the normal "
@@ -5436,187 +5570,187 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 269
-#: rc.cpp:3566
+#: rc.cpp:3680
 #, fuzzy, no-c-format
 msgid "Image Options"
 msgstr "&Delweddau :"
 
 #. i18n: file ./scripts/picturewizard.kmdr line 306
-#: rc.cpp:3569
+#: rc.cpp:3683
 #, no-c-format
 msgid "BMP"
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 311
-#: rc.cpp:3572
+#: rc.cpp:3686
 #, no-c-format
 msgid "CGM-BINARY"
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 316
-#: rc.cpp:3575
+#: rc.cpp:3689
 #, no-c-format
 msgid "CGM-CHAR"
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 321
-#: rc.cpp:3578
+#: rc.cpp:3692
 #, no-c-format
 msgid "CGM-CLEAR"
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 326
-#: rc.cpp:3581
+#: rc.cpp:3695
 #, no-c-format
 msgid "DITROFF"
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 331
-#: rc.cpp:3584
+#: rc.cpp:3698
 #, no-c-format
 msgid "DVI"
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 336
-#: rc.cpp:3587
+#: rc.cpp:3701
 #, no-c-format
 msgid "EPS"
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 341
-#: rc.cpp:3590
+#: rc.cpp:3704
 #, no-c-format
 msgid "EQN"
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 346
-#: rc.cpp:3593
+#: rc.cpp:3707
 #, no-c-format
 msgid "FAX"
 msgstr "FFACS"
 
 #. i18n: file ./scripts/picturewizard.kmdr line 351
-#: rc.cpp:3596
+#: rc.cpp:3710
 #, no-c-format
 msgid "GIF"
 msgstr "GIF"
 
 #. i18n: file ./scripts/picturewizard.kmdr line 356
-#: rc.cpp:3599
+#: rc.cpp:3713
 #, no-c-format
 msgid "GIF87a"
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 361
-#: rc.cpp:3602
+#: rc.cpp:3716
 #, no-c-format
 msgid "GIF89a"
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 366
-#: rc.cpp:3605
+#: rc.cpp:3719
 #, no-c-format
 msgid "IGES"
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 371
-#: rc.cpp:3608
+#: rc.cpp:3722
 #, no-c-format
 msgid "JPEG"
 msgstr "JPEG"
 
 #. i18n: file ./scripts/picturewizard.kmdr line 376
-#: rc.cpp:3611
+#: rc.cpp:3725
 #, no-c-format
 msgid "JPG"
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 381
-#: rc.cpp:3614
+#: rc.cpp:3728
 #, no-c-format
 msgid "linespecific"
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 386
-#: rc.cpp:3617
+#: rc.cpp:3731
 #, no-c-format
 msgid "PCX"
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 391
-#: rc.cpp:3620
+#: rc.cpp:3734
 #, no-c-format
 msgid "PDF"
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 396
-#: rc.cpp:3623
+#: rc.cpp:3737
 #, no-c-format
 msgid "PIC"
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 401
-#: rc.cpp:3626
+#: rc.cpp:3740
 #, no-c-format
 msgid "PNG"
 msgstr "PNG"
 
 #. i18n: file ./scripts/picturewizard.kmdr line 406
-#: rc.cpp:3629
+#: rc.cpp:3743
 #, no-c-format
 msgid "PS"
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 411
-#: rc.cpp:3632
+#: rc.cpp:3746
 #, no-c-format
 msgid "SGML"
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 416
-#: rc.cpp:3635
+#: rc.cpp:3749
 #, no-c-format
 msgid "SVG"
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 421
-#: rc.cpp:3638
+#: rc.cpp:3752
 #, no-c-format
 msgid "SWF"
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 426
-#: rc.cpp:3641
+#: rc.cpp:3755
 #, no-c-format
 msgid "TBL"
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 431
-#: rc.cpp:3644
+#: rc.cpp:3758
 #, no-c-format
 msgid "TEX"
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 436
-#: rc.cpp:3647
+#: rc.cpp:3761
 #, no-c-format
 msgid "TIFF"
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 441
-#: rc.cpp:3650
+#: rc.cpp:3764
 #, no-c-format
 msgid "WMF"
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 446
-#: rc.cpp:3653
+#: rc.cpp:3767
 #, no-c-format
 msgid "WPG"
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 461
-#: rc.cpp:3656 rc.cpp:3674
+#: rc.cpp:3770 rc.cpp:3788
 #, no-c-format
 msgid ""
 "Select the image format here.  The image format is usually reflects the file "
@@ -5625,13 +5759,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 469
-#: rc.cpp:3659
+#: rc.cpp:3773
 #, no-c-format
 msgid "Create caption, &using the image description text."
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 482
-#: rc.cpp:3662
+#: rc.cpp:3776
 #, no-c-format
 msgid ""
 "Check this box add caption text to the image. The caption text will appear "
@@ -5639,13 +5773,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 490
-#: rc.cpp:3665
+#: rc.cpp:3779
 #, fuzzy, no-c-format
 msgid "Image description."
 msgstr "Disgrifiad"
 
 #. i18n: file ./scripts/picturewizard.kmdr line 498
-#: rc.cpp:3668 rc.cpp:3692
+#: rc.cpp:3782 rc.cpp:3806
 #, no-c-format
 msgid ""
 "Enter the description of the image here. For instance, a screenshot of a "
@@ -5654,19 +5788,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 506
-#: rc.cpp:3671
+#: rc.cpp:3785
 #, fuzzy, no-c-format
 msgid "Image Type:"
 msgstr "&Delweddau :"
 
 #. i18n: file ./scripts/picturewizard.kmdr line 517
-#: rc.cpp:3677
+#: rc.cpp:3791
 #, fuzzy, no-c-format
 msgid "Image file name:"
 msgstr "Enw'r ffeil:"
 
 #. i18n: file ./scripts/picturewizard.kmdr line 520
-#: rc.cpp:3680 rc.cpp:3686
+#: rc.cpp:3794 rc.cpp:3800
 #, no-c-format
 msgid ""
 "Enter the file name of the image here, including the extension (.png, .jpg, "
@@ -5675,927 +5809,793 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 528
-#: rc.cpp:3683
+#: rc.cpp:3797
 #, no-c-format
 msgid "image.png"
 msgstr "image.png"
 
 #. i18n: file ./scripts/picturewizard.kmdr line 544
-#: rc.cpp:3689
+#: rc.cpp:3803
 #, fuzzy, no-c-format
 msgid "Image Description:"
 msgstr "Disgrifiad:"
 
-#. i18n: file ./scripts/gubed_install.kmdr line 18
-#: rc.cpp:3695
-#, no-c-format
-msgid "Gubed Installation v0.1"
-msgstr ""
-
-#. i18n: file ./scripts/gubed_install.kmdr line 124
-#: rc.cpp:3701
-#, no-c-format
-msgid "Target directory:"
-msgstr ""
-
-#. i18n: file ./scripts/gubed_install.kmdr line 132
-#: rc.cpp:3704
-#, no-c-format
-msgid "Archive name:"
-msgstr "Enw'r archif:"
-
-#. i18n: file ./scripts/gubed_install.kmdr line 145
-#: rc.cpp:3707
-#, no-c-format
-msgid "Select the archive containing Gubed (tar.bz2 format)"
-msgstr ""
-
-#. i18n: file ./scripts/gubed_install.kmdr line 161
-#: rc.cpp:3710
-#, no-c-format
-msgid "The target directory (example /var/www)"
-msgstr ""
-
-#. i18n: file ./scripts/gubed_install.kmdr line 179
-#: rc.cpp:3713
-#, no-c-format
-msgid "Run the server after installation has finished"
-msgstr ""
-
-#. i18n: file ./scripts/gubed_install.kmdr line 189
-#: rc.cpp:3716
+#. i18n: file ./scripts/scriptinfo.kmdr line 16
+#: rc.cpp:3809
 #, no-c-format
-msgid ""
-"If checked the server will be run in the background after the installation has "
-"finished"
+msgid "Quanta Script Info Generator"
 msgstr ""
 
-#. i18n: file ./scripts/gubed_install.kmdr line 205
-#: rc.cpp:3719
+#. i18n: file ./scripts/scriptinfo.kmdr line 37
+#: rc.cpp:3812
 #, no-c-format
-msgid "View installation log"
+msgid "Enter Info"
 msgstr ""
 
-#. i18n: file ./scripts/gubed_install.kmdr line 218
-#: rc.cpp:3722
+#. i18n: file ./scripts/scriptinfo.kmdr line 61
+#: rc.cpp:3815
 #, no-c-format
-msgid ""
-"Uncheck this if you do not want to see the installation log. The log may "
-"provide important information in case of installation failure."
+msgid "Please fill in all fields"
 msgstr ""
 
-#. i18n: file ./scripts/gubed_install.kmdr line 234
-#: rc.cpp:3725
+#. i18n: file ./scripts/scriptinfo.kmdr line 69
+#: rc.cpp:3818
 #, fuzzy, no-c-format
-msgid "&Start Installation"
-msgstr "Gosod"
-
-#. i18n: file ./scripts/dwt.kmdr line 18
-#: rc.cpp:3728
-#, no-c-format
-msgid "dwt - Apply Dreamweaver Template"
-msgstr ""
+msgid "Script name:"
+msgstr "Enw'r grwp:"
 
-#. i18n: file ./scripts/dwt.kmdr line 77
-#: rc.cpp:3740
+#. i18n: file ./scripts/scriptinfo.kmdr line 90
+#: rc.cpp:3821
 #, no-c-format
-msgid "Full project path:"
+msgid "Enter the script name with the extension"
 msgstr ""
 
-#. i18n: file ./scripts/dwt.kmdr line 85
-#: rc.cpp:3743
-#, no-c-format
-msgid "Show debug messages"
-msgstr ""
+#. i18n: file ./scripts/scriptinfo.kmdr line 98
+#: rc.cpp:3824
+#, fuzzy, no-c-format
+msgid "About script:"
+msgstr "Isysgrif"
 
-#. i18n: file ./scripts/dwt.kmdr line 93
-#: rc.cpp:3746
+#. i18n: file ./scripts/scriptinfo.kmdr line 111
+#: rc.cpp:3827
 #, no-c-format
-msgid "dwt.pl"
+msgid "Formatting may be done with XHTML tags"
 msgstr ""
 
-#. i18n: file ./scripts/dwt.kmdr line 160
-#: rc.cpp:3755
+#. i18n: file ./scripts/scriptinfo.kmdr line 119
+#: rc.cpp:3830
 #, no-c-format
-msgid ""
-"The dwt Script will apply actual Dreamweaver templates to all your project "
-"files. Just enter the FULL project path and specify where the script dwt.pl can "
-"be found."
+msgid "http://"
 msgstr ""
 
-#. i18n: file ./scripts/checkxml.kmdr line 18
-#: rc.cpp:3758
+#. i18n: file ./scripts/scriptinfo.kmdr line 127
+#: rc.cpp:3833
 #, no-c-format
-msgid "Quanta+ TDE XML Validator"
+msgid "The location of your up-to-date file on the web"
 msgstr ""
 
-#. i18n: file ./scripts/checkxml.kmdr line 98
-#: rc.cpp:3761 rc.cpp:3975
+#. i18n: file ./scripts/scriptinfo.kmdr line 135
+#: rc.cpp:3836
 #, fuzzy, no-c-format
-msgid "&Validate"
-msgstr "Dilys"
+msgid "Script author:"
+msgstr "&Sgriptiau :"
 
-#. i18n: file ./scripts/checkxml.kmdr line 184
-#: rc.cpp:3767
+#. i18n: file ./scripts/scriptinfo.kmdr line 143
+#: rc.cpp:3839
 #, fuzzy, no-c-format
-msgid "C&urrent working folder"
-msgstr "Creu Plygell Newydd"
+msgid "Script license:"
+msgstr "&Sgriptiau :"
 
-#. i18n: file ./scripts/checkxml.kmdr line 227
-#: rc.cpp:3770 rc.cpp:3930
+#. i18n: file ./scripts/scriptinfo.kmdr line 159
+#: rc.cpp:3842
 #, no-c-format
-msgid "Other folder:"
+msgid "Select the directory to write the .info file to"
 msgstr ""
 
-#. i18n: file ./scripts/listwizard.kmdr line 18
-#: rc.cpp:3773
+#. i18n: file ./scripts/scriptinfo.kmdr line 165
+#: rc.cpp:3845
 #, no-c-format
-msgid "Docbook List Wizard"
+msgid "GPL-2"
 msgstr ""
 
-#. i18n: file ./scripts/listwizard.kmdr line 87
-#: rc.cpp:3779
+#. i18n: file ./scripts/scriptinfo.kmdr line 170
+#: ../lib/compatibility/knewstuff/uploaddialog.cpp:83 rc.cpp:3848
 #, no-c-format
-msgid ""
-"Press this button to cancel the creation of the list or procedure. No action "
-"will be performed."
-msgstr ""
+msgid "LGPL"
+msgstr "LGPL"
 
-#. i18n: file ./scripts/listwizard.kmdr line 123
-#: rc.cpp:3785
+#. i18n: file ./scripts/scriptinfo.kmdr line 175
+#: ../lib/compatibility/knewstuff/uploaddialog.cpp:84 rc.cpp:3851
 #, no-c-format
-msgid "Press this button to create the selected list or procedure."
+msgid "BSD"
+msgstr "BSD"
+
+#. i18n: file ./scripts/scriptinfo.kmdr line 180
+#: rc.cpp:3854
+#, no-c-format
+msgid "Public Domain"
 msgstr ""
 
-#. i18n: file ./scripts/listwizard.kmdr line 133
-#: rc.cpp:3788
-#, fuzzy, no-c-format
-msgid "List Options"
-msgstr "De&wisiadau"
+#. i18n: file ./scripts/scriptinfo.kmdr line 185
+#: rc.cpp:3857 rc.cpp:4576
+#, no-c-format
+msgid "Other"
+msgstr "Arall"
 
-#. i18n: file ./scripts/listwizard.kmdr line 183
-#: rc.cpp:3791 rc.cpp:3797
+#. i18n: file ./scripts/scriptinfo.kmdr line 200
+#: rc.cpp:3860
 #, no-c-format
-msgid ""
-"Select or enter in this spin box the number of list entries or steps that "
-"should be created by the wizard. After using the wizard, you can add (or "
-"remove) more entries or steps manually."
+msgid "If other include in about"
 msgstr ""
 
-#. i18n: file ./scripts/listwizard.kmdr line 191
-#: rc.cpp:3794
-#, fuzzy, no-c-format
-msgid "Number of list items or steps:"
-msgstr "Nifel llinellau:"
-
-#. i18n: file ./scripts/listwizard.kmdr line 218
-#: rc.cpp:3800
+#. i18n: file ./scripts/scriptinfo.kmdr line 208
+#: rc.cpp:3863
 #, no-c-format
-msgid ""
-"<qt>\n"
-"Select the list type:\n"
-"<ul>\n"
-"<li><b>variablelist:</b> a list with two sections for each item: the term and "
-"the definition.</li>\n"
-"<li><b>itemizedlist:</b> a list  used when the order of the items is not "
-"important.</li>\n"
-"<li><b>orderedlist:</b> a list  used when the order of the items is important "
-"(for instance, a list of things in order of preference). Do not use orderedlist "
-"to describe the steps required to perform an action.</li>\n"
-"<li><b>procedure:</b> list of an sequence of ordered steps, describing to the "
-"reader how to perform a task. You can add substeps later.</li>\n"
-"</ul>\n"
-"</qt>"
+msgid "Editor/Executor:"
 msgstr ""
 
-#. i18n: file ./scripts/listwizard.kmdr line 229
-#: rc.cpp:3811
+#. i18n: file ./scripts/scriptinfo.kmdr line 216
+#: rc.cpp:3866
 #, fuzzy, no-c-format
-msgid "List Type"
-msgstr "Math"
+msgid "Author email:"
+msgstr "Awdur:"
 
-#. i18n: file ./scripts/listwizard.kmdr line 249
-#: rc.cpp:3814
+#. i18n: file ./scripts/scriptinfo.kmdr line 224
+#: rc.cpp:3869
 #, fuzzy, no-c-format
-msgid "&procedure"
-msgstr "&Mynd Ymlaen"
-
-#. i18n: file ./scripts/listwizard.kmdr line 285
-#: rc.cpp:3817
-#, no-c-format
-msgid ""
-"Select this option to create a procedure. A procedure is a sequence of ordered "
-"steps, describing to the reader how to perform a task. You can add nested "
-"substeps.\n"
-"\n"
-"Here is one example of a procedure:\n"
-"\n"
-"<procedure>\n"
-"\n"
-"<step><para>First step.</para></step>\n"
-"\n"
-"<step><para>Second step.</para>\n"
-"<substeps>\n"
-"<step><para>First substep of the second step.</para></step>\n"
-"</substeps>\n"
-"</step>\n"
-"\n"
-"</procedure>"
-msgstr ""
+msgid "Web address:"
+msgstr "Cyfeiriad Ebost:"
 
-#. i18n: file ./scripts/listwizard.kmdr line 293
-#: rc.cpp:3834
+#. i18n: file ./scripts/scriptinfo.kmdr line 232
+#: rc.cpp:3872
 #, no-c-format
-msgid "itemi&zedlist"
-msgstr ""
+msgid "Version number:"
+msgstr "Rhif y Fersiwn :"
 
-#. i18n: file ./scripts/listwizard.kmdr line 326
-#: rc.cpp:3837
+#. i18n: file ./scripts/scriptinfo.kmdr line 273
+#: rc.cpp:3875
 #, no-c-format
-msgid ""
-"Select this option to create a itemizedlist. A itemizedlist is a list used when "
-"the order of the items is not important.\n"
-"\n"
-"Here is one example of a itemizedlist:\n"
-"\n"
-"<itemizedlist>\n"
-"\n"
-"<listitem><para>\n"
-"First item.\n"
-"</para></listitem>\n"
-"\n"
-"<listitem><para>\n"
-"Second item.\n"
-"</para></listitem>\n"
-"\n"
-"</itemizedlist>"
+msgid "kmdr-editor"
 msgstr ""
 
-#. i18n: file ./scripts/listwizard.kmdr line 340
-#: rc.cpp:3854
+#. i18n: file ./scripts/scriptinfo.kmdr line 278
+#: rc.cpp:3878
 #, no-c-format
-msgid "or&deredlist"
-msgstr ""
+msgid "kwrite"
+msgstr "kwrite"
 
-#. i18n: file ./scripts/listwizard.kmdr line 376
-#: rc.cpp:3857
+#. i18n: file ./scripts/scriptinfo.kmdr line 283
+#: rc.cpp:3881
 #, no-c-format
-msgid ""
-"Select this option to create a orderedlist. A orderedlist is a list  used when "
-"the order of the items is important. A number will be associated with each "
-"entry, in order, starting from one.\n"
-"\n"
-"Here is one example of a orderedlist:\n"
-"\n"
-"<orderedlist>\n"
-"\n"
-"<listitem><para>\n"
-"First item.\n"
-"</para></listitem>\n"
-"\n"
-"<listitem><para>\n"
-"Second item.\n"
-"</para></listitem>\n"
-"\n"
-"</orderedlist>"
-msgstr ""
-
-#. i18n: file ./scripts/listwizard.kmdr line 387
-#: rc.cpp:3874
-#, fuzzy, no-c-format
-msgid "&variablelist"
-msgstr "&Newidynnau"
+msgid "kate"
+msgstr "kate"
 
-#. i18n: file ./scripts/listwizard.kmdr line 426
-#: rc.cpp:3877
+#. i18n: file ./scripts/scriptinfo.kmdr line 288
+#: rc.cpp:3884
 #, no-c-format
-msgid ""
-"Select this option to create a variablelist. A variablelist is a list with two "
-"sections for each item: the term (the tag used is <term>"
-") and the definition (the tag used is <listitem>). To mark each entry of the "
-"list, the <varlistentry> tag is used.\n"
-"\n"
-"Here is one example of a variablelist:\n"
-"\n"
-"<variablelist>\n"
-"\n"
-"<varlistentry>\n"
-"<term>Term text</term>\n"
-"<listitem><para>Definition text.</para></listitem>\n"
-"</varlistentry>\n"
-"\n"
-"</variablelist>"
+msgid "tdevelop"
 msgstr ""
 
-#. i18n: file ./scripts/docbook_table.kmdr line 18
-#: rc.cpp:3891
+#. i18n: file ./scripts/scriptinfo.kmdr line 303
+#: rc.cpp:3887
 #, no-c-format
-msgid "Docbook Table"
+msgid "Optional: Editor other than Quanta to use for this script"
 msgstr ""
 
-#. i18n: file ./scripts/docbook_table.kmdr line 41
-#: rc.cpp:3894
+#. i18n: file ./scripts/scriptinfo.kmdr line 314
+#: rc.cpp:3890
 #, no-c-format
-msgid "DocBook Table"
+msgid "kmdr-executor -c quanta"
 msgstr ""
 
-#. i18n: file ./scripts/docbook_table.kmdr line 88
-#: rc.cpp:3897
-#, no-c-format
-msgid "id:"
-msgstr "id :"
-
-#. i18n: file ./scripts/docbook_table.kmdr line 124
-#: rc.cpp:3903
-#, no-c-format
-msgid "Columns"
-msgstr "Colofnau"
-
-#. i18n: file ./scripts/docbook_table.kmdr line 155
-#: rc.cpp:3906
-#, no-c-format
-msgid "Lines"
-msgstr "Llinellau"
-
-#. i18n: file ./scripts/docbook_table.kmdr line 182
-#: rc.cpp:3909
+#. i18n: file ./scripts/scriptinfo.kmdr line 319
+#: rc.cpp:3893
 #, no-c-format
-msgid "&Include title line"
+msgid "kmdr-executor"
 msgstr ""
 
-#. i18n: file ./scripts/meinproc.kmdr line 18
-#: rc.cpp:3918
+#. i18n: file ./scripts/scriptinfo.kmdr line 324
+#: rc.cpp:3896
 #, no-c-format
-msgid "Quanta+: meinproc"
+msgid "perl"
 msgstr ""
 
-#. i18n: file ./scripts/meinproc.kmdr line 146
-#: rc.cpp:3927
-#, fuzzy, no-c-format
-msgid "Current working folder &in Quanta"
-msgstr "Creu Plygell Newydd"
-
-#. i18n: file ./scripts/meinproc.kmdr line 249
-#: rc.cpp:3933
+#. i18n: file ./scripts/scriptinfo.kmdr line 329
+#: rc.cpp:3899
 #, no-c-format
-msgid "View in &Konqueror"
-msgstr ""
+msgid "php"
+msgstr "php"
 
-#. i18n: file ./scripts/xmlval.kmdr line 18
-#: rc.cpp:3936
+#. i18n: file ./scripts/scriptinfo.kmdr line 344
+#: rc.cpp:3902
 #, no-c-format
-msgid "Quanta+ XML Validator"
+msgid "Optional: External program executor"
 msgstr ""
 
-#. i18n: file ./scripts/xmlval.kmdr line 92
-#: rc.cpp:3939
-#, fuzzy, no-c-format
-msgid "C&urrent file"
-msgstr "Cyfredol: %1"
-
-#. i18n: file ./scripts/xmlval.kmdr line 155
-#: rc.cpp:3942
+#. i18n: file ./scripts/scriptinfo.kmdr line 352
+#: rc.cpp:3905 rc.cpp:3947
 #, fuzzy, no-c-format
-msgid "Other file:"
-msgstr "Arall"
-
-#. i18n: file ./scripts/xmlval.kmdr line 209
-#: rc.cpp:3945
-#, no-c-format
-msgid "Validate against:"
-msgstr ""
-
-#. i18n: file ./scripts/xmlval.kmdr line 232
-#: rc.cpp:3948
-#, no-c-format
-msgid "DTD (Internal)"
-msgstr ""
+msgid "Script location:"
+msgstr "Disgrifiad:"
 
-#. i18n: file ./scripts/xmlval.kmdr line 237
-#: rc.cpp:3951
+#. i18n: file ./scripts/scriptinfo.kmdr line 360
+#: rc.cpp:3908
 #, no-c-format
-msgid "DTD (External)"
+msgid "Write File"
 msgstr ""
 
-#. i18n: file ./scripts/xmlval.kmdr line 242
-#: rc.cpp:3954
+#. i18n: file ./scripts/scriptinfo.kmdr line 431
+#: rc.cpp:3914
 #, no-c-format
-msgid "XML Schema"
+msgid ""
+"<html><head><meta name=\"qrichtext\" content=\"1\" /></head>"
+"<body style=\"font-size:11pt;font-family:sans-serif\">\n"
+"<p style=\"margin-top:16px\"><span style=\"font-weight:600\">"
+"Quanta Plus Submitter Info Files</span></p>\n"
+"<p>The purpose of these files is to provide developers with proper credit, "
+"expose licensing information and give users thumbnail information about scripts "
+"and templates at a glance. We ask that you try to do several things here.</p>\n"
+"<ul type=\"disc\">"
+"<li>Fill in all the fields. They are all there for a reason.</li>\n"
+"<li>Contact the appropriate Quanta script and template maintainer or a member "
+"of our team when you have new releases so we can include them. As we plan to "
+"build a huge repository we have to rely on you here.</li></ul>\n"
+"<p>The additional information serves as a backup. Any time a user wants they "
+"can click the link to go to your site and get updates, docs or whatever they "
+"require. Thank you for helping us to make this a great feature</p>\n"
+"<p align=\"center\" style=\"margin-top:14px\"><span style=\"font-weight:600\">"
+"Contact Information</span></p>\n"
+"<p align=\"center\">Quanta Resource Maintainer - (none at this time)<br />"
+"Lead Developer - Andras Mantia <a "
+"href=\"mailto:amantia@kde.org?subject=ScriptInfo\">amantia@kde.org</a><br />"
+"Kommander - Michal Rudolf <a "
+"href=\"mailto:mrudolf@kdewebdev.org?subject=ScriptInfo\">"
+"mrudolf@kdewebdev.org</a><br />Project Lead - Eric Laffoon <a "
+"href=\"mailto:sequitur@kde.org?subject=ScriptInfo\">sequitur@kde.org</a></p>\n"
+"</body></html>\n"
 msgstr ""
 
-#. i18n: file ./scripts/xmlval.kmdr line 247
-#: rc.cpp:3957 rc.cpp:3963
+#. i18n: file ./scripts/dwt.kmdr line 18
+#: rc.cpp:3926
 #, no-c-format
-msgid "RelaxNG Schema"
+msgid "dwt - Apply Dreamweaver Template"
 msgstr ""
 
-#. i18n: file ./scripts/xmlval.kmdr line 291
-#: rc.cpp:3960
+#. i18n: file ./scripts/dwt.kmdr line 77
+#: rc.cpp:3938
 #, no-c-format
-msgid "DTD"
+msgid "Full project path:"
 msgstr ""
 
-#. i18n: file ./scripts/xmlval.kmdr line 293
-#: rc.cpp:3966
+#. i18n: file ./scripts/dwt.kmdr line 85
+#: rc.cpp:3941
 #, no-c-format
-msgid "W3C XML Schema"
+msgid "Show debug messages"
 msgstr ""
 
-#. i18n: file ./scripts/xmlval.kmdr line 318
-#: rc.cpp:3969
+#. i18n: file ./scripts/dwt.kmdr line 93
+#: rc.cpp:3944
 #, no-c-format
-msgid "Well-formed checking &only"
+msgid "dwt.pl"
 msgstr ""
 
-#. i18n: file ./scripts/xmlval.kmdr line 374
-#: rc.cpp:3972
+#. i18n: file ./scripts/dwt.kmdr line 160
+#: rc.cpp:3953
 #, no-c-format
-msgid "Definition URI:"
+msgid ""
+"The dwt Script will apply actual Dreamweaver templates to all your project "
+"files. Just enter the FULL project path and specify where the script dwt.pl can "
+"be found."
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 24
-#: rc.cpp:3981 rc.cpp:5076
+#: rc.cpp:3956 rc.cpp:5318
 #, no-c-format
 msgid "Quick Start"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 76
-#: rc.cpp:3984
+#: rc.cpp:3959
 #, no-c-format
 msgid "Quanta Plus Kommander Quick Start"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 194
-#: rc.cpp:3987
+#: rc.cpp:3962
 #, no-c-format
 msgid "DTD / Schema:"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 202
-#: rc.cpp:3990
+#: rc.cpp:3965
 #, no-c-format
 msgid "Body Area"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 253
-#: rc.cpp:3993
+#: rc.cpp:3968
 #, no-c-format
 msgid "&PHP footer include:"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 268
-#: rc.cpp:3996
+#: rc.cpp:3971
 #, no-c-format
 msgid "PHP header include:"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 285
-#: rc.cpp:3999
+#: rc.cpp:3974
 #, fuzzy, no-c-format
 msgid "Show &DTD"
 msgstr "Dangos %1"
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 302
-#: rc.cpp:4002
+#: rc.cpp:3977
 #, no-c-format
 msgid "HTML 4.01 Transitional"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 307
-#: rc.cpp:4005
+#: rc.cpp:3980
 #, no-c-format
 msgid "HTML 4.01 Strict"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 312
-#: rc.cpp:4008
+#: rc.cpp:3983
 #, no-c-format
 msgid "HTML 4.01 Frameset"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 317
-#: rc.cpp:4011
+#: rc.cpp:3986
 #, no-c-format
 msgid "XHTML 1.0 Transitional"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 322
-#: rc.cpp:4014
+#: rc.cpp:3989
 #, no-c-format
 msgid "XHTML 1.0 Strict"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 327
-#: rc.cpp:4017
+#: rc.cpp:3992
 #, no-c-format
 msgid "XHTML 1.0 Frameset"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 332
-#: rc.cpp:4020
+#: rc.cpp:3995
 #, no-c-format
 msgid "XHTML 1.0 Basic"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 337
-#: rc.cpp:4023
+#: rc.cpp:3998
 #, fuzzy, no-c-format
 msgid "XHTML 1.1"
 msgstr "Ffeil cofnod:"
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 413
-#: rc.cpp:4026
+#: rc.cpp:4001
 #, fuzzy, no-c-format
 msgid "Head &area"
 msgstr "Pennawd"
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 441
-#: rc.cpp:4029
+#: rc.cpp:4004
 #, no-c-format
 msgid "CVS tag &in comment"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 481
-#: rc.cpp:4032
+#: rc.cpp:4007
 #, fuzzy, no-c-format
 msgid "&Meta author:"
 msgstr "Awdur:"
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 496
-#: rc.cpp:4035
+#: rc.cpp:4010
 #, no-c-format
 msgid "Meta character set:"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 511
-#: rc.cpp:4038
+#: rc.cpp:4013
 #, fuzzy, no-c-format
 msgid "St&yle area"
 msgstr "Ardull"
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 556
-#: rc.cpp:4041
+#: rc.cpp:4016
 #, no-c-format
 msgid "iso-8859-1"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 561
-#: rc.cpp:4044
+#: rc.cpp:4019
 #, no-c-format
 msgid "iso-8859-2"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 566
-#: rc.cpp:4047
+#: rc.cpp:4022
 #, no-c-format
 msgid "iso-8859-3"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 571
-#: rc.cpp:4050
+#: rc.cpp:4025
 #, no-c-format
 msgid "iso-8859-4"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 576
-#: rc.cpp:4053
+#: rc.cpp:4028
 #, no-c-format
 msgid "iso-8859-5"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 581
-#: rc.cpp:4056
+#: rc.cpp:4031
 #, no-c-format
 msgid "iso-8859-6"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 586
-#: rc.cpp:4059
+#: rc.cpp:4034
 #, no-c-format
 msgid "iso-8859-7"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 591
-#: rc.cpp:4062
+#: rc.cpp:4037
 #, no-c-format
 msgid "iso-8859-8"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 596
-#: rc.cpp:4065
+#: rc.cpp:4040
 #, no-c-format
 msgid "iso-8859-8i"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 601
-#: rc.cpp:4068
+#: rc.cpp:4043
 #, no-c-format
 msgid "iso-8859-9"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 606
-#: rc.cpp:4071
+#: rc.cpp:4046
 #, no-c-format
 msgid "iso-8859-10"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 611
-#: rc.cpp:4074
+#: rc.cpp:4049
 #, no-c-format
 msgid "iso-8859-11"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 616
-#: rc.cpp:4077
+#: rc.cpp:4052
 #, no-c-format
 msgid "iso-8859-12"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 621
-#: rc.cpp:4080
+#: rc.cpp:4055
 #, no-c-format
 msgid "iso-8859-13"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 626
-#: rc.cpp:4083
+#: rc.cpp:4058
 #, no-c-format
 msgid "iso-8859-14"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 631
-#: rc.cpp:4086
+#: rc.cpp:4061
 #, no-c-format
 msgid "iso-8859-15"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 636
-#: rc.cpp:4089
+#: rc.cpp:4064
 #, no-c-format
 msgid "utf-8"
 msgstr "uTF-8"
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 641
-#: rc.cpp:4092
+#: rc.cpp:4067
 #, no-c-format
 msgid "utf-16"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 646
-#: rc.cpp:4095
+#: rc.cpp:4070
 #, no-c-format
 msgid "koi8-r"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 651
-#: rc.cpp:4098
+#: rc.cpp:4073
 #, no-c-format
 msgid "koi8-u"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 656
-#: rc.cpp:4101
+#: rc.cpp:4076
 #, no-c-format
 msgid "windows-1250"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 661
-#: rc.cpp:4104
+#: rc.cpp:4079
 #, no-c-format
 msgid "windows-1251"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 666
-#: rc.cpp:4107
+#: rc.cpp:4082
 #, no-c-format
 msgid "windows-1252"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 671
-#: rc.cpp:4110
+#: rc.cpp:4085
 #, no-c-format
 msgid "windows-1253"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 676
-#: rc.cpp:4113
+#: rc.cpp:4088
 #, no-c-format
 msgid "windows-1254"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 681
-#: rc.cpp:4116
+#: rc.cpp:4091
 #, no-c-format
 msgid "windows-1255"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 686
-#: rc.cpp:4119
+#: rc.cpp:4094
 #, no-c-format
 msgid "windows-1256"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 691
-#: rc.cpp:4122
+#: rc.cpp:4097
 #, no-c-format
 msgid "windows-1257"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 696
-#: rc.cpp:4125
+#: rc.cpp:4100
 #, no-c-format
 msgid "windows-1258"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 724
-#: rc.cpp:4128
+#: rc.cpp:4103
 #, no-c-format
 msgid "limit to 8, separate with commas"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 732
-#: rc.cpp:4131
+#: rc.cpp:4106
 #, no-c-format
 msgid "&Base directory:"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 747
-#: rc.cpp:4134
+#: rc.cpp:4109
 #, no-c-format
 msgid "Meta &Quanta"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 765
-#: rc.cpp:4137
+#: rc.cpp:4112
 #, fuzzy, no-c-format
 msgid "Meta &keywords:"
 msgstr "allweddair"
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 782
-#: rc.cpp:4140
+#: rc.cpp:4115
 #, no-c-format
 msgid "Li&nked style sheet:"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 831
-#: rc.cpp:4146
+#: rc.cpp:4121
 #, fuzzy, no-c-format
 msgid "&JavaScript area"
 msgstr "Enw'r grwp:"
 
-#. i18n: file ./scripts/tablewizard.kmdr line 18
-#: rc.cpp:4155
+#. i18n: file ./scripts/listwizard.kmdr line 18
+#: rc.cpp:4130
 #, no-c-format
-msgid "Docbook Table Wizard"
+msgid "Docbook List Wizard"
 msgstr ""
 
-#. i18n: file ./scripts/tablewizard.kmdr line 63
-#: rc.cpp:4161
+#. i18n: file ./scripts/listwizard.kmdr line 87
+#: rc.cpp:4136
 #, no-c-format
 msgid ""
-"Click here to cancel the creation of the table. No action will be performed."
+"Press this button to cancel the creation of the list or procedure. No action "
+"will be performed."
 msgstr ""
 
-#. i18n: file ./scripts/tablewizard.kmdr line 98
-#: rc.cpp:4167
+#. i18n: file ./scripts/listwizard.kmdr line 123
+#: rc.cpp:4142
 #, no-c-format
-msgid "Press this button to create the table or informaltable."
+msgid "Press this button to create the selected list or procedure."
 msgstr ""
 
-#. i18n: file ./scripts/tablewizard.kmdr line 125
-#: rc.cpp:4170
+#. i18n: file ./scripts/listwizard.kmdr line 133
+#: rc.cpp:4145
 #, fuzzy, no-c-format
-msgid "Table Options"
-msgstr "Dewisiadau Cyffredinol"
+msgid "List Options"
+msgstr "De&wisiadau"
 
-#. i18n: file ./scripts/tablewizard.kmdr line 133
-#: rc.cpp:4173 rc.cpp:4185 rc.cpp:4197
+#. i18n: file ./scripts/listwizard.kmdr line 183
+#: rc.cpp:4148 rc.cpp:4154
 #, no-c-format
 msgid ""
-"Enter here the id of the table or informaltable. You can use the id to link or "
-"reference to the table or informaltable elsewhere in the document."
+"Select or enter in this spin box the number of list entries or steps that "
+"should be created by the wizard. After using the wizard, you can add (or "
+"remove) more entries or steps manually."
 msgstr ""
 
-#. i18n: file ./scripts/tablewizard.kmdr line 164
-#: rc.cpp:4176
-#, no-c-format
-msgid "Number of columns:"
-msgstr "Nifer colofnau:"
+#. i18n: file ./scripts/listwizard.kmdr line 191
+#: rc.cpp:4151
+#, fuzzy, no-c-format
+msgid "Number of list items or steps:"
+msgstr "Nifel llinellau:"
 
-#. i18n: file ./scripts/tablewizard.kmdr line 167
-#: rc.cpp:4179 rc.cpp:4215
+#. i18n: file ./scripts/listwizard.kmdr line 218
+#: rc.cpp:4157
 #, no-c-format
 msgid ""
-"Select or enter in this spin box the number of columns that should be created "
-"by the wizard."
+"<qt>\n"
+"Select the list type:\n"
+"<ul>\n"
+"<li><b>variablelist:</b> a list with two sections for each item: the term and "
+"the definition.</li>\n"
+"<li><b>itemizedlist:</b> a list  used when the order of the items is not "
+"important.</li>\n"
+"<li><b>orderedlist:</b> a list  used when the order of the items is important "
+"(for instance, a list of things in order of preference). Do not use orderedlist "
+"to describe the steps required to perform an action.</li>\n"
+"<li><b>procedure:</b> list of an sequence of ordered steps, describing to the "
+"reader how to perform a task. You can add substeps later.</li>\n"
+"</ul>\n"
+"</qt>"
 msgstr ""
 
-#. i18n: file ./scripts/tablewizard.kmdr line 175
-#: rc.cpp:4182
+#. i18n: file ./scripts/listwizard.kmdr line 229
+#: rc.cpp:4168
 #, fuzzy, no-c-format
-msgid "Table id:"
-msgstr "Tabl"
+msgid "List Type"
+msgstr "Math"
 
-#. i18n: file ./scripts/tablewizard.kmdr line 189
-#: rc.cpp:4188
+#. i18n: file ./scripts/listwizard.kmdr line 249
+#: rc.cpp:4171
+#, fuzzy, no-c-format
+msgid "&procedure"
+msgstr "&Mynd Ymlaen"
+
+#. i18n: file ./scripts/listwizard.kmdr line 285
+#: rc.cpp:4174
 #, no-c-format
-msgid "&Add table header"
+msgid ""
+"Select this option to create a procedure. A procedure is a sequence of ordered "
+"steps, describing to the reader how to perform a task. You can add nested "
+"substeps.\n"
+"\n"
+"Here is one example of a procedure:\n"
+"\n"
+"<procedure>\n"
+"\n"
+"<step><para>First step.</para></step>\n"
+"\n"
+"<step><para>Second step.</para>\n"
+"<substeps>\n"
+"<step><para>First substep of the second step.</para></step>\n"
+"</substeps>\n"
+"</step>\n"
+"\n"
+"</procedure>"
 msgstr ""
 
-#. i18n: file ./scripts/tablewizard.kmdr line 203
+#. i18n: file ./scripts/listwizard.kmdr line 293
 #: rc.cpp:4191
 #, no-c-format
-msgid ""
-"Check this box to create a table header. The table header is the first row of "
-"the table, and has the same number of entries as the other rows."
+msgid "itemi&zedlist"
 msgstr ""
 
-#. i18n: file ./scripts/tablewizard.kmdr line 211
+#. i18n: file ./scripts/listwizard.kmdr line 326
 #: rc.cpp:4194
-#, fuzzy, no-c-format
-msgid "table_id"
-msgstr "Dilys"
-
-#. i18n: file ./scripts/tablewizard.kmdr line 243
-#: rc.cpp:4200 rc.cpp:4206
 #, no-c-format
 msgid ""
-"Select or enter in this spin box the number of rows that should be created by "
-"the wizard. After using the wizard, you can add (or remove) more rows. To add "
-"more rows,  add the same number of <entry> tags per <row> "
-"tag as in the rest of the table."
+"Select this option to create a itemizedlist. A itemizedlist is a list used when "
+"the order of the items is not important.\n"
+"\n"
+"Here is one example of a itemizedlist:\n"
+"\n"
+"<itemizedlist>\n"
+"\n"
+"<listitem><para>\n"
+"First item.\n"
+"</para></listitem>\n"
+"\n"
+"<listitem><para>\n"
+"Second item.\n"
+"</para></listitem>\n"
+"\n"
+"</itemizedlist>"
 msgstr ""
 
-#. i18n: file ./scripts/tablewizard.kmdr line 251
-#: rc.cpp:4203
+#. i18n: file ./scripts/listwizard.kmdr line 340
+#: rc.cpp:4211
 #, no-c-format
-msgid "Number of rows:"
-msgstr "Nifer rhesi:"
-
-#. i18n: file ./scripts/tablewizard.kmdr line 265
-#: rc.cpp:4209
-#, fuzzy, no-c-format
-msgid "Table title:"
-msgstr "Teitl:"
+msgid "or&deredlist"
+msgstr ""
 
-#. i18n: file ./scripts/tablewizard.kmdr line 268
-#: rc.cpp:4212 rc.cpp:4221
+#. i18n: file ./scripts/listwizard.kmdr line 376
+#: rc.cpp:4214
 #, no-c-format
 msgid ""
-"Enter here the title of the table. The title of the table will appear in the "
-"table of contents as well, under the \"List of Tables\", if you are using the "
-"TDE DocBook tools."
+"Select this option to create a orderedlist. A orderedlist is a list  used when "
+"the order of the items is important. A number will be associated with each "
+"entry, in order, starting from one.\n"
+"\n"
+"Here is one example of a orderedlist:\n"
+"\n"
+"<orderedlist>\n"
+"\n"
+"<listitem><para>\n"
+"First item.\n"
+"</para></listitem>\n"
+"\n"
+"<listitem><para>\n"
+"Second item.\n"
+"</para></listitem>\n"
+"\n"
+"</orderedlist>"
 msgstr ""
 
-#. i18n: file ./scripts/tablewizard.kmdr line 300
-#: rc.cpp:4218
-#, fuzzy, no-c-format
-msgid "Table Title"
-msgstr "Tabl"
-
-#. i18n: file ./scripts/tablewizard.kmdr line 320
-#: rc.cpp:4224
+#. i18n: file ./scripts/listwizard.kmdr line 387
+#: rc.cpp:4231
 #, fuzzy, no-c-format
-msgid "Table Type"
-msgstr "Tabl"
-
-#. i18n: file ./scripts/tablewizard.kmdr line 337
-#: rc.cpp:4227
-#, no-c-format
-msgid "ta&ble"
-msgstr "ta&bl"
-
-#. i18n: file ./scripts/tablewizard.kmdr line 358
-#: rc.cpp:4230
-#, no-c-format
-msgid "Select this option to generate a formal table (table)."
-msgstr ""
-
-#. i18n: file ./scripts/tablewizard.kmdr line 369
-#: rc.cpp:4233
-#, no-c-format
-msgid "&informaltable"
-msgstr ""
-
-#. i18n: file ./scripts/tablewizard.kmdr line 389
-#: rc.cpp:4236
-#, no-c-format
-msgid "Select this option to generate an informal table (informaltable)."
-msgstr ""
+msgid "&variablelist"
+msgstr "&Newidynnau"
 
-#. i18n: file ./scripts/tablewizard.kmdr line 409
-#: rc.cpp:4239
+#. i18n: file ./scripts/listwizard.kmdr line 426
+#: rc.cpp:4234
 #, no-c-format
 msgid ""
-"<qt>\n"
-"Select the table type:\n"
-"<ul>\n"
-"<li><b>informaltable:</b> the most used table type in TDE docs. A informaltable "
-"does not contain title, table head or entry in the table of contents.</li>\n"
-"<li><b>table:</b> a complete and formal table type, including title, table head "
-"and entry in the table of contents.</li>\n"
-"</ul>\n"
-"</qt>"
+"Select this option to create a variablelist. A variablelist is a list with two "
+"sections for each item: the term (the tag used is <term>"
+") and the definition (the tag used is <listitem>). To mark each entry of the "
+"list, the <varlistentry> tag is used.\n"
+"\n"
+"Here is one example of a variablelist:\n"
+"\n"
+"<variablelist>\n"
+"\n"
+"<varlistentry>\n"
+"<term>Term text</term>\n"
+"<listitem><para>Definition text.</para></listitem>\n"
+"</varlistentry>\n"
+"\n"
+"</variablelist>"
 msgstr ""
 
 #: rc.cpp:4246
@@ -7281,8 +7281,153 @@ msgstr ""
 msgid "™ (&trade;) Trade Mark sign"
 msgstr ""
 
-#. i18n: file extrafiles line 38
-#: rc.cpp:4424 rc.cpp:4486
+#. i18n: file extrafiles line 42
+#: rc.cpp:4418
+#, no-c-format
+msgid "KDE DocBook Tables"
+msgstr ""
+
+#. i18n: file extrafiles line 103
+#: rc.cpp:4421
+#, no-c-format
+msgid "KDE DocBook Images"
+msgstr ""
+
+#. i18n: file extrafiles line 182
+#: rc.cpp:4424
+#, no-c-format
+msgid "KDE DocBook Lists"
+msgstr ""
+
+#. i18n: file extrafiles line 216
+#: rc.cpp:4427
+#, no-c-format
+msgid "Tools"
+msgstr "Offer"
+
+#. i18n: file extrafiles line 224
+#: rc.cpp:4430
+#, no-c-format
+msgid "KDE DocBook Standard"
+msgstr ""
+
+#. i18n: file extrafiles line 343
+#: rc.cpp:4433
+#, no-c-format
+msgid "KDE DocBook Admonitions"
+msgstr ""
+
+#. i18n: file extrafiles line 363
+#: rc.cpp:4436
+#, no-c-format
+msgid "UI Elements"
+msgstr ""
+
+#. i18n: file extrafiles line 430
+#: rc.cpp:4439 rc.cpp:4460 rc.cpp:4511
+#, no-c-format
+msgid "tagxml"
+msgstr ""
+
+#. i18n: file extrafiles line 457
+#: rc.cpp:4442
+#, no-c-format
+msgid ""
+"<?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?>\n"
+"<!DOCTYPE TAGS>\n"
+"<TAGS>\n"
+"\n"
+"</TAGS>\n"
+msgstr ""
+
+#. i18n: file extrafiles line 516
+#: rc.cpp:4450
+#, no-c-format
+msgid ""
+"<children>\n"
+"<child name=&quot;&quot; />\n"
+"</children>"
+msgstr ""
+
+#. i18n: file extrafiles line 521
+#: rc.cpp:4455
+#, no-c-format
+msgid ""
+"<stoppingtags>\n"
+"<stoppingtag name=&quot;&quot; />\n"
+"</stoppingtags>"
+msgstr ""
+
+#. i18n: file extrafiles line 577
+#: rc.cpp:4463
+#, no-c-format
+msgid ""
+"<chapter id=&quot;&quot;>\n"
+"<!--  -->\n"
+"\n"
+"<title></title>\n"
+"\n"
+"<para></para>\n"
+"\n"
+"\n"
+"\n"
+"<sect1>\n"
+"\n"
+"<title></title>\n"
+"\n"
+"<para></para>\n"
+"\n"
+"</sect1>\n"
+"\n"
+"\n"
+"\n"
+"</chapter>\n"
+msgstr ""
+
+#. i18n: file extrafiles line 595
+#: rc.cpp:4486 rc.cpp:4682 rc.cpp:4762 rc.cpp:4931
+#, no-c-format
+msgid ""
+"The <b>!-- --></b> element <i>comment</i> a text inside.\n"
+"   "
+msgstr ""
+
+#. i18n: file extrafiles line 630
+#: rc.cpp:4490
+#, no-c-format
+msgid ""
+"<figure id=&quot;&quot;>\n"
+"<title></title>\n"
+"<graphic fileref=&quot;&quot;/>\n"
+"</figure>\n"
+msgstr ""
+
+#. i18n: file extrafiles line 638
+#: rc.cpp:4497
+#, no-c-format
+msgid ""
+"<example role=&quot;codelisting&quot; id=&quot;&quot;>\n"
+"<title></title>\n"
+"<programlisting><![CDATA[\n"
+"\n"
+"]]></programlisting>\n"
+"</example>"
+msgstr ""
+
+#. i18n: file extrafiles line 677
+#: rc.cpp:4505
+#, no-c-format
+msgid "XML Tools"
+msgstr ""
+
+#. i18n: file extrafiles line 685
+#: rc.cpp:4508
+#, no-c-format
+msgid "Docbook - UI"
+msgstr ""
+
+#. i18n: file extrafiles line 802
+#: rc.cpp:4517 rc.cpp:4822
 #, no-c-format
 msgid ""
 "The <b>FONT</b> element allows authors to suggest rudimentary <i>"
@@ -7290,32 +7435,32 @@ msgid ""
 "   "
 msgstr ""
 
-#. i18n: file extrafiles line 45
-#: rc.cpp:4428 rc.cpp:4490
+#. i18n: file extrafiles line 809
+#: rc.cpp:4521 rc.cpp:4826
 #, no-c-format
 msgid ""
 "This <b>SIZE=+1</b> element allows to <i>increase</i> font.\n"
 "   "
 msgstr ""
 
-#. i18n: file extrafiles line 51
-#: rc.cpp:4432 rc.cpp:4494
+#. i18n: file extrafiles line 815
+#: rc.cpp:4525 rc.cpp:4830
 #, no-c-format
 msgid ""
 "This <b>SIZE=-1</b> element allows to <i>decrease</i> font.\n"
 "   "
 msgstr ""
 
-#. i18n: file extrafiles line 57
-#: rc.cpp:4436 rc.cpp:4498 rc.cpp:4637 rc.cpp:4994
+#. i18n: file extrafiles line 821
+#: rc.cpp:4529 rc.cpp:4585 rc.cpp:4834 rc.cpp:4997
 #, no-c-format
 msgid ""
 "The <b>PRE</b> element allows to view <i>preformatted</i> text.\n"
 "   "
 msgstr ""
 
-#. i18n: file extrafiles line 64
-#: rc.cpp:4440 rc.cpp:4502 rc.cpp:4641
+#. i18n: file extrafiles line 828
+#: rc.cpp:4533 rc.cpp:4589 rc.cpp:4838
 #, no-c-format
 msgid ""
 "The <b>SUB</b> element is used for <i>subscripts</i>.\n"
@@ -7324,8 +7469,8 @@ msgid ""
 "   "
 msgstr ""
 
-#. i18n: file extrafiles line 71
-#: rc.cpp:4445 rc.cpp:4507 rc.cpp:4646
+#. i18n: file extrafiles line 835
+#: rc.cpp:4538 rc.cpp:4594 rc.cpp:4843
 #, no-c-format
 msgid ""
 "The <b>SUP</b> element is used for <i>superscripts</i>.\n"
@@ -7334,8 +7479,8 @@ msgid ""
 "   "
 msgstr ""
 
-#. i18n: file extrafiles line 79
-#: rc.cpp:4450 rc.cpp:4512 rc.cpp:4651
+#. i18n: file extrafiles line 843
+#: rc.cpp:4543 rc.cpp:4599 rc.cpp:4848
 #, no-c-format
 msgid ""
 "The <b>H1</b> element defines a <i>level-one heading</i>.\n"
@@ -7346,8 +7491,8 @@ msgid ""
 "   "
 msgstr ""
 
-#. i18n: file extrafiles line 87
-#: rc.cpp:4456 rc.cpp:4518 rc.cpp:4657
+#. i18n: file extrafiles line 851
+#: rc.cpp:4549 rc.cpp:4605 rc.cpp:4854
 #, no-c-format
 msgid ""
 "The <b>H2</b> element defines a <i>level-two heading</i>.\n"
@@ -7358,8 +7503,8 @@ msgid ""
 "   "
 msgstr ""
 
-#. i18n: file extrafiles line 95
-#: rc.cpp:4462 rc.cpp:4524 rc.cpp:4663
+#. i18n: file extrafiles line 859
+#: rc.cpp:4555 rc.cpp:4611 rc.cpp:4860
 #, no-c-format
 msgid ""
 "The <b>H3</b> element defines a <i>level-three heading</i>.\n"
@@ -7370,8 +7515,8 @@ msgid ""
 "   "
 msgstr ""
 
-#. i18n: file extrafiles line 103
-#: rc.cpp:4468 rc.cpp:4530 rc.cpp:4669
+#. i18n: file extrafiles line 867
+#: rc.cpp:4561 rc.cpp:4617 rc.cpp:4866
 #, no-c-format
 msgid ""
 "The <b>H4</b> element defines a <i>level-four heading</i>.\n"
@@ -7382,8 +7527,8 @@ msgid ""
 "   "
 msgstr ""
 
-#. i18n: file extrafiles line 111
-#: rc.cpp:4474 rc.cpp:4536 rc.cpp:4675
+#. i18n: file extrafiles line 875
+#: rc.cpp:4567 rc.cpp:4623 rc.cpp:4872
 #, no-c-format
 msgid ""
 "The <b>H5</b> element defines a <i>level-five heading</i>.\n"
@@ -7394,26 +7539,32 @@ msgid ""
 "   "
 msgstr ""
 
-#. i18n: file extrafiles line 117
-#: rc.cpp:4480 rc.cpp:4628
+#. i18n: file extrafiles line 884
+#: rc.cpp:4573
 #, no-c-format
-msgid "Lists"
+msgid "Debug"
 msgstr ""
 
-#. i18n: file extrafiles line 261
-#: rc.cpp:4542 rc.cpp:4631
+#. i18n: file extrafiles line 951
+#: rc.cpp:4579 rc.cpp:4810
 #, no-c-format
-msgid "Tables"
-msgstr "Tablau"
+msgid "Lists"
+msgstr ""
 
-#. i18n: file extrafiles line 323
-#: rc.cpp:4545 rc.cpp:4634
+#. i18n: file extrafiles line 993
+#: rc.cpp:4582 rc.cpp:4813
 #, no-c-format
 msgid "Forms"
 msgstr "Ffurflenni"
 
-#. i18n: file extrafiles line 385
-#: rc.cpp:4548 rc.cpp:4684 rc.cpp:4761
+#. i18n: file extrafiles line 1142
+#: rc.cpp:4629 rc.cpp:5160
+#, no-c-format
+msgid "Style"
+msgstr "Ardull"
+
+#. i18n: file extrafiles line 1167
+#: rc.cpp:4632 rc.cpp:4712 rc.cpp:4881
 #, no-c-format
 msgid ""
 "The <b>B</b> element suggests that text be rendered as <i>bold text</i>.\n"
@@ -7422,8 +7573,8 @@ msgid ""
 "   "
 msgstr ""
 
-#. i18n: file extrafiles line 392
-#: rc.cpp:4553 rc.cpp:4689 rc.cpp:4766
+#. i18n: file extrafiles line 1174
+#: rc.cpp:4637 rc.cpp:4717 rc.cpp:4886
 #, no-c-format
 msgid ""
 "The <b>I</b> element suggests that text be rendered as <i>italic text</i>.\n"
@@ -7432,8 +7583,8 @@ msgid ""
 "   "
 msgstr ""
 
-#. i18n: file extrafiles line 401
-#: rc.cpp:4558 rc.cpp:4694 rc.cpp:4771
+#. i18n: file extrafiles line 1183
+#: rc.cpp:4642 rc.cpp:4722 rc.cpp:4891
 #, no-c-format
 msgid ""
 "The <b>U</b> element, deprecated in HTML 4.0, suggests that text be rendered as "
@@ -7443,8 +7594,8 @@ msgid ""
 "   "
 msgstr ""
 
-#. i18n: file extrafiles line 408
-#: rc.cpp:4563 rc.cpp:4699 rc.cpp:4776
+#. i18n: file extrafiles line 1190
+#: rc.cpp:4647 rc.cpp:4727 rc.cpp:4896
 #, no-c-format
 msgid ""
 "The <b>BR</b> element forces a <i>break</i> in the current line of text.\n"
@@ -7455,8 +7606,8 @@ msgid ""
 "   "
 msgstr ""
 
-#. i18n: file extrafiles line 416
-#: rc.cpp:4569 rc.cpp:4705 rc.cpp:4782
+#. i18n: file extrafiles line 1198
+#: rc.cpp:4653 rc.cpp:4733 rc.cpp:4902
 #, no-c-format
 msgid ""
 "The <b>P</b> element defines a <i>paragraph</i>.\n"
@@ -7467,14 +7618,14 @@ msgid ""
 "   "
 msgstr ""
 
-#. i18n: file extrafiles line 419
-#: rc.cpp:4575 rc.cpp:4711 rc.cpp:4788
+#. i18n: file extrafiles line 1201
+#: rc.cpp:4659 rc.cpp:4739 rc.cpp:4908
 #, no-c-format
 msgid "&nbsp;"
 msgstr ""
 
-#. i18n: file extrafiles line 422
-#: rc.cpp:4578 rc.cpp:4714 rc.cpp:4791
+#. i18n: file extrafiles line 1204
+#: rc.cpp:4662 rc.cpp:4742 rc.cpp:4911
 #, no-c-format
 msgid ""
 "Inserting <b>nbsp</b>.\n"
@@ -7482,8 +7633,8 @@ msgid ""
 "   "
 msgstr ""
 
-#. i18n: file extrafiles line 429
-#: rc.cpp:4583 rc.cpp:4719 rc.cpp:4796
+#. i18n: file extrafiles line 1211
+#: rc.cpp:4667 rc.cpp:4747 rc.cpp:4916
 #, no-c-format
 msgid ""
 "The <b>A</b> element denotes an <i>anchor</i>--a hypertext link or the "
@@ -7493,8 +7644,8 @@ msgid ""
 "   "
 msgstr ""
 
-#. i18n: file extrafiles line 435
-#: rc.cpp:4588 rc.cpp:4724 rc.cpp:4801 rc.cpp:5020
+#. i18n: file extrafiles line 1217
+#: rc.cpp:4672 rc.cpp:4752 rc.cpp:4921 rc.cpp:5017
 #, no-c-format
 msgid ""
 "The <b>IMG</b> element specifies an <i>inline</i> image.\n"
@@ -7502,8 +7653,8 @@ msgid ""
 "   "
 msgstr ""
 
-#. i18n: file extrafiles line 441
-#: rc.cpp:4593 rc.cpp:4729 rc.cpp:4806
+#. i18n: file extrafiles line 1223
+#: rc.cpp:4677 rc.cpp:4757 rc.cpp:4926
 #, no-c-format
 msgid ""
 "The <b>HR</b> element defines a <i>horizontal rule</i> for visual browsers.\n"
@@ -7512,16 +7663,8 @@ msgid ""
 "   "
 msgstr ""
 
-#. i18n: file extrafiles line 447
-#: rc.cpp:4598 rc.cpp:4734 rc.cpp:4811 rc.cpp:4870
-#, no-c-format
-msgid ""
-"The <b>!-- --></b> element <i>comment</i> a text inside.\n"
-"   "
-msgstr ""
-
-#. i18n: file extrafiles line 454
-#: rc.cpp:4602 rc.cpp:4738 rc.cpp:4815
+#. i18n: file extrafiles line 1236
+#: rc.cpp:4686 rc.cpp:4766 rc.cpp:4935
 #, no-c-format
 msgid ""
 "The <b>DIV ALIGN</b>=<i>left</i>\n"
@@ -7530,8 +7673,8 @@ msgid ""
 "   "
 msgstr ""
 
-#. i18n: file extrafiles line 461
-#: rc.cpp:4607 rc.cpp:4743 rc.cpp:4820
+#. i18n: file extrafiles line 1243
+#: rc.cpp:4691 rc.cpp:4771 rc.cpp:4940
 #, no-c-format
 msgid ""
 "The <b>DIV ALIGN</b>=<i>center</i> or <b>CENTER</b>\n"
@@ -7540,8 +7683,8 @@ msgid ""
 "   "
 msgstr ""
 
-#. i18n: file extrafiles line 468
-#: rc.cpp:4612 rc.cpp:4748 rc.cpp:4825
+#. i18n: file extrafiles line 1250
+#: rc.cpp:4696 rc.cpp:4776 rc.cpp:4945
 #, no-c-format
 msgid ""
 "The <b>DIV ALIGN</b>=<i>right</i>\n"
@@ -7550,8 +7693,8 @@ msgid ""
 "   "
 msgstr ""
 
-#. i18n: file extrafiles line 475
-#: rc.cpp:4617 rc.cpp:4753 rc.cpp:4830
+#. i18n: file extrafiles line 1257
+#: rc.cpp:4701 rc.cpp:4781 rc.cpp:4950
 #, no-c-format
 msgid ""
 "The <b>DIV ALIGN</b>=<i>justify</i>\n"
@@ -7560,237 +7703,106 @@ msgid ""
 "   "
 msgstr ""
 
-#. i18n: file extrafiles line 481
-#: rc.cpp:4622 rc.cpp:4758 rc.cpp:4835
+#. i18n: file extrafiles line 1267
+#: rc.cpp:4706 rc.cpp:4786 rc.cpp:4955
 #, no-c-format
 msgid "Standard"
 msgstr "Safonol"
 
-#. i18n: file extrafiles line 518
-#: rc.cpp:4625
-#, no-c-format
-msgid "CFML"
-msgstr ""
-
-#. i18n: file extrafiles line 787
-#: rc.cpp:4681 rc.cpp:5167
-#, no-c-format
-msgid "Style"
-msgstr "Ardull"
-
-#. i18n: file extrafiles line 1109
-#: rc.cpp:4841
-#, no-c-format
-msgid "Docbook - UI"
-msgstr ""
-
-#. i18n: file extrafiles line 1153
-#: rc.cpp:4844 rc.cpp:4892 rc.cpp:4937
-#, no-c-format
-msgid "tagxml"
-msgstr ""
-
-#. i18n: file extrafiles line 1203
-#: rc.cpp:4847
-#, no-c-format
-msgid ""
-"<chapter id=&quot;&quot;>\n"
-"<!--  -->\n"
-"\n"
-"<title></title>\n"
-"\n"
-"<para></para>\n"
-"\n"
-"\n"
-"\n"
-"<sect1>\n"
-"\n"
-"<title></title>\n"
-"\n"
-"<para></para>\n"
-"\n"
-"</sect1>\n"
-"\n"
-"\n"
-"\n"
-"</chapter>\n"
-msgstr ""
-
-#. i18n: file extrafiles line 1256
-#: rc.cpp:4874
+#. i18n: file extrafiles line 1336
+#: rc.cpp:4709 rc.cpp:4878
 #, no-c-format
-msgid ""
-"<figure id=&quot;&quot;>\n"
-"<title></title>\n"
-"<graphic fileref=&quot;&quot;/>\n"
-"</figure>\n"
-msgstr ""
-
-#. i18n: file extrafiles line 1264
-#: rc.cpp:4881
-#, no-c-format
-msgid ""
-"<example role=&quot;codelisting&quot; id=&quot;&quot;>\n"
-"<title></title>\n"
-"<programlisting><![CDATA[\n"
-"\n"
-"]]></programlisting>\n"
-"</example>"
-msgstr ""
-
-#. i18n: file extrafiles line 1303
-#: rc.cpp:4889
-#, no-c-format
-msgid "XML Tools"
-msgstr ""
-
-#. i18n: file extrafiles line 1404
-#: rc.cpp:4895
-#, no-c-format
-msgid "TDE DocBook Admonitions"
-msgstr ""
-
-#. i18n: file extrafiles line 1462
-#: rc.cpp:4898
-#, no-c-format
-msgid "TDE DocBook Tables"
-msgstr ""
-
-#. i18n: file extrafiles line 1523
-#: rc.cpp:4901
-#, no-c-format
-msgid "TDE DocBook Images"
-msgstr ""
-
-#. i18n: file extrafiles line 1602
-#: rc.cpp:4904
-#, no-c-format
-msgid "TDE DocBook Lists"
-msgstr ""
+msgid "Tables"
+msgstr "Tablau"
 
-#. i18n: file extrafiles line 1627
-#: rc.cpp:4907
+#. i18n: file extrafiles line 1511
+#: rc.cpp:4792
 #, no-c-format
-msgid "TDE DocBook Standard"
-msgstr ""
+msgid "Misc."
+msgstr "Amrywiol."
 
-#. i18n: file extrafiles line 1703
-#: rc.cpp:4910
+#. i18n: file extrafiles line 1555
+#: rc.cpp:4795
 #, no-c-format
-msgid "UI Elements"
+msgid "Facets"
 msgstr ""
 
-#. i18n: file extrafiles line 1779
-#: rc.cpp:4913
-#, no-c-format
-msgid "Tools"
-msgstr "Offer"
-
-#. i18n: file extrafiles line 1812
-#: dialogs/tagdialogs/tagdialog.cpp:192 rc.cpp:4919
-#, no-c-format
-msgid "Main"
-msgstr "Prif"
-
-#. i18n: file extrafiles line 1852
-#: rc.cpp:4922 rc.cpp:5283
+#. i18n: file extrafiles line 1629
+#: rc.cpp:4798 rc.cpp:5255
 #, no-c-format
 msgid "complexType"
 msgstr ""
 
-#. i18n: file extrafiles line 1926
-#: rc.cpp:4925
+#. i18n: file extrafiles line 1703
+#: rc.cpp:4801 rc.cpp:5267
 #, no-c-format
-msgid "Facets"
+msgid "simpleType"
 msgstr ""
 
-#. i18n: file extrafiles line 2000
-#: rc.cpp:4928 treeviews/tagattributetree.cpp:295
+#. i18n: file extrafiles line 1733
+#: rc.cpp:4804 treeviews/tagattributetree.cpp:295
 #, no-c-format
 msgid "Attributes"
 msgstr "Priodweddion"
 
-#. i18n: file extrafiles line 2024
-#: rc.cpp:4931
-#, no-c-format
-msgid "Misc."
-msgstr "Amrywiol."
-
-#. i18n: file extrafiles line 2068
-#: rc.cpp:4934 rc.cpp:5317
-#, no-c-format
-msgid "simpleType"
-msgstr ""
-
-#. i18n: file extrafiles line 2125
-#: rc.cpp:4940
-#, no-c-format
-msgid ""
-"<?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?>\n"
-"<!DOCTYPE TAGS>\n"
-"<TAGS>\n"
-"\n"
-"</TAGS>\n"
-msgstr ""
-
-#. i18n: file extrafiles line 2184
-#: rc.cpp:4948
+#. i18n: file extrafiles line 1757
+#: dialogs/tagdialogs/tagdialog.cpp:192 rc.cpp:4807
 #, no-c-format
-msgid ""
-"<children>\n"
-"<child name=&quot;&quot; />\n"
-"</children>"
-msgstr ""
+msgid "Main"
+msgstr "Prif"
 
-#. i18n: file extrafiles line 2189
-#: rc.cpp:4953
+#. i18n: file extrafiles line 1908
+#: rc.cpp:4816
 #, no-c-format
-msgid ""
-"<stoppingtags>\n"
-"<stoppingtag name=&quot;&quot; />\n"
-"</stoppingtags>"
+msgid "CFML"
 msgstr ""
 
-#. i18n: file extrafiles line 2195
+#. i18n: file extrafiles line 2214
 #: rc.cpp:4958
 #, no-c-format
 msgid "forms"
 msgstr "ffurflenni"
 
-#. i18n: file extrafiles line 2231
-#: rc.cpp:4961
+#. i18n: file extrafiles line 2247
+#: rc.cpp:4961 rc.cpp:5030
+#, no-c-format
+msgid "table"
+msgstr "tabl"
+
+#. i18n: file extrafiles line 2269
+#: rc.cpp:4964
 #, no-c-format
 msgid ""
 "The <b>B</b> element suggests that text be rendered as <i>bold text</i>.\n"
 "   "
 msgstr ""
 
-#. i18n: file extrafiles line 2234
-#: rc.cpp:4965
+#. i18n: file extrafiles line 2272
+#: rc.cpp:4968
 #, no-c-format
 msgid ""
 "The <b>B</b> element suggests that text be rendered as <i>emphasized text</i>.\n"
 "   "
 msgstr ""
 
-#. i18n: file extrafiles line 2243
-#: rc.cpp:4969
+#. i18n: file extrafiles line 2281
+#: rc.cpp:4972
 #, no-c-format
 msgid ""
 "The <b>I</b> element suggests that text be rendered as <i>italic text</i>.\n"
 "   "
 msgstr ""
 
-#. i18n: file extrafiles line 2248
-#: rc.cpp:4973
+#. i18n: file extrafiles line 2286
+#: rc.cpp:4976
 #, no-c-format
 msgid ""
 "The <b>U</b> element suggests that text be rendered as <i>underlined text</i>.\n"
 "   "
 msgstr ""
 
-#. i18n: file extrafiles line 2251
-#: rc.cpp:4977
+#. i18n: file extrafiles line 2289
+#: rc.cpp:4980
 #, no-c-format
 msgid ""
 "The <b>small</b> element suggests that text be rendered as a <i>small font</i>"
@@ -7798,24 +7810,24 @@ msgid ""
 "   "
 msgstr ""
 
-#. i18n: file extrafiles line 2258
-#: rc.cpp:4981
+#. i18n: file extrafiles line 2296
+#: rc.cpp:4984
 #, no-c-format
 msgid ""
 "The <b>big</b> element suggests that text be rendered as a <i>big font</i>.\n"
 "   "
 msgstr ""
 
-#. i18n: file extrafiles line 2265
-#: rc.cpp:4985
+#. i18n: file extrafiles line 2303
+#: rc.cpp:4988
 #, no-c-format
 msgid ""
 "The <b>br</b> element forces a <i>break</i> in the current line of text.\n"
 "   "
 msgstr ""
 
-#. i18n: file extrafiles line 2275
-#: rc.cpp:4989
+#. i18n: file extrafiles line 2313
+#: rc.cpp:4992
 #, no-c-format
 msgid ""
 "The <b>P</b> element defines a <i>paragraph</i>.\n"
@@ -7824,32 +7836,20 @@ msgid ""
 "   "
 msgstr ""
 
-#. i18n: file extrafiles line 2287
-#: rc.cpp:4998
+#. i18n: file extrafiles line 2325
+#: rc.cpp:5001
 #, no-c-format
 msgid "text"
 msgstr "testun"
 
-#. i18n: file extrafiles line 2333
-#: rc.cpp:5001
-#, no-c-format
-msgid "deck"
-msgstr ""
-
-#. i18n: file extrafiles line 2343
-#: rc.cpp:5004 rc.cpp:5216
-#, no-c-format
-msgid "table"
-msgstr "tabl"
-
-#. i18n: file extrafiles line 2362
-#: rc.cpp:5007
+#. i18n: file extrafiles line 2342
+#: rc.cpp:5004
 #, no-c-format
 msgid "misc."
 msgstr "amrywiol."
 
-#. i18n: file extrafiles line 2379
-#: rc.cpp:5010
+#. i18n: file extrafiles line 2359
+#: rc.cpp:5007
 #, no-c-format
 msgid ""
 "The <b>anchor</b> element denotes an <i>anchor</i>-- a link to formatted text.\n"
@@ -7858,8 +7858,8 @@ msgid ""
 "   "
 msgstr ""
 
-#. i18n: file extrafiles line 2383
-#: rc.cpp:5015
+#. i18n: file extrafiles line 2363
+#: rc.cpp:5012
 #, no-c-format
 msgid ""
 "The <b>a</b> element denotes an <i>anchor</i>--a hypertext link or the "
@@ -7869,778 +7869,778 @@ msgid ""
 "   "
 msgstr ""
 
-#. i18n: file extrafiles line 2445
+#. i18n: file extrafiles line 2421
+#: rc.cpp:5022
+#, no-c-format
+msgid "deck"
+msgstr ""
+
+#. i18n: file extrafiles line 2464
 #: rc.cpp:5025
 #, no-c-format
 msgid "tasks"
 msgstr "tasgau"
 
-#. i18n: file extrafiles line 2460
-#: rc.cpp:5028
-#, no-c-format
-msgid "Debug"
+#: rc.cpp:5029
+msgid "Table Wizard"
 msgstr ""
 
-#: rc.cpp:5029 rc.cpp:5046
-msgid "Font..."
-msgstr "Wynebfath..."
+#: rc.cpp:5031 rc.cpp:5070
+msgid "title"
+msgstr "teitl"
 
-#: rc.cpp:5030 rc.cpp:5047
-msgid "Font Size+1"
+#: rc.cpp:5032
+msgid "informaltable"
 msgstr ""
 
-#: rc.cpp:5031 rc.cpp:5048
-msgid "Font Size-1"
+#: rc.cpp:5033
+msgid "tgroup"
 msgstr ""
 
-#: rc.cpp:5032 rc.cpp:5049 rc.cpp:5124
-msgid "Pre"
+#: rc.cpp:5034
+msgid "thead"
 msgstr ""
 
-#: rc.cpp:5033 rc.cpp:5050 rc.cpp:5125
-msgid "Subscript"
-msgstr "Isysgrif"
-
-#: rc.cpp:5034 rc.cpp:5051 rc.cpp:5126
-msgid "Superscript"
-msgstr "Uwchysgrif"
-
-#: rc.cpp:5035 rc.cpp:5052 rc.cpp:5127
-msgid "Head 1 Level"
+#: rc.cpp:5035
+msgid "tbody"
 msgstr ""
 
-#: rc.cpp:5036 rc.cpp:5053 rc.cpp:5128
-msgid "Head 2 Level"
-msgstr ""
+#: rc.cpp:5036
+msgid "row"
+msgstr "rhes"
 
-#: rc.cpp:5037 rc.cpp:5054 rc.cpp:5129
-msgid "Head 3 Level"
-msgstr ""
+#: rc.cpp:5037
+msgid "entry"
+msgstr "cofnod"
 
-#: rc.cpp:5038 rc.cpp:5055 rc.cpp:5130
-msgid "Head 4 Level"
-msgstr ""
+#: rc.cpp:5038
+#, fuzzy
+msgid "Image Wizard"
+msgstr "&Delweddau :"
 
-#: rc.cpp:5039 rc.cpp:5056 rc.cpp:5131
-msgid "Head 5 Level"
-msgstr ""
+#: rc.cpp:5039
+msgid "screenshot"
+msgstr "sgrinlun"
 
-#: rc.cpp:5040 rc.cpp:5093
-msgid "Unordered List"
+#: rc.cpp:5040
+msgid "screeninfo"
 msgstr ""
 
-#: rc.cpp:5041 rc.cpp:5094
-msgid "Ordered List"
+#: rc.cpp:5041
+msgid "mediaobject"
 msgstr ""
 
-#: rc.cpp:5042 rc.cpp:5095
-msgid "List Item"
+#: rc.cpp:5042
+msgid "inlinemediaobject"
 msgstr ""
 
-#: rc.cpp:5043 rc.cpp:5096
-msgid "Definition List"
+#: rc.cpp:5043
+msgid "imageobject"
 msgstr ""
 
-#: rc.cpp:5044 rc.cpp:5097
-msgid "Definition Term"
+#: rc.cpp:5044
+msgid "imagedata"
 msgstr ""
 
-#: rc.cpp:5045 rc.cpp:5098
-msgid "Definition"
+#: rc.cpp:5045
+msgid "textobject"
 msgstr ""
 
-#: rc.cpp:5057 rc.cpp:5099 rc.cpp:5192 utility/tagactionset.cpp:333
-msgid "Table"
-msgstr "Tabl"
+#: rc.cpp:5046
+msgid "phrase"
+msgstr "ymadrodd"
 
-#: rc.cpp:5058 rc.cpp:5100
-msgid "Table Row (with dialog)"
+#: rc.cpp:5047
+msgid "caption"
+msgstr "egluryn"
+
+#: rc.cpp:5048
+msgid "List Wizard"
 msgstr ""
 
-#: rc.cpp:5059 rc.cpp:5101
-msgid "Table Body (with dialog)"
+#: rc.cpp:5049
+msgid "orderedlist"
 msgstr ""
 
-#: rc.cpp:5060 rc.cpp:5102
-msgid "Table Head (with dialog)"
+#: rc.cpp:5050
+msgid "itemizedlist"
 msgstr ""
 
-#: rc.cpp:5061 rc.cpp:5103
-msgid "Table Data (with dialog)"
+#: rc.cpp:5051
+msgid "listitem"
 msgstr ""
 
-#: rc.cpp:5062 rc.cpp:5104
-msgid "Table Body"
+#: rc.cpp:5052
+msgid "variablelist"
 msgstr ""
 
-#: rc.cpp:5063 rc.cpp:5105
-msgid "Table Head"
+#: rc.cpp:5053
+msgid "varlistentry"
 msgstr ""
 
-#: rc.cpp:5064 rc.cpp:5106
-msgid "Table Row"
+#: rc.cpp:5054
+msgid "term"
 msgstr ""
 
-#: rc.cpp:5065 rc.cpp:5107
-msgid "Table Data"
+#: rc.cpp:5055
+msgid "varlistitem"
 msgstr ""
 
-#: rc.cpp:5066 rc.cpp:5108
-msgid "Caption"
-msgstr "Egluryn"
+#: rc.cpp:5056
+msgid "procedure"
+msgstr ""
 
-#: rc.cpp:5067 rc.cpp:5109
-msgid "Form"
-msgstr "Ffurflen"
+#: rc.cpp:5057
+msgid "step"
+msgstr "cam"
 
-#: rc.cpp:5068 rc.cpp:5110
-msgid "Select"
-msgstr "Dewis"
+#: rc.cpp:5058
+msgid "substeps"
+msgstr ""
 
-#: rc.cpp:5069 rc.cpp:5112
-msgid "Check Button"
+#: rc.cpp:5059
+msgid "simplelist"
 msgstr ""
 
-#: rc.cpp:5070 rc.cpp:5113
-msgid "Radio Button"
-msgstr "Botwm radio"
+#: rc.cpp:5060
+msgid "member"
+msgstr ""
 
-#: rc.cpp:5071 rc.cpp:5115
-msgid "Text Area"
+#: rc.cpp:5061 rc.cpp:5071 rc.cpp:5086 rc.cpp:5112
+msgid "para"
 msgstr ""
 
-#: rc.cpp:5072 rc.cpp:5116
-msgid "Input Password"
+#: rc.cpp:5062
+msgid "meinproc"
 msgstr ""
 
-#: rc.cpp:5073 rc.cpp:5117
-msgid "Input Text"
+#: rc.cpp:5063
+msgid "checkXML"
 msgstr ""
 
-#: rc.cpp:5074 rc.cpp:5120
-msgid "Submit"
-msgstr "Cyflwyno"
+#: rc.cpp:5064
+msgid "chapter"
+msgstr "pennod"
 
-#: rc.cpp:5077
-msgid "Bold"
-msgstr "Trwm"
+#: rc.cpp:5065 rc.cpp:5115
+msgid "sect1"
+msgstr ""
 
-#: rc.cpp:5079 rc.cpp:5135 rc.cpp:5151
-msgid "Underline"
-msgstr "Tanlinellu"
+#: rc.cpp:5066 rc.cpp:5116
+msgid "sect2"
+msgstr ""
 
-#: rc.cpp:5080 rc.cpp:5136 rc.cpp:5152
-msgid "New Line"
+#: rc.cpp:5067 rc.cpp:5117
+msgid "sect3"
 msgstr ""
 
-#: rc.cpp:5081 rc.cpp:5137 rc.cpp:5153
-msgid "Paragraph"
-msgstr "Paragraff"
+#: rc.cpp:5068 rc.cpp:5118
+msgid "sect4"
+msgstr ""
 
-#: rc.cpp:5082 rc.cpp:5138 rc.cpp:5154
-msgid "Non Breaking Space"
+#: rc.cpp:5069
+msgid "sect5"
 msgstr ""
 
-#: rc.cpp:5083 rc.cpp:5139 rc.cpp:5155 rc.cpp:5185
-msgid "Anchor..."
+#: rc.cpp:5072
+msgid "anchor"
 msgstr ""
 
-#: rc.cpp:5084 rc.cpp:5140 rc.cpp:5156
-msgid "Image..."
-msgstr "Delwedd ..."
+#: rc.cpp:5073
+msgid "xref"
+msgstr ""
 
-#: rc.cpp:5085 rc.cpp:5141 rc.cpp:5157
-msgid "Horizontal Line"
-msgstr "Llinell Llorweddol"
+#: rc.cpp:5074
+msgid "link"
+msgstr "cyswllt"
 
-#: rc.cpp:5087 rc.cpp:5143
-msgid "Align Left"
-msgstr "Alinio Chwith"
+#: rc.cpp:5075
+msgid "ulink"
+msgstr ""
 
-#: rc.cpp:5088 rc.cpp:5144
-msgid "Align Center"
-msgstr "Alinio i'r Canol"
+#: rc.cpp:5076
+msgid "email"
+msgstr "ebost:"
 
-#: rc.cpp:5089 rc.cpp:5145
-msgid "Align Right"
-msgstr "Alinio Dde"
+#: rc.cpp:5077
+msgid "warning"
+msgstr "rhybudd"
 
-#: rc.cpp:5090 rc.cpp:5146
-msgid "Align Justify"
+#: rc.cpp:5078
+msgid "caution"
 msgstr ""
 
-#: rc.cpp:5091 rc.cpp:5164
-msgid "Time"
-msgstr "Amser"
+#: rc.cpp:5079
+msgid "important"
+msgstr "pwysig"
 
-#: rc.cpp:5111
-msgid "Option"
-msgstr "Dewisiad"
+#: rc.cpp:5080 rc.cpp:5114
+msgid "note"
+msgstr "nodyn"
 
-#: rc.cpp:5114 rc.cpp:5170
-msgid "Button"
-msgstr "Botwm"
+#: rc.cpp:5081
+msgid "tip"
+msgstr ""
 
-#: rc.cpp:5118
-msgid "Fieldset"
+#: rc.cpp:5082
+msgid "footnote"
+msgstr "troednodyn"
+
+#: rc.cpp:5083
+msgid "footnoteref"
 msgstr ""
 
-#: rc.cpp:5119
-msgid "Legend"
-msgstr "Mynegai"
+#: rc.cpp:5084
+msgid "example"
+msgstr "enghraifft"
 
-#: rc.cpp:5122 rc.cpp:5147 rc.cpp:5163
-msgid "Span"
+#: rc.cpp:5085
+msgid "informalexample"
 msgstr ""
 
-#: rc.cpp:5123
-msgid "Div"
+#: rc.cpp:5087
+msgid "guilabel"
 msgstr ""
 
-#: rc.cpp:5132 rc.cpp:5148
-msgid "Quick Start Dialog"
+#: rc.cpp:5088
+msgid "guibutton"
 msgstr ""
 
-#: rc.cpp:5165 rc.cpp:5350
-msgid "Meta"
-msgstr "Meta"
+#: rc.cpp:5089
+msgid "guiicon"
+msgstr ""
 
-#: rc.cpp:5166
-msgid "Base"
-msgstr "Bôn"
+#: rc.cpp:5090
+msgid "menuchoice"
+msgstr ""
 
-#: parts/kafka/wkafkapart.cpp:71 rc.cpp:5168
-msgid "Link"
-msgstr "Cyswllt"
+#: rc.cpp:5091
+msgid "shortcut"
+msgstr "byrlwybr"
 
-#: rc.cpp:5169
-msgid "Application Name"
+#: rc.cpp:5092
+msgid "guimenu"
 msgstr ""
 
-#: rc.cpp:5172
-msgid "Label"
-msgstr "Label"
-
-#: rc.cpp:5173
-msgid "Menu"
-msgstr "Dewislen"
+#: rc.cpp:5093
+msgid "guimenuitem"
+msgstr ""
 
-#: rc.cpp:5174
-msgid "menu item"
+#: rc.cpp:5094
+msgid "guisubmenu"
 msgstr ""
 
-#: rc.cpp:5175
-msgid "Sub menu"
+#: rc.cpp:5095
+msgid "keycombo"
 msgstr ""
 
-#: rc.cpp:5178 rc.cpp:5214 rc.cpp:5247 rc.cpp:5255
-msgid "para"
+#: rc.cpp:5096
+msgid "keycap"
 msgstr ""
 
-#: rc.cpp:5180 rc.cpp:5208
-msgid "note"
-msgstr "nodyn"
+#: rc.cpp:5097
+msgid "action"
+msgstr "gweithred"
 
-#: rc.cpp:5181 rc.cpp:5249
-msgid "sect1"
+#: rc.cpp:5098
+msgid "New Tag file"
 msgstr ""
 
-#: rc.cpp:5182 rc.cpp:5250
-msgid "sect2"
+#: rc.cpp:5101 rc.cpp:5124
+msgid "Items"
+msgstr "Eitemau"
+
+#: rc.cpp:5102
+msgid "Item"
+msgstr "Eitem"
+
+#: rc.cpp:5108
+msgid "Children"
 msgstr ""
 
-#: rc.cpp:5183 rc.cpp:5251
-msgid "sect3"
+#: rc.cpp:5109
+msgid "Stoppingtags"
 msgstr ""
 
-#: rc.cpp:5184 rc.cpp:5252
-msgid "sect4"
+#: rc.cpp:5119 rc.cpp:5198 rc.cpp:5224 rc.cpp:5325
+msgid "Anchor..."
 msgstr ""
 
-#: rc.cpp:5186
+#: rc.cpp:5120
 #, fuzzy
 msgid "Web Link"
 msgstr "Cyswllt"
 
-#: rc.cpp:5188
+#: rc.cpp:5122
 msgid "programlisting"
 msgstr ""
 
-#: rc.cpp:5189
+#: rc.cpp:5123
 msgid "List"
 msgstr "Rhestr"
 
-#: rc.cpp:5190 rc.cpp:5324
-msgid "Items"
-msgstr "Eitemau"
-
-#: rc.cpp:5191
+#: rc.cpp:5125
 #, fuzzy
 msgid "Emphasis"
 msgstr "Ebost"
 
-#: rc.cpp:5193
+#: rc.cpp:5126 rc.cpp:5207 rc.cpp:5308 utility/tagactionset.cpp:333
+msgid "Table"
+msgstr "Tabl"
+
+#: rc.cpp:5127
 #, fuzzy
 msgid "amp"
 msgstr "Engraifft"
 
-#: rc.cpp:5194
+#: rc.cpp:5128
 msgid "CDATA"
 msgstr ""
 
-#: rc.cpp:5195
+#: rc.cpp:5129
 msgid "XML Validator"
 msgstr ""
 
-#: rc.cpp:5196
+#: rc.cpp:5130
 msgid "XSLT Processor"
 msgstr ""
 
-#: rc.cpp:5197
+#: rc.cpp:5131
+msgid "Application Name"
+msgstr ""
+
+#: rc.cpp:5132 rc.cpp:5173
+msgid "Button"
+msgstr "Botwm"
+
+#: rc.cpp:5134
+msgid "Label"
+msgstr "Label"
+
+#: rc.cpp:5135
+msgid "Menu"
+msgstr "Dewislen"
+
+#: rc.cpp:5136
+msgid "menu item"
+msgstr ""
+
+#: rc.cpp:5137
+msgid "Sub menu"
+msgstr ""
+
+#: rc.cpp:5138
 #, fuzzy
 msgid "Class Name"
 msgstr "Dosbarthiadau"
 
-#: rc.cpp:5198
+#: rc.cpp:5139
 #, fuzzy
 msgid "Metod Name"
 msgstr "Enw Ffeil"
 
 #: components/debugger/backtracelistview.cpp:61
-#: components/debugger/debuggerbreakpointview.cpp:62 rc.cpp:5199
+#: components/debugger/debuggerbreakpointview.cpp:62 rc.cpp:5140
 msgid "Function"
 msgstr "Ffwythiant"
 
-#: rc.cpp:5201
+#: rc.cpp:5142
 #, fuzzy
 msgid "Var Name"
 msgstr "Enw"
 
-#: rc.cpp:5202
+#: rc.cpp:5143
 msgid "Command Line"
 msgstr "Llinell orchymyn"
 
-#: rc.cpp:5203
+#: rc.cpp:5144
 msgid "Parameter"
 msgstr "Paramedr"
 
-#: rc.cpp:5204
+#: rc.cpp:5145
 msgid "Prompt"
 msgstr "Annog"
 
-#: rc.cpp:5205
-msgid "warning"
-msgstr "rhybudd"
+#: rc.cpp:5146 rc.cpp:5297
+msgid "Font..."
+msgstr "Wynebfath..."
 
-#: rc.cpp:5206
-msgid "caution"
+#: rc.cpp:5147 rc.cpp:5298
+msgid "Font Size+1"
 msgstr ""
 
-#: rc.cpp:5207
-msgid "important"
-msgstr "pwysig"
-
-#: rc.cpp:5209
-msgid "tip"
+#: rc.cpp:5148 rc.cpp:5299
+msgid "Font Size-1"
 msgstr ""
 
-#: rc.cpp:5210
-msgid "footnote"
-msgstr "troednodyn"
-
-#: rc.cpp:5211
-msgid "footnoteref"
+#: rc.cpp:5149 rc.cpp:5183 rc.cpp:5300
+msgid "Pre"
 msgstr ""
 
-#: rc.cpp:5212
-msgid "example"
-msgstr "enghraifft"
+#: rc.cpp:5150 rc.cpp:5184 rc.cpp:5301
+msgid "Subscript"
+msgstr "Isysgrif"
 
-#: rc.cpp:5213
-msgid "informalexample"
-msgstr ""
+#: rc.cpp:5151 rc.cpp:5185 rc.cpp:5302
+msgid "Superscript"
+msgstr "Uwchysgrif"
 
-#: rc.cpp:5215
-msgid "Table Wizard"
+#: rc.cpp:5152 rc.cpp:5186 rc.cpp:5303
+msgid "Head 1 Level"
 msgstr ""
 
-#: rc.cpp:5217 rc.cpp:5254
-msgid "title"
-msgstr "teitl"
-
-#: rc.cpp:5218
-msgid "informaltable"
+#: rc.cpp:5153 rc.cpp:5187 rc.cpp:5304
+msgid "Head 2 Level"
 msgstr ""
 
-#: rc.cpp:5219
-msgid "tgroup"
+#: rc.cpp:5154 rc.cpp:5188 rc.cpp:5305
+msgid "Head 3 Level"
 msgstr ""
 
-#: rc.cpp:5220
-msgid "thead"
+#: rc.cpp:5155 rc.cpp:5189 rc.cpp:5306
+msgid "Head 4 Level"
 msgstr ""
 
-#: rc.cpp:5221
-msgid "tbody"
+#: rc.cpp:5156 rc.cpp:5190 rc.cpp:5307
+msgid "Head 5 Level"
 msgstr ""
 
-#: rc.cpp:5222
-msgid "row"
-msgstr "rhes"
+#: rc.cpp:5157 rc.cpp:5295
+msgid "Time"
+msgstr "Amser"
 
-#: rc.cpp:5223
-msgid "entry"
-msgstr "cofnod"
+#: rc.cpp:5158 rc.cpp:5359
+msgid "Meta"
+msgstr "Meta"
 
-#: rc.cpp:5224
-#, fuzzy
-msgid "Image Wizard"
-msgstr "&Delweddau :"
+#: rc.cpp:5159
+msgid "Base"
+msgstr "Bôn"
 
-#: rc.cpp:5225
-msgid "screenshot"
-msgstr "sgrinlun"
+#: parts/kafka/wkafkapart.cpp:71 rc.cpp:5161
+msgid "Link"
+msgstr "Cyswllt"
 
-#: rc.cpp:5226
-msgid "screeninfo"
+#: rc.cpp:5162 rc.cpp:5280
+msgid "Unordered List"
 msgstr ""
 
-#: rc.cpp:5227
-msgid "mediaobject"
+#: rc.cpp:5163 rc.cpp:5281
+msgid "Ordered List"
 msgstr ""
 
-#: rc.cpp:5228
-msgid "inlinemediaobject"
+#: rc.cpp:5164 rc.cpp:5282
+msgid "List Item"
 msgstr ""
 
-#: rc.cpp:5229
-msgid "imageobject"
+#: rc.cpp:5165 rc.cpp:5283
+msgid "Definition List"
 msgstr ""
 
-#: rc.cpp:5230
-msgid "imagedata"
+#: rc.cpp:5166 rc.cpp:5284
+msgid "Definition Term"
 msgstr ""
 
-#: rc.cpp:5231
-msgid "textobject"
+#: rc.cpp:5167 rc.cpp:5285
+msgid "Definition"
 msgstr ""
 
-#: rc.cpp:5232
-msgid "phrase"
-msgstr "ymadrodd"
-
-#: rc.cpp:5233
-msgid "caption"
-msgstr "egluryn"
+#: rc.cpp:5168 rc.cpp:5286
+msgid "Form"
+msgstr "Ffurflen"
 
-#: rc.cpp:5234
-msgid "List Wizard"
-msgstr ""
+#: rc.cpp:5169 rc.cpp:5287
+msgid "Select"
+msgstr "Dewis"
 
-#: rc.cpp:5235
-msgid "orderedlist"
-msgstr ""
+#: rc.cpp:5170
+msgid "Option"
+msgstr "Dewisiad"
 
-#: rc.cpp:5236
-msgid "itemizedlist"
+#: rc.cpp:5171 rc.cpp:5288
+msgid "Check Button"
 msgstr ""
 
-#: rc.cpp:5237
-msgid "listitem"
-msgstr ""
+#: rc.cpp:5172 rc.cpp:5289
+msgid "Radio Button"
+msgstr "Botwm radio"
 
-#: rc.cpp:5238
-msgid "variablelist"
+#: rc.cpp:5174 rc.cpp:5290
+msgid "Text Area"
 msgstr ""
 
-#: rc.cpp:5239
-msgid "varlistentry"
+#: rc.cpp:5175 rc.cpp:5291
+msgid "Input Password"
 msgstr ""
 
-#: rc.cpp:5240
-msgid "term"
+#: rc.cpp:5176 rc.cpp:5292
+msgid "Input Text"
 msgstr ""
 
-#: rc.cpp:5241
-msgid "varlistitem"
+#: rc.cpp:5177
+msgid "Fieldset"
 msgstr ""
 
-#: rc.cpp:5242
-msgid "procedure"
-msgstr ""
+#: rc.cpp:5178
+msgid "Legend"
+msgstr "Mynegai"
 
-#: rc.cpp:5243
-msgid "step"
-msgstr "cam"
+#: rc.cpp:5179 rc.cpp:5293
+msgid "Submit"
+msgstr "Cyflwyno"
 
-#: rc.cpp:5244
-msgid "substeps"
+#: rc.cpp:5181 rc.cpp:5206 rc.cpp:5232
+msgid "Span"
 msgstr ""
 
-#: rc.cpp:5245
-msgid "simplelist"
+#: rc.cpp:5182
+msgid "Div"
 msgstr ""
 
-#: rc.cpp:5246
-msgid "member"
+#: rc.cpp:5191 rc.cpp:5217
+msgid "Quick Start Dialog"
 msgstr ""
 
-#: rc.cpp:5248
-msgid "chapter"
-msgstr "pennod"
+#: rc.cpp:5194 rc.cpp:5220 rc.cpp:5321
+msgid "Underline"
+msgstr "Tanlinellu"
 
-#: rc.cpp:5253
-msgid "sect5"
+#: rc.cpp:5195 rc.cpp:5221 rc.cpp:5322
+msgid "New Line"
 msgstr ""
 
-#: rc.cpp:5256
-msgid "anchor"
-msgstr ""
+#: rc.cpp:5196 rc.cpp:5222 rc.cpp:5323
+msgid "Paragraph"
+msgstr "Paragraff"
 
-#: rc.cpp:5257
-msgid "xref"
+#: rc.cpp:5197 rc.cpp:5223 rc.cpp:5324
+msgid "Non Breaking Space"
 msgstr ""
 
-#: rc.cpp:5258
-msgid "link"
-msgstr "cyswllt"
+#: rc.cpp:5199 rc.cpp:5225 rc.cpp:5326
+msgid "Image..."
+msgstr "Delwedd ..."
 
-#: rc.cpp:5259
-msgid "ulink"
-msgstr ""
+#: rc.cpp:5200 rc.cpp:5226 rc.cpp:5327
+msgid "Horizontal Line"
+msgstr "Llinell Llorweddol"
 
-#: rc.cpp:5260
-msgid "email"
-msgstr "ebost:"
+#: rc.cpp:5202 rc.cpp:5329
+msgid "Align Left"
+msgstr "Alinio Chwith"
 
-#: rc.cpp:5261
-msgid "guilabel"
-msgstr ""
+#: rc.cpp:5203 rc.cpp:5330
+msgid "Align Center"
+msgstr "Alinio i'r Canol"
 
-#: rc.cpp:5262
-msgid "guibutton"
-msgstr ""
+#: rc.cpp:5204 rc.cpp:5331
+msgid "Align Right"
+msgstr "Alinio Dde"
 
-#: rc.cpp:5263
-msgid "guiicon"
+#: rc.cpp:5205 rc.cpp:5332
+msgid "Align Justify"
 msgstr ""
 
-#: rc.cpp:5264
-msgid "menuchoice"
+#: rc.cpp:5208 rc.cpp:5309
+msgid "Table Row (with dialog)"
 msgstr ""
 
-#: rc.cpp:5265
-msgid "shortcut"
-msgstr "byrlwybr"
-
-#: rc.cpp:5266
-msgid "guimenu"
+#: rc.cpp:5209 rc.cpp:5310
+msgid "Table Body (with dialog)"
 msgstr ""
 
-#: rc.cpp:5267
-msgid "guimenuitem"
+#: rc.cpp:5210 rc.cpp:5311
+msgid "Table Head (with dialog)"
 msgstr ""
 
-#: rc.cpp:5268
-msgid "guisubmenu"
+#: rc.cpp:5211 rc.cpp:5312
+msgid "Table Data (with dialog)"
 msgstr ""
 
-#: rc.cpp:5269
-msgid "keycombo"
+#: rc.cpp:5212 rc.cpp:5313
+msgid "Table Body"
 msgstr ""
 
-#: rc.cpp:5270
-msgid "keycap"
+#: rc.cpp:5213 rc.cpp:5314
+msgid "Table Head"
 msgstr ""
 
-#: rc.cpp:5271
-msgid "action"
-msgstr "gweithred"
-
-#: rc.cpp:5272
-msgid "meinproc"
+#: rc.cpp:5214 rc.cpp:5315
+msgid "Table Row"
 msgstr ""
 
-#: rc.cpp:5273
-msgid "checkXML"
+#: rc.cpp:5215 rc.cpp:5316
+msgid "Table Data"
 msgstr ""
 
-#: rc.cpp:5274
+#: rc.cpp:5216 rc.cpp:5317
+msgid "Caption"
+msgstr "Egluryn"
+
+#: rc.cpp:5233
 msgid "annotation"
 msgstr ""
 
-#: rc.cpp:5275
+#: rc.cpp:5234
 msgid "appInfo"
 msgstr ""
 
-#: rc.cpp:5276
+#: rc.cpp:5235
 msgid "documentation"
 msgstr "dogfenniaeth"
 
-#: rc.cpp:5277
-msgid "schema"
-msgstr "sgema"
-
-#: rc.cpp:5278
-msgid "element"
-msgstr "elfen"
-
-#: rc.cpp:5279
-msgid "import"
-msgstr "mewnforio"
-
-#: rc.cpp:5280
-msgid "include"
-msgstr "yn cynnwys"
-
-#: rc.cpp:5281
-msgid "notation"
-msgstr ""
-
-#: rc.cpp:5282
-msgid "redefine"
-msgstr ""
-
-#: rc.cpp:5284
-msgid "complexContent"
-msgstr ""
-
-#: rc.cpp:5285
-msgid "simpleContent"
-msgstr ""
-
-#: rc.cpp:5286
-msgid "all"
-msgstr "popeth"
+#: rc.cpp:5236
+msgid "any"
+msgstr "unrhyw"
 
-#: rc.cpp:5287
-msgid "choice"
-msgstr ""
+#: rc.cpp:5237
+msgid "field"
+msgstr "maes"
 
-#: rc.cpp:5288 rc.cpp:5312
+#: rc.cpp:5238 rc.cpp:5260
 msgid "group"
 msgstr "grŵp"
 
-#: rc.cpp:5289
-msgid "sequence"
-msgstr ""
-
-#: rc.cpp:5290 rc.cpp:5308
-msgid "attribute"
-msgstr "priodoleddau"
-
-#: rc.cpp:5291 rc.cpp:5309
-msgid "attributeGroup"
-msgstr ""
+#: rc.cpp:5239
+msgid "key"
+msgstr "allwedd"
 
-#: rc.cpp:5292 rc.cpp:5307
-msgid "anyAttribute"
+#: rc.cpp:5240
+msgid "keyref"
 msgstr ""
 
-#: rc.cpp:5293 rc.cpp:5318
-msgid "restriction"
-msgstr ""
+#: rc.cpp:5241
+msgid "selector"
+msgstr "dewisydd"
 
-#: rc.cpp:5294
-msgid "extension"
-msgstr "estyniad"
+#: rc.cpp:5242
+msgid "unique"
+msgstr "unigryw"
 
-#: rc.cpp:5295
+#: rc.cpp:5243
 msgid "enumeration"
 msgstr ""
 
-#: rc.cpp:5296
+#: rc.cpp:5244
 msgid "pattern"
 msgstr "patrwm"
 
-#: rc.cpp:5297
+#: rc.cpp:5245
 msgid "totalDigits"
 msgstr ""
 
-#: rc.cpp:5298
+#: rc.cpp:5246
 msgid "fractionDigits"
 msgstr ""
 
-#: rc.cpp:5299
+#: rc.cpp:5247
 msgid "length"
 msgstr "hyd"
 
-#: rc.cpp:5300
+#: rc.cpp:5248
 msgid "maxLength"
 msgstr ""
 
-#: rc.cpp:5301
+#: rc.cpp:5249
 msgid "minLength"
 msgstr ""
 
-#: rc.cpp:5302
+#: rc.cpp:5250
 msgid "maxInclusive"
 msgstr ""
 
-#: rc.cpp:5303
+#: rc.cpp:5251
 msgid "minInclusive"
 msgstr ""
 
-#: rc.cpp:5304
+#: rc.cpp:5252
 msgid "maxExclusive"
 msgstr ""
 
-#: rc.cpp:5305
+#: rc.cpp:5253
 msgid "minExclusive"
 msgstr ""
 
-#: rc.cpp:5306
+#: rc.cpp:5254
 msgid "whiteSpace"
 msgstr ""
 
-#: rc.cpp:5310
-msgid "any"
-msgstr "unrhyw"
+#: rc.cpp:5256
+msgid "complexContent"
+msgstr ""
 
-#: rc.cpp:5311
-msgid "field"
-msgstr "maes"
+#: rc.cpp:5257
+msgid "simpleContent"
+msgstr ""
 
-#: rc.cpp:5313
-msgid "key"
-msgstr "allwedd"
+#: rc.cpp:5258
+msgid "all"
+msgstr "popeth"
 
-#: rc.cpp:5314
-msgid "keyref"
+#: rc.cpp:5259
+msgid "choice"
 msgstr ""
 
-#: rc.cpp:5315
-msgid "selector"
-msgstr "dewisydd"
+#: rc.cpp:5261
+msgid "sequence"
+msgstr ""
 
-#: rc.cpp:5316
-msgid "unique"
-msgstr "unigryw"
+#: rc.cpp:5262 rc.cpp:5272
+msgid "attribute"
+msgstr "priodoleddau"
 
-#: rc.cpp:5319
+#: rc.cpp:5263 rc.cpp:5273
+msgid "attributeGroup"
+msgstr ""
+
+#: rc.cpp:5264 rc.cpp:5271
+msgid "anyAttribute"
+msgstr ""
+
+#: rc.cpp:5265 rc.cpp:5268
+msgid "restriction"
+msgstr ""
+
+#: rc.cpp:5266
+msgid "extension"
+msgstr "estyniad"
+
+#: rc.cpp:5269
 msgid "list"
 msgstr "rhestr"
 
-#: rc.cpp:5320
+#: rc.cpp:5270
 msgid "union"
 msgstr ""
 
-#: rc.cpp:5321
-msgid "New Tag file"
-msgstr ""
+#: rc.cpp:5274
+msgid "schema"
+msgstr "sgema"
 
-#: rc.cpp:5325
-msgid "Item"
-msgstr "Eitem"
+#: rc.cpp:5275
+msgid "element"
+msgstr "elfen"
 
-#: rc.cpp:5331
-msgid "Children"
+#: rc.cpp:5276
+msgid "import"
+msgstr "mewnforio"
+
+#: rc.cpp:5277
+msgid "include"
+msgstr "yn cynnwys"
+
+#: rc.cpp:5278
+msgid "notation"
 msgstr ""
 
-#: rc.cpp:5332
-msgid "Stoppingtags"
+#: rc.cpp:5279
+msgid "redefine"
 msgstr ""
 
+#: rc.cpp:5319
+msgid "Bold"
+msgstr "Trwm"
+
 #: rc.cpp:5334
 msgid "Input Text (wml)"
 msgstr ""
@@ -8650,79 +8650,79 @@ msgid "Option Group (wml)"
 msgstr ""
 
 #: rc.cpp:5337
-msgid "Bold (wml)"
+msgid "Table (wml)"
+msgstr ""
+
+#: rc.cpp:5338
+msgid "Table Row (wml)"
 msgstr ""
 
 #: rc.cpp:5339
-msgid "Italic (wml)"
+msgid "Table Data (wml)"
 msgstr ""
 
 #: rc.cpp:5340
-msgid "Underline (wml)"
+msgid "Bold (wml)"
 msgstr ""
 
-#: rc.cpp:5341
-msgid "Small (wml)"
+#: rc.cpp:5342
+msgid "Italic (wml)"
 msgstr ""
 
-#: rc.cpp:5342
-msgid "Big (wml)"
+#: rc.cpp:5343
+msgid "Underline (wml)"
 msgstr ""
 
 #: rc.cpp:5344
-msgid "Paragraph (wml)"
+msgid "Small (wml)"
 msgstr ""
 
-#: rc.cpp:5346
-msgid "Access (wml)"
+#: rc.cpp:5345
+msgid "Big (wml)"
 msgstr ""
 
 #: rc.cpp:5347
-msgid "WML"
+msgid "Paragraph (wml)"
 msgstr ""
 
-#: rc.cpp:5348
-msgid "Card"
-msgstr "Cerdyn"
-
 #: rc.cpp:5349
-msgid "Head"
+msgid "Anchor...(wml)"
+msgstr ""
+
+#: rc.cpp:5350
+msgid "A...(wml)"
 msgstr ""
 
 #: rc.cpp:5351
-msgid "Table (wml)"
+msgid "Image...(wml)"
 msgstr ""
 
 #: rc.cpp:5352
-msgid "Table Row (wml)"
+msgid "Timer (wml)"
 msgstr ""
 
 #: rc.cpp:5353
-msgid "Table Data (wml)"
+msgid "Set variable"
 msgstr ""
 
 #: rc.cpp:5354
-msgid "Anchor...(wml)"
+msgid "Post Field"
 msgstr ""
 
 #: rc.cpp:5355
-msgid "A...(wml)"
+msgid "Access (wml)"
 msgstr ""
 
 #: rc.cpp:5356
-msgid "Image...(wml)"
+msgid "WML"
 msgstr ""
 
 #: rc.cpp:5357
-msgid "Timer (wml)"
-msgstr ""
+msgid "Card"
+msgstr "Cerdyn"
 
 #: rc.cpp:5358
-msgid "Set variable"
-msgstr ""
-
-#: rc.cpp:5359
-msgid "Post Field"
+msgid "Head"
 msgstr ""
 
 #: rc.cpp:5360
@@ -9046,8 +9046,8 @@ msgstr ""
 
 #: tips.cpp:225
 msgid ""
-"<p>...that you can use KFileReplace to find and replace across your entire "
-"project? <b>Click on the KFileReplace button</b> and you can set extensive "
+"<p>...that you can use TDEFileReplace to find and replace across your entire "
+"project? <b>Click on the TDEFileReplace button</b> and you can set extensive "
 "configurations, use multi line values and wild cards, and even go to the files "
 "found in Quanta.\n"
 "</p>\n"
@@ -9177,6 +9177,868 @@ msgid ""
 "</p>\n"
 msgstr ""
 
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "KD wrth KGyfieithu"
+
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "kyfieithu@dotmon.com"
+
+#: utility/toolbartabwidget.cpp:45 utility/toolbartabwidget.cpp:188
+#: utility/toolbartabwidget.cpp:307
+msgid "Toolbar Menu"
+msgstr "Dewislen Bar Offer"
+
+#: utility/toolbartabwidget.cpp:46 utility/toolbartabwidget.cpp:309
+msgid "New Action..."
+msgstr "Gweithred Newydd ..."
+
+#: utility/toolbartabwidget.cpp:48 utility/toolbartabwidget.cpp:326
+msgid "New Toolbar..."
+msgstr ""
+
+#: src/quanta.cpp:2663 utility/toolbartabwidget.cpp:49
+#: utility/toolbartabwidget.cpp:327
+msgid "Remove Toolbar"
+msgstr ""
+
+#: utility/toolbartabwidget.cpp:50 utility/toolbartabwidget.cpp:328
+msgid "Rename Toolbar..."
+msgstr ""
+
+#: utility/toolbartabwidget.cpp:51 utility/toolbartabwidget.cpp:331
+msgid "Configure Toolbars..."
+msgstr "Ffurfio Bar Offer ..."
+
+#: utility/toolbartabwidget.cpp:234
+msgid "Icons Only"
+msgstr "Eiconau yn Unig"
+
+#: utility/toolbartabwidget.cpp:235
+msgid "Text Only"
+msgstr "Testun yn Unig"
+
+#: utility/toolbartabwidget.cpp:236
+msgid "Text Alongside Icons"
+msgstr "Testun wrth Ymyl Eiconau"
+
+#: utility/toolbartabwidget.cpp:237
+msgid "Text Under Icons"
+msgstr "Testun Dan Eiconau"
+
+#: utility/toolbartabwidget.cpp:320
+#, c-format
+msgid "Remove Action - %1"
+msgstr ""
+
+#: utility/toolbartabwidget.cpp:321
+#, c-format
+msgid "Edit Action - %1"
+msgstr ""
+
+#: utility/toolbartabwidget.cpp:330
+msgid "Text Position"
+msgstr "Lleoliad Testun"
+
+#: utility/toolbartabwidget.cpp:344
+msgid "<qt>Are you sure you want to remove the <b>%1</b> action?</qt>"
+msgstr ""
+
+#: utility/tagactionset.cpp:104
+msgid "Apply Source Indentation"
+msgstr ""
+
+#: utility/tagactionset.cpp:109
+#, fuzzy
+msgid "Copy DIV Area"
+msgstr "&Copïo Yma"
+
+#: utility/tagactionset.cpp:114
+msgid "Cut DIV Area"
+msgstr ""
+
+#: utility/tagactionset.cpp:284 utility/tagactionset.cpp:301
+msgid "Table..."
+msgstr "Tabl..."
+
+#: utility/tagactionset.cpp:285
+msgid "Insert..."
+msgstr "Mewnosod ..."
+
+#: utility/tagactionset.cpp:286
+msgid "Remove..."
+msgstr "Gwaredu..."
+
+#: utility/tagactionset.cpp:307
+#, fuzzy
+msgid "Row Above"
+msgstr "&Mewnosod Rhes"
+
+#: utility/tagactionset.cpp:313
+#, fuzzy
+msgid "Row Below"
+msgstr "&Mewnosod Rhes"
+
+#: utility/tagactionset.cpp:319
+#, fuzzy
+msgid "Column Left"
+msgstr "Mewnosod &Colofn"
+
+#: utility/tagactionset.cpp:325
+#, fuzzy
+msgid "Column Right"
+msgstr "Mewnosod &Colofn"
+
+#: utility/tagactionset.cpp:339
+#, fuzzy
+msgid "Row(s)"
+msgstr "Rhesi:"
+
+#: utility/tagactionset.cpp:345
+#, fuzzy
+msgid "Column(s)"
+msgstr "Co&lofnau:"
+
+#: utility/tagactionset.cpp:351
+msgid "Cell(s)"
+msgstr ""
+
+#: utility/tagactionset.cpp:357
+msgid "Cell(s) Content"
+msgstr ""
+
+#: utility/tagactionset.cpp:365
+#, fuzzy
+msgid "Merge Selected Cells"
+msgstr "Uno celloedd"
+
+#: utility/newstuff.cpp:53
+msgid ""
+"There was an error with the downloaded DTEP tarball file. Possible causes are "
+"damaged archive or invalid directory structure in the archive."
+msgstr ""
+
+#: utility/newstuff.cpp:53
+msgid "DTEP Installation Error"
+msgstr ""
+
+#: utility/newstuff.cpp:73
+msgid "Do you want to load the newly downloaded toolbar?"
+msgstr ""
+
+#: treeviews/projecttreeview.cpp:129 utility/newstuff.cpp:73
+msgid "Load Toolbar"
+msgstr ""
+
+#: src/dtds.cpp:960 utility/newstuff.cpp:73
+msgid "Load"
+msgstr "Llwytho"
+
+#: utility/newstuff.cpp:79
+msgid ""
+"There was an error with the downloaded toolbar tarball file. Possible causes "
+"are damaged archive or invalid directory structure in the archive."
+msgstr ""
+
+#: utility/newstuff.cpp:79
+msgid "Toolbar Installation Error"
+msgstr ""
+
+#: utility/newstuff.cpp:100
+msgid "Do you want to open the newly downloaded template?"
+msgstr ""
+
+#: utility/newstuff.cpp:100
+msgid "Open Template"
+msgstr ""
+
+#: utility/newstuff.cpp:106
+msgid "There was an error with the downloaded template file."
+msgstr ""
+
+#: utility/newstuff.cpp:106
+msgid "Template Installation Error"
+msgstr ""
+
+#: utility/newstuff.cpp:124 utility/newstuff.cpp:141
+msgid ""
+"There was an error with the downloaded script tarball file. Possible causes are "
+"damaged archive or invalid directory structure in the archive."
+msgstr ""
+
+#: utility/newstuff.cpp:124
+msgid "Script Installation Error"
+msgstr ""
+
+#: utility/newstuff.cpp:141
+msgid "Documentation Installation Error"
+msgstr ""
+
+#: utility/tagaction.cpp:464 utility/tagaction.cpp:718
+msgid ""
+"The \"%1\" script started.\n"
+msgstr ""
+
+#: utility/tagaction.cpp:475 utility/tagaction.cpp:729
+msgid ""
+"<qt>There was an error running <b>%1</b>."
+"<br>Check that you have the <i>%2</i> executable installed and it is "
+"accessible.</qt>"
+msgstr ""
+
+#: utility/tagaction.cpp:475 utility/tagaction.cpp:729
+msgid "Script Not Found"
+msgstr ""
+
+#: utility/tagaction.cpp:790 utility/tagaction.cpp:850
+msgid ""
+"The \"%1\" script output:\n"
+msgstr ""
+
+#: utility/tagaction.cpp:973
+msgid "The \"%1\" script has exited."
+msgstr ""
+
+#: utility/tagaction.cpp:1011
+msgid ""
+"<qt>The filtering action <b>%1</b> seems to be locked."
+"<br>Do you want to terminate it?</qt>"
+msgstr ""
+
+#: utility/tagaction.cpp:1011
+msgid "Action Not Responding"
+msgstr ""
+
+#: utility/tagaction.cpp:1011
+#, fuzzy
+msgid "Terminate"
+msgstr "Patrymlun"
+
+#: utility/tagaction.cpp:1011
+msgid "Keep Running"
+msgstr ""
+
+#: src/quantaview.cpp:966 utility/tagaction.cpp:1123
+msgid "Cannot insert the tag: invalid location."
+msgstr ""
+
+#: utility/quantacommon.cpp:384
+msgid ""
+"<qt>Cannot create folder"
+"<br><b>%1</b>."
+"<br>Check that you have write permission in the parent folder or that the "
+"connection to"
+"<br><b>%2</b>"
+"<br> is valid.</qt>"
+msgstr ""
+
+#: utility/quantacommon.cpp:697
+msgid ""
+"The file type is not recognized.   Opening binary files may confuse Quanta.\n"
+" Are you sure you want to open this file?"
+msgstr ""
+
+#: utility/quantacommon.cpp:699
+msgid "Unknown Type"
+msgstr "Math anhysbys"
+
+#: project/project.cpp:216 utility/quantacommon.cpp:699
+#, fuzzy
+msgid "Do Not Open"
+msgstr "&Peidiwch â Chadw"
+
+#: treeviews/basetreeview.cpp:1041 treeviews/templatestreeview.cpp:470
+#: utility/quantacommon.cpp:710
+msgid ""
+"<qt>The file <b>%1</b> already exists."
+"<br>Do you want to overwrite it?</qt>"
+msgstr ""
+
+#: ../lib/compatibility/knewstuff/knewstuffgeneric.cpp:135
+#: messages/messageoutput.cpp:162 project/projectprivate.cpp:920
+#: treeviews/basetreeview.cpp:1041 treeviews/templatestreeview.cpp:470
+#: utility/quantacommon.cpp:710
+msgid "Overwrite"
+msgstr "Trosysgrifo"
+
+#: utility/quantabookmarks.cpp:88
+msgid "Set &Bookmark"
+msgstr "Gosod &Tudnod"
+
+#: utility/quantabookmarks.cpp:91
+msgid "If a line has no bookmark then add one, otherwise remove it."
+msgstr ""
+
+#: utility/quantabookmarks.cpp:92
+msgid "Clear &Bookmark"
+msgstr ""
+
+#: utility/quantabookmarks.cpp:95
+msgid "Clear &All Bookmarks"
+msgstr ""
+
+#: utility/quantabookmarks.cpp:98
+msgid "Remove all bookmarks of the current document."
+msgstr ""
+
+#: utility/quantabookmarks.cpp:101 utility/quantabookmarks.cpp:307
+msgid "Next Bookmark"
+msgstr ""
+
+#: utility/quantabookmarks.cpp:104
+msgid "Go to the next bookmark."
+msgstr ""
+
+#: utility/quantabookmarks.cpp:107 utility/quantabookmarks.cpp:309
+#, fuzzy
+msgid "Previous Bookmark"
+msgstr "Golwg Offer Cynt"
+
+#: utility/quantabookmarks.cpp:110
+msgid "Go to the previous bookmark."
+msgstr ""
+
+#: utility/quantabookmarks.cpp:222
+msgid "&Next: %1 - \"%2\""
+msgstr "&Nesaf: %1 - \"%2\""
+
+#: utility/quantabookmarks.cpp:229
+msgid "&Previous: %1 - \"%2\""
+msgstr ""
+
+#: utility/qpevents.cpp:42
+#, fuzzy
+msgid "Before Document Save"
+msgstr "Strwythur Dogfen"
+
+#: utility/qpevents.cpp:43
+#, fuzzy
+msgid "After Document Save"
+msgstr "Strwythur Dogfen"
+
+#: utility/qpevents.cpp:44
+#, fuzzy
+msgid "After Document Open"
+msgstr "Strwythur Dogfen"
+
+#: utility/qpevents.cpp:45
+#, fuzzy
+msgid "Before Document Close"
+msgstr "Strwythur Dogfen"
+
+#: utility/qpevents.cpp:46
+#, fuzzy
+msgid "After Document Close"
+msgstr "Strwythur Dogfen"
+
+#: utility/qpevents.cpp:47
+#, fuzzy
+msgid "After Project Open"
+msgstr "Agor Cywaith"
+
+#: utility/qpevents.cpp:48
+msgid "Before Project Close"
+msgstr ""
+
+#: utility/qpevents.cpp:49
+#, fuzzy
+msgid "After Project Close"
+msgstr "Plygell Cywaith"
+
+#: utility/qpevents.cpp:50
+#, fuzzy
+msgid "Upload Requested"
+msgstr "Lanlwytho Ffeiliau"
+
+#: utility/qpevents.cpp:51
+#, fuzzy
+msgid "Before Document Upload"
+msgstr "Strwythur Dogfen"
+
+#: utility/qpevents.cpp:52
+#, fuzzy
+msgid "After Document Upload"
+msgstr "Strwythur Dogfen"
+
+#: utility/qpevents.cpp:53
+msgid "After Addition to Project"
+msgstr ""
+
+#: utility/qpevents.cpp:54
+msgid "After Removal From Project"
+msgstr ""
+
+#: utility/qpevents.cpp:55
+msgid "After Commit to CVS"
+msgstr ""
+
+#: utility/qpevents.cpp:56
+msgid "After Update From CVS"
+msgstr ""
+
+#: utility/qpevents.cpp:57
+msgid "After Moving File Inside Project"
+msgstr ""
+
+#: utility/qpevents.cpp:58
+msgid "Quanta Start"
+msgstr ""
+
+#: utility/qpevents.cpp:59
+msgid "Quanta Exit"
+msgstr ""
+
+#: utility/qpevents.cpp:62
+msgid "Send Email"
+msgstr "Anfon Ebost"
+
+#: utility/qpevents.cpp:63
+#, fuzzy
+msgid "Log Event"
+msgstr "Digwyddiad"
+
+#: utility/qpevents.cpp:64
+#, fuzzy
+msgid "Script Action"
+msgstr "Disgrifiad:"
+
+#: utility/qpevents.cpp:65
+#, fuzzy
+msgid "Non-Script Action"
+msgstr "Disgrifiad:"
+
+#: utility/qpevents.cpp:88
+msgid ""
+"<qt>An internal action (<i>%1</i>) associated with an event (<i>%2</i>"
+") will be executed.  Do you want to allow the execution of this action?</qt>"
+msgstr ""
+
+#: utility/qpevents.cpp:88 utility/qpevents.cpp:92
+msgid "Event Triggered"
+msgstr ""
+
+#: utility/qpevents.cpp:88 utility/qpevents.cpp:92
+msgid "Execute"
+msgstr "Gweithredu"
+
+#: utility/qpevents.cpp:92
+msgid ""
+"<qt>An external action (<i>%1</i>) associated with an event (<i>%2</i>"
+") will be executed.  Do you want to allow the execution of this action?</qt>"
+msgstr ""
+
+#: utility/qpevents.cpp:104
+msgid "An upload was initiated"
+msgstr ""
+
+#: utility/qpevents.cpp:113
+msgid "About to upload a document"
+msgstr ""
+
+#: utility/qpevents.cpp:120
+msgid "Document uploaded"
+msgstr ""
+
+#: utility/qpevents.cpp:127
+msgid "Document moved"
+msgstr ""
+
+#: utility/qpevents.cpp:137
+msgid "Document saved"
+msgstr ""
+
+#: utility/qpevents.cpp:143
+msgid "About to save a document"
+msgstr ""
+
+#: utility/qpevents.cpp:149
+msgid "Document opened"
+msgstr ""
+
+#: utility/qpevents.cpp:155
+msgid "Document closed"
+msgstr ""
+
+#: utility/qpevents.cpp:161
+msgid "About to close a document"
+msgstr ""
+
+#: utility/qpevents.cpp:167
+msgid "Project opened"
+msgstr ""
+
+#: utility/qpevents.cpp:173
+msgid "Project closed"
+msgstr ""
+
+#: utility/qpevents.cpp:179
+msgid "About to close the project"
+msgstr ""
+
+#: utility/qpevents.cpp:185
+msgid "Document added to project"
+msgstr ""
+
+#: utility/qpevents.cpp:191
+msgid "Document removed from project"
+msgstr ""
+
+#: utility/qpevents.cpp:199
+msgid "Document committed"
+msgstr ""
+
+#: utility/qpevents.cpp:205
+msgid "Document updated"
+msgstr ""
+
+#: utility/qpevents.cpp:211
+msgid "Quanta has been started"
+msgstr ""
+
+#: utility/qpevents.cpp:217
+msgid "Quanta is shutting down"
+msgstr ""
+
+#: utility/qpevents.cpp:224
+msgid "<qt>Unsupported event <b>%1</b>.</qt>"
+msgstr ""
+
+#: utility/qpevents.cpp:224
+msgid "Event Handling Error"
+msgstr ""
+
+#: utility/qpevents.cpp:273
+msgid "Logging to remote files is not supported."
+msgstr ""
+
+#: utility/qpevents.cpp:282
+msgid "Logging to files inside a remote project is not supported."
+msgstr ""
+
+#: utility/qpevents.cpp:312
+msgid "<qt>Logging failed. Check that you have write access to <i>%1</i>."
+msgstr ""
+
+#: utility/qpevents.cpp:316
+msgid "<qt>Unsupported internal event action : <b>%1</b>.</qt>"
+msgstr ""
+
+#: utility/qpevents.cpp:339
+msgid "<qt>The <b>%1</b> script action was not found on your system.</qt>"
+msgstr ""
+
+#: utility/qpevents.cpp:339
+msgid "Action Execution Error"
+msgstr ""
+
+#: utility/qpevents.cpp:341
+msgid "Unsupported external event action."
+msgstr ""
+
+#: utility/qpevents.cpp:343
+msgid "Unknown event type."
+msgstr ""
+
+#: utility/quantanetaccess.cpp:185
+msgid "<qt>Do you want to add <br><b>%1</b><br> to the project?</qt>"
+msgstr ""
+
+#: utility/quantanetaccess.cpp:185
+msgid "Add to Project"
+msgstr ""
+
+#: components/cvsservice/cvsservice.cpp:333 src/quanta.cpp:526
+#: utility/quantanetaccess.cpp:185
+msgid "Do Not Add"
+msgstr "Na Ychwaneger"
+
+#: treeviews/projecttreeview.cpp:428 utility/quantanetaccess.cpp:210
+msgid ""
+"<qt>Do you really want to remove "
+"<br><b>%1</b>"
+"<br> from the project?</qt>"
+msgstr ""
+
+#: treeviews/projecttreeview.cpp:428 utility/quantanetaccess.cpp:210
+msgid "Remove From Project"
+msgstr ""
+
+#: utility/quantanetaccess.cpp:233
+msgid ""
+"<qt>Do you really want to delete "
+"<br><b>%1</b>"
+"<br> and remove it from the project?</qt>"
+msgstr ""
+
+#: utility/quantanetaccess.cpp:233
+msgid "Delete & Remove From Project"
+msgstr ""
+
+#: utility/quantanetaccess.cpp:246
+msgid "<qt>Do you really want to delete <br><b>%1</b>?</qt>"
+msgstr ""
+
+#: utility/quantanetaccess.cpp:246
+msgid "Delete File or Folder"
+msgstr ""
+
+#: plugins/quantapluginconfig.cpp:45
+msgid "Message Area Tab"
+msgstr ""
+
+#: plugins/quantapluginconfig.cpp:46 plugins/quantaplugininterface.cpp:108
+#: plugins/quantaplugininterface.cpp:156
+msgid "Editor Tab"
+msgstr ""
+
+#: plugins/quantaplugin.cpp:354 plugins/quantaplugin.cpp:370
+#: plugins/quantapluginconfig.cpp:46 plugins/quantaplugininterface.cpp:106
+#: plugins/quantaplugininterface.cpp:157
+msgid "Separate Toolview"
+msgstr ""
+
+#: plugins/quantapluginconfig.cpp:68
+msgid ""
+"The plugin information you entered appears to be invalid. Are you sure you want "
+"to apply these settings?"
+msgstr ""
+
+#: plugins/quantapluginconfig.cpp:68
+msgid "Invalid Plugin"
+msgstr ""
+
+#: plugins/quantapluginconfig.cpp:68
+msgid "Do Not Apply"
+msgstr ""
+
+#: plugins/quantapluginconfig.cpp:80
+msgid "Select Plugin Folder"
+msgstr ""
+
+#: plugins/quantaplugininterface.cpp:44
+msgid "Configure &Plugins..."
+msgstr "Ffurfweddu'r &Ategion"
+
+#: plugins/quantaplugininterface.cpp:93
+msgid ""
+"<qt><b>%1</b> is a command line plugin. We have removed support for "
+"command-line plugins. However, the functionality has not been lost as script "
+"actions can still be used to run command-line tools. </qt>"
+msgstr ""
+
+#: plugins/quantaplugininterface.cpp:93
+msgid "Unsupported Plugin Type"
+msgstr ""
+
+#: plugins/quantaplugininterface.cpp:260
+msgid ""
+"<qt>The following plugins seems to be invalid:<b>%1</b>."
+"<br>"
+"<br>Do you want to edit the plugins?</qt>"
+msgstr ""
+
+#: plugins/quantaplugininterface.cpp:260
+msgid "Invalid Plugins"
+msgstr ""
+
+#: plugins/quantaplugininterface.cpp:260
+#, fuzzy
+msgid "Do Not Edit"
+msgstr "&Peidiwch â Chadw"
+
+#: plugins/quantaplugininterface.cpp:267
+msgid "All plugins validated successfully."
+msgstr ""
+
+#: plugins/quantaplugineditor.cpp:103
+msgid "Select Folder"
+msgstr "Dewis Plygell"
+
+#: plugins/quantaplugin.cpp:122
+msgid ""
+"<qt>The <b>%1</b> plugin could not be loaded."
+"<br>Possible reasons are:"
+"<br>    - <b>%2</b> is not installed;"
+"<br>    - the file <i>%3</i> is not installed or it is not reachable."
+msgstr ""
+
+#: parts/preview/whtmlpart.cpp:56
+msgid "View &Document Source"
+msgstr "Gweld Côd &Tarddiad y Ddogfen"
+
+#: parts/kafka/htmldocumentproperties.cpp:89
+msgid "Content"
+msgstr ""
+
+#: parts/kafka/htmldocumentproperties.cpp:98
+msgid "Rule"
+msgstr ""
+
+#: parts/kafka/htmldocumentproperties.cpp:340 parts/kafka/wkafkapart.cpp:78
+msgid "Sorry, VPL does not support this functionality yet."
+msgstr ""
+
+#: parts/kafka/domtreeview.cpp:35
+msgid "Value (limited to 20 char)"
+msgstr ""
+
+#: parts/kafka/domtreeview.cpp:36
+msgid "Length"
+msgstr "Hyd"
+
+#: parts/kafka/domtreeview.cpp:37 parts/kafka/wkafkapart.cpp:71
+msgid "ID"
+msgstr "ID"
+
+#: parts/kafka/domtreeview.cpp:146
+msgid "Debugging KafkaWidget DOM Tree "
+msgstr ""
+
+#: parts/kafka/wkafkapart.cpp:68
+msgid "Attribute"
+msgstr "Priodoleddau"
+
+#: components/debugger/debuggerbreakpointview.cpp:61
+#: parts/kafka/wkafkapart.cpp:68
+msgid "Class"
+msgstr "Dosbarth"
+
+#: parts/kafka/wkafkapart.cpp:69
+msgid "Pseudo-class"
+msgstr ""
+
+#: parts/kafka/wkafkapart.cpp:69
+msgid "CSS rules"
+msgstr ""
+
+#: parts/kafka/wkafkapart.cpp:69
+msgid "Universal selector"
+msgstr ""
+
+#: parts/kafka/wkafkapart.cpp:70
+msgid "Linked stylesheets"
+msgstr ""
+
+#: parts/kafka/wkafkapart.cpp:70
+msgid "Embedded stylesheets"
+msgstr ""
+
+#: parts/kafka/wkafkapart.cpp:70
+msgid "Inline style attribute"
+msgstr ""
+
+#: parts/kafka/wkafkapart.cpp:71
+msgid "Priority"
+msgstr "Blaenoriaeth"
+
+#: parts/kafka/wkafkapart.cpp:72
+msgid "Browser support"
+msgstr ""
+
+#: parts/kafka/wkafkapart.cpp:72
+msgid "Pseudo-element"
+msgstr ""
+
+#: parts/kafka/wkafkapart.cpp:72
+msgid "Imported"
+msgstr ""
+
+#: parts/kafka/wkafkapart.cpp:73
+msgid "Inheritance"
+msgstr ""
+
+#: parts/kafka/wkafkapart.cpp:73
+msgid "Inherited"
+msgstr ""
+
+#: parts/kafka/wkafkapart.cpp:76
+msgid "Undo/Redo history"
+msgstr ""
+
+#: parts/kafka/wkafkapart.cpp:76
+msgid "CSS styles"
+msgstr ""
+
+#: parts/kafka/wkafkapart.cpp:79
+msgid "Merge cells"
+msgstr "Uno celloedd"
+
+#: parts/kafka/wkafkapart.cpp:80
+msgid "Split cells"
+msgstr "Hollti Celloedd"
+
+#: parts/kafka/wkafkapart.cpp:81
+msgid "Edit CSS style of this Tag"
+msgstr ""
+
+#: parts/kafka/wkafkapart.cpp:82
+msgid "Ident all"
+msgstr ""
+
+#: src/dtds.cpp:688
+msgid ""
+"<qt>The DTD tag file %1 is not valid."
+"<br> The error message is: <i>%2 in line %3, column %4.</i></qt>"
+msgstr ""
+
+#: src/dtds.cpp:689
+msgid "Invalid Tag File"
+msgstr ""
+
+#: src/dtds.cpp:917 src/dtds.cpp:949
+msgid "<qt>Do you want to replace the existing <b>%1</b> DTD?</qt>"
+msgstr ""
+
+#: src/dtds.cpp:917 src/dtds.cpp:949
+#, fuzzy
+msgid "Do Not Replace"
+msgstr "&Peidiwch â Chadw"
+
+#: src/dtds.cpp:927 src/dtds.cpp:971
+msgid "<qt>Use the newly loaded <b>%1</b> DTD for the current document?</qt>"
+msgstr ""
+
+#: src/dtds.cpp:927 src/dtds.cpp:971
+msgid "Change DTD"
+msgstr ""
+
+#: src/dtds.cpp:927 src/dtds.cpp:971
+msgid "Use"
+msgstr "Defnydd"
+
+#: src/dtds.cpp:927 src/dtds.cpp:971
+#, fuzzy
+msgid "Do Not Use"
+msgstr "&Peidiwch â Chadw"
+
+#: src/dtds.cpp:956
+msgid ""
+"<qt>Cannot read the DTEP from <b>%1</b>. Check that the folder contains a valid "
+"DTEP (<i>description.rc and *.tag files</i>).</qt>"
+msgstr ""
+
+#: src/dtds.cpp:956
+msgid "Error Loading DTEP"
+msgstr ""
+
+#: src/dtds.cpp:960
+msgid "<qt>Autoload the <b>%1</b> DTD in the future?</qt>"
+msgstr ""
+
+#: src/dtds.cpp:960
+#, fuzzy
+msgid "Do Not Load"
+msgstr "&Peidiwch â Chadw"
+
+#: src/dtds.cpp:982
+msgid "Load DTD Entities Into DTEP"
+msgstr ""
+
 #: src/quanta.cpp:226
 msgid "Quanta data files were not found."
 msgstr ""
@@ -9214,11 +10076,6 @@ msgstr ""
 msgid "<qt>Do you want to add the<br><b>%1</b><br>file to project?</qt>"
 msgstr ""
 
-#: components/cvsservice/cvsservice.cpp:333 src/quanta.cpp:526
-#: utility/quantanetaccess.cpp:185
-msgid "Do Not Add"
-msgstr "Na Ychwaneger"
-
 #: src/quanta.cpp:587
 #, c-format
 msgid ""
@@ -9297,7 +10154,7 @@ msgstr ""
 msgid "Open File: %1"
 msgstr "Agor Ffeil : %1"
 
-#: src/quanta.cpp:1975 src/quanta_init.cpp:938
+#: src/quanta.cpp:1975 src/quanta_init.cpp:926
 msgid "Open File: none"
 msgstr ""
 
@@ -9334,7 +10191,7 @@ msgstr ""
 msgid "Toolbar Saving Error"
 msgstr ""
 
-#: src/quanta.cpp:2499 src/quanta.cpp:3322 src/quanta.cpp:3327
+#: src/quanta.cpp:2499 src/quanta.cpp:3303 src/quanta.cpp:3308
 msgid "Save Toolbar"
 msgstr ""
 
@@ -9363,11 +10220,6 @@ msgstr ""
 msgid "User_%1"
 msgstr ""
 
-#: src/quanta.cpp:2663 utility/toolbartabwidget.cpp:49
-#: utility/toolbartabwidget.cpp:327
-msgid "Remove Toolbar"
-msgstr ""
-
 #: src/quanta.cpp:2699
 msgid "Send Toolbar"
 msgstr ""
@@ -9384,7 +10236,7 @@ msgid ""
 "Have fun.\n"
 msgstr ""
 
-#: src/quanta.cpp:2744 src/quanta.cpp:3618 treeviews/scripttreeview.cpp:279
+#: src/quanta.cpp:2744 src/quanta.cpp:3599 treeviews/scripttreeview.cpp:278
 #: treeviews/templatestreeview.cpp:991
 msgid "Content:"
 msgstr ""
@@ -9393,14 +10245,14 @@ msgstr ""
 msgid "Quanta Plus toolbar"
 msgstr ""
 
-#: src/quanta.cpp:2757 src/quanta.cpp:3632 treeviews/scripttreeview.cpp:293
+#: src/quanta.cpp:2757 src/quanta.cpp:3613 treeviews/scripttreeview.cpp:292
 #: treeviews/templatestreeview.cpp:1005
 msgid ""
 "No destination address was specified.\n"
 " Sending is aborted."
 msgstr ""
 
-#: src/quanta.cpp:2757 src/quanta.cpp:3632 treeviews/scripttreeview.cpp:293
+#: src/quanta.cpp:2757 src/quanta.cpp:3613 treeviews/scripttreeview.cpp:292
 #: treeviews/templatestreeview.cpp:1005
 msgid "Error Sending Email"
 msgstr ""
@@ -9421,7 +10273,7 @@ msgstr ""
 msgid "Edit DTD"
 msgstr ""
 
-#: src/quanta.cpp:3099 src/quanta.cpp:3562
+#: src/quanta.cpp:3099 src/quanta.cpp:3543
 msgid "Please select a DTD:"
 msgstr ""
 
@@ -9435,31 +10287,31 @@ msgstr "Disgrifiad"
 msgid "Load DTEP description from disk"
 msgstr "Disgrifiad"
 
-#: src/quanta.cpp:3321
+#: src/quanta.cpp:3302
 msgid ""
 "<qt>Toolbar <b>%1</b> is new and unsaved. Do you want to save it before it is "
 "removed?</qt>"
 msgstr ""
 
-#: src/quanta.cpp:3326
+#: src/quanta.cpp:3307
 msgid ""
 "<qt>The toolbar <b>%1</b> was modified. Do you want to save it before it is "
 "removed?</qt>"
 msgstr ""
 
-#: src/quanta.cpp:3545
+#: src/quanta.cpp:3526
 msgid "Select DTEP Directory"
 msgstr ""
 
-#: src/quanta.cpp:3561
+#: src/quanta.cpp:3542
 msgid "Send DTD"
 msgstr ""
 
-#: src/quanta.cpp:3612
+#: src/quanta.cpp:3593
 msgid "Send DTEP in Email"
 msgstr ""
 
-#: src/quanta.cpp:3614
+#: src/quanta.cpp:3595
 msgid ""
 "Hi,\n"
 " This is a Quanta Plus [http://quanta.kdewebdev.org] DTEP definition tarball.\n"
@@ -9467,117 +10319,86 @@ msgid ""
 "Have fun.\n"
 msgstr ""
 
-#: src/quanta.cpp:3627
+#: src/quanta.cpp:3608
 msgid "Quanta Plus DTD"
 msgstr ""
 
-#: src/quanta.cpp:3723
+#: src/quanta.cpp:3704
 msgid "Code formatting can only be done in the source view."
 msgstr ""
 
-#: src/quanta.cpp:3741
+#: src/quanta.cpp:3722
 msgid "The Document Properties Dialog is only for HTML and XHTML."
 msgstr ""
 
-#: src/quanta.cpp:3858
+#: src/quanta.cpp:3839
 msgid "Do you want to review the upload?"
 msgstr ""
 
-#: src/quanta.cpp:3858
+#: src/quanta.cpp:3839
 msgid "Enable Quick Upload"
 msgstr ""
 
-#: src/quanta.cpp:3858
+#: src/quanta.cpp:3839
 #, fuzzy
 msgid "Review"
 msgstr "Rhagolwg"
 
-#: src/quanta.cpp:3858
+#: src/quanta.cpp:3839
 #, fuzzy
 msgid "Do Not Review"
 msgstr "&Peidiwch â Chadw"
 
-#: src/quanta.cpp:4081 src/quanta.cpp:4768 src/quanta.cpp:4803
+#: src/quanta.cpp:4062 src/quanta.cpp:4749 src/quanta.cpp:4784
 msgid ""
 "The file must be saved before external preview.\n"
 "Do you want to save and preview?"
 msgstr ""
 
-#: src/quanta.cpp:4083 src/quanta.cpp:4770 src/quanta.cpp:4805
+#: src/quanta.cpp:4064 src/quanta.cpp:4751 src/quanta.cpp:4786
 msgid "Save Before Preview"
 msgstr ""
 
-#: src/main.cpp:70 src/quanta.cpp:4106 treeviews/basetreeview.cpp:440
+#: src/main.cpp:70 src/quanta.cpp:4087 treeviews/basetreeview.cpp:440
 #: treeviews/templatestreeview.cpp:567
 msgid "Quanta"
 msgstr ""
 
-#: src/quanta.cpp:4330 src/quantadoc.cpp:320
+#: src/quanta.cpp:4311 src/quantadoc.cpp:320
 #, c-format
 msgid "Unknown tag: %1"
 msgstr ""
 
-#: src/quanta.cpp:4552
+#: src/quanta.cpp:4533
 msgid ""
 "The CSS Editor cannot be invoked here.\n"
 "Try to invoke it on a tag or on a style section."
 msgstr ""
 
-#: src/quanta.cpp:4561
+#: src/quanta.cpp:4542
 msgid "Email Link (mailto)"
 msgstr ""
 
-#: src/quanta.cpp:4623
+#: src/quanta.cpp:4604
 msgid "Generate List"
 msgstr ""
 
-#: src/quanta.cpp:4690
+#: src/quanta.cpp:4671
 msgid ""
 "The table structure is invalid. Most probably you forgot to close some tags."
 msgstr ""
 
 #: components/tableeditor/tableeditor.cpp:1168
 #: components/tableeditor/tableeditor.cpp:1189
-#: components/tableeditor/tableeditor.cpp:1204 src/quanta.cpp:4690
+#: components/tableeditor/tableeditor.cpp:1204 src/quanta.cpp:4671
 msgid "Cannot Read Table"
 msgstr ""
 
-#: src/quanta.cpp:5359
+#: src/quanta.cpp:5340
 #, fuzzy
 msgid "Annotate Document"
 msgstr "Strwythur Dogfen"
 
-#: src/viewmanager.cpp:71
-msgid "Close &Other Tabs"
-msgstr "Cau Tabiau &Eraill"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2581
-#: src/viewmanager.cpp:72
-msgid "Close &All"
-msgstr "Cau'r &Cwbl"
-
-#: src/viewmanager.cpp:74
-#, fuzzy
-msgid "&Upload File"
-msgstr "&Lanlwytho"
-
-#: src/viewmanager.cpp:75
-msgid "&Delete File"
-msgstr "&Dileu Ffeil"
-
-#: src/viewmanager.cpp:85
-msgid "&Switch To"
-msgstr ""
-
-#: src/viewmanager.cpp:110 src/viewmanager.cpp:111
-#, c-format
-msgid "Untitled%1"
-msgstr ""
-
-#: src/viewmanager.cpp:648
-msgid "CVS"
-msgstr ""
-
 #: src/document.cpp:182
 msgid "Breakpoint"
 msgstr ""
@@ -9618,236 +10439,10 @@ msgid ""
 "\"%1\" is used for \"%2\".\n"
 msgstr ""
 
-#: src/main.cpp:42
-msgid "Quanta Plus Web Development Environment"
-msgstr ""
-
-#: src/main.cpp:46
-msgid ""
-"Our goal is to be nothing less than the best possible tool for\n"
-" working with tagging and scripting languages.\n"
-"\n"
-"Quanta Plus is not in any way affiliated with any commercial\n"
-" versions of Quanta. \n"
-"\n"
-"We hope you enjoy Quanta Plus.\n"
-"\n"
-msgstr ""
-
-#: src/main.cpp:52
-msgid "The Quanta+ developers"
-msgstr ""
-
-#: src/main.cpp:56
-msgid "File to open"
-msgstr "Ffeil i agor"
-
-#: src/main.cpp:57
-msgid "Whether we start as a one-instance application"
-msgstr ""
-
-#: src/main.cpp:58
-msgid "Do not show the nice logo during startup"
-msgstr ""
-
-#: src/main.cpp:59
-msgid "Reset the layout of the user interface to the default"
-msgstr ""
-
-#: src/main.cpp:79
-msgid "Project Lead - public liaison"
-msgstr ""
-
-#: src/main.cpp:80
-msgid "Program Lead - bug squisher"
-msgstr ""
-
-#: src/main.cpp:81 src/main.cpp:82
-msgid "Inactive - left for commercial version"
-msgstr ""
-
-#: src/main.cpp:85
-msgid "Various fixes, table editor maintainer"
-msgstr ""
-
-#: src/main.cpp:89
-msgid "Debugger interface and integration of the Gubed PHP debugger"
-msgstr ""
-
-#: src/main.cpp:93
-msgid "Debugger interface"
-msgstr ""
-
-#: src/main.cpp:97
-msgid "XML - compliance, tools & DTEPs"
-msgstr ""
-
-#: src/main.cpp:101
-msgid "Template contributions"
-msgstr ""
-
-#: src/main.cpp:105
-msgid "ColdFusion support"
-msgstr ""
-
-#: src/main.cpp:109
-msgid "Initial debugger work - advanced test"
-msgstr ""
-
-#: src/main.cpp:113
-msgid "Coding and tag dialog definition documentation and more"
-msgstr ""
-
-#: src/main.cpp:117
-msgid "Original plugin system, various fixes"
-msgstr ""
-
-#: src/main.cpp:121
-msgid ""
-"Original documentation, many cool parsing scripts to automate \n"
-"development"
-msgstr ""
-
-#: src/main.cpp:125
-msgid ""
-"Various fixes, foundational code for the old DTD parsing and other \n"
-"DTD related work"
-msgstr ""
-
-#: src/main.cpp:129
-msgid "Tree based upload dialog"
-msgstr ""
-
-#: src/main.cpp:133
-msgid "Addition and maintenance of DTDs"
-msgstr ""
-
-#: src/main.cpp:137
-msgid "Visual Page Layout part, new undo/redo system"
-msgstr ""
-
-#: src/main.cpp:145
-msgid "Frame wizard, CSS wizard"
-msgstr ""
-
-#: src/main.cpp:149
-msgid "Crash recovery"
-msgstr ""
-
-#: src/main.cpp:153
-msgid "Improvements to the treeview code; code review and cleanup"
-msgstr ""
-
-#: src/main.cpp:157
-msgid "Original CSS editor"
-msgstr ""
-
-#: src/main.cpp:161
-msgid "Cool splash screen for many version releases of Quanta"
-msgstr ""
-
-#: src/main.cpp:165
-msgid "Danish translation"
-msgstr ""
-
-#: src/main.cpp:169
-msgid "Part of a code for the old PHP4 Debugger"
-msgstr ""
-
-#: src/main.cpp:173
-msgid "XSLT tags"
-msgstr ""
-
-#: src/main.cpp:177
-msgid "Splash screen and icon for 3.2"
-msgstr ""
-
 #: src/quantadoc.cpp:275
 msgid "Attributes of <%1>"
 msgstr ""
 
-#: src/dtds.cpp:688
-msgid ""
-"<qt>The DTD tag file %1 is not valid."
-"<br> The error message is: <i>%2 in line %3, column %4.</i></qt>"
-msgstr ""
-
-#: src/dtds.cpp:689
-msgid "Invalid Tag File"
-msgstr ""
-
-#: src/dtds.cpp:917 src/dtds.cpp:949
-msgid "<qt>Do you want to replace the existing <b>%1</b> DTD?</qt>"
-msgstr ""
-
-#: src/dtds.cpp:917 src/dtds.cpp:949
-#, fuzzy
-msgid "Do Not Replace"
-msgstr "&Peidiwch â Chadw"
-
-#: src/dtds.cpp:927 src/dtds.cpp:971
-msgid "<qt>Use the newly loaded <b>%1</b> DTD for the current document?</qt>"
-msgstr ""
-
-#: src/dtds.cpp:927 src/dtds.cpp:971
-msgid "Change DTD"
-msgstr ""
-
-#: src/dtds.cpp:927 src/dtds.cpp:971
-msgid "Use"
-msgstr "Defnydd"
-
-#: src/dtds.cpp:927 src/dtds.cpp:971
-#, fuzzy
-msgid "Do Not Use"
-msgstr "&Peidiwch â Chadw"
-
-#: src/dtds.cpp:956
-msgid ""
-"<qt>Cannot read the DTEP from <b>%1</b>. Check that the folder contains a valid "
-"DTEP (<i>description.rc and *.tag files</i>).</qt>"
-msgstr ""
-
-#: src/dtds.cpp:956
-msgid "Error Loading DTEP"
-msgstr ""
-
-#: src/dtds.cpp:960
-msgid "<qt>Autoload the <b>%1</b> DTD in the future?</qt>"
-msgstr ""
-
-#: src/dtds.cpp:960 utility/newstuff.cpp:73
-msgid "Load"
-msgstr "Llwytho"
-
-#: src/dtds.cpp:960
-#, fuzzy
-msgid "Do Not Load"
-msgstr "&Peidiwch â Chadw"
-
-#: src/dtds.cpp:982
-msgid "Load DTD Entities Into DTEP"
-msgstr ""
-
-#: src/quantaview.cpp:298 src/quantaview.cpp:304
-msgid "[modified]"
-msgstr ""
-
-#: src/quantaview.cpp:398 src/quantaview.cpp:447
-#, c-format
-msgid "The VPL Mode does not support the current DTD, at the moment: %1"
-msgstr ""
-
-#: src/quantaview.cpp:966 utility/tagaction.cpp:1123
-msgid "Cannot insert the tag: invalid location."
-msgstr ""
-
-#: src/quantaview.cpp:1067
-msgid ""
-"The file \"%1\" has been modified.\n"
-"Do you want to save it?"
-msgstr ""
-
 #: src/quanta_init.cpp:185
 msgid "Attribute Editor"
 msgstr ""
@@ -9864,7 +10459,7 @@ msgstr "Patrymluniau"
 msgid "Document Structure"
 msgstr "Strwythur Dogfen"
 
-#: src/quanta_init.cpp:189 treeviews/scripttreeview.cpp:66
+#: src/quanta_init.cpp:189 treeviews/scripttreeview.cpp:65
 msgid "Scripts"
 msgstr "Sgriptiau"
 
@@ -9950,231 +10545,219 @@ msgid "&Context Help..."
 msgstr ""
 
 #: src/quanta_init.cpp:789
-msgid "&Quanta Homepage"
-msgstr ""
-
-#: src/quanta_init.cpp:793
-msgid "&User Mailing List"
-msgstr ""
-
-#: src/quanta_init.cpp:797
-msgid "Make &Donation"
-msgstr ""
-
-#: src/quanta_init.cpp:801
 msgid "Tag &Attributes..."
 msgstr ""
 
-#: src/quanta_init.cpp:805
+#: src/quanta_init.cpp:793
 msgid "&Change the DTD..."
 msgstr ""
 
-#: src/quanta_init.cpp:809
+#: src/quanta_init.cpp:797
 msgid "&Edit DTD Settings..."
 msgstr ""
 
-#: src/quanta_init.cpp:813
+#: src/quanta_init.cpp:801
 msgid "&Load && Convert DTD..."
 msgstr ""
 
-#: src/quanta_init.cpp:816
+#: src/quanta_init.cpp:804
 msgid "Load DTD E&ntities..."
 msgstr ""
 
-#: src/quanta_init.cpp:820
+#: src/quanta_init.cpp:808
 msgid "Load DTD &Package (DTEP)..."
 msgstr ""
 
-#: src/quanta_init.cpp:824
+#: src/quanta_init.cpp:812
 msgid "Send DTD Package (DTEP) in E&mail..."
 msgstr ""
 
-#: src/quanta_init.cpp:828
+#: src/quanta_init.cpp:816
 msgid "&Download DTD Package (DTEP)..."
 msgstr ""
 
-#: src/quanta_init.cpp:831
+#: src/quanta_init.cpp:819
 msgid "&Upload DTD Package (DTEP)..."
 msgstr ""
 
-#: src/quanta_init.cpp:839
+#: src/quanta_init.cpp:827
 msgid "&Document Properties"
 msgstr ""
 
-#: src/quanta_init.cpp:843
+#: src/quanta_init.cpp:831
 msgid "F&ormat XML Code"
 msgstr ""
 
-#: src/quanta_init.cpp:847
+#: src/quanta_init.cpp:835
 msgid "&Convert Tag && Attribute Case..."
 msgstr ""
 
-#: src/quanta_init.cpp:855
+#: src/quanta_init.cpp:843
 msgid "&Source Editor"
 msgstr ""
 
-#: src/quanta_init.cpp:861
+#: src/quanta_init.cpp:849
 msgid "&VPL Editor"
 msgstr ""
 
-#: src/quanta_init.cpp:867
+#: src/quanta_init.cpp:855
 msgid "VPL && So&urce Editors"
 msgstr ""
 
-#: src/quanta_init.cpp:880
+#: src/quanta_init.cpp:868
 msgid "&Reload Preview"
 msgstr ""
 
-#: src/quanta_init.cpp:885
+#: src/quanta_init.cpp:873
 msgid "&Previous File"
 msgstr ""
 
-#: src/quanta_init.cpp:889
+#: src/quanta_init.cpp:877
 msgid "&Next File"
 msgstr ""
 
-#: src/quanta_init.cpp:896
+#: src/quanta_init.cpp:884
 msgid "Configure &Actions..."
 msgstr ""
 
-#: src/quanta_init.cpp:904
+#: src/quanta_init.cpp:892
 msgid "Configure Pre&view..."
 msgstr ""
 
-#: src/quanta_init.cpp:907
+#: src/quanta_init.cpp:895
 msgid "Load &Project Toolbar"
 msgstr ""
 
-#: src/quanta_init.cpp:911
+#: src/quanta_init.cpp:899
 msgid "Load &Global Toolbar..."
 msgstr ""
 
-#: src/quanta_init.cpp:912
+#: src/quanta_init.cpp:900
 msgid "Load &Local Toolbar..."
 msgstr ""
 
-#: src/quanta_init.cpp:913
+#: src/quanta_init.cpp:901
 msgid "Save as &Local Toolbar..."
 msgstr ""
 
-#: src/quanta_init.cpp:914
+#: src/quanta_init.cpp:902
 msgid "Save as &Project Toolbar..."
 msgstr ""
 
-#: src/quanta_init.cpp:915
+#: src/quanta_init.cpp:903
 msgid "&New User Toolbar..."
 msgstr ""
 
-#: src/quanta_init.cpp:916
+#: src/quanta_init.cpp:904
 msgid "&Remove User Toolbar..."
 msgstr ""
 
-#: src/quanta_init.cpp:917
+#: src/quanta_init.cpp:905
 msgid "Re&name User Toolbar..."
 msgstr ""
 
-#: src/quanta_init.cpp:918
+#: src/quanta_init.cpp:906
 msgid "Send Toolbar in E&mail..."
 msgstr ""
 
-#: src/quanta_init.cpp:919
+#: src/quanta_init.cpp:907
 #, fuzzy
 msgid "&Upload Toolbar..."
 msgstr "&Lanlwytho"
 
-#: src/quanta_init.cpp:920
+#: src/quanta_init.cpp:908
 msgid "&Download Toolbar..."
 msgstr ""
 
-#: src/quanta_init.cpp:922
+#: src/quanta_init.cpp:910
 msgid "Smart Tag Insertion"
 msgstr ""
 
-#: src/quanta_init.cpp:925
+#: src/quanta_init.cpp:913
 msgid "Show DTD Toolbar"
 msgstr ""
 
-#: src/quanta_init.cpp:928
+#: src/quanta_init.cpp:916
 msgid "Hide DTD Toolbar"
 msgstr ""
 
-#: src/quanta_init.cpp:930
+#: src/quanta_init.cpp:918
 msgid "Complete Text"
 msgstr ""
 
-#: src/quanta_init.cpp:932
+#: src/quanta_init.cpp:920
 msgid "Completion Hints"
 msgstr ""
 
-#: src/quanta_init.cpp:939
+#: src/quanta_init.cpp:927
 msgid "Upload..."
 msgstr "Lanlwytho ..."
 
-#: src/quanta_init.cpp:940
+#: src/quanta_init.cpp:928
 msgid "Delete File"
 msgstr "Dileu Ffeil"
 
-#: src/quanta_init.cpp:942
+#: src/quanta_init.cpp:930
 msgid "Upload Opened Project Files..."
 msgstr ""
 
-#: src/quanta_init.cpp:1003
+#: src/quanta_init.cpp:991
 msgid "&Preview"
 msgstr "&Rhagolwg"
 
-#: src/quanta_init.cpp:1007
+#: src/quanta_init.cpp:995
 msgid "Preview Without Frames"
 msgstr ""
 
-#: src/quanta_init.cpp:1012
+#: src/quanta_init.cpp:1000
 msgid "View with &Konqueror"
 msgstr ""
 
-#: src/quanta_init.cpp:1034
+#: src/quanta_init.cpp:1022
 msgid "View with L&ynx"
 msgstr ""
 
-#: src/quanta_init.cpp:1040
+#: src/quanta_init.cpp:1028
 msgid "Table Editor..."
 msgstr ""
 
-#: src/quanta_init.cpp:1044
+#: src/quanta_init.cpp:1032
 msgid "Quick List..."
 msgstr ""
 
-#: src/quanta_init.cpp:1048
+#: src/quanta_init.cpp:1036
 msgid "Color..."
 msgstr "Lliw..."
 
-#: src/quanta_init.cpp:1053
+#: src/quanta_init.cpp:1041
 msgid "Email..."
 msgstr "Ebost ..."
 
-#: src/quanta_init.cpp:1057
+#: src/quanta_init.cpp:1045
 msgid "Misc. Tag..."
 msgstr ""
 
-#: src/quanta_init.cpp:1061
+#: src/quanta_init.cpp:1049
 msgid "Frame Wizard..."
 msgstr ""
 
-#: src/quanta_init.cpp:1065
+#: src/quanta_init.cpp:1053
 msgid "Paste &HTML Quoted"
 msgstr ""
 
-#: src/quanta_init.cpp:1069
+#: src/quanta_init.cpp:1057
 msgid "Paste &URL Encoded"
 msgstr ""
 
-#: src/quanta_init.cpp:1073
+#: src/quanta_init.cpp:1061
 msgid "Insert CSS..."
 msgstr ""
 
-#: src/quanta_init.cpp:1174
+#: src/quanta_init.cpp:1162
 msgid "Restore File"
 msgstr ""
 
-#: src/quanta_init.cpp:1176
+#: src/quanta_init.cpp:1164
 msgid ""
 "<qt>A backup copy of a file was found:"
 "<br>"
@@ -10188,87 +10771,270 @@ msgid ""
 "<br></qt>"
 msgstr ""
 
-#: src/quanta_init.cpp:1186
+#: src/quanta_init.cpp:1174
 msgid "&Restore the file from backup"
 msgstr ""
 
-#: src/quanta_init.cpp:1187
+#: src/quanta_init.cpp:1175
 msgid "Do &not restore the file from backup"
 msgstr ""
 
-#: src/quanta_init.cpp:1296
+#: src/quanta_init.cpp:1284
 msgid "Failed to query for running Quanta instances."
 msgstr ""
 
-#: src/quanta_init.cpp:1407
+#: src/quanta_init.cpp:1394
 msgid "various script based dialogs including the Quick Start dialog"
 msgstr ""
 
-#: src/quanta_init.cpp:1414
+#: src/quanta_init.cpp:1400
 msgid "HTML syntax checking"
 msgstr ""
 
-#: src/quanta_init.cpp:1421
+#: src/quanta_init.cpp:1406
 msgid "comparing of files by content"
 msgstr ""
 
-#: src/quanta_init.cpp:1426
+#: src/quanta_init.cpp:1411
 msgid "Control Center (tdebase)"
 msgstr ""
 
-#: src/quanta_init.cpp:1429 src/quanta_init.cpp:1436
+#: src/quanta_init.cpp:1413 src/quanta_init.cpp:1419
 msgid "preview browser configuration"
 msgstr ""
 
-#: src/quanta_init.cpp:1443
+#: src/quanta_init.cpp:1425
 msgid "search and replace in files"
 msgstr ""
 
-#: src/quanta_init.cpp:1450
+#: src/quanta_init.cpp:1431
 msgid "XSLT debugging"
 msgstr ""
 
-#: src/quanta_init.cpp:1458
+#: src/quanta_init.cpp:1438
 msgid "editing HTML image maps"
 msgstr ""
 
-#: src/quanta_init.cpp:1466
+#: src/quanta_init.cpp:1445
 msgid "link validity checking"
 msgstr ""
 
-#: src/quanta_init.cpp:1473
+#: src/quanta_init.cpp:1451
 msgid "CVS management plugin"
 msgstr ""
 
-#: src/quanta_init.cpp:1478
-msgid "<br><b>-    %1</b> [<i>%2</i>] - %3 will not be available;"
+#: src/quanta_init.cpp:1456
+msgid "<br><b>-    %1</b> [<i>%2</i>] will not be available;"
 msgstr ""
 
-#: src/quanta_init.cpp:1503
+#: src/quanta_init.cpp:1481
 msgid "integrated CVS management"
 msgstr ""
 
-#: src/quanta_init.cpp:1520
-msgid "Some applications required for full functionality are missing:<br>"
-msgstr ""
-
-#: src/quanta_init.cpp:1520
+#: src/quanta_init.cpp:1498
 msgid ""
+"Some applications required for full functionality are missing or installed "
+"incorrectly:"
 "<br>"
-"<br>You may download the applications from the specified locations.</qt>"
 msgstr ""
 
-#: src/quanta_init.cpp:1520
+#: src/quanta_init.cpp:1498
+msgid "<br><br>Please verify the package contents.</qt>"
+msgstr ""
+
+#: src/quanta_init.cpp:1498
 msgid "Missing Applications"
 msgstr ""
 
-#: messages/messageitem.cpp:73 messages/messageitem.cpp:81
-msgid "File: "
-msgstr "Ffeil: "
+#: src/quantaview.cpp:298 src/quantaview.cpp:304
+msgid "[modified]"
+msgstr ""
 
-#: messages/messageitem.cpp:76
-msgid ", "
-msgstr ","
+#: src/quantaview.cpp:398 src/quantaview.cpp:447
+#, c-format
+msgid "The VPL Mode does not support the current DTD, at the moment: %1"
+msgstr ""
+
+#: src/quantaview.cpp:1067
+msgid ""
+"The file \"%1\" has been modified.\n"
+"Do you want to save it?"
+msgstr ""
+
+#: src/viewmanager.cpp:71
+msgid "Close &Other Tabs"
+msgstr "Cau Tabiau &Eraill"
+
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2581
+#: src/viewmanager.cpp:72
+msgid "Close &All"
+msgstr "Cau'r &Cwbl"
+
+#: src/viewmanager.cpp:74
+#, fuzzy
+msgid "&Upload File"
+msgstr "&Lanlwytho"
+
+#: src/viewmanager.cpp:75
+msgid "&Delete File"
+msgstr "&Dileu Ffeil"
+
+#: src/viewmanager.cpp:85
+msgid "&Switch To"
+msgstr ""
+
+#: src/viewmanager.cpp:110 src/viewmanager.cpp:111
+#, c-format
+msgid "Untitled%1"
+msgstr ""
+
+#: src/viewmanager.cpp:648
+msgid "CVS"
+msgstr ""
+
+#: src/main.cpp:42
+msgid "Quanta Plus Web Development Environment"
+msgstr ""
+
+#: src/main.cpp:46
+msgid ""
+"Our goal is to be nothing less than the best possible tool for\n"
+" working with tagging and scripting languages.\n"
+"\n"
+"Quanta Plus is not in any way affiliated with any commercial\n"
+" versions of Quanta. \n"
+"\n"
+"We hope you enjoy Quanta Plus.\n"
+"\n"
+msgstr ""
+
+#: src/main.cpp:52
+msgid "The Quanta+ developers"
+msgstr ""
+
+#: src/main.cpp:56
+msgid "File to open"
+msgstr "Ffeil i agor"
+
+#: src/main.cpp:57
+msgid "Whether we start as a one-instance application"
+msgstr ""
+
+#: src/main.cpp:58
+msgid "Do not show the nice logo during startup"
+msgstr ""
+
+#: src/main.cpp:59
+msgid "Reset the layout of the user interface to the default"
+msgstr ""
+
+#: src/main.cpp:79
+msgid "Project Lead - public liaison"
+msgstr ""
+
+#: src/main.cpp:80
+msgid "Program Lead - bug squisher"
+msgstr ""
+
+#: src/main.cpp:81 src/main.cpp:82
+msgid "Inactive - left for commercial version"
+msgstr ""
+
+#: src/main.cpp:85
+msgid "Various fixes, table editor maintainer"
+msgstr ""
+
+#: src/main.cpp:89
+msgid "Debugger interface and integration of the Gubed PHP debugger"
+msgstr ""
+
+#: src/main.cpp:93
+msgid "Debugger interface"
+msgstr ""
+
+#: src/main.cpp:97
+msgid "XML - compliance, tools & DTEPs"
+msgstr ""
+
+#: src/main.cpp:101
+msgid "Template contributions"
+msgstr ""
+
+#: src/main.cpp:105
+msgid "ColdFusion support"
+msgstr ""
+
+#: src/main.cpp:109
+msgid "Initial debugger work - advanced test"
+msgstr ""
+
+#: src/main.cpp:113
+msgid "Coding and tag dialog definition documentation and more"
+msgstr ""
+
+#: src/main.cpp:117
+msgid "Original plugin system, various fixes"
+msgstr ""
+
+#: src/main.cpp:121
+msgid ""
+"Original documentation, many cool parsing scripts to automate \n"
+"development"
+msgstr ""
+
+#: src/main.cpp:125
+msgid ""
+"Various fixes, foundational code for the old DTD parsing and other \n"
+"DTD related work"
+msgstr ""
+
+#: src/main.cpp:129
+msgid "Tree based upload dialog"
+msgstr ""
+
+#: src/main.cpp:133
+msgid "Addition and maintenance of DTDs"
+msgstr ""
+
+#: src/main.cpp:137
+msgid "Visual Page Layout part, new undo/redo system"
+msgstr ""
+
+#: src/main.cpp:145
+msgid "Frame wizard, CSS wizard"
+msgstr ""
+
+#: src/main.cpp:149
+msgid "Crash recovery"
+msgstr ""
+
+#: src/main.cpp:153
+msgid "Improvements to the treeview code; code review and cleanup"
+msgstr ""
+
+#: src/main.cpp:157
+msgid "Original CSS editor"
+msgstr ""
+
+#: src/main.cpp:161
+msgid "Cool splash screen for many version releases of Quanta"
+msgstr ""
+
+#: src/main.cpp:165
+msgid "Danish translation"
+msgstr ""
+
+#: src/main.cpp:169
+msgid "Part of a code for the old PHP4 Debugger"
+msgstr ""
+
+#: src/main.cpp:173
+msgid "XSLT tags"
+msgstr ""
+
+#: src/main.cpp:177
+msgid "Splash screen and icon for 3.2"
+msgstr ""
 
 #: messages/messageoutput.cpp:50
 msgid "&Save As..."
@@ -10288,17 +11054,18 @@ msgstr ""
 msgid "<qt>File<br><b>%1</b><br>already exists. Overwrite it?</qt>"
 msgstr ""
 
-#: ../lib/compatibility/knewstuff/knewstuffgeneric.cpp:135
-#: messages/messageoutput.cpp:162 project/projectprivate.cpp:920
-#: treeviews/basetreeview.cpp:1041 treeviews/templatestreeview.cpp:470
-#: utility/quantacommon.cpp:710
-msgid "Overwrite"
-msgstr "Trosysgrifo"
-
 #: messages/messageoutput.cpp:167
 msgid "<qt>Cannot save log file<br><b>%1</b></qt>"
 msgstr ""
 
+#: messages/messageitem.cpp:73 messages/messageitem.cpp:81
+msgid "File: "
+msgstr "Ffeil: "
+
+#: messages/messageitem.cpp:76
+msgid ", "
+msgstr ","
+
 #: messages/annotationoutput.cpp:51 messages/annotationoutput.cpp:104
 #: messages/annotationoutput.cpp:204
 msgid "For You"
@@ -10332,818 +11099,925 @@ msgstr ""
 msgid "New Annotations"
 msgstr "Lleoliad"
 
-#: dialogs/dirtydlg.cpp:44
-msgid "<qt>The file <b>%1</b> was changed outside of the Quanta editor.</qt>"
+#: treeviews/templatestreeview.cpp:73
+msgid "Insert as &Text"
 msgstr ""
 
-#: dialogs/tagdialogs/tagimgdlgdata.cpp:27
-msgid "Image source:"
+#: treeviews/templatestreeview.cpp:74
+msgid "Insert &Link to File"
 msgstr ""
 
-#: dialogs/tagdialogs/tagimgdlgdata.cpp:46
-msgid "Width:"
-msgstr "Lled:"
-
-#: dialogs/tagdialogs/tagimgdlgdata.cpp:58
-msgid "Height:"
-msgstr "Taldra:"
+#: treeviews/templatestreeview.cpp:75
+msgid "&New Document Based on This"
+msgstr ""
 
-#: dialogs/tagdialogs/tagimgdlgdata.cpp:74
-msgid "HSpace:"
+#: treeviews/templatestreeview.cpp:76
+msgid "&Extract Site Template To..."
 msgstr ""
 
-#: dialogs/tagdialogs/tagimgdlgdata.cpp:85
-msgid "VSpace:"
+#: treeviews/templatestreeview.cpp:135 treeviews/templatestreeview.cpp:139
+msgid "Text Snippet"
 msgstr ""
 
-#: dialogs/tagdialogs/tagimgdlgdata.cpp:93
-msgid "Alternate text:"
+#: treeviews/templatestreeview.cpp:136 treeviews/templatestreeview.cpp:140
+msgid "Binary File"
 msgstr ""
 
-#: dialogs/tagdialogs/tagimgdlgdata.cpp:103
-msgid "Border:"
-msgstr "Ymyl:"
+#: treeviews/templatestreeview.cpp:137 treeviews/templatestreeview.cpp:141
+msgid "Document Template"
+msgstr ""
 
-#: dialogs/tagdialogs/tagimgdlgdata.cpp:115
-msgid "Align:"
-msgstr "Alinio:"
+#: treeviews/templatestreeview.cpp:138 treeviews/templatestreeview.cpp:142
+msgid "Site Template"
+msgstr ""
 
-#: dialogs/tagdialogs/tagmaildlg.cpp:96
-msgid "Select Address"
-msgstr "Dewis Cyfeiriad"
+#: treeviews/filestreeview.cpp:87 treeviews/projecttreeview.cpp:128
+#: treeviews/servertreeview.cpp:103 treeviews/templatestreeview.cpp:147
+msgid "&Open"
+msgstr "A&gor"
 
-#: dialogs/tagdialogs/tagmaildlg.cpp:104
-msgid "No addresses found."
+#: treeviews/templatestreeview.cpp:148 treeviews/templatestreeview.cpp:161
+msgid "Send in E&mail..."
 msgstr ""
 
-#: dialogs/tagdialogs/colorcombo.cpp:178 dialogs/tagdialogs/colorcombo.cpp:232
-msgid "Custom..."
-msgstr "Addasu ..."
+#: treeviews/templatestreeview.cpp:149 treeviews/templatestreeview.cpp:162
+#, fuzzy
+msgid "&Upload Template..."
+msgstr "&Lanlwytho"
 
-#: dialogs/tagdialogs/tagimgdlg.cpp:107
-msgid ""
-"|Image Files\n"
-"*|All Files"
+#: treeviews/filestreeview.cpp:91 treeviews/filestreeview.cpp:109
+#: treeviews/templatestreeview.cpp:150 treeviews/templatestreeview.cpp:164
+msgid "&Insert in Project..."
 msgstr ""
 
-#: dialogs/tagdialogs/tagdialog.cpp:127 dialogs/tagdialogs/tagdialog.cpp:146
-#: dialogs/tagdialogs/tagdialog.cpp:345 dialogs/tagdialogs/tagdialog.cpp:427
-msgid "Unknown tag"
-msgstr ""
+#: treeviews/filestreeview.cpp:89 treeviews/projecttreeview.cpp:131
+#: treeviews/servertreeview.cpp:105 treeviews/templatestreeview.cpp:151
+msgid "Clos&e"
+msgstr "C&au"
 
-#: dialogs/tagdialogs/tagdialog.cpp:138
-msgid "Tag Properties: "
-msgstr ""
+#: treeviews/filestreeview.cpp:96 treeviews/filestreeview.cpp:116
+#: treeviews/projecttreeview.cpp:140 treeviews/projecttreeview.cpp:159
+#: treeviews/servertreeview.cpp:112 treeviews/servertreeview.cpp:122
+#: treeviews/templatestreeview.cpp:156 treeviews/templatestreeview.cpp:170
+msgid "&Properties"
+msgstr "&Priodweddau"
 
-#: dialogs/tagdialogs/tagquicklistdlgdata.cpp:27
-msgid "Rows:"
-msgstr "Rhesi:"
+#: treeviews/templatestreeview.cpp:160
+msgid "&New Folder..."
+msgstr "&Plygell Newydd"
 
-#: dialogs/tagdialogs/tagquicklistdlgdata.cpp:55
-msgid "Ordered"
+#: treeviews/templatestreeview.cpp:163 treeviews/templatestreeview.cpp:174
+msgid "&Download Template..."
 msgstr ""
 
-#: dialogs/tagdialogs/tagquicklistdlgdata.cpp:61
-msgid "Unordered"
+#: treeviews/templatestreeview.cpp:177
+msgid "Group"
+msgstr "Gr?p"
+
+#: treeviews/templatestreeview.cpp:211
+msgid "Global Templates"
 msgstr ""
 
-#: dialogs/actionconfigdialog.cpp:151
-msgid "&Add New Toolbar"
+#: treeviews/templatestreeview.cpp:215
+msgid "Local Templates"
 msgstr ""
 
-#: dialogs/actionconfigdialog.cpp:152
-msgid "&Remove Toolbar"
+#: treeviews/templatestreeview.cpp:218
+msgid "Project Templates"
 msgstr ""
 
-#: dialogs/actionconfigdialog.cpp:153
-msgid "&Edit Toolbar"
+#: treeviews/templatestreeview.cpp:376
+msgid "Create New Template Folder"
 msgstr ""
 
-#: dialogs/actionconfigdialog.cpp:193
-msgid "Do you really want to remove the \"%1\" toolbar?"
+#: treeviews/templatestreeview.cpp:386 treeviews/templatestreeview.cpp:619
+msgid "&Inherit parent attribute (nothing)"
 msgstr ""
 
-#: dialogs/actionconfigdialog.cpp:269 dialogs/actionconfigdialog.cpp:782
-msgid "Do you want to save the changes made to this action?"
+#: treeviews/templatestreeview.cpp:389 treeviews/templatestreeview.cpp:622
+msgid "&Inherit parent attribute (%1)"
 msgstr ""
 
-#: dialogs/actionconfigdialog.cpp:765
+#: treeviews/templatestreeview.cpp:406
 msgid ""
-"The '%1' key combination has already been allocated to the \"%2\" action.\n"
-"Please choose a unique key combination."
+"Error while creating the new folder.\n"
+"                    Maybe you do not have permission to write in the %1 folder."
 msgstr ""
-"Mae cyfuniad bysell %1 wedi ei dyrannu yn barod i'r gweithrediad \"%2\".\n"
-" Dewiswch cyfuniad bysell unigryw."
 
-#: dialogs/actionconfigdialog.cpp:769
-msgid "Conflicting Shortcuts"
+#: treeviews/templatestreeview.cpp:458
+msgid "Save selection as template file:"
 msgstr ""
 
-#: dialogs/actionconfigdialog.cpp:841
+#: treeviews/templatestreeview.cpp:476
 msgid ""
-"<qt>Removing the action removes all the references to it.\n"
-"Are you sure you want to remove the <b>%1</b> action?</qt>"
+"<qt>Could not write to file <b>%1</b>."
+"<br>Check if you have rights to write there or that your connection is "
+"working.</qt>"
 msgstr ""
 
-#: dialogs/actionconfigdialog.cpp:887
-msgid "Add Action to Toolbar"
+#: treeviews/templatestreeview.cpp:565
+msgid "Quanta Template"
 msgstr ""
 
-#: dialogs/settings/abbreviation.cpp:95
-msgid "New Abbreviation Group"
+#: treeviews/templatestreeview.cpp:876
+msgid ""
+"Do you really want to delete folder \n"
+"%1 ?\n"
 msgstr ""
 
-#: dialogs/settings/abbreviation.cpp:95
-msgid "Group name:"
-msgstr "Enw'r grwp:"
-
-#: dialogs/settings/abbreviation.cpp:100
+#: treeviews/templatestreeview.cpp:878
 msgid ""
-"<qt>There is already an abbreviation group called <b>%1</b>"
-". Choose an unique name for the new group.</qt>"
+"Do you really want to delete file \n"
+"%1 ?\n"
 msgstr ""
 
-#: dialogs/settings/abbreviation.cpp:100
-msgid "Group already exists"
+#: treeviews/templatestreeview.cpp:985
+msgid "Send template in email"
 msgstr ""
 
-#: dialogs/settings/abbreviation.cpp:118
-msgid "Add DTEP"
+#: treeviews/templatestreeview.cpp:987
+msgid ""
+"Hi,\n"
+" This is a Quanta Plus [http://quanta.kdewebdev.org] template tarball.\n"
+"\n"
+"Have fun.\n"
 msgstr ""
 
-#: dialogs/settings/abbreviation.cpp:119
-msgid "Select a DTEP:"
+#: treeviews/templatestreeview.cpp:1000
+msgid "Quanta Plus Template"
 msgstr ""
 
-#: dialogs/settings/abbreviation.cpp:145
-msgid "<qt>Select a DTEP from the list before using <b>Remove</b>.</qt>"
+#: treeviews/templatestreeview.cpp:1031
+msgid "Target folder"
 msgstr ""
 
-#: dialogs/settings/abbreviation.cpp:145
-msgid "No DTEP Selected"
+#: treeviews/templatestreeview.cpp:1067
+msgid ""
+"You have extracted the site template to a folder which is not under your main "
+"project folder.\n"
+"Do you want to copy the folder into the main project folder?"
 msgstr ""
 
-#: dialogs/settings/abbreviation.cpp:190
-msgid "<qt>Do you really want to remove the <b>%1</b> template?</qt>"
-msgstr ""
+#: treeviews/templatestreeview.cpp:1067
+#, fuzzy
+msgid "Copy Folder"
+msgstr "Plygell Wraidd"
 
-#: dialogs/settings/abbreviation.cpp:204
-msgid "Edit Code Template"
-msgstr ""
+#: treeviews/templatestreeview.cpp:1067
+#, fuzzy
+msgid "Do Not Copy"
+msgstr "&Peidiwch â Chadw"
 
-#: dialogs/settings/abbreviation.cpp:273
+#: treeviews/templatestreeview.cpp:1075
 msgid ""
-"<qt>Cannot open the file <b>%1</b> for writing.\n"
-"Modified abbreviations will be lost when you quit Quanta.</qt>"
+"<qt>Some error happened while extracting the <i>%1</i> site template file."
+"<br>Check that you have write permission for <i>%2</i> "
+"and that there is enough free space in your temporary folder.</qt>"
 msgstr ""
 
-#: components/framewizard/fmfpeditor.cpp:40 dialogs/filecombo.cpp:93
-msgid "*|All Files"
-msgstr "*|Pob Ffeil"
+#: treeviews/basetreeview.cpp:630 treeviews/servertreeview.cpp:104
+msgid "Open &With..."
+msgstr "Agor &Gyda..."
 
-#: dialogs/dtepeditdlg.cpp:63
-msgid "&Pages"
-msgstr "&Tudalennau"
+#: treeviews/filestreeview.cpp:93 treeviews/filestreeview.cpp:113
+#: treeviews/projecttreeview.cpp:135 treeviews/projecttreeview.cpp:153
+#: treeviews/servertreeview.cpp:110 treeviews/servertreeview.cpp:120
+msgid "Re&name"
+msgstr "Ai&l-enwi"
 
-#: dialogs/dtepeditdlg.cpp:206
-msgid ""
-"<qt>The file <b>%1</b> is not writable."
-"<br>Do you want to save the configuration to a different file?</qt>"
+#: treeviews/servertreeview.cpp:125
+msgid "Upload Tree"
 msgstr ""
 
-#: dialogs/dtepeditdlg.cpp:206
-msgid "Save to Different File"
+#: treeviews/basetreeview.cpp:438
+msgid "Quanta File Info"
 msgstr ""
 
-#: dialogs/dtepeditdlg.cpp:206
-msgid "Do Not Save"
-msgstr "Peidiwch â Chadw"
-
-#: dialogs/dtepeditdlg.cpp:208
-#, fuzzy
-msgid "*.rc|DTEP Description"
-msgstr "Disgrifiad"
+#: treeviews/basetreeview.cpp:497
+#, c-format
+msgid "Number of lines: %1"
+msgstr "Nifel llinellau: %1"
 
-#: dialogs/dtepeditdlg.cpp:208
-#, fuzzy
-msgid "Save Description As"
-msgstr "Disgrifiad:"
+#: treeviews/basetreeview.cpp:498
+#, c-format
+msgid "Number of images included: %1"
+msgstr ""
 
-#: dialogs/dtepeditdlg.cpp:444
-msgid "Edit Structure Group"
+#: treeviews/basetreeview.cpp:499
+msgid "Size of the included images: %1 bytes"
 msgstr ""
 
-#: dialogs/dtepeditdlg.cpp:494
-msgid "Add Structure Group"
+#: treeviews/basetreeview.cpp:500
+msgid "Total size with images: %1 bytes"
 msgstr ""
 
-#: dialogs/dtepeditdlg.cpp:539
-msgid "<qt>Do you really want to delete the <b>%1</b> group?</qt>"
+#: treeviews/basetreeview.cpp:505
+msgid "Image size: %1 x %2"
 msgstr ""
 
-#: dialogs/dtepeditdlg.cpp:539
-#, fuzzy
-msgid "Delete Group"
-msgstr "&Dileu Gweithred"
+#: treeviews/basetreeview.cpp:627
+msgid "&Other..."
+msgstr "&Eraill..."
 
-#: parts/kafka/domtreeview.cpp:35
-msgid "Value (limited to 20 char)"
-msgstr ""
+#: treeviews/basetreeview.cpp:628
+msgid "Open &With"
+msgstr "A&gor gyda"
 
-#: parts/kafka/domtreeview.cpp:36
-msgid "Length"
-msgstr "Hyd"
+#: treeviews/basetreeview.cpp:885 treeviews/structtreeview.cpp:832
+msgid "&Move Here"
+msgstr "&Symud Yma"
 
-#: parts/kafka/domtreeview.cpp:37 parts/kafka/wkafkapart.cpp:71
-msgid "ID"
-msgstr "ID"
+#: treeviews/basetreeview.cpp:887 treeviews/structtreeview.cpp:833
+msgid "&Copy Here"
+msgstr "&Copïo Yma"
 
-#: parts/kafka/domtreeview.cpp:146
-msgid "Debugging KafkaWidget DOM Tree "
-msgstr ""
+#: treeviews/basetreeview.cpp:889
+msgid "&Link Here"
+msgstr "Creu Cysw&llt Yma "
 
-#: parts/kafka/wkafkapart.cpp:68
-msgid "Attribute"
-msgstr "Priodoleddau"
+#: treeviews/basetreeview.cpp:891 treeviews/structtreeview.cpp:835
+msgid "C&ancel"
+msgstr "&Diddymu"
 
-#: components/debugger/debuggerbreakpointview.cpp:61
-#: parts/kafka/wkafkapart.cpp:68
-msgid "Class"
-msgstr "Dosbarth"
+#: treeviews/basetreeview.cpp:1135
+msgid "Create Site Template File"
+msgstr ""
 
-#: parts/kafka/wkafkapart.cpp:69
-msgid "Pseudo-class"
+#: treeviews/basetreeview.cpp:1143
+msgid "Templates should be saved to the local or project template folder."
 msgstr ""
 
-#: parts/kafka/wkafkapart.cpp:69
-msgid "CSS rules"
+#: treeviews/basetreeview.cpp:1151
+msgid "Currently you can create site templates only from local folders."
 msgstr ""
 
-#: parts/kafka/wkafkapart.cpp:69
-msgid "Universal selector"
+#: treeviews/basetreeview.cpp:1151
+msgid "Unsupported Feature"
 msgstr ""
 
-#: parts/kafka/wkafkapart.cpp:70
-msgid "Linked stylesheets"
+#: treeviews/basetreeview.cpp:1187
+msgid ""
+"<qt>There was an error while creating the site template tarball."
+"<br>Check that you can read the files from <i>%1</i>"
+", you have write access to <i>%2</i> and that you have enough free space in "
+"your temporary folder.</qt>"
 msgstr ""
 
-#: parts/kafka/wkafkapart.cpp:70
-msgid "Embedded stylesheets"
+#: treeviews/basetreeview.cpp:1194 treeviews/projecttreeview.cpp:375
+msgid "Create New Folder"
+msgstr "Creu Plygell Newydd"
+
+#: treeviews/basetreeview.cpp:1194 treeviews/projecttreeview.cpp:375
+msgid "Folder name:"
 msgstr ""
 
-#: parts/kafka/wkafkapart.cpp:70
-msgid "Inline style attribute"
+#: treeviews/basetreeview.cpp:1209 treeviews/projecttreeview.cpp:393
+#, fuzzy
+msgid "Create New File"
+msgstr "&Creu Plygell..."
+
+#: treeviews/basetreeview.cpp:1219 treeviews/projecttreeview.cpp:403
+msgid ""
+"<qt>Cannot create file, because a file named <b>%1</b> already exists.</qt>"
 msgstr ""
 
-#: parts/kafka/wkafkapart.cpp:71
-msgid "Priority"
-msgstr "Blaenoriaeth"
+#: treeviews/basetreeview.cpp:1219 treeviews/projecttreeview.cpp:403
+msgid "Error Creating File"
+msgstr ""
 
-#: parts/kafka/wkafkapart.cpp:72
-msgid "Browser support"
+#: treeviews/doctreeview.cpp:54
+msgid "Project Documentation"
 msgstr ""
 
-#: parts/kafka/wkafkapart.cpp:72
-msgid "Pseudo-element"
+#: treeviews/doctreeview.cpp:65
+#, fuzzy
+msgid "&Download Documentation..."
+msgstr "Dogfenniaeth"
+
+#: treeviews/projecttreeview.cpp:62 treeviews/projecttreeview.cpp:65
+msgid "Document Base Folder"
 msgstr ""
 
-#: parts/kafka/wkafkapart.cpp:72
-msgid "Imported"
+#: treeviews/projecttreeview.cpp:108
+msgid "Project Files"
 msgstr ""
 
-#: parts/kafka/wkafkapart.cpp:73
-msgid "Inheritance"
+#: treeviews/projecttreeview.cpp:121
+msgid "&When Modified"
 msgstr ""
 
-#: parts/kafka/wkafkapart.cpp:73
-msgid "Inherited"
+#: treeviews/projecttreeview.cpp:122
+msgid "&Never"
+msgstr "&Byth"
+
+#: treeviews/projecttreeview.cpp:123
+msgid "&Confirm"
+msgstr "&Cadarnhau"
+
+#: treeviews/filestreeview.cpp:88 treeviews/projecttreeview.cpp:130
+msgid "Insert &Tag"
 msgstr ""
 
-#: parts/kafka/wkafkapart.cpp:76
-msgid "Undo/Redo history"
+#: treeviews/projecttreeview.cpp:133
+#, fuzzy
+msgid "&Upload File..."
+msgstr "&Lanlwytho"
+
+#: treeviews/projecttreeview.cpp:134
+msgid "&Quick File Upload"
 msgstr ""
 
-#: parts/kafka/wkafkapart.cpp:76
-msgid "CSS styles"
+#: treeviews/projecttreeview.cpp:136 treeviews/projecttreeview.cpp:154
+msgid "&Remove From Project"
 msgstr ""
 
-#: parts/kafka/htmldocumentproperties.cpp:340 parts/kafka/wkafkapart.cpp:78
-msgid "Sorry, VPL does not support this functionality yet."
+#: treeviews/projecttreeview.cpp:139 treeviews/projecttreeview.cpp:158
+#: treeviews/projecttreeview.cpp:169
+msgid "Upload &Status"
 msgstr ""
 
-#: parts/kafka/wkafkapart.cpp:79
-msgid "Merge cells"
-msgstr "Uno celloedd"
+#: treeviews/filestreeview.cpp:99 treeviews/projecttreeview.cpp:143
+msgid "F&older..."
+msgstr "P&lygell ..."
 
-#: parts/kafka/wkafkapart.cpp:80
-msgid "Split cells"
-msgstr "Hollti Celloedd"
+#: treeviews/filestreeview.cpp:100 treeviews/projecttreeview.cpp:144
+msgid "&File..."
+msgstr "&Ffeil..."
 
-#: parts/kafka/wkafkapart.cpp:81
-msgid "Edit CSS style of this Tag"
+#: treeviews/filestreeview.cpp:107 treeviews/projecttreeview.cpp:148
+#: treeviews/projecttreeview.cpp:162
+msgid "&Create New"
+msgstr "&Creu Newydd"
+
+#: treeviews/projecttreeview.cpp:150
+msgid "&Upload Folder..."
 msgstr ""
 
-#: parts/kafka/wkafkapart.cpp:82
-msgid "Ident all"
+#: treeviews/projecttreeview.cpp:151
+msgid "&Quick Folder Upload"
 msgstr ""
 
-#: parts/kafka/htmldocumentproperties.cpp:89
-msgid "Content"
+#: treeviews/filestreeview.cpp:106 treeviews/projecttreeview.cpp:152
+msgid "Create Site &Template..."
 msgstr ""
 
-#: parts/kafka/htmldocumentproperties.cpp:98
-msgid "Rule"
+#: treeviews/projecttreeview.cpp:157
+msgid "Document-&Base Folder"
 msgstr ""
 
-#: parts/preview/whtmlpart.cpp:56
-msgid "View &Document Source"
-msgstr "Gweld Côd &Tarddiad y Ddogfen"
+#: project/projectprivate.cpp:137 treeviews/projecttreeview.cpp:164
+msgid "&Upload Project..."
+msgstr ""
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "KD wrth KGyfieithu"
+#: treeviews/projecttreeview.cpp:165
+msgid "Re&scan Project Folder..."
+msgstr ""
 
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "kyfieithu@dotmon.com"
+#: treeviews/projecttreeview.cpp:166
+msgid "Project &Properties"
+msgstr ""
 
-#: components/framewizard/fmfpeditor.cpp:36
-msgid "*.html *.htm|HTML Files"
+#: treeviews/projecttreeview.cpp:195 treeviews/projecttreeview.cpp:289
+msgid "[local disk]"
 msgstr ""
 
-#: components/framewizard/fmfpeditor.cpp:37
-msgid "*.php|PHP Files"
+#: treeviews/projecttreeview.cpp:205 treeviews/projecttreeview.cpp:300
+msgid "No Project"
 msgstr ""
 
-#: components/framewizard/fmfpeditor.cpp:38
-msgid "*.xml|XML Files"
+#: treeviews/filestreeview.cpp:299 treeviews/filestreeview.cpp:301
+#: treeviews/projecttreeview.cpp:653 treeviews/projecttreeview.cpp:655
+#: treeviews/projecttreeview.cpp:657
+msgid "C&VS"
 msgstr ""
 
-#: components/framewizard/fmfpeditor.cpp:39
-msgid "*xhtml|XHTML Files"
+#: treeviews/structtreeview.cpp:90
+msgid "All Present DTEP"
 msgstr ""
 
-#: components/framewizard/framewizard.cpp:28
-msgid "You must select an area."
+#: treeviews/structtreeview.cpp:104 treeviews/structtreeview.cpp:109
+msgid "Show Groups For"
 msgstr ""
 
-#: components/framewizard/framewizard.cpp:29
-msgid "Before editing a frame you must save the file."
+#: treeviews/structtreeview.cpp:105 treeviews/structtreeview.cpp:122
+msgid "&Reparse"
 msgstr ""
 
-#: components/framewizard/framewizard.cpp:62
-msgid "Enter the desired number of rows:"
+#: treeviews/structtreeview.cpp:115
+msgid "Open Subtrees"
 msgstr ""
 
-#: components/framewizard/framewizard.cpp:67
-#, fuzzy
-msgid "Enter the desired number of columns:"
-msgstr "Nifel llinellau:"
+#: treeviews/structtreeview.cpp:116
+msgid "Close Subtrees"
+msgstr ""
 
-#: components/csseditor/styleeditor.cpp:44
-msgid "Open css dialog"
+#: treeviews/structtreeview.cpp:123
+msgid "Follow Cursor"
 msgstr ""
 
-#: components/csseditor/colorrequester.cpp:63
-msgid "Open color dialog"
+#: treeviews/structtreeview.cpp:487
+msgid "Find tag"
 msgstr ""
 
-#: components/csseditor/cssselector.cpp:49
-msgid "HTML Files"
-msgstr "Ffeiliau HTML"
+#: treeviews/structtreeview.cpp:504 treeviews/structtreeview.cpp:524
+msgid "Find Tag && Open Tree"
+msgstr ""
 
-#: components/csseditor/cssselector.cpp:49
-#, fuzzy
-msgid "XHTML Files"
-msgstr "Ffeil cofnod:"
+#: treeviews/structtreeview.cpp:521 treeviews/structtreeview.cpp:549
+msgid "nothing"
+msgstr "dim"
 
-#: components/csseditor/cssselector.cpp:49
-#, fuzzy
-msgid "XML Files"
-msgstr "Ffeil cofnod:"
+#: treeviews/tagattributetree.cpp:227
+msgid "Attribute Name"
+msgstr ""
 
-#: components/csseditor/fontfamilychooser.cpp:43
-msgid "The Quick Brown Fox Jumps Over The Lazy Dog"
-msgstr "Duw a'm gwaredo, ni allaf ddianc rhag hon"
+#: components/debugger/debuggerbreakpointview.cpp:64
+#: components/debugger/variableslistview.cpp:56
+#: treeviews/tagattributetree.cpp:228
+msgid "Value"
+msgstr "Gwerth"
 
-#: components/csseditor/fontfamilychooser.cpp:84
-msgid "These are the names of the available fonts on your system"
+#: treeviews/tagattributetree.cpp:270
+msgid "Parent tags"
 msgstr ""
 
-#: components/csseditor/fontfamilychooser.cpp:85
-msgid "These are the names of the generic fonts "
+#: treeviews/tagattributetree.cpp:289
+msgid "Namespace"
 msgstr ""
 
-#: components/csseditor/fontfamilychooser.cpp:86
-msgid "These are the names of the generic fonts you have selected  "
-msgstr ""
+#: treeviews/tagattributetree.cpp:290
+msgid "prefix"
+msgstr "rhagddodiad"
 
-#: components/csseditor/fontfamilychooser.cpp:87
-msgid "Click this to add a font to your style sheet"
+#: treeviews/tagattributetree.cpp:464
+msgid "Node Name"
 msgstr ""
 
-#: components/csseditor/fontfamilychooser.cpp:88
-msgid "Click this to remove a font from your style sheet"
+#: treeviews/tagattributetree.cpp:468
+msgid "Delete Tag"
 msgstr ""
 
-#: components/csseditor/fontfamilychooser.cpp:89
-msgid "Click this to make the font more preferable than the preceeding one"
+#: treeviews/tagattributetree.cpp:472
+msgid "Delete the current tag only."
 msgstr ""
 
-#: components/csseditor/fontfamilychooser.cpp:90
-msgid "Click this to make the font less preferable than the following one"
+#: treeviews/tagattributetree.cpp:478
+msgid "Delete the current tag and all its children."
 msgstr ""
 
-#: components/csseditor/stylesheetparser.cpp:22
-msgid "has not been closed"
+#: treeviews/tagattributetree.cpp:518
+msgid "Current tag: <b>%1</b>"
 msgstr ""
 
-#: components/csseditor/stylesheetparser.cpp:23
-msgid "needs an opening parenthesis "
+#: treeviews/tagattributetree.cpp:522
+msgid "Current tag: <b>text</b>"
 msgstr ""
 
-#: components/csseditor/stylesheetparser.cpp:85
-#, fuzzy
-msgid "The comment"
-msgstr "Sylwad"
-
-#: components/csseditor/stylesheetparser.cpp:133
-#: components/csseditor/stylesheetparser.cpp:141
-#: components/csseditor/stylesheetparser.cpp:147
-msgid "The selector"
+#: treeviews/tagattributetree.cpp:524
+msgid "Current tag: <b>comment</b>"
 msgstr ""
 
-#: components/csseditor/colorslider.cpp:77
-msgid "Red"
-msgstr "Coch"
+#: treeviews/tagattributetree.cpp:526
+msgid "Current tag:"
+msgstr ""
 
-#: components/csseditor/colorslider.cpp:77
-msgid "Green"
-msgstr "Gwyrdd"
+#: project/projectupload.cpp:762 treeviews/uploadtreeview.cpp:36
+msgid "Upload"
+msgstr "Lanlwytho"
 
-#: components/csseditor/colorslider.cpp:77
-msgid "Blue"
-msgstr "Glas"
+#: components/debugger/variableslistview.cpp:58
+#: treeviews/uploadtreeview.cpp:37
+msgid "Size"
+msgstr "Maint"
 
-#: components/csseditor/propertysetter.cpp:115
-msgid "More..."
-msgstr "Mwy..."
+#: treeviews/uploadtreeview.cpp:38
+msgid "Date"
+msgstr "Dyddiad"
 
-#: components/csseditor/tlpeditors.cpp:70
-msgid ""
-"With this line edit you can insert the URI of the resource you want to reach"
+#: treeviews/filestreeview.cpp:104 treeviews/filestreeview.cpp:121
+msgid "New Top &Folder..."
 msgstr ""
 
-#: components/csseditor/tlpeditors.cpp:74
-msgid "Open the URI selector"
+#: treeviews/filestreeview.cpp:105 treeviews/filestreeview.cpp:228
+msgid "&Add Folder to Top"
 msgstr ""
 
-#: components/csseditor/tlpeditors.cpp:114
-#, fuzzy
-msgid "Image Files"
-msgstr "&Delweddau :"
-
-#: components/csseditor/tlpeditors.cpp:120
+#: treeviews/filestreeview.cpp:112
 #, fuzzy
-msgid "Audio Files"
-msgstr "Ffeil cofnod:"
+msgid "&Change Alias..."
+msgstr "&Cadw Fel..."
 
-#: components/csseditor/tlpeditors.cpp:154
-msgid "With this line edit you can insert the name of the font you want to use"
+#: treeviews/filestreeview.cpp:123
+msgid "Files Tree"
 msgstr ""
 
-#: components/csseditor/tlpeditors.cpp:156
-msgid "Font family:"
-msgstr "Teulu wynebfathau :"
+#: treeviews/filestreeview.cpp:153
+msgid "Root Folder"
+msgstr "Plygell Wraidd"
 
-#: components/csseditor/tlpeditors.cpp:158
-msgid "Open font family chooser"
+#: treeviews/filestreeview.cpp:158
+msgid "Home Folder"
+msgstr "Plygell Cartref"
+
+#: treeviews/filestreeview.cpp:216
+msgid "Remove From &Top"
 msgstr ""
 
-#: components/cvsservice/cvsservice.cpp:50
-msgid "&Commit..."
-msgstr "&Cyflwyno ..."
+#: treeviews/filestreeview.cpp:258 treeviews/filestreeview.cpp:283
+msgid "Set Alias"
+msgstr ""
 
-#: components/cvsservice/cvsservice.cpp:55
-msgid "Update &To"
+#: treeviews/filestreeview.cpp:258 treeviews/filestreeview.cpp:283
+#: treeviews/filestreeview.cpp:319
+msgid "Alternative folder name:"
 msgstr ""
 
-#: components/cvsservice/cvsservice.cpp:56
-#, fuzzy
-msgid "&Tag/Date..."
-msgstr "Tabl..."
+#: treeviews/filestreeview.cpp:264 treeviews/filestreeview.cpp:290
+#: treeviews/filestreeview.cpp:327
+msgid "<qt><b>%1</b> is already a toplevel entry.</qt>"
+msgstr ""
 
-#: components/cvsservice/cvsservice.cpp:58
-msgid "&HEAD"
+#: treeviews/filestreeview.cpp:277
+msgid "Choose Local or Remote Folder"
 msgstr ""
 
-#: components/cvsservice/cvsservice.cpp:60
-msgid "Re&vert"
-msgstr "&Dychwelyd"
+#: treeviews/filestreeview.cpp:319
+msgid "Change Alias"
+msgstr ""
 
-#: components/cvsservice/cvsservice.cpp:63
-msgid "&Add to Repository..."
+#: treeviews/structtreetag.cpp:119
+msgid ""
+"Line %1: %2 is not a possible child of %3.\n"
 msgstr ""
 
-#: components/cvsservice/cvsservice.cpp:65
-msgid "&Remove From Repository..."
+#: treeviews/structtreetag.cpp:132
+msgid "Line %1, column %2: Closing tag for %3 is missing."
 msgstr ""
 
-#: components/cvsservice/cvsservice.cpp:67
-msgid "&Ignore in CVS Operations"
+#: treeviews/structtreetag.cpp:137
+msgid "Line %1, column %2: %3 is not part of %4."
 msgstr ""
 
-#: components/cvsservice/cvsservice.cpp:69
-msgid "Do &Not Ignore in CVS Operations"
+#: treeviews/structtreetag.cpp:164
+msgid "Empty tag"
 msgstr ""
 
-#: components/cvsservice/cvsservice.cpp:73
-#, fuzzy
-msgid "Show &Log Messages"
-msgstr "Negeseuon"
+#: treeviews/structtreetag.cpp:185
+msgid "Line %1, column %2: Opening tag for %3 is missing."
+msgstr ""
 
-#: components/cvsservice/cvsservice.cpp:140
-msgid "Running CVS update..."
+#: treeviews/scripttreeview.cpp:72
+msgid "Global Scripts"
 msgstr ""
 
-#: components/cvsservice/cvsservice.cpp:179
-msgid "Updating to revision %1 ..."
+#: treeviews/scripttreeview.cpp:78
+msgid "Local Scripts"
 msgstr ""
 
-#: components/cvsservice/cvsservice.cpp:183
-msgid "Updating to the version from %1 ..."
+#: treeviews/scripttreeview.cpp:87
+msgid "&Description"
+msgstr "&Disgrifiad"
+
+#: treeviews/scripttreeview.cpp:88
+#, fuzzy
+msgid "&Run Script"
+msgstr "Sgript"
+
+#: treeviews/scripttreeview.cpp:90
+#, fuzzy
+msgid "&Edit Script"
+msgstr "&Sgriptiau :"
+
+#: treeviews/scripttreeview.cpp:91
+msgid "Edit in &Quanta"
 msgstr ""
 
-#: components/cvsservice/cvsservice.cpp:221
-msgid "Updating to HEAD..."
+#: treeviews/scripttreeview.cpp:92
+#, fuzzy
+msgid "Edi&t Description"
+msgstr "&Disgrifiad:"
+
+#: treeviews/scripttreeview.cpp:94
+#, fuzzy
+msgid "&Assign Action"
+msgstr "Gweithred &Newydd"
+
+#: treeviews/scripttreeview.cpp:95
+#, fuzzy
+msgid "&Send in Email..."
+msgstr "Canfod mewn Ffeiliau ..."
+
+#: treeviews/scripttreeview.cpp:96
+#, fuzzy
+msgid "&Upload Script..."
+msgstr "&Lanlwytho"
+
+#: treeviews/scripttreeview.cpp:99
+msgid "&Download Script..."
 msgstr ""
 
-#: components/cvsservice/cvsservice.cpp:256
-msgid "Current"
-msgstr "Cyfredol"
+#: treeviews/scripttreeview.cpp:272
+msgid "Send script in email"
+msgstr ""
 
-#: components/cvsservice/cvsservice.cpp:266
-msgid "Running CVS commit..."
+#: treeviews/scripttreeview.cpp:274
+msgid ""
+"Hi,\n"
+" This is a Quanta Plus [http://quanta.kdewebdev.org] script tarball.\n"
+"\n"
+"Have fun.\n"
 msgstr ""
 
-#: components/cvsservice/cvsservice.cpp:301
-msgid "Reverting to the version from the repository..."
+#: treeviews/scripttreeview.cpp:287
+msgid "Quanta Plus Script"
 msgstr ""
 
-#: components/cvsservice/cvsservice.cpp:333
-msgid "Add the following files to repository?"
+#: parsers/parsercommon.cpp:177
+msgid "%1 block"
 msgstr ""
 
-#: components/cvsservice/cvsservice.cpp:333
-msgid "CVS Add"
+#: parsers/dtd/dtd.cpp:127 parsers/dtd/dtdparser.cpp:78
+msgid "<qt>Cannot download the DTD from <b>%1</b>.</qt>"
 msgstr ""
 
-#: components/cvsservice/cvsservice.cpp:336
-msgid "Adding file to the repository..."
+#: components/debugger/debuggervariable.cpp:174 parsers/dtd/dtdparser.cpp:84
+msgid "Unknown"
+msgstr "Anhysbys"
+
+#: parsers/dtd/dtdparser.cpp:105
+msgid ""
+"<qt>Error while parsing the DTD."
+"<br>The error message is:"
+"<br><i>%1</i></qt>"
 msgstr ""
 
-#: components/cvsservice/cvsservice.cpp:368
+#: parsers/dtd/dtdparser.cpp:157
 msgid ""
-"<qt>Remove the following files from the repository?"
-"<br>This will remove your <b>working copy</b> as well.</qt>"
+"<qt>Cannot create the "
+"<br><b>%1</b> file."
+"<br>Check that you have write permission in the parent folder.</qt>"
 msgstr ""
 
-#: components/cvsservice/cvsservice.cpp:368
-#, fuzzy
-msgid "CVS Remove"
-msgstr "Gwaredu..."
+#: parsers/dtd/dtdparser.cpp:169
+msgid "No elements were found in the DTD."
+msgstr ""
 
-#: components/cvsservice/cvsservice.cpp:371
-msgid "Removing files from the repository..."
+#: dialogs/settings/abbreviation.cpp:95
+msgid "New Abbreviation Group"
 msgstr ""
 
-#: components/cvsservice/cvsservice.cpp:395
-msgid "Showing CVS log..."
+#: dialogs/settings/abbreviation.cpp:95
+msgid "Group name:"
+msgstr "Enw'r grwp:"
+
+#: dialogs/settings/abbreviation.cpp:100
+msgid ""
+"<qt>There is already an abbreviation group called <b>%1</b>"
+". Choose an unique name for the new group.</qt>"
 msgstr ""
 
-#: components/cvsservice/cvsservice.cpp:433
-msgid "\"%1\" is already in the CVS ignore list."
+#: dialogs/settings/abbreviation.cpp:100
+msgid "Group already exists"
 msgstr ""
 
-#: components/cvsservice/cvsservice.cpp:441
-msgid "\"%1\" added to the CVS ignore list."
+#: dialogs/settings/abbreviation.cpp:118
+msgid "Add DTEP"
 msgstr ""
 
-#: components/cvsservice/cvsservice.cpp:480
-msgid "\"%1\" is not in the CVS ignore list."
+#: dialogs/settings/abbreviation.cpp:119
+msgid "Select a DTEP:"
 msgstr ""
 
-#: components/cvsservice/cvsservice.cpp:489
-msgid "\"%1\" removed from the CVS ignore list."
+#: dialogs/settings/abbreviation.cpp:145
+msgid "<qt>Select a DTEP from the list before using <b>Remove</b>.</qt>"
 msgstr ""
 
-#: components/cvsservice/cvsservice.cpp:504
-msgid ""
-"<qt>The CVS command <b>%1</b> has failed. The error code was <i>%2</i>.</qt>"
+#: dialogs/settings/abbreviation.cpp:145
+msgid "No DTEP Selected"
 msgstr ""
 
-#: components/cvsservice/cvsservice.cpp:504
-msgid "Command Failed"
+#: dialogs/settings/abbreviation.cpp:190
+msgid "<qt>Do you really want to remove the <b>%1</b> template?</qt>"
 msgstr ""
 
-#: components/cvsservice/cvsservice.cpp:515
-msgid "CVS command finished."
+#: dialogs/settings/abbreviation.cpp:204
+msgid "Edit Code Template"
 msgstr ""
 
-#: components/cvsservice/cvsservice.cpp:532
+#: dialogs/settings/abbreviation.cpp:273
 msgid ""
-"Error: \"%1\" is not part of the\n"
-"\"%2\" repository."
+"<qt>Cannot open the file <b>%1</b> for writing.\n"
+"Modified abbreviations will be lost when you quit Quanta.</qt>"
 msgstr ""
 
-#: components/debugger/interfaces/debuggerclient.cpp:46
-msgid "The current debugger, %1, does not support the \"%2\" instruction."
+#: dialogs/dirtydlg.cpp:44
+msgid "<qt>The file <b>%1</b> was changed outside of the Quanta editor.</qt>"
 msgstr ""
 
-#: components/debugger/interfaces/debuggerclient.cpp:46
-#: components/debugger/interfaces/debuggerclient.cpp:144
-#: components/debugger/interfaces/debuggerclient.cpp:151
-#: components/debugger/interfaces/debuggerclient.cpp:157
-msgid "Unsupported Debugger Function"
+#: dialogs/actionconfigdialog.cpp:151
+msgid "&Add New Toolbar"
 msgstr ""
 
-#: components/debugger/interfaces/debuggerclient.cpp:59
-msgid "Send HTTP Request"
+#: dialogs/actionconfigdialog.cpp:152
+msgid "&Remove Toolbar"
 msgstr ""
 
-#: components/debugger/interfaces/debuggerclient.cpp:65
-msgid "Step Over"
+#: dialogs/actionconfigdialog.cpp:153
+msgid "&Edit Toolbar"
 msgstr ""
 
-#: components/debugger/interfaces/debuggerclient.cpp:72
-msgid "Step Out"
+#: dialogs/actionconfigdialog.cpp:193
+msgid "Do you really want to remove the \"%1\" toolbar?"
 msgstr ""
 
-#: components/debugger/interfaces/debuggerclient.cpp:89
-msgid "Skip"
-msgstr "Hepgor"
-
-#: components/debugger/interfaces/debuggerclient.cpp:94
-msgid "Step Into"
+#: dialogs/actionconfigdialog.cpp:269 dialogs/actionconfigdialog.cpp:782
+msgid "Do you want to save the changes made to this action?"
 msgstr ""
 
-#: components/debugger/debuggermanager.cpp:251
-#: components/debugger/interfaces/debuggerclient.cpp:99
-msgid "Kill"
-msgstr "Lladd"
-
-#: components/debugger/debuggermanager.cpp:273
-#: components/debugger/interfaces/debuggerclient.cpp:106
-#, fuzzy
-msgid "Open Profiler Output"
-msgstr "Agor Cywaith"
+#: dialogs/actionconfigdialog.cpp:765
+msgid ""
+"The '%1' key combination has already been allocated to the \"%2\" action.\n"
+"Please choose a unique key combination."
+msgstr ""
+"Mae cyfuniad bysell %1 wedi ei dyrannu yn barod i'r gweithrediad \"%2\".\n"
+" Dewiswch cyfuniad bysell unigryw."
 
-#: components/debugger/interfaces/debuggerclient.cpp:118
-msgid "Set Breakpoint"
+#: dialogs/actionconfigdialog.cpp:769
+msgid "Conflicting Shortcuts"
 msgstr ""
 
-#: components/debugger/interfaces/debuggerclient.cpp:125
-msgid "Remove Breakpoint"
+#: dialogs/actionconfigdialog.cpp:841
+msgid ""
+"<qt>Removing the action removes all the references to it.\n"
+"Are you sure you want to remove the <b>%1</b> action?</qt>"
 msgstr ""
 
-#: components/debugger/interfaces/debuggerclient.cpp:132
-msgid "%1 does not have any specific settings."
+#: dialogs/actionconfigdialog.cpp:887
+msgid "Add Action to Toolbar"
 msgstr ""
 
-#: components/debugger/interfaces/debuggerclient.cpp:132
-msgid "Settings"
-msgstr "Gosodiadau"
+#: dialogs/dtepeditdlg.cpp:63
+msgid "&Pages"
+msgstr "&Tudalennau"
 
-#: components/debugger/interfaces/debuggerclient.cpp:144
-#: components/debugger/interfaces/debuggerclient.cpp:151
-msgid "%1 does not support watches."
+#: dialogs/dtepeditdlg.cpp:206
+msgid ""
+"<qt>The file <b>%1</b> is not writable."
+"<br>Do you want to save the configuration to a different file?</qt>"
 msgstr ""
 
-#: components/debugger/interfaces/debuggerclient.cpp:157
-msgid "%1 does not support setting the value of variables."
+#: dialogs/dtepeditdlg.cpp:206
+msgid "Save to Different File"
 msgstr ""
 
-#: components/debugger/dbgp/quantadebuggerdbgp.cpp:330
-msgid "Unrecognized package: '%1%2'"
-msgstr ""
+#: dialogs/dtepeditdlg.cpp:206
+msgid "Do Not Save"
+msgstr "Peidiwch â Chadw"
 
-#: components/debugger/dbgp/quantadebuggerdbgp.cpp:342
-msgid "The debugger for %1 uses an unsupported protocol version (%2)"
+#: dialogs/dtepeditdlg.cpp:208
+#, fuzzy
+msgid "*.rc|DTEP Description"
+msgstr "Disgrifiad"
+
+#: dialogs/dtepeditdlg.cpp:208
+#, fuzzy
+msgid "Save Description As"
+msgstr "Disgrifiad:"
+
+#: dialogs/dtepeditdlg.cpp:444
+msgid "Edit Structure Group"
 msgstr ""
 
-#: components/debugger/dbgp/quantadebuggerdbgp.cpp:870
-#: components/debugger/dbgp/quantadebuggerdbgp.cpp:872
-msgid "Unable to open profiler output (%1)"
+#: dialogs/dtepeditdlg.cpp:494
+msgid "Add Structure Group"
 msgstr ""
 
-#: components/debugger/dbgp/quantadebuggerdbgp.cpp:870
-msgid "Profiler File Error"
+#: dialogs/dtepeditdlg.cpp:539
+msgid "<qt>Do you really want to delete the <b>%1</b> group?</qt>"
 msgstr ""
 
-#: components/debugger/dbgp/quantadebuggerdbgp.cpp:926
+#: dialogs/dtepeditdlg.cpp:539
 #, fuzzy
-msgid "Unable to set value of variable."
-msgstr "Wedi methu creu ffeil i lanlwytho."
+msgid "Delete Group"
+msgstr "&Dileu Gweithred"
 
-#: components/debugger/dbgp/dbgpnetwork.cpp:74
-#, fuzzy, c-format
-msgid "Listening on port %1"
-msgstr "Porth gwrando:"
+#: components/framewizard/fmfpeditor.cpp:40 dialogs/filecombo.cpp:93
+msgid "*|All Files"
+msgstr "*|Pob Ffeil"
 
-#: components/debugger/dbgp/dbgpnetwork.cpp:81
-#, c-format
-msgid "Unable to listen on port %1"
+#: dialogs/tagdialogs/tagimgdlg.cpp:107
+msgid ""
+"|Image Files\n"
+"*|All Files"
 msgstr ""
 
-#: components/debugger/dbgp/dbgpnetwork.cpp:125
-msgid "Disconnected from remote host"
+#: dialogs/tagdialogs/tagimgdlgdata.cpp:27
+msgid "Image source:"
 msgstr ""
 
-#: components/debugger/gubed/quantadebuggergubed.cpp:465
-msgid "Syntax or parse error in %1)"
-msgstr ""
+#: dialogs/tagdialogs/tagimgdlgdata.cpp:46
+msgid "Width:"
+msgstr "Lled:"
 
-#: components/debugger/gubed/quantadebuggergubed.cpp:482
-msgid "Error occurred: Line %1, Code %2 (%3) in  %4"
+#: dialogs/tagdialogs/tagimgdlgdata.cpp:58
+msgid "Height:"
+msgstr "Taldra:"
+
+#: dialogs/tagdialogs/tagimgdlgdata.cpp:74
+msgid "HSpace:"
 msgstr ""
 
-#: components/debugger/gubed/quantadebuggergubed.cpp:502
-msgid "Breakpoint reached"
+#: dialogs/tagdialogs/tagimgdlgdata.cpp:85
+msgid "VSpace:"
 msgstr ""
 
-#: components/debugger/gubed/quantadebuggergubed.cpp:509
-msgid "Conditional breakpoint fulfilled"
+#: dialogs/tagdialogs/tagimgdlgdata.cpp:93
+msgid "Alternate text:"
 msgstr ""
 
-#: components/debugger/gubed/quantadebuggergubed.cpp:519
-#, c-format
-msgid "Established connection to %1"
+#: dialogs/tagdialogs/tagimgdlgdata.cpp:103
+msgid "Border:"
+msgstr "Ymyl:"
+
+#: dialogs/tagdialogs/tagimgdlgdata.cpp:115
+msgid "Align:"
+msgstr "Alinio:"
+
+#: dialogs/tagdialogs/tagdialog.cpp:127 dialogs/tagdialogs/tagdialog.cpp:146
+#: dialogs/tagdialogs/tagdialog.cpp:345 dialogs/tagdialogs/tagdialog.cpp:427
+msgid "Unknown tag"
 msgstr ""
 
-#: components/debugger/gubed/quantadebuggergubed.cpp:560
-msgid ""
-"The script being debugged does not communicate with the correct protocol "
-"version"
+#: dialogs/tagdialogs/tagdialog.cpp:138
+msgid "Tag Properties: "
 msgstr ""
 
-#: components/debugger/gubed/quantadebuggergubed.cpp:1136
-msgid "False"
-msgstr "Ffug"
+#: dialogs/tagdialogs/tagquicklistdlgdata.cpp:27
+msgid "Rows:"
+msgstr "Rhesi:"
 
-#: components/debugger/gubed/quantadebuggergubed.cpp:1136
-msgid "True"
-msgstr "Gwir"
+#: dialogs/tagdialogs/tagquicklistdlgdata.cpp:55
+msgid "Ordered"
+msgstr ""
 
-#: components/debugger/gubed/quantadebuggergubed.cpp:1145
-#: components/debugger/gubed/quantadebuggergubed.cpp:1230
-msgid "<Undefined>"
-msgstr "<Anniffinir>"
+#: dialogs/tagdialogs/tagquicklistdlgdata.cpp:61
+msgid "Unordered"
+msgstr ""
 
-#: components/debugger/gubed/quantadebuggergubed.cpp:1234
-msgid "<Error>"
-msgstr "<Gwall>"
+#: dialogs/tagdialogs/colorcombo.cpp:178 dialogs/tagdialogs/colorcombo.cpp:232
+msgid "Custom..."
+msgstr "Addasu ..."
 
-#: components/debugger/gubed/quantadebuggergubed.cpp:1239
-msgid "<Unimplemented type>"
+#: dialogs/tagdialogs/tagmaildlg.cpp:96
+msgid "Select Address"
+msgstr "Dewis Cyfeiriad"
+
+#: dialogs/tagdialogs/tagmaildlg.cpp:104
+msgid "No addresses found."
 msgstr ""
 
-#: components/debugger/debuggerbreakpointview.cpp:64
-#: components/debugger/variableslistview.cpp:56
-#: treeviews/tagattributetree.cpp:228
-msgid "Value"
-msgstr "Gwerth"
+#: components/framewizard/fmfpeditor.cpp:36
+msgid "*.html *.htm|HTML Files"
+msgstr ""
 
-#: components/debugger/variableslistview.cpp:58
-#: treeviews/uploadtreeview.cpp:37
-msgid "Size"
-msgstr "Maint"
+#: components/framewizard/fmfpeditor.cpp:37
+msgid "*.php|PHP Files"
+msgstr ""
 
-#: components/debugger/variableslistview.cpp:66
-msgid "&Set Value"
+#: components/framewizard/fmfpeditor.cpp:38
+msgid "*.xml|XML Files"
 msgstr ""
 
-#: components/debugger/variableslistview.cpp:68
-msgid "&Dump in Messages Log"
+#: components/framewizard/fmfpeditor.cpp:39
+msgid "*xhtml|XHTML Files"
 msgstr ""
 
-#: components/debugger/variableslistview.cpp:70
-msgid "&Copy to Clipboard"
-msgstr "&Copïo i'r Gludfwrdd"
+#: components/framewizard/framewizard.cpp:28
+msgid "You must select an area."
+msgstr ""
 
-#: components/debugger/variableslistview.cpp:262
-msgid "Set Variable"
+#: components/framewizard/framewizard.cpp:29
+msgid "Before editing a frame you must save the file."
 msgstr ""
 
-#: components/debugger/variableslistview.cpp:277
-msgid ""
-"Contents of variable %1:\n"
-">>>\n"
+#: components/framewizard/framewizard.cpp:62
+msgid "Enter the desired number of rows:"
 msgstr ""
 
+#: components/framewizard/framewizard.cpp:67
+#, fuzzy
+msgid "Enter the desired number of columns:"
+msgstr "Nifel llinellau:"
+
+#: components/debugger/backtracelistview.cpp:60
+#: components/debugger/debuggerbreakpointview.cpp:63
+msgid "Line"
+msgstr "Llinell"
+
+#: components/debugger/backtracelistview.cpp:87
+msgid "Eval"
+msgstr "Eval"
+
 #: components/debugger/debuggermanager.cpp:111 project/projectprivate.cpp:1535
 msgid ""
 "<qt>Unable to load the debugger plugin, error code %1 was returned: <b>%2</b>"
@@ -11258,6 +12132,11 @@ msgid ""
 "being debugged, it will start in paused mode when started"
 msgstr ""
 
+#: components/debugger/debuggermanager.cpp:251
+#: components/debugger/interfaces/debuggerclient.cpp:99
+msgid "Kill"
+msgstr "Lladd"
+
 #: components/debugger/debuggermanager.cpp:252
 msgid "Kills the currently running script"
 msgstr ""
@@ -11293,6 +12172,12 @@ msgstr ""
 msgid "Changes the value of a variable"
 msgstr ""
 
+#: components/debugger/debuggermanager.cpp:273
+#: components/debugger/interfaces/debuggerclient.cpp:106
+#, fuzzy
+msgid "Open Profiler Output"
+msgstr "Agor Cywaith"
+
 #: components/debugger/debuggermanager.cpp:274
 msgid "Opens the profiler output file"
 msgstr ""
@@ -11309,6 +12194,62 @@ msgstr ""
 msgid "Unable to open file %1, check your basedirs and mappings."
 msgstr ""
 
+#: components/debugger/interfaces/debuggerclient.cpp:46
+msgid "The current debugger, %1, does not support the \"%2\" instruction."
+msgstr ""
+
+#: components/debugger/interfaces/debuggerclient.cpp:46
+#: components/debugger/interfaces/debuggerclient.cpp:144
+#: components/debugger/interfaces/debuggerclient.cpp:151
+#: components/debugger/interfaces/debuggerclient.cpp:157
+msgid "Unsupported Debugger Function"
+msgstr ""
+
+#: components/debugger/interfaces/debuggerclient.cpp:59
+msgid "Send HTTP Request"
+msgstr ""
+
+#: components/debugger/interfaces/debuggerclient.cpp:65
+msgid "Step Over"
+msgstr ""
+
+#: components/debugger/interfaces/debuggerclient.cpp:72
+msgid "Step Out"
+msgstr ""
+
+#: components/debugger/interfaces/debuggerclient.cpp:89
+msgid "Skip"
+msgstr "Hepgor"
+
+#: components/debugger/interfaces/debuggerclient.cpp:94
+msgid "Step Into"
+msgstr ""
+
+#: components/debugger/interfaces/debuggerclient.cpp:118
+msgid "Set Breakpoint"
+msgstr ""
+
+#: components/debugger/interfaces/debuggerclient.cpp:125
+msgid "Remove Breakpoint"
+msgstr ""
+
+#: components/debugger/interfaces/debuggerclient.cpp:132
+msgid "%1 does not have any specific settings."
+msgstr ""
+
+#: components/debugger/interfaces/debuggerclient.cpp:132
+msgid "Settings"
+msgstr "Gosodiadau"
+
+#: components/debugger/interfaces/debuggerclient.cpp:144
+#: components/debugger/interfaces/debuggerclient.cpp:151
+msgid "%1 does not support watches."
+msgstr ""
+
+#: components/debugger/interfaces/debuggerclient.cpp:157
+msgid "%1 does not support setting the value of variables."
+msgstr ""
+
 #: components/debugger/debuggervariable.cpp:109
 msgid "Non scalar value"
 msgstr ""
@@ -11349,18 +12290,53 @@ msgstr "Boolaidd"
 msgid "Undefined"
 msgstr "Anniffiniedig"
 
-#: components/debugger/debuggervariable.cpp:174 parsers/dtd/dtdparser.cpp:84
-msgid "Unknown"
-msgstr "Anhysbys"
+#: components/debugger/gubed/quantadebuggergubed.cpp:465
+msgid "Syntax or parse error in %1)"
+msgstr ""
 
-#: components/debugger/backtracelistview.cpp:60
-#: components/debugger/debuggerbreakpointview.cpp:63
-msgid "Line"
-msgstr "Llinell"
+#: components/debugger/gubed/quantadebuggergubed.cpp:482
+msgid "Error occurred: Line %1, Code %2 (%3) in  %4"
+msgstr ""
 
-#: components/debugger/backtracelistview.cpp:87
-msgid "Eval"
-msgstr "Eval"
+#: components/debugger/gubed/quantadebuggergubed.cpp:502
+msgid "Breakpoint reached"
+msgstr ""
+
+#: components/debugger/gubed/quantadebuggergubed.cpp:509
+msgid "Conditional breakpoint fulfilled"
+msgstr ""
+
+#: components/debugger/gubed/quantadebuggergubed.cpp:519
+#, c-format
+msgid "Established connection to %1"
+msgstr ""
+
+#: components/debugger/gubed/quantadebuggergubed.cpp:560
+msgid ""
+"The script being debugged does not communicate with the correct protocol "
+"version"
+msgstr ""
+
+#: components/debugger/gubed/quantadebuggergubed.cpp:1136
+msgid "False"
+msgstr "Ffug"
+
+#: components/debugger/gubed/quantadebuggergubed.cpp:1136
+msgid "True"
+msgstr "Gwir"
+
+#: components/debugger/gubed/quantadebuggergubed.cpp:1145
+#: components/debugger/gubed/quantadebuggergubed.cpp:1230
+msgid "<Undefined>"
+msgstr "<Anniffinir>"
+
+#: components/debugger/gubed/quantadebuggergubed.cpp:1234
+msgid "<Error>"
+msgstr "<Gwall>"
+
+#: components/debugger/gubed/quantadebuggergubed.cpp:1239
+msgid "<Unimplemented type>"
+msgstr ""
 
 #: components/debugger/debuggerui.cpp:46
 msgid "Variables"
@@ -11422,1374 +12398,700 @@ msgstr ""
 msgid "On breakpoint"
 msgstr ""
 
-#: components/debugger/debuggerbreakpointview.cpp:59
-msgid "Expression"
-msgstr "Mynegiant"
-
-#: components/tableeditor/tableeditor.cpp:55
-msgid "&Edit Cell Properties"
-msgstr ""
-
-#: components/tableeditor/tableeditor.cpp:56
-msgid "Edit &Row Properties"
-msgstr ""
-
-#: components/tableeditor/tableeditor.cpp:59
-msgid "Merge Cells"
-msgstr "Uno Celloedd"
-
-#: components/tableeditor/tableeditor.cpp:60
-msgid "Break Merging"
-msgstr ""
-
-#: components/tableeditor/tableeditor.cpp:63
-msgid "&Insert Row"
-msgstr "&Mewnosod Rhes"
-
-#: components/tableeditor/tableeditor.cpp:64
-msgid "Insert Co&lumn"
-msgstr "Mewnosod &Colofn"
-
-#: components/tableeditor/tableeditor.cpp:65
-msgid "Remove Row"
-msgstr "Gwaredu Rhes"
-
-#: components/tableeditor/tableeditor.cpp:66
-msgid "Remove Column"
-msgstr "Gwaredu Colofn"
-
-#: components/tableeditor/tableeditor.cpp:68
-msgid "Edit &Table Properties"
-msgstr ""
-
-#: components/tableeditor/tableeditor.cpp:69
-msgid "Edit Child Table"
-msgstr ""
-
-#: components/tableeditor/tableeditor.cpp:207
-#, c-format
-msgid "Edit col: %1"
-msgstr ""
-
-#: components/tableeditor/tableeditor.cpp:414
-#: components/tableeditor/tableeditor.cpp:454
-#: components/tableeditor/tableeditor.cpp:499
-#: components/tableeditor/tableeditor.cpp:1063
-msgid "Merged with (%1, %2)."
-msgstr ""
-
-#: components/tableeditor/tableeditor.cpp:1168
-#: components/tableeditor/tableeditor.cpp:1189
-msgid ""
-"Cannot edit the child table; you probably modified the cell containing the "
-"table manually."
-msgstr ""
-
-#: components/tableeditor/tableeditor.cpp:1204
-msgid ""
-"Cannot find the closing tag of the child table; you have probably introduced "
-"unclosed tags in the table and have broken its consistency."
-msgstr ""
-
-#: treeviews/filestreeview.cpp:87 treeviews/projecttreeview.cpp:128
-#: treeviews/servertreeview.cpp:103 treeviews/templatestreeview.cpp:147
-msgid "&Open"
-msgstr "A&gor"
-
-#: treeviews/filestreeview.cpp:88 treeviews/projecttreeview.cpp:130
-msgid "Insert &Tag"
-msgstr ""
-
-#: treeviews/filestreeview.cpp:89 treeviews/projecttreeview.cpp:131
-#: treeviews/servertreeview.cpp:105 treeviews/templatestreeview.cpp:151
-msgid "Clos&e"
-msgstr "C&au"
-
-#: treeviews/filestreeview.cpp:91 treeviews/filestreeview.cpp:109
-#: treeviews/templatestreeview.cpp:150 treeviews/templatestreeview.cpp:164
-msgid "&Insert in Project..."
+#: components/debugger/dbgp/quantadebuggerdbgp.cpp:330
+msgid "Unrecognized package: '%1%2'"
 msgstr ""
 
-#: treeviews/filestreeview.cpp:93 treeviews/filestreeview.cpp:113
-#: treeviews/projecttreeview.cpp:135 treeviews/projecttreeview.cpp:153
-#: treeviews/servertreeview.cpp:110 treeviews/servertreeview.cpp:120
-msgid "Re&name"
-msgstr "Ai&l-enwi"
-
-#: treeviews/filestreeview.cpp:96 treeviews/filestreeview.cpp:116
-#: treeviews/projecttreeview.cpp:140 treeviews/projecttreeview.cpp:159
-#: treeviews/servertreeview.cpp:112 treeviews/servertreeview.cpp:122
-#: treeviews/templatestreeview.cpp:156 treeviews/templatestreeview.cpp:170
-msgid "&Properties"
-msgstr "&Priodweddau"
-
-#: treeviews/filestreeview.cpp:99 treeviews/projecttreeview.cpp:143
-msgid "F&older..."
-msgstr "P&lygell ..."
-
-#: treeviews/filestreeview.cpp:100 treeviews/projecttreeview.cpp:144
-msgid "&File..."
-msgstr "&Ffeil..."
-
-#: treeviews/filestreeview.cpp:104 treeviews/filestreeview.cpp:121
-msgid "New Top &Folder..."
+#: components/debugger/dbgp/quantadebuggerdbgp.cpp:342
+msgid "The debugger for %1 uses an unsupported protocol version (%2)"
 msgstr ""
 
-#: treeviews/filestreeview.cpp:105 treeviews/filestreeview.cpp:228
-msgid "&Add Folder to Top"
+#: components/debugger/dbgp/quantadebuggerdbgp.cpp:870
+#: components/debugger/dbgp/quantadebuggerdbgp.cpp:872
+msgid "Unable to open profiler output (%1)"
 msgstr ""
 
-#: treeviews/filestreeview.cpp:106 treeviews/projecttreeview.cpp:152
-msgid "Create Site &Template..."
+#: components/debugger/dbgp/quantadebuggerdbgp.cpp:870
+msgid "Profiler File Error"
 msgstr ""
 
-#: treeviews/filestreeview.cpp:107 treeviews/projecttreeview.cpp:148
-#: treeviews/projecttreeview.cpp:162
-msgid "&Create New"
-msgstr "&Creu Newydd"
-
-#: treeviews/filestreeview.cpp:112
+#: components/debugger/dbgp/quantadebuggerdbgp.cpp:926
 #, fuzzy
-msgid "&Change Alias..."
-msgstr "&Cadw Fel..."
-
-#: treeviews/filestreeview.cpp:123
-msgid "Files Tree"
-msgstr ""
-
-#: treeviews/filestreeview.cpp:153
-msgid "Root Folder"
-msgstr "Plygell Wraidd"
+msgid "Unable to set value of variable."
+msgstr "Wedi methu creu ffeil i lanlwytho."
 
-#: treeviews/filestreeview.cpp:158
-msgid "Home Folder"
-msgstr "Plygell Cartref"
+#: components/debugger/dbgp/dbgpnetwork.cpp:74
+#, fuzzy, c-format
+msgid "Listening on port %1"
+msgstr "Porth gwrando:"
 
-#: treeviews/filestreeview.cpp:216
-msgid "Remove From &Top"
+#: components/debugger/dbgp/dbgpnetwork.cpp:81
+#, c-format
+msgid "Unable to listen on port %1"
 msgstr ""
 
-#: treeviews/filestreeview.cpp:258 treeviews/filestreeview.cpp:283
-msgid "Set Alias"
+#: components/debugger/dbgp/dbgpnetwork.cpp:125
+msgid "Disconnected from remote host"
 msgstr ""
 
-#: treeviews/filestreeview.cpp:258 treeviews/filestreeview.cpp:283
-#: treeviews/filestreeview.cpp:319
-msgid "Alternative folder name:"
-msgstr ""
+#: components/debugger/debuggerbreakpointview.cpp:59
+msgid "Expression"
+msgstr "Mynegiant"
 
-#: treeviews/filestreeview.cpp:264 treeviews/filestreeview.cpp:290
-#: treeviews/filestreeview.cpp:327
-msgid "<qt><b>%1</b> is already a toplevel entry.</qt>"
+#: components/debugger/variableslistview.cpp:66
+msgid "&Set Value"
 msgstr ""
 
-#: treeviews/filestreeview.cpp:277
-msgid "Choose Local or Remote Folder"
+#: components/debugger/variableslistview.cpp:68
+msgid "&Dump in Messages Log"
 msgstr ""
 
-#: treeviews/filestreeview.cpp:299 treeviews/filestreeview.cpp:301
-#: treeviews/projecttreeview.cpp:653 treeviews/projecttreeview.cpp:655
-#: treeviews/projecttreeview.cpp:657
-msgid "C&VS"
-msgstr ""
+#: components/debugger/variableslistview.cpp:70
+msgid "&Copy to Clipboard"
+msgstr "&Copïo i'r Gludfwrdd"
 
-#: treeviews/filestreeview.cpp:319
-msgid "Change Alias"
+#: components/debugger/variableslistview.cpp:262
+msgid "Set Variable"
 msgstr ""
 
-#: treeviews/structtreetag.cpp:119
+#: components/debugger/variableslistview.cpp:277
 msgid ""
-"Line %1: %2 is not a possible child of %3.\n"
-msgstr ""
-
-#: treeviews/structtreetag.cpp:132
-msgid "Line %1, column %2: Closing tag for %3 is missing."
-msgstr ""
-
-#: treeviews/structtreetag.cpp:137
-msgid "Line %1, column %2: %3 is not part of %4."
-msgstr ""
-
-#: treeviews/structtreetag.cpp:164
-msgid "Empty tag"
-msgstr ""
-
-#: treeviews/structtreetag.cpp:185
-msgid "Line %1, column %2: Opening tag for %3 is missing."
+"Contents of variable %1:\n"
+">>>\n"
 msgstr ""
 
-#: treeviews/templatestreeview.cpp:73
-msgid "Insert as &Text"
-msgstr ""
+#: components/cvsservice/cvsservice.cpp:50
+msgid "&Commit..."
+msgstr "&Cyflwyno ..."
 
-#: treeviews/templatestreeview.cpp:74
-msgid "Insert &Link to File"
+#: components/cvsservice/cvsservice.cpp:55
+msgid "Update &To"
 msgstr ""
 
-#: treeviews/templatestreeview.cpp:75
-msgid "&New Document Based on This"
-msgstr ""
+#: components/cvsservice/cvsservice.cpp:56
+#, fuzzy
+msgid "&Tag/Date..."
+msgstr "Tabl..."
 
-#: treeviews/templatestreeview.cpp:76
-msgid "&Extract Site Template To..."
+#: components/cvsservice/cvsservice.cpp:58
+msgid "&HEAD"
 msgstr ""
 
-#: treeviews/templatestreeview.cpp:135 treeviews/templatestreeview.cpp:139
-msgid "Text Snippet"
-msgstr ""
+#: components/cvsservice/cvsservice.cpp:60
+msgid "Re&vert"
+msgstr "&Dychwelyd"
 
-#: treeviews/templatestreeview.cpp:136 treeviews/templatestreeview.cpp:140
-msgid "Binary File"
+#: components/cvsservice/cvsservice.cpp:63
+msgid "&Add to Repository..."
 msgstr ""
 
-#: treeviews/templatestreeview.cpp:137 treeviews/templatestreeview.cpp:141
-msgid "Document Template"
+#: components/cvsservice/cvsservice.cpp:65
+msgid "&Remove From Repository..."
 msgstr ""
 
-#: treeviews/templatestreeview.cpp:138 treeviews/templatestreeview.cpp:142
-msgid "Site Template"
+#: components/cvsservice/cvsservice.cpp:67
+msgid "&Ignore in CVS Operations"
 msgstr ""
 
-#: treeviews/templatestreeview.cpp:148 treeviews/templatestreeview.cpp:161
-msgid "Send in E&mail..."
+#: components/cvsservice/cvsservice.cpp:69
+msgid "Do &Not Ignore in CVS Operations"
 msgstr ""
 
-#: treeviews/templatestreeview.cpp:149 treeviews/templatestreeview.cpp:162
+#: components/cvsservice/cvsservice.cpp:73
 #, fuzzy
-msgid "&Upload Template..."
-msgstr "&Lanlwytho"
-
-#: treeviews/templatestreeview.cpp:160
-msgid "&New Folder..."
-msgstr "&Plygell Newydd"
+msgid "Show &Log Messages"
+msgstr "Negeseuon"
 
-#: treeviews/templatestreeview.cpp:163 treeviews/templatestreeview.cpp:174
-msgid "&Download Template..."
+#: components/cvsservice/cvsservice.cpp:140
+msgid "Running CVS update..."
 msgstr ""
 
-#: treeviews/templatestreeview.cpp:177
-msgid "Group"
-msgstr "Gr?p"
-
-#: treeviews/templatestreeview.cpp:211
-msgid "Global Templates"
+#: components/cvsservice/cvsservice.cpp:179
+msgid "Updating to revision %1 ..."
 msgstr ""
 
-#: treeviews/templatestreeview.cpp:215
-msgid "Local Templates"
+#: components/cvsservice/cvsservice.cpp:183
+msgid "Updating to the version from %1 ..."
 msgstr ""
 
-#: treeviews/templatestreeview.cpp:218
-msgid "Project Templates"
+#: components/cvsservice/cvsservice.cpp:221
+msgid "Updating to HEAD..."
 msgstr ""
 
-#: treeviews/templatestreeview.cpp:376
-msgid "Create New Template Folder"
-msgstr ""
+#: components/cvsservice/cvsservice.cpp:256
+msgid "Current"
+msgstr "Cyfredol"
 
-#: treeviews/templatestreeview.cpp:386 treeviews/templatestreeview.cpp:619
-msgid "&Inherit parent attribute (nothing)"
+#: components/cvsservice/cvsservice.cpp:266
+msgid "Running CVS commit..."
 msgstr ""
 
-#: treeviews/templatestreeview.cpp:389 treeviews/templatestreeview.cpp:622
-msgid "&Inherit parent attribute (%1)"
+#: components/cvsservice/cvsservice.cpp:301
+msgid "Reverting to the version from the repository..."
 msgstr ""
 
-#: treeviews/templatestreeview.cpp:406
-msgid ""
-"Error while creating the new folder.\n"
-"                    Maybe you do not have permission to write in the %1 folder."
+#: components/cvsservice/cvsservice.cpp:333
+msgid "Add the following files to repository?"
 msgstr ""
 
-#: treeviews/templatestreeview.cpp:458
-msgid "Save selection as template file:"
+#: components/cvsservice/cvsservice.cpp:333
+msgid "CVS Add"
 msgstr ""
 
-#: treeviews/basetreeview.cpp:1041 treeviews/templatestreeview.cpp:470
-#: utility/quantacommon.cpp:710
-msgid ""
-"<qt>The file <b>%1</b> already exists."
-"<br>Do you want to overwrite it?</qt>"
+#: components/cvsservice/cvsservice.cpp:336
+msgid "Adding file to the repository..."
 msgstr ""
 
-#: treeviews/templatestreeview.cpp:476
+#: components/cvsservice/cvsservice.cpp:368
 msgid ""
-"<qt>Could not write to file <b>%1</b>."
-"<br>Check if you have rights to write there or that your connection is "
-"working.</qt>"
-msgstr ""
-
-#: treeviews/templatestreeview.cpp:565
-msgid "Quanta Template"
+"<qt>Remove the following files from the repository?"
+"<br>This will remove your <b>working copy</b> as well.</qt>"
 msgstr ""
 
-#: treeviews/templatestreeview.cpp:876
-msgid ""
-"Do you really want to delete folder \n"
-"%1 ?\n"
-msgstr ""
+#: components/cvsservice/cvsservice.cpp:368
+#, fuzzy
+msgid "CVS Remove"
+msgstr "Gwaredu..."
 
-#: treeviews/templatestreeview.cpp:878
-msgid ""
-"Do you really want to delete file \n"
-"%1 ?\n"
+#: components/cvsservice/cvsservice.cpp:371
+msgid "Removing files from the repository..."
 msgstr ""
 
-#: treeviews/templatestreeview.cpp:985
-msgid "Send template in email"
+#: components/cvsservice/cvsservice.cpp:395
+msgid "Showing CVS log..."
 msgstr ""
 
-#: treeviews/templatestreeview.cpp:987
-msgid ""
-"Hi,\n"
-" This is a Quanta Plus [http://quanta.kdewebdev.org] template tarball.\n"
-"\n"
-"Have fun.\n"
+#: components/cvsservice/cvsservice.cpp:433
+msgid "\"%1\" is already in the CVS ignore list."
 msgstr ""
 
-#: treeviews/templatestreeview.cpp:1000
-msgid "Quanta Plus Template"
+#: components/cvsservice/cvsservice.cpp:441
+msgid "\"%1\" added to the CVS ignore list."
 msgstr ""
 
-#: treeviews/templatestreeview.cpp:1031
-msgid "Target folder"
+#: components/cvsservice/cvsservice.cpp:480
+msgid "\"%1\" is not in the CVS ignore list."
 msgstr ""
 
-#: treeviews/templatestreeview.cpp:1067
-msgid ""
-"You have extracted the site template to a folder which is not under your main "
-"project folder.\n"
-"Do you want to copy the folder into the main project folder?"
+#: components/cvsservice/cvsservice.cpp:489
+msgid "\"%1\" removed from the CVS ignore list."
 msgstr ""
 
-#: treeviews/templatestreeview.cpp:1067
-#, fuzzy
-msgid "Copy Folder"
-msgstr "Plygell Wraidd"
-
-#: treeviews/templatestreeview.cpp:1067
-#, fuzzy
-msgid "Do Not Copy"
-msgstr "&Peidiwch â Chadw"
-
-#: treeviews/templatestreeview.cpp:1075
+#: components/cvsservice/cvsservice.cpp:504
 msgid ""
-"<qt>Some error happened while extracting the <i>%1</i> site template file."
-"<br>Check that you have write permission for <i>%2</i> "
-"and that there is enough free space in your temporary folder.</qt>"
-msgstr ""
-
-#: treeviews/basetreeview.cpp:630 treeviews/servertreeview.cpp:104
-msgid "Open &With..."
-msgstr "Agor &Gyda..."
-
-#: treeviews/servertreeview.cpp:125
-msgid "Upload Tree"
-msgstr ""
-
-#: treeviews/scripttreeview.cpp:73
-msgid "Global Scripts"
-msgstr ""
-
-#: treeviews/scripttreeview.cpp:79
-msgid "Local Scripts"
-msgstr ""
-
-#: treeviews/scripttreeview.cpp:88
-msgid "&Description"
-msgstr "&Disgrifiad"
-
-#: treeviews/scripttreeview.cpp:89
-#, fuzzy
-msgid "&Run Script"
-msgstr "Sgript"
-
-#: treeviews/scripttreeview.cpp:91
-#, fuzzy
-msgid "&Edit Script"
-msgstr "&Sgriptiau :"
-
-#: treeviews/scripttreeview.cpp:92
-msgid "Edit in &Quanta"
+"<qt>The CVS command <b>%1</b> has failed. The error code was <i>%2</i>.</qt>"
 msgstr ""
 
-#: treeviews/scripttreeview.cpp:93
-#, fuzzy
-msgid "Edi&t Description"
-msgstr "&Disgrifiad:"
-
-#: treeviews/scripttreeview.cpp:95
-#, fuzzy
-msgid "&Assign Action"
-msgstr "Gweithred &Newydd"
-
-#: treeviews/scripttreeview.cpp:96
-#, fuzzy
-msgid "&Send in Email..."
-msgstr "Canfod mewn Ffeiliau ..."
-
-#: treeviews/scripttreeview.cpp:97
-#, fuzzy
-msgid "&Upload Script..."
-msgstr "&Lanlwytho"
-
-#: treeviews/scripttreeview.cpp:100
-msgid "&Download Script..."
+#: components/cvsservice/cvsservice.cpp:504
+msgid "Command Failed"
 msgstr ""
 
-#: treeviews/scripttreeview.cpp:273
-msgid "Send script in email"
+#: components/cvsservice/cvsservice.cpp:515
+msgid "CVS command finished."
 msgstr ""
 
-#: treeviews/scripttreeview.cpp:275
+#: components/cvsservice/cvsservice.cpp:532
 msgid ""
-"Hi,\n"
-" This is a Quanta Plus [http://quanta.kdewebdev.org] script tarball.\n"
-"\n"
-"Have fun.\n"
-msgstr ""
-
-#: treeviews/scripttreeview.cpp:288
-msgid "Quanta Plus Script"
-msgstr ""
-
-#: project/projectupload.cpp:762 treeviews/uploadtreeview.cpp:36
-msgid "Upload"
-msgstr "Lanlwytho"
-
-#: treeviews/uploadtreeview.cpp:38
-msgid "Date"
-msgstr "Dyddiad"
-
-#: treeviews/basetreeview.cpp:438
-msgid "Quanta File Info"
+"Error: \"%1\" is not part of the\n"
+"\"%2\" repository."
 msgstr ""
 
-#: treeviews/basetreeview.cpp:497
-#, c-format
-msgid "Number of lines: %1"
-msgstr "Nifel llinellau: %1"
-
-#: treeviews/basetreeview.cpp:498
-#, c-format
-msgid "Number of images included: %1"
+#: components/tableeditor/tableeditor.cpp:55
+msgid "&Edit Cell Properties"
 msgstr ""
 
-#: treeviews/basetreeview.cpp:499
-msgid "Size of the included images: %1 bytes"
+#: components/tableeditor/tableeditor.cpp:56
+msgid "Edit &Row Properties"
 msgstr ""
 
-#: treeviews/basetreeview.cpp:500
-msgid "Total size with images: %1 bytes"
-msgstr ""
+#: components/tableeditor/tableeditor.cpp:59
+msgid "Merge Cells"
+msgstr "Uno Celloedd"
 
-#: treeviews/basetreeview.cpp:505
-msgid "Image size: %1 x %2"
+#: components/tableeditor/tableeditor.cpp:60
+msgid "Break Merging"
 msgstr ""
 
-#: treeviews/basetreeview.cpp:627
-msgid "&Other..."
-msgstr "&Eraill..."
-
-#: treeviews/basetreeview.cpp:628
-msgid "Open &With"
-msgstr "A&gor gyda"
-
-#: treeviews/basetreeview.cpp:885 treeviews/structtreeview.cpp:832
-msgid "&Move Here"
-msgstr "&Symud Yma"
+#: components/tableeditor/tableeditor.cpp:63
+msgid "&Insert Row"
+msgstr "&Mewnosod Rhes"
 
-#: treeviews/basetreeview.cpp:887 treeviews/structtreeview.cpp:833
-msgid "&Copy Here"
-msgstr "&Copïo Yma"
+#: components/tableeditor/tableeditor.cpp:64
+msgid "Insert Co&lumn"
+msgstr "Mewnosod &Colofn"
 
-#: treeviews/basetreeview.cpp:889
-msgid "&Link Here"
-msgstr "Creu Cysw&llt Yma "
+#: components/tableeditor/tableeditor.cpp:65
+msgid "Remove Row"
+msgstr "Gwaredu Rhes"
 
-#: treeviews/basetreeview.cpp:891 treeviews/structtreeview.cpp:835
-msgid "C&ancel"
-msgstr "&Diddymu"
+#: components/tableeditor/tableeditor.cpp:66
+msgid "Remove Column"
+msgstr "Gwaredu Colofn"
 
-#: treeviews/basetreeview.cpp:1135
-msgid "Create Site Template File"
+#: components/tableeditor/tableeditor.cpp:68
+msgid "Edit &Table Properties"
 msgstr ""
 
-#: treeviews/basetreeview.cpp:1143
-msgid "Templates should be saved to the local or project template folder."
+#: components/tableeditor/tableeditor.cpp:69
+msgid "Edit Child Table"
 msgstr ""
 
-#: treeviews/basetreeview.cpp:1151
-msgid "Currently you can create site templates only from local folders."
+#: components/tableeditor/tableeditor.cpp:207
+#, c-format
+msgid "Edit col: %1"
 msgstr ""
 
-#: treeviews/basetreeview.cpp:1151
-msgid "Unsupported Feature"
+#: components/tableeditor/tableeditor.cpp:414
+#: components/tableeditor/tableeditor.cpp:454
+#: components/tableeditor/tableeditor.cpp:499
+#: components/tableeditor/tableeditor.cpp:1063
+msgid "Merged with (%1, %2)."
 msgstr ""
 
-#: treeviews/basetreeview.cpp:1187
+#: components/tableeditor/tableeditor.cpp:1168
+#: components/tableeditor/tableeditor.cpp:1189
 msgid ""
-"<qt>There was an error while creating the site template tarball."
-"<br>Check that you can read the files from <i>%1</i>"
-", you have write access to <i>%2</i> and that you have enough free space in "
-"your temporary folder.</qt>"
-msgstr ""
-
-#: treeviews/basetreeview.cpp:1194 treeviews/projecttreeview.cpp:375
-msgid "Create New Folder"
-msgstr "Creu Plygell Newydd"
-
-#: treeviews/basetreeview.cpp:1194 treeviews/projecttreeview.cpp:375
-msgid "Folder name:"
+"Cannot edit the child table; you probably modified the cell containing the "
+"table manually."
 msgstr ""
 
-#: treeviews/basetreeview.cpp:1209 treeviews/projecttreeview.cpp:393
-#, fuzzy
-msgid "Create New File"
-msgstr "&Creu Plygell..."
-
-#: treeviews/basetreeview.cpp:1219 treeviews/projecttreeview.cpp:403
+#: components/tableeditor/tableeditor.cpp:1204
 msgid ""
-"<qt>Cannot create file, because a file named <b>%1</b> already exists.</qt>"
+"Cannot find the closing tag of the child table; you have probably introduced "
+"unclosed tags in the table and have broken its consistency."
 msgstr ""
 
-#: treeviews/basetreeview.cpp:1219 treeviews/projecttreeview.cpp:403
-msgid "Error Creating File"
+#: components/csseditor/styleeditor.cpp:44
+msgid "Open css dialog"
 msgstr ""
 
-#: treeviews/doctreeview.cpp:54
-msgid "Project Documentation"
-msgstr ""
+#: components/csseditor/cssselector.cpp:49
+msgid "HTML Files"
+msgstr "Ffeiliau HTML"
 
-#: treeviews/doctreeview.cpp:65
+#: components/csseditor/cssselector.cpp:49
 #, fuzzy
-msgid "&Download Documentation..."
-msgstr "Dogfenniaeth"
-
-#: treeviews/tagattributetree.cpp:227
-msgid "Attribute Name"
-msgstr ""
-
-#: treeviews/tagattributetree.cpp:270
-msgid "Parent tags"
-msgstr ""
-
-#: treeviews/tagattributetree.cpp:289
-msgid "Namespace"
-msgstr ""
-
-#: treeviews/tagattributetree.cpp:290
-msgid "prefix"
-msgstr "rhagddodiad"
-
-#: treeviews/tagattributetree.cpp:464
-msgid "Node Name"
-msgstr ""
-
-#: treeviews/tagattributetree.cpp:468
-msgid "Delete Tag"
-msgstr ""
-
-#: treeviews/tagattributetree.cpp:472
-msgid "Delete the current tag only."
-msgstr ""
-
-#: treeviews/tagattributetree.cpp:478
-msgid "Delete the current tag and all its children."
-msgstr ""
-
-#: treeviews/tagattributetree.cpp:518
-msgid "Current tag: <b>%1</b>"
-msgstr ""
-
-#: treeviews/tagattributetree.cpp:522
-msgid "Current tag: <b>text</b>"
-msgstr ""
-
-#: treeviews/tagattributetree.cpp:524
-msgid "Current tag: <b>comment</b>"
-msgstr ""
-
-#: treeviews/tagattributetree.cpp:526
-msgid "Current tag:"
-msgstr ""
-
-#: treeviews/structtreeview.cpp:90
-msgid "All Present DTEP"
-msgstr ""
-
-#: treeviews/structtreeview.cpp:104 treeviews/structtreeview.cpp:109
-msgid "Show Groups For"
-msgstr ""
-
-#: treeviews/structtreeview.cpp:105 treeviews/structtreeview.cpp:122
-msgid "&Reparse"
-msgstr ""
-
-#: treeviews/structtreeview.cpp:115
-msgid "Open Subtrees"
-msgstr ""
-
-#: treeviews/structtreeview.cpp:116
-msgid "Close Subtrees"
-msgstr ""
-
-#: treeviews/structtreeview.cpp:123
-msgid "Follow Cursor"
-msgstr ""
-
-#: treeviews/structtreeview.cpp:487
-msgid "Find tag"
-msgstr ""
-
-#: treeviews/structtreeview.cpp:504 treeviews/structtreeview.cpp:524
-msgid "Find Tag && Open Tree"
-msgstr ""
-
-#: treeviews/structtreeview.cpp:521 treeviews/structtreeview.cpp:549
-msgid "nothing"
-msgstr "dim"
-
-#: treeviews/projecttreeview.cpp:62 treeviews/projecttreeview.cpp:65
-msgid "Document Base Folder"
-msgstr ""
-
-#: treeviews/projecttreeview.cpp:108
-msgid "Project Files"
-msgstr ""
-
-#: treeviews/projecttreeview.cpp:121
-msgid "&When Modified"
-msgstr ""
-
-#: treeviews/projecttreeview.cpp:122
-msgid "&Never"
-msgstr "&Byth"
-
-#: treeviews/projecttreeview.cpp:123
-msgid "&Confirm"
-msgstr "&Cadarnhau"
-
-#: treeviews/projecttreeview.cpp:129 utility/newstuff.cpp:73
-msgid "Load Toolbar"
-msgstr ""
+msgid "XHTML Files"
+msgstr "Ffeil cofnod:"
 
-#: treeviews/projecttreeview.cpp:133
+#: components/csseditor/cssselector.cpp:49
 #, fuzzy
-msgid "&Upload File..."
-msgstr "&Lanlwytho"
-
-#: treeviews/projecttreeview.cpp:134
-msgid "&Quick File Upload"
-msgstr ""
-
-#: treeviews/projecttreeview.cpp:136 treeviews/projecttreeview.cpp:154
-msgid "&Remove From Project"
-msgstr ""
-
-#: treeviews/projecttreeview.cpp:139 treeviews/projecttreeview.cpp:158
-#: treeviews/projecttreeview.cpp:169
-msgid "Upload &Status"
-msgstr ""
-
-#: treeviews/projecttreeview.cpp:150
-msgid "&Upload Folder..."
-msgstr ""
-
-#: treeviews/projecttreeview.cpp:151
-msgid "&Quick Folder Upload"
-msgstr ""
+msgid "XML Files"
+msgstr "Ffeil cofnod:"
 
-#: treeviews/projecttreeview.cpp:157
-msgid "Document-&Base Folder"
-msgstr ""
+#: components/csseditor/propertysetter.cpp:115
+msgid "More..."
+msgstr "Mwy..."
 
-#: project/projectprivate.cpp:137 treeviews/projecttreeview.cpp:164
-msgid "&Upload Project..."
+#: components/csseditor/colorrequester.cpp:63
+msgid "Open color dialog"
 msgstr ""
 
-#: treeviews/projecttreeview.cpp:165
-msgid "Re&scan Project Folder..."
+#: components/csseditor/stylesheetparser.cpp:22
+msgid "has not been closed"
 msgstr ""
 
-#: treeviews/projecttreeview.cpp:166
-msgid "Project &Properties"
+#: components/csseditor/stylesheetparser.cpp:23
+msgid "needs an opening parenthesis "
 msgstr ""
 
-#: treeviews/projecttreeview.cpp:195 treeviews/projecttreeview.cpp:289
-msgid "[local disk]"
-msgstr ""
+#: components/csseditor/stylesheetparser.cpp:85
+#, fuzzy
+msgid "The comment"
+msgstr "Sylwad"
 
-#: treeviews/projecttreeview.cpp:205 treeviews/projecttreeview.cpp:300
-msgid "No Project"
+#: components/csseditor/stylesheetparser.cpp:133
+#: components/csseditor/stylesheetparser.cpp:141
+#: components/csseditor/stylesheetparser.cpp:147
+msgid "The selector"
 msgstr ""
 
-#: treeviews/projecttreeview.cpp:428 utility/quantanetaccess.cpp:210
+#: components/csseditor/tlpeditors.cpp:70
 msgid ""
-"<qt>Do you really want to remove "
-"<br><b>%1</b>"
-"<br> from the project?</qt>"
-msgstr ""
-
-#: treeviews/projecttreeview.cpp:428 utility/quantanetaccess.cpp:210
-msgid "Remove From Project"
-msgstr ""
-
-#: utility/tagactionset.cpp:104
-msgid "Apply Source Indentation"
+"With this line edit you can insert the URI of the resource you want to reach"
 msgstr ""
 
-#: utility/tagactionset.cpp:109
-#, fuzzy
-msgid "Copy DIV Area"
-msgstr "&Copïo Yma"
-
-#: utility/tagactionset.cpp:114
-msgid "Cut DIV Area"
+#: components/csseditor/tlpeditors.cpp:74
+msgid "Open the URI selector"
 msgstr ""
 
-#: utility/tagactionset.cpp:284 utility/tagactionset.cpp:301
-msgid "Table..."
-msgstr "Tabl..."
-
-#: utility/tagactionset.cpp:285
-msgid "Insert..."
-msgstr "Mewnosod ..."
-
-#: utility/tagactionset.cpp:286
-msgid "Remove..."
-msgstr "Gwaredu..."
-
-#: utility/tagactionset.cpp:307
-#, fuzzy
-msgid "Row Above"
-msgstr "&Mewnosod Rhes"
-
-#: utility/tagactionset.cpp:313
-#, fuzzy
-msgid "Row Below"
-msgstr "&Mewnosod Rhes"
-
-#: utility/tagactionset.cpp:319
-#, fuzzy
-msgid "Column Left"
-msgstr "Mewnosod &Colofn"
-
-#: utility/tagactionset.cpp:325
-#, fuzzy
-msgid "Column Right"
-msgstr "Mewnosod &Colofn"
-
-#: utility/tagactionset.cpp:339
+#: components/csseditor/tlpeditors.cpp:114
 #, fuzzy
-msgid "Row(s)"
-msgstr "Rhesi:"
+msgid "Image Files"
+msgstr "&Delweddau :"
 
-#: utility/tagactionset.cpp:345
+#: components/csseditor/tlpeditors.cpp:120
 #, fuzzy
-msgid "Column(s)"
-msgstr "Co&lofnau:"
-
-#: utility/tagactionset.cpp:351
-msgid "Cell(s)"
-msgstr ""
+msgid "Audio Files"
+msgstr "Ffeil cofnod:"
 
-#: utility/tagactionset.cpp:357
-msgid "Cell(s) Content"
+#: components/csseditor/tlpeditors.cpp:154
+msgid "With this line edit you can insert the name of the font you want to use"
 msgstr ""
 
-#: utility/tagactionset.cpp:365
-#, fuzzy
-msgid "Merge Selected Cells"
-msgstr "Uno celloedd"
-
-#: utility/tagaction.cpp:464 utility/tagaction.cpp:718
-msgid ""
-"The \"%1\" script started.\n"
-msgstr ""
+#: components/csseditor/tlpeditors.cpp:156
+msgid "Font family:"
+msgstr "Teulu wynebfathau :"
 
-#: utility/tagaction.cpp:475 utility/tagaction.cpp:729
-msgid ""
-"<qt>There was an error running <b>%1</b>."
-"<br>Check that you have the <i>%2</i> executable installed and it is "
-"accessible.</qt>"
+#: components/csseditor/tlpeditors.cpp:158
+msgid "Open font family chooser"
 msgstr ""
 
-#: utility/tagaction.cpp:475 utility/tagaction.cpp:729
-msgid "Script Not Found"
-msgstr ""
+#: components/csseditor/fontfamilychooser.cpp:43
+msgid "The Quick Brown Fox Jumps Over The Lazy Dog"
+msgstr "Duw a'm gwaredo, ni allaf ddianc rhag hon"
 
-#: utility/tagaction.cpp:790 utility/tagaction.cpp:850
-msgid ""
-"The \"%1\" script output:\n"
+#: components/csseditor/fontfamilychooser.cpp:84
+msgid "These are the names of the available fonts on your system"
 msgstr ""
 
-#: utility/tagaction.cpp:973
-msgid "The \"%1\" script has exited."
+#: components/csseditor/fontfamilychooser.cpp:85
+msgid "These are the names of the generic fonts "
 msgstr ""
 
-#: utility/tagaction.cpp:1011
-msgid ""
-"<qt>The filtering action <b>%1</b> seems to be locked."
-"<br>Do you want to terminate it?</qt>"
+#: components/csseditor/fontfamilychooser.cpp:86
+msgid "These are the names of the generic fonts you have selected  "
 msgstr ""
 
-#: utility/tagaction.cpp:1011
-msgid "Action Not Responding"
+#: components/csseditor/fontfamilychooser.cpp:87
+msgid "Click this to add a font to your style sheet"
 msgstr ""
 
-#: utility/tagaction.cpp:1011
-#, fuzzy
-msgid "Terminate"
-msgstr "Patrymlun"
-
-#: utility/tagaction.cpp:1011
-msgid "Keep Running"
+#: components/csseditor/fontfamilychooser.cpp:88
+msgid "Click this to remove a font from your style sheet"
 msgstr ""
 
-#: utility/quantacommon.cpp:384
-msgid ""
-"<qt>Cannot create folder"
-"<br><b>%1</b>."
-"<br>Check that you have write permission in the parent folder or that the "
-"connection to"
-"<br><b>%2</b>"
-"<br> is valid.</qt>"
+#: components/csseditor/fontfamilychooser.cpp:89
+msgid "Click this to make the font more preferable than the preceeding one"
 msgstr ""
 
-#: utility/quantacommon.cpp:697
-msgid ""
-"The file type is not recognized.   Opening binary files may confuse Quanta.\n"
-" Are you sure you want to open this file?"
+#: components/csseditor/fontfamilychooser.cpp:90
+msgid "Click this to make the font less preferable than the following one"
 msgstr ""
 
-#: utility/quantacommon.cpp:699
-msgid "Unknown Type"
-msgstr "Math anhysbys"
-
-#: project/project.cpp:216 utility/quantacommon.cpp:699
-#, fuzzy
-msgid "Do Not Open"
-msgstr "&Peidiwch â Chadw"
+#: components/csseditor/colorslider.cpp:77
+msgid "Red"
+msgstr "Coch"
 
-#: utility/quantabookmarks.cpp:88
-msgid "Set &Bookmark"
-msgstr "Gosod &Tudnod"
+#: components/csseditor/colorslider.cpp:77
+msgid "Green"
+msgstr "Gwyrdd"
 
-#: utility/quantabookmarks.cpp:91
-msgid "If a line has no bookmark then add one, otherwise remove it."
-msgstr ""
+#: components/csseditor/colorslider.cpp:77
+msgid "Blue"
+msgstr "Glas"
 
-#: utility/quantabookmarks.cpp:92
-msgid "Clear &Bookmark"
+#: project/membereditdlg.cpp:35 project/project.cpp:601
+msgid "Simple Member"
 msgstr ""
 
-#: utility/quantabookmarks.cpp:95
-msgid "Clear &All Bookmarks"
+#: project/membereditdlg.cpp:36 project/project.cpp:596
+msgid "Task Leader"
 msgstr ""
 
-#: utility/quantabookmarks.cpp:98
-msgid "Remove all bookmarks of the current document."
+#: project/membereditdlg.cpp:37 project/project.cpp:585
+msgid "Team Leader"
 msgstr ""
 
-#: utility/quantabookmarks.cpp:101 utility/quantabookmarks.cpp:307
-msgid "Next Bookmark"
+#: project/membereditdlg.cpp:38 project/project.cpp:591
+msgid "Subproject Leader"
 msgstr ""
 
-#: utility/quantabookmarks.cpp:104
-msgid "Go to the next bookmark."
+#: project/membereditdlg.cpp:85
+msgid "Edit Subprojects"
 msgstr ""
 
-#: utility/quantabookmarks.cpp:107 utility/quantabookmarks.cpp:309
+#: project/membereditdlg.cpp:169
 #, fuzzy
-msgid "Previous Bookmark"
-msgstr "Golwg Offer Cynt"
-
-#: utility/quantabookmarks.cpp:110
-msgid "Go to the previous bookmark."
-msgstr ""
-
-#: utility/quantabookmarks.cpp:222
-msgid "&Next: %1 - \"%2\""
-msgstr "&Nesaf: %1 - \"%2\""
-
-#: utility/quantabookmarks.cpp:229
-msgid "&Previous: %1 - \"%2\""
-msgstr ""
-
-#: utility/toolbartabwidget.cpp:45 utility/toolbartabwidget.cpp:188
-#: utility/toolbartabwidget.cpp:307
-msgid "Toolbar Menu"
-msgstr "Dewislen Bar Offer"
-
-#: utility/toolbartabwidget.cpp:46 utility/toolbartabwidget.cpp:309
-msgid "New Action..."
-msgstr "Gweithred Newydd ..."
+msgid "Select Member"
+msgstr "Dewis Plygell"
 
-#: utility/toolbartabwidget.cpp:48 utility/toolbartabwidget.cpp:326
-msgid "New Toolbar..."
+#: project/membereditdlg.cpp:179
+msgid "No entries found in the addressbook."
 msgstr ""
 
-#: utility/toolbartabwidget.cpp:50 utility/toolbartabwidget.cpp:328
-msgid "Rename Toolbar..."
+#: project/projectnewgeneral.cpp:97
+msgid "Select Project Folder"
 msgstr ""
 
-#: utility/toolbartabwidget.cpp:51 utility/toolbartabwidget.cpp:331
-msgid "Configure Toolbars..."
-msgstr "Ffurfio Bar Offer ..."
-
-#: utility/toolbartabwidget.cpp:234
-msgid "Icons Only"
-msgstr "Eiconau yn Unig"
-
-#: utility/toolbartabwidget.cpp:235
-msgid "Text Only"
-msgstr "Testun yn Unig"
-
-#: utility/toolbartabwidget.cpp:236
-msgid "Text Alongside Icons"
-msgstr "Testun wrth Ymyl Eiconau"
-
-#: utility/toolbartabwidget.cpp:237
-msgid "Text Under Icons"
-msgstr "Testun Dan Eiconau"
-
-#: utility/toolbartabwidget.cpp:320
-#, c-format
-msgid "Remove Action - %1"
+#: project/projectnewgeneral.cpp:174 project/projectoptions.ui.h:28
+msgid "Select Project Template Folder"
 msgstr ""
 
-#: utility/toolbartabwidget.cpp:321
-#, c-format
-msgid "Edit Action - %1"
+#: project/projectnewgeneral.cpp:180 project/projectnewgeneral.cpp:228
+msgid ""
+"<qt>The project templates must be stored under the main project folder: "
+"<br>"
+"<br><b>%1</b></qt>"
 msgstr ""
 
-#: utility/toolbartabwidget.cpp:330
-msgid "Text Position"
-msgstr "Lleoliad Testun"
-
-#: utility/toolbartabwidget.cpp:344
-msgid "<qt>Are you sure you want to remove the <b>%1</b> action?</qt>"
+#: project/projectnewgeneral.cpp:188 project/projectoptions.ui.h:40
+msgid "Select Project Toolbar & Actions Folder"
 msgstr ""
 
-#: utility/newstuff.cpp:53
+#: project/projectnewgeneral.cpp:194 project/projectnewgeneral.cpp:241
 msgid ""
-"There was an error with the downloaded DTEP tarball file. Possible causes are "
-"damaged archive or invalid directory structure in the archive."
+"<qt>The project toolbars must be stored under the main project folder: "
+"<br>"
+"<br><b>%1</b></qt>"
 msgstr ""
 
-#: utility/newstuff.cpp:53
-msgid "DTEP Installation Error"
-msgstr ""
+#: project/eventconfigurationdlg.cpp:102
+msgid "New Event"
+msgstr "Digwyddiad Newydd"
 
-#: utility/newstuff.cpp:73
-msgid "Do you want to load the newly downloaded toolbar?"
-msgstr ""
+#: project/eventconfigurationdlg.cpp:121
+msgid "Edit Event"
+msgstr "Golygu Digwyddiad"
 
-#: utility/newstuff.cpp:79
+#: project/eventconfigurationdlg.cpp:144
 msgid ""
-"There was an error with the downloaded toolbar tarball file. Possible causes "
-"are damaged archive or invalid directory structure in the archive."
+"<qt>Are you sure that you want to remove the configuration of the <b>%1</b> "
+"event?</qt>"
 msgstr ""
 
-#: utility/newstuff.cpp:79
-msgid "Toolbar Installation Error"
+#: project/eventconfigurationdlg.cpp:144
+msgid "Delete Event Configuration"
 msgstr ""
 
-#: utility/newstuff.cpp:100
-msgid "Do you want to open the newly downloaded template?"
+#: project/projectprivate.cpp:74
+msgid "<b>Insert Files in Project</b>"
 msgstr ""
 
-#: utility/newstuff.cpp:100
-msgid "Open Template"
-msgstr ""
+#: project/projectprivate.cpp:85
+msgid "&New Project..."
+msgstr "Cywaith &Newydd..."
 
-#: utility/newstuff.cpp:106
-msgid "There was an error with the downloaded template file."
-msgstr ""
+#: project/projectprivate.cpp:89
+msgid "&Open Project..."
+msgstr "&Agor Cywaith..."
 
-#: utility/newstuff.cpp:106
-msgid "Template Installation Error"
-msgstr ""
+#: project/projectprivate.cpp:95
+msgid "Open Recent Project"
+msgstr "Agor Cywaith Diweddar"
 
-#: utility/newstuff.cpp:124 utility/newstuff.cpp:141
-msgid ""
-"There was an error with the downloaded script tarball file. Possible causes are "
-"damaged archive or invalid directory structure in the archive."
+#: project/projectprivate.cpp:97
+msgid "Open/Open recent project"
 msgstr ""
 
-#: utility/newstuff.cpp:124
-msgid "Script Installation Error"
-msgstr ""
+#: project/projectprivate.cpp:100
+msgid "&Close Project"
+msgstr "Ca&u Cywaith"
 
-#: utility/newstuff.cpp:141
-msgid "Documentation Installation Error"
+#: project/projectprivate.cpp:105
+msgid "Open Project &View..."
 msgstr ""
 
-#: utility/qpevents.cpp:42
-#, fuzzy
-msgid "Before Document Save"
-msgstr "Strwythur Dogfen"
-
-#: utility/qpevents.cpp:43
-#, fuzzy
-msgid "After Document Save"
-msgstr "Strwythur Dogfen"
-
-#: utility/qpevents.cpp:44
-#, fuzzy
-msgid "After Document Open"
-msgstr "Strwythur Dogfen"
-
-#: utility/qpevents.cpp:45
-#, fuzzy
-msgid "Before Document Close"
-msgstr "Strwythur Dogfen"
-
-#: utility/qpevents.cpp:46
-#, fuzzy
-msgid "After Document Close"
-msgstr "Strwythur Dogfen"
-
-#: utility/qpevents.cpp:47
+#: project/projectprivate.cpp:109
 #, fuzzy
-msgid "After Project Open"
+msgid "Open project view"
 msgstr "Agor Cywaith"
 
-#: utility/qpevents.cpp:48
-msgid "Before Project Close"
-msgstr ""
-
-#: utility/qpevents.cpp:49
-#, fuzzy
-msgid "After Project Close"
-msgstr "Plygell Cywaith"
-
-#: utility/qpevents.cpp:50
-#, fuzzy
-msgid "Upload Requested"
-msgstr "Lanlwytho Ffeiliau"
-
-#: utility/qpevents.cpp:51
-#, fuzzy
-msgid "Before Document Upload"
-msgstr "Strwythur Dogfen"
-
-#: utility/qpevents.cpp:52
-#, fuzzy
-msgid "After Document Upload"
-msgstr "Strwythur Dogfen"
-
-#: utility/qpevents.cpp:53
-msgid "After Addition to Project"
-msgstr ""
-
-#: utility/qpevents.cpp:54
-msgid "After Removal From Project"
-msgstr ""
-
-#: utility/qpevents.cpp:55
-msgid "After Commit to CVS"
-msgstr ""
-
-#: utility/qpevents.cpp:56
-msgid "After Update From CVS"
-msgstr ""
-
-#: utility/qpevents.cpp:57
-msgid "After Moving File Inside Project"
+#: project/projectprivate.cpp:111
+msgid "&Save Project View"
 msgstr ""
 
-#: utility/qpevents.cpp:58
-msgid "Quanta Start"
+#: project/projectprivate.cpp:114
+msgid "Save Project View &As..."
 msgstr ""
 
-#: utility/qpevents.cpp:59
-msgid "Quanta Exit"
+#: project/projectprivate.cpp:117
+msgid "&Delete Project View"
 msgstr ""
 
-#: utility/qpevents.cpp:62
-msgid "Send Email"
-msgstr "Anfon Ebost"
-
-#: utility/qpevents.cpp:63
-#, fuzzy
-msgid "Log Event"
-msgstr "Digwyddiad"
-
-#: utility/qpevents.cpp:64
-#, fuzzy
-msgid "Script Action"
-msgstr "Disgrifiad:"
-
-#: utility/qpevents.cpp:65
+#: project/projectprivate.cpp:121
 #, fuzzy
-msgid "Non-Script Action"
-msgstr "Disgrifiad:"
-
-#: utility/qpevents.cpp:88
-msgid ""
-"<qt>An internal action (<i>%1</i>) associated with an event (<i>%2</i>"
-") will be executed.  Do you want to allow the execution of this action?</qt>"
-msgstr ""
-
-#: utility/qpevents.cpp:88 utility/qpevents.cpp:92
-msgid "Event Triggered"
-msgstr ""
-
-#: utility/qpevents.cpp:88 utility/qpevents.cpp:92
-msgid "Execute"
-msgstr "Gweithredu"
-
-#: utility/qpevents.cpp:92
-msgid ""
-"<qt>An external action (<i>%1</i>) associated with an event (<i>%2</i>"
-") will be executed.  Do you want to allow the execution of this action?</qt>"
-msgstr ""
-
-#: utility/qpevents.cpp:104
-msgid "An upload was initiated"
-msgstr ""
-
-#: utility/qpevents.cpp:113
-msgid "About to upload a document"
-msgstr ""
-
-#: utility/qpevents.cpp:120
-msgid "Document uploaded"
-msgstr ""
-
-#: utility/qpevents.cpp:127
-msgid "Document moved"
-msgstr ""
-
-#: utility/qpevents.cpp:137
-msgid "Document saved"
-msgstr ""
-
-#: utility/qpevents.cpp:143
-msgid "About to save a document"
-msgstr ""
+msgid "Close project view"
+msgstr "Ca&u Cywaith"
 
-#: utility/qpevents.cpp:149
-msgid "Document opened"
+#: project/projectprivate.cpp:125
+msgid "&Insert Files..."
 msgstr ""
 
-#: utility/qpevents.cpp:155
-msgid "Document closed"
-msgstr ""
+#: project/projectprivate.cpp:129
+#, fuzzy
+msgid "Inser&t Folder..."
+msgstr "&Plygell Newydd"
 
-#: utility/qpevents.cpp:161
-msgid "About to close a document"
+#: project/projectprivate.cpp:133
+msgid "&Rescan Project Folder..."
 msgstr ""
 
-#: utility/qpevents.cpp:167
-msgid "Project opened"
+#: project/projectprivate.cpp:141
+msgid "&Project Properties"
 msgstr ""
 
-#: utility/qpevents.cpp:173
-msgid "Project closed"
+#: project/projectprivate.cpp:146
+msgid "Save as Project Template..."
 msgstr ""
 
-#: utility/qpevents.cpp:179
-msgid "About to close the project"
+#: project/projectprivate.cpp:151
+msgid "Save Selection to Project Template File..."
 msgstr ""
 
-#: utility/qpevents.cpp:185
-msgid "Document added to project"
+#: project/projectprivate.cpp:302
+msgid "Adding files to the project..."
 msgstr ""
 
-#: utility/qpevents.cpp:191
-msgid "Document removed from project"
+#: project/projectprivate.cpp:374
+msgid "Reading the project file..."
 msgstr ""
 
-#: utility/qpevents.cpp:199
-msgid "Document committed"
+#: project/projectprivate.cpp:384
+msgid "Invalid project file."
 msgstr ""
 
-#: utility/qpevents.cpp:205
-msgid "Document updated"
+#: project/projectprivate.cpp:906
+msgid "Save Project View As"
 msgstr ""
 
-#: utility/qpevents.cpp:211
-msgid "Quanta has been started"
+#: project/projectprivate.cpp:907
+msgid "Enter the name of the view:"
 msgstr ""
 
-#: utility/qpevents.cpp:217
-msgid "Quanta is shutting down"
+#: project/projectprivate.cpp:919
+msgid ""
+"<qt>A project view named <b>%1</b> already exists."
+"<br>Do you want to overwrite it?</qt>"
 msgstr ""
 
-#: utility/qpevents.cpp:224
-msgid "<qt>Unsupported event <b>%1</b>.</qt>"
+#: project/projectprivate.cpp:1059
+msgid "<qt>Cannot open file <b>%1</b> for writing.</qt>"
 msgstr ""
 
-#: utility/qpevents.cpp:224
-msgid "Event Handling Error"
+#: project/projectprivate.cpp:1124
+msgid "New Project Wizard"
 msgstr ""
 
-#: utility/qpevents.cpp:273
-msgid "Logging to remote files is not supported."
+#: project/projectprivate.cpp:1138
+msgid "<b>General Project Settings</b>"
 msgstr ""
 
-#: utility/qpevents.cpp:282
-msgid "Logging to files inside a remote project is not supported."
+#: project/projectprivate.cpp:1140
+msgid "<b>More Project Settings</b>"
 msgstr ""
 
-#: utility/qpevents.cpp:312
-msgid "<qt>Logging failed. Check that you have write access to <i>%1</i>."
+#: project/projectprivate.cpp:1218
+msgid ""
+"Saving of project failed. Do you want to continue with closing (might cause "
+"data loss)?"
 msgstr ""
 
-#: utility/qpevents.cpp:316
-msgid "<qt>Unsupported internal event action : <b>%1</b>.</qt>"
+#: project/project.cpp:1268 project/projectprivate.cpp:1218
+msgid "Project Saving Error"
 msgstr ""
 
-#: utility/qpevents.cpp:339
-msgid "<qt>The <b>%1</b> script action was not found on your system.</qt>"
+#: project/projectprivate.cpp:1242
+msgid ""
+"|Project Files\n"
+"*|All Files"
 msgstr ""
 
-#: utility/qpevents.cpp:339
-msgid "Action Execution Error"
-msgstr ""
+#: project/projectprivate.cpp:1243
+msgid "Open Project"
+msgstr "Agor Cywaith"
 
-#: utility/qpevents.cpp:341
-msgid "Unsupported external event action."
+#: project/projectprivate.cpp:1287
+#, c-format
+msgid "Wrote project file %1"
 msgstr ""
 
-#: utility/qpevents.cpp:343
-msgid "Unknown event type."
+#: project/projectprivate.cpp:1291
+msgid "<qt>Cannot open the file <b>%1</b> for writing.</qt>"
 msgstr ""
 
-#: utility/quantanetaccess.cpp:185
-msgid "<qt>Do you want to add <br><b>%1</b><br> to the project?</qt>"
+#: project/projectprivate.cpp:1342
+msgid "<qt>Cannot open the file <b>%1</b> for reading.</qt>"
 msgstr ""
 
-#: utility/quantanetaccess.cpp:185
-msgid "Add to Project"
+#: project/projectprivate.cpp:1354
+msgid "<qt>Malformed URL: <b>%1</b></qt>"
 msgstr ""
 
-#: utility/quantanetaccess.cpp:233
+#: project/projectprivate.cpp:1360
 msgid ""
-"<qt>Do you really want to delete "
+"<qt>The project"
 "<br><b>%1</b>"
-"<br> and remove it from the project?</qt>"
-msgstr ""
-
-#: utility/quantanetaccess.cpp:233
-msgid "Delete & Remove From Project"
-msgstr ""
-
-#: utility/quantanetaccess.cpp:246
-msgid "<qt>Do you really want to delete <br><b>%1</b>?</qt>"
+"<br> seems to be used by another Quanta instance."
+"<br>You may end up with data loss if you open the same project in two "
+"instances, modify and save them in both."
+"<br>"
+"<br>Do you want to proceed with open?</qt>"
 msgstr ""
 
-#: utility/quantanetaccess.cpp:246
-msgid "Delete File or Folder"
+#: project/projectprivate.cpp:1419
+msgid "<qt>Cannot access the project file <b>%1</b>.</qt>"
 msgstr ""
 
-#: parsers/dtd/dtd.cpp:127 parsers/dtd/dtdparser.cpp:78
-msgid "<qt>Cannot download the DTD from <b>%1</b>.</qt>"
+#: project/projectnewlocal.cpp:185 project/projectprivate.cpp:1430
+msgid "*"
 msgstr ""
 
-#: parsers/dtd/dtdparser.cpp:105
-msgid ""
-"<qt>Error while parsing the DTD."
-"<br>The error message is:"
-"<br><i>%1</i></qt>"
+#: project/projectnewlocal.cpp:185 project/projectprivate.cpp:1430
+msgid "Insert Files in Project"
 msgstr ""
 
-#: parsers/dtd/dtdparser.cpp:157
-msgid ""
-"<qt>Cannot create the "
-"<br><b>%1</b> file."
-"<br>Check that you have write permission in the parent folder.</qt>"
+#: project/projectnewlocal.cpp:196 project/projectprivate.cpp:1440
+msgid "Files: Copy to Project"
 msgstr ""
 
-#: parsers/dtd/dtdparser.cpp:169
-msgid "No elements were found in the DTD."
+#: project/projectnewlocal.cpp:244 project/projectprivate.cpp:1489
+msgid "Insert Folder in Project"
 msgstr ""
 
-#: parsers/parsercommon.cpp:177
-msgid "%1 block"
+#: project/projectprivate.cpp:1642
+#, c-format
+msgid "Uploaded project file %1"
 msgstr ""
 
-#: plugins/quantapluginconfig.cpp:45
-msgid "Message Area Tab"
-msgstr ""
+#: project/eventeditordlg.cpp:301
+msgid "Argument:"
+msgstr "Ymresymiad:"
 
-#: plugins/quantapluginconfig.cpp:46 plugins/quantaplugininterface.cpp:108
-#: plugins/quantaplugininterface.cpp:156
-msgid "Editor Tab"
-msgstr ""
+#: project/eventeditordlg.cpp:318
+msgid "Receiver:"
+msgstr "Derbynnydd :"
 
-#: plugins/quantaplugin.cpp:354 plugins/quantaplugin.cpp:370
-#: plugins/quantapluginconfig.cpp:46 plugins/quantaplugininterface.cpp:106
-#: plugins/quantaplugininterface.cpp:157
-msgid "Separate Toolview"
-msgstr ""
+#: project/eventeditordlg.cpp:337
+msgid "Log file:"
+msgstr "Ffeil cofnod:"
 
-#: plugins/quantapluginconfig.cpp:68
+#: project/eventeditordlg.cpp:339
 msgid ""
-"The plugin information you entered appears to be invalid. Are you sure you want "
-"to apply these settings?"
-msgstr ""
-
-#: plugins/quantapluginconfig.cpp:68
-msgid "Invalid Plugin"
-msgstr ""
-
-#: plugins/quantapluginconfig.cpp:68
-msgid "Do Not Apply"
-msgstr ""
-
-#: plugins/quantapluginconfig.cpp:80
-msgid "Select Plugin Folder"
+"A relative file to the project folder or a file outside of the project folder "
+"in which case the full path must be specified."
 msgstr ""
 
-#: plugins/quantaplugininterface.cpp:44
-msgid "Configure &Plugins..."
-msgstr "Ffurfweddu'r &Ategion"
+#: project/eventeditordlg.cpp:341
+msgid "Detail:"
+msgstr "Manylder :"
 
-#: plugins/quantaplugininterface.cpp:93
-msgid ""
-"<qt><b>%1</b> is a command line plugin. We have removed support for "
-"command-line plugins. However, the functionality has not been lost as script "
-"actions can still be used to run command-line tools. </qt>"
-msgstr ""
+#: project/eventeditordlg.cpp:344
+msgid "Full"
+msgstr "Llawn"
 
-#: plugins/quantaplugininterface.cpp:93
-msgid "Unsupported Plugin Type"
+#: project/eventeditordlg.cpp:345
+msgid "Minimal"
 msgstr ""
 
-#: plugins/quantaplugininterface.cpp:260
-msgid ""
-"<qt>The following plugins seems to be invalid:<b>%1</b>."
-"<br>"
-"<br>Do you want to edit the plugins?</qt>"
-msgstr ""
+#: project/eventeditordlg.cpp:347
+msgid "Behavior:"
+msgstr "Ymddygiad :"
 
-#: plugins/quantaplugininterface.cpp:260
-msgid "Invalid Plugins"
+#: project/eventeditordlg.cpp:350
+msgid "Create New Log"
 msgstr ""
 
-#: plugins/quantaplugininterface.cpp:260
-#, fuzzy
-msgid "Do Not Edit"
-msgstr "&Peidiwch â Chadw"
-
-#: plugins/quantaplugininterface.cpp:267
-msgid "All plugins validated successfully."
+#: project/eventeditordlg.cpp:351
+msgid "Append to Existing Log"
 msgstr ""
 
-#: plugins/quantaplugineditor.cpp:103
-msgid "Select Folder"
-msgstr "Dewis Plygell"
+#: project/eventeditordlg.cpp:356 project/eventeditordlg.cpp:384
+msgid "Action name:"
+msgstr "Enw'r weithred:"
 
-#: plugins/quantaplugin.cpp:122
-msgid ""
-"<qt>The <b>%1</b> plugin could not be loaded."
-"<br>Possible reasons are:"
-"<br>    - <b>%2</b> is not installed;"
-"<br>    - the file <i>%3</i> is not installed or it is not reachable."
+#: project/eventeditordlg.cpp:375
+msgid "Blocking:"
 msgstr ""
 
 #: project/projectnewweb.cpp:132
@@ -12868,22 +13170,6 @@ msgstr ""
 msgid "Team Configuration"
 msgstr ""
 
-#: project/membereditdlg.cpp:37 project/project.cpp:585
-msgid "Team Leader"
-msgstr ""
-
-#: project/membereditdlg.cpp:38 project/project.cpp:591
-msgid "Subproject Leader"
-msgstr ""
-
-#: project/membereditdlg.cpp:36 project/project.cpp:596
-msgid "Task Leader"
-msgstr ""
-
-#: project/membereditdlg.cpp:35 project/project.cpp:601
-msgid "Simple Member"
-msgstr ""
-
 #: project/project.cpp:607
 msgid "Event Configuration"
 msgstr ""
@@ -12902,21 +13188,12 @@ msgid ""
 "loss)?"
 msgstr ""
 
-#: project/project.cpp:1268 project/projectprivate.cpp:1218
-msgid "Project Saving Error"
-msgstr ""
-
-#: project/membereditdlg.cpp:85
-msgid "Edit Subprojects"
+#: project/rescanprj.cpp:55
+msgid "Reading folder:"
 msgstr ""
 
-#: project/membereditdlg.cpp:169
-#, fuzzy
-msgid "Select Member"
-msgstr "Dewis Plygell"
-
-#: project/membereditdlg.cpp:179
-msgid "No entries found in the addressbook."
+#: project/rescanprj.cpp:229
+msgid "Building tree:"
 msgstr ""
 
 #: project/projectupload.cpp:81
@@ -13041,507 +13318,182 @@ msgid ""
 "<qt>The <b>%1</b> nickname is already assigned to <b>%2 &lt;%3&gt;</b>.</qt>"
 msgstr ""
 
-#: project/projectprivate.cpp:74
-msgid "<b>Insert Files in Project</b>"
+#: project/projectnewlocal.cpp:78
+#, c-format
+msgid "Insert files from %1."
 msgstr ""
 
-#: project/projectprivate.cpp:85
-msgid "&New Project..."
-msgstr "Cywaith &Newydd..."
-
-#: project/projectprivate.cpp:89
-msgid "&Open Project..."
-msgstr "&Agor Cywaith..."
-
-#: project/projectprivate.cpp:95
-msgid "Open Recent Project"
-msgstr "Agor Cywaith Diweddar"
-
-#: project/projectprivate.cpp:97
-msgid "Open/Open recent project"
+#: ../lib/ksavealldialog.cpp:53 ../lib/ksavealldialog.cpp:144
+msgid "Save Modified Files?"
 msgstr ""
 
-#: project/projectprivate.cpp:100
-msgid "&Close Project"
-msgstr "Ca&u Cywaith"
-
-#: project/projectprivate.cpp:105
-msgid "Open Project &View..."
+#: ../lib/ksavealldialog.cpp:58 ../lib/ksavealldialog.cpp:151
+msgid "The following files have been modified. Save them?"
 msgstr ""
 
-#: project/projectprivate.cpp:109
+#: ../lib/ksavealldialog.cpp:65
 #, fuzzy
-msgid "Open project view"
-msgstr "Agor Cywaith"
-
-#: project/projectprivate.cpp:111
-msgid "&Save Project View"
-msgstr ""
-
-#: project/projectprivate.cpp:114
-msgid "Save Project View &As..."
-msgstr ""
+msgid "Save &Selected"
+msgstr "Dewisiedig"
 
-#: project/projectprivate.cpp:117
-msgid "&Delete Project View"
+#: ../lib/ksavealldialog.cpp:65
+msgid "Saves all selected files"
 msgstr ""
 
-#: project/projectprivate.cpp:121
+#: ../lib/ksavealldialog.cpp:66 ../lib/ksavealldialog.cpp:157
 #, fuzzy
-msgid "Close project view"
-msgstr "Ca&u Cywaith"
+msgid "Save &None"
+msgstr "Cadw &Fel"
 
-#: project/projectprivate.cpp:125
-msgid "&Insert Files..."
+#: ../lib/ksavealldialog.cpp:68 ../lib/ksavealldialog.cpp:159
+msgid "Lose all modifications"
 msgstr ""
 
-#: project/projectprivate.cpp:129
+#: ../lib/ksavealldialog.cpp:69 ../lib/ksavealldialog.cpp:160
 #, fuzzy
-msgid "Inser&t Folder..."
-msgstr "&Plygell Newydd"
-
-#: project/projectprivate.cpp:133
-msgid "&Rescan Project Folder..."
-msgstr ""
+msgid "Cancels the action"
+msgstr "&Dileu Gweithred"
 
-#: project/projectprivate.cpp:141
-msgid "&Project Properties"
-msgstr ""
+#: ../lib/ksavealldialog.cpp:156
+msgid "Save &All"
+msgstr "Cadw &Popeth"
 
-#: project/projectprivate.cpp:146
-msgid "Save as Project Template..."
+#: ../lib/ksavealldialog.cpp:156
+msgid "Saves all modified files"
 msgstr ""
 
-#: project/projectprivate.cpp:151
-msgid "Save Selection to Project Template File..."
-msgstr ""
+#: ../lib/compatibility/knewstuff/provider.cpp:205
+msgid "Error parsing providers list."
+msgstr "Gwall wrth ddosrannu'r rhestr o ddarparwyr."
 
-#: project/projectprivate.cpp:302
-msgid "Adding files to the project..."
-msgstr ""
+#: ../lib/compatibility/knewstuff/knewstuff.cpp:38
+#, c-format
+msgid "Download New %1"
+msgstr "Lawrlwytho %1 Newydd"
 
-#: project/projectprivate.cpp:374
-msgid "Reading the project file..."
-msgstr ""
+#: ../lib/compatibility/knewstuff/providerdialog.cpp:53
+msgid "Hot New Stuff Providers"
+msgstr "Darparwyr y Diweddaraf"
 
-#: project/projectprivate.cpp:384
-msgid "Invalid project file."
-msgstr ""
+#: ../lib/compatibility/knewstuff/providerdialog.cpp:61
+msgid "Please select one of the providers listed below:"
+msgstr "Dewiswch un o'r darparwyr o'r rhestr isod:"
 
-#: project/projectprivate.cpp:906
-msgid "Save Project View As"
-msgstr ""
+#: ../lib/compatibility/knewstuff/providerdialog.cpp:88
+msgid "No provider selected."
+msgstr "Nid oes darparwr wedi ei dewis."
 
-#: project/projectprivate.cpp:907
-msgid "Enter the name of the view:"
-msgstr ""
+#: ../lib/compatibility/knewstuff/knewstuffgeneric.cpp:133
+msgid "The file '%1' already exists. Do you want to override it?"
+msgstr "Mae'r ffeil '%1' mewn bod eisoes.  Ydych eisiau ysgrifennu drosto?"
 
-#: project/projectprivate.cpp:919
+#: ../lib/compatibility/knewstuff/knewstuffsecure.cpp:83
 msgid ""
-"<qt>A project view named <b>%1</b> already exists."
-"<br>Do you want to overwrite it?</qt>"
-msgstr ""
-
-#: project/projectprivate.cpp:1059
-msgid "<qt>Cannot open file <b>%1</b> for writing.</qt>"
-msgstr ""
-
-#: project/projectprivate.cpp:1124
-msgid "New Project Wizard"
+"There was an error with the downloaded resource tarball file. Possible causes "
+"are damaged archive or invalid directory structure in the archive."
 msgstr ""
 
-#: project/projectprivate.cpp:1138
-msgid "<b>General Project Settings</b>"
+#: ../lib/compatibility/knewstuff/knewstuffsecure.cpp:83
+msgid "Resource Installation Error"
 msgstr ""
 
-#: project/projectprivate.cpp:1140
-msgid "<b>More Project Settings</b>"
+#: ../lib/compatibility/knewstuff/knewstuffsecure.cpp:94
+msgid "No keys were found."
 msgstr ""
 
-#: project/projectprivate.cpp:1218
-msgid ""
-"Saving of project failed. Do you want to continue with closing (might cause "
-"data loss)?"
+#: ../lib/compatibility/knewstuff/knewstuffsecure.cpp:99
+msgid "The validation failed for unknown reason."
 msgstr ""
 
-#: project/projectprivate.cpp:1242
-msgid ""
-"|Project Files\n"
-"*|All Files"
+#: ../lib/compatibility/knewstuff/knewstuffsecure.cpp:106
+msgid "The MD5SUM check failed, the archive might be broken."
 msgstr ""
 
-#: project/projectprivate.cpp:1243
-msgid "Open Project"
-msgstr "Agor Cywaith"
-
-#: project/projectprivate.cpp:1287
-#, c-format
-msgid "Wrote project file %1"
+#: ../lib/compatibility/knewstuff/knewstuffsecure.cpp:111
+msgid "The signature is bad, the archive might be broken or altered."
 msgstr ""
 
-#: project/projectprivate.cpp:1291
-msgid "<qt>Cannot open the file <b>%1</b> for writing.</qt>"
+#: ../lib/compatibility/knewstuff/knewstuffsecure.cpp:121
+msgid "The signature is valid, but untrusted."
 msgstr ""
 
-#: project/projectprivate.cpp:1342
-msgid "<qt>Cannot open the file <b>%1</b> for reading.</qt>"
+#: ../lib/compatibility/knewstuff/knewstuffsecure.cpp:127
+msgid "The signature is unknown."
 msgstr ""
 
-#: project/projectprivate.cpp:1354
-msgid "<qt>Malformed URL: <b>%1</b></qt>"
+#: ../lib/compatibility/knewstuff/knewstuffsecure.cpp:131
+msgid ""
+"The resource was signed with key <i>0x%1</i>, belonging to <i>%2 &lt;%3&gt;</i>"
+"."
 msgstr ""
 
-#: project/projectprivate.cpp:1360
+#: ../lib/compatibility/knewstuff/knewstuffsecure.cpp:137
 msgid ""
-"<qt>The project"
-"<br><b>%1</b>"
-"<br> seems to be used by another Quanta instance."
-"<br>You may end up with data loss if you open the same project in two "
-"instances, modify and save them in both."
+"<qt>There is a problem with the resource file you have downloaded. The errors "
+"are :<b>%1</b>"
+"<br>%2"
 "<br>"
-"<br>Do you want to proceed with open?</qt>"
-msgstr ""
-
-#: project/projectprivate.cpp:1419
-msgid "<qt>Cannot access the project file <b>%1</b>.</qt>"
-msgstr ""
-
-#: project/projectnewlocal.cpp:185 project/projectprivate.cpp:1430
-msgid "*"
-msgstr ""
-
-#: project/projectnewlocal.cpp:185 project/projectprivate.cpp:1430
-msgid "Insert Files in Project"
-msgstr ""
-
-#: project/projectnewlocal.cpp:196 project/projectprivate.cpp:1440
-msgid "Files: Copy to Project"
+"<br>Installation of the resource is <b>not recommended</b>."
+"<br>"
+"<br>Do you want to proceed with the installation?</qt>"
 msgstr ""
 
-#: project/projectnewlocal.cpp:244 project/projectprivate.cpp:1489
-msgid "Insert Folder in Project"
+#: ../lib/compatibility/knewstuff/knewstuffsecure.cpp:137
+msgid "Problematic Resource File"
 msgstr ""
 
-#: project/projectprivate.cpp:1642
-#, c-format
-msgid "Uploaded project file %1"
+#: ../lib/compatibility/knewstuff/knewstuffsecure.cpp:140
+msgid "<qt>%1<br><br>Press OK to install it.</qt>"
 msgstr ""
 
-#: project/rescanprj.cpp:55
-msgid "Reading folder:"
+#: ../lib/compatibility/knewstuff/knewstuffsecure.cpp:140
+msgid "Valid Resource"
 msgstr ""
 
-#: project/rescanprj.cpp:229
-msgid "Building tree:"
+#: ../lib/compatibility/knewstuff/knewstuffsecure.cpp:190
+msgid "The signing failed for unknown reason."
 msgstr ""
 
-#: project/eventeditordlg.cpp:301
-msgid "Argument:"
-msgstr "Ymresymiad:"
-
-#: project/eventeditordlg.cpp:318
-msgid "Receiver:"
-msgstr "Derbynnydd :"
-
-#: project/eventeditordlg.cpp:337
-msgid "Log file:"
-msgstr "Ffeil cofnod:"
-
-#: project/eventeditordlg.cpp:339
+#: ../lib/compatibility/knewstuff/knewstuffsecure.cpp:195
 msgid ""
-"A relative file to the project folder or a file outside of the project folder "
-"in which case the full path must be specified."
-msgstr ""
-
-#: project/eventeditordlg.cpp:341
-msgid "Detail:"
-msgstr "Manylder :"
-
-#: project/eventeditordlg.cpp:344
-msgid "Full"
-msgstr "Llawn"
-
-#: project/eventeditordlg.cpp:345
-msgid "Minimal"
-msgstr ""
-
-#: project/eventeditordlg.cpp:347
-msgid "Behavior:"
-msgstr "Ymddygiad :"
-
-#: project/eventeditordlg.cpp:350
-msgid "Create New Log"
-msgstr ""
-
-#: project/eventeditordlg.cpp:351
-msgid "Append to Existing Log"
-msgstr ""
-
-#: project/eventeditordlg.cpp:356 project/eventeditordlg.cpp:384
-msgid "Action name:"
-msgstr "Enw'r weithred:"
-
-#: project/eventeditordlg.cpp:375
-msgid "Blocking:"
-msgstr ""
-
-#: project/projectnewlocal.cpp:78
-#, c-format
-msgid "Insert files from %1."
-msgstr ""
-
-#: project/projectnewgeneral.cpp:97
-msgid "Select Project Folder"
-msgstr ""
-
-#: project/projectnewgeneral.cpp:174 project/projectoptions.ui.h:28
-msgid "Select Project Template Folder"
+"There are no keys usable for signing or you did not entered the correct "
+"passphrase.\n"
+"Proceed without signing the resource?"
 msgstr ""
 
-#: project/projectnewgeneral.cpp:180 project/projectnewgeneral.cpp:228
+#: ../lib/compatibility/knewstuff/security.cpp:63
 msgid ""
-"<qt>The project templates must be stored under the main project folder: "
-"<br>"
-"<br><b>%1</b></qt>"
-msgstr ""
-
-#: project/projectnewgeneral.cpp:188 project/projectoptions.ui.h:40
-msgid "Select Project Toolbar & Actions Folder"
+"<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 ""
 
-#: project/projectnewgeneral.cpp:194 project/projectnewgeneral.cpp:241
+#: ../lib/compatibility/knewstuff/security.cpp:177
 msgid ""
-"<qt>The project toolbars must be stored under the main project folder: "
-"<br>"
-"<br><b>%1</b></qt>"
+"<qt>Enter passphrase for key <b>0x%1</b>, belonging to"
+"<br><i>%2&lt;%3&gt;</i>:</qt>"
 msgstr ""
 
-#: project/eventconfigurationdlg.cpp:102
-msgid "New Event"
-msgstr "Digwyddiad Newydd"
-
-#: project/eventconfigurationdlg.cpp:121
-msgid "Edit Event"
-msgstr "Golygu Digwyddiad"
-
-#: project/eventconfigurationdlg.cpp:144
+#: ../lib/compatibility/knewstuff/security.cpp:257
 msgid ""
-"<qt>Are you sure that you want to remove the configuration of the <b>%1</b> "
-"event?</qt>"
+"<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 ""
 
-#: project/eventconfigurationdlg.cpp:144
-msgid "Delete Event Configuration"
+#: ../lib/compatibility/knewstuff/security.cpp:317
+msgid "Select Signing Key"
 msgstr ""
 
-#: ../lib/compatibility/tdemdi/qextmdi/ktabbar.cpp:195
-msgid "Close this tab"
-msgstr "Cau'r tab yma"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:139
-msgid "Tool &Views"
-msgstr "Golygfeydd &Offer"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:142
-msgid "MDI Mode"
-msgstr "Modd MDI"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:144
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2598
-msgid "&Toplevel Mode"
-msgstr "&Modd Gwastad Uchaf"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:144
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2599
-msgid "C&hildframe Mode"
-msgstr "Modd Ffrâm &Plentyn"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:144
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2600
-msgid "Ta&b Page Mode"
-msgstr "Modd Tudalen Ta&b"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:144
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2601
-msgid "I&DEAl Mode"
-msgstr "Modd I&DEAI"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:154
-msgid "Tool &Docks"
-msgstr "Dociau &Offer"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:155
-msgid "Switch Top Dock"
-msgstr "Newid y Doc wrth y Pen"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:157
-msgid "Switch Left Dock"
-msgstr "Newid y Doc ar y Chwith"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:159
-msgid "Switch Right Dock"
-msgstr "Newid y Doc ar y Dde"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:161
-msgid "Switch Bottom Dock"
-msgstr "Newid y Doc wrth y Gwaelod"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:164
-msgid "Previous Tool View"
-msgstr "Golwg Offer Cynt"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:166
-msgid "Next Tool View"
-msgstr "Golwg Offer Nesaf"
-
-#: ../lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp:2884
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:260
-#, c-format
-msgid "Show %1"
-msgstr "Dangos %1"
-
-#: ../lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp:2878
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:265
-#, c-format
-msgid "Hide %1"
-msgstr "Cuddio %1"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:983
-msgid "Window"
-msgstr "Ffenestr"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:996
-msgid "Undock"
-msgstr "Dad-ddocio"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:1001
-msgid "Maximize"
-msgstr "Ehangu"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:1003
-msgid "Minimize"
-msgstr "Lleihau"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:1006
-msgid "Dock"
-msgstr "Doc"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:1011
-msgid "Operations"
-msgstr "Gweithrediadau"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2590
-msgid "&Minimize All"
-msgstr "Llei&hau'r Cwbl"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2596
-msgid "&MDI Mode"
-msgstr "&Modd MDI"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2623
-msgid "&Tile"
-msgstr "&Teilio"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2625
-msgid "Ca&scade Windows"
-msgstr "Rhae&adru Ffenestri"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2626
-msgid "Cascade &Maximized"
-msgstr "Rhaeadru wedi'u &Ehangu"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2627
-msgid "Expand &Vertically"
-msgstr "Ehangu'n &Fertigol"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2628
-msgid "Expand &Horizontally"
-msgstr "Ehangu'n &Llorweddol"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2629
-msgid "Tile &Non-Overlapped"
-msgstr "Teilio wedi'u &Di-orgyffwrdd"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2630
-msgid "Tile Overla&pped"
-msgstr "Teilio wedi'u &Gorgyffwrdd"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2631
-msgid "Tile V&ertically"
-msgstr "Teilio'n Fe&rtigol"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2637
-msgid "&Dock/Undock"
-msgstr "&Docio/Dad-ddocio"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildfrmcaption.cpp:71
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildview.cpp:63
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildview.cpp:88
-msgid "Unnamed"
-msgstr "Di-enw"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp:1237
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp:1259
-msgid "&Restore"
-msgstr "&Adfer"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp:1238
-msgid "&Move"
-msgstr "Sy&mud"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp:1239
-msgid "R&esize"
-msgstr "Ne&wid Maint"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp:1240
-msgid "M&inimize"
-msgstr "Lle&ihau"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp:1241
-msgid "M&aximize"
-msgstr "Ch&wyddo"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp:1261
-msgid "&Maximize"
-msgstr "&Chwyddo"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp:1263
-msgid "&Minimize"
-msgstr "Llei&hau"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp:1265
-msgid "M&ove"
-msgstr "&Symud"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp:1267
-msgid "&Resize"
-msgstr "Newid &Maint"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp:1270
-msgid "&Undock"
-msgstr "&Dad-ddocio"
-
-#: ../lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp:237
-msgid ""
-"_: Freeze the window geometry\n"
-"Freeze"
-msgstr "Rhewi"
-
-#: ../lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp:244
-msgid ""
-"_: Dock this window\n"
-"Dock"
-msgstr "Clymu"
-
-#: ../lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp:251
-msgid "Detach"
-msgstr "Dat-glymu"
+#: ../lib/compatibility/knewstuff/security.cpp:317
+msgid "Key used for signing:"
+msgstr ""
 
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.cpp:215
+#: ../lib/compatibility/knewstuff/security.cpp:338
 msgid ""
-"_: Switch between overlap and side by side mode\n"
-"Overlap"
-msgstr "Gorgyffwrdd"
+"<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 ""
 
 #: ../lib/compatibility/knewstuff/uploaddialog.cpp:46
 msgid "Share Hot New Stuff"
@@ -13591,13 +13543,71 @@ msgstr ""
 msgid "Please put in a name."
 msgstr "Rhowch enw, os gwelwch yn dda."
 
-#: ../lib/compatibility/knewstuff/knewstuffgeneric.cpp:133
-msgid "The file '%1' already exists. Do you want to override it?"
-msgstr "Mae'r ffeil '%1' mewn bod eisoes.  Ydych eisiau ysgrifennu drosto?"
+#: ../lib/compatibility/knewstuff/engine.cpp:211
+msgid "Successfully installed hot new stuff."
+msgstr "Wedi gosod y diweddaraf yn llwyddiannus."
 
-#: ../lib/compatibility/knewstuff/provider.cpp:205
-msgid "Error parsing providers list."
-msgstr "Gwall wrth ddosrannu'r rhestr o ddarparwyr."
+#: ../lib/compatibility/knewstuff/engine.cpp:216
+msgid "Failed to install hot new stuff."
+msgstr "Wedi methu gosod y diweddaraf yn llwyddiannus."
+
+#: ../lib/compatibility/knewstuff/engine.cpp:270
+msgid "Unable to create file to upload."
+msgstr "Wedi methu creu ffeil i lanlwytho."
+
+#: ../lib/compatibility/knewstuff/engine.cpp:285
+msgid ""
+"The files to be uploaded have been created at:\n"
+msgstr ""
+"Mae'r ffeiliau i lanlwytho wedi eu creu wrth:\n"
+
+#: ../lib/compatibility/knewstuff/engine.cpp:286
+msgid ""
+"Data file: %1\n"
+msgstr ""
+"Ffeil ddata: %1\n"
+
+#: ../lib/compatibility/knewstuff/engine.cpp:288
+msgid ""
+"Preview image: %1\n"
+msgstr ""
+"Rhagolygu delwedd: %1\n"
+
+#: ../lib/compatibility/knewstuff/engine.cpp:290
+msgid ""
+"Content information: %1\n"
+msgstr ""
+"Gwybodaeth gynnwys: %1\n"
+
+#: ../lib/compatibility/knewstuff/engine.cpp:291
+msgid ""
+"Those files can now be uploaded.\n"
+msgstr ""
+"Gellir lanlwytho'r ffeiliau yma rwan.\n"
+
+#: ../lib/compatibility/knewstuff/engine.cpp:292
+msgid "Beware that any people might have access to them at any time."
+msgstr "Sylwer: gall unrhyw berson eu cyrchu wrth unrhyw amser."
+
+#: ../lib/compatibility/knewstuff/engine.cpp:294
+msgid "Upload Files"
+msgstr "Lanlwytho Ffeiliau"
+
+#: ../lib/compatibility/knewstuff/engine.cpp:299
+msgid "Please upload the files manually."
+msgstr "Lanlwythwch y ffeiliau â llaw, os gwelwch yn dda."
+
+#: ../lib/compatibility/knewstuff/engine.cpp:303
+msgid "Upload Info"
+msgstr "Gwybodaeth Lanlwytho"
+
+#: ../lib/compatibility/knewstuff/engine.cpp:311
+msgid "&Upload"
+msgstr "&Lanlwytho"
+
+#: ../lib/compatibility/knewstuff/engine.cpp:413
+msgid "Successfully uploaded new stuff."
+msgstr "Wedi lanlwytho'r diweddaraf yn llyddiannus."
 
 #: ../lib/compatibility/knewstuff/downloaddialog.cpp:71
 #: ../lib/compatibility/knewstuff/downloaddialog.cpp:78
@@ -13692,235 +13702,214 @@ msgstr "Gosod"
 msgid "Installation failed."
 msgstr "Methodd y gosod."
 
-#: ../lib/compatibility/knewstuff/knewstuff.cpp:38
-#, c-format
-msgid "Download New %1"
-msgstr "Lawrlwytho %1 Newydd"
-
-#: ../lib/compatibility/knewstuff/engine.cpp:211
-msgid "Successfully installed hot new stuff."
-msgstr "Wedi gosod y diweddaraf yn llwyddiannus."
-
-#: ../lib/compatibility/knewstuff/engine.cpp:216
-msgid "Failed to install hot new stuff."
-msgstr "Wedi methu gosod y diweddaraf yn llwyddiannus."
+#: ../lib/compatibility/tdemdi/qextmdi/ktabbar.cpp:195
+msgid "Close this tab"
+msgstr "Cau'r tab yma"
 
-#: ../lib/compatibility/knewstuff/engine.cpp:270
-msgid "Unable to create file to upload."
-msgstr "Wedi methu creu ffeil i lanlwytho."
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:139
+msgid "Tool &Views"
+msgstr "Golygfeydd &Offer"
 
-#: ../lib/compatibility/knewstuff/engine.cpp:285
-msgid ""
-"The files to be uploaded have been created at:\n"
-msgstr ""
-"Mae'r ffeiliau i lanlwytho wedi eu creu wrth:\n"
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:142
+msgid "MDI Mode"
+msgstr "Modd MDI"
 
-#: ../lib/compatibility/knewstuff/engine.cpp:286
-msgid ""
-"Data file: %1\n"
-msgstr ""
-"Ffeil ddata: %1\n"
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:144
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2598
+msgid "&Toplevel Mode"
+msgstr "&Modd Gwastad Uchaf"
 
-#: ../lib/compatibility/knewstuff/engine.cpp:288
-msgid ""
-"Preview image: %1\n"
-msgstr ""
-"Rhagolygu delwedd: %1\n"
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:144
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2599
+msgid "C&hildframe Mode"
+msgstr "Modd Ffrâm &Plentyn"
 
-#: ../lib/compatibility/knewstuff/engine.cpp:290
-msgid ""
-"Content information: %1\n"
-msgstr ""
-"Gwybodaeth gynnwys: %1\n"
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:144
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2600
+msgid "Ta&b Page Mode"
+msgstr "Modd Tudalen Ta&b"
 
-#: ../lib/compatibility/knewstuff/engine.cpp:291
-msgid ""
-"Those files can now be uploaded.\n"
-msgstr ""
-"Gellir lanlwytho'r ffeiliau yma rwan.\n"
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:144
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2601
+msgid "I&DEAl Mode"
+msgstr "Modd I&DEAI"
 
-#: ../lib/compatibility/knewstuff/engine.cpp:292
-msgid "Beware that any people might have access to them at any time."
-msgstr "Sylwer: gall unrhyw berson eu cyrchu wrth unrhyw amser."
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:154
+msgid "Tool &Docks"
+msgstr "Dociau &Offer"
 
-#: ../lib/compatibility/knewstuff/engine.cpp:294
-msgid "Upload Files"
-msgstr "Lanlwytho Ffeiliau"
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:155
+msgid "Switch Top Dock"
+msgstr "Newid y Doc wrth y Pen"
 
-#: ../lib/compatibility/knewstuff/engine.cpp:299
-msgid "Please upload the files manually."
-msgstr "Lanlwythwch y ffeiliau â llaw, os gwelwch yn dda."
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:157
+msgid "Switch Left Dock"
+msgstr "Newid y Doc ar y Chwith"
 
-#: ../lib/compatibility/knewstuff/engine.cpp:303
-msgid "Upload Info"
-msgstr "Gwybodaeth Lanlwytho"
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:159
+msgid "Switch Right Dock"
+msgstr "Newid y Doc ar y Dde"
 
-#: ../lib/compatibility/knewstuff/engine.cpp:311
-msgid "&Upload"
-msgstr "&Lanlwytho"
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:161
+msgid "Switch Bottom Dock"
+msgstr "Newid y Doc wrth y Gwaelod"
 
-#: ../lib/compatibility/knewstuff/engine.cpp:413
-msgid "Successfully uploaded new stuff."
-msgstr "Wedi lanlwytho'r diweddaraf yn llyddiannus."
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:164
+msgid "Previous Tool View"
+msgstr "Golwg Offer Cynt"
 
-#: ../lib/compatibility/knewstuff/knewstuffsecure.cpp:83
-msgid ""
-"There was an error with the downloaded resource tarball file. Possible causes "
-"are damaged archive or invalid directory structure in the archive."
-msgstr ""
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:166
+msgid "Next Tool View"
+msgstr "Golwg Offer Nesaf"
 
-#: ../lib/compatibility/knewstuff/knewstuffsecure.cpp:83
-msgid "Resource Installation Error"
-msgstr ""
+#: ../lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp:2886
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:260
+#, c-format
+msgid "Show %1"
+msgstr "Dangos %1"
 
-#: ../lib/compatibility/knewstuff/knewstuffsecure.cpp:94
-msgid "No keys were found."
-msgstr ""
+#: ../lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp:2880
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:265
+#, c-format
+msgid "Hide %1"
+msgstr "Cuddio %1"
 
-#: ../lib/compatibility/knewstuff/knewstuffsecure.cpp:99
-msgid "The validation failed for unknown reason."
-msgstr ""
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildfrmcaption.cpp:71
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildview.cpp:63
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildview.cpp:88
+msgid "Unnamed"
+msgstr "Di-enw"
 
-#: ../lib/compatibility/knewstuff/knewstuffsecure.cpp:106
-msgid "The MD5SUM check failed, the archive might be broken."
-msgstr ""
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp:1237
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp:1259
+msgid "&Restore"
+msgstr "&Adfer"
 
-#: ../lib/compatibility/knewstuff/knewstuffsecure.cpp:111
-msgid "The signature is bad, the archive might be broken or altered."
-msgstr ""
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp:1238
+msgid "&Move"
+msgstr "Sy&mud"
 
-#: ../lib/compatibility/knewstuff/knewstuffsecure.cpp:121
-msgid "The signature is valid, but untrusted."
-msgstr ""
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp:1239
+msgid "R&esize"
+msgstr "Ne&wid Maint"
 
-#: ../lib/compatibility/knewstuff/knewstuffsecure.cpp:127
-msgid "The signature is unknown."
-msgstr ""
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp:1240
+msgid "M&inimize"
+msgstr "Lle&ihau"
 
-#: ../lib/compatibility/knewstuff/knewstuffsecure.cpp:131
-msgid ""
-"The resource was signed with key <i>0x%1</i>, belonging to <i>%2 &lt;%3&gt;</i>"
-"."
-msgstr ""
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp:1241
+msgid "M&aximize"
+msgstr "Ch&wyddo"
 
-#: ../lib/compatibility/knewstuff/knewstuffsecure.cpp:137
-msgid ""
-"<qt>There is a problem with the resource file you have downloaded. The errors "
-"are :<b>%1</b>"
-"<br>%2"
-"<br>"
-"<br>Installation of the resource is <b>not recommended</b>."
-"<br>"
-"<br>Do you want to proceed with the installation?</qt>"
-msgstr ""
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp:1261
+msgid "&Maximize"
+msgstr "&Chwyddo"
 
-#: ../lib/compatibility/knewstuff/knewstuffsecure.cpp:137
-msgid "Problematic Resource File"
-msgstr ""
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp:1263
+msgid "&Minimize"
+msgstr "Llei&hau"
 
-#: ../lib/compatibility/knewstuff/knewstuffsecure.cpp:140
-msgid "<qt>%1<br><br>Press OK to install it.</qt>"
-msgstr ""
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp:1265
+msgid "M&ove"
+msgstr "&Symud"
 
-#: ../lib/compatibility/knewstuff/knewstuffsecure.cpp:140
-msgid "Valid Resource"
-msgstr ""
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp:1267
+msgid "&Resize"
+msgstr "Newid &Maint"
 
-#: ../lib/compatibility/knewstuff/knewstuffsecure.cpp:190
-msgid "The signing failed for unknown reason."
-msgstr ""
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp:1270
+msgid "&Undock"
+msgstr "&Dad-ddocio"
 
-#: ../lib/compatibility/knewstuff/knewstuffsecure.cpp:195
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.cpp:215
 msgid ""
-"There are no keys usable for signing or you did not entered the correct "
-"passphrase.\n"
-"Proceed without signing the resource?"
-msgstr ""
+"_: Switch between overlap and side by side mode\n"
+"Overlap"
+msgstr "Gorgyffwrdd"
 
-#: ../lib/compatibility/knewstuff/security.cpp:63
+#: ../lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp:237
 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 ""
+"_: Freeze the window geometry\n"
+"Freeze"
+msgstr "Rhewi"
 
-#: ../lib/compatibility/knewstuff/security.cpp:177
+#: ../lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp:244
 msgid ""
-"<qt>Enter passphrase for key <b>0x%1</b>, belonging to"
-"<br><i>%2&lt;%3&gt;</i>:</qt>"
-msgstr ""
+"_: Dock this window\n"
+"Dock"
+msgstr "Clymu"
 
-#: ../lib/compatibility/knewstuff/security.cpp:257
-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 ""
+#: ../lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp:251
+msgid "Detach"
+msgstr "Dat-glymu"
 
-#: ../lib/compatibility/knewstuff/security.cpp:317
-msgid "Select Signing Key"
-msgstr ""
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:983
+msgid "Window"
+msgstr "Ffenestr"
 
-#: ../lib/compatibility/knewstuff/security.cpp:317
-msgid "Key used for signing:"
-msgstr ""
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:996
+msgid "Undock"
+msgstr "Dad-ddocio"
 
-#: ../lib/compatibility/knewstuff/security.cpp:338
-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 ""
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:1001
+msgid "Maximize"
+msgstr "Ehangu"
 
-#: ../lib/compatibility/knewstuff/providerdialog.cpp:53
-msgid "Hot New Stuff Providers"
-msgstr "Darparwyr y Diweddaraf"
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:1003
+msgid "Minimize"
+msgstr "Lleihau"
 
-#: ../lib/compatibility/knewstuff/providerdialog.cpp:61
-msgid "Please select one of the providers listed below:"
-msgstr "Dewiswch un o'r darparwyr o'r rhestr isod:"
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:1006
+msgid "Dock"
+msgstr "Doc"
 
-#: ../lib/compatibility/knewstuff/providerdialog.cpp:88
-msgid "No provider selected."
-msgstr "Nid oes darparwr wedi ei dewis."
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:1011
+msgid "Operations"
+msgstr "Gweithrediadau"
 
-#: ../lib/ksavealldialog.cpp:53 ../lib/ksavealldialog.cpp:144
-msgid "Save Modified Files?"
-msgstr ""
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2590
+msgid "&Minimize All"
+msgstr "Llei&hau'r Cwbl"
 
-#: ../lib/ksavealldialog.cpp:58 ../lib/ksavealldialog.cpp:151
-msgid "The following files have been modified. Save them?"
-msgstr ""
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2596
+msgid "&MDI Mode"
+msgstr "&Modd MDI"
 
-#: ../lib/ksavealldialog.cpp:65
-#, fuzzy
-msgid "Save &Selected"
-msgstr "Dewisiedig"
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2623
+msgid "&Tile"
+msgstr "&Teilio"
 
-#: ../lib/ksavealldialog.cpp:65
-msgid "Saves all selected files"
-msgstr ""
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2625
+msgid "Ca&scade Windows"
+msgstr "Rhae&adru Ffenestri"
 
-#: ../lib/ksavealldialog.cpp:66 ../lib/ksavealldialog.cpp:157
-#, fuzzy
-msgid "Save &None"
-msgstr "Cadw &Fel"
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2626
+msgid "Cascade &Maximized"
+msgstr "Rhaeadru wedi'u &Ehangu"
 
-#: ../lib/ksavealldialog.cpp:68 ../lib/ksavealldialog.cpp:159
-msgid "Lose all modifications"
-msgstr ""
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2627
+msgid "Expand &Vertically"
+msgstr "Ehangu'n &Fertigol"
 
-#: ../lib/ksavealldialog.cpp:69 ../lib/ksavealldialog.cpp:160
-#, fuzzy
-msgid "Cancels the action"
-msgstr "&Dileu Gweithred"
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2628
+msgid "Expand &Horizontally"
+msgstr "Ehangu'n &Llorweddol"
 
-#: ../lib/ksavealldialog.cpp:156
-msgid "Save &All"
-msgstr "Cadw &Popeth"
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2629
+msgid "Tile &Non-Overlapped"
+msgstr "Teilio wedi'u &Di-orgyffwrdd"
 
-#: ../lib/ksavealldialog.cpp:156
-msgid "Saves all modified files"
-msgstr ""
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2630
+msgid "Tile Overla&pped"
+msgstr "Teilio wedi'u &Gorgyffwrdd"
+
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2631
+msgid "Tile V&ertically"
+msgstr "Teilio'n Fe&rtigol"
+
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2637
+msgid "&Dock/Undock"
+msgstr "&Docio/Dad-ddocio"
 
 #~ msgid "Abort"
 #~ msgstr "Erthylu"
diff --git a/tde-i18n-cy/messages/tdewebdev/tdefilereplace.po b/tde-i18n-cy/messages/tdewebdev/tdefilereplace.po
index e423b45ae75..5706be3d10a 100644
--- a/tde-i18n-cy/messages/tdewebdev/tdefilereplace.po
+++ b/tde-i18n-cy/messages/tdewebdev/tdefilereplace.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdewebdev/tdefilereplace.po\n"
-"POT-Creation-Date: 2008-07-08 01:25+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,381 +26,6 @@ msgstr "kyfieithu@dotmon.com"
 msgid " Line:%3,Col:%4 - \"%1\" -> \"%2\""
 msgstr ""
 
-#: tdefilereplace.cpp:49
-msgid "Could not find the KFileReplace part."
-msgstr ""
-
-#: tdefilereplacelib.cpp:99
-#, c-format
-msgid ""
-"_n: 1 byte\n"
-"%n bytes"
-msgstr ""
-
-#: tdefilereplacelib.cpp:105
-msgid "%1 KB"
-msgstr "%1 KB"
-
-#: tdefilereplacelib.cpp:111
-msgid "%1 MB"
-msgstr "%1 MB"
-
-#: tdefilereplacelib.cpp:117
-msgid "%1 GB"
-msgstr "%1 GB"
-
-#: tdefilereplacelib.cpp:140
-msgid ""
-"<qt>Cannot open the file <b>%1</b> and load the string list. This file seems "
-"not to be a valid old kfr file or it is broken.</qt>"
-msgstr ""
-
-#: tdefilereplacelib.cpp:158 tdefilereplacelib.cpp:171 tdefilereplacelib.cpp:177
-msgid "Cannot read data."
-msgstr ""
-
-#: tdefilereplacelib.cpp:167
-msgid "Out of memory."
-msgstr "Allan o gof."
-
-#: tdefilereplacepart.cpp:102
-msgid "Ready."
-msgstr "Parod."
-
-#: tdefilereplacepart.cpp:151
-msgid "Search completed."
-msgstr ""
-
-#: tdefilereplacepart.cpp:164
-msgid ""
-"<qt>You have selected <b>%1</b> as the encoding of the files."
-"<br>Selecting the correct encoding is very important as if you have files that "
-"have some other encoding than the selected one, after a replace you may damage "
-"those files."
-"<br>"
-"<br>In case you do not know the encoding of your files, select <i>utf8</i> "
-"and <b>enable</b> the creation of backup files. This setting will autodetect <i>"
-"utf8</i> and <i>utf16</i> files, but the changed files will be converted to <i>"
-"utf8</i>.</qt>"
-msgstr ""
-
-#: tdefilereplacepart.cpp:164
-msgid "File Encoding Warning"
-msgstr ""
-
-#: tdefilereplacepart.cpp:173
-msgid "Replacing files (simulation)..."
-msgstr ""
-
-#: tdefilereplacepart.cpp:174
-msgid "Replaced strings (simulation)"
-msgstr ""
-
-#: tdefilereplacepart.cpp:178
-msgid "Replacing files..."
-msgstr ""
-
-#: tdefilereplacepart.cpp:179
-msgid "Replaced strings"
-msgstr ""
-
-#: tdefilereplacepart.cpp:233
-#, fuzzy
-msgid "Stopping..."
-msgstr "Aros."
-
-#: tdefilereplacepart.cpp:247
-msgid "There are no results to save: the result list is empty."
-msgstr ""
-
-#: tdefilereplacepart.cpp:251
-msgid "Save Report"
-msgstr ""
-
-#: tdefilereplacepart.cpp:261
-msgid "<qt>A folder or a file named <b>%1</b> already exists.</qt>"
-msgstr ""
-
-#: tdefilereplacepart.cpp:269
-msgid "<qt>Cannot create the <b>%1</b> folder.</qt>"
-msgstr ""
-
-#: tdefilereplacepart.cpp:347
-msgid "KFileReplace strings"
-msgstr ""
-
-#: tdefilereplacepart.cpp:347 tdefilereplaceview.cpp:425
-msgid "All Files"
-msgstr "Pob Ffeil"
-
-#: tdefilereplacepart.cpp:348
-msgid "Load Strings From File"
-msgstr ""
-
-#: tdefilereplacepart.cpp:381
-msgid "Cannot open folders."
-msgstr ""
-
-#: tdefilereplacepart.cpp:513
-msgid "KFileReplacePart"
-msgstr ""
-
-#: tdefilereplacepart.cpp:515
-msgid "Batch search and replace tool."
-msgstr ""
-
-#: tdefilereplacepart.cpp:517 main.cpp:38
-msgid "Part of the TDEWebDev module."
-msgstr ""
-
-#: tdefilereplacepart.cpp:519 main.cpp:44
-msgid "Original author of the KFileReplace tool"
-msgstr ""
-
-#: tdefilereplacepart.cpp:522 main.cpp:42
-msgid "Current maintainer, code cleaner and rewriter"
-msgstr ""
-
-#: tdefilereplacepart.cpp:525
-msgid "Co-maintainer, KPart creator"
-msgstr ""
-
-#: tdefilereplacepart.cpp:528
-msgid "Original german translator"
-msgstr ""
-
-#: tdefilereplacepart.cpp:538
-msgid "Sorry, currently the KFileReplace part works only for local files."
-msgstr ""
-
-#: tdefilereplacepart.cpp:538
-msgid "Non Local File"
-msgstr ""
-
-#: tdefilereplacepart.cpp:570
-msgid "Customize Search/Replace Session..."
-msgstr ""
-
-#: tdefilereplacepart.cpp:571
-msgid "&Search"
-msgstr " &Chwilio"
-
-#: tdefilereplacepart.cpp:572
-msgid "S&imulate"
-msgstr ""
-
-#: tdefilereplacepart.cpp:573
-msgid "&Replace"
-msgstr "A&mnewid"
-
-#: tdefilereplacepart.cpp:574
-msgid "Sto&p"
-msgstr "&Aros"
-
-#: tdefilereplacepart.cpp:575
-msgid "Cre&ate Report File..."
-msgstr ""
-
-#: tdefilereplacepart.cpp:578
-#, fuzzy
-msgid "&Add String..."
-msgstr "Aros."
-
-#: tdefilereplacepart.cpp:580
-msgid "&Delete String"
-msgstr ""
-
-#: tdefilereplacepart.cpp:581
-msgid "&Empty Strings List"
-msgstr ""
-
-#: tdefilereplacepart.cpp:582
-msgid "Edit Selected String..."
-msgstr ""
-
-#: tdefilereplacepart.cpp:583
-msgid "&Save Strings List to File..."
-msgstr ""
-
-#: tdefilereplacepart.cpp:584
-msgid "&Load Strings List From File..."
-msgstr ""
-
-#: tdefilereplacepart.cpp:585
-msgid "&Load Recent Strings Files"
-msgstr ""
-
-#: tdefilereplacepart.cpp:586
-msgid "&Invert Current String (search <--> replace)"
-msgstr ""
-
-#: tdefilereplacepart.cpp:587
-msgid "&Invert All Strings (search <--> replace)"
-msgstr ""
-
-#: tdefilereplacepart.cpp:590
-msgid "&Include Sub-Folders"
-msgstr ""
-
-#: tdefilereplacepart.cpp:591
-msgid "Create &Backup Files"
-msgstr ""
-
-#: tdefilereplacepart.cpp:592
-msgid "Case &Sensitive"
-msgstr "Mae l&lythrennau mawr/bach o bwys"
-
-#: tdefilereplacepart.cpp:593
-msgid "Enable Commands &in Replace String: [$command:option$]"
-msgstr ""
-
-#: tdefilereplacepart.cpp:594
-msgid "Enable &Regular Expressions"
-msgstr ""
-
-#: tdefilereplacepart.cpp:595
-#, fuzzy
-msgid "Configure &KFileReplace..."
-msgstr "A&mnewid"
-
-#: tdefilereplacepart.cpp:598 tdefilereplaceview.cpp:530
-msgid "&Properties"
-msgstr "&Priodweddau"
-
-#: tdefilereplacepart.cpp:599 tdefilereplaceview.cpp:502
-msgid "&Open"
-msgstr "A&gor"
-
-#: tdefilereplacepart.cpp:603 tdefilereplaceview.cpp:515
-msgid "&Edit in Quanta"
-msgstr ""
-
-#: tdefilereplacepart.cpp:605 tdefilereplaceview.cpp:521
-msgid "Open Parent &Folder"
-msgstr ""
-
-#: tdefilereplacepart.cpp:607
-msgid "E&xpand Tree"
-msgstr "E&hangu Coeden"
-
-#: tdefilereplacepart.cpp:608
-msgid "&Reduce Tree"
-msgstr ""
-
-#: tdefilereplacepart.cpp:609
-msgid "&About KFileReplace"
-msgstr ""
-
-#: tdefilereplacepart.cpp:610
-msgid "KFileReplace &Handbook"
-msgstr ""
-
-#: tdefilereplacepart.cpp:611
-msgid "&Report Bug"
-msgstr "&Anfon adroddiad nam"
-
-#: tdefilereplacepart.cpp:1025 tdefilereplacepart.cpp:1113
-#: tdefilereplacepart.cpp:1335
-#, fuzzy
-msgid "<qt>Cannot open file <b>%1</b> for reading.</qt>"
-msgstr "Methu agor ffeil %1 i'w ddarllen."
-
-#: tdefilereplacepart.cpp:1064 tdefilereplacepart.cpp:1142
-#, fuzzy
-msgid "<qt>Cannot open file <b>%1</b> for writing.</qt>"
-msgstr "Methu agor ffeil %1 i'w ysgrifennu."
-
-#: tdefilereplacepart.cpp:1199
-msgid ""
-"<qt>Do you want to replace the string <b>%1</b> with the string <b>%2</b>?</qt>"
-msgstr ""
-
-#: tdefilereplacepart.cpp:1200
-#, fuzzy
-msgid "Confirm Replace"
-msgstr "A&mnewid"
-
-#: tdefilereplacepart.cpp:1202
-#, fuzzy
-msgid "Do Not Replace"
-msgstr "Amnewid:"
-
-#: tdefilereplacepart.cpp:1406 tdefilereplacepart.cpp:1446
-msgid " Line:%2, Col:%3 - \"%1\""
-msgstr ""
-
-#: tdefilereplacepart.cpp:1512
-msgid "<qt>Cannot open the file <b>%1</b> and load the string list.</qt>"
-msgstr ""
-
-#: tdefilereplacepart.cpp:1520
-msgid ""
-"<qt>File <b>%1</b> seems not to be written in new kfr format. Remember that the "
-"old kfr format will be soon abandoned. You can convert your old rules files by "
-"simply saving them with tdefilereplace.</qt>"
-msgstr ""
-
-#: tdefilereplacepart.cpp:1540
-msgid ""
-"<qt>The format of kfr files has been changed; attempting to load <b>%1</b>"
-". Please see the KFilereplace manual for details. Do you want to load a "
-"search-and-replace list of strings?</qt>"
-msgstr ""
-
-#: tdefilereplacepart.cpp:1540
-msgid "Load"
-msgstr "Llwytho"
-
-#: tdefilereplacepart.cpp:1540
-msgid "Do Not Load"
-msgstr ""
-
-#: tdefilereplacepart.cpp:1629
-msgid "There are no strings to search and replace."
-msgstr ""
-
-#: tdefilereplacepart.cpp:1642
-msgid "<qt>The main folder of the project <b>%1</b> does not exist.</qt>"
-msgstr ""
-
-#: tdefilereplacepart.cpp:1650
-msgid "<qt>Access denied in the main folder of the project:<br><b>%1</b></qt>"
-msgstr ""
-
-#: tdefilereplaceview.cpp:120
-msgid ""
-"<qt>Cannot invert string <b>%1</b>, because the search string would be "
-"empty.</qt>"
-msgstr ""
-
-#: tdefilereplaceview.cpp:259
-msgid "File %1 cannot be opened. Might be a DCOP problem."
-msgstr ""
-
-#: tdefilereplaceview.cpp:281
-msgid "Do you really want to delete %1?"
-msgstr ""
-
-#: tdefilereplaceview.cpp:401
-msgid "No strings to save as the list is empty."
-msgstr ""
-
-#: tdefilereplaceview.cpp:425
-msgid "KFileReplace Strings"
-msgstr ""
-
-#: tdefilereplaceview.cpp:426
-msgid "Save Strings to File"
-msgstr ""
-
-#: tdefilereplaceview.cpp:437
-msgid "File %1 cannot be saved."
-msgstr ""
-
-#: tdefilereplaceview.cpp:507
-msgid "Open &With..."
-msgstr "Agor &Gyda..."
-
 #: knewprojectdlg.cpp:97
 msgid "Project Directory"
 msgstr ""
@@ -425,13 +51,26 @@ msgid "Starting folder"
 msgstr ""
 
 #: main.cpp:37
-msgid "KFileReplace"
+#, fuzzy
+msgid "TDEFileReplace"
 msgstr "KFileReplace"
 
+#: main.cpp:38 tdefilereplacepart.cpp:517
+msgid "Part of the KDEWebDev module."
+msgstr ""
+
 #: main.cpp:41
 msgid "Shell author, KPart creator, co-maintainer"
 msgstr ""
 
+#: main.cpp:42 tdefilereplacepart.cpp:522
+msgid "Current maintainer, code cleaner and rewriter"
+msgstr ""
+
+#: main.cpp:44 tdefilereplacepart.cpp:519
+msgid "Original author of the TDEFileReplace tool"
+msgstr ""
+
 #. i18n: file tdefilereplacepartui.rc line 4
 #: rc.cpp:3 rc.cpp:27
 #, no-c-format
@@ -453,7 +92,7 @@ msgstr "&Canlyniadau"
 #. i18n: file tdefilereplacepartui.rc line 55
 #: rc.cpp:21
 #, no-c-format
-msgid "KFileReplace Main Toolbar"
+msgid "TDEFileReplace Main Toolbar"
 msgstr ""
 
 #. i18n: file kaddstringdlgs.ui line 16
@@ -493,413 +132,413 @@ msgid "Replace with:"
 msgstr "Amnewid efo:"
 
 #. i18n: file kaddstringdlgs.ui line 270
-#: rc.cpp:48 rc.cpp:51 rc.cpp:105 rc.cpp:111
+#: rc.cpp:48 rc.cpp:51 rc.cpp:306 rc.cpp:312
 #, no-c-format
 msgid "Search For"
 msgstr "Chwilio am:"
 
 #. i18n: file kaddstringdlgs.ui line 322
-#: rc.cpp:54 rc.cpp:108
+#: rc.cpp:54 rc.cpp:309
 #, no-c-format
 msgid "Replace With"
 msgstr "Amnewid Efo"
 
-#. i18n: file tdefilereplaceviewwdg.ui line 58
-#: rc.cpp:66 rc.cpp:87 rc.cpp:204 rc.cpp:222 report.cpp:114
-#, no-c-format
-msgid "Name"
-msgstr "Enw"
-
-#. i18n: file tdefilereplaceviewwdg.ui line 69
-#: rc.cpp:69 rc.cpp:90 report.cpp:115
-#, no-c-format
-msgid "Folder"
-msgstr "Plygell"
-
-#. i18n: file tdefilereplaceviewwdg.ui line 80
-#: rc.cpp:72 report.cpp:122
-#, no-c-format
-msgid "Old Size"
-msgstr ""
-
-#. i18n: file tdefilereplaceviewwdg.ui line 91
-#: rc.cpp:75 report.cpp:123
-#, no-c-format
-msgid "New Size"
-msgstr ""
-
-#. i18n: file tdefilereplaceviewwdg.ui line 102
-#: rc.cpp:78 report.cpp:54
-#, no-c-format
-msgid "Replaced Strings"
-msgstr ""
-
-#. i18n: file tdefilereplaceviewwdg.ui line 113
-#: rc.cpp:81 rc.cpp:99 report.cpp:126
-#, no-c-format
-msgid "Owner User"
-msgstr ""
-
-#. i18n: file tdefilereplaceviewwdg.ui line 124
-#: rc.cpp:84 rc.cpp:102 report.cpp:127
-#, no-c-format
-msgid "Owner Group"
-msgstr ""
-
-#. i18n: file tdefilereplaceviewwdg.ui line 203
-#: rc.cpp:93 report.cpp:118
-#, no-c-format
-msgid "Size"
-msgstr "Maint"
-
-#. i18n: file tdefilereplaceviewwdg.ui line 214
-#: rc.cpp:96
-#, no-c-format
-msgid "Found Strings"
-msgstr ""
-
-#. i18n: file tdefilereplaceviewwdg.ui line 427
-#: rc.cpp:114
-#, no-c-format
-msgid "Green means ready"
-msgstr ""
-
-#. i18n: file tdefilereplaceviewwdg.ui line 430
-#: rc.cpp:117
-#, no-c-format
-msgid "Ready"
-msgstr "Parod"
-
-#. i18n: file tdefilereplaceviewwdg.ui line 454
-#: rc.cpp:120
-#, no-c-format
-msgid "Yellow means wait while sorting list"
-msgstr ""
-
-#. i18n: file tdefilereplaceviewwdg.ui line 457
-#: rc.cpp:123
-#, no-c-format
-msgid "Please wait while sorting list"
-msgstr ""
-
-#. i18n: file tdefilereplaceviewwdg.ui line 478
-#: rc.cpp:126
-#, no-c-format
-msgid "Red means scanning files"
-msgstr ""
-
-#. i18n: file tdefilereplaceviewwdg.ui line 513
-#: rc.cpp:129
-#, no-c-format
-msgid "Scanned files:"
-msgstr ""
-
 #. i18n: file knewprojectdlgs.ui line 16
-#: rc.cpp:132
+#: rc.cpp:66
 #, no-c-format
 msgid "Search & Replace in Files"
 msgstr ""
 
 #. i18n: file knewprojectdlgs.ui line 89
-#: rc.cpp:138
+#: rc.cpp:72
 #, fuzzy, no-c-format
 msgid "Search Now"
 msgstr "Chwilio am"
 
 #. i18n: file knewprojectdlgs.ui line 103
-#: rc.cpp:141
+#: rc.cpp:75
 #, fuzzy, no-c-format
 msgid "Search Later"
 msgstr "Chwilio am"
 
 #. i18n: file knewprojectdlgs.ui line 142
-#: rc.cpp:147
+#: rc.cpp:81
 #, no-c-format
 msgid "&General"
 msgstr "&Cyffredinol"
 
 #. i18n: file knewprojectdlgs.ui line 153
-#: rc.cpp:150
+#: rc.cpp:84
 #, fuzzy, no-c-format
 msgid "Startup Folder Options"
 msgstr "Dewisiadau Cyffredinol"
 
 #. i18n: file knewprojectdlgs.ui line 164
-#: rc.cpp:153
+#: rc.cpp:87
 #, no-c-format
 msgid "Filter:"
 msgstr "Hidl:"
 
 #. i18n: file knewprojectdlgs.ui line 175
-#: rc.cpp:156
+#: rc.cpp:90
 #, no-c-format
 msgid "Location:"
 msgstr "Lleoliad:"
 
 #. i18n: file knewprojectdlgs.ui line 212
-#: rc.cpp:159
+#: rc.cpp:93
 #, no-c-format
 msgid "Insert a search path here. You can use the search path button."
 msgstr ""
 
 #. i18n: file knewprojectdlgs.ui line 262
-#: rc.cpp:162
+#: rc.cpp:96
 #, no-c-format
 msgid "&Include subfolders"
 msgstr "&Cynnwys is-blygyll"
 
 #. i18n: file knewprojectdlgs.ui line 275
-#: rc.cpp:165
+#: rc.cpp:99
 #, no-c-format
 msgid "Search/Replace Strings"
 msgstr ""
 
 #. i18n: file knewprojectdlgs.ui line 296
-#: rc.cpp:168
+#: rc.cpp:102
 #, no-c-format
 msgid "Search:"
 msgstr "Chwiliad:"
 
 #. i18n: file knewprojectdlgs.ui line 304
-#: rc.cpp:171
+#: rc.cpp:105
 #, no-c-format
 msgid "Replace:"
 msgstr "Amnewid:"
 
 #. i18n: file knewprojectdlgs.ui line 314
-#: rc.cpp:174 rc.cpp:270
+#: rc.cpp:108 rc.cpp:204
 #, no-c-format
 msgid "General Options"
 msgstr "Dewisiadau Cyffredinol"
 
 #. i18n: file knewprojectdlgs.ui line 328
-#: rc.cpp:177
+#: rc.cpp:111
 #, no-c-format
 msgid "Enable &regular expressions"
 msgstr ""
 
 #. i18n: file knewprojectdlgs.ui line 336
-#: rc.cpp:180
+#: rc.cpp:114
 #, no-c-format
 msgid "Do &backup copy instead of overwrite"
 msgstr ""
 
 #. i18n: file knewprojectdlgs.ui line 344
-#: rc.cpp:183
+#: rc.cpp:117
 #, no-c-format
 msgid "&Case sensitive"
 msgstr "&Llythrennau mawr/bach o bwys"
 
 #. i18n: file knewprojectdlgs.ui line 352
-#: rc.cpp:186
+#: rc.cpp:120
 #, no-c-format
 msgid "Enable co&mmands in the replace string"
 msgstr ""
 
 #. i18n: file knewprojectdlgs.ui line 360
-#: rc.cpp:189 rc.cpp:276
+#: rc.cpp:123 rc.cpp:210
 #, no-c-format
 msgid "Backup copy suffix:"
 msgstr ""
 
 #. i18n: file knewprojectdlgs.ui line 389
-#: rc.cpp:192 rc.cpp:294
+#: rc.cpp:126 rc.cpp:228
 #, no-c-format
 msgid "Encoding of the files:"
 msgstr ""
 
 #. i18n: file knewprojectdlgs.ui line 401
-#: rc.cpp:195 rc.cpp:297
+#: rc.cpp:129 rc.cpp:231
 #, no-c-format
 msgid "&Advanced"
 msgstr "&Uwch"
 
 #. i18n: file knewprojectdlgs.ui line 412
-#: rc.cpp:198
+#: rc.cpp:132
 #, no-c-format
 msgid "Ownership Filtering"
 msgstr ""
 
 #. i18n: file knewprojectdlgs.ui line 423
-#: rc.cpp:201
+#: rc.cpp:135
 #, no-c-format
 msgid "User: "
 msgstr "Defnyddiwr: "
 
+#. i18n: file knewprojectdlgs.ui line 429
+#: rc.cpp:138 rc.cpp:156 rc.cpp:267 rc.cpp:288 report.cpp:114
+#, no-c-format
+msgid "Name"
+msgstr "Enw"
+
 #. i18n: file knewprojectdlgs.ui line 434
-#: rc.cpp:207 rc.cpp:225
+#: rc.cpp:141 rc.cpp:159
 #, no-c-format
 msgid "ID (Number)"
 msgstr ""
 
 #. i18n: file knewprojectdlgs.ui line 456
-#: rc.cpp:210 rc.cpp:216
+#: rc.cpp:144 rc.cpp:150
 #, no-c-format
 msgid "Equals To"
 msgstr ""
 
 #. i18n: file knewprojectdlgs.ui line 461
-#: rc.cpp:213 rc.cpp:219
+#: rc.cpp:147 rc.cpp:153
 #, no-c-format
 msgid "Is Not"
 msgstr "Nid Yw"
 
 #. i18n: file knewprojectdlgs.ui line 539
-#: rc.cpp:228
+#: rc.cpp:162
 #, no-c-format
 msgid "Group:"
 msgstr "Gr?p:"
 
 #. i18n: file knewprojectdlgs.ui line 565
-#: rc.cpp:231
+#: rc.cpp:165
 #, no-c-format
 msgid "Access Date Filtering"
 msgstr ""
 
 #. i18n: file knewprojectdlgs.ui line 592
-#: rc.cpp:234
+#: rc.cpp:168
 #, no-c-format
 msgid "Dates valid for:"
 msgstr ""
 
 #. i18n: file knewprojectdlgs.ui line 600
-#: rc.cpp:237
+#: rc.cpp:171
 #, no-c-format
 msgid "Accessed after:"
 msgstr ""
 
 #. i18n: file knewprojectdlgs.ui line 608
-#: rc.cpp:240
+#: rc.cpp:174
 #, no-c-format
 msgid "Accessed before: "
 msgstr ""
 
 #. i18n: file knewprojectdlgs.ui line 624
-#: rc.cpp:243
+#: rc.cpp:177
 #, no-c-format
 msgid "Last Writing Access"
 msgstr ""
 
 #. i18n: file knewprojectdlgs.ui line 629
-#: rc.cpp:246
+#: rc.cpp:180
 #, no-c-format
 msgid "Last Reading Access"
 msgstr ""
 
 #. i18n: file knewprojectdlgs.ui line 737
-#: rc.cpp:249
+#: rc.cpp:183
 #, no-c-format
 msgid "Size Filtering"
 msgstr ""
 
 #. i18n: file knewprojectdlgs.ui line 764
-#: rc.cpp:252
+#: rc.cpp:186
 #, no-c-format
 msgid "Minimum si&ze:"
 msgstr ""
 
 #. i18n: file knewprojectdlgs.ui line 772
-#: rc.cpp:255
+#: rc.cpp:189
 #, no-c-format
 msgid "Maximum size:"
 msgstr ""
 
 #. i18n: file knewprojectdlgs.ui line 822
-#: rc.cpp:258 rc.cpp:261
+#: rc.cpp:192 rc.cpp:195
 #, no-c-format
 msgid "KB"
 msgstr "KB"
 
 #. i18n: file koptionsdlgs.ui line 34
-#: rc.cpp:267
+#: rc.cpp:201
 #, no-c-format
 msgid "General"
 msgstr "Cyffredinol"
 
 #. i18n: file koptionsdlgs.ui line 56
-#: rc.cpp:273
+#: rc.cpp:207
 #, no-c-format
 msgid "Enable commands in replace strings"
 msgstr ""
 
 #. i18n: file koptionsdlgs.ui line 83
-#: rc.cpp:279
+#: rc.cpp:213
 #, no-c-format
 msgid "Notif&y on errors"
 msgstr ""
 
 #. i18n: file koptionsdlgs.ui line 91
-#: rc.cpp:282
+#: rc.cpp:216
 #, no-c-format
 msgid "Case sensitive"
 msgstr "Llythrennau mawr/bach o bwys"
 
 #. i18n: file koptionsdlgs.ui line 102
-#: rc.cpp:285
+#: rc.cpp:219
 #, no-c-format
 msgid "Recursive (search/replace in all sub folders)"
 msgstr ""
 
 #. i18n: file koptionsdlgs.ui line 116
-#: rc.cpp:288
+#: rc.cpp:222
 #, no-c-format
 msgid "Enable regular e&xpressions"
 msgstr ""
 
 #. i18n: file koptionsdlgs.ui line 124
-#: rc.cpp:291
+#: rc.cpp:225
 #, no-c-format
 msgid "Do &backup copy"
 msgstr ""
 
 #. i18n: file koptionsdlgs.ui line 168
-#: rc.cpp:300
+#: rc.cpp:234
 #, no-c-format
 msgid "Advanced Options"
 msgstr "Dewisiadau Uwch"
 
 #. i18n: file koptionsdlgs.ui line 179
-#: rc.cpp:303
+#: rc.cpp:237
 #, no-c-format
 msgid "Ignore hidden files and folders"
 msgstr ""
 
 #. i18n: file koptionsdlgs.ui line 187
-#: rc.cpp:306
+#: rc.cpp:240
 #, no-c-format
 msgid "Follow s&ymbolic links"
 msgstr "Dilyn cy&sylltau symbolaidd"
 
 #. i18n: file koptionsdlgs.ui line 195
-#: rc.cpp:309
+#: rc.cpp:243
 #, no-c-format
 msgid "When searching, stop on first string found (faster but no details)"
 msgstr ""
 
 #. i18n: file koptionsdlgs.ui line 206
-#: rc.cpp:312
+#: rc.cpp:246
 #, no-c-format
 msgid "Do not show file if no strings are found or replaced"
 msgstr ""
 
 #. i18n: file koptionsdlgs.ui line 242
-#: rc.cpp:315
+#: rc.cpp:249
 #, no-c-format
 msgid "Show confirmation dialog"
 msgstr ""
 
 #. i18n: file koptionsdlgs.ui line 255
-#: rc.cpp:318
+#: rc.cpp:252
 #, no-c-format
 msgid "Confirm before replace each string"
 msgstr ""
 
 #. i18n: file koptionsdlgs.ui line 296
-#: rc.cpp:324
+#: rc.cpp:258
 #, no-c-format
 msgid "&Default Values"
 msgstr ""
 
+#. i18n: file tdefilereplaceviewwdg.ui line 69
+#: rc.cpp:270 rc.cpp:291 report.cpp:115
+#, no-c-format
+msgid "Folder"
+msgstr "Plygell"
+
+#. i18n: file tdefilereplaceviewwdg.ui line 80
+#: rc.cpp:273 report.cpp:122
+#, no-c-format
+msgid "Old Size"
+msgstr ""
+
+#. i18n: file tdefilereplaceviewwdg.ui line 91
+#: rc.cpp:276 report.cpp:123
+#, no-c-format
+msgid "New Size"
+msgstr ""
+
+#. i18n: file tdefilereplaceviewwdg.ui line 102
+#: rc.cpp:279 report.cpp:54
+#, no-c-format
+msgid "Replaced Strings"
+msgstr ""
+
+#. i18n: file tdefilereplaceviewwdg.ui line 113
+#: rc.cpp:282 rc.cpp:300 report.cpp:126
+#, no-c-format
+msgid "Owner User"
+msgstr ""
+
+#. i18n: file tdefilereplaceviewwdg.ui line 124
+#: rc.cpp:285 rc.cpp:303 report.cpp:127
+#, no-c-format
+msgid "Owner Group"
+msgstr ""
+
+#. i18n: file tdefilereplaceviewwdg.ui line 203
+#: rc.cpp:294 report.cpp:118
+#, no-c-format
+msgid "Size"
+msgstr "Maint"
+
+#. i18n: file tdefilereplaceviewwdg.ui line 214
+#: rc.cpp:297
+#, no-c-format
+msgid "Found Strings"
+msgstr ""
+
+#. i18n: file tdefilereplaceviewwdg.ui line 427
+#: rc.cpp:315
+#, no-c-format
+msgid "Green means ready"
+msgstr ""
+
+#. i18n: file tdefilereplaceviewwdg.ui line 430
+#: rc.cpp:318
+#, no-c-format
+msgid "Ready"
+msgstr "Parod"
+
+#. i18n: file tdefilereplaceviewwdg.ui line 454
+#: rc.cpp:321
+#, no-c-format
+msgid "Yellow means wait while sorting list"
+msgstr ""
+
+#. i18n: file tdefilereplaceviewwdg.ui line 457
+#: rc.cpp:324
+#, no-c-format
+msgid "Please wait while sorting list"
+msgstr ""
+
+#. i18n: file tdefilereplaceviewwdg.ui line 478
+#: rc.cpp:327
+#, no-c-format
+msgid "Red means scanning files"
+msgstr ""
+
+#. i18n: file tdefilereplaceviewwdg.ui line 513
+#: rc.cpp:330
+#, no-c-format
+msgid "Scanned files:"
+msgstr ""
+
 #: report.cpp:41 report.cpp:194
 msgid "<qt>Cannot open the file <b>%1</b>.</qt>"
 msgstr ""
@@ -917,8 +556,9 @@ msgid "-"
 msgstr "-"
 
 #: report.cpp:68
-msgid "KFileReplace Report"
-msgstr ""
+#, fuzzy
+msgid "TDEFileReplace Report"
+msgstr "KFileReplace"
 
 #: report.cpp:73
 msgid "Searching/Replacing Strings Table"
@@ -944,6 +584,375 @@ msgstr "dyddiad"
 msgid "Total occurrences"
 msgstr ""
 
+#: tdefilereplace.cpp:49
+msgid "Could not find the TDEFileReplace part."
+msgstr ""
+
+#: tdefilereplacelib.cpp:99
+#, c-format
+msgid ""
+"_n: 1 byte\n"
+"%n bytes"
+msgstr ""
+
+#: tdefilereplacelib.cpp:105
+msgid "%1 KB"
+msgstr "%1 KB"
+
+#: tdefilereplacelib.cpp:111
+msgid "%1 MB"
+msgstr "%1 MB"
+
+#: tdefilereplacelib.cpp:117
+msgid "%1 GB"
+msgstr "%1 GB"
+
+#: tdefilereplacelib.cpp:140
+msgid ""
+"<qt>Cannot open the file <b>%1</b> and load the string list. This file seems "
+"not to be a valid old kfr file or it is broken.</qt>"
+msgstr ""
+
+#: tdefilereplacelib.cpp:158 tdefilereplacelib.cpp:171
+#: tdefilereplacelib.cpp:177
+msgid "Cannot read data."
+msgstr ""
+
+#: tdefilereplacelib.cpp:167
+msgid "Out of memory."
+msgstr "Allan o gof."
+
+#: tdefilereplacepart.cpp:102
+msgid "Ready."
+msgstr "Parod."
+
+#: tdefilereplacepart.cpp:151
+msgid "Search completed."
+msgstr ""
+
+#: tdefilereplacepart.cpp:164
+msgid ""
+"<qt>You have selected <b>%1</b> as the encoding of the files."
+"<br>Selecting the correct encoding is very important as if you have files that "
+"have some other encoding than the selected one, after a replace you may damage "
+"those files."
+"<br>"
+"<br>In case you do not know the encoding of your files, select <i>utf8</i> "
+"and <b>enable</b> the creation of backup files. This setting will autodetect <i>"
+"utf8</i> and <i>utf16</i> files, but the changed files will be converted to <i>"
+"utf8</i>.</qt>"
+msgstr ""
+
+#: tdefilereplacepart.cpp:164
+msgid "File Encoding Warning"
+msgstr ""
+
+#: tdefilereplacepart.cpp:173
+msgid "Replacing files (simulation)..."
+msgstr ""
+
+#: tdefilereplacepart.cpp:174
+msgid "Replaced strings (simulation)"
+msgstr ""
+
+#: tdefilereplacepart.cpp:178
+msgid "Replacing files..."
+msgstr ""
+
+#: tdefilereplacepart.cpp:179
+msgid "Replaced strings"
+msgstr ""
+
+#: tdefilereplacepart.cpp:233
+#, fuzzy
+msgid "Stopping..."
+msgstr "Aros."
+
+#: tdefilereplacepart.cpp:247
+msgid "There are no results to save: the result list is empty."
+msgstr ""
+
+#: tdefilereplacepart.cpp:251
+msgid "Save Report"
+msgstr ""
+
+#: tdefilereplacepart.cpp:261
+msgid "<qt>A folder or a file named <b>%1</b> already exists.</qt>"
+msgstr ""
+
+#: tdefilereplacepart.cpp:269
+msgid "<qt>Cannot create the <b>%1</b> folder.</qt>"
+msgstr ""
+
+#: tdefilereplacepart.cpp:347
+#, fuzzy
+msgid "TDEFileReplace strings"
+msgstr "KFileReplace"
+
+#: tdefilereplacepart.cpp:347 tdefilereplaceview.cpp:425
+msgid "All Files"
+msgstr "Pob Ffeil"
+
+#: tdefilereplacepart.cpp:348
+msgid "Load Strings From File"
+msgstr ""
+
+#: tdefilereplacepart.cpp:381
+msgid "Cannot open folders."
+msgstr ""
+
+#: tdefilereplacepart.cpp:513
+#, fuzzy
+msgid "TDEFileReplacePart"
+msgstr "KFileReplace"
+
+#: tdefilereplacepart.cpp:515
+msgid "Batch search and replace tool."
+msgstr ""
+
+#: tdefilereplacepart.cpp:525
+msgid "Co-maintainer, KPart creator"
+msgstr ""
+
+#: tdefilereplacepart.cpp:528
+msgid "Original german translator"
+msgstr ""
+
+#: tdefilereplacepart.cpp:538
+msgid "Sorry, currently the TDEFileReplace part works only for local files."
+msgstr ""
+
+#: tdefilereplacepart.cpp:538
+msgid "Non Local File"
+msgstr ""
+
+#: tdefilereplacepart.cpp:570
+msgid "Customize Search/Replace Session..."
+msgstr ""
+
+#: tdefilereplacepart.cpp:571
+msgid "&Search"
+msgstr " &Chwilio"
+
+#: tdefilereplacepart.cpp:572
+msgid "S&imulate"
+msgstr ""
+
+#: tdefilereplacepart.cpp:573
+msgid "&Replace"
+msgstr "A&mnewid"
+
+#: tdefilereplacepart.cpp:574
+msgid "Sto&p"
+msgstr "&Aros"
+
+#: tdefilereplacepart.cpp:575
+msgid "Cre&ate Report File..."
+msgstr ""
+
+#: tdefilereplacepart.cpp:578
+#, fuzzy
+msgid "&Add String..."
+msgstr "Aros."
+
+#: tdefilereplacepart.cpp:580
+msgid "&Delete String"
+msgstr ""
+
+#: tdefilereplacepart.cpp:581
+msgid "&Empty Strings List"
+msgstr ""
+
+#: tdefilereplacepart.cpp:582
+msgid "Edit Selected String..."
+msgstr ""
+
+#: tdefilereplacepart.cpp:583
+msgid "&Save Strings List to File..."
+msgstr ""
+
+#: tdefilereplacepart.cpp:584
+msgid "&Load Strings List From File..."
+msgstr ""
+
+#: tdefilereplacepart.cpp:585
+msgid "&Load Recent Strings Files"
+msgstr ""
+
+#: tdefilereplacepart.cpp:586
+msgid "&Invert Current String (search <--> replace)"
+msgstr ""
+
+#: tdefilereplacepart.cpp:587
+msgid "&Invert All Strings (search <--> replace)"
+msgstr ""
+
+#: tdefilereplacepart.cpp:590
+msgid "&Include Sub-Folders"
+msgstr ""
+
+#: tdefilereplacepart.cpp:591
+msgid "Create &Backup Files"
+msgstr ""
+
+#: tdefilereplacepart.cpp:592
+msgid "Case &Sensitive"
+msgstr "Mae l&lythrennau mawr/bach o bwys"
+
+#: tdefilereplacepart.cpp:593
+msgid "Enable Commands &in Replace String: [$command:option$]"
+msgstr ""
+
+#: tdefilereplacepart.cpp:594
+msgid "Enable &Regular Expressions"
+msgstr ""
+
+#: tdefilereplacepart.cpp:595
+#, fuzzy
+msgid "Configure &TDEFileReplace..."
+msgstr "A&mnewid"
+
+#: tdefilereplacepart.cpp:598 tdefilereplaceview.cpp:530
+msgid "&Properties"
+msgstr "&Priodweddau"
+
+#: tdefilereplacepart.cpp:599 tdefilereplaceview.cpp:502
+msgid "&Open"
+msgstr "A&gor"
+
+#: tdefilereplacepart.cpp:603 tdefilereplaceview.cpp:515
+msgid "&Edit in Quanta"
+msgstr ""
+
+#: tdefilereplacepart.cpp:605 tdefilereplaceview.cpp:521
+msgid "Open Parent &Folder"
+msgstr ""
+
+#: tdefilereplacepart.cpp:607
+msgid "E&xpand Tree"
+msgstr "E&hangu Coeden"
+
+#: tdefilereplacepart.cpp:608
+msgid "&Reduce Tree"
+msgstr ""
+
+#: tdefilereplacepart.cpp:609
+#, fuzzy
+msgid "&About TDEFileReplace"
+msgstr "KFileReplace"
+
+#: tdefilereplacepart.cpp:610
+#, fuzzy
+msgid "TDEFileReplace &Handbook"
+msgstr "KFileReplace"
+
+#: tdefilereplacepart.cpp:611
+msgid "&Report Bug"
+msgstr "&Anfon adroddiad nam"
+
+#: tdefilereplacepart.cpp:1025 tdefilereplacepart.cpp:1113
+#: tdefilereplacepart.cpp:1335
+#, fuzzy
+msgid "<qt>Cannot open file <b>%1</b> for reading.</qt>"
+msgstr "Methu agor ffeil %1 i'w ddarllen."
+
+#: tdefilereplacepart.cpp:1064 tdefilereplacepart.cpp:1142
+#, fuzzy
+msgid "<qt>Cannot open file <b>%1</b> for writing.</qt>"
+msgstr "Methu agor ffeil %1 i'w ysgrifennu."
+
+#: tdefilereplacepart.cpp:1199
+msgid ""
+"<qt>Do you want to replace the string <b>%1</b> with the string <b>%2</b>?</qt>"
+msgstr ""
+
+#: tdefilereplacepart.cpp:1200
+#, fuzzy
+msgid "Confirm Replace"
+msgstr "A&mnewid"
+
+#: tdefilereplacepart.cpp:1202
+#, fuzzy
+msgid "Do Not Replace"
+msgstr "Amnewid:"
+
+#: tdefilereplacepart.cpp:1406 tdefilereplacepart.cpp:1446
+msgid " Line:%2, Col:%3 - \"%1\""
+msgstr ""
+
+#: tdefilereplacepart.cpp:1512
+msgid "<qt>Cannot open the file <b>%1</b> and load the string list.</qt>"
+msgstr ""
+
+#: tdefilereplacepart.cpp:1520
+msgid ""
+"<qt>File <b>%1</b> seems not to be written in new kfr format. Remember that the "
+"old kfr format will be soon abandoned. You can convert your old rules files by "
+"simply saving them with tdefilereplace.</qt>"
+msgstr ""
+
+#: tdefilereplacepart.cpp:1540
+msgid ""
+"<qt>The format of kfr files has been changed; attempting to load <b>%1</b>"
+". Please see the KFilereplace manual for details. Do you want to load a "
+"search-and-replace list of strings?</qt>"
+msgstr ""
+
+#: tdefilereplacepart.cpp:1540
+msgid "Load"
+msgstr "Llwytho"
+
+#: tdefilereplacepart.cpp:1540
+msgid "Do Not Load"
+msgstr ""
+
+#: tdefilereplacepart.cpp:1629
+msgid "There are no strings to search and replace."
+msgstr ""
+
+#: tdefilereplacepart.cpp:1642
+msgid "<qt>The main folder of the project <b>%1</b> does not exist.</qt>"
+msgstr ""
+
+#: tdefilereplacepart.cpp:1650
+msgid "<qt>Access denied in the main folder of the project:<br><b>%1</b></qt>"
+msgstr ""
+
+#: tdefilereplaceview.cpp:120
+msgid ""
+"<qt>Cannot invert string <b>%1</b>, because the search string would be "
+"empty.</qt>"
+msgstr ""
+
+#: tdefilereplaceview.cpp:259
+msgid "File %1 cannot be opened. Might be a DCOP problem."
+msgstr ""
+
+#: tdefilereplaceview.cpp:281
+msgid "Do you really want to delete %1?"
+msgstr ""
+
+#: tdefilereplaceview.cpp:401
+msgid "No strings to save as the list is empty."
+msgstr ""
+
+#: tdefilereplaceview.cpp:425
+#, fuzzy
+msgid "TDEFileReplace Strings"
+msgstr "KFileReplace"
+
+#: tdefilereplaceview.cpp:426
+msgid "Save Strings to File"
+msgstr ""
+
+#: tdefilereplaceview.cpp:437
+msgid "File %1 cannot be saved."
+msgstr ""
+
+#: tdefilereplaceview.cpp:507
+msgid "Open &With..."
+msgstr "Agor &Gyda..."
+
 #: whatthis.h:29
 msgid ""
 "Shows the statistics of your operations. Note that the columns content changes "