August 2013 - tor-commits - lists.torproject.org

[translation/tor-launcher-progress] Update translations for tor-launcher-progress
by translation＠torproject.org 27 Aug '13

27 Aug '13

commit 1fc7afdc2f52547fb3713047cc7b4595f650a1c4 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 27 23:46:37 2013 +0000 Update translations for tor-launcher-progress --- zh_TW/progress.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_TW/progress.dtd b/zh_TW/progress.dtd index ced94e0..f535b4d 100644 --- a/zh_TW/progress.dtd +++ b/zh_TW/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor 狀態"> -<!ENTITY torprogress.openSettings ""> +<!ENTITY torprogress.openSettings "開啟設定"> <!ENTITY torprogress.heading "正在連線至 Tor 網路"> -<!ENTITY torprogress.pleaseWait ""> +<!ENTITY torprogress.pleaseWait "Tor瀏覽器即將在已連接建立Tor網路時開啟。">

1 0

[translation/tails-greeter_completed] Update translations for tails-greeter_completed
by translation＠torproject.org 27 Aug '13

27 Aug '13

commit 84f41c594e52d5010c70b613ecf4bd2e595477a3 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 27 23:46:24 2013 +0000 Update translations for tails-greeter_completed --- zh_TW/zh_TW.po | 140 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 140 insertions(+) diff --git a/zh_TW/zh_TW.po b/zh_TW/zh_TW.po new file mode 100644 index 0000000..1279c53 --- /dev/null +++ b/zh_TW/zh_TW.po @@ -0,0 +1,140 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# chinrur <chinrur(a)gmail.com>, 2013 +# wongyinho981 <wongyinho981(a)gmail.com>, 2013 +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2013-05-12 19:29+0200\n" +"PO-Revision-Date: 2013-08-27 23:43+0000\n" +"Last-Translator: chinrur <chinrur(a)gmail.com>\n" +"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/torproject/language/zh_TW/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: zh_TW\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ../glade/persistencewindow.glade.h:1 +msgid "Forward" +msgstr "往後" + +#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1 +msgid "Login" +msgstr "登入" + +#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2 +msgid "Welcome to Tails" +msgstr "歡迎來到 Tails" + +#: ../glade/persistencewindow.glade.h:4 +msgid "Use persistence?" +msgstr "使用持久性？" + +#: ../glade/persistencewindow.glade.h:5 +msgid "Yes" +msgstr "確定" + +#: ../glade/persistencewindow.glade.h:6 +msgid "No" +msgstr "取消" + +#: ../glade/persistencewindow.glade.h:7 +msgid "Passphrase:" +msgstr "密碼：" + +#: ../glade/persistencewindow.glade.h:8 +msgid "Read-Only?" +msgstr "唯獨？" + +#: ../glade/persistencewindow.glade.h:9 +msgid "Wrong passphrase. Please try again." +msgstr "密碼錯誤，請重試。" + +#: ../glade/persistencewindow.glade.h:10 +msgid "More options?" +msgstr "更多選項？" + +#: ../glade/optionswindow.glade.h:3 +msgid "Administration password" +msgstr "系統管理員密碼" + +#: ../glade/optionswindow.glade.h:4 +msgid "" +"Enter an administration password in case you need to perform administration tasks.\n" +"Otherwise it will be disabled for better security." +msgstr "進行管理工作時請輸入系統管理員密碼。\n否則會因安全理由而被禁用。" + +#: ../glade/optionswindow.glade.h:6 +msgid "Password:" +msgstr "密碼：" + +#: ../glade/optionswindow.glade.h:7 +msgid "Verify Password:" +msgstr "確認密碼：" + +#: ../glade/optionswindow.glade.h:8 +msgid "Passwords do not match" +msgstr "密碼不符合" + +#: ../glade/optionswindow.glade.h:9 +msgid "Windows Camouflage" +msgstr "偽裝成Windows" + +#: ../glade/optionswindow.glade.h:10 +msgid "" +"This option makes Tails look more like Microsoft Windows XP. This may be " +"useful in public places in order to avoid attracting suspicion." +msgstr "這選項令Tails更像Microsoft Windows XP，可以避免在公開埸合引起懷疑。" + +#: ../glade/optionswindow.glade.h:11 +msgid "Activate Microsoft Windows XP Camouflage" +msgstr "開啟Microsoft Windows XP偽裝" + +#: ../glade/langpanel.glade.h:1 +msgid " " +msgstr " " + +#: ../glade/langpanel.glade.h:2 ../GdmGreeter/langpanel.py:42 +msgid "Language" +msgstr "語言" + +#: ../glade/langpanel.glade.h:3 +msgid "Locale" +msgstr "地區" + +#: ../glade/langpanel.glade.h:4 +msgid "Layout" +msgstr "顯示" + +#: ../GdmGreeter/persistence.py:59 +#, python-format +msgid "" +"live-persist failed with return code %(returncode)s:\n" +"%(stderr)s" +msgstr "live-persist 失敗並傳回錯誤代碼 %(returncode)s:\n%(stderr)s" + +#: ../GdmGreeter/persistence.py:99 +#, python-format +msgid "" +"cryptsetup failed with return code %(returncode)s:\n" +"%(stdout)s\n" +"%(stderr)s" +msgstr "設定密碼失敗，代碼 %(returncode)s:\n%(stdout)s\n%(stderr)s" + +#: ../GdmGreeter/persistence.py:124 +#, python-format +msgid "" +"live-persist failed with return code %(returncode)s:\n" +"%(stdout)s\n" +"%(stderr)s" +msgstr "live-persist 失敗並傳回錯誤代碼 %(returncode)s:⏎\n%(stdout)s⏎\n%(stderr)s" + +#: ../GdmGreeter/langpanel.py:124 ../GdmGreeter/langpanel.py:148 +#: ../GdmGreeter/langpanel.py:181 +msgid "Other..." +msgstr "其他..."

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 27 Aug '13

