[gdm] Updated Traditional Chinese translation(Hong Kong and Taiwan)

[Chao-Hsiung Liao <chliao src gnome org>]

commit 86c01b00bc900e1d027355c4e7ca966005aab9c8
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Tue Jul 20 15:24:58 2010 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po |  541 +++++++++++++++++++++++++++++++----------------------------
 po/zh_TW.po |  541 +++++++++++++++++++++++++++++++----------------------------
 2 files changed, 562 insertions(+), 520 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 2e8abb3..d47b714 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -12,10 +12,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gdm2 2.29.6\n"
+"Project-Id-Version: gdm2 2.31.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-15 19:04+0800\n"
-"PO-Revision-Date: 2010-02-15 19:04+0800\n"
+"POT-Creation-Date: 2010-07-20 15:24+0800\n"
+"PO-Revision-Date: 2010-07-20 15:24+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"
@@ -28,18 +28,18 @@ msgstr ""
 msgid "/dev/urandom is not a character device"
 msgstr "/dev/urandom ���符�置"
 
-#: ../daemon/factory-slave-main.c:177 ../daemon/product-slave-main.c:181
-#: ../daemon/simple-slave-main.c:183 ../daemon/xdmcp-chooser-slave-main.c:183
+#: ../daemon/factory-slave-main.c:178 ../daemon/product-slave-main.c:182
+#: ../daemon/simple-slave-main.c:182 ../daemon/xdmcp-chooser-slave-main.c:184
 msgid "Display ID"
 msgstr "顯示 ID"
 
-#: ../daemon/factory-slave-main.c:177 ../daemon/product-slave-main.c:181
-#: ../daemon/simple-slave-main.c:183 ../daemon/xdmcp-chooser-slave-main.c:183
+#: ../daemon/factory-slave-main.c:178 ../daemon/product-slave-main.c:182
+#: ../daemon/simple-slave-main.c:182 ../daemon/xdmcp-chooser-slave-main.c:184
 msgid "ID"
 msgstr "ID"
 
-#: ../daemon/factory-slave-main.c:189 ../daemon/product-slave-main.c:193
-#: ../daemon/simple-slave-main.c:195 ../daemon/xdmcp-chooser-slave-main.c:195
+#: ../daemon/factory-slave-main.c:190 ../daemon/product-slave-main.c:194
+#: ../daemon/simple-slave-main.c:194 ../daemon/xdmcp-chooser-slave-main.c:196
 msgid "GNOME Display Manager Slave"
 msgstr "GNOME å¾?屬顯示管ç??ç¨?å¼?"
 
@@ -48,81 +48,78 @@ msgstr "GNOME å¾?屬顯示管ç??ç¨?å¼?"
 msgid "could not find user \"%s\" on system"
 msgstr "å?¨ç³»çµ±ä¸­æ?¾ä¸?å?°ä½¿ç?¨è??ã??%sã??"
 
-#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:225
+#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:258
 msgid "Unable to initialize login system"
 msgstr "ç?¡æ³?å??å§?å??ç?»å?¥ç³»çµ±"
 
-#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:261
+#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:294
 msgid "Unable to authenticate user"
 msgstr "ç?¡æ³?é©?è­?使ç?¨è??"
 
-#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:315
+#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:351
 msgid "Unable to authorize user"
 msgstr "ç?¡æ³?é©?è­?使ç?¨è??"
 
-#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:443
+#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:480
 msgid "Unable to establish credentials"
 msgstr "��建���"
 
-#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:473
+#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:510
 msgid "Unable to open session"
 msgstr "ç?¡æ³?é??å??ä½?業é??段"
 
-#: ../daemon/gdm-factory-slave.c:683 ../daemon/gdm-product-slave.c:449
-#: ../daemon/gdm-simple-slave.c:1151
+#: ../daemon/gdm-factory-slave.c:689 ../daemon/gdm-product-slave.c:449
+#: ../daemon/gdm-simple-slave.c:1196
 msgid ""
-"Could not start the X server (your graphical environment) due to some "
-"internal error. Please contact your system administrator or check your "
-"syslog to diagnose. In the meantime this display will be disabled.  Please "
-"restart GDM when the problem is corrected."
-msgstr "å? ç?ºæ??äº?å?§é?¨é?¯èª¤ï¼?ç?®å??ç?¡æ³?å??å?? X 伺æ??å?¨ï¼?å?³å??å½¢ä»?é?¢ï¼?ã??è«?è?¯çµ¡ç³»çµ±ç®¡ç??å?¡æ??æ?¯æª¢æ?¥ç³»çµ±ç´?é??æª?ã??ç?®å??æ??å??止使ç?¨é??å??顯示ç?«é?¢ã??è«?å?¨ä¿®æ­£å??é¡?å¾?é??æ?°å??å?? GDMã??"
+"Could not start the X server (your graphical environment) due to an internal "
+"error. Please contact your system administrator or check your syslog to "
+"diagnose. In the meantime this display will be disabled.  Please restart GDM "
+"when the problem is corrected."
+msgstr "å? ç?ºæ??äº?å?§é?¨é?¯èª¤ï¼?ç?®å??ç?¡æ³?å??å?? X 伺æ??å?¨ï¼?å?³å??å½¢ä»?é?¢ï¼?ã??è«?è?¯çµ¡ç³»çµ±ç®¡ç??å?¡æ??æ?¯æª¢æ?¥ç³»çµ±ç´?é??æª?ä¾?å?¤æ?·ã??ç?®å??æ??å??止使ç?¨é??å??顯示ç?«é?¢ã??è«?å?¨ä¿®æ­£å??é¡?å¾?é??æ?°å??å?? GDMã??"
 
-#: ../daemon/gdm-server.c:246
+#: ../daemon/gdm-server.c:250
 #, c-format
 msgid "%s: failed to connect to parent display '%s'"
 msgstr "%sï¼?ç?¡æ³?é?£æ?¥ä¸»é¡¯ç¤ºç?«é?¢â??%sâ??"
 
-#: ../daemon/gdm-server.c:361
+#: ../daemon/gdm-server.c:365
 #, c-format
 msgid "Server was to be spawned by user %s but that user doesn't exist"
 msgstr "伺æ??å?¨æ??以使ç?¨è?? %s ç??身å??è¡?ç??ï¼?ä½?該使ç?¨è??ä¸?å­?å?¨"
 
-#: ../daemon/gdm-server.c:372 ../daemon/gdm-welcome-session.c:554
+#: ../daemon/gdm-server.c:376 ../daemon/gdm-server.c:396
+#: ../daemon/gdm-welcome-session.c:598 ../daemon/gdm-welcome-session.c:618
 #, c-format
 msgid "Couldn't set groupid to %d"
 msgstr "��設� groupid � %d"
 
-#: ../daemon/gdm-server.c:378 ../daemon/gdm-welcome-session.c:560
+#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:604
 #, c-format
 msgid "initgroups () failed for %s"
 msgstr "%s ç?? initgroups () 失æ??ã??"
 
-#: ../daemon/gdm-server.c:384 ../daemon/gdm-welcome-session.c:566
+#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:610
 #, c-format
 msgid "Couldn't set userid to %d"
 msgstr "��設� userid � %d"
 
-#: ../daemon/gdm-server.c:392 ../daemon/gdm-welcome-session.c:574
-msgid "Couldn't set groupid to 0"
-msgstr "��設� groupid � 0"
-
-#: ../daemon/gdm-server.c:431
+#: ../daemon/gdm-server.c:435
 #, c-format
-msgid "%s: Could not open logfile for display %s!"
-msgstr "%sï¼?ç?¡æ³?é??å??顯示ç?«é?¢ %s ç??ç´?é??æª?ï¼?"
+msgid "%s: Could not open log file for display %s!"
+msgstr "%sï¼?ç?¡æ³?é??å??顯示 %s ç??ç´?é??æª?æ¡?ï¼?"
 
-#: ../daemon/gdm-server.c:442 ../daemon/gdm-server.c:448
-#: ../daemon/gdm-server.c:454
+#: ../daemon/gdm-server.c:446 ../daemon/gdm-server.c:452
+#: ../daemon/gdm-server.c:458
 #, c-format
 msgid "%s: Error setting %s to %s"
 msgstr "%sï¼?å°? %s 設å®?ç?º %s æ??ç?¼ç??é?¯èª¤"
 
-#: ../daemon/gdm-server.c:469
+#: ../daemon/gdm-server.c:478
 #, c-format
 msgid "%s: Server priority couldn't be set to %d: %s"
 msgstr "%sï¼?伺æ??å?¨å?ªå??ç­?ç´?ç?¡æ³?設å®?ç?º %dï¼?%s"
 
-#: ../daemon/gdm-server.c:621
+#: ../daemon/gdm-server.c:631
 #, c-format
 msgid "%s: Empty server command for display %s"
 msgstr "%sï¼?顯示ç?«é?¢ %s ç??伺æ??å?¨æ??令æ?¯ç©ºç?½ç??"
@@ -133,7 +130,7 @@ msgstr "使ç?¨è??å??稱"
 
 #: ../daemon/gdm-session-auditor.c:91
 msgid "The username"
-msgstr "使ç?¨è??å??稱"
+msgstr "使ç?¨è??ç??å??稱"
 
 #: ../daemon/gdm-session-auditor.c:95
 msgid "Hostname"
@@ -141,7 +138,7 @@ msgstr "主æ©?å??稱"
 
 #: ../daemon/gdm-session-auditor.c:96
 msgid "The hostname"
-msgstr "主æ©?å??稱"
+msgstr "主æ©?ç??å??稱"
 
 #: ../daemon/gdm-session-auditor.c:101
 msgid "Display Device"
@@ -151,216 +148,216 @@ msgstr "顯示�置"
 msgid "The display device"
 msgstr "顯示�置"
 
-#: ../daemon/gdm-session-worker.c:1298
+#: ../daemon/gdm-session-worker.c:1309
 #, c-format
-msgid "error initiating conversation with authentication system - %s"
-msgstr "é©?è­?系統å??å§?å??交è«?ç?¼ç??é?¯èª¤ - %s"
+msgid "error initiating conversation with authentication system: %s"
+msgstr "é©?è­?系統å??å§?å??交è«?ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: ../daemon/gdm-session-worker.c:1299
+#: ../daemon/gdm-session-worker.c:1310
 msgid "general failure"
 msgstr "ä¸?è?¬æ?§å¤±æ??"
 
-#: ../daemon/gdm-session-worker.c:1300
+#: ../daemon/gdm-session-worker.c:1311
 msgid "out of memory"
 msgstr "è¨?æ?¶é«?è??ç?¡"
 
-#: ../daemon/gdm-session-worker.c:1301
+#: ../daemon/gdm-session-worker.c:1312
 msgid "application programmer error"
 msgstr "æ??ç?¨ç¨?å¼?é?¯èª¤"
 
-#: ../daemon/gdm-session-worker.c:1302
+#: ../daemon/gdm-session-worker.c:1313
 msgid "unknown error"
 msgstr "ä¸?æ??ç??é?¯èª¤"
 
-#: ../daemon/gdm-session-worker.c:1309
+#: ../daemon/gdm-session-worker.c:1320
 msgid "Username:"
 msgstr "使ç?¨è??å??稱:"
 
-#: ../daemon/gdm-session-worker.c:1315
+#: ../daemon/gdm-session-worker.c:1326
 #, c-format
-msgid "error informing authentication system of preferred username prompt - %s"
-msgstr "以é¦?é?¸ç??使ç?¨è??å??稱æ??示é??ç?¥é©?è­?系統æ??ç?¼ç??é?¯èª¤ - %s"
+msgid "error informing authentication system of preferred username prompt: %s"
+msgstr "以é¦?é?¸ç??使ç?¨è??å??稱æ??示é??ç?¥é©?è­?系統æ??ç?¼ç??é?¯èª¤ï¼? %s"
 
-#: ../daemon/gdm-session-worker.c:1329
+#: ../daemon/gdm-session-worker.c:1340
 #, c-format
-msgid "error informing authentication system of user's hostname - %s"
-msgstr "以使ç?¨è??ç??主æ©?å??稱é??ç?¥é©?è­?系統æ??ç?¼ç??é?¯èª¤ - %s"
+msgid "error informing authentication system of user's hostname: %s"
+msgstr "以使ç?¨è??ç??主æ©?å??稱é??ç?¥é©?è­?系統æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: ../daemon/gdm-session-worker.c:1344
+#: ../daemon/gdm-session-worker.c:1355
 #, c-format
-msgid "error informing authentication system of user's console - %s"
-msgstr "以使ç?¨è??ç??主æ?§å?°é??ç?¥é©?è­?系統æ??ç?¼ç??é?¯èª¤ - %s"
+msgid "error informing authentication system of user's console: %s"
+msgstr "以使ç?¨è??ç??主æ?§å?°é??ç?¥é©?è­?系統æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: ../daemon/gdm-session-worker.c:1357
+#: ../daemon/gdm-session-worker.c:1368
 #, c-format
-msgid "error informing authentication system of display string - %s"
-msgstr "以顯示å­?串é??ç?¥é©?è­?系統æ??ç?¼ç??é?¯èª¤ - %s"
+msgid "error informing authentication system of display string: %s"
+msgstr "以顯示å­?串é??ç?¥é©?è­?系統æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: ../daemon/gdm-session-worker.c:1372
+#: ../daemon/gdm-session-worker.c:1383
 #, c-format
-msgid "error informing authentication system of display xauth credentials - %s"
-msgstr "以顯示 xauth è­?æ?¸é??ç?¥é©?è­?系統æ??ç?¼ç??é?¯èª¤ - %s"
+msgid "error informing authentication system of display xauth credentials: %s"
+msgstr "以顯示 xauth è­?æ?¸é??ç?¥é©?è­?系統æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: ../daemon/gdm-session-worker.c:1661 ../daemon/gdm-session-worker.c:1680
+#: ../daemon/gdm-session-worker.c:1675 ../daemon/gdm-session-worker.c:1692
 #, c-format
 msgid "no user account available"
 msgstr "æ²?æ??å?¯ç?¨ç??使ç?¨è??帳è??"
 
