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



commit d617b547520913771cbe5eb289e76e4e5c61b653
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Sat Feb 13 06:49:26 2010 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po |  725 +++++++++++++++++++++++++++++++++++++++++-----------------
 po/zh_TW.po |  733 ++++++++++++++++++++++++++++++++++++++++++-----------------
 2 files changed, 1037 insertions(+), 421 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 9d3e96b..f2e503a 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -2,20 +2,20 @@
 # Copyright (C) 2008 Free Software Foundation, Inc.
 # This file is distributed under the same license as the vinagre package.
 # hialan <hialan liu gmail com>, 2008.
+# Chao-Hsiung Liao <j_h_liau yahoo com tw>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vinagre 2.27.90\n"
+"Project-Id-Version: vinagre 2.29.90\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-22 15:54+0800\n"
-"PO-Revision-Date: 2009-08-22 15:54+0800\n"
+"POT-Creation-Date: 2010-02-13 06:47+0800\n"
+"PO-Revision-Date: 2010-02-13 06:49+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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Poedit-Bookmarks: -1,103,-1,-1,-1,-1,-1,-1,-1,-1\n"
 
 #: ../data/GNOME_VinagreApplet.xml.h:1 ../vinagre/vinagre-plugin-manager.c:495
 msgid "_About"
@@ -32,19 +32,20 @@ msgstr "å­?å??é? ç«¯æ¡?é?¢"
 #: ../data/vinagre.desktop.in.in.h:2 ../data/vinagre-file.desktop.in.in.h:2
 #: ../vinagre/GNOME_VinagreApplet.server.in.in.h:2
 #: ../vinagre/vinagre-applet.c:434 ../vinagre/vinagre-applet.c:486
-#: ../vinagre/vinagre-main.c:198
+#: ../vinagre/vinagre-main.c:200
 msgid "Remote Desktop Viewer"
 msgstr "�端��檢��"
 
 #: ../data/vinagre.ui.h:1
-msgid "All fields above are mandatory"
-msgstr "ä¸?é?¢æ??æ??æ¬?ä½?é?½æ?¯å¿?è¦?ç??"
+msgid "Allow _keyboard shortcuts"
+msgstr "å??許é?µç?¤æ?·å¾?é?µ(_K)"
 
 #: ../data/vinagre.ui.h:2
 msgid "Authentication is required"
 msgstr "é??è¦?é©?è­?"
 
-#: ../data/vinagre.ui.h:3 ../vinagre/vinagre-fav.c:856
+#. setup label
+#: ../data/vinagre.ui.h:3 ../vinagre/vinagre-fav.c:851
 msgid "Bookmarks"
 msgstr "�籤"
 
@@ -61,7 +62,7 @@ msgid "Folder"
 msgstr "è³?æ??夾"
 
 #: ../data/vinagre.ui.h:7 ../plugins/ssh/vinagre-ssh-tab.c:49
-#: ../plugins/vnc/vinagre-vnc-tab.c:134 ../vinagre/vinagre-fav.c:425
+#: ../plugins/vnc/vinagre-vnc-tab.c:148 ../vinagre/vinagre-fav.c:404
 msgid "Host:"
 msgstr "主��"
 
@@ -81,48 +82,51 @@ msgstr "ä¸?層è³?æ??夾"
 msgid "Preferences"
 msgstr "å??好設å®?"
 
-#: ../data/vinagre.ui.h:12
+#. This is a tooltip in preferences dialog
+#: ../data/vinagre.ui.h:13
+msgid ""
+"This option enables menu accelerators and keyboard shortcuts. For more info "
+"on why you may want to disable them, check the documentation."
+msgstr "é??å??é?¸é ?æ??å??ç?¨é?¸å?®è??é?µç?¤ç??æ?·å¾?é?µã??æ?³äº?解å?¨ä»?麼æ??å½¢ä¸?ä½ æ??æ?³å??ç?¨å®?å??ï¼?è«?æ?¥é?±æ??件ã??"
+
+#: ../data/vinagre.ui.h:14
 msgid "Which machine do you want to connect to?"
 msgstr "ä½ æ?³é?£ç·?å?°å?ªå??æ©?å?¨ï¼?"
 
-#: ../data/vinagre.ui.h:13
+#: ../data/vinagre.ui.h:15
 msgid "_Always show tabs"
 msgstr "æ°¸é? é¡¯ç¤ºå??é ?(_A)"
 
 #. This is a button label, in the authentication dialog
-#: ../data/vinagre.ui.h:15
+#: ../data/vinagre.ui.h:17
 msgid "_Authenticate"
 msgstr "é©?è­?(_A)"
 
-#: ../data/vinagre.ui.h:16
+#: ../data/vinagre.ui.h:18
 msgid "_Full screen"
 msgstr "���(_F)"
 
-#: ../data/vinagre.ui.h:17
+#: ../data/vinagre.ui.h:19
 msgid "_Host:"
 msgstr "主�(_H):"
 
-#: ../data/vinagre.ui.h:18
+#: ../data/vinagre.ui.h:20
 msgid "_Name:"
 msgstr "å??稱(_N):"
 
-#: ../data/vinagre.ui.h:19
+#: ../data/vinagre.ui.h:21
 msgid "_Password:"
 msgstr "�碼(_P):"
 
-#: ../data/vinagre.ui.h:20
+#: ../data/vinagre.ui.h:22
 msgid "_Protocol:"
 msgstr "é??è¨?å??å®?(_P):"
 
-#: ../data/vinagre.ui.h:21
+#: ../data/vinagre.ui.h:23
 msgid "_Remember this credential"
 msgstr "è¨?ä½?é??å??è­?æ?¸(_R)"
 
-#: ../data/vinagre.ui.h:22
-msgid "_Show menu shortcuts"
-msgstr "顯示�����(_S)"
-
-#: ../data/vinagre.ui.h:23
+#: ../data/vinagre.ui.h:24 ../plugins/ssh/vinagre-ssh-plugin.c:144
 msgid "_Username:"
 msgstr "使ç?¨è??å??稱(_U):"
 
@@ -155,33 +159,43 @@ msgid ""
 msgstr "設ç?ºã??trueã??å??æ°¸é? é¡¯ç¤ºå??é ?ã??設ç?ºã??falseã??å??å?ªæ??å?¨å??æ??使ç?¨ä¸?å??以ä¸?ç??é?£ç·?æ??顯示å??é ?ã??"
 
 #: ../data/vinagre.schemas.in.in.h:6
+msgid ""
+"Set to \"true\" to always start the program listening for reverse "
+"connections."
+msgstr "設å®?ç?ºã??trueã??å??å??å??ç¨?å¼?æ??æ°¸é? æ??è?½å??å??å??é?£ç·?ã??"
+
+#: ../data/vinagre.schemas.in.in.h:7
 msgid "Specifies the maximum number of items in the host dropdown entry."
 msgstr "æ??å®?å?¨ä¸»æ©?ä¸?æ??å¼?é ?ç?®ä¸­æ??顯示é ?ç?®ç??æ??大æ?¸ç?®ã??"
 
-#: ../data/vinagre.schemas.in.in.h:7
+#: ../data/vinagre.schemas.in.in.h:8
 msgid "The handler for \"vnc://\" URLs"
 msgstr "ã??vnc://ã??網å??ç??è??ç??ç¨?å¼?"
 
-#: ../data/vinagre.schemas.in.in.h:8
+#: ../data/vinagre.schemas.in.in.h:9
 msgid ""
 "When connecting to a host, the client can say to the server to leave other "
 "clients connected or to drop the existent connections. Set the value to true "
 "to share the desktop with the other clients."
 msgstr "ç?¶é?£ç·?å?°ä¸»æ©?æ??ï¼?此客æ?¶ç«¯ç¨?å¼?å?¯ä»¥è¦?æ±?該伺æ??å?¨ä¿?ç??å?¶ä»?å·²é?£ç·?ç??客æ?¶ç«¯æ??è??中æ?·æ?¢å­?ç??é?£ç·?ã??å°?é??å??æ?¸å?¼è¨­ç?º true å?¯ä»¥è??å?¶ä»?客æ?¶ç«¯ç¨?å¼?å?±å??使ç?¨æ¡?é?¢ã??"
 
-#: ../data/vinagre.schemas.in.in.h:9
+#: ../data/vinagre.schemas.in.in.h:10
 msgid "Whether we should leave other clients connected"
 msgstr "æ?¯å?¦ä¿?ç??å?¶ä»?å·²é?£ç·?ç??客æ?¶ç«¯ç¨?å¼?"
 
-#: ../data/vinagre.schemas.in.in.h:10
+#: ../data/vinagre.schemas.in.in.h:11
 msgid ""
 "Whether we should show tabs even when there is only one active connection"
 msgstr "æ?¯å?¦è¦?å?¨å?ªä½¿ç?¨ä¸?å??é?£ç·?æ??顯示å??é ?"
 
-#: ../data/vinagre.schemas.in.in.h:11
+#: ../data/vinagre.schemas.in.in.h:12
 msgid "Whether we should show the menu accelerators (shortcut keys)"
 msgstr "æ?¯å?¦é¡¯ç¤ºé?¸å?®å? é??é?µï¼?æ?·å¾?é?µï¼?"
 
+#: ../data/vinagre.schemas.in.in.h:13
+msgid "Whether we should start the program listening for reverse connections"
+msgstr "æ?¯å?¦å??å??ç¨?å¼?以è?½å??å??å??é?£ç·?"
+
 #: ../data/vinagre-mime.xml.in.h:1
 msgid "Remote Desktop (VNC) file"
 msgstr "é? ç«¯æ¡?é?¢(VNC)æ??件"
@@ -191,17 +205,28 @@ msgid "Remote Desktop Connection"
 msgstr "�端����"
 
 #. vim: set ts=8:
-#: ../plugins/ssh/vinagre-ssh-plugin.c:70
+#: ../plugins/ssh/vinagre-ssh-plugin.c:76
 #: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:1
 msgid "SSH"
 msgstr "SSH"
 
 #. Translators: This is a description of the SSH protocol. It appears at Connect dialog.
-#: ../plugins/ssh/vinagre-ssh-plugin.c:72
+#: ../plugins/ssh/vinagre-ssh-plugin.c:78
 msgid "Access Unix/Linux terminals"
 msgstr "å­?å?? Unix/Linux çµ?端æ©?"
 
-#: ../plugins/ssh/vinagre-ssh-tab.c:50 ../plugins/vnc/vinagre-vnc-tab.c:135
+#: ../plugins/ssh/vinagre-ssh-plugin.c:132
+msgid "SSH Options"
+msgstr "SSH ��"
+
+#. Translators: This is the tooltip for the username field in a SSH connection
+#: ../plugins/ssh/vinagre-ssh-plugin.c:149
+msgid ""
+"Optional. If blank, your username will be used. Also, it can be supplied in "
+"the Machine field above, in the form username hostname "
+msgstr "é?¸æ??æ?§ç??ã??å¦?æ??ä¿?æ??空ç?½ï¼?æ??使ç?¨ä½ ç??使ç?¨è??å??稱ã??å?¦å¤?ï¼?ä¹?å?¯ä»¥å?¨ä¸?é?¢ç??ã??æ©?å?¨ã??æ¬?ä½?中æ??å®?ï¼?æ ¼å¼?ç?º 使ç?¨è??å??稱 主æ©?å??稱ã??"
+
+#: ../plugins/ssh/vinagre-ssh-tab.c:50 ../plugins/vnc/vinagre-vnc-tab.c:149
 msgid "Port:"
 msgstr "���:"
 
@@ -209,140 +234,227 @@ msgstr "���:"
 msgid "SSH support"
 msgstr "SSH ��"
 
-#: ../plugins/vnc/vinagre-vnc-connection.c:207
-#: ../plugins/vnc/vinagre-vnc-plugin.c:214
+#: ../plugins/vnc/vinagre-vnc-connection.c:290
+#: ../plugins/vnc/vinagre-vnc-plugin.c:321
 #, c-format
 msgid ""
 "Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it."
 msgstr "ã??sharedã??æ??æ¨?æ?¸å?¼é?¯èª¤ï¼?%dã??å®?æ??該ç?º 0 æ?? 1ã??å?ªè?½å¿½ç?¥æ­¤æ?¸å?¼ã??"
 
+#: ../plugins/vnc/vinagre-vnc-plugin.c:84
+msgid "_Reverse Connections..."
+msgstr "å??å??é?£ç·?(_R)..."
+
+#: ../plugins/vnc/vinagre-vnc-plugin.c:86
+msgid "Configure incoming VNC connections"
+msgstr "設å®?é?£å?¥ç?? VNC é?£ç·?"
+
 #. Translators: this is a command line option (run vinagre --help)
-#: ../plugins/vnc/vinagre-vnc-plugin.c:66
+#: ../plugins/vnc/vinagre-vnc-plugin.c:173
 msgid "Enable scaled mode"
 msgstr "å??ç?¨ç¸®æ?¾æ¨¡å¼?"
 
 #. Translators: this is a command line option (run vinagre --help)
-#: ../plugins/vnc/vinagre-vnc-plugin.c:81
+#: ../plugins/vnc/vinagre-vnc-plugin.c:188
 msgid "VNC Options:"
 msgstr "VNC ���"
 
 #. Translators: this is a command line option (run vinagre --help)
-#: ../plugins/vnc/vinagre-vnc-plugin.c:83
+#: ../plugins/vnc/vinagre-vnc-plugin.c:190
 msgid "Show VNC Options"
 msgstr "顯示 VNC ��"
 
 #. vim: set ts=8:
-#: ../plugins/vnc/vinagre-vnc-plugin.c:105
+#: ../plugins/vnc/vinagre-vnc-plugin.c:212
 #: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:1
 msgid "VNC"
 msgstr "VNC"
 
-#: ../plugins/vnc/vinagre-vnc-plugin.c:106
+#: ../plugins/vnc/vinagre-vnc-plugin.c:213
 msgid "Access Unix/Linux, Windows and other machines."
 msgstr "å­?å?? Unix/Linuxã??Windows å??å?¶ä»?é?»è?¦ã??"
 
-#: ../plugins/vnc/vinagre-vnc-plugin.c:163
+#: ../plugins/vnc/vinagre-vnc-plugin.c:270
 msgid "Could not parse the file."
 msgstr "ç?¡æ³?解æ??該æª?æ¡?ã??"
 
-#: ../plugins/vnc/vinagre-vnc-plugin.c:170
+#: ../plugins/vnc/vinagre-vnc-plugin.c:277
 msgid "The file is not a VNC one: Missing the group \"connection\"."
 msgstr "該æª?æ¡?並é?? VNC æª?æ¡?ï¼?缺å°?ç¾£çµ?ã??connectionã??ã??"
 
-#: ../plugins/vnc/vinagre-vnc-plugin.c:176
+#: ../plugins/vnc/vinagre-vnc-plugin.c:283
 msgid "The file is not a VNC one: Missing the key \"host\"."
 msgstr "該æª?æ¡?並é?? VNC æª?æ¡?ï¼?缺å°?設å®?é?µã??hostã??ã??"
 
-#: ../plugins/vnc/vinagre-vnc-plugin.c:243
+#: ../plugins/vnc/vinagre-vnc-plugin.c:374
 msgid "VNC Options"
 msgstr "VNC ��"
 
-#: ../plugins/vnc/vinagre-vnc-plugin.c:254
-#: ../plugins/vnc/vinagre-vnc-tab.c:654
+#. View only check button
+#: ../plugins/vnc/vinagre-vnc-plugin.c:387
+#: ../plugins/vnc/vinagre-vnc-tab.c:632
 msgid "_View only"
 msgstr "å?ªæ??檢è¦?(_V)"
 
-#: ../plugins/vnc/vinagre-vnc-plugin.c:261
+#. Scaling check button
+#: ../plugins/vnc/vinagre-vnc-plugin.c:395
 msgid "_Scaling"
 msgstr "縮�(_S)"
 
