summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Winston <alexander.winston@comcast.net>2004-03-08 15:44:05 +0000
committerAlexander Winston <alexander@src.gnome.org>2004-03-08 15:44:05 +0000
commit8d7d8f4476e2b857cdc908698f9c05776cd1bf63 (patch)
treeb5dcf2eff9c125a6831d4cdd30bce5f98005daf6
parent5d37168b2d9b2d4aefe3b51bdccb65ca147a492e (diff)
downloadgdm-8d7d8f4476e2b857cdc908698f9c05776cd1bf63.tar.gz
Updated Canadian English translation to "698 translated messages" status.
2004-03-08 Alexander Winston <alexander.winston@comcast.net> * en_CA.po: Updated Canadian English translation to "698 translated messages" status.
-rw-r--r--po/ChangeLog5
-rw-r--r--po/en_CA.po358
2 files changed, 191 insertions, 172 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index 7dc690e9..ac3ee671 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-08 Alexander Winston <alexander.winston@comcast.net>
+
+ * en_CA.po: Updated Canadian English translation to "698
+ translated messages" status.
+
2004-03-08 Sanlig Badral <badral@openmn.org>
* mn.po: Updated Mongolian translation.
diff --git a/po/en_CA.po b/po/en_CA.po
index 1b79d34b..ab0bdb96 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -8,13 +8,13 @@ msgid ""
msgstr ""
"Project-Id-Version: gdm2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-20 14:40+0100\n"
-"PO-Revision-Date: 2004-02-20 17:21-0500\n"
-"Last-Translator: Adam Weinberger <adamw@FreeBSD.org>\n"
+"POT-Creation-Date: 2004-03-08 10:39-0500\n"
+"PO-Revision-Date: 2004-03-08 10:41-0500\n"
+"Last-Translator: Alexander Winston <alexander.winston@comcast.net>\n"
"Language-Team: English/Canada <adamw@FreeBSD.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
#: config/CDE.desktop.in.h:1
msgid "CDE"
@@ -205,12 +205,12 @@ msgstr ""
"it is likely that something bad is going on. I will wait for 2 minutes "
"before trying again on display %s."
-#: daemon/display.c:243
+#: daemon/display.c:244
#, c-format
msgid "%s: Cannot create pipe"
msgstr "%s: Cannot create pipe"
-#: daemon/display.c:315
+#: daemon/display.c:316
#, c-format
msgid "%s: Failed forking gdm slave process for %s"
msgstr "%s: Failed forking gdm slave process for %s"
@@ -228,13 +228,13 @@ msgstr ""
"\n"
"... File too long to display ...\n"
-#: daemon/errorgui.c:381
+#: daemon/errorgui.c:382
#, c-format
msgid "%s could not be opened"
msgstr "%s could not be opened"
-#: daemon/errorgui.c:493 daemon/errorgui.c:634 daemon/errorgui.c:742
-#: daemon/errorgui.c:860
+#: daemon/errorgui.c:494 daemon/errorgui.c:635 daemon/errorgui.c:743
+#: daemon/errorgui.c:861
#, c-format
msgid "%s: Cannot fork to display error/info box"
msgstr "%s: Cannot fork to display error/info box"
@@ -553,7 +553,7 @@ msgid "%s: fork() failed!"
msgstr "%s: fork() failed!"
#. should never happen
-#: daemon/gdm.c:859 daemon/slave.c:3373
+#: daemon/gdm.c:859 daemon/slave.c:3437
#, c-format
msgid "%s: setsid() failed: %s!"
msgstr "%s: setsid() failed: %s!"
@@ -690,12 +690,12 @@ msgstr "Only root wants to run gdm\n"
#: daemon/gdm.c:2084 daemon/gdm.c:2088 daemon/gdm.c:2098 daemon/gdm.c:2104
#: daemon/gdm.c:2115 daemon/misc.c:1603 daemon/misc.c:1607 daemon/misc.c:1611
#: daemon/misc.c:1618 daemon/misc.c:1622 daemon/misc.c:1626
-#: daemon/server.c:510 daemon/server.c:523 daemon/slave.c:805
-#: daemon/slave.c:819 daemon/slave.c:829 daemon/slave.c:839 daemon/slave.c:851
+#: daemon/server.c:521 daemon/server.c:534 daemon/slave.c:811
+#: daemon/slave.c:825 daemon/slave.c:835 daemon/slave.c:845 daemon/slave.c:857
#: gui/gdmchooser.c:1924 gui/gdmchooser.c:1927 gui/gdmchooser.c:1930
#: gui/gdmlogin.c:3928 gui/gdmlogin.c:3936 gui/gdmlogin.c:3939
-#: gui/greeter/greeter.c:1084 gui/greeter/greeter.c:1092
-#: gui/greeter/greeter.c:1095
+#: gui/greeter/greeter.c:1083 gui/greeter/greeter.c:1091
+#: gui/greeter/greeter.c:1094
#, c-format
msgid "%s: Error setting up %s signal handler: %s"
msgstr "%s: Error setting up %s signal handler: %s"
@@ -783,7 +783,7 @@ msgstr ""
msgid "Can not start fallback console"
msgstr "Can not start fallback console"
-#: daemon/server.c:330
+#: daemon/server.c:341
#, c-format
msgid ""
"There already appears to be an X server running on display %s. Should I try "
@@ -794,7 +794,7 @@ msgstr ""
"another display number? If you answer no, I will attempt to start the "
"server on %s again.%s"
-#: daemon/server.c:337
+#: daemon/server.c:348
msgid ""
" (You can change consoles by pressing Ctrl-Alt plus a function key, such as "
"Ctrl-Alt-F7 to go to console 7. X servers usually run on consoles 7 and "
@@ -804,105 +804,105 @@ msgstr ""
"Ctrl-Alt-F7 to go to console 7. X servers usually run on consoles 7 and "
"higher.)"
-#: daemon/server.c:383
+#: daemon/server.c:394
#, c-format
msgid "Display '%s' cannot be opened by Xnest"
msgstr "Display '%s' cannot be opened by Xnest"
-#: daemon/server.c:414
+#: daemon/server.c:425
#, 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:498
+#: daemon/server.c:509
#, c-format
msgid "%s: Error opening a pipe: %s"
msgstr "%s: Error opening a pipe: %s"
#. Send X too busy
-#: daemon/server.c:780
+#: daemon/server.c:794
#, c-format
msgid "%s: Cannot find a free display number"
msgstr "%s: Cannot find a free display number"
-#: daemon/server.c:795
+#: daemon/server.c:821
#, c-format
msgid "%s: Display %s busy. Trying another display number."
msgstr "%s: Display %s busy. Trying another display number."
-#: daemon/server.c:889
+#: daemon/server.c:916
#, c-format
msgid "Invalid server command '%s'"
msgstr "Invalid server command '%s'"
-#: daemon/server.c:894
+#: daemon/server.c:921
#, c-format
msgid "Server name '%s' not found, using standard server"
msgstr "Server name '%s' not found, using standard server"
-#: daemon/server.c:1070
+#: daemon/server.c:1097
#, c-format
msgid "%s: Could not open logfile for display %s!"
msgstr "%s: Could not open logfile for display %s!"
-#: daemon/server.c:1083 daemon/server.c:1089 daemon/server.c:1094
+#: daemon/server.c:1110 daemon/server.c:1116 daemon/server.c:1121
#, c-format
msgid "%s: Error setting %s to %s"
msgstr "%s: Error setting %s to %s"
-#: daemon/server.c:1131
+#: daemon/server.c:1158
#, c-format
msgid "%s: Empty server command for display %s"
msgstr "%s: Empty server command for display %s"
-#: daemon/server.c:1145
+#: daemon/server.c:1172
#, 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:1160 daemon/slave.c:2493 daemon/slave.c:2971
+#: daemon/server.c:1187 daemon/slave.c:2500 daemon/slave.c:2978
#, c-format
msgid "%s: Couldn't set groupid to %d"
msgstr "%s: Couldn't set groupid to %d"
-#: daemon/server.c:1166 daemon/slave.c:2498 daemon/slave.c:2976
+#: daemon/server.c:1193 daemon/slave.c:2505 daemon/slave.c:2983
#, c-format
msgid "%s: initgroups() failed for %s"
msgstr "%s: initgroups() failed for %s"
-#: daemon/server.c:1172 daemon/slave.c:2503 daemon/slave.c:2981
+#: daemon/server.c:1199 daemon/slave.c:2510 daemon/slave.c:2988
#, c-format
msgid "%s: Couldn't set userid to %d"
msgstr "%s: Couldn't set userid to %d"
-#: daemon/server.c:1179
+#: daemon/server.c:1206
#, c-format
msgid "%s: Couldn't set groupid to 0"
msgstr "%s: Couldn't set groupid to 0"
-#: daemon/server.c:1190
+#: daemon/server.c:1217
#, c-format
msgid "%s: Xserver not found: %s"
msgstr "%s: Xserver not found: %s"
-#: daemon/server.c:1198
+#: daemon/server.c:1225
#, c-format
msgid "%s: Can't fork Xserver process!"
msgstr "%s: Can't fork Xserver process!"
-#: daemon/slave.c:301
+#: daemon/slave.c:307
msgid "Can't set EGID to user GID"
msgstr "Can't set EGID to user GID"
-#: daemon/slave.c:309
+#: daemon/slave.c:315
msgid "Can't set EUID to user UID"
msgstr "Can't set EUID to user UID"
-#: daemon/slave.c:1114
+#: daemon/slave.c:1120
msgid "Log in anyway"
msgstr "Log in anyway"
-#: daemon/slave.c:1116
+#: daemon/slave.c:1122
msgid ""
"You are already logged in. You can log in anyway, return to your previous "
"login session, or abort this login"
@@ -910,19 +910,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:1120
+#: daemon/slave.c:1126
msgid "Return to previous login"
msgstr "Return to previous login"
-#: daemon/slave.c:1121 daemon/slave.c:1127
+#: daemon/slave.c:1127 daemon/slave.c:1133
msgid "Abort login"
msgstr "Abort login"
-#: daemon/slave.c:1124
+#: daemon/slave.c:1130
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:1214
+#: daemon/slave.c:1221
msgid ""
"I could not start the X\n"
"server (your graphical environment)\n"
@@ -942,17 +942,17 @@ msgstr ""
"disabled. Please restart gdm when\n"
"the problem is corrected."
-#: daemon/slave.c:1463
+#: daemon/slave.c:1470
#, c-format
msgid "%s: cannot fork"
msgstr "%s: cannot fork"
-#: daemon/slave.c:1510
+#: daemon/slave.c:1517
#, c-format
msgid "%s: cannot open display %s"
msgstr "%s: cannot open display %s"
-#: daemon/slave.c:1661
+#: daemon/slave.c:1668
msgid ""
"Could not execute the configuration program. Make sure it's path is set "
"correctly in the configuration file. I will attempt to start it from the "
@@ -962,7 +962,7 @@ msgstr ""
"correctly in the configuration file. I will attempt to start it from the "
"default location."
-#: daemon/slave.c:1675
+#: daemon/slave.c:1682
msgid ""
"Could not execute the configuration program. Make sure it's path is set "
"correctly in the configuration file."
@@ -970,7 +970,7 @@ msgstr ""
"Could not execute the configuration program. Make sure it's path is set "
"correctly in the configuration file."
-#: daemon/slave.c:1805
+#: daemon/slave.c:1812
msgid ""
"Enter the root password\n"
"to run the configuration."
@@ -978,12 +978,12 @@ msgstr ""
"Enter the root password\n"
"to run the configuration."
-#: daemon/slave.c:2447 daemon/slave.c:2452
+#: daemon/slave.c:2454 daemon/slave.c:2459
#, c-format
msgid "%s: Can't init pipe to gdmgreeter"
msgstr "%s: Can't init pipe to gdmgreeter"
-#: daemon/slave.c:2575
+#: daemon/slave.c:2582
msgid ""
"No servers were defined in the configuration file and XDMCP was disabled. "
"This can only be a configuration error. So I have started a single server "
@@ -995,7 +995,7 @@ msgstr ""
"for you. You should log in and fix the configuration. Note that automatic "
"and timed logins are disabled now."
-#: daemon/slave.c:2589
+#: daemon/slave.c:2596
msgid ""
"I could not start the regular X server (your graphical environment) and so "
"this is a failsafe X server. You should log in and properly configure the X "
@@ -1005,7 +1005,7 @@ msgstr ""
"this is a failsafe X server. You should log in and properly configure the X "
"server."
-#: daemon/slave.c:2598
+#: daemon/slave.c:2605
#, c-format
msgid ""
"The specified display number was busy, so this server was started on display "
@@ -1014,7 +1014,7 @@ msgstr ""
"The specified display number was busy, so this server was started on display "
"%s."
-#: daemon/slave.c:2618
+#: daemon/slave.c:2625
msgid ""
"The greeter program appears to be crashing.\n"
"I will attempt to use a different one."
@@ -1023,17 +1023,17 @@ msgstr ""
"I will attempt to use a different one."
#. Something went wrong
-#: daemon/slave.c:2639
+#: daemon/slave.c:2646
#, 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:2646
+#: daemon/slave.c:2653
#, c-format
msgid "%s: Cannot start greeter trying default: %s"
msgstr "%s: Cannot start greeter trying default: %s"
-#: daemon/slave.c:2658
+#: daemon/slave.c:2665
msgid ""
"Cannot start the greeter program, you will not be able to log in. This "
"display will be disabled. Try logging in by other means and editing the "
@@ -1044,27 +1044,27 @@ msgstr ""
"configuration file"
#. If no greeter we really have to disable the display
-#: daemon/slave.c:2665
+#: daemon/slave.c:2672
#, c-format
msgid "%s: Error starting greeter on display %s"
msgstr "%s: Error starting greeter on display %s"
-#: daemon/slave.c:2669
+#: daemon/slave.c:2676
#, c-format
msgid "%s: Can't fork gdmgreeter process"
msgstr "%s: Can't fork gdmgreeter process"
-#: daemon/slave.c:2754
+#: daemon/slave.c:2761
#, c-format
msgid "%s: Can't open fifo!"
msgstr "%s: Can't open fifo!"
-#: daemon/slave.c:2930
+#: daemon/slave.c:2937
#, c-format
msgid "%s: Can't init pipe to gdmchooser"
msgstr "%s: Can't init pipe to gdmchooser"
-#: daemon/slave.c:3028
+#: daemon/slave.c:3035
msgid ""
"Cannot start the chooser program, you will probably not be able to log in. "
"Please contact the system administrator."
@@ -1072,56 +1072,56 @@ msgstr ""
"Cannot start the chooser program, you will probably not be able to log in. "
"Please contact the system administrator."
-#: daemon/slave.c:3032
+#: daemon/slave.c:3039
#, c-format
msgid "%s: Error starting chooser on display %s"
msgstr "%s: Error starting chooser on display %s"
-#: daemon/slave.c:3035
+#: daemon/slave.c:3042
#, c-format
msgid "%s: Can't fork gdmchooser process"
msgstr "%s: Can't fork gdmchooser process"
-#: daemon/slave.c:3279
+#: daemon/slave.c:3338
#, c-format
msgid "%s: Could not open ~/.xsession-errors"
msgstr "%s: Could not open ~/.xsession-errors"
-#: daemon/slave.c:3410
+#: daemon/slave.c:3474
#, c-format
msgid "%s: Execution of PreSession script returned > 0. Aborting."
msgstr "%s: Execution of PreSession script returned > 0. Aborting."
-#: daemon/slave.c:3439
+#: daemon/slave.c:3503
#, c-format
msgid "Language %s does not exist, using %s"
msgstr "Language %s does not exist, using %s"
-#: daemon/slave.c:3440
+#: daemon/slave.c:3504
msgid "System default"
msgstr "System default"
-#: daemon/slave.c:3456
+#: daemon/slave.c:3520
#, c-format
msgid "%s: Could not setup environment for %s. Aborting."
msgstr "%s: Could not setup environment for %s. Aborting."
-#: daemon/slave.c:3477
+#: daemon/slave.c:3541
#, c-format
msgid "%s: setusercontext() failed for %s. Aborting."
msgstr "%s: setusercontext() failed for %s. Aborting."
-#: daemon/slave.c:3483
+#: daemon/slave.c:3547
#, c-format
msgid "%s: Could not become %s. Aborting."
msgstr "%s: Could not become %s. Aborting."
-#: daemon/slave.c:3543
+#: daemon/slave.c:3607
#, 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:3549
+#: daemon/slave.c:3613
msgid ""
"The session you selected does not look valid. I will run the GNOME failsafe "
"session for you."
@@ -1129,14 +1129,14 @@ msgstr ""
"The session you selected does not look valid. I will run the GNOME failsafe "
"session for you."
-#: daemon/slave.c:3563
+#: daemon/slave.c:3627
#, c-format
msgid ""
"%s: Cannot find or run the base Xsession script, will try GNOME failsafe"
msgstr ""
"%s: Cannot find or run the base Xsession script, will try GNOME failsafe"
-#: daemon/slave.c:3569
+#: daemon/slave.c:3633
msgid ""
"Cannot find or run the base session script, will try the GNOME failsafe "
"session for you."
@@ -1145,12 +1145,12 @@ msgstr ""
"session for you."
#. yaikes
-#: daemon/slave.c:3584
+#: daemon/slave.c:3648
#, 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:3589
+#: daemon/slave.c:3653
msgid ""
"Could not find the GNOME installation, will try running the \"Failsafe xterm"
"\" session."
@@ -1158,7 +1158,7 @@ msgstr ""
"Could not find the GNOME installation, will try running the \"Failsafe xterm"
"\" session."
-#: daemon/slave.c:3597
+#: daemon/slave.c:3661
msgid ""
"This is the Failsafe Gnome session. You will be logged into the 'Default' "
"session of Gnome with no startup scripts run. This is only to fix problems "
@@ -1168,11 +1168,11 @@ msgstr ""
"session of Gnome with no startup scripts run. This is only to fix problems "
"in your installation."
-#: daemon/slave.c:3612
+#: daemon/slave.c:3676
msgid "Cannot find \"xterm\" to start a failsafe session."
msgstr "Cannot find \"xterm\" to start a failsafe session."
-#: daemon/slave.c:3625
+#: daemon/slave.c:3689
msgid ""
"This is the Failsafe xterm session. You will be logged into a terminal "
"console so that you may fix your system if you cannot log in any other way. "
@@ -1182,41 +1182,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:3652
+#: daemon/slave.c:3716
#, c-format
msgid "%s: User not allowed to log in"
msgstr "%s: User not allowed to log in"
-#: daemon/slave.c:3655
+#: daemon/slave.c:3719
msgid "The system administrator has disabled your account."
msgstr "The system administrator has disabled your account."
-#: daemon/slave.c:3668
+#: daemon/slave.c:3748
msgid "Error! Unable to set executable context."
msgstr "Error! Unable to set executable context."
#. will go to .xsession-errors
-#: daemon/slave.c:3676 daemon/slave.c:3681
+#: daemon/slave.c:3756 daemon/slave.c:3761
#, 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:3692
+#: daemon/slave.c:3772
msgid "Cannot start the session due to some internal error."
msgstr "Cannot start the session due to some internal error."
-#: daemon/slave.c:3746
+#: daemon/slave.c:3826
#, c-format
msgid "%s: User passed auth but getpwnam(%s) failed!"
msgstr "%s: User passed auth but getpwnam(%s) failed!"
-#: daemon/slave.c:3760
+#: daemon/slave.c:3840
#, c-format
msgid "%s: Execution of PostLogin script returned > 0. Aborting."
msgstr "%s: Execution of PostLogin script returned > 0. Aborting."
-#: daemon/slave.c:3769
+#: daemon/slave.c:3849
#, c-format
msgid ""
"Your home directory is listed as:\n"
@@ -1233,12 +1233,12 @@ msgstr ""
"\n"
"It is unlikely anything will work unless you use a failsafe session."
-#: daemon/slave.c:3777
+#: daemon/slave.c:3857
#, 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:3940
+#: daemon/slave.c:4037
msgid ""
"GDM could not write to your authorization file. This could mean that you "
"are out of disk space or that your home directory could not be opened for "
@@ -1250,12 +1250,12 @@ msgstr ""
"writing. In any case, it is not possible to log in. Please contact your "
"system administrator"
-#: daemon/slave.c:4016
+#: daemon/slave.c:4113
#, c-format
msgid "%s: Error forking user session"
msgstr "%s: Error forking user session"
-#: daemon/slave.c:4097
+#: daemon/slave.c:4194
msgid ""
"Your session only lasted less than 10 seconds. If you have not logged out "
"yourself, this could mean that there is some installation problem or that "
@@ -1267,25 +1267,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:4105
+#: daemon/slave.c:4202
msgid "View details (~/.xsession-errors file)"
msgstr "View details (~/.xsession-errors file)"
-#: daemon/slave.c:4249
+#: daemon/slave.c:4346
msgid "GDM detected a shutdown or reboot in progress."
msgstr "GDM detected a shutdown or reboot in progress."
-#: daemon/slave.c:4343
+#: daemon/slave.c:4440
#, c-format
msgid "Ping to %s failed, whacking display!"
msgstr "Ping to %s failed, whacking display!"
-#: daemon/slave.c:4623
+#: daemon/slave.c:4726
#, c-format
msgid "%s: Fatal X error - Restarting %s"
msgstr "%s: Fatal X error - Restarting %s"
-#: daemon/slave.c:4717
+#: daemon/slave.c:4820
msgid ""
"Login sound requested on non-local display or the play software cannot be "
"run or the sound does not exist"
@@ -1293,22 +1293,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:5072
+#: daemon/slave.c:5175
#, c-format
msgid "%s: Failed starting: %s"
msgstr "%s: Failed starting: %s"
-#: daemon/slave.c:5080 daemon/slave.c:5219
+#: daemon/slave.c:5183 daemon/slave.c:5322
#, c-format
msgid "%s: Can't fork script process!"
msgstr "%s: Can't fork script process!"
-#: daemon/slave.c:5174
+#: daemon/slave.c:5277
#, c-format
msgid "%s: Failed creating pipe"
msgstr "%s: Failed creating pipe"
-#: daemon/slave.c:5213
+#: daemon/slave.c:5316
#, c-format
msgid "%s: Failed executing: %s"
msgstr "%s: Failed executing: %s"
@@ -1968,7 +1968,7 @@ msgid "Can't open default host icon: %s"
msgstr "Can't open default host icon: %s"
#: gui/gdmchooser.c:1938 gui/gdmlogin.c:3947 gui/gdmlogin.c:3954
-#: gui/greeter/greeter.c:1103 gui/greeter/greeter.c:1110
+#: gui/greeter/greeter.c:1102 gui/greeter/greeter.c:1109
msgid "Could not set signal mask!"
msgstr "Could not set signal mask!"
@@ -2365,278 +2365,293 @@ msgstr "A-M|English (British)"
#. Note translate the A-M to the A-M you used in the group label
#: gui/gdmlanguages.c:97
+msgid "A-M|English (Canadian)"
+msgstr "A-M|English (Canadian)"
+
+#. Note translate the A-M to the A-M you used in the group label
+#: gui/gdmlanguages.c:99
msgid "A-M|English (Ireland)"
msgstr "A-M|English (Ireland)"
#. Note translate the A-M to the A-M you used in the group label
-#: gui/gdmlanguages.c:99
+#: gui/gdmlanguages.c:101
msgid "A-M|Estonian"
msgstr "A-M|Estonian"
#. Note translate the A-M to the A-M you used in the group label
-#: gui/gdmlanguages.c:101
+#: gui/gdmlanguages.c:103
msgid "A-M|Finnish"
msgstr "A-M|Finnish"
#. Note translate the A-M to the A-M you used in the group label
-#: gui/gdmlanguages.c:103
+#: gui/gdmlanguages.c:105
msgid "A-M|French"
msgstr "A-M|French"
#. Note translate the A-M to the A-M you used in the group label
-#: gui/gdmlanguages.c:105
+#: gui/gdmlanguages.c:107
msgid "A-M|Galician"
msgstr "A-M|Galician"
#. Note translate the A-M to the A-M you used in the group label
-#: gui/gdmlanguages.c:107
+#: gui/gdmlanguages.c:109
msgid "A-M|German"
msgstr "A-M|German"
#. Note translate the A-M to the A-M you used in the group label
-#: gui/gdmlanguages.c:109
+#: gui/gdmlanguages.c:111
msgid "A-M|Greek"
msgstr "A-M|Greek"
#. Note translate the A-M to the A-M you used in the group label
-#: gui/gdmlanguages.c:111
+#: gui/gdmlanguages.c:113
msgid "A-M|Gujarati"
msgstr "A-M|Gujarati"
#. Note translate the A-M to the A-M you used in the group label
-#: gui/gdmlanguages.c:113 gui/gdmlanguages.c:115
+#: gui/gdmlanguages.c:115 gui/gdmlanguages.c:117
msgid "A-M|Hebrew"
msgstr "A-M|Hebrew"
#. Note translate the A-M to the A-M you used in the group label
-#: gui/gdmlanguages.c:117
+#: gui/gdmlanguages.c:119
msgid "A-M|Hindi"
msgstr "A-M|Hindi"
#. Note translate the A-M to the A-M you used in the group label
-#: gui/gdmlanguages.c:119
+#: gui/gdmlanguages.c:121
msgid "A-M|Hungarian"
msgstr "A-M|Hungarian"
#. Note translate the A-M to the A-M you used in the group label
-#: gui/gdmlanguages.c:121
+#: gui/gdmlanguages.c:123
msgid "A-M|Icelandic"
msgstr "A-M|Icelandic"
#. Note translate the A-M to the A-M you used in the group label
-#: gui/gdmlanguages.c:123
+#: gui/gdmlanguages.c:125
msgid "A-M|Indonesian"
msgstr "A-M|Indonesian"
#. Note translate the A-M to the A-M you used in the group label
-#: gui/gdmlanguages.c:125
+#: gui/gdmlanguages.c:127
msgid "A-M|Interlingua"
msgstr "A-M|Interlingua"
#. Note translate the A-M to the A-M you used in the group label
-#: gui/gdmlanguages.c:127
+#: gui/gdmlanguages.c:129
msgid "A-M|Irish"
msgstr "A-M|Irish"
#. Note translate the A-M to the A-M you used in the group label
-#: gui/gdmlanguages.c:129
+#: gui/gdmlanguages.c:131
msgid "A-M|Italian"
msgstr "A-M|Italian"
#. Note translate the A-M to the A-M you used in the group label
-#: gui/gdmlanguages.c:131
+#: gui/gdmlanguages.c:133
msgid "A-M|Japanese"
msgstr "A-M|Japanese"
#. Note translate the A-M to the A-M you used in the group label
-#: gui/gdmlanguages.c:133
+#: gui/gdmlanguages.c:135
msgid "A-M|Kannada"
msgstr "A-M|Kannada"
#. Note translate the A-M to the A-M you used in the group label
-#: gui/gdmlanguages.c:135
+#: gui/gdmlanguages.c:137
msgid "A-M|Korean"
msgstr "A-M|Korean"
#. Note translate the A-M to the A-M you used in the group label
-#: gui/gdmlanguages.c:137
+#: gui/gdmlanguages.c:139
msgid "A-M|Latvian"
msgstr "A-M|Latvian"
#. Note translate the A-M to the A-M you used in the group label
-#: gui/gdmlanguages.c:139
+#: gui/gdmlanguages.c:141
msgid "A-M|Lithuanian"
msgstr "A-M|Lithuanian"
#. Note translate the A-M to the A-M you used in the group label
-#: gui/gdmlanguages.c:141
+#: gui/gdmlanguages.c:143
msgid "A-M|Macedonian"
msgstr "A-M|Macedonian"
#. Note translate the A-M to the A-M you used in the group label
-#: gui/gdmlanguages.c:143
+#: gui/gdmlanguages.c:145
msgid "A-M|Malay"
msgstr "A-M|Malay"
#. Note translate the A-M to the A-M you used in the group label
-#: gui/gdmlanguages.c:145
+#: gui/gdmlanguages.c:147
msgid "A-M|Malayalam"
msgstr "A-M|Malayalam"
#. Note translate the A-M to the A-M you used in the group label
-#: gui/gdmlanguages.c:147
+#: gui/gdmlanguages.c:149
msgid "A-M|Marathi"
msgstr "A-M|Marathi"
#. Note translate the A-M to the A-M you used in the group label
-#: gui/gdmlanguages.c:149
+#: gui/gdmlanguages.c:151
msgid "A-M|Mongolian"
msgstr "A-M|Mongolian"
#. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:151
+#: gui/gdmlanguages.c:153
msgid "N-Z|Norwegian (bokmal)"
msgstr "N-Z|Norwegian (bokmal)"
#. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:153
+#: gui/gdmlanguages.c:155
msgid "N-Z|Norwegian (nynorsk)"
msgstr "N-Z|Norwegian (nynorsk)"
#. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:155
+#: gui/gdmlanguages.c:157
msgid "N-Z|Oriya"
msgstr "N-Z|Oriya"
#. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:157
+#: gui/gdmlanguages.c:159
msgid "N-Z|Panjabi"
msgstr "N-Z|Panjabi"
#. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:159
+#: gui/gdmlanguages.c:161
msgid "N-Z|Persian"
msgstr "N-Z|Persian"
#. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:161
+#: gui/gdmlanguages.c:163
msgid "N-Z|Polish"
msgstr "N-Z|Polish"
#. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:163
+#: gui/gdmlanguages.c:165
msgid "N-Z|Portuguese"
msgstr "N-Z|Portuguese"
#. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:165
+#: gui/gdmlanguages.c:167
msgid "N-Z|Portuguese (Brazilian)"
msgstr "N-Z|Portuguese (Brazilian)"
#. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:167
+#: gui/gdmlanguages.c:169
msgid "N-Z|Romanian"
msgstr "N-Z|Romanian"
#. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:169
+#: gui/gdmlanguages.c:171
msgid "N-Z|Russian"
msgstr "N-Z|Russian"
#. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:171
+#: gui/gdmlanguages.c:173 gui/gdmlanguages.c:175
msgid "N-Z|Serbian"
msgstr "N-Z|Serbian"
#. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:173
+#: gui/gdmlanguages.c:177
+msgid "N-Z|Serbian (Latin)"
+msgstr "N-Z|Serbian (Latin)"
+
+#. Note translate the N-Z to the N-Z you used in the group label
+#: gui/gdmlanguages.c:179
+msgid "N-Z|Serbian (Jekavian)"
+msgstr "N-Z|Serbian (Jekavian)"
+
+#. Note translate the N-Z to the N-Z you used in the group label
+#: gui/gdmlanguages.c:181
msgid "N-Z|Slovak"
msgstr "N-Z|Slovak"
#. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:175
+#: gui/gdmlanguages.c:183
msgid "N-Z|Slovenian"
msgstr "N-Z|Slovenian"
#. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:177
+#: gui/gdmlanguages.c:185
msgid "N-Z|Spanish"
msgstr "N-Z|Spanish"
#. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:179
+#: gui/gdmlanguages.c:187
msgid "N-Z|Spanish (Mexico)"
msgstr "N-Z|Spanish (Mexico)"
#. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:181
+#: gui/gdmlanguages.c:189
msgid "N-Z|Swedish"
msgstr "N-Z|Swedish"
#. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:183
+#: gui/gdmlanguages.c:191
msgid "N-Z|Swedish (Finland)"
msgstr "N-Z|Swedish (Finland)"
#. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:185
+#: gui/gdmlanguages.c:193
msgid "N-Z|Tamil"
msgstr "N-Z|Tamil"
#. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:187
+#: gui/gdmlanguages.c:195
msgid "N-Z|Telugu"
msgstr "N-Z|Telugu"
#. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:189
+#: gui/gdmlanguages.c:197
msgid "N-Z|Thai"
msgstr "N-Z|Thai"
#. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:191
+#: gui/gdmlanguages.c:199
msgid "N-Z|Turkish"
msgstr "N-Z|Turkish"
#. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:193
+#: gui/gdmlanguages.c:201
msgid "N-Z|Ukrainian"
msgstr "N-Z|Ukrainian"
#. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:195
+#: gui/gdmlanguages.c:203
msgid "N-Z|Vietnamese"
msgstr "N-Z|Vietnamese"
#. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:197
+#: gui/gdmlanguages.c:205
msgid "N-Z|Walloon"
msgstr "N-Z|Walloon"
#. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:199
+#: gui/gdmlanguages.c:207
msgid "N-Z|Welsh"
msgstr "N-Z|Welsh"
#. Note translate the N-Z to the N-Z you used in the group label
-#: gui/gdmlanguages.c:201
+#: gui/gdmlanguages.c:209
msgid "N-Z|Yiddish"
msgstr "N-Z|Yiddish"
#. This is the POSIX/C locale for english, should really be in Other
-#: gui/gdmlanguages.c:203
+#: gui/gdmlanguages.c:211
msgid "Other|POSIX/C English"
msgstr "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:378
+#: gui/gdmlanguages.c:407
msgid "A-M"
msgstr "A-M"
#. This should be the same as in the front of the language strings
#. * else the languages will appear in the "Other" submenu
-#: gui/gdmlanguages.c:386
+#: gui/gdmlanguages.c:415
msgid "N-Z"
msgstr "N-Z"
@@ -2718,7 +2733,7 @@ msgstr ""
#. markup
#: gui/gdmlogin.c:860 gui/gdmlogin.c:887 gui/gdmlogin.c:965
-#: gui/greeter/greeter_action_language.c:155 gui/greeter/greeter_session.c:125
+#: gui/greeter/greeter_action_language.c:143 gui/greeter/greeter_session.c:125
#: gui/greeter/greeter_session.c:155
msgid "Make _Default"
msgstr "Make _Default"
@@ -2732,7 +2747,7 @@ msgstr "Just _Log In"
#. untranslated
#. markup
#: gui/gdmlogin.c:879 gui/gdmlogin.c:959
-#: gui/greeter/greeter_action_language.c:149 gui/greeter/greeter_session.c:147
+#: gui/greeter/greeter_action_language.c:137 gui/greeter/greeter_session.c:147
#, c-format
msgid ""
"You have chosen %s for this session, but your default setting is %s.\n"
@@ -2742,7 +2757,7 @@ msgstr ""
"Do you wish to make %s the default for future sessions?"
#: gui/gdmlogin.c:887 gui/gdmlogin.c:965
-#: gui/greeter/greeter_action_language.c:155 gui/greeter/greeter_session.c:155
+#: gui/greeter/greeter_action_language.c:143 gui/greeter/greeter_session.c:155
msgid "Just For _This Session"
msgstr "Just For _This Session"
@@ -2761,8 +2776,8 @@ msgstr ""
#: gui/gdmlogin.c:941 gui/gdmlogin.c:950
#: gui/greeter/greeter_action_language.c:53
-#: gui/greeter/greeter_action_language.c:133
-#: gui/greeter/greeter_action_language.c:141
+#: gui/greeter/greeter_action_language.c:121
+#: gui/greeter/greeter_action_language.c:129
msgid "System Default"
msgstr "System Default"
@@ -3013,11 +3028,11 @@ msgid "Restart"
msgstr "Restart"
#. markup
-#: gui/gdmlogin.c:4069 gui/greeter/greeter.c:1332
+#: gui/gdmlogin.c:4069 gui/greeter/greeter.c:1331
msgid "Session directory is missing"
msgstr "Session directory is missing"
-#: gui/gdmlogin.c:4071 gui/greeter/greeter.c:1334
+#: gui/gdmlogin.c:4071 gui/greeter/greeter.c:1333
msgid ""
"Your session directory is missing or empty! There are two available "
"sessions you can use, but you should log in and correct the gdm "
@@ -3028,11 +3043,11 @@ msgstr ""
"configuration."
#. markup
-#: gui/gdmlogin.c:4095 gui/greeter/greeter.c:1359
+#: gui/gdmlogin.c:4095 gui/greeter/greeter.c:1358
msgid "Configuration is not correct"
msgstr "Configuration is not correct"
-#: gui/gdmlogin.c:4097 gui/greeter/greeter.c:1361
+#: gui/gdmlogin.c:4097 gui/greeter/greeter.c:1360
msgid ""
"The configuration file contains an invalid command line for the login "
"dialog, and thus I ran the default command. Please fix your configuration."
@@ -3041,11 +3056,11 @@ msgstr ""
"dialog, and thus I ran the default command. Please fix your configuration."
#. markup
-#: gui/gdmlogin.c:4122 gui/greeter/greeter.c:1388
+#: gui/gdmlogin.c:4122 gui/greeter/greeter.c:1387
msgid "No configuration was found"
msgstr "No configuration was found"
-#: gui/gdmlogin.c:4124 gui/greeter/greeter.c:1390
+#: gui/gdmlogin.c:4124 gui/greeter/greeter.c:1389
msgid ""
"The configuration was not found. GDM is using defaults to run this "
"session. You should log in and create a configuration file with the GDM "
@@ -3590,17 +3605,17 @@ msgstr ""
"You have probably just upgraded gdm.\n"
"Please restart the gdm daemon or reboot the computer."
-#: gui/greeter/greeter.c:1172
+#: gui/greeter/greeter.c:1171
#, c-format
msgid "There was an error loading the theme %s"
msgstr "There was an error loading the theme %s"
#. markup
-#: gui/greeter/greeter.c:1225
+#: gui/greeter/greeter.c:1224
msgid "The theme for the graphical greeter is corrupt"
msgstr "The theme for the graphical greeter is corrupt"
-#: gui/greeter/greeter.c:1228
+#: gui/greeter/greeter.c:1227
msgid ""
"The theme does not contain definition for the username/password entry "
"element."
@@ -3609,7 +3624,7 @@ msgstr ""
"element."
#. markup
-#: gui/greeter/greeter.c:1261
+#: gui/greeter/greeter.c:1260
msgid ""
"There was an error loading the theme, and the default theme also could not "
"have been loaded, I will attempt to start the standard greeter"
@@ -3618,7 +3633,7 @@ msgstr ""
"have been loaded, I will attempt to start the standard greeter"
#. markup
-#: gui/greeter/greeter.c:1283
+#: gui/greeter/greeter.c:1282
msgid ""
"I could not start the standard greeter. This display will abort and you may "
"have to login another way and fix the installation of gdm"
@@ -3630,11 +3645,11 @@ msgstr ""
msgid "Last"
msgstr "Last"
-#: gui/greeter/greeter_action_language.c:206
+#: gui/greeter/greeter_action_language.c:195
msgid "Select a language"
msgstr "Select a language"
-#: gui/greeter/greeter_action_language.c:223
+#: gui/greeter/greeter_action_language.c:212
msgid "Select a language for your session to use:"
msgstr "Select a language for your session to use:"
@@ -3851,4 +3866,3 @@ msgstr "No interface could be loaded, BAD! (file: %s)"
#: 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"
-