Updated Canadian English translation.

2005-11-01  Adam Weinberger  <adamw@gnome.org>

	* en_CA.po: Updated Canadian English translation.

2 files changed, 511 insertions, 592 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index b3a48f39..9aef0b1c 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2005-11-01  Adam Weinberger  <adamw@gnome.org>
+
+	* en_CA.po: Updated Canadian English translation.
+
 2005-11-01  Funda Wang  <fundawang@linux.net.cn>
 
 	* zh_CN.po: Updated Simplified Chinese translation.
diff --git a/po/en_CA.po b/po/en_CA.po
index c75179fa..63e38f27 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gdm2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-12 21:25-0400\n"
+"POT-Creation-Date: 2005-11-01 12:46-0500\n"
 "PO-Revision-Date: 2005-08-08 10:41-0400\n"
 "Last-Translator: Adam Weinberger <adamw@gnome.org>\n"
 "Language-Team: Canadian English <adamw@gnome.org>\n"
@@ -552,7 +552,7 @@ msgid "%s: fork() failed!"
 msgstr "%s: fork() failed!"
 
 #. should never happen
-#: daemon/gdm.c:1045 daemon/slave.c:3646
+#: daemon/gdm.c:1045 daemon/slave.c:3656
 #, c-format
 msgid "%s: setsid() failed: %s!"
 msgstr "%s: setsid() failed: %s!"
@@ -660,11 +660,11 @@ msgstr "Do not fork into the background"
 msgid "No console (static) servers to be run"
 msgstr "No console (static) servers to be run"
 
-#: daemon/gdm.c:2059 gui/gdmsetup.c:4593
+#: daemon/gdm.c:2059 gui/gdmsetup.c:6185
 msgid "Alternative configuration file"
 msgstr "Alternate configuration file"
 
-#: daemon/gdm.c:2059 gui/gdmsetup.c:4593
+#: daemon/gdm.c:2059 gui/gdmsetup.c:6185
 msgid "CONFIGFILE"
 msgstr "CONFIGFILE"
 
@@ -685,7 +685,7 @@ msgstr "Start the first X server but then halt until we get a GO in the fifo"
 msgid "Can't open %s for writing"
 msgstr "Can't open %s for writing"
 
-#: daemon/gdm.c:2229 gui/gdmchooser.c:2084
+#: daemon/gdm.c:2229 gui/gdmchooser.c:2046
 #, c-format
 msgid ""
 "Error on option %s: %s.\n"
@@ -702,12 +702,12 @@ msgstr "Only root wants to run gdm\n"
 #: daemon/gdm.c:2360 daemon/gdm.c:2364 daemon/gdm.c:2374 daemon/gdm.c:2380
 #: daemon/gdm.c:2391 daemon/misc.c:1750 daemon/misc.c:1754 daemon/misc.c:1758
 #: daemon/misc.c:1765 daemon/misc.c:1769 daemon/misc.c:1773
-#: daemon/server.c:531 daemon/server.c:544 daemon/slave.c:825
-#: daemon/slave.c:839 daemon/slave.c:849 daemon/slave.c:859 daemon/slave.c:871
-#: gui/gdmchooser.c:1963 gui/gdmchooser.c:1966 gui/gdmchooser.c:1969
-#: gui/gdmlogin.c:3844 gui/gdmlogin.c:3854 gui/gdmlogin.c:3859
-#: gui/greeter/greeter.c:1325 gui/greeter/greeter.c:1333
-#: gui/greeter/greeter.c:1336
+#: daemon/server.c:531 daemon/server.c:544 daemon/slave.c:833
+#: daemon/slave.c:847 daemon/slave.c:857 daemon/slave.c:867 daemon/slave.c:879
+#: gui/gdmchooser.c:1956 gui/gdmchooser.c:1959 gui/gdmchooser.c:1962
+#: gui/gdmlogin.c:3782 gui/gdmlogin.c:3792 gui/gdmlogin.c:3797
+#: gui/greeter/greeter.c:1301 gui/greeter/greeter.c:1309
+#: gui/greeter/greeter.c:1312
 #, c-format
 msgid "%s: Error setting up %s signal handler: %s"
 msgstr "%s: Error setting up %s signal handler: %s"
@@ -725,8 +725,8 @@ msgstr "%s: Error setting up CHLD signal handler"
 msgid "DYNAMIC request denied: Not authenticated"
 msgstr "DYNAMIC request denied: Not authenticated"
 
-#: daemon/gdm.c:4085 daemon/gdm.c:4103 daemon/gdm.c:4433 daemon/gdm.c:4486
-#: daemon/gdm.c:4540 daemon/gdm.c:4584 daemon/gdm.c:4610
+#: daemon/gdm.c:4085 daemon/gdm.c:4103 daemon/gdm.c:4435 daemon/gdm.c:4488
+#: daemon/gdm.c:4542 daemon/gdm.c:4586 daemon/gdm.c:4612
 #, c-format
 msgid "%s request denied: Not authenticated"
 msgstr "%s request denied: Not authenticated"
@@ -866,17 +866,17 @@ msgstr "%s: Empty server command for display %s"
 msgid "%s: Server was to be spawned by uid %d but that user doesn't exist"
 msgstr "%s: Server was to be spawned by uid %d but that user doesn't exist"
 
-#: daemon/server.c:1263 daemon/slave.c:2723 daemon/slave.c:3181
+#: daemon/server.c:1263 daemon/slave.c:2732 daemon/slave.c:3190
 #, c-format
 msgid "%s: Couldn't set groupid to %d"
 msgstr "%s: Couldn't set groupid to %d"
 
-#: daemon/server.c:1269 daemon/slave.c:2728 daemon/slave.c:3186
+#: daemon/server.c:1269 daemon/slave.c:2737 daemon/slave.c:3195
 #, c-format
 msgid "%s: initgroups() failed for %s"
 msgstr "%s: initgroups() failed for %s"
 
-#: daemon/server.c:1275 daemon/slave.c:2733 daemon/slave.c:3191
+#: daemon/server.c:1275 daemon/slave.c:2742 daemon/slave.c:3200
 #, c-format
 msgid "%s: Couldn't set userid to %d"
 msgstr "%s: Couldn't set userid to %d"
@@ -904,11 +904,11 @@ msgstr "Can't set EGID to user GID"
 msgid "Can't set EUID to user UID"
 msgstr "Can't set EUID to user UID"
 
-#: daemon/slave.c:1144
+#: daemon/slave.c:1152
 msgid "Log in anyway"
 msgstr "Log in anyway"
 
-#: daemon/slave.c:1146
+#: daemon/slave.c:1154
 msgid ""
 "You are already logged in.  You can log in anyway, return to your previous "
 "login session, or abort this login"
@@ -916,19 +916,19 @@ msgstr ""
 "You are already logged in.  You can log in anyway, return to your previous "
 "login session, or abort this login"
 
-#: daemon/slave.c:1150
+#: daemon/slave.c:1158
 msgid "Return to previous login"
 msgstr "Return to previous login"
 
-#: daemon/slave.c:1151 daemon/slave.c:1157
+#: daemon/slave.c:1159 daemon/slave.c:1165
 msgid "Abort login"
 msgstr "Abort login"
 
-#: daemon/slave.c:1154
+#: daemon/slave.c:1162
 msgid "You are already logged in.  You can log in anyway or abort this login"
 msgstr "You are already logged in.  You can log in anyway or abort this login"
 
-#: daemon/slave.c:1329
+#: daemon/slave.c:1338
 msgid ""
 "Could not start the X\n"
 "server (your graphical environment)\n"
@@ -948,17 +948,17 @@ msgstr ""
 "disabled.  Please restart gdm when\n"
 "the problem is corrected."
 
-#: daemon/slave.c:1577
+#: daemon/slave.c:1586
 #, c-format
 msgid "%s: cannot fork"
 msgstr "%s: cannot fork"
 
-#: daemon/slave.c:1624
+#: daemon/slave.c:1633
 #, c-format
 msgid "%s: cannot open display %s"
 msgstr "%s: cannot open display %s"
 
-#: daemon/slave.c:1775
+#: daemon/slave.c:1784
 msgid ""
 "Could not execute the configuration application.  Make sure its path is set "
 "correctly in the configuration file.  Attempting to start it from the "
@@ -968,7 +968,7 @@ msgstr ""
 "correctly in the configuration file.  Attempting to start it from the "
 "default location."
 
-#: daemon/slave.c:1789
+#: daemon/slave.c:1798
 msgid ""
 "Could not execute the configuration application.  Make sure its path is set "
 "correctly in the configuration file."
@@ -976,11 +976,11 @@ msgstr ""
 "Could not execute the configuration application.  Make sure its path is set "
 "correctly in the configuration file."
 
-#: daemon/slave.c:1951
+#: daemon/slave.c:1960
 msgid "You must authenticate as root to run configuration."
 msgstr "You must authenticate as root to run configuration."
 
-#: daemon/slave.c:2081 daemon/slave.c:2104
+#: daemon/slave.c:2090 daemon/slave.c:2113
 msgid ""
 "Login sound requested on non-local display or the play software cannot be "
 "run or the sound does not exist."
@@ -988,12 +988,12 @@ msgstr ""
 "Login sound requested on non-local display, the play software cannot be run, "
 "or the sound does not exist."
 
-#: daemon/slave.c:2677 daemon/slave.c:2682
+#: daemon/slave.c:2686 daemon/slave.c:2691
 #, c-format
 msgid "%s: Can't init pipe to gdmgreeter"
 msgstr "%s: Can't init pipe to gdmgreeter"
 
-#: daemon/slave.c:2807
+#: daemon/slave.c:2816
 msgid ""
 "No servers were defined in the configuration file and XDMCP was disabled.  "
 "This can only be a configuration error.  GDM has started a single server for "
@@ -1005,7 +1005,7 @@ msgstr ""
 "you.  You should log in and fix the configuration.  Note that automatic and "
 "timed logins are disabled now."
 
-#: daemon/slave.c:2821
+#: daemon/slave.c:2830
 msgid ""
 "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 "
@@ -1015,7 +1015,7 @@ msgstr ""
 "this is a failsafe X server.  You should log in and properly configure the X "
 "server."
 
-#: daemon/slave.c:2830
+#: daemon/slave.c:2839
 #, c-format
 msgid ""
 "The specified display number was busy, so this server was started on display "
@@ -1024,7 +1024,7 @@ msgstr ""
 "The specified display number was busy, so this server was started on display "
 "%s."
 
