Updated Canadian English translation.

	* en_CA.po: Updated Canadian English translation.

po/ChangeLog

+2005-01-26  Adam Weinberger  <adamw@gnome.org>
+
+	* en_CA.po: Updated Canadian English translation.
+
 2005-01-25  Duarte Loreto <happyguy_pt@hotmail.com>
 
 	* pt.po: Updated Portuguese translation.

po/en_CA.po

 # English/Canada translation of gdm2.
-# Copyright (C) 2004 Adam Weinberger and the GNOME Foundation
+# Copyright (C) 2005 Adam Weinberger and the GNOME Foundation
 # This file is distributed under the same licence as the gdm2 package.
-# Adam Weinberger <adamw@gnome.org>, 2004.
+# Adam Weinberger <adamw@gnome.org>, 2004, 2005.
 # 
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: gdm2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-03 14:04-0500\n"
-"PO-Revision-Date: 2004-12-03 10:41-0400\n"
+"POT-Creation-Date: 2005-01-26 00:50-0500\n"
+"PO-Revision-Date: 2005-01-26 10:41-0400\n"
 "Last-Translator: Adam Weinberger <adamw@gnome.org>\n"
 "Language-Team: English/Canada <adamw@FreeBSD.org>\n"
 "MIME-Version: 1.0\n"
@@ -184,6 +184,16 @@ msgstr "%s: Ignoring suspiciously looking cookie file %s"
 msgid "Can't write to %s: %s"
 msgstr "Can't write to %s: %s"
 
+#. This means we have no clue what's happening,
+#. * it's not X server crashing as we would have
+#. * cought that elsewhere.  Things are just
+#. * not working out, so tell the user.
+#. * However this may have been caused by a malicious local user
+#. * zapping the display repeatedly, that shouldn't cause gdm
+#. * to stop working completely so just wait for 2 minutes,
+#. * 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:114
 #, c-format
 msgid ""
@@ -689,8 +699,8 @@ msgstr "Only root wants to run gdm\n"
 #: daemon/slave.c:825 daemon/slave.c:835 daemon/slave.c:845 daemon/slave.c:857
 #: gui/gdmchooser.c:1936 gui/gdmchooser.c:1939 gui/gdmchooser.c:1942
 #: gui/gdmlogin.c:3958 gui/gdmlogin.c:3966 gui/gdmlogin.c:3969
-#: gui/greeter/greeter.c:1085 gui/greeter/greeter.c:1093
-#: gui/greeter/greeter.c:1096
+#: gui/greeter/greeter.c:1086 gui/greeter/greeter.c:1094
+#: gui/greeter/greeter.c:1097
 #, c-format
 msgid "%s: Error setting up %s signal handler: %s"
 msgstr "%s: Error setting up %s signal handler: %s"
@@ -708,6 +718,8 @@ msgstr "%s: Error setting up CHLD signal handler"
 msgid "FLEXI_XSERVER request denied: Not authenticated"
 msgstr "FLEXI_XSERVER request denied: Not authenticated"
 
+#. Don't print the name to syslog as it might be
+#. * long and dangerous
 #: daemon/gdm.c:3670
 msgid "Unknown server type requested, using standard server."
 msgstr "Unknown server type requested, using standard server."
@@ -807,6 +819,7 @@ msgstr "Display %s is busy. There is another X server running already."
 msgid "%s: Error opening a pipe: %s"
 msgstr "%s: Error opening a pipe: %s"
 
+#. Send X too busy
 #: daemon/server.c:794
 #, c-format
 msgid "%s: Cannot find a free display number"
@@ -1022,11 +1035,11 @@ msgstr "%s: Cannot start greeter trying default: %s"
 
 #: daemon/slave.c:2665
 msgid ""
-"Cannot start the greeter program, you will not be able to log in.  This "
+"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 "
 "configuration file"
 msgstr ""
-"Cannot start the greeter program, you will not be able to log in.  This "
+"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 "
 "configuration file"
 
@@ -1188,6 +1201,7 @@ msgstr "Error! Unable to set executable context."
 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:3814
 msgid "Cannot start the session due to some internal error."
 msgstr "Cannot start the session due to some internal error."
@@ -1822,6 +1836,7 @@ msgstr "GDM is not running"
 msgid "Please ask your system administrator to start it."
 msgstr "Please ask your system administrator to start it."
 
+#. markup
 #: gui/gdmXnestchooser.c:623
 msgid "Could not find a free display number"
 msgstr "Could not find a free display number"
@@ -1953,7 +1968,7 @@ msgid "Can't open default host icon: %s"
 msgstr "Can't open default host icon: %s"
 
 #: gui/gdmchooser.c:1950 gui/gdmlogin.c:3977 gui/gdmlogin.c:3984
-#: gui/greeter/greeter.c:1104 gui/greeter/greeter.c:1111
+#: gui/greeter/greeter.c:1105 gui/greeter/greeter.c:1112
 msgid "Could not set signal mask!"
 msgstr "Could not set signal mask!"
 
