Updated Canadian English translation.

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

	* en_CA.po: Updated Canadian English translation.

2 files changed, 230 insertions, 170 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 79364c5f..cd4e1b8d 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2005-04-01  Adam Weinberger  <adamw@gnome.org>
+
+	* en_CA.po: Updated Canadian English translation.
+
 2005-04-01  Pawan Chitrakar  <pawan@nplinux.org>
 
 	* ne.po: Added Nepali Translation
diff --git a/po/en_CA.po b/po/en_CA.po
index 27a7a3f6..a42e8865 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gdm2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-26 02:07-0500\n"
-"PO-Revision-Date: 2005-03-26 10:41-0400\n"
+"POT-Creation-Date: 2005-04-01 12:39-0500\n"
+"PO-Revision-Date: 2005-04-01 10:41-0400\n"
 "Last-Translator: Adam Weinberger <adamw@gnome.org>\n"
 "Language-Team: Canadian English <adamw@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -703,8 +703,8 @@ msgstr "Only root wants to run gdm\n"
 #: ../daemon/server.c:521 ../daemon/server.c:534 ../daemon/slave.c:813
 #: ../daemon/slave.c:827 ../daemon/slave.c:837 ../daemon/slave.c:847
 #: ../daemon/slave.c:859 ../gui/gdmchooser.c:1936 ../gui/gdmchooser.c:1939
-#: ../gui/gdmchooser.c:1942 ../gui/gdmlogin.c:3686 ../gui/gdmlogin.c:3694
-#: ../gui/gdmlogin.c:3697 ../gui/greeter/greeter.c:1088
+#: ../gui/gdmchooser.c:1942 ../gui/gdmlogin.c:3687 ../gui/gdmlogin.c:3695
+#: ../gui/gdmlogin.c:3698 ../gui/greeter/greeter.c:1088
 #: ../gui/greeter/greeter.c:1096 ../gui/greeter/greeter.c:1099
 #, c-format
 msgid "%s: Error setting up %s signal handler: %s"
@@ -1152,12 +1152,12 @@ msgstr ""
 
 #: ../daemon/slave.c:3697
 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 "
+"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 "
 "in your installation."
 msgstr ""
-"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 "
+"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 "
 "in your installation."
 
 #: ../daemon/slave.c:3712
@@ -1877,11 +1877,9 @@ msgstr "A_dd host: "
 
 #. EOF
 #: ../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:44
-#: ../gui/gdmsetup-strings.c:65 ../gui/gdmsetup-strings.c:72
-#: ../gui/gdmsetup-strings.c:98 ../gui/gdmsetup.glade.h:2
+#: ../gui/gdmsetup-strings.c:15 ../gui/gdmsetup-strings.c:17
+#: ../gui/gdmsetup-strings.c:68 ../gui/gdmsetup-strings.c:75
+#: ../gui/gdmsetup.glade.h:2
 msgid "*"
 msgstr "*"
 
@@ -1890,8 +1888,8 @@ msgid "Query and add this host to the above list"
 msgstr "Query and add this host to the above list"
 
 #: ../gui/gdmchooser-strings.c:17 ../gui/gdmchooser.glade.h:11
-#: ../gui/gdmsetup-strings.c:66 ../gui/gdmsetup-strings.c:73
-#: ../gui/gdmsetup.glade.h:65
+#: ../gui/gdmsetup-strings.c:69 ../gui/gdmsetup-strings.c:76
+#: ../gui/gdmsetup.glade.h:75
 msgid "_Add"
 msgstr "_Add"
 
@@ -1967,7 +1965,7 @@ msgstr ""
 msgid "Can't open default host icon: %s"
 msgstr "Can't open default host icon: %s"
 
-#: ../gui/gdmchooser.c:1950 ../gui/gdmlogin.c:3705 ../gui/gdmlogin.c:3712
+#: ../gui/gdmchooser.c:1950 ../gui/gdmlogin.c:3706 ../gui/gdmlogin.c:3713
 #: ../gui/greeter/greeter.c:1107 ../gui/greeter/greeter.c:1114
 msgid "Could not set signal mask!"
 msgstr "Could not set signal mask!"
@@ -2703,13 +2701,13 @@ msgstr "Other|POSIX/C English"
 
 #. 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:433
+#: ../gui/gdmlanguages.c:419
 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:441
+#: ../gui/gdmlanguages.c:427
 msgid "N-Z"
 msgstr "N-Z"
 
@@ -2769,12 +2767,12 @@ msgstr "Are you sure you want to suspend the machine?"
 msgid "_Suspend"
 msgstr "_Suspend"
 
-#: ../gui/gdmlogin.c:681 ../gui/gdmlogin.c:3470 ../gui/greeter/greeter.c:168
+#: ../gui/gdmlogin.c:681 ../gui/gdmlogin.c:3471 ../gui/greeter/greeter.c:168
 #: ../gui/greeter/greeter.c:858
 msgid "Welcome"
 msgstr "Welcome"
 
-#: ../gui/gdmlogin.c:684 ../gui/gdmlogin.c:3473 ../gui/greeter/greeter.c:171
+#: ../gui/gdmlogin.c:684 ../gui/gdmlogin.c:3474 ../gui/greeter/greeter.c:171
 #: ../gui/greeter/greeter.c:861
 #, c-format
 msgid "Welcome to %n"
@@ -2864,9 +2862,9 @@ msgstr "_Last"
 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/gdmlogin.c:1210 ../gui/greeter/greeter_session.c:264