-#: daemon/slave.c:2850
+#: daemon/slave.c:2859
 msgid ""
 "The greeter application appears to be crashing.\n"
 "Attempting to use a different one."
@@ -1033,17 +1033,17 @@ msgstr ""
 "Attempting to use a different one."
 
 #. Something went wrong
-#: daemon/slave.c:2871
+#: daemon/slave.c:2880
 #, c-format
 msgid "%s: Cannot start greeter with gtk modules: %s. Trying without modules"
 msgstr "%s: Cannot start greeter with gtk modules: %s. Trying without modules"
 
-#: daemon/slave.c:2878
+#: daemon/slave.c:2887
 #, c-format
 msgid "%s: Cannot start greeter trying default: %s"
 msgstr "%s: Cannot start greeter trying default: %s"
 
-#: daemon/slave.c:2890
+#: daemon/slave.c:2899
 msgid ""
 "Cannot start the greeter application; you will not be able to log in.  This "
 "display will be disabled.  Try logging in by other means and editing the "
@@ -1054,27 +1054,27 @@ msgstr ""
 "configuration file"
 
 #. If no greeter we really have to disable the display
-#: daemon/slave.c:2897
+#: daemon/slave.c:2906
 #, c-format
 msgid "%s: Error starting greeter on display %s"
 msgstr "%s: Error starting greeter on display %s"
 
-#: daemon/slave.c:2901
+#: daemon/slave.c:2910
 #, c-format
 msgid "%s: Can't fork gdmgreeter process"
 msgstr "%s: Can't fork gdmgreeter process"
 
-#: daemon/slave.c:2972
+#: daemon/slave.c:2981
 #, c-format
 msgid "%s: Can't open fifo!"
 msgstr "%s: Can't open fifo!"
 
-#: daemon/slave.c:3141
+#: daemon/slave.c:3150
 #, c-format
 msgid "%s: Can't init pipe to gdmchooser"
 msgstr "%s: Can't init pipe to gdmchooser"
 
-#: daemon/slave.c:3238
+#: daemon/slave.c:3247
 msgid ""
 "Cannot start the chooser application. You will probably not be able to log "
 "in.  Please contact the system administrator."
@@ -1082,56 +1082,56 @@ msgstr ""
 "Cannot start the chooser application. You will probably not be able to log "
 "in.  Please contact the system administrator."
 
-#: daemon/slave.c:3242
+#: daemon/slave.c:3251
 #, c-format
 msgid "%s: Error starting chooser on display %s"
 msgstr "%s: Error starting chooser on display %s"
 
-#: daemon/slave.c:3245
+#: daemon/slave.c:3254
 #, c-format
 msgid "%s: Can't fork gdmchooser process"
 msgstr "%s: Can't fork gdmchooser process"
 
-#: daemon/slave.c:3547
+#: daemon/slave.c:3556
 #, c-format
 msgid "%s: Could not open ~/.xsession-errors"
 msgstr "%s: Could not open ~/.xsession-errors"
 
-#: daemon/slave.c:3682
+#: daemon/slave.c:3709
 #, c-format
 msgid "%s: Execution of PreSession script returned > 0. Aborting."
 msgstr "%s: Execution of PreSession script returned > 0. Aborting."
 
-#: daemon/slave.c:3726
+#: daemon/slave.c:3753
 #, c-format
 msgid "Language %s does not exist; using %s"
 msgstr "Language %s does not exist; using %s"
 
-#: daemon/slave.c:3727
+#: daemon/slave.c:3754
 msgid "System default"
 msgstr "System default"
 
-#: daemon/slave.c:3744
+#: daemon/slave.c:3771
 #, c-format
 msgid "%s: Could not setup environment for %s. Aborting."
 msgstr "%s: Could not setup environment for %s. Aborting."
 
-#: daemon/slave.c:3791
+#: daemon/slave.c:3818
 #, c-format
 msgid "%s: setusercontext() failed for %s. Aborting."
 msgstr "%s: setusercontext() failed for %s. Aborting."
 
-#: daemon/slave.c:3797
+#: daemon/slave.c:3824
 #, c-format
 msgid "%s: Could not become %s. Aborting."
 msgstr "%s: Could not become %s. Aborting."
 
-#: daemon/slave.c:3860
+#: daemon/slave.c:3887
 #, c-format
 msgid "%s: No Exec line in the session file: %s. Starting failsafe GNOME"
 msgstr "%s: No Exec line in the session file: %s. Starting failsafe GNOME"
 
-#: daemon/slave.c:3866
+#: daemon/slave.c:3893
 msgid ""
 "The session you selected does not look valid.  Running the GNOME failsafe "
 "session instead."
@@ -1139,7 +1139,7 @@ msgstr ""
 "The session you selected does not look valid.  Running the GNOME failsafe "
 "session instead."
 
-#: daemon/slave.c:3880
+#: daemon/slave.c:3907
 #, c-format
 msgid ""
 "%s: Cannot find or run the base Xsession script.  Running the GNOME failsafe "
@@ -1148,7 +1148,7 @@ msgstr ""
 "%s: Cannot find or run the base Xsession script.  Running the GNOME failsafe "
 "session instead."
 
-#: daemon/slave.c:3886
+#: daemon/slave.c:3913
 msgid ""
 "Cannot find or run the base session script.  Running the GNOME failsafe "
 "session instead."
@@ -1157,12 +1157,12 @@ msgstr ""
 "session instead."
 
 #. yaikes
-#: daemon/slave.c:3901
+#: daemon/slave.c:3928
 #, c-format
 msgid "%s: gnome-session not found for a failsafe GNOME session; trying xterm"
 msgstr "%s: gnome-session not found for a failsafe GNOME session; trying xterm"
 
-#: daemon/slave.c:3906
+#: daemon/slave.c:3933
 msgid ""
 "Could not find the GNOME installation.  Running the \"Failsafe xterm\" "
 "session instead."
@@ -1170,7 +1170,7 @@ msgstr ""
 "Could not find the GNOME installation.  Running the \"Failsafe xterm\" "
 "session instead."
 
-#: daemon/slave.c:3914
+#: daemon/slave.c:3941
 msgid ""
 "This is the Failsafe GNOME session.  You will be logged into the 'Default' "
 "session of GNOME without the startup scripts being run.  This should be used "
@@ -1180,11 +1180,11 @@ msgstr ""
 "session of GNOME without the startup scripts being run.  This should be used "
 "to fix problems in your installation."
 
-#: daemon/slave.c:3929
+#: daemon/slave.c:3956
 msgid "Cannot find \"xterm\" to start a failsafe session."
 msgstr "Cannot find \"xterm\" to start a failsafe session."
 
-#: daemon/slave.c:3942
+#: daemon/slave.c:3969
 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.  "
@@ -1194,41 +1194,41 @@ msgstr ""
 "console so that you may fix your system if you cannot log in any other way.  "
 "To exit the terminal emulator, type 'exit' and an enter into the window."
 
-#: daemon/slave.c:3969
+#: daemon/slave.c:3996
 #, c-format
 msgid "%s: User not allowed to log in"
 msgstr "%s: User not allowed to log in"
 
-#: daemon/slave.c:3972
+#: daemon/slave.c:3999
 msgid "The system administrator has disabled your account."
 msgstr "The system administrator has disabled your account."
 
-#: daemon/slave.c:4003
+#: daemon/slave.c:4030
 msgid "Error! Unable to set executable context."
 msgstr "Error! Unable to set executable context."
 
 #. will go to .xsession-errors
-#: daemon/slave.c:4011 daemon/slave.c:4016
+#: daemon/slave.c:4038 daemon/slave.c:4043
 #, c-format
 msgid "%s: Could not exec %s %s %s"
 msgstr "%s: Could not exec %s %s %s"
 
 #. we can't really be any more specific
-#: daemon/slave.c:4027
+#: daemon/slave.c:4054
 msgid "Cannot start the session due to some internal error."
 msgstr "Cannot start the session due to some internal error."
 
-#: daemon/slave.c:4081
+#: daemon/slave.c:4108
 #, c-format
 msgid "%s: User passed auth but getpwnam(%s) failed!"
 msgstr "%s: User passed auth but getpwnam(%s) failed!"
 
-#: daemon/slave.c:4094
+#: daemon/slave.c:4121
 #, c-format
 msgid "%s: Execution of PostLogin script returned > 0. Aborting."
 msgstr "%s: Execution of PostLogin script returned > 0. Aborting."
 
-#: daemon/slave.c:4116
+#: daemon/slave.c:4143
 #, c-format
 msgid ""
 "Your home directory is listed as:\n"
@@ -1245,12 +1245,12 @@ msgstr ""
 "\n"
 "It is unlikely anything will work unless you use a failsafe session."
 
-#: daemon/slave.c:4128
+#: daemon/slave.c:4155
 #, c-format
 msgid "%s: Home directory for %s: '%s' does not exist!"
 msgstr "%s: Home directory for %s: '%s' does not exist!"
 
-#: daemon/slave.c:4207
+#: daemon/slave.c:4234
 msgid ""
 "User's $HOME/.dmrc file is being ignored.  This prevents the default session "
 "and language from being saved.  File should be owned by user and have 644 "
@@ -1262,7 +1262,7 @@ msgstr ""
 "permissions.  User's $HOME directory must be owned by user and not writable "
 "by other users."
 
-#: daemon/slave.c:4336
+#: daemon/slave.c:4363
 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 "
@@ -1274,12 +1274,12 @@ msgstr ""
 "writing.  In any case, it is not possible to log in.  Please contact your "
 "system administrator"
 
-#: daemon/slave.c:4412
+#: daemon/slave.c:4439
 #, c-format
 msgid "%s: Error forking user session"
 msgstr "%s: Error forking user session"
 
-#: daemon/slave.c:4493
+#: daemon/slave.c:4520
 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 "
@@ -1291,25 +1291,25 @@ msgstr ""
 "you may be out of diskspace.  Try logging in with one of the failsafe "
 "sessions to see if you can fix this problem."
 
-#: daemon/slave.c:4501
+#: daemon/slave.c:4528
 msgid "View details (~/.xsession-errors file)"
 msgstr "View details (~/.xsession-errors file)"
 
-#: daemon/slave.c:4665
+#: daemon/slave.c:4692
 msgid "GDM detected a shutdown or reboot in progress."
 msgstr "GDM detected a shutdown or reboot in progress."
 
-#: daemon/slave.c:4759
+#: daemon/slave.c:4786
 #, c-format
 msgid "Ping to %s failed; whacking display!"
 msgstr "Ping to %s failed; whacking display!"
 
