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

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

commit 5b2bf9c1e6ae2c2f6e35deda3b1ee82eac27b8c6
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Thu May 19 15:52:41 2011 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po |  734 ++++++++++++++++++++++++++++++++--------------------------
 po/zh_TW.po |  744 ++++++++++++++++++++++++++++++++---------------------------
 2 files changed, 814 insertions(+), 664 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 8bc569f..f085bb2 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -2,15 +2,15 @@
 # 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.
 # Wei-Lun Chao <chaoweilun gmail com>, 2010.
+# Chao-Hsiung Liao <j_h_liau yahoo com tw>, 2010, 2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vinagre 2.91.93\n"
+"Project-Id-Version: vinagre 3.1.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-30 21:39+0800\n"
-"PO-Revision-Date: 2011-03-30 21:39+0800\n"
+"POT-Creation-Date: 2011-05-19 15:51+0800\n"
+"PO-Revision-Date: 2011-05-19 15:52+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
 "Language: \n"
@@ -86,7 +86,6 @@ msgid "Access remote desktops"
 msgstr "å­?å??é? 端æ¡?é?¢"
 
 #: ../data/vinagre.desktop.in.in.h:2 ../data/vinagre-file.desktop.in.in.h:2
-#: ../vinagre/vinagre-applet.c:327 ../vinagre/vinagre-applet.c:339
 #: ../vinagre/vinagre-main.c:128
 msgid "Remote Desktop Viewer"
 msgstr "é? 端æ¡?é?¢æª¢è¦?å?¨"
@@ -96,95 +95,137 @@ msgid "Allow _keyboard shortcuts"
 msgstr "å??許é?µç?¤æ?·å¾?é?µ(_K)"
 
 #: ../data/vinagre.ui.h:2
+msgid "Always show tabs in the remote desktop display area"
+msgstr "æ°¸é? å?¨é? 端æ¡?é?¢é¡¯ç¤ºå??å??顯示å??é ?"
+
+#: ../data/vinagre.ui.h:3
 msgid "Authentication is required"
 msgstr "é??è¦?é©?è­?"
 
+#: ../data/vinagre.ui.h:4
+msgid "Bookmark Folder"
+msgstr "æ?¸ç±¤è³?æ??夾"
+
 #. setup label
-#: ../data/vinagre.ui.h:3 ../vinagre/vinagre-fav.c:860
+#: ../data/vinagre.ui.h:5 ../vinagre/vinagre-fav.c:886
 msgid "Bookmarks"
 msgstr "�籤"
 
-#: ../data/vinagre.ui.h:4
+#: ../data/vinagre.ui.h:6
+msgid "Choose a remote desktop to connect to"
+msgstr "é?¸æ??ä¸?å??è¦?é?£ç·?ç??é? 端æ¡?é?¢"
+
+#: ../data/vinagre.ui.h:7
+msgid "Connect"
+msgstr "��"
+
+#: ../data/vinagre.ui.h:8
 msgid "Connection"
 msgstr "��"
 
-#: ../data/vinagre.ui.h:5
+#: ../data/vinagre.ui.h:9
 msgid "Connection options"
 msgstr "é?£ç·?é?¸é ?"
 
-#: ../data/vinagre.ui.h:6
+#: ../data/vinagre.ui.h:10
+msgid "Enable fullscreen mode for this connection"
+msgstr "å?¨é??å??é?£ç·?å??ç?¨å?¨è?¢å¹?模å¼?"
+
+#. This is a tooltip in preferences dialog
+#: ../data/vinagre.ui.h:12
+msgid ""
+"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:13
+msgid "Enter a valid hostname or IP address"
+msgstr "輸å?¥æ??æ??ç??主æ©?å??稱æ?? IP ä½?å??"
+
+#: ../data/vinagre.ui.h:14
 msgid "Folder"
 msgstr "è³?æ??夾"
 
-#: ../data/vinagre.ui.h:7 ../plugins/rdp/vinagre-rdp-tab.c:53
-#: ../plugins/ssh/vinagre-ssh-tab.c:49 ../plugins/vnc/vinagre-vnc-tab.c:148
-#: ../plugins/spice/vinagre-spice-tab.c:138 ../vinagre/vinagre-fav.c:406
+#: ../data/vinagre.ui.h:15 ../plugins/rdp/vinagre-rdp-tab.c:54
+#: ../plugins/ssh/vinagre-ssh-tab.c:50 ../plugins/vnc/vinagre-vnc-tab.c:149
+#: ../plugins/spice/vinagre-spice-tab.c:139 ../vinagre/vinagre-fav.c:406
 msgid "Host:"
 msgstr "主��"
 
-#: ../data/vinagre.ui.h:8
+#: ../data/vinagre.ui.h:16
 msgid "Interface"
 msgstr "ä»?é?¢"
 
-#: ../data/vinagre.ui.h:9
+#: ../data/vinagre.ui.h:17
 msgid "Options"
 msgstr "é?¸é ?"
 
-#: ../data/vinagre.ui.h:10
+#: ../data/vinagre.ui.h:18
 msgid "Parent Folder"
 msgstr "ä¸?層è³?æ??夾"
 
-#: ../data/vinagre.ui.h:11
+#: ../data/vinagre.ui.h:19
 msgid "Preferences"
 msgstr "å??好設å®?"
 
-#. This is a tooltip in preferences dialog
-#: ../data/vinagre.ui.h:13
+#: ../data/vinagre.ui.h:20
+msgid "Search for remote hosts on the network"
+msgstr "æ??å°?網絡ä¸?ç??é? 端主æ©?"
+
+#: ../data/vinagre.ui.h:21
+msgid "Select a remote desktop protocol for this connection"
+msgstr "ç?ºé??å??é?£ç·?é?¸æ??ä¸?å??é? 端æ¡?é?¢é??è¨?å??å®?"
+
+#: ../data/vinagre.ui.h:22
+msgid "Store the login credential in GNOME Keyring"
+msgstr "å°?ç?»å?¥è­?æ?¸å?²å­?å?° GNOME å¯?碼å??å??"
+
+#: ../data/vinagre.ui.h:23
 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:15
+#: ../data/vinagre.ui.h:24
 msgid "_Always show tabs"
 msgstr "æ°¸é? 顯示å??é ?(_A)"
 
 #. This is a button label, in the authentication dialog
-#: ../data/vinagre.ui.h:17
+#: ../data/vinagre.ui.h:26
 msgid "_Authenticate"
 msgstr "é©?è­?(_A)"
 
-#: ../data/vinagre.ui.h:18
+#: ../data/vinagre.ui.h:27
 msgid "_Full screen"
 msgstr "���(_F)"
 
-#: ../data/vinagre.ui.h:19
+#: ../data/vinagre.ui.h:28
+msgid "_Fullscreen"
+msgstr "���(_F)"
+
+#: ../data/vinagre.ui.h:29
 msgid "_Host:"
 msgstr "主�(_H):"
 
 #. Translators: This is the name of a bookmark. It appears in the add/edit bookmark dialog.
-#: ../data/vinagre.ui.h:21
+#: ../data/vinagre.ui.h:31
 msgid "_Name:"
 msgstr "å??稱(_N):"
 
-#: ../data/vinagre.ui.h:22 ../plugins/spice/vinagre-spice-plugin.c:295
+#: ../data/vinagre.ui.h:32 ../plugins/spice/vinagre-spice-plugin.c:295
 msgid "_Password:"
 msgstr "�碼(_P):"
 
-#: ../data/vinagre.ui.h:23
+#: ../data/vinagre.ui.h:33
 msgid "_Protocol:"
 msgstr "é??è¨?å??å®?(_P):"
 
-#: ../data/vinagre.ui.h:24
+#: ../data/vinagre.ui.h:34
 msgid "_Remember this credential"
 msgstr "è¨?ä½?é??å??è­?æ?¸(_R)"
 
-#: ../data/vinagre.ui.h:25 ../plugins/rdp/vinagre-rdp-plugin.c:108
-#: ../plugins/ssh/vinagre-ssh-plugin.c:113
+#: ../data/vinagre.ui.h:35 ../plugins/rdp/vinagre-rdp-plugin.c:105
+#: ../plugins/ssh/vinagre-ssh-plugin.c:110
 msgid "_Username:"
 msgstr "使ç?¨è??å??稱(_U):"
 
@@ -205,10 +246,10 @@ msgstr "RDP"
 msgid "RDP support"
 msgstr "RDP ��"
 
-#. Translators: This is a description of the RDP protocol. It appears at Connect dialog.
+#. Translators: This is a description of the RDP protocol. It appears in the Connect dialog.
 #: ../plugins/rdp/vinagre-rdp-plugin.c:57
-msgid "Access MS Windows machines"
-msgstr "å­?å?? MS Windows æ©?å?¨"
+msgid "Access MS Windows remote desktops"
+msgstr "å­?å?? MS Windows é? 端æ¡?é?¢"
 
 #: ../plugins/rdp/vinagre-rdp-plugin.c:96
 msgid "RDP Options"
@@ -216,30 +257,30 @@ msgstr "RDP é?¸é ?"
 
 #. Translators: This is the tooltip for the username field in a RDP connection
 #. Translators: This is the tooltip for the username field in a SSH connection
-#: ../plugins/rdp/vinagre-rdp-plugin.c:113
-#: ../plugins/ssh/vinagre-ssh-plugin.c:118
+#: ../plugins/rdp/vinagre-rdp-plugin.c:110
+#: ../plugins/ssh/vinagre-ssh-plugin.c:115
 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 "é?¸æ??æ?§ç??ã??å¦?æ??ä¿?æ??空ç?½ï¼?æ??使ç?¨ä½ ç??使ç?¨è??å??稱ã??å?¦å¤?ï¼?ä¹?å?¯ä»¥å?¨ä¸?é?¢ç??ã??æ©?å?¨ã??æ¬?ä½?中æ??å®?ï¼?æ ¼å¼?ç?º 使ç?¨è??å??稱 主æ©?å??稱ã??"
+"the Host field above, in the form username hostname "
+msgstr "é?¸æ??æ?§ç??ã??å¦?æ??ä¿?æ??空ç?½ï¼?æ??使ç?¨ä½ ç??使ç?¨è??å??稱ã??å?¦å¤?ï¼?ä¹?å?¯ä»¥å?¨ä¸?é?¢ç??ã??主æ©?ã??æ¬?ä½?中æ??å®?ï¼?æ ¼å¼?ç?º 使ç?¨è??å??稱 主æ©?å??稱ã??"
 
-#: ../plugins/rdp/vinagre-rdp-tab.c:54 ../plugins/ssh/vinagre-ssh-tab.c:50
-#: ../plugins/vnc/vinagre-vnc-tab.c:149
-#: ../plugins/spice/vinagre-spice-tab.c:139
+#: ../plugins/rdp/vinagre-rdp-tab.c:55 ../plugins/ssh/vinagre-ssh-tab.c:51
+#: ../plugins/vnc/vinagre-vnc-tab.c:150
+#: ../plugins/spice/vinagre-spice-tab.c:140
 msgid "Port:"
 msgstr "é?£æ?¥å? :"
 
-#: ../plugins/rdp/vinagre-rdp-tab.c:123
+#: ../plugins/rdp/vinagre-rdp-tab.c:124
 msgid "Error while executing rdesktop"
 msgstr "å?·è¡? rdesktop æ??å?ºç?¾é?¯èª¤"
 
-#: ../plugins/rdp/vinagre-rdp-tab.c:124 ../vinagre/vinagre-bookmarks.c:366
-#: ../vinagre/vinagre-bookmarks.c:492
-#: ../vinagre/vinagre-bookmarks-migration.c:135
-#: ../vinagre/vinagre-cache-prefs.c:56 ../vinagre/vinagre-commands.c:170
+#: ../plugins/rdp/vinagre-rdp-tab.c:125 ../vinagre/vinagre-bookmarks.c:367
+#: ../vinagre/vinagre-bookmarks.c:493
+#: ../vinagre/vinagre-bookmarks-migration.c:136
+#: ../vinagre/vinagre-cache-prefs.c:57 ../vinagre/vinagre-commands.c:178
 #: ../vinagre/vinagre-connect.c:492 ../vinagre/vinagre-fav.c:772
-#: ../vinagre/vinagre-options.c:76 ../vinagre/vinagre-options.c:94
-#: ../vinagre/vinagre-window.c:278 ../vinagre/vinagre-window.c:751
+#: ../vinagre/vinagre-options.c:81 ../vinagre/vinagre-options.c:99
+#: ../vinagre/vinagre-window.c:288 ../vinagre/vinagre-window.c:753
 msgid "Unknown error"
 msgstr "ä¸?æ??ç??é?¯èª¤"
 
@@ -263,7 +304,7 @@ msgid "SSH support"
 msgstr "SSH ��"
 
 #. Translators: 'shared' here is a VNC protocol specific flag. You can translate it, but I think it's better to let it untranslated
-#: ../plugins/vnc/vinagre-vnc-connection.c:316
+#: ../plugins/vnc/vinagre-vnc-connection.c:317
 #: ../plugins/vnc/vinagre-vnc-plugin.c:199
 #, c-format
 msgid ""
@@ -292,8 +333,8 @@ msgid "VNC"
 msgstr "VNC"
 
 #: ../plugins/vnc/vinagre-vnc-plugin.c:88
-msgid "Access Unix/Linux, Windows and other machines."
-msgstr "å­?å?? Unix/Linuxã??Windows å??å?¶ä»?é?»è?¦ã??"
+msgid "Access Unix/Linux, Windows and other remote desktops."
+msgstr "å­?å?? Unix/Linuxã??Windows å??å?¶ä»?é? 端æ¡?é?¢ã??"
 
 #: ../plugins/vnc/vinagre-vnc-plugin.c:145
 #: ../plugins/spice/vinagre-spice-plugin.c:100
@@ -316,203 +357,204 @@ msgstr "VNC é?¸é ?"
 
 #. View only check button
 #. View only check button - not fully ready on spice-gtk side
-#: ../plugins/vnc/vinagre-vnc-plugin.c:265
-#: ../plugins/vnc/vinagre-vnc-tab.c:624
+#: ../plugins/vnc/vinagre-vnc-plugin.c:260
+#: ../plugins/vnc/vinagre-vnc-tab.c:625
 #: ../plugins/spice/vinagre-spice-plugin.c:222
-#: ../plugins/spice/vinagre-spice-tab.c:506
+#: ../plugins/spice/vinagre-spice-tab.c:507
 msgid "_View only"
 msgstr "å?ªæ??檢è¦?(_V)"
 
 #. Scaling check button
-#: ../plugins/vnc/vinagre-vnc-plugin.c:273
+#: ../plugins/vnc/vinagre-vnc-plugin.c:269
 #: ../plugins/spice/vinagre-spice-plugin.c:246
 msgid "_Scaling"
 msgstr "縮�(_S)"
 
-#: ../plugins/vnc/vinagre-vnc-plugin.c:289
+#. Keep ratio check button
+#: ../plugins/vnc/vinagre-vnc-plugin.c:283
 msgid "_Keep aspect ratio"
 msgstr "ä¿?æ??é?·å¯¬æ¯?(_K)"
 
 #. JPEG Compression check button
-#: ../plugins/vnc/vinagre-vnc-plugin.c:299
+#: ../plugins/vnc/vinagre-vnc-plugin.c:293
 msgid "_Use JPEG Compression"
 msgstr "使� JPEG �縮(_U)"
 
-#: ../plugins/vnc/vinagre-vnc-plugin.c:300
+#: ../plugins/vnc/vinagre-vnc-plugin.c:294
 msgid "This might not work on all VNC servers"
 msgstr "é??å?¯è?½ç?¡æ³?ç?¨æ?¼æ??æ??ç?? VNC 伺æ??å?¨"
 
-#: ../plugins/vnc/vinagre-vnc-plugin.c:309
-msgid "_Depth Color:"
+#: ../plugins/vnc/vinagre-vnc-plugin.c:304
+msgid "Color _Depth:"
 msgstr "��深度(_D):"
 
-#: ../plugins/vnc/vinagre-vnc-plugin.c:314
+#: ../plugins/vnc/vinagre-vnc-plugin.c:309
 msgid "Use Server Settings"
 msgstr "使ç?¨ä¼ºæ??å?¨è¨­å®?å?¼"
 
-#: ../plugins/vnc/vinagre-vnc-plugin.c:315
+#: ../plugins/vnc/vinagre-vnc-plugin.c:310
 msgid "True Color (24 bits)"
 msgstr "ç??彩 (24 ä½?å??)"
 
-#: ../plugins/vnc/vinagre-vnc-plugin.c:316
+#: ../plugins/vnc/vinagre-vnc-plugin.c:311
 msgid "High Color (16 bits)"
 msgstr "é«?彩 (16 ä½?å??)"
 
-#: ../plugins/vnc/vinagre-vnc-plugin.c:317
+#: ../plugins/vnc/vinagre-vnc-plugin.c:312
 msgid "Low Color (8 bits)"
 msgstr "ä½?è?²å½© (8 ä½?å??)"
 
-#: ../plugins/vnc/vinagre-vnc-plugin.c:318
+#: ../plugins/vnc/vinagre-vnc-plugin.c:313
 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:331
+#: ../plugins/vnc/vinagre-vnc-plugin.c:327
 #: ../plugins/spice/vinagre-spice-plugin.c:257
 msgid "Use h_ost"
 msgstr "使�主�(_O)"
 
-#: ../plugins/vnc/vinagre-vnc-plugin.c:340
+#: ../plugins/vnc/vinagre-vnc-plugin.c:336
 #: ../plugins/spice/vinagre-spice-plugin.c:266
 msgid "hostname or user hostname"
 msgstr "主æ©?å??稱 æ?? 使ç?¨è?? 主æ©?å??稱"
 
-#: ../plugins/vnc/vinagre-vnc-plugin.c:341
+#: ../plugins/vnc/vinagre-vnc-plugin.c:337
 #: ../plugins/spice/vinagre-spice-plugin.c:267
 msgid "Supply an alternative port using colon"
 msgstr "使ç?¨å??è??æ??ä¾?å?¥ç??é?£æ?¥å? "
 
-#: ../plugins/vnc/vinagre-vnc-plugin.c:342
+#: ../plugins/vnc/vinagre-vnc-plugin.c:338
 #: ../plugins/spice/vinagre-spice-plugin.c:268
 msgid "For instance: joe domain com:5022"
 msgstr "���joe domain com:5022"
 
 #. Translators: the whole sentence will be: Use host <hostname> as a SSH tunnel
-#: ../plugins/vnc/vinagre-vnc-plugin.c:348
+#: ../plugins/vnc/vinagre-vnc-plugin.c:344
 #: ../plugins/spice/vinagre-spice-plugin.c:274
 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:383
+#: ../plugins/vnc/vinagre-vnc-plugin.c:379
 msgid "VNC Files"
 msgstr "VNC ��"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:147
+#: ../plugins/vnc/vinagre-vnc-tab.c:148
 msgid "Desktop Name:"
 msgstr "æ¡?é?¢å??稱ï¼?"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:150
+#: ../plugins/vnc/vinagre-vnc-tab.c:151
 msgid "Dimensions:"
 msgstr "尺寸:"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:295
