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

[translation/tor-messenger-authdtd] Update translations for tor-messenger-authdtd
by translation＠torproject.org 12 Aug '15

12 Aug '15

commit 4e802ec1327552884f8a6961281a09032c407394 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Aug 12 15:16:24 2015 +0000 Update translations for tor-messenger-authdtd --- bg/auth.dtd | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/bg/auth.dtd b/bg/auth.dtd index badc98d..259b1a9 100644 --- a/bg/auth.dtd +++ b/bg/auth.dtd @@ -1,21 +1,21 @@ -<!ENTITY authDialog.title "Verify contact's identity"> +<!ENTITY authDialog.title "Удостовери самоличността за контакта"> <!ENTITY authDialog.authenticate "Потвърдете"> <!ENTITY authDialog.cancel "Отказ"> -<!ENTITY authDialog.help "Help"> +<!ENTITY authDialog.help "Помощ"> <!ENTITY authDialog.yes "Да"> <!ENTITY authDialog.no "Не"> -<!ENTITY authDialog.verified "I have verified that this is in fact the correct fingerprint."> -<!ENTITY authDialog.yourFingerprint "Your fingerprint"> -<!ENTITY authDialog.theirFingerprint "Their purported fingerprint"> -<!ENTITY authDialog.manualVerification "Manual fingerprint verification"> -<!ENTITY authDialog.questionAndAnswer "Question and answer"> -<!ENTITY authDialog.sharedSecret "Shared secret"> -<!ENTITY authDialog.manualInstruction "To verify the fingerprint, contact your buddy via some other authenticated channel, such as the telephone or GPG-signed email. Each of you should tell your fingerprint to the other. If everything matches up, you should indicate in the dialog below that you have verified the fingerprint."> -<!ENTITY authDialog.choose "Choose"> -<!ENTITY authDialog.how "How would you like to verify your contact's identity?"> +<!ENTITY authDialog.verified "Аз съм се уверил, че това всъщност е правилния пръстов отпечатък."> +<!ENTITY authDialog.yourFingerprint "Вашият пръстов отпечатък"> +<!ENTITY authDialog.theirFingerprint "Техните предполагаеми пръстови отпечатъци"> +<!ENTITY authDialog.manualVerification "Ръчно удостоверяване за пръстови отпечатъци"> +<!ENTITY authDialog.questionAndAnswer "Въпроси и отговори"> +<!ENTITY authDialog.sharedSecret "Споделена тайна"> +<!ENTITY authDialog.manualInstruction "За да се провери пръстовия отпечатък, свържете се с вашия познат приятел чрез някакъв друг проверен канал, например телефон или GPG-подписана е-поща. Всеки от вас трябва да даде своя пръстов отпечатък на другия. Ако всичко съвпада, това трябва да се посочи в полето по-долу, че сте проверили за пръстови отпечатъци."> +<!ENTITY authDialog.choose "Избери"> +<!ENTITY authDialog.how "Как бихте искали да удостоверите самоличността си за контакта?"> <!ENTITY authDialog.qaInstruction "To verify their identity, pick a question whose answer is known only to you and your contact. Enter this question and answer, then wait for your contact to enter the answer as well. If the answers do not match, then you may be talking to an imposter."> <!ENTITY authDialog.secretInstruction "To verify their identity, pick a secret known only to you and your contact. Enter this secret, then wait for your contact to enter it as well. If the secrets do not match, then you may be talking to an imposter."> -<!ENTITY authDialog.question "Enter question here:"> -<!ENTITY authDialog.answer "Enter secret answer here (case sensitive):"> -<!ENTITY authDialog.secret "Enter secret here:"> -<!ENTITY authDialog.waiting "Waiting for contact ..."> \ No newline at end of file +<!ENTITY authDialog.question "Въведете въпрос тук:"> +<!ENTITY authDialog.answer "Въведете таен отговор тук (главни и малки букви):"> +<!ENTITY authDialog.secret "Въведете тайната тук:"> +<!ENTITY authDialog.waiting "Чакащи за контакт ..."> \ No newline at end of file

1 0

[translation/torbutton-branddtd_completed] Update translations for torbutton-branddtd_completed
by translation＠torproject.org 12 Aug '15

12 Aug '15

