May 2019 - tor-commits - lists.torproject.org

[tor/master] Hiding crypt_path_t: Add changes file.
by dgoulet＠torproject.org 08 May '19

08 May '19

commit e9769d621769c2ee31657b6da25032d86f79b15d Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon May 6 17:54:51 2019 +0300 Hiding crypt_path_t: Add changes file. --- changes/bug30236 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/bug30236 b/changes/bug30236 new file mode 100644 index 000000000..ceaa98c8f --- /dev/null +++ b/changes/bug30236 @@ -0,0 +1,3 @@ + o Code simplification and refactoring: + - Refactor and encapsulate parts of the codebase that manipulate + crypt_path_t objects. Resolves issue 30236. \ No newline at end of file

1 0

[tor/master] Merge branch 'tor-github/pr/1000'
by dgoulet＠torproject.org 08 May '19

08 May '19

commit 3885e7b44b1df421aa062ba2598f1731e4e3e3a5 Merge: b72f5da03 e9769d621 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed May 8 08:02:28 2019 -0400 Merge branch 'tor-github/pr/1000' Signed-off-by: David Goulet <dgoulet(a)torproject.org> changes/bug30236 | 3 + scripts/maint/practracker/exceptions.txt | 10 +- src/core/crypto/relay_crypto.c | 15 +- src/core/crypto/relay_crypto.h | 5 + src/core/include.am | 2 + src/core/mainloop/connection.c | 3 +- src/core/or/circuitbuild.c | 122 +------------- src/core/or/circuitbuild.h | 9 -- src/core/or/circuitlist.c | 81 +--------- src/core/or/circuitlist.h | 1 - src/core/or/crypt_path.c | 262 +++++++++++++++++++++++++++++++ src/core/or/crypt_path.h | 43 +++++ src/core/or/crypt_path_st.h | 23 ++- src/core/or/sendme.c | 12 +- src/core/or/sendme.h | 1 - src/feature/hs/hs_circuit.c | 7 +- src/feature/rend/rendservice.c | 5 +- src/test/test_circuitpadding.c | 10 +- src/test/test_circuitstats.c | 16 +- src/test/test_hs_client.c | 22 ++- src/test/test_hs_service.c | 12 +- src/test/test_relaycrypt.c | 10 +- 22 files changed, 414 insertions(+), 260 deletions(-)

1 0

[tor/master] Hiding crypt_path_t: Hide 'crypto' usage in sendme.c
by dgoulet＠torproject.org 08 May '19

08 May '19

