Fixed some typos. 12 fuzzies and 31 untranslated left to do.

Fixed some typos.
12 fuzzies and 31 untranslated left to do.

2 files changed, 965 insertions, 683 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 9a93bf8d..1b5a063e 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-11  Telsa Gwynne  <hobbit@aloss.ukuu.org.uk> 
+
+	* cy.po: Updated Welsh translation. 
+
 2004-03-10  Stanislav Visnovsky <visnovsky@nenya.ms.mff.cuni.cz>
 
 	* sk.po: Updated Slovak translation.
diff --git a/po/cy.po b/po/cy.po
index c9673f6a..819237f1 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -8,14 +8,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gdm2\n"
-"POT-Creation-Date: 2003-09-02 12:12-0700\n"
-"PO-Revision-Date: 2003-08-25 18:27+0100\n"
-"Last-Translator: Dafydd Harries <daf@parnassus.ath.cx>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-03-11 15:20+0000\n"
+"PO-Revision-Date: 2004-03-11-15:40+0000\n"
+"Last-Translator: Telsa Gwynne <hobbit@aloss.ukuu.org.uk>\n"
 "Language-Team: Cymraeg <gnome-cy@www.linux.org.uk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: config/CDE.desktop.in.h:1
 msgid "CDE"
@@ -25,11 +25,11 @@ msgstr "CDE"
 msgid "This session logs you into CDE"
 msgstr "Mae'r sesiwn hwn yn eich mewngofnodi i CDE"
 
-#: config/Default.desktop.in.h:1
+#: config/default.desktop.in.h:1
 msgid "Default System Session"
 msgstr "Seswin Rhagosodedig y System"
 
-#: config/Default.desktop.in.h:2
+#: config/default.desktop.in.h:2
 msgid "This is the default system session"
 msgstr "Dyma sesiwn rhagosodedig y system"
 
@@ -132,19 +132,19 @@ msgstr "GNOME"
 msgid "This session logs you into GNOME"
 msgstr "Mae'r sesiwn hwn yn eich mewngofnodi i GNOME"
 
-#: daemon/auth.c:56
+#: daemon/auth.c:58
 #, c-format
 msgid "%s: Could not write new authorization entry: %s"
 msgstr "%s: Ni ellwyd ysgrifennu cofnod awdurdodaeth newydd: %s"
 
-#: daemon/auth.c:59
+#: daemon/auth.c:61
 #, c-format
 msgid "%s: Could not write new authorization entry.  Possibly out of diskspace"
 msgstr ""
 "%s: Ni ellwyd ysgrifennu cofnod awdurdodaeth newydd. Efallai does dim lle ar "
 "y disg"
 
-#: daemon/auth.c:64
+#: daemon/auth.c:66
 #, c-format
 msgid ""
 "GDM could not write a new authorization entry to disk.  Possibly out of "
@@ -153,37 +153,42 @@ msgstr ""
 "Ni allodd GDM ysgrifennu cofnod awdurdodaeth newydd i'r disg. Efallai does "
 "dim lle ar y disg.%s%s"
 
-#: daemon/auth.c:193
+#: daemon/auth.c:196
 #, c-format
 msgid "%s: Could not make new cookie file in %s"
 msgstr "%s: Ni ellwyd creu ffeil cwci newydd yn %s"
 
-#: daemon/auth.c:217 daemon/auth.c:234 daemon/auth.c:759
+#: daemon/auth.c:220 daemon/auth.c:237 daemon/auth.c:871
 #, c-format
 msgid "%s: Cannot safely open %s"
 msgstr "%s: Ni ellir agor %s yn ddiogel"
 
 #. Really no need to clean up here - this process is a goner anyway
-#: daemon/auth.c:572 daemon/auth.c:610
+#: daemon/auth.c:669 daemon/auth.c:709
 #, c-format
 msgid "%s: Could not open cookie file %s"
 msgstr "%s: Methwyd agor y ffeil cwci %s"
 
-#: daemon/auth.c:591
+#: daemon/auth.c:690
 #, c-format
 msgid "%s: Could not lock cookie file %s"
 msgstr "%s: Ni ellwyd cloi y ffeil cwci %s"
 
-#: daemon/auth.c:641 daemon/auth.c:662
+#: daemon/auth.c:740 daemon/auth.c:762
 #, c-format
 msgid "%s: Could not write cookie"
 msgstr "%s: Ni ellwyd ysgrifennu cwci"
 
-#: daemon/auth.c:737
+#: daemon/auth.c:847
 #, c-format
 msgid "%s: Ignoring suspiciously looking cookie file %s"
 msgstr "%s: Anwybyddu ffeil cwci amheus %s"
 
+#: daemon/auth.c:890 daemon/gdm.c:2259
+#, c-format
+msgid "Can't write to %s: %s"
+msgstr ""
+
 #. This means we have no clue what's happening,
 #. * it's not X server crashing as we would have
 #. * cought that elsewhere.  Things are just
@@ -205,22 +210,22 @@ msgstr ""
 "mae'n debyg fod rhywbeth gwael yn mynd ymlaen. Fe fydda i'n aros am 2 funud "
 "cyn ceisio eto ar y dangosydd %s."
 
-#: daemon/display.c:243
+#: daemon/display.c:244
 #, c-format
 msgid "%s: Cannot create pipe"
 msgstr "%s: Ni ellir creu piben"
 
-#: daemon/display.c:315
+#: daemon/display.c:316
 #, c-format
 msgid "%s: Failed forking gdm slave process for %s"
 msgstr "%s: Methwyd fforcio proses gwas gdm ar gyfer %s"
 
-#: daemon/errorgui.c:286
+#: daemon/errorgui.c:356
 #, c-format
 msgid "%s not a regular file!\n"
 msgstr "Nid yw %s yn ffeil rheolaidd!\n"
 
-#: daemon/errorgui.c:301
+#: daemon/errorgui.c:373
 msgid ""
 "\n"
 "... File too long to display ...\n"
@@ -229,79 +234,79 @@ msgstr ""
 "...Ffeil yn rhy hir i'w ddangos ...\n"
 "\n"
 
-#: daemon/errorgui.c:309
+#: daemon/errorgui.c:382
 #, c-format
 msgid "%s could not be opened"
 msgstr "Ni ellwyd agor %s"
 
-#: daemon/errorgui.c:402 daemon/errorgui.c:522 daemon/errorgui.c:609
-#: daemon/errorgui.c:706
+#: daemon/errorgui.c:494 daemon/errorgui.c:635 daemon/errorgui.c:743
+#: daemon/errorgui.c:861
 #, c-format
 msgid "%s: Cannot fork to display error/info box"
 msgstr "%s: Ni ellir fforcio er meyn dangos blwch gwall/gwybodaeth"
 
-#: daemon/filecheck.c:54
+#: daemon/filecheck.c:63
 #, c-format
 msgid "%s: Directory %s does not exist."
 msgstr "%s: Dyw'r cyfeiriadur %s ddim yn bodoli."
 
-#: daemon/filecheck.c:61 daemon/filecheck.c:103
+#: daemon/filecheck.c:70 daemon/filecheck.c:112 daemon/filecheck.c:174
 #, c-format
 msgid "%s: %s is not owned by uid %d."
 msgstr "%s: Nid yw %s yn berchen i'r uid %d."
 
-#: daemon/filecheck.c:67 daemon/filecheck.c:110
+#: daemon/filecheck.c:76 daemon/filecheck.c:119
 #, c-format
 msgid "%s: %s is writable by group."
 msgstr "%s: mae %s yn ysgrifennadwy gan y grŵp."
 
-#: daemon/filecheck.c:73
+#: daemon/filecheck.c:82
 #, c-format
 msgid "%s: %s is writable by other."
 msgstr "%s: mae %s yn ysgrifennadwy gan eraill."
 
-#: daemon/filecheck.c:88
+#: daemon/filecheck.c:97 daemon/filecheck.c:162
 #, c-format
 msgid "%s: %s does not exist but must exist."
 msgstr "%s: nid yw %s yn bodoli ond rhaid iddo fodoli"
 
-#: daemon/filecheck.c:96
+#: daemon/filecheck.c:105 daemon/filecheck.c:168
 #, c-format
 msgid "%s: %s is not a regular file."
 msgstr "%s: nid yw %s yn ffeil arferol"
 
-#: daemon/filecheck.c:117
+#: daemon/filecheck.c:126
 #, c-format
 msgid "%s: %s is writable by group/other."
 msgstr "%s: mae %s yn ysgrifennadwy gan y grŵp/eraill."
 
-#: daemon/filecheck.c:124
+#: daemon/filecheck.c:133 daemon/filecheck.c:186
 #, c-format
 msgid "%s: %s is bigger than sysadmin specified maximum file size."
 msgstr ""
 "%s: mae %s yn fwy na'r maint ffeil mwyaf a benodwyd gan y gweinyddwr system"
 
-#: daemon/gdm-net.c:248
+#: daemon/gdm-net.c:271
 #, c-format
 msgid "%s: Could not make socket"
 msgstr "%s: Methwyd creu soced"
 
-#: daemon/gdm-net.c:258
+#: daemon/gdm-net.c:302
 #, c-format
 msgid "%s: Could not bind socket"
 msgstr "%s: Methwyd rhwymo soced"
 
-#: daemon/gdm-net.c:334
+#: daemon/gdm-net.c:388
 #, c-format
 msgid "%s: Could not make FIFO"
 msgstr "%s: Methwyd creu FIFO"
 
-#: daemon/gdm-net.c:342
+#: daemon/gdm-net.c:396
 #, c-format
 msgid "%s: Could not open FIFO"
 msgstr "%s: Methwyd agor FIFO"
 
-#: daemon/gdm.c:234
+#: daemon/gdm.c:246
 #, c-format
 msgid ""
 "Server Authorization directory (daemon/ServAuthDir) is set to %s but this "
@@ -311,12 +316,12 @@ msgstr ""
 "s ond nid yw hyn yn bodoli. Os gwelwch yn dda, cywirwch gyfluniad gdm %s ac "
 "ailgychwynwch gdm."
 
-#: daemon/gdm.c:243
+#: daemon/gdm.c:255
 #, c-format
 msgid "%s: Authdir %s does not exist. Aborting."
 msgstr "%s: Nid yw'r cyfeiriadur awdurdodaeth %s yn bodoli. Terfynnu."
 
-#: daemon/gdm.c:248
+#: daemon/gdm.c:260
 #, c-format
 msgid ""
 "Server Authorization directory (daemon/ServAuthDir) is set to %s but this is "
@@ -326,12 +331,12 @@ msgstr ""
 "s ond nid yw hyn yn gyfeiriadur. Os gwelwch yn dda, cywirwch gyfluniad %s "
 "gdm ac ailgychwynwych gdm."
 
-#: daemon/gdm.c:257
+#: daemon/gdm.c:269
 #, c-format
 msgid "%s: Authdir %s is not a directory. Aborting."
 msgstr "%s: Nid yw'r cyfeiriadur awdurdodaeth %s yn gyfeiriadur. Terfynnu."
 
-#: daemon/gdm.c:270
+#: daemon/gdm.c:282
 #, c-format
 msgid ""
 "%s: Logdir %s does not exist or isn't a directory.  Using ServAuthDir %s."
@@ -339,77 +344,77 @@ msgstr ""
 "%s: Nid yw'r cyfeiriadur cofnod %s yn bodoli neu nid cyfeiriadur ydyw. Yn "
 "defnyddio ServAuthDir %s."
 
-#: daemon/gdm.c:304 gui/gdmlogin.c:692 gui/greeter/greeter.c:95
+#: daemon/gdm.c:311 gui/gdmlogin.c:650 gui/greeter/greeter.c:101
 #, c-format
 msgid "%s: No configuration file: %s. Using defaults."
 msgstr "%s: Nid oes ffeil cyfluniad: %s. Defnyddir rhagosodion"
 
-#: daemon/gdm.c:349
+#: daemon/gdm.c:356
 #, c-format
 msgid "%s: BaseXsession empty, using %s/gdm/Xsession"
 msgstr "%s: BaseXsession yn wag, yn defnyddio %s/gdm/Xsession"
 
-#: daemon/gdm.c:389
+#: daemon/gdm.c:399
 #, c-format
 msgid "%s: Standard X server not found, trying alternatives"
 msgstr ""
 "%s: Nid yw'r gweinydd X wedi ei darganfod, yn ceisio gweinyddion eiladol"
 
-#: daemon/gdm.c:417
+#: daemon/gdm.c:431
 #, c-format
 msgid "%s: XDMCP was enabled while there is no XDMCP support, turning it off"
 msgstr "%s: Mi alluogwyd XDMCP pan nad oes cynheliad XDMCP - yn analluogi."
 
-#: daemon/gdm.c:430
+#: daemon/gdm.c:444
 #, c-format
 msgid "%s: Root cannot be autologged in, turing off automatic login"
 msgstr ""
 "%s: Ni chaniateir yr uwchdefnyddiwr (\"root\") mewngofnodi yn ymysgogol, yn "
 "analluogi mewngofnodiad ymysgogol"
 
-#: daemon/gdm.c:443
+#: daemon/gdm.c:457
 #, c-format
 msgid "%s: Root cannot be autologged in, turing off timed login"
 msgstr ""
 "%s: Ni chaniateir yr uwchdefnyddiwr (\"root\") mewngofnodi yn ymysgogol, yn "
 "analluogi mewngofnodiad amserol"
 
-#: daemon/gdm.c:449
+#: daemon/gdm.c:463
 #, c-format
 msgid "%s: TimedLoginDelay less than 5, so I will just use 5."
 msgstr "%s: Mae TimedLoginDelay yn llai na 5, felly fe fydda i'n defnyddio 5."
 
-#: daemon/gdm.c:459
+#: daemon/gdm.c:473
 #, c-format
 msgid "%s: No greeter specified."
 msgstr "%s: Dim cyfarchydd wedi ei benodi."
 
-#: daemon/gdm.c:462
+#: daemon/gdm.c:476
 #, c-format
 msgid "%s: No remote greeter specified."
 msgstr "%s: Dim cyfarchydd pell wedi ei benodi."
 
-#: daemon/gdm.c:466
+#: daemon/gdm.c:480
 #, c-format
 msgid "%s: No sessions directory specified."
 msgstr "%s: Dim cyfeiriadur sesiynau wedi ei benodi."
 
-#: daemon/gdm.c:491
+#: daemon/gdm.c:505
 #, c-format
 msgid "%s: Empty server command, using standard one."
 msgstr "%s: Gorchymyn gweinydd gwag, yn defnyddio'r gorchymyn safonol"
 
-#: daemon/gdm.c:534
+#: daemon/gdm.c:548
 #, c-format
 msgid "%s: Display number %d in use!  I will use %d"
 msgstr "%s: Y mae dangosydd rhif %d mewn defnydd! Mi fyddwn yn defnyddio %d"
 
-#: daemon/gdm.c:553
+#: daemon/gdm.c:567
 #, c-format
 msgid "%s: Invalid server line in config file. Ignoring!"
 msgstr "%s: Llinell gweinydd annilys yn y ffeil cyfluniad. Yn anwybyddu!"
 
-#: daemon/gdm.c:564 daemon/gdm.c:603
+#: daemon/gdm.c:578 daemon/gdm.c:619
 #, c-format
 msgid "%s: XDMCP disabled and no local servers defined. Aborting!"
 msgstr ""
@@ -418,7 +423,7 @@ msgstr ""
 
 #. start
 #. server uid
-#: daemon/gdm.c:580
+#: daemon/gdm.c:596
 #, c-format
 msgid ""
 "%s: XDMCP disabled and no local servers defined. Adding %s on :%d to allow "
@@ -427,7 +432,7 @@ msgstr ""
 "%s: Mae XDMCP wedi analluogi ac nid oes gweinyddion lleol wedi diffinio. Yn "
 "ychwanegu %s i :%d er mwyn caniatau cyflunio!"
 
-#: daemon/gdm.c:595
+#: daemon/gdm.c:611
 #, c-format
 msgid ""
 "XDMCP is disabled and gdm cannot find any local server to start.  Aborting!  "
@@ -436,12 +441,7 @@ msgstr ""
 "Mae XDMCP wedi analluogi ac nid yw gdm yn gallu darganfod gweinydd lleol i'w "
 "gychwyn. Yn ateli! Cywirwch y cyfluniad %s ac aillgychwynwch GDM."
 
-#: daemon/gdm.c:616
-#, c-format
-msgid "%s: Can't find the gdm user (%s). Trying 'nobody'!"
-msgstr "%s: Ni allai darganfod a defnyddiwr gdm (%s). Yn ceisio 'nobody'!"
-
-#: daemon/gdm.c:624
+#: daemon/gdm.c:633
 #, c-format
 msgid ""
 "The gdm user does not exist. Please correct gdm configuration %s and restart "
@@ -450,12 +450,12 @@ msgstr ""
 "Nid yw'r defnyddiwr gdm yn bodoli. Cywirwch y cyfluniad gdm %s ac "
 "ailgychwynwch gdm."
 
-#: daemon/gdm.c:631
+#: daemon/gdm.c:640
 #, c-format
 msgid "%s: Can't find the gdm user (%s). Aborting!"
 msgstr "%s: Wedi methu darganfod y defnyddiwr gdm (%s). Yn ateli!"
 
-#: daemon/gdm.c:638
+#: daemon/gdm.c:647
 #, c-format
 msgid ""
 "The gdm user is set to be root, but this is not allowed since it can pose a "
@@ -465,17 +465,12 @@ msgstr ""
 "chaniateir hyn gan ei fod yn berygl i ddiogelwch. Cywirwch y cyfluniad gdm %"
 "s ac ailgychwynwch gdm."
 
-#: daemon/gdm.c:646
+#: daemon/gdm.c:655
 #, c-format
 msgid "%s: The gdm user should not be root. Aborting!"
 msgstr "%s: Ni ddylid y defnyddiwr gdm fod yn root. Yn ateli!"
 
-#: daemon/gdm.c:652
-#, c-format
-msgid "%s: Can't find the gdm group (%s). Trying 'nobody'!"
-msgstr "%s: Ni allai darganfod a grŵp gdm (%s). Yn ceisio 'nobody'!"
-
-#: daemon/gdm.c:660
+#: daemon/gdm.c:662
 #, c-format
 msgid ""
 "The gdm group does not exist. Please correct gdm configuration %s and "
@@ -484,12 +479,12 @@ msgstr ""
 "Nid yw'r grŵp gdm yn bodoli. Os gwelwch yn dda, cywirwch y cyfluniad gdm %s "
 "ac ailgychwynwch gdm."
 
-#: daemon/gdm.c:667
+#: daemon/gdm.c:669
 #, c-format
 msgid "%s: Can't find the gdm group (%s). Aborting!"
 msgstr "%s: Wedi methu darganfod y grŵp gdm (%s). Yn ateli! "
 
-#: daemon/gdm.c:674
+#: daemon/gdm.c:676
 #, c-format
 msgid ""
 "The gdm group is set to be root, but this is not allowed since it can pose a "
@@ -499,35 +494,35 @@ msgstr ""
 "gan ei fod yn berygl i ddiogelwch. Os gwelwch yn dda, cywirwch y cyfluniad "
 "gdm %s ac ailgychwynwch gdm."
 
-#: daemon/gdm.c:682
+#: daemon/gdm.c:684
 #, c-format
 msgid "%s: The gdm group should not be root. Aborting!"
 msgstr "%s: Ni ddylid y grŵp gdm fod yn root. Yn ateli!"
 
-#: daemon/gdm.c:697
+#: daemon/gdm.c:699
 #, c-format
 msgid "%s: Greeter not found or can't be executed by the gdm user"
 msgstr ""
 "%s: Cyfarchydd heb ei ganfod neu ni ellir ei weithredu gan y defnyddiwr gdm."
 
-#: daemon/gdm.c:704
+#: daemon/gdm.c:706
 #, c-format
 msgid "%s: Remote greeter not found or can't be executed by the gdm user"
 msgstr ""
 "%s: Cyfarchydd pell heb ei ganfod neu ni ellir ei weithredu gan y defnyddiwr "
 "gdm."
 
-#: daemon/gdm.c:715
+#: daemon/gdm.c:717
 #, c-format
 msgid "%s: Chooser not found or it can't be executed by the gdm user"
 msgstr ""
 "%s: Dewisydd heb ei ganfod neu ni ellir ei weithredu gan y defnyddiwr gdm."
 
-#: daemon/gdm.c:724
+#: daemon/gdm.c:726
 msgid "No daemon/ServAuthDir specified in the configuration file"
 msgstr "Dim ellyll/ServAuthDir wedi ei benodi yn y ffeil cyfluniad"
 
-#: daemon/gdm.c:726
+#: daemon/gdm.c:728
 #, c-format
 msgid "%s: No daemon/ServAuthDir specified."
 msgstr "%s: Dim ellyll/ServAuthDir wedi ei benodi."
@@ -569,28 +564,39 @@ msgstr ""
 "%s: Mae gan y cyfeiriadur awdurdodaeth (Authdir) %s y caniatadau anghywir %"
 "o. Dylai fod %o. Yn terfynnu."
 
-#: daemon/gdm.c:857
+#. FIXME: how to handle this?
+#: daemon/gdm.c:836 daemon/gdm.c:844 daemon/gdm.c:2043 daemon/gdm.c:2051
+#, c-format
+msgid "Cannot write PID file %s, possibly out of diskspace.  Error: %s\n"
+msgstr ""
+
+#: daemon/gdm.c:838 daemon/gdm.c:846 daemon/gdm.c:2045 daemon/gdm.c:2053
+#, c-format
+msgid "Cannot write PID file %s, possibly out of diskspace.  Error: %s"
+msgstr ""
+
+#: daemon/gdm.c:856
 #, c-format
 msgid "%s: fork() failed!"
 msgstr "%s: fork() wedi methu!"
 
 #. should never happen
-#: daemon/gdm.c:860 daemon/slave.c:2978
+#: daemon/gdm.c:859 daemon/slave.c:3437
 #, c-format
 msgid "%s: setsid() failed: %s!"
 msgstr "%s: setsid() wedi methu: %s!"
 
-#: daemon/gdm.c:1030
+#: daemon/gdm.c:1029
 #, c-format
 msgid "%s: Trying failsafe X server %s"
 msgstr "%s: Ceisio'r gweinydd X difethiant %s"
 
-#: daemon/gdm.c:1048
+#: daemon/gdm.c:1047
 #, c-format
 msgid "%s: Running the XKeepsCrashing script"
 msgstr "%s: Gweithredu'r sgript XKeepsCrashing"
 
-#: daemon/gdm.c:1160
+#: daemon/gdm.c:1159
 msgid ""
 "I cannot start the X server (your graphical interface).  It is likely that "
 "it is not set up correctly. You will need to log in on a console and rerun "
@@ -605,7 +611,7 @@ msgstr ""
 #. * talk to him.  He's on some 'l33t system anyway, so syslog
 #. * reading will do him good
 #. * }