-#: ../plugins/spice/vinagre-spice-tab.c:251
+#: ../plugins/vnc/vinagre-vnc-tab.c:296
+#: ../plugins/spice/vinagre-spice-tab.c:252
 msgid "Error creating the SSH tunnel"
 msgstr "建ç«? SSH ç©¿é?§æ??ç?¼ç??é?¯èª¤"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:296 ../plugins/vnc/vinagre-vnc-tab.c:307
-#: ../plugins/spice/vinagre-spice-tab.c:252
-#: ../plugins/spice/vinagre-spice-tab.c:264
+#: ../plugins/vnc/vinagre-vnc-tab.c:297 ../plugins/vnc/vinagre-vnc-tab.c:308
+#: ../plugins/spice/vinagre-spice-tab.c:253
+#: ../plugins/spice/vinagre-spice-tab.c:265
 msgid "Unknown reason"
 msgstr "ä¸?æ??ç??å??å? "
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:306
-#: ../plugins/spice/vinagre-spice-tab.c:263
+#: ../plugins/vnc/vinagre-vnc-tab.c:307
+#: ../plugins/spice/vinagre-spice-tab.c:264
 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:351
+#: ../plugins/vnc/vinagre-vnc-tab.c:352
 #, c-format
 msgid "Authentication method for host %s is unsupported. (%u)"
 msgstr "ä¸?æ?¯æ??å?°ä¸»æ©? %s ç??é©?è­?æ?¹æ³?ã??(%u)"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:355
+#: ../plugins/vnc/vinagre-vnc-tab.c:356
 msgid "Authentication unsupported"
 msgstr "ä¸?æ?¯æ?´ç??é©?è­?æ?¹æ³?"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:523 ../plugins/vnc/vinagre-vnc-tab.c:540
+#: ../plugins/vnc/vinagre-vnc-tab.c:524 ../plugins/vnc/vinagre-vnc-tab.c:541
 msgid "Authentication error"
 msgstr "���誤"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:524
-msgid "A username is required in order to access this machine."
-msgstr "ç?ºäº?å­?å??é??å??é?»è?¦é??è¦?使ç?¨è??å??稱ã??"
+#: ../plugins/vnc/vinagre-vnc-tab.c:525
+msgid "A username is required in order to access this remote desktop."
+msgstr "ç?ºäº?å­?å??é??å??é? 端æ¡?é?¢é??è¦?使ç?¨è??å??稱ã??"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:541
-msgid "A password is required in order to access this machine."
-msgstr "ç?ºäº?å­?å??é??å??é?»è?¦é??è¦?å¯?碼ã??"
+#: ../plugins/vnc/vinagre-vnc-tab.c:542
+msgid "A password is required in order to access this remote desktop."
+msgstr "ç?ºäº?å­?å??é??å??é? 端æ¡?é?¢é??è¦?å¯?碼ã??"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:595
-#: ../plugins/spice/vinagre-spice-tab.c:465
+#: ../plugins/vnc/vinagre-vnc-tab.c:596
+#: ../plugins/spice/vinagre-spice-tab.c:466
 msgid "S_caling"
 msgstr "縮�(_C)"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:596
-#: ../plugins/spice/vinagre-spice-tab.c:466
+#: ../plugins/vnc/vinagre-vnc-tab.c:597
+#: ../plugins/spice/vinagre-spice-tab.c:467
 msgid "Fits the remote screen into the current window size"
 msgstr "è®?é? 端è?¢å¹?è?½ç¬¦å??ç?®å??ç??è¦?çª?大å°?"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:609
+#: ../plugins/vnc/vinagre-vnc-tab.c:610
 msgid "_Keep Aspect Ratio"
 msgstr "ä¿?æ??é?·å¯¬æ¯?(_K)"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:610
+#: ../plugins/vnc/vinagre-vnc-tab.c:611
 msgid "Keeps the screen aspect ratio when using scaling"
 msgstr "使ç?¨ç¸®æ?¾æ??ä¿?æ??è?¢å¹?é?·å¯¬æ¯?"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:625
-#: ../plugins/spice/vinagre-spice-tab.c:507
+#: ../plugins/vnc/vinagre-vnc-tab.c:626
+#: ../plugins/spice/vinagre-spice-tab.c:508
 msgid "Does not send mouse and keyboard events"
 msgstr "ä¸?è¦?é??å?ºæ»?é¼ è??é?µç?¤äº?件"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:638
+#: ../plugins/vnc/vinagre-vnc-tab.c:639
 msgid "_Original size"
 msgstr "å??å§?大å°?(_O)"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:639
+#: ../plugins/vnc/vinagre-vnc-tab.c:640
 msgid "Adjusts the window to the remote desktop's size"
 msgstr "å°?è¦?çª?調æ?´ç?ºé? 端æ¡?é?¢ç??大å°?"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:652
+#: ../plugins/vnc/vinagre-vnc-tab.c:653
 msgid "_Refresh Screen"
 msgstr "é??æ?°æ?´ç??ç?«é?¢(_R)"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:653
+#: ../plugins/vnc/vinagre-vnc-tab.c:654
 msgid "Requests an update of the screen"
 msgstr "������"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:675
-#: ../plugins/spice/vinagre-spice-tab.c:530
+#: ../plugins/vnc/vinagre-vnc-tab.c:676
+#: ../plugins/spice/vinagre-spice-tab.c:531
 msgid "_Send Ctrl-Alt-Del"
 msgstr "å?³é?? Ctrl-Alt-Del(_S)"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:676
-#: ../plugins/spice/vinagre-spice-tab.c:531
-msgid "Sends Ctrl+Alt+Del to the remote machine"
-msgstr "å?³é?? Ctrl+Alt+Del å?°é? 端æ©?å?¨"
+#: ../plugins/vnc/vinagre-vnc-tab.c:677
+#: ../plugins/spice/vinagre-spice-tab.c:532
+msgid "Sends Ctrl+Alt+Del to the remote desktop"
+msgstr "å?³é?? Ctrl+Alt+Del å?°é? 端æ¡?é?¢"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:728 ../plugins/vnc/vinagre-vnc-tab.c:729
-#: ../plugins/spice/vinagre-spice-tab.c:583
+#: ../plugins/vnc/vinagre-vnc-tab.c:729 ../plugins/vnc/vinagre-vnc-tab.c:730
 #: ../plugins/spice/vinagre-spice-tab.c:584
+#: ../plugins/spice/vinagre-spice-tab.c:585
 msgid "Scaling"
 msgstr "正�縮�"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:738 ../plugins/vnc/vinagre-vnc-tab.c:739
-#: ../plugins/spice/vinagre-spice-tab.c:593
+#: ../plugins/vnc/vinagre-vnc-tab.c:739 ../plugins/vnc/vinagre-vnc-tab.c:740
 #: ../plugins/spice/vinagre-spice-tab.c:594
+#: ../plugins/spice/vinagre-spice-tab.c:595
 msgid "Read only"
 msgstr "��"
 
 #. Send Ctrl-alt-del
-#: ../plugins/vnc/vinagre-vnc-tab.c:747 ../plugins/vnc/vinagre-vnc-tab.c:749
-#: ../plugins/spice/vinagre-spice-tab.c:602
-#: ../plugins/spice/vinagre-spice-tab.c:604
+#: ../plugins/vnc/vinagre-vnc-tab.c:748 ../plugins/vnc/vinagre-vnc-tab.c:750
+#: ../plugins/spice/vinagre-spice-tab.c:603
+#: ../plugins/spice/vinagre-spice-tab.c:605
 msgid "Send Ctrl-Alt-Del"
 msgstr "å?³é?? Ctrl-Alt-Del"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:912
+#: ../plugins/vnc/vinagre-vnc-tab.c:913
 msgid ""
 "Scaling is not supported on this installation.\n"
 "\n"
@@ -555,16 +597,16 @@ msgstr ""
 "\n"
 "IPv6ï¼?"
 
-#: ../plugins/reverse-vnc/vinagre-reverse-vnc-listener-dialog.c:172
+#: ../plugins/reverse-vnc/vinagre-reverse-vnc-listener-dialog.c:173
 #, c-format
 msgid "On the port %d"
 msgstr "æ?¼é?£æ?¥å?  %d"
 
-#: ../plugins/reverse-vnc/vinagre-reverse-vnc-listener.c:211
+#: ../plugins/reverse-vnc/vinagre-reverse-vnc-listener.c:212
 msgid "Error activating reverse connections"
 msgstr "使ç?¨å??å??é?£ç·?æ??ç?¼ç??é?¯èª¤"
 
-#: ../plugins/reverse-vnc/vinagre-reverse-vnc-listener.c:212
+#: ../plugins/reverse-vnc/vinagre-reverse-vnc-listener.c:213
 msgid ""
 "The program could not find any available TCP ports starting at 5500. Is "
 "there any other running program consuming all your TCP ports?"
@@ -572,7 +614,7 @@ msgstr "ç¨?å¼?æ?¾ä¸?å?°ä»»ä½?å?¯ç?¨å¾? 5500 èµ·ç?? TCP é?£æ?¥å? ã??æ?¯å?¦æ??ä»»
 
 #. Translators: "Reverse" here is an adjective, not a verb.
 #: ../plugins/reverse-vnc/vinagre-reverse-vnc-plugin.c:69
-msgid "_Reverse Connections..."
+msgid "_Reverse Connectionsâ?¦"
 msgstr "å??å??é?£ç·?(_R)â?¦"
 
 #: ../plugins/reverse-vnc/vinagre-reverse-vnc-plugin.c:71
@@ -613,13 +655,13 @@ msgstr "SPICE é?¸é ?"
 
 #. Resize guest check button
 #: ../plugins/spice/vinagre-spice-plugin.c:230
-#: ../plugins/spice/vinagre-spice-tab.c:479
+#: ../plugins/spice/vinagre-spice-tab.c:480
 msgid "_Resize guest"
 msgstr "��訪客端大�(_R)"
 
 #. Clipboard sharing check button
 #: ../plugins/spice/vinagre-spice-plugin.c:238
-#: ../plugins/spice/vinagre-spice-tab.c:492
+#: ../plugins/spice/vinagre-spice-tab.c:493
 msgid "_Share clipboard"
 msgstr "å??享å?ªè²¼ç°¿(_S)"
 
@@ -633,21 +675,21 @@ msgstr "é?¸æ??æ?§ç??"
 msgid "Spice Files"
 msgstr "Spice ��"
 
-#: ../plugins/spice/vinagre-spice-tab.c:480
+#: ../plugins/spice/vinagre-spice-tab.c:481
 msgid "Resize the screen guest to best fit"
 msgstr "å°?訪客端è?¢å¹?æ?¹è®?ç?ºæ??é?©å??ç??大å°?"
 
-#: ../plugins/spice/vinagre-spice-tab.c:493
+#: ../plugins/spice/vinagre-spice-tab.c:494
 msgid "Automatically share clipboard between client and guest"
 msgstr "è?ªå??å?¨å®¢æ?¶ç«¯è??訪客端ä¹?é??å??享å?ªè²¼ç°¿"
 
 #. vim: set ts=8:
 #: ../plugins/reverse-vnc/reverse-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 "å??ç?¨å??å??é?£ç·?è?½è®?ä½ å­?å??ä½?æ?¼é?²ç?«ç??å¾?ç??æ©?å?¨ã??é? 端æ©?å?¨æ??該æ??èµ·å§?è??ä½ ç??é?£ç·?ã??é??è¦?æ?´å¤?è³?è¨?ï¼?è«?æ?¥é?±æ±?å?©é?¸å?®ã??"
+"By activating reverse connections you can access remote desktops that are "
+"behind a firewall. The remote side is supposed to initiate the connection "
+"with you. For further information, read the help."
+msgstr "å??ç?¨å??å??é?£ç·?è?½è®?ä½ å­?å??ä½?æ?¼é?²ç?«ç??å¾?ç??é? 端æ¡?é?¢ã??é? 端æ©?å?¨æ??該æ??èµ·å§?è??ä½ ç??é?£ç·?ã??é??è¦?æ?´å¤?è³?è¨?ï¼?è«?æ?¥é?±æ±?å?©é?¸å?®ã??"
 
 #: ../plugins/reverse-vnc/reverse-vnc.ui.h:2
 msgid "Connectivity"
@@ -658,10 +700,10 @@ msgid "Reverse Connections"
 msgstr "å??å??é?£ç·?"
 
 #: ../plugins/reverse-vnc/reverse-vnc.ui.h:4
-msgid "This machine is reachable through the following IP address(es):"
-msgstr "é??å??é?»è?¦å?¯ä»¥é??é??ä¸?å?? IP ä½?å??使ç?¨ï¼?"
+msgid "This desktop is reachable through the following IP address(es):"
+msgstr "é??å??æ¡?é?¢å?¯ä»¥é??é??ä¸?å?? IP ä½?å??使ç?¨ï¼?"
 
-#. Translators: this is the reverse connection mode. "Always enabled" means it will be enabled by default in the program startup. You can see this string in the dialog Machine->Reverse connections.
+#. Translators: this is the reverse connection mode. "Always enabled" means it will be enabled by default in the program startup. You can see this string in the dialog Remote->Reverse connections.
 #: ../plugins/reverse-vnc/reverse-vnc.ui.h:6
 msgid "_Always Enabled"
 msgstr "æ°¸é? å??ç?¨(_A)"
@@ -684,176 +726,156 @@ msgstr "IM ç??æ??"
 msgid "Could not communicate to Telepathy. IM Status plugin will not work."
 msgstr "ç?¡æ³?é?£æ?¥å?° Telepathyã??IM ç??æ??å¤?æ??ç¨?å¼?å°?ç?¡æ³?é??ä½?ã??"
 
-#: ../vinagre/vinagre-applet.c:171 ../vinagre/vinagre-applet.c:255
-msgid "Could not run vinagre:"
-msgstr "ç?¡æ³?å?·è¡? vinagre:"
-
-#: ../vinagre/vinagre-applet.c:275
-msgid "Open Remote Desktop Viewer"
-msgstr "é??å??é? 端æ¡?é?¢æª¢è¦?å?¨"
-
-#: ../vinagre/vinagre-applet.c:321 ../vinagre/vinagre-ui.h:37
-msgid "_Help"
-msgstr "æ±?å?©(_H)"
-
-#: ../vinagre/vinagre-applet.c:322
-msgid "_About"
-msgstr "é??æ?¼(_A)"
-
-#: ../vinagre/vinagre-applet.c:340
-msgid "Access your bookmarks"
-msgstr "å­?å??ä½ ç??æ?¸ç±¤"
-
-#: ../vinagre/vinagre-bookmarks.c:366
+#: ../vinagre/vinagre-bookmarks.c:367
 #, c-format
 msgid "Error while initializing bookmarks: %s"
 msgstr "å??å§?å??æ?¸ç±¤æ??é?¯èª¤ï¼?%s"
 
-#: ../vinagre/vinagre-bookmarks.c:373
+#: ../vinagre/vinagre-bookmarks.c:374
 msgid "Error while initializing bookmarks: The file seems to be empty"
 msgstr "å??å§?å??æ?¸ç±¤æ??ç?¼ç??é?¯èª¤ï¼?該æª?æ¡?ä¼¼ä¹?æ?¯ç©ºç??"
 
-#: ../vinagre/vinagre-bookmarks.c:380
+#: ../vinagre/vinagre-bookmarks.c:381
 msgid ""
 "Error while initializing bookmarks: The file is not a vinagre bookmarks file"
 msgstr "å??å§?å??æ?¸ç±¤æ??ç?¼ç??é?¯èª¤ï¼?該æª?æ¡?並é?? vinagre æ?¸ç±¤æª?æ¡?"
 
-#: ../vinagre/vinagre-bookmarks.c:453 ../vinagre/vinagre-bookmarks.c:460
+#: ../vinagre/vinagre-bookmarks.c:454 ../vinagre/vinagre-bookmarks.c:461
 msgid "Error while saving bookmarks: Failed to create the XML structure"
 msgstr "å?²å­?æ?¸ç±¤æ??ç?¼ç??é?¯èª¤ï¼?建ç«? XML çµ?æ§?失æ??"
 
-#: ../vinagre/vinagre-bookmarks.c:467 ../vinagre/vinagre-bookmarks.c:474
+#: ../vinagre/vinagre-bookmarks.c:468 ../vinagre/vinagre-bookmarks.c:475
 msgid "Error while saving bookmarks: Failed to initialize the XML structure"
 msgstr "å?²å­?æ?¸ç±¤æ??ç?¼ç??é?¯èª¤ï¼?å??å§?å?? XML çµ?æ§?失æ??"
 
-#: ../vinagre/vinagre-bookmarks.c:483
+#: ../vinagre/vinagre-bookmarks.c:484
 msgid "Error while saving bookmarks: Failed to finalize the XML structure"
 msgstr "å?²å­?æ?¸ç±¤æ??ç?¼ç??é?¯èª¤ï¼?çµ?æ?? XML çµ?æ§?失æ??"
 
-#: ../vinagre/vinagre-bookmarks.c:492
+#: ../vinagre/vinagre-bookmarks.c:493
 #, c-format
 msgid "Error while saving bookmarks: %s"
 msgstr "å?²å­?æ?¸ç±¤æ??é?¯èª¤ï¼?%s"
 
-#: ../vinagre/vinagre-bookmarks-migration.c:95
-#: ../vinagre/vinagre-bookmarks-migration.c:102
+#: ../vinagre/vinagre-bookmarks-migration.c:96
+#: ../vinagre/vinagre-bookmarks-migration.c:103
 msgid "Error while migrating bookmarks: Failed to create the XML structure"
 msgstr "å?¨è½?移æ?¸ç±¤æ??ç?¼ç??é?¯èª¤ï¼?建ç«? XML çµ?æ§?失æ??"
 
-#: ../vinagre/vinagre-bookmarks-migration.c:109
-#: ../vinagre/vinagre-bookmarks-migration.c:116
+#: ../vinagre/vinagre-bookmarks-migration.c:110
+#: ../vinagre/vinagre-bookmarks-migration.c:117
 msgid "Error while migrating bookmarks: Failed to initialize the XML structure"
 msgstr "å?¨è½?移æ?¸ç±¤æ??ç?¼ç??é?¯èª¤ï¼?å??å§?å?? XML çµ?æ§?失æ??"
 
-#: ../vinagre/vinagre-bookmarks-migration.c:125
+#: ../vinagre/vinagre-bookmarks-migration.c:126
 msgid "Error while migrating bookmarks: Failed to finalize the XML structure"
 msgstr "å?¨è½?移æ?¸ç±¤æ??ç?¼ç??é?¯èª¤ï¼?çµ?æ?? XML çµ?æ§?失æ??"
 
-#: ../vinagre/vinagre-bookmarks-migration.c:135
-#: ../vinagre/vinagre-bookmarks-migration.c:216
+#: ../vinagre/vinagre-bookmarks-migration.c:136
+#: ../vinagre/vinagre-bookmarks-migration.c:217
 #, c-format
 msgid "Error while migrating bookmarks: %s"
 msgstr "è½?移æ?¸ç±¤æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: ../vinagre/vinagre-bookmarks-migration.c:164