-#: ../daemon/gdm-session-worker.c:1707
+#: ../daemon/gdm-session-worker.c:1719
 msgid "Unable to change to user"
 msgstr "ç?¡æ³?æ?¹è®?ç?ºä½¿ç?¨è??"
 
-#: ../daemon/gdm-welcome-session.c:532
+#: ../daemon/gdm-welcome-session.c:548
 #, c-format
 msgid "User %s doesn't exist"
 msgstr "使ç?¨è?? %s ä¸?å­?å?¨"
 
-#: ../daemon/gdm-welcome-session.c:539
+#: ../daemon/gdm-welcome-session.c:555
 #, c-format
 msgid "Group %s doesn't exist"
 msgstr "羣� %s ���"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:596
+#: ../daemon/gdm-xdmcp-display-factory.c:604
 msgid "Could not create socket!"
 msgstr "��建� socket�"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:865
+#: ../daemon/gdm-xdmcp-display-factory.c:873
 #, c-format
 msgid "Denied XDMCP query from host %s"
 msgstr "æ??çµ?ç?±ä¸»æ©? %s ç?¼å?ºç?? XDMCP æ?¥è©¢"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:1023
-#: ../daemon/gdm-xdmcp-display-factory.c:1247
+#: ../daemon/gdm-xdmcp-display-factory.c:1031
+#: ../daemon/gdm-xdmcp-display-factory.c:1255
 msgid "Could not extract authlist from packet"
 msgstr "ç?¡æ³?å¾?å°?å??中è®?å?? authlist"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:1036
-#: ../daemon/gdm-xdmcp-display-factory.c:1262
+#: ../daemon/gdm-xdmcp-display-factory.c:1044
+#: ../daemon/gdm-xdmcp-display-factory.c:1270
 msgid "Error in checksum"
 msgstr "檢�碼���誤"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:1515
+#: ../daemon/gdm-xdmcp-display-factory.c:1523
 msgid "Bad address"
 msgstr "ä½?å??é?¯èª¤"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:1599
+#: ../daemon/gdm-xdmcp-display-factory.c:1607
 #, c-format
 msgid "%s: Could not read display address"
 msgstr "%sï¼?ç?¡æ³?è®?å??ç?«é?¢ä½?å??"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:1607
+#: ../daemon/gdm-xdmcp-display-factory.c:1615
 #, c-format
 msgid "%s: Could not read display port number"
 msgstr "%sï¼?ç?¡æ³?è®?å??ç?«é?¢æ??ç?¨ç??é?£æ?¥å? è??碼"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:1616
+#: ../daemon/gdm-xdmcp-display-factory.c:1624
 #, c-format
 msgid "%s: Could not extract authlist from packet"
 msgstr "%sï¼?ç?¡æ³?å¾?å°?å??中è®?å?? authlist"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:1636
+#: ../daemon/gdm-xdmcp-display-factory.c:1644
 #, c-format
 msgid "%s: Error in checksum"
 msgstr "%s�檢�碼���誤"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2155
+#: ../daemon/gdm-xdmcp-display-factory.c:2200
 #, c-format
 msgid "%s: Got REQUEST from banned host %s"
 msgstr "%sï¼?已被æ??çµ?ç??主æ©? %s ç?¼å?ºè¦?æ±?"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2165
-#: ../daemon/gdm-xdmcp-display-factory.c:2521
-#: ../daemon/gdm-xdmcp-display-factory.c:2775
+#: ../daemon/gdm-xdmcp-display-factory.c:2210
+#: ../daemon/gdm-xdmcp-display-factory.c:2568
+#: ../daemon/gdm-xdmcp-display-factory.c:2822
 #, c-format
 msgid "%s: Could not read Display Number"
 msgstr "%sï¼?ç?¡æ³?è®?å??顯示ç?«é?¢ç·¨è??"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2172
+#: ../daemon/gdm-xdmcp-display-factory.c:2217
 #, c-format
 msgid "%s: Could not read Connection Type"
 msgstr "%sï¼?ç?¡æ³?è®?å??é?£ç·?æ?¹å¼?"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2179
+#: ../daemon/gdm-xdmcp-display-factory.c:2224
 #, c-format
 msgid "%s: Could not read Client Address"
 msgstr "%sï¼?ç?¡æ³?è®?å??客æ?¶ç«¯ä½?å??"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2187
+#: ../daemon/gdm-xdmcp-display-factory.c:2232
 #, c-format
 msgid "%s: Could not read Authentication Names"
 msgstr "%sï¼?ç?¡æ³?è®?å??èª?è­?å??稱"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2196
+#: ../daemon/gdm-xdmcp-display-factory.c:2241
 #, c-format
 msgid "%s: Could not read Authentication Data"
 msgstr "%sï¼?ç?¡æ³?è®?å??èª?è­?è³?æ??"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2206
+#: ../daemon/gdm-xdmcp-display-factory.c:2251
 #, c-format
 msgid "%s: Could not read Authorization List"
 msgstr "%sï¼?ç?¡æ³?è®?å??æ??æ¬?æ¸?å?®"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2225
+#: ../daemon/gdm-xdmcp-display-factory.c:2270
 #, c-format
 msgid "%s: Could not read Manufacturer ID"
 msgstr "%sï¼?ç?¡æ³?è®?å??å» å??è­?å?¥ç¢¼"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2252
+#: ../daemon/gdm-xdmcp-display-factory.c:2297
 #, c-format
 msgid "%s: Failed checksum from %s"
 msgstr "%sï¼?å¾? %s å¾?å?°é?¯èª¤ç??檢æ?¥ç¢¼"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2505
+#: ../daemon/gdm-xdmcp-display-factory.c:2552
 #, c-format
 msgid "%s: Got Manage from banned host %s"
 msgstr "%sï¼?已被æ??çµ?ç??主æ©? %s ç?¼å?ºç®¡ç??è¨?æ?¯"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2514
-#: ../daemon/gdm-xdmcp-display-factory.c:2782
+#: ../daemon/gdm-xdmcp-display-factory.c:2561
+#: ../daemon/gdm-xdmcp-display-factory.c:2829
 #, c-format
 msgid "%s: Could not read Session ID"
 msgstr "%sï¼?ç?¡æ³?è®?å??ä½?業é??段è­?å?¥ç¢¼"
 
 # FIXME: What is display class?
-#: ../daemon/gdm-xdmcp-display-factory.c:2528
+#: ../daemon/gdm-xdmcp-display-factory.c:2575
 #, c-format
 msgid "%s: Could not read Display Class"
 msgstr "%sï¼?ç?¡æ³?è®?å??顯示ç?«é?¢ç??é¡?å?¥"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2634
-#: ../daemon/gdm-xdmcp-display-factory.c:2684
-#: ../daemon/gdm-xdmcp-display-factory.c:2690
+#: ../daemon/gdm-xdmcp-display-factory.c:2681
+#: ../daemon/gdm-xdmcp-display-factory.c:2731
+#: ../daemon/gdm-xdmcp-display-factory.c:2737
 #, c-format
 msgid "%s: Could not read address"
 msgstr "%sï¼?ç?¡æ³?è®?å??ä½?å??"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2765
+#: ../daemon/gdm-xdmcp-display-factory.c:2812
 #, c-format
 msgid "%s: Got KEEPALIVE from banned host %s"
 msgstr "%sï¼?已被æ??çµ?ç??主æ©? %s ç?¼å?º KEEPALIVE è¨?æ?¯"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2854
+#: ../daemon/gdm-xdmcp-display-factory.c:2902
 msgid "GdmXdmcpDisplayFactory: Could not read XDMCP header!"
 msgstr "GdmXdmcpDisplayFactoryï¼?ç?¡æ³?è®?å?? XDMCP æ¨?é ­ï¼?"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2860
-#: ../gui/simple-chooser/gdm-host-chooser-widget.c:226
+#: ../daemon/gdm-xdmcp-display-factory.c:2908
+#: ../gui/simple-chooser/gdm-host-chooser-widget.c:227
 msgid "XMDCP: Incorrect XDMCP version!"
 msgstr "XMDCPï¼?XDMCP ç??æ?¬ä¸?正確ï¼?"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2866
-#: ../gui/simple-chooser/gdm-host-chooser-widget.c:232
+#: ../daemon/gdm-xdmcp-display-factory.c:2914
+#: ../gui/simple-chooser/gdm-host-chooser-widget.c:233
 msgid "XMDCP: Unable to parse address"
 msgstr "XMDCPï¼?ç?¡æ³?解æ??ä½?å??"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:3311
+#: ../daemon/gdm-xdmcp-display-factory.c:3359
 #, c-format
 msgid "Could not get server hostname: %s!"
 msgstr "ç?¡æ³?å??å¾?伺æ??å?¨ä¸»æ©?å??稱ï¼?%sï¼?"
 
 #: ../daemon/main.c:237 ../daemon/main.c:250
 #, c-format
-msgid "Cannot write PID file %s: possibly out of diskspace: %s"
+msgid "Cannot write PID file %s: possibly out of disk space: %s"
 msgstr "ç?¡æ³?寫å?¥ PID æª? %sï¼?å?¯è?½æ?¯ç£?ç¢?空é??ä¸?足ï¼?%s"
 
 #: ../daemon/main.c:271
@@ -411,8 +408,8 @@ msgid "Make all warnings fatal"
 msgstr "æ??æ??æ??ç??è­¦å??è¨?æ?¯é?½ç?¶æ??å?´é??é?¯èª¤"
 
 #: ../daemon/main.c:534
-msgid "Exit after a time - for debugging"
-msgstr "å?¨ä¸?å®?æ??é??å¾?é?¢é??â??é?¤é?¯å°?ç?¨"
+msgid "Exit after a time (for debugging)"
+msgstr "ä¸?段æ??é??å¾?é?¢é??ï¼?é?¤é?¯ç?¨ï¼?"
 
 #: ../daemon/main.c:535
 msgid "Print GDM version"
@@ -423,20 +420,22 @@ msgid "GNOME Display Manager"
 msgstr "GNOME ç?»å?¥ç®¡ç??å?¡"
 
 #. make sure the pid file doesn't get wiped
-#: ../daemon/main.c:611
+#: ../daemon/main.c:616
 msgid "Only the root user can run GDM"
 msgstr "å?ªæ?? root 使ç?¨è??å?¯ä»¥å?·è¡? GDM"
 
-#: ../daemon/session-worker-main.c:156
+#. Translators: worker is a helper process that does the work
+#. of starting up a session
+#: ../daemon/session-worker-main.c:158
 msgid "GNOME Display Manager Session Worker"
 msgstr "GNOME ç?»å?¥ç®¡ç??å?¡å·¥ä½?é??段ç??å·¥ä½?ç¨?åº?"
 
 #: ../data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in.h:1
-msgid "AT SPI Registry Wrapper"
-msgstr "AT SPI 註å??表è½?æ??å?¨"
+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:1434
+#: ../gui/simple-greeter/gdm-greeter-login-window.c:1632
 msgid "Login Window"
 msgstr "����"
 
@@ -461,12 +460,12 @@ msgid "Magnify parts of the screen"
 msgstr "è?¢å¹?ç??æ?¾å¤§é?¨ä»½"
 
 #: ../data/greeter-autostart/gok.desktop.in.h:1
-msgid "GNOME Onscreen Keyboard"
+msgid "GNOME On-Screen Keyboard"
 msgstr "GNOME ����"
 
 #: ../data/greeter-autostart/gok.desktop.in.h:2
-msgid "Use an onscreen keyboard"
-msgstr "使�����"
+msgid "Use an on-screen keyboard"
+msgstr "使ç?¨é¡¯ç¤ºå?¨è?¢å¹?ä¸?ç??é?µç?¤"
 
 #: ../data/greeter-autostart/metacity.desktop.in.h:1
 msgid "Metacity"
@@ -488,43 +487,43 @@ msgstr "PolicyKit é©?è­?代ç??ç¨?å¼?"
 msgid "Select System"
 msgstr "é?¸æ??系統"
 
-#: ../gui/simple-chooser/gdm-host-chooser-widget.c:213
+#: ../gui/simple-chooser/gdm-host-chooser-widget.c:215
 msgid "XDMCP: Could not create XDMCP buffer!"
 msgstr "XDMCP���建� XDMCP 緩��"
 
-#: ../gui/simple-chooser/gdm-host-chooser-widget.c:220
+#: ../gui/simple-chooser/gdm-host-chooser-widget.c:221
 msgid "XDMCP: Could not read XDMCP header!"
 msgstr "XDMCPï¼?ç?¡æ³?è®?å?? XDMCP æ¨?é ­ï¼?"
 
-#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:244
+#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:250
 msgid "Value"
 msgstr "��"
 
-#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:245
+#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:251
 msgid "percentage of time complete"
 msgstr "å®?æ??æ??é??ç?¾å??æ¯?"
 
-#: ../gui/simple-greeter/gdm-chooser-widget.c:1281
+#: ../gui/simple-greeter/gdm-chooser-widget.c:1459
 msgid "Inactive Text"
 msgstr "æ?ªä½¿ç?¨ç??æ??å­?"
 
-#: ../gui/simple-greeter/gdm-chooser-widget.c:1282
+#: ../gui/simple-greeter/gdm-chooser-widget.c:1460
 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:1290
+#: ../gui/simple-greeter/gdm-chooser-widget.c:1468
 msgid "Active Text"
 msgstr "使ç?¨ä¸­ç??æ??å­?"
 
-#: ../gui/simple-greeter/gdm-chooser-widget.c:1291
+#: ../gui/simple-greeter/gdm-chooser-widget.c:1469
 msgid "The text to use in the label if the user has picked an item"
 msgstr "è?¥ä½¿ç?¨è??å·²æ??é?¸æ??å??é ?ç?®ï¼?è¦?å?¨æ¨?籤中使ç?¨ç??æ??å­?"
 
