GNOME.org
 

[gdm] Update Simplified Chinese translations.

commit 53d0a6d9376ff1e936f4f7efd894d739d5df94d7
Author: Eleanor Chen <chenyueg gmail com>
Date:   Tue Jul 13 17:11:06 2010 +0800

    Update Simplified Chinese translations.

 po/zh_CN.po |  556 ++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 282 insertions(+), 274 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 95e1e2c..3e8cf4b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -5,14 +5,15 @@
 # ç??é?²(Gan Lu) <rhythm gan gmail com>, 2008, 2009
 # Tao Wei <weitao1979 gmail com>, 2009.
 # Aron Xu <happyaron xu gmail com>, 2010.
+# Fan Qijiang <fqj1994 linux com>, 2010.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gdm master\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 17:34+0800\n"
-"PO-Revision-Date: 2010-04-12 18:00+0800\n"
-"Last-Translator: Aron Xu <happyaron xu gmail com>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gdm&component=general\n";
+"POT-Creation-Date: 2010-06-28 17:15+0000\n"
+"PO-Revision-Date: 2010-07-13 17:00+0800\n"
+"Last-Translator: Eleanor Chen <chenyueg gmail com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,18 +25,24 @@ 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 ä»?å±?æ?¾ç¤ºç®¡ç??å?¨"
 
@@ -44,83 +51,85 @@ 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
-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ã??"
+#: ../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 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 "���� ID 设置为 %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 "initgroups() �� %s 失败"
 
-#: ../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 "����� ID 设置为 %d"
 
-#: ../daemon/gdm-server.c:392 ../daemon/gdm-welcome-session.c:574
-msgid "Couldn't set groupid to 0"
-msgstr "���� ID 设置为 0"
-
-#: ../daemon/gdm-server.c:431
+#: ../daemon/gdm-server.c:435
 #, c-format
-msgid "%s: Could not open logfile for display %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 ç??æ??å?¡å?¨å?½ä»¤ä¸ºç©º"
@@ -149,215 +158,217 @@ 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 "æ? æ³?å??建å¥?æ?¥å­?ï¼?"
 
-#: ../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 "æ? æ³?ä»?å??中解å?ºè®¤è¯?表"
 
-#: ../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ï¼?æ? æ³?ä»?å??中å??解å?ºè®¤è¯?表"
 
-#: ../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ï¼?ä»?ç¦?æ­¢ç??主æ?ºè?·å¾? REQUEST %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ï¼?æ? æ³?读å??å?¶é? å?? ID"
 
-#: ../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 è?·å¾? Manage"
 
-#: ../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ï¼?æ? æ³?读å??ä¼?è¯? ID"
 
-#: ../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ï¼?ä»?ç¦?æ­¢ç??主æ?ºè?·å¾? KEEPALIVE %s"
 
-#: ../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
+#: ../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
@@ -408,7 +419,7 @@ msgid "Make all warnings fatal"
 msgstr "ç½®æ??æ??è­¦å??为è?´å?½é??误"
 
 #: ../daemon/main.c:534
-msgid "Exit after a time - for debugging"
+msgid "Exit after a time (for debugging)"
 msgstr "ä¸?段æ?¶é?´å??é??å?º - è°?è¯?æ?¶ä½¿ç?¨"
 
 #: ../daemon/main.c:535
@@ -420,20 +431,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 "����"
 
@@ -458,11 +471,11 @@ 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"
+msgid "Use an on-screen keyboard"
 msgstr "使ç?¨å±?å¹?é?®ç??"
 
 #: ../data/greeter-autostart/metacity.desktop.in.h:1
@@ -485,43 +498,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 "é??æ?©å?¨å??表æ?¯å?¦å?¯è§?"
 
@@ -553,77 +566,93 @@ msgstr "%A %H:%M:%S"
 msgid "%a %l:%M %p"
 msgstr "%A %H:%M"
 
-#: ../gui/simple-greeter/gdm-greeter-login-window.c:278
-msgid "Automatically logging in..."
+#: ../gui/simple-greeter/gdm-greeter-login-window.c:290
+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: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..."
+#: ../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..."
+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 "æ?ªæ??å®?"
 
@@ -631,45 +660,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..."
+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"
 
@@ -683,7 +715,7 @@ msgstr "å?¨æ¸?å??中ä¿?å­?项ç?®æ?°é??ç??æ??大å?¼"
 
 #: ../gui/simple-greeter/gdm-remote-login-window.c:188
 #, c-format
-msgid "Remote Login (Connecting to %s...)"
+msgid "Remote Login (Connecting to %sâ?¦)"
 msgstr "����(正��� %s...)"
 
 #: ../gui/simple-greeter/gdm-remote-login-window.c:202
@@ -696,8 +728,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"
@@ -748,12 +780,11 @@ msgid "Recently selected languages"
 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."
