[gdm: 25/70] 2.25.3

From: Ray Strode <halfline src gnome org>
To: svn-commits-list gnome org
Subject: [gdm: 25/70] 2.25.3
Date: Tue, 31 Mar 2009 14:52:52 -0400 (EDT)
commit 737182d35409821ee89fb478d0907df6e71ba7da
Author: Chao-Hsiung Liao <chliao src gnome org>
Date:   Wed Feb 4 13:00:07 2009 +0000

    2.25.3
    
    svn path=/trunk/; revision=6681
---
 po/ChangeLog |    5 +
 po/zh_HK.po  |  428 +++++++++++++++++++++++++++++++---------------------------
 po/zh_TW.po  |  430 +++++++++++++++++++++++++++++++---------------------------
 3 files changed, 468 insertions(+), 395 deletions(-)

diff --git a/po/ChangeLog b/po/ChangeLog
index c364c74..72257ac 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-04  Chao-Hsiung Liao  <j_h_liau yahoo com tw>
+
+	* zh_HK.po: Updated Traditional Chinese translation(Hong Kong).
+	* zh_TW.po: Updated Traditional Chinese translation(Taiwan).
+
 2009-02-04  Sweta Kothari  <swkothar redhat com>
 
 	* gu.po: Committed Gujarati Translation.
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 53775fd..417f467 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -12,10 +12,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gdm2 2.23.1\n"
+"Project-Id-Version: gdm2 2.25.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-23 19:49+0800\n"
-"PO-Revision-Date: 2008-08-23 19:49+0800\n"
+"POT-Creation-Date: 2009-02-04 20:58+0800\n"
+"PO-Revision-Date: 2009-02-04 20:59+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
 "MIME-Version: 1.0\n"
@@ -54,15 +54,15 @@ msgstr "GNOME å¾?å±¬é¡¯ç¤ºç®¡ç??ç¨?å¼?"
 msgid "could not find user \"%s\" on system"
 msgstr "å?¨ç³»çµ±ä¸æ?¾ä¸?å?°ä½¿ç?¨è??ã??%sã??"
 
-#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:207
+#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:217
 msgid "Unable to initialize login system"
 msgstr "ç?¡æ³?å??å§?å??ç?»å?¥ç³»çµ±"
 
-#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:240
+#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:253
 msgid "Unable to authenticate user"
 msgstr "ç?¡æ³?é©?è?ä½¿ç?¨è??"
 
-#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:286
+#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:307
 msgid "Unable to authorize user"
 msgstr "ç?¡æ³?é©?è?ä½¿ç?¨è??"
 
@@ -71,7 +71,7 @@ msgid "Unable to establish credentials"
 msgstr "ç?¡æ³?å»ºç«?è?æ?¸"
 
 #: ../daemon/gdm-factory-slave.c:662 ../daemon/gdm-product-slave.c:449
-#: ../daemon/gdm-simple-slave.c:1048
+#: ../daemon/gdm-simple-slave.c:1097
 msgid ""
 "Could not start the X server (your graphical environment) due to some "
 "internal error. Please contact your system administrator or check your "
@@ -79,52 +79,52 @@ msgid ""
 "restart GDM when the problem is corrected."
 msgstr "å? ç?ºæ??äº?å?§é?¨é?¯èª¤ï¼?ç?®å??ç?¡æ³?å??å??X ä¼ºæ??å?¨ï¼?å?³å??å½¢ä»?é?¢ï¼?ã??è«?è?¯çµ¡ç³»çµ±ç®¡ç??å?¡æ??æ?¯æª¢æ?¥ç³»çµ±ç´?é??æª?ã??ç?®å??æ??å??æ¢ä½¿ç?¨é??å??é¡¯ç¤ºç?«é?¢ã??è«?å?¨ä¿®æ£å??é¡?å¾?é??æ?°å??å?? GDMã??"
 
-#: ../daemon/gdm-server.c:244
+#: ../daemon/gdm-server.c:246
 #, c-format
 msgid "%s: failed to connect to parent display '%s'"
 msgstr "%sï¼?ç?¡æ³?é?£æ?¥ä¸»é¡¯ç¤ºç?«é?¢â??%sâ??"
 
-#: ../daemon/gdm-server.c:362
+#: ../daemon/gdm-server.c:361
 #, c-format
 msgid "Server was to be spawned by user %s but that user doesn't exist"
 msgstr "ä¼ºæ??å?¨æ??ä»¥ä½¿ç?¨è?? %s ç??èº«å??è¡?ç??ï¼?ä½?è©²ä½¿ç?¨è??ä¸?å?å?¨"
 
-#: ../daemon/gdm-server.c:373 ../daemon/gdm-welcome-session.c:415
+#: ../daemon/gdm-server.c:372 ../daemon/gdm-welcome-session.c:444
 #, c-format
 msgid "Couldn't set groupid to %d"
 msgstr "ç?¡æ³?è¨å®? groupid ç?º %d"
 
-#: ../daemon/gdm-server.c:379 ../daemon/gdm-welcome-session.c:421
+#: ../daemon/gdm-server.c:378 ../daemon/gdm-welcome-session.c:450
 #, c-format
 msgid "initgroups () failed for %s"
 msgstr "%s ç?? initgroups () å¤±æ??ã??"
 
-#: ../daemon/gdm-server.c:385 ../daemon/gdm-welcome-session.c:427
+#: ../daemon/gdm-server.c:384 ../daemon/gdm-welcome-session.c:456
 #, c-format
 msgid "Couldn't set userid to %d"
 msgstr "ç?¡æ³?è¨å®? userid ç?º %d"
 
-#: ../daemon/gdm-server.c:393 ../daemon/gdm-welcome-session.c:435
+#: ../daemon/gdm-server.c:392 ../daemon/gdm-welcome-session.c:464
 msgid "Couldn't set groupid to 0"
 msgstr "ç?¡æ³?è¨å®? groupid ç?º 0"
 
-#: ../daemon/gdm-server.c:428
+#: ../daemon/gdm-server.c:431
 #, c-format
 msgid "%s: Could not open logfile for display %s!"
 msgstr "%sï¼?ç?¡æ³?é??å??é¡¯ç¤ºç?«é?¢ %s ç??ç´?é??æª?ï¼?"
 
-#: ../daemon/gdm-server.c:439 ../daemon/gdm-server.c:445
-#: ../daemon/gdm-server.c:451
+#: ../daemon/gdm-server.c:442 ../daemon/gdm-server.c:448
+#: ../daemon/gdm-server.c:454
 #, c-format
 msgid "%s: Error setting %s to %s"
 msgstr "%sï¼?å°? %s è¨å®?ç?º %s æ??ç?¼ç??é?¯èª¤"
 
-#: ../daemon/gdm-server.c:466
+#: ../daemon/gdm-server.c:469
 #, c-format
 msgid "%s: Server priority couldn't be set to %d: %s"
 msgstr "%sï¼?ä¼ºæ??å?¨å?ªå??ç?ç´?ç?¡æ³?è¨å®?ç?º %dï¼?%s"
 
-#: ../daemon/gdm-server.c:618
+#: ../daemon/gdm-server.c:621
 #, c-format
 msgid "%s: Empty server command for display %s"
 msgstr "%sï¼?é¡¯ç¤ºç?«é?¢ %s ç??ä¼ºæ??å?¨æ??ä»¤æ?¯ç©ºç?½ç??"
@@ -181,7 +181,7 @@ msgstr "ä¸?æ??ç??é?¯èª¤"
 
 #: ../daemon/gdm-session-worker.c:1090
 msgid "Username:"
-msgstr "ä½¿ç?¨è??å??ç¨±ï¼?"
+msgstr "ä½¿ç?¨è??å??ç¨±:"
 
 #: ../daemon/gdm-session-worker.c:1096
 #, c-format
@@ -217,16 +217,16 @@ msgstr "æ²?æ??å?¯ç?¨ç??ä½¿ç?¨è??å¸³è??"
 msgid "Unable to change to user"
 msgstr "ç?¡æ³?æ?¹è®?ç?ºä½¿ç?¨è??"
 
-#: ../daemon/gdm-simple-slave.c:387
+#: ../daemon/gdm-simple-slave.c:426
 msgid "Unable establish credentials"
 msgstr "ç?¡æ³?å»ºç«?è?æ?¸"
 
-#: ../daemon/gdm-welcome-session.c:397
+#: ../daemon/gdm-welcome-session.c:426
 #, c-format
 msgid "User %s doesn't exist"
 msgstr "ä½¿ç?¨è?? %s ä¸?å?å?¨"
 
-#: ../daemon/gdm-welcome-session.c:404
+#: ../daemon/gdm-welcome-session.c:433
 #, c-format
 msgid "Group %s doesn't exist"
 msgstr "ç¾£çµ? %s ä¸?å?å?¨"
@@ -274,97 +274,97 @@ msgstr "%sï¼?ç?¡æ³?å¾?å°?å??ä¸è®?å?? authlist"
 msgid "%s: Error in checksum"
 msgstr "%sï¼?æª¢æ?¥ç¢¼å?ºç?¾é?¯èª¤"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2120
+#: ../daemon/gdm-xdmcp-display-factory.c:2127
 #, c-format
 msgid "%s: Got REQUEST from banned host %s"
 msgstr "%sï¼?å·²è¢«æ??çµ?ç??ä¸»æ©? %s ç?¼å?ºè¦?æ±?"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2130
-#: ../daemon/gdm-xdmcp-display-factory.c:2485
-#: ../daemon/gdm-xdmcp-display-factory.c:2737
+#: ../daemon/gdm-xdmcp-display-factory.c:2137
+#: ../daemon/gdm-xdmcp-display-factory.c:2492
+#: ../daemon/gdm-xdmcp-display-factory.c:2744
 #, c-format
 msgid "%s: Could not read Display Number"
 msgstr "%sï¼?ç?¡æ³?è®?å??é¡¯ç¤ºç?«é?¢ç·¨è??"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2137
+#: ../daemon/gdm-xdmcp-display-factory.c:2144
 #, c-format
 msgid "%s: Could not read Connection Type"
 msgstr "%sï¼?ç?¡æ³?è®?å??é?£ç·?æ?¹å¼?"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2144
+#: ../daemon/gdm-xdmcp-display-factory.c:2151
 #, c-format
 msgid "%s: Could not read Client Address"
 msgstr "%sï¼?ç?¡æ³?è®?å??å®¢æ?¶ç«¯ä½?å??"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2152
+#: ../daemon/gdm-xdmcp-display-factory.c:2159
 #, c-format
 msgid "%s: Could not read Authentication Names"
 msgstr "%sï¼?ç?¡æ³?è®?å??èª?è?å??ç¨±"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2161
+#: ../daemon/gdm-xdmcp-display-factory.c:2168
 #, c-format
 msgid "%s: Could not read Authentication Data"
 msgstr "%sï¼?ç?¡æ³?è®?å??èª?è?è³?æ??"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2171
+#: ../daemon/gdm-xdmcp-display-factory.c:2178
 #, c-format
 msgid "%s: Could not read Authorization List"
 msgstr "%sï¼?ç?¡æ³?è®?å??æ??æ¬?æ¸?å?®"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2190
+#: ../daemon/gdm-xdmcp-display-factory.c:2197
 #, c-format
 msgid "%s: Could not read Manufacturer ID"
 msgstr "%sï¼?ç?¡æ³?è®?å??å» å??è?å?¥ç¢¼"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2217
+#: ../daemon/gdm-xdmcp-display-factory.c:2224
 #, c-format
 msgid "%s: Failed checksum from %s"
 msgstr "%sï¼?å¾? %s å¾?å?°é?¯èª¤ç??æª¢æ?¥ç¢¼"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2469
+#: ../daemon/gdm-xdmcp-display-factory.c:2476
 #, c-format
 msgid "%s: Got Manage from banned host %s"
 msgstr "%sï¼?å·²è¢«æ??çµ?ç??ä¸»æ©? %s ç?¼å?ºç®¡ç??è¨?æ?¯"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2478
-#: ../daemon/gdm-xdmcp-display-factory.c:2744
+#: ../daemon/gdm-xdmcp-display-factory.c:2485
+#: ../daemon/gdm-xdmcp-display-factory.c:2751
 #, c-format
 msgid "%s: Could not read Session ID"
 msgstr "%sï¼?ç?¡æ³?è®?å??ä½?æ¥é??æ®µè?å?¥ç¢¼"
 
 # FIXME: What is display class?
-#: ../daemon/gdm-xdmcp-display-factory.c:2492
+#: ../daemon/gdm-xdmcp-display-factory.c:2499
 #, c-format
 msgid "%s: Could not read Display Class"
 msgstr "%sï¼?ç?¡æ³?è®?å??é¡¯ç¤ºç?«é?¢ç??é¡?å?¥"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2597
-#: ../daemon/gdm-xdmcp-display-factory.c:2647
-#: ../daemon/gdm-xdmcp-display-factory.c:2653
+#: ../daemon/gdm-xdmcp-display-factory.c:2604
+#: ../daemon/gdm-xdmcp-display-factory.c:2654
+#: ../daemon/gdm-xdmcp-display-factory.c:2660
 #, c-format
 msgid "%s: Could not read address"
 msgstr "%sï¼?ç?¡æ³?è®?å??ä½?å??"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2727
+#: ../daemon/gdm-xdmcp-display-factory.c:2734
 #, c-format
 msgid "%s: Got KEEPALIVE from banned host %s"
 msgstr "%sï¼?å·²è¢«æ??çµ?ç??ä¸»æ©? %s ç?¼å?º KEEPALIVE è¨?æ?¯"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2816
+#: ../daemon/gdm-xdmcp-display-factory.c:2823
 msgid "GdmXdmcpDisplayFactory: Could not read XDMCP header!"
 msgstr "GdmXdmcpDisplayFactoryï¼?ç?¡æ³?è®?å?? XDMCP æ¨?é ï¼?"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2822
+#: ../daemon/gdm-xdmcp-display-factory.c:2829
 #: ../gui/simple-chooser/gdm-host-chooser-widget.c:226
 msgid "XMDCP: Incorrect XDMCP version!"
 msgstr "XMDCPï¼?XDMCP ç??æ?¬ä¸?æ£ç¢ºï¼?"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2828
+#: ../daemon/gdm-xdmcp-display-factory.c:2835
 #: ../gui/simple-chooser/gdm-host-chooser-widget.c:232
 msgid "XMDCP: Unable to parse address"
 msgstr "XMDCPï¼?ç?¡æ³?è§£æ??ä½?å??"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:3226
+#: ../daemon/gdm-xdmcp-display-factory.c:3233
 #, c-format
 msgid "Could not get server hostname: %s!"
 msgstr "ç?¡æ³?å??å¾?ä¼ºæ??å?¨ä¸»æ©?å??ç¨±ï¼?%sï¼?"
