February 2015 - tor-commits - lists.torproject.org

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 19 Feb '15

19 Feb '15

commit 7a1ee436ef5036a88b6f3d925e948ae086187445 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 19 00:45:52 2015 +0000 Update translations for tor-launcher-network-settings_completed --- ko/network-settings.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ko/network-settings.dtd b/ko/network-settings.dtd index a89866e..81a2368 100644 --- a/ko/network-settings.dtd +++ b/ko/network-settings.dtd @@ -9,7 +9,7 @@ <!ENTITY torSettings.firstQuestion "어떤 것이 귀하의 상황에 가깝습니까?"> <!ENTITY torSettings.configurePrompt1 "이 컴퓨터의 인터넷 연결은 검열되어 있거나 프록시를 통합니다."> -<!ENTITY torSettings.configurePrompt2 "브릿지 또는 프록시 설정을 구성해야 합니다."> +<!ENTITY torSettings.configurePrompt2 "브릿지 또는 프록시 설정 구성을 해야 합니다."> <!ENTITY torSettings.configure "구성"> <!ENTITY torSettings.connectPrompt2 "Tor 네트워크에 직접 연결하고 싶습니다."> <!ENTITY torSettings.connectPrompt3 "이것은 대부분의 상황에서 동작합니다"> @@ -17,7 +17,7 @@ <!ENTITY torSettings.proxyQuestion "이 컴퓨터는 인터넷에 접속하는 데 프록시가 필요한가요?">  -<!ENTITY torSettings.proxyHelp "이 질문에 어떻게 대답해야 할지 확신이 서지 않으면 프록시의 사용이 어떻게 설정되어 있는지 확인하기 위해 다른 브라우저의 인터넷 설정을 보세요."> +<!ENTITY torSettings.proxyHelp "뭔 질문인지 잘 모르시겠다면, 다른 브라우저의 인터넷 설정을 보고 프록시가 어떻게 설정되어 있는지 참고하세요."> <!ENTITY torSettings.enterProxy "프록시 설정에 들어갑니다."> <!ENTITY torSettings.bridgeQuestion "인터넷 서비스 공급자(ISP)가 Tor 네트워크 접속을 차단하거나 검열하고 있나요?"> <!ENTITY torSettings.bridgeHelp "이 질문에 어떻게 대답해야할지 잘 모르는 경우 아니오를 선택하십시오.  예를 선택하면 Tor 네트워크에 대한 연결을 차단하는 것을 더욱 어렵게하는 목록 화되지 않은 릴레이이고 Tor Bridges을 구성하는 것이 요구됩니다.">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 19 Feb '15

19 Feb '15

commit 3dc889b8a17a10bca05c54eb1be163e56c3f6b49 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 19 00:45:48 2015 +0000 Update translations for tor-launcher-network-settings --- ko/network-settings.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ko/network-settings.dtd b/ko/network-settings.dtd index 1d12f69..81a2368 100644 --- a/ko/network-settings.dtd +++ b/ko/network-settings.dtd @@ -9,15 +9,15 @@ <!ENTITY torSettings.firstQuestion "어떤 것이 귀하의 상황에 가깝습니까?"> <!ENTITY torSettings.configurePrompt1 "이 컴퓨터의 인터넷 연결은 검열되어 있거나 프록시를 통합니다."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings."> +<!ENTITY torSettings.configurePrompt2 "브릿지 또는 프록시 설정 구성을 해야 합니다."> <!ENTITY torSettings.configure "구성"> <!ENTITY torSettings.connectPrompt2 "Tor 네트워크에 직접 연결하고 싶습니다."> <!ENTITY torSettings.connectPrompt3 "이것은 대부분의 상황에서 동작합니다"> <!ENTITY torSettings.connect "연결"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> +<!ENTITY torSettings.proxyQuestion "이 컴퓨터는 인터넷에 접속하는 데 프록시가 필요한가요?">  -<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy."> +<!ENTITY torSettings.proxyHelp "뭔 질문인지 잘 모르시겠다면, 다른 브라우저의 인터넷 설정을 보고 프록시가 어떻게 설정되어 있는지 참고하세요."> <!ENTITY torSettings.enterProxy "프록시 설정에 들어갑니다."> <!ENTITY torSettings.bridgeQuestion "인터넷 서비스 공급자(ISP)가 Tor 네트워크 접속을 차단하거나 검열하고 있나요?"> <!ENTITY torSettings.bridgeHelp "이 질문에 어떻게 대답해야할지 잘 모르는 경우 아니오를 선택하십시오.  예를 선택하면 Tor 네트워크에 대한 연결을 차단하는 것을 더욱 어렵게하는 목록 화되지 않은 릴레이이고 Tor Bridges을 구성하는 것이 요구됩니다."> @@ -30,7 +30,7 @@ <!ENTITY torsettings.optional "선택"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "이 컴퓨터는 인터넷 접속에 프록시를 사용해야 합니다."> <!ENTITY torsettings.useProxy.type "프록시 종류:"> <!ENTITY torsettings.useProxy.address "주소:"> <!ENTITY torsettings.useProxy.address.placeholder "IP 주소 또는 호스트 네임">

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 19 Feb '15

