Updated Japanese translation.

2001-12-14  Akira TAGOH  <tagoh@gnome.gr.jp>

	* ja.po: Updated Japanese translation.

2 files changed, 1049 insertions, 795 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index f605e09c..cdcc22ee 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2001-12-14  Akira TAGOH  <tagoh@gnome.gr.jp>
+
+	* ja.po: Updated Japanese translation.
+
 2001-12-13  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* no.po: Updated Norwegian (bokmål) translation.
diff --git a/po/ja.po b/po/ja.po
index 8593318d..c3e8bc2d 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,99 +6,119 @@
 # Yukihior Nakai <nakai@gnome.gr.jp>, 2000-2001.
 # Taku YASUI <tach@debian.or.jp>, 2001.
 # SATO Satoru <ss@gnome.gr.jp>, 2001.
+# Akira TAGOH <tagoh@gnome.gr.jp>, 2001.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gdm 2.0beta5\n"
-"POT-Creation-Date: 2001-09-05 17:00-0400\n"
-"PO-Revision-Date: 2001-02-19 16:23+09:00\n"
-"Last-Translator: Yukihiro Nakai <nakai@gnome.gr.jp>\n"
+"Project-Id-Version: gdm CVS-20011214\n"
+"POT-Creation-Date: 2001-12-14 17:23+0900\n"
+"PO-Revision-Date: 2001-12-14 20:17+0900\n"
+"Last-Translator: Akira TAGOH <tagoh@gnome.gr.jp>\n"
 "Language-Team: Japanese <translation@gnome.gr.jp>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=euc-jp\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: daemon/auth.c:144
+#, c-format
+msgid "%s: Could not make new cookie file in %s"
+msgstr "%s: %s ¤Ë¿·µ¬¥¯¥Ã¥­¡¼¥Õ¥¡¥¤¥ë¤òºîÀ®¤¹¤ë¤³¤È¤¬½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿"
+
 #. Really no need to clean up here - this process is a goner anyway
-#: daemon/auth.c:272 daemon/auth.c:303
+#: daemon/auth.c:367 daemon/auth.c:398
 #, c-format
 msgid "gdm_auth_user_add: Could not open cookie file %s"
-msgstr "gdm_auth_user_add: ¥¯¥Ã¥­¡¼¥Õ¥¡¥¤¥ë %s ¤ò³«¤¯¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¡£"
+msgstr "gdm_auth_user_add: ¥¯¥Ã¥­¡¼¥Õ¥¡¥¤¥ë %s ¤ò³«¤¯¤³¤È¤¬½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿"
 
-#: daemon/auth.c:289
+#: daemon/auth.c:384
 #, c-format
 msgid "gdm_auth_user_add: Could not lock cookie file %s"
-msgstr "gdm_auth_user_add: ¥¯¥Ã¥­¡¼¥Õ¥¡¥¤¥ë %s ¤ò¥í¥Ã¥¯¤Ç¤­¤Þ¤»¤ó¡£"
+msgstr "gdm_auth_user_add: ¥¯¥Ã¥­¡¼¥Õ¥¡¥¤¥ë %s ¤ò¥í¥Ã¥¯¤¹¤ë¤³¤È¤¬½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿"
 
-#: daemon/auth.c:376
+#: daemon/auth.c:473
 #, c-format
 msgid "gdm_auth_user_remove: Ignoring suspiciously looking cookie file %s"
 msgstr "gdm_auth_user_remove: ²ø¤·¤²¤Ê¥¯¥Ã¥­¡¼¥Õ¥¡¥¤¥ë %s ¤ò̵»ë¤·¤Þ¤¹¡£"
 
-#: daemon/display.c:94
+#. 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
+#: daemon/display.c:95
 #, c-format
 msgid ""
 "Failed to start the display server several times in a short time period; "
 "disabling display %s"
-msgstr ""
-"û´ü´Ö¤Ë¿ô²ó¤Î X ¥µ¡¼¥Ð¤Îµ¯Æ°¤ò»î¤ß¤Þ¤·¤¿¤¬¼ºÇÔ¡¢¥Ç¥£¥¹¥×¥ì¥¤ %s ¤ò̵¸ú²½"
+msgstr "û´ü´Ö¤Ë¿ô²ó¤Î X ¥µ¡¼¥Ð¤Îµ¯Æ°¤ò»î¤ß¤Þ¤·¤¿¤¬¼ºÇÔ¤·¤Þ¤·¤¿¡¢¥Ç¥£¥¹¥×¥ì¥¤ %s ¤ò̵¸ú¤Ë¤·¤Þ¤¹"
 
-#: daemon/display.c:209
+#: daemon/display.c:222
+#, c-format
 msgid "gdm_display_manage: Failed forking gdm slave process for %s"
-msgstr "gdm_display_manage: %s¤Çgdm¥¹¥ì¡¼¥Ö¥×¥í¥»¥¹¤ò¥Õ¥©¡¼¥¯¤¹¤ë¤Î¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
+msgstr ""
+"gdm_display_manage: %s¤Çgdm¥¹¥ì¡¼¥Ö¥×¥í¥»¥¹¤ò¥Õ¥©¡¼¥¯¤¹¤ë¤Î¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: daemon/errorgui.c:164
+#: daemon/errorgui.c:169
 msgid "gdm_error_box: Failed to execute self"
-msgstr "gdm_error_box: ¼Â¹Ô¤Ë¼ºÇÔ"
+msgstr "gdm_error_box: ¼Â¹Ô¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: daemon/errorgui.c:170
+#: daemon/errorgui.c:174
 msgid "gdm_error_box: Cannot fork to display error/info box"
-msgstr "gdm_error_box: ¥¨¥é¡¼/¾ðÊó¥Ü¥Ã¥¯¥¹É½¼¨¤Îfork¤Ë¼ºÇÔ"
+msgstr "gdm_error_box: ¥¨¥é¡¼/¾ðÊó¥Ü¥Ã¥¯¥¹É½¼¨¤Îfork¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: daemon/filecheck.c:51
+#: daemon/errorgui.c:311 daemon/errorgui.c:447
+msgid "gdm_failsafe_question: Failed to execute self"
+msgstr "gdm_failsafe_question: ¼Â¹Ô¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
+
+#: daemon/errorgui.c:329 daemon/errorgui.c:467
+msgid "gdm_failsafe_question: Cannot fork to display error/info box"
+msgstr "gdm_failsafe_question: ¥¨¥é¡¼/¾ðÊó¥Ü¥Ã¥¯¥¹É½¼¨¤Îfork¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
+
+#: daemon/filecheck.c:49
 #, c-format
 msgid "%s: Directory %s does not exist."
 msgstr "%s: ¥Ç¥£¥ì¥¯¥È¥ê %s ¤¬Â¸ºß¤·¤Þ¤»¤ó¡£"
 
-#: daemon/filecheck.c:58 daemon/filecheck.c:99
+#: daemon/filecheck.c:56 daemon/filecheck.c:97
 #, c-format
 msgid "%s: %s is not owned by uid %d."
 msgstr "%s: %s ¤Ï uid %d ¤Î½êÍ­¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: daemon/filecheck.c:64 daemon/filecheck.c:106
+#: daemon/filecheck.c:62 daemon/filecheck.c:104
 #, c-format
 msgid "%s: %s is writable by group."
 msgstr "%s: %s ¤¬¥°¥ë¡¼¥×½ñ¤­¹þ¤ß²Ä¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£"
 
-#: daemon/filecheck.c:70
+#: daemon/filecheck.c:68
 #, c-format
 msgid "%s: %s is writable by other."
 msgstr "%s: %s ¤¬ other ¤Ë¤è¤ë½ñ¤­¹þ¤ß²Ä¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£"
 
-#: daemon/filecheck.c:84
+#: daemon/filecheck.c:82
+#, c-format
 msgid "%s: %s does not exist but must exist."
 msgstr "%s: %s¤Ï¸ºß¤·¤Þ¤»¤ó¤¬É¬¤ºÉ¬ÍפǤ¹¡£"
 
-#: daemon/filecheck.c:92
+#: daemon/filecheck.c:90
 #, c-format
 msgid "%s: %s is not a regular file."
 msgstr "%s: %s¤ÏÄ̾ï¤Î¥Õ¥¡¥¤¥ë¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: daemon/filecheck.c:113
+#: daemon/filecheck.c:111
 #, c-format
 msgid "%s: %s is writable by group/other."
 msgstr "%s: %s ¤¬ group/other ¤Ë¤è¤ë½ñ¤­¹þ¤ß²Ä¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£"
 
-#: daemon/filecheck.c:120
+#: daemon/filecheck.c:118
 #, c-format
 msgid "%s: %s is bigger than sysadmin specified maximum file size."
 msgstr "%s: %s ¤¬´ÉÍý¼Ô¤Ë¤è¤Ã¤Æ»ØÄꤵ¤ì¤¿ºÇÂç¥Õ¥¡¥¤¥ë¥µ¥¤¥º¤òĶ¤¨¤Æ¤¤¤Þ¤¹¡£"
 
-#: daemon/gdm.c:194
+#: daemon/gdm.c:205
 #, c-format
 msgid "gdm_config_parse: No configuration file: %s. Using defaults."
 msgstr "gdm_config_parse: ÀßÄê¥Õ¥¡¥¤¥ë %s ¤¬¤Ê¤¤¤Î¤Çɸ½àÀßÄê¤ò»È¤¤¤Þ¤¹"
 
-#: daemon/gdm.c:279
+#: daemon/gdm.c:288
 msgid ""
 "gdm_config_parse: XDMCP was enabled while there is no XDMCP support, turning "
 "it off"
@@ -106,113 +126,176 @@ msgstr ""
 "gdm_config_parse: XDMCP ¤Ï̤¥µ¥Ý¡¼¥È¤Ê¤Î¤ËÍ­¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¤Î¤Ç¡¢Ìµ¸ú¤Ë¤·¤Þ"
 "¤¹"
 
-#: daemon/gdm.c:292
+#: daemon/gdm.c:301
 msgid ""
 "gdm_config_parse: Root cannot be autologged in, turing off automatic login"
 msgstr ""
 "gdm_config_parse: root¼«Æ°¥í¥°¥¤¥ó¤Ç¤­¤Ê¤¤¤Î¤Ç¡¢¼«Æ°¥í¥°¥¤¥ó¤ò̵¸ú¤Ë¤·¤Þ¤¹"
 
-#: daemon/gdm.c:305
+#: daemon/gdm.c:314
 msgid "gdm_config_parse: Root cannot be autologged in, turing off timed login"
 msgstr ""
 "gdm_config_parse: root¤Ï¼«Æ°¥í¥°¥¤¥ó¤Ç¤­¤Þ¤»¤ó¤Î¤Ç»þ´Ö¥í¥°¥¤¥ó¤ò̵¸ú¤Ë¤·¤Þ¤¹"
 
-#: daemon/gdm.c:311
+#: daemon/gdm.c:320
 msgid "gdm_config_parse: TimedLoginDelay less then 5, so I will just use 5."
 msgstr "gdm_config_parse: TimedLoginDelay¤¬5 ̤Ëþ¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤Î¤Ç5¤Ë¤·¤Þ¤¹"
 
-#: daemon/gdm.c:321
+#: daemon/gdm.c:330
 msgid "gdm_config_parse: No greeter specified."
 msgstr "gdm_config_parse: greeter¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó¡£"
 
-#: daemon/gdm.c:325
+#: daemon/gdm.c:334
+msgid "No daemon/ServAuthDir specified in the configuration file"
+msgstr "ÀßÄê¥Õ¥¡¥¤¥ë¤Ç»ØÄꤵ¤ì¤¿ daemon/ServAuthDir ¤¬¤¢¤ê¤Þ¤»¤ó"
+
+#: daemon/gdm.c:335
 msgid "gdm_config_parse: No authdir specified."
 msgstr "gdm_config_parse: authdir¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó¡£"
 
-#: daemon/gdm.c:331
+#: daemon/gdm.c:342
 msgid "gdm_config_parse: No sessions directory specified."
 msgstr "gdm_config_parse: sessions¥Ç¥£¥ì¥¯¥È¥ê¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó¡£"
 
-#: daemon/gdm.c:355
+#: daemon/gdm.c:366
+#, c-format
 msgid "%s: Empty server command, using standard one."
 msgstr "%s: ¥µ¡¼¥Ð¥³¥Þ¥ó¥É¤¬¶õ¤Ç¤¹¡£É¸½à¤Î¤â¤Î¤ò»È¤¤¤Þ¤¹¡£"
 
-#: daemon/gdm.c:400
+#: daemon/gdm.c:411
 #, c-format
 msgid "%s: Display number %d in use!  I will use %d"
 msgstr "%s: ¥Ç¥£¥¹¥×¥ì¥¤ÈÖ¹æ%d¤Ï»È¤ï¤ì¤Æ¤¤¤Þ¤¹! %d¤ò»È¤¤¤Þ¤¹¡£"
 
-#: daemon/gdm.c:415
+#: daemon/gdm.c:428
 msgid "gdm_config_parse: Invalid server line in config file. Ignoring!"
 msgstr "gdm_config_parse: ÀßÄê¥Õ¥¡¥¤¥ë¤ËÀµ¤·¤¯¤Ê¤¤ server ¹Ô¤¬¤¢¤ê¤Þ¤¹¡£Ìµ»ë!"
 
 #. start
 #. server uid
-#: daemon/gdm.c:434
+#: daemon/gdm.c:447
+#, c-format
 msgid ""
 "%s: Xdmcp disabled and no local servers defined. Adding /usr/bin/X11/X on :%"
 "d to allow configuration!"
 msgstr ""
-"%s: XDMCP¤¬Ìµ¸ú¤Ç¡¢¥í¡¼¥«¥ë¥µ¡¼¥Ð¤Î»ØÄ꤬¤¢¤ê¤Þ¤»¤ó¡£/usr/bin/"
-"X11/X ¤ò :%d ¤Ë¤Ä¤¤¤ÆÀßÄê¤òµö²Ä¤¹¤ë¤è¤¦¤Ë¤·¤Æ²¼¤µ¤¤!"
+"%s: XDMCP¤¬Ìµ¸ú¤Ç¡¢¥í¡¼¥«¥ë¥µ¡¼¥Ð¤Î»ØÄ꤬¤¢¤ê¤Þ¤»¤ó¡£/usr/bin/X11/X ¤ò :%d ¤Ë"
+"¤Ä¤¤¤ÆÀßÄê¤òµö²Ä¤¹¤ë¤è¤¦¤Ë¤·¤Æ²¼¤µ¤¤!"
 
-#: daemon/gdm.c:448
+#: daemon/gdm.c:461
+#, c-format
+msgid ""
+"Xdmcp is disabled and gdm cannot find any local server to start.  Aborting!  "
+"Please correct the configuration %sand restart gdm."
+msgstr "XDMCP¤¬Ìµ¸ú¤Ç¡¢gdm¤¬³«»Ï¤¹¤ë¤¿¤á¤Î¥í¡¼¥«¥ë¥µ¡¼¥Ð¤ò¸«¤Ä¤±¤ë¤³¤È¤¬½ÐÍè¤Þ¤»¤ó¡£ÃæÃǤ·¤Þ¤¹!  ÀßÄê¥Õ¥¡¥¤¥ë %s ¤òÄûÀµ¤·¤Ægdm¤òºÆµ¯Æ°¤·¤Æ¤¯¤À¤µ¤¤"
+
+#: daemon/gdm.c:468
 msgid ""
 "gdm_config_parse: Xdmcp disabled and no local servers defined. Aborting!"
 msgstr ""
 "gdm_config_parse: XDMCP¤¬Ìµ¸ú¤Ç¡¢¥í¡¼¥«¥ë¥µ¡¼¥Ð¤Î»ØÄê¤â¤¢¤ê¤Þ¤»¤ó¤Î¤Ç¡¢Ãæ»ß¤·"
 "¤Þ¤¹¡£"
 
-#: daemon/gdm.c:457
+#: daemon/gdm.c:476
 #, c-format
 msgid "gdm_config_parse: Can't find the gdm user (%s). Trying 'nobody'!"
 msgstr "gdm_config_parse: gdm¥æ¡¼¥¶(%s)¤¬¤Ê¤¤¤Î¤Ç¡¢'nobody'¤ò»î¤·¤Þ¤¹"
 
-#: daemon/gdm.c:464
+#: daemon/gdm.c:483
+#, c-format
+msgid ""
+"The gdm user does not exist.  Please correct gdm configuration %s and "
+"restart gdm."
+msgstr "gdm¥æ¡¼¥¶¤¬Â¸ºß¤·¤Þ¤»¤ó¡£gdmÀßÄê¥Õ¥¡¥¤¥ë %s ¤òÄûÀµ¤·¤Ægdm¤òºÆµ¯Æ°¤·¤Æ¤¯¤À¤µ¤¤"
+
+#: daemon/gdm.c:488
 #, c-format
 msgid "gdm_config_parse: Can't find the gdm user (%s). Aborting!"
 msgstr "gdm_config_parse: gdm¥æ¡¼¥¶(%s)¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¡£Ãæ»ß¤·¤Þ¤¹¡£"
 
-#: daemon/gdm.c:469
+#: daemon/gdm.c:494
+#, c-format
+msgid ""
+"The gdm user is set to be root, but this is not allowed since it can pose a "
+"security risk.  Please correct gdm configuration %s and restart gdm."
+msgstr "gdm¥æ¡¼¥¶¤¬root¤ËÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹¡£¤³¤ì¤Ï¥»¥­¥å¥ê¥Æ¥£ÌäÂê¤ò°ú¤­µ¯¤³¤¹¤¿¤áµö²Ä½ÐÍè¤Þ¤»¤ó¡£gdmÀßÄê¥Õ¥¡¥¤¥ë %s ¤òÄûÀµ¤·¤Ægdm¤òºÆµ¯Æ°¤·¤Æ¤¯¤À¤µ¤¤"
+
+#: daemon/gdm.c:500
 msgid "gdm_config_parse: The gdm user should not be root. Aborting!"
 msgstr "gdm_config_parse: gdm¥æ¡¼¥¶¤¬root¤Ç¤¢¤Ã¤Æ¤Ï¤¤¤±¤Þ¤»¤ó¡£Ãæ»ß¤·¤Þ¤¹¡£"
 
-#: daemon/gdm.c:474
+#: daemon/gdm.c:506
 #, c-format
 msgid "gdm_config_parse: Can't find the gdm group (%s). Trying 'nobody'!"
 msgstr "gdm_config_parse: gdm¥°¥ë¡¼¥×(%s)¤¬¤ß¤Ä¤«¤ê¤Þ¤»¤ó¡£'nobody'¤ò»î¹Ô!"
 
-#: daemon/gdm.c:481
+#: daemon/gdm.c:513
+#, c-format
+msgid ""
+"The gdm group does not exist.  Please correct gdm configuration %s and "
+"restart gdm."
+msgstr "gdm¥°¥ë¡¼¥×¤¬Â¸ºß¤·¤Þ¤»¤ó¡£gdmÀßÄê¥Õ¥¡¥¤¥ë %s ¤òÄûÀµ¤·¤Ægdm¤òºÆµ¯Æ°¤·¤Æ¤¯¤À¤µ¤¤"
+
+#: daemon/gdm.c:518
 #, c-format
 msgid "gdm_config_parse: Can't find the gdm group (%s). Aborting!"
 msgstr "gdm_config_parse: gdm¥°¥ë¡¼¥×(%s)¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¡£Ãæ»ß¤·¤Þ¤¹¡£"
 
-#: daemon/gdm.c:486
+#: daemon/gdm.c:524
+#, c-format
+msgid ""
+"The gdm group is set to be root, but this is not allowed since it can pose a "
+"security risk.  Please correct gdm configuration %s and restart gdm."
+msgstr "gdm¥°¥ë¡¼¥×¤¬root¤ËÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹¡£¤³¤ì¤Ï¥»¥­¥å¥ê¥Æ¥£ÌäÂê¤ò°ú¤­µ¯¤³¤¹¤¿¤áµö²Ä½ÐÍè¤Þ¤»¤ó¡£gdm¤ÎÀßÄê¥Õ¥¡¥¤¥ë %s ¤òÄûÀµ¤·¤Ægdm¤òºÆµ¯Æ°¤·¤Æ¤¯¤À¤µ¤¤"
+
+#: daemon/gdm.c:530
 msgid "gdm_config_parse: The gdm group should not be root. Aborting!"
 msgstr "gdm_config_parse: gdm¥°¥ë¡¼¥×¤¬root¤Ç¤¢¤Ã¤Æ¤Ï¤¤¤±¤Þ¤»¤ó¡£Ãæ»ß¤·¤Þ¤¹¡£"
 
-#: daemon/gdm.c:497
+#: daemon/gdm.c:541
 #, c-format
 msgid "%s: Greeter not found or can't be executed by the gdm user"
 msgstr "%s: Greeter¤¬Â¸ºß¤·¤Ê¤¤¤«¡¢gdm¥æ¡¼¥¶¤Ë¤Ä¤¤¤Æ¼Â¹Ô²Äǽ¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤»¤ó"
 
-#: daemon/gdm.c:509
+#: daemon/gdm.c:553
 #, c-format
 msgid "%s: Chooser not found or it can't be executed by the gdm user"
 msgstr "%s: Chooser¤¬Â¸ºß¤·¤Ê¤¤¤«¡¢gdm¥æ¡¼¥¶¤Ë¤Ä¤¤¤Æ¼Â¹Ô²Äǽ¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤»¤ó"
 
-#: daemon/gdm.c:517
+#: daemon/gdm.c:561
+#, c-format
+msgid ""
+"Server Authorization directory (daemon/ServAuthDir) is set to %s but this "
+"does not exist.  Please correct gdm configuration %s and restart gdm."
+msgstr "¥µ¡¼¥Ðǧ¾Ú¥Ç¥£¥ì¥¯¥È¥ê (daemon/ServAuthDir) ¤¬ %s ¤ËÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢¤³¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ï¸ºß¤·¤Þ¤»¤ó¡£gdmÀßÄê¥Õ¥¡¥¤¥ë %s ¤òÄûÀµ¤·¤Ægdm¤òºÆµ¯Æ°¤·¤Æ¤¯¤À¤µ¤¤"
+
+#: daemon/gdm.c:568
 #, c-format
 msgid "gdm_config_parse: Authdir %s does not exist. Aborting."
 msgstr "gdm_config_parse: Authdir %s ¤¬Â¸ºß¤·¤Þ¤»¤ó¡£Ãæ»ß¤·¤Þ¤¹¡£"
 
-#: daemon/gdm.c:520
+#: daemon/gdm.c:572
+#, c-format
+msgid ""
+"Server Authorization directory (daemon/ServAuthDir) is set to %s but this is "
+"not a directory.  Please correct gdm configuration %s and restart gdm."
+msgstr "¥µ¡¼¥Ðǧ¾Ú¥Ç¥£¥ì¥¯¥È¥ê (daemon/ServAuthDir) ¤Ï %s ¤ËÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢¤³¤ì¤Ï¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£gdmÀßÄê¥Õ¥¡¥¤¥ë %s ¤òÄûÀµ¤·¤Ægdm¤òºÆµ¯Æ°¤·¤Æ¤¯¤À¤µ¤¤"
+
+#: daemon/gdm.c:579
 #, c-format
 msgid "gdm_config_parse: Authdir %s is not a directory. Aborting."
 msgstr ""
 "gdm_config_parse: Authdir %s ¤Ï¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£Ãæ»ß¤·¤Þ¤¹¡£"
 
-#: daemon/gdm.c:523
+#: daemon/gdm.c:583
+#, c-format
+msgid ""
+"Server Authorization directory (daemon/ServAuthDir) is set to %s but is not "
+"owned by user %s and group %s.  Please correct the ownership or gdm "
+"configuration %s and restart gdm."
+msgstr "¥µ¡¼¥Ðǧ¾Ú¥Ç¥£¥ì¥¯¥È¥ê (daemon/ServAuthDir) ¤Ï %s ¤ËÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢¥æ¡¼¥¶ %s ¤È¥°¥ë¡¼¥× %s ¤Ë¤è¤Ã¤Æ½êÍ­¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£½êÍ­¸¢¤¢¤ë¤¤¤ÏgdmÀßÄê¥Õ¥¡¥¤¥ë %s ¤òÄûÀµ¤·¤Ægdm¤òºÆµ¯Æ°¤·¤Æ¤¯¤À¤µ¤¤"
+
+#: daemon/gdm.c:592
 #, c-format
 msgid ""
 "gdm_config_parse: Authdir %s is not owned by user %s, group %s. Aborting."
@@ -220,36 +303,45 @@ msgstr ""
 "gdm_config_parse: Authdir %s ¤Ï¥æ¡¼¥¶ %s¡¢¥°¥ë¡¼¥× %s ¤Î½êÍ­¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£"
 "Ãæ»ß¤·¤Þ¤¹¡£"
 
-#: daemon/gdm.c:527
+#: daemon/gdm.c:597
+#, c-format
 msgid ""
-"gdm_config_parse: Authdir %s has wrong permissions %o. Should be 750. "
+"Server Authorization directory (daemon/ServAuthDir) is set to %s but has the "
+"wrong permissions, it should have permissions of 0750.Please correct the "
+"permissions or the gdm configuration %s and restart gdm."
+msgstr "¥µ¡¼¥Ðǧ¾Ú¥Ç¥£¥ì¥¯¥È¥ê (daemon/ServAuthDir) ¤Ï %s ¤ËÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢´Ö°ã¤Ã¤¿¥¢¥¯¥»¥¹¸¢¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹¡£¥¢¥¯¥»¥¹¸¢¤Ï 0750 ¤ÇÀßÄꤵ¤ì¤ë¤Ù¤­¤Ç¤¹¡£¥¢¥¯¥»¥¹¸¢¤¢¤ë¤¤¤ÏgdmÀßÄê¥Õ¥¡¥¤¥ë %s ¤òÄûÀµ¤·¤Ægdm¤òºÆµ¯Æ°¤·¤Æ¤¯¤À¤µ¤¤"
+
+#: daemon/gdm.c:606
+#, c-format
+msgid ""
+"gdm_config_parse: Authdir %s has wrong permissions %o. Should be 0750. "
 "Aborting."
 msgstr ""
-"gdm_config_parse: Authdir %s ¤Î¥Ñ¡¼¥ß¥Ã¥·¥ç¥ó %o¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹¡£"
-"750¤Ç¤Ê¤±¤ì¤Ð¤¤¤±¤Þ¤»¤ó¡£Ãæ»ß¤·¤Þ¤¹¡£"
+"gdm_config_parse: Authdir %s ¤Î¥Ñ¡¼¥ß¥Ã¥·¥ç¥ó %o¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹¡£750¤Ç¤Ê¤±¤ì"
+"¤Ð¤¤¤±¤Þ¤»¤ó¡£Ãæ»ß¤·¤Þ¤¹¡£"
 
-#: daemon/gdm.c:580
+#: daemon/gdm.c:661
 msgid "gdm_daemonify: fork() failed!"
 msgstr "gdm_daemonify: fork()¤Ë¼ºÇÔ¤·¤Þ¤·¤¿!"
 
-#: daemon/gdm.c:583
+#: daemon/gdm.c:664
 #, c-format
 msgid "gdm_daemonify: setsid() failed: %s!"
 msgstr "gdm_daemonify: setsid()¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s!"
 
-#: daemon/gdm.c:679
+#: daemon/gdm.c:772
 #, c-format
 msgid "deal_with_x_crashes: Trying failsafe X server %s"
 msgstr "deal_with_x_crashes: ¥Õ¥§¡¼¥ë¥»¡¼¥ÕX¥µ¡¼¥Ð%s¤ò»î¹ÔÃæ"
 
-#: daemon/gdm.c:712
+#: daemon/gdm.c:788
 msgid "deal_with_x_crashes: Running the XKeepsCrashing script"
-msgstr "deal_with_x_crashes: XKeepCrashing¥¹¥¯¥ê¥×¥È¤ò¼Â¹ÔÃæ"
+msgstr "deal_with_x_crashes: XKeepCrashing¥¹¥¯¥ê¥×¥È¤ò¼Â¹ÔÃæ¤Ç¤¹"
 
 #. Shit if we knew what the program was to tell the user,
 #. * the above script would have been defined and we'd run
 #. * it for them
-#: daemon/gdm.c:742 daemon/gdm.c:811
+#: config/gettextfoo.h:1 daemon/gdm.c:860
 msgid ""
 "I cannot start the X server (your graphical interface).  It is likely that "
 "it is not set up correctly.  You will need to log in on a console and rerun "
@@ -259,194 +351,188 @@ msgstr ""
 "¤Æ¤¤¤Þ¤»¤ó¡£¥³¥ó¥½¡¼¥ë¤Ë¥í¥°¥¤¥ó¤·¤Æ¡¢X¤ÎÀßÄê¥×¥í¥°¥é¥à¤òµ¯Æ°¤·¡¢¤½¤ì¤«¤éGDM"
 "¤òºÆµ¯Æ°¤·¤Æ¤ß¤Æ²¼¤µ¤¤"
 
-#: daemon/gdm.c:747
-msgid ""
-"Would you like me to try to run the X configuration program?  Note that you "
-"will need the root password for this."
-msgstr ""
-"X¤ÎÀßÄê¥×¥í¥°¥é¥à¤òµ¯Æ°¤·¤Æ¤ß¤Æ¤â¤¤¤¤¤Ç¤¹¤«? ¤³¤ì¤Ë¤Ïroot¥Ñ¥¹¥ï¡¼"
-"¥É¤¬É¬ÍפȤʤê¤Þ¤¹"
-
-#: daemon/gdm.c:750
-msgid "Please type in the root (privilaged user) password."
-msgstr "root(Æø¢¥æ¡¼¥¶)¥Ñ¥¹¥ï¡¼¥É¤òÆþÎϤ·¤Æ²¼¤µ¤¤"
-
-#: daemon/gdm.c:752
-msgid "I will now try to restart the X server again."
-msgstr "X¥µ¡¼¥Ð¤òºÆµ¯Æ°¤·¤Æ¤ß¤Þ¤¹"
-
-#: daemon/gdm.c:754
-msgid ""
-"I will disable this X server for now.  Restart GDM when it is configured "
-"correctly."
-msgstr "X¥µ¡¼¥Ð¤ò̵¸ú¤Ë¤·¤Þ¤¹¡£Å¬ÀÚ¤ËÀßÄꤷ¤Æ¤«¤éGDM¤òºÆµ¯Æ°¤·¤Æ²¼¤µ¤¤"
-
-#: daemon/gdm.c:756
-msgid ""
-"I cannot start the X server (your graphical interface).  It is likely that "
-"it is not set up correctly.  Would you like to view the X server output to "
-"diagnose the problem?"
-msgstr ""
-"¤³¤Î¥°¥é¥Õ¥£¥Ã¥¯¥«¡¼¥É¤Ç¤ÏX¥µ¡¼¥Ð¤òµ¯Æ°¤Ç¤­¤Þ¤»¤ó¡£¤ª¤½¤é¤¯Å¬ÀÚ¤ÊÀßÄ꤬¤Ê¤µ¤ì"
-"¤Æ¤¤¤Þ¤»¤ó¡£¾ã³²¤òʬÀϤ¹¤ë¤¿¤á¤ËX¥µ¡¼¥Ð¤Î½ÐÎϤòɽ¼¨¤·¤Þ¤¹¤«?"
-
 #. else {
 #. * At this point .... screw the user, we don't know how to
 #. * talk to him.  He's on some 'l33t system anyway, so syslog
 #. * reading will do him good
 #. * }
