Update translation files

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

(cherry picked from commit a9574708d96712b2d7dbb6d2bb7db90764dafc3a)

1 files changed, 1096 insertions, 1017 deletions

diff --git a/tde-i18n-cy/messages/tdepim/kaddressbook.po b/tde-i18n-cy/messages/tdepim/kaddressbook.po
index dae79c0c276..6962c677deb 100644
--- a/tde-i18n-cy/messages/tdepim/kaddressbook.po
+++ b/tde-i18n-cy/messages/tdepim/kaddressbook.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kaddressbook\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 19:59+0100\n"
 "PO-Revision-Date: 2004-01-07 21:14+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
@@ -19,48 +19,13 @@ msgstr ""
 "X-Generator: KBabel 1.2\n"
 "\n"
 
-#: customfieldswidget.h:159
-#, fuzzy
-msgid "Custom Fields"
-msgstr "Cwsmer"
-
-#: kaddressbook_options.h:33
-msgid "Shows contact editor with given email address"
-msgstr "Dangos golygydd cysylltiadau efo'r cyfeiriad ebost penodol"
-
-#: kaddressbook_options.h:34
-msgid "Shows contact editor with given uid"
-msgstr "Dangos golygydd cysylltiadau efo'r uid penodol"
-
-#: kaddressbook_options.h:35
-msgid "Launches in editor only mode"
-msgstr "Cychwyn mewn modd golygydd yn unig"
-
-#: kaddressbook_options.h:36
-msgid "Launches editor for the new contact"
-msgstr "Cychwyn golygydd ar gyfer y cyswllt newydd"
-
-#: kaddressbook_options.h:37
-msgid "Work on given file"
-msgstr ""
-
-#: kaddressbook_options.h:38
-msgid "Import the given vCard"
-msgstr "Mewnforio y vCerdyn penodol"
-
-#: typecombo.h:94
-msgid ""
-"_: label (number)\n"
-"%1 (%2)"
-msgstr "%1 (%2)"
-
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "KGyfieithu - Meddalwedd Gymraeg"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -132,6 +97,12 @@ msgstr "Hwn yw'r hoff gyfeiriad"
 msgid "New..."
 msgstr "Newydd..."
 
+#: addresseditwidget.cpp:340 emaileditwidget.cpp:202 kabcore.cpp:1255
+#: keywidget.cpp:56 phoneeditwidget.cpp:182
+#, fuzzy
+msgid "Remove"
+msgstr "Gwaredu Rhestr"
+
 #: addresseditwidget.cpp:343
 msgid "Change Type..."
 msgstr "Newid Math..."
@@ -1169,6 +1140,32 @@ msgstr "Enw'r golwg:"
 msgid "View Type"
 msgstr "Math yr Olwg"
 
+#: common/kabprefs.cpp:61
+msgid "Business"
+msgstr "Busnes"
+
+#: common/kabprefs.cpp:61
+msgid "Family"
+msgstr "Teulu"
+
+#: common/kabprefs.cpp:61
+msgid "School"
+msgstr "Ysgol"
+
+#: common/kabprefs.cpp:62
+msgid "Customer"
+msgstr "Cwsmer"
+
+#: common/kabprefs.cpp:62
+msgid "Friend"
+msgstr "Cyfaill"
+
+#: common/locationmap.cpp:77
+msgid ""
+"No service provider available for map lookup!\n"
+"Please add one in the configuration dialog."
+msgstr ""
+
 #: customfieldswidget.cpp:46
 #, fuzzy
 msgid "Add Field"
@@ -1235,6 +1232,11 @@ msgstr "Ychwanegu Golwg..."
 msgid "Remove Field..."
 msgstr "Ailenwi Rhestr..."
 
+#: customfieldswidget.h:159
+#, fuzzy
+msgid "Custom Fields"
+msgstr "Cwsmer"
+
 #: distributionlisteditor.cpp:165
 #, fuzzy
 msgid "Edit Distribution List"
@@ -1272,10 +1274,7 @@ msgstr ""
 #: distributionlistentryview.cpp:109
 msgid ""
 "_: Formatted name, role, organization\n"
-"<qt>"
-"<h2>%1</h2>"
-"<p>%2"
-"<br/>%3</p></qt>"
+"<qt><h2>%1</h2><p>%2<br/>%3</p></qt>"
 msgstr ""
 
 #: distributionlistentryview.cpp:112
@@ -1300,14 +1299,78 @@ msgstr "Rhestr Ddosbarthu Newydd"
 
 #: distributionlistpicker.cpp:115
 msgid ""
-"A distribution list with the the name %1 already exists. Please choose another "
-"name"
+"A distribution list with the the name %1 already exists. Please choose "
+"another name"
 msgstr ""
 
 #: distributionlistpicker.cpp:115
 msgid "Name Exists"
 msgstr ""
 
+#: editors/cryptowidget.cpp:63
+#, fuzzy
+msgid "Crypto Settings"
+msgstr "Gosodiadau Wynebfath"
+
+#: editors/cryptowidget.cpp:79
+msgid "Allowed Protocols"
+msgstr ""
+
+#: editors/cryptowidget.cpp:92
+msgid "Preferred OpenPGP encryption key:"
+msgstr ""
+
+#: editors/cryptowidget.cpp:98
+msgid "Preferred S/MIME encryption certificate:"
+msgstr ""
+
+#: editors/cryptowidget.cpp:104
+#, fuzzy
+msgid "Message Preference"
+msgstr "Defnyddio'r Dewisol"
+
+#: editors/cryptowidget.cpp:111
+msgid "Sign:"
+msgstr "Llofnodi :"
+
+#: editors/cryptowidget.cpp:121
+msgid "Encrypt:"
+msgstr "Cêl-ysgrifo :"
+
+#: editors/imeditorwidget.cpp:87
+msgid ""
+"_: <nickname> on <server>\n"
+"%1 on %2"
+msgstr ""
+
+#: editors/imeditorwidget.cpp:144
+msgid "Edit Instant Messenging Address"
+msgstr ""
+
+#: editors/imeditorwidget.cpp:334
+msgid ""
+"_: Instant messaging\n"
+"Add Address"
+msgstr ""
+
+#: editors/imaddressbase.ui:24 editors/imeditorwidget.cpp:371
+#, no-c-format
+msgid ""
+"_: Instant messaging\n"
+"Edit Address"
+msgstr ""
+
+#: editors/imeditorwidget.cpp:425
+#, fuzzy, c-format
+msgid ""
+"_n: Do you really want to delete the selected address?\n"
+"Do you really want to delete the %n selected addresses?"
+msgstr "<qt>Ydych chi wir am waredu'r allwedd <b>%1</b>?</qt>"
+
+#: editors/imeditorwidget.cpp:426 viewmanager.cpp:311
+msgid "Confirm Delete"
+msgstr "Cadarnhau Dileu"
+
 #: emaileditwidget.cpp:95 emaileditwidget.cpp:281 simpleaddresseeeditor.cpp:78
 msgid "Email:"
 msgstr "Ebost:"
@@ -1351,12 +1414,220 @@ msgstr "Ebost"
 msgid ""
 "<qt>Are you sure that you want to remove the email address <b>%1</b>?</qt>"
 msgstr ""
-"<qt>Ydych chi'n siŵr eich bod eisiau gwaredu'r cyfeiriad ebost <b>%1</b>?</qt>"
+"<qt>Ydych chi'n siŵr eich bod eisiau gwaredu'r cyfeiriad ebost <b>%1</b>?</"
+"qt>"
 
 #: emaileditwidget.cpp:306
 msgid "Confirm Remove"
 msgstr "Cadarnhau Gwaredu"
 
+#: emaileditwidget.cpp:308 keywidget.cpp:157 viewmanager.cpp:313
+#, fuzzy
+msgid "&Delete"
+msgstr "Cadarnhau Dileu"
+
+#: features/distributionlistngwidget.cpp:110
+#, fuzzy
+msgid "Distribution List Editor NG"
+msgstr "Golygydd Rhestri Dosbarthu"
+
+#: features/distributionlistngwidget.cpp:127
+#, fuzzy
+msgid "Distribution Lists"
+msgstr "Rhestr Ddosbarthu"
+
+#: features/distributionlistngwidget.cpp:133
+#, fuzzy
+msgid "Add distribution list"
+msgstr "Rhestr Ddosbarthu"
+
+#: features/distributionlistngwidget.cpp:139
+#, fuzzy
+msgid "Edit distribution list"
+msgstr "Rhestr Ddosbarthu"
+
+#: features/distributionlistngwidget.cpp:145
+#, fuzzy
+msgid "Remove distribution list"
+msgstr "Rhestr Ddosbarthu Newydd"
+
+#: features/distributionlistngwidget.cpp:174
+#, fuzzy
+msgid "New Distribution List..."
+msgstr "Rhestr Ddosbarthu Newydd"
+
+#: features/distributionlistngwidget.cpp:175
+#: features/distributionlistngwidget.cpp:236
+#, fuzzy
+msgid "All Contacts"
+msgstr "&Pob cyswllt"
+
+#: features/distributionlistngwidget.cpp:178
+#: features/distributionlistwidget.cpp:347
+#, fuzzy
+msgid "Delete"
+msgstr "Dileu Golwg"
+
+#: features/distributionlistwidget.cpp:121
+msgid "Yes"
+msgstr ""
+
+#: features/distributionlistwidget.cpp:124
+#, fuzzy
+msgid "No"
+msgstr "Dim un"
+
+#: features/distributionlistwidget.cpp:163
+msgid "New List..."
+msgstr "Rhestr Newydd..."
+
+#: features/distributionlistwidget.cpp:167
+msgid "Rename List..."
+msgstr "Ailenwi Rhestr..."
+
+#: features/distributionlistwidget.cpp:171
+msgid "Remove List"
+msgstr "Gwaredu Rhestr"
+
+#: features/distributionlistwidget.cpp:176 ldapsearchdialog.cpp:171
+#: ldapsearchdialog.cpp:362
+msgid "Name"
+msgstr "Enw"
+
+#: features/distributionlistwidget.cpp:177 ldapsearchdialog.cpp:83
+#: ldapsearchdialog.cpp:172 ldapsearchdialog.cpp:294 ldapsearchdialog.cpp:367
+msgid "Email"
+msgstr "Ebost"
+
+#: features/distributionlistwidget.cpp:178
+msgid "Use Preferred"
+msgstr "Defnyddio'r Dewisol"
+
+#: features/distributionlistwidget.cpp:188
+msgid "Add Contact"
+msgstr "Ychwanegu Cyswllt"
+
+#: features/distributionlistwidget.cpp:196
+msgid "Change Email..."
+msgstr "Newid Ebost..."
+
+#: features/distributionlistwidget.cpp:200
+msgid "Remove Contact"
+msgstr "Gwaredu Cyswllt"
+
+#: features/distributionlistwidget.cpp:266 kabcore.cpp:717
+msgid "New Distribution List"
+msgstr "Rhestr Ddosbarthu Newydd"
+
+#: features/distributionlistwidget.cpp:267
+#: features/distributionlistwidget.cpp:307
+msgid "Please enter name:"
+msgstr "Rhowch enw:"
+
+#: features/distributionlistwidget.cpp:273
+msgid "The name already exists"
+msgstr "Mae'r enw mewn bod yn barod"
+
+#: features/distributionlistwidget.cpp:306
+#, fuzzy
+msgid "Rename Distribution List"
+msgstr "Rhestr Ddosbarthu Newydd"
+
+#: features/distributionlistwidget.cpp:313
+msgid "The name already exists."
+msgstr "Mae'r enw mewn bod yn barod."
+
+#: features/distributionlistwidget.cpp:346
+msgid "<qt>Delete distribution list <b>%1</b>?</qt>"
+msgstr "<qt>Dileu rhestr ddosbarthu<b>%1</b>?</qt>"
+
+#: features/distributionlistwidget.cpp:508
+#, fuzzy, c-format
+msgid ""
+"_n: Count: %n contact\n"
+"Count: %n contacts"
+msgstr ""
+"Canfuwyd un cyswllt:\n"
+"Canfuwyd %n o gysylltau:"
+
+#: features/distributionlistwidget.cpp:568
+msgid "Distribution List Editor"
+msgstr "Golygydd Rhestri Dosbarthu"
+
+#: features/distributionlistwidget.cpp:626
+msgid "Select Email Address"
+msgstr "Dewiswch Gyfeiriad Ebost"
+
+#: features/distributionlistwidget.cpp:632
+msgid "Email Addresses"
+msgstr "Cyfeiriadau Ebost"
+
+#: features/distributionlistwidget.cpp:637
+msgid "Preferred address"
+msgstr "Cyfeiriad Dewisiedig"
+
+#: features/resourceselection.cpp:172
+msgid "Re&load"
+msgstr ""
+
+#: features/resourceselection.cpp:175
+msgid "&Save"
+msgstr ""
+
+#: features/resourceselection.cpp:182 filtereditdialog.cpp:270
+msgid "&Edit..."
+msgstr "&Golygu..."
+
+#: features/resourceselection.cpp:183 features/resourceselection.cpp:302
+#: filtereditdialog.cpp:272
+#, fuzzy
+msgid "&Remove"
+msgstr "&Gwaredu Gwesteiwr"
+
+#: features/resourceselection.cpp:187 filtereditdialog.cpp:269
+msgid "&Add..."
+msgstr "&Ychwanegu..."
+
+#: features/resourceselection.cpp:224 features/resourceselection.cpp:494
+#: features/resourceselection.cpp:515
+msgid "Address Books"
+msgstr "Llyfrau Cyfeiriadau"
+
+#: features/resourceselection.cpp:238
+#, fuzzy
+msgid "Add Address Book"
+msgstr "LlyfrCyfeiriadau"
+
+#: features/resourceselection.cpp:239
+#, fuzzy
+msgid "Please select type of the new address book:"
+msgstr "Argraffu'r llyfr cyfeiriadau yn gyfan "
+
+#: features/resourceselection.cpp:249
+#, fuzzy
+msgid "<qt>Unable to create an address book of type <b>%1</b>.</qt>"
+msgstr "<qt>Methu cyrchu <b>%1</b>.</qt>"
+
+#: features/resourceselection.cpp:300
+#, fuzzy
+msgid "<qt>Do you really want to remove the address book <b>%1</b>?</qt>"
+msgstr "<qt>Ydych chi wir am waredu'r allwedd <b>%1</b>?</qt>"
+
+#: features/resourceselection.cpp:500
+#, fuzzy
+msgid "Add addressbook"
+msgstr "LlyfrCyfeiriadau"
+
+#: features/resourceselection.cpp:505
+#, fuzzy
+msgid "Edit addressbook settings"
+msgstr "Golygu Hidlenni y Llyfrau Cyfeiriadau"
+
+#: features/resourceselection.cpp:510
+#, fuzzy
+msgid "Remove addressbook"
+msgstr "LlyfrCyfeiriadau"
+
 #: filtereditdialog.cpp:49
 msgid "Edit Address Book Filter"
 msgstr "Golygu Hidlen y Llyfr Cyfeiriadau"
