Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: applications/koffice - kexi
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/koffice-kexi/
(cherry picked from commit 9966b23858e3637ec42907319da30698d399ab74)

1 files changed, 3622 insertions, 3242 deletions

diff --git a/koffice-i18n-cy/messages/koffice/kexi.po b/koffice-i18n-cy/messages/koffice/kexi.po
index 31911736..11344c6b 100644
--- a/koffice-i18n-cy/messages/koffice/kexi.po
+++ b/koffice-i18n-cy/messages/koffice/kexi.po
@@ -8,19 +8,62 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kexi\n"
-"POT-Creation-Date: 2007-05-19 02:19+0200\n"
+"POT-Creation-Date: 2019-01-06 10:59+0100\n"
 "PO-Revision-Date: 2004-08-12 18:36+0100\n"
 "Last-Translator: KD at 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"
 
-#: core/kexiguimsghandler.cpp:124 core/kexitextmsghandler.cpp:52
-msgid "Unknown error"
-msgstr "Gwall anhysbys"
+#: _translatorinfo:1 core/kexiaboutdata.cpp:76
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "KD wrth KGyfieithu"
+
+#: _translatorinfo:2 core/kexiaboutdata.cpp:76
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "kyfieithu@dotmon.com"
+
+#: core/kexi.cpp:159
+msgid "No View"
+msgstr ""
+
+#: core/kexi.cpp:160
+msgid "Data View"
+msgstr "Golwg Data"
+
+#: core/kexi.cpp:161
+msgid "Design View"
+msgstr "Golwg Cynllunio"
+
+#: core/kexi.cpp:162
+msgid "Text View"
+msgstr "Golwg Testun"
+
+#: core/kexi.cpp:164
+msgid "Unknown"
+msgstr "Anhysbys"
+
+#: core/kexi.cpp:170
+msgid ""
+"You can correct data in this row or use \"Cancel row changes\" function."
+msgstr ""
+
+#: core/kexi.cpp:332
+#, fuzzy
+msgid "This function is not available for version %1 of %2 application."
+msgstr "Ni ellir darllen y ffeil \"%1\"."
+
+#: core/kexi.cpp:337
+msgid "\"%1\" function is not available for version %2 of %3 application."
+msgstr ""
 
 #: core/kexiaboutdata.cpp:29
 msgid "Database creation for everyone"
@@ -64,8 +107,8 @@ msgstr ""
 #: core/kexiaboutdata.cpp:60
 #, fuzzy
 msgid ""
-"Project maintainer & developer, design, KexiDB, commercially supported version, "
-"win32 port"
+"Project maintainer & developer, design, KexiDB, commercially supported "
+"version, win32 port"
 msgstr ""
 "Datblygwr, Cynllunydd, KexiDB, fersiwn a gynhelir yn fasnachol, trosiad win32"
 
@@ -133,126 +176,6 @@ msgstr "Noddi Coffi"
 msgid "Numerous bug reports, usability tests, technical support"
 msgstr ""
 
-#: _translatorinfo.cpp:1 core/kexiaboutdata.cpp:76
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "KD wrth KGyfieithu"
-
-#: _translatorinfo.cpp:3 core/kexiaboutdata.cpp:76
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "kyfieithu@dotmon.com"
-
-#: core/kexidialogbase.cpp:321
-#, fuzzy
-msgid ""
-"Design has been changed. You must save it before switching to other view."
-msgstr "Newidwyd y cynllun. Rhaid i chi ei gadw cyn newid i olwg arall."
-
-#: core/kexidialogbase.cpp:382 main/keximainwindowimpl.cpp:3022
-#, fuzzy
-msgid "Switching to other view failed (%1)."
-msgstr "Methwyd mewnosod y rhes ar y gweinydd."
-
-#: core/kexidialogbase.cpp:520
-msgid "Saving object's definition failed."
-msgstr ""
-
-#: core/kexipartmanager.cpp:134
-#, fuzzy
-msgid "Error while loading plugin \"%1\""
-msgstr "Gwall tra'n llwytho'r modiwl rhan \"%1\""
-
-#: core/kexipartmanager.cpp:201
-#, fuzzy
-msgid "No plugin for mime type \"%1\""
-msgstr "Heb fodiwl rhannau ar gyfer teip MIME \"%1\""
-
-#: core/kexicontexthelp.cpp:34
-msgid "Context Help"
-msgstr "Cymorth Cyd-destun"
-
-#: core/kexiproject.cpp:183
-msgid "Could not open project \"%1\"."
-msgstr "Methwyd agor cywaith \"%1\"."
-
-#: core/kexiproject.cpp:228
-msgid "Could not create project \"%1\"."
-msgstr "Methwyd creu cywaith \"%1\"."
-
-#: core/kexiproject.cpp:272 core/kexiproject.cpp:333
-#, fuzzy
-msgid "Project major version"
-msgstr "Mordwywr cywaith"
-
-#: core/kexiproject.cpp:274 core/kexiproject.cpp:335
-#, fuzzy
-msgid "Project minor version"
-msgstr "Mordwywr cywaith"
-
-#: core/kexiproject.cpp:276
-#, fuzzy
-msgid "Project caption"
-msgstr "Egluryn y cywaith:"
-
-#: core/kexiproject.cpp:278
-#, fuzzy
-msgid "Project description"
-msgstr "&Disgrifiad:"
-
-#: core/kexiproject.cpp:739
-msgid "Opening object \"%1\" failed."
-msgstr ""
-
-#: core/kexiproject.cpp:758
-msgid "This project is opened as read only."
-msgstr ""
-
-#: core/kexiproject.cpp:815 main/keximainwindowimpl.cpp:3860
-msgid "Could not set empty name for this object."
-msgstr ""
-
-#: core/kexiproject.cpp:819
-msgid "Could not use this name. Object with name \"%1\" already exists."
-msgstr ""
-
-#: core/kexiproject.cpp:826
-#, fuzzy
-msgid "Could not rename object \"%1\"."
-msgstr "Methwyd creu cywaith \"%1\""
-
-#: core/kexiproject.cpp:947
-#, fuzzy
-msgid "Warning: entire project's data will be removed."
-msgstr "Mewnosod enw cronfa ddata'r cywaith"
-
-#: core/kexiproject.cpp:961
-#, fuzzy
-msgid ""
-"The project %1 already exists.\n"
-"Do you want to replace it with a new, blank one?"
-msgstr ""
-"Mae'r ffeil \"%1\" eisoes mewn bod.\n"
-" Ydych eisiau ysgrifennu drosti?\n"
-
-#: core/kexiproject.cpp:988
-#, fuzzy
-msgid "Do you want to drop the project \"%1\"?"
-msgstr "Ydych eisiau dileu ymholiad \"%1\"?"
-
-#: core/kexiproject.cpp:997
-msgid ""
-"Could not drop this project. Database connection for this project has been "
-"opened as read only."
-msgstr ""
-
-#: core/kexiinternalpart.cpp:57
-#, fuzzy
-msgid "Could not load \"%1\" plugin."
-msgstr "Methwyd creu cywaith \"%1\""
-
 #: core/kexicmdlineargs.h:30
 #, fuzzy
 msgid "Options related to entire projects:"
@@ -374,11 +297,11 @@ msgstr ""
 "Agor gwrthrych o fath <math_gwrthrych>\n"
 " ac enw <enw_gwrthrych> o'r cywaith penodol\n"
 " wrth gychwyn y cymhwysiad.\n"
-" Nid yw <math_gwrthrych>: yn ofynnol, os y'i hepgor - cymerir mai math tabl ydy "
-"o.\n"
+" Nid yw <math_gwrthrych>: yn ofynnol, os y'i hepgor - cymerir mai math tabl "
+"ydy o.\n"
 " Ymholiad, adroddiad, ffurflen, sgript\n"
-" gall mathau gwrthrychau eraill fod (gall fod yn fwy ynteu'n llai gan ddibynnu "
-"ar yr ategion sydd wedi'u arsefydlu gennych).\n"
+" gall mathau gwrthrychau eraill fod (gall fod yn fwy ynteu'n llai gan "
+"ddibynnu ar yr ategion sydd wedi'u arsefydlu gennych).\n"
 " Defnyddiwch gymeriadau \"\" i bennu enwau â gofodnodau.\n"
 " Enghreifftiau: --open FyNhabl.\n"
 " --open query:\"Fy ymholiad anferth\"\n"
@@ -418,11 +341,11 @@ msgstr ""
 "Agor gwrthrych o fath <math_gwrthrych>\n"
 " ac enw <enw_gwrthrych> o'r cywaith penodol\n"
 " wrth gychwyn y cymhwysiad.\n"
-" Nid yw <math_gwrthrych>: yn ofynnol, os y'i hepgor - cymerir mai math tabl ydy "
-"o.\n"
+" Nid yw <math_gwrthrych>: yn ofynnol, os y'i hepgor - cymerir mai math tabl "
+"ydy o.\n"
 " Ymholiad, adroddiad, ffurflen, sgript\n"
-" gall mathau gwrthrychau eraill fod (gall fod yn fwy ynteu'n llai gan ddibynnu "
-"ar yr ategion sydd wedi'u arsefydlu gennych).\n"
+" gall mathau gwrthrychau eraill fod (gall fod yn fwy ynteu'n llai gan "
+"ddibynnu ar yr ategion sydd wedi'u arsefydlu gennych).\n"
 " Defnyddiwch gymeriadau \"\" i bennu enwau â gofodnodau.\n"
 " Enghreifftiau: --open FyNhabl.\n"
 " --open query:\"Fy ymholiad anferth\"\n"
@@ -504,6 +427,43 @@ msgid ""
 "project on a server to open."
 msgstr "Ffeil gywaith cronfa ddata (neu ffeil fyrlwybr) i'w hagor."
 
+#: core/kexicontexthelp.cpp:34
+msgid "Context Help"
+msgstr "Cymorth Cyd-destun"
+
+#: core/kexidialogbase.cpp:321
+#, fuzzy
+msgid ""
+"Design has been changed. You must save it before switching to other view."
+msgstr "Newidwyd y cynllun. Rhaid i chi ei gadw cyn newid i olwg arall."
+
+#: core/kexidialogbase.cpp:382 main/keximainwindowimpl.cpp:3022
+#, fuzzy
+msgid "Switching to other view failed (%1)."
+msgstr "Methwyd mewnosod y rhes ar y gweinydd."
+
+#: core/kexidialogbase.cpp:520
+msgid "Saving object's definition failed."
+msgstr ""
+
+#: core/kexiguimsghandler.cpp:124 core/kexitextmsghandler.cpp:52
+msgid "Unknown error"
+msgstr "Gwall anhysbys"
+
+#: core/kexiguimsghandler.cpp:150
+msgid "Warning"
+msgstr ""
+
+#: core/kexiguimsghandler.cpp:155
+#, fuzzy
+msgid "Do not show this message again"
+msgstr "Peidiwch â dangos y Dewin hwn eto"
+
+#: core/kexiinternalpart.cpp:57
+#, fuzzy
+msgid "Could not load \"%1\" plugin."
+msgstr "Methwyd creu cywaith \"%1\""
+
 #: core/kexipart.cpp:66
 #, fuzzy
 msgid "Details:"
@@ -546,6 +506,95 @@ msgstr "Methu gwaredu ffeil \"%1\". "
 msgid "Data identifier: \"%1\"."
 msgstr ""
 
+#: core/kexipartmanager.cpp:134
+#, fuzzy
+msgid "Error while loading plugin \"%1\""
+msgstr "Gwall tra'n llwytho'r modiwl rhan \"%1\""
+
+#: core/kexipartmanager.cpp:201
+#, fuzzy
+msgid "No plugin for mime type \"%1\""
+msgstr "Heb fodiwl rhannau ar gyfer teip MIME \"%1\""
+
+#: core/kexiproject.cpp:183
+msgid "Could not open project \"%1\"."
+msgstr "Methwyd agor cywaith \"%1\"."
+
+#: core/kexiproject.cpp:228
+msgid "Could not create project \"%1\"."
+msgstr "Methwyd creu cywaith \"%1\"."
+
+#: core/kexiproject.cpp:272 core/kexiproject.cpp:333
+#, fuzzy
+msgid "Project major version"
+msgstr "Mordwywr cywaith"
+
+#: core/kexiproject.cpp:274 core/kexiproject.cpp:335
+#, fuzzy
+msgid "Project minor version"
+msgstr "Mordwywr cywaith"
+
+#: core/kexiproject.cpp:276
+#, fuzzy
+msgid "Project caption"
+msgstr "Egluryn y cywaith:"
+
+#: core/kexiproject.cpp:278
+#, fuzzy
+msgid "Project description"
+msgstr "&Disgrifiad:"
+
+#: core/kexiproject.cpp:739
+msgid "Opening object \"%1\" failed."
+msgstr ""
+
+#: core/kexiproject.cpp:758
+msgid "This project is opened as read only."
+msgstr ""
+
+#: core/kexiproject.cpp:815 main/keximainwindowimpl.cpp:3860
+msgid "Could not set empty name for this object."
+msgstr ""
+
+#: core/kexiproject.cpp:819
+msgid "Could not use this name. Object with name \"%1\" already exists."
+msgstr ""
+
+#: core/kexiproject.cpp:826
+#, fuzzy
+msgid "Could not rename object \"%1\"."
+msgstr "Methwyd creu cywaith \"%1\""
+
+#: core/kexiproject.cpp:947
+#, fuzzy
+msgid "Warning: entire project's data will be removed."
+msgstr "Mewnosod enw cronfa ddata'r cywaith"
+
+#: core/kexiproject.cpp:961
+#, fuzzy
+msgid ""
+"The project %1 already exists.\n"
+"Do you want to replace it with a new, blank one?"
+msgstr ""
+"Mae'r ffeil \"%1\" eisoes mewn bod.\n"
+" Ydych eisiau ysgrifennu drosti?\n"
+
+#: core/kexiproject.cpp:964 main/kexifinddialog.cpp:215
+#, fuzzy
+msgid "Replace"
+msgstr "A&mnewid"
+
+#: core/kexiproject.cpp:988
+#, fuzzy
+msgid "Do you want to drop the project \"%1\"?"
+msgstr "Ydych eisiau dileu ymholiad \"%1\"?"
+
+#: core/kexiproject.cpp:997
+msgid ""
+"Could not drop this project. Database connection for this project has been "
+"opened as read only."
+msgstr ""
+
 #: core/kexiprojectdata.cpp:159
 #, fuzzy
 msgid ""
@@ -553,6 +602,16 @@ msgid ""
 "(connection %1)"
 msgstr "Gwall yng nghysylltiad y gronfa ddata"
 
+#: core/kexiuseraction.cpp:41
+#, fuzzy
+msgid "Specified part does not exist"
+msgstr "Nid yw ffeil %1 yn bodoli."
+
+#: core/kexiuseraction.cpp:49
+#, fuzzy
+msgid "Specified document could not be opened."
+msgstr "Creuwyd cronfa ddata \"%1\" ond methwyd ei hagor"
+
 #: core/kexiuseractionmethod.cpp:19
 #, fuzzy
 msgid "Open Object"
@@ -576,345 +635,485 @@ msgstr "Creu &Sgript..."
 msgid "Exit Main Application"
 msgstr "Cymhwysiad KPart KDE"
 
-#: core/kexiuseraction.cpp:41
+#: kexidb/connection.cpp:116
 #, fuzzy
-msgid "Specified part does not exist"
-msgstr "Nid yw ffeil %1 yn bodoli."
+msgid "Invalid database contents. "
+msgstr "Cynnwys annilys yn y gronfa ddata "
 
-#: core/kexiuseraction.cpp:49
+#: kexidb/connection.cpp:120
+msgid "It is a system object."
+msgstr ""
+
+#: kexidb/connection.cpp:250
+msgid "Connection already established."
+msgstr "Cysylltiad wedi'i sefydlu eisoes"
+
+#: kexidb/connection.cpp:257
 #, fuzzy
-msgid "Specified document could not be opened."
-msgstr "Creuwyd cronfa ddata \"%1\" ond methwyd ei hagor"
+msgid "Could not open \"%1\" project file."
+msgstr "Methwyd agor cywaith \"%1\""
 
-#: core/kexi.cpp:159
-msgid "No View"
-msgstr ""
+#: kexidb/connection.cpp:258
+#, fuzzy
+msgid "Could not connect to \"%1\" database server."
+msgstr "Heb ei gysylltu â gweinydd y gronfa ddata"
 
-#: core/kexi.cpp:160
-msgid "Data View"
-msgstr "Golwg Data"
+#: kexidb/connection.cpp:300
+msgid "Not connected to the database server."
+msgstr "Heb ei gysylltu â gweinydd y gronfa ddata"
 
-#: core/kexi.cpp:161
-msgid "Design View"
-msgstr "Golwg Cynllunio"
+#: kexidb/connection.cpp:310
+msgid "Currently no database is used."
+msgstr "Ni ddefnyddir cronfa ddata ar hyn o bryd."
 
-#: core/kexi.cpp:162
-msgid "Text View"
-msgstr "Golwg Testun"
+#: kexidb/connection.cpp:366
+msgid "The database \"%1\" does not exist."
+msgstr "Nid yw'r gronfa ddata \"%1\" yn bodoli."
 
-#: core/kexi.cpp:164
-msgid "Unknown"
-msgstr "Anhysbys"
+#: kexidb/connection.cpp:386
+msgid "Database file \"%1\" does not exist."
+msgstr "Nid yw'r ffeil gronfa ddata \"%1\" yn bodoli."
 
-#: core/kexi.cpp:170
+#: kexidb/connection.cpp:392
+msgid "Database file \"%1\" is not readable."
+msgstr "Ni ellir darllen y ffeil gronfa ddata \"%1\"."
+
+#: kexidb/connection.cpp:398
+msgid "Database file \"%1\" is not writable."
+msgstr "Ni ellir ysgrifennu'r ffeil gronfa ddata \"%1\"."
+
+#: kexidb/connection.cpp:441
+msgid "Database \"%1\" already exists."
+msgstr "Mae cronfa ddata \"%1\" yn bodoli eisoes."
+
+#: kexidb/connection.cpp:446
+#, fuzzy
 msgid ""
-"You can correct data in this row or use \"Cancel row changes\" function."
+"Cannot create database \"%1\". This name is reserved for system database."
 msgstr ""
+"Methu creu cronfa ddata \"%1\". Neilltuir yr enw hwn ar gyfer cronfa ddata'r "
+"cysawd."
 
-#: core/kexi.cpp:332
+#: kexidb/connection.cpp:461
+msgid "Error creating database \"%1\" on the server."
+msgstr "Gwall wrth greu cronfa ddata \"%1\" ar y gweinydd."
+
+#: kexidb/connection.cpp:475
+msgid "Database \"%1\" created but could not be opened."
+msgstr "Creuwyd cronfa ddata \"%1\" ond methwyd ei hagor"
+
+#: kexidb/connection.cpp:569
 #, fuzzy
-msgid "This function is not available for version %1 of %2 application."
-msgstr "Ni ellir darllen y ffeil \"%1\"."
+msgid "Opening database \"%1\" failed."
+msgstr "Cadw gwrthrych fel"
 
-#: core/kexi.cpp:337
-msgid "\"%1\" function is not available for version %2 of %3 application."
+#: kexidb/connection.cpp:609
+msgid "Database version (%1) does not match Kexi application's version (%2)"
 msgstr ""
+"Nid yw fersiwn (%1) y gronfa ddata yn cydweddu â fersiwn y cymhwysiad Kexi "
+"(%2)"
 
-#: main/kexinewstuff.cpp:64
-msgid "Choose Directory Where to Install Example Database"
+#: kexidb/connection.cpp:679
+msgid "Cannot find any database for temporary connection."
+msgstr "Methu cael hyd i gronfa ddata ar gyfer cysylltiad dros dro"
+
+#: kexidb/connection.cpp:688
+msgid "Error during starting temporary connection using \"%1\" database name."
 msgstr ""
+"Gwall wrth gychwyn cysylltiad dros dro gan ddefnyddio enw cronfa ddata "
+"\"%1\"."
 
-#: main/startup/KexiConnSelector.cpp:148
-#, fuzzy
-msgid "Add a new database connection"
-msgstr "Gwall yng nghysylltiad y gronfa ddata"
+#: kexidb/connection.cpp:705
+msgid "Cannot drop database - name not specified."
+msgstr "Methu gollwng y gronfa ddata - ni roddwyd enw."
 
-#: main/startup/KexiConnSelector.cpp:149
-#, fuzzy
-msgid "Edit selected database connection"
-msgstr "Gwall yng nghysylltiad y gronfa ddata"
+#: kexidb/connection.cpp:723
+msgid "Cannot delete database - name not specified."
+msgstr "Methu dileu'r gronfa ddata- ni roddwyd enw."
 
-#: main/startup/KexiConnSelector.cpp:150
+#: kexidb/connection.cpp:728
+msgid "Cannot delete system database \"%1\"."
+msgstr "Ni cheir dileu cronfa ddata'r cysawd \"%1\"."
+
+#: kexidb/connection.cpp:1062
 #, fuzzy
-msgid "Remove selected database connections"
-msgstr "Gwall yng nghysylltiad y gronfa ddata"
+msgid "Error while executing SQL statement."
+msgstr "Gwall tra'n darllen y ddogfen."
 
-#: main/startup/KexiConnSelector.cpp:362
-#: widget/relations/kexirelationwidget.cpp:65
-msgid "&Add"
-msgstr "&Ychwanegu"
+#: kexidb/connection.cpp:1533
+msgid "Cannot create table without fields."
+msgstr "Ni cheir creu tabl heb feysydd."
 
-#: main/startup/KexiConnSelector.cpp:362
+#: kexidb/connection.cpp:1543
+msgid "System name \"%1\" cannot be used as table name."
+msgstr "Ni cheir defnyddio enw cysawd \"%1\" fel enw tabl."
+
+#: kexidb/connection.cpp:1552
+msgid "System name \"%1\" cannot be used as one of fields in \"%2\" table."
+msgstr "Ni cheir defnyddio enw cysawd \"%1\" fel un o feysydd tabl \"%2\"."
+
+#: kexidb/connection.cpp:1568
 #, fuzzy
-msgid "Add database connection"
-msgstr "Cysylltiad Cronfa Ddata"
+msgid "Could not create the same table \"%1\" twice."
+msgstr "Methwyd creu cywaith \"%1\""
 
-#: main/startup/KexiConnSelector.cpp:363
+#: kexidb/connection.cpp:1582 plugins/tables/kexitablepart.cpp:212
 #, fuzzy
-msgid "Add New Database Connection"
-msgstr "Cysylltiad Cronfa Ddata"
+msgid "Table \"%1\" already exists."
+msgstr "Mae cronfa ddata \"%1\" yn bodoli eisoes."
 
-#: main/startup/KexiConnSelector.cpp:387
+#: kexidb/connection.cpp:1673
 #, fuzzy
-msgid "Save changes made to this database connection"
-msgstr "Gwall yng nghysylltiad y gronfa ddata"
+msgid "Could not remove object's data."
+msgstr "Methu gwaredu ffeil \"%1\". "
 
-#: main/startup/KexiConnSelector.cpp:388
+#: kexidb/connection.cpp:1704
 #, fuzzy
-msgid "Edit Database Connection"
-msgstr "Cysylltiad Cronfa Ddata"
+msgid "Table \"%1\" cannot be removed.\n"
+msgstr "Ni cheir gwaredu tabl \"%1\"."
 
-#: main/startup/KexiConnSelector.cpp:409
+#: kexidb/connection.cpp:1711
+msgid "Unexpected name or identifier."
+msgstr ""
+
+#: kexidb/connection.cpp:1759
 #, fuzzy
-msgid ""
-"Do you want to remove database connection \"%1\" from the list of available "
-"connections?"
-msgstr "Ydych eisiau dileu ymholiad \"%1\"?"
+msgid "Table \"%1\" does not exist."
+msgstr "Nid yw'r gronfa ddata \"%1\" yn bodoli."
 
-#: main/startup/KexiStartupFileDialog.cpp:204
-msgid "All Supported Files"
-msgstr "Pob Ffeil a Cynhelir"
+#: kexidb/connection.cpp:1774
+msgid "Could not alter table \"%1\" using the same table."
+msgstr ""
 
-#: main/startup/KexiStartupFileDialog.cpp:292
-#: main/startup/KexiStartupFileDialog.cpp:308
-msgid "Enter a filename."
-msgstr "Mewnosod enw ffeil."
+#: kexidb/connection.cpp:1796 kexidb/expression.cpp:772
+#, fuzzy
+msgid "Unknown table \"%1\""
+msgstr "math anhysbys o wrthrych \"%1\""
 
-#: main/startup/KexiStartupFileDialog.cpp:302
+#: kexidb/connection.cpp:1800
 #, fuzzy
-msgid "The file \"%1\" does not exist."
-msgstr "Nid yw'r ffeil \"%1\" mewn bod."
+msgid "Invalid table name \"%1\""
+msgstr "Enw gwrthrych annilys \"%1\""
 
-#: main/startup/KexiStartupFileDialog.cpp:312
-msgid "The file \"%1\" is not readable."
-msgstr "Ni ellir darllen y ffeil \"%1\"."
+#: kexidb/connection.cpp:1806
+msgid "Could rename table \"%1\" using the same name."
+msgstr ""
 
-#: main/startup/KexiStartupFileDialog.cpp:331
-#, fuzzy
-msgid ""
-"The file \"%1\" already exists.\n"
-"Do you want to overwrite it?"
+#: kexidb/connection.cpp:1818
+msgid "Could not rename table \"%1\" to \"%2\". Table \"%3\" already exists."
 msgstr ""
-"Mae'r ffeil \"%1\" eisoes mewn bod.\n"
-" Ydych eisiau ysgrifennu drosti?\n"
 
-#: main/startup/KexiStartupFileDialog.cpp:333
-msgid "Overwrite"
-msgstr "Trosysgrifo"
+#: kexidb/connection.cpp:1940
+#, fuzzy
+msgid "Query \"%1\" does not exist."
+msgstr "<qt>Nid yw'r ffeil \"%1\" mewn bod."
 
-#: main/startup/KexiStartupDialog.cpp:135
-msgid "Create Project"
-msgstr "Creu Cywaith"
+#: kexidb/connection.cpp:2037
+msgid "Transaction already started."
+msgstr "Cychwynwyd y trosglwyddiad eisoes."
 
-#: main/startup/KexiStartupDialog.cpp:137
-msgid "Open Existing Project"
-msgstr "Agor Hen Gywaith"
+#: kexidb/connection.cpp:2079 kexidb/connection.cpp:2115
+msgid "Transaction not started."
+msgstr "Trosglwyddiad heb ei gychwyn."
 
-#: main/startup/KexiProjectSelector.cpp:222
-#: main/startup/KexiStartupDialog.cpp:139
-msgid "Open Recent Project"
-msgstr "Agor Cywaith Diweddar"
+#: kexidb/connection.cpp:2093
+msgid "Error on commit transaction"
+msgstr "Gwall wrth gadarnhau'r trawsweithrediad"
 
-#: main/startup/KexiStartupDialog.cpp:141
-#, fuzzy
-msgid "Choose Project"
-msgstr "Dewis cywaith"
+#: kexidb/connection.cpp:2129
+msgid "Error on rollback transaction"
+msgstr "Gwall wrth ddadwneud y trosglwyddiad"
 
-#: main/startup/KexiStartupDialog.cpp:296
-msgid "&Create Project"
-msgstr "&Creu Cywaith"
+#: kexidb/connection.cpp:2290 kexidb/connection.cpp:2779
+msgid "Invalid object name \"%1\""
+msgstr "Enw gwrthrych annilys \"%1\""
 
-#: main/startup/KexiStartupDialog.cpp:310
-msgid "Don't show me this dialog again"
-msgstr "Peidiwch â dangos yr ymgom hwn eto i mi"
+#: kexidb/connection.cpp:2410
+#, fuzzy
+msgid "Column %1 does not exist for the query."
+msgstr "Nid yw'r gronfa ddata \"%1\" yn bodoli."
 
-#: main/startup/KexiStartupDialog.cpp:321
-msgid "Click \"OK\" button to proceed."
+#: kexidb/connection.cpp:2697
+msgid ""
+"Error in XML data: \"%1\" in line %2, column %3.\n"
+"XML data: "
 msgstr ""
 
-#: main/startup/KexiStartupDialog.cpp:323
+#: kexidb/connection.cpp:2819
 #, fuzzy
-msgid "Blank Database"
-msgstr "Cronfeydd Data Gwag"
+msgid "Table has no fields defined."
+msgstr "Ni cheir gwaredu tabl \"%1\"."
 
-#: main/startup/KexiStartupDialog.cpp:323
-msgid "New Blank Database Project"
-msgstr "Cywaith Cronfa Ddata Newydd Wag"
+#: kexidb/connection.cpp:2945
+msgid ""
+"Could not find definition for query \"%1\". Removing this query is "
+"recommended."
+msgstr ""
 
-#: main/startup/KexiStartupDialog.cpp:326
+#: kexidb/connection.cpp:2954
+msgid ""
+"<p>Could not load definition for query \"%1\". SQL statement for this query "
+"is invalid:<br><tt>%2</tt></p>\n"
+"<p>You can open this query in Text View and correct it.</p>"
+msgstr ""
+
+#: kexidb/connection.cpp:3168
 #, fuzzy
-msgid "Kexi will create a new blank database project."
+msgid "Could not update row because there is no master table defined."
+msgstr "Methwyd creu cywaith \"%1\""
+
+#: kexidb/connection.cpp:3175
+msgid "Could not update row because master table has no primary key defined."
 msgstr ""
-"Creua Kexi gronfa ddata newydd wag.  Cliciwch y botwm \"Iawn\" i fynd ymlaen."
 
-#: main/startup/KexiStartupDialog.cpp:339
+#: kexidb/connection.cpp:3199
 msgid ""
-"_: Keep this text narrow: split to multiple rows if needed\n"
-"Create From\n"
-"Template"
+"Could not update row because it does not contain entire master table's "
+"primary key."
 msgstr ""
 
-#: main/startup/KexiStartupDialog.cpp:340
-#, fuzzy
-msgid "New Database Project From Template"
-msgstr "Patymluniau Cyweithiau Cronfa Ddata Fusnes Newydd"
+#: kexidb/connection.cpp:3210 kexidb/connection.cpp:3431
+msgid "Primary key's field \"%1\" cannot be empty."
+msgstr "Ni all maes y prif allwedd \"%1\" fod yn wag."
 
-#: main/startup/KexiStartupDialog.cpp:343
+#: kexidb/connection.cpp:3227
+msgid "Row updating on the server failed."
+msgstr "Methwyd diweddaru'r rhes ar y gweinydd."
+
+#: kexidb/connection.cpp:3250
 #, fuzzy
+msgid "Could not insert row because there is no master table defined."
+msgstr "Methwyd creu cywaith \"%1\""
+
+#: kexidb/connection.cpp:3284
+msgid "Could not insert row because master table has no primary key defined."
+msgstr ""
+
+#: kexidb/connection.cpp:3293
 msgid ""
-"Kexi will create a new database project using selected template.\n"
-"Select template and click \"OK\" button to proceed."
+"Could not insert row because it does not contain entire master table's "
+"primary key."
 msgstr ""
-"Bydd Kexi'n creu cywaith cronfa ddata newydd. Dewiswch ddull storio i'w "
-"ddefnyddio i gadw'r cywaith newydd.\n"
-"\n"
 
-#: main/startup/KexiStartupDialog.cpp:386
+#: kexidb/connection.cpp:3332
+msgid "Row inserting on the server failed."
+msgstr "Methwyd mewnosod y rhes ar y gweinydd."
+
+#: kexidb/connection.cpp:3397
 #, fuzzy
-msgid ""
-"Import Existing\n"
-"Database"
-msgstr "Dewis Cronfa Ddata"
+msgid "Could not delete row because there is no master table defined."
+msgstr "Methwyd creu cywaith \"%1\""
 
-#: main/startup/KexiStartupDialog.cpp:386
-msgid "Import Existing Database as New Database Project"
+#: kexidb/connection.cpp:3407
+msgid ""
+"Could not delete row because there is no primary key for master table "
+"defined."
 msgstr ""
 
-#: main/startup/KexiStartupDialog.cpp:390
+#: kexidb/connection.cpp:3422
 msgid ""
-"Kexi will import the structure and data of an existing database as a new "
-"database project."
+"Could not delete row because it does not contain entire master table's "
+"primary key."
 msgstr ""
 
-#: main/startup/KexiStartupDialog.cpp:547
-msgid "Open &Existing Project"
-msgstr "Agor &Hen Gywaith"
+#: kexidb/connection.cpp:3448 kexidb/connection.cpp:3471
+#, fuzzy
+msgid "Row deletion on the server failed."
+msgstr "Methwyd dileu y rhes ar y gweinydd."
 
-#: main/startup/KexiStartupDialog.cpp:631
-msgid "Open &Recent Project"
-msgstr "Agor &Cywaith Diweddar"
+#: kexidb/connectiondata.cpp:97
+msgid "file"
+msgstr "ffeil"
 
-#: main/startup/KexiStartup.cpp:143
-#, fuzzy
-msgid "Opening database"
-msgstr "Cronfa ddata newydd"
+#: kexidb/cursor.cpp:142
+msgid "No query statement or schema defined."
+msgstr ""
 
-#: main/startup/KexiStartup.cpp:144
-#, fuzzy
-msgid "Please enter the password."
-msgstr "Rhowch yr enw."
+#: kexidb/cursor.cpp:152
+msgid "Query statement is empty."
+msgstr ""
 
-#: main/startup/KexiStartup.cpp:151
+#: kexidb/cursor.cpp:162
 #, fuzzy
-msgid "local database server"
-msgstr "Disgwylwyd enw ffeil ar gyfer gyrrydd feil-seiliedig."
+msgid "Error opening database cursor."
+msgstr "Gwall yng nghysylltiad y gronfa ddata"
 
-#: main/startup/KexiStartup.cpp:153
-#, fuzzy, c-format
-msgid "Database server: %1"
-msgstr "Gwall Cronfa Ddata"
+#: kexidb/cursor.cpp:418 kexidb/cursor.cpp:441
+msgid "Cannot fetch next record."
+msgstr "Methu nôl y cofnod nesaf"
 
-#: main/startup/KexiStartup.cpp:157
+#: kexidb/dbobjectnamevalidator.cpp:46
+#, fuzzy
 msgid ""
-"_: unspecified user\n"
-"(unspecified)"
+"You cannot use name \"%1\" for your object.\n"
+"It is reserved for internal Kexi objects. Please choose another name."
 msgstr ""
+"Ni cheir defnyddio'r enw \"%1\" am eich gwrthrych.\n"
+" Mae wedi'i gadw ar gyfer gwrthrychau mewnol Kexi. Dewiswch enw arall.\n"
 
-#: main/startup/KexiStartup.cpp:161
-#, c-format
-msgid "Username: %1"
-msgstr "Enw defnyddiwr: %1"
+#: kexidb/dbobjectnamevalidator.cpp:49
+msgid "Names of internal Kexi objects are starting with \"kexi__\"."
+msgstr "Mae enwau gwrthrychau mewnol Kexi yn cychwyn hefo \"kexi__\"."
 
-#: main/startup/KexiStartup.cpp:167
-msgid "&Details"
-msgstr "&Manylion"
+#: kexidb/dbproperties.cpp:44 kexidb/dbproperties.cpp:54
+#: kexidb/dbproperties.cpp:65
+#, fuzzy
+msgid "Could not set value of database property \"%1\"."
+msgstr "Methu llwytho gyrrydd cronfa ddata \"%1\"."
 
-#: main/startup/KexiProjectSelector.cpp:243 main/startup/KexiStartup.cpp:169
-#: widget/kexibrowser.cpp:126 widget/kexidbconnectionwidget.cpp:345
-#: widget/kexidbconnectionwidget.cpp:360
-msgid "&Open"
-msgstr "&Agor"
+#: kexidb/dbproperties.cpp:82 kexidb/dbproperties.cpp:92
+#: kexidb/dbproperties.cpp:103
+#, fuzzy
+msgid "Could not set caption for database property \"%1\"."
+msgstr "Methu canfod gyrrydd cronfa ddata \"%1\"."
 
-#: main/startup/KexiStartup.cpp:284
-msgid ""
-"Could not read connection information from connection shortcut file <nobr>"
-"\"%1\"</nobr>."
-"<br>"
-"<br>Check whether the file has valid contents."
-msgstr ""
+#: kexidb/dbproperties.cpp:116 kexidb/dbproperties.cpp:131
+#, fuzzy
+msgid "Could not read database property \"%1\"."
+msgstr "Methu llwytho gyrrydd cronfa ddata \"%1\"."
 
-#: main/startup/KexiStartup.cpp:297
+#: kexidb/dbproperties.cpp:144
+#, fuzzy
+msgid "Could not read database properties."
+msgstr "Methu canfod unrhyw yryddion cronfa ddata."
+
+#: kexidb/driver.cpp:108
+#, fuzzy
 msgid ""
-"You have specified invalid argument (\"%1\") for \"type\" command-line option."
+"Incompatible database driver's \"%1\" version: found version %2, expected "
+"version %3."
 msgstr ""
+"Fersiwn anghydnaws gyrryddion \"%1\" y gronfa ddata: cafwyd fersiwn %2 gan "
+"ddisgwyl fersiwn %3."
 
-#: main/startup/KexiStartup.cpp:352
-msgid "You have specified invalid port number \"%1\"."
+#: kexidb/driver.cpp:115
+#, fuzzy
+msgid "Invalid database driver's \"%1\" implementation:\n"
 msgstr ""
+"Gweithredoliad annilys o yrrydd y gronfa ddata \"%1\":\n"
+"\n"
 
-#: main/startup/KexiStartup.cpp:368
-msgid "Could not start Kexi application this way."
+#: kexidb/driver.cpp:116
+msgid "Value of \"%1\" is not initialized for the driver."
+msgstr "Nid yw gwerth \"%1\" wedi'i ymgychwyn ar gyfer y gyrrydd."
+
+#: kexidb/driver.cpp:186
+msgid "File name expected for file-based database driver."
+msgstr "Disgwylwyd enw ffeil ar gyfer gyrrydd feil-seiliedig."
+
+#: kexidb/driver_p.cpp:49
+msgid "Client library version"
 msgstr ""
 
-#: main/startup/KexiStartup.cpp:372
-msgid "You have used both \"createdb\" and \"dropdb\" startup options."
+#: kexidb/driver_p.cpp:53
+msgid "Default character encoding on server"
 msgstr ""
 
-#: main/startup/KexiStartup.cpp:378
+#: kexidb/driver_p.cpp:59
 #, fuzzy
-msgid "No project name specified."
-msgstr "Methu gollwng y gronfa ddata - ni roddwyd enw."
+msgid "File-based database driver"
+msgstr "Disgwylwyd enw ffeil ar gyfer gyrrydd feil-seiliedig."
 
-#: main/startup/KexiStartup.cpp:413
-msgid "You have used both \"user-mode\" and \"design-mode\" startup options."
+#: kexidb/driver_p.cpp:62
+msgid "File-based database's MIME type"
 msgstr ""
 
-#: main/startup/KexiStartup.cpp:436
+#: kexidb/driver_p.cpp:68
+msgid "Single transactions"
+msgstr ""
+
+#: kexidb/driver_p.cpp:70
+msgid "Multiple transactions"
+msgstr ""
+
+#: kexidb/driver_p.cpp:72
+msgid "Nested transactions"
+msgstr ""
+
+#: kexidb/driver_p.cpp:74
+msgid "Ignored"
+msgstr "Anwybyddwyd"
+
+#: kexidb/driver_p.cpp:76 plugins/importexport/csv/kexicsvwidgets.cpp:137
+#: plugins/importexport/csv/kexicsvwidgets.cpp:152
+#: plugins/queries/kexiquerydesignerguieditor.cpp:1734
+#: plugins/tables/kexitabledesignerview.cpp:406
+msgid "None"
+msgstr "Dim"
+
+#: kexidb/driver_p.cpp:81
 #, fuzzy
-msgid ""
-"Could not remove project.\n"
-"The file \"%1\" does not exist."
-msgstr "<qt>Nid yw'r ffeil \"%1\" mewn bod."
+msgid "Single transactions support"
+msgstr "Trosglwyddiad heb ei gychwyn."
 
-#: main/startup/KexiStartup.cpp:478
+#: kexidb/driver_p.cpp:83
 #, fuzzy
-msgid ""
-"Could not open shortcut file\n"
-"\"%1\"."
-msgstr "Methwyd agor cywaith \"%1\""
+msgid "Multiple transactions support"
+msgstr "Trosglwyddiad heb ei gychwyn."
 
-#: main/startup/KexiStartup.cpp:511
+#: kexidb/driver_p.cpp:85
 #, fuzzy
-msgid ""
-"Could not open connection data file\n"
-"\"%1\"."
-msgstr "Methwyd agor cywaith \"%1\""
+msgid "Nested transactions support"
+msgstr "Trosglwyddiad heb ei gychwyn."
 
-#: main/startup/KexiStartup.cpp:598
-msgid ""
-"You have specified a few database objects to be opened automatically, using "
-"startup options.\n"
-"These options will be ignored because it is not available while creating or "
-"dropping projects."
+#: kexidb/driver_p.cpp:90
+msgid "KexiDB driver version"
 msgstr ""
 
-#: main/startup/KexiStartup.cpp:614
-msgid "Project \"%1\" created successfully."
-msgstr ""
+#: kexidb/drivermanager.cpp:179
+msgid "Could not find any database drivers."
+msgstr "Methu canfod unrhyw yryddion cronfa ddata."
 
-#: main/startup/KexiStartup.cpp:624
-msgid "Project \"%1\" dropped successfully."
-msgstr ""
+#: kexidb/drivermanager.cpp:189 kexidb/drivermanager.cpp:206
+msgid "Could not find database driver \"%1\"."
+msgstr "Methu canfod gyrrydd cronfa ddata \"%1\"."
 
-#: main/startup/KexiStartup.cpp:750 main/startup/KexiStartup.cpp:782
+#: kexidb/drivermanager.cpp:218
+msgid "Could not load database driver \"%1\"."
+msgstr "Methu llwytho gyrrydd cronfa ddata \"%1\"."
+
+#: kexidb/drivermanager.cpp:363
+msgid "No such driver service: \"%1\"."
+msgstr "Dim gyrrydd o'r math: \"%1\"."
+
+#: kexidb/drivers/pqxx/pqxxconnection.cpp:221
+#: kexidb/drivers/pqxx/pqxxconnection.cpp:307
+#: kexidb/drivers/pqxx/pqxxconnection.cpp:415
+msgid "Unknown error."
+msgstr "Gwall anhysbys."
+
+#: kexidb/drivers/pqxx/pqxxcursor.cpp:85
+msgid "No connection for cursor open operation specified"
+msgstr "Dim cysylltiad wedi'i benodi ar gyfer y weithred agor cwrchydd"
+
+#: kexidb/drivers/sqlite/sqliteadmin.cpp:49
 #, fuzzy
-msgid "<p>Could not open project.</p>"
-msgstr "Methwyd agor cywaith \"%1\""
+msgid "Could not compact database \"%1\"."
+msgstr "Methu llwytho gyrrydd cronfa ddata \"%1\"."
 
-#: main/startup/KexiStartup.cpp:751
+#: kexidb/drivers/sqlite/sqliteconnection.cpp:202
 #, fuzzy
-msgid "<p>The file <nobr>\"%1\"</nobr> does not exist or is not readable.</p>"
-msgstr "Ni ellir darllen y ffeil \"%1\"."
+msgid "Do you want to open file \"%1\" as read-only?"
+msgstr "Ydych eisiau dileu'r rhes dewisiedig?"
+
+#: kexidb/drivers/sqlite/sqliteconnection.cpp:205
+#: kexidb/drivers/sqlite/sqliteconnection.cpp:221
+#: kexidb/drivers/sqlite/sqliteconnection.cpp:227
+msgid "The file is probably already open on this or another computer."
+msgstr ""
+
+#: kexidb/drivers/sqlite/sqliteconnection.cpp:206
+#: kexidb/drivers/sqlite/sqliteconnection.cpp:228
+msgid "Could not gain exclusive access for writing the file."
+msgstr ""
+
+#: kexidb/drivers/sqlite/sqliteconnection.cpp:208
+msgid "Open As Read-Only"
+msgstr ""
+
+#: kexidb/drivers/sqlite/sqliteconnection.cpp:222
+msgid "Could not gain exclusive access for reading and writing the file."
+msgstr ""
 
 #: kexidb/drivers/sqlite/sqliteconnection.cpp:223
 #: kexidb/drivers/sqlite/sqliteconnection.cpp:229
@@ -925,195 +1124,388 @@ msgid ""
 "another application."
 msgstr ""
 
-#: main/startup/KexiStartup.cpp:783
+#: kexidb/drivers/sqlite/sqliteconnection.cpp:252
 #, fuzzy
-msgid "<p>The file <nobr>\"%1\"</nobr> is not readable.</p>"
-msgstr "Ni ellir darllen y ffeil \"%1\"."
+msgid "Could not close busy database."
+msgstr "Methu llwytho gyrrydd cronfa ddata \"%1\"."
 
-#: main/startup/KexiStartup.cpp:805
+#: kexidb/drivers/sqlite/sqliteconnection.cpp:266
+msgid "Could not remove file \"%1\"."
+msgstr "Methu gwaredu ffeil \"%1\". "
+
+#: kexidb/drivers/sqlite/sqlitevacuum.cpp:80
+#, fuzzy
+msgid "Compacting database"
+msgstr "Cronfa ddata newydd"
+
+#: kexidb/drivers/sqlite/sqlitevacuum.cpp:81
+#, fuzzy
+msgid "Compacting database \"%1\"..."
+msgstr "Cadw gwrthrych fel"
+
+#: kexidb/drivers/sqlite/sqlitevacuum.cpp:100
+msgid "The database has been compacted. Current size decreased by %1% to %2."
+msgstr ""
+
+#: kexidb/expression.cpp:715 kexidb/parser/parser_p.cpp:288
+#, fuzzy
+msgid "Ambiguous field name"
+msgstr "Enw maes"
+
+#: kexidb/expression.cpp:716 kexidb/parser/parser_p.cpp:289
 msgid ""
-"\"%1\" is an external file of type:\n"
-"\"%2\".\n"
-"Do you want to import the file as a Kexi project?"
+"Both table \"%1\" and \"%2\" have defined \"%3\" field. Use \"<tableName>."
+"%4\" notation to specify table name."
 msgstr ""
 
-#: main/startup/KexiStartup.cpp:808
+#: kexidb/expression.cpp:725 kexidb/expression.cpp:797
+#: kexidb/parser/parser_p.cpp:298 kexidb/parser/parser_p.cpp:381
 #, fuzzy
-msgid "Open External File"
-msgstr "Agor Ffeil"
+msgid "Field not found"
+msgstr "Ymholiad heb ei ganfod"
 
-#: main/startup/KexiStartup.cpp:808
-msgid "Import..."
-msgstr "Mewnforio..."
+#: kexidb/expression.cpp:726 kexidb/parser/parser_p.cpp:299
+msgid "Table containing \"%1\" field not found"
+msgstr ""
 
-#: main/startup/KexiStartup.cpp:830
-msgid ""
-"The project file \"%1\" is recognized as compatible with \"%2\" database "
-"driver, while you have asked for \"%3\" database driver to be used.\n"
-"Do you want to use \"%4\" database driver?"
+#: kexidb/expression.cpp:751 kexidb/parser/parser_p.cpp:322
+msgid "Could not access the table directly using its name"
 msgstr ""
 
-#: main/startup/KexiStartup.cpp:852
+#: kexidb/expression.cpp:752 kexidb/parser/parser_p.cpp:323
 msgid ""
-"Previous version of database file format (\"%1\") is detected in the \"%2\" "
-"project file.\n"
-"Do you want to convert the project to a new \"%3\" format (recommended)?"
+"Table \"%1\" is covered by aliases. Instead of \"%2\", you can write \"%3\""
 msgstr ""
 
-#: main/startup/KexiStartup.cpp:863
-msgid ""
-"Failed to convert project file \"%1\" to a new \"%2\" format.\n"
-"The file format remains unchanged."
+#: kexidb/expression.cpp:771
+#, fuzzy
+msgid "Table not found"
+msgstr "ni chafwyd y gwrthrych"
+
+#: kexidb/expression.cpp:785 kexidb/parser/parser_p.cpp:351
+msgid "Ambiguous \"%1.*\" expression"
 msgstr ""
 
-#: main/startup/KexiStartup.cpp:875
-msgid "Possible problems:"
+#: kexidb/expression.cpp:786 kexidb/parser/parser_p.cpp:352
+msgid "More than one \"%1\" table or alias defined"
 msgstr ""
 
-#: main/startup/KexiStartup.cpp:880
-msgid "The file \"%1\" is not recognized as being supported by Kexi."
-msgstr "Nid adnabyddir y ffeil \"%1\" fel un a gynhelir gan Kexi."
+#: kexidb/expression.cpp:798 kexidb/parser/parser_p.cpp:381
+#, fuzzy
+msgid "Table \"%1\" has no \"%2\" field"
+msgstr "Ni cheir gwaredu tabl \"%1\"."
 
-#: main/startup/KexiStartup.cpp:883
-#, fuzzy, c-format
-msgid ""
-"Database driver for this file type not found.\n"
-"Detected MIME type: %1"
+#: kexidb/expression.cpp:813 kexidb/parser/parser_p.cpp:371
+msgid "Ambiguous \"%1.%2\" expression"
 msgstr ""
-"<qt>Ni chafwyd gyrrydd cronfa ddata ar gyfer y math yma o ffeil."
-"<p>Darganfuwyd math MIME: %1"
 
-#: main/startup/KexiStartup.cpp:919 main/startup/KexiStartup.cpp:923
+#: kexidb/expression.cpp:815 kexidb/parser/parser_p.cpp:372
+msgid "More than one \"%1\" table or alias defined containing \"%2\" field"
+msgstr ""
+
+#: kexidb/field.cpp:685
+msgid "Invalid Type"
+msgstr "Math annilys"
+
+#: kexidb/field.cpp:686
+msgid "Byte"
+msgstr "Beit"
+
+#: kexidb/field.cpp:687
+msgid "Short Integer Number"
+msgstr "Cyfanrif cwta"
+
+#: kexidb/field.cpp:688 kexidb/field.cpp:718
+msgid "Integer Number"
+msgstr "Cyfanrif"
+
+#: kexidb/field.cpp:689
+msgid "Big Integer Number"
+msgstr "Cyfanrif mawr"
+
+#: kexidb/field.cpp:690
+msgid "Yes/No Value"
+msgstr "Gwerth Ie/Nage"
+
+#: kexidb/field.cpp:691 plugins/importexport/csv/kexicsvimportdialog.cpp:227
+msgid "Date"
+msgstr "Dyddiad"
+
+#: kexidb/field.cpp:692
+msgid "Date and Time"
+msgstr "Dyddiad ac Amser"
+
+#: kexidb/field.cpp:693 plugins/importexport/csv/kexicsvimportdialog.cpp:228
+msgid "Time"
+msgstr "Amser"
+
+#: kexidb/field.cpp:694
+msgid "Single Precision Number"
+msgstr "Rhif gywirdeb sengl"
+
+#: kexidb/field.cpp:695
+msgid "Double Precision Number"
+msgstr "Rhif cywirdeb dwbl"
+
+#: kexidb/field.cpp:696 kexidb/field.cpp:717
+#: plugins/importexport/csv/kexicsvimportdialog.cpp:225
+msgid "Text"
+msgstr "Testun"
+
+#: kexidb/field.cpp:697
+msgid "Long Text"
+msgstr "Testun hir"
+
+#: kexidb/field.cpp:698 kexidb/field.cpp:722
+#: plugins/macros/kexiactions/objectvariable.h:56
+msgid "Object"
+msgstr "Gwrthrych"
+
+#: kexidb/field.cpp:716
+msgid "Invalid Group"
+msgstr "Grŵp annilys"
+
+#: kexidb/field.cpp:719
+msgid "Floating Point Number"
+msgstr "Rhif pwynt arnawf"
+
+#: kexidb/field.cpp:720
+msgid "Yes/No"
+msgstr "Ie/Nage"
+
+#: kexidb/field.cpp:721 plugins/importexport/csv/kexicsvimportdialog.cpp:229
+msgid "Date/Time"
+msgstr "Dyddiad/Amser"
+
+#: kexidb/object.cpp:60
+msgid "Unspecified error encountered"
+msgstr "Cafwyd gwall amhenodol"
+
+#: kexidb/parser/parser_p.cpp:136
+msgid "identifier was expected"
+msgstr ""
+
+#: kexidb/parser/parser_p.cpp:144 kexidb/parser/parser_p.cpp:147
+msgid "Syntax Error"
+msgstr "Gwall Cystrawen"
+
+#: kexidb/parser/parser_p.cpp:145
+msgid "\"%1\" is a reserved keyword"
+msgstr ""
+
+#: kexidb/parser/parser_p.cpp:148
 #, fuzzy
-msgid ""
-"Could not load list of available projects for <b>%1</b> database server."
+msgid "Syntax Error near \"%1\""
+msgstr "Gwall Cystrawen ger '%1'"
+
+#: kexidb/parser/parser_p.cpp:177
+#: plugins/macros/kexipart/keximacroerrorbase.ui:16
+#, fuzzy, no-c-format
+msgid "Error"
+msgstr "Gwall: %1"
+
+#: kexidb/parser/parser_p.cpp:177
+msgid "No query specified"
 msgstr ""
-"Methwyd llwytho y rhestr o gyweithiau ar gael ar gyfer y cysylltiad \"%1\""
 
-#: main/startup/KexiStartup.cpp:954
-msgid ""
-"Failed saving connection data to\n"
-"\"%1\" file."
+#: kexidb/parser/parser_p.cpp:242
+msgid "\"*\" could not be used if no tables are specified"
 msgstr ""
 
-#: main/startup/KexiStartup_p.cpp:75
-msgid "Saving \"%1\" project file to a new \"%2\" database format..."
+#: kexidb/parser/parser_p.cpp:439
+#, fuzzy
+msgid "Table \"%1\" does not exist"
+msgstr "Nid yw'r gronfa ddata \"%1\" yn bodoli."
+
+#: kexidb/parser/parser_p.cpp:513
+#, fuzzy
+msgid "Invalid alias definition for column \"%1\""
+msgstr "Math annilys"
+
+#: kexidb/parser/parser_p.cpp:545
+#, fuzzy
+msgid "Invalid \"%1\" column definition"
+msgstr "Math annilys"
+
+#: kexidb/parser/parser_p.cpp:612
+#, c-format
+msgid "Could not define sorting - no column at position %1"
 msgstr ""
 
-#: main/startup/KexiProjectSelector.cpp:236
-msgid "Open Project"
-msgstr "Agor Cywaith"
+#: kexidb/parser/parser_p.cpp:621
+#, fuzzy
+msgid "Could not define sorting - column name or alias \"%1\" does not exist"
+msgstr "<qt>Nid yw'r ffeil \"%1\" mewn bod."
 
-#: main/startup/KexiProjectSelector.cpp:243
-#: widget/kexidbconnectionwidget.cpp:345 widget/kexidbconnectionwidget.cpp:360
+#: sqlscanner.l:98
 #, fuzzy
-msgid "Open Database Connection"
-msgstr "Gwall yng nghysylltiad y gronfa ddata"
+msgid "Invalid integer number"
+msgstr "Cyfanrif mawr"
 
-#: main/startup/KexiProjectSelector.cpp:250
-msgid "Select a project on <b>%1</b> database server to open:"
+#: sqlscanner.l:98
+msgid "This integer number may be too large."
 msgstr ""
 
-#: main/startup/KexiNewProjectWizard.cpp:93
+#: sqlscanner.l:286
 #, fuzzy
-msgid "Creating New Project"
-msgstr "Wrthi'n creu cywaith newydd"
+msgid "Invalid identifier"
+msgstr "Math annilys"
 
-#: main/startup/KexiNewProjectWizard.cpp:94
-msgid "Create"
-msgstr "Creu"
+#: plugins/queries/kexiquerydesignerguieditor.cpp:1453 sqlscanner.l:287
+msgid "Identifiers should start with a letter or '_' character"
+msgstr ""
 
-#: main/startup/KexiNewProjectWizard.cpp:108
+#: kexidb/queryschema.cpp:250
+#: plugins/queries/kexiquerydesignerguieditor.cpp:1271
+msgid ""
+"_: short for 'expression' word (only latin letters, please)\n"
+"expr"
+msgstr ""
+
+#: kexidb/simplecommandlineapp.cpp:35
 #, fuzzy
-msgid "New Project Stored in File"
-msgstr "Cywaith newydd wedi'i storio mewn ffeil"
+msgid "Database driver name"
+msgstr "Gweinydd Cronfa Ddata"
 
-#: main/startup/KexiNewProjectWizard.cpp:116
+#: kexidb/simplecommandlineapp.cpp:37
 #, fuzzy
-msgid "New Project Stored on Database Server"
-msgstr "Cywaith newydd wedi'i storio ar weinydd cronfa ddata"
+msgid "Database user name"
+msgstr "Gweinydd Cronfa Ddata"
 
-#: main/startup/KexiNewProjectWizard.cpp:134
+#: kexidb/simplecommandlineapp.cpp:39
 #, fuzzy
-msgid "Select Storage Method"
-msgstr "Dewiswch dull storio"
+msgid "Prompt for password"
+msgstr "Cadw cyfrinair"
 
-#: main/startup/KexiNewProjectWizard.cpp:139
+#: kexidb/simplecommandlineapp.cpp:41
+msgid "Host (server) name"
+msgstr ""
+
+#: kexidb/simplecommandlineapp.cpp:42
 #, fuzzy
-msgid "Select Project's Caption"
-msgstr "Dewiswch pennawd y prosiect"
+msgid "Server's port number"
+msgstr "Enw canlyniad y gweinydd:"
 
-#: main/startup/KexiNewProjectWizard.cpp:144
-msgid "Enter a new Kexi project's file name:"
-msgstr "Rhowch enw ffeil ar gyfer cywaith newydd Kexi:"
+#: kexidb/simplecommandlineapp.cpp:44
+#, fuzzy
+msgid "Server's local socket filename"
+msgstr "Mewnosod enw cronfa ddata'r cywaith"
 
-#: main/startup/KexiNewProjectWizard.cpp:160
+#: kexidb/simplecommandlineapp.cpp:143
+#, fuzzy
+msgid "Enter password for %1: "
+msgstr "Rhowch yr enw."
+
+#: kexidb/utils.cpp:139
+msgid "Message from server:"
+msgstr "Neges gan y gweinydd:"
+
+#: kexidb/utils.cpp:141
+msgid "SQL statement:"
+msgstr "Datganiad SQL:"
+
+#: kexidb/utils.cpp:153
+msgid "Server result name:"
+msgstr "Enw canlyniad y gweinydd:"
+
+#: kexidb/utils.cpp:157
+#, fuzzy
+msgid "Server result number:"
+msgstr "Enw canlyniad y gweinydd:"
+
+#: kexidb/utils.cpp:389 kexidb/utils.cpp:445 kexidb/utils.cpp:451
 #, fuzzy
+msgid "Test Connection"
+msgstr "Cysylltiad"
+
+#: kexidb/utils.cpp:389
+#, fuzzy
+msgid "<qt>Testing connection to <b>%1</b> database server...</qt>"
+msgstr "Heb ei gysylltu â gweinydd y gronfa ddata"
+
+#: kexidb/utils.cpp:443
 msgid ""
-"Select database server's connection you wish to use to create a new Kexi "
-"project. "
-"<p>Here you may also add, edit or remove connections from the list."
+"<qt>Test connection to <b>%1</b> database server failed. The server is not "
+"responding.</qt>"
 msgstr ""
-"Dewiswch y cysylltiad cronfa ddata yr hoffech ei ddefnyddio i greu cywaith Kexi "
-"newydd. "
-"<p>Cewch hefyd ychwanegu, golygu neu ddileu cysylltiadau o'r rhestr."
 
-#: main/startup/KexiNewProjectWizard.cpp:177
+#: kexidb/utils.cpp:449
+msgid ""
+"<qt>Test connection to <b>%1</b> database server established successfully.</"
+"qt>"
+msgstr ""
+
+#: kexidb/utils.cpp:1254 plugins/importexport/csv/kexicsvimportdialog.cpp:226
+msgid "Number"
+msgstr "Rhif"
+
+#: kexidb/utils.cpp:1257 plugins/forms/kexidbfactory.cpp:326
+#: widget/utils/kexicontextmenuutils.cpp:249
+msgid "Image"
+msgstr "Delwedd"
+
+#: kexiutils/identifier.cpp:90
 #, fuzzy
-msgid "Select Project's Location"
-msgstr "Dewiswch leoliad y cywaith"
+msgid "Value of \"%1\" column must be an identifier."
+msgstr ""
+"Rhaid i werth colofn \"%1\" fod yn ddynodiad. \n"
+"Nid yw \"%2\" yn ddynodiad dilys.\n"
 
-#: main/startup/KexiNewProjectWizard.cpp:181
+#: kexiutils/identifier.cpp:91
 #, fuzzy
-msgid "Existing project databases on <b>%1</b> database server:"
-msgstr "Hen gyweithiau ar weinydd <b>%1</b>:"
+msgid "\"%1\" is not a valid identifier."
+msgstr "Math annilys"
 
-#: main/startup/KexiNewProjectWizard.cpp:190
-#: main/startup/KexiNewProjectWizard.cpp:244
-msgid "New database"
-msgstr "Cronfa ddata newydd"
+#: kexiutils/validator.h:78
+msgid "\"%1\" value has to be entered."
+msgstr "Mae angen rhoi gwerth \"%1\" i fewn."
 
-#: main/startup/KexiNewProjectWizard.cpp:198
+#: main/kexifinddialog.cpp:162
 #, fuzzy
-msgid "Select Project's Caption & Database Name"
-msgstr "Dewiswch pennawd y cywaith ac enw'r gronfa ddata"
+msgid "(All fields)"
+msgstr "Enw'r tabl:"
 
-#: main/startup/KexiNewProjectWizard.cpp:288
-#: main/startup/KexiNewProjectWizard.cpp:327
-msgid "Enter project caption."
-msgstr "Mewnosod pennawd y cywaith."
+#: main/kexifinddialog.cpp:163
+#, fuzzy
+msgid "(Current field)"
+msgstr "Cyfredol:"
 
-#: main/startup/KexiNewProjectWizard.cpp:300
-msgid "Select server connection for a new project."
-msgstr "Dewiswch gysylltiad gweinydd ar gyfer cywaith newydd."
+#: main/kexifinddialog.cpp:217
+#, fuzzy
+msgid "Replace in \"%1\""
+msgstr "Am&newid efo:"
 
-#: main/startup/KexiNewProjectWizard.cpp:334
-msgid "Enter project's database name."
-msgstr "Mewnosod enw cronfa ddata'r cywaith."
+#: main/kexifinddialog.cpp:221 main/kexifinddialogbase.ui:16
+#, fuzzy, no-c-format
+msgid "Find"
+msgstr "KFind"
 
-#: main/startup/KexiNewProjectWizard.cpp:343
-#, fuzzy
-msgid ""
-"<b>A project with database name \"%1\" already exists</b>"
-"<p>Do you want to delete it and create a new one?"
+#: main/kexifinddialog.cpp:223
+msgid "Find in \"%1\""
 msgstr ""
-"<b>Mae cywaith o'r enw \"%1\" mewn bod eisoes.</b>"
-"<p>Ydych eisiau ei ddileu a chreu un newydd?"
 
-#. i18n: file data/kexiui.rc line 125
-#: main/keximainwindowimpl.cpp:331 main/keximainwindowimpl.cpp:396 rc.cpp:45
+#: main/kexifinddialog.cpp:246
+#, fuzzy
+msgid "The search item was not found"
+msgstr "ni chafwyd y gwrthrych"
+
+#: data/kexiui.rc:125 main/keximainwindowimpl.cpp:331
+#: main/keximainwindowimpl.cpp:396
 #, no-c-format
 msgid "&Window"
 msgstr "&Ffenestr"
 
-#. i18n: file data/kexiui.rc line 21
-#: main/keximainwindowimpl.cpp:344 rc.cpp:9
+#: data/kexiui.rc:88 main/keximainwindowimpl.cpp:338
+#, fuzzy, no-c-format
+msgid "&Insert"
+msgstr "Mewnosod %1"
+
+#: data/kexiui.rc:21 main/keximainwindowimpl.cpp:344
 #, no-c-format
 msgid "&Import"
 msgstr "&Mewnforio"
 
-#. i18n: file data/kexiui.rc line 57
-#: main/keximainwindowimpl.cpp:345 rc.cpp:21
+#: data/kexiui.rc:57 main/keximainwindowimpl.cpp:345
 #, no-c-format
 msgid "Paste &Special"
 msgstr ""
@@ -1174,6 +1566,12 @@ msgstr ""
 msgid "Downloads example databases from the Internet."
 msgstr "Cyrchfan Mewnforio"
 
+#: data/kexiui.rc:11 main/keximainwindowimpl.cpp:547
+#: main/keximainwindowimpl.cpp:2866
+#, fuzzy, no-c-format
+msgid "Open Recent"
+msgstr "Agor Cywaith Diweddar"
+
 #: main/keximainwindowimpl.cpp:568
 msgid "Save object changes"
 msgstr "Cadw newidiadau i'r gwrthrych"
@@ -1196,8 +1594,8 @@ msgid ""
 "Saves object changes from currently selected window under a new name (within "
 "the same project)."
 msgstr ""
-"Cadw gwrthrychau o'r ffenestr a ddewisir ar hyn o bryd o dan enw newydd (yn yr "
-"un cywaith)."
+"Cadw gwrthrychau o'r ffenestr a ddewisir ar hyn o bryd o dan enw newydd (yn "
+"yr un cywaith)."
 
 #: main/keximainwindowimpl.cpp:578
 #, fuzzy
@@ -1352,6 +1750,12 @@ msgstr ""
 msgid "Reverts the most recent undo action."
 msgstr ""
 
+#: main/keximainwindowimpl.cpp:718 widget/kexibrowser.cpp:148
+#: widget/kexibrowser.cpp:151
+#, fuzzy
+msgid "&Delete"
+msgstr "&Dileu Rhes"
+
 #: main/keximainwindowimpl.cpp:720
 #, fuzzy
 msgid "Delete selected object"
@@ -1543,8 +1947,8 @@ msgstr ""
 
 #: main/keximainwindowimpl.cpp:830
 msgid ""
-"Sorts data in ascending order (from A to Z and from 0 to 9). Data from selected "
-"column is used for sorting."
+"Sorts data in ascending order (from A to Z and from 0 to 9). Data from "
+"selected column is used for sorting."
 msgstr ""
 
 #: main/keximainwindowimpl.cpp:832
@@ -1656,8 +2060,7 @@ msgstr "rheswm:"
 #: main/keximainwindowimpl.cpp:1321
 msgid ""
 "<qt>Database project %1 does not appear to have been created using Kexi."
-"<br>"
-"<br>Do you want to import it as a new Kexi project?</qt>"
+"<br><br>Do you want to import it as a new Kexi project?</qt>"
 msgstr ""
 
 #: main/keximainwindowimpl.cpp:1323
@@ -1749,12 +2152,18 @@ msgstr "methu agor y gwrthrych"
 #: main/keximainwindowimpl.cpp:1552
 #, fuzzy
 msgid ""
-"You have requested selected objects to be automatically opened or processed on "
-"startup. Several objects cannot be opened or processed."
+"You have requested selected objects to be automatically opened or processed "
+"on startup. Several objects cannot be opened or processed."
 msgstr ""
 "Rydych wedi gofyn agor sawl gwrthrych yn ymysgogol wrth ymgychwyn.  Ni cheir "
 "agor sawl gwrthrych."
 
+#: main/keximainwindowimpl.cpp:1803 widget/kexipropertyeditorview.cpp:110
+#: widget/utils/kexicontextmenuutils.cpp:85
+#, fuzzy
+msgid "Properties"
+msgstr "Priodwedd"
+
 #: main/keximainwindowimpl.cpp:2823
 #, fuzzy
 msgid "Recently Opened Databases"
@@ -1790,9 +2199,8 @@ msgstr "Cadw'r Gwrthrych Fel"
 msgid "Do you want to replace it?"
 msgstr "Ydych eisiau gwaredu:"
 
-#. i18n: file ./main/kexifinddialogbase.ui line 132
-#: main/keximainwindowimpl.cpp:3123 migration/importwizard.cpp:824 rc.cpp:163
-#: widget/utils/kexicontextmenuutils.cpp:191
+#: main/kexifinddialogbase.ui:132 main/keximainwindowimpl.cpp:3123
+#: migration/importwizard.cpp:824 widget/utils/kexicontextmenuutils.cpp:191
 #, no-c-format
 msgid "&Replace"
 msgstr "A&mnewid"
@@ -1815,11 +2223,11 @@ msgstr "Cadw gwrthrych fel"
 msgid "Saving new \"%1\" object failed."
 msgstr ""
 
-#: main/keximainwindowimpl.cpp:3224 main/keximainwindowimpl.cpp:4423
+#: main/keximainwindowimpl.cpp:3224 main/keximainwindowimpl.cpp:4424
 msgid "Save changes"
 msgstr "Cadw Newidiadau"
 
-#: main/keximainwindowimpl.cpp:3226 main/keximainwindowimpl.cpp:4425
+#: main/keximainwindowimpl.cpp:3226 main/keximainwindowimpl.cpp:4426
 msgid ""
 "Pressing this button will save all recent changes made in \"%1\" object."
 msgstr ""
@@ -1847,6 +2255,12 @@ msgid ""
 "If you click \"Delete\", you will not be able to undo the deletion."
 msgstr ""
 
+#: main/keximainwindowimpl.cpp:3794
+#: plugins/queries/kexiparameterlisteditor.ui:75
+#, fuzzy, no-c-format
+msgid "Delete"
+msgstr "Dileu Rhes"
+
 #: main/keximainwindowimpl.cpp:3845
 #, fuzzy
 msgid "Could not remove object."
@@ -1888,28 +2302,28 @@ msgstr "Ni ellir darllen y ffeil \"%1\"."
 
 #: main/keximainwindowimpl.cpp:4199
 msgid ""
-"The current project has to be closed before compacting the database. It will be "
-"open again after compacting.\n"
+"The current project has to be closed before compacting the database. It will "
+"be open again after compacting.\n"
 "\n"
 "Do you want to continue?"
 msgstr ""
 
-#: main/keximainwindowimpl.cpp:4429
+#: main/keximainwindowimpl.cpp:4430
 msgid ""
 "Pressing this button will ignore all unsaved changes made in \"%1\" object."
 msgstr ""
 
-#: main/keximainwindowimpl.cpp:4434
+#: main/keximainwindowimpl.cpp:4435
 #, fuzzy
 msgid "Do you want to save changes before printing?"
 msgstr "Ydych eisiau dileu'r rhes dewisiedig?"
 
-#: main/keximainwindowimpl.cpp:4436
+#: main/keximainwindowimpl.cpp:4437
 #, fuzzy
 msgid "Do you want to save changes before making print preview?"
 msgstr "Ydych eisiau dileu'r rhes dewisiedig?"
 
-#: main/keximainwindowimpl.cpp:4438
+#: main/keximainwindowimpl.cpp:4439
 #, fuzzy
 msgid "Do you want to save changes before showing page setup?"
 msgstr "Ydych eisiau dileu'r rhes dewisiedig?"
@@ -1924,35 +2338,58 @@ msgstr "Methwyd creu cywaith \"%1\""
 msgid "Command \"%1\" failed."
 msgstr "Cadw gwrthrych fel"
 
-#: main/kexifinddialog.cpp:162
-#, fuzzy
-msgid "(All fields)"
-msgstr "Enw'r tabl:"
+#: main/kexinamewidget.cpp:73
+msgid "Caption:"
+msgstr "Pennawd:"
 
-#: main/kexifinddialog.cpp:163
-#, fuzzy
-msgid "(Current field)"
-msgstr "Cyfredol:"
+#: main/kexinamewidget.cpp:94
+msgid "Please enter the name."
+msgstr "Rhowch yr enw."
 
-#: main/kexifinddialog.cpp:217
-#, fuzzy
-msgid "Replace in \"%1\""
-msgstr "Am&newid efo:"
+#: main/kexinamewidget.cpp:95
+msgid "Please enter the caption."
+msgstr "Rhowch y pennawd."
 
-#. i18n: file ./main/kexifinddialogbase.ui line 16
-#: main/kexifinddialog.cpp:221 rc.cpp:142
-#, fuzzy, no-c-format
-msgid "Find"
-msgstr "KFind"
+#: main/kexinewstuff.cpp:64
+msgid "Choose Directory Where to Install Example Database"
+msgstr ""
 
-#: main/kexifinddialog.cpp:223
-msgid "Find in \"%1\""
+#: main/kexistatusbar.cpp:53 main/kexistatusbar.cpp:142
+msgid "Read only"
 msgstr ""
 
-#: main/kexifinddialog.cpp:246
+#: main/kexistatusbar.cpp:129
+msgid " Line: %1 Col: %2 "
+msgstr "Llinell: %1 Col: %2"
+
+#: main/printing/kexisimpleprintingengine.cpp:150
 #, fuzzy
-msgid "The search item was not found"
-msgstr "ni chafwyd y gwrthrych"
+msgid "Could not load data from table or query."
+msgstr "Methu llwytho gyrrydd cronfa ddata \"%1\"."
+
+#: main/printing/kexisimpleprintingengine.cpp:328
+#: main/printing/kexisimpleprintpreviewwindow.cpp:318
+msgid ""
+"_: Page (number) of (total)\n"
+"Page %1 of %2"
+msgstr ""
+
+#: main/printing/kexisimpleprintingengine.cpp:331
+#, c-format
+msgid "Page %1"
+msgstr "Tudalen %1"
+
+#: main/printing/kexisimpleprintingengine.cpp:454
+msgid ""
+"_: Boolean Yes (true)\n"
+"Yes"
+msgstr "Ie"
+
+#: main/printing/kexisimpleprintingengine.cpp:454
+msgid ""
+"_: Boolean No (false)\n"
+"No"
+msgstr "Nage"
 
 #: main/printing/kexisimpleprintingpagesetup.cpp:93
 #: main/printing/kexisimpleprintingpart.cpp:32
@@ -2007,6 +2444,15 @@ msgstr ""
 msgid "Changes page size and margins."
 msgstr ""
 
+#: main/printing/kexisimpleprintingpagesetup.cpp:451
+#, fuzzy
+msgid "Portrait"
+msgstr "Porth:"
+
+#: main/printing/kexisimpleprintingpagesetup.cpp:451
+msgid "Landscape"
+msgstr ""
+
 #: main/printing/kexisimpleprintingpagesetup.cpp:452
 #, fuzzy
 msgid "margins:"
@@ -2040,85 +2486,503 @@ msgstr "Tudalen Nesaf"
 msgid "Last Page"
 msgstr "Tudalen Olaf"
 
-#: main/printing/kexisimpleprintingengine.cpp:328
-#: main/printing/kexisimpleprintpreviewwindow.cpp:318
+#: main/startup/KexiConnSelector.cpp:68 main/startup/KexiProjectSelector.cpp:74
+#, fuzzy
+msgid "File"
+msgstr "&Ychwanegu Ffeil"
+
+#: main/startup/KexiConnSelector.cpp:148
+#, fuzzy
+msgid "Add a new database connection"
+msgstr "Gwall yng nghysylltiad y gronfa ddata"
+
+#: main/startup/KexiConnSelector.cpp:149
+#, fuzzy
+msgid "Edit selected database connection"
+msgstr "Gwall yng nghysylltiad y gronfa ddata"
+
+#: main/startup/KexiConnSelector.cpp:150
+#, fuzzy
+msgid "Remove selected database connections"
+msgstr "Gwall yng nghysylltiad y gronfa ddata"
+
+#: main/startup/KexiConnSelector.cpp:362
+#: widget/relations/kexirelationwidget.cpp:65
+msgid "&Add"
+msgstr "&Ychwanegu"
+
+#: main/startup/KexiConnSelector.cpp:362
+#, fuzzy
+msgid "Add database connection"
+msgstr "Cysylltiad Cronfa Ddata"
+
+#: main/startup/KexiConnSelector.cpp:363
+#, fuzzy
+msgid "Add New Database Connection"
+msgstr "Cysylltiad Cronfa Ddata"
+
+#: main/startup/KexiConnSelector.cpp:387
+#, fuzzy
+msgid "&Save"
+msgstr "Cadw &Rhes"
+
+#: main/startup/KexiConnSelector.cpp:387
+#, fuzzy
+msgid "Save changes made to this database connection"
+msgstr "Gwall yng nghysylltiad y gronfa ddata"
+
+#: main/startup/KexiConnSelector.cpp:388
+#, fuzzy
+msgid "Edit Database Connection"
+msgstr "Cysylltiad Cronfa Ddata"
+
+#: main/startup/KexiConnSelector.cpp:409
+#, fuzzy
 msgid ""
-"_: Page (number) of (total)\n"
-"Page %1 of %2"
+"Do you want to remove database connection \"%1\" from the list of available "
+"connections?"
+msgstr "Ydych eisiau dileu ymholiad \"%1\"?"
+
+#: main/startup/KexiNewProjectWizard.cpp:93
+#, fuzzy
+msgid "Creating New Project"
+msgstr "Wrthi'n creu cywaith newydd"
+
+#: main/startup/KexiNewProjectWizard.cpp:94
+msgid "Create"
+msgstr "Creu"
+
+#: main/startup/KexiNewProjectWizard.cpp:108
+#, fuzzy
+msgid "New Project Stored in File"
+msgstr "Cywaith newydd wedi'i storio mewn ffeil"
+
+#: main/startup/KexiNewProjectWizard.cpp:116
+#, fuzzy
+msgid "New Project Stored on Database Server"
+msgstr "Cywaith newydd wedi'i storio ar weinydd cronfa ddata"
+
+#: main/startup/KexiNewProjectWizard.cpp:134
+#, fuzzy
+msgid "Select Storage Method"
+msgstr "Dewiswch dull storio"
+
+#: main/startup/KexiNewProjectWizard.cpp:139
+#, fuzzy
+msgid "Select Project's Caption"
+msgstr "Dewiswch pennawd y prosiect"
+
+#: main/startup/KexiNewProjectWizard.cpp:144
+msgid "Enter a new Kexi project's file name:"
+msgstr "Rhowch enw ffeil ar gyfer cywaith newydd Kexi:"
+
+#: main/startup/KexiNewProjectWizard.cpp:160
+#, fuzzy
+msgid ""
+"Select database server's connection you wish to use to create a new Kexi "
+"project. <p>Here you may also add, edit or remove connections from the list."
 msgstr ""
+"Dewiswch y cysylltiad cronfa ddata yr hoffech ei ddefnyddio i greu cywaith "
+"Kexi newydd. <p>Cewch hefyd ychwanegu, golygu neu ddileu cysylltiadau o'r "
+"rhestr."
 
-#: main/printing/kexisimpleprintingengine.cpp:150
+#: main/startup/KexiNewProjectWizard.cpp:177
 #, fuzzy
-msgid "Could not load data from table or query."
-msgstr "Methu llwytho gyrrydd cronfa ddata \"%1\"."
+msgid "Select Project's Location"
+msgstr "Dewiswch leoliad y cywaith"
 
-#: main/printing/kexisimpleprintingengine.cpp:331
+#: main/startup/KexiNewProjectWizard.cpp:181
+#, fuzzy
+msgid "Existing project databases on <b>%1</b> database server:"
+msgstr "Hen gyweithiau ar weinydd <b>%1</b>:"
+
+#: main/startup/KexiNewProjectWizard.cpp:190
+#: main/startup/KexiNewProjectWizard.cpp:244
+msgid "New database"
+msgstr "Cronfa ddata newydd"
+
+#: main/startup/KexiNewProjectWizard.cpp:198
+#, fuzzy
+msgid "Select Project's Caption & Database Name"
+msgstr "Dewiswch pennawd y cywaith ac enw'r gronfa ddata"
+
+#: main/startup/KexiNewProjectWizard.cpp:288
+#: main/startup/KexiNewProjectWizard.cpp:327
+msgid "Enter project caption."
+msgstr "Mewnosod pennawd y cywaith."
+
+#: main/startup/KexiNewProjectWizard.cpp:300
+msgid "Select server connection for a new project."
+msgstr "Dewiswch gysylltiad gweinydd ar gyfer cywaith newydd."
+
+#: main/startup/KexiNewProjectWizard.cpp:334
+msgid "Enter project's database name."
+msgstr "Mewnosod enw cronfa ddata'r cywaith."
+
+#: main/startup/KexiNewProjectWizard.cpp:343
+#, fuzzy
+msgid ""
+"<b>A project with database name \"%1\" already exists</b><p>Do you want to "
+"delete it and create a new one?"
+msgstr ""
+"<b>Mae cywaith o'r enw \"%1\" mewn bod eisoes.</b><p>Ydych eisiau ei ddileu "
+"a chreu un newydd?"
+
+#: main/startup/KexiProjectSelector.cpp:222
+#: main/startup/KexiStartupDialog.cpp:139
+msgid "Open Recent Project"
+msgstr "Agor Cywaith Diweddar"
+
+#: main/startup/KexiProjectSelector.cpp:236
+msgid "Open Project"
+msgstr "Agor Cywaith"
+
+#: main/startup/KexiProjectSelector.cpp:243 main/startup/KexiStartup.cpp:169
+#: widget/kexibrowser.cpp:126 widget/kexidbconnectionwidget.cpp:345
+#: widget/kexidbconnectionwidget.cpp:360
+msgid "&Open"
+msgstr "&Agor"
+
+#: main/startup/KexiProjectSelector.cpp:243
+#: widget/kexidbconnectionwidget.cpp:345 widget/kexidbconnectionwidget.cpp:360
+#, fuzzy
+msgid "Open Database Connection"
+msgstr "Gwall yng nghysylltiad y gronfa ddata"
+
+#: main/startup/KexiProjectSelector.cpp:250
+msgid "Select a project on <b>%1</b> database server to open:"
+msgstr ""
+
+#: main/startup/KexiStartup.cpp:143
+#, fuzzy
+msgid "Opening database"
+msgstr "Cronfa ddata newydd"
+
+#: main/startup/KexiStartup.cpp:144
+#, fuzzy
+msgid "Please enter the password."
+msgstr "Rhowch yr enw."
+
+#: main/startup/KexiStartup.cpp:151
+#, fuzzy
+msgid "local database server"
+msgstr "Disgwylwyd enw ffeil ar gyfer gyrrydd feil-seiliedig."
+
+#: main/startup/KexiStartup.cpp:153
+#, fuzzy, c-format
+msgid "Database server: %1"
+msgstr "Gwall Cronfa Ddata"
+
+#: main/startup/KexiStartup.cpp:157
+msgid ""
+"_: unspecified user\n"
+"(unspecified)"
+msgstr ""
+
+#: main/startup/KexiStartup.cpp:161
 #, c-format
-msgid "Page %1"
-msgstr "Tudalen %1"
+msgid "Username: %1"
+msgstr "Enw defnyddiwr: %1"
 
-#: main/printing/kexisimpleprintingengine.cpp:454
+#: main/startup/KexiStartup.cpp:167
+msgid "&Details"
+msgstr "&Manylion"
+
+#: main/startup/KexiStartup.cpp:284
 msgid ""
-"_: Boolean Yes (true)\n"
-"Yes"
-msgstr "Ie"
+"Could not read connection information from connection shortcut file <nobr>"
+"\"%1\"</nobr>.<br><br>Check whether the file has valid contents."
+msgstr ""
 
-#: main/printing/kexisimpleprintingengine.cpp:454
+#: main/startup/KexiStartup.cpp:297
 msgid ""
-"_: Boolean No (false)\n"
-"No"
-msgstr "Nage"
+"You have specified invalid argument (\"%1\") for \"type\" command-line "
+"option."
+msgstr ""
 
-#: main/kexinamewidget.cpp:73
-msgid "Caption:"
-msgstr "Pennawd:"
+#: main/startup/KexiStartup.cpp:352
+msgid "You have specified invalid port number \"%1\"."
+msgstr ""
 
-#: main/kexinamewidget.cpp:94
-msgid "Please enter the name."
-msgstr "Rhowch yr enw."
+#: main/startup/KexiStartup.cpp:368
+msgid "Could not start Kexi application this way."
+msgstr ""
 
-#: main/kexinamewidget.cpp:95
-msgid "Please enter the caption."
-msgstr "Rhowch y pennawd."
+#: main/startup/KexiStartup.cpp:372
+msgid "You have used both \"createdb\" and \"dropdb\" startup options."
+msgstr ""
 
-#: main/kexistatusbar.cpp:53 main/kexistatusbar.cpp:142
-msgid "Read only"
+#: main/startup/KexiStartup.cpp:378
+#, fuzzy
+msgid "No project name specified."
+msgstr "Methu gollwng y gronfa ddata - ni roddwyd enw."
+
+#: main/startup/KexiStartup.cpp:413
+msgid "You have used both \"user-mode\" and \"design-mode\" startup options."
 msgstr ""
 
-#: main/kexistatusbar.cpp:129
-msgid " Line: %1 Col: %2 "
-msgstr "Llinell: %1 Col: %2"
+#: main/startup/KexiStartup.cpp:436
+#, fuzzy
+msgid ""
+"Could not remove project.\n"
+"The file \"%1\" does not exist."
+msgstr "<qt>Nid yw'r ffeil \"%1\" mewn bod."
 
-#: kexiutils/identifier.cpp:90
+#: main/startup/KexiStartup.cpp:478
 #, fuzzy
-msgid "Value of \"%1\" column must be an identifier."
+msgid ""
+"Could not open shortcut file\n"
+"\"%1\"."
+msgstr "Methwyd agor cywaith \"%1\""
+
+#: main/startup/KexiStartup.cpp:511
+#, fuzzy
+msgid ""
+"Could not open connection data file\n"
+"\"%1\"."
+msgstr "Methwyd agor cywaith \"%1\""
+
+#: main/startup/KexiStartup.cpp:598
+msgid ""
+"You have specified a few database objects to be opened automatically, using "
+"startup options.\n"
+"These options will be ignored because it is not available while creating or "
+"dropping projects."
 msgstr ""
-"Rhaid i werth colofn \"%1\" fod yn ddynodiad. \n"
-"Nid yw \"%2\" yn ddynodiad dilys.\n"
 
-#: kexiutils/identifier.cpp:91
+#: main/startup/KexiStartup.cpp:614
+msgid "Project \"%1\" created successfully."
+msgstr ""
+
+#: main/startup/KexiStartup.cpp:624
+msgid "Project \"%1\" dropped successfully."
+msgstr ""
+
+#: main/startup/KexiStartup.cpp:750 main/startup/KexiStartup.cpp:782
 #, fuzzy
-msgid "\"%1\" is not a valid identifier."
-msgstr "Math annilys"
+msgid "<p>Could not open project.</p>"
+msgstr "Methwyd agor cywaith \"%1\""
 
-#: kexiutils/validator.h:78
-msgid "\"%1\" value has to be entered."
-msgstr "Mae angen rhoi gwerth \"%1\" i fewn."
+#: main/startup/KexiStartup.cpp:751
+#, fuzzy
+msgid "<p>The file <nobr>\"%1\"</nobr> does not exist or is not readable.</p>"
+msgstr "Ni ellir darllen y ffeil \"%1\"."
 
-#: migration/migratemanager.cpp:172
+#: main/startup/KexiStartup.cpp:783
 #, fuzzy
-msgid "Could not find any import/export database drivers."
-msgstr "Methu canfod unrhyw yryddion cronfa ddata."
+msgid "<p>The file <nobr>\"%1\"</nobr> is not readable.</p>"
+msgstr "Ni ellir darllen y ffeil \"%1\"."
 
-#: migration/migratemanager.cpp:191
+#: main/startup/KexiStartup.cpp:805
+msgid ""
+"\"%1\" is an external file of type:\n"
+"\"%2\".\n"
+"Do you want to import the file as a Kexi project?"
+msgstr ""
+
+#: main/startup/KexiStartup.cpp:808
 #, fuzzy
-msgid "Could not find import/export database driver \"%1\"."
-msgstr "Methu canfod gyrrydd cronfa ddata \"%1\"."
+msgid "Open External File"
+msgstr "Agor Ffeil"
 
-#: migration/migratemanager.cpp:203
+#: main/startup/KexiStartup.cpp:808
+msgid "Import..."
+msgstr "Mewnforio..."
+
+#: main/startup/KexiStartup.cpp:830
+msgid ""
+"The project file \"%1\" is recognized as compatible with \"%2\" database "
+"driver, while you have asked for \"%3\" database driver to be used.\n"
+"Do you want to use \"%4\" database driver?"
+msgstr ""
+
+#: main/startup/KexiStartup.cpp:852
+msgid ""
+"Previous version of database file format (\"%1\") is detected in the \"%2\" "
+"project file.\n"
+"Do you want to convert the project to a new \"%3\" format (recommended)?"
+msgstr ""
+
+#: main/startup/KexiStartup.cpp:863
+msgid ""
+"Failed to convert project file \"%1\" to a new \"%2\" format.\n"
+"The file format remains unchanged."
+msgstr ""
+
+#: main/startup/KexiStartup.cpp:875
+msgid "Possible problems:"
+msgstr ""
+
+#: main/startup/KexiStartup.cpp:880
+msgid "The file \"%1\" is not recognized as being supported by Kexi."
+msgstr "Nid adnabyddir y ffeil \"%1\" fel un a gynhelir gan Kexi."
+
+#: main/startup/KexiStartup.cpp:883
+#, fuzzy, c-format
+msgid ""
+"Database driver for this file type not found.\n"
+"Detected MIME type: %1"
+msgstr ""
+"<qt>Ni chafwyd gyrrydd cronfa ddata ar gyfer y math yma o ffeil."
+"<p>Darganfuwyd math MIME: %1"
+
+#: main/startup/KexiStartup.cpp:919 main/startup/KexiStartup.cpp:923
 #, fuzzy
-msgid "Could not load import/export database driver \"%1\"."
-msgstr "Methu llwytho gyrrydd cronfa ddata \"%1\"."
+msgid ""
+"Could not load list of available projects for <b>%1</b> database server."
+msgstr ""
+"Methwyd llwytho y rhestr o gyweithiau ar gael ar gyfer y cysylltiad \"%1\""
+
+#: main/startup/KexiStartup.cpp:954
+msgid ""
+"Failed saving connection data to\n"
+"\"%1\" file."
+msgstr ""
+
+#: main/startup/KexiStartupDialog.cpp:135
+msgid "Create Project"
+msgstr "Creu Cywaith"
+
+#: main/startup/KexiStartupDialog.cpp:137
+msgid "Open Existing Project"
+msgstr "Agor Hen Gywaith"
+
+#: main/startup/KexiStartupDialog.cpp:141
+#, fuzzy
+msgid "Choose Project"
+msgstr "Dewis cywaith"
+
+#: main/startup/KexiStartupDialog.cpp:296
+msgid "&Create Project"
+msgstr "&Creu Cywaith"
+
+#: main/startup/KexiStartupDialog.cpp:310
+msgid "Don't show me this dialog again"
+msgstr "Peidiwch â dangos yr ymgom hwn eto i mi"
+
+#: main/startup/KexiStartupDialog.cpp:321
+msgid "Click \"OK\" button to proceed."
+msgstr ""
+
+#: main/startup/KexiStartupDialog.cpp:323
+#, fuzzy
+msgid "Blank Database"
+msgstr "Cronfeydd Data Gwag"
+
+#: main/startup/KexiStartupDialog.cpp:323
+msgid "New Blank Database Project"
+msgstr "Cywaith Cronfa Ddata Newydd Wag"
+
+#: main/startup/KexiStartupDialog.cpp:326
+#, fuzzy
+msgid "Kexi will create a new blank database project."
+msgstr ""
+"Creua Kexi gronfa ddata newydd wag.  Cliciwch y botwm \"Iawn\" i fynd ymlaen."
+
+#: main/startup/KexiStartupDialog.cpp:339
+msgid ""
+"_: Keep this text narrow: split to multiple rows if needed\n"
+"Create From\n"
+"Template"
+msgstr ""
+
+#: main/startup/KexiStartupDialog.cpp:340
+#, fuzzy
+msgid "New Database Project From Template"
+msgstr "Patymluniau Cyweithiau Cronfa Ddata Fusnes Newydd"
+
+#: main/startup/KexiStartupDialog.cpp:343
+#, fuzzy
+msgid ""
+"Kexi will create a new database project using selected template.\n"
+"Select template and click \"OK\" button to proceed."
+msgstr ""
+"Bydd Kexi'n creu cywaith cronfa ddata newydd. Dewiswch ddull storio i'w "
+"ddefnyddio i gadw'r cywaith newydd.\n"
+"\n"
+
+#: main/startup/KexiStartupDialog.cpp:386
+#, fuzzy
+msgid ""
+"Import Existing\n"
+"Database"
+msgstr "Dewis Cronfa Ddata"
+
+#: main/startup/KexiStartupDialog.cpp:386
+msgid "Import Existing Database as New Database Project"
+msgstr ""
+
+#: main/startup/KexiStartupDialog.cpp:390
+msgid ""
+"Kexi will import the structure and data of an existing database as a new "
+"database project."
+msgstr ""
+
+#: main/startup/KexiStartupDialog.cpp:547
+msgid "Open &Existing Project"
+msgstr "Agor &Hen Gywaith"
+
+#: main/startup/KexiStartupDialog.cpp:631
+msgid "Open &Recent Project"
+msgstr "Agor &Cywaith Diweddar"
+
+#: main/startup/KexiStartupFileDialog.cpp:204
+msgid "All Supported Files"
+msgstr "Pob Ffeil a Cynhelir"
+
+#: main/startup/KexiStartupFileDialog.cpp:292
+#: main/startup/KexiStartupFileDialog.cpp:308
+msgid "Enter a filename."
+msgstr "Mewnosod enw ffeil."
+
+#: main/startup/KexiStartupFileDialog.cpp:302
+#, fuzzy
+msgid "The file \"%1\" does not exist."
+msgstr "Nid yw'r ffeil \"%1\" mewn bod."
+
+#: main/startup/KexiStartupFileDialog.cpp:312
+msgid "The file \"%1\" is not readable."
+msgstr "Ni ellir darllen y ffeil \"%1\"."
+
+#: main/startup/KexiStartupFileDialog.cpp:331
+#, fuzzy
+msgid ""
+"The file \"%1\" already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Mae'r ffeil \"%1\" eisoes mewn bod.\n"
+" Ydych eisiau ysgrifennu drosti?\n"
+
+#: main/startup/KexiStartupFileDialog.cpp:333
+msgid "Overwrite"
+msgstr "Trosysgrifo"
+
+#: main/startup/KexiStartup_p.cpp:75
+msgid "Saving \"%1\" project file to a new \"%2\" database format..."
+msgstr ""
+
+#: migration/importoptionsdlg.cpp:42
+msgid "Advanced Import Options"
+msgstr ""
+
+#: migration/importoptionsdlg.cpp:59
+msgid ""
+"<h3>Text encoding for Microsoft Access database</h3>\n"
+"<p>Database file \"%1\" appears to be created by a version of Microsoft "
+"Access older than 2000.</p><p>In order to properly import national "
+"characters, you may need to choose a proper text encoding if the database "
+"was created on a computer with a different character set.</p>"
+msgstr ""
+
+#: migration/importoptionsdlg.cpp:68
+#: plugins/importexport/csv/kexicsvexportwizard.cpp:175
+#: plugins/importexport/csv/kexicsvimportoptionsdlg.cpp:87
+msgid "Text encoding:"
+msgstr ""
+
+#: migration/importoptionsdlg.cpp:72
+msgid "Always use this encoding in similar situations"
+msgstr ""
 
 #: migration/importwizard.cpp:65
 #, fuzzy
@@ -2127,20 +2991,20 @@ msgstr "Dewis Cronfa Ddata"
 
 #: migration/importwizard.cpp:154
 msgid ""
-"<qt>Database Importing wizard is about to import \"%1\" database <nobr>"
-"(connection %2)</nobr> into a Kexi database.</qt>"
+"<qt>Database Importing wizard is about to import \"%1\" database "
+"<nobr>(connection %2)</nobr> into a Kexi database.</qt>"
 msgstr ""
 
 #: migration/importwizard.cpp:161
 msgid ""
-"<qt>Database Importing wizard is about to import <nobr>\"%1\"</nobr> "
-"file of type \"%2\" into a Kexi database.</qt>"
+"<qt>Database Importing wizard is about to import <nobr>\"%1\"</nobr> file of "
+"type \"%2\" into a Kexi database.</qt>"
 msgstr ""
 
 #: migration/importwizard.cpp:166
 msgid ""
-"Database Importing wizard allows you to import an existing database into a Kexi "
-"database."
+"Database Importing wizard allows you to import an existing database into a "
+"Kexi database."
 msgstr ""
 
 #: migration/importwizard.cpp:170
@@ -2251,8 +3115,8 @@ msgstr "Dewis Cronfa Ddata"
 
 #: migration/importwizard.cpp:539
 msgid ""
-"All required information has now been gathered. Click \"Next\" button to start "
-"importing.\n"
+"All required information has now been gathered. Click \"Next\" button to "
+"start importing.\n"
 "\n"
 "Depending on size of the database this may take some time."
 msgstr ""
@@ -2268,6 +3132,12 @@ msgstr ""
 "Mae'r ffeil \"%1\" eisoes mewn bod.\n"
 " Ydych eisiau ysgrifennu drosti?\n"
 
+#: migration/importwizard.cpp:824
+#: plugins/macros/kexipart/keximacroerrorbase.ui:99
+#, fuzzy, no-c-format
+msgid "No"
+msgstr "Dim"
+
 #: migration/importwizard.cpp:861
 #, fuzzy
 msgid "Failure"
@@ -2275,9 +3145,8 @@ msgstr "Gwerth"
 
 #: migration/importwizard.cpp:863
 msgid ""
-"<p>Import failed.</p>%1"
-"<p>%2</p>"
-"<p>You can click \"Back\" button and try again.</p>"
+"<p>Import failed.</p>%1<p>%2</p><p>You can click \"Back\" button and try "
+"again.</p>"
 msgstr ""
 
 #: migration/importwizard.cpp:884
@@ -2306,6 +3175,12 @@ msgstr ""
 msgid "No help is available for this page."
 msgstr ""
 
+#: migration/importwizard.cpp:992 migration/importwizard.cpp:1000
+#: migration/importwizard.cpp:1004 migration/importwizard.cpp:1008
+#: migration/importwizard.cpp:1012 migration/importwizard.cpp:1016
+msgid "Help"
+msgstr ""
+
 #: migration/importwizard.cpp:1000
 msgid "Here you can choose the location to import data from."
 msgstr ""
@@ -2320,31 +3195,8 @@ msgstr ""
 
 #: migration/importwizard.cpp:1012
 msgid ""
-"Here you can choose the location to save the data in and the new database name."
-msgstr ""
-
-#: migration/importoptionsdlg.cpp:42
-msgid "Advanced Import Options"
-msgstr ""
-
-#: migration/importoptionsdlg.cpp:59
-msgid ""
-"<h3>Text encoding for Microsoft Access database</h3>\n"
-"<p>Database file \"%1\" appears to be created by a version of Microsoft Access "
-"older than 2000.</p>"
-"<p>In order to properly import national characters, you may need to choose a "
-"proper text encoding if the database was created on a computer with a different "
-"character set.</p>"
-msgstr ""
-
-#: migration/importoptionsdlg.cpp:68
-#: plugins/importexport/csv/kexicsvexportwizard.cpp:175
-#: plugins/importexport/csv/kexicsvimportoptionsdlg.cpp:87
-msgid "Text encoding:"
-msgstr ""
-
-#: migration/importoptionsdlg.cpp:72
-msgid "Always use this encoding in similar situations"
+"Here you can choose the location to save the data in and the new database "
+"name."
 msgstr ""
 
 #: migration/keximigrate.cpp:76 migration/keximigrate.cpp:126
@@ -2388,18 +3240,18 @@ msgstr "Heb ei gysylltu â gweinydd y gronfa ddata"
 msgid "Could not import data from data source \"%1\"."
 msgstr "Methu canfod gyrrydd cronfa ddata \"%1\"."
 
-#: migration/keximigrate.cpp:512
+#: migration/keximigrate.cpp:511
 #, fuzzy
 msgid "Field Type"
 msgstr "Math o faes:"
 
-#: migration/keximigrate.cpp:513
+#: migration/keximigrate.cpp:512
 msgid ""
 "The data type for %1 could not be determined. Please select one of the "
 "following data types"
 msgstr ""
 
-#: migration/keximigrate.cpp:577
+#: migration/keximigrate.cpp:576
 #, fuzzy
 msgid ""
 "Incompatible migration driver's \"%1\" version: found version %2, expected "
@@ -2408,1355 +3260,41 @@ msgstr ""
 "Fersiwn anghydnaws gyrryddion \"%1\" y gronfa ddata: cafwyd fersiwn %2 gan "
 "ddisgwyl fersiwn %3."
 
-#: kexidb/simplecommandlineapp.cpp:35
-#, fuzzy
-msgid "Database driver name"
-msgstr "Gweinydd Cronfa Ddata"
-
-#: kexidb/simplecommandlineapp.cpp:37
-#, fuzzy
-msgid "Database user name"
-msgstr "Gweinydd Cronfa Ddata"
-
-#: kexidb/simplecommandlineapp.cpp:39
-#, fuzzy
-msgid "Prompt for password"
-msgstr "Cadw cyfrinair"
-
-#: kexidb/simplecommandlineapp.cpp:41
-msgid "Host (server) name"
-msgstr ""
-
-#: kexidb/simplecommandlineapp.cpp:42
-#, fuzzy
-msgid "Server's port number"
-msgstr "Enw canlyniad y gweinydd:"
-
-#: kexidb/simplecommandlineapp.cpp:44
-#, fuzzy
-msgid "Server's local socket filename"
-msgstr "Mewnosod enw cronfa ddata'r cywaith"
-
-#: kexidb/simplecommandlineapp.cpp:143
-#, fuzzy
-msgid "Enter password for %1: "
-msgstr "Rhowch yr enw."
-
-#: kexidb/field.cpp:685
-msgid "Invalid Type"
-msgstr "Math annilys"
-
-#: kexidb/field.cpp:686
-msgid "Byte"
-msgstr "Beit"
-
-#: kexidb/field.cpp:687
-msgid "Short Integer Number"
-msgstr "Cyfanrif cwta"
-
-#: kexidb/field.cpp:688 kexidb/field.cpp:718
-msgid "Integer Number"
-msgstr "Cyfanrif"
-
-#: kexidb/field.cpp:689
-msgid "Big Integer Number"
-msgstr "Cyfanrif mawr"
-
-#: kexidb/field.cpp:690
-msgid "Yes/No Value"
-msgstr "Gwerth Ie/Nage"
-
-#: kexidb/field.cpp:691 plugins/importexport/csv/kexicsvimportdialog.cpp:225
-msgid "Date"
-msgstr "Dyddiad"
-
-#: kexidb/field.cpp:692
-msgid "Date and Time"
-msgstr "Dyddiad ac Amser"
-
-#: kexidb/field.cpp:693 plugins/importexport/csv/kexicsvimportdialog.cpp:226
-msgid "Time"
-msgstr "Amser"
-
-#: kexidb/field.cpp:694
-msgid "Single Precision Number"
-msgstr "Rhif gywirdeb sengl"
-
-#: kexidb/field.cpp:695
-msgid "Double Precision Number"
-msgstr "Rhif cywirdeb dwbl"
-
-#: kexidb/field.cpp:696 kexidb/field.cpp:717
-#: plugins/importexport/csv/kexicsvimportdialog.cpp:223
-msgid "Text"
-msgstr "Testun"
-
-#: kexidb/field.cpp:697
-msgid "Long Text"
-msgstr "Testun hir"
-
-#: kexidb/field.cpp:698 kexidb/field.cpp:722
-#: plugins/macros/kexiactions/objectvariable.h:56
-msgid "Object"
-msgstr "Gwrthrych"
-
-#: kexidb/field.cpp:716
-msgid "Invalid Group"
-msgstr "Grŵp annilys"
-
-#: kexidb/field.cpp:719
-msgid "Floating Point Number"
-msgstr "Rhif pwynt arnawf"
-
-#: kexidb/field.cpp:720
-msgid "Yes/No"
-msgstr "Ie/Nage"
-
-#: kexidb/field.cpp:721 plugins/importexport/csv/kexicsvimportdialog.cpp:227
-msgid "Date/Time"
-msgstr "Dyddiad/Amser"
-
-#: kexidb/dbobjectnamevalidator.cpp:46
-#, fuzzy
-msgid ""
-"You cannot use name \"%1\" for your object.\n"
-"It is reserved for internal Kexi objects. Please choose another name."
-msgstr ""
-"Ni cheir defnyddio'r enw \"%1\" am eich gwrthrych.\n"
-" Mae wedi'i gadw ar gyfer gwrthrychau mewnol Kexi. Dewiswch enw arall.\n"
-
-#: kexidb/dbobjectnamevalidator.cpp:49
-msgid "Names of internal Kexi objects are starting with \"kexi__\"."
-msgstr "Mae enwau gwrthrychau mewnol Kexi yn cychwyn hefo \"kexi__\"."
-
-#: kexidb/drivers/pqxx/pqxxconnection.cpp:221
-#: kexidb/drivers/pqxx/pqxxconnection.cpp:307
-#: kexidb/drivers/pqxx/pqxxconnection.cpp:415
-msgid "Unknown error."
-msgstr "Gwall anhysbys."
-
-#: kexidb/drivers/pqxx/pqxxcursor.cpp:83
-msgid "No connection for cursor open operation specified"
-msgstr "Dim cysylltiad wedi'i benodi ar gyfer y weithred agor cwrchydd"
-
-#: kexidb/drivers/sqlite/sqlitevacuum.cpp:80
-#, fuzzy
-msgid "Compacting database"
-msgstr "Cronfa ddata newydd"
-
-#: kexidb/drivers/sqlite/sqlitevacuum.cpp:81
-#, fuzzy
-msgid "Compacting database \"%1\"..."
-msgstr "Cadw gwrthrych fel"
-
-#: kexidb/drivers/sqlite/sqlitevacuum.cpp:100
-msgid "The database has been compacted. Current size decreased by %1% to %2."
-msgstr ""
-
-#: kexidb/drivers/sqlite/sqliteadmin.cpp:49
-#, fuzzy
-msgid "Could not compact database \"%1\"."
-msgstr "Methu llwytho gyrrydd cronfa ddata \"%1\"."
-
-#: kexidb/drivers/sqlite/sqliteconnection.cpp:202
-#, fuzzy
-msgid "Do you want to open file \"%1\" as read-only?"
-msgstr "Ydych eisiau dileu'r rhes dewisiedig?"
-
-#: kexidb/drivers/sqlite/sqliteconnection.cpp:205
-#: kexidb/drivers/sqlite/sqliteconnection.cpp:221
-#: kexidb/drivers/sqlite/sqliteconnection.cpp:227
-msgid "The file is probably already open on this or another computer."
-msgstr ""
-
-#: kexidb/drivers/sqlite/sqliteconnection.cpp:206
-#: kexidb/drivers/sqlite/sqliteconnection.cpp:228
-msgid "Could not gain exclusive access for writing the file."
-msgstr ""
-
-#: kexidb/drivers/sqlite/sqliteconnection.cpp:208
-msgid "Open As Read-Only"
-msgstr ""
-
-#: kexidb/drivers/sqlite/sqliteconnection.cpp:222
-msgid "Could not gain exclusive access for reading and writing the file."
-msgstr ""
-
-#: kexidb/drivers/sqlite/sqliteconnection.cpp:252
-#, fuzzy
-msgid "Could not close busy database."
-msgstr "Methu llwytho gyrrydd cronfa ddata \"%1\"."
-
-#: kexidb/drivers/sqlite/sqliteconnection.cpp:266
-msgid "Could not remove file \"%1\"."
-msgstr "Methu gwaredu ffeil \"%1\". "
-
-#: kexidb/driver_p.cpp:49
-msgid "Client library version"
-msgstr ""
-
-#: kexidb/driver_p.cpp:53
-msgid "Default character encoding on server"
-msgstr ""
-
-#: kexidb/driver_p.cpp:59
-#, fuzzy
-msgid "File-based database driver"
-msgstr "Disgwylwyd enw ffeil ar gyfer gyrrydd feil-seiliedig."
-
-#: kexidb/driver_p.cpp:62
-msgid "File-based database's MIME type"
-msgstr ""
-
-#: kexidb/driver_p.cpp:68
-msgid "Single transactions"
-msgstr ""
-
-#: kexidb/driver_p.cpp:70
-msgid "Multiple transactions"
-msgstr ""
-
-#: kexidb/driver_p.cpp:72
-msgid "Nested transactions"
-msgstr ""
-
-#: kexidb/driver_p.cpp:74
-msgid "Ignored"
-msgstr "Anwybyddwyd"
-
-#: kexidb/driver_p.cpp:76 plugins/importexport/csv/kexicsvwidgets.cpp:137
-#: plugins/importexport/csv/kexicsvwidgets.cpp:152
-#: plugins/queries/kexiquerydesignerguieditor.cpp:1734
-#: plugins/tables/kexitabledesignerview.cpp:406
-msgid "None"
-msgstr "Dim"
-
-#: kexidb/driver_p.cpp:81
-#, fuzzy
-msgid "Single transactions support"
-msgstr "Trosglwyddiad heb ei gychwyn."
-
-#: kexidb/driver_p.cpp:83
-#, fuzzy
-msgid "Multiple transactions support"
-msgstr "Trosglwyddiad heb ei gychwyn."
-
-#: kexidb/driver_p.cpp:85
-#, fuzzy
-msgid "Nested transactions support"
-msgstr "Trosglwyddiad heb ei gychwyn."
-
-#: kexidb/driver_p.cpp:90
-msgid "KexiDB driver version"
-msgstr ""
-
-#: kexidb/cursor.cpp:142
-msgid "No query statement or schema defined."
-msgstr ""
-
-#: kexidb/cursor.cpp:152
-msgid "Query statement is empty."
-msgstr ""
-
-#: kexidb/cursor.cpp:162
+#: migration/migratemanager.cpp:172
 #, fuzzy
-msgid "Error opening database cursor."
-msgstr "Gwall yng nghysylltiad y gronfa ddata"
-
-#: kexidb/cursor.cpp:418 kexidb/cursor.cpp:441
-msgid "Cannot fetch next record."
-msgstr "Methu nôl y cofnod nesaf"
-
-#: kexidb/object.cpp:60
-msgid "Unspecified error encountered"
-msgstr "Cafwyd gwall amhenodol"
-
-#: kexidb/queryschema.cpp:250
-#: plugins/queries/kexiquerydesignerguieditor.cpp:1271
-msgid ""
-"_: short for 'expression' word (only latin letters, please)\n"
-"expr"
-msgstr ""
-
-#: kexidb/drivermanager.cpp:179
-msgid "Could not find any database drivers."
+msgid "Could not find any import/export database drivers."
 msgstr "Methu canfod unrhyw yryddion cronfa ddata."
 
-#: kexidb/drivermanager.cpp:189 kexidb/drivermanager.cpp:206
-msgid "Could not find database driver \"%1\"."
-msgstr "Methu canfod gyrrydd cronfa ddata \"%1\"."
-
-#: kexidb/drivermanager.cpp:218
-msgid "Could not load database driver \"%1\"."
-msgstr "Methu llwytho gyrrydd cronfa ddata \"%1\"."
-
-#: kexidb/drivermanager.cpp:363
-msgid "No such driver service: \"%1\"."
-msgstr "Dim gyrrydd o'r math: \"%1\"."
-
-#: kexidb/parser/parser_p.cpp:136
-msgid "identifier was expected"
-msgstr ""
-
-#: kexidb/parser/parser_p.cpp:144 kexidb/parser/parser_p.cpp:147
-msgid "Syntax Error"
-msgstr "Gwall Cystrawen"
-
-#: kexidb/parser/parser_p.cpp:145
-msgid "\"%1\" is a reserved keyword"
-msgstr ""
-
-#: kexidb/parser/parser_p.cpp:148
-#, fuzzy
-msgid "Syntax Error near \"%1\""
-msgstr "Gwall Cystrawen ger '%1'"
-
-#: kexidb/parser/parser_p.cpp:177
-msgid "No query specified"
-msgstr ""
-
-#: kexidb/parser/parser_p.cpp:242
-msgid "\"*\" could not be used if no tables are specified"
-msgstr ""
-
-#: kexidb/expression.cpp:719 kexidb/parser/parser_p.cpp:288
-#, fuzzy
-msgid "Ambiguous field name"
-msgstr "Enw maes"
-
-#: kexidb/expression.cpp:720 kexidb/parser/parser_p.cpp:289
-msgid ""
-"Both table \"%1\" and \"%2\" have defined \"%3\" field. Use \"<tableName>"
-".%4\" notation to specify table name."
-msgstr ""
-
-#: kexidb/expression.cpp:729 kexidb/expression.cpp:801
-#: kexidb/parser/parser_p.cpp:298 kexidb/parser/parser_p.cpp:381
-#, fuzzy
-msgid "Field not found"
-msgstr "Ymholiad heb ei ganfod"
-
-#: kexidb/expression.cpp:730 kexidb/parser/parser_p.cpp:299
-msgid "Table containing \"%1\" field not found"
-msgstr ""
-
-#: kexidb/expression.cpp:755 kexidb/parser/parser_p.cpp:322
-msgid "Could not access the table directly using its name"
-msgstr ""
-
-#: kexidb/expression.cpp:756 kexidb/parser/parser_p.cpp:323
-msgid ""
-"Table \"%1\" is covered by aliases. Instead of \"%2\", you can write \"%3\""
-msgstr ""
-
-#: kexidb/expression.cpp:789 kexidb/parser/parser_p.cpp:351
-msgid "Ambiguous \"%1.*\" expression"
-msgstr ""
-
-#: kexidb/expression.cpp:790 kexidb/parser/parser_p.cpp:352
-msgid "More than one \"%1\" table or alias defined"
-msgstr ""
-
-#: kexidb/expression.cpp:817 kexidb/parser/parser_p.cpp:371
-msgid "Ambiguous \"%1.%2\" expression"
-msgstr ""
-
-#: kexidb/expression.cpp:819 kexidb/parser/parser_p.cpp:372
-msgid "More than one \"%1\" table or alias defined containing \"%2\" field"
-msgstr ""
-
-#: kexidb/expression.cpp:802 kexidb/parser/parser_p.cpp:381
-#, fuzzy
-msgid "Table \"%1\" has no \"%2\" field"
-msgstr "Ni cheir gwaredu tabl \"%1\"."
-
-#. i18n("Field List Error"), 
-#: kexidb/parser/parser_p.cpp:439
-#, fuzzy
-msgid "Table \"%1\" does not exist"
-msgstr "Nid yw'r gronfa ddata \"%1\" yn bodoli."
-
-#: kexidb/parser/parser_p.cpp:513
-#, fuzzy
-msgid "Invalid alias definition for column \"%1\""
-msgstr "Math annilys"
-
-#: kexidb/parser/parser_p.cpp:545
-#, fuzzy
-msgid "Invalid \"%1\" column definition"
-msgstr "Math annilys"
-
-#: kexidb/parser/parser_p.cpp:612
-#, c-format
-msgid "Could not define sorting - no column at position %1"
-msgstr ""
-
-#: kexidb/parser/parser_p.cpp:621
-#, fuzzy
-msgid "Could not define sorting - column name or alias \"%1\" does not exist"
-msgstr "<qt>Nid yw'r ffeil \"%1\" mewn bod."
-
-#: sqlscanner.l:98
-#, fuzzy
-msgid "Invalid integer number"
-msgstr "Cyfanrif mawr"
-
-#: sqlscanner.l:98
-msgid "This integer number may be too large."
-msgstr ""
-
-#: sqlscanner.l:286
-#, fuzzy
-msgid "Invalid identifier"
-msgstr "Math annilys"
-
-#: plugins/queries/kexiquerydesignerguieditor.cpp:1453 sqlscanner.l:287
-msgid "Identifiers should start with a letter or '_' character"
-msgstr ""
-
-#: kexidb/expression.cpp:775
-#, fuzzy
-msgid "Table not found"
-msgstr "ni chafwyd y gwrthrych"
-
-#: kexidb/connection.cpp:1796 kexidb/expression.cpp:776
-#, fuzzy
-msgid "Unknown table \"%1\""
-msgstr "math anhysbys o wrthrych \"%1\""
-
-#: kexidb/connectiondata.cpp:97
-msgid "file"
-msgstr "ffeil"
-
-#: kexidb/driver.cpp:108
-#, fuzzy
-msgid ""
-"Incompatible database driver's \"%1\" version: found version %2, expected "
-"version %3."
-msgstr ""
-"Fersiwn anghydnaws gyrryddion \"%1\" y gronfa ddata: cafwyd fersiwn %2 gan "
-"ddisgwyl fersiwn %3."
-
-#: kexidb/driver.cpp:115
-#, fuzzy
-msgid ""
-"Invalid database driver's \"%1\" implementation:\n"
-msgstr ""
-"Gweithredoliad annilys o yrrydd y gronfa ddata \"%1\":\n"
-"\n"
-
-#: kexidb/driver.cpp:116
-msgid "Value of \"%1\" is not initialized for the driver."
-msgstr "Nid yw gwerth \"%1\" wedi'i ymgychwyn ar gyfer y gyrrydd."
-
-#: kexidb/driver.cpp:186
-msgid "File name expected for file-based database driver."
-msgstr "Disgwylwyd enw ffeil ar gyfer gyrrydd feil-seiliedig."
-
-#: kexidb/dbproperties.cpp:44 kexidb/dbproperties.cpp:54
-#: kexidb/dbproperties.cpp:65
-#, fuzzy
-msgid "Could not set value of database property \"%1\"."
-msgstr "Methu llwytho gyrrydd cronfa ddata \"%1\"."
-
-#: kexidb/dbproperties.cpp:82 kexidb/dbproperties.cpp:92
-#: kexidb/dbproperties.cpp:103
+#: migration/migratemanager.cpp:191
 #, fuzzy
-msgid "Could not set caption for database property \"%1\"."
+msgid "Could not find import/export database driver \"%1\"."
 msgstr "Methu canfod gyrrydd cronfa ddata \"%1\"."
 
-#: kexidb/dbproperties.cpp:116 kexidb/dbproperties.cpp:131
+#: migration/migratemanager.cpp:203
 #, fuzzy
-msgid "Could not read database property \"%1\"."
+msgid "Could not load import/export database driver \"%1\"."
 msgstr "Methu llwytho gyrrydd cronfa ddata \"%1\"."
 
-#: kexidb/dbproperties.cpp:144
-#, fuzzy
-msgid "Could not read database properties."
-msgstr "Methu canfod unrhyw yryddion cronfa ddata."
-
-#: kexidb/connection.cpp:116
-#, fuzzy
-msgid "Invalid database contents. "
-msgstr "Cynnwys annilys yn y gronfa ddata "
-
-#: kexidb/connection.cpp:120
-msgid "It is a system object."
-msgstr ""
-
-#: kexidb/connection.cpp:250
-msgid "Connection already established."
-msgstr "Cysylltiad wedi'i sefydlu eisoes"
-
-#: kexidb/connection.cpp:257
-#, fuzzy
-msgid "Could not open \"%1\" project file."
-msgstr "Methwyd agor cywaith \"%1\""
-
-#: kexidb/connection.cpp:258
-#, fuzzy
-msgid "Could not connect to \"%1\" database server."
-msgstr "Heb ei gysylltu â gweinydd y gronfa ddata"
-
-#: kexidb/connection.cpp:300
-msgid "Not connected to the database server."
-msgstr "Heb ei gysylltu â gweinydd y gronfa ddata"
-
-#: kexidb/connection.cpp:310
-msgid "Currently no database is used."
-msgstr "Ni ddefnyddir cronfa ddata ar hyn o bryd."
-
-#: kexidb/connection.cpp:366
-msgid "The database \"%1\" does not exist."
-msgstr "Nid yw'r gronfa ddata \"%1\" yn bodoli."
-
-#: kexidb/connection.cpp:386
-msgid "Database file \"%1\" does not exist."
-msgstr "Nid yw'r ffeil gronfa ddata \"%1\" yn bodoli."
-
-#: kexidb/connection.cpp:392
-msgid "Database file \"%1\" is not readable."
-msgstr "Ni ellir darllen y ffeil gronfa ddata \"%1\"."
-
-#: kexidb/connection.cpp:398
-msgid "Database file \"%1\" is not writable."
-msgstr "Ni ellir ysgrifennu'r ffeil gronfa ddata \"%1\"."
-
-#: kexidb/connection.cpp:441
-msgid "Database \"%1\" already exists."
-msgstr "Mae cronfa ddata \"%1\" yn bodoli eisoes."
-
-#: kexidb/connection.cpp:446
-#, fuzzy
-msgid ""
-"Cannot create database \"%1\". This name is reserved for system database."
-msgstr ""
-"Methu creu cronfa ddata \"%1\". Neilltuir yr enw hwn ar gyfer cronfa ddata'r "
-"cysawd."
-
-#: kexidb/connection.cpp:461
-msgid "Error creating database \"%1\" on the server."
-msgstr "Gwall wrth greu cronfa ddata \"%1\" ar y gweinydd."
-
-#: kexidb/connection.cpp:475
-msgid "Database \"%1\" created but could not be opened."
-msgstr "Creuwyd cronfa ddata \"%1\" ond methwyd ei hagor"
-
-#: kexidb/connection.cpp:569
-#, fuzzy
-msgid "Opening database \"%1\" failed."
-msgstr "Cadw gwrthrych fel"
-
-#: kexidb/connection.cpp:609
-msgid "Database version (%1) does not match Kexi application's version (%2)"
-msgstr ""
-"Nid yw fersiwn (%1) y gronfa ddata yn cydweddu â fersiwn y cymhwysiad Kexi (%2)"
-
-#: kexidb/connection.cpp:679
-msgid "Cannot find any database for temporary connection."
-msgstr "Methu cael hyd i gronfa ddata ar gyfer cysylltiad dros dro"
-
-#: kexidb/connection.cpp:688
-msgid "Error during starting temporary connection using \"%1\" database name."
-msgstr ""
-"Gwall wrth gychwyn cysylltiad dros dro gan ddefnyddio enw cronfa ddata \"%1\"."
-
-#: kexidb/connection.cpp:705
-msgid "Cannot drop database - name not specified."
-msgstr "Methu gollwng y gronfa ddata - ni roddwyd enw."
-
-#: kexidb/connection.cpp:723
-msgid "Cannot delete database - name not specified."
-msgstr "Methu dileu'r gronfa ddata- ni roddwyd enw."
-
-#: kexidb/connection.cpp:728
-msgid "Cannot delete system database \"%1\"."
-msgstr "Ni cheir dileu cronfa ddata'r cysawd \"%1\"."
-
-#: kexidb/connection.cpp:1062
-#, fuzzy
-msgid "Error while executing SQL statement."
-msgstr "Gwall tra'n darllen y ddogfen."
-
-#: kexidb/connection.cpp:1533
-msgid "Cannot create table without fields."
-msgstr "Ni cheir creu tabl heb feysydd."
-
-#: kexidb/connection.cpp:1543
-msgid "System name \"%1\" cannot be used as table name."
-msgstr "Ni cheir defnyddio enw cysawd \"%1\" fel enw tabl."
-
-#: kexidb/connection.cpp:1552
-msgid "System name \"%1\" cannot be used as one of fields in \"%2\" table."
-msgstr "Ni cheir defnyddio enw cysawd \"%1\" fel un o feysydd tabl \"%2\"."
-
-#: kexidb/connection.cpp:1568
-#, fuzzy
-msgid "Could not create the same table \"%1\" twice."
-msgstr "Methwyd creu cywaith \"%1\""
-
-#: kexidb/connection.cpp:1582 plugins/tables/kexitablepart.cpp:212
-#, fuzzy
-msgid "Table \"%1\" already exists."
-msgstr "Mae cronfa ddata \"%1\" yn bodoli eisoes."
-
-#: kexidb/connection.cpp:1673
-#, fuzzy
-msgid "Could not remove object's data."
-msgstr "Methu gwaredu ffeil \"%1\". "
-
-#: kexidb/connection.cpp:1704
-#, fuzzy
-msgid ""
-"Table \"%1\" cannot be removed.\n"
-msgstr "Ni cheir gwaredu tabl \"%1\"."
-
-#: kexidb/connection.cpp:1711
-msgid "Unexpected name or identifier."
-msgstr ""
-
-#: kexidb/connection.cpp:1759
-#, fuzzy
-msgid "Table \"%1\" does not exist."
-msgstr "Nid yw'r gronfa ddata \"%1\" yn bodoli."
-
-#: kexidb/connection.cpp:1774
-msgid "Could not alter table \"%1\" using the same table."
-msgstr ""
-
-#: kexidb/connection.cpp:1800
-#, fuzzy
-msgid "Invalid table name \"%1\""
-msgstr "Enw gwrthrych annilys \"%1\""
-
-#: kexidb/connection.cpp:1806
-msgid "Could rename table \"%1\" using the same name."
-msgstr ""
-
-#: kexidb/connection.cpp:1818
-msgid "Could not rename table \"%1\" to \"%2\". Table \"%3\" already exists."
-msgstr ""
-
-#: kexidb/connection.cpp:1940
-#, fuzzy
-msgid "Query \"%1\" does not exist."
-msgstr "<qt>Nid yw'r ffeil \"%1\" mewn bod."
-
-#: kexidb/connection.cpp:2037
-msgid "Transaction already started."
-msgstr "Cychwynwyd y trosglwyddiad eisoes."
-
-#: kexidb/connection.cpp:2079 kexidb/connection.cpp:2115
-msgid "Transaction not started."
-msgstr "Trosglwyddiad heb ei gychwyn."
-
-#: kexidb/connection.cpp:2093
-msgid "Error on commit transaction"
-msgstr "Gwall wrth gadarnhau'r trawsweithrediad"
-
-#: kexidb/connection.cpp:2129
-msgid "Error on rollback transaction"
-msgstr "Gwall wrth ddadwneud y trosglwyddiad"
-
-#: kexidb/connection.cpp:2290 kexidb/connection.cpp:2779
-msgid "Invalid object name \"%1\""
-msgstr "Enw gwrthrych annilys \"%1\""
-
-#: kexidb/connection.cpp:2410
-#, fuzzy
-msgid "Column %1 does not exist for the query."
-msgstr "Nid yw'r gronfa ddata \"%1\" yn bodoli."
-
-#: kexidb/connection.cpp:2697
-msgid ""
-"Error in XML data: \"%1\" in line %2, column %3.\n"
-"XML data: "
-msgstr ""
-
-#: kexidb/connection.cpp:2819
-#, fuzzy
-msgid "Table has no fields defined."
-msgstr "Ni cheir gwaredu tabl \"%1\"."
-
-#: kexidb/connection.cpp:2945
-msgid ""
-"Could not find definition for query \"%1\". Removing this query is recommended."
-msgstr ""
-
-#: kexidb/connection.cpp:2954
-msgid ""
-"<p>Could not load definition for query \"%1\". SQL statement for this query is "
-"invalid:"
-"<br><tt>%2</tt></p>\n"
-"<p>You can open this query in Text View and correct it.</p>"
-msgstr ""
-
-#: kexidb/connection.cpp:3168
-#, fuzzy
-msgid "Could not update row because there is no master table defined."
-msgstr "Methwyd creu cywaith \"%1\""
-
-#: kexidb/connection.cpp:3175
-msgid "Could not update row because master table has no primary key defined."
-msgstr ""
-
-#: kexidb/connection.cpp:3199
-msgid ""
-"Could not update row because it does not contain entire master table's primary "
-"key."
-msgstr ""
-
-#: kexidb/connection.cpp:3210 kexidb/connection.cpp:3431
-msgid "Primary key's field \"%1\" cannot be empty."
-msgstr "Ni all maes y prif allwedd \"%1\" fod yn wag."
-
-#: kexidb/connection.cpp:3227
-msgid "Row updating on the server failed."
-msgstr "Methwyd diweddaru'r rhes ar y gweinydd."
-
-#: kexidb/connection.cpp:3250
-#, fuzzy
-msgid "Could not insert row because there is no master table defined."
-msgstr "Methwyd creu cywaith \"%1\""
-
-#: kexidb/connection.cpp:3284
-msgid "Could not insert row because master table has no primary key defined."
-msgstr ""
-
-#: kexidb/connection.cpp:3293
-msgid ""
-"Could not insert row because it does not contain entire master table's primary "
-"key."
-msgstr ""
-
-#: kexidb/connection.cpp:3332
-msgid "Row inserting on the server failed."
-msgstr "Methwyd mewnosod y rhes ar y gweinydd."
-
-#: kexidb/connection.cpp:3397
-#, fuzzy
-msgid "Could not delete row because there is no master table defined."
-msgstr "Methwyd creu cywaith \"%1\""
-
-#: kexidb/connection.cpp:3407
-msgid ""
-"Could not delete row because there is no primary key for master table defined."
-msgstr ""
-
-#: kexidb/connection.cpp:3422
-msgid ""
-"Could not delete row because it does not contain entire master table's primary "
-"key."
-msgstr ""
-
-#: kexidb/connection.cpp:3448 kexidb/connection.cpp:3471
-#, fuzzy
-msgid "Row deletion on the server failed."
-msgstr "Methwyd dileu y rhes ar y gweinydd."
-
-#: kexidb/utils.cpp:139
-msgid "Message from server:"
-msgstr "Neges gan y gweinydd:"
-
-#: kexidb/utils.cpp:141
-msgid "SQL statement:"
-msgstr "Datganiad SQL:"
-
-#: kexidb/utils.cpp:153
-msgid "Server result name:"
-msgstr "Enw canlyniad y gweinydd:"
-
-#: kexidb/utils.cpp:157
+#: plugins/forms/kexiactionselectiondialog.cpp:194
 #, fuzzy
-msgid "Server result number:"
-msgstr "Enw canlyniad y gweinydd:"
+msgid "No action"
+msgstr "Dim Gweithred"
 
-#: kexidb/utils.cpp:389 kexidb/utils.cpp:445 kexidb/utils.cpp:451
+#: plugins/forms/kexiactionselectiondialog.cpp:197
 #, fuzzy
-msgid "Test Connection"
-msgstr "Cysylltiad"
+msgid "Application actions"
+msgstr "Cymhwysiad"
 
-#: kexidb/utils.cpp:389
+#: plugins/forms/kexiactionselectiondialog.cpp:211
 #, fuzzy
-msgid "<qt>Testing connection to <b>%1</b> database server...</qt>"
-msgstr "Heb ei gysylltu â gweinydd y gronfa ddata"
-
-#: kexidb/utils.cpp:443
-msgid ""
-"<qt>Test connection to <b>%1</b> database server failed. The server is not "
-"responding.</qt>"
-msgstr ""
-
-#: kexidb/utils.cpp:449
 msgid ""
-"<qt>Test connection to <b>%1</b> database server established successfully.</qt>"
-msgstr ""
-
-#: kexidb/utils.cpp:1254 plugins/importexport/csv/kexicsvimportdialog.cpp:224
-msgid "Number"
-msgstr "Rhif"
-
-#: kexidb/utils.cpp:1257 plugins/forms/kexidbfactory.cpp:326
-#: widget/utils/kexicontextmenuutils.cpp:249
-msgid "Image"
-msgstr "Delwedd"
-
-#. i18n: file data/kexiui.rc line 5
-#: rc.cpp:3
-#, no-c-format
-msgid "&Project"
-msgstr "&Cywaith"
-
-#. i18n: file data/kexiui.rc line 26
-#: rc.cpp:12
-#, no-c-format
-msgid "&Export"
-msgstr "&Allforio"
-
-#. i18n: file data/kexiui.rc line 53
-#: rc.cpp:18
-#, no-c-format
-msgid "Copy &Special"
-msgstr ""
-
-#. i18n: file data/kexiui.rc line 92
-#: rc.cpp:30
-#, no-c-format
-msgid "&Format"
-msgstr "&Fformat"
-
-#. i18n: file data/kexiui.rc line 99
-#: rc.cpp:33
-#, no-c-format
-msgid "&Data"
-msgstr "&Data"
-
-#. i18n: file data/kexiui.rc line 104
-#: rc.cpp:36
-#, no-c-format
-msgid "Sort"
-msgstr "Trefnu"
-
-#. i18n: file data/kexiui.rc line 116
-#: rc.cpp:42
-#, fuzzy, no-c-format
-msgid "&Migrate"
-msgstr "G&wybodaeth"
-
-#. i18n: file data/kexiui.rc line 140
-#: rc.cpp:51
-#, no-c-format
-msgid "&Other"
-msgstr "A&rall"
-
-#. i18n: file data/kexiui.rc line 156
-#: rc.cpp:57
-#, no-c-format
-msgid "Other &Licenses"
-msgstr "&Trwyddedau Eraill"
-
-#. i18n: file data/kexiui.rc line 185
-#: rc.cpp:66
-#, no-c-format
-msgid "Data"
-msgstr "Data"
-
-#. i18n: file data/kexiui.rc line 197
-#: rc.cpp:69
-#, no-c-format
-msgid "Design"
-msgstr "Cynllun"
-
-#. i18n: file data/kexiui.rc line 201
-#: rc.cpp:72
-#, no-c-format
-msgid "Format"
-msgstr "Fformat"
-
-#. i18n: file ./main/startup/KexiNewPrjTypeSelector.ui line 75
-#: rc.cpp:76
-#, fuzzy, no-c-format
-msgid ""
-"Kexi will create a new database project. Select a storage method which will be "
-"used to store the new project.\n"
-msgstr ""
-"Bydd Kexi'n creu cywaith cronfa ddata newydd. Dewiswch ddull storio i'w "
-"ddefnyddio i gadw'r cywaith newydd.\n"
-"\n"
-
-#. i18n: file ./main/startup/KexiOpenExistingFile.ui line 36
-#: rc.cpp:80
-#, fuzzy, no-c-format
-msgid ""
-"<b>Select existing Kexi project file to open:</b>\n"
-msgstr ""
-"<b>Dewiswch hen ffeil cywaith Kexi i'w agor:</b>\n"
-"\n"
-
-#. i18n: file ./main/startup/KexiOpenExistingFile.ui line 97
-#: rc.cpp:84
-#, no-c-format
-msgid "&Advanced "
-msgstr "&Uwch "
-
-#. i18n: file ./main/startup/KexiOpenExistingFile.ui line 113
-#: rc.cpp:87
-#, fuzzy, no-c-format
-msgid ""
-"Click \"Advanced\" button if you want to find an existing project on a server "
-"rather than a file."
-msgstr ""
-"Cliciwch y botwm \"Uwch\" os ydych eisiau cael hyd i hen gywaith ar weinydd yn "
-"hytrach na ffeil."
-
-#. i18n: file ./main/startup/KexiConnSelectorBase.ui line 33
-#: plugins/macros/kexiactions/objectnamevariable.h:46
-#: plugins/tables/kexitabledesignerview.cpp:333 rc.cpp:90 rc.cpp:323
-#: rc.cpp:343
-#, no-c-format
-msgid "Name"
-msgstr "Enw"
-
-#. i18n: file ./main/startup/KexiConnSelectorBase.ui line 44
-#: plugins/macros/kexiactions/datatableaction.cpp:60
-#: plugins/tables/kexitabledesignerview.cpp:338 rc.cpp:93 rc.cpp:136
-#: rc.cpp:326
-#, no-c-format
-msgid "Type"
-msgstr "Math"
-
-#. i18n: file ./main/startup/KexiConnSelectorBase.ui line 55
-#: rc.cpp:96
-#, no-c-format
-msgid "Server Information"
-msgstr "Gwybodaeth am y Gweinydd"
-
-#. i18n: file ./main/startup/KexiConnSelectorBase.ui line 107
-#: rc.cpp:99
-#, no-c-format
-msgid "&Edit..."
-msgstr "&Golygu..."
-
-#. i18n: file ./main/startup/KexiConnSelectorBase.ui line 123
-#: rc.cpp:102
-#, no-c-format
-msgid "&Add..."
-msgstr "Ychw&anegu..."
-
-#. i18n: file ./main/startup/KexiConnSelectorBase.ui line 187
-#: rc.cpp:108
-#, no-c-format
-msgid "Description"
-msgstr "Disgrifiad"
-
-#. i18n: file ./main/startup/KexiConnSelectorBase.ui line 247
-#: rc.cpp:111
-#, fuzzy, no-c-format
-msgid ""
-"<b>Select Existing Database Server's Connection From the List Below</b>\n"
-"<p>You will see existing Kexi projects available for the selected connection. "
-"Here you may also add, edit or remove connections from the list.\n"
-msgstr ""
-"<b>Dewiswch gysylltiad cronfa ddata gyfredol o'r rhestr isod a chlicio "
-"\"Iawn\"</b>.\n"
-" "
-"<p>Mi welwch yr hen gyweithiau Kexi sydd ar gael ar gyfer y cysylltiad "
-"dewisiedig. Yma cewch hefyd ychwanegu, golygu neu ddisodli cysylltiadau o'r "
-"rhestr.\n"
-"\n"
-
-#. i18n: file ./main/startup/KexiServerDBNamePage.ui line 24
-#: rc.cpp:117 rc.cpp:123
-#, fuzzy, no-c-format
-msgid "Project caption: "
-msgstr "Egluryn y cywaith:"
-
-#. i18n: file ./main/startup/KexiServerDBNamePage.ui line 32
-#: rc.cpp:120
-#, fuzzy, no-c-format
-msgid "Project's database name: "
-msgstr "Enw cronfa ddata'r cywaith:"
-
-#. i18n: file ./main/startup/KexiProjectSelectorBase.ui line 44
-#: rc.cpp:126
-#, fuzzy, no-c-format
-msgid ""
-"<b>There are Kexi projects you have recently opened.</b> "
-"Select one you wish to open:\n"
-msgstr ""
-"<b>Dyma'r cyweithiau Kexi wedi'u hagor gennych yn ddiweddar.</b> "
-"Dewiswch un yr hoffech ei agor:\n"
-"\n"
-
-#. i18n: file ./main/startup/KexiProjectSelectorBase.ui line 53
-#: rc.cpp:130
-#, no-c-format
-msgid "Project Name"
-msgstr "Enw'r Cywaith"
-
-#. i18n: file ./main/startup/KexiProjectSelectorBase.ui line 64
-#: rc.cpp:133 rc.cpp:295 widget/kexidbconnectionwidget.cpp:141
-#, no-c-format
-msgid "Database"
-msgstr "Cronfa ddata"
-
-#. i18n: file ./main/startup/KexiProjectSelectorBase.ui line 86
-#: rc.cpp:139
-#, no-c-format
-msgid "Connection"
-msgstr "Cysylltiad"
-
-#. i18n: file ./main/kexifinddialogbase.ui line 27
-#: rc.cpp:145
-#, no-c-format
-msgid "Fi&nd:"
-msgstr "Ca&nfod:"
-
-#. i18n: file ./main/kexifinddialogbase.ui line 38
-#: rc.cpp:148
-#, no-c-format
-msgid "Re&place with:"
-msgstr "Am&newid efo:"
-
-#. i18n: file ./main/kexifinddialogbase.ui line 60
-#: rc.cpp:151
-#, no-c-format
-msgid "&Look in:"
-msgstr ""
-
-#. i18n: file ./main/kexifinddialogbase.ui line 74
-#: rc.cpp:154
-#, no-c-format
-msgid "&Whole words only"
-msgstr "D&im ond geiriau cyfan"
-
-#. i18n: file ./main/kexifinddialogbase.ui line 85
-#: rc.cpp:157
-#, no-c-format
-msgid "Prompt on replace"
-msgstr "Cofweini wrth amnewid"
-
-#. i18n: file ./main/kexifinddialogbase.ui line 140
-#: rc.cpp:166
-#, fuzzy, no-c-format
-msgid "Replace All"
-msgstr "&Amnewid y Cwbl"
-
-#. i18n: file ./main/kexifinddialogbase.ui line 167
-#: rc.cpp:169
-#, no-c-format
-msgid "&Match:"
-msgstr "&Cydweddu :"
-
-#. i18n: file ./main/kexifinddialogbase.ui line 176
-#: rc.cpp:172
-#, fuzzy, no-c-format
-msgid "Any Part of Field"
-msgstr "Maes"
-
-#. i18n: file ./main/kexifinddialogbase.ui line 181
-#: rc.cpp:175
-#, fuzzy, no-c-format
-msgid "Whole Field"
-msgstr "Dileu Maes"
-
-#. i18n: file ./main/kexifinddialogbase.ui line 186
-#: rc.cpp:178
-#, fuzzy, no-c-format
-msgid "Start of Field"
-msgstr "Maes"
-
-#. i18n: file ./main/kexifinddialogbase.ui line 204
-#: rc.cpp:181
-#, no-c-format
-msgid "&Search:"
-msgstr "&Chwilio:"
-
-#. i18n: file ./main/kexifinddialogbase.ui line 213
-#: rc.cpp:184
-#, no-c-format
-msgid "Up"
-msgstr "I fyny"
-
-#. i18n: file ./main/kexifinddialogbase.ui line 218
-#: rc.cpp:187
-#, no-c-format
-msgid "Down"
-msgstr "I Lawr"
-
-#. i18n: file ./main/kexifinddialogbase.ui line 223
-#: rc.cpp:190
-#, fuzzy, no-c-format
-msgid "All Rows"
-msgstr "Saeth"
-
-#. i18n: file ./main/kexifinddialogbase.ui line 261
-#: rc.cpp:193
-#, no-c-format
-msgid "C&ase sensitive"
-msgstr "Mae llythrennau bach/mawr o &bwys"
-
-#. i18n: file ./main/printing/kexisimpleprintingpagesetupbase.ui line 16
-#: rc.cpp:197
-#, no-c-format
-msgid "."
-msgstr "."
-
-#. i18n: file ./main/printing/kexisimpleprintingpagesetupbase.ui line 57
-#: rc.cpp:201
-#, no-c-format
-msgid "<h2>Page Setup for Printing \"%1\" Table Data</h2>"
-msgstr ""
-
-#. i18n: file ./main/printing/kexisimpleprintingpagesetupbase.ui line 91
-#: rc.cpp:204
-#, fuzzy, no-c-format
-msgid "Set Font..."
-msgstr "Adroddiad"
-
-#. i18n: file ./main/printing/kexisimpleprintingpagesetupbase.ui line 107
-#: rc.cpp:207
-#, no-c-format
-msgid "Page title:"
-msgstr "Teitl y dudalen:"
-
-#. i18n: file ./main/printing/kexisimpleprintingpagesetupbase.ui line 183
-#: rc.cpp:213
-#, no-c-format
-msgid "Add page numbers"
-msgstr ""
-
-#. i18n: file ./main/printing/kexisimpleprintingpagesetupbase.ui line 191
-#: rc.cpp:216
-#, no-c-format
-msgid "Page Size && Margins"
-msgstr "Maint Tudalen && Ymylon"
-
-#. i18n: file ./main/printing/kexisimpleprintingpagesetupbase.ui line 220
-#: rc.cpp:220
-#, no-c-format
-msgid "Change..."
-msgstr "Newid..."
-
-#. i18n: file ./main/printing/kexisimpleprintingpagesetupbase.ui line 259
-#: rc.cpp:223
-#, no-c-format
-msgid "Save This Setup as Default"
-msgstr ""
-
-#. i18n: file ./main/printing/kexisimpleprintingpagesetupbase.ui line 282
-#: rc.cpp:228
-#, fuzzy, no-c-format
-msgid "Open This Table"
-msgstr "&Agor Tabl"
-
-#. i18n: file ./main/printing/kexisimpleprintingpagesetupbase.ui line 299
-#: rc.cpp:233
-#, fuzzy, no-c-format
-msgid "Related actions:"
-msgstr "Perthnasau"
-
-#. i18n: file ./main/printing/kexisimpleprintingpagesetupbase.ui line 317
-#: rc.cpp:236
-#, fuzzy, no-c-format
-msgid "Add date and time"
-msgstr "Dyddiad ac Amser"
-
-#. i18n: file ./main/printing/kexisimpleprintingpagesetupbase.ui line 333
-#: rc.cpp:239
-#, no-c-format
-msgid "Add table borders"
-msgstr ""
-
-#. i18n: file ./widget/kexidbconnectionwidgetdetailsbase.ui line 38
-#: rc.cpp:242
-#, no-c-format
-msgid "Use socket &file instead of TCP/IP port:"
-msgstr ""
-
-#. i18n: file ./widget/kexidbconnectionwidgetdetailsbase.ui line 150
-#: rc.cpp:249
-#, no-c-format
-msgid "&Description:"
-msgstr "&Disgrifiad:"
-
-#. i18n: file ./widget/kexiprjtypeselectorbase.ui line 53
-#: rc.cpp:253
-#, fuzzy, no-c-format
-msgid "Projects stored on a database server"
-msgstr "Cywaith newydd wedi'i storio ar weinydd cronfa ddata"
-
-#. i18n: file ./widget/kexiprjtypeselectorbase.ui line 64
-#: rc.cpp:256
-#, fuzzy, no-c-format
-msgid "Projects stored in a file"
-msgstr "Cywaith newydd wedi'i storio mewn ffeil"
-
-#. i18n: file ./widget/kexidbconnectionwidgetbase.ui line 98
-#: rc.cpp:261
-#, no-c-format
-msgid "Database Server"
-msgstr "Gweinydd Cronfa Ddata"
-
-#. i18n: file ./widget/kexidbconnectionwidgetbase.ui line 134
-#: rc.cpp:264
-#, no-c-format
-msgid "Port:"
-msgstr "Porth:"
-
-#. i18n: file ./widget/kexidbconnectionwidgetbase.ui line 147
-#: rc.cpp:267
-#, fuzzy, no-c-format
-msgid "Local server"
-msgstr "Disgwylwyd enw ffeil ar gyfer gyrrydd feil-seiliedig."
-
-#. i18n: file ./widget/kexidbconnectionwidgetbase.ui line 178
-#: rc.cpp:271
-#, no-c-format
-msgid "&Hostname:"
-msgstr "&Enw Gwesteiwr:"
-
-#. i18n: file ./widget/kexidbconnectionwidgetbase.ui line 201
-#: rc.cpp:277
-#, fuzzy, no-c-format
-msgid "Remote server"
-msgstr "Gwesteiwr pell"
-
-#. i18n: file ./widget/kexidbconnectionwidgetbase.ui line 215
-#: rc.cpp:280
-#, no-c-format
-msgid "&Engine:"
-msgstr "&Peiriant :"
-
-#. i18n: file ./widget/kexidbconnectionwidgetbase.ui line 247
-#: rc.cpp:283
-#, no-c-format
-msgid "Authentication"
-msgstr "Dilysiant"
-
-#. i18n: file ./widget/kexidbconnectionwidgetbase.ui line 258
-#: rc.cpp:286
-#, no-c-format
-msgid "&Username:"
-msgstr "&Enw Defnyddiwr:"
-
-#. i18n: file ./widget/kexidbconnectionwidgetbase.ui line 274
-#: rc.cpp:289
-#, no-c-format
-msgid "&Password:"
-msgstr "&Cyfrinair:"
-
-#. i18n: file ./widget/kexidbconnectionwidgetbase.ui line 293
-#: rc.cpp:292
-#, fuzzy, no-c-format
-msgid "Save password in the shortcut file"
-msgstr "Cadw'r cyfrinair yn ffeil y cywaith"
-
-#. i18n: file ./widget/kexidbconnectionwidgetbase.ui line 322
-#: rc.cpp:298 widget/pixmapcollection.cpp:160
-#, no-c-format
-msgid "&Name:"
-msgstr "&Enw:"
-
-#. i18n: file ./widget/kexidbconnectionwidgetbase.ui line 338
-#: rc.cpp:301
-#, no-c-format
-msgid "&Title (optional):"
-msgstr ""
-
-#. i18n: file ./plugins/queries/kexiaddparamwidget.ui line 16
-#: rc.cpp:305
-#, no-c-format
-msgid "Parameter"
-msgstr "Paramedr"
-
-#. i18n: file ./plugins/queries/kexiaddparamwidget.ui line 35
-#: rc.cpp:308
-#, no-c-format
-msgid "Name:"
-msgstr "Enw:"
-
-#. i18n: file ./plugins/queries/kexiaddparamwidget.ui line 51
-#: rc.cpp:311
-#, no-c-format
-msgid "kexi_"
-msgstr "kexi_"
-
-#. i18n: file ./plugins/queries/kexiaddparamwidget.ui line 96
-#: rc.cpp:314
-#, no-c-format
-msgid "Message:"
-msgstr "Neges:"
-
-#. i18n: file ./plugins/queries/kexiaddparamwidget.ui line 119
-#: rc.cpp:317
-#, no-c-format
-msgid "Type:"
-msgstr "Math:"
-
-#. i18n: file ./plugins/queries/kexiparameterlisteditor.ui line 24
-#: rc.cpp:320
-#, no-c-format
-msgid "Parameters:"
-msgstr "Paramedrau:"
-
-#. i18n: file ./plugins/macros/kexipart/keximacroerrorbase.ui line 121
-#: rc.cpp:346
-#, no-c-format
-msgid "Value"
-msgstr "Gwerth"
-
-#. i18n: file ./plugins/macros/kexipart/keximacroerrorbase.ui line 168
-#: rc.cpp:349
-#, fuzzy, no-c-format
-msgid "Open in design view"
-msgstr "Golwg &Testun"
-
-#. i18n: file ./plugins/macros/kexipart/keximacroerrorbase.ui line 190
-#: rc.cpp:356
-#, fuzzy, no-c-format
-msgid "Abort"
-msgstr "Trefnu"
-
-#: widget/kexibrowser.cpp:128
-#, fuzzy
-msgid "Open object"
-msgstr "Agor cywaith"
-
-#: widget/kexibrowser.cpp:129
-msgid "Opens object selected in the list"
-msgstr ""
-
-#: widget/kexibrowser.cpp:153
-msgid "&Rename"
-msgstr "&Ail-enwi"
-
-#: widget/kexibrowser.cpp:161
-msgid "&Design"
-msgstr "&Cynllun"
-
-#: widget/kexibrowser.cpp:163
-#, fuzzy
-msgid "Design object"
-msgstr "&Cynllunio Tabl"
-
-#: widget/kexibrowser.cpp:164
-msgid "Starts designing of the object selected in the list"
-msgstr ""
-
-#: widget/kexibrowser.cpp:170
-#, fuzzy
-msgid "Open in &Text View"
-msgstr "Golwg &Testun"
-
-#: widget/kexibrowser.cpp:172
-#, fuzzy
-msgid "Open object in text view"
-msgstr "Golwg &Testun"
+"_: Current form's actions\n"
+"Current"
+msgstr "Arian"
 
-#: widget/kexibrowser.cpp:173
+#: plugins/forms/kexiactionselectiondialog.cpp:268
 #, fuzzy
-msgid "Opens selected object in the list in text view"
+msgid "Open in Data View"
 msgstr "Golwg &Testun"
 
 #: plugins/forms/kexiactionselectiondialog.cpp:272
@@ -3765,603 +3303,160 @@ msgstr "Golwg &Testun"
 msgid "Execute"
 msgstr "Creu &Sgript..."
 
-#: widget/kexibrowser.cpp:197
-msgid ""
-"_: Export->To File as Data &Table... \n"
-"To &File as Data Table..."
-msgstr ""
-
-#: widget/kexibrowser.cpp:200
+#: plugins/forms/kexiactionselectiondialog.cpp:277
 #, fuzzy
-msgid "Exports data from the currently selected table or query data to a file."
-msgstr "Cadw data'r rhes a dewisir ar hyn o bryd"
+msgid "Print"
+msgstr "Argraffu"
 
-#: widget/kexibrowser.cpp:206
+#: plugins/forms/kexiactionselectiondialog.cpp:284
 #, fuzzy
-msgid "Prints data from the currently selected table or query."
-msgstr "Mewnosod un rhes wag uwchben yr un wedi'i dewis ar hyn o bryd"
-
-#: widget/kexibrowser.cpp:207
-msgid "Page Setup..."
+msgid "Show Page Setup"
 msgstr "Gosodiad Tudalen ..."
 
-#: widget/kexibrowser.cpp:341
-#, fuzzy
-msgid "Errors encountered during loading plugins:"
-msgstr "Gwall tra'n llwytho'r modiwl rhan \"%1\""
-
-#: widget/kexibrowser.cpp:526
-msgid "&Create Object: %1..."
-msgstr "&Creu Gwrthrych: %1..."
-
-#: widget/kexibrowser.cpp:531
-#, fuzzy, c-format
-msgid "Create object: %1"
-msgstr "&Creu Gwrthrych: %1..."
-
-#: widget/kexibrowser.cpp:533
-#, fuzzy, c-format
-msgid "Creates a new object: %1"
-msgstr "Creu cywaith newydd"
-
-#: widget/kexibrowser.cpp:538
-msgid "&Create Object..."
-msgstr "&Creu Gwrthrych..."
-
-#: widget/kexibrowser.cpp:543
-#, fuzzy
-msgid "Create object"
-msgstr "Creu Cywaith"
-
-#: widget/kexibrowser.cpp:544
-#, fuzzy
-msgid "Creates a new object"
-msgstr "Creu cywaith newydd"
-
-#: widget/kexidbconnectionwidget.cpp:85
-#, fuzzy
-msgid "Load database list from the server"
-msgstr "Disgwylwyd enw ffeil ar gyfer gyrrydd feil-seiliedig."
-
-#: widget/kexidbconnectionwidget.cpp:87
-msgid ""
-"Loads database list from the server, so you can select one using the \"Name\" "
-"combo box."
-msgstr ""
-
-#: widget/kexidbconnectionwidget.cpp:91
-msgid "Save Changes"
-msgstr "Cadw Newidiadau"
-
-#: widget/kexidbconnectionwidget.cpp:92
-msgid "Save all changes made to this connection information"
-msgstr ""
-
-#: widget/kexidbconnectionwidget.cpp:93
+#: plugins/forms/kexiactionselectiondialog.cpp:292
 msgid ""
-"Save all changes made to this connection information. You can later reuse this "
-"information."
+"_: Note: use multiple rows if needed\n"
+"Export to File\n"
+"As Data Table"
 msgstr ""
 
-#: widget/kexidbconnectionwidget.cpp:100
-#, fuzzy
-msgid "&Test Connection"
-msgstr "Cysylltiad"
-
-#: widget/kexidbconnectionwidget.cpp:101
-#, fuzzy
-msgid "Test database connection"
-msgstr "Gwall yng nghysylltiad y gronfa ddata"
-
-#: widget/kexidbconnectionwidget.cpp:102
+#: plugins/forms/kexiactionselectiondialog.cpp:297
 msgid ""
-"Tests database connection. You can ensure that valid connection information is "
-"provided."
-msgstr ""
-
-#: widget/kexidbconnectionwidget.cpp:132
-msgid "Database Connection"
-msgstr "Cysylltiad Cronfa Ddata"
-
-#: widget/kexidbconnectionwidget.cpp:229
-msgid "Parameters"
-msgstr "Paramedrau"
-
-#: widget/kexidbconnectionwidget.cpp:238
-msgid "Details"
-msgstr "Manylion"
-
-#: widget/kexidbconnectionwidget.cpp:341
-#, fuzzy
-msgid "Open Database"
-msgstr "Cronfa ddata newydd"
-
-#: widget/kexidbconnectionwidget.cpp:356
-#, fuzzy
-msgid "Connect to a Database Server"
-msgstr "Cywaith newydd wedi'i storio ar weinydd cronfa ddata"
-
-#: widget/kexifieldlistview.cpp:58
-msgid "Field Name"
-msgstr "Enw Maes"
-
-#: plugins/tables/kexitabledesignerview.cpp:139
-#: widget/kexifieldlistview.cpp:60
-msgid "Data Type"
-msgstr "Math data"
-
-#: widget/kexifieldlistview.cpp:99
-msgid "* (All Columns)"
+"_: Note: use multiple rows if needed\n"
+"Copy to Clipboard\n"
+"As Data Table"
 msgstr ""
 
-#: widget/utils/kexidisplayutils.cpp:109 widget/utils/kexidisplayutils.cpp:168
+#: plugins/forms/kexiactionselectiondialog.cpp:303
 #, fuzzy
-msgid "(autonumber)"
-msgstr "Rhif y canlyniad:"
-
-#: widget/utils/kexirecordnavigator.cpp:81
-msgid "Row:"
-msgstr "Rhes:"
-
-#: widget/utils/kexirecordnavigator.cpp:93
-#: widget/utils/kexirecordnavigator.cpp:471
-msgid "First row"
-msgstr "Rhes gyntaf"
-
-#: widget/utils/kexirecordnavigator.cpp:100
-#: widget/utils/kexirecordnavigator.cpp:472
-msgid "Previous row"
-msgstr "Rhes flaenorol"
-
-#: widget/utils/kexirecordnavigator.cpp:112
-msgid "Current row number"
-msgstr "Rhif y rhes gyfredol"
-
-#: widget/utils/kexirecordnavigator.cpp:114
-msgid "of"
-msgstr "o"
-
-#: widget/utils/kexirecordnavigator.cpp:129
-msgid "Number of rows"
-msgstr "Nifer rhesi"
-
-#: widget/utils/kexirecordnavigator.cpp:141
-#: widget/utils/kexirecordnavigator.cpp:473
-msgid "Next row"
-msgstr "Rhes nesaf"
-
-#: widget/utils/kexirecordnavigator.cpp:147
-#: widget/utils/kexirecordnavigator.cpp:474
-msgid "Last row"
-msgstr "Rhes olaf"
-
-#: widget/utils/kexirecordnavigator.cpp:154
-#: widget/utils/kexirecordnavigator.cpp:475
-msgid "New row"
-msgstr "Rhes newydd"
-
-#: widget/utils/kexirecordnavigator.cpp:457
-msgid "Editing indicator"
-msgstr ""
+msgid "Create New Object"
+msgstr "Creu cywaith newydd"
 
-#: widget/utils/kexirecordnavigator.cpp:471
+#: plugins/forms/kexiactionselectiondialog.cpp:306
 #, fuzzy
-msgid "Go to first row"
-msgstr "Rhes gyntaf"
+msgid "Open in Design View"
+msgstr "Golwg &Testun"
 
-#: widget/utils/kexirecordnavigator.cpp:472
+#: plugins/forms/kexiactionselectiondialog.cpp:310
 #, fuzzy
-msgid "Go to previous row"
-msgstr "Rhes flaenorol"
+msgid "Open in Text View"
+msgstr "Golwg &Testun"
 
-#: widget/utils/kexirecordnavigator.cpp:473
+#: plugins/forms/kexiactionselectiondialog.cpp:313
 #, fuzzy
-msgid "Go to next row"
+msgid "Close View"
 msgstr "Rhes nesaf"
 
-#: widget/utils/kexirecordnavigator.cpp:474
-#, fuzzy
-msgid "Go to last row"
-msgstr "Rhes olaf"
-
-#: widget/utils/kexirecordnavigator.cpp:475
-#, fuzzy
-msgid "Go to new row"
-msgstr "Rhes newydd"
-
-#: widget/utils/kexicontextmenuutils.cpp:65
-#, fuzzy
-msgid "Insert From &File..."
-msgstr "O Ffeil..."
-
-#: widget/utils/kexicontextmenuutils.cpp:78
-msgid "&Clear"
-msgstr "&Clirio"
-
-#: widget/utils/kexicontextmenuutils.cpp:105
-#: widget/utils/kexicontextmenuutils.cpp:111
-msgid "Insert Image From File"
+#: plugins/forms/kexiactionselectiondialog.cpp:355
+msgid "&Select macro to be executed after clicking \"%1\" button:"
 msgstr ""
 
-#: widget/utils/kexicontextmenuutils.cpp:165
-#: widget/utils/kexicontextmenuutils.cpp:169
-#, fuzzy
-msgid "Save Image to File"
-msgstr "Cadw i ffeil..."
-
-#: widget/utils/kexicontextmenuutils.cpp:188
-#, fuzzy
-msgid "File \"%1\" already exists.<p>Do you want to replace it with a new one?"
+#: plugins/forms/kexiactionselectiondialog.cpp:357
+msgid "&Select script to be executed after clicking \"%1\" button:"
 msgstr ""
-"Mae'r ffeil \"%1\" eisoes mewn bod.\n"
-" Ydych eisiau ysgrifennu drosti?\n"
 
-#: widget/utils/kexicontextmenuutils.cpp:191
-#, fuzzy
-msgid "&Don't Replace"
-msgstr "A&mnewid"
-
-#: widget/utils/kexicontextmenuutils.cpp:270
-msgid ""
-"_: Object name : Object type\n"
-"%1 : %2"
+#: plugins/forms/kexiactionselectiondialog.cpp:360
+msgid "&Select object to be opened after clicking \"%1\" button:"
 msgstr ""
 
-#: widget/kexiscrollview.cpp:357
-#, fuzzy
-msgid "Outer Area"
-msgstr "Ardal ddata:"
-
-#: widget/kexiscrollview.cpp:358
-#, fuzzy
-msgid ""
-"Outer\n"
-"Area"
-msgstr "Ardal ddata:"
-
-#: widget/kexiqueryparameters.cpp:39
-msgid ""
-"_: Enter Query Parameter Value\n"
-"Enter Parameter Value"
+#: plugins/forms/kexiactionselectiondialog.cpp:399
+msgid "Assigning Action to Command Button"
 msgstr ""
 
-#: widget/kexiqueryparameters.cpp:59
-#, fuzzy
-msgid ""
-"_: Boolean True - Yes\n"
-"Yes"
-msgstr "Ie"
-
-#: widget/kexiqueryparameters.cpp:59
-#, fuzzy
-msgid ""
-"_: Boolean False - No\n"
-"No"
-msgstr "Nage"
-
-#: widget/relations/kexirelationview.cpp:76
-msgid "&Hide Selected Table/Query"
-msgstr "&Cuddio'r Tabl/Ymholiad Dewisiedig"
-
-#: widget/relations/kexirelationview.cpp:78
-msgid "&Remove Selected Relationship"
-msgstr "&Gwaredu'r Berthynas Ddewisiedig"
-
-#: widget/relations/kexirelationview.cpp:80
-msgid "&Open Selected Table/Query"
-msgstr "&Agor y Tabl/Ymholiad Dewisiedig"
-
-#: plugins/queries/kexiquerydesignerguieditor.cpp:217
-#: plugins/tables/kexitablepart.cpp:70
-#: widget/relations/kexirelationwidget.cpp:57
-#: widget/relations/kexirelationwidget.cpp:331
-msgid "Table"
-msgstr "Tabl"
-
-#: widget/relations/kexirelationwidget.cpp:86
-msgid "&Open Table"
-msgstr "&Agor Tabl"
-
-#: widget/relations/kexirelationwidget.cpp:89
-msgid "&Design Table"
-msgstr "&Cynllunio Tabl"
-
-#: widget/relations/kexirelationwidget.cpp:94
-msgid "&Hide Table"
-msgstr "&Cuddio Tabl"
-
-#: widget/relations/kexirelationwidget.cpp:335
-msgid "Relationship"
-msgstr "Perthynas"
-
-#: widget/kexicharencodingcombobox.cpp:68
-#, c-format
+#: plugins/forms/kexiactionselectiondialog.cpp:405
 msgid ""
-"_: Text encoding: Default\n"
-"Default: %1"
-msgstr ""
-
-#: widget/pixmapcollection.cpp:154
-msgid "Load KDE Icon by Name"
-msgstr ""
-
-#: widget/pixmapcollection.cpp:168
-msgid "&Size:"
-msgstr "&Maint:"
-
-#: widget/pixmapcollection.cpp:176
-msgid "Small"
-msgstr "Bach"
-
-#: widget/pixmapcollection.cpp:176
-msgid "Medium"
-msgstr "Canolig"
-
-#: widget/pixmapcollection.cpp:176
-msgid "Large"
-msgstr "Mawr"
-
-#: widget/pixmapcollection.cpp:176
-msgid "Huge"
-msgstr "Anferth"
-
-#: widget/pixmapcollection.cpp:235
-#, c-format
-msgid "Edit Pixmap Collection: %1"
-msgstr "Golygu Casgliad Picsfap : %1"
-
-#: widget/pixmapcollection.cpp:246
-msgid "&Add File"
-msgstr "&Ychwanegu Ffeil"
-
-#: widget/pixmapcollection.cpp:253
-#, fuzzy
-msgid "&Add an Icon"
-msgstr "Cysylltiad"
-
-#: widget/pixmapcollection.cpp:260
-#, fuzzy
-msgid "&Remove Selected Item"
-msgstr "&Gwaredu'r Berthynas Ddewisiedig"
-
-#: widget/pixmapcollection.cpp:314
-#, fuzzy
-msgid "Do you want to remove item \"%1\" from collection \"%2\"?"
-msgstr "Ydych eisiau dileu ymholiad \"%1\"?"
-
-#: widget/pixmapcollection.cpp:369
-msgid "Rename Item"
-msgstr "Ailenwi Eitem"
-
-#: widget/pixmapcollection.cpp:370
-msgid "Remove Item"
-msgstr "Gwaredu Eitem"
-
-#: widget/pixmapcollection.cpp:376
-#, c-format
-msgid "Select Pixmap From %1"
+"_: Assign action\n"
+"&Assign"
 msgstr ""
 
-#: widget/pixmapcollection.cpp:377
-#, fuzzy
-msgid "Edit Collection..."
-msgstr "Diwedd detholiad"
-
-#: widget/kexidatasourcecombobox.cpp:128
+#: plugins/forms/kexiactionselectiondialog.cpp:405
 #, fuzzy
-msgid "Define Query..."
-msgstr "Dileu Ymholiad..."
-
-#: plugins/queries/kexiquerydesignersqlhistory.cpp:339
-#: widget/tableview/kexidataawareobjectiface.cpp:943
-#, c-format
-msgid "Error: %1"
-msgstr "Gwall: %1"
-
-#: widget/tableview/kexidataawareobjectiface.cpp:960
-#: widget/tableview/kexitableviewdata.cpp:659
-msgid "The column's constraint is declared as NOT NULL."
-msgstr "Datganwyd cyfyngiad y golofn fel NOT NULL (dim nwl)."
-
-#: widget/tableview/kexidataawareobjectiface.cpp:982
-#: widget/tableview/kexitableviewdata.cpp:670
-msgid "The column's constraint is declared as NOT EMPTY."
-msgstr "Datganwyd cyfyngiad y golofn fel NOT EMPTY (dim yn wag)."
-
-#: widget/tableview/kexidataawareobjectiface.cpp:1000
-msgid "The column's constraint is declared as NOT EMPTY and NOT NULL."
-msgstr ""
-"Datganwyd cyfyngiad y golofn fel NOT EMPTY (dim yn wag) a NOT NULL (dim nwl)"
-
-#: widget/tableview/kexidataawareobjectiface.cpp:1212
-msgid "Do you want to delete selected row?"
-msgstr "Ydych eisiau dileu'r rhes dewisiedig?"
-
-#: widget/tableview/kexidataawareobjectiface.cpp:1213
-msgid "&Delete Row"
-msgstr "&Dileu Rhes"
+msgid "Assign action"
+msgstr "Gweithredoedd"
 
-#: widget/tableview/kexidataawareobjectiface.cpp:1334
+#: plugins/forms/kexiactionselectiondialog.cpp:436
 #, fuzzy
-msgid "Do you want to clear the contents of table %1?"
-msgstr "Ydych eisiau dileu'r rhes dewisiedig?"
+msgid "Action category:"
+msgstr "Math y weithred:"
 
-#: widget/tableview/kexidataawareobjectiface.cpp:1335
+#: plugins/forms/kexiactionselectiondialog.cpp:480
 #, fuzzy
-msgid "&Clear Contents"
-msgstr "Cynnwys annilys yn y gronfa ddata "
-
-#: widget/tableview/kexidataawareobjectiface.cpp:1762
-msgid "Row: "
-msgstr "Rhes: "
+msgid "Action to execute:"
+msgstr "Math y weithred:"
 
-#: widget/tableview/kexidataawareobjectiface.cpp:1838
-msgid ""
-"_: Correct Changes\n"
-"Correct"
+#: plugins/forms/kexiactionselectiondialog.cpp:581
+msgid "&Select action to be executed after clicking \"%1\" button:"
 msgstr ""
 
-#: widget/tableview/kexidataawareobjectiface.cpp:1838
-#, fuzzy
-msgid "Correct changes"
-msgstr "Cadw newidiadau i'r gwrthrych"
-
-#: widget/tableview/kexidataawareobjectiface.cpp:1839
-#, fuzzy
-msgid "Discard Changes"
-msgstr "Cadw Newidiadau"
-
-#: widget/tableview/kexitableviewdata.cpp:657
-#: widget/tableview/kexitableviewdata.cpp:668
-msgid "\"%1\" column requires a value to be entered."
-msgstr "Rhaid mewnosod gwerth yng ngholofn \"%1\"."
-
-#: widget/tableview/kexitableviewdata.cpp:682
-msgid "Row inserting failed."
-msgstr "Methwyd mewnosod rhes."
-
-#: widget/tableview/kexitableviewdata.cpp:702
-msgid "Row changing failed."
-msgstr "Methwyd newid rhes."
-
-#: widget/tableview/kexitableviewdata.cpp:769
-msgid "Row deleting failed."
-msgstr "Methwyd dileu rhes."
+#: plugins/forms/kexidataprovider.cpp:231
+#: plugins/forms/kexidataprovider.cpp:256
+#: plugins/forms/kexidataprovider.cpp:278
+msgid "NAME"
+msgstr "ENW"
 
-#: widget/tableview/kexiblobtableedit.cpp:93
-msgid "Click to show available actions for this cell"
+#: plugins/forms/kexidatasourcepage.cpp:54
+msgid "No data source could be assigned for this widget."
 msgstr ""
 
-#: widget/tableview/kexitableview.cpp:106
-#, fuzzy
-msgid "Contains a pointer to the currently selected row"
-msgstr "Mewnosod un rhes wag uwchben yr un wedi'i dewis ar hyn o bryd"
-
-#: widget/tableview/kexitableview.cpp:109
-#, fuzzy
-msgid "Row navigator"
-msgstr "Mordwywr cywaith"
-
-#: widget/tableview/kexitableview.cpp:222
-msgid "Add Record"
-msgstr "Ychwanegu Cofnod"
-
-#: widget/tableview/kexitableview.cpp:225
-msgid "Remove Record"
-msgstr "Dileu Cofnod"
-
-#: plugins/reports/kexireportview.cpp:47
-msgid "Page:"
-msgstr "Tudalen :"
-
-#: plugins/reports/kexireportpart.cpp:57
-msgid ""
-"_: Translate this word using only lowercase alphanumeric characters (a..z, "
-"0..9). Use '_' character instead of spaces. First character should be a..z "
-"character. If you cannot use latin characters in your language, use english "
-"word.\n"
-"report"
+#: plugins/forms/kexidatasourcepage.cpp:55
+msgid "No data source could be assigned for multiple widgets."
 msgstr ""
 
-#: plugins/reports/kexireportfactory.cpp:42
-#: plugins/reports/kexireportpart.cpp:58
-msgid "Report"
-msgstr "Adroddiad"
-
-#: plugins/reports/kexireportpart.cpp:123
-#, fuzzy
-msgid "Design of report \"%1\" has been modified."
-msgstr "<p>Addasiwyd y gwrthrych: %1 \"%2\".</p><p>Ydych eisiau ei gadw?</p>"
-
-#: plugins/reports/kexireportpart.cpp:125
+#: plugins/forms/kexidatasourcepage.cpp:60 plugins/forms/kexidbfactory.cpp:291
+#: plugins/forms/kexiformpart.cpp:505
 #, fuzzy
-msgid "Report \"%1\" already exists."
-msgstr "Mae cronfa ddata \"%1\" yn bodoli eisoes."
+msgid "Data Source"
+msgstr "Tarddiad data"
 
-#: plugins/reports/kexireportfactory.cpp:44
+#: plugins/forms/kexidatasourcepage.cpp:79
 msgid ""
-"_: Widget name. This string will be used to name widgets of this class. It must "
-"_not_ contain white spaces and non latin1 characters.\n"
-"report"
+"_: Table Field or Query Field\n"
+"Widget's data source:"
 msgstr ""
 
-#: plugins/reports/kexireportfactory.cpp:45
-#, fuzzy
-msgid "A report"
-msgstr "Adroddiad"
-
-#: plugins/reports/kexireportfactory.cpp:51
-msgid "Label"
-msgstr "Label"
-
-#: plugins/forms/kexidbfactory.cpp:149
-#: plugins/reports/kexireportfactory.cpp:53
-msgid ""
-"_: Widget name. This string will be used to name widgets of this class. It must "
-"_not_ contain white spaces and non latin1 characters.\n"
-"label"
-msgstr "label"
-
-#: plugins/reports/kexireportfactory.cpp:54
+#: plugins/forms/kexidatasourcepage.cpp:89
 #, fuzzy
-msgid "A label to display text"
-msgstr "Celfigyn i ddangos testun neu bics-fapiau"
+msgid "Clear widget's data source"
+msgstr "Newid Tarddiad Data"
 
-#: plugins/reports/kexireportfactory.cpp:60
+#: plugins/forms/kexidatasourcepage.cpp:106
 #, fuzzy
-msgid "Picture Label"
-msgstr "Label Testun"
-
-#: plugins/reports/kexireportfactory.cpp:62
-msgid ""
-"_: Widget name. This string will be used to name widgets of this class. It must "
-"_not_ contain white spaces and non latin1 characters.\n"
-"picture"
-msgstr ""
+msgid "Form's data source:"
+msgstr "Ffynhonnell ddata:"
 
-#: plugins/reports/kexireportfactory.cpp:63
+#: plugins/forms/kexidatasourcepage.cpp:115
 #, fuzzy
-msgid "A label to display images or icons"
-msgstr "Celfigyn i ddangos testun neu bics-fapiau"
-
-#: plugins/reports/kexireportfactory.cpp:69
-msgid "Line"
-msgstr "Llinell"
-
-#: plugins/reports/kexireportfactory.cpp:71
-msgid ""
-"_: Widget name. This string will be used to name widgets of this class. It must "
-"_not_ contain white spaces and non latin1 characters.\n"
-"line"
-msgstr "llinell"
+msgid "Go to selected form's data source"
+msgstr "Ffynhonnell ddata:"
 
-#: plugins/reports/kexireportfactory.cpp:72
+#: plugins/forms/kexidatasourcepage.cpp:121
 #, fuzzy
-msgid "A simple line"
-msgstr "Blwch rhestr syml"
+msgid "Clear form's data source"
+msgstr "Newid Tarddiad Data"
 
-#: plugins/reports/kexireportfactory.cpp:78
+#: plugins/forms/kexidatasourcepage.cpp:148
 #, fuzzy
-msgid "Sub Report"
-msgstr "Adroddiad"
+msgid "Inserting Fields"
+msgstr "Methwyd mewnosod rhes."
 
-#: plugins/reports/kexireportfactory.cpp:80
+#: plugins/forms/kexidatasourcepage.cpp:162
 msgid ""
-"_: Widget name. This string will be used to name widgets of this class. It must "
-"_not_ contain white spaces and non latin1 characters.\n"
-"subReport"
+"Select fields from the list below and drag them onto a form or click the "
+"\"Insert\" button"
 msgstr ""
 
-#: plugins/reports/kexireportfactory.cpp:81
-msgid "A report embedded in another report"
+#: plugins/forms/kexidatasourcepage.cpp:169
+msgid "Available fields:"
 msgstr ""
 
-#: plugins/reports/kexireportfactory.cpp:124
-msgid "Edit Rich Text"
-msgstr "Golygu Testun Cyfoethog"
+#: plugins/forms/kexidatasourcepage.cpp:175
+msgid ""
+"_: Insert selected field into form\n"
+"Insert"
+msgstr "Rhyngosod"
 
-#: plugins/forms/kexiformmanager.cpp:115
-msgid "Set Form's Data Source to \"%1\""
+#: plugins/forms/kexidatasourcepage.cpp:180
+msgid "Insert selected fields into form"
 msgstr ""
 
 #: plugins/forms/kexidbfactory.cpp:79 plugins/forms/kexiformpart.cpp:93
@@ -4370,8 +3465,8 @@ msgstr "Ffurflen"
 
 #: plugins/forms/kexidbfactory.cpp:82
 msgid ""
-"_: Widget name. This string will be used to name widgets of this class. It must "
-"_not_ contain white spaces and non latin1 characters.\n"
+"_: Widget name. This string will be used to name widgets of this class. It "
+"must _not_ contain white spaces and non latin1 characters.\n"
 "form"
 msgstr ""
 
@@ -4387,8 +3482,8 @@ msgstr "Ffurflen"
 
 #: plugins/forms/kexidbfactory.cpp:94
 msgid ""
-"_: Widget name. This string will be used to name widgets of this class. It must "
-"_not_ contain white spaces and non latin1 characters.\n"
+"_: Widget name. This string will be used to name widgets of this class. It "
+"must _not_ contain white spaces and non latin1 characters.\n"
 "subForm"
 msgstr ""
 
@@ -4403,8 +3498,8 @@ msgstr "Testun"
 
 #: plugins/forms/kexidbfactory.cpp:110
 msgid ""
-"_: Widget name. This string will be used to name widgets of this class. It must "
-"_not_ contain white spaces and non latin1 characters.\n"
+"_: Widget name. This string will be used to name widgets of this class. It "
+"must _not_ contain white spaces and non latin1 characters.\n"
 "textBox"
 msgstr ""
 
@@ -4419,8 +3514,8 @@ msgstr "Golygydd testun"
 
 #: plugins/forms/kexidbfactory.cpp:124
 msgid ""
-"_: Widget name. This string will be used to name widgets of this class. It must "
-"_not_ contain white spaces and non latin1 characters.\n"
+"_: Widget name. This string will be used to name widgets of this class. It "
+"must _not_ contain white spaces and non latin1 characters.\n"
 "textEditor"
 msgstr ""
 
@@ -4435,8 +3530,8 @@ msgstr "Ffrâm"
 
 #: plugins/forms/kexidbfactory.cpp:136
 msgid ""
-"_: Widget name. This string will be used to name widgets of this class. It must "
-"_not_ contain white spaces and non latin1 characters.\n"
+"_: Widget name. This string will be used to name widgets of this class. It "
+"must _not_ contain white spaces and non latin1 characters.\n"
 "frame"
 msgstr ""
 
@@ -4451,6 +3546,13 @@ msgid ""
 "Label"
 msgstr "Label"
 
+#: plugins/forms/kexidbfactory.cpp:149 plugins/reports/kexireportfactory.cpp:53
+msgid ""
+"_: Widget name. This string will be used to name widgets of this class. It "
+"must _not_ contain white spaces and non latin1 characters.\n"
+"label"
+msgstr "label"
+
 #: plugins/forms/kexidbfactory.cpp:150
 #, fuzzy
 msgid "A widget for displaying text"
@@ -4462,8 +3564,8 @@ msgstr ""
 
 #: plugins/forms/kexidbfactory.cpp:163
 msgid ""
-"_: Widget name. This string will be used to name widgets of this class. It must "
-"_not_ contain white spaces and non latin1 characters.\n"
+"_: Widget name. This string will be used to name widgets of this class. It "
+"must _not_ contain white spaces and non latin1 characters.\n"
 "image"
 msgstr "delwedd"
 
@@ -4479,8 +3581,8 @@ msgstr "Blwch Cyfun"
 #: plugins/forms/kexidbfactory.cpp:182
 #, fuzzy
 msgid ""
-"_: Widget name. This string will be used to name widgets of this class. It must "
-"_not_ contain white spaces and non latin1 characters.\n"
+"_: Widget name. This string will be used to name widgets of this class. It "
+"must _not_ contain white spaces and non latin1 characters.\n"
 "comboBox"
 msgstr "botwm"
 
@@ -4495,8 +3597,8 @@ msgstr "Blwch Britho"
 
 #: plugins/forms/kexidbfactory.cpp:194
 msgid ""
-"_: Widget name. This string will be used to name widgets of this class. It must "
-"_not_ contain white spaces and non latin1 characters.\n"
+"_: Widget name. This string will be used to name widgets of this class. It "
+"must _not_ contain white spaces and non latin1 characters.\n"
 "checkBox"
 msgstr ""
 
@@ -4512,8 +3614,8 @@ msgstr "Maes"
 
 #: plugins/forms/kexidbfactory.cpp:206
 msgid ""
-"_: Widget name. This string will be used to name widgets of this class. It must "
-"_not_ contain white spaces and non latin1 characters\n"
+"_: Widget name. This string will be used to name widgets of this class. It "
+"must _not_ contain white spaces and non latin1 characters\n"
 "autoField"
 msgstr ""
 
@@ -4530,8 +3632,8 @@ msgstr "Botwm Radio"
 
 #: plugins/forms/kexidbfactory.cpp:287
 msgid ""
-"_: Widget name. This string will be used to name widgets of this class. It must "
-"_not_ contain white spaces and non latin1 characters.\n"
+"_: Widget name. This string will be used to name widgets of this class. It "
+"must _not_ contain white spaces and non latin1 characters.\n"
 "button"
 msgstr "botwm"
 
@@ -4540,12 +3642,6 @@ msgstr "botwm"
 msgid "A command button to execute actions"
 msgstr "Botwm gwthio syml i weithredu gorchymyn"
 
-#: plugins/forms/kexidatasourcepage.cpp:60 plugins/forms/kexidbfactory.cpp:291
-#: plugins/forms/kexiformpart.cpp:505
-#, fuzzy
-msgid "Data Source"
-msgstr "Tarddiad data"
-
 #: plugins/forms/kexidbfactory.cpp:292
 #, fuzzy
 msgid "Form Name"
@@ -4703,180 +3799,8 @@ msgstr "&Delwedd"
 msgid "&Assign Action..."
 msgstr ""
 
-#: plugins/forms/kexidataprovider.cpp:231
-#: plugins/forms/kexidataprovider.cpp:256
-#: plugins/forms/kexidataprovider.cpp:278
-msgid "NAME"
-msgstr "ENW"
-
-#: plugins/forms/kexiformview.cpp:1118
-msgid "Insert AutoField widget"
-msgstr ""
-
-#: plugins/forms/kexiformview.cpp:1118
-#, fuzzy
-msgid "Insert %1 AutoField widgets"
-msgstr "Newid %1 o nifer o gelfigion"
-
-#: plugins/forms/kexiactionselectiondialog.cpp:194
-#, fuzzy
-msgid "No action"
-msgstr "Dim Gweithred"
-
-#: plugins/forms/kexiactionselectiondialog.cpp:197
-#, fuzzy
-msgid "Application actions"
-msgstr "Cymhwysiad"
-
-#: plugins/forms/kexiactionselectiondialog.cpp:211
-#, fuzzy
-msgid ""
-"_: Current form's actions\n"
-"Current"
-msgstr "Arian"
-
-#: plugins/forms/kexiactionselectiondialog.cpp:268
-#, fuzzy
-msgid "Open in Data View"
-msgstr "Golwg &Testun"
-
-#: plugins/forms/kexiactionselectiondialog.cpp:284
-#, fuzzy
-msgid "Show Page Setup"
-msgstr "Gosodiad Tudalen ..."
-
-#: plugins/forms/kexiactionselectiondialog.cpp:292
-msgid ""
-"_: Note: use multiple rows if needed\n"
-"Export to File\n"
-"As Data Table"
-msgstr ""
-
-#: plugins/forms/kexiactionselectiondialog.cpp:297
-msgid ""
-"_: Note: use multiple rows if needed\n"
-"Copy to Clipboard\n"
-"As Data Table"
-msgstr ""
-
-#: plugins/forms/kexiactionselectiondialog.cpp:303
-#, fuzzy
-msgid "Create New Object"
-msgstr "Creu cywaith newydd"
-
-#: plugins/forms/kexiactionselectiondialog.cpp:306
-#, fuzzy
-msgid "Open in Design View"
-msgstr "Golwg &Testun"
-
-#: plugins/forms/kexiactionselectiondialog.cpp:310
-#, fuzzy
-msgid "Open in Text View"
-msgstr "Golwg &Testun"
-
-#: plugins/forms/kexiactionselectiondialog.cpp:313
-#, fuzzy
-msgid "Close View"
-msgstr "Rhes nesaf"
-
-#: plugins/forms/kexiactionselectiondialog.cpp:355
-msgid "&Select macro to be executed after clicking \"%1\" button:"
-msgstr ""
-
-#: plugins/forms/kexiactionselectiondialog.cpp:357
-msgid "&Select script to be executed after clicking \"%1\" button:"
-msgstr ""
-
-#: plugins/forms/kexiactionselectiondialog.cpp:360
-msgid "&Select object to be opened after clicking \"%1\" button:"
-msgstr ""
-
-#: plugins/forms/kexiactionselectiondialog.cpp:399
-msgid "Assigning Action to Command Button"
-msgstr ""
-
-#: plugins/forms/kexiactionselectiondialog.cpp:405
-msgid ""
-"_: Assign action\n"
-"&Assign"
-msgstr ""
-
-#: plugins/forms/kexiactionselectiondialog.cpp:405
-#, fuzzy
-msgid "Assign action"
-msgstr "Gweithredoedd"
-
-#: plugins/forms/kexiactionselectiondialog.cpp:436
-#, fuzzy
-msgid "Action category:"
-msgstr "Math y weithred:"
-
-#: plugins/forms/kexiactionselectiondialog.cpp:480
-#, fuzzy
-msgid "Action to execute:"
-msgstr "Math y weithred:"
-
-#: plugins/forms/kexiactionselectiondialog.cpp:581
-msgid "&Select action to be executed after clicking \"%1\" button:"
-msgstr ""
-
-#: plugins/forms/kexidatasourcepage.cpp:54
-msgid "No data source could be assigned for this widget."
-msgstr ""
-
-#: plugins/forms/kexidatasourcepage.cpp:55
-msgid "No data source could be assigned for multiple widgets."
-msgstr ""
-
-#: plugins/forms/kexidatasourcepage.cpp:79
-msgid ""
-"_: Table Field or Query Field\n"
-"Widget's data source:"
-msgstr ""
-
-#: plugins/forms/kexidatasourcepage.cpp:89
-#, fuzzy
-msgid "Clear widget's data source"
-msgstr "Newid Tarddiad Data"
-
-#: plugins/forms/kexidatasourcepage.cpp:106
-#, fuzzy
-msgid "Form's data source:"
-msgstr "Ffynhonnell ddata:"
-
-#: plugins/forms/kexidatasourcepage.cpp:115
-#, fuzzy
-msgid "Go to selected form's data source"
-msgstr "Ffynhonnell ddata:"
-
-#: plugins/forms/kexidatasourcepage.cpp:121
-#, fuzzy
-msgid "Clear form's data source"
-msgstr "Newid Tarddiad Data"
-
-#: plugins/forms/kexidatasourcepage.cpp:148
-#, fuzzy
-msgid "Inserting Fields"
-msgstr "Methwyd mewnosod rhes."
-
-#: plugins/forms/kexidatasourcepage.cpp:162
-msgid ""
-"Select fields from the list below and drag them onto a form or click the "
-"\"Insert\" button"
-msgstr ""
-
-#: plugins/forms/kexidatasourcepage.cpp:169
-msgid "Available fields:"
-msgstr ""
-
-#: plugins/forms/kexidatasourcepage.cpp:175
-msgid ""
-"_: Insert selected field into form\n"
-"Insert"
-msgstr "Rhyngosod"
-
-#: plugins/forms/kexidatasourcepage.cpp:180
-msgid "Insert selected fields into form"
+#: plugins/forms/kexiformmanager.cpp:115
+msgid "Set Form's Data Source to \"%1\""
 msgstr ""
 
 #: plugins/forms/kexiformpart.cpp:92
@@ -5011,23 +3935,20 @@ msgstr "<p>Addasiwyd y gwrthrych: %1 \"%2\".</p><p>Ydych eisiau ei gadw?</p>"
 msgid "Form \"%1\" already exists."
 msgstr "Mae cronfa ddata \"%1\" yn bodoli eisoes."
 
-#: plugins/forms/kexiformpart.cpp:508
+#: plugins/forms/kexiformpart.cpp:508 plugins/forms/kexiformpartinstui.rc:30
+#: plugins/reports/kexireportpartinstui.rc:21
+#, no-c-format
 msgid "Widgets"
 msgstr "Celfigion"
 
-#: plugins/forms/widgets/kexidbimagebox.cpp:564
-msgid "Click to show actions for this image box"
-msgstr ""
-
-#: plugins/forms/widgets/kexidbimagebox.cpp:576
-msgid "Click to show actions for \"%1\" image box"
+#: plugins/forms/kexiformview.cpp:1118
+msgid "Insert AutoField widget"
 msgstr ""
 
-#: plugins/forms/widgets/kexidbimagebox.cpp:668
-msgid ""
-"_: Unbound Image Box\n"
-"(unbound)"
-msgstr ""
+#: plugins/forms/kexiformview.cpp:1118
+#, fuzzy
+msgid "Insert %1 AutoField widgets"
+msgstr "Newid %1 o nifer o gelfigion"
 
 #: plugins/forms/widgets/kexidbautofield.cpp:573
 msgid ""
@@ -5041,280 +3962,30 @@ msgid ""
 " (unbound)"
 msgstr ""
 
-#: plugins/queries/kexiquerydesignerguieditor.cpp:158
-msgid "Query Columns"
-msgstr "Colofnau'r ymholiad"
-
-#: plugins/importexport/csv/kexicsvimportdialog.cpp:1163
-#: plugins/macros/kexiactions/navigateaction.cpp:73
-#: plugins/queries/kexiquerydesignerguieditor.cpp:209
-msgid "Column"
-msgstr "Colofn"
-
-#: plugins/queries/kexiquerydesignerguieditor.cpp:210
-msgid "Describes field name or expression for the designed query."
-msgstr ""
-
-#: plugins/queries/kexiquerydesignerguieditor.cpp:218
-msgid "Describes table for a given field. Can be empty."
-msgstr ""
-
-#: plugins/queries/kexiquerydesignerguieditor.cpp:223
-msgid "Visible"
-msgstr "Gweladwy"
-
-#: plugins/queries/kexiquerydesignerguieditor.cpp:224
-msgid "Describes visibility for a given field or expression."
-msgstr ""
-
-#: plugins/queries/kexiquerydesignerguieditor.cpp:230
-msgid "Totals"
-msgstr "Cyfansymiau"
-
-#: plugins/queries/kexiquerydesignerguieditor.cpp:231
-msgid "Describes a way of computing totals for a given field or expression."
-msgstr ""
-
-#: plugins/queries/kexiquerydesignerguieditor.cpp:233
-msgid "Group by"
-msgstr "Casglu yn ôl"
-
-#: plugins/queries/kexiquerydesignerguieditor.cpp:234
-msgid "Sum"
-msgstr "Swm"
-
-#: plugins/queries/kexiquerydesignerguieditor.cpp:235
-msgid "Average"
-msgstr "Cyfartaledd"
-
-#: plugins/queries/kexiquerydesignerguieditor.cpp:236
-msgid "Min"
-msgstr "Isafswm"
-
-#: plugins/queries/kexiquerydesignerguieditor.cpp:237
-msgid "Max"
-msgstr "Uchafswm"
-
-#: plugins/queries/kexiquerydesignerguieditor.cpp:243
-#: plugins/queries/kexiquerydesignerguieditor.cpp:1736
-msgid "Sorting"
-msgstr "Didoli"
-
-#: plugins/queries/kexiquerydesignerguieditor.cpp:244
-#, fuzzy
-msgid "Describes a way of sorting for a given field."
-msgstr "Cadw newidiadau i'r gwrthrych o'r ffenestr a ddewisir ar hyn o bryd"
-
-#: plugins/queries/kexiquerydesignerguieditor.cpp:247
-#: plugins/queries/kexiquerydesignerguieditor.cpp:1734
-msgid "Ascending"
-msgstr "Esgynnol"
-
-#: plugins/queries/kexiquerydesignerguieditor.cpp:248
-#: plugins/queries/kexiquerydesignerguieditor.cpp:1734
-msgid "Descending"
-msgstr "Disgynnol"
-
-#: plugins/queries/kexiquerydesignerguieditor.cpp:252
-msgid "Criteria"
-msgstr "Meini prawf"
-
-#: plugins/queries/kexiquerydesignerguieditor.cpp:253
-msgid "Describes the criteria for a given field or expression."
-msgstr ""
-
-#: plugins/queries/kexiquerydesignerguieditor.cpp:356
-#, fuzzy
-msgid ""
-"Cannot switch to data view, because query design is empty.\n"
-"First, please create your design."
-msgstr ""
-"Methu newid i olygfa'r data, am fod cynllun yr ymholiad yn wag.\n"
-" Creuwch eich cynllun yn gyntaf.\n"
-
-#: plugins/queries/kexiquerydesignerguieditor.cpp:390
-msgid "Select column for table \"%1\""
-msgstr ""
-
-#: plugins/queries/kexiquerydesignerguieditor.cpp:413
-#: plugins/queries/kexiquerydesignerguieditor.cpp:1641
-#, fuzzy
-msgid "Invalid criteria \"%1\""
-msgstr "Enw gwrthrych annilys \"%1\""
-
-#: plugins/queries/kexiquerydesignerguieditor.cpp:434
-#: plugins/queries/kexiquerydesignerguieditor.cpp:1471
-#, fuzzy
-msgid "Invalid expression \"%1\""
-msgstr "Enw gwrthrych annilys \"%1\""
-
-#: plugins/queries/kexiquerydesignerguieditor.cpp:628
-#: plugins/queries/kexiquerydesignerguieditor.cpp:642
-#: plugins/queries/kexiquerydesignerguieditor.cpp:665
-#: plugins/queries/kexiquerydesignerguieditor.cpp:1086
-msgid "Query definition loading failed."
-msgstr ""
-
-#: plugins/queries/kexiquerydesignerguieditor.cpp:629
-msgid ""
-"Query design may be corrupted so it could not be opened even in text view.\n"
-"You can delete the query and create it again."
-msgstr ""
-
-#: plugins/queries/kexiquerydesignerguieditor.cpp:1451
-#, fuzzy
-msgid "Entered column alias \"%1\" is not a valid identifier."
-msgstr "Math annilys"
-
-#: plugins/queries/kexiquerydesignerguieditor.cpp:1592
-#, fuzzy
-msgid "Could not set sorting for multiple columns (%1)"
-msgstr "Methwyd creu cywaith \"%1\""
-
-#: plugins/queries/kexiquerydesignerguieditor.cpp:1614
-#, fuzzy
-msgid "Could not set criteria for \"%1\""
-msgstr "Methwyd creu cywaith \"%1\""
-
-#: plugins/queries/kexiquerydesignerguieditor.cpp:1617
-msgid "Could not set criteria for empty row"
-msgstr ""
-
-#: plugins/queries/kexiquerydesignerguieditor.cpp:1706
-#, fuzzy
-msgid "Query column"
-msgstr "Colofnau'r ymholiad"
-
-#: plugins/macros/kexiactions/messageaction.cpp:34
-#: plugins/queries/kexiquerydesignerguieditor.cpp:1717
-#: plugins/tables/kexitabledesignerview.cpp:371
-msgid "Caption"
-msgstr "Egluryn"
-
-#: plugins/queries/kexiquerydesignerguieditor.cpp:1722
-msgid "Alias"
-msgstr "Ffugenw"
-
-#: plugins/queries/kexiqueryview.cpp:87
-#, fuzzy
-msgid "Query executing failed."
-msgstr "Methwyd dileu rhes."
-
-#: plugins/queries/kexiquerydesignersql.cpp:108
-msgid "SQL Query Text"
-msgstr ""
-
-#: plugins/queries/kexiquerydesignersql.cpp:143
-msgid "SQL Query History"
-msgstr ""
-
-#: plugins/queries/kexiquerydesignersql.cpp:147
-#, fuzzy
-msgid "Back to Selected Query"
-msgstr "&Cuddio'r Tabl/Ymholiad Dewisiedig"
-
-#: plugins/queries/kexiquerydesignersql.cpp:148
-msgid "Clear History"
-msgstr "Gwaredu Hanes"
-
-#: plugins/queries/kexiquerydesignersql.cpp:175
-msgid "The query is correct"
-msgstr ""
-
-#: plugins/queries/kexiquerydesignersql.cpp:182
-msgid "The query is incorrect"
-msgstr ""
-
-#: plugins/queries/kexiquerydesignersql.cpp:189
-msgid ""
-"Please enter your query and execute \"Check query\" function to verify it."
-msgstr ""
-
-#: plugins/queries/kexiquerydesignersql.cpp:236
-msgid "The query you entered is incorrect."
-msgstr ""
-
-#: plugins/queries/kexiquerydesignersql.cpp:237
-msgid "Do you want to cancel any changes made to this SQL text?"
+#: plugins/forms/widgets/kexidbimagebox.cpp:564
+msgid "Click to show actions for this image box"
 msgstr ""
 
-#: plugins/queries/kexiquerydesignersql.cpp:238
-msgid "Answering \"No\" allows you to make corrections."
+#: plugins/forms/widgets/kexidbimagebox.cpp:576
+msgid "Click to show actions for \"%1\" image box"
 msgstr ""
 
-#: plugins/queries/kexiquerydesignersql.cpp:480
-#, fuzzy
-msgid "Do you want to save invalid query?"
-msgstr "Ydych eisiau dileu ymholiad \"%1\"?"
-
-#: plugins/queries/kexiaddparamdialog.cpp:30
-msgid "Add Parameter"
-msgstr "Ychwanegu Paramedr"
-
-#: plugins/queries/kexiquerydesignersqlhistory.cpp:44
-msgid "Copy to Clipboard"
-msgstr "Copïo i'r Gludfwrdd"
-
-#: plugins/queries/kexidynamicqueryparameterdialog.cpp:32
-msgid "Query Parameters"
-msgstr "Paramedrau'r Ymholiad"
-
-#: plugins/queries/kexiquerypart.cpp:50
+#: plugins/forms/widgets/kexidbimagebox.cpp:668
 msgid ""
-"_: Translate this word using only lowercase alphanumeric characters (a..z, "
-"0..9). Use '_' character instead of spaces. First character should be a..z "
-"character. If you cannot use latin characters in your language, use english "
-"word.\n"
-"query"
-msgstr "ymholiad"
-
-#: plugins/queries/kexiquerypart.cpp:51
-msgid "Query"
-msgstr "Ymholiad"
-
-#: plugins/queries/kexiquerypart.cpp:147 plugins/queries/kexiquerypart.cpp:149
-#, fuzzy
-msgid "Check Query"
-msgstr "Ail-ymholi"
-
-#: plugins/queries/kexiquerypart.cpp:150
-msgid "Checks query for validity."
-msgstr ""
-
-#: plugins/queries/kexiquerypart.cpp:153
-msgid "Show SQL History"
-msgstr ""
-
-#: plugins/queries/kexiquerypart.cpp:155
-msgid "Shows or hides SQL editor's history."
+"_: Unbound Image Box\n"
+"(unbound)"
 msgstr ""
 
-#: plugins/queries/kexiquerypart.cpp:198
+#: plugins/importexport/csv/kexicsvexportwizard.cpp:60
 #, fuzzy
-msgid "Design of query \"%1\" has been modified."
-msgstr "<p>Addasiwyd y gwrthrych: %1 \"%2\".</p><p>Ydych eisiau ei gadw?</p>"
-
-#: plugins/queries/kexiquerypart.cpp:200
-#, fuzzy
-msgid "Query \"%1\" already exists."
-msgstr "Mae cronfa ddata \"%1\" yn bodoli eisoes."
-
-#: plugins/importexport/csv/kexicsvwidgets.cpp:51
-msgid "Comma \",\""
-msgstr ""
-
-#: plugins/importexport/csv/kexicsvwidgets.cpp:52
-msgid "Semicolon \";\""
-msgstr ""
-
-#: plugins/importexport/csv/kexicsvwidgets.cpp:53
-msgid "Tabulator"
-msgstr "Tablwr"
+msgid "Copy"
+msgstr "Copïo"
 
-#: plugins/importexport/csv/kexicsvwidgets.cpp:54
+#: plugins/importexport/csv/kexicsvexportwizard.cpp:64
+#: widget/kexibrowser.cpp:196
 #, fuzzy
-msgid "Space \" \""
-msgstr "Bylchydd"
+msgid "Export"
+msgstr "&Allforio"
 
 #: plugins/importexport/csv/kexicsvexportwizard.cpp:74
 #, fuzzy
@@ -5372,13 +4043,18 @@ msgstr "Bar Offer:"
 msgid "Show Options >>"
 msgstr "Dewisiadau CSV"
 
+#: plugins/importexport/csv/kexicsvexportwizard.cpp:143
+#, fuzzy
+msgid "Options"
+msgstr "Egluryn"
+
 #: plugins/importexport/csv/kexicsvexportwizard.cpp:157
-#: plugins/importexport/csv/kexicsvimportdialog.cpp:216
+#: plugins/importexport/csv/kexicsvimportdialog.cpp:218
 msgid "Delimiter:"
 msgstr "Amffinydd:"
 
 #: plugins/importexport/csv/kexicsvexportwizard.cpp:168
-#: plugins/importexport/csv/kexicsvimportdialog.cpp:241
+#: plugins/importexport/csv/kexicsvimportdialog.cpp:243
 #, fuzzy
 msgid "Text quote:"
 msgstr "Dyfyniad testun:"
@@ -5419,171 +4095,182 @@ msgstr "Dewisiadau CSV"
 msgid "Defaults"
 msgstr "Rhagosodion"
 
-#: plugins/importexport/csv/kexicsvimportdialog.cpp:142
+#: plugins/importexport/csv/kexicsvimportdialog.cpp:144
 #, fuzzy
 msgid "Import CSV Data File"
 msgstr "Dewis Cronfa Ddata"
 
-#: plugins/importexport/csv/kexicsvimportdialog.cpp:173
+#: plugins/importexport/csv/kexicsvimportdialog.cpp:153
+#, fuzzy
+msgid "&Options"
+msgstr "Egluryn"
+
+#: plugins/importexport/csv/kexicsvimportdialog.cpp:175
 msgid "&Import..."
 msgstr "&Mewnforio..."
 
-#: plugins/importexport/csv/kexicsvimportdialog.cpp:176
+#: plugins/importexport/csv/kexicsvimportdialog.cpp:178
 msgid "text"
 msgstr "testun"
 
-#: plugins/importexport/csv/kexicsvimportdialog.cpp:177
+#: plugins/importexport/csv/kexicsvimportdialog.cpp:179
 msgid "number"
 msgstr "rhif"
 
-#: plugins/importexport/csv/kexicsvimportdialog.cpp:178
+#: plugins/importexport/csv/kexicsvimportdialog.cpp:180
 msgid "date"
 msgstr "dyddiad"
 
-#: plugins/importexport/csv/kexicsvimportdialog.cpp:179
+#: plugins/importexport/csv/kexicsvimportdialog.cpp:181
 msgid "time"
 msgstr "amser"
 
-#: plugins/importexport/csv/kexicsvimportdialog.cpp:180
+#: plugins/importexport/csv/kexicsvimportdialog.cpp:182
 msgid "date/time"
 msgstr "dyddiad/Amser"
 
-#: plugins/importexport/csv/kexicsvimportdialog.cpp:201
+#: plugins/importexport/csv/kexicsvimportdialog.cpp:203
 msgid "Preview of data from file:"
 msgstr ""
 
-#: plugins/importexport/csv/kexicsvimportdialog.cpp:202
+#: plugins/importexport/csv/kexicsvimportdialog.cpp:204
 msgid "Preview of data from clipboard:"
 msgstr ""
 
-#: plugins/importexport/csv/kexicsvimportdialog.cpp:221
+#: plugins/importexport/csv/kexicsvimportdialog.cpp:223
 msgid "Format for column %1:"
 msgstr ""
 
-#: plugins/importexport/csv/kexicsvimportdialog.cpp:234
+#: plugins/importexport/csv/kexicsvimportdialog.cpp:236
 msgid "Primary key"
 msgstr "Prif Allwedd"
 
-#: plugins/importexport/csv/kexicsvimportdialog.cpp:262
+#: plugins/importexport/csv/kexicsvimportdialog.cpp:264
 msgid "Ignore duplicated delimiters"
 msgstr "Anwybyddu amffinyddion dyblygedig"
 
-#: plugins/importexport/csv/kexicsvimportdialog.cpp:266
+#: plugins/importexport/csv/kexicsvimportdialog.cpp:268
 msgid "First row contains column names"
 msgstr ""
 
-#: plugins/importexport/csv/kexicsvimportdialog.cpp:303
+#: plugins/importexport/csv/kexicsvimportdialog.cpp:305
 #, fuzzy
 msgid "Open CSV Data File"
 msgstr "Agor Ffeil"
 
-#: plugins/importexport/csv/kexicsvimportdialog.cpp:352
+#: plugins/importexport/csv/kexicsvimportdialog.cpp:354
 msgid "Loading CSV Data"
 msgstr ""
 
-#: plugins/importexport/csv/kexicsvimportdialog.cpp:352
+#: plugins/importexport/csv/kexicsvimportdialog.cpp:354
 msgid "Loading CSV Data from \"%1\"..."
 msgstr ""
 
-#: plugins/importexport/csv/kexicsvimportdialog.cpp:440
+#: plugins/importexport/csv/kexicsvimportdialog.cpp:442
 msgid "Cannot open input file <nobr>\"%1\"</nobr>."
 msgstr ""
 
-#: plugins/importexport/csv/kexicsvimportdialog.cpp:531
+#: plugins/importexport/csv/kexicsvimportdialog.cpp:533
 #, fuzzy
 msgid "Start at line%1:"
 msgstr "Maes Cyrchfan"
 
-#: plugins/importexport/csv/kexicsvimportdialog.cpp:927
-#: plugins/importexport/csv/kexicsvimportdialog.cpp:938
+#: plugins/importexport/csv/kexicsvimportdialog.cpp:929
+#: plugins/importexport/csv/kexicsvimportdialog.cpp:940
 #, c-format
 msgid "Column %1"
 msgstr "Colofn %1"
 
-#: plugins/importexport/csv/kexicsvimportdialog.cpp:1189
+#: plugins/importexport/csv/kexicsvimportdialog.cpp:1165
+#: plugins/macros/kexiactions/navigateaction.cpp:73
+#: plugins/queries/kexiquerydesignerguieditor.cpp:209
+msgid "Column"
+msgstr "Colofn"
+
+#: plugins/importexport/csv/kexicsvimportdialog.cpp:1191
 #, fuzzy
 msgid "Column name"
 msgstr "Colofn"
 
-#: plugins/importexport/csv/kexicsvimportdialog.cpp:1323
+#: plugins/importexport/csv/kexicsvimportdialog.cpp:1325
 msgid "Data set contains no rows. Do you want to import empty table?"
 msgstr ""
 
-#: plugins/importexport/csv/kexicsvimportdialog.cpp:1329
+#: plugins/importexport/csv/kexicsvimportdialog.cpp:1331
 #, fuzzy
 msgid "No project available."
 msgstr "Methu gollwng y gronfa ddata - ni roddwyd enw."
 
-#: plugins/importexport/csv/kexicsvimportdialog.cpp:1334
+#: plugins/importexport/csv/kexicsvimportdialog.cpp:1336
 #, fuzzy
 msgid "No database connection available."
 msgstr "Gwall yng nghysylltiad y gronfa ddata"
 
-#: plugins/importexport/csv/kexicsvimportdialog.cpp:1395
+#: plugins/importexport/csv/kexicsvimportdialog.cpp:1397
 msgid ""
 "No Primary Key (autonumber) has been defined.\n"
 "Should it be automatically defined on import (recommended)?\n"
 "\n"
-"Note: An imported table without a Primary Key may not be editable (depending on "
-"database type)."
+"Note: An imported table without a Primary Key may not be editable (depending "
+"on database type)."
 msgstr ""
 
-#: plugins/importexport/csv/kexicsvimportdialog.cpp:1398
+#: plugins/importexport/csv/kexicsvimportdialog.cpp:1400
 msgid ""
 "_: Add Database Primary Key to a Table\n"
 "Add Primary Key"
 msgstr ""
 
-#: plugins/importexport/csv/kexicsvimportdialog.cpp:1399
+#: plugins/importexport/csv/kexicsvimportdialog.cpp:1401
 msgid ""
 "_: Do Not Add Database Primary Key to a Table\n"
 "Do Not Add"
 msgstr "Na Ychwaneger"
 
-#: plugins/importexport/csv/kexicsvimportdialog.cpp:1519
+#: plugins/importexport/csv/kexicsvimportdialog.cpp:1521
 #, fuzzy
 msgid "Importing CSV Data"
 msgstr "Dewis Cronfa Ddata"
 
-#: plugins/importexport/csv/kexicsvimportdialog.cpp:1522
+#: plugins/importexport/csv/kexicsvimportdialog.cpp:1524
 msgid "Importing CSV Data from <nobr>\"%1\"</nobr> into \"%2\" table..."
 msgstr ""
 
-#: plugins/importexport/csv/kexicsvimportdialog.cpp:1569
+#: plugins/importexport/csv/kexicsvimportdialog.cpp:1571
 msgid "Data has been successfully imported to table \"%1\"."
 msgstr ""
 
-#: plugins/importexport/csv/kexicsvimportdialog.cpp:1579
+#: plugins/importexport/csv/kexicsvimportdialog.cpp:1581
 msgid ""
 "_: Text type for column\n"
 "Text"
 msgstr "Testun"
 
-#: plugins/importexport/csv/kexicsvimportdialog.cpp:1581
+#: plugins/importexport/csv/kexicsvimportdialog.cpp:1583
 msgid ""
 "_: Numeric type for column\n"
 "Number"
 msgstr "Rhif"
 
-#: plugins/importexport/csv/kexicsvimportdialog.cpp:1583
+#: plugins/importexport/csv/kexicsvimportdialog.cpp:1585
 msgid ""
 "_: Currency type for column\n"
 "Currency"
 msgstr "Arian"
 
-#: plugins/importexport/csv/kexicsvimportdialog.cpp:1652
+#: plugins/importexport/csv/kexicsvimportdialog.cpp:1654
 msgid ""
 "_: row count\n"
 "(rows: %1)"
 msgstr ""
 
-#: plugins/importexport/csv/kexicsvimportdialog.cpp:1657
+#: plugins/importexport/csv/kexicsvimportdialog.cpp:1659
 msgid ""
 "_: row count\n"
 "(rows: more than %1)"
 msgstr ""
 
-#: plugins/importexport/csv/kexicsvimportdialog.cpp:1658
+#: plugins/importexport/csv/kexicsvimportdialog.cpp:1660
 msgid "Not all rows are visible on this preview"
 msgstr ""
 
@@ -5600,14 +4287,36 @@ msgstr ""
 msgid "Strip leading and trailing blanks off of text values"
 msgstr ""
 
-#: plugins/relations/kexirelationmaindlg.cpp:41
-msgid "Relationships"
-msgstr "Perthnasau"
+#: plugins/importexport/csv/kexicsvwidgets.cpp:51
+msgid "Comma \",\""
+msgstr ""
+
+#: plugins/importexport/csv/kexicsvwidgets.cpp:52
+msgid "Semicolon \";\""
+msgstr ""
+
+#: plugins/importexport/csv/kexicsvwidgets.cpp:53
+msgid "Tabulator"
+msgstr "Tablwr"
+
+#: plugins/importexport/csv/kexicsvwidgets.cpp:54
+#, fuzzy
+msgid "Space \" \""
+msgstr "Bylchydd"
 
 #: plugins/macros/kexiactions/datatableaction.cpp:45
 msgid "Method"
 msgstr ""
 
+#: main/startup/KexiConnSelectorBase.ui:44
+#: main/startup/KexiProjectSelectorBase.ui:75
+#: plugins/macros/kexiactions/datatableaction.cpp:60
+#: plugins/queries/kexiparameterlisteditor.ui:41
+#: plugins/tables/kexitabledesignerview.cpp:338
+#, no-c-format
+msgid "Type"
+msgstr "Math"
+
 #: plugins/macros/kexiactions/datatableaction.cpp:75
 #, fuzzy
 msgid "Item"
@@ -5628,12 +4337,28 @@ msgstr "Heb fodiwl rhannau ar gyfer teip MIME \"%1\""
 msgid "No such method \"%1\""
 msgstr "Heb fodiwl rhannau ar gyfer teip MIME \"%1\""
 
+#: plugins/macros/kexiactions/executeaction.cpp:85
+#, fuzzy
+msgid "No such mimetype \"%1\""
+msgstr "Heb fodiwl rhannau ar gyfer teip MIME \"%1\""
+
+#: plugins/macros/kexiactions/executeaction.cpp:90
+#, fuzzy
+msgid "Failed to open part \"%1\" for mimetype \"%2\""
+msgstr "Heb fodiwl rhannau ar gyfer teip MIME \"%1\""
+
 #: plugins/macros/kexiactions/messageaction.cpp:32
 #: plugins/macros/kexiactions/messageaction.cpp:35
 #, fuzzy
 msgid "Message"
 msgstr "Neges:"
 
+#: plugins/macros/kexiactions/messageaction.cpp:34
+#: plugins/queries/kexiquerydesignerguieditor.cpp:1717
+#: plugins/tables/kexitabledesignerview.cpp:371
+msgid "Caption"
+msgstr "Egluryn"
+
 #: plugins/macros/kexiactions/navigateaction.cpp:46
 #, fuzzy
 msgid "Record"
@@ -5666,15 +4391,24 @@ msgstr "Ni ellir darllen y ffeil \"%1\"."
 msgid "Unknown record \"%1\" in view for \"%2\"."
 msgstr "Colofn anhysbys '%1' yn nhabl '%2'"
 
-#: plugins/macros/kexiactions/executeaction.cpp:85
-#, fuzzy
-msgid "No such mimetype \"%1\""
-msgstr "Heb fodiwl rhannau ar gyfer teip MIME \"%1\""
+#: main/startup/KexiConnSelectorBase.ui:33
+#: plugins/macros/kexiactions/objectnamevariable.h:46
+#: plugins/macros/kexipart/keximacroerrorbase.ui:110
+#: plugins/queries/kexiparameterlisteditor.ui:30
+#: plugins/tables/kexitabledesignerview.cpp:333
+#, no-c-format
+msgid "Name"
+msgstr "Enw"
 
-#: plugins/macros/kexiactions/executeaction.cpp:90
+#: data/kexiui.rc:178 plugins/macros/kexiactions/openaction.cpp:53
+#, fuzzy, no-c-format
+msgid "View"
+msgstr "Golwg Data"
+
+#: plugins/macros/kexiactions/openaction.cpp:80
 #, fuzzy
-msgid "Failed to open part \"%1\" for mimetype \"%2\""
-msgstr "Heb fodiwl rhannau ar gyfer teip MIME \"%1\""
+msgid "Open"
+msgstr "&Agor"
 
 #: plugins/macros/kexiactions/openaction.cpp:122
 #, fuzzy
@@ -5695,10 +4429,6 @@ msgstr ""
 msgid "Failed to open object \"%1.%2\"."
 msgstr "Methwyd agor cywaith \"%1\"."
 
-#: plugins/macros/kexipart/keximacroerror.cpp:56
-msgid "<qt>Failed to execute the macro \"%1\".<br>%2</qt>"
-msgstr ""
-
 #: plugins/macros/kexipart/keximacrodesignview.cpp:127
 #: plugins/macros/kexipart/keximacroerror.cpp:64
 #, fuzzy
@@ -5710,6 +4440,10 @@ msgstr "Gweithredoedd"
 msgid "Comment"
 msgstr "Sylwadau"
 
+#: plugins/macros/kexipart/keximacroerror.cpp:56
+msgid "<qt>Failed to execute the macro \"%1\".<br>%2</qt>"
+msgstr ""
+
 #: plugins/macros/kexipart/keximacropart.cpp:71
 #, fuzzy
 msgid ""
@@ -5734,6 +4468,371 @@ msgstr "<p>Addasiwyd y gwrthrych: %1 \"%2\".</p><p>Ydych eisiau ei gadw?</p>"
 msgid "Macro \"%1\" already exists."
 msgstr "Mae cronfa ddata \"%1\" yn bodoli eisoes."
 
+#: plugins/queries/kexiaddparamdialog.cpp:30
+msgid "Add Parameter"
+msgstr "Ychwanegu Paramedr"
+
+#: plugins/queries/kexidynamicqueryparameterdialog.cpp:32
+msgid "Query Parameters"
+msgstr "Paramedrau'r Ymholiad"
+
+#: plugins/queries/kexiquerydesignerguieditor.cpp:158
+msgid "Query Columns"
+msgstr "Colofnau'r ymholiad"
+
+#: plugins/queries/kexiquerydesignerguieditor.cpp:210
+msgid "Describes field name or expression for the designed query."
+msgstr ""
+
+#: plugins/queries/kexiquerydesignerguieditor.cpp:217
+#: plugins/tables/kexitablepart.cpp:70
+#: widget/relations/kexirelationwidget.cpp:57
+#: widget/relations/kexirelationwidget.cpp:331
+msgid "Table"
+msgstr "Tabl"
+
+#: plugins/queries/kexiquerydesignerguieditor.cpp:218
+msgid "Describes table for a given field. Can be empty."
+msgstr ""
+
+#: plugins/queries/kexiquerydesignerguieditor.cpp:223
+msgid "Visible"
+msgstr "Gweladwy"
+
+#: plugins/queries/kexiquerydesignerguieditor.cpp:224
+msgid "Describes visibility for a given field or expression."
+msgstr ""
+
+#: plugins/queries/kexiquerydesignerguieditor.cpp:230
+msgid "Totals"
+msgstr "Cyfansymiau"
+
+#: plugins/queries/kexiquerydesignerguieditor.cpp:231
+msgid "Describes a way of computing totals for a given field or expression."
+msgstr ""
+
+#: plugins/queries/kexiquerydesignerguieditor.cpp:233
+msgid "Group by"
+msgstr "Casglu yn ôl"
+
+#: plugins/queries/kexiquerydesignerguieditor.cpp:234
+msgid "Sum"
+msgstr "Swm"
+
+#: plugins/queries/kexiquerydesignerguieditor.cpp:235
+msgid "Average"
+msgstr "Cyfartaledd"
+
+#: plugins/queries/kexiquerydesignerguieditor.cpp:236
+msgid "Min"
+msgstr "Isafswm"
+
+#: plugins/queries/kexiquerydesignerguieditor.cpp:237
+msgid "Max"
+msgstr "Uchafswm"
+
+#: plugins/queries/kexiquerydesignerguieditor.cpp:243
+#: plugins/queries/kexiquerydesignerguieditor.cpp:1736
+msgid "Sorting"
+msgstr "Didoli"
+
+#: plugins/queries/kexiquerydesignerguieditor.cpp:244
+#, fuzzy
+msgid "Describes a way of sorting for a given field."
+msgstr "Cadw newidiadau i'r gwrthrych o'r ffenestr a ddewisir ar hyn o bryd"
+
+#: plugins/queries/kexiquerydesignerguieditor.cpp:247
+#: plugins/queries/kexiquerydesignerguieditor.cpp:1734
+msgid "Ascending"
+msgstr "Esgynnol"
+
+#: plugins/queries/kexiquerydesignerguieditor.cpp:248
+#: plugins/queries/kexiquerydesignerguieditor.cpp:1734
+msgid "Descending"
+msgstr "Disgynnol"
+
+#: plugins/queries/kexiquerydesignerguieditor.cpp:252
+msgid "Criteria"
+msgstr "Meini prawf"
+
+#: plugins/queries/kexiquerydesignerguieditor.cpp:253
+msgid "Describes the criteria for a given field or expression."
+msgstr ""
+
+#: plugins/queries/kexiquerydesignerguieditor.cpp:356
+#, fuzzy
+msgid ""
+"Cannot switch to data view, because query design is empty.\n"
+"First, please create your design."
+msgstr ""
+"Methu newid i olygfa'r data, am fod cynllun yr ymholiad yn wag.\n"
+" Creuwch eich cynllun yn gyntaf.\n"
+
+#: plugins/queries/kexiquerydesignerguieditor.cpp:390
+msgid "Select column for table \"%1\""
+msgstr ""
+
+#: plugins/queries/kexiquerydesignerguieditor.cpp:413
+#: plugins/queries/kexiquerydesignerguieditor.cpp:1641
+#, fuzzy
+msgid "Invalid criteria \"%1\""
+msgstr "Enw gwrthrych annilys \"%1\""
+
+#: plugins/queries/kexiquerydesignerguieditor.cpp:434
+#: plugins/queries/kexiquerydesignerguieditor.cpp:1471
+#, fuzzy
+msgid "Invalid expression \"%1\""
+msgstr "Enw gwrthrych annilys \"%1\""
+
+#: plugins/queries/kexiquerydesignerguieditor.cpp:628
+#: plugins/queries/kexiquerydesignerguieditor.cpp:642
+#: plugins/queries/kexiquerydesignerguieditor.cpp:665
+#: plugins/queries/kexiquerydesignerguieditor.cpp:1086
+msgid "Query definition loading failed."
+msgstr ""
+
+#: plugins/queries/kexiquerydesignerguieditor.cpp:629
+msgid ""
+"Query design may be corrupted so it could not be opened even in text view.\n"
+"You can delete the query and create it again."
+msgstr ""
+
+#: plugins/queries/kexiquerydesignerguieditor.cpp:1451
+#, fuzzy
+msgid "Entered column alias \"%1\" is not a valid identifier."
+msgstr "Math annilys"
+
+#: plugins/queries/kexiquerydesignerguieditor.cpp:1592
+#, fuzzy
+msgid "Could not set sorting for multiple columns (%1)"
+msgstr "Methwyd creu cywaith \"%1\""
+
+#: plugins/queries/kexiquerydesignerguieditor.cpp:1614
+#, fuzzy
+msgid "Could not set criteria for \"%1\""
+msgstr "Methwyd creu cywaith \"%1\""
+
+#: plugins/queries/kexiquerydesignerguieditor.cpp:1617
+msgid "Could not set criteria for empty row"
+msgstr ""
+
+#: plugins/queries/kexiquerydesignerguieditor.cpp:1706
+#, fuzzy
+msgid "Query column"
+msgstr "Colofnau'r ymholiad"
+
+#: plugins/queries/kexiquerydesignerguieditor.cpp:1722
+msgid "Alias"
+msgstr "Ffugenw"
+
+#: plugins/queries/kexiquerydesignersql.cpp:108
+msgid "SQL Query Text"
+msgstr ""
+
+#: plugins/queries/kexiquerydesignersql.cpp:143
+msgid "SQL Query History"
+msgstr ""
+
+#: plugins/queries/kexiquerydesignersql.cpp:147
+#, fuzzy
+msgid "Back to Selected Query"
+msgstr "&Cuddio'r Tabl/Ymholiad Dewisiedig"
+
+#: plugins/queries/kexiquerydesignersql.cpp:148
+msgid "Clear History"
+msgstr "Gwaredu Hanes"
+
+#: plugins/queries/kexiquerydesignersql.cpp:175
+msgid "The query is correct"
+msgstr ""
+
+#: plugins/queries/kexiquerydesignersql.cpp:182
+msgid "The query is incorrect"
+msgstr ""
+
+#: plugins/queries/kexiquerydesignersql.cpp:189
+msgid ""
+"Please enter your query and execute \"Check query\" function to verify it."
+msgstr ""
+
+#: plugins/queries/kexiquerydesignersql.cpp:236
+msgid "The query you entered is incorrect."
+msgstr ""
+
+#: plugins/queries/kexiquerydesignersql.cpp:237
+msgid "Do you want to cancel any changes made to this SQL text?"
+msgstr ""
+
+#: plugins/queries/kexiquerydesignersql.cpp:238
+msgid "Answering \"No\" allows you to make corrections."
+msgstr ""
+
+#: plugins/queries/kexiquerydesignersql.cpp:480
+#, fuzzy
+msgid "Do you want to save invalid query?"
+msgstr "Ydych eisiau dileu ymholiad \"%1\"?"
+
+#: plugins/queries/kexiquerydesignersqlhistory.cpp:44
+msgid "Copy to Clipboard"
+msgstr "Copïo i'r Gludfwrdd"
+
+#: plugins/queries/kexiquerydesignersqlhistory.cpp:339
+#: widget/tableview/kexidataawareobjectiface.cpp:943
+#, c-format
+msgid "Error: %1"
+msgstr "Gwall: %1"
+
+#: plugins/queries/kexiquerypart.cpp:50
+msgid ""
+"_: Translate this word using only lowercase alphanumeric characters (a..z, "
+"0..9). Use '_' character instead of spaces. First character should be a..z "
+"character. If you cannot use latin characters in your language, use english "
+"word.\n"
+"query"
+msgstr "ymholiad"
+
+#: plugins/queries/kexiquerypart.cpp:51
+msgid "Query"
+msgstr "Ymholiad"
+
+#: plugins/queries/kexiquerypart.cpp:147 plugins/queries/kexiquerypart.cpp:149
+#, fuzzy
+msgid "Check Query"
+msgstr "Ail-ymholi"
+
+#: plugins/queries/kexiquerypart.cpp:150
+msgid "Checks query for validity."
+msgstr ""
+
+#: plugins/queries/kexiquerypart.cpp:153
+msgid "Show SQL History"
+msgstr ""
+
+#: plugins/queries/kexiquerypart.cpp:155
+msgid "Shows or hides SQL editor's history."
+msgstr ""
+
+#: plugins/queries/kexiquerypart.cpp:198
+#, fuzzy
+msgid "Design of query \"%1\" has been modified."
+msgstr "<p>Addasiwyd y gwrthrych: %1 \"%2\".</p><p>Ydych eisiau ei gadw?</p>"
+
+#: plugins/queries/kexiquerypart.cpp:200
+#, fuzzy
+msgid "Query \"%1\" already exists."
+msgstr "Mae cronfa ddata \"%1\" yn bodoli eisoes."
+
+#: plugins/queries/kexiqueryview.cpp:87
+#, fuzzy
+msgid "Query executing failed."
+msgstr "Methwyd dileu rhes."
+
+#: plugins/relations/kexirelationmaindlg.cpp:41
+msgid "Relationships"
+msgstr "Perthnasau"
+
+#: plugins/reports/kexireportfactory.cpp:42
+#: plugins/reports/kexireportpart.cpp:58
+msgid "Report"
+msgstr "Adroddiad"
+
+#: plugins/reports/kexireportfactory.cpp:44
+msgid ""
+"_: Widget name. This string will be used to name widgets of this class. It "
+"must _not_ contain white spaces and non latin1 characters.\n"
+"report"
+msgstr ""
+
+#: plugins/reports/kexireportfactory.cpp:45
+#, fuzzy
+msgid "A report"
+msgstr "Adroddiad"
+
+#: plugins/reports/kexireportfactory.cpp:51
+msgid "Label"
+msgstr "Label"
+
+#: plugins/reports/kexireportfactory.cpp:54
+#, fuzzy
+msgid "A label to display text"
+msgstr "Celfigyn i ddangos testun neu bics-fapiau"
+
+#: plugins/reports/kexireportfactory.cpp:60
+#, fuzzy
+msgid "Picture Label"
+msgstr "Label Testun"
+
+#: plugins/reports/kexireportfactory.cpp:62
+msgid ""
+"_: Widget name. This string will be used to name widgets of this class. It "
+"must _not_ contain white spaces and non latin1 characters.\n"
+"picture"
+msgstr ""
+
+#: plugins/reports/kexireportfactory.cpp:63
+#, fuzzy
+msgid "A label to display images or icons"
+msgstr "Celfigyn i ddangos testun neu bics-fapiau"
+
+#: plugins/reports/kexireportfactory.cpp:69
+msgid "Line"
+msgstr "Llinell"
+
+#: plugins/reports/kexireportfactory.cpp:71
+msgid ""
+"_: Widget name. This string will be used to name widgets of this class. It "
+"must _not_ contain white spaces and non latin1 characters.\n"
+"line"
+msgstr "llinell"
+
+#: plugins/reports/kexireportfactory.cpp:72
+#, fuzzy
+msgid "A simple line"
+msgstr "Blwch rhestr syml"
+
+#: plugins/reports/kexireportfactory.cpp:78
+#, fuzzy
+msgid "Sub Report"
+msgstr "Adroddiad"
+
+#: plugins/reports/kexireportfactory.cpp:80
+msgid ""
+"_: Widget name. This string will be used to name widgets of this class. It "
+"must _not_ contain white spaces and non latin1 characters.\n"
+"subReport"
+msgstr ""
+
+#: plugins/reports/kexireportfactory.cpp:81
+msgid "A report embedded in another report"
+msgstr ""
+
+#: plugins/reports/kexireportfactory.cpp:124
+msgid "Edit Rich Text"
+msgstr "Golygu Testun Cyfoethog"
+
+#: plugins/reports/kexireportpart.cpp:57
+msgid ""
+"_: Translate this word using only lowercase alphanumeric characters (a..z, "
+"0..9). Use '_' character instead of spaces. First character should be a..z "
+"character. If you cannot use latin characters in your language, use english "
+"word.\n"
+"report"
+msgstr ""
+
+#: plugins/reports/kexireportpart.cpp:123
+#, fuzzy
+msgid "Design of report \"%1\" has been modified."
+msgstr "<p>Addasiwyd y gwrthrych: %1 \"%2\".</p><p>Ydych eisiau ei gadw?</p>"
+
+#: plugins/reports/kexireportpart.cpp:125
+#, fuzzy
+msgid "Report \"%1\" already exists."
+msgstr "Mae cronfa ddata \"%1\" yn bodoli eisoes."
+
+#: plugins/reports/kexireportview.cpp:47
+msgid "Page:"
+msgstr "Tudalen :"
+
 #: plugins/tables/kexilookupcolumnpage.cpp:144
 #, fuzzy
 msgid "Row source:"
@@ -5773,11 +4872,6 @@ msgstr "Cynnwys annilys yn y gronfa ddata "
 msgid "No field selected"
 msgstr ""
 
-#: plugins/tables/kexitabledesignerview_p.cpp:277
-#, fuzzy
-msgid "Do you want to save the design now?"
-msgstr "Ydych eisiau dileu'r rhes dewisiedig?"
-
 #: plugins/tables/kexitabledesignercommands.cpp:74
 msgid "Change \"%1\" property for table field from \"%2\" to \"%3\""
 msgstr ""
@@ -5792,55 +4886,6 @@ msgstr "Enw gwrthrych annilys \"%1\""
 msgid "Insert table field \"%1\""
 msgstr "Enw gwrthrych annilys \"%1\""
 
-#: plugins/tables/kexitablepart.cpp:69
-msgid ""
-"_: Translate this word using only lowercase alphanumeric characters (a..z, "
-"0..9). Use '_' character instead of spaces. First character should be a..z "
-"character. If you cannot use latin characters in your language, use english "
-"word.\n"
-"table"
-msgstr "tabl"
-
-#: plugins/tables/kexitabledesignerview.cpp:410
-#: plugins/tables/kexitablepart.cpp:89
-msgid "Primary Key"
-msgstr "Prif Allwedd"
-
-#: plugins/tables/kexitablepart.cpp:91
-#, fuzzy
-msgid "Sets or removes primary key for currently selected field."
-msgstr "Cadw newidiadau i'r gwrthrych o'r ffenestr a ddewisir ar hyn o bryd"
-
-#: plugins/tables/kexitablepart.cpp:139
-msgid ""
-"You are about to remove table \"%1\" but following objects using this table are "
-"opened:"
-msgstr ""
-
-#: plugins/tables/kexitablepart.cpp:190
-#, fuzzy
-msgid "Do you want to close all windows for these objects?"
-msgstr "Ydych eisiau dileu ymholiad \"%1\"?"
-
-#: plugins/tables/kexitablepart.cpp:191
-#, fuzzy
-msgid "Close windows"
-msgstr "Rhes nesaf"
-
-#: plugins/tables/kexitablepart.cpp:209
-#, fuzzy
-msgid "Design of table \"%1\" has been modified."
-msgstr "<p>Addasiwyd y gwrthrych: %1 \"%2\".</p><p>Ydych eisiau ei gadw?</p>"
-
-#: plugins/tables/kexitablepart.cpp:216
-msgid "Warning! Any data in this table will be removed upon design's saving!"
-msgstr ""
-
-#: plugins/tables/kexitablepart.cpp:244
-#, fuzzy
-msgid "Lookup column"
-msgstr "Colofnau'r ymholiad"
-
 #: plugins/tables/kexitabledesignerview.cpp:124
 msgid "Additional information about the field"
 msgstr ""
@@ -5855,6 +4900,10 @@ msgstr "Mapiad Maes"
 msgid "Describes caption for the field"
 msgstr "Cadw newidiadau i'r gwrthrych o'r ffenestr a ddewisir ar hyn o bryd"
 
+#: plugins/tables/kexitabledesignerview.cpp:139 widget/kexifieldlistview.cpp:60
+msgid "Data Type"
+msgstr "Math data"
+
 #: plugins/tables/kexitabledesignerview.cpp:140
 #, fuzzy
 msgid "Describes data type for the field"
@@ -5915,6 +4964,11 @@ msgstr "Lled y golofn"
 msgid "Default Value"
 msgstr "Gwerth Rhagosodol"
 
+#: plugins/tables/kexitabledesignerview.cpp:410
+#: plugins/tables/kexitablepart.cpp:89
+msgid "Primary Key"
+msgstr "Prif Allwedd"
+
 #: plugins/tables/kexitabledesignerview.cpp:414
 msgid "Unique"
 msgstr "Unigryw"
@@ -5994,8 +5048,8 @@ msgstr ""
 
 #: plugins/tables/kexitabledesignerview.cpp:959
 msgid ""
-"Do you want to create primary key for current field? Click \"Cancel\" to cancel "
-"setting autonumber."
+"Do you want to create primary key for current field? Click \"Cancel\" to "
+"cancel setting autonumber."
 msgstr ""
 
 #: plugins/tables/kexitabledesignerview.cpp:963
@@ -6039,11 +5093,11 @@ msgstr "Cadw newidiadau i'r gwrthrych o'r ffenestr a ddewisir ar hyn o bryd"
 
 #: plugins/tables/kexitabledesignerview.cpp:1211
 msgid ""
-"<p>Table \"%1\" has no <b>primary key</b> defined.</p>"
-"<p>Although a primary key is not required, it is needed for creating relations "
-"between database tables. Do you want to add primary key automatically now?</p>"
-"<p>If you want to add a primary key by hand, press \"Cancel\" to cancel saving "
-"table design.</p>"
+"<p>Table \"%1\" has no <b>primary key</b> defined.</p><p>Although a primary "
+"key is not required, it is needed for creating relations between database "
+"tables. Do you want to add primary key automatically now?</p><p>If you want "
+"to add a primary key by hand, press \"Cancel\" to cancel saving table design."
+"</p>"
 msgstr ""
 
 #: plugins/tables/kexitabledesignerview.cpp:1217
@@ -6082,8 +5136,8 @@ msgstr ""
 
 #: plugins/tables/kexitabledesignerview.cpp:1458
 msgid ""
-"You are about to change the design of table \"%1\" but following objects using "
-"this table are opened:"
+"You are about to change the design of table \"%1\" but following objects "
+"using this table are opened:"
 msgstr ""
 
 #: plugins/tables/kexitabledesignerview.cpp:1662
@@ -6097,14 +5151,1097 @@ msgid ""
 "Empty Row"
 msgstr ""
 
+#: plugins/tables/kexitabledesignerview_p.cpp:277
+#, fuzzy
+msgid "Do you want to save the design now?"
+msgstr "Ydych eisiau dileu'r rhes dewisiedig?"
+
+#: plugins/tables/kexitablepart.cpp:69
+msgid ""
+"_: Translate this word using only lowercase alphanumeric characters (a..z, "
+"0..9). Use '_' character instead of spaces. First character should be a..z "
+"character. If you cannot use latin characters in your language, use english "
+"word.\n"
+"table"
+msgstr "tabl"
+
+#: plugins/tables/kexitablepart.cpp:91
+#, fuzzy
+msgid "Sets or removes primary key for currently selected field."
+msgstr "Cadw newidiadau i'r gwrthrych o'r ffenestr a ddewisir ar hyn o bryd"
+
+#: plugins/tables/kexitablepart.cpp:139
+msgid ""
+"You are about to remove table \"%1\" but following objects using this table "
+"are opened:"
+msgstr ""
+
+#: plugins/tables/kexitablepart.cpp:190
+#, fuzzy
+msgid "Do you want to close all windows for these objects?"
+msgstr "Ydych eisiau dileu ymholiad \"%1\"?"
+
+#: plugins/tables/kexitablepart.cpp:191
+#, fuzzy
+msgid "Close windows"
+msgstr "Rhes nesaf"
+
+#: plugins/tables/kexitablepart.cpp:209
+#, fuzzy
+msgid "Design of table \"%1\" has been modified."
+msgstr "<p>Addasiwyd y gwrthrych: %1 \"%2\".</p><p>Ydych eisiau ei gadw?</p>"
+
+#: plugins/tables/kexitablepart.cpp:216
+msgid "Warning! Any data in this table will be removed upon design's saving!"
+msgstr ""
+
+#: plugins/tables/kexitablepart.cpp:244
+#, fuzzy
+msgid "Lookup column"
+msgstr "Colofnau'r ymholiad"
+
+#: widget/kexibrowser.cpp:128
+#, fuzzy
+msgid "Open object"
+msgstr "Agor cywaith"
+
+#: widget/kexibrowser.cpp:129
+msgid "Opens object selected in the list"
+msgstr ""
+
+#: widget/kexibrowser.cpp:153
+msgid "&Rename"
+msgstr "&Ail-enwi"
+
+#: widget/kexibrowser.cpp:161
+msgid "&Design"
+msgstr "&Cynllun"
+
+#: widget/kexibrowser.cpp:163
+#, fuzzy
+msgid "Design object"
+msgstr "&Cynllunio Tabl"
+
+#: widget/kexibrowser.cpp:164
+msgid "Starts designing of the object selected in the list"
+msgstr ""
+
+#: widget/kexibrowser.cpp:170
+#, fuzzy
+msgid "Open in &Text View"
+msgstr "Golwg &Testun"
+
+#: widget/kexibrowser.cpp:172
+#, fuzzy
+msgid "Open object in text view"
+msgstr "Golwg &Testun"
+
+#: widget/kexibrowser.cpp:173
+#, fuzzy
+msgid "Opens selected object in the list in text view"
+msgstr "Golwg &Testun"
+
+#: widget/kexibrowser.cpp:197
+msgid ""
+"_: Export->To File as Data &Table... \n"
+"To &File as Data Table..."
+msgstr ""
+
+#: widget/kexibrowser.cpp:200
+#, fuzzy
+msgid "Exports data from the currently selected table or query data to a file."
+msgstr "Cadw data'r rhes a dewisir ar hyn o bryd"
+
+#: widget/kexibrowser.cpp:203
+#, fuzzy
+msgid "&Print..."
+msgstr "W&ynebfath..."
+
+#: widget/kexibrowser.cpp:206
+#, fuzzy
+msgid "Prints data from the currently selected table or query."
+msgstr "Mewnosod un rhes wag uwchben yr un wedi'i dewis ar hyn o bryd"
+
+#: widget/kexibrowser.cpp:207
+msgid "Page Setup..."
+msgstr "Gosodiad Tudalen ..."
+
+#: widget/kexibrowser.cpp:341
+#, fuzzy
+msgid "Errors encountered during loading plugins:"
+msgstr "Gwall tra'n llwytho'r modiwl rhan \"%1\""
+
+#: widget/kexibrowser.cpp:526
+msgid "&Create Object: %1..."
+msgstr "&Creu Gwrthrych: %1..."
+
+#: widget/kexibrowser.cpp:531
+#, fuzzy, c-format
+msgid "Create object: %1"
+msgstr "&Creu Gwrthrych: %1..."
+
+#: widget/kexibrowser.cpp:533
+#, fuzzy, c-format
+msgid "Creates a new object: %1"
+msgstr "Creu cywaith newydd"
+
+#: widget/kexibrowser.cpp:538
+msgid "&Create Object..."
+msgstr "&Creu Gwrthrych..."
+
+#: widget/kexibrowser.cpp:543
+#, fuzzy
+msgid "Create object"
+msgstr "Creu Cywaith"
+
+#: widget/kexibrowser.cpp:544
+#, fuzzy
+msgid "Creates a new object"
+msgstr "Creu cywaith newydd"
+
+#: widget/kexicharencodingcombobox.cpp:68
+#, c-format
+msgid ""
+"_: Text encoding: Default\n"
+"Default: %1"
+msgstr ""
+
+#: widget/kexidatasourcecombobox.cpp:128
+#, fuzzy
+msgid "Define Query..."
+msgstr "Dileu Ymholiad..."
+
+#: widget/kexidbconnectionwidget.cpp:85
+#, fuzzy
+msgid "Load database list from the server"
+msgstr "Disgwylwyd enw ffeil ar gyfer gyrrydd feil-seiliedig."
+
+#: widget/kexidbconnectionwidget.cpp:87
+msgid ""
+"Loads database list from the server, so you can select one using the \"Name"
+"\" combo box."
+msgstr ""
+
+#: widget/kexidbconnectionwidget.cpp:91
+msgid "Save Changes"
+msgstr "Cadw Newidiadau"
+
+#: widget/kexidbconnectionwidget.cpp:92
+msgid "Save all changes made to this connection information"
+msgstr ""
+
+#: widget/kexidbconnectionwidget.cpp:93
+msgid ""
+"Save all changes made to this connection information. You can later reuse "
+"this information."
+msgstr ""
+
+#: widget/kexidbconnectionwidget.cpp:100
+#, fuzzy
+msgid "&Test Connection"
+msgstr "Cysylltiad"
+
+#: widget/kexidbconnectionwidget.cpp:101
+#, fuzzy
+msgid "Test database connection"
+msgstr "Gwall yng nghysylltiad y gronfa ddata"
+
+#: widget/kexidbconnectionwidget.cpp:102
+msgid ""
+"Tests database connection. You can ensure that valid connection information "
+"is provided."
+msgstr ""
+
+#: widget/kexidbconnectionwidget.cpp:132
+msgid "Database Connection"
+msgstr "Cysylltiad Cronfa Ddata"
+
+#: main/startup/KexiProjectSelectorBase.ui:64
+#: widget/kexidbconnectionwidget.cpp:141
+#: widget/kexidbconnectionwidgetbase.ui:311
+#, no-c-format
+msgid "Database"
+msgstr "Cronfa ddata"
+
+#: widget/kexidbconnectionwidget.cpp:229
+msgid "Parameters"
+msgstr "Paramedrau"
+
+#: widget/kexidbconnectionwidget.cpp:238
+msgid "Details"
+msgstr "Manylion"
+
+#: widget/kexidbconnectionwidget.cpp:341
+#, fuzzy
+msgid "Open Database"
+msgstr "Cronfa ddata newydd"
+
+#: widget/kexidbconnectionwidget.cpp:356
+#, fuzzy
+msgid "Connect to a Database Server"
+msgstr "Cywaith newydd wedi'i storio ar weinydd cronfa ddata"
+
+#: widget/kexidswelcome.cpp:39
+#, fuzzy
+msgid ""
+"Kexi can help you with creation of %2 using data sources in almost no time "
+"with the \"%1 Wizard\""
+msgstr ""
+"Gall Kexi eich helpu efo creu %2 gan ddefnyddio tarddiadau data mewn dim o "
+"amser gyda'r \"Dewin %1\""
+
+#: widget/kexidswelcome.cpp:41
+msgid "Create %1 using the \"%1 Wizard\""
+msgstr "Creu %1 gan ddefnyddio'r \"Dewin %1\""
+
+#: widget/kexidswelcome.cpp:46
+#, fuzzy
+msgid "Do not show this wizard again"
+msgstr "Peidiwch â dangos y Dewin hwn eto"
+
+#: widget/kexidswelcome.cpp:72
+msgid "&Next"
+msgstr "&Nesaf"
+
+#: widget/kexidswelcome.cpp:79
+msgid "&Finish"
+msgstr "G&orffen"
+
+#: widget/kexifieldlistview.cpp:58
+msgid "Field Name"
+msgstr "Enw Maes"
+
+#: widget/kexifieldlistview.cpp:99
+msgid "* (All Columns)"
+msgstr ""
+
+#: widget/kexiqueryparameters.cpp:39
+msgid ""
+"_: Enter Query Parameter Value\n"
+"Enter Parameter Value"
+msgstr ""
+
+#: widget/kexiqueryparameters.cpp:59
+#, fuzzy
+msgid ""
+"_: Boolean True - Yes\n"
+"Yes"
+msgstr "Ie"
+
+#: widget/kexiqueryparameters.cpp:59
+#, fuzzy
+msgid ""
+"_: Boolean False - No\n"
+"No"
+msgstr "Nage"
+
+#: widget/kexiscrollview.cpp:357
+#, fuzzy
+msgid "Outer Area"
+msgstr "Ardal ddata:"
+
+#: widget/kexiscrollview.cpp:358
+#, fuzzy
+msgid ""
+"Outer\n"
+"Area"
+msgstr "Ardal ddata:"
+
+#: widget/pixmapcollection.cpp:154
+msgid "Load KDE Icon by Name"
+msgstr ""
+
+#: widget/kexidbconnectionwidgetbase.ui:322 widget/pixmapcollection.cpp:160
+#, no-c-format
+msgid "&Name:"
+msgstr "&Enw:"
+
+#: widget/pixmapcollection.cpp:168
+msgid "&Size:"
+msgstr "&Maint:"
+
+#: widget/pixmapcollection.cpp:176
+msgid "Small"
+msgstr "Bach"
+
+#: widget/pixmapcollection.cpp:176
+msgid "Medium"
+msgstr "Canolig"
+
+#: widget/pixmapcollection.cpp:176
+msgid "Large"
+msgstr "Mawr"
+
+#: widget/pixmapcollection.cpp:176
+msgid "Huge"
+msgstr "Anferth"
+
+#: widget/pixmapcollection.cpp:235
+#, c-format
+msgid "Edit Pixmap Collection: %1"
+msgstr "Golygu Casgliad Picsfap : %1"
+
+#: widget/pixmapcollection.cpp:246
+msgid "&Add File"
+msgstr "&Ychwanegu Ffeil"
+
+#: widget/pixmapcollection.cpp:253
+#, fuzzy
+msgid "&Add an Icon"
+msgstr "Cysylltiad"
+
+#: widget/pixmapcollection.cpp:260
+#, fuzzy
+msgid "&Remove Selected Item"
+msgstr "&Gwaredu'r Berthynas Ddewisiedig"
+
+#: widget/pixmapcollection.cpp:314
+#, fuzzy
+msgid "Do you want to remove item \"%1\" from collection \"%2\"?"
+msgstr "Ydych eisiau dileu ymholiad \"%1\"?"
+
+#: widget/pixmapcollection.cpp:369
+msgid "Rename Item"
+msgstr "Ailenwi Eitem"
+
+#: widget/pixmapcollection.cpp:370
+msgid "Remove Item"
+msgstr "Gwaredu Eitem"
+
+#: widget/pixmapcollection.cpp:376
+#, c-format
+msgid "Select Pixmap From %1"
+msgstr ""
+
+#: widget/pixmapcollection.cpp:377
+#, fuzzy
+msgid "Edit Collection..."
+msgstr "Diwedd detholiad"
+
+#: widget/relations/kexirelationview.cpp:76
+msgid "&Hide Selected Table/Query"
+msgstr "&Cuddio'r Tabl/Ymholiad Dewisiedig"
+
+#: widget/relations/kexirelationview.cpp:78
+msgid "&Remove Selected Relationship"
+msgstr "&Gwaredu'r Berthynas Ddewisiedig"
+
+#: widget/relations/kexirelationview.cpp:80
+msgid "&Open Selected Table/Query"
+msgstr "&Agor y Tabl/Ymholiad Dewisiedig"
+
+#: widget/relations/kexirelationwidget.cpp:86
+msgid "&Open Table"
+msgstr "&Agor Tabl"
+
+#: widget/relations/kexirelationwidget.cpp:89
+msgid "&Design Table"
+msgstr "&Cynllunio Tabl"
+
+#: widget/relations/kexirelationwidget.cpp:94
+msgid "&Hide Table"
+msgstr "&Cuddio Tabl"
+
+#: widget/relations/kexirelationwidget.cpp:335
+msgid "Relationship"
+msgstr "Perthynas"
+
+#: widget/tableview/kexiblobtableedit.cpp:93
+msgid "Click to show available actions for this cell"
+msgstr ""
+
+#: widget/tableview/kexidataawareobjectiface.cpp:960
+#: widget/tableview/kexitableviewdata.cpp:659
+msgid "The column's constraint is declared as NOT NULL."
+msgstr "Datganwyd cyfyngiad y golofn fel NOT NULL (dim nwl)."
+
+#: widget/tableview/kexidataawareobjectiface.cpp:982
+#: widget/tableview/kexitableviewdata.cpp:670
+msgid "The column's constraint is declared as NOT EMPTY."
+msgstr "Datganwyd cyfyngiad y golofn fel NOT EMPTY (dim yn wag)."
+
+#: widget/tableview/kexidataawareobjectiface.cpp:1000
+msgid "The column's constraint is declared as NOT EMPTY and NOT NULL."
+msgstr ""
+"Datganwyd cyfyngiad y golofn fel NOT EMPTY (dim yn wag) a NOT NULL (dim nwl)"
+
+#: widget/tableview/kexidataawareobjectiface.cpp:1212
+msgid "Do you want to delete selected row?"
+msgstr "Ydych eisiau dileu'r rhes dewisiedig?"
+
+#: widget/tableview/kexidataawareobjectiface.cpp:1213
+msgid "&Delete Row"
+msgstr "&Dileu Rhes"
+
+#: widget/tableview/kexidataawareobjectiface.cpp:1334
+#, fuzzy
+msgid "Do you want to clear the contents of table %1?"
+msgstr "Ydych eisiau dileu'r rhes dewisiedig?"
+
+#: widget/tableview/kexidataawareobjectiface.cpp:1335
+#, fuzzy
+msgid "&Clear Contents"
+msgstr "Cynnwys annilys yn y gronfa ddata "
+
+#: widget/tableview/kexidataawareobjectiface.cpp:1762
+msgid "Row: "
+msgstr "Rhes: "
+
+#: widget/tableview/kexidataawareobjectiface.cpp:1838
+msgid ""
+"_: Correct Changes\n"
+"Correct"
+msgstr ""
+
+#: widget/tableview/kexidataawareobjectiface.cpp:1838
+#, fuzzy
+msgid "Correct changes"
+msgstr "Cadw newidiadau i'r gwrthrych"
+
+#: widget/tableview/kexidataawareobjectiface.cpp:1839
+#, fuzzy
+msgid "Discard Changes"
+msgstr "Cadw Newidiadau"
+
+#: widget/tableview/kexitableview.cpp:106
+#, fuzzy
+msgid "Contains a pointer to the currently selected row"
+msgstr "Mewnosod un rhes wag uwchben yr un wedi'i dewis ar hyn o bryd"
+
+#: widget/tableview/kexitableview.cpp:109
+#, fuzzy
+msgid "Row navigator"
+msgstr "Mordwywr cywaith"
+
+#: widget/tableview/kexitableview.cpp:222
+msgid "Add Record"
+msgstr "Ychwanegu Cofnod"
+
+#: widget/tableview/kexitableview.cpp:225
+msgid "Remove Record"
+msgstr "Dileu Cofnod"
+
+#: widget/tableview/kexitableviewdata.cpp:657
+#: widget/tableview/kexitableviewdata.cpp:668
+msgid "\"%1\" column requires a value to be entered."
+msgstr "Rhaid mewnosod gwerth yng ngholofn \"%1\"."
+
+#: widget/tableview/kexitableviewdata.cpp:682
+msgid "Row inserting failed."
+msgstr "Methwyd mewnosod rhes."
+
+#: widget/tableview/kexitableviewdata.cpp:702
+msgid "Row changing failed."
+msgstr "Methwyd newid rhes."
+
+#: widget/tableview/kexitableviewdata.cpp:769
+msgid "Row deleting failed."
+msgstr "Methwyd dileu rhes."
+
+#: widget/utils/kexicontextmenuutils.cpp:65
+#, fuzzy
+msgid "Insert From &File..."
+msgstr "O Ffeil..."
+
+#: widget/utils/kexicontextmenuutils.cpp:78
+msgid "&Clear"
+msgstr "&Clirio"
+
+#: widget/utils/kexicontextmenuutils.cpp:105
+#: widget/utils/kexicontextmenuutils.cpp:111
+msgid "Insert Image From File"
+msgstr ""
+
+#: widget/utils/kexicontextmenuutils.cpp:165
+#: widget/utils/kexicontextmenuutils.cpp:169
+#, fuzzy
+msgid "Save Image to File"
+msgstr "Cadw i ffeil..."
+
+#: widget/utils/kexicontextmenuutils.cpp:188
+#, fuzzy
+msgid "File \"%1\" already exists.<p>Do you want to replace it with a new one?"
+msgstr ""
+"Mae'r ffeil \"%1\" eisoes mewn bod.\n"
+" Ydych eisiau ysgrifennu drosti?\n"
+
+#: widget/utils/kexicontextmenuutils.cpp:191
+#, fuzzy
+msgid "&Don't Replace"
+msgstr "A&mnewid"
+
+#: widget/utils/kexicontextmenuutils.cpp:270
+msgid ""
+"_: Object name : Object type\n"
+"%1 : %2"
+msgstr ""
+
+#: widget/utils/kexidisplayutils.cpp:109 widget/utils/kexidisplayutils.cpp:168
+#, fuzzy
+msgid "(autonumber)"
+msgstr "Rhif y canlyniad:"
+
+#: widget/utils/kexirecordnavigator.cpp:81
+msgid "Row:"
+msgstr "Rhes:"
+
+#: widget/utils/kexirecordnavigator.cpp:93
+#: widget/utils/kexirecordnavigator.cpp:471
+msgid "First row"
+msgstr "Rhes gyntaf"
+
+#: widget/utils/kexirecordnavigator.cpp:100
+#: widget/utils/kexirecordnavigator.cpp:472
+msgid "Previous row"
+msgstr "Rhes flaenorol"
+
+#: widget/utils/kexirecordnavigator.cpp:112
+msgid "Current row number"
+msgstr "Rhif y rhes gyfredol"
+
+#: widget/utils/kexirecordnavigator.cpp:114
+msgid "of"
+msgstr "o"
+
+#: widget/utils/kexirecordnavigator.cpp:129
+msgid "Number of rows"
+msgstr "Nifer rhesi"
+
+#: widget/utils/kexirecordnavigator.cpp:141
+#: widget/utils/kexirecordnavigator.cpp:473
+msgid "Next row"
+msgstr "Rhes nesaf"
+
+#: widget/utils/kexirecordnavigator.cpp:147
+#: widget/utils/kexirecordnavigator.cpp:474
+msgid "Last row"
+msgstr "Rhes olaf"
+
+#: widget/utils/kexirecordnavigator.cpp:154
+#: widget/utils/kexirecordnavigator.cpp:475
+msgid "New row"
+msgstr "Rhes newydd"
+
+#: widget/utils/kexirecordnavigator.cpp:457
+msgid "Editing indicator"
+msgstr ""
+
+#: widget/utils/kexirecordnavigator.cpp:471
+#, fuzzy
+msgid "Go to first row"
+msgstr "Rhes gyntaf"
+
+#: widget/utils/kexirecordnavigator.cpp:472
+#, fuzzy
+msgid "Go to previous row"
+msgstr "Rhes flaenorol"
+
+#: widget/utils/kexirecordnavigator.cpp:473
+#, fuzzy
+msgid "Go to next row"
+msgstr "Rhes nesaf"
+
+#: widget/utils/kexirecordnavigator.cpp:474
+#, fuzzy
+msgid "Go to last row"
+msgstr "Rhes olaf"
+
+#: widget/utils/kexirecordnavigator.cpp:475
+#, fuzzy
+msgid "Go to new row"
+msgstr "Rhes newydd"
+
+#: data/kexiui.rc:5 plugins/relations/kexirelationpartui.rc:5
+#, no-c-format
+msgid "&Project"
+msgstr "&Cywaith"
+
+#: data/kexiui.rc:26
+#, no-c-format
+msgid "&Export"
+msgstr "&Allforio"
+
+#: data/kexiui.rc:44 plugins/tables/kexitablepartinstui.rc:6
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "&Golygu..."
+
+#: data/kexiui.rc:53
+#, no-c-format
+msgid "Copy &Special"
+msgstr ""
+
+#: data/kexiui.rc:75 plugins/queries/kexiquerypartinstui.rc:6
+#, fuzzy, no-c-format
+msgid "&View"
+msgstr "Golwg &Data"
+
+#: data/kexiui.rc:92 plugins/forms/kexiformpartinstui.rc:15
+#: plugins/reports/kexireportpartinstui.rc:9
+#, no-c-format
+msgid "&Format"
+msgstr "&Fformat"
+
+#: data/kexiui.rc:99 plugins/queries/kexiquerypartinstui.rc:10
+#, no-c-format
+msgid "&Data"
+msgstr "&Data"
+
+#: data/kexiui.rc:104
+#, no-c-format
+msgid "Sort"
+msgstr "Trefnu"
+
+#: data/kexiui.rc:114
+#, fuzzy, no-c-format
+msgid "&Tools"
+msgstr "Barrau Offer:"
+
+#: data/kexiui.rc:116
+#, fuzzy, no-c-format
+msgid "&Migrate"
+msgstr "G&wybodaeth"
+
+#: data/kexiui.rc:130
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Gosodiadau Cywaith"
+
+#: data/kexiui.rc:140
+#, no-c-format
+msgid "&Other"
+msgstr "A&rall"
+
+#: data/kexiui.rc:152
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: data/kexiui.rc:156
+#, no-c-format
+msgid "Other &Licenses"
+msgstr "&Trwyddedau Eraill"
+
+#: data/kexiui.rc:163
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "Barrau Offer:"
+
+#: data/kexiui.rc:185
+#, no-c-format
+msgid "Data"
+msgstr "Data"
+
+#: data/kexiui.rc:197 plugins/forms/kexiformpartui.rc:5
+#: plugins/queries/kexiquerypartinstui.rc:18
+#: plugins/tables/kexitablepartinstui.rc:13
+#, no-c-format
+msgid "Design"
+msgstr "Cynllun"
+
+#: data/kexiui.rc:201 plugins/forms/kexiformpartinstui.rc:59
+#, no-c-format
+msgid "Format"
+msgstr "Fformat"
+
+#: main/kexifinddialogbase.ui:27
+#, no-c-format
+msgid "Fi&nd:"
+msgstr "Ca&nfod:"
+
+#: main/kexifinddialogbase.ui:38
+#, no-c-format
+msgid "Re&place with:"
+msgstr "Am&newid efo:"
+
+#: main/kexifinddialogbase.ui:60
+#, no-c-format
+msgid "&Look in:"
+msgstr ""
+
+#: main/kexifinddialogbase.ui:74
+#, no-c-format
+msgid "&Whole words only"
+msgstr "D&im ond geiriau cyfan"
+
+#: main/kexifinddialogbase.ui:85
+#, no-c-format
+msgid "Prompt on replace"
+msgstr "Cofweini wrth amnewid"
+
+#: main/kexifinddialogbase.ui:140
+#, fuzzy, no-c-format
+msgid "Replace All"
+msgstr "&Amnewid y Cwbl"
+
+#: main/kexifinddialogbase.ui:167
+#, no-c-format
+msgid "&Match:"
+msgstr "&Cydweddu :"
+
+#: main/kexifinddialogbase.ui:176
+#, fuzzy, no-c-format
+msgid "Any Part of Field"
+msgstr "Maes"
+
+#: main/kexifinddialogbase.ui:181
+#, fuzzy, no-c-format
+msgid "Whole Field"
+msgstr "Dileu Maes"
+
+#: main/kexifinddialogbase.ui:186
+#, fuzzy, no-c-format
+msgid "Start of Field"
+msgstr "Maes"
+
+#: main/kexifinddialogbase.ui:204
+#, no-c-format
+msgid "&Search:"
+msgstr "&Chwilio:"
+
+#: main/kexifinddialogbase.ui:213
+#, no-c-format
+msgid "Up"
+msgstr "I fyny"
+
+#: main/kexifinddialogbase.ui:218
+#, no-c-format
+msgid "Down"
+msgstr "I Lawr"
+
+#: main/kexifinddialogbase.ui:223
+#, fuzzy, no-c-format
+msgid "All Rows"
+msgstr "Saeth"
+
+#: main/kexifinddialogbase.ui:261
+#, no-c-format
+msgid "C&ase sensitive"
+msgstr "Mae llythrennau bach/mawr o &bwys"
+
+#: main/printing/kexisimpleprintingpagesetupbase.ui:16
+#, no-c-format
+msgid "."
+msgstr "."
+
+#: main/printing/kexisimpleprintingpagesetupbase.ui:57
+#, no-c-format
+msgid "<h2>Page Setup for Printing \"%1\" Table Data</h2>"
+msgstr ""
+
+#: main/printing/kexisimpleprintingpagesetupbase.ui:91
+#, fuzzy, no-c-format
+msgid "Set Font..."
+msgstr "Adroddiad"
+
+#: main/printing/kexisimpleprintingpagesetupbase.ui:107
+#, no-c-format
+msgid "Page title:"
+msgstr "Teitl y dudalen:"
+
+#: main/printing/kexisimpleprintingpagesetupbase.ui:183
+#, no-c-format
+msgid "Add page numbers"
+msgstr ""
+
+#: main/printing/kexisimpleprintingpagesetupbase.ui:191
+#, no-c-format
+msgid "Page Size && Margins"
+msgstr "Maint Tudalen && Ymylon"
+
+#: main/printing/kexisimpleprintingpagesetupbase.ui:220
+#, no-c-format
+msgid "Change..."
+msgstr "Newid..."
+
+#: main/printing/kexisimpleprintingpagesetupbase.ui:259
+#, no-c-format
+msgid "Save This Setup as Default"
+msgstr ""
+
+#: main/printing/kexisimpleprintingpagesetupbase.ui:282
+#, fuzzy, no-c-format
+msgid "Open This Table"
+msgstr "&Agor Tabl"
+
+#: main/printing/kexisimpleprintingpagesetupbase.ui:299
+#, fuzzy, no-c-format
+msgid "Related actions:"
+msgstr "Perthnasau"
+
+#: main/printing/kexisimpleprintingpagesetupbase.ui:317
+#, fuzzy, no-c-format
+msgid "Add date and time"
+msgstr "Dyddiad ac Amser"
+
+#: main/printing/kexisimpleprintingpagesetupbase.ui:333
+#, no-c-format
+msgid "Add table borders"
+msgstr ""
+
+#: main/startup/KexiConnSelectorBase.ui:55
+#, no-c-format
+msgid "Server Information"
+msgstr "Gwybodaeth am y Gweinydd"
+
+#: main/startup/KexiConnSelectorBase.ui:107
+#, no-c-format
+msgid "&Edit..."
+msgstr "&Golygu..."
+
+#: main/startup/KexiConnSelectorBase.ui:123
+#, no-c-format
+msgid "&Add..."
+msgstr "Ychw&anegu..."
+
+#: main/startup/KexiConnSelectorBase.ui:139
+#, fuzzy, no-c-format
+msgid "&Remove"
+msgstr "Pell"
+
+#: main/startup/KexiConnSelectorBase.ui:187
+#, no-c-format
+msgid "Description"
+msgstr "Disgrifiad"
+
+#: main/startup/KexiConnSelectorBase.ui:245
+#, fuzzy, no-c-format
+msgid ""
+"<b>Select Existing Database Server's Connection From the List Below</b>\n"
+"<p>You will see existing Kexi projects available for the selected "
+"connection. Here you may also add, edit or remove connections from the "
+"list.\n"
+msgstr ""
+"<b>Dewiswch gysylltiad cronfa ddata gyfredol o'r rhestr isod a chlicio \"Iawn"
+"\"</b>.\n"
+" <p>Mi welwch yr hen gyweithiau Kexi sydd ar gael ar gyfer y cysylltiad "
+"dewisiedig. Yma cewch hefyd ychwanegu, golygu neu ddisodli cysylltiadau o'r "
+"rhestr.\n"
+"\n"
+
+#: main/startup/KexiDBTitlePageBase.ui:27
+#: main/startup/KexiServerDBNamePage.ui:24
+#, fuzzy, no-c-format
+msgid "Project caption: "
+msgstr "Egluryn y cywaith:"
+
+#: main/startup/KexiNewPrjTypeSelector.ui:74
+#, fuzzy, no-c-format
+msgid ""
+"Kexi will create a new database project. Select a storage method which will "
+"be used to store the new project.\n"
+msgstr ""
+"Bydd Kexi'n creu cywaith cronfa ddata newydd. Dewiswch ddull storio i'w "
+"ddefnyddio i gadw'r cywaith newydd.\n"
+"\n"
+
+#: main/startup/KexiOpenExistingFile.ui:35
+#, fuzzy, no-c-format
+msgid "<b>Select existing Kexi project file to open:</b>\n"
+msgstr ""
+"<b>Dewiswch hen ffeil cywaith Kexi i'w agor:</b>\n"
+"\n"
+
+#: main/startup/KexiOpenExistingFile.ui:97
+#, no-c-format
+msgid "&Advanced "
+msgstr "&Uwch "
+
+#: main/startup/KexiOpenExistingFile.ui:113
+#, fuzzy, no-c-format
+msgid ""
+"Click \"Advanced\" button if you want to find an existing project on a "
+"server rather than a file."
+msgstr ""
+"Cliciwch y botwm \"Uwch\" os ydych eisiau cael hyd i hen gywaith ar weinydd "
+"yn hytrach na ffeil."
+
+#: main/startup/KexiProjectSelectorBase.ui:43
+#, fuzzy, no-c-format
+msgid ""
+"<b>There are Kexi projects you have recently opened.</b> Select one you wish "
+"to open:\n"
+msgstr ""
+"<b>Dyma'r cyweithiau Kexi wedi'u hagor gennych yn ddiweddar.</b> Dewiswch un "
+"yr hoffech ei agor:\n"
+"\n"
+
+#: main/startup/KexiProjectSelectorBase.ui:53
+#, no-c-format
+msgid "Project Name"
+msgstr "Enw'r Cywaith"
+
+#: main/startup/KexiProjectSelectorBase.ui:86
+#, no-c-format
+msgid "Connection"
+msgstr "Cysylltiad"
+
+#: main/startup/KexiServerDBNamePage.ui:32
+#, fuzzy, no-c-format
+msgid "Project's database name: "
+msgstr "Enw cronfa ddata'r cywaith:"
+
+#: plugins/macros/kexipart/keximacroerrorbase.ui:121
+#, no-c-format
+msgid "Value"
+msgstr "Gwerth"
+
+#: plugins/macros/kexipart/keximacroerrorbase.ui:168
+#, fuzzy, no-c-format
+msgid "Open in design view"
+msgstr "Golwg &Testun"
+
+#: plugins/macros/kexipart/keximacroerrorbase.ui:182
+#, no-c-format
+msgid "Continue"
+msgstr ""
+
+#: plugins/macros/kexipart/keximacroerrorbase.ui:190
+#, fuzzy, no-c-format
+msgid "Abort"
+msgstr "Trefnu"
+
+#: plugins/queries/kexiaddparamwidget.ui:16
+#, no-c-format
+msgid "Parameter"
+msgstr "Paramedr"
+
+#: plugins/queries/kexiaddparamwidget.ui:35
+#, no-c-format
+msgid "Name:"
+msgstr "Enw:"
+
+#: plugins/queries/kexiaddparamwidget.ui:51
+#, no-c-format
+msgid "kexi_"
+msgstr "kexi_"
+
+#: plugins/queries/kexiaddparamwidget.ui:96
+#, no-c-format
+msgid "Message:"
+msgstr "Neges:"
+
+#: plugins/queries/kexiaddparamwidget.ui:119
+#, no-c-format
+msgid "Type:"
+msgstr "Math:"
+
+#: plugins/queries/kexiparameterlisteditor.ui:24
+#, no-c-format
+msgid "Parameters:"
+msgstr "Paramedrau:"
+
+#: plugins/queries/kexiparameterlisteditor.ui:67
+#, fuzzy, no-c-format
+msgid "Add"
+msgstr "&Ychwanegu"
+
+#: plugins/queries/kexiquerypartui.rc:6
+#, no-c-format
+msgid "&Create"
+msgstr "&Creu"
+
+#: plugins/relations/kexirelationpartui.rc:11
+#, no-c-format
+msgid "Project"
+msgstr "Cywaith"
+
+#: plugins/reports/kexireportpartinstui.rc:31
+#, fuzzy, no-c-format
+msgid "Format Toolbar"
+msgstr "Bar Offer:"
+
+#: widget/kexidbconnectionwidgetbase.ui:98
+#, no-c-format
+msgid "Database Server"
+msgstr "Gweinydd Cronfa Ddata"
+
+#: widget/kexidbconnectionwidgetbase.ui:134
+#, no-c-format
+msgid "Port:"
+msgstr "Porth:"
+
+#: widget/kexidbconnectionwidgetbase.ui:147
+#, fuzzy, no-c-format
+msgid "Local server"
+msgstr "Disgwylwyd enw ffeil ar gyfer gyrrydd feil-seiliedig."
+
+#: widget/kexidbconnectionwidgetbase.ui:178
+#, no-c-format
+msgid "&Hostname:"
+msgstr "&Enw Gwesteiwr:"
+
+#: widget/kexidbconnectionwidgetbase.ui:189
+#: widget/kexidbconnectionwidgetdetailsbase.ui:85
+#, fuzzy, no-c-format
+msgid "Default"
+msgstr "Rhagosodion"
+
+#: widget/kexidbconnectionwidgetbase.ui:201
+#, fuzzy, no-c-format
+msgid "Remote server"
+msgstr "Gwesteiwr pell"
+
+#: widget/kexidbconnectionwidgetbase.ui:215
+#, no-c-format
+msgid "&Engine:"
+msgstr "&Peiriant :"
+
+#: widget/kexidbconnectionwidgetbase.ui:247
+#, no-c-format
+msgid "Authentication"
+msgstr "Dilysiant"
+
+#: widget/kexidbconnectionwidgetbase.ui:258
+#, no-c-format
+msgid "&Username:"
+msgstr "&Enw Defnyddiwr:"
+
+#: widget/kexidbconnectionwidgetbase.ui:274
+#, no-c-format
+msgid "&Password:"
+msgstr "&Cyfrinair:"
+
+#: widget/kexidbconnectionwidgetbase.ui:293
+#, fuzzy, no-c-format
+msgid "Save password in the shortcut file"
+msgstr "Cadw'r cyfrinair yn ffeil y cywaith"
+
+#: widget/kexidbconnectionwidgetbase.ui:338
+#, no-c-format
+msgid "&Title (optional):"
+msgstr ""
+
+#: widget/kexidbconnectionwidgetdetailsbase.ui:38
+#, no-c-format
+msgid "Use socket &file instead of TCP/IP port:"
+msgstr ""
+
+#: widget/kexidbconnectionwidgetdetailsbase.ui:150
+#, no-c-format
+msgid "&Description:"
+msgstr "&Disgrifiad:"
+
+#: widget/kexiprjtypeselectorbase.ui:53
+#, fuzzy, no-c-format
+msgid "Projects stored on a database server"
+msgstr "Cywaith newydd wedi'i storio ar weinydd cronfa ddata"
+
+#: widget/kexiprjtypeselectorbase.ui:64
+#, fuzzy, no-c-format
+msgid "Projects stored in a file"
+msgstr "Cywaith newydd wedi'i storio mewn ffeil"
+
 #~ msgid "We are sorry, templates are not yet available."
 #~ msgstr "Mae'n ddrwg gennym, nid oes patrymluniau ar gael eto."
 
 #~ msgid "CD Catalog"
 #~ msgstr "Catalog CD"
 
-#~ msgid "Easy-to-use database for storing information about your CD collection."
-#~ msgstr "Cronfa ddata hawdd ei defnyddio i gadw gwybodaeth am eich casgliad CDau"
+#~ msgid ""
+#~ "Easy-to-use database for storing information about your CD collection."
+#~ msgstr ""
+#~ "Cronfa ddata hawdd ei defnyddio i gadw gwybodaeth am eich casgliad CDau"
 
 #~ msgid "Expenses"
 #~ msgstr "Treuliau"
@@ -6331,7 +6468,8 @@ msgstr ""
 #~ msgstr "Peidiwch â dangos y cwestiwn hwn imi eto."
 
 #~ msgid "Always &use database server for creating new projects."
-#~ msgstr "&Defnyddiwch weinydd cronfeydd data bob tro i greu cyweithiau newydd"
+#~ msgstr ""
+#~ "&Defnyddiwch weinydd cronfeydd data bob tro i greu cyweithiau newydd"
 
 #, fuzzy
 #~ msgid "&More Projects..."
@@ -6353,22 +6491,12 @@ msgstr ""
 #~ msgid "\"%1\" database property not found"
 #~ msgstr "Ni chafwyd priodwedd cronfa ddata \"%1\""
 
-#, fuzzy
-#~ msgid "Tools Toolbar"
-#~ msgstr "Bar Offer:"
-
-#~ msgid "&Create"
-#~ msgstr "&Creu"
-
 #~ msgid "&Query"
 #~ msgstr "&Ymholi"
 
 #~ msgid "State"
 #~ msgstr "Cyflwr"
 
-#~ msgid "Project"
-#~ msgstr "Cywaith"
-
 #, fuzzy
 #~ msgid "Always &use files for creating new projects"
 #~ msgstr "Defnyddio &ffeiliau bob tro i greu cyweithiau newydd."
@@ -6376,22 +6504,30 @@ msgstr ""
 #~ msgid "Engine"
 #~ msgstr "Peiriant"
 
-#~ msgid "Click \"Back\" button if you want to open existing Kexi project file."
-#~ msgstr "Cliciwch y botwm \"Yn Ôl\" os ydych eisiau agor hen ffeil cywaith Kexi."
+#~ msgid ""
+#~ "Click \"Back\" button if you want to open existing Kexi project file."
+#~ msgstr ""
+#~ "Cliciwch y botwm \"Yn Ôl\" os ydych eisiau agor hen ffeil cywaith Kexi."
 
 #~ msgid "&Back"
 #~ msgstr "&Yn Ôl"
 
 #, fuzzy
-#~ msgid "Click \"Advanced\" button if you want to create a new database on a server instead of a file."
-#~ msgstr "Cliciwch y botwm \"Uwch\" os ydydch eisiau creu cronfa ddata newydd ar weinydd yn hytrach na ffeil."
+#~ msgid ""
+#~ "Click \"Advanced\" button if you want to create a new database on a "
+#~ "server instead of a file."
+#~ msgstr ""
+#~ "Cliciwch y botwm \"Uwch\" os ydydch eisiau creu cronfa ddata newydd ar "
+#~ "weinydd yn hytrach na ffeil."
 
 #, fuzzy
 #~ msgid ""
-#~ "<P><b>Kexi will create a new database, which will be stored in a file on this computer.</b>\n"
+#~ "<P><b>Kexi will create a new database, which will be stored in a file on "
+#~ "this computer.</b>\n"
 #~ "<P>&nbsp;"
 #~ msgstr ""
-#~ "<p><b>Bydd Kexi yn creu cronfa ddata newydd, a chedwir mewn ffeil ar y cyfrifiadur hwn.</b>\n"
+#~ "<p><b>Bydd Kexi yn creu cronfa ddata newydd, a chedwir mewn ffeil ar y "
+#~ "cyfrifiadur hwn.</b>\n"
 #~ "<p>&nbsp; \n"
 
 #, fuzzy
@@ -6411,18 +6547,12 @@ msgstr ""
 #~ msgid "Local"
 #~ msgstr "Lleol"
 
-#~ msgid "Remote"
-#~ msgstr "Pell"
-
 #~ msgid "Fields"
 #~ msgstr "Meysydd"
 
 #~ msgid "&Information"
 #~ msgstr "G&wybodaeth"
 
-#~ msgid "Property"
-#~ msgstr "Priodwedd"
-
 #, fuzzy
 #~ msgid " ... "
 #~ msgstr "..."
@@ -6463,11 +6593,22 @@ msgstr ""
 #~ msgstr "Croeso"
 
 #, fuzzy
-#~ msgid "The <B>KEXI team</B> wishes you a lot of productive work, with this product. <BR><HR><BR>If you have found a <B>bug</B> or have a <B>feature</B> request, please don't hesitate to report it at our <A href=\"http://www.kexi-project.org/cgi-bin/bug.pl\"> issue tracking system </A>.<BR><HR><BR>If you would like to <B>join</B> our effort, the <B>development</B> documentation at <A href=\"http://www.kexi-project.org\">www.kexi-project.org</A> is a good starting point."
-#~ msgstr "Dymuna'r <B>tîm KEXI</B> lawer o waith gynhyrchiol i chi efo'r cynnyrch yma. <HR>Os ydych wedi canfod <B>nam</B> neu os oes gennych cais <B>nodwedd</B>, brysiwch i'w adrodd ar ein <A href=\"http://www.kexi-project. org/cgi-bin/bug.pl\">cyfundrefn dilyn materion</A>. <HR>Os hoffech <B>ymuno</B> â'n hymdrech, mae'r ddogfennaeth <B>ddatblygiad</B> ar <A href=\"http://www.kexi-project.org\">www.kexi-project.org</A> yn fan gychwyn dda."
-
-#~ msgid "Project Settings"
-#~ msgstr "Gosodiadau Cywaith"
+#~ msgid ""
+#~ "The <B>KEXI team</B> wishes you a lot of productive work, with this "
+#~ "product. <BR><HR><BR>If you have found a <B>bug</B> or have a <B>feature</"
+#~ "B> request, please don't hesitate to report it at our <A href=\"http://"
+#~ "www.kexi-project.org/cgi-bin/bug.pl\"> issue tracking system </A>."
+#~ "<BR><HR><BR>If you would like to <B>join</B> our effort, the "
+#~ "<B>development</B> documentation at <A href=\"http://www.kexi-project.org"
+#~ "\">www.kexi-project.org</A> is a good starting point."
+#~ msgstr ""
+#~ "Dymuna'r <B>tîm KEXI</B> lawer o waith gynhyrchiol i chi efo'r cynnyrch "
+#~ "yma. <HR>Os ydych wedi canfod <B>nam</B> neu os oes gennych cais "
+#~ "<B>nodwedd</B>, brysiwch i'w adrodd ar ein <A href=\"http://www.kexi-"
+#~ "project. org/cgi-bin/bug.pl\">cyfundrefn dilyn materion</A>. <HR>Os "
+#~ "hoffech <B>ymuno</B> â'n hymdrech, mae'r ddogfennaeth <B>ddatblygiad</B> "
+#~ "ar <A href=\"http://www.kexi-project.org\">www.kexi-project.org</A> yn "
+#~ "fan gychwyn dda."
 
 #, fuzzy
 #~ msgid "Project Data"
@@ -6504,9 +6645,6 @@ msgstr ""
 #~ msgid "&Delete Action"
 #~ msgstr "&Dileu Gweithred"
 
-#~ msgid "Toolbars"
-#~ msgstr "Barrau Offer:"
-
 #, fuzzy
 #~ msgid "MDI mode:"
 #~ msgstr "Modd MDI :"
@@ -6528,25 +6666,14 @@ msgstr ""
 #~ msgstr "Dangos Dewislen"
 
 #, fuzzy
-#~ msgid "To create a relationship simply drag the source field onto the target field. An arrowhead is used to show which table is the parent (master) and which table is the child (slave) in the relationship."
-#~ msgstr "I greu perthynas, llusgwch y maes tarddiad ar ben ymaes cyrchfan. Defnyddir saeth i ddangos pa dabl ydi'r rhiant (meistr) a pha dabl ydi'r plentyn (gwas) yn y berthynas."
-
-#, fuzzy
-#~ msgid "Kexi can help you with creation of %2 using data sources in almost no time with the \"%1 Wizard\""
-#~ msgstr "Gall Kexi eich helpu efo creu %2 gan ddefnyddio tarddiadau data mewn dim o amser gyda'r \"Dewin %1\""
-
-#~ msgid "Create %1 using the \"%1 Wizard\""
-#~ msgstr "Creu %1 gan ddefnyddio'r \"Dewin %1\""
-
-#, fuzzy
-#~ msgid "Do not show this wizard again"
-#~ msgstr "Peidiwch â dangos y Dewin hwn eto"
-
-#~ msgid "&Next"
-#~ msgstr "&Nesaf"
-
-#~ msgid "&Finish"
-#~ msgstr "G&orffen"
+#~ msgid ""
+#~ "To create a relationship simply drag the source field onto the target "
+#~ "field. An arrowhead is used to show which table is the parent (master) "
+#~ "and which table is the child (slave) in the relationship."
+#~ msgstr ""
+#~ "I greu perthynas, llusgwch y maes tarddiad ar ben ymaes cyrchfan. "
+#~ "Defnyddir saeth i ddangos pa dabl ydi'r rhiant (meistr) a pha dabl ydi'r "
+#~ "plentyn (gwas) yn y berthynas."
 
 #, fuzzy
 #~ msgid ""
@@ -6593,8 +6720,14 @@ msgstr ""
 #~ msgstr "Nid yw'r gyrrydd hwn ar gael efo fersiwn cyfredol %1."
 
 #, fuzzy
-#~ msgid "<p>ODBC is an open specification for accessing data sources more easily; data sources include both SQL databases available with Kexi drivers and others, like Microsoft SQL Server and Microsoft Access."
-#~ msgstr "<p>Penodiad agored yw ODBC at gyrchu ffynonellau data'n haws; mae ffynonellau data yn cynnwys cronfeydd data SQL ar gael efo gyryddion Kexi,  ac eraill fel SQL Server Microsoft ac Access Microsoft."
+#~ msgid ""
+#~ "<p>ODBC is an open specification for accessing data sources more easily; "
+#~ "data sources include both SQL databases available with Kexi drivers and "
+#~ "others, like Microsoft SQL Server and Microsoft Access."
+#~ msgstr ""
+#~ "<p>Penodiad agored yw ODBC at gyrchu ffynonellau data'n haws; mae "
+#~ "ffynonellau data yn cynnwys cronfeydd data SQL ar gael efo gyryddion "
+#~ "Kexi,  ac eraill fel SQL Server Microsoft ac Access Microsoft."
 
 #~ msgid "Internal error while retrieving information. (No driver installed ?)"
 #~ msgstr "Gwall mewnol tra'n nôl gwybodaeth. (Gyrrydd heb ei arsefydlu?)"
@@ -6665,8 +6798,12 @@ msgstr ""
 #~ msgstr "Llwytho Ategyn Mewnforio"
 
 #, fuzzy
-#~ msgid "Please be patient for a few seconds, while the appropriate plugin for your request is being loaded."
-#~ msgstr "Byddwch yn amyneddgar am ychydig o eiliadau, tra bod yr ategyn priodol ar gyfer eich ymholiad yn cael ei lwytho."
+#~ msgid ""
+#~ "Please be patient for a few seconds, while the appropriate plugin for "
+#~ "your request is being loaded."
+#~ msgstr ""
+#~ "Byddwch yn amyneddgar am ychydig o eiliadau, tra bod yr ategyn priodol ar "
+#~ "gyfer eich ymholiad yn cael ei lwytho."
 
 #~ msgid "dummySourcePage"
 #~ msgstr "dummySourcePage"
@@ -6688,8 +6825,12 @@ msgstr ""
 #~ msgstr "Mapio rhwng y meysydd tarddiad a'r meysydd cyrchfan"
 
 #, fuzzy
-#~ msgid "Please choose into which fields of the selected destination table the imported data fields should be inserted"
-#~ msgstr "Dewiswch pa feysydd o'r tabl cyrchfan y dylid rhoi'r meysydd data sy wedi'u mewnforio."
+#~ msgid ""
+#~ "Please choose into which fields of the selected destination table the "
+#~ "imported data fields should be inserted"
+#~ msgstr ""
+#~ "Dewiswch pa feysydd o'r tabl cyrchfan y dylid rhoi'r meysydd data sy "
+#~ "wedi'u mewnforio."
 
 #~ msgid "Destination Field"
 #~ msgstr "Maes Cyrchfan"
@@ -6728,8 +6869,16 @@ msgstr ""
 #~ msgstr "Yn Gorffen"
 
 #, fuzzy
-#~ msgid "You have now provided all information needed for importing. Just click the <b>Finish</b> button to eventually start the import process. If you have changed your mind and don't want to import anything, click the <b>Cancel</b> button."
-#~ msgstr "Rydych wedi rhoi'r wybodaeth angenrheidiol i gyd ar gyfer mewnforio. Cliciwch y botwm <b>Gorffen</b> i gychwyn y proses mewnforio. Os ydych wedi newid eich meddwl ac nad ydych eisiau mewnforio dim, cliciwch y botwm <b>Diddymu</b>"
+#~ msgid ""
+#~ "You have now provided all information needed for importing. Just click "
+#~ "the <b>Finish</b> button to eventually start the import process. If you "
+#~ "have changed your mind and don't want to import anything, click the "
+#~ "<b>Cancel</b> button."
+#~ msgstr ""
+#~ "Rydych wedi rhoi'r wybodaeth angenrheidiol i gyd ar gyfer mewnforio. "
+#~ "Cliciwch y botwm <b>Gorffen</b> i gychwyn y proses mewnforio. Os ydych "
+#~ "wedi newid eich meddwl ac nad ydych eisiau mewnforio dim, cliciwch y "
+#~ "botwm <b>Diddymu</b>"
 
 #, fuzzy
 #~ msgid "Exception"
@@ -6844,7 +6993,8 @@ msgstr ""
 #~ msgstr "Rhaid i dabl fod â phrif allwedd"
 
 #, fuzzy
-#~ msgid "An unknown error has been encountered while creating the destination table"
+#~ msgid ""
+#~ "An unknown error has been encountered while creating the destination table"
 #~ msgstr "Cafwyd gwall anhysbys tra'n creu'r tabl cyrchfan"
 
 #, fuzzy
@@ -6968,11 +7118,20 @@ msgstr ""
 #~ msgid "csv file"
 #~ msgstr "ffeil csv"
 
-#~ msgid " You have not specified a valid cell range. This must contain the data you would like to import"
-#~ msgstr "Nid ydych wedi penodi amrediad celloedd dilys. Rhaid bod hyn yn cynnwys data hoffech eu mewnforio."
+#~ msgid ""
+#~ " You have not specified a valid cell range. This must contain the data "
+#~ "you would like to import"
+#~ msgstr ""
+#~ "Nid ydych wedi penodi amrediad celloedd dilys. Rhaid bod hyn yn cynnwys "
+#~ "data hoffech eu mewnforio."
 
-#~ msgid " You have chosen that a separate header range should be used. The specified range is invalid though. You have to fix that problem before you can proceed"
-#~ msgstr "Rydych wedi dewis defnyddio amrediad ar wahan i'r pennawd. Ond mae'r amrediad penodol yn annilys. Rhaid datrys y broblem honno cyn mynd ymlaen."
+#~ msgid ""
+#~ " You have chosen that a separate header range should be used. The "
+#~ "specified range is invalid though. You have to fix that problem before "
+#~ "you can proceed"
+#~ msgstr ""
+#~ "Rydych wedi dewis defnyddio amrediad ar wahan i'r pennawd. Ond mae'r "
+#~ "amrediad penodol yn annilys. Rhaid datrys y broblem honno cyn mynd ymlaen."
 
 #~ msgid "kspread file"
 #~ msgstr "ffeil kspread"
@@ -6998,9 +7157,6 @@ msgstr ""
 #~ msgid "Change layout of %1"
 #~ msgstr "Newid haenlun %1"
 
-#~ msgid "Insert %1"
-#~ msgstr "Mewnosod %1"
-
 #~ msgid "A spacer widget to fill in blanks"
 #~ msgstr "Celfigyn bylchu i lenwi'r gwagleodd"
 
@@ -7049,8 +7205,12 @@ msgstr ""
 #~ msgid "*.ui|Qt Designer UI files"
 #~ msgstr "*.ui|Ffeiliau UI Qt Designer"
 
-#~ msgid " A widget with this name already exists. Please choose another name or rename this widget before."
-#~ msgstr "Mae celfigyn efo'r enw hwn yn bodoli eisoes. Dewiswch enw arall neu ail-enwi'r celfigyn blaenorol."
+#~ msgid ""
+#~ " A widget with this name already exists. Please choose another name or "
+#~ "rename this widget before."
+#~ msgstr ""
+#~ "Mae celfigyn efo'r enw hwn yn bodoli eisoes. Dewiswch enw arall neu ail-"
+#~ "enwi'r celfigyn blaenorol."
 
 #~ msgid "Background Pixmap"
 #~ msgstr "Pics-fap y Cefndir"
@@ -7140,20 +7300,38 @@ msgstr ""
 #~ msgstr "Hysbysiad Trwydded Pwysig"
 
 #~ msgid ""
-#~ " The \"Kugar Report Generator\" is not part of Kexi, although reports are displayed within Kexi main window. It is loaded as as a plugin, but is a stand alone product licensed as GPL. There are no invocations of Kugar's internal methods.\n"
-#~ " Kexi only generates data files, which are not covered by the GPL license (FAQ at: http://www.fsf.org/copyleft/gpl.html)  and only the LGPL tdeparts interface is used for telling Kugar which datafile to use and to display the navigation actions. This has been approved by all (including the original) copyright holders.\n"
+#~ " The \"Kugar Report Generator\" is not part of Kexi, although reports are "
+#~ "displayed within Kexi main window. It is loaded as as a plugin, but is a "
+#~ "stand alone product licensed as GPL. There are no invocations of Kugar's "
+#~ "internal methods.\n"
+#~ " Kexi only generates data files, which are not covered by the GPL license "
+#~ "(FAQ at: http://www.fsf.org/copyleft/gpl.html)  and only the LGPL "
+#~ "tdeparts interface is used for telling Kugar which datafile to use and to "
+#~ "display the navigation actions. This has been approved by all (including "
+#~ "the original) copyright holders.\n"
 #~ " \n"
-#~ " The GPL application Kugar is part of the KOffice package (www.koffice.org). The copyright/left holders known at  the time this notice is written are:\n"
+#~ " The GPL application Kugar is part of the KOffice package (www.koffice."
+#~ "org). The copyright/left holders known at  the time this notice is "
+#~ "written are:\n"
 #~ " Mutiny Bay Software (info@mutinybaysoftware.com)  (Metaphrast)\n"
 #~ " Phil Thompson (phil@river-bank.demon.co.uk) (Kugar)\n"
 #~ " Alexander Dymo (cloudtemple@mksat.net) (Kugar)\n"
 #~ " Joseph Wenninger (jowenn@kde.org) (Kugar)\n"
 #~ "\n"
 #~ msgstr ""
-#~ "Nid rhan o Kexi ydi'r \"Creuydd Adroddiadau Kugar (Kugar Report Generator)\", er dangosir adroddiadau tu mewn i brif ffenestr Kexi.  Fe'i llwythir fel ategyn, ond cynnyrch annibynnol ydy o, wedi'i drwyddedu o dan y TGG (GPL).  Nid oes unrhyw alwadau ar ddulliau mewnol Kugar.\n"
-#~ " Dim ond cynhyrchu ffeiliau data wna Kexi, sy heb eu cynnwys o dan drwydded y GPL (Ceir FAQ yn: http://www.fsf.org/copyleft/gpl.html) a defnyddir dim ond y rhyngwyneb LGPL tdeparts i ddweud wrth Kugar pa ffeil ddata i'w defnyddio ac i ddangos y gweithredoedd mordwyo. Cymeradwyir hyn gan bob un o'r deiliaid hawlfraint (gan gynnwys y rhai gwreiddiol).\n"
+#~ "Nid rhan o Kexi ydi'r \"Creuydd Adroddiadau Kugar (Kugar Report "
+#~ "Generator)\", er dangosir adroddiadau tu mewn i brif ffenestr Kexi.  Fe'i "
+#~ "llwythir fel ategyn, ond cynnyrch annibynnol ydy o, wedi'i drwyddedu o "
+#~ "dan y TGG (GPL).  Nid oes unrhyw alwadau ar ddulliau mewnol Kugar.\n"
+#~ " Dim ond cynhyrchu ffeiliau data wna Kexi, sy heb eu cynnwys o dan "
+#~ "drwydded y GPL (Ceir FAQ yn: http://www.fsf.org/copyleft/gpl.html) a "
+#~ "defnyddir dim ond y rhyngwyneb LGPL tdeparts i ddweud wrth Kugar pa ffeil "
+#~ "ddata i'w defnyddio ac i ddangos y gweithredoedd mordwyo. Cymeradwyir hyn "
+#~ "gan bob un o'r deiliaid hawlfraint (gan gynnwys y rhai gwreiddiol).\n"
 #~ "\n"
-#~ " Rhan o becyn KOffice (www.koffice.org) ydy rhaglen GPL Kugar. Deiliaid yr hawlfraint/haelfraint sy'n hysbys adeg yr ysgrifennir yr hysbysiad hwn yw:\n"
+#~ " Rhan o becyn KOffice (www.koffice.org) ydy rhaglen GPL Kugar. Deiliaid "
+#~ "yr hawlfraint/haelfraint sy'n hysbys adeg yr ysgrifennir yr hysbysiad hwn "
+#~ "yw:\n"
 #~ " Mutiny Bay Software (info@mutinybaysoftware.com) (Metaphrast)\n"
 #~ " Phil Thompson (phil@river-bank.demon.co.uk) (Kugar)\n"
 #~ " Alexander Dymo (cloudtemple@mksat.net) (Kugar)\n"
@@ -7205,7 +7383,8 @@ msgstr ""
 #~ " \n"
 #~ " Also, for each author's protection and ours, we want to make certain\n"
 #~ " that everyone understands that there is no warranty for this free\n"
-#~ " software.  If the software is modified by someone else and passed on, we\n"
+#~ " software.  If the software is modified by someone else and passed on, "
+#~ "we\n"
 #~ " want its recipients to know that what they have is not the original, so\n"
 #~ " that any problems introduced by others will not reflect on the original\n"
 #~ " authors' reputations.\n"
@@ -7224,7 +7403,8 @@ msgstr ""
 #~ " \n"
 #~ " 0. This License applies to any program or other work which contains\n"
 #~ " a notice placed by the copyright holder saying it may be distributed\n"
-#~ " under the terms of this General Public License.  The \"Program\", below,\n"
+#~ " under the terms of this General Public License.  The \"Program\", "
+#~ "below,\n"
 #~ " refers to any such program or work, and a \"work based on the Program\"\n"
 #~ " means either the Program or any derivative work under copyright law:\n"
 #~ " that is to say, a work containing the Program or a portion of it,\n"
@@ -7282,7 +7462,8 @@ msgstr ""
 #~ " distribute the same sections as part of a whole which is a work based\n"
 #~ " on the Program, the distribution of the whole must be on the terms of\n"
 #~ " this License, whose permissions for other licensees extend to the\n"
-#~ " entire whole, and thus to each and every part regardless of who wrote it.\n"
+#~ " entire whole, and thus to each and every part regardless of who wrote "
+#~ "it.\n"
 #~ " \n"
 #~ " Thus, it is not the intent of this section to claim rights or contest\n"
 #~ " your rights to work written entirely by you; rather, the intent is to\n"
@@ -7300,7 +7481,8 @@ msgstr ""
 #~ " \n"
 #~ " a) Accompany it with the complete corresponding machine-readable\n"
 #~ " source code, which must be distributed under the terms of Sections\n"
-#~ " 1 and 2 above on a medium customarily used for software interchange; or,\n"
+#~ " 1 and 2 above on a medium customarily used for software interchange; "
+#~ "or,\n"
 #~ " \n"
 #~ " b) Accompany it with a written offer, valid for at least three\n"
 #~ " years, to give any third party, for a charge no more than your\n"
@@ -7398,45 +7580,65 @@ msgstr ""
 #~ " the limitation as if written in the body of this License.\n"
 #~ " \n"
 #~ " 9. The Free Software Foundation may publish revised and/or new versions\n"
-#~ " of the General Public License from time to time.  Such new versions will\n"
-#~ " be similar in spirit to the present version, but may differ in detail to\n"
+#~ " of the General Public License from time to time.  Such new versions "
+#~ "will\n"
+#~ " be similar in spirit to the present version, but may differ in detail "
+#~ "to\n"
 #~ " address new problems or concerns.\n"
 #~ " \n"
 #~ " Each version is given a distinguishing version number.  If the Program\n"
-#~ " specifies a version number of this License which applies to it and \"any\n"
-#~ " later version\", you have the option of following the terms and conditions\n"
+#~ " specifies a version number of this License which applies to it and "
+#~ "\"any\n"
+#~ " later version\", you have the option of following the terms and "
+#~ "conditions\n"
 #~ " either of that version or of any later version published by the Free\n"
-#~ " Software Foundation.  If the Program does not specify a version number of\n"
-#~ " this License, you may choose any version ever published by the Free Software\n"
+#~ " Software Foundation.  If the Program does not specify a version number "
+#~ "of\n"
+#~ " this License, you may choose any version ever published by the Free "
+#~ "Software\n"
 #~ " Foundation.\n"
 #~ " \n"
 #~ " 10. If you wish to incorporate parts of the Program into other free\n"
-#~ " programs whose distribution conditions are different, write to the author\n"
+#~ " programs whose distribution conditions are different, write to the "
+#~ "author\n"
 #~ " to ask for permission.  For software which is copyrighted by the Free\n"
-#~ " Software Foundation, write to the Free Software Foundation; we sometimes\n"
+#~ " Software Foundation, write to the Free Software Foundation; we "
+#~ "sometimes\n"
 #~ " make exceptions for this.  Our decision will be guided by the two goals\n"
-#~ " of preserving the free status of all derivatives of our free software and\n"
+#~ " of preserving the free status of all derivatives of our free software "
+#~ "and\n"
 #~ " of promoting the sharing and reuse of software generally.\n"
 #~ " \n"
 #~ " \t\t\t    NO WARRANTY\n"
 #~ " \n"
-#~ " 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY\n"
-#~ " FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN\n"
+#~ " 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO "
+#~ "WARRANTY\n"
+#~ " FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT "
+#~ "WHEN\n"
 #~ " OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES\n"
-#~ " PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED\n"
+#~ " PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY OF ANY KIND, EITHER "
+#~ "EXPRESSED\n"
 #~ " OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF\n"
-#~ " MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS\n"
+#~ " MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK "
+#~ "AS\n"
 #~ " TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE\n"
-#~ " PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,\n"
+#~ " PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY "
+#~ "SERVICING,\n"
 #~ " REPAIR OR CORRECTION.\n"
 #~ " \n"
-#~ " 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\n"
+#~ " 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN "
+#~ "WRITING\n"
 #~ " WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR\n"
-#~ " REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,\n"
-#~ " INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING\n"
-#~ " OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED\n"
-#~ " TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY\n"
-#~ " YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER\n"
+#~ " REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR "
+#~ "DAMAGES,\n"
+#~ " INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES "
+#~ "ARISING\n"
+#~ " OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT "
+#~ "LIMITED\n"
+#~ " TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED "
+#~ "BY\n"
+#~ " YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY "
+#~ "OTHER\n"
 #~ " PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE\n"
 #~ " POSSIBILITY OF SUCH DAMAGES.\n"
 #~ " \n"
@@ -7447,7 +7649,8 @@ msgstr ""
 #~ " \n"
 #~ " If you develop a new program, and you want it to be of the greatest\n"
 #~ " possible use to the public, the best way to achieve this is to make it\n"
-#~ " free software which everyone can redistribute and change under these terms.\n"
+#~ " free software which everyone can redistribute and change under these "
+#~ "terms.\n"
 #~ " \n"
 #~ " To do so, attach the following notices to the program.  It is safest\n"
 #~ " to attach them to the start of each source file to most effectively\n"
@@ -7469,22 +7672,28 @@ msgstr ""
 #~ " \n"
 #~ " You should have received a copy of the GNU General Public License\n"
 #~ " along with this program; if not, write to the Free Software\n"
-#~ " Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA\n"
+#~ " Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 "
+#~ "USA\n"
 #~ " \n"
 #~ " \n"
-#~ " Also add information on how to contact you by electronic and paper mail.\n"
+#~ " Also add information on how to contact you by electronic and paper "
+#~ "mail.\n"
 #~ " \n"
 #~ " If the program is interactive, make it output a short notice like this\n"
 #~ " when it starts in an interactive mode:\n"
 #~ " \n"
 #~ " Gnomovision version 69, Copyright (C) 19yy name of author\n"
-#~ " Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n"
+#~ " Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show "
+#~ "w'.\n"
 #~ " This is free software, and you are welcome to redistribute it\n"
 #~ " under certain conditions; type `show c' for details.\n"
 #~ " \n"
-#~ " The hypothetical commands `show w' and `show c' should show the appropriate\n"
-#~ " parts of the General Public License.  Of course, the commands you use may\n"
-#~ " be called something other than `show w' and `show c'; they could even be\n"
+#~ " The hypothetical commands `show w' and `show c' should show the "
+#~ "appropriate\n"
+#~ " parts of the General Public License.  Of course, the commands you use "
+#~ "may\n"
+#~ " be called something other than `show w' and `show c'; they could even "
+#~ "be\n"
 #~ " mouse-clicks or menu items--whatever suits your program.\n"
 #~ " \n"
 #~ " You should also get your employer (if you work as a programmer) or your\n"
@@ -7492,14 +7701,17 @@ msgstr ""
 #~ " necessary.  Here is a sample; alter the names:\n"
 #~ " \n"
 #~ " Yoyodyne, Inc., hereby disclaims all copyright interest in the program\n"
-#~ " `Gnomovision' (which makes passes at compilers) written by James Hacker.\n"
+#~ " `Gnomovision' (which makes passes at compilers) written by James "
+#~ "Hacker.\n"
 #~ " \n"
 #~ " <signature of Ty Coon>, 1 April 1989\n"
 #~ " Ty Coon, President of Vice\n"
 #~ " \n"
-#~ " This General Public License does not permit incorporating your program into\n"
+#~ " This General Public License does not permit incorporating your program "
+#~ "into\n"
 #~ " proprietary programs.  If your program is a subroutine library, you may\n"
-#~ " consider it more useful to permit linking proprietary applications with the\n"
+#~ " consider it more useful to permit linking proprietary applications with "
+#~ "the\n"
 #~ " library.  If this is what you want to do, use the GNU Library General\n"
 #~ " Public License instead of this License.\n"
 #~ "\n"
@@ -7515,47 +7727,63 @@ msgstr ""
 #~ "\t\t\t Cyflwyniad\n"
 #~ "\n"
 #~ "Cynllunir trwyddedau ar gyfer y rhan fwyaf o feddalwedd i dynnu'ch\n"
-#~ " rhyddid i'w rhannu a'i newid. I'r gwrthwyned, bwriedir Trwydded y Cyhoedd\n"
+#~ " rhyddid i'w rhannu a'i newid. I'r gwrthwyned, bwriedir Trwydded y "
+#~ "Cyhoedd\n"
 #~ " i warantu'ch rhyddid i rannu a newid meddalwedd\n"
-#~ " rydd -- i sicrhau mai rhydd ar gyfer pob un o'i defnyddiwr ydi'r feddalwedd.\n"
-#~ " Perthyn i'r rhan fwyaf o feddalwedd y Free Software Foundation y mae'r Trwydded y Cyhoedd hon\n"
+#~ " rydd -- i sicrhau mai rhydd ar gyfer pob un o'i defnyddiwr ydi'r "
+#~ "feddalwedd.\n"
+#~ " Perthyn i'r rhan fwyaf o feddalwedd y Free Software Foundation y mae'r "
+#~ "Trwydded y Cyhoedd hon\n"
 #~ " ac i unrhyw raglen arall y lle mae ei hawduron\n"
-#~ " yn ymrwymo i'w defnyddio. (Perthyn peth meddalwedd arall y Free Software Foundation yn lle i\n"
+#~ " yn ymrwymo i'w defnyddio. (Perthyn peth meddalwedd arall y Free Software "
+#~ "Foundation yn lle i\n"
 #~ " Drwydded GNU Llyfrgelloedd y Cyhoedd.) Cewch ei chlymu wrth eich\n"
 #~ " rhaglen chi hefyd.\n"
 #~ " \n"
 #~ " Wrth siarad am feddalwedd rydd, cyfeiriwn at ryddid, nid\n"
 #~ " pris.  Cynllunir ein Trwyddedau'r Cyhoedd i sicrhau bod gennych\n"
 #~ " y rhyddid i ddosbarthu copiau o feddalwedd rydd (a chodi\n"
-#~ " am y gwasanaeth hwn pe dymunech), eich bod chi'n cael y cod gwreiddiol neu'n medru'i gael\n"
-#~ " os ydych ei eisiau, eich bod chi'n cael newid y feddalwedd neu ddefnyddio rhannau ohoni\n"
-#~ " mewn rhaglenni rhydd newydd; a'ch bod chi'n gwybod eich bod chi'n gallu gwneud y pethau hyn.\n"
+#~ " am y gwasanaeth hwn pe dymunech), eich bod chi'n cael y cod gwreiddiol "
+#~ "neu'n medru'i gael\n"
+#~ " os ydych ei eisiau, eich bod chi'n cael newid y feddalwedd neu "
+#~ "ddefnyddio rhannau ohoni\n"
+#~ " mewn rhaglenni rhydd newydd; a'ch bod chi'n gwybod eich bod chi'n gallu "
+#~ "gwneud y pethau hyn.\n"
 #~ " \n"
 #~ " I ddiogelu'ch hawliau, rhaid inni godi rhwystrau sy'n gwahardd\n"
-#~ " unrhywun rhag gwadu'r hawliau hyn i chi neu ofyn ichi roi'r hawliau i fyny.\n"
+#~ " unrhywun rhag gwadu'r hawliau hyn i chi neu ofyn ichi roi'r hawliau i "
+#~ "fyny.\n"
 #~ " Try'r cyfyngiadau hyn yn gyfrifoldebau arbennig arnoch chi os\n"
 #~ " ydych yn dosbarthu copiau o'r feddalwedd, neu os ydych yn ei haddasu.\n"
 #~ "\n"
 #~ " Er enghraifft, os ydych yn dosbarthu copiau o raglen o'r fath, neill\n"
-#~ " ai'n rhad neu am ffi, rhaid ichi roi i'r rhai sy'n ei derbyn pob un o'r hawliau sy\n"
-#~ " gennych chithau. Rhaid ichi sicrhau eu bod hwythau hefyd yn derbyn neu'n gallu cael\n"
-#~ " y cod gwreiddiol. A rhaid ichi ddangos iddynt hwythauy termau hyn fel eu bod hwy'n ymwybodol o'u hawliau.\n"
+#~ " ai'n rhad neu am ffi, rhaid ichi roi i'r rhai sy'n ei derbyn pob un o'r "
+#~ "hawliau sy\n"
+#~ " gennych chithau. Rhaid ichi sicrhau eu bod hwythau hefyd yn derbyn neu'n "
+#~ "gallu cael\n"
+#~ " y cod gwreiddiol. A rhaid ichi ddangos iddynt hwythauy termau hyn fel eu "
+#~ "bod hwy'n ymwybodol o'u hawliau.\n"
 #~ "\n"
-#~ " Diogelwn eich hawliau gyda dau gam: (1) rhoi hawlfraint ar y feddalwedd, a\n"
-#~ " (2) cynnig y drwydded hon ichi sy'n rhoi caniatad cyfreithiol ichi gopio,\n"
+#~ " Diogelwn eich hawliau gyda dau gam: (1) rhoi hawlfraint ar y feddalwedd, "
+#~ "a\n"
+#~ " (2) cynnig y drwydded hon ichi sy'n rhoi caniatad cyfreithiol ichi "
+#~ "gopio,\n"
 #~ " dosbarthu a/neu newid y feddalwedd.\n"
 #~ " \n"
 #~ " Hefyd, er amddifyn pob un awdur a ninnau, carwn sicrhau\n"
 #~ " y deall pawb nad oes gwarant ar gyfer y feddalwedd rydd hon.\n"
 #~ " Os newidir y feddalwedd gan rywun arall a cael ei phasio ymlaen,\n"
-#~ " carwn i'r sawl sy'n ei derbyn wybod mai nid y gwaith gwreiddiol sydd ganddynt, fel nad\n"
+#~ " carwn i'r sawl sy'n ei derbyn wybod mai nid y gwaith gwreiddiol sydd "
+#~ "ganddynt, fel nad\n"
 #~ " adlewyrcha unrhyw broblemau dygwyd i mewn gan eraill\n"
 #~ " ar enwau da'r awduron gwreiddiol.\n"
 #~ "\n"
 #~ " Yn olaf, caiff unrhyw raglen rydd ei bygwth *** gan batentau\n"
 #~ " meddalwedd. Carwn osgoi'r perygl y caiff ail-ddosbarthwyr rhaglen rydd\n"
-#~ " drwydded batent unigol, gan wneud y rhaglen, mewn effaith, yn un berchnogol. I atal hyn, yr ydym wedi'i wneud yn glir bod rhaid\n"
-#~ " i unrhyw batent gael ei drwyddedu ar gyfer defnydd rhydd gan bawb neu fod heb ei drwyddedu o gwbl.\n"
+#~ " drwydded batent unigol, gan wneud y rhaglen, mewn effaith, yn un "
+#~ "berchnogol. I atal hyn, yr ydym wedi'i wneud yn glir bod rhaid\n"
+#~ " i unrhyw batent gael ei drwyddedu ar gyfer defnydd rhydd gan bawb neu "
+#~ "fod heb ei drwyddedu o gwbl.\n"
 #~ " \n"
 #~ " Mae'r union dermau a thelerau ar gyfer copio, dosbarthu a\n"
 #~ " newid yn dilyn.\n"
@@ -7564,31 +7792,40 @@ msgstr ""
 #~ " TERMAU A THELERAU AR GYFER COPIO, DOSBARTHU A NEWID\n"
 #~ " \n"
 #~ " 0. Perthyn y Drwydded hon i unrhyw raglen neu waith arall sy'n cynnwys\n"
-#~ " hysbys wedi'i osod gan ddeiliad yr hawlfraint a ddywed y caiff ei dosbarthu\n"
+#~ " hysbys wedi'i osod gan ddeiliad yr hawlfraint a ddywed y caiff ei "
+#~ "dosbarthu\n"
 #~ " o dan dermau'r Drwydded y Cyhoedd hon. Cyfeiria'r \"Rhaglen\", isod,\n"
-#~ " at unrhwy raglen neu waith o'r fath, a golyga \"gwaith seiliedig ar y Rhaglen\"\n"
-#~ " neill ai'r Rhaglen neu unrhyw waith a ddeillia ohoni o dan gyfraith hawlfraint:\n"
+#~ " at unrhwy raglen neu waith o'r fath, a golyga \"gwaith seiliedig ar y "
+#~ "Rhaglen\"\n"
+#~ " neill ai'r Rhaglen neu unrhyw waith a ddeillia ohoni o dan gyfraith "
+#~ "hawlfraint:\n"
 #~ " hynny yw, unrhyw waith sy'n cynnwys y Rhaglen neu ran ohoni.\n"
 #~ " neill ai gair-am-air neu gyda newidiadau a/neu wedi'i gyfieithu i iaith\n"
 #~ " arall. (O hyn ymlaen, cynnwys cyfieithu heb cyfyngiad yn\n"
 #~ " y term \"newid\".) Cyfeirir at bob trwyddedai fel \"chi\".\n"
 #~ " \n"
-#~ " Ni pherthyn gweithgareddau heblaw copio, dosbarthu a newid i'r Drwydded hon; tu allan o'i hystod y maen nhw. Ni chyfyngir ar y weithred\n"
+#~ " Ni pherthyn gweithgareddau heblaw copio, dosbarthu a newid i'r Drwydded "
+#~ "hon; tu allan o'i hystod y maen nhw. Ni chyfyngir ar y weithred\n"
 #~ " o redeg y Rhaglen, a pherthyn allbwn y Rhaglen dim ond\n"
 #~ " os yw ei gynnwys yn cyfateb i waith seiliedig ar y Rhaglen\n"
 #~ " (yn annibynnol o'i gynhyrchu trwy redeg y Rhaglen).\n"
 #~ " A ydi hynny'n wir yn dibynnu ar yr hyn y mae'r Rhaglen yn ei gyflawni.\n"
 #~ " \n"
-#~ " 1. Cewch gopio a dosbarthu gair-am-air gopiau o god gwreiddiol y Rhaglen\n"
-#~ " fel y'i cafwyd gennych, ar unrhyw gyfrwng, ond eich bod chi'n cyhoeddi'n amlwg ac yn briodol ar bob copi hysbys hawlfraint\n"
-#~ " priodol a gwadiad gwarant; cadw'n un pob hysbys a gyfeiria at y Drwydded hon ac i absenoldeb unrhyw warant;\n"
+#~ " 1. Cewch gopio a dosbarthu gair-am-air gopiau o god gwreiddiol y "
+#~ "Rhaglen\n"
+#~ " fel y'i cafwyd gennych, ar unrhyw gyfrwng, ond eich bod chi'n cyhoeddi'n "
+#~ "amlwg ac yn briodol ar bob copi hysbys hawlfraint\n"
+#~ " priodol a gwadiad gwarant; cadw'n un pob hysbys a gyfeiria at y Drwydded "
+#~ "hon ac i absenoldeb unrhyw warant;\n"
 #~ " a rhoi i bob un derbynnydd arall o'r Rhaglen gopi o'r Drwydded hon\n"
 #~ " ynghyd a'r rhaglen.\n"
 #~ " \n"
 #~ " Cewch godi ffi am y weithred gorfforol o drosglwyddo copi, a\n"
-#~ " chewch yn unol a'ch dymuniad chi gynnig amddiffyn gwarant yn gyfnewid am ffi.\n"
+#~ " chewch yn unol a'ch dymuniad chi gynnig amddiffyn gwarant yn gyfnewid am "
+#~ "ffi.\n"
 #~ " \n"
-#~ " 2. Cewch newid eich copi neu gopiau chi o'r Rhaglen neu unrhyw ran ohoni,\n"
+#~ " 2. Cewch newid eich copi neu gopiau chi o'r Rhaglen neu unrhyw ran "
+#~ "ohoni,\n"
 #~ " gan ffurfio gwaith seiliedig ar y Rhaglen a chopi a\n"
 #~ " dosbarthu'r newidiadau hynny neu waith o dan delerau adran 1\n"
 #~ " uchod, ond eich bod hefyd yn cyfarfod a'r holl delerau hyn hefyd;\n"
@@ -7596,13 +7833,17 @@ msgstr ""
 #~ " a) Rhaid ichi wneud i'r ffeiliau a newidiwyd gario hysbysiadau amlwg\n"
 #~ " yn datgan ichi newid y ffeiliau a'r dyddiad o unrhyw newid.\n"
 #~ " \n"
-#~ " b) Rhaid ichi wneud i unrhyw waith y byddwch yn ei ddosbarthu neu'i gyhoeddi, sy'n cynnwys yn gyfan neu'n rhannol neu sy'n deillio o'r Rhaglen neu unrhyw\n"
+#~ " b) Rhaid ichi wneud i unrhyw waith y byddwch yn ei ddosbarthu neu'i "
+#~ "gyhoeddi, sy'n cynnwys yn gyfan neu'n rhannol neu sy'n deillio o'r "
+#~ "Rhaglen neu unrhyw\n"
 #~ " ran ohoni, gael ei drwyddedu fel cyfanwaith yn rhad i bob\n"
 #~ " tryddydd parti o dan dermau'r Drwydded hon.\n"
 #~ " \n"
-#~ " c) Os bydd y rhaglen addasiedig fel arfer yn darllen gorchmynion trwy gyfathrach\n"
+#~ " c) Os bydd y rhaglen addasiedig fel arfer yn darllen gorchmynion trwy "
+#~ "gyfathrach\n"
 #~ " pan y'i rhedir, rhaid ichi wneud iddi, pan yn ymgychwyn ar gyfer\n"
-#~ " y fath ddefnydd cyfathrachol yn y ffordd fwyaf cyffredin, argraffu neu arddangos\n"
+#~ " y fath ddefnydd cyfathrachol yn y ffordd fwyaf cyffredin, argraffu neu "
+#~ "arddangos\n"
 #~ " cyhoeddiad gan gynnwys hysbys hawlfraint priodol a\n"
 #~ " hysbys nad oes gwarant (neu fel arall, yn dweud eich bod yn darparu\n"
 #~ " gwarant) ac y caiff defnyddwyr ail-ddosbarthu'r rhaglen\n"
@@ -7611,20 +7852,32 @@ msgstr ""
 #~ " ond nad yw'n argraffu hysbys o'r fath fel arfer, nid yw'ch gwaith\n"
 #~ " chi sy'n seiliedig ar y Rhaglen yn gorfod argraffu hysbysiad.)\n"
 #~ " \n"
-#~ " Mae'r gofyniadau hyn yn perthyn i'r gwaith addasiedig fel cyfanwaith.  Os\n"
-#~ " oes adrannau penodedig o'r gwaith hwnnw nad ydynt yn seiliedig ar y Rhaglen,\n"
-#~ " ac a ellid eu hystyried yn rhesymol yn weithiau annibynnol ac ar wahan yn\n"
-#~ " eu hunain, wedyn nad yw'r Drwydded hon na'i thelerau ddim yn berthnasol i'r adrannau hynny pan fyddwch yn eu dosbarthu fel gweithiau ar wahan. Ond pan fyddwch\n"
+#~ " Mae'r gofyniadau hyn yn perthyn i'r gwaith addasiedig fel cyfanwaith.  "
+#~ "Os\n"
+#~ " oes adrannau penodedig o'r gwaith hwnnw nad ydynt yn seiliedig ar y "
+#~ "Rhaglen,\n"
+#~ " ac a ellid eu hystyried yn rhesymol yn weithiau annibynnol ac ar wahan "
+#~ "yn\n"
+#~ " eu hunain, wedyn nad yw'r Drwydded hon na'i thelerau ddim yn berthnasol "
+#~ "i'r adrannau hynny pan fyddwch yn eu dosbarthu fel gweithiau ar wahan. "
+#~ "Ond pan fyddwch\n"
 #~ " yn dosbarthu'r union adrannau'n rhan o gyfanwaith sy'n waith seiliedig\n"
 #~ " ar y Rhaglen, rhaid bod dosbarthiad y cyfanwaith o dan delerau'r\n"
-#~ " Drwydded hon, y mae ei chaniatad ar gyfer trwyddedau eraill yn ymestyn dros\n"
-#~ " yr holl gyfanwaith, ac felly i bob un rhan ni waeth pwy a'i hysgrifennodd.\n"
+#~ " Drwydded hon, y mae ei chaniatad ar gyfer trwyddedau eraill yn ymestyn "
+#~ "dros\n"
+#~ " yr holl gyfanwaith, ac felly i bob un rhan ni waeth pwy a'i "
+#~ "hysgrifennodd.\n"
 #~ " \n"
-#~ " Felly, nid yw'n fwriad gan yr adran hon i hawlio neu ddadlau'ch hawliau chi dros waith a ysgrifennwyd gennych yn gyfangwbl; yn hytrach, y bwriad yw i\n"
-#~ " arfer yr hawl i reoli dosbarthiad gweithau seiliedig neu gyfanweithiau seiliedig ar y Rhaglen.\n"
+#~ " Felly, nid yw'n fwriad gan yr adran hon i hawlio neu ddadlau'ch hawliau "
+#~ "chi dros waith a ysgrifennwyd gennych yn gyfangwbl; yn hytrach, y bwriad "
+#~ "yw i\n"
+#~ " arfer yr hawl i reoli dosbarthiad gweithau seiliedig neu gyfanweithiau "
+#~ "seiliedig ar y Rhaglen.\n"
 #~ " \n"
-#~ " Ymhellach, ni ddwg dim byd ond hel gwaith arall nad yw'n seiliedig ar y Rhaglen\n"
-#~ " at ei gilydd gyda'r Rhaglen (neu chyda gwaith seiliedig ar y Rhaglen) ar ddosran\n"
+#~ " Ymhellach, ni ddwg dim byd ond hel gwaith arall nad yw'n seiliedig ar y "
+#~ "Rhaglen\n"
+#~ " at ei gilydd gyda'r Rhaglen (neu chyda gwaith seiliedig ar y Rhaglen) ar "
+#~ "ddosran\n"
 #~ " o gyfrwng storio neu ddosbarthu y gwaith arall o dan\n"
 #~ " ystod y Drwydded hon.\n"
 #~ "\n"
@@ -7637,10 +7890,12 @@ msgstr ""
 #~ " 1 a 2 uchod ar gyfrwng ddefnyddid fel arfer i gyfnewid meddalwedd; neu,\n"
 #~ " \n"
 #~ " b) Cyd-ddosbarthu cynnig ysgrifennedig, dilys am leiafswm\n"
-#~ " o dair blynnedd, i roi i unrhyw drydydd parti, am ffi dim mwy na'ch cost\n"
+#~ " o dair blynnedd, i roi i unrhyw drydydd parti, am ffi dim mwy na'ch "
+#~ "cost\n"
 #~ " chi o berfformio'n gorfforol y dosbarthiad cod gwreiddiol,\n"
 #~ " gopi cyfan peiriant-ddarllenadwy o'r cod gwreiddiol cyfatebol, i'w\n"
-#~ " ddosbarth o dan delerau Adrannau 1 a 2 uchod ar gyfrwng ddefnyddid fel arfer i gyfnewid meddalwedd; neu,\n"
+#~ " ddosbarth o dan delerau Adrannau 1 a 2 uchod ar gyfrwng ddefnyddid fel "
+#~ "arfer i gyfnewid meddalwedd; neu,\n"
 #~ " \n"
 #~ " c) Cyd-ddosbarthu'r wybodaeth gawsoch chi o'r cynnig\n"
 #~ " i ddosbarth cod gwreiddiol cyfatebol. (Caniateir y dewis hwn\n"
@@ -7649,60 +7904,183 @@ msgstr ""
 #~ " ynghyd a chynnig o'r fath, yn ol Is-adran b uchod.)\n"
 #~ " \n"
 #~ " Ystir cod gwreiddiol yw ffurf y gwaith a ddewisir i'w newid yn arferol.\n"
-#~ "  Ar gyfer gwaith rhedadwy, golyga cod gwreiddiol cyfan y cod gwreiddiol ar gyfer yr holl fodiwlau cynwysiedig, ynghyd ag unrhyw ffeiliau diffinio rhyngwyneb, a'r sgriptiau a ddefnyddir i reoli compeilio ac arsefydlu'r ffeil redadwy. Ond, fel eithriad arbennig, ni raid i'r cod gwreiddiol a ddosberthir gynnwys unrhywbeth nad yw'n cael ei ddosbarthu fel arfer (mewn gwedd cod gwreiddiol neu'n ddigidol) gyda phrif ddosrannau (compeilydd, cnewyllyn, ac ati) y cysawd gweithredu y mae'r ffeil redadwy yn rhedeg arno, onibai bod y dernyn ei hun yn cael ei gyd-ddosbarthu gyda'r ffeil redadwy. Os cyflawnir dosbarthu'r cod rhedadwy neu wrthrychol trwy gynnig mynediad i gopio o le penodedig, wedyn bydd cynnig mynediad tebyg i copio'r cod gwreiddiol o'r un lle yn cyfrif fel dosbarthu'r cod gwreiddiol, er nad yw trydydd partiau'n cael eu gorfodi i gopio'r cod gwreiddiol ynghyd a'r cod gwrthrychol.\n"
+#~ "  Ar gyfer gwaith rhedadwy, golyga cod gwreiddiol cyfan y cod gwreiddiol "
+#~ "ar gyfer yr holl fodiwlau cynwysiedig, ynghyd ag unrhyw ffeiliau diffinio "
+#~ "rhyngwyneb, a'r sgriptiau a ddefnyddir i reoli compeilio ac arsefydlu'r "
+#~ "ffeil redadwy. Ond, fel eithriad arbennig, ni raid i'r cod gwreiddiol a "
+#~ "ddosberthir gynnwys unrhywbeth nad yw'n cael ei ddosbarthu fel arfer "
+#~ "(mewn gwedd cod gwreiddiol neu'n ddigidol) gyda phrif ddosrannau "
+#~ "(compeilydd, cnewyllyn, ac ati) y cysawd gweithredu y mae'r ffeil redadwy "
+#~ "yn rhedeg arno, onibai bod y dernyn ei hun yn cael ei gyd-ddosbarthu "
+#~ "gyda'r ffeil redadwy. Os cyflawnir dosbarthu'r cod rhedadwy neu "
+#~ "wrthrychol trwy gynnig mynediad i gopio o le penodedig, wedyn bydd cynnig "
+#~ "mynediad tebyg i copio'r cod gwreiddiol o'r un lle yn cyfrif fel "
+#~ "dosbarthu'r cod gwreiddiol, er nad yw trydydd partiau'n cael eu gorfodi i "
+#~ "gopio'r cod gwreiddiol ynghyd a'r cod gwrthrychol.\n"
 #~ " \n"
-#~ " 4. Ni chewch gopio, newid, is-drwyddedu, neu ddosbarthu'r Rhaglen ond fel y darperir trwy fynegiant o dan y Drwydded hon. Y mae unrhyw ymgais fel arall i gopio, newid, is-drwyddedu neu ddosbarthu'r Rhaglen yn ddi-ystyr, a bydd yn terfynu'ch hawliau chi o dan y Drwydded hon.  Serch hynny, na therfynir trwyddedau partiau sydd wedi derbyn copiau, neu hawliau, gennych o dan y Drwydded hon cyhyd a bod partiau felly yn cydymffurfio o hyd.\n"
+#~ " 4. Ni chewch gopio, newid, is-drwyddedu, neu ddosbarthu'r Rhaglen ond "
+#~ "fel y darperir trwy fynegiant o dan y Drwydded hon. Y mae unrhyw ymgais "
+#~ "fel arall i gopio, newid, is-drwyddedu neu ddosbarthu'r Rhaglen yn ddi-"
+#~ "ystyr, a bydd yn terfynu'ch hawliau chi o dan y Drwydded hon.  Serch "
+#~ "hynny, na therfynir trwyddedau partiau sydd wedi derbyn copiau, neu "
+#~ "hawliau, gennych o dan y Drwydded hon cyhyd a bod partiau felly yn "
+#~ "cydymffurfio o hyd.\n"
 #~ " \n"
-#~ " 5. Nid yw'n ofynnol ichi dderbyn y Drwydded hon, am nad ydych wedi'i arwyddo. Serch hynny, ni rydd unrhywbeth arall ganiatad ichi newid neu ddosbarthu'r Rhaglen na'i weithiau seiliedig. Gwaherddir y gweithredoedd hyn trwy gyfraith os nad ydych yn derbyn y Drwydded hon.  Felly, tryw newid neu ddosbarthu'r Rhaglen (neu unrhyw waith seiliedig ar y Rhaglen), yr ydych yn arwyddo eich bod yn derbyn y Drwydded hon er mwyn gwneud felly, a'i holl dermau a thelerau ar gyfer copio, dosbarthu neu newid y Rhaglen neu weithiau seiliedig arni.\n"
+#~ " 5. Nid yw'n ofynnol ichi dderbyn y Drwydded hon, am nad ydych wedi'i "
+#~ "arwyddo. Serch hynny, ni rydd unrhywbeth arall ganiatad ichi newid neu "
+#~ "ddosbarthu'r Rhaglen na'i weithiau seiliedig. Gwaherddir y gweithredoedd "
+#~ "hyn trwy gyfraith os nad ydych yn derbyn y Drwydded hon.  Felly, tryw "
+#~ "newid neu ddosbarthu'r Rhaglen (neu unrhyw waith seiliedig ar y Rhaglen), "
+#~ "yr ydych yn arwyddo eich bod yn derbyn y Drwydded hon er mwyn gwneud "
+#~ "felly, a'i holl dermau a thelerau ar gyfer copio, dosbarthu neu newid y "
+#~ "Rhaglen neu weithiau seiliedig arni.\n"
 #~ " \n"
-#~ " 6. Bob tro yr ydych yn ail-ddosbarthu'r Rhaglen (neu unrhyw waith seiliedig ar y Rhaglen), bydd y derbynnydd yn cael yn awtomatig drwydded oddi wrth y trwyddedwr gwreiddiol i gopio, dosbarthu neu newid y Rhaglen o dan y termau a'r telerau hyn. Ni chewch orfodi unrhyw gyfyngiadau ymhellach ar arfer hawliau'r derbynnydd a roir yn hyn. Nid ydych yn gyfrifol am orfodi cydymffurfiad trydydd partiau i'r Drwydded hon.\n"
+#~ " 6. Bob tro yr ydych yn ail-ddosbarthu'r Rhaglen (neu unrhyw waith "
+#~ "seiliedig ar y Rhaglen), bydd y derbynnydd yn cael yn awtomatig drwydded "
+#~ "oddi wrth y trwyddedwr gwreiddiol i gopio, dosbarthu neu newid y Rhaglen "
+#~ "o dan y termau a'r telerau hyn. Ni chewch orfodi unrhyw gyfyngiadau "
+#~ "ymhellach ar arfer hawliau'r derbynnydd a roir yn hyn. Nid ydych yn "
+#~ "gyfrifol am orfodi cydymffurfiad trydydd partiau i'r Drwydded hon.\n"
 #~ " \n"
-#~ " 7. Os, mewn canlyniad i ddyfarniad llys neu honiad o dorri patent neu am unrhyw resum arall (heb ei gyfyngu i faterion patentau), gorfodir telerau arnoch (trwy orchymyn llys, cytundeb neu fel arall) sy'n gwrth-ddweud telerau'r Drwydded hon, nid ydynt yn eich esgusodi rhag telerau'r Drwydded hon. Os na fedrwch ddosbarthu fel y bodlonir eich oblygiadau o dan y Drwydded hon ac unrhyw oblygiadau perthnasol eraill ar yr un pryd, wedyn mewn canlyniad ni fedrwch ddosbarthu'r Rhaglen o gwbl. Er enghraifft, pe na byddai trwydded patent yn caniatau ail-ddosbarthu di-freiniol o'r Rhaglen i bawb a dderbyn copiau'n uniongyrchol neu'n anuniongyrchol gennych, yna'r unig ffordd y gellwch ei fodloni ef a'r Drwydded hon fyddai i beidio yn gyfangwbl a dosbarthu'r Rhaglen. Os delir unrhyw ran o'r adran hon yn annilys neu'n anorfodadwy o dan unrhyw amgylchiad arbennig, bwriedir i weddill yr adran berthyn, a bwriedir i'r adran gyfan berthyn mewn amgylchiadau eraill.  Nid yw'n fwriad gan yr adran hon i'ch ysgogi i dorri unrhyw batentau neu hawliau eiddo eraill neu i ddadlau dilysrwydd unrhyw hawliau o'r fath; unig bwrpas yr adran hon yw i amddiffyn dilysrwydd sustem dosbarthu meddalwedd rydd, a weithredir tryw ymarferion trwyddedau cyhoeddus. Gwnaed cyfraniadau hael gan lawer o bobl i'r ystod eang o feddalwedd a ddosberthir trwy'r sustem honno gan ddibynnu ar weithredu cyson o'r sustem honno; i fyny i'r awdur/rhoddwr mae hi i benderfynu a ydyw'n fodlon dosbarthu meddalwedd trwy unrhyw sustem arall ac ni caiff trwydded gorfodi'r dewis hwnnw. Bwriedir yr adran hon i wneud yn hollol glir yr hyn a credir fydd yn ganlyniad gweddill y Drwydded hon. 8. Os cyfyngir ar ddosbarthu a/neu ddefnydd o'r Rhaglen mewn gwledydd arbennig neill ai trwy batentau neu drwy ryngwynebau hawlfreintiedig, caiff deiliad gwreiddiol yr hawlfraint a roir y Rhaglen hon o dan y Drwydded hon ychwanegu trwy fynegiant gyfyngiad dosbarthiad daearyddol sy'n eithrio'r gwledydd hynny, fel y caniateir dosbarthu dim ond o fewn neu rhwng y gwledydd nad ydynt wedi'u heithrio.  Mewn achos felly, cynnwys y Drwydded hon y cyfyngiad fel ei fod wedi'i ysgrifennu yng nghorff y Drwydded hon. 9.  Gall y Free Software Foundation gyhoeddi fersiynau addasiedig a/neu newydd o Drwydded y Cyhoedd o dro i dro. Bydd fersiynau felly'n debyg mewn ysbryd i'r fersiwn presennol, ond gallant amrywio yn y manylion i gyfeirio at broblemau neu ofidiau newydd. Rhoir rhif fersiwn nodweddiol ar bob fersiwn.  Os yw'r Rhaglen yn nodi rhif fersiwn y Drwydded hon sy'n perthyn iddi ac \"unrhyw fersiynau diweddarach\", bydd gennych yr opsiwn o ddilyn y termau a'r telerau neill ai y fersiwn hwnnw neu unrhyw fersiwn diweddarach wedi'i gyhoeddi gan y Free Software Foundation. Os nad yw'r Rhaglen yn nodi rhif fersiwn y Drwydded hon, cewch ddewis unrhyw fersiwn a gyhoeddwyd erioed gan y Free Software Foundation. 10. Pe garech gynnwys rhannau o'r Rhaglen mewn rhaglenni rhydd eraill sydd a thelerau dosbarthu gwahanol, ysgrifennwch at yr awdur i ofyn am ganiatad. Ar gyfer meddalwedd o dan hawlfraint y Free Software Foundation, ysgrifennwch at y Free Software Foundation; gwnawn eithriadau weithiau am hyn. Tywysir ein penderfyniad gan ddwy amcan o gadw statws rhydd popeht sy'n deillio o'n meddalwedd rydd ac o hybu rhannu ac ail-ddefnydd o feddalwedd yn gyffredinol.\n"
+#~ " 7. Os, mewn canlyniad i ddyfarniad llys neu honiad o dorri patent neu am "
+#~ "unrhyw resum arall (heb ei gyfyngu i faterion patentau), gorfodir telerau "
+#~ "arnoch (trwy orchymyn llys, cytundeb neu fel arall) sy'n gwrth-ddweud "
+#~ "telerau'r Drwydded hon, nid ydynt yn eich esgusodi rhag telerau'r "
+#~ "Drwydded hon. Os na fedrwch ddosbarthu fel y bodlonir eich oblygiadau o "
+#~ "dan y Drwydded hon ac unrhyw oblygiadau perthnasol eraill ar yr un pryd, "
+#~ "wedyn mewn canlyniad ni fedrwch ddosbarthu'r Rhaglen o gwbl. Er "
+#~ "enghraifft, pe na byddai trwydded patent yn caniatau ail-ddosbarthu di-"
+#~ "freiniol o'r Rhaglen i bawb a dderbyn copiau'n uniongyrchol neu'n "
+#~ "anuniongyrchol gennych, yna'r unig ffordd y gellwch ei fodloni ef a'r "
+#~ "Drwydded hon fyddai i beidio yn gyfangwbl a dosbarthu'r Rhaglen. Os delir "
+#~ "unrhyw ran o'r adran hon yn annilys neu'n anorfodadwy o dan unrhyw "
+#~ "amgylchiad arbennig, bwriedir i weddill yr adran berthyn, a bwriedir i'r "
+#~ "adran gyfan berthyn mewn amgylchiadau eraill.  Nid yw'n fwriad gan yr "
+#~ "adran hon i'ch ysgogi i dorri unrhyw batentau neu hawliau eiddo eraill "
+#~ "neu i ddadlau dilysrwydd unrhyw hawliau o'r fath; unig bwrpas yr adran "
+#~ "hon yw i amddiffyn dilysrwydd sustem dosbarthu meddalwedd rydd, a "
+#~ "weithredir tryw ymarferion trwyddedau cyhoeddus. Gwnaed cyfraniadau hael "
+#~ "gan lawer o bobl i'r ystod eang o feddalwedd a ddosberthir trwy'r sustem "
+#~ "honno gan ddibynnu ar weithredu cyson o'r sustem honno; i fyny i'r awdur/"
+#~ "rhoddwr mae hi i benderfynu a ydyw'n fodlon dosbarthu meddalwedd trwy "
+#~ "unrhyw sustem arall ac ni caiff trwydded gorfodi'r dewis hwnnw. Bwriedir "
+#~ "yr adran hon i wneud yn hollol glir yr hyn a credir fydd yn ganlyniad "
+#~ "gweddill y Drwydded hon. 8. Os cyfyngir ar ddosbarthu a/neu ddefnydd o'r "
+#~ "Rhaglen mewn gwledydd arbennig neill ai trwy batentau neu drwy "
+#~ "ryngwynebau hawlfreintiedig, caiff deiliad gwreiddiol yr hawlfraint a "
+#~ "roir y Rhaglen hon o dan y Drwydded hon ychwanegu trwy fynegiant "
+#~ "gyfyngiad dosbarthiad daearyddol sy'n eithrio'r gwledydd hynny, fel y "
+#~ "caniateir dosbarthu dim ond o fewn neu rhwng y gwledydd nad ydynt wedi'u "
+#~ "heithrio.  Mewn achos felly, cynnwys y Drwydded hon y cyfyngiad fel ei "
+#~ "fod wedi'i ysgrifennu yng nghorff y Drwydded hon. 9.  Gall y Free "
+#~ "Software Foundation gyhoeddi fersiynau addasiedig a/neu newydd o Drwydded "
+#~ "y Cyhoedd o dro i dro. Bydd fersiynau felly'n debyg mewn ysbryd i'r "
+#~ "fersiwn presennol, ond gallant amrywio yn y manylion i gyfeirio at "
+#~ "broblemau neu ofidiau newydd. Rhoir rhif fersiwn nodweddiol ar bob "
+#~ "fersiwn.  Os yw'r Rhaglen yn nodi rhif fersiwn y Drwydded hon sy'n "
+#~ "perthyn iddi ac \"unrhyw fersiynau diweddarach\", bydd gennych yr opsiwn "
+#~ "o ddilyn y termau a'r telerau neill ai y fersiwn hwnnw neu unrhyw fersiwn "
+#~ "diweddarach wedi'i gyhoeddi gan y Free Software Foundation. Os nad yw'r "
+#~ "Rhaglen yn nodi rhif fersiwn y Drwydded hon, cewch ddewis unrhyw fersiwn "
+#~ "a gyhoeddwyd erioed gan y Free Software Foundation. 10. Pe garech gynnwys "
+#~ "rhannau o'r Rhaglen mewn rhaglenni rhydd eraill sydd a thelerau dosbarthu "
+#~ "gwahanol, ysgrifennwch at yr awdur i ofyn am ganiatad. Ar gyfer "
+#~ "meddalwedd o dan hawlfraint y Free Software Foundation, ysgrifennwch at y "
+#~ "Free Software Foundation; gwnawn eithriadau weithiau am hyn. Tywysir ein "
+#~ "penderfyniad gan ddwy amcan o gadw statws rhydd popeht sy'n deillio o'n "
+#~ "meddalwedd rydd ac o hybu rhannu ac ail-ddefnydd o feddalwedd yn "
+#~ "gyffredinol.\n"
 #~ " \n"
 #~ " \t\t\t DIM GWARANT\n"
 #~ " \n"
-#~ " 11. AM FOD Y RHAGLEN WEDI'I DRWYDDEDU'N RHAD, NID OES WARANT AR GYFER Y RHAGLEN, HYD AT GANIATAD EHANGAF CYFRAITH BERTHNASOL. ONI DDYWEDIR YN WAHANOL YN YSGRIFENEDIG DARPERIR Y RHAGLEN GAN DDEILIAD YR HAWLFRAINT A/NEU BARTIAU ERAILL \"FEL Y MAE\" HEB WARANT O UNRHYW FATH, NEILL AI TRWY FYNEGIANT NEU DRWY AWGRYMIAD, GAN GYNNWYS, OND HEB EI GYFYNGU AT, WARANTAU AWGRYMIEDIG GWERTHADWY-EDD A DILYSRWYDD AT BWRPAS ARBENNIG. CHI BIAU'R RISG LLE MAE SAFON A PHERFFORMANS Y RHAGLEN YN Y CWESTIWN. PE BYDDAI'R RHAGLEN YN WALLUS, CHI FYDD YN CYMRYD Y CYFRIFOLDEB AR GYFER COSTAU POB GWASANAETH, TRWSIO NEU GYWIRO.\n"
+#~ " 11. AM FOD Y RHAGLEN WEDI'I DRWYDDEDU'N RHAD, NID OES WARANT AR GYFER Y "
+#~ "RHAGLEN, HYD AT GANIATAD EHANGAF CYFRAITH BERTHNASOL. ONI DDYWEDIR YN "
+#~ "WAHANOL YN YSGRIFENEDIG DARPERIR Y RHAGLEN GAN DDEILIAD YR HAWLFRAINT A/"
+#~ "NEU BARTIAU ERAILL \"FEL Y MAE\" HEB WARANT O UNRHYW FATH, NEILL AI TRWY "
+#~ "FYNEGIANT NEU DRWY AWGRYMIAD, GAN GYNNWYS, OND HEB EI GYFYNGU AT, "
+#~ "WARANTAU AWGRYMIEDIG GWERTHADWY-EDD A DILYSRWYDD AT BWRPAS ARBENNIG. CHI "
+#~ "BIAU'R RISG LLE MAE SAFON A PHERFFORMANS Y RHAGLEN YN Y CWESTIWN. PE "
+#~ "BYDDAI'R RHAGLEN YN WALLUS, CHI FYDD YN CYMRYD Y CYFRIFOLDEB AR GYFER "
+#~ "COSTAU POB GWASANAETH, TRWSIO NEU GYWIRO.\n"
 #~ " \n"
-#~ " 12. NI FYDD AR UNRHYW GYFRIF ONIBAI AM OFYNIAD CYFRAITH BERTHNASOL NEU WEDI'I GYTUNO'N YSGRIFENNEDIG UNRHYW DEILIAD HAWLFRAINT, NEU UNRHYW BARTI ARALL ALL NEWID A/NEU AIL-DDOSBARTHU'R RHAGLEN YN OL Y CANIATAD UCHOD, YN GYFRIFOL ICHI AM IAWNDAL, GAN GYNNWYS UNRHYW IAWNDALIADAU CYFFREDINOL, ARBENNIG, DIGWYDDIADOL NEU GANLYNIADOL A CYWD ALLAN O DDEFNYDD NEU ANALLU I DDEFNYDDIO'R RHAGLEN (GAN CYNNWYS OND HEB GYFYNGU I GOLLI DATA NEU DATA'N CAEL EI WNEUD YN WALLUS NEU COLLEDION DIODDEFWYD GENNYCH NEU TRYDYDD PARTIAU NEU FETHIANT Y RHAGLEN I GYD-WEITHIO GYDAG UNRHYW RAGLENNI ERAILL), HYD YN OED OS BYDD Y FATH DEILIAD WEDI'I HYSBYSU O BOSIBILRWYDD DIFROD O'R FATH.\n"
+#~ " 12. NI FYDD AR UNRHYW GYFRIF ONIBAI AM OFYNIAD CYFRAITH BERTHNASOL NEU "
+#~ "WEDI'I GYTUNO'N YSGRIFENNEDIG UNRHYW DEILIAD HAWLFRAINT, NEU UNRHYW BARTI "
+#~ "ARALL ALL NEWID A/NEU AIL-DDOSBARTHU'R RHAGLEN YN OL Y CANIATAD UCHOD, YN "
+#~ "GYFRIFOL ICHI AM IAWNDAL, GAN GYNNWYS UNRHYW IAWNDALIADAU CYFFREDINOL, "
+#~ "ARBENNIG, DIGWYDDIADOL NEU GANLYNIADOL A CYWD ALLAN O DDEFNYDD NEU ANALLU "
+#~ "I DDEFNYDDIO'R RHAGLEN (GAN CYNNWYS OND HEB GYFYNGU I GOLLI DATA NEU "
+#~ "DATA'N CAEL EI WNEUD YN WALLUS NEU COLLEDION DIODDEFWYD GENNYCH NEU "
+#~ "TRYDYDD PARTIAU NEU FETHIANT Y RHAGLEN I GYD-WEITHIO GYDAG UNRHYW "
+#~ "RAGLENNI ERAILL), HYD YN OED OS BYDD Y FATH DEILIAD WEDI'I HYSBYSU O "
+#~ "BOSIBILRWYDD DIFROD O'R FATH.\n"
 #~ " \n"
 #~ " \t\t DIWDDD TERMAU A THELERAU\n"
 #~ " \n"
 #~ " \n"
 #~ " \t Sut i Glymu'r Telerau hyn i'ch Rhaglen Newydd\n"
 #~ " \n"
-#~ " Os ydych yn datblygu rhaglen newydd, a bydd arnoch eisiau iddi fod o'r defnydd mwyaf i'r cyhoedd, y ffordd orau i gyflawni hyn yw i'w wneud yn feddalwedd rydd y gall pawb ei hail-ddosbarthu a newid o dan y telerau hyn.\n"
+#~ " Os ydych yn datblygu rhaglen newydd, a bydd arnoch eisiau iddi fod o'r "
+#~ "defnydd mwyaf i'r cyhoedd, y ffordd orau i gyflawni hyn yw i'w wneud yn "
+#~ "feddalwedd rydd y gall pawb ei hail-ddosbarthu a newid o dan y telerau "
+#~ "hyn.\n"
 #~ " \n"
-#~ " I wneud felly, clymu'r hysbysiadau canlynol i'r rhaglen. Clymu nhw i gychwyn pob ffeil cod gwreiddiol ydi'r peth saffaf i cyfleu yn y ffordd fwyaf effeithiol gwadiad gwarant; a dylai pob ffeil fod ag o leiaf y llinell \"hawlfraint\" ac arwydd i le ceir y hysbysiad cyflawn.\n"
+#~ " I wneud felly, clymu'r hysbysiadau canlynol i'r rhaglen. Clymu nhw i "
+#~ "gychwyn pob ffeil cod gwreiddiol ydi'r peth saffaf i cyfleu yn y ffordd "
+#~ "fwyaf effeithiol gwadiad gwarant; a dylai pob ffeil fod ag o leiaf y "
+#~ "llinell \"hawlfraint\" ac arwydd i le ceir y hysbysiad cyflawn.\n"
 #~ " \n"
 #~ " <un linell i roi enw'r rhaglen a syniad byr o beth mae hi'n ei wneud.>\n"
 #~ " Hawlfraint (h) 19bb <enw'r awdur>\n"
 #~ " \n"
-#~ " Meddalwedd rydd yw'r rhaglen hon; cewch ei hail-ddosbarthu a/neu ei newid o dan delerau Trwydded y Cyhoedd GNU fel y'i cyhoeddir gan y Free Software Foundation; neill ai fersiwn 2 o'r Drwydded, neu (yn ol eich dewis chi) unrhyw fersiwn diweddarach.\n"
+#~ " Meddalwedd rydd yw'r rhaglen hon; cewch ei hail-ddosbarthu a/neu ei "
+#~ "newid o dan delerau Trwydded y Cyhoedd GNU fel y'i cyhoeddir gan y Free "
+#~ "Software Foundation; neill ai fersiwn 2 o'r Drwydded, neu (yn ol eich "
+#~ "dewis chi) unrhyw fersiwn diweddarach.\n"
 #~ " \n"
-#~ " Dosberthir y rhaglen hon yn y gobaith y bydd yn ddefnyddiol, ond HEB UNRHYW WARANT; heb hyd yn oed y warant awgrymiedig o WERTHADWY-EDD neu DILYSRWYDD AT BWRPAS ARBENNIG. Gweler Trywdded y Cyhoedd GNU am ragor o fanylion.\n"
+#~ " Dosberthir y rhaglen hon yn y gobaith y bydd yn ddefnyddiol, ond HEB "
+#~ "UNRHYW WARANT; heb hyd yn oed y warant awgrymiedig o WERTHADWY-EDD neu "
+#~ "DILYSRWYDD AT BWRPAS ARBENNIG. Gweler Trywdded y Cyhoedd GNU am ragor o "
+#~ "fanylion.\n"
 #~ " \n"
-#~ " Dylech fod wedi derbyn copi o Drwydded y Cyhoedd GNU ynghyd a'r rhaglen hon; os na, ysgrifennwch at y Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 UDA\n"
+#~ " Dylech fod wedi derbyn copi o Drwydded y Cyhoedd GNU ynghyd a'r rhaglen "
+#~ "hon; os na, ysgrifennwch at y Free Software Foundation, Inc., 59 Temple "
+#~ "Place, Suite 330, Boston, MA 02111-1307 UDA\n"
 #~ " \n"
 #~ " \n"
-#~ " Ychwanegwch hefyd wybodaeth ar sut i gysylltu a chi drwy bost electroneg a phapur.\n"
+#~ " Ychwanegwch hefyd wybodaeth ar sut i gysylltu a chi drwy bost electroneg "
+#~ "a phapur.\n"
 #~ "\n"
-#~ " Os yw'r rhaglen yn cyfathrachol, gwnewch iddi roi allan hysbysiad byr fel hyn pan fydd yn cychwyn mewn modd gyfathrachol:\n"
+#~ " Os yw'r rhaglen yn cyfathrachol, gwnewch iddi roi allan hysbysiad byr "
+#~ "fel hyn pan fydd yn cychwyn mewn modd gyfathrachol:\n"
 #~ " \n"
 #~ " Gnomofisiwn fersiwn 69, Hawlfraint (h) 19bb enw'r awdur\n"
-#~ " Daw Gnomofisiwn heb UNRHYW WARANT O GWBL; am fanylion teipiwch 'dangos w'.\n"
+#~ " Daw Gnomofisiwn heb UNRHYW WARANT O GWBL; am fanylion teipiwch 'dangos "
+#~ "w'.\n"
 #~ " Meddalwedd rydd yw hon, ac y mae croeso ichi ei hail-ddosbarth\n"
 #~ " o dan rai amodau; teipiwch 'dangos c' am fanylion.\n"
 #~ " \n"
-#~ " Dylai'r gorchmynion dychmygol 'dangos w' a 'dangos c' ddangos y rhannau perthnasol o Drwydded y Cyhoedd.  Wrth gwrs, gellir galw'r gorchmynion yr ydych yn eu defnyddio rhywbeth wahanol i 'dangos w' a 'dangos c'; cliciadau'r llygoden hyd yn oed neu ddewisiadau dewislen can nhw fod--beth bynnag sy'n gweddu i'ch rhaglen.\n"
+#~ " Dylai'r gorchmynion dychmygol 'dangos w' a 'dangos c' ddangos y rhannau "
+#~ "perthnasol o Drwydded y Cyhoedd.  Wrth gwrs, gellir galw'r gorchmynion yr "
+#~ "ydych yn eu defnyddio rhywbeth wahanol i 'dangos w' a 'dangos c'; "
+#~ "cliciadau'r llygoden hyd yn oed neu ddewisiadau dewislen can nhw fod--"
+#~ "beth bynnag sy'n gweddu i'ch rhaglen.\n"
 #~ " \n"
-#~ " Dylech hefyd gael i'ch cyflogwr (os ydych yn gweithio fel rhaglennydd) neu'ch ysgol, os oes un gennych, i lofnodi \"gwadiant hawlfraint\" ar gyfer y rhaglen, os oes rhaid.  Dyma sampl; newidiwch yr enwau\n"
+#~ " Dylech hefyd gael i'ch cyflogwr (os ydych yn gweithio fel rhaglennydd) "
+#~ "neu'ch ysgol, os oes un gennych, i lofnodi \"gwadiant hawlfraint\" ar "
+#~ "gyfer y rhaglen, os oes rhaid.  Dyma sampl; newidiwch yr enwau\n"
 #~ " \n"
-#~ " Rhy Yoyodyne, Inc., heibio pob diddordeb hawlfraint yn y rhaglen 'Gnomofisiwn' (sy'n trio bachu compeilars) ysgrifennwyd gan James Hacker.\n"
+#~ " Rhy Yoyodyne, Inc., heibio pob diddordeb hawlfraint yn y rhaglen "
+#~ "'Gnomofisiwn' (sy'n trio bachu compeilars) ysgrifennwyd gan James "
+#~ "Hacker.\n"
 #~ " \n"
 #~ " <llofnod Ty Coon>, 1 Ebrill 1989\n"
 #~ " Ty Coon, Llywydd Feis\n"
 #~ " \n"
-#~ " Ni chaniateir y Drwydded Cyhoedd hon ymgorffori'ch rhaglen i mewn i raglenni perchnogol. Os mai llyfrgell is-ffwythiannau yw'ch rhaglen fe allech ei ystyried yn fwy defnyddiol i ganiatau dolenni rhaglenni perchnogol gyda'r llyfrgell.  Os mai dyma beth yr ydych eisiau ei wneud, defnyddiwch Drwydded Llyfrgell y Cyhoedd GNU yn lle'r Drwydded hon.\n"
+#~ " Ni chaniateir y Drwydded Cyhoedd hon ymgorffori'ch rhaglen i mewn i "
+#~ "raglenni perchnogol. Os mai llyfrgell is-ffwythiannau yw'ch rhaglen fe "
+#~ "allech ei ystyried yn fwy defnyddiol i ganiatau dolenni rhaglenni "
+#~ "perchnogol gyda'r llyfrgell.  Os mai dyma beth yr ydych eisiau ei wneud, "
+#~ "defnyddiwch Drwydded Llyfrgell y Cyhoedd GNU yn lle'r Drwydded hon.\n"
 #~ "\n"
 
 #~ msgid "test"
@@ -7727,7 +8105,9 @@ msgstr ""
 #~ msgstr "<DIM>"
 
 #~ msgid ""
-#~ " _: Please make sure that the translated string looks like Detail %1. (%1 preceded by a space and directly followed by a . and no character after that)\n"
+#~ " _: Please make sure that the translated string looks like Detail %1. (%1 "
+#~ "preceded by a space and directly followed by a . and no character after "
+#~ "that)\n"
 #~ " Detail %1.\n"
 #~ msgstr "Manylion: %1.\n"