@@ -447,7 +447,7 @@ msgid "AT SPI Registry Wrapper"
 msgstr "AT SPI è¨»å??è¡¨è½?æ??å?¨"
 
 #: ../data/greeter-autostart/gdm-simple-greeter.desktop.in.in.h:1
-#: ../gui/simple-greeter/gdm-greeter-login-window.c:1962
+#: ../gui/simple-greeter/gdm-greeter-login-window.c:1921
 msgid "Login Window"
 msgstr "ç?»å?¥ç?«é?¢"
 
@@ -479,6 +479,10 @@ msgstr "GNOME è?¢å¹?é?µç?¤"
 msgid "Use an onscreen keyboard"
 msgstr "ä½¿ç?¨è?¢å¹?é?µç?¤"
 
+#: ../data/greeter-autostart/metacity.desktop.in.h:1
+msgid "Metacity"
+msgstr "Metacity"
+
 #: ../data/greeter-autostart/orca-screen-reader.desktop.in.h:1
 msgid "Orca Screen Reader"
 msgstr "Orca è?¢å¹?é?±è®?å?¨"
@@ -507,19 +511,19 @@ msgstr "æ?¸å?¼"
 msgid "percentage of time complete"
 msgstr "å®?æ??æ??é??ç?¾å??æ¯?"
 
-#: ../gui/simple-greeter/gdm-chooser-widget.c:1211
+#: ../gui/simple-greeter/gdm-chooser-widget.c:1306
 msgid "Inactive Text"
 msgstr "æ?ªä½¿ç?¨ç??æ??å?"
 
-#: ../gui/simple-greeter/gdm-chooser-widget.c:1212
+#: ../gui/simple-greeter/gdm-chooser-widget.c:1307
 msgid "The text to use in the label if the user hasn't picked an item yet"
 msgstr "è?¥ä½¿ç?¨è??å°?æ?ªæ??é?¸ä»»ä½?é ?ç?®ï¼?è¦?å?¨æ¨?ç±¤ä¸ä½¿ç?¨ç??æ??å?"
 
-#: ../gui/simple-greeter/gdm-chooser-widget.c:1220
+#: ../gui/simple-greeter/gdm-chooser-widget.c:1315
 msgid "Active Text"
 msgstr "ä½¿ç?¨ä¸ç??æ??å?"
 
-#: ../gui/simple-greeter/gdm-chooser-widget.c:1221
+#: ../gui/simple-greeter/gdm-chooser-widget.c:1316
 msgid "The text to use in the label if the user has picked an item"
 msgstr "è?¥ä½¿ç?¨è??å·²æ??é?¸æ??å??é ?ç?®ï¼?è¦?å?¨æ¨?ç±¤ä¸ä½¿ç?¨ç??æ??å?"
 
@@ -549,39 +553,35 @@ msgstr "%a %b %e"
 msgid "%1$s, %2$s"
 msgstr "%1$s, %2$s"
 
-#: ../gui/simple-greeter/gdm-greeter-login-window.c:181
-msgid "You have the Caps Lock key on."
-msgstr "ä½ å·²æ??ä¸?äº? Caps Lockã??"
-
-#: ../gui/simple-greeter/gdm-greeter-login-window.c:326
+#: ../gui/simple-greeter/gdm-greeter-login-window.c:288
 msgid "Automatically logging in..."
 msgstr "æ£å?¨è?ªå??ç?»å?¥..."
 
 #. need to wait for response from backend
-#: ../gui/simple-greeter/gdm-greeter-login-window.c:760
+#: ../gui/simple-greeter/gdm-greeter-login-window.c:718
 msgid "Cancelling..."
 msgstr "æ£å?¨å??æ¶?..."
 
-#: ../gui/simple-greeter/gdm-greeter-login-window.c:1229
+#: ../gui/simple-greeter/gdm-greeter-login-window.c:1187
 msgid "Failed to restart computer"
 msgstr "é??æ?°å??å??é?»è?¦å¤±æ??"
 
-#: ../gui/simple-greeter/gdm-greeter-login-window.c:1232
+#: ../gui/simple-greeter/gdm-greeter-login-window.c:1190
 msgid ""
 "You are not allowed to restart the computer because multiple users are "
 "logged in"
 msgstr "ä½ ç?¾å?¨ä¸?è?½é??æ?°å??å??é?»è?¦ï¼?å? ç?ºæ??å¤?å??ä½¿ç?¨è??ç?»å?¥"
 
-#: ../gui/simple-greeter/gdm-greeter-login-window.c:1313
+#: ../gui/simple-greeter/gdm-greeter-login-window.c:1271
 msgid "Failed to stop computer"
 msgstr "å??æ¢é?»è?¦å¤±æ??"
 
-#: ../gui/simple-greeter/gdm-greeter-login-window.c:1316
+#: ../gui/simple-greeter/gdm-greeter-login-window.c:1274
 msgid ""
 "You are not allowed to stop the computer because multiple users are logged in"
 msgstr "ä½ ç?¾å?¨ä¸?è?½å??æ¢é?»è?¦ï¼?å? ç?ºæ??å¤?å??ä½¿ç?¨è??ç?»å?¥"
 
-#: ../gui/simple-greeter/gdm-greeter-login-window.c:1400
+#: ../gui/simple-greeter/gdm-greeter-login-window.c:1358
 msgid "Select language and click Log In"
 msgstr "é?¸æ??èª?è¨?ä¸¦æ??ä¸?ã??ç?»å?¥ã??"
 
@@ -617,11 +617,11 @@ msgstr "ç??æ?¬"
 msgid "page 5"
 msgstr "ç¬¬ 5 é ?"
 
-#: ../gui/simple-greeter/gdm-greeter-panel.c:540
+#: ../gui/simple-greeter/gdm-greeter-panel.c:590
 msgid "Panel"
 msgstr "é?¢æ?¿"
 
-#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:222
+#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:201
 msgid "Languages"
 msgstr "èª?è¨?"
 
@@ -630,68 +630,67 @@ msgid "_Languages:"
 msgstr "èª?è¨?(_L):"
 
 #: ../gui/simple-greeter/gdm-language-chooser-widget.c:273
-#: ../gui/simple-greeter/gdm-language-option-widget.c:235
+#: ../gui/simple-greeter/gdm-language-option-widget.c:259
 msgid "_Language:"
 msgstr "èª?è¨?(_L):"
 
-#: ../gui/simple-greeter/gdm-language-option-widget.c:206
-#: ../gui/simple-greeter/gdm-layout-option-widget.c:199
-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:89
-#: ../gui/user-switch-applet/applet.c:996
+#: ../gui/simple-greeter/gdm-language-option-widget.c:228
+#: ../gui/simple-greeter/gdm-layout-option-widget.c:220
+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:131
 msgid "Other..."
 msgstr "å?¶å®?..."
 
-#: ../gui/simple-greeter/gdm-language-option-widget.c:207
+#: ../gui/simple-greeter/gdm-language-option-widget.c:229
 msgid "Choose a language from the full list of available languages."
 msgstr "å¾?å®?æ?´ç??å?¯ç?¨èª?è¨?æ¸?å?®ä¸é?¸æ??èª?è¨?ã??"
 
-#: ../gui/simple-greeter/gdm-languages.c:587
+#: ../gui/simple-greeter/gdm-languages.c:610
 msgid "Unspecified"
 msgstr "æ?ªæ??å®?"
 
-#: ../gui/simple-greeter/gdm-layout-chooser-dialog.c:211
+#: ../gui/simple-greeter/gdm-layout-chooser-dialog.c:191
 msgid "Keyboard layouts"
 msgstr "é?µç?¤é??ç½®"
 
 #: ../gui/simple-greeter/gdm-layout-chooser-widget.c:200
 #: ../gui/simple-greeter/gdm-layout-chooser-widget.c:201
-#: ../gui/simple-greeter/gdm-layout-option-widget.c:228
+#: ../gui/simple-greeter/gdm-layout-option-widget.c:251
 msgid "_Keyboard:"
 msgstr "é?µç?¤(_K):"
 
-#: ../gui/simple-greeter/gdm-layout-option-widget.c:200
+#: ../gui/simple-greeter/gdm-layout-option-widget.c:221
 msgid "Choose a keyboard layout from the full list of available layouts."
 msgstr "å¾?å®?æ?´ç??å?¯ç?¨é?µç?¤é??ç½®æ¸?å?®ä¸é?¸æ??é?µç?¤é??ç½®ã??"
 
-#: ../gui/simple-greeter/gdm-option-widget.c:493
+#: ../gui/simple-greeter/gdm-option-widget.c:494
 msgid "Label Text"
 msgstr "æ¨?ç±¤æ??å?"
 
-#: ../gui/simple-greeter/gdm-option-widget.c:494
+#: ../gui/simple-greeter/gdm-option-widget.c:495
 msgid "The text to use as a label"
 msgstr "è¦?ç?¨å??æ¨?ç±¤ç??æ??å?"
 
-#: ../gui/simple-greeter/gdm-option-widget.c:501
+#: ../gui/simple-greeter/gdm-option-widget.c:502
 msgid "Icon name"
 msgstr "å??ç¤ºå??ç¨±"
 
-#: ../gui/simple-greeter/gdm-option-widget.c:502
+#: ../gui/simple-greeter/gdm-option-widget.c:503
 msgid "The icon to use with the label"
 msgstr "è¦?è??æ¨?ç±¤ä¸?èµ·ä½¿ç?¨ç??å??ç¤º"
 
-#: ../gui/simple-greeter/gdm-option-widget.c:510
+#: ../gui/simple-greeter/gdm-option-widget.c:511
 msgid "Default Item"
 msgstr "é ?è¨ç??é ?ç?®"
 
-#: ../gui/simple-greeter/gdm-option-widget.c:511
+#: ../gui/simple-greeter/gdm-option-widget.c:512
 msgid "The id of the default item"
 msgstr "é ?è¨é ?ç?®ç?? id"
 
-#: ../gui/simple-greeter/gdm-recent-option-widget.c:298
+#: ../gui/simple-greeter/gdm-recent-option-widget.c:310
 msgid "Max Item Count"
 msgstr "æ??å¤§é ?ç?®æ?¸"
 
-#: ../gui/simple-greeter/gdm-recent-option-widget.c:299
+#: ../gui/simple-greeter/gdm-recent-option-widget.c:311
 msgid "The maximum number of items to keep around in the list"
 msgstr "å?¨æ¸?å?®ä¸ä¿?å?é ?ç?®æ?¸é??ç??æ??å¤§å?¼"
 
@@ -892,36 +891,36 @@ msgstr "ç®¡ç??ç¨?å¼?"
 msgid "The user manager object this user is controlled by."
 msgstr "æ?§å?¶é??å??ä½¿ç?¨è??ç??ä½¿ç?¨è??ç®¡ç??ç¨?å¼?ç?©ä»¶ã??"
 
-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:90
+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:132
 msgid "Choose a different account"
 msgstr "é?¸æ??ä¸?å??ç??å¸³è??"
 
-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:102
+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:144
 msgid "Guest"
 msgstr "è¨ªå®¢"
 
-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:103
+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:145
 msgid "Login as a temporary guest"
 msgstr "ä»¥è?¨æ??è¨ªå®¢ç??èº«å??ç?»å?¥"
 
-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:115
+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:157
 msgid "Automatic Login"
 msgstr "è?ªå??ç?»å?¥"
 
-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:116
+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:158
 msgid "Automatically login to the system after selecting options"
 msgstr "å?¨é?¸å??é?¸é ?å¾?è?ªå??ç?»å?¥ç³»çµ±"
 
-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:279
+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:349
 #, c-format
 msgid "Log in as %s"
 msgstr "ä»¥ %s èº«å??ç?»å?¥"
 
-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:600
+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:694
 msgid "Currently logged in"
 msgstr "ç?¾å?¨å·²ç¶?ç?»å?¥"
 
-#: ../gui/user-switch-applet/applet.c:147
+#: ../gui/user-switch-applet/applet.c:160
 msgid ""
 "The User Switch Applet is free software; you can redistribute it and/or "
 "modify it under the terms of the GNU General Public License as published by "
@@ -929,7 +928,7 @@ msgid ""
 "option) any later version."
 msgstr "ä½¿ç?¨è??å??æ??ç¨?å¼?æ?¯è?ªç?±è»?ä»¶ï¼?ä½ å?¯ä»¥é?µç?§è?ªç?±è»?ä»¶å?ºé??æ?? (Free Software Foundation) å?ºç??ç?? GNU é??ç?¨å?¬å?±è¨±å?¯è?æ¢?æ¬¾ (GNU General Public License) ç¬¬äº?ç??ä¾?ä¿®æ?¹å??é??æ?°ç?¼ä½?é??ä¸?ç¨?å¼?ï¼?æ??è??è?ªç?±é?¸æ??ä½¿ç?¨ä»»ä½?æ?´æ?°ç??ç??æ?¬ã??"
 
-#: ../gui/user-switch-applet/applet.c:151
+#: ../gui/user-switch-applet/applet.c:164
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -937,90 +936,105 @@ msgid ""
 "more details."
 msgstr "ç?¼ä½?é??ä¸?ç¨?å¼?ç??ç?®ç??æ?¯å¸?æ??å®?æ??ç?¨ï¼?ä½?æ²?æ??ä»»ä½?æ??ä¿?ã??ç??è?³æ²?æ??é?©å??ç?¹å®?ç?®ç??è??é?±å?«ç??æ??ä¿?ã??æ?´è©³ç´°ç??æ??æ³?è«?å??é?± GNU é??ç?¨å?¬å?±è¨±å?¯è?ã??"
 
-#: ../gui/user-switch-applet/applet.c:155
+#: ../gui/user-switch-applet/applet.c:168
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA "
 msgstr "ä½ æ??è©²å·²ç¶?å??ç¨?å¼?ä¸?èµ·æ?¶å?°ä¸?ä»½ GNU é??ç?¨å?¬å?±è¨±å?¯è?ç??å?¯æ?¬ã??å¦?æ??é??æ²?æ??ï¼?å¯«ä¿¡çµ¦ï¼? the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA "
 
-#: ../gui/user-switch-applet/applet.c:169
+#: ../gui/user-switch-applet/applet.c:182
 msgid "A menu to quickly switch between users."
-msgstr "ç?¨ä¾?å?¨ä½¿ç?¨è??é??å¿«é??å??æ??ç??é?¸å?®ã??"
+msgstr "ç?¨ä¾?å¿«é??å??æ??ä½¿ç?¨è??ç??é?¸å?®ã??"
 