@@ -1377,14 +1648,6 @@ msgstr "Dangos y cysylltiadau sydd ddim yn cydweddu â'r categorïau a ddewiswyd
 msgid "Edit Address Book Filters"
 msgstr "Golygu Hidlenni y Llyfrau Cyfeiriadau"
 
-#: features/resourceselection.cpp:187 filtereditdialog.cpp:269
-msgid "&Add..."
-msgstr "&Ychwanegu..."
-
-#: features/resourceselection.cpp:182 filtereditdialog.cpp:270
-msgid "&Edit..."
-msgstr "&Golygu..."
-
 #: filterselectionwidget.cpp:37
 msgid "Filter:"
 msgstr "Hidlen:"
@@ -1464,15 +1727,13 @@ msgstr "Chwiliad:"
 
 #: incsearchwidget.cpp:59
 msgid ""
-"The incremental search"
-"<p>Enter some text here will start the search for the contact, which matches "
-"the search pattern best. The part of the contact, which will be used for "
-"matching, depends on the field selection."
+"The incremental search<p>Enter some text here will start the search for the "
+"contact, which matches the search pattern best. The part of the contact, "
+"which will be used for matching, depends on the field selection."
 msgstr ""
-"Y chwiliad cynyddol"
-"<p>Rhowch destun yma i ddechrau'r chwiliad am y cyswllt sy'n cydweddu orau â'r "
-"patrwm chwiliad. Mae pa ran o'r cyswllt a ddefnyddir i gydweddu, yn ddibynnol "
-"ar y dewisiad meysydd."
+"Y chwiliad cynyddol<p>Rhowch destun yma i ddechrau'r chwiliad am y cyswllt "
+"sy'n cydweddu orau â'r patrwm chwiliad. Mae pa ran o'r cyswllt a ddefnyddir "
+"i gydweddu, yn ddibynnol ar y dewisiad meysydd."
 
 #: incsearchwidget.cpp:63
 msgid ""
@@ -1599,8 +1860,8 @@ msgstr "<qt>Ydych chi wir am waredu'r allwedd <b>%1</b>?</qt>"
 #, c-format
 msgid ""
 "_n: <qt>Do you really want to delete this contact from your addressbook?"
-"<br><b>Note:</b>The contact will be also removed from all distribution "
-"lists.</qt>\n"
+"<br><b>Note:</b>The contact will be also removed from all distribution lists."
+"</qt>\n"
 "<qt>Do you really want to delete these %n contacts from your addressbook?"
 "<br><b>Note:</b>The contacts will be also removed from all distribution "
 "lists.</qt>"
@@ -1614,8 +1875,8 @@ msgstr "Dewiswch un cyswllt yn unig os gwelwch yn dda."
 msgid ""
 "<qt>Do you really want to use <b>%1</b> as your new personal contact?</qt>"
 msgstr ""
-"<qt>A ydych wir eisiau defnyddio <b>%1</b> fel eich cyswllt personol "
-"newydd?</qt>"
+"<qt>A ydych wir eisiau defnyddio <b>%1</b> fel eich cyswllt personol newydd?"
+"</qt>"
 
 #: kabcore.cpp:643
 msgid "Use"
@@ -1625,10 +1886,6 @@ msgstr "Defnydd"
 msgid "Do Not Use"
 msgstr ""
 
-#: features/distributionlistwidget.cpp:266 kabcore.cpp:717
-msgid "New Distribution List"
-msgstr "Rhestr Ddosbarthu Newydd"
-
 #: kabcore.cpp:723
 #, fuzzy
 msgid "New Distribution List (%1)"
@@ -1647,11 +1904,11 @@ msgstr "<qt>Methu cyrchu <b>%1</b>.</qt>"
 #: kabcore.cpp:1021
 #, fuzzy
 msgid ""
-"Your TDE installation is missing LDAP support, please ask your administrator or "
-"distributor for more information."
+"Your TDE installation is missing LDAP support, please ask your administrator "
+"or distributor for more information."
 msgstr ""
-"Mae eich gosodiad TDE yn colli cynhaliaeth LDAP - gofynnwch i'ch gweinyddwr neu "
-"ddosbarthwr am fwy o wybodaeth!"
+"Mae eich gosodiad TDE yn colli cynhaliaeth LDAP - gofynnwch i'ch gweinyddwr "
+"neu ddosbarthwr am fwy o wybodaeth!"
 
 #: kabcore.cpp:1023
 msgid "No LDAP IO Slave Available"
@@ -1670,6 +1927,11 @@ msgstr "Argraffu Cyfeiriadau"
 msgid "Contacts"
 msgstr "Cyswllt"
 
+#: kabcore.cpp:1241 phoneeditwidget.cpp:178
+#, fuzzy
+msgid "Add"
+msgstr "&Ychwanegu..."
+
 #: kabcore.cpp:1242
 #, fuzzy
 msgid "Add contacts to the distribution list"
@@ -1677,9 +1939,9 @@ msgstr "Rhestr Ddosbarthu"
 
 #: kabcore.cpp:1244
 msgid ""
-"Click this button if you want to add more contacts to the current distribution "
-"list. You will be shown a dialog that allows to enter a list of existing "
-"contacts to this distribution list."
+"Click this button if you want to add more contacts to the current "
+"distribution list. You will be shown a dialog that allows to enter a list of "
+"existing contacts to this distribution list."
 msgstr ""
 
 #: kabcore.cpp:1256
@@ -1689,8 +1951,8 @@ msgstr "Rhestr Ddosbarthu Newydd"
 
 #: kabcore.cpp:1258
 msgid ""
-"Click this button if you want to remove the selected contacts from the current "
-"distribution list."
+"Click this button if you want to remove the selected contacts from the "
+"current distribution list."
 msgstr ""
 
 #: kabcore.cpp:1320
@@ -1717,13 +1979,11 @@ msgstr "&Cyswllt Newydd..."
 #: kabcore.cpp:1332
 #, fuzzy
 msgid ""
-"Create a new contact"
-"<p>You will be presented with a dialog where you can add all data about a "
-"person, including addresses and phone numbers."
+"Create a new contact<p>You will be presented with a dialog where you can add "
+"all data about a person, including addresses and phone numbers."
 msgstr ""
-"Creu cyswllt newydd"
-"<p>Cyflwynir ymgom i chi lle y gallwch ychwanegu holl ddata ar gyfer person, yn "
-"cynnwys cyfeiriadau a rhifau ffôn."
+"Creu cyswllt newydd<p>Cyflwynir ymgom i chi lle y gallwch ychwanegu holl "
+"ddata ar gyfer person, yn cynnwys cyfeiriadau a rhifau ffôn."
 
 #: kabcore.cpp:1334
 #, fuzzy
@@ -1733,12 +1993,11 @@ msgstr "Rhestr Ddosbarthu Newydd"
 #: kabcore.cpp:1336
 #, fuzzy
 msgid ""
-"Create a new distribution list"
-"<p>You will be presented with a dialog where you can create a new distribution "
-"list."
+"Create a new distribution list<p>You will be presented with a dialog where "
+"you can create a new distribution list."
 msgstr ""
-"Golygu'r hidlennu cysylltau"
-"<p>Ymddengys ymgom, lle gallwch ychwanegu, waredu, a golygu hidlenni."
+"Golygu'r hidlennu cysylltau<p>Ymddengys ymgom, lle gallwch ychwanegu, "
+"waredu, a golygu hidlenni."
 
 #: kabcore.cpp:1338
 msgid "Send &Contact..."
@@ -1764,13 +2023,11 @@ msgstr "&Golygu Cyswllt..."
 #: kabcore.cpp:1351
 #, fuzzy
 msgid ""
-"Edit a contact"
-"<p>You will be presented with a dialog where you can change all data about a "
-"person, including addresses and phone numbers."
+"Edit a contact<p>You will be presented with a dialog where you can change "
+"all data about a person, including addresses and phone numbers."
 msgstr ""
-"Golygu cyswllt"
-"<p>Cyflwynir ymgom i chi lle y gallwch newid data ar gyfer person, yn cynnwys "
-"cyfeiriadau a rhifau ffôn."
+"Golygu cyswllt<p>Cyflwynir ymgom i chi lle y gallwch newid data ar gyfer "
+"person, yn cynnwys cyfeiriadau a rhifau ffôn."
 
 #: kabcore.cpp:1353
 #, fuzzy
@@ -1813,12 +2070,11 @@ msgstr "&Cyswllt Newydd..."
 #: kabcore.cpp:1378
 #, fuzzy
 msgid ""
-"Store a contact in a different Addressbook"
-"<p>You will be presented with a dialog where you can select a new storage place "
-"for this contact."
+"Store a contact in a different Addressbook<p>You will be presented with a "
+"dialog where you can select a new storage place for this contact."
 msgstr ""
-"Golygu'r hidlennu cysylltau"
-"<p>Ymddengys ymgom, lle gallwch ychwanegu, waredu, a golygu hidlenni."
+"Golygu'r hidlennu cysylltau<p>Ymddengys ymgom, lle gallwch ychwanegu, "
+"waredu, a golygu hidlenni."
 
 #: kabcore.cpp:1381
 #, fuzzy
@@ -1861,8 +2117,8 @@ msgid ""
 "You will be presented with a dialog, that offers you all possibilities to "
 "configure KAddressBook."
 msgstr ""
-"Cyflwynir ymgom i chi a fydd yn eich galluogi i ffurfweddu KLlyfrCyfeiriadau yn "
-"yr holl ffyrdd posib."
+"Cyflwynir ymgom i chi a fydd yn eich galluogi i ffurfweddu KLlyfrCyfeiriadau "
+"yn yr holl ffyrdd posib."
 
 #: kabcore.cpp:1409
 msgid "&Lookup Addresses in LDAP Directory..."
@@ -1870,13 +2126,13 @@ msgstr "&Chwilio am Gyfeiriad yn y Cyfeiriadur LDAP..."
 
 #: kabcore.cpp:1411
 msgid ""
-"Search for contacts on a LDAP server"
-"<p>You will be presented with a dialog, where you can search for contacts and "
-"select the ones you want to add to your local address book."
+"Search for contacts on a LDAP server<p>You will be presented with a dialog, "
+"where you can search for contacts and select the ones you want to add to "
+"your local address book."
 msgstr ""
-"Chwilio am gysylltiadau ar weinydd LDAP"
-"<p>Cyflwynir ymgom i ch lle gallwch chwilio am gysylltau a dewis y rhai yr "
-"ydych eisiau eu hychwanegu i'ch llyfr cyfeiriadau lleol."
+"Chwilio am gysylltiadau ar weinydd LDAP<p>Cyflwynir ymgom i ch lle gallwch "
+"chwilio am gysylltau a dewis y rhai yr ydych eisiau eu hychwanegu i'ch llyfr "
+"cyfeiriadau lleol."
 
 #: kabcore.cpp:1413
 msgid "Set as Personal Contact Data"
@@ -1885,13 +2141,13 @@ msgstr ""
 #: kabcore.cpp:1416
 #, fuzzy
 msgid ""
-"Set the personal contact"
-"<p>The data of this contact will be used in many other TDE applications, so you "
-"do not have to input your personal data several times."
+"Set the personal contact<p>The data of this contact will be used in many "
+"other TDE applications, so you do not have to input your personal data "
+"several times."
 msgstr ""
-"Gosod y cyswllt personol"
-"<p>Bydd data y cyswllt yn cael ei ddefnyddio mewn amryw o raglenni TDE, fel nad "
-"oes rhaid mewnosod eich manylion personol fwy nag unwaith."
+"Gosod y cyswllt personol<p>Bydd data y cyswllt yn cael ei ddefnyddio mewn "
+"amryw o raglenni TDE, fel nad oes rhaid mewnosod eich manylion personol fwy "
+"nag unwaith."
 
 #: kabcore.cpp:1421
 msgid "Set the categories for all selected contacts."
@@ -1929,13 +2185,11 @@ msgstr ""
 #: kabcore.cpp:1632
 msgid ""
 "_n: <qt>Do you really want to remove this contact from the %1 distribution "
-"list?"
-"<br><b>Note:</b>The contact will be not be removed from your addressbook nor "
-"from any other distribution list.</qt>\n"
+"list?<br><b>Note:</b>The contact will be not be removed from your "
+"addressbook nor from any other distribution list.</qt>\n"
 "<qt>Do you really want to remove these %n contacts from the %1 distribution "
-"list?"
-"<br><b>Note:</b>The contacts will be not be removed from your addressbook nor "
-"from any other distribution list.</qt>"
+"list?<br><b>Note:</b>The contacts will be not be removed from your "
+"addressbook nor from any other distribution list.</qt>"
 msgstr ""
 
 #: kabcore.cpp:1732
@@ -1943,6 +2197,30 @@ msgstr ""
 msgid "Distribution List: %1"
 msgstr "Rhestr Ddosbarthu"
 