19 Feb '15

commit 4b5d70444cea44447f492ffafb65035b060c40a9 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 19 00:45:11 2015 +0000 Update translations for torcheck --- ko/torcheck.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ko/torcheck.po b/ko/torcheck.po index 26909f3..52628ff 100644 --- a/ko/torcheck.po +++ b/ko/torcheck.po @@ -5,14 +5,14 @@ # ilbe123 <a3057016(a)drdrb.net>, 2014 # cwt967 <cwt967(a)gmail.com>, 2012 # cwt96 <cwt967(a)naver.com>, 2012 -# Dr.what <javrick6(a)naver.com>, 2014 +# Dr.what <javrick6(a)naver.com>, 2014-2015 # letsdiet <letsdiet(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2015-02-14 08:38+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2015-02-19 00:40+0000\n" +"Last-Translator: Dr.what <javrick6(a)naver.com>\n" "Language-Team: Korean (http://www.transifex.com/projects/p/torproject/language/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -104,4 +104,4 @@ msgid "Run a Relay" msgstr "" msgid "Stay Anonymous" -msgstr "" +msgstr "익명으로"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 19 Feb '15

19 Feb '15

commit a4ba1cc8f506b73859ca733e5112475f99b20933 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 19 00:45:03 2015 +0000 Update translations for bridgedb --- ko/LC_MESSAGES/bridgedb.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ko/LC_MESSAGES/bridgedb.po b/ko/LC_MESSAGES/bridgedb.po index 89062e5..24bd367 100644 --- a/ko/LC_MESSAGES/bridgedb.po +++ b/ko/LC_MESSAGES/bridgedb.po @@ -7,7 +7,7 @@ # cwt96 <cwt967(a)naver.com>, 2012 # 고영욱 <greenknite(a)naver.com>, 2015 # Jamin <bakzaa(a)gmail.com>, 2014 -# Dr.what <javrick6(a)naver.com>, 2014 +# Dr.what <javrick6(a)naver.com>, 2014-2015 # Kevin Min <candyson1(a)naver.com>, 2015 # pCsOrI <pcsori(a)gmail.com>, 2012 # Sam Ryoo <samryoo(a)gmail.com>, 2014 @@ -17,8 +17,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-02-03 03:24+0000\n" -"PO-Revision-Date: 2015-02-14 08:51+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2015-02-19 00:41+0000\n" +"Last-Translator: Dr.what <javrick6(a)naver.com>\n" "Language-Team: Korean (http://www.transifex.com/projects/p/torproject/language/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -284,7 +284,7 @@ msgstr "모두 선택" #: lib/bridgedb/templates/bridges.html:87 msgid "Show QRCode" -msgstr "" +msgstr "QR코드 보기" #: lib/bridgedb/templates/bridges.html:100 msgid "QRCode for your bridge lines"

1 0

[tor/master] clean up comments and whitespace a bit
by arma＠torproject.org 19 Feb '15

19 Feb '15