+#: ../vinagre/vinagre-bookmarks-migration.c:165
 msgid "Error while migrating bookmarks: VNC plugin is not activated"
 msgstr "è½?移æ?¸ç±¤æ??ç?¼ç??é?¯èª¤ï¼?å°?æ?ªä½¿ç?¨ VNC å¤?æ??ç¨?å¼?"
 
-#: ../vinagre/vinagre-bookmarks-migration.c:216
+#: ../vinagre/vinagre-bookmarks-migration.c:217
 msgid "Failed to create the directory"
 msgstr "建ç«?ç?®é??失æ??"
 
-#: ../vinagre/vinagre-bookmarks-migration.c:241
+#: ../vinagre/vinagre-bookmarks-migration.c:242
 msgid ""
 "Migrating the bookmarks file to the new format. This operation is only "
 "supposed to run once."
 msgstr "æ­£å?¨å°?æ?¸ç±¤æª?æ¡?è½?移ç?ºæ?°ç??æ ¼å¼?ã??é??å??æ??ä½?å?ªè?½å?·è¡?ä¸?次ã??"
 
-#: ../vinagre/vinagre-bookmarks-migration.c:249
+#: ../vinagre/vinagre-bookmarks-migration.c:250
 #, c-format
 msgid "Error opening old bookmarks file: %s"
 msgstr "é??å??è??ç??æ?¸ç±¤æª?æ¡?æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: ../vinagre/vinagre-bookmarks-migration.c:250
-#: ../vinagre/vinagre-bookmarks-migration.c:262
+#: ../vinagre/vinagre-bookmarks-migration.c:251
+#: ../vinagre/vinagre-bookmarks-migration.c:263
 msgid "Migration cancelled"
 msgstr "è½?移ç¨?åº?å·²å??æ¶?"
 
-#: ../vinagre/vinagre-bookmarks-migration.c:259
+#: ../vinagre/vinagre-bookmarks-migration.c:260
 msgid "Could not remove the old bookmarks file"
 msgstr "ç?¡æ³?移é?¤è??ç??æ?¸ç±¤æª?æ¡?"
 
-#: ../vinagre/vinagre-bookmarks-tree.c:119
+#: ../vinagre/vinagre-bookmarks-tree.c:120
 msgid "Root Folder"
 msgstr "æ ¹è³?æ??夾"
 
-#: ../vinagre/vinagre-bookmarks-ui.c:77
+#: ../vinagre/vinagre-bookmarks-ui.c:78
 msgid "Invalid name for this folder"
 msgstr "é??å??è³?æ??夾ç??å??稱ç?¡æ??"
 
-#: ../vinagre/vinagre-bookmarks-ui.c:87 ../vinagre/vinagre-bookmarks-ui.c:199
+#: ../vinagre/vinagre-bookmarks-ui.c:88 ../vinagre/vinagre-bookmarks-ui.c:200
 #, c-format
 msgid ""
 "The name \"%s\" is already used in this folder. Please use a different name."
 msgstr "é??å??ç?®é??å?§å·²ç¶?æ??å??ç?ºã??%sã??ç??é ?ç?®ã??è«?使ç?¨å?¶ä»?å??稱ã??"
 
-#: ../vinagre/vinagre-bookmarks-ui.c:88 ../vinagre/vinagre-bookmarks-ui.c:189
-#: ../vinagre/vinagre-bookmarks-ui.c:200
+#: ../vinagre/vinagre-bookmarks-ui.c:89 ../vinagre/vinagre-bookmarks-ui.c:190
+#: ../vinagre/vinagre-bookmarks-ui.c:201
 msgid "Invalid name for this item"
 msgstr "é??å??é ?ç?®ç??å??稱ç?¡æ??"
 
 #. Translators: %s is a protocol name, like VNC or SSH
-#: ../vinagre/vinagre-bookmarks-ui.c:167
+#: ../vinagre/vinagre-bookmarks-ui.c:168
 #, c-format
 msgid "(Protocol: %s)"
 msgstr "(é??è¨?å??å®?ï¼?%s)"
 
 #. Translators: %s is a bookmark entry name
-#: ../vinagre/vinagre-bookmarks-ui.c:305
+#: ../vinagre/vinagre-bookmarks-ui.c:306
 #, c-format
 msgid "Are you sure you want to remove %s from bookmarks?"
 msgstr "ä½ ç¢ºå®?æ?³å¾?æ?¸ç±¤ä¸­ç§»é?¤ %sï¼?"
 
-#: ../vinagre/vinagre-bookmarks-ui.c:311
+#: ../vinagre/vinagre-bookmarks-ui.c:312
 msgid "Remove Folder?"
 msgstr "æ?¯å?¦ç§»é?¤è³?æ??夾ï¼?"
 
-#: ../vinagre/vinagre-bookmarks-ui.c:312
-msgid "Notice that all its subfolders and items will be removed as well."
-msgstr "注æ??å®?æ??æ??ç??å­?è³?æ??夾å??é ?ç?®ä¹?æ??被移é?¤ã??"
+#: ../vinagre/vinagre-bookmarks-ui.c:313
+msgid "Note that all its subfolders and bookmarks will be removed as well."
+msgstr "注æ??å®?æ??æ??ç??å­?è³?æ??夾å??æ?¸ç±¤ä¹?æ??被移é?¤ã??"
 
-#: ../vinagre/vinagre-bookmarks-ui.c:317
+#: ../vinagre/vinagre-bookmarks-ui.c:318
 msgid "Remove Item?"
 msgstr "æ?¯å?¦ç§»é?¤é ?ç?®ï¼?"
 
-#: ../vinagre/vinagre-bookmarks-ui.c:334
+#: ../vinagre/vinagre-bookmarks-ui.c:335
 msgid "Error removing bookmark: Entry not found"
 msgstr "移é?¤æ?¸ç±¤æ??ç?¼ç??é?¯èª¤ï¼?æ?¾ä¸?å?°é ?ç?®"
 
-#: ../vinagre/vinagre-bookmarks-ui.c:351
+#: ../vinagre/vinagre-bookmarks-ui.c:352
 msgid "New Folder"
 msgstr "æ?°å¢?è³?æ??夾"
 
-#: ../vinagre/vinagre-cache-prefs.c:56
+#: ../vinagre/vinagre-cache-prefs.c:57
 #, c-format
 msgid "Error while saving preferences: %s"
 msgstr "ç?¶å?²å­?å??好設å®?æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: ../vinagre/vinagre-commands.c:122
+#: ../vinagre/vinagre-commands.c:130
 msgid "Choose the file"
 msgstr "é?¸æ??æ??件"
 
-#: ../vinagre/vinagre-commands.c:146
+#: ../vinagre/vinagre-commands.c:154
 msgid "There are no supported files"
 msgstr "é??è£?æ²?æ??æ?¯æ?´ç??æª?æ¡?"
 
-#: ../vinagre/vinagre-commands.c:147
+#: ../vinagre/vinagre-commands.c:155
 msgid ""
 "None of the active plugins support this action. Activate some plugins and "
 "try again."
 msgstr "使ç?¨ä¸­ç??å¤?æ??ç¨?å¼?æ²?æ??æ?¯æ?´é??å??å??ä½?ã??è«?使ç?¨å?¶ä»?å¤?æ??ç¨?å¼?å¾?å??試ä¸?次ã??"
 
-#: ../vinagre/vinagre-commands.c:181
+#: ../vinagre/vinagre-commands.c:189
 msgid "The following file could not be opened:"
 msgid_plural "The following files could not be opened:"
 msgstr[0] "ç?¡æ³?é??å??ä¸?å??æ??件ï¼?"
@@ -873,22 +895,22 @@ msgstr "å?²å­?æ­·å?²ç´?é??æª?æ¡?æ??ç?¼ç??é?¯èª¤ï¼?%s"
 msgid "Choose a Remote Desktop"
 msgstr "é?¸æ??ä¸?å??é? 端æ¡?é?¢"
 
-#: ../vinagre/vinagre-connection.c:524 ../vinagre/vinagre-tab.c:573
-#: ../vinagre/vinagre-tube-handler.c:254
+#: ../vinagre/vinagre-connection.c:525 ../vinagre/vinagre-tab.c:573
+#: ../vinagre/vinagre-tube-handler.c:255
 #, c-format
 msgid "The protocol %s is not supported."
 msgstr "æ?ªæ?¯æ?´é??è¨?å??å®? %s ã??"
 
-#: ../vinagre/vinagre-connection.c:632
+#: ../vinagre/vinagre-connection.c:633
 msgid "Could not open the file."
 msgstr "ç?¡æ³?é??å??該æª?æ¡?ã??"
 
-#: ../vinagre/vinagre-connection.c:656
+#: ../vinagre/vinagre-connection.c:657
 msgid "The file was not recognized by any of the plugins."
 msgstr "該æª?æ¡?ç?¡æ³?被任ä½?å¤?æ??ç¨?å¼?辨è­?ã??"
 
 #: ../vinagre/vinagre-fav.c:569
-msgid "_New Folder"
+msgid "_New folder"
 msgstr "æ?°å¢?è³?æ??夾(_N)"
 
 #: ../vinagre/vinagre-fav.c:570
@@ -900,8 +922,8 @@ msgid "_Open bookmark"
 msgstr "é??å??æ?¸ç±¤(_O)"
 
 #: ../vinagre/vinagre-fav.c:576
-msgid "Connect to this machine"
-msgstr "���此��"
+msgid "Connect to this remote desktop"
+msgstr "é?£ç·?å?°é??å??é? 端æ¡?é?¢"
 
 #: ../vinagre/vinagre-fav.c:577
 msgid "_Edit bookmark"
@@ -919,7 +941,7 @@ msgstr "��籤中移�(_R)"
 msgid "Remove current selected connection from bookmarks"
 msgstr "å¾?æ?¸ç±¤ä¸­ç§»é?¤ç?¶å??é?¸æ??ç??é?£ç·?"
 
-#: ../vinagre/vinagre-fav.c:597 ../vinagre/vinagre-window.c:408
+#: ../vinagre/vinagre-fav.c:597 ../vinagre/vinagre-window.c:410
 #, c-format
 msgid "Could not merge UI XML file: %s"
 msgstr "ç?¡æ³?å??ä½µ UI XML æª?æ¡?ï¼?%s"
@@ -932,11 +954,11 @@ msgstr "ç?¡æ??ç??æ??ä½?"
 msgid "Data received from drag&drop operation is invalid."
 msgstr "å¾?æ??æ?¾æ??ä½?中å??å??ç??è³?æ??æ?¯ç?¡æ??ç??ã??"
 
-#: ../vinagre/vinagre-fav.c:868
+#: ../vinagre/vinagre-fav.c:894
 msgid "Hide panel"
 msgstr "é?±è??é?¢æ?¿"
 
-#: ../vinagre/vinagre-fav.c:1073
+#: ../vinagre/vinagre-fav.c:1099
 msgid "Hosts nearby"
 msgstr "è?¨è¿?ç??主æ©?"
 
@@ -945,28 +967,28 @@ msgstr "è?¨è¿?ç??主æ©?"
 msgid "- Remote Desktop Viewer"
 msgstr "- é? 端æ¡?é?¢æª¢è¦?å?¨"
 
-#: ../vinagre/vinagre-mdns.c:171
+#: ../vinagre/vinagre-mdns.c:172
 #, c-format
 msgid "Failed to resolve avahi hostname: %s\n"
 msgstr "解æ?? avahi 主æ©?å??稱失æ??ï¼?%s\n"
 
-#: ../vinagre/vinagre-mdns.c:225
+#: ../vinagre/vinagre-mdns.c:226
 #, c-format
 msgid "The service %s was already registered by another plugin."
 msgstr "æ??å?? %s å·²ç¶?被å?¦ä¸?å??å¤?æ??ç¨?å¼?註å??äº?ã??"
 
-#: ../vinagre/vinagre-mdns.c:233
+#: ../vinagre/vinagre-mdns.c:234
 #, c-format
 msgid "Failed to add mDNS browser for service %s."
 msgstr "å°? mDNS ç??覽å?¨å? å?¥æ??å?? %s失æ??ã??"
 
-#. Translators: "Browse for hosts" means the ability to find/locate some machines [with the VNC service enabled] in the local network
-#: ../vinagre/vinagre-mdns.c:250
+#. Translators: "Browse for hosts" means the ability to find/locate some remote hosts [with the VNC service enabled] in the local network
+#: ../vinagre/vinagre-mdns.c:251
 #, c-format
 msgid "Failed to browse for hosts: %s\n"
 msgstr "ç??覽主æ©?失æ??ï¼?%s\n"
 
-#: ../vinagre/vinagre-mdns.c:319
+#: ../vinagre/vinagre-mdns.c:320
 #, c-format
 msgid "Failed to initialize mDNS browser: %s\n"
 msgstr "å??å§?å?? mDNS ç??覽å?¨å¤±æ??ï¼?%s\n"
@@ -995,45 +1017,55 @@ msgstr "é©?è­?失æ??"
 msgid "Connecting..."
 msgstr "正����"
 
-#: ../vinagre/vinagre-notebook.c:554 ../vinagre/vinagre-tab.c:354
+#: ../vinagre/vinagre-notebook.c:554
 msgid "Close connection"
 msgstr "é??é??é?£ç·?"
 
 #. Translators: this is a command line option (run vinagre --help)
-#: ../vinagre/vinagre-options.c:31
-msgid "Open vinagre in fullscreen mode"
-msgstr "以å?¨è?¢å¹?模å¼?é??å?? vinagre"
+#: ../vinagre/vinagre-options.c:32
+msgid "Specify geometry of the main Vinagre window"
+msgstr "æ??å®?主è¦? Vinagre è¦?çª?ç??ä½?置大å°?"
 
 #. Translators: this is a command line option (run vinagre --help)
-#: ../vinagre/vinagre-options.c:35
-msgid "Create a new toplevel window in an existing instance of vinagre"
-msgstr "å?¨æ?¢å­?ç?? vinagre 實é«?中建ç«?æ?°ç??é ?層è¦?çª?"
+#: ../vinagre/vinagre-options.c:36
+msgid "Open Vinagre in fullscreen mode"
+msgstr "以å?¨è?¢å¹?模å¼?é??å?? Vinagre"
 
 #. Translators: this is a command line option (run vinagre --help)
-#: ../vinagre/vinagre-options.c:39
-msgid "Open a file recognized by vinagre"
-msgstr "é??å?? vinagre å?¯è¾¨è­?ç??æª?æ¡?"
+#: ../vinagre/vinagre-options.c:40
+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-options.c:44
+msgid "Open a file recognized by Vinagre"
+msgstr "é??å?? Vinagre å?¯è¾¨è­?ç??æª?æ¡?"
 
-#: ../vinagre/vinagre-options.c:39
+#: ../vinagre/vinagre-options.c:44
 msgid "filename"
 msgstr "æª?æ¡?å??稱"
 
 #. Translators: this is a command line option (run vinagre --help)
-#: ../vinagre/vinagre-options.c:44
+#: ../vinagre/vinagre-options.c:49
 msgid "[server:port]"
 msgstr "[伺æ??å?¨:å? å?£]"
 
-#: ../vinagre/vinagre-options.c:125
+#: ../vinagre/vinagre-options.c:123
+#, c-format
+msgid "Invalid argument %s for --geometry"
+msgstr "å¼?æ?¸ %s å°? --geometry æ?¯ç?¡æ??ç??"
+
+#: ../vinagre/vinagre-options.c:141
 msgid "The following error has occurred:"
 msgid_plural "The following errors have occurred:"
 msgstr[0] "ç?¼ç??ä¸?å??é?¯èª¤ï¼?"
 msgstr[1] "ç?¼ç??ä¸?å??é?¯èª¤ï¼?"
 
-#: ../vinagre/vinagre-plugin-dialog.c:71
+#: ../vinagre/vinagre-plugin-dialog.c:72
 msgid "Plugin Manager"
 msgstr "å¤?æ??ç¨?å¼?管ç??å?¡"
 
-#: ../vinagre/vinagre-prefs.c:87
+#: ../vinagre/vinagre-prefs.c:88
 msgid "Cannot initialize preferences manager."
 msgstr "ç?¡æ³?å??å§?å??å??好設å®?管ç??å?¡ã??"
 
@@ -1078,16 +1110,16 @@ msgstr "å??æ¶?ç?»å?¥"
 #: ../vinagre/vinagre-ssh.c:488
 #, 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"
+"The identity of the remote host (%s) is unknown.\n"
+"This happens when you log in to a host the first time.\n"
 "\n"
-"The identity sent by the remote computer is %s. If you want to be absolutely "
+"The identity sent by the remote host is %s. If you want to be absolutely "
 "sure it is safe to continue, contact the system administrator."
 msgstr ""
-"é? 端é?»è?¦ (%s) ç??è­?å?¥ä¸?æ??ã??\n"
+"é? 端主æ©? (%s) ç??è­?å?¥ä¸?æ??ã??\n"
 "é??é??常ç?¼ç??å?¨ä½ 第ä¸?次ç?»å?¥é?»è?¦ç??æ??å??ã??\n"
 "\n"
-"ç?±é? 端é?»è?¦å?³é??ç??è­?å?¥ç?º %sã??å¦?æ??ä½ æ?³è¦?å®?å?¨ç¢ºå®?ç¹¼çº?æ?¯å®?å?¨ç??ï¼?è«?è?¯çµ¡ç³»çµ±ç®¡ç??è??ã??"
+"ç?±é? 端主æ©?å?³é??ç??è­?å?¥ç?º %sã??å¦?æ??ä½ æ?³è¦?å®?å?¨ç¢ºå®?ç¹¼çº?æ?¯å®?å?¨ç??ï¼?è«?è?¯çµ¡ç³»çµ±ç®¡ç??è??ã??"
 
 #: ../vinagre/vinagre-ssh.c:506
 msgid "Login dialog canceled"
@@ -1121,6 +1153,10 @@ msgstr "主æ©?å¯?碼å??é©?è­?失æ??"
 msgid "Unable to find a valid SSH program"
 msgstr "æ?¾ä¸?å?°æ??æ??ç?? SSH ç¨?å¼?"
 
+#: ../vinagre/vinagre-tab.c:354
+msgid "Disconnect"
+msgstr "æ?·ç·?"
+
 #: ../vinagre/vinagre-tab.c:375
 msgid "Leave fullscreen"
 msgstr "é?¢é??å?¨è?¢å¹?"
@@ -1147,45 +1183,45 @@ msgstr "%s ç??ç?«é?¢å¿«ç?§"
 msgid "Error saving screenshot"
 msgstr "å?²å­?ç?«é?¢å¿«ç?§æ??ç?¼ç??é?¯èª¤"
 
-#: ../vinagre/vinagre-tube-handler.c:230
+#: ../vinagre/vinagre-tube-handler.c:231
 #, c-format
 msgid "Impossible to get service property: %s"
 msgstr "ä¸?å?¯è?½å??å¾?æ??å??屬æ?§ï¼?%s"
 
-#: ../vinagre/vinagre-tube-handler.c:287
+#: ../vinagre/vinagre-tube-handler.c:288
 #, c-format
 msgid "Impossible to create the connection: %s"
 msgstr "���建����%s"
 