27 Aug '13

commit 2ad9a51427d0a751ffc4cf12179c8f2bb9e37eac Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 27 23:46:19 2013 +0000 Update translations for tails-greeter --- zh_TW/zh_TW.po | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/zh_TW/zh_TW.po b/zh_TW/zh_TW.po index 193d24d..1279c53 100644 --- a/zh_TW/zh_TW.po +++ b/zh_TW/zh_TW.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# chinrur <chinrur(a)gmail.com>, 2013 # wongyinho981 <wongyinho981(a)gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-05-12 19:29+0200\n" -"PO-Revision-Date: 2013-05-26 01:50+0000\n" -"Last-Translator: wongyinho981 <wongyinho981(a)gmail.com>\n" +"PO-Revision-Date: 2013-08-27 23:43+0000\n" +"Last-Translator: chinrur <chinrur(a)gmail.com>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -32,7 +33,7 @@ msgstr "歡迎來到 Tails" #: ../glade/persistencewindow.glade.h:4 msgid "Use persistence?" -msgstr "永久保留工作數據？" +msgstr "使用持久性？" #: ../glade/persistencewindow.glade.h:5 msgid "Yes" @@ -48,7 +49,7 @@ msgstr "密碼：" #: ../glade/persistencewindow.glade.h:8 msgid "Read-Only?" -msgstr "只能閱讀？" +msgstr "唯獨？" #: ../glade/persistencewindow.glade.h:9 msgid "Wrong passphrase. Please try again." @@ -60,25 +61,25 @@ msgstr "更多選項？" #: ../glade/optionswindow.glade.h:3 msgid "Administration password" -msgstr "管理員密碼" +msgstr "系統管理員密碼" #: ../glade/optionswindow.glade.h:4 msgid "" "Enter an administration password in case you need to perform administration tasks.\n" "Otherwise it will be disabled for better security." -msgstr "進行管理工作時請輸入管理員密碼。\n否則會因安全理由而被禁用。" +msgstr "進行管理工作時請輸入系統管理員密碼。\n否則會因安全理由而被禁用。" #: ../glade/optionswindow.glade.h:6 msgid "Password:" -msgstr "密碼:" +msgstr "密碼：" #: ../glade/optionswindow.glade.h:7 msgid "Verify Password:" -msgstr "確認密碼" +msgstr "確認密碼：" #: ../glade/optionswindow.glade.h:8 msgid "Passwords do not match" -msgstr "密碼不符合" +msgstr "密碼不符合" #: ../glade/optionswindow.glade.h:9 msgid "Windows Camouflage" @@ -115,7 +116,7 @@ msgstr "顯示" msgid "" "live-persist failed with return code %(returncode)s:\n" "%(stderr)s" -msgstr "" +msgstr "live-persist 失敗並傳回錯誤代碼 %(returncode)s:\n%(stderr)s" #: ../GdmGreeter/persistence.py:99 #, python-format @@ -123,7 +124,7 @@ msgid "" "cryptsetup failed with return code %(returncode)s:\n" "%(stdout)s\n" "%(stderr)s" -msgstr "設定密碼失敗，代碼%(returncode)s:\n%(stdout)s\n%(stderr)s" +msgstr "設定密碼失敗，代碼 %(returncode)s:\n%(stdout)s\n%(stderr)s" #: ../GdmGreeter/persistence.py:124 #, python-format @@ -131,7 +132,7 @@ msgid "" "live-persist failed with return code %(returncode)s:\n" "%(stdout)s\n" "%(stderr)s" -msgstr "" +msgstr "live-persist 失敗並傳回錯誤代碼 %(returncode)s:⏎\n%(stdout)s⏎\n%(stderr)s" #: ../GdmGreeter/langpanel.py:124 ../GdmGreeter/langpanel.py:148 #: ../GdmGreeter/langpanel.py:181