-#: daemon/gdm.c:1172
+#: daemon/gdm.c:1171
 #, c-format
 msgid ""
 "Failed to start X server several times in a short time period; disabling "
@@ -614,79 +620,87 @@ msgstr ""
 "Wedi methu cychwyn y gweinydd X aml dro mewn amser bach; yn analluogi'r "
 "dangosydd %s"
 
-#: daemon/gdm.c:1217
+#: daemon/gdm.c:1179 daemon/gdm.c:2762
+msgid "Master suspending..."
+msgstr "Meistr yn gorffwys..."
+
+#: daemon/gdm.c:1233
 msgid "System is rebooting, please wait ..."
 msgstr "Mae'r system yn ailfwtio, arhoswch os gwelwch yn dda..."
 
-#: daemon/gdm.c:1219
+#: daemon/gdm.c:1235
 msgid "System is shutting down, please wait ..."
 msgstr "Mae'r system yn troi bant, arhoswch os gwelwch yn dda..."
 
-#: daemon/gdm.c:1313
-#, c-format
-msgid "Reboot or Halt request when there is no system menu from display %s"
-msgstr ""
-"Gofyniad Ailfwtio neu Atal pan nad oes dewislen system o'r ddangosydd %s"
-
-#: daemon/gdm.c:1322
-#, c-format
-msgid "Restart, Reboot or Halt request from a non-local display %s"
-msgstr "Cais Ailgychwyn, Ailfwtio, neu Atal o ddangosydd dileol %s"
+#: daemon/gdm.c:1246
+msgid "Master halting..."
+msgstr "Meistr yn  atal..."
 
-#. Bury this display for good
-#: daemon/gdm.c:1382
+#: daemon/gdm.c:1259
 #, c-format
-msgid "%s: Aborting display %s"
-msgstr "%s: Yn terfynnu'r dangosydd %s"
+msgid "%s: Halt failed: %s"
+msgstr "%s: Arosiad wedi methu: %s"
 
-#. Reboot machine
-#: daemon/gdm.c:1395
+#: daemon/gdm.c:1268
 msgid "Master rebooting..."
 msgstr "Meistr yn ailfwtio..."
 
-#: daemon/gdm.c:1407
+#: daemon/gdm.c:1281
 #, c-format
 msgid "%s: Reboot failed: %s"
 msgstr "%s: Ailfwtio wedi methu: %s"
 
-#. Halt machine
-#: daemon/gdm.c:1415
-msgid "Master halting..."
-msgstr "Meistr yn  atal..."
+#: daemon/gdm.c:1379
+#, c-format
+msgid "Reboot or Halt request when there is no system menu from display %s"
+msgstr ""
+"Gofyniad Ailfwtio neu Atal pan nad oes dewislen system o'r ddangosydd %s"
 
-#: daemon/gdm.c:1427
+#: daemon/gdm.c:1388
 #, c-format
-msgid "%s: Halt failed: %s"
-msgstr "%s: Arosiad wedi methu: %s"
+msgid "Restart, Reboot or Halt request from a non-local display %s"
+msgstr "Cais Ailgychwyn, Ailfwtio, neu Atal o ddangosydd dileol %s"
 
-#. Suspend machine
-#. XXX: this is ugly, why should there be a suspend like this,
-#. * see GDM_SOP_SUSPEND_MACHINE
-#: daemon/gdm.c:1437 daemon/gdm.c:2604
-msgid "Master suspending..."
-msgstr "Meistr yn gorffwys..."
+#. Bury this display for good
+#: daemon/gdm.c:1454
+#, c-format
+msgid "%s: Aborting display %s"
+msgstr "%s: Yn terfynnu'r dangosydd %s"
 
-#: daemon/gdm.c:1547
+#: daemon/gdm.c:1592
 msgid "GDM restarting ..."
 msgstr "GDM yn ailguchwyn..."
 
-#: daemon/gdm.c:1551
+#: daemon/gdm.c:1596
 msgid "Failed to restart self"
 msgstr "Wedi methu ailgychwyn fy hunan"
 
-#: daemon/gdm.c:1711
+#. FIXME: note that this could mean out of memory
+#: daemon/gdm.c:1670
+msgid "main daemon: Got SIGABRT, something went very wrong. Going down!"
+msgstr ""
+
+#: daemon/gdm.c:1829
 msgid "Do not fork into the background"
 msgstr "Peidio fforcio i'r cefndir"
 
-#: daemon/gdm.c:1713
+#: daemon/gdm.c:1831
 msgid "No console (local) servers to be run"
 msgstr "Nad oes gweinydd terfynnell (lleol) i rhedeg"
 
-#: daemon/gdm.c:1715
+#: daemon/gdm.c:1833
 msgid "Preserve LD_* variables"
 msgstr "Cadew newidynau LD_*"
 
-#: daemon/gdm.c:1835 gui/gdmchooser.c:1494
+#: daemon/gdm.c:1835
+msgid "Print GDM version"
+msgstr ""
+
+#: daemon/gdm.c:1837
+msgid "Start the first X server but then halt until we get a GO in the fifo"
+msgstr ""
+
+#: daemon/gdm.c:1958 gui/gdmchooser.c:2045
 #, c-format
 msgid ""
 "Error on option %s: %s.\n"
@@ -696,44 +710,49 @@ msgstr ""
 "Rhedwch '%s --help' er mwyn gweld rhestr llawn o'r opsinau llinell orchymyn "
 "sydd ar agel.\n"
 
-#: daemon/gdm.c:1853
+#: daemon/gdm.c:1981
 msgid "Only root wants to run gdm\n"
 msgstr "Dim ond root sydd eisiau rhedeg gdm\n"
 
-#: daemon/gdm.c:1869 daemon/gdm.c:1873 daemon/gdm.c:1948 daemon/gdm.c:1952
-#: daemon/gdm.c:1956 daemon/gdm.c:1960 daemon/gdm.c:1970 daemon/gdm.c:1976
-#: daemon/gdm.c:1987 daemon/misc.c:1391 daemon/misc.c:1395 daemon/misc.c:1399
-#: daemon/misc.c:1406 daemon/misc.c:1410 daemon/misc.c:1414
-#: daemon/server.c:499 daemon/server.c:512 daemon/slave.c:678
-#: daemon/slave.c:692 daemon/slave.c:702 daemon/slave.c:712 daemon/slave.c:724
-#: gui/gdmchooser.c:1373 gui/gdmchooser.c:1376 gui/gdmchooser.c:1379
-#: gui/gdmlogin.c:3803 gui/gdmlogin.c:3811 gui/gdmlogin.c:3814
-#: gui/greeter/greeter.c:1161 gui/greeter/greeter.c:1169
-#: gui/greeter/greeter.c:1172
+#: daemon/gdm.c:1997 daemon/gdm.c:2001 daemon/gdm.c:2076 daemon/gdm.c:2080
+#: daemon/gdm.c:2084 daemon/gdm.c:2088 daemon/gdm.c:2098 daemon/gdm.c:2104
+#: daemon/gdm.c:2115 daemon/misc.c:1603 daemon/misc.c:1607 daemon/misc.c:1611
+#: daemon/misc.c:1618 daemon/misc.c:1622 daemon/misc.c:1626
+#: daemon/server.c:521 daemon/server.c:534 daemon/slave.c:811
+#: daemon/slave.c:825 daemon/slave.c:835 daemon/slave.c:845 daemon/slave.c:857
+#: gui/gdmchooser.c:1924 gui/gdmchooser.c:1927 gui/gdmchooser.c:1930
+#: gui/gdmlogin.c:3928 gui/gdmlogin.c:3936 gui/gdmlogin.c:3939
+#: gui/greeter/greeter.c:1083 gui/greeter/greeter.c:1091
+#: gui/greeter/greeter.c:1094
 #, c-format
 msgid "%s: Error setting up %s signal handler: %s"
 msgstr "%s: Gwall wrth osod i fyny trinydd arwydd %s: %s"
 
-#: daemon/gdm.c:1897
+#: daemon/gdm.c:2025
 msgid "gdm already running. Aborting!"
 msgstr "Y mae gdm yn rhedeg yn barod. Yn ateli!"
 
-#: daemon/gdm.c:1996
+#: daemon/gdm.c:2124
 #, c-format
 msgid "%s: Error setting up CHLD signal handler"
 msgstr "%s: Gwall wrth osod i fyny trinydd arwydd CHLD"
 
-#: daemon/gdm.c:3241 daemon/gdm.c:3260
+#: daemon/gdm.c:2228
+#, fuzzy, c-format
+msgid "Can't open %s for writing"
+msgstr "Methwyd agor sesiwn ar gyfer %s"
+
+#: daemon/gdm.c:3495 daemon/gdm.c:3514
 msgid "Flexible server request denied: Not authenticated"
 msgstr "Gwrthodwyd cais gweinydd hyblyg: Heb ddilysu"
 
 #. Don't print the name to syslog as it might be
 #. * long and dangerous
-#: daemon/gdm.c:3278
+#: daemon/gdm.c:3532
 msgid "Unknown server type requested, using standard server."
 msgstr "Gofynnwyd am math gweinydd anhysbys, yn defnyddio'r gweinydd safonol."
 
-#: daemon/gdm.c:3282
+#: daemon/gdm.c:3536
 #, c-format
 msgid ""
 "Requested server %s not allowed to be used for flexible servers, using "
@@ -742,37 +761,59 @@ msgstr ""
 "Ni chaniateir y math gweinydd gofynnol %s ar gyfer gweinyddion hyblyg, yn "
 "defnyddio'r gweinydd safonol."
 
+#: daemon/gdm.c:3658
+#, fuzzy
+msgid "Query logout action request denied: Not authenticated"
+msgstr "Gwrthodwyd cais gweinydd hyblyg: Heb ddilysu"
+
+#: daemon/gdm.c:3716 daemon/gdm.c:3771
+#, fuzzy
+msgid "Set logout action request denied: Not authenticated"
+msgstr "Gwrthodwyd cais gweinydd hyblyg: Heb ddilysu"
+
+#: daemon/gdm.c:3816 daemon/gdm.c:3843
+#, fuzzy
+msgid "Query vt request denied: Not authenticated"
+msgstr "Gwrthodwyd cais gweinydd hyblyg: Heb ddilysu"
+
 # TRWSIO
 #. Translators, don't translate the 'y' and 'n'
-#: daemon/misc.c:555
+#: daemon/misc.c:623
 msgid "y = Yes or n = No? >"
 msgstr "y = Ie neu n = Na? >"
 
-#: daemon/misc.c:869
+#: daemon/misc.c:977
 #, c-format
 msgid "%s: Cannot get local addresses!"
 msgstr "%s: Wedi methu cyrchu cyfeiriadau lleol!"
 
-#: daemon/misc.c:984
+#: daemon/misc.c:1129
 #, c-format
 msgid "Could not setgid %d. Aborting."
 msgstr "Wedi methu setgid %d. An ateli."
 
-#: daemon/misc.c:989
+#: daemon/misc.c:1134
 #, c-format
 msgid "initgroups() failed for %s. Aborting."
 msgstr "initgroups() wedi methu am %s. Yn ateli."
 
-#: daemon/misc.c:1219 daemon/misc.c:1233
+#: daemon/misc.c:1371 daemon/misc.c:1385
 #, c-format
 msgid "%s: Error setting signal %d to %s"
 msgstr "%s: Gwall weth osod arwydd %d i %s"
 
+#: daemon/misc.c:2272
+#, c-format
+msgid ""
+"Last login:\n"
+"%s"
+msgstr ""
+
 #: daemon/server.c:160
 msgid "Can not start fallback console"
 msgstr "Ni ellir cychwyn consol wrth gefn"
 
-#: daemon/server.c:330
+#: daemon/server.c:341
 #, c-format
 msgid ""
 "There already appears to be an X server running on display %s.  Should I try "
@@ -783,7 +824,7 @@ msgstr ""
 "geisio rhif dangosydd arall? Os ydych chi'd ateb na, mi fydda i'n ceisio "
 "cychwyn y gweinydd ar %s eto.%s"
 
-#: daemon/server.c:337
+#: daemon/server.c:348
 msgid ""
 "  (You can change consoles by pressing Ctrl-Alt plus a function key, such as "
 "Ctrl-Alt-F7 to go to console 7.  X servers usually run on consoles 7 and "
@@ -793,100 +834,108 @@ msgstr ""
 "Alt-F7 er mwyn mynd at gonsol 7. Mae gweinyddion X fel arfer yn rhedeg ar "
 "gonsolau 7 ac uwch.)"
 
-#: daemon/server.c:377
+#: daemon/server.c:394
 #, c-format
 msgid "Display '%s' cannot be opened by Xnest"
 msgstr "Ni allai Xnest agor y dangosydd '%s'"
 
-#: daemon/server.c:405
+#: daemon/server.c:425
 #, c-format
 msgid "Display %s is busy. There is another X server running already."
 msgstr "Y mae dangosydd %s yn brysur. Mae yna gweinydd X yn rhedeg yn barod."
 
-#: daemon/server.c:487
+#: daemon/server.c:509
 #, c-format
 msgid "%s: Error opening a pipe: %s"
 msgstr "%s: Gwall wrth agor pibell: %s"
 
 #. Send X too busy
-#: daemon/server.c:770
+#: daemon/server.c:794
 #, c-format
 msgid "%s: Cannot find a free display number"
 msgstr "%s: Wedi methu darganfod rhif dangosydd rhydd"
 
-#: daemon/server.c:785
+#: daemon/server.c:821
 #, c-format
 msgid "%s: Display %s busy.  Trying another display number."
 msgstr "%s: Dangosydd %s yn brysur. Yn ceisio rhif dangosydd arall."
 
-#: daemon/server.c:879
+#: daemon/server.c:916
 #, c-format
 msgid "Invalid server command '%s'"
 msgstr "Gorchymyn gweinydd annilys '%s'"
 
-#: daemon/server.c:884
+#: daemon/server.c:921
 #, c-format
 msgid "Server name '%s' not found, using standard server"
 msgstr "Methu darganfod gweinydd enw '%s', yn defnyddio gweinydd safonol"
 
-#: daemon/server.c:1060
+#: daemon/server.c:1097
 #, c-format
 msgid "%s: Could not open logfile for display %s!"
 msgstr "%s: Wedi methu agor ffeil gofnod am dangosydd %s!"
 
-#: daemon/server.c:1073 daemon/server.c:1079 daemon/server.c:1084
+#: daemon/server.c:1110 daemon/server.c:1116 daemon/server.c:1121
 #, c-format
 msgid "%s: Error setting %s to %s"
 msgstr "%s: Gwall wrth osod %s i %s"
 
-#: daemon/server.c:1121
+#: daemon/server.c:1158
 #, c-format
 msgid "%s: Empty server command for display %s"
 msgstr "%s: Gorchymyn gweinydd gwag am dangosydd %s"
 
-#: daemon/server.c:1135
+#: daemon/server.c:1172
 #, c-format
 msgid "%s: Server was to be spawned by uid %d but that user doesn't exist"
 msgstr ""
 "%s: Roedd y gweinydd i fod i gael ei gychwyn gan y UID %d ond nid yw'r "
 "defnyddiwr hwnnw'n bodoli"
 
-#: daemon/server.c:1150 daemon/slave.c:2234 daemon/slave.c:2692
+#: daemon/server.c:1187 daemon/slave.c:2500 daemon/slave.c:2978
 #, c-format
 msgid "%s: Couldn't set groupid to %d"
 msgstr "%s: Methwyd gosod yr ID grŵp i %d"
 
-#: daemon/server.c:1156 daemon/slave.c:2239 daemon/slave.c:2697
+#: daemon/server.c:1193 daemon/slave.c:2505 daemon/slave.c:2983
 #, c-format
 msgid "%s: initgroups() failed for %s"
 msgstr "%s: initgroups() wedi methu am %s"
 
-#: daemon/server.c:1162 daemon/slave.c:2244 daemon/slave.c:2702
+#: daemon/server.c:1199 daemon/slave.c:2510 daemon/slave.c:2988
 #, c-format
 msgid "%s: Couldn't set userid to %d"
 msgstr "%s: Methwyd gosod yr ID defnyddiwr i %d"
 
-#: daemon/server.c:1169
+#: daemon/server.c:1206
 #, c-format
 msgid "%s: Couldn't set groupid to 0"
 msgstr "%s: Methwyd gosod yr ID grŵp i 0"
 
-#: daemon/server.c:1180
+#: daemon/server.c:1217
 #, c-format
 msgid "%s: Xserver not found: %s"
 msgstr "%s: Gweinydd X heb ei ganfod: %s"
 
-#: daemon/server.c:1188
+#: daemon/server.c:1225
 #, c-format
 msgid "%s: Can't fork Xserver process!"
 msgstr "%s: Ni ellir fforcio proses gweinydd X!"
 
-#: daemon/slave.c:987
+#: daemon/slave.c:307
+msgid "Can't set EGID to user GID"
+msgstr ""
+
+#: daemon/slave.c:315
+msgid "Can't set EUID to user UID"
+msgstr ""
+
+#: daemon/slave.c:1120
 msgid "Log in anyway"
 msgstr "Mewngofnodi beth bynnag"
 
 # TRWSIO (.)
-#: daemon/slave.c:989
+#: daemon/slave.c:1122
 msgid ""
 "You are already logged in.  You can log in anyway, return to your previous "
 "login session, or abort this login"
@@ -894,21 +943,21 @@ msgstr ""
 "Rydych wedi mewngofnodi eisioes. Fe allech fewngofnodi beth bynnag, mynd yn "
 "ôl i'r sesiwn mewngofnod blaenorol, neu terfynnu y mewngofnodiad hwn"
 
-#: daemon/slave.c:993
+#: daemon/slave.c:1126
 msgid "Return to previous login"
 msgstr "Mynd yn ôl i'r mewngofnodiad blaenorol"
 
-#: daemon/slave.c:994 daemon/slave.c:1000
+#: daemon/slave.c:1127 daemon/slave.c:1133
 msgid "Abort login"
 msgstr "Terfynnu'r mewngofnodiad"
 
-#: daemon/slave.c:997
+#: daemon/slave.c:1130
 msgid "You are already logged in.  You can log in anyway or abort this login"
 msgstr ""
 "Rydych yn barod wedi mewngofnodi. My allech mewngofnodi beth bynnag, neu "
 "terfynnu y mewngofnodiad hyn"
 
-#: daemon/slave.c:1087
+#: daemon/slave.c:1221
 msgid ""
 "I could not start the X\n"
 "server (your graphical environment)\n"
@@ -929,17 +978,17 @@ msgstr ""
 "Os gwelwch yn dda, ailgychwynwch GDM\n"
 "pan mae'r broblem wedi ei thrwsio."
 
-#: daemon/slave.c:1323
+#: daemon/slave.c:1470
 #, c-format
 msgid "%s: cannot fork"
 msgstr "%s: methu fforchio"
 
-#: daemon/slave.c:1370
+#: daemon/slave.c:1517
 #, c-format
 msgid "%s: cannot open display %s"
 msgstr "%s: wedi methu agor y dangosydd %s"
 
-#: daemon/slave.c:1520
+#: daemon/slave.c:1668
 msgid ""
 "Could not execute the configuration program.  Make sure it's path is set "
 "correctly in the configuration file.  I will attempt to start it from the "
@@ -949,7 +998,7 @@ msgstr ""
 "osod yn gywir yn a ffeil cyluniad. Fe fyddaf yn awr yn ceisio ei gychwyn e "
 "o'r lleoliad rhaogosod."
 
-#: daemon/slave.c:1534
+#: daemon/slave.c:1682
 msgid ""
 "Could not execute the configuration program.  Make sure it's path is set "
 "correctly in the configuration file."
@@ -958,7 +1007,7 @@ msgstr ""
 "yn gywir yn y ffeil cyfluniad."
 
 # TRWSIO (\n?)
-#: daemon/slave.c:1661
+#: daemon/slave.c:1812
 msgid ""
 "Enter the root password\n"
 "to run the configuration."
@@ -966,12 +1015,12 @@ msgstr ""
 "Rhowch gyfrinair root\n"
 "er mwyn gweithredu'r cyfluniad."
 
-#: daemon/slave.c:2188 daemon/slave.c:2193
+#: daemon/slave.c:2454 daemon/slave.c:2459
 #, c-format
 msgid "%s: Can't init pipe to gdmgreeter"
 msgstr "%s: Wedi methu ymgychwyn pibell i gdmgreeter"
 
-#: daemon/slave.c:2312
+#: daemon/slave.c:2582
 msgid ""
 "No servers were defined in the configuration file and XDMCP was disabled.  "
 "This can only be a configuration error.  So I have started a single server "
@@ -984,7 +1033,7 @@ msgstr ""
 "thrwsio'r cyfluniad. Nodwch fod mewngofnodiadau awtomatig ac amserol wedi eu "
 "analluogi."
 
-#: daemon/slave.c:2326
+#: daemon/slave.c:2596
 msgid ""
 "I could not start the regular X server (your graphical environment) and so "
 "this is a failsafe X server.  You should log in and properly configure the X "
@@ -994,7 +1043,7 @@ msgstr ""
 "mae hyn yn weinydd difethiant. Fe ddylech chi fewngofnodi a chyflunio'r "
 "gweinydd X yn gywir."
 
-#: daemon/slave.c:2335
+#: daemon/slave.c:2605
 #, c-format
 msgid ""
 "The specified display number was busy, so this server was started on display "
@@ -1003,7 +1052,7 @@ msgstr ""
 "Roedd y rhif dangosydd a benodwyd yn brysur, felly cychwynwyd y gweinydd hwn "
 "ar y dangosydd %s."
 
-#: daemon/slave.c:2355
+#: daemon/slave.c:2625
 msgid ""
 "The greeter program appears to be crashing.\n"
 "I will attempt to use a different one."
@@ -1012,20 +1061,20 @@ msgstr ""
 "Fe fydda i'n ceisio defnyddio un gwahanol."
 
 #. Something went wrong
-#: daemon/slave.c:2380
+#: daemon/slave.c:2646
 #, c-format
 msgid "%s: Cannot start greeter with gtk modules: %s. Trying without modules"
 msgstr ""
 "%s: Ni ellir cychwyn y cyfarchydd gyda modylau gtk: %s. Yn ceisio heb "
 "fodylau."
 
-#: daemon/slave.c:2387
+#: daemon/slave.c:2653
 #, c-format
 msgid "%s: Cannot start greeter trying default: %s"
 msgstr "%s: Ni ellir cychwyn y cyfarchydd, yn ceisio'r rhagosodyn: %s"
 
 # TRWSIO (.)
-#: daemon/slave.c:2400
+#: daemon/slave.c:2665
 msgid ""
 "Cannot start the greeter program, you will not be able to log in.  This "
 "display will be disabled.  Try logging in by other means and editing the "
@@ -1036,27 +1085,27 @@ msgstr ""
 "golygu'r ffeil cyfluniad"
 
 #. If no greeter we really have to disable the display
-#: daemon/slave.c:2407
+#: daemon/slave.c:2672
 #, c-format
 msgid "%s: Error starting greeter on display %s"
 msgstr "%s: Gwall wrth gychwyn gyfarchydd ar y dangosydd %s"
 