-#: ../gui/simple-greeter/gdm-chooser-widget.c:1300
+#: ../gui/simple-greeter/gdm-chooser-widget.c:1478
 msgid "List Visible"
 msgstr "�����"
 
-#: ../gui/simple-greeter/gdm-chooser-widget.c:1301
+#: ../gui/simple-greeter/gdm-chooser-widget.c:1479
 msgid "Whether the chooser list is visible"
 msgstr "æ?¯å?¦é¡¯ç¤ºé?¸æ??ç¨?å¼?æ¸?å?®"
 
@@ -549,14 +548,6 @@ msgstr "%b %e %a, %p %l:%M"
 msgid "%a %l:%M:%S %p"
 msgstr "%a %p %l:%M:%S"
 
-#. translators: This is the time format to use for the date
-#.
-#: ../gui/simple-greeter/gdm-clock-widget.c:87
-#: ../gui/simple-greeter/gdm-clock-widget.c:94
-#, c-format
-msgid "%x"
-msgstr "%x"
-
 #. translators: This is the time format to use when there is
 #. * no date, just weekday and time without seconds.
 #.
@@ -564,77 +555,93 @@ msgstr "%x"
 msgid "%a %l:%M %p"
 msgstr "%a %p %l:%M"
 
-#: ../gui/simple-greeter/gdm-greeter-login-window.c:278
-msgid "Automatically logging in..."
-msgstr "æ­£å?¨è?ªå??ç?»å?¥..."
-
-#. need to wait for response from backend
-#: ../gui/simple-greeter/gdm-greeter-login-window.c:570
-msgid "Cancelling..."
-msgstr "æ­£å?¨å??æ¶?..."
+#: ../gui/simple-greeter/gdm-greeter-login-window.c:290
+msgid "Automatically logging inâ?¦"
+msgstr "æ­£å?¨è?ªå??ç?»å?¥â?¦"
 
-#: ../gui/simple-greeter/gdm-greeter-login-window.c:870
+#: ../gui/simple-greeter/gdm-greeter-login-window.c:576
 msgid "Select language and click Log In"
 msgstr "é?¸æ??èª?è¨?並æ??ä¸?ã??ç?»å?¥ã??"
 
+#. need to wait for response from backend
+#: ../gui/simple-greeter/gdm-greeter-login-window.c:689
+msgid "Cancellingâ?¦"
+msgstr "æ­£å?¨å??æ¶?â?¦"
+
 #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1
 msgid "Computer Name"
 msgstr "é?»è?¦å??稱"
 
 #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2
-msgid "Log In"
+msgid "Login"
 msgstr "��"
 
 #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3
+msgid "Unlock"
+msgstr "解é??"
+
+#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4
 msgid "Version"
 msgstr "ç??æ?¬"
 
-#: ../gui/simple-greeter/gdm-greeter-panel.c:852
+#: ../gui/simple-greeter/gdm-greeter-panel.c:740
 msgid "Panel"
 msgstr "��"
 
-#: ../gui/simple-greeter/gdm-greeter-panel.c:923
-msgid "Shutdown Options..."
-msgstr "é??æ©?é?¸é ?..."
+#: ../gui/simple-greeter/gdm-greeter-panel.c:805
+msgid "Shutdown Optionsâ?¦"
+msgstr "é??æ©?é?¸é ?â?¦"
 
-#: ../gui/simple-greeter/gdm-greeter-panel.c:945
+#: ../gui/simple-greeter/gdm-greeter-panel.c:827
 msgid "Suspend"
 msgstr "æ?«å??"
 
-#: ../gui/simple-greeter/gdm-greeter-panel.c:950
+#: ../gui/simple-greeter/gdm-greeter-panel.c:832
 msgid "Restart"
 msgstr "é??æ?°å??å??"
 
-#: ../gui/simple-greeter/gdm-greeter-panel.c:954
+#: ../gui/simple-greeter/gdm-greeter-panel.c:836
 msgid "Shut Down"
 msgstr "é??é??é?»è?¦"
 
+#: ../gui/simple-greeter/gdm-greeter-panel.c:1111
+msgctxt "customsession"
+msgid "Custom"
+msgstr "��"
+
+#: ../gui/simple-greeter/gdm-greeter-panel.c:1112
+msgid "Custom session"
+msgstr "è?ªé?¸ä½?業é??段"
+
 #: ../gui/simple-greeter/gdm-language-chooser-dialog.c:201
 msgid "Languages"
 msgstr "��"
 
-#: ../gui/simple-greeter/gdm-language-chooser-widget.c:274
+#: ../gui/simple-greeter/gdm-language-chooser-widget.c:276
 msgid "_Languages:"
 msgstr "��(_L):"
 
-#: ../gui/simple-greeter/gdm-language-chooser-widget.c:275
-#: ../gui/simple-greeter/gdm-language-option-widget.c:274
+#: ../gui/simple-greeter/gdm-language-chooser-widget.c:277
 msgid "_Language:"
 msgstr "��(_L):"
 
 #. translators: This brings up a dialog
 #. * with a list of languages to choose from
 #.
-#: ../gui/simple-greeter/gdm-language-option-widget.c:243
+#: ../gui/simple-greeter/gdm-language-option-widget.c:231
 msgctxt "language"
-msgid "Other..."
-msgstr "��..."
+msgid "Otherâ?¦"
+msgstr "���"
 
-#: ../gui/simple-greeter/gdm-language-option-widget.c:244
+#: ../gui/simple-greeter/gdm-language-option-widget.c:232
 msgid "Choose a language from the full list of available languages."
 msgstr "å¾?å®?æ?´ç??å?¯ç?¨èª?è¨?æ¸?å?®ä¸­é?¸æ??èª?è¨?ã??"
 
-#: ../gui/simple-greeter/gdm-languages.c:698
+#: ../gui/simple-greeter/gdm-language-option-widget.c:262
+msgid "Language"
+msgstr "��"
+
+#: ../gui/simple-greeter/gdm-languages.c:699
 msgid "Unspecified"
 msgstr "æ?ªæ??å®?"
 
@@ -642,45 +649,48 @@ msgstr "æ?ªæ??å®?"
 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:266
+#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:202
+#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:203
 msgid "_Keyboard:"
 msgstr "��(_K):"
 
 #. translators: This brings up a dialog of
 #. * available keyboard layouts
 #.
-#: ../gui/simple-greeter/gdm-layout-option-widget.c:235
+#: ../gui/simple-greeter/gdm-layout-option-widget.c:223
 msgctxt "keyboard"
-msgid "Other..."
-msgstr "��..."
+msgid "Otherâ?¦"
+msgstr "���"
 
-#: ../gui/simple-greeter/gdm-layout-option-widget.c:236
+#: ../gui/simple-greeter/gdm-layout-option-widget.c:224
 msgid "Choose a keyboard layout from the full list of available layouts."
 msgstr "å¾?å®?æ?´ç??å?¯ç?¨é?µç?¤é??ç½®æ¸?å?®ä¸­é?¸æ??é?µç?¤é??ç½®ã??"
 
-#: ../gui/simple-greeter/gdm-option-widget.c:507
+#: ../gui/simple-greeter/gdm-layout-option-widget.c:254
+msgid "Keyboard"
+msgstr "��"
+
+#: ../gui/simple-greeter/gdm-option-widget.c:505
 msgid "Label Text"
 msgstr "æ¨?籤æ??å­?"
 
-#: ../gui/simple-greeter/gdm-option-widget.c:508
+#: ../gui/simple-greeter/gdm-option-widget.c:506
 msgid "The text to use as a label"
 msgstr "è¦?ç?¨å??æ¨?籤ç??æ??å­?"
 
-#: ../gui/simple-greeter/gdm-option-widget.c:515
+#: ../gui/simple-greeter/gdm-option-widget.c:513
 msgid "Icon name"
 msgstr "å??示å??稱"
 
-#: ../gui/simple-greeter/gdm-option-widget.c:516
+#: ../gui/simple-greeter/gdm-option-widget.c:514
 msgid "The icon to use with the label"
 msgstr "è¦?è??æ¨?籤ä¸?起使ç?¨ç??å??示"
 
-#: ../gui/simple-greeter/gdm-option-widget.c:524
+#: ../gui/simple-greeter/gdm-option-widget.c:522
 msgid "Default Item"
 msgstr "é ?設ç??é ?ç?®"
 
-#: ../gui/simple-greeter/gdm-option-widget.c:525
+#: ../gui/simple-greeter/gdm-option-widget.c:523
 msgid "The ID of the default item"
 msgstr "é ?設é ?ç?®ç?? ID"
 
@@ -694,8 +704,8 @@ msgstr "å?¨æ¸?å?®ä¸­ä¿?å­?é ?ç?®æ?¸é??ç??æ??大å?¼"
 
 #: ../gui/simple-greeter/gdm-remote-login-window.c:188
 #, c-format
-msgid "Remote Login (Connecting to %s...)"
-msgstr "é? 端ç?»å?¥(é?£ç·?è?³ %s...)"
+msgid "Remote Login (Connecting to %sâ?¦)"
+msgstr "é? 端ç?»å?¥ï¼?é?£ç·?è?³ %sâ?¦ï¼?"
 
 #: ../gui/simple-greeter/gdm-remote-login-window.c:202
 #, c-format
@@ -707,8 +717,8 @@ msgid "Remote Login"
 msgstr "é? 端ç?»å?¥"
 
 #: ../gui/simple-greeter/gdm-session-option-widget.c:162
-msgid "_Sessions:"
-msgstr "ä½?業é??段(_S):"
+msgid "Session"
+msgstr "ä½?業é??段"
 
 #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:1
 msgid "Banner message text"
@@ -760,11 +770,11 @@ msgstr "ç?®å??é?¸å??ç??èª?è¨?"
 
 #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13
 msgid ""
-"Set to a list of keyboard layouts to be shown by default at the login window."
+"Set to a list of keyboard layouts to be shown by default in the login window."
 msgstr "設å®?é ?設å?¨ç?»å?¥è¦?çª?中顯示é?µç?¤é??ç½®ç??æ¸?å?®ã??"
 
 #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14
-msgid "Set to a list of languages to be shown by default at the login window."
+msgid "Set to a list of languages to be shown by default in the login window."
 msgstr "設å®?é ?設å?¨ç?»å?¥è¦?çª?中顯示èª?è¨?ç??æ¸?å?®ã??"
 
 #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15
@@ -780,39 +790,39 @@ msgid "Set to true to disable showing the restart buttons in the login window."
 msgstr "設ç?º true å??ä¸?å?¨ç?»å?¥è¦?çª?中顯示é??æ?°å??å??æ??é??ã??"
 
 #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18
+msgid "Set to true to enable the XRandR settings manager plugin."
+msgstr "設ç?º true å??å??ç?¨ XRandR 設å®?管ç??å¤?æ??ç¨?å¼?ã??"
+
+#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19
 msgid "Set to true to enable the background settings manager plugin."
 msgstr "設ç?º true å??å??ç?¨è??æ?¯è¨­å®?管ç??å¤?æ??ç¨?å¼?ã??"
 
-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19
+#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20
 msgid "Set to true to enable the media-keys settings manager plugin."
 msgstr "設ç?º true å??å??ç?¨åª?é«?æ??é?µè¨­å®?管ç??å¤?æ??ç¨?å¼?ã??"
 
-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20
+#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21
 msgid "Set to true to enable the on-screen keyboard."
 msgstr "設ç?º true å??å??ç?¨è?¢å¹?é?µç?¤ã??"
 
-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21
+#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22
 msgid ""
 "Set to true to enable the plugin to manage the accessibility keyboard "
 "settings."
 msgstr "設ç?º true å??å??ç?¨è¨­å®?管ç??é?µç?¤ç?¡é??ç¤?å??è?½è¨­å®?å?¼ç??å¤?æ??ç¨?å¼?ã??"
 
-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22
+#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23
 msgid "Set to true to enable the screen magnifier."
 msgstr "設ç?º true å??å??ç?¨è?¢å¹?æ?¾å¤§é?¡ã??"
 
-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23
+#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24
 msgid "Set to true to enable the screen reader."
 msgstr "設ç?º true å??å??ç?¨è?¢å¹?é?±è®?å?¨ã??"
 
-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24
+#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25
 msgid "Set to true to enable the sound settings manager plugin."
 msgstr "設ç?º true å??å??ç?¨é?³æ??設å®?管ç??å¤?æ??ç¨?å¼?ã??"
 
-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25
-msgid "Set to true to enable the xrandr settings manager plugin."
-msgstr "設ç?º true å??å??ç?¨ xrandr 設å®?管ç??å¤?æ??ç¨?å¼?ã??"
-
 #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26
 msgid "Set to true to enable the xsettings settings manager plugin."
 msgstr "設ç?º true å??å??ç?¨ xsettings 設å®?管ç??å¤?æ??ç¨?å¼?ã??"
@@ -822,42 +832,42 @@ msgid "Set to true to show the banner message text."
 msgstr "設ç?º true å??顯示橫å¹?è¨?æ?¯æ??å­?ã??"
 
 #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28
-msgid "Set to true to use compiz as the window manager."
-msgstr "設ç?º true å??使ç?¨ compiz å??ç?ºè¦?çª?管ç??ç¨?å¼?ã??"
+msgid "Set to true to use Compiz as the window manager."
+msgstr "設ç?º true å??使ç?¨ Compiz ä½?ç?ºè¦?çª?管ç??ç¨?å¼?ã??"
 
 #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29
 msgid ""
-"Text banner message to show on the login window when the user chooser is "
+"Text banner message to show in the login window when the user chooser is "
 "empty, instead of banner_message_text."
 msgstr "ç?¶é?¸æ??ç¨?å¼?æ?¯ç©ºç??æ??è¦?顯示æ?¼ç?»å?¥è¦?çª?ç??æ??å­?æ©«å¹?è¨?æ?¯ï¼?ç?¨ä¾?å??代 banner_message_textã??"
 
 #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30
