March 2014 - tor-commits - lists.torproject.org

[tor/master] Turn off testing code for #9683.
by nickm＠torproject.org 26 Mar '14

26 Mar '14

commit 6da2544f207a541b90a5c5fddbd038800e19d903 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 26 10:31:56 2014 -0400 Turn off testing code for #9683. (This wasn't supposed to get committed turned-on.) --- src/or/circuitlist.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index b1efde5..9313325 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -1077,15 +1077,15 @@ circuit_get_by_edge_conn(edge_connection_t *conn) void circuit_unlink_all_from_channel(channel_t *chan, int reason) { - circuit_t *circ; smartlist_t *detached = smartlist_new(); -#define DEBUG_CIRCUIT_UNLINK_ALL +/* #define DEBUG_CIRCUIT_UNLINK_ALL */ channel_unlink_all_circuits(chan, detached); #ifdef DEBUG_CIRCUIT_UNLINK_ALL { + circuit_t *circ; smartlist_t *detached_2 = smartlist_new(); int mismatch = 0, badlen = 0;

1 0

[translation/torbirdy_completed] Update translations for torbirdy_completed
by translation＠torproject.org 26 Mar '14

26 Mar '14

commit ad9b05a1b774b82246ef55ce33ede576e9ddb532 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 26 12:15:30 2014 +0000 Update translations for torbirdy_completed --- cy/torbirdy.properties | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/cy/torbirdy.properties b/cy/torbirdy.properties new file mode 100644 index 0000000..4262df9 --- /dev/null +++ b/cy/torbirdy.properties @@ -0,0 +1,19 @@ +torbirdy.name=TorBirdy + +torbirdy.enabled.tor=Galluogodd TorBirdy: Tor +torbirdy.enabled.jondo=Galluogodd TorBirdy: JonDo +torbirdy.enabled.custom=Galluogodd TorBirdy: Procsi Personol +torbirdy.enabled.torification=Galluogodd TorBirdy: Torification dryloyw +torbirdy.enabled.whonix=Galluogodd TorBirdy: Whonix +torbirdy.disabled=TorBirdy: Analluogwyd! + +torbirdy.email.prompt=Mae TorBirdy wedi analluogi tiwtorial awto-cyflyniad Thunderbird i amddiffyn eich anhysbysrwydd.\n\nMae'r osodiadau diogelwch amgymhellir am %S wedi'i osod.\n\nGallwch cyflyni'r osodiadau am y cyfrif arall â llaw. + +torbirdy.email.advanced=Nodwch NID yw newid osodiadau uwch TorBirdy yn cael ei amgymhellir.\n\nDylech chi ddim ond mynd ymlaen os rydych yn gwybod beth rydych chi'n gwneud. +torbirdy.email.advanced.nextwarning=Dangoswch y rhybydd tro nesaf +torbirdy.email.advanced.title=Gosodiadau Uwch TorBirdy + +torbirdy.restart=Maen rhaid ailgychwyn Thunderbird i'r dewisiadau cylchfa amser i cymryd effaith. + +torbirdy.firstrun=Rydych yn awr yn rhedeg TorBirdy.\n\nI diogeli'ch anhysbysiad, bydd TorBirdy yn ddod a osodiadau Thunderbird i rym, a'i rwystro nhw o gael ei newid gan chi neu gan unrhyw ychwanegiad. Mae yna rhai osodiadau sydd gallu cael ei newid, ac rydych chi gallu cael gafael ar rhain trwy deialog dewisiadau TorBirdy. Pan mae TorBirdy wedi'i allosod neu wedi'i analluogi, bydd pob osodiad sydd wedi'i newid yn cael ei ailosod i'r gwerthoedd diofyn (yr gwerthoedd cyn i osodiad TorBirdy).\n\nOs rydych yn defnyddiwr newydd, rydym yn amgymhellir eich bod yn darllen trwy wefan TorBirdy i ddeall beth rydym yn ceisio cyflawni gydag TorBirdy i'm defnyddwyr. +torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 26 Mar '14

26 Mar '14