+msgid "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
@@ -769,39 +800,37 @@ msgid "Set to true to disable showing the restart buttons in the login window."
 msgstr "设置为ç??å°?ç¦?æ­¢å?¨ç?»å½?çª?å?£ä¸­æ?¾ç¤ºé??å?¯å?¨æ??é?®"
 
 #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18
+msgid "Set to true to enable the XRandR settings manager plugin."
+msgstr "设置为ç??以å?¯ç?¨ XRandR 设置管ç??å?¨æ??件ã??"
+
+#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19
 msgid "Set to true to enable the background settings manager plugin."
 msgstr "设置为ç??以å?¯ç?¨è??æ?¯è®¾ç½®ç®¡ç??å?¨æ??件ã??"
 
-#: ../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 "设置为ç??以å?¯ç?¨å¤?åª?ä½?é?®ç®¡ç??å?¨æ??件ã??"
 
-#: ../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 "设置为ç??以å?¯ç?¨å±?å¹?é?®ç??ã??"
 
-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21
-msgid ""
-"Set to true to enable the plugin to manage the accessibility keyboard "
-"settings."
+#: ../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 "设置为ç??以å?¯ç?¨ç®¡ç??è¾?å?©å??è?½é?®ç??设置ç??æ??件ã??"
 
-#: ../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 "设置为ç??以å?¯ç?¨å±?å¹?æ?¾å¤§é??ã??"
 
-#: ../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 "设置为ç??以å?¯ç?¨å±?å¹?读å??å?¨ã??"
 
-#: ../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 "设置为ç??以å?¯ç?¨å£°é?³è®¾ç½®ç®¡ç??å?¨æ??件ã??"
 
-#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25
-msgid "Set to true to enable the xrandr settings manager plugin."
-msgstr "设置为ç??以å?¯ç?¨ xrandr 设置管ç??å?¨æ??件ã??"
-
 #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26
 msgid "Set to true to enable the xsettings settings manager plugin."
 msgstr "设置为ç??以å?¯ç?¨ xsettings 设置管ç??å?¨æ??件ã??"
@@ -811,43 +840,41 @@ 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."
+msgid "Set to true to use Compiz as the window manager."
 msgstr "设置为â??ç??(true)â??以使ç?¨ compiz ä½?为çª?å?£ç®¡ç??å?¨ã??"
 
 #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29
 #, fuzzy
-msgid ""
-"Text banner message to show on the login window when the user chooser is "
-"empty, instead of banner_message_text."
+msgid "Text banner message to show in the login window when the user chooser is empty, instead of banner_message_text."
 msgstr "æ?¾ç¤ºå?¨ç?»å½?çª?å?£ç??æ??æ?¬æ¨ªå¹?ä¿¡æ?¯ã??"
 
 #: ../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 "为ç??(true)表示 XRandR 设置管ç??å?¨æ??件已å?¯ç?¨ã??"
+
+#: ../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 "为ç??(true)表示 xrandr 设置管ç??å?¨æ??件已å?¯ç?¨ã??"
-
 #: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:35
 msgid "True if the xsettings settings manager plugin is enabled."
 msgstr "为ç??(true)æ?¶è¡¨ç¤º xsettings 设置管ç??å?¨æ??件已å?¯ç?¨ã??"
 
 #: ../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"
@@ -873,153 +900,136 @@ 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..."
+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
-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 "
-"the Free Software Foundation; either version 2 of the License, or (at your "
-"option) any later version."
-msgstr ""
+#: ../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 the Free Software Foundation; either version 2 of the License, or (at your option) any later version."
+msgstr "ç?¨æ?·å??æ?¢å°?å·¥å?·æ?¯è?ªç?±è½¯ä»¶ï¼?ä½ å?¯ä»¥é?µç?§è?ªç?±è½¯ä»¶å?ºé??ä¼?å?ºç??ç??GNUé??ç?¨å?¬å?±è®¸å?¯è¯?æ?¡æ¬¾æ?¥ä¿®æ?¹å??é??æ?°å??å¸?è¿?ä¸?ç¨?åº?ã??ä½ å?¯ä»¥ä½¿ç?¨è®¸å?¯è¯?ç??第äº?ç??ï¼?æ??è??ï¼?æ ¹æ?®ä½ ç??é??æ?©ï¼?ç?¨ä»»ä½?æ?´æ?°ç??ç??æ?¬ã??"
 
-#: ../gui/user-switch-applet/applet.c:168
-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 "
-"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
-"more details."
-msgstr ""
+#: ../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 FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details."
+msgstr "å??å¸?è¿?ä¸?ç¨?åº?æ?¯å¸?æ??ä»?æ??ç?¨ï¼?ä½?没æ??ä»»ä½?æ??ä¿?ã??ç??è?³æ²¡æ??ä»»ä½?é??å??ç?¹å®?ç?®ç??ç??é??å?«æ??ä¿?ã??æ?´å¤?详æ??ï¼?请å??é??GNUé??ç?¨å?¬å?±è®¸å?¯è¯?ã??"
 
-#: ../gui/user-switch-applet/applet.c:172
-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 ""
+#: ../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é??ç?¨å?¬å?±è®¸å?¯è¯?ç??å?¯æ?¬ï¼?å¦?æ??没æ??ï¼?å??ä¿¡ç»?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 ""
 "Wang Li <charles linux net cn>, 2002\n"
 "Funda Wang <fundawang linux net cn>, 2003, 2004\n"
 "ç??é?²(Gan Lu) <rhythm gan gmail com>, 2008, 2009\n"
 "Tao Wei <weitao1979 gmail com>, 2009\n"
-"Aron Xu <happyaron xu gmail com>, 2010"
+"Aron Xu <happyaron xu gmail com>, 2010\n"
+"Fan Qijiang <fqj1994 linux com>, 2010"
 
-#: ../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..."
+#: ../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 "æ?¹å??è´¦æ?·è®¾ç½®å??ç?¶æ??"
 
@@ -1055,12 +1065,15 @@ msgstr "å?ªæ?¯æ?? VERSION å?½ä»¤"
 msgid "COMMAND"
 msgstr "�令"
 
-#: ../utils/gdmflexiserver.c:62 ../utils/gdmflexiserver.c:63
-#: ../utils/gdmflexiserver.c:65 ../utils/gdmflexiserver.c:66
-msgid "Ignored - retained for compatibility"
+#: ../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:64 ../utils/gdm-screenshot.c:43
+#: ../utils/gdmflexiserver.c:64
+#: ../utils/gdm-screenshot.c:43
 msgid "Debugging output"
 msgstr "����"
 
@@ -1087,55 +1100,50 @@ msgid "Screenshot taken"
 msgstr "已���"
 
 #. Option parsing
-#: ../utils/gdm-screenshot.c:281
+#: ../utils/gdm-screenshot.c:283
 msgid "Take a picture of the screen"
-msgstr "æ??å??å±?å¹?ç??ä¸?å¼ å?¾ç??"
-
+msgstr "æ??å??å±?å¹?ç??ä¸?å¼ æ?ªå?¾"
+
+#~ msgid "Manager"
+#~ msgstr "管ç??å?¨"
+#~ msgid "The user manager object this user is controlled by."
+#~ msgstr "æ?§å?¶æ­¤ç?¨æ?·ç??ç?¨æ?·ç®¡ç??å?¨å¯¹è±¡"
+#~ msgid "Couldn't set groupid to 0"
+#~ msgstr "���� ID 设置为 0"
+#~ msgid "Quit..."
+#~ msgstr "é??å?º..."
 #~ msgid "%x"
 #~ msgstr "%x"
-
 #~ msgid "Authentication Dialog"
 #~ msgstr "认�对��"
-
 #~ msgid "Enable debugging code"
 #~ msgstr "����代�"
-
 #~ msgid "id"
 #~ msgstr "id"
-
 #~ msgid "worker exited with status %d"
 #~ msgstr "å·¥ä½?ç¨?åº?以ç?¶æ?? %d é??å?º"
-
 #~ msgid "Unable establish credentials"
 #~ msgstr "��建�信任��"
-
 #~ msgid "%a %b %e"
 #~ msgstr "%b%eæ?¥ æ??æ??%a"
-
 #~ msgid "%1$s, %2$s"
 #~ msgstr "%1$s, %2$s"
-
 #~ msgid "Failed to restart computer"
 #~ msgstr "é??æ?°å?¯å?¨è®¡ç®?æ?ºå¤±è´¥"
-
 #~ msgid ""
 #~ "You are not allowed to restart the computer because multiple users are "
 #~ "logged in"
 #~ msgstr "å? ä¸ºå¤?个ç?¨æ?·å·²ç?»å½?ï¼?ç³»ç»?ä¸?å??许你é??å?¯å?¨è®¡ç®?æ?º"
-
 #~ msgid "Failed to stop computer"
 #~ msgstr "��计��失败"
-
 #~ msgid ""
 #~ "You are not allowed to stop the computer because multiple users are "
 #~ "logged in"
 #~ msgstr "å? ä¸ºå¤?个ç?¨æ?·å·²ç?»å½?ï¼?ç³»ç»?ä¸?å??许你å?³é?­è®¡ç®?æ?º"
-
 #~ msgid "page 5"
 #~ msgstr "第5页"
-
 #~ msgid "Enable debugging"
 #~ msgstr "����"
-
 #~ msgid "Enable debugging mode for the greeter."
 #~ msgstr "为欢è¿?ç??é?¢å?¯ç?¨è°?è¯?模å¼?"
+
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]