+#: ../plugins/vnc/vinagre-vnc-plugin.c:411
+msgid "_Keep aspect ratio"
+msgstr "ä¿?æ??é?·å¯¬æ¯?(_K)"
+
+#. JPEG Compression check button
+#: ../plugins/vnc/vinagre-vnc-plugin.c:421
+msgid "_Use JPEG Compression"
+msgstr "使� JPEG �縮(_U)"
+
+#: ../plugins/vnc/vinagre-vnc-plugin.c:422
+msgid "This might not work on all VNC servers"
+msgstr "é??å?¯è?½ç?¡æ³?ç?¨æ?¼æ??æ??ç?? VNC 伺æ??å?¨"
+
+#: ../plugins/vnc/vinagre-vnc-plugin.c:431
+msgid "_Depth Color:"
+msgstr "��深度(_D):"
+
+#: ../plugins/vnc/vinagre-vnc-plugin.c:436
+msgid "Use Server Settings"
+msgstr "使ç?¨ä¼ºæ??å?¨è¨­å®?å?¼"
+
+#: ../plugins/vnc/vinagre-vnc-plugin.c:437
+msgid "True Color (24 bits)"
+msgstr "ç??彩 (24 ä½?å??)"
+
+#: ../plugins/vnc/vinagre-vnc-plugin.c:438
+msgid "High Color (16 bits)"
+msgstr "é«?彩 (16 ä½?å??)"
+
+#: ../plugins/vnc/vinagre-vnc-plugin.c:439
+msgid "Low Color (8 bits)"
+msgstr "ä½?è?²å½© (8 ä½?å??)"
+
+#: ../plugins/vnc/vinagre-vnc-plugin.c:440
+msgid "Ultra Low Color (3 bits)"
+msgstr "極ä½?è?²å½© (3 ä½?å??)"
+
+#. Translators: the whole sentence will be: Use host <hostname> as a SSH tunnel
+#: ../plugins/vnc/vinagre-vnc-plugin.c:453
+msgid "Use h_ost"
+msgstr "使�主�(_O)"
+
+#. Translators: This is the tooltip of the SSH tunneling entry
+#: ../plugins/vnc/vinagre-vnc-plugin.c:461
+msgid "hostname or user hostname"
+msgstr "主æ©?å??稱 æ?? 使ç?¨è?? 主æ©?å??稱"
+
+#. Translators: the whole sentence will be: Use host <hostname> as a SSH tunnel
+#: ../plugins/vnc/vinagre-vnc-plugin.c:465
+msgid "as a SSH tunnel"
+msgstr "å??ç?º SSH ç©¿é?§"
+
 #. Translators: this is a pattern to open *.vnc files in a open dialog.
-#: ../plugins/vnc/vinagre-vnc-plugin.c:285
+#: ../plugins/vnc/vinagre-vnc-plugin.c:500
 msgid "VNC Files"
 msgstr "VNC ��"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:133
+#: ../plugins/vnc/vinagre-vnc-tab.c:147
 msgid "Desktop Name:"
 msgstr "æ¡?é?¢å??稱ï¼?"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:136
+#: ../plugins/vnc/vinagre-vnc-tab.c:150
 msgid "Dimensions:"
 msgstr "尺寸:"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:268
+#: ../plugins/vnc/vinagre-vnc-tab.c:304
+msgid "Error creating the SSH tunnel"
+msgstr "建ç«? SSH ç©¿é?§æ??ç?¼ç??é?¯èª¤"
+
+#: ../plugins/vnc/vinagre-vnc-tab.c:305 ../plugins/vnc/vinagre-vnc-tab.c:316
+msgid "Unknown reason"
+msgstr "ä¸?æ??ç??å??å? "
+
+#: ../plugins/vnc/vinagre-vnc-tab.c:315
 msgid "Error connecting to host."
 msgstr "é?£ç·?å?°ä¸»æ©?æ??é?¯èª¤ã??"
 
 #. Translators: %s is a host name or IP address; %u is a code error (number).
-#: ../plugins/vnc/vinagre-vnc-tab.c:306
+#: ../plugins/vnc/vinagre-vnc-tab.c:360
 #, c-format
 msgid "Authentication method to host %s is unsupported. (%u)"
 msgstr "ä¸?æ?¯æ??å?°ä¸»æ©? %s ç??é©?è­?æ?¹æ³?ã??(%u)"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:310
+#: ../plugins/vnc/vinagre-vnc-tab.c:364
 msgid "Authentication unsupported"
 msgstr "ä¸?æ?¯æ?´ç??é©?è­?æ?¹æ³?"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:570 ../plugins/vnc/vinagre-vnc-tab.c:587
+#: ../plugins/vnc/vinagre-vnc-tab.c:531 ../plugins/vnc/vinagre-vnc-tab.c:548
 msgid "Authentication error"
 msgstr "���誤"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:571
+#: ../plugins/vnc/vinagre-vnc-tab.c:532
 msgid "A username is required in order to access this machine."
 msgstr "ç?ºäº?å­?å??é??å??é?»è?¦é??è¦?使ç?¨è??å??稱ã??"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:588
+#: ../plugins/vnc/vinagre-vnc-tab.c:549
 msgid "A password is required in order to access this machine."
 msgstr "ç?ºäº?å­?å??é??å??é?»è?¦é??è¦?å¯?碼ã??"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:639
+#: ../plugins/vnc/vinagre-vnc-tab.c:603
 msgid "S_caling"
 msgstr "縮�(_C)"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:640
+#: ../plugins/vnc/vinagre-vnc-tab.c:604
 msgid "Fits the remote screen into the current window size"
 msgstr "è®?é? ç«¯è?¢å¹?è?½ç¬¦å??ç?®å??ç??è¦?çª?大å°?"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:655
+#: ../plugins/vnc/vinagre-vnc-tab.c:617
+msgid "_Keep Aspect Ratio"
+msgstr "ä¿?æ??é?·å¯¬æ¯?(_K)"
+
+#: ../plugins/vnc/vinagre-vnc-tab.c:618
+msgid "Keeps the screen aspect ratio when using scaling"
+msgstr "使ç?¨ç¸®æ?¾æ??ä¿?æ??è?¢å¹?é?·å¯¬æ¯?"
+
+#: ../plugins/vnc/vinagre-vnc-tab.c:633
 msgid "Does not send mouse and keyboard events"
 msgstr "ä¸?è¦?é??å?ºæ»?é¼ è??é?µç?¤äº?件"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:668
+#: ../plugins/vnc/vinagre-vnc-tab.c:646
 msgid "_Original size"
 msgstr "å??å§?大å°?(_O)"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:669
+#: ../plugins/vnc/vinagre-vnc-tab.c:647
 msgid "Adjusts the window to the remote desktop's size"
 msgstr "å°?è¦?çª?調æ?´ç?ºé? ç«¯æ¡?é?¢ç??大å°?"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:692 ../plugins/vnc/vinagre-vnc-tab.c:766
-#: ../plugins/vnc/vinagre-vnc-tab.c:767
+#: ../plugins/vnc/vinagre-vnc-tab.c:660
+msgid "_Refresh Screen"
+msgstr "é??æ?°æ?´ç??ç?«é?¢(_R)"
+
+#: ../plugins/vnc/vinagre-vnc-tab.c:661
+msgid "Requests an update of the screen"
+msgstr "������"
+
+#. Send Ctrl-alt-del
+#: ../plugins/vnc/vinagre-vnc-tab.c:683 ../plugins/vnc/vinagre-vnc-tab.c:755
+#: ../plugins/vnc/vinagre-vnc-tab.c:757
 msgid "Send Ctrl-Alt-Del"
 msgstr "å?³é?? Ctrl-Alt-Del"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:693
+#: ../plugins/vnc/vinagre-vnc-tab.c:684
 msgid "Sends Ctrl+Alt+Del to the remote machine"
 msgstr "å?³é?? Ctrl+Alt+Del å?°é? ç«¯æ©?å?¨"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:745 ../plugins/vnc/vinagre-vnc-tab.c:746
+#: ../plugins/vnc/vinagre-vnc-tab.c:736 ../plugins/vnc/vinagre-vnc-tab.c:737
 msgid "Scaling"
 msgstr "正�縮�"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:755 ../plugins/vnc/vinagre-vnc-tab.c:756
+#: ../plugins/vnc/vinagre-vnc-tab.c:746 ../plugins/vnc/vinagre-vnc-tab.c:747
 msgid "Read only"
 msgstr "��"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:925
+#: ../plugins/vnc/vinagre-vnc-tab.c:919
 msgid ""
 "Scaling is not supported on this installation.\n"
 "\n"
@@ -353,10 +465,66 @@ msgstr ""
 "\n"
 "è«?é?±è®? README æª?æ¡?ï¼?é?¨é??å?¨ Vinagre è£?ï¼?以äº?解å¦?ä½?å??ç?¨é??å??å??è?½ã??"
 
+#: ../plugins/vnc/vinagre-vnc-tunnel.c:77
+#, c-format
+msgid "Unable to find a free TCP port"
+msgstr "æ?¾ä¸?å?°å?¯ç?¨ç?? TCP é?£æ?¥å? "
+
 #: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:2
 msgid "VNC support"
 msgstr "VNC ��"
 
+#: ../plugins/vnc/vinagre-vnc-listener-dialog.c:90
+msgid "IPv4:"
+msgstr "IPv4ï¼?"
+
+#: ../plugins/vnc/vinagre-vnc-listener-dialog.c:102
+msgid ""
+"\n"
+"\n"
+"IPv6:"
+msgstr ""
+"\n"
+"\n"
+"IPv6ï¼?"
+
+#: ../plugins/vnc/vinagre-vnc-listener-dialog.c:161
+#, c-format
+msgid "On the port %d"
+msgstr "���� %d"
+
+#: ../plugins/vnc/vinagre-vnc-listener.c:168
+msgid "Incoming VNC connection arrived but there is no active window"
+msgstr "æ?? VNC é?£ç·?é?²å?¥ä½?æ?¯æ²?æ??使ç?¨ä¸­ç??è¦?çª?"
+
+#. vim: set ts=8:
+#: ../plugins/vnc/vnc.ui.h:1
+msgid ""
+"By activating reverse connections you can access machines that are behind a "
+"firewall. The remote side is supposed to initiate the connection with you. "
+"For further information, checkout the help."
+msgstr "å??ç?¨å??å??é?£ç·?è?½è®?ä½ å­?å??ä½?æ?¼é?²ç?«ç??å¾?ç??æ©?å?¨ã??é? ç«¯æ©?å?¨æ??該æ??èµ·å§?è??ä½ ç??é?£ç·?ã??é??è¦?æ?´å¤?è³?è¨?ï¼?è«?æ?¥é?±æ±?å?©é?¸å?®ã??"
+
+#: ../plugins/vnc/vnc.ui.h:2
+msgid "Connectivity"
+msgstr "é?£ç·?è?½å??"
+
+#: ../plugins/vnc/vnc.ui.h:3
+msgid "Reverse Connections"
+msgstr "å??å??é?£ç·?"
+
+#: ../plugins/vnc/vnc.ui.h:4
+msgid "This machine is reachable through the following IP address(es):"
+msgstr "é??å??é?»è?¦å?¯ä»¥é??é??ä¸?å?? IP ä½?å??使ç?¨ï¼?"
+
+#: ../plugins/vnc/vnc.ui.h:5
+msgid "_Always Enabled"
+msgstr "æ°¸é? å??ç?¨(_A)"
+
+#: ../plugins/vnc/vnc.ui.h:6
+msgid "_Enable Reverse Connections"
+msgstr "å??ç?¨å??å??é?£ç·?(_E)"
+
 #: ../vinagre/GNOME_VinagreApplet.server.in.in.h:1
 msgid "A menu to quickly access remote machines"
 msgstr "ç?¨ä¾?å¿«é??é?£ç·?å?°é? ç«¯æ©?å?¨ç??é?¸å?®"
@@ -377,8 +545,8 @@ msgstr "é??å??é? ç«¯æ¡?é?¢æª¢è¦?å?¨"
 msgid "Access your bookmarks"
 msgstr "å­?å??ä½ ç??æ?¸ç±¤"
 
-#: ../vinagre/vinagre-bookmarks.c:265 ../vinagre/vinagre-connection.c:519
-#: ../vinagre/vinagre-tab.c:533 ../vinagre/vinagre-tube-handler.c:256
+#: ../vinagre/vinagre-bookmarks.c:265 ../vinagre/vinagre-connection.c:522
+#: ../vinagre/vinagre-tab.c:535 ../vinagre/vinagre-tube-handler.c:253
 #, c-format
 msgid "The protocol %s is not supported."
 msgstr "æ?ªæ?¯æ?´é??è¨?å??å®? %s ã??"
@@ -390,9 +558,10 @@ msgstr "å??å§?å??æ?¸ç±¤æ??é?¯èª¤ï¼?%s"
 
 #: ../vinagre/vinagre-bookmarks.c:343 ../vinagre/vinagre-bookmarks.c:458
 #: ../vinagre/vinagre-bookmarks-migration.c:135
-#: ../vinagre/vinagre-commands.c:170 ../vinagre/vinagre-connect.c:459
-#: ../vinagre/vinagre-fav.c:681 ../vinagre/vinagre-main.c:100
-#: ../vinagre/vinagre-main.c:119 ../vinagre/vinagre-window.c:266
+#: ../vinagre/vinagre-cache-prefs.c:53 ../vinagre/vinagre-commands.c:173
+#: ../vinagre/vinagre-connect.c:482 ../vinagre/vinagre-fav.c:765
+#: ../vinagre/vinagre-main.c:101 ../vinagre/vinagre-main.c:120
+#: ../vinagre/vinagre-window.c:268 ../vinagre/vinagre-window.c:737
 msgid "Unknown error"
 msgstr "ä¸?æ??ç??é?¯èª¤"
 
@@ -437,7 +606,7 @@ msgid "Error while migrating bookmarks: Failed to finalize the XML structure"
 msgstr "å?¨è½?移æ?¸ç±¤æ??ç?¼ç??é?¯èª¤ï¼?çµ?æ?? XML çµ?æ§?失æ??"
 
 #: ../vinagre/vinagre-bookmarks-migration.c:135
-#: ../vinagre/vinagre-bookmarks-migration.c:238
+#: ../vinagre/vinagre-bookmarks-migration.c:217
 #, c-format
 msgid "Error while migrating bookmarks: %s"
 msgstr "è½?移æ?¸ç±¤æ??ç?¼ç??é?¯èª¤ï¼?%s"
@@ -446,27 +615,27 @@ msgstr "è½?移æ?¸ç±¤æ??ç?¼ç??é?¯èª¤ï¼?%s"
 msgid "Error while migrating bookmarks: VNC plugin is not activated"
 msgstr "è½?移æ?¸ç±¤æ??ç?¼ç??é?¯èª¤ï¼?å°?æ?ªä½¿ç?¨ VNC å¤?æ??ç¨?å¼?"
 
-#: ../vinagre/vinagre-bookmarks-migration.c:238
+#: ../vinagre/vinagre-bookmarks-migration.c:217
 msgid "Failed to create the directory"
 msgstr "建ç«?ç?®é??失æ??"
 
-#: ../vinagre/vinagre-bookmarks-migration.c:262
+#: ../vinagre/vinagre-bookmarks-migration.c:241
 msgid ""
 "Migrating the bookmarks file to the new format. This operation is only "
 "supposed to run once."
 msgstr "æ­£å?¨å°?æ?¸ç±¤æª?æ¡?è½?移ç?ºæ?°ç??æ ¼å¼?ã??é??å??æ??ä½?å?ªè?½å?·è¡?ä¸?次ã??"
 
-#: ../vinagre/vinagre-bookmarks-migration.c:270
+#: ../vinagre/vinagre-bookmarks-migration.c:249
 #, c-format
 msgid "Error opening old bookmarks file: %s"
 msgstr "é??å??è??ç??æ?¸ç±¤æª?æ¡?æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: ../vinagre/vinagre-bookmarks-migration.c:271
-#: ../vinagre/vinagre-bookmarks-migration.c:283
+#: ../vinagre/vinagre-bookmarks-migration.c:250
+#: ../vinagre/vinagre-bookmarks-migration.c:262
 msgid "Migration cancelled"
 msgstr "è½?移ç¨?åº?å·²å??æ¶?"
 
-#: ../vinagre/vinagre-bookmarks-migration.c:280
+#: ../vinagre/vinagre-bookmarks-migration.c:259
 msgid "Could not remove the old bookmarks file"
 msgstr "ç?¡æ³?移é?¤è??ç??æ?¸ç±¤æª?æ¡?"
 
@@ -521,121 +690,167 @@ msgstr "移é?¤æ?¸ç±¤æ??ç?¼ç??é?¯èª¤ï¼?æ?¾ä¸?å?°é ?ç?®"
 msgid "New Folder"
 msgstr "æ?°å¢?è³?æ??夾"
 
-#: ../vinagre/vinagre-commands.c:120
+#: ../vinagre/vinagre-cache-prefs.c:53
+#, c-format
+msgid "Error while saving preferences: %s"
+msgstr "ç?¶å?²å­?å??好設å®?æ??ç?¼ç??é?¯èª¤ï¼?%s"
+
+#: ../vinagre/vinagre-commands.c:121
 msgid "Choose the file"
 msgstr "é?¸æ??æ??件"
 