-msgid "Failsafe Gnome"
-msgstr "Failsafe Gnome"
+#: ../gui/gdmlogin.c:1210
+msgid "Failsafe GNOME"
+msgstr "Failsafe GNOME"
 
 #: ../gui/gdmlogin.c:1211 ../gui/greeter/greeter_session.c:265
 msgid "Failsafe xterm"
@@ -2881,9 +2879,9 @@ msgstr "%s: Session directory %s not found!"
 msgid "Yaikes, nothing found in the session directory."
 msgstr "Yikes! Nothing found in the session directory."
 
-#: ../gui/gdmlogin.c:1377 ../gui/greeter/greeter_session.c:449
-msgid "Failsafe _Gnome"
-msgstr "Failsafe _Gnome"
+#: ../gui/gdmlogin.c:1377
+msgid "Failsafe _GNOME"
+msgstr "Failsafe _GNOME"
 
 #: ../gui/gdmlogin.c:1379 ../gui/greeter/greeter_session.c:451
 msgid ""
@@ -3036,13 +3034,13 @@ msgid "Icon"
 msgstr "Icon"
 
 #. markup
-#: ../gui/gdmlogin.c:3549 ../gui/gdmlogin.c:3580 ../gui/gdmlogin.c:3624
+#: ../gui/gdmlogin.c:3550 ../gui/gdmlogin.c:3581 ../gui/gdmlogin.c:3625
 #: ../gui/greeter/greeter.c:669 ../gui/greeter/greeter.c:701
 #: ../gui/greeter/greeter.c:746
 msgid "Cannot start the greeter"
 msgstr "Cannot start the greeter"
 
-#: ../gui/gdmlogin.c:3550 ../gui/gdmlogin.c:3581
+#: ../gui/gdmlogin.c:3551 ../gui/gdmlogin.c:3582
 #, c-format
 msgid ""
 "The greeter version (%s) does not match the daemon version.  You have "
@@ -3053,12 +3051,12 @@ msgstr ""
 "probably just upgraded gdm.  Please restart the gdm daemon or reboot the "
 "computer."
 
-#: ../gui/gdmlogin.c:3587 ../gui/gdmlogin.c:3633 ../gui/greeter/greeter.c:708
+#: ../gui/gdmlogin.c:3588 ../gui/gdmlogin.c:3634 ../gui/greeter/greeter.c:708
 #: ../gui/greeter/greeter.c:755
 msgid "Reboot"
 msgstr "Reboot"
 
-#: ../gui/gdmlogin.c:3625
+#: ../gui/gdmlogin.c:3626
 #, c-format
 msgid ""
 "The greeter version (%s) does not match the daemon version (%s).  You have "
@@ -3069,21 +3067,21 @@ msgstr ""
 "probably just upgraded gdm.  Please restart the gdm daemon or reboot the "
 "computer."
 
-#: ../gui/gdmlogin.c:3631 ../gui/greeter/greeter.c:753
+#: ../gui/gdmlogin.c:3632 ../gui/greeter/greeter.c:753
 msgid "Restart"
 msgstr "Restart"
 
-#: ../gui/gdmlogin.c:3663
+#: ../gui/gdmlogin.c:3664
 #, c-format
 msgid "Can't open DefaultImage: %s. Suspending face browser!"
 msgstr "Can't open DefaultImage: %s. Suspending face browser!"
 
 #. markup
-#: ../gui/gdmlogin.c:3827 ../gui/greeter/greeter.c:1341
+#: ../gui/gdmlogin.c:3828 ../gui/greeter/greeter.c:1341
 msgid "Session directory is missing"
 msgstr "Session directory is missing"
 
-#: ../gui/gdmlogin.c:3829 ../gui/greeter/greeter.c:1343
+#: ../gui/gdmlogin.c:3830 ../gui/greeter/greeter.c:1343
 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 "
@@ -3094,11 +3092,11 @@ msgstr ""
 "configuration."
 
 #. markup
-#: ../gui/gdmlogin.c:3853 ../gui/greeter/greeter.c:1368
+#: ../gui/gdmlogin.c:3854 ../gui/greeter/greeter.c:1368
 msgid "Configuration is not correct"
 msgstr "Configuration is not correct"
 
-#: ../gui/gdmlogin.c:3855 ../gui/greeter/greeter.c:1370
+#: ../gui/gdmlogin.c:3856 ../gui/greeter/greeter.c:1370
 msgid ""
 "The configuration file contains an invalid command line for the login "
 "dialog, and thus I ran the default command.  Please fix your configuration."
@@ -3107,11 +3105,11 @@ msgstr ""
 "dialogue, and thus I ran the default command.  Please fix your configuration."
 
 #. markup
-#: ../gui/gdmlogin.c:3880 ../gui/greeter/greeter.c:1397
+#: ../gui/gdmlogin.c:3881 ../gui/greeter/greeter.c:1397
 msgid "No configuration was found"
 msgstr "No configuration was found"
 
-#: ../gui/gdmlogin.c:3882 ../gui/greeter/greeter.c:1399
+#: ../gui/gdmlogin.c:3883 ../gui/greeter/greeter.c:1399
 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 "
@@ -3121,11 +3119,11 @@ msgstr ""
 "session.  You should log in and create a configuration file with the GDM "
 "configuration program."
 
-#: ../gui/gdmphotosetup.c:171
+#: ../gui/gdmphotosetup.c:180 ../gui/gdmsetup.c:1337 ../gui/gdmsetup.c:1880
 msgid "Open File"
 msgstr "Open File"
 