commit 7f2cd6545ce324b5241f002e7c412408ca5902b7 Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri May 3 18:27:58 2019 +0300 Hiding crypt_path_t: Hide 'crypto' usage in sendme.c --- scripts/maint/practracker/exceptions.txt | 7 +++---- src/core/crypto/relay_crypto.c | 2 +- src/core/or/crypt_path.c | 18 ++++++++++++++++++ src/core/or/crypt_path.h | 4 ++++ src/core/or/sendme.c | 12 ++---------- src/core/or/sendme.h | 1 - 6 files changed, 28 insertions(+), 16 deletions(-) diff --git a/scripts/maint/practracker/exceptions.txt b/scripts/maint/practracker/exceptions.txt index a2b6d36ea..70176ad89 100644 --- a/scripts/maint/practracker/exceptions.txt +++ b/scripts/maint/practracker/exceptions.txt @@ -54,9 +54,9 @@ problem function-size /src/app/main/main.c:sandbox_init_filter() 291 problem function-size /src/app/main/main.c:run_tor_main_loop() 105 problem function-size /src/app/main/ntmain.c:nt_service_install() 125 problem include-count /src/app/main/shutdown.c 52 -problem file-size /src/core/mainloop/connection.c 5559 +problem file-size /src/core/mainloop/connection.c 5560 problem include-count /src/core/mainloop/connection.c 62 -problem function-size /src/core/mainloop/connection.c:connection_free_minimal() 184 +problem function-size /src/core/mainloop/connection.c:connection_free_minimal() 185 problem function-size /src/core/mainloop/connection.c:connection_listener_new() 328 problem function-size /src/core/mainloop/connection.c:connection_handle_listener_read() 161 problem function-size /src/core/mainloop/connection.c:connection_connect_sockaddr() 103 @@ -79,7 +79,6 @@ problem function-size /src/core/or/channeltls.c:channel_tls_process_netinfo_cell problem function-size /src/core/or/channeltls.c:channel_tls_process_certs_cell() 246 problem function-size /src/core/or/channeltls.c:channel_tls_process_authenticate_cell() 202 problem file-size /src/core/or/circuitbuild.c 3061 -problem include-count /src/core/or/circuitbuild.c 53 problem include-count /src/core/or/circuitbuild.c 54 problem function-size /src/core/or/circuitbuild.c:get_unique_circ_id_by_chan() 128 problem function-size /src/core/or/circuitbuild.c:circuit_extend() 147 @@ -246,7 +245,7 @@ problem function-size /src/feature/rend/rendmid.c:rend_mid_establish_intro_legac problem function-size /src/feature/rend/rendparse.c:rend_parse_v2_service_descriptor() 187 problem function-size /src/feature/rend/rendparse.c:rend_decrypt_introduction_points() 104 problem function-size /src/feature/rend/rendparse.c:rend_parse_introduction_points() 131 -problem file-size /src/feature/rend/rendservice.c 4510 +problem file-size /src/feature/rend/rendservice.c 4511 problem function-size /src/feature/rend/rendservice.c:rend_service_prune_list_impl_() 107 problem function-size /src/feature/rend/rendservice.c:rend_config_service() 164 problem function-size /src/feature/rend/rendservice.c:rend_service_load_auth_keys() 178 diff --git a/src/core/crypto/relay_crypto.c b/src/core/crypto/relay_crypto.c index 96b1002ca..74cccd222 100644 --- a/src/core/crypto/relay_crypto.c +++ b/src/core/crypto/relay_crypto.c @@ -164,7 +164,7 @@ relay_decrypt_cell(circuit_t *circ, cell_t *cell, /* This cell is for us. Keep a record of this cell because we will * use it in the next SENDME cell. */ if (sendme_circuit_cell_is_next(thishop->deliver_window)) { - sendme_circuit_record_inbound_cell(thishop); + cpath_sendme_circuit_record_inbound_cell(thishop); } return 0; } diff --git a/src/core/or/crypt_path.c b/src/core/or/crypt_path.c index e2234cc2a..a4b7190e2 100644 --- a/src/core/or/crypt_path.c +++ b/src/core/or/crypt_path.c @@ -202,6 +202,24 @@ cpath_set_cell_forward_digest(crypt_path_t *cpath, cell_t *cell) relay_set_digest(cpath->pvt_crypto.f_digest, cell); } +/************ cpath sendme API ***************************/ + +/** Keep the current inbound cell digest for the next SENDME digest. This part + * is only done by the client as the circuit came back from the Exit. */ +void +cpath_sendme_circuit_record_inbound_cell(crypt_path_t *cpath) +{ + tor_assert(cpath); + relay_crypto_record_sendme_digest(&cpath->pvt_crypto); +} + +/** Return the sendme_digest of this <b>cpath</b>. */ +uint8_t * +cpath_get_sendme_digest(crypt_path_t *cpath) +{ + return relay_crypto_get_sendme_digest(&cpath->pvt_crypto); +} + /************ other cpath functions ***************************/ /** Return the first non-open hop in cpath, or return NULL if all diff --git a/src/core/or/crypt_path.h b/src/core/or/crypt_path.h index 19c8571d0..30c14b3dc 100644 --- a/src/core/or/crypt_path.h +++ b/src/core/or/crypt_path.h @@ -32,6 +32,10 @@ cpath_set_cell_forward_digest(crypt_path_t *cpath, cell_t *cell); crypt_path_t *cpath_get_next_non_open_hop(crypt_path_t *cpath); +void cpath_sendme_circuit_record_inbound_cell(crypt_path_t *cpath); + +uint8_t *cpath_get_sendme_digest(crypt_path_t *cpath); + #if defined(TOR_UNIT_TESTS) unsigned int cpath_get_n_hops(crypt_path_t **head_ptr); #endif /* defined(TOR_UNIT_TESTS) */ diff --git a/src/core/or/sendme.c b/src/core/or/sendme.c index 70ff3798b..46fdc3ca1 100644 --- a/src/core/or/sendme.c +++ b/src/core/or/sendme.c @@ -15,6 +15,7 @@ #include "core/crypto/relay_crypto.h" #include "core/mainloop/connection.h" #include "core/or/cell_st.h" +#include "core/or/crypt_path.h" #include "core/or/circuitlist.h" #include "core/or/circuituse.h" #include "core/or/or_circuit_st.h" @@ -299,15 +300,6 @@ sendme_circuit_record_outbound_cell(or_circuit_t *or_circ) relay_crypto_record_sendme_digest(&or_circ->crypto); } -/** Keep the current inbound cell digest for the next SENDME digest. This part - * is only done by the client as the circuit came back from the Exit. */ -void -sendme_circuit_record_inbound_cell(crypt_path_t *cpath) -{ - tor_assert(cpath); - relay_crypto_record_sendme_digest(&cpath->crypto); -} - /** Return true iff the next cell for the given cell window is expected to be * a SENDME. * @@ -387,7 +379,7 @@ sendme_circuit_consider_sending(circuit_t *circ, crypt_path_t *layer_hint) log_debug(LD_CIRC,"Queuing circuit sendme."); if (layer_hint) { layer_hint->deliver_window += CIRCWINDOW_INCREMENT; - digest = relay_crypto_get_sendme_digest(&layer_hint->crypto); + digest = cpath_get_sendme_digest(layer_hint); } else { circ->deliver_window += CIRCWINDOW_INCREMENT; digest = relay_crypto_get_sendme_digest(&TO_OR_CIRCUIT(circ)->crypto); diff --git a/src/core/or/sendme.h b/src/core/or/sendme.h index 78273eb9a..ac18bbdd3 100644 --- a/src/core/or/sendme.h +++ b/src/core/or/sendme.h @@ -36,7 +36,6 @@ int sendme_note_stream_data_packaged(edge_connection_t *conn); /* Track cell digest. */ void sendme_record_cell_digest(circuit_t *circ); -void sendme_circuit_record_inbound_cell(crypt_path_t *cpath); void sendme_circuit_record_outbound_cell(or_circuit_t *or_circ); /* Circuit level information. */

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 08 May '19