-msgid "Text banner message to show on the login window."
+msgid "Text banner message to show in the login window."
 msgstr "è¦?顯示æ?¼ç?»å?¥è¦?çª?ç??æ??å­?æ©«å¹?è¨?æ?¯ã??"
 
 #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31
+msgid "True if the XRandR settings manager plugin is enabled."
+msgstr "è?¥å??ç?¨ XRandR 設å®?管ç??å¤?æ??ç¨?å¼?å??ç?º Trueã??"
+
+#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32
 msgid "True if the background settings manager plugin is enabled."
 msgstr "è?¥å??ç?¨è??æ?¯è¨­å®?管ç??å¤?æ??ç¨?å¼?å??ç?º Trueã??"
 
-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32
+#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33
 msgid "True if the media-keys settings manager plugin is enabled."
 msgstr "è?¥å??ç?¨åª?é«?æ??é?µè¨­å®?管ç??å¤?æ??ç¨?å¼?å??ç?º Trueã??"
 
-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33
+#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34
 msgid "True if the sound settings manager plugin is enabled."
 msgstr "è?¥å??ç?¨é?³æ??設å®?管ç??å¤?æ??ç¨?å¼?å??ç?º Trueã??"
 
-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34
-msgid "True if the xrandr settings manager plugin is enabled."
-msgstr "è?¥å??ç?¨ xrandr 設å®?管ç??å¤?æ??ç¨?å¼?å??ç?º Trueã??"
-
 #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:35
 msgid "True if the xsettings settings manager plugin is enabled."
 msgstr "è?¥å??ç?¨ xsettings 設å®?管ç??å¤?æ??ç¨?å¼?å??ç?º Trueã??"
 
 #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:36
-msgid "Use compiz as the window manager"
-msgstr "使ç?¨ compiz å??ç?ºè¦?çª?管ç??ç¨?å¼?"
+msgid "Use Compiz as the window manager"
+msgstr "使ç?¨ Compiz ä½?ç?ºè¦?çª?管ç??ç¨?å¼?"
 
 #: ../gui/simple-greeter/gdm-timer.c:149
 msgid "Duration"
@@ -883,54 +893,47 @@ msgstr "���正����"
 msgid "Whether the timer is currently ticking"
 msgstr "è¨?æ??å?¨ç?¾å?¨æ?¯å?¦å?¨è¨?æ??"
 
-#: ../gui/simple-greeter/gdm-user.c:245
-msgid "Manager"
-msgstr "管ç??ç¨?å¼?"
-
-#: ../gui/simple-greeter/gdm-user.c:246
-msgid "The user manager object this user is controlled by."
-msgstr "æ?§å?¶é??å??使ç?¨è??ç??使ç?¨è??管ç??ç¨?å¼?ç?©ä»¶ã??"
+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:194
+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:470
+#, c-format
+msgid "Log in as %s"
+msgstr "以 %s 身å??ç?»å?¥"
 
 #. translators: This option prompts
 #. * the user to type in a username
 #. * manually instead of choosing from
 #. * a list.
 #.
-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:166
+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:250
 msgctxt "user"
-msgid "Other..."
-msgstr "��..."
+msgid "Otherâ?¦"
+msgstr "���"
 
-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:167
+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:251
 msgid "Choose a different account"
 msgstr "é?¸æ??ä¸?å??ç??帳è??"
 
-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:179
+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:265
 msgid "Guest"
 msgstr "訪客"
 
-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:180
-msgid "Login as a temporary guest"
+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:266
+msgid "Log in as a temporary guest"
 msgstr "以è?¨æ??訪客ç??身å??ç?»å?¥"
 
-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:193
+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:281
 msgid "Automatic Login"
 msgstr "è?ªå??ç?»å?¥"
 
-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:194
-msgid "Automatically login to the system after selecting options"
+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:282
+msgid "Automatically log into the system after selecting options"
 msgstr "å?¨é?¸å??é?¸é ?å¾?è?ªå??ç?»å?¥ç³»çµ±"
 
-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:385
-#, c-format
-msgid "Log in as %s"
-msgstr "以 %s 身å??ç?»å?¥"
-
-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:738
+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:978
 msgid "Currently logged in"
 msgstr "��已���"
 
-#: ../gui/user-switch-applet/applet.c:164
+#: ../gui/user-switch-applet/applet.c:162
 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 "
@@ -938,7 +941,7 @@ msgid ""
 "option) any later version."
 msgstr "使ç?¨è??å??æ??ç¨?å¼?æ?¯è?ªç?±è»?件ï¼?ä½ å?¯ä»¥é?µç?§è?ªç?±è»?件å?ºé??æ?? (Free Software Foundation) å?ºç??ç?? GNU é??ç?¨å?¬å?±è¨±å?¯è­?æ¢?款 (GNU General Public License) 第äº?ç??ä¾?ä¿®æ?¹å??é??æ?°ç?¼ä½?é??ä¸?ç¨?å¼?ï¼?æ??è??è?ªç?±é?¸æ??使ç?¨ä»»ä½?æ?´æ?°ç??ç??æ?¬ã??"
 
-#: ../gui/user-switch-applet/applet.c:168
+#: ../gui/user-switch-applet/applet.c:166
 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 "
@@ -946,18 +949,18 @@ msgid ""
 "more details."
 msgstr "ç?¼ä½?é??ä¸?ç¨?å¼?ç??ç?®ç??æ?¯å¸?æ??å®?æ??ç?¨ï¼?ä½?æ²?æ??ä»»ä½?æ??ä¿?ã??ç??è?³æ²?æ??é?©å??ç?¹å®?ç?®ç??è??é?±å?«ç??æ??ä¿?ã??æ?´è©³ç´°ç??æ??æ³?è«?å??é?± GNU é??ç?¨å?¬å?±è¨±å?¯è­?ã??"
 
-#: ../gui/user-switch-applet/applet.c:172
+#: ../gui/user-switch-applet/applet.c:170
 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:186
+#: ../gui/user-switch-applet/applet.c:184
 msgid "A menu to quickly switch between users."
 msgstr "ç?¨ä¾?å¿«é??å??æ??使ç?¨è??ç??é?¸å?®ã??"
 
-#: ../gui/user-switch-applet/applet.c:190
+#: ../gui/user-switch-applet/applet.c:188
 msgid "translator-credits"
 msgstr ""
 "å¦?å°?翻譯æ??ä»»ä½?æ??è¦?ï¼?è«?é??ä¸?å°?é?»å­?é?µä»¶çµ¦\n"
@@ -968,70 +971,70 @@ msgstr ""
 "Craig Jeffares <cjeffares novell com>, 2004\n"
 "Joe Man <trmetal yahoo com hk>, 2001"
 
-#: ../gui/user-switch-applet/applet.c:649
-#: ../gui/user-switch-applet/applet.c:788
-#: ../gui/user-switch-applet/applet.c:827
+#: ../gui/user-switch-applet/applet.c:658
+#: ../gui/user-switch-applet/applet.c:787
+#: ../gui/user-switch-applet/applet.c:829
 #, c-format
 msgid "Can't lock screen: %s"
 msgstr "ç?¡æ³?é??å®?è?¢å¹?ï¼?%s"
 
-#: ../gui/user-switch-applet/applet.c:671
+#: ../gui/user-switch-applet/applet.c:680
 #, c-format
 msgid "Can't temporarily set screensaver to blank screen: %s"
 msgstr "ä¸?è?½æ?«æ??å°?è?¢å¹?ä¿?è­·ç¨?å¼?設ç?ºç©ºç?½ç?«é?¢ï¼?%s"
 
-#: ../gui/user-switch-applet/applet.c:886
+#: ../gui/user-switch-applet/applet.c:888
 #, c-format
-msgid "Can't logout: %s"
+msgid "Can't log out: %s"
 msgstr "�����%s"
 
-#: ../gui/user-switch-applet/applet.c:970
+#: ../gui/user-switch-applet/applet.c:972
 msgid "Available"
 msgstr "�使�"
 
-#: ../gui/user-switch-applet/applet.c:971
+#: ../gui/user-switch-applet/applet.c:973
 msgid "Invisible"
 msgstr "�形"
 
-#: ../gui/user-switch-applet/applet.c:972
+#: ../gui/user-switch-applet/applet.c:974
 msgid "Busy"
 msgstr "��"
 
-#: ../gui/user-switch-applet/applet.c:973
+#: ../gui/user-switch-applet/applet.c:975
 msgid "Away"
 msgstr "é?¢é??"
 
-#: ../gui/user-switch-applet/applet.c:1133
+#: ../gui/user-switch-applet/applet.c:1122
 msgid "Account Information"
 msgstr "帳è??è³?è¨?"
 
-#: ../gui/user-switch-applet/applet.c:1145
+#: ../gui/user-switch-applet/applet.c:1134
 msgid "System Preferences"
 msgstr "系統å??好設å®?"
 
-#: ../gui/user-switch-applet/applet.c:1161
+#: ../gui/user-switch-applet/applet.c:1148
 msgid "Lock Screen"
 msgstr "é??å®?è?¢å¹?"
 
 #. Only show if not locked down
-#: ../gui/user-switch-applet/applet.c:1172
+#: ../gui/user-switch-applet/applet.c:1159
 msgid "Switch User"
 msgstr "å??æ??使ç?¨è??"
 
 #. Only show switch user if there are other users
-#: ../gui/user-switch-applet/applet.c:1183
-msgid "Quit..."
-msgstr "çµ?æ??..."
+#: ../gui/user-switch-applet/applet.c:1170
+msgid "Quitâ?¦"
+msgstr "çµ?æ??â?¦"
 
-#: ../gui/user-switch-applet/applet.c:1304
+#: ../gui/user-switch-applet/applet.c:1276
 msgid "Unknown"
 msgstr "ä¸?æ??"
 
-#: ../gui/user-switch-applet/applet.c:1422
+#: ../gui/user-switch-applet/applet.c:1389
 msgid "User Switch Applet"
 msgstr "使ç?¨è??å??æ??é?¢æ?¿ç¨?å¼?"
 
-#: ../gui/user-switch-applet/applet.c:1436
+#: ../gui/user-switch-applet/applet.c:1404
 msgid "Change account settings and status"
 msgstr "æ?¹è®?帳è??設å®?å?¼è??ç??æ??"
 
@@ -1069,8 +1072,8 @@ msgstr "æ??令"
 
 #: ../utils/gdmflexiserver.c:62 ../utils/gdmflexiserver.c:63
 #: ../utils/gdmflexiserver.c:65 ../utils/gdmflexiserver.c:66
-msgid "Ignored - retained for compatibility"
-msgstr "已忽ç?¥ - å?ªç?ºå?¼å®¹æ?§è??ä¿?ç??"
+msgid "Ignored â?? retained for compatibility"
+msgstr "已忽ç?¥ â?? å?ªç?ºå?¼å®¹æ?§è??ä¿?ç??"
 
 #: ../utils/gdmflexiserver.c:64 ../utils/gdm-screenshot.c:43
 msgid "Debugging output"
@@ -1099,10 +1102,40 @@ msgid "Screenshot taken"
 msgstr "æ??ä¸?æ?ªå??"
 
 #. Option parsing
-#: ../utils/gdm-screenshot.c:281
+#: ../utils/gdm-screenshot.c:283
 msgid "Take a picture of the screen"
 msgstr "ç?§ä¸?è?¢å¹?ç??å??ç??"
 
+#~ msgid "Couldn't set groupid to 0"
+#~ msgstr "��設� groupid � 0"
+
+#~ msgid "%x"
+#~ msgstr "%x"
+
+#~ msgctxt "language"
+#~ msgid "Other..."
+#~ msgstr "��..."
+
+#~ msgctxt "keyboard"
+#~ msgid "Other..."
+#~ msgstr "��..."
+
+#~ msgid "_Sessions:"
+#~ msgstr "ä½?業é??段(_S):"
+
+#~ msgid "Manager"
+#~ msgstr "管ç??ç¨?å¼?"
+
+#~ msgid "The user manager object this user is controlled by."
+#~ msgstr "æ?§å?¶é??å??使ç?¨è??ç??使ç?¨è??管ç??ç¨?å¼?ç?©ä»¶ã??"
+
+#~ msgctxt "user"
+#~ msgid "Other..."
+#~ msgstr "��..."
+
+#~ msgid "Quit..."
+#~ msgstr "çµ?æ??..."
+
 #~ msgid "Enable debugging code"
 #~ msgstr "å??ç?¨é?¤é?¯ç¢¼"
 
@@ -1278,9 +1311,6 @@ msgstr "ç?§ä¸?è?¢å¹?ç??å??ç??"
 #~ msgid "Users"
 #~ msgstr "使ç?¨è??"
 
-#~ msgid "Other"
-#~ msgstr "��"
-
 #~ msgid "<span weight=\"bold\" size=\"larger\">Multiple Logins Found</span>"
 #~ msgstr "<span weight=\"bold\" size=\"larger\">ç?¼ç?¾å¤?é??ç?»å?¥</span>"
 
@@ -3355,9 +3385,6 @@ msgstr "ç?§ä¸?è?¢å¹?ç??å??ç??"
 #~ msgid "C_ommand:"
 #~ msgstr "æ??令(_O):"
 
-#~ msgid "C_ustom:"
-#~ msgstr "��(_U):"
-
 #~ msgid "Co_lor:"
 #~ msgstr "�彩(_L):"
 
@@ -3686,12 +3713,6 @@ msgstr "ç?§ä¸?è?¢å¹?ç??å??ç??"
 #~ msgid "Change _Session"
 #~ msgstr "æ?¹è®?ä½?業é??段(_S)"
 