-#: daemon/gdm.c:823
+#: daemon/gdm.c:872
 #, c-format
 msgid ""
 "Failed to start X server several times in a short time period; disabling "
 "display %s"
-msgstr ""
-"û´ü´Ö¤Ë¿ô²ó¤Î X ¥µ¡¼¥Ð¤Îµ¯Æ°¤ò»î¤ß¤Þ¤·¤¿¤¬¼ºÇÔ¤·¤Þ¤·¤¿¡¥\n"
-"DISPLAY %s ¤Ï̵¸ú¤Ç¤¹"
+msgstr "û´ü´Ö¤Ë¿ô²ó¤Î X ¥µ¡¼¥Ð¤Îµ¯Æ°¤ò»î¤ß¤Þ¤·¤¿¤¬¼ºÇÔ¤·¤Þ¤·¤¿¡£DISPLAY %s ¤Ï̵¸ú¤Ë¤·¤Þ¤¹"
 
-#: daemon/gdm.c:922
+#: daemon/gdm.c:978
 #, c-format
 msgid ""
 "gdm_child_action: Reboot or Halt request when there is no system menu from "
 "display %s"
-msgstr ""
-"gdm_child_action: ¥Ç¥£¥¹¥×¥ì¥¤ %s¤Ë¤Ä¤¤¤Æ¥·¥¹¥Æ¥à¥á¥Ë¥å¡¼¤¬¤Ê¤¤¾ì¹ç¤ËºÆµ¯Æ°¤¢"
-"¤ë¤¤¤Ï¥·¥ã¥Ã¥È¥À¥¦¥ó"
+msgstr "gdm_child_action: ¥Ç¥£¥¹¥×¥ì¥¤ %s ¤«¤é¥·¥¹¥Æ¥à¥á¥Ë¥å¡¼¤¬¤Ê¤¤¾ì¹çºÆµ¯Æ°¤¢¤ë¤¤¤ÏÄä»ß¤òÍ׵ᤷ¤Þ¤¹"
 
-#: daemon/gdm.c:930
+#: daemon/gdm.c:986
 #, c-format
 msgid ""
 "gdm_child_action: Restart, Reboot or Halt request from a non-local display %s"
-msgstr "gdm_child_action: Èó¥í¡¼¥«¥ë¤Ê¥Ç¥£¥¹¥×¥ì¥¤%s¤Ë¤Ä¤¤¤ÆºÆµ¯Æ°¡¢Ää»ß¤òÍ×µá"
+msgstr "gdm_child_action: ¥ê¥â¡¼¥È¥Ç¥£¥¹¥×¥ì¥¤ %s ¤«¤éºÆµ¯Æ°¤¢¤ë¤¤¤ÏÄä»ß¤òÍ׵ᤷ¤Þ¤¹"
 
 #. Bury this display for good
-#: daemon/gdm.c:964
+#: daemon/gdm.c:1020
 #, c-format
 msgid "gdm_child_action: Aborting display %s"
 msgstr "gdm_child_action: ¥Ç¥£¥¹¥×¥ì¥¤ %s ¤òÃæ»ß¤·¤Æ¤Þ¤¹"
 
 #. Reboot machine
-#: daemon/gdm.c:973
+#: daemon/gdm.c:1032
 msgid "gdm_child_action: Master rebooting..."
 msgstr "gdm_child_action: ¥Þ¥¹¥¿¡¼¥ê¥Ö¡¼¥ÈÃæ..."
 
-#: daemon/gdm.c:980
+#: daemon/gdm.c:1039
 #, c-format
 msgid "gdm_child_action: Reboot failed: %s"
 msgstr "gdm_child_action: ¥ê¥Ö¡¼¥È¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s"
 
 #. Halt machine
-#: daemon/gdm.c:984
+#: daemon/gdm.c:1043
 msgid "gdm_child_action: Master halting..."
 msgstr "gdm_child_action: ¥Þ¥¹¥¿¡¼Ää»ßÃæ..."
 
-#: daemon/gdm.c:991
+#: daemon/gdm.c:1050
 #, c-format
 msgid "gdm_child_action: Halt failed: %s"
 msgstr "gdm_child_action: Ää»ß¤Ï¼ºÇÔ¤·¤Þ¤·¤¿: %s"
 
 #. Suspend machine
-#: daemon/gdm.c:995
+#: daemon/gdm.c:1054
 msgid "gdm_child_action: Master suspending..."
 msgstr "gdm_child_action: ¥Þ¥¹¥¿¡¼¥µ¥¹¥Ú¥ó¥ÉÃæ..."
 
-#: daemon/gdm.c:1002
+#: daemon/gdm.c:1061
 #, c-format
 msgid "gdm_child_action: Suspend failed: %s"
 msgstr "gdm_child_action: ¥µ¥¹¥Ú¥ó¥É¼ºÇÔ: %s"
 
-#: daemon/gdm.c:1087
+#: daemon/gdm.c:1156
 msgid "Gdm restarting ..."
 msgstr "GDMºÆµ¯Æ°Ãæ..."
 
-#: daemon/gdm.c:1092
+#: daemon/gdm.c:1161
 msgid "Failed to restart self"
 msgstr "ºÆµ¯Æ°¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: daemon/gdm.c:1225
+#: daemon/gdm.c:1328
 msgid "Only root wants to run gdm\n"
 msgstr "root¤À¤±¤¬gdm¤òµ¯Æ°¤Ç¤­¤Þ¤¹\n"
 
-#: daemon/gdm.c:1253
+#: daemon/gdm.c:1356
 msgid "gdm already running. Aborting!"
 msgstr "gdm¤Ï¤¹¤Ç¤Ë¼Â¹ÔÃæ¤Ç¤¹¡£Ãæ»ß¤·¤Þ¤¹!"
 
-#: daemon/gdm.c:1284
+#: daemon/gdm.c:1387
 #, c-format
 msgid "%s: Error setting up TERM signal handler"
-msgstr "%s: TERM¥·¥°¥Ê¥ë¥Ï¥ó¥É¥é¤òÀßÄêÃæ¤Ë¥¨¥é¡¼"
+msgstr "%s: TERM¥·¥°¥Ê¥ë¥Ï¥ó¥É¥é¤òÀßÄêÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
 
-#: daemon/gdm.c:1288
+#: daemon/gdm.c:1391
 #, c-format
 msgid "%s: Error setting up INT signal handler"
-msgstr "%s: INT¥·¥°¥Ê¥ë¥Ï¥ó¥É¥é¤òÀßÄêÃæ¤Ë¥¨¥é¡¼"
+msgstr "%s: INT¥·¥°¥Ê¥ë¥Ï¥ó¥É¥é¤òÀßÄêÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
 
-#: daemon/gdm.c:1292
+#: daemon/gdm.c:1395
 #, c-format
 msgid "%s: Error setting up HUP signal handler"
-msgstr "%s: HUP¥·¥°¥Ê¥ë¥Ï¥ó¥É¥é¤òÀßÄêÃæ¤Ë¥¨¥é¡¼"
+msgstr "%s: HUP¥·¥°¥Ê¥ë¥Ï¥ó¥É¥é¤òÀßÄêÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
 
-#: daemon/gdm.c:1296
+#: daemon/gdm.c:1399
 #, c-format
 msgid "%s: Error setting up USR1 signal handler"
-msgstr "%s: USR1¥·¥°¥Ê¥ë¥Ï¥ó¥É¥é¤òÀßÄêÃæ¤Ë¥¨¥é¡¼"
+msgstr "%s: USR1¥·¥°¥Ê¥ë¥Ï¥ó¥É¥é¤òÀßÄêÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
 
-#: daemon/gdm.c:1305
+#: daemon/gdm.c:1408
 #, c-format
 msgid "%s: Error setting up CHLD signal handler"
-msgstr "%s: CHLD¥·¥°¥Ê¥ë¥Ï¥ó¥É¥é¤òÀßÄêÃæ¤Ë¥¨¥é¡¼"
+msgstr "%s: CHLD¥·¥°¥Ê¥ë¥Ï¥ó¥É¥é¤òÀßÄêÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
 
-#: daemon/gdm.c:1923 daemon/gdm.c:1940
+#: daemon/gdm.c:2181 daemon/gdm.c:2198
 msgid "Flexible server request denied: Not authenticated"
-msgstr ""
+msgstr "¥Õ¥ì¥­¥·¥Ö¥ë¥µ¡¼¥Ð¤ÎÍ×µá¤ÏµñÈݤ·¤Þ¤·¤¿: ǧ¾Ú¤Ç¤­¤Þ¤»¤ó"
 
 #. Don't print the name to syslog as it might be
 #. * long and dangerous
-#: daemon/gdm.c:1958
+#: daemon/gdm.c:2216
 msgid "Unknown server type requested, using standard server."
-msgstr "ÉÔÌÀ¤Ê¥µ¡¼¥Ð¥¿¥¤¥×¤¬Í׵ᤵ¤ì¤Þ¤·¤¿¡£É¸½à¤Î¥µ¡¼¥Ð¤ò»ÈÍѤ·¤Þ¤¹¡£"
+msgstr "ÉÔÌÀ¤Ê¥µ¡¼¥Ð¥¿¥¤¥×¤¬Í׵ᤵ¤ì¤Þ¤·¤¿¡£É¸½à¤Î¥µ¡¼¥Ð¤ò»ÈÍѤ·¤Þ¤¹"
 
-#: daemon/gdm.c:1962
+#: daemon/gdm.c:2220
 #, c-format
 msgid ""
 "Requested server %s not allowed to be used for flexible servers, using "
 "standard server."
-msgstr "Í׵ᤵ¤ì¤¿¥µ¡¼¥Ð%s¤Ï¥Õ¥ì¥­¥·¥Ö¥ë¥µ¡¼¥Ð¤È¤·¤Æ¤Î»ÈÍѤòµö²Ä¤·¤Æ¤¤¤Þ¤»¤ó¡£"
-"ɸ½à¤Î¥µ¡¼¥Ð¤ò»ÈÍѤ·¤Þ¤¹¡£"
+msgstr ""
+"Í׵ᤵ¤ì¤¿¥µ¡¼¥Ð%s¤Ï¥Õ¥ì¥­¥·¥Ö¥ë¥µ¡¼¥Ð¤È¤·¤Æ¤Î»ÈÍѤòµö²Ä¤·¤Æ¤¤¤Þ¤»¤ó¡£É¸½à¤Î"
+"¥µ¡¼¥Ð¤ò»ÈÍѤ·¤Þ¤¹¡£"
 
-#: daemon/gdm-net.c:236
+#: daemon/gdm-net.c:247
+#, c-format
 msgid "%s: Could not make socket"
 msgstr "%s: ¥½¥±¥Ã¥È¤ò¤Ä¤¯¤ì¤Þ¤»¤ó¤Ç¤·¤¿"
 
-#: daemon/gdm-net.c:246
+#: daemon/gdm-net.c:257
+#, c-format
 msgid "%s: Could not bind socket"
 msgstr "%s: ¥½¥±¥Ã¥È¤òbind¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
 
-#: daemon/gdm-net.c:287
+#: daemon/gdm-net.c:298
 #, c-format
 msgid "%s: Could not make FIFO"
-msgstr "%s: FIFO¤ò¤Ä¤¯¤ì¤Þ¤»¤ó"
+msgstr "%s: FIFO¤òºîÀ®¤¹¤ë¤³¤È¤¬½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿"
 
-#: daemon/gdm-net.c:295
+#: daemon/gdm-net.c:306
 #, c-format
 msgid "%s: Could not open FIFO"
-msgstr "%s: FIFO¤ò¤Ä¤¯¤ì¤Þ¤»¤ó¤Ç¤·¤¿"
+msgstr "%s: FIFO¤òºîÀ®¤¹¤ë¤³¤È¤¬½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿"
 
 #. Translators, don't translate the 'y' and 'n'
-#: daemon/misc.c:365
+#: daemon/misc.c:379
 msgid "y = Yes or n = No? >"
 msgstr "y = ¤Ï¤¤ ¤Þ¤¿¤Ï n = ¤¤¤¤¤¨? >"
 
-#: daemon/server.c:136
+#: daemon/misc.c:623
+#, c-format
+msgid "%s: Cannot get local addresses!"
+msgstr "%s: ¥í¡¼¥«¥ë¥¢¥É¥ì¥¹¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó!"
+
+#: daemon/misc.c:664
+#, c-format
+msgid "%s: Could not get server hostname: %s!"
+msgstr "%s: ¥µ¡¼¥Ð¤Î¥Û¥¹¥È̾¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿: %s!"
+
+#: daemon/misc.c:671
+#, c-format
+msgid "%s: Could not get address from hostname!"
+msgstr "%s: ¥Û¥¹¥È̾¤«¤é¥¢¥É¥ì¥¹¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
+
+#: daemon/misc.c:729
+#, c-format
+msgid "Could not setgid %d. Aborting."
+msgstr "setgid %d ¤¬½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿¡£Ãæ»ß¤·¤Þ¤¹"
+
+#: daemon/misc.c:734
+#, c-format
+msgid "initgroups() failed for %s. Aborting."
+msgstr "%s ¤Î initgroups() ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£Ãæ»ß¤·¤Þ¤¹¡£"
+
+#: daemon/server.c:165
+#, c-format
 msgid ""
 "There already appears to be an X server running on display %s.  Should I try "
 "another display number?  If you answer no, I will attempt to start the "
 "server on %s again.%s"
 msgstr ""
-"¥Ç¥£¥¹¥×¥ì¥¤ %s¤Ç¤Ï¤¹¤Ç¤Ë¾¤ÎX¥µ¡¼¥Ð¤¬¼Â¹ÔÃæ¤Ç¤¹¡£Â¾¤Î¥Ç¥£¥¹¥×¥ì¥¤ÈÖ¹æ¤ò"
-"»î¤·¤Æ¤ß¤Þ¤¹¤«? ¤â¤·¤½¤¦¤Ç¤Ê¤¤¤Ê¤é¤â¤¦°ìÅÙ%s¤Ç¥µ¡¼¥Ð¤òµ¯Æ°¤·¤Æ¤ß¤Þ¤¹¡£%s"
+"¥Ç¥£¥¹¥×¥ì¥¤ %s¤Ç¤Ï¤¹¤Ç¤Ë¾¤ÎX¥µ¡¼¥Ð¤¬¼Â¹ÔÃæ¤Ç¤¹¡£Â¾¤Î¥Ç¥£¥¹¥×¥ì¥¤ÈÖ¹æ¤ò»î¤·"
+"¤Æ¤ß¤Þ¤¹¤«? ¤â¤·¤½¤¦¤Ç¤Ê¤¤¤Ê¤é¤â¤¦°ìÅÙ%s¤Ç¥µ¡¼¥Ð¤òµ¯Æ°¤·¤Æ¤ß¤Þ¤¹¡£%s"
 
-#: daemon/server.c:143
+#: daemon/server.c:172
 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 "
@@ -455,114 +541,159 @@ msgstr ""
 "  (Ctrl-Alt + ¥Õ¥¡¥ó¥¯¥·¥ç¥ó¥­¡¼¡¢Î㤨¤Ð Ctrl-Alt-F7¡¢¤ò²¡¤¹¤³¤È¤Ç¥³¥ó¥½¡¼¥ë7"
 "¤Ë°Ü¤ì¤Þ¤¹¡£X¥µ¡¼¥Ð¤ÏÄ̾ï¤Ï¥³¥ó¥½¡¼¥ë7¤Þ¤¿¤Ï¤½¤ì°Ê¾å¤Ç¼Â¹Ô¤µ¤ì¤Æ¤¤¤Þ¤¹¡£)"
 
-#: daemon/server.c:182
+#: daemon/server.c:211
 #, c-format
 msgid "Display '%s' cannot be opened by Xnest"
 msgstr "¥Ç¥£¥¹¥×¥ì¥¤'%s'¤ÏXnest¤Ç³«¤±¤Þ¤»¤ó"
 
-#: daemon/server.c:212
+#: daemon/server.c:241
+#, c-format
 msgid "Display %s is busy, there is another X server already running"
 msgstr "¥Ç¥£¥¹¥×¥ì¥¤ %s¤Ç¤Ï¾¤ÎX¥µ¡¼¥Ð¤¬¤¹¤Ç¤Ë¼Â¹ÔÃæ¤Ç¤¹"
 
-#: daemon/server.c:305
+#: daemon/server.c:343
 msgid "gdm_server_start: Error setting up USR1 signal handler"
-msgstr "gdm_server_start: USR1¥·¥°¥Ê¥ë¥Ï¥ó¥É¥é¤òÀßÄê¤Ç¤­¤Þ¤»¤ó"
+msgstr "gdm_server_start: USR1¥·¥°¥Ê¥ë¥Ï¥ó¥É¥é¤òÀßÄêÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
 
-#: daemon/server.c:315
+#: daemon/server.c:353
 msgid "gdm_server_start: Error setting up CHLD signal handler"
-msgstr "gdm_server_start: CHLD¥·¥°¥Ê¥ë¥Ï¥ó¥É¥é¤òÀßÄê¤Ç¤­¤Þ¤»¤ó"
+msgstr "gdm_server_start: CHLD¥·¥°¥Ê¥ë¥Ï¥ó¥É¥é¤òÀßÄêÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
 
-#: daemon/server.c:326
+#: daemon/server.c:364
 msgid "gdm_server_start: Error setting up ALRM signal handler"
-msgstr "gdm_server_start: ALRM¥·¥°¥Ê¥ë¥Ï¥ó¥É¥é¤òÀßÄê¤Ç¤­¤Þ¤»¤ó"
+msgstr "gdm_server_start: ALRM¥·¥°¥Ê¥ë¥Ï¥ó¥É¥é¤òÀßÄêÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
 
 #. Send X too busy
-#: daemon/server.c:426
+#: daemon/server.c:504
 #, c-format
 msgid "%s: Cannot find a free display number"
-msgstr ""
+msgstr "%s: ÍøÍѲÄǽ¤Ê¥Ç¥£¥¹¥×¥ì¥¤ÈÖ¹æ¤ò¸«¤Ä¤±¤ë¤³¤È¤¬½ÐÍè¤Þ¤»¤ó"
 
-#: daemon/server.c:441
+#: daemon/server.c:519
 #, c-format
 msgid "%s: Display %s busy.  Trying another display number."
-msgstr ""
+msgstr "%s: ¥Ç¥£¥¹¥×¥ì¥¤ %s ¤Ï»ÈÍÑÃæ¤Ç¤¹¡£Ê̤Υǥ£¥¹¥×¥ì¥¤ÈÖ¹æ¤ò»î¤·¤Æ¤¤¤Þ¤¹"
 
-#: daemon/server.c:533
+#: daemon/server.c:654
 #, c-format
 msgid "gdm_server_spawn: Could not open logfile for display %s!"
 msgstr "gdm_server_spawn: ¥Ç¥£¥¹¥×¥ì¥¤%sÍÑ¤Î¥í¥°¥Õ¥¡¥¤¥ë¤ò³«¤±¤Þ¤»¤ó!"
 
-#: daemon/server.c:543
+#: daemon/server.c:664
 msgid "gdm_server_spawn: Error setting USR1 to SIG_IGN"
-msgstr "gdm_server_spawn: USR1 ¤ò SIG_IGN ¤ËÀßÄê¤Ç¤­¤Þ¤»¤ó"
+msgstr "gdm_server_spawn: USR1 ¤ò SIG_IGN ¤ËÀßÄêÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
 
-#: daemon/server.c:547
+#: daemon/server.c:668
 msgid "gdm_server_spawn: Error setting TTIN to SIG_IGN"
-msgstr "gdm_server_spawn: TTIN¤òSIG_IGN¤ËÀßÄêÃæ¤Ë¥¨¥é¡¼"
+msgstr "gdm_server_spawn: TTIN¤òSIG_IGN¤ËÀßÄêÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
 
-#: daemon/server.c:551
+#: daemon/server.c:672
 msgid "gdm_server_spawn: Error setting TTOU to SIG_IGN"
-msgstr "gdm_server_spawn: TTOU¤òSIG_IGN¤ËÀßÄêÃæ¤Ë¥¨¥é¡¼"
+msgstr "gdm_server_spawn: TTOU¤òSIG_IGN¤ËÀßÄêÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
 
-#: daemon/server.c:561
+#: daemon/server.c:682
 msgid "gdm_server_spawn: Error setting HUP to SIG_DFL"
-msgstr "gdm_server_spawn: HUP ¤ò SIG_DFL ¤ËÀßÄê¤Ç¤­¤Þ¤»¤ó"
+msgstr "gdm_server_spawn: HUP ¤ò SIG_DFL ¤ËÀßÄêÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
 
-#: daemon/server.c:565
+#: daemon/server.c:686
 msgid "gdm_server_spawn: Error setting TERM to SIG_DFL"
-msgstr "gdm_server_spawn: TERM ¤ò SIG_DFL ¤ËÀßÄê¤Ç¤­¤Þ¤»¤ó"
+msgstr "gdm_server_spawn: TERM ¤ò SIG_DFL ¤ËÀßÄêÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
 
-#: daemon/server.c:588
+#: daemon/server.c:709
 #, c-format
 msgid "Invalid server command '%s'"
-msgstr ""
+msgstr "'%s' ¤Ï̵¸ú¤Ê¥µ¡¼¥Ð¥³¥Þ¥ó¥É¤Ç¤¹"
 
-#: daemon/server.c:594
+#: daemon/server.c:715
 #, c-format
 msgid "Server name '%s' not found, using standard server"
-msgstr ""
+msgstr "¥µ¡¼¥Ð̾ '%s' ¤Ï¸«¤Ä¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿¡£É¸½à¤Î¥µ¡¼¥Ð¤ò»ÈÍѤ·¤Þ¤¹"
 
-#: daemon/server.c:626
+#: daemon/server.c:747
 #, c-format
 msgid "%s: Empty server command for display %s"
-msgstr "%s: ¥Ç¥£¥¹¥×¥ì¥¤%s¤Ë¤Ä¤¤¤Æ¶õ¤Î¥µ¡¼¥Ð¥³¥Þ¥ó¥É"
+msgstr "%s: ¥Ç¥£¥¹¥×¥ì¥¤ %s ¤Ø¤Î¥µ¡¼¥Ð¥³¥Þ¥ó¥É¤¬¶õ¤Ç¤¹"
+
+#: daemon/server.c:773
+#, c-format
+msgid "%s: Server was to be spawned by uid %d but that user doesn't exist"
+msgstr "%s: ¥µ¡¼¥Ð¤Ï uid %d ¤Ë¤è¤Ã¤Æµ¯Æ°¤µ¤ì¤Þ¤·¤¿¤¬¥æ¡¼¥¶¤¬Â¸ºß¤·¤Þ¤»¤ó"
+
+#: daemon/server.c:788 daemon/slave.c:1108 daemon/slave.c:1453
+#, c-format
+msgid "%s: Couldn't set groupid to %d"
+msgstr "%s: ¥°¥ë¡¼¥×ID¤ò %d ¤ËÀßÄꤹ¤ë¤³¤È¤¬½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿"
+
+#: daemon/server.c:794 daemon/slave.c:1113 daemon/slave.c:1458
+#, c-format
+msgid "%s: initgroups() failed for %s"
+msgstr "%s: %s ¤Î initgroups() ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: daemon/server.c:650
+#: daemon/server.c:800 daemon/slave.c:1118 daemon/slave.c:1463
+#, c-format
+msgid "%s: Couldn't set userid to %d"
+msgstr "%s: ¥æ¡¼¥¶ID¤ò %d ¤ËÀßÄꤹ¤ë¤³¤È¤¬½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿"
+
+#: daemon/server.c:807
+#, c-format
+msgid "%s: Couldn't set groupid to 0"
+msgstr "%s: ¥°¥ë¡¼¥×ID¤ò0¤ËÀßÄꤹ¤ë¤³¤È¤¬½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿"
+
+#: daemon/server.c:818
 #, c-format
 msgid "gdm_server_spawn: Xserver not found: %s"
 msgstr "gdm_slave_spawn: Xserver ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s"
 
-#: daemon/server.c:655
+#: daemon/server.c:823
 msgid "gdm_server_spawn: Can't fork Xserver process!"
 msgstr "gdm_server_spawn: Xserver ¤Î¥×¥í¥»¥¹¤òfork¤Ç¤­¤Þ¤»¤ó!"
 
-#: daemon/slave.c:172
+#: daemon/slave.c:171
 msgid "gdm_slave_init: Error setting up ALRM signal handler"
-msgstr "gdm_slave_init: ALRM¥·¥°¥Ê¥ë¥Ï¥ó¥É¥é¤òÀßÄêÃæ¤Ë¥¨¥é¡¼"
+msgstr "gdm_slave_init: ALRM¥·¥°¥Ê¥ë¥Ï¥ó¥É¥é¤òÀßÄêÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
 
-#: daemon/slave.c:184
+#: daemon/slave.c:183
 msgid "gdm_slave_init: Error setting up TERM/INT signal handler"
-msgstr "gdm_slave_init: TERM/INT¥·¥°¥Ê¥ë¥Ï¥ó¥É¥é¤òÀßÄê¤Ç¤­¤Þ¤»¤ó"
+msgstr "gdm_slave_init: TERM/INT¥·¥°¥Ê¥ë¥Ï¥ó¥É¥é¤òÀßÄêÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
 
-#: daemon/slave.c:193
+#: daemon/slave.c:192
 msgid "gdm_slave_init: Error setting up CHLD signal handler"
-msgstr "gdm_slave_init: CHLD¥·¥°¥Ê¥ë¥Ï¥ó¥É¥é¤òÀßÄê¤Ç¤­¤Þ¤»¤ó"
+msgstr "gdm_slave_init: CHLD¥·¥°¥Ê¥ë¥Ï¥ó¥É¥é¤òÀßÄêÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
 
-#: daemon/slave.c:202
+#: daemon/slave.c:201
 #, c-format
 msgid "%s: Error setting up USR2 signal handler"
-msgstr "%s: USR2¥·¥°¥Ê¥ë¥Ï¥ó¥É¥é¤òÀßÄêÃæ¤Ë¥¨¥é¡¼"
+msgstr "%s: USR2¥·¥°¥Ê¥ë¥Ï¥ó¥É¥é¤òÀßÄêÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
 
-#: daemon/slave.c:518
+#: daemon/slave.c:363
+msgid ""
+"I could not start the X\n"
+"server (your graphical environment)\n"
+"due to some internal error.\n"
+"Please contact your system administrator\n"
+"or check your syslog to diagnose.\n"
+"In the meantime this display will be\n"
+"disabled.  Please restart gdm when\n"
+"the problem is corrected."
+msgstr ""
+"X¥µ¡¼¥Ð(¥°¥é¥Õ¥£¥«¥ë´Ä¶­)¤Ï¤¤¤¯¤Ä¤«¤Î\n"
+"ÆâÉô¥¨¥é¡¼¤¬¸¶°ø¤Çµ¯Æ°¤¹¤ë¤³¤È¤¬\n"
+"½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿\n"
+"¥·¥¹¥Æ¥à´ÉÍý¼Ô¤ËÏ¢Íí¤ò¤¹¤ë¤«¿ÇÃǤò\n"
+"¤¹¤ë¤¿¤á¤Ësyslog¤ò¥Á¥§¥Ã¥¯¤·¤Æ¤¯¤À¤µ¤¤\n"
+"¤È¤ê¤¢¤¨¤º¤³¤Î¥Ç¥£¥¹¥×¥ì¥¤¤Ï̵¸ú¤Ë¤·¤Þ¤¹\n"
+"ÌäÂê¤ò²ò·è¤·¤¿»þgdm¤òºÆµ¯Æ°¤·¤Æ¤¯¤À¤µ¤¤"
+
+#: daemon/slave.c:550
 msgid "focus_first_x_window: cannot fork"
 msgstr "focus_first_x_window: fork¤Ç¤­¤Þ¤»¤ó"
 
-#: daemon/slave.c:537
+#: daemon/slave.c:569
 #, c-format
 msgid "focus_first_x_window: cannot open display %s"
 msgstr "focus_first_x_window: ¥Ç¥£¥¹¥×¥ì¥¤%s¤ò³«¤±¤Þ¤»¤ó"
 
-#: daemon/slave.c:634
+#: daemon/slave.c:674
 msgid ""
 "Could not execute the configuration\n"
 "program.  Make sure it's path is set\n"
@@ -575,7 +706,7 @@ msgstr ""
 "³Îǧ¤·¤Æ²¼¤µ¤¤¡£É¸½à¤Î¾ì½ê¤Ë¤¢¤ë¤È¤·¤Æ\n"
 "µ¯Æ°¤·¤Æ¤ß¤Þ¤¹"
 
-#: daemon/slave.c:648
+#: daemon/slave.c:688
 msgid ""
 "Could not execute the configuration\n"
 "program.  Make sure it's path is set\n"
@@ -585,7 +716,7 @@ msgstr ""
 "ÀßÄê¥Õ¥¡¥¤¥ë¤Ø¤Î¥Ñ¥¹¤¬Å¬ÀڤǤ¢¤ë¤«¡¢\n"
 "³Îǧ¤·¤Æ²¼¤µ¤¤"
 
-#: daemon/slave.c:698
+#: daemon/slave.c:743
 msgid ""
 "Enter the root password\n"
 "to run the configuration."