1 0

[translation/torbirdy_completed] Update translations for torbirdy_completed
by translation＠torproject.org 27 Aug '13

27 Aug '13

commit 94a420a104330585c0b1b6dd3fa602d9805d43dd Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 27 22:46:32 2013 +0000 Update translations for torbirdy_completed --- de/torbirdy.dtd | 2 ++ 1 file changed, 2 insertions(+) diff --git a/de/torbirdy.dtd b/de/torbirdy.dtd index 3d08d65..a8fa1cb 100644 --- a/de/torbirdy.dtd +++ b/de/torbirdy.dtd @@ -45,6 +45,8 @@ <!ENTITY torbirdy.prefs.confirmemail.key "b"> <!ENTITY torbirdy.prefs.emailwizard.label "Thunderbird's automatischen Email-Konfigurator aktivieren [standard: deaktiviert]"> <!ENTITY torbirdy.prefs.emailwizard.key "w"> +<!ENTITY torbirdy.prefs.automatic.label "Prüfe automatisch nach neuen Nachrichten für alle Accounts [Standard: deaktiviert]"> +<!ENTITY torbirdy.prefs.automatic.key "f"> <!ENTITY torbirdy.prefs.renegotiation.label "Verbindungen zu Servern erlauben, die kein SSL/TLS mit sicherer Renegotiation unterstützen [standard: nicht erlauben]"> <!ENTITY torbirdy.prefs.renegotiation.key "r"> <!ENTITY torbirdy.prefs.account_specific "Konten-spezifisch">

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 27 Aug '13

27 Aug '13

commit 6cb2c8c20fcbd1aa271d02a24ceb161d8d086be5 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 27 22:46:28 2013 +0000 Update translations for torbirdy --- de/torbirdy.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/de/torbirdy.dtd b/de/torbirdy.dtd index 1d6f1ba..a8fa1cb 100644 --- a/de/torbirdy.dtd +++ b/de/torbirdy.dtd @@ -45,8 +45,8 @@ <!ENTITY torbirdy.prefs.confirmemail.key "b"> <!ENTITY torbirdy.prefs.emailwizard.label "Thunderbird's automatischen Email-Konfigurator aktivieren [standard: deaktiviert]"> <!ENTITY torbirdy.prefs.emailwizard.key "w"> -<!ENTITY torbirdy.prefs.automatic.label ""> -<!ENTITY torbirdy.prefs.automatic.key ""> +<!ENTITY torbirdy.prefs.automatic.label "Prüfe automatisch nach neuen Nachrichten für alle Accounts [Standard: deaktiviert]"> +<!ENTITY torbirdy.prefs.automatic.key "f"> <!ENTITY torbirdy.prefs.renegotiation.label "Verbindungen zu Servern erlauben, die kein SSL/TLS mit sicherer Renegotiation unterstützen [standard: nicht erlauben]"> <!ENTITY torbirdy.prefs.renegotiation.key "r"> <!ENTITY torbirdy.prefs.account_specific "Konten-spezifisch">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 27 Aug '13