@@ -1997,6 +2012,7 @@ msgstr ""
 "probably just upgraded gdm.  Please restart the gdm daemon or reboot the "
 "computer."
 
+#. markup
 #: gui/gdmcomm.c:405 gui/gdmphotosetup.c:70
 msgid "GDM (The GNOME Display Manager) is not running."
 msgstr "GDM (The GNOME Display Manager) is not running."
@@ -2017,6 +2033,7 @@ msgstr ""
 "If you still wish to use this feature, either start GDM yourself or ask your "
 "system administrator to start GDM."
 
+#. markup
 #: gui/gdmcomm.c:433 gui/gdmflexiserver.c:697
 msgid "Cannot communicate with GDM (The GNOME Display Manager)"
 msgstr "Cannot communicate with GDM (The GNOME Display Manager)"
@@ -2205,6 +2222,7 @@ msgstr "Debugging output"
 msgid "Authenticate before running --command"
 msgstr "Authenticate before running --command"
 
+#. markup
 #: gui/gdmflexiserver.c:725
 msgid "You do not seem to have the authentication needed for this operation"
 msgstr "You do not seem to have the authentication needed for this operation"
@@ -2213,6 +2231,7 @@ msgstr "You do not seem to have the authentication needed for this operation"
 msgid "Perhaps your .Xauthority file is not set up correctly."
 msgstr "Perhaps your .Xauthority file is not set up correctly."
 
+#. markup
 #: gui/gdmflexiserver.c:753
 msgid "You do not seem to be logged in on the console"
 msgstr "You do not seem to be logged in on the console"
@@ -2740,12 +2759,12 @@ msgid "_Suspend"
 msgstr "_Suspend"
 
 #: gui/gdmlogin.c:685 gui/gdmlogin.c:3752 gui/greeter/greeter.c:164
-#: gui/greeter/greeter.c:858
+#: gui/greeter/greeter.c:859
 msgid "Welcome"
 msgstr "Welcome"
 
 #: gui/gdmlogin.c:688 gui/gdmlogin.c:3755 gui/greeter/greeter.c:167
-#: gui/greeter/greeter.c:861
+#: gui/greeter/greeter.c:862
 #, c-format
 msgid "Welcome to %n"
 msgstr "Welcome to %n"
@@ -2774,6 +2793,10 @@ msgstr "Make _Default"
 msgid "Just _Log In"
 msgstr "Just _Log In"
 
+#. never_encoding
+#. no_group
+#. untranslated
+#. markup
 #: gui/gdmlogin.c:879 gui/gdmlogin.c:959
 #: gui/greeter/greeter_action_language.c:137 gui/greeter/greeter_session.c:147
 #, c-format
@@ -2905,6 +2928,9 @@ msgstr "_Other"
 msgid "_Password:"
 msgstr "_Password:"
 
+#. markup
+#. translators:  This is a nice and evil eggie text, translate
+#. * to your favourite currency
 #: gui/gdmlogin.c:2130 gui/greeter/greeter.c:434
 msgid "Please insert 25 cents to log in."
 msgstr "Please insert 25 cents to log in."
@@ -3010,8 +3036,8 @@ msgstr "Too many users to list here..."
 
 #. markup
 #: gui/gdmlogin.c:3831 gui/gdmlogin.c:3862 gui/gdmlogin.c:3906
-#: gui/greeter/greeter.c:637 gui/greeter/greeter.c:668
-#: gui/greeter/greeter.c:713
+#: gui/greeter/greeter.c:637 gui/greeter/greeter.c:669
+#: gui/greeter/greeter.c:714
 msgid "Cannot start the greeter"
 msgstr "Cannot start the greeter"
 
@@ -3026,8 +3052,8 @@ msgstr ""
 "probably just upgraded gdm.  Please restart the gdm daemon or reboot the "
 "computer."
 
-#: gui/gdmlogin.c:3869 gui/gdmlogin.c:3915 gui/greeter/greeter.c:675
-#: gui/greeter/greeter.c:722
+#: gui/gdmlogin.c:3869 gui/gdmlogin.c:3915 gui/greeter/greeter.c:676
+#: gui/greeter/greeter.c:723
 msgid "Reboot"
 msgstr "Reboot"
 
@@ -3042,16 +3068,16 @@ msgstr ""
 "probably just upgraded gdm.  Please restart the gdm daemon or reboot the "
 "computer."
 
-#: gui/gdmlogin.c:3913 gui/greeter/greeter.c:720
+#: gui/gdmlogin.c:3913 gui/greeter/greeter.c:721
 msgid "Restart"
 msgstr "Restart"
 
 #. markup
-#: gui/gdmlogin.c:4099 gui/greeter/greeter.c:1335
+#: gui/gdmlogin.c:4099 gui/greeter/greeter.c:1340
 msgid "Session directory is missing"
 msgstr "Session directory is missing"
 