commit 5867b7af736efceab1fff88beddc28199093088b Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 26 12:15:27 2014 +0000 Update translations for torbirdy --- cy/torbirdy.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cy/torbirdy.properties b/cy/torbirdy.properties index dbcdda4..4262df9 100644 --- a/cy/torbirdy.properties +++ b/cy/torbirdy.properties @@ -9,11 +9,11 @@ torbirdy.disabled=TorBirdy: Analluogwyd! torbirdy.email.prompt=Mae TorBirdy wedi analluogi tiwtorial awto-cyflyniad Thunderbird i amddiffyn eich anhysbysrwydd.\n\nMae'r osodiadau diogelwch amgymhellir am %S wedi'i osod.\n\nGallwch cyflyni'r osodiadau am y cyfrif arall â llaw. -torbirdy.email.advanced=Please note that changing the advanced settings of TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of what you are doing. -torbirdy.email.advanced.nextwarning=Show this warning next time +torbirdy.email.advanced=Nodwch NID yw newid osodiadau uwch TorBirdy yn cael ei amgymhellir.\n\nDylech chi ddim ond mynd ymlaen os rydych yn gwybod beth rydych chi'n gwneud. +torbirdy.email.advanced.nextwarning=Dangoswch y rhybydd tro nesaf torbirdy.email.advanced.title=Gosodiadau Uwch TorBirdy -torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect. +torbirdy.restart=Maen rhaid ailgychwyn Thunderbird i'r dewisiadau cylchfa amser i cymryd effaith. -torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users. +torbirdy.firstrun=Rydych yn awr yn rhedeg TorBirdy.\n\nI diogeli'ch anhysbysiad, bydd TorBirdy yn ddod a osodiadau Thunderbird i rym, a'i rwystro nhw o gael ei newid gan chi neu gan unrhyw ychwanegiad. Mae yna rhai osodiadau sydd gallu cael ei newid, ac rydych chi gallu cael gafael ar rhain trwy deialog dewisiadau TorBirdy. Pan mae TorBirdy wedi'i allosod neu wedi'i analluogi, bydd pob osodiad sydd wedi'i newid yn cael ei ailosod i'r gwerthoedd diofyn (yr gwerthoedd cyn i osodiad TorBirdy).\n\nOs rydych yn defnyddiwr newydd, rydym yn amgymhellir eich bod yn darllen trwy wefan TorBirdy i ddeall beth rydym yn ceisio cyflawni gydag TorBirdy i'm defnyddwyr. torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 26 Mar '14

26 Mar '14

commit 9e438041ffb76cc69db05dbeb214ccfd60740ba9 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 26 11:45:27 2014 +0000 Update translations for torbirdy --- cy/torbirdy.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cy/torbirdy.properties b/cy/torbirdy.properties index ea37b5f..dbcdda4 100644 --- a/cy/torbirdy.properties +++ b/cy/torbirdy.properties @@ -7,7 +7,7 @@ torbirdy.enabled.torification=Galluogodd TorBirdy: Torification dryloyw torbirdy.enabled.whonix=Galluogodd TorBirdy: Whonix torbirdy.disabled=TorBirdy: Analluogwyd! -torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration wizard to protect your anonymity.\n\nThe recommended security settings for %S have been set.\n\nYou can now configure the other account settings manually. +torbirdy.email.prompt=Mae TorBirdy wedi analluogi tiwtorial awto-cyflyniad Thunderbird i amddiffyn eich anhysbysrwydd.\n\nMae'r osodiadau diogelwch amgymhellir am %S wedi'i osod.\n\nGallwch cyflyni'r osodiadau am y cyfrif arall â llaw. torbirdy.email.advanced=Please note that changing the advanced settings of TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of what you are doing. torbirdy.email.advanced.nextwarning=Show this warning next time

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 26 Mar '14

26 Mar '14