-#: ../gui/user-switch-applet/applet.c:173
+#: ../gui/user-switch-applet/applet.c:186
 msgid "translator-credits"
 msgstr ""
 "å¦?å°?ç¿»è¯æ??ä»»ä½?æ??è¦?ï¼?è«?é??ä¸?å°?é?»å?é?µä»¶çµ¦\n"
 "ä»¥ä¸?å?°å??ï¼?GNOME ç¿»è¯é??ä¼?æ??ç?¡å¿«å??è¦?ä½ ï¼?\n"
-"community linuxhall org\n"
+"zh-l10n lists linux org tw\n"
 "\n"
 "Chao-Hsiung Liao <j_h_liau yahoo com tw>, 2003, 05\n"
 "Craig Jeffares <cjeffares novell com>, 2004\n"
 "Joe Man <trmetal yahoo com hk>, 2001"
 
-#: ../gui/user-switch-applet/applet.c:782
+#: ../gui/user-switch-applet/applet.c:643
+#: ../gui/user-switch-applet/applet.c:778
+#: ../gui/user-switch-applet/applet.c:817
 #, c-format
 msgid "Can't lock screen: %s"
 msgstr "ç?¡æ³?é??å®?è?¢å¹?ï¼?%s"
 
-#: ../gui/user-switch-applet/applet.c:804
+#: ../gui/user-switch-applet/applet.c:665
 #, c-format
 msgid "Can't temporarily set screensaver to blank screen: %s"
-msgstr "ä¸?è?½æ?«æ??å°?è?¢å¹?ä¿?è·ç¨?å¼?è¨ç?ºç©ºç?½è?¢å¹?ï¼?%s"
+msgstr "ä¸?è?½æ?«æ??å°?è?¢å¹?ä¿?è·ç¨?å¼?è¨ç?ºç©ºç?½ç?«é?¢ï¼?%s"
 
-#: ../gui/user-switch-applet/applet.c:1101
-msgid "Unknown"
-msgstr "ä¸?æ??"
+#: ../gui/user-switch-applet/applet.c:876
+#, c-format
+msgid "Can't logout: %s"
+msgstr "ä¸?è?½ç?»å?ºï¼?%s"
 
-#: ../gui/user-switch-applet/applet.c:1157
-msgid "User Switch Applet"
-msgstr "ä½¿ç?¨è??å??æ??é?¢æ?¿ç¨?å¼?"
+#: ../gui/user-switch-applet/applet.c:959
+msgid "Available"
+msgstr "å?¯ä½¿ç?¨"
 
-#: ../gui/user-switch-applet/applet.c:1181
-#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:2
-msgid "User Switcher"
-msgstr "ä½¿ç?¨è??å??æ??ç¨?å¼?"
+#: ../gui/user-switch-applet/applet.c:960
+msgid "Invisible"
+msgstr "é?±å½¢"
+
+#: ../gui/user-switch-applet/applet.c:961
+msgid "Busy"
+msgstr "å¿?ç¢?"
+
+#: ../gui/user-switch-applet/applet.c:962
+msgid "Away"
+msgstr "é?¢é??"
 
-#: ../gui/user-switch-applet/gdm-user-menu-item.c:338
-msgid "User"
-msgstr "ä½¿ç?¨è??"
+#: ../gui/user-switch-applet/applet.c:1108
+msgid "Account Information..."
+msgstr "å¸³è??è³?è¨?..."
 
-#: ../gui/user-switch-applet/gdm-user-menu-item.c:339
-msgid "The user this menu item represents."
-msgstr "é??å??é?¸å?®é ?ç?®æ??é¡¯ç¤ºç??ä½¿ç?¨è??ã??"
+#: ../gui/user-switch-applet/applet.c:1120
+msgid "System Preferences..."
+msgstr "ç³»çµ±å??å¥½è¨å®?..."
 
-#: ../gui/user-switch-applet/gdm-user-menu-item.c:346
-msgid "Icon Size"
-msgstr "å??ç¤ºå¤§å°?"
+#: ../gui/user-switch-applet/applet.c:1136
+msgid "Lock Screen"
+msgstr "é??å®?è?¢å¹?"
 
-#: ../gui/user-switch-applet/gdm-user-menu-item.c:347
-msgid "The size of the icon to use."
-msgstr "è¦?ä½¿ç?¨ç??å??ç¤ºå¤§å°?ã??"
+#: ../gui/user-switch-applet/applet.c:1147
+msgid "Switch User"
+msgstr "å??æ??ä½¿ç?¨è??"
 
-#: ../gui/user-switch-applet/gdm-user-menu-item.c:353
-msgid "Indicator Size"
-msgstr "æ??æ¨?å¤§å°?"
+#. Only show switch user if there are other users
+#: ../gui/user-switch-applet/applet.c:1158
+msgid "Quit..."
+msgstr "çµ?æ??..."
 
-#: ../gui/user-switch-applet/gdm-user-menu-item.c:354
-msgid "Size of check indicator"
-msgstr "æ ¸å??æ??æ¨?ç??å°ºå¯¸"
+#: ../gui/user-switch-applet/applet.c:1261
+msgid "Unknown"
+msgstr "ä¸?æ??"
 
-#: ../gui/user-switch-applet/gdm-user-menu-item.c:359
-msgid "Indicator Spacing"
-msgstr "æ??æ¨?é??è·?"
+#: ../gui/user-switch-applet/applet.c:1373
+msgid "User Switch Applet"
+msgstr "ä½¿ç?¨è??å??æ??é?¢æ?¿ç¨?å¼?"
 
-#: ../gui/user-switch-applet/gdm-user-menu-item.c:360
-msgid "Space between the username and the indicator"
-msgstr "ä½¿ç?¨è??è??æ??æ¨?ç??é??è·?"
+#: ../gui/user-switch-applet/applet.c:1382
+msgid "Change account settings and status"
+msgstr "æ?¹è®?å¸³è??è¨å®?å?¼è??ç??æ??"
 
 #: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:1
 msgid "A menu to quickly switch between users"
-msgstr "ç?¨ä¾?å?¨ä½¿ç?¨è??é??å¿«é??å??æ??ç??é?¸å?®"
+msgstr "ç?¨ä¾?å¿«é??å??æ??ä½¿ç?¨è??ç??é?¸å?®"
+
+#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:2
+msgid "User Switcher"
+msgstr "ä½¿ç?¨è??å??æ??ç¨?å¼?"
 
 #: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:3
 msgid "User Switcher Applet Factory"
-msgstr "ä½¿ç?¨è??å??æ??ç¨?å¼?å·¥å» "
+msgstr "ä½¿ç?¨è??å??æ??é?¢æ?¿ç¨?å¼?å·¥å» "
 
 #: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:1
 msgid "Edit Personal _Information"
@@ -1032,43 +1046,78 @@ msgstr "é??æ?¼(_A)"
 
 #: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:3
 msgid "_Edit Users and Groups"
-msgstr "ç·¨è¼¯ä½¿ç?¨è??å??ç¾£çµ?(_E)"
-
-#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:4
-msgid "_Help"
-msgstr "æ±?å?©(_H)"
+msgstr "ç·¨è¼¯ä½¿ç?¨è??è??ç¾£çµ?(_E)"
 
-#: ../utils/gdmflexiserver.c:60 ../utils/gdmflexiserver.c:61
-#: ../utils/gdmflexiserver.c:62 ../utils/gdmflexiserver.c:64
-#: ../utils/gdmflexiserver.c:65
+#: ../utils/gdmflexiserver.c:61 ../utils/gdmflexiserver.c:62
+#: ../utils/gdmflexiserver.c:63 ../utils/gdmflexiserver.c:65
+#: ../utils/gdmflexiserver.c:66
 msgid "Ignored - retained for compatibility"
 msgstr "å·²å¿½ç?¥ - å?ªç?ºå?¼å®¹æ?§è??ä¿?ç??"
 
-#: ../utils/gdmflexiserver.c:60
+#: ../utils/gdmflexiserver.c:61
 msgid "COMMAND"
 msgstr "æ??ä»¤"
 
-#: ../utils/gdmflexiserver.c:63 ../utils/gdm-screenshot.c:41
+#: ../utils/gdmflexiserver.c:64 ../utils/gdm-screenshot.c:42
 msgid "Debugging output"
 msgstr "å?µé?¯è¼¸å?º"
 
-#: ../utils/gdmflexiserver.c:67
+#: ../utils/gdmflexiserver.c:68
 msgid "Version of this application"
 msgstr "é??å??ç¨?å¼?ç??ç??æ?¬"
 
-#: ../utils/gdmflexiserver.c:674
+#: ../utils/gdmflexiserver.c:675
 #, c-format
 msgid "Could not identify the current session."
 msgstr "ç?¡æ³?è?å?¥ç?®å??ç??ä½?æ¥é??æ®µã??"
 
-#: ../utils/gdmflexiserver.c:710 ../utils/gdm-screenshot.c:230
-msgid "Main Options"
-msgstr "ä¸»é?¸é ?"
+#. Option parsing
+#: ../utils/gdmflexiserver.c:711
+msgid "- New GDM login"
+msgstr "- æ?°ç?? GDM ç?»å?¥"
 
-#: ../utils/gdmflexiserver.c:759
+#: ../utils/gdmflexiserver.c:762
 msgid "Unable to start new display"
 msgstr "ç?¡æ³?å??å??æ?°ç??é¡¯ç¤ºç?«é?¢"
 
+#. Option parsing
+#: ../utils/gdm-screenshot.c:231
+msgid "Take a picture of the screen"
+msgstr "ç?§ä¸?è?¢å¹?å¿«ç?§"
+
+#~ msgid "You have the Caps Lock key on."
+#~ msgstr "æ?¨å·²æ??ä¸?äº? Caps Lockã??"
+
+#~ msgid "User"
+#~ msgstr "ä½¿ç?¨è??"
+
+#~ msgid "The user this menu item represents."
+#~ msgstr "é??å??é?¸å?®é ?ç?®æ??è¡¨ç¤ºç??ä½¿ç?¨è??ã??"
+
+#~ msgid "Icon Size"
+#~ msgstr "å??ç¤ºå¤§å°?"
+
+#~ msgid "The size of the icon to use."
+#~ msgstr "è¦?ä½¿ç?¨ç??å??ç¤ºå¤§å°?ã??"
+
+#~ msgid "Indicator Size"
+#~ msgstr "æ??æ¨?å¤§å°?"
+
+#~ msgid "Size of check indicator"
+#~ msgstr "æ ¸å??æ??æ¨?ç??å°ºå¯¸"
+
+#~ msgid "Indicator Spacing"
+#~ msgstr "æ??æ¨?é??è·?"
+
+#~ msgid "Space between the username and the indicator"
+#~ msgstr "ä½¿ç?¨è??è??æ??æ¨?ç??é??è·?"
+
+#~ msgid "_Help"
+#~ msgstr "æ±?å?©(_H)"
+
+#~ msgid "Main Options"
+#~ msgstr "ä¸»é?¸é ?"
+
 #~ msgid "Accessibility Preferences"
 #~ msgstr "ç?¡é??ç¤?å??å¥½è¨å®?"
 
@@ -1149,9 +1198,6 @@ msgstr "ç?¡æ³?å??å??æ?°ç??é¡¯ç¤ºç?«é?¢"
 #~ msgid "_User:"
 #~ msgstr "ä½¿ç?¨è??(_U):"
 
-#~ msgid "_Preferences"
-#~ msgstr "å??å¥½è¨å®?(_P)"
-
 #~ msgid "_Setup Login Screen"
 #~ msgstr "è¨å®?ç?»å?¥ç?«é?¢(_S)"
 
@@ -1169,7 +1215,7 @@ msgstr "ç?¡æ³?å??å??æ?°ç??é¡¯ç¤ºç?«é?¢"
 #~ msgstr "ä½¿ç?¨è??"
 
 #~ msgid "Other"
-#~ msgstr "å?¶å®?"
+#~ msgstr "å?¶ä»?"
 
 #~ msgid "<span weight=\"bold\" size=\"larger\">Multiple Logins Found</span>"
 #~ msgstr "<span weight=\"bold\" size=\"larger\">ç?¼ç?¾å¤?é??ç?»å?¥</span>"
@@ -1181,7 +1227,7 @@ msgstr "ç?¡æ³?å??å??æ?°ç??é¡¯ç¤ºç?«é?¢"
 #~ msgstr "ç¹¼çº?"
 
 #~ msgid "Create new logins in _nested windows"
-#~ msgstr "å?¨ X_nest è¦?çª?ä»¥å?¦ä¸?å??èº«å??ç?»å?¥"
+#~ msgstr "å?¨å·¢ç??è¦?çª?ä¸å»ºç«?æ?°ç??ç?»å?¥(_N)"
 
 #~ msgid "Details"
 #~ msgstr "è©³ç´°è³?æ??"
@@ -1201,7 +1247,7 @@ msgstr "ç?¡æ³?å??å??æ?°ç??é¡¯ç¤ºç?«é?¢"
 #~ msgstr "æ?¨æ?³è¦?å??æ??ç??ä½¿ç?¨è??å·²å?¨æ¤é?»è?¦é??è¤?ç?»å?¥ã??è¦?å??æ??è?³å?ªå??ç?»å?¥ï¼?"
 
 #~ msgid "Use the `people' icon for the menu title"
-#~ msgstr "å?¨é?¸å?®æ¨?é¡?ä½¿ç?¨ ã??äººç?©ã??å??ç¤º"
+#~ msgstr "å?¨é?¸å?®æ¨?é¡?ä½¿ç?¨ã??äººç?©ã??å??ç¤º"
 
 #~ msgid "Use the current user's name for the menu title"
 #~ msgstr "å?¨é?¸å?®æ¨?é¡?ä½¿ç?¨ç?®å??ç??ä½¿ç?¨è??å??ç¨±"
@@ -1232,9 +1278,6 @@ msgstr "ç?¡æ³?å??å??æ?°ç??é¡¯ç¤ºç?«é?¢"
 #~ msgid "Display Style"
 #~ msgstr "é¡¯ç¤ºæ¨£å¼?"
 
-#~ msgid "Lock Screen After Switch"
-#~ msgstr "å??æ??ä½¿ç?¨è??å¾?é??å®?è?¢å¹?"
-
 #~ msgid "Show \"Login Window\" Menuitem"
 #~ msgstr "é¡¯ç¤ºã??ç?»å?¥è¦?çª?ã??é?¸å?®é ?ç?®"
 
@@ -1280,11 +1323,11 @@ msgstr "ç?¡æ³?å??å??æ?°ç??é¡¯ç¤ºç?«é?¢"
 
 #~ msgid ""
 #~ "Whether or not to lock the screen after switching to a different console."