-#: daemon/slave.c:5038
+#: daemon/slave.c:5065
 #, c-format
 msgid "%s: Fatal X error - Restarting %s"
 msgstr "%s: Fatal X error - Restarting %s"
 
-#: daemon/slave.c:5107
+#: daemon/slave.c:5134
 msgid ""
 "Login sound requested on non-local display or the play software cannot be "
 "run or the sound does not exist"
@@ -1317,22 +1317,22 @@ msgstr ""
 "Login sound requested on non-local display or the play software cannot be "
 "run or the sound does not exist"
 
-#: daemon/slave.c:5463
+#: daemon/slave.c:5490
 #, c-format
 msgid "%s: Failed starting: %s"
 msgstr "%s: Failed starting: %s"
 
-#: daemon/slave.c:5470 daemon/slave.c:5609
+#: daemon/slave.c:5497 daemon/slave.c:5636
 #, c-format
 msgid "%s: Can't fork script process!"
 msgstr "%s: Can't fork script process!"
 
-#: daemon/slave.c:5564
+#: daemon/slave.c:5591
 #, c-format
 msgid "%s: Failed creating pipe"
 msgstr "%s: Failed creating pipe"
 
-#: daemon/slave.c:5603
+#: daemon/slave.c:5630
 #, c-format
 msgid "%s: Failed executing: %s"
 msgstr "%s: Failed executing: %s"
@@ -1350,21 +1350,21 @@ msgid "Please make sure the Caps Lock key is not enabled."
 msgstr "Please make sure the Caps Lock key is not enabled."
 
 #: daemon/verify-crypt.c:126 daemon/verify-pam.c:538
-#: daemon/verify-shadow.c:125 gui/gdmlogin.c:3170
+#: daemon/verify-shadow.c:125 gui/gdmlogin.c:3115
 msgid "Please enter your username"
 msgstr "Please enter your username"
 
 #. login: is whacked always translate to Username:
 #: daemon/verify-crypt.c:127 daemon/verify-pam.c:438 daemon/verify-pam.c:439
 #: daemon/verify-pam.c:440 daemon/verify-pam.c:525 daemon/verify-pam.c:867
-#: daemon/verify-shadow.c:126 gui/gdmlogin.c:1329 gui/gdmlogin.c:1343
-#: gui/gdmlogin.c:1974 gui/gdmlogin.c:2481 gui/greeter/greeter.c:397
+#: daemon/verify-shadow.c:126 gui/gdmlogin.c:1338 gui/gdmlogin.c:1352
+#: gui/gdmlogin.c:1965 gui/gdmlogin.c:2445 gui/greeter/greeter.c:397
 #: gui/greeter/greeter_parser.c:1125
 msgid "Username:"
 msgstr "Username:"
 
 #: daemon/verify-crypt.c:165 daemon/verify-pam.c:441 daemon/verify-pam.c:442
-#: daemon/verify-pam.c:586 daemon/verify-shadow.c:183 gui/gdmlogin.c:2009
+#: daemon/verify-pam.c:586 daemon/verify-shadow.c:183 gui/gdmlogin.c:2000
 msgid "Password:"
 msgstr "Password:"
 
@@ -1833,9 +1833,9 @@ msgstr "Run broadcast instead of indirect (chooser)"
 msgid "Don't check for running gdm"
 msgstr "Don't check for running gdm"
 
-#: gui/gdmXnestchooser.c:509 gui/gdmchooser.c:2099 gui/gdmdynamic.c:157
-#: gui/gdmflexiserver.c:745 gui/gdmlogin.c:3658 gui/gdmphotosetup.c:483
-#: gui/gdmsetup.c:4629 gui/greeter/greeter.c:1287
+#: gui/gdmXnestchooser.c:509 gui/gdmchooser.c:2057 gui/gdmdynamic.c:157
+#: gui/gdmflexiserver.c:745 gui/gdmlogin.c:3592 gui/gdmphotosetup.c:483
+#: gui/gdmsetup.c:6264 gui/greeter/greeter.c:1253
 msgid "Could not access GDM configuration file.\n"
 msgstr "Could not access GDM configuration file.\n"
 
@@ -1883,7 +1883,7 @@ msgstr "No serving hosts were found."
 msgid "Choose a ho_st to connect to:"
 msgstr "Choose a ho_st to connect to:"
 
-#: gui/gdmchooser.c:656
+#: gui/gdmchooser.c:647
 #, c-format
 msgid ""
 "The host \"%s\" is not willing to support a login session right now.  Please "
@@ -1892,11 +1892,11 @@ msgstr ""
 "The host \"%s\" is not willing to support a login session right now.  Please "
 "try again later."
 
-#: gui/gdmchooser.c:666
+#: gui/gdmchooser.c:657
 msgid "Cannot connect to remote server"
 msgstr "Cannot connect to remote server"
 
-#: gui/gdmchooser.c:1285
+#: gui/gdmchooser.c:1276
 #, c-format
 msgid ""
 "Did not receive any response from host \"%s\" in %d seconds.  Perhaps the "
@@ -1907,20 +1907,20 @@ msgstr ""
 "host is not turned on, or is not willing to support a login session right "
 "now.  Please try again later."
 
-#: gui/gdmchooser.c:1298
+#: gui/gdmchooser.c:1289
 msgid "Did not receive response from server"
 msgstr "Did not receive response from server"
 
-#: gui/gdmchooser.c:1400
+#: gui/gdmchooser.c:1391
 #, c-format
 msgid "Cannot find the host \"%s\". Perhaps you have mistyped it."
 msgstr "Cannot find the host \"%s\". Perhaps you have mistyped it."
 
-#: gui/gdmchooser.c:1409
+#: gui/gdmchooser.c:1400
 msgid "Cannot find host"
 msgstr "Cannot find host"
 
-#: gui/gdmchooser.c:1705
+#: gui/gdmchooser.c:1696
 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 "
@@ -1936,41 +1936,41 @@ msgstr ""
 "You can rescan the network for new hosts by clicking \"Refresh\".  When you "
 "have selected a host click \"Connect\" to open a session to that computer."
 
-#: gui/gdmchooser.c:1752
+#: gui/gdmchooser.c:1743
 #, c-format
 msgid "Can't open default host icon: %s"
 msgstr "Can't open default host icon: %s"
 
-#: gui/gdmchooser.c:1977 gui/gdmlogin.c:3869 gui/greeter/greeter.c:1344
-#: gui/greeter/greeter.c:1351
+#: gui/gdmchooser.c:1970 gui/gdmlogin.c:3807 gui/greeter/greeter.c:1320
+#: gui/greeter/greeter.c:1327
 msgid "Could not set signal mask!"
 msgstr "Could not set signal mask!"
 
-#: gui/gdmchooser.c:1983
+#: gui/gdmchooser.c:1976
 msgid "Socket for xdm communication"
 msgstr "Socket for xdm communication"
 
-#: gui/gdmchooser.c:1983
+#: gui/gdmchooser.c:1976
 msgid "SOCKET"
 msgstr "SOCKET"
 
-#: gui/gdmchooser.c:1986
+#: gui/gdmchooser.c:1979
 msgid "Client address to return in response to xdm"
 msgstr "Client address to return in response to xdm"
 
-#: gui/gdmchooser.c:1986
+#: gui/gdmchooser.c:1979
 msgid "ADDRESS"
 msgstr "ADDRESS"
 
-#: gui/gdmchooser.c:1989
+#: gui/gdmchooser.c:1982
 msgid "Connection type to return in response to xdm"
 msgstr "Connection type to return in response to xdm"
 
-#: gui/gdmchooser.c:1989
+#: gui/gdmchooser.c:1982
 msgid "TYPE"
 msgstr "TYPE"
 
-#: gui/gdmchooser.c:2120
+#: gui/gdmchooser.c:2088
 #, c-format
 msgid ""
 "The chooser version (%s) does not match the daemon version (%s).  You have "
@@ -1979,7 +1979,7 @@ msgstr ""
 "The chooser version (%s) does not match the daemon version (%s).  You have "
 "probably just upgraded GDM.  Please restart the GDM daemon or the computer."
 
-#: gui/gdmchooser.c:2130
+#: gui/gdmchooser.c:2098
 msgid "Cannot run chooser"
 msgstr "Cannot run chooser"
 
@@ -2024,7 +2024,7 @@ msgstr "Query and add this host to the above list"
 msgid "Status"
 msgstr "Status"
 
-#: gui/gdmchooser.glade.h:11 gui/gdmsetup.glade.h:105
+#: gui/gdmchooser.glade.h:11
 msgid "_Add"
 msgstr "_Add"
 
@@ -2159,7 +2159,7 @@ msgstr "Display %s on virtual terminal %d"
 msgid "Nested display %s on virtual terminal %d"
 msgstr "Nested display %s on virtual terminal %d"
 
-#: gui/gdmflexiserver.c:251 gui/gdmlogin.c:3017
+#: gui/gdmflexiserver.c:251 gui/gdmlogin.c:2962
 #: gui/greeter/greeter_item_ulist.c:246
 msgid "Username"
 msgstr "Username"
@@ -2755,7 +2755,7 @@ msgstr "%sWelcome to %s%s"
 msgid "Are you sure you want to restart the computer?"
 msgstr "Are you sure you want to restart the computer?"
 
-#: gui/gdmlogin.c:819 gui/gdmlogin.c:2880
+#: gui/gdmlogin.c:819 gui/gdmlogin.c:2835
 msgid "_Restart"
 msgstr "_Restart"
 
@@ -2763,7 +2763,7 @@ msgstr "_Restart"
 msgid "Are you sure you want to shut down the computer?"
 msgstr "Are you sure you want to shut down the computer?"
 
-#: gui/gdmlogin.c:832 gui/gdmlogin.c:2893 gui/greeter/greeter_parser.c:1077
+#: gui/gdmlogin.c:832 gui/gdmlogin.c:2845 gui/greeter/greeter_parser.c:1077
 #: gui/greeter/greeter_system.c:76 gui/greeter/greeter_system.c:195
 msgid "Shut _Down"
 msgstr "Shut _Down"
@@ -2772,16 +2772,16 @@ msgstr "Shut _Down"
 msgid "Are you sure you want to suspend the computer?"
 msgstr "Are you sure you want to suspend the computer?"
 