@@ -593,30 +724,15 @@ msgstr ""
 "ÀßÄê¥×¥í¥°¥é¥à¤ò¼Â¹Ô¤¹¤ë¤¿¤á¤Î\n"
 "root¥Ñ¥¹¥ï¡¼¥É¤òÆþÎϤ·¤Æ²¼¤µ¤¤"
 
-#: daemon/slave.c:712 daemon/slave.c:778
+#: daemon/slave.c:758 daemon/slave.c:823
 msgid "gdm_slave_wait_for_login: No login/Bad login"
 msgstr "gdm_slave_wait_for_login: ¥í¥°¥¤¥óÉÔ²Ä/ÉÔŬÀÚ¤Ê¥í¥°¥¤¥ó"
 
-#: daemon/slave.c:1013
+#: daemon/slave.c:1072
 msgid "gdm_slave_greeter: Can't init pipe to gdmgreeter"
 msgstr "gdm_slave_greeter: gdmgreeter¤È¤Î¥Ñ¥¤¥×¤ò½é´ü²½¤Ç¤­¤Þ¤»¤ó"
 
-#: daemon/slave.c:1046
-#, c-format
-msgid "gdm_slave_greeter: Couldn't set groupid to %d"
-msgstr "gdm_slave_greeter: ¥°¥ë¡¼¥×ID¤ò%d¤ËÀßÄê¤Ç¤­¤Þ¤»¤ó"
-
-#: daemon/slave.c:1049
-#, c-format
-msgid "gdm_slave_greeter: initgroups() failed for %s"
-msgstr "gdm_slave_session_start: %s¤Îinitgroups()¤Ë¼ºÇÔ"
-
-#: daemon/slave.c:1052
-#, c-format
-msgid "gdm_slave_greeter: Couldn't set userid to %d"
-msgstr "gdm_slave_greeter: ¥æ¡¼¥¶ID¤ò%d¤ËÀßÄê¤Ç¤­¤Þ¤»¤ó"
-
-#: daemon/slave.c:1107
+#: daemon/slave.c:1179
 msgid ""
 "No servers were defined in the\n"
 "configuration file and xdmcp was\n"
@@ -633,7 +749,7 @@ msgstr ""
 "¤·¤ÆÀßÄê¤ò½¤Àµ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¼«Æ°¡¢\n"
 "»þ´ÖÂÔ¤Á¥í¥°¥¤¥ó¤Ï̵¸ú¤Ë¤Ê¤ê¤Þ¤¹"
 
-#: daemon/slave.c:1121
+#: daemon/slave.c:1193
 msgid ""
 "I could not start the regular X\n"
 "server (your graphical environment)\n"
@@ -646,19 +762,19 @@ msgstr ""
 "¥µ¡¼¥Ð¤òµ¯Æ°¤·¤Æ¤¤¤Þ¤¹¡£¥í¥°¥¤¥ó¤·¤Æ\n"
 "ŬÀÚ¤ËX¥µ¡¼¥Ð¤òÀßÄꤷ¤Æ²¼¤µ¤¤"
 
-#: daemon/slave.c:1130
+#: daemon/slave.c:1202
 #, c-format
 msgid ""
 "The specified display number was busy, so this server was started on display "
 "%s."
-msgstr ""
+msgstr "»ØÄꤷ¤¿¥Ç¥£¥¹¥×¥ì¥¤ÈÖ¹æ¤Ï»ÈÍÑÃæ¤Ç¤¹¡£¤è¤Ã¤Æ¥Ç¥£¥¹¥×¥ì¥¤ %s ¤Ç¤³¤Î¥µ¡¼¥Ð¤òµ¯Æ°¤µ¤»¤Þ¤·¤¿"
 
-#: daemon/slave.c:1140
+#: daemon/slave.c:1212
 #, c-format
 msgid "gdm_slave_greeter: Cannot start greeter trying default: %s"
 msgstr "gdm_slave_greeter: ɸ½à¥Ç¥£¥¹¥×¥ì¥¤¤Çgreeter¤òµ¯Æ°¤Ç¤­¤Þ¤»¤ó: %s"
 
-#: daemon/slave.c:1152
+#: daemon/slave.c:1224
 msgid ""
 "Cannot start the greeter program,\n"
 "you will not be able to log in.\n"
@@ -670,40 +786,25 @@ msgstr ""
 "¥í¥°¥¤¥ó¤Ç¤­¤Þ¤»¤ó¡£¤³¤Îɽ¼¨¤ò̵¸ú¤Ë¤·¤Þ¤¹¡£\n"
 "¥í¥°¥¤¥ó¤·¤ÆÀßÄê¥Õ¥¡¥¤¥ë¤òÊÔ½¸¤·¤Æ²¼¤µ¤¤"
 
-#: daemon/slave.c:1158
+#: daemon/slave.c:1230
 #, c-format
 msgid "gdm_slave_greeter: Error starting greeter on display %s"
 msgstr "gdm_slave_greeter: ¥Ç¥£¥¹¥×¥ì¥¤%s¤Çgreeter¤ò³«»Ï¤Ç¤­¤Þ¤»¤ó"
 
-#: daemon/slave.c:1161
+#: daemon/slave.c:1233
 msgid "gdm_slave_greeter: Can't fork gdmgreeter process"
 msgstr "gdm_slave_greeter: gdmgreeter¥×¥í¥»¥¹¤òfork¤Ç¤­¤Þ¤»¤ó"
 
-#: daemon/slave.c:1218 daemon/slave.c:1262 daemon/slave.c:1303
+#: daemon/slave.c:1293 daemon/slave.c:1386
 #, c-format
 msgid "%s: Can't open fifo!"
 msgstr "%s: FIFO¤ò³«¤±¤Þ¤»¤ó"
 
-#: daemon/slave.c:1333
+#: daemon/slave.c:1417
 msgid "gdm_slave_chooser: Can't init pipe to gdmchooser"
 msgstr "gdm_slave_chooser: gdmchooser¤È¤Î¥Ñ¥¤¥×¤ò½é´ü²½¤Ç¤­¤Þ¤»¤ó"
 
-#: daemon/slave.c:1365
-#, c-format
-msgid "gdm_slave_chooser: Couldn't set groupid to %d"
-msgstr "gdm_slave_chooser: ¥°¥ë¡¼¥×ID¤ò%d¤ËÀßÄê¤Ç¤­¤Þ¤»¤ó"
-
-#: daemon/slave.c:1368
-#, c-format
-msgid "gdm_slave_chooser: initgroups() failed for %s"
-msgstr "gdm_slave_chooser: %s¤Îinitgroups()¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£Ãæ»ß¤·¤Þ¤¹¡£"
-
-#: daemon/slave.c:1371
-#, c-format
-msgid "gdm_slave_chooser: Couldn't set userid to %d"
-msgstr "gdm_slave_chooser: ¥æ¡¼¥¶ID¤ò%d¤ËÀßÄê¤Ç¤­¤Þ¤»¤ó"
-
-#: daemon/slave.c:1403
+#: daemon/slave.c:1496
 msgid ""
 "Cannot start the chooser program,\n"
 "you will not be able to log in.\n"
@@ -713,57 +814,27 @@ msgstr ""
 "¥í¥°¥¤¥ó¤Ç¤­¤Þ¤»¤ó¡£¥·¥¹¥Æ¥à´ÉÍý¼Ô¤ËÏ¢Íí¤·¤Æ\n"
 "²¼¤µ¤¤\n"
 
-#: daemon/slave.c:1407
+#: daemon/slave.c:1500
 #, c-format
 msgid "gdm_slave_chooser: Error starting chooser on display %s"
 msgstr "gdm_slave_chooser: ¥Ç¥£¥¹¥×¥ì¥¤%s¤Çchooser¤òµ¯Æ°¤Ç¤­¤Þ¤»¤ó"
 
-#: daemon/slave.c:1410
+#: daemon/slave.c:1503
 msgid "gdm_slave_chooser: Can't fork gdmchooser process"
 msgstr "gdm_slave_chooser: gdmchooser¥×¥í¥»¥¹¤òfork¤Ç¤­¤Þ¤»¤ó"
 
-#: daemon/slave.c:1742
+#: daemon/slave.c:1867
 #, c-format
-msgid "gdm_slave_session_start: User passed auth but getpwnam(%s) failed!"
-msgstr "gdm_slave_session_start: getpwnam(%s) ¤¬¼ºÇÔ¤·¤Þ¤·¤¿!"
-
-#: daemon/slave.c:1864
-msgid "gdm_slave_session_start: Authentication completed. Whacking greeter"
-msgstr "gdm_slave_session_start: ǧ¾Ú´°Î»¡¢greeterµ¯Æ°"
+msgid "%s: Could not setup environment for %s. Aborting."
+msgstr "%s: %s¤Î´Ä¶­¤òÀßÄꤹ¤ë¤³¤È¤¬½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿¡£Ãæ»ß¤·¤Þ¤¹"
 
-#: daemon/slave.c:1879
-msgid ""
-"gdm_slave_session_start: Execution of PreSession script returned > 0. "
-"Aborting."
-msgstr ""
-"gdm_slave_session_start: PreSession¥¹¥¯¥ê¥×¥È¤¬0¤è¤êÂ礭¤¤Ãͤò ÊÖ¤·¤Þ¤·¤¿¡£Ãæ"
-"»ß¤·¤Þ¤¹¡£"
-
-#: daemon/slave.c:1905
-msgid "gdm_slave_session_start: Error forking user session"
-msgstr "gdm_slave_session_start: ¥æ¡¼¥¶¥»¥Ã¥·¥ç¥ó¤Îfork¤¬¤Ç¤­¤Þ¤»¤ó"
-
-#: daemon/slave.c:1950
-#, c-format
-msgid "gdm_slave_session_start: Could not setgid %d. Aborting."
-msgstr "gdm_slave_session_start: setgid %d¤¬¤Ç¤­¤Þ¤»¤ó¡£Ãæ»ß¤·¤Þ¤¹¡£"
-
-#: daemon/slave.c:1954
-#, c-format
-msgid "gdm_slave_session_start: initgroups() failed for %s. Aborting."
-msgstr "gdm_slave_session_start: %s¤Îinitgroups()¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£Ãæ»ß¤·¤Þ¤¹¡£"
-
-#: daemon/slave.c:1960
-msgid "%s: Could not open session for %s. Aborting."
-msgstr "%s: %s¤Î¥»¥Ã¥·¥ç¥ó¤ò³«¤±¤Þ¤»¤ó¤Ç¤·¤¿¡£½ªÎ»¤·¤Þ¤¹¡£"
-
-#: daemon/slave.c:1966
+#: daemon/slave.c:1873
 #, c-format
 msgid "gdm_slave_session_start: Could not become %s. Aborting."
 msgstr "gdm_slave_session_start: %s¤Ë¤Ê¤ì¤Þ¤»¤ó¤Ç¤·¤¿¡£Ãæ»ß¤·¤Þ¤¹¡£"
 
 #. yaikes
-#: daemon/slave.c:2036
+#: daemon/slave.c:1939
 msgid ""
 "gdm_slave_session_start: gnome-session not found for a failsafe gnome "
 "session, trying xterm"
@@ -771,7 +842,7 @@ msgstr ""
 "gdm_slave_session_start: ¥Õ¥§¡¼¥ë¥»¡¼¥Õgnom¥»¥Ã¥·¥ç¥ó¤Ë¤Ä¤¤¤Ægnome-session¤¬"
 "¤ß¤Ä¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿¤Î¤Ç¡¢xterm¤ò»î¤·¤Þ¤¹"
 
-#: daemon/slave.c:2041
+#: daemon/slave.c:1943
 msgid ""
 "Could not find the GNOME installation,\n"
 "will try running the \"Failsafe xterm\"\n"
@@ -781,7 +852,7 @@ msgstr ""
 "¤Ç¤·¤¿¤Î¤Ç¡¢\"¥Õ¥§¡¼¥ë¥»¡¼¥Õxterm\"¥»¥Ã¥·¥ç¥ó¤ò»î¤·\n"
 "¤Æ¤ß¤Þ¤¹"
 
-#: daemon/slave.c:2047
+#: daemon/slave.c:1949
 msgid ""
 "This is the Failsafe Gnome session.\n"
 "You will be logged into the 'Default'\n"
@@ -794,12 +865,12 @@ msgstr ""
 "¥»¥Ã¥·¥ç¥ó¤Ç¤¹¡£¤³¤Î¾ã³²¤ò²ò·è¤¹¤ë\n"
 "¤Ë¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤·¤«¤¢¤ê¤Þ¤»¤ó"
 
-#: daemon/slave.c:2066
+#: daemon/slave.c:1968
 msgid "Cannot find \"xterm\" to start a failsafe session."
 msgstr ""
 "¥Õ¥§¡¼¥ë¥»¡¼¥Õ¥»¥Ã¥·¥ç¥ó¤ò³«»Ï¤¹¤ë¤¿¤á¤Î\"xterm\"¤¬¤ß¤Ä¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿"
 
-#: daemon/slave.c:2073
+#: daemon/slave.c:1975
 msgid ""
 "This is the Failsafe xterm session.\n"
 "You will be logged into a terminal\n"
@@ -814,16 +885,16 @@ msgstr ""
 "½¤Àµ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£Ã¼Ëö¥¨¥ß¥å¥ì¡¼¥¿¤ò\n"
 "½ªÎ»¤¹¤ë¤Ë¤Ï'exit'¤ÈÆþÎϤ·¤Þ¤¹"
 
-#: daemon/slave.c:2095
+#: daemon/slave.c:1997
 #, c-format
 msgid "Running %s for %s on %s"
 msgstr "%s¤ò¼Â¹ÔÃæ(%s¤Ë¤Ä¤¤¤Æ¡¢%s¾å)"
 
-#: daemon/slave.c:2109
+#: daemon/slave.c:2011
 msgid "gdm_slave_session_start: User not allowed to log in"
 msgstr "gdm_slave_session_start: ¥æ¡¼¥¶¤Ï¥í¥°¥¤¥ó¤òµö²Ä¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
-#: daemon/slave.c:2111
+#: daemon/slave.c:2013
 msgid ""
 "The system administrator has\n"
 "disabled your account."
@@ -831,12 +902,12 @@ msgstr ""
 "¥·¥¹¥Æ¥à´ÉÍý¼Ô¤Ï¤¢¤Ê¤¿¤Î¥¢¥«¥¦¥ó¥È¤ò\n"
 "̵¸ú¤Ë¤·¤Æ¤¤¤Þ¤¹"
 
-#: daemon/slave.c:2114
+#: daemon/slave.c:2016
 #, c-format
 msgid "gdm_slave_session_start: Could not find/run session `%s'"
 msgstr "gdm_slave_session_start: ¥»¥Ã¥·¥ç¥ó%s¤ò¤ß¤Ä¤±/¼Â¹Ô¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
 
-#: daemon/slave.c:2119
+#: daemon/slave.c:2021
 msgid ""
 "Cannot start the session, most likely the\n"
 "session does not exist.  Please select from\n"
@@ -848,12 +919,12 @@ msgstr ""
 "¥À¥¤¥¢¥í¥°¥¦¥£¥ó¥É¥¦Æâ¤ÎŬÀڤʥ»¥Ã¥·¥ç¥ó¥ê¥¹¥È\n"
 "¤òÁªÂò¤·¤Æ²¼¤µ¤¤"
 
-#: daemon/slave.c:2127
+#: daemon/slave.c:2029
 #, c-format
 msgid "gdm_slave_session_start: Could not start session `%s'"
 msgstr "gdm_slave_session_start: ¥»¥Ã¥·¥ç¥ó¡Ö%s¡×¤¬³«»Ï¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
 
-#: daemon/slave.c:2130
+#: daemon/slave.c:2032
 msgid ""
 "Cannot start your shell.  It could be that the\n"
 "system administrator has disabled your login.\n"
@@ -864,41 +935,93 @@ msgstr ""
 "¤¢¤ë¤¤¤Ï¤¢¤Ê¤¿¤Î¥¢¥«¥¦¥ó¥È¤Ë¤Ä¤¤¤Æ²¿¤é¤«¤Î¾ã³²¤¬\n"
 "¤¢¤ë¤¿¤á¤Ç¤¹\n"
 
-#: daemon/slave.c:2291
+#: daemon/slave.c:2064
+#, c-format
+msgid "gdm_slave_session_start: User passed auth but getpwnam(%s) failed!"
+msgstr "gdm_slave_session_start: getpwnam(%s) ¤¬¼ºÇÔ¤·¤Þ¤·¤¿!"
+
+#: daemon/slave.c:2070
+#, c-format
+msgid ""
+"Your home directory is listed as:\n"
+"'%s'\n"
+"but it does not appear to exist.\n"
+"Do you want to log in with the root\n"
+"directory as your home directory?\n"
+"\n"
+"It is unlikely anything will work unless\n"
+"you use a failsafe session."
+msgstr ""
+"¤¢¤Ê¤¿¤Î¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê¤Ï°Ê²¼¤Î¤è¤¦¤Ç¤¹:\n"
+"'%s'\n"
+"¤·¤«¤·Â¸ºß¤·¤Æ¤¤¤Ê¤¤¤è¤¦¤Ç¤¹¡£\n"
+"¥ë¡¼¥È¥Ç¥£¥ì¥¯¥È¥ê¤ò¤¢¤Ê¤¿¤Î¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê\n"
+"¤È¤·¤Æ¥í¥°¥¤¥ó¤·¤Æ¤â¤è¤í¤·¤¤¤Ç¤¹¤«?\n"
+"\n"
+"¥Õ¥§¡¼¥ë¥»¡¼¥Õ¥»¥Ã¥·¥ç¥ó¤ò»È¤¦¾ì¹ç¤ò½ü¤¤¤Æ\n"
+"²¿¤âÆ°¤«¤Ê¤¤¤«¤â¤·¤ì¤Þ¤»¤ó"
+
+#: daemon/slave.c:2078
+#, c-format
+msgid "%s: Home directory for %s: '%s' does not exist!"
+msgstr "%s: %s ¤Î¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê: '%s' ¤Ï¸ºß¤·¤Þ¤»¤ó!"
+
+#: daemon/slave.c:2225
+msgid "gdm_slave_session_start: Authentication completed. Whacking greeter"
+msgstr "gdm_slave_session_start: ǧ¾Ú´°Î»¡¢greeterµ¯Æ°"
+
+#: daemon/slave.c:2243
+msgid ""
+"gdm_slave_session_start: Execution of PreSession script returned > 0. "
+"Aborting."
+msgstr ""
+"gdm_slave_session_start: PreSession¥¹¥¯¥ê¥×¥È¤¬0¤è¤êÂ礭¤¤Ãͤò ÊÖ¤·¤Þ¤·¤¿¡£Ãæ"
+"»ß¤·¤Þ¤¹¡£"
+
+#: daemon/slave.c:2280
+msgid "gdm_slave_session_start: Error forking user session"
+msgstr "gdm_slave_session_start: ¥æ¡¼¥¶¥»¥Ã¥·¥ç¥ó¤Îfork¤¬¤Ç¤­¤Þ¤»¤ó"
+
+#: daemon/slave.c:2464
 #, c-format
 msgid "Ping to %s failed, whacking display!"
 msgstr "%s¤Ø¤Îping¤Ë¼ºÇÔ¡¢¥Ç¥£¥¹¥×¥ì¥¤¤ò¥Õ¥é¥Ã¥·¥å¤·¤Þ¤¹!"
 
-#: daemon/slave.c:2394
+#: daemon/slave.c:2585
 #, c-format
 msgid "gdm_slave_xioerror_handler: Fatal X error - Restarting %s"
 msgstr "gdm_slave_xioerror_handler: X ¤ÎÃ×̿Ū¥¨¥é¡¼ - %s¤òºÆµ¯Æ°¤·¤Þ¤¹"
 
-#: daemon/slave.c:2564
+#: daemon/slave.c:2776
 #, c-format
 msgid "gdm_slave_exec_script: Failed starting: %s"
 msgstr "gdm_slave_exec_script: µ¯Æ°¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s"
 
-#: daemon/slave.c:2568
+#: daemon/slave.c:2782
 msgid "gdm_slave_exec_script: Can't fork script process!"
 msgstr "gdm_slave_exec_script: ¥¹¥¯¥ê¥×¥È¤Î¥×¥í¥»¥¹¤òfork¤Ç¤­¤Þ¤»¤ó!"
 
-#: daemon/slave.c:2692
+#: daemon/slave.c:2906
 msgid "gdm_parse_enriched_login: Failed creating pipe"
-msgstr "gdm_parse_enriched_login: ¥Ñ¥¤¥×ºîÀ®¤Ë¼ºÇÔ"
+msgstr "gdm_parse_enriched_login: ¥Ñ¥¤¥×ºîÀ®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: daemon/slave.c:2712
+#: daemon/slave.c:2928
 #, c-format
 msgid "gdm_parse_enriched_login: Failed executing: %s"
-msgstr "gdm_parse_enriched_login: ¼Â¹Ô¤Ë¼ºÇÔ: %s"
+msgstr "gdm_parse_enriched_login: ¼Â¹Ô¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s"
 
-#: daemon/slave.c:2717
+#: daemon/slave.c:2933
 msgid "gdm_parse_enriched_login: Can't fork script process!"
 msgstr "gdm_parse_enriched_login: ¥¹¥¯¥ê¥×¥È¥×¥í¥»¥¹¤òfork¤Ç¤­¤Þ¤»¤ó!"
 
 #. Ask gdmgreeter for the user's login. Just for good measure
-#: daemon/verify-crypt.c:69 daemon/verify-pam.c:172 daemon/verify-shadow.c:68
-#: gui/gdmlogin.c:3015
+#: daemon/verify-crypt.c:68 daemon/verify-pam.c:295 daemon/verify-shadow.c:67
+#: gui/gdmlogin.c:3127
+msgid "Please enter your username"
+msgstr "¥æ¡¼¥¶Ì¾¤òÆþÎϤ·¤Æ²¼¤µ¤¤"
+
+#: daemon/verify-crypt.c:69 daemon/verify-pam.c:296 daemon/verify-shadow.c:68
+#: gui/gdmlogin.c:3090
 msgid "Username:"
 msgstr "¥æ¡¼¥¶ID:"
 
@@ -906,45 +1029,36 @@ msgstr "¥æ¡¼¥¶ID:"
 msgid "Password: "
 msgstr "¥Ñ¥¹¥ï¡¼¥É: "
 
-#: daemon/verify-crypt.c:108 daemon/verify-pam.c:207
-#: daemon/verify-shadow.c:117
+#: daemon/verify-crypt.c:109 daemon/verify-pam.c:329 daemon/verify-pam.c:489
+#: daemon/verify-shadow.c:118
 msgid "Couldn't authenticate user"
 msgstr "¥æ¡¼¥¶¤òǧ¾Ú¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
 
-#: daemon/verify-crypt.c:111 daemon/verify-crypt.c:131 daemon/verify-pam.c:288
-#: daemon/verify-shadow.c:120 daemon/verify-shadow.c:140
+#: daemon/verify-crypt.c:115 daemon/verify-crypt.c:135 daemon/verify-pam.c:435
+#: daemon/verify-shadow.c:124 daemon/verify-shadow.c:144
 msgid ""
 "\n"
 "Incorrect username or password.  Letters must be typed in the correct case.  "
 "Please be sure the Caps Lock key is not enabled"
-msgstr ""
-
-#: daemon/verify-crypt.c:118 daemon/verify-crypt.c:138
-#: daemon/verify-crypt.c:159 daemon/verify-crypt.c:182
-#: daemon/verify-shadow.c:127 daemon/verify-shadow.c:147
-#: daemon/verify-shadow.c:168 daemon/verify-shadow.c:191
-msgid "Login incorrect"
-msgstr "¥í¥°¥¤¥ó¤Ç¤­¤Þ¤»¤ó"
+msgstr "\n¥æ¡¼¥¶Ì¾¤¢¤ë¤¤¤Ï¥Ñ¥¹¥ï¡¼¥É¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹¡£Ê¸»ú¤ÏÀµ¤·¤¤¥±¡¼¥¹¤ÇÆþÎϤµ¤ì¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£¥­¥ã¥×¥¹¥í¥Ã¥¯¥­¡¼¤¬Í­¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤Ê¤¤¤«³Îǧ¤·¤Æ¤¯¤À¤µ¤¤"
 
-#: daemon/verify-crypt.c:149 daemon/verify-pam.c:220
+#: daemon/verify-crypt.c:149 daemon/verify-pam.c:342
 #: daemon/verify-shadow.c:158
 #, c-format
 msgid "Root login disallowed on display '%s'"
 msgstr "root ¤Ç DISPLAY %s ¤Ë¥í¥°¥¤¥ó¤Ç¤­¤Ê¤¤¤è¤¦¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£"
 
-#: daemon/verify-crypt.c:152 daemon/verify-shadow.c:161
+#: daemon/verify-crypt.c:151 daemon/verify-shadow.c:160
 msgid "The system administrator is not allowed to login from this screen"
-msgstr ""
-"¤³¤Î¥¹¥¯¥ê¡¼¥ó¤«¤é¤Î¥í¥°¥¤¥ó¤Ï¥·¥¹¥Æ¥à´ÉÍý¼Ô¤Ëµö²Ä¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
+msgstr "¤³¤Î¥¹¥¯¥ê¡¼¥ó¤«¤é¤Î¥í¥°¥¤¥ó¤Ï¥·¥¹¥Æ¥à´ÉÍý¼Ô¤Ëµö²Ä¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
-#: daemon/verify-crypt.c:172 daemon/verify-pam.c:240
-#: daemon/verify-shadow.c:181
+#: daemon/verify-crypt.c:167 daemon/verify-shadow.c:176
 #, c-format
 msgid "User %s not allowed to log in"
 msgstr "¥æ¡¼¥¶%s¤Ï¥í¥°¥¤¥ó¤òµö²Ä¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
-#: daemon/verify-crypt.c:175 daemon/verify-pam.c:243
-#: daemon/verify-shadow.c:184
+#: daemon/verify-crypt.c:169 daemon/verify-pam.c:372 daemon/verify-pam.c:522
+#: daemon/verify-shadow.c:178
 msgid ""
 "\n"
 "The system administrator has disabled your account."
@@ -952,18 +1066,52 @@ msgstr ""
 "\n"
 "¥·¥¹¥Æ¥à´ÉÍý¼Ô¤Ï¤¢¤Ê¤¿¤Î¥¢¥«¥¦¥ó¥È¤ò̵¸ú¤Ë¤·¤Æ¤¤¤Þ¤¹¡£"
 
-#: daemon/verify-pam.c:189 daemon/verify-pam.c:338 daemon/verify-pam.c:410
-#: daemon/verify-pam.c:474
-msgid "Can't find /etc/pam.d/gdm!"
-msgstr "/etc/pam.d/gdm¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó!"
+#: daemon/verify-crypt.c:184 daemon/verify-crypt.c:218 daemon/verify-pam.c:390
+#: daemon/verify-pam.c:539 daemon/verify-shadow.c:192
+#: daemon/verify-shadow.c:225
+#, c-format
+msgid "Cannot set user group for %s"
+msgstr "%s ¤Î¥æ¡¼¥¶¥°¥ë¡¼¥×¤òÀßÄê½ÐÍè¤Þ¤»¤ó"
+
+#: daemon/verify-crypt.c:186 daemon/verify-crypt.c:221 daemon/verify-pam.c:392
+#: daemon/verify-pam.c:542 daemon/verify-shadow.c:194
+#: daemon/verify-shadow.c:228
+msgid ""
+"\n"
+"Cannot set your user group, you will not be able to log in, please contact "
+"your system administrator."
+msgstr "\n¥æ¡¼¥¶¥°¥ë¡¼¥×¤òÀßÄê½ÐÍè¤Þ¤»¤ó¡£¥í¥°¥¤¥ó¤¹¤ë¤³¤È¤¬½ÐÍè¤Ê¤¤¤Î¤Ç¤·¤¿¤é¡¢¥·¥¹¥Æ¥à´ÉÍý¼Ô¤ËÏ¢Íí¤·¤Æ¤¯¤À¤µ¤¤"
+
+#: daemon/verify-crypt.c:213 daemon/verify-shadow.c:220
+#, c-format
+msgid "Cannot get passwd structure for %s"
+msgstr "%s ¤Î¥Ñ¥¹¥ï¡¼¥É¹½Â¤¤ò¼èÆÀ½ÐÍè¤Þ¤»¤ó"
+
+#: daemon/verify-pam.c:216
+msgid "Cannot setup pam handle with null login and/or display"
+msgstr "pam¤¬¶õ¤Î¥í¥°¥¤¥ó¤¢¤ë¤¤¤Ï¥Ç¥£¥¹¥×¥ì¥¤¤Ç°·¤¦¤è¤¦¤ËÀßÄê½ÐÍè¤Þ¤»¤ó"
 
-#: daemon/verify-pam.c:198 daemon/verify-pam.c:345 daemon/verify-pam.c:419
-#: daemon/verify-pam.c:483
+#: daemon/verify-pam.c:230
+#, c-format
+msgid "Can't find /etc/pam.d/%s!"
+msgstr "/etc/pam.d/%s ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó!"
+
+#: daemon/verify-pam.c:237
 #, c-format
 msgid "Can't set PAM_TTY=%s"
 msgstr "PAM_TTY=%s¤òÀßÄê¤Ç¤­¤Þ¤»¤ó"
 
-#: daemon/verify-pam.c:224
+#: daemon/verify-pam.c:244
+#, c-format
+msgid "Can't set PAM_RUSER=%s"
+msgstr "PAM_RUSER=%s ¤òÀßÄê½ÐÍè¤Þ¤»¤ó"
+
+#: daemon/verify-pam.c:252
+#, c-format
+msgid "Can't set PAM_RHOST=%s"
+msgstr "PAM_RHOST=%s ¤òÀßÄê½ÐÍè¤Þ¤»¤ó"
+
+#: daemon/verify-pam.c:345
 msgid ""
 "\n"
 "The system administrator is not allowed to login from this screen"
@@ -971,216 +1119,237 @@ msgstr ""
 "\n"
 "¤³¤Î¥¹¥¯¥ê¡¼¥ó¤«¤é¤Î¥í¥°¥¤¥ó¤Ï¥·¥¹¥Æ¥à´ÉÍý¼Ô¤Ëµö²Ä¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
-#: daemon/verify-pam.c:261 daemon/verify-pam.c:358
+#: daemon/verify-pam.c:361
 #, c-format