-#~ msgstr "å??æ??è?³ä¸?å??ç??ä¸»æ?§å?°å¾?æ?¯å?¦é??å®?å??æ??é?¢ã??"
+#~ msgstr "å??æ??è?³ä¸?å??ç??ä¸»æ?§å?°å¾?æ?¯å?¦é??å®?è?¢å¹?ã??"
 
 #~ msgid ""
 #~ "Whether to show only users who are currently logged in, or all users."
-#~ msgstr "å?ªé¡¯ç¤ºç?®å??ç?»å?¥ç??ä½¿ç?¨è??æ??æ?¯æ??æ??ç??ä½¿ç?¨è??ã??"
+#~ msgstr "å?ªé¡¯ç¤ºç?®å??ç?»å?¥ç??ä½¿ç?¨è??ï¼?æ??æ?¯é¡¯ç¤ºæ??æ??ç??ä½¿ç?¨è??ã??"
 
 #~ msgid "User Switcher 2"
 #~ msgstr "ä½¿ç?¨è??å??æ??ç¨?å¼? 2"
@@ -2100,7 +2143,7 @@ msgstr "ç?¡æ³?å??å??æ?°ç??é¡¯ç¤ºç?«é?¢"
 #~ msgstr "è«?è¼¸å?¥ä½¿ç?¨è??å??ç¨±"
 
 #~ msgid "Password:"
-#~ msgstr "å¯?ç¢¼ï¼?"
+#~ msgstr "å¯?ç¢¼:"
 
 #~ msgid "Couldn't authenticate user \"%s\""
 #~ msgstr "ç?¡æ³?èª?è?ä½¿ç?¨è??â??%sâ??"
@@ -2331,9 +2374,6 @@ msgstr "ç?¡æ³?å??å??æ?°ç??é¡¯ç¤ºç?«é?¢"
 #~ msgid "- Nested gdm login chooser"
 #~ msgstr "- Nested gdm ç?»å?¥é?¸æ??ç¨?å¼?"
 
-#~ msgid "- Nested gdm login"
-#~ msgstr "- Nested gdm ç?»å?¥"
-
 #~ msgid "Please ask your system administrator to install it."
 #~ msgstr "è«?è¦?æ±?ç³»çµ±ç®¡ç??å?¡å®?è£?è©²ç¨?å¼?ã??"
 
@@ -2359,7 +2399,7 @@ msgstr "ç?¡æ³?å??å??æ?°ç??é¡¯ç¤ºç?«é?¢"
 #~ msgstr "æ?¾ä¸?å?°ä»»ä½?æ??ä¾?æ??å??ç??ä¸»æ©?ã??"
 
 #~ msgid "Choose a ho_st to connect to:"
-#~ msgstr "é?¸æ??æº?å??é?£æ?¥ç??ä¸»æ©?(_S)ï¼?"
+#~ msgstr "é?¸æ??æº?å??é?£æ?¥ç??ä¸»æ©?(_S):"
 
 #~ msgid ""
 #~ "The host \"%s\" is not willing to support a login session right now.  "
@@ -2434,7 +2474,7 @@ msgstr "ç?¡æ³?å??å??æ?°ç??é¡¯ç¤ºç?«é?¢"
 #~ msgstr "ç?¡æ³?å?·è¡?é?¸æ??ç¨?å¼?"
 
 #~ msgid "A_dd host: "
-#~ msgstr "å? å?¥ä¸»æ©?(_D)ï¼?"
+#~ msgstr "å? å?¥ä¸»æ©?(_D):"
 
 #~ msgid "C_onnect"
 #~ msgstr "é?£ç·?(_O)"
@@ -2512,7 +2552,7 @@ msgstr "ç?¡æ³?å??å??æ?°ç??é¡¯ç¤ºç?«é?¢"
 #~ msgstr "å??è©¦è¨å®?ä¸?æ??ç??æ??ä¸?å?å?¨ç??ç?»å?ºè¡?å??ã??"
 
 #~ msgid "Virtual terminals not supported."
-#~ msgstr "ä¸?æ?¯æ?´è??æ?¬çµ?ç«¯æ©?"
+#~ msgstr "ä¸?æ?¯æ?´è??æ?¬çµ?ç«¯æ©?ã??"
 
 #~ msgid "Trying to change to an invalid virtual terminal number."
 #~ msgstr "å??è©¦è®?æ?´ç?¡æ??ç??è??æ?¬çµ?ç«¯æ©?è??ç¢¼ã??"
@@ -2943,7 +2983,7 @@ msgstr "ç?¡æ³?å??å??æ?°ç??é¡¯ç¤ºç?«é?¢"
 #~ msgstr "ç³»çµ±é ?è¨å?¼"
 
 #~ msgid "_Username:"
-#~ msgstr "ä½¿ç?¨è??å??ç¨±(_U)ï¼?"
+#~ msgstr "ä½¿ç?¨è??å??ç¨±(_U):"
 
 #~ msgid "%s session selected"
 #~ msgstr "å·²é?¸å??â??%sâ??ä½?æ¥é??æ®µ"
@@ -2958,7 +2998,7 @@ msgstr "ç?¡æ³?å??å??æ?°ç??é¡¯ç¤ºç?«é?¢"
 #~ msgstr "ç³»çµ±é ?è¨å?¼(_S)"
 
 #~ msgid "_Password:"
-#~ msgstr "å¯?ç¢¼(_P)ï¼?"
+#~ msgstr "å¯?ç¢¼(_P):"
 
 #~ msgid "Please insert 25 cents to log in."
 #~ msgstr "è«?æ??å?¥å??å??ç¡¬å¹£ä¾?ç?»å?¥ã??"
@@ -2978,9 +3018,6 @@ msgstr "ç?¡æ³?å??å??æ?°ç??é¡¯ç¤ºç?«é?¢"
 #~ msgid "_Theme"
 #~ msgstr "ä½?æ?¯ä¸»é¡?(_T)"
 
-#~ msgid "_Quit"
-#~ msgstr "çµ?æ??(_Q)"
-
 #~ msgid "Welcome"
 #~ msgstr "æ¡è¿?"
 
@@ -3109,7 +3146,7 @@ msgstr "ç?¡æ³?å??å??æ?°ç??é¡¯ç¤ºç?«é?¢"
 #~ msgstr "è?²é?³"
 
 #~ msgid "None"
-#~ msgstr "ç?¡"
+#~ msgstr "æ²?æ??"
 
 #~ msgid "Archive is not of a subdirectory"
 #~ msgstr "æª?æ¡?ä¸æ²?æ??å??å?«ä»»ä½?å?¯ç?®é??"
@@ -3246,19 +3283,19 @@ msgstr "ç?¡æ³?å??å??æ?°ç??é¡¯ç¤ºç?«é?¢"
 #~ msgstr "å??è¨±é? ç«¯ä½¿ç?¨è¨?æ??ç?»å?¥å??è?½(_W)"
 
 #~ msgid "Author:"
-#~ msgstr "ä½?è??ï¼?"
+#~ msgstr "ä½?è??:"
 
 #~ msgid "Background"
 #~ msgstr "è??æ?¯å??æ¡?"
 
 #~ msgid "C_ommand:"
-#~ msgstr "æ??ä»¤(_O)ï¼?"
+#~ msgstr "æ??ä»¤(_O):"
 
 #~ msgid "C_ustom:"
-#~ msgstr "è?ªè¨?(_U)ï¼?"
+#~ msgstr "è?ªè¨?(_U):"
 
 #~ msgid "Co_lor:"
-#~ msgstr "è?²å½©(_L)ï¼?"
+#~ msgstr "è?²å½©(_L):"
 
 #~ msgid "Color depth:"
 #~ msgstr "è?²å½©æ·±åº¦ï¼?"
@@ -3276,7 +3313,7 @@ msgstr "ç?¡æ³?å??å??æ?°ç??é¡¯ç¤ºç?«é?¢"
 #~ msgstr "å??ç?¨ X forwardingï¼?ä½?ä¸?æ??å½±é?¿ XDMCPã??"
 
 #~ msgid "Displays per _host:"
-#~ msgstr "ä¸»æ©?ç??é?£ç·?æ?¸ç?®ä¸?é??(_H)ï¼?"
+#~ msgstr "ä¸»æ©?ç??é?£ç·?æ?¸ç?®ä¸?é??(_H):"
 
 #~ msgid "Do not show image for _remote logins"
 #~ msgstr "å°?é? ç«¯ç?»å?¥ä¸?é¡¯ç¤ºå??ç??(_R)"
@@ -3285,7 +3322,7 @@ msgstr "ç?¡æ³?å??å??æ?°ç??é¡¯ç¤ºç?«é?¢"
 #~ msgstr "å°?é?¤é?¯è¨?æ?¯è¨?é??å?¨ç³»çµ±æ?¥èª?ä¸(_N)"
 
 #~ msgid "E_xclude:"
-#~ msgstr "æ??é?¤(_X)ï¼?"
+#~ msgstr "æ??é?¤(_X):"
 
 #~ msgid "Enable _Timed Login"
 #~ msgstr "å??ç?¨è¨?æ??ç?»å?¥(_T)"
@@ -3304,10 +3341,10 @@ msgstr "ç?¡æ³?å??å??æ?°ç??é¡¯ç¤ºç?«é?¢"
 #~ msgstr "æ?¥å??é??æ?¥ç??ç?»å?¥è¦?æ±?(_I)"
 
 #~ msgid "I_mage:"
-#~ msgstr "å??ç??(_I)ï¼?"
+#~ msgstr "å??ç??(_I):"
 
 #~ msgid "I_nclude:"
-#~ msgstr "å??å?«(_N)ï¼?"
+#~ msgstr "å??å?«(_N):"
 
 #~ msgid "Includ_e Hostname Chooser (XDMCP) menu item"
 #~ msgstr "å??å?«ä¸»æ©?å??ç¨±é?¸æ??å?¨(XDMCP)é?¸å?®é ?ç?®(_E)"
@@ -3316,10 +3353,10 @@ msgstr "ç?¡æ³?å??å??æ?°ç??é¡¯ç¤ºç?«é?¢"
 #~ msgstr "å??å?«è¨å®?é?¸å?®é ?ç?®(_F)"
 
 #~ msgid "L_ogin retry delay:"
-#~ msgstr "å??è©¦ç?»å?¥å»¶é?²(_O)ï¼?"
+#~ msgstr "å??è©¦ç?»å?¥å»¶é?²(_O):"
 
 #~ msgid "La_unch:"
-#~ msgstr "å?·è¡?(_U)ï¼?"
+#~ msgstr "å?·è¡?(_U):"
 
 #~ msgid "Listen on _UDP port: "
 #~ msgstr "é??å?? _UDP é?£æ?¥å? ï¼?"
@@ -3328,25 +3365,25 @@ msgstr "ç?¡æ³?å??å??æ?°ç??é¡¯ç¤ºç?«é?¢"
 #~ msgstr "æ?¬å?°ç«¯"
 
 #~ msgid "Login _failed:"
-#~ msgstr "ç?»å?¥å¤±æ??(_F)ï¼?"
+#~ msgstr "ç?»å?¥å¤±æ??(_F):"
 
 #~ msgid "Login _successful:"
-#~ msgstr "ç?»å?¥æ??å??(_S)ï¼?"
+#~ msgstr "ç?»å?¥æ??å??(_S):"
 
 #~ msgid "Logo"
 #~ msgstr "æ¨?èª?"
 
 #~ msgid "Maximum _pending requests:"
-#~ msgstr "å?¯è??ç??ç??ç?´æ?¥æ?¥è©¢æ?¸ç?®ä¸?é??(_P)ï¼?"
+#~ msgstr "å?¯è??ç??ç??ç?´æ?¥æ?¥è©¢æ?¸ç?®ä¸?é??(_P):"
 
 #~ msgid "Maximum _remote sessions:"
-#~ msgstr "é? ç«¯ä½?æ¥é??æ®µæ?¸ç?®ä¸?é??(_R)ï¼?"
+#~ msgstr "é? ç«¯ä½?æ¥é??æ®µæ?¸ç?®ä¸?é??(_R):"
 
 #~ msgid "Maximum _wait time:"
-#~ msgstr "ç?å¾?æ??é??ä¸?é??(_W)ï¼?"
+#~ msgstr "ç?å¾?æ??é??ä¸?é??(_W):"
 
 #~ msgid "Maximum indirect w_ait time:"
-#~ msgstr "é??æ?¥è¦?æ±?ç?å¾?æ??é??ä¸?é??(_A)ï¼?"
+#~ msgstr "é??æ?¥è¦?æ±?ç?å¾?æ??é??ä¸?é??(_A):"
 
 #~ msgid "Maximum p_ending indirect requests:"
 #~ msgstr "å?¯è??ç??ç??é??æ?¥æ?¥è©¢æ?¸ç?®ä¸?é??(_E):"
@@ -3355,7 +3392,7 @@ msgstr "ç?¡æ³?å??å??æ?°ç??é¡¯ç¤ºç?«é?¢"
 #~ msgstr "é?¸å?®å??"
 
 #~ msgid "Op_tions:\t"
-#~ msgstr "é?¸é ?(_T)ï¼?\t"
+#~ msgstr "é?¸é ?(_T):\t"
 
 #~ msgid "Pick Background Color"
 #~ msgstr "é?¸æ??è??æ?¯è?²å½©"
@@ -3397,9 +3434,6 @@ msgstr "ç?¡æ³?å??å??æ?°ç??é¡¯ç¤ºç?«é?¢"
 #~ msgid "Sc_ale to fit screen"
 #~ msgstr "ç¸®æ?¾ä»¥ç¬¦å??è?¢å¹?(_A)"
 
-#~ msgid "Security"
-#~ msgstr "å®?å?¨æ?§"
-
 #~ msgid "Select Background Image"
 #~ msgstr "å?¦å?è??æ?¯å??ç??"
 
@@ -3420,7 +3454,7 @@ msgstr "ç?¡æ³?å??å??æ?°ç??é¡¯ç¤ºç?«é?¢"
 #~ msgstr "ä¼ºæ??å?¨è¨å®?å?¼"
 
 #~ msgid "Server _name:"
-#~ msgstr "ä¼ºæ??å?¨å??ç¨±(_N)ï¼?"
+#~ msgstr "ä¼ºæ??å?¨å??ç¨±(_N):"
 
 #~ msgid "Servers To Start"
 #~ msgstr "è¦?å??å??ç??ä¼ºæ??å?¨"
@@ -3429,7 +3463,7 @@ msgstr "ç?¡æ³?å??å??æ?°ç??é¡¯ç¤ºç?«é?¢"
 #~ msgstr "ä½?æ?¯ä¸»é¡?"
 
 #~ msgid "U_ser:"
-#~ msgstr "ä½¿ç?¨è??(_S)ï¼?"
+#~ msgstr "ä½¿ç?¨è??(_S):"
 
 #~ msgid "Welcome Message"
 #~ msgstr "æ¡è¿?è¨?æ?¯"
