Updated Canadian English translation.

2006-01-19  Adam Weinberger  <adamw@gnome.org>

	* en_CA.po: Updated Canadian English translation.

2 files changed, 184 insertions, 175 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 08f1824c..d2ee8128 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2006-01-19  Adam Weinberger  <adamw@gnome.org>
+
+	* en_CA.po: Updated Canadian English translation.
+
 2006-01-19  Clytie Siddall <clytie@riverland.net.au>
 
 	* vi.po: Updated Vietnamese translation.
diff --git a/po/en_CA.po b/po/en_CA.po
index be34a4d9..c63f4f2f 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: 2006-01-15 23:19-0500\n"
+"POT-Creation-Date: 2006-01-19 23:35-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"
@@ -129,18 +129,18 @@ msgstr "GNOME"
 msgid "This session logs you into GNOME"
 msgstr "This session logs you into GNOME"
 
-#: ../daemon/auth.c:56
+#: ../daemon/auth.c:57
 #, c-format
 msgid "%s: Could not write new authorization entry: %s"
 msgstr "%s: Could not write new authorization entry: %s"
 
-#: ../daemon/auth.c:59
+#: ../daemon/auth.c:60
 #, c-format
 msgid "%s: Could not write new authorization entry.  Possibly out of diskspace"
 msgstr ""
 "%s: Could not write new authorization entry.  Possibly out of diskspace"
 
-#: ../daemon/auth.c:64
+#: ../daemon/auth.c:65
 #, c-format
 msgid ""
 "GDM could not write a new authorization entry to disk.  Possibly out of "
@@ -149,38 +149,38 @@ msgstr ""
 "GDM could not write a new authorization entry to disk.  Possibly out of "
 "diskspace.%s%s"
 
-#: ../daemon/auth.c:194
+#: ../daemon/auth.c:195
 #, c-format
 msgid "%s: Could not make new cookie file in %s"
 msgstr "%s: Could not make new cookie file in %s"
 
-#: ../daemon/auth.c:218 ../daemon/auth.c:235 ../daemon/auth.c:875
+#: ../daemon/auth.c:219 ../daemon/auth.c:236 ../daemon/auth.c:876
 #, c-format
 msgid "%s: Cannot safely open %s"
 msgstr "%s: Cannot safely open %s"
 
 #. Really no need to clean up here - this process is a goner anyway
-#: ../daemon/auth.c:674 ../daemon/auth.c:716
+#: ../daemon/auth.c:675 ../daemon/auth.c:717
 #, c-format
 msgid "%s: Could not open cookie file %s"
 msgstr "%s: Could not open cookie file %s"
 
-#: ../daemon/auth.c:695
+#: ../daemon/auth.c:696
 #, c-format
 msgid "%s: Could not lock cookie file %s"
 msgstr "%s: Could not lock cookie file %s"
 
-#: ../daemon/auth.c:745 ../daemon/auth.c:767
+#: ../daemon/auth.c:746 ../daemon/auth.c:768
 #, c-format
 msgid "%s: Could not write cookie"
 msgstr "%s: Could not write cookie"
 
-#: ../daemon/auth.c:851
+#: ../daemon/auth.c:852
 #, c-format
 msgid "%s: Ignoring suspiciously looking cookie file %s"
 msgstr "%s: Ignoring suspiciously looking cookie file %s"
 
-#: ../daemon/auth.c:894 ../daemon/gdm.c:1361 ../daemon/gdm.c:1725
+#: ../daemon/auth.c:895 ../daemon/gdm.c:1361 ../daemon/gdm.c:1725
 #, c-format
 msgid "Can't write to %s: %s"
 msgstr "Can't write to %s: %s"
@@ -195,7 +195,7 @@ msgstr "Can't write to %s: %s"
 #. * that should give people ample time to stop gdm if needed,
 #. * or just wait for the stupid malicious user to get bored
 #. * and go away
-#: ../daemon/display.c:110
+#: ../daemon/display.c:111
 #, c-format
 msgid ""
 "The display server has been shut down about 6 times in the last 90 seconds. "
@@ -206,22 +206,22 @@ msgstr ""
 "It is likely that something bad is going on.  Waiting for 2 minutes before "
 "trying again on display %s."
 
-#: ../daemon/display.c:254
+#: ../daemon/display.c:255
 #, c-format
 msgid "%s: Cannot create pipe"
 msgstr "%s: Cannot create pipe"
 
-#: ../daemon/display.c:330
+#: ../daemon/display.c:331
 #, c-format
 msgid "%s: Failed forking GDM slave process for %s"
 msgstr "%s: Failed forking GDM slave process for %s"
 
-#: ../daemon/errorgui.c:347
+#: ../daemon/errorgui.c:348
 #, c-format
 msgid "%s not a regular file!\n"
 msgstr "%s not a regular file!\n"
 
-#: ../daemon/errorgui.c:364
+#: ../daemon/errorgui.c:365
 msgid ""
 "\n"
 "... File too long to display ...\n"
@@ -229,54 +229,54 @@ msgstr ""
 "\n"
 "... File too long to display ...\n"
 
-#: ../daemon/errorgui.c:373
+#: ../daemon/errorgui.c:374
 #, c-format
 msgid "%s could not be opened"
 msgstr "%s could not be opened"
 
-#: ../daemon/errorgui.c:487 ../daemon/errorgui.c:631 ../daemon/errorgui.c:742
-#: ../daemon/errorgui.c:863
+#: ../daemon/errorgui.c:488 ../daemon/errorgui.c:632 ../daemon/errorgui.c:743
+#: ../daemon/errorgui.c:864
 #, c-format
 msgid "%s: Cannot fork to display error/info box"
 msgstr "%s: Cannot fork to display error/info box"
 
