x2go-commits August 2013

x2go-commits@lists.x2go.org

2 participants
2119 discussions

page changed: events:start
by wiki-admin＠x2go.org 22 Aug '13

22 Aug '13

A page in your DokuWiki was added or changed. Here are the details: Date : 2013/08/22 08:46 Browser : Mozilla/5.0 (X11; Linux x86_64; rv:18.0) Gecko/20100101 Firefox/18.0 Iceweasel/18.0.1 IP-Address : 195.244.234.222 Hostname : 195.244.234.222 Old Revision: http://wiki.x2go.org/doku.php/events:start?rev=1377161149 New Revision: http://wiki.x2go.org/doku.php/events:start Edit Summary: User : sunweaver @@ -2,9 +2,9 @@ ===== Upcoming Events ===== ==== DebConf 2013 ==== - * [[http://meetings-archive.debian.net/pub/debian-meetings/2013/debconf13/webm-… on X2Go]] by Mike Gabriel + * [[http://meetings-archive.debian.net/pub/debian-meetings/2013/debconf13/webm-… on X2Go]] by Mike Gabriel (August 2013) ==== Linuxtag 2013 ==== * 4 People as booth team needed (May 22nd till 25th) -- This mail was generated by DokuWiki at http://wiki.x2go.org/

1 0

page changed: events:start
by wiki-admin＠x2go.org 22 Aug '13

22 Aug '13

A page in your DokuWiki was added or changed. Here are the details: Date : 2013/08/22 08:45 Browser : Mozilla/5.0 (X11; Linux x86_64; rv:18.0) Gecko/20100101 Firefox/18.0 Iceweasel/18.0.1 IP-Address : 195.244.234.222 Hostname : 195.244.234.222 Old Revision: http://wiki.x2go.org/doku.php/events:start?rev=1365509114 New Revision: http://wiki.x2go.org/doku.php/events:start Edit Summary: User : sunweaver @@ -3,5 +3,8 @@ ===== Upcoming Events ===== + + ==== DebConf 2013 ==== + * [[http://meetings-archive.debian.net/pub/debian-meetings/2013/debconf13/webm-… on X2Go]] by Mike Gabriel ==== Linuxtag 2013 ==== * 4 People as booth team needed (May 22nd till 25th) -- This mail was generated by DokuWiki at http://wiki.x2go.org/

1 0

pyhoca-gui.git - master (branch) updated: 0.4.0.6-18-gb96f788
by git-admin＠x2go.org 21 Aug '13

21 Aug '13

The branch, master has been updated via b96f788a625a1ccdbdc723de678784eee2271d27 (commit) from 220cefec0a4aefd71dae25760249c14e1c917107 (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 ----------------------------------------------------------------- commit b96f788a625a1ccdbdc723de678784eee2271d27 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Aug 21 21:26:19 2013 +0200 provide Finnish translation file ----------------------------------------------------------------------- Summary of changes: po/{fr.po => fi.po} | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) copy po/{fr.po => fi.po} (98%) The diff of changes is: diff --git a/po/fr.po b/po/fi.po similarity index 98% copy from po/fr.po copy to po/fi.po index d30d761..316562d 100644 --- a/po/fr.po +++ b/po/fi.po @@ -2,24 +2,24 @@ # Copyright (C) 2010-2013 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # Dick Kniep <dick.kniep(a)lindix.nl> # This file is distributed under the same license as the PyHoca-GUI package. -# Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>, 2011. # +# Contributing TRANSLATORS: +# 2013, xxx yyy <mail@address> + +#, fuzzy msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-03 22:47+0200\n" -"PO-Revision-Date: 2011-09-17 02:17+0100\n" -"Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" -"Language-Team: X2Go i18n <x2go-i18n(a)lists.berlios.de>\n" -"Language: fr\n" +"POT-Creation-Date: 2013-08-18 15:33+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: fi <x2go-i18n(a)lists.berlios.de>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Poedit-Language: French\n" -"X-Poedit-Country: French\n" -"X-Poedit-SourceCharset: utf-8\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../pyhoca/wxgui/logon.py:86 #, python-format @@ -714,21 +714,21 @@ msgstr "" msgid "Profile name %s already exists!!!" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2418 +#: ../pyhoca/wxgui/profilemanager.py:2415 #, python-format msgid "%s - profile added" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2419 +#: ../pyhoca/wxgui/profilemanager.py:2416 msgid "A new session profile has been added." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2423 +#: ../pyhoca/wxgui/profilemanager.py:2420 #, python-format msgid "%s - modified" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2424 +#: ../pyhoca/wxgui/profilemanager.py:2421 msgid "Changes to profile have been saved." msgstr "" hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) 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 "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

1 0

x2goclient.git - master (branch) updated: 4.0.1.0-46-gffe70e3
by git-admin＠x2go.org 21 Aug '13

21 Aug '13