+#: kaddressbook_options.h:33
+msgid "Shows contact editor with given email address"
+msgstr "Dangos golygydd cysylltiadau efo'r cyfeiriad ebost penodol"
+
+#: kaddressbook_options.h:34
+msgid "Shows contact editor with given uid"
+msgstr "Dangos golygydd cysylltiadau efo'r uid penodol"
+
+#: kaddressbook_options.h:35
+msgid "Launches in editor only mode"
+msgstr "Cychwyn mewn modd golygydd yn unig"
+
+#: kaddressbook_options.h:36
+msgid "Launches editor for the new contact"
+msgstr "Cychwyn golygydd ar gyfer y cyswllt newydd"
+
+#: kaddressbook_options.h:37
+msgid "Work on given file"
+msgstr ""
+
+#: kaddressbook_options.h:38
+msgid "Import the given vCard"
+msgstr "Mewnforio y vCerdyn penodol"
+
 #: kaddressbookmain.cpp:44
 msgid "Address Book Browser"
 msgstr "Porydd Llyfrau Cyfeiriadau"
@@ -1952,8 +2230,8 @@ msgid ""
 "You will be presented with a dialog, where you can configure the application "
 "wide shortcuts."
 msgstr ""
-"Cyflwynir ymgom i chi  a fydd yn eich galluogi i ffurfweddu byrlwybrau eang y "
-"rhaglen."
+"Cyflwynir ymgom i chi  a fydd yn eich galluogi i ffurfweddu byrlwybrau eang "
+"y rhaglen."
 
 #: keywidget.cpp:47
 msgid "Keys:"
@@ -1987,11 +2265,6 @@ msgstr "Teitl"
 msgid "Full Name"
 msgstr "Enw Llawn"
 
-#: features/distributionlistwidget.cpp:177 ldapsearchdialog.cpp:83
-#: ldapsearchdialog.cpp:172 ldapsearchdialog.cpp:294 ldapsearchdialog.cpp:367
-msgid "Email"
-msgstr "Ebost"
-
 #: ldapsearchdialog.cpp:84 ldapsearchdialog.cpp:173 ldapsearchdialog.cpp:295
 #: ldapsearchdialog.cpp:369
 msgid "Home Number"
@@ -2069,10 +2342,9 @@ msgid ""
 "in"
 msgstr "in"
 
-#: features/distributionlistwidget.cpp:176 ldapsearchdialog.cpp:171
-#: ldapsearchdialog.cpp:362
-msgid "Name"
-msgstr "Enw"
+#: ldapsearchdialog.cpp:178 ldapsearchdialog.cpp:388
+msgid "Stop"
+msgstr ""
 
 #: ldapsearchdialog.cpp:180 ldapsearchdialog.cpp:427
 msgid "&Search"
@@ -2090,6 +2362,11 @@ msgstr "Cynhwysa"
 msgid "Starts With"
 msgstr ""
 
+#: ldapsearchdialog.cpp:206
+#, fuzzy
+msgid "Select All"
+msgstr "Dewis Pope&th"
+
 #: ldapsearchdialog.cpp:207
 msgid "Unselect All"
 msgstr "Datddewis Popeth"
@@ -2259,279 +2536,220 @@ msgstr "Hwn yw'r hoff rif ffôn "
 msgid "Types"
 msgstr "Mathau"
 
-#. i18n: file kaddressbook_part.rc line 6
-#: rc.cpp:6 rc.cpp:36
-#, fuzzy, no-c-format
-msgid "New"
-msgstr "Newydd..."
-
-#. i18n: file kaddressbook_part.rc line 12
-#: rc.cpp:9 rc.cpp:39
+#: printing/detailledstyle.cpp:80 printing/ds_appearance.ui:66
 #, no-c-format
-msgid "&Import"
-msgstr "&Mewnforio"
+msgid "Detailed Print Style - Appearance"
+msgstr "Arddull Manwl Argraffu - Ymddanosiad"
 
-#. i18n: file kaddressbook_part.rc line 14
-#: rc.cpp:12 rc.cpp:42
-#, no-c-format
-msgid "&Export"
-msgstr "&Allforio"
+#: printing/detailledstyle.cpp:129
+msgid "Setting up fonts and colors"
+msgstr "Gosod wynebfathau a lliwiau"
 
-#. i18n: file kaddressbook_part.rc line 55
-#: rc.cpp:21
-#, no-c-format
-msgid "Tools"
-msgstr "Offer"
+#: printing/detailledstyle.cpp:212
+msgid "Setting up margins and spacing"
+msgstr "Gosod ymylon a bylchu"
 
-#. i18n: file kaddressbook_part.rc line 101
-#: rc.cpp:30 rc.cpp:60
-#, no-c-format
-msgid "Contact Toolbar"
-msgstr "Bar Offer Cysylltiadau"
+#: printing/detailledstyle.cpp:231 printing/mikesstyle.cpp:77
+msgid "Printing"
+msgstr "Argraffu"
 
-#. i18n: file editors/imaddressbase.ui line 24
-#: editors/imeditorwidget.cpp:371 rc.cpp:63
-#, no-c-format
-msgid ""
-"_: Instant messaging\n"
-"Edit Address"
-msgstr ""
+#: printing/detailledstyle.cpp:236 printing/mikesstyle.cpp:105
+msgid "Done"
+msgstr "Wedi Gorffen"
 
-#. i18n: file editors/imaddressbase.ui line 40
-#: rc.cpp:66
-#, no-c-format
-msgid ""
-"_: Instant messaging\n"
-"&Protocol:"
-msgstr ""
+#: printing/detailledstyle.cpp:288
+msgid "Detailed Style"
+msgstr "Arddull Manwl"
 
-#. i18n: file editors/imaddressbase.ui line 56
-#: rc.cpp:69
-#, no-c-format
-msgid ""
-"_: Instant messaging\n"
-"&Address:"
-msgstr ""
+#: printing/kabentrypainter.cpp:251
+msgid "Email address:"
+msgstr "Cyfeiriad Ebost:"
 
-#. i18n: file editors/imaddressbase.ui line 67
-#: rc.cpp:72
-#, no-c-format
-msgid ""
-"_: Instant messaging\n"
-"&Network:"
-msgstr ""
+#: printing/kabentrypainter.cpp:252
+msgid "Email addresses:"
+msgstr "Cyfeiriadau ebost:"
 
-#. i18n: file editors/imeditorbase.ui line 24
-#: rc.cpp:75
-#, no-c-format
-msgid ""
-"_: Instant messaging\n"
-"IM Addresses"
-msgstr ""
+#: printing/kabentrypainter.cpp:264
+msgid "Telephone:"
+msgstr "Ffôn:"
 
-#. i18n: file editors/imeditorbase.ui line 52
-#: rc.cpp:78
-#, no-c-format
-msgid ""
-"_: Instant messaging\n"
-"&Set Standard"
-msgstr ""
+#: printing/kabentrypainter.cpp:265
+msgid "Telephones:"
+msgstr "Ffônau:"
 
-#. i18n: file editors/imeditorbase.ui line 55
-#: rc.cpp:81
-#, no-c-format
-msgid ""
-"_: Instant messaging\n"
-"The IM Address that is set as the standard is the address that is shown in main "
-"editor window."
-msgstr ""
+#: printing/kabentrypainter.cpp:282
+msgid "Web page:"
+msgstr "Tudalen wê:"
 
-#. i18n: file editors/imeditorbase.ui line 58
-#: rc.cpp:84
-#, no-c-format
-msgid ""
-"_: Instant messaging\n"
-"<qt>Only one IM Address can be set as the standard IM Address."
-"<br>The standard IM Address is shown in the main editor window, and other "
-"programs may use this as hint for deciding which IM Address to show.</qt>"
-msgstr ""
+#: printing/kabentrypainter.cpp:363 printing/kabentrypainter.cpp:367
+msgid "Address:"
+msgstr "Cyfeiriad:"
 
-#. i18n: file editors/imeditorbase.ui line 66
-#: rc.cpp:87
-#, no-c-format
-msgid ""
-"_: Instant messaging\n"
-"&Remove"
-msgstr ""
+#: printing/kabentrypainter.cpp:364 printing/kabentrypainter.cpp:368
+msgid "Addresses:"
+msgstr "Cyfeiriadau:"
 
-#. i18n: file editors/imeditorbase.ui line 74
-#: rc.cpp:90
-#, no-c-format
-msgid ""
-"_: Instant messaging\n"
-"&Edit..."
-msgstr ""
+#: printing/kabentrypainter.cpp:380
+msgid "Domestic Address"
+msgstr "Cyfeiriad Cartrefol"
 
-#. i18n: file editors/imeditorbase.ui line 82
-#: rc.cpp:93
-#, no-c-format
-msgid ""
-"_: Instant messaging\n"
-"&Add..."
-msgstr ""
+#: printing/kabentrypainter.cpp:383
+msgid "International Address"
+msgstr "Cyfeiriad Rhyngwladol"
 
-#. i18n: file editors/imeditorbase.ui line 88
-#: rc.cpp:96
-#, no-c-format
-msgid ""
-"_: Instant messaging\n"
-"Protocol"
-msgstr ""
+#: printing/kabentrypainter.cpp:389
+msgid "Parcel Address"
+msgstr "Cyfeiriad Parsel"
 
-#. i18n: file editors/imeditorbase.ui line 99
-#: rc.cpp:99
-#, no-c-format
-msgid ""
-"_: Instant messaging\n"
-"Address"
-msgstr ""
+#: printing/kabentrypainter.cpp:392
+msgid "Home Address"
+msgstr "Cyfeiriad Cartref"
 
-#. i18n: file editors/imeditorbase.ui line 148
-#: rc.cpp:102
-#, no-c-format
-msgid ""
-"_: Instant messaging\n"
-"<em>Note:</em> Please read the help page before adding or editing Instant "
-"Messenging Addresses here."
-msgstr ""
+#: printing/kabentrypainter.cpp:395
+msgid "Work Address"
+msgstr "Cyfeiriad Gwaith"
 
-#. i18n: file printing/ds_appearance.ui line 16
-#: rc.cpp:105
-#, no-c-format
-msgid "Appearance Page"
-msgstr "Tudalen Olwg"
+#: printing/kabentrypainter.cpp:399
+msgid "Preferred Address"
+msgstr "Cyfeiriad Dewisedig"
 
-#. i18n: file printing/ds_appearance.ui line 66
-#: printing/detailledstyle.cpp:80 rc.cpp:108
-#, no-c-format
-msgid "Detailed Print Style - Appearance"
-msgstr "Arddull Manwl Argraffu - Ymddanosiad"
+#: printing/kabentrypainter.cpp:473 printing/kabentrypainter.cpp:477
+msgid "(Deliver to:)"
+msgstr "(Gyrru at:)"
 
-#. i18n: file printing/ds_appearance.ui line 88
-#: rc.cpp:111
-#, no-c-format
-msgid "Font Settings"
-msgstr "Gosodiadau Wynebfath"
+#: printing/mikesstyle.cpp:76
+msgid "Preparing"
+msgstr "Paratoi"
 
-#. i18n: file printing/ds_appearance.ui line 105
-#: rc.cpp:114
-#, no-c-format
-msgid "Use standard TDE fonts"
-msgstr "Defnyddio wynebfathau arferol TDE"
+#: printing/mikesstyle.cpp:207
+msgid "Printed on %1 by KAddressBook (http://www.kde.org)"
+msgstr "Argraffwyd ar %1 gan KLlyfrCyfeiriadau (http://www.kde.org)"
 
-#. i18n: file printing/ds_appearance.ui line 139
-#: rc.cpp:117
-#, no-c-format
-msgid "Details font:"
-msgstr "Wynebfath manylion:"
+#: printing/mikesstyle.cpp:259
+msgid "Mike's Printing Style"
+msgstr "Arddull Argraffu Meic"
 
-#. i18n: file printing/ds_appearance.ui line 150
-#: rc.cpp:120 rc.cpp:126 rc.cpp:132 rc.cpp:138 rc.cpp:141
-#, no-c-format
-msgid "Size:"
-msgstr "Maint:"
+#: printing/printingwizard.cpp:63
+msgid "Choose Contacts to Print"
+msgstr "Dewiswch Cysylltiadau i Argraffu"
 
-#. i18n: file printing/ds_appearance.ui line 161
-#: rc.cpp:123
-#, no-c-format
-msgid "Body font:"
-msgstr "Wynebfath corff:"
+#: printing/printingwizard.cpp:79 printing/stylepage.cpp:113
+msgid "Choose Printing Style"
+msgstr "Dewiswch Arddull Argraffu"
 
-#. i18n: file printing/ds_appearance.ui line 183
-#: rc.cpp:129
-#, no-c-format
-msgid "Fixed font:"
-msgstr "Wynebfath gosodedig:"
+#: printing/printingwizard.cpp:154
+msgid "Print Progress"
+msgstr "Cynnydd Argraffu"
 
-#. i18n: file printing/ds_appearance.ui line 246
-#: rc.cpp:135
-#, no-c-format
-msgid "Contact header font:"
-msgstr "Wynebfath pennawd cyswllt:"
+#: printing/printprogress.cpp:40
+msgid "Printing: Progress"
+msgstr "Argraffu: Cynnydd"
 
-#. i18n: file printing/ds_appearance.ui line 302
-#: rc.cpp:144
-#, no-c-format
-msgid "Headlines:"
-msgstr "Penawdau"
+#: printing/printprogress.cpp:63
+msgid "Progress"
+msgstr "Cynnydd"
 
-#. i18n: file printing/ds_appearance.ui line 335
-#: rc.cpp:147
-#, no-c-format
-msgid "Contact Headers"
-msgstr "Penawdau Cyswllt"
+#: printing/selectionpage.cpp:44
+msgid "Choose Which Contacts to Print"
+msgstr "Dewiswch pa Cysylltiadau i Argraffu"
 