-#: ../vinagre/vinagre-tube-handler.c:326
+#: ../vinagre/vinagre-tube-handler.c:327
 #, c-format
 msgid "Impossible to accept the stream tube: %s"
 msgstr "ä¸?å?¯è?½æ?¥å??串æµ?管ï¼?%s"
 
 #. Translators: this is an error message when we fail to get the name of an empathy/telepathy buddy. %s will be replaced by the actual error message.
-#: ../vinagre/vinagre-tube-handler.c:464
+#: ../vinagre/vinagre-tube-handler.c:465
 #, c-format
 msgid "Impossible to get the contact name: %s"
 msgstr "ä¸?å?¯è?½å??å¾?è?¯çµ¡äººå??稱ï¼?%s"
 
-#: ../vinagre/vinagre-tube-handler.c:501
+#: ../vinagre/vinagre-tube-handler.c:502
 #, c-format
 msgid "Impossible to get the avatar: %s"
 msgstr "ä¸?å?¯è?½å??å¾?å¤§é ­è²¼ï¼?%s"
 
-#: ../vinagre/vinagre-tube-handler.c:522
+#: ../vinagre/vinagre-tube-handler.c:523
 #, c-format
 msgid "%s wants to share their desktop with you."
 msgstr "%s æ?³è¦?è??ä½ å??享ä»?å??ç??æ¡?é?¢ã??"
 
-#: ../vinagre/vinagre-tube-handler.c:527
+#: ../vinagre/vinagre-tube-handler.c:528
 msgid "Desktop sharing invitation"
 msgstr "æ¡?é?¢å?±äº«é??è«?"
 
 #. Toplevel
 #: ../vinagre/vinagre-ui.h:33
-msgid "_Machine"
-msgstr "æ©?å?¨(_M)"
+msgid "_Remote"
+msgstr "é? 端(_R)"
 
 #: ../vinagre/vinagre-ui.h:34
 msgid "_Edit"
@@ -1199,9 +1235,13 @@ msgstr "檢�(_V)"
 msgid "_Bookmarks"
 msgstr "�籤(_B)"
 
+#: ../vinagre/vinagre-ui.h:37
+msgid "_Help"
+msgstr "æ±?å?©(_H)"
+
 #: ../vinagre/vinagre-ui.h:41
-msgid "Connect to a remote machine"
-msgstr "é?£ç·?å?°é? 端æ©?å?¨"
+msgid "Connect to a remote desktop"
+msgstr "é?£ç·?å?°é? 端æ¡?é?¢"
 
 #: ../vinagre/vinagre-ui.h:43
 msgid "Open a .VNC file"
@@ -1215,136 +1255,125 @@ msgstr "çµ?æ??ç¨?å¼?"
 msgid "Edit the application preferences"
 msgstr "編輯æ??ç?¨ç¨?å¼?å??好設å®?"
 
-#: ../vinagre/vinagre-ui.h:50
+#. TODO: Use a more appropriate icon. Libpeas uses "libpeas-plugin".
+#: ../vinagre/vinagre-ui.h:51
 msgid "_Plugins"
 msgstr "å¤?æ??ç¨?å¼?(_P)"
 
-#: ../vinagre/vinagre-ui.h:51
-msgid "Select plugins"
-msgstr "é?¸æ??å¤?æ??ç¨?å¼?"
+#: ../vinagre/vinagre-ui.h:52
+msgid "Select active plugins"
+msgstr "é?¸æ??使ç?¨ä¸­ç??å¤?æ??ç¨?å¼?"
 
 #. Help menu
-#: ../vinagre/vinagre-ui.h:54
+#: ../vinagre/vinagre-ui.h:55
 msgid "_Contents"
 msgstr "�容(_C)"
 
-#: ../vinagre/vinagre-ui.h:55
-msgid "Open the vinagre manual"
-msgstr "é??å?? vinagre æ??å??"
+#: ../vinagre/vinagre-ui.h:56
+msgid "Open the Vinagre manual"
+msgstr "é??å?? Vinagre æ??å??"
 
-#: ../vinagre/vinagre-ui.h:57
+#: ../vinagre/vinagre-ui.h:58
 msgid "About this application"
 msgstr "é??æ?¼æ­¤ç¨?å¼?"
 
-#: ../vinagre/vinagre-ui.h:62
+#: ../vinagre/vinagre-ui.h:63
 msgid "_Toolbar"
 msgstr "å·¥å?·å??(_T)"
 
-#: ../vinagre/vinagre-ui.h:63
+#: ../vinagre/vinagre-ui.h:64
 msgid "Show or hide the toolbar"
 msgstr "顯示æ??é?±è??å·¥å?·å??"
 
-#: ../vinagre/vinagre-ui.h:66
+#: ../vinagre/vinagre-ui.h:67
 msgid "_Statusbar"
 msgstr "ç??æ??å??(_S)"
 
-#: ../vinagre/vinagre-ui.h:67
+#: ../vinagre/vinagre-ui.h:68
 msgid "Show or hide the statusbar"
 msgstr "顯示æ??é?±è??ç??æ??å??"
 
-#: ../vinagre/vinagre-ui.h:70
-msgid "Side _Panel"
-msgstr "å?´é??é?¢æ?¿(_P)"
-
 #: ../vinagre/vinagre-ui.h:71
-msgid "Show or hide the side panel"
-msgstr "顯示æ??é?±è??å?´é??é?¢æ?¿"
+msgid "Side _Pane"
+msgstr "å?´é??çª?æ ¼(_P)"
 
-#: ../vinagre/vinagre-ui.h:79
-msgid "Close the current connection"
-msgstr "é??é??ç?¶å??é?£ç·?"
+#: ../vinagre/vinagre-ui.h:72
+msgid "Show or hide the side pane"
+msgstr "顯示æ??é?±è??å?´é??çª?æ ¼"
 
 #: ../vinagre/vinagre-ui.h:80
-msgid "C_lose All"
-msgstr "å?¨é?¨é??é??(_L)"
+msgid "Disconnect the current connection"
+msgstr "é??é??ç?®å??é?£ç·?"
 
 #: ../vinagre/vinagre-ui.h:81
-msgid "Close all active connections"
-msgstr "é??é??å?¨é?¨æ´»å??中ç??é?£ç·?"
+msgid "Disconnect All"
+msgstr "����"
 
-#. Bookmarks menu
-#: ../vinagre/vinagre-ui.h:84
-msgid "_Add to bookmarks"
-msgstr "����籤(_A)"
+#: ../vinagre/vinagre-ui.h:82
+msgid "Disconnect all connections"
+msgstr "é??é??æ??æ??ç??é?£ç·?"
 
+#. Bookmarks menu
 #: ../vinagre/vinagre-ui.h:85
-msgid "Add current connection to your bookmarks"
-msgstr "æ?°å¢?ç?®å??é?£ç·?è?³ä½ ç??æ?¸ç±¤"
+msgid "_Add Bookmark"
+msgstr "å? å?¥æ?¸ç±¤(_A)"
 
-#. Machine menu
-#: ../vinagre/vinagre-ui.h:92
-msgid "_Take screenshot"
-msgstr "æ??æ??è?¢å¹?æ?ªå??(_T)"
+#: ../vinagre/vinagre-ui.h:86
+msgid "Add the current connection to your bookmarks"
+msgstr "æ?°å¢?ç?®å??é?£ç·?è?³ä½ ç??æ?¸ç±¤"
 
+#. Remote menu
 #: ../vinagre/vinagre-ui.h:93
-msgid "Take a screenshot of active connection"
-msgstr "æ?·å??æ´»å??é?£ç·?ç??ç?«é?¢å¿«ç?§"
+msgid "_Take Screenshot"
+msgstr "æ??æ??è?¢å¹?æ?ªå??(_T)"
 
-#: ../vinagre/vinagre-ui.h:97
-msgid "View the current machine in full screen"
-msgstr "以å?¨è?¢å¹?檢è¦?ç?¶å??æ©?å?¨"
+#: ../vinagre/vinagre-ui.h:94
+msgid "Take a screenshot of the current remote desktop"
+msgstr "æ?·å??ç?®å??é? 端æ¡?é?¢ç??è?¢å¹?æ?ªå??"
 
-#: ../vinagre/vinagre-utils.c:72
-msgid "An error has occurred:"
-msgstr "ç?¼ç??é?¯èª¤ï¼?"
+#: ../vinagre/vinagre-ui.h:98
+msgid "View the current remote desktop in fullscreen mode"
+msgstr "以å?¨è?¢å¹?檢è¦?ç?®å??ç??é? 端æ¡?é?¢"
 
-#: ../vinagre/vinagre-utils.c:161
+#: ../vinagre/vinagre-util.c:89
 msgid ""
 "A plugin tried to open an UI file but did not succeed, with the error "
 "message:"
 msgstr "æ??å¤?æ??ç¨?å¼?å??試é??å?? UI æª?æ¡?ä½?並æ?ªæ??å??ï¼?é?¯èª¤è¨?æ?¯ç?ºï¼?"
 
-#: ../vinagre/vinagre-utils.c:163
+#: ../vinagre/vinagre-util.c:91
 msgid ""
 "The program tried to open an UI file but did not succeed, with the error "
 "message:"
 msgstr "æ??ç¨?å¼?å??試é??å?? UI æª?æ¡?ä½?並æ?ªæ??å??ï¼?é?¯èª¤è¨?æ?¯ç?ºï¼?"
 
-#: ../vinagre/vinagre-utils.c:166
+#: ../vinagre/vinagre-util.c:94
 msgid "Please check your installation."
 msgstr "è«?檢æ?¥å®?è£?æ?¯å?¦æ­£ç¢ºã??"
 
-#: ../vinagre/vinagre-utils.c:167
+#: ../vinagre/vinagre-util.c:95
 msgid "Error loading UI file"
 msgstr "è¼?å?¥ UI æª?æ¡?æ??ç?¼ç??é?¯èª¤"
 
-#: ../vinagre/vinagre-utils.c:264
-msgid "Vinagre is a remote desktop viewer for the GNOME Desktop"
-msgstr "Vinagre æ?¯ GNOME æ¡?é?¢ç??é? 端æ¡?é?¢æª¢è¦?å?¨"
+#. Translators: %s is a protocol, like VNC or SSH
+#: ../vinagre/vinagre-util.c:255
+#, c-format
+msgid "%s authentication is required"
+msgstr "é??è¦? %s é©?è­?"
 
-#: ../vinagre/vinagre-utils.c:267
-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 "
-"Foundation; either version 2 of the License, or (at your option) any later "
-"version."
-msgstr "Vinagre æ?¯è?ªç?±è»?件ï¼?ä½ å?¯ä»¥å?¨è?ªç?±è»?件å?ºé??æ??ç?¼è¡?ç?? GNU é??ç?¨å?¬å?±è¨±å?¯ç??æ¢?款ä¸?é??æ?°å??ç?¼å®?å??/æ??ä¿®æ?¹å®?ï¼?ç?¡è«?此許å?¯ç??ç??æ?¬2ï¼?æ??è??(ä»¥ä½ ç??é?¸æ??)ä»»ä½?æ?´æ?°ç??ç??æ?¬ã??"
+#: ../vinagre/vinagre-utils.vala:24
+msgid "An error occurred"
+msgstr "ç?¼ç??é?¯èª¤"
 
-#: ../vinagre/vinagre-utils.c:271
-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 "
-"FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
-"details."
-msgstr "Vinagre 被ç?¼å¸?æ?¯å¸?æ??å®?è?½å¤ æ??æ??ç?¨è??ï¼?ä½?ã??æ²?æ??ä»»ä½?ä¿?è­?ã??ï¼?ç??è?³æ²?æ??é?±å?«ã??å?¯é?·å?®ã??æ??è??ã??ç?¨æ?¼ç?¹å®?ç?¨é??ã??ç??ä¿?è­?ã??è«?æ?¥ç?? GNU é??ç?¨å?¬å?±è¨±å?¯ä»¥ç?²å¾?æ?´å¤?ç´°ç¯?ã??"
+#: ../vinagre/vinagre-utils.vala:63
+msgid "Error showing help"
+msgstr "顯示æ±?å?©æ??ç?¼ç??é?¯èª¤"
 
-#: ../vinagre/vinagre-utils.c:275
-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.vala:77
+msgid "Vinagre is a remote desktop viewer for the GNOME Desktop"
+msgstr "Vinagre æ?¯ GNOME æ¡?é?¢ç??é? 端æ¡?é?¢æª¢è¦?å?¨"
 
-#: ../vinagre/vinagre-utils.c:292
+#: ../vinagre/vinagre-utils.vala:88
 msgid "translator-credits"
 msgstr ""
 "GNOME ç¨?å¼?中æ??å??é?µä»¶è«?å£?\n"
@@ -1352,52 +1381,104 @@ msgstr ""
 "\n"
 "Hialan Liu <hialan liu gmail com>, 2008"
 
-#: ../vinagre/vinagre-utils.c:295
+#: ../vinagre/vinagre-utils.vala:91
 msgid "Vinagre Website"
 msgstr "Vinagre 網�"
 
-#. Translators: %s is a protocol, like VNC or SSH
-#: ../vinagre/vinagre-utils.c:407
-#, c-format
-msgid "%s authentication is required"
-msgstr "é??è¦? %s é©?è­?"
-
-#: ../vinagre/vinagre-window.c:439
-msgid "_Recent connections"
+#: ../vinagre/vinagre-window.c:441
+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:556
+#: ../vinagre/vinagre-window.c:558
 #, c-format
 msgid "Open %s:%d"
 msgstr "é??å?? %sï¼?%d"
 
-#: ../vinagre/vinagre-window.c:735
+#: ../vinagre/vinagre-window.c:737
 msgid "About menu accelerators and keyboard shortcuts"
 msgstr "é??æ?¼é?¸å?®è??é?µç?¤æ?·å¾?é?µ"
 
-#: ../vinagre/vinagre-window.c:737
+#: ../vinagre/vinagre-window.c:739
 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"
+"default. The reason is to avoid the keys from being intercepted by the "
+"program, and allow them to be sent to the remote desktop.\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"
+"Vinagre é ?設å?³å??ç?¨é?¸å?®è??é?µç?¤æ?·å¾?é?µã??å??å? æ?¯ç?ºäº?é?¿å??æ??é?µè¢«ç¨?å¼?æ??æ?ªï¼?é??樣æ??è?½è®?æ??é?µé??è?³é? 端æ¡?é?¢ã??\n"
 "\n"
 "ä½ å?¯ä»¥é??é??å??好設å®?å°?話ç??æ?¹è®?é??å??è¡?ç?ºã??é??è¦?æ?´å¤?è³?è¨?ï¼?è«?æ?¥é?±æ??件ã??\n"
 "\n"
 "é??å??è¨?æ?¯å?ªæ??å?ºç?¾ä¸?次ã??"
 
-#: ../vinagre/vinagre-window.c:745 ../vinagre/vinagre-window.c:751
+#: ../vinagre/vinagre-window.c:747 ../vinagre/vinagre-window.c:753
 #, c-format
 msgid "Error while creating the file %s: %s"
 msgstr "建ç«?æª?æ¡? %s æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
+#~ msgid "Which machine do you want to connect to?"
+#~ msgstr "æ?¨æ?³é?£ç·?å?°å?ªå??æ©?å?¨ï¼?"
+
+#~ msgid "Access MS Windows machines"
+#~ msgstr "å­?å?? MS Windows æ©?å?¨"
+
+#~ msgid "_Depth Color:"
+#~ msgstr "��深度(_D):"
+
+#~ msgid "_Reverse Connections..."
+#~ msgstr "å??å??é?£ç·?(_R)â?¦"
+
+#~ msgid "Could not run vinagre:"
+#~ msgstr "ç?¡æ³?å?·è¡? vinagre:"
+
+#~ msgid "Open Remote Desktop Viewer"
+#~ msgstr "é??å??é? 端æ¡?é?¢æª¢è¦?å?¨"
+
+#~ msgid "_About"
+#~ msgstr "é??æ?¼(_A)"
+
+#~ msgid "Access your bookmarks"
+#~ msgstr "å­?å??æ?¨ç??æ?¸ç±¤"
+
+#~ msgid "Connect to this machine"
+#~ msgstr "���此��"
+
+#~ msgid "_Machine"
+#~ msgstr "æ©?å?¨(_M)"
+
+#~ msgid "C_lose All"
+#~ msgstr "å?¨é?¨é??é??(_L)"
+
+#~ 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 Foundation; either version 2 of the License, or (at your option) "
+#~ "any later version."
+#~ msgstr ""
+#~ "Vinagre æ?¯è?ªç?±è»?é«?ï¼?æ?¨å?¯ä»¥å?¨è?ªç?±è»?é«?å?ºé??æ??ç?¼è¡?ç?? GNU é??ç?¨å?¬å?±è¨±å?¯ç??æ¢?款ä¸?"
+#~ "é??æ?°å??ç?¼å®?å??/æ??ä¿®æ?¹å®?ï¼?ç?¡è«?此許å?¯ç??ç??æ?¬2ï¼?æ??è??(以æ?¨ç??é?¸æ??)ä»»ä½?æ?´æ?°ç??ç??æ?¬ã??"
+
+#~ 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 FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+#~ "more details."
+#~ msgstr ""
+#~ "Vinagre 被ç?¼å¸?æ?¯å¸?æ??å®?è?½å¤ æ??æ??ç?¨è??ï¼?ä½?ã??æ²?æ??ä»»ä½?ä¿?è­?ã??ï¼?ç??è?³æ²?æ??é?±å?«ã??å?¯é?·"
+#~ "å?®ã??æ??è??ã??ç?¨æ?¼ç?¹å®?ç?¨é??ã??ç??ä¿?è­?ã??è«?æ?¥ç?? GNU é??ç?¨å?¬å?±è¨±å?¯ä»¥ç?²å¾?æ?´å¤?ç´°ç¯?ã??"
+
+#~ 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/>ã??"
+
 #~ msgid "The handler for \"vnc://\" URLs"
 #~ msgstr "ã??vnc://ã??網å??ç??è??ç??ç¨?å¼?"
 
@@ -1489,9 +1570,6 @@ msgstr "建ç«?æª?æ¡? %s æ??ç?¼ç??é?¯èª¤ï¼?%s"
 #~ msgid "<b>Editing a bookmark</b>"
 #~ msgstr "<b>編輯�籤</b>"
 
-#~ msgid "<b>Enter a name for this connection</b>"
-#~ msgstr "<b>ç?ºé??å??é?£ç·?輸å?¥å??稱</b>"
-
 #~ msgid ""
 #~ "<b>In order to connect on this machine, a password is required. Please "
 #~ "supply it.</b>"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index bac6963..b03e3a3 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -2,17 +2,17 @@
 # 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.
 # Wei-Lun Chao <chaoweilun gmail com>, 2010.