-#~ msgid "Sessions"
-#~ msgstr "ä½?業é??段"
-
-#~ msgid "_Last session"
-#~ msgstr "ä¸?次ç??ä½?業é??段(_L)"
-
 #~ msgid "Log in using the session that you have used last time you logged in"
 #~ msgstr "沿ç?¨ä¸?次ç??ä½?業é??段ä¾?ç?»å?¥"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 87402a2..61635e8 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -12,10 +12,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gdm2 2.29.6\n"
+"Project-Id-Version: gdm2 2.31.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-15 19:04+0800\n"
-"PO-Revision-Date: 2010-02-15 08:33+0800\n"
+"POT-Creation-Date: 2010-07-20 15:24+0800\n"
+"PO-Revision-Date: 2010-07-16 14:57+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Taiwan) <zh-l10n lists linux org tw>\n"
 "MIME-Version: 1.0\n"
@@ -28,18 +28,18 @@ msgstr ""
 msgid "/dev/urandom is not a character device"
 msgstr "/dev/urandom ä¸?æ?¯å­?å??è£?ç½®"
 
-#: ../daemon/factory-slave-main.c:177 ../daemon/product-slave-main.c:181
-#: ../daemon/simple-slave-main.c:183 ../daemon/xdmcp-chooser-slave-main.c:183
+#: ../daemon/factory-slave-main.c:178 ../daemon/product-slave-main.c:182
+#: ../daemon/simple-slave-main.c:182 ../daemon/xdmcp-chooser-slave-main.c:184
 msgid "Display ID"
 msgstr "顯示 ID"
 
-#: ../daemon/factory-slave-main.c:177 ../daemon/product-slave-main.c:181
-#: ../daemon/simple-slave-main.c:183 ../daemon/xdmcp-chooser-slave-main.c:183
+#: ../daemon/factory-slave-main.c:178 ../daemon/product-slave-main.c:182
+#: ../daemon/simple-slave-main.c:182 ../daemon/xdmcp-chooser-slave-main.c:184
 msgid "ID"
 msgstr "ID"
 
-#: ../daemon/factory-slave-main.c:189 ../daemon/product-slave-main.c:193
-#: ../daemon/simple-slave-main.c:195 ../daemon/xdmcp-chooser-slave-main.c:195
+#: ../daemon/factory-slave-main.c:190 ../daemon/product-slave-main.c:194
+#: ../daemon/simple-slave-main.c:194 ../daemon/xdmcp-chooser-slave-main.c:196
 msgid "GNOME Display Manager Slave"
 msgstr "GNOME å¾?屬顯示管ç??ç¨?å¼?"
 
@@ -48,83 +48,80 @@ msgstr "GNOME å¾?屬顯示管ç??ç¨?å¼?"
 msgid "could not find user \"%s\" on system"
 msgstr "å?¨ç³»çµ±ä¸­æ?¾ä¸?å?°ä½¿ç?¨è??ã??%sã??"
 
-#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:225
+#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:258
 msgid "Unable to initialize login system"
 msgstr "ç?¡æ³?å??å§?å??ç?»å?¥ç³»çµ±"
 
-#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:261
+#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:294
 msgid "Unable to authenticate user"
 msgstr "ç?¡æ³?é©?è­?使ç?¨è??"
 
-#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:315
+#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:351
 msgid "Unable to authorize user"
 msgstr "ç?¡æ³?é©?è­?使ç?¨è??"
 
-#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:443
+#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:480
 msgid "Unable to establish credentials"
 msgstr "��建���"
 
-#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:473
+#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:510
 msgid "Unable to open session"
 msgstr "ç?¡æ³?é??å??ä½?業é??段"
 
-#: ../daemon/gdm-factory-slave.c:683 ../daemon/gdm-product-slave.c:449
-#: ../daemon/gdm-simple-slave.c:1151
+#: ../daemon/gdm-factory-slave.c:689 ../daemon/gdm-product-slave.c:449
+#: ../daemon/gdm-simple-slave.c:1196
 msgid ""
-"Could not start the X server (your graphical environment) due to some "
-"internal error. Please contact your system administrator or check your "
-"syslog to diagnose. In the meantime this display will be disabled.  Please "
-"restart GDM when the problem is corrected."
+"Could not start the X server (your graphical environment) due to an internal "
+"error. Please contact your system administrator or check your syslog to "
+"diagnose. In the meantime this display will be disabled.  Please restart GDM "
+"when the problem is corrected."
 msgstr ""
 "å? ç?ºæ??äº?å?§é?¨é?¯èª¤ï¼?ç?®å??ç?¡æ³?å??å?? X 伺æ??å?¨ï¼?å?³å??å½¢ä»?é?¢ï¼?ã??è«?é?£çµ¡ç³»çµ±ç®¡ç??å?¡æ??æ?¯æª¢"
-"æ?¥ç³»çµ±ç´?é??æª?ã??ç?®å??æ??å??止使ç?¨é??å??顯示ç?«é?¢ã??è«?å?¨ä¿®æ­£å??é¡?å¾?é??æ?°å??å?? GDMã??"
+"æ?¥ç³»çµ±ç´?é??æª?ä¾?å?¤æ?·ã??ç?®å??æ??å??止使ç?¨é??å??顯示ç?«é?¢ã??è«?å?¨ä¿®æ­£å??é¡?å¾?é??æ?°å??å?? GDMã??"
 
-#: ../daemon/gdm-server.c:246
+#: ../daemon/gdm-server.c:250
 #, c-format
 msgid "%s: failed to connect to parent display '%s'"
 msgstr "%sï¼?ç?¡æ³?é?£æ?¥ä¸»é¡¯ç¤ºç?«é?¢â??%sâ??"
 
-#: ../daemon/gdm-server.c:361
+#: ../daemon/gdm-server.c:365
 #, c-format
 msgid "Server was to be spawned by user %s but that user doesn't exist"
 msgstr "伺æ??å?¨æ??以使ç?¨è?? %s ç??身å??è¡?ç??ï¼?ä½?該使ç?¨è??ä¸?å­?å?¨"
 
-#: ../daemon/gdm-server.c:372 ../daemon/gdm-welcome-session.c:554
+#: ../daemon/gdm-server.c:376 ../daemon/gdm-server.c:396
+#: ../daemon/gdm-welcome-session.c:598 ../daemon/gdm-welcome-session.c:618
 #, c-format
 msgid "Couldn't set groupid to %d"
 msgstr "��設� groupid � %d"
 
-#: ../daemon/gdm-server.c:378 ../daemon/gdm-welcome-session.c:560
+#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:604
 #, c-format
 msgid "initgroups () failed for %s"
 msgstr "%s ç?? initgroups () 失æ??ã??"
 
-#: ../daemon/gdm-server.c:384 ../daemon/gdm-welcome-session.c:566
+#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:610
 #, c-format
 msgid "Couldn't set userid to %d"
 msgstr "��設� userid � %d"
 
-#: ../daemon/gdm-server.c:392 ../daemon/gdm-welcome-session.c:574
-msgid "Couldn't set groupid to 0"
-msgstr "��設� groupid � 0"
-
-#: ../daemon/gdm-server.c:431
+#: ../daemon/gdm-server.c:435
 #, c-format
-msgid "%s: Could not open logfile for display %s!"
-msgstr "%sï¼?ç?¡æ³?é??å??顯示ç?«é?¢ %s ç??ç´?é??æª?ï¼?"
+msgid "%s: Could not open log file for display %s!"
+msgstr "%sï¼?ç?¡æ³?é??å??顯示 %s ç??ç´?é??æª?æ¡?ï¼?"
 
-#: ../daemon/gdm-server.c:442 ../daemon/gdm-server.c:448
-#: ../daemon/gdm-server.c:454
+#: ../daemon/gdm-server.c:446 ../daemon/gdm-server.c:452
+#: ../daemon/gdm-server.c:458
 #, c-format
 msgid "%s: Error setting %s to %s"
 msgstr "%sï¼?å°? %s 設å®?ç?º %s æ??ç?¼ç??é?¯èª¤"
 
-#: ../daemon/gdm-server.c:469
+#: ../daemon/gdm-server.c:478
 #, c-format
 msgid "%s: Server priority couldn't be set to %d: %s"
 msgstr "%sï¼?伺æ??å?¨å?ªå??ç­?ç´?ç?¡æ³?設å®?ç?º %dï¼?%s"
 
-#: ../daemon/gdm-server.c:621
+#: ../daemon/gdm-server.c:631
 #, c-format
 msgid "%s: Empty server command for display %s"
 msgstr "%sï¼?顯示ç?«é?¢ %s ç??伺æ??å?¨æ??令æ?¯ç©ºç?½ç??"
@@ -135,7 +132,7 @@ msgstr "使ç?¨è??å??稱"
 
 #: ../daemon/gdm-session-auditor.c:91
 msgid "The username"
-msgstr "使ç?¨è??å??稱"
+msgstr "使ç?¨è??ç??å??稱"
 
 #: ../daemon/gdm-session-auditor.c:95
 msgid "Hostname"
@@ -143,7 +140,7 @@ msgstr "主æ©?å??稱"
 
 #: ../daemon/gdm-session-auditor.c:96
 msgid "The hostname"
-msgstr "主æ©?å??稱"
+msgstr "主æ©?ç??å??稱"
 
 #: ../daemon/gdm-session-auditor.c:101
 msgid "Display Device"
@@ -153,216 +150,216 @@ msgstr "顯示�置"
 msgid "The display device"
 msgstr "顯示�置"
 
-#: ../daemon/gdm-session-worker.c:1298
+#: ../daemon/gdm-session-worker.c:1309
 #, c-format
-msgid "error initiating conversation with authentication system - %s"
-msgstr "é©?è­?系統å??å§?å??交è«?ç?¼ç??é?¯èª¤ - %s"
+msgid "error initiating conversation with authentication system: %s"
+msgstr "é©?è­?系統å??å§?å??交è«?ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: ../daemon/gdm-session-worker.c:1299
+#: ../daemon/gdm-session-worker.c:1310
 msgid "general failure"
 msgstr "ä¸?è?¬æ?§å¤±æ??"
 
-#: ../daemon/gdm-session-worker.c:1300
+#: ../daemon/gdm-session-worker.c:1311
 msgid "out of memory"
 msgstr "è¨?æ?¶é«?è??ç?¡"
 
-#: ../daemon/gdm-session-worker.c:1301
+#: ../daemon/gdm-session-worker.c:1312
 msgid "application programmer error"
 msgstr "æ??ç?¨ç¨?å¼?é?¯èª¤"
 
-#: ../daemon/gdm-session-worker.c:1302
+#: ../daemon/gdm-session-worker.c:1313
 msgid "unknown error"
 msgstr "ä¸?æ??ç??é?¯èª¤"
 
-#: ../daemon/gdm-session-worker.c:1309
+#: ../daemon/gdm-session-worker.c:1320
 msgid "Username:"
 msgstr "使ç?¨è??å??稱:"
 
-#: ../daemon/gdm-session-worker.c:1315
+#: ../daemon/gdm-session-worker.c:1326
 #, c-format
-msgid "error informing authentication system of preferred username prompt - %s"
-msgstr "以é¦?é?¸ç??使ç?¨è??å??稱æ??示é??ç?¥é©?è­?系統æ??ç?¼ç??é?¯èª¤ - %s"
+msgid "error informing authentication system of preferred username prompt: %s"
+msgstr "以é¦?é?¸ç??使ç?¨è??å??稱æ??示é??ç?¥é©?è­?系統æ??ç?¼ç??é?¯èª¤ï¼? %s"
 
-#: ../daemon/gdm-session-worker.c:1329
+#: ../daemon/gdm-session-worker.c:1340
 #, c-format
-msgid "error informing authentication system of user's hostname - %s"
-msgstr "以使ç?¨è??ç??主æ©?å??稱é??ç?¥é©?è­?系統æ??ç?¼ç??é?¯èª¤ - %s"
+msgid "error informing authentication system of user's hostname: %s"
+msgstr "以使ç?¨è??ç??主æ©?å??稱é??ç?¥é©?è­?系統æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: ../daemon/gdm-session-worker.c:1344
+#: ../daemon/gdm-session-worker.c:1355
 #, c-format
-msgid "error informing authentication system of user's console - %s"
-msgstr "以使ç?¨è??ç??主æ?§å?°é??ç?¥é©?è­?系統æ??ç?¼ç??é?¯èª¤ - %s"
+msgid "error informing authentication system of user's console: %s"
+msgstr "以使ç?¨è??ç??主æ?§å?°é??ç?¥é©?è­?系統æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: ../daemon/gdm-session-worker.c:1357
+#: ../daemon/gdm-session-worker.c:1368
 #, c-format
-msgid "error informing authentication system of display string - %s"
-msgstr "以顯示å­?串é??ç?¥é©?è­?系統æ??ç?¼ç??é?¯èª¤ - %s"
+msgid "error informing authentication system of display string: %s"
+msgstr "以顯示å­?串é??ç?¥é©?è­?系統æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: ../daemon/gdm-session-worker.c:1372
+#: ../daemon/gdm-session-worker.c:1383
 #, c-format
-msgid "error informing authentication system of display xauth credentials - %s"
-msgstr "以顯示 xauth è­?æ?¸é??ç?¥é©?è­?系統æ??ç?¼ç??é?¯èª¤ - %s"
+msgid "error informing authentication system of display xauth credentials: %s"
+msgstr "以顯示 xauth è­?æ?¸é??ç?¥é©?è­?系統æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: ../daemon/gdm-session-worker.c:1661 ../daemon/gdm-session-worker.c:1680
+#: ../daemon/gdm-session-worker.c:1675 ../daemon/gdm-session-worker.c:1692
 #, c-format
 msgid "no user account available"
 msgstr "æ²?æ??å?¯ç?¨ç??使ç?¨è??帳è??"
 
-#: ../daemon/gdm-session-worker.c:1707
+#: ../daemon/gdm-session-worker.c:1719
 msgid "Unable to change to user"
 msgstr "ç?¡æ³?æ?¹è®?ç?ºä½¿ç?¨è??"
 