-#: ../gui/gdmphotosetup.c:189
+#: ../gui/gdmphotosetup.c:198 ../gui/gdmsetup.c:1352
 msgid "PNG and JPEG"
 msgstr "PNG and JPEG"
 
@@ -3181,50 +3179,41 @@ 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:29
+#: ../gui/gdmsetup.glade.h:35
 msgid "Login Screen Setup"
 msgstr "Login Screen Setup"
 
-#: ../gui/gdmsetup-strings.c:8 ../gui/gdmsetup.glade.h:24
+#: ../gui/gdmsetup-strings.c:8 ../gui/gdmsetup.glade.h:30
 msgid "Greeter"
 msgstr "Greeter"
 
-#: ../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:78
-#: ../gui/gdmsetup-strings.c:84 ../gui/gdmsetup-strings.c:86
-#: ../gui/gdmsetup-strings.c:92 ../gui/gdmsetup-strings.c:95
-#: ../gui/gdmsetup-strings.c:103 ../gui/gdmsetup.glade.h:1
+#: ../gui/gdmsetup-strings.c:9 ../gui/gdmsetup-strings.c:25
+#: ../gui/gdmsetup-strings.c:30 ../gui/gdmsetup-strings.c:37
+#: ../gui/gdmsetup-strings.c:41 ../gui/gdmsetup-strings.c:81
+#: ../gui/gdmsetup-strings.c:88 ../gui/gdmsetup-strings.c:90
+#: ../gui/gdmsetup-strings.c:96 ../gui/gdmsetup-strings.c:100
+#: ../gui/gdmsetup-strings.c:107 ../gui/gdmsetup.glade.h:1
 msgid "    "
 msgstr "    "
 
-#: ../gui/gdmsetup-strings.c:10 ../gui/gdmsetup.glade.h:27
+#: ../gui/gdmsetup-strings.c:10 ../gui/gdmsetup.glade.h:33
 msgid "L_ocal: "
 msgstr "L_ocal: "
 
-#: ../gui/gdmsetup-strings.c:11 ../gui/gdmsetup.glade.h:76
+#: ../gui/gdmsetup-strings.c:11 ../gui/gdmsetup.glade.h:86
 msgid "_Remote: "
 msgstr "_Remote: "
 
-#: ../gui/gdmsetup-strings.c:12 ../gui/gdmsetup.glade.h:82
+#: ../gui/gdmsetup-strings.c:12 ../gui/gdmsetup.glade.h:91
 msgid "_Welcome string: "
 msgstr "_Welcome string: "
 
-#: ../gui/gdmsetup-strings.c:13 ../gui/gdmsetup.glade.h:45
-msgid "Re_mote welcome string: "
-msgstr "Re_mote welcome string: "
-
-#: ../gui/gdmsetup-strings.c:14 ../gui/gdmsetup-strings.c:16
-#: ../gui/gdmsetup.c:1408 ../gui/gdmsetup.glade.h:23
-msgid "GTK+ Greeter"
-msgstr "GTK+ Greeter"
-
-#: ../gui/gdmsetup-strings.c:15 ../gui/gdmsetup-strings.c:17
-#: ../gui/gdmsetup.c:1410 ../gui/gdmsetup.glade.h:54
-msgid "Themed Greeter"
-msgstr "Themed Greeter"
+#: ../gui/gdmsetup-strings.c:13 ../gui/gdmsetup.glade.h:55
+#, no-c-format
+msgid "Re_mote welcome string (%n = hostname): "
+msgstr "Re_mote welcome string (%n = hostname): "
 
-#: ../gui/gdmsetup-strings.c:18 ../gui/gdmsetup.glade.h:51
+#: ../gui/gdmsetup-strings.c:14 ../gui/gdmsetup.glade.h:61
 #, no-c-format
 msgid ""
 "String to be shown in the greeter as welcome.  You can insert %n in here and "
@@ -3233,7 +3222,7 @@ 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."
 
-#: ../gui/gdmsetup-strings.c:20 ../gui/gdmsetup.glade.h:53
+#: ../gui/gdmsetup-strings.c:16 ../gui/gdmsetup.glade.h:63
 #, no-c-format
 msgid ""
 "String to be shown in the greeter for people logging in remotely with "
@@ -3244,103 +3233,133 @@ msgstr ""
 "XDMCP.  You can insert %n in here and it will be replaced by the name of "
 "your computer."
 
-#: ../gui/gdmsetup-strings.c:22 ../gui/gdmsetup.glade.h:11
+#: ../gui/gdmsetup-strings.c:18 ../gui/gdmsetup.glade.h:12
 msgid "Always use 24 hour cloc_k format"
 msgstr "Always use 24 hour cloc_k format"
 
-#: ../gui/gdmsetup-strings.c:23 ../gui/gdmsetup.glade.h:14
+#: ../gui/gdmsetup-strings.c:19 ../gui/gdmsetup-strings.c:21
+msgid "GTK+ Greeter"
+msgstr "GTK+ Greeter"
+
+#: ../gui/gdmsetup-strings.c:20 ../gui/gdmsetup-strings.c:22
+msgid "Themed Greeter"
+msgstr "Themed Greeter"
+
+#: ../gui/gdmsetup-strings.c:23
+msgid "Disabled"
+msgstr "Disabled"
+
+#: ../gui/gdmsetup-strings.c:24 ../gui/gdmsetup.glade.h:15
 msgid "Automatic Login"
 msgstr "Automatic Login"
 