08 May '19

commit 2428df65fab35baa8e172d0d9099188c2e9f40a0 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 8 12:16:03 2019 +0000 Update translations for https_everywhere_completed --- nl/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nl/https-everywhere.dtd b/nl/https-everywhere.dtd index eaf70e963..bd3688d49 100644 --- a/nl/https-everywhere.dtd +++ b/nl/https-everywhere.dtd @@ -44,7 +44,7 @@ <!ENTITY https-everywhere.cancel.open_page "Niet-beveiligde pagina openen"> <!ENTITY https-everywhere.chrome.settings_for_this_site_header "Instellingen voor deze website"> -<!ENTITY https-everywhere.chrome.settings_for_this_site_subheader "Verander je voorkeuren voor versleutelde verbindingen"> +<!ENTITY https-everywhere.chrome.settings_for_this_site_subheader "Uw voorkeuren voor versleutelde verbindingen wijzigen"> <!ENTITY https-everywhere.chrome.settings_for_this_site_explained "Bij het bezoeken van meerdere websites kunt u uw voorkeuren voor elke website wijzigen"> <!ENTITY https-everywhere.chrome.stable_rules "Stabiele regels"> <!ENTITY https-everywhere.chrome.stable_rules_description "Versleutelde verbindingen afdwingen voor deze websites:">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 08 May '19

08 May '19