-#: gui/gdmlogin.c:853 gui/gdmlogin.c:2907 gui/greeter/greeter_system.c:87
+#: gui/gdmlogin.c:853 gui/gdmlogin.c:2855 gui/greeter/greeter_system.c:87
 msgid "_Suspend"
 msgstr "_Suspend"
 
-#: gui/gdmlogin.c:883 gui/greeter/greeter.c:182
+#: gui/gdmlogin.c:882 gui/greeter/greeter.c:182
 #, c-format
 msgid "%s: No configuration file: %s. Using defaults."
 msgstr "%s: No configuration file: %s. Using defaults."
 
-#: gui/gdmlogin.c:999 gui/greeter/greeter.c:301
+#: gui/gdmlogin.c:1005 gui/greeter/greeter.c:301
 msgid "TimedLoginDelay was less than 5.  I'll just use 5."
 msgstr "TimedLoginDelay was less than 5.  I'll just use 5."
 
@@ -2789,45 +2789,45 @@ msgstr "TimedLoginDelay was less than 5.  I'll just use 5."
 #. no_group
 #. untranslated
 #. markup
-#: gui/gdmlogin.c:1101 gui/gdmlogin.c:1130 gui/gdmlogin.c:1212
+#: gui/gdmlogin.c:1110 gui/gdmlogin.c:1139 gui/gdmlogin.c:1221
 #: gui/greeter/greeter_action_language.c:156 gui/greeter/greeter_session.c:121
 #: gui/greeter/greeter_session.c:151
 #, c-format
 msgid "Do you wish to make %s the default for future sessions?"
 msgstr "Do you wish to make %s the default for future sessions?"
 
-#: gui/gdmlogin.c:1104 gui/greeter/greeter_session.c:124
+#: gui/gdmlogin.c:1113 gui/greeter/greeter_session.c:124
 #, c-format
 msgid "Your preferred session type %s is not installed on this computer."
 msgstr "Your preferred session type %s is not installed on this computer."
 
-#: gui/gdmlogin.c:1109 gui/gdmlogin.c:1140 gui/gdmlogin.c:1219
+#: gui/gdmlogin.c:1118 gui/gdmlogin.c:1149 gui/gdmlogin.c:1228
 #: gui/greeter/greeter_action_language.c:163 gui/greeter/greeter_session.c:127
 #: gui/greeter/greeter_session.c:159
 msgid "Make _Default"
 msgstr "Make _Default"
 
-#: gui/gdmlogin.c:1109 gui/greeter/greeter_session.c:127
+#: gui/gdmlogin.c:1118 gui/greeter/greeter_session.c:127
 msgid "Just _Log In"
 msgstr "Just _Log In"
 
-#: gui/gdmlogin.c:1134 gui/gdmlogin.c:1214
+#: gui/gdmlogin.c:1143 gui/gdmlogin.c:1223
 #: gui/greeter/greeter_action_language.c:158 gui/greeter/greeter_session.c:154
 #, c-format
 msgid "You have chosen %s for this session, but your default setting is %s."
 msgstr "You have chosen %s for this session, but your default setting is %s."
 
-#: gui/gdmlogin.c:1140 gui/gdmlogin.c:1219
+#: gui/gdmlogin.c:1149 gui/gdmlogin.c:1228
 #: gui/greeter/greeter_action_language.c:163 gui/greeter/greeter_session.c:159
 msgid "Just For _This Session"
 msgstr "Just For _This Session"
 
-#: gui/gdmlogin.c:1150
+#: gui/gdmlogin.c:1159
 #, c-format
 msgid "You have chosen %s for this session."
 msgstr "You have chosen %s for this session."
 
-#: gui/gdmlogin.c:1153
+#: gui/gdmlogin.c:1162
 #, c-format
 msgid ""
 "If you wish to make %s the default for future sessions, run the 'switchdesk' "
@@ -2836,31 +2836,27 @@ msgstr ""
 "If you wish to make %s the default for future sessions, run the 'switchdesk' "
 "utility (System Tools->Desktop Switching Tool from the main menu)."
 
-#: gui/gdmlogin.c:1194 gui/gdmlogin.c:1203
+#: gui/gdmlogin.c:1203 gui/gdmlogin.c:1212
 #: gui/greeter/greeter_action_language.c:71
 #: gui/greeter/greeter_action_language.c:140
 #: gui/greeter/greeter_action_language.c:148
 msgid "System Default"
 msgstr "System Default"
 
-#: gui/gdmlogin.c:1330 gui/gdmlogin.c:1344 gui/gdmlogin.c:1978
-#: gui/gdmlogin.c:2482 gui/gdmlogin.c:3123
+#: gui/gdmlogin.c:1339 gui/gdmlogin.c:1353 gui/gdmlogin.c:1969
+#: gui/gdmlogin.c:2446 gui/gdmlogin.c:3068
 msgid "_Username:"
 msgstr "_Username:"
 
-#: gui/gdmlogin.c:1418
+#: gui/gdmlogin.c:1427
 #, c-format
 msgid "%s session selected"
 msgstr "%s session selected"
 
-#: gui/gdmlogin.c:1439 gui/gdmlogin.c:1566
+#: gui/gdmlogin.c:1448 gui/gdmlogin.c:1566
 msgid "_Last"
 msgstr "_Last"
 
-#: gui/gdmlogin.c:1450 gui/greeter/greeter_session.c:276
-msgid "Log in using the session that you have used last time you logged in"
-msgstr "Log in using the session that you have used last time you logged in"
-
 #. never_encoding
 #. no_group
 #. untranslated
@@ -2871,36 +2867,28 @@ msgid "%s language selected"
 msgstr "%s language selected"
 
 #: gui/gdmlogin.c:1577
-msgid "Log in using the language that you have used last time you logged in"
-msgstr "Log in using the language that you have used last time you logged in"
-
-#: gui/gdmlogin.c:1581
 msgid "_System Default"
 msgstr "_System Default"
 
-#: gui/gdmlogin.c:1592
-msgid "Log in using the default system language"
-msgstr "Log in using the default system language"
-
-#: gui/gdmlogin.c:1616
+#: gui/gdmlogin.c:1609
 msgid "_Other"
 msgstr "_Other"
 
-#: gui/gdmlogin.c:2010
+#: gui/gdmlogin.c:2001
 msgid "_Password:"
 msgstr "_Password:"
 
 #. translators:  This is a nice and evil eggie text, translate
 #. * to your favourite currency
-#: gui/gdmlogin.c:2241 gui/greeter/greeter.c:560
+#: gui/gdmlogin.c:2232 gui/greeter/greeter.c:560
 msgid "Please insert 25 cents to log in."
 msgstr "Please insert 25 cents to log in."
 
-#: gui/gdmlogin.c:2603
+#: gui/gdmlogin.c:2567
 msgid "GNOME Desktop Manager"
 msgstr "GNOME Desktop Manager"
 
-#: gui/gdmlogin.c:2629 gui/greeter/greeter_item.c:157
+#: gui/gdmlogin.c:2593 gui/greeter/greeter_item.c:157
 msgid "%a %b %d, %H:%M"
 msgstr "%a %d %b, %H:%M"
 
@@ -2908,86 +2896,57 @@ msgstr "%a %d %b, %H:%M"
 #. %H:%M if your language does not have AM and PM
 #. equivalent.  Note: %l is a strftime option for
 #. 12-hour clock format
-#: gui/gdmlogin.c:2635 gui/greeter/greeter_item.c:161
+#: gui/gdmlogin.c:2599 gui/greeter/greeter_item.c:161
 msgid "%a %b %d, %l:%M %p"
 msgstr "%a %d %b, %l:%M %p"
 
-#: gui/gdmlogin.c:2684
+#: gui/gdmlogin.c:2648
 msgid "Finger"
 msgstr "Finger"
 
-#: gui/gdmlogin.c:2788
+#: gui/gdmlogin.c:2752
 msgid "GDM Login"
 msgstr "GDM Login"
 
-#: gui/gdmlogin.c:2831 gui/greeter/greeter_parser.c:1057
+#: gui/gdmlogin.c:2795 gui/greeter/greeter_parser.c:1057
 msgid "_Session"
 msgstr "_Session"
 
-#: gui/gdmlogin.c:2838 gui/greeter/greeter_parser.c:1052
+#: gui/gdmlogin.c:2802 gui/greeter/greeter_parser.c:1052
 msgid "_Language"
 msgstr "_Language"
 
-#: gui/gdmlogin.c:2850 gui/greeter/greeter_system.c:149
+#: gui/gdmlogin.c:2814 gui/greeter/greeter_system.c:149
 msgid "_XDMCP Chooser..."
 msgstr "_XDMCP Chooser..."
 
-#: gui/gdmlogin.c:2857 gui/greeter/greeter_system.c:156
-#: gui/greeter/greeter_system.c:352
-msgid ""
-"Run an XDMCP chooser which will allow you to log into available remote "
-"computers, if there are any."
-msgstr ""
-"Run an XDMCP chooser which will allow you to log into available remote "
-"computers, if there are any."
-
-#: gui/gdmlogin.c:2866 gui/greeter/greeter_system.c:164
+#: gui/gdmlogin.c:2825 gui/greeter/greeter_system.c:164
 msgid "_Configure Login Manager..."
 msgstr "_Configure Login Manager..."
 
-#: gui/gdmlogin.c:2873 gui/greeter/greeter_system.c:171
-#: gui/greeter/greeter_system.c:372
-msgid ""
-"Configure GDM (this login manager). This will require the root password."
-msgstr ""
-"Configure GDM (this login manager). This will require the root password."
-
-#: gui/gdmlogin.c:2887
-msgid "Restart your computer"
-msgstr "Restart your computer"
-
-#: gui/gdmlogin.c:2900 gui/greeter/greeter_system.c:202
-msgid "Shut down the system so that you may safely turn off the computer."
-msgstr "Shut down the system so that you may safely turn off the computer."
-
-#: gui/gdmlogin.c:2914 gui/greeter/greeter_system.c:215
-#: gui/greeter/greeter_system.c:335
-msgid "Suspend your computer"
-msgstr "Suspend your computer"
-
-#: gui/gdmlogin.c:2920 gui/greeter/greeter_parser.c:1062
+#: gui/gdmlogin.c:2865 gui/greeter/greeter_parser.c:1062
 msgid "_Actions"
 msgstr "_Actions"
 
-#: gui/gdmlogin.c:2929
+#: gui/gdmlogin.c:2874
 msgid "_Theme"
 msgstr "_Theme"
 