+# Chao-Hsiung Liao <j_h_liau yahoo com tw>, 2010, 2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vinagre 2.91.93\n"
+"Project-Id-Version: vinagre 3.1.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-30 21:39+0800\n"
-"PO-Revision-Date: 2011-03-30 14:33+0800\n"
+"POT-Creation-Date: 2011-05-19 15:51+0800\n"
+"PO-Revision-Date: 2011-05-19 15:39+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"
+"Language-Team: Chinese (traditional) <zh-l10n lists linux org tw>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -94,7 +94,6 @@ msgid "Access remote desktops"
 msgstr "å­?å??é? 端æ¡?é?¢"
 
 #: ../data/vinagre.desktop.in.in.h:2 ../data/vinagre-file.desktop.in.in.h:2
-#: ../vinagre/vinagre-applet.c:327 ../vinagre/vinagre-applet.c:339
 #: ../vinagre/vinagre-main.c:128
 msgid "Remote Desktop Viewer"
 msgstr "é? 端æ¡?é?¢æª¢è¦?å?¨"
@@ -104,50 +103,92 @@ msgid "Allow _keyboard shortcuts"
 msgstr "å??許é?µç?¤æ?·å¾?é?µ(_K)"
 
 #: ../data/vinagre.ui.h:2
+msgid "Always show tabs in the remote desktop display area"
+msgstr "æ°¸é? å?¨é? 端æ¡?é?¢é¡¯ç¤ºå??å??顯示å??é ?"
+
+#: ../data/vinagre.ui.h:3
 msgid "Authentication is required"
 msgstr "é??è¦?é©?è­?"
 
+#: ../data/vinagre.ui.h:4
+msgid "Bookmark Folder"
+msgstr "æ?¸ç±¤è³?æ??夾"
+
 #. setup label
-#: ../data/vinagre.ui.h:3 ../vinagre/vinagre-fav.c:860
+#: ../data/vinagre.ui.h:5 ../vinagre/vinagre-fav.c:886
 msgid "Bookmarks"
 msgstr "�籤"
 
-#: ../data/vinagre.ui.h:4
+#: ../data/vinagre.ui.h:6
+msgid "Choose a remote desktop to connect to"
+msgstr "é?¸æ??ä¸?å??è¦?é?£ç·?ç??é? 端æ¡?é?¢"
+
+#: ../data/vinagre.ui.h:7
+msgid "Connect"
+msgstr "��"
+
+#: ../data/vinagre.ui.h:8
 msgid "Connection"
 msgstr "��"
 
-#: ../data/vinagre.ui.h:5
+#: ../data/vinagre.ui.h:9
 msgid "Connection options"
 msgstr "é?£ç·?é?¸é ?"
 
-#: ../data/vinagre.ui.h:6
+#: ../data/vinagre.ui.h:10
+msgid "Enable fullscreen mode for this connection"
+msgstr "å?¨é??å??é?£ç·?å??ç?¨å?¨è?¢å¹?模å¼?"
+
+#. This is a tooltip in preferences dialog
+#: ../data/vinagre.ui.h:12
+msgid ""
+"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:13
+msgid "Enter a valid hostname or IP address"
+msgstr "輸å?¥æ??æ??ç??主æ©?å??稱æ?? IP ä½?å??"
+
+#: ../data/vinagre.ui.h:14
 msgid "Folder"
 msgstr "è³?æ??夾"
 
-#: ../data/vinagre.ui.h:7 ../plugins/rdp/vinagre-rdp-tab.c:53
-#: ../plugins/ssh/vinagre-ssh-tab.c:49 ../plugins/vnc/vinagre-vnc-tab.c:148
-#: ../plugins/spice/vinagre-spice-tab.c:138 ../vinagre/vinagre-fav.c:406
+#: ../data/vinagre.ui.h:15 ../plugins/rdp/vinagre-rdp-tab.c:54
+#: ../plugins/ssh/vinagre-ssh-tab.c:50 ../plugins/vnc/vinagre-vnc-tab.c:149
+#: ../plugins/spice/vinagre-spice-tab.c:139 ../vinagre/vinagre-fav.c:406
 msgid "Host:"
 msgstr "主��"
 
-#: ../data/vinagre.ui.h:8
+#: ../data/vinagre.ui.h:16
 msgid "Interface"
 msgstr "ä»?é?¢"
 
-#: ../data/vinagre.ui.h:9
+#: ../data/vinagre.ui.h:17
 msgid "Options"
 msgstr "é?¸é ?"
 
-#: ../data/vinagre.ui.h:10
+#: ../data/vinagre.ui.h:18
 msgid "Parent Folder"
 msgstr "ä¸?層è³?æ??夾"
 
-#: ../data/vinagre.ui.h:11
+#: ../data/vinagre.ui.h:19
 msgid "Preferences"
 msgstr "å??好設å®?"
 
-#. This is a tooltip in preferences dialog
-#: ../data/vinagre.ui.h:13
+#: ../data/vinagre.ui.h:20
+msgid "Search for remote hosts on the network"
+msgstr "æ??å°?網路ä¸?ç??é? 端主æ©?"
+
+#: ../data/vinagre.ui.h:21
+msgid "Select a remote desktop protocol for this connection"
+msgstr "ç?ºé??å??é?£ç·?é?¸æ??ä¸?å??é? 端æ¡?é?¢é??è¨?å??å®?"
+
+#: ../data/vinagre.ui.h:22
+msgid "Store the login credential in GNOME Keyring"
+msgstr "å°?ç?»å?¥æ??è­?å?²å­?å?° GNOME é?°å??å??"
+
+#: ../data/vinagre.ui.h:23
 msgid ""
 "This option enables menu accelerators and keyboard shortcuts. For more info "
 "on why you may want to disable them, check the documentation."
@@ -155,46 +196,46 @@ msgstr ""
 "é??å??é?¸é ?æ??å??ç?¨é?¸å?®è??é?µç?¤ç??æ?·å¾?é?µã??æ?³äº?解å?¨ä»?麼æ??å½¢ä¸?æ?¨æ??æ?³å??ç?¨å®?å??ï¼?è«?æ?¥é?±æ??"
 "件ã??"
 
-#: ../data/vinagre.ui.h:14
-msgid "Which machine do you want to connect to?"
-msgstr "æ?¨æ?³é?£ç·?å?°å?ªå??æ©?å?¨ï¼?"
-
-#: ../data/vinagre.ui.h:15
+#: ../data/vinagre.ui.h:24
 msgid "_Always show tabs"
 msgstr "æ°¸é? 顯示å??é ?(_A)"
 
 #. This is a button label, in the authentication dialog
-#: ../data/vinagre.ui.h:17
+#: ../data/vinagre.ui.h:26
 msgid "_Authenticate"
 msgstr "é©?è­?(_A)"
 
-#: ../data/vinagre.ui.h:18
+#: ../data/vinagre.ui.h:27
 msgid "_Full screen"
 msgstr "���(_F)"
 
-#: ../data/vinagre.ui.h:19
+#: ../data/vinagre.ui.h:28
+msgid "_Fullscreen"
+msgstr "���(_F)"
+
+#: ../data/vinagre.ui.h:29
 msgid "_Host:"
 msgstr "主�(_H):"
 
 #. Translators: This is the name of a bookmark. It appears in the add/edit bookmark dialog.
-#: ../data/vinagre.ui.h:21
+#: ../data/vinagre.ui.h:31
 msgid "_Name:"
 msgstr "å??稱(_N):"
 
-#: ../data/vinagre.ui.h:22 ../plugins/spice/vinagre-spice-plugin.c:295
+#: ../data/vinagre.ui.h:32 ../plugins/spice/vinagre-spice-plugin.c:295
 msgid "_Password:"
 msgstr "�碼(_P):"
 
-#: ../data/vinagre.ui.h:23
+#: ../data/vinagre.ui.h:33
 msgid "_Protocol:"
 msgstr "é??è¨?å??å®?(_P):"
 
-#: ../data/vinagre.ui.h:24
+#: ../data/vinagre.ui.h:34
 msgid "_Remember this credential"
 msgstr "è¨?ä½?é??å??æ??è­?(_R)"
 
-#: ../data/vinagre.ui.h:25 ../plugins/rdp/vinagre-rdp-plugin.c:108
-#: ../plugins/ssh/vinagre-ssh-plugin.c:113
+#: ../data/vinagre.ui.h:35 ../plugins/rdp/vinagre-rdp-plugin.c:105
+#: ../plugins/ssh/vinagre-ssh-plugin.c:110
 msgid "_Username:"
 msgstr "使ç?¨è??å??稱(_U):"
 
@@ -215,10 +256,10 @@ msgstr "RDP"
 msgid "RDP support"
 msgstr "RDP ��"
 
-#. Translators: This is a description of the RDP protocol. It appears at Connect dialog.
+#. Translators: This is a description of the RDP protocol. It appears in the Connect dialog.
 #: ../plugins/rdp/vinagre-rdp-plugin.c:57
-msgid "Access MS Windows machines"
-msgstr "å­?å?? MS Windows æ©?å?¨"
+msgid "Access MS Windows remote desktops"
+msgstr "å­?å?? MS Windows é? 端æ¡?é?¢"
 
 #: ../plugins/rdp/vinagre-rdp-plugin.c:96
 msgid "RDP Options"
@@ -226,32 +267,32 @@ msgstr "RDP é?¸é ?"
 
 #. Translators: This is the tooltip for the username field in a RDP connection
 #. Translators: This is the tooltip for the username field in a SSH connection
-#: ../plugins/rdp/vinagre-rdp-plugin.c:113
-#: ../plugins/ssh/vinagre-ssh-plugin.c:118
+#: ../plugins/rdp/vinagre-rdp-plugin.c:110
+#: ../plugins/ssh/vinagre-ssh-plugin.c:115
 msgid ""
 "Optional. If blank, your username will be used. Also, it can be supplied in "
-"the Machine field above, in the form username hostname "
+"the Host field above, in the form username hostname "
 msgstr ""
-"é?¸æ??æ?§ç??ã??å¦?æ??ä¿?æ??空ç?½ï¼?æ??使ç?¨æ?¨ç??使ç?¨è??å??稱ã??å?¦å¤?ï¼?ä¹?å?¯ä»¥å?¨ä¸?é?¢ç??ã??æ©?å?¨ã??æ¬?"
+"é?¸æ??æ?§ç??ã??å¦?æ??ä¿?æ??空ç?½ï¼?æ??使ç?¨æ?¨ç??使ç?¨è??å??稱ã??å?¦å¤?ï¼?ä¹?å?¯ä»¥å?¨ä¸?é?¢ç??ã??主æ©?ã??æ¬?"
 "ä½?中æ??å®?ï¼?æ ¼å¼?ç?º 使ç?¨è??å??稱 主æ©?å??稱ã??"
 
-#: ../plugins/rdp/vinagre-rdp-tab.c:54 ../plugins/ssh/vinagre-ssh-tab.c:50
-#: ../plugins/vnc/vinagre-vnc-tab.c:149
-#: ../plugins/spice/vinagre-spice-tab.c:139
+#: ../plugins/rdp/vinagre-rdp-tab.c:55 ../plugins/ssh/vinagre-ssh-tab.c:51
+#: ../plugins/vnc/vinagre-vnc-tab.c:150
+#: ../plugins/spice/vinagre-spice-tab.c:140
 msgid "Port:"
 msgstr "é?£æ?¥å? :"
 
-#: ../plugins/rdp/vinagre-rdp-tab.c:123
+#: ../plugins/rdp/vinagre-rdp-tab.c:124
 msgid "Error while executing rdesktop"
 msgstr "å?·è¡? rdesktop æ??å?ºç?¾é?¯èª¤"
 
-#: ../plugins/rdp/vinagre-rdp-tab.c:124 ../vinagre/vinagre-bookmarks.c:366
-#: ../vinagre/vinagre-bookmarks.c:492
-#: ../vinagre/vinagre-bookmarks-migration.c:135
-#: ../vinagre/vinagre-cache-prefs.c:56 ../vinagre/vinagre-commands.c:170
+#: ../plugins/rdp/vinagre-rdp-tab.c:125 ../vinagre/vinagre-bookmarks.c:367
+#: ../vinagre/vinagre-bookmarks.c:493
+#: ../vinagre/vinagre-bookmarks-migration.c:136
+#: ../vinagre/vinagre-cache-prefs.c:57 ../vinagre/vinagre-commands.c:178
 #: ../vinagre/vinagre-connect.c:492 ../vinagre/vinagre-fav.c:772
-#: ../vinagre/vinagre-options.c:76 ../vinagre/vinagre-options.c:94
-#: ../vinagre/vinagre-window.c:278 ../vinagre/vinagre-window.c:751
+#: ../vinagre/vinagre-options.c:81 ../vinagre/vinagre-options.c:99
+#: ../vinagre/vinagre-window.c:288 ../vinagre/vinagre-window.c:753
 msgid "Unknown error"
 msgstr "ä¸?æ??ç??é?¯èª¤"
 
@@ -275,7 +316,7 @@ msgid "SSH support"
 msgstr "SSH ��"
 
 #. Translators: 'shared' here is a VNC protocol specific flag. You can translate it, but I think it's better to let it untranslated
-#: ../plugins/vnc/vinagre-vnc-connection.c:316
+#: ../plugins/vnc/vinagre-vnc-connection.c:317
 #: ../plugins/vnc/vinagre-vnc-plugin.c:199
 #, c-format
 msgid ""
@@ -304,8 +345,8 @@ msgid "VNC"
 msgstr "VNC"
 
 #: ../plugins/vnc/vinagre-vnc-plugin.c:88
-msgid "Access Unix/Linux, Windows and other machines."
-msgstr "å­?å?? Unix/Linuxã??Windows å??å?¶ä»?é?»è?¦ã??"
+msgid "Access Unix/Linux, Windows and other remote desktops."
+msgstr "å­?å?? Unix/Linuxã??Windows å??å?¶ä»?é? 端æ¡?é?¢ã??"
 
 #: ../plugins/vnc/vinagre-vnc-plugin.c:145
 #: ../plugins/spice/vinagre-spice-plugin.c:100
@@ -328,203 +369,204 @@ msgstr "VNC é?¸é ?"
 
 #. View only check button
 #. View only check button - not fully ready on spice-gtk side
-#: ../plugins/vnc/vinagre-vnc-plugin.c:265
-#: ../plugins/vnc/vinagre-vnc-tab.c:624
+#: ../plugins/vnc/vinagre-vnc-plugin.c:260
+#: ../plugins/vnc/vinagre-vnc-tab.c:625
 #: ../plugins/spice/vinagre-spice-plugin.c:222
-#: ../plugins/spice/vinagre-spice-tab.c:506
+#: ../plugins/spice/vinagre-spice-tab.c:507
 msgid "_View only"
 msgstr "å?ªæ??檢è¦?(_V)"
 
 #. Scaling check button
-#: ../plugins/vnc/vinagre-vnc-plugin.c:273
+#: ../plugins/vnc/vinagre-vnc-plugin.c:269
 #: ../plugins/spice/vinagre-spice-plugin.c:246
 msgid "_Scaling"
 msgstr "縮�(_S)"
 
-#: ../plugins/vnc/vinagre-vnc-plugin.c:289
+#. Keep ratio check button
+#: ../plugins/vnc/vinagre-vnc-plugin.c:283
 msgid "_Keep aspect ratio"
 msgstr "ä¿?æ??é?·å¯¬æ¯?(_K)"
 
 #. JPEG Compression check button
-#: ../plugins/vnc/vinagre-vnc-plugin.c:299
+#: ../plugins/vnc/vinagre-vnc-plugin.c:293
 msgid "_Use JPEG Compression"
 msgstr "使� JPEG �縮(_U)"
 
-#: ../plugins/vnc/vinagre-vnc-plugin.c:300
+#: ../plugins/vnc/vinagre-vnc-plugin.c:294
 msgid "This might not work on all VNC servers"
 msgstr "é??å?¯è?½ç?¡æ³?ç?¨æ?¼æ??æ??ç?? VNC 伺æ??å?¨"
 
-#: ../plugins/vnc/vinagre-vnc-plugin.c:309
-msgid "_Depth Color:"
+#: ../plugins/vnc/vinagre-vnc-plugin.c:304
+msgid "Color _Depth:"
 msgstr "��深度(_D):"
 
-#: ../plugins/vnc/vinagre-vnc-plugin.c:314
+#: ../plugins/vnc/vinagre-vnc-plugin.c:309
 msgid "Use Server Settings"
 msgstr "使ç?¨ä¼ºæ??å?¨è¨­å®?å?¼"
 
-#: ../plugins/vnc/vinagre-vnc-plugin.c:315
+#: ../plugins/vnc/vinagre-vnc-plugin.c:310
 msgid "True Color (24 bits)"
 msgstr "ç??彩 (24 ä½?å??)"
 
-#: ../plugins/vnc/vinagre-vnc-plugin.c:316
+#: ../plugins/vnc/vinagre-vnc-plugin.c:311
 msgid "High Color (16 bits)"
 msgstr "é«?彩 (16 ä½?å??)"
 
-#: ../plugins/vnc/vinagre-vnc-plugin.c:317
+#: ../plugins/vnc/vinagre-vnc-plugin.c:312
 msgid "Low Color (8 bits)"
 msgstr "ä½?è?²å½© (8 ä½?å??)"
 
-#: ../plugins/vnc/vinagre-vnc-plugin.c:318
+#: ../plugins/vnc/vinagre-vnc-plugin.c:313
 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:331
+#: ../plugins/vnc/vinagre-vnc-plugin.c:327
 #: ../plugins/spice/vinagre-spice-plugin.c:257
 msgid "Use h_ost"
 msgstr "使�主�(_O)"
 
-#: ../plugins/vnc/vinagre-vnc-plugin.c:340
+#: ../plugins/vnc/vinagre-vnc-plugin.c:336
 #: ../plugins/spice/vinagre-spice-plugin.c:266
 msgid "hostname or user hostname"
 msgstr "主æ©?å??稱 æ?? 使ç?¨è?? 主æ©?å??稱"
 
-#: ../plugins/vnc/vinagre-vnc-plugin.c:341
+#: ../plugins/vnc/vinagre-vnc-plugin.c:337
 #: ../plugins/spice/vinagre-spice-plugin.c:267
 msgid "Supply an alternative port using colon"
 msgstr "使ç?¨å??è??æ??ä¾?å?¥ç??é?£æ?¥å? "
 
-#: ../plugins/vnc/vinagre-vnc-plugin.c:342
+#: ../plugins/vnc/vinagre-vnc-plugin.c:338
 #: ../plugins/spice/vinagre-spice-plugin.c:268
 msgid "For instance: joe domain com:5022"
 msgstr "���joe domain com:5022"
 
 #. Translators: the whole sentence will be: Use host <hostname> as a SSH tunnel
-#: ../plugins/vnc/vinagre-vnc-plugin.c:348
+#: ../plugins/vnc/vinagre-vnc-plugin.c:344
 #: ../plugins/spice/vinagre-spice-plugin.c:274
 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:383
+#: ../plugins/vnc/vinagre-vnc-plugin.c:379
 msgid "VNC Files"
 msgstr "VNC ��"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:147
+#: ../plugins/vnc/vinagre-vnc-tab.c:148
 msgid "Desktop Name:"
 msgstr "æ¡?é?¢å??稱ï¼?"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:150
+#: ../plugins/vnc/vinagre-vnc-tab.c:151
 msgid "Dimensions:"
 msgstr "尺寸:"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:295
