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

[translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed
by translation＠torproject.org 01 Oct '13

01 Oct '13

commit d49c65462269f5a5c4491acf75684a8de4a333b4 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 1 05:45:58 2013 +0000 Update translations for tails-persistence-setup_completed --- zh_CN/zh_CN.po | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/zh_CN/zh_CN.po b/zh_CN/zh_CN.po index 7d9f8e2..a145ec1 100644 --- a/zh_CN/zh_CN.po +++ b/zh_CN/zh_CN.po @@ -4,13 +4,14 @@ # # Translators: # simabull tsai, 2013 +# simabull tsai, 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-08-01 16:49+0200\n" -"PO-Revision-Date: 2013-08-02 08:38+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"POT-Creation-Date: 2013-09-29 14:53+0200\n" +"PO-Revision-Date: 2013-10-01 05:39+0000\n" +"Last-Translator: simabull tsai\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -83,26 +84,34 @@ msgid "Bookmarks saved in Iceweasel browser" msgstr "保存在 Iceweasel 浏览器中的书签" #: ../lib/Tails/Persistence/Configuration/Presets.pm:128 +msgid "Printers" +msgstr "打印机" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:130 +msgid "Printers configuration" +msgstr "打印机配置" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:138 msgid "APT Packages" msgstr "APT 软件包" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:130 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:140 msgid "Packages downloaded by APT" msgstr "APT 下载的软件包" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:138 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:148 msgid "APT Lists" msgstr "APT 列表" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:140 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:150 msgid "Lists downloaded by APT" msgstr "APT 下载的软件包列表" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:148 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:158 msgid "Dotfiles" msgstr ".用户配置文件" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:150 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:160 msgid "" "Symlink into $HOME every file or directory found in the `dotfiles' directory" msgstr "连入 $HOME 的符号链接，'.'开头目录中的所有文件和文件夹"

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 01 Oct '13

01 Oct '13

commit 0f039ec5e04ce21881d8a7356cd5974a2c7a092b Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 1 05:45:54 2013 +0000 Update translations for tails-persistence-setup --- zh_CN/zh_CN.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/zh_CN/zh_CN.po b/zh_CN/zh_CN.po index bedd152..a145ec1 100644 --- a/zh_CN/zh_CN.po +++ b/zh_CN/zh_CN.po @@ -4,13 +4,14 @@ # # Translators: # simabull tsai, 2013 +# simabull tsai, 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-09-29 14:53+0200\n" -"PO-Revision-Date: 2013-09-30 08:40+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2013-10-01 05:39+0000\n" +"Last-Translator: simabull tsai\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -84,11 +85,11 @@ msgstr "保存在 Iceweasel 浏览器中的书签" #: ../lib/Tails/Persistence/Configuration/Presets.pm:128 msgid "Printers" -msgstr "" +msgstr "打印机" #: ../lib/Tails/Persistence/Configuration/Presets.pm:130 msgid "Printers configuration" -msgstr "" +msgstr "打印机配置" #: ../lib/Tails/Persistence/Configuration/Presets.pm:138 msgid "APT Packages"

1 0

[torbutton/master] Bug #9224: about:tor fails if > 1 SOCKS listener
by mikeperry＠torproject.org 01 Oct '13

01 Oct '13

commit 2167f0cbd7a0591c1d5e94b97bd2f10111f8137b Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Sep 20 11:01:39 2013 -0400 Bug #9224: about:tor fails if > 1 SOCKS listener Correctly parse GETINFO response when more than one SOCKS listener is configured. --- src/chrome/content/torbutton.js | 61 ++++++++++++++++++++++++--------------- 1 file changed, 38 insertions(+), 23 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index ed87a0c..97156c8 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1637,6 +1637,8 @@ function torbutton_do_tor_check() function torbutton_local_tor_check() { + let didLogError = false; + let proxyType = m_tb_prefs.getIntPref("network.proxy.type"); if (0 == proxyType) return false; @@ -1650,10 +1652,13 @@ function torbutton_local_tor_check() function logUnexpectedResponse() { - torbutton_log(5, "unexpected tor response: " + resp); + if (!didLogError) { + didLogError = true; + torbutton_log(5, "unexpected tor response: " + resp); + } } - // Sample response: net/listeners/socks="127.0.0.1:9150" + // Sample response: net/listeners/socks="127.0.0.1:9149" "127.0.0.1:9150" // First, check for command argument prefix. resp = resp.toLowerCase(); if (0 != resp.indexOf(kCmdArg + '=')) { @@ -1661,31 +1666,41 @@ function torbutton_local_tor_check() return false; } - // Remove double quotes if present. - resp = resp.substr(kCmdArg.length + 1); - let len = resp.length; - if ((len > 2) && ('"' == resp.charAt(0)) && ('"' == resp.charAt(len - 1))) - resp = resp.substring(1, len - 1); + // Retrieve configured proxy settings and check each listener against them. + let socksAddr = m_tb_prefs.getCharPref("network.proxy.socks"); + let socksPort = m_tb_prefs.getIntPref("network.proxy.socks_port"); + let addrArray = resp.substr(kCmdArg.length + 1).split(' '); + let foundSocksListener = false; + for (let i = 0; !foundSocksListener && (i < addrArray.length); ++i) + { + var addr = addrArray[i]; - let tokens = resp.split(':'); - if (tokens.length < 2) { - logUnexpectedResponse(); - return false; - } + // Remove double quotes if present. + let len = addr.length; + if ((len > 2) && ('"' == addr.charAt(0)) && ('"' == addr.charAt(len - 1))) + addr = addr.substring(1, len - 1); - let torSocksAddr = tokens[0]; - let torSocksPort = parseInt(tokens[1], 10); - if ((torSocksAddr.length < 1) || isNaN(torSocksPort)) { - logUnexpectedResponse(); - return false; + // Check against the configured proxy. + let tokens = addr.split(':'); + if (tokens.length < 2) + logUnexpectedResponse(); + else + { + let torSocksAddr = tokens[0]; + let torSocksPort = parseInt(tokens[1], 10); + if ((torSocksAddr.length < 1) || isNaN(torSocksPort)) + logUnexpectedResponse(); + else + { + torbutton_log(2, "Tor socks listener: " + torSocksAddr + ':' + + torSocksPort); + foundSocksListener = ((socksAddr == torSocksAddr) && + (socksPort == torSocksPort)); + } + } } - torbutton_log(2, "Tor socks listener: " + torSocksAddr + ':' + torSocksPort); - - let socksAddr = m_tb_prefs.getCharPref("network.proxy.socks"); - let socksPort = m_tb_prefs.getIntPref("network.proxy.socks_port"); - - return ((socksAddr == torSocksAddr) && (socksPort == torSocksPort)); + return foundSocksListener; } // torbutton_local_tor_check

1 0

[torbutton/master] Merge remote-tracking branch 'brade/bug9224'
by mikeperry＠torproject.org 01 Oct '13

01 Oct '13

commit ea745403012427f289a06b60f35efb7ed799ab6f Merge: 7120c21 2167f0c Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Sep 30 20:26:52 2013 -0700 Merge remote-tracking branch 'brade/bug9224' src/chrome/content/torbutton.js | 61 ++++++++++++++++++++++++--------------- 1 file changed, 38 insertions(+), 23 deletions(-)

1 0