-#: ../gui/gdmsetup-strings.c:25 ../gui/gdmsetup.glade.h:66
+#: ../gui/gdmsetup-strings.c:26 ../gui/gdmsetup.glade.h:76
 msgid "_Automatic login username:"
 msgstr "_Automatic login username:"
 
-#: ../gui/gdmsetup-strings.c:27 ../gui/gdmsetup.glade.h:73
+#: ../gui/gdmsetup-strings.c:27 ../gui/gdmsetup.glade.h:83
 msgid "_Login a user automatically on first bootup"
 msgstr "_Log in a user automatically on first bootup"
 
-#: ../gui/gdmsetup-strings.c:28 ../gui/gdmsetup.glade.h:55
+#: ../gui/gdmsetup-strings.c:28 ../gui/gdmsetup-strings.c:34
+#: ../gui/gdmsetup.glade.h:96
+msgid "dummy"
+msgstr "dummy"
+
+#: ../gui/gdmsetup-strings.c:29 ../gui/gdmsetup.glade.h:65
 msgid "Timed Login"
 msgstr "Timed Login"
 
-#: ../gui/gdmsetup-strings.c:30 ../gui/gdmsetup.glade.h:81
+#: ../gui/gdmsetup-strings.c:31 ../gui/gdmsetup.glade.h:90
 msgid "_Timed login username:"
 msgstr "_Timed login username:"
 
-#: ../gui/gdmsetup-strings.c:31 ../gui/gdmsetup.glade.h:78
+#: ../gui/gdmsetup-strings.c:32 ../gui/gdmsetup.glade.h:88
 msgid "_Seconds before login:"
 msgstr "_Seconds before login:"
 
-#: ../gui/gdmsetup-strings.c:33 ../gui/gdmsetup.glade.h:30
+#: ../gui/gdmsetup-strings.c:33 ../gui/gdmsetup.glade.h:36
 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-strings.c:34 ../gui/gdmsetup.glade.h:58
+#: ../gui/gdmsetup-strings.c:35 ../gui/gdmsetup.glade.h:68
 msgid "_1 General"
 msgstr "_1 General"
 
-#: ../gui/gdmsetup-strings.c:35 ../gui/gdmsetup.glade.h:31
+#: ../gui/gdmsetup-strings.c:36 ../gui/gdmsetup.glade.h:37
 msgid "Logo"
 msgstr "Logo"
 
-#: ../gui/gdmsetup-strings.c:38 ../gui/gdmsetup.glade.h:15
+#: ../gui/gdmsetup-strings.c:38 ../gui/gdmsetup-strings.c:46
+#: ../gui/gdmsetup-strings.c:102 ../gui/gdmsetup.glade.h:17
+msgid "Browse"
+msgstr "Browse"
+
+#: ../gui/gdmsetup-strings.c:39 ../gui/gdmsetup.glade.h:45
+msgid "No Logo"
+msgstr "No Logo"
+
+#: ../gui/gdmsetup-strings.c:40 ../gui/gdmsetup.glade.h:16
 msgid "Background"
 msgstr "Background"
 
-#: ../gui/gdmsetup-strings.c:40 ../gui/gdmsetup.glade.h:74
+#: ../gui/gdmsetup-strings.c:42 ../gui/gdmsetup.glade.h:84
 msgid "_No background"
 msgstr "_No background"
 
-#: ../gui/gdmsetup-strings.c:41 ../gui/gdmsetup.glade.h:70
+#: ../gui/gdmsetup-strings.c:43 ../gui/gdmsetup.glade.h:80
 msgid "_Image"
 msgstr "_Image"
 
-#: ../gui/gdmsetup-strings.c:42 ../gui/gdmsetup.glade.h:68
+#: ../gui/gdmsetup-strings.c:44 ../gui/gdmsetup.glade.h:78
 msgid "_Color"
 msgstr "_Colour"
 
-#: ../gui/gdmsetup-strings.c:43 ../gui/gdmsetup.glade.h:77
+#: ../gui/gdmsetup-strings.c:45 ../gui/gdmsetup.glade.h:87
 msgid "_Scale background image to fit"
 msgstr "_Scale background image to fit"
 
-#: ../gui/gdmsetup-strings.c:45 ../gui/gdmsetup.glade.h:75
+#: ../gui/gdmsetup-strings.c:47 ../gui/gdmsetup.glade.h:44
+msgid "No Background"
+msgstr "No Background"
+
+#: ../gui/gdmsetup-strings.c:48 ../gui/gdmsetup.glade.h:85
 msgid "_Only color on remote displays"
 msgstr "_Only colour on remote displays"
 
-#: ../gui/gdmsetup-strings.c:46 ../gui/gdmsetup.glade.h:67
+#: ../gui/gdmsetup-strings.c:49 ../gui/gdmsetup.glade.h:77
 msgid "_Background color: "
 msgstr "_Background colour: "
 
-#: ../gui/gdmsetup-strings.c:47 ../gui/gdmsetup.glade.h:41
+#: ../gui/gdmsetup-strings.c:50 ../gui/gdmsetup.glade.h:50
 msgid "Pick a color"
 msgstr "Pick a colour"
 
-#: ../gui/gdmsetup-strings.c:48 ../gui/gdmsetup.glade.h:59
+#: ../gui/gdmsetup-strings.c:51 ../gui/gdmsetup.glade.h:69
 msgid "_2 GTK+ Greeter"
 msgstr "_2 GTK+ Greeter"
 