-#: ../plugins/spice/vinagre-spice-tab.c:251
+#: ../plugins/vnc/vinagre-vnc-tab.c:296
+#: ../plugins/spice/vinagre-spice-tab.c:252
 msgid "Error creating the SSH tunnel"
 msgstr "建ç«? SSH ç©¿é?§æ??ç?¼ç??é?¯èª¤"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:296 ../plugins/vnc/vinagre-vnc-tab.c:307
-#: ../plugins/spice/vinagre-spice-tab.c:252
-#: ../plugins/spice/vinagre-spice-tab.c:264
+#: ../plugins/vnc/vinagre-vnc-tab.c:297 ../plugins/vnc/vinagre-vnc-tab.c:308
+#: ../plugins/spice/vinagre-spice-tab.c:253
+#: ../plugins/spice/vinagre-spice-tab.c:265
 msgid "Unknown reason"
 msgstr "ä¸?æ??ç??å??å? "
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:306
-#: ../plugins/spice/vinagre-spice-tab.c:263
+#: ../plugins/vnc/vinagre-vnc-tab.c:307
+#: ../plugins/spice/vinagre-spice-tab.c:264
 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:351
+#: ../plugins/vnc/vinagre-vnc-tab.c:352
 #, c-format
 msgid "Authentication method for host %s is unsupported. (%u)"
 msgstr "ä¸?æ?¯æ??å?°ä¸»æ©? %s ç??é©?è­?æ?¹æ³?ã??(%u)"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:355
+#: ../plugins/vnc/vinagre-vnc-tab.c:356
 msgid "Authentication unsupported"
 msgstr "ä¸?æ?¯æ?´ç??é©?è­?æ?¹æ³?"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:523 ../plugins/vnc/vinagre-vnc-tab.c:540
+#: ../plugins/vnc/vinagre-vnc-tab.c:524 ../plugins/vnc/vinagre-vnc-tab.c:541
 msgid "Authentication error"
 msgstr "���誤"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:524
-msgid "A username is required in order to access this machine."
-msgstr "ç?ºäº?å­?å??é??å??é?»è?¦é??è¦?使ç?¨è??å??稱ã??"
+#: ../plugins/vnc/vinagre-vnc-tab.c:525
+msgid "A username is required in order to access this remote desktop."
+msgstr "ç?ºäº?å­?å??é??å??é? 端æ¡?é?¢é??è¦?使ç?¨è??å??稱ã??"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:541
-msgid "A password is required in order to access this machine."
-msgstr "ç?ºäº?å­?å??é??å??é?»è?¦é??è¦?å¯?碼ã??"
+#: ../plugins/vnc/vinagre-vnc-tab.c:542
+msgid "A password is required in order to access this remote desktop."
+msgstr "ç?ºäº?å­?å??é??å??é? 端æ¡?é?¢é??è¦?å¯?碼ã??"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:595
-#: ../plugins/spice/vinagre-spice-tab.c:465
+#: ../plugins/vnc/vinagre-vnc-tab.c:596
+#: ../plugins/spice/vinagre-spice-tab.c:466
 msgid "S_caling"
 msgstr "縮�(_C)"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:596
-#: ../plugins/spice/vinagre-spice-tab.c:466
+#: ../plugins/vnc/vinagre-vnc-tab.c:597
+#: ../plugins/spice/vinagre-spice-tab.c:467
 msgid "Fits the remote screen into the current window size"
 msgstr "è®?é? 端è?¢å¹?è?½ç¬¦å??ç?®å??ç??è¦?çª?大å°?"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:609
+#: ../plugins/vnc/vinagre-vnc-tab.c:610
 msgid "_Keep Aspect Ratio"
 msgstr "ä¿?æ??é?·å¯¬æ¯?(_K)"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:610
+#: ../plugins/vnc/vinagre-vnc-tab.c:611
 msgid "Keeps the screen aspect ratio when using scaling"
 msgstr "使ç?¨ç¸®æ?¾æ??ä¿?æ??è?¢å¹?é?·å¯¬æ¯?"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:625
-#: ../plugins/spice/vinagre-spice-tab.c:507
+#: ../plugins/vnc/vinagre-vnc-tab.c:626
+#: ../plugins/spice/vinagre-spice-tab.c:508
 msgid "Does not send mouse and keyboard events"
 msgstr "ä¸?è¦?é??å?ºæ»?é¼ è??é?µç?¤äº?件"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:638
+#: ../plugins/vnc/vinagre-vnc-tab.c:639
 msgid "_Original size"
 msgstr "å??å§?大å°?(_O)"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:639
+#: ../plugins/vnc/vinagre-vnc-tab.c:640
 msgid "Adjusts the window to the remote desktop's size"
 msgstr "å°?è¦?çª?調æ?´ç?ºé? 端æ¡?é?¢ç??大å°?"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:652
+#: ../plugins/vnc/vinagre-vnc-tab.c:653
 msgid "_Refresh Screen"
 msgstr "é??æ?°æ?´ç??ç?«é?¢(_R)"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:653
+#: ../plugins/vnc/vinagre-vnc-tab.c:654
 msgid "Requests an update of the screen"
 msgstr "������"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:675
-#: ../plugins/spice/vinagre-spice-tab.c:530
+#: ../plugins/vnc/vinagre-vnc-tab.c:676
+#: ../plugins/spice/vinagre-spice-tab.c:531
 msgid "_Send Ctrl-Alt-Del"
 msgstr "å?³é?? Ctrl-Alt-Del(_S)"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:676
-#: ../plugins/spice/vinagre-spice-tab.c:531
-msgid "Sends Ctrl+Alt+Del to the remote machine"
-msgstr "å?³é?? Ctrl+Alt+Del å?°é? 端æ©?å?¨"
+#: ../plugins/vnc/vinagre-vnc-tab.c:677
+#: ../plugins/spice/vinagre-spice-tab.c:532
+msgid "Sends Ctrl+Alt+Del to the remote desktop"
+msgstr "å?³é?? Ctrl+Alt+Del å?°é? 端æ¡?é?¢"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:728 ../plugins/vnc/vinagre-vnc-tab.c:729
-#: ../plugins/spice/vinagre-spice-tab.c:583
+#: ../plugins/vnc/vinagre-vnc-tab.c:729 ../plugins/vnc/vinagre-vnc-tab.c:730
 #: ../plugins/spice/vinagre-spice-tab.c:584
+#: ../plugins/spice/vinagre-spice-tab.c:585
 msgid "Scaling"
 msgstr "正�縮�"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:738 ../plugins/vnc/vinagre-vnc-tab.c:739
-#: ../plugins/spice/vinagre-spice-tab.c:593
+#: ../plugins/vnc/vinagre-vnc-tab.c:739 ../plugins/vnc/vinagre-vnc-tab.c:740
 #: ../plugins/spice/vinagre-spice-tab.c:594
+#: ../plugins/spice/vinagre-spice-tab.c:595
 msgid "Read only"
 msgstr "��"
 
 #. Send Ctrl-alt-del
-#: ../plugins/vnc/vinagre-vnc-tab.c:747 ../plugins/vnc/vinagre-vnc-tab.c:749
-#: ../plugins/spice/vinagre-spice-tab.c:602
-#: ../plugins/spice/vinagre-spice-tab.c:604
+#: ../plugins/vnc/vinagre-vnc-tab.c:748 ../plugins/vnc/vinagre-vnc-tab.c:750
+#: ../plugins/spice/vinagre-spice-tab.c:603
+#: ../plugins/spice/vinagre-spice-tab.c:605
 msgid "Send Ctrl-Alt-Del"
 msgstr "å?³é?? Ctrl-Alt-Del"
 
-#: ../plugins/vnc/vinagre-vnc-tab.c:912
+#: ../plugins/vnc/vinagre-vnc-tab.c:913
 msgid ""
 "Scaling is not supported on this installation.\n"
 "\n"
@@ -567,16 +609,16 @@ msgstr ""
 "\n"
 "IPv6ï¼?"
 
-#: ../plugins/reverse-vnc/vinagre-reverse-vnc-listener-dialog.c:172
+#: ../plugins/reverse-vnc/vinagre-reverse-vnc-listener-dialog.c:173
 #, c-format
 msgid "On the port %d"
 msgstr "æ?¼é?£æ?¥å?  %d"
 
-#: ../plugins/reverse-vnc/vinagre-reverse-vnc-listener.c:211
+#: ../plugins/reverse-vnc/vinagre-reverse-vnc-listener.c:212
 msgid "Error activating reverse connections"
 msgstr "使ç?¨å??å??é?£ç·?æ??ç?¼ç??é?¯èª¤"
 
-#: ../plugins/reverse-vnc/vinagre-reverse-vnc-listener.c:212
+#: ../plugins/reverse-vnc/vinagre-reverse-vnc-listener.c:213
 msgid ""
 "The program could not find any available TCP ports starting at 5500. Is "
 "there any other running program consuming all your TCP ports?"
@@ -586,7 +628,7 @@ msgstr ""
 
 #. Translators: "Reverse" here is an adjective, not a verb.
 #: ../plugins/reverse-vnc/vinagre-reverse-vnc-plugin.c:69
-msgid "_Reverse Connections..."
+msgid "_Reverse Connectionsâ?¦"
 msgstr "å??å??é?£ç·?(_R)â?¦"
 
 #: ../plugins/reverse-vnc/vinagre-reverse-vnc-plugin.c:71
@@ -627,13 +669,13 @@ msgstr "SPICE é?¸é ?"
 
 #. Resize guest check button
 #: ../plugins/spice/vinagre-spice-plugin.c:230
-#: ../plugins/spice/vinagre-spice-tab.c:479
+#: ../plugins/spice/vinagre-spice-tab.c:480
 msgid "_Resize guest"
 msgstr "��訪客端大�(_R)"
 
 #. Clipboard sharing check button
 #: ../plugins/spice/vinagre-spice-plugin.c:238
-#: ../plugins/spice/vinagre-spice-tab.c:492
+#: ../plugins/spice/vinagre-spice-tab.c:493
 msgid "_Share clipboard"
 msgstr "å??享å?ªè²¼ç°¿(_S)"
 
@@ -647,23 +689,23 @@ msgstr "é?¸æ??æ?§ç??"
 msgid "Spice Files"
 msgstr "Spice ��"
 
-#: ../plugins/spice/vinagre-spice-tab.c:480
+#: ../plugins/spice/vinagre-spice-tab.c:481
 msgid "Resize the screen guest to best fit"
 msgstr "å°?訪客端è?¢å¹?æ?¹è®?ç?ºæ??é?©å??ç??大å°?"
 
-#: ../plugins/spice/vinagre-spice-tab.c:493
+#: ../plugins/spice/vinagre-spice-tab.c:494
 msgid "Automatically share clipboard between client and guest"
 msgstr "è?ªå??å?¨å®¢æ?¶ç«¯è??訪客端ä¹?é??å??享å?ªè²¼ç°¿"
 
 #. vim: set ts=8:
 #: ../plugins/reverse-vnc/reverse-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."
+"By activating reverse connections you can access remote desktops that are "
+"behind a firewall. The remote side is supposed to initiate the connection "
+"with you. For further information, read the help."
 msgstr ""
-"å??ç?¨å??å??é?£ç·?è?½è®?æ?¨å­?å??ä½?æ?¼é?²ç?«ç??å¾?ç??æ©?å?¨ã??é? 端æ©?å?¨æ??該æ??èµ·å§?è??æ?¨ç??é?£ç·?ã??é??è¦?"
-"æ?´å¤?è³?è¨?ï¼?è«?æ?¥é?±æ±?å?©é?¸å?®ã??"
+"å??ç?¨å??å??é?£ç·?è?½è®?æ?¨å­?å??ä½?æ?¼é?²ç?«ç??å¾?ç??é? 端æ¡?é?¢ã??é? 端æ©?å?¨æ??該æ??èµ·å§?è??æ?¨ç??é?£ç·?ã??"
+"é??è¦?æ?´å¤?è³?è¨?ï¼?è«?æ?¥é?±æ±?å?©é?¸å?®ã??"
 
 #: ../plugins/reverse-vnc/reverse-vnc.ui.h:2
 msgid "Connectivity"
@@ -674,10 +716,10 @@ msgid "Reverse Connections"
 msgstr "å??å??é?£ç·?"
 
 #: ../plugins/reverse-vnc/reverse-vnc.ui.h:4
-msgid "This machine is reachable through the following IP address(es):"
-msgstr "é??å??é?»è?¦å?¯ä»¥é??é??ä¸?å?? IP ä½?å??使ç?¨ï¼?"
+msgid "This desktop is reachable through the following IP address(es):"
+msgstr "é??å??æ¡?é?¢å?¯ä»¥é??é??ä¸?å?? IP ä½?å??使ç?¨ï¼?"
 
-#. Translators: this is the reverse connection mode. "Always enabled" means it will be enabled by default in the program startup. You can see this string in the dialog Machine->Reverse connections.
+#. Translators: this is the reverse connection mode. "Always enabled" means it will be enabled by default in the program startup. You can see this string in the dialog Remote->Reverse connections.
 #: ../plugins/reverse-vnc/reverse-vnc.ui.h:6
 msgid "_Always Enabled"
 msgstr "æ°¸é? å??ç?¨(_A)"
@@ -700,176 +742,156 @@ msgstr "IM ç??æ??"
 msgid "Could not communicate to Telepathy. IM Status plugin will not work."
 msgstr "ç?¡æ³?é?£æ?¥å?° Telepathyã??IM ç??æ??å¤?æ??ç¨?å¼?å°?ç?¡æ³?é??ä½?ã??"
 
-#: ../vinagre/vinagre-applet.c:171 ../vinagre/vinagre-applet.c:255
-msgid "Could not run vinagre:"
-msgstr "ç?¡æ³?å?·è¡? vinagre:"
-
-#: ../vinagre/vinagre-applet.c:275
-msgid "Open Remote Desktop Viewer"
-msgstr "é??å??é? 端æ¡?é?¢æª¢è¦?å?¨"
-
-#: ../vinagre/vinagre-applet.c:321 ../vinagre/vinagre-ui.h:37
-msgid "_Help"
-msgstr "æ±?å?©(_H)"
-
-#: ../vinagre/vinagre-applet.c:322
-msgid "_About"
-msgstr "é??æ?¼(_A)"
-
-#: ../vinagre/vinagre-applet.c:340
-msgid "Access your bookmarks"
-msgstr "å­?å??æ?¨ç??æ?¸ç±¤"
-
-#: ../vinagre/vinagre-bookmarks.c:366
+#: ../vinagre/vinagre-bookmarks.c:367
 #, c-format
 msgid "Error while initializing bookmarks: %s"
 msgstr "å??å§?å??æ?¸ç±¤æ??é?¯èª¤ï¼?%s"
 
-#: ../vinagre/vinagre-bookmarks.c:373
+#: ../vinagre/vinagre-bookmarks.c:374
 msgid "Error while initializing bookmarks: The file seems to be empty"
 msgstr "å??å§?å??æ?¸ç±¤æ??ç?¼ç??é?¯èª¤ï¼?該æª?æ¡?ä¼¼ä¹?æ?¯ç©ºç??"
 
-#: ../vinagre/vinagre-bookmarks.c:380
+#: ../vinagre/vinagre-bookmarks.c:381
 msgid ""
 "Error while initializing bookmarks: The file is not a vinagre bookmarks file"
 msgstr "å??å§?å??æ?¸ç±¤æ??ç?¼ç??é?¯èª¤ï¼?該æª?æ¡?並é?? vinagre æ?¸ç±¤æª?æ¡?"
 
-#: ../vinagre/vinagre-bookmarks.c:453 ../vinagre/vinagre-bookmarks.c:460
+#: ../vinagre/vinagre-bookmarks.c:454 ../vinagre/vinagre-bookmarks.c:461
 msgid "Error while saving bookmarks: Failed to create the XML structure"
 msgstr "å?²å­?æ?¸ç±¤æ??ç?¼ç??é?¯èª¤ï¼?建ç«? XML çµ?æ§?失æ??"
 
-#: ../vinagre/vinagre-bookmarks.c:467 ../vinagre/vinagre-bookmarks.c:474
+#: ../vinagre/vinagre-bookmarks.c:468 ../vinagre/vinagre-bookmarks.c:475
 msgid "Error while saving bookmarks: Failed to initialize the XML structure"
 msgstr "å?²å­?æ?¸ç±¤æ??ç?¼ç??é?¯èª¤ï¼?å??å§?å?? XML çµ?æ§?失æ??"
 
-#: ../vinagre/vinagre-bookmarks.c:483
+#: ../vinagre/vinagre-bookmarks.c:484
 msgid "Error while saving bookmarks: Failed to finalize the XML structure"
 msgstr "å?²å­?æ?¸ç±¤æ??ç?¼ç??é?¯èª¤ï¼?çµ?æ?? XML çµ?æ§?失æ??"
 
-#: ../vinagre/vinagre-bookmarks.c:492
+#: ../vinagre/vinagre-bookmarks.c:493
 #, c-format
 msgid "Error while saving bookmarks: %s"
 msgstr "å?²å­?æ?¸ç±¤æ??é?¯èª¤ï¼?%s"
 
-#: ../vinagre/vinagre-bookmarks-migration.c:95
-#: ../vinagre/vinagre-bookmarks-migration.c:102
+#: ../vinagre/vinagre-bookmarks-migration.c:96
+#: ../vinagre/vinagre-bookmarks-migration.c:103
 msgid "Error while migrating bookmarks: Failed to create the XML structure"
 msgstr "å?¨è½?移æ?¸ç±¤æ??ç?¼ç??é?¯èª¤ï¼?建ç«? XML çµ?æ§?失æ??"
 
-#: ../vinagre/vinagre-bookmarks-migration.c:109
-#: ../vinagre/vinagre-bookmarks-migration.c:116
+#: ../vinagre/vinagre-bookmarks-migration.c:110
+#: ../vinagre/vinagre-bookmarks-migration.c:117
 msgid "Error while migrating bookmarks: Failed to initialize the XML structure"
 msgstr "å?¨è½?移æ?¸ç±¤æ??ç?¼ç??é?¯èª¤ï¼?å??å§?å?? XML çµ?æ§?失æ??"
 
-#: ../vinagre/vinagre-bookmarks-migration.c:125
+#: ../vinagre/vinagre-bookmarks-migration.c:126
 msgid "Error while migrating bookmarks: Failed to finalize the XML structure"
 msgstr "å?¨è½?移æ?¸ç±¤æ??ç?¼ç??é?¯èª¤ï¼?çµ?æ?? XML çµ?æ§?失æ??"
 
-#: ../vinagre/vinagre-bookmarks-migration.c:135
-#: ../vinagre/vinagre-bookmarks-migration.c:216
+#: ../vinagre/vinagre-bookmarks-migration.c:136
+#: ../vinagre/vinagre-bookmarks-migration.c:217
 #, c-format
 msgid "Error while migrating bookmarks: %s"
 msgstr "è½?移æ?¸ç±¤æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: ../vinagre/vinagre-bookmarks-migration.c:164