27 Aug '13

commit 1308aba1c65f9e4ba35a6aaf0485e96735b3e93e Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 27 22:46:12 2013 +0000 Update translations for https_everywhere --- de/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de/https-everywhere.dtd b/de/https-everywhere.dtd index 9e1e534..7e007b1 100644 --- a/de/https-everywhere.dtd +++ b/de/https-everywhere.dtd @@ -39,4 +39,4 @@ <!ENTITY https-everywhere.popup.paragraph2 ""> <!ENTITY https-everywhere.popup.paragraph3 ""> <!ENTITY https-everywhere.popup.keep ""> -<!ENTITY https-everywhere.popup.revert ""> +<!ENTITY https-everywhere.popup.revert "Die letzte stabile Version herunterladen">

1 0

[flashproxy/master] Provide methodName to ConnectOr in doc example.
by dcf＠torproject.org 27 Aug '13

27 Aug '13

commit deaa96bf6d44d8fc96715bebaf7c5c92f57ca9a0 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Aug 27 15:36:26 2013 -0700 Provide methodName to ConnectOr in doc example. --- websocket-transport/src/pt/pt.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/websocket-transport/src/pt/pt.go b/websocket-transport/src/pt/pt.go index 9c6624e..6b40098 100644 --- a/websocket-transport/src/pt/pt.go +++ b/websocket-transport/src/pt/pt.go @@ -23,8 +23,8 @@ // pt.Smethod(bindAddr.MethodName, ln.Addr()) // } // pt.SmethodsDone() -// func handler(conn net.Conn) { -// or, err := pt.ConnectOr(&ptInfo, conn) +// func handler(conn net.Conn, methodName) { +// or, err := pt.ConnectOr(&ptInfo, conn, methodName) // if err != nil { // return // }

1 0

[flashproxy/master] Doc typo.
by dcf＠torproject.org 27 Aug '13

27 Aug '13

commit 463effbb001950e10b8bda37155723d2e938f42a Author: David Fifield <david(a)bamsoftware.com> Date: Tue Aug 27 15:18:31 2013 -0700 Doc typo. --- websocket-transport/src/pt/pt.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/websocket-transport/src/pt/pt.go b/websocket-transport/src/pt/pt.go index 2a3e348..9c6624e 100644 --- a/websocket-transport/src/pt/pt.go +++ b/websocket-transport/src/pt/pt.go @@ -24,7 +24,7 @@ // } // pt.SmethodsDone() // func handler(conn net.Conn) { -// or, err := pt.ConnectOr(&ptInfo, ws.Conn) +// or, err := pt.ConnectOr(&ptInfo, conn) // if err != nil { // return // }

1 0

[flashproxy/master] No need to export these local functions.
by dcf＠torproject.org 27 Aug '13

27 Aug '13