-#: ../vinagre/vinagre-commands.c:148
-msgid "There are none supported files"
+#: ../vinagre/vinagre-commands.c:149
+msgid "There are no supported files"
 msgstr "é??è£?æ²?æ??æ?¯æ?´ç??æª?æ¡?"
 
-#: ../vinagre/vinagre-commands.c:148
+#: ../vinagre/vinagre-commands.c:150
 msgid ""
-"None of the active plugins offer a supported file to be open. Activate some "
-"plugins and try again."
-msgstr "使ç?¨ä¸­ç??å¤?æ??ç¨?å¼?æ²?æ??æ??ä¾?å?¯é??å??ç??æ?¯æ?´æª?æ¡?ã??è«?使ç?¨å?¶ä»?å¤?æ??ç¨?å¼?å¾?å??試ä¸?次ã??"
+"None of the active plugins support this action. Activate some plugins and "
+"try again."
+msgstr "使ç?¨ä¸­ç??å¤?æ??ç¨?å¼?æ²?æ??æ?¯æ?´é??å??å??ä½?ã??è«?使ç?¨å?¶ä»?å¤?æ??ç¨?å¼?å¾?å??試ä¸?次ã??"
 
-#: ../vinagre/vinagre-commands.c:181
+#: ../vinagre/vinagre-commands.c:184
 msgid "The following file could not be opened:"
 msgid_plural "The following files could not be opened:"
 msgstr[0] "ç?¡æ³?é??å??ä¸?å??æ??件ï¼?"
 msgstr[1] "ç?¡æ³?é??å??ä¸?å??æ??件ï¼?"
 
-#: ../vinagre/vinagre-connect.c:86 ../vinagre/vinagre-connect.c:330
-#: ../vinagre/vinagre-connect.c:424
+#: ../vinagre/vinagre-connect.c:87 ../vinagre/vinagre-connect.c:334
+#: ../vinagre/vinagre-connect.c:446
 msgid "Could not get the active protocol in the protocol list."
 msgstr "ç?¡æ³?å?¨é??è¨?å??å®?æ¸?å?®ä¸­å??å¾?使ç?¨ä¸­ç??é??è¨?å??å®?ã??"
 
-#: ../vinagre/vinagre-connect.c:313
+#: ../vinagre/vinagre-connect.c:315
 #, c-format
 msgid "Error while saving history file: %s"
 msgstr "å?²å­?æ­·å?²ç´?é??æª?æ¡?æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: ../vinagre/vinagre-connect.c:340
+#: ../vinagre/vinagre-connect.c:350
 msgid "Choose a Remote Desktop"
 msgstr "é?¸æ??ä¸?å??é? ç«¯æ¡?é?¢"
 
-#: ../vinagre/vinagre-connection.c:627
+#: ../vinagre/vinagre-connection.c:630
 msgid "Could not open the file."
 msgstr "ç?¡æ³?é??å??該æª?æ¡?ã??"
 
-#: ../vinagre/vinagre-connection.c:651
+#: ../vinagre/vinagre-connection.c:654
 msgid "The file was not recognized by any of the plugins."
 msgstr "該æª?æ¡?ç?¡æ³?被任ä½?å¤?æ??ç¨?å¼?辨è­?ã??"
 
-#: ../vinagre/vinagre-fav.c:670
+#: ../vinagre/vinagre-fav.c:567
+msgid "_New Folder"
+msgstr "æ?°å¢?è³?æ??夾(_N)"
+
+#: ../vinagre/vinagre-fav.c:568
+msgid "Create a new folder"
+msgstr "建ç«?æ?°ç??è³?æ??夾"
+
+#: ../vinagre/vinagre-fav.c:573
+msgid "_Open bookmark"
+msgstr "é??å??æ?¸ç±¤(_O)"
+
+#: ../vinagre/vinagre-fav.c:574
+msgid "Connect to this machine"
+msgstr "���此��"
+
+#: ../vinagre/vinagre-fav.c:575
+msgid "_Edit bookmark"
+msgstr "編輯�籤(_E)"
+
+#: ../vinagre/vinagre-fav.c:576
+msgid "Edit the details of selected bookmark"
+msgstr "編輯æ??é?¸æ??æ?¸ç±¤ç??ç´°ç¯?"
+
+#: ../vinagre/vinagre-fav.c:577
+msgid "_Remove from bookmarks"
+msgstr "��籤中移�(_R)"
+
+#: ../vinagre/vinagre-fav.c:578
+msgid "Remove current selected connection from bookmarks"
+msgstr "å¾?æ?¸ç±¤ä¸­ç§»é?¤ç?¶å??é?¸æ??ç??é?£ç·?"
+
+#: ../vinagre/vinagre-fav.c:596 ../vinagre/vinagre-window.c:399
+#, c-format
+msgid "Could not merge UI XML file: %s"
+msgstr "ç?¡æ³?å??ä½µ UI XML æª?æ¡?ï¼?%s"
+
+#: ../vinagre/vinagre-fav.c:754
 msgid "Invalid operation"
 msgstr "ç?¡æ??ç??æ??ä½?"
 
-#: ../vinagre/vinagre-fav.c:671
+#: ../vinagre/vinagre-fav.c:755
 msgid "Data received from drag&drop operation is invalid."
 msgstr "å¾?æ??æ?¾æ??ä½?中å??å??ç??è³?æ??æ?¯ç?¡æ??ç??ã??"
 
-#: ../vinagre/vinagre-fav.c:871
+#: ../vinagre/vinagre-fav.c:859
+msgid "Hide panel"
+msgstr "é?±è??é?¢æ?¿"
+
+#: ../vinagre/vinagre-fav.c:1044
 msgid "Hosts nearby"
 msgstr "è?¨è¿?ç??主æ©?"
 
 #. Translators: this is a command line option (run vinagre --help)
-#: ../vinagre/vinagre-main.c:62
+#: ../vinagre/vinagre-main.c:63
 msgid "Open vinagre in fullscreen mode"
 msgstr "以å?¨è?¢å¹?模å¼?é??å?? vinagre"
 
 #. Translators: this is a command line option (run vinagre --help)
-#: ../vinagre/vinagre-main.c:66
+#: ../vinagre/vinagre-main.c:67
 msgid "Create a new toplevel window in an existing instance of vinagre"
 msgstr "å?¨æ?¢å­?ç?? vinagre 實é«?中建ç«?æ?°ç??é ?層è¦?çª?"
 
 #. Translators: this is a command line option (run vinagre --help)
-#: ../vinagre/vinagre-main.c:70
+#: ../vinagre/vinagre-main.c:71
 msgid "Open a file recognized by vinagre"
 msgstr "é??å?? vinagre å?¯è¾¨è­?ç??æª?æ¡?"
 
-#: ../vinagre/vinagre-main.c:70
+#: ../vinagre/vinagre-main.c:71
 msgid "filename"
 msgstr "æª?æ¡?å??稱"
 
 #. Translators: this is a command line option (run vinagre --help)
-#: ../vinagre/vinagre-main.c:75
+#: ../vinagre/vinagre-main.c:76
 msgid "[server:port]"
 msgstr "[伺æ??å?¨:å? å?£]"
 
-#: ../vinagre/vinagre-main.c:130
+#: ../vinagre/vinagre-main.c:131
 msgid "The following error has occurred:"
 msgid_plural "The following errors have occurred:"
 msgstr[0] "ç?¼ç??ä¸?å??é?¯èª¤ï¼?"
 msgstr[1] "ç?¼ç??ä¸?å??é?¯èª¤ï¼?"
 
 #. Setup command line options
-#: ../vinagre/vinagre-main.c:169
+#: ../vinagre/vinagre-main.c:170
 msgid "- Remote Desktop Viewer"
 msgstr "- �端��檢��"
 
-#: ../vinagre/vinagre-main.c:193
+#: ../vinagre/vinagre-main.c:195
 msgid ""
 "Run 'vinagre --help' to see a full list of available command line options"
 msgstr "å?·è¡?ã??vinagre --helpã??以æ?¥ç??å?¯ç?¨å?½ä»¤è¡?é?¸é ?ç??å®?æ?´å??表"
 
-#: ../vinagre/vinagre-mdns.c:142
+#: ../vinagre/vinagre-mdns.c:159
 #, c-format
 msgid "Failed to resolve avahi hostname: %s\n"
 msgstr "解æ?? avahi 主æ©?å??稱失æ??ï¼?%s\n"
 
-#: ../vinagre/vinagre-mdns.c:200
+#: ../vinagre/vinagre-mdns.c:217
 #, c-format
 msgid "Plugin %s has already registered a browser for service %s."
 msgstr "å¤?æ??ç¨?å¼? %s 已被ç??覽å?¨è¨»å??ç?¨æ?¼æ??å?? %sã??"
 
-#: ../vinagre/vinagre-mdns.c:209
+#: ../vinagre/vinagre-mdns.c:226
 #, c-format
 msgid "Failed to add mDNS browser for service %s."
 msgstr "å°? mDNS ç??覽å?¨å? å?¥æ??å?? %s失æ??ã??"
 
-#: ../vinagre/vinagre-mdns.c:225
+#: ../vinagre/vinagre-mdns.c:242
 #, c-format
 msgid "Failed to browse for hosts: %s\n"
 msgstr "ç??覽主æ©?失æ??ï¼?%s\n"
 
-#: ../vinagre/vinagre-mdns.c:298
+#: ../vinagre/vinagre-mdns.c:315
 #, c-format
 msgid "Failed to initialize mDNS browser: %s\n"
 msgstr "å??å§?å?? mDNS ç??覽å?¨å¤±æ??ï¼?%s\n"
@@ -660,11 +875,11 @@ msgstr "å?°ä¸»æ©? %s ç??é©?è­?失æ??"
 msgid "Authentication failed"
 msgstr "é©?è­?失æ??"
 
-#: ../vinagre/vinagre-notebook.c:525
+#: ../vinagre/vinagre-notebook.c:526
 msgid "Connecting..."
 msgstr "正���..."
 
-#: ../vinagre/vinagre-notebook.c:552 ../vinagre/vinagre-tab.c:325
+#: ../vinagre/vinagre-notebook.c:553 ../vinagre/vinagre-tab.c:325
 msgid "Close connection"
 msgstr "é??é??é?£ç·?"
 
@@ -704,79 +919,150 @@ msgstr "é??æ?¼å¤?æ??ç¨?å¼?(_A)"
 msgid "C_onfigure Plugin"
 msgstr "設å®?å¤?æ??ç¨?å¼?(_O)"
 
-#: ../vinagre/vinagre-prefs.c:217
+#: ../vinagre/vinagre-prefs.c:212
 msgid "Cannot initialize preferences manager."
 msgstr "ç?¡æ³?å??å§?å??å??好設å®?管ç??å?¡ã??"
 
+#: ../vinagre/vinagre-ssh.c:106
+msgid "Timed out when logging into SSH host"
+msgstr "ç?¶ç?»å?¥ SSH 主æ©?æ??ç??é?¾æ??æ??é??"
+
+#: ../vinagre/vinagre-ssh.c:180
+msgid "Unable to spawn ssh program"
+msgstr "���� ssh ��"
+
+#: ../vinagre/vinagre-ssh.c:197
+#, c-format
+msgid "Unable to spawn ssh program: %s"
+msgstr "���� ssh ���%s"
+
+#: ../vinagre/vinagre-ssh.c:352
+msgid "Timed out when logging in"
+msgstr "ç?»å?¥é?¾æ??æ??é??"
+
+#: ../vinagre/vinagre-ssh.c:375 ../vinagre/vinagre-ssh.c:529
+#: ../vinagre/vinagre-ssh.c:612
+msgid "Permission denied"
+msgstr "æ¬?é??ä¸?足"
+
+#: ../vinagre/vinagre-ssh.c:440
+msgid "Password dialog canceled"
+msgstr "å¯?碼å°?話ç??已被å??æ¶?"
+
+#: ../vinagre/vinagre-ssh.c:463
+msgid "Could not send password"
+msgstr "ç?¡æ³?å?³é??å¯?碼"
+
+#: ../vinagre/vinagre-ssh.c:471
+msgid "Log In Anyway"
+msgstr "強���"
+
+#: ../vinagre/vinagre-ssh.c:471
+msgid "Cancel Login"
+msgstr "å??æ¶?ç?»å?¥"
+
+#: ../vinagre/vinagre-ssh.c:480
+#, c-format
+msgid ""
+"The identity of the remote computer (%s) is unknown.\n"
+"This happens when you log in to a computer the first time.\n"
+"\n"
+"The identity sent by the remote computer is %s. If you want to be absolutely "
+"sure it is safe to continue, contact the system administrator."
+msgstr ""
+"é? ç«¯é?»è?¦ (%s) ç??è­?å?¥ä¸?æ??ã??\n"
+"é??é??常ç?¼ç??å?¨ä½ ç¬¬ä¸?次ç?»å?¥é?»è?¦ç??æ??å??ã??\n"
+"\n"
+"ç?±é? ç«¯é?»è?¦å?³é??ç??è­?å?¥ç?º %sã??å¦?æ??ä½ æ?³è¦?å®?å?¨ç¢ºå®?ç¹¼çº?æ?¯å®?å?¨ç??ï¼?è«?è?¯çµ¡ç³»çµ±ç®¡ç??è??ã??"
+
+#: ../vinagre/vinagre-ssh.c:498
+msgid "Login dialog canceled"
+msgstr "ç?»å?¥å°?話ç??已被å??æ¶?"
+
+#: ../vinagre/vinagre-ssh.c:519
+msgid "Can't send host identity confirmation"
+msgstr "ä¸?è?½å?³é??主æ©?è­?å?¥ç¢ºèª?"
+
+#: ../vinagre/vinagre-ssh.c:554 ../vinagre/vinagre-tab.c:732
+msgid "Error saving the credentials on the keyring."
+msgstr "å?²å­?è­?æ?¸å?°å¯?碼å??å??æ??ç?¼ç??é?¯èª¤ã??"
+
+#: ../vinagre/vinagre-ssh.c:619
+msgid "Hostname not known"
+msgstr "主æ©?å??稱ä¸?æ??"
+
+#: ../vinagre/vinagre-ssh.c:626
+msgid "No route to host"
+msgstr "æ²?æ??è·¯ç?±å?¯å?°ä¸»æ©?"
+
+#: ../vinagre/vinagre-ssh.c:633
+msgid "Connection refused by server"
+msgstr "é?£ç·?被伺æ??å?¨æ??çµ?"
+
+#: ../vinagre/vinagre-ssh.c:640
+msgid "Host key verification failed"
+msgstr "主æ©?å¯?碼å??é©?è­?失æ??"
+
+#: ../vinagre/vinagre-ssh.c:676
+msgid "Unable to find a valid SSH program"
+msgstr "æ?¾ä¸?å?°æ??æ??ç?? SSH ç¨?å¼?"
+
 #: ../vinagre/vinagre-tab.c:346
 msgid "Leave fullscreen"
 msgstr "é?¢é??å?¨è?¢å¹?"
 
-#: ../vinagre/vinagre-tab.c:495
+#: ../vinagre/vinagre-tab.c:497
 msgid "Error saving recent connection."
 msgstr "å?²å­?æ??è¿?é?£ç·?æ??é?¯èª¤ã??"
 
-#: ../vinagre/vinagre-tab.c:728
-msgid "Error saving the credentials on the keyring."
-msgstr "å?²å­?è­?æ?¸å?°å¯?碼å??å??æ??ç?¼ç??é?¯èª¤ã??"
-
-#: ../vinagre/vinagre-tab.c:814
+#: ../vinagre/vinagre-tab.c:818
 msgid "Could not get a screenshot of the connection."
 msgstr "ç?¡æ³?å??å¾?æ­¤é?£ç·?ç??ç?«é?¢å¿«ç?§ã??"
 
-#: ../vinagre/vinagre-tab.c:819
+#: ../vinagre/vinagre-tab.c:823
 msgid "Save Screenshot"
 msgstr "����快�"
 
-#: ../vinagre/vinagre-tab.c:830
+#: ../vinagre/vinagre-tab.c:834
 #, c-format
 msgid "Screenshot of %s"
 msgstr "%s ç??ç?«é?¢å¿«ç?§"
 
-#: ../vinagre/vinagre-tab.c:881
+#: ../vinagre/vinagre-tab.c:885
 msgid "Error saving screenshot"
 msgstr "å?²å­?ç?«é?¢å¿«ç?§æ??ç?¼ç??é?¯èª¤"
 