-#: ../daemon/filecheck.c:60
+#: ../daemon/filecheck.c:61
 #, c-format
 msgid "%s: Directory %s does not exist."
 msgstr "%s: Directory %s does not exist."
 
-#: ../daemon/filecheck.c:72 ../daemon/filecheck.c:114
-#: ../daemon/filecheck.c:177
+#: ../daemon/filecheck.c:73 ../daemon/filecheck.c:115
+#: ../daemon/filecheck.c:178
 #, c-format
 msgid "%s: %s is not owned by uid %d."
 msgstr "%s: %s is not owned by uid %d."
 
-#: ../daemon/filecheck.c:78 ../daemon/filecheck.c:121
+#: ../daemon/filecheck.c:79 ../daemon/filecheck.c:122
 #, c-format
 msgid "%s: %s is writable by group."
 msgstr "%s: %s is writable by group."
 
-#: ../daemon/filecheck.c:84
+#: ../daemon/filecheck.c:85
 #, c-format
 msgid "%s: %s is writable by other."
 msgstr "%s: %s is writable by other."
 
-#: ../daemon/filecheck.c:99 ../daemon/filecheck.c:165
+#: ../daemon/filecheck.c:100 ../daemon/filecheck.c:166
 #, c-format
 msgid "%s: %s does not exist but must exist."
 msgstr "%s: %s does not exist but must exist."
 
-#: ../daemon/filecheck.c:107 ../daemon/filecheck.c:171
+#: ../daemon/filecheck.c:108 ../daemon/filecheck.c:172
 #, c-format
 msgid "%s: %s is not a regular file."
 msgstr "%s: %s is not a regular file."
 
-#: ../daemon/filecheck.c:128
+#: ../daemon/filecheck.c:129
 #, c-format
 msgid "%s: %s is writable by group/other."
 msgstr "%s: %s is writable by group/other."
 
-#: ../daemon/filecheck.c:135 ../daemon/filecheck.c:190
+#: ../daemon/filecheck.c:136 ../daemon/filecheck.c:191
 #, c-format
 msgid "%s: %s is bigger than sysadmin specified maximum file size."
 msgstr "%s: %s is bigger than sysadmin specified maximum file size."
@@ -365,8 +365,8 @@ msgstr "Master suspending..."
 
 #: ../daemon/gdm.c:622
 #, c-format
-msgid "System is rebooting, please wait ..."
-msgstr "System is rebooting, please wait ..."
+msgid "System is restarting, please wait ..."
+msgstr "System is restarting, please wait ..."
 
 #: ../daemon/gdm.c:624
 #, c-format
@@ -383,23 +383,31 @@ msgid "%s: Halt failed: %s"
 msgstr "%s: Halt failed: %s"
 
 #: ../daemon/gdm.c:657
-msgid "Master rebooting..."
-msgstr "Master rebooting..."
+msgid "Restarting computer..."
+msgstr "Restarting computer..."
 
 #: ../daemon/gdm.c:670
 #, c-format
-msgid "%s: Reboot failed: %s"
-msgstr "%s: Reboot failed: %s"
+msgid "%s: Restart failed: %s"
+msgstr "%s: Restart failed: %s"
 
 #: ../daemon/gdm.c:771
 #, c-format
-msgid "Reboot or Halt request when there is no system menu from display %s"
-msgstr "Reboot or Halt request when there is no system menu from display %s"
+msgid ""
+"Restart GDM, Restart machine, Suspend, or Halt request when there is no "
+"system menu from display %s"
+msgstr ""
+"Restart GDM, Restart machine, Suspend, or Halt request when there is no "
+"system menu from display %s"
 
 #: ../daemon/gdm.c:780
 #, c-format
-msgid "Restart, Reboot or Halt request from a non-static display %s"
-msgstr "Restart, Reboot or Halt request from a non-static display %s"
+msgid ""
+"Restart GDM, Restart machine, Suspend or Halt request from a non-static "
+"display %s"
+msgstr ""
+"Restart GDM, Restart machine, Suspend or Halt request from a non-static "
+"display %s"
 
 #. Bury this display for good
 #: ../daemon/gdm.c:846
@@ -472,7 +480,7 @@ msgstr "Only root wants to run GDM\n"
 #: ../daemon/gdm.c:1555 ../daemon/gdm.c:1561 ../daemon/gdm.c:1572
 #: ../daemon/misc.c:1771 ../daemon/misc.c:1775 ../daemon/misc.c:1779
 #: ../daemon/misc.c:1786 ../daemon/misc.c:1790 ../daemon/misc.c:1794
-#: ../daemon/server.c:521 ../daemon/server.c:534 ../daemon/slave.c:780
+#: ../daemon/server.c:522 ../daemon/server.c:535 ../daemon/slave.c:780
 #: ../daemon/slave.c:794 ../daemon/slave.c:804 ../daemon/slave.c:814
 #: ../daemon/slave.c:826 ../gui/gdmchooser.c:1841 ../gui/gdmchooser.c:1844
 #: ../gui/gdmchooser.c:1847 ../gui/gdmlogin.c:3388 ../gui/gdmlogin.c:3398
@@ -775,11 +783,11 @@ msgstr ""
 "Last login:\n"
 "%s"
 
-#: ../daemon/server.c:150
+#: ../daemon/server.c:151
 msgid "Can not start fallback console"
 msgstr "Can not start fallback console"
 
-#: ../daemon/server.c:340
+#: ../daemon/server.c:341
 #, c-format
 msgid ""
 "There already appears to be an X server running on display %s.  Should "
@@ -790,7 +798,7 @@ msgstr ""
 "another display number by tried?  Answering no will cause GDM to attempt to "
 "start the server on %s again. %s"
 