commit 4f530ed72c98d053e88ce51cc312c3eb250ef56b Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 8 12:15:55 2019 +0000 Update translations for https_everywhere --- nl/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nl/https-everywhere.dtd b/nl/https-everywhere.dtd index eaf70e963..bd3688d49 100644 --- a/nl/https-everywhere.dtd +++ b/nl/https-everywhere.dtd @@ -44,7 +44,7 @@ <!ENTITY https-everywhere.cancel.open_page "Niet-beveiligde pagina openen"> <!ENTITY https-everywhere.chrome.settings_for_this_site_header "Instellingen voor deze website"> -<!ENTITY https-everywhere.chrome.settings_for_this_site_subheader "Verander je voorkeuren voor versleutelde verbindingen"> +<!ENTITY https-everywhere.chrome.settings_for_this_site_subheader "Uw voorkeuren voor versleutelde verbindingen wijzigen"> <!ENTITY https-everywhere.chrome.settings_for_this_site_explained "Bij het bezoeken van meerdere websites kunt u uw voorkeuren voor elke website wijzigen"> <!ENTITY https-everywhere.chrome.stable_rules "Stabiele regels"> <!ENTITY https-everywhere.chrome.stable_rules_description "Versleutelde verbindingen afdwingen voor deze websites:">

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 08 May '19

08 May '19

commit 96fb5a64b582477bb27861c3bf4d709201230989 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 8 11:46:09 2019 +0000 Update translations for https_everywhere_completed --- nl/https-everywhere.dtd | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/nl/https-everywhere.dtd b/nl/https-everywhere.dtd index c8530c2e2..eaf70e963 100644 --- a/nl/https-everywhere.dtd +++ b/nl/https-everywhere.dtd @@ -9,12 +9,12 @@ <!ENTITY https-everywhere.menu.observatory "SSL-observatoriumvoorkeuren"> <!ENTITY https-everywhere.menu.globalEnable "HTTPS Everywhere staat UIT"> <!ENTITY https-everywhere.menu.globalEnable "HTTPS Everywhere staat UIT"> -<!ENTITY https-everywhere.menu.encryptAllSitesEligible "Versleutel alle weblocaties welke in aanmerking komen (EASE) staat AAN"> -<!ENTITY https-everywhere.menu.encryptAllSitesEligible "Versleutel alle weblocaties welke in aanmerking komen (EASE) staat AAN"> -<!ENTITY https-everywhere.menu.httpNoWhereExplained "Onversleutelde verzoeken worden momenteel geblokkeerd"> -<!ENTITY https-everywhere.menu.httpNoWhereExplained "Onversleutelde verzoeken worden momenteel geblokkeerd"> +<!ENTITY https-everywhere.menu.encryptAllSitesEligible "Alle in aanmerking komende websites versleutelen staat AAN"> +<!ENTITY https-everywhere.menu.encryptAllSitesEligible "Alle in aanmerking komende websites versleutelen staat AAN"> +<!ENTITY https-everywhere.menu.httpNoWhereExplained "Niet-versleutelde aanvragen worden momenteel geblokkeerd"> +<!ENTITY https-everywhere.menu.httpNoWhereExplained "Niet-versleutelde aanvragen worden momenteel geblokkeerd"> <!ENTITY https-everywhere.menu.seeMore "Meer zien"> -<!ENTITY https-everywhere.menu.httpNoWhereMore "Deze modus blokkeert onversleutelde inhoud en verzoeken"> +<!ENTITY https-everywhere.menu.httpNoWhereMore "Deze modus blokkeert niet-versleutelde inhoud en aanvragen"> <!ENTITY https-everywhere.menu.showCounter "Teller tonen"> <!ENTITY https-everywhere.menu.viewAllRules "Alle regels bekijken"> @@ -43,9 +43,9 @@ <!ENTITY https-everywhere.cancel.he_blocking_network "op netwerk gebaseerde downgrade-aanvallen"> <!ENTITY https-everywhere.cancel.open_page "Niet-beveiligde pagina openen"> -<!ENTITY https-everywhere.chrome.settings_for_this_site_header "Instellingen voor deze weblocatie"> +<!ENTITY https-everywhere.chrome.settings_for_this_site_header "Instellingen voor deze website"> <!ENTITY https-everywhere.chrome.settings_for_this_site_subheader "Verander je voorkeuren voor versleutelde verbindingen"> -<!ENTITY https-everywhere.chrome.settings_for_this_site_explained "Als je navigeert tussen verschillende weblocaties, kun je je voorkeuren voor elke weblocatie onafhankelijk veranderen"> +<!ENTITY https-everywhere.chrome.settings_for_this_site_explained "Bij het bezoeken van meerdere websites kunt u uw voorkeuren voor elke website wijzigen"> <!ENTITY https-everywhere.chrome.stable_rules "Stabiele regels"> <!ENTITY https-everywhere.chrome.stable_rules_description "Versleutelde verbindingen afdwingen voor deze websites:"> <!ENTITY https-everywhere.chrome.experimental_rules "Experimentele regels">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 08 May '19