-#: ../daemon/gdm-welcome-session.c:532
+#: ../daemon/gdm-welcome-session.c:548
 #, c-format
 msgid "User %s doesn't exist"
 msgstr "使ç?¨è?? %s ä¸?å­?å?¨"
 
-#: ../daemon/gdm-welcome-session.c:539
+#: ../daemon/gdm-welcome-session.c:555
 #, c-format
 msgid "Group %s doesn't exist"
 msgstr "群� %s ���"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:596
+#: ../daemon/gdm-xdmcp-display-factory.c:604
 msgid "Could not create socket!"
 msgstr "��建� socket�"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:865
+#: ../daemon/gdm-xdmcp-display-factory.c:873
 #, c-format
 msgid "Denied XDMCP query from host %s"
 msgstr "æ??çµ?ç?±ä¸»æ©? %s ç?¼å?ºç?? XDMCP æ?¥è©¢"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:1023
-#: ../daemon/gdm-xdmcp-display-factory.c:1247
+#: ../daemon/gdm-xdmcp-display-factory.c:1031
+#: ../daemon/gdm-xdmcp-display-factory.c:1255
 msgid "Could not extract authlist from packet"
 msgstr "ç?¡æ³?å¾?å°?å??中è®?å?? authlist"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:1036
-#: ../daemon/gdm-xdmcp-display-factory.c:1262
+#: ../daemon/gdm-xdmcp-display-factory.c:1044
+#: ../daemon/gdm-xdmcp-display-factory.c:1270
 msgid "Error in checksum"
 msgstr "檢�碼���誤"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:1515
+#: ../daemon/gdm-xdmcp-display-factory.c:1523
 msgid "Bad address"
 msgstr "ä½?å??é?¯èª¤"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:1599
+#: ../daemon/gdm-xdmcp-display-factory.c:1607
 #, c-format
 msgid "%s: Could not read display address"
 msgstr "%sï¼?ç?¡æ³?è®?å??ç?«é?¢ä½?å??"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:1607
+#: ../daemon/gdm-xdmcp-display-factory.c:1615
 #, c-format
 msgid "%s: Could not read display port number"
 msgstr "%sï¼?ç?¡æ³?è®?å??ç?«é?¢æ??ç?¨ç??é?£æ?¥å? è??碼"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:1616
+#: ../daemon/gdm-xdmcp-display-factory.c:1624
 #, c-format
 msgid "%s: Could not extract authlist from packet"
 msgstr "%sï¼?ç?¡æ³?å¾?å°?å??中è®?å?? authlist"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:1636
+#: ../daemon/gdm-xdmcp-display-factory.c:1644
 #, c-format
 msgid "%s: Error in checksum"
 msgstr "%s�檢�碼���誤"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2155
+#: ../daemon/gdm-xdmcp-display-factory.c:2200
 #, c-format
 msgid "%s: Got REQUEST from banned host %s"
 msgstr "%sï¼?已被æ??çµ?ç??主æ©? %s ç?¼å?ºè¦?æ±?"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2165
-#: ../daemon/gdm-xdmcp-display-factory.c:2521
-#: ../daemon/gdm-xdmcp-display-factory.c:2775
+#: ../daemon/gdm-xdmcp-display-factory.c:2210
+#: ../daemon/gdm-xdmcp-display-factory.c:2568
+#: ../daemon/gdm-xdmcp-display-factory.c:2822
 #, c-format
 msgid "%s: Could not read Display Number"
 msgstr "%sï¼?ç?¡æ³?è®?å??顯示ç?«é?¢ç·¨è??"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2172
+#: ../daemon/gdm-xdmcp-display-factory.c:2217
 #, c-format
 msgid "%s: Could not read Connection Type"
 msgstr "%sï¼?ç?¡æ³?è®?å??é?£ç·?æ?¹å¼?"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2179
+#: ../daemon/gdm-xdmcp-display-factory.c:2224
 #, c-format
 msgid "%s: Could not read Client Address"
 msgstr "%sï¼?ç?¡æ³?è®?å??客æ?¶ç«¯ä½?å??"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2187
+#: ../daemon/gdm-xdmcp-display-factory.c:2232
 #, c-format
 msgid "%s: Could not read Authentication Names"
 msgstr "%sï¼?ç?¡æ³?è®?å??èª?è­?å??稱"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2196
+#: ../daemon/gdm-xdmcp-display-factory.c:2241
 #, c-format
 msgid "%s: Could not read Authentication Data"
 msgstr "%sï¼?ç?¡æ³?è®?å??èª?è­?è³?æ??"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2206
+#: ../daemon/gdm-xdmcp-display-factory.c:2251
 #, c-format
 msgid "%s: Could not read Authorization List"
 msgstr "%sï¼?ç?¡æ³?è®?å??æ??æ¬?æ¸?å?®"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2225
+#: ../daemon/gdm-xdmcp-display-factory.c:2270
 #, c-format
 msgid "%s: Could not read Manufacturer ID"
 msgstr "%sï¼?ç?¡æ³?è®?å??å» å??è­?å?¥ç¢¼"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2252
+#: ../daemon/gdm-xdmcp-display-factory.c:2297
 #, c-format
 msgid "%s: Failed checksum from %s"
 msgstr "%sï¼?å¾? %s å¾?å?°é?¯èª¤ç??檢æ?¥ç¢¼"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2505
+#: ../daemon/gdm-xdmcp-display-factory.c:2552
 #, c-format
 msgid "%s: Got Manage from banned host %s"
 msgstr "%sï¼?已被æ??çµ?ç??主æ©? %s ç?¼å?ºç®¡ç??è¨?æ?¯"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2514
-#: ../daemon/gdm-xdmcp-display-factory.c:2782
+#: ../daemon/gdm-xdmcp-display-factory.c:2561
+#: ../daemon/gdm-xdmcp-display-factory.c:2829
 #, c-format
 msgid "%s: Could not read Session ID"
 msgstr "%sï¼?ç?¡æ³?è®?å??ä½?業é??段è­?å?¥ç¢¼"
 
 # FIXME: What is display class?
-#: ../daemon/gdm-xdmcp-display-factory.c:2528
+#: ../daemon/gdm-xdmcp-display-factory.c:2575
 #, c-format
 msgid "%s: Could not read Display Class"
 msgstr "%sï¼?ç?¡æ³?è®?å??顯示ç?«é?¢ç??é¡?å?¥"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2634
-#: ../daemon/gdm-xdmcp-display-factory.c:2684
-#: ../daemon/gdm-xdmcp-display-factory.c:2690
+#: ../daemon/gdm-xdmcp-display-factory.c:2681
+#: ../daemon/gdm-xdmcp-display-factory.c:2731
+#: ../daemon/gdm-xdmcp-display-factory.c:2737
 #, c-format
 msgid "%s: Could not read address"
 msgstr "%sï¼?ç?¡æ³?è®?å??ä½?å??"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2765
+#: ../daemon/gdm-xdmcp-display-factory.c:2812
 #, c-format
 msgid "%s: Got KEEPALIVE from banned host %s"
 msgstr "%sï¼?已被æ??çµ?ç??主æ©? %s ç?¼å?º KEEPALIVE è¨?æ?¯"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2854
+#: ../daemon/gdm-xdmcp-display-factory.c:2902
 msgid "GdmXdmcpDisplayFactory: Could not read XDMCP header!"
 msgstr "GdmXdmcpDisplayFactoryï¼?ç?¡æ³?è®?å?? XDMCP æ¨?é ­ï¼?"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2860
-#: ../gui/simple-chooser/gdm-host-chooser-widget.c:226
+#: ../daemon/gdm-xdmcp-display-factory.c:2908
+#: ../gui/simple-chooser/gdm-host-chooser-widget.c:227
 msgid "XMDCP: Incorrect XDMCP version!"
 msgstr "XMDCPï¼?XDMCP ç??æ?¬ä¸?正確ï¼?"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:2866
-#: ../gui/simple-chooser/gdm-host-chooser-widget.c:232
+#: ../daemon/gdm-xdmcp-display-factory.c:2914
+#: ../gui/simple-chooser/gdm-host-chooser-widget.c:233
 msgid "XMDCP: Unable to parse address"
 msgstr "XMDCPï¼?ç?¡æ³?解æ??ä½?å??"
 
-#: ../daemon/gdm-xdmcp-display-factory.c:3311
+#: ../daemon/gdm-xdmcp-display-factory.c:3359
 #, c-format
 msgid "Could not get server hostname: %s!"
 msgstr "ç?¡æ³?å??å¾?伺æ??å?¨ä¸»æ©?å??稱ï¼?%sï¼?"
 
 #: ../daemon/main.c:237 ../daemon/main.c:250
 #, c-format
-msgid "Cannot write PID file %s: possibly out of diskspace: %s"
+msgid "Cannot write PID file %s: possibly out of disk space: %s"
 msgstr "ç?¡æ³?寫å?¥ PID æª? %sï¼?å?¯è?½æ?¯ç£?ç¢?空é??ä¸?足ï¼?%s"
 
 #: ../daemon/main.c:271
@@ -413,8 +410,8 @@ msgid "Make all warnings fatal"
 msgstr "æ??æ??æ??ç??è­¦å??è¨?æ?¯é?½ç?¶æ??å?´é??é?¯èª¤"
 
 #: ../daemon/main.c:534
-msgid "Exit after a time - for debugging"
-msgstr "å?¨ä¸?å®?æ??é??å¾?é?¢é??â??é?¤é?¯å°?ç?¨"
+msgid "Exit after a time (for debugging)"
+msgstr "ä¸?段æ??é??å¾?é?¢é??ï¼?é?¤é?¯ç?¨ï¼?"
 
 #: ../daemon/main.c:535
 msgid "Print GDM version"
@@ -425,20 +422,22 @@ msgid "GNOME Display Manager"
 msgstr "GNOME ç?»å?¥ç®¡ç??å?¡"
 
 #. make sure the pid file doesn't get wiped
-#: ../daemon/main.c:611
+#: ../daemon/main.c:616
 msgid "Only the root user can run GDM"
 msgstr "å?ªæ?? root 使ç?¨è??å?¯ä»¥å?·è¡? GDM"
 
-#: ../daemon/session-worker-main.c:156
+#. Translators: worker is a helper process that does the work
+#. of starting up a session
+#: ../daemon/session-worker-main.c:158
 msgid "GNOME Display Manager Session Worker"
 msgstr "GNOME ç?»å?¥ç®¡ç??å?¡å·¥ä½?é??段ç??å·¥ä½?ç¨?åº?"
 
 #: ../data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in.h:1
-msgid "AT SPI Registry Wrapper"
-msgstr "AT SPI 註å??表è½?æ??å?¨"
+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:1434
+#: ../gui/simple-greeter/gdm-greeter-login-window.c:1632
 msgid "Login Window"
 msgstr "����"
 
@@ -463,12 +462,12 @@ msgid "Magnify parts of the screen"
 msgstr "è?¢å¹?ç??æ?¾å¤§é?¨ä»½"
 
 #: ../data/greeter-autostart/gok.desktop.in.h:1
-msgid "GNOME Onscreen Keyboard"
+msgid "GNOME On-Screen Keyboard"
 msgstr "GNOME ����"
 
 #: ../data/greeter-autostart/gok.desktop.in.h:2
-msgid "Use an onscreen keyboard"
-msgstr "使�����"
+msgid "Use an on-screen keyboard"
+msgstr "使ç?¨é¡¯ç¤ºå?¨è?¢å¹?ä¸?ç??é?µç?¤"
 
 #: ../data/greeter-autostart/metacity.desktop.in.h:1
 msgid "Metacity"
@@ -490,43 +489,43 @@ msgstr "PolicyKit é©?è­?代ç??ç¨?å¼?"
 msgid "Select System"
 msgstr "é?¸æ??系統"
 
-#: ../gui/simple-chooser/gdm-host-chooser-widget.c:213
+#: ../gui/simple-chooser/gdm-host-chooser-widget.c:215
 msgid "XDMCP: Could not create XDMCP buffer!"
 msgstr "XDMCP���建� XDMCP 緩��"
 
-#: ../gui/simple-chooser/gdm-host-chooser-widget.c:220
+#: ../gui/simple-chooser/gdm-host-chooser-widget.c:221
 msgid "XDMCP: Could not read XDMCP header!"
 msgstr "XDMCPï¼?ç?¡æ³?è®?å?? XDMCP æ¨?é ­ï¼?"
 
-#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:244
+#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:250
 msgid "Value"
 msgstr "��"
 
-#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:245
+#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:251
 msgid "percentage of time complete"
 msgstr "å®?æ??æ??é??ç?¾å??æ¯?"
 
-#: ../gui/simple-greeter/gdm-chooser-widget.c:1281
+#: ../gui/simple-greeter/gdm-chooser-widget.c:1459
 msgid "Inactive Text"
 msgstr "æ?ªä½¿ç?¨ç??æ??å­?"
 
-#: ../gui/simple-greeter/gdm-chooser-widget.c:1282
+#: ../gui/simple-greeter/gdm-chooser-widget.c:1460
 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:1290
+#: ../gui/simple-greeter/gdm-chooser-widget.c:1468
 msgid "Active Text"
 msgstr "使ç?¨ä¸­ç??æ??å­?"
 
-#: ../gui/simple-greeter/gdm-chooser-widget.c:1291
+#: ../gui/simple-greeter/gdm-chooser-widget.c:1469
 msgid "The text to use in the label if the user has picked an item"
 msgstr "è?¥ä½¿ç?¨è??å·²æ??é?¸æ??å??é ?ç?®ï¼?è¦?å?¨æ¨?籤中使ç?¨ç??æ??å­?"
 
-#: ../gui/simple-greeter/gdm-chooser-widget.c:1300
+#: ../gui/simple-greeter/gdm-chooser-widget.c:1478
 msgid "List Visible"
 msgstr "�����"
 