@@ -3453,7 +3487,7 @@ msgstr "ç?¡æ³?å??å??æ?°ç??é¡¯ç¤ºç?«é?¢"
 #~ msgstr "å??è¨±ä½¿ç?¨è??æ?¹è®?ç´?æ??å?æ¡è¿?ç¨?å¼?ç??å?å??è??è?²å½©(_A)"
 
 #~ msgid "_Background color:"
-#~ msgstr "è??æ?¯è?²å½©(_B)ï¼?"
+#~ msgstr "è??æ?¯è?²å½©(_B):"
 
 #~ msgid "_Default: \"Welcome to %n\""
 #~ msgstr "é ?è¨ï¼?ã??æ¡è¿?ä¾?å?° %nã??(_D)"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 8e21c62..fb4be32 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -12,12 +12,12 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gdm2 2.23.1\n"
+"Project-Id-Version: gdm2 2.25.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-23 19:49+0800\n"
-"PO-Revision-Date: 2008-07-12 05:09+0800\n"
+"POT-Creation-Date: 2009-02-04 20:58+0800\n"
+"PO-Revision-Date: 2009-02-04 10:35+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
-"Language-Team: Chinese (Taiwan) <community linuxhall org>\n"
+"Language-Team: Chinese (Taiwan) <zh-l10n lists linux org tw>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -54,15 +54,15 @@ msgstr "GNOME å¾?å±¬é¡¯ç¤ºç®¡ç??ç¨?å¼?"
 msgid "could not find user \"%s\" on system"
 msgstr "å?¨ç³»çµ±ä¸æ?¾ä¸?å?°ä½¿ç?¨è??ã??%sã??"
 
-#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:207
+#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:217
 msgid "Unable to initialize login system"
 msgstr "ç?¡æ³?å??å§?å??ç?»å?¥ç³»çµ±"
 
-#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:240
+#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:253
 msgid "Unable to authenticate user"
 msgstr "ç?¡æ³?é©?è?ä½¿ç?¨è??"
 
-#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:286
+#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:307
 msgid "Unable to authorize user"
 msgstr "ç?¡æ³?é©?è?ä½¿ç?¨è??"
 
@@ -71,7 +71,7 @@ msgid "Unable to establish credentials"
 msgstr "ç?¡æ³?å»ºç«?è?æ?¸"
 
 #: ../daemon/gdm-factory-slave.c:662 ../daemon/gdm-product-slave.c:449
-#: ../daemon/gdm-simple-slave.c:1048
+#: ../daemon/gdm-simple-slave.c:1097
 msgid ""
 "Could not start the X server (your graphical environment) due to some "
 "internal error. Please contact your system administrator or check your "
@@ -81,52 +81,52 @@ msgstr ""
 "å? ç?ºæ??äº?å?§é?¨é?¯èª¤ï¼?ç?®å??ç?¡æ³?å??å??X ä¼ºæ??å?¨ï¼?å?³å??å½¢ä»?é?¢ï¼?ã??è«?é?£çµ¡ç³»çµ±ç®¡ç??å?¡æ??æ?¯æª¢"
 "æ?¥ç³»çµ±ç´?é??æª?ã??ç?®å??æ??å??æ¢ä½¿ç?¨é??å??é¡¯ç¤ºç?«é?¢ã??è«?å?¨ä¿®æ£å??é¡?å¾?é??æ?°å??å?? GDMã??"
 
-#: ../daemon/gdm-server.c:244
+#: ../daemon/gdm-server.c:246
 #, c-format
 msgid "%s: failed to connect to parent display '%s'"
 msgstr "%sï¼?ç?¡æ³?é?£æ?¥ä¸»é¡¯ç¤ºç?«é?¢â??%sâ??"
 
-#: ../daemon/gdm-server.c:362
+#: ../daemon/gdm-server.c:361
 #, c-format
 msgid "Server was to be spawned by user %s but that user doesn't exist"
 msgstr "ä¼ºæ??å?¨æ??ä»¥ä½¿ç?¨è?? %s ç??èº«å??è¡?ç??ï¼?ä½?è©²ä½¿ç?¨è??ä¸?å?å?¨"
 
-#: ../daemon/gdm-server.c:373 ../daemon/gdm-welcome-session.c:415
+#: ../daemon/gdm-server.c:372 ../daemon/gdm-welcome-session.c:444
 #, c-format
 msgid "Couldn't set groupid to %d"
 msgstr "ç?¡æ³?è¨å®? groupid ç?º %d"
 
-#: ../daemon/gdm-server.c:379 ../daemon/gdm-welcome-session.c:421
+#: ../daemon/gdm-server.c:378 ../daemon/gdm-welcome-session.c:450
 #, c-format
 msgid "initgroups () failed for %s"
 msgstr "%s ç?? initgroups () å¤±æ??ã??"
 
-#: ../daemon/gdm-server.c:385 ../daemon/gdm-welcome-session.c:427
+#: ../daemon/gdm-server.c:384 ../daemon/gdm-welcome-session.c:456
 #, c-format
 msgid "Couldn't set userid to %d"
 msgstr "ç?¡æ³?è¨å®? userid ç?º %d"
 
-#: ../daemon/gdm-server.c:393 ../daemon/gdm-welcome-session.c:435
+#: ../daemon/gdm-server.c:392 ../daemon/gdm-welcome-session.c:464
 msgid "Couldn't set groupid to 0"
 msgstr "ç?¡æ³?è¨å®? groupid ç?º 0"
 
-#: ../daemon/gdm-server.c:428
+#: ../daemon/gdm-server.c:431
 #, c-format
 msgid "%s: Could not open logfile for display %s!"
 msgstr "%sï¼?ç?¡æ³?é??å??é¡¯ç¤ºç?«é?¢ %s ç??ç´?é??æª?ï¼?"
 
-#: ../daemon/gdm-server.c:439 ../daemon/gdm-server.c:445
-#: ../daemon/gdm-server.c:451
+#: ../daemon/gdm-server.c:442 ../daemon/gdm-server.c:448
+#: ../daemon/gdm-server.c:454
 #, c-format
 msgid "%s: Error setting %s to %s"
 msgstr "%sï¼?å°? %s è¨å®?ç?º %s æ??ç?¼ç??é?¯èª¤"
 
-#: ../daemon/gdm-server.c:466
+#: ../daemon/gdm-server.c:469
 #, c-format
 msgid "%s: Server priority couldn't be set to %d: %s"
 msgstr "%sï¼?ä¼ºæ??å?¨å?ªå??ç?ç´?ç?¡æ³?è¨å®?ç?º %dï¼?%s"
 
-#: ../daemon/gdm-server.c:618
+#: ../daemon/gdm-server.c:621
 #, c-format
 msgid "%s: Empty server command for display %s"
 msgstr "%sï¼?é¡¯ç¤ºç?«é?¢ %s ç??ä¼ºæ??å?¨æ??ä»¤æ?¯ç©ºç?½ç??"
@@ -183,7 +183,7 @@ msgstr "ä¸?æ??ç??é?¯èª¤"
 
 #: ../daemon/gdm-session-worker.c:1090
 msgid "Username:"
-msgstr "ä½¿ç?¨è??å??ç¨±ï¼?"
+msgstr "ä½¿ç?¨è??å??ç¨±:"
 
 #: ../daemon/gdm-session-worker.c:1096
 #, c-format
@@ -219,16 +219,16 @@ msgstr "æ²?æ??å?¯ç?¨ç??ä½¿ç?¨è??å¸³è??"
 msgid "Unable to change to user"
 msgstr "ç?¡æ³?æ?¹è®?ç?ºä½¿ç?¨è??"
 
-#: ../daemon/gdm-simple-slave.c:387
+#: ../daemon/gdm-simple-slave.c:426
 msgid "Unable establish credentials"
 msgstr "ç?¡æ³?å»ºç«?è?æ?¸"
 
-#: ../daemon/gdm-welcome-session.c:397
+#: ../daemon/gdm-welcome-session.c:426
 #, c-format
 msgid "User %s doesn't exist"
 msgstr "ä½¿ç?¨è?? %s ä¸?å?å?¨"
 
-#: ../daemon/gdm-welcome-session.c:404
+#: ../daemon/gdm-welcome-session.c:433
 #, c-format
 msgid "Group %s doesn't exist"
 msgstr "ç¾¤çµ? %s ä¸?å?å?¨"
@@ -276,97 +276,97 @@ msgstr "%sï¼?ç?¡æ³?å¾?å°?å??ä¸è®?å?? authlist"
 msgid "%s: Error in checksum"
 msgstr "%sï¼?æª¢æ?¥ç¢¼å?ºç?¾é?¯èª¤"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2120
+#: ../daemon/gdm-xdmcp-display-factory.c:2127
 #, c-format
 msgid "%s: Got REQUEST from banned host %s"
 msgstr "%sï¼?å·²è¢«æ??çµ?ç??ä¸»æ©? %s ç?¼å?ºè¦?æ±?"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2130
-#: ../daemon/gdm-xdmcp-display-factory.c:2485
-#: ../daemon/gdm-xdmcp-display-factory.c:2737
+#: ../daemon/gdm-xdmcp-display-factory.c:2137
+#: ../daemon/gdm-xdmcp-display-factory.c:2492
+#: ../daemon/gdm-xdmcp-display-factory.c:2744
 #, c-format
 msgid "%s: Could not read Display Number"
 msgstr "%sï¼?ç?¡æ³?è®?å??é¡¯ç¤ºç?«é?¢ç·¨è??"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2137
+#: ../daemon/gdm-xdmcp-display-factory.c:2144
 #, c-format
 msgid "%s: Could not read Connection Type"
 msgstr "%sï¼?ç?¡æ³?è®?å??é?£ç·?æ?¹å¼?"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2144
+#: ../daemon/gdm-xdmcp-display-factory.c:2151
 #, c-format
 msgid "%s: Could not read Client Address"
 msgstr "%sï¼?ç?¡æ³?è®?å??å®¢æ?¶ç«¯ä½?å??"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2152
+#: ../daemon/gdm-xdmcp-display-factory.c:2159
 #, c-format
 msgid "%s: Could not read Authentication Names"
 msgstr "%sï¼?ç?¡æ³?è®?å??èª?è?å??ç¨±"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2161
+#: ../daemon/gdm-xdmcp-display-factory.c:2168
 #, c-format
 msgid "%s: Could not read Authentication Data"
 msgstr "%sï¼?ç?¡æ³?è®?å??èª?è?è³?æ??"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2171
+#: ../daemon/gdm-xdmcp-display-factory.c:2178
 #, c-format
 msgid "%s: Could not read Authorization List"
 msgstr "%sï¼?ç?¡æ³?è®?å??æ??æ¬?æ¸?å?®"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2190
+#: ../daemon/gdm-xdmcp-display-factory.c:2197
 #, c-format
 msgid "%s: Could not read Manufacturer ID"
 msgstr "%sï¼?ç?¡æ³?è®?å??å» å??è?å?¥ç¢¼"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2217
+#: ../daemon/gdm-xdmcp-display-factory.c:2224
 #, c-format
 msgid "%s: Failed checksum from %s"
 msgstr "%sï¼?å¾? %s å¾?å?°é?¯èª¤ç??æª¢æ?¥ç¢¼"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2469
+#: ../daemon/gdm-xdmcp-display-factory.c:2476
 #, c-format
 msgid "%s: Got Manage from banned host %s"
 msgstr "%sï¼?å·²è¢«æ??çµ?ç??ä¸»æ©? %s ç?¼å?ºç®¡ç??è¨?æ?¯"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2478
-#: ../daemon/gdm-xdmcp-display-factory.c:2744
+#: ../daemon/gdm-xdmcp-display-factory.c:2485
+#: ../daemon/gdm-xdmcp-display-factory.c:2751
 #, c-format
 msgid "%s: Could not read Session ID"
 msgstr "%sï¼?ç?¡æ³?è®?å??ä½?æ¥é??æ®µè?å?¥ç¢¼"
 
 # FIXME: What is display class?
-#: ../daemon/gdm-xdmcp-display-factory.c:2492
+#: ../daemon/gdm-xdmcp-display-factory.c:2499
 #, c-format
 msgid "%s: Could not read Display Class"
 msgstr "%sï¼?ç?¡æ³?è®?å??é¡¯ç¤ºç?«é?¢ç??é¡?å?¥"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2597
-#: ../daemon/gdm-xdmcp-display-factory.c:2647
-#: ../daemon/gdm-xdmcp-display-factory.c:2653
+#: ../daemon/gdm-xdmcp-display-factory.c:2604
+#: ../daemon/gdm-xdmcp-display-factory.c:2654
+#: ../daemon/gdm-xdmcp-display-factory.c:2660
 #, c-format
 msgid "%s: Could not read address"
 msgstr "%sï¼?ç?¡æ³?è®?å??ä½?å??"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2727
+#: ../daemon/gdm-xdmcp-display-factory.c:2734
 #, c-format
 msgid "%s: Got KEEPALIVE from banned host %s"
 msgstr "%sï¼?å·²è¢«æ??çµ?ç??ä¸»æ©? %s ç?¼å?º KEEPALIVE è¨?æ?¯"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2816
+#: ../daemon/gdm-xdmcp-display-factory.c:2823
 msgid "GdmXdmcpDisplayFactory: Could not read XDMCP header!"
 msgstr "GdmXdmcpDisplayFactoryï¼?ç?¡æ³?è®?å?? XDMCP æ¨?é ï¼?"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2822
+#: ../daemon/gdm-xdmcp-display-factory.c:2829
 #: ../gui/simple-chooser/gdm-host-chooser-widget.c:226
 msgid "XMDCP: Incorrect XDMCP version!"
 msgstr "XMDCPï¼?XDMCP ç??æ?¬ä¸?æ£ç¢ºï¼?"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2828
+#: ../daemon/gdm-xdmcp-display-factory.c:2835
 #: ../gui/simple-chooser/gdm-host-chooser-widget.c:232
 msgid "XMDCP: Unable to parse address"
 msgstr "XMDCPï¼?ç?¡æ³?è§£æ??ä½?å??"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:3226
+#: ../daemon/gdm-xdmcp-display-factory.c:3233
 #, c-format
 msgid "Could not get server hostname: %s!"
 msgstr "ç?¡æ³?å??å¾?ä¼ºæ??å?¨ä¸»æ©?å??ç¨±ï¼?%sï¼?"
@@ -449,7 +449,7 @@ msgid "AT SPI Registry Wrapper"
 msgstr "AT SPI è¨»å??è¡¨è½?æ??å?¨"
 
 #: ../data/greeter-autostart/gdm-simple-greeter.desktop.in.in.h:1