08 May '19

commit a365c38d36547dc70600d6f5796641d9e17993cd Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 8 11:45:59 2019 +0000 Update translations for https_everywhere --- nl/https-everywhere.dtd | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/nl/https-everywhere.dtd b/nl/https-everywhere.dtd index c8530c2e2..eaf70e963 100644 --- a/nl/https-everywhere.dtd +++ b/nl/https-everywhere.dtd @@ -9,12 +9,12 @@ <!ENTITY https-everywhere.menu.observatory "SSL-observatoriumvoorkeuren"> <!ENTITY https-everywhere.menu.globalEnable "HTTPS Everywhere staat UIT"> <!ENTITY https-everywhere.menu.globalEnable "HTTPS Everywhere staat UIT"> -<!ENTITY https-everywhere.menu.encryptAllSitesEligible "Versleutel alle weblocaties welke in aanmerking komen (EASE) staat AAN"> -<!ENTITY https-everywhere.menu.encryptAllSitesEligible "Versleutel alle weblocaties welke in aanmerking komen (EASE) staat AAN"> -<!ENTITY https-everywhere.menu.httpNoWhereExplained "Onversleutelde verzoeken worden momenteel geblokkeerd"> -<!ENTITY https-everywhere.menu.httpNoWhereExplained "Onversleutelde verzoeken worden momenteel geblokkeerd"> +<!ENTITY https-everywhere.menu.encryptAllSitesEligible "Alle in aanmerking komende websites versleutelen staat AAN"> +<!ENTITY https-everywhere.menu.encryptAllSitesEligible "Alle in aanmerking komende websites versleutelen staat AAN"> +<!ENTITY https-everywhere.menu.httpNoWhereExplained "Niet-versleutelde aanvragen worden momenteel geblokkeerd"> +<!ENTITY https-everywhere.menu.httpNoWhereExplained "Niet-versleutelde aanvragen worden momenteel geblokkeerd"> <!ENTITY https-everywhere.menu.seeMore "Meer zien"> -<!ENTITY https-everywhere.menu.httpNoWhereMore "Deze modus blokkeert onversleutelde inhoud en verzoeken"> +<!ENTITY https-everywhere.menu.httpNoWhereMore "Deze modus blokkeert niet-versleutelde inhoud en aanvragen"> <!ENTITY https-everywhere.menu.showCounter "Teller tonen"> <!ENTITY https-everywhere.menu.viewAllRules "Alle regels bekijken"> @@ -43,9 +43,9 @@ <!ENTITY https-everywhere.cancel.he_blocking_network "op netwerk gebaseerde downgrade-aanvallen"> <!ENTITY https-everywhere.cancel.open_page "Niet-beveiligde pagina openen"> -<!ENTITY https-everywhere.chrome.settings_for_this_site_header "Instellingen voor deze weblocatie"> +<!ENTITY https-everywhere.chrome.settings_for_this_site_header "Instellingen voor deze website"> <!ENTITY https-everywhere.chrome.settings_for_this_site_subheader "Verander je voorkeuren voor versleutelde verbindingen"> -<!ENTITY https-everywhere.chrome.settings_for_this_site_explained "Als je navigeert tussen verschillende weblocaties, kun je je voorkeuren voor elke weblocatie onafhankelijk veranderen"> +<!ENTITY https-everywhere.chrome.settings_for_this_site_explained "Bij het bezoeken van meerdere websites kunt u uw voorkeuren voor elke website wijzigen"> <!ENTITY https-everywhere.chrome.stable_rules "Stabiele regels"> <!ENTITY https-everywhere.chrome.stable_rules_description "Versleutelde verbindingen afdwingen voor deze websites:"> <!ENTITY https-everywhere.chrome.experimental_rules "Experimentele regels">

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 08 May '19

08 May '19