-#: gui/gdmlogin.c:2940 gui/greeter/greeter_canvas_item.c:165
+#: gui/gdmlogin.c:2885 gui/greeter/greeter_canvas_item.c:165
 #: gui/greeter/greeter_parser.c:1072
 msgid "_Quit"
 msgstr "_Quit"
 
-#: gui/gdmlogin.c:2942 gui/greeter/greeter_canvas_item.c:167
+#: gui/gdmlogin.c:2887 gui/greeter/greeter_canvas_item.c:167
 #: gui/greeter/greeter_parser.c:1067
 msgid "D_isconnect"
 msgstr "D_isconnect"
 
-#: gui/gdmlogin.c:3010 gui/greeter/greeter_item_ulist.c:240
+#: gui/gdmlogin.c:2955 gui/greeter/greeter_item_ulist.c:240
 msgid "Icon"
 msgstr "Icon"
 
-#: gui/gdmlogin.c:3687 gui/gdmlogin.c:3721 gui/greeter/greeter.c:797
+#: gui/gdmlogin.c:3625 gui/gdmlogin.c:3659 gui/greeter/greeter.c:797
 #, c-format
 msgid ""
 "The greeter version (%s) does not match the daemon version.  You have "
@@ -2996,17 +2955,17 @@ msgstr ""
 "The greeter version (%s) does not match the daemon version.  You have "
 "probably just upgraded GDM.  Please restart the GDM daemon or the computer."
 
-#: gui/gdmlogin.c:3697 gui/gdmlogin.c:3731 gui/gdmlogin.c:3779
+#: gui/gdmlogin.c:3635 gui/gdmlogin.c:3669 gui/gdmlogin.c:3717
 #: gui/greeter/greeter.c:807 gui/greeter/greeter.c:842
 #: gui/greeter/greeter.c:891
 msgid "Cannot start the greeter"
 msgstr "Cannot start the greeter"
 
-#: gui/gdmlogin.c:3736 gui/greeter/greeter.c:896
+#: gui/gdmlogin.c:3674 gui/greeter/greeter.c:896
 msgid "Restart"
 msgstr "Restart"
 
-#: gui/gdmlogin.c:3769 gui/greeter/greeter.c:881
+#: gui/gdmlogin.c:3707 gui/greeter/greeter.c:881
 #, c-format
 msgid ""
 "The greeter version (%s) does not match the daemon version (%s).  You have "
@@ -3015,24 +2974,24 @@ msgstr ""
 "The greeter version (%s) does not match the daemon version (%s).  You have "
 "probably just upgraded GDM.  Please restart the GDM daemon or the computer."
 
-#: gui/gdmlogin.c:3784
+#: gui/gdmlogin.c:3722
 msgid "Restart gdm"
 msgstr "Restart GDM"
 
-#: gui/gdmlogin.c:3786
+#: gui/gdmlogin.c:3724
 msgid "Restart computer"
 msgstr "Restart computer"
 
-#: gui/gdmlogin.c:3821
+#: gui/gdmlogin.c:3759
 #, c-format
 msgid "Can't open DefaultImage: %s. Suspending face browser!"
 msgstr "Can't open DefaultImage: %s. Suspending face browser!"
 
-#: gui/gdmlogin.c:3985 gui/greeter/greeter.c:1571
+#: gui/gdmlogin.c:3921 gui/greeter/greeter.c:1545
 msgid "Session directory is missing"
 msgstr "Session directory is missing"
 
-#: gui/gdmlogin.c:3986 gui/greeter/greeter.c:1572
+#: gui/gdmlogin.c:3922 gui/greeter/greeter.c:1546
 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 "
@@ -3042,11 +3001,11 @@ msgstr ""
 "sessions you can use, but you should log in and correct the gdm "
 "configuration."
 
-#: gui/gdmlogin.c:4009 gui/greeter/greeter.c:1596
+#: gui/gdmlogin.c:3945 gui/greeter/greeter.c:1570
 msgid "Configuration is not correct"
 msgstr "Configuration is not correct"
 
-#: gui/gdmlogin.c:4010 gui/greeter/greeter.c:1597
+#: gui/gdmlogin.c:3946 gui/greeter/greeter.c:1571
 msgid ""
 "The configuration file contains an invalid command line for the login "
 "dialog, so running the default command.  Please fix your configuration."
@@ -3054,11 +3013,11 @@ msgstr ""
 "The configuration file contains an invalid command line for the login "
 "dialogue, so the default command will be run.  Please fix your configuration."
 
-#: gui/gdmlogin.c:4034 gui/greeter/greeter.c:1623
+#: gui/gdmlogin.c:3970 gui/greeter/greeter.c:1597
 msgid "No configuration was found"
 msgstr "No configuration was found"
 
-#: gui/gdmlogin.c:4035 gui/greeter/greeter.c:1624
+#: gui/gdmlogin.c:3971 gui/greeter/greeter.c:1598
 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 "
@@ -3162,7 +3121,7 @@ msgstr "Yikes, nothing found in the session directory."
 msgid "No default session link found. Using Failsafe GNOME.\n"
 msgstr "No default session link found. Using Failsafe GNOME.\n"
 
-#: gui/gdmsetup.c:208
+#: gui/gdmsetup.c:246
 msgid ""
 "An error occurred while trying to contact the login screens.  Not all "
 "updates may have taken effect."
@@ -3170,92 +3129,124 @@ msgstr ""
 "An error occurred while trying to contact the login screens.  Not all "
 "updates may have taken effect."
 
-#: gui/gdmsetup.c:869
+#: gui/gdmsetup.c:714 gui/gdmsetup.c:732 gui/gdmsetup.c:854
+#: gui/gdmsetup.c:1103
+msgid "Themed"
+msgstr "Themed"
+
+#: gui/gdmsetup.c:717 gui/gdmsetup.c:748
+msgid "Plain"
+msgstr "Plain"
+
+#: gui/gdmsetup.c:718 gui/gdmsetup.c:749
+msgid "Plain with face browser"
+msgstr "Plain with face browser"
+
+#: gui/gdmsetup.c:1464
 msgid "Autologin or timed login to the root account is not allowed."
 msgstr "Autologin or timed login to the root account is not allowed."
 
-#: gui/gdmsetup.c:1663 gui/gdmsetup.c:2292
-msgid "Open File"
-msgstr "Open File"
+#: gui/gdmsetup.c:1697
+#, c-format
+msgid "The \"%s\" user already exists in the include list."
+msgstr "The \"%s\" user already exists in the include list."
+
+#: gui/gdmsetup.c:1707 gui/gdmsetup.c:1737 gui/gdmsetup.c:1774
+msgid "Cannot add user"
+msgstr "Cannot add user"
+
+#: gui/gdmsetup.c:1727
+#, c-format
+msgid "The \"%s\" user already exists in the exclude list."
+msgstr "The \"%s\" user already exists in the exclude list."
+
+#: gui/gdmsetup.c:1764
+#, c-format
+msgid "The \"%s\" user does not exist."
+msgstr "The \"%s\" user does not exist."
+
+#: gui/gdmsetup.c:3015 gui/gdmsetup.glade.h:74
+msgid "Sounds"
+msgstr "Sounds"
 
-#: gui/gdmsetup.c:1679
-msgid "PNG and JPEG"
-msgstr "PNG and JPEG"
+#: gui/gdmsetup.c:3020 gui/gdmsetup.c:5427 gui/gdmsetup.c:5496
+#: gui/gdmsetup.c:5724 gui/gdmsetup.c:5793
+msgid "All Files"
+msgstr "All Files"
 
-#: gui/gdmsetup.c:2136 gui/gdmsetup.c:2176 gui/gdmsetup.c:2392
-#: gui/gdmsetup.c:2402 gui/gdmsetup.c:2412
+#: gui/gdmsetup.c:3230 gui/gdmsetup.c:3288
 msgid "None"
 msgstr "None"
 
-#: gui/gdmsetup.c:2301
-msgid "All files"
-msgstr "All files"
-
-#: gui/gdmsetup.c:3050
+#: gui/gdmsetup.c:3728
 msgid "Archive is not of a subdirectory"
 msgstr "Archive is not of a subdirectory"
 
-#: gui/gdmsetup.c:3058
+#: gui/gdmsetup.c:3736
 msgid "Archive is not of a single subdirectory"
 msgstr "Archive is not of a single subdirectory"
 
-#: gui/gdmsetup.c:3082 gui/gdmsetup.c:3160
+#: gui/gdmsetup.c:3760 gui/gdmsetup.c:3838
 msgid "File not a tar.gz or tar archive"
 msgstr "File not a tar.gz or tar archive"
 
-#: gui/gdmsetup.c:3084
+#: gui/gdmsetup.c:3762
 msgid "Archive does not include a GdmGreeterTheme.info file"
 msgstr "Archive does not include a GdmGreeterTheme.info file"
 
-#: gui/gdmsetup.c:3106
+#: gui/gdmsetup.c:3784
 msgid "File does not exist"
 msgstr "File does not exist"
 
-#: gui/gdmsetup.c:3220
+#: gui/gdmsetup.c:3898
 msgid "No file selected"
 msgstr "No file selected"
 
-#: gui/gdmsetup.c:3244
+#: gui/gdmsetup.c:3922
 #, c-format
-msgid "Details: %s"
-msgstr "Details: %s"
+msgid "%s"
+msgstr "%s"
 
-#: gui/gdmsetup.c:3251
+#: gui/gdmsetup.c:3929
 msgid "Not a theme archive"
 msgstr "Not a theme archive"
 
 #. FIXME: if exists already perhaps we could also have an
 #. * option to change the dir name
-#: gui/gdmsetup.c:3270
+#: gui/gdmsetup.c:3948
 #, c-format
 msgid ""
 "Theme directory '%s' seems to be already installed. Install again anyway?"
 msgstr ""
 "Theme directory '%s' seems to be installed already. Install again anyway?"
 
-#: gui/gdmsetup.c:3354
+#: gui/gdmsetup.c:4032
 msgid "Some error occurred when installing the theme"
 msgstr "An error occurred when installing the theme"
 
-#: gui/gdmsetup.c:3394
-msgid "Select new theme archive to install"
-msgstr "Select new theme archive to install"
+#: gui/gdmsetup.c:4072
+msgid "Select Theme Archive"
+msgstr "Select Theme Archive"
 
-#: gui/gdmsetup.c:3398
+#: gui/gdmsetup.c:4076
 msgid "_Install"
 msgstr "_Install"
 
-#: gui/gdmsetup.c:3467
+#: gui/gdmsetup.c:4167
 #, c-format