-#: ../gui/simple-greeter/gdm-greeter-login-window.c:1962
+#: ../gui/simple-greeter/gdm-greeter-login-window.c:1921
 msgid "Login Window"
 msgstr "ç?»å?¥ç?«é?¢"
 
@@ -481,6 +481,10 @@ msgstr "GNOME è?¢å¹?é?µç?¤"
 msgid "Use an onscreen keyboard"
 msgstr "ä½¿ç?¨è?¢å¹?é?µç?¤"
 
+#: ../data/greeter-autostart/metacity.desktop.in.h:1
+msgid "Metacity"
+msgstr "Metacity"
+
 #: ../data/greeter-autostart/orca-screen-reader.desktop.in.h:1
 msgid "Orca Screen Reader"
 msgstr "Orca è?¢å¹?é?±è®?å?¨"
@@ -509,19 +513,19 @@ msgstr "æ?¸å?¼"
 msgid "percentage of time complete"
 msgstr "å®?æ??æ??é??ç?¾å??æ¯?"
 
-#: ../gui/simple-greeter/gdm-chooser-widget.c:1211
+#: ../gui/simple-greeter/gdm-chooser-widget.c:1306
 msgid "Inactive Text"
 msgstr "æ?ªä½¿ç?¨ç??æ??å?"
 
-#: ../gui/simple-greeter/gdm-chooser-widget.c:1212
+#: ../gui/simple-greeter/gdm-chooser-widget.c:1307
 msgid "The text to use in the label if the user hasn't picked an item yet"
 msgstr "è?¥ä½¿ç?¨è??å°?æ?ªæ??é?¸ä»»ä½?é ?ç?®ï¼?è¦?å?¨æ¨?ç±¤ä¸ä½¿ç?¨ç??æ??å?"
 
-#: ../gui/simple-greeter/gdm-chooser-widget.c:1220
+#: ../gui/simple-greeter/gdm-chooser-widget.c:1315
 msgid "Active Text"
 msgstr "ä½¿ç?¨ä¸ç??æ??å?"
 
-#: ../gui/simple-greeter/gdm-chooser-widget.c:1221
+#: ../gui/simple-greeter/gdm-chooser-widget.c:1316
 msgid "The text to use in the label if the user has picked an item"
 msgstr "è?¥ä½¿ç?¨è??å·²æ??é?¸æ??å??é ?ç?®ï¼?è¦?å?¨æ¨?ç±¤ä¸ä½¿ç?¨ç??æ??å?"
 
@@ -551,39 +555,35 @@ msgstr "%a %b %e"
 msgid "%1$s, %2$s"
 msgstr "%1$s, %2$s"
 
-#: ../gui/simple-greeter/gdm-greeter-login-window.c:181
-msgid "You have the Caps Lock key on."
-msgstr "æ?¨å·²æ??ä¸?äº? Caps Lockã??"
-
-#: ../gui/simple-greeter/gdm-greeter-login-window.c:326
+#: ../gui/simple-greeter/gdm-greeter-login-window.c:288
 msgid "Automatically logging in..."
 msgstr "æ£å?¨è?ªå??ç?»å?¥..."
 
 #. need to wait for response from backend
-#: ../gui/simple-greeter/gdm-greeter-login-window.c:760
+#: ../gui/simple-greeter/gdm-greeter-login-window.c:718
 msgid "Cancelling..."
 msgstr "æ£å?¨å??æ¶?..."
 
-#: ../gui/simple-greeter/gdm-greeter-login-window.c:1229
+#: ../gui/simple-greeter/gdm-greeter-login-window.c:1187
 msgid "Failed to restart computer"
 msgstr "é??æ?°å??å??é?»è?¦å¤±æ??"
 
-#: ../gui/simple-greeter/gdm-greeter-login-window.c:1232
+#: ../gui/simple-greeter/gdm-greeter-login-window.c:1190
 msgid ""
 "You are not allowed to restart the computer because multiple users are "
 "logged in"
 msgstr "æ?¨ç?¾å?¨ä¸?è?½é??æ?°å??å??é?»è?¦ï¼?å? ç?ºæ??å¤?å??ä½¿ç?¨è??ç?»å?¥"
 
-#: ../gui/simple-greeter/gdm-greeter-login-window.c:1313
+#: ../gui/simple-greeter/gdm-greeter-login-window.c:1271
 msgid "Failed to stop computer"
 msgstr "å??æ¢é?»è?¦å¤±æ??"
 
-#: ../gui/simple-greeter/gdm-greeter-login-window.c:1316
+#: ../gui/simple-greeter/gdm-greeter-login-window.c:1274
 msgid ""
 "You are not allowed to stop the computer because multiple users are logged in"
 msgstr "æ?¨ç?¾å?¨ä¸?è?½å??æ¢é?»è?¦ï¼?å? ç?ºæ??å¤?å??ä½¿ç?¨è??ç?»å?¥"
 
-#: ../gui/simple-greeter/gdm-greeter-login-window.c:1400
+#: ../gui/simple-greeter/gdm-greeter-login-window.c:1358
 msgid "Select language and click Log In"
 msgstr "é?¸æ??èª?è¨?ä¸¦æ??ä¸?ã??ç?»å?¥ã??"
 
@@ -619,11 +619,11 @@ msgstr "ç??æ?¬"
 msgid "page 5"
 msgstr "ç¬¬ 5 é ?"
 
-#: ../gui/simple-greeter/gdm-greeter-panel.c:540
+#: ../gui/simple-greeter/gdm-greeter-panel.c:590
 msgid "Panel"
 msgstr "é?¢æ?¿"
 
-#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:222
+#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:201
 msgid "Languages"
 msgstr "èª?è¨?"
 
@@ -632,68 +632,67 @@ msgid "_Languages:"
 msgstr "èª?è¨?(_L):"
 
 #: ../gui/simple-greeter/gdm-language-chooser-widget.c:273
-#: ../gui/simple-greeter/gdm-language-option-widget.c:235
+#: ../gui/simple-greeter/gdm-language-option-widget.c:259
 msgid "_Language:"
 msgstr "èª?è¨?(_L):"
 
-#: ../gui/simple-greeter/gdm-language-option-widget.c:206
-#: ../gui/simple-greeter/gdm-layout-option-widget.c:199
-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:89
-#: ../gui/user-switch-applet/applet.c:996
+#: ../gui/simple-greeter/gdm-language-option-widget.c:228
+#: ../gui/simple-greeter/gdm-layout-option-widget.c:220
+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:131
 msgid "Other..."
 msgstr "å?¶å®?..."
 
-#: ../gui/simple-greeter/gdm-language-option-widget.c:207
+#: ../gui/simple-greeter/gdm-language-option-widget.c:229
 msgid "Choose a language from the full list of available languages."
 msgstr "å¾?å®?æ?´ç??å?¯ç?¨èª?è¨?æ¸?å?®ä¸é?¸æ??èª?è¨?ã??"
 
-#: ../gui/simple-greeter/gdm-languages.c:587
+#: ../gui/simple-greeter/gdm-languages.c:610
 msgid "Unspecified"
 msgstr "æ?ªæ??å®?"
 
-#: ../gui/simple-greeter/gdm-layout-chooser-dialog.c:211
+#: ../gui/simple-greeter/gdm-layout-chooser-dialog.c:191
 msgid "Keyboard layouts"
 msgstr "é?µç?¤é??ç½®"
 
 #: ../gui/simple-greeter/gdm-layout-chooser-widget.c:200
 #: ../gui/simple-greeter/gdm-layout-chooser-widget.c:201
-#: ../gui/simple-greeter/gdm-layout-option-widget.c:228
+#: ../gui/simple-greeter/gdm-layout-option-widget.c:251
 msgid "_Keyboard:"
 msgstr "é?µç?¤(_K):"
 
-#: ../gui/simple-greeter/gdm-layout-option-widget.c:200
+#: ../gui/simple-greeter/gdm-layout-option-widget.c:221
 msgid "Choose a keyboard layout from the full list of available layouts."
 msgstr "å¾?å®?æ?´ç??å?¯ç?¨é?µç?¤é??ç½®æ¸?å?®ä¸é?¸æ??é?µç?¤é??ç½®ã??"
 
-#: ../gui/simple-greeter/gdm-option-widget.c:493
+#: ../gui/simple-greeter/gdm-option-widget.c:494
 msgid "Label Text"
 msgstr "æ¨?ç±¤æ??å?"
 
-#: ../gui/simple-greeter/gdm-option-widget.c:494
+#: ../gui/simple-greeter/gdm-option-widget.c:495
 msgid "The text to use as a label"
 msgstr "è¦?ç?¨å??æ¨?ç±¤ç??æ??å?"
 
-#: ../gui/simple-greeter/gdm-option-widget.c:501
+#: ../gui/simple-greeter/gdm-option-widget.c:502
 msgid "Icon name"
 msgstr "å??ç¤ºå??ç¨±"
 
-#: ../gui/simple-greeter/gdm-option-widget.c:502
+#: ../gui/simple-greeter/gdm-option-widget.c:503
 msgid "The icon to use with the label"
 msgstr "è¦?è??æ¨?ç±¤ä¸?èµ·ä½¿ç?¨ç??å??ç¤º"
 
-#: ../gui/simple-greeter/gdm-option-widget.c:510
+#: ../gui/simple-greeter/gdm-option-widget.c:511
 msgid "Default Item"
 msgstr "é ?è¨ç??é ?ç?®"
 
-#: ../gui/simple-greeter/gdm-option-widget.c:511
+#: ../gui/simple-greeter/gdm-option-widget.c:512
 msgid "The id of the default item"
 msgstr "é ?è¨é ?ç?®ç?? id"
 
-#: ../gui/simple-greeter/gdm-recent-option-widget.c:298
+#: ../gui/simple-greeter/gdm-recent-option-widget.c:310
 msgid "Max Item Count"
 msgstr "æ??å¤§é ?ç?®æ?¸"
 
-#: ../gui/simple-greeter/gdm-recent-option-widget.c:299
+#: ../gui/simple-greeter/gdm-recent-option-widget.c:311
 msgid "The maximum number of items to keep around in the list"
 msgstr "å?¨æ¸?å?®ä¸ä¿?å?é ?ç?®æ?¸é??ç??æ??å¤§å?¼"
 
@@ -894,36 +893,36 @@ msgstr "ç®¡ç??ç¨?å¼?"
 msgid "The user manager object this user is controlled by."
 msgstr "æ?§å?¶é??å??ä½¿ç?¨è??ç??ä½¿ç?¨è??ç®¡ç??ç¨?å¼?ç?©ä»¶ã??"
 
-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:90
+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:132
 msgid "Choose a different account"
 msgstr "é?¸æ??ä¸?å??ç??å¸³è??"
 
-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:102
+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:144
 msgid "Guest"
 msgstr "è¨ªå®¢"
 
-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:103
+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:145
 msgid "Login as a temporary guest"
 msgstr "ä»¥è?¨æ??è¨ªå®¢ç??èº«å??ç?»å?¥"
 
-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:115
+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:157
 msgid "Automatic Login"
 msgstr "è?ªå??ç?»å?¥"
 
-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:116
+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:158
 msgid "Automatically login to the system after selecting options"
 msgstr "å?¨é?¸å??é?¸é ?å¾?è?ªå??ç?»å?¥ç³»çµ±"
 
-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:279
+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:349
 #, c-format
 msgid "Log in as %s"
 msgstr "ä»¥ %s èº«å??ç?»å?¥"
 
-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:600
+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:694
 msgid "Currently logged in"
 msgstr "ç?¾å?¨å·²ç¶?ç?»å?¥"
 
-#: ../gui/user-switch-applet/applet.c:147
+#: ../gui/user-switch-applet/applet.c:160
 msgid ""
 "The User Switch Applet is free software; you can redistribute it and/or "
 "modify it under the terms of the GNU General Public License as published by "
@@ -934,7 +933,7 @@ msgstr ""
 "Foundation) å?ºç??ç?? GNU é??ç?¨å?¬å?±è¨±å?¯è?æ¢?æ¬¾ (GNU General Public License) ç¬¬äº?ç??"
 "ä¾?ä¿®æ?¹å??é??æ?°ç?¼ä½?é??ä¸?ç¨?å¼?ï¼?æ??è??è?ªç?±é?¸æ??ä½¿ç?¨ä»»ä½?æ?´æ?°ç??ç??æ?¬ã??"
 
-#: ../gui/user-switch-applet/applet.c:151
+#: ../gui/user-switch-applet/applet.c:164
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -944,7 +943,7 @@ msgstr ""
 "ç?¼ä½?é??ä¸?ç¨?å¼?ç??ç?®ç??æ?¯å¸?æ??å®?æ??ç?¨ï¼?ä½?æ²?æ??ä»»ä½?æ??ä¿?ã??ç??è?³æ²?æ??é?©å??ç?¹å®?ç?®ç??è??é?±å?«ç??"
 "æ??ä¿?ã??æ?´è©³ç´°ç??æ??æ³?è«?å??é?± GNU é??ç?¨å?¬å?±è¨±å?¯è?ã??"
 
-#: ../gui/user-switch-applet/applet.c:155
+#: ../gui/user-switch-applet/applet.c:168
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
@@ -954,83 +953,98 @@ msgstr ""
 "the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, "
 "MA 02110-1301, USA "
 
-#: ../gui/user-switch-applet/applet.c:169
+#: ../gui/user-switch-applet/applet.c:182
 msgid "A menu to quickly switch between users."
-msgstr "ç?¨ä¾?å?¨ä½¿ç?¨è??é??å¿«é??å??æ??ç??é?¸å?®ã??"
+msgstr "ç?¨ä¾?å¿«é??å??æ??ä½¿ç?¨è??ç??é?¸å?®ã??"
 
-#: ../gui/user-switch-applet/applet.c:173
+#: ../gui/user-switch-applet/applet.c:186
 msgid "translator-credits"
 msgstr ""
 "å¦?å°?ç¿»è¯æ??ä»»ä½?æ??è¦?ï¼?è«?é??ä¸?å°?é?»å?é?µä»¶çµ¦\n"
 "ä»¥ä¸?å?°å??ï¼?GNOME ç¿»è¯å??é??æ??ç?¡å¿«å??è¦?æ?¨ï¼?\n"
-"community linuxhall org\n"
+"zh-l10n lists linux org tw\n"
 "\n"
 "Chao-Hsiung Liao <j_h_liau yahoo com tw>, 2003, 05\n"
 "Craig Jeffares <cjeffares novell com>, 2004\n"
 "Joe Man <trmetal yahoo com hk>, 2001"
 