commit b9981d91466d0f1f043eb283831ad31045e7a71c Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 8 10:16:07 2019 +0000 Update translations for https_everywhere_completed --- uk/https-everywhere.dtd | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/uk/https-everywhere.dtd b/uk/https-everywhere.dtd index e6964bb2c..313b60a9a 100644 --- a/uk/https-everywhere.dtd +++ b/uk/https-everywhere.dtd @@ -7,8 +7,14 @@ <!ENTITY https-everywhere.menu.donate_eff_imperative "Зробити пожертву EFF"> <!ENTITY https-everywhere.menu.observatory "Налаштування SSL Observatory"> -<!ENTITY https-everywhere.menu.globalEnable "Увімкнути HTTPS Everywhere"> -<!ENTITY https-everywhere.menu.encryptAllSitesEligible "Шифрувати всі допустимі сайти (EASE)"> +<!ENTITY https-everywhere.menu.globalEnable "HTTPS Everywhere ВИМКНЕНИЙ"> +<!ENTITY https-everywhere.menu.globalEnable "HTTPS Everywhere ВИМКНЕНИЙ"> +<!ENTITY https-everywhere.menu.encryptAllSitesEligible "Шифрування усіх допустимих сайтів УВІМКНЕНО"> +<!ENTITY https-everywhere.menu.encryptAllSitesEligible "Шифрування усіх допустимих сайтів УВІМКНЕНО"> +<!ENTITY https-everywhere.menu.httpNoWhereExplained "Незашифровані запити наразі блокуються"> +<!ENTITY https-everywhere.menu.httpNoWhereExplained "Незашифровані запити наразі блокуються"> +<!ENTITY https-everywhere.menu.seeMore "Дізнатись більше"> +<!ENTITY https-everywhere.menu.httpNoWhereMore "Цей режим блокує незашифрований контент та запити"> <!ENTITY https-everywhere.menu.showCounter "Показати лічильник"> <!ENTITY https-everywhere.menu.viewAllRules "Переглянути всі правила"> @@ -37,6 +43,9 @@ <!ENTITY https-everywhere.cancel.he_blocking_network "мережеві атаки зниження рівня"> <!ENTITY https-everywhere.cancel.open_page "Відкрити ненадійну сторінку"> +<!ENTITY https-everywhere.chrome.settings_for_this_site_header "Налаштування для цього сайту"> +<!ENTITY https-everywhere.chrome.settings_for_this_site_subheader "Змінити ваші налаштування для зашифрованих з'єднань"> +<!ENTITY https-everywhere.chrome.settings_for_this_site_explained "Під час перегляду різних веб-сайтів можна змінити ваші налаштування для кожного з них"> <!ENTITY https-everywhere.chrome.stable_rules "Стабільні правила"> <!ENTITY https-everywhere.chrome.stable_rules_description "Примусово створювати зашифровані з'єдання до цих веб-сайтів: "> <!ENTITY https-everywhere.chrome.experimental_rules "Експериментальні правила">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 08 May '19

08 May '19

commit 7492c55e85cfd9ba88c4e74d711a322133c0b87f Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 8 10:15:56 2019 +0000 Update translations for https_everywhere --- uk/https-everywhere.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/uk/https-everywhere.dtd b/uk/https-everywhere.dtd index b13473858..313b60a9a 100644 --- a/uk/https-everywhere.dtd +++ b/uk/https-everywhere.dtd @@ -9,8 +9,8 @@ <!ENTITY https-everywhere.menu.observatory "Налаштування SSL Observatory"> <!ENTITY https-everywhere.menu.globalEnable "HTTPS Everywhere ВИМКНЕНИЙ"> <!ENTITY https-everywhere.menu.globalEnable "HTTPS Everywhere ВИМКНЕНИЙ"> -<!ENTITY https-everywhere.menu.encryptAllSitesEligible "Encrypt All Sites Eligible is ON"> -<!ENTITY https-everywhere.menu.encryptAllSitesEligible "Encrypt All Sites Eligible is ON"> +<!ENTITY https-everywhere.menu.encryptAllSitesEligible "Шифрування усіх допустимих сайтів УВІМКНЕНО"> +<!ENTITY https-everywhere.menu.encryptAllSitesEligible "Шифрування усіх допустимих сайтів УВІМКНЕНО"> <!ENTITY https-everywhere.menu.httpNoWhereExplained "Незашифровані запити наразі блокуються"> <!ENTITY https-everywhere.menu.httpNoWhereExplained "Незашифровані запити наразі блокуються"> <!ENTITY https-everywhere.menu.seeMore "Дізнатись більше">