-#: ../daemon/server.c:348
+#: ../daemon/server.c:349
 msgid ""
 "  (You can change consoles by pressing Ctrl-Alt plus a function key, such as "
 "Ctrl-Alt-F7 to go to console 7.  X servers usually run on consoles 7 and "
@@ -800,98 +808,98 @@ msgstr ""
 "Ctrl-Alt-F7 to go to console 7.  X servers usually run on consoles 7 and "
 "higher.)"
 
-#: ../daemon/server.c:394
+#: ../daemon/server.c:395
 #, c-format
 msgid "Display '%s' cannot be opened by Xnest"
 msgstr "Display '%s' cannot be opened by Xnest"
 
-#: ../daemon/server.c:425
+#: ../daemon/server.c:426
 #, c-format
 msgid "Display %s is busy. There is another X server running already."
 msgstr "Display %s is busy. There is another X server running already."
 
-#: ../daemon/server.c:509
+#: ../daemon/server.c:510
 #, c-format
 msgid "%s: Error opening a pipe: %s"
 msgstr "%s: Error opening a pipe: %s"
 
-#: ../daemon/server.c:697
+#: ../daemon/server.c:698
 #, c-format
 msgid "%s: failed to connect to parent display '%s'"
 msgstr "%s: failed to connect to parent display '%s'"
 
 #. Send X too busy
-#: ../daemon/server.c:837
+#: ../daemon/server.c:838
 #, c-format
 msgid "%s: Cannot find a free display number"
 msgstr "%s: Cannot find a free display number"
 
-#: ../daemon/server.c:864
+#: ../daemon/server.c:865
 #, c-format
 msgid "%s: Display %s busy.  Trying another display number."
 msgstr "%s: Display %s busy.  Trying another display number."
 
-#: ../daemon/server.c:975
+#: ../daemon/server.c:976
 #, c-format
 msgid "Invalid server command '%s'"
 msgstr "Invalid server command '%s'"
 
-#: ../daemon/server.c:980
+#: ../daemon/server.c:981
 #, c-format
 msgid "Server name '%s' not found; using standard server"
 msgstr "Server name '%s' not found; using standard server"
 
-#: ../daemon/server.c:1159
+#: ../daemon/server.c:1160
 #, c-format
 msgid "%s: Could not open logfile for display %s!"
 msgstr "%s: Could not open logfile for display %s!"
 
-#: ../daemon/server.c:1171 ../daemon/server.c:1177 ../daemon/server.c:1182
+#: ../daemon/server.c:1172 ../daemon/server.c:1178 ../daemon/server.c:1183
 #, c-format
 msgid "%s: Error setting %s to %s"
 msgstr "%s: Error setting %s to %s"
 
-#: ../daemon/server.c:1228
+#: ../daemon/server.c:1229
 #, c-format
 msgid "%s: Empty server command for display %s"
 msgstr "%s: Empty server command for display %s"
 
-#: ../daemon/server.c:1238
+#: ../daemon/server.c:1239
 #, c-format
 msgid "%s: Server priority couldn't be set to %d: %s"
 msgstr "%s: Server priority could not be set to %d: %s"
 
-#: ../daemon/server.c:1250
+#: ../daemon/server.c:1251
 #, c-format
 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:1265 ../daemon/slave.c:2450 ../daemon/slave.c:2921
+#: ../daemon/server.c:1266 ../daemon/slave.c:2450 ../daemon/slave.c:2921
 #, c-format
 msgid "%s: Couldn't set groupid to %d"
 msgstr "%s: Couldn't set groupid to %d"
 
-#: ../daemon/server.c:1271 ../daemon/slave.c:2456 ../daemon/slave.c:2927
+#: ../daemon/server.c:1272 ../daemon/slave.c:2456 ../daemon/slave.c:2927
 #, c-format
 msgid "%s: initgroups () failed for %s"
 msgstr "%s: initgroups () failed for %s"
 
-#: ../daemon/server.c:1277 ../daemon/slave.c:2461 ../daemon/slave.c:2932
+#: ../daemon/server.c:1278 ../daemon/slave.c:2461 ../daemon/slave.c:2932
 #, c-format
 msgid "%s: Couldn't set userid to %d"
 msgstr "%s: Couldn't set userid to %d"
 
-#: ../daemon/server.c:1284
+#: ../daemon/server.c:1285
 #, c-format
 msgid "%s: Couldn't set groupid to 0"
 msgstr "%s: Couldn't set groupid to 0"
 
-#: ../daemon/server.c:1311
+#: ../daemon/server.c:1312
 #, c-format
 msgid "%s: Xserver not found: %s"
 msgstr "%s: Xserver not found: %s"
 
-#: ../daemon/server.c:1319
+#: ../daemon/server.c:1320
 #, c-format
 msgid "%s: Can't fork Xserver process!"
 msgstr "%s: Can't fork Xserver process!"
@@ -1297,8 +1305,8 @@ msgid "View details (~/.xsession-errors file)"
 msgstr "View details (~/.xsession-errors file)"
 
 #: ../daemon/slave.c:4314
-msgid "GDM detected a halt or reboot in progress."
-msgstr "GDM detected a halt or reboot in progress."
+msgid "GDM detected a halt or restart in progress."
+msgstr "GDM detected a halt or restart in progress."
 
 #: ../daemon/slave.c:4408
 #, c-format
@@ -1338,8 +1346,8 @@ msgstr "%s: Failed creating pipe"
 msgid "%s: Failed executing: %s"
 msgstr "%s: Failed executing: %s"
 