commit 4d28486391a16ef373210e469c8654bf124a0449 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 26 11:15:57 2014 +0000 Update translations for torbutton-torbuttondtd --- zh_CN/torbutton.dtd | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/zh_CN/torbutton.dtd b/zh_CN/torbutton.dtd index 7c77238..2b1894e 100644 --- a/zh_CN/torbutton.dtd +++ b/zh_CN/torbutton.dtd @@ -12,18 +12,18 @@ <!ENTITY torbutton.prefs.proxy.port "端口："> <!ENTITY torbutton.about.title "关于 Torbutton"> <!ENTITY torbutton.about.version "版本："> -<!ENTITY torbutton.about.summary "正使用 Tor 进行浏览保护您的隐私。"> -<!ENTITY torbutton.about.code "代码提供者："> +<!ENTITY torbutton.about.summary "使用 Tor 进行浏览保护在线隐私。"> +<!ENTITY torbutton.about.code "代码贡献者："> <!ENTITY torbutton.about.maintainer "维护人员："> -<!ENTITY torbutton.about.security_review "安全审查："> -<!ENTITY torbutton.about.donate "如果您喜欢使用 Tor，您也可以考虑"> +<!ENTITY torbutton.about.security_review "安全评审："> +<!ENTITY torbutton.about.donate "如果喜欢使用 Tor，你可以"> <!ENTITY torbutton.about.make_donation "给予捐赠。"> <!ENTITY torbutton.pref_connection.notice "禁止 Torbutton 更改这些设置。"> <!ENTITY torbutton.pref_connection.more_info "更多信息"> <!ENTITY torbutton.pref_connection_more_info.title "帮助"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton 当前已启用。如果您想要更改非 Tor 的代理设置，请禁用 Torbutton 后再返回这里。如果您想更改Tor 的设置，请到 Torbutton 的首选项窗口中进行设置。"> -<!ENTITY torbutton.context_menu.new_identity "新特性"> -<!ENTITY torbutton.context_menu.new_identity_key "我"> +<!ENTITY torbutton.pref_connection_more_info.text "Torbutton 当前已启用。如需对 Tor 之外的代理设置进行更改，请禁用 Torbutton 后再返回这里。如需更改Tor 的设置，请在 Torbutton 首选项窗口中进行设置。"> +<!ENTITY torbutton.context_menu.new_identity "新标识"> +<!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.toggle "切换 Tor 状态"> <!ENTITY torbutton.context_menu.toggle.key "T"> <!ENTITY torbutton.context_menu.preferences "首选项..."> @@ -45,21 +45,21 @@ <!ENTITY torbutton.button.label "Torbutton"> <!ENTITY torbutton.button.tooltip "点此初始化 Torbutton"> <!ENTITY torbutton.prefs.sec_settings "安全设置"> -<!ENTITY torbutton.prefs.block_thread "使用 Tor 时禁止读取历史（重要）"> -<!ENTITY torbutton.prefs.block_thwrite "使用 Tor 时禁止写入历史（推荐）"> -<!ENTITY torbutton.prefs.block_nthread "使用 Tor 之外的代理时禁止读取历史（可选）"> -<!ENTITY torbutton.prefs.block_nthwrite "停用 Tor 时禁止历史写入（可选）"> -<!ENTITY torbutton.prefs.clear_history "切换 Tor 状态时清除历史（可选）"> +<!ENTITY torbutton.prefs.block_thread "使用 Tor 时禁止读取历史记录（重要）"> +<!ENTITY torbutton.prefs.block_thwrite "使用 Tor 时禁止写入历史记录（推荐）"> +<!ENTITY torbutton.prefs.block_nthread "使用 Tor 之外的代理时禁止读取历史记录（可选）"> +<!ENTITY torbutton.prefs.block_nthwrite "停用 Tor 时禁止历史记录写入（可选）"> +<!ENTITY torbutton.prefs.clear_history "切换 Tor 状态时清除历史记录（可选）"> <!ENTITY torbutton.prefs.clear_cache "切换 Tor 时禁用磁盘缓存并清除所有缓存"> <!ENTITY torbutton.prefs.block_cache "使用 Tor 时禁止访问磁盘和内存缓存"> -<!ENTITY torbutton.prefs.cookie_jars "在受保护的 jar 中保存非 Tor 的 Cookie"> +<!ENTITY torbutton.prefs.cookie_jars "在受保护的 jar 中保存 Tor 之外的 Cookie"> <!ENTITY torbutton.prefs.cookie_protection "请在 Cookie 隐私保护对话框内选择"> -<!ENTITY torbutton.prefs.mmm_cookies "我要手动管理我的 cookies （危险）"> +<!ENTITY torbutton.prefs.mmm_cookies "手动管理我的 cookies （危险）"> <!ENTITY torbutton.prefs.clear_cookies "切换 Tor 时清除 cookie"> <!ENTITY torbutton.prefs.disable_plugins "使用 Tor 时禁用插件（重要）"> <!ENTITY torbutton.prefs.kill_bad_js "挂勾危险的 Java 脚本（重要）"> -<!ENTITY torbutton.prefs.isolate_content "根据 Tor 状态隔离动态网页内容（(重要）"> -<!ENTITY torbutton.prefs.no_updates "使用 Tor 时禁止浏览器更新"> +<!ENTITY torbutton.prefs.isolate_content "将动态内容与 Tor 状态隔离（重要）"> +<!ENTITY torbutton.prefs.no_updates "使用 Tor 时禁用浏览器更新"> <!ENTITY torbutton.prefs.set_uagent "使用 Tor 作为用户代理设置（重要）"> <!ENTITY torbutton.prefs.dynamic "动态网页内容"> <!ENTITY torbutton.prefs.cookies "Cookies">

1 0

[translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed
by translation＠torproject.org 26 Mar '14

26 Mar '14

commit f1c1f944e049117de1faf906f17e04a2c04c63d0 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 26 11:15:48 2014 +0000 Update translations for abouttor-homepage_completed --- zh_CN/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/aboutTor.dtd b/zh_CN/aboutTor.dtd index 7a0c195..b9d8bc0 100644 --- a/zh_CN/aboutTor.dtd +++ b/zh_CN/aboutTor.dtd @@ -12,7 +12,7 @@ <!ENTITY aboutTor.check.label "测试 Tor 网络设置"> -<!ENTITY aboutTor.success.label "成功！"> +<!ENTITY aboutTor.success.label "恭喜！"> <!ENTITY aboutTor.success2.label "该浏览器已配置为使用 Tor 网络。"> <!ENTITY aboutTor.success3.label "现在即可自由地匿名访问互联网。"> <!ENTITY aboutTor.failure.label "出错了！">

1 0

[translation/abouttor-homepage] Update translations for abouttor-homepage
by translation＠torproject.org 26 Mar '14

26 Mar '14

commit 2eb1da85e48cdfdf54418c7950777c0385840f0f Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 26 11:15:45 2014 +0000 Update translations for abouttor-homepage --- zh_CN/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/aboutTor.dtd b/zh_CN/aboutTor.dtd index 7a0c195..b9d8bc0 100644 --- a/zh_CN/aboutTor.dtd +++ b/zh_CN/aboutTor.dtd @@ -12,7 +12,7 @@ <!ENTITY aboutTor.check.label "测试 Tor 网络设置"> -<!ENTITY aboutTor.success.label "成功！"> +<!ENTITY aboutTor.success.label "恭喜！"> <!ENTITY aboutTor.success2.label "该浏览器已配置为使用 Tor 网络。"> <!ENTITY aboutTor.success3.label "现在即可自由地匿名访问互联网。"> <!ENTITY aboutTor.failure.label "出错了！">

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 26 Mar '14

26 Mar '14

commit 03066e1ab08b11a034eeb97e275a47c81a62f0df Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 26 11:15:31 2014 +0000 Update translations for torbirdy --- cy/torbirdy.properties | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/cy/torbirdy.properties b/cy/torbirdy.properties index 9548373..ea37b5f 100644 --- a/cy/torbirdy.properties +++ b/cy/torbirdy.properties @@ -2,18 +2,18 @@ torbirdy.name=TorBirdy torbirdy.enabled.tor=Galluogodd TorBirdy: Tor torbirdy.enabled.jondo=Galluogodd TorBirdy: JonDo -# torbirdy.enabled.custom=TorBirdy Enabled: Custom Proxy -# torbirdy.enabled.torification=TorBirdy Enabled: Transparent Torification +torbirdy.enabled.custom=Galluogodd TorBirdy: Procsi Personol +torbirdy.enabled.torification=Galluogodd TorBirdy: Torification dryloyw torbirdy.enabled.whonix=Galluogodd TorBirdy: Whonix torbirdy.disabled=TorBirdy: Analluogwyd! -# torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration wizard to protect your anonymity.\n\nThe recommended security settings for %S have been set.\n\nYou can now configure the other account settings manually. +torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration wizard to protect your anonymity.\n\nThe recommended security settings for %S have been set.\n\nYou can now configure the other account settings manually. -# torbirdy.email.advanced=Please note that changing the advanced settings of TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of what you are doing. -# torbirdy.email.advanced.nextwarning=Show this warning next time +torbirdy.email.advanced=Please note that changing the advanced settings of TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of what you are doing. +torbirdy.email.advanced.nextwarning=Show this warning next time torbirdy.email.advanced.title=Gosodiadau Uwch TorBirdy -# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect. +torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect. -# torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users. +torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users. torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 26 Mar '14

26 Mar '14

commit 0f4a0cfb05be87f1f3706543303b5c415cd27f3b Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 26 11:15:13 2014 +0000 Update translations for torcheck_completed --- zh_CN/torcheck.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/torcheck.po b/zh_CN/torcheck.po index 4f90ead..90a5ef5 100644 --- a/zh_CN/torcheck.po +++ b/zh_CN/torcheck.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-03-26 10:44+0000\n" +"PO-Revision-Date: 2014-03-26 10:53+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"

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 26 Mar '14

26 Mar '14

commit 9394293620cb86277c640a1f8445a96c1f1ee0e8 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 26 11:15:10 2014 +0000 Update translations for torcheck --- zh_CN/torcheck.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/torcheck.po b/zh_CN/torcheck.po index 4f90ead..90a5ef5 100644 --- a/zh_CN/torcheck.po +++ b/zh_CN/torcheck.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-03-26 10:44+0000\n" +"PO-Revision-Date: 2014-03-26 10:53+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"

1 0