-#: ../gui/user-switch-applet/applet.c:782
+#: ../gui/user-switch-applet/applet.c:643
+#: ../gui/user-switch-applet/applet.c:778
+#: ../gui/user-switch-applet/applet.c:817
 #, c-format
 msgid "Can't lock screen: %s"
 msgstr "ç?¡æ³?é??å®?è?¢å¹?ï¼?%s"
 
-#: ../gui/user-switch-applet/applet.c:804
+#: ../gui/user-switch-applet/applet.c:665
 #, c-format
 msgid "Can't temporarily set screensaver to blank screen: %s"
-msgstr "ä¸?è?½æ?«æ??å°?è?¢å¹?ä¿?è·ç¨?å¼?è¨ç?ºç©ºç?½è?¢å¹?ï¼?%s"
+msgstr "ä¸?è?½æ?«æ??å°?è?¢å¹?ä¿?è·ç¨?å¼?è¨ç?ºç©ºç?½ç?«é?¢ï¼?%s"
 
-#: ../gui/user-switch-applet/applet.c:1101
-msgid "Unknown"
-msgstr "ä¸?æ??"
+#: ../gui/user-switch-applet/applet.c:876
+#, c-format
+msgid "Can't logout: %s"
+msgstr "ä¸?è?½ç?»å?ºï¼?%s"
 
-#: ../gui/user-switch-applet/applet.c:1157
-msgid "User Switch Applet"
-msgstr "ä½¿ç?¨è??å??æ??é?¢æ?¿ç¨?å¼?"
+#: ../gui/user-switch-applet/applet.c:959
+msgid "Available"
+msgstr "å?¯ä½¿ç?¨"
 
-#: ../gui/user-switch-applet/applet.c:1181
-#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:2
-msgid "User Switcher"
-msgstr "ä½¿ç?¨è??å??æ??ç¨?å¼?"
+#: ../gui/user-switch-applet/applet.c:960
+msgid "Invisible"
+msgstr "é?±å½¢"
+
+#: ../gui/user-switch-applet/applet.c:961
+msgid "Busy"
+msgstr "å¿?ç¢?"
+
+#: ../gui/user-switch-applet/applet.c:962
+msgid "Away"
+msgstr "é?¢é??"
 
-#: ../gui/user-switch-applet/gdm-user-menu-item.c:338
-msgid "User"
-msgstr "ä½¿ç?¨è??"
+#: ../gui/user-switch-applet/applet.c:1108
+msgid "Account Information..."
+msgstr "å¸³è??è³?è¨?..."
 
-#: ../gui/user-switch-applet/gdm-user-menu-item.c:339
-msgid "The user this menu item represents."
-msgstr "é??å??é?¸å?®é ?ç?®æ??é¡¯ç¤ºç??ä½¿ç?¨è??ã??"
+#: ../gui/user-switch-applet/applet.c:1120
+msgid "System Preferences..."
+msgstr "ç³»çµ±å??å¥½è¨å®?..."
 
-#: ../gui/user-switch-applet/gdm-user-menu-item.c:346
-msgid "Icon Size"
-msgstr "å??ç¤ºå¤§å°?"
+#: ../gui/user-switch-applet/applet.c:1136
+msgid "Lock Screen"
+msgstr "é??å®?è?¢å¹?"
 
-#: ../gui/user-switch-applet/gdm-user-menu-item.c:347
-msgid "The size of the icon to use."
-msgstr "è¦?ä½¿ç?¨ç??å??ç¤ºå¤§å°?ã??"
+#: ../gui/user-switch-applet/applet.c:1147
+msgid "Switch User"
+msgstr "å??æ??ä½¿ç?¨è??"
 
-#: ../gui/user-switch-applet/gdm-user-menu-item.c:353
-msgid "Indicator Size"
-msgstr "æ??æ¨?å¤§å°?"
+#. Only show switch user if there are other users
+#: ../gui/user-switch-applet/applet.c:1158
+msgid "Quit..."
+msgstr "çµ?æ??..."
 
-#: ../gui/user-switch-applet/gdm-user-menu-item.c:354
-msgid "Size of check indicator"
-msgstr "æ ¸å??æ??æ¨?ç??å°ºå¯¸"
+#: ../gui/user-switch-applet/applet.c:1261
+msgid "Unknown"
+msgstr "ä¸?æ??"
 
-#: ../gui/user-switch-applet/gdm-user-menu-item.c:359
-msgid "Indicator Spacing"
-msgstr "æ??æ¨?é??è·?"
+#: ../gui/user-switch-applet/applet.c:1373
+msgid "User Switch Applet"
+msgstr "ä½¿ç?¨è??å??æ??é?¢æ?¿ç¨?å¼?"
 
-#: ../gui/user-switch-applet/gdm-user-menu-item.c:360
-msgid "Space between the username and the indicator"
-msgstr "ä½¿ç?¨è??è??æ??æ¨?ç??é??è·?"
+#: ../gui/user-switch-applet/applet.c:1382
+msgid "Change account settings and status"
+msgstr "æ?¹è®?å¸³è??è¨å®?å?¼è??ç??æ??"
 
 #: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:1
 msgid "A menu to quickly switch between users"
-msgstr "ç?¨ä¾?å?¨ä½¿ç?¨è??é??å¿«é??å??æ??ç??é?¸å?®"
+msgstr "ç?¨ä¾?å¿«é??å??æ??ä½¿ç?¨è??ç??é?¸å?®"
+
+#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:2
+msgid "User Switcher"
+msgstr "ä½¿ç?¨è??å??æ??ç¨?å¼?"
 
 #: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:3
 msgid "User Switcher Applet Factory"
-msgstr "ä½¿ç?¨è??å??æ??ç¨?å¼?å·¥å» "
+msgstr "ä½¿ç?¨è??å??æ??é?¢æ?¿ç¨?å¼?å·¥å» "
 
 #: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:1
 msgid "Edit Personal _Information"
@@ -1042,43 +1056,78 @@ msgstr "é??æ?¼(_A)"
 
 #: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:3
 msgid "_Edit Users and Groups"
-msgstr "ç·¨è¼¯ä½¿ç?¨è??å??ç¾¤çµ?(_E)"
-
-#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:4
-msgid "_Help"
-msgstr "æ±?å?©(_H)"
+msgstr "ç·¨è¼¯ä½¿ç?¨è??è??ç¾¤çµ?(_E)"
 
-#: ../utils/gdmflexiserver.c:60 ../utils/gdmflexiserver.c:61
-#: ../utils/gdmflexiserver.c:62 ../utils/gdmflexiserver.c:64
-#: ../utils/gdmflexiserver.c:65
+#: ../utils/gdmflexiserver.c:61 ../utils/gdmflexiserver.c:62
+#: ../utils/gdmflexiserver.c:63 ../utils/gdmflexiserver.c:65
+#: ../utils/gdmflexiserver.c:66
 msgid "Ignored - retained for compatibility"
 msgstr "å·²å¿½ç?¥ - å?ªç?ºç?¸å®¹æ?§è??ä¿?ç??"
 
-#: ../utils/gdmflexiserver.c:60
+#: ../utils/gdmflexiserver.c:61
 msgid "COMMAND"
 msgstr "æ??ä»¤"
 
-#: ../utils/gdmflexiserver.c:63 ../utils/gdm-screenshot.c:41
+#: ../utils/gdmflexiserver.c:64 ../utils/gdm-screenshot.c:42
 msgid "Debugging output"
 msgstr "å?µé?¯è¼¸å?º"
 
-#: ../utils/gdmflexiserver.c:67
+#: ../utils/gdmflexiserver.c:68
 msgid "Version of this application"
 msgstr "é??å??ç¨?å¼?ç??ç??æ?¬"
 
-#: ../utils/gdmflexiserver.c:674
+#: ../utils/gdmflexiserver.c:675
 #, c-format
 msgid "Could not identify the current session."
 msgstr "ç?¡æ³?è?å?¥ç?®å??ç??ä½?æ¥é??æ®µã??"
 
-#: ../utils/gdmflexiserver.c:710 ../utils/gdm-screenshot.c:230
-msgid "Main Options"
-msgstr "ä¸»é?¸é ?"
+#. Option parsing
+#: ../utils/gdmflexiserver.c:711
+msgid "- New GDM login"
+msgstr "- æ?°ç?? GDM ç?»å?¥"
 
-#: ../utils/gdmflexiserver.c:759
+#: ../utils/gdmflexiserver.c:762
 msgid "Unable to start new display"
 msgstr "ç?¡æ³?å??å??æ?°ç??é¡¯ç¤ºç?«é?¢"
 
+#. Option parsing
+#: ../utils/gdm-screenshot.c:231
+msgid "Take a picture of the screen"
+msgstr "ç?§ä¸?è?¢å¹?å¿«ç?§"
+
+#~ msgid "You have the Caps Lock key on."
+#~ msgstr "æ?¨å·²æ??ä¸?äº? Caps Lockã??"
+
+#~ msgid "User"
+#~ msgstr "ä½¿ç?¨è??"
+
+#~ msgid "The user this menu item represents."
+#~ msgstr "é??å??é?¸å?®é ?ç?®æ??è¡¨ç¤ºç??ä½¿ç?¨è??ã??"
+
+#~ msgid "Icon Size"
+#~ msgstr "å??ç¤ºå¤§å°?"
+
+#~ msgid "The size of the icon to use."
+#~ msgstr "è¦?ä½¿ç?¨ç??å??ç¤ºå¤§å°?ã??"
+
+#~ msgid "Indicator Size"
+#~ msgstr "æ??æ¨?å¤§å°?"
+
+#~ msgid "Size of check indicator"
+#~ msgstr "æ ¸å??æ??æ¨?ç??å°ºå¯¸"
+
+#~ msgid "Indicator Spacing"
+#~ msgstr "æ??æ¨?é??è·?"
+
+#~ msgid "Space between the username and the indicator"
+#~ msgstr "ä½¿ç?¨è??è??æ??æ¨?ç??é??è·?"
+
+#~ msgid "_Help"
+#~ msgstr "æ±?å?©(_H)"
+
+#~ msgid "Main Options"
+#~ msgstr "ä¸»é?¸é ?"
+
 #~ msgid "Accessibility Preferences"
 #~ msgstr "ç?¡é??ç¤?å??å¥½è¨å®?"
 
@@ -1159,9 +1208,6 @@ msgstr "ç?¡æ³?å??å??æ?°ç??é¡¯ç¤ºç?«é?¢"
 #~ msgid "_User:"
 #~ msgstr "ä½¿ç?¨è??(_U):"
 
-#~ msgid "_Preferences"
-#~ msgstr "å??å¥½è¨å®?(_P)"
-
 #~ msgid "_Setup Login Screen"
 #~ msgstr "è¨å®?ç?»å?¥ç?«é?¢(_S)"
 
@@ -1179,7 +1225,7 @@ msgstr "ç?¡æ³?å??å??æ?°ç??é¡¯ç¤ºç?«é?¢"
 #~ msgstr "ä½¿ç?¨è??"
 
 #~ msgid "Other"
-#~ msgstr "å?¶å®?"
+#~ msgstr "å?¶ä»?"
 
 #~ msgid "<span weight=\"bold\" size=\"larger\">Multiple Logins Found</span>"
 #~ msgstr "<span weight=\"bold\" size=\"larger\">ç?¼ç?¾å¤?é??ç?»å?¥</span>"
@@ -1191,7 +1237,7 @@ msgstr "ç?¡æ³?å??å??æ?°ç??é¡¯ç¤ºç?«é?¢"
 #~ msgstr "ç¹¼çº?"
 
 #~ msgid "Create new logins in _nested windows"
-#~ msgstr "å?¨ X_nest è¦?çª?ä»¥å?¦ä¸?å??èº«å??ç?»å?¥"
+#~ msgstr "å?¨å·¢ç??è¦?çª?ä¸å»ºç«?æ?°ç??ç?»å?¥(_N)"
 
 #~ msgid "Details"
 #~ msgstr "è©³ç´°è³?æ??"
@@ -1211,7 +1257,7 @@ msgstr "ç?¡æ³?å??å??æ?°ç??é¡¯ç¤ºç?«é?¢"
 #~ msgstr "æ?¨æ?³è¦?å??æ??ç??ä½¿ç?¨è??å·²å?¨æ¤é?»è?¦é??è¤?ç?»å?¥ã??è¦?å??æ??è?³å?ªå??ç?»å?¥ï¼?"
 
 #~ msgid "Use the `people' icon for the menu title"
-#~ msgstr "å?¨é?¸å?®æ¨?é¡?ä½¿ç?¨ ã??äººç?©ã??å??ç¤º"
+#~ msgstr "å?¨é?¸å?®æ¨?é¡?ä½¿ç?¨ã??äººç?©ã??å??ç¤º"
 
 #~ msgid "Use the current user's name for the menu title"
 #~ msgstr "å?¨é?¸å?®æ¨?é¡?ä½¿ç?¨ç?®å??ç??ä½¿ç?¨è??å??ç¨±"
@@ -1242,9 +1288,6 @@ msgstr "ç?¡æ³?å??å??æ?°ç??é¡¯ç¤ºç?«é?¢"
 #~ msgid "Display Style"
 #~ msgstr "é¡¯ç¤ºæ¨£å¼?"
 
-#~ msgid "Lock Screen After Switch"
-#~ msgstr "å??æ??ä½¿ç?¨è??å¾?é??å®?è?¢å¹?"
-
 #~ msgid "Show \"Login Window\" Menuitem"
 #~ msgstr "é¡¯ç¤ºã??ç?»å?¥è¦?çª?ã??é?¸å?®é ?ç?®"
 
@@ -1290,11 +1333,11 @@ msgstr "ç?¡æ³?å??å??æ?°ç??é¡¯ç¤ºç?«é?¢"
 
 #~ msgid ""
 #~ "Whether or not to lock the screen after switching to a different console."
-#~ msgstr "å??æ??è?³ä¸?å??ç??ä¸»æ?§å?°å¾?æ?¯å?¦é??å®?å??æ??é?¢ã??"
+#~ msgstr "å??æ??è?³ä¸?å??ç??ä¸»æ?§å?°å¾?æ?¯å?¦é??å®?è?¢å¹?ã??"
 
 #~ msgid ""
 #~ "Whether to show only users who are currently logged in, or all users."
-#~ msgstr "å?ªé¡¯ç¤ºç?®å??ç?»å?¥ç??ä½¿ç?¨è??æ??æ?¯æ??æ??ç??ä½¿ç?¨è??ã??"
+#~ msgstr "å?ªé¡¯ç¤ºç?®å??ç?»å?¥ç??ä½¿ç?¨è??ï¼?æ??æ?¯é¡¯ç¤ºæ??æ??ç??ä½¿ç?¨è??ã??"
 
 #~ msgid "User Switcher 2"
 #~ msgstr "ä½¿ç?¨è??å??æ??ç¨?å¼? 2"