-#. i18n: file printing/ds_appearance.ui line 352
-#: rc.cpp:150
-#, no-c-format
-msgid "Use colored contact headers"
-msgstr "Defnyddio penawdau cyswllt lliw"
+#: printing/selectionpage.cpp:49
+msgid "Which contacts do you want to print?"
+msgstr "Pa cysylltiadau rydych eisiau argraffu?"
 
-#. i18n: file printing/ds_appearance.ui line 401
-#: rc.cpp:153
-#, no-c-format
-msgid "Headline background color:"
-msgstr "Lliw cefndir y pennawd"
+#: printing/selectionpage.cpp:61 xxportselectdialog.cpp:196
+msgid "&All contacts"
+msgstr "&Pob cyswllt"
 
-#. i18n: file printing/ds_appearance.ui line 412
-#: rc.cpp:156
-#, no-c-format
-msgid "Headline text color:"
-msgstr "Lliw testun y pennawd"
+#: printing/selectionpage.cpp:63
+msgid "Print the entire address book"
+msgstr "Argraffu'r llyfr cyfeiriadau yn gyfan "
 
-#. i18n: file common/kaddressbook.kcfg line 10
-#: rc.cpp:159
-#, no-c-format
-msgid "Automatic name parsing for new addressees"
-msgstr "Dyrannu enwau ymysgogol ar gyfer cyferiadwyr newydd"
+#: printing/selectionpage.cpp:66
+msgid "&Selected contacts"
+msgstr "Cysylltau &dewisiedig"
 
-#. i18n: file common/kaddressbook.kcfg line 18
-#: rc.cpp:162
-#, no-c-format
-msgid "Phone"
-msgstr "Ffôn"
+#: printing/selectionpage.cpp:67
+msgid ""
+"Only print contacts selected in KAddressBook.\n"
+"This option is disabled if no contacts are selected."
+msgstr ""
+"Argraffu cysylltiadau sydd wedi'w dewis yn KLlyfrCyfeiriadau yn unig.\n"
+" Analluogir y dewisiad yma os nid yw cyswlltiad weid'i ddewis."
 
-#. i18n: file common/kaddressbook.kcfg line 22
-#: rc.cpp:165
-#, no-c-format
-msgid "Fax"
-msgstr "Ffacs"
+#: printing/selectionpage.cpp:71 xxportselectdialog.cpp:205
+msgid "Contacts matching &filter"
+msgstr "Cysylltau sy'n cydweddu â &hidlen"
 
-#. i18n: file common/kaddressbook.kcfg line 27
-#: rc.cpp:168
-#, no-c-format
-msgid "SMS"
-msgstr "SMS"
+#: printing/selectionpage.cpp:72
+#, fuzzy
+msgid ""
+"Only print contacts matching the selected filter.\n"
+"This option is disabled if you have not defined any filters."
+msgstr ""
+"Argraffu cysylltiadau sy'n cydweddu â'r hidlen ddewisiedig yn unig.\n"
+" Analluogir y dewisiad yma os nad ydych wedi diffinio hidlen."
 
-#. i18n: file common/kaddressbook.kcfg line 28
-#: rc.cpp:171
-#, no-c-format
-msgid "The script used to send a GSM SMS text message to the mobile phone"
+#: printing/selectionpage.cpp:76 xxportselectdialog.cpp:210
+msgid "Category &members"
+msgstr "&Aelodau categori"
+
+#: printing/selectionpage.cpp:77
+msgid ""
+"Only print contacts who are members of a category that is checked on the "
+"list to the left.\n"
+"This option is disabled if you have no categories."
 msgstr ""
+"Argraffu cysylltau sy'n aelodau o gategori wedi'i fritho yn y restr ar y "
+"chwith.\n"
+" Mae'r dewisiad yma'n analluog os nad oes gennych gategorïau."
 
-#. i18n: file common/kaddressbook.kcfg line 34
-#: rc.cpp:174
-#, fuzzy, no-c-format
-msgid "Honor KDE single click"
-msgstr "Parchu clic unigol TDE"
+#: printing/selectionpage.cpp:82
+msgid "Select a filter to decide which contacts to print."
+msgstr "Dewiswch hidlen i ddewis ba gysylltau i'w hargraffu."
 
-#. i18n: file common/kaddressbook.kcfg line 59
-#: rc.cpp:177
-#, no-c-format
+#: printing/selectionpage.cpp:88
+msgid "Check the categories whose members you want to print."
+msgstr "Brithwch y categorïau yr hoffech argraffu eu haelodau."
+
+#: printing/stylepage.cpp:44 xxportselectdialog.cpp:80
+msgid "Ascending"
+msgstr "Esgynnol"
+
+#: printing/stylepage.cpp:45 xxportselectdialog.cpp:81
+msgid "Descending"
+msgstr "Disgynnol"
+
+#: printing/stylepage.cpp:57
+msgid "(No preview available.)"
+msgstr "(Dim rhagolwg ar gael.)"
+
+#: printing/stylepage.cpp:118
 msgid ""
-"If true, the contact list will be placed above the extensions on the left "
-"(distribution list editor etc.) instead of in the middle of the main window"
+"What should the print look like?\n"
+"KAddressBook has several printing styles, designed for different purposes.\n"
+"Choose the style that suits your needs below."
 msgstr ""
+"Sut ddylai'r argraff edrych?\n"
+" Mae gan KLlyfrCyfeiriadau sawl arddull argraffu, wedi'u dylunio ar gyfer "
+"bwriadau gwahanol.\n"
+" Dewiswch yr arddull sy'n addas at eich anghenion isod."
+
+#: printing/stylepage.cpp:123 xxportselectdialog.cpp:227
+msgid "Sorting"
+msgstr "Yn Didoli"
+
+#: printing/stylepage.cpp:129 xxportselectdialog.cpp:233
+msgid "Criterion:"
+msgstr "Maen prawf:"
+
+#: printing/stylepage.cpp:135 xxportselectdialog.cpp:239
+msgid "Order:"
+msgstr "Trefn:"
+
+#: printing/stylepage.cpp:143
+msgid "Print Style"
+msgstr "Arddull Argraffu"
 
 #: soundwidget.cpp:54
 msgid "Play"
@@ -2551,6 +2769,21 @@ msgstr ""
 msgid "Save only the URL to the sound file, not the whole object."
 msgstr ""
 
+#: thumbnailcreator/ldifvcardcreator.cpp:104
+#, fuzzy, c-format
+msgid ""
+"_n: One contact found:\n"
+"%n contacts found:"
+msgstr ""
+"Canfuwyd un cyswllt:\n"
+"Canfuwyd %n o gysylltau:"
+
+#: typecombo.h:94
+msgid ""
+"_: label (number)\n"
+"%1 (%2)"
+msgstr "%1 (%2)"
+
 #: undocmds.cpp:58
 #, fuzzy, c-format
 msgid ""
@@ -2616,9 +2849,9 @@ msgstr "Meysydd &dewisiedig:"
 #: viewconfigurefilterpage.cpp:46
 msgid ""
 "The default filter will be activated whenever this view is displayed. This "
-"feature allows you to configure views that only interact with certain types of "
-"information based on the filter. Once the view is activated, the filter can be "
-"changed at anytime."
+"feature allows you to configure views that only interact with certain types "
+"of information based on the filter. Once the view is activated, the filter "
+"can be changed at anytime."
 msgstr ""
 "Gweithredolir yr hidlen ragosod pryd bynnag y dengys yr olwg hon. Galluoga'r "
 "nodwedd hon i chi ffrufweddu golygon sy'n rhyngweithio â mathau penodol o "
@@ -2653,10 +2886,6 @@ msgstr "Addasu Golwg:"
 msgid "<qt>Are you sure that you want to delete the view <b>%1</b>?</qt>"
 msgstr "<qt>A ydych yn sicr eich bod am ddileu'r olwg<b>%1</b>?</qt>"
 
-#: editors/imeditorwidget.cpp:426 viewmanager.cpp:311
-msgid "Confirm Delete"
-msgstr "Cadarnhau Dileu"
-
 #: viewmanager.cpp:429
 #, c-format
 msgid ""
@@ -2672,6 +2901,11 @@ msgstr "Mewnforio Cysylltau?"
 
 #: viewmanager.cpp:430 xxport/kde2_xxport.cpp:58
 #, fuzzy
+msgid "Import"
+msgstr "&Mewnforio"
+
+#: viewmanager.cpp:430 xxport/kde2_xxport.cpp:58
+#, fuzzy
 msgid "Do Not Import"
 msgstr "&Mewnforio"
 
@@ -2696,12 +2930,12 @@ msgstr "Addasu Golwg..."
 #: viewmanager.cpp:579
 msgid ""
 "By pressing this button a dialog opens that allows you to modify the view of "
-"the addressbook. There you can add or remove fields that you want to be shown "
-"or hidden in the addressbook like the name for example."
+"the addressbook. There you can add or remove fields that you want to be "
+"shown or hidden in the addressbook like the name for example."
 msgstr ""
-"Gan wasgu'r botwm yma, agora ymgom sy'n eich galluogi i addasu'r olwg o'r llyfr "
-"cyfeiriadau. Yno gallwch ychwanegu neu waredu meysydd yr ydych am eu dangos "
-"neu'u cuddio yn y llyfr cyfeiriadau, er enghraifft yr enw."
+"Gan wasgu'r botwm yma, agora ymgom sy'n eich galluogi i addasu'r olwg o'r "
+"llyfr cyfeiriadau. Yno gallwch ychwanegu neu waredu meysydd yr ydych am eu "
+"dangos neu'u cuddio yn y llyfr cyfeiriadau, er enghraifft yr enw."
 
 #: viewmanager.cpp:581
 msgid "Add View..."
@@ -2714,9 +2948,9 @@ msgid ""
 "pressing the button. You have to give the view a name, so that you can "
 "distinguish between the different views."
 msgstr ""
-"Gallwch ychwanegu golwg newydd drwy ddewis un o'r ymgomau sy'n ymddanges wedi "
-"gwasgu'r botwm. Rhaid i chi enwi'r olwg, fel y gallwch wahaniaethu rhwng y "
-"gwahanol olygon."
+"Gallwch ychwanegu golwg newydd drwy ddewis un o'r ymgomau sy'n ymddanges "
+"wedi gwasgu'r botwm. Rhaid i chi enwi'r olwg, fel y gallwch wahaniaethu "
+"rhwng y gwahanol olygon."
 
 #: viewmanager.cpp:586
 msgid "Delete View"
@@ -2727,7 +2961,8 @@ msgid ""
 "By pressing this button you can delete the actual view, which you have added "
 "before."
 msgstr ""
-"Drwy wasgu'r botwm yma gallwch ddileu'r olwg ei hun, yr ychwanegoch o'r blaen."
+"Drwy wasgu'r botwm yma gallwch ddileu'r olwg ei hun, yr ychwanegoch o'r "
+"blaen."
 
 #: viewmanager.cpp:591
 msgid "Refresh View"
@@ -2743,526 +2978,11 @@ msgstr "Golygu &Hidlenni..."
 
 #: viewmanager.cpp:599
 msgid ""
-"Edit the contact filters"
-"<p>You will be presented with a dialog, where you can add, remove and edit "
-"filters."
-msgstr ""
-"Golygu'r hidlennu cysylltau"
-"<p>Ymddengys ymgom, lle gallwch ychwanegu, waredu, a golygu hidlenni."
-
-#: xxportmanager.cpp:80
-msgid "<qt>No import plugin available for <b>%1</b>.</qt>"
-msgstr "<qt>Dim ategyn mewnforio ar gael ar gyfer <b>%1</b>.</qt>"
-
-#: xxportmanager.cpp:104
-msgid "<qt>No export plugin available for <b>%1</b>.</qt>"
-msgstr "<qt>Di ategyn allforio ar gael ar gyfer <b>%1</b>.</qt>"
-
-#: xxportmanager.cpp:116
-msgid "Unable to export contacts."
-msgstr "Methu allforio cysylltau."
-
-#: xxportselectdialog.cpp:48
-msgid "Choose Which Contacts to Export"
-msgstr "Dewiswch Pa Gysylltau i'w Hallforio"
-
-#: printing/stylepage.cpp:44 xxportselectdialog.cpp:80
-msgid "Ascending"
-msgstr "Esgynnol"
-
-#: printing/stylepage.cpp:45 xxportselectdialog.cpp:81
-msgid "Descending"
-msgstr "Disgynnol"
-
-#: xxportselectdialog.cpp:185
-msgid "Which contacts do you want to export?"
-msgstr "Pa gysylltau ydych am eu hallforio?"
-
-#: xxportselectdialog.cpp:188
-msgid "Selection"
-msgstr "Dewisiad"
-
-#: printing/selectionpage.cpp:61 xxportselectdialog.cpp:196
-msgid "&All contacts"
-msgstr "&Pob cyswllt"
-
-#: xxportselectdialog.cpp:198
-msgid "Export the entire address book"
-msgstr "Allforio'r llyfr cyfeiriadau cyfan"
-
-#: xxportselectdialog.cpp:200
-#, c-format
-msgid ""
-"_n: &Selected contact\n"
-"&Selected contacts (%n selected)"
+"Edit the contact filters<p>You will be presented with a dialog, where you "
+"can add, remove and edit filters."
 msgstr ""