-#: daemon/slave.c:2411
+#: daemon/slave.c:2676
 #, c-format
 msgid "%s: Can't fork gdmgreeter process"
 msgstr "%s: Wedi methu fforchio'r broses gdmgreeter"
 
-#: daemon/slave.c:2496
+#: daemon/slave.c:2761
 #, c-format
 msgid "%s: Can't open fifo!"
 msgstr "%s: Ni ellir agor FIFO!"
 
-#: daemon/slave.c:2651
+#: daemon/slave.c:2937
 #, c-format
 msgid "%s: Can't init pipe to gdmchooser"
 msgstr "%s: Wedi methu ymgychwyn pibell i gdmchooser"
 
-#: daemon/slave.c:2740
+#: daemon/slave.c:3035
 msgid ""
 "Cannot start the chooser program, you will probably not be able to log in.  "
 "Please contact the system administrator."
@@ -1064,57 +1113,57 @@ msgstr ""
 "Ni ellir cychwyn y rhaglen dewis, mae'n debygol ni fyddwch yn gallu "
 "mewngofnodi. Cysylltwch â gweinyddwr y system os gwelwch yn dda."
 
-#: daemon/slave.c:2744
+#: daemon/slave.c:3039
 #, c-format
 msgid "%s: Error starting chooser on display %s"
 msgstr "%s: Gwall wrth gychwyn gewisydd ar y dangosydd %s"
 
-#: daemon/slave.c:2747
+#: daemon/slave.c:3042
 #, c-format
 msgid "%s: Can't fork gdmchooser process"
 msgstr "%s: Wedi methu fforchio'r broses gdmchooser"
 
-#: daemon/slave.c:2919
+#: daemon/slave.c:3338
 #, c-format
 msgid "%s: Could not open ~/.xsession-errors"
 msgstr "%s: Wedi methu agor ~/.xsession-errors"
 
-#: daemon/slave.c:3015
+#: daemon/slave.c:3474
 #, c-format
 msgid "%s: Execution of PreSession script returned > 0. Aborting."
 msgstr "%s: Dychwelodd gweithrediad sgript PreSession gwerth > 0. Yn terfynnu."
 
-#: daemon/slave.c:3044
+#: daemon/slave.c:3503
 #, c-format
 msgid "Language %s does not exist, using %s"
 msgstr "Nid yw iaeth %s yn bodoli, yn defnyddio %s"
 
-#: daemon/slave.c:3045
+#: daemon/slave.c:3504
 msgid "System default"
 msgstr "Rhagosodidad y system"
 
-#: daemon/slave.c:3061
+#: daemon/slave.c:3520
 #, c-format
 msgid "%s: Could not setup environment for %s. Aborting."
 msgstr "%s: Ni allwys gosod amgylchedd ar gyfer %s. Yn terfynnu."
 
-#: daemon/slave.c:3081
+#: daemon/slave.c:3541
 #, c-format
 msgid "%s: setusercontext() failed for %s. Aborting."
 msgstr "%s: Methodd setusercontext() ar gyfer %s. Yn terfynnu."
 
-#: daemon/slave.c:3087
+#: daemon/slave.c:3547
 #, c-format
 msgid "%s: Could not become %s. Aborting."
 msgstr "%s: Ni allwyd dod yn %s. Yn terfynu."
 
-#: daemon/slave.c:3146
+#: daemon/slave.c:3607
 #, c-format
 msgid "%s: No Exec line in the session file: %s, starting failsafe GNOME"
 msgstr ""
 "%s: Dim llinell Exec yn y ffeil sesiwn: %s, yn cychwyn GNOME difethiant"
 
-#: daemon/slave.c:3152
+#: daemon/slave.c:3613
 msgid ""
 "The session you selected does not look valid.  I will run the GNOME failsafe "
 "session for you."
@@ -1122,7 +1171,7 @@ msgstr ""
 "Nid yw'r sesiwn dewisoch chi yn ymddangos yn ddilys. Fe fydda i'n rhedeg "
 "sesiwn GNOME diefethiant i chi."
 
-#: daemon/slave.c:3166
+#: daemon/slave.c:3627
 #, c-format
 msgid ""
 "%s: Cannot find or run the base Xsession script, will try GNOME failsafe"
@@ -1130,7 +1179,7 @@ msgstr ""
 "%s: Ni ellir canfod na rhedeg y sgript Xsession sail, fe fyddaf yn ceisio "
 "difethiant GNOME"
 
-#: daemon/slave.c:3171
+#: daemon/slave.c:3633
 msgid ""
 "Cannot find or run the base session script, will try the GNOME failsafe "
 "session for you."
@@ -1139,14 +1188,14 @@ msgstr ""
 "difethiant GNOME i chi."
 
 #. yaikes
-#: daemon/slave.c:3186
+#: daemon/slave.c:3648
 #, c-format
 msgid "%s: gnome-session not found for a failsafe GNOME session, trying xterm"
 msgstr ""
 "%s: Methwyd canfod gnome-session ar gyfer sesiwn GNOME difethiant, yn ceisio "
 "xterm"
 
-#: daemon/slave.c:3191
+#: daemon/slave.c:3653
 msgid ""
 "Could not find the GNOME installation, will try running the \"Failsafe xterm"
 "\" session."
@@ -1154,7 +1203,7 @@ msgstr ""
 "%s: Methwyd canfod y sefydliad GNOME, ceisiaf rhedeg y sesiwn \"Xterm "
 "difethiant\"."
 
-#: daemon/slave.c:3199
+#: daemon/slave.c:3661
 msgid ""
 "This is the Failsafe Gnome session.  You will be logged into the 'Default' "
 "session of Gnome with no startup scripts run.  This is only to fix problems "
@@ -1164,11 +1213,11 @@ msgstr ""
 "'Rhagosod' GNOME efo dim sgriptiau cychwyn yn cael eu rhedeg. Mae hyn ond er "
 "mwyn trwsio problemau yn eich sefydliad."
 
-#: daemon/slave.c:3214
+#: daemon/slave.c:3676
 msgid "Cannot find \"xterm\" to start a failsafe session."
 msgstr "Methu canfod \"xterm\" er mwyn dechrau sesiwn difethiant."
 
-#: daemon/slave.c:3227
+#: daemon/slave.c:3689
 msgid ""
 "This is the Failsafe xterm session.  You will be logged into a terminal "
 "console so that you may fix your system if you cannot log in any other way.  "
@@ -1179,38 +1228,42 @@ msgstr ""
 "rhyw ddull arall. Er mwyn gadael yr efelychydd terfynell, teipiwch 'exit' ac "
 "Enter i fewn i'r ffenest."
 
-#: daemon/slave.c:3254
+#: daemon/slave.c:3716
 #, c-format
 msgid "%s: User not allowed to log in"
 msgstr "%s: Ni chaiff y defnyddiwr fewngofnodi"
 
-#: daemon/slave.c:3257
+#: daemon/slave.c:3719
 msgid "The system administrator has disabled your account."
 msgstr "Mae gweinyddwr y system wedi analluogi eich cyfrif."
 
+#: daemon/slave.c:3748
+msgid "Error! Unable to set executable context."
+msgstr ""
+
 #. will go to .xsession-errors
-#: daemon/slave.c:3268 daemon/slave.c:3273
+#: daemon/slave.c:3756 daemon/slave.c:3761
 #, c-format
 msgid "%s: Could not exec %s %s %s"
 msgstr "%s: Ni allwyd exec() %s %s %s"
 
 #. we can't really be any more specific
-#: daemon/slave.c:3284
+#: daemon/slave.c:3772
 msgid "Cannot start the session due to some internal error."
 msgstr "Ni ellir cychwyn y sesiwn oherwydd rhyw wall mewnol."
 
 # TRWSIO
-#: daemon/slave.c:3337
+#: daemon/slave.c:3826
 #, c-format
 msgid "%s: User passed auth but getpwnam(%s) failed!"
 msgstr "%s: Pasiodd y defnyddiwr y dilysiad ond methodd getpwnam(%s)!"
 
-#: daemon/slave.c:3351
+#: daemon/slave.c:3840
 #, c-format
 msgid "%s: Execution of PostLogin script returned > 0. Aborting."
 msgstr "%s: Dychwelodd gweithrediad sgript PostLogin gwerth > 0. Yn terfynu."
 
-#: daemon/slave.c:3360
+#: daemon/slave.c:3849
 #, c-format
 msgid ""
 "Your home directory is listed as:\n"
@@ -1228,12 +1281,12 @@ msgstr ""
 "Mae'n anhebygol ni fydd unrhywbeth yn gweithio os nad ydych chi'n defnyddio "
 "sesiwn difethiant."
 
-#: daemon/slave.c:3368
+#: daemon/slave.c:3857
 #, c-format
 msgid "%s: Home directory for %s: '%s' does not exist!"
 msgstr "%s: Nid yw cyfeiriadur cartref ar gyfer %s: '%s' yn bodoli!"
 
-#: daemon/slave.c:3496
+#: daemon/slave.c:4037
 msgid ""
 "GDM could not write to your authorization file.  This could mean that you "
 "are out of disk space or that your home directory could not be opened for "
@@ -1245,12 +1298,12 @@ msgstr ""
 "er mwyn ysgrifennu. Fodd bynnag, nid yw'n bosib mewngofnodi. Os gwelwch yn "
 "dda, cysylltwch a gweinyddwr eich system."
 
-#: daemon/slave.c:3573
+#: daemon/slave.c:4113
 #, c-format
 msgid "%s: Error forking user session"
 msgstr "%s: Gwall wrth fforcio sesiwn defnyddiwr"
 
-#: daemon/slave.c:3652
+#: daemon/slave.c:4194
 msgid ""
 "Your session only lasted less than 10 seconds.  If you have not logged out "
 "yourself, this could mean that there is some installation problem or that "
@@ -1262,45 +1315,51 @@ msgstr ""
 "lle ar y disg. Ceisiwch mewngofnodi gyda un o'r sesiynau difethiant er mwyn "
 "gweld os gallwch drwsio'r broblem."
 
-#: daemon/slave.c:3660
+#: daemon/slave.c:4202
 msgid "View details (~/.xsession-errors file)"
 msgstr "Gweld manylion (ffeil ~/.xsession-errors)"
 
-#: daemon/slave.c:3786
+#: daemon/slave.c:4346
 msgid "GDM detected a shutdown or reboot in progress."
 msgstr "Synhwyrodd GDM ataliad neu ailfwtiad yn digwydd."
 
-#: daemon/slave.c:3880
+#: daemon/slave.c:4440
 #, c-format
 msgid "Ping to %s failed, whacking display!"
 msgstr "Methodd ping i %s, yn bwrw'r dangosydd!"
 
-#: daemon/slave.c:4153
+#: daemon/slave.c:4726
 #, c-format
 msgid "%s: Fatal X error - Restarting %s"
 msgstr "%s :Gwall X farwol - Ailgychwyn %s"
 
-#: daemon/slave.c:4554
+#: daemon/slave.c:4820
+msgid ""
+"Login sound requested on non-local display or the play software cannot be "
+"run or the sound does not exist"
+msgstr ""
+
+#: daemon/slave.c:5175
 #, c-format
 msgid "%s: Failed starting: %s"
 msgstr "%s: Methwyd cychwyn: %s"
 
-#: daemon/slave.c:4562 daemon/slave.c:4699
+#: daemon/slave.c:5183 daemon/slave.c:5322
 #, c-format
 msgid "%s: Can't fork script process!"
 msgstr "%s: Ni ellir fforcio proses sgript!"
 
-#: daemon/slave.c:4656
+#: daemon/slave.c:5277
 #, c-format
 msgid "%s: Failed creating pipe"
 msgstr "%s: Methwyd creu piben"
 
-#: daemon/slave.c:4693
+#: daemon/slave.c:5316
 #, c-format
 msgid "%s: Failed executing: %s"
 msgstr "%s: Methwyd gweithred: %s"
 
-#: daemon/verify-crypt.c:70 daemon/verify-pam.c:708 daemon/verify-shadow.c:71
+#: daemon/verify-crypt.c:75 daemon/verify-pam.c:723 daemon/verify-shadow.c:76
 msgid ""
 "\n"
 "Incorrect username or password.  Letters must be typed in the correct case."
@@ -1309,54 +1368,56 @@ msgstr ""
 "Enw defnyddiwr neu gyfrinair anghywir. Rhaid teipio llythrennau yn y "
 "priflythrennedd cywir."
 
-#: daemon/verify-crypt.c:75 daemon/verify-pam.c:718 daemon/verify-shadow.c:76
+#: daemon/verify-crypt.c:80 daemon/verify-pam.c:733 daemon/verify-shadow.c:81
 msgid "Please make sure the Caps Lock key is not enabled."
 msgstr ""
 "Os gwelwch yn dda, sicrhewch nad yw'r bysell Caps Lock wedi ei alluogi."
 
 #. I think I'll add the buttons next to this
-#: daemon/verify-crypt.c:114 daemon/verify-pam.c:175
-#: daemon/verify-shadow.c:113 gui/gdmlogin.c:2905
+#: daemon/verify-crypt.c:127 daemon/verify-pam.c:176
+#: daemon/verify-shadow.c:126 gui/gdmlogin.c:3052
 msgid "Please enter your username"
 msgstr "Rhowch enw eich cyfrif os gwelwch yn dda"
 
 #. login: is whacked always translate to Username:
-#: daemon/verify-crypt.c:115 daemon/verify-pam.c:91 daemon/verify-pam.c:92
-#: daemon/verify-pam.c:93 daemon/verify-pam.c:169 daemon/verify-pam.c:505
-#: daemon/verify-shadow.c:114 gui/gdmlogin.c:1095 gui/gdmlogin.c:1109
-#: gui/gdmlogin.c:1757 gui/gdmlogin.c:2223 gui/greeter/greeter.c:265
-#: gui/greeter/greeter_parser.c:1045
+#: daemon/verify-crypt.c:128 daemon/verify-pam.c:92 daemon/verify-pam.c:93
+#: daemon/verify-pam.c:94 daemon/verify-pam.c:170 daemon/verify-pam.c:512
+#: daemon/verify-shadow.c:127 gui/gdmlogin.c:1073 gui/gdmlogin.c:1087
+#: gui/gdmlogin.c:1873 gui/gdmlogin.c:2342 gui/greeter/greeter.c:272
+#: gui/greeter/greeter_parser.c:1061
 msgid "Username:"
 msgstr "Enw Defnyddiwr:"
 
-#: daemon/verify-crypt.c:153 daemon/verify-pam.c:94 daemon/verify-pam.c:95
-#: daemon/verify-pam.c:216 daemon/verify-shadow.c:171 gui/gdmlogin.c:1789
+#: daemon/verify-crypt.c:166 daemon/verify-pam.c:95 daemon/verify-pam.c:96
+#: daemon/verify-pam.c:223 daemon/verify-shadow.c:184 gui/gdmlogin.c:1905
 msgid "Password:"
 msgstr "Cyfrinair:"
 
-#: daemon/verify-crypt.c:171 daemon/verify-crypt.c:185
-#: daemon/verify-shadow.c:189 daemon/verify-shadow.c:203
+#: daemon/verify-crypt.c:184 daemon/verify-crypt.c:198
+#: daemon/verify-shadow.c:202 daemon/verify-shadow.c:216
 #, c-format
 msgid "Couldn't authenticate user \"%s\""
 msgstr "Ni allwyd dilysu'r defnyddiwr \"%s\""
 
-#: daemon/verify-crypt.c:198 daemon/verify-pam.c:594
-#: daemon/verify-shadow.c:216
+#: daemon/verify-crypt.c:211 daemon/verify-pam.c:609
+#: daemon/verify-shadow.c:229
 #, c-format
 msgid "Root login disallowed on display '%s'"
 msgstr "Mewngofnodiad root wedi ei wahardd ar y dangosydd '%s'"
 
-#: daemon/verify-crypt.c:200 daemon/verify-shadow.c:218
+#: daemon/verify-crypt.c:213 daemon/verify-shadow.c:231
 msgid "The system administrator is not allowed to login from this screen"
 msgstr "Nid yw gweinyddwr y system yn cael mewngofnodi o'r sgrîn hwn"
 
-#: daemon/verify-crypt.c:216 daemon/verify-shadow.c:234
+#: daemon/verify-crypt.c:229 daemon/verify-crypt.c:253
+#: daemon/verify-shadow.c:247 daemon/verify-shadow.c:271
 #, c-format
 msgid "User %s not allowed to log in"
 msgstr "Ni chaiff y defnyddiwr %s fewngofnodi"
 
-#: daemon/verify-crypt.c:218 daemon/verify-pam.c:624 daemon/verify-pam.c:873
-#: daemon/verify-shadow.c:236
+#: daemon/verify-crypt.c:231 daemon/verify-crypt.c:255 daemon/verify-pam.c:639
+#: daemon/verify-pam.c:888 daemon/verify-shadow.c:249
+#: daemon/verify-shadow.c:273
 msgid ""
 "\n"
 "The system administrator has disabled your account."
@@ -1364,16 +1425,16 @@ msgstr ""
 "\n"
 "Mae gweinyddwr y system wedi analluogi eich cyfrif."
 
-#: daemon/verify-crypt.c:233 daemon/verify-crypt.c:270 daemon/verify-pam.c:642
-#: daemon/verify-pam.c:890 daemon/verify-shadow.c:250
-#: daemon/verify-shadow.c:286
+#: daemon/verify-crypt.c:278 daemon/verify-crypt.c:416 daemon/verify-pam.c:657
+#: daemon/verify-pam.c:905 daemon/verify-shadow.c:296
+#: daemon/verify-shadow.c:434
 #, c-format
 msgid "Cannot set user group for %s"
 msgstr "Ni ellir gosod grŵp defnyddiwr ar gyfer %s"
 
-#: daemon/verify-crypt.c:235 daemon/verify-crypt.c:273 daemon/verify-pam.c:644
-#: daemon/verify-pam.c:893 daemon/verify-shadow.c:252
-#: daemon/verify-shadow.c:289
+#: daemon/verify-crypt.c:280 daemon/verify-crypt.c:419 daemon/verify-pam.c:659
+#: daemon/verify-pam.c:908 daemon/verify-shadow.c:298
+#: daemon/verify-shadow.c:437
 msgid ""
 "\n"
 "Cannot set your user group, you will not be able to log in, please contact "
@@ -1383,99 +1444,158 @@ msgstr ""
 "Ni ellid osod eich grŵp defnyddiwr, ni fyddwch yn galli mewngofnodi, "
 "cysylltwch a gweinddwr eich system os gwelwch yn dda."
 
-#: daemon/verify-crypt.c:265 daemon/verify-shadow.c:281
+#: daemon/verify-crypt.c:291 daemon/verify-crypt.c:364
+#: daemon/verify-shadow.c:309 daemon/verify-shadow.c:383
+#, c-format
+msgid "Password of %s has expired"
+msgstr ""
+
+#: daemon/verify-crypt.c:293 daemon/verify-shadow.c:311
+#, fuzzy (I added the second line, please check! Telsa)
+msgid ""
+"You are required to change your password.\n"
+"Please choose a new one."
+msgstr 
+"Mae'n rhaid i chi newid eich cyfrinair.\n"
+"Dewiswch gyfrinair newydd, os gwelwch chi'n dda."
+
+#: daemon/verify-crypt.c:304 daemon/verify-shadow.c:322
+#, fuzzy
+msgid ""
+"\n"
+"Cannot change your password, you will not be able to log in, please try "
+"again later or contact your system administrator."
+msgstr ""
+"\n"
+"Ni ellid osod eich grŵp defnyddiwr, ni fyddwch yn galli mewngofnodi, "
+"cysylltwch a gweinddwr eich system os gwelwch yn dda."
+
+#: daemon/verify-crypt.c:347 daemon/verify-crypt.c:355
+#: daemon/verify-shadow.c:366 daemon/verify-shadow.c:374
+#, fuzzy
+msgid ""
+"Your password has been changed but you may have to change it again, please "
+"try again later or contact your system administrator."
+msgstr ""
+"\n"
+"Methodd y newid i'r tocyn awdurdodaeth. Os gwelwch y ndda, ceisiwch eto "
+"wedyn neu cysylltwch a gweinyddwr y system."
+
+#: daemon/verify-crypt.c:366 daemon/verify-shadow.c:385
+#, fuzzy
+msgid ""
+"Your password has expired.\n"
+"Only a system administrator can now change it"
+msgstr ""
+"Mae eich cyfrif wedi darfod; cydylltwch â gweinyddwr eich system os gwelwch "
+"yn dda"
+
+#: daemon/verify-crypt.c:373 daemon/verify-shadow.c:392
+msgid "Internal error on passwdexpired"
+msgstr ""
+
+#: daemon/verify-crypt.c:375 daemon/verify-shadow.c:394
+#, fuzzy
+msgid ""
+"An internal error occured, you will not be able to log in.\n"
+"Please try again later or contact your system administrator."
+msgstr ""
+"\n"
+"Ni ellid osod eich grŵp defnyddiwr, ni fyddwch yn galli mewngofnodi, "
+"cysylltwch a gweinddwr eich system os gwelwch yn dda."
+
+#: daemon/verify-crypt.c:411 daemon/verify-shadow.c:429
 #, c-format
 msgid "Cannot get passwd structure for %s"
 msgstr "Ni ellir cyrchu strwythur cyfrinair ar gyfer %s"
 
-#: daemon/verify-pam.c:96
+#: daemon/verify-pam.c:97
 msgid "You are required to change your password immediately (password aged)"
 msgstr "Mae'n rhaid i chi newid eich cyfrinair ar unwaith (hen gyfrinair)"
 
-#: daemon/verify-pam.c:97
+#: daemon/verify-pam.c:98
 msgid "You are required to change your password immediately (root enforced)"
 msgstr "Mae'n rhaid i chi newid eich cyfrinair ar unwaith (gofynnol gan root)"
 
-#: daemon/verify-pam.c:98
+#: daemon/verify-pam.c:99
 msgid "Your account has expired; please contact your system administrator"
 msgstr ""
 "Mae eich cyfrif wedi darfod; cydylltwch â gweinyddwr eich system os gwelwch "
 "yn dda"
 
-#: daemon/verify-pam.c:99
+#: daemon/verify-pam.c:100
 msgid "No password supplied"
 msgstr "Darparwyd dim cyfrinair"
 
-#: daemon/verify-pam.c:100
+#: daemon/verify-pam.c:101
 msgid "Password unchanged"
 msgstr "Cyfrinair heb ei newid"
 
-#: daemon/verify-pam.c:101
+#: daemon/verify-pam.c:102
 msgid "Can not get username"
 msgstr "Ni ellir cyrchu'r enw defnyddiwr"
 
-#: daemon/verify-pam.c:102
+#: daemon/verify-pam.c:103
 msgid "Retype new UNIX password:"
 msgstr "Aildeipiwch y cyfrinair UNIX newydd:"
 