-#: ../vinagre/vinagre-tube-handler.c:232
+#: ../vinagre/vinagre-tube-handler.c:229
 #, c-format
 msgid "Impossible to get service property: %s"
 msgstr "ä¸?å?¯è?½å??å¾?æ??å??屬æ?§ï¼?%s"
 
-#: ../vinagre/vinagre-tube-handler.c:289
+#: ../vinagre/vinagre-tube-handler.c:286
 #, c-format
 msgid "Impossible to create the connection: %s"
 msgstr "���建����%s"
 
-#: ../vinagre/vinagre-tube-handler.c:328
+#: ../vinagre/vinagre-tube-handler.c:325
 #, c-format
 msgid "Impossible to accept the stream tube: %s"
 msgstr "ä¸?å?¯è?½æ?¥å??串æµ?管ï¼?%s"
 
-#: ../vinagre/vinagre-tube-handler.c:404
-#, c-format
-msgid "Failed to request name: %s"
-msgstr "è¦?æ±?å??稱失æ??ï¼?%s"
-
-#: ../vinagre/vinagre-tube-handler.c:405
-msgid "No error given"
-msgstr "æ²?æ??æ??å®?ç??é?¯èª¤"
-
-#: ../vinagre/vinagre-tube-handler.c:482
+#: ../vinagre/vinagre-tube-handler.c:463
 #, c-format
 msgid "Impossible to get the contact name: %s"
 msgstr "ä¸?å?¯è?½å??å¾?è?¯çµ¡äººå??稱ï¼?%s"
 
-#: ../vinagre/vinagre-tube-handler.c:517
+#: ../vinagre/vinagre-tube-handler.c:498
 #, c-format
 msgid "Impossible to get the avatar: %s"
 msgstr "ä¸?å?¯è?½å??å¾?大頭貼ï¼?%s"
 
-#: ../vinagre/vinagre-tube-handler.c:538
+#: ../vinagre/vinagre-tube-handler.c:519
 #, c-format
-msgid "%s wants to share his desktop with you."
-msgstr "%s æ?³è¦?è??ä½ å??享ä»?ç??æ¡?é?¢ã??"
+msgid "%s wants to share their desktop with you."
+msgstr "%s æ?³è¦?è??ä½ å??享ä»?å??ç??æ¡?é?¢ã??"
 
-#: ../vinagre/vinagre-tube-handler.c:543
+#: ../vinagre/vinagre-tube-handler.c:524
 msgid "Desktop sharing invitation"
 msgstr "æ¡?é?¢å?±äº«é??è«?"
 
@@ -813,111 +1099,82 @@ msgstr "çµ?æ??ç¨?å¼?"
 msgid "Edit the application preferences"
 msgstr "編輯æ??ç?¨ç¨?å¼?å??好設å®?"
 
-#. FIXME: Study this dialog for next release
-#. { "EditPlugins", GTK_STOCK_EXECUTE, N_("_Plugins"), NULL,
-#. N_("Select plugins"), G_CALLBACK (vinagre_cmd_edit_plugins) },
-#.
-#. Bookmarks menu
-#: ../vinagre/vinagre-ui.h:56
-msgid "_Open bookmark"
-msgstr "é??å??æ?¸ç±¤(_O)"
-
-#: ../vinagre/vinagre-ui.h:57
-msgid "Connect to this machine"
-msgstr "���此��"
-
-#: ../vinagre/vinagre-ui.h:58
-msgid "_Edit bookmark"
-msgstr "編輯�籤(_E)"
-
-#: ../vinagre/vinagre-ui.h:59
-msgid "Edit the details of selected bookmark"
-msgstr "編輯æ??é?¸æ??æ?¸ç±¤ç??ç´°ç¯?"
-
-#: ../vinagre/vinagre-ui.h:60
-msgid "_Remove from bookmarks"
-msgstr "��籤中移�(_R)"
-
-#: ../vinagre/vinagre-ui.h:61
-msgid "Remove current selected connection from bookmarks"
-msgstr "å¾?æ?¸ç±¤ä¸­ç§»é?¤ç?¶å??é?¸æ??ç??é?£ç·?"
+#: ../vinagre/vinagre-ui.h:50
+msgid "_Plugins"
+msgstr "å¤?æ??ç¨?å¼?(_P)"
 
-#: ../vinagre/vinagre-ui.h:62
-msgid "_New Folder"
-msgstr "æ?°å¢?è³?æ??夾(_N)"
-
-#: ../vinagre/vinagre-ui.h:63
-msgid "Create a new folder"
-msgstr "建ç«?æ?°ç??è³?æ??夾"
+#: ../vinagre/vinagre-ui.h:51
+msgid "Select plugins"
+msgstr "é?¸æ??å¤?æ??ç¨?å¼?"
 
 #. Help menu
-#: ../vinagre/vinagre-ui.h:66
+#: ../vinagre/vinagre-ui.h:54
 msgid "_Contents"
 msgstr "�容(_C)"
 
-#: ../vinagre/vinagre-ui.h:67
+#: ../vinagre/vinagre-ui.h:55
 msgid "Open the vinagre manual"
 msgstr "é??å?? vinagre æ??å??"
 
-#: ../vinagre/vinagre-ui.h:69
+#: ../vinagre/vinagre-ui.h:57
 msgid "About this application"
 msgstr "é??æ?¼æ­¤ç¨?å¼?"
 
-#: ../vinagre/vinagre-ui.h:74
+#: ../vinagre/vinagre-ui.h:62
 msgid "_Toolbar"
 msgstr "å·¥å?·å??(_T)"
 
-#: ../vinagre/vinagre-ui.h:75
+#: ../vinagre/vinagre-ui.h:63
 msgid "Show or hide the toolbar"
 msgstr "顯示æ??é?±è??å·¥å?·å??"
 
-#: ../vinagre/vinagre-ui.h:78
+#: ../vinagre/vinagre-ui.h:66
 msgid "_Statusbar"
 msgstr "ç??æ??å??(_S)"
 
-#: ../vinagre/vinagre-ui.h:79
+#: ../vinagre/vinagre-ui.h:67
 msgid "Show or hide the statusbar"
 msgstr "顯示æ??é?±è??ç??æ??å??"
 
-#: ../vinagre/vinagre-ui.h:82
+#: ../vinagre/vinagre-ui.h:70
 msgid "Side _Panel"
 msgstr "å?´é??é?¢æ?¿(_P)"
 
-#: ../vinagre/vinagre-ui.h:83
+#: ../vinagre/vinagre-ui.h:71
 msgid "Show or hide the side panel"
 msgstr "顯示æ??é?±è??å?´é??é?¢æ?¿"
 
-#: ../vinagre/vinagre-ui.h:91
+#: ../vinagre/vinagre-ui.h:79
 msgid "Close the current connection"
 msgstr "é??é??ç?¶å??é?£ç·?"
 
-#: ../vinagre/vinagre-ui.h:92
+#: ../vinagre/vinagre-ui.h:80
 msgid "C_lose All"
 msgstr "å?¨é?¨é??é??(_L)"
 
-#: ../vinagre/vinagre-ui.h:93
+#: ../vinagre/vinagre-ui.h:81
 msgid "Close all active connections"
 msgstr "é??é??å?¨é?¨æ´»å??中ç??é?£ç·?"
 
 #. Bookmarks menu
-#: ../vinagre/vinagre-ui.h:96
+#: ../vinagre/vinagre-ui.h:84
 msgid "_Add to bookmarks"
 msgstr "����籤(_A)"
 
-#: ../vinagre/vinagre-ui.h:97
+#: ../vinagre/vinagre-ui.h:85
 msgid "Add current connection to your bookmarks"
 msgstr "æ?°å¢?ç?®å??é?£ç·?è?³ä½ ç??æ?¸ç±¤"
 
 #. Machine menu
-#: ../vinagre/vinagre-ui.h:104
+#: ../vinagre/vinagre-ui.h:92
 msgid "Take screenshot"
 msgstr "æ?·å??ç?«é?¢å¿«ç?§"
 
-#: ../vinagre/vinagre-ui.h:105
+#: ../vinagre/vinagre-ui.h:93
 msgid "Take a screenshot of active connection"
 msgstr "æ?·å??æ´»å??é?£ç·?ç??ç?«é?¢å¿«ç?§"
 
-#: ../vinagre/vinagre-ui.h:109
+#: ../vinagre/vinagre-ui.h:97
 msgid "View the current machine in full screen"
 msgstr "以å?¨è?¢å¹?檢è¦?ç?¶å??æ©?å?¨"
 
@@ -925,16 +1182,31 @@ msgstr "以å?¨è?¢å¹?檢è¦?ç?¶å??æ©?å?¨"
 msgid "An error has occurred:"
 msgstr "ç?¼ç??é?¯èª¤ï¼?"
 
-#: ../vinagre/vinagre-utils.c:150
-#, c-format
-msgid "Could not load builder file: %s"
-msgstr "����建置���%s"
+#: ../vinagre/vinagre-utils.c:175
+msgid ""
+"A plugin tried to open an UI file but did not succeed, with the error "
+"message:"
+msgstr "æ??å¤?æ??ç¨?å¼?å??試é??å?? UI æª?æ¡?ä½?並æ?ªæ??å??ï¼?é?¯èª¤è¨?æ?¯ç?ºï¼?"
+
+#: ../vinagre/vinagre-utils.c:177
+msgid ""
+"The program tried to open an UI file but did not succeed, with the error "
+"message:"
+msgstr "æ??ç¨?å¼?å??試é??å?? UI æª?æ¡?ä½?並æ?ªæ??å??ï¼?é?¯èª¤è¨?æ?¯ç?ºï¼?"
 
-#: ../vinagre/vinagre-utils.c:453
+#: ../vinagre/vinagre-utils.c:180
+msgid "Please check your installation."
+msgstr "è«?檢æ?¥å®?è£?æ?¯å?¦æ­£ç¢ºã??"
+
+#: ../vinagre/vinagre-utils.c:181
+msgid "Error loading UI file"
+msgstr "è¼?å?¥ UI æª?æ¡?æ??ç?¼ç??é?¯èª¤"
+
+#: ../vinagre/vinagre-utils.c:492
 msgid "Vinagre is a remote desktop viewer for the GNOME Desktop"
 msgstr "Vinagre æ?¯ GNOME æ¡?é?¢ç??é? ç«¯æ¡?é?¢æª¢è¦?å?¨"
 
-#: ../vinagre/vinagre-utils.c:456
+#: ../vinagre/vinagre-utils.c:495
 msgid ""
 "Vinagre 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 "
@@ -942,7 +1214,7 @@ msgid ""
 "version."
 msgstr "Vinagre æ?¯è?ªç?±è»?件ï¼?ä½ å?¯ä»¥å?¨è?ªç?±è»?件å?ºé??æ??ç?¼è¡?ç?? GNU é??ç?¨å?¬å?±è¨±å?¯ç??æ¢?款ä¸?é??æ?°å??ç?¼å®?å??/æ??ä¿®æ?¹å®?ï¼?ç?¡è«?此許å?¯ç??ç??æ?¬2ï¼?æ??è??(以你ç??é?¸æ??)ä»»ä½?æ?´æ?°ç??ç??æ?¬ã??"
 
-#: ../vinagre/vinagre-utils.c:460
+#: ../vinagre/vinagre-utils.c:499
 msgid ""
 "Vinagre is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
@@ -950,13 +1222,13 @@ msgid ""
 "details."
 msgstr "Vinagre 被ç?¼ä½?æ?¯å¸?æ??å®?è?½å¤ æ??æ??ç?¨è??ï¼?ä½?ã??æ²?æ??ä»»ä½?ä¿?è­?ã??ï¼?ç??è?³æ²?æ??é?±å?«ã??å?¯é?·å?®ã??æ??è??ã??ç?¨æ?¼ç?¹å®?ç?¨é??ã??ç??ä¿?è­?ã??è«?æ?¥ç?? GNU é??ç?¨å?¬å?±è¨±å?¯ä»¥ç?²å¾?æ?´å¤?ç´°ç¯?ã??"
 
-#: ../vinagre/vinagre-utils.c:464
+#: ../vinagre/vinagre-utils.c:503
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program. If not, see <http://www.gnu.org/licenses/>."
 msgstr "ä½ æ??該已ç¶?å??ç¨?å¼?ä¸?èµ·æ?¶å?°ä¸?份 GNU é??ç?¨å?¬å?±è¨±å?¯è­?ç??å?¯æ?¬ã??å¦?æ??é??æ²?æ??ï¼?è«?å??訪 <http://www.gnu.org/licenses/>ã??"
 
-#: ../vinagre/vinagre-utils.c:486
+#: ../vinagre/vinagre-utils.c:525
 msgid "translator-credits"
 msgstr ""
 "GNOME ç¨?å¼?中æ??å??é?µä»¶è«?å£?\n"
@@ -964,33 +1236,66 @@ msgstr ""
 "\n"
 "Hialan Liu <hialan liu gmail com>, 2008"
 
-#: ../vinagre/vinagre-utils.c:489
+#: ../vinagre/vinagre-utils.c:528
 msgid "Vinagre Website"
 msgstr "Vinagre 網�"
 
-#: ../vinagre/vinagre-window.c:397
+#. Translators: %s is a protocol, like VNC or SSH
+#: ../vinagre/vinagre-utils.c:660
 #, c-format
-msgid "Could not merge vinagre-ui.xml: %s"
-msgstr "ç?¡æ³?å??ä½µ vinagre-ui.xmlï¼?%s"
+msgid "%s authentication is required"
+msgstr "é??è¦? %s é©?è­?"
 
-#: ../vinagre/vinagre-window.c:425
+#: ../vinagre/vinagre-window.c:428
 msgid "_Recent connections"
 msgstr "æ??è¿?é?£ç·?(_R)"
 
 #. Translators: This is server:port, a statusbar tooltip when mouse is over a bookmark item on menu
-#: ../vinagre/vinagre-window.c:585
+#: ../vinagre/vinagre-window.c:543
 #, c-format
 msgid "Open %s:%d"
 msgstr "é??å?? %sï¼?%d"
 
-#~ msgid "Minimize window"
-#~ msgstr "æ??å°?å??è¦?çª?"
+#: ../vinagre/vinagre-window.c:721
+msgid "About menu accelerators and keyboard shortcuts"
+msgstr "é??æ?¼é?¸å?®è??é?µç?¤æ?·å¾?é?µ"
 
-#~ msgid "_Plugins"
-#~ msgstr "å¤?æ??ç¨?å¼?(_P)"
+#: ../vinagre/vinagre-window.c:723
+msgid ""
+"Vinagre comes with menu accelerators and keyboard shortcuts disabled by "
+"default. The reason is to avoid the keys to be intercepted by the program, "
+"and allow them to be sent to the remote machine.\n"
+"\n"
+"You can change this behavior through the preferences dialog. For more "
+"information, check the documentation.\n"
+"\n"
+"This message will appear only once."
+msgstr ""
+"Vinagre é ?設å?³å??ç?¨é?¸å?®è??é?µç?¤æ?·å¾?é?µã??å??å? æ?¯ç?ºäº?é?¿å??æ??é?µè¢«ç¨?å¼?æ??æ?ªï¼?é??樣æ??è?½è®?æ??é?µé??è?³é? ç«¯æ©?å?¨ã??\n"
+"\n"
+"ä½ å?¯ä»¥é??é??å??好設å®?å°?話ç??æ?¹è®?é??å??è¡?ç?ºã??é??è¦?æ?´å¤?è³?è¨?ï¼?è«?æ?¥é?±æ??件ã??\n"
+"\n"
+"é??å??è¨?æ?¯å?ªæ??å?ºç?¾ä¸?次ã??"
+
+#: ../vinagre/vinagre-window.c:731 ../vinagre/vinagre-window.c:737
+#, c-format
+msgid "Error while creating the file %s: %s"
+msgstr "建ç«?æª?æ¡? %s æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#~ msgid "Select plugins"
-#~ msgstr "é?¸æ??å¤?æ??ç¨?å¼?"
+#~ msgid "All fields above are mandatory"
+#~ msgstr "ä¸?é?¢æ??æ??æ¬?ä½?é?½æ?¯å¿?è¦?ç??"
+
+#~ msgid "Failed to request name: %s"
+#~ msgstr "è¦?æ±?å??稱失æ??ï¼?%s"
+
+#~ msgid "No error given"
+#~ msgstr "æ²?æ??æ??å®?ç??é?¯èª¤"
+
+#~ msgid "Could not merge vinagre-ui.xml: %s"
+#~ msgstr "ç?¡æ³?å??ä½µ vinagre-ui.xmlï¼?%s"
+
+#~ msgid "Minimize window"
+#~ msgstr "æ??å°?å??è¦?çª?"
 
 #~ msgid "Supported formats"
 #~ msgstr "æ?¯æ?´ç??æ ¼å¼?"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 53fb8be..5c94430 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -2,20 +2,20 @@
 # Copyright (C) 2008 Free Software Foundation, Inc.
 # This file is distributed under the same license as the vinagre package.
 # hialan <hialan liu gmail com>, 2008.