@@ -2110,7 +2153,7 @@ msgstr "ç?¡æ³?å??å??æ?°ç??é¡¯ç¤ºç?«é?¢"
 #~ msgstr "è«?è¼¸å?¥ä½¿ç?¨è??å??ç¨±"
 
 #~ msgid "Password:"
-#~ msgstr "å¯?ç¢¼ï¼?"
+#~ msgstr "å¯?ç¢¼:"
 
 #~ msgid "Couldn't authenticate user \"%s\""
 #~ msgstr "ç?¡æ³?èª?è?ä½¿ç?¨è??â??%sâ??"
@@ -2341,9 +2384,6 @@ msgstr "ç?¡æ³?å??å??æ?°ç??é¡¯ç¤ºç?«é?¢"
 #~ msgid "- Nested gdm login chooser"
 #~ msgstr "- Nested gdm ç?»å?¥é?¸æ??ç¨?å¼?"
 
-#~ msgid "- Nested gdm login"
-#~ msgstr "- Nested gdm ç?»å?¥"
-
 #~ msgid "Please ask your system administrator to install it."
 #~ msgstr "è«?è¦?æ±?ç³»çµ±ç®¡ç??å?¡å®?è£?è©²ç¨?å¼?ã??"
 
@@ -2369,7 +2409,7 @@ msgstr "ç?¡æ³?å??å??æ?°ç??é¡¯ç¤ºç?«é?¢"
 #~ msgstr "æ?¾ä¸?å?°ä»»ä½?æ??ä¾?æ??å??ç??ä¸»æ©?ã??"
 
 #~ msgid "Choose a ho_st to connect to:"
-#~ msgstr "é?¸æ??æº?å??é?£æ?¥ç??ä¸»æ©?(_S)ï¼?"
+#~ msgstr "é?¸æ??æº?å??é?£æ?¥ç??ä¸»æ©?(_S):"
 
 #~ msgid ""
 #~ "The host \"%s\" is not willing to support a login session right now.  "
@@ -2444,7 +2484,7 @@ msgstr "ç?¡æ³?å??å??æ?°ç??é¡¯ç¤ºç?«é?¢"
 #~ msgstr "ç?¡æ³?å?·è¡?é?¸æ??ç¨?å¼?"
 
 #~ msgid "A_dd host: "
-#~ msgstr "å? å?¥ä¸»æ©?(_D)ï¼?"
+#~ msgstr "å? å?¥ä¸»æ©?(_D):"
 
 #~ msgid "C_onnect"
 #~ msgstr "é?£ç·?(_O)"
@@ -2522,7 +2562,7 @@ msgstr "ç?¡æ³?å??å??æ?°ç??é¡¯ç¤ºç?«é?¢"
 #~ msgstr "å??è©¦è¨å®?ä¸?æ??ç??æ??ä¸?å?å?¨ç??ç?»å?ºè¡?å??ã??"
 
 #~ msgid "Virtual terminals not supported."
-#~ msgstr "ä¸?æ?¯æ?´è??æ?¬çµ?ç«¯æ©?"
+#~ msgstr "ä¸?æ?¯æ?´è??æ?¬çµ?ç«¯æ©?ã??"
 
 #~ msgid "Trying to change to an invalid virtual terminal number."
 #~ msgstr "å??è©¦è®?æ?´ç?¡æ??ç??è??æ?¬çµ?ç«¯æ©?è??ç¢¼ã??"
@@ -2953,7 +2993,7 @@ msgstr "ç?¡æ³?å??å??æ?°ç??é¡¯ç¤ºç?«é?¢"
 #~ msgstr "ç³»çµ±é ?è¨å?¼"
 
 #~ msgid "_Username:"
-#~ msgstr "ä½¿ç?¨è??å??ç¨±(_U)ï¼?"
+#~ msgstr "ä½¿ç?¨è??å??ç¨±(_U):"
 
 #~ msgid "%s session selected"
 #~ msgstr "å·²é?¸å??â??%sâ??ä½?æ¥é??æ®µ"
@@ -2968,7 +3008,7 @@ msgstr "ç?¡æ³?å??å??æ?°ç??é¡¯ç¤ºç?«é?¢"
 #~ msgstr "ç³»çµ±é ?è¨å?¼(_S)"
 
 #~ msgid "_Password:"
-#~ msgstr "å¯?ç¢¼(_P)ï¼?"
+#~ msgstr "å¯?ç¢¼(_P):"
 
 #~ msgid "Please insert 25 cents to log in."
 #~ msgstr "è«?æ??å?¥å??å??ç¡¬å¹£ä¾?ç?»å?¥ã??"
@@ -2988,9 +3028,6 @@ msgstr "ç?¡æ³?å??å??æ?°ç??é¡¯ç¤ºç?«é?¢"
 #~ msgid "_Theme"
 #~ msgstr "ä½?æ?¯ä¸»é¡?(_T)"
 
-#~ msgid "_Quit"
-#~ msgstr "çµ?æ??(_Q)"
-
 #~ msgid "Welcome"
 #~ msgstr "æ¡è¿?"
 
@@ -3119,7 +3156,7 @@ msgstr "ç?¡æ³?å??å??æ?°ç??é¡¯ç¤ºç?«é?¢"
 #~ msgstr "è?²é?³"
 
 #~ msgid "None"
-#~ msgstr "ç?¡"
+#~ msgstr "æ²?æ??"
 
 #~ msgid "Archive is not of a subdirectory"
 #~ msgstr "æª?æ¡?ä¸æ²?æ??å??å?«ä»»ä½?å?¯ç?®é??"
@@ -3256,19 +3293,19 @@ msgstr "ç?¡æ³?å??å??æ?°ç??é¡¯ç¤ºç?«é?¢"
 #~ msgstr "å??è¨±é? ç«¯ä½¿ç?¨è¨?æ??ç?»å?¥å??è?½(_W)"
 
 #~ msgid "Author:"
-#~ msgstr "ä½?è??ï¼?"
+#~ msgstr "ä½?è??:"
 
 #~ msgid "Background"
 #~ msgstr "è??æ?¯å??æ¡?"
 
 #~ msgid "C_ommand:"
-#~ msgstr "æ??ä»¤(_O)ï¼?"
+#~ msgstr "æ??ä»¤(_O):"
 
 #~ msgid "C_ustom:"
-#~ msgstr "è?ªè¨?(_U)ï¼?"
+#~ msgstr "è?ªè¨?(_U):"
 
 #~ msgid "Co_lor:"
-#~ msgstr "è?²å½©(_L)ï¼?"
+#~ msgstr "è?²å½©(_L):"
 
 #~ msgid "Color depth:"
 #~ msgstr "è?²å½©æ·±åº¦ï¼?"
@@ -3286,7 +3323,7 @@ msgstr "ç?¡æ³?å??å??æ?°ç??é¡¯ç¤ºç?«é?¢"
 #~ msgstr "å??ç?¨ X forwardingï¼?ä½?ä¸?æ??å½±é?¿ XDMCPã??"
 
 #~ msgid "Displays per _host:"
-#~ msgstr "ä¸»æ©?ç??é?£ç·?æ?¸ç?®ä¸?é??(_H)ï¼?"
+#~ msgstr "ä¸»æ©?ç??é?£ç·?æ?¸ç?®ä¸?é??(_H):"
 
 #~ msgid "Do not show image for _remote logins"
 #~ msgstr "å°?é? ç«¯ç?»å?¥ä¸?é¡¯ç¤ºå??ç??(_R)"
@@ -3295,7 +3332,7 @@ msgstr "ç?¡æ³?å??å??æ?°ç??é¡¯ç¤ºç?«é?¢"
 #~ msgstr "å°?é?¤é?¯è¨?æ?¯è¨?é??å?¨ç³»çµ±æ?¥èª?ä¸(_N)"
 
 #~ msgid "E_xclude:"
-#~ msgstr "æ??é?¤(_X)ï¼?"
+#~ msgstr "æ??é?¤(_X):"
 
 #~ msgid "Enable _Timed Login"
 #~ msgstr "å??ç?¨è¨?æ??ç?»å?¥(_T)"
@@ -3314,10 +3351,10 @@ msgstr "ç?¡æ³?å??å??æ?°ç??é¡¯ç¤ºç?«é?¢"
 #~ msgstr "æ?¥å??é??æ?¥ç??ç?»å?¥è¦?æ±?(_I)"
 
 #~ msgid "I_mage:"
-#~ msgstr "å??ç??(_I)ï¼?"
+#~ msgstr "å??ç??(_I):"
 
 #~ msgid "I_nclude:"
-#~ msgstr "å??å?«(_N)ï¼?"
+#~ msgstr "å??å?«(_N):"
 
 #~ msgid "Includ_e Hostname Chooser (XDMCP) menu item"
 #~ msgstr "å??å?«ä¸»æ©?å??ç¨±é?¸æ??å?¨(XDMCP)é?¸å?®é ?ç?®(_E)"
@@ -3326,10 +3363,10 @@ msgstr "ç?¡æ³?å??å??æ?°ç??é¡¯ç¤ºç?«é?¢"
 #~ msgstr "å??å?«è¨å®?é?¸å?®é ?ç?®(_F)"
 
 #~ msgid "L_ogin retry delay:"
-#~ msgstr "å??è©¦ç?»å?¥å»¶é?²(_O)ï¼?"
+#~ msgstr "å??è©¦ç?»å?¥å»¶é?²(_O):"
 
 #~ msgid "La_unch:"
-#~ msgstr "å?·è¡?(_U)ï¼?"
+#~ msgstr "å?·è¡?(_U):"
 
 #~ msgid "Listen on _UDP port: "
 #~ msgstr "é??å?? _UDP é?£æ?¥å? ï¼?"
@@ -3338,25 +3375,25 @@ msgstr "ç?¡æ³?å??å??æ?°ç??é¡¯ç¤ºç?«é?¢"
 #~ msgstr "æ?¬å?°ç«¯"
 
 #~ msgid "Login _failed:"
-#~ msgstr "ç?»å?¥å¤±æ??(_F)ï¼?"
+#~ msgstr "ç?»å?¥å¤±æ??(_F):"
 
 #~ msgid "Login _successful:"
-#~ msgstr "ç?»å?¥æ??å??(_S)ï¼?"
+#~ msgstr "ç?»å?¥æ??å??(_S):"
 
 #~ msgid "Logo"
 #~ msgstr "æ¨?èª?"
 
 #~ msgid "Maximum _pending requests:"
-#~ msgstr "å?¯è??ç??ç??ç?´æ?¥æ?¥è©¢æ?¸ç?®ä¸?é??(_P)ï¼?"
+#~ msgstr "å?¯è??ç??ç??ç?´æ?¥æ?¥è©¢æ?¸ç?®ä¸?é??(_P):"
 
 #~ msgid "Maximum _remote sessions:"
-#~ msgstr "é? ç«¯ä½?æ¥é??æ®µæ?¸ç?®ä¸?é??(_R)ï¼?"
+#~ msgstr "é? ç«¯ä½?æ¥é??æ®µæ?¸ç?®ä¸?é??(_R):"
 
 #~ msgid "Maximum _wait time:"
-#~ msgstr "ç?å¾?æ??é??ä¸?é??(_W)ï¼?"
+#~ msgstr "ç?å¾?æ??é??ä¸?é??(_W):"
 
 #~ msgid "Maximum indirect w_ait time:"
-#~ msgstr "é??æ?¥è¦?æ±?ç?å¾?æ??é??ä¸?é??(_A)ï¼?"
+#~ msgstr "é??æ?¥è¦?æ±?ç?å¾?æ??é??ä¸?é??(_A):"
 
 #~ msgid "Maximum p_ending indirect requests:"
 #~ msgstr "å?¯è??ç??ç??é??æ?¥æ?¥è©¢æ?¸ç?®ä¸?é??(_E):"
@@ -3365,7 +3402,7 @@ msgstr "ç?¡æ³?å??å??æ?°ç??é¡¯ç¤ºç?«é?¢"
 #~ msgstr "é?¸å?®å??"
 
 #~ msgid "Op_tions:\t"
-#~ msgstr "é?¸é ?(_T)ï¼?\t"
+#~ msgstr "é?¸é ?(_T):\t"
 
 #~ msgid "Pick Background Color"
 #~ msgstr "é?¸æ??è??æ?¯è?²å½©"
@@ -3407,9 +3444,6 @@ msgstr "ç?¡æ³?å??å??æ?°ç??é¡¯ç¤ºç?«é?¢"
 #~ msgid "Sc_ale to fit screen"
 #~ msgstr "ç¸®æ?¾ä»¥ç¬¦å??è?¢å¹?(_A)"
 
-#~ msgid "Security"
-#~ msgstr "å®?å?¨æ?§"
-
 #~ msgid "Select Background Image"
 #~ msgstr "å?¦å?è??æ?¯å??ç??"
 
@@ -3430,7 +3464,7 @@ msgstr "ç?¡æ³?å??å??æ?°ç??é¡¯ç¤ºç?«é?¢"
 #~ msgstr "ä¼ºæ??å?¨è¨å®?å?¼"
 
 #~ msgid "Server _name:"
-#~ msgstr "ä¼ºæ??å?¨å??ç¨±(_N)ï¼?"
+#~ msgstr "ä¼ºæ??å?¨å??ç¨±(_N):"
 
 #~ msgid "Servers To Start"
 #~ msgstr "è¦?å??å??ç??ä¼ºæ??å?¨"
@@ -3439,7 +3473,7 @@ msgstr "ç?¡æ³?å??å??æ?°ç??é¡¯ç¤ºç?«é?¢"
 #~ msgstr "ä½?æ?¯ä¸»é¡?"
 
 #~ msgid "U_ser:"
-#~ msgstr "ä½¿ç?¨è??(_S)ï¼?"
+#~ msgstr "ä½¿ç?¨è??(_S):"
 
 #~ msgid "Welcome Message"
 #~ msgstr "æ¡è¿?è¨?æ?¯"
@@ -3463,7 +3497,7 @@ msgstr "ç?¡æ³?å??å??æ?°ç??é¡¯ç¤ºç?«é?¢"
 #~ msgstr "å??è¨±ä½¿ç?¨è??æ?¹è®?ç´?æ??å?æ¡è¿?ç¨?å¼?ç??å?å??è??è?²å½©(_A)"
 
 #~ msgid "_Background color:"
-#~ msgstr "è??æ?¯è?²å½©(_B)ï¼?"
+#~ msgstr "è??æ?¯è?²å½©(_B):"
 
 #~ msgid "_Default: \"Welcome to %n\""
 #~ msgstr "é ?è¨ï¼?ã??æ¡è¿?ä¾?å?° %nã??(_D)"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]