[X2go-Commits] x2goclient.git - build-main (branch) updated: 3.99.0.6

[X2go dev team]

The branch, build-main has been updated
       via  0f17d81f3502f98ea5d3bd61ff19a6dd8d0e7a66 (commit)
       via  4e4adffaaf2d032cce55bd9aedf24b6034182481 (commit)
       via  cebb1bdee16a707e84740da7e9dd780835ff0941 (commit)
       via  489bcaca1d708c1b9cb87332950ea97af0af2293 (commit)
       via  fee08d6ae36649d6be6fbf1b2c8e7562020ba0e0 (commit)
      from  986a2d932a40c15530c2bc82fe68a01334e121d7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 VERSION                                 |    2 +-
 debian/changelog                        |   11 +
 desktop/x2goclient.desktop              |    2 +-
 resources.rcc                           |    1 +
 sshmasterconnection.cpp                 |   32 +-
 sshmasterconnection.h                   |   33 +-
 sshprocess.cpp                          |   33 +-
 sshprocess.h                            |   35 +-
 version.h                               |    2 +-
 x2goclient.pro                          |    1 +
 x2goclient_de.qm                        |  Bin 44533 -> 44873 bytes
 x2goclient_ru.qm                        |  Bin 42773 -> 43127 bytes
 x2goclient_zh_tw.qm                     |  Bin 0 -> 35103 bytes
 x2goclient_fr.ts => x2goclient_zh_tw.ts | 1894 ++++++++++++++++---------------
 x2goplugin.rc                           |   10 +-
 15 files changed, 1100 insertions(+), 956 deletions(-)
 create mode 100644 x2goclient_zh_tw.qm
 copy x2goclient_fr.ts => x2goclient_zh_tw.ts (52%)

The diff of changes is:
diff --git a/VERSION b/VERSION
index e98a62b..3504bc8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.99.0.5
+3.99.0.6
diff --git a/debian/changelog b/debian/changelog
index ff3a618..15c6e43 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+x2goclient (3.99.0.6-0~x2go1) unstable; urgency=low
+
+  [ Oleksandr Shneyder ]
+  * New upstream version (3.99.0.6):
+    - Update copyright section in ssmasterconnection.h/cpp and
+      sshprocess.h/cpp.
+    - Traditional Chinese(zh_TW) translation for x2goclient from
+      Liu Arlo <arlo.liu at atrustcorp.com>.
+
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 01 Feb 2012 13:52:40 +0100
+
 x2goclient (3.99.0.5-0~x2go1) unstable; urgency=low
 
   [ Mike Gabriel ]
diff --git a/desktop/x2goclient.desktop b/desktop/x2goclient.desktop
index 6b1bca9..477577b 100644
--- a/desktop/x2goclient.desktop
+++ b/desktop/x2goclient.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-Version=3.99.0.5
+Version=3.99.0.6
 Type=Application
 Name=X2Go Client
 Exec=/usr/bin/x2goclient
diff --git a/resources.rcc b/resources.rcc
index ebc6380..795cc0f 100644
--- a/resources.rcc
+++ b/resources.rcc
@@ -65,6 +65,7 @@
        <file>x2goclient_de.qm</file>
        <file>x2goclient_ru.qm</file>
        <file>x2goclient_fr.qm</file>
+       <file>x2goclient_zh_tw.qm</file>
        <file>qt_de.qm</file>
        <file>qt_ru.qm</file>
        <file>qt_fr.qm</file>