-msgid "Do you really wish to remove theme '%s' from the system?"
-msgstr "Do you really wish to remove theme '%s' from the system?"
+msgid "Remove the \"%s\" theme?"
+msgstr "Remove the \"%s\" theme?"
 
-#: gui/gdmsetup.c:3484
+#: gui/gdmsetup.c:4176
+msgid "If you choose to remove the theme, it will be permanently lost."
+msgstr "If you choose to remove the theme, it will be permanently lost."
+
+#: gui/gdmsetup.c:4184
 msgid "_Remove Theme"
 msgstr "_Remove Theme"
 
 #. This is the temporary help dialog
-#: gui/gdmsetup.c:4238
+#: gui/gdmsetup.c:5109
 #, c-format
 msgid ""
 "This configuration window changes settings for the GDM daemon, which is the "
@@ -3278,7 +3269,26 @@ msgstr ""
 "For complete documentation see the GNOME help browser under the \"Desktop\" "
 "category."
 
-#: gui/gdmsetup.c:4678
+#: gui/gdmsetup.c:5422 gui/gdmsetup.c:5491 gui/gdmsetup.c:5719
+#: gui/gdmsetup.c:5788
+msgid "Images"
+msgstr "Images"
+
+#: gui/gdmsetup.c:6203
+msgid "Apply the changes to users before closing?"
+msgstr "Apply the changes to users before closing?"
+
+#: gui/gdmsetup.c:6204
+msgid ""
+"If you don't apply, the changes made on the Users tab will be disregarded."
+msgstr ""
+"If you do not apply, the changes made on the Users tab will be disregarded."
+
+#: gui/gdmsetup.c:6207
+msgid "Close _without Applying"
+msgstr "Close _without Applying"
+
+#: gui/gdmsetup.c:6313
 msgid "You must be the root user to configure GDM."
 msgstr "You must be the root user to configure GDM."
 
@@ -3287,539 +3297,418 @@ msgstr "You must be the root user to configure GDM."
 msgid "Configure the login screen (GNOME Display Manager)"
 msgstr "Configure the login screen (GNOME Display Manager)"
 
-#: gui/gdmsetup.desktop.in.h:2 gui/gdmsetup.glade.h:52
+#: gui/gdmsetup.desktop.in.h:2
 msgid "Login Screen Setup"
 msgstr "Login Screen Setup"
 
-#: gui/gdmsetup.glade.h:2
-msgid "     "
-msgstr "     "
-
 #: gui/gdmsetup.glade.h:3
-msgid "<"
-msgstr "<"
+#, no-c-format
+msgid "%n will be replaced by hostname"
+msgstr "%n will be replaced by hostname"
 
 #: gui/gdmsetup.glade.h:4
-msgid "<b>Server Settings</b>"
-msgstr "<b>Server Settings</b>"
+msgid ""
+"<b>Note:</b>  Users in the Include list will appear in the face browser if "
+"enabled and will appear in the user drop-down lists for automatic and timed "
+"logins on the Security tab.  Users in the Exclude list will not appear."
+msgstr ""
+"<b>Note:</b>  Users in the Include list will appear in the face browser if "
+"enabled and will appear in the user drop-down lists for automatic and timed "
+"logins on the Security tab.  Users in the Exclude list will not appear."
 
 #: gui/gdmsetup.glade.h:5
-msgid "<b>Servers to Start</b>"
-msgstr "<b>Servers to Start</b>"
-
-#: gui/gdmsetup.glade.h:6
 msgid ""
-"<b>WARNING:</b> Placing values in this section that your Xserver does not "
-"support will stop your Xserver\n"
-"from restarting (effectively not allowing this configuration application to "
-"run), BE CAREFUL!"
+"<b>Warning:</b>  Using an invalid value could stop the XServer from "
+"restarting.  The gdm service will require a restart before changes take "
+"effect."
 msgstr ""
-"<b>WARNING:</b> Placing values in this section that your Xserver does not "
-"support will stop your Xserver\n"
-"from restarting (effectively not allowing this configuration application to "
-"run), BE CAREFUL!"
+"<b>Warning:</b>  Using an invalid value could stop the XServer from "
+"restarting.  The GDM service will require a restart before changes take "
+"effect."
 
-#: gui/gdmsetup.glade.h:8
-msgid ">"
-msgstr ">"
+#: gui/gdmsetup.glade.h:6
+msgid "A_llow remote system administrator login"
+msgstr "A_llow remote system administrator login"
 
-#: gui/gdmsetup.glade.h:9
+#: gui/gdmsetup.glade.h:7
 msgid "Accessibility"
 msgstr "Accessibility"
 
+#: gui/gdmsetup.glade.h:8
+msgid "Add / Modify Servers To Start"
+msgstr "Add / Modify Servers To Start"
+
+#: gui/gdmsetup.glade.h:9
+msgid "Add S_erver..."
+msgstr "Add S_erver..."
+
 #: gui/gdmsetup.glade.h:10
-msgid "Add/Modify Server"
-msgstr "Add/Modify Server"
+msgid "Add User"
+msgstr "Add User"
 
 #: gui/gdmsetup.glade.h:11
-msgid "Allow _configuration from the login screen"
-msgstr "Allow _configuration from the login screen"
+msgid "Allo_w remote timed logins"
+msgstr "Allo_w remote timed logins"
 
 #: gui/gdmsetup.glade.h:12
-msgid "Allow _root to login with GDM"
-msgstr "Allow _root to login with GDM"
+msgid "Author:"
+msgstr "Author:"
 
 #: gui/gdmsetup.glade.h:13
-msgid "Allow remote _timed logins"
-msgstr "Allow remote _timed logins"
+msgid "Background"
+msgstr "Background"
 
 #: gui/gdmsetup.glade.h:14
-msgid "Allow root to login r_emotely with GDM"
-msgstr "Allow root to login r_emotely with GDM"
+msgid "C_ommand:"
+msgstr "C_ommand:"
 
 #: gui/gdmsetup.glade.h:15
-msgid "Allow running _XDMCP chooser from the login screen"
-msgstr "Allow _XDMCP chooser to be run from the login screen"
+msgid "C_ustom:"
+msgstr "C_ustom:"
 
 #: gui/gdmsetup.glade.h:16
-msgid "Allow theme selection in _GTK+ Greeter"
-msgstr "Allow theme selection in _GTK+ Greeter"
+msgid "Co_lor:"
+msgstr "Co_lour:"
 
 #: gui/gdmsetup.glade.h:17
-msgid "Apply"
-msgstr "Apply"
+msgid "Color depth:"
+msgstr "Colour depth:"
 
 #: gui/gdmsetup.glade.h:18
-msgid "Author:"
-msgstr "Author:"
+msgid "Configure _XDMCP..."
+msgstr "Configure _XDMCP..."
 
 #: gui/gdmsetup.glade.h:19
-msgid "Automatic Login"
-msgstr "Automatic Login"
+msgid "Configure _XServer..."
+msgstr "Configure _XServer..."
 
 #: gui/gdmsetup.glade.h:20
-msgid "Background"
-msgstr "Background"
+msgid "Copyright:"
+msgstr "Copyright:"
 
 #: gui/gdmsetup.glade.h:21
-msgid "Browse"
-msgstr "Browse"
+msgid "Disables X forwarding, but does not affect XDMCP."
+msgstr "Disables X forwarding, but does not affect XDMCP."
 
 #: gui/gdmsetup.glade.h:22
-msgid "Choose network computer to connect to."
-msgstr "Choose network computer to connect to."
+msgid "Displays per _host:"
+msgstr "Displays per _host:"
 
 #: gui/gdmsetup.glade.h:23
-msgid "Chooser"
-msgstr "Chooser"
+msgid "Do not show image for _remote logins"
+msgstr "Do not show image for _remote logins"
 
 #: gui/gdmsetup.glade.h:24
-msgid "Color Depth:"
-msgstr "Colour Depth:"
+msgid "E_nable debug messages to system log"
+msgstr "E_nable debug messages to system log"
 
 #: gui/gdmsetup.glade.h:25
-msgid "Command:"
-msgstr "Command:"
+msgid "E_xclude:"
+msgstr "E_xclude:"
 
 #: gui/gdmsetup.glade.h:26
-msgid "Copyright:"
-msgstr "Copyright:"
+msgid "Enable _Timed Login"
+msgstr "Enable _Timed Login"
 
 #: gui/gdmsetup.glade.h:27
-msgid "Create Server Definition"
-msgstr "Create Server Definition"
+msgid "Example: /usr/X11R6/bin/X"
+msgstr "Example: /usr/X11R6/bin/X"
 
 #: gui/gdmsetup.glade.h:28
-msgid "Delete"
-msgstr "Delete"
-
-#: gui/gdmsetup.glade.h:29
-msgid "Delete Server Definition"
-msgstr "Delete Server Definition"
+msgid ""
+"Greeter\n"
+"Chooser"
+msgstr ""
+"Greeter\n"
+"Chooser"
 
 #: gui/gdmsetup.glade.h:30
-msgid "Description:"
-msgstr "Description:"
+msgid "Honor _indirect requests"
+msgstr "Honour _indirect requests"
 
 #: gui/gdmsetup.glade.h:31
-msgid "Displays per _host:"
-msgstr "Displays per _host:"
+msgid "I_mage:"
+msgstr "I_mage:"
 
 #: gui/gdmsetup.glade.h:32
-msgid "Enable _XDMCP"
-msgstr "Enable _XDMCP"
+msgid "I_nclude:"
+msgstr "I_nclude:"
 
 #: gui/gdmsetup.glade.h:33
-msgid "Enable _accessibility modules"
-msgstr "Enable _accessibility modules"
+msgid "Includ_e Hostname Chooser (XDMCP) menu item"
+msgstr "Includ_e Hostname Chooser (XDMCP) menu item"
 
 #: gui/gdmsetup.glade.h:34
-msgid "Enable debu_g messages to system log"
-msgstr "Enable debu_g messages to system log"
+msgid "Include Con_figure menu item"
+msgstr "Include Con_figure menu item"
 
 #: gui/gdmsetup.glade.h:35
-msgid "Exclude"
-msgstr "Exclude"
+msgid "L_ogin retry delay:"
+msgstr "L_ogin retry delay:"
 
 #: gui/gdmsetup.glade.h:36
-msgid "Flexible"
-msgstr "Flexible"
+msgid "La_unch:"
+msgstr "La_unch:"
 
 #: gui/gdmsetup.glade.h:37