-#: ../gui/gdmsetup-strings.c:49 ../gui/gdmsetup.glade.h:44
+#: ../gui/gdmsetup-strings.c:52 ../gui/gdmsetup.glade.h:53
 msgid "Preview:"
 msgstr "Preview:"
 
-#: ../gui/gdmsetup-strings.c:50 ../gui/gdmsetup.glade.h:39
+#: ../gui/gdmsetup-strings.c:53 ../gui/gdmsetup.glade.h:48
 msgid "No screenshot available"
 msgstr "No screenshot available"
 
-#: ../gui/gdmsetup-strings.c:51 ../gui/gdmsetup.glade.h:18
+#: ../gui/gdmsetup-strings.c:54 ../gui/gdmsetup.glade.h:20
 msgid "Description:"
 msgstr "Description:"
 
-#: ../gui/gdmsetup-strings.c:52 ../gui/gdmsetup.glade.h:16
+#: ../gui/gdmsetup-strings.c:55 ../gui/gdmsetup.glade.h:18
 msgid "Copyright:"
 msgstr "Copyright:"
 
-#: ../gui/gdmsetup-strings.c:53 ../gui/gdmsetup.glade.h:13
+#: ../gui/gdmsetup-strings.c:56 ../gui/gdmsetup.glade.h:14
 msgid "Author:"
 msgstr "Author:"
 
-#: ../gui/gdmsetup-strings.c:54 ../gui/gdmsetup.glade.h:86
+#: ../gui/gdmsetup-strings.c:57 ../gui/gdmsetup.glade.h:94
 msgid ""
 "description\n"
 "widget"
@@ -3348,89 +3367,93 @@ msgstr ""
 "description\n"
 "widget"
 
-#: ../gui/gdmsetup-strings.c:56 ../gui/gdmsetup.glade.h:84
+#: ../gui/gdmsetup-strings.c:59 ../gui/gdmsetup.glade.h:92
 msgid "author"
 msgstr "author"
 
-#: ../gui/gdmsetup-strings.c:57 ../gui/gdmsetup.glade.h:85
+#: ../gui/gdmsetup-strings.c:60 ../gui/gdmsetup.glade.h:93
 msgid "copyright"
 msgstr "copyright"
 
-#: ../gui/gdmsetup-strings.c:58 ../gui/gdmsetup.glade.h:72
+#: ../gui/gdmsetup-strings.c:61 ../gui/gdmsetup.glade.h:82
 msgid "_Install new theme"
 msgstr "_Install new theme"
 
-#: ../gui/gdmsetup-strings.c:59 ../gui/gdmsetup.glade.h:69
+#: ../gui/gdmsetup-strings.c:62 ../gui/gdmsetup.glade.h:79
 msgid "_Delete theme"
 msgstr "_Delete theme"
 
-#: ../gui/gdmsetup-strings.c:60 ../gui/gdmsetup.glade.h:60
+#: ../gui/gdmsetup-strings.c:63 ../gui/gdmsetup.glade.h:70
 msgid "_3 Themed Greeter"
 msgstr "_3 Themed Greeter"
 
-#: ../gui/gdmsetup-strings.c:61 ../gui/gdmsetup.glade.h:79
+#: ../gui/gdmsetup-strings.c:64 ../gui/gdmsetup.glade.h:89
 msgid "_Show choosable user images (Face Browser)"
 msgstr "_Show choosable user images (Face Browser)"
 
-#: ../gui/gdmsetup-strings.c:62 ../gui/gdmsetup.glade.h:71
+#: ../gui/gdmsetup-strings.c:65 ../gui/gdmsetup.glade.h:81
 msgid "_Include All Users"
 msgstr "_Include All Users"
 
-#: ../gui/gdmsetup-strings.c:63 ../gui/gdmsetup.glade.h:26
+#: ../gui/gdmsetup-strings.c:66 ../gui/gdmsetup.glade.h:32
 msgid "Include"
 msgstr "Include"
 
-#: ../gui/gdmsetup-strings.c:64 ../gui/gdmsetup.glade.h:56
+#: ../gui/gdmsetup-strings.c:67 ../gui/gdmsetup.glade.h:66
 msgid "User to Include"
 msgstr "User to Include"
 
-#: ../gui/gdmsetup-strings.c:67 ../gui/gdmsetup-strings.c:74
-#: ../gui/gdmsetup.glade.h:17
+#: ../gui/gdmsetup-strings.c:70 ../gui/gdmsetup-strings.c:77
+#: ../gui/gdmsetup.glade.h:19
 msgid "Delete"
 msgstr "Delete"
 
-#: ../gui/gdmsetup-strings.c:68 ../gui/gdmsetup.glade.h:3
+#: ../gui/gdmsetup-strings.c:71 ../gui/gdmsetup.glade.h:3
 msgid "<"
 msgstr "<"
 
-#: ../gui/gdmsetup-strings.c:69 ../gui/gdmsetup.glade.h:4
+#: ../gui/gdmsetup-strings.c:72 ../gui/gdmsetup.glade.h:4
 msgid ">"
 msgstr ">"
 
-#: ../gui/gdmsetup-strings.c:70 ../gui/gdmsetup.glade.h:22
+#: ../gui/gdmsetup-strings.c:73 ../gui/gdmsetup.glade.h:24
 msgid "Exclude"
 msgstr "Exclude"
 
-#: ../gui/gdmsetup-strings.c:71 ../gui/gdmsetup.glade.h:57
+#: ../gui/gdmsetup-strings.c:74 ../gui/gdmsetup.glade.h:67
 msgid "User to exclude"
 msgstr "User to exclude"
 