-msgid "Couldn't set acct. mgmt for %s"
-msgstr "acct¤¬ÀßÄê¤Ç¤­¤Þ¤»¤ó¡£mgmt¤Ï%s¤Ç¤¹¡£"
+msgid "Authentication token change failed for user %s"
+msgstr "¥æ¡¼¥¶ %s ¤Îǧ¾Ú¥È¡¼¥¯¥ó¤ÎÊѹ¹¤Ï¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: daemon/verify-pam.c:294
-msgid "Authentication failed"
-msgstr "ǧ¾Ú¼ºÇÔ"
+#: daemon/verify-pam.c:363
+msgid ""
+"\n"
+"The change of the authentication token failed. Please try again later or "
+"cantact the system administrator."
+msgstr "\nǧ¾Ú¥È¡¼¥¯¥ó¤ÎÊѹ¹¤Ï¼ºÇÔ¤·¤Þ¤·¤¿¡£¸å¤Ç¤â¤¦°ìÅٻ¤Æ¤ß¤ë¤«¥·¥¹¥Æ¥à´ÉÍý¼Ô¤ØÏ¢Íí¤ò¤È¤Ã¤Æ¤¯¤À¤µ¤¤"
 
-#: daemon/verify-pam.c:456
-msgid "gdm_verify_check: Can't find PAM configuration file for gdm"
-msgstr "gdm_verify_check: gdm ¤Î PAM ÀßÄê¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
+#: daemon/verify-pam.c:370 daemon/verify-pam.c:519
+#, c-format
+msgid "User %s no longer permitted to access the system"
+msgstr "¥æ¡¼¥¶ %s ¤Ï¤â¤Ï¤ä¥·¥¹¥Æ¥à¤Ø¥¢¥¯¥»¥¹¤¹¤ë¤³¤È¤Ï½ÐÍè¤Þ¤»¤ó"
 
-#: daemon/verify-pam.c:490
+#: daemon/verify-pam.c:376 daemon/verify-pam.c:525
 #, c-format
-msgid "Couldn't set credentials for %s"
-msgstr "%s¤Îcredential¤òÀßÄê¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
+msgid "User %s not permitted to gain access at this time"
+msgstr "¥æ¡¼¥¶ %s ¤Ïº£¤Î¤È¤³¤í¥¢¥¯¥»¥¹¸¢¤¬¤¢¤ê¤Þ¤»¤ó"
+
+#: daemon/verify-pam.c:378
+msgid ""
+"\n"
+"The system administrator has disabled access to the system temporary."
+msgstr "\n¥·¥¹¥Æ¥à´ÉÍý¼Ô¤Ï¥·¥¹¥Æ¥à¥Æ¥ó¥Ý¥é¥ê¤Ø¤Î¥¢¥¯¥»¥¹¤ò̵¸ú¤Ë¤·¤Æ¤¤¤Þ¤¹"
 
-#: daemon/verify-pam.c:498
+#: daemon/verify-pam.c:383 daemon/verify-pam.c:532
+#, c-format
+msgid "Couldn't set acct. mgmt for %s"
+msgstr "acct¤¬ÀßÄê¤Ç¤­¤Þ¤»¤ó¡£mgmt¤Ï%s¤Ç¤¹¡£"
+
+#: daemon/verify-pam.c:402 daemon/verify-pam.c:552
 #, c-format
 msgid "Couldn't open session for %s"
 msgstr "%s¤Î¥»¥Ã¥·¥ç¥ó¤ò³«¤±¤Þ¤»¤ó¤Ç¤·¤¿"
 
-#: daemon/xdmcp.c:251
+#: daemon/verify-pam.c:410 daemon/verify-pam.c:560
 #, c-format
-msgid "%s: Cannot get local addresses!"
-msgstr "%s: ¥í¡¼¥«¥ë¥¢¥É¥ì¥¹¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó!"
+msgid "Couldn't set credentials for %s"
+msgstr "%s¤Îcredential¤òÀßÄê¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
 
-#: daemon/xdmcp.c:287
-#, c-format
-msgid "%s: Could not get server hostname: %s!"
-msgstr "%s: ¥µ¡¼¥Ð¤Î¥Û¥¹¥È̾¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿: %s!"
+#: daemon/verify-pam.c:441 daemon/verify-pam.c:492
+msgid "Authentication failed"
+msgstr "ǧ¾Ú¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: daemon/xdmcp.c:294
+#: daemon/verify-pam.c:528
+msgid ""
+"\n"
+"The system administrator has your disabled access to the system temporary."
+msgstr "\n¥·¥¹¥Æ¥à´ÉÍý¼Ô¤Ï¥·¥¹¥Æ¥à¥Æ¥ó¥Ý¥é¥ê¤Ø¤Î¤¢¤Ê¤¿¤Î¥¢¥¯¥»¥¹¤ò̵¸ú¤Ë¤·¤Æ¤¤¤Þ¤¹"
+
+#: daemon/verify-pam.c:645
 #, c-format
-msgid "%s: Could not get address from hostname!"
-msgstr "%s: ¥Û¥¹¥È̾¤«¤é¥¢¥É¥ì¥¹¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿"
+msgid "Can't find PAM configuration file for gdm. I've tried %s, %s, %s and %s"
+msgstr "gdm¤ÎPAMÀßÄê¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¡£%s, %s, %s¤ä%s¤ò»î¤·¤Þ¤·¤¿"
 
-#: daemon/xdmcp.c:338
+#: daemon/xdmcp.c:238
 #, c-format
 msgid "gdm_xdmcp_init: Could not get server hostname: %s!"
-msgstr "gdm_xdmcp_init: ¥µ¡¼¥Ð¤Î¥Û¥¹¥È̾¤¬¤ï¤«¤ê¤Þ¤»¤ó: %s!"
+msgstr "gdm_xdmcp_init: ¥µ¡¼¥Ð¤Î¥Û¥¹¥È̾¤ò¼èÆÀ¤¹¤ë¤³¤È¤¬½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿: %s!"
 
-#: daemon/xdmcp.c:355
+#: daemon/xdmcp.c:255
 msgid "gdm_xdmcp_init: Could not create socket!"
-msgstr "gdm_xdmcp_init: ¥½¥±¥Ã¥È¤¬ºîÀ®¤Ç¤­¤Þ¤»¤ó!"
+msgstr "gdm_xdmcp_init: ¥½¥±¥Ã¥È¤òºîÀ®¤¹¤ë¤³¤È¤¬½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿!"
 
-#: daemon/xdmcp.c:365
+#: daemon/xdmcp.c:265
 msgid "gdm_xdmcp_init: Could not bind to XDMCP socket!"
-msgstr "gdm_xdmcp_init: XDMCP¥½¥±¥Ã¥È¤Ë bind ¤Ç¤­¤Þ¤»¤ó"
+msgstr "gdm_xdmcp_init: XDMCP¥½¥±¥Ã¥È¤Ë bind ¤¹¤ë¤³¤È¤¬½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿!"
 
-#: daemon/xdmcp.c:421
+#: daemon/xdmcp.c:321
 msgid "gdm_xdmcp_decode: Could not create XDMCP buffer!"
-msgstr "gdm_xdmcp_decode: XDMCP ¥Ð¥Ã¥Õ¥¡¤òºîÀ®¤Ç¤­¤Þ¤»¤ó!"
+msgstr "gdm_xdmcp_decode: XDMCP ¥Ð¥Ã¥Õ¥¡¤òºîÀ®¤¹¤ë¤³¤È¤¬½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿!"
 
-#: daemon/xdmcp.c:426
+#: daemon/xdmcp.c:326
 msgid "gdm_xdmcp_decode: Could not read XDMCP header!"
-msgstr "gdm_xdmcp_decode: XDMCP ¥Ø¥Ã¥À¤òÆɤá¤Þ¤»¤ó!"
+msgstr "gdm_xdmcp_decode: XDMCP ¥Ø¥Ã¥À¤òÆɤ߹þ¤à¤³¤È¤¬½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿!"
 
-#: daemon/xdmcp.c:432
+#: daemon/xdmcp.c:332
 msgid "gdm_xdmcp_decode: Incorrect XDMCP version!"
 msgstr "gdm_xdmcp_decode: XDMCP ¤Î¥Ð¡¼¥¸¥ç¥ó¤¬Àµ¤·¤¯¤¢¤ê¤Þ¤»¤ó!"
 
-#: daemon/xdmcp.c:485
+#: daemon/xdmcp.c:385
 #, c-format
 msgid "gdm_xdmcp_decode_packet: Unknown opcode from host %s"
-msgstr "gdm_xdmcp_decode_packet: ¥Û¥¹¥È %s ¤«¤éÉÔÌÀ¤Ê¥ª¥Ú¥³¡¼¥É"
+msgstr "gdm_xdmcp_decode_packet: ¥Û¥¹¥È %s ¤«¤éÉÔÌÀ¤Ê¥ª¥Ú¥³¡¼¥É¤ò¼õ¤±¼è¤ê¤Þ¤·¤¿"
 
-#: daemon/xdmcp.c:504
+#: daemon/xdmcp.c:404
 msgid "gdm_xdmcp_handle_query: Could not extract authlist from packet"
-msgstr "gdm_xdmcp_handle_query: ¥Ñ¥±¥Ã¥È¤«¤éǧ¾Ú¥ê¥¹¥È¤òŸ³«¤Ç¤­¤Þ¤»¤ó"
+msgstr "gdm_xdmcp_handle_query: ¥Ñ¥±¥Ã¥È¤«¤éǧ¾Ú¥ê¥¹¥È¤òŸ³«¤¹¤ë¤³¤È¤¬½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿"
 
-#: daemon/xdmcp.c:516
+#: daemon/xdmcp.c:416
 msgid "gdm_xdmcp_handle_query: Error in checksum"
 msgstr "gdm_xdmcp_handle_query: ¥Á¥§¥Ã¥¯¥µ¥à¤Î¥¨¥é¡¼"
 
-#: daemon/xdmcp.c:759
+#: daemon/xdmcp.c:659
 msgid "gdm_xdmcp_handle_forward_query: Could not read display address"
 msgstr "gdm_xdmcp_handle_forward_query: ¥Ç¥£¥¹¥×¥ì¥¤¤Î¥¢¥É¥ì¥¹¤¬¤ï¤«¤ê¤Þ¤»¤ó"
 
-#: daemon/xdmcp.c:766
+#: daemon/xdmcp.c:666
 msgid "gdm_xdmcp_handle_forward_query: Could not read display port number"
 msgstr "gdm_xdmcp_handle_forward_query: ¥Ç¥£¥¹¥×¥ì¥¤¤Î¥Ý¡¼¥ÈÈֹ椬¤ï¤«¤ê¤Þ¤»¤ó"
 
-#: daemon/xdmcp.c:774
+#: daemon/xdmcp.c:674
 msgid "gdm_xdmcp_handle_forward_query: Could not extract authlist from packet"
 msgstr "gdm_xdmcp_handle_forward_query: ¥Ñ¥±¥Ã¥È¤«¤éǧ¾Ú¥ê¥¹¥È¤¬Å¸³«¤Ç¤­¤Þ¤»¤ó"
 
-#: daemon/xdmcp.c:790
+#: daemon/xdmcp.c:690
 msgid "gdm_xdmcp_handle_forward_query: Error in checksum"
 msgstr "gdm_xdmcp_handle_forward_query: ¥Á¥§¥Ã¥¯¥µ¥à¤Î¥¨¥é¡¼"
 
-#: daemon/xdmcp.c:796
+#: daemon/xdmcp.c:696
 msgid "gdm_xdmcp_handle_forward_query: Bad address"
-msgstr "gdm_xdmcp_handle_forward_query: ÉÔŬÀڤʥ¢¥É¥ì¥¹"
+msgstr "gdm_xdmcp_handle_forward_query: ÉÔŬÀڤʥ¢¥É¥ì¥¹¤Ç¤¹"
 
-#: daemon/xdmcp.c:903
+#: daemon/xdmcp.c:804
 #, c-format
 msgid "Denied XDMCP query from host %s"
-msgstr "¥Û¥¹¥È %s ¤Î XDMCP Í×µá¤òµñÈÝ"
+msgstr "¥Û¥¹¥È %s ¤Î XDMCP Í×µá¤òµñÈݤ·¤Þ¤·¤¿"
 
-#: daemon/xdmcp.c:1049
+#: daemon/xdmcp.c:950
 #, c-format
 msgid "gdm_xdmcp_handle_request: Got REQUEST from banned host %s"
-msgstr "gdm_xdmcp_handle_request: ¶Ø»ß¤µ¤ì¤¿¥Û¥¹¥È %s ¤è¤ê REQUEST ¤ò¼õ¿®"
+msgstr "gdm_xdmcp_handle_request: ¶Ø»ß¤µ¤ì¤¿¥Û¥¹¥È %s ¤è¤ê REQUEST ¤ò¼õ¿®¤·¤Þ¤·¤¿"
 
-#: daemon/xdmcp.c:1056
+#: daemon/xdmcp.c:957
 msgid "gdm_xdmcp_handle_request: Could not read Display Number"
 msgstr "gdm_xdmcp_handle_request: ¥Ç¥£¥¹¥×¥ì¥¤Èֹ椬¤ï¤«¤ê¤Þ¤»¤ó"
 
-#: daemon/xdmcp.c:1062
+#: daemon/xdmcp.c:963
 msgid "gdm_xdmcp_handle_request: Could not read Connection Type"
 msgstr "gdm_xdmcp_handle_request: ÀܳÊý¼°¤¬¤ï¤«¤ê¤Þ¤»¤ó"
 
-#: daemon/xdmcp.c:1068
+#: daemon/xdmcp.c:969
 msgid "gdm_xdmcp_handle_request: Could not read Client Address"
 msgstr "gdm_xdmcp_handle_request: ¥¯¥é¥¤¥¢¥ó¥È¤Î¥¢¥É¥ì¥¹¤¬¤ï¤«¤ê¤Þ¤»¤ó"
 
-#: daemon/xdmcp.c:1075
+#: daemon/xdmcp.c:976
 msgid "gdm_xdmcp_handle_request: Could not read Authentication Names"
 msgstr "gdm_xdmcp_handle_request: ǧ¾Ú̾¤¬¤ï¤«¤ê¤Þ¤»¤ó"
 
-#: daemon/xdmcp.c:1083
+#: daemon/xdmcp.c:984
 msgid "gdm_xdmcp_handle_request: Could not read Authentication Data"
 msgstr "gdm_xdmcp_handle_request: ǧ¾Ú¥Ç¡¼¥¿¤¬¤ï¤«¤ê¤Þ¤»¤ó"
 
-#: daemon/xdmcp.c:1092
+#: daemon/xdmcp.c:993
 msgid "gdm_xdmcp_handle_request: Could not read Authorization List"
 msgstr "gdm_xdmcp_handle_request: ǧ¾Ú¥ê¥¹¥È¤¬¤ï¤«¤ê¤Þ¤»¤ó"
 
-#: daemon/xdmcp.c:1107
+#: daemon/xdmcp.c:1008
 msgid "gdm_xdmcp_handle_request: Could not read Manufacturer ID"
 msgstr "gdm_xdmcp_handle_request: À½Â¤¼ÔID¤¬¤ï¤«¤ê¤Þ¤»¤ó"
 
-#: daemon/xdmcp.c:1130
+#: daemon/xdmcp.c:1031
 #, c-format
 msgid "gdm_xdmcp_handle_request: Failed checksum from %s"
-msgstr "gdm_xdmcp_handle_request: %s ¤«¤é¤Î¥Á¥§¥Ã¥¯¥µ¥à¤Ë´Ö°ã¤¤"
+msgstr "gdm_xdmcp_handle_request: %s ¤«¤é¤Î¥Á¥§¥Ã¥¯¥µ¥à¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: daemon/xdmcp.c:1297
+#: daemon/xdmcp.c:1198
 #, c-format
 msgid "gdm_xdmcp_handle_manage: Got Manage from banned host %s"
-msgstr "gdm_xdmcp_handle_manage: ¶Ø»ß¤µ¤ì¤¿¥Û¥¹¥È %s ¤«¤é Manage ¤ò¼õ¿®"
+msgstr "gdm_xdmcp_handle_manage: ¶Ø»ß¤µ¤ì¤¿¥Û¥¹¥È %s ¤«¤é Manage ¤ò¼õ¿®¤·¤Þ¤·¤¿"
 
-#: daemon/xdmcp.c:1304
+#: daemon/xdmcp.c:1205
 msgid "gdm_xdmcp_handle_manage: Could not read Session ID"
 msgstr "gdm_xdmcp_handle_manage: ¥»¥Ã¥·¥ç¥óID¤¬¤ï¤«¤ê¤Þ¤»¤ó"
 
-#: daemon/xdmcp.c:1310
+#: daemon/xdmcp.c:1211
 msgid "gdm_xdmcp_handle_manage: Could not read Display Number"
 msgstr "gdm_xdmcp_handle_manage: ¥Ç¥£¥¹¥×¥ì¥¤Èֹ椬¤ï¤«¤ê¤Þ¤»¤ó"
 
-#: daemon/xdmcp.c:1319
+#: daemon/xdmcp.c:1220
 msgid "gdm_xdmcp_handle_manage: Could not read Display Class"
 msgstr "gdm_xdmcp_handle_manage: ¥Ç¥£¥¹¥×¥ì¥¤¥¯¥é¥¹¤¬¤ï¤«¤ê¤Þ¤»¤ó"
 
-#: daemon/xdmcp.c:1394 daemon/xdmcp.c:1400 daemon/xdmcp.c:1450
-#: daemon/xdmcp.c:1456
+#: daemon/xdmcp.c:1295 daemon/xdmcp.c:1301 daemon/xdmcp.c:1351
+#: daemon/xdmcp.c:1357
+#, c-format
 msgid "%s: Could not read address"
 msgstr "%s: ¥¢¥É¥ì¥¹¤òÆɤá¤Þ¤»¤ó¤Ç¤·¤¿"
 
-#: daemon/xdmcp.c:1532
+#: daemon/xdmcp.c:1433
 #, c-format
 msgid "gdm_xdmcp_handle_keepalive: Got KEEPALIVE from banned host %s"
-msgstr "gdm_xdmcp_handle_keepalive: ¶Ø»ß¤µ¤ì¤¿¥Û¥¹¥È %s ¤è¤ê KEEPALIVE ¤ò¼õ¿®"
+msgstr "gdm_xdmcp_handle_keepalive: ¶Ø»ß¤µ¤ì¤¿¥Û¥¹¥È %s ¤è¤ê KEEPALIVE ¤ò¼õ¿®¤·¤Þ¤·¤¿"
 
-#: daemon/xdmcp.c:1539
+#: daemon/xdmcp.c:1440
 msgid "gdm_xdmcp_handle_keepalive: Could not read Display Number"
 msgstr "gdm_xdmcp_handle_keepalive: ¥Ç¥£¥¹¥×¥ì¥¤Èֹ椬¤ï¤«¤ê¤Þ¤»¤ó"
 
-#: daemon/xdmcp.c:1545
+#: daemon/xdmcp.c:1446
 msgid "gdm_xdmcp_handle_keepalive: Could not read Session ID"
 msgstr "gdm_xdmcp_handle_keepalive: ¥»¥Ã¥·¥ç¥óID¤¬¤ï¤«¤ê¤Þ¤»¤ó"
 
-#: daemon/xdmcp.c:1744
+#: daemon/xdmcp.c:1645
 msgid "gdm_xdmcp_init: No XDMCP support"
-msgstr "gdm_xdmcp_run: XDMCP¥µ¥Ý¡¼¥È¤Ê¤·"
+msgstr "gdm_xdmcp_run: XDMCP¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó"
 
-#: daemon/xdmcp.c:1751
+#: daemon/xdmcp.c:1652
 msgid "gdm_xdmcp_run: No XDMCP support"
-msgstr "gdm_xdmcp_run: XDMCP¥µ¥Ý¡¼¥È¤Ê¤·"
+msgstr "gdm_xdmcp_run: XDMCP¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó"
 
-#: daemon/xdmcp.c:1757
+#: daemon/xdmcp.c:1658
 msgid "gdm_xdmcp_close: No XDMCP support"
-msgstr "gdm_xdmcp_close: XDMCP¥µ¥Ý¡¼¥È¤Ê¤·"
+msgstr "gdm_xdmcp_close: XDMCP¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó"
 
-#: gui/gdmchooser.c:64
+#: gui/gdmchooser.c:62
 msgid "Please wait: scanning local network for XDMCP-enabled hosts..."
 msgstr "¤ªÂÔ¤Á²¼¤µ¤¤: ¥í¡¼¥«¥ë¥Í¥Ã¥È¥ï¡¼¥¯¤ÇXDMCP¤¬Í­¸ú¤Ê¥Û¥¹¥È¤ò¸¡º÷Ãæ..."
 
-#: gui/gdmchooser.c:65
+#: gui/gdmchooser.c:63
 msgid "No serving hosts were found."
 msgstr "¤½¤Î¥µ¡¼¥Ó¥¹¤òÄ󶡤·¤Æ¤¤¤ë¥Û¥¹¥È¤¬¤ß¤Ä¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿"
 
-#: gui/gdmchooser.c:66
+#: gui/gdmchooser.c:64
 msgid "Choose a host to connect to from the selection below."
 msgstr "Àܳ¤¹¤ë¥Û¥¹¥È¤ò²¼¤ÎÁªÂò¥ê¥¹¥È¤«¤éÁª¤ó¤Ç²¼¤µ¤¤"
 
-#: gui/gdmchooser.c:491
+#: gui/gdmchooser.c:489
 #, c-format
 msgid "gdm_chooser_parse_config: No configuration file: %s. Aborting."
 msgstr ""
 "gdm_chooser_parse_config: ÀßÄê¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó:%s¡£Ãæ»ß¤·¤Þ¤¹¡£"
 
-#: gui/gdmchooser.c:674
+#: gui/gdmchooser.c:672
 #, c-format
 msgid "Can't open default host icon: %s"
 msgstr "¥Ç¥Õ¥©¥ë¥È¤Î¥Û¥¹¥È¥¢¥¤¥³¥ó¤ò³«¤±¤Þ¤»¤ó: %s"
 
-#: gui/gdmchooser.c:683
+#: gui/gdmchooser.c:681
 msgid ""
 "Cannot find the glade interface description\n"
 "file, cannot run gdmchooser.\n"
@@ -1192,7 +1361,7 @@ msgstr ""
 "ŬÀڤ˥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¤«¡¢gdmchooser\n"
 "¥Õ¥¡¥¤¥ë¤Î¾ì½ê¤Ï¤É¤³¤«³Îǧ¤·¤Æ²¼¤µ¤¤"
 
-#: gui/gdmchooser.c:704
+#: gui/gdmchooser.c:702
 msgid ""
 "The glade interface description file\n"
 "appears to be corrupted.\n"
@@ -1203,47 +1372,47 @@ msgstr ""
 "ŬÀڤ˥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¤«¤É¤¦¤«³Îǧ¤·¤Æ\n"
 "²¼¤µ¤¤"
 
-#: gui/gdmchooser.c:748
+#: gui/gdmchooser.c:746
 msgid "gdm_signals_init: Error setting up HUP signal handler"
-msgstr "gdm_signals_init: INT¥·¥°¥Ê¥ë¥Ï¥ó¥É¥é¤òÀßÄê¤Ç¤­¤Þ¤»¤ó"
+msgstr "gdm_signals_init: INT¥·¥°¥Ê¥ë¥Ï¥ó¥É¥é¤òÀßÄêÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
 
-#: gui/gdmchooser.c:751
+#: gui/gdmchooser.c:749
 msgid "gdm_signals_init: Error setting up INT signal handler"
-msgstr "gdm_signals_init: INT¥·¥°¥Ê¥ë¥Ï¥ó¥É¥é¤òÀßÄê¤Ç¤­¤Þ¤»¤ó"
+msgstr "gdm_signals_init: INT¥·¥°¥Ê¥ë¥Ï¥ó¥É¥é¤òÀßÄêÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
 
-#: gui/gdmchooser.c:754
+#: gui/gdmchooser.c:752
 msgid "gdm_signals_init: Error setting up TERM signal handler"
-msgstr "gdm_signals_init: TERM¥·¥°¥Ê¥ë¥Ï¥ó¥É¥é¤òÀßÄê¤Ç¤­¤Þ¤»¤ó"
+msgstr "gdm_signals_init: TERM¥·¥°¥Ê¥ë¥Ï¥ó¥É¥é¤òÀßÄêÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿"
 
-#: gui/gdmchooser.c:762 gui/gdmlogin.c:3683
+#: gui/gdmchooser.c:760 gui/gdmlogin.c:3767
 msgid "Could not set signal mask!"
-msgstr "¥·¥°¥Ê¥ë¥Þ¥¹¥¯¤òÀßÄê¤Ç¤­¤Þ¤»¤ó!"
+msgstr "¥·¥°¥Ê¥ë¥Þ¥¹¥¯¤òÀßÄê½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿!"
 
-#: gui/gdmchooser.c:852
+#: gui/gdmchooser.c:850
 msgid "Socket for xdm communication"
 msgstr "XDMÄÌ¿®¤Î¤¿¤á¤Î¥½¥±¥Ã¥È"
 
-#: gui/gdmchooser.c:852
+#: gui/gdmchooser.c:850
 msgid "SOCKET"
 msgstr "SOCKET"
 
-#: gui/gdmchooser.c:852
+#: gui/gdmchooser.c:850
 msgid "Client address to return in response to xdm"
 msgstr "XDM¤Ø¤Î±þÅúÆâ¤ËÊÖ¤¹¥¯¥é¥¤¥¢¥ó¥È¥¢¥É¥ì¥¹"
 
-#: gui/gdmchooser.c:852
+#: gui/gdmchooser.c:850
 msgid "ADDRESS"
 msgstr "ADDRESS"
 
-#: gui/gdmchooser.c:853
+#: gui/gdmchooser.c:851
 msgid "Connection type to return in response to xdm"
 msgstr "XDM¤Ø¤Î±þÅúÆâ¤ËÊÖ¤¹Àܳ¥¿¥¤¥×"
 
-#: gui/gdmchooser.c:853
+#: gui/gdmchooser.c:851
 msgid "TYPE"
 msgstr "TYPE"
 
-#: gui/gdmchooser.c:1052
+#: gui/gdmchooser.c:1050
 #, c-format
 msgid ""
 "The chooser version (%s) does not match the daemon version (%s).\n"
@@ -1278,7 +1447,7 @@ msgstr "¥Í¥Ã¥È¥ï¡¼¥¯¸¡½Ð"
 
 #: gui/gdmchooser-strings.c:11
 msgid "Rescan"
-msgstr "ºÆ¥¹¥­¥ã¥ó"
+msgstr "ºÆÁöºº"
 
 #: gui/gdmchooser-strings.c:12
 msgid "How to use this application"
@@ -1292,7 +1461,7 @@ msgstr "¥Ø¥ë¥×"
 msgid "Exit the application"
 msgstr "¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò½ªÎ»"
 
-#: gui/gdmchooser-strings.c:15 gui/gdmlogin.c:2810
+#: gui/gdmchooser-strings.c:15 gui/gdmlogin.c:2885
 msgid "Quit"
 msgstr "½ªÎ»"
 
@@ -1336,7 +1505,7 @@ msgstr "´ðËÜ"
 msgid "Expert"
 msgstr "¹âÅÙ"
 
-#: gui/gdmconfig.c:58 gui/gdmlogin.c:2796
+#: gui/gdmconfig.c:58 gui/gdmlogin.c:2871
 msgid "System"
 msgstr "¥·¥¹¥Æ¥à"
 
@@ -1441,34 +1610,34 @@ msgstr ""
 "ÀßÄê¥Õ¥¡¥¤¥ë: %s\n"
 "¸ºß¤·¤Þ¤»¤ó! ɸ½àÃͤò»È¤¤¤Þ¤¹"
 
-#: gui/gdmconfig.c:738 gui/gdmconfig.c:1091 gui/gdmconfig.c:1955
-#: gui/gdmconfig.c:2177 gui/gdmflexiserver.c:366
+#: gui/gdmconfig.c:738 gui/gdmconfig.c:1090 gui/gdmconfig.c:1953
+#: gui/gdmconfig.c:2175 gui/gdmflexiserver.c:449
 msgid "Standard server"
 msgstr "ɸ½à¤Î¥µ¡¼¥Ð"
 
-#: gui/gdmconfig.c:939
+#: gui/gdmconfig.c:938
 msgid "Error reading session script!"
 msgstr "¥»¥Ã¥·¥ç¥ó¥¹¥¯¥ê¥×¥ÈÆɤ߹þ¤ßÃæ¤Ë¥¨¥é¡¼!"
 
-#: gui/gdmconfig.c:942
+#: gui/gdmconfig.c:941
 msgid "Error reading this session script"
 msgstr "¤³¤Î¥»¥Ã¥·¥ç¥ó¥¹¥¯¥ê¥×¥ÈÆɤ߹þ¤ßÃæ¤Ë¥¨¥é¡¼!"
 
-#: gui/gdmconfig.c:1050 gui/gdmconfig.c:1096 gui/gdmconfig.c:1939
-#: gui/gdmconfig.c:2017 gui/gdmconfig.c:2033
+#: gui/gdmconfig.c:1049 gui/gdmconfig.c:1095 gui/gdmconfig.c:1937
+#: gui/gdmconfig.c:2015 gui/gdmconfig.c:2031
 msgid "Yes"
 msgstr "¤Ï¤¤"
 
-#: gui/gdmconfig.c:1052 gui/gdmconfig.c:2021 gui/gdmconfig.c:2035
+#: gui/gdmconfig.c:1051 gui/gdmconfig.c:2019 gui/gdmconfig.c:2033
 msgid "No"
 msgstr "¤¤¤¤¤¨"
 
-#: gui/gdmconfig.c:1127
+#: gui/gdmconfig.c:1126
 msgid "gdm_config_parse_most: Invalid server line in config file. Ignoring!"
 msgstr ""
 "gdm_config_parse_most: ÀßÄê¥Õ¥¡¥¤¥ë¤Ë´Ö°ã¤Ã¤¿ server ¹Ô¤¬¤¢¤ê¤Þ¤¹¡¥Ìµ»ë!"
 
-#: gui/gdmconfig.c:1309
+#: gui/gdmconfig.c:1308
 msgid ""
 "The applied settings cannot take effect until gdm\n"
 "is restarted or your computer is rebooted.\n"