-
-#: xxportselectdialog.cpp:201
-msgid ""
-"Only export contacts selected in KAddressBook.\n"
-"This option is disabled if no contacts are selected."
-msgstr ""
-"Allforio'r cysylltau sy'n ddewisiedig yn KLlyfrCyfeiriadau'n unig.\n"
-" Mae'r dewisiad yma'n analluog os nad oes cysylltau wedi'u dewis."
-
-#: printing/selectionpage.cpp:71 xxportselectdialog.cpp:205
-msgid "Contacts matching &filter"
-msgstr "Cysylltau sy'n cydweddu â &hidlen"
-
-#: xxportselectdialog.cpp:206
-#, fuzzy
-msgid ""
-"Only export contacts matching the selected filter.\n"
-"This option is disabled if you have not defined any filters"
-msgstr ""
-"Allforio cysylltau sy'n cydweddu â'r hidlen ddewisiedig yn unig.\n"
-" Mae'r dewisiad yma'n analluog os nad ydych wedi diffinio unrhyw hidlenni."
-
-#: printing/selectionpage.cpp:76 xxportselectdialog.cpp:210
-msgid "Category &members"
-msgstr "&Aelodau categori"
-
-#: xxportselectdialog.cpp:211
-msgid ""
-"Only export contacts who are members of a category that is checked on the list "
-"to the left.\n"
-"This option is disabled if you have no categories."
-msgstr ""
-"Allforio cysylltau sy'n aeolod o gategori sydd wedi'i fritho yn y restr ar y "
-"chwith.\n"
-" Mae'r dewisiad yma'n analluog os nad oes gennych gategorïau."
-
-#: xxportselectdialog.cpp:216
-msgid "Select a filter to decide which contacts to export."
-msgstr "Dewiswch hidlen i ddewis ba gysylltau i'w hallforio."
-
-#: xxportselectdialog.cpp:222
-msgid "Check the categories whose members you want to export."
-msgstr "Gwiriwch y categorïau yr ydych am allforio eu haelodau."
-
-#: printing/stylepage.cpp:123 xxportselectdialog.cpp:227
-msgid "Sorting"
-msgstr "Yn Didoli"
-
-#: printing/stylepage.cpp:129 xxportselectdialog.cpp:233
-msgid "Criterion:"
-msgstr "Maen prawf:"
-
-#: printing/stylepage.cpp:135 xxportselectdialog.cpp:239
-msgid "Order:"
-msgstr "Trefn:"
-
-#: common/kabprefs.cpp:61
-msgid "Business"
-msgstr "Busnes"
-
-#: common/kabprefs.cpp:61
-msgid "Family"
-msgstr "Teulu"
-
-#: common/kabprefs.cpp:61
-msgid "School"
-msgstr "Ysgol"
-
-#: common/kabprefs.cpp:62
-msgid "Customer"
-msgstr "Cwsmer"
-
-#: common/kabprefs.cpp:62
-msgid "Friend"
-msgstr "Cyfaill"
-
-#: common/locationmap.cpp:77
-msgid ""
-"No service provider available for map lookup!\n"
-"Please add one in the configuration dialog."
-msgstr ""
-
-#: editors/cryptowidget.cpp:63
-#, fuzzy
-msgid "Crypto Settings"
-msgstr "Gosodiadau Wynebfath"
-
-#: editors/cryptowidget.cpp:79
-msgid "Allowed Protocols"
-msgstr ""
-
-#: editors/cryptowidget.cpp:92
-msgid "Preferred OpenPGP encryption key:"
-msgstr ""
-
-#: editors/cryptowidget.cpp:98
-msgid "Preferred S/MIME encryption certificate:"
-msgstr ""
-
-#: editors/cryptowidget.cpp:104
-#, fuzzy
-msgid "Message Preference"
-msgstr "Defnyddio'r Dewisol"
-
-#: editors/cryptowidget.cpp:111
-msgid "Sign:"
-msgstr "Llofnodi :"
-
-#: editors/cryptowidget.cpp:121
-msgid "Encrypt:"
-msgstr "Cêl-ysgrifo :"
-
-#: editors/imeditorwidget.cpp:87
-msgid ""
-"_: <nickname> on <server>\n"
-"%1 on %2"
-msgstr ""
-
-#: editors/imeditorwidget.cpp:144
-msgid "Edit Instant Messenging Address"
-msgstr ""
-
-#: editors/imeditorwidget.cpp:334
-msgid ""
-"_: Instant messaging\n"
-"Add Address"
-msgstr ""
-
-#: editors/imeditorwidget.cpp:425
-#, fuzzy, c-format
-msgid ""
-"_n: Do you really want to delete the selected address?\n"
-"Do you really want to delete the %n selected addresses?"
-msgstr "<qt>Ydych chi wir am waredu'r allwedd <b>%1</b>?</qt>"
-
-#: features/distributionlistngwidget.cpp:110
-#, fuzzy
-msgid "Distribution List Editor NG"
-msgstr "Golygydd Rhestri Dosbarthu"
-
-#: features/distributionlistngwidget.cpp:127
-#, fuzzy
-msgid "Distribution Lists"
-msgstr "Rhestr Ddosbarthu"
-
-#: features/distributionlistngwidget.cpp:133
-#, fuzzy
-msgid "Add distribution list"
-msgstr "Rhestr Ddosbarthu"
-
-#: features/distributionlistngwidget.cpp:139
-#, fuzzy
-msgid "Edit distribution list"
-msgstr "Rhestr Ddosbarthu"
-
-#: features/distributionlistngwidget.cpp:145
-#, fuzzy
-msgid "Remove distribution list"
-msgstr "Rhestr Ddosbarthu Newydd"
-
-#: features/distributionlistngwidget.cpp:174
-#, fuzzy
-msgid "New Distribution List..."
-msgstr "Rhestr Ddosbarthu Newydd"
-
-#: features/distributionlistngwidget.cpp:175
-#: features/distributionlistngwidget.cpp:236
-#, fuzzy
-msgid "All Contacts"
-msgstr "&Pob cyswllt"
-
-#: features/distributionlistwidget.cpp:163
-msgid "New List..."
-msgstr "Rhestr Newydd..."
-
-#: features/distributionlistwidget.cpp:167
-msgid "Rename List..."
-msgstr "Ailenwi Rhestr..."
-
-#: features/distributionlistwidget.cpp:171
-msgid "Remove List"
-msgstr "Gwaredu Rhestr"
-
-#: features/distributionlistwidget.cpp:178
-msgid "Use Preferred"
-msgstr "Defnyddio'r Dewisol"
-
-#: features/distributionlistwidget.cpp:188
-msgid "Add Contact"
-msgstr "Ychwanegu Cyswllt"
-
-#: features/distributionlistwidget.cpp:196
-msgid "Change Email..."
-msgstr "Newid Ebost..."
-
-#: features/distributionlistwidget.cpp:200
-msgid "Remove Contact"
-msgstr "Gwaredu Cyswllt"
-
-#: features/distributionlistwidget.cpp:267
-#: features/distributionlistwidget.cpp:307
-msgid "Please enter name:"
-msgstr "Rhowch enw:"
-
-#: features/distributionlistwidget.cpp:273
-msgid "The name already exists"
-msgstr "Mae'r enw mewn bod yn barod"
-
-#: features/distributionlistwidget.cpp:306
-#, fuzzy
-msgid "Rename Distribution List"
-msgstr "Rhestr Ddosbarthu Newydd"
-
-#: features/distributionlistwidget.cpp:313
-msgid "The name already exists."
-msgstr "Mae'r enw mewn bod yn barod."
-
-#: features/distributionlistwidget.cpp:346
-msgid "<qt>Delete distribution list <b>%1</b>?</qt>"
-msgstr "<qt>Dileu rhestr ddosbarthu<b>%1</b>?</qt>"
-
-#: features/distributionlistwidget.cpp:508
-#, fuzzy, c-format
-msgid ""
-"_n: Count: %n contact\n"
-"Count: %n contacts"
-msgstr ""
-"Canfuwyd un cyswllt:\n"
-"Canfuwyd %n o gysylltau:"
-
-#: features/distributionlistwidget.cpp:568
-msgid "Distribution List Editor"
-msgstr "Golygydd Rhestri Dosbarthu"
-
-#: features/distributionlistwidget.cpp:626
-msgid "Select Email Address"
-msgstr "Dewiswch Gyfeiriad Ebost"
-
-#: features/distributionlistwidget.cpp:632
-msgid "Email Addresses"
-msgstr "Cyfeiriadau Ebost"
-
-#: features/distributionlistwidget.cpp:637
-msgid "Preferred address"
-msgstr "Cyfeiriad Dewisiedig"
-
-#: features/resourceselection.cpp:172
-msgid "Re&load"
-msgstr ""
-
-#: features/resourceselection.cpp:224 features/resourceselection.cpp:494
-#: features/resourceselection.cpp:515
-msgid "Address Books"
-msgstr "Llyfrau Cyfeiriadau"
-
-#: features/resourceselection.cpp:238
-#, fuzzy
-msgid "Add Address Book"
-msgstr "LlyfrCyfeiriadau"
-
-#: features/resourceselection.cpp:239
-#, fuzzy
-msgid "Please select type of the new address book:"
-msgstr "Argraffu'r llyfr cyfeiriadau yn gyfan "
-
-#: features/resourceselection.cpp:249
-#, fuzzy
-msgid "<qt>Unable to create an address book of type <b>%1</b>.</qt>"
-msgstr "<qt>Methu cyrchu <b>%1</b>.</qt>"
-
-#: features/resourceselection.cpp:300
-#, fuzzy
-msgid "<qt>Do you really want to remove the address book <b>%1</b>?</qt>"
-msgstr "<qt>Ydych chi wir am waredu'r allwedd <b>%1</b>?</qt>"
-
-#: features/resourceselection.cpp:500
-#, fuzzy
-msgid "Add addressbook"
-msgstr "LlyfrCyfeiriadau"
-
-#: features/resourceselection.cpp:505
-#, fuzzy
-msgid "Edit addressbook settings"
-msgstr "Golygu Hidlenni y Llyfrau Cyfeiriadau"
-
-#: features/resourceselection.cpp:510
-#, fuzzy
-msgid "Remove addressbook"
-msgstr "LlyfrCyfeiriadau"
-
-#: printing/detailledstyle.cpp:129
-msgid "Setting up fonts and colors"
-msgstr "Gosod wynebfathau a lliwiau"
-
-#: printing/detailledstyle.cpp:212
-msgid "Setting up margins and spacing"
-msgstr "Gosod ymylon a bylchu"
-
-#: printing/detailledstyle.cpp:231 printing/mikesstyle.cpp:77
-msgid "Printing"
-msgstr "Argraffu"
-
-#: printing/detailledstyle.cpp:236 printing/mikesstyle.cpp:105
-msgid "Done"
-msgstr "Wedi Gorffen"
-
-#: printing/detailledstyle.cpp:288
-msgid "Detailed Style"
-msgstr "Arddull Manwl"
-
-#: printing/kabentrypainter.cpp:251
-msgid "Email address:"
-msgstr "Cyfeiriad Ebost:"
-
-#: printing/kabentrypainter.cpp:252
-msgid "Email addresses:"
-msgstr "Cyfeiriadau ebost:"
-
-#: printing/kabentrypainter.cpp:264
-msgid "Telephone:"
-msgstr "Ffôn:"
-
-#: printing/kabentrypainter.cpp:265
-msgid "Telephones:"
-msgstr "Ffônau:"
-
-#: printing/kabentrypainter.cpp:282
-msgid "Web page:"
-msgstr "Tudalen wê:"
-
-#: printing/kabentrypainter.cpp:363 printing/kabentrypainter.cpp:367
-msgid "Address:"
-msgstr "Cyfeiriad:"
-
-#: printing/kabentrypainter.cpp:364 printing/kabentrypainter.cpp:368
-msgid "Addresses:"
-msgstr "Cyfeiriadau:"
-
-#: printing/kabentrypainter.cpp:380
-msgid "Domestic Address"
-msgstr "Cyfeiriad Cartrefol"
-
-#: printing/kabentrypainter.cpp:383
-msgid "International Address"
-msgstr "Cyfeiriad Rhyngwladol"
-
-#: printing/kabentrypainter.cpp:389
-msgid "Parcel Address"
-msgstr "Cyfeiriad Parsel"
-
-#: printing/kabentrypainter.cpp:392
-msgid "Home Address"
-msgstr "Cyfeiriad Cartref"
-
-#: printing/kabentrypainter.cpp:395
-msgid "Work Address"
-msgstr "Cyfeiriad Gwaith"
-
-#: printing/kabentrypainter.cpp:399
-msgid "Preferred Address"
-msgstr "Cyfeiriad Dewisedig"
-
-#: printing/kabentrypainter.cpp:473 printing/kabentrypainter.cpp:477
-msgid "(Deliver to:)"
-msgstr "(Gyrru at:)"
-
-#: printing/mikesstyle.cpp:76
-msgid "Preparing"
-msgstr "Paratoi"
-
-#: printing/mikesstyle.cpp:207
-msgid "Printed on %1 by KAddressBook (http://www.kde.org)"
-msgstr "Argraffwyd ar %1 gan KLlyfrCyfeiriadau (http://www.kde.org)"
-
-#: printing/mikesstyle.cpp:259
-msgid "Mike's Printing Style"
-msgstr "Arddull Argraffu Meic"
-
-#: printing/printingwizard.cpp:63
-msgid "Choose Contacts to Print"
-msgstr "Dewiswch Cysylltiadau i Argraffu"
-
-#: printing/printingwizard.cpp:79 printing/stylepage.cpp:113
-msgid "Choose Printing Style"
-msgstr "Dewiswch Arddull Argraffu"
-
-#: printing/printingwizard.cpp:154
-msgid "Print Progress"
-msgstr "Cynnydd Argraffu"
-
-#: printing/printprogress.cpp:40
-msgid "Printing: Progress"
-msgstr "Argraffu: Cynnydd"
-
-#: printing/printprogress.cpp:63
-msgid "Progress"
-msgstr "Cynnydd"
-
-#: printing/selectionpage.cpp:44
-msgid "Choose Which Contacts to Print"
-msgstr "Dewiswch pa Cysylltiadau i Argraffu"
-
-#: printing/selectionpage.cpp:49
-msgid "Which contacts do you want to print?"
-msgstr "Pa cysylltiadau rydych eisiau argraffu?"
-
-#: printing/selectionpage.cpp:63
-msgid "Print the entire address book"
-msgstr "Argraffu'r llyfr cyfeiriadau yn gyfan "
-
-#: printing/selectionpage.cpp:66
-msgid "&Selected contacts"
-msgstr "Cysylltau &dewisiedig"
-
-#: printing/selectionpage.cpp:67
-msgid ""
-"Only print contacts selected in KAddressBook.\n"
-"This option is disabled if no contacts are selected."
-msgstr ""
-"Argraffu cysylltiadau sydd wedi'w dewis yn KLlyfrCyfeiriadau yn unig.\n"
-" Analluogir y dewisiad yma os nid yw cyswlltiad weid'i ddewis."
-
-#: printing/selectionpage.cpp:72
-#, fuzzy
-msgid ""
-"Only print contacts matching the selected filter.\n"
-"This option is disabled if you have not defined any filters."
-msgstr ""
-"Argraffu cysylltiadau sy'n cydweddu â'r hidlen ddewisiedig yn unig.\n"
-" Analluogir y dewisiad yma os nad ydych wedi diffinio hidlen."
-
-#: printing/selectionpage.cpp:77
-msgid ""
-"Only print contacts who are members of a category that is checked on the list "
-"to the left.\n"
-"This option is disabled if you have no categories."
-msgstr ""
-"Argraffu cysylltau sy'n aelodau o gategori wedi'i fritho yn y restr ar y "
-"chwith.\n"
-" Mae'r dewisiad yma'n analluog os nad oes gennych gategorïau."
-
-#: printing/selectionpage.cpp:82
-msgid "Select a filter to decide which contacts to print."
-msgstr "Dewiswch hidlen i ddewis ba gysylltau i'w hargraffu."
-
-#: printing/selectionpage.cpp:88
-msgid "Check the categories whose members you want to print."
-msgstr "Brithwch y categorïau yr hoffech argraffu eu haelodau."
-
-#: printing/stylepage.cpp:57
-msgid "(No preview available.)"
-msgstr "(Dim rhagolwg ar gael.)"
-
-#: printing/stylepage.cpp:118
-msgid ""
-"What should the print look like?\n"
-"KAddressBook has several printing styles, designed for different purposes.\n"
-"Choose the style that suits your needs below."
-msgstr ""
-"Sut ddylai'r argraff edrych?\n"
-" Mae gan KLlyfrCyfeiriadau sawl arddull argraffu, wedi'u dylunio ar gyfer "
-"bwriadau gwahanol.\n"
-" Dewiswch yr arddull sy'n addas at eich anghenion isod."
-
-#: printing/stylepage.cpp:143
-msgid "Print Style"
-msgstr "Arddull Argraffu"
+"Golygu'r hidlennu cysylltau<p>Ymddengys ymgom, lle gallwch ychwanegu, "
+"waredu, a golygu hidlenni."
 
 #: views/configurecardviewdialog.cpp:54 views/configuretableviewdialog.cpp:48
 msgid "Look & Feel"
@@ -3322,21 +3042,21 @@ msgstr "Darlunio &ymylon"
 
 #: views/configurecardviewdialog.cpp:230
 msgid ""
-"The item margin is the distance (in pixels) between the item edge and the item "
-"data. Most noticeably, incrementing the item margin will add space between the "
-"focus rectangle and the item data."
+"The item margin is the distance (in pixels) between the item edge and the "
+"item data. Most noticeably, incrementing the item margin will add space "
+"between the focus rectangle and the item data."
 msgstr ""
-"Ymyl yr eitem yw'r pellter (mewn picseli) rhwng ochr allanol yr eitem a data'r "
-"eitem. Yn fwyaf amlwg, bydd ehangu ymyl yr eitem yn ychwanegu gofod rhwng y "
-"petryal canolbwynt â data'r eitem."
+"Ymyl yr eitem yw'r pellter (mewn picseli) rhwng ochr allanol yr eitem a "
+"data'r eitem. Yn fwyaf amlwg, bydd ehangu ymyl yr eitem yn ychwanegu gofod "
+"rhwng y petryal canolbwynt â data'r eitem."
 
 #: views/configurecardviewdialog.cpp:235
 msgid ""
 "The item spacing decides the distance (in pixels) between the items and "
 "anything else: the view borders, other items or column separators."
 msgstr ""
-"Mae gofodu'r eitem yn penderfynnnu'r pellter (mewn picseli) rhwng yr eitemau ac "
-"unrhywbeth arall: ymylon yr olwg, eitemau eraill, neu wahanyddion colofn."
+"Mae gofodu'r eitem yn penderfynnnu'r pellter (mewn picseli) rhwng yr eitemau "
+"ac unrhywbeth arall: ymylon yr olwg, eitemau eraill, neu wahanyddion colofn."
 
 #: views/configurecardviewdialog.cpp:239
 msgid "Sets the width of column separators"
@@ -3368,8 +3088,8 @@ msgid ""
 "Double click or press RETURN on a item to select a color for the related "
 "strings in the view."
 msgstr ""
-"Cliciwch yn ddwbl, neu gwasgwch y DYCHWELYD ar eitem i ddewis lliw ar gyfer y "
-"llinynnau perthnasol yn yr olwg."
+"Cliciwch yn ddwbl, neu gwasgwch y DYCHWELYD ar eitem i ddewis lliw ar gyfer "
+"y llinynnau perthnasol yn yr olwg."
 
 #: views/configurecardviewdialog.cpp:267
 msgid "&Enable custom fonts"
@@ -3398,6 +3118,10 @@ msgstr ""
 "ragosod, mewn arddull bras ar gyfer y pennawd, ac arddull arferol ar gyfer y "
 "data."
 
+#: views/configurecardviewdialog.cpp:297
+msgid "&Fonts"
+msgstr ""
+
 #: views/configurecardviewdialog.cpp:304
 msgid "Show &empty fields"
 msgstr "Dangos meysydd &gwag"
@@ -3444,8 +3168,7 @@ msgstr " %1: %2"
 msgid ""
 "_: label: value\n"
 "%1: \n"
-msgstr ""
-" %1:\n"
+msgstr " %1:\n"
 
 #: views/kaddressbookcardview.cpp:51
 msgid "Card"
@@ -3469,8 +3192,8 @@ msgstr "Tabl"
 
 #: views/kaddressbooktableview.cpp:71
 msgid ""
-"A listing of contacts in a table. Each cell of the table holds a field of the "
-"contact."
+"A listing of contacts in a table. Each cell of the table holds a field of "
+"the contact."
 msgstr ""
 "Rhestr cysylltau mewn tabl. Pob cell yn y tabl yn dal maes o'r cyswllt."
 
@@ -3563,21 +3286,13 @@ msgstr "'"
 
 #: xxport/csvimportdialog.cpp:424
 msgid ""
-"<ul>"
-"<li>y: year with 2 digits</li>"
-"<li>Y: year with 4 digits</li>"
-"<li>m: month with 1 or 2 digits</li>"
-"<li>M: month with 2 digits</li>"
-"<li>d: day with 1 or 2 digits</li>"
-"<li>D: day with 2 digits</li></ul>"
-msgstr ""
-"<ul>"
-"<li>y: blwyddyn efo 2 digid</li>"
-"<li>Y: blwyddyn efo 4 digid</li>"
-"<li>m: mis efo 1 or 2 digid</li>"
-"<li>M: mis efo 2 digid</li>"
-"<li>d: dydd efo 1 neu 2 digid</li>"
-"<li>D: dydd efo 2 digid</li></ul>"
+"<ul><li>y: year with 2 digits</li><li>Y: year with 4 digits</li><li>m: month "
+"with 1 or 2 digits</li><li>M: month with 2 digits</li><li>d: day with 1 or 2 "
+"digits</li><li>D: day with 2 digits</li></ul>"
+msgstr ""
+"<ul><li>y: blwyddyn efo 2 digid</li><li>Y: blwyddyn efo 4 digid</li><li>m: "
+"mis efo 1 or 2 digid</li><li>M: mis efo 2 digid</li><li>d: dydd efo 1 neu 2 "
+"digid</li><li>D: dydd efo 2 digid</li></ul>"
 
 #: xxport/csvimportdialog.cpp:432
 msgid "Start at line:"
@@ -3681,15 +3396,10 @@ msgstr ""
 
 #: xxport/gnokii_xxport.cpp:140 xxport/gnokii_xxport.cpp:849
 msgid ""
-"<qt>"
-"<center>Mobile Phone interface initialization failed."
-"<br>"
-"<br>The returned error message was:"
-"<br><b>%1</b>"
-"<br>"
-"<br>You might try to run \"gnokii --identify\" on the command line to check any "
-"cable/transport issues and to verify if your gnokii configuration is "
-"correct.</center></qt>"
+"<qt><center>Mobile Phone interface initialization failed.<br><br>The "
+"returned error message was:<br><b>%1</b><br><br>You might try to run "
+"\"gnokii --identify\" on the command line to check any cable/transport "
+"issues and to verify if your gnokii configuration is correct.</center></qt>"
 msgstr ""
 
 #: xxport/gnokii_xxport.cpp:179 xxport/gnokii_xxport.cpp:949
@@ -3725,19 +3435,17 @@ msgstr ""
 
 #: xxport/gnokii_xxport.cpp:211 xxport/gnokii_xxport.cpp:991
 msgid ""
-"<qt>Importing <b>%1</b> contacts from <b>%2</b> of the Mobile Phone."
-"<br>"
-"<br>%3</qt>"
+"<qt>Importing <b>%1</b> contacts from <b>%2</b> of the Mobile Phone.<br><br>"
+"%3</qt>"
 msgstr ""
 
 #: xxport/gnokii_xxport.cpp:532 xxport/gnokii_xxport.cpp:1323
 msgid ""
-"<qt>Please connect your Mobile Phone to your computer and press <b>Continue</b> "
-"to start importing the personal contacts."
-"<br>"
-"<br>Please note that if your Mobile Phone is not properly connected the "
-"following detection phase might take up to two minutes, during which "
-"KAddressbook will behave unresponsively.</qt>"
+"<qt>Please connect your Mobile Phone to your computer and press <b>Continue</"
+"b> to start importing the personal contacts.<br><br>Please note that if your "
+"Mobile Phone is not properly connected the following detection phase might "
+"take up to two minutes, during which KAddressbook will behave unresponsively."
+"</qt>"
 msgstr ""
 
 #: xxport/gnokii_xxport.cpp:540 xxport/gnokii_xxport.cpp:1331
@@ -3748,10 +3456,8 @@ msgstr "Ffeil i'w mewnforio:"
 #: xxport/gnokii_xxport.cpp:541 xxport/gnokii_xxport.cpp:588
 #: xxport/gnokii_xxport.cpp:1332 xxport/gnokii_xxport.cpp:1379
 msgid ""
-"<qt>"
-"<center>Establishing connection to the Mobile Phone."
-"<br>"
-"<br>Please wait...</center></qt>"
+"<qt><center>Establishing connection to the Mobile Phone.<br><br>Please "
+"wait...</center></qt>"
 msgstr ""
 
 #: xxport/gnokii_xxport.cpp:562 xxport/gnokii_xxport.cpp:1353
@@ -3761,12 +3467,11 @@ msgstr "&Mewnforio"
 
 #: xxport/gnokii_xxport.cpp:579 xxport/gnokii_xxport.cpp:1370
 msgid ""
-"<qt>Please connect your Mobile Phone to your computer and press <b>Continue</b> "
-"to start exporting the selected personal contacts."
-"<br>"
-"<br>Please note that if your Mobile Phone is not properly connected the "
-"following detection phase might take up to two minutes, during which "
-"KAddressbook will behave unresponsively.</qt>"
+"<qt>Please connect your Mobile Phone to your computer and press <b>Continue</"
+"b> to start exporting the selected personal contacts.<br><br>Please note "
+"that if your Mobile Phone is not properly connected the following detection "
+"phase might take up to two minutes, during which KAddressbook will behave "
+"unresponsively.</qt>"
 msgstr ""
 
 #: xxport/gnokii_xxport.cpp:587 xxport/gnokii_xxport.cpp:769
@@ -3776,13 +3481,11 @@ msgstr ""
 
 #: xxport/gnokii_xxport.cpp:641 xxport/gnokii_xxport.cpp:1432
 msgid ""
-"<qt>Do you want the selected contacts to be <b>appended</b> "
-"to the current mobile phonebook or should they <b>replace</b> "
-"all currently existing phonebook entries ?"
-"<br>"
-"<br>Please note, that in case you choose to replace the phonebook entries, "
-"every contact in your phone will be deleted and only the newly exported "
-"contacts will be available from inside your phone.</qt>"
+"<qt>Do you want the selected contacts to be <b>appended</b> to the current "
+"mobile phonebook or should they <b>replace</b> all currently existing "
+"phonebook entries ?<br><br>Please note, that in case you choose to replace "
+"the phonebook entries, every contact in your phone will be deleted and only "
+"the newly exported contacts will be available from inside your phone.</qt>"
 msgstr ""
 
 #: xxport/gnokii_xxport.cpp:647 xxport/gnokii_xxport.cpp:1438
@@ -3806,17 +3509,14 @@ msgstr "&Allforio"
 #: xxport/gnokii_xxport.cpp:657 xxport/gnokii_xxport.cpp:1448
 msgid ""
 "<qt>Exporting <b>%1</b> contacts to the <b>%2</b> of the Mobile Phone."
-"<br>"
-"<br>%3</qt>"
+"<br><br>%3</qt>"
 msgstr ""
 
 #: xxport/gnokii_xxport.cpp:724 xxport/gnokii_xxport.cpp:1515
 msgid ""
-"<qt>"
-"<center>All selected contacts have been sucessfully copied to the Mobile Phone."
-"<br>"
-"<br>Please wait until all remaining orphaned contacts from the Mobile Phone "
-"have been deleted.</center></qt>"
+"<qt><center>All selected contacts have been sucessfully copied to the Mobile "
+"Phone.<br><br>Please wait until all remaining orphaned contacts from the "
+"Mobile Phone have been deleted.</center></qt>"
 msgstr ""
 
 #: xxport/gnokii_xxport.cpp:729 xxport/gnokii_xxport.cpp:1520