-#: ../gui/gdmsetup-strings.c:75 ../gui/gdmsetup.glade.h:12
+#: ../gui/gdmsetup-strings.c:78 ../gui/gdmsetup.glade.h:13
 msgid "Apply"
 msgstr "Apply"
 
-#: ../gui/gdmsetup-strings.c:76 ../gui/gdmsetup.glade.h:61
+#: ../gui/gdmsetup-strings.c:79 ../gui/gdmsetup.glade.h:71
 msgid "_4 Face Browser"
 msgstr "_4 Face Browser"
 
-#: ../gui/gdmsetup-strings.c:77 ../gui/gdmsetup-strings.c:91
-#: ../gui/gdmsetup.glade.h:40
+#: ../gui/gdmsetup-strings.c:80 ../gui/gdmsetup-strings.c:95
+#: ../gui/gdmsetup.glade.h:49
 msgid "Options"
 msgstr "Options"
 
-#: ../gui/gdmsetup-strings.c:79 ../gui/gdmsetup.glade.h:6
+#: ../gui/gdmsetup-strings.c:82 ../gui/gdmsetup.glade.h:22
+msgid "Enable _XDMCP"
+msgstr "Enable _XDMCP"
+
+#: ../gui/gdmsetup-strings.c:83 ../gui/gdmsetup.glade.h:6
 msgid "Allow _root to login with GDM"
 msgstr "Allow _root to login with GDM"
 
-#: ../gui/gdmsetup-strings.c:80 ../gui/gdmsetup.glade.h:8
+#: ../gui/gdmsetup-strings.c:84 ../gui/gdmsetup.glade.h:8
 msgid "Allow root to login r_emotely with GDM"
 msgstr "Allow root to login r_emotely with GDM"
 
-#: ../gui/gdmsetup-strings.c:81 ../gui/gdmsetup.glade.h:7
+#: ../gui/gdmsetup-strings.c:85 ../gui/gdmsetup.glade.h:7
 msgid "Allow remote _timed logins"
 msgstr "Allow remote _timed logins"
 
-#: ../gui/gdmsetup-strings.c:82 ../gui/gdmsetup.glade.h:48
+#: ../gui/gdmsetup-strings.c:86 ../gui/gdmsetup.glade.h:58
 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, "
@@ -3440,59 +3463,62 @@ msgstr ""
 "set, none of the system commands will be available (this includes reboot, "
 "shutdown, configure, chooser)"
 
-#: ../gui/gdmsetup-strings.c:83 ../gui/gdmsetup.glade.h:47
+#: ../gui/gdmsetup-strings.c:87 ../gui/gdmsetup.glade.h:57
 msgid "Show _actions menu"
 msgstr "Show _actions menu"
 
-#: ../gui/gdmsetup-strings.c:85 ../gui/gdmsetup.glade.h:5
+#: ../gui/gdmsetup-strings.c:89 ../gui/gdmsetup.glade.h:5
 msgid "Allow _configuration from the login screen"
 msgstr "Allow _configuration from the login screen"
 
-#: ../gui/gdmsetup-strings.c:87 ../gui/gdmsetup.glade.h:9
+#: ../gui/gdmsetup-strings.c:91 ../gui/gdmsetup.glade.h:9
 msgid "Allow running _XDMCP chooser from the login screen"
 msgstr "Allow _XDMCP chooser to be run from the login screen"
 
-#: ../gui/gdmsetup-strings.c:88 ../gui/gdmsetup.glade.h:10
+#: ../gui/gdmsetup-strings.c:92 ../gui/gdmsetup.glade.h:11
 msgid ""
 "Always _disallow TCP connections to X server (disables all remote "
 "connections)"
 msgstr ""
-"Always _deny TCP connections to X server (disables all remote "
-"connections)"
+"Always _deny TCP connections to X server (disables all remote connections)"
 
-#: ../gui/gdmsetup-strings.c:89 ../gui/gdmsetup.glade.h:46
+#: ../gui/gdmsetup-strings.c:93 ../gui/gdmsetup.glade.h:56
 msgid "Retry _delay (seconds) :"
 msgstr "Retry _delay (seconds) :"
 
-#: ../gui/gdmsetup-strings.c:90 ../gui/gdmsetup.glade.h:62
+#: ../gui/gdmsetup-strings.c:94 ../gui/gdmsetup.glade.h:72
 msgid "_5 Security"
 msgstr "_5 Security"
 
-#: ../gui/gdmsetup-strings.c:93 ../gui/gdmsetup.glade.h:21
+#: ../gui/gdmsetup-strings.c:97 ../gui/gdmsetup.glade.h:23
 msgid "Enable _accessibility modules"
 msgstr "Enable _accessibility modules"
 
-#: ../gui/gdmsetup-strings.c:94 ../gui/gdmsetup.glade.h:32
+#: ../gui/gdmsetup-strings.c:98 ../gui/gdmsetup.glade.h:10
+msgid "Allow theme selection in _GTK+ Greeter."
+msgstr "Allow theme selection in _GTK+ Greeter."
+
+#: ../gui/gdmsetup-strings.c:99 ../gui/gdmsetup.glade.h:38
 msgid "Make a _sound when login window is ready"
 msgstr "Make a _sound when login window is ready"
 
-#: ../gui/gdmsetup-strings.c:96 ../gui/gdmsetup.glade.h:83
-msgid "acc_sound_file_box"
-msgstr "acc_sound_file_box"
+#: ../gui/gdmsetup-strings.c:101 ../gui/gdmsetup.glade.h:59
+msgid "Sound file:"
+msgstr "Sound file:"
 