+# Chao-Hsiung Liao <j_h_liau yahoo com tw>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vinagre 2.27.90\n"
+"Project-Id-Version: vinagre 2.29.90\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-22 15:54+0800\n"
-"PO-Revision-Date: 2009-08-22 15:32+0800\n"
+"POT-Creation-Date: 2010-02-13 06:47+0800\n"
+"PO-Revision-Date: 2010-02-12 20:02+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Traditional) <zh-l10n lists linux org tw>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Poedit-Bookmarks: -1,103,-1,-1,-1,-1,-1,-1,-1,-1\n"
 
 #: ../data/GNOME_VinagreApplet.xml.h:1 ../vinagre/vinagre-plugin-manager.c:495
 msgid "_About"
@@ -32,19 +32,20 @@ msgstr "å­?å??é? ç«¯æ¡?é?¢"
 #: ../data/vinagre.desktop.in.in.h:2 ../data/vinagre-file.desktop.in.in.h:2
 #: ../vinagre/GNOME_VinagreApplet.server.in.in.h:2
 #: ../vinagre/vinagre-applet.c:434 ../vinagre/vinagre-applet.c:486
-#: ../vinagre/vinagre-main.c:198
+#: ../vinagre/vinagre-main.c:200
 msgid "Remote Desktop Viewer"
 msgstr "�端��檢��"
 
 #: ../data/vinagre.ui.h:1
-msgid "All fields above are mandatory"
-msgstr "ä¸?é?¢æ??æ??æ¬?ä½?é?½æ?¯å¿?è¦?ç??"
+msgid "Allow _keyboard shortcuts"
+msgstr "å??許é?µç?¤æ?·å¾?é?µ(_K)"
 
 #: ../data/vinagre.ui.h:2
 msgid "Authentication is required"
 msgstr "é??è¦?é©?è­?"
 
-#: ../data/vinagre.ui.h:3 ../vinagre/vinagre-fav.c:856
+#. setup label
+#: ../data/vinagre.ui.h:3 ../vinagre/vinagre-fav.c:851
 msgid "Bookmarks"
 msgstr "�籤"
 
@@ -61,7 +62,7 @@ msgid "Folder"
 msgstr "è³?æ??夾"
 
 #: ../data/vinagre.ui.h:7 ../plugins/ssh/vinagre-ssh-tab.c:49
-#: ../plugins/vnc/vinagre-vnc-tab.c:134 ../vinagre/vinagre-fav.c:425
+#: ../plugins/vnc/vinagre-vnc-tab.c:148 ../vinagre/vinagre-fav.c:404
 msgid "Host:"
 msgstr "主��"
 
@@ -81,48 +82,53 @@ msgstr "ä¸?層è³?æ??夾"
 msgid "Preferences"
 msgstr "å??好設å®?"
 
-#: ../data/vinagre.ui.h:12
+#. This is a tooltip in preferences dialog
+#: ../data/vinagre.ui.h:13
+msgid ""
+"This option enables menu accelerators and keyboard shortcuts. For more info "
+"on why you may want to disable them, check the documentation."
+msgstr ""
+"é??å??é?¸é ?æ??å??ç?¨é?¸å?®è??é?µç?¤ç??æ?·å¾?é?µã??æ?³äº?解å?¨ä»?麼æ??å½¢ä¸?æ?¨æ??æ?³å??ç?¨å®?å??ï¼?è«?æ?¥é?±æ??"
+"件ã??"
+
+#: ../data/vinagre.ui.h:14
 msgid "Which machine do you want to connect to?"
 msgstr "æ?¨æ?³é?£ç·?å?°å?ªå??æ©?å?¨ï¼?"
 
-#: ../data/vinagre.ui.h:13
+#: ../data/vinagre.ui.h:15
 msgid "_Always show tabs"
 msgstr "æ°¸é? é¡¯ç¤ºå??é ?(_A)"
 
 #. This is a button label, in the authentication dialog
-#: ../data/vinagre.ui.h:15
+#: ../data/vinagre.ui.h:17
 msgid "_Authenticate"
 msgstr "é©?è­?(_A)"
 
-#: ../data/vinagre.ui.h:16
+#: ../data/vinagre.ui.h:18
 msgid "_Full screen"
 msgstr "���(_F)"
 
-#: ../data/vinagre.ui.h:17
+#: ../data/vinagre.ui.h:19
 msgid "_Host:"
 msgstr "主�(_H):"
 
-#: ../data/vinagre.ui.h:18
+#: ../data/vinagre.ui.h:20
 msgid "_Name:"
 msgstr "å??稱(_N):"
 
-#: ../data/vinagre.ui.h:19
+#: ../data/vinagre.ui.h:21
 msgid "_Password:"
 msgstr "�碼(_P):"
 
-#: ../data/vinagre.ui.h:20
+#: ../data/vinagre.ui.h:22
 msgid "_Protocol:"
 msgstr "é??è¨?å??å®?(_P):"
 
-#: ../data/vinagre.ui.h:21
+#: ../data/vinagre.ui.h:23
 msgid "_Remember this credential"
 msgstr "è¨?ä½?é??å??æ??è­?(_R)"
 
-#: ../data/vinagre.ui.h:22
-msgid "_Show menu shortcuts"
-msgstr "顯示�����(_S)"
-
-#: ../data/vinagre.ui.h:23
+#: ../data/vinagre.ui.h:24 ../plugins/ssh/vinagre-ssh-plugin.c:144
 msgid "_Username:"
 msgstr "使ç?¨è??å??稱(_U):"
 
@@ -161,14 +167,20 @@ msgstr ""
 "å??é ?ã??"
 
 #: ../data/vinagre.schemas.in.in.h:6
+msgid ""
+"Set to \"true\" to always start the program listening for reverse "
+"connections."
+msgstr "設å®?ç?ºã??trueã??å??å??å??ç¨?å¼?æ??æ°¸é? æ??è?½å??å??å??é?£ç·?ã??"
+
+#: ../data/vinagre.schemas.in.in.h:7
 msgid "Specifies the maximum number of items in the host dropdown entry."
 msgstr "æ??å®?å?¨ä¸»æ©?ä¸?æ??å¼?é ?ç?®ä¸­æ??顯示é ?ç?®ç??æ??大æ?¸ç?®ã??"
 
-#: ../data/vinagre.schemas.in.in.h:7
+#: ../data/vinagre.schemas.in.in.h:8
 msgid "The handler for \"vnc://\" URLs"
 msgstr "ã??vnc://ã??網å??ç??è??ç??ç¨?å¼?"
 
-#: ../data/vinagre.schemas.in.in.h:8
+#: ../data/vinagre.schemas.in.in.h:9
 msgid ""
 "When connecting to a host, the client can say to the server to leave other "
 "clients connected or to drop the existent connections. Set the value to true "
@@ -177,19 +189,23 @@ msgstr ""
 "ç?¶é?£ç·?å?°ä¸»æ©?æ??ï¼?此客æ?¶ç«¯ç¨?å¼?å?¯ä»¥è¦?æ±?該伺æ??å?¨ä¿?ç??å?¶ä»?å·²é?£ç·?ç??客æ?¶ç«¯æ??è??中æ?·æ?¢"
 "å­?ç??é?£ç·?ã??å°?é??å??æ?¸å?¼è¨­ç?º true å?¯ä»¥è??å?¶ä»?客æ?¶ç«¯ç¨?å¼?å?±å??使ç?¨æ¡?é?¢ã??"
 
-#: ../data/vinagre.schemas.in.in.h:9
+#: ../data/vinagre.schemas.in.in.h:10
 msgid "Whether we should leave other clients connected"
 msgstr "æ?¯å?¦ä¿?ç??å?¶ä»?å·²é?£ç·?ç??客æ?¶ç«¯ç¨?å¼?"
 
-#: ../data/vinagre.schemas.in.in.h:10
+#: ../data/vinagre.schemas.in.in.h:11
 msgid ""
 "Whether we should show tabs even when there is only one active connection"
 msgstr "æ?¯å?¦è¦?å?¨å?ªä½¿ç?¨ä¸?å??é?£ç·?æ??顯示å??é ?"
 
-#: ../data/vinagre.schemas.in.in.h:11
+#: ../data/vinagre.schemas.in.in.h:12
 msgid "Whether we should show the menu accelerators (shortcut keys)"
 msgstr "æ?¯å?¦é¡¯ç¤ºé?¸å?®å? é??é?µï¼?æ?·å¾?é?µï¼?"
 
+#: ../data/vinagre.schemas.in.in.h:13
+msgid "Whether we should start the program listening for reverse connections"
+msgstr "æ?¯å?¦å??å??ç¨?å¼?以è?½å??å??å??é?£ç·?"
+
 #: ../data/vinagre-mime.xml.in.h:1
 msgid "Remote Desktop (VNC) file"
 msgstr "é? ç«¯æ¡?é?¢(VNC)æ??件"
@@ -199,17 +215,30 @@ msgid "Remote Desktop Connection"
 msgstr "�端����"
 
 #. vim: set ts=8:
-#: ../plugins/ssh/vinagre-ssh-plugin.c:70
+#: ../plugins/ssh/vinagre-ssh-plugin.c:76
 #: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:1
 msgid "SSH"
 msgstr "SSH"
 
 #. Translators: This is a description of the SSH protocol. It appears at Connect dialog.
-#: ../plugins/ssh/vinagre-ssh-plugin.c:72
+#: ../plugins/ssh/vinagre-ssh-plugin.c:78
 msgid "Access Unix/Linux terminals"
 msgstr "å­?å?? Unix/Linux çµ?端æ©?"
 
-#: ../plugins/ssh/vinagre-ssh-tab.c:50 ../plugins/vnc/vinagre-vnc-tab.c:135
+#: ../plugins/ssh/vinagre-ssh-plugin.c:132
+msgid "SSH Options"
+msgstr "SSH ��"
+
+#. Translators: This is the tooltip for the username field in a SSH connection
+#: ../plugins/ssh/vinagre-ssh-plugin.c:149
+msgid ""
+"Optional. If blank, your username will be used. Also, it can be supplied in "
+"the Machine field above, in the form username hostname "
+msgstr ""
+"é?¸æ??æ?§ç??ã??å¦?æ??ä¿?æ??空ç?½ï¼?æ??使ç?¨æ?¨ç??使ç?¨è??å??稱ã??å?¦å¤?ï¼?ä¹?å?¯ä»¥å?¨ä¸?é?¢ç??ã??æ©?å?¨ã??æ¬?"
+"ä½?中æ??å®?ï¼?æ ¼å¼?ç?º 使ç?¨è??å??稱 主æ©?å??稱ã??"
+
+#: ../plugins/ssh/vinagre-ssh-tab.c:50 ../plugins/vnc/vinagre-vnc-tab.c:149
 msgid "Port:"
 msgstr "���:"
 
@@ -217,140 +246,227 @@ msgstr "���:"
 msgid "SSH support"
 msgstr "SSH ��"
 
-#: ../plugins/vnc/vinagre-vnc-connection.c:207
-#: ../plugins/vnc/vinagre-vnc-plugin.c:214
+#: ../plugins/vnc/vinagre-vnc-connection.c:290
+#: ../plugins/vnc/vinagre-vnc-plugin.c:321
 #, c-format
 msgid ""
 "Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it."
 msgstr "ã??sharedã??æ??æ¨?æ?¸å?¼é?¯èª¤ï¼?%dã??å®?æ??該ç?º 0 æ?? 1ã??å?ªè?½å¿½ç?¥æ­¤æ?¸å?¼ã??"
 
+#: ../plugins/vnc/vinagre-vnc-plugin.c:84
+msgid "_Reverse Connections..."
+msgstr "å??å??é?£ç·?(_R)..."
+
+#: ../plugins/vnc/vinagre-vnc-plugin.c:86
+msgid "Configure incoming VNC connections"
+msgstr "設å®?é?£å?¥ç?? VNC é?£ç·?"
+
 #. Translators: this is a command line option (run vinagre --help)
-#: ../plugins/vnc/vinagre-vnc-plugin.c:66
+#: ../plugins/vnc/vinagre-vnc-plugin.c:173
 msgid "Enable scaled mode"
 msgstr "å??ç?¨ç¸®æ?¾æ¨¡å¼?"
 
 #. Translators: this is a command line option (run vinagre --help)
-#: ../plugins/vnc/vinagre-vnc-plugin.c:81
+#: ../plugins/vnc/vinagre-vnc-plugin.c:188
 msgid "VNC Options:"
 msgstr "VNC ���"
 
 #. Translators: this is a command line option (run vinagre --help)
-#: ../plugins/vnc/vinagre-vnc-plugin.c:83
+#: ../plugins/vnc/vinagre-vnc-plugin.c:190
 msgid "Show VNC Options"
 msgstr "顯示 VNC ��"
 
 #. vim: set ts=8:
-#: ../plugins/vnc/vinagre-vnc-plugin.c:105
+#: ../plugins/vnc/vinagre-vnc-plugin.c:212
 #: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:1
 msgid "VNC"
 msgstr "VNC"
 
-#: ../plugins/vnc/vinagre-vnc-plugin.c:106
+#: ../plugins/vnc/vinagre-vnc-plugin.c:213
 msgid "Access Unix/Linux, Windows and other machines."
 msgstr "å­?å?? Unix/Linuxã??Windows å??å?¶ä»?é?»è?¦ã??"
 
-#: ../plugins/vnc/vinagre-vnc-plugin.c:163
+#: ../plugins/vnc/vinagre-vnc-plugin.c:270
 msgid "Could not parse the file."
 msgstr "ç?¡æ³?解æ??該æª?æ¡?ã??"
 
-#: ../plugins/vnc/vinagre-vnc-plugin.c:170
+#: ../plugins/vnc/vinagre-vnc-plugin.c:277
 msgid "The file is not a VNC one: Missing the group \"connection\"."
 msgstr "該æª?æ¡?並é?? VNC æª?æ¡?ï¼?缺å°?群çµ?ã??connectionã??ã??"
 
-#: ../plugins/vnc/vinagre-vnc-plugin.c:176
+#: ../plugins/vnc/vinagre-vnc-plugin.c:283
 msgid "The file is not a VNC one: Missing the key \"host\"."
 msgstr "該æª?æ¡?並é?? VNC æª?æ¡?ï¼?缺å°?設å®?é?µã??hostã??ã??"
 
-#: ../plugins/vnc/vinagre-vnc-plugin.c:243
+#: ../plugins/vnc/vinagre-vnc-plugin.c:374
 msgid "VNC Options"
 msgstr "VNC ��"
 
-#: ../plugins/vnc/vinagre-vnc-plugin.c:254
-#: ../plugins/vnc/vinagre-vnc-tab.c:654
+#. View only check button
+#: ../plugins/vnc/vinagre-vnc-plugin.c:387
+#: ../plugins/vnc/vinagre-vnc-tab.c:632
 msgid "_View only"
 msgstr "å?ªæ??檢è¦?(_V)"
 
-#: ../plugins/vnc/vinagre-vnc-plugin.c:261
+#. Scaling check button
+#: ../plugins/vnc/vinagre-vnc-plugin.c:395
 msgid "_Scaling"
 msgstr "縮�(_S)"
 