@@ -3831,17 +3531,13 @@ msgstr "Allforio i ffôn symudol"
 
 #: xxport/gnokii_xxport.cpp:760 xxport/gnokii_xxport.cpp:1551
 msgid ""
-"<qt>The following contacts could not be exported to the Mobile Phone. Possible "
-"Reasons for this problem could be:"
-"<br>"
-"<ul>"
-"<li>The contacts contain more information per entry than the phone can "
-"store.</li>"
-"<li>Your phone does not allow to store multiple addresses, emails, homepages, "
-"...</li>"
-"<li>other storage size related problems.</li></ul>To avoid those kind of "
-"problems in the future please reduce the amount of different fields in the "
-"above contacts.</qt>"
+"<qt>The following contacts could not be exported to the Mobile Phone. "
+"Possible Reasons for this problem could be:<br><ul><li>The contacts contain "
+"more information per entry than the phone can store.</li><li>Your phone does "
+"not allow to store multiple addresses, emails, homepages, ...</li><li>other "
+"storage size related problems.</li></ul>To avoid those kind of problems in "
+"the future please reduce the amount of different fields in the above "
+"contacts.</qt>"
 msgstr ""
 
 #: xxport/gnokii_xxport.cpp:823
@@ -3957,7 +3653,8 @@ msgstr "Allforio vCerdyn 3.0..."
 
 #: xxport/vcard_xxport.cpp:131
 msgid ""
-"You have selected a list of contacts, shall they be exported to several files?"
+"You have selected a list of contacts, shall they be exported to several "
+"files?"
 msgstr ""
 "Rydych wedi dewis rhestr o gysylltau.  Ydych am eu hallforio i sawl ffeil?"
 
@@ -4039,6 +3736,340 @@ msgstr "Meysydd &dewisiedig:"
 msgid "Encryption keys"
 msgstr "Allweddau cêl-ysgrifo"
 
+#: xxportmanager.cpp:80
+msgid "<qt>No import plugin available for <b>%1</b>.</qt>"
+msgstr "<qt>Dim ategyn mewnforio ar gael ar gyfer <b>%1</b>.</qt>"
+
+#: xxportmanager.cpp:104
+msgid "<qt>No export plugin available for <b>%1</b>.</qt>"
+msgstr "<qt>Di ategyn allforio ar gael ar gyfer <b>%1</b>.</qt>"
+
+#: xxportmanager.cpp:116
+msgid "Unable to export contacts."
+msgstr "Methu allforio cysylltau."
+
+#: xxportselectdialog.cpp:48
+msgid "Choose Which Contacts to Export"
+msgstr "Dewiswch Pa Gysylltau i'w Hallforio"
+
+#: xxportselectdialog.cpp:185
+msgid "Which contacts do you want to export?"
+msgstr "Pa gysylltau ydych am eu hallforio?"
+
+#: xxportselectdialog.cpp:188
+msgid "Selection"
+msgstr "Dewisiad"
+
+#: xxportselectdialog.cpp:198
+msgid "Export the entire address book"
+msgstr "Allforio'r llyfr cyfeiriadau cyfan"
+
+#: xxportselectdialog.cpp:200
+#, c-format
+msgid ""
+"_n: &Selected contact\n"
+"&Selected contacts (%n selected)"
+msgstr ""
+
+#: xxportselectdialog.cpp:201
+msgid ""
+"Only export contacts selected in KAddressBook.\n"
+"This option is disabled if no contacts are selected."
+msgstr ""
+"Allforio'r cysylltau sy'n ddewisiedig yn KLlyfrCyfeiriadau'n unig.\n"
+" Mae'r dewisiad yma'n analluog os nad oes cysylltau wedi'u dewis."
+
+#: xxportselectdialog.cpp:206
+#, fuzzy
+msgid ""
+"Only export contacts matching the selected filter.\n"
+"This option is disabled if you have not defined any filters"
+msgstr ""
+"Allforio cysylltau sy'n cydweddu â'r hidlen ddewisiedig yn unig.\n"
+" Mae'r dewisiad yma'n analluog os nad ydych wedi diffinio unrhyw hidlenni."
+
+#: xxportselectdialog.cpp:211
+msgid ""
+"Only export contacts who are members of a category that is checked on the "
+"list to the left.\n"
+"This option is disabled if you have no categories."
+msgstr ""
+"Allforio cysylltau sy'n aeolod o gategori sydd wedi'i fritho yn y restr ar y "
+"chwith.\n"
+" Mae'r dewisiad yma'n analluog os nad oes gennych gategorïau."
+
+#: xxportselectdialog.cpp:216
+msgid "Select a filter to decide which contacts to export."
+msgstr "Dewiswch hidlen i ddewis ba gysylltau i'w hallforio."
+
+#: xxportselectdialog.cpp:222
+msgid "Check the categories whose members you want to export."
+msgstr "Gwiriwch y categorïau yr ydych am allforio eu haelodau."
+
+#: editors/imaddressbase.ui:40
+#, no-c-format
+msgid ""
+"_: Instant messaging\n"
+"&Protocol:"
+msgstr ""
+
+#: editors/imaddressbase.ui:56
+#, no-c-format
+msgid ""
+"_: Instant messaging\n"
+"&Address:"
+msgstr ""
+
+#: editors/imaddressbase.ui:67
+#, no-c-format
+msgid ""
+"_: Instant messaging\n"
+"&Network:"
+msgstr ""
+
+#: editors/imeditorbase.ui:24
+#, no-c-format
+msgid ""
+"_: Instant messaging\n"
+"IM Addresses"
+msgstr ""
+
+#: editors/imeditorbase.ui:52
+#, no-c-format
+msgid ""
+"_: Instant messaging\n"
+"&Set Standard"
+msgstr ""
+
+#: editors/imeditorbase.ui:55
+#, no-c-format
+msgid ""
+"_: Instant messaging\n"
+"The IM Address that is set as the standard is the address that is shown in "
+"main editor window."
+msgstr ""
+
+#: editors/imeditorbase.ui:58
+#, no-c-format
+msgid ""
+"_: Instant messaging\n"
+"<qt>Only one IM Address can be set as the standard IM Address.<br>The "
+"standard IM Address is shown in the main editor window, and other programs "
+"may use this as hint for deciding which IM Address to show.</qt>"
+msgstr ""
+
+#: editors/imeditorbase.ui:66
+#, no-c-format
+msgid ""
+"_: Instant messaging\n"
+"&Remove"
+msgstr ""
+
+#: editors/imeditorbase.ui:74
+#, no-c-format
+msgid ""
+"_: Instant messaging\n"
+"&Edit..."
+msgstr ""
+
+#: editors/imeditorbase.ui:82
+#, no-c-format
+msgid ""
+"_: Instant messaging\n"
+"&Add..."
+msgstr ""
+
+#: editors/imeditorbase.ui:88
+#, no-c-format
+msgid ""
+"_: Instant messaging\n"
+"Protocol"
+msgstr ""
+
+#: editors/imeditorbase.ui:99
+#, no-c-format
+msgid ""
+"_: Instant messaging\n"
+"Address"
+msgstr ""
+
+#: editors/imeditorbase.ui:148
+#, no-c-format
+msgid ""
+"_: Instant messaging\n"
+"<em>Note:</em> Please read the help page before adding or editing Instant "
+"Messenging Addresses here."
+msgstr ""
+
+#: common/kaddressbook.kcfg:10
+#, no-c-format
+msgid "Automatic name parsing for new addressees"
+msgstr "Dyrannu enwau ymysgogol ar gyfer cyferiadwyr newydd"
+
+#: common/kaddressbook.kcfg:18
+#, no-c-format
+msgid "Phone"
+msgstr "Ffôn"
+
+#: common/kaddressbook.kcfg:22
+#, no-c-format
+msgid "Fax"
+msgstr "Ffacs"
+
+#: common/kaddressbook.kcfg:27
+#, no-c-format
+msgid "SMS"
+msgstr "SMS"
+
+#: common/kaddressbook.kcfg:28
+#, no-c-format
+msgid "The script used to send a GSM SMS text message to the mobile phone"
+msgstr ""
+
+#: common/kaddressbook.kcfg:34
+#, fuzzy, no-c-format
+msgid "Honor KDE single click"
+msgstr "Parchu clic unigol TDE"
+
+#: common/kaddressbook.kcfg:59
+#, no-c-format
+msgid ""
+"If true, the contact list will be placed above the extensions on the left "
+"(distribution list editor etc.) instead of in the middle of the main window"
+msgstr ""
+
+#: kaddressbook_part.rc:5 kaddressbookui.rc:5 xxport/bookmark_xxportui.rc:5
+#: xxport/csv_xxportui.rc:5 xxport/eudora_xxportui.rc:5
+#: xxport/gnokii_xxportui.rc:5 xxport/kde2_xxportui.rc:5
+#: xxport/ldif_xxportui.rc:5 xxport/opera_xxportui.rc:5
+#: xxport/pab_xxportui.rc:5 xxport/vcard_xxportui.rc:5
+#, no-c-format
+msgid "&File"
+msgstr ""
+
+#: kaddressbook_part.rc:6 kaddressbookui.rc:6
+#, fuzzy, no-c-format
+msgid "New"
+msgstr "Newydd..."
+
+#: kaddressbook_part.rc:12 kaddressbookui.rc:12 xxport/csv_xxportui.rc:6
+#: xxport/eudora_xxportui.rc:6 xxport/gnokii_xxportui.rc:6
+#: xxport/kde2_xxportui.rc:6 xxport/ldif_xxportui.rc:6
+#: xxport/opera_xxportui.rc:6 xxport/pab_xxportui.rc:6
+#: xxport/vcard_xxportui.rc:6
+#, no-c-format
+msgid "&Import"
+msgstr "&Mewnforio"
+
+#: kaddressbook_part.rc:14 kaddressbookui.rc:14 xxport/bookmark_xxportui.rc:6
+#: xxport/csv_xxportui.rc:9 xxport/gnokii_xxportui.rc:9
+#: xxport/ldif_xxportui.rc:9 xxport/vcard_xxportui.rc:9
+#, no-c-format
+msgid "&Export"
+msgstr "&Allforio"
+
+#: kaddressbook_part.rc:25 kaddressbookui.rc:25
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "&Golygu..."
+
+#: kaddressbook_part.rc:44 kaddressbookui.rc:44
+#, fuzzy, no-c-format
+msgid "&View"
+msgstr "Ychwanegu Golwg"
+
+#: kaddressbook_part.rc:55
+#, no-c-format
+msgid "Tools"
+msgstr "Offer"
+
+#: kaddressbook_part.rc:59 kaddressbookui.rc:59
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Gosodiadau Wynebfath"
+
+#: kaddressbook_part.rc:90 kaddressbookui.rc:94
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "Bar Offer Golwg"
+
+#: kaddressbook_part.rc:101 kaddressbookui.rc:105
+#, no-c-format
+msgid "Contact Toolbar"
+msgstr "Bar Offer Cysylltiadau"
+
+#: kaddressbookui.rc:55
+#, fuzzy, no-c-format
+msgid "&Tools"
+msgstr "Offer"
+
+#: printing/ds_appearance.ui:16
+#, no-c-format
+msgid "Appearance Page"
+msgstr "Tudalen Olwg"
+
+#: printing/ds_appearance.ui:88
+#, no-c-format
+msgid "Font Settings"
+msgstr "Gosodiadau Wynebfath"
+
+#: printing/ds_appearance.ui:105
+#, no-c-format
+msgid "Use standard TDE fonts"
+msgstr "Defnyddio wynebfathau arferol TDE"
+
+#: printing/ds_appearance.ui:139
+#, no-c-format
+msgid "Details font:"
+msgstr "Wynebfath manylion:"
+
+#: printing/ds_appearance.ui:150 printing/ds_appearance.ui:172
+#: printing/ds_appearance.ui:204 printing/ds_appearance.ui:275
+#: printing/ds_appearance.ui:286
+#, no-c-format
+msgid "Size:"
+msgstr "Maint:"
+
+#: printing/ds_appearance.ui:161
+#, no-c-format
+msgid "Body font:"
+msgstr "Wynebfath corff:"
+
+#: printing/ds_appearance.ui:183
+#, no-c-format
+msgid "Fixed font:"
+msgstr "Wynebfath gosodedig:"
+
+#: printing/ds_appearance.ui:246
+#, no-c-format
+msgid "Contact header font:"
+msgstr "Wynebfath pennawd cyswllt:"
+
+#: printing/ds_appearance.ui:302
+#, no-c-format
+msgid "Headlines:"
+msgstr "Penawdau"
+
+#: printing/ds_appearance.ui:335
+#, no-c-format
+msgid "Contact Headers"
+msgstr "Penawdau Cyswllt"
+
+#: printing/ds_appearance.ui:352
+#, no-c-format
+msgid "Use colored contact headers"
+msgstr "Defnyddio penawdau cyswllt lliw"
+
+#: printing/ds_appearance.ui:401
+#, no-c-format
+msgid "Headline background color:"
+msgstr "Lliw cefndir y pennawd"
+
+#: printing/ds_appearance.ui:412
+#, no-c-format
+msgid "Headline text color:"
+msgstr "Lliw testun y pennawd"
+
 #, fuzzy
 #~ msgid ""
 #~ "_n: Do you really want to delete this contact?\n"
@@ -4091,8 +4122,16 @@ msgstr "Allweddau cêl-ysgrifo"
 #~ msgid "Letter Groups"
 #~ msgstr "Casgliadau Llythrennau"
 