@@ -1483,15 +1652,15 @@ msgstr ""
 "¥¢¥¦¥È)¤ì¤ÐGDM¤òºÆµ¯Æ°¤Ç¤­¤Þ¤¹¤·¡¢¤Þ¤¿GDM¤ò¤¹¤°¤Ë\n"
 "ºÆµ¯Æ°(¸½ºß¤Î¤¹¤Ù¤Æ¤Î¥»¥Ã¥·¥ç¥ó¤òkill)"
 
-#: gui/gdmconfig.c:1315
+#: gui/gdmconfig.c:1314
 msgid "Restart after logout"
 msgstr "¥í¥°¥¢¥¦¥È¸å¤ËºÆµ¯Æ°"
 
-#: gui/gdmconfig.c:1316
+#: gui/gdmconfig.c:1315
 msgid "Restart now"
 msgstr "º£¤¹¤°ºÆµ¯Æ°"
 
-#: gui/gdmconfig.c:1326
+#: gui/gdmconfig.c:1325
 msgid ""
 "Are you sure you wish to restart GDM\n"
 "now and lose any unsaved data?"
@@ -1499,7 +1668,7 @@ msgstr ""
 "ËÜÅö¤ËGDM¤òºÆµ¯Æ°¤·¤Æ¡¢Êݸ¤·¤Æ¤¤¤Ê¤¤\n"
 "¥Ç¡¼¥¿¤òÇË´þ¤·¤Æ¤â¤¤¤¤¤Ç¤¹¤«?"
 
-#: gui/gdmconfig.c:1334
+#: gui/gdmconfig.c:1333
 msgid ""
 "The greeter settings will take effect the next time\n"
 "it is displayed.  The rest of the settings will not\n"
@@ -1510,7 +1679,7 @@ msgstr ""
 "»Ä¤ê¤ÎÀßÄê¤Ï¡¤GDM ¤¬ºÆµ¯Æ°¤µ¤ì¤ë¤«¡¤¥³¥ó¥Ô¥å¡¼¥¿¤¬\n"
 "ºÆµ¯Æ°¤µ¤ì¤ë¤Þ¤Ç¡¤Í­¸ú¤Ë¤Ê¤ê¤Þ¤»¤ó¡¥"
 
-#: gui/gdmconfig.c:1356
+#: gui/gdmconfig.c:1355
 msgid ""
 "You have not defined any local servers.\n"
 "Usually this is not a good idea unless you\n"
@@ -1526,7 +1695,7 @@ msgstr ""
 "¤È¤¤¤¦¤³¤È¤¬³Î¤«¤Ç¤¢¤ë¾ì¹ç¤ò½ü¤¯¤È¡¢¤³¤ì¤ÏÎɤ¤¹Í¤¨\n"
 "¤È¤Ï¤¤¤¨¤Þ¤»¤ó"
 
-#: gui/gdmconfig.c:1541
+#: gui/gdmconfig.c:1539
 #, c-format
 msgid ""
 "\n"
@@ -1537,7 +1706,7 @@ msgstr ""
 "¥»¥Ã¥·¥ç¥ó%s¤ò¾Ãµî¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿\n"
 "  ¥¨¥é¡¼: %s"
 
-#: gui/gdmconfig.c:1577
+#: gui/gdmconfig.c:1575
 #, c-format
 msgid ""
 "\n"
@@ -1548,7 +1717,7 @@ msgstr ""
 "¥»¥Ã¥·¥ç¥ó%s¤ò¾Ãµî¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿\n"
 "  ¥¨¥é¡¼: %s"
 
-#: gui/gdmconfig.c:1620
+#: gui/gdmconfig.c:1618
 #, c-format
 msgid ""
 "\n"
@@ -1559,7 +1728,7 @@ msgstr ""
 "¥»¥Ã¥·¥ç¥ó%s¤ò½ñ¤­¹þ¤ß¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿\n"
 "  ¥¨¥é¡¼: %s"
 
-#: gui/gdmconfig.c:1631
+#: gui/gdmconfig.c:1629
 #, c-format
 msgid ""
 "\n"
@@ -1570,7 +1739,7 @@ msgstr ""
 "¥»¥Ã¥·¥ç¥ó%s¤ËÆâÍƤò½ñ¤­¹þ¤ß¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿\n"
 "  ¥¨¥é¡¼: %s"
 
-#: gui/gdmconfig.c:1656
+#: gui/gdmconfig.c:1654
 #, c-format
 msgid ""
 "\n"
@@ -1581,7 +1750,7 @@ msgstr ""
 "µìɸ½à¥»¥Ã¥·¥ç¥ó¤Ëunlink¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿\n"
 "  ¥¨¥é¡¼: %s"
 
-#: gui/gdmconfig.c:1695
+#: gui/gdmconfig.c:1693
 msgid ""
 "\n"
 "Could not find a suitable name for the default session link"
@@ -1589,7 +1758,7 @@ msgstr ""
 "\n"
 "ɸ½à¥»¥Ã¥·¥ç¥ó¥ê¥ó¥¯¤Ë¤Ä¤¤¤ÆŬÀÚ¤Ê̾Á°¤¬¤ß¤Ä¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿"
 
-#: gui/gdmconfig.c:1704
+#: gui/gdmconfig.c:1702
 #, c-format
 msgid ""
 "\n"
@@ -1600,7 +1769,7 @@ msgstr ""
 "¿·µ¬É¸½à¥»¥Ã¥·¥ç¥ó¤ò¥ê¥ó¥¯¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿\n"
 "  ¥¨¥é¡¼: %s"
 
-#: gui/gdmconfig.c:1724
+#: gui/gdmconfig.c:1722
 msgid ""
 "There were errors writing changes to the session files.\n"
 "The configuration may not be completely saved.\n"
@@ -1608,7 +1777,7 @@ msgstr ""
 "¥»¥Ã¥·¥ç¥ó¥Õ¥¡¥¤¥ë¤Ø½ñ¤­¹þ¤ßÃæ¤Ë¥¨¥é¡¼¡£ÀßÄê¥Õ¥¡¥¤¥ë¤ÎÆâÍƤÏ\n"
 "´°Á´¤Ë¤ÏÊݸ¤µ¤ì¤Ê¤¤²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹\n"
 
-#: gui/gdmconfig.c:1744
+#: gui/gdmconfig.c:1742
 msgid ""
 "This will destroy any changes made in this session.\n"
 "Are you sure you want to do this?"
@@ -1616,7 +1785,7 @@ msgstr ""
 "¤³¤Î¥»¥Ã¥·¥ç¥ó¤Ç¹Ô¤Ã¤¿Êѹ¹¤òÇË´þ¤·¤Þ¤¹¡¥\n"
 "ËÜÅö¤Ë¹Ô¤Ã¤Æ¤â¤¤¤¤¤Ç¤¹¤«?"
 
-#: gui/gdmconfig.c:1755
+#: gui/gdmconfig.c:1753
 msgid ""
 "This will destroy any changes made in the configuration.\n"
 "Are you sure you want to do this?"
@@ -1624,23 +1793,23 @@ msgstr ""
 "¤³¤¦¤¹¤ë¤È¤³¤ÎÀßÄê¤Ë¤Ä¤¤¤ÆÊѹ¹¤·¤¿Éôʬ¤ò¤¹¤Ù¤ÆÇË´þ¤¹¤ë¤³¤È¤Ë\n"
 "¤Ê¤ê¤Þ¤¹¤¬¡¢ËÜÅö¤Ë¹Ô¤Ã¤Æ¤â¤¤¤¤¤Ç¤¹¤«?"
 
-#: gui/gdmconfig.c:1976 gui/gdmconfig.c:2307
+#: gui/gdmconfig.c:1974 gui/gdmconfig.c:2305
 msgid "A command line must start with a forward slash ('/')"
-msgstr ""
+msgstr "¥³¥Þ¥ó¥É¥é¥¤¥ó¤ÎÀèƬ¤Ï¥¹¥é¥Ã¥·¥å ('/') ¤Ç³«»Ï¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
 
-#: gui/gdmconfig.c:1980
+#: gui/gdmconfig.c:1978
 msgid "A descriptive server name must be supplied"
-msgstr ""
+msgstr "¥Ç¥£¥¹¥¯¥ê¥×¥Æ¥£¥Ö¥µ¡¼¥Ð̾¤Ïµ­½Ò¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
 
-#: gui/gdmconfig.c:2647
+#: gui/gdmconfig.c:2645
 msgid "A session name must be unique and not empty"
 msgstr "¥»¥Ã¥·¥ç¥ó̾¤Ï¸ÇÍ­¡¢¤«¤Ä¶õ¤Ç¤¢¤Ã¤Æ¤Ï¤¤¤±¤Þ¤»¤ó"
 
-#: gui/gdmconfig.c:2660
+#: gui/gdmconfig.c:2658
 msgid "Enter a name for the new session"
-msgstr "¿·µ¬¥»¥Ã¥·¥ç¥ó̾¤òÆþÎÏ"
+msgstr "¿·µ¬¥»¥Ã¥·¥ç¥ó̾¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤"
 
-#: gui/gdmconfig.c:2775
+#: gui/gdmconfig.c:2773
 msgid ""
 "You have modified the sessions directory.\n"
 "Your session changes will still get written\n"
@@ -1674,7 +1843,7 @@ msgstr "ÀßÄê(_C)"
 
 #: gui/gdmconfig-strings.c:9
 msgid "Revert to settings in the configuration file"
-msgstr "ÀßÄê¥Õ¥¡¥¤¥ëÆâ¤ÇÀßÄê¤ò¸µ¤ËÌ᤹"
+msgstr "ÀßÄê¥Õ¥¡¥¤¥ëÆâ¤ÇÀßÄê¤ò¸µ¤ËÌᤷ¤Þ¤¹"
 
 #: gui/gdmconfig-strings.c:10
 msgid "Revert settings"
@@ -1682,7 +1851,7 @@ msgstr "ÀßÄê¤ò¸µ¤ËÌ᤹"
 
 #: gui/gdmconfig-strings.c:11
 msgid "Revert to settings that were shipped with your system"
-msgstr "½Ð²Ù»þ¤ÎÀßÄê¤ËÌ᤹"
+msgstr "½Ð²Ù»þ¤ÎÀßÄê¤ËÌᤷ¤Þ¤¹"
 
 #: gui/gdmconfig-strings.c:12
 msgid "Revert to Factory Settings"
@@ -1690,13 +1859,13 @@ msgstr "ÀßÄê¤ò½Ð²Ù»þÀßÄê¤ËÌ᤹"
 
 #: gui/gdmconfig-strings.c:13
 msgid "Apply the current changes"
-msgstr "¸½ºß¤ÎÊѹ¹¤òŬÍÑ"
+msgstr "¸½ºß¤ÎÊѹ¹¤òŬÍѤ·¤Þ¤¹"
 
 #: gui/gdmconfig-strings.c:14
 msgid "Apply"
 msgstr "ŬÍÑ"
 
-#: gui/gdmconfig-strings.c:15 gui/gdmconfig-strings.c:132
+#: gui/gdmconfig-strings.c:15 gui/gdmconfig-strings.c:134
 msgid "Options"
 msgstr "¥ª¥×¥·¥ç¥ó"
 
@@ -1714,7 +1883,7 @@ msgstr "¥í¥´: "
 
 #: gui/gdmconfig-strings.c:20
 msgid "Select a logo to be displayed during login"
-msgstr "¥í¥°¥¤¥ó»þ¤Ëɽ¼¨¤¹¤ë¥í¥´¤ÎÁªÂò"
+msgstr "¥í¥°¥¤¥ó»þ¤Ëɽ¼¨¤¹¤ë¥í¥´¤ÎÁªÂò¤·¤Þ¤¹"
 
 #: gui/gdmconfig-strings.c:21
 msgid "Minimised Icon: "
@@ -1753,11 +1922,11 @@ msgstr ""
 
 #: gui/gdmconfig-strings.c:28
 msgid "Show the 'system' menu, (for reboot, shutdown etc.)"
-msgstr "¡Ö¥·¥¹¥Æ¥à¡×¥á¥Ë¥å¡¼¤òɽ¼¨ (ºÆµ¯Æ°¡¦¥·¥ã¥Ã¥È¥À¥¦¥ó¤Ê¤É)"
+msgstr "¡Ö¥·¥¹¥Æ¥à¡×¥á¥Ë¥å¡¼¤òɽ¼¨¤·¤Þ¤¹ (ºÆµ¯Æ°¡¦¥·¥ã¥Ã¥È¥À¥¦¥ó¤Ê¤É)"
 
 #: gui/gdmconfig-strings.c:29
 msgid "Allow users to run the configurator from the system menu"
-msgstr "¥æ¡¼¥¶¤Ë¥·¥¹¥Æ¥à¥á¥Ë¥å¡¼¤«¤é¤ÎÀßÄê¥Ä¡¼¥ë¼Â¹Ô¤òµö²Ä"
+msgstr "¥æ¡¼¥¶¤Ë¥·¥¹¥Æ¥à¥á¥Ë¥å¡¼¤«¤é¤ÎÀßÄê¥Ä¡¼¥ë¼Â¹Ô¤òµö²Ä¤·¤Þ¤¹"
 
 #: gui/gdmconfig-strings.c:30
 msgid ""
@@ -1780,7 +1949,7 @@ msgstr ""
 
 #: gui/gdmconfig-strings.c:33
 msgid "Show title bar on login window"
-msgstr "¥í¥°¥¤¥ó¥¦¥£¥ó¥É¥¦¾å¤Ë¥¿¥¤¥È¥ë¥Ð¡¼¤òɽ¼¨"
+msgstr "¥í¥°¥¤¥ó¥¦¥£¥ó¥É¥¦¾å¤Ë¥¿¥¤¥È¥ë¥Ð¡¼¤òɽ¼¨¤·¤Þ¤¹"
 
 #: gui/gdmconfig-strings.c:34
 #, c-format
@@ -1799,7 +1968,7 @@ msgstr "¤³¤ì¤Ï %n ¤Ç¤¹"
 
 #: gui/gdmconfig-strings.c:37
 msgid "The welcome message displayed on the login window"
-msgstr "¤è¤¦¤³¤½¥á¥Ã¥»¡¼¥¸¤ò¥í¥°¥¤¥ó¥¦¥£¥ó¥É¥¦¤Ëɽ¼¨"
+msgstr "¤è¤¦¤³¤½¥á¥Ã¥»¡¼¥¸¤ò¥í¥°¥¤¥ó¥¦¥£¥ó¥É¥¦¤Ëɽ¼¨¤·¤Þ¤¹"
 
 #: gui/gdmconfig-strings.c:39
 msgid "Default font: "
@@ -1811,7 +1980,7 @@ msgstr "¥¦¥¨¥ë¥«¥à¥á¥Ã¥»¡¼¥¸: "
 
 #: gui/gdmconfig-strings.c:41
 msgid "The font to use on the welcome message"
-msgstr "¤è¤¦¤³¤½¥á¥Ã¥»¡¼¥¸¤Ë»È¤¦¥Õ¥©¥ó¥È"
+msgstr "¤è¤¦¤³¤½¥á¥Ã¥»¡¼¥¸¤Ë»È¤¦¥Õ¥©¥ó¥È¤ò»ØÄꤷ¤Þ¤¹"
 
 #: gui/gdmconfig-strings.c:42
 msgid "Pick a Font"
@@ -1964,38 +2133,48 @@ msgstr ""
 "¤Ï\"ja_JP\")¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
 
 #: gui/gdmconfig-strings.c:80
+msgid ""
+"Always use the 24 hour format for the clock in the greeter, even if the norm "
+"for the current locale is 12 hour"
+msgstr "¤¿¤È¤¨¸½ºß¤Î¥í¥±¡¼¥ë¤Ç¤Ï12»þ´ÖÀ©¤¬É¸½à¤Ç¤â»þ·×¤Ç24»þ´ÖÀ©¤ò¾ï¤Ë»ÈÍѤ·¤Þ¤¹"
+
+#: gui/gdmconfig-strings.c:81
+msgid "Always use 24 hour clock format"
+msgstr "¾ï¤Ë24»þ´ÖÀ©¤Ç»ÈÍѤ¹¤ë"
+
+#: gui/gdmconfig-strings.c:82
 msgid "Position"
 msgstr "°ÌÃÖ"
 
-#: gui/gdmconfig-strings.c:81
+#: gui/gdmconfig-strings.c:83
 msgid "Set the initial position of the login window to the values below"
-msgstr "¥í¥°¥¤¥ó¥¦¥£¥ó¥É¥¦¤Î½é´ü°ÌÃÖ¤ò²¼¤ÎÃͤËÀßÄê"
+msgstr "¥í¥°¥¤¥ó¥¦¥£¥ó¥É¥¦¤Î½é´ü°ÌÃÖ¤ò²¼¤ÎÃͤËÀßÄꤷ¤Þ¤¹"
 
-#: gui/gdmconfig-strings.c:82
+#: gui/gdmconfig-strings.c:84
 msgid "Manually set position"
 msgstr "¼êÆ°¤Ç°ÌÃÖ¤òÀßÄê"
 
-#: gui/gdmconfig-strings.c:83
+#: gui/gdmconfig-strings.c:85
 msgid "Do note allow the user to drag the login window around"
-msgstr "¥æ¡¼¥¶¤¬¥í¥°¥¤¥ó¥¦¥£¥ó¥É¥¦¤ò¥É¥é¥Ã¥°¤·¤ÆÆ°¤«¤¹¤³¤È¤ò¶Ø»ß"
+msgstr "¥æ¡¼¥¶¤¬¥í¥°¥¤¥ó¥¦¥£¥ó¥É¥¦¤ò¥É¥é¥Ã¥°¤·¤ÆÆ°¤«¤¹¤³¤È¤ò¶Ø»ß¤·¤Þ¤¹"
 
-#: gui/gdmconfig-strings.c:84
+#: gui/gdmconfig-strings.c:86
 msgid "Lock position"
 msgstr "°ÌÃÖ¤ò¸ÇÄê"
 
-#: gui/gdmconfig-strings.c:85
+#: gui/gdmconfig-strings.c:87
 msgid "X position: "
 msgstr "X °ÌÃÖ: "
 
-#: gui/gdmconfig-strings.c:86
+#: gui/gdmconfig-strings.c:88
 msgid "Y position: "
 msgstr "Y °ÌÃÖ: "
 
-#: gui/gdmconfig-strings.c:87
+#: gui/gdmconfig-strings.c:89
 msgid "Xinerama screen: "
 msgstr "Xinerama ¥¹¥¯¥ê¡¼¥ó: "
 
-#: gui/gdmconfig-strings.c:88
+#: gui/gdmconfig-strings.c:90
 msgid ""
 "If you have xinerama multi display setup which screen should the loginw "
 "indow appear on.  0 will usually do just fine."
@@ -2003,15 +2182,15 @@ msgstr ""
 "¥·¥Í¥é¥Þ¥Þ¥ë¥Á¥Ç¥£¥¹¥×¥ì¥¤¤ò»ý¤Ã¤Æ¤¤¤Æ¡¢¥í¥°¥¤¥ó¥¦¥£¥ó¥É¥¦¤òɽ¼¨¤¹¤ë¤Ù¤­²èÌÌ"
 "¤òÀßÄꤹ¤ëɬÍפ¬¤¢¤ë¤Ê¤é¡¢Ä̾ï¤Ï 0 ¤È¤¹¤ë¤Î¤¬Îɤ¤¤Ç¤·¤ç¤¦"
 
-#: gui/gdmconfig-strings.c:89
+#: gui/gdmconfig-strings.c:91
 msgid "Login behaviour"
 msgstr "¥í¥°¥¤¥ó¤Î¤Õ¤ë¤Þ¤¤"
 
-#: gui/gdmconfig-strings.c:90 gui/gdmconfig-strings.c:101
+#: gui/gdmconfig-strings.c:92 gui/gdmconfig-strings.c:103
 msgid "Face browser"
 msgstr "´é²èÁü¥Ö¥é¥¦¥¶"
 
-#: gui/gdmconfig-strings.c:91
+#: gui/gdmconfig-strings.c:93
 msgid ""
 "Show a browser of user face images. The users can put their picture in ~/."
 "gnome/photo"
@@ -2019,75 +2198,75 @@ msgstr ""
 "¥æ¡¼¥¶¤Î´é¼Ì¿¿¤òɽ¼¨¤·¤Þ¤¹¡£¥æ¡¼¥¶¤ÏÈà¤é¼«¿È¤Î´é¼Ì¿¿²èÁü¤ò ~/.gnome/photo¤ËÃÖ"
 "¤¤¤Æ¤ª¤¯¤³¤È¤¬¤Ç¤­¤Þ¤¹"
 
-#: gui/gdmconfig-strings.c:92
+#: gui/gdmconfig-strings.c:94
 msgid "Show choosable user images (enable face browser)"
 msgstr "ÁªÂò²Äǽ¤Ê¥æ¡¼¥¶²èÁü¤òɽ¼¨ (´é²èÁü¥Ö¥é¥¦¥¶¤òÍ­¸ú¤Ë¤¹¤ë)"
 
-#: gui/gdmconfig-strings.c:93
+#: gui/gdmconfig-strings.c:95
 msgid "Default face image: "
 msgstr "¥Ç¥Õ¥©¥ë¥È¤Î´é²èÁü: "
 
-#: gui/gdmconfig-strings.c:94
+#: gui/gdmconfig-strings.c:96
 msgid "Global faces directory: "
 msgstr "Á´ÂΤδé²èÁü¥Ç¥£¥ì¥¯¥È¥ê: "
 
-#: gui/gdmconfig-strings.c:95
+#: gui/gdmconfig-strings.c:97
 msgid "Maximum face width: "
 msgstr "´é²èÁü¤ÎÉý¤ÎºÇÂçÃÍ: "
 
-#: gui/gdmconfig-strings.c:96
+#: gui/gdmconfig-strings.c:98
 msgid "Select an image for users with no 'face'"
-msgstr "´é²èÁü¤Î¤Ê¤¤¥æ¡¼¥¶¤Î²èÁü¤ÎÁªÂò"
+msgstr "´é²èÁü¤Î¤Ê¤¤¥æ¡¼¥¶¤Î²èÁü¤ÎÁªÂò¤·¤Þ¤¹"
 
-#: gui/gdmconfig-strings.c:97
+#: gui/gdmconfig-strings.c:99
 msgid "Choose the directory to search for faces"
-msgstr "´é²èÁü¤òõ¤¹¥Ç¥£¥ì¥¯¥È¥ê¤ÎÁªÂò"
+msgstr "´é²èÁü¤òõ¤¹¥Ç¥£¥ì¥¯¥È¥ê¤ÎÁªÂò¤·¤Þ¤¹"
 
-#: gui/gdmconfig-strings.c:98
+#: gui/gdmconfig-strings.c:100
 msgid "Maximum face height: "
 msgstr "´é²èÁü¤Î¹â¤µ¤ÎºÇÂçÃÍ: "
 
-#: gui/gdmconfig-strings.c:99
+#: gui/gdmconfig-strings.c:101
 msgid "Exclude these users: "
 msgstr "¤³¤ì¤é¤Î¥æ¡¼¥¶¤ò½ü³°: "
 
-#: gui/gdmconfig-strings.c:100
+#: gui/gdmconfig-strings.c:102
 msgid "A comma separated list of users to exclude from the face browser."
-msgstr "¥«¥ó¥Þ¤Ç¶èÀÚ¤é¤ì¤¿¡¢´é¼Ì¿¿¥Ö¥é¥¦¥¶¤«¤é½ü³°¤¹¤ë¥æ¡¼¥¶¤Î¥ê¥¹¥È"
+msgstr "¥«¥ó¥Þ¤Ç¶èÀÚ¤é¤ì¤¿¡¢´é¼Ì¿¿¥Ö¥é¥¦¥¶¤«¤é½ü³°¤¹¤ë¥æ¡¼¥¶¤Î¥ê¥¹¥È¤Ç¤¹"
 
-#: gui/gdmconfig-strings.c:102 gui/gdmconfig-strings.c:122
+#: gui/gdmconfig-strings.c:104 gui/gdmconfig-strings.c:124
 msgid "Background"
 msgstr "ÇØ·Ê"
 
-#: gui/gdmconfig-strings.c:103
+#: gui/gdmconfig-strings.c:105
 msgid "Background type: "
 msgstr "ÇطʤμïÎà: "
 
-#: gui/gdmconfig-strings.c:104
+#: gui/gdmconfig-strings.c:106
 msgid "The background should be the standard background"
-msgstr "Çطʤòɸ½à¤ÎÇطʤˤ¹¤ë"
+msgstr "Çطʤòɸ½à¤ÎÇطʤËÀßÄꤷ¤Þ¤¹"
 
-#: gui/gdmconfig-strings.c:105
+#: gui/gdmconfig-strings.c:107
 msgid "None"
 msgstr "¤Ê¤·"
 
-#: gui/gdmconfig-strings.c:106
+#: gui/gdmconfig-strings.c:108
 msgid "The background should be an image"
-msgstr "Çطʤò²èÁü¤Ë¤¹¤ë"
+msgstr "Çطʤò²èÁü¤ËÀßÄꤷ¤Þ¤¹"
 
-#: gui/gdmconfig-strings.c:107
+#: gui/gdmconfig-strings.c:109
 msgid "Image"
 msgstr "²èÁü"
 
-#: gui/gdmconfig-strings.c:108
+#: gui/gdmconfig-strings.c:110
 msgid "The background should be a color"
-msgstr "Çطʤò¿§¤ÇÅɤë"
+msgstr "Çطʤò¿§¤ÇÅɤê¤Ä¤Ö¤·¤Þ¤¹"
 
-#: gui/gdmconfig-strings.c:109
+#: gui/gdmconfig-strings.c:111
 msgid "Color"
 msgstr "¿§"
 
-#: gui/gdmconfig-strings.c:110
+#: gui/gdmconfig-strings.c:112
 msgid ""
 "Scale background image to fit the entire screen. If this is not set then the "
 "image will be tiled on the background."
@@ -2095,93 +2274,93 @@ msgstr ""
 "²èÌÌÁ´ÂΤ˹礦¤è¤¦¤ËÇطʲèÁü¤ò³ÈÂç/½Ì¾®¡£Ì¤»ØÄê¤Ê¤é²èÁü¤ÏÇطʤ˥¿¥¤¥ë¾õ¤ËʤÙ"
 "¤é¤ì¤Þ¤¹"
 
-#: gui/gdmconfig-strings.c:111
+#: gui/gdmconfig-strings.c:113
 msgid "Scale background image to fit"
-msgstr "ÇطʲèÁü¤¬¹ç¤¦¤è¤¦¤Ë³ÈÂç/½Ì¾®"
+msgstr "ÇطʲèÁü¤¬¹ç¤¦¤è¤¦¤Ë³ÈÂç/½Ì¾®¤·¤Þ¤¹"
 
-#: gui/gdmconfig-strings.c:112
+#: gui/gdmconfig-strings.c:114
 msgid "Background color: "
-msgstr "ÇØ·Ê¿§"
+msgstr "ÇØ·Ê¿§: "
 
-#: gui/gdmconfig-strings.c:113
+#: gui/gdmconfig-strings.c:115
 msgid "The color to use on the background"
-msgstr "ÇØ·Ê¿§"
+msgstr "ÇØ·Ê¿§¤òÀßÄꤷ¤Þ¤¹"
 
-#: gui/gdmconfig-strings.c:114
+#: gui/gdmconfig-strings.c:116
 msgid "Pick a color"
 msgstr "¿§¤òÁªÂò"
 
-#: gui/gdmconfig-strings.c:115
+#: gui/gdmconfig-strings.c:117
 msgid "Background image:"
 msgstr "ÇطʲèÁü:"
 
-#: gui/gdmconfig-strings.c:116
+#: gui/gdmconfig-strings.c:118
 msgid "On remote login screens only set color to reduce network traffic"
 msgstr ""
 "¥ê¥â¡¼¥È¥í¥°¥¤¥ó²èÌ̤ˤĤ¤¤Æ¤Ï¥Í¥Ã¥È¥ï¡¼¥¯ÄÌ¿®Î̤ò¸º¤é¤¹¤¿¤á¤Ë¿§¤òÀßÄꤹ¤ë¤À"
 "¤±¤Ç¤¹"
 
-#: gui/gdmconfig-strings.c:117
+#: gui/gdmconfig-strings.c:119
 msgid "Only color on remote displays"
 msgstr "¥ê¥â¡¼¥È¥Ç¥£¥¹¥×¥ì¥¤¤Ë¤Ä¤¤¤Æ¤ÏÇØ·Ê¿§¤À¤±¤Ë"
 
-#: gui/gdmconfig-strings.c:118
+#: gui/gdmconfig-strings.c:120
 msgid "Background program"
 msgstr "¥Ð¥Ã¥¯¥°¥é¥¦¥ó¥É¥×¥í¥°¥é¥à"
 
-#: gui/gdmconfig-strings.c:119
+#: gui/gdmconfig-strings.c:121
 msgid "Background program: "
 msgstr "¥Ð¥Ã¥¯¥°¥é¥¦¥ó¥É¥×¥í¥°¥é¥à: "
 
-#: gui/gdmconfig-strings.c:120 gui/gdmconfig-strings.c:269
+#: gui/gdmconfig-strings.c:122 gui/gdmconfig-strings.c:268
 msgid "Select a file containing Locale information"
 msgstr "¥í¥«¡¼¥ë¾ðÊó¤ÎÆþ¤Ã¤¿¥Õ¥¡¥¤¥ë¤ÎÁªÂò"
 
-#: gui/gdmconfig-strings.c:121
+#: gui/gdmconfig-strings.c:123
 msgid "The program to run in the background of the login."
-msgstr "¥í¥°¥¤¥ó¤ÎÇطʤǼ¹Ԥµ¤»¤ë¥×¥í¥°¥é¥à"
+msgstr "¥í¥°¥¤¥ó¤ÎÇطʤǼ¹Ԥµ¤»¤ë¥×¥í¥°¥é¥à¤òÀßÄꤷ¤Þ¤¹"
 
-#: gui/gdmconfig-strings.c:123 gui/gdmconfig-strings.c:130
+#: gui/gdmconfig-strings.c:125 gui/gdmconfig-strings.c:132
 msgid "Automatic login"
-msgstr "¼«Æ°¥í¥°¥¤¥ó"
+msgstr "¼«Æ°¥í¥°¥¤¥ó¤òÀßÄꤷ¤Þ¤¹"
 
-#: gui/gdmconfig-strings.c:124
+#: gui/gdmconfig-strings.c:126
 msgid "Automatic login: "
 msgstr "¼«Æ°¥í¥°¥¤¥ó: "
 