The branch, master has been updated via ffe70e38b19f3b6c7404cdedb9efd7c0f6b746cb (commit) from 61958d4701d4d9e567e116acaceca9333dde3737 (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 ----------------------------------------------------------------- commit ffe70e38b19f3b6c7404cdedb9efd7c0f6b746cb Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Aug 21 21:21:47 2013 +0200 provide Finnish translation files ----------------------------------------------------------------------- Summary of changes: resources.rcc | 1 + x2goclient.pro | 1 + x2goclient_zh_tw.ts => x2goclient_fi.ts | 1816 +++++++++++++++---------------- 3 files changed, 879 insertions(+), 939 deletions(-) copy x2goclient_zh_tw.ts => x2goclient_fi.ts (57%) The diff of changes is: diff --git a/resources.rcc b/resources.rcc index cc74d72..d83d68a 100644 --- a/resources.rcc +++ b/resources.rcc @@ -84,6 +84,7 @@ <file>x2goclient_de.qm</file> <file>x2goclient_da.qm</file> <file>x2goclient_es.qm</file> + <file>x2goclient_fi.qm</file> <file>x2goclient_fr.qm</file> <file>x2goclient_nb_no.qm</file> <file>x2goclient_ru.qm</file> diff --git a/x2goclient.pro b/x2goclient.pro index 5d2206d..4510219 100755 --- a/x2goclient.pro +++ b/x2goclient.pro @@ -24,6 +24,7 @@ TRANSLATIONS += \ x2goclient_de.ts \ x2goclient_da.ts \ x2goclient_es.ts \ + x2goclient_fi.ts \ x2goclient_ru.ts \ x2goclient_nb_no.ts \ x2goclient_sv.ts \ diff --git a/x2goclient_zh_tw.ts b/x2goclient_fi.ts similarity index 57% copy from x2goclient_zh_tw.ts copy to x2goclient_fi.ts index 0105298..4a38057 100644 --- a/x2goclient_zh_tw.ts +++ b/x2goclient_fi.ts @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0" language="zh_TW"> +<TS version="2.0" language="fi_FI"> <context> <name>AppDialog</name> <message> @@ -61,7 +61,7 @@ <message> <location filename="appdialog.cpp" line="137"/> <source>Settings</source> - <translation type="unfinished">設定</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="appdialog.cpp" line="142"/> @@ -84,22 +84,22 @@ <message> <location filename="brokerpassdialog.ui" line="15"/> <source>Dialog</source> - <translation>對話框</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="brokerpassdialog.ui" line="23"/> <source>Old password:</source> - <translation>舊密碼:</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="brokerpassdialog.ui" line="37"/> <source>New password:</source> - <translation>新密碼:</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="brokerpassdialog.ui" line="51"/> <source>Confirm password:</source> - <translation>請再輸入一遍新密碼:</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="brokerpassdialog.ui" line="80"/> @@ -112,7 +112,7 @@ <message> <location filename="brokerpassdlg.cpp" line="39"/> <source>Passwords do not match</source> - <translation>密碼不相符</translation> + <translation type="unfinished"></translation> </message> </context> <context> @@ -120,67 +120,67 @@ <message> <location filename="cupsprintwidget.ui" line="21"/> <source>Form</source> - <translation>表單</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="cupsprintwidget.ui" line="27"/> <source>Name:</source> - <translation>姓名:</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="cupsprintwidget.ui" line="44"/> <source>Properties</source> - <translation>屬性</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="cupsprintwidget.ui" line="51"/> <source>State:</source> - <translation>狀態:</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="cupsprintwidget.ui" line="65"/> <source>Accepting jobs:</source> - <translation>接收的工作:</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="cupsprintwidget.ui" line="79"/> <source>Type:</source> - <translation>類別:</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="cupsprintwidget.ui" line="93"/> <source>Location:</source> - <translation>位置:</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="cupsprintwidget.ui" line="107"/> <source>Comment:</source> - <translation>註解:</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="cupsprintwidget.cpp" line="71"/> <source>Idle</source> - <translation>閒置</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="cupsprintwidget.cpp" line="74"/> <source>Printing</source> - <translation>正在列印</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="cupsprintwidget.cpp" line="77"/> <source>Stopped</source> - <translation>已停止</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="cupsprintwidget.cpp" line="87"/> <source>Yes</source> - <translation>是</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="cupsprintwidget.cpp" line="87"/> <source>No</source> - <translation>否</translation> + <translation type="unfinished"></translation> </message> </context> <context> @@ -188,17 +188,17 @@ <message> <location filename="cupsprintersettingsdialog.cpp" line="110"/> <source>No option selected</source> - <translation type="unfinished">尚未選取任何選項</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="cupsprintersettingsdialog.cpp" line="271"/> <source>This value is in conflict with other option</source> - <translation>此設定值與其它選項衝突</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="cupsprintersettingsdialog.cpp" line="281"/> <source>Options conflict</source> - <translation>選項衝突</translation> + <translation type="unfinished"></translation> </message> </context> <context> @@ -206,50 +206,50 @@ <message> <location filename="contest.ui" line="15"/> <source>Connectivity test</source> - <translation>連線測式</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="contest.ui" line="25"/> <source>HTTPS connection:</source> - <translation>加密HTTP連線:</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="contest.ui" line="32"/> <source>SSH connection:</source> - <translation>SSH連線:</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="contest.ui" line="39"/> <source>Connection speed:</source> - <translation>連線速度:</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="contest.ui" line="124"/> <location filename="contest.ui" line="168"/> <source>Failed</source> - <translation>失敗</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="contest.ui" line="212"/> <source>0 Kb/s</source> - <translation>0 Kb/s</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="contest.cpp" line="106"/> <location filename="contest.cpp" line="113"/> <source>OK</source> - <translation>確定</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="contest.cpp" line="148"/> <source>Socket operation timed out</source> - <translation>網路操作逾時</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="contest.cpp" line="160"/> <location filename="contest.cpp" line="166"/> <source>Failed: </source> - <translation>失敗:</translation> + <translation type="unfinished"></translation> </message> </context> <context> @@ -257,42 +257,42 @@ <message> <location filename="configdialog.cpp" line="56"/> <source>General</source> - <translation>一般設定</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="configdialog.cpp" line="65"/> <source>Display icon in system tray</source> - <translation>在系統狀態列中顯示圖示</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="configdialog.cpp" line="72"/> <source>Hide to system tray when minimized</source> - <translation>最小化時縮至系統狀態列</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="configdialog.cpp" line="73"/> <source>Hide to system tray when closed</source> - <translation>關閉時隱藏至系統狀態列</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="configdialog.cpp" line="74"/> <source>Hide to system tray after connection is established</source> - <translation>連線建立後隱藏至系統狀態列</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="configdialog.cpp" line="75"/> <source>Restore from system tray after session is disconnected</source> - <translation>當工作階段斷線後從系統狀態列中還原</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="configdialog.cpp" line="93"/> <source>Use LDAP</source> - <translation>使用LDAP</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="configdialog.cpp" line="117"/> <source>Server URL:</source> - <translation type="unfinished">伺服器網址:</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="configdialog.cpp" line="118"/> @@ -302,112 +302,112 @@ <message> <location filename="configdialog.cpp" line="120"/> <source>Failover server 1 URL:</source> - <translation>備援伺服器網1 網址:</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="configdialog.cpp" line="122"/> <source>Failover server 2 URL:</source> - <translation>備援伺服器網2 網址:</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="configdialog.cpp" line="204"/> <location filename="configdialog.cpp" line="346"/> <source>X-Server settings</source> - <translation>X伺服器設定</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="configdialog.cpp" line="213"/> <source>X11 application:</source> - <translation>X11應用程式:</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="configdialog.cpp" line="224"/> <source>X11 version:</source> - <translation>X11版本:</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="configdialog.cpp" line="239"/> <source>Find X11 application</source> - <translation>尋找X11應用程式</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="configdialog.cpp" line="256"/> <source>Clientside SSH port for file system export usage:</source> - <translation>檔案系統匯出時用戶端所使用的SSH連接埠:</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="configdialog.cpp" line="266"/> <source>Start session embedded inside website</source> - <translation>將工作階段嵌入至網站內</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="configdialog.cpp" line="270"/> <location filename="configdialog.cpp" line="573"/> <location filename="configdialog.cpp" line="585"/> <source>Advanced options</source> - <translation>進階選項</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="configdialog.cpp" line="297"/> <source>Defaults</source> - <translation>預設</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="configdialog.cpp" line="298"/> <source>&OK</source> - <translation>確定(&O)</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="configdialog.cpp" line="299"/> <source>&Cancel</source> - <translation>取消(&C)</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="configdialog.cpp" line="322"/> <source>Settings</source> - <translation>設定</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="configdialog.cpp" line="342"/> <source>Printing</source> - <translation>列印功能</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="configdialog.cpp" line="509"/> <location filename="configdialog.cpp" line="527"/> <location filename="configdialog.cpp" line="546"/> <source>Warning</source> - <translation>警告</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="configdialog.cpp" line="510"/> <source>x2goclient could not find any suitable X11 Application. Please install Apple X11 or select the path to the application</source> - <translation>X2Go用戶端無法找到合適的X11應用程式，請安裝Apple X11或是選擇應用程式的路徑</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="configdialog.cpp" line="528"/> <source>Your are using X11 (Apple X-Window Server) version </source> - <translation>您正在使用X11(Apple X-Window 伺服器) 版本 </translation> + <translation type="unfinished"></translation> </message> <message> <location filename="configdialog.cpp" line="530"/> <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>. 此版本在24位元色彩模式時會有問題，請升級您的X11環境 (http://trac.macosforge.org/projects/xquartz)</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="configdialog.cpp" line="547"/> <source>No suitable X11 application found in selected path</source> - <translation>在您選擇的路徑中沒有合適的X11應用程式</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="configdialog.cpp" line="583"/> <source>&Connection</source> - <translation>連線(&C)</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="configdialog.cpp" line="584"/> <source>&Settings</source> - <translation>設定(&S)</translation> + <translation type="unfinished"></translation> </message> </context> <context> @@ -415,32 +415,32 @@ <message> <location filename="connectionwidget.cpp" line="39"/> <source>&Connection speed</source> - <translation>連線速度(&C)</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="connectionwidget.cpp" line="44"/> <source>Connection speed:</source> - <translation>連線速度:</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="connectionwidget.cpp" line="74"/> <source>C&ompression</source> - <translation>壓縮(&o)</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="connectionwidget.cpp" line="91"/> <source>Method:</source> - <translation>方式:</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="connectionwidget.cpp" line="93"/> <source>Compression method:</source> - <translation>壓縮方式:</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="connectionwidget.cpp" line="95"/> <source>Image quality:</source> - <translation>影像品質:</translation> + <translation type="unfinished"></translation> </message> </context> <context> @@ -448,72 +448,72 @@ <message> <location filename="cupsprintsettingsdialog.ui" line="21"/> <source>Dialog</source> - <translation>對話框</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="cupsprintsettingsdialog.ui" line="37"/> <source>General</source> - <translation>一般設定</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="cupsprintsettingsdialog.ui" line="47"/> <source>Page size:</source> - <translation>頁面尺寸:</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="cupsprintsettingsdialog.ui" line="64"/> <source>Paper type:</source> - <translation>紙張類型:</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="cupsprintsettingsdialog.ui" line="74"/> <source>Paper source:</source> - <translation>紙張來源:</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="cupsprintsettingsdialog.ui" line="101"/> <source>Duplex Printing</source> - <translation>雙面列印</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="cupsprintsettingsdialog.ui" line="107"/> <source>None</source> - <translation>無</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="cupsprintsettingsdialog.ui" line="114"/> <source>Long side</source> - <translation>長邊翻轉</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="cupsprintsettingsdialog.ui" line="121"/> <source>Short side</source> - <translation>短邊翻轉</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="cupsprintsettingsdialog.ui" line="145"/> <source>Driver settings</source> - <translation>驅動程式設定</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="cupsprintsettingsdialog.ui" line="177"/> <source>Option</source> - <translation>選項</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="cupsprintsettingsdialog.ui" line="182"/> <source>Value</source> - <translation>數值</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="cupsprintsettingsdialog.ui" line="188"/> <source>No option selected</source> - <translation>目前沒有選取任何選項</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="cupsprintsettingsdialog.ui" line="207"/> <source>text</source> - <translation>文字</translation> + <translation type="unfinished"></translation> </message> </context> <context> @@ -521,42 +521,42 @@ <message> <location filename="editconnectiondialog.cpp" line="58"/> <source>&Session</source> - <translation>工作階段(&S)</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="editconnectiondialog.cpp" line="59"/> <source>&Connection</source> - <translation>連線(&C)</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="editconnectiondialog.cpp" line="60"/> <source>&Settings</source> - <translation>設定(&S)</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="editconnectiondialog.cpp" line="61"/> <source>&Shared folders</source> - <translation>共享資料夾(&S)</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="editconnectiondialog.cpp" line="63"/> <source>&OK</source> - <translation>確定(&O)</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="editconnectiondialog.cpp" line="64"/> <source>&Cancel</source> - <translation>取消(&C)</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="editconnectiondialog.cpp" line="65"/> <source>Defaults</source> - <translation>預設值</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="editconnectiondialog.cpp" line="123"/> <source>Session preferences - </source> - <translation>工作階段偏好設定 - </translation> + <translation type="unfinished"></translation> </message> </context> <context> @@ -564,113 +564,84 @@ <message> <location filename="exportdialog.cpp" line="44"/> <source>&Cancel</source> - <translation>取消(&C)</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="exportdialog.cpp" line="50"/> <source>&share</source> - <translation>分享(&s)</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="exportdialog.cpp" line="51"/> <source>&Preferences ...</source> - <translation>偏好設定(&P) ...</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="exportdialog.cpp" line="52"/> <source>&Custom folder ...</source> - <translation>自訂資料夾(&C) ...</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="exportdialog.cpp" line="62"/> <source>Delete</source> <comment>Delete</comment> - <translation>刪除</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="exportdialog.cpp" line="79"/> <source>share folders</source> - <translation>共享資料夾</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="exportdialog.cpp" line="145"/> <source>Select folder</source> - <translation>選擇資料夾</translation> + <translation type="unfinished"></translation> </message> </context> <context> <name>HttpBrokerClient</name> <message> - <source>us</source> - <translation type="obsolete">us</translation> - </message> - <message> - <source>pc105/us</source> - <translation type="obsolete">pc105/us</translation> - </message> - <message> - <location filename="httpbrokerclient.cpp" line="350"/> - <location filename="httpbrokerclient.cpp" line="366"/> - <location filename="httpbrokerclient.cpp" line="386"/> - <location filename="httpbrokerclient.cpp" line="401"/> - <location filename="httpbrokerclient.cpp" line="415"/> - <location filename="httpbrokerclient.cpp" line="433"/> - <source>Error</source> - <translation>錯誤</translation> - </message> - <message> - <location filename="httpbrokerclient.cpp" line="351"/> - <source>Login failed! Please try again</source> - <translation>登入失敗! 請再試一次</translation> - </message> - <message> - <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="obsolete">您的工作階段已中斷連線。請返回登入畫面或是在瀏覽器中重新載入頁面以重新連回之前的工作階段。</translation> - </message> - <message> <location filename="httpbrokerclient.cpp" line="118"/> <source>Host key for server changed. It is now: </source> - <translation type="unfinished">主機的SSH密鑰已經更換。 -現在的密鑰為: </translation> + <translation type="unfinished"></translation> </message> <message> <location filename="httpbrokerclient.cpp" line="119"/> <source>For security reasons, connection will be stopped</source> - <translation type="unfinished">由於安全性的考量，目前的連線已被中止</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="httpbrokerclient.cpp" line="132"/> <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> + <translation type="unfinished"></translation> </message> <message> <location filename="httpbrokerclient.cpp" line="158"/> <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> + <translation type="unfinished"></translation> </message> <message> <location filename="httpbrokerclient.cpp" line="163"/> <source>The server is unknown. Do you trust the host key? Public key hash: </source> - <translation type="unfinished">此為未知的伺服器，您要選擇信任此主機密鑰嗎? -此公開密鑰的雜湊值為:</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="httpbrokerclient.cpp" line="167"/> <location filename="httpbrokerclient.cpp" line="177"/> <source>Host key verification failed</source> - <translation type="unfinished">主機密鑰驗證任失敗</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="httpbrokerclient.cpp" line="167"/> <source>Yes</source> - <translation type="unfinished">是</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="httpbrokerclient.cpp" line="167"/> <source>No</source> - <translation type="unfinished">否</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="httpbrokerclient.cpp" line="190"/> @@ -683,94 +654,109 @@ Public key hash: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="525"/> + <location filename="httpbrokerclient.cpp" line="370"/> + <location filename="httpbrokerclient.cpp" line="386"/> + <location filename="httpbrokerclient.cpp" line="406"/> + <location filename="httpbrokerclient.cpp" line="421"/> + <location filename="httpbrokerclient.cpp" line="435"/> + <location filename="httpbrokerclient.cpp" line="453"/> + <source>Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="httpbrokerclient.cpp" line="371"/> + <source>Login failed! Please try again</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="httpbrokerclient.cpp" line="545"/> <source> Server uses an invalid security certificate. </source> - <translation> 伺服使器使用了不合法的安全憑證 </translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="528"/> + <location filename="httpbrokerclient.cpp" line="548"/> <source>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.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="533"/> + <location filename="httpbrokerclient.cpp" line="553"/> <source>Secure connection failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="538"/> + <location filename="httpbrokerclient.cpp" line="558"/> <source>Issued to: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="539"/> - <location filename="httpbrokerclient.cpp" line="551"/> + <location filename="httpbrokerclient.cpp" line="559"/> + <location filename="httpbrokerclient.cpp" line="571"/> <source>Common Name(CN) </source> <translation type="unfinished"></translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="542"/> - <location filename="httpbrokerclient.cpp" line="554"/> + <location filename="httpbrokerclient.cpp" line="562"/> + <location filename="httpbrokerclient.cpp" line="574"/> <source>Organization(O) </source> <translation type="unfinished"></translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="545"/> - <location filename="httpbrokerclient.cpp" line="557"/> + <location filename="httpbrokerclient.cpp" line="565"/> + <location filename="httpbrokerclient.cpp" line="577"/> <source>Organizational Unit(OU) </source> <translation type="unfinished"></translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="548"/> + <location filename="httpbrokerclient.cpp" line="568"/> <source>Serial Number </source> <translation type="unfinished"></translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="550"/> + <location filename="httpbrokerclient.cpp" line="570"/> <source>Issued by: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="561"/> + <location filename="httpbrokerclient.cpp" line="581"/> <source>Validity: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="562"/> + <location filename="httpbrokerclient.cpp" line="582"/> <source>Issued on </source> <translation type="unfinished"></translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="563"/> + <location filename="httpbrokerclient.cpp" line="583"/> <source>expires on </source> <translation type="unfinished"></translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="564"/> + <location filename="httpbrokerclient.cpp" line="584"/> <source>Fingerprints: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="565"/> + <location filename="httpbrokerclient.cpp" line="585"/> <source>SHA1 </source> <translation type="unfinished"></translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="567"/> + <location filename="httpbrokerclient.cpp" line="587"/> <source>MD5 </source> <translation type="unfinished"></translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="573"/> + <location filename="httpbrokerclient.cpp" line="593"/> <source>Exit X2Go Client</source> <translation type="unfinished"></translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="575"/> + <location filename="httpbrokerclient.cpp" line="595"/> <source>Add exception</source> <translation type="unfinished"></translation> </message> @@ -783,1184 +769,1143 @@ Public key hash: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="89"/> - <location filename="onmainwindow.cpp" line="6415"/> + <location filename="onmainwindow.cpp" line="90"/> + <location filename="onmainwindow.cpp" line="6458"/> <source>us</source> - <translation>us</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="90"/> + <location filename="onmainwindow.cpp" line="91"/> <source>pc105/us</source> - <translation>pc105/us</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="152"/> + <location filename="onmainwindow.cpp" line="155"/> <source>X2Go Client</source> - <translation>X2Go用戶端</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="169"/> - <location filename="onmainwindow.cpp" line="3083"/> - <location filename="onmainwindow.cpp" line="5515"/> + <location filename="onmainwindow.cpp" line="172"/> + <location filename="onmainwindow.cpp" line="3095"/> + <location filename="onmainwindow.cpp" line="5539"/> <source>connecting</source> - <translation>正在連線</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="176"/> + <location filename="onmainwindow.cpp" line="179"/> <source>Internet browser</source> - <translation>網頁瀏覽器</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="177"/> + <location filename="onmainwindow.cpp" line="180"/> <source>Email client</source> - <translation>電子郵件軟體</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="178"/> + <location filename="onmainwindow.cpp" line="181"/> <source>OpenOffice.org</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="179"/> + <location filename="onmainwindow.cpp" line="182"/> <source>Terminal</source> - <translation>終端機</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="229"/> + <location filename="onmainwindow.cpp" line="232"/> <source>Starting x2goclient in portable mode... data directory is: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="351"/> + <location filename="onmainwindow.cpp" line="354"/> <source>&Settings ...</source> - <translation>設定(&S) ...</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="355"/> + <location filename="onmainwindow.cpp" line="358"/> <source>Support ...</source> - <translation>支援 ...</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="362"/> - <location filename="onmainwindow.cpp" line="7726"/> + <location filename="onmainwindow.cpp" line="365"/> + <location filename="onmainwindow.cpp" line="7769"/> <source>About X2GO client</source> - <translation>關於X2GO用戶端</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="460"/> + <location filename="onmainwindow.cpp" line="463"/> <source>Started x2goclient.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="522"/> - <location filename="onmainwindow.cpp" line="535"/> + <location filename="onmainwindow.cpp" line="525"/> + <location filename="onmainwindow.cpp" line="538"/> <source>Can't load translator: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="527"/> - <location filename="onmainwindow.cpp" line="540"/> + <location filename="onmainwindow.cpp" line="530"/> + <location filename="onmainwindow.cpp" line="543"/> <source>Translator: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="527"/> - <location filename="onmainwindow.cpp" line="540"/> + <location filename="onmainwindow.cpp" line="530"/> + <location filename="onmainwindow.cpp" line="543"/> <source> installed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="561"/> - <location filename="onmainwindow.cpp" line="1058"/> - <location filename="onmainwindow.cpp" line="10418"/> + <location filename="onmainwindow.cpp" line="564"/> + <location filename="onmainwindow.cpp" line="1069"/> + <location filename="onmainwindow.cpp" line="10477"/> <source>Share folder...</source> - <translation>共享資料夾...</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="564"/> - <location filename="onmainwindow.cpp" line="1059"/> - <location filename="onmainwindow.cpp" line="5571"/> - <location filename="onmainwindow.cpp" line="10591"/> + <location filename="onmainwindow.cpp" line="567"/> + <location filename="onmainwindow.cpp" line="10470"/> + <source>Applications...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="onmainwindow.cpp" line="570"/> + <location filename="onmainwindow.cpp" line="1070"/> + <location filename="onmainwindow.cpp" line="5595"/> + <location filename="onmainwindow.cpp" line="10650"/> <source>Suspend</source> - <translation>暫停</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="567"/> - <location filename="onmainwindow.cpp" line="1060"/> - <location filename="onmainwindow.cpp" line="10431"/> - <location filename="onmainwindow.cpp" line="10593"/> + <location filename="onmainwindow.cpp" line="573"/> + <location filename="onmainwindow.cpp" line="1071"/> + <location filename="onmainwindow.cpp" line="10490"/> + <location filename="onmainwindow.cpp" line="10652"/> <source>Terminate</source> - <translation>終止</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="569"/> + <location filename="onmainwindow.cpp" line="575"/> <source>Reconnect</source> - <translation>重新連線</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="573"/> - <location filename="onmainwindow.cpp" line="9851"/> + <location filename="onmainwindow.cpp" line="579"/> + <location filename="onmainwindow.cpp" line="9894"/> <source>Detach X2Go window</source> - <translation>脫離X2Go視窗</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="576"/> - <location filename="onmainwindow.cpp" line="10895"/> + <location filename="onmainwindow.cpp" line="582"/> + <location filename="onmainwindow.cpp" line="10954"/> <source>Minimize toolbar</source> - <translation>將工具列最小化</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="687"/> - <location filename="onmainwindow.cpp" line="2004"/> - <location filename="onmainwindow.cpp" line="7826"/> + <location filename="onmainwindow.cpp" line="698"/> + <location filename="onmainwindow.cpp" line="2016"/> + <location filename="onmainwindow.cpp" line="7869"/> <source>Session:</source> - <translation>工作階段:</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="739"/> + <location filename="onmainwindow.cpp" line="750"/> <source>&Quit</source> - <translation>離開(&Q)</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="740"/> + <location filename="onmainwindow.cpp" line="751"/> <source>Ctrl+Q</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="741"/> - <location filename="onmainwindow.cpp" line="1077"/> + <location filename="onmainwindow.cpp" line="752"/> + <location filename="onmainwindow.cpp" line="1088"/> <source>Quit</source> - <translation>離開</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="744"/> + <location filename="onmainwindow.cpp" line="755"/> <source>&New session ...</source> - <translation>新增工作階段(&N) ...</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="745"/> + <location filename="onmainwindow.cpp" line="756"/> <source>Ctrl+N</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="750"/> + <location filename="onmainwindow.cpp" line="761"/> <source>Session management...</source> - <translation>工作階段管理員...</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="751"/> + <location filename="onmainwindow.cpp" line="762"/> <source>Ctrl+E</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="761"/> + <location filename="onmainwindow.cpp" line="772"/> <source>&Create session icon on desktop...</source> - <translation>在桌面上建立工作階段圖示(&C)...</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="770"/> + <location filename="onmainwindow.cpp" line="781"/> <source>&Set broker password...</source> - <translation>設定代理伺服器密碼(&S)...</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="781"/> + <location filename="onmainwindow.cpp" line="792"/> <source>&Connectivity test...</source> - <translation>連線能力測試(&C)...</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="788"/> - <location filename="onmainwindow.cpp" line="809"/> + <location filename="onmainwindow.cpp" line="799"/> + <location filename="onmainwindow.cpp" line="820"/> <source>Show toolbar</source> - <translation>顯示工具列</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="794"/> + <location filename="onmainwindow.cpp" line="805"/> <source>About Qt</source> - <translation>關於Qt</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="811"/> + <location filename="onmainwindow.cpp" line="822"/> <source>Ctrl+Q</source> <comment>exit</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="817"/> + <location filename="onmainwindow.cpp" line="828"/> <source>&Session</source> - <translation>工作階段(&S)</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="818"/> + <location filename="onmainwindow.cpp" line="829"/> <source>&Options</source> - <translation>選項(&O)</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="837"/> + <location filename="onmainwindow.cpp" line="848"/> <source>&Help</source> - <translation>幫助(&H)</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="876"/> - <location filename="onmainwindow.cpp" line="1997"/> - <location filename="onmainwindow.cpp" line="7819"/> - <location filename="onmainwindow.cpp" line="10219"/> + <location filename="onmainwindow.cpp" line="887"/> + <location filename="onmainwindow.cpp" line="2009"/> + <location filename="onmainwindow.cpp" line="7862"/> + <location filename="onmainwindow.cpp" line="10278"/> <source>Login:</source> - <translation>登入:</translation> - </message> - <message> - <location filename="onmainwindow.cpp" line="897"/> - <location filename="onmainwindow.cpp" line="926"/> - <location filename="onmainwindow.cpp" line="1677"/> - <location filename="onmainwindow.cpp" line="1706"/> - <location filename="onmainwindow.cpp" line="1714"/> - <location filename="onmainwindow.cpp" line="1862"/> - <location filename="onmainwindow.cpp" line="1889"/> - <location filename="onmainwindow.cpp" line="1892"/> - <location filename="onmainwindow.cpp" line="2154"/> - <location filename="onmainwindow.cpp" line="2395"/> - <location filename="onmainwindow.cpp" line="2411"/> - <location filename="onmainwindow.cpp" line="2425"/> - <location filename="onmainwindow.cpp" line="2459"/> - <location filename="onmainwindow.cpp" line="2504"/> - <location filename="onmainwindow.cpp" line="3449"/> - <location filename="onmainwindow.cpp" line="3639"/> - <location filename="onmainwindow.cpp" line="3648"/> - <location filename="onmainwindow.cpp" line="3971"/> - <location filename="onmainwindow.cpp" line="4490"/> - <location filename="onmainwindow.cpp" line="4571"/> - <location filename="onmainwindow.cpp" line="4635"/> - <location filename="onmainwindow.cpp" line="4665"/> - <location filename="onmainwindow.cpp" line="4709"/> - <location filename="onmainwindow.cpp" line="5107"/> - <location filename="onmainwindow.cpp" line="5137"/> - <location filename="onmainwindow.cpp" line="5292"/> - <location filename="onmainwindow.cpp" line="6109"/> - <location filename="onmainwindow.cpp" line="6139"/> - <location filename="onmainwindow.cpp" line="6936"/> - <location filename="onmainwindow.cpp" line="7018"/> - <location filename="onmainwindow.cpp" line="7265"/> - <location filename="onmainwindow.cpp" line="7397"/> - <location filename="onmainwindow.cpp" line="7460"/> - <location filename="onmainwindow.cpp" line="7769"/> - <location filename="onmainwindow.cpp" line="7771"/> - <location filename="onmainwindow.cpp" line="8009"/> - <location filename="onmainwindow.cpp" line="8065"/> - <location filename="onmainwindow.cpp" line="8093"/> - <location filename="onmainwindow.cpp" line="8547"/> - <location filename="onmainwindow.cpp" line="8566"/> - <location filename="onmainwindow.cpp" line="8620"/> - <location filename="onmainwindow.cpp" line="8646"/> - <location filename="onmainwindow.cpp" line="8673"/> - <location filename="onmainwindow.cpp" line="10809"/> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="onmainwindow.cpp" line="908"/> + <location filename="onmainwindow.cpp" line="937"/> + <location filename="onmainwindow.cpp" line="1689"/> + <location filename="onmainwindow.cpp" line="1718"/> + <location filename="onmainwindow.cpp" line="1726"/> + <location filename="onmainwindow.cpp" line="1874"/> + <location filename="onmainwindow.cpp" line="1901"/> + <location filename="onmainwindow.cpp" line="1904"/> + <location filename="onmainwindow.cpp" line="2166"/> + <location filename="onmainwindow.cpp" line="2407"/> + <location filename="onmainwindow.cpp" line="2423"/> + <location filename="onmainwindow.cpp" line="2437"/> + <location filename="onmainwindow.cpp" line="2471"/> + <location filename="onmainwindow.cpp" line="2516"/> + <location filename="onmainwindow.cpp" line="3463"/> + <location filename="onmainwindow.cpp" line="3653"/> + <location filename="onmainwindow.cpp" line="3662"/> + <location filename="onmainwindow.cpp" line="3991"/> + <location filename="onmainwindow.cpp" line="4510"/> + <location filename="onmainwindow.cpp" line="4591"/> + <location filename="onmainwindow.cpp" line="4655"/> + <location filename="onmainwindow.cpp" line="4685"/> + <location filename="onmainwindow.cpp" line="4729"/> + <location filename="onmainwindow.cpp" line="5127"/> + <location filename="onmainwindow.cpp" line="5157"/> + <location filename="onmainwindow.cpp" line="5312"/> + <location filename="onmainwindow.cpp" line="6138"/> + <location filename="onmainwindow.cpp" line="6168"/> + <location filename="onmainwindow.cpp" line="6979"/> + <location filename="onmainwindow.cpp" line="7061"/> + <location filename="onmainwindow.cpp" line="7308"/> + <location filename="onmainwindow.cpp" line="7440"/> + <location filename="onmainwindow.cpp" line="7503"/> + <location filename="onmainwindow.cpp" line="7812"/> + <location filename="onmainwindow.cpp" line="7814"/> + <location filename="onmainwindow.cpp" line="8052"/> + <location filename="onmainwindow.cpp" line="8108"/> + <location filename="onmainwindow.cpp" line="8136"/> + <location filename="onmainwindow.cpp" line="8590"/> + <location filename="onmainwindow.cpp" line="8609"/> + <location filename="onmainwindow.cpp" line="8663"/> + <location filename="onmainwindow.cpp" line="8689"/> + <location filename="onmainwindow.cpp" line="8716"/> + <location filename="onmainwindow.cpp" line="10868"/> <source>Error</source> - <translation>錯誤</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="897"/> + <location filename="onmainwindow.cpp" line="908"/> <source>Operation failed</source> - <translation>更改密碼失敗</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="901"/> + <location filename="onmainwindow.cpp" line="912"/> <source>Password changed</source> - <translation>密碼已更改成功</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="926"/> + <location filename="onmainwindow.cpp" line="937"/> <source>Wrong password!</source> - <translation>輸入了錯誤的密碼!</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="930"/> - <location filename="onmainwindow.cpp" line="3089"/> - <location filename="onmainwindow.cpp" line="11066"/> + <location filename="onmainwindow.cpp" line="941"/> + <location filename="onmainwindow.cpp" line="3101"/> + <location filename="onmainwindow.cpp" line="11126"/> <source>Connecting to broker</source> - <translation>連線至連線代理伺服器</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="979"/> + <location filename="onmainwindow.cpp" line="990"/> <source>Authentication</source> - <translation>身份驗證</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="1029"/> + <location filename="onmainwindow.cpp" line="1040"/> <source>Restore</source> - <translation>還原</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="1031"/> - <location filename="onmainwindow.cpp" line="5394"/> + <location filename="onmainwindow.cpp" line="1042"/> + <location filename="onmainwindow.cpp" line="5414"/> <source>Not connected</source> - <translation>尚未連線</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="1033"/> + <location filename="onmainwindow.cpp" line="1044"/> <source>Multimedia</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="1035"/> + <location filename="onmainwindow.cpp" line="1046"/> <source>Development</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="1037"/> + <location filename="onmainwindow.cpp" line="1048"/> <source>Education</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="1039"/> + <location filename="onmainwindow.cpp" line="1050"/> <source>Game</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="1041"/> + <location filename="onmainwindow.cpp" line="1052"/> <source>Graphics</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="1043"/> + <location filename="onmainwindow.cpp" line="1054"/> <source>Network</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="1045"/> + <location filename="onmainwindow.cpp" line="1056"/> <source>Office</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="1047"/> + <location filename="onmainwindow.cpp" line="1058"/> <source>Settings</source> - <translation type="unfinished">設定</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="1049"/> + <location filename="onmainwindow.cpp" line="1060"/> <source>System</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="1051"/> + <location filename="onmainwindow.cpp" line="1062"/> <source>Utility</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="1053"/> + <location filename="onmainwindow.cpp" line="1064"/> <source>Other</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="1088"/> + <location filename="onmainwindow.cpp" line="1099"/> <source>Left mouse button to hide/restore - Right mouse button to display context menu</source> - <translation>按滑鼠左鍵以隱藏或還原視窗, 右鍵顯示選單</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="1259"/> + <location filename="onmainwindow.cpp" line="1270"/> <source>Closing x2goclient...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="1407"/> + <location filename="onmainwindow.cpp" line="1418"/> <source>Closed x2goclient.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="1678"/> - <location filename="onmainwindow.cpp" line="1863"/> - <location filename="onmainwindow.cpp" line="1893"/> + <location filename="onmainwindow.cpp" line="1690"/> + <location filename="onmainwindow.cpp" line="1875"/> + <location filename="onmainwindow.cpp" line="1905"/> <source>Please check LDAP settings</source> - <translation>請確認LDAP的設定</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="1713"/> + <location filename="onmainwindow.cpp" line="1725"/> <source>no X2Go server found in LDAP </source> - <translation>在LDAP環境中沒有找到X2Go伺服器</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="2027"/> + <location filename="onmainwindow.cpp" line="2039"/> <source>Create session icon on desktop</source> - <translation>在桌面上建立工作階段圖示</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="2028"/> + <location filename="onmainwindow.cpp" line="2040"/> <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>桌面圖示可以被設定為不顯示X2Go用戶端的模式(隱藏模式)。如果您想要使用隱藏模式，您必需要將登入方式設定成使用GPG金匙或是GPG IC智慧卡。 - -是否要使用X2Go用戶端的隱藏模式?</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="2039"/> + <location filename="onmainwindow.cpp" line="2051"/> <source>New Session</source> - <translation>新的工作階段</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="2094"/> + <location filename="onmainwindow.cpp" line="2106"/> <source>X2Go Link to session </source> - <translation>X2Go工作階段的連結</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="2152"/> + <location filename="onmainwindow.cpp" line="2164"/> <source>No X2Go sessions found, closing.</source> <translation type="unfinished"></translation> </message> <message> - <source>X2Go sessions not found</source> - <translation type="obsolete">無法找到X2Go的工作</translation> - </message> - <message> - <location filename="onmainwindow.cpp" line="2314"/> + <location filename="onmainwindow.cpp" line="2326"/> <source>Are you sure you want to delete this session?</source> - <translation>您確定要刪除此工作階段嗎?</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="2632"/> - <location filename="onmainwindow.cpp" line="5949"/> + <location filename="onmainwindow.cpp" line="2644"/> + <location filename="onmainwindow.cpp" line="5973"/> <source>KDE</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="2710"/> + <location filename="onmainwindow.cpp" line="2722"/> <source>RDP connection</source> - <translation>RDP連線</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="2714"/> + <location filename="onmainwindow.cpp" line="2726"/> <source>XDMCP</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="2718"/> + <location filename="onmainwindow.cpp" line="2730"/> <source>Connection to local desktop</source> - <translation>連線至本地桌面</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="2722"/> + <location filename="onmainwindow.cpp" line="2734"/> <source> on </source> - <translation> 於 </translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="2781"/> + <location filename="onmainwindow.cpp" line="2793"/> <source>Starting connection to server: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="2790"/> + <location filename="onmainwindow.cpp" line="2802"/> <source> to </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="2835"/> + <location filename="onmainwindow.cpp" line="2847"/> <source>Connection Error(</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="2904"/> + <location filename="onmainwindow.cpp" line="2916"/> <source>Couldn't find a SSH connection.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="2921"/> + <location filename="onmainwindow.cpp" line="2933"/> <source>Enter passphrase to decrypt a key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="2954"/> + <location filename="onmainwindow.cpp" line="2966"/> <source>Host key for server changed. It is now: </source> - <translation>主機的SSH密鑰已經更換。 -現在的密鑰為: </translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="2955"/> + <location filename="onmainwindow.cpp" line="2967"/> <source>For security reasons, connection will be stopped</source> - <translation>由於安全性的考量，目前的連線已被中止</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="2968"/> + <location filename="onmainwindow.cpp" line="2980"/> <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> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="2994"/> + <location filename="onmainwindow.cpp" line="3006"/> <source>Could not find known host file.If you accept the host key here, the file will be automatically created</source> - <translation>目前沒有發現已知的主機檔案。如果您接受目前的主機密鑰，這個檔案將會自動被建立。</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="2999"/> + <location filename="onmainwindow.cpp" line="3011"/> <source>The server is unknown. Do you trust the host key? Public key hash: </source> - <translation>此為未知的伺服器，您要選擇信任此主機密鑰嗎? -此公開密鑰的雜湊值為:</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="3003"/> - <location filename="onmainwindow.cpp" line="3013"/> + <location filename="onmainwindow.cpp" line="3015"/> + <location filename="onmainwindow.cpp" line="3025"/> <source>Host key verification failed</source> - <translation>主機密鑰驗證任失敗</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="3003"/> - <location filename="onmainwindow.cpp" line="4412"/> + <location filename="onmainwindow.cpp" line="3015"/> <location filename="onmainwindow.cpp" line="4432"/> + <location filename="onmainwindow.cpp" line="4452"/> <source>Yes</source> - <translation>是</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="3003"/> - <location filename="onmainwindow.cpp" line="4413"/> + <location filename="onmainwindow.cpp" line="3015"/> <location filename="onmainwindow.cpp" line="4433"/> + <location filename="onmainwindow.cpp" line="4453"/> <source>No</source> - <translation>否</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="3041"/> + <location filename="onmainwindow.cpp" line="3053"/> <source>Authentication failed: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="3045"/> + <location filename="onmainwindow.cpp" line="3057"/> <source>Authentication failed</source> - <translation>認證失敗</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="3421"/> + <location filename="onmainwindow.cpp" line="3435"/> <source>Enter password for SSH proxy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="3440"/> - <location filename="onmainwindow.cpp" line="4564"/> - <location filename="onmainwindow.cpp" line="4658"/> - <location filename="onmainwindow.cpp" line="4691"/> - <location filename="onmainwindow.cpp" line="6929"/> - <location filename="onmainwindow.cpp" line="7011"/> - <location filename="onmainwindow.cpp" line="7388"/> - <location filename="onmainwindow.cpp" line="7453"/> - <location filename="onmainwindow.cpp" line="8540"/> + <location filename="onmainwindow.cpp" line="3454"/> + <location filename="onmainwindow.cpp" line="4584"/> + <location filename="onmainwindow.cpp" line="4678"/> + <location filename="onmainwindow.cpp" line="4711"/> + <location filename="onmainwindow.cpp" line="6972"/> + <location filename="onmainwindow.cpp" line="7054"/> + <location filename="onmainwindow.cpp" line="7431"/> + <location filename="onmainwindow.cpp" line="7496"/> + <location filename="onmainwindow.cpp" line="8583"/> <source>Connection failed </source> - <translation>連線失敗 -</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="3443"/> - <location filename="onmainwindow.cpp" line="4567"/> - <location filename="onmainwindow.cpp" line="4661"/> - <location filename="onmainwindow.cpp" line="6106"/> - <location filename="onmainwindow.cpp" line="6136"/> - <location filename="onmainwindow.cpp" line="6932"/> - <location filename="onmainwindow.cpp" line="7014"/> - <location filename="onmainwindow.cpp" line="7391"/> - <location filename="onmainwindow.cpp" line="7456"/> - <location filename="onmainwindow.cpp" line="8543"/> + <location filename="onmainwindow.cpp" line="3457"/> + <location filename="onmainwindow.cpp" line="4587"/> + <location filename="onmainwindow.cpp" line="4681"/> + <location filename="onmainwindow.cpp" line="6135"/> + <location filename="onmainwindow.cpp" line="6165"/> + <location filename="onmainwindow.cpp" line="6975"/> + <location filename="onmainwindow.cpp" line="7057"/> + <location filename="onmainwindow.cpp" line="7434"/> + <location filename="onmainwindow.cpp" line="7499"/> + <location filename="onmainwindow.cpp" line="8586"/> <source>Wrong password! </source> - <translation>不正確的密碼! </translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="3455"/> - <location filename="onmainwindow.cpp" line="3458"/> - <location filename="onmainwindow.cpp" line="3460"/> - <location filename="onmainwindow.cpp" line="7403"/> - <location filename="onmainwindow.cpp" line="7406"/> - <location filename="onmainwindow.cpp" line="7408"/> + <location filename="onmainwindow.cpp" line="3469"/> + <location filename="onmainwindow.cpp" line="3472"/> + <location filename="onmainwindow.cpp" line="3474"/> + <location filename="onmainwindow.cpp" line="7446"/> + <location filename="onmainwindow.cpp" line="7449"/> + <location filename="onmainwindow.cpp" line="7451"/> <source>Connection failed: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="3458"/> - <location filename="onmainwindow.cpp" line="7406"/> + <location filename="onmainwindow.cpp" line="3472"/> + <location filename="onmainwindow.cpp" line="7449"/> <source> - Wrong password.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="3573"/> + <location filename="onmainwindow.cpp" line="3587"/> <source>unknown</source> - <translation>未知</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="3640"/> + <location filename="onmainwindow.cpp" line="3654"/> <source>No server availabel</source> - <translation>伺服器不存在l</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="3649"/> - <location filename="onmainwindow.cpp" line="3972"/> - <location filename="onmainwindow.cpp" line="4491"/> - <location filename="onmainwindow.cpp" line="4636"/> + <location filename="onmainwindow.cpp" line="3663"/> + <location filename="onmainwindow.cpp" line="3992"/> + <location filename="onmainwindow.cpp" line="4511"/> + <location filename="onmainwindow.cpp" line="4656"/> <source>Server not availabel</source> - <translation>伺服器不存在|</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="4237"/> - <location filename="onmainwindow.cpp" line="10582"/> + <location filename="onmainwindow.cpp" line="4257"/> + <location filename="onmainwindow.cpp" line="10641"/> <source>Select session:</source> - <translation>請選擇工作階段:</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="4252"/> - <location filename="onmainwindow.cpp" line="4349"/> - <location filename="onmainwindow.cpp" line="5535"/> + <location filename="onmainwindow.cpp" line="4272"/> + <location filename="onmainwindow.cpp" line="4369"/> + <location filename="onmainwindow.cpp" line="5559"/> <source>running</source> - <translation>正在執行中</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="4254"/> - <location filename="onmainwindow.cpp" line="4583"/> + <location filename="onmainwindow.cpp" line="4274"/> + <location filename="onmainwindow.cpp" line="4603"/> <source>suspended</source> - <translation>已暫停</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="4260"/> + <location filename="onmainwindow.cpp" line="4280"/> <source>Desktop</source> - <translation>桌面</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="4262"/> + <location filename="onmainwindow.cpp" line="4282"/> <source>single application</source> - <translation>單一的應用程式</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="4264"/> + <location filename="onmainwindow.cpp" line="4284"/> <source>shadow session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="4297"/> + <location filename="onmainwindow.cpp" line="4317"/> <source>Information</source> - <translation>資訊</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="4298"/> + <location filename="onmainwindow.cpp" line="4318"/> <source>No accessible desktop found</source> - <translation>目前沒有找到可訪問的工作桌面</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="4311"/> - <location filename="onmainwindow.cpp" line="10998"/> + <location filename="onmainwindow.cpp" line="4331"/> + <location filename="onmainwindow.cpp" line="11058"/> <source>Filter</source> - <translation>篩選器</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="4318"/> + <location filename="onmainwindow.cpp" line="4338"/> <source>Select desktop:</source> - <translation>請選擇工作桌面:</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="4399"/> <location filename="onmainwindow.cpp" line="4419"/> - <location filename="onmainwindow.cpp" line="5322"/> - <location filename="onmainwindow.cpp" line="5744"/> + <location filename="onmainwindow.cpp" line="4439"/> + <location filename="onmainwindow.cpp" line="5342"/> + <location filename="onmainwindow.cpp" line="5768"/> <source>Warning</source> - <translation>警告</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="4400"/> <location filename="onmainwindow.cpp" line="4420"/> + <location filename="onmainwindow.cpp" line="4440"/> <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 you will loose the session and have to start a new one! It's highly recommended to change the color depth of your Display to </source> - <translation>您目前使用與x2go工作階段不同的色彩設定。可能會造成連線的不穩定，並且很可能會喪失目前的工作階段。強烈建議先將目前使用的色彩設定設為</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="4408"/> + <location filename="onmainwindow.cpp" line="4428"/> <source>24 or 32</source> - <translation>24或32</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="4409"/> <location filename="onmainwindow.cpp" line="4429"/> + <location filename="onmainwindow.cpp" line="4449"/> <source> bit and restart your X-server before you reconnect to this x2go-session. Resume this session anyway?</source> - <translation>位元並且重新啟動X-server，之後再重新連接這一個工作階段。 請問您無論如何都要恢復此工作階段的連線嗎?</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="4517"/> + <location filename="onmainwindow.cpp" line="4537"/> <source>suspending</source> - <translation>正在暫停工作中</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="4552"/> + <location filename="onmainwindow.cpp" line="4572"/> <source>terminating</source> - <translation>正在中止工作中</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="4694"/> + <location filename="onmainwindow.cpp" line="4714"/> <source>Wrong Password! </source> - <translation>不正確的密碼! </translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="4836"/> + <location filename="onmainwindow.cpp" line="4856"/> <source>New session started</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="4871"/> + <location filename="onmainwindow.cpp" line="4891"/> <source>Session resumed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="5103"/> - <location filename="onmainwindow.cpp" line="5107"/> + <location filename="onmainwindow.cpp" line="5123"/> + <location filename="onmainwindow.cpp" line="5127"/> <source>Unable to create folder: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="5133"/> - <location filename="onmainwindow.cpp" line="5137"/> + <location filename="onmainwindow.cpp" line="5153"/> + <location filename="onmainwindow.cpp" line="5157"/> <source>Unable to write file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="5406"/> - <source>Emergency exit.</source> + <location filename="onmainwindow.cpp" line="5284"/> + <location filename="onmainwindow.cpp" line="9869"/> + <source>Attach X2Go window</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="5415"/> - <source>Waiting for proxy to exit.</source> + <location filename="onmainwindow.cpp" line="5310"/> + <location filename="onmainwindow.cpp" line="8661"/> + <source>Unable to create SSL tunnel: +</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="5418"/> - <source>Failed, killing the proxy.</source> + <location filename="onmainwindow.cpp" line="5340"/> + <source>Unable to create SSL Tunnel: +</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="6830"/> - <location filename="onmainwindow.cpp" line="6835"/> - <source>Wrong parameter: </source> + <location filename="onmainwindow.cpp" line="5426"/> + <source>Emergency exit.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="7263"/> - <source>Unable to create folder:</source> - <translation>無法創建資料夾:</translation> - </message> - <message> - <source>Unable to write file:</source> - <translation type="obsolete">檔案無法寫入:</translation> - </message> - <message> - <location filename="onmainwindow.cpp" line="5264"/> - <location filename="onmainwindow.cpp" line="9826"/> - <source>Attach X2Go window</source> - <translation>連接X2Go視窗</translation> - </message> - <message> - <location filename="onmainwindow.cpp" line="5290"/> - <location filename="onmainwindow.cpp" line="8618"/> - <source>Unable to create SSL tunnel: -</source> - <translation>無法建立SSL通道:</translation> + <location filename="onmainwindow.cpp" line="5435"/> + <source>Waiting for proxy to exit.</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="5320"/> - <source>Unable to create SSL Tunnel: -</source> - <translation>無法建立SSL通道: -</translation> + <location filename="onmainwindow.cpp" line="5438"/> + <source>Failed, killing the proxy.</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="5497"/> + <location filename="onmainwindow.cpp" line="5521"/> <source>Finished</source> - <translation>已完成</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="5524"/> + <location filename="onmainwindow.cpp" line="5548"/> <source>starting</source> - <translation>正在開始</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="5528"/> + <location filename="onmainwindow.cpp" line="5552"/> <source>resuming</source> - <translation>正在還原</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="5591"/> - <location filename="onmainwindow.cpp" line="5871"/> - <location filename="onmainwindow.cpp" line="5890"/> + <location filename="onmainwindow.cpp" line="5615"/> + <location filename="onmainwindow.cpp" line="5895"/> + <location filename="onmainwindow.cpp" line="5914"/> <source>Connection timeout, aborting</source> - <translation>連線超時，中止中</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="5592"/> + <location filename="onmainwindow.cpp" line="5616"/> <source>aborting</source> - <translation>中止中</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="5745"/> + <location filename="onmainwindow.cpp" line="5769"/> <source>Are you sure you want to terminate this session? Unsaved documents will be lost</source> - <translation>您確定要終止目前的工作階段嗎? 所有未存檔的資料都將會遺失</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="5839"/> + <location filename="onmainwindow.cpp" line="5863"/> <source>Session</source> - <translation>工作階段</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="5841"/> - <location filename="onmainwindow.cpp" line="10663"/> - <location filename="onmainwindow.cpp" line="10685"/> + <location filename="onmainwindow.cpp" line="5865"/> + <location filename="onmainwindow.cpp" line="10722"/> + <location filename="onmainwindow.cpp" line="10744"/> <source>Display</source> - <translation>顯示</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="5843"/> - <location filename="onmainwindow.cpp" line="10674"/> + <location filename="onmainwindow.cpp" line="5867"/> + <location filename="onmainwindow.cpp" line="10733"/> <source>Creation time</source> - <translation>創建時間</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="6103"/> - <location filename="onmainwindow.cpp" line="6133"/> + <location filename="onmainwindow.cpp" line="6132"/> + <location filename="onmainwindow.cpp" line="6162"/> <source>Connection failed : </source> - <translation>連線失敗 -: -</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="6560"/> + <location filename="onmainwindow.cpp" line="6603"/> <source> (can't open file)</source> - <translation> (無法開啟檔案)</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="6571"/> - <location filename="onmainwindow.cpp" line="6581"/> - <location filename="onmainwindow.cpp" line="6591"/> + <location filename="onmainwindow.cpp" line="6614"/> + <location filename="onmainwindow.cpp" line="6624"/> + <location filename="onmainwindow.cpp" line="6634"/> <source> (file not exists)</source> - <translation> (檔案不存在)</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="6616"/> + <location filename="onmainwindow.cpp" line="6659"/> <source> (directory not exists)</source> - <translation> (目錄不存在)</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="6644"/> + <location filename="onmainwindow.cpp" line="6687"/> <source>wrong value for argument"--link"</source> - <translation>"--link"參數的值錯誤</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="6662"/> + <location filename="onmainwindow.cpp" line="6705"/> <source>wrong value for argument"--sound"</source> - <translation>"--sound"參數的值錯誤</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="6679"/> - <location filename="onmainwindow.cpp" line="6690"/> + <location filename="onmainwindow.cpp" line="6722"/> + <location filename="onmainwindow.cpp" line="6733"/> <source>wrong value for argument"--geometry"</source> - <translation>"--geometry"參數的值錯誤</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="6708"/> + <location filename="onmainwindow.cpp" line="6751"/> <source>wrong value for argument"--set-kbd"</source> - <translation>"--set-kbd"參數的值錯誤</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="6725"/> + <location filename="onmainwindow.cpp" line="6768"/> <source>wrong value for argument"--ldap"</source> - <translation>"--ldap"參數的值錯誤</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="6747"/> + <location filename="onmainwindow.cpp" line="6790"/> <source>wrong value for argument"--ldap1"</source> - <translation>"--ldap1"參數的值錯誤</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="6766"/> + <location filename="onmainwindow.cpp" line="6809"/> <source>wrong value for argument"--ldap2"</source> - <translation>"--ldap2"參數的值錯誤</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="6820"/> + <location filename="onmainwindow.cpp" line="6863"/> <source>wrong value for argument"--pack"</source> - <translation>"--pack"參數的值錯誤</translation> + <translation type="unfinished"></translation> </message> <message> - <source>wrong parameter: </source> - <translation type="obsolete">錯誤的參數:</translation> + <location filename="onmainwindow.cpp" line="6873"/> + <location filename="onmainwindow.cpp" line="6878"/> + <source>Wrong parameter: </source> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="6889"/> - <location filename="onmainwindow.cpp" line="6916"/> + <location filename="onmainwindow.cpp" line="6932"/> + <location filename="onmainwindow.cpp" line="6959"/> <source>Options</source> - <translation>選項</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="6895"/> + <location filename="onmainwindow.cpp" line="6938"/> <source>Available pack methodes:</source> - <translation>可用的包裝方法:</translation> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="onmainwindow.cpp" line="7306"/> + <source>Unable to create folder:</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="7359"/> + <location filename="onmainwindow.cpp" line="7402"/> <source>RSA file empty.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="7368"/> + <location filename="onmainwindow.cpp" line="7411"/> <source>Can not open key: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="7701"/> + <location filename="onmainwindow.cpp" line="7744"/> <source>Support</source> - <translation>支援</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="7706"/> + <location filename="onmainwindow.cpp" line="7749"/> <source> (C. 2006-2012 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="7710"/> + <location filename="onmainwindow.cpp" line="7753"/> <source> x2goplugin mode was sponsored by <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a> </source> - <translation> x2goplugin mode是由 <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a>提供贊助 </translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="7714"/> + <location filename="onmainwindow.cpp" line="7757"/> <source> 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 authentication 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.cpp" line="7727"/> + <location filename="onmainwindow.cpp" line="7770"/> <source>X2Go Client V. </source> - <translation>X2Go 客戶端 V. </translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="7772"/> + <location filename="onmainwindow.cpp" line="7815"/> <source>Please check LDAP Settings</source> - <translation>請檢查LDAP的設定</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="8010"/> + <location filename="onmainwindow.cpp" line="8053"/> <source>No valid card found</source> - <translation>沒有發現合法的卡片</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="8062"/> + <location filename="onmainwindow.cpp" line="8105"/> <source>Card not configured.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="8066"/> + <location filename="onmainwindow.cpp" line="8109"/> <source>This card is unknown by X2Go system</source> - <translation>X2Go系統無法辨識此張卡片</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="8094"/> + <location filename="onmainwindow.cpp" line="8137"/> <source>Unable to create file: </source> - <translation>檔案無法創建:</translation> - </message> - <message> - <location filename="onmainwindow.cpp" line="8382"/> - <source>Can't start X server -Please check your settings</source> <translation type="unfinished"></translation> </message> <message> - <source>Can't connect to X-Server</source> - <translation type="obsolete">無法連接至X伺服器</translation> - </message> - <message> - <location filename="onmainwindow.cpp" line="8381"/> + <location filename="onmainwindow.cpp" line="8424"/> <source>Can't connect to X server Please check your settings</source> - <oldsource>Can't connect to X-Server -Please check your settings</oldsource> - <translation type="unfinished">無法連接至X伺服器 -請檢查您的設定值</translation> + <translation type="unfinished"></translation> </message> <message> - <source>Can't start X Server + <location filename="onmainwindow.cpp" line="8425"/> + <source>Can't start X server Please check your settings</source> - <translation type="obsolete">無法啟動X伺服器 -請檢查您的設定值</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="8396"/> - <location filename="onmainwindow.cpp" line="9053"/> - <location filename="onmainwindow.cpp" line="9083"/> + <location filename="onmainwindow.cpp" line="8439"/> + <location filename="onmainwindow.cpp" line="9096"/> + <location filename="onmainwindow.cpp" line="9126"/> <source>Can't start X Server Please check your installation</source> - <translation>無法啟動X伺服器 -請檢查X伺服器安是否有安裝正確</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="8562"/> - <location filename="onmainwindow.cpp" line="8567"/> + <location filename="onmainwindow.cpp" line="8605"/> + <location filename="onmainwindow.cpp" line="8610"/> <source>Unable to execute: </source> - <translation>無法執行:</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="8592"/> + <location filename="onmainwindow.cpp" line="8635"/> <source>Remote server does not support file system export through SSH Tunnel Please update to a newer x2goserver package</source> - <translation>遠端伺服器無法支援SSH通道型式的共用檔案系統，請升級至較新的X2Go伺服器板本</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="8645"/> + <location filename="onmainwindow.cpp" line="8688"/> <source>Unable to read : </source> - <translation>無法讀取: -</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="8672"/> + <location filename="onmainwindow.cpp" line="8715"/> <source>Unable to write : </source> - <translation>無法寫入: -</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="8759"/> + <location filename="onmainwindow.cpp" line="8802"/> <source>WINDOWS-1252</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="8771"/> + <location filename="onmainwindow.cpp" line="8814"/> <source>ISO8859-1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="9641"/> + <location filename="onmainwindow.cpp" line="9684"/> <source>Error getting window geometry (window closed)?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="9917"/> + <location filename="onmainwindow.cpp" line="9962"/> <source>X2Go Session</source> - <translation>X2Go工作階段</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="10104"/> + <location filename="onmainwindow.cpp" line="10163"/> <source>wrong value for argument"speed"</source> - <translation>錯誤的"speed"參數值</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="10220"/> + <location filename="onmainwindow.cpp" line="10279"/> <source>Password:</source> - <translation>密碼:</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="10221"/> + <location filename="onmainwindow.cpp" line="10280"/> <source>Keyboard layout:</source> - <translation>鑑盤佈局:</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="10262"/> + <location filename="onmainwindow.cpp" line="10321"/> <source>Ok</source> - <translation>確定</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="10264"/> - <location filename="onmainwindow.cpp" line="10586"/> - <location filename="onmainwindow.cpp" line="10588"/> + <location filename="onmainwindow.cpp" line="10323"/> + <location filename="onmainwindow.cpp" line="10645"/> + <location filename="onmainwindow.cpp" line="10647"/> <source>Cancel</source> - <translation>取消</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="10401"/> + <location filename="onmainwindow.cpp" line="10460"/> <source>Session ID: Server: Username: Display: Creation time: Status:</source> - <translation>工作階段識別碼: 伺服器: 使用者名稱: 顯示: 創建時間: 狀態:</translation> - </message> - <message> - <location filename="onmainwindow.cpp" line="10411"/> - <source>Applications...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="10424"/> + <location filename="onmainwindow.cpp" line="10483"/> <source>Abort</source> - <translation>退出</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="10436"/> + <location filename="onmainwindow.cpp" line="10495"/> <source>Show details</source> - <translation>顯示細節</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="10584"/> + <location filename="onmainwindow.cpp" line="10643"/> <source>Resume</source> - <translation>恢復</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="10596"/> + <location filename="onmainwindow.cpp" line="10655"/> <source>New</source> - <translation>新增</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="10599"/> + <location filename="onmainwindow.cpp" line="10658"/> <source>Full access</source> - <translation>完全存取</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="10602"/> + <location filename="onmainwindow.cpp" line="10661"/> <source>View only</source> - <translation>僅查看</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="10665"/> + <location filename="onmainwindow.cpp" line="10724"/> <source>Status</source> - <translation>狀態</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="10667"/> + <location filename="onmainwindow.cpp" line="10726"/> <source>Command</source> - <translation>指令</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="10669"/> + <location filename="onmainwindow.cpp" line="10728"/> <source>Type</source> - <translation>型態</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="10671"/> + <location filename="onmainwindow.cpp" line="10730"/> <source>Server</source> - <translation>伺服器</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="10676"/> + <location filename="onmainwindow.cpp" line="10735"/> <source>Client IP</source> - <translation>客戶端IP</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="10678"/> + <location filename="onmainwindow.cpp" line="10737"/> <source>Session ID</source> - <translation>工作階段識別碼</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="10682"/> + <location filename="onmainwindow.cpp" line="10741"/> <source>User</source> - <translation>使用者</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="10713"/> + <location filename="onmainwindow.cpp" line="10772"/> <source>Only my desktops</source> - <translation>只選擇我的桌面</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="10810"/> + <location filename="onmainwindow.cpp" line="10869"/> <source>sshd not started, you'll need sshd for printing and file sharing you can install sshd with sudo apt-get install openssh-server</source> - <translation>SSH伺服器沒有執行起來，遠端列印與檔案共享功能需要先安裝SSH伺服器 -您可以使用下列指令來安裝SSH伺服器: -sudo apt-get install openssh-server</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="10883"/> + <location filename="onmainwindow.cpp" line="10942"/> <source>Restore toolbar</source> - <translation>還原工具列</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="10928"/> + <location filename="onmainwindow.cpp" line="10988"/> <source> &nbsp;&nbsp;&nbsp;Click this button&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;to restore toolbar&nbsp;&nbsp;&nbsp; </source> - <translation> &nbsp;&nbsp;&nbsp;按此按鈕&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;還原工具列&nbsp;&nbsp;&nbsp; </translation> - </message> - <message> - <source>Invalid reply from broker</source> - <translation type="obsolete">代理伺服器的回應不合法</translation> + <translation type="unfinished"></translation> </message> </context> <context> @@ -1968,22 +1913,22 @@ you can install sshd with <message> <location filename="printdialog.ui" line="18"/> <source>Print - X2Go Client</source> - <translation>列印 - X2Go用戶端</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="printdialog.cpp" line="31"/> <source>Print</source> - <translation>列印</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="printdialog.cpp" line="60"/> <source>You've deactivated the x2go client printing dialog.</source> - <translation>您已經停用X2Go用戶端的列印對話框</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="printdialog.cpp" line="62"/> <source>You may reactivate this dialog using the x2goclient settings dialog (Menu -> Options -> Settings)</source> - <translation>您可能需要於X2Go用戶端的設定對話框中(選單 -> 選項 -> 設定)重新啟用這個對話框</translation> + <translation type="unfinished"></translation> </message> </context> <context> @@ -1991,25 +1936,25 @@ you can install sshd with <message> <location filename="printprocess.cpp" line="161"/> <source>Save File</source> - <translation>儲存檔案</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="printprocess.cpp" line="163"/> <source>PDF Document (*.pdf)</source> - <translation>PDF文件 (*.pdf)</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="printprocess.cpp" line="257"/> <location filename="printprocess.cpp" line="280"/> <source>Failed to execute command: </source> - <translation>執行命令失敗:</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="printprocess.cpp" line="272"/> <location filename="printprocess.cpp" line="279"/> <source>Printing error</source> - <translation>列印錯誤</translation> + <translation type="unfinished"></translation> </message> </context> <context> @@ -2017,73 +1962,73 @@ you can install sshd with <message> <location filename="printwidget.ui" line="15"/> <source>Form</source> - <translation>表單</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="printwidget.ui" line="25"/> <source>Print</source> - <translation>列印</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="printwidget.ui" line="35"/> <source>View as PDF</source> - <translation>以PDF格式查看</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="printwidget.ui" line="65"/> <source>Print settings</source> - <translation>列印設定</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="printwidget.ui" line="71"/> <source>Printer:</source> - <translation>印表機:</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="printwidget.ui" line="81"/> <source>Print using default Windows PDF Viewer (Viewer application needs to be installed)</source> - <translation>以預設的Windows PDF閱讀器列印(必需要安裝閱讀器)</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="printwidget.ui" line="96"/> <source>Printer command:</source> - <translation>印表機指令:</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="printwidget.ui" line="118"/> <source>...</source> - <translation></translation> + <translation type="unfinished"></translation> </message> <message> <location filename="printwidget.ui" line="149"/> <source>Viewer settings</source> - <translation>閱讀器設定</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="printwidget.ui" line="155"/> <source>Open in viewer application</source> - <translation>在閱讀器程式裡開啟</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="printwidget.ui" line="167"/> <source>Command:</source> - <translation>指令:</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="printwidget.ui" line="179"/> <source>Save to disk</source> - <translation>儲存到磁碟裡</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="printwidget.ui" line="209"/> <source>Show this dialog before start printing</source> - <translation>開始列印前先顯示此對話框</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="printwidget.cpp" line="59"/> <source>Please configure your client side printing settings. 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">ghost… and <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a… can find further information <a href="http://www.x2go.org/index.php?id=49">here</a>.</source> - <translation>請設定您的客戶端列印設定 您會需要一個外部的程式來進行列印工作，您可以使用 <a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghost… 以及 <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a… <a href="http://www.x2go.org/index.php?id=49">這個網址</a>.</translation> + <translation type="unfinished"></translation> </message> </context> <context> @@ -2091,12 +2036,12 @@ you can install sshd with <message> <location filename="printercmddialog.ui" line="15"/> <source>Printer command</source> - <translation>印表機指令</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="printercmddialog.ui" line="21"/> <source>Command</source> - <translation>指令</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="printercmddialog.ui" line="27"/> @@ -2104,64 +2049,59 @@ you can install sshd with Examples: kprinter lpr -P hp_laserjet</source> - <translation>請輸入您自定的列印指令。 -例如: -kprinter -lpr -P hp_laserjet</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="printercmddialog.ui" line="46"/> <source>Output format</source> - <translation>輸出格式</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="printercmddialog.ui" line="52"/> <source>Please choose the printing file format (regarding to your printing environment - if you use CUPS you may use PDF)</source> - <translation>請選擇您要輸出的檔案格式 (如果您是使用CUPS列印服務，您可能是使用PDF)</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="printercmddialog.ui" line="68"/> <source>PDF</source> - <translation></translation> + <translation type="unfinished"></translation> </message> <message> <location filename="printercmddialog.ui" line="75"/> <source>PS</source> - <translation></translation> + <translation type="unfinished"></translation> </message> <message> <location filename="printercmddialog.ui" line="88"/> <source>Data structure</source> - <translation>數據結構</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="printercmddialog.ui" line="94"/> <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>請選擇列印資料的輸入方式:</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="printercmddialog.ui" line="110"/> <source>standard input (STDIN)</source> - <translation>標準輸入 (STDIN)</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="printercmddialog.ui" line="117"/> <source>Specify path as program parameter</source> - <translation>指定一個路徑做為程式的參數</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="printercmddialog.cpp" line="43"/> <source>Please enter your customized or individual printing command. Example: </source> - <translation>請輸入您自定的列印指令 -範例: -</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="printercmddialog.cpp" line="51"/> <source><Path to gsprint.exe> -query -color</source> - <translation><Path to gsprint.exe> -query -color</translation> + <translation type="unfinished"></translation> </message> </context> <context> @@ -2177,52 +2117,52 @@ Example: <message> <location filename="sessionbutton.cpp" line="135"/> <source>Session preferences...</source> - <translation>工作階段偏好設定...</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="sessionbutton.cpp" line="139"/> <source>Create session icon on desktop...</source> - <translation>在桌面上建立工作階段圖示</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="sessionbutton.cpp" line="144"/> <source>Delete session</source> - <translation>刪除工作階段</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="sessionbutton.cpp" line="157"/> <source>Session actions</source> - <translation>工作階段動作</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="sessionbutton.cpp" line="158"/> <source>Select type</source> - <translation>選擇類型</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="sessionbutton.cpp" line="160"/> <source>Select resolution</source> - <translation>選擇解析度</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="sessionbutton.cpp" line="161"/> <source>Toggle sound support</source> - <translation>切換聲音支援</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="sessionbutton.cpp" line="291"/> <source>New Session</source> - <translation>新工作階段</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="sessionbutton.cpp" line="296"/> <source>running</source> - <translation>執行中</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="sessionbutton.cpp" line="300"/> <source>suspended</source> - <translation>已暫停</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="sessionbutton.cpp" line="333"/> @@ -2230,74 +2170,74 @@ Example: <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="348"/> - <location filename="sessionbutton.cpp" line="395"/> - <location filename="sessionbutton.cpp" line="684"/> + <location filename="sessionbutton.cpp" line="349"/> + <location filename="sessionbutton.cpp" line="401"/> + <location filename="sessionbutton.cpp" line="702"/> <source>RDP connection</source> - <translation>RDP連線</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="349"/> - <location filename="sessionbutton.cpp" line="401"/> - <location filename="sessionbutton.cpp" line="690"/> + <location filename="sessionbutton.cpp" line="350"/> + <location filename="sessionbutton.cpp" line="407"/> + <location filename="sessionbutton.cpp" line="708"/> <source>XDMCP</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="350"/> - <location filename="sessionbutton.cpp" line="386"/> - <location filename="sessionbutton.cpp" line="678"/> + <location filename="sessionbutton.cpp" line="351"/> + <location filename="sessionbutton.cpp" line="392"/> + <location filename="sessionbutton.cpp" line="696"/> <source>Connection to local desktop</source> - <translation>連線至本地桌面</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="351"/> - <location filename="sessionbutton.cpp" line="406"/> - <location filename="sessionbutton.cpp" line="726"/> + <location filename="sessionbutton.cpp" line="352"/> + <location filename="sessionbutton.cpp" line="412"/> + <location filename="sessionbutton.cpp" line="749"/> <source>Published applications</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="430"/> - <location filename="sessionbutton.cpp" line="448"/> - <location filename="sessionbutton.cpp" line="747"/> + <location filename="sessionbutton.cpp" line="436"/> + <location filename="sessionbutton.cpp" line="461"/> + <location filename="sessionbutton.cpp" line="770"/> <source>fullscreen</source> - <translation>全螢幕</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="435"/> - <location filename="sessionbutton.cpp" line="458"/> - <location filename="sessionbutton.cpp" line="462"/> - <location filename="sessionbutton.cpp" line="760"/> - <location filename="sessionbutton.cpp" line="763"/> + <location filename="sessionbutton.cpp" line="441"/> + <location filename="sessionbutton.cpp" line="471"/> + <location filename="sessionbutton.cpp" line="475"/> + <location filename="sessionbutton.cpp" line="783"/> + <location filename="sessionbutton.cpp" line="786"/> <source>Display </source> - <translation>顯示</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="443"/> - <location filename="sessionbutton.cpp" line="483"/> + <location filename="sessionbutton.cpp" line="456"/> + <location filename="sessionbutton.cpp" line="496"/> <source>window</source> - <translation>視窗</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="490"/> - <location filename="sessionbutton.cpp" line="494"/> - <location filename="sessionbutton.cpp" line="495"/> - <location filename="sessionbutton.cpp" line="753"/> + <location filename="sessionbutton.cpp" line="503"/> + <location filename="sessionbutton.cpp" line="507"/> + <location filename="sessionbutton.cpp" line="508"/> + <location filename="sessionbutton.cpp" line="776"/> <source>Maximum</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="502"/> - <location filename="sessionbutton.cpp" line="632"/> + <location filename="sessionbutton.cpp" line="515"/> + <location filename="sessionbutton.cpp" line="645"/> <source>Enabled</source> - <translation>啟用</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="504"/> - <location filename="sessionbutton.cpp" line="634"/> + <location filename="sessionbutton.cpp" line="517"/> + <location filename="sessionbutton.cpp" line="647"/> <source>Disabled</source> - <translation>停用</translation> + <translation type="unfinished"></translation> </message> </context> <context> @@ -2305,38 +2245,38 @@ Example: <message> <location filename="sessionmanagedialog.cpp" line="41"/> <source>E&xit</source> - <translation>離開(&x)</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="sessionmanagedialog.cpp" line="47"/> <source>&New session</source> - <translation>建立新的工作階段(&N)</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="sessionmanagedialog.cpp" line="48"/> <source>&Session preferences</source> - <translation>工作階段偏好設定(&S)</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="sessionmanagedialog.cpp" line="49"/> <source>&Delete session</source> - <translation>刪除工作階段(&D)</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="sessionmanagedialog.cpp" line="53"/> <source>&Create session icon on desktop...</source> - <translation>在桌面上建立工作階段圖示(&C)...</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="sessionmanagedialog.cpp" line="87"/> <source>Delete</source> <comment>Delete</comment> - <translation>刪除</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="sessionmanagedialog.cpp" line="115"/> <source>Session management</source> - <translation>管理工作階段</translation> + <translation type="unfinished"></translation> </message> </context> <context> @@ -2344,50 +2284,50 @@ Example: <message> <location filename="sessionwidget.cpp" line="61"/> <source>Session name:</source> - <translation>工作階段名稱:</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="sessionwidget.cpp" line="66"/> <source><< change icon</source> - <translation><< 更換圖示</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="sessionwidget.cpp" line="69"/> <source>&Server</source> - <translation>伺服器(&S)</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="sessionwidget.cpp" line="102"/> <location filename="sessionwidget.cpp" line="160"/> <source>Host:</source> - <translation>主機:</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="sessionwidget.cpp" line="103"/> <location filename="sessionwidget.cpp" line="166"/> <source>Login:</source> - <translation>登入帳號:</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="sessionwidget.cpp" line="104"/> - <location filename="sessionwidget.cpp" line="367"/> + <location filename="sessionwidget.cpp" line="368"/> <source>SSH port:</source> - <translation>SSH連接埠:</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="sessionwidget.cpp" line="119"/> <source>Use RSA/DSA key for ssh connection:</source> - <translation>使用RSA/DSA密鑰於SSH連線:</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="sessionwidget.cpp" line="126"/> <source>Try auto login (ssh-agent or default ssh key)</source> - <translation>嘗試自動登入 (ssh代理或預設SSH密鑰)</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="sessionwidget.cpp" line="127"/> <source>Kerberos 5 (GSSAPI) authentication</source> - <translation>Kerberos 5 (GSSAPI) 認證</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="sessionwidget.cpp" line="130"/> @@ -2432,7 +2372,7 @@ Example: <message> <location filename="sessionwidget.cpp" line="157"/> <source>Type:</source> - <translation type="unfinished">類別:</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="sessionwidget.cpp" line="161"/> @@ -2442,128 +2382,128 @@ Example: <message> <location filename="sessionwidget.cpp" line="176"/> <source>&Session type</source> - <translation>工作階段類型(&S)</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="sessionwidget.cpp" line="181"/> <source>Session type:</source> - <translation>工作階段類型:</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="192"/> - <location filename="sessionwidget.cpp" line="491"/> + <location filename="sessionwidget.cpp" line="193"/> + <location filename="sessionwidget.cpp" line="492"/> <source>Connect to Windows terminal server</source> - <translation>連線至微軟終端伺服器</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="193"/> + <location filename="sessionwidget.cpp" line="194"/> <source>XDMCP</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="194"/> + <location filename="sessionwidget.cpp" line="195"/> <source>Connect to local desktop</source> - <translation>連線至本地桌面</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="195"/> + <location filename="sessionwidget.cpp" line="196"/> <source>Custom desktop</source> - <translation>自訂桌面類型</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="196"/> + <location filename="sessionwidget.cpp" line="197"/> <source>Single application</source> - <translation>單一應用程式</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="197"/> + <location filename="sessionwidget.cpp" line="198"/> <source>Published applications</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="199"/> - <location filename="sessionwidget.cpp" line="435"/> + <location filename="sessionwidget.cpp" line="200"/> + <location filename="sessionwidget.cpp" line="436"/> <source>Command:</source> - <translation>指令:</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="200"/> + <location filename="sessionwidget.cpp" line="201"/> <source>Advanced options...</source> - <translation>進階設定...</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="212"/> - <location filename="sessionwidget.cpp" line="725"/> - <location filename="sessionwidget.cpp" line="820"/> + <location filename="sessionwidget.cpp" line="213"/> + <location filename="sessionwidget.cpp" line="726"/> + <location filename="sessionwidget.cpp" line="821"/> <source>Path to executable</source> - <translation>執行路徑</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="222"/> + <location filename="sessionwidget.cpp" line="223"/> <source>Direct RDP Connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="363"/> - <source>RDP port:</source> + <location filename="sessionwidget.cpp" line="291"/> + <location filename="sessionwidget.cpp" line="403"/> + <source>Open key file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="379"/> - <source>Open picture</source> - <translation>開啟圖片</translation> + <location filename="sessionwidget.cpp" line="293"/> + <location filename="sessionwidget.cpp" line="405"/> + <source>All files</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="381"/> - <source>Pictures</source> - <translation>圖片</translation> + <location filename="sessionwidget.cpp" line="303"/> + <location filename="sessionwidget.cpp" line="415"/> + <source>Error</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="290"/> - <location filename="sessionwidget.cpp" line="402"/> - <source>Open key file</source> - <translation>開啟密鑰檔案</translation> + <location filename="sessionwidget.cpp" line="304"/> + <location filename="sessionwidget.cpp" line="416"/> + <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> <message> - <location filename="sessionwidget.cpp" line="292"/> - <location filename="sessionwidget.cpp" line="404"/> - <source>All files</source> - <translation>所有檔案</translation> + <location filename="sessionwidget.cpp" line="364"/> + <source>RDP port:</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="302"/> - <location filename="sessionwidget.cpp" line="414"/> - <source>Error</source> - <translation>錯誤</translation> + <location filename="sessionwidget.cpp" line="380"/> + <source>Open picture</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="303"/> - <location filename="sessionwidget.cpp" line="415"/> - <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> + <location filename="sessionwidget.cpp" line="382"/> + <source>Pictures</source> + <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="462"/> - <location filename="sessionwidget.cpp" line="680"/> + <location filename="sessionwidget.cpp" line="463"/> + <location filename="sessionwidget.cpp" line="681"/> <source>Server:</source> - <translation>伺服器:</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="471"/> - <location filename="sessionwidget.cpp" line="692"/> + <location filename="sessionwidget.cpp" line="472"/> + <location filename="sessionwidget.cpp" line="693"/> <source>XDMCP server:</source> - <translation>XDMCP 伺服器:</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="492"/> + <location filename="sessionwidget.cpp" line="493"/> <source>rdesktop command line options:</source> - <translation>rdesktop 指令選項:</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="505"/> - <location filename="sessionwidget.cpp" line="704"/> + <location filename="sessionwidget.cpp" line="506"/> + <location filename="sessionwidget.cpp" line="705"/> <source>New session</source> - <translation>新的工作階段</translation> + <translation type="unfinished"></translation> </message> </context> <context> @@ -2572,154 +2512,153 @@ Example: <location filename="settingswidget.cpp" line="47"/> <location filename="settingswidget.cpp" line="51"/> <source>&Display</source> - <translation>顯示(&D)</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="settingswidget.cpp" line="48"/> <location filename="settingswidget.cpp" line="52"/> <source>&Keyboard</source> - <translation>鍵盤(&K)</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="settingswidget.cpp" line="49"/> <location filename="settingswidget.cpp" line="53"/> <source>Sound</source> - <translation>聲音</translation> - </message> - <message> - <location filename="settingswidget.cpp" line="244"/> - <source>RDP Client</source> <translation type="unfinished"></translation> </message> <message> <location filename="settingswidget.cpp" line="64"/> <source>Fullscreen</source> - <translation>全螢幕</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="settingswidget.cpp" line="66"/> <source>Custom</source> - <translation>自定</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="settingswidget.cpp" line="68"/> <source>Window</source> - <translation>視窗</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="settingswidget.cpp" line="70"/> <source>Use whole display</source> - <translation>使用整個顯示器</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="72"/> + <location filename="settingswidget.cpp" line="71"/> <source>Maximum available</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="83"/> + <location filename="settingswidget.cpp" line="79"/> <source>Set display DPI</source> - <translation>設定顯示DPI</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="88"/> + <location filename="settingswidget.cpp" line="84"/> <source>Xinerama extension (support for two or more physical displays)</source> - <translation>Xinerama延伸功能(支援兩個以上的螢幕)</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="104"/> + <location filename="settingswidget.cpp" line="100"/> <source>Width:</source> - <translation>寬度:</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="107"/> + <location filename="settingswidget.cpp" line="103"/> <source>Height:</source> - <translation>高度:</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="117"/> + <location filename="settingswidget.cpp" line="111"/> <source>&Display:</source> - <translation>顯示器(&D):</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="119"/> + <location filename="settingswidget.cpp" line="113"/> <source>&Identify all displays</source> - <translation>辨認所有顯示器(&I)</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="159"/> + <location filename="settingswidget.cpp" line="153"/> <source>Keep current keyboard Settings</source> - <translation>保持目前的鍵盤設定</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="169"/> + <location filename="settingswidget.cpp" line="163"/> <source>Keyboard layout:</source> - <translation>鍵盤佈局:</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="171"/> + <location filename="settingswidget.cpp" line="165"/> <source>Keyboard model:</source> - <translation>鍵盤型號:</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="182"/> + <location filename="settingswidget.cpp" line="176"/> <source>Enable sound support</source> - <translation>啟用音效支援</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="191"/> + <location filename="settingswidget.cpp" line="185"/> <source>Start sound daemon</source> - <translation>開啟聲音背景程式</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="193"/> + <location filename="settingswidget.cpp" line="187"/> <source>Use running sound daemon</source> - <translation>使用目前的音效背景程式</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="195"/> + <location filename="settingswidget.cpp" line="189"/> <source>Use SSH port forwarding to tunnel sound system connections through firewalls</source> - <translation>使用SSH連接埠轉送來建立 -可通過防火牆的聲音通道</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="197"/> + <location filename="settingswidget.cpp" line="191"/> <source>Use default sound port</source> - <translation>使用預設的聲音連接埠</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="204"/> + <location filename="settingswidget.cpp" line="198"/> <source>Sound port:</source> - <translation>聲音連接埠:</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="231"/> + <location filename="settingswidget.cpp" line="225"/> <source>Client side printing support</source> - <translation>用戶端列印支援</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="256"/> + <location filename="settingswidget.cpp" line="238"/> + <source>RDP Client</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="settingswidget.cpp" line="250"/> <source>Additional parameters:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="257"/> + <location filename="settingswidget.cpp" line="251"/> <source>Command line:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="650"/> + <location filename="settingswidget.cpp" line="644"/> <source>us</source> - <translation>us</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="651"/> + <location filename="settingswidget.cpp" line="645"/> <source>pc105/us</source> - <translation>pc105/us</translation> + <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="768"/> + <location filename="settingswidget.cpp" line="783"/> <source>password</source> <translation type="unfinished"></translation> </message> @@ -2729,68 +2668,68 @@ sound system connections through firewalls</source> <message> <location filename="sharewidget.cpp" line="43"/> <source>&Folders</source> - <translation>資料夾(&F)</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="sharewidget.cpp" line="53"/> <source>Path</source> - <translation>路徑</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="sharewidget.cpp" line="55"/> <location filename="sharewidget.cpp" line="137"/> <source>Automount</source> - <translation>自動掛載</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="sharewidget.cpp" line="64"/> <source>Add</source> - <translation>新增</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="sharewidget.cpp" line="65"/> <source>Delete</source> - <translation>刪除</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="sharewidget.cpp" line="75"/> <source>Path:</source> - <translation>路徑:</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="sharewidget.cpp" line="82"/> <source>Filename encoding</source> - <translation>檔案編碼方式</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="sharewidget.cpp" line="88"/> <source>local:</source> - <translation>本地端:</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="sharewidget.cpp" line="89"/> <source>remote:</source> - <translation>遠端:</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="sharewidget.cpp" line="101"/> <source>Use ssh port forwarding to tunnel file system connections through firewalls</source> - <translation>使用SSH連接埠轉送來建立可通過防火牆的檔案系統通道</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="sharewidget.cpp" line="164"/> <source>Select folder</source> - <translation>選擇資料夾</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="sharewidget.cpp" line="175"/> <source>Error</source> - <translation>錯誤</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="sharewidget.cpp" line="176"/> <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> + <translation type="unfinished"></translation> </message> <message> <location filename="sharewidget.cpp" line="235"/> @@ -2826,12 +2765,12 @@ sound system connections through firewalls</source> <message> <location filename="sshmasterconnection.cpp" line="321"/> <source>Can not initialize libssh</source> - <translation>libssh無法初始化</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="sshmasterconnection.cpp" line="349"/> <source>Can not create ssh session</source> - <translation>無法建立SSH工作階段</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="sshmasterconnection.cpp" line="379"/> @@ -2841,52 +2780,52 @@ sound system connections through firewalls</source> <message> <location filename="sshmasterconnection.cpp" line="409"/> <source>Can not connect to </source> - <translation>無法連線至 </translation> + <translation type="unfinished"></translation> </message> <message> <location filename="sshmasterconnection.cpp" line="500"/> <source>Authentication failed</source> - <translation>驗證失敗</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="sshmasterconnection.cpp" line="535"/> <source>channel_forward_listen failed</source> - <translation>channel_forward_listen失敗</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="sshmasterconnection.cpp" line="965"/> <source>Can not open file </source> - <translation>無法開啟檔案</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="sshmasterconnection.cpp" line="977"/> <source>Can not create remote file </source> - <translation>無法創建遠端檔案</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="sshmasterconnection.cpp" line="992"/> <source>Can not write to remote file </source> - <translation>無法寫入資料至遠端檔案</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="sshmasterconnection.cpp" line="1106"/> <source>can not connect to </source> - <translation>無法連線至 </translation> + <translation type="unfinished"></translation> </message> <message> <location filename="sshmasterconnection.cpp" line="1183"/> <source>channel_open_forward failed</source> - <translation>channel_open_forward失敗</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="sshmasterconnection.cpp" line="1204"/> <source>channel_open_session failed</source> - <translation>channel_open_session失敗</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="sshmasterconnection.cpp" line="1213"/> <source>channel_request_exec failed</source> - <translation>channel_request_exec失敗</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="sshmasterconnection.cpp" line="1292"/> @@ -2927,12 +2866,12 @@ sound system connections through firewalls</source> <message> <location filename="xsettingswidget.cpp" line="49"/> <source>Open File</source> - <translation>開啟檔案</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="xsettingswidget.cpp" line="51"/> <source>Executable (*.exe)</source> - <translation>執行檔 (*.exe)</translation> + <translation type="unfinished"></translation> </message> </context> <context> @@ -2940,18 +2879,17 @@ sound system connections through firewalls</source> <message> <location filename="xsettingsui.ui" line="15"/> <source>Form</source> - <translation>表單</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="xsettingsui.ui" line="28"/> <source>You must restart the X2Go Client for the changes to take effect</source> - <oldsource>You must restart the X2go Client for the changes to take effect</oldsource> - <translation type="unfinished">您必需重新啟動X2go用戶端以讓設定變更生效</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="xsettingsui.ui" line="51"/> <source>use integrated X-Server</source> - <translation>使用內建的X伺服器</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="xsettingsui.ui" line="61"/> @@ -2961,47 +2899,47 @@ sound system connections through firewalls</source> <message> <location filename="xsettingsui.ui" line="68"/> <source>use custom X-Server</source> - <translation>使用自定的X伺服器</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="xsettingsui.ui" line="78"/> <source>custom X-Server</source> - <translation>自定X伺服器</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="xsettingsui.ui" line="86"/> <source>executable:</source> - <translation>執行路徑:</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="xsettingsui.ui" line="109"/> <source>start X-Server on X2Go Client start</source> - <translation>當X2Go用戶端啟動時啟動X伺服器</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="xsettingsui.ui" line="121"/> <source>command line options:</source> - <translation>指令列選項:</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="xsettingsui.ui" line="133"/> <source>X-Server command line options</source> - <translation>X伺服器指令列選項</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="xsettingsui.ui" line="139"/> <source>window mode:</source> - <translation>視窗模式:</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="xsettingsui.ui" line="149"/> <source>fullscreen mode:</source> - <translation>全螢幕模式:</translation> + <translation type="unfinished"></translation> </message> <message> <location filename="xsettingsui.ui" line="159"/> <source>single application:</source> - <translation>單一應用程式:</translation> + <translation type="unfinished"></translation> </message> </context> </TS> 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).

1 0

x2gobroker.git - master (branch) updated: 0.0.2.3-19-gc8aeb0d
by git-admin＠x2go.org 19 Aug '13

19 Aug '13

The branch, master has been updated via c8aeb0d4a9e4896456655cae66d743c2e03de6e3 (commit) from 31eea62dbed1f9fdc5c270c178e7d947e6749ec9 (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 ----------------------------------------------------------------- commit c8aeb0d4a9e4896456655cae66d743c2e03de6e3 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Aug 18 22:33:24 2013 +0200 Fix output of HTTP based connectivity test. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2gobroker/web/plain.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 8b72caf..9628994 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ x2gobroker (0.0.3.0-0~x2go1) UNRELEASED; urgency=low - Fix logrotate script: x2gobroker-wsgi. (Fixes: #275). - Get the cookie based extra-authentication working for SSH mode. - Get the cookie based extra-authentication working for HTTP mode. + - Fix output of HTTP based connectivity test. * /debian/control: + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. diff --git a/x2gobroker/web/plain.py b/x2gobroker/web/plain.py index eb3daca..39ab7a8 100644 --- a/x2gobroker/web/plain.py +++ b/x2gobroker/web/plain.py @@ -129,7 +129,8 @@ class X2GoBrokerWeb(tornado.web.RequestHandler): ### TEST THE CONNECTION ### - return broker_backend.test_connection() + self.write(broker_backend.test_connection()) + return if task == 'listsessions': hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) 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 "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - master (branch) updated: 0.0.2.3-16-g9176b71
by git-admin＠x2go.org 19 Aug '13

19 Aug '13

The branch, master has been updated via 9176b71273c66f2e949f3229e498705ab1f84a6a (commit) from eeb50c1fbd89bae051e3a4f7cdc85de8f55dc976 (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 ----------------------------------------------------------------- commit 9176b71273c66f2e949f3229e498705ab1f84a6a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Aug 18 21:37:50 2013 +0200 mark inifile backend as: working ----------------------------------------------------------------------- Summary of changes: x2gobroker/brokers/base_broker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index 8c25da7..5431a99 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -47,7 +47,7 @@ class X2GoBroker(object): Currently available broker classes are:: L{zeroconf.X2GoBroker} (working) - L{inifile.X2GoBroker} (in prep) + L{inifile.X2GoBroker} (working) L{ldap.X2GoBroker} (in prep) """ hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) 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 "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - master (branch) updated: 0.0.2.3-17-g4123481
by git-admin＠x2go.org 19 Aug '13

19 Aug '13

The branch, master has been updated via 412348110510de7c77fda9f76b039ddfd7a1b7f2 (commit) from 9176b71273c66f2e949f3229e498705ab1f84a6a (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 ----------------------------------------------------------------- commit 412348110510de7c77fda9f76b039ddfd7a1b7f2 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Aug 18 21:53:09 2013 +0200 Get the cookie based extra-authentication working. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2gobroker/brokers/base_broker.py | 13 +++-- x2gobroker/client/plain.py | 113 +++++++++++++++++++------------------ 3 files changed, 69 insertions(+), 58 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 94431cc..64ee398 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ x2gobroker (0.0.3.0-0~x2go1) UNRELEASED; urgency=low - SSH broker: Only allow context change to another user for the magic user (default: x2gobroker). - Fix logrotate script: x2gobroker-wsgi. (Fixes: #275). + - Get the cookie based extra-authentication working. * /debian/control: + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index 5431a99..3a7aa7a 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -706,7 +706,7 @@ class X2GoBroker(object): else: return [] - def check_access(self, username='', password='', cookie=None, ): + def check_access(self, username='', password='', cookie=None, cookie_only=False): """\ Check if a given user with a given password may gain access to the X2Go session broker. @@ -717,6 +717,8 @@ class X2GoBroker(object): @type password: C{unicode} @param cookie: an extra (static or dynamic) authentication token @type cookie: C{unicode} + @param cookie_only: do only check the auth_cookie, not username/password + @type cookie_only: C{bool} @return: returns C{True} if the authentication has been successful @rtype: C{bool} @@ -733,13 +735,16 @@ class X2GoBroker(object): ### when inheriting from the base.X2GoBroker class. access = False - access = self._do_authenticate(username=username, password=password) - logger_broker.debug('base_broker.X2GoBroker.check_access(): result of authentication check is: {access}'.format(access=access)) + if cookie_only is False: + access = self._do_authenticate(username=username, password=password) + logger_broker.debug('base_broker.X2GoBroker.check_access(): result of authentication check is: {access}'.format(access=access)) + else: + access = True ### HANDLING OF DYNAMIC AUTHENTICATION ID HASHES # using cookie authentication as extra security? - if self.config.get_value('global', 'require-cookie-authentication'): + if self.config.get_value('global', 'require-cookie-auth'): if type(cookie) is types.StringType: cookie = unicode(cookie) diff --git a/x2gobroker/client/plain.py b/x2gobroker/client/plain.py index 73bc210..f6df4b6 100644 --- a/x2gobroker/client/plain.py +++ b/x2gobroker/client/plain.py @@ -66,75 +66,80 @@ class X2GoBrokerClient(object): output = '' - logger_broker.debug ('username: {username}, task: {task}, profile_id: {profile_id}'.format(username=username, task=task, profile_id=profile_id)) + if broker_backend.check_access(cookie=cookie, cookie_only=True): - ### - ### CONFIRM SUCCESSFUL AUTHENTICATION FIRST - ### + logger_broker.debug ('username: {username}, task: {task}, profile_id: {profile_id}'.format(username=username, task=task, profile_id=profile_id)) - if global_config['require-cookie-auth']: - - ### FIXME: make up a nice protocol for this, disabled for now - #output += "AUTHID: {authid} ".format(authid=broker_backend.get_next_authid(username=data.user)) - pass + ### + ### CONFIRM SUCCESSFUL AUTHENTICATION FIRST + ### - output += "Access granted\n" - ### - ### X2GO BROKER TASKS - ### + if global_config['require-cookie-auth'] and not global_config['use-static-cookie']: - # FIXME: the ,,testcon'' task can be object to DoS attacks... - if task == 'testcon': + ### FIXME: make up a nice protocol for this, disabled for now + #output += "AUTHID: {authid} ".format(authid=broker_backend.get_next_authid(username=data.user)) + pass + output += "Access granted\n" ### - ### TEST THE CONNECTION + ### X2GO BROKER TASKS ### - return broker_backend.test_connection() - - if task == 'listsessions': - - profiles = broker_backend.list_profiles(username) - if profiles: - output += "START_USER_SESSIONS\n\n" - profile_ids = profiles.keys() - profile_ids.sort() - for profile_id in profile_ids: - output += "[{profile_id}]\n".format(profile_id=profile_id) - for key in profiles[profile_id].keys(): - if key == u'user' and not profiles[profile_id][key]: - profiles[profile_id][key] = username - if type(profiles[profile_id][key]) in (types.UnicodeType, types.StringType): - output += "{key}={value}".format(key=key, value=unicode(profiles[profile_id][key])) - elif type(profiles[profile_id][key]) in (types.ListType, types.TupleType): - output += "{key}={value}".format(key=key, value=unicode(",".join(profiles[profile_id][key]))) - else: - output += "{key}={value}".format(key=key, value=unicode(int(profiles[profile_id][key]))) - + # FIXME: the ,,testcon'' task can be object to DoS attacks... + if task == 'testcon': + + ### + ### TEST THE CONNECTION + ### + + return broker_backend.test_connection() + + if task == 'listsessions': + + profiles = broker_backend.list_profiles(username) + if profiles: + output += "START_USER_SESSIONS\n\n" + profile_ids = profiles.keys() + profile_ids.sort() + for profile_id in profile_ids: + output += "[{profile_id}]\n".format(profile_id=profile_id) + for key in profiles[profile_id].keys(): + if key == u'user' and not profiles[profile_id][key]: + profiles[profile_id][key] = username + if type(profiles[profile_id][key]) in (types.UnicodeType, types.StringType): + output += "{key}={value}".format(key=key, value=unicode(profiles[profile_id][key])) + elif type(profiles[profile_id][key]) in (types.ListType, types.TupleType): + output += "{key}={value}".format(key=key, value=unicode(",".join(profiles[profile_id][key]))) + else: + output += "{key}={value}".format(key=key, value=unicode(int(profiles[profile_id][key]))) + + output += "\n" output += "\n" - output += "\n" - output += "END_USER_SESSIONS\n" + output += "END_USER_SESSIONS\n" - elif task == 'selectsession': + elif task == 'selectsession': - if profile_id: + if profile_id: - profile_info = broker_backend.select_session(profile_id=profile_id, username=username) - if profile_info.has_key('server'): - output += "SERVER:" - output += profile_info['server'] - if profile_info.has_key('port'): - output += ":{port}".format(port=profile_info['port']) - output += "\n" - if profile_info.has_key('authentication_privkey'): - output += profile_info['authentication_privkey'] - if profile_info.has_key('session_info'): - output += "SESSION_INFO:" - output += profile_info['session_info'] + "\n" + profile_info = broker_backend.select_session(profile_id=profile_id, username=username) + if profile_info.has_key('server'): + output += "SERVER:" + output += profile_info['server'] + if profile_info.has_key('port'): + output += ":{port}".format(port=profile_info['port']) + output += "\n" + if profile_info.has_key('authentication_privkey'): + output += profile_info['authentication_privkey'] + if profile_info.has_key('session_info'): + output += "SESSION_INFO:" + output += profile_info['session_info'] + "\n" + + else: + logger_broker.error ('cookie authentication failed') return output - logger_broker.warn ('broker backend ,,{backend}\'\' is disabled on this system'.format(backend=backend)) + logger_broker.error ('broker backend ,,{backend}\'\' is disabled on this system'.format(backend=backend)) hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) 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 "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - master (branch) updated: 0.0.2.3-18-g31eea62
by git-admin＠x2go.org 19 Aug '13

19 Aug '13

The branch, master has been updated via 31eea62dbed1f9fdc5c270c178e7d947e6749ec9 (commit) from 412348110510de7c77fda9f76b039ddfd7a1b7f2 (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 ----------------------------------------------------------------- commit 31eea62dbed1f9fdc5c270c178e7d947e6749ec9 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Aug 18 22:13:10 2013 +0200 Get the cookie based extra-authentication working for HTTP mode. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 ++- x2gobroker/web/plain.py | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 64ee398..8b72caf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,7 +7,8 @@ x2gobroker (0.0.3.0-0~x2go1) UNRELEASED; urgency=low - SSH broker: Only allow context change to another user for the magic user (default: x2gobroker). - Fix logrotate script: x2gobroker-wsgi. (Fixes: #275). - - Get the cookie based extra-authentication working. + - Get the cookie based extra-authentication working for SSH mode. + - Get the cookie based extra-authentication working for HTTP mode. * /debian/control: + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. diff --git a/x2gobroker/web/plain.py b/x2gobroker/web/plain.py index 6fdfffe..eb3daca 100644 --- a/x2gobroker/web/plain.py +++ b/x2gobroker/web/plain.py @@ -97,21 +97,21 @@ class X2GoBrokerWeb(tornado.web.RequestHandler): username = self.get_argument('user', default='') password = self.get_argument('password', default='') - cookie = self.get_argument('cookie', default='') + cookie = self.get_argument('authid', default='') task = self.get_argument('task', default='') profile_id = self.get_argument('sid', default='') new_password = self.get_argument('newpass', default='') output = '' - logger_broker.debug ('username: {username}, password: {password}, task: {task}, profile_id: {profile_id}'.format(username=username, password='XXXXX', task=task, profile_id=profile_id)) + logger_broker.debug ('username: {username}, password: {password}, task: {task}, profile_id: {profile_id}, cookie: {cookie}'.format(username=username, password='XXXXX', task=task, profile_id=profile_id, cookie=cookie)) if broker_backend.check_access(username=username, password=password, cookie=cookie): ### ### CONFIRM SUCCESSFUL AUTHENTICATION FIRST ### - if global_config['require-cookie-auth']: + if global_config['require-cookie-auth'] and not global_config['use-static-cookie']: ### FIXME: make up a nice protocol for this, disabled for now #output += "AUTHID: {authid} ".format(authid=broker_backend.get_next_authid(username=data.user)) hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) 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 "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - master (branch) updated: 0.0.2.3-15-geeb50c1
by git-admin＠x2go.org 19 Aug '13

19 Aug '13

The branch, master has been updated via eeb50c1fbd89bae051e3a4f7cdc85de8f55dc976 (commit) from 96e694c2c28c08352c3f070c90e183f66bd1b509 (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 ----------------------------------------------------------------- commit eeb50c1fbd89bae051e3a4f7cdc85de8f55dc976 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Aug 18 21:32:09 2013 +0200 SSH broker: Only allow context change to another user for the magic user (default: x2gobroker). ----------------------------------------------------------------------- Summary of changes: bin/x2gobroker | 3 +++ debian/changelog | 2 ++ 2 files changed, 5 insertions(+) The diff of changes is: diff --git a/bin/x2gobroker b/bin/x2gobroker index 3c1426d..cb6062b 100755 --- a/bin/x2gobroker +++ b/bin/x2gobroker @@ -117,6 +117,9 @@ if __name__ == "__main__": logger_broker.warn('ignoring option --sid as it only has a meaning with ,,--task selectsession\'\'') if cmdline_args.user is None: cmdline_args.user = os.environ['LOGNAME'] + elif cmdline_args.user != x2gobroker.defaults.X2GOBROKER_DAEMON_USER: + logger_broker.warn('denying context change to user `{user}\', only allowed for magic user `{magic_user}\''.format(user=cmdline_args.user, magic_user=x2gobroker.defaults.X2GOBROKER_DAEMON_USER)) + cmdline_args.user = os.environ['LOGNAME'] if cmdline_args.task is None: print("") p.print_usage() diff --git a/debian/changelog b/debian/changelog index 74167b8..94431cc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ x2gobroker (0.0.3.0-0~x2go1) UNRELEASED; urgency=low - Add SSH support to X2Go Session Broker. (Fixes: #153). - Move x2gobroker executable to /usr/bin. - Update x2gobroker man page. + - SSH broker: Only allow context change to another user for the + magic user (default: x2gobroker). - Fix logrotate script: x2gobroker-wsgi. (Fixes: #275). * /debian/control: + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) 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 "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - master (branch) updated: 0.0.2.3-13-g6be0aa0
by git-admin＠x2go.org 19 Aug '13

19 Aug '13

The branch, master has been updated via 6be0aa0ce1e0f079b9ab4e39d6166ab7e8411a99 (commit) from 5b10c97493111d76064747cdb6af64bcfc0b7b9d (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 ----------------------------------------------------------------- commit 6be0aa0ce1e0f079b9ab4e39d6166ab7e8411a99 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Aug 18 21:10:02 2013 +0200 log output fine-tuning ----------------------------------------------------------------------- Summary of changes: bin/x2gobroker | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/bin/x2gobroker b/bin/x2gobroker index dd8e633..36b3809 100755 --- a/bin/x2gobroker +++ b/bin/x2gobroker @@ -60,7 +60,8 @@ interactive_mode_warning = False if x2gobroker.defaults.X2GOBROKER_USER != x2gobroker.defaults.X2GOBROKER_DAEMON_USER and os.geteuid() != 0: interactive_mode_warning = True elif x2gobroker.defaults.X2GOBROKER_DAEMON_USER != 'root' and os.geteuid() == 0: - logger_broker.warn('X2Go Session Broker should not be run as root, better run as user {daemon_username}.'.format(daemon_username=x2gobroker.defaults.X2GOBROKER_DAEMON_USER)) + logger_broker.warn('X2Go Session Broker should not be run as root,') + logger_broker.warn(' better run as user {daemon_username}.'.format(daemon_username=x2gobroker.defaults.X2GOBROKER_DAEMON_USER)) elif os.geteuid() == 0: logger_broker.warn('X2Go Session Broker should not be run as root, better run as non-privileged user') @@ -125,7 +126,8 @@ if __name__ == "__main__": elif cmdline_args.mode.upper() == 'HTTP': if interactive_mode_warning: - logger_broker.warn('X2Go Session Broker has been started interactively by user {username}, better run as user {daemon_username}.'.format(username=x2gobroker.defaults.X2GOBROKER_USER, daemon_username=x2gobroker.defaults.X2GOBROKER_DAEMON_USER)) + logger_broker.warn('X2Go Session Broker has been started interactively by user {username},'.format(username=x2gobroker.defaults.X2GOBROKER_USER)) + logger_broker.warn(' better run as user {daemon_username}.'.format(daemon_username=x2gobroker.defaults.X2GOBROKER_DAEMON_USER)) logger_broker.info('Automatically switching to DEBUG mode due to interactive launch of this application.') if cmdline_args.bind is None: cmdline_args.bind = '127.0.0.1:8080' if cmdline_args.user: logger_broker.warn('ignoring non-valid option --user for broker mode HTTP...') hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) 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 "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits August 2013