-#: daemon/verify-pam.c:103
+#: daemon/verify-pam.c:104
 msgid "Enter new UNIX password:"
 msgstr "Rhoiwch eich cyfrinair UNIX newydd:"
 
-#: daemon/verify-pam.c:104
+#: daemon/verify-pam.c:105
 msgid "(current) UNIX password:"
 msgstr "Cyfrinair UNIX (cyfredol):"
 
-#: daemon/verify-pam.c:105
+#: daemon/verify-pam.c:106
 msgid "Error while changing NIS password."
 msgstr "Gwall wrth newid cyfrinair NIS."
 
-#: daemon/verify-pam.c:106
+#: daemon/verify-pam.c:107
 msgid "You must choose a longer password"
 msgstr "Mae'n rhaid i chi ddewis cyfrinair hirach."
 
-#: daemon/verify-pam.c:107
+#: daemon/verify-pam.c:108
 msgid "Password has been already used. Choose another."
 msgstr "Mae'r cyfrinair wedi ei ddefnyddio eisioes. Dewiswch yn gwahanol."
 
 # TRWSIO (.)
-#: daemon/verify-pam.c:108
+#: daemon/verify-pam.c:109
 msgid "You must wait longer to change your password"
 msgstr "Mae'n rhaid i chi aros yn hirach er mwyn newid eich cyfrinair"
 
-#: daemon/verify-pam.c:109
+#: daemon/verify-pam.c:110
 msgid "Sorry, passwords do not match"
 msgstr "Mae'n flin, nid yw'r cyfrineiriau'n cydweddu"
 
-#: daemon/verify-pam.c:380
+#: daemon/verify-pam.c:387
 msgid "Cannot setup pam handle with null display"
 msgstr "Ni ellir gosod trinydd PAM efo dangosydd NULL"
 
-#: daemon/verify-pam.c:397
+#: daemon/verify-pam.c:404
 #, c-format
 msgid "Unable to establish service %s: %s\n"
 msgstr "Ni ellir sefydlu gwasanaeth %s: %s\n"
 
 # TRWSIO
-#: daemon/verify-pam.c:405
+#: daemon/verify-pam.c:412
 #, c-format
 msgid "Can't set PAM_TTY=%s"
 msgstr "Ni ellir gosod PAM_TTY=%s"
 
-#: daemon/verify-pam.c:415
+#: daemon/verify-pam.c:422
 #, c-format
 msgid "Can't set PAM_RHOST=%s"
 msgstr "Ni ellir gosod PAM_RHOST=%s"
 
-#. is not really an auth problem, but it will
-#. pretty much look as such, it shouldn't really
-#. happen
-#: daemon/verify-pam.c:550 daemon/verify-pam.c:569 daemon/verify-pam.c:823
-#: daemon/verify-pam.c:836
+#. #endif
+#. PAM_FAIL_DELAY
+#: daemon/verify-pam.c:565 daemon/verify-pam.c:584 daemon/verify-pam.c:838
+#: daemon/verify-pam.c:851
 msgid "Couldn't authenticate user"
 msgstr "Methwyd dilysu'r defnyddiwr"
 
-#: daemon/verify-pam.c:597
+#: daemon/verify-pam.c:612
 msgid ""
 "\n"
 "The system administrator is not allowed to login from this screen"
@@ -1483,12 +1603,12 @@ msgstr ""
 "\n"
 "Nid yw gweiyddwr y system yn cael mewngofnodi o'r sgrîn hwn"
 
-#: daemon/verify-pam.c:613
+#: daemon/verify-pam.c:628
 #, c-format
 msgid "Authentication token change failed for user %s"
 msgstr "Methwyd newid tocyn awdurdodaeth ar gyfer y defnyddiwr %s"
 
-#: daemon/verify-pam.c:615
+#: daemon/verify-pam.c:630
 msgid ""
 "\n"
 "The change of the authentication token failed. Please try again later or "
@@ -1498,17 +1618,17 @@ msgstr ""
 "Methodd y newid i'r tocyn awdurdodaeth. Os gwelwch y ndda, ceisiwch eto "
 "wedyn neu cysylltwch a gweinyddwr y system."
 
-#: daemon/verify-pam.c:622 daemon/verify-pam.c:870
+#: daemon/verify-pam.c:637 daemon/verify-pam.c:885
 #, c-format
 msgid "User %s no longer permitted to access the system"
 msgstr "Ni chaiff y defnyddiwr %s ddefnyddio'r system bellach"
 
-#: daemon/verify-pam.c:628 daemon/verify-pam.c:876
+#: daemon/verify-pam.c:643 daemon/verify-pam.c:891
 #, c-format
 msgid "User %s not permitted to gain access at this time"
 msgstr "Ni chaiff y defnyddiwr %s ddefnyddio'r system ar hyn o bryd"
 
-#: daemon/verify-pam.c:630
+#: daemon/verify-pam.c:645
 msgid ""
 "\n"
 "The system administrator has disabled access to the system temporarily."
@@ -1516,22 +1636,22 @@ msgstr ""
 "\n"
 "Mae gweinyddwr y system wedi analluogi mynediad i'r system dros dro."
 
-#: daemon/verify-pam.c:635 daemon/verify-pam.c:883
+#: daemon/verify-pam.c:650 daemon/verify-pam.c:898
 #, c-format
 msgid "Couldn't set acct. mgmt for %s"
 msgstr "Methwyd gosod rheolaeth cyfrf ar gyfer %s"
 
-#: daemon/verify-pam.c:656 daemon/verify-pam.c:906
+#: daemon/verify-pam.c:671 daemon/verify-pam.c:921
 #, c-format
 msgid "Couldn't set credentials for %s"
 msgstr "Methwyd gosod credlythyrau ar gyfer %s"
 
-#: daemon/verify-pam.c:670 daemon/verify-pam.c:921
+#: daemon/verify-pam.c:685 daemon/verify-pam.c:936
 #, c-format
 msgid "Couldn't open session for %s"
 msgstr "Methwyd agor sesiwn ar gyfer %s"
 
-#: daemon/verify-pam.c:712
+#: daemon/verify-pam.c:727
 msgid ""
 "\n"
 "Authentication failed.  Letters must be typed in the correct case."
@@ -1540,15 +1660,15 @@ msgstr ""
 "Methodd dilysiad. Rhaid i lythrennau gael eu teipio yn y priflythrenned "
 "cywir."
 
-#: daemon/verify-pam.c:728 daemon/verify-pam.c:826 daemon/verify-pam.c:839
+#: daemon/verify-pam.c:743 daemon/verify-pam.c:841 daemon/verify-pam.c:854
 msgid "Authentication failed"
 msgstr "Method dilysiad"
 
-#: daemon/verify-pam.c:792
+#: daemon/verify-pam.c:807
 msgid "Automatic login"
 msgstr "Mewngofnodiad awtomatig"
 
-#: daemon/verify-pam.c:879
+#: daemon/verify-pam.c:894
 msgid ""
 "\n"
 "The system administrator has disabled your access to the system temporary."
@@ -1556,200 +1676,202 @@ msgstr ""
 "\n"
 "Mae gweinyddwr y systm wedi analluogi eich myndiad i'r system dros dro."
 
-#: daemon/verify-pam.c:1054 daemon/verify-pam.c:1056
+#: daemon/verify-pam.c:1069 daemon/verify-pam.c:1071
 msgid "Can't find PAM configuration for gdm."
 msgstr "Ni ellir canfod cyfluniad PAM ar gyfer GDM."
 
-#: daemon/xdmcp.c:270
+#: daemon/xdmcp.c:369
 #, c-format
 msgid "%s: Could not get server hostname: %s!"
 msgstr "%s: Methwyd cyrchu enw gwesteiwr y gweinydd: %s!"
 
-#: daemon/xdmcp.c:291
+#: daemon/xdmcp.c:394
 #, c-format
 msgid "%s: Could not create socket!"
 msgstr "%s: Methwyd creu soced!"
 
-#: daemon/xdmcp.c:301
+#: daemon/xdmcp.c:487
 #, c-format
 msgid "%s: Could not bind to XDMCP socket!"
 msgstr "%s: Methwyd clymu at soced XDMCP!"
 
-#: daemon/xdmcp.c:369
+#: daemon/xdmcp.c:559
 #, c-format
 msgid "%s: Could not create XDMCP buffer!"
 msgstr "%s: Methwyd creu byffer XDMCP!"
 
-#: daemon/xdmcp.c:375
+#: daemon/xdmcp.c:565
 #, c-format
 msgid "%s: Could not read XDMCP header!"
 msgstr "%s: Methwyd darllen pennawd XDMCP!"
 
-#: daemon/xdmcp.c:382
+#: daemon/xdmcp.c:572
 #, c-format
 msgid "%s: Incorrect XDMCP version!"
 msgstr "%s: Fersiwn XDMCP anghywir!"
 
-#: daemon/xdmcp.c:435
+#: daemon/xdmcp.c:652 daemon/xdmcp.c:659
 #, c-format
 msgid "%s: Unknown opcode from host %s"
 msgstr "%s: Opcode anhysbys o'r gwesteiwr %s"
 
-#: daemon/xdmcp.c:455 daemon/xdmcp.c:741
+#: daemon/xdmcp.c:693 daemon/xdmcp.c:1138
 #, c-format
 msgid "%s: Could not extract authlist from packet"
 msgstr "%s: Methwyd echdynu rehstr awdurdodaeth o'r pecyn"
 
-#: daemon/xdmcp.c:471 daemon/xdmcp.c:761
+#: daemon/xdmcp.c:709 daemon/xdmcp.c:1158
 #, c-format
 msgid "%s: Error in checksum"
 msgstr "%s: Gwall yn y swm gwirio"
 
-#: daemon/xdmcp.c:724
+#: daemon/xdmcp.c:1121
 #, c-format
 msgid "%s: Could not read display address"
 msgstr "%s: Methwyd darllen cyfeiriad dangosydd"
 
-#: daemon/xdmcp.c:732
+#: daemon/xdmcp.c:1129
 #, c-format
 msgid "%s: Could not read display port number"
 msgstr "%s: Methwyd darllen rhif porth y dangosydd"
 
-#: daemon/xdmcp.c:768
+#: daemon/xdmcp.c:1169 daemon/xdmcp.c:1193
 #, c-format
 msgid "%s: Bad address"
 msgstr "%s: Cyfeiriad gwael"
 
-#: daemon/xdmcp.c:883
+#: daemon/xdmcp.c:1352 daemon/xdmcp.c:1359
 #, c-format
 msgid "Denied XDMCP query from host %s"
 msgstr "Gwrthodwyd cais XDMCP o'r gweinydd %s"
 
-#: daemon/xdmcp.c:1012
+#: daemon/xdmcp.c:1585 daemon/xdmcp.c:1592
 #, c-format
 msgid "%s: Got REQUEST from banned host %s"
 msgstr "%s: Cafwyd REQUEST o'r gwesteiwr gwaharddedig %s"
 
-#: daemon/xdmcp.c:1022 daemon/xdmcp.c:1296 daemon/xdmcp.c:1549
+#: daemon/xdmcp.c:1604 daemon/xdmcp.c:1980 daemon/xdmcp.c:2390
 #, c-format
 msgid "%s: Could not read Display Number"
 msgstr "%s: Methwyd darllen Rhif Dangosydd"
 
-#: daemon/xdmcp.c:1029
+#: daemon/xdmcp.c:1611
 #, c-format
 msgid "%s: Could not read Connection Type"
 msgstr "%s: Methwyd darllen Math Cysylltiad"
 
-#: daemon/xdmcp.c:1036
+#: daemon/xdmcp.c:1618
 #, c-format
 msgid "%s: Could not read Client Address"
 msgstr "%s: Methwyd darllen Cyfeiriad Cleient"
 
-#: daemon/xdmcp.c:1044
+#: daemon/xdmcp.c:1626
 #, c-format
 msgid "%s: Could not read Authentication Names"
 msgstr "%s: Methwyd darllen Enwau Dilysu"
 
-#: daemon/xdmcp.c:1053
+#: daemon/xdmcp.c:1635
 #, c-format
 msgid "%s: Could not read Authentication Data"
 msgstr "%s: Methwyd darllen Data Dilysu"
 
-#: daemon/xdmcp.c:1063
+#: daemon/xdmcp.c:1645
 #, c-format
 msgid "%s: Could not read Authorization List"
 msgstr "%s: Methywd daellen Rhestr Dilysu"
 
-#: daemon/xdmcp.c:1080
+#: daemon/xdmcp.c:1662
 #, c-format
 msgid "%s: Could not read Manufacturer ID"
 msgstr "%s: Methwyd darllen ID Gwneuthuriwr"
 
-#: daemon/xdmcp.c:1104
+#: daemon/xdmcp.c:1688 daemon/xdmcp.c:1695
 #, c-format
 msgid "%s: Failed checksum from %s"
 msgstr "%s: Methodd swm gwirio o %s"
 
-#: daemon/xdmcp.c:1281
+#: daemon/xdmcp.c:1956 daemon/xdmcp.c:1963
 #, c-format
 msgid "%s: Got Manage from banned host %s"
 msgstr "%s: Cafwyd MANAGE o'r gwesteiwr gwaharddedig %s"
 
-#: daemon/xdmcp.c:1289 daemon/xdmcp.c:1556
+#: daemon/xdmcp.c:1973 daemon/xdmcp.c:2397
 #, c-format
 msgid "%s: Could not read Session ID"
 msgstr "%s: Methwyd darllen ID Sesiwn"
 
-#: daemon/xdmcp.c:1303
+#: daemon/xdmcp.c:1987
 #, c-format
 msgid "%s: Could not read Display Class"
 msgstr "%s: Methwyd darllen Dosbarth Dangosydd"
 
-#: daemon/xdmcp.c:1395 daemon/xdmcp.c:1401 daemon/xdmcp.c:1459
-#: daemon/xdmcp.c:1465
+#: daemon/xdmcp.c:2108 daemon/xdmcp.c:2115 daemon/xdmcp.c:2127
+#: daemon/xdmcp.c:2237 daemon/xdmcp.c:2244 daemon/xdmcp.c:2256
 #, c-format
 msgid "%s: Could not read address"
 msgstr "%s: Methwyd darllen cyfeiriad"
 
-#: daemon/xdmcp.c:1541
+#: daemon/xdmcp.c:2367 daemon/xdmcp.c:2381
 #, c-format
 msgid "%s: Got KEEPALIVE from banned host %s"
 msgstr "%s: Cafwyd KEEPALIVE o westeiwr gwaharddedig %s"
 
-#: daemon/xdmcp.c:1799 daemon/xdmcp.c:1806 daemon/xdmcp.c:1812
+#: daemon/xdmcp.c:2690 daemon/xdmcp.c:2697 daemon/xdmcp.c:2703
 #, c-format
 msgid "%s: No XDMCP support"
 msgstr "%s: Dim cynhaliaeth XDMCP"
 
-#: gui/gdmXnestchooser.c:132 gui/gdmXnestchooser.c:139
+#: gui/gdmXnestchooser.c:166 gui/gdmXnestchooser.c:173
 msgid "Xnest command line"
 msgstr "Llinell orchymyn Xnest"
 
-#: gui/gdmXnestchooser.c:132 gui/gdmXnestchooser.c:139
+#: gui/gdmXnestchooser.c:166 gui/gdmXnestchooser.c:173
 msgid "STRING"
 msgstr "LLINYN"
 
-#: gui/gdmXnestchooser.c:133 gui/gdmXnestchooser.c:140
+#: gui/gdmXnestchooser.c:167 gui/gdmXnestchooser.c:174
 msgid "Extra options for Xnest"
 msgstr "Opsiynnau ychwanegol ar gyfer Xnest"
 
-#: gui/gdmXnestchooser.c:133 gui/gdmXnestchooser.c:140
+#: gui/gdmXnestchooser.c:167 gui/gdmXnestchooser.c:174
 msgid "OPTIONS"
 msgstr "OPSIYNNAU"
 
-#: gui/gdmXnestchooser.c:134 gui/gdmXnestchooser.c:144
+#: gui/gdmXnestchooser.c:168 gui/gdmXnestchooser.c:178
 msgid "Run in background"
 msgstr "Rhedeg yn y cefndir"
 
-#: gui/gdmXnestchooser.c:141
+#: gui/gdmXnestchooser.c:175
 msgid "Just run Xnest, no query (no chooser)"
 msgstr "Rhedeg Xnest yn unig, dim ymholiad (dim dewisydd)"
 
-#: gui/gdmXnestchooser.c:142
+#: gui/gdmXnestchooser.c:176
 msgid "Do direct query instead of indirect (chooser)"
 msgstr "Gwneud ymholiad uniongyrchol yn hytrach nac anuniongyrchol (dewisydd)"
 
-#: gui/gdmXnestchooser.c:143
+#: gui/gdmXnestchooser.c:177
 msgid "Run broadcast instead of indirect (chooser)"
 msgstr "Rhedeg darlledu yn hytrach nac anuniongyrchol (dewisydd)"
 
-#: gui/gdmXnestchooser.c:145
+#: gui/gdmXnestchooser.c:179
 msgid "Don't check for running gdm"
 msgstr "Peidio gwirio am GDM yn rhedeg"
 
-#: gui/gdmXnestchooser.c:486
+#. markup
+#: gui/gdmXnestchooser.c:521
 msgid "Xnest doesn't exist."
 msgstr "Nid yw Xnest yn bodoli."
 
-#: gui/gdmXnestchooser.c:488
+#: gui/gdmXnestchooser.c:523
 msgid "Please ask your system administrator to install it."
 msgstr "Os gwelwch yn dda, gofynnwch i weinyddwr y system i'w ymsefydlu."
 
-#: gui/gdmXnestchooser.c:513
+#. markup
+#: gui/gdmXnestchooser.c:549
 msgid "Indirect XDMCP is not enabled"
 msgstr "Nid yw XDMCP anuniongyrchol wedi ei alluogi"
 
-#: gui/gdmXnestchooser.c:515 gui/gdmXnestchooser.c:535
+#: gui/gdmXnestchooser.c:551 gui/gdmXnestchooser.c:572
 msgid ""
 "Please ask your system administrator to enable it in the GDM configurator "
 "program."
@@ -1757,19 +1879,22 @@ msgstr ""
 "Os gwelwch yn dda, gofynnwch i weinyddwr y system i'w alluogi yn rhaglen "
 "cyfluniad GDM."
 
-#: gui/gdmXnestchooser.c:533
+#. markup
+#: gui/gdmXnestchooser.c:570
 msgid "XDMCP is not enabled"
 msgstr "Nid yw XDMCP wedi ei alluogi"
 
-#: gui/gdmXnestchooser.c:563
+#. markup
+#: gui/gdmXnestchooser.c:604
 msgid "GDM is not running"
 msgstr "Nid yw GDM yn rhedeg"
 
-#: gui/gdmXnestchooser.c:565
+#: gui/gdmXnestchooser.c:606
 msgid "Please ask your system administrator to start it."
 msgstr "Os gwelwch yn dda, gofynnwch i weinyddwr y system i'w gychwyn."
 
-#: gui/gdmXnestchooser.c:581
+#. markup
+#: gui/gdmXnestchooser.c:623
 msgid "Could not find a free display number"
 msgstr "Methwyd canfod rhif dangosydd rhydd"
 
@@ -1814,7 +1939,8 @@ msgstr "_Ychwanegu gwesteiwr: "
 #: gui/gdmchooser-strings.c:15 gui/gdmchooser.glade.h:1
 #: gui/gdmsetup-strings.c:19 gui/gdmsetup-strings.c:21
 #: gui/gdmsetup-strings.c:26 gui/gdmsetup-strings.c:32
-#: gui/gdmsetup-strings.c:37 gui/gdmsetup-strings.c:47 gui/gdmsetup.glade.h:2
+#: gui/gdmsetup-strings.c:37 gui/gdmsetup-strings.c:47
+#: gui/gdmsetup-strings.c:85 gui/gdmsetup.glade.h:2
 msgid "*"
 msgstr "*"
 
@@ -1826,23 +1952,24 @@ msgstr "Ymholi ac ychwanegu'r gwesteiwr hwn i'r rhestr uchod"
 msgid "_Add"
 msgstr "_Ychwanegu"
 
-#: gui/gdmchooser.c:75
+#: gui/gdmchooser.c:79
 msgid "Please wait: scanning local network..."
 msgstr "Arhoswch os gwelwch yn dda: yn archilio'r rhwydwaith lleol..."
 
-#: gui/gdmchooser.c:76
+#: gui/gdmchooser.c:80
 msgid "No serving hosts were found."
 msgstr "Ni chanfodwyd unrhyw westeiwyr sy'n gweinyddu."
 
-#: gui/gdmchooser.c:77
+#: gui/gdmchooser.c:81
 msgid "Choose a ho_st to connect to:"
 msgstr "_Dewiswch westeiwr i gysylltu efo:"
 
-#: gui/gdmchooser.c:484
+#. markup
+#: gui/gdmchooser.c:645
 msgid "Cannot connect to remote server"
 msgstr "Ni ellir cysylltu ar weinydd pell"
 
-#: gui/gdmchooser.c:485
+#: gui/gdmchooser.c:646
 #, c-format
 msgid ""
 "The host \"%s\" is not willing to support a login session right now.  Please "
@@ -1851,11 +1978,12 @@ msgstr ""
 "Nid yw'r gweinydd \"%s\" yn fodlon cynnal sesiwn mengofnodi ar hyn o bryd. "
 "Os gwelwch yn dda, ceisiwch eto yn wedyn."
 
-#: gui/gdmchooser.c:851
+#. markup
+#: gui/gdmchooser.c:1270
 msgid "Did not receive response from server"
 msgstr "Ni dderbyniwyd ateb o'r gweinydd"
 
-#: gui/gdmchooser.c:852
+#: gui/gdmchooser.c:1271
 #, c-format
 msgid ""
 "Did not receive any response from host \"%s\" in %d seconds.  Perhaps the "
@@ -1866,18 +1994,18 @@ msgstr ""
 "nid yw'r gwesteiwr wedi ei droi ymlaen, neu nid yw'n fodlon cynnal sesiwn "
 "mewngofnodi ar hyn o bryd. Os gwelwch yn dda, ceisiwch eto wedyn."
 
-#: gui/gdmchooser.c:904
+#: gui/gdmchooser.c:1377
 msgid "Cannot find host"
 msgstr "Ni ellir canfod y gwesteiwr"
 
-#: gui/gdmchooser.c:905
+#: gui/gdmchooser.c:1378
 #, c-format
 msgid "I cannot find the host \"%s\", perhaps you have mistyped it."
 msgstr ""
 "Ni allaf ganfod y gwesteiwr \"%s\", efallai rydych chi wei ei camdeipio."
 
 # TRWSIO (Adnewyddu - ife hwn sydd ar y botwm?)
-#: gui/gdmchooser.c:1133
+#: gui/gdmchooser.c:1664
 msgid ""
 "The main area of this application shows the hosts on the local network that "
 "have \"XDMCP\" enabled. This allows users to login remotely to other "
@@ -1895,47 +2023,48 @@ msgstr ""
 "\"Adnewyddu\". Pan rydych wedi dewid gwesteiwr, clicwch \"Cysylltu\" er mwyn "
 "agor sesiwn i'r peiriant hwnnw."
 
-#: gui/gdmchooser.c:1168
+#: gui/gdmchooser.c:1718
 #, c-format
 msgid "Can't open default host icon: %s"
 msgstr "Ni ellir agor yr eicon gwesteiwr rhagosod: %s"
 
-#: gui/gdmchooser.c:1387 gui/gdmlogin.c:3822 gui/gdmlogin.c:3829
-#: gui/greeter/greeter.c:1180 gui/greeter/greeter.c:1187
+#: gui/gdmchooser.c:1938 gui/gdmlogin.c:3947 gui/gdmlogin.c:3954
+#: gui/greeter/greeter.c:1102 gui/greeter/greeter.c:1109
 msgid "Could not set signal mask!"
 msgstr "Methwyd gosod masg arwydd!"
 
-#: gui/gdmchooser.c:1393
+#: gui/gdmchooser.c:1944
 msgid "Socket for xdm communication"
 msgstr "Soced ar gyfer cyfathrebiad XDM"
 
-#: gui/gdmchooser.c:1393
+#: gui/gdmchooser.c:1944
 msgid "SOCKET"
 msgstr "SOCED"
 
 # TRWSIO (XDM)
-#: gui/gdmchooser.c:1396
+#: gui/gdmchooser.c:1947
 msgid "Client address to return in response to xdm"
 msgstr "Cyfeiriad cleient i'w ddychwelyd yn ymateb i XDM"
 
-#: gui/gdmchooser.c:1396
+#: gui/gdmchooser.c:1947
 msgid "ADDRESS"
 msgstr "CYFEIRIAD"
 
 # TRWSIO (XDM)
-#: gui/gdmchooser.c:1399
+#: gui/gdmchooser.c:1950
 msgid "Connection type to return in response to xdm"
 msgstr "Y math cysylltiad i'w ddychwelyd yn ymateb i XDM"
 
-#: gui/gdmchooser.c:1399
+#: gui/gdmchooser.c:1950
 msgid "TYPE"
 msgstr "MATH"
 
-#: gui/gdmchooser.c:1527
+#. markup
+#: gui/gdmchooser.c:2079
 msgid "Cannot run chooser"
 msgstr "Ni ellir rhedeg dewisydd"
 
-#: gui/gdmchooser.c:1528
+#: gui/gdmchooser.c:2080
 #, c-format
 msgid ""
 "The chooser version (%s) does not match the daemon version (%s).  You have "
@@ -1946,12 +2075,13 @@ msgstr ""
 "debygol eich bod chi ond wedi diweddaru GDM. Os gwelwch yn dda, "
 "ailgychwynwch yr ellyll GDM neu ailfwtiwch y cyfrifiadur."
 
-#: gui/gdmcomm.c:392 gui/gdmphotosetup.c:66
+#. markup
+#: gui/gdmcomm.c:405 gui/gdmphotosetup.c:70
 msgid "GDM (The GNOME Display Manager) is not running."
 msgstr "Nid yw GDM (Rheolydd Dangosydd GNOME) yn rhedeg."
 
 # TRWSIO (XDM)
-#: gui/gdmcomm.c:395 gui/gdmphotosetup.c:69
+#: gui/gdmcomm.c:408 gui/gdmphotosetup.c:73
 msgid ""
 "You might in fact be using a different display manager, such as KDM (KDE "
 "Display Manager) or xdm."
@@ -1959,7 +2089,7 @@ msgstr ""
 "Efallai eich bod chi yn defnyddio rheolydd dangosydd gwahanol, megis KDM "
 "(Rheolydd Dangosydd KDE) neu XDM."
 
-#: gui/gdmcomm.c:398 gui/gdmphotosetup.c:72
+#: gui/gdmcomm.c:411 gui/gdmphotosetup.c:76
 msgid ""
 "If you still wish to use this feature, either start GDM yourself or ask your "
 "system administrator to start GDM."
@@ -1967,37 +2097,38 @@ msgstr ""
 "Os ydych o hyd eisiau defnyddio'r nodwedd hwn, un ai cychwynwch GDM eich "
 "hunan neu gofynwch i weinyddwr eich system gychwyn GDM."
 
-#: gui/gdmcomm.c:416 gui/gdmflexiserver.c:253
+#. markup
+#: gui/gdmcomm.c:433 gui/gdmflexiserver.c:697
 msgid "Cannot communicate with GDM (The GNOME Display Manager)"
 msgstr "Ni ellir cyfathrebu efo GDM (Rheolydd Dangosydd GNOME)"
 
-#: gui/gdmcomm.c:419 gui/gdmflexiserver.c:256
+#: gui/gdmcomm.c:436 gui/gdmflexiserver.c:700
 msgid "Perhaps you have an old version of GDM running."
 msgstr "Efallai mae gennych hen fersiwn o GDM yn rhedeg."
 
 # TRWSIO (GDM)
-#: gui/gdmcomm.c:436 gui/gdmcomm.c:439
+#: gui/gdmcomm.c:453 gui/gdmcomm.c:456
 msgid "Cannot communicate with gdm, perhaps you have an old version running."
 msgstr ""
 "Ni ellir cyfathrebu efo GDM, efallai mae gennych hen fersiwn yn rhedeg."
 
-#: gui/gdmcomm.c:442
+#: gui/gdmcomm.c:459
 msgid "The allowed limit of flexible X servers reached."
 msgstr "Cyrrhaeddwyd cyfwng y gweinyddion X hyblyg a ganiateir."
 
-#: gui/gdmcomm.c:444
+#: gui/gdmcomm.c:461
 msgid "There were errors trying to start the X server."
 msgstr "Roedd gwallau wrth geisio cychwyn y gweinydd X."
 
-#: gui/gdmcomm.c:446
+#: gui/gdmcomm.c:463
 msgid "The X server failed.  Perhaps it is not configured well."
 msgstr "Methodd y gwinydd X. Efallai nid yw e wedi ei gyflunio'n dda."
 
-#: gui/gdmcomm.c:449
+#: gui/gdmcomm.c:466
 msgid "Too many X sessions running."
 msgstr "Gormod o sesiynau X yn rhedeg."
 
-#: gui/gdmcomm.c:451
+#: gui/gdmcomm.c:468
 msgid ""
 "The nested X server (Xnest) cannot connect to your current X server.  You "
 "may be missing an X authorization file."
@@ -2006,7 +2137,7 @@ msgstr ""
 "cyfredol. Efallai nad oes ffeil awdurdodaeth X gennych."
 
 # TRWSIO (GDM)
-#: gui/gdmcomm.c:456
+#: gui/gdmcomm.c:473
 msgid ""
 "The nested X server (Xnest) is not available, or gdm is badly configured.\n"
 "Please install the Xnest package in order to use the nested login."
@@ -2016,17 +2147,31 @@ msgstr ""
 "mewngofnodiad nythol."
 
 # TRWSIO s/gdm/GDM/; s/, /. /;
-#: gui/gdmcomm.c:461
+#: gui/gdmcomm.c:478
 msgid ""
 "The X server is not available, it is likely that gdm is badly configured."
 msgstr ""
 "Nid yw'r gweinydd X ar gael, mae'n debyg fod GDM wedi ei gyflunio'n wael."
 
-#: gui/gdmcomm.c:465
+#: gui/gdmcomm.c:482
+msgid ""
+"Trying to set an unknown logout action, or trying to set a logout action "
+"which is not available."
+msgstr ""
+
+#: gui/gdmcomm.c:485
+msgid "Virtual terminals not supported."
+msgstr ""
+
+#: gui/gdmcomm.c:487
+msgid "Trying to change to an invalid virtual terminal number."
+msgstr ""
+
+#: gui/gdmcomm.c:489
 msgid "Trying to update an unsupported configuration key."
 msgstr "Yn ceisio diweddaru allwedd cyfluniad ni gynhelir."
 
-#: gui/gdmcomm.c:467
+#: gui/gdmcomm.c:491
 msgid ""
 "You do not seem to have authentication needed be for this operation.  "
 "Perhaps your .Xauthority file is not set up correctly."
@@ -2034,7 +2179,11 @@ msgstr ""
 "Ymddengys nad oes gennyd y dilysiad sy'n anghenrheidiol ar gyfer y weithred "
 "hon. Efallai nad yw eich ffeil .Xauthority wedi ei osod i fyny yn gywir."
 
-#: gui/gdmcomm.c:471
+#: gui/gdmcomm.c:495
+msgid "Too many messages were sent to gdm and it hung upon us."
+msgstr ""
+
+#: gui/gdmcomm.c:498
 msgid "Unknown error occured."
 msgstr "Digwyddod gwall anhysbys."
 
@@ -2046,70 +2195,122 @@ msgstr "Mewngofnodi fel defnyddiwr arall o fewn ffenest nythol"
 msgid "New Login in a Nested Window"
 msgstr "Mewngofnodiad Newydd Mewn Ffenest Nythol"
 
-#: gui/gdmflexiserver.c:129
+#. markup
+#: gui/gdmflexiserver.c:100
+#, fuzzy
+msgid "Cannot change display"
+msgstr "Ni ellir cychwyn dangosydd newydd"
+
+#: gui/gdmflexiserver.c:177
+msgid "Nobody"
+msgstr "Neb"
+
+#: gui/gdmflexiserver.c:212
+#, c-format
+msgid "Display %s on virtual terminal %d"
+msgstr ""
+
+#: gui/gdmflexiserver.c:217
+#, c-format
+msgid "Nested display %s on virtual terminal %d"
+msgstr ""
+
+#: gui/gdmflexiserver.c:247 gui/gdmlogin.c:2904
+#: gui/greeter/greeter_item_ulist.c:436
+msgid "Username"
+msgstr "Enw Cyfrif"
+
+#: gui/gdmflexiserver.c:256
+msgid "Display"
+msgstr ""
+
+#: gui/gdmflexiserver.c:310
+msgid "Open Displays"
+msgstr ""
+
+#. parent
+#. flags
+#: gui/gdmflexiserver.c:313
+msgid "_Open New Display"
+msgstr ""
+
+#: gui/gdmflexiserver.c:315
+msgid "Change to _Existing Display"
+msgstr ""
+
+#: gui/gdmflexiserver.c:323
+msgid ""
+"There are some displays already open.  You can select one from the list "
+"below or open a new one."
+msgstr ""
+
+#: gui/gdmflexiserver.c:390 gui/gdmflexiserver.c:785
+msgid "Can't lock screen"
+msgstr "Ni ellir cloi'r sgrîn"
+
+#: gui/gdmflexiserver.c:393 gui/gdmflexiserver.c:788
+msgid "Can't disable xscreensaver display hacks"
+msgstr "Ni ellir analluogi triciau dangosydd xscreensaver"
+
+#: gui/gdmflexiserver.c:548
 msgid "Choose server"
 msgstr "Dewiswch weinydd"
 
-#: gui/gdmflexiserver.c:140
+#: gui/gdmflexiserver.c:559
 msgid "Choose the X server to start"
 msgstr "Dewiswch y gweinydd X i'w gychwyn"
 
-#: gui/gdmflexiserver.c:146
+#: gui/gdmflexiserver.c:565
 msgid "Standard server"
 msgstr "Gweinydd safonol"
 
 # TRWSIO
-#: gui/gdmflexiserver.c:194
+#: gui/gdmflexiserver.c:632
 msgid "Send the specified protocol command to gdm"
 msgstr "Danfon y gorchymyn protocol penodedig i GDM"
 
-#: gui/gdmflexiserver.c:194
+#: gui/gdmflexiserver.c:632
 msgid "COMMAND"
 msgstr "GORCHYMYN"
 
-#: gui/gdmflexiserver.c:195
+#: gui/gdmflexiserver.c:633
 msgid "Xnest mode"
 msgstr "Modd Xnest"
 
-#: gui/gdmflexiserver.c:196
+#: gui/gdmflexiserver.c:634
 msgid "Do not lock current screen"
 msgstr "Peido a chloi'r sgrîn cyfredol"
 
-#: gui/gdmflexiserver.c:197
+#: gui/gdmflexiserver.c:635
 msgid "Debugging output"
 msgstr "Allbwn datnamu"
 
-#: gui/gdmflexiserver.c:198
+#: gui/gdmflexiserver.c:636
 msgid "Authenticate before running --command"
 msgstr "Dilysu cyn rhedeg --command"
 
-#: gui/gdmflexiserver.c:273
+#. markup
+#: gui/gdmflexiserver.c:725
 msgid "You do not seem to have the authentication needed for this operation"
 msgstr ""
 "Ymddengys nad oes ganddoch y dilysiad sy'n anghenrheidiol ar gyfer y "
 "weithred hon"
 
-#: gui/gdmflexiserver.c:277
+#: gui/gdmflexiserver.c:729
 msgid "Perhaps your .Xauthority file is not set up correctly."
 msgstr "Efallau nid yw eich ffeil .Xauthority wedi ei osod i fyny yn gywir."
 
-#: gui/gdmflexiserver.c:302
+#. markup
+#: gui/gdmflexiserver.c:753
 msgid "You do not seem to be logged in on the console"
 msgstr "Ymddengys nad ydych wedi mewngofnodi ar y consol"
 
-#: gui/gdmflexiserver.c:305
+#: gui/gdmflexiserver.c:756
 msgid "Starting a new login only works correctly on the console."
 msgstr "Mae cychwyn mewngofnodiad newydd ond yn gweithio'n gywir ar y consol."
 
-#: gui/gdmflexiserver.c:334
-msgid "Can't lock screen"
-msgstr "Ni ellir cloi'r sgrîn"
-
-#: gui/gdmflexiserver.c:337
-msgid "Can't disable xscreensaver display hacks"
-msgstr "Ni ellir analluogi triciau dangosydd xscreensaver"
-
-#: gui/gdmflexiserver.c:351
+#. markup
+#: gui/gdmflexiserver.c:803
 msgid "Cannot start new display"
 msgstr "Ni ellir cychwyn dangosydd newydd"
 
@@ -2233,345 +2434,364 @@ msgstr "N-Z|Saesneg (Prydeinig)"
 
 #. Note translate the A-M to the A-M you used in the group label
 #: gui/gdmlanguages.c:97
+msgid "A-M|English (Canadian)"
+msgstr "N-Z|Saesneg (Canadaidd)"
+
+#. Note translate the A-M to the A-M you used in the group label
+#: gui/gdmlanguages.c:99
 msgid "A-M|English (Ireland)"
 msgstr "N-Z|Saesneg (Gwyddelig)"
 
 #. Note translate the A-M to the A-M you used in the group label
-#: gui/gdmlanguages.c:99
+#: gui/gdmlanguages.c:101
 msgid "A-M|Estonian"
 msgstr "A-M|Estoneg"
 
 #. Note translate the A-M to the A-M you used in the group label
-#: gui/gdmlanguages.c:101
+#: gui/gdmlanguages.c:103
 msgid "A-M|Finnish"
 msgstr "A-M|Ffinneg"
 
 #. Note translate the A-M to the A-M you used in the group label
-#: gui/gdmlanguages.c:103
+#: gui/gdmlanguages.c:105
 msgid "A-M|French"
 msgstr "A-M|Frangeg"
 
 #. Note translate the A-M to the A-M you used in the group label
-#: gui/gdmlanguages.c:105
+#: gui/gdmlanguages.c:107
 msgid "A-M|Galician"
 msgstr "A-M|Galiseg"
 
 #. Note translate the A-M to the A-M you used in the group label
-#: gui/gdmlanguages.c:107
+#: gui/gdmlanguages.c:109
 msgid "A-M|German"
 msgstr "A-M|Almaeneg"
 
 #. Note translate the A-M to the A-M you used in the group label
-#: gui/gdmlanguages.c:109
+#: gui/gdmlanguages.c:111
 msgid "A-M|Greek"
 msgstr "A-M|Groeg"
 
 #. Note translate the A-M to the A-M you used in the group label
-#: gui/gdmlanguages.c:111
+#: gui/gdmlanguages.c:113
 msgid "A-M|Gujarati"
 msgstr "A-M|Gwjarati"
 
 #. Note translate the A-M to the A-M you used in the group label
-#: gui/gdmlanguages.c:113 gui/gdmlanguages.c:115
+#: gui/gdmlanguages.c:115 gui/gdmlanguages.c:117
 msgid "A-M|Hebrew"
 msgstr "A-M|Hebraeg"
 
 #. Note translate the A-M to the A-M you used in the group label
-#: gui/gdmlanguages.c:117
+#: gui/gdmlanguages.c:119
 msgid "A-M|Hindi"
 msgstr "A-M|Hindi"
 
 #. Note translate the A-M to the A-M you used in the group label
-#: gui/gdmlanguages.c:119
+#: gui/gdmlanguages.c:121
 msgid "A-M|Hungarian"
 msgstr "A-M|Hwngareg"
 
 #. Note translate the A-M to the A-M you used in the group label
-#: gui/gdmlanguages.c:121
+#: gui/gdmlanguages.c:123
 msgid "A-M|Icelandic"
 msgstr "A-M|Islandeg"
 
 #. Note translate the A-M to the A-M you used in the group label
-#: gui/gdmlanguages.c:123
+#: gui/gdmlanguages.c:125
 msgid "A-M|Indonesian"
 msgstr "A-M|Indoneseg"
 
 #. Note translate the A-M to the A-M you used in the group label
-#: gui/gdmlanguages.c:125
+#: gui/gdmlanguages.c:127
 msgid "A-M|Interlingua"
 msgstr "A-M|Interlingua"
 
 #. Note translate the A-M to the A-M you used in the group label
-#: gui/gdmlanguages.c:127
+#: gui/gdmlanguages.c:129
 msgid "A-M|Irish"
 msgstr "A-M|Gwyddelig"
 
 #. Note translate the A-M to the A-M you used in the group label
-#: gui/gdmlanguages.c:129
+#: gui/gdmlanguages.c:131
 msgid "A-M|Italian"
 msgstr "A-M|Eidaleg"
 
 #. Note translate the A-M to the A-M you used in the group label
-#: gui/gdmlanguages.c:131
+#: gui/gdmlanguages.c:133
 msgid "A-M|Japanese"
 msgstr "A-M|Japaneg"
 
 #. Note translate the A-M to the A-M you used in the group label
-#: gui/gdmlanguages.c:133
+#: gui/gdmlanguages.c:135
 msgid "A-M|Kannada"
 msgstr "A-M|Canareg"
 
 #. Note translate the A-M to the A-M you used in the group label
-#: gui/gdmlanguages.c:135
+#: gui/gdmlanguages.c:137
 msgid "A-M|Korean"
 msgstr "A-M|Corëeg"
 
 #. Note translate the A-M to the A-M you used in the group label
-#: gui/gdmlanguages.c:137
+#: gui/gdmlanguages.c:139
 msgid "A-M|Latvian"
 msgstr "A-M|Latfieg"
 
 #. Note translate the A-M to the A-M you used in the group label
-#: gui/gdmlanguages.c:139
+#: gui/gdmlanguages.c:141
 msgid "A-M|Lithuanian"
 msgstr "A-M|Lithwaneg"
 
 #. Note translate the A-M to the A-M you used in the group label
-#: gui/gdmlanguages.c:141
+#: gui/gdmlanguages.c:143
 msgid "A-M|Macedonian"
 msgstr "A-M|Macedoneg"
 
 #. Note translate the A-M to the A-M you used in the group label
-#: gui/gdmlanguages.c:143
+#: gui/gdmlanguages.c:145
 msgid "A-M|Malay"
 msgstr "A-M|Maleieg"
 
 #. Note translate the A-M to the A-M you used in the group label
-#: gui/gdmlanguages.c:145
+#: gui/gdmlanguages.c:147
 msgid "A-M|Malayalam"
 msgstr "A-M|Malaiameg"
 
 #. Note translate the A-M to the A-M you used in the group label
-#: gui/gdmlanguages.c:147
+#: gui/gdmlanguages.c:149
 msgid "A-M|Marathi"
 msgstr "A-M|Marati"
 
 #. Note translate the A-M to the A-M you used in the group label
-#: gui/gdmlanguages.c:149
+#: gui/gdmlanguages.c:151
 msgid "A-M|Mongolian"
 msgstr "A-M|Mongoleg"
 
 #. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:151
+#: gui/gdmlanguages.c:153
 msgid "N-Z|Norwegian (bokmal)"
 msgstr "N-Z|Norwyeg (bokmal)"
 
 #. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:153
+#: gui/gdmlanguages.c:155
 msgid "N-Z|Norwegian (nynorsk)"
 msgstr "N-Z|Norwyeg (nynorsk)"
 
 #. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:155
+#: gui/gdmlanguages.c:157
 msgid "N-Z|Oriya"
 msgstr "N-Z|Oriya"
 
 #. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:157
+#: gui/gdmlanguages.c:159
 msgid "N-Z|Panjabi"
 msgstr "N-Z|Panjabi"
 
 #. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:159
+#: gui/gdmlanguages.c:161
 msgid "N-Z|Persian"
 msgstr "N-Z|Perseg"
 
 #. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:161
+#: gui/gdmlanguages.c:163
 msgid "N-Z|Polish"
 msgstr "N-Z|Pwyleg"
 
 #. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:163
+#: gui/gdmlanguages.c:165
 msgid "N-Z|Portuguese"
 msgstr "N-Z|Portiwgaleg"
 
 #. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:165
+#: gui/gdmlanguages.c:167
 msgid "N-Z|Portuguese (Brazilian)"
 msgstr "N-Z|Portiwgaleg (Brasilaidd)"
 
 #. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:167
+#: gui/gdmlanguages.c:169
 msgid "N-Z|Romanian"
 msgstr "N-Z|Rwmaneg"
 
 #. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:169
+#: gui/gdmlanguages.c:171
 msgid "N-Z|Russian"
 msgstr "N-Z|Rwseg"
 
 #. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:171
+#: gui/gdmlanguages.c:173 gui/gdmlanguages.c:175
 msgid "N-Z|Serbian"
 msgstr "N-Z|Serbeg"
 
 #. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:173
+#: gui/gdmlanguages.c:177
+msgid "N-Z|Serbian (Latin)"
+msgstr "N-Z|Serbeg (Lladin)"
+
+#. Note translate the N-Z to the N-Z you used in the group label
+#: gui/gdmlanguages.c:179
+msgid "N-Z|Serbian (Jekavian)"
+msgstr "N-Z|Serbeg (Jekavian)"
+
+#. Note translate the N-Z to the N-Z you used in the group label
+#: gui/gdmlanguages.c:181
 msgid "N-Z|Slovak"
 msgstr "N-Z|Slofaceg"
 
 #. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:175
+#: gui/gdmlanguages.c:183
 msgid "N-Z|Slovenian"
 msgstr "N-Z|Slofeneg"
 
 #. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:177