-#: gui/gdmconfig-strings.c:125
+#: gui/gdmconfig-strings.c:127
 msgid "Login a user automatically on first bootup"
-msgstr "µ¯Æ°¤·¤Æ¤¹¤°¤Ë¥æ¡¼¥¶¤ò¼«Æ°¤Ç¥í¥°¥¤¥ó"
+msgstr "µ¯Æ°¤·¤Æ¤¹¤°¤Ë¥æ¡¼¥¶¤ò¼«Æ°¤Ç¥í¥°¥¤¥ó¤µ¤»¤Þ¤¹"
 
-#: gui/gdmconfig-strings.c:126
+#: gui/gdmconfig-strings.c:128
 msgid "Timed login"
 msgstr "»þ´Ö¥í¥°¥¤¥ó"
 
-#: gui/gdmconfig-strings.c:127
+#: gui/gdmconfig-strings.c:129
 msgid "Timed login: "
 msgstr "»þ´Ö¥í¥°¥¤¥ó: "
 
-#: gui/gdmconfig-strings.c:128
+#: gui/gdmconfig-strings.c:130
 msgid "Seconds before login: "
 msgstr "¥í¥°¥¤¥óÁ°¤ÎÂÔ¤Á»þ´Ö: "
 
-#: gui/gdmconfig-strings.c:129
+#: gui/gdmconfig-strings.c:131
 msgid "Login a user automatically after a specified number of seconds"
-msgstr "»ØÄê»þ´Ö(ÉÃ)¸å¤Ë¥æ¡¼¥¶¤ò¼«Æ°Åª¤Ë¥í¥°¥¤¥ó"
+msgstr "»ØÄê»þ´Ö(ÉÃ)¸å¤Ë¥æ¡¼¥¶¤ò¼«Æ°Åª¤Ë¥í¥°¥¤¥ó¤µ¤»¤Þ¤¹"
 
-#: gui/gdmconfig-strings.c:131
+#: gui/gdmconfig-strings.c:133
 msgid "expert"
 msgstr "¹âÅÙ"
 
-#: gui/gdmconfig-strings.c:133
+#: gui/gdmconfig-strings.c:135
 msgid "Allow logging in as root (administrator) user."
-msgstr "root(´ÉÍý¼Ô)¥æ¡¼¥¶¤Ç¤Î¥í¥°¥¤¥ó¤òµö²Ä"
+msgstr "root(´ÉÍý¼Ô)¥æ¡¼¥¶¤Ç¤Î¥í¥°¥¤¥ó¤òµö²Ä¤·¤Þ¤¹"
 
-#: gui/gdmconfig-strings.c:134
+#: gui/gdmconfig-strings.c:136
 msgid "Allow root to login with GDM"
 msgstr "GDM ¤«¤é¤Î root ¥í¥°¥¤¥ó¤òµö²Ä"
 
-#: gui/gdmconfig-strings.c:135
+#: gui/gdmconfig-strings.c:137
 msgid ""
 "Allow logging in as root (administrator) user from a remote host using GDM.  "
 "This is only relevant if you enable the XDMCP protocol."
@@ -2189,11 +2368,11 @@ msgstr ""
 "GDM¤ò»ÈÍѤ·¤Æ¤¤¤ë¡¢¥ê¥â¡¼¥È¥Û¥¹¥È¤«¤é¤Îroot(´ÉÍý¼Ô)¥æ¡¼¥¶¤Ç¤Î¥í¥°¥¤¥ó¤òµö²Ä¡£"
 "XDMCP¥×¥í¥È¥³¥ë¤òÍøÍÑÃæ¤Î¾ì¹ç¤À¤±°ÕÌ£¤¬¤¢¤ê¤Þ¤¹"
 
-#: gui/gdmconfig-strings.c:136
+#: gui/gdmconfig-strings.c:138
 msgid "Allow root to login remotely with GDM"
 msgstr "¥ê¥â¡¼¥ÈGDM¤«¤é¤Î root ¥í¥°¥¤¥ó¤òµö²Ä"
 
-#: gui/gdmconfig-strings.c:137
+#: gui/gdmconfig-strings.c:139
 msgid ""
 "Allow logging in using the timed from a remote host using GDM.  This is only "
 "relevant if you enable the XDMCP protocol.  Note that this is insecure since "
@@ -2204,11 +2383,11 @@ msgstr ""
 "¥È¥³¥ë¤òÍøÍÑÃæ¤Î¾ì¹ç¤À¤±°ÕÌ£¤¬¤¢¤ê¤Þ¤¹¡£¤³¤ì¤Ë¤è¤Ã¤Æ¥ê¥â¡¼¥È¥Û¥¹¥È¤Ï¥Ñ¥¹¥ï¡¼"
 "¥É¤Ê¤·¤Ë¤³¤Î¥Û¥¹¥È¤Ø¤Î¥¢¥¯¥»¥¹¤¬²Äǽ¤Ë¤Ê¤ê¡¢°ÂÁ´¤Ç¤Ï¤Ê¤¤¤³¤È¤ËÃí°Õ¤·¤Æ²¼¤µ¤¤"
 
-#: gui/gdmconfig-strings.c:138
+#: gui/gdmconfig-strings.c:140
 msgid "Allow remote timed logins"
 msgstr "¥ê¥â¡¼¥Ètimed¥í¥°¥¤¥ó¤òµö²Ä"
 
-#: gui/gdmconfig-strings.c:139
+#: gui/gdmconfig-strings.c:141
 msgid ""
 "Determines whether GDM should kill X clients started by the init scripts "
 "when the user logs in."
@@ -2216,84 +2395,80 @@ msgstr ""
 "¥æ¡¼¥¶¥í¥°¥¤¥ó»þ¤Ëinit¥¹¥¯¥ê¥×¥È¤Çµ¯Æ°¤µ¤ì¤¿¥¯¥é¥¤¥¢¥ó¥È¤òGDM¤¬kill¤¹¤ë¤«¤É¤¦"
 "¤«¤ò·èÄê"
 
-#: gui/gdmconfig-strings.c:140
+#: gui/gdmconfig-strings.c:142
 msgid "Kill 'init' clients"
 msgstr "'init' ¥¯¥é¥¤¥¢¥ó¥È¤ò»¦¤¹"
 
-#: gui/gdmconfig-strings.c:141
+#: gui/gdmconfig-strings.c:143
 msgid "Should GDM print authentication errors in the greeter"
 msgstr "GDM¤¬greeter¤Çǧ¾Ú¥¨¥é¡¼¤òɽ¼¨¤¹¤ë¤Ù¤­¤«¤É¤¦¤«"
 
-#: gui/gdmconfig-strings.c:142
-msgid "Authentication errors should be verbose"
-msgstr "ǧ¾Ú¥¨¥é¡¼¤Ï¾éŤË"
-
-#: gui/gdmconfig-strings.c:143
+#: gui/gdmconfig-strings.c:144
 msgid "Select how relaxed permissions are"
-msgstr "¸¢¸Â¤ÎÄøÅÙ¤òÁªÂò"
+msgstr "¸¢¸Â¤ÎÄøÅÙ¤òÁªÂò¤·¤Þ¤¹"
 
-#: gui/gdmconfig-strings.c:144
+#: gui/gdmconfig-strings.c:145
 msgid "Permissions: "
 msgstr "¸¢¸Â: "
 
-#: gui/gdmconfig-strings.c:145
+#: gui/gdmconfig-strings.c:146
 msgid "Allow world writable files and directories"
-msgstr "¥Õ¥¡¥¤¥ë¤È¥Ç¥£¥ì¥¯¥È¥ê¤Ø¤ÎÁ´¥æ¡¼¥¶¤Ë¤è¤ë½ñ¤­¹þ¤ß¤òµö²Ä"
+msgstr "¥Õ¥¡¥¤¥ë¤È¥Ç¥£¥ì¥¯¥È¥ê¤Ø¤ÎÁ´¥æ¡¼¥¶¤Ë¤è¤ë½ñ¤­¹þ¤ß¤òµö²Ä¤·¤Þ¤¹"
 
-#: gui/gdmconfig-strings.c:146
+#: gui/gdmconfig-strings.c:147
 msgid "World writable"
 msgstr "Á´¥æ¡¼¥¶½ñ¤­¹þ¤ß²Äǽ"
 
-#: gui/gdmconfig-strings.c:147
+#: gui/gdmconfig-strings.c:148
 msgid "Allow group writable files and directories"
-msgstr "¥Õ¥¡¥¤¥ë¤È¥Ç¥£¥ì¥¯¥È¥ê¤Ø¥°¥ë¡¼¥×¤Ë¤è¤ë½ñ¤­¹þ¤ß¤òµö²Ä"
+msgstr "¥Õ¥¡¥¤¥ë¤È¥Ç¥£¥ì¥¯¥È¥ê¤Ø¥°¥ë¡¼¥×¤Ë¤è¤ë½ñ¤­¹þ¤ß¤òµö²Ä¤·¤Þ¤¹"
 
-#: gui/gdmconfig-strings.c:148
+#: gui/gdmconfig-strings.c:149
 msgid "Group writable"
 msgstr "¥°¥ë¡¼¥×½ñ¤­¹þ¤ß²Äǽ"
 
-#: gui/gdmconfig-strings.c:149
+#: gui/gdmconfig-strings.c:150
 msgid "Only accept user owned files and directories"
-msgstr "¥Õ¥¡¥¤¥ë¤È¥Ç¥£¥ì¥¯¥È¥ê¤Î½êÍ­¼Ô¤À¤±¤Ëµö²Ä"
+msgstr "¥Õ¥¡¥¤¥ë¤È¥Ç¥£¥ì¥¯¥È¥ê¤Î½êÍ­¼Ô¤À¤±¤Ëµö²Ä¤·¤Þ¤¹"
 
-#: gui/gdmconfig-strings.c:150
+#: gui/gdmconfig-strings.c:151
 msgid "Paranoia"
 msgstr "¥Ñ¥é¥Î¥¤¥¢"
 
-#: gui/gdmconfig-strings.c:151
+#: gui/gdmconfig-strings.c:152
 msgid "Authorization Details"
 msgstr "ǧ¾Ú¤Î¾ÜºÙ"
 
-#: gui/gdmconfig-strings.c:152
+#: gui/gdmconfig-strings.c:153
 msgid "GDM runs as this user: "
 msgstr "GDM ¤Ï¤³¤Î¥æ¡¼¥¶¤ÇÆ°ºî: "
 
-#: gui/gdmconfig-strings.c:153
+#: gui/gdmconfig-strings.c:154
 msgid "User 'auth' directory: "
 msgstr "¥æ¡¼¥¶ 'auth' ¥Ç¥£¥ì¥¯¥È¥ê: "
 
-#: gui/gdmconfig-strings.c:154
+#: gui/gdmconfig-strings.c:155
 msgid "User 'auth' FB directory: "
 msgstr "¥æ¡¼¥¶ 'auth' FB ¥Ç¥£¥ì¥¯¥È¥ê: "
 
-#: gui/gdmconfig-strings.c:155
+#: gui/gdmconfig-strings.c:156
 msgid "User 'auth' file: "
 msgstr "¥æ¡¼¥¶ 'auth' ¥Õ¥¡¥¤¥ë: "
 
-#: gui/gdmconfig-strings.c:156
+#: gui/gdmconfig-strings.c:157
 msgid "GDM runs as this group: "
 msgstr "GDM ¤Ï¤³¤Î¥°¥ë¡¼¥×¤ÇÆ°ºî: "
 
-#: gui/gdmconfig-strings.c:157
+#: gui/gdmconfig-strings.c:158
 msgid "Limits"
 msgstr "À©¸Â"
 
-#: gui/gdmconfig-strings.c:158
+#: gui/gdmconfig-strings.c:159
 msgid ""
 "The number of seconds before a login is allowed after an unsuccesful try."
-msgstr "¥í¥°¥¤¥ó¼ºÇÔ¸å¤ÎºÆ»î¹Ô¤Ç¥í¥°¥¤¥ó¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤ë¤Þ¤Ç¤ÎÂÔ¤Á»þ´Ö"
+msgstr "¥í¥°¥¤¥ó¼ºÇÔ¸å¤ÎºÆ»î¹Ô¤Ç¥í¥°¥¤¥ó¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤ë¤Þ¤Ç¤ÎÂÔ¤Á»þ´Ö¤òÀßÄꤷ¤Þ¤¹"
 
-#: gui/gdmconfig-strings.c:159
+#: gui/gdmconfig-strings.c:160
 msgid ""
 "The maximum size of a file that gdm will attempt to read.  This is for files "
 "that are read into memory and so you don't want users \"attacking\" gdm by "
@@ -2303,19 +2478,19 @@ msgstr ""
 "¤ë¤â¤Î¤Ç¤¢¤ê¡¢¥æ¡¼¥¶¤¬GDM¤ËµðÂç¤Ê¥Õ¥¡¥¤¥ë¤òÆɤ߹þ¤Þ¤»¤ë¤³¤È¤Ç\"¹¶·â\"¤¹¤ë¤³¤È"
 "¤òËɤ®¤Þ¤¹"
 
-#: gui/gdmconfig-strings.c:160
+#: gui/gdmconfig-strings.c:161
 msgid "Retry delay: "
 msgstr "ºÆ»î¹Ô¤ÎÃÙ±ä: "
 
-#: gui/gdmconfig-strings.c:161
+#: gui/gdmconfig-strings.c:162
 msgid "Maximum user file length: "
 msgstr "¥æ¡¼¥¶¥Õ¥¡¥¤¥ë¤ÎŤµ¤ÎºÇÂçÃÍ: "
 
-#: gui/gdmconfig-strings.c:162
+#: gui/gdmconfig-strings.c:163
 msgid "Maximum session file length: "
 msgstr "ºÇÂ祻¥Ã¥·¥ç¥ó¥Õ¥¡¥¤¥ëĹ: "
 
-#: gui/gdmconfig-strings.c:163
+#: gui/gdmconfig-strings.c:164
 msgid ""
 "The session file is read in a way where a higher limit is still ok.  That is "
 "it is never stored in memory."
@@ -2323,11 +2498,11 @@ msgstr ""
 "ÍÆÎ̤ξå¸Â¤¬Í­¸ú¤Ê¾ì¹ç¤Ç¤â¥»¥Ã¥·¥ç¥ó¥Õ¥¡¥¤¥ë¤Ï¤¢¤ëÄøÅÙÆɤ߹þ¤Þ¤ì¤Þ¤¹¡£¤³¤ì¤Ï"
 "·è¤·¤Æ¥á¥â¥ê¤ËÊÝ»ý¤µ¤ì¤Ê¤¤¤«¤é¤Ç¤¹"
 
-#: gui/gdmconfig-strings.c:164
+#: gui/gdmconfig-strings.c:165
 msgid "Security"
 msgstr "¥»¥­¥å¥ê¥Æ¥£"
 
-#: gui/gdmconfig-strings.c:165
+#: gui/gdmconfig-strings.c:166
 msgid ""
 "No XDMCP support in the binary.  To enable XDMCP support you must recompile "
 "GDM with the XDMCP libraries."
@@ -2335,51 +2510,51 @@ msgstr ""
 "¤³¤Î¥Ð¥¤¥Ê¥ê¤ÏXDMCP̤¥µ¥Ý¡¼¥È¤Ç¤¹¡£XDMCP¤òÍ­¸ú¤Ë¤¹¤ë¤Ë¤ÏGDM¤òXDMCP¥é¥¤¥Ö¥é¥ê"
 "¤È¤È¤â¤ËºÆ¥³¥ó¥Ñ¥¤¥ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹"
 
-#: gui/gdmconfig-strings.c:166
+#: gui/gdmconfig-strings.c:167
 msgid "Enable XDMCP, a protocol to allow others to log in remotely"
 msgstr "¥ê¥â¡¼¥È¤«¤é¤Î¥í¥°¥¤¥ó¤òµö²Ä¤¹¤ë¡¢XDMCP¤òÍ­¸ú²½"
 
-#: gui/gdmconfig-strings.c:167
+#: gui/gdmconfig-strings.c:168
 msgid "Enable XDMCP"
 msgstr "XDMCP ¤òÍ­¸ú¤Ë¤¹¤ë"
 
-#: gui/gdmconfig-strings.c:168
+#: gui/gdmconfig-strings.c:169
 msgid "Connection Settings"
 msgstr "Àܳ¤ÎÀßÄê"
 
-#: gui/gdmconfig-strings.c:169
+#: gui/gdmconfig-strings.c:170
 msgid "Honour indirect requests"
 msgstr "̾ÍÀ¤¢¤ë´ÖÀÜŪ¤ÊÍ×µá"
 
-#: gui/gdmconfig-strings.c:170
+#: gui/gdmconfig-strings.c:171
 msgid "Maximum indirect wait time: "
 msgstr "´ÖÀÜŪ¤ÊÂÔ¤Á»þ´Ö¤ÎºÇÂçÃÍ: "
 
-#: gui/gdmconfig-strings.c:171
+#: gui/gdmconfig-strings.c:172
 msgid "Maximum wait time: "
 msgstr "ÂÔ¤Á»þ´Ö¤ÎºÇÂçÃÍ: "
 
-#: gui/gdmconfig-strings.c:172
+#: gui/gdmconfig-strings.c:173
 msgid "Maximum remote sessions: "
 msgstr "±ó³Ö¥»¥Ã¥·¥ç¥ó¤ÎºÇÂç¿ô: "
 
-#: gui/gdmconfig-strings.c:173
+#: gui/gdmconfig-strings.c:174
 msgid "Max pending indirect requests: "
 msgstr "̤²ò·è¤Î´ÖÀÜŪÍ×µá¤ÎºÇÂçÃÍ: "
 
-#: gui/gdmconfig-strings.c:174
+#: gui/gdmconfig-strings.c:175
 msgid "Maximum pending requests: "
 msgstr "̤²ò·è¤ÎÍ×µá¤ÎºÇÂçÃÍ: "
 
-#: gui/gdmconfig-strings.c:175
+#: gui/gdmconfig-strings.c:176
 msgid "Listen on UDP port: "
 msgstr "´Æ»ë¤¹¤ë UDP ¥Ý¡¼¥È: "
 
-#: gui/gdmconfig-strings.c:176
+#: gui/gdmconfig-strings.c:177
 msgid "Ping interval (minutes):"
 msgstr "ping»þ´Ö´Ö³Ö(ÉÃ):"
 
-#: gui/gdmconfig-strings.c:177
+#: gui/gdmconfig-strings.c:178
 msgid ""
 "Interval in minutes in which to ping the server.  If the server doesn't "
 "respond in this many minutes (that is before the next time we ping it) the "
@@ -2388,80 +2563,80 @@ msgstr ""
 "¥µ¡¼¥Ð¤Ëping¤¹¤ë¤È¤­¤Î»þ´Ö´Ö³Ö(ÉÃ)¡£¥µ¡¼¥Ð¤¬¤³¤Î»þ´Ö¤ò²á¤®¤Æ¤â±þÅú¤·¤Ê¤¤¤È¤­"
 "¤Ï¤½¤Î¥Ç¥£¥¹¥×¥ì¥¤¤ò½ªÎ»¤·¤Þ¤¹"
 
-#: gui/gdmconfig-strings.c:178
+#: gui/gdmconfig-strings.c:179
 msgid ""
 "The script to run when the server sends a WILLING response to a QUERY.  If "
 "this is empty or does not exist, the standard message with the system ID is "
 "sent.  Only the first line of output from this script is read."
-msgstr ""
+msgstr "¥µ¡¼¥Ð¤¬QUERY¤ØWILLING¥ì¥¹¥Ý¥ó¥¹¤òÁ÷¿®¤¹¤ë»þ¤Ë¼Â¹Ô¤¹¤ë¥¹¥¯¥ê¥×¥È¤ò»ØÄꤷ¤Þ¤¹¡£¤â¤·¤³¤ì¤¬¶õ¤¢¤ë¤¤¤Ï¸ºß¤·¤Ê¤¤¤Ê¤é¡¢¥·¥¹¥Æ¥àID¤Çɸ½à¥á¥Ã¥»¡¼¥¸¤ÏÁ÷¿®¤µ¤ì¤Þ¤¹¡£¤³¤Î¥¹¥¯¥ê¥×¥È¤«¤é¤Î½ÐÎϤÎ1¹ÔÌܤÀ¤±¤¬Æɤ߹þ¤Þ¤ì¤Þ¤¹"
 
-#: gui/gdmconfig-strings.c:179
+#: gui/gdmconfig-strings.c:180
 msgid "Willing script (optional):"
-msgstr ""
+msgstr "Willing¥¹¥¯¥ê¥×¥È (Ǥ°Õ):"
 
-#: gui/gdmconfig-strings.c:180
+#: gui/gdmconfig-strings.c:181
 msgid ""
 "Maximum displays per single host.  You can use this to prevent attacks by "
 "hogging all the possible displays.  Does not apply to local connections."
-msgstr ""
+msgstr "ñ°ì¥Û¥¹¥ÈËè¤ÎºÇÂç¥Ç¥£¥¹¥×¥ì¥¤¿ô¤Ç¤¹¡£¤¹¤Ù¤Æ¤Î²Äǽ¤Ê¥Ç¥£¥¹¥×¥ì¥¤¤òÀêÍ­¤¹¤ë¥¢¥¿¥Ã¥¯¤òͽËɤ¹¤ë¤¿¤á¤Ë»ÈÍѤ·¤Þ¤¹¡£¥í¡¼¥«¥ëÀܳ¤Ë¤ÏŬÍѤµ¤ì¤Þ¤»¤ó"
 
-#: gui/gdmconfig-strings.c:181
+#: gui/gdmconfig-strings.c:182
 msgid "Displays per host:"
 msgstr "¥Û¥¹¥È¤¢¤¿¤ê¤Î¥Ç¥£¥¹¥×¥ì¥¤¿ô:"
 
-#: gui/gdmconfig-strings.c:182
+#: gui/gdmconfig-strings.c:183
 msgid "XDMCP"
 msgstr "XDMCP"
 
-#: gui/gdmconfig-strings.c:183
+#: gui/gdmconfig-strings.c:184
 msgid "Servers"
 msgstr "¥µ¡¼¥Ð"
 
-#: gui/gdmconfig-strings.c:184
+#: gui/gdmconfig-strings.c:185
 msgid "Name"
 msgstr "̾Á°"
 
-#: gui/gdmconfig-strings.c:185
+#: gui/gdmconfig-strings.c:186
 msgid "Command"
 msgstr "¥³¥Þ¥ó¥É"
 
-#: gui/gdmconfig-strings.c:186
+#: gui/gdmconfig-strings.c:187
 msgid "Flexible"
 msgstr "¥Õ¥ì¥­¥·¥Ö¥ë"
 
-#: gui/gdmconfig-strings.c:187 gui/gdmconfig-strings.c:197
+#: gui/gdmconfig-strings.c:188 gui/gdmconfig-strings.c:198
 msgid "Add server"
 msgstr "¥µ¡¼¥Ð¤òÄɲÃ"
 
-#: gui/gdmconfig-strings.c:188 gui/gdmconfig-strings.c:198
+#: gui/gdmconfig-strings.c:189 gui/gdmconfig-strings.c:199
 msgid "Edit server"
 msgstr "¥µ¡¼¥Ð¤òÊÔ½¸"
 
-#: gui/gdmconfig-strings.c:189 gui/gdmconfig-strings.c:199
+#: gui/gdmconfig-strings.c:190 gui/gdmconfig-strings.c:200
 msgid "Delete server"
 msgstr "¥µ¡¼¥Ð¤òºï½ü"
 
-#: gui/gdmconfig-strings.c:190 gui/gdmconfig-strings.c:226
+#: gui/gdmconfig-strings.c:191 gui/gdmconfig-strings.c:225
 msgid "Set as default"
 msgstr "ɸ½à¤ËÀßÄê"
 
-#: gui/gdmconfig-strings.c:191
+#: gui/gdmconfig-strings.c:192
 msgid "Static Servers (servers to always run)"
 msgstr "¸ÇÄꥵ¡¼¥Ð(¾ï¤Ëµ¯Æ°¤·¤Æ¤¤¤ë¥µ¡¼¥Ð)"
 
-#: gui/gdmconfig-strings.c:192
+#: gui/gdmconfig-strings.c:193
 msgid "No."
 msgstr "¤¤¤¤¤¨¡¥"
 
-#: gui/gdmconfig-strings.c:193
+#: gui/gdmconfig-strings.c:194
 msgid "Server"
 msgstr "¥µ¡¼¥Ð"
 
-#: gui/gdmconfig-strings.c:194
+#: gui/gdmconfig-strings.c:195
 msgid "Extra arguments"
 msgstr "°ú¿ô"
 
-#: gui/gdmconfig-strings.c:195
+#: gui/gdmconfig-strings.c:196
 msgid ""
 "Instead of reinitializing running servers when a user logs out.  Always kill "
 "and then start the server again."
@@ -2469,59 +2644,49 @@ msgstr ""
 "¥æ¡¼¥¶¤¬¥í¥°¥¢¥¦¥È¤·¤¿¤È¤­¤Ë¼Â¹ÔÃæ¤Î¥µ¡¼¥Ð¤òºÆ½é´ü²½¤¹¤ëÂå¤ê¡£¤¤¤Ä¤âkill¤·¤Æ"
 "¥µ¡¼¥Ð¤òºÆÅÙµ¯Æ°¤·¤Þ¤¹"
 
-#: gui/gdmconfig-strings.c:196
+#: gui/gdmconfig-strings.c:197
 msgid "Always restart X servers"
 msgstr "¾ï¤ËX¥µ¡¼¥Ð¤òºÆµ¯Æ°"
 
-#: gui/gdmconfig-strings.c:200 gui/gdmconfig-strings.c:247
-#: gui/gdmconfig-strings.c:261 gui/gdmconfig-strings.c:265
+#: gui/gdmconfig-strings.c:201 gui/gdmconfig-strings.c:246
+#: gui/gdmconfig-strings.c:260 gui/gdmconfig-strings.c:264
 msgid "Miscellaneous"
 msgstr "¤½¤Î¾"
 
-#: gui/gdmconfig-strings.c:201
+#: gui/gdmconfig-strings.c:202
 msgid "Xnest server: "
 msgstr "Xnest¥µ¡¼¥Ð: "
 
-#: gui/gdmconfig-strings.c:202
+#: gui/gdmconfig-strings.c:203
 msgid "Maximum number of flexible servers: "
 msgstr "¥Õ¥ì¥­¥·¥Ö¥ë¥µ¡¼¥Ð¤ÎºÇÂçÃÍ: "
 
-#: gui/gdmconfig-strings.c:203
+#: gui/gdmconfig-strings.c:204
 msgid ""
 "The Xnest server.  This is a server that can run inside another server, used "
 "for the flexible nested login."
 msgstr ""
-"Xnest¥µ¡¼¥Ð¡£¤³¤ì¤Ï¾¤Î¥µ¡¼¥Ð¤ÎÃæ¤Çµ¯Æ°¤Ç¤­¤ë¥µ¡¼¥Ð¤Ç¡¢¥Õ¥ì¥­¥·¥Ö¥ë¤ÊÆþ¤ì»Ò"
-"¥í¥°¥¤¥ó¤Ë»È¤¤¤Þ¤¹¡£"
+"Xnest¥µ¡¼¥Ð¡£¤³¤ì¤Ï¾¤Î¥µ¡¼¥Ð¤ÎÃæ¤Çµ¯Æ°¤Ç¤­¤ë¥µ¡¼¥Ð¤Ç¡¢¥Õ¥ì¥­¥·¥Ö¥ë¤ÊÆþ¤ì»Ò¥í"
+"¥°¥¤¥ó¤Ë»È¤¤¤Þ¤¹¡£"
 
-#: gui/gdmconfig-strings.c:204
+#: gui/gdmconfig-strings.c:205
 msgid "Standard X server: "
 msgstr "ɸ½à¤ÎX¥µ¡¼¥Ð: "
 
-#: gui/gdmconfig-strings.c:205
+#: gui/gdmconfig-strings.c:206
 msgid "This is the standard X server to run when we are not told otherwise."
 msgstr "¤³¤ì¤Ï¾¤Ë»ØÄꤵ¤ì¤Ê¤«¤Ã¤¿¤È¤­¤Ë»ÈÍѤµ¤ì¤ëɸ½à¤ÎX¥µ¡¼¥Ð¤Ç¤¹¡£"
 
-#: gui/gdmconfig-strings.c:206 gui/gdmlogin.c:62
+#: gui/gdmconfig-strings.c:207 gui/gdmlogin.c:60
 msgid "Failsafe"
 msgstr "¥Õ¥§¡¼¥ë¥»¡¼¥Õ"
 
-#: gui/gdmconfig-strings.c:207
+#: gui/gdmconfig-strings.c:208
 msgid "Script to run when X is crashing: "
 msgstr "X¤¬¥¯¥é¥Ã¥·¥å¤·¤¿¤È¤­¤Ë¼Â¹Ô¤¹¤ë¥¹¥¯¥ê¥×¥È: "
 
-#: gui/gdmconfig-strings.c:208
-msgid "X configurator binaries to try: "
-msgstr "»î¹Ô¤¹¤ë¡¢Xconfigurator¥Ð¥¤¥Ê¥ê: "
-
 #: gui/gdmconfig-strings.c:209
 msgid ""
-"A list of X setup programs to try for the above script, separated by spaces"
-msgstr ""
-"¾åµ­¤Î¥¹¥¯¥ê¥×¥È¤Ë¤Ä¤¤¤Æ¡¢»î¹Ô¤¹¤ëXÀßÄê¥×¥í¥°¥é¥à¤Î(¶õÇò¤Ç¶èÀÚ¤é¤ì¤¿)¥ê¥¹¥È"
-
-#: gui/gdmconfig-strings.c:210
-msgid ""
 "A script to run when the X server keeps crashing and the failsafe X server "
 "is either empty or also didn't take.  This will run an X setup program "
 "defined below."
@@ -2530,11 +2695,11 @@ msgstr ""
 "¥¯¥é¥Ã¥·¥å¤¹¤ë¾ì¹ç¤Ë¼Â¹Ô¤¹¤ë¥¹¥¯¥ê¥×¥È¡£¤³¤ì¤Ï²¼¤ËÄêµÁ¤µ¤ì¤¿XÀßÄê¥×¥í¥°¥é¥à¤ò"
 "¼Â¹Ô¤·¤Þ¤¹"
 