-#: gui/gdmlogin.c:4101 gui/greeter/greeter.c:1337
+#: gui/gdmlogin.c:4101 gui/greeter/greeter.c:1342
 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 "
@@ -3062,11 +3088,11 @@ msgstr ""
 "configuration."
 
 #. markup
-#: gui/gdmlogin.c:4125 gui/greeter/greeter.c:1362
+#: gui/gdmlogin.c:4125 gui/greeter/greeter.c:1367
 msgid "Configuration is not correct"
 msgstr "Configuration is not correct"
 
-#: gui/gdmlogin.c:4127 gui/greeter/greeter.c:1364
+#: gui/gdmlogin.c:4127 gui/greeter/greeter.c:1369
 msgid ""
 "The configuration file contains an invalid command line for the login "
 "dialog, and thus I ran the default command.  Please fix your configuration."
@@ -3075,11 +3101,11 @@ msgstr ""
 "dialogue, and thus I ran the default command.  Please fix your configuration."
 
 #. markup
-#: gui/gdmlogin.c:4152 gui/greeter/greeter.c:1391
+#: gui/gdmlogin.c:4152 gui/greeter/greeter.c:1396
 msgid "No configuration was found"
 msgstr "No configuration was found"
 
-#: gui/gdmlogin.c:4154 gui/greeter/greeter.c:1393
+#: gui/gdmlogin.c:4154 gui/greeter/greeter.c:1398
 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 "
@@ -3089,6 +3115,7 @@ msgstr ""
 "session.  You should log in and create a configuration file with the GDM "
 "configuration program."
 
+#. markup
 #: gui/gdmphotosetup.c:144
 msgid "The face browser is not configured"
 msgstr "The face browser is not configured"
@@ -3488,6 +3515,7 @@ msgstr "Ping interval (seconds):"
 msgid "XDMCP"
 msgstr "XDMCP"
 
+#. markup
 #: gui/gdmsetup.c:164
 msgid ""
 "An error occured while trying to contact the login screens.  Not all updates "
@@ -3538,6 +3566,8 @@ msgstr "Not a theme archive"
 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:1973
 #, c-format
 msgid ""
@@ -3545,6 +3575,7 @@ msgid ""
 msgstr ""
 "Theme directory '%s' seems to be already installed, install again anyway?"
 
+#. markup
 #: gui/gdmsetup.c:2059
 msgid "Some error occured when installing the theme"
 msgstr "Some error occured when installing the theme"
@@ -3562,6 +3593,7 @@ msgstr "_Install"
 msgid "Do you really wish to remove theme '%s' from the system?"
 msgstr "Do you really wish to remove theme '%s' from the system?"
 
+#. This is the temporary help dialog
 #: gui/gdmsetup.c:2386
 #, c-format
 msgid ""
@@ -3596,7 +3628,7 @@ msgid "A graphical application for configuring the GNOME Display Manager (GDM)"
 msgstr ""
 "A graphical application for configuring the GNOME Display Manager (GDM)"
 
-#: gui/greeter/greeter.c:638 gui/greeter/greeter.c:669
+#: gui/greeter/greeter.c:638 gui/greeter/greeter.c:670
 #, c-format
 msgid ""
 "The greeter version (%s) does not match the daemon version.\n"
@@ -3607,7 +3639,7 @@ msgstr ""
 "You have probably just upgraded gdm.\n"
 "Please restart the gdm daemon or reboot the computer."
 
-#: gui/greeter/greeter.c:714
+#: gui/greeter/greeter.c:715
 #, c-format
 msgid ""
 "The greeter version (%s) does not match the daemon version (%s).\n"
@@ -3618,16 +3650,17 @@ msgstr ""
 "You have probably just upgraded gdm.\n"
 "Please restart the gdm daemon or reboot the computer."
 
-#: gui/greeter/greeter.c:1173
+#: gui/greeter/greeter.c:1174
 #, c-format
 msgid "There was an error loading the theme %s"
 msgstr "There was an error loading the theme %s"
 
-#: gui/greeter/greeter.c:1226
+#. markup
+#: gui/greeter/greeter.c:1228
 msgid "The theme for the graphical greeter is corrupt"
 msgstr "The theme for the graphical greeter is corrupt"
 
-#: gui/greeter/greeter.c:1229
+#: gui/greeter/greeter.c:1231
 msgid ""
 "The theme does not contain definition for the username/password entry "
 "element."
@@ -3635,7 +3668,8 @@ msgstr ""
 "The theme does not contain definition for the username/password entry "
 "element."
 
-#: gui/greeter/greeter.c:1262
+#. markup
+#: gui/greeter/greeter.c:1265
 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"
@@ -3643,7 +3677,8 @@ msgstr ""
 "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"
 
-#: gui/greeter/greeter.c:1284
+#. markup
+#: gui/greeter/greeter.c:1288
 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"