-#: ../daemon/verify-crypt.c:67 ../daemon/verify-pam.c:1119
-#: ../daemon/verify-shadow.c:68
+#: ../daemon/verify-crypt.c:68 ../daemon/verify-pam.c:1119
+#: ../daemon/verify-shadow.c:69
 msgid ""
 "\n"
 "Incorrect username or password.  Letters must be typed in the correct case."
@@ -1347,58 +1355,58 @@ msgstr ""
 "\n"
 "Incorrect username or password.  Letters must be typed in the correct case."
 
-#: ../daemon/verify-crypt.c:72 ../daemon/verify-pam.c:1129
-#: ../daemon/verify-shadow.c:73 ../gui/greeter/greeter_parser.c:1101
+#: ../daemon/verify-crypt.c:73 ../daemon/verify-pam.c:1129
+#: ../daemon/verify-shadow.c:74 ../gui/greeter/greeter_parser.c:1101
 msgid "Caps Lock is on."
 msgstr "Caps Lock is on."
 
-#: ../daemon/verify-crypt.c:117 ../daemon/verify-pam.c:525
-#: ../daemon/verify-shadow.c:116 ../gui/gdmlogin.c:2773
+#: ../daemon/verify-crypt.c:118 ../daemon/verify-pam.c:525
+#: ../daemon/verify-shadow.c:117 ../gui/gdmlogin.c:2773
 msgid "Please enter your username"
 msgstr "Please enter your username"
 
 #. login: is whacked always translate to Username:
-#: ../daemon/verify-crypt.c:118 ../daemon/verify-pam.c:425
+#: ../daemon/verify-crypt.c:119 ../daemon/verify-pam.c:425
 #: ../daemon/verify-pam.c:426 ../daemon/verify-pam.c:427
 #: ../daemon/verify-pam.c:512 ../daemon/verify-pam.c:854
-#: ../daemon/verify-shadow.c:117 ../gui/gdmlogin.c:996 ../gui/gdmlogin.c:1010
+#: ../daemon/verify-shadow.c:118 ../gui/gdmlogin.c:996 ../gui/gdmlogin.c:1010
 #: ../gui/gdmlogin.c:1624 ../gui/gdmlogin.c:2104 ../gui/greeter/greeter.c:172
 #: ../gui/greeter/greeter_parser.c:1120
 msgid "Username:"
 msgstr "Username:"
 
-#: ../daemon/verify-crypt.c:156 ../daemon/verify-pam.c:428
+#: ../daemon/verify-crypt.c:157 ../daemon/verify-pam.c:428
 #: ../daemon/verify-pam.c:429 ../daemon/verify-pam.c:573
-#: ../daemon/verify-shadow.c:174 ../gui/gdmlogin.c:1659
+#: ../daemon/verify-shadow.c:175 ../gui/gdmlogin.c:1659
 #: ../gui/greeter/greeter.c:190
 msgid "Password:"
 msgstr "Password:"
 
-#: ../daemon/verify-crypt.c:174 ../daemon/verify-crypt.c:188
-#: ../daemon/verify-shadow.c:192 ../daemon/verify-shadow.c:206
+#: ../daemon/verify-crypt.c:175 ../daemon/verify-crypt.c:189
+#: ../daemon/verify-shadow.c:193 ../daemon/verify-shadow.c:207
 #, c-format
 msgid "Couldn't authenticate user \"%s\""
 msgstr "Couldn't authenticate user \"%s\""
 
-#: ../daemon/verify-crypt.c:201 ../daemon/verify-pam.c:965
-#: ../daemon/verify-shadow.c:219
+#: ../daemon/verify-crypt.c:202 ../daemon/verify-pam.c:965
+#: ../daemon/verify-shadow.c:220
 #, c-format
 msgid "Root login disallowed on display '%s'"
 msgstr "Root login disallowed on display '%s'"
 
-#: ../daemon/verify-crypt.c:203 ../daemon/verify-shadow.c:221
+#: ../daemon/verify-crypt.c:204 ../daemon/verify-shadow.c:222
 msgid "The system administrator is not allowed to login from this screen"
 msgstr "The system administrator is not allowed to login from this screen"
 
-#: ../daemon/verify-crypt.c:219 ../daemon/verify-crypt.c:243
-#: ../daemon/verify-shadow.c:237 ../daemon/verify-shadow.c:261
+#: ../daemon/verify-crypt.c:220 ../daemon/verify-crypt.c:244
+#: ../daemon/verify-shadow.c:238 ../daemon/verify-shadow.c:262
 #, c-format
 msgid "User %s not allowed to log in"
 msgstr "User %s not allowed to log in"
 
-#: ../daemon/verify-crypt.c:221 ../daemon/verify-crypt.c:245
+#: ../daemon/verify-crypt.c:222 ../daemon/verify-crypt.c:246
 #: ../daemon/verify-pam.c:1011 ../daemon/verify-pam.c:1292
-#: ../daemon/verify-shadow.c:239 ../daemon/verify-shadow.c:263
+#: ../daemon/verify-shadow.c:240 ../daemon/verify-shadow.c:264
 msgid ""
 "\n"
 "The system administrator has disabled your account."
@@ -1406,16 +1414,16 @@ msgstr ""
 "\n"
 "The system administrator has disabled your account."
 
-#: ../daemon/verify-crypt.c:268 ../daemon/verify-crypt.c:406
+#: ../daemon/verify-crypt.c:269 ../daemon/verify-crypt.c:407
 #: ../daemon/verify-pam.c:1029 ../daemon/verify-pam.c:1309
-#: ../daemon/verify-shadow.c:286 ../daemon/verify-shadow.c:424
+#: ../daemon/verify-shadow.c:287 ../daemon/verify-shadow.c:425
 #, c-format
 msgid "Cannot set user group for %s"
 msgstr "Cannot set user group for %s"
 
-#: ../daemon/verify-crypt.c:270 ../daemon/verify-crypt.c:409
+#: ../daemon/verify-crypt.c:271 ../daemon/verify-crypt.c:410
 #: ../daemon/verify-pam.c:1031 ../daemon/verify-pam.c:1312
-#: ../daemon/verify-shadow.c:288 ../daemon/verify-shadow.c:427
+#: ../daemon/verify-shadow.c:289 ../daemon/verify-shadow.c:428
 msgid ""
 "\n"
 "Cannot set your user group; you will not be able to log in. Please contact "
@@ -1425,13 +1433,13 @@ msgstr ""
 "Cannot set your user group; you will not be able to log in. Please contact "
 "your system administrator."
 
-#: ../daemon/verify-crypt.c:281 ../daemon/verify-crypt.c:354
-#: ../daemon/verify-shadow.c:299 ../daemon/verify-shadow.c:373
+#: ../daemon/verify-crypt.c:282 ../daemon/verify-crypt.c:355
+#: ../daemon/verify-shadow.c:300 ../daemon/verify-shadow.c:374
 #, c-format
 msgid "Password of %s has expired"
 msgstr "Password of %s has expired"
 
-#: ../daemon/verify-crypt.c:283 ../daemon/verify-shadow.c:301
+#: ../daemon/verify-crypt.c:284 ../daemon/verify-shadow.c:302
 msgid ""
 "You are required to change your password.\n"
 "Please choose a new one."
@@ -1439,7 +1447,7 @@ msgstr ""
 "You are required to change your password.\n"
 "Please choose a new one."
 
-#: ../daemon/verify-crypt.c:294 ../daemon/verify-shadow.c:312
+#: ../daemon/verify-crypt.c:295 ../daemon/verify-shadow.c:313
 msgid ""
 "\n"
 "Cannot change your password; you will not be able to log in. Please try "
@@ -1449,8 +1457,8 @@ msgstr ""
 "Cannot change your password; you will not be able to log in. Please try "
 "again later or contact your system administrator."
 
-#: ../daemon/verify-crypt.c:337 ../daemon/verify-crypt.c:345
-#: ../daemon/verify-shadow.c:356 ../daemon/verify-shadow.c:364
+#: ../daemon/verify-crypt.c:338 ../daemon/verify-crypt.c:346
+#: ../daemon/verify-shadow.c:357 ../daemon/verify-shadow.c:365
 msgid ""
 "Your password has been changed but you may have to change it again. Please "
 "try again later or contact your system administrator."
@@ -1458,7 +1466,7 @@ msgstr ""
 "Your password has been changed but you may have to change it again. Please "
 "try again later or contact your system administrator."
 
-#: ../daemon/verify-crypt.c:356 ../daemon/verify-shadow.c:375
+#: ../daemon/verify-crypt.c:357 ../daemon/verify-shadow.c:376
 msgid ""
 "Your password has expired.\n"
 "Only a system administrator can now change it"
@@ -1466,11 +1474,11 @@ msgstr ""
 "Your password has expired.\n"
 "Only a system administrator can now change it"
 
-#: ../daemon/verify-crypt.c:363 ../daemon/verify-shadow.c:382
+#: ../daemon/verify-crypt.c:364 ../daemon/verify-shadow.c:383
 msgid "Internal error on passwdexpired"
 msgstr "Internal error on passwdexpired"
 
-#: ../daemon/verify-crypt.c:365 ../daemon/verify-shadow.c:384
+#: ../daemon/verify-crypt.c:366 ../daemon/verify-shadow.c:385
 msgid ""
 "An internal error occurred. You will not be able to log in.\n"
 "Please try again later or contact your system administrator."
@@ -1478,7 +1486,7 @@ msgstr ""
 "An internal error occurred. You will not be able to log in.\n"
 "Please try again later or contact your system administrator."
 
-#: ../daemon/verify-crypt.c:401 ../daemon/verify-shadow.c:419
+#: ../daemon/verify-crypt.c:402 ../daemon/verify-shadow.c:420
 #, c-format
 msgid "Cannot get passwd structure for %s"
 msgstr "Cannot get passwd structure for %s"
@@ -2757,7 +2765,8 @@ msgid "Are you sure you want to restart the computer?"
 msgstr "Are you sure you want to restart the computer?"
 
 #: ../gui/gdmlogin.c:650 ../gui/gdmlogin.c:2494
-#: ../gui/greeter/greeter_parser.c:1086
+#: ../gui/greeter/greeter_parser.c:1086 ../gui/greeter/greeter_system.c:68
+#: ../gui/greeter/greeter_system.c:187
 msgid "_Restart"
 msgstr "_Restart"
 
@@ -2946,7 +2955,7 @@ msgstr ""
 msgid "Cannot start the greeter"
 msgstr "Cannot start the greeter"
 
-#: ../gui/gdmlogin.c:3280 ../gui/greeter/greeter.c:674
+#: ../gui/gdmlogin.c:3280
 msgid "Restart"
 msgstr "Restart"
 
@@ -2959,7 +2968,7 @@ 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:3328
+#: ../gui/gdmlogin.c:3328 ../gui/greeter/greeter.c:674
 msgid "Restart GDM"
 msgstr "Restart GDM"
 
@@ -3011,13 +3020,13 @@ msgstr "Cannot open file"
 msgid "Select User Image"
 msgstr "Select User Image"
 