-#: gui/gdmconfig-strings.c:211
+#: gui/gdmconfig-strings.c:210
 msgid "Failsafe X server:"
 msgstr "¥Õ¥§¡¼¥ë¥»¡¼¥ÕX¥µ¡¼¥Ð:"
 
-#: gui/gdmconfig-strings.c:212
+#: gui/gdmconfig-strings.c:211
 msgid ""
 "An X server binary to run if the standard one keeps crashing.  If this fails "
 "the script below will be run."
@@ -2542,63 +2707,63 @@ msgstr ""
 "ɸ½àŪ¤Ê¤â¤Î¤¬¥¯¥é¥Ã¥·¥å¤·Â³¤±¤ë¾ì¹ç¤Ë¼Â¹Ô¤¹¤ëX¥µ¡¼¥Ð¥Ð¥¤¥Ê¥ê¡£¤³¤ì¤â¼ºÇÔ¤·¤¿"
 "¾ì¹ç¤Ï²¼¤Î¥¹¥¯¥ê¥×¥È¤ò¼Â¹Ô¤·¤Þ¤¹"
 
-#: gui/gdmconfig-strings.c:213
+#: gui/gdmconfig-strings.c:212
 msgid "X-server setup"
 msgstr "X ¥µ¡¼¥Ð¤ÎÀßÄê"
 
-#: gui/gdmconfig-strings.c:214
+#: gui/gdmconfig-strings.c:213
 msgid "Session configuration"
 msgstr "¥»¥Ã¥·¥ç¥óÀßÄê"
 
-#: gui/gdmconfig-strings.c:215
+#: gui/gdmconfig-strings.c:214
 msgid "Session directory: "
 msgstr "¥»¥Ã¥·¥ç¥ó¥Ç¥£¥ì¥¯¥È¥ê: "
 
-#: gui/gdmconfig-strings.c:216
+#: gui/gdmconfig-strings.c:215
 msgid "Select a directory to be used for system-wide session scripts"
-msgstr "¥·¥¹¥Æ¥àÁ´ÂΤΥ»¥Ã¥·¥ç¥ó¥¹¥¯¥ê¥×¥È¤Ë»ÈÍѤ¹¤ë¥Ç¥£¥ì¥¯¥È¥ê¤ÎÁªÂò"
+msgstr "¥·¥¹¥Æ¥àÁ´ÂΤΥ»¥Ã¥·¥ç¥ó¥¹¥¯¥ê¥×¥È¤Ë»ÈÍѤ¹¤ë¥Ç¥£¥ì¥¯¥È¥ê¤òÁªÂò¤·¤Þ¤¹"
 
-#: gui/gdmconfig-strings.c:217
+#: gui/gdmconfig-strings.c:216
 msgid "Available Sessions"
 msgstr "ÍøÍѲÄǽ¤Ê¥»¥Ã¥·¥ç¥ó"
 
-#: gui/gdmconfig-strings.c:218
+#: gui/gdmconfig-strings.c:217
 msgid "Show the Gnome Chooser session, if a session named 'Gnome' is present"
-msgstr "¥»¥Ã¥·¥ç¥ó'GNOME'¤¬¤¢¤ì¤Ð¡¢¤½¤ÎGNOME Chooser¥»¥Ã¥·¥ç¥ó¤òɽ¼¨"
+msgstr "¥»¥Ã¥·¥ç¥ó'GNOME'¤¬¤¢¤ì¤Ð¡¢¤½¤ÎGNOME Chooser¥»¥Ã¥·¥ç¥ó¤òɽ¼¨¤·¤Þ¤¹"
 
-#: gui/gdmconfig-strings.c:219 gui/gdmlogin.c:66 gui/gdmlogin.c:1412
+#: gui/gdmconfig-strings.c:218 gui/gdmlogin.c:64 gui/gdmlogin.c:1415
 msgid "Gnome Chooser"
 msgstr "GNOME Chooser"
 
-#: gui/gdmconfig-strings.c:220
+#: gui/gdmconfig-strings.c:219
 msgid "Show the Gnome failsafe session"
-msgstr "GNOME¥Õ¥§¡¼¥ë¥»¡¼¥Õ¥»¥Ã¥·¥ç¥ó¤òɽ¼¨"
+msgstr "GNOME¥Õ¥§¡¼¥ë¥»¡¼¥Õ¥»¥Ã¥·¥ç¥ó¤òɽ¼¨¤·¤Þ¤¹"
 
-#: gui/gdmconfig-strings.c:221
+#: gui/gdmconfig-strings.c:220
 msgid "Gnome Failsafe"
 msgstr "GNOME¥Õ¥§¡¼¥ë¥»¡¼¥Õ"
 
-#: gui/gdmconfig-strings.c:222
+#: gui/gdmconfig-strings.c:221
 msgid "Show the Xterm failsafe session"
-msgstr "Xterm¥Õ¥§¡¼¥ë¥»¡¼¥Õ¥»¥Ã¥·¥ç¥ó¤òɽ¼¨"
+msgstr "Xterm¥Õ¥§¡¼¥ë¥»¡¼¥Õ¥»¥Ã¥·¥ç¥ó¤òɽ¼¨¤·¤Þ¤¹"
 
-#: gui/gdmconfig-strings.c:223
+#: gui/gdmconfig-strings.c:222
 msgid "Xterm Failsafe"
 msgstr "xterm¥Õ¥§¡¼¥ë¥»¡¼¥Õ"
 
-#: gui/gdmconfig-strings.c:224
+#: gui/gdmconfig-strings.c:223
 msgid "Add session"
 msgstr "¥»¥Ã¥·¥ç¥ó¤òÄɲÃ"
 
-#: gui/gdmconfig-strings.c:225
+#: gui/gdmconfig-strings.c:224
 msgid "Remove session"
 msgstr "ÀßÄê¤òºï½ü"
 
-#: gui/gdmconfig-strings.c:227
+#: gui/gdmconfig-strings.c:226
 msgid "Selected session name: "
 msgstr "ÁªÂò¤·¤¿¥»¥Ã¥·¥ç¥ó̾: "
 
-#: gui/gdmconfig-strings.c:228
+#: gui/gdmconfig-strings.c:227
 msgid ""
 "The exact script details of a session\n"
 "will appear here when you select\n"
@@ -2608,48 +2773,47 @@ msgstr ""
 "¥ê¥¹¥ÈÆ⤫¤éÁªÂò¤·¤¿¤â¤Î¤Ë¤Ä¤¤¤Æº¸Â¦¤Ë\n"
 "ɽ¼¨¤µ¤ì¤Þ¤¹\n"
 
-#: gui/gdmconfig-strings.c:232
+#: gui/gdmconfig-strings.c:231
 msgid "Login sessions"
 msgstr "¥í¥°¥¤¥ó¥»¥Ã¥·¥ç¥ó"
 
-#: gui/gdmconfig-strings.c:233
+#: gui/gdmconfig-strings.c:232
 msgid "Appearance"
 msgstr "³°´Ñ"
 
-#: gui/gdmconfig-strings.c:234
+#: gui/gdmconfig-strings.c:233
 msgid "Directory for host images: "
 msgstr "¥Û¥¹¥È¥¤¥á¡¼¥¸¤Î¥Ç¥£¥ì¥¯¥È¥ê: "
 
-#: gui/gdmconfig-strings.c:235
+#: gui/gdmconfig-strings.c:234
 msgid "Default host image:"
 msgstr "¥Ç¥Õ¥©¥ë¥È¤Î¥Û¥¹¥È¥¤¥á¡¼¥¸: "
 
-#: gui/gdmconfig-strings.c:236
+#: gui/gdmconfig-strings.c:235
 msgid "Refresh"
 msgstr "¹¹¿·"
 
-#: gui/gdmconfig-strings.c:237
+#: gui/gdmconfig-strings.c:236
 msgid "Scan every 'x' seconds: "
 msgstr "x É䴤Ȥ˥¹¥­¥ã¥ó: "
 
-#: gui/gdmconfig-strings.c:238
+#: gui/gdmconfig-strings.c:237
 msgid "Hosts"
 msgstr "¥Û¥¹¥È"
 
-#: gui/gdmconfig-strings.c:239
+#: gui/gdmconfig-strings.c:238
 msgid "Send a query to the local network and list all servers that respond"
-msgstr ""
-"¥í¡¼¥«¥ë¥Í¥Ã¥È¥ï¡¼¥¯¤ËÌ䤤¹ç¤ï¤»¤òÁ÷¿®¤·¤Æ±þÅú¤·¤¿¤¹¤Ù¤Æ¤Î¥µ¡¼¥Ð¤ò¥ê¥¹¥Èɽ¼¨"
+msgstr "¥í¡¼¥«¥ë¥Í¥Ã¥È¥ï¡¼¥¯¤ËÌ䤤¹ç¤ï¤»¤òÁ÷¿®¤·¤Æ±þÅú¤·¤¿¤¹¤Ù¤Æ¤Î¥µ¡¼¥Ð¤ò¥ê¥¹¥Èɽ¼¨¤·¤Þ¤¹"
 
-#: gui/gdmconfig-strings.c:240
+#: gui/gdmconfig-strings.c:239
 msgid "Broadcast query"
 msgstr "¥Ö¥í¡¼¥É¥­¥ã¥¹¥ÈÌ䤤¹ç¤ï¤»"
 
-#: gui/gdmconfig-strings.c:241
+#: gui/gdmconfig-strings.c:240
 msgid "Hosts to list: "
 msgstr "¥ê¥¹¥È¤µ¤ì¤ë¥Û¥¹¥È: "
 
-#: gui/gdmconfig-strings.c:242
+#: gui/gdmconfig-strings.c:241
 msgid ""
 "Comma separated list of hostnames to list in the chooser (in addition to the "
 "broadcast above)"
@@ -2657,15 +2821,15 @@ msgstr ""
 "¥Û¥¹¥È̾¤Î¡¢¥³¥ó¥Þ¤Ç¶èÀÚ¤é¤ì¤¿¥ê¥¹¥È¤òchooser¤Î¥ê¥¹¥È¤Ø(¾å¤Î¥Ö¥í¡¼¥É¥­¥ã¥¹¥È"
 "¤Ë¤è¤ë¤â¤Î¤ËÄɲÃ)"
 
-#: gui/gdmconfig-strings.c:243
+#: gui/gdmconfig-strings.c:242
 msgid "Chooser"
 msgstr "Chooser"
 
-#: gui/gdmconfig-strings.c:244
+#: gui/gdmconfig-strings.c:243
 msgid "Debugging"
 msgstr "¥Ç¥Ð¥Ã¥°"
 
-#: gui/gdmconfig-strings.c:245
+#: gui/gdmconfig-strings.c:244
 msgid ""
 "Enable debugging output to be printed into the syslog.  Useful for tracking "
 "down problems.  But not so useful for normal usage as it can fill up your "
@@ -2675,169 +2839,168 @@ msgstr ""
 "¥°¤ò¤¹¤°¤Ë¿£¤ä¤·¤Æ¤·¤Þ¤¦¤Î¤ÇÉáÄ̤λȤ¤Êý¤ò¤·¤Æ¤¤¤ë¸Â¤ê¤Ï¤½¤ì¤Û¤ÉÍ­±×¤Ç¤Ï¤¢¤ê"
 "¤Þ¤»¤ó"
 
-#: gui/gdmconfig-strings.c:246
+#: gui/gdmconfig-strings.c:245
 msgid "Enable debugging output"
 msgstr "¥Ç¥Ð¥Ã¥°½ÐÎϤòÍ­¸ú¤Ë¤¹¤ë"
 
-#: gui/gdmconfig-strings.c:248
+#: gui/gdmconfig-strings.c:247
 msgid "system_setup"
 msgstr "¥·¥¹¥Æ¥àÀßÄê(_S)"
 
-#: gui/gdmconfig-strings.c:249
+#: gui/gdmconfig-strings.c:248
 msgid "Executables"
 msgstr "¼Â¹Ô²Äǽ"
 
-#: gui/gdmconfig-strings.c:250
+#: gui/gdmconfig-strings.c:249
 msgid "Chooser command: "
 msgstr "Chooser ¥³¥Þ¥ó¥É: "
 
-#: gui/gdmconfig-strings.c:251
+#: gui/gdmconfig-strings.c:250
 msgid "Greeter command: "
 msgstr "Greeter ¥³¥Þ¥ó¥É: "
 
-#: gui/gdmconfig-strings.c:252
+#: gui/gdmconfig-strings.c:251
 msgid "Halt command: "
 msgstr "Ää»ß¥³¥Þ¥ó¥É: "
 
-#: gui/gdmconfig-strings.c:253
+#: gui/gdmconfig-strings.c:252
 msgid "Reboot command: "
 msgstr "ºÆµ¯Æ°¥³¥Þ¥ó¥É: "
 
-#: gui/gdmconfig-strings.c:254
+#: gui/gdmconfig-strings.c:253
 msgid "Configurator command: "
 msgstr "Configurator¥³¥Þ¥ó¥É: "
 
-#: gui/gdmconfig-strings.c:255
+#: gui/gdmconfig-strings.c:254
 msgid "Suspend command: "
 msgstr "¥µ¥¹¥Ú¥ó¥É¥³¥Þ¥ó¥É: "
 
-#: gui/gdmconfig-strings.c:256
+#: gui/gdmconfig-strings.c:255
 msgid "Directories"
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê"
 
-#: gui/gdmconfig-strings.c:257
+#: gui/gdmconfig-strings.c:256
 msgid "PRE session scripts directory: "
 msgstr "Á°ÃÖ¥»¥Ã¥·¥ç¥ó¥¹¥¯¥ê¥×¥È¥Ç¥£¥ì¥¯¥È¥ê: "
 
-#: gui/gdmconfig-strings.c:258
+#: gui/gdmconfig-strings.c:257
 msgid "POST session scripts directory: "
 msgstr "¸åÃÖ¥»¥Ã¥·¥ç¥ó¥¹¥¯¥ê¥×¥È¥Ç¥£¥ì¥¯¥È¥ê: "
 
-#: gui/gdmconfig-strings.c:259
+#: gui/gdmconfig-strings.c:258
 msgid "Logging directory: "
 msgstr "¥í¥°¥Ç¥£¥ì¥¯¥È¥ê: "
 
-#: gui/gdmconfig-strings.c:260
+#: gui/gdmconfig-strings.c:259
 msgid "Display initialization directory: "
 msgstr "¥Ç¥£¥¹¥×¥ì¥¤½é´ü²½¥Ç¥£¥ì¥¯¥È¥ê: "
 
-#: gui/gdmconfig-strings.c:262
+#: gui/gdmconfig-strings.c:261
 msgid "PID file: "
 msgstr "PID ¥Õ¥¡¥¤¥ë: "
 
-#: gui/gdmconfig-strings.c:263
+#: gui/gdmconfig-strings.c:262
 msgid "Default GNOME session file: "
 msgstr "ɸ½àGNOME¥»¥Ã¥·¥ç¥ó¥Õ¥¡¥¤¥ë: "
 
-#: gui/gdmconfig-strings.c:264
+#: gui/gdmconfig-strings.c:263
 msgid "Paths"
 msgstr "¥Ñ¥¹"
 
-#: gui/gdmconfig-strings.c:266
+#: gui/gdmconfig-strings.c:265
 msgid "Default $PATH: "
 msgstr "¥Ç¥Õ¥©¥ë¥È $PATH: "
 
-#: gui/gdmconfig-strings.c:267
+#: gui/gdmconfig-strings.c:266
 msgid "Root $PATH: "
 msgstr "Root $PATH: "
 
-#: gui/gdmconfig-strings.c:268
+#: gui/gdmconfig-strings.c:267
 msgid "Localization"
 msgstr "¸À¸ìÀßÄê"
 
-#: gui/gdmconfig-strings.c:270
+#: gui/gdmconfig-strings.c:269
 msgid "Locale file: "
 msgstr "¥í¥«¡¼¥ë¥Õ¥¡¥¤¥ë: "
 
-#: gui/gdmconfig-strings.c:271
+#: gui/gdmconfig-strings.c:270
 msgid "Environment"
 msgstr "´Ä¶­"
 
-#: gui/gdmconfig-strings.c:272
+#: gui/gdmconfig-strings.c:271
 msgid "(C) 2001 Lee Mallabone"
 msgstr "(C) 2001 Lee Mallabone"
 
-#: gui/gdmconfig-strings.c:273
+#: gui/gdmconfig-strings.c:272
 msgid ""
 "Configure the GNOME Display Manager.\n"
 "Please submit any bugs or feature requests at http://bugzilla.gnome.org "
 "under the `gdm' product."
 msgstr ""
-"GNOME¥Ç¥£¥¹¥×¥ì¥¤¥Þ¥Í¡¼¥¸¥ã¤òÀßÄê¡£\n"
-"ÉÔ¶ñ¹ç¤ÎÊó¹ð¤äÍߤ·¤¤µ¡Ç½¤Ë¤Ä¤¤¤Æ¤Ï http://bugzilla.gnome.org ¤Î'gm'¥×¥í¥À¥¯¥È"
-"¤Ø¤É¤¦¤¾"
+"GNOME¥Ç¥£¥¹¥×¥ì¥¤¥Þ¥Í¡¼¥¸¥ã¤òÀßÄꤷ¤Þ¤¹\n"
+"ÉÔ¶ñ¹ç¤ÎÊó¹ð¤äÍߤ·¤¤µ¡Ç½¤Ë¤Ä¤¤¤Æ¤Ï http://bugzilla.gnome.org ¤Î'gm'¥×¥í¥À¥¯¥È¤Ø¤É¤¦¤¾"
 
-#: gui/gdmconfig-strings.c:275
+#: gui/gdmconfig-strings.c:274
 msgid "label273"
 msgstr "label273"
 
-#: gui/gdmconfig-strings.c:276
+#: gui/gdmconfig-strings.c:275
 msgid "Extra arguments:"
 msgstr "°ú¿ô:"
 
-#: gui/gdmconfig-strings.c:277
+#: gui/gdmconfig-strings.c:276
 msgid "Custom command line:"
 msgstr "¥«¥¹¥¿¥à¥³¥Þ¥ó¥É¥é¥¤¥ó:"
 
-#: gui/gdmconfig-strings.c:278 gui/gdmlogin.c:1812
+#: gui/gdmconfig-strings.c:277 gui/gdmlogin.c:1815
 msgid "Name: "
 msgstr "̾Á°: "
 
-#: gui/gdmconfig-strings.c:279
+#: gui/gdmconfig-strings.c:278
 msgid "Command line: "
 msgstr "¥³¥Þ¥ó¥É¥é¥¤¥ó: "
 
-#: gui/gdmconfig-strings.c:280
+#: gui/gdmconfig-strings.c:279
 msgid "Allow as flexible server"
 msgstr "¥Õ¥ì¥­¥·¥Ö¥ë¥µ¡¼¥Ð¤òµö²Ä"
 
-#: gui/gdmconfig-strings.c:281
+#: gui/gdmconfig-strings.c:280
 msgid "Make this the default server"
 msgstr "¤³¤ì¤ò¥Ç¥Õ¥©¥ë¥È¤Î¥µ¡¼¥Ð¤Ë¤¹¤ë"
 
-#: gui/gdmflexiserver.c:354
+#: gui/gdmflexiserver.c:437
 msgid "Choose server"
 msgstr "¥µ¡¼¥Ð¤ÎÁªÂò"
 
-#: gui/gdmflexiserver.c:360
+#: gui/gdmflexiserver.c:443
 msgid "Choose the X server to start"
 msgstr "µ¯Æ°¤¹¤ëX¥µ¡¼¥Ð¤òµ¯Æ°¤·¤Þ¤¹"
 
-#: gui/gdmflexiserver.c:416
+#: gui/gdmflexiserver.c:499
 msgid "Send the specified protocol command to gdm"
 msgstr "»ØÄꤷ¤¿¥×¥í¥È¥³¥ë¥³¥Þ¥ó¥É¤ògdm¤ËÁ÷¿®"
 
-#: gui/gdmflexiserver.c:416
+#: gui/gdmflexiserver.c:499
 msgid "COMMAND"
 msgstr "¥³¥Þ¥ó¥É"
 
-#: gui/gdmflexiserver.c:417
+#: gui/gdmflexiserver.c:500
 msgid "Xnest mode"
 msgstr "Xnest¥â¡¼¥É"
 
-#: gui/gdmflexiserver.c:418
+#: gui/gdmflexiserver.c:501
 msgid "Do not lock current screen"
 msgstr "¸½ºß¥¹¥¯¥ê¡¼¥ó¤ò¥í¥Ã¥¯¤·¤Ê¤¤"
 
-#: gui/gdmflexiserver.c:419
+#: gui/gdmflexiserver.c:502
 msgid "Debugging output"
 msgstr "¥Ç¥Ð¥Ã¥°½ÐÎÏ"
 
-#: gui/gdmflexiserver.c:420
+#: gui/gdmflexiserver.c:503
 msgid "Authenticate before running --command"
 msgstr "--command¤Çµ¯Æ°¤¹¤ëÁ°¤Ëǧ¾Ú¤¹¤ë"
 
-#: gui/gdmXnestchooser.c:153 gui/gdmflexiserver.c:468
+#: gui/gdmXnestchooser.c:261 gui/gdmflexiserver.c:551
 msgid ""
 "GDM is not running.\n"
 "Please ask your system administrator to start it."
@@ -2845,52 +3008,59 @@ msgstr ""
 "GDM¤Ïµ¯Æ°¤·¤Æ¤¤¤Þ¤»¤ó¡£\n"
 "¥·¥¹¥Æ¥à´ÉÍý¼Ô¤Ëµ¯Æ°¤¹¤ë¤è¤¦¤ËÍê¤ó¤Ç¤¯¤À¤µ¤¤¡£"
 
-#: gui/gdmflexiserver.c:477 gui/gdmflexiserver.c:493 gui/gdmflexiserver.c:550
-#: gui/gdmflexiserver.c:553
+#: gui/gdmflexiserver.c:560 gui/gdmflexiserver.c:576 gui/gdmflexiserver.c:644
+#: gui/gdmflexiserver.c:647
 msgid "Cannot communicate with gdm, perhaps you have an old version running."
-msgstr "gdm¤ÈÄÌ¿®¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¡£¤ª¤½¤é¤¯¸Å¤¤¥Ð¡¼¥¸¥ç¥ó¤òµ¯Æ°¤·¤Æ¤¤¤Þ¤¹¡£"
+msgstr ""
+"gdm¤ÈÄÌ¿®¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¡£¤ª¤½¤é¤¯¸Å¤¤¥Ð¡¼¥¸¥ç¥ó¤òµ¯Æ°¤·¤Æ¤¤¤Þ¤¹¡£"
+
+#: gui/gdmflexiserver.c:587 gui/gdmflexiserver.c:673
+msgid ""
+"You do not seem to have authentication needed be for this operation.  "
+"Perhaps your .Xauthority file is not set up correctly."
+msgstr "¤³¤ÎÁàºî¤ËɬÍפȤµ¤ì¤ëǧ¾Ú¤ò»ý¤Ã¤Æ¤¤¤Ê¤¤¤è¤¦¤Ç¤¹¡£¤ª¤½¤é¤¯¤¢¤Ê¤¿¤Î .Xauthority ¥Õ¥¡¥¤¥ë¤¬Àµ¤·¤¯ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
-#: gui/gdmflexiserver.c:512 gui/gdmflexiserver.c:579
+#: gui/gdmflexiserver.c:606
 msgid ""
 "You do not seem to be logged in on the console.  Starting a new login only "
 "works correctly on the console."
 msgstr ""
-"¥³¥ó¥½¡¼¥ë¤Ë¥í¥°¥¤¥ó¤¹¤ë¤³¤È¤¬¤Ç¤­¤Ê¤¤¤è¤¦¤Ç¤¹¡£¿·µ¬¥í¥°¥¤¥ó¤Î³«»Ï¤Ï"
-"¸½ºß¥³¥ó¥½¡¼¥ë¤À¤±¤Ç¼Â¹Ô¤Ç¤­¤Þ¤¹¡£"
+"¥³¥ó¥½¡¼¥ë¤Ë¥í¥°¥¤¥ó¤¹¤ë¤³¤È¤¬¤Ç¤­¤Ê¤¤¤è¤¦¤Ç¤¹¡£¿·µ¬¥í¥°¥¤¥ó¤Î³«»Ï¤Ï¸½ºß¥³¥ó"
+"¥½¡¼¥ë¤À¤±¤Ç¼Â¹Ô¤Ç¤­¤Þ¤¹¡£"
 
-#: gui/gdmflexiserver.c:538
+#: gui/gdmflexiserver.c:632
 msgid "Can't lock screen"
 msgstr "¥¹¥¯¥ê¡¼¥ó¤ò¥í¥Ã¥¯¤Ç¤­¤Þ¤»¤ó"
 
-#: gui/gdmflexiserver.c:541
+#: gui/gdmflexiserver.c:635
 msgid "Can't disable xscreensaver display hacks"
 msgstr "xscreensaver¥Ç¥£¥¹¥×¥ì¥¤¥Ï¥Ã¥¯¤Ï»È¤¨¤Þ¤»¤ó"
 
-#: gui/gdmflexiserver.c:556
+#: gui/gdmflexiserver.c:650
 msgid "The allowed limit of flexible X servers reached."
 msgstr "¥Õ¥ì¥­¥·¥Ö¥ëX¥µ¡¼¥Ð¤ÎÀßÄꤵ¤ì¤¿¸Â³¦¤Ç¤¹¡£"
 
-#: gui/gdmflexiserver.c:558
+#: gui/gdmflexiserver.c:652
 msgid "There were errors trying to start the X server."
 msgstr "X¥µ¡¼¥Ð¤òµ¯Æ°¤·¤è¤¦¤È¤·¤Æ¥¨¥é¡¼¤¬µ¯¤³¤ê¤Þ¤·¤¿¡£"
 
-#: gui/gdmflexiserver.c:560
+#: gui/gdmflexiserver.c:654
 msgid "The X server failed.  Perhaps it is not configured well."
 msgstr "X¥µ¡¼¥Ð¤¬½ªÎ»¤·¤Þ¤·¤¿¡£¤ª¤½¤é¤¯¤¦¤Þ¤¯ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó¡£"
 
-#: gui/gdmflexiserver.c:563
+#: gui/gdmflexiserver.c:657
 msgid "Too many X sessions running."
 msgstr "µ¯Æ°¤·¤Æ¤¤¤ëX¥»¥Ã¥·¥ç¥ó¤¬Â¿¤¹¤®¤Ç¤¹¡£"
 
-#: gui/gdmflexiserver.c:565
+#: gui/gdmflexiserver.c:659
 msgid ""
 "The nested X server (Xnest) cannot connect to your current X server.  You "
 "may be missing an X authorization file."
 msgstr ""
-"Æþ¤ì»ÒX¥µ¡¼¥Ð(Xnest)¤Ï¸½ºß¤ÎX¥µ¡¼¥Ð¤ËÀܳ¤Ç¤­¤Þ¤»¤ó¡£X¤Îǧ¾Ú¥Õ¥¡¥¤¥ë"
-"¤¬¸«¤Ä¤«¤é¤Ê¤¤¤»¤¤¤«¤âÃΤì¤Þ¤»¤ó¡£"
+"Æþ¤ì»ÒX¥µ¡¼¥Ð(Xnest)¤Ï¸½ºß¤ÎX¥µ¡¼¥Ð¤ËÀܳ¤Ç¤­¤Þ¤»¤ó¡£X¤Îǧ¾Ú¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«"
+"¤é¤Ê¤¤¤»¤¤¤«¤âÃΤì¤Þ¤»¤ó¡£"
 
-#: gui/gdmflexiserver.c:570
+#: gui/gdmflexiserver.c:664
 msgid ""
 "The nested X server (Xnest) is not available, or gdm is badly configured.\n"
 "Please install the Xnest package in order to use the nested login."
@@ -2898,13 +3068,12 @@ msgstr ""
 "Æþ¤ì»ÒX¥µ¡¼¥Ð(Xnest)¤Ï»ÈÍѤǤ­¤Ê¤¤¤«¡¢gdm¤¬Àµ¤·¤¯ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n"
 "Æþ¤ì»Ò¥í¥°¥¤¥ó¤ò»È¤¦¤Ë¤ÏXnest¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£"
 
-#: gui/gdmflexiserver.c:575
+#: gui/gdmflexiserver.c:669
 msgid ""
 "The X server is not available, it is likely that gdm is badly configured."
-msgstr ""
-"X¥µ¡¼¥Ð¤Ï»ÈÍѤǤ­¤Þ¤»¤ó¡£gdm¤¬Àµ¤·¤¯ÀßÄꤵ¤ì¤Æ¤¤¤Ê¤¤¤«¤é¤Î¤è¤¦¤Ç¤¹¡£"
+msgstr "X¥µ¡¼¥Ð¤Ï»ÈÍѤǤ­¤Þ¤»¤ó¡£gdm¤¬Àµ¤·¤¯ÀßÄꤵ¤ì¤Æ¤¤¤Ê¤¤¤«¤é¤Î¤è¤¦¤Ç¤¹¡£"
 
-#: gui/gdmflexiserver.c:583
+#: gui/gdmflexiserver.c:677
 msgid "Unknown error occured."
 msgstr "ÉÔÌÀ¤Ê¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿¡£"
 
@@ -2986,9 +3155,8 @@ msgstr "A-M|Ê©¸ì"
 
 #. Note translate the A-M to the A-M you used in the group label
 #: gui/gdmlanguages.c:60
-#, fuzzy
 msgid "A-M|Galician"
-msgstr "A-M|°Ë¸ì"
+msgstr "A-M|¥¬¥ê¥Á¥¢¸ì"
 
 #. Note translate the A-M to the A-M you used in the group label
 #: gui/gdmlanguages.c:62
@@ -3057,9 +3225,8 @@ msgstr "N-Z|¥Ý¥ë¥È¥¬¥ë¸ì"
 
 #. Note translate the N-Z to the N-Z you used in the group label
 #: gui/gdmlanguages.c:88
-#, fuzzy
 msgid "N-Z|Brazilian Portuguese"
-msgstr "N-Z|¥Ý¥ë¥È¥¬¥ë¸ì"
+msgstr "N-Z|¥Ý¥ë¥È¥¬¥ë¸ì(¥Ö¥é¥¸¥ë)"
 
 #. Note translate the N-Z to the N-Z you used in the group label
 #: gui/gdmlanguages.c:90
@@ -3096,50 +3263,55 @@ msgstr "N-Z|¥¹¥¦¥§¡¼¥Ç¥ó¸ì"
 msgid "N-Z|Turkish"
 msgstr "N-Z|¥È¥ë¥³¸ì"
 