+#: ../plugins/vnc/vinagre-vnc-plugin.c:411
+msgid "_Keep aspect ratio"
+msgstr "ä¿?æ??é?·å¯¬æ¯?(_K)"
+
+#. JPEG Compression check button
+#: ../plugins/vnc/vinagre-vnc-plugin.c:421
+msgid "_Use JPEG Compression"
+msgstr "使� JPEG �縮(_U)"
+
+#: ../plugins/vnc/vinagre-vnc-plugin.c:422
+msgid "This might not work on all VNC servers"
+msgstr "é??å?¯è?½ç?¡æ³?ç?¨æ?¼æ??æ??ç?? VNC 伺æ??å?¨"
+
+#: ../plugins/vnc/vinagre-vnc-plugin.c:431
+msgid "_Depth Color:"
+msgstr "��深度(_D):"
+
+#: ../plugins/vnc/vinagre-vnc-plugin.c:436
+msgid "Use Server Settings"
+msgstr "使ç?¨ä¼ºæ??å?¨è¨­å®?å?¼"
+
+#: ../plugins/vnc/vinagre-vnc-plugin.c:437
+msgid "True Color (24 bits)"
+msgstr "ç??彩 (24 ä½?å??)"
+
+#: ../plugins/vnc/vinagre-vnc-plugin.c:438
+msgid "High Color (16 bits)"
+msgstr "é«?彩 (16 ä½?å??)"
+
+#: ../plugins/vnc/vinagre-vnc-plugin.c:439
+msgid "Low Color (8 bits)"
+msgstr "ä½?è?²å½© (8 ä½?å??)"
+
+#: ../plugins/vnc/vinagre-vnc-plugin.c:440
+msgid "Ultra Low Color (3 bits)"
+msgstr "極ä½?è?²å½© (3 ä½?å??)"
+
+#. Translators: the whole sentence will be: Use host <hostname> as a SSH tunnel
+#: ../plugins/vnc/vinagre-vnc-plugin.c:453
+msgid "Use h_ost"
+msgstr "使�主�(_O)"
+
+#. Translators: This is the tooltip of the SSH tunneling entry
+#: ../plugins/vnc/vinagre-vnc-plugin.c:461
+msgid "hostname or user hostname"
+msgstr "主æ©?å??稱 æ?? 使ç?¨è?? 主æ©?å??稱"
+
+#. Translators: the whole sentence will be: Use host <hostname> as a SSH tunnel
+#: ../plugins/vnc/vinagre-vnc-plugin.c:465
+msgid "as a SSH tunnel"
+msgstr "å??ç?º SSH ç©¿é?§"
+
 #. Translators: this is a pattern to open *.vnc files in a open dialog.
-#: ../plugins/vnc/vinagre-vnc-plugin.c:285
+#: ../plugins/vnc/vinagre-vnc-plugin.c:500
 msgid "VNC Files"
 msgstr "VNC ��"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:133
+#: ../plugins/vnc/vinagre-vnc-tab.c:147
 msgid "Desktop Name:"
 msgstr "æ¡?é?¢å??稱ï¼?"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:136
+#: ../plugins/vnc/vinagre-vnc-tab.c:150
 msgid "Dimensions:"
 msgstr "尺寸:"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:268
+#: ../plugins/vnc/vinagre-vnc-tab.c:304
+msgid "Error creating the SSH tunnel"
+msgstr "建ç«? SSH ç©¿é?§æ??ç?¼ç??é?¯èª¤"
+
+#: ../plugins/vnc/vinagre-vnc-tab.c:305 ../plugins/vnc/vinagre-vnc-tab.c:316
+msgid "Unknown reason"
+msgstr "ä¸?æ??ç??å??å? "
+
+#: ../plugins/vnc/vinagre-vnc-tab.c:315
 msgid "Error connecting to host."
 msgstr "é?£ç·?å?°ä¸»æ©?æ??é?¯èª¤ã??"
 
 #. Translators: %s is a host name or IP address; %u is a code error (number).
-#: ../plugins/vnc/vinagre-vnc-tab.c:306
+#: ../plugins/vnc/vinagre-vnc-tab.c:360
 #, c-format
 msgid "Authentication method to host %s is unsupported. (%u)"
 msgstr "ä¸?æ?¯æ??å?°ä¸»æ©? %s ç??é©?è­?æ?¹æ³?ã??(%u)"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:310
+#: ../plugins/vnc/vinagre-vnc-tab.c:364
 msgid "Authentication unsupported"
 msgstr "ä¸?æ?¯æ?´ç??é©?è­?æ?¹æ³?"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:570 ../plugins/vnc/vinagre-vnc-tab.c:587
+#: ../plugins/vnc/vinagre-vnc-tab.c:531 ../plugins/vnc/vinagre-vnc-tab.c:548
 msgid "Authentication error"
 msgstr "���誤"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:571
+#: ../plugins/vnc/vinagre-vnc-tab.c:532
 msgid "A username is required in order to access this machine."
 msgstr "ç?ºäº?å­?å??é??å??é?»è?¦é??è¦?使ç?¨è??å??稱ã??"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:588
+#: ../plugins/vnc/vinagre-vnc-tab.c:549
 msgid "A password is required in order to access this machine."
 msgstr "ç?ºäº?å­?å??é??å??é?»è?¦é??è¦?å¯?碼ã??"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:639
+#: ../plugins/vnc/vinagre-vnc-tab.c:603
 msgid "S_caling"
 msgstr "縮�(_C)"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:640
+#: ../plugins/vnc/vinagre-vnc-tab.c:604
 msgid "Fits the remote screen into the current window size"
 msgstr "è®?é? ç«¯è?¢å¹?è?½ç¬¦å??ç?®å??ç??è¦?çª?大å°?"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:655
+#: ../plugins/vnc/vinagre-vnc-tab.c:617
+msgid "_Keep Aspect Ratio"
+msgstr "ä¿?æ??é?·å¯¬æ¯?(_K)"
+
+#: ../plugins/vnc/vinagre-vnc-tab.c:618
+msgid "Keeps the screen aspect ratio when using scaling"
+msgstr "使ç?¨ç¸®æ?¾æ??ä¿?æ??è?¢å¹?é?·å¯¬æ¯?"
+
+#: ../plugins/vnc/vinagre-vnc-tab.c:633
 msgid "Does not send mouse and keyboard events"
 msgstr "ä¸?è¦?é??å?ºæ»?é¼ è??é?µç?¤äº?件"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:668
+#: ../plugins/vnc/vinagre-vnc-tab.c:646
 msgid "_Original size"
 msgstr "å??å§?大å°?(_O)"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:669
+#: ../plugins/vnc/vinagre-vnc-tab.c:647
 msgid "Adjusts the window to the remote desktop's size"
 msgstr "å°?è¦?çª?調æ?´ç?ºé? ç«¯æ¡?é?¢ç??大å°?"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:692 ../plugins/vnc/vinagre-vnc-tab.c:766
-#: ../plugins/vnc/vinagre-vnc-tab.c:767
+#: ../plugins/vnc/vinagre-vnc-tab.c:660
+msgid "_Refresh Screen"
+msgstr "é??æ?°æ?´ç??ç?«é?¢(_R)"
+
+#: ../plugins/vnc/vinagre-vnc-tab.c:661
+msgid "Requests an update of the screen"
+msgstr "������"
+
+#. Send Ctrl-alt-del
+#: ../plugins/vnc/vinagre-vnc-tab.c:683 ../plugins/vnc/vinagre-vnc-tab.c:755
+#: ../plugins/vnc/vinagre-vnc-tab.c:757
 msgid "Send Ctrl-Alt-Del"
 msgstr "å?³é?? Ctrl-Alt-Del"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:693
+#: ../plugins/vnc/vinagre-vnc-tab.c:684
 msgid "Sends Ctrl+Alt+Del to the remote machine"
 msgstr "å?³é?? Ctrl+Alt+Del å?°é? ç«¯æ©?å?¨"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:745 ../plugins/vnc/vinagre-vnc-tab.c:746
+#: ../plugins/vnc/vinagre-vnc-tab.c:736 ../plugins/vnc/vinagre-vnc-tab.c:737
 msgid "Scaling"
 msgstr "正�縮�"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:755 ../plugins/vnc/vinagre-vnc-tab.c:756
+#: ../plugins/vnc/vinagre-vnc-tab.c:746 ../plugins/vnc/vinagre-vnc-tab.c:747
 msgid "Read only"
 msgstr "��"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:925
+#: ../plugins/vnc/vinagre-vnc-tab.c:919
 msgid ""
 "Scaling is not supported on this installation.\n"
 "\n"
@@ -361,10 +477,68 @@ msgstr ""
 "\n"
 "è«?é?±è®? README æª?æ¡?ï¼?é?¨é??å?¨ Vinagre 裡ï¼?以äº?解å¦?ä½?å??ç?¨é??å??å??è?½ã??"
 
+#: ../plugins/vnc/vinagre-vnc-tunnel.c:77
+#, c-format
+msgid "Unable to find a free TCP port"
+msgstr "æ?¾ä¸?å?°å?¯ç?¨ç?? TCP é?£æ?¥å? "
+
 #: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:2
 msgid "VNC support"
 msgstr "VNC ��"
 
+#: ../plugins/vnc/vinagre-vnc-listener-dialog.c:90
+msgid "IPv4:"
+msgstr "IPv4ï¼?"
+
+#: ../plugins/vnc/vinagre-vnc-listener-dialog.c:102
+msgid ""
+"\n"
+"\n"
+"IPv6:"
+msgstr ""
+"\n"
+"\n"
+"IPv6ï¼?"
+
+#: ../plugins/vnc/vinagre-vnc-listener-dialog.c:161
+#, c-format
+msgid "On the port %d"
+msgstr "���� %d"
+
+#: ../plugins/vnc/vinagre-vnc-listener.c:168
+msgid "Incoming VNC connection arrived but there is no active window"
+msgstr "æ?? VNC é?£ç·?é?²å?¥ä½?æ?¯æ²?æ??使ç?¨ä¸­ç??è¦?çª?"
+
+#. vim: set ts=8:
+#: ../plugins/vnc/vnc.ui.h:1
+msgid ""
+"By activating reverse connections you can access machines that are behind a "
+"firewall. The remote side is supposed to initiate the connection with you. "
+"For further information, checkout the help."
+msgstr ""
+"å??ç?¨å??å??é?£ç·?è?½è®?æ?¨å­?å??ä½?æ?¼é?²ç?«ç??å¾?ç??æ©?å?¨ã??é? ç«¯æ©?å?¨æ??該æ??èµ·å§?è??æ?¨ç??é?£ç·?ã??é??è¦?"
+"æ?´å¤?è³?è¨?ï¼?è«?æ?¥é?±æ±?å?©é?¸å?®ã??"
+
+#: ../plugins/vnc/vnc.ui.h:2
+msgid "Connectivity"
+msgstr "é?£ç·?è?½å??"
+
+#: ../plugins/vnc/vnc.ui.h:3
+msgid "Reverse Connections"
+msgstr "å??å??é?£ç·?"
+
+#: ../plugins/vnc/vnc.ui.h:4
+msgid "This machine is reachable through the following IP address(es):"
+msgstr "é??å??é?»è?¦å?¯ä»¥é??é??ä¸?å?? IP ä½?å??使ç?¨ï¼?"
+
+#: ../plugins/vnc/vnc.ui.h:5
+msgid "_Always Enabled"
+msgstr "æ°¸é? å??ç?¨(_A)"
+
+#: ../plugins/vnc/vnc.ui.h:6
+msgid "_Enable Reverse Connections"
+msgstr "å??ç?¨å??å??é?£ç·?(_E)"
+
 #: ../vinagre/GNOME_VinagreApplet.server.in.in.h:1
 msgid "A menu to quickly access remote machines"
 msgstr "ç?¨ä¾?å¿«é??é?£ç·?å?°é? ç«¯æ©?å?¨ç??é?¸å?®"
@@ -385,8 +559,8 @@ msgstr "é??å??é? ç«¯æ¡?é?¢æª¢è¦?å?¨"
 msgid "Access your bookmarks"
 msgstr "å­?å??æ?¨ç??æ?¸ç±¤"
 
-#: ../vinagre/vinagre-bookmarks.c:265 ../vinagre/vinagre-connection.c:519
-#: ../vinagre/vinagre-tab.c:533 ../vinagre/vinagre-tube-handler.c:256
+#: ../vinagre/vinagre-bookmarks.c:265 ../vinagre/vinagre-connection.c:522
+#: ../vinagre/vinagre-tab.c:535 ../vinagre/vinagre-tube-handler.c:253
 #, c-format
 msgid "The protocol %s is not supported."
 msgstr "æ?ªæ?¯æ?´é??è¨?å??å®? %s ã??"
@@ -398,9 +572,10 @@ msgstr "å??å§?å??æ?¸ç±¤æ??é?¯èª¤ï¼?%s"
 
 #: ../vinagre/vinagre-bookmarks.c:343 ../vinagre/vinagre-bookmarks.c:458
 #: ../vinagre/vinagre-bookmarks-migration.c:135
-#: ../vinagre/vinagre-commands.c:170 ../vinagre/vinagre-connect.c:459
-#: ../vinagre/vinagre-fav.c:681 ../vinagre/vinagre-main.c:100
-#: ../vinagre/vinagre-main.c:119 ../vinagre/vinagre-window.c:266
+#: ../vinagre/vinagre-cache-prefs.c:53 ../vinagre/vinagre-commands.c:173
+#: ../vinagre/vinagre-connect.c:482 ../vinagre/vinagre-fav.c:765
+#: ../vinagre/vinagre-main.c:101 ../vinagre/vinagre-main.c:120
+#: ../vinagre/vinagre-window.c:268 ../vinagre/vinagre-window.c:737
 msgid "Unknown error"
 msgstr "ä¸?æ??ç??é?¯èª¤"
 
@@ -445,7 +620,7 @@ msgid "Error while migrating bookmarks: Failed to finalize the XML structure"
 msgstr "å?¨è½?移æ?¸ç±¤æ??ç?¼ç??é?¯èª¤ï¼?çµ?æ?? XML çµ?æ§?失æ??"
 
 #: ../vinagre/vinagre-bookmarks-migration.c:135
-#: ../vinagre/vinagre-bookmarks-migration.c:238
+#: ../vinagre/vinagre-bookmarks-migration.c:217
 #, c-format
 msgid "Error while migrating bookmarks: %s"
 msgstr "è½?移æ?¸ç±¤æ??ç?¼ç??é?¯èª¤ï¼?%s"
@@ -454,27 +629,27 @@ msgstr "è½?移æ?¸ç±¤æ??ç?¼ç??é?¯èª¤ï¼?%s"
 msgid "Error while migrating bookmarks: VNC plugin is not activated"
 msgstr "è½?移æ?¸ç±¤æ??ç?¼ç??é?¯èª¤ï¼?å°?æ?ªä½¿ç?¨ VNC å¤?æ??ç¨?å¼?"
 
-#: ../vinagre/vinagre-bookmarks-migration.c:238
+#: ../vinagre/vinagre-bookmarks-migration.c:217
 msgid "Failed to create the directory"
 msgstr "建ç«?ç?®é??失æ??"
 
-#: ../vinagre/vinagre-bookmarks-migration.c:262
+#: ../vinagre/vinagre-bookmarks-migration.c:241
 msgid ""
 "Migrating the bookmarks file to the new format. This operation is only "
 "supposed to run once."
 msgstr "æ­£å?¨å°?æ?¸ç±¤æª?æ¡?è½?移ç?ºæ?°ç??æ ¼å¼?ã??é??å??æ??ä½?å?ªè?½å?·è¡?ä¸?次ã??"
 
-#: ../vinagre/vinagre-bookmarks-migration.c:270
+#: ../vinagre/vinagre-bookmarks-migration.c:249
 #, c-format
 msgid "Error opening old bookmarks file: %s"
 msgstr "é??å??è??ç??æ?¸ç±¤æª?æ¡?æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: ../vinagre/vinagre-bookmarks-migration.c:271
-#: ../vinagre/vinagre-bookmarks-migration.c:283
+#: ../vinagre/vinagre-bookmarks-migration.c:250
+#: ../vinagre/vinagre-bookmarks-migration.c:262
 msgid "Migration cancelled"
 msgstr "è½?移ç¨?åº?å·²å??æ¶?"
 
-#: ../vinagre/vinagre-bookmarks-migration.c:280
+#: ../vinagre/vinagre-bookmarks-migration.c:259
 msgid "Could not remove the old bookmarks file"
 msgstr "ç?¡æ³?移é?¤è??ç??æ?¸ç±¤æª?æ¡?"
 
@@ -529,122 +704,167 @@ msgstr "移é?¤æ?¸ç±¤æ??ç?¼ç??é?¯èª¤ï¼?æ?¾ä¸?å?°é ?ç?®"
 msgid "New Folder"
 msgstr "æ?°å¢?è³?æ??夾"
 
-#: ../vinagre/vinagre-commands.c:120
+#: ../vinagre/vinagre-cache-prefs.c:53
+#, c-format
+msgid "Error while saving preferences: %s"
+msgstr "ç?¶å?²å­?å??好設å®?æ??ç?¼ç??é?¯èª¤ï¼?%s"
+
+#: ../vinagre/vinagre-commands.c:121
 msgid "Choose the file"
 msgstr "é?¸æ??æ??件"
 
-#: ../vinagre/vinagre-commands.c:148
-msgid "There are none supported files"
+#: ../vinagre/vinagre-commands.c:149
+msgid "There are no supported files"
 msgstr "é??裡æ²?æ??æ?¯æ?´ç??æª?æ¡?"
 