+#: gui/gdmlanguages.c:185
 msgid "N-Z|Spanish"
 msgstr "N-Z|Sbaeneg"
 
 #. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:179
+#: gui/gdmlanguages.c:187
 msgid "N-Z|Spanish (Mexico)"
 msgstr "N-Z|Sbaeneg (Mecsico)"
 
 #. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:181
+#: gui/gdmlanguages.c:189
 msgid "N-Z|Swedish"
 msgstr "N-Z|Swedeg"
 
 #. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:183
+#: gui/gdmlanguages.c:191
 msgid "N-Z|Swedish (Finland)"
 msgstr "N-Z|Swedeg (Ffindir)"
 
 #. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:185
+#: gui/gdmlanguages.c:193
 msgid "N-Z|Tamil"
 msgstr "N-Z|Tamileg"
 
 #. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:187
+#: gui/gdmlanguages.c:195
 msgid "N-Z|Telugu"
 msgstr "N-Z|Telwgw"
 
 #. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:189
+#: gui/gdmlanguages.c:197
 msgid "N-Z|Thai"
 msgstr "N-Z|Siameg"
 
 #. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:191
+#: gui/gdmlanguages.c:199
 msgid "N-Z|Turkish"
 msgstr "N-Z|Tyrceg"
 
 #. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:193
+#: gui/gdmlanguages.c:201
 msgid "N-Z|Ukrainian"
 msgstr "N-Z|Wcreineg"
 
 #. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:195
+#: gui/gdmlanguages.c:203
 msgid "N-Z|Vietnamese"
 msgstr "A-M|Fietnameg"
 
 #. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:197
+#: gui/gdmlanguages.c:205
 msgid "N-Z|Walloon"
 msgstr "N-Z|Walwneg"
 
 #. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:199
+#: gui/gdmlanguages.c:207
 msgid "N-Z|Welsh"
 msgstr "A-M|Cymraeg"
 
 #. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:201
+#: gui/gdmlanguages.c:209
 msgid "N-Z|Yiddish"
 msgstr "A-M|Iddew-Almaeneg"
 
 #. This is the POSIX/C locale for english, should really be in Other
-#: gui/gdmlanguages.c:203
+#: gui/gdmlanguages.c:211
 msgid "Other|POSIX/C English"
 msgstr "Eraill|POSIX/Saesneg C"
 
 #. This should be the same as in the front of the language strings
 #. * else the languages will appear in the "Other" submenu
-#: gui/gdmlanguages.c:378
+#: gui/gdmlanguages.c:407
 msgid "A-M"
 msgstr "A-M"
 
 #. This should be the same as in the front of the language strings
 #. * else the languages will appear in the "Other" submenu
-#: gui/gdmlanguages.c:386
+#: gui/gdmlanguages.c:415
 msgid "N-Z"
 msgstr "N-Z"
 
-#: gui/gdmlogin.c:209 gui/greeter/greeter_parser.c:1031
+#: gui/gdmlogin.c:222 gui/greeter/greeter_parser.c:1047
 #, c-format
 msgid "User %s will login in %d seconds"
 msgstr "Bydd y defnyddiwr %s yn mewngofnodi mewn %d eiliad"
 
-#: gui/gdmlogin.c:441
+#: gui/gdmlogin.c:447
 #, c-format
 msgid "%s: String too long!"
 msgstr "%s: llinyn rhy hir!"
 
-#: gui/gdmlogin.c:443
+#: gui/gdmlogin.c:449
 #, c-format
 msgid "%sWelcome to %s%s"
 msgstr "%sCroeso i %s%s"
 
-#: gui/gdmlogin.c:597
+#. markup
+#: gui/gdmlogin.c:537
 msgid "Could not fork a new process!"
 msgstr "Methu forcio proses newydd!"
 
-#: gui/gdmlogin.c:599
+#: gui/gdmlogin.c:539
 msgid "You likely won't be able to log in either."
 msgstr "Ni fyddwch yn gallu mewngofnodi mwy na thebyg hefyd."
 
-#: gui/gdmlogin.c:643 gui/greeter/greeter_system.c:55
+#: gui/gdmlogin.c:583 gui/greeter/greeter_system.c:56
 msgid "Are you sure you want to reboot the machine?"
 msgstr "Ydych chi'n sicr eich bod chi eisiau ailfwtio y cyfrifiadur?"
 
-#: gui/gdmlogin.c:644 gui/gdmlogin.c:2629 gui/greeter/greeter_parser.c:1011
-#: gui/greeter/greeter_system.c:56 gui/greeter/greeter_system.c:180
+#. markup
+#: gui/gdmlogin.c:585 gui/gdmlogin.c:2768 gui/greeter/greeter_parser.c:1027
+#: gui/greeter/greeter_system.c:58 gui/greeter/greeter_system.c:184
 msgid "_Reboot"
 msgstr "_Ailfwtio"
 
-#: gui/gdmlogin.c:656 gui/greeter/greeter_system.c:67
+#: gui/gdmlogin.c:597 gui/greeter/greeter_system.c:69
 msgid "Are you sure you want to shut down the machine?"
 msgstr "Ydych chi'n sicr eich bod chi eisiau troi'r peiriant bant?"
 
-#: gui/gdmlogin.c:657
+#. markup
+#: gui/gdmlogin.c:599
 msgid "Shut _Down"
 msgstr "Troi _Bant..."
 
-#: gui/gdmlogin.c:677 gui/greeter/greeter_system.c:78
+#: gui/gdmlogin.c:619 gui/greeter/greeter_system.c:81
 msgid "Are you sure you want to suspend the machine?"
 msgstr "Ydych yn siwr bod chi eisiau crogiannu y peiriant?"
 
-#: gui/gdmlogin.c:678 gui/gdmlogin.c:2656 gui/greeter/greeter_system.c:79
+#. markup
+#: gui/gdmlogin.c:621 gui/gdmlogin.c:2795 gui/greeter/greeter_system.c:83
 msgid "_Suspend"
 msgstr "_Gorffwys"
 
-#: gui/gdmlogin.c:725 gui/gdmlogin.c:3600 gui/greeter/greeter.c:146
-#: gui/greeter/greeter.c:951
+#: gui/gdmlogin.c:685 gui/gdmlogin.c:3722 gui/greeter/greeter.c:155
+#: gui/greeter/greeter.c:849
 msgid "Welcome"
 msgstr "Croeso"
 
-#: gui/gdmlogin.c:728 gui/gdmlogin.c:3603 gui/greeter/greeter.c:149
-#: gui/greeter/greeter.c:954
+#: gui/gdmlogin.c:688 gui/gdmlogin.c:3725 gui/greeter/greeter.c:158
+#: gui/greeter/greeter.c:852
 #, c-format
 msgid "Welcome to %n"
 msgstr "Croeso i %n"
 
-#: gui/gdmlogin.c:772 gui/greeter/greeter.c:174
+#: gui/gdmlogin.c:736 gui/greeter/greeter.c:183
 msgid "TimedLoginDelay was less than 5.  I'll just use 5."
 msgstr "TimedLoginDelay yn llai na 5. Gwnai defnyddio 5."
 
-#: gui/gdmlogin.c:878 gui/greeter/greeter_session.c:111
+#: gui/gdmlogin.c:854 gui/greeter/greeter_session.c:119
 #, c-format
 msgid ""
 "Your preferred session type %s is not installed on this machine.\n"
@@ -2580,13 +2800,14 @@ msgstr ""
 "Mae eich math sesiwn dymunol %s heb ei osod ar y peiriant yma.\n"
 "Ydych eisiau gwneud %s yn rhagosod ar gyfer sesiwn yn y dyfodol?"
 
-#: gui/gdmlogin.c:884 gui/gdmlogin.c:912 gui/gdmlogin.c:987
-#: gui/greeter/greeter_action_language.c:154 gui/greeter/greeter_session.c:117
-#: gui/greeter/greeter_session.c:148
+#. markup
+#: gui/gdmlogin.c:860 gui/gdmlogin.c:887 gui/gdmlogin.c:965
+#: gui/greeter/greeter_action_language.c:143 gui/greeter/greeter_session.c:125
+#: gui/greeter/greeter_session.c:155
 msgid "Make _Default"
 msgstr "Gwneud yn Rhagosodiad"
 
-#: gui/gdmlogin.c:884 gui/greeter/greeter_session.c:117
+#: gui/gdmlogin.c:860 gui/greeter/greeter_session.c:125
 msgid "Just _Log In"
 msgstr "_Mewngofnodi'n Unig"
 
@@ -2594,8 +2815,8 @@ msgstr "_Mewngofnodi'n Unig"
 #. no_group
 #. untranslated
 #. markup
-#: gui/gdmlogin.c:904 gui/gdmlogin.c:981
-#: gui/greeter/greeter_action_language.c:148 gui/greeter/greeter_session.c:140
+#: gui/gdmlogin.c:879 gui/gdmlogin.c:959
+#: gui/greeter/greeter_action_language.c:137 gui/greeter/greeter_session.c:147
 #, c-format
 msgid ""
 "You have chosen %s for this session, but your default setting is %s.\n"
@@ -2605,17 +2826,12 @@ msgstr ""
 "yn %s.\n"
 "Ydych eisiau gwneud %s yn rhagosodiad ar gyfer sesiwn yn y dyfodol?"
 
-#: gui/gdmlogin.c:912 gui/gdmlogin.c:987
-#: gui/greeter/greeter_action_language.c:154 gui/greeter/greeter_session.c:148
+#: gui/gdmlogin.c:887 gui/gdmlogin.c:965
+#: gui/greeter/greeter_action_language.c:143 gui/greeter/greeter_session.c:155
 msgid "Just For _This Session"
 msgstr "Dim ond ar Gyfer y _Sesiwn Yma"
 
-#. if !GdmShowLastSession then our saved session is
-#. * irrelevant, we are in "switchdesk mode"
-#. * and the relevant thing is the saved session
-#. * in .Xclients
-#.
-#: gui/gdmlogin.c:920 gui/greeter/greeter_session.c:158
+#: gui/gdmlogin.c:897 gui/greeter/greeter_session.c:168
 #, c-format
 msgid ""
 "You have chosen %s for this session.\n"
@@ -2628,55 +2844,55 @@ msgstr ""
 "rhedwch y cyfleuster 'switchdesk'\n"
 "(System->Erfyn Newid Penbwrdd o ddewislen y panel)."
 
-#: gui/gdmlogin.c:963 gui/gdmlogin.c:972
-#: gui/greeter/greeter_action_language.c:52
-#: gui/greeter/greeter_action_language.c:132
-#: gui/greeter/greeter_action_language.c:140
+#: gui/gdmlogin.c:941 gui/gdmlogin.c:950
+#: gui/greeter/greeter_action_language.c:53
+#: gui/greeter/greeter_action_language.c:121
+#: gui/greeter/greeter_action_language.c:129
 msgid "System Default"
 msgstr "Rhagosodidad y System"
 
-#: gui/gdmlogin.c:1096 gui/gdmlogin.c:1110 gui/gdmlogin.c:1759
-#: gui/gdmlogin.c:2224 gui/gdmlogin.c:2863
+#: gui/gdmlogin.c:1074 gui/gdmlogin.c:1088 gui/gdmlogin.c:1875
+#: gui/gdmlogin.c:2343 gui/gdmlogin.c:3010
 msgid "_Username:"
 msgstr "_Enw Defnyddiwr:"
 
-#: gui/gdmlogin.c:1168
+#: gui/gdmlogin.c:1146
 #, c-format
 msgid "%s session selected"
 msgstr "Deiswyd y sesiwn %s"
 
-#: gui/gdmlogin.c:1191 gui/gdmlogin.c:1461 gui/greeter/greeter_session.c:257
+#: gui/gdmlogin.c:1172 gui/gdmlogin.c:1482 gui/greeter/greeter_session.c:271
 msgid "_Last"
 msgstr "_Diwethaf"
 
-#: gui/gdmlogin.c:1202 gui/greeter/greeter_session.c:263
+#: gui/gdmlogin.c:1183 gui/greeter/greeter_session.c:277
 msgid "Log in using the session that you have used last time you logged in"
 msgstr ""
 "Mewngofnodi yn defnyddio'r sesiwn a defnyddwyd y tro dwethaf daru chi "
 "mewngofnodi"
 
-#: gui/gdmlogin.c:1215 gui/greeter/greeter_session.c:274
-#, c-format
-msgid "%s: Session directory %s not found!"
-msgstr "%s: Plygell y sesiwn %s heb ei canfod!"
-
-#: gui/gdmlogin.c:1232 gui/greeter/greeter_session.c:250
+#: gui/gdmlogin.c:1194 gui/greeter/greeter_session.c:264
 msgid "Failsafe Gnome"
 msgstr "Gnome Difethiant"
 
-#: gui/gdmlogin.c:1233 gui/greeter/greeter_session.c:251
+#: gui/gdmlogin.c:1195 gui/greeter/greeter_session.c:265
 msgid "Failsafe xterm"
 msgstr "xterm difethiant"
 
-#: gui/gdmlogin.c:1329 gui/greeter/greeter_session.c:379
+#: gui/gdmlogin.c:1344 gui/greeter/greeter_session.c:429
+#, c-format
+msgid "%s: Session directory %s not found!"
+msgstr "%s: Plygell y sesiwn %s heb ei canfod!"
+
+#: gui/gdmlogin.c:1350 gui/greeter/greeter_session.c:437
 msgid "Yaikes, nothing found in the session directory."
 msgstr "O diar, canfodwyd dim byd yn y cyfeiriadur sesiynau."
 
-#: gui/gdmlogin.c:1340 gui/greeter/greeter_session.c:391
+#: gui/gdmlogin.c:1361 gui/greeter/greeter_session.c:449
 msgid "Failsafe _Gnome"
 msgstr "_Gnome Difethiant"
 
-#: gui/gdmlogin.c:1342 gui/greeter/greeter_session.c:393
+#: gui/gdmlogin.c:1363 gui/greeter/greeter_session.c:451
 msgid ""
 "This is a failsafe session that will log you into GNOME.  No startup scripts "
 "will be read and it is only to be used when you can't log in otherwise.  "
@@ -2686,11 +2902,11 @@ msgstr ""
 "sgripiau gychwyn yn cael ei darllen a  bydd ond yn cael ei defnyddio os ni "
 "ellwch mewngofnodi. Gwneith GNOME defnyddio'r sessiwn 'Default'."
 
-#: gui/gdmlogin.c:1365 gui/greeter/greeter_session.c:415
+#: gui/gdmlogin.c:1386 gui/greeter/greeter_session.c:473
 msgid "Failsafe _Terminal"
 msgstr "_Terfynell Difethaint"
 
-#: gui/gdmlogin.c:1367 gui/greeter/greeter_session.c:417
+#: gui/gdmlogin.c:1388 gui/greeter/greeter_session.c:475
 msgid ""
 "This is a failsafe session that will log you into a terminal.  No startup "
 "scripts will be read and it is only to be used when you can't log in "
@@ -2701,7 +2917,7 @@ msgstr ""
 "defnyddio pam ni allwch mewngofnodi fel arall. I gadael y terfynell, bwydwch "
 "'exit'."
 
-#: gui/gdmlogin.c:1388 gui/greeter/greeter_session.c:437
+#: gui/gdmlogin.c:1409 gui/greeter/greeter_session.c:495
 msgid "No default session link found. Using Failsafe GNOME.\n"
 msgstr ""
 "Dim cyswllt sesiwn rhagosod wedi ei canfod. Defnyddio GNOME Difethiant.\n"
@@ -2710,77 +2926,78 @@ msgstr ""
 #. no_group
 #. untranslated
 #. makrup
-#: gui/gdmlogin.c:1432
+#: gui/gdmlogin.c:1453
 #, c-format
 msgid "%s language selected"
 msgstr "Dewiswyd y iaith %s"
 
-#: gui/gdmlogin.c:1472
+#: gui/gdmlogin.c:1493
 msgid "Log in using the language that you have used last time you logged in"
 msgstr ""
 "Mewngofnodi yn defnyddio y iaith defnyddwyd y tro dewthaf i chi mewngofnodi"
 
-#: gui/gdmlogin.c:1476
+#: gui/gdmlogin.c:1497
 msgid "_System Default"
 msgstr "Rhagosodidad y _System"
 
-#: gui/gdmlogin.c:1487
+#: gui/gdmlogin.c:1508
 msgid "Log in using the default system language"
 msgstr "Mewngofnodi yn defnyddio iaith rhagosod y system"
 
-#: gui/gdmlogin.c:1507
+#: gui/gdmlogin.c:1528
 msgid "_Other"
 msgstr "_Eraill"
 
-#: gui/gdmlogin.c:1790
+#: gui/gdmlogin.c:1906
 msgid "_Password:"
 msgstr "_Cyfrinair:"
 
+#. markup
 #. translators:  This is a nice and evil eggie text, translate
 #. * to your favourite currency
-#: gui/gdmlogin.c:2010 gui/greeter/greeter.c:416
+#: gui/gdmlogin.c:2128 gui/greeter/greeter.c:425
 msgid "Please insert 25 cents to log in."
 msgstr "Rhowch 20 ceiniog i fewn er mwyn mewngofnodi os gwelwch yn dda."
 
-#: gui/gdmlogin.c:2232
+#: gui/gdmlogin.c:2351
 msgid "Doubleclick on the user to log in"
 msgstr "Defnyddiwch glic ggwbl ar y defnyddiwr er mwyn mewngofnodi"
 
 # TRWSIO
-#: gui/gdmlogin.c:2356
+#: gui/gdmlogin.c:2475
 msgid "GNOME Desktop Manager"
 msgstr "Rheolydd Penbwrdd GNOME"
 
-#: gui/gdmlogin.c:2382 gui/greeter/greeter_item.c:116
+#: gui/gdmlogin.c:2501 gui/greeter/greeter_item.c:139
 msgid "%a %b %d, %H:%M"
 msgstr "%a %b %d, %H:%M"
 
-#: gui/gdmlogin.c:2384 gui/greeter/greeter_item.c:120
-msgid "%a %b %d, %I:%M %p"
-msgstr "%a %b %d, %I:%M %p"
+#: gui/gdmlogin.c:2503 gui/greeter/greeter_item.c:143
+msgid "%a %b %d, %l:%M %p"
+msgstr "%a %b %d, %l:%M %p"
 
-#: gui/gdmlogin.c:2444
+#: gui/gdmlogin.c:2563
 msgid "Finger"
 msgstr "Fysedd"
 
-#: gui/gdmlogin.c:2537
+#: gui/gdmlogin.c:2676
 msgid "GDM Login"
 msgstr "Mewngofnodi GDM"
 
-#: gui/gdmlogin.c:2580 gui/greeter/greeter_parser.c:981
+#: gui/gdmlogin.c:2719 gui/greeter/greeter_parser.c:997
 msgid "_Session"
 msgstr "_Sesiwn"
 
-#: gui/gdmlogin.c:2587 gui/greeter/greeter_parser.c:976
+#: gui/gdmlogin.c:2726 gui/greeter/greeter_parser.c:992
 msgid "_Language"
 msgstr "_Iaith"
 
-#: gui/gdmlogin.c:2599 gui/greeter/greeter_system.c:142
+#: gui/gdmlogin.c:2738 gui/greeter/greeter_system.c:146
 msgid "_XDMCP Chooser..."
 msgstr "Dewisiwr _XDMCP..."
 
-#: gui/gdmlogin.c:2606 gui/greeter/greeter_system.c:149
-#: gui/greeter/greeter_system.c:341
+#: gui/gdmlogin.c:2745 gui/greeter/greeter_system.c:153
+#: gui/greeter/greeter_system.c:345
 msgid ""
 "Run an XDMCP chooser which will allow you to log into available remote "
 "machines, if there are any."
@@ -2788,72 +3005,74 @@ msgstr ""
 "Rhedeg dewisiwr XDMCP a gwneith eich galluogi i mewngofnodi i ynrhyw "
 "peiriant pell sydd ar gael, os bydd rhai."
 
-#: gui/gdmlogin.c:2615 gui/greeter/greeter_system.c:157
+#: gui/gdmlogin.c:2754 gui/greeter/greeter_system.c:161
 msgid "_Configure Login Manager..."
 msgstr "_Cyflunio'r Rheolydd Mewngofnodi..."
 
-#: gui/gdmlogin.c:2622 gui/greeter/greeter_system.c:164
-#: gui/greeter/greeter_system.c:361
+#: gui/gdmlogin.c:2761 gui/greeter/greeter_system.c:168
+#: gui/greeter/greeter_system.c:365
 msgid ""
 "Configure GDM (this login manager). This will require the root password."
 msgstr ""
 "Cyflunio GDM (y rheolydd mewngofnodi yma). Bydd hyn angen cyfrinair root"
 
-#: gui/gdmlogin.c:2636 gui/greeter/greeter_system.c:187
+#: gui/gdmlogin.c:2775 gui/greeter/greeter_system.c:191
 msgid "Reboot your computer"
 msgstr "Ailfwtio eich cyfrifiadur"
 
-#: gui/gdmlogin.c:2642 gui/greeter/greeter_parser.c:1001
-#: gui/greeter/greeter_system.c:68 gui/greeter/greeter_system.c:192
+#. markup
+#: gui/gdmlogin.c:2781 gui/greeter/greeter_parser.c:1017
+#: gui/greeter/greeter_system.c:71 gui/greeter/greeter_system.c:196
 msgid "Shut_down"
 msgstr "Troi _bant"
 
-#: gui/gdmlogin.c:2649 gui/greeter/greeter_system.c:199
+#: gui/gdmlogin.c:2788 gui/greeter/greeter_system.c:203
 msgid "Shut down the system so that you may safely turn off the computer."
 msgstr "Cau y system i lawr i chi allu diffodd y cyfrifiadur yn ddiogel."
 
-#: gui/gdmlogin.c:2663 gui/greeter/greeter_system.c:212
+#: gui/gdmlogin.c:2802 gui/greeter/greeter_system.c:216
 msgid "Suspend your computer"
 msgstr "Gorffwys y cyfrifiadur"
 
-#: gui/gdmlogin.c:2669 gui/greeter/greeter_parser.c:986
+#: gui/gdmlogin.c:2808 gui/greeter/greeter_parser.c:1002
 msgid "_Actions"
 msgstr "_Gweithredion"
 
-#: gui/gdmlogin.c:2681 gui/greeter/greeter_canvas_item.c:145
-#: gui/greeter/greeter_parser.c:996
+#: gui/gdmlogin.c:2817
+msgid "_Theme"
+msgstr ""
+
+#: gui/gdmlogin.c:2828 gui/greeter/greeter_canvas_item.c:145
+#: gui/greeter/greeter_parser.c:1012
 msgid "_Quit"
 msgstr "_Gadael"
 
-#: gui/gdmlogin.c:2683 gui/greeter/greeter_canvas_item.c:147
-#: gui/greeter/greeter_parser.c:991
+#: gui/gdmlogin.c:2830 gui/greeter/greeter_canvas_item.c:147
+#: gui/greeter/greeter_parser.c:1007
 msgid "D_isconnect"
 msgstr "D_adcysylltu"
 