commit 0e4bdc400576ba71ae885e94d32adc0e79e8e7fc Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Feb 18 19:27:02 2015 -0500 clean up comments and whitespace a bit --- src/or/dirvote.c | 12 +++++++----- src/or/entrynodes.h | 6 +++--- src/or/routerparse.c | 2 +- src/test/test_guardfraction.c | 12 ++++++------ 4 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/or/dirvote.c b/src/or/dirvote.c index f5694ba..7a5154d 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -1060,7 +1060,8 @@ update_total_bandwidth_weights(const routerstatus_t *rs, * E' = E + (1-F)*B, if N has the exit flag * * In this block of code, we prepare the bandwidth values by setting - * the default_bandwidth to F*B and guardfraction_bandwidth to (1-F)*B. */ + * the default_bandwidth to F*B and guardfraction_bandwidth to (1-F)*B. + */ if (rs->has_guardfraction) { guardfraction_bandwidth_t guardfraction_bw; @@ -1075,10 +1076,11 @@ update_total_bandwidth_weights(const routerstatus_t *rs, } /* Now calculate the total bandwidth weights with or without - guardfraction. Depending on the flags of the relay, add its - bandwidth to the appropriate weight pool. If it's a guard and - guardfraction is enabled, add its bandwidth to both pools as - indicated by the previous comment. */ + * guardfraction. Depending on the flags of the relay, add its + * bandwidth to the appropriate weight pool. If it's a guard and + * guardfraction is enabled, add its bandwidth to both pools as + * indicated by the previous comment. + */ *T += default_bandwidth; if (is_exit && is_guard) { diff --git a/src/or/entrynodes.h b/src/or/entrynodes.h index 35bd748..107a562 100644 --- a/src/or/entrynodes.h +++ b/src/or/entrynodes.h @@ -161,11 +161,11 @@ double pathbias_get_close_success_count(entry_guard_t *guard); double pathbias_get_use_success_count(entry_guard_t *guard); /** Contains the bandwidth of a relay as a guard and as a non-guard - * after the guardfraction has been considered. */ + * after the guardfraction has been considered. */ typedef struct guardfraction_bandwidth_t { - /* Bandwidth as a guard after guardfraction has been considered. */ + /** Bandwidth as a guard after guardfraction has been considered. */ int guard_bw; - /* Bandwidth as a non-guard after guardfraction has been considered. */ + /** Bandwidth as a non-guard after guardfraction has been considered. */ int non_guard_bw; } guardfraction_bandwidth_t; diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 0e8bf8d..5a9626f 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -1827,7 +1827,7 @@ routerstatus_parse_guardfraction(const char *guardfraction_str, } guardfraction = (uint32_t)tor_parse_ulong(end_of_header+1, - 10, 0, 100, &ok, NULL); + 10, 0, 100, &ok, NULL); if (!ok) { log_warn(LD_DIR, "Invalid GuardFraction %s", escaped(guardfraction_str)); return -1; diff --git a/src/test/test_guardfraction.c b/src/test/test_guardfraction.c index e9cf890..57063c9 100644 --- a/src/test/test_guardfraction.c +++ b/src/test/test_guardfraction.c @@ -18,8 +18,8 @@ #include "test.h" #include "test_helpers.h" -/* Generate a vote_routerstatus_t for a router with identity digest - digest_in_hex. */ +/** Generate a vote_routerstatus_t for a router with identity digest + * digest_in_hex. */ static vote_routerstatus_t * gen_vote_routerstatus_for_tests(const char *digest_in_hex, int is_guard) { @@ -169,7 +169,7 @@ test_parse_guardfraction_file_bad(void *arg) tor_free(guardfraction_bad); } -/* Make sure that our test guardfraction file gets parsed properly, and +/** Make sure that our test guardfraction file gets parsed properly, and * its information are applied properly to our routerstatuses. */ static void test_parse_guardfraction_file_good(void *arg) @@ -263,7 +263,7 @@ test_get_guardfraction_bandwidth(void *arg) } /** Parse the GuardFraction element of the consensus, and make sure it - * gets parsed correctly. */ + * gets parsed correctly. */ static void test_parse_guardfraction_consensus(void *arg) { @@ -337,8 +337,8 @@ test_parse_guardfraction_consensus(void *arg) ; } -/* Make sure that we use GuardFraction information when we should, - according to the torrc option and consensus parameter. */ +/** Make sure that we use GuardFraction information when we should, + * according to the torrc option and consensus parameter. */ static void test_should_apply_guardfraction(void *arg) {

1 0

[tor-browser-bundle/master] Update versions.nightly for new TBB branch + NoScript.
by mikeperry＠torproject.org 19 Feb '15

19 Feb '15

commit 96f7be3ca355cd4cf89fc709d24d383b7bf7240a Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Feb 18 15:52:02 2015 -0800 Update versions.nightly for new TBB branch + NoScript. --- gitian/versions.nightly | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index a619cad..2f078b2 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -7,7 +7,7 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=0 -FIREFOX_VERSION=31.4.0esr +FIREFOX_VERSION=31.5.0esr TORBROWSER_UPDATE_CHANNEL=default @@ -61,7 +61,7 @@ GO_VER=1.3.3 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.11-sm+fn+fx.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.14-fn+fx+sm.xpi HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz @@ -90,7 +90,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=568122b4834baf2113648317baf294879700178df157780a9c89582280338ba8 +NOSCRIPT_HASH=67516200ef6ec7a3741a2b94d2257edd91f1862cec92c89251ea870839f8032f HTTPSE_HASH=a42812dbd4b0103600ac5dce0e5f1366e8a7a7267e18743f5cd1e152615964e3 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0

[webwml/master] get rid of two more non-blocking-spaces
by arma＠torproject.org 18 Feb '15

18 Feb '15

commit 9ee47beb524f6cac50882d2edb2acd30a360bcf4 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Feb 18 18:23:49 2015 -0500 get rid of two more non-blocking-spaces --- projects/en/torbrowser.wml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/en/torbrowser.wml b/projects/en/torbrowser.wml index 4f97dce..abccdee 100644 --- a/projects/en/torbrowser.wml +++ b/projects/en/torbrowser.wml @@ -82,7 +82,7 @@ <tr> <th> Language</th> <th>Microsoft Windows (<version-torbrowserbundle>)</th> - <th>Mac OS X (<version-torbrowserbundleosx32>)</th> + <th>Mac OS X (<version-torbrowserbundleosx32>)</th> <th>Linux (<version-torbrowserbundlelinux32>)</th> </tr> </thead> @@ -304,7 +304,7 @@ <tr> <th> Language</th> <th>Microsoft Windows (<version-torbrowserbundlebeta>)</th> - <th>Mac OS X (<version-torbrowserbundleosx64beta>)</th> + <th>Mac OS X (<version-torbrowserbundleosx64beta>)</th> <th>Linux (<version-torbrowserbundlelinux32beta>)</th> </tr> </thead>

1 0

[bridgedb/develop] Hotfix unittest failure due to fix for #12664.
by isis＠torproject.org 18 Feb '15

18 Feb '15

commit 37efc108fdceb49e4c91034b07fd9d12b4e81ea1 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Feb 11 08:02:18 2015 +0000 Hotfix unittest failure due to fix for #12664. The newlines in bridgelines for the HTTPS distributor were changed, but not in the unittests. This fixes the unittests in test_https.py. --- lib/bridgedb/test/test_https.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/test/test_https.py b/lib/bridgedb/test/test_https.py index 4624f08..5225dc3 100644 --- a/lib/bridgedb/test/test_https.py +++ b/lib/bridgedb/test/test_https.py @@ -131,7 +131,7 @@ class HTTPTests(unittest.TestCase): self.assertTrue(soup, "Could not find <div class='bridge-lines'>!") for portion in soup: - bridge_lines = portion.text.strip().split('\n') + bridge_lines = portion.text.strip().split(' ') for bridge_line in bridge_lines: fields = bridge_line.split() bridges.append(fields)

1 0

[bridgedb/develop] Fix missing t.t.unittest.FailTest import in three test modules.
by isis＠torproject.org 18 Feb '15

18 Feb '15

commit 495d77e249763e68e04f9325d7b85bc633fcbba3 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Feb 18 09:31:28 2015 +0000 Fix missing t.t.unittest.FailTest import in three test modules. --- lib/bridgedb/test/test_bridgedb.py | 1 + lib/bridgedb/test/test_https.py | 1 + lib/bridgedb/test/test_smtp.py | 1 + 3 files changed, 3 insertions(+) diff --git a/lib/bridgedb/test/test_bridgedb.py b/lib/bridgedb/test/test_bridgedb.py index 3f0a17a..70c71f0 100644 --- a/lib/bridgedb/test/test_bridgedb.py +++ b/lib/bridgedb/test/test_bridgedb.py @@ -18,6 +18,7 @@ import signal import time from twisted.trial import unittest +from twisted.trial.unittest import FailTest from twisted.trial.unittest import SkipTest from bridgedb.test.util import processExists diff --git a/lib/bridgedb/test/test_https.py b/lib/bridgedb/test/test_https.py index 5225dc3..86b1f84 100644 --- a/lib/bridgedb/test/test_https.py +++ b/lib/bridgedb/test/test_https.py @@ -30,6 +30,7 @@ import os from BeautifulSoup import BeautifulSoup from twisted.trial import unittest +from twisted.trial.unittest import FailTest from twisted.trial.unittest import SkipTest from bridgedb.test.util import processExists diff --git a/lib/bridgedb/test/test_smtp.py b/lib/bridgedb/test/test_smtp.py index cc9e79c..1cbafba 100644 --- a/lib/bridgedb/test/test_smtp.py +++ b/lib/bridgedb/test/test_smtp.py @@ -12,6 +12,7 @@ import os from smtpd import SMTPServer from twisted.trial import unittest +from twisted.trial.unittest import FailTest from twisted.trial.unittest import SkipTest from bridgedb.test.util import processExists

1 0

[bridgedb/develop] Merge branch 'hotfix/0.2.4-mechanize-tags' into develop
by isis＠torproject.org 18 Feb '15

18 Feb '15

commit 034a421031b336a8540e106f8334e98f53a48f07 Merge: 495d77e 8c6f0bd Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Feb 18 21:10:09 2015 +0000 Merge branch 'hotfix/0.2.4-mechanize-tags' into develop lib/bridgedb/test/test_https.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)

1 0