-#. This is the POSIX/C locale for english, should really be in Other
+#. Note translate the N-Z to the N-Z you used in the group label
 #: gui/gdmlanguages.c:104
+msgid "N-Z|Ukrainian"
+msgstr "N-Z|¥¦¥¯¥é¥¤¥Ê¸ì"
+
+#. This is the POSIX/C locale for english, should really be in Other
+#: gui/gdmlanguages.c:106
 msgid "Other|POSIX/C English"
 msgstr "¤½¤Î¾|POSIX/C ±Ñ¸ì"
 
 #. 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:231
+#: gui/gdmlanguages.c:233
 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:239
+#: gui/gdmlanguages.c:241
 msgid "N-Z"
 msgstr "N-Z"
 
-#: gui/gdmlogin.c:60
+#: gui/gdmlogin.c:58
 msgid "AnotherLevel"
 msgstr "AnotherLevel"
 
 #. default is nicely translated
 #. Translators: default GNOME session
-#: gui/gdmlogin.c:61 gui/gdmlogin.c:1767 gui/gdmlogin.c:1789
+#: gui/gdmlogin.c:59 gui/gdmlogin.c:1770 gui/gdmlogin.c:1792
 msgid "Default"
 msgstr "ɸ½à"
 
-#: gui/gdmlogin.c:63
+#: gui/gdmlogin.c:61
 msgid "Gnome"
 msgstr "GNOME"
 
-#: gui/gdmlogin.c:64
+#: gui/gdmlogin.c:62
 msgid "KDE"
 msgstr "KDE"
 
-#: gui/gdmlogin.c:65
+#: gui/gdmlogin.c:63
 msgid "XSession"
 msgstr "X¥»¥Ã¥·¥ç¥ó"
 
-#: gui/gdmlogin.c:67
+#: gui/gdmlogin.c:65
 msgid "Last"
 msgstr "Á°²ó"
 
-#: gui/gdmlogin.c:197
+#: gui/gdmlogin.c:196
 #, c-format
 msgid "User %s will login in %d seconds"
 msgstr "¥æ¡¼¥¶%s¤Ï%dÉøå¤Ë¥í¥°¥¤¥ó"
@@ -3191,15 +3363,15 @@ msgstr "gdm_login_parse_config: ÀßÄê¥Õ¥¡¥¤¥ë¤Ê¤·: %s ɸ½à¤ò»ÈÍÑ"
 msgid "TimedLoginDelay was less then 5.  I'll just use 5."
 msgstr "TimedLoginDelay¤¬5̤Ëþ¤Ê¤Î¤Ç5¤Ë¤·¤Þ¤¹"
 
-#: gui/gdmlogin.c:886 gui/gdmlogin.c:1460
+#: gui/gdmlogin.c:888 gui/gdmlogin.c:1463
 msgid "Failsafe Gnome"
 msgstr "¥Õ¥§¡¼¥ë¥»¡¼¥ÕGNOME"
 
-#: gui/gdmlogin.c:888 gui/gdmlogin.c:1485
+#: gui/gdmlogin.c:890 gui/gdmlogin.c:1488
 msgid "Failsafe xterm"
 msgstr "¥Õ¥§¡¼¥ë¥»¡¼¥Õxterm"
 
-#: gui/gdmlogin.c:934
+#: gui/gdmlogin.c:936
 #, c-format
 msgid ""
 "Your preferred session type %s is not installed on this machine.\n"
@@ -3208,7 +3380,7 @@ msgstr ""
 "¤ªË¾¤ß¤Î¥»¥Ã¥·¥ç¥ó¥¿¥¤¥×%s¤Ï¤³¤Î¥·¥¹¥Æ¥à¤Ë¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n"
 "º£¸å%s¤ò¥Ç¥Õ¥©¥ë¥È¥»¥Ã¥·¥ç¥ó¤Ë¤·¤Þ¤¹¤«?"
 
-#: gui/gdmlogin.c:959 gui/gdmlogin.c:1047
+#: gui/gdmlogin.c:961 gui/gdmlogin.c:1049
 #, c-format
 msgid ""
 "You have chosen %s for this session, but your default setting is %s.\n"
@@ -3222,7 +3394,7 @@ msgstr ""
 #. * and the relevant thing is the saved session
 #. * in .Xclients
 #.
-#: gui/gdmlogin.c:975
+#: gui/gdmlogin.c:977
 #, c-format
 msgid ""
 "You have chosen %s for this session.\n"
@@ -3235,27 +3407,26 @@ msgstr ""
 "'switchdesk'¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤òµ¯Æ°¤·¤Æ¤¯¤À¤µ¤¤\n"
 "(¥Ñ¥Í¥ë¥á¥Ë¥å¡¼¤«¤é[¥·¥¹¥Æ¥à]->[¥Ç¥¹¥¯¥È¥Ã¥×ÀÚÂؤ¨¥Ä¡¼¥ë])¡£"
 
-
-#: gui/gdmlogin.c:1269
+#: gui/gdmlogin.c:1272
 #, c-format
 msgid "%s session selected"
 msgstr "%s¥»¥Ã¥·¥ç¥ó¤¬ÁªÂò¤µ¤ì¤Þ¤·¤¿"
 
-#: gui/gdmlogin.c:1302
+#: gui/gdmlogin.c:1305
 msgid "Log in using the session that you have used last time you logged in"
 msgstr "ºÇ¸å¤Ë¥í¥°¥¤¥ó¤·¤¿ºÝ¤Î¥»¥Ã¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ¥í¥°¥¤¥ó"
 
-#: gui/gdmlogin.c:1315
+#: gui/gdmlogin.c:1318
 msgid "gdm_login_session_init: Session script directory not found!"
 msgstr ""
 "gdm_login_session_init: ¥»¥Ã¥·¥ç¥ó¥¹¥¯¥ê¥×¥È¤Î¥Ç¥£¥ì¥¯¥È¥ê¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó!"
 
-#: gui/gdmlogin.c:1400
+#: gui/gdmlogin.c:1403
 msgid ""
 "This session will log you directly into GNOME, into your current session."
 msgstr "¤³¤Î¥»¥Ã¥·¥ç¥ó¤Ï¸½ºß¤Î¥»¥Ã¥·¥ç¥ó¤È¤·¤ÆľÀÜGNOME¤Ë¥í¥°¥¤¥ó¤·¤Þ¤¹"
 
-#: gui/gdmlogin.c:1415
+#: gui/gdmlogin.c:1418
 msgid ""
 "This session will log you into GNOME and it will let you choose which one of "
 "the GNOME sessions you want to use."
@@ -3263,11 +3434,11 @@ msgstr ""
 "¤³¤Î¥»¥Ã¥·¥ç¥ó¤ÏGNOME¤Ë¥í¥°¥¤¥ó¤·¡¢»ÈÍѤ·¤¿¤¤GNOME¥»¥Ã¥·¥ç¥ó¤«¤éÁªÂò¤¹¤ë¤³¤È"
 "¤¬¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹"
 
-#: gui/gdmlogin.c:1450
+#: gui/gdmlogin.c:1453
 msgid "Yaikes, nothing found in the session directory."
 msgstr "¥»¥Ã¥·¥ç¥ó¥Ç¥£¥ì¥¯¥È¥ê¤Ë²¿¤â¤ß¤Ä¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿"
 
-#: gui/gdmlogin.c:1462
+#: gui/gdmlogin.c:1465
 msgid ""
 "This is a failsafe session that will log you into GNOME.  No startup scripts "
 "will be read and it is only to be used when you can't log in otherwise.  "
@@ -3277,7 +3448,7 @@ msgstr ""
 "¤Þ¤ì¤º¡¢Â¾¤ÎÊýË¡¤Ç¤Ï¥í¥°¥¤¥ó¤Ç¤­¤Ê¤¤¾ì¹ç¤Ë¤À¤±»ÈÍѤ·¤Þ¤¹¡£GNOME¤Ï'ɸ½à'¥»¥Ã"
 "¥·¥ç¥ó¤ò»ÈÍѤ·¤Þ¤¹"
 
-#: gui/gdmlogin.c:1487
+#: gui/gdmlogin.c:1490
 msgid ""
 "This is a failsafe session that will log you into a terminal.  No startup "
 "scripts will be read and it is only to be used when you can't log in "
@@ -3287,124 +3458,123 @@ msgstr ""
 "¤Þ¤ì¤º¡¢Â¾¤ÎÊýË¡¤Ç¤Ï¥í¥°¥¤¥ó¤Ç¤­¤Ê¤¤¾ì¹ç¤Ë¤À¤±»ÈÍѤ·¤Þ¤¹¡£Ã¼Ëö¤ò½ªÎ»¤¹¤ë¤Ë"
 "¤Ï'exit'¤òÆþÎϤ·¤Þ¤¹"
 
-#: gui/gdmlogin.c:1508
+#: gui/gdmlogin.c:1511
 msgid "No default session link found. Using Failsafe GNOME.\n"
 msgstr "ɸ½à¥»¥Ã¥·¥ç¥ó¤Î¥ê¥ó¥¯¤Ê¤·. ¥Õ¥§¡¼¥ë¥»¡¼¥ÕGNOME¤ò»ÈÍÑ\n"
 
-#: gui/gdmlogin.c:1548
+#: gui/gdmlogin.c:1551
 #, c-format
 msgid "%s language selected"
 msgstr "¸À¸ì %s ¤òÁªÂò"
 
-#: gui/gdmlogin.c:1586
+#: gui/gdmlogin.c:1589
 msgid "Log in using the language that you have used last time you logged in"
 msgstr "ºÇ¸å¤Ë¥í¥°¥¤¥ó¤·¤¿¤È¤­¤ÈƱ¤¸¸À¸ì¤ò»È¤Ã¤Æ¥í¥°¥¤¥ó"
 
-#: gui/gdmlogin.c:1607
+#: gui/gdmlogin.c:1610
 msgid "Other"
 msgstr "¤½¤Î¾"
 
-#: gui/gdmlogin.c:1727 gui/gdmlogin.c:1736
+#: gui/gdmlogin.c:1730 gui/gdmlogin.c:1739
 msgid "Select GNOME session"
 msgstr "GNOME¥»¥Ã¥·¥ç¥ó¤òÁªÂò"
 
-#: gui/gdmlogin.c:1803
+#: gui/gdmlogin.c:1806
 msgid "Create new session"
 msgstr "¿·µ¬¥»¥Ã¥·¥ç¥ó¤òºîÀ®"
 
 #. Translators: this is to remember the chosen gnome session
 #. * for next time
-#: gui/gdmlogin.c:1833
+#: gui/gdmlogin.c:1836
 msgid "Remember this setting"
 msgstr "¤³¤ÎÀßÄê¤òµ­²±"
 
 #. translators:  This is a nice and evil eggie text, translate
 #. * to your favourite currency
-#: gui/gdmlogin.c:2127
+#: gui/gdmlogin.c:2166
 msgid "Please insert 25 cents to log in."
 msgstr "¥í¥°¥¤¥ó¤¹¤ë¤Ë¤Ï110±ßÆþ¤ì¤Æ²¼¤µ¤¤"
 
-#: gui/gdmlogin.c:2454
+#: gui/gdmlogin.c:2520
 msgid "GNOME Desktop Manager"
 msgstr "GNOME ¥Ç¥¹¥¯¥È¥Ã¥×¥Þ¥Í¡¼¥¸¥ã"
 
-#: gui/gdmlogin.c:2462
+#: gui/gdmlogin.c:2528
 #, c-format
 msgid "Can't open icon file: %s. Suspending iconify feature!"
 msgstr "¥¢¥¤¥³¥ó¥Õ¥¡¥¤¥ë¤¬³«¤±¤Þ¤»¤ó: %s ¥¢¥¤¥³¥ó²½µ¡Ç½¤Ï¸«¹ç¤ï¤»¤Þ¤¹!"
 
-#: gui/gdmlogin.c:2484
+#: gui/gdmlogin.c:2550
 msgid "Iconify the login window"
 msgstr "¥í¥°¥¤¥ó¥¦¥£¥ó¥É¥¦¤ò¥¢¥¤¥³¥ó²½"
 
-#: gui/gdmlogin.c:2543
+#: gui/gdmlogin.c:2610
+msgid "%a %b %d, %H:%M"
+msgstr "%a %b %d, %H:%M"
+
+#: gui/gdmlogin.c:2617
 msgid "%a %b %d, %I:%M %p"
 msgstr "%a %b %d, %I:%M %p"
 
-#: gui/gdmlogin.c:2601
+#: gui/gdmlogin.c:2676
 msgid "Finger"
 msgstr "finger"
 
-#: gui/gdmlogin.c:2671
+#: gui/gdmlogin.c:2746
 msgid "GDM Login"
 msgstr "GDM¥í¥°¥¤¥ó"
 
-#: gui/gdmlogin.c:2717
+#: gui/gdmlogin.c:2792
 msgid "Session"
 msgstr "¥»¥Ã¥·¥ç¥ó"
 
-#: gui/gdmlogin.c:2728
+#: gui/gdmlogin.c:2803
 msgid "Language"
 msgstr "¸À¸ì"
 
-#: gui/gdmlogin.c:2742
+#: gui/gdmlogin.c:2817
 msgid "Configure..."
 msgstr "ÀßÄê..."
 
-#: gui/gdmlogin.c:2749
+#: gui/gdmlogin.c:2824
 msgid ""
 "Configure GDM (this login manager). This will require the root password."
 msgstr "GDM(¥í¥°¥¤¥ó¥Þ¥Í¡¼¥¸¥ã)¤òÀßÄê¡£root¥Ñ¥¹¥ï¡¼¥É¤¬É¬ÍפǤ¹"
 
-#: gui/gdmlogin.c:2756
+#: gui/gdmlogin.c:2831
 msgid "Reboot..."
 msgstr "ºÆµ¯Æ°..."
 
-#: gui/gdmlogin.c:2763
+#: gui/gdmlogin.c:2838
 msgid "Reboot your computer"
 msgstr "¥·¥¹¥Æ¥à¤òºÆµ¯Æ°"
 
-#: gui/gdmlogin.c:2769
+#: gui/gdmlogin.c:2844
 msgid "Shut down..."
 msgstr "Ää»ß..."
 
-#: gui/gdmlogin.c:2776
+#: gui/gdmlogin.c:2851
 msgid "Shut down your computer so that you may turn it off."
 msgstr "¥·¥¹¥Æ¥à¤òÄä»ß¡¢ÅŸ»ÃÇ"
 
-#: gui/gdmlogin.c:2783
+#: gui/gdmlogin.c:2858
 msgid "Suspend..."
 msgstr "¥µ¥¹¥Ú¥ó¥É..."
 
-#: gui/gdmlogin.c:2790
+#: gui/gdmlogin.c:2865
 msgid "Suspend your computer"
 msgstr "¥·¥¹¥Æ¥à¤ò¥µ¥¹¥Ú¥ó¥É"
 
-#: gui/gdmlogin.c:2812
+#: gui/gdmlogin.c:2887
 msgid "Disconnect"
 msgstr "ÀܳÀÚÃÇ"
 
-#. I think I'll add the buttons next to this
-#: gui/gdmlogin.c:3052
-msgid "Please enter your username"
-msgstr "¥æ¡¼¥¶Ì¾¤òÆþÎϤ·¤Æ²¼¤µ¤¤"
-
-#: gui/gdmlogin.c:3296
+#: gui/gdmlogin.c:3371
 #, c-format
 msgid "Can't open DefaultImage: %s. Suspending face browser!"
 msgstr "¥Ç¥Õ¥©¥ë¥È²èÁü¤ò³«¤±¤Þ¤»¤ó: %s ¥Õ¥§¥¤¥¹¥Ö¥é¥¦¥¶¤Ï¸«¹ç¤ï¤»¤Þ¤¹!"
 
-#: gui/gdmlogin.c:3554 gui/gdmlogin.c:3581
+#: gui/gdmlogin.c:3634 gui/gdmlogin.c:3662
 #, c-format
 msgid ""
 "The greeter version (%s) does not match the daemon version.\n"
@@ -3415,42 +3585,42 @@ msgstr ""
 "¤ª¤½¤é¤¯gdm¤ò¹¹¿·¤·¤¿¤Ð¤«¤ê¤Ê¤¿¤á¤Ç¤¹¡£\n"
 "gdm¤«¥·¥¹¥Æ¥à¤òºÆµ¯Æ°¤·¤Æ²¼¤µ¤¤"
 
-#: gui/gdmlogin.c:3588 gui/gdmlogin.c:3623
+#: gui/gdmlogin.c:3669 gui/gdmlogin.c:3707
 msgid "Reboot"
 msgstr "ºÆµ¯Æ°"
 
-#: gui/gdmlogin.c:3615
+#: gui/gdmlogin.c:3699
 #, c-format
 msgid ""
 "The greeter version (%s) does not match the daemon version (%s).\n"
 "You have probably just upgraded gdm.\n"
 "Please restart the gdm daemon or reboot the computer."
 msgstr ""
-"Greeter¥Ð¡¼¥¸¥ç¥ó(%s)¤¬¥Ç¡¼¥â¥ó¤Î¥Ð¡¼¥¸¥ç¥ó¤È°ìÃפ·¤Þ¤»¤ó¡£\n"
+"Greeter¥Ð¡¼¥¸¥ç¥ó(%s)¤¬¥Ç¡¼¥â¥ó¤Î¥Ð¡¼¥¸¥ç¥ó(%s)¤È°ìÃפ·¤Þ¤»¤ó¡£\n"
 "¤ª¤½¤é¤¯gdm¤ò¹¹¿·¤·¤¿¤Ð¤«¤ê¤Ê¤¿¤á¤Ç¤¹¡£\n"
 "gdm¤«¥·¥¹¥Æ¥à¤òºÆµ¯Æ°¤·¤Æ²¼¤µ¤¤"
 
-#: gui/gdmlogin.c:3622
+#: gui/gdmlogin.c:3706
 msgid "Restart"
 msgstr "ºÆ³«»Ï"
 
-#: gui/gdmlogin.c:3660
+#: gui/gdmlogin.c:3744
 msgid "main: Error setting up HUP signal handler"
 msgstr "main: HUP¥·¥°¥Ê¥ë¥Ï¥ó¥É¥é¤òÀßÄê¤Ç¤­¤Þ¤»¤ó"
 
-#: gui/gdmlogin.c:3663
+#: gui/gdmlogin.c:3747
 msgid "main: Error setting up INT signal handler"
 msgstr "main: INT¥·¥°¥Ê¥ë¥Ï¥ó¥É¥é¤òÀßÄê¤Ç¤­¤Þ¤»¤ó"
 
-#: gui/gdmlogin.c:3666
+#: gui/gdmlogin.c:3750
 msgid "main: Error setting up TERM signal handler"
 msgstr "main: TERM¥·¥°¥Ê¥ë¥Ï¥ó¥É¥é¤òÀßÄê¤Ç¤­¤Þ¤»¤ó"
 
-#: gui/gdmlogin.c:3674
+#: gui/gdmlogin.c:3758
 msgid "main: Error setting up CHLD signal handler"
 msgstr "main: CHLD ¥·¥°¥Ê¥ë¥Ï¥ó¥É¥é¤òÀßÄê¤Ç¤­¤Þ¤»¤ó"
 
-#: gui/gdmlogin.c:3739
+#: gui/gdmlogin.c:3823
 msgid ""
 "Your session directory is missing or empty!\n"
 "\n"
@@ -3462,7 +3632,7 @@ msgstr ""
 "Æó¤ÄÍøÍѲÄǽ¤Ê¥»¥Ã¥·¥ç¥ó¤¬¤¢¤ê¤Þ¤¹¤¬¡¢¥í¥°¥¤¥ó¤·¤Æ\n"
 "GDMÀßÄê¤ò½¤Àµ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹"
 
-#: gui/gdmlogin.c:3755
+#: gui/gdmlogin.c:3839
 msgid ""
 "The configuration file contains an invalid command\n"
 "line for the login dialog, and thus I ran the\n"
@@ -3472,7 +3642,7 @@ msgstr ""
 "¹Ô¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë¤Î¤Ç¡¢É¸½à¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤Þ¤·¤¿¡£\n"
 "ÀßÄê¤ò½¤Àµ¤·¤Æ²¼¤µ¤¤"
 
-#: gui/gdmlogin.c:3772
+#: gui/gdmlogin.c:3856
 msgid ""
 "The configuration was not found.  GDM is using\n"
 "defaults to run this session.  You should log in\n"
@@ -3547,7 +3717,43 @@ msgid ""
 "Setup the picture that will show in the GDM (login manager) face browser"
 msgstr "GDM´é¼Ì¿¿¥Ö¥é¥¦¥¶¤Çɽ¼¨¤¹¤ë´é¼Ì¿¿¤ÎÀßÄê"
 
-#: gui/gdmXnestchooser.c:114
+#: gui/gdmXnestchooser.c:98
+msgid "Xnest command line"
+msgstr "Xnest¥³¥Þ¥ó¥É¥é¥¤¥ó"
+
+#: gui/gdmXnestchooser.c:98
+msgid "STRING"
+msgstr "ʸ»ú"
+
+#: gui/gdmXnestchooser.c:99
+msgid "Extra options for Xnest"
+msgstr "Xnest¤Î¤¿¤á¤Î¤½¤Î¾¤Î¥ª¥×¥·¥ç¥ó"
+
+#: gui/gdmXnestchooser.c:99
+msgid "OPTIONS"
+msgstr "¥ª¥×¥·¥ç¥ó"
+
+#: gui/gdmXnestchooser.c:100
+msgid "Just run Xnest, no query (no chooser)"
+msgstr "¥¯¥¨¥ê¤Ê¤·¤ËXnest¤ò¼Â¹Ô¤¹¤ë (ÁªÂò¤·¤Þ¤»¤ó)"
+
+#: gui/gdmXnestchooser.c:101
+msgid "Do direct query instead of indirect (chooser)"
+msgstr "indirect¤ÎÂå¤ï¤ê¤ËľÀÜ¥¯¥¨¥ê¤¹¤ë (ÁªÂò¤µ¤ì¤Þ¤¹)"
+
+#: gui/gdmXnestchooser.c:102
+msgid "Run broadcast instead of indirect (chooser)"
+msgstr "indirect¤ÎÂå¤ï¤ê¤Ë¥Ö¥í¡¼¥É¥­¥ã¥¹¥È¤ò¼Â¹Ô¤¹¤ë (ÁªÂò¤µ¤ì¤Þ¤¹)"
+
+#: gui/gdmXnestchooser.c:103
+msgid "Run in background"
+msgstr "¥Ð¥Ã¥¯¥°¥é¥¦¥ó¥É¤Ç¼Â¹Ô¤¹¤ë"
+
+#: gui/gdmXnestchooser.c:104
+msgid "Don't check for running gdm"
+msgstr "gdm¤Îµ¯Æ°¥Á¥§¥Ã¥¯¤ò¤·¤Ê¤¤"
+
+#: gui/gdmXnestchooser.c:219
 msgid ""
 "Xnest doesn't exist.\n"
 "Please ask your system administrator\n"
@@ -3557,7 +3763,7 @@ msgstr ""
 "¥·¥¹¥Æ¥à´ÉÍý¼Ô¤ËÍê¤ó¤Ç¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ\n"
 "¤â¤é¤Ã¤Æ¤¯¤À¤µ¤¤¡£"
 
-#: gui/gdmXnestchooser.c:130
+#: gui/gdmXnestchooser.c:238
 msgid ""
 "Indirect XDMCP is not enabled,\n"
 "please ask your system administrator to enable it\n"
@@ -3567,7 +3773,7 @@ msgstr ""
 "´ÉÍý¼Ô¤ËGDMÀßÄê¥×¥í¥°¥é¥à¤ÇÍ­¸ú¤Ë¤¹¤ë¤è¤¦¤Ë\n"
 "Íê¤ó¤Ç²¼¤µ¤¤"
 
-#: gui/gdmXnestchooser.c:164
+#: gui/gdmXnestchooser.c:272
 msgid "Could not find a free display number"
 msgstr "¶õ¤¤¤Æ¤¤¤ë¥Ç¥£¥¹¥×¥ì¥¤Èֹ椬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
@@ -3609,8 +3815,8 @@ msgid ""
 "Glade file is on crack! Make sure the correct file is installed!\n"
 "file: %s widget: %s"
 msgstr ""
-"glade¥Õ¥¡¥¤¥ë¤Ï²õ¤ì¤Æ¤¤¤Þ¤¹! Àµ¤·¤¤¥Õ¥¡¥¤¥ë¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¤«"
-"³Îǧ¤·¤Æ¤¯¤À¤µ¤¤!\n"
+"glade¥Õ¥¡¥¤¥ë¤Ï²õ¤ì¤Æ¤¤¤Þ¤¹! Àµ¤·¤¤¥Õ¥¡¥¤¥ë¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¤«³Îǧ¤·¤Æ"
+"¤¯¤À¤µ¤¤!\n"
 "¥Õ¥¡¥¤¥ë: %s ¥¦¥£¥¸¥§¥Ã¥È: %s"
 
 #: vicious-extensions/glade-helper.c:217
@@ -3636,8 +3842,8 @@ msgid ""
 "Glade file is on crack! Make sure the correct file is installed!\n"
 "file: %s widget: %s expected clist columns: %d"
 msgstr ""
-"glade¥Õ¥¡¥¤¥ë¤¬²õ¤ì¤Æ¤¤¤Þ¤¹! Àµ¤·¤¤¥Õ¥¡¥¤¥ë¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¤«"
-"³Îǧ¤·¤Æ¤¯¤À¤µ¤¤!\n"
+"glade¥Õ¥¡¥¤¥ë¤¬²õ¤ì¤Æ¤¤¤Þ¤¹! Àµ¤·¤¤¥Õ¥¡¥¤¥ë¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¤«³Îǧ¤·¤Æ"
+"¤¯¤À¤µ¤¤!\n"
 "¥Õ¥¡¥¤¥ë: %s ¥¦¥£¥¸¥§¥Ã¥È: %s ¤ÇɬÍפÊclist¤ÎÎó¿ô: %d"
 
 #: vicious-extensions/glade-helper.c:251
@@ -3663,3 +3869,47 @@ msgstr "¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹¤¬Æɤ߹þ¤Þ¤ì¤Þ¤»¤ó¤Ç¤·¤¿¡£BAD! (¥Õ¥¡¥¤¥ë: %s)"
 #: vicious-extensions/icon-entry-hack.c:268
 msgid "Choose an icon"
 msgstr "¥¢¥¤¥³¥ó¤òÁªÂò"
+
+#: config/gettextfoo.h:2
+msgid ""
+"Would you like me to try to run the X configuration program?  Note that you "
+"will need the root password for this."
+msgstr ""
+"X¤ÎÀßÄê¥×¥í¥°¥é¥à¤òµ¯Æ°¤·¤Æ¤ß¤Æ¤â¤¤¤¤¤Ç¤¹¤«? ¤³¤ì¤Ë¤Ïroot¥Ñ¥¹¥ï¡¼¥É¤¬É¬ÍפȤÊ"
+"¤ê¤Þ¤¹"
+
+#: config/gettextfoo.h:3
+msgid "Please type in the root (privilaged user) password."
+msgstr "root(Æø¢¥æ¡¼¥¶)¥Ñ¥¹¥ï¡¼¥É¤òÆþÎϤ·¤Æ²¼¤µ¤¤"
+
+#: config/gettextfoo.h:4
+msgid "I will now try to restart the X server again."
+msgstr "X¥µ¡¼¥Ð¤òºÆµ¯Æ°¤·¤Æ¤ß¤Þ¤¹"
+
+#: config/gettextfoo.h:5
+msgid ""
+"I will disable this X server for now.  Restart GDM when it is configured "
+"correctly."
+msgstr "X¥µ¡¼¥Ð¤ò̵¸ú¤Ë¤·¤Þ¤¹¡£Å¬ÀÚ¤ËÀßÄꤷ¤Æ¤«¤éGDM¤òºÆµ¯Æ°¤·¤Æ²¼¤µ¤¤"
+
+#: config/gettextfoo.h:6
+msgid ""
+"I cannot start the X server (your graphical interface).  It is likely that "
+"it is not set up correctly.  Would you like to view the X server output to "
+"diagnose the problem?"
+msgstr ""
+"¤³¤Î¥°¥é¥Õ¥£¥Ã¥¯¥«¡¼¥É¤Ç¤ÏX¥µ¡¼¥Ð¤òµ¯Æ°¤Ç¤­¤Þ¤»¤ó¡£¤ª¤½¤é¤¯Å¬ÀÚ¤ÊÀßÄ꤬¤Ê¤µ¤ì"
+"¤Æ¤¤¤Þ¤»¤ó¡£¾ã³²¤òʬÀϤ¹¤ë¤¿¤á¤ËX¥µ¡¼¥Ð¤Î½ÐÎϤòɽ¼¨¤·¤Þ¤¹¤«?"
+
+#: config/gettextfoo.h:7
+msgid ""
+"I cannot start the X server (your graphical interface).  It seems that the "
+"pointer device (your mouse) is not set up correctly.  Would you like to view "
+"the X server output to diagnose the problem?"
+msgstr "X¥µ¡¼¥Ð(¥°¥é¥Õ¥£¥Ã¥¯¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹)¤òµ¯Æ°½ÐÍè¤Þ¤»¤ó¡£¥Ý¥¤¥ó¥¿¥Ç¥Ð¥¤¥¹(¥Þ¥¦¥¹)¤¬Àµ¤·¤¯ÀßÄꤵ¤ì¤Æ¤¤¤Ê¤¤¤è¤¦¤Ç¤¹¡£ÌäÂê¤Î¿ÇÃǤò¤¹¤ë¤¿¤á¤Î½ÐÎϤòX¥µ¡¼¥Ð¤Øɽ¼¨¤·¤Æ¤â¤è¤í¤·¤¤¤Ç¤¹¤«?"
+
+#: config/gettextfoo.h:8
+msgid ""
+"Would you like me to try to run the mouse configuration program?  Note that "
+"you will need the root password for this."
+msgstr "¥Þ¥¦¥¹ÀßÄê¥×¥í¥°¥é¥à¤ò¼Â¹Ô¤·¤Æ¤â¤è¤í¤·¤¤¤Ç¤¹¤«? ¤³¤Î¤¿¤á¤Ë¤Ïroot¤Î¥Ñ¥¹¥ï¡¼¥É¤¬É¬Íפˤʤ뤳¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤"