[vino] Updated Simplified Chinese translation.

[Aron Xu <aronxu src gnome org>]

commit 090dfcdb54d1cd395558eb78d4dac365b1b087c2
Author: Tao Wei <weitao1979 gmail com>
Date:   Tue Nov 24 20:01:25 2009 +0800

    Updated Simplified Chinese translation.

 po/zh_CN.po |  402 +++++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 264 insertions(+), 138 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 20fa91c..5a6c9d0 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -12,9 +12,9 @@ msgstr ""
 "Project-Id-Version: vino HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=vino&component=Preferences Dialog\n"
-"POT-Creation-Date: 2009-04-05 10:11+0000\n"
-"PO-Revision-Date: 2009-04-09 14:08+0800\n"
-"Last-Translator: Ray Wang <wanglei1123 gmail com>\n"
+"POT-Creation-Date: 2009-11-17 08:33+0000\n"
+"PO-Revision-Date: 2009-11-19 18:59+0100\n"
+"Last-Translator: Tao Wei <weitao1979 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"
@@ -34,36 +34,40 @@ msgstr "å¤?å?¶å?°å??å?°å?ªè´´æ?¿(_C)"
 #: ../capplet/vino-message-box.c:103
 #, c-format
 msgid "There was an error showing the URL \"%s\""
-msgstr "æ?¾ç¤º URLâ??%sâ?? æ?¶å?ºé??"
+msgstr "æ?¾ç¤ºç½?å?? â??%sâ?? æ?¶å?ºç?°äº?ä¸?个é??误"
 
-#: ../capplet/vino-preferences.c:198 ../capplet/vino-preferences.c:989
+#: ../capplet/vino-preferences.c:197 ../capplet/vino-preferences.c:1000
 msgid "Checking the connectivity of this machine..."
 msgstr "æ­£å?¨æ£?æ?¥æ?¬æ?ºå?¨ç??è??ç½?ç?¶æ??..."
 
-#: ../capplet/vino-preferences.c:798
+#: ../capplet/vino-preferences.c:804
 #, c-format
 msgid ""
 "There was an error displaying help:\n"
 "%s"
 msgstr ""
-"æ?¾ç¤ºå¸®å?©æ?¶å?ºé??ï¼?\n"
+"æ?¾ç¤ºå¸®å?©æ?¶å?ºç?°äº?ä¸?个é??误ï¼?\n"
 "%s"
 
-#: ../capplet/vino-preferences.c:828
+#: ../capplet/vino-preferences.c:834
 msgid "Your desktop is only reachable over the local network."
-msgstr "ä½ ç??æ¡?é?¢ä»?å?¯å?¨æ?¬å?°ç½?ç»?中访é?®ã??"
+msgstr "æ?¨ç??æ¡?é?¢ä»?å?¯å?¨æ?¬å?°ç½?ç»?中访é?®ã??"
 
-#: ../capplet/vino-preferences.c:851 ../capplet/vino-preferences.c:922
+#: ../capplet/vino-preferences.c:854 ../capplet/vino-preferences.c:929
+msgid " or "
+msgstr "æ??è??"
+
+#: ../capplet/vino-preferences.c:859 ../capplet/vino-preferences.c:933
 #, c-format
 msgid "Others can access your computer using the address %s."
-msgstr "å?¶ä»?人å?¯ä»¥ä½¿ç?¨è¿?个å?°å?? %s æ?¥è®¿é?®ä½ ç??ç?µè??ã??"
+msgstr "å?¶ä»?人å?¯ä»¥ä½¿ç?¨è¿?个å?°å?? %s æ?¥è®¿é?®æ?¨ç??ç?µè??ã??"
 
-#: ../capplet/vino-preferences.c:975
+#: ../capplet/vino-preferences.c:986
 msgid "Nobody can access your desktop."
-msgstr "没æ??人å?¯è®¿é?®ä½ ç??æ¡?é?¢ã??"
+msgstr "没æ??人å?¯è®¿é?®æ?¨ç??æ¡?é?¢ã??"
 
-#: ../capplet/vino-preferences.c:1116 ../server/vino-dbus-listener.c:506
-#: ../server/vino-server.c:156 ../server/vino-server.c:187
+#: ../capplet/vino-preferences.c:1130 ../server/vino-server.c:164
+#: ../server/vino-server.c:194
 #, c-format
 msgid "Failed to open connection to bus: %s\n"
 msgstr "æ??å¼?å?°æ?»çº¿ç??è¿?æ?¥å¤±è´¥ï¼?%s\n"
@@ -77,103 +81,159 @@ msgstr "é??æ?©å?¶ä»?ç?¨æ?·å¦?ä½?ä»?è¿?ç¨?æ?¥ç??æ?¨ç??æ¡?é?¢"
 msgid "Remote Desktop"
 msgstr "����"
 
-#: ../capplet/vino-preferences.glade.h:1
-msgid "<b>Notification Area</b>"
-msgstr "<b>é??ç?¥å?ºå??</b>"
-
-#: ../capplet/vino-preferences.glade.h:2
-msgid "<b>Security</b>"
-msgstr "<b>å®?å?¨</b>"
-
-#: ../capplet/vino-preferences.glade.h:3
-msgid "<b>Sharing</b>"
-msgstr "<b>�享</b>"
-
-#: ../capplet/vino-preferences.glade.h:4
-msgid "<i>Some of these preferences are locked down</i>"
-msgstr "<i>æ??äº?é¦?é??项已被é??å®?</i>"
-
-#: ../capplet/vino-preferences.glade.h:5
+#: ../capplet/vino-preferences.ui.h:1
 msgid "Al_ways display an icon"
 msgstr "æ?»æ?¯æ?¾ç¤ºå?¾æ ?(_W)"
 
-#: ../capplet/vino-preferences.glade.h:6
+#: ../capplet/vino-preferences.ui.h:2
 msgid "Allow other users to _view your desktop"
 msgstr "å??许å?¶ä»?人æ?¥ç??æ?¨ç??æ¡?é?¢(_V)"
 
-#: ../capplet/vino-preferences.glade.h:7
+#: ../capplet/vino-preferences.ui.h:3
 msgid "Maximum size: 8 characters"
 msgstr "æ??大大å°?ï¼?8 个å­?符"
 
-#: ../capplet/vino-preferences.glade.h:8
+#: ../capplet/vino-preferences.ui.h:4
+msgid "Notification Area"
+msgstr "é??ç?¥å?ºå??"
+
+#: ../capplet/vino-preferences.ui.h:5
 msgid "Remote Desktop Preferences"
 msgstr "è¿?ç¨?æ¡?é?¢é¦?é??项"
 
-#: ../capplet/vino-preferences.glade.h:9
+#: ../capplet/vino-preferences.ui.h:6
 msgid "Remote users are able to control your mouse and keyboard"
 msgstr "è¿?ç¨?ç?¨æ?·å°?è?½å¤?æ?§å?¶æ?¨ç??é¼ æ ?å??é?®ç??"
 
-#: ../capplet/vino-preferences.glade.h:10
+#: ../capplet/vino-preferences.ui.h:7
+msgid "Security"
+msgstr "å®?å?¨"
+
+#: ../capplet/vino-preferences.ui.h:8
+msgid "Sharing"
+msgstr "�享"
+
+#: ../capplet/vino-preferences.ui.h:9
+msgid "Some of these preferences are locked down"
+msgstr "æ??äº?é¦?é??项已被é??å®?"
+
+#: ../capplet/vino-preferences.ui.h:10
 msgid "The router must have the UPnP feature enabled"
 msgstr "è·¯ç?±å?¨å¿?é¡»å?¯ç?¨ UPnP å??è?½"
 
-#: ../capplet/vino-preferences.glade.h:11
+#: ../capplet/vino-preferences.ui.h:11
 msgid "You will be queried to allow or to refuse every incoming connection"
-msgstr "ä½ å°?ä¼?被é?®å?°æ?¯å?¦å??许æ??æ??ç»?æ¯?个è¿?å?¥ç??è¿?æ?¥ã??"
+msgstr "æ?¨å°?ä¼?被é?®å?°æ?¯å?¦å??许æ??æ??ç»?æ¯?个è¿?å?¥ç??è¿?æ?¥ã??"
 
-#: ../capplet/vino-preferences.glade.h:12
+#: ../capplet/vino-preferences.ui.h:12
 msgid "Your desktop will be shared"
 msgstr "æ?¨ç??æ¡?é?¢å°?被å?±äº«"
 
-#: ../capplet/vino-preferences.glade.h:13
+#: ../capplet/vino-preferences.ui.h:13
 msgid "_Allow other users to control your desktop"
 msgstr "å??许å?¶ä»?ç?¨æ?·æ?§å?¶æ?¨ç??æ¡?é?¢(_A)"
 
-#: ../capplet/vino-preferences.glade.h:14
+#: ../capplet/vino-preferences.ui.h:14
 msgid "_Configure network automatically to accept connections"
 msgstr "é??ç½®ç½?ç»?为è?ªå?¨æ?¥å??è¿?æ?¥(_C)"
 
-#: ../capplet/vino-preferences.glade.h:15
+#: ../capplet/vino-preferences.ui.h:15
 msgid "_Never display an icon"
 msgstr "ä»?ä¸?æ?¾ç¤ºå?¾æ ?(_N)"
 
-#: ../capplet/vino-preferences.glade.h:16
+#: ../capplet/vino-preferences.ui.h:16
 msgid "_Only display an icon when there is someone connected"
 msgstr "ä»?å?¨å?«äººè¿?æ?¥ä¸?æ?¶æ?¾ç¤ºå?¾æ ?(_O)"
 
-#: ../capplet/vino-preferences.glade.h:17
+#: ../capplet/vino-preferences.ui.h:17
 msgid "_Require the user to enter this password:"
 msgstr "è¦?æ±?ç?¨æ?·è¾?å?¥æ­¤å¯?ç ?(_R)ï¼?"
 
-#: ../capplet/vino-preferences.glade.h:18
+#: ../capplet/vino-preferences.ui.h:18
 msgid "_You must confirm each access to this machine"
-msgstr "ä½ å¿?须为æ?¬æ?ºå?¨ç¡®è®¤æ¯?个访é?®(_Y)"
+msgstr "��须为���确认�个访�(_Y)"
 
-#: ../server/vino-dbus-listener.c:283 ../server/vino-dbus-listener.c:313
-#: ../server/vino-dbus-listener.c:357
+#: ../server/smclient/eggdesktopfile.c:165
 #, c-format
-msgid "Out of memory handling '%s' message"
-msgstr "å¤?ç??æ¶?æ?¯â??%sâ??æ?¶å??å­?ç?¨å°½"
+msgid "File is not a valid .desktop file"
+msgstr "æ??件ä¸?æ?¯ä¸?个æ??æ??ç?? .desktop æ??件"
 
-#: ../server/vino-dbus-listener.c:463
+#: ../server/smclient/eggdesktopfile.c:188
 #, c-format
-msgid "Out of memory registering object path '%s'"
-msgstr "注å??对象路å¾?â??%sâ??æ?¶å??å­?ç?¨å°½"
+msgid "Unrecognized desktop file Version '%s'"
+msgstr "ä¸?å?¯è¯?å?«ç??æ¡?é?¢æ??件ç??æ?¬ â??%sâ??"
 
-#: ../server/vino-dbus-listener.c:542
+#: ../server/smclient/eggdesktopfile.c:958
 #, c-format
-msgid "Failed to acquire D-Bus name '%s'\n"
-msgstr "è?·å?? D-Bus å??称â??%sâ??失败\n"
+msgid "Starting %s"
+msgstr "�� %s"
+
+#: ../server/smclient/eggdesktopfile.c:1100
+#, c-format
+msgid "Application does not accept documents on command line"
+msgstr "åº?ç?¨ç¨?åº?å?¨å?½ä»¤è¡?ä¸?ä¸?æ?¥å??æ??æ¡£"
+
+#: ../server/smclient/eggdesktopfile.c:1168
+#, c-format
+msgid "Unrecognized launch option: %d"
+msgstr "ä¸?å?¯è¯?å?«ç??å? è½½é??项ï¼?%d"
+
+#: ../server/smclient/eggdesktopfile.c:1373
+#, c-format
+msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
+msgstr "ä¸?è?½è½¬ç§»æ??æ¡£ URI å?°ä¸?个 â??Type=Linkâ?? æ¡?é?¢æ?¡ç?®"
+
+#: ../server/smclient/eggdesktopfile.c:1392
+#, c-format
+msgid "Not a launchable item"
+msgstr "ä¸?æ?¯ä¸?个å?¯ä»¥å? è½½ç??æ?¡ç?®"
+
+#: ../server/smclient/eggsmclient.c:225
+msgid "Disable connection to session manager"
+msgstr "ç¦?ç?¨å?°ä¼?è¯?管ç??å?¨ç??è¿?æ?¥"
+
+#: ../server/smclient/eggsmclient.c:228
+msgid "Specify file containing saved configuration"
+msgstr "æ??å®?å??å?«ä¿?å­?é??ç½®ç??æ??件"
+
+#: ../server/smclient/eggsmclient.c:228
+msgid "FILE"
+msgstr "æ??件"
+
+#: ../server/smclient/eggsmclient.c:231
+msgid "Specify session management ID"
+msgstr "æ??å®?ä¼?è¯?管ç??å?¨ ID"
+
+#: ../server/smclient/eggsmclient.c:231
+msgid "ID"
+msgstr "ID"
+
+#: ../server/smclient/eggsmclient.c:252
+msgid "Session management options:"
+msgstr "ä¼?è¯?管ç??å?¨é??项ï¼?"
 
-#: ../server/vino-dbus-listener.c:550
+#: ../server/smclient/eggsmclient.c:253
+msgid "Show session management options"
+msgstr "æ?¾ç¤ºä¼?è¯?管ç??å?¨é??项"
+
+#: ../server/vino-dbus-listener.c:461
 msgid "Remote Desktop server already running; exiting ...\n"
 msgstr "è¿?ç¨?æ¡?é?¢æ??å?¡å?¨å·²ç»?å?¨è¿?è¡?ï¼?é??å?º...\n"
 
-#: ../server/vino-main.c:89
+#: ../server/vino-main.c:67
+msgid "- VNC Server for GNOME"
+msgstr "- GNOME ç?? VNC æ??å?¡å?¨"
+
+#: ../server/vino-main.c:75
+msgid ""
+"Run 'vino-server --help' to see a full list of available command line options"
+msgstr "è¿?è¡? â??vino-server --helpâ?? æ?¥ç??å?¯ç?¨å?½ä»¤è¡?é??项ç??å?¨é?¨æ¸?å??"
+
+#: ../server/vino-main.c:98
 msgid "GNOME Remote Desktop"
 msgstr "GNOME ����"
 
-#: ../server/vino-main.c:99
+#: ../server/vino-main.c:108
 msgid ""
 "Your XServer does not support the XTest extension - remote desktop access "
 "will be view-only\n"
@@ -184,63 +244,63 @@ msgstr "æ?¨ç?? XServer ä¸?æ?¯æ?? XTest æ?©å±? - è¿?ç¨?æ¡?é?¢è®¿é?®å?ªè?½æ?¥ç??\n
 #. * "1" if "%s's remote desktop" doesn't make sense in
 #. * your language.
 #.
-#: ../server/vino-mdns.c:59
+#: ../server/vino-mdns.c:62
 msgid "vino-mdns:showusername"
-msgstr "1"
+msgstr "0"
 
 #.
 #. * Translators: this string is used ONLY if you
 #. * translated "vino-mdns:showusername" to anything
 #. * other than "1"
 #.
-#: ../server/vino-mdns.c:71
+#: ../server/vino-mdns.c:74
 #, c-format
 msgid "%s's remote desktop on %s"
-msgstr "%s ç??äº? %s ä¸?ç??è¿?ç¨?æ¡?é?¢"
+msgstr "%s å?¨ %s ä¸?ç??è¿?ç¨?æ¡?é?¢"
 
-#: ../server/vino-prefs.c:579
+#: ../server/vino-prefs.c:607
 #, c-format
 msgid "Received signal %d, exiting...\n"
 msgstr "å·²æ?¶å?°ä¿¡å?· %dï¼?é??å?ºä¸­...\n"
 
-#: ../server/vino-prompt.c:142
+#: ../server/vino-prompt.c:141
 msgid "Screen"
 msgstr "å±?å¹?"
 
-#: ../server/vino-prompt.c:143
+#: ../server/vino-prompt.c:142
 msgid "The screen on which to display the prompt"
 msgstr "æ?¾ç¤ºæ??示信æ?¯ç??å±?å¹?"
 
-#: ../server/vino-prompt.c:343
+#: ../server/vino-prompt.c:345
 #, c-format
 msgid ""
 "A user on the computer '%s' is trying to remotely view or control your "
 "desktop."
-msgstr "å?¨è®¡ç®?æ?ºâ??%sâ??ä¸?ç??ç?¨æ?·æ­£å?¨å°?è¯?è¿?ç¨?æ?¥ç??æ??æ?§å?¶æ?¨ç??æ¡?é?¢ã??"
+msgstr "å?¨è®¡ç®?æ?º â??%sâ?? ä¸?ç??ä¸?个ç?¨æ?·æ­£å?¨å°?è¯?è¿?ç¨?æ?¥ç??æ??æ?§å?¶æ?¨ç??æ¡?é?¢ã??"
 
-#: ../server/vino-prompt.glade.h:1
-msgid "<big><b>Another user is trying to view your desktop.</b></big>"
-msgstr "<big><b>å?¦ä¸?个ç?¨æ?·æ­£å?¨æ?¥ç??æ?¨ç??æ¡?é?¢ã??</b></big>"
-
-#: ../server/vino-prompt.glade.h:2
+#: ../server/vino-prompt.ui.h:1
 msgid ""
 "A user on another computer is trying to remotely view or control your "
 "desktop."
-msgstr "å?¨å?¶å®?计ç®?æ?ºä¸?ç??ç?¨æ?·å?¨å°?è¯?è¿?ç¨?æ?¥ç??æ??æ?§å?¶æ?¨ç??æ¡?é?¢ã??"
+msgstr "å?¨å?¶å®?计ç®?æ?ºä¸?ç??ä¸?个ç?¨æ?·å?¨å°?è¯?è¿?ç¨?æ?¥ç??æ??æ?§å?¶æ?¨ç??æ¡?é?¢ã??"
+
+#: ../server/vino-prompt.ui.h:2
+msgid "Another user is trying to view your desktop."
+msgstr "å?¦ä¸?个ç?¨æ?·æ­£å?¨å°?è¯?æ?¥ç??æ?¨ç??æ¡?é?¢ã??"
 
-#: ../server/vino-prompt.glade.h:3
+#: ../server/vino-prompt.ui.h:3
 msgid "Do you want to allow them to do so?"
 msgstr "æ?¨å??许ä»?们è¿?æ ·å??å??ï¼?"
 
-#: ../server/vino-prompt.glade.h:4
+#: ../server/vino-prompt.ui.h:4
 msgid "Question"
 msgstr "��"
 
-#: ../server/vino-prompt.glade.h:5 ../server/vino-util.c:64
+#: ../server/vino-prompt.ui.h:5 ../server/vino-util.c:65
 msgid "_Allow"
 msgstr "å??许(_A)"
 
-#: ../server/vino-prompt.glade.h:6 ../server/vino-util.c:65
+#: ../server/vino-prompt.ui.h:6 ../server/vino-util.c:66
 msgid "_Refuse"
 msgstr "æ??ç»?(_R)"
 
@@ -258,7 +318,7 @@ msgstr "�代端��"
 
 #: ../server/vino-server.schemas.in.h:3
 msgid "E-mail address to which the remote desktop URL should be sent"
-msgstr "å??é??è¿?ç¨?æ¡?é?¢ URL ç??ç?µå­?é?®ä»¶å?°å??"
+msgstr "å??é??è¿?ç¨?æ¡?é?¢ç½?å??ç??ç?µå­?é?®ä»¶å?°å??"
 
 #: ../server/vino-server.schemas.in.h:4
 msgid "Enable remote desktop access"
@@ -270,8 +330,8 @@ msgid ""
 "you want that accept connections only from some specific network interface. "
 "eg: eth0, wifi0, lo, ..."
 msgstr ""
-"å¦?æ??空置ï¼?æ??å?¡å?¨å°?ç??å?¬æ??æ??ç½?ç»?ç??é?¢ã??设å®?该å?¼ï¼?å¦?æ??ä½ å?ªæ??ç®?æ?¥æ?¶æ??äº?æ??å®?ç½?ç»?ç??"
-"é?¢ç??è¿?æ?¥ï¼?æ¯?å¦?ï¼?eth0ï¼?wifi0ï¼?lo,..."
+"å¦?æ??ä¸?设置ï¼?æ??å?¡å?¨å°?ç??å?¬æ??æ??ç½?ç»?ç??é?¢ã??设å®?该å?¼ï¼?å¦?æ??æ?¨å?ªæ??ç®?æ?¥æ?¶æ??äº?æ??å®?ç½?ç»?"
+"ç??é?¢ç??è¿?æ?¥ï¼?æ¯?å¦?ï¼?eth0ï¼?wifi0ï¼?lo,..."
 
 #: ../server/vino-server.schemas.in.h:6
 msgid ""
@@ -315,20 +375,30 @@ msgid ""
 "If true, the server will listen to another port, instead of the default "
 "(5900). The port must be specified in the 'alternative_port' key."
 msgstr ""
-"è?¥ä¸º trueï¼?æ??å?¡å?¨å°?ç??å?¬å?¦ä¸?个端å?£ï¼?è??ä¸?æ?¯é»?认ç?? 5900ã??端å?£å?·å¿?é¡»"
-"å?¨â??alternative_portâ??é?®ä¸­æ??å®?ã??"
+"å¦?æ??为 trueï¼?æ??å?¡å?¨å°?ç??å?¬å?¦ä¸?个端å?£ï¼?è??ä¸?æ?¯é»?认ç?? 5900ã??端å?£å?·å¿?é¡»å?¨ "
+"â??alternative_portâ?? é?®ä¸­æ??å®?ã??"
 
 #: ../server/vino-server.schemas.in.h:12
 msgid ""
+"If true, we will not use the XDamage extension of X.org. This extension does "
+"not work properly on some video drivers when using 3D effects. Disabling it "
+"will make vino work on these environments with a slower rendering as side "
+"effect."
+msgstr ""
+"å¦?æ??为ç??ï¼?æ??们å°?ä¸?使ç?¨ X.org ç?? XDamage æ?©å±?ã??è¿?个æ?©å±?å?¨ä¸?äº?æ?¾å?¡ä¸?ä¸?è?½æ­£å¸¸ä½¿"
+"ç?¨ 3D æ??æ??ã??ç¦?ç?¨å®?å°?ä¼?使 vino å?¨è¿?äº?ç?¯å¢?ä¸?è?½å¤?å·¥ä½?ï¼?ä½?æ?¯æ¸²æ??ä¼?æ?¢ä¸?ç?¹ã??"
+
+#: ../server/vino-server.schemas.in.h:13
+msgid ""
 "If true, we will use UPNP protocol to automatically forward the port used by "
 "vino in the router."
-msgstr "å¦?为 Trueï¼?å°?使ç?¨å??è®®è?ªå?¨è½¬å??å?¨è·¯ç?±å?¨ä¸­ vino 使ç?¨ç??端å?£ã??"
+msgstr "å¦?æ??为 Trueï¼?å°?使ç?¨å??è®®è?ªå?¨è½¬å??å?¨è·¯ç?±å?¨ä¸­ vino 使ç?¨ç??端å?£ã??"
 
-#: ../server/vino-server.schemas.in.h:13
+#: ../server/vino-server.schemas.in.h:14
 msgid "Listen an alternative port"
 msgstr "ç??å?¬æ?¿ä»£ç«¯å?£"
 
-#: ../server/vino-server.schemas.in.h:14
+#: ../server/vino-server.schemas.in.h:15
 msgid ""
 "Lists the authentication methods with which remote users may access the "
 "desktop. There are two possible authentication methods; \"vnc\" causes the "
@@ -340,31 +410,31 @@ msgstr ""
 "ç?¨æ?·è¾?å?¥å¯?ç ?(å¯?ç ?ç?± vnc_password é?®æ??å®?)æ??è??â??没æ??å¯?ç ?â??ï¼?å??许任ä½?è¿?ç¨?ç?¨æ?·è¿?"
 "æ?¥ã??"
 
-#: ../server/vino-server.schemas.in.h:15
+#: ../server/vino-server.schemas.in.h:16
 msgid "Lock the screen when last user disconnect"
 msgstr "æ??å??ä¸?个ç?¨æ?·æ?­å¼?è¿?æ?¥æ?¶é??ä½?å±?å¹?"
 
-#: ../server/vino-server.schemas.in.h:16
+#: ../server/vino-server.schemas.in.h:17
 msgid "Network interface for listening"
 msgstr "ç??å?¬ç½?ç»?ç??é?¢"
 
-#: ../server/vino-server.schemas.in.h:17
+#: ../server/vino-server.schemas.in.h:18
 msgid "Only allow remote users to view the desktop"
 msgstr "ä»?å??许è¿?ç¨?ç?¨æ?·æ?¥ç??æ¡?é?¢"
 
-#: ../server/vino-server.schemas.in.h:18
+#: ../server/vino-server.schemas.in.h:19
 msgid "Password required for \"vnc\" authentication"
-msgstr "â??vncâ??认è¯?ç??å¯?ç ?"
+msgstr "â??vncâ?? 认è¯?æ?¶æ??é??è¦?ç??å¯?ç ?"
 
-#: ../server/vino-server.schemas.in.h:19
+#: ../server/vino-server.schemas.in.h:20
 msgid "Prompt the user before completing a connection"
 msgstr "å®?æ??è¿?æ?¥å??æ??示ç?¨æ?·"
 
-#: ../server/vino-server.schemas.in.h:20
+#: ../server/vino-server.schemas.in.h:21
 msgid "Require encryption"
 msgstr "请æ±?å? å¯?"
 
-#: ../server/vino-server.schemas.in.h:21
+#: ../server/vino-server.schemas.in.h:22
 msgid ""
 "The password which the remote user will be prompted for if the \"vnc\" "
 "authentication method is used. The password specified by the key is base64 "
@@ -373,15 +443,15 @@ msgstr ""
 "è¿?ç¨?ç?¨æ?·ä¼?被æ??示è¾?å?¥ç??å¯?ç ?ï¼?å¦?æ??â??vncâ??éª?è¯?æ?¹æ³?å?¯ç?¨ã??æ­¤ç?±é?®æ??å®?å¯?ç ?æ?¯å?ºäº? 64 ä½?"
 "ç¼?ç ?ã??"
 
-#: ../server/vino-server.schemas.in.h:22
+#: ../server/vino-server.schemas.in.h:23
 msgid ""
 "The port which the server will listen to if the 'use_alternative_port' key "
 "is set to true. Valid values are in the range from 5000 to 50000."
 msgstr ""
-"è¿?æ?¯å?¨â??use_alternative_portâ??é?®è¢«è®¾å®?为 true æ?¶æ??å?¡å?¨å°?ç??å?¬ç??端å?£å?·ã??å?¯å??å?¼ç??"
-"è??å?´ä¸ºä»? 5000 å?° 50000ã??"
+"è¿?æ?¯å?¨ â??use_alternative_portâ?? é?®è¢«è®¾å®?为 true æ?¶æ??å?¡å?¨å°?ç??å?¬ç??端å?£å?·ã??å?¯å??å?¼"
+"ç??è??å?´ä¸ºä»? 5000 å?° 50000ã??"
 
-#: ../server/vino-server.schemas.in.h:23
+#: ../server/vino-server.schemas.in.h:24
 msgid ""
 "This key controls the behavior of the status icon. There are three options: "
 "\"always\" - The icon will be always there; \"client\" - You will see the "
@@ -391,28 +461,32 @@ msgstr ""
 "æ­¤é?®å?¼æ?§å?¶ç?¶æ??å?¾æ ?ç??è¡?为ã??æ??ä¸?个é??项ï¼?â??æ?»æ?¯â?? - æ?»æ?¯æ?¾ç¤ºå?¾æ ?ï¼?â??客æ?·â?? - æ?¨å°?ä»?"
 "å?¨æ??人è¿?æ?¥ä¸?ç??æ?¶å??ç??å?°å?¾æ ?ï¼?è¿?æ?¯é»?认è¡?为ï¼?â??ä»?ä¸?â?? - ä»?ä¸?æ?¾ç¤ºå?¾æ ?ã??"
 
-#: ../server/vino-server.schemas.in.h:24
+#: ../server/vino-server.schemas.in.h:25
 msgid ""
 "This key specifies the e-mail address to which the remote desktop URL should "
 "be sent if the user clicks on the URL in the Remote Desktop preferences "
 "dialog."
 msgstr ""
 "æ­¤é?®æ??å®?è¿?ç¨?æ¡?é?¢ URL åº?å??é??å?°ç?? E-mail å?°å??ã??ç?¨æ?·å?¨ç?¹å?»äº?è¿?ç¨?æ¡?é?¢é¦?é??项设置对"
-"è¯?æ¡?ç??å??ç?? URL æ?¶ï¼?ä¼?å??æ­¤å?°å??å??é??é?®ä»¶ã??"
+"è¯?æ¡?ç??å??ç??ç½?å??æ?¶ï¼?ä¼?å??æ­¤å?°å??å??é??é?®ä»¶ã??"
 
-#: ../server/vino-server.schemas.in.h:25
+#: ../server/vino-server.schemas.in.h:26
 msgid "When the status icon should be shown"
 msgstr "ä½?æ?¶æ?¾ç¤ºç?¶æ??å?¾æ ?"
 
-#: ../server/vino-server.schemas.in.h:26
+#: ../server/vino-server.schemas.in.h:27
 msgid "When true, disable the background on receive valid session"
 msgstr "å½?为 True æ?¶ï¼?å?¨æ?¶å?°æ??æ??è¿?ç¨?æ?¶ç¦?ç?¨è??æ?¯"
 
-#: ../server/vino-server.schemas.in.h:27
+#: ../server/vino-server.schemas.in.h:28
+msgid "Whether we should disable the XDamage extension of X.org"
+msgstr "æ??们æ?¯å?¦åº?å½?ç¦?ç?¨ X.org ç?? XDamage æ?©å±?"
+
+#: ../server/vino-server.schemas.in.h:29
 msgid "Whether we should use UPNP to forward the port in routers"
 msgstr "æ?¯å?¦ä½¿ç?¨ UPNP æ?¥è½¬å??è·¯ç?±å?¨ä¸­ç??端å?£"
 
-#: ../server/vino-status-icon.c:102
+#: ../server/vino-status-icon.c:102 ../server/vino-status-tube-icon.c:95
 msgid "Desktop sharing is enabled"
 msgstr "���享已��"
 
@@ -420,13 +494,13 @@ msgstr "���享已��"
 #, c-format
 msgid "One person is connected"
 msgid_plural "%d people are connected"
-msgstr[0] "%d ���已��"
+msgstr[0] "%d 个��已��"
 
-#: ../server/vino-status-icon.c:207
+#: ../server/vino-status-icon.c:207 ../server/vino-status-tube-icon.c:175
 msgid "Error displaying preferences"
 msgstr "æ?¾ç¤ºé¦?é??项æ?¶å?ºé??"
 
-#: ../server/vino-status-icon.c:226
+#: ../server/vino-status-icon.c:226 ../server/vino-status-tube-icon.c:191
 msgid "Error displaying help"
 msgstr "æ?¾ç¤ºå¸®å?©æ?¶å?ºé??"
 
@@ -467,86 +541,118 @@ msgstr ""
 msgid "translator-credits"
 msgstr ""
 "Yang Zhang <zyangmath gmail com>, 2007\n"
-"ç??é?²(Gan Lu) <rhythm gan gmail com>"
+"ç??é?²(Gan Lu) <rhythm gan gmail com>\n"
+"Tao Wei <weitao1979 gmail com>"
 
 #: ../server/vino-status-icon.c:274
 msgid "Share your desktop with other users"
 msgstr "ä¸?å?¶å®?ç?¨æ?·å?±äº«æ?¨ç??æ¡?é?¢"
 
-#. Translators: %s is a hostname
-#: ../server/vino-status-icon.c:338
+#: ../server/vino-status-icon.c:339 ../server/vino-status-tube-icon.c:223
 #, c-format
 msgid "Are you sure you want to disconnect '%s'?"
 msgstr "æ?¨ç¡®å®?è¦?æ?­å¼?è¿?æ?¥â??%sâ??å??ï¼?"
 
-#: ../server/vino-status-icon.c:340
+#: ../server/vino-status-icon.c:342
 #, c-format
 msgid "The remote user from '%s' will be disconnected. Are you sure?"
 msgstr "å°?è¦?æ?­å¼?ä¸?æ?¥è?ªâ??%sâ??ç??è¿?ç¨?ç?¨æ?·ç??è¿?æ?¥ã??æ?¨ç¡®å®?å??ï¼?"
 
-#: ../server/vino-status-icon.c:345
+#: ../server/vino-status-icon.c:348
 msgid "Are you sure you want to disconnect all clients?"
 msgstr "æ?¨ç¡®å®?è¦?æ?­å¼?ä¸?æ??æ??客æ?·ç«¯ç??è¿?æ?¥å??ï¼?"
 
-#: ../server/vino-status-icon.c:346
+#: ../server/vino-status-icon.c:350
 msgid "All remote users will be disconnected. Are you sure?"
 msgstr "å°?è¦?æ?­å¼?ä¸?æ??æ??è¿?ç¨?ç?¨æ?·ç??è¿?æ?¥ã??æ?¨ç¡®å®?å??ï¼?"
 
-#: ../server/vino-status-icon.c:358
+#: ../server/vino-status-icon.c:362 ../server/vino-status-tube-icon.c:237
 msgid "Disconnect"
 msgstr "æ?­å¼?è¿?æ?¥"
 
-#: ../server/vino-status-icon.c:384
+#: ../server/vino-status-icon.c:388 ../server/vino-status-tube-icon.c:262
 msgid "_Preferences"
 msgstr "é¦?é??项(_P)"
 
-#: ../server/vino-status-icon.c:399
+#: ../server/vino-status-icon.c:403
 msgid "Disconnect all"
 msgstr "æ?­å¼?æ??æ??è¿?æ?¥"
 
 #. Translators: %s is a hostname
-#: ../server/vino-status-icon.c:423
+#. Translators: %s is the alias of the telepathy contact
+#: ../server/vino-status-icon.c:427 ../server/vino-status-tube-icon.c:275
 #, c-format
 msgid "Disconnect %s"
 msgstr "æ?­å¼?è¿?æ?¥ %s"
 
-#: ../server/vino-status-icon.c:443
+#: ../server/vino-status-icon.c:448 ../server/vino-status-tube-icon.c:294
 msgid "_Help"
 msgstr "帮�(_H)"
 
-#: ../server/vino-status-icon.c:451
+#: ../server/vino-status-icon.c:456
 msgid "_About"
 msgstr "��(_A)"
 
-#: ../server/vino-status-icon.c:584
+#: ../server/vino-status-icon.c:589 ../server/vino-status-tube-icon.c:391
 #, c-format
 msgid "Error initializing libnotify\n"
 msgstr "å??å§?å?? libnotify å?ºé??\n"
 
-#: ../server/vino-status-icon.c:604
+#. Translators: %s is a hostname
+#: ../server/vino-status-icon.c:610
 msgid "Another user is viewing your desktop"
 msgstr "å?¶å®?ç?¨æ?·æ­£å?¨æ?¥ç??æ?¨ç??æ¡?é?¢"
 
-#: ../server/vino-status-icon.c:605
+#: ../server/vino-status-icon.c:612
 #, c-format
 msgid "A user on the computer '%s' is remotely viewing your desktop."
-msgstr "ä½?äº?计ç®?æ?ºâ??%sâ??ä¸?ç??ç?¨æ?·æ­£å?¨è¿?ç¨?æ?¥ç??æ?¨ç??æ¡?é?¢ã??"
+msgstr "ä½?äº?计ç®?æ?º â??%sâ?? ä¸?ç??ç?¨æ?·æ­£å?¨è¿?ç¨?æ?¥ç??æ?¨ç??æ¡?é?¢ã??"
 
-#: ../server/vino-status-icon.c:610
+#. Translators: %s is a hostname
+#: ../server/vino-status-icon.c:618
 msgid "Another user is controlling your desktop"
 msgstr "å?¶å®?ç?¨æ?·æ­£å?¨æ?§å?¶æ?¨ç??æ¡?é?¢"
 
-#: ../server/vino-status-icon.c:611
+#: ../server/vino-status-icon.c:620
 #, c-format
 msgid "A user on the computer '%s' is remotely controlling your desktop."
-msgstr "ä½?äº?计ç®?æ?ºâ??%sâ??ä¸?ç??ç?¨æ?·æ­£å?¨è¿?ç¨?æ?§å?¶æ?¨ç??æ¡?é?¢ã??"
+msgstr "ä½?äº?计ç®?æ?º â??%sâ?? ä¸?ç??ç?¨æ?·æ­£å?¨è¿?ç¨?æ?§å?¶æ?¨ç??æ¡?é?¢ã??"
 
-#: ../server/vino-status-icon.c:633
+#: ../server/vino-status-icon.c:642 ../server/vino-status-tube-icon.c:422
 #, c-format
 msgid "Error while displaying notification bubble: %s\n"
 msgstr "æ?¾ç¤ºæ°?泡é??ç?¥æ?¶å?ºé??ï¼?%s\n"
 
-#: ../server/vino-util.c:115
+#: ../server/vino-status-tube-icon.c:226
+#, c-format
+msgid "The remote user '%s' will be disconnected. Are you sure?"
+msgstr "å°?è¦?æ?­å¼?è¿?ç¨?ç?¨æ?· â??%sâ?? ç??è¿?æ?¥ã??æ?¨ç¡®å®?å??ï¼?"
+
+#: ../server/vino-tube-server.c:311 ../server/vino-tube-server.c:340
+msgid "Share my desktop information"
+msgstr "å?±äº«æ??ç??æ¡?é?¢ä¿¡æ?¯"
+
+#: ../server/vino-tube-server.c:315
+#, c-format
+msgid "'%s' rejected the desktop sharing invitation."
+msgstr "â??%sâ?? æ??ç»?äº?æ¡?é?¢å?±äº«é??请ã??"
+
+#: ../server/vino-tube-server.c:319
+#, c-format
+msgid "'%s' disconnected"
+msgstr "â??%sâ?? å·²ç»?æ?­å¼?è¿?æ?¥"
+
+#: ../server/vino-tube-server.c:346
+#, c-format
+msgid "'%s' is remotely controlling your desktop."
+msgstr "â??%sâ?? æ­£å?¨è¿?ç¨?æ?§å?¶æ?¨ç??æ¡?é?¢ã??"
+
+#: ../server/vino-tube-server.c:355
+#, c-format
+msgid "Waiting for '%s' to connect to the screen."
+msgstr "ç­?å¾? â??%sâ?? æ?¥è¿?æ?¥å?°å±?å¹?ã??"
+
+#: ../server/vino-util.c:116
 msgid "An error has occurred:"
 msgstr "å??ç??äº?ä¸?个é??误ï¼?"
 
@@ -583,35 +689,55 @@ msgstr "å??è¾?ä¸?次æ?°ç?? Vino å¯?ç ?ï¼?"
 msgid "vino-passwd: password updated successfully.\n"
 msgstr "vino-passwdï¼?å¯?ç ?æ?´æ?°æ??å??ã??\n"
 
-#: ../tools/vino-passwd.c:171
+#: ../tools/vino-passwd.c:172
 #, c-format
 msgid "Sorry, passwords do not match.\n"
 msgstr "对ä¸?èµ·ï¼?两次å¯?ç ?ä¸?ä¸?è?´ã??\n"
 
-#: ../tools/vino-passwd.c:172
+#: ../tools/vino-passwd.c:173
 #, c-format
 msgid "vino-passwd: password unchanged.\n"
 msgstr "vino-passwdï¼?å¯?ç ?没æ??æ?´æ?¢ã??\n"
 
-#: ../tools/vino-passwd.c:187
+#: ../tools/vino-passwd.c:181
+#, c-format
+msgid ""
+"Error while communicating with GConf. Are you logged into a GNOME session?"
+msgstr "å?? GConf é??讯æ?¶å?ºç?°äº?é??误ã??æ?¨å·²ç»?ç?»å½?å?°äº?ä¸?个 GNOME ä¼?è¯?å??ï¼?"
+
+#: ../tools/vino-passwd.c:183
+#, c-format
+msgid "Error message:"
+msgstr "é??误信æ?¯ï¼?"
+
+#: ../tools/vino-passwd.c:200
 msgid "Show Vino version"
 msgstr "æ?¾ç¤º Vino ç??æ?¬"
 
-#: ../tools/vino-passwd.c:196
+#: ../tools/vino-passwd.c:209
 msgid "- Updates Vino password"
 msgstr "- æ?´æ?° Vinoå¯?ç ?"
 
-#: ../tools/vino-passwd.c:206
+#: ../tools/vino-passwd.c:219
 msgid ""
 "Run 'vino-passwd --help' to see a full list of available command line options"
-msgstr "è¿?è¡? 'vino-passwd --help' æ?¥ç??å?¯ç?¨å?½ä»¤è¡?é??项ç??å?¨é?¨æ¸?å??"
+msgstr "è¿?è¡? â??vino-passwd --helpâ?? æ?¥ç??å?¯ç?¨å?½ä»¤è¡?é??项ç??å?¨é?¨æ¸?å??"
 
-#: ../tools/vino-passwd.c:213
+#: ../tools/vino-passwd.c:226
 #, c-format
 msgid "VINO Version %s\n"
 msgstr "VINO ç??æ?¬ %s\n"
 
-#: ../tools/vino-passwd.c:222
+#: ../tools/vino-passwd.c:238
 #, c-format
 msgid "ERROR: You do not have enough permissions to change Vino password.\n"
-msgstr "é??误ï¼?ä½ æ²¡æ??足å¤?æ??é??æ?´æ?¹ Vino å¯?ç ?ã??\n"
+msgstr "é??误ï¼?æ?¨æ²¡æ??足å¤?ç??æ??é??æ?¥æ?´æ?¹ Vino å¯?ç ?ã??\n"
+
+#~ msgid "Out of memory handling '%s' message"
+#~ msgstr "å¤?ç??æ¶?æ?¯â??%sâ??æ?¶å??å­?ç?¨å°½"
+
+#~ msgid "Out of memory registering object path '%s'"
+#~ msgstr "注å??对象路å¾?â??%sâ??æ?¶å??å­?ç?¨å°½"
+
+#~ msgid "Failed to acquire D-Bus name '%s'\n"
+#~ msgstr "è?·å?? D-Bus å??称â??%sâ??失败\n"