June 2016 - tor-commits - lists.torproject.org

[tor/maint-0.2.7] Use tor_sscanf, not sscanf, in test_util.c.
by nickm＠torproject.org 02 Jun '16

02 Jun '16

commit 5854b19816bc7b09df4785afbfb0e8891b398638 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 2 10:11:29 2016 -0400 Use tor_sscanf, not sscanf, in test_util.c. Fixes the 0.2.7 case of bug #19213, which prevented mingw64 from working. --- changes/bug19213 | 3 +++ src/test/test_util.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/bug19213 b/changes/bug19213 new file mode 100644 index 0000000..f912ffb --- /dev/null +++ b/changes/bug19213 @@ -0,0 +1,3 @@ + o Minor bugfixes (compilation): + - Cause the unit tests to compile correctly on mingw64 versions + that lack sscanf. Fixes bug 19213. Bugfix on 0.2.7.1-alpha. diff --git a/src/test/test_util.c b/src/test/test_util.c index 0a5783e..046e92e 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -4377,7 +4377,7 @@ test_util_writepid(void *arg) contents = read_file_to_str(fname, 0, NULL); tt_assert(contents); - int n = sscanf(contents, "%lu\n%c", &pid, &c); + int n = tor_sscanf(contents, "%lu\n%c", &pid, &c); tt_int_op(n, OP_EQ, 1); #ifdef _WIN32

1 0

[webwml/master] We now have a Seattle mailing address.
by nickm＠torproject.org 02 Jun '16

02 Jun '16

commit a3cfaaa1793662fcc35486813ee246b13be31c1b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 1 21:26:55 2016 -0400 We now have a Seattle mailing address. --- donate/en/donor-faq.wml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/donate/en/donor-faq.wml b/donate/en/donor-faq.wml index 0b95e8c..701e4de 100644 --- a/donate/en/donor-faq.wml +++ b/donate/en/donor-faq.wml @@ -337,8 +337,8 @@ </li> <li> Can I donate by mail? - Yes. Our mailing address is The Tor Project, 7 Temple - Street Suite A, Cambridge MA 02139-2403 USA. + Yes. Our mailing address is The Tor Project, 217 1st Ave S #4903, + Seattle WA 98194, USA </li> <li> Do you accept cash donations?

1 0

[translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed
by translation＠torproject.org 01 Jun '16

01 Jun '16

commit f631733e478fa8dc99436f9ddeecc40ce3498b72 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 1 20:15:44 2016 +0000 Update translations for abouttor-homepage_completed --- sr/aboutTor.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sr/aboutTor.dtd b/sr/aboutTor.dtd index 5f3035e..b91a104 100644 --- a/sr/aboutTor.dtd +++ b/sr/aboutTor.dtd @@ -6,14 +6,14 @@ <!ENTITY aboutTor.title "О Тору"> -<!ENTITY aboutTor.outOfDateTorOn.label "МЕЂУТИМ, овај претраживач је застарео."> +<!ENTITY aboutTor.outOfDateTorOn.label "УПОЗОРЕЊЕ: овај веб прегледач је застарео."> <!ENTITY aboutTor.outOfDateTorOff.label "ТАКОЂЕ, овај претраживач је застарео."> <!ENTITY aboutTor.outOfDate2.label "Кликните на лук и онда изаберите Потражити Ажурирање за Тор Браузер."> <!ENTITY aboutTor.check.label "Тестирај подешавања за Тор мрежу."> -<!ENTITY aboutTor.success.label "Честитамо!"> -<!ENTITY aboutTor.success2.label "Овај претраживач је подешен тако да користи Тор."> +<!ENTITY aboutTor.success.label "Добродошли у Tor Browser"> +<!ENTITY aboutTor.success2.label "Повежите се на Tor мрежу."> <!ENTITY aboutTor.success3.label "Сада можете да анонимно претражујете интернет."> <!ENTITY aboutTor.failure.label "Нешто није у реду!"> <!ENTITY aboutTor.failure2.label "Тор не ради у овом претраживачу.">

1 0

[translation/abouttor-homepage] Update translations for abouttor-homepage
by translation＠torproject.org 01 Jun '16

01 Jun '16

commit e5930c69b55d27f9deacd76ec9cecc25c74043c0 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 1 20:15:41 2016 +0000 Update translations for abouttor-homepage --- sr/aboutTor.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sr/aboutTor.dtd b/sr/aboutTor.dtd index b41409b..b91a104 100644 --- a/sr/aboutTor.dtd +++ b/sr/aboutTor.dtd @@ -6,14 +6,14 @@ <!ENTITY aboutTor.title "О Тору"> -<!ENTITY aboutTor.outOfDateTorOn.label "WARNING: this browser is out of date."> +<!ENTITY aboutTor.outOfDateTorOn.label "УПОЗОРЕЊЕ: овај веб прегледач је застарео."> <!ENTITY aboutTor.outOfDateTorOff.label "ТАКОЂЕ, овај претраживач је застарео."> <!ENTITY aboutTor.outOfDate2.label "Кликните на лук и онда изаберите Потражити Ажурирање за Тор Браузер."> <!ENTITY aboutTor.check.label "Тестирај подешавања за Тор мрежу."> -<!ENTITY aboutTor.success.label "Welcome to Tor Browser"> -<!ENTITY aboutTor.success2.label "Connected to the Tor network."> +<!ENTITY aboutTor.success.label "Добродошли у Tor Browser"> +<!ENTITY aboutTor.success2.label "Повежите се на Tor мрежу."> <!ENTITY aboutTor.success3.label "Сада можете да анонимно претражујете интернет."> <!ENTITY aboutTor.failure.label "Нешто није у реду!"> <!ENTITY aboutTor.failure2.label "Тор не ради у овом претраживачу.">

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 01 Jun '16

01 Jun '16

commit 90c07ee05bc36b195601626b55615cf6ea225352 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 1 19:45:49 2016 +0000 Update translations for torbutton-torbuttonproperties --- sr/torbutton.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sr/torbutton.properties b/sr/torbutton.properties index 675a12d..d775978 100644 --- a/sr/torbutton.properties +++ b/sr/torbutton.properties @@ -76,4 +76,4 @@ profileProblemTitle=%S Problem profila profileReadOnly=Ne možete pokrenuti %S iz samo-za-čitanje sistema fajlova. Iskopirajte %S na drugu lokaciju pre nego što pokušate da ga koristite. profileReadOnlyMac=Ne možete pokrenuti %S iz samo-za-čitanje sistema fajlova. Iskopirajte %S na vaš desktop ili u folder sa aplikacijama pre nego što pokušate da ga koristite. profileAccessDenied=%S nema dozvolu za pristup profilu. Podesite dozvole kod vašeg sistema fajlova pa pokušajte ponovo. -profileMigrationFailed=Migration of your existing %S profile failed.\nNew settings will be used. +profileMigrationFailed=Миграција вашег постојећег %S профила није успела.\nНова подешавања ће бити искоришћена.

1 0

[translation/tails-onioncircuits_completed] Update translations for tails-onioncircuits_completed
by translation＠torproject.org 01 Jun '16

01 Jun '16

commit 4e0e7243362b3ca52565852b3576085946e077e5 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 1 16:17:04 2016 +0000 Update translations for tails-onioncircuits_completed --- zh_CN/onioncircuits.pot | 95 +++++++++++++++++++++++-------------------------- 1 file changed, 45 insertions(+), 50 deletions(-) diff --git a/zh_CN/onioncircuits.pot b/zh_CN/onioncircuits.pot index 38c7c52..d064fc4 100644 --- a/zh_CN/onioncircuits.pot +++ b/zh_CN/onioncircuits.pot @@ -4,13 +4,14 @@ # # Translators: # Xiaolan <xiaolan(a)protonmail.ch>, 2016 +# Y.F Yang <yfdyh000(a)gmail.com>, 2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-31 21:31+0200\n" -"PO-Revision-Date: 2016-05-20 19:14+0000\n" -"Last-Translator: Xiaolan <xiaolan(a)protonmail.ch>\n" +"POT-Creation-Date: 2016-05-31 14:42+0200\n" +"PO-Revision-Date: 2016-06-01 16:10+0000\n" +"Last-Translator: Y.F Yang <yfdyh000(a)gmail.com>\n" "Language-Team: Chinese (China) (http://www.transifex.com/otf/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,74 +20,68 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" #: ../onioncircuits:81 -msgid "" -"Cannot connect to the Tor daemon. Onion Circuits will try to reconnect..." -msgstr "无法连接到Tor的后台程序. Onion Circuits将尝试重新连接..." - -#: ../onioncircuits:94 -msgid "Onion Circuits" -msgstr "Onion Circuits" +msgid "You are not connected to Tor yet..." +msgstr "您还没连接到 Tor..." #: ../onioncircuits:95 -msgid "Display Tor circuits and streams" -msgstr "显示Tor回路和数据流" - -#: ../onioncircuits:107 -msgid "OK" -msgstr "确定" - -#: ../onioncircuits:124 -msgid "Path" -msgstr "路径" +msgid "Onion Circuits" +msgstr "Onion 链路" #: ../onioncircuits:125 +msgid "Circuit" +msgstr "链路" + +#: ../onioncircuits:126 msgid "Status" msgstr "状态" -#: ../onioncircuits:141 -msgid "Click on a path to get details" -msgstr "在路径上点击以获取详情" +#: ../onioncircuits:142 +msgid "Click on a circuit for more detail about its Tor relays." +msgstr "点击一个链路了解有关其 Tor 中继的更多信息。" -#: ../onioncircuits:215 -msgid "" -"Lost connection to the Tor daemon. Onion Circuits will try to reconnect..." -msgstr "与Tor的后台程序失去连接. Onion Circuits将尝试重新连接..." - -#: ../onioncircuits:232 -msgid "Connected to the Tor daemon! You can use now Onion Circuits." -msgstr "已经连接到Tor后台程序! 您现在可以使用Onion Circuits了." +#: ../onioncircuits:221 +msgid "The connection to Tor was lost..." +msgstr "至 Tor 的连接已丢失..." -#: ../onioncircuits:314 -msgid "Building..." -msgstr "正在建立..." +#: ../onioncircuits:317 +msgid "..." +msgstr "..." -#: ../onioncircuits:339 +#: ../onioncircuits:343 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: ../onioncircuits:564 +#: ../onioncircuits:554 +msgid "GeoIP database unavailable. No country information will be displayed." +msgstr "GeoIP 数据库不可用。国家/区域信息将不会显示。" + +#: ../onioncircuits:585 +#, c-format +msgid "%s (%s)" +msgstr "%s (%s)" + +#: ../onioncircuits:590 +#, c-format +msgid "%.2f Mb/s" +msgstr "%.2f Mb/s" + +#: ../onioncircuits:592 ../onioncircuits:593 ../onioncircuits:594 +msgid "Unknown" +msgstr "未知" + +#: ../onioncircuits:607 msgid "Fingerprint:" -msgstr "指纹：" +msgstr "指纹:" -#: ../onioncircuits:565 +#: ../onioncircuits:608 msgid "Published:" msgstr "已公布:" -#: ../onioncircuits:566 +#: ../onioncircuits:609 msgid "IP:" msgstr "IP:" -#: ../onioncircuits:566 -#, c-format -msgid "%s (%s)" -msgstr "%s (%s)" - -#: ../onioncircuits:567 +#: ../onioncircuits:610 msgid "Bandwidth:" msgstr "带宽:" - -#: ../onioncircuits:567 -#, c-format -msgid "%.2f Mb/s" -msgstr "%.2f Mb/s"

1 0

[translation/tails-onioncircuits] Update translations for tails-onioncircuits
by translation＠torproject.org 01 Jun '16

01 Jun '16

commit 0c60175819a5bd5e12be3475fc3b4b2c7de996bb Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 1 16:17:01 2016 +0000 Update translations for tails-onioncircuits --- zh_CN/onioncircuits.pot | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/zh_CN/onioncircuits.pot b/zh_CN/onioncircuits.pot index 0f80307..d064fc4 100644 --- a/zh_CN/onioncircuits.pot +++ b/zh_CN/onioncircuits.pot @@ -4,13 +4,14 @@ # # Translators: # Xiaolan <xiaolan(a)protonmail.ch>, 2016 +# Y.F Yang <yfdyh000(a)gmail.com>, 2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-31 14:42+0200\n" -"PO-Revision-Date: 2016-06-01 09:23+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2016-06-01 16:10+0000\n" +"Last-Translator: Y.F Yang <yfdyh000(a)gmail.com>\n" "Language-Team: Chinese (China) (http://www.transifex.com/otf/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,15 +21,15 @@ msgstr "" #: ../onioncircuits:81 msgid "You are not connected to Tor yet..." -msgstr "" +msgstr "您还没连接到 Tor..." #: ../onioncircuits:95 msgid "Onion Circuits" -msgstr "Onion Circuits" +msgstr "Onion 链路" #: ../onioncircuits:125 msgid "Circuit" -msgstr "" +msgstr "链路" #: ../onioncircuits:126 msgid "Status" @@ -36,15 +37,15 @@ msgstr "状态" #: ../onioncircuits:142 msgid "Click on a circuit for more detail about its Tor relays." -msgstr "" +msgstr "点击一个链路了解有关其 Tor 中继的更多信息。" #: ../onioncircuits:221 msgid "The connection to Tor was lost..." -msgstr "" +msgstr "至 Tor 的连接已丢失..." #: ../onioncircuits:317 msgid "..." -msgstr "" +msgstr "..." #: ../onioncircuits:343 #, c-format @@ -53,7 +54,7 @@ msgstr "%s: %s" #: ../onioncircuits:554 msgid "GeoIP database unavailable. No country information will be displayed." -msgstr "" +msgstr "GeoIP 数据库不可用。国家/区域信息将不会显示。" #: ../onioncircuits:585 #, c-format @@ -67,11 +68,11 @@ msgstr "%.2f Mb/s" #: ../onioncircuits:592 ../onioncircuits:593 ../onioncircuits:594 msgid "Unknown" -msgstr "" +msgstr "未知" #: ../onioncircuits:607 msgid "Fingerprint:" -msgstr "指纹：" +msgstr "指纹:" #: ../onioncircuits:608 msgid "Published:"

1 0

[translation/tails-openpgp-applet_completed] Update translations for tails-openpgp-applet_completed
by translation＠torproject.org 01 Jun '16

01 Jun '16

commit 06601861df0db37f6d2844add559f438132044ef Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 1 16:16:55 2016 +0000 Update translations for tails-openpgp-applet_completed --- zh_CN/openpgp-applet.pot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/openpgp-applet.pot b/zh_CN/openpgp-applet.pot index 45165f2..bae1172 100644 --- a/zh_CN/openpgp-applet.pot +++ b/zh_CN/openpgp-applet.pot @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: tails(a)boum.org\n" "POT-Creation-Date: 2015-08-10 15:55+0200\n" -"PO-Revision-Date: 2016-03-21 16:27+0000\n" +"PO-Revision-Date: 2016-06-01 16:10+0000\n" "Last-Translator: Mingye Wang <arthur200126(a)gmail.com>\n" "Language-Team: Chinese (China) (http://www.transifex.com/otf/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-openpgp-applet] Update translations for tails-openpgp-applet
by translation＠torproject.org 01 Jun '16

01 Jun '16

commit 1203090333d7fa74df9c7569f5b79ebc17aa1d7a Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 1 16:16:52 2016 +0000 Update translations for tails-openpgp-applet --- zh_CN/openpgp-applet.pot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/openpgp-applet.pot b/zh_CN/openpgp-applet.pot index 45165f2..bae1172 100644 --- a/zh_CN/openpgp-applet.pot +++ b/zh_CN/openpgp-applet.pot @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: tails(a)boum.org\n" "POT-Creation-Date: 2015-08-10 15:55+0200\n" -"PO-Revision-Date: 2016-03-21 16:27+0000\n" +"PO-Revision-Date: 2016-06-01 16:10+0000\n" "Last-Translator: Mingye Wang <arthur200126(a)gmail.com>\n" "Language-Team: Chinese (China) (http://www.transifex.com/otf/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 01 Jun '16

01 Jun '16

commit c1b0a751f8a29ff83b332157104440d82fecfb6c Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 1 16:15:50 2016 +0000 Update translations for tails-misc_completed --- zh_CN.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN.po b/zh_CN.po index 268da05..a926123 100644 --- a/zh_CN.po +++ b/zh_CN.po @@ -17,7 +17,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-25 20:25+0200\n" -"PO-Revision-Date: 2016-05-27 10:12+0000\n" +"PO-Revision-Date: 2016-06-01 16:10+0000\n" "Last-Translator: carolyn <carolyn(a)anhalt.org>\n" "Language-Team: Chinese (China) (http://www.transifex.com/otf/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n"

1 0