1 0

[translation/whisperback_completed] Update translations for whisperback_completed
by translation＠torproject.org 08 May '19

08 May '19

commit e08545a19255034db69af20ac7d67684bec3cb50 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 8 09:50:47 2019 +0000 Update translations for whisperback_completed --- uk/uk.po | 68 ++++++++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 40 insertions(+), 28 deletions(-) diff --git a/uk/uk.po b/uk/uk.po index 125710844..797513a91 100644 --- a/uk/uk.po +++ b/uk/uk.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-06-11 17:17+0200\n" -"PO-Revision-Date: 2019-04-20 14:20+0000\n" +"POT-Creation-Date: 2019-04-29 12:08+0200\n" +"PO-Revision-Date: 2019-05-08 09:26+0000\n" "Last-Translator: - -\n" "Language-Team: Ukrainian (http://www.transifex.com/otf/torproject/language/uk/)\n" "MIME-Version: 1.0\n" @@ -23,17 +23,17 @@ msgstr "" "Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);\n" #. XXX use a better exception -#: ../whisperBack/whisperback.py:56 +#: ../whisperBack/whisperback.py:63 #, python-format msgid "Invalid contact email: %s" msgstr "Недійсна адреса електронної пошти контакту: %s" -#: ../whisperBack/whisperback.py:74 +#: ../whisperBack/whisperback.py:83 #, python-format msgid "Invalid contact OpenPGP key: %s" msgstr "Недійсний ключ OpenPGP контакту: %s" -#: ../whisperBack/whisperback.py:76 +#: ../whisperBack/whisperback.py:85 msgid "Invalid contact OpenPGP public key block" msgstr "Недійсний блок публічного ключа OpenPGP контакту" @@ -44,56 +44,56 @@ msgid "" "/etc/whisperback/config.py, ~/.whisperback/config.py, or ./config.py" msgstr "Змінну %s не було знайдено у жодному з конфігураційних файлів /etc/whisperback/config.py, ~/.whisperback/config.py або ./config.py" -#: ../whisperBack/gui.py:111 +#: ../whisperBack/gui.py:114 msgid "Name of the affected software" msgstr "Назва ураженого програмного забезпечення" -#: ../whisperBack/gui.py:113 +#: ../whisperBack/gui.py:116 msgid "Exact steps to reproduce the error" msgstr "Точні кроки для відтворення помилки" -#: ../whisperBack/gui.py:115 +#: ../whisperBack/gui.py:118 msgid "Actual result and description of the error" msgstr "Фактичний результат і опис помилки" -#: ../whisperBack/gui.py:117 +#: ../whisperBack/gui.py:120 msgid "Desired result" msgstr "Бажаний результат" -#: ../whisperBack/gui.py:130 +#: ../whisperBack/gui.py:133 msgid "Unable to load a valid configuration." msgstr "Не вдалося завантажити вірну конфігурацію." -#: ../whisperBack/gui.py:166 +#: ../whisperBack/gui.py:170 msgid "Sending mail..." msgstr "Відправлення листа..." -#: ../whisperBack/gui.py:167 +#: ../whisperBack/gui.py:171 msgid "Sending mail" msgstr "Відправлення листа" #. pylint: disable=C0301 -#: ../whisperBack/gui.py:169 +#: ../whisperBack/gui.py:173 msgid "This could take a while..." msgstr "Це може зайняти деякий час..." -#: ../whisperBack/gui.py:185 +#: ../whisperBack/gui.py:189 msgid "The contact email address doesn't seem valid." msgstr "Адреса електронної пошти контакту не схожа на дійсну." -#: ../whisperBack/gui.py:202 +#: ../whisperBack/gui.py:206 msgid "Unable to send the mail: SMTP error." msgstr "Не вдалося відправити лист: помилка SMTP." -#: ../whisperBack/gui.py:204 +#: ../whisperBack/gui.py:208 msgid "Unable to connect to the server." msgstr "Не вдалося підключитися до серверу." -#: ../whisperBack/gui.py:206 +#: ../whisperBack/gui.py:210 msgid "Unable to create or to send the mail." msgstr "Не вдалося створити або відправити повідомлення." -#: ../whisperBack/gui.py:209 +#: ../whisperBack/gui.py:213 msgid "" "\n" "\n" @@ -102,20 +102,20 @@ msgid "" "If it does not work, you will be offered to save the bug report." msgstr "\n\nПовідомлення про помилку не може бути відправлено ймовірно через проблеми у мережі. Будь ласка, спробуйте підключитися до мережі і натисніть кнопку відправити знову.\n\n\nЯкщо це не допоможе, то Вам буде запропоновано зберегти звіт про помилку." -#: ../whisperBack/gui.py:222 +#: ../whisperBack/gui.py:226 msgid "Your message has been sent." msgstr "Ваше повідомлення було відправлено." -#: ../whisperBack/gui.py:229 +#: ../whisperBack/gui.py:233 msgid "An error occured during encryption." msgstr "При шифруванні виникла помилка." -#: ../whisperBack/gui.py:249 +#: ../whisperBack/gui.py:253 #, python-format msgid "Unable to save %s." msgstr "Не вдалося зберегти %s." -#: ../whisperBack/gui.py:272 +#: ../whisperBack/gui.py:276 #, python-format msgid "" "The bug report could not be sent, likely due to network problems.\n" @@ -125,27 +125,27 @@ msgid "" "Do you want to save the bug report to a file?" msgstr "Повідомлення про помилку не може бути відправлено ймовірно через проблеми у мережі.\n\nМожливо зберегти звіт про помилку у вигляді файлу на USB диск і спробувати відправити його нам за адресою %s по електронній пошті за допомогою іншої системи. Зверніть увагу на те, що у цьому разі Ваше повідомлення про помилку не буде анонімним, якщо Ви не вживете додаткових кроків самостійно (наприклад, за допомогою Tor з одноразовим обліковим записом електронної пошти).\n\nВи хочете зберегти звіт про помилку у файл?" -#: ../whisperBack/gui.py:332 ../data/whisperback.ui.h:21 +#: ../whisperBack/gui.py:338 ../data/whisperback.ui.h:21 msgid "WhisperBack" msgstr "WhisperBack" -#: ../whisperBack/gui.py:333 ../data/whisperback.ui.h:2 +#: ../whisperBack/gui.py:339 ../data/whisperback.ui.h:2 msgid "Send feedback in an encrypted mail." msgstr "Відправити зворотній зв'язок у зашифрованому листі." -#: ../whisperBack/gui.py:336 +#: ../whisperBack/gui.py:342 msgid "Copyright © 2009-2018 Tails developers (tails(a)boum.org)" msgstr "Авторське право © 2009-2018 Розробники Tails (tails(a)boum.org)" -#: ../whisperBack/gui.py:337 +#: ../whisperBack/gui.py:343 msgid "Tails developers <tails(a)boum.org>" msgstr "Розробники Tails <tails(a)boum.org>" -#: ../whisperBack/gui.py:338 +#: ../whisperBack/gui.py:344 msgid "translator-credits" msgstr "перекладачі" -#: ../whisperBack/gui.py:370 +#: ../whisperBack/gui.py:377 msgid "This doesn't seem to be a valid URL or OpenPGP key." msgstr "Невірний URL або OpenPGP ключ." @@ -221,3 +221,15 @@ msgstr "налагоджувальна інформація" #: ../data/whisperback.ui.h:31 msgid "Send" msgstr "Відправити" + +#: ../data/whisperback.desktop.in.h:1 +msgid "WhisperBack Error Reporting" +msgstr "WhisperBack - Звіт про помилки" + +#: ../data/whisperback.desktop.in.h:2 +msgid "Send feedback via encrypted e-mail" +msgstr "Надіслати зворотній зв'язок зашифрованим електронним листом" + +#: ../data/whisperback.desktop.in.h:3 +msgid "feedback;bug;report;tails;error;" +msgstr "зворотній зв'язок;баґ;звіт;tails;помилка;"

1 0