-msgid "GTK+ Greeter"
-msgstr "GTK+ Greeter"
+msgid "Listen on _UDP port: "
+msgstr "Listen on _UDP port: "
 
 #: gui/gdmsetup.glade.h:38
-msgid ""
-"GTK+ Greeter\n"
-"Themed Greeter"
-msgstr ""
-"GTK+ Greeter\n"
-"Themed Greeter"
+msgid "Local"
+msgstr "Local"
+
+#: gui/gdmsetup.glade.h:39
+msgid "Login Window Preferences"
+msgstr "Login Window Preferences"
 
 #: gui/gdmsetup.glade.h:40
-msgid ""
-"GTK+ Greeter\n"
-"Themed Greeter\n"
-"Disabled"
-msgstr ""
-"GTK+ Greeter\n"
-"Themed Greeter\n"
-"Disabled"
+msgid "Login _failed:"
+msgstr "Login _failed:"
+
+#: gui/gdmsetup.glade.h:41
+msgid "Login _successful:"
+msgstr "Login _successful:"
+
+#: gui/gdmsetup.glade.h:42
+msgid "Logo"
+msgstr "Logo"
 
 #: gui/gdmsetup.glade.h:43
-msgid "General"
-msgstr "General"
+msgid "Maximum _pending requests:"
+msgstr "Maximum _pending requests:"
 
 #: gui/gdmsetup.glade.h:44
-msgid "Greeter"
-msgstr "Greeter"
+msgid "Maximum _remote sessions:"
+msgstr "Maximum _remote sessions:"
 
 #: gui/gdmsetup.glade.h:45
-msgid "Handled"
-msgstr "Handled"
+msgid "Maximum _wait time:"
+msgstr "Maximum _wait time:"
 
 #: gui/gdmsetup.glade.h:46
-msgid "Honour _indirect requests"
-msgstr "Honour _indirect requests"
+msgid "Maximum indirect w_ait time:"
+msgstr "Maximum indirect w_ait time:"
 
 #: gui/gdmsetup.glade.h:47
-msgid "Include"
-msgstr "Include"
+msgid "Maximum p_ending indirect requests:"
+msgstr "Maximum p_ending indirect requests:"
 
 #: gui/gdmsetup.glade.h:48
-msgid "Is a login attempt handled by this computer?"
-msgstr "Is a login attempt handled by this computer?"
+msgid "Menu Bar"
+msgstr "Menu Bar"
 
 #: gui/gdmsetup.glade.h:49
-msgid "L_ocal: "
-msgstr "L_ocal: "
+msgid "Op_tions:\t"
+msgstr "Op_tions:\t"
 
 #: gui/gdmsetup.glade.h:50
-msgid "Listen on _UDP port: "
-msgstr "Listen on _UDP port: "
+msgid "Pick Background Color"
+msgstr "Pick Background Colour"
 
 #: gui/gdmsetup.glade.h:51
-msgid "Login Greeter."
-msgstr "Login Greeter"
+msgid "Pin_g interval:"
+msgstr "Pin_g interval:"
 
-#: gui/gdmsetup.glade.h:53
-msgid "Login a _user automatically after a specified number of seconds"
-msgstr "Log in a _user automatically after a specified number of seconds"
-
-#: gui/gdmsetup.glade.h:54
-msgid "Logo"
-msgstr "Logo"
+#: gui/gdmsetup.glade.h:52
+msgid ""
+"Plain\n"
+"Plain with face browser\n"
+"Themed"
+msgstr ""
+"Plain\n"
+"Plain with face browser\n"
+"Themed"
 
 #: gui/gdmsetup.glade.h:55
-msgid "Make a _sound after a failed login attempt"
-msgstr "Make a _sound after a failed login attempt"
+msgid "Re_move Server"
+msgstr "Re_move Server"
 
 #: gui/gdmsetup.glade.h:56
-msgid "Make a _sound after a successful login attempt"
-msgstr "Make a _sound after a successful login attempt"
+msgid "Refresh rate:"
+msgstr "Refresh rate:"
 
 #: gui/gdmsetup.glade.h:57
-msgid "Make a _sound when login window is ready"
-msgstr "Make a _sound when login window is ready"
+msgid "Remote"
+msgstr "Remote"
 
 #: gui/gdmsetup.glade.h:58
-msgid "Max p_ending indirect requests:"
-msgstr "Max p_ending indirect requests:"
-
-#: gui/gdmsetup.glade.h:59
-msgid "Maximum _pending requests:"
-msgstr "Maximum _pending requests:"
+msgid ""
+"Remote login disabled\n"
+"Same as Local"
+msgstr ""
+"Remote login disabled\n"
+"Same as Local"
 
 #: gui/gdmsetup.glade.h:60
-msgid "Maximum _remote sessions:"
-msgstr "Maximum _remote sessions:"
+msgid "Resolution:"
+msgstr "Resolution:"
 
 #: gui/gdmsetup.glade.h:61
-msgid "Maximum _wait time:"
-msgstr "Maximum _wait time:"
+msgid "Sc_ale to fit screen"
+msgstr "Sc_ale to fit screen"
 
 #: gui/gdmsetup.glade.h:62
-msgid "Maximum indirect w_ait time:"
-msgstr "Maximum indirect w_ait time:"
+msgid "Security"
+msgstr "Security"
 
 #: gui/gdmsetup.glade.h:63
-msgid "No Logo"
-msgstr "No Logo"
+msgid "Select Backgroud Image"
+msgstr "Select Backgroud Image"
 
 #: gui/gdmsetup.glade.h:64
-msgid "No Sound"
-msgstr "No Sound"
+msgid "Select Background Image"
+msgstr "Select Background Image"
 
 #: gui/gdmsetup.glade.h:65
-msgid ""
-"No XDMCP support in the binary.  To enable XDMCP support you must recompile "
-"GDM with the XDMCP libraries."
-msgstr ""
-"No XDMCP support in the binary.  To enable XDMCP support you must recompile "
-"GDM with the XDMCP libraries."
+msgid "Select Logo Image"
+msgstr "Select Logo Image"
 
 #: gui/gdmsetup.glade.h:66
-msgid "No screenshot available"
-msgstr "No screenshot available"
+msgid "Select Sound File"
+msgstr "Select Sound File"
 
 #: gui/gdmsetup.glade.h:67
 msgid ""
-"Note: For settings to take effect, the gdm service will require a restart."
+"Selected only\n"
+"Random from selected\n"
 msgstr ""
-"Note: For settings to take effect, the GDM service will require a restart."
-
-#: gui/gdmsetup.glade.h:68
-msgid ""
-"Only One Theme\n"
-"Random Theme"
-msgstr ""
-"Only One Theme\n"
-"Random Theme"
+"Selected only\n"
+"Random from selected\n"
 
 #: gui/gdmsetup.glade.h:70
-msgid "Options"
-msgstr "Options"
+msgid "Server Settings"
+msgstr "Server Settings"
 
 #: gui/gdmsetup.glade.h:71
-msgid "Pick a color"
-msgstr "Pick a colour"
+msgid "Server _name:"
+msgstr "Server _name:"
 
 #: gui/gdmsetup.glade.h:72
-msgid "Pin_g interval (seconds):"
-msgstr "Pin_g interval (seconds):"
+msgid "Servers To Start"
+msgstr "Servers To Start"
 
 #: gui/gdmsetup.glade.h:73
-msgid "Ping interval (seconds):"
-msgstr "Ping interval (seconds):"
+msgid "Sho_w Actions menu"
+msgstr "Sho_w Actions menu"
 
-#: gui/gdmsetup.glade.h:74
-msgid "Preview:"
-msgstr "Preview:"
+#: gui/gdmsetup.glade.h:75
+msgid "Themes"
+msgstr "Themes"
 
 #: gui/gdmsetup.glade.h:76
-#, no-c-format
-msgid "Re_mote welcome string (%n = hostname): "
-msgstr "Re_mote welcome string (%n = hostname): "
+msgid "U_ser:"
+msgstr "U_ser:"
 
 #: gui/gdmsetup.glade.h:77
-msgid "Refresh Rate:"
-msgstr "Refresh Rate:"
+msgid "Users"
+msgstr "Users"
 
 #: gui/gdmsetup.glade.h:78
-msgid "Remove Server"
-msgstr "Remove Server"
+msgid "Welcome Message"
+msgstr "Welcome Message"
 
 #: gui/gdmsetup.glade.h:79
-msgid "Resolution:"
-msgstr "Resolution:"
+msgid "XDMCP Login WIndow Preferences"
+msgstr "XDMCP Login WIndow Preferences"
 
 #: gui/gdmsetup.glade.h:80
-msgid "Retry delay (_seconds):"
-msgstr "Retry delay (_seconds):"
+msgid "XServer Login Window Preferences"
+msgstr "XServer Login Window Preferences"
 
 #: gui/gdmsetup.glade.h:81
-msgid "Security"
-msgstr "Security"
+msgid "_Add/Modify..."
+msgstr "_Add/Modify..."
 
 #: gui/gdmsetup.glade.h:82
-msgid "Server Definition to Modify:"
-msgstr "Server Definition to Modify:"
+msgid "_Allow local system administrator login"
+msgstr "_Allow local system administrator login"
 
 #: gui/gdmsetup.glade.h:83
-msgid "Server Name:"
-msgstr "Server Name:"
-
-#: gui/gdmsetup.glade.h:84
-msgid "Show _Face Browser"
-msgstr "Show _Face Browser"
+msgid "_Allow users to change fonts and colors of plain greeter"
+msgstr "_Allow users to change fonts and colours of plain greeter"
 
 #: gui/gdmsetup.glade.h:85
-msgid "Show _actions menu"
-msgstr "Show _actions menu"
+#, no-c-format
+msgid "_Default message of \"Welcome to %n\""
+msgstr "_Default message of \"Welcome to %n\""
 
 #: gui/gdmsetup.glade.h:86
-msgid ""
-"Show the \"Actions\" menu (formerly known as the \"System\" menu).  If not "
-"set, none of the system commands will be available (this includes restart, "
-"shutdown, configure, chooser)"
-msgstr ""
-"Show the \"Actions\" menu (formerly known as the \"System\" menu).  If not "
-"set, none of the system commands will be available (this includes restart, "
-"shutdown, configure, chooser)"
+msgid "_Default message of \"Welcome\""
+msgstr "_Default message of \"Welcome\""
 
 #: gui/gdmsetup.glade.h:87