-#: ../gui/gdmsetup-strings.c:97 ../gui/gdmsetup.glade.h:49
-msgid "Sound _file:"
-msgstr "Sound _file:"
+#: ../gui/gdmsetup-strings.c:103 ../gui/gdmsetup.glade.h:46
+msgid "No Sound"
+msgstr "No Sound"
 
-#: ../gui/gdmsetup-strings.c:99 ../gui/gdmsetup.glade.h:80
-msgid "_Test sound"
-msgstr "_Test sound"
+#: ../gui/gdmsetup-strings.c:104 ../gui/gdmsetup.glade.h:64
+msgid "Test Sound"
+msgstr "Test Sound"
 
-#: ../gui/gdmsetup-strings.c:100 ../gui/gdmsetup.glade.h:63
+#: ../gui/gdmsetup-strings.c:105 ../gui/gdmsetup.glade.h:73
 msgid "_6 Accessibility"
 msgstr "_6 Accessibility"
 
-#: ../gui/gdmsetup-strings.c:101 ../gui/gdmsetup.glade.h:38
+#: ../gui/gdmsetup-strings.c:106 ../gui/gdmsetup.glade.h:47
 msgid ""
 "No XDMCP support in the binary.  To enable XDMCP support you must recompile "
 "GDM with the XDMCP libraries."
@@ -3500,56 +3526,52 @@ msgstr ""
 "No XDMCP support in the binary.  To enable XDMCP support you must recompile "
 "GDM with the XDMCP libraries."
 
-#: ../gui/gdmsetup-strings.c:102 ../gui/gdmsetup.glade.h:20
-msgid "Enable _XDMCP"
-msgstr "Enable _XDMCP"
-
-#: ../gui/gdmsetup-strings.c:104 ../gui/gdmsetup.glade.h:25
+#: ../gui/gdmsetup-strings.c:108 ../gui/gdmsetup.glade.h:31
 msgid "Honour _indirect requests"
 msgstr "Honour _indirect requests"
 
-#: ../gui/gdmsetup-strings.c:105 ../gui/gdmsetup.glade.h:28
+#: ../gui/gdmsetup-strings.c:109 ../gui/gdmsetup.glade.h:34
 msgid "Listen on _UDP port: "
 msgstr "Listen on _UDP port: "
 
-#: ../gui/gdmsetup-strings.c:106 ../gui/gdmsetup.glade.h:34
+#: ../gui/gdmsetup-strings.c:110 ../gui/gdmsetup.glade.h:40
 msgid "Maximum _pending requests:"
 msgstr "Maximum _pending requests:"
 
-#: ../gui/gdmsetup-strings.c:107 ../gui/gdmsetup.glade.h:33
+#: ../gui/gdmsetup-strings.c:111 ../gui/gdmsetup.glade.h:39
 msgid "Max p_ending indirect requests:"
 msgstr "Max p_ending indirect requests:"
 
-#: ../gui/gdmsetup-strings.c:108 ../gui/gdmsetup.glade.h:35
+#: ../gui/gdmsetup-strings.c:112 ../gui/gdmsetup.glade.h:41
 msgid "Maximum _remote sessions:"
 msgstr "Maximum _remote sessions:"
 
-#: ../gui/gdmsetup-strings.c:109 ../gui/gdmsetup.glade.h:36
+#: ../gui/gdmsetup-strings.c:113 ../gui/gdmsetup.glade.h:42
 msgid "Maximum _wait time:"
 msgstr "Maximum _wait time:"
 
-#: ../gui/gdmsetup-strings.c:110 ../gui/gdmsetup.glade.h:37
+#: ../gui/gdmsetup-strings.c:114 ../gui/gdmsetup.glade.h:43
 msgid "Maximum indirect w_ait time:"
 msgstr "Maximum indirect w_ait time:"
 
-#: ../gui/gdmsetup-strings.c:111 ../gui/gdmsetup.glade.h:19
+#: ../gui/gdmsetup-strings.c:115 ../gui/gdmsetup.glade.h:21
 msgid "Displays per _host:"
 msgstr "Displays per _host:"
 
-#: ../gui/gdmsetup-strings.c:112 ../gui/gdmsetup.glade.h:42
+#: ../gui/gdmsetup-strings.c:116 ../gui/gdmsetup.glade.h:51
 msgid "Pin_g interval (seconds):"
 msgstr "Pin_g interval (seconds):"
 
-#: ../gui/gdmsetup-strings.c:113 ../gui/gdmsetup.glade.h:43
+#: ../gui/gdmsetup-strings.c:117 ../gui/gdmsetup.glade.h:52
 msgid "Ping interval (seconds):"
 msgstr "Ping interval (seconds):"
 
-#: ../gui/gdmsetup-strings.c:114 ../gui/gdmsetup.glade.h:64
+#: ../gui/gdmsetup-strings.c:118 ../gui/gdmsetup.glade.h:74
 msgid "_7 XDMCP"
 msgstr "_7 XDMCP"
 
 #. markup
-#: ../gui/gdmsetup.c:191
+#: ../gui/gdmsetup.c:194
 msgid ""
 "An error occurred while trying to contact the login screens.  Not all "
 "updates may have taken effect."
@@ -3558,50 +3580,58 @@ msgstr ""
 "updates may have taken effect."
 
 #. markup