diff --git a/sshmasterconnection.cpp b/sshmasterconnection.cpp
index ef08cd8..c922af2 100644
--- a/sshmasterconnection.cpp
+++ b/sshmasterconnection.cpp
@@ -1,18 +1,24 @@
-/*
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public
-   License version 2 as published by the Free Software Foundation.
-
-   This library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public License
-   along with this library; see the file COPYING.LIB.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
+
+/***************************************************************************
+ *   Copyright (C) 2005-2012 by Oleksandr Shneyder   *
+ *   oleksandr.shneyder at obviously-nice.de   *
+ *                                                                         *
+ *   This program 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.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
 #include "x2goclientconfig.h"
 #include "x2gologdebug.h"
 #include "sshmasterconnection.h"
diff --git a/sshmasterconnection.h b/sshmasterconnection.h
index c5d79e1..379b6b2 100644
--- a/sshmasterconnection.h
+++ b/sshmasterconnection.h
@@ -1,18 +1,23 @@
-/*
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public
-   License version 2 as published by the Free Software Foundation.
 
-   This library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public License
-   along with this library; see the file COPYING.LIB.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
+/***************************************************************************
+ *   Copyright (C) 2005-2012 by Oleksandr Shneyder   *
+ *   oleksandr.shneyder at obviously-nice.de   *
+ *                                                                         *
+ *   This program 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.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
 
 #ifndef SSHMASTERCONNECTION_H
 #define SSHMASTERCONNECTION_H
diff --git a/sshprocess.cpp b/sshprocess.cpp
index b045fd0..e8f0ea6 100644
--- a/sshprocess.cpp
+++ b/sshprocess.cpp
@@ -1,18 +1,23 @@
-/*
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public
-   License version 2 as published by the Free Software Foundation.
-
-   This library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public License
-   along with this library; see the file COPYING.LIB.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
+
+/***************************************************************************
+ *   Copyright (C) 2005-2012 by Oleksandr Shneyder   *
+ *   oleksandr.shneyder at obviously-nice.de   *
+ *                                                                         *
+ *   This program 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.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
 
 #include "x2goclientconfig.h"
 #include "x2gologdebug.h"
diff --git a/sshprocess.h b/sshprocess.h
index 7a65e17..567bff9 100644
--- a/sshprocess.h
+++ b/sshprocess.h
@@ -1,18 +1,23 @@
-/*
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public
-   License version 2 as published by the Free Software Foundation.
 
-   This library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public License
-   along with this library; see the file COPYING.LIB.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
+/***************************************************************************
+ *   Copyright (C) 2005-2012 by Oleksandr Shneyder   *
+ *   oleksandr.shneyder at obviously-nice.de   *
+ *                                                                         *
+ *   This program 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.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
 
 #ifndef SSHPROCESS_H
 #define SSHPROCESS_H
diff --git a/version.h b/version.h
index 5647dc5..77743ab 100644
--- a/version.h
+++ b/version.h
@@ -1 +1 @@
-#define VERSION "3.99.0.5"
+#define VERSION "3.99.0.6"
diff --git a/x2goclient.pro b/x2goclient.pro
index 5246b79..8c71ee3 100755
--- a/x2goclient.pro
+++ b/x2goclient.pro
@@ -15,6 +15,7 @@ FORMS += cupsprintsettingsdialog.ui cupsprintwidget.ui printdialog.ui printercmd
 TRANSLATIONS += x2goclient_de.ts 
 TRANSLATIONS += x2goclient_ru.ts 
 TRANSLATIONS += x2goclient_fr.ts 
+TRANSLATIONS += x2goclient_zh_tw.ts
 HEADERS += configdialog.h \
            editconnectiondialog.h \
            exportdialog.h \
diff --git a/x2goclient_de.qm b/x2goclient_de.qm
index d00b720..03d7acc 100644
Binary files a/x2goclient_de.qm and b/x2goclient_de.qm differ
diff --git a/x2goclient_ru.qm b/x2goclient_ru.qm
index 10f6d53..1dd3769 100644
Binary files a/x2goclient_ru.qm and b/x2goclient_ru.qm differ
diff --git a/x2goclient_zh_tw.qm b/x2goclient_zh_tw.qm
new file mode 100644
index 0000000..89a9d60
Binary files /dev/null and b/x2goclient_zh_tw.qm differ
diff --git a/x2goclient_fr.ts b/x2goclient_zh_tw.ts
similarity index 52%
copy from x2goclient_fr.ts
copy to x2goclient_zh_tw.ts
index 1cd6797..d5669c1 100644
--- a/x2goclient_fr.ts
+++ b/x2goclient_zh_tw.ts
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0">
+<TS version="2.0" language="zh_TW">
 <context>
     <name>BrokerPassDialogUi</name>
     <message>
         <location filename="brokerpassdialog.ui" line="14"/>
         <source>Dialog</source>
-        <translation type="unfinished"></translation>
+        <translation>對話框</translation>
     </message>
     <message>
         <location filename="brokerpassdialog.ui" line="22"/>
         <source>Old password:</source>
-        <translation type="unfinished"></translation>
+        <translation>舊密碼:</translation>
     </message>
     <message>
         <location filename="brokerpassdialog.ui" line="36"/>
         <source>New password:</source>
-        <translation type="unfinished"></translation>
+        <translation>新密碼:</translation>
     </message>
     <message>
         <location filename="brokerpassdialog.ui" line="50"/>
         <source>Confirm password:</source>
-        <translation type="unfinished"></translation>
+        <translation>請再輸入一遍新密碼:</translation>
     </message>
     <message>
         <location filename="brokerpassdialog.ui" line="79"/>
@@ -34,75 +34,75 @@
     <message>
         <location filename="brokerpassdlg.cpp" line="41"/>
         <source>Passwords do not match</source>
-        <translation type="unfinished"></translation>
+        <translation>密碼不相符</translation>
     </message>
 </context>
 <context>
     <name>CUPSPrintWidget</name>
     <message>
-        <location filename="cupsprintwidget.cpp" line="65"/>
-        <source>Idle</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="cupsprintwidget.cpp" line="68"/>
-        <source>Printing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="cupsprintwidget.cpp" line="71"/>
-        <source>Stopped</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="cupsprintwidget.cpp" line="81"/>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="cupsprintwidget.cpp" line="81"/>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="cupsprintwidget.ui" line="19"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>表單</translation>
     </message>
     <message>
         <location filename="cupsprintwidget.ui" line="25"/>
         <source>Name:</source>
-        <translation type="unfinished"></translation>
+        <translation>姓名:</translation>
     </message>
     <message>
         <location filename="cupsprintwidget.ui" line="42"/>
         <source>Properties</source>
-        <translation type="unfinished"></translation>
+        <translation>屬性</translation>
     </message>
     <message>
         <location filename="cupsprintwidget.ui" line="49"/>
         <source>State:</source>
-        <translation type="unfinished"></translation>
+        <translation>狀態:</translation>
     </message>
     <message>
         <location filename="cupsprintwidget.ui" line="63"/>
         <source>Accepting jobs:</source>
-        <translation type="unfinished"></translation>
+        <translation>接收的工作:</translation>
     </message>
     <message>
         <location filename="cupsprintwidget.ui" line="77"/>
         <source>Type:</source>
-        <translation type="unfinished"></translation>
+        <translation>類別:</translation>
     </message>
     <message>
         <location filename="cupsprintwidget.ui" line="91"/>
         <source>Location:</source>
-        <translation type="unfinished"></translation>
+        <translation>位置:</translation>
     </message>
     <message>
         <location filename="cupsprintwidget.ui" line="105"/>
         <source>Comment:</source>
-        <translation type="unfinished"></translation>
+        <translation>註解:</translation>
+    </message>
+    <message>
+        <location filename="cupsprintwidget.cpp" line="65"/>
+        <source>Idle</source>
+        <translation>é–’ç½®</translation>
+    </message>
+    <message>
+        <location filename="cupsprintwidget.cpp" line="68"/>
+        <source>Printing</source>
+        <translation>正在列印</translation>
+    </message>
+    <message>
+        <location filename="cupsprintwidget.cpp" line="71"/>
+        <source>Stopped</source>
+        <translation>已停止</translation>
+    </message>
+    <message>
+        <location filename="cupsprintwidget.cpp" line="81"/>
+        <source>Yes</source>
+        <translation>是</translation>
+    </message>
+    <message>
+        <location filename="cupsprintwidget.cpp" line="81"/>
+        <source>No</source>
+        <translation>否</translation>
     </message>
 </context>
 <context>
@@ -110,17 +110,68 @@
     <message>
         <location filename="cupsprintersettingsdialog.cpp" line="104"/>
         <source>No option selected</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">å°šæœªé¸å–ä»»ä½•é¸é …</translation>
     </message>
     <message>
         <location filename="cupsprintersettingsdialog.cpp" line="265"/>
         <source>This value is in conflict with other option</source>
-        <translation type="unfinished"></translation>
+        <translation>æ­¤è¨­å®šå€¼èˆ‡å…¶å®ƒé¸é …è¡çª</translation>
     </message>
     <message>
         <location filename="cupsprintersettingsdialog.cpp" line="275"/>
         <source>Options conflict</source>
-        <translation type="unfinished"></translation>
+        <translation>é¸é …è¡çª</translation>
+    </message>
+</context>
+<context>
+    <name>ConTest</name>
+    <message>
+        <location filename="contest.ui" line="14"/>
+        <source>Connectivity test</source>
+        <translation>連線測式</translation>
+    </message>
+    <message>
+        <location filename="contest.ui" line="24"/>
+        <source>HTTPS connection:</source>
+        <translation>åŠ å¯†HTTP連線:</translation>
+    </message>
+    <message>
+        <location filename="contest.ui" line="31"/>
+        <source>SSH connection:</source>
+        <translation>SSH連線:</translation>
+    </message>
+    <message>
+        <location filename="contest.ui" line="38"/>
+        <source>Connection speed:</source>
+        <translation>連線速度:</translation>
+    </message>
+    <message>
+        <location filename="contest.ui" line="123"/>
+        <location filename="contest.ui" line="167"/>
+        <source>Failed</source>
+        <translation>失敗</translation>
+    </message>
+    <message>
+        <location filename="contest.ui" line="211"/>
+        <source>0 Kb/s</source>
+        <translation>0 Kb/s</translation>
+    </message>
+    <message>
+        <location filename="contest.cpp" line="108"/>
+        <location filename="contest.cpp" line="115"/>
+        <source>OK</source>
+        <translation>確定</translation>
+    </message>
+    <message>
+        <location filename="contest.cpp" line="150"/>
+        <source>Socket operation timed out</source>
+        <translation>網路操作逾時</translation>
+    </message>
+    <message>
+        <location filename="contest.cpp" line="162"/>
+        <location filename="contest.cpp" line="168"/>
+        <source>Failed: </source>
+        <translation>失敗:</translation>
     </message>
 </context>
 <context>
@@ -128,42 +179,42 @@
     <message>
         <location filename="configdialog.cpp" line="50"/>
         <source>General</source>
-        <translation type="unfinished"></translation>
+        <translation>一般設定</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="59"/>
         <source>Display icon in system tray</source>
-        <translation type="unfinished"></translation>
+        <translation>在系統狀態列中顯示圖示</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="66"/>
         <source>Hide to system tray when minimized</source>
-        <translation type="unfinished"></translation>
+        <translation>最小化時縮至系統狀態列</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="67"/>
         <source>Hide to system tray when closed</source>
-        <translation type="unfinished"></translation>
+        <translation>關閉時隱藏至系統狀態列</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="68"/>
         <source>Hide to system tray after connection is established</source>
-        <translation type="unfinished"></translation>
+        <translation>連線建立後隱藏至系統狀態列</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="69"/>
         <source>Restore from system tray after session is disconnected</source>
-        <translation type="unfinished"></translation>
+        <translation>當工作階段斷線後從系統狀態列中還原</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="87"/>
         <source>Use LDAP</source>
-        <translation type="unfinished"></translation>
+        <translation>使用LDAP</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="111"/>
         <source>Server URL:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">伺服器網址:</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="112"/>
@@ -173,112 +224,112 @@
     <message>
         <location filename="configdialog.cpp" line="114"/>
         <source>Failover server 1 URL:</source>
-        <translation type="unfinished"></translation>
+        <translation>備援伺服器網1 網址:</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="116"/>
         <source>Failover server 2 URL:</source>
-        <translation type="unfinished"></translation>
+        <translation>備援伺服器網2 網址:</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="198"/>
         <location filename="configdialog.cpp" line="340"/>
         <source>X-Server settings</source>
-        <translation type="unfinished"></translation>
+        <translation>X伺服器設定</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="207"/>
         <source>X11 application:</source>
-        <translation type="unfinished"></translation>
+        <translation>X11應用程式:</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="218"/>
         <source>X11 version:</source>
-        <translation type="unfinished"></translation>
+        <translation>X11版本:</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="233"/>
         <source>Find X11 application</source>
-        <translation type="unfinished"></translation>
+        <translation>尋找X11應用程式</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="250"/>
         <source>Clientside SSH port for file system export usage:</source>
-        <translation type="unfinished"></translation>
+        <translation>檔案系統匯出時用戶端所使用的SSHé€£æŽ¥åŸ :</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="260"/>
         <source>Start session embedded inside website</source>
-        <translation type="unfinished"></translation>
+        <translation>將工作階段嵌入至網站內</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="264"/>
         <location filename="configdialog.cpp" line="567"/>
         <location filename="configdialog.cpp" line="579"/>
         <source>Advanced options</source>
-        <translation type="unfinished"></translation>
+        <translation>é€²éšŽé¸é …</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="291"/>
         <source>Defaults</source>
-        <translation type="unfinished"></translation>
+        <translation>é è¨­</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="292"/>
         <source>&OK</source>
-        <translation type="unfinished"></translation>
+        <translation>確定(&O)</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="293"/>
         <source>&Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>取消(&C)</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="316"/>
         <source>Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>設定</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="336"/>
         <source>Printing</source>
-        <translation type="unfinished"></translation>
+        <translation>列印功能</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="503"/>
         <location filename="configdialog.cpp" line="521"/>
         <location filename="configdialog.cpp" line="540"/>
         <source>Warning</source>
-        <translation type="unfinished"></translation>
+        <translation>警告</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="504"/>
         <source>x2goclient could not find any suitable X11 Application. Please install Apple X11 or select the path to the application</source>
-        <translation type="unfinished"></translation>
+        <translation>X2Go用戶端無法找到合適的X11應用程式，請安裝Apple X11或是選擇應用程式的路徑</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="522"/>
         <source>Your are using X11 (Apple X-Window Server) version </source>
-        <translation type="unfinished"></translation>
+        <translation>您正在使用X11(Apple X-Window 伺服器) 版本 </translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="524"/>
         <source>. This version causes problems with X-application in 24bit color mode. You should update your X11 environment (http://trac.macosforge.org/projects/xquartz).</source>
-        <translation type="unfinished"></translation>
+        <translation>. 此版本在24位元色彩模式時會有問題，請升級您的X11環境 (http://trac.macosforge.org/projects/xquartz).</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="541"/>
         <source>No suitable X11 application found in selected path</source>
-        <translation type="unfinished"></translation>
+        <translation>在您選擇的路徑中沒有合適的X11應用程式</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="577"/>
         <source>&Connection</source>
-        <translation type="unfinished"></translation>
+        <translation>連線(&C)</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="578"/>
         <source>&Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>設定(&S)</translation>
     </message>
 </context>
 <context>
@@ -286,32 +337,32 @@
     <message>
         <location filename="connectionwidget.cpp" line="33"/>
         <source>&Connection speed</source>
-        <translation type="unfinished"></translation>
+        <translation>連線速度(&C)</translation>
     </message>
     <message>
         <location filename="connectionwidget.cpp" line="38"/>
         <source>Connection speed:</source>
-        <translation type="unfinished"></translation>
+        <translation>連線速度:</translation>
     </message>
     <message>
         <location filename="connectionwidget.cpp" line="68"/>
         <source>C&ompression</source>
-        <translation type="unfinished"></translation>
+        <translation>壓縮(&o)</translation>
     </message>
     <message>
         <location filename="connectionwidget.cpp" line="85"/>
         <source>Method:</source>
-        <translation type="unfinished"></translation>
+        <translation>方式:</translation>
     </message>
     <message>
         <location filename="connectionwidget.cpp" line="87"/>
         <source>Compression method:</source>
-        <translation type="unfinished"></translation>
+        <translation>壓縮方式:</translation>
     </message>
     <message>
         <location filename="connectionwidget.cpp" line="89"/>
         <source>Image quality:</source>
-        <translation type="unfinished"></translation>
+        <translation>影像品質:</translation>
     </message>
 </context>
 <context>
@@ -319,72 +370,72 @@
     <message>
         <location filename="cupsprintsettingsdialog.ui" line="19"/>
         <source>Dialog</source>
-        <translation type="unfinished"></translation>
+        <translation>對話框</translation>
     </message>
     <message>
         <location filename="cupsprintsettingsdialog.ui" line="35"/>
         <source>General</source>
-        <translation type="unfinished"></translation>
+        <translation>一般設定</translation>
     </message>
     <message>
         <location filename="cupsprintsettingsdialog.ui" line="45"/>
         <source>Page size:</source>
-        <translation type="unfinished"></translation>
+        <translation>é é¢å°ºå¯¸:</translation>
     </message>
     <message>
         <location filename="cupsprintsettingsdialog.ui" line="62"/>
         <source>Paper type:</source>
-        <translation type="unfinished"></translation>
+        <translation>紙張類型:</translation>
     </message>
     <message>
         <location filename="cupsprintsettingsdialog.ui" line="72"/>
         <source>Paper source:</source>
-        <translation type="unfinished"></translation>
+        <translation>紙張來源:</translation>
     </message>
     <message>
         <location filename="cupsprintsettingsdialog.ui" line="99"/>
         <source>Duplex Printing</source>
-        <translation type="unfinished"></translation>
+        <translation>雙面列印</translation>
     </message>
     <message>
         <location filename="cupsprintsettingsdialog.ui" line="105"/>
         <source>None</source>
-        <translation type="unfinished"></translation>
+        <translation>ç„¡</translation>
     </message>
     <message>
         <location filename="cupsprintsettingsdialog.ui" line="112"/>
         <source>Long side</source>
-        <translation type="unfinished"></translation>
+        <translation>長邊翻轉</translation>
     </message>
     <message>
         <location filename="cupsprintsettingsdialog.ui" line="119"/>
         <source>Short side</source>
-        <translation type="unfinished"></translation>
+        <translation>短邊翻轉</translation>
     </message>
     <message>
         <location filename="cupsprintsettingsdialog.ui" line="143"/>
         <source>Driver settings</source>
-        <translation type="unfinished"></translation>
+        <translation>驅動程式設定</translation>
     </message>
     <message>
         <location filename="cupsprintsettingsdialog.ui" line="175"/>
         <source>Option</source>
-        <translation type="unfinished"></translation>
+        <translation>é¸é …</translation>
     </message>
     <message>
         <location filename="cupsprintsettingsdialog.ui" line="180"/>
         <source>Value</source>
-        <translation type="unfinished"></translation>
+        <translation>數值</translation>
     </message>
     <message>
         <location filename="cupsprintsettingsdialog.ui" line="186"/>
         <source>No option selected</source>
-        <translation type="unfinished"></translation>
+        <translation>ç›®å‰æ²’æœ‰é¸å–ä»»ä½•é¸é …</translation>
     </message>
     <message>
         <location filename="cupsprintsettingsdialog.ui" line="205"/>
         <source>text</source>
-        <translation type="unfinished"></translation>
+        <translation>文字</translation>
     </message>
 </context>
 <context>
@@ -392,42 +443,42 @@
     <message>
         <location filename="editconnectiondialog.cpp" line="52"/>
         <source>&Session</source>
-        <translation type="unfinished"></translation>
+        <translation>工作階段(&S)</translation>
     </message>
     <message>
         <location filename="editconnectiondialog.cpp" line="53"/>
         <source>&Connection</source>
-        <translation type="unfinished"></translation>
+        <translation>連線(&C)</translation>
     </message>
     <message>
         <location filename="editconnectiondialog.cpp" line="54"/>
         <source>&Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>設定(&S)</translation>
     </message>
     <message>
         <location filename="editconnectiondialog.cpp" line="55"/>
         <source>&Shared folders</source>
-        <translation type="unfinished"></translation>
+        <translation>共享資料夾(&S)</translation>
     </message>
     <message>
         <location filename="editconnectiondialog.cpp" line="57"/>
         <source>&OK</source>
-        <translation type="unfinished"></translation>
+        <translation>確定(&O)</translation>
     </message>
     <message>
         <location filename="editconnectiondialog.cpp" line="58"/>
         <source>&Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>取消(&C)</translation>
     </message>
     <message>
         <location filename="editconnectiondialog.cpp" line="59"/>
         <source>Defaults</source>
-        <translation type="unfinished"></translation>
+        <translation>é è¨­å€¼</translation>
     </message>
     <message>
         <location filename="editconnectiondialog.cpp" line="109"/>
         <source>Session preferences - </source>
-        <translation type="unfinished"></translation>
+        <translation>工作階段偏好設定 - </translation>
     </message>
 </context>
 <context>
@@ -435,158 +486,158 @@
     <message>
         <location filename="exportdialog.cpp" line="38"/>
         <source>&Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>取消(&C)</translation>
     </message>
     <message>
         <location filename="exportdialog.cpp" line="44"/>
         <source>&share</source>
-        <translation type="unfinished"></translation>
+        <translation>分享(&s)</translation>
     </message>
     <message>
         <location filename="exportdialog.cpp" line="45"/>
         <source>&Preferences ...</source>
-        <translation type="unfinished"></translation>
+        <translation>偏好設定(&P) ...</translation>
     </message>
     <message>
         <location filename="exportdialog.cpp" line="46"/>
         <source>&Custom folder ...</source>
-        <translation type="unfinished"></translation>
+        <translation>自訂資料夾(&C) ...</translation>
     </message>
     <message>
         <location filename="exportdialog.cpp" line="56"/>
         <source>Delete</source>
         <comment>Delete</comment>
-        <translation type="unfinished"></translation>
+        <translation>刪除</translation>
     </message>
     <message>
         <location filename="exportdialog.cpp" line="73"/>
         <source>share folders</source>
-        <translation type="unfinished"></translation>
+        <translation>共享資料夾</translation>
     </message>
     <message>
         <location filename="exportdialog.cpp" line="139"/>
         <source>Select folder</source>
-        <translation type="unfinished"></translation>
+        <translation>選擇資料夾</translation>
     </message>
 </context>
 <context>
     <name>HttpBrokerClient</name>
     <message>
-        <location filename="httpbrokerclient.cpp" line="164"/>
+        <location filename="httpbrokerclient.cpp" line="178"/>
         <source>us</source>
-        <translation type="unfinished"></translation>
+        <translation>us</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="167"/>
+        <location filename="httpbrokerclient.cpp" line="181"/>
         <source>pc105/us</source>
-        <translation type="unfinished"></translation>
+        <translation>pc105/us</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="294"/>
         <location filename="httpbrokerclient.cpp" line="308"/>
-        <location filename="httpbrokerclient.cpp" line="345"/>
+        <location filename="httpbrokerclient.cpp" line="328"/>
+        <location filename="httpbrokerclient.cpp" line="365"/>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation>錯誤</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="309"/>
+        <location filename="httpbrokerclient.cpp" line="329"/>
         <source>Login failed!<br>Please try again</source>
-        <translation type="unfinished"></translation>
+        <translation>登入失敗! <br>請再試一次</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="346"/>
+        <location filename="httpbrokerclient.cpp" line="366"/>
         <source>Your session was disconnected. To get access to your running session, please return to the login page or use the "reload" function of your browser.</source>
-        <translation type="unfinished"></translation>
+        <translation>æ‚¨çš„å·¥ä½œéšŽæ®µå·²ä¸­æ–·é€£ç·šã€‚è«‹è¿”å›žç™»å…¥ç•«é¢æˆ–æ˜¯åœ¨ç€è¦½å™¨ä¸­é‡æ–°è¼‰å…¥é é¢ä»¥é‡æ–°é€£å›žä¹‹å‰çš„å·¥ä½œéšŽæ®µã€‚</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="433"/>
+        <location filename="httpbrokerclient.cpp" line="454"/>
         <source><br><b>Server uses an invalid security certificate.</b><br><br></source>
-        <translation type="unfinished"></translation>
+        <translation><br><b>伺服使器使用了不合法的安全憑證</b><br><br></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="436"/>
+        <location filename="httpbrokerclient.cpp" line="457"/>
         <source><p style='background:#FFFFDC;'>You should not add an exception if you are using an internet connection that you do not trust completely or if you are not used to seeing a warning for this server.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="441"/>
+        <location filename="httpbrokerclient.cpp" line="462"/>
         <source>Secure connection failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="446"/>
+        <location filename="httpbrokerclient.cpp" line="467"/>
         <source>Issued to:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="447"/>
-        <location filename="httpbrokerclient.cpp" line="459"/>
+        <location filename="httpbrokerclient.cpp" line="468"/>
+        <location filename="httpbrokerclient.cpp" line="480"/>
         <source>Common Name(CN)	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="450"/>
-        <location filename="httpbrokerclient.cpp" line="462"/>
+        <location filename="httpbrokerclient.cpp" line="471"/>
+        <location filename="httpbrokerclient.cpp" line="483"/>
         <source>Organization(O)	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="453"/>
-        <location filename="httpbrokerclient.cpp" line="465"/>
+        <location filename="httpbrokerclient.cpp" line="474"/>
+        <location filename="httpbrokerclient.cpp" line="486"/>
         <source>Organizational Unit(OU)	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="456"/>
+        <location filename="httpbrokerclient.cpp" line="477"/>
         <source>Serial Number	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="458"/>
+        <location filename="httpbrokerclient.cpp" line="479"/>
         <source>Issued by:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="469"/>
+        <location filename="httpbrokerclient.cpp" line="490"/>
         <source>Validity:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="470"/>
+        <location filename="httpbrokerclient.cpp" line="491"/>
         <source>Issued on	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="471"/>
+        <location filename="httpbrokerclient.cpp" line="492"/>
         <source>expires on	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="472"/>
+        <location filename="httpbrokerclient.cpp" line="493"/>
         <source>Fingerprints:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="473"/>
+        <location filename="httpbrokerclient.cpp" line="494"/>
         <source>SHA1	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="475"/>
+        <location filename="httpbrokerclient.cpp" line="496"/>
         <source>MD5	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="481"/>
+        <location filename="httpbrokerclient.cpp" line="502"/>
         <source>Exit X2Go Client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="483"/>
+        <location filename="httpbrokerclient.cpp" line="504"/>
         <source>Add exception</source>
         <translation type="unfinished"></translation>
     </message>
@@ -594,970 +645,989 @@
 <context>
     <name>ONMainWindow</name>
     <message>
-        <location filename="onmainwindow.cpp" line="80"/>
-        <location filename="onmainwindow_part3.cpp" line="307"/>
+        <location filename="onmainwindow.cpp" line="84"/>
+        <location filename="onmainwindow_part3.cpp" line="312"/>
         <source>us</source>
-        <translation type="unfinished"></translation>
+        <translation>us</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="81"/>
+        <location filename="onmainwindow.cpp" line="85"/>
         <source>pc105/us</source>
-        <translation type="unfinished"></translation>
+        <translation>pc105/us</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="126"/>
+        <location filename="onmainwindow.cpp" line="130"/>
         <source>X2Go client</source>
-        <translation type="unfinished"></translation>
+        <translation>X2Go用戶端</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="143"/>
+        <location filename="onmainwindow.cpp" line="147"/>
         <location filename="onmainwindow_part2.cpp" line="184"/>
-        <location filename="onmainwindow_part2.cpp" line="2148"/>
+        <location filename="onmainwindow_part2.cpp" line="2152"/>
         <source>connecting</source>
-        <translation type="unfinished"></translation>
+        <translation>正在連線</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="150"/>
+        <location filename="onmainwindow.cpp" line="154"/>
         <source>Internet browser</source>
-        <translation type="unfinished"></translation>
+        <translation>ç¶²é ç€è¦½å™¨</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="151"/>
+        <location filename="onmainwindow.cpp" line="155"/>
         <source>Email client</source>
-        <translation type="unfinished"></translation>
+        <translation>電子郵件軟體</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="152"/>
+        <location filename="onmainwindow.cpp" line="156"/>
         <source>OpenOffice.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="153"/>
+        <location filename="onmainwindow.cpp" line="157"/>
         <source>Terminal</source>
-        <translation type="unfinished"></translation>
+        <translation>終端機</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="325"/>
+        <location filename="onmainwindow.cpp" line="329"/>
         <source>&Settings ...</source>
-        <translation type="unfinished"></translation>
+        <translation>設定(&S) ...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="329"/>
+        <location filename="onmainwindow.cpp" line="333"/>
         <source>Support ...</source>
-        <translation type="unfinished"></translation>
+        <translation>支援 ...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="336"/>
-        <location filename="onmainwindow_part3.cpp" line="1536"/>
+        <location filename="onmainwindow.cpp" line="340"/>
+        <location filename="onmainwindow_part3.cpp" line="1542"/>
         <source>About X2GO client</source>
-        <translation type="unfinished"></translation>
+        <translation>關於X2GO用戶端</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="476"/>
-        <location filename="onmainwindow.cpp" line="926"/>
-        <location filename="onmainwindow_part4.cpp" line="1610"/>
+        <location filename="onmainwindow.cpp" line="485"/>
+        <location filename="onmainwindow.cpp" line="944"/>
+        <location filename="onmainwindow_part4.cpp" line="1844"/>
         <source>Share folder...</source>
-        <translation type="unfinished"></translation>
+        <translation>共享資料夾...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="479"/>
-        <location filename="onmainwindow.cpp" line="927"/>
-        <location filename="onmainwindow_part2.cpp" line="2200"/>
-        <location filename="onmainwindow_part4.cpp" line="1761"/>
+        <location filename="onmainwindow.cpp" line="488"/>
+        <location filename="onmainwindow.cpp" line="945"/>
+        <location filename="onmainwindow_part2.cpp" line="2204"/>
+        <location filename="onmainwindow_part4.cpp" line="1995"/>
         <source>Suspend</source>
-        <translation type="unfinished"></translation>
+        <translation>暫停</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="482"/>
-        <location filename="onmainwindow.cpp" line="928"/>
-        <location filename="onmainwindow_part4.cpp" line="1609"/>
-        <location filename="onmainwindow_part4.cpp" line="1763"/>
+        <location filename="onmainwindow.cpp" line="491"/>
+        <location filename="onmainwindow.cpp" line="946"/>
+        <location filename="onmainwindow_part4.cpp" line="1843"/>
+        <location filename="onmainwindow_part4.cpp" line="1997"/>
         <source>Terminate</source>
-        <translation type="unfinished"></translation>
+        <translation>終止</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="484"/>
+        <location filename="onmainwindow.cpp" line="493"/>
         <source>Reconnect</source>
-        <translation type="unfinished"></translation>
+        <translation>重新連線</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="488"/>
-        <location filename="onmainwindow_part4.cpp" line="1054"/>
+        <location filename="onmainwindow.cpp" line="497"/>
+        <location filename="onmainwindow_part4.cpp" line="1288"/>
         <source>Detach X2Go window</source>
-        <translation type="unfinished"></translation>
+        <translation>脫離X2Go視窗</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="491"/>
-        <location filename="onmainwindow_part4.cpp" line="2064"/>
+        <location filename="onmainwindow.cpp" line="500"/>
+        <location filename="onmainwindow_part4.cpp" line="2298"/>
         <source>Minimize toolbar</source>
-        <translation type="unfinished"></translation>
+        <translation>將工具列最小化</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="601"/>
-        <location filename="onmainwindow.cpp" line="1782"/>
-        <location filename="onmainwindow_part3.cpp" line="1636"/>
+        <location filename="onmainwindow.cpp" line="610"/>
+        <location filename="onmainwindow.cpp" line="1820"/>
+        <location filename="onmainwindow_part3.cpp" line="1642"/>
         <source>Session:</source>
-        <translation type="unfinished"></translation>
+        <translation>工作階段:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="653"/>
+        <location filename="onmainwindow.cpp" line="662"/>
         <source>&Quit</source>
-        <translation type="unfinished"></translation>
+        <translation>離開(&Q)</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="654"/>
+        <location filename="onmainwindow.cpp" line="663"/>
         <source>Ctrl+Q</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="655"/>
-        <location filename="onmainwindow.cpp" line="940"/>
+        <location filename="onmainwindow.cpp" line="664"/>
+        <location filename="onmainwindow.cpp" line="958"/>
         <source>Quit</source>
-        <translation type="unfinished"></translation>
+        <translation>離開</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="658"/>
+        <location filename="onmainwindow.cpp" line="667"/>
         <source>&New session ...</source>
-        <translation type="unfinished"></translation>
+        <translation>新增工作階段(&N) ...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="659"/>
+        <location filename="onmainwindow.cpp" line="668"/>
         <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="664"/>
+        <location filename="onmainwindow.cpp" line="673"/>
         <source>Session management...</source>
-        <translation type="unfinished"></translation>
+        <translation>工作階段管理員...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="665"/>
+        <location filename="onmainwindow.cpp" line="674"/>
         <source>Ctrl+E</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="675"/>
+        <location filename="onmainwindow.cpp" line="684"/>
         <source>&Create session icon on desktop...</source>
-        <translation type="unfinished"></translation>
+        <translation>在桌面上建立工作階段圖示(&C)...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="684"/>
+        <location filename="onmainwindow.cpp" line="693"/>
         <source>&Set broker password...</source>
-        <translation type="unfinished"></translation>
+        <translation>設定代理伺服器密碼(&S)...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="692"/>
-        <location filename="onmainwindow.cpp" line="713"/>
+        <location filename="onmainwindow.cpp" line="704"/>
+        <source>&Connectivity test...</source>
+        <translation>連線能力測試(&C)...</translation>
+    </message>
+    <message>
+        <location filename="onmainwindow.cpp" line="711"/>
+        <location filename="onmainwindow.cpp" line="732"/>
         <source>Show toolbar</source>
-        <translation type="unfinished"></translation>
+        <translation>顯示工具列</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="698"/>
+        <location filename="onmainwindow.cpp" line="717"/>
         <source>About Qt</source>
-        <translation type="unfinished"></translation>
+        <translation>關於Qt</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="715"/>
+        <location filename="onmainwindow.cpp" line="734"/>
         <source>Ctrl+Q</source>
         <comment>exit</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="721"/>
+        <location filename="onmainwindow.cpp" line="740"/>
         <source>&Session</source>
-        <translation type="unfinished"></translation>
+        <translation>工作階段(&S)</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="722"/>
+        <location filename="onmainwindow.cpp" line="741"/>
         <source>&Options</source>
-        <translation type="unfinished"></translation>
+        <translation>é¸é …(&O)</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="739"/>
+        <location filename="onmainwindow.cpp" line="760"/>
         <source>&Help</source>
-        <translation type="unfinished"></translation>
+        <translation>幫助(&H)</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="776"/>
-        <location filename="onmainwindow.cpp" line="1775"/>
-        <location filename="onmainwindow_part3.cpp" line="1629"/>
-        <location filename="onmainwindow_part4.cpp" line="1422"/>
+        <location filename="onmainwindow.cpp" line="799"/>
+        <location filename="onmainwindow.cpp" line="1813"/>
+        <location filename="onmainwindow_part3.cpp" line="1635"/>
+        <location filename="onmainwindow_part4.cpp" line="1656"/>
         <source>Login:</source>
-        <translation type="unfinished"></translation>
+        <translation>登入:</translation>
+    </message>
+    <message>
+        <location filename="onmainwindow.cpp" line="820"/>
+        <location filename="onmainwindow.cpp" line="848"/>
+        <location filename="onmainwindow.cpp" line="1495"/>
+        <location filename="onmainwindow.cpp" line="1524"/>
+        <location filename="onmainwindow.cpp" line="1532"/>
+        <location filename="onmainwindow.cpp" line="1678"/>
+        <location filename="onmainwindow.cpp" line="1705"/>
+        <location filename="onmainwindow.cpp" line="1708"/>
+        <location filename="onmainwindow.cpp" line="1955"/>
+        <location filename="onmainwindow.cpp" line="2178"/>
+        <location filename="onmainwindow.cpp" line="2192"/>
+        <location filename="onmainwindow.cpp" line="2205"/>
+        <location filename="onmainwindow.cpp" line="2239"/>
+        <location filename="onmainwindow.cpp" line="2284"/>
+        <location filename="onmainwindow_part2.cpp" line="300"/>
+        <location filename="onmainwindow_part2.cpp" line="476"/>
+        <location filename="onmainwindow_part2.cpp" line="485"/>
+        <location filename="onmainwindow_part2.cpp" line="784"/>
+        <location filename="onmainwindow_part2.cpp" line="1235"/>
+        <location filename="onmainwindow_part2.cpp" line="1296"/>
+        <location filename="onmainwindow_part2.cpp" line="1347"/>
+        <location filename="onmainwindow_part2.cpp" line="1380"/>
+        <location filename="onmainwindow_part2.cpp" line="1424"/>
+        <location filename="onmainwindow_part2.cpp" line="1804"/>
+        <location filename="onmainwindow_part2.cpp" line="1830"/>
+        <location filename="onmainwindow_part2.cpp" line="1962"/>
+        <location filename="onmainwindow_part3.cpp" line="202"/>
+        <location filename="onmainwindow_part3.cpp" line="773"/>
+        <location filename="onmainwindow_part3.cpp" line="854"/>
+        <location filename="onmainwindow_part3.cpp" line="1098"/>
+        <location filename="onmainwindow_part3.cpp" line="1226"/>
+        <location filename="onmainwindow_part3.cpp" line="1279"/>
+        <location filename="onmainwindow_part3.cpp" line="1585"/>
+        <location filename="onmainwindow_part3.cpp" line="1587"/>
+        <location filename="onmainwindow_part3.cpp" line="1817"/>
+        <location filename="onmainwindow_part3.cpp" line="1865"/>
+        <location filename="onmainwindow_part3.cpp" line="1893"/>
+        <location filename="onmainwindow_part3.cpp" line="2263"/>
+        <location filename="onmainwindow_part3.cpp" line="2278"/>
+        <location filename="onmainwindow_part3.cpp" line="2332"/>
+        <location filename="onmainwindow_part4.cpp" line="29"/>
+        <location filename="onmainwindow_part4.cpp" line="54"/>
+        <location filename="onmainwindow_part4.cpp" line="2214"/>
+        <location filename="onmainwindow_part4.cpp" line="2485"/>
+        <source>Error</source>
+        <translation>錯誤</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="807"/>
+        <location filename="onmainwindow.cpp" line="820"/>
         <source>Operation failed</source>
-        <translation type="unfinished"></translation>
+        <translation>更改密碼失敗</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="811"/>
+        <location filename="onmainwindow.cpp" line="824"/>
         <source>Password changed</source>
-        <translation type="unfinished"></translation>
+        <translation>密碼已更改成功</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="830"/>
+        <location filename="onmainwindow.cpp" line="848"/>
         <source>Wrong password!</source>
-        <translation type="unfinished"></translation>
+        <translation>輸入了錯誤的密碼!</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="879"/>
+        <location filename="onmainwindow.cpp" line="852"/>
+        <location filename="onmainwindow.cpp" line="2393"/>
+        <location filename="onmainwindow_part4.cpp" line="2468"/>
+        <source>Connecting to broker</source>
+        <translation>連線至連線代理伺服器</translation>
+    </message>
+    <message>
+        <location filename="onmainwindow.cpp" line="897"/>
         <source><b>Authentication</b></source>
-        <translation type="unfinished"></translation>
+        <translation><b>身份驗證</b></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="920"/>
+        <location filename="onmainwindow.cpp" line="938"/>
         <source>Restore</source>
-        <translation type="unfinished"></translation>
+        <translation>還原</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="923"/>
-        <location filename="onmainwindow_part2.cpp" line="2061"/>
+        <location filename="onmainwindow.cpp" line="941"/>
+        <location filename="onmainwindow_part2.cpp" line="2065"/>
         <source>Not connected</source>
-        <translation type="unfinished"></translation>
+        <translation>尚未連線</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="951"/>
+        <location filename="onmainwindow.cpp" line="969"/>
         <source>Left mouse button to hide/restore - Right mouse button to display context menu</source>
-        <oldsource>Left click to open the X2GoClient window or right click to get the context menu.</oldsource>
-        <translation type="unfinished"></translation>
+        <translation>æŒ‰æ»‘é¼ å·¦éµä»¥éš±è—æˆ–é‚„åŽŸè¦–çª—, 右鍵顯示選單</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="807"/>
-        <location filename="onmainwindow.cpp" line="830"/>
-        <location filename="onmainwindow.cpp" line="1471"/>
-        <location filename="onmainwindow.cpp" line="1499"/>
-        <location filename="onmainwindow.cpp" line="1507"/>
-        <location filename="onmainwindow.cpp" line="1640"/>
-        <location filename="onmainwindow.cpp" line="1667"/>
-        <location filename="onmainwindow.cpp" line="1670"/>
-        <location filename="onmainwindow.cpp" line="1917"/>
-        <location filename="onmainwindow.cpp" line="2140"/>
-        <location filename="onmainwindow.cpp" line="2154"/>
-        <location filename="onmainwindow.cpp" line="2167"/>
-        <location filename="onmainwindow.cpp" line="2201"/>
-        <location filename="onmainwindow.cpp" line="2246"/>
-        <location filename="onmainwindow_part2.cpp" line="297"/>
-        <location filename="onmainwindow_part2.cpp" line="473"/>
-        <location filename="onmainwindow_part2.cpp" line="482"/>
-        <location filename="onmainwindow_part2.cpp" line="781"/>
-        <location filename="onmainwindow_part2.cpp" line="1232"/>
-        <location filename="onmainwindow_part2.cpp" line="1293"/>
-        <location filename="onmainwindow_part2.cpp" line="1344"/>
-        <location filename="onmainwindow_part2.cpp" line="1377"/>
-        <location filename="onmainwindow_part2.cpp" line="1421"/>
-        <location filename="onmainwindow_part2.cpp" line="1801"/>
-        <location filename="onmainwindow_part2.cpp" line="1827"/>
-        <location filename="onmainwindow_part2.cpp" line="1958"/>
-        <location filename="onmainwindow_part3.cpp" line="202"/>
-        <location filename="onmainwindow_part3.cpp" line="768"/>
-        <location filename="onmainwindow_part3.cpp" line="848"/>
-        <location filename="onmainwindow_part3.cpp" line="1092"/>
-        <location filename="onmainwindow_part3.cpp" line="1220"/>
-        <location filename="onmainwindow_part3.cpp" line="1273"/>
-        <location filename="onmainwindow_part3.cpp" line="1579"/>
-        <location filename="onmainwindow_part3.cpp" line="1581"/>
-        <location filename="onmainwindow_part3.cpp" line="1811"/>
-        <location filename="onmainwindow_part3.cpp" line="1859"/>
-        <location filename="onmainwindow_part3.cpp" line="1887"/>
-        <location filename="onmainwindow_part3.cpp" line="2257"/>
-        <location filename="onmainwindow_part3.cpp" line="2272"/>
-        <location filename="onmainwindow_part3.cpp" line="2326"/>
-        <location filename="onmainwindow_part4.cpp" line="29"/>
-        <location filename="onmainwindow_part4.cpp" line="54"/>
-        <location filename="onmainwindow_part4.cpp" line="1980"/>
-        <location filename="onmainwindow_part4.cpp" line="2251"/>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="onmainwindow.cpp" line="1472"/>
-        <location filename="onmainwindow.cpp" line="1641"/>
-        <location filename="onmainwindow.cpp" line="1671"/>
+        <location filename="onmainwindow.cpp" line="1496"/>
+        <location filename="onmainwindow.cpp" line="1679"/>
+        <location filename="onmainwindow.cpp" line="1709"/>
         <source>Please check LDAP settings</source>
-        <translation type="unfinished"></translation>
+        <translation>請確認LDAP的設定</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1506"/>
+        <location filename="onmainwindow.cpp" line="1531"/>
         <source>no X2Go server found in LDAP </source>
-        <translation type="unfinished"></translation>
+        <translation>在LDAP環境中沒有找到X2Go伺服器</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1805"/>
+        <location filename="onmainwindow.cpp" line="1843"/>
         <source>Create session icon on desktop</source>
-        <translation type="unfinished"></translation>
+        <translation>在桌面上建立工作階段圖示</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1806"/>
+        <location filename="onmainwindow.cpp" line="1844"/>
         <source>Desktop icons can be configured not to show x2goclient (hidden mode). If you like to use this feature you'll need to configure login by a gpg key or gpg smart card.
 
 Use x2goclient hidden mode?</source>
-        <translation type="unfinished"></translation>
+        <translation>桌面圖示可以被設定為不顯示X2Go用戶端的模式(隱藏模式)。如果您想要使用隱藏模式，您必需要將登入方式設定成使用GPG金匙或是GPG IC智慧卡。
+
+是否要使用X2Go用戶端的隱藏模式?</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1817"/>
+        <location filename="onmainwindow.cpp" line="1855"/>
         <source>New Session</source>
-        <translation type="unfinished"></translation>
+        <translation>新的工作階段</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1867"/>
+        <location filename="onmainwindow.cpp" line="1905"/>
         <source>X2Go Link to session </source>
-        <translation type="unfinished"></translation>
+        <translation>X2Go工作階段的連結</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1917"/>
+        <location filename="onmainwindow.cpp" line="1955"/>
         <source>X2Go sessions not found</source>
-        <translation type="unfinished"></translation>
+        <translation>無法找到X2Go的工作</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2065"/>
+        <location filename="onmainwindow.cpp" line="2103"/>
         <source>Are you sure you want to delete this session?</source>
-        <translation type="unfinished"></translation>
+        <translation>您確定要刪除此工作階段嗎?</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2372"/>
+        <location filename="onmainwindow.cpp" line="2411"/>
         <location filename="onmainwindow_part3.cpp" line="68"/>
         <source>KDE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2431"/>
+        <location filename="onmainwindow.cpp" line="2473"/>
         <source>RDP connection</source>
-        <translation type="unfinished"></translation>
+        <translation>RDP連線</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2435"/>
+        <location filename="onmainwindow.cpp" line="2477"/>
         <source>XDMCP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2439"/>
+        <location filename="onmainwindow.cpp" line="2481"/>
         <source>Connection to local desktop</source>
-        <translation type="unfinished"></translation>
+        <translation>連線至本地桌面</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2443"/>
+        <location filename="onmainwindow.cpp" line="2485"/>
         <source> on </source>
-        <translation type="unfinished"></translation>
+        <translation> æ–¼ </translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="290"/>
-        <location filename="onmainwindow_part2.cpp" line="1286"/>
-        <location filename="onmainwindow_part2.cpp" line="1370"/>
-        <location filename="onmainwindow_part2.cpp" line="1403"/>
-        <location filename="onmainwindow_part3.cpp" line="761"/>
-        <location filename="onmainwindow_part3.cpp" line="841"/>
-        <location filename="onmainwindow_part3.cpp" line="1213"/>
-        <location filename="onmainwindow_part3.cpp" line="1266"/>
-        <location filename="onmainwindow_part3.cpp" line="2250"/>
-        <source><b>Connection failed</b>
-</source>
-        <translation type="unfinished"></translation>
+        <location filename="onmainwindow_part2.cpp" line="79"/>
+        <source>Host key for server changed.
+It is now: </source>
+        <translation>主機的SSH密鑰已經更換。
+現在的密鑰為: </translation>
+    </message>
+    <message>
+        <location filename="onmainwindow_part2.cpp" line="80"/>
+        <source>For security reasons, connection will be stopped</source>
+        <translation>由於安全性的考量，目前的連線已被中止</translation>
+    </message>
+    <message>
+        <location filename="onmainwindow_part2.cpp" line="90"/>
+        <source>The host key for this server was not found but an othertype of key exists.An attacker might change the default server key toconfuse your client into thinking the key does not exist</source>
+        <translation>ç›®å‰æ²’æœ‰æ‰¾åˆ°ä¼ºæœå™¨ä¸Šçš„ä¸»æ©Ÿå¯†é‘°ï¼Œä¸éŽæœ‰å…¶å®ƒé¡žåž‹çš„å¯†é‘°å­˜åœ¨ã€‚æƒ¡æ„çš„æ”»æ“Šè€…å¯èƒ½æœƒåˆ©ç”¨æ”¹è®Šé è¨­çš„ä¼ºæœå™¨å¯†é‘°ä¾†è®“æ‚¨çš„ç”¨æˆ¶ç«¯èªç‚ºåŽŸæœ¬çš„å¯†é‘°ä¸¦ä¸å­˜åœ¨</translation>
+    </message>
+    <message>
+        <location filename="onmainwindow_part2.cpp" line="110"/>
+        <source>Could not find known host file.If you accept the host key here, the file will be automatically created</source>
+        <translation>目前沒有發現已知的主機檔案。如果您接受目前的主機密鑰，這個檔案將會自動被建立。</translation>
+    </message>
+    <message>
+        <location filename="onmainwindow_part2.cpp" line="115"/>
+        <source>The server is unknown. Do you trust the host key?
+Public key hash: </source>
+        <translation>此為未知的伺服器，您要選擇信任此主機密鑰嗎?
+此公開密鑰的雜湊值為:</translation>
+    </message>
+    <message>
+        <location filename="onmainwindow_part2.cpp" line="119"/>
+        <location filename="onmainwindow_part2.cpp" line="126"/>
+        <source>Host key verification failed</source>
+        <translation>主機密鑰驗證任失敗</translation>
+    </message>
+    <message>
+        <location filename="onmainwindow_part2.cpp" line="119"/>
+        <location filename="onmainwindow_part2.cpp" line="1169"/>
+        <location filename="onmainwindow_part2.cpp" line="1189"/>
+        <source>Yes</source>
+        <translation>是</translation>
+    </message>
+    <message>
+        <location filename="onmainwindow_part2.cpp" line="119"/>
+        <location filename="onmainwindow_part2.cpp" line="1170"/>
+        <location filename="onmainwindow_part2.cpp" line="1190"/>
+        <source>No</source>
+        <translation>否</translation>
+    </message>
+    <message>
+        <location filename="onmainwindow_part2.cpp" line="141"/>
+        <source>Authentification failed</source>
+        <translation>認證失敗</translation>
     </message>
     <message>
         <location filename="onmainwindow_part2.cpp" line="293"/>
         <location filename="onmainwindow_part2.cpp" line="1289"/>
         <location filename="onmainwindow_part2.cpp" line="1373"/>
+        <location filename="onmainwindow_part2.cpp" line="1406"/>
+        <location filename="onmainwindow_part3.cpp" line="766"/>
+        <location filename="onmainwindow_part3.cpp" line="847"/>
+        <location filename="onmainwindow_part3.cpp" line="1219"/>
+        <location filename="onmainwindow_part3.cpp" line="1272"/>
+        <location filename="onmainwindow_part3.cpp" line="2256"/>
+        <source><b>Connection failed</b>
+</source>
+        <translation><b>連線失敗</b>
+</translation>
+    </message>
+    <message>
+        <location filename="onmainwindow_part2.cpp" line="296"/>
+        <location filename="onmainwindow_part2.cpp" line="1292"/>
+        <location filename="onmainwindow_part2.cpp" line="1376"/>
         <location filename="onmainwindow_part3.cpp" line="199"/>
-        <location filename="onmainwindow_part3.cpp" line="764"/>
-        <location filename="onmainwindow_part3.cpp" line="844"/>
-        <location filename="onmainwindow_part3.cpp" line="1216"/>
-        <location filename="onmainwindow_part3.cpp" line="1269"/>
-        <location filename="onmainwindow_part3.cpp" line="2253"/>
+        <location filename="onmainwindow_part3.cpp" line="769"/>
+        <location filename="onmainwindow_part3.cpp" line="850"/>
+        <location filename="onmainwindow_part3.cpp" line="1222"/>
+        <location filename="onmainwindow_part3.cpp" line="1275"/>
+        <location filename="onmainwindow_part3.cpp" line="2259"/>
         <source><b>Wrong password!</b><br><br></source>
-        <translation type="unfinished"></translation>
+        <translation><b>不正確的密碼!</b><br><br></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="409"/>
+        <location filename="onmainwindow_part2.cpp" line="412"/>
         <source>unknown</source>
-        <translation type="unfinished"></translation>
+        <translation>未知</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="474"/>
+        <location filename="onmainwindow_part2.cpp" line="477"/>
         <source>No server availabel</source>
-        <translation type="unfinished"></translation>
+        <translation>伺服器不存在l</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1002"/>
-        <location filename="onmainwindow_part4.cpp" line="1752"/>
+        <location filename="onmainwindow_part2.cpp" line="486"/>
+        <location filename="onmainwindow_part2.cpp" line="785"/>
+        <location filename="onmainwindow_part2.cpp" line="1236"/>
+        <location filename="onmainwindow_part2.cpp" line="1348"/>
+        <source>Server not availabel</source>
+        <translation>伺服器不存在|</translation>
+    </message>
+    <message>
+        <location filename="onmainwindow_part2.cpp" line="1005"/>
+        <location filename="onmainwindow_part4.cpp" line="1986"/>
         <source>Select session:</source>
-        <translation type="unfinished"></translation>
+        <translation>請選擇工作階段:</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1018"/>
-        <location filename="onmainwindow_part2.cpp" line="1112"/>
-        <location filename="onmainwindow_part2.cpp" line="2164"/>
+        <location filename="onmainwindow_part2.cpp" line="1021"/>
+        <location filename="onmainwindow_part2.cpp" line="1115"/>
+        <location filename="onmainwindow_part2.cpp" line="2168"/>
         <source>running</source>
-        <translation type="unfinished"></translation>
+        <translation>正在執行中</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1020"/>
-        <location filename="onmainwindow_part2.cpp" line="1305"/>
+        <location filename="onmainwindow_part2.cpp" line="1023"/>
+        <location filename="onmainwindow_part2.cpp" line="1308"/>
         <source>suspended</source>
-        <translation type="unfinished"></translation>
+        <translation>已暫停</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1026"/>
+        <location filename="onmainwindow_part2.cpp" line="1029"/>
         <source>Desktop</source>
-        <translation type="unfinished"></translation>
+        <translation>桌面</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1028"/>
+        <location filename="onmainwindow_part2.cpp" line="1031"/>
         <source>single application</source>
-        <translation type="unfinished"></translation>
+        <translation>單一的應用程式</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1030"/>
+        <location filename="onmainwindow_part2.cpp" line="1033"/>
         <source>shadow session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1063"/>
+        <location filename="onmainwindow_part2.cpp" line="1066"/>
         <source>Information</source>
-        <translation type="unfinished"></translation>
+        <translation>資訊</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1064"/>
+        <location filename="onmainwindow_part2.cpp" line="1067"/>
         <source>No accessible desktop found</source>
-        <translation type="unfinished"></translation>
+        <translation>目前沒有找到可訪問的工作桌面</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1077"/>
-        <location filename="onmainwindow_part4.cpp" line="2165"/>
+        <location filename="onmainwindow_part2.cpp" line="1080"/>
+        <location filename="onmainwindow_part4.cpp" line="2399"/>
         <source>Filter</source>
-        <translation type="unfinished"></translation>
+        <translation>篩選器</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1084"/>
+        <location filename="onmainwindow_part2.cpp" line="1087"/>
         <source>Select desktop:</source>
-        <translation type="unfinished"></translation>
+        <translation>請選擇工作桌面:</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1153"/>
-        <location filename="onmainwindow_part2.cpp" line="1173"/>
-        <location filename="onmainwindow_part2.cpp" line="1987"/>
-        <location filename="onmainwindow_part2.cpp" line="2376"/>
+        <location filename="onmainwindow_part2.cpp" line="1156"/>
+        <location filename="onmainwindow_part2.cpp" line="1176"/>
+        <location filename="onmainwindow_part2.cpp" line="1991"/>
+        <location filename="onmainwindow_part2.cpp" line="2380"/>
         <source>Warning</source>
-        <translation type="unfinished"></translation>
+        <translation>警告</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1154"/>
-        <location filename="onmainwindow_part2.cpp" line="1174"/>
+        <location filename="onmainwindow_part2.cpp" line="1157"/>
+        <location filename="onmainwindow_part2.cpp" line="1177"/>
         <source>Your current color depth is different to the color depth of your x2go-session. This may cause problems reconnecting to this session and in most cases <b>you will loose the session</b> and have to start a new one! It's highly recommended to change the color depth of your Display to </source>
-        <translation type="unfinished"></translation>
+        <translation>您目前使用與x2goå·¥ä½œéšŽæ®µä¸åŒçš„è‰²å½©è¨­å®šã€‚å¯èƒ½æœƒé€ æˆé€£ç·šçš„ä¸ç©©å®šï¼Œä¸¦ä¸”å¾ˆå¯èƒ½æœƒå–ªå¤±ç›®å‰çš„å·¥ä½œéšŽæ®µã€‚å¼·çƒˆå»ºè­°å…ˆå°‡ç›®å‰ä½¿ç”¨çš„è‰²å½©è¨­å®šè¨­ç‚º</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1162"/>
+        <location filename="onmainwindow_part2.cpp" line="1165"/>
         <source>24 or 32</source>
-        <translation type="unfinished"></translation>
+        <translation>24或32</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1163"/>
-        <location filename="onmainwindow_part2.cpp" line="1183"/>
-        <source> bit and restart your X-server before you reconnect to this x2go-session.<br>Resume this session anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="onmainwindow_part2.cpp" line="119"/>
         <location filename="onmainwindow_part2.cpp" line="1166"/>
         <location filename="onmainwindow_part2.cpp" line="1186"/>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="onmainwindow_part2.cpp" line="79"/>
-        <source>Host key for server changed.
-It is now: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="onmainwindow_part2.cpp" line="80"/>
-        <source>For security reasons, connection will be stopped</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="onmainwindow_part2.cpp" line="90"/>
-        <source>The host key for this server was not found but an othertype of key exists.An attacker might change the default server key toconfuse your client into thinking the key does not exist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="onmainwindow_part2.cpp" line="110"/>
-        <source>Could not find known host file.If you accept the host key here, the file will be automatically created</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="onmainwindow_part2.cpp" line="115"/>
-        <source>The server is unknown. Do you trust the host key?
-Public key hash: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="onmainwindow_part2.cpp" line="119"/>
-        <location filename="onmainwindow_part2.cpp" line="1167"/>
-        <location filename="onmainwindow_part2.cpp" line="1187"/>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="onmainwindow_part2.cpp" line="119"/>
-        <location filename="onmainwindow_part2.cpp" line="126"/>
-        <source>Host key verification failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="onmainwindow_part2.cpp" line="141"/>
-        <source>Authentification failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="onmainwindow_part2.cpp" line="483"/>
-        <location filename="onmainwindow_part2.cpp" line="782"/>
-        <location filename="onmainwindow_part2.cpp" line="1233"/>
-        <location filename="onmainwindow_part2.cpp" line="1345"/>
-        <source>Server not availabel</source>
-        <translation type="unfinished"></translation>
+        <source> bit and restart your X-server before you reconnect to this x2go-session.<br>Resume this session anyway?</source>
+        <translation>位元並且重新啟動X-server，之後再重新連接這一個工作階段。<br>請問您無論如何都要恢復此工作階段的連線嗎?</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1250"/>
+        <location filename="onmainwindow_part2.cpp" line="1253"/>
         <source>suspending</source>
-        <translation type="unfinished"></translation>
+        <translation>正在暫停工作中</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1272"/>
+        <location filename="onmainwindow_part2.cpp" line="1275"/>
         <source>terminating</source>
-        <translation type="unfinished"></translation>
+        <translation>正在中止工作中</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1406"/>
+        <location filename="onmainwindow_part2.cpp" line="1409"/>
         <source><b>Wrong Password!</b><br><br></source>
-        <translation type="unfinished"></translation>
+        <translation><b>不正確的密碼!</b><br><br></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1799"/>
-        <location filename="onmainwindow_part3.cpp" line="1090"/>
+        <location filename="onmainwindow_part2.cpp" line="1802"/>
+        <location filename="onmainwindow_part3.cpp" line="1096"/>
         <source>Unable to create folder:</source>
-        <translation type="unfinished"></translation>
+        <translation>無法創建資料夾:</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1825"/>
+        <location filename="onmainwindow_part2.cpp" line="1828"/>
         <source>Unable to write file:</source>
-        <translation type="unfinished"></translation>
+        <translation>檔案無法寫入:</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1930"/>
-        <location filename="onmainwindow_part4.cpp" line="1029"/>
+        <location filename="onmainwindow_part2.cpp" line="1934"/>
+        <location filename="onmainwindow_part4.cpp" line="1263"/>
         <source>Attach X2Go window</source>
-        <translation type="unfinished"></translation>
+        <translation>連接X2Go視窗</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1956"/>
-        <location filename="onmainwindow_part3.cpp" line="2324"/>
+        <location filename="onmainwindow_part2.cpp" line="1960"/>
+        <location filename="onmainwindow_part3.cpp" line="2330"/>
         <source>Unable to create SSL tunnel:
 </source>
-        <translation type="unfinished"></translation>
+        <translation>無法建立SSL通道:</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1985"/>
+        <location filename="onmainwindow_part2.cpp" line="1989"/>
         <source>Unable to create SSL Tunnel:
 </source>
-        <translation type="unfinished"></translation>
+        <translation>無法建立SSL通道:
+</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2133"/>
+        <location filename="onmainwindow_part2.cpp" line="2137"/>
         <source>Finished</source>
-        <translation type="unfinished"></translation>
+        <translation>已完成</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2156"/>
+        <location filename="onmainwindow_part2.cpp" line="2160"/>
         <source>starting</source>
-        <translation type="unfinished"></translation>
+        <translation>正在開始</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2158"/>
+        <location filename="onmainwindow_part2.cpp" line="2162"/>
         <source>resuming</source>
-        <translation type="unfinished"></translation>
+        <translation>正在還原</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2220"/>
-        <location filename="onmainwindow_part2.cpp" line="2488"/>
-        <location filename="onmainwindow_part2.cpp" line="2506"/>
+        <location filename="onmainwindow_part2.cpp" line="2224"/>
+        <location filename="onmainwindow_part2.cpp" line="2492"/>
+        <location filename="onmainwindow_part2.cpp" line="2510"/>
         <source>Connection timeout, aborting</source>
-        <translation type="unfinished"></translation>
+        <translation>連線超時，中止中</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2221"/>
+        <location filename="onmainwindow_part2.cpp" line="2225"/>
         <source>aborting</source>
-        <translation type="unfinished"></translation>
+        <translation>中止中</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2377"/>
+        <location filename="onmainwindow_part2.cpp" line="2381"/>
         <source>Are you sure you want to terminate this session?
 Unsaved documents will be lost</source>
-        <translation type="unfinished"></translation>
+        <translation>您確定要終止目前的工作階段嗎? 所有未存檔的資料都將會遺失</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2456"/>
+        <location filename="onmainwindow_part2.cpp" line="2460"/>
         <source>Session</source>
-        <translation type="unfinished"></translation>
+        <translation>工作階段</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2458"/>
-        <location filename="onmainwindow_part4.cpp" line="1833"/>
-        <location filename="onmainwindow_part4.cpp" line="1855"/>
+        <location filename="onmainwindow_part2.cpp" line="2462"/>
+        <location filename="onmainwindow_part4.cpp" line="2067"/>
+        <location filename="onmainwindow_part4.cpp" line="2089"/>
         <source>Display</source>
-        <translation type="unfinished"></translation>
+        <translation>顯示</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2460"/>
-        <location filename="onmainwindow_part4.cpp" line="1844"/>
+        <location filename="onmainwindow_part2.cpp" line="2464"/>
+        <location filename="onmainwindow_part4.cpp" line="2078"/>
         <source>Creation time</source>
-        <translation type="unfinished"></translation>
+        <translation>創建時間</translation>
     </message>
     <message>
         <location filename="onmainwindow_part3.cpp" line="196"/>
         <source><b>Connection failed</b>
 :
 </source>
-        <translation type="unfinished"></translation>
+        <translation><b>連線失敗</b>
+:
+</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="404"/>
+        <location filename="onmainwindow_part3.cpp" line="409"/>
         <source> (can't open file)</source>
-        <translation type="unfinished"></translation>
+        <translation> (無法開啟檔案)</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="415"/>
-        <location filename="onmainwindow_part3.cpp" line="425"/>
-        <location filename="onmainwindow_part3.cpp" line="435"/>
+        <location filename="onmainwindow_part3.cpp" line="420"/>
+        <location filename="onmainwindow_part3.cpp" line="430"/>
+        <location filename="onmainwindow_part3.cpp" line="440"/>
         <source> (file not exists)</source>
-        <translation type="unfinished"></translation>
+        <translation> (檔案不存在)</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="459"/>
+        <location filename="onmainwindow_part3.cpp" line="464"/>
         <source> (directory not exists)</source>
-        <translation type="unfinished"></translation>
+        <translation> (目錄不存在)</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="487"/>
+        <location filename="onmainwindow_part3.cpp" line="492"/>
         <source>wrong value for argument"--link"</source>
-        <translation type="unfinished"></translation>
+        <translation>"--link"參數的值錯誤</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="505"/>
+        <location filename="onmainwindow_part3.cpp" line="510"/>
         <source>wrong value for argument"--sound"</source>
-        <translation type="unfinished"></translation>
+        <translation>"--sound"參數的值錯誤</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="522"/>
-        <location filename="onmainwindow_part3.cpp" line="533"/>
+        <location filename="onmainwindow_part3.cpp" line="527"/>
+        <location filename="onmainwindow_part3.cpp" line="538"/>
         <source>wrong value for argument"--geometry"</source>
-        <translation type="unfinished"></translation>
+        <translation>"--geometry"參數的值錯誤</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="551"/>
+        <location filename="onmainwindow_part3.cpp" line="556"/>
         <source>wrong value for argument"--set-kbd"</source>
-        <translation type="unfinished"></translation>
+        <translation>"--set-kbd"參數的值錯誤</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="568"/>
+        <location filename="onmainwindow_part3.cpp" line="573"/>
         <source>wrong value for argument"--ldap"</source>
-        <translation type="unfinished"></translation>
+        <translation>"--ldap"參數的值錯誤</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="590"/>
+        <location filename="onmainwindow_part3.cpp" line="595"/>
         <source>wrong value for argument"--ldap1"</source>
-        <translation type="unfinished"></translation>
+        <translation>"--ldap1"參數的值錯誤</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="609"/>
+        <location filename="onmainwindow_part3.cpp" line="614"/>
         <source>wrong value for argument"--ldap2"</source>
-        <translation type="unfinished"></translation>
+        <translation>"--ldap2"參數的值錯誤</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="663"/>
+        <location filename="onmainwindow_part3.cpp" line="668"/>
         <source>wrong value for argument"--pack"</source>
-        <translation type="unfinished"></translation>
+        <translation>"--pack"參數的值錯誤</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="671"/>
-        <location filename="onmainwindow_part3.cpp" line="674"/>
+        <location filename="onmainwindow_part3.cpp" line="676"/>
+        <location filename="onmainwindow_part3.cpp" line="679"/>
         <source>wrong parameter: </source>
-        <translation type="unfinished"></translation>
+        <translation>錯誤的參數:</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="719"/>
-        <location filename="onmainwindow_part3.cpp" line="745"/>
+        <location filename="onmainwindow_part3.cpp" line="724"/>
+        <location filename="onmainwindow_part3.cpp" line="750"/>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation>é¸é …</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="724"/>
+        <location filename="onmainwindow_part3.cpp" line="729"/>
         <source>Available pack methodes:</source>
-        <translation type="unfinished"></translation>
+        <translation>可用的包裝方法:</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="1511"/>
+        <location filename="onmainwindow_part3.cpp" line="1517"/>
         <source>Support</source>
-        <translation type="unfinished"></translation>
+        <translation>支援</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="1516"/>
+        <location filename="onmainwindow_part3.cpp" line="1522"/>
         <source></b><br> (C. 2006-2011 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="1520"/>
+        <location filename="onmainwindow_part3.cpp" line="1526"/>
         <source><br>x2goplugin mode was sponsored by <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a><br></source>
-        <translation type="unfinished"></translation>
+        <translation><br>x2goplugin mode是由 <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a>提供贊助<br></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="1524"/>
+        <location filename="onmainwindow_part3.cpp" line="1530"/>
         <source><br>Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request authentification data from LDAP directories. Furthermore it can be used as fullscreen loginscreen (replacement for loginmanager like xdm). Please visit x2go.org for further information.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="1537"/>
+        <location filename="onmainwindow_part3.cpp" line="1543"/>
         <source><b>X2Go client V. </source>
-        <translation type="unfinished"></translation>
+        <translation><b>X2Go 客戶端 V. </translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="1582"/>
+        <location filename="onmainwindow_part3.cpp" line="1588"/>
         <source>Please check LDAP Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>請檢查LDAP的設定</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="1812"/>
+        <location filename="onmainwindow_part3.cpp" line="1818"/>
         <source>No valid card found</source>
-        <translation type="unfinished"></translation>
+        <translation>沒有發現合法的卡片</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="1860"/>
+        <location filename="onmainwindow_part3.cpp" line="1866"/>
         <source>This card is unknown by X2Go system</source>
-        <translation type="unfinished"></translation>
+        <translation>X2Go系統無法辨識此張卡片</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="1888"/>
+        <location filename="onmainwindow_part3.cpp" line="1894"/>
         <source>Unable to create file: </source>
-        <translation type="unfinished"></translation>
+        <translation>檔案無法創建:</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="2053"/>
-        <location filename="onmainwindow_part3.cpp" line="2078"/>
+        <location filename="onmainwindow_part3.cpp" line="2059"/>
+        <location filename="onmainwindow_part3.cpp" line="2084"/>
         <source>Can't connect to X-Server</source>
-        <translation type="unfinished"></translation>
+        <translation>無法連接至X伺服器</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="2054"/>
-        <location filename="onmainwindow_part3.cpp" line="2079"/>
+        <location filename="onmainwindow_part3.cpp" line="2060"/>
+        <location filename="onmainwindow_part3.cpp" line="2085"/>
         <source>Can't connect to X-Server
 Please check your settings</source>
-        <translation type="unfinished"></translation>
+        <translation>無法連接至X伺服器
+請檢查您的設定值</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="2087"/>
+        <location filename="onmainwindow_part3.cpp" line="2093"/>
         <source>Can't start X Server
 Please check your settings</source>
-        <translation type="unfinished"></translation>
+        <translation>無法啟動X伺服器
+請檢查您的設定值</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="2101"/>
+        <location filename="onmainwindow_part3.cpp" line="2107"/>
         <location filename="onmainwindow_part4.cpp" line="422"/>
         <location filename="onmainwindow_part4.cpp" line="450"/>
         <source>Can't start X Server
 Please check your installation</source>
-        <translation type="unfinished"></translation>
+        <translation>無法啟動X伺服器
+請檢查X伺服器安是否有安裝正確</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="2273"/>
+        <location filename="onmainwindow_part3.cpp" line="2279"/>
         <source>Unable to execute: </source>
-        <translation type="unfinished"></translation>
+        <translation>無法執行:</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="2289"/>
+        <location filename="onmainwindow_part3.cpp" line="2295"/>
         <source>Remote server does not support file system export through SSH Tunnel
 Please update to a newer x2goserver package</source>
-        <translation type="unfinished"></translation>
+        <translation>é ç«¯ä¼ºæœå™¨ç„¡æ³•æ”¯æ´SSH通道型式的共用檔案系統，請升級至較新的X2Go伺服器板本</translation>
     </message>
     <message>
         <location filename="onmainwindow_part4.cpp" line="28"/>
         <source>Unable to read :
 </source>
-        <translation type="unfinished"></translation>
+        <translation>無法讀取:
+</translation>
     </message>
     <message>
         <location filename="onmainwindow_part4.cpp" line="53"/>
         <source>Unable to write :
 </source>
+        <translation>無法寫入:
+</translation>
+    </message>
+    <message>
+        <location filename="onmainwindow_part4.cpp" line="141"/>
+        <source>WINDOWS-1252</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1118"/>
-        <source>X2Go Session</source>
+        <location filename="onmainwindow_part4.cpp" line="153"/>
+        <source>ISO8859-1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1423"/>
+        <location filename="onmainwindow_part4.cpp" line="1352"/>
+        <source>X2Go Session</source>
+        <translation>X2Go工作階段</translation>
+    </message>
+    <message>
+        <location filename="onmainwindow_part4.cpp" line="1534"/>
+        <source>wrong value for argument"speed"</source>
+        <translation>錯誤的"speed"參數值</translation>
+    </message>
+    <message>
+        <location filename="onmainwindow_part4.cpp" line="1657"/>
         <source>Password:</source>
-        <translation type="unfinished"></translation>
+        <translation>密碼:</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1424"/>
+        <location filename="onmainwindow_part4.cpp" line="1658"/>
         <source>Keyboard layout:</source>
-        <translation type="unfinished"></translation>
+        <translation>鑑盤佈局:</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1465"/>
+        <location filename="onmainwindow_part4.cpp" line="1699"/>
         <source>Ok</source>
-        <translation type="unfinished"></translation>
+        <translation>確定</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1467"/>
-        <location filename="onmainwindow_part4.cpp" line="1756"/>
-        <location filename="onmainwindow_part4.cpp" line="1758"/>
+        <location filename="onmainwindow_part4.cpp" line="1701"/>
+        <location filename="onmainwindow_part4.cpp" line="1990"/>
+        <location filename="onmainwindow_part4.cpp" line="1992"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>取消</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1600"/>
+        <location filename="onmainwindow_part4.cpp" line="1834"/>
         <source><b>Session ID:<br>Server:<br>Username:<br>Display:<br>Creation time:<br>Status:</b></source>
-        <translation type="unfinished"></translation>
+        <translation><b>工作階段識別碼:<br>伺服器:<br>使用者名稱:<br>顯示:<br>創建時間:<br>狀態:</b></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1608"/>
+        <location filename="onmainwindow_part4.cpp" line="1842"/>
         <source>Abort</source>
-        <translation type="unfinished"></translation>
+        <translation>退出</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1612"/>
+        <location filename="onmainwindow_part4.cpp" line="1846"/>
         <source>Show details</source>
-        <translation type="unfinished"></translation>
+        <translation>顯示細節</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1754"/>
+        <location filename="onmainwindow_part4.cpp" line="1988"/>
         <source>Resume</source>
-        <translation type="unfinished"></translation>
+        <translation>恢復</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1766"/>
+        <location filename="onmainwindow_part4.cpp" line="2000"/>
         <source>New</source>
-        <translation type="unfinished"></translation>
+        <translation>新增</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1769"/>
+        <location filename="onmainwindow_part4.cpp" line="2003"/>
         <source>Full access</source>
-        <translation type="unfinished"></translation>
+        <translation>完全存取</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1772"/>
+        <location filename="onmainwindow_part4.cpp" line="2006"/>
         <source>View only</source>
-        <translation type="unfinished"></translation>
+        <translation>僅查看</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1835"/>
+        <location filename="onmainwindow_part4.cpp" line="2069"/>
         <source>Status</source>
-        <translation type="unfinished"></translation>
+        <translation>狀態</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1837"/>
+        <location filename="onmainwindow_part4.cpp" line="2071"/>
         <source>Command</source>
-        <translation type="unfinished"></translation>
+        <translation>指令</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1839"/>
+        <location filename="onmainwindow_part4.cpp" line="2073"/>
         <source>Type</source>
-        <translation type="unfinished"></translation>
+        <translation>åž‹æ…‹</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1841"/>
+        <location filename="onmainwindow_part4.cpp" line="2075"/>
         <source>Server</source>
-        <translation type="unfinished"></translation>
+        <translation>伺服器</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1846"/>
+        <location filename="onmainwindow_part4.cpp" line="2080"/>
         <source>Client IP</source>
-        <translation type="unfinished"></translation>
+        <translation>客戶端IP</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1848"/>
+        <location filename="onmainwindow_part4.cpp" line="2082"/>
         <source>Session ID</source>
-        <translation type="unfinished"></translation>
+        <translation>工作階段識別碼</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1852"/>
+        <location filename="onmainwindow_part4.cpp" line="2086"/>
         <source>User</source>
-        <translation type="unfinished"></translation>
+        <translation>使用者</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1883"/>
+        <location filename="onmainwindow_part4.cpp" line="2117"/>
         <source>Only my desktops</source>
-        <translation type="unfinished"></translation>
+        <translation>只選擇我的桌面</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1981"/>
+        <location filename="onmainwindow_part4.cpp" line="2215"/>
         <source>sshd not started, you'll need sshd for printing and file sharing
 you can install sshd with
 <b>sudo apt-get install openssh-server</b></source>
-        <translation type="unfinished"></translation>
+        <translation>SSHä¼ºæœå™¨æ²’æœ‰åŸ·è¡Œèµ·ä¾†ï¼Œé ç«¯åˆ—å°èˆ‡æª”æ¡ˆå…±äº«åŠŸèƒ½éœ€è¦å…ˆå®‰è£SSH伺服器
+您可以使用下列指令來安裝SSH伺服器:
+<b>sudo apt-get install openssh-server</b></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="2052"/>
+        <location filename="onmainwindow_part4.cpp" line="2286"/>
         <source>Restore toolbar</source>
-        <translation type="unfinished"></translation>
+        <translation>還原工具列</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="2097"/>
+        <location filename="onmainwindow_part4.cpp" line="2331"/>
         <source><br><b>&nbsp;&nbsp;&nbsp;Click this button&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;to restore toolbar&nbsp;&nbsp;&nbsp;</b><br></source>
-        <translation type="unfinished"></translation>
+        <translation><br><b>&nbsp;&nbsp;&nbsp;按此按鈕&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;還原工具列&nbsp;&nbsp;&nbsp;</b><br></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="2252"/>
+        <location filename="onmainwindow_part4.cpp" line="2486"/>
         <source>Invalid reply from broker</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="onmainwindow.cpp" line="834"/>
-        <location filename="onmainwindow.cpp" line="2354"/>
-        <location filename="onmainwindow_part4.cpp" line="2234"/>
-        <source>Connecting to broker</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="onmainwindow_part4.cpp" line="141"/>
-        <source>WINDOWS-1252</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="onmainwindow_part4.cpp" line="153"/>
-        <source>ISO8859-1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="onmainwindow_part4.cpp" line="1300"/>
-        <source>wrong value for argument"speed"</source>
-        <translation type="unfinished"></translation>
+        <translation>代理伺服器的回應不合法</translation>
     </message>
 </context>
 <context>
     <name>PrintDialog</name>
     <message>
+        <location filename="printdialog.ui" line="16"/>
+        <source>Print - X2Go client</source>
+        <translation>列印 - X2Go用戶端</translation>
+    </message>
+    <message>
         <location filename="printdialog.cpp" line="25"/>
         <source>Print</source>
-        <translation type="unfinished"></translation>
+        <translation>列印</translation>
     </message>
     <message>
         <location filename="printdialog.cpp" line="54"/>
         <source>You've deactivated the x2go client printing dialog.</source>
-        <translation type="unfinished"></translation>
+        <translation>您已經停用X2Go用戶端的列印對話框</translation>
     </message>
     <message>
         <location filename="printdialog.cpp" line="56"/>
         <source>You may reactivate this dialog using the x2goclient settings dialog (Menu -> Options -> Settings)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="printdialog.ui" line="16"/>
-        <source>Print - X2Go client</source>
-        <translation type="unfinished"></translation>
+        <translation>您可能需要於X2Go用戶端的設定對話框中(選單 -> é¸é … -> 設定)重新啟用這個對話框</translation>
     </message>
 </context>
 <context>
@@ -1565,124 +1635,112 @@ you can install sshd with
     <message>
         <location filename="printprocess.cpp" line="155"/>
         <source>Save File</source>
-        <translation type="unfinished"></translation>
+        <translation>儲存檔案</translation>
     </message>
     <message>
         <location filename="printprocess.cpp" line="157"/>
         <source>PDF Document (*.pdf)</source>
-        <translation type="unfinished"></translation>
+        <translation>PDF文件 (*.pdf)</translation>
     </message>
     <message>
         <location filename="printprocess.cpp" line="251"/>
         <location filename="printprocess.cpp" line="274"/>
         <source>Failed to execute command:
 </source>
-        <translation type="unfinished"></translation>
+        <translation>執行命令失敗:</translation>
     </message>
     <message>
         <location filename="printprocess.cpp" line="266"/>
         <location filename="printprocess.cpp" line="273"/>
         <source>Printing error</source>
-        <translation type="unfinished"></translation>
+        <translation>列印錯誤</translation>
     </message>
 </context>
 <context>
     <name>PrintWidget</name>
     <message>
-        <location filename="printwidget.cpp" line="53"/>
-        <source>Please configure your client side printing settings.<br><br>If you want to print the created file, you'll need an external application. Typically you can use <a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghostprint</a> and <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a><br>You can find  further information <a href="http://www.x2go.org/index.php?id=49">here</a>.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="printwidget.ui" line="13"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>表單</translation>
     </message>
     <message>
         <location filename="printwidget.ui" line="23"/>
         <source>Print</source>
-        <translation type="unfinished"></translation>
+        <translation>列印</translation>
     </message>
     <message>
         <location filename="printwidget.ui" line="33"/>
         <source>View as PDF</source>
-        <translation type="unfinished"></translation>
+        <translation>以PDFæ ¼å¼æŸ¥çœ‹</translation>
     </message>
     <message>
         <location filename="printwidget.ui" line="63"/>
         <source>Print settings</source>
-        <translation type="unfinished"></translation>
+        <translation>列印設定</translation>
     </message>
     <message>
         <location filename="printwidget.ui" line="69"/>
         <source>Printer:</source>
-        <translation type="unfinished"></translation>
+        <translation>印表機:</translation>
     </message>
     <message>
         <location filename="printwidget.ui" line="79"/>
         <source>Print using default Windows PDF Viewer
 (Viewer application needs to be installed)</source>
-        <translation type="unfinished"></translation>
+        <translation>ä»¥é è¨­çš„Windows PDF閱讀器列印(必需要安裝閱讀器)</translation>
     </message>
     <message>
         <location filename="printwidget.ui" line="94"/>
         <source>Printer command:</source>
-        <translation type="unfinished"></translation>
+        <translation>印表機指令:</translation>
     </message>
     <message>
         <location filename="printwidget.ui" line="116"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="printwidget.ui" line="147"/>
         <source>Viewer settings</source>
-        <translation type="unfinished"></translation>
+        <translation>閱讀器設定</translation>
     </message>
     <message>
         <location filename="printwidget.ui" line="153"/>
         <source>Open in viewer application</source>
-        <translation type="unfinished"></translation>
+        <translation>在閱讀器程式裡開啟</translation>
     </message>
     <message>
         <location filename="printwidget.ui" line="165"/>
         <source>Command:</source>
-        <translation type="unfinished"></translation>
+        <translation>指令:</translation>
     </message>
     <message>
         <location filename="printwidget.ui" line="177"/>
         <source>Save to disk</source>
-        <translation type="unfinished"></translation>
+        <translation>儲存到磁碟裡</translation>
     </message>
     <message>
         <location filename="printwidget.ui" line="207"/>
         <source>Show this dialog before start printing</source>
-        <translation type="unfinished"></translation>
+        <translation>開始列印前先顯示此對話框</translation>
+    </message>
+    <message>
+        <location filename="printwidget.cpp" line="53"/>
+        <source>Please configure your client side printing settings.<br><br>If you want to print the created file, you'll need an external application. Typically you can use <a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghostprint</a> and <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a><br>You can find  further information <a href="http://www.x2go.org/index.php?id=49">here</a>.</source>
+        <translation>請設定您的客戶端列印設定<br><br>您會需要一個外部的程式來進行列印工作，您可以使用 <a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghostprint</a> 以及 <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a><br>如需進一步的資訊，請參考 <a href="http://www.x2go.org/index.php?id=49">這個網址</a>.</translation>
     </message>
 </context>
 <context>
     <name>PrinterCmdDialog</name>
     <message>
-        <location filename="printercmddialog.cpp" line="37"/>
-        <source>Please enter your customized or individual printing command.
-Example:
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="printercmddialog.cpp" line="45"/>
-        <source><Path to gsprint.exe> -query -color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="printercmddialog.ui" line="13"/>
         <source>Printer command</source>
-        <translation type="unfinished"></translation>
+        <translation>印表機指令</translation>
     </message>
     <message>
         <location filename="printercmddialog.ui" line="19"/>
         <source>Command</source>
-        <translation type="unfinished"></translation>
+        <translation>指令</translation>
     </message>
     <message>
         <location filename="printercmddialog.ui" line="25"/>
@@ -1690,151 +1748,177 @@ Example:
 Examples:
 kprinter
 lpr -P hp_laserjet</source>
-        <translation type="unfinished"></translation>
+        <translation>請輸入您自定的列印指令。
+例如:
+kprinter
+lpr -P hp_laserjet</translation>
     </message>
     <message>
         <location filename="printercmddialog.ui" line="44"/>
         <source>Output format</source>
-        <translation type="unfinished"></translation>
+        <translation>è¼¸å‡ºæ ¼å¼</translation>
     </message>
     <message>
         <location filename="printercmddialog.ui" line="50"/>
         <source>Please choose the printing file format (regarding to your printing environment - if you use CUPS you may use PDF)</source>
-        <translation type="unfinished"></translation>
+        <translation>è«‹é¸æ“‡æ‚¨è¦è¼¸å‡ºçš„æª”æ¡ˆæ ¼å¼ (如果您是使用CUPS列印服務，您可能是使用PDF)</translation>
     </message>
     <message>
         <location filename="printercmddialog.ui" line="66"/>
         <source>PDF</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="printercmddialog.ui" line="73"/>
         <source>PS</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="printercmddialog.ui" line="86"/>
         <source>Data structure</source>
-        <translation type="unfinished"></translation>
+        <translation>數據結構</translation>
     </message>
     <message>
         <location filename="printercmddialog.ui" line="92"/>
         <source>Please choose the method of printing file input (some commands accepting printing files as program options, some are awaiting data on standard input):</source>
-        <translation type="unfinished"></translation>
+        <translation>請選擇列印資料的輸入方式:</translation>
     </message>
     <message>
         <location filename="printercmddialog.ui" line="108"/>
         <source>standard input (STDIN)</source>
-        <translation type="unfinished"></translation>
+        <translation>標準輸入 (STDIN)</translation>
     </message>
     <message>
         <location filename="printercmddialog.ui" line="115"/>
         <source>Specify path as program parameter</source>
-        <translation type="unfinished"></translation>
+        <translation>指定一個路徑做為程式的參數</translation>
+    </message>
+    <message>
+        <location filename="printercmddialog.cpp" line="37"/>
+        <source>Please enter your customized or individual printing command.
+Example:
+</source>
+        <translation>請輸入您自定的列印指令
+範例:
+</translation>
+    </message>
+    <message>
+        <location filename="printercmddialog.cpp" line="45"/>
+        <source><Path to gsprint.exe> -query -color</source>
+        <translation><Path to gsprint.exe> -query -color</translation>
     </message>
 </context>
 <context>
     <name>SessionButton</name>
     <message>
-        <location filename="sessionbutton.cpp" line="114"/>
+        <location filename="sessionbutton.cpp" line="116"/>
         <source>Session preferences...</source>
-        <translation type="unfinished"></translation>
+        <translation>工作階段偏好設定...</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="118"/>
+        <location filename="sessionbutton.cpp" line="120"/>
         <source>Create session icon on desktop...</source>
-        <translation type="unfinished"></translation>
+        <translation>在桌面上建立工作階段圖示</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="123"/>
+        <location filename="sessionbutton.cpp" line="125"/>
         <source>Delete session</source>
-        <translation type="unfinished"></translation>
+        <translation>刪除工作階段</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="136"/>
+        <location filename="sessionbutton.cpp" line="138"/>
         <source>Session actions</source>
-        <translation type="unfinished"></translation>
+        <translation>工作階段動作</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="137"/>
+        <location filename="sessionbutton.cpp" line="139"/>
         <source>Select type</source>
-        <translation type="unfinished"></translation>
+        <translation>選擇類型</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="139"/>
+        <location filename="sessionbutton.cpp" line="141"/>
         <source>Select resolution</source>
-        <translation type="unfinished"></translation>
+        <translation>選擇解析度</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="140"/>
+        <location filename="sessionbutton.cpp" line="142"/>
         <source>Toggle sound support</source>
-        <translation type="unfinished"></translation>
+        <translation>切換聲音支援</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="270"/>
+        <location filename="sessionbutton.cpp" line="272"/>
         <source>New Session</source>
-        <translation type="unfinished"></translation>
+        <translation>新工作階段</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="275"/>
+        <location filename="sessionbutton.cpp" line="277"/>
         <source>running</source>
-        <translation type="unfinished"></translation>
+        <translation>執行中</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="279"/>
+        <location filename="sessionbutton.cpp" line="281"/>
         <source>suspended</source>
-        <translation type="unfinished"></translation>
+        <translation>已暫停</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="312"/>
+        <location filename="sessionbutton.cpp" line="314"/>
         <source>KDE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="323"/>
-        <location filename="sessionbutton.cpp" line="355"/>
-        <location filename="sessionbutton.cpp" line="588"/>
+        <location filename="sessionbutton.cpp" line="325"/>
+        <location filename="sessionbutton.cpp" line="357"/>
+        <location filename="sessionbutton.cpp" line="616"/>
         <source>RDP connection</source>
-        <translation type="unfinished"></translation>
+        <translation>RDP連線</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="324"/>
-        <location filename="sessionbutton.cpp" line="361"/>
-        <location filename="sessionbutton.cpp" line="594"/>
+        <location filename="sessionbutton.cpp" line="326"/>
+        <location filename="sessionbutton.cpp" line="363"/>
+        <location filename="sessionbutton.cpp" line="622"/>
         <source>XDMCP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="325"/>
-        <location filename="sessionbutton.cpp" line="349"/>
-        <location filename="sessionbutton.cpp" line="582"/>
+        <location filename="sessionbutton.cpp" line="327"/>
+        <location filename="sessionbutton.cpp" line="351"/>
+        <location filename="sessionbutton.cpp" line="610"/>
         <source>Connection to local desktop</source>
-        <translation type="unfinished"></translation>
+        <translation>連線至本地桌面</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="383"/>
-        <location filename="sessionbutton.cpp" line="395"/>
-        <location filename="sessionbutton.cpp" line="635"/>
+        <location filename="sessionbutton.cpp" line="385"/>
+        <location filename="sessionbutton.cpp" line="402"/>
+        <location filename="sessionbutton.cpp" line="663"/>
         <source>fullscreen</source>
-        <translation type="unfinished"></translation>
+        <translation>全螢幕</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="390"/>
-        <location filename="sessionbutton.cpp" line="409"/>
+        <location filename="sessionbutton.cpp" line="389"/>
+        <location filename="sessionbutton.cpp" line="412"/>
+        <location filename="sessionbutton.cpp" line="416"/>
+        <location filename="sessionbutton.cpp" line="669"/>
+        <location filename="sessionbutton.cpp" line="672"/>
+        <source>Display </source>
+        <translation>顯示</translation>
+    </message>
+    <message>
+        <location filename="sessionbutton.cpp" line="397"/>
+        <location filename="sessionbutton.cpp" line="437"/>
         <source>window</source>
-        <translation type="unfinished"></translation>
+        <translation>視窗</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="417"/>
-        <location filename="sessionbutton.cpp" line="547"/>
+        <location filename="sessionbutton.cpp" line="445"/>
+        <location filename="sessionbutton.cpp" line="575"/>
         <source>Enabled</source>
-        <translation type="unfinished"></translation>
+        <translation>啟用</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="419"/>
-        <location filename="sessionbutton.cpp" line="549"/>
+        <location filename="sessionbutton.cpp" line="447"/>
+        <location filename="sessionbutton.cpp" line="577"/>
         <source>Disabled</source>
-        <translation type="unfinished"></translation>
+        <translation>停用</translation>
     </message>
 </context>
 <context>
@@ -1842,38 +1926,38 @@ lpr -P hp_laserjet</source>
     <message>
         <location filename="sessionmanagedialog.cpp" line="35"/>
         <source>E&xit</source>
-        <translation type="unfinished"></translation>
+        <translation>離開(&x)</translation>
     </message>
     <message>
         <location filename="sessionmanagedialog.cpp" line="41"/>
         <source>&New session</source>
-        <translation type="unfinished"></translation>
+        <translation>建立新的工作階段(&N)</translation>
     </message>
     <message>
         <location filename="sessionmanagedialog.cpp" line="42"/>
         <source>&Session preferences</source>
-        <translation type="unfinished"></translation>
+        <translation>工作階段偏好設定(&S)</translation>
     </message>
     <message>
         <location filename="sessionmanagedialog.cpp" line="43"/>
         <source>&Delete session</source>
-        <translation type="unfinished"></translation>
+        <translation>刪除工作階段(&D)</translation>
     </message>
     <message>
         <location filename="sessionmanagedialog.cpp" line="47"/>
         <source>&Create session icon on desktop...</source>
-        <translation type="unfinished"></translation>
+        <translation>在桌面上建立工作階段圖示(&C)...</translation>
     </message>
     <message>
         <location filename="sessionmanagedialog.cpp" line="81"/>
         <source>Delete</source>
         <comment>Delete</comment>
-        <translation type="unfinished"></translation>
+        <translation>刪除</translation>
     </message>
     <message>
         <location filename="sessionmanagedialog.cpp" line="109"/>
         <source>Session management</source>
-        <translation type="unfinished"></translation>
+        <translation>管理工作階段</translation>
     </message>
 </context>
 <context>
@@ -1881,261 +1965,287 @@ lpr -P hp_laserjet</source>
     <message>
         <location filename="sessionwidget.cpp" line="52"/>
         <source>Session name:</source>
-        <translation type="unfinished"></translation>
+        <translation>工作階段名稱:</translation>
     </message>
     <message>
         <location filename="sessionwidget.cpp" line="57"/>
         <source><< change icon</source>
-        <translation type="unfinished"></translation>
+        <translation><< 更換圖示</translation>
     </message>
     <message>
         <location filename="sessionwidget.cpp" line="60"/>
         <source>&Server</source>
-        <translation type="unfinished"></translation>
+        <translation>伺服器(&S)</translation>
     </message>
     <message>
         <location filename="sessionwidget.cpp" line="87"/>
         <source>Host:</source>
-        <translation type="unfinished"></translation>
+        <translation>主機:</translation>
     </message>
     <message>
         <location filename="sessionwidget.cpp" line="88"/>
         <source>Login:</source>
-        <translation type="unfinished"></translation>
+        <translation>登入帳號:</translation>
     </message>
     <message>
         <location filename="sessionwidget.cpp" line="89"/>
         <source>SSH port:</source>
-        <translation type="unfinished"></translation>
+        <translation>SSHé€£æŽ¥åŸ :</translation>
     </message>
     <message>
         <location filename="sessionwidget.cpp" line="101"/>
         <source>Use RSA/DSA key for ssh connection:</source>
-        <translation type="unfinished"></translation>
+        <translation>使用RSA/DSA密鑰於SSH連線:</translation>
     </message>
     <message>
         <location filename="sessionwidget.cpp" line="107"/>
         <source>Try auto login (ssh-agent or default ssh key)</source>
-        <translation type="unfinished"></translation>
+        <translation>嘗試自動登入 (sshä»£ç†æˆ–é è¨­SSH密鑰)</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="111"/>
+        <location filename="sessionwidget.cpp" line="108"/>
+        <source>Kerberos 5 (GSSAPI) authentication</source>
+        <translation>Kerberos 5 (GSSAPI) 認證</translation>
+    </message>
+    <message>
+        <location filename="sessionwidget.cpp" line="113"/>
         <source>&Session type</source>
-        <translation type="unfinished"></translation>
+        <translation>工作階段類型(&S)</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="116"/>
+        <location filename="sessionwidget.cpp" line="118"/>
         <source>Session type:</source>
-        <translation type="unfinished"></translation>
+        <translation>工作階段類型:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="125"/>
-        <location filename="sessionwidget.cpp" line="292"/>
+        <location filename="sessionwidget.cpp" line="127"/>
+        <location filename="sessionwidget.cpp" line="296"/>
         <source>Connect to Windows terminal server</source>
-        <translation type="unfinished"></translation>
+        <translation>連線至微軟終端伺服器</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="126"/>
+        <location filename="sessionwidget.cpp" line="128"/>
         <source>XDMCP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="127"/>
+        <location filename="sessionwidget.cpp" line="129"/>
         <source>Connect to local desktop</source>
-        <translation type="unfinished"></translation>
+        <translation>連線至本地桌面</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="128"/>
+        <location filename="sessionwidget.cpp" line="130"/>
         <source>Custom desktop</source>
-        <translation type="unfinished"></translation>
+        <translation>自訂桌面類型</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="129"/>
+        <location filename="sessionwidget.cpp" line="131"/>
         <source>Single application</source>
-        <translation type="unfinished"></translation>
+        <translation>單一應用程式</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="131"/>
-        <location filename="sessionwidget.cpp" line="248"/>
+        <location filename="sessionwidget.cpp" line="133"/>
+        <location filename="sessionwidget.cpp" line="252"/>
         <source>Command:</source>
-        <translation type="unfinished"></translation>
+        <translation>指令:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="132"/>
+        <location filename="sessionwidget.cpp" line="134"/>
         <source>Advanced options...</source>
-        <translation type="unfinished"></translation>
+        <translation>進階設定...</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="143"/>
-        <location filename="sessionwidget.cpp" line="420"/>
-        <location filename="sessionwidget.cpp" line="482"/>
+        <location filename="sessionwidget.cpp" line="145"/>
+        <location filename="sessionwidget.cpp" line="429"/>
+        <location filename="sessionwidget.cpp" line="492"/>
         <source>Path to executable</source>
-        <translation type="unfinished"></translation>
+        <translation>執行路徑</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="192"/>
+        <location filename="sessionwidget.cpp" line="196"/>
         <source>Open picture</source>
-        <translation type="unfinished"></translation>
+        <translation>開啟圖片</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="194"/>
+        <location filename="sessionwidget.cpp" line="198"/>
         <source>Pictures</source>
-        <translation type="unfinished"></translation>
+        <translation>圖片</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="215"/>
+        <location filename="sessionwidget.cpp" line="219"/>
         <source>Open key file</source>
-        <translation type="unfinished"></translation>
+        <translation>開啟密鑰檔案</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="217"/>
+        <location filename="sessionwidget.cpp" line="221"/>
         <source>All files</source>
-        <translation type="unfinished"></translation>
+        <translation>所有檔案</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="269"/>
-        <location filename="sessionwidget.cpp" line="384"/>
-        <source>Server:</source>
-        <translation type="unfinished"></translation>
+        <location filename="sessionwidget.cpp" line="231"/>
+        <source>Error</source>
+        <translation>錯誤</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="275"/>
-        <location filename="sessionwidget.cpp" line="392"/>
-        <source>XDMCP server:</source>
-        <translation type="unfinished"></translation>
+        <location filename="sessionwidget.cpp" line="232"/>
+        <source>x2goclient is running in portable mode. You should use a path on your usb device to be able to access your data whereever you are</source>
+        <translation>X2Go用戶端目前為可攜式模式，您應該要使用您的USB裝置的路徑來存取您的資料</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="293"/>
-        <source>rdesktop command line options:</source>
-        <translation type="unfinished"></translation>
+        <location filename="sessionwidget.cpp" line="273"/>
+        <location filename="sessionwidget.cpp" line="391"/>
+        <source>Server:</source>
+        <translation>伺服器:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="306"/>
-        <location filename="sessionwidget.cpp" line="404"/>
-        <source>New session</source>
-        <translation type="unfinished"></translation>
+        <location filename="sessionwidget.cpp" line="279"/>
+        <location filename="sessionwidget.cpp" line="399"/>
+        <source>XDMCP server:</source>
+        <translation>XDMCP 伺服器:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="227"/>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
+        <location filename="sessionwidget.cpp" line="297"/>
+        <source>rdesktop command line options:</source>
+        <translation>rdesktop æŒ‡ä»¤é¸é …:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="228"/>
-        <source>x2goclient is running in portable mode. You should use a path on your usb device to be able to access your data whereever you are</source>
-        <translation type="unfinished"></translation>
+        <location filename="sessionwidget.cpp" line="310"/>
+        <location filename="sessionwidget.cpp" line="411"/>
+        <source>New session</source>
+        <translation>新的工作階段</translation>
     </message>
 </context>
 <context>
     <name>SettingsWidget</name>
     <message>
-        <location filename="settingswidget.cpp" line="33"/>
-        <location filename="settingswidget.cpp" line="37"/>
+        <location filename="settingswidget.cpp" line="40"/>
+        <location filename="settingswidget.cpp" line="44"/>
         <source>&Display</source>
-        <translation type="unfinished"></translation>
+        <translation>顯示(&D)</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="34"/>
-        <location filename="settingswidget.cpp" line="38"/>
+        <location filename="settingswidget.cpp" line="41"/>
+        <location filename="settingswidget.cpp" line="45"/>
         <source>&Keyboard</source>
-        <translation type="unfinished"></translation>
+        <translation>鍵盤(&K)</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="35"/>
-        <location filename="settingswidget.cpp" line="39"/>
+        <location filename="settingswidget.cpp" line="42"/>
+        <location filename="settingswidget.cpp" line="46"/>
         <source>Sound</source>
-        <translation type="unfinished"></translation>
+        <translation>聲音</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="50"/>
+        <location filename="settingswidget.cpp" line="57"/>
         <source>Fullscreen</source>
-        <translation type="unfinished"></translation>
+        <translation>全螢幕</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="52"/>
+        <location filename="settingswidget.cpp" line="59"/>
         <source>Custom</source>
-        <translation type="unfinished"></translation>
+        <translation>自定</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="54"/>
+        <location filename="settingswidget.cpp" line="61"/>
         <source>Window</source>
-        <translation type="unfinished"></translation>
+        <translation>視窗</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="61"/>
+        <location filename="settingswidget.cpp" line="63"/>
+        <source>Use whole display</source>
+        <translation>使用整個顯示器</translation>
+    </message>
+    <message>
+        <location filename="settingswidget.cpp" line="71"/>
         <source>Set display DPI</source>
-        <translation type="unfinished"></translation>
+        <translation>設定顯示DPI</translation>
+    </message>
+    <message>
+        <location filename="settingswidget.cpp" line="76"/>
+        <source>Xinerama extension (support for two or more physical displays)</source>
+        <translation>Xinerama延伸功能(支援兩個以上的螢幕)</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="79"/>
+        <location filename="settingswidget.cpp" line="92"/>
         <source>Width:</source>
-        <translation type="unfinished"></translation>
+        <translation>寬度:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="82"/>
+        <location filename="settingswidget.cpp" line="95"/>
         <source>Height:</source>
-        <translation type="unfinished"></translation>
+        <translation>高度:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="101"/>
+        <location filename="settingswidget.cpp" line="102"/>
+        <source>&Display:</source>
+        <translation>顯示器(&D):</translation>
+    </message>
+    <message>
+        <location filename="settingswidget.cpp" line="104"/>
+        <source>&Identify all displays</source>
+        <translation>辨認所有顯示器(&I)</translation>
+    </message>
+    <message>
+        <location filename="settingswidget.cpp" line="142"/>
         <source>Keep current keyboard Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>保持目前的鍵盤設定</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="111"/>
+        <location filename="settingswidget.cpp" line="152"/>
         <source>Keyboard layout:</source>
-        <translation type="unfinished"></translation>
+        <translation>鍵盤佈局:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="113"/>
+        <location filename="settingswidget.cpp" line="154"/>
         <source>Keyboard model:</source>
-        <translation type="unfinished"></translation>
+        <translation>鍵盤型號:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="124"/>
+        <location filename="settingswidget.cpp" line="165"/>
         <source>Enable sound support</source>
-        <translation type="unfinished"></translation>
+        <translation>啟用音效支援</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="133"/>
+        <location filename="settingswidget.cpp" line="174"/>
         <source>Start sound daemon</source>
-        <translation type="unfinished"></translation>
+        <translation>開啟聲音背景程式</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="135"/>
+        <location filename="settingswidget.cpp" line="176"/>
         <source>Use running sound daemon</source>
-        <translation type="unfinished"></translation>
+        <translation>使用目前的音效背景程式</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="137"/>
+        <location filename="settingswidget.cpp" line="178"/>
         <source>Use SSH port forwarding to tunnel
 sound system connections through firewalls</source>
-        <translation type="unfinished"></translation>
+        <translation>使用SSHé€£æŽ¥åŸ è½‰é€ä¾†å»ºç«‹
+可通過防火牆的聲音通道</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="139"/>
+        <location filename="settingswidget.cpp" line="180"/>
         <source>Use default sound port</source>
-        <translation type="unfinished"></translation>
+        <translation>ä½¿ç”¨é è¨­çš„è²éŸ³é€£æŽ¥åŸ </translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="146"/>
+        <location filename="settingswidget.cpp" line="187"/>
         <source>Sound port:</source>
-        <translation type="unfinished"></translation>
+        <translation>è²éŸ³é€£æŽ¥åŸ :</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="173"/>
+        <location filename="settingswidget.cpp" line="214"/>
         <source>Client side printing support</source>
-        <translation type="unfinished"></translation>
+        <translation>用戶端列印支援</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="440"/>
+        <location filename="settingswidget.cpp" line="557"/>
         <source>us</source>
-        <translation type="unfinished"></translation>
+        <translation>us</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="441"/>
+        <location filename="settingswidget.cpp" line="558"/>
         <source>pc105/us</source>
-        <translation type="unfinished"></translation>
+        <translation>pc105/us</translation>
     </message>
 </context>
 <context>
@@ -2143,48 +2253,68 @@ sound system connections through firewalls</source>
     <message>
         <location filename="sharewidget.cpp" line="37"/>
         <source>&Folders</source>
-        <translation type="unfinished"></translation>
+        <translation>資料夾(&F)</translation>
     </message>
     <message>
         <location filename="sharewidget.cpp" line="47"/>
         <source>Path</source>
-        <translation type="unfinished"></translation>
+        <translation>路徑</translation>
     </message>
     <message>
         <location filename="sharewidget.cpp" line="49"/>
         <location filename="sharewidget.cpp" line="131"/>
         <source>Automount</source>
-        <translation type="unfinished"></translation>
+        <translation>自動掛載</translation>
     </message>
     <message>
         <location filename="sharewidget.cpp" line="58"/>
         <source>Add</source>
-        <translation type="unfinished"></translation>
+        <translation>新增</translation>
     </message>
     <message>
         <location filename="sharewidget.cpp" line="59"/>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation>刪除</translation>
     </message>
     <message>
         <location filename="sharewidget.cpp" line="69"/>
         <source>Path:</source>
-        <translation type="unfinished"></translation>
+        <translation>路徑:</translation>
+    </message>
+    <message>
+        <location filename="sharewidget.cpp" line="76"/>
+        <source>Filename encoding</source>
+        <translation>檔案編碼方式</translation>
+    </message>
+    <message>
+        <location filename="sharewidget.cpp" line="82"/>
+        <source>local:</source>
+        <translation>本地端:</translation>
+    </message>
+    <message>
+        <location filename="sharewidget.cpp" line="83"/>
+        <source>remote:</source>
+        <translation>é ç«¯:</translation>
     </message>
     <message>
         <location filename="sharewidget.cpp" line="95"/>
         <source>Use ssh port forwarding to tunnel file system connections through firewalls</source>
-        <translation type="unfinished"></translation>
+        <translation>使用SSHé€£æŽ¥åŸ è½‰é€ä¾†å»ºç«‹å¯é€šéŽé˜²ç«ç‰†çš„æª”æ¡ˆç³»çµ±é€šé“</translation>
     </message>
     <message>
         <location filename="sharewidget.cpp" line="158"/>
         <source>Select folder</source>
-        <translation type="unfinished"></translation>
+        <translation>選擇資料夾</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="76"/>
-        <source>Filename encoding</source>
-        <translation type="unfinished"></translation>
+        <location filename="sharewidget.cpp" line="169"/>
+        <source>Error</source>
+        <translation>錯誤</translation>
+    </message>
+    <message>
+        <location filename="sharewidget.cpp" line="170"/>
+        <source>x2goclient is running in portable mode. You should use a path on your usb device to be able to access your data whereever you are</source>
+        <translation>X2Go用戶端目前為可攜式模式，您應該要使用您的USB裝置的路徑來存取您的資料</translation>
     </message>
     <message>
         <location filename="sharewidget.cpp" line="229"/>
@@ -2198,106 +2328,86 @@ sound system connections through firewalls</source>
         <source>ISO8859-1</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="sharewidget.cpp" line="82"/>
-        <source>local:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="sharewidget.cpp" line="83"/>
-        <source>remote:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="sharewidget.cpp" line="169"/>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="sharewidget.cpp" line="170"/>
-        <source>x2goclient is running in portable mode. You should use a path on your usb device to be able to access your data whereever you are</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>SshMasterConnection</name>
     <message>
-        <location filename="sshmasterconnection.cpp" line="100"/>
+        <location filename="sshmasterconnection.cpp" line="111"/>
         <source>Can not initialize libssh</source>
-        <translation type="unfinished"></translation>
+        <translation>libssh無法初始化</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="120"/>
+        <location filename="sshmasterconnection.cpp" line="131"/>
         <source>Can not create ssh session</source>
-        <translation type="unfinished"></translation>
+        <translation>無法建立SSH工作階段</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="135"/>
+        <location filename="sshmasterconnection.cpp" line="146"/>
         <source>Can not connect to </source>
-        <translation type="unfinished"></translation>
+        <translation>無法連線至 </translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="171"/>
+        <location filename="sshmasterconnection.cpp" line="187"/>
         <source>Authentication failed</source>
-        <translation type="unfinished"></translation>
+        <translation>驗證失敗</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="187"/>
+        <location filename="sshmasterconnection.cpp" line="203"/>
         <source>channel_forward_listen failed</source>
-        <translation type="unfinished"></translation>
+        <translation>channel_forward_listen失敗</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="498"/>
+        <location filename="sshmasterconnection.cpp" line="517"/>
         <source>Can not open file </source>
-        <translation type="unfinished"></translation>
+        <translation>無法開啟檔案</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="510"/>
+        <location filename="sshmasterconnection.cpp" line="529"/>
         <source>Can not create remote file </source>
-        <translation type="unfinished"></translation>
+        <translation>ç„¡æ³•å‰µå»ºé ç«¯æª”æ¡ˆ</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="523"/>
+        <location filename="sshmasterconnection.cpp" line="542"/>
         <source>Can not write to remote file </source>
-        <translation type="unfinished"></translation>
+        <translation>ç„¡æ³•å¯«å…¥è³‡æ–™è‡³é ç«¯æª”æ¡ˆ</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="573"/>
+        <location filename="sshmasterconnection.cpp" line="592"/>
         <source>can not connect to </source>
-        <translation type="unfinished"></translation>
+        <translation>無法連線至 </translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="682"/>
+        <location filename="sshmasterconnection.cpp" line="701"/>
         <source>channel_open_forward failed</source>
-        <translation type="unfinished"></translation>
+        <translation>channel_open_forward失敗</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="701"/>
+        <location filename="sshmasterconnection.cpp" line="720"/>
         <source>channel_open_session failed</source>
-        <translation type="unfinished"></translation>
+        <translation>channel_open_session失敗</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="708"/>
+        <location filename="sshmasterconnection.cpp" line="727"/>
         <source>channel_request_exec failed</source>
-        <translation type="unfinished"></translation>
+        <translation>channel_request_exec失敗</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="773"/>
+        <location filename="sshmasterconnection.cpp" line="792"/>
         <source>error writing to socket</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="791"/>
+        <location filename="sshmasterconnection.cpp" line="810"/>
         <source>error reading channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="821"/>
+        <location filename="sshmasterconnection.cpp" line="840"/>
         <source>channel_write failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="833"/>
+        <location filename="sshmasterconnection.cpp" line="852"/>
         <source>error reading tcp socket</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2320,12 +2430,12 @@ sound system connections through firewalls</source>
     <message>
         <location filename="xsettingswidget.cpp" line="50"/>
         <source>Open File</source>
-        <translation type="unfinished"></translation>
+        <translation>開啟檔案</translation>
     </message>
     <message>
         <location filename="xsettingswidget.cpp" line="52"/>
         <source>Executable (*.exe)</source>
-        <translation type="unfinished"></translation>
+        <translation>執行檔 (*.exe)</translation>
     </message>
 </context>
 <context>
@@ -2333,62 +2443,62 @@ sound system connections through firewalls</source>
     <message>
         <location filename="xsettingsui.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>表單</translation>
     </message>
     <message>
         <location filename="xsettingsui.ui" line="27"/>
-        <source>You must restart the X2Go Client for the changes to take effect</source>
-        <translation type="unfinished"></translation>
+        <source>You must restart the X2go Client for the changes to take effect</source>
+        <translation>您必需重新啟動X2go用戶端以讓設定變更生效</translation>
     </message>
     <message>
         <location filename="xsettingsui.ui" line="50"/>
         <source>use integrated X-Server</source>
-        <translation type="unfinished"></translation>
+        <translation>使用內建的X伺服器</translation>
     </message>
     <message>
         <location filename="xsettingsui.ui" line="60"/>
         <source>use custom X-Server</source>
-        <translation type="unfinished"></translation>
+        <translation>使用自定的X伺服器</translation>
     </message>
     <message>
         <location filename="xsettingsui.ui" line="70"/>
         <source>custom X-Server</source>
-        <translation type="unfinished"></translation>
+        <translation>自定X伺服器</translation>
     </message>
     <message>
         <location filename="xsettingsui.ui" line="78"/>
         <source>executable:</source>
-        <translation type="unfinished"></translation>
+        <translation>執行路徑:</translation>
     </message>
     <message>
         <location filename="xsettingsui.ui" line="101"/>
         <source>start X-Server on X2Go client start</source>
-        <translation type="unfinished"></translation>
+        <translation>當X2Go用戶端啟動時啟動X伺服器</translation>
     </message>
     <message>
         <location filename="xsettingsui.ui" line="113"/>
         <source>command line options:</source>
-        <translation type="unfinished"></translation>
+        <translation>æŒ‡ä»¤åˆ—é¸é …:</translation>
     </message>
     <message>
         <location filename="xsettingsui.ui" line="125"/>
         <source>X-Server command line options</source>
-        <translation type="unfinished"></translation>
+        <translation>Xä¼ºæœå™¨æŒ‡ä»¤åˆ—é¸é …</translation>
     </message>
     <message>
         <location filename="xsettingsui.ui" line="131"/>
         <source>window mode:</source>
-        <translation type="unfinished"></translation>
+        <translation>視窗模式:</translation>
     </message>
     <message>
         <location filename="xsettingsui.ui" line="141"/>
         <source>fullscreen mode:</source>
-        <translation type="unfinished"></translation>
+        <translation>全螢幕模式:</translation>
     </message>
     <message>
         <location filename="xsettingsui.ui" line="151"/>
         <source>single application:</source>
-        <translation type="unfinished"></translation>
+        <translation>單一應用程式:</translation>
     </message>
 </context>
 </TS>
diff --git a/x2goplugin.rc b/x2goplugin.rc
index 2b05a07..1578a92 100644
--- a/x2goplugin.rc
+++ b/x2goplugin.rc
@@ -1,8 +1,8 @@
 1 TYPELIB "x2goplugin.rc"
 
 1 VERSIONINFO
- FILEVERSION 3,99,0,5
- PRODUCTVERSION 3,99,0,5
+ FILEVERSION 3,99,0,6
+ PRODUCTVERSION 3,99,0,6
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -21,13 +21,13 @@ BEGIN
             VALUE "FileDescription", "Allows you to start X2Go session in a webbrowser\0"
 	    VALUE "FileExtents", "x2go\0"
 	    VALUE "FileOpenName", "Configuration File for X2Go Session (*.x2go)\0"
-            VALUE "FileVersion", "3, 99, 0 ,5\0"
+            VALUE "FileVersion", "3, 99, 0 ,6\0"
             VALUE "InternalName", "x2goplugin\0"
             VALUE "LegalCopyright", "Copyright © 2010-2012 Obviously Nice\0"
 	    VALUE "MIMEType", "application/x2go\0"
             VALUE "OriginalFilename", "npx2goplugin.dll\0"
-            VALUE "ProductName", "X2GoClient Plug-in 3.99.0.5\0"
-            VALUE "ProductVersion", "3, 99, 0, 5\0"
+            VALUE "ProductName", "X2GoClient Plug-in 3.99.0.6\0"
+            VALUE "ProductVersion", "3, 99, 0, 6\0"
         END
     END
     BLOCK "VarFileInfo"


hooks/post-receive
-- 
x2goclient.git (X2Go Client)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2goclient.git" (X2Go Client).