-#: ../gui/simple-greeter/gdm-chooser-widget.c:1301
+#: ../gui/simple-greeter/gdm-chooser-widget.c:1479
 msgid "Whether the chooser list is visible"
 msgstr "æ?¯å?¦é¡¯ç¤ºé?¸æ??ç¨?å¼?æ¸?å?®"
 
@@ -551,14 +550,6 @@ msgstr "%b %e %a, %p %l:%M"
 msgid "%a %l:%M:%S %p"
 msgstr "%a %p %l:%M:%S"
 
-#. translators: This is the time format to use for the date
-#.
-#: ../gui/simple-greeter/gdm-clock-widget.c:87
-#: ../gui/simple-greeter/gdm-clock-widget.c:94
-#, c-format
-msgid "%x"
-msgstr "%x"
-
 #. translators: This is the time format to use when there is
 #. * no date, just weekday and time without seconds.
 #.
@@ -566,77 +557,93 @@ msgstr "%x"
 msgid "%a %l:%M %p"
 msgstr "%a %p %l:%M"
 
-#: ../gui/simple-greeter/gdm-greeter-login-window.c:278
-msgid "Automatically logging in..."
-msgstr "æ­£å?¨è?ªå??ç?»å?¥..."
-
-#. need to wait for response from backend
-#: ../gui/simple-greeter/gdm-greeter-login-window.c:570
-msgid "Cancelling..."
-msgstr "æ­£å?¨å??æ¶?..."
+#: ../gui/simple-greeter/gdm-greeter-login-window.c:290
+msgid "Automatically logging inâ?¦"
+msgstr "æ­£å?¨è?ªå??ç?»å?¥â?¦"
 
-#: ../gui/simple-greeter/gdm-greeter-login-window.c:870
+#: ../gui/simple-greeter/gdm-greeter-login-window.c:576
 msgid "Select language and click Log In"
 msgstr "é?¸æ??èª?è¨?並æ??ä¸?ã??ç?»å?¥ã??"
 
+#. need to wait for response from backend
+#: ../gui/simple-greeter/gdm-greeter-login-window.c:689
+msgid "Cancellingâ?¦"
+msgstr "æ­£å?¨å??æ¶?â?¦"
+
 #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1
 msgid "Computer Name"
 msgstr "é?»è?¦å??稱"
 
 #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2
-msgid "Log In"
+msgid "Login"
 msgstr "��"
 
 #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3
+msgid "Unlock"
+msgstr "解é??"
+
+#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4
 msgid "Version"
 msgstr "ç??æ?¬"
 
-#: ../gui/simple-greeter/gdm-greeter-panel.c:852
+#: ../gui/simple-greeter/gdm-greeter-panel.c:740
 msgid "Panel"
 msgstr "��"
 
-#: ../gui/simple-greeter/gdm-greeter-panel.c:923
-msgid "Shutdown Options..."
-msgstr "é??æ©?é?¸é ?..."
+#: ../gui/simple-greeter/gdm-greeter-panel.c:805
+msgid "Shutdown Optionsâ?¦"
+msgstr "é??æ©?é?¸é ?â?¦"
 
-#: ../gui/simple-greeter/gdm-greeter-panel.c:945
+#: ../gui/simple-greeter/gdm-greeter-panel.c:827
 msgid "Suspend"
 msgstr "æ?«å??"
 
-#: ../gui/simple-greeter/gdm-greeter-panel.c:950
+#: ../gui/simple-greeter/gdm-greeter-panel.c:832
 msgid "Restart"
 msgstr "é??æ?°å??å??"
 
-#: ../gui/simple-greeter/gdm-greeter-panel.c:954
+#: ../gui/simple-greeter/gdm-greeter-panel.c:836
 msgid "Shut Down"
 msgstr "é??é??é?»è?¦"
 
+#: ../gui/simple-greeter/gdm-greeter-panel.c:1111
+msgctxt "customsession"
+msgid "Custom"
+msgstr "��"
+
+#: ../gui/simple-greeter/gdm-greeter-panel.c:1112
+msgid "Custom session"
+msgstr "è?ªè¨?ä½?業é??段"
+
 #: ../gui/simple-greeter/gdm-language-chooser-dialog.c:201
 msgid "Languages"
 msgstr "��"
 
-#: ../gui/simple-greeter/gdm-language-chooser-widget.c:274
+#: ../gui/simple-greeter/gdm-language-chooser-widget.c:276
 msgid "_Languages:"
 msgstr "��(_L):"
 
-#: ../gui/simple-greeter/gdm-language-chooser-widget.c:275
-#: ../gui/simple-greeter/gdm-language-option-widget.c:274
+#: ../gui/simple-greeter/gdm-language-chooser-widget.c:277
 msgid "_Language:"
 msgstr "��(_L):"
 
 #. translators: This brings up a dialog
 #. * with a list of languages to choose from
 #.
-#: ../gui/simple-greeter/gdm-language-option-widget.c:243
+#: ../gui/simple-greeter/gdm-language-option-widget.c:231
 msgctxt "language"
-msgid "Other..."
-msgstr "��..."
+msgid "Otherâ?¦"
+msgstr "���"
 
-#: ../gui/simple-greeter/gdm-language-option-widget.c:244
+#: ../gui/simple-greeter/gdm-language-option-widget.c:232
 msgid "Choose a language from the full list of available languages."
 msgstr "å¾?å®?æ?´ç??å?¯ç?¨èª?è¨?æ¸?å?®ä¸­é?¸æ??èª?è¨?ã??"
 
-#: ../gui/simple-greeter/gdm-languages.c:698
+#: ../gui/simple-greeter/gdm-language-option-widget.c:262
+msgid "Language"
+msgstr "��"
+
+#: ../gui/simple-greeter/gdm-languages.c:699
 msgid "Unspecified"
 msgstr "æ?ªæ??å®?"
 
@@ -644,45 +651,48 @@ msgstr "æ?ªæ??å®?"
 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:266
+#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:202
+#: ../gui/simple-greeter/gdm-layout-chooser-widget.c:203
 msgid "_Keyboard:"
 msgstr "��(_K):"
 
 #. translators: This brings up a dialog of
 #. * available keyboard layouts
 #.
-#: ../gui/simple-greeter/gdm-layout-option-widget.c:235
+#: ../gui/simple-greeter/gdm-layout-option-widget.c:223
 msgctxt "keyboard"
-msgid "Other..."
-msgstr "��..."
+msgid "Otherâ?¦"
+msgstr "���"
 
-#: ../gui/simple-greeter/gdm-layout-option-widget.c:236
+#: ../gui/simple-greeter/gdm-layout-option-widget.c:224
 msgid "Choose a keyboard layout from the full list of available layouts."
 msgstr "å¾?å®?æ?´ç??å?¯ç?¨é?µç?¤é??ç½®æ¸?å?®ä¸­é?¸æ??é?µç?¤é??ç½®ã??"
 
-#: ../gui/simple-greeter/gdm-option-widget.c:507
+#: ../gui/simple-greeter/gdm-layout-option-widget.c:254
+msgid "Keyboard"
+msgstr "��"
+
+#: ../gui/simple-greeter/gdm-option-widget.c:505
 msgid "Label Text"
 msgstr "æ¨?籤æ??å­?"
 
-#: ../gui/simple-greeter/gdm-option-widget.c:508
+#: ../gui/simple-greeter/gdm-option-widget.c:506
 msgid "The text to use as a label"
 msgstr "è¦?ç?¨å??æ¨?籤ç??æ??å­?"
 
-#: ../gui/simple-greeter/gdm-option-widget.c:515
+#: ../gui/simple-greeter/gdm-option-widget.c:513
 msgid "Icon name"
 msgstr "å??示å??稱"
 
-#: ../gui/simple-greeter/gdm-option-widget.c:516
+#: ../gui/simple-greeter/gdm-option-widget.c:514
 msgid "The icon to use with the label"
 msgstr "è¦?è??æ¨?籤ä¸?起使ç?¨ç??å??示"
 
-#: ../gui/simple-greeter/gdm-option-widget.c:524
+#: ../gui/simple-greeter/gdm-option-widget.c:522
 msgid "Default Item"
 msgstr "é ?設ç??é ?ç?®"
 
-#: ../gui/simple-greeter/gdm-option-widget.c:525
+#: ../gui/simple-greeter/gdm-option-widget.c:523
 msgid "The ID of the default item"
 msgstr "é ?設é ?ç?®ç?? ID"
 
@@ -696,8 +706,8 @@ msgstr "å?¨æ¸?å?®ä¸­ä¿?å­?é ?ç?®æ?¸é??ç??æ??大å?¼"
 
 #: ../gui/simple-greeter/gdm-remote-login-window.c:188
 #, c-format
-msgid "Remote Login (Connecting to %s...)"
-msgstr "é? 端ç?»å?¥(é?£ç·?è?³ %s...)"
+msgid "Remote Login (Connecting to %sâ?¦)"
+msgstr "é? 端ç?»å?¥ï¼?é?£ç·?è?³ %sâ?¦ï¼?"
 
 #: ../gui/simple-greeter/gdm-remote-login-window.c:202
 #, c-format
@@ -709,8 +719,8 @@ msgid "Remote Login"
 msgstr "é? 端ç?»å?¥"
 
 #: ../gui/simple-greeter/gdm-session-option-widget.c:162
-msgid "_Sessions:"
-msgstr "ä½?業é??段(_S):"
+msgid "Session"
+msgstr "ä½?業é??段"
 
 #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:1
 msgid "Banner message text"
@@ -762,11 +772,11 @@ msgstr "ç?®å??é?¸å??ç??èª?è¨?"
 
 #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13
 msgid ""
-"Set to a list of keyboard layouts to be shown by default at the login window."
+"Set to a list of keyboard layouts to be shown by default in the login window."
 msgstr "設å®?é ?設å?¨ç?»å?¥è¦?çª?中顯示é?µç?¤é??ç½®ç??æ¸?å?®ã??"
 
 #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14
-msgid "Set to a list of languages to be shown by default at the login window."
+msgid "Set to a list of languages to be shown by default in the login window."
 msgstr "設å®?é ?設å?¨ç?»å?¥è¦?çª?中顯示èª?è¨?ç??æ¸?å?®ã??"
 
 #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15
@@ -782,39 +792,39 @@ msgid "Set to true to disable showing the restart buttons in the login window."
 msgstr "設ç?º true å??ä¸?å?¨ç?»å?¥è¦?çª?中顯示é??æ?°å??å??æ??é??ã??"
 
 #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18
+msgid "Set to true to enable the XRandR settings manager plugin."
+msgstr "設ç?º true å??å??ç?¨ XRandR 設å®?管ç??å¤?æ??ç¨?å¼?ã??"
+
+#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19
 msgid "Set to true to enable the background settings manager plugin."
 msgstr "設ç?º true å??å??ç?¨è??æ?¯è¨­å®?管ç??å¤?æ??ç¨?å¼?ã??"
 
-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19
+#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20
 msgid "Set to true to enable the media-keys settings manager plugin."
 msgstr "設ç?º true å??å??ç?¨åª?é«?æ??é?µè¨­å®?管ç??å¤?æ??ç¨?å¼?ã??"
 
-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20
+#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21
 msgid "Set to true to enable the on-screen keyboard."
 msgstr "設ç?º true å??å??ç?¨è?¢å¹?é?µç?¤ã??"
 
-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21
+#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22
 msgid ""
 "Set to true to enable the plugin to manage the accessibility keyboard "
 "settings."
 msgstr "設ç?º true å??å??ç?¨è¨­å®?管ç??é?µç?¤ç?¡é??ç¤?å??è?½è¨­å®?å?¼ç??å¤?æ??ç¨?å¼?ã??"
 
-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22
+#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23
 msgid "Set to true to enable the screen magnifier."
 msgstr "設ç?º true å??å??ç?¨è?¢å¹?æ?¾å¤§é?¡ã??"
 
-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23
+#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24
 msgid "Set to true to enable the screen reader."
 msgstr "設ç?º true å??å??ç?¨è?¢å¹?é?±è®?å?¨ã??"
 
-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24
+#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25
 msgid "Set to true to enable the sound settings manager plugin."
 msgstr "設ç?º true å??å??ç?¨é?³æ??設å®?管ç??å¤?æ??ç¨?å¼?ã??"
 
-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25
-msgid "Set to true to enable the xrandr settings manager plugin."
-msgstr "設ç?º true å??å??ç?¨ xrandr 設å®?管ç??å¤?æ??ç¨?å¼?ã??"
-
 #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26
 msgid "Set to true to enable the xsettings settings manager plugin."
 msgstr "設ç?º true å??å??ç?¨ xsettings 設å®?管ç??å¤?æ??ç¨?å¼?ã??"
@@ -824,44 +834,44 @@ msgid "Set to true to show the banner message text."
 msgstr "設ç?º true å??顯示橫å¹?è¨?æ?¯æ??å­?ã??"
 
 #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28
-msgid "Set to true to use compiz as the window manager."
-msgstr "設ç?º true å??使ç?¨ compiz å??ç?ºè¦?çª?管ç??ç¨?å¼?ã??"
+msgid "Set to true to use Compiz as the window manager."
+msgstr "設ç?º true å??使ç?¨ Compiz ä½?ç?ºè¦?çª?管ç??ç¨?å¼?ã??"
 
 #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29
 msgid ""
-"Text banner message to show on the login window when the user chooser is "
+"Text banner message to show in the login window when the user chooser is "
 "empty, instead of banner_message_text."
 msgstr ""
 "ç?¶é?¸æ??ç¨?å¼?æ?¯ç©ºç??æ??è¦?顯示æ?¼ç?»å?¥è¦?çª?ç??æ??å­?æ©«å¹?è¨?æ?¯ï¼?ç?¨ä¾?å??代 "
 "banner_message_textã??"
 
 #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30