-#: ../gui/gdmphotosetup.c:272 ../gui/gdmsetup.c:5581 ../gui/gdmsetup.c:5703
-#: ../gui/gdmsetup.c:5856 ../gui/gdmsetup.c:5978
+#: ../gui/gdmphotosetup.c:272 ../gui/gdmsetup.c:5582 ../gui/gdmsetup.c:5704
+#: ../gui/gdmsetup.c:5857 ../gui/gdmsetup.c:5979
 msgid "Images"
 msgstr "Images"
 
-#: ../gui/gdmphotosetup.c:277 ../gui/gdmsetup.c:3045 ../gui/gdmsetup.c:5586
-#: ../gui/gdmsetup.c:5708 ../gui/gdmsetup.c:5861 ../gui/gdmsetup.c:5983
+#: ../gui/gdmphotosetup.c:277 ../gui/gdmsetup.c:3046 ../gui/gdmsetup.c:5587
+#: ../gui/gdmsetup.c:5709 ../gui/gdmsetup.c:5862 ../gui/gdmsetup.c:5984
 msgid "All Files"
 msgstr "All Files"
 
@@ -3080,7 +3089,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:259
+#: ../gui/gdmsetup.c:260
 msgid ""
 "An error occurred while trying to contact the login screens.  Not all "
 "updates may have taken effect."
@@ -3088,129 +3097,129 @@ msgstr ""
 "An error occurred while trying to contact the login screens.  Not all "
 "updates may have taken effect."
 
-#: ../gui/gdmsetup.c:800 ../gui/gdmsetup.c:818 ../gui/gdmsetup.c:973
-#: ../gui/gdmsetup.c:1219
+#: ../gui/gdmsetup.c:801 ../gui/gdmsetup.c:819 ../gui/gdmsetup.c:974
+#: ../gui/gdmsetup.c:1220
 msgid "Themed"
 msgstr "Themed"
 
-#: ../gui/gdmsetup.c:803 ../gui/gdmsetup.c:834
+#: ../gui/gdmsetup.c:804 ../gui/gdmsetup.c:835
 msgid "Plain"
 msgstr "Plain"
 
-#: ../gui/gdmsetup.c:804 ../gui/gdmsetup.c:835
+#: ../gui/gdmsetup.c:805 ../gui/gdmsetup.c:836
 msgid "Plain with face browser"
 msgstr "Plain with face browser"
 
-#: ../gui/gdmsetup.c:1570
+#: ../gui/gdmsetup.c:1571
 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:1791
+#: ../gui/gdmsetup.c:1792
 #, 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:1801 ../gui/gdmsetup.c:1831 ../gui/gdmsetup.c:1868
+#: ../gui/gdmsetup.c:1802 ../gui/gdmsetup.c:1832 ../gui/gdmsetup.c:1869
 msgid "Cannot add user"
 msgstr "Cannot add user"
 
-#: ../gui/gdmsetup.c:1821
+#: ../gui/gdmsetup.c:1822
 #, 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:1858
+#: ../gui/gdmsetup.c:1859
 #, c-format
 msgid "The \"%s\" user does not exist."
 msgstr "The \"%s\" user does not exist."
 
-#: ../gui/gdmsetup.c:3040 ../gui/gdmsetup.glade.h:73
+#: ../gui/gdmsetup.c:3041 ../gui/gdmsetup.glade.h:73
 msgid "Sounds"
 msgstr "Sounds"
 
-#: ../gui/gdmsetup.c:3244 ../gui/gdmsetup.c:3302
+#: ../gui/gdmsetup.c:3245 ../gui/gdmsetup.c:3303
 msgid "None"
 msgstr "None"
 
-#: ../gui/gdmsetup.c:3735
+#: ../gui/gdmsetup.c:3736
 msgid "Archive is not of a subdirectory"
 msgstr "Archive is not of a subdirectory"
 
-#: ../gui/gdmsetup.c:3743
+#: ../gui/gdmsetup.c:3744
 msgid "Archive is not of a single subdirectory"
 msgstr "Archive is not of a single subdirectory"
 
-#: ../gui/gdmsetup.c:3767 ../gui/gdmsetup.c:3845
+#: ../gui/gdmsetup.c:3768 ../gui/gdmsetup.c:3846
 msgid "File not a tar.gz or tar archive"
 msgstr "File not a tar.gz or tar archive"
 
-#: ../gui/gdmsetup.c:3769
+#: ../gui/gdmsetup.c:3770
 msgid "Archive does not include a GdmGreeterTheme.info file"
 msgstr "Archive does not include a GdmGreeterTheme.info file"
 
-#: ../gui/gdmsetup.c:3791
+#: ../gui/gdmsetup.c:3792
 msgid "File does not exist"
 msgstr "File does not exist"
 
-#: ../gui/gdmsetup.c:3911
+#: ../gui/gdmsetup.c:3912
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../gui/gdmsetup.c:3918
+#: ../gui/gdmsetup.c:3919
 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:3940
+#: ../gui/gdmsetup.c:3941
 #, 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:4032
+#: ../gui/gdmsetup.c:4033
 msgid "Some error occurred when installing the theme"
 msgstr "An error occurred when installing the theme"
 
-#: ../gui/gdmsetup.c:4088
+#: ../gui/gdmsetup.c:4089
 msgid "No file selected"
 msgstr "No file selected"
 
-#: ../gui/gdmsetup.c:4109
+#: ../gui/gdmsetup.c:4110
 msgid "Select Theme Archive"
 msgstr "Select Theme Archive"
 
-#: ../gui/gdmsetup.c:4113 ../gui/gdmsetup.c:5102
+#: ../gui/gdmsetup.c:4114 ../gui/gdmsetup.c:5103
 msgid "_Install"
 msgstr "_Install"
 
-#: ../gui/gdmsetup.c:4204
+#: ../gui/gdmsetup.c:4205
 #, c-format
 msgid "Remove the \"%s\" theme?"
 msgstr "Remove the \"%s\" theme?"
 
