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

[tor/maint-0.2.5] Fix some URLs in the README
by nickm＠torproject.org 10 Aug '14

10 Aug '14

commit 4056c61608f1ede0da56559cb7e56ec2087dc659 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Aug 9 15:57:06 2014 -0400 Fix some URLs in the README patch from mttp; fixes 12830 --- README | 9 ++++----- changes/bug12830 | 4 ++++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/README b/README index b2a391a..e878476 100644 --- a/README +++ b/README @@ -10,17 +10,16 @@ Home page: https://www.torproject.org/ Download new versions: - https://www.torproject.org/download.html + https://www.torproject.org/download/download.html Documentation, including links to installation and setup instructions: - https://www.torproject.org/documentation.html + https://www.torproject.org/docs/documentation.html Making applications work with Tor: - https://wiki.torproject.org/noreply/TheOnionRouter/TorifyHOWTO + https://wiki.torproject.org/projects/tor/wiki/doc/TorifyHOWTO Frequently Asked Questions: - https://www.torproject.org/faq.html - https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ + https://www.torproject.org/docs/faq.html To get started working on Tor development: diff --git a/changes/bug12830 b/changes/bug12830 new file mode 100644 index 0000000..835ebe2 --- /dev/null +++ b/changes/bug12830 @@ -0,0 +1,4 @@ + o Documentation: + - Adjust the URLs in the README to refer to the new locations of + several documents on the website. Patch from Matt Pagan. Fixes + bug 12830.

1 0

[tor/maint-0.2.4] fix extra words in man page
by arma＠torproject.org 10 Aug '14

10 Aug '14

commit 691371b8026d40467662a9c7cf3bd9f788ea6df5 Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Aug 9 15:40:40 2014 -0400 fix extra words in man page --- doc/tor.1.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 4f3612b..ba05968 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1630,7 +1630,7 @@ is non-zero): [[BridgeRecordUsageByCountry]] **BridgeRecordUsageByCountry** **0**|**1**:: When this option is enabled and BridgeRelay is also enabled, and we have - GeoIP data, Tor keeps a keep a per-country count of how many client + GeoIP data, Tor keeps a per-country count of how many client addresses have contacted it so that it can help the bridge authority guess which countries have blocked access to it. (Default: 1)

1 0

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 09 Aug '14

09 Aug '14

commit 1e0561bce5da081962d4556eb5295f5cd8376a7c Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 8 21:45:51 2014 +0000 Update translations for tor-launcher-network-settings_completed --- ru/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ru/network-settings.dtd b/ru/network-settings.dtd index ea2ee82..a0dc714 100644 --- a/ru/network-settings.dtd +++ b/ru/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Ожидание запуска Tor..."> -<!ENTITY torsettings.restart "Перезапустить"> +<!ENTITY torsettings.restartTor "Перезапустить Tor"> <!ENTITY torsettings.optional "Необязательно">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 09 Aug '14

09 Aug '14

commit 3f50a90c4dd0a36bc015bfbcbb899ee8d1de5d08 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 8 21:45:48 2014 +0000 Update translations for tor-launcher-network-settings --- ru/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ru/network-settings.dtd b/ru/network-settings.dtd index 3cf9cd2..a0dc714 100644 --- a/ru/network-settings.dtd +++ b/ru/network-settings.dtd @@ -29,7 +29,7 @@  <!ENTITY torsettings.startingTor "Ожидание запуска Tor..."> -<!ENTITY torsettings.restartTor "Restart Tor"> +<!ENTITY torsettings.restartTor "Перезапустить Tor"> <!ENTITY torsettings.optional "Необязательно">

1 0

[translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed
by translation＠torproject.org 09 Aug '14

09 Aug '14

commit db3248deabc671725dc936bc563ce7d05f48e2fe Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 8 21:45:42 2014 +0000 Update translations for tor-launcher-properties_completed --- ru/torlauncher.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ru/torlauncher.properties b/ru/torlauncher.properties index ad50365..7db0641 100644 --- a/ru/torlauncher.properties +++ b/ru/torlauncher.properties @@ -4,7 +4,7 @@ torlauncher.error_title=Загрузчик Tor torlauncher.tor_exited=Tor неожиданно завершился. -torlauncher.please_restart_app=Пожалуйста, перезапустите приложение +torlauncher.tor_connection_lost=Соединение с Tor Сетью было потеряно. torlauncher.tor_controlconn_failed=Невозможно соединиться с портом управления Tor. torlauncher.tor_failed_to_start=Невозможно запустить Tor. torlauncher.tor_control_failed=Не удалось взять контроль над Tor. @@ -30,6 +30,7 @@ torlauncher.error_bridge_bad_default_type=Предопределенные мо torlauncher.recommended_bridge=(рекомендуемый) torlauncher.connect=Соединиться +torlauncher.reconnect=Переподключение torlauncher.quit=Выйти torlauncher.quit_win=Выход torlauncher.done=Готово

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 09 Aug '14

09 Aug '14

commit e024d5df24d39643b66bbf6652bf282a80409f72 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 8 21:45:39 2014 +0000 Update translations for tor-launcher-properties --- ru/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ru/torlauncher.properties b/ru/torlauncher.properties index 3e49e06..7db0641 100644 --- a/ru/torlauncher.properties +++ b/ru/torlauncher.properties @@ -4,7 +4,7 @@ torlauncher.error_title=Загрузчик Tor torlauncher.tor_exited=Tor неожиданно завершился. -torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. +torlauncher.tor_connection_lost=Соединение с Tor Сетью было потеряно. torlauncher.tor_controlconn_failed=Невозможно соединиться с портом управления Tor. torlauncher.tor_failed_to_start=Невозможно запустить Tor. torlauncher.tor_control_failed=Не удалось взять контроль над Tor.

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 09 Aug '14

09 Aug '14

commit e8990d7648d25677a94bdbbfdeac2a54531d685d Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 8 21:45:09 2014 +0000 Update translations for bridgedb_completed --- ru/LC_MESSAGES/bridgedb.po | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/ru/LC_MESSAGES/bridgedb.po b/ru/LC_MESSAGES/bridgedb.po index 13b9ab0..a66e7c9 100644 --- a/ru/LC_MESSAGES/bridgedb.po +++ b/ru/LC_MESSAGES/bridgedb.po @@ -7,6 +7,7 @@ # Eugene, 2013 # foo <im-infamous(a)yandex.ru>, 2014 # liquixis <liquixis(a)gmail.com>, 2012 +# Oleg, 2014 # Sergey Briskin <sergey.briskin(a)gmail.com>, 2014 # Valid Olov, 2014 # Vitaliy Grishenko <vitolink(a)gmail.com>, 2014 @@ -14,9 +15,9 @@ msgid "" 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: 2014-06-06 21:46+0000\n" -"PO-Revision-Date: 2014-07-05 18:43+0000\n" -"Last-Translator: Vitaliy Grishenko <vitolink(a)gmail.com>\n" +"POT-Creation-Date: 2014-07-26 02:11+0000\n" +"PO-Revision-Date: 2014-08-08 21:40+0000\n" +"Last-Translator: Oleg\n" "Language-Team: Russian (http://www.transifex.com/projects/p/torproject/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -79,7 +80,7 @@ msgstr "Эй, %s!" msgid "Hello, friend!" msgstr "Привет, друг!" -#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100 +#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101 msgid "Public Keys" msgstr "Открытые ключи" @@ -147,8 +148,8 @@ msgstr "Мне нужен альтернативный способ получе msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" "send the email using an address from one of the following email providers:\n" -"%s or %s." -msgstr "Другим способом получения мостов является отправка электронного письма на адрес %s. Пожалуйста, обратите внимание на то, что вы должны \nотправить электронный запрос с использованием одного из перечисленных сервисов:\n%s или %s." +"%s, %s or %s." +msgstr "Другим способом получения мостов является отправка электронного письма на адрес %s. Пожалуйста, обратите внимание на то, \nчто вы должны отправить электронный запрос с использованием одного из перечисленных сервисов: %s, %s или %s." #: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" @@ -260,19 +261,19 @@ msgstr "Запросить подключаемый транспорт по TYPE msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "Получить копию открытого GnuPG ключа BridgeDB." -#: lib/bridgedb/templates/base.html:91 +#: lib/bridgedb/templates/base.html:92 msgid "Report a Bug" msgstr "Сообщить об ошибке" -#: lib/bridgedb/templates/base.html:93 +#: lib/bridgedb/templates/base.html:94 msgid "Source Code" msgstr "Исходный код" -#: lib/bridgedb/templates/base.html:96 +#: lib/bridgedb/templates/base.html:97 msgid "Changelog" msgstr "Лог изменений" -#: lib/bridgedb/templates/base.html:98 +#: lib/bridgedb/templates/base.html:99 msgid "Contact" msgstr "Контакт"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 09 Aug '14

09 Aug '14

commit 1c53ae40854e0c493b3d0a2ac9cbd50f6c7538d8 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 8 21:45:04 2014 +0000 Update translations for bridgedb --- ru/LC_MESSAGES/bridgedb.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ru/LC_MESSAGES/bridgedb.po b/ru/LC_MESSAGES/bridgedb.po index af7f298..a66e7c9 100644 --- a/ru/LC_MESSAGES/bridgedb.po +++ b/ru/LC_MESSAGES/bridgedb.po @@ -7,6 +7,7 @@ # Eugene, 2013 # foo <im-infamous(a)yandex.ru>, 2014 # liquixis <liquixis(a)gmail.com>, 2012 +# Oleg, 2014 # Sergey Briskin <sergey.briskin(a)gmail.com>, 2014 # Valid Olov, 2014 # Vitaliy Grishenko <vitolink(a)gmail.com>, 2014 @@ -15,8 +16,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: 2014-07-26 02:11+0000\n" -"PO-Revision-Date: 2014-07-26 09:42+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-08-08 21:40+0000\n" +"Last-Translator: Oleg\n" "Language-Team: Russian (http://www.transifex.com/projects/p/torproject/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -148,7 +149,7 @@ msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" "send the email using an address from one of the following email providers:\n" "%s, %s or %s." -msgstr "" +msgstr "Другим способом получения мостов является отправка электронного письма на адрес %s. Пожалуйста, обратите внимание на то, \nчто вы должны отправить электронный запрос с использованием одного из перечисленных сервисов: %s, %s или %s." #: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!"

1 0

[tor/master] fix three typos in comments
by nickm＠torproject.org 08 Aug '14

08 Aug '14

commit 0c869af7f8626cc74a7b82d0c0d6192cbb796d02 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Aug 6 02:20:51 2014 -0400 fix three typos in comments --- src/or/directory.c | 2 +- src/or/routerlist.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/or/directory.c b/src/or/directory.c index 22ba056..51ea312 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -349,7 +349,7 @@ should_use_directory_guards(const or_options_t *options) return 1; } -/** Pick an unconsetrained directory server from among our guards, the latest +/** Pick an unconstrained directory server from among our guards, the latest * networkstatus, or the fallback dirservers, for use in downloading * information of type <b>type</b>, and return its routerstatus. */ static const routerstatus_t * diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 8f3477a..b5e9245 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -1365,7 +1365,7 @@ router_pick_trusteddirserver(dirinfo_type_t type, int flags) return router_pick_dirserver_generic(trusted_dir_servers, type, flags); } -/** Try to find a running fallback directory Flags are as for +/** Try to find a running fallback directory. Flags are as for * router_pick_directory_server. */ const routerstatus_t * @@ -1374,7 +1374,7 @@ router_pick_fallback_dirserver(dirinfo_type_t type, int flags) return router_pick_dirserver_generic(fallback_dir_servers, type, flags); } -/** Try to find a running fallback directory Flags are as for +/** Try to find a running fallback directory. Flags are as for * router_pick_directory_server. */ static const routerstatus_t *

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.5'
by nickm＠torproject.org 08 Aug '14

08 Aug '14

commit bb68c731b897a967a4b7eb138728fa077617646e Merge: 374611d fcac4b4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 8 10:09:17 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' changes/bug11200-caching | 7 +++++++ src/or/directory.c | 2 +- src/or/nodelist.c | 21 ++++++++++++--------- src/or/routerlist.c | 4 ++-- 4 files changed, 22 insertions(+), 12 deletions(-)

1 0