commit a13bba9bd7e3eb6237e8ada95056bc95e2ed205b Author: Translation commit bot <translation(a)torproject.org> Date: Wed Aug 12 15:16:02 2015 +0000 Update translations for torbutton-branddtd_completed --- bg/brand.dtd | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/bg/brand.dtd b/bg/brand.dtd index f0a8e05..241501a 100644 --- a/bg/brand.dtd +++ b/bg/brand.dtd @@ -2,7 +2,14 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> +<!ENTITY brandShorterName "Tor браузър"> <!ENTITY brandShortName "Tor браузър"> <!ENTITY brandFullName "Tor браузър"> <!ENTITY vendorShortName "Проекта Tor"> <!ENTITY trademarkInfo.part1 "Firefox и логото на Firefox са запазени марки на Mozilla Foundation."> + + +<!ENTITY plugins.installed.find "Кликнете, за да заредите инсталираните системни приставки "> +<!ENTITY plugins.installed.enable "Разрешаване на добавките"> +<!ENTITY plugins.installed.disable "Изключване на приставки"> +<!ENTITY plugins.installed.disable.tip "Кликнете, за да се предотвратите зареждането на системните приставки">

1 0

[translation/torbutton-branddtd] Update translations for torbutton-branddtd
by translation＠torproject.org 12 Aug '15

12 Aug '15

commit b89c804aa068eac4fe872ce40b6ee5aeffd30dba Author: Translation commit bot <translation(a)torproject.org> Date: Wed Aug 12 15:15:59 2015 +0000 Update translations for torbutton-branddtd --- bg/brand.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bg/brand.dtd b/bg/brand.dtd index 7301b1e..241501a 100644 --- a/bg/brand.dtd +++ b/bg/brand.dtd @@ -2,14 +2,14 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShorterName "Tor Browser"> +<!ENTITY brandShorterName "Tor браузър"> <!ENTITY brandShortName "Tor браузър"> <!ENTITY brandFullName "Tor браузър"> <!ENTITY vendorShortName "Проекта Tor"> <!ENTITY trademarkInfo.part1 "Firefox и логото на Firefox са запазени марки на Mozilla Foundation.">  -<!ENTITY plugins.installed.find "Click to load installed system plugins"> +<!ENTITY plugins.installed.find "Кликнете, за да заредите инсталираните системни приставки "> <!ENTITY plugins.installed.enable "Разрешаване на добавките"> -<!ENTITY plugins.installed.disable "Disable plugins"> -<!ENTITY plugins.installed.disable.tip "Click to prevent loading system plugins"> +<!ENTITY plugins.installed.disable "Изключване на приставки"> +<!ENTITY plugins.installed.disable.tip "Кликнете, за да се предотвратите зареждането на системните приставки">

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 12 Aug '15

12 Aug '15