+#: ../vinagre/vinagre-bookmarks-migration.c:165
 msgid "Error while migrating bookmarks: VNC plugin is not activated"
 msgstr "è½?移æ?¸ç±¤æ??ç?¼ç??é?¯èª¤ï¼?å°?æ?ªä½¿ç?¨ VNC å¤?æ??ç¨?å¼?"
 
-#: ../vinagre/vinagre-bookmarks-migration.c:216
+#: ../vinagre/vinagre-bookmarks-migration.c:217
 msgid "Failed to create the directory"
 msgstr "建ç«?ç?®é??失æ??"
 
-#: ../vinagre/vinagre-bookmarks-migration.c:241
+#: ../vinagre/vinagre-bookmarks-migration.c:242
 msgid ""
 "Migrating the bookmarks file to the new format. This operation is only "
 "supposed to run once."
 msgstr "æ­£å?¨å°?æ?¸ç±¤æª?æ¡?è½?移ç?ºæ?°ç??æ ¼å¼?ã??é??å??æ??ä½?å?ªè?½å?·è¡?ä¸?次ã??"
 
-#: ../vinagre/vinagre-bookmarks-migration.c:249
+#: ../vinagre/vinagre-bookmarks-migration.c:250
 #, c-format
 msgid "Error opening old bookmarks file: %s"
 msgstr "é??å??è??ç??æ?¸ç±¤æª?æ¡?æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: ../vinagre/vinagre-bookmarks-migration.c:250
-#: ../vinagre/vinagre-bookmarks-migration.c:262
+#: ../vinagre/vinagre-bookmarks-migration.c:251
+#: ../vinagre/vinagre-bookmarks-migration.c:263
 msgid "Migration cancelled"
 msgstr "è½?移ç¨?åº?å·²å??æ¶?"
 
-#: ../vinagre/vinagre-bookmarks-migration.c:259
+#: ../vinagre/vinagre-bookmarks-migration.c:260
 msgid "Could not remove the old bookmarks file"
 msgstr "ç?¡æ³?移é?¤è??ç??æ?¸ç±¤æª?æ¡?"
 
-#: ../vinagre/vinagre-bookmarks-tree.c:119
+#: ../vinagre/vinagre-bookmarks-tree.c:120
 msgid "Root Folder"
 msgstr "æ ¹è³?æ??夾"
 
-#: ../vinagre/vinagre-bookmarks-ui.c:77
+#: ../vinagre/vinagre-bookmarks-ui.c:78
 msgid "Invalid name for this folder"
 msgstr "é??å??è³?æ??夾ç??å??稱ç?¡æ??"
 
-#: ../vinagre/vinagre-bookmarks-ui.c:87 ../vinagre/vinagre-bookmarks-ui.c:199
+#: ../vinagre/vinagre-bookmarks-ui.c:88 ../vinagre/vinagre-bookmarks-ui.c:200
 #, c-format
 msgid ""
 "The name \"%s\" is already used in this folder. Please use a different name."
 msgstr "é??å??ç?®é??å?§å·²ç¶?æ??å??ç?ºã??%sã??ç??é ?ç?®ã??è«?使ç?¨å?¶ä»?å??稱ã??"
 
-#: ../vinagre/vinagre-bookmarks-ui.c:88 ../vinagre/vinagre-bookmarks-ui.c:189
-#: ../vinagre/vinagre-bookmarks-ui.c:200
+#: ../vinagre/vinagre-bookmarks-ui.c:89 ../vinagre/vinagre-bookmarks-ui.c:190
+#: ../vinagre/vinagre-bookmarks-ui.c:201
 msgid "Invalid name for this item"
 msgstr "é??å??é ?ç?®ç??å??稱ç?¡æ??"
 
 #. Translators: %s is a protocol name, like VNC or SSH
-#: ../vinagre/vinagre-bookmarks-ui.c:167
+#: ../vinagre/vinagre-bookmarks-ui.c:168
 #, c-format
 msgid "(Protocol: %s)"
 msgstr "(é??è¨?å??å®?ï¼?%s)"
 
 #. Translators: %s is a bookmark entry name
-#: ../vinagre/vinagre-bookmarks-ui.c:305
+#: ../vinagre/vinagre-bookmarks-ui.c:306
 #, c-format
 msgid "Are you sure you want to remove %s from bookmarks?"
 msgstr "�確����籤中移� %s�"
 
-#: ../vinagre/vinagre-bookmarks-ui.c:311
+#: ../vinagre/vinagre-bookmarks-ui.c:312
 msgid "Remove Folder?"
 msgstr "æ?¯å?¦ç§»é?¤è³?æ??夾ï¼?"
 
-#: ../vinagre/vinagre-bookmarks-ui.c:312
-msgid "Notice that all its subfolders and items will be removed as well."
-msgstr "注æ??å®?æ??æ??ç??å­?è³?æ??夾å??é ?ç?®ä¹?æ??被移é?¤ã??"
+#: ../vinagre/vinagre-bookmarks-ui.c:313
+msgid "Note that all its subfolders and bookmarks will be removed as well."
+msgstr "注æ??å®?æ??æ??ç??å­?è³?æ??夾å??æ?¸ç±¤ä¹?æ??被移é?¤ã??"
 
-#: ../vinagre/vinagre-bookmarks-ui.c:317
+#: ../vinagre/vinagre-bookmarks-ui.c:318
 msgid "Remove Item?"
 msgstr "æ?¯å?¦ç§»é?¤é ?ç?®ï¼?"
 
-#: ../vinagre/vinagre-bookmarks-ui.c:334
+#: ../vinagre/vinagre-bookmarks-ui.c:335
 msgid "Error removing bookmark: Entry not found"
 msgstr "移é?¤æ?¸ç±¤æ??ç?¼ç??é?¯èª¤ï¼?æ?¾ä¸?å?°é ?ç?®"
 
-#: ../vinagre/vinagre-bookmarks-ui.c:351
+#: ../vinagre/vinagre-bookmarks-ui.c:352
 msgid "New Folder"
 msgstr "æ?°å¢?è³?æ??夾"
 
-#: ../vinagre/vinagre-cache-prefs.c:56
+#: ../vinagre/vinagre-cache-prefs.c:57
 #, c-format
 msgid "Error while saving preferences: %s"
 msgstr "ç?¶å?²å­?å??好設å®?æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: ../vinagre/vinagre-commands.c:122
+#: ../vinagre/vinagre-commands.c:130
 msgid "Choose the file"
 msgstr "é?¸æ??æ??件"
 
-#: ../vinagre/vinagre-commands.c:146
+#: ../vinagre/vinagre-commands.c:154
 msgid "There are no supported files"
 msgstr "é??裡æ²?æ??æ?¯æ?´ç??æª?æ¡?"
 
-#: ../vinagre/vinagre-commands.c:147
+#: ../vinagre/vinagre-commands.c:155
 msgid ""
 "None of the active plugins support this action. Activate some plugins and "
 "try again."
 msgstr "使ç?¨ä¸­ç??å¤?æ??ç¨?å¼?æ²?æ??æ?¯æ?´é??å??å??ä½?ã??è«?使ç?¨å?¶ä»?å¤?æ??ç¨?å¼?å¾?å??試ä¸?次ã??"
 
-#: ../vinagre/vinagre-commands.c:181
+#: ../vinagre/vinagre-commands.c:189
 msgid "The following file could not be opened:"
 msgid_plural "The following files could not be opened:"
 msgstr[0] "ç?¡æ³?é??å??ä¸?å??æ??件ï¼?"
@@ -889,22 +911,22 @@ msgstr "å?²å­?æ­·å?²ç´?é??æª?æ¡?æ??ç?¼ç??é?¯èª¤ï¼?%s"
 msgid "Choose a Remote Desktop"
 msgstr "é?¸æ??ä¸?å??é? 端æ¡?é?¢"
 
-#: ../vinagre/vinagre-connection.c:524 ../vinagre/vinagre-tab.c:573
-#: ../vinagre/vinagre-tube-handler.c:254
+#: ../vinagre/vinagre-connection.c:525 ../vinagre/vinagre-tab.c:573
+#: ../vinagre/vinagre-tube-handler.c:255
 #, c-format
 msgid "The protocol %s is not supported."
 msgstr "æ?ªæ?¯æ?´é??è¨?å??å®? %s ã??"
 
-#: ../vinagre/vinagre-connection.c:632
+#: ../vinagre/vinagre-connection.c:633
 msgid "Could not open the file."
 msgstr "ç?¡æ³?é??å??該æª?æ¡?ã??"
 
-#: ../vinagre/vinagre-connection.c:656
+#: ../vinagre/vinagre-connection.c:657
 msgid "The file was not recognized by any of the plugins."
 msgstr "該æª?æ¡?ç?¡æ³?被任ä½?å¤?æ??ç¨?å¼?辨è­?ã??"
 
 #: ../vinagre/vinagre-fav.c:569
-msgid "_New Folder"
+msgid "_New folder"
 msgstr "æ?°å¢?è³?æ??夾(_N)"
 
 #: ../vinagre/vinagre-fav.c:570
@@ -916,8 +938,8 @@ msgid "_Open bookmark"
 msgstr "é??å??æ?¸ç±¤(_O)"
 
 #: ../vinagre/vinagre-fav.c:576
-msgid "Connect to this machine"
-msgstr "���此��"
+msgid "Connect to this remote desktop"
+msgstr "é?£ç·?å?°é??å??é? 端æ¡?é?¢"
 
 #: ../vinagre/vinagre-fav.c:577
 msgid "_Edit bookmark"
@@ -935,7 +957,7 @@ msgstr "��籤中移�(_R)"
 msgid "Remove current selected connection from bookmarks"
 msgstr "å¾?æ?¸ç±¤ä¸­ç§»é?¤ç?¶å??é?¸æ??ç??é?£ç·?"
 
-#: ../vinagre/vinagre-fav.c:597 ../vinagre/vinagre-window.c:408
+#: ../vinagre/vinagre-fav.c:597 ../vinagre/vinagre-window.c:410
 #, c-format
 msgid "Could not merge UI XML file: %s"
 msgstr "ç?¡æ³?å??ä½µ UI XML æª?æ¡?ï¼?%s"
@@ -948,11 +970,11 @@ msgstr "ç?¡æ??ç??æ??ä½?"
 msgid "Data received from drag&drop operation is invalid."
 msgstr "å¾?æ??æ?¾æ??ä½?中å??å??ç??è³?æ??æ?¯ç?¡æ??ç??ã??"
 
-#: ../vinagre/vinagre-fav.c:868
+#: ../vinagre/vinagre-fav.c:894
 msgid "Hide panel"
 msgstr "é?±è??é?¢æ?¿"
 
-#: ../vinagre/vinagre-fav.c:1073
+#: ../vinagre/vinagre-fav.c:1099
 msgid "Hosts nearby"
 msgstr "è?¨è¿?ç??主æ©?"
 
@@ -961,28 +983,28 @@ msgstr "è?¨è¿?ç??主æ©?"
 msgid "- Remote Desktop Viewer"
 msgstr "- é? 端æ¡?é?¢æª¢è¦?å?¨"
 
-#: ../vinagre/vinagre-mdns.c:171
+#: ../vinagre/vinagre-mdns.c:172
 #, c-format
 msgid "Failed to resolve avahi hostname: %s\n"
 msgstr "解æ?? avahi 主æ©?å??稱失æ??ï¼?%s\n"
 
-#: ../vinagre/vinagre-mdns.c:225
+#: ../vinagre/vinagre-mdns.c:226
 #, c-format
 msgid "The service %s was already registered by another plugin."
 msgstr "æ??å?? %s å·²ç¶?被å?¦ä¸?å??å¤?æ??ç¨?å¼?註å??äº?ã??"
 
-#: ../vinagre/vinagre-mdns.c:233
+#: ../vinagre/vinagre-mdns.c:234
 #, c-format
 msgid "Failed to add mDNS browser for service %s."
 msgstr "å°? mDNS ç??覽å?¨å? å?¥æ??å?? %s失æ??ã??"
 
-#. Translators: "Browse for hosts" means the ability to find/locate some machines [with the VNC service enabled] in the local network
-#: ../vinagre/vinagre-mdns.c:250
+#. Translators: "Browse for hosts" means the ability to find/locate some remote hosts [with the VNC service enabled] in the local network
+#: ../vinagre/vinagre-mdns.c:251
 #, c-format
 msgid "Failed to browse for hosts: %s\n"
 msgstr "ç??覽主æ©?失æ??ï¼?%s\n"
 
-#: ../vinagre/vinagre-mdns.c:319
+#: ../vinagre/vinagre-mdns.c:320
 #, c-format
 msgid "Failed to initialize mDNS browser: %s\n"
 msgstr "å??å§?å?? mDNS ç??覽å?¨å¤±æ??ï¼?%s\n"
@@ -1011,45 +1033,55 @@ msgstr "é©?è­?失æ??"
 msgid "Connecting..."
 msgstr "正����"
 
-#: ../vinagre/vinagre-notebook.c:554 ../vinagre/vinagre-tab.c:354
+#: ../vinagre/vinagre-notebook.c:554
 msgid "Close connection"
 msgstr "é??é??é?£ç·?"
 
 #. Translators: this is a command line option (run vinagre --help)
-#: ../vinagre/vinagre-options.c:31
-msgid "Open vinagre in fullscreen mode"
-msgstr "以å?¨è?¢å¹?模å¼?é??å?? vinagre"
+#: ../vinagre/vinagre-options.c:32
+msgid "Specify geometry of the main Vinagre window"
+msgstr "æ??å®?主è¦? Vinagre è¦?çª?ç??ä½?置大å°?"
 
 #. Translators: this is a command line option (run vinagre --help)
-#: ../vinagre/vinagre-options.c:35
-msgid "Create a new toplevel window in an existing instance of vinagre"
-msgstr "å?¨æ?¢å­?ç?? vinagre 實é«?中建ç«?æ?°ç??é ?層è¦?çª?"
+#: ../vinagre/vinagre-options.c:36
+msgid "Open Vinagre in fullscreen mode"
+msgstr "以å?¨è?¢å¹?模å¼?é??å?? Vinagre"
 
 #. Translators: this is a command line option (run vinagre --help)
-#: ../vinagre/vinagre-options.c:39
-msgid "Open a file recognized by vinagre"
-msgstr "é??å?? vinagre å?¯è¾¨è­?ç??æª?æ¡?"
+#: ../vinagre/vinagre-options.c:40
+msgid "Create a new toplevel window in an existing instance of Vinagre"
+msgstr "å?¨ç?¾æ??ç?? Vinagre 實é«?中建ç«?æ?°ç??é ?層è¦?çª?"
 
-#: ../vinagre/vinagre-options.c:39
+#. Translators: this is a command line option (run vinagre --help)
+#: ../vinagre/vinagre-options.c:44
+msgid "Open a file recognized by Vinagre"
+msgstr "é??å?? Vinagre å?¯è¾¨è­?ç??æª?æ¡?"
+
+#: ../vinagre/vinagre-options.c:44
 msgid "filename"
 msgstr "æª?æ¡?å??稱"
 
 #. Translators: this is a command line option (run vinagre --help)
-#: ../vinagre/vinagre-options.c:44
+#: ../vinagre/vinagre-options.c:49
 msgid "[server:port]"
 msgstr "[伺æ??å?¨:å? å?£]"
 
-#: ../vinagre/vinagre-options.c:125
+#: ../vinagre/vinagre-options.c:123
+#, c-format
+msgid "Invalid argument %s for --geometry"
+msgstr "å¼?æ?¸ %s å°? --geometry æ?¯ç?¡æ??ç??"
+
+#: ../vinagre/vinagre-options.c:141
 msgid "The following error has occurred:"
 msgid_plural "The following errors have occurred:"
 msgstr[0] "ç?¼ç??ä¸?å??é?¯èª¤ï¼?"
 msgstr[1] "ç?¼ç??ä¸?å??é?¯èª¤ï¼?"
 
-#: ../vinagre/vinagre-plugin-dialog.c:71
+#: ../vinagre/vinagre-plugin-dialog.c:72
 msgid "Plugin Manager"
 msgstr "å¤?æ??ç¨?å¼?管ç??å?¡"
 
-#: ../vinagre/vinagre-prefs.c:87
+#: ../vinagre/vinagre-prefs.c:88
 msgid "Cannot initialize preferences manager."
 msgstr "ç?¡æ³?å??å§?å??å??好設å®?管ç??å?¡ã??"
 
@@ -1094,16 +1126,16 @@ msgstr "å??æ¶?ç?»å?¥"
 #: ../vinagre/vinagre-ssh.c:488
 #, 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"
+"The identity of the remote host (%s) is unknown.\n"
+"This happens when you log in to a host the first time.\n"
 "\n"
-"The identity sent by the remote computer is %s. If you want to be absolutely "
+"The identity sent by the remote host is %s. If you want to be absolutely "
 "sure it is safe to continue, contact the system administrator."
 msgstr ""
-"é? 端é?»è?¦ (%s) ç??è­?å?¥ä¸?æ??ã??\n"
+"é? 端主æ©? (%s) ç??è­?å?¥ä¸?æ??ã??\n"
 "é??é??常ç?¼ç??å?¨æ?¨ç¬¬ä¸?次ç?»å?¥é?»è?¦ç??æ??å??ã??\n"
 "\n"
-"ç?±é? 端é?»è?¦å?³é??ç??è­?å?¥ç?º %sã??å¦?æ??æ?¨æ?³è¦?å®?å?¨ç¢ºå®?ç¹¼çº?æ?¯å®?å?¨ç??ï¼?è«?é?£çµ¡ç³»çµ±ç®¡ç??è??ã??"
+"ç?±é? 端主æ©?å?³é??ç??è­?å?¥ç?º %sã??å¦?æ??æ?¨æ?³è¦?å®?å?¨ç¢ºå®?ç¹¼çº?æ?¯å®?å?¨ç??ï¼?è«?é?£çµ¡ç³»çµ±ç®¡ç??è??ã??"
 
 #: ../vinagre/vinagre-ssh.c:506
 msgid "Login dialog canceled"
@@ -1137,6 +1169,10 @@ msgstr "主æ©?é??é?°é©?è­?失æ??"
 msgid "Unable to find a valid SSH program"
 msgstr "æ?¾ä¸?å?°æ??æ??ç?? SSH ç¨?å¼?"
 
+#: ../vinagre/vinagre-tab.c:354
+msgid "Disconnect"
+msgstr "æ?·ç·?"
+
 #: ../vinagre/vinagre-tab.c:375
 msgid "Leave fullscreen"
 msgstr "é?¢é??å?¨è?¢å¹?"
@@ -1163,45 +1199,45 @@ msgstr "%s ç??ç?«é?¢å¿«ç?§"
 msgid "Error saving screenshot"
 msgstr "å?²å­?ç?«é?¢å¿«ç?§æ??ç?¼ç??é?¯èª¤"
 
-#: ../vinagre/vinagre-tube-handler.c:230
+#: ../vinagre/vinagre-tube-handler.c:231
 #, c-format
 msgid "Impossible to get service property: %s"
 msgstr "ä¸?å?¯è?½å??å¾?æ??å??屬æ?§ï¼?%s"
 