-#: ../gui/gdmsetup.c:514
+#: ../gui/gdmsetup.c:572
 msgid ""
 "Autologin or timed login to the superuser (root) account is not allowed."
 msgstr ""
 "Autologin or timed login to the superuser (root) account is not allowed."
 
-#: ../gui/gdmsetup.c:2181
+#: ../gui/gdmsetup.c:1779 ../gui/gdmsetup.c:1809 ../gui/gdmsetup.c:1936
+msgid "None"
+msgstr "None"
+
+#: ../gui/gdmsetup.c:1888
+msgid "All files"
+msgstr "All files"
+
+#: ../gui/gdmsetup.c:2471
 msgid "Archive is not of a subdirectory"
 msgstr "Archive is not of a subdirectory"
 
-#: ../gui/gdmsetup.c:2189
+#: ../gui/gdmsetup.c:2479
 msgid "Archive is not of a single subdirectory"
 msgstr "Archive is not of a single subdirectory"
 
-#: ../gui/gdmsetup.c:2213 ../gui/gdmsetup.c:2293
+#: ../gui/gdmsetup.c:2503 ../gui/gdmsetup.c:2583
 msgid "File not a tar.gz or tar archive"
 msgstr "File not a tar.gz or tar archive"
 
-#: ../gui/gdmsetup.c:2215
+#: ../gui/gdmsetup.c:2505
 msgid "Archive does not include a GdmGreeterTheme.info file"
 msgstr "Archive does not include a GdmGreeterTheme.info file"
 
-#: ../gui/gdmsetup.c:2237
+#: ../gui/gdmsetup.c:2527
 msgid "File does not exist"
 msgstr "File does not exist"
 
 #. markup
-#: ../gui/gdmsetup.c:2351
+#: ../gui/gdmsetup.c:2641
 msgid "No file selected"
 msgstr "No file selected"
 
 #. markup
-#: ../gui/gdmsetup.c:2379
+#: ../gui/gdmsetup.c:2669
 msgid "Not a theme archive"
 msgstr "Not a theme archive"
 
-#: ../gui/gdmsetup.c:2380
+#: ../gui/gdmsetup.c:2670
 #, c-format
 msgid "Details: %s"
 msgstr "Details: %s"
 
 #. FIXME: if exists already perhaps we could also have an
 #. * option to change the dir name
-#: ../gui/gdmsetup.c:2398
+#: ../gui/gdmsetup.c:2688
 #, c-format
 msgid ""
 "Theme directory '%s' seems to be already installed. Install again anyway?"
@@ -3609,29 +3639,29 @@ msgstr ""
 "Theme directory '%s' seems to be installed already. Install again anyway?"
 
 #. markup
-#: ../gui/gdmsetup.c:2484
+#: ../gui/gdmsetup.c:2774
 msgid "Some error occurred when installing the theme"
 msgstr "An error occurred when installing the theme"
 
-#: ../gui/gdmsetup.c:2530
+#: ../gui/gdmsetup.c:2814
 msgid "Select new theme archive to install"
 msgstr "Select new theme archive to install"
 
-#: ../gui/gdmsetup.c:2534
+#: ../gui/gdmsetup.c:2818
 msgid "_Install"
 msgstr "_Install"
 
-#: ../gui/gdmsetup.c:2598
+#: ../gui/gdmsetup.c:2882
 #, 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?"
 
-#: ../gui/gdmsetup.c:2616
+#: ../gui/gdmsetup.c:2900
 msgid "_Remove Theme"
 msgstr "_Remove Theme"
 
 #. This is the temporary help dialog
-#: ../gui/gdmsetup.c:2811
+#: ../gui/gdmsetup.c:3095
 #, c-format
 msgid ""
 "This configuration window changes settings for the GDM daemon, which is the "
@@ -3655,14 +3685,32 @@ msgstr ""
 "GNOME/System."
 
 #. markup
-#: ../gui/gdmsetup.c:3226
+#: ../gui/gdmsetup.c:3507
 msgid "You must be the superuser (root) to configure GDM."
 msgstr "You must be the superuser (root) to configure GDM."
 
 #. EOF
 #: ../gui/gdmsetup.desktop.in.h:1
-msgid "Configure the login screen (Gnome Display Manager)"
-msgstr "Configure the login screen (Gnome Display Manager)"
+msgid "Configure the login screen (GNOME Display Manager)"
+msgstr "Configure the login screen (GNOME Display Manager)"
+
+#: ../gui/gdmsetup.glade.h:25
+msgid ""
+"GTK+ Greeter\n"
+"Themed Greeter"
+msgstr ""
+"GTK+ Greeter\n"
+"Themed Greeter"
+
+#: ../gui/gdmsetup.glade.h:27
+msgid ""
+"GTK+ Greeter\n"
+"Themed Greeter\n"
+"Disabled"
+msgstr ""
+"GTK+ Greeter\n"
+"Themed Greeter\n"
+"Disabled"
 
 #: ../gui/greeter/greeter.c:670 ../gui/greeter/greeter.c:702
 #, c-format
@@ -3787,6 +3835,14 @@ msgstr "_Cancel"
 msgid "Choose a Session"
 msgstr "Choose a Session"
 
+#: ../gui/greeter/greeter_session.c:264
+msgid "Failsafe Gnome"
+msgstr "Failsafe Gnome"
+
+#: ../gui/greeter/greeter_session.c:449
+msgid "Failsafe _Gnome"
+msgstr "Failsafe _Gnome"
+
 #: ../gui/greeter/greeter_system.c:260
 msgid "Choose an Action"
 msgstr "Choose an Action"