-#: gui/gdmlogin.c:2750 gui/greeter/greeter_item_ulist.c:426
+#: gui/gdmlogin.c:2897 gui/greeter/greeter_item_ulist.c:429
 msgid "Icon"
 msgstr "Eicon"
 
-#: gui/gdmlogin.c:2757 gui/greeter/greeter_item_ulist.c:433
-msgid "Username"
-msgstr "Enw Cyfrif"
-
-#: gui/gdmlogin.c:3211
+#: gui/gdmlogin.c:3361
 #, c-format
 msgid "Can't open DefaultImage: %s. Suspending face browser!"
 msgstr "Methu agor DefaultImage: %s. Gorffwys y porwr gwynebau!"
 
-#: gui/gdmlogin.c:3233 gui/gdmsetup.c:468 gui/greeter/greeter_item_ulist.c:281
+#: gui/gdmlogin.c:3383 gui/gdmsetup.c:516 gui/greeter/greeter_item_ulist.c:284
 msgid "Too many users to list here..."
 msgstr "Gormod o defnyddwyr i rhestri yma..."
 
-#: gui/gdmlogin.c:3678 gui/gdmlogin.c:3708 gui/gdmlogin.c:3751
-#: gui/greeter/greeter.c:618 gui/greeter/greeter.c:648
-#: gui/greeter/greeter.c:692
+#. markup
+#: gui/gdmlogin.c:3801 gui/gdmlogin.c:3832 gui/gdmlogin.c:3876
+#: gui/greeter/greeter.c:628 gui/greeter/greeter.c:659
+#: gui/greeter/greeter.c:704
 msgid "Cannot start the greeter"
 msgstr "Methu cychwyn y cyfarchwr"
 
-#: gui/gdmlogin.c:3679 gui/gdmlogin.c:3709
+#: gui/gdmlogin.c:3802 gui/gdmlogin.c:3833
 #, c-format
 msgid ""
 "The greeter version (%s) does not match the daemon version.  You have "
@@ -2864,12 +3083,12 @@ msgstr ""
 "debyg bod chi newydd uwchraddio gdm. Ailgychwynwch yr ellyll GDM neu "
 "ailfwtiwch y peiriant os gwelwch yn dda."
 
-#: gui/gdmlogin.c:3715 gui/gdmlogin.c:3760 gui/greeter/greeter.c:655
-#: gui/greeter/greeter.c:701
+#: gui/gdmlogin.c:3839 gui/gdmlogin.c:3885 gui/greeter/greeter.c:666
+#: gui/greeter/greeter.c:713
 msgid "Reboot"
 msgstr "Ailfwtio"
 
-#: gui/gdmlogin.c:3752
+#: gui/gdmlogin.c:3877
 #, c-format
 msgid ""
 "The greeter version (%s) does not match the daemon version (%s).  You have "
@@ -2880,15 +3099,16 @@ msgstr ""
 "Mae'n debyg bod chi newydd uwchraddio gdm. Ailgychwynwch yr ellyll GDM neu "
 "ailfwtiwch y peiriant os gwelwch yn dda."
 
-#: gui/gdmlogin.c:3758 gui/greeter/greeter.c:699
+#: gui/gdmlogin.c:3883 gui/greeter/greeter.c:711
 msgid "Restart"
 msgstr "Ailcychwyn"
 
-#: gui/gdmlogin.c:3910 gui/greeter/greeter.c:1401
+#. markup
+#: gui/gdmlogin.c:4069 gui/greeter/greeter.c:1331
 msgid "Session directory is missing"
 msgstr "Cyfeiriadur sesiwn ar goll"
 
-#: gui/gdmlogin.c:3912 gui/greeter/greeter.c:1403
+#: gui/gdmlogin.c:4071 gui/greeter/greeter.c:1333
 msgid ""
 "Your session directory is missing or empty!  There are two available "
 "sessions you can use, but you should log in and correct the gdm "
@@ -2897,11 +3117,12 @@ msgstr ""
 "Mae eich cyfeiriadur sesiwn ar goll neu yn wag! Mae dwy sesiwn ar gael i chi "
 "defnyddio, ond dyliwch fewngofnodi a chywiro cyfluniad gdm."
 
-#: gui/gdmlogin.c:3935 gui/greeter/greeter.c:1427
+#. markup
+#: gui/gdmlogin.c:4095 gui/greeter/greeter.c:1358
 msgid "Configuration is not correct"
 msgstr "Nid yw'r cyfluniad yn gywir"
 
-#: gui/gdmlogin.c:3937 gui/greeter/greeter.c:1429
+#: gui/gdmlogin.c:4097 gui/greeter/greeter.c:1360
 msgid ""
 "The configuration file contains an invalid command line for the login "
 "dialog, and thus I ran the default command.  Please fix your configuration."
@@ -2910,11 +3131,12 @@ msgstr ""
 "mewngofnodi, fellu daru mi rhedeg y gorchymyn rhagosod. Gwirwch y cyfluniad "
 "os gwelwch yn dda."
 
-#: gui/gdmlogin.c:3961 gui/greeter/greeter.c:1455
+#. markup
+#: gui/gdmlogin.c:4122 gui/greeter/greeter.c:1387
 msgid "No configuration was found"
 msgstr "Dim cyfluniad wedi ei ganfod"
 
-#: gui/gdmlogin.c:3963 gui/greeter/greeter.c:1457
+#: gui/gdmlogin.c:4124 gui/greeter/greeter.c:1389
 msgid ""
 "The configuration was not found.  GDM is using defaults to run this "
 "session.  You should log in and create a configuration file with the GDM "
@@ -2924,11 +3146,12 @@ msgstr ""
 "ar gyfer y sesiwn. Dylwch fewngofnodi a creu ffeil cyfluniad hefo rhaglen "
 "cyfluniad GDM."
 
-#: gui/gdmphotosetup.c:139
+#. markup
+#: gui/gdmphotosetup.c:144
 msgid "The face browser is not configured"
 msgstr "Nid yw y porwr gwyneb wedi ei gyflunio"
 
-#: gui/gdmphotosetup.c:142
+#: gui/gdmphotosetup.c:147
 msgid ""
 "The face browser is not configured in the GDM configuration.  Please ask "
 "your system administrator to enable it in the GDM configurator program."
@@ -2936,27 +3159,29 @@ msgstr ""
 "Nid yw'r porwr gwyneb wedi ei gyflunio yng nghyfluniad GDM. Gofynnwch i "
 "weinyddwr eich system i'w alluogi yn rhaglen cyfluniad GDM."
 
-#: gui/gdmphotosetup.c:152 gui/gdmphotosetup.desktop.in.h:2
+#: gui/gdmphotosetup.c:157 gui/gdmphotosetup.desktop.in.h:2
 msgid "Login Photo"
 msgstr "Ffoto Mewngofnodi"
 
-#: gui/gdmphotosetup.c:162
+#: gui/gdmphotosetup.c:167
 msgid "Select a photograph to show in the facebrowser:"
 msgstr "Dewisiwch ffoto i dangos yn y gwyneb-porwr"
 
-#: gui/gdmphotosetup.c:167
+#: gui/gdmphotosetup.c:172
 msgid "Browse"
 msgstr "Pori"
 
-#: gui/gdmphotosetup.c:200
+#. markup
+#: gui/gdmphotosetup.c:206
 msgid "No picture selected."
 msgstr "Dim llun wedi ei dewis."
 
-#: gui/gdmphotosetup.c:210
+#. markup
+#: gui/gdmphotosetup.c:217
 msgid "Picture is too large"
 msgstr "Llun yn rhy fawr"
 
-#: gui/gdmphotosetup.c:211
+#: gui/gdmphotosetup.c:218
 #, c-format
 msgid ""
 "The system administrator disallowed pictures larger than %d bytes to show in "
@@ -2965,11 +3190,12 @@ msgstr ""
 "Mae gweinyddwr eich system wedi gwahardd lluniau yn fwy na %d beit rhag cael "
 "eu dangos yn y porwr gwyneb"
 
-#: gui/gdmphotosetup.c:236 gui/gdmphotosetup.c:255
+#. markup
+#: gui/gdmphotosetup.c:245 gui/gdmphotosetup.c:267
 msgid "Cannot open file"
 msgstr "Methu agor ffeil"
 
-#: gui/gdmphotosetup.c:237
+#: gui/gdmphotosetup.c:246
 #, c-format
 msgid ""
 "File %s cannot be open for reading\n"
@@ -2978,7 +3204,7 @@ msgstr ""
 "Ni ellir agor ffeil %s i'w darllen\n"
 "Gwall: %s"
 
-#: gui/gdmphotosetup.c:256
+#: gui/gdmphotosetup.c:268
 #, c-format
 msgid ""
 "File %s cannot be open for writing\n"
@@ -2999,48 +3225,50 @@ msgstr ""
 #. * DO NOT compile it as part of your application.
 #.
 #: gui/gdmsetup-strings.c:7 gui/gdmsetup.desktop.in.h:2
-#: gui/gdmsetup.glade.h:24
+#: gui/gdmsetup.glade.h:26
 msgid "Login Screen Setup"
 msgstr "Gosodiad Sgrîn Mewngofnodi"
 
-#: gui/gdmsetup-strings.c:8 gui/gdmsetup.glade.h:20
+#: gui/gdmsetup-strings.c:8 gui/gdmsetup.glade.h:22
 msgid "Greeter"
 msgstr "Cyfarchwr"
 
 #: gui/gdmsetup-strings.c:9 gui/gdmsetup-strings.c:24
 #: gui/gdmsetup-strings.c:29 gui/gdmsetup-strings.c:36
 #: gui/gdmsetup-strings.c:39 gui/gdmsetup-strings.c:42
-#: gui/gdmsetup-strings.c:65 gui/gdmsetup-strings.c:78 gui/gdmsetup.glade.h:1
+#: gui/gdmsetup-strings.c:65 gui/gdmsetup-strings.c:71
+#: gui/gdmsetup-strings.c:73 gui/gdmsetup-strings.c:79
+#: gui/gdmsetup-strings.c:82 gui/gdmsetup-strings.c:90 gui/gdmsetup.glade.h:1
 msgid "    "
 msgstr "    "
 
-#: gui/gdmsetup-strings.c:10 gui/gdmsetup.glade.h:22
+#: gui/gdmsetup-strings.c:10 gui/gdmsetup.glade.h:24
 msgid "L_ocal: "
 msgstr "L_leol:"
 
-#: gui/gdmsetup-strings.c:11 gui/gdmsetup.glade.h:62
+#: gui/gdmsetup-strings.c:11 gui/gdmsetup.glade.h:66
 msgid "_Remote: "
 msgstr "_Pell:"
 
-#: gui/gdmsetup-strings.c:12 gui/gdmsetup.glade.h:65
+#: gui/gdmsetup-strings.c:12 gui/gdmsetup.glade.h:70
 msgid "_Welcome string: "
 msgstr "Llinyn _croeso: "
 
-#: gui/gdmsetup-strings.c:13 gui/gdmsetup.glade.h:40
+#: gui/gdmsetup-strings.c:13 gui/gdmsetup.glade.h:43
 msgid "Re_mote welcome string: "
 msgstr "Llinyn croeso p_ell: "
 
 #: gui/gdmsetup-strings.c:14 gui/gdmsetup-strings.c:16
-#: gui/gdmsetup-strings.c:51 gui/gdmsetup.c:840 gui/gdmsetup.glade.h:46
+#: gui/gdmsetup-strings.c:51 gui/gdmsetup.c:911 gui/gdmsetup.glade.h:50
 msgid "Standard greeter"
 msgstr "Cyfarchydd safonol"
 
 #: gui/gdmsetup-strings.c:15 gui/gdmsetup-strings.c:17
-#: gui/gdmsetup-strings.c:63 gui/gdmsetup.c:842 gui/gdmsetup.glade.h:19
+#: gui/gdmsetup-strings.c:63 gui/gdmsetup.c:913 gui/gdmsetup.glade.h:21
 msgid "Graphical greeter"
 msgstr "Cyfarchydd graffigol"
 
-#: gui/gdmsetup-strings.c:18 gui/gdmsetup.glade.h:48
+#: gui/gdmsetup-strings.c:18 gui/gdmsetup.glade.h:52
 #, no-c-format
 msgid ""
 "String to be shown in the greeter as welcome.  You can insert %n in here and "
@@ -3049,7 +3277,7 @@ msgstr ""
 "Y llinyn i'w ddangos yn y cyfarchydd fel croseo. Fe allwch fewnosod %n yma a "
 "fe gaiff ei amnewid efo enw eich cyfrifiadur."
 
-#: gui/gdmsetup-strings.c:20 gui/gdmsetup.glade.h:50
+#: gui/gdmsetup-strings.c:20 gui/gdmsetup.glade.h:54
 #, no-c-format
 msgid ""
 "String to be shown in the greeter for people logging in remotely with "
@@ -3060,107 +3288,107 @@ msgstr ""
 "o pell hefo XDMCP. Fe allwch rhoi %n yma a bydd yn cael ei amnewid hefo enw "
 "eich cyfrifiadur."
 
-#: gui/gdmsetup-strings.c:22 gui/gdmsetup.glade.h:9
+#: gui/gdmsetup-strings.c:22 gui/gdmsetup.glade.h:10
 msgid "Always use 24 hour cloc_k format"
 msgstr "Pob tro defnyddio y clo_c fformat 24 awr"
 
-#: gui/gdmsetup-strings.c:23 gui/gdmsetup.glade.h:11
+#: gui/gdmsetup-strings.c:23 gui/gdmsetup.glade.h:12
 msgid "Automatic Login"
 msgstr "Mewngofnodiad Awtomatig"
 
-#: gui/gdmsetup-strings.c:25 gui/gdmsetup.glade.h:54
+#: gui/gdmsetup-strings.c:25 gui/gdmsetup.glade.h:58
 msgid "_Automatic login username:"
 msgstr "M_ewngofnodi enw defnyddiwr yn awtomatig:"
 
-#: gui/gdmsetup-strings.c:27 gui/gdmsetup.glade.h:59
+#: gui/gdmsetup-strings.c:27 gui/gdmsetup.glade.h:63
 msgid "_Login a user automatically on first bootup"
 msgstr "_Mewngofnodi defnyddiwr yn ymysgogol ar ol cychwyn cyntaf"
 
-#: gui/gdmsetup-strings.c:28 gui/gdmsetup.glade.h:51
+#: gui/gdmsetup-strings.c:28 gui/gdmsetup.glade.h:55
 msgid "Timed Login"
 msgstr "Amseru Mewngofnodi"
 
-#: gui/gdmsetup-strings.c:30 gui/gdmsetup.glade.h:52
+#: gui/gdmsetup-strings.c:30 gui/gdmsetup.glade.h:56
 msgid "Timed login us_ername:"
 msgstr "Amseru mewngofnodi _enw defnyddiwr:"
 
-#: gui/gdmsetup-strings.c:31 gui/gdmsetup.glade.h:64
+#: gui/gdmsetup-strings.c:31 gui/gdmsetup.glade.h:68
 msgid "_Seconds before login:"
 msgstr "_Eiliadau cyn mewngofnodi:"
 
-#: gui/gdmsetup-strings.c:33 gui/gdmsetup.glade.h:25
+#: gui/gdmsetup-strings.c:33 gui/gdmsetup.glade.h:27
 msgid "Login a user automa_tically after a specified number of seconds"
 msgstr "Mewngofnodi yn ym_ysgogol ar ol nifer penodol o eiliadau"
 
-#: gui/gdmsetup-strings.c:34 gui/gdmsetup.glade.h:18
+#: gui/gdmsetup-strings.c:34 gui/gdmsetup.glade.h:20
 msgid "General"
 msgstr "Cyffredinol"
 
-#: gui/gdmsetup-strings.c:35 gui/gdmsetup.glade.h:26
+#: gui/gdmsetup-strings.c:35 gui/gdmsetup.glade.h:28
 msgid "Logo"
 msgstr "Logo"
 
-#: gui/gdmsetup-strings.c:38 gui/gdmsetup.glade.h:32
+#: gui/gdmsetup-strings.c:38 gui/gdmsetup.glade.h:35
 msgid "Miscellaneous"
 msgstr "Amrywiol"
 
-#: gui/gdmsetup-strings.c:40 gui/gdmsetup.glade.h:44
+#: gui/gdmsetup-strings.c:40 gui/gdmsetup.glade.h:47
 msgid "Show choosable user images (_face browser)"
 msgstr "Dangos delweddau defnyddwyr dewisiedig (_porwr gwyneb)"
 
-#: gui/gdmsetup-strings.c:41 gui/gdmsetup.glade.h:12
+#: gui/gdmsetup-strings.c:41 gui/gdmsetup.glade.h:13
 msgid "Background"
 msgstr "Cefndir"
 
-#: gui/gdmsetup-strings.c:43 gui/gdmsetup.glade.h:60
+#: gui/gdmsetup-strings.c:43 gui/gdmsetup.glade.h:64
 msgid "_No background"
 msgstr "_Dim cefndir"
 
-#: gui/gdmsetup-strings.c:44 gui/gdmsetup.glade.h:57
+#: gui/gdmsetup-strings.c:44 gui/gdmsetup.glade.h:61
 msgid "_Image"
 msgstr "_Delwedd"
 
-#: gui/gdmsetup-strings.c:45 gui/gdmsetup.glade.h:13
+#: gui/gdmsetup-strings.c:45 gui/gdmsetup.glade.h:14
 msgid "Co_lor"
 msgstr "_Lliw"
 
-#: gui/gdmsetup-strings.c:46 gui/gdmsetup.glade.h:63
+#: gui/gdmsetup-strings.c:46 gui/gdmsetup.glade.h:67
 msgid "_Scale background image to fit"
 msgstr "_Chwyddo delwedd cefndir i ffitio"
 
-#: gui/gdmsetup-strings.c:48 gui/gdmsetup.glade.h:61
+#: gui/gdmsetup-strings.c:48 gui/gdmsetup.glade.h:65
 msgid "_Only color on remote displays"
 msgstr "_Ond lliw ar ddangosyddion pell"
 
-#: gui/gdmsetup-strings.c:49 gui/gdmsetup.glade.h:55
+#: gui/gdmsetup-strings.c:49 gui/gdmsetup.glade.h:59
 msgid "_Background color: "
 msgstr "_Lliw Cefndir: "
 
-#: gui/gdmsetup-strings.c:50 gui/gdmsetup.glade.h:36
+#: gui/gdmsetup-strings.c:50 gui/gdmsetup.glade.h:39
 msgid "Pick a color"
 msgstr "Dewiswch liw"
 
-#: gui/gdmsetup-strings.c:52 gui/gdmsetup.glade.h:39
+#: gui/gdmsetup-strings.c:52 gui/gdmsetup.glade.h:42
 msgid "Preview:"
 msgstr "Rhagolwg:"
 
-#: gui/gdmsetup-strings.c:53 gui/gdmsetup.glade.h:34
+#: gui/gdmsetup-strings.c:53 gui/gdmsetup.glade.h:37
 msgid "No screenshot available"
 msgstr "Dim Sgrînlun ar gael"
 
-#: gui/gdmsetup-strings.c:54 gui/gdmsetup.glade.h:15
+#: gui/gdmsetup-strings.c:54 gui/gdmsetup.glade.h:16
 msgid "Description:"
 msgstr "Disgrifiad:"
 
-#: gui/gdmsetup-strings.c:55 gui/gdmsetup.glade.h:14
+#: gui/gdmsetup-strings.c:55 gui/gdmsetup.glade.h:15
 msgid "Copyright:"
 msgstr "Hawlfraint:"
 
-#: gui/gdmsetup-strings.c:56 gui/gdmsetup.glade.h:10
+#: gui/gdmsetup-strings.c:56 gui/gdmsetup.glade.h:11
 msgid "Author:"
 msgstr "Awdur:"
 
-#: gui/gdmsetup-strings.c:57 gui/gdmsetup.glade.h:68
+#: gui/gdmsetup-strings.c:57 gui/gdmsetup.glade.h:74
 msgid ""
 "description\n"
 "widget"
@@ -3168,39 +3396,39 @@ msgstr ""
 "Disgrifiad\n"
 "teclyn"
 
-#: gui/gdmsetup-strings.c:59 gui/gdmsetup.glade.h:66
+#: gui/gdmsetup-strings.c:59 gui/gdmsetup.glade.h:72
 msgid "author"
 msgstr "awdur"
 
-#: gui/gdmsetup-strings.c:60 gui/gdmsetup.glade.h:67
+#: gui/gdmsetup-strings.c:60 gui/gdmsetup.glade.h:73
 msgid "copyright"
 msgstr "hawlfraint"
 
-#: gui/gdmsetup-strings.c:61 gui/gdmsetup.glade.h:58
+#: gui/gdmsetup-strings.c:61 gui/gdmsetup.glade.h:62
 msgid "_Install new theme"
 msgstr "_Gosod thema newydd"
 
-#: gui/gdmsetup-strings.c:62 gui/gdmsetup.glade.h:56
+#: gui/gdmsetup-strings.c:62 gui/gdmsetup.glade.h:60
 msgid "_Delete theme"
 msgstr "_Dileu thema"
 
-#: gui/gdmsetup-strings.c:64 gui/gdmsetup.glade.h:35
+#: gui/gdmsetup-strings.c:64 gui/gdmsetup-strings.c:78 gui/gdmsetup.glade.h:38
 msgid "Options"
 msgstr "Opsiynnau"
 
-#: gui/gdmsetup-strings.c:66 gui/gdmsetup.glade.h:4
+#: gui/gdmsetup-strings.c:66 gui/gdmsetup.glade.h:5
 msgid "Allow _root to login with GDM"
 msgstr "Caniatáu _root i mewngofnodi hefo GDM"
 
-#: gui/gdmsetup-strings.c:67 gui/gdmsetup.glade.h:7
+#: gui/gdmsetup-strings.c:67 gui/gdmsetup.glade.h:8
 msgid "Allow root to login r_emotely with GDM"
 msgstr "Caniatáu i root mewngofnodi o _pell hefo GDM"
 
-#: gui/gdmsetup-strings.c:68 gui/gdmsetup.glade.h:6
+#: gui/gdmsetup-strings.c:68 gui/gdmsetup.glade.h:7
 msgid "Allow remote _timed logins"
 msgstr "Caniatáu mewngofnodi pell wedi amseru"
 
-#: gui/gdmsetup-strings.c:69 gui/gdmsetup.glade.h:45
+#: gui/gdmsetup-strings.c:69 gui/gdmsetup.glade.h:48
 msgid ""
 "Show the \"Actions\" menu (formerly known as the \"System\" menu).  If not "
 "set, none of the system commands will be available (this includes reboot, "
@@ -3210,19 +3438,19 @@ msgstr ""
 "blaen). Os heb ei osod, bydd dim un o'r gorchmynion system ar gael (mae hyn "
 "yn cynnwys ailfwtio, cau i lawr, cyflunio, dewisydd)"
 