-#~ msgid "Here you can group letters together as they are grouped in your time planner. Press 'group letter' to combine the selected letter with the letter group above it, press 'ungroup letter' to remove the last letter from a selected group."
-#~ msgstr "Yma, gallwch gasglu llythrennau fel y maent yn cael eu casglu yn eich cynllunydd amser.  Gwthiwch 'casglu llythyren' i gyfuno'r llythyren ddewisiedig efo'r casgliad llythrennau o'i flaen, a gwthiwch 'dad-gasglu llythyren' i waredu'r llythyren ddiwethaf o gasgliad dewisiedig. "
+#~ msgid ""
+#~ "Here you can group letters together as they are grouped in your time "
+#~ "planner. Press 'group letter' to combine the selected letter with the "
+#~ "letter group above it, press 'ungroup letter' to remove the last letter "
+#~ "from a selected group."
+#~ msgstr ""
+#~ "Yma, gallwch gasglu llythrennau fel y maent yn cael eu casglu yn eich "
+#~ "cynllunydd amser.  Gwthiwch 'casglu llythyren' i gyfuno'r llythyren "
+#~ "ddewisiedig efo'r casgliad llythrennau o'i flaen, a gwthiwch 'dad-gasglu "
+#~ "llythyren' i waredu'r llythyren ddiwethaf o gasgliad dewisiedig. "
 
 #~ msgid "Group Letter"
 #~ msgstr "Casglu Llythyren"
@@ -4103,23 +4142,52 @@ msgstr "Allweddau cêl-ysgrifo"
 #~ msgid "Fill pages with empty address fields"
 #~ msgstr "Llenwi tudalennau efo meyseydd cyfeiriad gwag"
 
-#~ msgid "If this option is turned on, behind the contacts on a page the remaining space will be filled with empty fields so you can add contacts manually later"
-#~ msgstr "Os troir y dewisiad yma ymlaen, llenwir y lle gweddill tu ôl cysylltiadau ar dudalen efo meyseydd gwag, i chi allu ychwanegu cysylltiadau â llaw yn nes ymlaen."
+#~ msgid ""
+#~ "If this option is turned on, behind the contacts on a page the remaining "
+#~ "space will be filled with empty fields so you can add contacts manually "
+#~ "later"
+#~ msgstr ""
+#~ "Os troir y dewisiad yma ymlaen, llenwir y lle gweddill tu ôl cysylltiadau "
+#~ "ar dudalen efo meyseydd gwag, i chi allu ychwanegu cysylltiadau â llaw yn "
+#~ "nes ymlaen."
 
 #~ msgid "Always print pages for all tabs"
 #~ msgstr "Argraffu tudalennau ar gyfer bob tab bob amser"
 
-#~ msgid "If this box is checked, at least one page will be printed for every letter group, regardless of whether entries exist for this letter group. This is normally only useful in conjunction with the option 'fill pages with empty address fields'."
-#~ msgstr "Os dewisir y blwch yma, argraffir o leiaf un dudalen ar gyfer pob grŵp llythyren. Dim ond ynghŷd â'r dewisiad 'llenwi tudalennau â meysydd cyfeiriad gwag' mae hwn yn ddefnyddiol fel arfer."
+#~ msgid ""
+#~ "If this box is checked, at least one page will be printed for every "
+#~ "letter group, regardless of whether entries exist for this letter group. "
+#~ "This is normally only useful in conjunction with the option 'fill pages "
+#~ "with empty address fields'."
+#~ msgstr ""
+#~ "Os dewisir y blwch yma, argraffir o leiaf un dudalen ar gyfer pob grŵp "
+#~ "llythyren. Dim ond ynghŷd â'r dewisiad 'llenwi tudalennau â meysydd "
+#~ "cyfeiriad gwag' mae hwn yn ddefnyddiol fel arfer."
 
 #~ msgid "Min. number of empty fields:"
 #~ msgstr "Nifer lleiaf o feysydd gwag:"
 
-#~ msgid "If you often add contacts to your printout manually before entering them into the TDE addressbook, you should set this option to a value greater than 0: it determines how many empty address fields must be printed; if this many do not fit onto the page, another page with empty fields only will be printed."
-#~ msgstr "Os ydych yn aml yn ychwanegu cysylltau i'ch argraff â llaw cyn eu rhoi yn y llyfr cyfeiriadau TDE, dylech osod y dewisiad yma'n werth uwch na 0: mae'n penodi sawl maes cyfeiriad gwag mae rhaid eu hargraffu; os nad yw'r nifer yma'n ffitio ar y dudalen, argraffir tudalen arall â meysydd gwag yn unig."
+#~ msgid ""
+#~ "If you often add contacts to your printout manually before entering them "
+#~ "into the TDE addressbook, you should set this option to a value greater "
+#~ "than 0: it determines how many empty address fields must be printed; if "
+#~ "this many do not fit onto the page, another page with empty fields only "
+#~ "will be printed."
+#~ msgstr ""
+#~ "Os ydych yn aml yn ychwanegu cysylltau i'ch argraff â llaw cyn eu rhoi yn "
+#~ "y llyfr cyfeiriadau TDE, dylech osod y dewisiad yma'n werth uwch na 0: "
+#~ "mae'n penodi sawl maes cyfeiriad gwag mae rhaid eu hargraffu; os nad yw'r "
+#~ "nifer yma'n ffitio ar y dudalen, argraffir tudalen arall â meysydd gwag "
+#~ "yn unig."
 
-#~ msgid "This is the minimum number of empty fields that have to be printed in addition to real entries; if this number is not reached on the first page, more pages with empty fields only may be appended."
-#~ msgstr "Dyma isafswm nifer y meysydd gwag mae rhaid eu hargraffu ynghŷd â'r gwir gofnodion; os na gyrhaeddir y nifer yma ar y dudalen gyntaf, atodir rhagor o dudalennau â meysydd gwag yn unig."
+#~ msgid ""
+#~ "This is the minimum number of empty fields that have to be printed in "
+#~ "addition to real entries; if this number is not reached on the first "
+#~ "page, more pages with empty fields only may be appended."
+#~ msgstr ""
+#~ "Dyma isafswm nifer y meysydd gwag mae rhaid eu hargraffu ynghŷd â'r gwir "
+#~ "gofnodion; os na gyrhaeddir y nifer yma ar y dudalen gyntaf, atodir "
+#~ "rhagor o dudalennau â meysydd gwag yn unig."
 
 #~ msgid "Print Contact's Information"
 #~ msgstr "Argraffu Gwybodaeth am y Cyswllt"
@@ -4220,8 +4288,12 @@ msgstr "Allweddau cêl-ysgrifo"
 #~ msgid "Tiled Backgrounds"
 #~ msgstr "Cefndiroedd Teiledig"
 
-#~ msgid "There is no application set which could be executed. Please go to the settings dialog and configure one."
-#~ msgstr "Nid oes casgliad o gymhwysiannau a ellir eu gweithredu.  Ewch i'r ymgom gosodiadau a ffurfweddu un."
+#~ msgid ""
+#~ "There is no application set which could be executed. Please go to the "
+#~ "settings dialog and configure one."
+#~ msgstr ""
+#~ "Nid oes casgliad o gymhwysiannau a ellir eu gweithredu.  Ewch i'r ymgom "
+#~ "gosodiadau a ffurfweddu un."
 
 #~ msgid "Detailed Style: Display all details, no modifications."
 #~ msgstr "Arddull Manwl: Dangos pob manylyn, dim addasiadau."
@@ -4245,8 +4317,12 @@ msgstr "Allweddau cêl-ysgrifo"
 #~ msgstr "Mewnforio Llyfr Cyfeiriadau Personol MS Exchange (.PAB)"
 
 #, fuzzy
-#~ msgid "There was an error while attempting to save the address book. Please check that no other application is using it."
-#~ msgstr "Bu gwall tra'n ceisio cadw'r llyfr cyfeiriadau. Gwiriwch nad yw rhyw raglen arall yn ei ddefnyddio."
+#~ msgid ""
+#~ "There was an error while attempting to save the address book. Please "
+#~ "check that no other application is using it."
+#~ msgstr ""
+#~ "Bu gwall tra'n ceisio cadw'r llyfr cyfeiriadau. Gwiriwch nad yw rhyw "
+#~ "raglen arall yn ei ddefnyddio."
 
 #~ msgid "Unable to Save"
 #~ msgstr "Methu Cadw"
@@ -4282,8 +4358,12 @@ msgstr "Allweddau cêl-ysgrifo"
 #~ msgid "Port:"
 #~ msgstr "Porth:"
 
-#~ msgid "The port number of the directory server if it is using a non-standard port (389 is the standard)"
-#~ msgstr "Rhif porth y gweinydd cyfeiriaduron os yw'n defnyddio porth ansafonol (389 sy'n safonol)"
+#~ msgid ""
+#~ "The port number of the directory server if it is using a non-standard "
+#~ "port (389 is the standard)"
+#~ msgstr ""
+#~ "Rhif porth y gweinydd cyfeiriaduron os yw'n defnyddio porth ansafonol "
+#~ "(389 sy'n safonol)"
 
 #~ msgid "Base DN:"
 #~ msgstr "EP Sail:"
@@ -4338,8 +4418,12 @@ msgstr "Allweddau cêl-ysgrifo"
 #~ msgid "Location Map"
 #~ msgstr "Lleoliad Cyswllt"
 
-#~ msgid "<ul> <li>%s: Street</li><li>%r: Region</li><li>%l: Location</li><li>%z: Zip Code</li><li>%c: Country ISO Code</li> </ul>"
-#~ msgstr "<ul><li>%s: Stryd</li><li>%r: Ardal</li><li>%l: Lleoliad</li><li>%z: Côd Post</li><li>%c: Côd ISO Gwlad</li></ul>"
+#~ msgid ""
+#~ "<ul> <li>%s: Street</li><li>%r: Region</li><li>%l: Location</li><li>%z: "
+#~ "Zip Code</li><li>%c: Country ISO Code</li> </ul>"
+#~ msgstr ""
+#~ "<ul><li>%s: Stryd</li><li>%r: Ardal</li><li>%l: Lleoliad</li><li>%z: Côd "
+#~ "Post</li><li>%c: Côd ISO Gwlad</li></ul>"
 
 #~ msgid "Extensions"
 #~ msgstr "Estyniadau"
@@ -4418,13 +4502,6 @@ msgstr "Allweddau cêl-ysgrifo"
 #~ msgid "&Edit Host..."
 #~ msgstr "&Golygu Gwesteiwr..."
 
-#~ msgid "&Remove Host"
-#~ msgstr "&Gwaredu Gwesteiwr"
-
-#, fuzzy
-#~ msgid "&Add"
-#~ msgstr "&Ychwanegu..."
-
 #, fuzzy
 #~ msgid "Confirm delete"
 #~ msgstr "Cadarnhau Dileu"
@@ -4488,19 +4565,23 @@ msgstr "Allweddau cêl-ysgrifo"
 #~ " %1"
 
 #~ msgid ""
-#~ "The selected phonebook entries can either be added to the mobile phonebook or they can replace existing phonebook entries.\n"
+#~ "The selected phonebook entries can either be added to the mobile "
+#~ "phonebook or they can replace existing phonebook entries.\n"
 #~ "\n"
 #~ "Do you want to just add the new entries ?"
 #~ msgstr ""
-#~ "Gall y cofnodion llyfr ffôn dewisiedig naill ai gael eu hychwanegu at y llyfr ffôn symudol, neu gallant amnewid cofnodion llyfr ffôn cyfredol.\n"
+#~ "Gall y cofnodion llyfr ffôn dewisiedig naill ai gael eu hychwanegu at y "
+#~ "llyfr ffôn symudol, neu gallant amnewid cofnodion llyfr ffôn cyfredol.\n"
 #~ " \n"
 #~ " A ydych am ychwanegu'r cofnodion newydd yn unig?"
 
 #~ msgid ""
-#~ "During the export now all your existing phonebook entries in the mobile phone will be deleted and replaced with the new entries.\n"
+#~ "During the export now all your existing phonebook entries in the mobile "
+#~ "phone will be deleted and replaced with the new entries.\n"
 #~ "Do you really want to continue ?"
 #~ msgstr ""
-#~ "Yn ystod yr allforiad nawr, dilëir holl gofnodion llyfr ffôn cyfredol yn y ffôn symudol a'u hamnewid â'r cofnodion newydd.\n"
+#~ "Yn ystod yr allforiad nawr, dilëir holl gofnodion llyfr ffôn cyfredol yn "
+#~ "y ffôn symudol a'u hamnewid â'r cofnodion newydd.\n"
 #~ " A ydych wir am barhau?"
 
 #~ msgid "Invalid vCard format in clipboard"
@@ -4527,9 +4608,6 @@ msgstr "Allweddau cêl-ysgrifo"
 #~ msgid "Cu&t"
 #~ msgstr "&Torri"
 
-#~ msgid "Select &All"
-#~ msgstr "Dewis Pope&th"
-
 #~ msgid "Re&do"
 #~ msgstr "Ail&wneud"
 
@@ -4542,9 +4620,6 @@ msgstr "Allweddau cêl-ysgrifo"
 #~ msgid "dummy argument"
 #~ msgstr "Ymresymiad ffug"
 
-#~ msgid "View Toolbar"
-#~ msgstr "Bar Offer Golwg"
-
 #~ msgid "Contact Preview"
 #~ msgstr "Rhagolwg Cysylltau"
 
@@ -4557,5 +4632,9 @@ msgstr "Allweddau cêl-ysgrifo"
 #~ msgid "Not supported vCard version."
 #~ msgstr "Fersiwn vCerdyn nas cynhelir"
 
-#~ msgid " The selected file does not include a valid vCard. Please check the file and try again."
-#~ msgstr "Nid yw'r ffeil ddewisiedig yn cynnwys vCerdyn dilys. Gwiriwch y ffeil a cheisiwch eto os gwelwch yn dda."
+#~ msgid ""
+#~ " The selected file does not include a valid vCard. Please check the file "
+#~ "and try again."
+#~ msgstr ""
+#~ "Nid yw'r ffeil ddewisiedig yn cynnwys vCerdyn dilys. Gwiriwch y ffeil a "
+#~ "cheisiwch eto os gwelwch yn dda."