commit 612b2fa17dea07a680c989724ab1112d9848b2e8 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Aug 12 15:15:51 2015 +0000 Update translations for tails-misc_completed --- bg.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bg.po b/bg.po index 5cf4e42..4ae17b0 100644 --- a/bg.po +++ b/bg.po @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-08-10 18:53+0200\n" -"PO-Revision-Date: 2015-08-12 13:19+0000\n" +"PO-Revision-Date: 2015-08-12 14:46+0000\n" "Last-Translator: Tsvetan Nikolov <slakware(a)gmail.com>\n" "Language-Team: Bulgarian (http://www.transifex.com/otf/torproject/language/bg/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 12 Aug '15

12 Aug '15

commit 893f893765b5c51a8bffe7fad029f8c6c5cfe0be Author: Translation commit bot <translation(a)torproject.org> Date: Wed Aug 12 15:15:48 2015 +0000 Update translations for tails-misc --- bg.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bg.po b/bg.po index 5cf4e42..4ae17b0 100644 --- a/bg.po +++ b/bg.po @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-08-10 18:53+0200\n" -"PO-Revision-Date: 2015-08-12 13:19+0000\n" +"PO-Revision-Date: 2015-08-12 14:46+0000\n" "Last-Translator: Tsvetan Nikolov <slakware(a)gmail.com>\n" "Language-Team: Bulgarian (http://www.transifex.com/otf/torproject/language/bg/)\n" "MIME-Version: 1.0\n"

1 0

[translation/whisperback_completed] Update translations for whisperback_completed
by translation＠torproject.org 12 Aug '15

12 Aug '15

commit 43feb73613347132721433b65d5e3d23465cb0bb Author: Translation commit bot <translation(a)torproject.org> Date: Wed Aug 12 15:15:21 2015 +0000 Update translations for whisperback_completed --- bg/bg.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/bg/bg.po b/bg/bg.po index fe9ae49..1129307 100644 --- a/bg/bg.po +++ b/bg/bg.po @@ -3,18 +3,18 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# sandstorm <ivanov.aleksandar.m(a)gmail.com>, 2013 -# kirilvel <kirilvelinov(a)gmail.com>, 2012 +# Aleksandar Ivanov <ivanov.aleksandar.m(a)gmail.com>, 2013 +# Kiril Ivailov Velinov <kirilvelinov(a)gmail.com>, 2012 # alexdimitrov <kvikmen(a)gmail.com>, 2013 -# nasdar <alexander.waterdale(a)gmail.com>, 2013 +# Yani Gerov <alexander.waterdale(a)gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-01 15:36+0200\n" -"PO-Revision-Date: 2013-12-02 18:00+0000\n" +"POT-Creation-Date: 2014-03-17 17:40+0100\n" +"PO-Revision-Date: 2015-08-12 14:55+0000\n" "Last-Translator: alexdimitrov <kvikmen(a)gmail.com>\n" -"Language-Team: Bulgarian (http://www.transifex.com/projects/p/torproject/language/bg/)\n" +"Language-Team: Bulgarian (http://www.transifex.com/otf/torproject/language/bg/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n"

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 12 Aug '15

12 Aug '15

commit 74cf7c9888399c1b713fc6728d9c18065a8666e8 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Aug 12 15:15:17 2015 +0000 Update translations for whisperback --- bg/bg.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/bg/bg.po b/bg/bg.po index fe9ae49..1129307 100644 --- a/bg/bg.po +++ b/bg/bg.po @@ -3,18 +3,18 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# sandstorm <ivanov.aleksandar.m(a)gmail.com>, 2013 -# kirilvel <kirilvelinov(a)gmail.com>, 2012 +# Aleksandar Ivanov <ivanov.aleksandar.m(a)gmail.com>, 2013 +# Kiril Ivailov Velinov <kirilvelinov(a)gmail.com>, 2012 # alexdimitrov <kvikmen(a)gmail.com>, 2013 -# nasdar <alexander.waterdale(a)gmail.com>, 2013 +# Yani Gerov <alexander.waterdale(a)gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-01 15:36+0200\n" -"PO-Revision-Date: 2013-12-02 18:00+0000\n" +"POT-Creation-Date: 2014-03-17 17:40+0100\n" +"PO-Revision-Date: 2015-08-12 14:55+0000\n" "Last-Translator: alexdimitrov <kvikmen(a)gmail.com>\n" -"Language-Team: Bulgarian (http://www.transifex.com/projects/p/torproject/language/bg/)\n" +"Language-Team: Bulgarian (http://www.transifex.com/otf/torproject/language/bg/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n"

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 12 Aug '15

12 Aug '15

commit 6e4f410e12506ea581a59c4d68b93eb19f7d6335 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Aug 12 15:15:13 2015 +0000 Update translations for torcheck_completed --- bg/torcheck.po | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/bg/torcheck.po b/bg/torcheck.po index 711f22a..9612749 100644 --- a/bg/torcheck.po +++ b/bg/torcheck.po @@ -4,14 +4,17 @@ # Translators: # Aleksandar Ivanov <ivanov.aleksandar.m(a)gmail.com>, 2013 # Etem Bavarian <mr.cyberpower(a)gmail.com>, 2014 +# Gabriel Radev <gabosss(a)gmail.com>, 2015 +# iliev.mb <iliev.mb(a)gmail.com>, 2015 # Ivo, 2014 +# Tsvetan Nikolov <slakware(a)gmail.com>, 2015 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-10-15 17:11+0000\n" -"Last-Translator: Ivo\n" -"Language-Team: Bulgarian (http://www.transifex.com/projects/p/torproject/language/bg/)\n" +"PO-Revision-Date: 2015-08-12 14:52+0000\n" +"Last-Translator: Tsvetan Nikolov <slakware(a)gmail.com>\n" +"Language-Team: Bulgarian (http://www.transifex.com/otf/torproject/language/bg/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -28,8 +31,8 @@ msgid "" "the Internet anonymously." msgstr "Моля, посетете <a href=\"https://www.torproject.org/\">Страницата на Tor</a> за повече информация относно използването на Tor безопасно. Сега можете да сърфирате из интернет Анонимно." -msgid "There is a security update available for the Tor Browser Bundle." -msgstr "Налично е обновяване по сигурността за Tor Браузър Пакет" +msgid "There is a security update available for Tor Browser." +msgstr "Има актуализации по сигурността на TOR браузера" msgid "" "<a href=\"https://www.torproject.org/download/download-easy.html\">Click " @@ -95,5 +98,11 @@ msgstr "JavaScript е позволен." msgid "JavaScript is disabled." msgstr "JavaScript е изключен." -msgid "However, it does not appear to be the Tor Browser Bundle." -msgstr "Но не изглежда да е Tor Браузър Пакета." +msgid "However, it does not appear to be Tor Browser." +msgstr "Въпреки това, това не изглежда да е Tor Browser." + +msgid "Run a Relay" +msgstr "Пусни Relay" + +msgid "Stay Anonymous" +msgstr "Останете анонимни"

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 12 Aug '15

12 Aug '15

commit 164b56fb01ce1d41edcddc42049043a09b8b490c Author: Translation commit bot <translation(a)torproject.org> Date: Wed Aug 12 15:15:09 2015 +0000 Update translations for torcheck --- bg/torcheck.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/bg/torcheck.po b/bg/torcheck.po index fc0d74d..9612749 100644 --- a/bg/torcheck.po +++ b/bg/torcheck.po @@ -7,13 +7,14 @@ # Gabriel Radev <gabosss(a)gmail.com>, 2015 # iliev.mb <iliev.mb(a)gmail.com>, 2015 # Ivo, 2014 +# Tsvetan Nikolov <slakware(a)gmail.com>, 2015 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2015-03-31 19:41+0000\n" -"Last-Translator: iliev.mb <iliev.mb(a)gmail.com>\n" -"Language-Team: Bulgarian (http://www.transifex.com/projects/p/torproject/language/bg/)\n" +"PO-Revision-Date: 2015-08-12 14:52+0000\n" +"Last-Translator: Tsvetan Nikolov <slakware(a)gmail.com>\n" +"Language-Team: Bulgarian (http://www.transifex.com/otf/torproject/language/bg/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -98,10 +99,10 @@ msgid "JavaScript is disabled." msgstr "JavaScript е изключен." msgid "However, it does not appear to be Tor Browser." -msgstr "" +msgstr "Въпреки това, това не изглежда да е Tor Browser." msgid "Run a Relay" -msgstr "" +msgstr "Пусни Relay" msgid "Stay Anonymous" msgstr "Останете анонимни"

1 0

[tor/master] Decouple the backend for directory_all_unreachable to simplify our CFG
by nickm＠torproject.org 12 Aug '15

12 Aug '15

commit b65d53519aa216232f81144bdfd33b19d2ec23dc Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 11 09:58:30 2015 -0400 Decouple the backend for directory_all_unreachable to simplify our CFG See ticket 16762. --- changes/decouple_dir_all_unreachable | 4 ++++ src/or/main.c | 44 ++++++++++++++++++++++++++-------- 2 files changed, 38 insertions(+), 10 deletions(-) diff --git a/changes/decouple_dir_all_unreachable b/changes/decouple_dir_all_unreachable new file mode 100644 index 0000000..1e57b3d --- /dev/null +++ b/changes/decouple_dir_all_unreachable @@ -0,0 +1,4 @@ + o Code simplification and refactoring: + - Simply the control graph further by deferring the inner body of + directory_all_unreachable() into a callback. Closes ticket + 16762. \ No newline at end of file diff --git a/src/or/main.c b/src/or/main.c index e564e6c..a29387c 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -982,19 +982,18 @@ conn_close_if_marked(int i) return 1; } -/** We've just tried every dirserver we know about, and none of - * them were reachable. Assume the network is down. Change state - * so next time an application connection arrives we'll delay it - * and try another directory fetch. Kill off all the circuit_wait - * streams that are waiting now, since they will all timeout anyway. +/** Implementation for directory_all_unreachable. This is done in a callback, + * since otherwise it would complicate Tor's control-flow graph beyond all + * reason. */ -void -directory_all_unreachable(time_t now) +static void +directory_all_unreachable_cb(evutil_socket_t fd, short event, void *arg) { - connection_t *conn; - (void)now; + (void)fd; + (void)event; + (void)arg; - stats_n_seconds_working=0; /* reset it */ + connection_t *conn; while ((conn = connection_get_by_type_state(CONN_TYPE_AP, AP_CONN_STATE_CIRCUIT_WAIT))) { @@ -1010,6 +1009,31 @@ directory_all_unreachable(time_t now) control_event_general_status(LOG_ERR, "DIR_ALL_UNREACHABLE"); } +static struct event *directory_all_unreachable_cb_event = NULL; + +/** We've just tried every dirserver we know about, and none of + * them were reachable. Assume the network is down. Change state + * so next time an application connection arrives we'll delay it + * and try another directory fetch. Kill off all the circuit_wait + * streams that are waiting now, since they will all timeout anyway. + */ +void +directory_all_unreachable(time_t now) +{ + (void)now; + + stats_n_seconds_working=0; /* reset it */ + + if (!directory_all_unreachable_cb_event) { + directory_all_unreachable_cb_event = + tor_event_new(tor_libevent_get_base(), + -1, EV_READ, directory_all_unreachable_cb, NULL); + tor_assert(directory_all_unreachable_cb_event); + } + + event_active(directory_all_unreachable_cb_event, EV_READ, 1); +} + /** This function is called whenever we successfully pull down some new * network statuses or server descriptors. */ void

1 0