-#: gui/gdmsetup-strings.c:70 gui/gdmsetup.glade.h:43
+#: gui/gdmsetup-strings.c:70 gui/gdmsetup.glade.h:46
 msgid "Show _actions menu"
 msgstr "Dangos dewislen _gweithredoedd"
 
-#: gui/gdmsetup-strings.c:71 gui/gdmsetup.glade.h:5
+#: gui/gdmsetup-strings.c:72 gui/gdmsetup.glade.h:6
 msgid "Allow c_onfiguration from the login screen"
 msgstr "Caniadau c_yfluniad o'r sgrîn mewngofnodi"
 
-#: gui/gdmsetup-strings.c:72 gui/gdmsetup.glade.h:3
+#: gui/gdmsetup-strings.c:74 gui/gdmsetup.glade.h:4
 msgid "Allo_w running XDMCP chooser from the login screen"
 msgstr "Caniatáu rhedeg dewisiwr XDMCP o'r sgrîn mewngofnodi"
 
-#: gui/gdmsetup-strings.c:73 gui/gdmsetup.glade.h:8
+#: gui/gdmsetup-strings.c:75 gui/gdmsetup.glade.h:9
 msgid ""
 "Always disallow TCP connections to _X server (disables all remote "
 "connections)"
@@ -3230,15 +3458,40 @@ msgstr ""
 "Pob tro rhwystro cysylltiadau TCP i'r gweinydd _X (analluogi pob cysylltiad "
 "pell)"
 
-#: gui/gdmsetup-strings.c:74 gui/gdmsetup.glade.h:41
+#: gui/gdmsetup-strings.c:76 gui/gdmsetup.glade.h:44
 msgid "Retry _delay (seconds) :"
 msgstr "_Oedi Ail-geisio"
 
-#: gui/gdmsetup-strings.c:75 gui/gdmsetup.glade.h:42
+#: gui/gdmsetup-strings.c:77 gui/gdmsetup.glade.h:45
 msgid "Security"
 msgstr "Diogelwch"
 
-#: gui/gdmsetup-strings.c:76 gui/gdmsetup.glade.h:33
+#: gui/gdmsetup-strings.c:80 gui/gdmsetup.glade.h:19
+msgid "Enable _accessibility modules"
+msgstr ""
+
+#: gui/gdmsetup-strings.c:81 gui/gdmsetup.glade.h:29
+msgid "Make a _sound when login window is ready"
+msgstr ""
+
+#: gui/gdmsetup-strings.c:83 gui/gdmsetup.glade.h:71
+msgid "acc_sound_file_box"
+msgstr ""
+
+#: gui/gdmsetup-strings.c:84 gui/gdmsetup.glade.h:49
+msgid "Sound _file:"
+msgstr ""
+
+#: gui/gdmsetup-strings.c:86 gui/gdmsetup.glade.h:69
+#, fuzzy
+msgid "_Test sound"
+msgstr "_Sesiwn"
+
+#: gui/gdmsetup-strings.c:87 gui/gdmsetup.glade.h:3
+msgid "Accessibility"
+msgstr ""
+
+#: gui/gdmsetup-strings.c:88 gui/gdmsetup.glade.h:36
 msgid ""
 "No XDMCP support in the binary.  To enable XDMCP support you must recompile "
 "GDM with the XDMCP libraries."
@@ -3246,55 +3499,56 @@ msgstr ""
 "Nid oes cefnogaeth XDMCP yn y deuol. I galluogi cefnogaeth XDMCP bydd rhaid "
 "i chi ailgrynhoi GDM hefo'r llyfrgelloedd XDMCP."
 
-#: gui/gdmsetup-strings.c:77 gui/gdmsetup.glade.h:17
+#: gui/gdmsetup-strings.c:89 gui/gdmsetup.glade.h:18
 msgid "Enable _XDMCP"
 msgstr "Galluogi _XDMCP"
 
-#: gui/gdmsetup-strings.c:79 gui/gdmsetup.glade.h:21
+#: gui/gdmsetup-strings.c:91 gui/gdmsetup.glade.h:23
 msgid "Honour _indirect requests"
 msgstr "Parchu _ceisiadau anuniongyrchol"
 
-#: gui/gdmsetup-strings.c:80 gui/gdmsetup.glade.h:23
+#: gui/gdmsetup-strings.c:92 gui/gdmsetup.glade.h:25
 msgid "Listen on _UDP port: "
 msgstr "Gwrando ar porth _UDP:"
 
-#: gui/gdmsetup-strings.c:81 gui/gdmsetup.glade.h:28
+#: gui/gdmsetup-strings.c:93 gui/gdmsetup.glade.h:31
 msgid "Maximum _pending requests:"
 msgstr "Mwyafrif Ceisiadau _disgwyl:"
 
-#: gui/gdmsetup-strings.c:82 gui/gdmsetup.glade.h:27
+#: gui/gdmsetup-strings.c:94 gui/gdmsetup.glade.h:30
 msgid "Max p_ending indirect requests:"
 msgstr "Mwyafrif ceisiadau anuniongyrchol d_isgwyl:"
 
-#: gui/gdmsetup-strings.c:83 gui/gdmsetup.glade.h:29
+#: gui/gdmsetup-strings.c:95 gui/gdmsetup.glade.h:32
 msgid "Maximum _remote sessions:"
 msgstr "Mwyafrif sesiwn pell:"
 
-#: gui/gdmsetup-strings.c:84 gui/gdmsetup.glade.h:30
+#: gui/gdmsetup-strings.c:96 gui/gdmsetup.glade.h:33
 msgid "Maximum _wait time:"
 msgstr "Mwyafrif _amser disgwyl:"
 
-#: gui/gdmsetup-strings.c:85 gui/gdmsetup.glade.h:31
+#: gui/gdmsetup-strings.c:97 gui/gdmsetup.glade.h:34
 msgid "Maximum indirect w_ait time:"
 msgstr "Mwyafrif amser disgwyl anuniongyrchol:"
 
-#: gui/gdmsetup-strings.c:86 gui/gdmsetup.glade.h:16
+#: gui/gdmsetup-strings.c:98 gui/gdmsetup.glade.h:17
 msgid "Displays per _host:"
 msgstr "Ddangosyddion fesul gwesteiwr:"
 
-#: gui/gdmsetup-strings.c:87 gui/gdmsetup.glade.h:37
+#: gui/gdmsetup-strings.c:99 gui/gdmsetup.glade.h:40
 msgid "Pin_g interval (seconds):"
 msgstr "Cyfnod _Pingio (eiliadau):"
 
-#: gui/gdmsetup-strings.c:88 gui/gdmsetup.glade.h:38
+#: gui/gdmsetup-strings.c:100 gui/gdmsetup.glade.h:41
 msgid "Ping interval (seconds):"
 msgstr "Cyfnod Pingio (eiliadau):"
 
-#: gui/gdmsetup-strings.c:89 gui/gdmsetup.glade.h:53
+#: gui/gdmsetup-strings.c:101 gui/gdmsetup.glade.h:57
 msgid "XDMCP"
 msgstr "XDMCP"
 
-#: gui/gdmsetup.c:145
+#. markup
+#: gui/gdmsetup.c:147
 msgid ""
 "An error occured while trying to contact the login screens.  Not all updates "
 "may have taken effect."
@@ -3302,42 +3556,50 @@ msgstr ""
 "Gwall tra'n cysylltu hefo'r sgrîn mewngofnodi. Mae'n posib bydd rhai o'r "
 "diweddariadau wedi cymeryd effaith."
 
-#: gui/gdmsetup.c:1423
+#. markup
+#: gui/gdmsetup.c:470
+msgid ""
+"Autologin or timed login to the superuser (root) account is not allowed."
+msgstr ""
+
+#: gui/gdmsetup.c:1698
 msgid "Archive is not of a subdirectory"
 msgstr "Archif ddim o Is-gyfeiriadur"
 
-#: gui/gdmsetup.c:1431
+#: gui/gdmsetup.c:1706
 msgid "Archive is not of a single subdirectory"
 msgstr "Archif ddim o Is-gyfeiriadur sengl"
 
-#: gui/gdmsetup.c:1455 gui/gdmsetup.c:1534
+#: gui/gdmsetup.c:1730 gui/gdmsetup.c:1809
 msgid "File not a tar.gz or tar archive"
 msgstr "Ffeil ddim yn tar.gz neu archif tar"
 
-#: gui/gdmsetup.c:1457
+#: gui/gdmsetup.c:1732
 msgid "Archive does not include a GdmGreeterTheme.info file"
 msgstr "Archif ddim yn cynnwys ffeil GdmGreeterTheme.info"
 
-#: gui/gdmsetup.c:1479
+#: gui/gdmsetup.c:1754
 msgid "File does not exist"
 msgstr "Ffeil ddim yn bodoli"
 
-#: gui/gdmsetup.c:1587
+#. markup
+#: gui/gdmsetup.c:1867
 msgid "No file selected"
 msgstr "Dim ffeil dewisiedig"
 
-#: gui/gdmsetup.c:1614
+#. markup
+#: gui/gdmsetup.c:1895
 msgid "Not a theme archive"
 msgstr "Dim yn archif thema"
 
-#: gui/gdmsetup.c:1615
+#: gui/gdmsetup.c:1896
 #, c-format
 msgid "Details: %s"
 msgstr "Manylion: %s"
 
 #. FIXME: if exists already perhaps we could also have an
 #. * option to change the dir name
-#: gui/gdmsetup.c:1633
+#: gui/gdmsetup.c:1914
 #, c-format
 msgid ""
 "Theme directory '%s' seems to be already installed, install again anyway?"
@@ -3345,21 +3607,27 @@ msgstr ""
 "Mae y cyfeiriadur thema '%s' i'w gweld wedi ei gosod yn barod, gosod eto "
 "beth bynnag?"
 
-#: gui/gdmsetup.c:1709
+#. markup
+#: gui/gdmsetup.c:1992
 msgid "Some error occured when installing the theme"
 msgstr "Bydd nam tra'n gosod y thema"
 
-#: gui/gdmsetup.c:1755
+#: gui/gdmsetup.c:2038
 msgid "Select new theme archive to install"
 msgstr "Dewisiwch thema newydd i gosod"
 
-#: gui/gdmsetup.c:1823
+#: gui/gdmsetup.c:2042
+#, fuzzy
+msgid "_Install"
+msgstr "_Gosod thema newydd"
+
+#: gui/gdmsetup.c:2106
 #, c-format
 msgid "Do you really wish to remove theme '%s' from the system?"
 msgstr "Ydych yn siwr bod chi eisiau tynnu'r thema '%s' o'ch system?"
 
 #. This is the temporary help dialog
-#: gui/gdmsetup.c:2033
+#: gui/gdmsetup.c:2317
 #, c-format
 msgid ""
 "This configuration window changes settings for the GDM daemon, which is the "
@@ -3382,7 +3650,8 @@ msgstr ""
 "Am y dogfenaeth cyfan gwelwch y porwr cymorth GNOME dan y categori GNOME/"
 "System."
 
-#: gui/gdmsetup.c:2417
+#. markup
+#: gui/gdmsetup.c:2733
 msgid "You must be the superuser (root) to configure GDM."
 msgstr "Bydd rhaid bod yn uwch ddefnyddiwr (root) i gyflunio GDM."
 
@@ -3391,7 +3660,7 @@ msgstr "Bydd rhaid bod yn uwch ddefnyddiwr (root) i gyflunio GDM."
 msgid "A graphical application for configuring the GNOME Display Manager (GDM)"
 msgstr "Rhaglen graffegol er mwyn cyflunio Rheolydd Dangosydd GNOME (GDM)"
 
-#: gui/greeter/greeter.c:619 gui/greeter/greeter.c:649
+#: gui/greeter/greeter.c:629 gui/greeter/greeter.c:660
 #, c-format
 msgid ""
 "The greeter version (%s) does not match the daemon version.\n"
@@ -3402,7 +3671,7 @@ msgstr ""
 "Rydych mwy na thebyg wedi ywchraddio gdm.\n"
 "Ailgychwynwch yr ellyll GDM neu ailfwtiwch y cyfrifiadur os gwelwch yn dda."
 
-#: gui/greeter/greeter.c:693
+#: gui/greeter/greeter.c:705
 #, c-format
 msgid ""
 "The greeter version (%s) does not match the daemon version (%s).\n"
@@ -3413,24 +3682,26 @@ msgstr ""
 "Rydych mwy na thebyg wedi ywchraddio gdm.\n"
 "Ailgychwynwch yr ellyll GDM neu ailfwtiwch y cyfrifiadur os gwelwch yn dda."
 
-#: gui/greeter/greeter.c:1249
+#: gui/greeter/greeter.c:1171
 #, c-format
 msgid "There was an error loading the theme %s"
 msgstr "Roedd nam tra'n llwytho y thema %s"
 
-#: gui/greeter/greeter.c:1297
+#. markup
+#: gui/greeter/greeter.c:1224
 msgid "The theme for the graphical greeter is corrupt"
 msgstr "Mae'r thema ar gyfer y cyfarchwr graffegol yn lygredig"
 
-#: gui/greeter/greeter.c:1300
+#: gui/greeter/greeter.c:1227
 msgid ""
 "The theme does not contain definition for the username/password entry "
 "element."
 msgstr ""
-"Nid ydy'r thema yn cynnwys diffiniad o'r elfen bwydo enw-defnyddwyr/"
+"Nid ydy'r thema yn cynnwys diffiniad o'r cofnod enw defnyddiwr/"
 "cyfrinair."
 
-#: gui/greeter/greeter.c:1332
+#. markup
+#: gui/greeter/greeter.c:1260
 msgid ""
 "There was an error loading the theme, and the default theme also could not "
 "have been loaded, I will attempt to start the standard greeter"
@@ -3438,7 +3709,8 @@ msgstr ""
 "Roedd gwall tra'n llwytho y thema, a ni ellir llwytho'r thema rhagosod, "
 "ceisiaf gychwyn y cyfarchwr safonol"
 
-#: gui/greeter/greeter.c:1353
+#. markup
+#: gui/greeter/greeter.c:1282
 msgid ""
 "I could not start the standard greeter.  This display will abort and you may "
 "have to login another way and fix the installation of gdm"
@@ -3446,15 +3718,15 @@ msgstr ""
 "Nid oeddwn yn gallu cychwyn y cyfarchwr safonol. Gwneith y dangos yma cau ac "
 "bu rhaid iddoch mewn-gonfnodi ffordd arall a gwyrio y gosodiad o gdm"
 
-#: gui/greeter/greeter_action_language.c:45
+#: gui/greeter/greeter_action_language.c:46
 msgid "Last"
 msgstr "Diwethaf"
 
-#: gui/greeter/greeter_action_language.c:188
+#: gui/greeter/greeter_action_language.c:195
 msgid "Select a language"
 msgstr "Dewis iaith"
 
-#: gui/greeter/greeter_action_language.c:205
+#: gui/greeter/greeter_action_language.c:212
 msgid "Select a language for your session to use:"
 msgstr "Dewis iaith i'ch sesiwn defnyddio:"
 
@@ -3466,18 +3738,17 @@ msgstr "Dewis _Iaith..."
 msgid "Select _Session..."
 msgstr "Dewis _Sesiwn..."
 
-#: gui/greeter/greeter_canvas_item.c:351
+#: gui/greeter/greeter_canvas_item.c:373
 msgid "Answer questions here and press Enter when done.  For a menu press F10."
 msgstr ""
-"Ateb y cwestiwn yma a pwyswch Enter pan byddwch weid gorffen. I galw y "
-"bwydlen gwasgwch F10."
+"Ateb y cwestiwn yma a pwyswch Enter pan byddwch wedi gorffen. I alw y ddewislen gwasgwch F10."
 
-#: gui/greeter/greeter_item_ulist.c:263
+#: gui/greeter/greeter_item_ulist.c:266
 #, c-format
 msgid "Can't open DefaultImage: %s!"
 msgstr "Methu agor DefaultImage: %s!"
 
-#: gui/greeter/greeter_item_ulist.c:365
+#: gui/greeter/greeter_item_ulist.c:368
 msgid ""
 "Doubleclick on the user\n"
 "to log in"
@@ -3485,51 +3756,51 @@ msgstr ""
 "Defnyddiwch glic ddwbl ar y\n"
 "defnyddiwr er mwyn mewngofnodi"
 
-#: gui/greeter/greeter_parser.c:1006 gui/greeter/greeter_system.c:205
+#: gui/greeter/greeter_parser.c:1022 gui/greeter/greeter_system.c:209
 msgid "Sus_pend"
 msgstr "_Gorffwys"
 
-#: gui/greeter/greeter_parser.c:1016
+#: gui/greeter/greeter_parser.c:1032
 msgid "_XDMCP Chooser"
 msgstr "Dewisydd _XDMCP"
 
-#: gui/greeter/greeter_parser.c:1021
+#: gui/greeter/greeter_parser.c:1037
 msgid "_Configure"
 msgstr "_Cyflunio"
 
-#: gui/greeter/greeter_parser.c:1026
+#: gui/greeter/greeter_parser.c:1042
 msgid "You've got capslock on!"
 msgstr "Mae capslock ymalen gennych!"
 
-#: gui/greeter/greeter_session.c:233
+#: gui/greeter/greeter_session.c:247
 msgid "Choose a Session"
 msgstr "Dewiswch Sesiwn"
 
-#: gui/greeter/greeter_system.c:270
+#: gui/greeter/greeter_system.c:274
 msgid "Choose an Action"
 msgstr "Dewiswch Weithred"
 
-#: gui/greeter/greeter_system.c:292
+#: gui/greeter/greeter_system.c:296
 msgid "Shut _down the computer"
 msgstr "Cau'r cyfrifiadur i _lawr"
 
-#: gui/greeter/greeter_system.c:295
+#: gui/greeter/greeter_system.c:299
 msgid "Shut down your computer so that you may turn it off."
 msgstr "Cau eich cyfrifiadur i lawr fel y gallwch ei droi e bant."
 
-#: gui/greeter/greeter_system.c:310
+#: gui/greeter/greeter_system.c:314
 msgid "_Reboot the computer"
 msgstr "_Ailfwtio'r cyfrifiadur"
 
-#: gui/greeter/greeter_system.c:324
+#: gui/greeter/greeter_system.c:328
 msgid "Sus_pend the computer"
 msgstr "_Gorffwys y gyfrifiadur"
 
-#: gui/greeter/greeter_system.c:338
+#: gui/greeter/greeter_system.c:342
 msgid "Run _XDMCP chooser"
 msgstr "Rhedeg y dew_isiwr XDMCP"
 
-#: gui/greeter/greeter_system.c:358
+#: gui/greeter/greeter_system.c:362
 msgid "_Configure the login manager"
 msgstr "_Cyflunio'r rheolydd mwngofnodi"
 
@@ -3575,7 +3846,7 @@ msgstr "Amrywiad Celf GNOME o Cylchoedd"
 msgid "Happy GNOME"
 msgstr "GNOME Hapus"
 
-#: gui/modules/dwellmouselistener.c:573 gui/modules/keymouselistener.c:632
+#: gui/modules/dwellmouselistener.c:586 gui/modules/keymouselistener.c:681
 #, c-format
 msgid ""
 "Error while trying to run (%s)\n"
@@ -3602,12 +3873,13 @@ msgstr "(byffer cof)"
 msgid "(memory buffer"
 msgstr "(byffer cof)"
 
-#: vicious-extensions/glade-helper.c:189 vicious-extensions/glade-helper.c:236
-#: vicious-extensions/glade-helper.c:273
+#. markup
+#: vicious-extensions/glade-helper.c:193 vicious-extensions/glade-helper.c:246
+#: vicious-extensions/glade-helper.c:289
 msgid "Cannot load user interface"
 msgstr "Methu llwytho'r rhyngwyneb defnyddiwr"
 
-#: vicious-extensions/glade-helper.c:190
+#: vicious-extensions/glade-helper.c:194
 #, c-format
 msgid ""
 "An error occured while loading the user interface element %s%s from file %"
@@ -3620,7 +3892,7 @@ msgstr ""
 "yn gallu parhau ac am gorffen nawr. Dyliwch gwiro eich gosodiad o %s neu ail "
 "osod %s."
 
-#: vicious-extensions/glade-helper.c:206
+#: vicious-extensions/glade-helper.c:210
 #, c-format
 msgid ""
 "Glade file is on crack! Make sure the correct file is installed!\n"
@@ -3629,7 +3901,7 @@ msgstr ""
 "Mae y ffeil Glade ar crac! Gwnewch yn siwr bod y ffeil cywir wedi ei gosod!\n"
 "ffeil: %s teclyn: %s"
 
-#: vicious-extensions/glade-helper.c:237
+#: vicious-extensions/glade-helper.c:247
 #, c-format
 msgid ""
 "An error occured while loading the user interface element %s%s from file %"
@@ -3642,7 +3914,7 @@ msgstr ""
 "rhyngwyneb glade wedi ei llygru. %s yn methu parhau ac fe gwnaiff nawr "
 "gorffen. Dyliwch gwiro eich gosodiad o %s neu ail-osod %s."
 
-#: vicious-extensions/glade-helper.c:255
+#: vicious-extensions/glade-helper.c:265
 #, c-format
 msgid ""
 "Glade file is on crack! Make sure the correct file is installed!\n"
@@ -3652,7 +3924,7 @@ msgstr ""
 "gywir!\n"
 "ffeil: %s teclyn: %s colofnau clist disgwyliedig: %d"
 
-#: vicious-extensions/glade-helper.c:274
+#: vicious-extensions/glade-helper.c:290
 #, c-format
 msgid ""
 "An error occured while loading the user interface from file %s.  Possibly "
@@ -3663,15 +3935,21 @@ msgstr ""
 "bod y disgrifiad rhyngwyneb glade methu cael ei canfod. %s yn methu parhau a "
 "gwnaiff nawr gorffen. Dyliwch gwirio eich gosodiad o %s neu ail osod %s."
 
-#: vicious-extensions/glade-helper.c:286
+#: vicious-extensions/glade-helper.c:302
 #, c-format
 msgid "No interface could be loaded, BAD! (file: %s)"
 msgstr "Ni ellir llwytho rhyngwyneb, DRWG! (ffeil: %s)"
 
-#: vicious-extensions/ve-nongnome.c:132
+#: vicious-extensions/ve-nongnome.c:135
 msgid "Too many alias levels for a locale, may indicate a loop"
 msgstr "Gormod o lefelau ffugenw ar gyfer y locale, fe ellir hysbysu dolen"
 
+#~ msgid "%s: Can't find the gdm user (%s). Trying 'nobody'!"
+#~ msgstr "%s: Ni allai darganfod a defnyddiwr gdm (%s). Yn ceisio 'nobody'!"
+
+#~ msgid "%s: Can't find the gdm group (%s). Trying 'nobody'!"
+#~ msgstr "%s: Ni allai darganfod a grŵp gdm (%s). Yn ceisio 'nobody'!"
+
 #~ msgid ""
 #~ " Doubleclick on the user\n"
 #~ " to log in\n"