-msgid "Sound file:"
-msgstr "Sound file:"
+msgid "_Deny TCP connections to Xserver"
+msgstr "_Deny TCP connections to Xserver"
+
+#: gui/gdmsetup.glade.h:88
+msgid "_Enable Automatic Login"
+msgstr "_Enable Automatic Login"
 
 #: gui/gdmsetup.glade.h:89
-#, no-c-format
-msgid ""
-"String to be shown in the greeter as welcome.  You can insert %n in here and "
-"it will be replaced by the name of your computer."
-msgstr ""
-"String to be shown in the greeter as welcome.  You can insert %n in here and "
-"it will be replaced by the name of your computer."
+msgid "_Enable accessible login"
+msgstr "_Enable accessible login"
+
+#: gui/gdmsetup.glade.h:90
+msgid "_Flexible (on demand)"
+msgstr "_Flexible (on demand)"
 
 #: gui/gdmsetup.glade.h:91
-#, no-c-format
-msgid ""
-"String to be shown in the greeter for people logging in remotely with "
-"XDMCP.  You can insert %n in here and it will be replaced by the name of "
-"your computer."
-msgstr ""
-"String to be shown in the greeter for people logging in remotely with "
-"XDMCP.  You can insert %n in here and it will be replaced by the name of "
-"your computer."
+msgid "_Image:"
+msgstr "_Image:"
 
 #: gui/gdmsetup.glade.h:92
-msgid "Test Sound"
-msgstr "Test Sound"
+msgid "_Include all users from /etc/passwd (not for NIS)"
+msgstr "_Include all users from /etc/passwd (not for NIS)"
 
 #: gui/gdmsetup.glade.h:93
-msgid ""
-"The \"Users\" tab specifies which users are visible to GDM.  Users listed in "
-"\"Include\" will appear in the Face Browser if it is enabled in the "
-"\"Security\" tab and will also appear in the drop-down list for Automatic/"
-"Timed login under the \"General\" tab.  Users listed in \"Exclude\" will not "
-"be displayed regardless of whether \"Include All Users\" is checked."
-msgstr ""
-"The \"Users\" tab specifies which users are visible to GDM.  Users listed in "
-"\"Include\" will appear in the Face Browser if it is enabled in the "
-"\"Security\" tab and will also appear in the drop-down list for Automatic/"
-"Timed login under the \"General\" tab.  Users listed in \"Exclude\" will not "
-"be displayed regardless of whether \"Include All Users\" is checked."
+msgid "_Login screen ready:"
+msgstr "_Login screen ready:"
 
 #: gui/gdmsetup.glade.h:94
-msgid "Themed Greeter"
-msgstr "Themed Greeter"
+msgid "_Logins are handled by this computer"
+msgstr "_Logins are handled by this computer"
 
 #: gui/gdmsetup.glade.h:95
-msgid "Timed Login"
-msgstr "Timed Login"
+msgid "_Pause before login:"
+msgstr "_Pause before login:"
 
 #: gui/gdmsetup.glade.h:96
-msgid "Use default Remote Welcome"
-msgstr "Use default Remote Welcome"
+msgid "_Remove"
+msgstr "_Remove"
 
 #: gui/gdmsetup.glade.h:97
-msgid "Use default Welcome"
-msgstr "Use default Welcome"
+msgid "_Server:"
+msgstr "_Server:"
 
 #: gui/gdmsetup.glade.h:98
-msgid "User to Include"
-msgstr "User to Include"
+msgid "_Servers:"
+msgstr "_Servers:"
 
 #: gui/gdmsetup.glade.h:99
-msgid "User to exclude"
-msgstr "User to exclude"
+msgid "_Style:"
+msgstr "_Style:"
 
 #: gui/gdmsetup.glade.h:100
-msgid "Users"
-msgstr "Users"
+msgid "_Theme:"
+msgstr "_Theme:"
 
 #: gui/gdmsetup.glade.h:101
-msgid "Usually something like: /usr/bin/X"
-msgstr "Usually something like: /usr/local/bin/X"
+msgid "_User:"
+msgstr "_User:"
 
 #: gui/gdmsetup.glade.h:102
-msgid "X Server Settings"
-msgstr "X Server Settings"
+msgid "_VT:"
+msgstr "_VT:"
 
 #: gui/gdmsetup.glade.h:103
-msgid "XDMCP"
-msgstr "XDMCP"
-
-#: gui/gdmsetup.glade.h:104
-msgid "XServer"
-msgstr "XServer"
-
-#: gui/gdmsetup.glade.h:106
-msgid "_Automatic login username:"
-msgstr "_Automatic login username:"
-
-#: gui/gdmsetup.glade.h:107
-msgid "_Background color: "
-msgstr "_Background colour: "
-
-#: gui/gdmsetup.glade.h:108
-msgid "_Color"
-msgstr "_Colour"
-
-#: gui/gdmsetup.glade.h:109
-msgid "_Delete theme"
-msgstr "_Delete theme"
-
-#: gui/gdmsetup.glade.h:110
-msgid ""
-"_Deny TCP connections to Xserver (disables xforwarding, but does not affect "
-"XDMCP)"
-msgstr ""
-"_Deny TCP connections to Xserver (disables xforwarding, but does not affect "
-"XDMCP)"
-
-#: gui/gdmsetup.glade.h:111
-msgid "_Image"
-msgstr "_Image"
-
-#: gui/gdmsetup.glade.h:112
-msgid ""
-"_Include All Users (Get \"Include\" user list from /etc/passwd.  Not "
-"appropriate if using NIS)"
-msgstr ""
-"_Include All Users (Obtains \"Include\" user list from /etc/passwd.  Not "
-"appropriate if using NIS)"
-
-#: gui/gdmsetup.glade.h:113
-msgid "_Install new theme"
-msgstr "_Install new theme"
-
-#: gui/gdmsetup.glade.h:114
-msgid "_Login a user automatically on first bootup"
-msgstr "_Log in a user automatically on first bootup"
-
-#: gui/gdmsetup.glade.h:115
-msgid "_Mode:"
-msgstr "_Mode:"
-
-#: gui/gdmsetup.glade.h:116
-msgid "_No background"
-msgstr "_No background"
-
-#: gui/gdmsetup.glade.h:117
-msgid "_Only color on remote displays"
-msgstr "_Only colour on remote displays"
-
-#: gui/gdmsetup.glade.h:118
-msgid "_Remote: "
-msgstr "_Remote: "
-
-#: gui/gdmsetup.glade.h:119
-msgid "_Scale background image to fit"
-msgstr "_Scale background image to fit"
-
-#: gui/gdmsetup.glade.h:120
-msgid "_Seconds before login:"
-msgstr "_Seconds before login:"
-
-#: gui/gdmsetup.glade.h:121
-msgid "_Timed login username:"
-msgstr "_Timed login username:"
-
-#: gui/gdmsetup.glade.h:122
-msgid "_Welcome string: "
-msgstr "_Welcome string: "
-
-#: gui/gdmsetup.glade.h:123
-msgid "author"
-msgstr "author"
-
-#: gui/gdmsetup.glade.h:124
-msgid "copyright"
-msgstr "copyright"
-
-#: gui/gdmsetup.glade.h:125
-msgid ""
-"description\n"
-"widget"
-msgstr ""
-"description\n"
-"widget"
-
-#: gui/gdmsetup.glade.h:127
 msgid "dummy"
 msgstr "dummy"
 
+#: gui/gdmsetup.glade.h:104
+msgid "seconds"
+msgstr "seconds"
+
 #: gui/gdmuser.c:287 gui/gdmuser.c:289
 msgid "Too many users to list here..."
 msgstr "Too many users to list here..."
@@ -3837,16 +3726,16 @@ msgstr ""
 msgid "Reboot"
 msgstr "Reboot"
 
-#: gui/greeter/greeter.c:1413
+#: gui/greeter/greeter.c:1389
 #, c-format
 msgid "There was an error loading the theme %s"
 msgstr "There was an error loading the theme %s"
 
-#: gui/greeter/greeter.c:1465
+#: gui/greeter/greeter.c:1441
 msgid "The greeter theme is corrupt"
 msgstr "The greeter theme is corrupt"
 
-#: gui/greeter/greeter.c:1466
+#: gui/greeter/greeter.c:1442
 msgid ""
 "The theme does not contain definition for the username/password entry "
 "element."
@@ -3854,7 +3743,7 @@ msgstr ""
 "The theme does not contain definition for the username/password entry "
 "element."
 
-#: gui/greeter/greeter.c:1499
+#: gui/greeter/greeter.c:1475
 msgid ""
 "There was an error loading the theme, and the default theme could not be "
 "loaded. Attempting to start the standard greeter"
@@ -3862,7 +3751,7 @@ msgstr ""
 "There was an error loading the theme, and the default theme could not be "
 "loaded. Attempting to start the standard greeter"
 
-#: gui/greeter/greeter.c:1521
+#: gui/greeter/greeter.c:1497
 msgid ""
 "The GTK+ greeter could not be started.  This display will abort and you may "
 "have to login another way and fix the installation of gdm"
@@ -3967,10 +3856,36 @@ msgstr "Sessions"
 msgid "_Last session"
 msgstr "_Last session"
 
+#: gui/greeter/greeter_session.c:276
+msgid "Log in using the session that you have used last time you logged in"
+msgstr "Log in using the session that you have used last time you logged in"
+
+#: gui/greeter/greeter_system.c:156 gui/greeter/greeter_system.c:352
+msgid ""
+"Run an XDMCP chooser which will allow you to log into available remote "
+"computers, if there are any."
+msgstr ""
+"Run an XDMCP chooser which will allow you to log into available remote "
+"computers, if there are any."
+
+#: gui/greeter/greeter_system.c:171 gui/greeter/greeter_system.c:372
+msgid ""
+"Configure GDM (this login manager). This will require the root password."
+msgstr ""
+"Configure GDM (this login manager). This will require the root password."
+
 #: gui/greeter/greeter_system.c:190 gui/greeter/greeter_system.c:318
 msgid "Reboot your computer"
 msgstr "Reboot your computer"
 
+#: gui/greeter/greeter_system.c:202
+msgid "Shut down the system so that you may safely turn off the computer."
+msgstr "Shut down the system so that you may safely turn off the computer."
+
+#: gui/greeter/greeter_system.c:215 gui/greeter/greeter_system.c:335
+msgid "Suspend your computer"
+msgstr "Suspend your computer"
+
 #: gui/greeter/greeter_system.c:275
 msgid "Choose an Action"
 msgstr "Choose an Action"