-#: ../vinagre/vinagre-commands.c:148
+#: ../vinagre/vinagre-commands.c:150
 msgid ""
-"None of the active plugins offer a supported file to be open. Activate some "
-"plugins and try again."
-msgstr ""
-"使ç?¨ä¸­ç??å¤?æ??ç¨?å¼?æ²?æ??æ??ä¾?å?¯é??å??ç??æ?¯æ?´æª?æ¡?ã??è«?使ç?¨å?¶ä»?å¤?æ??ç¨?å¼?å¾?å??試ä¸?次ã??"
+"None of the active plugins support this action. Activate some plugins and "
+"try again."
+msgstr "使ç?¨ä¸­ç??å¤?æ??ç¨?å¼?æ²?æ??æ?¯æ?´é??å??å??ä½?ã??è«?使ç?¨å?¶ä»?å¤?æ??ç¨?å¼?å¾?å??試ä¸?次ã??"
 
-#: ../vinagre/vinagre-commands.c:181
+#: ../vinagre/vinagre-commands.c:184
 msgid "The following file could not be opened:"
 msgid_plural "The following files could not be opened:"
 msgstr[0] "ç?¡æ³?é??å??ä¸?å??æ??件ï¼?"
 msgstr[1] "ç?¡æ³?é??å??ä¸?å??æ??件ï¼?"
 
-#: ../vinagre/vinagre-connect.c:86 ../vinagre/vinagre-connect.c:330
-#: ../vinagre/vinagre-connect.c:424
+#: ../vinagre/vinagre-connect.c:87 ../vinagre/vinagre-connect.c:334
+#: ../vinagre/vinagre-connect.c:446
 msgid "Could not get the active protocol in the protocol list."
 msgstr "ç?¡æ³?å?¨é??è¨?å??å®?æ¸?å?®ä¸­å??å¾?使ç?¨ä¸­ç??é??è¨?å??å®?ã??"
 
-#: ../vinagre/vinagre-connect.c:313
+#: ../vinagre/vinagre-connect.c:315
 #, c-format
 msgid "Error while saving history file: %s"
 msgstr "å?²å­?æ­·å?²ç´?é??æª?æ¡?æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: ../vinagre/vinagre-connect.c:340
+#: ../vinagre/vinagre-connect.c:350
 msgid "Choose a Remote Desktop"
 msgstr "é?¸æ??ä¸?å??é? ç«¯æ¡?é?¢"
 
-#: ../vinagre/vinagre-connection.c:627
+#: ../vinagre/vinagre-connection.c:630
 msgid "Could not open the file."
 msgstr "ç?¡æ³?é??å??該æª?æ¡?ã??"
 
-#: ../vinagre/vinagre-connection.c:651
+#: ../vinagre/vinagre-connection.c:654
 msgid "The file was not recognized by any of the plugins."
 msgstr "該æª?æ¡?ç?¡æ³?被任ä½?å¤?æ??ç¨?å¼?辨è­?ã??"
 
-#: ../vinagre/vinagre-fav.c:670
+#: ../vinagre/vinagre-fav.c:567
+msgid "_New Folder"
+msgstr "æ?°å¢?è³?æ??夾(_N)"
+
+#: ../vinagre/vinagre-fav.c:568
+msgid "Create a new folder"
+msgstr "建ç«?æ?°ç??è³?æ??夾"
+
+#: ../vinagre/vinagre-fav.c:573
+msgid "_Open bookmark"
+msgstr "é??å??æ?¸ç±¤(_O)"
+
+#: ../vinagre/vinagre-fav.c:574
+msgid "Connect to this machine"
+msgstr "���此��"
+
+#: ../vinagre/vinagre-fav.c:575
+msgid "_Edit bookmark"
+msgstr "編輯�籤(_E)"
+
+#: ../vinagre/vinagre-fav.c:576
+msgid "Edit the details of selected bookmark"
+msgstr "編輯æ??é?¸æ??æ?¸ç±¤ç??ç´°ç¯?"
+
+#: ../vinagre/vinagre-fav.c:577
+msgid "_Remove from bookmarks"
+msgstr "��籤中移�(_R)"
+
+#: ../vinagre/vinagre-fav.c:578
+msgid "Remove current selected connection from bookmarks"
+msgstr "å¾?æ?¸ç±¤ä¸­ç§»é?¤ç?¶å??é?¸æ??ç??é?£ç·?"
+
+#: ../vinagre/vinagre-fav.c:596 ../vinagre/vinagre-window.c:399
+#, c-format
+msgid "Could not merge UI XML file: %s"
+msgstr "ç?¡æ³?å??ä½µ UI XML æª?æ¡?ï¼?%s"
+
+#: ../vinagre/vinagre-fav.c:754
 msgid "Invalid operation"
 msgstr "ç?¡æ??ç??æ??ä½?"
 
-#: ../vinagre/vinagre-fav.c:671
+#: ../vinagre/vinagre-fav.c:755
 msgid "Data received from drag&drop operation is invalid."
 msgstr "å¾?æ??æ?¾æ??ä½?中å??å??ç??è³?æ??æ?¯ç?¡æ??ç??ã??"
 
-#: ../vinagre/vinagre-fav.c:871
+#: ../vinagre/vinagre-fav.c:859
+msgid "Hide panel"
+msgstr "é?±è??é?¢æ?¿"
+
+#: ../vinagre/vinagre-fav.c:1044
 msgid "Hosts nearby"
 msgstr "è?¨è¿?ç??主æ©?"
 
 #. Translators: this is a command line option (run vinagre --help)
-#: ../vinagre/vinagre-main.c:62
+#: ../vinagre/vinagre-main.c:63
 msgid "Open vinagre in fullscreen mode"
 msgstr "以å?¨è?¢å¹?模å¼?é??å?? vinagre"
 
 #. Translators: this is a command line option (run vinagre --help)
-#: ../vinagre/vinagre-main.c:66
+#: ../vinagre/vinagre-main.c:67
 msgid "Create a new toplevel window in an existing instance of vinagre"
 msgstr "å?¨æ?¢å­?ç?? vinagre 實é«?中建ç«?æ?°ç??é ?層è¦?çª?"
 
 #. Translators: this is a command line option (run vinagre --help)
-#: ../vinagre/vinagre-main.c:70
+#: ../vinagre/vinagre-main.c:71
 msgid "Open a file recognized by vinagre"
 msgstr "é??å?? vinagre å?¯è¾¨è­?ç??æª?æ¡?"
 
-#: ../vinagre/vinagre-main.c:70
+#: ../vinagre/vinagre-main.c:71
 msgid "filename"
 msgstr "æª?æ¡?å??稱"
 
 #. Translators: this is a command line option (run vinagre --help)
-#: ../vinagre/vinagre-main.c:75
+#: ../vinagre/vinagre-main.c:76
 msgid "[server:port]"
 msgstr "[伺æ??å?¨:å? å?£]"
 
-#: ../vinagre/vinagre-main.c:130
+#: ../vinagre/vinagre-main.c:131
 msgid "The following error has occurred:"
 msgid_plural "The following errors have occurred:"
 msgstr[0] "ç?¼ç??ä¸?å??é?¯èª¤ï¼?"
 msgstr[1] "ç?¼ç??ä¸?å??é?¯èª¤ï¼?"
 
 #. Setup command line options
-#: ../vinagre/vinagre-main.c:169
+#: ../vinagre/vinagre-main.c:170
 msgid "- Remote Desktop Viewer"
 msgstr "- �端��檢��"
 
-#: ../vinagre/vinagre-main.c:193
+#: ../vinagre/vinagre-main.c:195
 msgid ""
 "Run 'vinagre --help' to see a full list of available command line options"
 msgstr "å?·è¡?ã??vinagre --helpã??以æ?¥ç??å?¯ç?¨å?½ä»¤è¡?é?¸é ?ç??å®?æ?´å??表"
 
-#: ../vinagre/vinagre-mdns.c:142
+#: ../vinagre/vinagre-mdns.c:159
 #, c-format
 msgid "Failed to resolve avahi hostname: %s\n"
 msgstr "解æ?? avahi 主æ©?å??稱失æ??ï¼?%s\n"
 
-#: ../vinagre/vinagre-mdns.c:200
+#: ../vinagre/vinagre-mdns.c:217
 #, c-format
 msgid "Plugin %s has already registered a browser for service %s."
 msgstr "å¤?æ??ç¨?å¼? %s 已被ç??覽å?¨è¨»å??ç?¨æ?¼æ??å?? %sã??"
 
-#: ../vinagre/vinagre-mdns.c:209
+#: ../vinagre/vinagre-mdns.c:226
 #, c-format
 msgid "Failed to add mDNS browser for service %s."
 msgstr "å°? mDNS ç??覽å?¨å? å?¥æ??å?? %s失æ??ã??"
 
-#: ../vinagre/vinagre-mdns.c:225
+#: ../vinagre/vinagre-mdns.c:242
 #, c-format
 msgid "Failed to browse for hosts: %s\n"
 msgstr "ç??覽主æ©?失æ??ï¼?%s\n"
 
-#: ../vinagre/vinagre-mdns.c:298
+#: ../vinagre/vinagre-mdns.c:315
 #, c-format
 msgid "Failed to initialize mDNS browser: %s\n"
 msgstr "å??å§?å?? mDNS ç??覽å?¨å¤±æ??ï¼?%s\n"
@@ -669,11 +889,11 @@ msgstr "å?°ä¸»æ©? %s ç??é©?è­?失æ??"
 msgid "Authentication failed"
 msgstr "é©?è­?失æ??"
 
-#: ../vinagre/vinagre-notebook.c:525
+#: ../vinagre/vinagre-notebook.c:526
 msgid "Connecting..."
 msgstr "正���..."
 
-#: ../vinagre/vinagre-notebook.c:552 ../vinagre/vinagre-tab.c:325
+#: ../vinagre/vinagre-notebook.c:553 ../vinagre/vinagre-tab.c:325
 msgid "Close connection"
 msgstr "é??é??é?£ç·?"
 
@@ -713,79 +933,150 @@ msgstr "é??æ?¼å¤?æ??ç¨?å¼?(_A)"
 msgid "C_onfigure Plugin"
 msgstr "設å®?å¤?æ??ç¨?å¼?(_O)"
 
-#: ../vinagre/vinagre-prefs.c:217
+#: ../vinagre/vinagre-prefs.c:212
 msgid "Cannot initialize preferences manager."
 msgstr "ç?¡æ³?å??å§?å??å??好設å®?管ç??å?¡ã??"
 
+#: ../vinagre/vinagre-ssh.c:106
+msgid "Timed out when logging into SSH host"
+msgstr "ç?¶ç?»å?¥ SSH 主æ©?æ??ç??é?¾æ??æ??é??"
+
+#: ../vinagre/vinagre-ssh.c:180
+msgid "Unable to spawn ssh program"
+msgstr "���� ssh ��"
+
+#: ../vinagre/vinagre-ssh.c:197
+#, c-format
+msgid "Unable to spawn ssh program: %s"
+msgstr "���� ssh ���%s"
+
+#: ../vinagre/vinagre-ssh.c:352
+msgid "Timed out when logging in"
+msgstr "ç?»å?¥é?¾æ??æ??é??"
+
+#: ../vinagre/vinagre-ssh.c:375 ../vinagre/vinagre-ssh.c:529
+#: ../vinagre/vinagre-ssh.c:612
+msgid "Permission denied"
+msgstr "æ¬?é??ä¸?足"
+
+#: ../vinagre/vinagre-ssh.c:440
+msgid "Password dialog canceled"
+msgstr "å¯?碼å°?話ç??已被å??æ¶?"
+
+#: ../vinagre/vinagre-ssh.c:463
+msgid "Could not send password"
+msgstr "ç?¡æ³?å?³é??å¯?碼"
+
+#: ../vinagre/vinagre-ssh.c:471
+msgid "Log In Anyway"
+msgstr "強���"
+
+#: ../vinagre/vinagre-ssh.c:471
+msgid "Cancel Login"
+msgstr "å??æ¶?ç?»å?¥"
+
+#: ../vinagre/vinagre-ssh.c:480
+#, c-format
+msgid ""
+"The identity of the remote computer (%s) is unknown.\n"
+"This happens when you log in to a computer the first time.\n"
+"\n"
+"The identity sent by the remote computer is %s. If you want to be absolutely "
+"sure it is safe to continue, contact the system administrator."
+msgstr ""
+"é? ç«¯é?»è?¦ (%s) ç??è­?å?¥ä¸?æ??ã??\n"
+"é??é??常ç?¼ç??å?¨æ?¨ç¬¬ä¸?次ç?»å?¥é?»è?¦ç??æ??å??ã??\n"
+"\n"
+"ç?±é? ç«¯é?»è?¦å?³é??ç??è­?å?¥ç?º %sã??å¦?æ??æ?¨æ?³è¦?å®?å?¨ç¢ºå®?ç¹¼çº?æ?¯å®?å?¨ç??ï¼?è«?é?£çµ¡ç³»çµ±ç®¡ç??è??ã??"
+
+#: ../vinagre/vinagre-ssh.c:498
+msgid "Login dialog canceled"
+msgstr "ç?»å?¥å°?話ç??已被å??æ¶?"
+
+#: ../vinagre/vinagre-ssh.c:519
+msgid "Can't send host identity confirmation"
+msgstr "ä¸?è?½å?³é??主æ©?è­?å?¥ç¢ºèª?"
+
+#: ../vinagre/vinagre-ssh.c:554 ../vinagre/vinagre-tab.c:732
+msgid "Error saving the credentials on the keyring."
+msgstr "å?²å­?æ??è­?å?°é?°å??å??æ??ç?¼ç??é?¯èª¤ã??"
+
+#: ../vinagre/vinagre-ssh.c:619
+msgid "Hostname not known"
+msgstr "主æ©?å??稱ä¸?æ??"
+
+#: ../vinagre/vinagre-ssh.c:626
+msgid "No route to host"
+msgstr "æ²?æ??è·¯ç?±å?¯å?°ä¸»æ©?"
+
+#: ../vinagre/vinagre-ssh.c:633
+msgid "Connection refused by server"
+msgstr "é?£ç·?被伺æ??å?¨æ??çµ?"
+
+#: ../vinagre/vinagre-ssh.c:640
+msgid "Host key verification failed"
+msgstr "主æ©?é??é?°é©?è­?失æ??"
+
+#: ../vinagre/vinagre-ssh.c:676
+msgid "Unable to find a valid SSH program"
+msgstr "æ?¾ä¸?å?°æ??æ??ç?? SSH ç¨?å¼?"
+
 #: ../vinagre/vinagre-tab.c:346
 msgid "Leave fullscreen"
 msgstr "é?¢é??å?¨è?¢å¹?"
 
-#: ../vinagre/vinagre-tab.c:495
+#: ../vinagre/vinagre-tab.c:497
 msgid "Error saving recent connection."
 msgstr "å?²å­?æ??è¿?é?£ç·?æ??é?¯èª¤ã??"
 
-#: ../vinagre/vinagre-tab.c:728
-msgid "Error saving the credentials on the keyring."
-msgstr "å?²å­?æ??è­?å?°é?°å??å??æ??ç?¼ç??é?¯èª¤ã??"
-
-#: ../vinagre/vinagre-tab.c:814
+#: ../vinagre/vinagre-tab.c:818
 msgid "Could not get a screenshot of the connection."
 msgstr "ç?¡æ³?å??å¾?æ­¤é?£ç·?ç??ç?«é?¢å¿«ç?§ã??"
 
-#: ../vinagre/vinagre-tab.c:819
+#: ../vinagre/vinagre-tab.c:823
 msgid "Save Screenshot"
 msgstr "����快�"
 
-#: ../vinagre/vinagre-tab.c:830
+#: ../vinagre/vinagre-tab.c:834
 #, c-format
 msgid "Screenshot of %s"
 msgstr "%s ç??ç?«é?¢å¿«ç?§"
 
-#: ../vinagre/vinagre-tab.c:881
+#: ../vinagre/vinagre-tab.c:885
 msgid "Error saving screenshot"
 msgstr "å?²å­?ç?«é?¢å¿«ç?§æ??ç?¼ç??é?¯èª¤"
 
-#: ../vinagre/vinagre-tube-handler.c:232
+#: ../vinagre/vinagre-tube-handler.c:229
 #, c-format
 msgid "Impossible to get service property: %s"
 msgstr "ä¸?å?¯è?½å??å¾?æ??å??屬æ?§ï¼?%s"
 