-msgid "Text banner message to show on the login window."
+msgid "Text banner message to show in the login window."
 msgstr "è¦?顯示æ?¼ç?»å?¥è¦?çª?ç??æ??å­?æ©«å¹?è¨?æ?¯ã??"
 
 #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31
+msgid "True if the XRandR settings manager plugin is enabled."
+msgstr "è?¥å??ç?¨ XRandR 設å®?管ç??å¤?æ??ç¨?å¼?å??ç?º Trueã??"
+
+#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32
 msgid "True if the background settings manager plugin is enabled."
 msgstr "è?¥å??ç?¨è??æ?¯è¨­å®?管ç??å¤?æ??ç¨?å¼?å??ç?º Trueã??"
 
-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32
+#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33
 msgid "True if the media-keys settings manager plugin is enabled."
 msgstr "è?¥å??ç?¨åª?é«?æ??é?µè¨­å®?管ç??å¤?æ??ç¨?å¼?å??ç?º Trueã??"
 
-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33
+#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34
 msgid "True if the sound settings manager plugin is enabled."
 msgstr "è?¥å??ç?¨é?³æ??設å®?管ç??å¤?æ??ç¨?å¼?å??ç?º Trueã??"
 
-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34
-msgid "True if the xrandr settings manager plugin is enabled."
-msgstr "è?¥å??ç?¨ xrandr 設å®?管ç??å¤?æ??ç¨?å¼?å??ç?º Trueã??"
-
 #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:35
 msgid "True if the xsettings settings manager plugin is enabled."
 msgstr "è?¥å??ç?¨ xsettings 設å®?管ç??å¤?æ??ç¨?å¼?å??ç?º Trueã??"
 
 #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:36
-msgid "Use compiz as the window manager"
-msgstr "使ç?¨ compiz å??ç?ºè¦?çª?管ç??ç¨?å¼?"
+msgid "Use Compiz as the window manager"
+msgstr "使ç?¨ Compiz ä½?ç?ºè¦?çª?管ç??ç¨?å¼?"
 
 #: ../gui/simple-greeter/gdm-timer.c:149
 msgid "Duration"
@@ -887,54 +897,47 @@ msgstr "���正����"
 msgid "Whether the timer is currently ticking"
 msgstr "è¨?æ??å?¨ç?¾å?¨æ?¯å?¦å?¨è¨?æ??"
 
-#: ../gui/simple-greeter/gdm-user.c:245
-msgid "Manager"
-msgstr "管ç??ç¨?å¼?"
-
-#: ../gui/simple-greeter/gdm-user.c:246
-msgid "The user manager object this user is controlled by."
-msgstr "æ?§å?¶é??å??使ç?¨è??ç??使ç?¨è??管ç??ç¨?å¼?ç?©ä»¶ã??"
+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:194
+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:470
+#, c-format
+msgid "Log in as %s"
+msgstr "以 %s 身å??ç?»å?¥"
 
 #. translators: This option prompts
 #. * the user to type in a username
 #. * manually instead of choosing from
 #. * a list.
 #.
-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:166
+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:250
 msgctxt "user"
-msgid "Other..."
-msgstr "��..."
+msgid "Otherâ?¦"
+msgstr "���"
 
-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:167
+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:251
 msgid "Choose a different account"
 msgstr "é?¸æ??ä¸?å??ç??帳è??"
 
-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:179
+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:265
 msgid "Guest"
 msgstr "訪客"
 
-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:180
-msgid "Login as a temporary guest"
+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:266
+msgid "Log in as a temporary guest"
 msgstr "以è?¨æ??訪客ç??身å??ç?»å?¥"
 
-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:193
+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:281
 msgid "Automatic Login"
 msgstr "è?ªå??ç?»å?¥"
 
-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:194
-msgid "Automatically login to the system after selecting options"
+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:282
+msgid "Automatically log into the system after selecting options"
 msgstr "å?¨é?¸å??é?¸é ?å¾?è?ªå??ç?»å?¥ç³»çµ±"
 
-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:385
-#, c-format
-msgid "Log in as %s"
-msgstr "以 %s 身å??ç?»å?¥"
-
-#: ../gui/simple-greeter/gdm-user-chooser-widget.c:738
+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:978
 msgid "Currently logged in"
 msgstr "��已���"
 
-#: ../gui/user-switch-applet/applet.c:164
+#: ../gui/user-switch-applet/applet.c:162
 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 "
@@ -945,7 +948,7 @@ msgstr ""
 "Foundation) å?ºç??ç?? GNU é??ç?¨å?¬å?±è¨±å?¯è­?æ¢?款 (GNU General Public License) 第äº?ç??"
 "ä¾?ä¿®æ?¹å??é??æ?°ç?¼ä½?é??ä¸?ç¨?å¼?ï¼?æ??è??è?ªç?±é?¸æ??使ç?¨ä»»ä½?æ?´æ?°ç??ç??æ?¬ã??"
 
-#: ../gui/user-switch-applet/applet.c:168
+#: ../gui/user-switch-applet/applet.c:166
 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 "
@@ -955,7 +958,7 @@ msgstr ""
 "ç?¼ä½?é??ä¸?ç¨?å¼?ç??ç?®ç??æ?¯å¸?æ??å®?æ??ç?¨ï¼?ä½?æ²?æ??ä»»ä½?æ??ä¿?ã??ç??è?³æ²?æ??é?©å??ç?¹å®?ç?®ç??è??é?±å?«ç??"
 "æ??ä¿?ã??æ?´è©³ç´°ç??æ??æ³?è«?å??é?± GNU é??ç?¨å?¬å?±è¨±å?¯è­?ã??"
 
-#: ../gui/user-switch-applet/applet.c:172
+#: ../gui/user-switch-applet/applet.c:170
 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 "
@@ -965,11 +968,11 @@ msgstr ""
 "the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, "
 "MA 02110-1301, USA "
 
-#: ../gui/user-switch-applet/applet.c:186
+#: ../gui/user-switch-applet/applet.c:184
 msgid "A menu to quickly switch between users."
 msgstr "ç?¨ä¾?å¿«é??å??æ??使ç?¨è??ç??é?¸å?®ã??"
 
-#: ../gui/user-switch-applet/applet.c:190
+#: ../gui/user-switch-applet/applet.c:188
 msgid "translator-credits"
 msgstr ""
 "å¦?å°?翻譯æ??ä»»ä½?æ??è¦?ï¼?è«?é??ä¸?å°?é?»å­?é?µä»¶çµ¦\n"
@@ -980,70 +983,70 @@ msgstr ""
 "Craig Jeffares <cjeffares novell com>, 2004\n"
 "Joe Man <trmetal yahoo com hk>, 2001"
 
-#: ../gui/user-switch-applet/applet.c:649
-#: ../gui/user-switch-applet/applet.c:788
-#: ../gui/user-switch-applet/applet.c:827
+#: ../gui/user-switch-applet/applet.c:658
+#: ../gui/user-switch-applet/applet.c:787
+#: ../gui/user-switch-applet/applet.c:829
 #, c-format
 msgid "Can't lock screen: %s"
 msgstr "ç?¡æ³?é??å®?è?¢å¹?ï¼?%s"
 
-#: ../gui/user-switch-applet/applet.c:671
+#: ../gui/user-switch-applet/applet.c:680
 #, c-format
 msgid "Can't temporarily set screensaver to blank screen: %s"
 msgstr "ä¸?è?½æ?«æ??å°?è?¢å¹?ä¿?è­·ç¨?å¼?設ç?ºç©ºç?½ç?«é?¢ï¼?%s"
 
-#: ../gui/user-switch-applet/applet.c:886
+#: ../gui/user-switch-applet/applet.c:888
 #, c-format
-msgid "Can't logout: %s"
+msgid "Can't log out: %s"
 msgstr "�����%s"
 
-#: ../gui/user-switch-applet/applet.c:970
+#: ../gui/user-switch-applet/applet.c:972
 msgid "Available"
 msgstr "�使�"
 
-#: ../gui/user-switch-applet/applet.c:971
+#: ../gui/user-switch-applet/applet.c:973
 msgid "Invisible"
 msgstr "�形"
 
-#: ../gui/user-switch-applet/applet.c:972
+#: ../gui/user-switch-applet/applet.c:974
 msgid "Busy"
 msgstr "��"
 
-#: ../gui/user-switch-applet/applet.c:973
+#: ../gui/user-switch-applet/applet.c:975
 msgid "Away"
 msgstr "é?¢é??"
 
-#: ../gui/user-switch-applet/applet.c:1133
+#: ../gui/user-switch-applet/applet.c:1122
 msgid "Account Information"
 msgstr "帳è??è³?è¨?"
 
-#: ../gui/user-switch-applet/applet.c:1145
+#: ../gui/user-switch-applet/applet.c:1134
 msgid "System Preferences"
 msgstr "系統å??好設å®?"
 
-#: ../gui/user-switch-applet/applet.c:1161
+#: ../gui/user-switch-applet/applet.c:1148
 msgid "Lock Screen"
 msgstr "é??å®?è?¢å¹?"
 
 #. Only show if not locked down
-#: ../gui/user-switch-applet/applet.c:1172
+#: ../gui/user-switch-applet/applet.c:1159
 msgid "Switch User"
 msgstr "å??æ??使ç?¨è??"
 
 #. Only show switch user if there are other users
-#: ../gui/user-switch-applet/applet.c:1183
-msgid "Quit..."
-msgstr "çµ?æ??..."
+#: ../gui/user-switch-applet/applet.c:1170
+msgid "Quitâ?¦"
+msgstr "çµ?æ??â?¦"
 
-#: ../gui/user-switch-applet/applet.c:1304
+#: ../gui/user-switch-applet/applet.c:1276
 msgid "Unknown"
 msgstr "ä¸?æ??"
 
-#: ../gui/user-switch-applet/applet.c:1422
+#: ../gui/user-switch-applet/applet.c:1389
 msgid "User Switch Applet"
 msgstr "使ç?¨è??å??æ??é?¢æ?¿ç¨?å¼?"
 
-#: ../gui/user-switch-applet/applet.c:1436
+#: ../gui/user-switch-applet/applet.c:1404
 msgid "Change account settings and status"
 msgstr "æ?¹è®?帳è??設å®?å?¼è??ç??æ??"
 
@@ -1081,8 +1084,8 @@ msgstr "æ??令"
 
 #: ../utils/gdmflexiserver.c:62 ../utils/gdmflexiserver.c:63
 #: ../utils/gdmflexiserver.c:65 ../utils/gdmflexiserver.c:66
-msgid "Ignored - retained for compatibility"
-msgstr "已忽ç?¥ - å?ªç?ºç?¸å®¹æ?§è??ä¿?ç??"
+msgid "Ignored â?? retained for compatibility"
+msgstr "已忽ç?¥ â?? å?ªç?ºç?¸å®¹æ?§è??ä¿?ç??"
 
 #: ../utils/gdmflexiserver.c:64 ../utils/gdm-screenshot.c:43
 msgid "Debugging output"
@@ -1111,10 +1114,40 @@ msgid "Screenshot taken"
 msgstr "æ??ä¸?æ?ªå??"
 
 #. Option parsing
-#: ../utils/gdm-screenshot.c:281
+#: ../utils/gdm-screenshot.c:283
 msgid "Take a picture of the screen"
 msgstr "ç?§ä¸?è?¢å¹?ç??å??ç??"
 
+#~ msgid "Couldn't set groupid to 0"
+#~ msgstr "��設� groupid � 0"
+
+#~ msgid "%x"
+#~ msgstr "%x"
+
+#~ msgctxt "language"
+#~ msgid "Other..."
+#~ msgstr "��..."
+
+#~ msgctxt "keyboard"
+#~ msgid "Other..."
+#~ msgstr "��..."
+
+#~ msgid "_Sessions:"
+#~ msgstr "ä½?業é??段(_S):"
+
+#~ msgid "Manager"
+#~ msgstr "管ç??ç¨?å¼?"
+
+#~ msgid "The user manager object this user is controlled by."
+#~ msgstr "æ?§å?¶é??å??使ç?¨è??ç??使ç?¨è??管ç??ç¨?å¼?ç?©ä»¶ã??"
+
+#~ msgctxt "user"
+#~ msgid "Other..."
+#~ msgstr "��..."
+
+#~ msgid "Quit..."
+#~ msgstr "çµ?æ??..."
+
 #~ msgid "Enable debugging code"
 #~ msgstr "å??ç?¨é?¤é?¯ç¢¼"
 
@@ -1290,9 +1323,6 @@ msgstr "ç?§ä¸?è?¢å¹?ç??å??ç??"
 #~ msgid "Users"
 #~ msgstr "使ç?¨è??"
 
-#~ msgid "Other"
-#~ msgstr "��"
-
 #~ msgid "<span weight=\"bold\" size=\"larger\">Multiple Logins Found</span>"
 #~ msgstr "<span weight=\"bold\" size=\"larger\">ç?¼ç?¾å¤?é??ç?»å?¥</span>"
 
@@ -3367,9 +3397,6 @@ msgstr "ç?§ä¸?è?¢å¹?ç??å??ç??"
 #~ msgid "C_ommand:"
 #~ msgstr "æ??令(_O):"
 
-#~ msgid "C_ustom:"
-#~ msgstr "��(_U):"
-
 #~ msgid "Co_lor:"
 #~ msgstr "�彩(_L):"
 
@@ -3698,12 +3725,6 @@ msgstr "ç?§ä¸?è?¢å¹?ç??å??ç??"
 #~ msgid "Change _Session"
 #~ msgstr "æ?¹è®?ä½?業é??段(_S)"
 
-#~ msgid "Sessions"
-#~ msgstr "ä½?業é??段"
-
-#~ msgid "_Last session"
-#~ msgstr "ä¸?次ç??ä½?業é??段(_L)"
-
 #~ msgid "Log in using the session that you have used last time you logged in"
 #~ msgstr "沿ç?¨ä¸?次ç??ä½?業é??段ä¾?ç?»å?¥"