-#: ../gui/gdmsetup.c:4213
+#: ../gui/gdmsetup.c:4214
 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:4221
+#: ../gui/gdmsetup.c:4222
 msgid "_Remove Theme"
 msgstr "_Remove Theme"
 
-#: ../gui/gdmsetup.c:5091
+#: ../gui/gdmsetup.c:5092
 #, c-format
 msgid "Install the theme from '%s'?"
 msgstr "Install the theme from '%s'?"
 
-#: ../gui/gdmsetup.c:5092
+#: ../gui/gdmsetup.c:5093
 #, c-format
 msgid "Select install to add the theme from the file '%s'."
 msgstr "Select install to add the theme from the file '%s'."
 
 #. This is the temporary help dialog
-#: ../gui/gdmsetup.c:5353
+#: ../gui/gdmsetup.c:5354
 #, c-format
 msgid ""
 "This configuration window changes settings for the GDM daemon, which is the "
@@ -3233,25 +3242,25 @@ msgstr ""
 "For complete documentation see the GNOME help browser under the \"Desktop\" "
 "category."
 
-#: ../gui/gdmsetup.c:6399
+#: ../gui/gdmsetup.c:6400
 msgid "Apply the changes to users before closing?"
 msgstr "Apply the changes to users before closing?"
 
-#: ../gui/gdmsetup.c:6400
+#: ../gui/gdmsetup.c:6401
 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:6403
+#: ../gui/gdmsetup.c:6404
 msgid "Close _without Applying"
 msgstr "Close _without Applying"
 
-#: ../gui/gdmsetup.c:6451
+#: ../gui/gdmsetup.c:6452
 msgid "Could not access GDM configuration file.\n"
 msgstr "Could not access GDM configuration file.\n"
 
-#: ../gui/gdmsetup.c:6495
+#: ../gui/gdmsetup.c:6496
 msgid "You must be the root user to configure GDM."
 msgstr "You must be the root user to configure GDM."
 
@@ -3690,8 +3699,8 @@ msgstr ""
 "probably just upgraded GDM. Please restart the GDM daemon or the computer."
 
 #: ../gui/greeter/greeter.c:625 ../gui/greeter/greeter.c:676
-msgid "Reboot"
-msgstr "Reboot"
+msgid "Restart Machine"
+msgstr "Restart Machine"
 
 #: ../gui/greeter/greeter.c:1099
 #, c-format
@@ -3828,10 +3837,6 @@ msgstr "_Last session"
 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:68 ../gui/greeter/greeter_system.c:187
-msgid "_Reboot"
-msgstr "_Reboot"
-
 #: ../gui/greeter/greeter_system.c:160 ../gui/greeter/greeter_system.c:356
 msgid ""
 "Run an XDMCP chooser which will allow you to log into available remote "
@@ -3847,8 +3852,8 @@ msgstr ""
 "Configure GDM (this login manager). This will require the root password."
 
 #: ../gui/greeter/greeter_system.c:194 ../gui/greeter/greeter_system.c:322
-msgid "Reboot your computer"
-msgstr "Reboot your computer"
+msgid "Restart your computer"
+msgstr "Restart your computer"
 
 #: ../gui/greeter/greeter_system.c:206
 msgid "Shut Down the system so that you may safely turn off the computer."
@@ -3871,8 +3876,8 @@ msgid "Shut Down your computer so that you may turn it off."
 msgstr "Shut Down your computer so that you may turn it off."
 
 #: ../gui/greeter/greeter_system.c:319
-msgid "_Reboot the computer"
-msgstr "_Reboot the computer"
+msgid "_Restart the computer"
+msgstr "_Restart the computer"
 
 #: ../gui/greeter/greeter_system.c:336
 msgid "Sus_pend the computer"
@@ -3928,7 +3933,7 @@ msgstr "GNOME Art variation of Circles"
 msgid "Happy GNOME"
 msgstr "Happy GNOME"
 
-#: ../gui/modules/dwellmouselistener.c:655
+#: ../gui/modules/dwellmouselistener.c:656
 #: ../gui/modules/keymouselistener.c:926
 #, c-format
 msgid ""
@@ -3943,55 +3948,55 @@ msgstr ""
 msgid "Cannot open gestures file: %s"
 msgstr "Cannot open gestures file: %s"
 
-#: ../utils/gdm-dmx-reconnect-proxy.c:38
+#: ../utils/gdm-dmx-reconnect-proxy.c:37
 msgid "DMX display to migrate to"
 msgstr "DMX display to migrate to"
 
-#: ../utils/gdm-dmx-reconnect-proxy.c:39 ../utils/gdm-dmx-reconnect-proxy.c:44
+#: ../utils/gdm-dmx-reconnect-proxy.c:38 ../utils/gdm-dmx-reconnect-proxy.c:43
 msgid "DISPLAY"
 msgstr "DISPLAY"
 
-#: ../utils/gdm-dmx-reconnect-proxy.c:43
+#: ../utils/gdm-dmx-reconnect-proxy.c:42
 msgid "Backend display name"
 msgstr "Backend display name"
 
-#: ../utils/gdm-dmx-reconnect-proxy.c:48
+#: ../utils/gdm-dmx-reconnect-proxy.c:47
 msgid "Xauthority file for destination display"
 msgstr "Xauthority file for destination display"
 
-#: ../utils/gdm-dmx-reconnect-proxy.c:49 ../utils/gdm-dmx-reconnect-proxy.c:54
+#: ../utils/gdm-dmx-reconnect-proxy.c:48 ../utils/gdm-dmx-reconnect-proxy.c:53
 msgid "AUTHFILE"
 msgstr "AUTHFILE"
 