-#: ../vinagre/vinagre-tube-handler.c:289
+#: ../vinagre/vinagre-tube-handler.c:286
 #, c-format
 msgid "Impossible to create the connection: %s"
 msgstr "���建����%s"
 
-#: ../vinagre/vinagre-tube-handler.c:328
+#: ../vinagre/vinagre-tube-handler.c:325
 #, c-format
 msgid "Impossible to accept the stream tube: %s"
 msgstr "ä¸?å?¯è?½æ?¥å??串æµ?管ï¼?%s"
 
-#: ../vinagre/vinagre-tube-handler.c:404
-#, c-format
-msgid "Failed to request name: %s"
-msgstr "è¦?æ±?å??稱失æ??ï¼?%s"
-
-#: ../vinagre/vinagre-tube-handler.c:405
-msgid "No error given"
-msgstr "æ²?æ??æ??å®?ç??é?¯èª¤"
-
-#: ../vinagre/vinagre-tube-handler.c:482
+#: ../vinagre/vinagre-tube-handler.c:463
 #, c-format
 msgid "Impossible to get the contact name: %s"
 msgstr "ä¸?å?¯è?½å??å¾?é?£çµ¡äººå??稱ï¼?%s"
 
-#: ../vinagre/vinagre-tube-handler.c:517
+#: ../vinagre/vinagre-tube-handler.c:498
 #, c-format
 msgid "Impossible to get the avatar: %s"
 msgstr "ä¸?å?¯è?½å??å¾?大頭貼ï¼?%s"
 
-#: ../vinagre/vinagre-tube-handler.c:538
+#: ../vinagre/vinagre-tube-handler.c:519
 #, c-format
-msgid "%s wants to share his desktop with you."
-msgstr "%s æ?³è¦?è??æ?¨å??享ä»?ç??æ¡?é?¢ã??"
+msgid "%s wants to share their desktop with you."
+msgstr "%s æ?³è¦?è??æ?¨å??享ä»?å??ç??æ¡?é?¢ã??"
 
-#: ../vinagre/vinagre-tube-handler.c:543
+#: ../vinagre/vinagre-tube-handler.c:524
 msgid "Desktop sharing invitation"
 msgstr "æ¡?é?¢å?±äº«é??è«?"
 
@@ -822,111 +1113,82 @@ msgstr "çµ?æ??ç¨?å¼?"
 msgid "Edit the application preferences"
 msgstr "編輯æ??ç?¨ç¨?å¼?å??好設å®?"
 
-#. FIXME: Study this dialog for next release
-#. { "EditPlugins", GTK_STOCK_EXECUTE, N_("_Plugins"), NULL,
-#. N_("Select plugins"), G_CALLBACK (vinagre_cmd_edit_plugins) },
-#.
-#. Bookmarks menu
-#: ../vinagre/vinagre-ui.h:56
-msgid "_Open bookmark"
-msgstr "é??å??æ?¸ç±¤(_O)"
-
-#: ../vinagre/vinagre-ui.h:57
-msgid "Connect to this machine"
-msgstr "���此��"
-
-#: ../vinagre/vinagre-ui.h:58
-msgid "_Edit bookmark"
-msgstr "編輯�籤(_E)"
-
-#: ../vinagre/vinagre-ui.h:59
-msgid "Edit the details of selected bookmark"
-msgstr "編輯æ??é?¸æ??æ?¸ç±¤ç??ç´°ç¯?"
+#: ../vinagre/vinagre-ui.h:50
+msgid "_Plugins"
+msgstr "å¤?æ??ç¨?å¼?(_P)"
 
-#: ../vinagre/vinagre-ui.h:60
-msgid "_Remove from bookmarks"
-msgstr "��籤中移�(_R)"
-
-#: ../vinagre/vinagre-ui.h:61
-msgid "Remove current selected connection from bookmarks"
-msgstr "å¾?æ?¸ç±¤ä¸­ç§»é?¤ç?¶å??é?¸æ??ç??é?£ç·?"
-
-#: ../vinagre/vinagre-ui.h:62
-msgid "_New Folder"
-msgstr "æ?°å¢?è³?æ??夾(_N)"
-
-#: ../vinagre/vinagre-ui.h:63
-msgid "Create a new folder"
-msgstr "建ç«?æ?°ç??è³?æ??夾"
+#: ../vinagre/vinagre-ui.h:51
+msgid "Select plugins"
+msgstr "é?¸æ??å¤?æ??ç¨?å¼?"
 
 #. Help menu
-#: ../vinagre/vinagre-ui.h:66
+#: ../vinagre/vinagre-ui.h:54
 msgid "_Contents"
 msgstr "�容(_C)"
 
-#: ../vinagre/vinagre-ui.h:67
+#: ../vinagre/vinagre-ui.h:55
 msgid "Open the vinagre manual"
 msgstr "é??å?? vinagre æ??å??"
 
-#: ../vinagre/vinagre-ui.h:69
+#: ../vinagre/vinagre-ui.h:57
 msgid "About this application"
 msgstr "é??æ?¼æ­¤ç¨?å¼?"
 
-#: ../vinagre/vinagre-ui.h:74
+#: ../vinagre/vinagre-ui.h:62
 msgid "_Toolbar"
 msgstr "å·¥å?·å??(_T)"
 
-#: ../vinagre/vinagre-ui.h:75
+#: ../vinagre/vinagre-ui.h:63
 msgid "Show or hide the toolbar"
 msgstr "顯示æ??é?±è??å·¥å?·å??"
 
-#: ../vinagre/vinagre-ui.h:78
+#: ../vinagre/vinagre-ui.h:66
 msgid "_Statusbar"
 msgstr "ç??æ??å??(_S)"
 
-#: ../vinagre/vinagre-ui.h:79
+#: ../vinagre/vinagre-ui.h:67
 msgid "Show or hide the statusbar"
 msgstr "顯示æ??é?±è??ç??æ??å??"
 
-#: ../vinagre/vinagre-ui.h:82
+#: ../vinagre/vinagre-ui.h:70
 msgid "Side _Panel"
 msgstr "å?´é??é?¢æ?¿(_P)"
 
-#: ../vinagre/vinagre-ui.h:83
+#: ../vinagre/vinagre-ui.h:71
 msgid "Show or hide the side panel"
 msgstr "顯示æ??é?±è??å?´é??é?¢æ?¿"
 
-#: ../vinagre/vinagre-ui.h:91
+#: ../vinagre/vinagre-ui.h:79
 msgid "Close the current connection"
 msgstr "é??é??ç?¶å??é?£ç·?"
 
-#: ../vinagre/vinagre-ui.h:92
+#: ../vinagre/vinagre-ui.h:80
 msgid "C_lose All"
 msgstr "å?¨é?¨é??é??(_L)"
 
-#: ../vinagre/vinagre-ui.h:93
+#: ../vinagre/vinagre-ui.h:81
 msgid "Close all active connections"
 msgstr "é??é??å?¨é?¨æ´»å??中ç??é?£ç·?"
 
 #. Bookmarks menu
-#: ../vinagre/vinagre-ui.h:96
+#: ../vinagre/vinagre-ui.h:84
 msgid "_Add to bookmarks"
 msgstr "����籤(_A)"
 
-#: ../vinagre/vinagre-ui.h:97
+#: ../vinagre/vinagre-ui.h:85
 msgid "Add current connection to your bookmarks"
 msgstr "æ?°å¢?ç?®å??é?£ç·?è?³æ?¨ç??æ?¸ç±¤"
 
 #. Machine menu
-#: ../vinagre/vinagre-ui.h:104
+#: ../vinagre/vinagre-ui.h:92
 msgid "Take screenshot"
 msgstr "æ?·å??ç?«é?¢å¿«ç?§"
 
-#: ../vinagre/vinagre-ui.h:105
+#: ../vinagre/vinagre-ui.h:93
 msgid "Take a screenshot of active connection"
 msgstr "æ?·å??æ´»å??é?£ç·?ç??ç?«é?¢å¿«ç?§"
 
-#: ../vinagre/vinagre-ui.h:109
+#: ../vinagre/vinagre-ui.h:97
 msgid "View the current machine in full screen"
 msgstr "以å?¨è?¢å¹?檢è¦?ç?¶å??æ©?å?¨"
 
@@ -934,16 +1196,31 @@ msgstr "以å?¨è?¢å¹?檢è¦?ç?¶å??æ©?å?¨"
 msgid "An error has occurred:"
 msgstr "ç?¼ç??é?¯èª¤ï¼?"
 
-#: ../vinagre/vinagre-utils.c:150
-#, c-format
-msgid "Could not load builder file: %s"
-msgstr "����建置���%s"
+#: ../vinagre/vinagre-utils.c:175
+msgid ""
+"A plugin tried to open an UI file but did not succeed, with the error "
+"message:"
+msgstr "æ??å¤?æ??ç¨?å¼?å??試é??å?? UI æª?æ¡?ä½?並æ?ªæ??å??ï¼?é?¯èª¤è¨?æ?¯ç?ºï¼?"
 
-#: ../vinagre/vinagre-utils.c:453
+#: ../vinagre/vinagre-utils.c:177
+msgid ""
+"The program tried to open an UI file but did not succeed, with the error "
+"message:"
+msgstr "æ??ç¨?å¼?å??試é??å?? UI æª?æ¡?ä½?並æ?ªæ??å??ï¼?é?¯èª¤è¨?æ?¯ç?ºï¼?"
+
+#: ../vinagre/vinagre-utils.c:180
+msgid "Please check your installation."
+msgstr "è«?檢æ?¥å®?è£?æ?¯å?¦æ­£ç¢ºã??"
+
+#: ../vinagre/vinagre-utils.c:181
+msgid "Error loading UI file"
+msgstr "è¼?å?¥ UI æª?æ¡?æ??ç?¼ç??é?¯èª¤"
+
+#: ../vinagre/vinagre-utils.c:492
 msgid "Vinagre is a remote desktop viewer for the GNOME Desktop"
 msgstr "Vinagre æ?¯ GNOME æ¡?é?¢ç??é? ç«¯æ¡?é?¢æª¢è¦?å?¨"
 
-#: ../vinagre/vinagre-utils.c:456
+#: ../vinagre/vinagre-utils.c:495
 msgid ""
 "Vinagre 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 "
@@ -953,7 +1230,7 @@ msgstr ""
 "Vinagre æ?¯è?ªç?±è»?é«?ï¼?æ?¨å?¯ä»¥å?¨è?ªç?±è»?é«?å?ºé??æ??ç?¼è¡?ç?? GNU é??ç?¨å?¬å?±è¨±å?¯ç??æ¢?款ä¸?é??æ?°"
 "å??ç?¼å®?å??/æ??ä¿®æ?¹å®?ï¼?ç?¡è«?此許å?¯ç??ç??æ?¬2ï¼?æ??è??(以æ?¨ç??é?¸æ??)ä»»ä½?æ?´æ?°ç??ç??æ?¬ã??"
 
-#: ../vinagre/vinagre-utils.c:460
+#: ../vinagre/vinagre-utils.c:499
 msgid ""
 "Vinagre is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
@@ -963,7 +1240,7 @@ msgstr ""
 "Vinagre 被ç?¼ä½?æ?¯å¸?æ??å®?è?½å¤ æ??æ??ç?¨è??ï¼?ä½?ã??æ²?æ??ä»»ä½?ä¿?è­?ã??ï¼?ç??è?³æ²?æ??é?±å?«ã??å?¯é?·"
 "å?®ã??æ??è??ã??ç?¨æ?¼ç?¹å®?ç?¨é??ã??ç??ä¿?è­?ã??è«?æ?¥ç?? GNU é??ç?¨å?¬å?±è¨±å?¯ä»¥ç?²å¾?æ?´å¤?ç´°ç¯?ã??"
 
-#: ../vinagre/vinagre-utils.c:464
+#: ../vinagre/vinagre-utils.c:503
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program. If not, see <http://www.gnu.org/licenses/>."
@@ -971,7 +1248,7 @@ msgstr ""
 "æ?¨æ??該已ç¶?å??ç¨?å¼?ä¸?èµ·æ?¶å?°ä¸?份 GNU é??ç?¨å?¬å?±è¨±å?¯è­?ç??å?¯æ?¬ã??å¦?æ??é??æ²?æ??ï¼?è«?å??訪 "
 "<http://www.gnu.org/licenses/>ã??"
 
-#: ../vinagre/vinagre-utils.c:486
+#: ../vinagre/vinagre-utils.c:525
 msgid "translator-credits"
 msgstr ""
 "GNOME ç¨?å¼?中æ??å??é?µä»¶è«?å£?\n"
@@ -979,33 +1256,67 @@ msgstr ""
 "\n"
 "Hialan Liu <hialan liu gmail com>, 2008"
 
-#: ../vinagre/vinagre-utils.c:489
+#: ../vinagre/vinagre-utils.c:528
 msgid "Vinagre Website"
 msgstr "Vinagre 網�"
 
-#: ../vinagre/vinagre-window.c:397
+#. Translators: %s is a protocol, like VNC or SSH
+#: ../vinagre/vinagre-utils.c:660
 #, c-format
-msgid "Could not merge vinagre-ui.xml: %s"
-msgstr "ç?¡æ³?å??ä½µ vinagre-ui.xmlï¼?%s"
+msgid "%s authentication is required"
+msgstr "é??è¦? %s é©?è­?"
 
-#: ../vinagre/vinagre-window.c:425
+#: ../vinagre/vinagre-window.c:428
 msgid "_Recent connections"
 msgstr "æ??è¿?é?£ç·?(_R)"
 
 #. Translators: This is server:port, a statusbar tooltip when mouse is over a bookmark item on menu
-#: ../vinagre/vinagre-window.c:585
+#: ../vinagre/vinagre-window.c:543
 #, c-format
 msgid "Open %s:%d"
 msgstr "é??å?? %sï¼?%d"
 
-#~ msgid "Minimize window"
-#~ msgstr "æ??å°?å??è¦?çª?"
+#: ../vinagre/vinagre-window.c:721
+msgid "About menu accelerators and keyboard shortcuts"
+msgstr "é??æ?¼é?¸å?®è??é?µç?¤æ?·å¾?é?µ"
+
+#: ../vinagre/vinagre-window.c:723
+msgid ""
+"Vinagre comes with menu accelerators and keyboard shortcuts disabled by "
+"default. The reason is to avoid the keys to be intercepted by the program, "
+"and allow them to be sent to the remote machine.\n"
+"\n"
+"You can change this behavior through the preferences dialog. For more "
+"information, check the documentation.\n"
+"\n"
+"This message will appear only once."
+msgstr ""
+"Vinagre é ?設å?³å??ç?¨é?¸å?®è??é?µç?¤æ?·å¾?é?µã??å??å? æ?¯ç?ºäº?é?¿å??æ??é?µè¢«ç¨?å¼?æ??æ?ªï¼?é??樣æ??è?½è®?"
+"æ??é?µé??è?³é? ç«¯æ©?å?¨ã??\n"
+"\n"
+"æ?¨å?¯ä»¥é??é??å??好設å®?å°?話ç??æ?¹è®?é??å??è¡?ç?ºã??é??è¦?æ?´å¤?è³?è¨?ï¼?è«?æ?¥é?±æ??件ã??\n"
+"\n"
+"é??å??è¨?æ?¯å?ªæ??å?ºç?¾ä¸?次ã??"
 
-#~ msgid "_Plugins"
-#~ msgstr "å¤?æ??ç¨?å¼?(_P)"
+#: ../vinagre/vinagre-window.c:731 ../vinagre/vinagre-window.c:737
+#, c-format
+msgid "Error while creating the file %s: %s"
+msgstr "建ç«?æª?æ¡? %s æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#~ msgid "Select plugins"
-#~ msgstr "é?¸æ??å¤?æ??ç¨?å¼?"
+#~ msgid "All fields above are mandatory"
+#~ msgstr "ä¸?é?¢æ??æ??æ¬?ä½?é?½æ?¯å¿?è¦?ç??"
+
+#~ msgid "Failed to request name: %s"
+#~ msgstr "è¦?æ±?å??稱失æ??ï¼?%s"
+
+#~ msgid "No error given"
+#~ msgstr "æ²?æ??æ??å®?ç??é?¯èª¤"
+
+#~ msgid "Could not merge vinagre-ui.xml: %s"
+#~ msgstr "ç?¡æ³?å??ä½µ vinagre-ui.xmlï¼?%s"
+
+#~ msgid "Minimize window"
+#~ msgstr "æ??å°?å??è¦?çª?"
 
 #~ msgid "Supported formats"
 #~ msgstr "æ?¯æ?´ç??æ ¼å¼?"



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]