commit 88a3b15213543dd45f568ca2dd0babd4709a1b7d Author: David Fifield <david(a)bamsoftware.com> Date: Thu Aug 15 14:05:38 2013 -0700 No need to export these local functions. --- .../src/websocket-server/websocket-server.go | 22 ++++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/websocket-transport/src/websocket-server/websocket-server.go b/websocket-transport/src/websocket-server/websocket-server.go index c951c60..b280862 100644 --- a/websocket-transport/src/websocket-server/websocket-server.go +++ b/websocket-transport/src/websocket-server/websocket-server.go @@ -48,7 +48,7 @@ func usage() { var logMutex sync.Mutex -func Log(format string, v ...interface{}) { +func log(format string, v ...interface{}) { dateStr := time.Now().Format("2006-01-02 15:04:05") logMutex.Lock() defer logMutex.Unlock() @@ -129,7 +129,7 @@ func (conn *webSocketConn) Close() error { } // Create a new webSocketConn. -func NewWebSocketConn(ws *websocket.WebSocket) webSocketConn { +func newWebSocketConn(ws *websocket.WebSocket) webSocketConn { var conn webSocketConn conn.Ws = ws conn.Base64 = (ws.Subprotocol == "base64") @@ -145,7 +145,7 @@ func proxy(local *net.TCPConn, conn *webSocketConn) { go func() { _, err := io.Copy(conn, local) if err != nil { - Log("error copying ORPort to WebSocket") + log("error copying ORPort to WebSocket") } local.CloseRead() conn.Close() @@ -155,7 +155,7 @@ func proxy(local *net.TCPConn, conn *webSocketConn) { go func() { _, err := io.Copy(local, conn) if err != nil { - Log("error copying WebSocket to ORPort") + log("error copying WebSocket to ORPort") } local.CloseWrite() conn.Close() @@ -168,7 +168,7 @@ func proxy(local *net.TCPConn, conn *webSocketConn) { func webSocketHandler(ws *websocket.WebSocket) { // Undo timeouts on HTTP request handling. ws.Conn.SetDeadline(time.Time{}) - conn := NewWebSocketConn(ws) + conn := newWebSocketConn(ws) handlerChan <- 1 defer func() { @@ -177,7 +177,7 @@ func webSocketHandler(ws *websocket.WebSocket) { s, err := pt.ConnectOr(&ptInfo, ws.Conn, ptMethodName) if err != nil { - Log("Failed to connect to ORPort: " + err.Error()) + log("Failed to connect to ORPort: " + err.Error()) return } @@ -199,7 +199,7 @@ func startListener(addr *net.TCPAddr) (*net.TCPListener, error) { } err = s.Serve(ln) if err != nil { - Log("http.Serve: " + err.Error()) + log("http.Serve: " + err.Error()) } }() return ln, nil @@ -223,7 +223,7 @@ func main() { logFile = f } - Log("starting") + log("starting") ptInfo = pt.ServerSetup([]string{ptMethodName}) listeners := make([]*net.TCPListener, 0) @@ -241,7 +241,7 @@ func main() { continue } pt.Smethod(bindAddr.MethodName, ln.Addr()) - Log("listening on %s", ln.Addr().String()) + log("listening on %s", ln.Addr().String()) listeners = append(listeners, ln) } pt.SmethodsDone() @@ -256,7 +256,7 @@ func main() { case n := <-handlerChan: numHandlers += n case <-signalChan: - Log("SIGINT") + log("SIGINT") sigint = true } } @@ -271,7 +271,7 @@ func main() { case n := <-handlerChan: numHandlers += n case <-signalChan: - Log("SIGINT") + log("SIGINT") sigint = true } }

1 0

[flashproxy/master] Move logMutex next to the function that uses it.
by dcf＠torproject.org 27 Aug '13

27 Aug '13

commit f3e8f5aa168e7331bd492676355a25e0995e2a36 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Aug 15 14:04:08 2013 -0700 Move logMutex next to the function that uses it. --- websocket-transport/src/websocket-server/websocket-server.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/websocket-transport/src/websocket-server/websocket-server.go b/websocket-transport/src/websocket-server/websocket-server.go index cef86f8..c951c60 100644 --- a/websocket-transport/src/websocket-server/websocket-server.go +++ b/websocket-transport/src/websocket-server/websocket-server.go @@ -36,8 +36,6 @@ var ptInfo pt.ServerInfo // ends, -1 is written. var handlerChan = make(chan int) -var logMutex sync.Mutex - func usage() { fmt.Printf("Usage: %s [OPTIONS]\n", os.Args[0]) fmt.Printf("WebSocket server pluggable transport for Tor.\n") @@ -48,6 +46,8 @@ func usage() { fmt.Printf(" --port PORT listen on PORT (overrides Tor's requested port).\n") } +var logMutex sync.Mutex + func Log(format string, v ...interface{}) { dateStr := time.Now().Format("2006-01-02 15:04:05") logMutex.Lock()

1 0