-#: ../utils/gdm-dmx-reconnect-proxy.c:53
+#: ../utils/gdm-dmx-reconnect-proxy.c:52
 msgid "Xauthority file for backend display"
 msgstr "Xauthority file for backend display"
 
-#: ../utils/gdm-dmx-reconnect-proxy.c:71
+#: ../utils/gdm-dmx-reconnect-proxy.c:70
 #, c-format
 msgid "Failed to open display \"%s\"\n"
 msgstr "Failed to open display \"%s\"\n"
 
-#: ../utils/gdm-dmx-reconnect-proxy.c:75
+#: ../utils/gdm-dmx-reconnect-proxy.c:74
 #, c-format
 msgid "DMX extension not present on \"%s\"\n"
 msgstr "DMX extension not present on \"%s\"\n"
 
-#: ../utils/gdm-dmx-reconnect-proxy.c:98
+#: ../utils/gdm-dmx-reconnect-proxy.c:97
 msgid "- migrate a backend display from one DMX display to another"
 msgstr "- migrate a backend display from one DMX display to another"
 
-#: ../utils/gdm-dmx-reconnect-proxy.c:104
+#: ../utils/gdm-dmx-reconnect-proxy.c:103
 #, c-format
 msgid "You must specify a destination DMX display using %s\n"
 msgstr "You must specify a destination DMX display using %s\n"
 
-#: ../utils/gdm-dmx-reconnect-proxy.c:109
+#: ../utils/gdm-dmx-reconnect-proxy.c:108
 #, c-format
 msgid "You must specify a backend display by using %s\n"
 msgstr "You must specify a backend display by using %s\n"
 
-#: ../utils/gdm-dmx-reconnect-proxy.c:124
+#: ../utils/gdm-dmx-reconnect-proxy.c:123
 #, c-format
 msgid "DMXAddScreen \"%s\" failed on \"%s\"\n"
 msgstr "DMXAddScreen \"%s\" failed on \"%s\"\n"
@@ -4006,14 +4011,14 @@ msgstr "gdmaskpass only runs as root\n"
 msgid "Authentication failure!\n"
 msgstr "Authentication failure!\n"
 
-#: ../vicious-extensions/glade-helper.c:85
-#: ../vicious-extensions/glade-helper.c:117
-#: ../vicious-extensions/glade-helper.c:139
-#: ../vicious-extensions/glade-helper.c:159
+#: ../vicious-extensions/glade-helper.c:84
+#: ../vicious-extensions/glade-helper.c:116
+#: ../vicious-extensions/glade-helper.c:138
+#: ../vicious-extensions/glade-helper.c:158
 msgid "(memory buffer)"
 msgstr "(memory buffer)"
 
-#: ../vicious-extensions/glade-helper.c:191
+#: ../vicious-extensions/glade-helper.c:190
 #, c-format
 msgid ""
 "An error occurred while loading user interface element %s%s from file %s.  "
@@ -4024,13 +4029,13 @@ msgstr ""
 "The glade interface description may be corrupted.  %s cannot continue and "
 "will exit now.  You should check your installation of %s or reinstall %s."
 
-#: ../vicious-extensions/glade-helper.c:209
-#: ../vicious-extensions/glade-helper.c:277
-#: ../vicious-extensions/glade-helper.c:319
+#: ../vicious-extensions/glade-helper.c:208
+#: ../vicious-extensions/glade-helper.c:276
+#: ../vicious-extensions/glade-helper.c:318
 msgid "Cannot load user interface"
 msgstr "Cannot load user interface"
 
-#: ../vicious-extensions/glade-helper.c:215
+#: ../vicious-extensions/glade-helper.c:214
 #, c-format
 msgid ""
 "Glade file is on crack! Make sure the correct file is installed!\n"
@@ -4039,7 +4044,7 @@ msgstr ""
 "Glade file is on crack! Make sure the correct file is installed!\n"
 "file: %s widget: %s"
 
-#: ../vicious-extensions/glade-helper.c:247
+#: ../vicious-extensions/glade-helper.c:246
 #, c-format
 msgid ""
 "An error occurred while loading the user interface element %s%s from file %"
@@ -4062,7 +4067,7 @@ msgstr[1] ""
 "may be corrupted. %s cannot continue and will exit now. You should check "
 "your installation of %s or reinstall %s."
 
-#: ../vicious-extensions/glade-helper.c:283
+#: ../vicious-extensions/glade-helper.c:282
 #, c-format
 msgid ""
 "Glade file is on crack! Make sure the correct file is installed!\n"
@@ -4071,7 +4076,7 @@ msgstr ""
 "Glade file is on crack! Make sure the correct file is installed!\n"
 "file: %s widget: %s expected clist columns: %d"
 
-#: ../vicious-extensions/glade-helper.c:303
+#: ../vicious-extensions/glade-helper.c:302
 #, c-format
 msgid ""
 "An error occurred while loading the user interface from file %s.  Possibly "
@@ -4082,11 +4087,11 @@ msgstr ""
 "interface description may be missing.  %s cannot continue and will exit "
 "now.  You should check your installation of %s or reinstall %s."
 
-#: ../vicious-extensions/glade-helper.c:322
+#: ../vicious-extensions/glade-helper.c:321
 #, c-format
 msgid "No interface could be loaded. This is BAD! (file: %s)"
 msgstr "No interface could be loaded. This is BAD! (file: %s)"
 
-#: ../vicious-extensions/ve-nongnome.c:134
+#: ../vicious-extensions/ve-nongnome.c:135
 msgid "Too many alias levels for a locale; may indicate a loop"
 msgstr "Too many alias levels for a locale; may indicate a loop"