-#: ../vinagre/vinagre-tube-handler.c:287
+#: ../vinagre/vinagre-tube-handler.c:288
 #, c-format
 msgid "Impossible to create the connection: %s"
 msgstr "���建����%s"
 
-#: ../vinagre/vinagre-tube-handler.c:326
+#: ../vinagre/vinagre-tube-handler.c:327
 #, c-format
 msgid "Impossible to accept the stream tube: %s"
 msgstr "ä¸?å?¯è?½æ?¥å??串æµ?管ï¼?%s"
 
 #. Translators: this is an error message when we fail to get the name of an empathy/telepathy buddy. %s will be replaced by the actual error message.
-#: ../vinagre/vinagre-tube-handler.c:464
+#: ../vinagre/vinagre-tube-handler.c:465
 #, c-format
 msgid "Impossible to get the contact name: %s"
 msgstr "ä¸?å?¯è?½å??å¾?é?£çµ¡äººå??稱ï¼?%s"
 
-#: ../vinagre/vinagre-tube-handler.c:501
+#: ../vinagre/vinagre-tube-handler.c:502
 #, c-format
 msgid "Impossible to get the avatar: %s"
 msgstr "ä¸?å?¯è?½å??å¾?å¤§é ­è²¼ï¼?%s"
 
-#: ../vinagre/vinagre-tube-handler.c:522
+#: ../vinagre/vinagre-tube-handler.c:523
 #, c-format
 msgid "%s wants to share their desktop with you."
 msgstr "%s æ?³è¦?è??æ?¨å??享ä»?å??ç??æ¡?é?¢ã??"
 
-#: ../vinagre/vinagre-tube-handler.c:527
+#: ../vinagre/vinagre-tube-handler.c:528
 msgid "Desktop sharing invitation"
 msgstr "æ¡?é?¢å?±äº«é??è«?"
 
 #. Toplevel
 #: ../vinagre/vinagre-ui.h:33
-msgid "_Machine"
-msgstr "æ©?å?¨(_M)"
+msgid "_Remote"
+msgstr "é? 端(_R)"
 
 #: ../vinagre/vinagre-ui.h:34
 msgid "_Edit"
@@ -1215,9 +1251,13 @@ msgstr "檢�(_V)"
 msgid "_Bookmarks"
 msgstr "�籤(_B)"
 
+#: ../vinagre/vinagre-ui.h:37
+msgid "_Help"
+msgstr "æ±?å?©(_H)"
+
 #: ../vinagre/vinagre-ui.h:41
-msgid "Connect to a remote machine"
-msgstr "é?£ç·?å?°é? 端æ©?å?¨"
+msgid "Connect to a remote desktop"
+msgstr "é?£ç·?å?°é? 端æ¡?é?¢"
 
 #: ../vinagre/vinagre-ui.h:43
 msgid "Open a .VNC file"
@@ -1231,142 +1271,125 @@ msgstr "çµ?æ??ç¨?å¼?"
 msgid "Edit the application preferences"
 msgstr "編輯æ??ç?¨ç¨?å¼?å??好設å®?"
 
-#: ../vinagre/vinagre-ui.h:50
+#. TODO: Use a more appropriate icon. Libpeas uses "libpeas-plugin".
+#: ../vinagre/vinagre-ui.h:51
 msgid "_Plugins"
 msgstr "å¤?æ??ç¨?å¼?(_P)"
 
-#: ../vinagre/vinagre-ui.h:51
-msgid "Select plugins"
-msgstr "é?¸æ??å¤?æ??ç¨?å¼?"
+#: ../vinagre/vinagre-ui.h:52
+msgid "Select active plugins"
+msgstr "é?¸æ??使ç?¨ä¸­ç??å¤?æ??ç¨?å¼?"
 
 #. Help menu
-#: ../vinagre/vinagre-ui.h:54
+#: ../vinagre/vinagre-ui.h:55
 msgid "_Contents"
 msgstr "�容(_C)"
 
-#: ../vinagre/vinagre-ui.h:55
-msgid "Open the vinagre manual"
-msgstr "é??å?? vinagre æ??å??"
+#: ../vinagre/vinagre-ui.h:56
+msgid "Open the Vinagre manual"
+msgstr "é??å?? Vinagre æ??å??"
 
-#: ../vinagre/vinagre-ui.h:57
+#: ../vinagre/vinagre-ui.h:58
 msgid "About this application"
 msgstr "é??æ?¼æ­¤ç¨?å¼?"
 
-#: ../vinagre/vinagre-ui.h:62
+#: ../vinagre/vinagre-ui.h:63
 msgid "_Toolbar"
 msgstr "å·¥å?·å??(_T)"
 
-#: ../vinagre/vinagre-ui.h:63
+#: ../vinagre/vinagre-ui.h:64
 msgid "Show or hide the toolbar"
 msgstr "顯示æ??é?±è??å·¥å?·å??"
 
-#: ../vinagre/vinagre-ui.h:66
+#: ../vinagre/vinagre-ui.h:67
 msgid "_Statusbar"
 msgstr "ç??æ??å??(_S)"
 
-#: ../vinagre/vinagre-ui.h:67
+#: ../vinagre/vinagre-ui.h:68
 msgid "Show or hide the statusbar"
 msgstr "顯示æ??é?±è??ç??æ??å??"
 
-#: ../vinagre/vinagre-ui.h:70
-msgid "Side _Panel"
-msgstr "å?´é??é?¢æ?¿(_P)"
-
 #: ../vinagre/vinagre-ui.h:71
-msgid "Show or hide the side panel"
-msgstr "顯示æ??é?±è??å?´é??é?¢æ?¿"
+msgid "Side _Pane"
+msgstr "å?´é??çª?æ ¼(_P)"
 
-#: ../vinagre/vinagre-ui.h:79
-msgid "Close the current connection"
-msgstr "é??é??ç?¶å??é?£ç·?"
+#: ../vinagre/vinagre-ui.h:72
+msgid "Show or hide the side pane"
+msgstr "顯示æ??é?±è??å?´é??çª?æ ¼"
 
 #: ../vinagre/vinagre-ui.h:80
-msgid "C_lose All"
-msgstr "å?¨é?¨é??é??(_L)"
+msgid "Disconnect the current connection"
+msgstr "é??é??ç?®å??é?£ç·?"
 
 #: ../vinagre/vinagre-ui.h:81
-msgid "Close all active connections"
-msgstr "é??é??å?¨é?¨æ´»å??中ç??é?£ç·?"
+msgid "Disconnect All"
+msgstr "����"
 
-#. Bookmarks menu
-#: ../vinagre/vinagre-ui.h:84
-msgid "_Add to bookmarks"
-msgstr "����籤(_A)"
+#: ../vinagre/vinagre-ui.h:82
+msgid "Disconnect all connections"
+msgstr "é??é??æ??æ??ç??é?£ç·?"
 
+#. Bookmarks menu
 #: ../vinagre/vinagre-ui.h:85
-msgid "Add current connection to your bookmarks"
-msgstr "æ?°å¢?ç?®å??é?£ç·?è?³æ?¨ç??æ?¸ç±¤"
+msgid "_Add Bookmark"
+msgstr "å? å?¥æ?¸ç±¤(_A)"
 
-#. Machine menu
-#: ../vinagre/vinagre-ui.h:92
-msgid "_Take screenshot"
-msgstr "æ??æ??è?¢å¹?æ?ªå??(_T)"
+#: ../vinagre/vinagre-ui.h:86
+msgid "Add the current connection to your bookmarks"
+msgstr "æ?°å¢?ç?®å??é?£ç·?è?³æ?¨ç??æ?¸ç±¤"
 
+#. Remote menu
 #: ../vinagre/vinagre-ui.h:93
-msgid "Take a screenshot of active connection"
-msgstr "æ?·å??æ´»å??é?£ç·?ç??ç?«é?¢å¿«ç?§"
+msgid "_Take Screenshot"
+msgstr "æ??æ??è?¢å¹?æ?ªå??(_T)"
 
-#: ../vinagre/vinagre-ui.h:97
-msgid "View the current machine in full screen"
-msgstr "以å?¨è?¢å¹?檢è¦?ç?¶å??æ©?å?¨"
+#: ../vinagre/vinagre-ui.h:94
+msgid "Take a screenshot of the current remote desktop"
+msgstr "æ?·å??ç?®å??é? 端æ¡?é?¢ç??è?¢å¹?æ?ªå??"
 
-#: ../vinagre/vinagre-utils.c:72
-msgid "An error has occurred:"
-msgstr "ç?¼ç??é?¯èª¤ï¼?"
+#: ../vinagre/vinagre-ui.h:98
+msgid "View the current remote desktop in fullscreen mode"
+msgstr "以å?¨è?¢å¹?檢è¦?ç?®å??ç??é? 端æ¡?é?¢"
 
-#: ../vinagre/vinagre-utils.c:161
+#: ../vinagre/vinagre-util.c:89
 msgid ""
 "A plugin tried to open an UI file but did not succeed, with the error "
 "message:"
 msgstr "æ??å¤?æ??ç¨?å¼?å??試é??å?? UI æª?æ¡?ä½?並æ?ªæ??å??ï¼?é?¯èª¤è¨?æ?¯ç?ºï¼?"
 
-#: ../vinagre/vinagre-utils.c:163
+#: ../vinagre/vinagre-util.c:91
 msgid ""
 "The program tried to open an UI file but did not succeed, with the error "
 "message:"
 msgstr "æ??ç¨?å¼?å??試é??å?? UI æª?æ¡?ä½?並æ?ªæ??å??ï¼?é?¯èª¤è¨?æ?¯ç?ºï¼?"
 
-#: ../vinagre/vinagre-utils.c:166
+#: ../vinagre/vinagre-util.c:94
 msgid "Please check your installation."
 msgstr "è«?檢æ?¥å®?è£?æ?¯å?¦æ­£ç¢ºã??"
 
-#: ../vinagre/vinagre-utils.c:167
+#: ../vinagre/vinagre-util.c:95
 msgid "Error loading UI file"
 msgstr "è¼?å?¥ UI æª?æ¡?æ??ç?¼ç??é?¯èª¤"
 
-#: ../vinagre/vinagre-utils.c:264
-msgid "Vinagre is a remote desktop viewer for the GNOME Desktop"
-msgstr "Vinagre æ?¯ GNOME æ¡?é?¢ç??é? 端æ¡?é?¢æª¢è¦?å?¨"
+#. Translators: %s is a protocol, like VNC or SSH
+#: ../vinagre/vinagre-util.c:255
+#, c-format
+msgid "%s authentication is required"
+msgstr "é??è¦? %s é©?è­?"
 
-#: ../vinagre/vinagre-utils.c:267
-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 "
-"Foundation; either version 2 of the License, or (at your option) any later "
-"version."
-msgstr ""
-"Vinagre æ?¯è?ªç?±è»?é«?ï¼?æ?¨å?¯ä»¥å?¨è?ªç?±è»?é«?å?ºé??æ??ç?¼è¡?ç?? GNU é??ç?¨å?¬å?±è¨±å?¯ç??æ¢?款ä¸?é??æ?°"
-"å??ç?¼å®?å??/æ??ä¿®æ?¹å®?ï¼?ç?¡è«?此許å?¯ç??ç??æ?¬2ï¼?æ??è??(以æ?¨ç??é?¸æ??)ä»»ä½?æ?´æ?°ç??ç??æ?¬ã??"
+#: ../vinagre/vinagre-utils.vala:24
+msgid "An error occurred"
+msgstr "ç?¼ç??é?¯èª¤"
 
-#: ../vinagre/vinagre-utils.c:271
-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 "
-"FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
-"details."
-msgstr ""
-"Vinagre 被ç?¼å¸?æ?¯å¸?æ??å®?è?½å¤ æ??æ??ç?¨è??ï¼?ä½?ã??æ²?æ??ä»»ä½?ä¿?è­?ã??ï¼?ç??è?³æ²?æ??é?±å?«ã??å?¯é?·"
-"å?®ã??æ??è??ã??ç?¨æ?¼ç?¹å®?ç?¨é??ã??ç??ä¿?è­?ã??è«?æ?¥ç?? GNU é??ç?¨å?¬å?±è¨±å?¯ä»¥ç?²å¾?æ?´å¤?ç´°ç¯?ã??"
+#: ../vinagre/vinagre-utils.vala:63
+msgid "Error showing help"
+msgstr "顯示æ±?å?©æ??ç?¼ç??é?¯èª¤"
 
-#: ../vinagre/vinagre-utils.c:275
-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.vala:77
+msgid "Vinagre is a remote desktop viewer for the GNOME Desktop"
+msgstr "Vinagre æ?¯ GNOME æ¡?é?¢ç??é? 端æ¡?é?¢æª¢è¦?å?¨"
 
-#: ../vinagre/vinagre-utils.c:292
+#: ../vinagre/vinagre-utils.vala:88
 msgid "translator-credits"
 msgstr ""
 "GNOME ç¨?å¼?中æ??å??é?µä»¶è«?å£?\n"
@@ -1374,35 +1397,29 @@ msgstr ""
 "\n"
 "Hialan Liu <hialan liu gmail com>, 2008"
 
-#: ../vinagre/vinagre-utils.c:295
+#: ../vinagre/vinagre-utils.vala:91
 msgid "Vinagre Website"
 msgstr "Vinagre 網�"
 
-#. Translators: %s is a protocol, like VNC or SSH
-#: ../vinagre/vinagre-utils.c:407
-#, c-format
-msgid "%s authentication is required"
-msgstr "é??è¦? %s é©?è­?"
-
-#: ../vinagre/vinagre-window.c:439
-msgid "_Recent connections"
+#: ../vinagre/vinagre-window.c:441
+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:556
+#: ../vinagre/vinagre-window.c:558
 #, c-format
 msgid "Open %s:%d"
 msgstr "é??å?? %sï¼?%d"
 
-#: ../vinagre/vinagre-window.c:735
+#: ../vinagre/vinagre-window.c:737
 msgid "About menu accelerators and keyboard shortcuts"
 msgstr "é??æ?¼é?¸å?®è??é?µç?¤æ?·å¾?é?µ"
 
-#: ../vinagre/vinagre-window.c:737
+#: ../vinagre/vinagre-window.c:739
 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"
+"default. The reason is to avoid the keys from being intercepted by the "
+"program, and allow them to be sent to the remote desktop.\n"
 "\n"
 "You can change this behavior through the preferences dialog. For more "
 "information, check the documentation.\n"
@@ -1410,17 +1427,75 @@ msgid ""
 "This message will appear only once."
 msgstr ""
 "Vinagre é ?設å?³å??ç?¨é?¸å?®è??é?µç?¤æ?·å¾?é?µã??å??å? æ?¯ç?ºäº?é?¿å??æ??é?µè¢«ç¨?å¼?æ??æ?ªï¼?é??樣æ??è?½è®?"
-"æ??é?µé??è?³é? 端æ©?å?¨ã??\n"
+"æ??é?µé??è?³é? 端æ¡?é?¢ã??\n"
 "\n"
 "æ?¨å?¯ä»¥é??é??å??好設å®?å°?話ç??æ?¹è®?é??å??è¡?ç?ºã??é??è¦?æ?´å¤?è³?è¨?ï¼?è«?æ?¥é?±æ??件ã??\n"
 "\n"
 "é??å??è¨?æ?¯å?ªæ??å?ºç?¾ä¸?次ã??"
 
-#: ../vinagre/vinagre-window.c:745 ../vinagre/vinagre-window.c:751
+#: ../vinagre/vinagre-window.c:747 ../vinagre/vinagre-window.c:753
 #, c-format
 msgid "Error while creating the file %s: %s"
 msgstr "建ç«?æª?æ¡? %s æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
+#~ msgid "Which machine do you want to connect to?"
+#~ msgstr "æ?¨æ?³é?£ç·?å?°å?ªå??æ©?å?¨ï¼?"
+
+#~ msgid "Access MS Windows machines"
+#~ msgstr "å­?å?? MS Windows æ©?å?¨"
+
+#~ msgid "_Depth Color:"
+#~ msgstr "��深度(_D):"
+
+#~ msgid "_Reverse Connections..."
+#~ msgstr "å??å??é?£ç·?(_R)â?¦"
+
+#~ msgid "Could not run vinagre:"
+#~ msgstr "ç?¡æ³?å?·è¡? vinagre:"
+
+#~ msgid "Open Remote Desktop Viewer"
+#~ msgstr "é??å??é? 端æ¡?é?¢æª¢è¦?å?¨"
+
+#~ msgid "_About"
+#~ msgstr "é??æ?¼(_A)"
+
+#~ msgid "Access your bookmarks"
+#~ msgstr "å­?å??æ?¨ç??æ?¸ç±¤"
+
+#~ msgid "Connect to this machine"
+#~ msgstr "���此��"
+
+#~ msgid "_Machine"
+#~ msgstr "æ©?å?¨(_M)"
+
+#~ msgid "C_lose All"
+#~ msgstr "å?¨é?¨é??é??(_L)"
+
+#~ 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 Foundation; either version 2 of the License, or (at your option) "
+#~ "any later version."
+#~ msgstr ""
+#~ "Vinagre æ?¯è?ªç?±è»?é«?ï¼?æ?¨å?¯ä»¥å?¨è?ªç?±è»?é«?å?ºé??æ??ç?¼è¡?ç?? GNU é??ç?¨å?¬å?±è¨±å?¯ç??æ¢?款ä¸?"
+#~ "é??æ?°å??ç?¼å®?å??/æ??ä¿®æ?¹å®?ï¼?ç?¡è«?此許å?¯ç??ç??æ?¬2ï¼?æ??è??(以æ?¨ç??é?¸æ??)ä»»ä½?æ?´æ?°ç??ç??æ?¬ã??"
+
+#~ 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 FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+#~ "more details."
+#~ msgstr ""
+#~ "Vinagre 被ç?¼å¸?æ?¯å¸?æ??å®?è?½å¤ æ??æ??ç?¨è??ï¼?ä½?ã??æ²?æ??ä»»ä½?ä¿?è­?ã??ï¼?ç??è?³æ²?æ??é?±å?«ã??å?¯é?·"
+#~ "å?®ã??æ??è??ã??ç?¨æ?¼ç?¹å®?ç?¨é??ã??ç??ä¿?è­?ã??è«?æ?¥ç?? GNU é??ç?¨å?¬å?±è¨±å?¯ä»¥ç?²å¾?æ?´å¤?ç´°ç¯?ã??"
+
+#~ 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/>ã??"
+
 #~ msgid "The handler for \"vnc://\" URLs"
 #~ msgstr "ã??vnc://ã??網å??ç??è??ç??ç¨?å¼?"
 
@@ -1512,9 +1587,6 @@ msgstr "建ç«?æª?æ¡? %s æ??ç?¼ç??é?¯èª¤ï¼?%s"
 #~ msgid "<b>Editing a bookmark</b>"
 #~ msgstr "<b>編輯�籤</b>"
 
-#~ msgid "<b>Enter a name for this connection</b>"
-#~ msgstr "<b>ç?ºé??å??é?£ç·?輸å?¥å??稱</b>"
-
 #~ msgid ""
 #~ "<b>In order to connect on this machine, a password is required. Please "
 #~ "supply it.</b>"